From f151ffbd32391e6ecb3f6bf593174fa38cff9800 Mon Sep 17 00:00:00 2001 From: XTZGZoReX Date: Mon, 7 Jun 2010 01:11:15 +0200 Subject: * Last round of script directory renames. --HG-- branch : trunk --- .../BattleForMountHyjal/boss_anetheron.cpp | 309 ++++ .../BattleForMountHyjal/boss_archimonde.cpp | 635 +++++++++ .../BattleForMountHyjal/boss_azgalor.cpp | 285 ++++ .../BattleForMountHyjal/boss_kazrogal.cpp | 197 +++ .../BattleForMountHyjal/boss_rage_winterchill.cpp | 192 +++ .../CavernsOfTime/BattleForMountHyjal/hyjal.cpp | 247 ++++ .../CavernsOfTime/BattleForMountHyjal/hyjal.h | 38 + .../CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp | 1157 +++++++++++++++ .../CavernsOfTime/BattleForMountHyjal/hyjalAI.h | 248 ++++ .../BattleForMountHyjal/hyjal_trash.cpp | 1440 +++++++++++++++++++ .../BattleForMountHyjal/hyjal_trash.h | 35 + .../BattleForMountHyjal/instance_hyjal.cpp | 324 +++++ .../CullingOfStratholme/boss_epoch.cpp | 156 ++ .../CullingOfStratholme/boss_infinite.cpp | 88 ++ .../CullingOfStratholme/boss_mal_ganis.cpp | 262 ++++ .../CullingOfStratholme/boss_meathook.cpp | 140 ++ .../CullingOfStratholme/boss_salramm.cpp | 170 +++ .../CullingOfStratholme/culling_of_stratholme.cpp | 1210 ++++++++++++++++ .../CullingOfStratholme/culling_of_stratholme.h | 68 + .../instance_culling_of_stratholme.cpp | 244 ++++ .../CavernsOfTime/DarkPortal/boss_aeonus.cpp | 145 ++ .../DarkPortal/boss_chrono_lord_deja.cpp | 154 ++ .../CavernsOfTime/DarkPortal/boss_temporus.cpp | 152 ++ .../CavernsOfTime/DarkPortal/dark_portal.cpp | 404 ++++++ .../CavernsOfTime/DarkPortal/dark_portal.h | 35 + .../DarkPortal/instance_dark_portal.cpp | 346 +++++ .../boss_captain_skarloc.cpp | 152 ++ .../EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp | 138 ++ .../boss_leutenant_drake.cpp | 190 +++ .../instance_old_hillsbrad.cpp | 238 ++++ .../EscapeFromDurnholdeKeep/old_hillsbrad.cpp | 658 +++++++++ .../EscapeFromDurnholdeKeep/old_hillsbrad.h | 19 + .../culling_of_stratholme/boss_epoch.cpp | 156 -- .../culling_of_stratholme/boss_infinite.cpp | 88 -- .../culling_of_stratholme/boss_mal_ganis.cpp | 262 ---- .../culling_of_stratholme/boss_meathook.cpp | 140 -- .../culling_of_stratholme/boss_salramm.cpp | 170 --- .../culling_of_stratholme.cpp | 1210 ---------------- .../culling_of_stratholme/culling_of_stratholme.h | 68 - .../instance_culling_of_stratholme.cpp | 244 ---- .../CavernsOfTime/dark_portal/boss_aeonus.cpp | 145 -- .../dark_portal/boss_chrono_lord_deja.cpp | 154 -- .../CavernsOfTime/dark_portal/boss_temporus.cpp | 152 -- .../CavernsOfTime/dark_portal/dark_portal.cpp | 404 ------ .../CavernsOfTime/dark_portal/dark_portal.h | 35 - .../dark_portal/instance_dark_portal.cpp | 346 ----- .../CavernsOfTime/hyjal/boss_anetheron.cpp | 309 ---- .../CavernsOfTime/hyjal/boss_archimonde.cpp | 635 --------- .../Kalimdor/CavernsOfTime/hyjal/boss_azgalor.cpp | 285 ---- .../Kalimdor/CavernsOfTime/hyjal/boss_kazrogal.cpp | 197 --- .../CavernsOfTime/hyjal/boss_rage_winterchill.cpp | 192 --- .../scripts/Kalimdor/CavernsOfTime/hyjal/hyjal.cpp | 247 ---- .../scripts/Kalimdor/CavernsOfTime/hyjal/hyjal.h | 38 - .../Kalimdor/CavernsOfTime/hyjal/hyjalAI.cpp | 1157 --------------- .../scripts/Kalimdor/CavernsOfTime/hyjal/hyjalAI.h | 248 ---- .../Kalimdor/CavernsOfTime/hyjal/hyjal_trash.cpp | 1440 ------------------- .../Kalimdor/CavernsOfTime/hyjal/hyjal_trash.h | 35 - .../CavernsOfTime/hyjal/instance_hyjal.cpp | 324 ----- .../old_hillsbrad/boss_captain_skarloc.cpp | 152 -- .../old_hillsbrad/boss_epoch_hunter.cpp | 138 -- .../old_hillsbrad/boss_leutenant_drake.cpp | 190 --- .../old_hillsbrad/instance_old_hillsbrad.cpp | 238 ---- .../CavernsOfTime/old_hillsbrad/old_hillsbrad.cpp | 658 --------- .../CavernsOfTime/old_hillsbrad/old_hillsbrad.h | 19 - .../Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h | 38 + .../AzjolNerub/AzjolNerub/boss_anubarak.cpp | 360 +++++ .../AzjolNerub/AzjolNerub/boss_hadronox.cpp | 206 +++ .../AzjolNerub/boss_krikthir_the_gatewatcher.cpp | 553 ++++++++ .../AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp | 215 +++ .../Northrend/AzjolNerub/azjol_nerub/azjol_nerub.h | 38 - .../AzjolNerub/azjol_nerub/boss_anubarak.cpp | 360 ----- .../AzjolNerub/azjol_nerub/boss_hadronox.cpp | 206 --- .../azjol_nerub/boss_krikthir_the_gatewatcher.cpp | 553 -------- .../azjol_nerub/instance_azjol_nerub.cpp | 215 --- .../TrialOfTheChampion/boss_argent_challenge.cpp | 512 +++++++ .../TrialOfTheChampion/boss_black_knight.cpp | 373 +++++ .../TrialOfTheChampion/boss_grand_champions.cpp | 993 +++++++++++++ .../instance_trial_of_the_champion.cpp | 340 +++++ .../TrialOfTheChampion/trial_of_the_champion.cpp | 512 +++++++ .../TrialOfTheChampion/trial_of_the_champion.h | 115 ++ .../boss_argent_challenge.cpp | 512 ------- .../trial_of_the_champion/boss_black_knight.cpp | 373 ----- .../trial_of_the_champion/boss_grand_champions.cpp | 993 ------------- .../instance_trial_of_the_champion.cpp | 340 ----- .../trial_of_the_champion.cpp | 512 ------- .../trial_of_the_champion/trial_of_the_champion.h | 115 -- .../FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp | 263 ++++ .../ForgeOfSouls/boss_devourer_of_souls.cpp | 349 +++++ .../FrozenHalls/ForgeOfSouls/forge_of_souls.cpp | 899 ++++++++++++ .../FrozenHalls/ForgeOfSouls/forge_of_souls.h | 52 + .../ForgeOfSouls/instance_forge_of_souls.cpp | 168 +++ .../FrozenHalls/HallsOfReflection/boss_falric.cpp | 142 ++ .../FrozenHalls/HallsOfReflection/boss_marwyn.cpp | 133 ++ .../HallsOfReflection/halls_of_reflection.cpp | 1022 +++++++++++++ .../HallsOfReflection/halls_of_reflection.h | 156 ++ .../instance_halls_of_reflection.cpp | 431 ++++++ .../PitOfSaron/boss_forgemaster_garfrost.cpp | 209 +++ .../FrozenHalls/PitOfSaron/boss_krickandick.cpp | 482 +++++++ .../PitOfSaron/boss_scourgelord_tyrannus.cpp | 273 ++++ .../PitOfSaron/instance_pit_of_saron.cpp | 236 +++ .../FrozenHalls/PitOfSaron/pit_of_saron.cpp | 1101 ++++++++++++++ .../FrozenHalls/PitOfSaron/pit_of_saron.h | 63 + .../FrozenHalls/forge_of_souls/boss_bronjahm.cpp | 263 ---- .../forge_of_souls/boss_devourer_of_souls.cpp | 349 ----- .../FrozenHalls/forge_of_souls/forge_of_souls.cpp | 899 ------------ .../FrozenHalls/forge_of_souls/forge_of_souls.h | 52 - .../forge_of_souls/instance_forge_of_souls.cpp | 168 --- .../halls_of_reflection/boss_falric.cpp | 142 -- .../halls_of_reflection/boss_marwyn.cpp | 133 -- .../halls_of_reflection/halls_of_reflection.cpp | 1022 ------------- .../halls_of_reflection/halls_of_reflection.h | 156 -- .../instance_halls_of_reflection.cpp | 431 ------ .../pit_of_saron/boss_forgemaster_garfrost.cpp | 209 --- .../FrozenHalls/pit_of_saron/boss_krickandick.cpp | 482 ------- .../pit_of_saron/boss_scourgelord_tyrannus.cpp | 273 ---- .../pit_of_saron/instance_pit_of_saron.cpp | 236 --- .../FrozenHalls/pit_of_saron/pit_of_saron.cpp | 1101 -------------- .../FrozenHalls/pit_of_saron/pit_of_saron.h | 63 - .../Northrend/Nexus/EyeOfEternity/boss_malygos.cpp | 175 +++ .../Nexus/EyeOfEternity/eye_of_eternity.h | 4 + .../EyeOfEternity/instance_eye_of_eternity.cpp | 21 + .../Northrend/Nexus/Nexus/boss_anomalus.cpp | 253 ++++ .../Northrend/Nexus/Nexus/boss_keristrasza.cpp | 247 ++++ .../Northrend/Nexus/Nexus/boss_magus_telestra.cpp | 327 +++++ .../scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp | 298 ++++ .../Northrend/Nexus/Nexus/commander_kolurg.cpp | 58 + .../Northrend/Nexus/Nexus/commander_stoutbeard.cpp | 64 + .../Northrend/Nexus/Nexus/instance_nexus.cpp | 259 ++++ src/server/scripts/Northrend/Nexus/Nexus/nexus.h | 35 + .../scripts/Northrend/Nexus/Oculus/boss_drakos.cpp | 218 +++ .../scripts/Northrend/Nexus/Oculus/boss_eregos.cpp | 129 ++ .../scripts/Northrend/Nexus/Oculus/boss_urom.cpp | 356 +++++ .../scripts/Northrend/Nexus/Oculus/boss_varos.cpp | 105 ++ .../Northrend/Nexus/Oculus/instance_oculus.cpp | 205 +++ .../scripts/Northrend/Nexus/Oculus/oculus.cpp | 174 +++ src/server/scripts/Northrend/Nexus/Oculus/oculus.h | 34 + .../TheNexus/eye_of_eternity/boss_malygos.cpp | 175 --- .../TheNexus/eye_of_eternity/eye_of_eternity.h | 4 - .../eye_of_eternity/instance_eye_of_eternity.cpp | 21 - .../Northrend/TheNexus/nexus/boss_anomalus.cpp | 253 ---- .../Northrend/TheNexus/nexus/boss_keristrasza.cpp | 247 ---- .../TheNexus/nexus/boss_magus_telestra.cpp | 327 ----- .../Northrend/TheNexus/nexus/boss_ormorok.cpp | 298 ---- .../Northrend/TheNexus/nexus/commander_kolurg.cpp | 58 - .../TheNexus/nexus/commander_stoutbeard.cpp | 64 - .../Northrend/TheNexus/nexus/instance_nexus.cpp | 259 ---- .../scripts/Northrend/TheNexus/nexus/nexus.h | 35 - .../Northrend/TheNexus/oculus/boss_drakos.cpp | 218 --- .../Northrend/TheNexus/oculus/boss_eregos.cpp | 129 -- .../Northrend/TheNexus/oculus/boss_urom.cpp | 356 ----- .../Northrend/TheNexus/oculus/boss_varos.cpp | 105 -- .../Northrend/TheNexus/oculus/instance_oculus.cpp | 205 --- .../scripts/Northrend/TheNexus/oculus/oculus.cpp | 174 --- .../scripts/Northrend/TheNexus/oculus/oculus.h | 34 - .../Ulduar/HallsOfLightning/boss_bjarngrim.cpp | 432 ++++++ .../Ulduar/HallsOfLightning/boss_ionar.cpp | 388 +++++ .../Ulduar/HallsOfLightning/boss_loken.cpp | 222 +++ .../Ulduar/HallsOfLightning/boss_volkhan.cpp | 478 +++++++ .../Ulduar/HallsOfLightning/halls_of_lightning.h | 34 + .../instance_halls_of_lightning.cpp | 248 ++++ .../Ulduar/HallsOfStone/boss_krystallus.cpp | 148 ++ .../Ulduar/HallsOfStone/boss_maiden_of_grief.cpp | 166 +++ .../Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp | 300 ++++ .../Ulduar/HallsOfStone/halls_of_stone.cpp | 724 ++++++++++ .../Northrend/Ulduar/HallsOfStone/halls_of_stone.h | 48 + .../HallsOfStone/instance_halls_of_stone.cpp | 254 ++++ .../Ulduar/halls_of_lightning/boss_bjarngrim.cpp | 432 ------ .../Ulduar/halls_of_lightning/boss_ionar.cpp | 388 ----- .../Ulduar/halls_of_lightning/boss_loken.cpp | 222 --- .../Ulduar/halls_of_lightning/boss_volkhan.cpp | 478 ------- .../Ulduar/halls_of_lightning/halls_of_lightning.h | 34 - .../instance_halls_of_lightning.cpp | 248 ---- .../Ulduar/halls_of_stone/boss_krystallus.cpp | 148 -- .../Ulduar/halls_of_stone/boss_maiden_of_grief.cpp | 166 --- .../Ulduar/halls_of_stone/boss_sjonnir.cpp | 300 ---- .../Ulduar/halls_of_stone/halls_of_stone.cpp | 724 ---------- .../Ulduar/halls_of_stone/halls_of_stone.h | 48 - .../halls_of_stone/instance_halls_of_stone.cpp | 254 ---- .../UtgardeKeep/boss_ingvar_the_plunderer.cpp | 442 ++++++ .../UtgardeKeep/UtgardeKeep/boss_keleseth.cpp | 361 +++++ .../UtgardeKeep/boss_skarvald_dalronn.cpp | 389 +++++ .../UtgardeKeep/instance_utgarde_keep.cpp | 312 ++++ .../UtgardeKeep/UtgardeKeep/utgarde_keep.cpp | 160 +++ .../UtgardeKeep/UtgardeKeep/utgarde_keep.h | 35 + .../UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp | 830 +++++++++++ .../UtgardeKeep/UtgardePinnacle/boss_skadi.cpp | 477 +++++++ .../UtgardeKeep/UtgardePinnacle/boss_svala.cpp | 408 ++++++ .../UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp | 367 +++++ .../UtgardePinnacle/instance_pinnacle.cpp | 241 ++++ .../UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h | 42 + .../utgarde_keep/boss_ingvar_the_plunderer.cpp | 442 ------ .../UtgardeKeep/utgarde_keep/boss_keleseth.cpp | 361 ----- .../utgarde_keep/boss_skarvald_dalronn.cpp | 389 ----- .../utgarde_keep/instance_utgarde_keep.cpp | 312 ---- .../UtgardeKeep/utgarde_keep/utgarde_keep.cpp | 160 --- .../UtgardeKeep/utgarde_keep/utgarde_keep.h | 35 - .../UtgardeKeep/utgarde_pinnacle/boss_palehoof.cpp | 830 ----------- .../UtgardeKeep/utgarde_pinnacle/boss_skadi.cpp | 477 ------- .../UtgardeKeep/utgarde_pinnacle/boss_svala.cpp | 408 ------ .../UtgardeKeep/utgarde_pinnacle/boss_ymiron.cpp | 367 ----- .../utgarde_pinnacle/instance_pinnacle.cpp | 241 ---- .../utgarde_pinnacle/utgarde_pinnacle.h | 42 - .../AuchenaiCrypts/boss_exarch_maladaar.cpp | 348 +++++ .../boss_shirrak_the_dead_watcher.cpp | 211 +++ .../ManaTombs/boss_nexusprince_shaffar.cpp | 358 +++++ .../Auchindoun/ManaTombs/boss_pandemonius.cpp | 126 ++ .../SethekkHalls/boss_darkweaver_syth.cpp | 414 ++++++ .../SethekkHalls/boss_tailonking_ikiss.cpp | 213 +++ .../SethekkHalls/instance_sethekk_halls.cpp | 91 ++ .../Auchindoun/SethekkHalls/sethekk_halls.h | 14 + .../ShadowLabyrinth/boss_ambassador_hellmaw.cpp | 206 +++ .../boss_blackheart_the_inciter.cpp | 169 +++ .../ShadowLabyrinth/boss_grandmaster_vorpil.cpp | 313 ++++ .../Auchindoun/ShadowLabyrinth/boss_murmur.cpp | 205 +++ .../ShadowLabyrinth/instance_shadow_labyrinth.cpp | 227 +++ .../Auchindoun/ShadowLabyrinth/shadow_labyrinth.h | 15 + .../auchenai_crypts/boss_exarch_maladaar.cpp | 348 ----- .../boss_shirrak_the_dead_watcher.cpp | 211 --- .../mana_tombs/boss_nexusprince_shaffar.cpp | 358 ----- .../Auchindoun/mana_tombs/boss_pandemonius.cpp | 126 -- .../sethekk_halls/boss_darkweaver_syth.cpp | 414 ------ .../sethekk_halls/boss_tailonking_ikiss.cpp | 213 --- .../sethekk_halls/instance_sethekk_halls.cpp | 91 -- .../Auchindoun/sethekk_halls/sethekk_halls.h | 14 - .../shadow_labyrinth/boss_ambassador_hellmaw.cpp | 206 --- .../boss_blackheart_the_inciter.cpp | 169 --- .../shadow_labyrinth/boss_grandmaster_vorpil.cpp | 313 ---- .../Auchindoun/shadow_labyrinth/boss_murmur.cpp | 205 --- .../shadow_labyrinth/instance_shadow_labyrinth.cpp | 227 --- .../Auchindoun/shadow_labyrinth/shadow_labyrinth.h | 15 - .../SerpentShrine/boss_fathomlord_karathress.cpp | 746 ++++++++++ .../SerpentShrine/boss_hydross_the_unstable.cpp | 379 +++++ .../SerpentShrine/boss_lady_vashj.cpp | 1039 ++++++++++++++ .../SerpentShrine/boss_leotheras_the_blind.cpp | 787 ++++++++++ .../SerpentShrine/boss_lurker_below.cpp | 458 ++++++ .../SerpentShrine/boss_morogrim_tidewalker.cpp | 369 +++++ .../SerpentShrine/instance_serpent_shrine.cpp | 398 ++++++ .../SerpentShrine/serpent_shrine.h | 45 + .../SteamVault/boss_hydromancer_thespia.cpp | 187 +++ .../SteamVault/boss_mekgineer_steamrigger.cpp | 264 ++++ .../SteamVault/boss_warlord_kalithresh.cpp | 204 +++ .../SteamVault/instance_steam_vault.cpp | 231 +++ .../CoilfangReservoir/SteamVault/steam_vault.h | 17 + .../serpent_shrine/boss_fathomlord_karathress.cpp | 746 ---------- .../serpent_shrine/boss_hydross_the_unstable.cpp | 379 ----- .../serpent_shrine/boss_lady_vashj.cpp | 1039 -------------- .../serpent_shrine/boss_leotheras_the_blind.cpp | 787 ---------- .../serpent_shrine/boss_lurker_below.cpp | 458 ------ .../serpent_shrine/boss_morogrim_tidewalker.cpp | 369 ----- .../serpent_shrine/instance_serpent_shrine.cpp | 398 ------ .../serpent_shrine/serpent_shrine.h | 45 - .../steam_vault/boss_hydromancer_thespia.cpp | 187 --- .../steam_vault/boss_mekgineer_steamrigger.cpp | 264 ---- .../steam_vault/boss_warlord_kalithresh.cpp | 204 --- .../steam_vault/instance_steam_vault.cpp | 231 --- .../CoilfangReservoir/steam_vault/steam_vault.h | 17 - .../HellfireCitadel/BloodFurnace/blood_furnace.h | 29 + .../HellfireCitadel/BloodFurnace/boss_broggok.cpp | 131 ++ .../BloodFurnace/boss_kelidan_the_breaker.cpp | 356 +++++ .../BloodFurnace/boss_the_maker.cpp | 152 ++ .../BloodFurnace/instance_blood_furnace.cpp | 232 +++ .../HellfireRamparts/boss_omor_the_unscarred.cpp | 206 +++ .../HellfireRamparts/boss_vazruden_the_herald.cpp | 467 ++++++ .../boss_watchkeeper_gargolmar.cpp | 156 ++ .../HellfireRamparts/hellfire_ramparts.h | 16 + .../instance_hellfire_ramparts.cpp | 84 ++ .../MagtheridonsLair/boss_magtheridon.cpp | 570 ++++++++ .../instance_magtheridons_lair.cpp | 254 ++++ .../MagtheridonsLair/magtheridons_lair.h | 14 + .../ShatteredHalls/boss_nethekurse.cpp | 396 ++++++ .../ShatteredHalls/boss_warbringer_omrogg.cpp | 404 ++++++ .../boss_warchief_kargath_bladefist.cpp | 288 ++++ .../ShatteredHalls/instance_shattered_halls.cpp | 114 ++ .../ShatteredHalls/shattered_halls.h | 14 + .../HellfireCitadel/blood_furnace/blood_furnace.h | 29 - .../HellfireCitadel/blood_furnace/boss_broggok.cpp | 131 -- .../blood_furnace/boss_kelidan_the_breaker.cpp | 356 ----- .../blood_furnace/boss_the_maker.cpp | 152 -- .../blood_furnace/instance_blood_furnace.cpp | 232 --- .../hellfire_ramparts/boss_omor_the_unscarred.cpp | 206 --- .../hellfire_ramparts/boss_vazruden_the_herald.cpp | 467 ------ .../boss_watchkeeper_gargolmar.cpp | 156 -- .../hellfire_ramparts/hellfire_ramparts.h | 16 - .../instance_hellfire_ramparts.cpp | 84 -- .../magtheridons_lair/boss_magtheridon.cpp | 570 -------- .../instance_magtheridons_lair.cpp | 254 ---- .../magtheridons_lair/magtheridons_lair.h | 14 - .../shattered_halls/boss_nethekurse.cpp | 396 ------ .../shattered_halls/boss_warbringer_omrogg.cpp | 404 ------ .../boss_warchief_kargath_bladefist.cpp | 288 ---- .../shattered_halls/instance_shattered_halls.cpp | 114 -- .../shattered_halls/shattered_halls.h | 14 - .../scripts/Outland/TempestKeep/Eye/boss_alar.cpp | 523 +++++++ .../Outland/TempestKeep/Eye/boss_astromancer.cpp | 466 ++++++ .../Outland/TempestKeep/Eye/boss_kaelthas.cpp | 1498 ++++++++++++++++++++ .../Outland/TempestKeep/Eye/boss_void_reaver.cpp | 179 +++ .../Outland/TempestKeep/Eye/instance_the_eye.cpp | 176 +++ .../scripts/Outland/TempestKeep/Eye/the_eye.cpp | 98 ++ .../scripts/Outland/TempestKeep/Eye/the_eye.h | 20 + .../Mechanar/boss_gatewatcher_gyrokill.cpp | 39 + .../Mechanar/boss_gatewatcher_ironhand.cpp | 130 ++ .../Mechanar/boss_nethermancer_sepethrea.cpp | 245 ++++ .../Mechanar/boss_pathaleon_the_calculator.cpp | 246 ++++ .../TempestKeep/Mechanar/instance_mechanar.cpp | 86 ++ .../Outland/TempestKeep/Mechanar/mechanar.h | 6 + .../Outland/TempestKeep/the_eye/boss_alar.cpp | 523 ------- .../TempestKeep/the_eye/boss_astromancer.cpp | 466 ------ .../Outland/TempestKeep/the_eye/boss_kaelthas.cpp | 1498 -------------------- .../TempestKeep/the_eye/boss_void_reaver.cpp | 179 --- .../TempestKeep/the_eye/instance_the_eye.cpp | 176 --- .../Outland/TempestKeep/the_eye/the_eye.cpp | 98 -- .../scripts/Outland/TempestKeep/the_eye/the_eye.h | 20 - .../the_mechanar/boss_gatewatcher_gyrokill.cpp | 39 - .../the_mechanar/boss_gatewatcher_ironhand.cpp | 130 -- .../the_mechanar/boss_nethermancer_sepethrea.cpp | 245 ---- .../the_mechanar/boss_pathaleon_the_calculator.cpp | 246 ---- .../TempestKeep/the_mechanar/instance_mechanar.cpp | 86 -- .../Outland/TempestKeep/the_mechanar/mechanar.h | 6 - 318 files changed, 46369 insertions(+), 46369 deletions(-) create mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp create mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp create mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp create mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp create mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp create mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp create mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h create mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp create mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h create mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp create mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.h create mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp create mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp create mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp create mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp create mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp create mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp create mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp create mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.h create mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp create mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp create mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp create mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp create mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp create mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.h create mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp create mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp create mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp create mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp create mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp create mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp create mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h delete mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/culling_of_stratholme/boss_epoch.cpp delete mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/culling_of_stratholme/boss_infinite.cpp delete mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/culling_of_stratholme/boss_mal_ganis.cpp delete mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/culling_of_stratholme/boss_meathook.cpp delete mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/culling_of_stratholme/boss_salramm.cpp delete mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/culling_of_stratholme/culling_of_stratholme.cpp delete mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/culling_of_stratholme/culling_of_stratholme.h delete mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/culling_of_stratholme/instance_culling_of_stratholme.cpp delete mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/dark_portal/boss_aeonus.cpp delete mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/dark_portal/boss_chrono_lord_deja.cpp delete mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/dark_portal/boss_temporus.cpp delete mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/dark_portal/dark_portal.cpp delete mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/dark_portal/dark_portal.h delete mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/dark_portal/instance_dark_portal.cpp delete mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/hyjal/boss_anetheron.cpp delete mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/hyjal/boss_archimonde.cpp delete mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/hyjal/boss_azgalor.cpp delete mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/hyjal/boss_kazrogal.cpp delete mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/hyjal/boss_rage_winterchill.cpp delete mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/hyjal/hyjal.cpp delete mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/hyjal/hyjal.h delete mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/hyjal/hyjalAI.cpp delete mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/hyjal/hyjalAI.h delete mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/hyjal/hyjal_trash.cpp delete mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/hyjal/hyjal_trash.h delete mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/hyjal/instance_hyjal.cpp delete mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/old_hillsbrad/boss_captain_skarloc.cpp delete mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/old_hillsbrad/boss_epoch_hunter.cpp delete mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/old_hillsbrad/boss_leutenant_drake.cpp delete mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/old_hillsbrad/instance_old_hillsbrad.cpp delete mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/old_hillsbrad/old_hillsbrad.cpp delete mode 100644 src/server/scripts/Kalimdor/CavernsOfTime/old_hillsbrad/old_hillsbrad.h create mode 100644 src/server/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h create mode 100644 src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp create mode 100644 src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp create mode 100644 src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp create mode 100644 src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp delete mode 100644 src/server/scripts/Northrend/AzjolNerub/azjol_nerub/azjol_nerub.h delete mode 100644 src/server/scripts/Northrend/AzjolNerub/azjol_nerub/boss_anubarak.cpp delete mode 100644 src/server/scripts/Northrend/AzjolNerub/azjol_nerub/boss_hadronox.cpp delete mode 100644 src/server/scripts/Northrend/AzjolNerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp delete mode 100644 src/server/scripts/Northrend/AzjolNerub/azjol_nerub/instance_azjol_nerub.cpp create mode 100644 src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp create mode 100644 src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp create mode 100644 src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp create mode 100644 src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp create mode 100644 src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp create mode 100644 src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h delete mode 100644 src/server/scripts/Northrend/CrusadersColiseum/trial_of_the_champion/boss_argent_challenge.cpp delete mode 100644 src/server/scripts/Northrend/CrusadersColiseum/trial_of_the_champion/boss_black_knight.cpp delete mode 100644 src/server/scripts/Northrend/CrusadersColiseum/trial_of_the_champion/boss_grand_champions.cpp delete mode 100644 src/server/scripts/Northrend/CrusadersColiseum/trial_of_the_champion/instance_trial_of_the_champion.cpp delete mode 100644 src/server/scripts/Northrend/CrusadersColiseum/trial_of_the_champion/trial_of_the_champion.cpp delete mode 100644 src/server/scripts/Northrend/CrusadersColiseum/trial_of_the_champion/trial_of_the_champion.h create mode 100644 src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp create mode 100644 src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp create mode 100644 src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp create mode 100644 src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h create mode 100644 src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp create mode 100644 src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp create mode 100644 src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp create mode 100644 src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp create mode 100644 src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h create mode 100644 src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp create mode 100644 src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp create mode 100644 src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp create mode 100644 src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp create mode 100644 src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp create mode 100644 src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp create mode 100644 src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h delete mode 100644 src/server/scripts/Northrend/FrozenHalls/forge_of_souls/boss_bronjahm.cpp delete mode 100644 src/server/scripts/Northrend/FrozenHalls/forge_of_souls/boss_devourer_of_souls.cpp delete mode 100644 src/server/scripts/Northrend/FrozenHalls/forge_of_souls/forge_of_souls.cpp delete mode 100644 src/server/scripts/Northrend/FrozenHalls/forge_of_souls/forge_of_souls.h delete mode 100644 src/server/scripts/Northrend/FrozenHalls/forge_of_souls/instance_forge_of_souls.cpp delete mode 100644 src/server/scripts/Northrend/FrozenHalls/halls_of_reflection/boss_falric.cpp delete mode 100644 src/server/scripts/Northrend/FrozenHalls/halls_of_reflection/boss_marwyn.cpp delete mode 100644 src/server/scripts/Northrend/FrozenHalls/halls_of_reflection/halls_of_reflection.cpp delete mode 100644 src/server/scripts/Northrend/FrozenHalls/halls_of_reflection/halls_of_reflection.h delete mode 100644 src/server/scripts/Northrend/FrozenHalls/halls_of_reflection/instance_halls_of_reflection.cpp delete mode 100644 src/server/scripts/Northrend/FrozenHalls/pit_of_saron/boss_forgemaster_garfrost.cpp delete mode 100644 src/server/scripts/Northrend/FrozenHalls/pit_of_saron/boss_krickandick.cpp delete mode 100644 src/server/scripts/Northrend/FrozenHalls/pit_of_saron/boss_scourgelord_tyrannus.cpp delete mode 100644 src/server/scripts/Northrend/FrozenHalls/pit_of_saron/instance_pit_of_saron.cpp delete mode 100644 src/server/scripts/Northrend/FrozenHalls/pit_of_saron/pit_of_saron.cpp delete mode 100644 src/server/scripts/Northrend/FrozenHalls/pit_of_saron/pit_of_saron.h create mode 100644 src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp create mode 100644 src/server/scripts/Northrend/Nexus/EyeOfEternity/eye_of_eternity.h create mode 100644 src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp create mode 100644 src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp create mode 100644 src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp create mode 100644 src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp create mode 100644 src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp create mode 100644 src/server/scripts/Northrend/Nexus/Nexus/commander_kolurg.cpp create mode 100644 src/server/scripts/Northrend/Nexus/Nexus/commander_stoutbeard.cpp create mode 100644 src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp create mode 100644 src/server/scripts/Northrend/Nexus/Nexus/nexus.h create mode 100644 src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp create mode 100644 src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp create mode 100644 src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp create mode 100644 src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp create mode 100644 src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp create mode 100644 src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp create mode 100644 src/server/scripts/Northrend/Nexus/Oculus/oculus.h delete mode 100644 src/server/scripts/Northrend/TheNexus/eye_of_eternity/boss_malygos.cpp delete mode 100644 src/server/scripts/Northrend/TheNexus/eye_of_eternity/eye_of_eternity.h delete mode 100644 src/server/scripts/Northrend/TheNexus/eye_of_eternity/instance_eye_of_eternity.cpp delete mode 100644 src/server/scripts/Northrend/TheNexus/nexus/boss_anomalus.cpp delete mode 100644 src/server/scripts/Northrend/TheNexus/nexus/boss_keristrasza.cpp delete mode 100644 src/server/scripts/Northrend/TheNexus/nexus/boss_magus_telestra.cpp delete mode 100644 src/server/scripts/Northrend/TheNexus/nexus/boss_ormorok.cpp delete mode 100644 src/server/scripts/Northrend/TheNexus/nexus/commander_kolurg.cpp delete mode 100644 src/server/scripts/Northrend/TheNexus/nexus/commander_stoutbeard.cpp delete mode 100644 src/server/scripts/Northrend/TheNexus/nexus/instance_nexus.cpp delete mode 100644 src/server/scripts/Northrend/TheNexus/nexus/nexus.h delete mode 100644 src/server/scripts/Northrend/TheNexus/oculus/boss_drakos.cpp delete mode 100644 src/server/scripts/Northrend/TheNexus/oculus/boss_eregos.cpp delete mode 100644 src/server/scripts/Northrend/TheNexus/oculus/boss_urom.cpp delete mode 100644 src/server/scripts/Northrend/TheNexus/oculus/boss_varos.cpp delete mode 100644 src/server/scripts/Northrend/TheNexus/oculus/instance_oculus.cpp delete mode 100644 src/server/scripts/Northrend/TheNexus/oculus/oculus.cpp delete mode 100644 src/server/scripts/Northrend/TheNexus/oculus/oculus.h create mode 100644 src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp create mode 100644 src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp create mode 100644 src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp create mode 100644 src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp create mode 100644 src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h create mode 100644 src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp create mode 100644 src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp create mode 100644 src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp create mode 100644 src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp create mode 100644 src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp create mode 100644 src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.h create mode 100644 src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp delete mode 100644 src/server/scripts/Northrend/Ulduar/halls_of_lightning/boss_bjarngrim.cpp delete mode 100644 src/server/scripts/Northrend/Ulduar/halls_of_lightning/boss_ionar.cpp delete mode 100644 src/server/scripts/Northrend/Ulduar/halls_of_lightning/boss_loken.cpp delete mode 100644 src/server/scripts/Northrend/Ulduar/halls_of_lightning/boss_volkhan.cpp delete mode 100644 src/server/scripts/Northrend/Ulduar/halls_of_lightning/halls_of_lightning.h delete mode 100644 src/server/scripts/Northrend/Ulduar/halls_of_lightning/instance_halls_of_lightning.cpp delete mode 100644 src/server/scripts/Northrend/Ulduar/halls_of_stone/boss_krystallus.cpp delete mode 100644 src/server/scripts/Northrend/Ulduar/halls_of_stone/boss_maiden_of_grief.cpp delete mode 100644 src/server/scripts/Northrend/Ulduar/halls_of_stone/boss_sjonnir.cpp delete mode 100644 src/server/scripts/Northrend/Ulduar/halls_of_stone/halls_of_stone.cpp delete mode 100644 src/server/scripts/Northrend/Ulduar/halls_of_stone/halls_of_stone.h delete mode 100644 src/server/scripts/Northrend/Ulduar/halls_of_stone/instance_halls_of_stone.cpp create mode 100644 src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp create mode 100644 src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp create mode 100644 src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp create mode 100644 src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp create mode 100644 src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp create mode 100644 src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h create mode 100644 src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp create mode 100644 src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp create mode 100644 src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp create mode 100644 src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp create mode 100644 src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp create mode 100644 src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h delete mode 100644 src/server/scripts/Northrend/UtgardeKeep/utgarde_keep/boss_ingvar_the_plunderer.cpp delete mode 100644 src/server/scripts/Northrend/UtgardeKeep/utgarde_keep/boss_keleseth.cpp delete mode 100644 src/server/scripts/Northrend/UtgardeKeep/utgarde_keep/boss_skarvald_dalronn.cpp delete mode 100644 src/server/scripts/Northrend/UtgardeKeep/utgarde_keep/instance_utgarde_keep.cpp delete mode 100644 src/server/scripts/Northrend/UtgardeKeep/utgarde_keep/utgarde_keep.cpp delete mode 100644 src/server/scripts/Northrend/UtgardeKeep/utgarde_keep/utgarde_keep.h delete mode 100644 src/server/scripts/Northrend/UtgardeKeep/utgarde_pinnacle/boss_palehoof.cpp delete mode 100644 src/server/scripts/Northrend/UtgardeKeep/utgarde_pinnacle/boss_skadi.cpp delete mode 100644 src/server/scripts/Northrend/UtgardeKeep/utgarde_pinnacle/boss_svala.cpp delete mode 100644 src/server/scripts/Northrend/UtgardeKeep/utgarde_pinnacle/boss_ymiron.cpp delete mode 100644 src/server/scripts/Northrend/UtgardeKeep/utgarde_pinnacle/instance_pinnacle.cpp delete mode 100644 src/server/scripts/Northrend/UtgardeKeep/utgarde_pinnacle/utgarde_pinnacle.h create mode 100644 src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp create mode 100644 src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp create mode 100644 src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp create mode 100644 src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp create mode 100644 src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp create mode 100644 src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp create mode 100644 src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp create mode 100644 src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h create mode 100644 src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp create mode 100644 src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp create mode 100644 src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp create mode 100644 src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp create mode 100644 src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp create mode 100644 src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h delete mode 100644 src/server/scripts/Outland/Auchindoun/auchenai_crypts/boss_exarch_maladaar.cpp delete mode 100644 src/server/scripts/Outland/Auchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp delete mode 100644 src/server/scripts/Outland/Auchindoun/mana_tombs/boss_nexusprince_shaffar.cpp delete mode 100644 src/server/scripts/Outland/Auchindoun/mana_tombs/boss_pandemonius.cpp delete mode 100644 src/server/scripts/Outland/Auchindoun/sethekk_halls/boss_darkweaver_syth.cpp delete mode 100644 src/server/scripts/Outland/Auchindoun/sethekk_halls/boss_tailonking_ikiss.cpp delete mode 100644 src/server/scripts/Outland/Auchindoun/sethekk_halls/instance_sethekk_halls.cpp delete mode 100644 src/server/scripts/Outland/Auchindoun/sethekk_halls/sethekk_halls.h delete mode 100644 src/server/scripts/Outland/Auchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp delete mode 100644 src/server/scripts/Outland/Auchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp delete mode 100644 src/server/scripts/Outland/Auchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp delete mode 100644 src/server/scripts/Outland/Auchindoun/shadow_labyrinth/boss_murmur.cpp delete mode 100644 src/server/scripts/Outland/Auchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp delete mode 100644 src/server/scripts/Outland/Auchindoun/shadow_labyrinth/shadow_labyrinth.h create mode 100644 src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp create mode 100644 src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp create mode 100644 src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp create mode 100644 src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp create mode 100644 src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp create mode 100644 src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp create mode 100644 src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp create mode 100644 src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h create mode 100644 src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp create mode 100644 src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp create mode 100644 src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp create mode 100644 src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp create mode 100644 src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h delete mode 100644 src/server/scripts/Outland/CoilfangReservoir/serpent_shrine/boss_fathomlord_karathress.cpp delete mode 100644 src/server/scripts/Outland/CoilfangReservoir/serpent_shrine/boss_hydross_the_unstable.cpp delete mode 100644 src/server/scripts/Outland/CoilfangReservoir/serpent_shrine/boss_lady_vashj.cpp delete mode 100644 src/server/scripts/Outland/CoilfangReservoir/serpent_shrine/boss_leotheras_the_blind.cpp delete mode 100644 src/server/scripts/Outland/CoilfangReservoir/serpent_shrine/boss_lurker_below.cpp delete mode 100644 src/server/scripts/Outland/CoilfangReservoir/serpent_shrine/boss_morogrim_tidewalker.cpp delete mode 100644 src/server/scripts/Outland/CoilfangReservoir/serpent_shrine/instance_serpent_shrine.cpp delete mode 100644 src/server/scripts/Outland/CoilfangReservoir/serpent_shrine/serpent_shrine.h delete mode 100644 src/server/scripts/Outland/CoilfangReservoir/steam_vault/boss_hydromancer_thespia.cpp delete mode 100644 src/server/scripts/Outland/CoilfangReservoir/steam_vault/boss_mekgineer_steamrigger.cpp delete mode 100644 src/server/scripts/Outland/CoilfangReservoir/steam_vault/boss_warlord_kalithresh.cpp delete mode 100644 src/server/scripts/Outland/CoilfangReservoir/steam_vault/instance_steam_vault.cpp delete mode 100644 src/server/scripts/Outland/CoilfangReservoir/steam_vault/steam_vault.h create mode 100644 src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h create mode 100644 src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp create mode 100644 src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp create mode 100644 src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp create mode 100644 src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp create mode 100644 src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp create mode 100644 src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp create mode 100644 src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp create mode 100644 src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h create mode 100644 src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp create mode 100644 src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp create mode 100644 src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp create mode 100644 src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h create mode 100644 src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp create mode 100644 src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp create mode 100644 src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp create mode 100644 src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp create mode 100644 src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h delete mode 100644 src/server/scripts/Outland/HellfireCitadel/blood_furnace/blood_furnace.h delete mode 100644 src/server/scripts/Outland/HellfireCitadel/blood_furnace/boss_broggok.cpp delete mode 100644 src/server/scripts/Outland/HellfireCitadel/blood_furnace/boss_kelidan_the_breaker.cpp delete mode 100644 src/server/scripts/Outland/HellfireCitadel/blood_furnace/boss_the_maker.cpp delete mode 100644 src/server/scripts/Outland/HellfireCitadel/blood_furnace/instance_blood_furnace.cpp delete mode 100644 src/server/scripts/Outland/HellfireCitadel/hellfire_ramparts/boss_omor_the_unscarred.cpp delete mode 100644 src/server/scripts/Outland/HellfireCitadel/hellfire_ramparts/boss_vazruden_the_herald.cpp delete mode 100644 src/server/scripts/Outland/HellfireCitadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp delete mode 100644 src/server/scripts/Outland/HellfireCitadel/hellfire_ramparts/hellfire_ramparts.h delete mode 100644 src/server/scripts/Outland/HellfireCitadel/hellfire_ramparts/instance_hellfire_ramparts.cpp delete mode 100644 src/server/scripts/Outland/HellfireCitadel/magtheridons_lair/boss_magtheridon.cpp delete mode 100644 src/server/scripts/Outland/HellfireCitadel/magtheridons_lair/instance_magtheridons_lair.cpp delete mode 100644 src/server/scripts/Outland/HellfireCitadel/magtheridons_lair/magtheridons_lair.h delete mode 100644 src/server/scripts/Outland/HellfireCitadel/shattered_halls/boss_nethekurse.cpp delete mode 100644 src/server/scripts/Outland/HellfireCitadel/shattered_halls/boss_warbringer_omrogg.cpp delete mode 100644 src/server/scripts/Outland/HellfireCitadel/shattered_halls/boss_warchief_kargath_bladefist.cpp delete mode 100644 src/server/scripts/Outland/HellfireCitadel/shattered_halls/instance_shattered_halls.cpp delete mode 100644 src/server/scripts/Outland/HellfireCitadel/shattered_halls/shattered_halls.h create mode 100644 src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp create mode 100644 src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp create mode 100644 src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp create mode 100644 src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp create mode 100644 src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp create mode 100644 src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp create mode 100644 src/server/scripts/Outland/TempestKeep/Eye/the_eye.h create mode 100644 src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp create mode 100644 src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp create mode 100644 src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp create mode 100644 src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp create mode 100644 src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp create mode 100644 src/server/scripts/Outland/TempestKeep/Mechanar/mechanar.h delete mode 100644 src/server/scripts/Outland/TempestKeep/the_eye/boss_alar.cpp delete mode 100644 src/server/scripts/Outland/TempestKeep/the_eye/boss_astromancer.cpp delete mode 100644 src/server/scripts/Outland/TempestKeep/the_eye/boss_kaelthas.cpp delete mode 100644 src/server/scripts/Outland/TempestKeep/the_eye/boss_void_reaver.cpp delete mode 100644 src/server/scripts/Outland/TempestKeep/the_eye/instance_the_eye.cpp delete mode 100644 src/server/scripts/Outland/TempestKeep/the_eye/the_eye.cpp delete mode 100644 src/server/scripts/Outland/TempestKeep/the_eye/the_eye.h delete mode 100644 src/server/scripts/Outland/TempestKeep/the_mechanar/boss_gatewatcher_gyrokill.cpp delete mode 100644 src/server/scripts/Outland/TempestKeep/the_mechanar/boss_gatewatcher_ironhand.cpp delete mode 100644 src/server/scripts/Outland/TempestKeep/the_mechanar/boss_nethermancer_sepethrea.cpp delete mode 100644 src/server/scripts/Outland/TempestKeep/the_mechanar/boss_pathaleon_the_calculator.cpp delete mode 100644 src/server/scripts/Outland/TempestKeep/the_mechanar/instance_mechanar.cpp delete mode 100644 src/server/scripts/Outland/TempestKeep/the_mechanar/mechanar.h (limited to 'src') diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp new file mode 100644 index 00000000000..14ce4a59b37 --- /dev/null +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp @@ -0,0 +1,309 @@ + +#include "ScriptedPch.h" +#include "hyjal.h" +#include "hyjal_trash.h" + +#define SPELL_CARRION_SWARM 31306 +#define SPELL_SLEEP 31298 +#define SPELL_VAMPIRIC_AURA 38196 +#define SPELL_INFERNO 31299 + +#define SAY_ONDEATH "The clock... is still... ticking." +#define SOUND_ONDEATH 10982 + +#define SAY_ONSLAY1 "Your hopes are lost!" +#define SAY_ONSLAY2 "Scream for me!" +#define SAY_ONSLAY3 "Pity, no time for a slow death!" +#define SOUND_ONSLAY1 10981 +#define SOUND_ONSLAY2 11038 +#define SOUND_ONSLAY3 11039 + +#define SAY_SWARM1 "The swarm is eager to feed!" +#define SAY_SWARM2 "Pestilence upon you!" +#define SOUND_SWARM1 10979 +#define SOUND_SWARM2 11037 + +#define SAY_SLEEP1 "You look tired..." +#define SAY_SLEEP2 "Sweet dreams..." +#define SOUND_SLEEP1 10978 +#define SOUND_SLEEP2 11545 + +#define SAY_INFERNO1 "Let fire rain from above!" +#define SAY_INFERNO2 "Earth and sky shall burn!" +#define SOUND_INFERNO1 10980 +#define SOUND_INFERNO2 11036 + +#define SAY_ONAGGRO "You are defenders of a doomed world! Flee here, and perhaps you will prolong your pathetic lives!" +#define SOUND_ONAGGRO 10977 + +struct boss_anetheronAI : public hyjal_trashAI +{ + boss_anetheronAI(Creature *c) : hyjal_trashAI(c) + { + pInstance = c->GetInstanceData(); + pGo = false; + pos = 0; + SpellEntry *TempSpell = GET_SPELL(SPELL_SLEEP); + if (TempSpell && TempSpell->EffectImplicitTargetA[0] != 1) + { + TempSpell->EffectImplicitTargetA[0] = 1; + TempSpell->EffectImplicitTargetB[0] = 0; + } + } + + uint32 SwarmTimer; + uint32 SleepTimer; + uint32 AuraTimer; + uint32 InfernoTimer; + bool pGo; + uint32 pos; + + void Reset() + { + damageTaken = 0; + SwarmTimer = 45000; + SleepTimer = 60000; + AuraTimer = 5000; + InfernoTimer = 45000; + + if (pInstance && IsEvent) + pInstance->SetData(DATA_ANETHERONEVENT, NOT_STARTED); + } + + void EnterCombat(Unit * /*who*/) + { + if (pInstance && IsEvent) + pInstance->SetData(DATA_ANETHERONEVENT, IN_PROGRESS); + DoPlaySoundToSet(me, SOUND_ONAGGRO); + me->MonsterYell(SAY_ONAGGRO, LANG_UNIVERSAL, 0); + } + + void KilledUnit(Unit * /*victim*/) + { + switch (urand(0,2)) + { + case 0: + DoPlaySoundToSet(me, SOUND_ONSLAY1); + me->MonsterYell(SAY_ONSLAY1, LANG_UNIVERSAL, 0); + break; + case 1: + DoPlaySoundToSet(me, SOUND_ONSLAY2); + me->MonsterYell(SAY_ONSLAY2, LANG_UNIVERSAL, 0); + break; + case 2: + DoPlaySoundToSet(me, SOUND_ONSLAY3); + me->MonsterYell(SAY_ONSLAY3, LANG_UNIVERSAL, 0); + break; + } + } + + void WaypointReached(uint32 i) + { + pos = i; + if (i == 7 && pInstance) + { + Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); + if (pTarget && pTarget->isAlive()) + me->AddThreat(pTarget,0.0); + } + } + + void JustDied(Unit *victim) + { + hyjal_trashAI::JustDied(victim); + if (pInstance && IsEvent) + pInstance->SetData(DATA_ANETHERONEVENT, DONE); + DoPlaySoundToSet(me, SOUND_ONDEATH); + me->MonsterYell(SAY_ONDEATH, LANG_UNIVERSAL, 0); + } + + void UpdateAI(const uint32 diff) + { + if (IsEvent) + { + //Must update npc_escortAI + npc_escortAI::UpdateAI(diff); + if (!pGo) + { + pGo = true; + if (pInstance) + { + AddWaypoint(0, 4896.08, -1576.35, 1333.65); + AddWaypoint(1, 4898.68, -1615.02, 1329.48); + AddWaypoint(2, 4907.12, -1667.08, 1321.00); + AddWaypoint(3, 4963.18, -1699.35, 1340.51); + AddWaypoint(4, 4989.16, -1716.67, 1335.74); + AddWaypoint(5, 5026.27, -1736.89, 1323.02); + AddWaypoint(6, 5037.77, -1770.56, 1324.36); + AddWaypoint(7, 5067.23, -1789.95, 1321.17); + Start(false, true); + SetDespawnAtEnd(false); + } + } + } + + //Return since we have no target + if (!UpdateVictim()) + return; + + if (SwarmTimer <= diff) + { + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(pTarget, SPELL_CARRION_SWARM); + + SwarmTimer = urand(45000,60000); + switch (urand(0,1)) + { + case 0: + DoPlaySoundToSet(me, SOUND_SWARM1); + me->MonsterYell(SAY_SWARM1, LANG_UNIVERSAL, 0); + break; + case 1: + DoPlaySoundToSet(me, SOUND_SWARM2); + me->MonsterYell(SAY_SWARM2, LANG_UNIVERSAL, 0); + break; + } + } else SwarmTimer -= diff; + + if (SleepTimer <= diff) + { + for (uint8 i = 0; i < 3; ++i) + { + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + pTarget->CastSpell(pTarget,SPELL_SLEEP,true); + } + SleepTimer = 60000; + switch (urand(0,1)) + { + case 0: + DoPlaySoundToSet(me, SOUND_SLEEP1); + me->MonsterYell(SAY_SLEEP1, LANG_UNIVERSAL, 0); + break; + case 1: + DoPlaySoundToSet(me, SOUND_SLEEP2); + me->MonsterYell(SAY_SLEEP2, LANG_UNIVERSAL, 0); + break; + } + } else SleepTimer -= diff; + if (AuraTimer <= diff) + { + DoCast(me, SPELL_VAMPIRIC_AURA, true); + AuraTimer = urand(10000,20000); + } else AuraTimer -= diff; + if (InfernoTimer <= diff) + { + DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true), SPELL_INFERNO); + InfernoTimer = 45000; + switch (urand(0,1)) + { + case 0: + DoPlaySoundToSet(me, SOUND_INFERNO1); + me->MonsterYell(SAY_INFERNO1, LANG_UNIVERSAL, 0); + break; + case 1: + DoPlaySoundToSet(me, SOUND_INFERNO2); + me->MonsterYell(SAY_INFERNO2, LANG_UNIVERSAL, 0); + break; + } + } else InfernoTimer -= diff; + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_boss_anetheron(Creature* pCreature) +{ + return new boss_anetheronAI (pCreature); +} + +#define SPELL_IMMOLATION 31303 +#define SPELL_INFERNO_EFFECT 31302 + +struct mob_towering_infernalAI : public ScriptedAI +{ + mob_towering_infernalAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + if (pInstance) + AnetheronGUID = pInstance->GetData64(DATA_ANETHERON); + } + + uint32 ImmolationTimer; + uint32 CheckTimer; + uint64 AnetheronGUID; + ScriptedInstance* pInstance; + + void Reset() + { + DoCast(me, SPELL_INFERNO_EFFECT); + ImmolationTimer = 5000; + CheckTimer = 5000; + } + + void EnterCombat(Unit * /*who*/) + { + } + + void KilledUnit(Unit * /*victim*/) + { + } + + void JustDied(Unit * /*victim*/) + { + } + + void MoveInLineOfSight(Unit *who) + { + if (me->IsWithinDist(who, 50) && !me->isInCombat() && me->IsHostileTo(who)) + AttackStart(who); + } + + void UpdateAI(const uint32 diff) + { + if (CheckTimer <= diff) + { + if (AnetheronGUID) + { + Creature* boss = Unit::GetCreature((*me),AnetheronGUID); + if (!boss || (boss && boss->isDead())) + { + me->setDeathState(JUST_DIED); + me->RemoveCorpse(); + return; + } + } + CheckTimer = 5000; + } else CheckTimer -= diff; + + //Return since we have no target + if (!UpdateVictim()) + return; + + if (ImmolationTimer <= diff) + { + DoCast(me, SPELL_IMMOLATION); + ImmolationTimer = 5000; + } else ImmolationTimer -= diff; + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_mob_towering_infernal(Creature* pCreature) +{ + return new mob_towering_infernalAI (pCreature); +} + +void AddSC_boss_anetheron() +{ + Script *newscript; + newscript = new Script; + newscript->Name = "boss_anetheron"; + newscript->GetAI = &GetAI_boss_anetheron; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_towering_infernal"; + newscript->GetAI = &GetAI_mob_towering_infernal; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp new file mode 100644 index 00000000000..8e1fa378e07 --- /dev/null +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp @@ -0,0 +1,635 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Boss_Archimonde +SD%Complete: 85 +SDComment: Doomfires not completely offlike due to core limitations for random moving. Tyrande and second phase not fully implemented. +SDCategory: Caverns of Time, Mount Hyjal +EndScriptData */ + +#include "ScriptedPch.h" +#include "hyjal.h" +#include "SpellAuras.h" +#include "hyjal_trash.h" + +//text id -1534018 are the text used when previous events complete. Not part of this script. +#define SAY_AGGRO -1534019 +#define SAY_DOOMFIRE1 -1534020 +#define SAY_DOOMFIRE2 -1534021 +#define SAY_AIR_BURST1 -1534022 +#define SAY_AIR_BURST2 -1534023 +#define SAY_SLAY1 -1534024 +#define SAY_SLAY2 -1534025 +#define SAY_SLAY3 -1534026 +#define SAY_ENRAGE -1534027 +#define SAY_DEATH -1534028 +#define SAY_SOUL_CHARGE1 -1534029 +#define SAY_SOUL_CHARGE2 -1534030 + +#define SPELL_DENOUEMENT_WISP 32124 +#define SPELL_ANCIENT_SPARK 39349 +#define SPELL_PROTECTION_OF_ELUNE 38528 + +#define SPELL_DRAIN_WORLD_TREE 39140 +#define SPELL_DRAIN_WORLD_TREE_2 39141 + +#define SPELL_FINGER_OF_DEATH 31984 +#define SPELL_HAND_OF_DEATH 35354 +#define SPELL_AIR_BURST 32014 +#define SPELL_GRIP_OF_THE_LEGION 31972 +#define SPELL_DOOMFIRE_STRIKE 31903 //summons two creatures +#define SPELL_DOOMFIRE_SPAWN 32074 +#define SPELL_DOOMFIRE 31945 +#define SPELL_SOUL_CHARGE_YELLOW 32045 +#define SPELL_SOUL_CHARGE_GREEN 32051 +#define SPELL_SOUL_CHARGE_RED 32052 +#define SPELL_UNLEASH_SOUL_YELLOW 32054 +#define SPELL_UNLEASH_SOUL_GREEN 32057 +#define SPELL_UNLEASH_SOUL_RED 32053 +#define SPELL_FEAR 31970 + +#define CREATURE_ARCHIMONDE 17968 +#define CREATURE_DOOMFIRE 18095 +#define CREATURE_DOOMFIRE_SPIRIT 18104 +#define CREATURE_ANCIENT_WISP 17946 +#define CREATURE_CHANNEL_TARGET 22418 + +#define NORDRASSIL_X 5503.713 +#define NORDRASSIL_Y -3523.436 +#define NORDRASSIL_Z 1608.781 + +struct mob_ancient_wispAI : public ScriptedAI +{ + mob_ancient_wispAI(Creature* c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + ArchimondeGUID = 0; + } + + ScriptedInstance* pInstance; + uint64 ArchimondeGUID; + uint32 CheckTimer; + + void Reset() + { + CheckTimer = 1000; + + if (pInstance) + ArchimondeGUID = pInstance->GetData64(DATA_ARCHIMONDE); + + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + } + + void EnterCombat(Unit* /*who*/) {} + + void DamageTaken(Unit* /*done_by*/, uint32 &damage) { damage = 0; } + + void UpdateAI(const uint32 diff) + { + if (CheckTimer <= diff) + { + if (Unit* Archimonde = Unit::GetUnit((*me), ArchimondeGUID)) + { + if ((((Archimonde->GetHealth()*100) / Archimonde->GetMaxHealth()) < 2) || !Archimonde->isAlive()) + DoCast(me, SPELL_DENOUEMENT_WISP); + else + DoCast(Archimonde, SPELL_ANCIENT_SPARK); + } + CheckTimer = 1000; + } else CheckTimer -= diff; + } +}; + +/* This script is merely a placeholder for the Doomfire that triggers Doomfire spell. It will + MoveChase the Doomfire Spirit always, until despawn (AttackStart is called upon it's spawn) */ +struct mob_doomfireAI : public ScriptedAI +{ + mob_doomfireAI(Creature* c) : ScriptedAI(c) {} + + void Reset() { } + + void MoveInLineOfSight(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) {} + void DamageTaken(Unit * /*done_by*/, uint32 &damage) { damage = 0; } +}; + +/* This is the script for the Doomfire Spirit Mob. This mob simply follow players or + travels in random directions if pTarget cannot be found. */ +struct mob_doomfire_targettingAI : public ScriptedAI +{ + mob_doomfire_targettingAI(Creature* c) : ScriptedAI(c) {} + + uint64 TargetGUID; + uint32 ChangeTargetTimer; + + void Reset() + { + TargetGUID = 0; + ChangeTargetTimer = 5000; + } + + void MoveInLineOfSight(Unit* who) + { + //will update once TargetGUID is 0. In case noone actually moves(not likely) and this is 0 + //when UpdateAI needs it, it will be forced to select randomPoint + if (!TargetGUID && who->GetTypeId() == TYPEID_PLAYER) + TargetGUID = who->GetGUID(); + } + + void EnterCombat(Unit* /*who*/) {} + + void DamageTaken(Unit * /*done_by*/, uint32 &damage) { damage = 0; } + + void UpdateAI(const uint32 diff) + { + if (ChangeTargetTimer <= diff) + { + if (Unit *temp = Unit::GetUnit(*me,TargetGUID)) + { + me->GetMotionMaster()->MoveFollow(temp,0.0f,0.0f); + TargetGUID = 0; + } + else + { + Position pos; + me->GetRandomNearPosition(pos, 40); + me->GetMotionMaster()->MovePoint(0, pos.m_positionX, pos.m_positionY, pos.m_positionZ); + } + + ChangeTargetTimer = 5000; + } else ChangeTargetTimer -= diff; + } +}; + +/* Finally, Archimonde's script. His script isn't extremely complex, most are simply spells on timers. + The only complicated aspect of the battle is Finger of Death and Doomfire, with Doomfire being the + hardest bit to code. Finger of Death is simply a distance check - if no one is in melee range, then + select a random pTarget and cast the spell on them. However, if someone IS in melee range, and this + is NOT the main tank (creature's victim), then we aggro that player and they become the new victim. + For Doomfire, we summon a mob (Doomfire Spirit) for the Doomfire mob to follow. It's spirit will + randomly select it's pTarget to follow and then we create the random movement making it unpredictable. */ + +struct boss_archimondeAI : public hyjal_trashAI +{ + boss_archimondeAI(Creature *c) : hyjal_trashAI(c) + { + pInstance = c->GetInstanceData(); + } + + ScriptedInstance* pInstance; + + uint64 DoomfireSpiritGUID; + uint64 WorldTreeGUID; + + uint32 DrainNordrassilTimer; + uint32 FearTimer; + uint32 AirBurstTimer; + uint32 GripOfTheLegionTimer; + uint32 DoomfireTimer; + uint32 SoulChargeTimer; + uint32 SoulChargeCount; + uint32 MeleeRangeCheckTimer; + uint32 HandOfDeathTimer; + uint32 SummonWispTimer; + uint32 WispCount; + uint32 EnrageTimer; + uint32 CheckDistanceTimer; + + bool Enraged; + bool BelowTenPercent; + bool HasProtected; + bool IsChanneling; + + void Reset() + { + if (pInstance) + pInstance->SetData(DATA_ARCHIMONDEEVENT, NOT_STARTED); + + DoomfireSpiritGUID = 0; + damageTaken = 0; + WorldTreeGUID = 0; + + DrainNordrassilTimer = 0; + FearTimer = 42000; + AirBurstTimer = 30000; + GripOfTheLegionTimer = urand(5000,25000); + DoomfireTimer = 20000; + SoulChargeTimer = urand(2000,30000); + SoulChargeCount = 0; + MeleeRangeCheckTimer = 15000; + HandOfDeathTimer = 2000; + WispCount = 0; // When ~30 wisps are summoned, Archimonde dies + EnrageTimer = 600000; // 10 minutes + CheckDistanceTimer = 30000; // This checks if he's too close to the World Tree (75 yards from a point on the tree), if true then he will enrage + SummonWispTimer = 0; + + Enraged = false; + BelowTenPercent = false; + HasProtected = false; + IsChanneling = false; + } + + void EnterCombat(Unit * /*who*/) + { + me->InterruptSpell(CURRENT_CHANNELED_SPELL); + DoScriptText(SAY_AGGRO, me); + DoZoneInCombat(); + + if (pInstance) + pInstance->SetData(DATA_ARCHIMONDEEVENT, IN_PROGRESS); + } + + void KilledUnit(Unit * victim) + { + DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2,SAY_SLAY3), me); + + if (victim && (victim->GetTypeId() == TYPEID_PLAYER)) + GainSoulCharge(CAST_PLR(victim)); + } + + void GainSoulCharge(Player* victim) + { + switch(victim->getClass()) + { + case CLASS_PRIEST: + case CLASS_PALADIN: + case CLASS_WARLOCK: + victim->CastSpell(me, SPELL_SOUL_CHARGE_RED, true); + break; + case CLASS_MAGE: + case CLASS_ROGUE: + case CLASS_WARRIOR: + victim->CastSpell(me, SPELL_SOUL_CHARGE_YELLOW, true); + break; + case CLASS_DRUID: + case CLASS_SHAMAN: + case CLASS_HUNTER: + victim->CastSpell(me, SPELL_SOUL_CHARGE_GREEN, true); + break; + } + + SoulChargeTimer = urand(2000,30000); + ++SoulChargeCount; + } + + void JustDied(Unit *victim) + { + hyjal_trashAI::JustDied(victim); + DoScriptText(SAY_DEATH, me); + + if (pInstance) + pInstance->SetData(DATA_ARCHIMONDEEVENT, DONE); + } + + bool CanUseFingerOfDeath() + { + // First we check if our current victim is in melee range or not. + Unit* victim = me->getVictim(); + if (victim && me->IsWithinDistInMap(victim, me->GetAttackDistance(victim))) + return false; + + std::list& m_threatlist = me->getThreatManager().getThreatList(); + if (m_threatlist.empty()) + return false; + + std::list targets; + std::list::const_iterator itr = m_threatlist.begin(); + for (; itr != m_threatlist.end(); ++itr) + { + Unit* pUnit = Unit::GetUnit((*me), (*itr)->getUnitGuid()); + if (pUnit && pUnit->isAlive()) + targets.push_back(pUnit); + } + + if (targets.empty()) + return false; + + targets.sort(Trinity::ObjectDistanceOrderPred(me)); + Unit *pTarget = targets.front(); + if (pTarget) + { + if (!me->IsWithinDistInMap(pTarget, me->GetAttackDistance(pTarget))) + return true; // Cast Finger of Death + else // This target is closest, he is our new tank + me->AddThreat(pTarget, me->getThreatManager().getThreat(me->getVictim())); + } + + return false; + } + + void JustSummoned(Creature *summoned) + { + if (summoned->GetEntry() == CREATURE_ANCIENT_WISP) + summoned->AI()->AttackStart(me); + else + { + summoned->setFaction(me->getFaction()); + summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + } + + if (summoned->GetEntry() == CREATURE_DOOMFIRE_SPIRIT) + { + DoomfireSpiritGUID = summoned->GetGUID(); + } + + if (summoned->GetEntry() == CREATURE_DOOMFIRE) + { + summoned->CastSpell(summoned,SPELL_DOOMFIRE_SPAWN,false); + summoned->CastSpell(summoned,SPELL_DOOMFIRE,true,0,0,me->GetGUID()); + + if (Unit *DoomfireSpirit = Unit::GetUnit(*me, DoomfireSpiritGUID)) + { + summoned->GetMotionMaster()->MoveFollow(DoomfireSpirit,0.0f,0.0f); + DoomfireSpiritGUID = 0; + } + } + } + + //this is code doing close to what the summoning spell would do (spell 31903) + void SummonDoomfire(Unit *pTarget) + { + me->SummonCreature(CREATURE_DOOMFIRE_SPIRIT, + pTarget->GetPositionX()+15.0,pTarget->GetPositionY()+15.0,pTarget->GetPositionZ(),0, + TEMPSUMMON_TIMED_DESPAWN, 27000); + + me->SummonCreature(CREATURE_DOOMFIRE, + pTarget->GetPositionX()-15.0,pTarget->GetPositionY()-15.0,pTarget->GetPositionZ(),0, + TEMPSUMMON_TIMED_DESPAWN, 27000); + } + + void UnleashSoulCharge() + { + me->InterruptNonMeleeSpells(false); + + bool HasCast = false; + uint32 chargeSpell = 0; + uint32 unleashSpell = 0; + + switch (urand(0,2)) + { + case 0: + chargeSpell = SPELL_SOUL_CHARGE_RED; + unleashSpell = SPELL_UNLEASH_SOUL_RED; + break; + case 1: + chargeSpell = SPELL_SOUL_CHARGE_YELLOW; + unleashSpell = SPELL_UNLEASH_SOUL_YELLOW; + break; + case 2: + chargeSpell = SPELL_SOUL_CHARGE_GREEN; + unleashSpell = SPELL_UNLEASH_SOUL_GREEN; + break; + } + + if (me->HasAura(chargeSpell)) + { + me->RemoveAuraFromStack(chargeSpell); + DoCast(me->getVictim(), unleashSpell); + HasCast = true; + SoulChargeCount--; + } + + if (HasCast) + SoulChargeTimer = urand(2000,30000); + } + + void UpdateAI(const uint32 diff) + { + if (!me->isInCombat()) + { + if (pInstance) + { + // Do not let the raid skip straight to Archimonde. Visible and hostile ONLY if Azagalor is finished. + if ((pInstance->GetData(DATA_AZGALOREVENT) < DONE) && ((me->GetVisibility() != VISIBILITY_OFF) || (me->getFaction() != 35))) + { + me->SetVisibility(VISIBILITY_OFF); + me->setFaction(35); + } + else if ((pInstance->GetData(DATA_AZGALOREVENT) >= DONE) && ((me->GetVisibility() != VISIBILITY_ON) || (me->getFaction() == 35))) + { + me->setFaction(1720); + me->SetVisibility(VISIBILITY_ON); + } + } + + if (DrainNordrassilTimer <= diff) + { + if (!IsChanneling) + { + Creature *temp = me->SummonCreature(CREATURE_CHANNEL_TARGET, NORDRASSIL_X, NORDRASSIL_Y, NORDRASSIL_Z, 0, TEMPSUMMON_TIMED_DESPAWN, 1200000); + + if (temp) + WorldTreeGUID = temp->GetGUID(); + + if (Unit *Nordrassil = Unit::GetUnit(*me, WorldTreeGUID)) + { + Nordrassil->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + Nordrassil->SetDisplayId(11686); + DoCast(Nordrassil, SPELL_DRAIN_WORLD_TREE); + IsChanneling = true; + } + } + + if (Unit *Nordrassil = Unit::GetUnit(*me, WorldTreeGUID)) + { + Nordrassil->CastSpell(me, SPELL_DRAIN_WORLD_TREE_2, true); + DrainNordrassilTimer = 1000; + } + } else DrainNordrassilTimer -= diff; + } + + if (!UpdateVictim()) + return; + + if (((me->GetHealth()*100 / me->GetMaxHealth()) < 10) && !BelowTenPercent && !Enraged) + BelowTenPercent = true; + + if (!Enraged) + { + if (EnrageTimer <= diff) + { + if ((me->GetHealth()*100 / me->GetMaxHealth()) > 10) + { + me->GetMotionMaster()->Clear(false); + me->GetMotionMaster()->MoveIdle(); + Enraged = true; + DoScriptText(SAY_ENRAGE, me); + } + } else EnrageTimer -= diff; + + if (CheckDistanceTimer <= diff) + { + // To simplify the check, we simply summon a Creature in the location and then check how far we are from the creature + Creature* Check = me->SummonCreature(CREATURE_CHANNEL_TARGET, NORDRASSIL_X, NORDRASSIL_Y, NORDRASSIL_Z, 0, TEMPSUMMON_TIMED_DESPAWN, 2000); + if (Check) + { + Check->SetVisibility(VISIBILITY_OFF); + + if (me->IsWithinDistInMap(Check, 75)) + { + me->GetMotionMaster()->Clear(false); + me->GetMotionMaster()->MoveIdle(); + Enraged = true; + DoScriptText(SAY_ENRAGE, me); + } + } + CheckDistanceTimer = 5000; + } else CheckDistanceTimer -= diff; + } + + if (BelowTenPercent) + { + if (!HasProtected) + { + me->GetMotionMaster()->Clear(false); + me->GetMotionMaster()->MoveIdle(); + + //all members of raid must get this buff + DoCast(me->getVictim(), SPELL_PROTECTION_OF_ELUNE); + HasProtected = true; + Enraged = true; + } + + if (SummonWispTimer <= diff) + { + DoSpawnCreature(CREATURE_ANCIENT_WISP, rand()%40, rand()%40, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + SummonWispTimer = 1500; + ++WispCount; + } else SummonWispTimer -= diff; + + if (WispCount >= 30) + me->DealDamage(me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); + } + + if (Enraged) + { + if (HandOfDeathTimer <= diff) + { + DoCast(me->getVictim(), SPELL_HAND_OF_DEATH); + HandOfDeathTimer = 2000; + } else HandOfDeathTimer -= diff; + return; // Don't do anything after this point. + } + + if (SoulChargeCount) + { + if (SoulChargeTimer <= diff) + UnleashSoulCharge(); + else SoulChargeTimer -= diff; + } + + if (GripOfTheLegionTimer <= diff) + { + DoCast(SelectUnit(SELECT_TARGET_RANDOM, 0), SPELL_GRIP_OF_THE_LEGION); + GripOfTheLegionTimer = urand(5000,25000); + } else GripOfTheLegionTimer -= diff; + + if (AirBurstTimer <= diff) + { + if (urand(0,1)) + DoScriptText(SAY_AIR_BURST1, me); + else + DoScriptText(SAY_AIR_BURST2, me); + + DoCast(SelectUnit(SELECT_TARGET_RANDOM, 1), SPELL_AIR_BURST);//not on tank + AirBurstTimer = urand(25000,40000); + } else AirBurstTimer -= diff; + + if (FearTimer <= diff) + { + DoCast(me->getVictim(), SPELL_FEAR); + FearTimer = 42000; + } else FearTimer -= diff; + + if (DoomfireTimer <= diff) + { + if (urand(0,1)) + DoScriptText(SAY_DOOMFIRE1, me); + else + DoScriptText(SAY_DOOMFIRE2, me); + + Unit *temp = SelectUnit(SELECT_TARGET_RANDOM, 1); + if (!temp) + temp = me->getVictim(); + + //replace with spell cast 31903 once implicitTarget 73 implemented + SummonDoomfire(temp); + + //supposedly three doomfire can be up at the same time + DoomfireTimer = 20000; + } else DoomfireTimer -= diff; + + if (MeleeRangeCheckTimer <= diff) + { + if (CanUseFingerOfDeath()) + { + DoCast(SelectUnit(SELECT_TARGET_RANDOM, 0), SPELL_FINGER_OF_DEATH); + MeleeRangeCheckTimer = 1000; + } + + MeleeRangeCheckTimer = 5000; + } else MeleeRangeCheckTimer -= diff; + + DoMeleeAttackIfReady(); + } + void WaypointReached(uint32 /*i*/){} +}; + +CreatureAI* GetAI_boss_archimonde(Creature* pCreature) +{ + return new boss_archimondeAI (pCreature); +} + +CreatureAI* GetAI_mob_doomfire(Creature* pCreature) +{ + return new mob_doomfireAI(pCreature); +} + +CreatureAI* GetAI_mob_doomfire_targetting(Creature* pCreature) +{ + return new mob_doomfire_targettingAI(pCreature); +} + +CreatureAI* GetAI_mob_ancient_wisp(Creature* pCreature) +{ + return new mob_ancient_wispAI(pCreature); +} + +void AddSC_boss_archimonde() +{ + Script *newscript; + newscript = new Script; + newscript->Name = "boss_archimonde"; + newscript->GetAI = &GetAI_boss_archimonde; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_doomfire"; + newscript->GetAI = &GetAI_mob_doomfire; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_doomfire_targetting"; + newscript->GetAI = &GetAI_mob_doomfire_targetting; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_ancient_wisp"; + newscript->GetAI = &GetAI_mob_ancient_wisp; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp new file mode 100644 index 00000000000..69e37f7f740 --- /dev/null +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp @@ -0,0 +1,285 @@ + +#include "ScriptedPch.h" +#include "hyjal.h" +#include "hyjal_trash.h" + +#define SPELL_RAIN_OF_FIRE 31340 +#define SPELL_DOOM 31347 +#define SPELL_HOWL_OF_AZGALOR 31344 +#define SPELL_CLEAVE 31345 +#define SPELL_BERSERK 26662 + +#define SAY_ONDEATH "Your time is almost... up" +#define SOUND_ONDEATH 11002 + +#define SAY_ONSLAY1 "Reesh, hokta!" +#define SAY_ONSLAY2 "Don't fight it" +#define SAY_ONSLAY3 "No one is going to save you" +#define SOUND_ONSLAY1 11001 +#define SOUND_ONSLAY2 11048 +#define SOUND_ONSLAY3 11047 + +#define SAY_DOOM1 "Just a taste... of what awaits you" +#define SAY_DOOM2 "Suffer you despicable insect!" +#define SOUND_DOOM1 11046 +#define SOUND_DOOM2 11000 + +#define SAY_ONAGGRO "Abandon all hope! The legion has returned to finish what was begun so many years ago. This time there will be no escape!" +#define SOUND_ONAGGRO 10999 + +struct boss_azgalorAI : public hyjal_trashAI +{ + boss_azgalorAI(Creature *c) : hyjal_trashAI(c) + { + pInstance = c->GetInstanceData(); + pGo = false; + pos = 0; + SpellEntry *TempSpell = GET_SPELL(SPELL_HOWL_OF_AZGALOR); + if (TempSpell) + TempSpell->EffectRadiusIndex[0] = 12;//100yards instead of 50000?! + } + + uint32 RainTimer; + uint32 DoomTimer; + uint32 HowlTimer; + uint32 CleaveTimer; + uint32 EnrageTimer; + bool enraged; + + bool pGo; + uint32 pos; + + void Reset() + { + damageTaken = 0; + RainTimer = 20000; + DoomTimer = 50000; + HowlTimer = 30000; + CleaveTimer = 10000; + EnrageTimer = 600000; + enraged = false; + + if (pInstance && IsEvent) + pInstance->SetData(DATA_AZGALOREVENT, NOT_STARTED); + } + + void EnterCombat(Unit * /*who*/) + { + if (pInstance && IsEvent) + pInstance->SetData(DATA_AZGALOREVENT, IN_PROGRESS); + DoPlaySoundToSet(me, SOUND_ONAGGRO); + me->MonsterYell(SAY_ONAGGRO, LANG_UNIVERSAL, NULL); + } + + void KilledUnit(Unit * /*victim*/) + { + switch (urand(0,2)) + { + case 0: + DoPlaySoundToSet(me, SOUND_ONSLAY1); + me->MonsterYell(SAY_ONSLAY1, LANG_UNIVERSAL, NULL); + break; + case 1: + DoPlaySoundToSet(me, SOUND_ONSLAY2); + me->MonsterYell(SAY_ONSLAY2, LANG_UNIVERSAL, NULL); + break; + case 2: + DoPlaySoundToSet(me, SOUND_ONSLAY3); + me->MonsterYell(SAY_ONSLAY3, LANG_UNIVERSAL, NULL); + break; + } + } + + void WaypointReached(uint32 i) + { + pos = i; + if (i == 7 && pInstance) + { + Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); + if (pTarget && pTarget->isAlive()) + me->AddThreat(pTarget,0.0); + } + } + + void JustDied(Unit *victim) + { + hyjal_trashAI::JustDied(victim); + if (pInstance && IsEvent) + pInstance->SetData(DATA_AZGALOREVENT, DONE); + DoPlaySoundToSet(me, SOUND_ONDEATH); + } + + void UpdateAI(const uint32 diff) + { + if (IsEvent) + { + //Must update npc_escortAI + npc_escortAI::UpdateAI(diff); + if (!pGo) + { + pGo = true; + if (pInstance) + { + AddWaypoint(0, 5492.91, -2404.61, 1462.63); + AddWaypoint(1, 5531.76, -2460.87, 1469.55); + AddWaypoint(2, 5554.58, -2514.66, 1476.12); + AddWaypoint(3, 5554.16, -2567.23, 1479.90); + AddWaypoint(4, 5540.67, -2625.99, 1480.89); + AddWaypoint(5, 5508.16, -2659.2, 1480.15); + AddWaypoint(6, 5489.62, -2704.05, 1482.18); + AddWaypoint(7, 5457.04, -2726.26, 1485.10); + Start(false, true); + SetDespawnAtEnd(false); + } + } + } + + //Return since we have no target + if (!UpdateVictim()) + return; + + if (RainTimer <= diff) + { + DoCast(SelectTarget(SELECT_TARGET_RANDOM,0,30,true), SPELL_RAIN_OF_FIRE); + RainTimer = 20000+rand()%15000; + } else RainTimer -= diff; + + if (DoomTimer <= diff) + { + DoCast(SelectTarget(SELECT_TARGET_RANDOM,1,100,true), SPELL_DOOM);//never on tank + DoomTimer = 45000+rand()%5000; + } else DoomTimer -= diff; + + if (HowlTimer <= diff) + { + DoCast(me, SPELL_HOWL_OF_AZGALOR); + HowlTimer = 30000; + } else HowlTimer -= diff; + + if (CleaveTimer <= diff) + { + DoCast(me->getVictim(), SPELL_CLEAVE); + CleaveTimer = 10000+rand()%5000; + } else CleaveTimer -= diff; + + if (EnrageTimer < diff && !enraged) + { + me->InterruptNonMeleeSpells(false); + DoCast(me, SPELL_BERSERK, true); + enraged = true; + EnrageTimer = 600000; + } else EnrageTimer -= diff; + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_boss_azgalor(Creature* pCreature) +{ + return new boss_azgalorAI (pCreature); +} + +#define SPELL_THRASH 12787 +#define SPELL_CRIPPLE 31406 +#define SPELL_WARSTOMP 31408 + +struct mob_lesser_doomguardAI : public hyjal_trashAI +{ + mob_lesser_doomguardAI(Creature *c) : hyjal_trashAI(c) + { + pInstance = c->GetInstanceData(); + if (pInstance) + AzgalorGUID = pInstance->GetData64(DATA_AZGALOR); + } + + uint32 CrippleTimer; + uint32 WarstompTimer; + uint32 CheckTimer; + uint64 AzgalorGUID; + ScriptedInstance* pInstance; + + void Reset() + { + CrippleTimer = 50000; + WarstompTimer = 10000; + DoCast(me, SPELL_THRASH); + CheckTimer = 5000; + } + + void EnterCombat(Unit * /*who*/) + { + } + + void KilledUnit(Unit * /*victim*/) + { + } + + void WaypointReached(uint32 /*i*/) + { + } + + void MoveInLineOfSight(Unit *who) + { + if (me->IsWithinDist(who, 50) && !me->isInCombat() && me->IsHostileTo(who)) + AttackStart(who); + } + + void JustDied(Unit * /*victim*/) + { + } + + void UpdateAI(const uint32 diff) + { + if (CheckTimer <= diff) + { + if (AzgalorGUID) + { + Creature* boss = Unit::GetCreature((*me),AzgalorGUID); + if (!boss || (boss && boss->isDead())) + { + me->setDeathState(JUST_DIED); + me->RemoveCorpse(); + return; + } + } + CheckTimer = 5000; + } else CheckTimer -= diff; + + //Return since we have no target + if (!UpdateVictim()) + return; + + if (WarstompTimer <= diff) + { + DoCast(me, SPELL_WARSTOMP); + WarstompTimer = 10000+rand()%5000; + } else WarstompTimer -= diff; + + if (CrippleTimer <= diff) + { + DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true), SPELL_CRIPPLE); + CrippleTimer = 25000+rand()%5000; + } else CrippleTimer -= diff; + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_mob_lesser_doomguard(Creature* pCreature) +{ + return new mob_lesser_doomguardAI (pCreature); +} + +void AddSC_boss_azgalor() +{ + Script *newscript; + newscript = new Script; + newscript->Name = "boss_azgalor"; + newscript->GetAI = &GetAI_boss_azgalor; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_lesser_doomguard"; + newscript->GetAI = &GetAI_mob_lesser_doomguard; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp new file mode 100644 index 00000000000..b52d22842e3 --- /dev/null +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp @@ -0,0 +1,197 @@ + +#include "ScriptedPch.h" +#include "hyjal.h" +#include "hyjal_trash.h" + +#define SPELL_CLEAVE 31436 +#define SPELL_WARSTOMP 31480 +#define SPELL_MARK 31447 + +#define SOUND_ONDEATH 11018 + +#define SAY_ONSLAY1 "Shaza-Kiel!" +#define SAY_ONSLAY2 "You... are nothing!" +#define SAY_ONSLAY3 "Miserable nuisance!" +#define SOUND_ONSLAY1 11017 +#define SOUND_ONSLAY2 11053 +#define SOUND_ONSLAY3 11054 + +#define SAY_MARK1 "Your death will be a painful one." +#define SAY_MARK2 "You... are marked." +#define SOUND_MARK1 11016 +#define SOUND_MARK2 11052 + +#define SAY_ONAGGRO "Cry for mercy! Your meaningless lives will soon be forfeit." +#define SOUND_ONAGGRO 11015 + +struct boss_kazrogalAI : public hyjal_trashAI +{ + boss_kazrogalAI(Creature *c) : hyjal_trashAI(c) + { + pInstance = c->GetInstanceData(); + pGo = false; + pos = 0; + SpellEntry *TempSpell = GET_SPELL(SPELL_MARK); + if (TempSpell && TempSpell->EffectImplicitTargetA[0] != 1) + { + TempSpell->EffectImplicitTargetA[0] = 1; + TempSpell->EffectImplicitTargetB[0] = 0; + } + } + + uint32 CleaveTimer; + uint32 WarStompTimer; + uint32 MarkTimer; + uint32 MarkTimerBase; + bool pGo; + uint32 pos; + + void Reset() + { + damageTaken = 0; + CleaveTimer = 5000; + WarStompTimer = 15000; + MarkTimer = 45000; + MarkTimerBase = 45000; + + if (pInstance && IsEvent) + pInstance->SetData(DATA_KAZROGALEVENT, NOT_STARTED); + } + + void EnterCombat(Unit * /*who*/) + { + if (pInstance && IsEvent) + pInstance->SetData(DATA_KAZROGALEVENT, IN_PROGRESS); + DoPlaySoundToSet(me, SOUND_ONAGGRO); + me->MonsterYell(SAY_ONAGGRO, LANG_UNIVERSAL, NULL); + } + + void KilledUnit(Unit * /*victim*/) + { + switch (urand(0,2)) + { + case 0: + DoPlaySoundToSet(me, SOUND_ONSLAY1); + me->MonsterYell(SAY_ONSLAY1, LANG_UNIVERSAL, NULL); + break; + case 1: + DoPlaySoundToSet(me, SOUND_ONSLAY2); + me->MonsterYell(SAY_ONSLAY2, LANG_UNIVERSAL, NULL); + break; + case 2: + DoPlaySoundToSet(me, SOUND_ONSLAY3); + me->MonsterYell(SAY_ONSLAY3, LANG_UNIVERSAL, NULL); + break; + } + } + + void WaypointReached(uint32 i) + { + pos = i; + if (i == 7 && pInstance) + { + Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); + if (pTarget && pTarget->isAlive()) + me->AddThreat(pTarget,0.0); + } + } + + void JustDied(Unit *victim) + { + hyjal_trashAI::JustDied(victim); + if (pInstance && IsEvent) + pInstance->SetData(DATA_KAZROGALEVENT, DONE); + DoPlaySoundToSet(me, SOUND_ONDEATH); + } + + void UpdateAI(const uint32 diff) + { + if (IsEvent) + { + //Must update npc_escortAI + npc_escortAI::UpdateAI(diff); + if (!pGo) + { + pGo = true; + if (pInstance) + { + AddWaypoint(0, 5492.91, -2404.61, 1462.63); + AddWaypoint(1, 5531.76, -2460.87, 1469.55); + AddWaypoint(2, 5554.58, -2514.66, 1476.12); + AddWaypoint(3, 5554.16, -2567.23, 1479.90); + AddWaypoint(4, 5540.67, -2625.99, 1480.89); + AddWaypoint(5, 5508.16, -2659.2, 1480.15); + AddWaypoint(6, 5489.62, -2704.05, 1482.18); + AddWaypoint(7, 5457.04, -2726.26, 1485.10); + Start(false, true); + SetDespawnAtEnd(false); + } + } + } + + //Return since we have no target + if (!UpdateVictim()) + return; + + if (CleaveTimer <= diff) + { + DoCast(me, SPELL_CLEAVE); + CleaveTimer = 6000+rand()%15000; + } else CleaveTimer -= diff; + + if (WarStompTimer <= diff) + { + DoCast(me, SPELL_WARSTOMP); + WarStompTimer = 60000; + } else WarStompTimer -= diff; + + if (me->HasAura(SPELL_MARK)) + me->RemoveAurasDueToSpell(SPELL_MARK); + if (MarkTimer <= diff) + { + //cast dummy, useful for bos addons + me->CastCustomSpell(me, SPELL_MARK, NULL, NULL, NULL, false, NULL, NULL, me->GetGUID()); + + std::list t_list = me->getThreatManager().getThreatList(); + for (std::list::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) + { + Unit *pTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid()); + if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER && pTarget->getPowerType() == POWER_MANA) + { + pTarget->CastSpell(pTarget, SPELL_MARK,true);//only cast on mana users + } + } + MarkTimerBase -= 5000; + if (MarkTimerBase < 5500) + MarkTimerBase = 5500; + MarkTimer = MarkTimerBase; + switch (urand(0,2)) + { + case 0: + DoPlaySoundToSet(me, SOUND_MARK1); + me->MonsterYell(SAY_MARK1, LANG_UNIVERSAL, NULL); + break; + case 1: + DoPlaySoundToSet(me, SOUND_MARK2); + me->MonsterYell(SAY_MARK2, LANG_UNIVERSAL, NULL); + break; + } + } else MarkTimer -= diff; + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_boss_kazrogal(Creature* pCreature) +{ + return new boss_kazrogalAI (pCreature); +} + +void AddSC_boss_kazrogal() +{ + Script *newscript; + newscript = new Script; + newscript->Name = "boss_kazrogal"; + newscript->GetAI = &GetAI_boss_kazrogal; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp new file mode 100644 index 00000000000..7465b997117 --- /dev/null +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp @@ -0,0 +1,192 @@ + +#include "ScriptedPch.h" +#include "hyjal.h" +#include "hyjal_trash.h" + +#define SPELL_FROST_ARMOR 31256 +#define SPELL_DEATH_AND_DECAY 31258 + +#define SPELL_FROST_NOVA 31250 +#define SPELL_ICEBOLT 31249 + +#define SAY_ONDEATH "You have won this battle, but not... the... war" +#define SOUND_ONDEATH 11026 + +#define SAY_ONSLAY1 "All life must perish!" +#define SAY_ONSLAY2 "Victory to the Legion!" +#define SOUND_ONSLAY1 11025 +#define SOUND_ONSLAY2 11057 + +#define SAY_DECAY1 "Crumble and rot!" +#define SAY_DECAY2 "Ashes to ashes, dust to dust" +#define SOUND_DECAY1 11023 +#define SOUND_DECAY2 11055 + +#define SAY_NOVA1 "Succumb to the icy chill... of death!" +#define SAY_NOVA2 "It will be much colder in your grave" +#define SOUND_NOVA1 11024 +#define SOUND_NOVA2 11058 + +#define SAY_ONAGGRO "The Legion's final conquest has begun! Once again the subjugation of this world is within our grasp. Let none survive!" +#define SOUND_ONAGGRO 11022 + +struct boss_rage_winterchillAI : public hyjal_trashAI +{ + boss_rage_winterchillAI(Creature *c) : hyjal_trashAI(c) + { + pInstance = c->GetInstanceData(); + pGo = false; + pos = 0; + } + + uint32 FrostArmorTimer; + uint32 DecayTimer; + uint32 NovaTimer; + uint32 IceboltTimer; + bool pGo; + uint32 pos; + + void Reset() + { + damageTaken = 0; + FrostArmorTimer = 37000; + DecayTimer = 45000; + NovaTimer = 15000; + IceboltTimer = 10000; + + if (pInstance && IsEvent) + pInstance->SetData(DATA_RAGEWINTERCHILLEVENT, NOT_STARTED); + } + + void EnterCombat(Unit * /*who*/) + { + if (pInstance && IsEvent) + pInstance->SetData(DATA_RAGEWINTERCHILLEVENT, IN_PROGRESS); + DoPlaySoundToSet(me, SOUND_ONAGGRO); + me->MonsterYell(SAY_ONAGGRO, LANG_UNIVERSAL, 0); + } + + void KilledUnit(Unit * /*victim*/) + { + switch (urand(0,1)) + { + case 0: + DoPlaySoundToSet(me, SOUND_ONSLAY1); + me->MonsterYell(SAY_ONSLAY1, LANG_UNIVERSAL, NULL); + break; + case 1: + DoPlaySoundToSet(me, SOUND_ONSLAY2); + me->MonsterYell(SAY_ONSLAY2, LANG_UNIVERSAL, NULL); + break; + } + } + + void WaypointReached(uint32 i) + { + pos = i; + if (i == 7 && pInstance) + { + Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); + if (pTarget && pTarget->isAlive()) + me->AddThreat(pTarget,0.0f); + } + } + + void JustDied(Unit *victim) + { + hyjal_trashAI::JustDied(victim); + if (pInstance && IsEvent) + pInstance->SetData(DATA_RAGEWINTERCHILLEVENT, DONE); + DoPlaySoundToSet(me, SOUND_ONDEATH); + me->MonsterYell(SAY_ONDEATH, LANG_UNIVERSAL, NULL); + } + + void UpdateAI(const uint32 diff) + { + if (IsEvent) + { + //Must update npc_escortAI + npc_escortAI::UpdateAI(diff); + if (!pGo) + { + pGo = true; + if (pInstance) + { + AddWaypoint(0, 4896.08, -1576.35, 1333.65); + AddWaypoint(1, 4898.68, -1615.02, 1329.48); + AddWaypoint(2, 4907.12, -1667.08, 1321.00); + AddWaypoint(3, 4963.18, -1699.35, 1340.51); + AddWaypoint(4, 4989.16, -1716.67, 1335.74); + AddWaypoint(5, 5026.27, -1736.89, 1323.02); + AddWaypoint(6, 5037.77, -1770.56, 1324.36); + AddWaypoint(7, 5067.23, -1789.95, 1321.17); + Start(false, true); + SetDespawnAtEnd(false); + } + } + } + + //Return since we have no target + if (!UpdateVictim()) + return; + + if (FrostArmorTimer <= diff) + { + DoCast(me, SPELL_FROST_ARMOR); + FrostArmorTimer = 40000+rand()%20000; + } else FrostArmorTimer -= diff; + if (DecayTimer <= diff) + { + DoCast(me->getVictim(), SPELL_DEATH_AND_DECAY); + DecayTimer = 60000+rand()%20000; + switch (urand(0,1)) + { + case 0: + DoPlaySoundToSet(me, SOUND_DECAY1); + me->MonsterYell(SAY_DECAY1, LANG_UNIVERSAL, NULL); + break; + case 1: + DoPlaySoundToSet(me, SOUND_DECAY2); + me->MonsterYell(SAY_DECAY2, LANG_UNIVERSAL, NULL); + break; + } + } else DecayTimer -= diff; + if (NovaTimer <= diff) + { + DoCast(me->getVictim(), SPELL_FROST_NOVA); + NovaTimer = 30000+rand()%15000; + switch (urand(0,1)) + { + case 0: + DoPlaySoundToSet(me, SOUND_NOVA1); + me->MonsterYell(SAY_NOVA1, LANG_UNIVERSAL, NULL); + break; + case 1: + DoPlaySoundToSet(me, SOUND_NOVA2); + me->MonsterYell(SAY_NOVA2, LANG_UNIVERSAL, NULL); + break; + } + } else NovaTimer -= diff; + if (IceboltTimer <= diff) + { + DoCast(SelectTarget(SELECT_TARGET_RANDOM,0,40,true), SPELL_ICEBOLT); + IceboltTimer = 11000+rand()%20000; + } else IceboltTimer -= diff; + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_boss_rage_winterchill(Creature* pCreature) +{ + return new boss_rage_winterchillAI (pCreature); +} + +void AddSC_boss_rage_winterchill() +{ + Script *newscript; + newscript = new Script; + newscript->Name = "boss_rage_winterchill"; + newscript->GetAI = &GetAI_boss_rage_winterchill; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp new file mode 100644 index 00000000000..16a050939cc --- /dev/null +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp @@ -0,0 +1,247 @@ + /* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Hyjal +SD%Complete: 80 +SDComment: gossip text id's unknown +SDCategory: Caverns of Time, Mount Hyjal +EndScriptData */ + +/* ContentData +npc_jaina_proudmoore +npc_thrall +npc_tyrande_whisperwind +EndContentData */ + +#include "ScriptedPch.h" +#include "hyjalAI.h" + +#define GOSSIP_ITEM_BEGIN_ALLY "My companions and I are with you, Lady Proudmoore." +#define GOSSIP_ITEM_ANETHERON "We are ready for whatever Archimonde might send our way, Lady Proudmoore." + +#define GOSSIP_ITEM_BEGIN_HORDE "I am with you, Thrall." +#define GOSSIP_ITEM_AZGALOR "We have nothing to fear." + +#define GOSSIP_ITEM_RETREAT "We can't keep this up. Let's retreat!" + +#define GOSSIP_ITEM_TYRANDE "Aid us in defending Nordrassil" +#define ITEM_TEAR_OF_GODDESS 24494 + +#define GOSSIP_ITEM_GM1 "[GM] Toggle Debug Timers" + +CreatureAI* GetAI_npc_jaina_proudmoore(Creature* pCreature) +{ + hyjalAI* ai = new hyjalAI(pCreature); + + ai->Reset(); + ai->EnterEvadeMode(); + + ai->Spell[0].SpellId = SPELL_BLIZZARD; + ai->Spell[0].Cooldown = 15000 + rand()%20000; + ai->Spell[0].TargetType = TARGETTYPE_RANDOM; + + ai->Spell[1].SpellId = SPELL_PYROBLAST; + ai->Spell[1].Cooldown = 5500 + rand()%4000; + ai->Spell[1].TargetType = TARGETTYPE_RANDOM; + + ai->Spell[2].SpellId = SPELL_SUMMON_ELEMENTALS; + ai->Spell[2].Cooldown = 15000 + rand()%30000; + ai->Spell[2].TargetType = TARGETTYPE_SELF; + + return ai; +} + +bool GossipHello_npc_jaina_proudmoore(Player* pPlayer, Creature* pCreature) +{ + hyjalAI* ai = CAST_AI(hyjalAI, pCreature->AI()); + if (ai->EventBegun) + return false; + + uint32 RageEncounter = ai->GetInstanceData(DATA_RAGEWINTERCHILLEVENT); + uint32 AnetheronEncounter = ai->GetInstanceData(DATA_ANETHERONEVENT); + if (RageEncounter == NOT_STARTED) + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BEGIN_ALLY, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); + else if (RageEncounter == DONE && AnetheronEncounter == NOT_STARTED) + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ANETHERON, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); + else if (RageEncounter == DONE && AnetheronEncounter == DONE) + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_RETREAT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); + + if (pPlayer->isGameMaster()) + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_ITEM_GM1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); + + pPlayer->SEND_GOSSIP_MENU(907, pCreature->GetGUID()); + return true; +} + +bool GossipSelect_npc_jaina_proudmoore(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) +{ + hyjalAI* ai = CAST_AI(hyjalAI, pCreature->AI()); + switch(uiAction) + { + case GOSSIP_ACTION_INFO_DEF + 1: + ai->StartEvent(pPlayer); + break; + case GOSSIP_ACTION_INFO_DEF + 2: + ai->FirstBossDead = true; + ai->WaveCount = 9; + ai->StartEvent(pPlayer); + break; + case GOSSIP_ACTION_INFO_DEF + 3: + ai->Retreat(); + break; + case GOSSIP_ACTION_INFO_DEF: + ai->Debug = !ai->Debug; + debug_log("TSCR: HyjalAI - Debug mode has been toggled"); + break; + } + return true; +} + +CreatureAI* GetAI_npc_thrall(Creature* pCreature) +{ + hyjalAI* ai = new hyjalAI(pCreature); + + ai->Reset(); + ai->EnterEvadeMode(); + + ai->Spell[0].SpellId = SPELL_CHAIN_LIGHTNING; + ai->Spell[0].Cooldown = 3000 + rand()%5000; + ai->Spell[0].TargetType = TARGETTYPE_VICTIM; + + ai->Spell[1].SpellId = SPELL_SUMMON_DIRE_WOLF; + ai->Spell[1].Cooldown = 6000 + rand()%35000; + ai->Spell[1].TargetType = TARGETTYPE_RANDOM; + + return ai; +} + +bool GossipHello_npc_thrall(Player* pPlayer, Creature* pCreature) +{ + hyjalAI* ai = CAST_AI(hyjalAI, pCreature->AI()); + if (ai->EventBegun) + return false; + + uint32 AnetheronEvent = ai->GetInstanceData(DATA_ANETHERONEVENT); + // Only let them start the Horde phases if Anetheron is dead. + if (AnetheronEvent == DONE && ai->GetInstanceData(DATA_ALLIANCE_RETREAT)) + { + uint32 KazrogalEvent = ai->GetInstanceData(DATA_KAZROGALEVENT); + uint32 AzgalorEvent = ai->GetInstanceData(DATA_AZGALOREVENT); + if (KazrogalEvent == NOT_STARTED) + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BEGIN_HORDE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); + else if (KazrogalEvent == DONE && AzgalorEvent == NOT_STARTED) + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_AZGALOR, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); + else if (AzgalorEvent == DONE) + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_RETREAT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); + } + + if (pPlayer->isGameMaster()) + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_ITEM_GM1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); + + pPlayer->SEND_GOSSIP_MENU(907, pCreature->GetGUID()); + return true; +} + +bool GossipSelect_npc_thrall(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) +{ + hyjalAI* ai = CAST_AI(hyjalAI, pCreature->AI()); + ai->DeSpawnVeins();//despawn the alliance veins + switch(uiAction) + { + case GOSSIP_ACTION_INFO_DEF + 1: + ai->StartEvent(pPlayer); + break; + case GOSSIP_ACTION_INFO_DEF + 2: + ai->FirstBossDead = true; + ai->WaveCount = 9; + ai->StartEvent(pPlayer); + break; + case GOSSIP_ACTION_INFO_DEF + 3: + ai->Retreat(); + break; + case GOSSIP_ACTION_INFO_DEF: + ai->Debug = !ai->Debug; + debug_log("TSCR: HyjalAI - Debug mode has been toggled"); + break; + } + return true; +} + +CreatureAI* GetAI_npc_tyrande_whisperwind(Creature* pCreature) +{ + hyjalAI* ai = new hyjalAI(pCreature); + ai->Reset(); + ai->EnterEvadeMode(); + return ai; +} + +bool GossipHello_npc_tyrande_whisperwind(Player* pPlayer, Creature* pCreature) +{ + hyjalAI* ai = CAST_AI(hyjalAI, pCreature->AI()); + uint32 AzgalorEvent = ai->GetInstanceData(DATA_AZGALOREVENT); + + // Only let them get item if Azgalor is dead. + if (AzgalorEvent == DONE && !pPlayer->HasItemCount(ITEM_TEAR_OF_GODDESS,1)) + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TYRANDE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); + pPlayer->SEND_GOSSIP_MENU(907, pCreature->GetGUID()); + return true; +} + +bool GossipSelect_npc_tyrande_whisperwind(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) +{ + if (uiAction == GOSSIP_ACTION_INFO_DEF) + { + ItemPosCountVec dest; + uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, ITEM_TEAR_OF_GODDESS, 1); + if (msg == EQUIP_ERR_OK) + { + Item* item = pPlayer->StoreNewItem(dest, ITEM_TEAR_OF_GODDESS, true); + if (item && pPlayer) + pPlayer->SendNewItem(item,1,true,false,true); + } + pPlayer->SEND_GOSSIP_MENU(907, pCreature->GetGUID()); + CAST_AI(hyjalAI, pCreature->AI()); + } + return true; +} + +void AddSC_hyjal() +{ + Script *newscript; + + newscript = new Script; + newscript->Name = "npc_jaina_proudmoore"; + newscript->GetAI = &GetAI_npc_jaina_proudmoore; + newscript->pGossipHello = &GossipHello_npc_jaina_proudmoore; + newscript->pGossipSelect = &GossipSelect_npc_jaina_proudmoore; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "npc_thrall"; + newscript->GetAI = &GetAI_npc_thrall; + newscript->pGossipHello = &GossipHello_npc_thrall; + newscript->pGossipSelect = &GossipSelect_npc_thrall; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "npc_tyrande_whisperwind"; + newscript->pGossipHello = &GossipHello_npc_tyrande_whisperwind; + newscript->pGossipSelect = &GossipSelect_npc_tyrande_whisperwind; + newscript->GetAI = &GetAI_npc_tyrande_whisperwind; + newscript->RegisterSelf(); +} + diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h new file mode 100644 index 00000000000..bfc9a54dfd9 --- /dev/null +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h @@ -0,0 +1,38 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software licensed under GPL version 2 + * Please see the included DOCS/LICENSE.TXT for more information */ + +#ifndef DEF_HYJAL_H +#define DEF_HYJAL_H + +#define ERROR_INST_DATA "TSCR: Instance data not set properly for Mount Hyjal. Encounters will be buggy." + +enum eTypes +{ + WORLD_STATE_WAVES = 2842, + WORLD_STATE_ENEMY = 2453, + WORLD_STATE_ENEMYCOUNT = 2454, + + DATA_ANETHERON = 1, + DATA_ANETHERONEVENT = 2, + DATA_ARCHIMONDE = 3, + DATA_ARCHIMONDEEVENT = 4, + DATA_AZGALOR = 5, + DATA_AZGALOREVENT = 6, + DATA_JAINAPROUDMOORE = 7, + DATA_KAZROGAL = 8, + DATA_KAZROGALEVENT = 9, + DATA_RAGEWINTERCHILL = 10, + DATA_RAGEWINTERCHILLEVENT = 11, + DATA_THRALL = 12, + DATA_TYRANDEWHISPERWIND = 13, + DATA_TRASH = 14, + DATA_RESET_TRASH_COUNT = 15, + DATA_ALLIANCE_RETREAT = 16, + DATA_HORDE_RETREAT = 17, + DATA_RAIDDAMAGE = 18, + DATA_RESET_RAIDDAMAGE = 19, + TYPE_RETREAT = 20 +}; +#endif + diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp new file mode 100644 index 00000000000..3c12b54f3f4 --- /dev/null +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp @@ -0,0 +1,1157 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: HyjalAI +SD%Complete: 90 +SDComment: +SDCategory: Caverns of Time, Mount Hyjal +EndScriptData */ + +#include "ScriptedPch.h" +#include "hyjalAI.h" +#include "hyjal_trash.h" +#include "MapManager.h" +#include "Language.h" +#include "Chat.h" +#include "Object.h" + +#define SPAWN_GARG_GATE 0 +#define SPAWN_WYRM_GATE 1 +#define SPAWN_NEAR_TOWER 2 + +#define YELL_HURRY "Hurry, we don't have much time" + +// Locations for summoning gargoyls and frost wyrms in special cases +float SpawnPointSpecial[3][3]= +{ + {5497.08, -2493.23, 1535.72}, //spawn point for the gargoyles near the horde gate + {5624.53, -2548.12, 1551.54}, //spawn point for the frost wyrm near the horde gate + {5604.41, -2811.98, 1547.77} //spawn point for the gargoyles and wyrms near the horde tower +}; + +// Locations for summoning waves in Alliance base +float AllianceBase[4][3]= +{ + {4928.48, -1526.38, 1326.83}, + {4923.54, -1514.29, 1327.98}, + {4928.41, -1510.35, 1327.99}, + {4938.35, -1521.00, 1326.69} +}; + +float JainaDummySpawn[2][4]= +{ + {5497.01, -2719.03, 1483.08, 2.90426}, + {5484.98, -2721.69, 1483.39, 6.00656} +}; + +// Locations for summoning waves in Horde base +float HordeBase[4][3]= +{ + {5458.01, -2340.27, 1459.60}, + {5466.01, -2334.69, 1460.06}, + {5468.45, -2355.13, 1459.99}, + {5479.06, -2344.16, 1461.74} +}; + +// Lady Jaina's waypoints when retreathing +float JainaWPs[2][3]= +{ + {5078.56, -1789.79, 1320.73},//next to the small stairs + {5037.38, -1778.39, 1322.61},//center of alliance base +}; + +float InfernalPos[8][3]=//spawn points for the infernals in the horde base +{ + {5453.59, -2764.52, 1493.50}, + {5478.4, -2781.77, 1497.52}, + {5506.09, -2780.53, 1496.32}, + {5532.1, -2763.42, 1492.37}, + {5544.16, -2733.99, 1487.14}, + {5536.19, -2708.18, 1480.01}, + {5510.16, -2691.75, 1479.66}, + {5482.39, -2689.19, 1481.09} +}; + +float InfernalSPWP[26][4]=//spawn points for the infernals in the horde base used in the cleaning wave +{ + {5490.96, -2718.72, 1482.96, 0.49773}, + {5449.51, -2723.32, 1485.69, 2.69685}, + {5520.83, -2624.68, 1483.82, 1.20459}, + {5558.28, -2629.26, 1485.76, 0.37992}, + {5567.97, -2758.69, 1494.10, 5.04125}, + {5384.90, -2793.47, 1503.90, 5.55412}, + {5495.33, -2814.06, 1501.56, 1.12055}, + {5472.63, -2929.39, 1538.31, 1.95777}, + {5334.72, -2952.29, 1534.34, 0.50869}, + {5398.36, -2872.46, 1512.38, 0.76787}, + {5514.39, -2768.63, 1492.30, 1.55721}, + {5598.91, -2703.75, 1495.64, 2.56644}, + {5467.80, -2655.93, 1482.27, 0.85819}, + {5399.83, -2985.24, 1545.04, 5.92559}, + {5232.13, -2967.05, 1553.09, 5.41351}, + {5272.02, -3082.52, 1567.09, 3.40681}, + {5343.26, -3120.71, 1582.92, 3.16727}, + {5371.26, -3175.24, 1587.41, 6.10466}, + {5434.67, -3177.91, 1579.25, 2.77850}, + {5237.39, -3149.25, 1593.59, 0.83855}, + {5202.15, -3016.64, 1566.28, 3.31256}, + {5302.54, -2914.37, 1528.53, 3.37146}, + {5439.04, -2834.81, 1508.80, 2.14231}, + {5421.33, -2771.04, 1494.28, 6.06223}, + {5549.76, -2692.93, 1482.68, 2.19414}, + {5459.78, -2755.71, 1490.68, 1.05139} +}; + +float VeinPos[14][8]=//spawn points of the ancient gem veins +{ + {5184.84, -1982.59, 1382.66, 2.58079, 0, 0, 0.960944, 0.276742}, //alliance + {5107.66, -2071.16, 1368.37, 2.65148, 0, 0, 0.970124, 0.242611}, //alliance + {5040.53, -2227.65, 1403.17, 3.35049, 0, 0, 0.99455, -0.104257}, //alliance + {5187.59, -2453.12, 1455.51, 5.87943, 0, 0, 0.20051, -0.979692}, //alliance + {5429.43, -2340.65, 1465.38, 4.7681, 0, 0, 0.687138, -0.726527}, //alliance + {5463.99, -2315.95, 1470.29, 1.52045, 0, 0, 0.689084, 0.724682}, //alliance + {5624.65, -2495.09, 1510.11, 0.0124869, 0, 0, 0.00624342, 0.999981}, //alliance + {5285.41, -3348.32, 1663.01, 1.57152, 0, 0, 0.707362, 0.706852}, //horde + {5417.69, -3372.52, 1656.31, 0.361993, 0, 0, 0.18001, 0.983665}, //horde + {5315.34, -3238.32, 1622.88, 3.03627, 0, 0, 0.998614, 0.0526347}, //horde + {5303.4, -3096.44, 1596.41, 1.72073, 0, 0, 0.758081, 0.65216}, //horde + {5265.13, -3177.27, 1616.22, 0.813604, 0, 0, 0.395674, 0.918391}, //horde + {5374.3, -3420.59, 1653.43, 1.45762, 0, 0, 0.665981, 0.745969}, //horde + {5441.54, -3321.59, 1651.55, 0.258306, 0, 0, 0.128794, 0.991671} //horde +}; + +float AllianceOverrunGargPos[5][4]=//gargoyle spawn points in the alliance overrun +{ + {5279.94, -2049.68, 1311.38, 0},//garg1 + {5289.15, -2219.06, 1291.12, 0},//garg2 + {5202.07, -2136.10, 1305.07, 2.8},//garg3 + {5071.52, -2425.63, 1454.48, 5.54},//garg4 + {5120.65, -2467.92, 1463.93, 2.54}//garg5 +}; + +float AllianceFirePos[92][8]=//spawn points for the fire visuals (GO) in the alliance base +{ + {5039.9, -1796.84, 1323.88, 2.59222, 0, 0, 0.962511, 0.271243}, + {5087.2, -1795.2, 1320.68, 1.03946, 0, 0, 0.496644, 0.867954}, + {5112.68, -1806.66, 1359.93, 1.37799, 0, 0, 0.63576, 0.771887}, + {5095.61, -1793.27, 1359.78, 0.580806, 0, 0, 0.286338, 0.958129}, + {5090.43, -1784.45, 1360.44, 0.796784, 0, 0, 0.387937, 0.921686}, + {5139.25, -1783.11, 1359.39, 3.30849, 0, 0, 0.99652, -0.0833509}, + {5112.16, -1763.72, 1361.35, 5.10312, 0, 0, 0.556388, -0.830922}, + {4981.18, -1793.98, 1335.7, 3.23072, 0, 0, 0.999007, -0.0445498}, + {4996.57, -1766.75, 1341.62, 3.5331, 0, 0, 0.980902, -0.194505}, + {4983.74, -1769.25, 1345.75, 3.79228, 0, 0, 0.947541, -0.319635}, + {4996.01, -1774.43, 1330.71, 3.07364, 0, 0, 0.999423, 0.0339693}, + {5094.2, -1726.13, 1330.55, 1.56175, 0, 0, 0.703901, 0.710298}, + {5079.82, -1721.24, 1336.26, 1.18868, 0, 0, 0.559964, 0.828517}, + {5077.68, -1717.15, 1327.78, 0.0145145, 0, 0, 0.00725717, 0.999974}, + {5122.27, -1738.22, 1341.67, 0.835256, 0, 0, 0.405593, 0.914054}, + {5131.88, -1741.15, 1335.25, 2.15472, 0, 0, 0.880712, 0.473653}, + {5196.93, -1772.99, 1345.2, 0.128397, 0, 0, 0.0641544, 0.99794}, + {5225.33, -1756.06, 1344.17, 3.04223, 0, 0, 0.998766, 0.0496599}, + {5224.84, -1767.05, 1360.06, 3.19538, 0, 0, 0.999638, -0.0268922}, + {5202.05, -1763.47, 1361.68, 2.59455, 0, 0, 0.962826, 0.270122}, + {5194.74, -1766.66, 1356.94, 0.0734191, 0, 0, 0.0367013, 0.999326}, + {5159.67, -1832.97, 1344.5, 5.17457, 0, 0, 0.526356, -0.850264}, + {5096.17, -1858.73, 1332.46, 5.30021, 0, 0, 0.471939, -0.881631}, + {5110.7, -1856.59, 1342.84, 5.97564, 0, 0, 0.153167, -0.9882}, + {5109.76, -1855.3, 1332.38, 4.89572, 0, 0, 0.639411, -0.768865}, + {5068.95, -1837.37, 1328.81, 2.61569, 0, 0, 0.965628, 0.25993}, + {5064.4, -1824.77, 1329.02, 2.16409, 0, 0, 0.88292, 0.469524}, + {5059.89, -1848.79, 1329.59, 0.0709955, 0, 0, 0.0354903, 0.99937}, + {5014.37, -1851.39, 1322.56, 4.66949, 0, 0, 0.722111, -0.691777}, + {5025.1, -1848.27, 1323.39, 4.44565, 0, 0, 0.794854, -0.606801}, + {4942.63, -1890.13, 1326.59, 3.28719, 0, 0, 0.997351, -0.0727343}, + {4937.95, -1888.71, 1352.41, 3.41678, 0, 0, 0.990549, -0.13716}, + {4922.48, -1881.92, 1352.41, 5.03077, 0, 0, 0.586075, -0.810257}, + {4915.35, -1894.32, 1351.24, 6.22457, 0, 0, 0.0293048, -0.999571}, + {4922.71, -1904.84, 1352.56, 1.37866, 0, 0, 0.63602, 0.771672}, + {4932.89, -1905.49, 1352.56, 1.89702, 0, 0, 0.812549, 0.582893}, + {5011.83, -1861.05, 1345.86, 4.43777, 0, 0, 0.797239, -0.603664}, + {5011.83, -1861.05, 1363.26, 4.748, 0, 0, 0.694406, -0.719583}, + {5021.46, -1858.35, 1342.17, 4.86188, 0, 0, 0.652329, -0.757936}, + {4995.02, -1698.3, 1370.38, 6.15779, 0, 0, 0.0626579, -0.998035}, + {5119.85, -1728.9, 1336.04, 5.87112, 0, 0, 0.204579, -0.97885}, + {5214.75, -1751.02, 1342.5, 5.08965, 0, 0, 0.561972, -0.827156}, + {5075.04, -1822.43, 1328.87, 3.99951, 0, 0, 0.9094, -0.415924}, + {5057.09, -1823.32, 1350.35, 3.88169, 0, 0, 0.93231, -0.361659}, + {4984.6, -1816.99, 1329.21, 3.05308, 0, 0, 0.999021, 0.0442417}, + {4983.35, -1811.55, 1356.82, 3.33975, 0, 0, 0.995096, -0.098917}, + {4984.11, -1825.73, 1350.76, 2.26375, 0, 0, 0.905211, 0.424962}, + {4968.47, -1786.46, 1354.09, 3.07663, 0, 0, 0.999473, 0.0324733}, + {5061.82, -1751.16, 1339.07, 5.94727, 0, 0, 0.167171, -0.985928}, + {5063.75, -1763, 1351.91, 0.759707, 0, 0, 0.370784, 0.928719}, + {5078.65, -1708.26, 1353.9, 1.27022, 0, 0, 0.593264, 0.805008}, + {4983.19, -1755.96, 1331.13, 4.28221, 0, 0, 0.841733, -0.539894}, + {4972.76, -1755.3, 1332.5, 4.21938, 0, 0, 0.858276, -0.513188}, + {4961.65, -1760.82, 1351.69, 3.56515, 0, 0, 0.977659, -0.210198}, + {5086.45, -1779.83, 1321.62, 6.23157, 0, 0, 0.0258051, -0.999667}, + {5063.15, -1756.74, 1328.56, 0.886926, 0, 0, 0.42907, 0.903271}, + {5042.45, -1800.61, 1323.88, 2.50093, 0, 0, 0.949131, 0.31488}, + {5084.74, -1725.35, 1327.89, 1.65034, 0, 0, 0.734663, 0.678432}, + {4993.25, -1758.1, 1331.07, 3.49995, 0, 0, 0.98399, -0.178223}, + {5078.53, -1867.85, 1348.91, 5.85612, 0, 0, 0.211913, -0.977288}, + {5080.74, -1869.73, 1333.18, 6.18206, 0, 0, 0.0505424, -0.998722}, + {5089.55, -1894.13, 1356.08, 1.52072, 0, 0, 0.689181, 0.724589}, + {5113.24, -1899.49, 1363.77, 1.50108, 0, 0, 0.682034, 0.731321}, + {4984.18, -1907.69, 1325.62, 3.82193, 0, 0, 0.942698, -0.333646}, + {5094.14, -2432.08, 1429.38, 4.70083, 0, 0, 0.711182, -0.703007}, + {5329.89, -2113.30, 1281.06, 5.60560, 0, 0, 0.332347, -0.943157}, + {5170.87, -2148.13, 1278.32, 1.63540, 0, 0, 0.729573, 0.683903 }, + {5132.94, -1960.25, 1367.8, 3.69787, 0, 0, 0.961568, -0.274566}, + {5280.82, -2351.55, 1431.57, 4.46913, 0, 0, 0.787677, -0.616088}, + {5176.78, -2121.43, 1295.27, 3.24153, 0, 0, 0.998752, -0.04995}, + {5332.75, -2101.41, 1296.37, 5.50350, 0, 0, 0.380043, -0.924969}, + {5265.70, -2050.27, 1287.57, 0.50051, 0, 0, 0.247655, 0.968848 }, + {5194.21, -2129.89, 1274.04, 3.08053, 0, 0, 0.999534, 0.0305272}, + {5225.81, -1985.50, 1364.15, 0.37247, 0, 0, 0.185163, 0.982708 }, + {5339.46, -2204.47, 1280.45, 0.99921, 0, 0, 0.479081, 0.877771 }, + {5269.63, -2020.57, 1299.62, 3.00201, 0, 0, 0.997566, 0.0697332}, + {5111.54, -2445.70, 1435.31, 2.70983, 0, 0, 0.976788, 0.214207 }, + {5111.24, -1901.14, 1355.33, 1.61028, 0, 0, 0.720929, 0.693009 }, + {5310.42, -2207.82, 1277.46, 0.50441, 0, 0, 0.249544, 0.968363 }, + {5150.81, -2042.13, 1394.3, 2.21031, 0, 0, 0.893534, 0.448995 }, + {5224.84, -2376.61, 1366.33, 5.0621, 0, 0, 0.573311, -0.819338}, + {5105.41, -2454.86, 1446.16, 4.64584, 0, 0, 0.730239, -0.683191}, + {5309.65, -2188.28, 1266.84, 5.56631, 0, 0, 0.350811, -0.936446}, + {5281.46, -2047.82, 1287.67, 2.44909, 0, 0, 0.940652, 0.339373 }, + {5325.45, -2189.41, 1309.6, 6.23783, 0, 0, 0.0226771, -0.999743}, + {5190.96, -2142.54, 1293.03, 6.25668, 0, 0, 0.0132544, -0.999912}, + {5089.99, -2467.49, 1441.8, 0.77381, 0, 0, 0.377326, 0.92608 }, + {5195.08, -2129.01, 1285.36, 3.55727, 0, 0, 0.978480, -0.206344}, + {5353.76, -2116.28, 1299.27, 6.17894, 0, 0, 0.0521006, -0.998642}, + {5271.14, -2037.38, 1299.24, 4.07879, 0, 0, 0.892201, -0.451638}, + {5332.5 , -2181.28, 1279.95, 4.6906, 0, 0, 0.714768, -0.699362}, + {5108.2 , -2429.84, 1427.73, 4.5194, 0, 0, 0.771943, -0.635691} +}; + +float HordeFirePos[65][8]=//spawn points for the fire visuals (GO) in the horde base +{ + {5524.11, -2612.73, 1483.38, 1.96198, 0, 0, 0.831047, 0.556202}, + {5514.42, -2617.19, 1505.77, 1.82453, 0, 0, 0.790892, 0.611956}, + {5510.21, -2624.77, 1485.34, 1.71065, 0, 0, 0.754783, 0.655974}, + {5570.72, -2619.04, 1487.62, 0.728898, 0, 0, 0.356435, 0.93432}, + {5570.29, -2639.37, 1487.31, 1.49308, 0, 0, 0.679104, 0.734042}, + {5583.56, -2637.2, 1503.78, 1.46559, 0, 0, 0.668951, 0.743307}, + {5571.53, -2626.81, 1510.99, 0.362107, 0, 0, 0.180066, 0.983654}, + {5545.97, -2659.62, 1489.64, 5.07055, 0, 0, 0.569845, -0.821752}, + {5557.44, -2675.91, 1482.58, 1.70118, 0, 0, 0.751671, 0.659539}, + {5594.98, -2742.31, 1495.51, 4.5993, 0, 0, 0.74594, -0.666013}, + {5599.65, -2755.6, 1505.05, 1.66896, 0, 0, 0.740947, 0.671564}, + {5565.95, -2774.75, 1499.48, 6.22425, 0, 0, 0.0294611, -0.999566}, + {5567.1, -2769.7, 1511.17, 5.99257, 0, 0, 0.144799, -0.989461}, + {5572.84, -2774.16, 1527.06, 0.836428, 0, 0, 0.406129, 0.913816}, + {5538.32, -2805.94, 1498.87, 4.30082, 0, 0, 0.836674, -0.547701}, + {5515.66, -2801.74, 1503.53, 5.57316, 0, 0, 0.347602, -0.937642}, + {5516.76, -2827.14, 1501.15, 0.35026, 0, 0, 0.174236, 0.984704}, + {5536.13, -2813.51, 1537.21, 4.51681, 0, 0, 0.772765, -0.634692}, + {5525.05, -2825.16, 1538.53, 0.489275, 0, 0, 0.242205, 0.970225}, + {5534.42, -2815.45, 1562.84, 4.62834, 0, 0, 0.736191, -0.676774}, + {5519.64, -2831.12, 1526.46, 0.611008, 0, 0, 0.300774, 0.953696}, + {5551.04, -2827.55, 1523.5, 3.35206, 0, 0, 0.994468, -0.10504}, + {5469.22, -2802.87, 1503.5, 4.99509, 0, 0, 0.600436, -0.799673}, + {5427.8, -2737.26, 1487.12, 1.78673, 0, 0, 0.779186, 0.626793}, + {5454.1, -2709.1, 1485.92, 3.03552, 0, 0, 0.998594, 0.0530137}, + {5436.3, -2718.2, 1506.02, 2.7567, 0, 0, 0.981539, 0.191261}, + {5412.6, -2740.55, 1510.79, 2.98446, 0, 0, 0.996915, 0.0784832}, + {5406.12, -2752.48, 1521.01, 2.05769, 0, 0, 0.856705, 0.515807}, + {5445.24, -2676.35, 1521.89, 2.91378, 0, 0, 0.99352, 0.113661}, + {5481.4, -2665.08, 1482.23, 4.30001, 0, 0, 0.836895, -0.547363}, + {5443.51, -2675.44, 1487.12, 2.90986, 0, 0, 0.993295, 0.115606}, + {5391.72, -2647.3, 1528.9, 3.76987, 0, 0, 0.951063, -0.308997}, + {5421.09, -2734.12, 1521.01, 2.70567, 0, 0, 0.97634, 0.216242}, + {5405.39, -2710.33, 1533.77, 2.51324, 0, 0, 0.951052, 0.309032}, + {5423.96, -2703.76, 1516.34, 2.79206, 0, 0, 0.984767, 0.173879}, + {5444.75, -2735.23, 1486.37, 2.22657, 0, 0, 0.897155, 0.441715}, + {5570.98, -2747.91, 1495.7, 5.14433, 0, 0, 0.53915, -0.84221}, + {5567.79, -2673.9, 1484.66, 2.72529, 0, 0, 0.978415, 0.20665}, + {5600.71, -2696.8, 1500.42, 0.443704, 0, 0, 0.220036, 0.975492}, + {5600.7, -2693.04, 1515.2, 5.16003, 0, 0, 0.532522, -0.846416}, + {5627.56, -2839.66, 1510.53, 5.41527, 0, 0, 0.420463, -0.907309}, + {5622.02, -2868.71, 1516.22, 2.25482, 0, 0, 0.903303, 0.429002}, + {5586.61, -2878.97, 1510.34, 4.55604, 0, 0, 0.76017, -0.649724}, + {5583.78, -2843.71, 1509.54, 5.35715, 0, 0, 0.44665, -0.894709}, + {5580.95, -2811.3, 1513.3, 3.57587, 0, 0, 0.976518, -0.215434}, + {5542.52, -2869.31, 1523.13, 5.23304, 0, 0, 0.501275, -0.865288}, + {5557.35, -2866.36, 1518.76, 4.48299, 0, 0, 0.783388, -0.621533}, + {5380.91, -2849.36, 1512.81, 3.90962, 0, 0, 0.927168, -0.374646}, + {5395.76, -2881.41, 1521.11, 4.28426, 0, 0, 0.84118, -0.540755}, + {5374.87, -2859.63, 1528.98, 3.30252, 0, 0, 0.996765, -0.0803745}, + {5356.07, -2854.66, 1520.34, 5.83933, 0, 0, 0.220108, -0.975475}, + {5363.01, -2975.72, 1539.02, 4.13738, 0, 0, 0.87859, -0.477576}, + {5336.85, -2980.74, 1561.24, 5.11126, 0, 0, 0.553001, -0.83318}, + {5335.23, -2974.62, 1540.05, 5.04451, 0, 0, 0.580496, -0.814263}, + {5422.37, -2998.87, 1549.98, 4.51831, 0, 0, 0.772288, -0.635272}, + {5405.54, -3014.6, 1562.16, 5.86761, 0, 0, 0.206298, -0.978489}, + {5427.96, -3019.4, 1561.58, 3.53498, 0, 0, 0.980718, -0.19543}, + {5348.12, -2977.84, 1582.47, 3.94025, 0, 0, 0.921323, -0.388799}, + {5331.12, -2993.71, 1576.14, 0.0642734, 0, 0, 0.0321311, 0.999484}, + {5321.63, -2986.55, 1552.2, 5.29503, 0, 0, 0.474219, -0.880407}, + {5292.1, -2914.36, 1529.52, 2.9742, 0, 0, 0.996499, 0.083601}, + {5281.77, -2926.5, 1530.62, 1.67829, 0, 0, 0.744071, 0.6681}, + {5287.19, -2909.94, 1543.49, 3.31192, 0, 0, 0.996376, -0.0850591}, + {5534.15, -2679.35, 1483.61, 0.428685, 0, 0, 0.212705, 0.977116}, + {5545.43, -2647.82, 1483.05, 5.38848, 0, 0, 0.432578, -0.901596} +}; + +hyjalAI::hyjalAI(Creature *c) : npc_escortAI(c), Summons(me) +{ + pInstance = c->GetInstanceData(); + VeinsSpawned[0] = false; + VeinsSpawned[1] = false; + for (uint8 i=0; i<14; ++i) + VeinGUID[i] = 0; + InfernalCount = 0; + TeleportTimer = 1000; + Overrun = false; + Teleported = false; + WaitForTeleport = false; + OverrunCounter = 0; + OverrunCounter2 = 0; + InfernalPoint = 0; + RespawnTimer = 10000; + DoRespawn = false; + DoHide = false; + MassTeleportTimer = 0; + DoMassTeleport = false; +} + +void hyjalAI::JustSummoned(Creature *summoned) +{ + Summons.Summon(summoned); +} + +void hyjalAI::SummonedCreatureDespawn(Creature* summoned) +{ + Summons.Despawn(summoned); +} + +void hyjalAI::Reset() +{ + IsDummy = false; + me->setActive(true); + // GUIDs + PlayerGUID = 0; + BossGUID[0] = 0; + BossGUID[1] = 0; + + // Timers + NextWaveTimer = 10000; + CheckTimer = 0; + RetreatTimer = 1000; + + // Misc + WaveCount = 0; + EnemyCount = 0; + + // Set faction properly based on Creature entry + switch(me->GetEntry()) + { + case JAINA: + Faction = 0; + DoCast(me, SPELL_BRILLIANCE_AURA, true); + break; + + case THRALL: + Faction = 1; + break; + + case TYRANDE: + Faction = 2; + break; + } + + //Bools + EventBegun = false; + FirstBossDead = false; + SecondBossDead = false; + Summon = false; + bRetreat = false; + Debug = false; + + //Flags + me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); + + //Initialize spells + memset(Spell, 0, sizeof(Spell)); + + //Reset Instance Data for trash count + if (pInstance) + { + if ((!pInstance->GetData(DATA_ALLIANCE_RETREAT) && me->GetEntry() == JAINA) || (pInstance->GetData(DATA_ALLIANCE_RETREAT) && me->GetEntry() == THRALL)) + { + //Reset World States + pInstance->DoUpdateWorldState(WORLD_STATE_WAVES, 0); + pInstance->DoUpdateWorldState(WORLD_STATE_ENEMY, 0); + pInstance->DoUpdateWorldState(WORLD_STATE_ENEMYCOUNT, 0); + pInstance->SetData(DATA_RESET_TRASH_COUNT, 0); + } + } else error_log(ERROR_INST_DATA); + + //Visibility + DoHide = true; +} + +void hyjalAI::EnterEvadeMode() +{ + if (me->GetEntry() != JAINA) + me->RemoveAllAuras(); + me->DeleteThreatList(); + me->CombatStop(true); + me->LoadCreaturesAddon(); + + if (me->isAlive()) + me->GetMotionMaster()->MoveTargetedHome(); + + me->SetLootRecipient(NULL); +} + +void hyjalAI::EnterCombat(Unit * /*who*/) +{ + if (IsDummy)return; + for (uint8 i = 0; i < 3; ++i) + if (Spell[i].Cooldown) + SpellTimer[i] = Spell[i].Cooldown; + + Talk(ATTACKED); +} + +void hyjalAI::MoveInLineOfSight(Unit *who) +{ + if (IsDummy) + return; + + npc_escortAI::MoveInLineOfSight(who); +} + +void hyjalAI::SummonCreature(uint32 entry, float Base[4][3]) +{ + uint32 random = rand()%4; + float SpawnLoc[3]; + + for (uint8 i = 0; i < 3; ++i) + { + SpawnLoc[i] = Base[random][i]; + } + Creature* pCreature = NULL; + switch(entry) + { + case 17906: //GARGOYLE + + if (!FirstBossDead && (WaveCount == 1 || WaveCount == 3)) + {//summon at tower + pCreature = me->SummonCreature(entry, SpawnPointSpecial[SPAWN_NEAR_TOWER][0]+irand(-20,20), SpawnPointSpecial[SPAWN_NEAR_TOWER][1]+irand(-20,20), SpawnPointSpecial[SPAWN_NEAR_TOWER][2]+irand(-10,10), 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000); + if (pCreature) + CAST_AI(hyjal_trashAI, pCreature->AI())->useFlyPath = true; + }else{//summon at gate + pCreature = me->SummonCreature(entry, SpawnPointSpecial[SPAWN_GARG_GATE][0]+irand(-10,10), SpawnPointSpecial[SPAWN_GARG_GATE][1]+irand(-10,10), SpawnPointSpecial[SPAWN_GARG_GATE][2]+irand(-10,10), 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000); + } + break; + case 17907: //FROST_WYRM , + if (FirstBossDead && WaveCount == 1) //summon at gate + pCreature = me->SummonCreature(entry, SpawnPointSpecial[SPAWN_WYRM_GATE][0],SpawnPointSpecial[SPAWN_WYRM_GATE][1],SpawnPointSpecial[SPAWN_WYRM_GATE][2], 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000); + else + { + pCreature = me->SummonCreature(entry, SpawnPointSpecial[SPAWN_NEAR_TOWER][0], SpawnPointSpecial[SPAWN_NEAR_TOWER][1],SpawnPointSpecial[SPAWN_NEAR_TOWER][2], 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000); + if (pCreature) + CAST_AI(hyjal_trashAI, pCreature->AI())->useFlyPath = true; + } + break; + case 17908: //GIANT_INFERNAL + ++InfernalCount; + if (InfernalCount > 7) + InfernalCount = 0; + pCreature = me->SummonCreature(entry, InfernalPos[InfernalCount][0], InfernalPos[InfernalCount][1], InfernalPos[InfernalCount][2], 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000); + break; + default: + pCreature = me->SummonCreature(entry, SpawnLoc[0], SpawnLoc[1], SpawnLoc[2], 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000); + break; + + } + + if (pCreature) + { + // Increment Enemy Count to be used in World States and instance script + ++EnemyCount; + + pCreature->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE); + pCreature->setActive(true); + switch(entry) + { + case NECROMANCER: + case ABOMINATION: + case GHOUL: + case BANSHEE: + case CRYPT_FIEND: + case GARGOYLE: + case FROST_WYRM: + case GIANT_INFERNAL: + case FEL_STALKER: + case RAGE_WINTERCHILL: + case ANETHERON: + case KAZROGAL: + case AZGALOR: + CAST_AI(hyjal_trashAI, pCreature->AI())->IsEvent = true; + break; + } + if (pInstance) + { + if (pInstance->GetData(DATA_RAIDDAMAGE) < MINRAIDDAMAGE) + pCreature->SetDisableReputationGain(true);//no repu for solo farming + } + // Check if Creature is a boss. + if (pCreature->isWorldBoss()) + { + if (!FirstBossDead) BossGUID[0] = pCreature->GetGUID(); + else BossGUID[1] = pCreature->GetGUID(); + CheckTimer = 5000; + } + } +} + +void hyjalAI::SummonNextWave(Wave wave[18], uint32 Count, float Base[4][3]) +{ + // 1 in 4 chance we give a rally yell. Not sure if the chance is offilike. + if (rand()%4 == 0) + Talk(RALLY); + + if (!pInstance) + { + error_log(ERROR_INST_DATA); + return; + } + InfernalCount = 0;//reset infernal count every new wave + + EnemyCount = pInstance->GetData(DATA_TRASH); + for (uint8 i = 0; i < 18; ++i) + { + if (wave[Count].Mob[i]) + SummonCreature(wave[Count].Mob[i], Base); + } + + if (!wave[Count].IsBoss) + { + uint32 stateValue = Count+1; + if (FirstBossDead) + stateValue -= 9; // Subtract 9 from it to give the proper wave number if we are greater than 8 + + // Set world state to our current wave number + pInstance->DoUpdateWorldState(WORLD_STATE_WAVES, stateValue); // Set world state to our current wave number + // Enable world state + pInstance->DoUpdateWorldState(WORLD_STATE_ENEMY, 1); // Enable world state + + pInstance->SetData(DATA_TRASH, EnemyCount); // Send data for instance script to update count + + if (!Debug) + NextWaveTimer = wave[Count].WaveTimer; + else + { + NextWaveTimer = 15000; + debug_log("TSCR: HyjalAI: debug mode is enabled. Next Wave in 15 seconds"); + } + } + else + { + // Set world state for waves to 0 to disable it. + pInstance->DoUpdateWorldState(WORLD_STATE_WAVES, 0); + pInstance->DoUpdateWorldState(WORLD_STATE_ENEMY, 1); + + // Set World State for enemies invading to 1. + pInstance->DoUpdateWorldState(WORLD_STATE_ENEMYCOUNT, 1); + + Summon = false; + } + CheckTimer = 5000; +} + +void hyjalAI::StartEvent(Player* pPlayer) +{ + if (!pPlayer || IsDummy || !pInstance) + return; + + Talk(BEGIN); + + EventBegun = true; + Summon = true; + + NextWaveTimer = 15000; + CheckTimer = 5000; + PlayerGUID = pPlayer->GetGUID(); + + me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); + + pInstance->DoUpdateWorldState(WORLD_STATE_WAVES, 0); + pInstance->DoUpdateWorldState(WORLD_STATE_ENEMY, 0); + pInstance->DoUpdateWorldState(WORLD_STATE_ENEMYCOUNT, 0); + + DeSpawnVeins(); +} + +uint32 hyjalAI::GetInstanceData(uint32 Event) +{ + if (pInstance) + return pInstance->GetData(Event); + else error_log(ERROR_INST_DATA); + + return 0; +} + +void hyjalAI::Talk(uint32 id) +{ + std::list index; + for (uint8 i = 0; i < 9; ++i) + { + if (Faction == 0) // Alliance + { + if (JainaQuotes[i].id == id) + index.push_back(i); + } + else if (Faction == 1) // Horde + { + if (ThrallQuotes[i].id == id) + index.push_back(i); + } + } + + if (index.empty()) + return; // No quotes found, no use to continue + + uint8 ind = *(index.begin()) + rand()%index.size(); + + int32 YellId = 0; + if (Faction == 0) // Alliance + { + YellId = JainaQuotes[ind].textid; + } + else if (Faction == 1) // Horde + { + YellId = ThrallQuotes[ind].textid; + } + + if (YellId) + DoScriptText(YellId, me); +} + +void hyjalAI::Retreat() +{ + if (pInstance) + { + pInstance->SetData(TYPE_RETREAT,SPECIAL); + + if (Faction == 0) + { + pInstance->SetData(DATA_ALLIANCE_RETREAT, 1); + AddWaypoint(0,JainaWPs[0][0],JainaWPs[0][1],JainaWPs[0][2]); + AddWaypoint(1,JainaWPs[1][0],JainaWPs[1][1],JainaWPs[1][2]); + Start(false, false); + SetDespawnAtEnd(false);//move to center of alliance base + } + if (Faction == 1) + { + pInstance->SetData(DATA_HORDE_RETREAT, 1); + Creature* JainaDummy = me->SummonCreature(JAINA,JainaDummySpawn[0][0],JainaDummySpawn[0][1],JainaDummySpawn[0][2],JainaDummySpawn[0][3],TEMPSUMMON_TIMED_DESPAWN,60000); + if (JainaDummy) + { + JainaDummy->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); + CAST_AI(hyjalAI, JainaDummy->AI())->IsDummy = true; + DummyGuid = JainaDummy->GetGUID(); + } + AddWaypoint(0,JainaDummySpawn[1][0],JainaDummySpawn[1][1],JainaDummySpawn[1][2]); + Start(false, false); + SetDespawnAtEnd(false);//move to center of alliance base + } + } + SpawnVeins(); + Overrun = true; + me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);//cant talk after overrun event started +} + +void hyjalAI::SpawnVeins() +{ + if (Faction == 0) + { + if (VeinsSpawned[0])//prevent any buggers + return; + for (uint8 i = 0; i<7; ++i) + { + GameObject* gem = me->SummonGameObject(ANCIENT_VEIN,VeinPos[i][0],VeinPos[i][1],VeinPos[i][2],VeinPos[i][3],VeinPos[i][4],VeinPos[i][5],VeinPos[i][6],VeinPos[i][7],0); + if (gem) + VeinGUID[i]=gem->GetGUID(); + } + VeinsSpawned[0] = true; + }else{ + if (VeinsSpawned[1]) + return; + for (uint8 i = 7; i<14; ++i) + { + GameObject* gem = me->SummonGameObject(ANCIENT_VEIN,VeinPos[i][0],VeinPos[i][1],VeinPos[i][2],VeinPos[i][3],VeinPos[i][4],VeinPos[i][5],VeinPos[i][6],VeinPos[i][7],0); + if (gem) + VeinGUID[i]=gem->GetGUID(); + } + VeinsSpawned[1] = true; + } +} + +void hyjalAI::DeSpawnVeins() +{ + if (!pInstance) + return; + if (Faction == 1) + { + Creature* pUnit=Unit::GetCreature((*me),pInstance->GetData64(DATA_JAINAPROUDMOORE)); + if (!pUnit)return; + hyjalAI* ai = CAST_AI(hyjalAI, pUnit->AI()); + if (!ai)return; + for (uint8 i = 0; i<7; ++i) + { + if (GameObject* gem = pInstance->instance->GetGameObject(pInstance->GetData64(ai->VeinGUID[i]))) + gem->Delete(); + } + } else if (Faction) + { + Creature* pUnit=Unit::GetCreature((*me),pInstance->GetData64(DATA_THRALL)); + if (!pUnit)return; + hyjalAI* ai = CAST_AI(hyjalAI, pUnit->AI()); + if (!ai)return; + for (uint8 i = 7; i<14; ++i) + { + if (GameObject* gem = pInstance->instance->GetGameObject(pInstance->GetData64(ai->VeinGUID[i]))) + gem->Delete(); + } + } +} + +void hyjalAI::UpdateAI(const uint32 diff) +{ + if (IsDummy) + { + if (MassTeleportTimer < diff && DoMassTeleport) + { + DoCast(me, SPELL_MASS_TELEPORT, false); + DoMassTeleport = false; + } else MassTeleportTimer -= diff; + return; + } + if (DoHide) + { + DoHide = false; + switch(me->GetEntry()) + { + case JAINA: + if (pInstance && pInstance->GetData(DATA_ALLIANCE_RETREAT)) + { + me->SetVisibility(VISIBILITY_OFF); + HideNearPos(me->GetPositionX(), me->GetPositionY()); + HideNearPos(5037.76, -1889.71); + for (uint8 i = 0; i < 92; ++i)//summon fires + me->SummonGameObject(FLAMEOBJECT,AllianceFirePos[i][0],AllianceFirePos[i][1],AllianceFirePos[i][2],AllianceFirePos[i][3],AllianceFirePos[i][4],AllianceFirePos[i][5],AllianceFirePos[i][6],AllianceFirePos[i][7],0); + + } + else me->SetVisibility(VISIBILITY_ON); + break; + case THRALL: //thrall + if (pInstance && pInstance->GetData(DATA_HORDE_RETREAT)) + { + me->SetVisibility(VISIBILITY_OFF); + HideNearPos(me->GetPositionX(), me->GetPositionY()); + HideNearPos(5563, -2763.19); + HideNearPos(5542.2, -2629.36); + for (uint8 i = 0; i < 65; ++i)//summon fires + me->SummonGameObject(FLAMEOBJECT,HordeFirePos[i][0],HordeFirePos[i][1],HordeFirePos[i][2],HordeFirePos[i][3],HordeFirePos[i][4],HordeFirePos[i][5],HordeFirePos[i][6],HordeFirePos[i][7],0); + + } + else me->SetVisibility(VISIBILITY_ON); + break; + } + } + if (DoRespawn) + { + if (RespawnTimer <= diff) + { + DoRespawn = false; + RespawnNearPos(me->GetPositionX(), me->GetPositionY()); + if (Faction == 0) + { + RespawnNearPos(5037.76, -1889.71); + } else if (Faction == 1) + { + RespawnNearPos(5563, -2763.19); + RespawnNearPos(5542.2, -2629.36); + } + me->SetVisibility(VISIBILITY_ON); + }else{ + RespawnTimer -= diff; + me->SetVisibility(VISIBILITY_OFF); + } + return; + } + if (Overrun) + DoOverrun(Faction, diff); + if (bRetreat) + { + if (RetreatTimer <= diff) + { + IsDummy = true; + bRetreat = false; + HideNearPos(me->GetPositionX(), me->GetPositionY()); + switch(me->GetEntry()) + { + case JAINA://jaina + HideNearPos(5037.76, -1889.71); + break; + case THRALL://thrall + HideNearPos(5563, -2763.19); + HideNearPos(5542.2, -2629.36); + HideNearPos(5603.75, -2853.12); + break; + } + me->SetVisibility(VISIBILITY_OFF); + } else RetreatTimer -= diff; + } + + if (!EventBegun) + return; + + if (Summon) + { + if (pInstance && EnemyCount) + { + EnemyCount = pInstance->GetData(DATA_TRASH); + if (!EnemyCount) + NextWaveTimer = 5000; + } + + if (NextWaveTimer <= diff) + { + if (Faction == 0) + SummonNextWave(AllianceWaves, WaveCount, AllianceBase); + else if (Faction == 1) + SummonNextWave(HordeWaves, WaveCount, HordeBase); + ++WaveCount; + } else NextWaveTimer -= diff; + } + + if (CheckTimer <= diff) + { + for (uint8 i = 0; i < 2; ++i) + { + if (BossGUID[i]) + { + Unit* pUnit = Unit::GetUnit((*me), BossGUID[i]); + if (pUnit && (!pUnit->isAlive())) + { + if (BossGUID[i] == BossGUID[0]) + { + Talk(INCOMING); + FirstBossDead = true; + } + else if (BossGUID[i] == BossGUID[1]) + { + Talk(SUCCESS); + SecondBossDead = true; + } + EventBegun = false; + CheckTimer = 0; + me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); + BossGUID[i] = 0; + if (pInstance) + pInstance->DoUpdateWorldState(WORLD_STATE_ENEMY, 0); // Reset world state for enemies to disable it + } + } + } + CheckTimer = 5000; + } else CheckTimer -= diff; + + if (!UpdateVictim()) + return; + + for (uint8 i = 0; i < 3; ++i) + { + if (Spell[i].SpellId) + { + if (SpellTimer[i] <= diff) + { + if (me->IsNonMeleeSpellCasted(false)) + me->InterruptNonMeleeSpells(false); + + Unit *pTarget = NULL; + + switch(Spell[i].TargetType) + { + case TARGETTYPE_SELF: pTarget = me; break; + case TARGETTYPE_RANDOM: pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); break; + case TARGETTYPE_VICTIM: pTarget = me->getVictim(); break; + } + + if (pTarget && pTarget->isAlive()) + { + DoCast(pTarget, Spell[i].SpellId); + SpellTimer[i] = Spell[i].Cooldown; + } + } else SpellTimer[i] -= diff; + } + } + + DoMeleeAttackIfReady(); +} +void hyjalAI::JustDied(Unit* /*killer*/) +{ + if (IsDummy)return; + me->Respawn(); + me->SetVisibility(VISIBILITY_OFF); + DoRespawn = true; + RespawnTimer = 120000; + Talk(DEATH); + Summons.DespawnAll();//despawn all wave's summons + if (pInstance) + {//reset encounter if boss is despawned (ex: thrall is killed, boss despawns, event stucks at inprogress) + if (pInstance->GetData(DATA_RAGEWINTERCHILLEVENT) == IN_PROGRESS) + pInstance->SetData(DATA_RAGEWINTERCHILLEVENT, NOT_STARTED); + if (pInstance->GetData(DATA_ANETHERONEVENT) == IN_PROGRESS) + pInstance->SetData(DATA_ANETHERONEVENT, NOT_STARTED); + if (pInstance->GetData(DATA_KAZROGALEVENT) == IN_PROGRESS) + pInstance->SetData(DATA_KAZROGALEVENT, NOT_STARTED); + if (pInstance->GetData(DATA_AZGALOREVENT) == IN_PROGRESS) + pInstance->SetData(DATA_AZGALOREVENT, NOT_STARTED); + pInstance->SetData(DATA_RESET_RAIDDAMAGE, NULL);//reset damage on die + } +} +void hyjalAI::HideNearPos(float x, float y) +{ + CellPair pair(Trinity::ComputeCellPair(x, y)); + Cell cell(pair); + cell.data.Part.reserved = ALL_DISTRICT; + cell.SetNoCreate(); + + // First get all creatures. + std::list creatures; + Trinity::AllFriendlyCreaturesInGrid creature_check(me); + Trinity::CreatureListSearcher creature_searcher(me, creatures, creature_check); + TypeContainerVisitor + , + GridTypeMapContainer> creature_visitor(creature_searcher); + + // Get Creatures + cell.Visit(pair, creature_visitor, *(me->GetMap())); + + if (!creatures.empty()) + { + for (std::list::const_iterator itr = creatures.begin(); itr != creatures.end(); ++itr) + { + (*itr)->SetVisibility(VISIBILITY_OFF); + (*itr)->setFaction(35);//make them friendly so mobs won't attack them + } + } +} +void hyjalAI::RespawnNearPos(float x, float y) +{ + CellPair p(Trinity::ComputeCellPair(x, y)); + Cell cell(p); + cell.data.Part.reserved = ALL_DISTRICT; + cell.SetNoCreate(); + + Trinity::RespawnDo u_do; + Trinity::WorldObjectWorker worker(me, u_do); + TypeContainerVisitor, GridTypeMapContainer > obj_worker(worker); + cell.Visit(p, obj_worker, *me->GetMap()); +} +void hyjalAI::WaypointReached(uint32 i) +{ + if (i == 1 || (i == 0 && me->GetEntry() == THRALL)) + { + me->MonsterYell(YELL_HURRY,0,0); + WaitForTeleport = true; + TeleportTimer = 20000; + if (me->GetEntry() == JAINA) + DoCast(me, SPELL_MASS_TELEPORT, false); + if (me->GetEntry() == THRALL && DummyGuid) + { + Unit* Dummy = Unit::GetUnit((*me),DummyGuid); + if (Dummy) + { + CAST_AI(hyjalAI, CAST_CRE(Dummy)->AI())->DoMassTeleport = true; + CAST_AI(hyjalAI, CAST_CRE(Dummy)->AI())->MassTeleportTimer = 20000; + Dummy->CastSpell(me, SPELL_MASS_TELEPORT, false); + } + } + //do some talking + //all alive guards walk near here + CellPair pair(Trinity::ComputeCellPair(me->GetPositionX(), me->GetPositionY())); + Cell cell(pair); + cell.data.Part.reserved = ALL_DISTRICT; + cell.SetNoCreate(); + + // First get all creatures. + std::list creatures; + Trinity::AllFriendlyCreaturesInGrid creature_check(me); + Trinity::CreatureListSearcher creature_searcher(me, creatures, creature_check); + TypeContainerVisitor + , + GridTypeMapContainer> creature_visitor(creature_searcher); + + cell.Visit(pair, creature_visitor, *(me->GetMap())); + + if (!creatures.empty()) + { + for (std::list::const_iterator itr = creatures.begin(); itr != creatures.end(); ++itr) + { + if ((*itr) && (*itr)->isAlive() && (*itr) != me && (*itr)->GetEntry() != JAINA) + { + if (!(*itr)->IsWithinDist(me, 60)) + (*itr)->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE); + float x, y, z; + (*itr)->SetDefaultMovementType(IDLE_MOTION_TYPE); + (*itr)->GetMotionMaster()->Initialize(); + float range = 10; + if (me->GetEntry() == THRALL)range = 20; + me->GetNearPoint(me, x, y, z, range, 0, me->GetAngle((*itr))); + (*itr)->GetMotionMaster()->MovePoint(0, x+irand(-5,5), y+irand(-5,5), me->GetPositionZ()); + } + } + } + } +} +void hyjalAI::DoOverrun(uint32 faction, const uint32 diff) +{ + npc_escortAI::UpdateAI(diff); + if (WaitForTeleport) + { + if (TeleportTimer <= diff) + { + CellPair pair(Trinity::ComputeCellPair(me->GetPositionX(), me->GetPositionY())); + Cell cell(pair); + cell.data.Part.reserved = ALL_DISTRICT; + cell.SetNoCreate(); + + std::list creatures; + Trinity::AllFriendlyCreaturesInGrid creature_check(me); + Trinity::CreatureListSearcher creature_searcher(me, creatures, creature_check); + TypeContainerVisitor + , + GridTypeMapContainer> creature_visitor(creature_searcher); + + cell.Visit(pair, creature_visitor, *(me->GetMap())); + + if (!creatures.empty()) + { + for (std::list::const_iterator itr = creatures.begin(); itr != creatures.end(); ++itr) + { + if ((*itr) && (*itr)->isAlive()) + { + (*itr)->CastSpell(*itr, SPELL_TELEPORT_VISUAL, true); + (*itr)->setFaction(35);//make them friendly so mobs won't attack them + (*itr)->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + } + } + DoCast(me, SPELL_TELEPORT_VISUAL); + bRetreat = true; + RetreatTimer = 1000; + } + + WaitForTeleport = false; + Teleported = true; + }TeleportTimer -= diff; + } + if (!Teleported) + return; + Overrun = false;//execute once + switch(faction) + { + case 0://alliance + for (uint8 i = 0; i < 92; ++i)//summon fires + me->SummonGameObject(FLAMEOBJECT,AllianceFirePos[i][0],AllianceFirePos[i][1],AllianceFirePos[i][2],AllianceFirePos[i][3],AllianceFirePos[i][4],AllianceFirePos[i][5],AllianceFirePos[i][6],AllianceFirePos[i][7],0); + + for (uint8 i = 0; i < 25; ++i)//summon 25 ghouls + { + uint8 r = rand()%4; + Creature* pUnit = me->SummonCreature(GHOUL, AllianceBase[r][0]+irand(-15,15), AllianceBase[r][1]+irand(-15,15), AllianceBase[r][2], 0, TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000); + if (pUnit) + { + CAST_AI(hyjal_trashAI, pUnit->AI())->faction = Faction; + CAST_AI(hyjal_trashAI, pUnit->AI())->IsOverrun = true; + CAST_AI(hyjal_trashAI, pUnit->AI())->OverrunType = i; + pUnit->setActive(true); + } + } + for (uint8 i = 0; i < 3; ++i)//summon 3 abominations + { + uint8 r = rand()%4; + Creature* pUnit = me->SummonCreature(ABOMINATION, AllianceBase[r][0]+irand(-15,15), AllianceBase[r][1]+irand(-15,15), AllianceBase[r][2], 0, TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000); + if (pUnit) + { + CAST_AI(hyjal_trashAI, pUnit->AI())->faction = Faction; + CAST_AI(hyjal_trashAI, pUnit->AI())->IsOverrun = true; + CAST_AI(hyjal_trashAI, pUnit->AI())->OverrunType = i; + pUnit->setActive(true); + } + } + for (uint8 i = 0; i < 5; ++i)//summon 5 gargoyles + { + Creature* pUnit = me->SummonCreature(GARGOYLE, AllianceOverrunGargPos[i][0], AllianceOverrunGargPos[i][1], AllianceOverrunGargPos[i][2], AllianceOverrunGargPos[i][3], TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000); + if (pUnit) + { + pUnit->SetHomePosition(AllianceOverrunGargPos[i][0], AllianceOverrunGargPos[i][1], AllianceOverrunGargPos[i][2], AllianceOverrunGargPos[i][3]); + CAST_AI(hyjal_trashAI, pUnit->AI())->faction = Faction; + CAST_AI(hyjal_trashAI, pUnit->AI())->IsOverrun = true; + CAST_AI(hyjal_trashAI, pUnit->AI())->OverrunType = i; + pUnit->setActive(true); + } + } + break; + case 1://horde + for (uint8 i = 0; i < 65; ++i)//summon fires + me->SummonGameObject(FLAMEOBJECT,HordeFirePos[i][0],HordeFirePos[i][1],HordeFirePos[i][2],HordeFirePos[i][3],HordeFirePos[i][4],HordeFirePos[i][5],HordeFirePos[i][6],HordeFirePos[i][7],0); + + for (uint8 i = 0; i < 26; ++i)//summon infernals + { + Creature* pUnit = me->SummonCreature(GIANT_INFERNAL, InfernalSPWP[i][0], InfernalSPWP[i][1], InfernalSPWP[i][2], InfernalSPWP[i][3], TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000); + if (pUnit) + { + pUnit->SetHomePosition(InfernalSPWP[i][0], InfernalSPWP[i][1], InfernalSPWP[i][2], InfernalSPWP[i][3]); + CAST_AI(hyjal_trashAI, pUnit->AI())->faction = Faction; + CAST_AI(hyjal_trashAI, pUnit->AI())->IsOverrun = true; + CAST_AI(hyjal_trashAI, pUnit->AI())->OverrunType = i; + pUnit->setActive(true); + } + } + for (uint8 i = 0; i < 25; ++i)//summon 25 ghouls + { + uint8 r = rand()%4; + Creature* pUnit = me->SummonCreature(GHOUL, HordeBase[r][0]+irand(-15,15), HordeBase[r][1]+irand(-15,15), HordeBase[r][2], 0, TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000); + if (pUnit) + { + CAST_AI(hyjal_trashAI, pUnit->AI())->faction = Faction; + CAST_AI(hyjal_trashAI, pUnit->AI())->IsOverrun = true; + CAST_AI(hyjal_trashAI, pUnit->AI())->OverrunType = i; + pUnit->setActive(true); + } + } + for (uint8 i = 0; i < 5; ++i)//summon 5 abominations + { + uint8 r = rand()%4; + Creature* pUnit = me->SummonCreature(ABOMINATION, HordeBase[r][0]+irand(-15,15), HordeBase[r][1]+irand(-15,15), HordeBase[r][2], 0, TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000); + if (pUnit) + { + CAST_AI(hyjal_trashAI, pUnit->AI())->faction = Faction; + CAST_AI(hyjal_trashAI, pUnit->AI())->IsOverrun = true; + CAST_AI(hyjal_trashAI, pUnit->AI())->OverrunType = i; + pUnit->setActive(true); + } + } + break; + } +} diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h new file mode 100644 index 00000000000..5c75465b7b4 --- /dev/null +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h @@ -0,0 +1,248 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software licensed under GPL version 2 + * Please see the included DOCS/LICENSE.TXT for more information */ + +#ifndef SC_HYJALAI_H +#define SC_HYJALAI_H + +#include "hyjal.h" +#include "ScriptedEscortAI.h" + +// Trash Mobs summoned in waves +#define NECROMANCER 17899//done +#define ABOMINATION 17898//done +#define GHOUL 17895//done +#define BANSHEE 17905//done +#define CRYPT_FIEND 17897//done +#define GARGOYLE 17906//done +#define FROST_WYRM 17907//done +#define GIANT_INFERNAL 17908//done +#define FEL_STALKER 17916//done + +#define JAINA 17772 +#define THRALL 17852 +#define TYRANDE 17948 + +#define ANCIENT_VEIN 185557 +#define FLAMEOBJECT 182592 + +// Bosses summoned after every 8 waves +#define RAGE_WINTERCHILL 17767 +#define ANETHERON 17808 +#define KAZROGAL 17888 +#define AZGALOR 17842 +#define ARCHIMONDE 17968 + +#define SPELL_TELEPORT_VISUAL 41232 +#define SPELL_MASS_TELEPORT 16807 + +//Spells for Jaina +#define SPELL_BRILLIANCE_AURA 31260 // The database must handle this spell via creature_addon(it should, but is removed in evade..) +#define SPELL_BLIZZARD 31266 +#define SPELL_PYROBLAST 31263 +#define SPELL_SUMMON_ELEMENTALS 31264 + +//Thrall spells +#define SPELL_CHAIN_LIGHTNING 31330 +#define SPELL_SUMMON_DIRE_WOLF 31331 + +struct Wave +{ + uint32 Mob[18]; // Stores Creature Entries to be summoned in Waves + uint32 WaveTimer; // The timer before the next wave is summoned + bool IsBoss; // Simply used to inform the wave summoner that the next wave contains a boss to halt all waves after that +}; + +static Wave AllianceWaves[]= // Waves that will be summoned in the Alliance Base +{ // Rage Winterchill Wave 1-8 + {GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, 0, 0, 0, 0, 0, 0, 0, 0, 120000, false}, + {GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, CRYPT_FIEND, CRYPT_FIEND, 0, 0, 0, 0, 0, 0, 120000, false}, + {GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, 0, 0, 0, 0, 0, 0, 120000, false}, + {GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, NECROMANCER, NECROMANCER, 0, 0, 0, 0, 0, 0, 120000, false}, + {GHOUL, GHOUL, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, NECROMANCER, NECROMANCER, NECROMANCER, NECROMANCER, 0, 0, 0, 0, 0, 0, 120000, false}, + {GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, ABOMINATION, ABOMINATION, ABOMINATION, ABOMINATION, ABOMINATION, ABOMINATION, 0, 0, 0, 0, 0, 0, 120000, false}, + {GHOUL, GHOUL, GHOUL, GHOUL, NECROMANCER, NECROMANCER, NECROMANCER, NECROMANCER, ABOMINATION, ABOMINATION, ABOMINATION, ABOMINATION, 0, 0, 0, 0, 0, 0, 120000, false}, + {GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, ABOMINATION, ABOMINATION, NECROMANCER, NECROMANCER, 0, 0, 0, 0, 180000, false}, + // All 8 Waves are summoned, summon Rage Winterchill, next few waves are for Anetheron + {RAGE_WINTERCHILL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, true}, + // Anetheron Wave 1-8 + {GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, 0, 0, 0, 0, 0, 0, 0, 0, 120000, false}, + {GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, ABOMINATION, ABOMINATION, ABOMINATION, ABOMINATION, 0, 0, 0, 0, 0, 0, 120000, false}, + {GHOUL, GHOUL, GHOUL, GHOUL, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, NECROMANCER, NECROMANCER, NECROMANCER, NECROMANCER, 0, 0, 0, 0, 0, 0, 120000, false}, + {NECROMANCER, NECROMANCER, NECROMANCER, NECROMANCER, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, BANSHEE, BANSHEE, 0, 0, 0, 0, 0, 0, 120000, false}, + {GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, NECROMANCER, NECROMANCER, BANSHEE, BANSHEE, BANSHEE, BANSHEE, 0, 0, 0, 0, 0, 0, 120000, false}, + {GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, ABOMINATION, ABOMINATION, NECROMANCER, NECROMANCER, NECROMANCER, NECROMANCER, 0, 0, 0, 0, 0, 0, 120000, false}, + {CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, BANSHEE, BANSHEE, BANSHEE, BANSHEE, ABOMINATION, ABOMINATION, ABOMINATION, ABOMINATION, GHOUL, GHOUL, 0, 0, 0, 0, 120000, false}, + {GHOUL, GHOUL, GHOUL, ABOMINATION, ABOMINATION, ABOMINATION, ABOMINATION, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, BANSHEE, BANSHEE, NECROMANCER, NECROMANCER, 0, 0, 0, 0, 180000, false}, + // All 8 Waves are summoned, summon Anatheron + {ANETHERON, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, true} +}; + +static Wave HordeWaves[]= // Waves that are summoned in the Horde base +{ // Kaz'Rogal Wave 1-8 + {GHOUL, GHOUL, GHOUL, GHOUL, ABOMINATION, ABOMINATION, ABOMINATION, ABOMINATION, BANSHEE, BANSHEE, NECROMANCER, NECROMANCER, 0, 0, 0, 0, 0, 0, 180000, false}, + {GHOUL, GHOUL, GHOUL, GHOUL, GARGOYLE, GARGOYLE, GARGOYLE, GARGOYLE, GARGOYLE, GARGOYLE, GARGOYLE, GARGOYLE, GARGOYLE, GARGOYLE, 0, 0, 0, 0, 180000, false}, + {GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, NECROMANCER, NECROMANCER, 0, 0, 0, 0, 180000, false}, + {CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, GARGOYLE, GARGOYLE, GARGOYLE, GARGOYLE, GARGOYLE, GARGOYLE, NECROMANCER, NECROMANCER, 0, 0, 0, 0, 180000, false}, + {GHOUL, GHOUL, GHOUL, GHOUL, ABOMINATION, ABOMINATION, ABOMINATION, ABOMINATION, ABOMINATION, ABOMINATION, NECROMANCER, NECROMANCER, NECROMANCER, NECROMANCER, 0, 0, 0, 0, 180000, false}, + {GARGOYLE, GARGOYLE, GARGOYLE, GARGOYLE, GARGOYLE, GARGOYLE, GARGOYLE, GARGOYLE, FROST_WYRM, 0, 0, 0, 0, 0, 0, 0, 0, 0, 180000, false}, + {GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, ABOMINATION, ABOMINATION, ABOMINATION, ABOMINATION, FROST_WYRM, 0, 0, 0, 0, 0, 0, 0, 180000, false}, + {GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, CRYPT_FIEND, CRYPT_FIEND, ABOMINATION, ABOMINATION, ABOMINATION, ABOMINATION, BANSHEE, BANSHEE, NECROMANCER, NECROMANCER, 0, 0, 240000, false}, + // All 8 Waves are summoned, summon Kaz'Rogal, next few waves are for Azgalor + {KAZROGAL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, true}, + // Azgalor Wave 1-8 + {ABOMINATION, ABOMINATION, ABOMINATION, ABOMINATION, ABOMINATION, ABOMINATION, NECROMANCER, NECROMANCER, NECROMANCER, NECROMANCER, NECROMANCER, NECROMANCER, 0, 0, 0, 0, 0, 0, 180000, false}, + {GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, FROST_WYRM, GARGOYLE, GARGOYLE, GARGOYLE, GARGOYLE, GARGOYLE, GARGOYLE, GARGOYLE, GARGOYLE, 0, 0, 0, 0, 180000, false}, + {GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GIANT_INFERNAL, GIANT_INFERNAL, GIANT_INFERNAL, GIANT_INFERNAL, GIANT_INFERNAL, GIANT_INFERNAL, GIANT_INFERNAL, GIANT_INFERNAL, 0, 0, 0, 0, 180000, false}, + {GIANT_INFERNAL, GIANT_INFERNAL, GIANT_INFERNAL, GIANT_INFERNAL, GIANT_INFERNAL, GIANT_INFERNAL, GIANT_INFERNAL, GIANT_INFERNAL, FEL_STALKER, FEL_STALKER, FEL_STALKER, FEL_STALKER, FEL_STALKER, FEL_STALKER, 0, 0, 0, 0, 180000, false}, + {FEL_STALKER, FEL_STALKER, FEL_STALKER, FEL_STALKER, FEL_STALKER, FEL_STALKER, ABOMINATION, ABOMINATION, ABOMINATION, ABOMINATION, NECROMANCER, NECROMANCER, NECROMANCER, NECROMANCER, 0, 0, 0, 0, 180000, false}, + {NECROMANCER, NECROMANCER, NECROMANCER, NECROMANCER, NECROMANCER, NECROMANCER, BANSHEE, BANSHEE, BANSHEE, BANSHEE, BANSHEE, BANSHEE, 0, 0, 0, 0, 0, 0, 180000, false}, + {GHOUL, GHOUL, CRYPT_FIEND, CRYPT_FIEND, FEL_STALKER, FEL_STALKER, GIANT_INFERNAL, GIANT_INFERNAL, GIANT_INFERNAL, GIANT_INFERNAL, GIANT_INFERNAL, GIANT_INFERNAL, GIANT_INFERNAL, GIANT_INFERNAL, 0, 0, 0, 0, 180000, false}, + {CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, FEL_STALKER, FEL_STALKER, ABOMINATION, ABOMINATION, ABOMINATION, ABOMINATION, BANSHEE, BANSHEE, BANSHEE, BANSHEE, NECROMANCER, NECROMANCER, 0, 0, 240000, false}, + // All 8 Waves are summoned, summon Azgalor + {AZGALOR, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, true} +}; + +enum TargetType // Used in the spell cast system for the AI +{ + TARGETTYPE_SELF = 0, + TARGETTYPE_RANDOM = 1, + TARGETTYPE_VICTIM = 2, +}; + +struct Yells +{ + uint32 id; // Used to determine the type of yell (attack, rally, etc) + int32 textid; // The text id to be yelled +}; + +enum YellId +{ + ATTACKED = 0, // Used when attacked and set in combat + BEGIN = 1, // Used when the event is begun + INCOMING = 2, // Used to warn the raid that another wave phase is coming + RALLY = 3, // Used to rally the raid and warn that the next wave has been summoned + FAILURE = 4, // Used when raid has failed (unsure where to place) + SUCCESS = 5, // Used when the raid has sucessfully defeated a wave phase + DEATH = 6, // Used on death +}; + +static Yells JainaQuotes[]= +{ + {ATTACKED, -1534000}, + {ATTACKED, -1534001}, + {INCOMING, -1534002}, + {BEGIN, -1534003}, + {RALLY, -1534004}, + {RALLY, -1534005}, + {FAILURE, -1534006}, + {SUCCESS, -1534007}, + {DEATH, -1534008}, +}; + +static Yells ThrallQuotes[]= +{ + {ATTACKED, -1534009}, + {ATTACKED, -1534010}, + {INCOMING, -1534011}, + {BEGIN, -1534012}, + {RALLY, -1534013}, + {RALLY, -1534014}, + {FAILURE, -1534015}, + {SUCCESS, -1534016}, + {DEATH, -1534017}, +}; + +struct hyjalAI : public npc_escortAI +{ + hyjalAI(Creature *c); + + void Reset(); // Generically used to reset our variables. Do *not* call in EnterEvadeMode as this may make problems if the raid is still in combat + + void EnterEvadeMode(); // Send creature back to spawn location and evade. + + void EnterCombat(Unit * /*who*/); // Used to reset cooldowns for our spells and to inform the raid that we're under attack + + void UpdateAI(const uint32 diff); // Called to summon waves, check for boss deaths and to cast our spells. + + void JustDied(Unit* /*killer*/); // Called on death, informs the raid that they have failed. + + void SetFaction(uint32 _faction) // Set the faction to either Alliance or Horde in Hyjal + { + Faction = _faction; + } + + void Retreat(); // "Teleport" (teleport visual + set invisible) all friendly creatures away from the base. + + void SpawnVeins(); + void DeSpawnVeins(); + void JustSummoned(Creature *summoned); + void SummonedCreatureDespawn(Creature* summoned); + void HideNearPos(float x, float y); + void RespawnNearPos(float x, float y); + void WaypointReached(uint32 i); + void DoOverrun(uint32 faction, const uint32 diff); + void MoveInLineOfSight(Unit *who); + + void SummonCreature(uint32 entry, float Base[4][3]); // Summons a creature for that wave in that base + + // Summons the next wave, calls SummonCreature + void SummonNextWave(Wave wave[18], uint32 Count, float Base[4][3]); + + void StartEvent(Player* player); // Begins the event by gossip click + + uint32 GetInstanceData(uint32 Event); // Gets instance data for this instance, used to check if raid has gotten past a certain point and can access the next phase + + void Talk(uint32 id); // Searches for the appropriate yell and sound and uses it to inform the raid of various things + + public: + ScriptedInstance* pInstance; + + uint64 PlayerGUID; + uint64 BossGUID[2]; + uint64 VeinGUID[14]; + + uint32 NextWaveTimer; + uint32 WaveCount; + uint32 CheckTimer; + uint32 Faction; + uint32 EnemyCount; + uint32 RetreatTimer; + + bool EventBegun; + bool FirstBossDead; + bool SecondBossDead; + bool Summon; + bool bRetreat; + bool Debug; + bool VeinsSpawned[2]; + uint8 InfernalCount; + SummonList Summons; + bool Overrun; + bool Teleported; + bool WaitForTeleport; + uint32 TeleportTimer; + uint32 OverrunCounter; + uint32 OverrunCounter2; + uint32 InfernalPoint; + uint32 RespawnTimer; + bool DoRespawn; + bool DoHide; + bool IsDummy; + uint32 MassTeleportTimer; + bool DoMassTeleport; + uint64 DummyGuid; + + struct Spell + { + uint32 SpellId; + uint32 Cooldown; + uint32 TargetType; + }Spell[3]; + + private: + uint32 SpellTimer[3]; + //std::list CreatureList; +}; +#endif + diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp new file mode 100644 index 00000000000..c4cf9ede397 --- /dev/null +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp @@ -0,0 +1,1440 @@ + +#include "ScriptedPch.h" +#include "hyjal.h" +#include "hyjal_trash.h" +#include "hyjalAI.h" + +#define SPELL_METEOR 33814 //infernal visual +#define SPELL_IMMOLATION 37059 +#define SPELL_FLAME_BUFFET 31724 +#define NPC_TRIGGER 21987 //World Trigger (Tiny) +#define MODEL_INVIS 11686 //invisible model + +float HordeWPs[8][3]=//basic waypoints from spawn to leader +{ + {5492.91, -2404.61, 1462.63}, + {5531.76, -2460.87, 1469.55}, + {5554.58, -2514.66, 1476.12}, + {5554.16, -2567.23, 1479.90}, + {5540.67, -2625.99, 1480.89}, + {5508.16, -2659.20, 1480.15},//random rush starts from here + {5489.62, -2704.05, 1482.18}, + {5457.04, -2726.26, 1485.10} +}; +float AllianceWPs[8][3]=//basic waypoints from spawn to leader +{ + {4896.08, -1576.35, 1333.65}, + {4898.68, -1615.02, 1329.48}, + {4907.12, -1667.08, 1321.00}, + {4963.18, -1699.35, 1340.51}, + {4989.16, -1716.67, 1335.74},//first WP in the base, after the gate + {5026.27, -1736.89, 1323.02}, + {5037.77, -1770.56, 1324.36}, + {5067.23, -1789.95, 1321.17} +}; + +float FrostWyrmWPs[3][3]=//waypoints for the frost wyrms in horde base +{ + {5580.82, -2628.83, 1528.28}, + {5550.90, -2667.16, 1505.45}, + {5459.64, -2725.91, 1484.83} +}; + +float GargoyleWPs[3][3]=//waypoints for the gargoyles in horde base +{ + {5533.66, -2634.32, 1495.33}, + {5517.88, -2712.05, 1490.54}, + {5459.64, -2725.91, 1484.83} +}; + +float FlyPathWPs[3][3]=//waypoints for the gargoyls and frost wyrms in horde base in wave 1/3 +{ + {5531.96, -2772.83, 1516.68}, + {5498.32, -2734.84, 1497.01}, + {5456.67, -2725.48, 1493.08} +}; + +float AllianceOverrunWP[55][3]=//waypoints in the alliance base used in the end in the cleaning wave +{ + {4976.37,-1708.02,1339.43},//0spawn + {4994.83,-1725.52,1333.25},//1 start + {4982.92,-1753.7,1330.69},//2 end + {4996.75,-1721.47,1332.95},//3 start + {5015.74,-1755.05,1322.49},//4 + {4998.68,-1773.44,1329.59},//5 + {4994.83,-1725.52,1333.25},//6 start + {5022.8,-1735.46,1323.53},//7 + {5052.15,-1729.02,1320.88},//8 + {5082.43,-1726.29,1327.87},//9 + {4994.83,-1725.52,1333.25},//10 start + {5018.92,-1751.14,1322.19},//11 + {5040.09,-1792.09,1322.1},//12 + {4994.83,-1725.52,1333.25},//13 start + {5023.47,-1748.1,1322.51},//14 + {5013.43,-1842.39,1322.07},//15 + {4994.83,-1725.52,1333.25},//16 start + {5020.8,-1756.86,1322.2},//17 + {5019.53,-1824.6,1321.96},//18 + {5043.42,-1853.75,1324.52},//19 + {5053.02,-1864.13,1330.36},//20 + {5062.49,-1852.47,1330.49},//21 + {5015.27, -1738.77, 1324.83},//35//start 22 + {5027.97, -1775.25, 1321.87},//34 23 + {5015.94, -1821.24, 1321.86},//33 24 + {4983.25, -1857.4, 1320.48},//32 25 + {4981.51, -1883.7, 1322.34},//31 26 + {5002.33, -1893.98, 1325.88},//30 27 + {5049.32, -1886.54, 1331.69},//29 28 + {5089.68, -1846.88, 1328.99},//28 29 + {5127.90, -1825.14, 1335.58},//27 30 + {5163.27, -1789.08, 1337.04},//26 31 + {5138.97, -1755.88, 1334.57},//25 32 + {5096.63, -1742.22, 1329.61},//24 33 + {5065.81, -1729.43, 1325.66},//23 34 + {5049.32, -1726.31, 1320.64},//22 start + {5081.07, -1902.10, 1346.36},//36 abo start + {5107.65, -1912.03, 1356.49},//37 + {5132.83, -1927.07, 1362.42},//38 + {5147.78, -1954.41, 1365.98},//39 + {5164.96, -1966.48, 1367.04},//40 + {5189.04, -1961.06, 1367.90},//41 + {5212.27, -1975.30, 1365.58},//42 + {5221.82, -1994.18, 1364.97},//43 end1 + {5202.23, -1994.94, 1367.59},//44 end2 + {5279.94, -2049.68, 1311.38},//45 garg1 + {5289.15, -2219.06, 1291.12},//46 garg2 + {5202.07, -2136.10, 1305.07},//47 garg3 + {5071.52, -2425.63, 1454.48},//48 garg4 + {5120.65, -2467.92, 1463.93},//49 garg5 + {5283.04, -2043.26, 1300.11},//50 garg target1 + {5313.22, -2207.60, 1290.06},//51 garg target2 + {5180.41, -2121.87, 1292.62},//52 garg target3 + {5088.68, -2432.04, 1441.73},//53 garg target4 + {5111.26, -2454.73, 1449.63}//54 garg target5 + +}; + +float HordeOverrunWP[21][3]=//waypoints in the horde base used in the end in the cleaning wave +{ + {5490.72,-2702.94,1482.14},//0 start + {5469.77,-2741.34,1486.95}, + {5439.47,-2771.02,1494.59}, + {5408.85,-2811.92,1505.68}, + {5423.87,-2857.80,1515.55}, + {5428.19,-2898.15,1524.61}, + {5394.59,-2930.05,1528.23}, + {5351.11,-2935.80,1532.24}, + {5312.37,-2959.06,1536.21}, + {5264.93,-2989.80,1545.70}, + {5256.63,-3056.16,1559.24}, + {5267.32,-3119.55,1575.36}, + {5305.61,-3139.88,1586.38}, + {5330.56,-3135.37,1588.58}, + {5365.87,-3139.78,1583.96}, + {5389.39,-3163.57,1582.57},//15 end + {5500.86,-2669.89,1481.04},//16 start + {5472.08,-2715.14,1483.55}, + {5450.11,-2721.47,1485.61}, + {5433.25,-2712.93,1493.02},//19 end 1 + {5429.91,-2718.44,1493.42}//20 end 2 +}; + +hyjal_trashAI::hyjal_trashAI(Creature *c) : npc_escortAI(c) +{ + pInstance = c->GetInstanceData(); + IsEvent = false; + Delay = 0; + LastOverronPos = 0; + IsOverrun = false; + OverrunType = 0; + SetupOverrun = false; + faction = 0; + useFlyPath = false; + damageTaken = 0; + Reset(); +} + +void hyjal_trashAI::DamageTaken(Unit *done_by, uint32 &damage) +{ + if (done_by->GetTypeId() == TYPEID_PLAYER || (done_by->GetTypeId() == TYPEID_UNIT && CAST_CRE(done_by)->isPet())) + { + damageTaken += damage; + if (pInstance) + pInstance->SetData(DATA_RAIDDAMAGE,damage);//store raid's damage + } +} + +void hyjal_trashAI::UpdateAI(const uint32 /*diff*/) +{ + if (IsOverrun && !SetupOverrun) + { + SetupOverrun = true; + if (faction == 0) + { + if (me->GetEntry() == GARGOYLE) + { + DummyTarget[0] = AllianceOverrunWP[50+OverrunType][0]; //+OverrunType 0 - 4 + DummyTarget[1] = AllianceOverrunWP[50+OverrunType][1]; + DummyTarget[2] = AllianceOverrunWP[50+OverrunType][2]; + } + if (me->GetEntry() == ABOMINATION) + { + for (uint8 i = 0; i < 4; ++i) + AddWaypoint(i, AllianceWPs[i][0]+irand(-3,3), AllianceWPs[i][1]+irand(-3,3), AllianceWPs[i][2]); + switch(OverrunType) + { + case 0: + AddWaypoint(4, AllianceOverrunWP[22][0]+irand(-3,3), AllianceOverrunWP[22][1]+irand(-3,3), AllianceOverrunWP[22][2]); + AddWaypoint(5, AllianceOverrunWP[23][0]+irand(-3,3), AllianceOverrunWP[23][1]+irand(-3,3), AllianceOverrunWP[23][2]); + AddWaypoint(6, AllianceOverrunWP[24][0]+irand(-3,3), AllianceOverrunWP[24][1]+irand(-3,3), AllianceOverrunWP[24][2]); + AddWaypoint(7, AllianceOverrunWP[25][0]+irand(-3,3), AllianceOverrunWP[25][1]+irand(-3,3), AllianceOverrunWP[25][2]); + AddWaypoint(8, AllianceOverrunWP[26][0]+irand(-3,3), AllianceOverrunWP[26][1]+irand(-3,3), AllianceOverrunWP[26][2]); + AddWaypoint(9, AllianceOverrunWP[27][0]+irand(-3,3), AllianceOverrunWP[27][1]+irand(-3,3), AllianceOverrunWP[27][2]); + AddWaypoint(10, AllianceOverrunWP[28][0]+irand(-3,3), AllianceOverrunWP[28][1]+irand(-3,3), AllianceOverrunWP[28][2]); + + AddWaypoint(11, AllianceOverrunWP[36][0]+irand(-3,3), AllianceOverrunWP[36][1]+irand(-3,3), AllianceOverrunWP[36][2]); + AddWaypoint(12, AllianceOverrunWP[37][0]+irand(-3,3), AllianceOverrunWP[37][1]+irand(-3,3), AllianceOverrunWP[37][2]); + AddWaypoint(13, AllianceOverrunWP[38][0]+irand(-3,3), AllianceOverrunWP[38][1]+irand(-3,3), AllianceOverrunWP[38][2]); + AddWaypoint(14, AllianceOverrunWP[39][0]+irand(-3,3), AllianceOverrunWP[39][1]+irand(-3,3), AllianceOverrunWP[39][2]); + AddWaypoint(15, AllianceOverrunWP[40][0]+irand(-3,3), AllianceOverrunWP[40][1]+irand(-3,3), AllianceOverrunWP[40][2]); + AddWaypoint(16, AllianceOverrunWP[41][0]+irand(-3,3), AllianceOverrunWP[41][1]+irand(-3,3), AllianceOverrunWP[41][2]); + AddWaypoint(17, AllianceOverrunWP[42][0]+irand(-3,3), AllianceOverrunWP[42][1]+irand(-3,3), AllianceOverrunWP[42][2]); + AddWaypoint(18, AllianceOverrunWP[43][0]+irand(-3,3), AllianceOverrunWP[43][1]+irand(-3,3), AllianceOverrunWP[43][2]); + me->SetHomePosition(AllianceOverrunWP[43][0]+irand(-3,3), AllianceOverrunWP[43][1]+irand(-3,3), AllianceOverrunWP[43][2],0); + SetDespawnAtEnd(false); + LastOverronPos = 18; + Start(true, true); + break; + case 1: + AddWaypoint(4, AllianceOverrunWP[22][0]+irand(-3,3), AllianceOverrunWP[22][1]+irand(-3,3), AllianceOverrunWP[22][2]); + AddWaypoint(5, AllianceOverrunWP[23][0]+irand(-3,3), AllianceOverrunWP[23][1]+irand(-3,3), AllianceOverrunWP[23][2]); + AddWaypoint(6, AllianceOverrunWP[24][0]+irand(-3,3), AllianceOverrunWP[24][1]+irand(-3,3), AllianceOverrunWP[24][2]); + AddWaypoint(7, AllianceOverrunWP[25][0]+irand(-3,3), AllianceOverrunWP[25][1]+irand(-3,3), AllianceOverrunWP[25][2]); + AddWaypoint(8, AllianceOverrunWP[26][0]+irand(-3,3), AllianceOverrunWP[26][1]+irand(-3,3), AllianceOverrunWP[26][2]); + AddWaypoint(9, AllianceOverrunWP[27][0]+irand(-3,3), AllianceOverrunWP[27][1]+irand(-3,3), AllianceOverrunWP[27][2]); + AddWaypoint(10, AllianceOverrunWP[28][0]+irand(-3,3), AllianceOverrunWP[28][1]+irand(-3,3), AllianceOverrunWP[28][2]); + + AddWaypoint(11, AllianceOverrunWP[36][0]+irand(-3,3), AllianceOverrunWP[36][1]+irand(-3,3), AllianceOverrunWP[36][2]); + AddWaypoint(12, AllianceOverrunWP[37][0]+irand(-3,3), AllianceOverrunWP[37][1]+irand(-3,3), AllianceOverrunWP[37][2]); + AddWaypoint(13, AllianceOverrunWP[38][0]+irand(-3,3), AllianceOverrunWP[38][1]+irand(-3,3), AllianceOverrunWP[38][2]); + AddWaypoint(14, AllianceOverrunWP[39][0]+irand(-3,3), AllianceOverrunWP[39][1]+irand(-3,3), AllianceOverrunWP[39][2]); + AddWaypoint(15, AllianceOverrunWP[40][0]+irand(-3,3), AllianceOverrunWP[40][1]+irand(-3,3), AllianceOverrunWP[40][2]); + AddWaypoint(16, AllianceOverrunWP[41][0]+irand(-3,3), AllianceOverrunWP[41][1]+irand(-3,3), AllianceOverrunWP[41][2]); + AddWaypoint(17, AllianceOverrunWP[42][0]+irand(-3,3), AllianceOverrunWP[42][1]+irand(-3,3), AllianceOverrunWP[42][2]); + AddWaypoint(18, AllianceOverrunWP[44][0]+irand(-3,3), AllianceOverrunWP[44][1]+irand(-3,3), AllianceOverrunWP[44][2]); + me->SetHomePosition(AllianceOverrunWP[44][0]+irand(-3,3), AllianceOverrunWP[44][1]+irand(-3,3), AllianceOverrunWP[44][2],0); + SetDespawnAtEnd(false); + LastOverronPos = 18; + Start(true, true); + break; + default: + for (uint8 i = 22; i < 36; ++i) + AddWaypoint(i-18, AllianceOverrunWP[i][0]+irand(-3,3), AllianceOverrunWP[i][1]+irand(-3,3), AllianceOverrunWP[i][2]); + + SetDespawnAtEnd(true); + LastOverronPos = 17; + Start(true, true); + break; + } + } + if (me->GetEntry() == GHOUL) + { + for (uint8 i = 0; i < 4; ++i) + AddWaypoint(i, AllianceWPs[i][0]+irand(-3,3), AllianceWPs[i][1]+irand(-3,3), AllianceWPs[i][2]); + switch(OverrunType) + { + case 0: + AddWaypoint(4, AllianceOverrunWP[1][0]+irand(-3,3), AllianceOverrunWP[1][1]+irand(-3,3), AllianceOverrunWP[1][2]); + AddWaypoint(5, AllianceOverrunWP[2][0]+irand(-3,3), AllianceOverrunWP[2][1]+irand(-3,3), AllianceOverrunWP[2][2]); + me->SetHomePosition(AllianceOverrunWP[2][0]+irand(-3,3), AllianceOverrunWP[2][1]+irand(-3,3), AllianceOverrunWP[2][2],0); + SetDespawnAtEnd(false); + LastOverronPos = 5; + Start(true, true); + break; + case 1: + AddWaypoint(4, AllianceOverrunWP[3][0]+irand(-3,3), AllianceOverrunWP[3][1]+irand(-3,3), AllianceOverrunWP[3][2]); + AddWaypoint(5, AllianceOverrunWP[4][0]+irand(-3,3), AllianceOverrunWP[4][1]+irand(-3,3), AllianceOverrunWP[4][2]); + AddWaypoint(6, AllianceOverrunWP[5][0]+irand(-3,3), AllianceOverrunWP[5][1]+irand(-3,3), AllianceOverrunWP[5][2]); + me->SetHomePosition(AllianceOverrunWP[5][0]+irand(-3,3), AllianceOverrunWP[5][1]+irand(-3,3), AllianceOverrunWP[5][2],0); + SetDespawnAtEnd(false); + LastOverronPos = 6; + Start(true, true); + break; + case 2: + AddWaypoint(4, AllianceOverrunWP[6][0]+irand(-3,3), AllianceOverrunWP[6][1]+irand(-3,3), AllianceOverrunWP[6][2]); + AddWaypoint(5, AllianceOverrunWP[7][0]+irand(-3,3), AllianceOverrunWP[7][1]+irand(-3,3), AllianceOverrunWP[7][2]); + AddWaypoint(6, AllianceOverrunWP[8][0]+irand(-3,3), AllianceOverrunWP[8][1]+irand(-3,3), AllianceOverrunWP[8][2]); + AddWaypoint(7, AllianceOverrunWP[9][0]+irand(-3,3), AllianceOverrunWP[9][1]+irand(-3,3), AllianceOverrunWP[9][2]); + me->SetHomePosition(AllianceOverrunWP[9][0]+irand(-3,3), AllianceOverrunWP[9][1]+irand(-3,3), AllianceOverrunWP[9][2],0); + SetDespawnAtEnd(false); + LastOverronPos = 7; + Start(true, true); + break; + case 3: + AddWaypoint(4, AllianceOverrunWP[10][0]+irand(-3,3), AllianceOverrunWP[10][1]+irand(-3,3), AllianceOverrunWP[10][2]); + AddWaypoint(5, AllianceOverrunWP[11][0]+irand(-3,3), AllianceOverrunWP[11][1]+irand(-3,3), AllianceOverrunWP[11][2]); + AddWaypoint(6, AllianceOverrunWP[12][0]+irand(-3,3), AllianceOverrunWP[12][1]+irand(-3,3), AllianceOverrunWP[12][2]); + me->SetHomePosition(AllianceOverrunWP[12][0]+irand(-3,3), AllianceOverrunWP[12][1]+irand(-3,3), AllianceOverrunWP[12][2],0); + SetDespawnAtEnd(false); + LastOverronPos = 6; + Start(true, true); + break; + case 4: + AddWaypoint(4, AllianceOverrunWP[13][0]+irand(-3,3), AllianceOverrunWP[13][1]+irand(-3,3), AllianceOverrunWP[13][2]); + AddWaypoint(5, AllianceOverrunWP[14][0]+irand(-3,3), AllianceOverrunWP[14][1]+irand(-3,3), AllianceOverrunWP[14][2]); + AddWaypoint(6, AllianceOverrunWP[15][0]+irand(-3,3), AllianceOverrunWP[15][1]+irand(-3,3), AllianceOverrunWP[15][2]); + me->SetHomePosition(AllianceOverrunWP[15][0]+irand(-3,3), AllianceOverrunWP[15][1]+irand(-3,3), AllianceOverrunWP[15][2],0); + SetDespawnAtEnd(false); + LastOverronPos = 6; + Start(true, true); + break; + case 5: + AddWaypoint(4, AllianceOverrunWP[16][0]+irand(-3,3), AllianceOverrunWP[16][1]+irand(-3,3), AllianceOverrunWP[16][2]); + AddWaypoint(5, AllianceOverrunWP[17][0]+irand(-3,3), AllianceOverrunWP[17][1]+irand(-3,3), AllianceOverrunWP[17][2]); + AddWaypoint(6, AllianceOverrunWP[18][0]+irand(-3,3), AllianceOverrunWP[18][1]+irand(-3,3), AllianceOverrunWP[18][2]); + AddWaypoint(7, AllianceOverrunWP[19][0]+irand(-3,3), AllianceOverrunWP[19][1]+irand(-3,3), AllianceOverrunWP[19][2]); + AddWaypoint(8, AllianceOverrunWP[20][0]+irand(-3,3), AllianceOverrunWP[20][1]+irand(-3,3), AllianceOverrunWP[20][2]); + AddWaypoint(9, AllianceOverrunWP[21][0]+irand(-3,3), AllianceOverrunWP[21][1]+irand(-3,3), AllianceOverrunWP[21][2]); + me->SetHomePosition(AllianceOverrunWP[21][0]+irand(-3,3), AllianceOverrunWP[21][1]+irand(-3,3), AllianceOverrunWP[21][2],0); + SetDespawnAtEnd(false); + LastOverronPos = 9; + Start(true, true); + break; + default: + for (uint8 i = 22; i < 36; ++i) + AddWaypoint(i-18, AllianceOverrunWP[i][0]+irand(-3,3), AllianceOverrunWP[i][1]+irand(-3,3), AllianceOverrunWP[i][2]); + SetDespawnAtEnd(true); + LastOverronPos = 17; + Start(true, true); + break; + } + } + } + if (faction == 1) + { + if (me->GetEntry() == GHOUL) + { + for (uint8 i = 0; i < 6; ++i) + AddWaypoint(i, HordeWPs[i][0]+irand(-3,3), HordeWPs[i][1]+irand(-3,3), HordeWPs[i][2]); + switch(OverrunType) + { + case 0: + AddWaypoint(5, HordeOverrunWP[16][0]+irand(-10,10), HordeOverrunWP[16][1]+irand(-10,10), HordeOverrunWP[16][2]); + AddWaypoint(6, HordeOverrunWP[17][0]+irand(-10,10), HordeOverrunWP[17][1]+irand(-10,10), HordeOverrunWP[17][2]); + AddWaypoint(7, HordeOverrunWP[18][0], HordeOverrunWP[18][1], HordeOverrunWP[18][2]); + AddWaypoint(8, HordeOverrunWP[19][0], HordeOverrunWP[19][1], HordeOverrunWP[19][2]); + me->SetHomePosition(HordeOverrunWP[19][0], HordeOverrunWP[19][1], HordeOverrunWP[19][2],0); + SetDespawnAtEnd(false); + LastOverronPos = 8; + Start(true, true); + break; + case 1: + AddWaypoint(5, HordeOverrunWP[16][0]+irand(-10,10), HordeOverrunWP[16][1]+irand(-10,10), HordeOverrunWP[16][2]); + AddWaypoint(6, HordeOverrunWP[17][0]+irand(-10,10), HordeOverrunWP[17][1]+irand(-10,10), HordeOverrunWP[17][2]); + AddWaypoint(7, HordeOverrunWP[18][0], HordeOverrunWP[18][1], HordeOverrunWP[18][2]); + AddWaypoint(8, HordeOverrunWP[20][0], HordeOverrunWP[20][1], HordeOverrunWP[20][2]); + me->SetHomePosition(HordeOverrunWP[20][0], HordeOverrunWP[20][1], HordeOverrunWP[20][2],0); + SetDespawnAtEnd(false); + LastOverronPos = 8; + Start(true, true); + break; + default: + for (uint8 i = 0; i < 16; ++i) + AddWaypoint(i+6, HordeOverrunWP[i][0]+irand(-10,10), HordeOverrunWP[i][1]+irand(-10,10), HordeOverrunWP[i][2]); + SetDespawnAtEnd(true); + LastOverronPos = 21; + Start(true, true); + break; + } + } + if (me->GetEntry() == ABOMINATION) + { + for (uint8 i = 0; i < 6; ++i) + AddWaypoint(i, HordeWPs[i][0]+irand(-10,10), HordeWPs[i][1]+irand(-10,10), HordeWPs[i][2]); + for (uint8 i = 0; i < 16; ++i) + AddWaypoint(i+6, HordeOverrunWP[i][0]+irand(-10,10), HordeOverrunWP[i][1]+irand(-10,10), HordeOverrunWP[i][2]); + SetDespawnAtEnd(true); + LastOverronPos = 21; + Start(true, true); + } + } + } +} + +void hyjal_trashAI::JustDied(Unit * /*victim*/) +{ + if (!pInstance) + return; + if (IsEvent && !me->isWorldBoss()) + pInstance->SetData(DATA_TRASH, 0);//signal trash is dead + + if ((pInstance->GetData(DATA_RAIDDAMAGE) < MINRAIDDAMAGE && !me->isWorldBoss()) || (damageTaken < me->GetMaxHealth()/4 && me->isWorldBoss())) + me->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);//no loot +} + +struct mob_giant_infernalAI : public hyjal_trashAI +{ + mob_giant_infernalAI(Creature* c) : hyjal_trashAI(c) + { + pInstance = c->GetInstanceData(); + meteor = false;//call once! + CanMove = false; + Delay = rand()%30000; + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + me->SetDisplayId(MODEL_INVIS); + pGo = false; + pos = 0; + Reset(); + } + + bool meteor; + bool CanMove; + bool WpEnabled; + bool pGo; + uint32 pos; + uint32 spawnTimer; + uint32 FlameBuffetTimer; + bool imol; + + void Reset() + { + spawnTimer = 2000; + FlameBuffetTimer= 2000; + imol = false; + } + + void EnterCombat(Unit* /*who*/) {} + + void WaypointReached(uint32 i) + { + pos = i; + if (i == 0 && pInstance && !IsOverrun) + { + if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall + { + Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); + if (pTarget && pTarget->isAlive()) + me->AddThreat(pTarget,0.0); + } + } + } + + void UpdateAI(const uint32 diff) + { + if (Delay <= diff) + { + Delay=0; + }else{ + Delay-=diff; + return; + } + if (!meteor) + { + float x,y,z; + me->GetPosition(x,y,z); + Creature* trigger = me->SummonCreature(NPC_TRIGGER,x+8,y+8,z+25+rand()%10,me->GetOrientation(),TEMPSUMMON_TIMED_DESPAWN,1000); + if (trigger) + { + trigger->SetVisibility(VISIBILITY_OFF); + trigger->setFaction(me->getFaction()); + trigger->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); + trigger->CastSpell(me,SPELL_METEOR,true); + } + me->GetMotionMaster()->Clear(); + meteor = true; + } else if (!CanMove){ + if (spawnTimer <= diff) + { + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + me->SetDisplayId(me->GetUInt32Value(UNIT_FIELD_NATIVEDISPLAYID)); + CanMove = true; + if (pInstance) + { + if (pInstance->GetData(DATA_ALLIANCE_RETREAT) && !pInstance->GetData(DATA_HORDE_RETREAT)) + { + Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); + if (pTarget && pTarget->isAlive()) + me->AddThreat(pTarget,0.0); + } else if (pInstance->GetData(DATA_ALLIANCE_RETREAT) && pInstance->GetData(DATA_HORDE_RETREAT)){ + //do overrun + } + } + } else spawnTimer -= diff; + } + if (!CanMove)return; + hyjal_trashAI::UpdateAI(diff); + if (IsEvent || IsOverrun) + npc_escortAI::UpdateAI(diff); + if (IsEvent) + { + if (!pGo) + { + pGo = true; + if (pInstance) + { + AddWaypoint(0, HordeWPs[7][0]+irand(-3,3), HordeWPs[7][1]+irand(-3,3), HordeWPs[7][2]);//HordeWPs[7] infront of thrall + Start(true, true); + SetDespawnAtEnd(false); + } + } + } + + if (!UpdateVictim()) + return; + if (!imol) + { + DoCast(me, SPELL_IMMOLATION); + imol=true; + } + if (FlameBuffetTimer <= diff) + { + DoCast(me->getVictim(), SPELL_FLAME_BUFFET, true); + FlameBuffetTimer = 7000; + } else FlameBuffetTimer -= diff; + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_mob_giant_infernal(Creature* pCreature) +{ + return new mob_giant_infernalAI(pCreature); +} + +#define SPELL_DISEASE_CLOUD 31607 +#define SPELL_KNOCKDOWN 31610 + +struct mob_abominationAI : public hyjal_trashAI +{ + mob_abominationAI(Creature* c) : hyjal_trashAI(c) + { + pInstance = c->GetInstanceData(); + pGo = false; + pos = 0; + Reset(); + } + + bool pGo; + uint32 KnockDownTimer; + uint32 pos; + void Reset() + { + KnockDownTimer = 10000; + } + + void WaypointReached(uint32 i) + { + pos = i; + if (i == 7 && pInstance && !IsOverrun) + { + if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall + { + Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); + if (pTarget && pTarget->isAlive()) + me->AddThreat(pTarget,0.0); + }else{ + Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); + if (pTarget && pTarget->isAlive()) + me->AddThreat(pTarget,0.0); + } + } + if (i == LastOverronPos && IsOverrun) + { + if ((faction == 0 && LastOverronPos == 17) || (faction == 1 && LastOverronPos == 21)) + { + me->setDeathState(DEAD); + me->RemoveCorpse(); + } + } + } + + void EnterCombat(Unit* /*who*/) {} + + void UpdateAI(const uint32 diff) + { + hyjal_trashAI::UpdateAI(diff); + if (IsEvent || IsOverrun) + npc_escortAI::UpdateAI(diff); + if (IsEvent) + { + if (!pGo) + { + pGo = true; + if (pInstance) + { + if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs + { + for (uint8 i = 0; i < 8; ++i) + AddWaypoint(i, HordeWPs[i][0]+irand(-3,3), HordeWPs[i][1]+irand(-3,3), HordeWPs[i][2]); + Start(false, true); + SetDespawnAtEnd(false); + }else//use alliance WPs + { + for (uint8 i = 0; i < 8; ++i) + AddWaypoint(i, AllianceWPs[i][0]+irand(-3,3), AllianceWPs[i][1]+irand(-3,3), AllianceWPs[i][2]); + Start(false, true); + SetDespawnAtEnd(false); + } + } + } + } + if (!me->HasAura(SPELL_DISEASE_CLOUD)) + DoCast(me, SPELL_DISEASE_CLOUD); + if (!UpdateVictim()) + return; + if (KnockDownTimer <= diff) + { + DoCast(me->getVictim(), SPELL_KNOCKDOWN); + KnockDownTimer = 15000+rand()%10000; + } else KnockDownTimer -= diff; + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_mob_abomination(Creature* pCreature) +{ + return new mob_abominationAI(pCreature); +} + +#define SPELL_FRENZY 31540 + +struct mob_ghoulAI : public hyjal_trashAI +{ + mob_ghoulAI(Creature* c) : hyjal_trashAI(c) + { + pInstance = c->GetInstanceData(); + pGo = false; + pos = 0; + Reset(); + } + + bool pGo; + uint32 FrenzyTimer; + uint32 pos; + uint32 MoveTimer; + bool RandomMove; + void Reset() + { + FrenzyTimer = 5000+rand()%5000; + MoveTimer = 2000; + RandomMove = false; + } + + void WaypointReached(uint32 i) + { + pos = i; + if (i == 7 && pInstance && !IsOverrun) + { + if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall + { + Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); + if (pTarget && pTarget->isAlive()) + me->AddThreat(pTarget,0.0); + }else{ + Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); + if (pTarget && pTarget->isAlive()) + me->AddThreat(pTarget,0.0); + } + } + if (i == LastOverronPos && IsOverrun) + { + me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_ATTACKUNARMED); + if ((faction == 0 && LastOverronPos == 17) || (faction == 1 && LastOverronPos == 21)) + { + me->setDeathState(DEAD); + me->RemoveCorpse(); + } + + } + } + + void EnterCombat(Unit* /*who*/) {} + + void UpdateAI(const uint32 diff) + { + hyjal_trashAI::UpdateAI(diff); + if (IsEvent || IsOverrun) + npc_escortAI::UpdateAI(diff); + if (IsEvent) + { + if (!pGo) + { + pGo = true; + if (pInstance) + { + if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs + { + for (uint8 i = 0; i < 8; ++i) + AddWaypoint(i, HordeWPs[i][0]+irand(-3,3), HordeWPs[i][1]+irand(-3,3), HordeWPs[i][2]); + Start(false, true); + SetDespawnAtEnd(false); + }else//use alliance WPs + { + for (uint8 i = 0; i < 8; ++i) + AddWaypoint(i, AllianceWPs[i][0]+irand(-3,3), AllianceWPs[i][1]+irand(-3,3), AllianceWPs[i][2]); + Start(false, true); + SetDespawnAtEnd(false); + } + } + } + } + if (FrenzyTimer <= diff) + { + DoCast(me, SPELL_FRENZY); + FrenzyTimer = 15000+rand()%15000; + } else FrenzyTimer -= diff; + if (!UpdateVictim()) + return; + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_mob_ghoul(Creature* pCreature) +{ + return new mob_ghoulAI(pCreature); +} + +#define SPELL_RAISE_DEAD_1 31617 +#define SPELL_RAISE_DEAD_2 31624 +#define SPELL_RAISE_DEAD_3 31625 +#define SPELL_SHADOW_BOLT 31627 + +struct mob_necromancerAI : public hyjal_trashAI +{ + mob_necromancerAI(Creature* c) : hyjal_trashAI(c), summons(me) + { + pInstance = c->GetInstanceData(); + pGo = false; + pos = 0; + Reset(); + } + SummonList summons; + bool pGo; + uint32 ShadowBoltTimer; + uint32 pos; + void Reset() + { + ShadowBoltTimer = 1000+rand()%5000; + summons.DespawnAll(); + } + + void JustSummoned(Creature* summon) + { + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0,30,true); + if (pTarget && summon) + summon->Attack(pTarget,false); + summons.Summon(summon); + } + void SummonedCreatureDespawn(Creature *summon) {summons.Despawn(summon);} + void WaypointReached(uint32 i) + { + pos = i; + if (i == 7 && pInstance && !IsOverrun) + { + if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall + { + Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); + if (pTarget && pTarget->isAlive()) + me->AddThreat(pTarget,0.0); + }else{ + Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); + if (pTarget && pTarget->isAlive()) + me->AddThreat(pTarget,0.0); + } + } + } + + void KilledUnit(Unit* /*victim*/) + { + switch (urand(0,2)) + { + case 0: + DoSpawnCreature(17902,3,0,0,0,TEMPSUMMON_TIMED_DESPAWN, 60000); + DoSpawnCreature(17902,-3,0,0,0,TEMPSUMMON_TIMED_DESPAWN, 60000); + break; + case 1: + DoSpawnCreature(17903,3,0,0,0,TEMPSUMMON_TIMED_DESPAWN, 60000); + DoSpawnCreature(17903,-3,0,0,0,TEMPSUMMON_TIMED_DESPAWN, 60000); + break; + case 2: + DoSpawnCreature(RAND(17902,17903),3,0,0,0,TEMPSUMMON_TIMED_DESPAWN, 60000); + break; + } + } + + void EnterCombat(Unit* /*who*/) {} + + void UpdateAI(const uint32 diff) + { + hyjal_trashAI::UpdateAI(diff); + if (IsEvent || IsOverrun) + npc_escortAI::UpdateAI(diff); + if (IsEvent) + { + if (!pGo) + { + pGo = true; + if (pInstance) + { + if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs + { + for (uint8 i = 0; i < 8; ++i) + AddWaypoint(i, HordeWPs[i][0]+irand(-3,3), HordeWPs[i][1]+irand(-3,3), HordeWPs[i][2]); + Start(true, true); + SetDespawnAtEnd(false); + }else//use alliance WPs + { + for (uint8 i = 0; i < 8; ++i) + AddWaypoint(i, AllianceWPs[i][0]+irand(-3,3), AllianceWPs[i][1]+irand(-3,3), AllianceWPs[i][2]); + Start(true, true); + SetDespawnAtEnd(false); + } + } + } + } + if (!UpdateVictim()) + return; + if (ShadowBoltTimer <= diff) + { + DoCast(me->getVictim(), SPELL_SHADOW_BOLT); + ShadowBoltTimer = 20000+rand()%10000; + } else ShadowBoltTimer -= diff; + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_mob_necromancer(Creature* pCreature) +{ + return new mob_necromancerAI(pCreature); +} + +#define SPELL_BANSHEE_CURSE 31651 +#define SPELL_BANSHEE_WAIL 38183 +#define SPELL_ANTI_MAGIC_SHELL 31662 + +struct mob_bansheeAI : public hyjal_trashAI +{ + mob_bansheeAI(Creature* c) : hyjal_trashAI(c) + { + pInstance = c->GetInstanceData(); + pGo = false; + pos = 0; + Reset(); + } + + bool pGo; + uint32 CourseTimer; + uint32 WailTimer; + uint32 ShellTimer; + uint32 pos; + void Reset() + { + CourseTimer = 20000+rand()%5000; + WailTimer = 15000+rand()%5000; + ShellTimer = 50000+rand()%10000; + } + + void WaypointReached(uint32 i) + { + pos = i; + if (i == 7 && pInstance && !IsOverrun) + { + if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall + { + Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); + if (pTarget && pTarget->isAlive()) + me->AddThreat(pTarget,0.0); + }else{ + Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); + if (pTarget && pTarget->isAlive()) + me->AddThreat(pTarget,0.0); + } + } + } + + void EnterCombat(Unit* /*who*/) {} + + void UpdateAI(const uint32 diff) + { + hyjal_trashAI::UpdateAI(diff); + if (IsEvent || IsOverrun) + npc_escortAI::UpdateAI(diff); + if (IsEvent) + { + if (!pGo) + { + pGo = true; + if (pInstance) + { + if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs + { + for (uint8 i = 0; i < 8; ++i) + AddWaypoint(i, HordeWPs[i][0]+irand(-3,3), HordeWPs[i][1]+irand(-3,3), HordeWPs[i][2]); + Start(false, true); + SetDespawnAtEnd(false); + }else//use alliance WPs + { + for (uint8 i = 0; i < 8; ++i) + AddWaypoint(i, AllianceWPs[i][0]+irand(-3,3), AllianceWPs[i][1]+irand(-3,3), AllianceWPs[i][2]); + Start(false, true); + SetDespawnAtEnd(false); + } + } + } + } + if (!UpdateVictim()) + return; + if (CourseTimer <= diff) + { + DoCast(me->getVictim(), SPELL_BANSHEE_CURSE); + CourseTimer = 20000+rand()%5000; + } else CourseTimer -= diff; + if (WailTimer <= diff) + { + DoCast(me->getVictim(), SPELL_BANSHEE_WAIL); + WailTimer = 15000+rand()%5000; + } else WailTimer -= diff; + if (ShellTimer <= diff) + { + DoCast(me, SPELL_ANTI_MAGIC_SHELL); + ShellTimer = 50000+rand()%10000; + } else ShellTimer -= diff; + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_mob_banshee(Creature* pCreature) +{ + return new mob_bansheeAI(pCreature); +} + +#define SPELL_WEB 28991 + +struct mob_crypt_fiendAI : public hyjal_trashAI +{ + mob_crypt_fiendAI(Creature* c) : hyjal_trashAI(c) + { + pInstance = c->GetInstanceData(); + pGo = false; + pos = 0; + Reset(); + } + + bool pGo; + uint32 WebTimer; + uint32 pos; + void Reset() + { + WebTimer = 20000+rand()%5000; + } + + void WaypointReached(uint32 i) + { + pos = i; + if (i == 7 && pInstance && !IsOverrun) + { + if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall + { + Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); + if (pTarget && pTarget->isAlive()) + me->AddThreat(pTarget,0.0); + }else{ + Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); + if (pTarget && pTarget->isAlive()) + me->AddThreat(pTarget,0.0); + } + } + } + + void EnterCombat(Unit* /*who*/) {} + + void UpdateAI(const uint32 diff) + { + hyjal_trashAI::UpdateAI(diff); + if (IsEvent || IsOverrun) + npc_escortAI::UpdateAI(diff); + if (IsEvent) + { + if (!pGo) + { + pGo = true; + if (pInstance) + { + if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs + { + for (uint8 i = 0; i < 8; ++i) + AddWaypoint(i, HordeWPs[i][0]+irand(-3,3), HordeWPs[i][1]+irand(-3,3), HordeWPs[i][2]); + Start(false, true); + SetDespawnAtEnd(false); + }else//use alliance WPs + { + for (uint8 i = 0; i < 8; ++i) + AddWaypoint(i, AllianceWPs[i][0]+irand(-3,3), AllianceWPs[i][1]+irand(-3,3), AllianceWPs[i][2]); + Start(false, true); + SetDespawnAtEnd(false); + } + + } + } + } + if (!UpdateVictim()) + return; + if (WebTimer <= diff) + { + DoCast(me->getVictim(), SPELL_WEB); + WebTimer = 20000+rand()%5000; + } else WebTimer -= diff; + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_mob_crypt_fiend(Creature* pCreature) +{ + return new mob_crypt_fiendAI(pCreature); +} + +#define SPELL_MANA_BURN 31729 + +struct mob_fel_stalkerAI : public hyjal_trashAI +{ + mob_fel_stalkerAI(Creature* c) : hyjal_trashAI(c) + { + pInstance = c->GetInstanceData(); + pGo = false; + pos = 0; + Reset(); + } + + bool pGo; + uint32 ManaBurnTimer; + uint32 pos; + void Reset() + { + ManaBurnTimer = 9000+rand()%5000; + } + + void WaypointReached(uint32 i) + { + pos = i; + if (i == 7 && pInstance && !IsOverrun) + { + if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall + { + Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); + if (pTarget && pTarget->isAlive()) + me->AddThreat(pTarget,0.0); + }else{ + Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); + if (pTarget && pTarget->isAlive()) + me->AddThreat(pTarget,0.0); + } + } + } + + void EnterCombat(Unit* /*who*/) {} + + void UpdateAI(const uint32 diff) + { + hyjal_trashAI::UpdateAI(diff); + if (IsEvent || IsOverrun) + npc_escortAI::UpdateAI(diff); + if (IsEvent) + { + if (!pGo) + { + pGo = true; + if (pInstance) + { + if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs + { + for (uint8 i = 0; i < 8; ++i) + AddWaypoint(i, HordeWPs[i][0]+irand(-3,3), HordeWPs[i][1]+irand(-3,3), HordeWPs[i][2]); + Start(false, true); + SetDespawnAtEnd(false); + }else//use alliance WPs + { + for (uint8 i = 0; i < 8; ++i) + AddWaypoint(i, AllianceWPs[i][0]+irand(-3,3), AllianceWPs[i][1]+irand(-3,3), AllianceWPs[i][2]); + Start(false, true); + SetDespawnAtEnd(false); + } + + } + } + } + if (!UpdateVictim()) + return; + if (ManaBurnTimer <= diff) + { + DoCast(me->getVictim(), SPELL_MANA_BURN); + ManaBurnTimer = 9000+rand()%5000; + } else ManaBurnTimer -= diff; + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_mob_fel_stalker(Creature* pCreature) +{ + return new mob_fel_stalkerAI(pCreature); +} + +#define SPELL_FROST_BREATH 31688 + +struct mob_frost_wyrmAI : public hyjal_trashAI +{ + mob_frost_wyrmAI(Creature* c) : hyjal_trashAI(c) + { + pInstance = c->GetInstanceData(); + pGo = false; + pos = 0; + Reset(); + } + + bool pGo; + uint32 FrostBreathTimer; + uint32 pos; + uint32 MoveTimer; + + void Reset() + { + FrostBreathTimer = 5000; + MoveTimer = 0; + me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); + } + + void WaypointReached(uint32 i) + { + pos = i; + if (i == 2 && pInstance && !IsOverrun) + { + Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); + if (pTarget && pTarget->isAlive()) + { + me->AddThreat(pTarget,0.0); + DoCast(pTarget, SPELL_FROST_BREATH, true); + } + } + } + + void JustDied(Unit * /*victim*/) + { + if (pInstance && IsEvent) + pInstance->SetData(DATA_TRASH, 0);//signal trash is dead + + float x,y,z; + me->GetPosition(x,y,z); + z = me->GetMap()->GetHeight(x, y, z); + me->GetMotionMaster()->MovePoint(0,x,y,z); + me->GetMap()->CreatureRelocation(me, x,y,z,0); + } + + void EnterCombat(Unit* /*who*/) {} + + void UpdateAI(const uint32 diff) + { + hyjal_trashAI::UpdateAI(diff); + if (IsEvent || IsOverrun) + { + CAST_AI(hyjal_trashAI, me->AI())->SetCanAttack(false); + npc_escortAI::UpdateAI(diff); + } + if (IsEvent) + { + if (!pGo) + { + pGo = true; + if (pInstance) + { + if (!useFlyPath) + { + for (uint8 i = 0; i < 3; ++i) + AddWaypoint(i, FrostWyrmWPs[i][0], FrostWyrmWPs[i][1], FrostWyrmWPs[i][2]); + Start(false, true); + SetDespawnAtEnd(false); + }else{//fly path FlyPathWPs + for (uint8 i = 0; i < 3; ++i) + AddWaypoint(i, FlyPathWPs[i][0]+irand(-10,10), FlyPathWPs[i][1]+irand(-10,10), FlyPathWPs[i][2]); + Start(false, true); + SetDespawnAtEnd(false); + } + } + } + } + if (!UpdateVictim()) + return; + if (!me->IsWithinDist(me->getVictim(), 25)){ + if (MoveTimer <= diff) + { + me->GetMotionMaster()->MoveChase(me->getVictim()); + MoveTimer = 2000; + } else MoveTimer-=diff; + } + + if (FrostBreathTimer <= diff) + { + if (!me->IsWithinDist(me->getVictim(), 25)) + { + DoCast(me->getVictim(), SPELL_FROST_BREATH); + me->StopMoving(); + me->GetMotionMaster()->Clear(); + FrostBreathTimer = 4000; + } + } else FrostBreathTimer -= diff; + } +}; + +CreatureAI* GetAI_mob_frost_wyrm(Creature* pCreature) +{ + return new mob_frost_wyrmAI(pCreature); +} + +#define SPELL_GARGOYLE_STRIKE 31664 + +struct mob_gargoyleAI : public hyjal_trashAI +{ + mob_gargoyleAI(Creature* c) : hyjal_trashAI(c) + { + pInstance = c->GetInstanceData(); + pGo = false; + pos = 0; + DummyTarget[0] = 0;DummyTarget[1] = 0;DummyTarget[2] = 0; + Reset(); + } + + bool pGo; + uint32 StrikeTimer; + uint32 pos; + uint32 MoveTimer; + float Zpos; + bool forcemove; + + void Reset() + { + forcemove = true; + Zpos = 10.0; + StrikeTimer = 2000+rand()%5000; + MoveTimer = 0; + me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); + } + + void WaypointReached(uint32 i) + { + pos = i; + if (i == 2 && pInstance && !IsOverrun) + { + Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); + if (pTarget && pTarget->isAlive()) + { + me->AddThreat(pTarget,0.0); + DoCast(pTarget, SPELL_GARGOYLE_STRIKE, true); + } + } + } + + void JustDied(Unit *victim) + { + float x,y,z; + me->GetPosition(x,y,z); + z = me->GetMap()->GetHeight(x, y, z); + me->GetMotionMaster()->MovePoint(0,x,y,z); + me->GetMap()->CreatureRelocation(me, x,y,z,0); + hyjal_trashAI::JustDied(victim); + } + + void UpdateAI(const uint32 diff) + { + hyjal_trashAI::UpdateAI(diff); + if (IsEvent || IsOverrun) + { + CAST_AI(hyjal_trashAI, me->AI())->SetCanAttack(false); + npc_escortAI::UpdateAI(diff); + } + if (IsEvent) + { + if (!pGo) + { + pGo = true; + if (pInstance) + { + if (!useFlyPath) + { + for (uint8 i = 0; i < 3; ++i) + AddWaypoint(i, GargoyleWPs[i][0]+irand(-10,10), GargoyleWPs[i][1]+irand(-10,10), GargoyleWPs[i][2]); + Start(false, true); + SetDespawnAtEnd(false); + }else{//fly path FlyPathWPs + for (uint8 i = 0; i < 3; ++i) + AddWaypoint(i, FlyPathWPs[i][0]+irand(-10,10), FlyPathWPs[i][1]+irand(-10,10), FlyPathWPs[i][2]); + Start(false, true); + SetDespawnAtEnd(false); + } + } + } + } + if (IsOverrun && !UpdateVictim()) + { + if (faction == 0)//alliance + { + if (StrikeTimer <= diff) + { + me->CastSpell(DummyTarget[0],DummyTarget[1],DummyTarget[2],SPELL_GARGOYLE_STRIKE,false); + StrikeTimer = 2000+rand()%1000; + } else StrikeTimer -= diff; + } + } + if (!UpdateVictim()) + return; + if (!me->IsWithinDist(me->getVictim(), 20) || forcemove) + { + forcemove = false; + if (forcemove) + { + Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); + if (pTarget) + me->Attack(pTarget,false); + } + if (MoveTimer <= diff) + { + float x,y,z; + me->getVictim()->GetPosition(x,y,z); + me->GetMotionMaster()->MovePoint(0,x,y,z+Zpos); + Zpos-=1.0; + if (Zpos <= 0)Zpos=0; + MoveTimer = 2000; + } else MoveTimer-=diff; + } + if (StrikeTimer <= diff) + { + if (me->IsWithinDist(me->getVictim(), 20)) + { + DoCast(me->getVictim(), SPELL_GARGOYLE_STRIKE); + me->StopMoving(); + me->GetMotionMaster()->Clear(); + StrikeTimer = 2000+rand()%1000; + } else StrikeTimer=0; + } else StrikeTimer -= diff; + } +}; + +CreatureAI* GetAI_mob_gargoyle(Creature* pCreature) +{ + return new mob_gargoyleAI(pCreature); +} + +#define SPELL_EXPLODING_SHOT 7896 + +struct alliance_riflemanAI : public Scripted_NoMovementAI +{ + alliance_riflemanAI(Creature *c) : Scripted_NoMovementAI(c) + { + Reset(); + } + + uint32 ExplodeTimer; + + void JustDied(Unit* /*who*/) + { + } + + void Reset() + { + ExplodeTimer = 5000+rand()%5000; + } + + void MoveInLineOfSight(Unit *who) + { + if (!who || me->getVictim()) + return; + + if (who->isTargetableForAttack() && me->IsHostileTo(who)) + { + //float attackRadius = me->GetAttackDistance(who); + if (me->IsWithinDistInMap(who, 30)) + AttackStart(who); + } + } + + void EnterCombat(Unit * /*who*/) + { + } + + void UpdateAI(const uint32 diff) + { + //Check if we have a target + if (!UpdateVictim()) + return; + if (ExplodeTimer <= diff) + { + if (!me->IsWithinDistInMap(me->getVictim(), 30)) + { + EnterEvadeMode(); + return; + } + int dmg = 500+rand()%700; + me->CastCustomSpell(me->getVictim(), SPELL_EXPLODING_SHOT, &dmg, 0, 0, false); + ExplodeTimer = 5000+rand()%5000; + } else ExplodeTimer -= diff; + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_alliance_rifleman(Creature* pCreature) +{ + return new alliance_riflemanAI(pCreature); +} + +void AddSC_hyjal_trash() +{ + Script *newscript = new Script; + newscript->Name = "mob_giant_infernal"; + newscript->GetAI = &GetAI_mob_giant_infernal; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_abomination"; + newscript->GetAI = &GetAI_mob_abomination; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_ghoul"; + newscript->GetAI = &GetAI_mob_ghoul; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_necromancer"; + newscript->GetAI = &GetAI_mob_necromancer; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_banshee"; + newscript->GetAI = &GetAI_mob_banshee; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_crypt_fiend"; + newscript->GetAI = &GetAI_mob_crypt_fiend; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_fel_stalker"; + newscript->GetAI = &GetAI_mob_fel_stalker; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_frost_wyrm"; + newscript->GetAI = &GetAI_mob_frost_wyrm; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_gargoyle"; + newscript->GetAI = &GetAI_mob_gargoyle; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "alliance_rifleman"; + newscript->GetAI = &GetAI_alliance_rifleman; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.h b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.h new file mode 100644 index 00000000000..21ee4bc06cc --- /dev/null +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.h @@ -0,0 +1,35 @@ + +#ifndef SC_HYJAL_TRASH_AI_H +#define SC_HYJAL_TRASH_AI_H + +#include "hyjal.h" +#include "ScriptedEscortAI.h" + +#define MINRAIDDAMAGE 700000//minimal damage before trash can drop loot and reputation, resets if faction leader dies + +struct hyjal_trashAI : public npc_escortAI +{ + hyjal_trashAI(Creature *c); + + void UpdateAI(const uint32 diff); + + void JustDied(Unit* /*killer*/); + + void DamageTaken(Unit *done_by, uint32 &damage); + + public: + ScriptedInstance* pInstance; + bool IsEvent; + uint32 Delay; + uint32 LastOverronPos; + bool IsOverrun; + bool SetupOverrun; + uint32 OverrunType; + uint8 faction; + bool useFlyPath; + uint32 damageTaken; + float DummyTarget[3]; + + //private: +}; +#endif diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp new file mode 100644 index 00000000000..e89d518c5bc --- /dev/null +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp @@ -0,0 +1,324 @@ + /* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Instance_Mount_Hyjal +SD%Complete: 100 +SDComment: Instance Data Scripts and functions to acquire mobs and set encounter status for use in various Hyjal Scripts +SDCategory: Caverns of Time, Mount Hyjal +EndScriptData */ + +#include "ScriptedPch.h" +#include "hyjal.h" +#include "hyjal_trash.h" + +enum eEnums +{ + MAX_ENCOUNTER = 5, + + GO_ANCIENT_GEM = 185557 +}; +/* Battle of Mount Hyjal encounters: +0 - Rage Winterchill event +1 - Anetheron event +2 - Kaz'rogal event +3 - Azgalor event +4 - Archimonde event +*/ + +struct instance_mount_hyjal : public ScriptedInstance +{ + instance_mount_hyjal(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; + + uint32 m_auiEncounter[MAX_ENCOUNTER]; + std::string str_data; + + std::list m_uiAncientGemGUID; + + uint64 RageWinterchill; + uint64 Anetheron; + uint64 Kazrogal; + uint64 Azgalor; + uint64 Archimonde; + uint64 JainaProudmoore; + uint64 Thrall; + uint64 TyrandeWhisperwind; + uint64 HordeGate; + uint64 ElfGate; + + uint32 Trash; + + uint32 hordeRetreat; + uint32 allianceRetreat; + bool ArchiYell; + + uint32 RaidDamage; + + #define YELL_EFFORTS "All of your efforts have been in vain, for the draining of the World Tree has already begun. Soon the heart of your world will beat no more." + #define YELL_EFFORTS_NAME "Archimonde" + + void Initialize() + { + memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); + + m_uiAncientGemGUID.clear(); + + RageWinterchill = 0; + Anetheron = 0; + Kazrogal = 0; + Azgalor = 0; + Archimonde = 0; + JainaProudmoore = 0; + Thrall = 0; + TyrandeWhisperwind = 0; + HordeGate = 0; + ElfGate = 0; + ArchiYell = false; + RaidDamage = 0; + + Trash = 0; + + hordeRetreat = 0; + allianceRetreat = 0; + } + + bool IsEncounterInProgress() const + { + for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) + if (m_auiEncounter[i] == IN_PROGRESS) return true; + + return false; + } + + void OnGameObjectCreate(GameObject* pGo, bool /*add*/) + { + switch(pGo->GetEntry()) + { + case 182060: + HordeGate = pGo->GetGUID(); + if (allianceRetreat) + HandleGameObject(0, true, pGo); + else + HandleGameObject(0, false, pGo); + break; + case 182061: + ElfGate = pGo->GetGUID(); + if (hordeRetreat) + HandleGameObject(0, true, pGo); + else + HandleGameObject(0, false, pGo); + break; + case GO_ANCIENT_GEM: + m_uiAncientGemGUID.push_back(pGo->GetGUID()); + break; + } + } + + void OnCreatureCreate(Creature* pCreature, bool /*add*/) + { + switch(pCreature->GetEntry()) + { + case 17767: RageWinterchill = pCreature->GetGUID(); break; + case 17808: Anetheron = pCreature->GetGUID(); break; + case 17888: Kazrogal = pCreature->GetGUID(); break; + case 17842: Azgalor = pCreature->GetGUID(); break; + case 17968: Archimonde = pCreature->GetGUID(); break; + case 17772: JainaProudmoore = pCreature->GetGUID(); break; + case 17852: Thrall = pCreature->GetGUID(); break; + case 17948: TyrandeWhisperwind = pCreature->GetGUID(); break; + } + } + + uint64 GetData64(uint32 identifier) + { + switch(identifier) + { + case DATA_RAGEWINTERCHILL: return RageWinterchill; + case DATA_ANETHERON: return Anetheron; + case DATA_KAZROGAL: return Kazrogal; + case DATA_AZGALOR: return Azgalor; + case DATA_ARCHIMONDE: return Archimonde; + case DATA_JAINAPROUDMOORE: return JainaProudmoore; + case DATA_THRALL: return Thrall; + case DATA_TYRANDEWHISPERWIND: return TyrandeWhisperwind; + } + + return 0; + } + + void SetData(uint32 type, uint32 data) + { + switch(type) + { + case DATA_RAGEWINTERCHILLEVENT: m_auiEncounter[0] = data; break; + case DATA_ANETHERONEVENT: + m_auiEncounter[1] = data; + break; + case DATA_KAZROGALEVENT: m_auiEncounter[2] = data; break; + case DATA_AZGALOREVENT: + { + m_auiEncounter[3] = data; + if (data == DONE) + { + if (ArchiYell)break; + ArchiYell = true; + + Creature* pCreature = instance->GetCreature(Azgalor); + if (pCreature) + { + Creature* pUnit = pCreature->SummonCreature(21987,pCreature->GetPositionX(),pCreature->GetPositionY(),pCreature->GetPositionZ(),0,TEMPSUMMON_TIMED_DESPAWN,10000); + + Map* pMap = pCreature->GetMap(); + if (pMap->IsDungeon() && pUnit) + { + pUnit->SetVisibility(VISIBILITY_OFF); + Map::PlayerList const &PlayerList = pMap->GetPlayers(); + if (PlayerList.isEmpty()) + return; + + for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) + { + if (i->getSource()) + { + WorldPacket data(SMSG_MESSAGECHAT, 200); + pUnit->BuildMonsterChat(&data,CHAT_MSG_MONSTER_YELL,YELL_EFFORTS,0,YELL_EFFORTS_NAME,i->getSource()->GetGUID()); + i->getSource()->GetSession()->SendPacket(&data); + + WorldPacket data2(SMSG_PLAY_SOUND, 4); + data2 << 10986; + i->getSource()->GetSession()->SendPacket(&data2); + } + } + } + } + } + } + break; + case DATA_ARCHIMONDEEVENT: m_auiEncounter[4] = data; break; + case DATA_RESET_TRASH_COUNT: Trash = 0; break; + + case DATA_TRASH: + if (data) Trash = data; + else Trash--; + DoUpdateWorldState(WORLD_STATE_ENEMYCOUNT, Trash); + break; + case TYPE_RETREAT: + if (data == SPECIAL) + { + if (!m_uiAncientGemGUID.empty()) + { + for (std::list::const_iterator itr = m_uiAncientGemGUID.begin(); itr != m_uiAncientGemGUID.end(); ++itr) + { + //don't know how long it expected + DoRespawnGameObject(*itr,DAY); + } + } + } + break; + case DATA_ALLIANCE_RETREAT: + allianceRetreat = data; + HandleGameObject(HordeGate, true); + SaveToDB(); + break; + case DATA_HORDE_RETREAT: + hordeRetreat = data; + HandleGameObject(ElfGate, true); + SaveToDB(); + break; + case DATA_RAIDDAMAGE: + RaidDamage += data; + if (RaidDamage >= MINRAIDDAMAGE) + RaidDamage = MINRAIDDAMAGE; + break; + case DATA_RESET_RAIDDAMAGE: + RaidDamage = 0; + break; + } + + debug_log("TSCR: Instance Hyjal: Instance data updated for event %u (Data=%u)",type,data); + + if (data == DONE) + { + OUT_SAVE_INST_DATA; + + std::ostringstream saveStream; + saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " " + << m_auiEncounter[3] << " " << m_auiEncounter[4] + << " " << allianceRetreat << " " << hordeRetreat + << " " << RaidDamage; + + str_data = saveStream.str(); + + SaveToDB(); + OUT_SAVE_INST_DATA_COMPLETE; + } + + } + + uint32 GetData(uint32 type) + { + switch(type) + { + case DATA_RAGEWINTERCHILLEVENT: return m_auiEncounter[0]; + case DATA_ANETHERONEVENT: return m_auiEncounter[1]; + case DATA_KAZROGALEVENT: return m_auiEncounter[2]; + case DATA_AZGALOREVENT: return m_auiEncounter[3]; + case DATA_ARCHIMONDEEVENT: return m_auiEncounter[4]; + case DATA_TRASH: return Trash; + case DATA_ALLIANCE_RETREAT: return allianceRetreat; + case DATA_HORDE_RETREAT: return hordeRetreat; + case DATA_RAIDDAMAGE: return RaidDamage; + } + return 0; + } + + std::string GetSaveData() + { + return str_data; + } + + void Load(const char* in) + { + if (!in) + { + OUT_LOAD_INST_DATA_FAIL; + return; + } + + OUT_LOAD_INST_DATA(in); + std::istringstream loadStream(in); + loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3] >> m_auiEncounter[4] >> allianceRetreat >> hordeRetreat >> RaidDamage; + for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) + if (m_auiEncounter[i] == IN_PROGRESS) // Do not load an encounter as IN_PROGRESS - reset it instead. + m_auiEncounter[i] = NOT_STARTED; + OUT_LOAD_INST_DATA_COMPLETE; + } +}; + +InstanceData* GetInstanceData_instance_mount_hyjal(Map* pMap) +{ + return new instance_mount_hyjal(pMap); +} + +void AddSC_instance_mount_hyjal() +{ + Script *newscript; + newscript = new Script; + newscript->Name = "instance_hyjal"; + newscript->GetInstanceData = &GetInstanceData_instance_mount_hyjal; + newscript->RegisterSelf(); +} + diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp new file mode 100644 index 00000000000..287d3cf8e9b --- /dev/null +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp @@ -0,0 +1,156 @@ +/* +* Copyright (C) 2008-2010 Trinity +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + + +/* Script Data Start +SDName: Boss epoch +SDAuthor: Tartalo +SD%Complete: 80 +SDComment: TODO: Intro, consecutive attacks to a random target durin time wrap, adjust timers +SDCategory: +Script Data End */ + +#include "ScriptedPch.h" +#include "culling_of_stratholme.h" + +enum Spells +{ + SPELL_CURSE_OF_EXERTION = 52772, + SPELL_TIME_WARP = 52766, //Time slows down, reducing attack, casting and movement speed by 70% for 6 sec. + SPELL_TIME_STOP = 58848, //Stops time in a 50 yard sphere for 2 sec. + SPELL_WOUNDING_STRIKE = 52771, //Used only on the tank + H_SPELL_WOUNDING_STRIKE = 58830 +}; + +enum Yells +{ + SAY_INTRO = -1595000, //"Prince Arthas Menethil, on this day, a powerful darkness has taken hold of your soul. The death you are destined to visit upon others will this day be your own." + SAY_AGGRO = -1595001, //"We'll see about that, young prince." + SAY_TIME_WARP_1 = -1595002, //"Tick tock, tick tock..." + SAY_TIME_WARP_2 = -1595003, //"Not quick enough!" + SAY_TIME_WARP_3 = -1595004, //"Let's get this over with. " + SAY_SLAY_1 = -1595005, //"There is no future for you." + SAY_SLAY_2 = -1595006, //"This is the hour of our greatest triumph!" + SAY_SLAY_3 = -1595007, //"You were destined to fail. " + SAY_DEATH = -1595008 //"*gurgles*" +}; + +struct boss_epochAI : public ScriptedAI +{ + boss_epochAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + } + + uint8 uiStep; + + uint32 uiStepTimer; + uint32 uiWoundingStrikeTimer; + uint32 uiTimeWarpTimer; + uint32 uiTimeStopTimer; + uint32 uiCurseOfExertionTimer; + + ScriptedInstance* pInstance; + + void Reset() + { + uiStep = 1; + uiStepTimer = 26000; + uiCurseOfExertionTimer = 9300; + uiTimeWarpTimer = 25300; + uiTimeStopTimer = 21300; + uiWoundingStrikeTimer = 5300; + + if (pInstance) + pInstance->SetData(DATA_EPOCH_EVENT, NOT_STARTED); + } + + void EnterCombat(Unit* /*who*/) + { + DoScriptText(SAY_AGGRO, me); + + if (pInstance) + pInstance->SetData(DATA_EPOCH_EVENT, IN_PROGRESS); + } + + void UpdateAI(const uint32 diff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + if (uiCurseOfExertionTimer < diff) + { + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(pTarget, SPELL_CURSE_OF_EXERTION); + uiCurseOfExertionTimer = 9300; + } else uiCurseOfExertionTimer -= diff; + + if (uiWoundingStrikeTimer < diff) + { + DoCastVictim(SPELL_WOUNDING_STRIKE); + uiWoundingStrikeTimer = 5300; + } else uiWoundingStrikeTimer -= diff; + + if (uiTimeStopTimer < diff) + { + DoCastAOE(SPELL_TIME_STOP); + uiTimeStopTimer = 21300; + } else uiTimeStopTimer -= diff; + + if (uiTimeWarpTimer < diff) + { + DoScriptText(RAND(SAY_TIME_WARP_1,SAY_TIME_WARP_2,SAY_TIME_WARP_3), me); + DoCastAOE(SPELL_TIME_WARP); + uiTimeWarpTimer = 25300; + } else uiTimeWarpTimer -= diff; + + DoMeleeAttackIfReady(); + } + + void JustDied(Unit* /*killer*/) + { + DoScriptText(SAY_DEATH, me); + + if (pInstance) + pInstance->SetData(DATA_EPOCH_EVENT, DONE); + } + + void KilledUnit(Unit * victim) + { + if (victim == me) + return; + + DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); + } +}; + +CreatureAI* GetAI_boss_epoch(Creature* pCreature) +{ + return new boss_epochAI (pCreature); +} + +void AddSC_boss_epoch() +{ + Script *newscript; + + newscript = new Script; + newscript->Name = "boss_epoch"; + newscript->GetAI = &GetAI_boss_epoch; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp new file mode 100644 index 00000000000..12cdf00f2a5 --- /dev/null +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp @@ -0,0 +1,88 @@ +/* +* Copyright (C) 2008-2010 Trinity +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +#include "ScriptedPch.h" +#include "culling_of_stratholme.h" + +enum Spells +{ + SPELL_CORRUPTING_BLIGHT = 60588, + SPELL_VOID_STRIKE = 60590 +}; + +enum Yells +{ + SAY_AGGRO = -1595045, + SAY_FAIL = -1595046, + SAY_DEATH = -1595047 +}; + + +struct boss_infinite_corruptorAI : public ScriptedAI +{ + boss_infinite_corruptorAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + } + + ScriptedInstance* pInstance; + + void Reset() + { + if (pInstance) + pInstance->SetData(DATA_INFINITE_EVENT, NOT_STARTED); + } + + void EnterCombat(Unit* /*who*/) + { + if (pInstance) + pInstance->SetData(DATA_INFINITE_EVENT, IN_PROGRESS); + } + + void AttackStart(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} + void UpdateAI(const uint32 /*diff*/) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + DoMeleeAttackIfReady(); + } + + void JustDied(Unit* /*killer*/) + { + if (pInstance) + pInstance->SetData(DATA_INFINITE_EVENT, DONE); + } +}; + +CreatureAI* GetAI_boss_infinite_corruptor(Creature* pCreature) +{ + return new boss_infinite_corruptorAI(pCreature); +} + +void AddSC_boss_infinite_corruptor() +{ + Script *newscript; + + newscript = new Script; + newscript->Name = "boss_infinite_corruptor"; + newscript->GetAI = &GetAI_boss_infinite_corruptor; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp new file mode 100644 index 00000000000..a39f3289a5a --- /dev/null +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp @@ -0,0 +1,262 @@ +/* +* Copyright (C) 2008-2010 Trinity +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +/* Script Data Start +SDName: Boss mal_ganis +SDAuthor: Tartalo +SD%Complete: 80 +SDComment: TODO: Intro & outro +SDCategory: +Script Data End */ + +/*** SQL START *** +update creature_template set scriptname = 'boss_mal_ganis' where entry = ''; +*** SQL END ***/ +#include "ScriptedPch.h" +#include "culling_of_stratholme.h" + +enum Spells +{ + SPELL_CARRION_SWARM = 52720, //A cresting wave of chaotic magic splashes over enemies in front of the caster, dealing 3230 to 3570 Shadow damage and 380 to 420 Shadow damage every 3 sec. for 15 sec. + H_SPELL_CARRION_SWARM = 58852, + SPELL_MIND_BLAST = 52722, //Inflicts 4163 to 4837 Shadow damage to an enemy. + H_SPELL_MIND_BLAST = 58850, + SPELL_SLEEP = 52721, //Puts an enemy to sleep for up to 10 sec. Any damage caused will awaken the target. + H_SPELL_SLEEP = 58849, + SPELL_VAMPIRIC_TOUCH = 52723 //Heals the caster for half the damage dealt by a melee attack. +}; + +enum Yells +{ + SAY_INTRO_1 = -1595009, + SAY_INTRO_2 = -1595010, + SAY_AGGRO = -1595011, + SAY_KILL_1 = -1595012, + SAY_KILL_2 = -1595013, + SAY_KILL_3 = -1595014, + SAY_SLAY_1 = -1595015, + SAY_SLAY_2 = -1595016, + SAY_SLAY_3 = -1595017, + SAY_SLAY_4 = -1595018, + SAY_SLEEP_1 = -1595019, + SAY_SLEEP_2 = -1595020, + SAY_30HEALTH = -1595021, + SAY_15HEALTH = -1595022, + SAY_ESCAPE_SPEECH_1 = -1595023, + SAY_ESCAPE_SPEECH_2 = -1595024, + SAY_OUTRO = -1595025, +}; + +enum CombatPhases +{ + COMBAT, + OUTRO +}; + +struct boss_mal_ganisAI : public ScriptedAI +{ + boss_mal_ganisAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + } + + uint32 uiCarrionSwarmTimer; + uint32 uiMindBlastTimer; + uint32 uiVampiricTouchTimer; + uint32 uiSleepTimer; + + uint8 uiOutroStep; + uint32 uiOutroTimer; + + bool bYelled; + bool bYelled2; + + CombatPhases Phase; + + ScriptedInstance* pInstance; + + void Reset() + { + bYelled = false; + bYelled2 = false; + Phase = COMBAT; + uiCarrionSwarmTimer = 6000; + uiMindBlastTimer = 11000; + uiVampiricTouchTimer = urand(10000,15000); + uiSleepTimer = urand(15000,20000); + uiOutroTimer = 1000; + + if (pInstance) + pInstance->SetData(DATA_MAL_GANIS_EVENT, NOT_STARTED); + } + + void EnterCombat(Unit* /*who*/) + { + DoScriptText(SAY_AGGRO, me); + if (pInstance) + pInstance->SetData(DATA_MAL_GANIS_EVENT, IN_PROGRESS); + } + + void DamageTaken(Unit *done_by, uint32 &damage) + { + if (damage >= me->GetHealth() && done_by != me) + damage = me->GetHealth()-1; + } + + void UpdateAI(const uint32 diff) + { + switch(Phase) + { + case COMBAT: + //Return since we have no target + if (!UpdateVictim()) + return; + + if (!bYelled && HealthBelowPct(30)) + { + DoScriptText(SAY_30HEALTH, me); + bYelled = true; + } + + if (!bYelled2 && HealthBelowPct(15)) + { + DoScriptText(SAY_15HEALTH, me); + bYelled2 = true; + } + + if (HealthBelowPct(1)) + { + //Handle Escape Event: Don't forget to add Player::RewardPlayerAndGroupAtEvent + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); + uiOutroStep = 1; + Phase = OUTRO; + return; + } + + if (Creature* pArthas = me->GetCreature(*me, pInstance ? pInstance->GetData64(DATA_ARTHAS) : 0)) + if (pArthas->isDead()) + { + EnterEvadeMode(); + me->DisappearAndDie(); + if (pInstance) + pInstance->SetData(DATA_MAL_GANIS_EVENT, FAIL); + } + + if (uiCarrionSwarmTimer < diff) + { + DoCastVictim(SPELL_CARRION_SWARM); + uiCarrionSwarmTimer = 7000; + } else uiCarrionSwarmTimer -= diff; + + if (uiMindBlastTimer < diff) + { + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(pTarget, SPELL_MIND_BLAST); + uiMindBlastTimer = 6000; + } else uiMindBlastTimer -= diff; + + if (uiVampiricTouchTimer < diff) + { + DoCast(me, SPELL_VAMPIRIC_TOUCH); + uiVampiricTouchTimer = 32000; + } else uiVampiricTouchTimer -= diff; + + if (uiSleepTimer < diff) + { + DoScriptText(RAND(SAY_SLEEP_1,SAY_SLEEP_2), me); + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(pTarget, SPELL_SLEEP); + uiSleepTimer = urand(15000,20000); + } else uiSleepTimer -= diff; + + DoMeleeAttackIfReady(); + break; + case OUTRO: + if (uiOutroTimer < diff) + { + switch(uiOutroStep) + { + case 1: + DoScriptText(SAY_ESCAPE_SPEECH_1, me); + me->GetMotionMaster()->MoveTargetedHome(); + ++uiOutroStep; + uiOutroTimer = 8000; + break; + case 2: + me->SetUInt64Value(UNIT_FIELD_TARGET, pInstance ? pInstance->GetData64(DATA_ARTHAS) : 0); + me->HandleEmoteCommand(29); + DoScriptText(SAY_ESCAPE_SPEECH_2, me); + ++uiOutroStep; + uiOutroTimer = 9000; + break; + case 3: + DoScriptText(SAY_OUTRO, me); + ++uiOutroStep; + uiOutroTimer = 16000; + break; + case 4: + me->HandleEmoteCommand(33); + ++uiOutroStep; + uiOutroTimer = 500; + break; + case 5: + me->SetVisibility(VISIBILITY_OFF); + me->Kill(me); + break; + + } + } else uiOutroTimer -= diff; + break; + } + } + + void JustDied(Unit* /*killer*/) + { + if (pInstance) + { + pInstance->SetData(DATA_MAL_GANIS_EVENT, DONE); + + // give achievement credit to players. criteria use spell 58630 which doesn't exist. + if (pInstance) + pInstance->DoUpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET, 58630); + } + } + + void KilledUnit(Unit * victim) + { + if (victim == me) + return; + + DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3,SAY_SLAY_4), me); + } +}; + +CreatureAI* GetAI_boss_mal_ganis(Creature* pCreature) +{ + return new boss_mal_ganisAI (pCreature); +} + +void AddSC_boss_mal_ganis() +{ + Script *newscript; + + newscript = new Script; + newscript->Name = "boss_mal_ganis"; + newscript->GetAI = &GetAI_boss_mal_ganis; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp new file mode 100644 index 00000000000..eba9733c745 --- /dev/null +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp @@ -0,0 +1,140 @@ +/* +* Copyright (C) 2008-2010 Trinity +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +/* Script Data Start +SDName: Boss meathook +SDAuthor: Tartalo +SD%Complete: 100 +SDComment: It may need timer adjustment +SDCategory: +Script Data End */ + +#include "ScriptedPch.h" +#include "culling_of_stratholme.h" + +enum Spells +{ + SPELL_CONSTRICTING_CHAINS = 52696, //Encases the targets in chains, dealing 1800 Physical damage every 1 sec. and stunning the target for 5 sec. + H_SPELL_CONSTRICTING_CHAINS = 58823, + SPELL_DISEASE_EXPULSION = 52666, //Meathook belches out a cloud of disease, dealing 1710 to 1890 Nature damage and interrupting the spell casting of nearby enemy targets for 4 sec. + H_SPELL_DISEASE_EXPULSION = 58824, + SPELL_FRENZY = 58841 //Increases the caster's Physical damage by 10% for 30 sec. +}; + +enum Yells +{ + SAY_AGGRO = -1595026, + SAY_SLAY_1 = -1595027, + SAY_SLAY_2 = -1595028, + SAY_SLAY_3 = -1595029, + SAY_SPAWN = -1595030, + SAY_DEATH = -1595031 +}; + +struct boss_meathookAI : public ScriptedAI +{ + boss_meathookAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + if (pInstance) + DoScriptText(SAY_SPAWN,me); + } + + uint32 uiChainTimer; + uint32 uiDiseaseTimer; + uint32 uiFrenzyTimer; + + ScriptedInstance* pInstance; + + void Reset() + { + uiChainTimer = urand(12000,17000); //seen on video 13, 17, 15, 12, 16 + uiDiseaseTimer = urand(2000,4000); //approx 3s + uiFrenzyTimer = urand(21000,26000); //made it up + + if (pInstance) + pInstance->SetData(DATA_MEATHOOK_EVENT, NOT_STARTED); + } + + void EnterCombat(Unit* /*who*/) + { + DoScriptText(SAY_AGGRO, me); + + if (pInstance) + pInstance->SetData(DATA_MEATHOOK_EVENT, IN_PROGRESS); + } + + void UpdateAI(const uint32 diff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + if (uiDiseaseTimer <= diff) + { + DoCastAOE(SPELL_DISEASE_EXPULSION); + uiDiseaseTimer = urand(1500,4000); + } else uiDiseaseTimer -= diff; + + if (uiFrenzyTimer <= diff) + { + DoCast(me, SPELL_FRENZY); + uiFrenzyTimer = urand(21000,26000); + } else uiFrenzyTimer -= diff; + + if (uiChainTimer <= diff) + { + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(pTarget, SPELL_CONSTRICTING_CHAINS); //anyone but the tank + uiChainTimer = urand(2000,4000); + } else uiChainTimer -= diff; + + DoMeleeAttackIfReady(); + } + + void JustDied(Unit* /*killer*/) + { + DoScriptText(SAY_DEATH, me); + + if (pInstance) + pInstance->SetData(DATA_MEATHOOK_EVENT, DONE); + } + + void KilledUnit(Unit * victim) + { + if (victim == me) + return; + + DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); + } +}; + +CreatureAI* GetAI_boss_meathook(Creature* pCreature) +{ + return new boss_meathookAI (pCreature); +} + +void AddSC_boss_meathook() +{ + Script *newscript; + + newscript = new Script; + newscript->Name = "boss_meathook"; + newscript->GetAI = &GetAI_boss_meathook; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp new file mode 100644 index 00000000000..da1c8098517 --- /dev/null +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp @@ -0,0 +1,170 @@ +/* +* Copyright (C) 2008-2010 Trinity +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +/* Script Data Start +SDName: Boss salramm +SDAuthor: Tartalo +SD%Complete: 80 +SDComment: TODO: Intro +SDCategory: +Script Data End */ + +/*** SQL START *** +update creature_template set scriptname = 'boss_salramm' where entry = ''; +*** SQL END ***/ +#include "ScriptedPch.h" +#include "culling_of_stratholme.h" + +enum Spells +{ + SPELL_CURSE_OF_TWISTED_FLESH = 58845, + SPELL_EXPLODE_GHOUL = 52480, + H_SPELL_EXPLODE_GHOUL = 58825, + SPELL_SHADOW_BOLT = 57725, + H_SPELL_SHADOW_BOLT = 58828, + SPELL_STEAL_FLESH = 52708, + SPELL_SUMMON_GHOULS = 52451 +}; + +enum Yells +{ + SAY_AGGRO = -1595032, + SAY_SPAWN = -1595033, + SAY_SLAY_1 = -1595034, + SAY_SLAY_2 = -1595035, + SAY_SLAY_3 = -1595036, + SAY_DEATH = -1595037, + SAY_EXPLODE_GHOUL_1 = -1595038, + SAY_EXPLODE_GHOUL_2 = -1595039, + SAY_STEAL_FLESH_1 = -1595040, + SAY_STEAL_FLESH_2 = -1595041, + SAY_STEAL_FLESH_3 = -1595042, + SAY_SUMMON_GHOULS_1 = -1595043, + SAY_SUMMON_GHOULS_2 = -1595044 +}; + +struct boss_salrammAI : public ScriptedAI +{ + boss_salrammAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + if (pInstance) + DoScriptText(SAY_SPAWN,me); + } + + uint32 uiCurseFleshTimer; + uint32 uiExplodeGhoulTimer; + uint32 uiShadowBoltTimer; + uint32 uiStealFleshTimer; + uint32 uiSummonGhoulsTimer; + + ScriptedInstance* pInstance; + + void Reset() + { + uiCurseFleshTimer = 30000; //30s DBM + uiExplodeGhoulTimer = urand(25000,28000); //approx 6 sec after summon ghouls + uiShadowBoltTimer = urand(8000,12000); // approx 10s + uiStealFleshTimer = 12345; + uiSummonGhoulsTimer = urand(19000,24000); //on a video approx 24s after aggro + + if (pInstance) + pInstance->SetData(DATA_SALRAMM_EVENT, NOT_STARTED); + } + + void EnterCombat(Unit* /*who*/) + { + DoScriptText(SAY_AGGRO, me); + + if (pInstance) + pInstance->SetData(DATA_SALRAMM_EVENT, IN_PROGRESS); + } + + void UpdateAI(const uint32 diff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + //Curse of twisted flesh timer + if (uiCurseFleshTimer <= diff) + { + DoCast(me->getVictim(), SPELL_CURSE_OF_TWISTED_FLESH); + uiCurseFleshTimer = 37000; + } else uiCurseFleshTimer -= diff; + + //Shadow bolt timer + if (uiShadowBoltTimer <= diff) + { + if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, SPELL_SHADOW_BOLT); + uiShadowBoltTimer = urand(8000,12000); + } else uiShadowBoltTimer -= diff; + + //Steal Flesh timer + if (uiStealFleshTimer <= diff) + { + DoScriptText(RAND(SAY_STEAL_FLESH_1,SAY_STEAL_FLESH_2,SAY_STEAL_FLESH_3), me); + if (Unit* random_pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(random_pTarget, SPELL_STEAL_FLESH); + uiStealFleshTimer = 10000; + } else uiStealFleshTimer -= diff; + + //Summon ghouls timer + if (uiSummonGhoulsTimer <= diff) + { + DoScriptText(RAND(SAY_SUMMON_GHOULS_1,SAY_SUMMON_GHOULS_2), me); + if (Unit* random_pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(random_pTarget, SPELL_SUMMON_GHOULS); + uiSummonGhoulsTimer = 10000; + } else uiSummonGhoulsTimer -= diff; + + DoMeleeAttackIfReady(); + } + + void JustDied(Unit* /*killer*/) + { + DoScriptText(SAY_DEATH, me); + + if (pInstance) + pInstance->SetData(DATA_SALRAMM_EVENT, DONE); + } + + void KilledUnit(Unit * victim) + { + if (victim == me) + return; + + DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); + } +}; + +CreatureAI* GetAI_boss_salramm(Creature* pCreature) +{ + return new boss_salrammAI (pCreature); +} + +void AddSC_boss_salramm() +{ + Script *newscript; + + newscript = new Script; + newscript->Name = "boss_salramm"; + newscript->GetAI = &GetAI_boss_salramm; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp new file mode 100644 index 00000000000..faaed2eb6db --- /dev/null +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp @@ -0,0 +1,1210 @@ +/* +* Copyright (C) 2008-2010 Trinity +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +#include "ScriptedPch.h" +#include "culling_of_stratholme.h" +#include "ScriptedEscortAI.h" + +enum Says +{ + //First Act - Uther and Jaina Dialog + SAY_PHASE101 = -1595070, //Arthas + SAY_PHASE102 = -1595071, //Uther + SAY_PHASE103 = -1595072, //Arthas + SAY_PHASE104 = -1595073, //Arthas + SAY_PHASE105 = -1595074, //Uther + SAY_PHASE106 = -1595075, //Arthas + SAY_PHASE107 = -1595076, //Uther + SAY_PHASE108 = -1595077, //Arthas + SAY_PHASE109 = -1595078, //Arthas + SAY_PHASE110 = -1595079, //Uther + SAY_PHASE111 = -1595080, //Arthas + SAY_PHASE112 = -1595081, //Uther + SAY_PHASE113 = -1595082, //Jaina + SAY_PHASE114 = -1595083, //Arthas + SAY_PHASE115 = -1595084, //Uther + SAY_PHASE116 = -1595085, //Arthas + SAY_PHASE117 = -1595086, //Jaina + SAY_PHASE118 = -1595087, //Arthas + //Second Act - City Streets + SAY_PHASE201 = -1595088, //Arthas + SAY_PHASE202 = -1595089, //Cityman + SAY_PHASE203 = -1595090, //Arthas + SAY_PHASE204 = -1595091, //Crazyman + SAY_PHASE205 = -1595092, //Arthas + SAY_PHASE206 = -1595009, //Malganis + SAY_PHASE207 = -1595010, //Malganis + SAY_PHASE208 = -1595093, //Arthas + SAY_PHASE209 = -1595094, //Arthas + SAY_PHASE210 = -1595095, //Arthas + //Third Act - Town Hall + SAY_PHASE301 = -1595096, //Arthas + SAY_PHASE302 = -1595097, //Drakonian + SAY_PHASE303 = -1595098, //Arthas + SAY_PHASE304 = -1595099, //Arthas + SAY_PHASE305 = -1595100, //Drakonian + SAY_PHASE306 = -1595101, //Arthas + SAY_PHASE307 = -1595102, //Arthas + SAY_PHASE308 = -1595103, //Arthas + SAY_PHASE309 = -1595104, //Arthas + SAY_PHASE310 = -1595105, //Arthas + SAY_PHASE311 = -1595106, //Arthas + SAY_PHASE312 = -1595107, //Arthas + SAY_PHASE313 = -1595108, //Arthas + SAY_PHASE314 = -1595000, //Epoch + SAY_PHASE315 = -1595109, //Arthas + //Fourth Act - Fire Corridor + SAY_PHASE401 = -1595110, //Arthas + SAY_PHASE402 = -1595111, //Arthas + SAY_PHASE403 = -1595112, //Arthas + SAY_PHASE404 = -1595113, //Arthas + SAY_PHASE405 = -1595114, //Arthas + SAY_PHASE406 = -1595115, //Arthas + SAY_PHASE407 = -1595116, //Arthas + //Fifth Act - Mal'Ganis Fight + SAY_PHASE501 = -1595117, //Arthas + SAY_PHASE502 = -1595118, //Arthas + SAY_PHASE503 = -1595119, //Arthas + SAY_PHASE504 = -1595120, //Arthas +}; + +enum NPCs +{ + NPC_INFINITE_ADVERSARY = 27742, + NPC_INFINITE_HUNTER = 27743, + NPC_INFINITE_AGENT = 27744, + NPC_TIME_RIFT = 28409, + NPC_ZOMBIE = 27737, + NPC_GHOUL = 28249, + NPC_NECROMANCER = 28200, + NPC_STALKER = 28199, + NPC_FIEND = 27734, + NPC_GOLEM = 28201, + NPC_EGHOUL = 27729, + NPC_CONSTRUCT = 27736, + + NPC_INVIS_TARGET = 20562, + + NPC_KNIGHT_ESCORT = 27745, + NPC_PRIEST_ESCORT = 27747, + NPC_CITY_MAN = 28167, + NPC_CITY_MAN2 = 28169, + NPC_CITY_MAN3 = 31126, + NPC_CITY_MAN4 = 31127, +}; + +enum Spells +{ + SPELL_FEAR = 39176, + SPELL_ARTHAS_AURA = 52442, + SPELL_EXORCISM_N = 52445, + SPELL_EXORCISM_H = 58822, + SPELL_HOLY_LIGHT = 52444, +}; + +enum GossipMenuArthas +{ + GOSSIP_MENU_ARTHAS_1 = 100001, + GOSSIP_MENU_ARTHAS_2 = 100002, + GOSSIP_MENU_ARTHAS_3 = 100003, + GOSSIP_MENU_ARTHAS_4 = 100004, + GOSSIP_MENU_ARTHAS_5 = 100005 +}; + +enum +{ + ENCOUNTER_WAVES_NUMBER = 8, + ENCOUNTER_WAVES_MAX_SPAWNS = 5, + ENCOUNTER_DRACONIAN_NUMBER = 4, + ENCOUNTER_CHRONO_SPAWNS = 19 +}; + +// Locations for necromancers and add to spawn +float WavesLocations[ENCOUNTER_WAVES_NUMBER][ENCOUNTER_WAVES_MAX_SPAWNS][5]= +{ + { + {NPC_ZOMBIE, 2164.698975, 1255.392944, 135.040878, 0.490202}, + {NPC_ZOMBIE, 2183.501465, 1263.079102, 134.859055, 3.169981}, + {NPC_GHOUL, 2177.512939, 1247.313843, 135.846695, 1.696574}, + {NPC_GHOUL, 2171.991943, 1246.615845, 135.745026, 1.696574}, + {0, 0, 0, 0, 0} + }, + { + {NPC_GHOUL, 2254.434326, 1163.427612, 138.055038, 2.077358}, + {NPC_GHOUL, 2254.703613, 1158.867798, 138.212234, 2.345532}, + {NPC_GHOUL, 2257.615723, 1162.310913, 138.091202, 2.077358}, + {NPC_NECROMANCER, 2258.258057, 1157.250732, 138.272873, 2.387766}, + {0, 0, 0, 0, 0} + }, + { + {NPC_STALKER, 2348.120117, 1202.302490, 130.491104, 4.698538}, + {NPC_GHOUL, 2352.863525, 1207.819092, 130.424271, 4.949865}, + {NPC_GHOUL, 2343.593750, 1207.915039, 130.781311, 4.321547}, + {NPC_NECROMANCER, 2348.257324, 1212.202515, 130.670135, 4.450352}, + {0, 0, 0, 0, 0} + }, + { + {NPC_STALKER, 2139.825195, 1356.277100, 132.199615, 5.820131}, + {NPC_GHOUL, 2137.073486, 1362.464844, 132.271637, 5.820131}, + {NPC_GHOUL, 2134.075684, 1354.148071, 131.885864, 5.820131}, + {NPC_NECROMANCER, 2133.302246, 1358.907837, 132.037689, 5.820131}, + {0, 0, 0, 0, 0} + }, + { + {NPC_NECROMANCER, 2264.013428, 1174.055908, 138.093094, 2.860481}, + {NPC_GHOUL, 2264.207764, 1170.892700, 138.034973, 2.860481}, + {NPC_GHOUL, 2266.948975, 1176.898926, 137.976929, 2.860481}, + {NPC_STALKER, 2269.215576, 1170.109253, 137.742691, 2.860481}, + {NPC_FIEND, 2273.106689, 1176.101074, 137.880508, 2.860481} + }, + { + {NPC_GOLEM, 2349.701660, 1188.436646, 130.428864, 3.908642}, + {NPC_GHOUL, 2349.909180, 1194.582642, 130.417816, 3.577001}, + {NPC_EGHOUL, 2354.662598, 1185.692017, 130.552032, 3.577001}, + {NPC_EGHOUL, 2354.716797, 1191.614380, 130.539810, 3.577001}, + {0, 0, 0, 0, 0} + }, + { + {NPC_CONSTRUCT, 2145.212891, 1355.288086, 132.288773, 6.004838}, + {NPC_NECROMANCER, 2137.078613, 1357.612671, 132.173340, 6.004838}, + {NPC_EGHOUL, 2139.402100, 1352.541626, 132.127518, 5.812850}, + {NPC_EGHOUL, 2142.408447, 1360.760620, 132.321564, 5.812850}, + {0, 0, 0, 0, 0} + }, + { + {NPC_GHOUL, 2172.686279, 1259.618164, 134.391754, 1.865499}, + {NPC_FIEND, 2177.649170, 1256.061157, 135.096512, 1.849572}, + {NPC_CONSTRUCT, 2170.782959, 1253.594849, 134.973022, 1.849572}, + {NPC_NECROMANCER, 2175.595703, 1249.041992, 135.603531, 1.849572}, + {0, 0, 0, 0, 0} + } +}; + +// Locations for rifts to spawn and draconians to go +float RiftAndSpawnsLocations[ENCOUNTER_CHRONO_SPAWNS][5]= +{ + {NPC_TIME_RIFT, 2431.790039, 1190.670044, 148.076004, 0.187923}, + {NPC_INFINITE_ADVERSARY, 2433.857910, 1185.612061, 148.075974, 4.566168}, + {NPC_INFINITE_ADVERSARY, 2437.577881, 1188.241089, 148.075974, 0.196999}, + {NPC_INFINITE_AGENT, 2437.165527, 1192.294922, 148.075974, 0.169247}, + {NPC_INFINITE_HUNTER, 2434.989990, 1197.679565, 148.075974, 0.715971}, + {NPC_TIME_RIFT, 2403.954834, 1178.815430, 148.075943, 4.966126}, + {NPC_INFINITE_AGENT, 2403.676758, 1171.495850, 148.075607, 4.902797}, + {NPC_INFINITE_HUNTER, 2407.691162, 1172.162720, 148.075607, 4.963010}, + {NPC_TIME_RIFT, 2414.217041, 1133.446167, 148.076050, 1.706972}, + {NPC_INFINITE_ADVERSARY, 2416.024658, 1139.456177, 148.076431, 1.752129}, + {NPC_INFINITE_HUNTER, 2410.866699, 1139.680542, 148.076431, 1.752129}, + {NPC_TIME_RIFT, 2433.081543, 1099.869751, 148.076157, 1.809509}, + {NPC_INFINITE_ADVERSARY, 2426.947998, 1107.471680, 148.076019, 1.877580}, + {NPC_INFINITE_HUNTER, 2432.944580, 1108.896362, 148.208160, 2.199241}, + {NPC_TIME_RIFT, 2444.077637, 1114.366089, 148.076157, 3.049565}, + {NPC_INFINITE_ADVERSARY, 2438.190674, 1118.368164, 148.076172, 3.139232}, + {NPC_INFINITE_AGENT, 2435.861328, 1113.402954, 148.169327, 2.390271}, + {NPC_TIME_RIFT, 2463.131592, 1115.391724, 152.473129, 3.409651}, + {NPC_EPOCH, 2451.809326, 1112.901245, 149.220459, 3.363617} +}; + +struct npc_arthasAI : public npc_escortAI +{ + npc_arthasAI(Creature *pCreature) : npc_escortAI(pCreature) + { + pInstance = pCreature->GetInstanceData(); + Reset(); + } + + ScriptedInstance* pInstance; + + bool bStepping; + uint32 uiStep; + uint32 uiPhaseTimer; + uint32 uiGossipStep; + uint32 uiPlayerFaction; + uint32 uiBossEvent; + uint32 uiWave; + + uint64 uiUtherGUID; + uint64 uiJainaGUID; + uint64 uiCitymenGUID[2]; + uint64 uiWaveGUID[ENCOUNTER_WAVES_MAX_SPAWNS]; + uint64 uiInfiniteDraconianGUID[ENCOUNTER_DRACONIAN_NUMBER]; + uint64 uiStalkerGUID; + + uint64 uiBossGUID; //uiMeathookGUID || uiSalrammGUID + uint64 uiEpochGUID; + uint64 uiMalganisGUID; + uint64 uiInfiniteGUID; + + uint32 uiExorcismTimer; + + void Reset() + { + uiUtherGUID = 0; + uiJainaGUID = 0; + + for (uint8 i = 0; i < 2; ++i) + uiCitymenGUID[i] = 0; + + for (uint8 i = 0; i < ENCOUNTER_WAVES_MAX_SPAWNS; ++i) + uiWaveGUID[i] = 0; + + for (uint8 i = 0; i < ENCOUNTER_DRACONIAN_NUMBER; ++i) + uiInfiniteDraconianGUID[i] = 0; + + uiStalkerGUID = 0; + uiBossGUID = 0; + uiEpochGUID = 0; + uiMalganisGUID = 0; + uiInfiniteGUID = 0; + + if (pInstance) { + pInstance->SetData(DATA_ARTHAS_EVENT, NOT_STARTED); + switch(pInstance->GetData(DATA_ARTHAS_EVENT)) + { + case NOT_STARTED: + bStepping = true; + uiStep = 0; + me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); + uiBossEvent = DATA_MEATHOOK_EVENT; + uiGossipStep = 0; + break; + } + uiPhaseTimer = 1000; + uiExorcismTimer = 7300; + uiWave = 0; + } + } + + void EnterCombat(Unit* /*who*/) + { + DoCast(me, SPELL_ARTHAS_AURA); + } + + void JustDied(Unit * /*killer*/) + { + if (pInstance) + pInstance->SetData(DATA_ARTHAS_EVENT, FAIL); + } + + void SpawnTimeRift(uint32 timeRiftID, uint64* guidVector) + { + me->SummonCreature((uint32)RiftAndSpawnsLocations[timeRiftID][0],RiftAndSpawnsLocations[timeRiftID][1],RiftAndSpawnsLocations[timeRiftID][2],RiftAndSpawnsLocations[timeRiftID][3],RiftAndSpawnsLocations[timeRiftID][4],TEMPSUMMON_TIMED_DESPAWN,11000); + + for (uint32 i = timeRiftID+1; i < ENCOUNTER_CHRONO_SPAWNS; ++i) + { + if ((uint32)RiftAndSpawnsLocations[i][0] == NPC_TIME_RIFT) break; + if (Creature* pTemp = me->SummonCreature((uint32)RiftAndSpawnsLocations[i][0],RiftAndSpawnsLocations[timeRiftID][1],RiftAndSpawnsLocations[timeRiftID][2],RiftAndSpawnsLocations[timeRiftID][3],RiftAndSpawnsLocations[timeRiftID][4],TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,900000)) + { + guidVector[i-timeRiftID-1] = pTemp->GetGUID(); + pTemp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE | UNIT_FLAG_UNK_9); + pTemp->SetReactState(REACT_PASSIVE); + pTemp->GetMotionMaster()->MovePoint(0, RiftAndSpawnsLocations[i][1],RiftAndSpawnsLocations[i][2],RiftAndSpawnsLocations[i][3]); + if ((uint32)RiftAndSpawnsLocations[i][0] == NPC_EPOCH) + uiEpochGUID = pTemp->GetGUID(); + } + } + } + + void SpawnWaveGroup(uint32 waveID, uint64* guidVector) + { + for (uint32 i = 0; i < ENCOUNTER_WAVES_MAX_SPAWNS; ++i) + { + if ((uint32)WavesLocations[waveID][i][0] == 0) break; + if (Creature* pTemp = me->SummonCreature((uint32)WavesLocations[waveID][i][0],WavesLocations[waveID][i][1],WavesLocations[waveID][i][2],WavesLocations[waveID][i][3],WavesLocations[waveID][i][4],TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,900000)) + { + guidVector[i] = pTemp->GetGUID(); + } + } + } + + void SetHoldState(bool bOnHold) + { + SetEscortPaused(bOnHold); + } + + void JumpToNextStep(uint32 uiTimer) + { + uiPhaseTimer = uiTimer; + ++uiStep; + } + + void WaypointReached(uint32 uiPointId) + { + switch(uiPointId) + { + case 0: + case 1: + case 3: + case 9: + case 10: + case 11: + case 22: + case 23: + case 26: + case 55: + case 56: + SetHoldState(true); + bStepping = true; + break; + case 7: + if (Unit* pCityman0 = me->SummonCreature(NPC_CITY_MAN,2091.977f,1275.021f,140.757f,0.558f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,60000)) + uiCitymenGUID[0] = pCityman0->GetGUID(); + if (Unit* pCityman1 = me->SummonCreature(NPC_CITY_MAN2,2093.514f,1275.842f,140.408f,3.801f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,60000)) + uiCitymenGUID[1] = pCityman1->GetGUID(); + break; + case 8: + uiGossipStep = 1; + me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); + SetHoldState(true); + break; + case 12: + SetRun(true); + DoScriptText(SAY_PHASE210, me); + if (Unit* pDisguised0 = me->SummonCreature(NPC_CITY_MAN3,2398.14f,1207.81f,134.04f,5.155249f,TEMPSUMMON_DEAD_DESPAWN,180000)) + { + uiInfiniteDraconianGUID[0] = pDisguised0->GetGUID(); + if (Unit* pDisguised1 = me->SummonCreature(NPC_CITY_MAN4,2403.22f,1205.54f,134.04f,3.311264f,TEMPSUMMON_DEAD_DESPAWN,180000)) + { + uiInfiniteDraconianGUID[1] = pDisguised1->GetGUID(); + + if (Unit* pDisguised2 = me->SummonCreature(NPC_CITY_MAN,2400.82f,1201.69f,134.01f,1.534082f,TEMPSUMMON_DEAD_DESPAWN,180000)) + { + uiInfiniteDraconianGUID[2] = pDisguised2->GetGUID(); + pDisguised0->SetUInt64Value(UNIT_FIELD_TARGET, uiInfiniteDraconianGUID[1]); + pDisguised1->SetUInt64Value(UNIT_FIELD_TARGET, uiInfiniteDraconianGUID[0]); + pDisguised2->SetUInt64Value(UNIT_FIELD_TARGET, uiInfiniteDraconianGUID[1]); + } + } + } + break; + case 20: + uiGossipStep = 2; + me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); + SetRun(false); + SetHoldState(true); + break; + case 21: + DoScriptText(SAY_PHASE301, me); + break; + case 25: + SetRun(false); + SpawnTimeRift(0,&uiInfiniteDraconianGUID[0]); + DoScriptText(SAY_PHASE307,me); + break; + case 29: + SetRun(false); + SpawnTimeRift(5,&uiInfiniteDraconianGUID[0]); + SpawnTimeRift(8,&uiInfiniteDraconianGUID[2]); + DoScriptText(SAY_PHASE309,me); + SetHoldState(true); + bStepping = true; + break; + case 31: + SetRun(false); + SpawnTimeRift(11,&uiInfiniteDraconianGUID[0]); + SpawnTimeRift(14,&uiInfiniteDraconianGUID[2]); + DoScriptText(SAY_PHASE311,me); + SetHoldState(true); + bStepping = true; + break; + case 32: + DoScriptText(SAY_PHASE401,me); + break; + case 34: + DoScriptText(SAY_PHASE402,me); + break; + case 35: + DoScriptText(SAY_PHASE403,me); + break; + case 36: + if (pInstance) + { + GameObject* pGate = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_SHKAF_GATE)); + pGate->SetGoState(GO_STATE_ACTIVE); + } + break; + case 45: + SetRun(true); + SetDespawnAtFar(false); + uiGossipStep = 4; + me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); + SetHoldState(true); + break; + case 47: + SetRun(false); + DoScriptText(SAY_PHASE405,me); + break; + case 48: + SetRun(true); + DoScriptText(SAY_PHASE406,me); + break; + case 53: + DoScriptText(SAY_PHASE407,me); + break; + case 54: + uiGossipStep = 5; + me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); + SetHoldState(true); + break; + } + } + + void UpdateAI(const uint32 diff) + { + npc_escortAI::UpdateAI(diff); + + DoMeleeAttackIfReady(); + + if (bStepping) + { + if (uiPhaseTimer <= diff) + { + switch(uiStep) + { + //After reset + case 0: + if (Unit* pJaina = GetClosestCreatureWithEntry(me, NPC_JAINA, 50.0f)) + uiJainaGUID = pJaina->GetGUID(); + else if (Unit* pJaina = me->SummonCreature(NPC_JAINA,1895.48f,1292.66f,143.706f,0.023475f,TEMPSUMMON_DEAD_DESPAWN,180000)) + uiJainaGUID = pJaina->GetGUID(); + bStepping = false; + JumpToNextStep(0); + break; + //After waypoint 0 + case 1: + me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE); + if (Unit* pUther = me->SummonCreature(NPC_UTHER,1794.357f,1272.183f,140.558f,1.37f,TEMPSUMMON_DEAD_DESPAWN,180000)) + { + uiUtherGUID = pUther->GetGUID(); + pUther->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE); + pUther->GetMotionMaster()->MovePoint(0, 1897.018f, 1287.487f, 143.481f); + pUther->SetUInt64Value(UNIT_FIELD_TARGET, me->GetGUID()); + me->SetUInt64Value(UNIT_FIELD_TARGET, uiUtherGUID); + } + JumpToNextStep(17000); + break; + case 2: + DoScriptText(SAY_PHASE101, me); + JumpToNextStep(2000); + break; + case 3: + if (Creature* pUther = Unit::GetCreature(*me, uiUtherGUID)) + { + DoScriptText(SAY_PHASE102, pUther); + } + JumpToNextStep(8000); + break; + case 4: + SetEscortPaused(false); + bStepping = false; + SetRun(false); + DoScriptText(SAY_PHASE103, me); + JumpToNextStep(0); + break; + //After waypoint 1 + case 5: + if (Creature* pJaina = Unit::GetCreature(*me, uiJainaGUID)) + pJaina->SetUInt64Value(UNIT_FIELD_TARGET, me->GetGUID()); + DoScriptText(SAY_PHASE104, me); + JumpToNextStep(10000); + break; + case 6: + if (Creature* pUther = Unit::GetCreature(*me, uiUtherGUID)) + DoScriptText(SAY_PHASE105, pUther); + JumpToNextStep(1000); + break; + case 7: + DoScriptText(SAY_PHASE106, me); + JumpToNextStep(4000); + break; + case 8: + if (Creature* pUther = Unit::GetCreature(*me, uiUtherGUID)) + DoScriptText(SAY_PHASE107, pUther); + JumpToNextStep(6000); + break; + case 9: + DoScriptText(SAY_PHASE108, me); + JumpToNextStep(4000); + break; + case 10: + if (Creature* pUther = Unit::GetCreature(*me, uiUtherGUID)) + DoScriptText(SAY_PHASE109, pUther); + JumpToNextStep(8000); + break; + case 11: + DoScriptText(SAY_PHASE110, me); + JumpToNextStep(4000); + break; + case 12: + if (Creature* pUther = Unit::GetCreature(*me, uiUtherGUID)) + DoScriptText(SAY_PHASE111, pUther); + JumpToNextStep(4000); + break; + case 13: + DoScriptText(SAY_PHASE112, me); + JumpToNextStep(11000); + break; + case 14: + if (Creature* pJaina = Unit::GetCreature(*me, uiJainaGUID)) + DoScriptText(SAY_PHASE113, pJaina); + JumpToNextStep(3000); + break; + case 15: + DoScriptText(SAY_PHASE114, me); + JumpToNextStep(9000); + break; + case 16: + if (Creature* pUther = Unit::GetCreature(*me, uiUtherGUID)) + DoScriptText(SAY_PHASE115, pUther); + JumpToNextStep(4000); + break; + case 17: + if (Creature* pUther = Unit::GetCreature(*me, uiUtherGUID)) + { + pUther->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE); + pUther->GetMotionMaster()->MovePoint(0, 1794.357f,1272.183f,140.558f); + } + JumpToNextStep(1000); + break; + case 18: + if (Creature* pJaina = Unit::GetCreature(*me, uiJainaGUID)) + { + me->SetUInt64Value(UNIT_FIELD_TARGET, uiJainaGUID); + pJaina->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE); + pJaina->GetMotionMaster()->MovePoint(0, 1794.357f,1272.183f,140.558f); + } + JumpToNextStep(1000); + break; + case 19: + DoScriptText(SAY_PHASE116, me); + JumpToNextStep(1000); + break; + case 20: + if (Creature* pJaina = Unit::GetCreature(*me, uiJainaGUID)) + DoScriptText(SAY_PHASE117, pJaina); + JumpToNextStep(3000); + break; + case 21: + SetEscortPaused(false); + bStepping = false; + me->SetUInt64Value(UNIT_FIELD_TARGET, 0); + JumpToNextStep(0); + break; + //After waypoint 3 + case 22: + DoScriptText(SAY_PHASE118, me); + me->SetUInt64Value(UNIT_FIELD_TARGET, uiJainaGUID); + JumpToNextStep(10000); + break; + case 23: + SetEscortPaused(false); + bStepping = false; + SetRun(true); + + if (Creature* pJaina = Unit::GetCreature(*me, uiJainaGUID)) + pJaina->DisappearAndDie(); + + if (Creature* pUther = Unit::GetCreature(*me, uiUtherGUID)) + pUther->DisappearAndDie(); + + me->SetUInt64Value(UNIT_FIELD_TARGET, 0); + JumpToNextStep(0); + break; + //After Gossip 1 (waypoint 8) + case 24: + if (Unit* pStalker = me->SummonCreature(NPC_INVIS_TARGET,2026.469f,1287.088f,143.596f,1.37f,TEMPSUMMON_TIMED_DESPAWN,14000)) + { + uiStalkerGUID = pStalker->GetGUID(); + me->SetUInt64Value(UNIT_FIELD_TARGET, uiStalkerGUID); + } + JumpToNextStep(1000); + break; + case 25: + DoScriptText(SAY_PHASE201, me); + JumpToNextStep(12000); + break; + case 26: + SetEscortPaused(false); + bStepping = false; + SetRun(false); + me->SetUInt64Value(UNIT_FIELD_TARGET, 0); + JumpToNextStep(0); + break; + //After waypoint 9 + case 27: + me->SetUInt64Value(UNIT_FIELD_TARGET, uiCitymenGUID[0]); + if (Creature* pCityman = Unit::GetCreature(*me, uiCitymenGUID[0])) + { + pCityman->SetUInt64Value(UNIT_FIELD_TARGET, me->GetGUID()); + pCityman->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE); + pCityman->GetMotionMaster()->MovePoint(0, 2088.625f,1279.191f,140.743f); + } + JumpToNextStep(2000); + break; + case 28: + if (Creature* pCityman = Unit::GetCreature(*me, uiCitymenGUID[0])) + DoScriptText(SAY_PHASE202, pCityman); + JumpToNextStep(4000); + break; + case 29: + SetEscortPaused(false); + bStepping = false; + DoScriptText(SAY_PHASE203, me); + JumpToNextStep(0); + break; + //After waypoint 10 + case 30: + me->HandleEmoteCommand(37); + JumpToNextStep(1000); + break; + case 31: + SetEscortPaused(false); + bStepping = false; + if (Creature* pCityman1 = Unit::GetCreature(*me, uiCitymenGUID[1])) + { + DoScriptText(SAY_PHASE204, pCityman1); + pCityman1->SetUInt64Value(UNIT_FIELD_TARGET, me->GetGUID()); + if (Creature* pCityman0 = Unit::GetCreature(*me, uiCitymenGUID[0])) + pCityman0->Kill(pCityman0); + me->SetUInt64Value(UNIT_FIELD_TARGET, uiCitymenGUID[1]); + } + JumpToNextStep(0); + break; + //After waypoint 11 + case 32: + me->HandleEmoteCommand(37); + JumpToNextStep(1000); + break; + case 33: + if (Creature* pCityman1 = Unit::GetCreature(*me, uiCitymenGUID[1])) + pCityman1->Kill(pCityman1); + JumpToNextStep(1000); + break; + case 34: + if (Unit* pStalker = me->SummonCreature(NPC_INVIS_TARGET,2081.447f,1287.770f,141.3241f,1.37f,TEMPSUMMON_TIMED_DESPAWN,10000)) + { + uiStalkerGUID = pStalker->GetGUID(); + me->SetUInt64Value(UNIT_FIELD_TARGET, uiStalkerGUID); + } + DoScriptText(SAY_PHASE205, me); + JumpToNextStep(3000); + break; + case 35: + if (Unit* pStalkerM = me->SummonCreature(NPC_INVIS_TARGET,2117.349f,1288.624f,136.271f,1.37f,TEMPSUMMON_TIMED_DESPAWN,60000)) + { + uiStalkerGUID = pStalkerM->GetGUID(); + me->SetUInt64Value(UNIT_FIELD_TARGET, uiStalkerGUID); + } + JumpToNextStep(1000); + break; + case 36: + if (Creature* pMalganis = me->SummonCreature(NPC_MAL_GANIS,2117.349f,1288.624f,136.271f,1.37f,TEMPSUMMON_TIMED_DESPAWN,60000)) + { + if (Creature* pStalkerM = Unit::GetCreature(*me, uiStalkerGUID)) + pMalganis->CastSpell(pStalkerM,63793,false); + + uiMalganisGUID = pMalganis->GetGUID(); + DoScriptText(SAY_PHASE206, pMalganis); + pMalganis->SetUInt64Value(UNIT_FIELD_TARGET, me->GetGUID()); + pMalganis->SetReactState(REACT_PASSIVE); + } + JumpToNextStep(11000); + break; + case 37: + if (Creature* pMalganis = Unit::GetCreature(*me, uiMalganisGUID)) + { + if (Creature* pZombie = GetClosestCreatureWithEntry(pMalganis, NPC_CITY_MAN, 100.0f)) + pZombie->UpdateEntry(NPC_ZOMBIE, 0); + else if (Creature* pZombie = GetClosestCreatureWithEntry(pMalganis, NPC_CITY_MAN2, 100.0f)) + pZombie->UpdateEntry(NPC_ZOMBIE, 0); + else //There's no one else to transform + uiStep++; + } + else + uiStep++; + uiPhaseTimer = 500; + break; + case 38: + if (Creature* pMalganis = Unit::GetCreature(*me, uiMalganisGUID)) + DoScriptText(SAY_PHASE207, pMalganis); + JumpToNextStep(17000); + break; + case 39: + if (Creature* pMalganis = Unit::GetCreature(*me, uiMalganisGUID)) + pMalganis->SetVisibility(VISIBILITY_OFF); + DoScriptText(SAY_PHASE208, me); + JumpToNextStep(7000); + break; + case 40: + if (Unit* pStalker = me->SummonCreature(NPC_INVIS_TARGET,2081.447f,1287.770f,141.3241f,1.37f,TEMPSUMMON_TIMED_DESPAWN,10000)) + { + uiStalkerGUID = pStalker->GetGUID(); + me->SetUInt64Value(UNIT_FIELD_TARGET, uiStalkerGUID); + } + DoScriptText(SAY_PHASE209, me); + + uiBossEvent = DATA_MEATHOOK_EVENT; + if (pInstance) + pInstance->SetData(DATA_ARTHAS_EVENT, IN_PROGRESS); + + me->SetReactState(REACT_DEFENSIVE); + SetDespawnAtFar(false); + JumpToNextStep(5000); + break; + case 41: //Summon wave group + case 43: + case 45: + case 47: + case 51: + case 53: + case 55: + case 57: + if (pInstance->GetData(uiBossEvent) != DONE) + { + SpawnWaveGroup(uiWave, uiWaveGUID); + uiWave++; + } + JumpToNextStep(500); + break; + case 42: //Wait group to die + case 44: + case 46: + case 48: + case 52: + case 54: + case 56: + case 58: + if (pInstance->GetData(uiBossEvent) != DONE) + { + uint32 mobCounter = 0; + uint32 deadCounter = 0; + for (uint8 i = 0; i < ENCOUNTER_WAVES_MAX_SPAWNS; ++i) + { + if (uiWaveGUID[i] == 0) + break; + ++mobCounter; + Unit* pTemp = Unit::GetCreature(*me, uiWaveGUID[i]); + if (!pTemp || pTemp->isDead()) + ++deadCounter; + } + + if (mobCounter <= deadCounter) //If group is dead + JumpToNextStep(1000); + else + uiPhaseTimer = 1000; + } + else + JumpToNextStep(500); + break; + case 49: //Summon Boss + case 59: + if (pInstance->GetData(uiBossEvent) != DONE) + { + uint32 uiBossID = 0; + if (uiBossEvent == DATA_MEATHOOK_EVENT) + uiBossID = NPC_MEATHOOK; + else if (uiBossEvent == DATA_SALRAMM_EVENT) + uiBossID = NPC_SALRAMM; + + if (Unit* pBoss = me->SummonCreature(uiBossID,2232.19f,1331.933f,126.662f,3.15f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,900000)) + { + uiBossGUID = pBoss->GetGUID(); + pBoss->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE); + pBoss->GetMotionMaster()->MovePoint(0, 2194.110f,1332.00f,130.00f); + } + } + JumpToNextStep(30000); + break; + case 50: //Wait Boss death + case 60: + if (pInstance) + { + if (pInstance->GetData(uiBossEvent) == DONE) + { + JumpToNextStep(1000); + if (uiBossEvent == DATA_MEATHOOK_EVENT) + uiBossEvent = DATA_SALRAMM_EVENT; + else if (uiBossEvent == DATA_SALRAMM_EVENT) + { + SetHoldState(false); + bStepping = false; + uiBossEvent = DATA_EPOCH_EVENT; + } + } + else if (pInstance->GetData(uiBossEvent) == FAIL) + npc_escortAI::EnterEvadeMode(); + else + uiPhaseTimer = 10000; + } + break; + //After Gossip 2 (waypoint 22) + case 61: + me->SetReactState(REACT_AGGRESSIVE); + if (Creature* pDisguised0 = Unit::GetCreature(*me, uiInfiniteDraconianGUID[0])) + pDisguised0->SetUInt64Value(UNIT_FIELD_TARGET, me->GetGUID()); + if (Creature* pDisguised1 = Unit::GetCreature(*me, uiInfiniteDraconianGUID[1])) + pDisguised1->SetUInt64Value(UNIT_FIELD_TARGET, me->GetGUID()); + if (Creature* pDisguised2 = Unit::GetCreature(*me, uiInfiniteDraconianGUID[2])) + pDisguised2->SetUInt64Value(UNIT_FIELD_TARGET, me->GetGUID()); + JumpToNextStep(1000); + break; + case 62: + if (Creature* pDisguised0 = Unit::GetCreature(*me, uiInfiniteDraconianGUID[0])) + DoScriptText(SAY_PHASE302, pDisguised0); + JumpToNextStep(7000); + break; + case 63: + DoScriptText(SAY_PHASE303, me); + SetHoldState(false); + bStepping = false; + JumpToNextStep(0); + break; + //After waypoint 23 + case 64: + me->HandleEmoteCommand(54); + JumpToNextStep(1000); + break; + case 65: + if (Creature* pDisguised0 = Unit::GetCreature(*me, uiInfiniteDraconianGUID[0])) + pDisguised0->HandleEmoteCommand(11); + JumpToNextStep(1000); + break; + case 66: + DoScriptText(SAY_PHASE304,me); + JumpToNextStep(2000); + break; + case 67: + if (Creature* pDisguised0 = Unit::GetCreature(*me, uiInfiniteDraconianGUID[0])) + DoScriptText(SAY_PHASE305,pDisguised0); + JumpToNextStep(1000); + break; + case 68: + if (Creature* pDisguised2 = Unit::GetCreature(*me, uiInfiniteDraconianGUID[2])) + { + pDisguised2->UpdateEntry(NPC_INFINITE_HUNTER, 0); + //Make them unattackable + pDisguised2->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE | UNIT_FLAG_UNK_9); + pDisguised2->SetReactState(REACT_PASSIVE); + } + JumpToNextStep(2000); + break; + case 69: + if (Creature* pDisguised1 = Unit::GetCreature(*me, uiInfiniteDraconianGUID[1])) + { + pDisguised1->UpdateEntry(NPC_INFINITE_AGENT, 0); + //Make them unattackable + pDisguised1->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE | UNIT_FLAG_UNK_9); + pDisguised1->SetReactState(REACT_PASSIVE); + } + JumpToNextStep(2000); + break; + case 70: + if (Creature* pDisguised0 = Unit::GetCreature(*me, uiInfiniteDraconianGUID[0])) + { + pDisguised0->UpdateEntry(NPC_INFINITE_ADVERSARY, 0); + //Make them unattackable + pDisguised0->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE | UNIT_FLAG_UNK_9); + pDisguised0->SetReactState(REACT_PASSIVE); + } + JumpToNextStep(2000); + break; + case 71: + //After waypoint 26,29,31 + case 73: + case 75: + case 77: + //Make cratures attackable + for (uint32 i = 0; i< ENCOUNTER_DRACONIAN_NUMBER; ++i) + if (Creature* pTemp = Unit::GetCreature(*me, uiInfiniteDraconianGUID[i])) + { + pTemp->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE | UNIT_FLAG_UNK_9); + pTemp->SetReactState(REACT_AGGRESSIVE); + } + JumpToNextStep(5000); + break; + case 72: + case 74: + case 76: + if (me->isInCombat()) + uiPhaseTimer = 1000; + else + { + if (uiStep == 72) DoScriptText(SAY_PHASE308,me); + if (uiStep == 74) DoScriptText(SAY_PHASE308,me); + if (uiStep == 76) DoScriptText(SAY_PHASE310,me); + SetHoldState(false); + bStepping = false; + SetRun(true); + JumpToNextStep(2000); + } + break; + case 78: + if (me->isInCombat()) + uiPhaseTimer = 1000; + else + { + DoScriptText(SAY_PHASE312,me); + JumpToNextStep(5000); + } + break; + case 79: + DoScriptText(SAY_PHASE313,me); + JumpToNextStep(1000); + break; + case 80: + if (pInstance) + if (pInstance->GetData(DATA_EPOCH_EVENT) != DONE) + { + SpawnTimeRift(17,&uiEpochGUID); + if (Creature* pEpoch = Unit::GetCreature(*me, uiEpochGUID)) + DoScriptText(SAY_PHASE314,pEpoch); + me->SetUInt64Value(UNIT_FIELD_TARGET, uiEpochGUID); + } + JumpToNextStep(18000); + break; + case 81: + if (pInstance) + if (pInstance->GetData(DATA_EPOCH_EVENT) != DONE) + DoScriptText(SAY_PHASE315, me); + JumpToNextStep(6000); + break; + case 82: + if (pInstance) + if (pInstance->GetData(DATA_EPOCH_EVENT) != DONE) + { + if (Creature* pEpoch = Unit::GetCreature(*me, uiEpochGUID)) + { + //Make Epoch attackable + pEpoch->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE | UNIT_FLAG_UNK_9); + pEpoch->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + pEpoch->SetReactState(REACT_AGGRESSIVE); + } + + } + JumpToNextStep(1000); + break; + case 83: + if (pInstance) + { + if (pInstance->GetData(DATA_EPOCH_EVENT) == DONE) + { + uiGossipStep = 3; + me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); + bStepping = false; + uiBossEvent = DATA_MAL_GANIS_EVENT; + JumpToNextStep(15000); + } + else if (pInstance->GetData(DATA_EPOCH_EVENT) == FAIL) + npc_escortAI::EnterEvadeMode(); + else + uiPhaseTimer = 10000; + } + break; + //After Gossip 4 + case 84: + DoScriptText(SAY_PHASE404,me); + SetHoldState(false); + bStepping = false; + break; + //After Gossip 5 + case 85: + DoScriptText(SAY_PHASE501, me); + if (Creature* pMalganis = me->SummonCreature(NPC_MAL_GANIS,2296.665f,1502.362f,128.362f,4.961f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,900000)) + { + uiMalganisGUID = pMalganis->GetGUID(); + pMalganis->SetReactState(REACT_PASSIVE); + } + if (pInstance) + { + GameObject* pGate = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_MAL_GANIS_GATE_1)); + pGate->SetGoState(GO_STATE_ACTIVE); + } + SetHoldState(false); + bStepping = false; + JumpToNextStep(0); + break; + //After waypoint 55 + case 86: + DoScriptText(SAY_PHASE502, me); + JumpToNextStep(6000); + me->SetUInt64Value(UNIT_FIELD_TARGET, uiMalganisGUID); + break; + case 87: + if (Creature* pMalganis = Unit::GetCreature(*me, uiMalganisGUID)) + { + pMalganis->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE | UNIT_FLAG_UNK_6 | UNIT_FLAG_UNK_9 | UNIT_FLAG_UNK_15); + pMalganis->SetReactState(REACT_AGGRESSIVE); + } + JumpToNextStep(1000); + break; + case 88: + if (pInstance) + { + if (pInstance->GetData(DATA_MAL_GANIS_EVENT) == DONE) + { + SetHoldState(false); + JumpToNextStep(1000); + } + else if (pInstance->GetData(DATA_MAL_GANIS_EVENT) == FAIL) + npc_escortAI::EnterEvadeMode(); + else + uiPhaseTimer = 10000; + } + break; + //After waypoint 56 + case 89: + SetRun(true); + me->SetUInt64Value(UNIT_FIELD_TARGET, uiMalganisGUID); + DoScriptText(SAY_PHASE503, me); + JumpToNextStep(7000); + break; + case 90: + if (pInstance) + { + pInstance->SetData(DATA_ARTHAS_EVENT, DONE); //Rewards: Achiev & Chest ;D + me->SetUInt64Value(UNIT_FIELD_TARGET, pInstance->GetData64(DATA_MAL_GANIS_GATE_2)); //Look behind + } + DoScriptText(SAY_PHASE504, me); + bStepping = false; + break; + } + } else uiPhaseTimer -= diff; + } + + //Battling skills + if (!me->getVictim()) + return; + + if (uiExorcismTimer < diff) + { + if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(target, SPELL_EXORCISM_N); + uiExorcismTimer = 7300; + } else uiExorcismTimer -= diff; + + if (HealthBelowPct(40)) + DoCast(me, SPELL_HOLY_LIGHT); + } +}; + +CreatureAI* GetAI_npc_arthas(Creature* pCreature) +{ + return new npc_arthasAI(pCreature); +} + +#define GOSSIP_ITEM_ARTHAS_0 "I'm ready to start Culling of Stratholme." +#define GOSSIP_ITEM_ARTHAS_1 "Yes, my Prince. We're ready." +#define GOSSIP_ITEM_ARTHAS_2 "We're only doing what is best for Loarderon your Highness." +#define GOSSIP_ITEM_ARTHAS_3 "I'm ready." +#define GOSSIP_ITEM_ARTHAS_4 "For Lordaeron!" +#define GOSSIP_ITEM_ARTHAS_5 "I'm ready to battle the dreadlord, sire." + +bool GossipHello_npc_arthas(Player* pPlayer, Creature* pCreature) +{ + npc_arthasAI* pAI = CAST_AI(npc_arthasAI,pCreature->AI()); + + if (pAI && pAI->bStepping == false) + { + switch (pAI->uiGossipStep) + { + case 0: //This one is a workaround since the very beggining of the script is wrong. + if (pPlayer->GetQuestStatus(13149) != QUEST_STATUS_COMPLETE) + return false; + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ARTHAS_0, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); + pPlayer->SEND_GOSSIP_MENU(907, pCreature->GetGUID()); + break; + case 1: + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ARTHAS_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_MENU_ARTHAS_1, pCreature->GetGUID()); + break; + case 2: + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ARTHAS_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_MENU_ARTHAS_2, pCreature->GetGUID()); + break; + case 3: + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ARTHAS_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_MENU_ARTHAS_3, pCreature->GetGUID()); + break; + case 4: + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ARTHAS_4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_MENU_ARTHAS_4, pCreature->GetGUID()); + break; + case 5: + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ARTHAS_5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_MENU_ARTHAS_5, pCreature->GetGUID()); + break; + default: + return false; + } + } + return true; +} + + +bool GossipSelect_npc_arthas(Player *pPlayer, Creature *pCreature, uint32 /*sender*/, uint32 action) +{ + npc_arthasAI* pAI = CAST_AI(npc_arthasAI,pCreature->AI()); + + if (!pAI) + return false; + + switch (action) + { + case GOSSIP_ACTION_INFO_DEF: + pAI->Start(true,true,pPlayer->GetGUID(),0,false,false); + pAI->SetDespawnAtEnd(false); + pAI->bStepping = false; + pAI->uiStep = 1; + break; + case GOSSIP_ACTION_INFO_DEF+1: + pAI->bStepping = true; + pAI->uiStep = 24; + break; + case GOSSIP_ACTION_INFO_DEF+2: + pAI->SetHoldState(false); + pAI->bStepping = false; + pAI->uiStep = 61; + break; + case GOSSIP_ACTION_INFO_DEF+3: + pAI->SetHoldState(false); + break; + case GOSSIP_ACTION_INFO_DEF+4: + pAI->bStepping = true; + pAI->uiStep = 84; + break; + case GOSSIP_ACTION_INFO_DEF+5: + pAI->bStepping = true; + pAI->uiStep = 85; + break; + } + pPlayer->CLOSE_GOSSIP_MENU(); + pAI->SetDespawnAtFar(true); + pCreature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); + return true; +} + +void AddSC_culling_of_stratholme() +{ + Script *newscript; + + newscript = new Script; + newscript->Name = "npc_arthas"; + newscript->GetAI = &GetAI_npc_arthas; + newscript->pGossipHello = &GossipHello_npc_arthas; + newscript->pGossipSelect = &GossipSelect_npc_arthas; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.h b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.h new file mode 100644 index 00000000000..4278ad46500 --- /dev/null +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.h @@ -0,0 +1,68 @@ +/* +* Copyright (C) 2008-2010 Trinity +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +#ifndef DEF_CULLING_OF_STRATHOLME_H +#define DEF_CULLING_OF_STRATHOLME_H + +enum Data +{ + DATA_MEATHOOK_EVENT, + DATA_SALRAMM_EVENT, + DATA_EPOCH_EVENT, + DATA_MAL_GANIS_EVENT, + DATA_INFINITE_EVENT, + DATA_ARTHAS_EVENT +}; + +enum Data64 +{ + DATA_ARTHAS, + DATA_MEATHOOK, + DATA_SALRAMM, + DATA_EPOCH, + DATA_MAL_GANIS, + DATA_INFINITE, + DATA_SHKAF_GATE, + DATA_MAL_GANIS_GATE_1, + DATA_MAL_GANIS_GATE_2, + DATA_EXIT_GATE, + DATA_MAL_GANIS_CHEST +}; + +enum Creatures +{ + NPC_MEATHOOK = 26529, + NPC_SALRAMM = 26530, + NPC_EPOCH = 26532, + NPC_MAL_GANIS = 26533, + NPC_INFINITE = 32273, + NPC_ARTHAS = 26499, + NPC_JAINA = 26497, + NPC_UTHER = 26528 +}; + +enum GameObjects +{ + GO_SHKAF_GATE = 188686, + GO_MALGANIS_GATE_1 = 187711, + GO_MALGANIS_GATE_2 = 187723, + GO_EXIT_GATE = 191788, + GO_MALGANIS_CHEST_N = 190663, + GO_MALGANIS_CHEST_H = 193597 +}; +#endif diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp new file mode 100644 index 00000000000..73742a1e748 --- /dev/null +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp @@ -0,0 +1,244 @@ +/* +* Copyright (C) 2008-2010 Trinity +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +#include "ScriptedPch.h" +#include "culling_of_stratholme.h" + +#define MAX_ENCOUNTER 5 + +/* Culling of Stratholme encounters: +0 - Meathook +1 - Salramm the Fleshcrafter +2 - Chrono-Lord Epoch +3 - Mal'Ganis +4 - Infinite Corruptor (Heroic only) +*/ + +struct instance_culling_of_stratholme : public ScriptedInstance +{ + instance_culling_of_stratholme(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; + + uint64 uiArthas; + uint64 uiMeathook; + uint64 uiSalramm; + uint64 uiEpoch; + uint64 uiMalGanis; + uint64 uiInfinite; + + uint64 uiShkafGate; + uint64 uiMalGanisGate1; + uint64 uiMalGanisGate2; + uint64 uiExitGate; + uint64 uiMalGanisChest; + + uint32 m_auiEncounter[MAX_ENCOUNTER]; + std::string str_data; + + bool IsEncounterInProgress() const + { + for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) + if (m_auiEncounter[i] == IN_PROGRESS) return true; + + return false; + } + + void OnCreatureCreate(Creature* pCreature, bool /*add*/) + { + switch(pCreature->GetEntry()) + { + case NPC_ARTHAS: + uiArthas = pCreature->GetGUID(); + break; + case NPC_MEATHOOK: + uiMeathook = pCreature->GetGUID(); + break; + case NPC_SALRAMM: + uiSalramm = pCreature->GetGUID(); + break; + case NPC_EPOCH: + uiEpoch = pCreature->GetGUID(); + break; + case NPC_MAL_GANIS: + uiMalGanis = pCreature->GetGUID(); + break; + case NPC_INFINITE: + uiInfinite = pCreature->GetGUID(); + break; + } + } + + void OnGameObjectCreate(GameObject* pGo, bool /*add*/) + { + switch(pGo->GetEntry()) + { + case GO_SHKAF_GATE: + uiShkafGate = pGo->GetGUID(); + break; + case GO_MALGANIS_GATE_1: + uiMalGanisGate1 = pGo->GetGUID(); + break; + case GO_MALGANIS_GATE_2: + uiMalGanisGate2 = pGo->GetGUID(); + break; + case GO_EXIT_GATE: + uiExitGate = pGo->GetGUID(); + if (m_auiEncounter[3] == DONE) + HandleGameObject(uiExitGate,true); + break; + case GO_MALGANIS_CHEST_N: + case GO_MALGANIS_CHEST_H: + uiMalGanisChest = pGo->GetGUID(); + if (m_auiEncounter[3] == DONE) + pGo->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_INTERACT_COND); + break; + } + } + + void SetData(uint32 type, uint32 data) + { + switch(type) + { + case DATA_MEATHOOK_EVENT: + m_auiEncounter[0] = data; + break; + case DATA_SALRAMM_EVENT: + m_auiEncounter[1] = data; + break; + case DATA_EPOCH_EVENT: + m_auiEncounter[2] = data; + break; + case DATA_MAL_GANIS_EVENT: + m_auiEncounter[3] = data; + + switch(m_auiEncounter[3]) + { + case NOT_STARTED: + HandleGameObject(uiMalGanisGate2,true); + break; + case IN_PROGRESS: + HandleGameObject(uiMalGanisGate2,false); + break; + case DONE: + HandleGameObject(uiExitGate, true); + if (GameObject *pGo = instance->GetGameObject(uiMalGanisChest)) + pGo->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_INTERACT_COND); + break; + } + break; + case DATA_INFINITE_EVENT: + m_auiEncounter[4] = data; + break; + } + + if (data == DONE) + SaveToDB(); + } + + uint32 GetData(uint32 type) + { + switch(type) + { + case DATA_MEATHOOK_EVENT: return m_auiEncounter[0]; + case DATA_SALRAMM_EVENT: return m_auiEncounter[1]; + case DATA_EPOCH_EVENT: return m_auiEncounter[2]; + case DATA_MAL_GANIS_EVENT: return m_auiEncounter[3]; + case DATA_INFINITE_EVENT: return m_auiEncounter[4]; + } + return 0; + } + + uint64 GetData64(uint32 identifier) + { + switch(identifier) + { + case DATA_ARTHAS: return uiArthas; + case DATA_MEATHOOK: return uiMeathook; + case DATA_SALRAMM: return uiSalramm; + case DATA_EPOCH: return uiEpoch; + case DATA_MAL_GANIS: return uiMalGanis; + case DATA_INFINITE: return uiInfinite; + case DATA_SHKAF_GATE: return uiShkafGate; + case DATA_MAL_GANIS_GATE_1: return uiMalGanisGate1; + case DATA_MAL_GANIS_GATE_2: return uiMalGanisGate2; + case DATA_EXIT_GATE: return uiExitGate; + case DATA_MAL_GANIS_CHEST: return uiMalGanisChest; + } + return 0; + } + + std::string GetSaveData() + { + OUT_SAVE_INST_DATA; + + std::ostringstream saveStream; + saveStream << "C S " << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " + << m_auiEncounter[2] << " " << m_auiEncounter[3] << " " << m_auiEncounter[4]; + + str_data = saveStream.str(); + + OUT_SAVE_INST_DATA_COMPLETE; + return str_data; + } + + void Load(const char* in) + { + if (!in) + { + OUT_LOAD_INST_DATA_FAIL; + return; + } + + OUT_LOAD_INST_DATA(in); + + char dataHead1, dataHead2; + uint16 data0, data1, data2, data3, data4; + + std::istringstream loadStream(in); + loadStream >> dataHead1 >> dataHead2 >> data0 >> data1 >> data2 >> data3 >> data4; + + if (dataHead1 == 'C' && dataHead2 == 'S') + { + m_auiEncounter[0] = data0; + m_auiEncounter[1] = data1; + m_auiEncounter[2] = data2; + m_auiEncounter[3] = data3; + m_auiEncounter[4] = data4; + + for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) + if (m_auiEncounter[i] == IN_PROGRESS) + m_auiEncounter[i] = NOT_STARTED; + + } else OUT_LOAD_INST_DATA_FAIL; + + OUT_LOAD_INST_DATA_COMPLETE; + } +}; + +InstanceData* GetInstanceData_instance_culling_of_stratholme(Map* pMap) +{ + return new instance_culling_of_stratholme(pMap); +} + +void AddSC_instance_culling_of_stratholme() +{ + Script *newscript; + newscript = new Script; + newscript->Name = "instance_culling_of_stratholme"; + newscript->GetInstanceData = &GetInstanceData_instance_culling_of_stratholme; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp new file mode 100644 index 00000000000..49cf7cd4433 --- /dev/null +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp @@ -0,0 +1,145 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Boss_Aeonus +SD%Complete: 80 +SDComment: Some spells not implemented +SDCategory: Caverns of Time, The Dark Portal +EndScriptData */ + +#include "ScriptedPch.h" +#include "dark_portal.h" + +enum eEnums +{ + SAY_ENTER = -1269012, + SAY_AGGRO = -1269013, + SAY_BANISH = -1269014, + SAY_SLAY1 = -1269015, + SAY_SLAY2 = -1269016, + SAY_DEATH = -1269017, + EMOTE_FRENZY = -1269018, + + SPELL_CLEAVE = 40504, + SPELL_TIME_STOP = 31422, + SPELL_ENRAGE = 37605, + SPELL_SAND_BREATH = 31473, + H_SPELL_SAND_BREATH = 39049 +}; + +struct boss_aeonusAI : public ScriptedAI +{ + boss_aeonusAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + } + + ScriptedInstance *pInstance; + + uint32 SandBreath_Timer; + uint32 TimeStop_Timer; + uint32 Frenzy_Timer; + + void Reset() + { + SandBreath_Timer = 15000+rand()%15000; + TimeStop_Timer = 10000+rand()%5000; + Frenzy_Timer = 30000+rand()%15000; + } + + void EnterCombat(Unit * /*who*/) + { + DoScriptText(SAY_AGGRO, me); + } + + void MoveInLineOfSight(Unit *who) + { + //Despawn Time Keeper + if (who->GetTypeId() == TYPEID_UNIT && who->GetEntry() == C_TIME_KEEPER) + { + if (me->IsWithinDistInMap(who,20.0f)) + { + DoScriptText(SAY_BANISH, me); + me->DealDamage(who, who->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); + } + } + + ScriptedAI::MoveInLineOfSight(who); + } + + void JustDied(Unit * /*victim*/) + { + DoScriptText(SAY_DEATH, me); + + if (pInstance) + { + pInstance->SetData(TYPE_RIFT,DONE); + pInstance->SetData(TYPE_MEDIVH,DONE);//FIXME: later should be removed + } + } + + void KilledUnit(Unit * /*victim*/) + { + DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); + } + + void UpdateAI(const uint32 diff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + //Sand Breath + if (SandBreath_Timer <= diff) + { + DoCast(me->getVictim(), SPELL_SAND_BREATH); + SandBreath_Timer = 15000+rand()%10000; + } else SandBreath_Timer -= diff; + + //Time Stop + if (TimeStop_Timer <= diff) + { + DoCast(me->getVictim(), SPELL_TIME_STOP); + TimeStop_Timer = 20000+rand()%15000; + } else TimeStop_Timer -= diff; + + //Frenzy + if (Frenzy_Timer <= diff) + { + DoScriptText(EMOTE_FRENZY, me); + DoCast(me, SPELL_ENRAGE); + Frenzy_Timer = 20000+rand()%15000; + } else Frenzy_Timer -= diff; + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_boss_aeonus(Creature* pCreature) +{ + return new boss_aeonusAI (pCreature); +} + +void AddSC_boss_aeonus() +{ + Script *newscript; + newscript = new Script; + newscript->Name = "boss_aeonus"; + newscript->GetAI = &GetAI_boss_aeonus; + newscript->RegisterSelf(); +} + diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp new file mode 100644 index 00000000000..1f2b4a80612 --- /dev/null +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp @@ -0,0 +1,154 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Boss_Chrono_Lord_Deja +SD%Complete: 65 +SDComment: All abilities not implemented +SDCategory: Caverns of Time, The Dark Portal +EndScriptData */ + +#include "ScriptedPch.h" +#include "dark_portal.h" + +enum eEnums +{ + SAY_ENTER = -1269006, + SAY_AGGRO = -1269007, + SAY_BANISH = -1269008, + SAY_SLAY1 = -1269009, + SAY_SLAY2 = -1269010, + SAY_DEATH = -1269011, + + SPELL_ARCANE_BLAST = 31457, + H_SPELL_ARCANE_BLAST = 38538, + SPELL_ARCANE_DISCHARGE = 31472, + H_SPELL_ARCANE_DISCHARGE = 38539, + SPELL_TIME_LAPSE = 31467, + SPELL_ATTRACTION = 38540 //Not Implemented (Heroic mode) +}; + +struct boss_chrono_lord_dejaAI : public ScriptedAI +{ + boss_chrono_lord_dejaAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + } + + ScriptedInstance *pInstance; + + uint32 ArcaneBlast_Timer; + uint32 TimeLapse_Timer; + uint32 Attraction_Timer; + uint32 ArcaneDischarge_Timer; + + void Reset() + { + ArcaneBlast_Timer = 18000+rand()%5000; + TimeLapse_Timer = 10000+rand()%5000; + ArcaneDischarge_Timer = 20000+rand()%10000; + Attraction_Timer = 25000+rand()%10000; + } + + void EnterCombat(Unit * /*who*/) + { + DoScriptText(SAY_AGGRO, me); + } + + void MoveInLineOfSight(Unit *who) + { + //Despawn Time Keeper + if (who->GetTypeId() == TYPEID_UNIT && who->GetEntry() == C_TIME_KEEPER) + { + if (me->IsWithinDistInMap(who,20.0f)) + { + DoScriptText(SAY_BANISH, me); + me->DealDamage(who, who->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); + } + } + + ScriptedAI::MoveInLineOfSight(who); + } + + void KilledUnit(Unit * /*victim*/) + { + DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); + } + + void JustDied(Unit * /*victim*/) + { + DoScriptText(SAY_DEATH, me); + + if (pInstance) + pInstance->SetData(TYPE_RIFT,SPECIAL); + } + + void UpdateAI(const uint32 diff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + //Arcane Blast + if (ArcaneBlast_Timer <= diff) + { + DoCast(me->getVictim(), SPELL_ARCANE_BLAST); + ArcaneBlast_Timer = 15000+rand()%10000; + } else ArcaneBlast_Timer -= diff; + + //Arcane Discharge + if (ArcaneDischarge_Timer <= diff) + { + Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); + DoCast(pTarget, SPELL_ARCANE_DISCHARGE); + ArcaneDischarge_Timer = 20000+rand()%10000; + } else ArcaneDischarge_Timer -= diff; + + //Time Lapse + if (TimeLapse_Timer <= diff) + { + DoScriptText(SAY_BANISH, me); + DoCast(me, SPELL_TIME_LAPSE); + TimeLapse_Timer = 15000+rand()%10000; + } else TimeLapse_Timer -= diff; + + if (IsHeroic()) + { + if (Attraction_Timer <= diff) + { + DoCast(me, SPELL_ATTRACTION); + Attraction_Timer = 25000+rand()%10000; + } else Attraction_Timer -= diff; + } + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_boss_chrono_lord_deja(Creature* pCreature) +{ + return new boss_chrono_lord_dejaAI (pCreature); +} + +void AddSC_boss_chrono_lord_deja() +{ + Script *newscript; + newscript = new Script; + newscript->Name = "boss_chrono_lord_deja"; + newscript->GetAI = &GetAI_boss_chrono_lord_deja; + newscript->RegisterSelf(); +} + diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp new file mode 100644 index 00000000000..04b4b020ead --- /dev/null +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp @@ -0,0 +1,152 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Boss_Temporus +SD%Complete: 75 +SDComment: More abilities need to be implemented +SDCategory: Caverns of Time, The Dark Portal +EndScriptData */ + +#include "ScriptedPch.h" +#include "dark_portal.h" + +enum eEnums +{ + SAY_ENTER = -1269000, + SAY_AGGRO = -1269001, + SAY_BANISH = -1269002, + SAY_SLAY1 = -1269003, + SAY_SLAY2 = -1269004, + SAY_DEATH = -1269005, + + SPELL_HASTE = 31458, + SPELL_MORTAL_WOUND = 31464, + SPELL_WING_BUFFET = 31475, + H_SPELL_WING_BUFFET = 38593, + SPELL_REFLECT = 38592 //Not Implemented (Heroic mod) +}; + +struct boss_temporusAI : public ScriptedAI +{ + boss_temporusAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + } + + ScriptedInstance *pInstance; + + uint32 Haste_Timer; + uint32 SpellReflection_Timer; + uint32 MortalWound_Timer; + uint32 WingBuffet_Timer; + + void Reset() + { + Haste_Timer = 15000+rand()%8000; + SpellReflection_Timer = 30000; + MortalWound_Timer = 8000; + WingBuffet_Timer = 25000+rand()%10000; + } + + void EnterCombat(Unit * /*who*/) + { + DoScriptText(SAY_AGGRO, me); + } + + void KilledUnit(Unit * /*victim*/) + { + DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); + } + + void JustDied(Unit * /*victim*/) + { + DoScriptText(SAY_DEATH, me); + + if (pInstance) + pInstance->SetData(TYPE_RIFT,SPECIAL); + } + + void MoveInLineOfSight(Unit *who) + { + //Despawn Time Keeper + if (who->GetTypeId() == TYPEID_UNIT && who->GetEntry() == C_TIME_KEEPER) + { + if (me->IsWithinDistInMap(who,20.0f)) + { + DoScriptText(SAY_BANISH, me); + + me->DealDamage(who, who->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); + } + } + + ScriptedAI::MoveInLineOfSight(who); + } + + void UpdateAI(const uint32 diff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + //Attack Haste + if (Haste_Timer <= diff) + { + DoCast(me, SPELL_HASTE); + Haste_Timer = 20000+rand()%5000; + } else Haste_Timer -= diff; + + //MortalWound_Timer + if (MortalWound_Timer <= diff) + { + DoCast(me, SPELL_MORTAL_WOUND); + MortalWound_Timer = 10000+rand()%10000; + } else MortalWound_Timer -= diff; + + //Wing ruffet + if (WingBuffet_Timer <= diff) + { + DoCast(me, SPELL_WING_BUFFET); + WingBuffet_Timer = 20000+rand()%10000; + } else WingBuffet_Timer -= diff; + + if (IsHeroic()) + { + if (SpellReflection_Timer <= diff) + { + DoCast(me, SPELL_REFLECT); + SpellReflection_Timer = 25000+rand()%10000; + } else SpellReflection_Timer -= diff; + } + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_boss_temporus(Creature* pCreature) +{ + return new boss_temporusAI (pCreature); +} + +void AddSC_boss_temporus() +{ + Script *newscript; + newscript = new Script; + newscript->Name = "boss_temporus"; + newscript->GetAI = &GetAI_boss_temporus; + newscript->RegisterSelf(); +} + diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp new file mode 100644 index 00000000000..b0432a9b57c --- /dev/null +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp @@ -0,0 +1,404 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +/* ScriptData +SDName: Dark_Portal +SD%Complete: 30 +SDComment: Misc NPC's and mobs for instance. Most here far from complete. +SDCategory: Caverns of Time, The Dark Portal +EndScriptData */ + +/* ContentData +npc_medivh_bm +npc_time_rift +npc_saat +EndContentData */ + +#include "ScriptedPch.h" +#include "dark_portal.h" + +#define SAY_ENTER -1269020 //where does this belong? +#define SAY_INTRO -1269021 +#define SAY_WEAK75 -1269022 +#define SAY_WEAK50 -1269023 +#define SAY_WEAK25 -1269024 +#define SAY_DEATH -1269025 +#define SAY_WIN -1269026 +#define SAY_ORCS_ENTER -1269027 +#define SAY_ORCS_ANSWER -1269028 + +#define SPELL_CHANNEL 31556 +#define SPELL_PORTAL_RUNE 32570 //aura(portal on ground effect) + +#define SPELL_BLACK_CRYSTAL 32563 //aura +#define SPELL_PORTAL_CRYSTAL 32564 //summon + +#define SPELL_BANISH_PURPLE 32566 //aura +#define SPELL_BANISH_GREEN 32567 //aura + +#define SPELL_CORRUPT 31326 +#define SPELL_CORRUPT_AEONUS 37853 + +#define C_COUNCIL_ENFORCER 17023 + +struct npc_medivh_bmAI : public ScriptedAI +{ + npc_medivh_bmAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + } + + ScriptedInstance *pInstance; + + uint32 SpellCorrupt_Timer; + uint32 Check_Timer; + + bool Life75; + bool Life50; + bool Life25; + + void Reset() + { + SpellCorrupt_Timer = 0; + + if (!pInstance) + return; + + if (pInstance->GetData(TYPE_MEDIVH) == IN_PROGRESS) + DoCast(me, SPELL_CHANNEL, true); + else if (me->HasAura(SPELL_CHANNEL)) + me->RemoveAura(SPELL_CHANNEL); + + DoCast(me, SPELL_PORTAL_RUNE, true); + } + + void MoveInLineOfSight(Unit *who) + { + if (!pInstance) + return; + + if (who->GetTypeId() == TYPEID_PLAYER && me->IsWithinDistInMap(who, 10.0f)) + { + if (pInstance->GetData(TYPE_MEDIVH) == IN_PROGRESS || pInstance->GetData(TYPE_MEDIVH) == DONE) + return; + + DoScriptText(SAY_INTRO, me); + pInstance->SetData(TYPE_MEDIVH,IN_PROGRESS); + DoCast(me, SPELL_CHANNEL, false); + Check_Timer = 5000; + } + else if (who->GetTypeId() == TYPEID_UNIT && me->IsWithinDistInMap(who, 15.0f)) + { + if (pInstance->GetData(TYPE_MEDIVH) != IN_PROGRESS) + return; + + uint32 entry = who->GetEntry(); + if (entry == C_ASSAS || entry == C_WHELP || entry == C_CHRON || entry == C_EXECU || entry == C_VANQU) + { + who->StopMoving(); + who->CastSpell(me,SPELL_CORRUPT,false); + } + else if (entry == C_AEONUS) + { + who->StopMoving(); + who->CastSpell(me,SPELL_CORRUPT_AEONUS,false); + } + } + } + + void AttackStart(Unit * /*who*/) + { + //if (pInstance && pInstance->GetData(TYPE_MEDIVH) == IN_PROGRESS) + //return; + + //ScriptedAI::AttackStart(who); + } + + void EnterCombat(Unit * /*who*/) {} + + void SpellHit(Unit* /*caster*/, const SpellEntry* spell) + { + if (SpellCorrupt_Timer) + return; + + if (spell->Id == SPELL_CORRUPT_AEONUS) + SpellCorrupt_Timer = 1000; + + if (spell->Id == SPELL_CORRUPT) + SpellCorrupt_Timer = 3000; + } + + void JustDied(Unit* Killer) + { + if (Killer->GetEntry() == me->GetEntry()) + return; + + DoScriptText(SAY_DEATH, me); + } + + void UpdateAI(const uint32 diff) + { + if (!pInstance) + return; + + if (SpellCorrupt_Timer) + { + if (SpellCorrupt_Timer <= diff) + { + pInstance->SetData(TYPE_MEDIVH,SPECIAL); + + if (me->HasAura(SPELL_CORRUPT_AEONUS)) + SpellCorrupt_Timer = 1000; + else if (me->HasAura(SPELL_CORRUPT)) + SpellCorrupt_Timer = 3000; + else + SpellCorrupt_Timer = 0; + } else SpellCorrupt_Timer -= diff; + } + + if (Check_Timer) + { + if (Check_Timer <= diff) + { + uint32 pct = pInstance->GetData(DATA_SHIELD); + + Check_Timer = 5000; + + if (Life25 && pct <= 25) + { + DoScriptText(SAY_WEAK25, me); + Life25 = false; + } + else if (Life50 && pct <= 50) + { + DoScriptText(SAY_WEAK50, me); + Life50 = false; + } + else if (Life75 && pct <= 75) + { + DoScriptText(SAY_WEAK75, me); + Life75 = false; + } + + //if we reach this it means event was running but at some point reset. + if (pInstance->GetData(TYPE_MEDIVH) == NOT_STARTED) + { + me->DealDamage(me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); + me->RemoveCorpse(); + me->Respawn(); + return; + } + + if (pInstance->GetData(TYPE_RIFT) == DONE) + { + DoScriptText(SAY_WIN, me); + Check_Timer = 0; + + if (me->HasAura(SPELL_CHANNEL)) + me->RemoveAura(SPELL_CHANNEL); + + //TODO: start the post-event here + pInstance->SetData(TYPE_MEDIVH,DONE); + } + } else Check_Timer -= diff; + } + + //if (!UpdateVictim()) + //return; + + //DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_npc_medivh_bm(Creature* pCreature) +{ + return new npc_medivh_bmAI (pCreature); +} + +struct Wave +{ + uint32 PortalMob[4]; //spawns for portal waves (in order) +}; + +static Wave PortalWaves[]= +{ + {C_ASSAS, C_WHELP, C_CHRON, 0}, + {C_EXECU, C_CHRON, C_WHELP, C_ASSAS}, + {C_EXECU, C_VANQU, C_CHRON, C_ASSAS} +}; + +struct npc_time_riftAI : public ScriptedAI +{ + npc_time_riftAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + } + + ScriptedInstance *pInstance; + + uint32 TimeRiftWave_Timer; + uint8 mRiftWaveCount; + uint8 mPortalCount; + uint8 mWaveId; + + void Reset() + { + + TimeRiftWave_Timer = 15000; + mRiftWaveCount = 0; + + if (!pInstance) + return; + + mPortalCount = pInstance->GetData(DATA_PORTAL_COUNT); + + if (mPortalCount < 6) + mWaveId = 0; + else if (mPortalCount > 12) + mWaveId = 2; + else mWaveId = 1; + + } + void EnterCombat(Unit * /*who*/) {} + + void DoSummonAtRift(uint32 creature_entry) + { + if (!creature_entry) + return; + + if (pInstance && pInstance->GetData(TYPE_MEDIVH) != IN_PROGRESS) + { + me->InterruptNonMeleeSpells(true); + me->RemoveAllAuras(); + return; + } + + Position pos; + me->GetRandomNearPosition(pos, 10.0f); + + //normalize Z-level if we can, if rift is not at ground level. + pos.m_positionZ = std::max(me->GetMap()->GetHeight(pos.m_positionX, pos.m_positionY, MAX_HEIGHT), me->GetMap()->GetWaterLevel(pos.m_positionX, pos.m_positionY)); + + if (Unit *Summon = DoSummon(creature_entry, pos, 30000, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT)) + if (Unit *temp = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_MEDIVH) : 0)) + Summon->AddThreat(temp,0.0f); + } + + void DoSelectSummon() + { + uint32 entry = 0; + + if ((mRiftWaveCount > 2 && mWaveId < 1) || mRiftWaveCount > 3) + mRiftWaveCount = 0; + + entry = PortalWaves[mWaveId].PortalMob[mRiftWaveCount]; + debug_log("TSCR: npc_time_rift: summoning wave Creature (Wave %u, Entry %u).",mRiftWaveCount,entry); + + ++mRiftWaveCount; + + if (entry == C_WHELP) + { + for (uint8 i = 0; i < 3; ++i) + DoSummonAtRift(entry); + } else DoSummonAtRift(entry); + } + + void UpdateAI(const uint32 diff) + { + if (!pInstance) + return; + + if (TimeRiftWave_Timer <= diff) + { + DoSelectSummon(); + TimeRiftWave_Timer = 15000; + } else TimeRiftWave_Timer -= diff; + + if (me->IsNonMeleeSpellCasted(false)) + return; + + debug_log("TSCR: npc_time_rift: not casting anylonger, i need to die."); + me->setDeathState(JUST_DIED); + + if (pInstance->GetData(TYPE_RIFT) == IN_PROGRESS) + pInstance->SetData(TYPE_RIFT,SPECIAL); + } +}; + +CreatureAI* GetAI_npc_time_rift(Creature* pCreature) +{ + return new npc_time_riftAI (pCreature); +} + +#define SAY_SAAT_WELCOME -1269019 + +#define GOSSIP_ITEM_OBTAIN "[PH] Obtain Chrono-Beacon" +#define SPELL_CHRONO_BEACON 34975 +#define ITEM_CHRONO_BEACON 24289 + +bool GossipHello_npc_saat(Player* pPlayer, Creature* pCreature) +{ + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); + + if (pPlayer->GetQuestStatus(QUEST_OPENING_PORTAL) == QUEST_STATUS_INCOMPLETE && !pPlayer->HasItemCount(ITEM_CHRONO_BEACON,1)) + { + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,GOSSIP_ITEM_OBTAIN,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+1); + pPlayer->SEND_GOSSIP_MENU(10000, pCreature->GetGUID()); + return true; + } + else if (pPlayer->GetQuestRewardStatus(QUEST_OPENING_PORTAL) && !pPlayer->HasItemCount(ITEM_CHRONO_BEACON,1)) + { + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,GOSSIP_ITEM_OBTAIN,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+1); + pPlayer->SEND_GOSSIP_MENU(10001, pCreature->GetGUID()); + return true; + } + + pPlayer->SEND_GOSSIP_MENU(10002, pCreature->GetGUID()); + return true; +} + +bool GossipSelect_npc_saat(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) +{ + if (uiAction == GOSSIP_ACTION_INFO_DEF+1) + { + pPlayer->CLOSE_GOSSIP_MENU(); + pCreature->CastSpell(pPlayer,SPELL_CHRONO_BEACON,false); + } + return true; +} + +void AddSC_dark_portal() +{ + Script *newscript; + + newscript = new Script; + newscript->Name = "npc_medivh_bm"; + newscript->GetAI = &GetAI_npc_medivh_bm; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "npc_time_rift"; + newscript->GetAI = &GetAI_npc_time_rift; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "npc_saat"; + newscript->pGossipHello = &GossipHello_npc_saat; + newscript->pGossipSelect = &GossipSelect_npc_saat; + newscript->RegisterSelf(); +} + diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.h b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.h new file mode 100644 index 00000000000..7bfd8c917d7 --- /dev/null +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.h @@ -0,0 +1,35 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 +* This program is free software licensed under GPL version 2 +* Please see the included DOCS/LICENSE.TXT for more information */ + +#ifndef DEF_DARKPORTAL_H +#define DEF_DARKPORTAL_H + +#define TYPE_MEDIVH 1 +#define TYPE_RIFT 2 + +#define DATA_MEDIVH 10 +#define DATA_PORTAL_COUNT 11 +#define DATA_SHIELD 12 + +#define WORLD_STATE_BM 2541 +#define WORLD_STATE_BM_SHIELD 2540 +#define WORLD_STATE_BM_RIFT 2784 + +#define QUEST_OPENING_PORTAL 10297 +#define QUEST_MASTER_TOUCH 9836 + +#define C_TIME_KEEPER 17918 +#define C_RKEEP 21104 +#define C_RLORD 17839 +#define C_DEJA 17879 +#define C_TEMPO 17880 +#define C_AEONUS 17881 +#define C_ASSAS 17835 +#define C_WHELP 21818 +#define C_CHRON 17892 +#define C_EXECU 18994 +#define C_VANQU 18995 + +#endif + diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp new file mode 100644 index 00000000000..d1280230808 --- /dev/null +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp @@ -0,0 +1,346 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +/* ScriptData +SDName: Instance_Dark_Portal +SD%Complete: 50 +SDComment: Quest support: 9836, 10297. Currently in progress. +SDCategory: Caverns of Time, The Dark Portal +EndScriptData */ + +#include "ScriptedPch.h" +#include "dark_portal.h" + +#define MAX_ENCOUNTER 2 + +#define C_MEDIVH 15608 +#define C_TIME_RIFT 17838 + +#define SPELL_RIFT_CHANNEL 31387 + +#define RIFT_BOSS 1 + +inline uint32 RandRiftBoss() { return ((rand()%2) ? C_RKEEP : C_RLORD); } + +float PortalLocation[4][4]= +{ + {-2041.06, 7042.08, 29.99, 1.30}, + {-1968.18, 7042.11, 21.93, 2.12}, + {-1885.82, 7107.36, 22.32, 3.07}, + {-1928.11, 7175.95, 22.11, 3.44} +}; + +struct Wave +{ + uint32 PortalBoss; //protector of current portal + uint32 NextPortalTime; //time to next portal, or 0 if portal boss need to be killed +}; + +static Wave RiftWaves[]= +{ + {RIFT_BOSS, 0}, + {C_DEJA, 0}, + {RIFT_BOSS, 120000}, + {C_TEMPO, 140000}, + {RIFT_BOSS, 120000}, + {C_AEONUS, 0} +}; + +struct instance_dark_portal : public ScriptedInstance +{ + instance_dark_portal(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; + + uint32 m_auiEncounter[MAX_ENCOUNTER]; + + uint32 mRiftPortalCount; + uint32 mShieldPercent; + uint8 mRiftWaveCount; + uint8 mRiftWaveId; + + uint32 NextPortal_Timer; + + uint64 MedivhGUID; + uint8 CurrentRiftId; + + void Initialize() + { + MedivhGUID = 0; + Clear(); + } + + void Clear() + { + memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); + + mRiftPortalCount = 0; + mShieldPercent = 100; + mRiftWaveCount = 0; + mRiftWaveId = 0; + + CurrentRiftId = 0; + + NextPortal_Timer = 0; + } + + void InitWorldState(bool Enable = true) + { + DoUpdateWorldState(WORLD_STATE_BM,Enable ? 1 : 0); + DoUpdateWorldState(WORLD_STATE_BM_SHIELD, 100); + DoUpdateWorldState(WORLD_STATE_BM_RIFT, 0); + } + + bool IsEncounterInProgress() + { + if (GetData(TYPE_MEDIVH) == IN_PROGRESS) + return true; + + return false; + } + + void OnPlayerEnter(Player* pPlayer) + { + if (GetData(TYPE_MEDIVH) == IN_PROGRESS) + return; + + pPlayer->SendUpdateWorldState(WORLD_STATE_BM,0); + } + + void OnCreatureCreate(Creature* pCreature, bool /*add*/) + { + if (pCreature->GetEntry() == C_MEDIVH) + MedivhGUID = pCreature->GetGUID(); + } + + //what other conditions to check? + bool CanProgressEvent() + { + if (instance->GetPlayers().isEmpty()) + return false; + + return true; + } + + uint8 GetRiftWaveId() + { + switch(mRiftPortalCount) + { + case 6: + mRiftWaveId = 2; + return 1; + case 12: + mRiftWaveId = 4; + return 3; + case 18: + return 5; + default: + return mRiftWaveId; + } + } + + void SetData(uint32 type, uint32 data) + { + switch(type) + { + case TYPE_MEDIVH: + if (data == SPECIAL && m_auiEncounter[0] == IN_PROGRESS) + { + --mShieldPercent; + + DoUpdateWorldState(WORLD_STATE_BM_SHIELD, mShieldPercent); + + if (!mShieldPercent) + { + if (Creature* pMedivh = instance->GetCreature(MedivhGUID)) + { + if (pMedivh->isAlive()) + { + pMedivh->DealDamage(pMedivh, pMedivh->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); + m_auiEncounter[0] = FAIL; + m_auiEncounter[1] = NOT_STARTED; + } + } + } + } + else + { + if (data == IN_PROGRESS) + { + debug_log("TSCR: Instance Dark Portal: Starting event."); + InitWorldState(); + m_auiEncounter[1] = IN_PROGRESS; + NextPortal_Timer = 15000; + } + + if (data == DONE) + { + //this may be completed further out in the post-event + debug_log("TSCR: Instance Dark Portal: Event completed."); + Map::PlayerList const& players = instance->GetPlayers(); + + if (!players.isEmpty()) + { + for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) + { + if (Player* pPlayer = itr->getSource()) + { + if (pPlayer->GetQuestStatus(QUEST_OPENING_PORTAL) == QUEST_STATUS_INCOMPLETE) + pPlayer->AreaExploredOrEventHappens(QUEST_OPENING_PORTAL); + + if (pPlayer->GetQuestStatus(QUEST_MASTER_TOUCH) == QUEST_STATUS_INCOMPLETE) + pPlayer->AreaExploredOrEventHappens(QUEST_MASTER_TOUCH); + } + } + } + } + + m_auiEncounter[0] = data; + } + break; + case TYPE_RIFT: + if (data == SPECIAL) + { + if (mRiftPortalCount < 7) + NextPortal_Timer = 5000; + } + else + m_auiEncounter[1] = data; + break; + } + } + + uint32 GetData(uint32 type) + { + switch(type) + { + case TYPE_MEDIVH: + return m_auiEncounter[0]; + case TYPE_RIFT: + return m_auiEncounter[1]; + case DATA_PORTAL_COUNT: + return mRiftPortalCount; + case DATA_SHIELD: + return mShieldPercent; + } + return 0; + } + + uint64 GetData64(uint32 data) + { + if (data == DATA_MEDIVH) + return MedivhGUID; + + return 0; + } + + Creature* SummonedPortalBoss(Creature* me) + { + uint32 entry = RiftWaves[GetRiftWaveId()].PortalBoss; + + if (entry == RIFT_BOSS) + entry = RandRiftBoss(); + + debug_log("TSCR: Instance Dark Portal: Summoning rift boss entry %u.",entry); + + Position pos; + me->GetRandomNearPosition(pos, 10.0f); + + //normalize Z-level if we can, if rift is not at ground level. + pos.m_positionZ = std::max(me->GetMap()->GetHeight(pos.m_positionX, pos.m_positionY, MAX_HEIGHT), me->GetMap()->GetWaterLevel(pos.m_positionX, pos.m_positionY)); + + if (Creature *summon = me->SummonCreature(entry, pos, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000)) + return summon; + + debug_log("TSCR: Instance Dark Portal: What just happened there? No boss, no loot, no fun..."); + return NULL; + } + + void DoSpawnPortal() + { + if (Creature* pMedivh = instance->GetCreature(MedivhGUID)) + { + uint8 tmp = urand(0,2); + + if (tmp >= CurrentRiftId) + ++tmp; + + debug_log("TSCR: Instance Dark Portal: Creating Time Rift at locationId %i (old locationId was %u).",tmp,CurrentRiftId); + + CurrentRiftId = tmp; + + Creature *pTemp = pMedivh->SummonCreature(C_TIME_RIFT, + PortalLocation[tmp][0],PortalLocation[tmp][1],PortalLocation[tmp][2],PortalLocation[tmp][3], + TEMPSUMMON_CORPSE_DESPAWN,0); + if (pTemp) + { + pTemp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + pTemp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + + if (Creature *pBoss = SummonedPortalBoss(pTemp)) + { + if (pBoss->GetEntry() == C_AEONUS) + pBoss->AddThreat(pMedivh,0.0f); + else + { + pBoss->AddThreat(pTemp,0.0f); + pTemp->CastSpell(pBoss,SPELL_RIFT_CHANNEL,false); + } + } + } + } + } + + void Update(uint32 diff) + { + if (m_auiEncounter[1] != IN_PROGRESS) + return; + + //add delay timer? + if (!CanProgressEvent()) + { + Clear(); + return; + } + + if (NextPortal_Timer) + { + if (NextPortal_Timer <= diff) + { + ++mRiftPortalCount; + + DoUpdateWorldState(WORLD_STATE_BM_RIFT, mRiftPortalCount); + + DoSpawnPortal(); + NextPortal_Timer = RiftWaves[GetRiftWaveId()].NextPortalTime; + } else NextPortal_Timer -= diff; + } + } +}; + +InstanceData* GetInstanceData_instance_dark_portal(Map* pMap) +{ + return new instance_dark_portal(pMap); +} + +void AddSC_instance_dark_portal() +{ + Script *newscript; + + newscript = new Script; + newscript->Name = "instance_dark_portal"; + newscript->GetInstanceData = &GetInstanceData_instance_dark_portal; + newscript->RegisterSelf(); +} + diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp new file mode 100644 index 00000000000..91c9e274b83 --- /dev/null +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp @@ -0,0 +1,152 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Boss_Captain_Skarloc +SD%Complete: 75 +SDComment: Missing adds, missing waypoints to move up to Thrall once spawned + speech before enter combat. +SDCategory: Caverns of Time, Old Hillsbrad Foothills +EndScriptData */ + +#include "ScriptedPch.h" +#include "old_hillsbrad.h" + +#define SAY_ENTER -1560000 +#define SAY_TAUNT1 -1560001 +#define SAY_TAUNT2 -1560002 +#define SAY_SLAY1 -1560003 +#define SAY_SLAY2 -1560004 +#define SAY_DEATH -1560005 + +#define SPELL_HOLY_LIGHT 29427 +#define SPELL_CLEANSE 29380 +#define SPELL_HAMMER_OF_JUSTICE 13005 +#define SPELL_HOLY_SHIELD 31904 +#define SPELL_DEVOTION_AURA 8258 +#define SPELL_CONSECRATION 38385 + +struct boss_captain_skarlocAI : public ScriptedAI +{ + boss_captain_skarlocAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + } + + ScriptedInstance *pInstance; + + uint32 Holy_Light_Timer; + uint32 Cleanse_Timer; + uint32 HammerOfJustice_Timer; + uint32 HolyShield_Timer; + uint32 DevotionAura_Timer; + uint32 Consecration_Timer; + + void Reset() + { + Holy_Light_Timer = 20000 + rand()%10000; + Cleanse_Timer = 10000; + HammerOfJustice_Timer = 20000 + rand()%15000; + HolyShield_Timer = 240000; + DevotionAura_Timer = 3000; + Consecration_Timer = 8000; + } + + void EnterCombat(Unit * /*who*/) + { + //This is not correct. Should taunt Thrall before engage in combat + DoScriptText(SAY_TAUNT1, me); + DoScriptText(SAY_TAUNT2, me); + } + + void KilledUnit(Unit * /*victim*/) + { + DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); + } + + void JustDied(Unit * /*victim*/) + { + DoScriptText(SAY_DEATH, me); + + if (pInstance && pInstance->GetData(TYPE_THRALL_EVENT) == IN_PROGRESS) + pInstance->SetData(TYPE_THRALL_PART1, DONE); + } + + void UpdateAI(const uint32 diff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + //Holy_Light + if (Holy_Light_Timer <= diff) + { + DoCast(me, SPELL_HOLY_LIGHT); + Holy_Light_Timer = 30000; + } else Holy_Light_Timer -= diff; + + //Cleanse + if (Cleanse_Timer <= diff) + { + DoCast(me, SPELL_CLEANSE); + Cleanse_Timer = 10000; + } else Cleanse_Timer -= diff; + + //Hammer of Justice + if (HammerOfJustice_Timer <= diff) + { + DoCast(me->getVictim(), SPELL_HAMMER_OF_JUSTICE); + HammerOfJustice_Timer = 60000; + } else HammerOfJustice_Timer -= diff; + + //Holy Shield + if (HolyShield_Timer <= diff) + { + DoCast(me, SPELL_HOLY_SHIELD); + HolyShield_Timer = 240000; + } else HolyShield_Timer -= diff; + + //Devotion_Aura + if (DevotionAura_Timer <= diff) + { + DoCast(me, SPELL_DEVOTION_AURA); + DevotionAura_Timer = 45000 + rand()%10000; + } else DevotionAura_Timer -= diff; + + //Consecration + if (Consecration_Timer <= diff) + { + //DoCast(me->getVictim(), SPELL_CONSECRATION); + Consecration_Timer = 5000 + rand()%5000; + } else Consecration_Timer -= diff; + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_boss_captain_skarloc(Creature* pCreature) +{ + return new boss_captain_skarlocAI (pCreature); +} + +void AddSC_boss_captain_skarloc() +{ + Script *newscript; + newscript = new Script; + newscript->Name = "boss_captain_skarloc"; + newscript->GetAI = &GetAI_boss_captain_skarloc; + newscript->RegisterSelf(); +} + diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp new file mode 100644 index 00000000000..2c2ad96ddb7 --- /dev/null +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp @@ -0,0 +1,138 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Boss_Epoch_Hunter +SD%Complete: 60 +SDComment: Missing spawns pre-event, missing speech to be coordinated with rest of escort event. +SDCategory: Caverns of Time, Old Hillsbrad Foothills +EndScriptData */ + +#include "ScriptedPch.h" +#include "old_hillsbrad.h" + +#define SAY_ENTER1 -1560013 +#define SAY_ENTER2 -1560014 +#define SAY_ENTER3 -1560015 +#define SAY_AGGRO1 -1560016 +#define SAY_AGGRO2 -1560017 +#define SAY_SLAY1 -1560018 +#define SAY_SLAY2 -1560019 +#define SAY_BREATH1 -1560020 +#define SAY_BREATH2 -1560021 +#define SAY_DEATH -1560022 + +#define SPELL_SAND_BREATH 31914 +#define SPELL_IMPENDING_DEATH 31916 +#define SPELL_MAGIC_DISRUPTION_AURA 33834 +#define SPELL_WING_BUFFET 31475 + +struct boss_epoch_hunterAI : public ScriptedAI +{ + boss_epoch_hunterAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + } + + ScriptedInstance *pInstance; + + uint32 SandBreath_Timer; + uint32 ImpendingDeath_Timer; + uint32 WingBuffet_Timer; + uint32 Mda_Timer; + + void Reset() + { + SandBreath_Timer = 8000 + rand()%8000; + ImpendingDeath_Timer = 25000 + rand()%5000; + WingBuffet_Timer = 35000; + Mda_Timer = 40000; + } + + void EnterCombat(Unit * /*who*/) + { + DoScriptText(RAND(SAY_AGGRO1,SAY_AGGRO2), me); + } + + void KilledUnit(Unit * /*victim*/) + { + DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); + } + + void JustDied(Unit * /*victim*/) + { + DoScriptText(SAY_DEATH, me); + + if (pInstance && pInstance->GetData(TYPE_THRALL_EVENT) == IN_PROGRESS) + pInstance->SetData(TYPE_THRALL_PART4, DONE); + } + + void UpdateAI(const uint32 diff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + //Sand Breath + if (SandBreath_Timer <= diff) + { + if (me->IsNonMeleeSpellCasted(false)) + me->InterruptNonMeleeSpells(false); + + DoCast(me->getVictim(), SPELL_SAND_BREATH); + + DoScriptText(RAND(SAY_BREATH1,SAY_BREATH2), me); + + SandBreath_Timer = 10000 + rand()%10000; + } else SandBreath_Timer -= diff; + + if (ImpendingDeath_Timer <= diff) + { + DoCast(me->getVictim(), SPELL_IMPENDING_DEATH); + ImpendingDeath_Timer = 25000+rand()%5000; + } else ImpendingDeath_Timer -= diff; + + if (WingBuffet_Timer <= diff) + { + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget, SPELL_WING_BUFFET); + WingBuffet_Timer = 25000+rand()%10000; + } else WingBuffet_Timer -= diff; + + if (Mda_Timer <= diff) + { + DoCast(me, SPELL_MAGIC_DISRUPTION_AURA); + Mda_Timer = 15000; + } else Mda_Timer -= diff; + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_boss_epoch_hunter(Creature* pCreature) +{ + return new boss_epoch_hunterAI (pCreature); +} + +void AddSC_boss_epoch_hunter() +{ + Script *newscript; + newscript = new Script; + newscript->Name = "boss_epoch_hunter"; + newscript->GetAI = &GetAI_boss_epoch_hunter; + newscript->RegisterSelf(); +} + diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp new file mode 100644 index 00000000000..dae0f5390b1 --- /dev/null +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp @@ -0,0 +1,190 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Boss_Luetenant_Drake +SD%Complete: 70 +SDComment: Missing proper code for patrolling area after being spawned. Script for GO (barrels) quest 10283 +SDCategory: Caverns of Time, Old Hillsbrad Foothills +EndScriptData */ + +#include "ScriptedPch.h" +#include "old_hillsbrad.h" +#include "ScriptedEscortAI.h" + +/*###### +## go_barrel_old_hillsbrad +######*/ + +bool GOHello_go_barrel_old_hillsbrad(Player* /*pPlayer*/, GameObject* pGO) +{ + if (ScriptedInstance* pInstance = pGO->GetInstanceData()) + { + if (pInstance->GetData(TYPE_BARREL_DIVERSION) == DONE) + return false; + + pInstance->SetData(TYPE_BARREL_DIVERSION, IN_PROGRESS); + } + + return false; +} + +/*###### +## boss_lieutenant_drake +######*/ + +#define SAY_ENTER -1560006 +#define SAY_AGGRO -1560007 +#define SAY_SLAY1 -1560008 +#define SAY_SLAY2 -1560009 +#define SAY_MORTAL -1560010 +#define SAY_SHOUT -1560011 +#define SAY_DEATH -1560012 + +#define SPELL_WHIRLWIND 31909 +#define SPELL_HAMSTRING 9080 +#define SPELL_MORTAL_STRIKE 31911 +#define SPELL_FRIGHTENING_SHOUT 33789 + +struct Location +{ + uint32 wpId; + float x; + float y; + float z; +}; + +static Location DrakeWP[]= +{ + {0, 2125.84, 88.2535, 54.8830}, + {1, 2111.01, 93.8022, 52.6356}, + {2, 2106.70, 114.753, 53.1965}, + {3, 2107.76, 138.746, 52.5109}, + {4, 2114.83, 160.142, 52.4738}, + {5, 2125.24, 178.909, 52.7283}, + {6, 2151.02, 208.901, 53.1551}, + {7, 2177.00, 233.069, 52.4409}, + {8, 2190.71, 227.831, 53.2742}, + {9, 2178.14, 214.219, 53.0779}, + {10, 2154.99, 202.795, 52.6446}, + {11, 2132.00, 191.834, 52.5709}, + {12, 2117.59, 166.708, 52.7686}, + {13, 2093.61, 139.441, 52.7616}, + {14, 2086.29, 104.950, 52.9246}, + {15, 2094.23, 81.2788, 52.6946}, + {16, 2108.70, 85.3075, 53.3294}, + {17, 2125.50, 88.9481, 54.7953}, + {18, 2128.20, 70.9763, 64.4221} +}; + +struct boss_lieutenant_drakeAI : public ScriptedAI +{ + boss_lieutenant_drakeAI(Creature *c) : ScriptedAI(c) {} + + bool CanPatrol; + uint32 wpId; + + uint32 Whirlwind_Timer; + uint32 Fear_Timer; + uint32 MortalStrike_Timer; + uint32 ExplodingShout_Timer; + + void Reset() + { + CanPatrol = true; + wpId = 0; + + Whirlwind_Timer = 20000; + Fear_Timer = 30000; + MortalStrike_Timer = 45000; + ExplodingShout_Timer = 25000; + } + + void EnterCombat(Unit * /*who*/) + { + DoScriptText(SAY_AGGRO, me); + } + + void KilledUnit(Unit * /*victim*/) + { + DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); + } + + void JustDied(Unit * /*victim*/) + { + DoScriptText(SAY_DEATH, me); + } + + void UpdateAI(const uint32 diff) + { + //TODO: make this work + if (CanPatrol && wpId == 0) + { + me->GetMotionMaster()->MovePoint(DrakeWP[0].wpId, DrakeWP[0].x, DrakeWP[0].y, DrakeWP[0].z); + ++wpId; + } + + //Return since we have no target + if (!UpdateVictim()) + return; + + //Whirlwind + if (Whirlwind_Timer <= diff) + { + DoCast(me->getVictim(), SPELL_WHIRLWIND); + Whirlwind_Timer = 20000+rand()%5000; + } else Whirlwind_Timer -= diff; + + //Fear + if (Fear_Timer <= diff) + { + DoScriptText(SAY_SHOUT, me); + DoCast(me->getVictim(), SPELL_FRIGHTENING_SHOUT); + Fear_Timer = 25000+rand()%10000; + } else Fear_Timer -= diff; + + //Mortal Strike + if (MortalStrike_Timer <= diff) + { + DoScriptText(SAY_MORTAL, me); + DoCast(me->getVictim(), SPELL_MORTAL_STRIKE); + MortalStrike_Timer = 20000+rand()%10000; + } else MortalStrike_Timer -= diff; + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_boss_lieutenant_drake(Creature* pCreature) +{ + return new boss_lieutenant_drakeAI (pCreature); +} + +void AddSC_boss_lieutenant_drake() +{ + Script *newscript; + + newscript = new Script; + newscript->Name = "go_barrel_old_hillsbrad"; + newscript->pGOHello = &GOHello_go_barrel_old_hillsbrad; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "boss_lieutenant_drake"; + newscript->GetAI = &GetAI_boss_lieutenant_drake; + newscript->RegisterSelf(); +} + diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp new file mode 100644 index 00000000000..fa0b7c14595 --- /dev/null +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp @@ -0,0 +1,238 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Instance_Old_Hillsbrad +SD%Complete: 75 +SDComment: If thrall escort fail, all parts will reset. In future, save sub-parts and continue from last known. +SDCategory: Caverns of Time, Old Hillsbrad Foothills +EndScriptData */ + +#include "ScriptedPch.h" +#include "old_hillsbrad.h" + +#define MAX_ENCOUNTER 6 + +#define THRALL_ENTRY 17876 +#define TARETHA_ENTRY 18887 +#define EPOCH_ENTRY 18096 + +#define DRAKE_ENTRY 17848 + +#define QUEST_ENTRY_DIVERSION 10283 +#define LODGE_QUEST_TRIGGER 20155 + +struct instance_old_hillsbrad : public ScriptedInstance +{ + instance_old_hillsbrad(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; + + uint32 m_auiEncounter[MAX_ENCOUNTER]; + uint32 mBarrelCount; + uint32 mThrallEventCount; + + uint64 ThrallGUID; + uint64 TarethaGUID; + uint64 EpochGUID; + + void Initialize() + { + memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); + + mBarrelCount = 0; + mThrallEventCount = 0; + ThrallGUID = 0; + TarethaGUID = 0; + EpochGUID = 0; + } + + Player* GetPlayerInMap() + { + Map::PlayerList const& players = instance->GetPlayers(); + + if (!players.isEmpty()) + { + for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) + { + if (Player* plr = itr->getSource()) + return plr; + } + } + + debug_log("TSCR: Instance Old Hillsbrad: GetPlayerInMap, but PlayerList is empty!"); + return NULL; + } + + void UpdateQuestCredit() + { + Map::PlayerList const& players = instance->GetPlayers(); + + if (!players.isEmpty()) + { + for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) + { + if (Player* pPlayer = itr->getSource()) + pPlayer->KilledMonsterCredit(LODGE_QUEST_TRIGGER,0); + } + } + } + + void OnCreatureCreate(Creature* pCreature, bool /*add*/) + { + switch(pCreature->GetEntry()) + { + case THRALL_ENTRY: + ThrallGUID = pCreature->GetGUID(); + break; + case TARETHA_ENTRY: + TarethaGUID = pCreature->GetGUID(); + break; + case EPOCH_ENTRY: + EpochGUID = pCreature->GetGUID(); + break; + } + } + + void SetData(uint32 type, uint32 data) + { + Player* pPlayer = GetPlayerInMap(); + + if (!pPlayer) + { + debug_log("TSCR: Instance Old Hillsbrad: SetData (Type: %u Data %u) cannot find any player.", type, data); + return; + } + + switch(type) + { + case TYPE_BARREL_DIVERSION: + { + if (data == IN_PROGRESS) + { + if (mBarrelCount >= 5) + return; + + ++mBarrelCount; + DoUpdateWorldState(WORLD_STATE_OH, mBarrelCount); + + debug_log("TSCR: Instance Old Hillsbrad: go_barrel_old_hillsbrad count %u",mBarrelCount); + + m_auiEncounter[0] = IN_PROGRESS; + + if (mBarrelCount == 5) + { + UpdateQuestCredit(); + pPlayer->SummonCreature(DRAKE_ENTRY, 2128.43, 71.01, 64.42, 1.74, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 1800000); + m_auiEncounter[0] = DONE; + } + } + break; + } + case TYPE_THRALL_EVENT: + { + if (data == FAIL) + { + if (mThrallEventCount <= 20) + { + ++mThrallEventCount; + m_auiEncounter[1] = NOT_STARTED; + debug_log("TSCR: Instance Old Hillsbrad: Thrall event failed %u times. Resetting all sub-events.",mThrallEventCount); + m_auiEncounter[2] = NOT_STARTED; + m_auiEncounter[3] = NOT_STARTED; + m_auiEncounter[4] = NOT_STARTED; + m_auiEncounter[5] = NOT_STARTED; + } + else if (mThrallEventCount > 20) + { + m_auiEncounter[1] = data; + m_auiEncounter[2] = data; + m_auiEncounter[3] = data; + m_auiEncounter[4] = data; + m_auiEncounter[5] = data; + debug_log("TSCR: Instance Old Hillsbrad: Thrall event failed %u times. Resetting all sub-events.",mThrallEventCount); + } + } + else + m_auiEncounter[1] = data; + debug_log("TSCR: Instance Old Hillsbrad: Thrall escort event adjusted to data %u.",data); + break; + } + case TYPE_THRALL_PART1: + m_auiEncounter[2] = data; + debug_log("TSCR: Instance Old Hillsbrad: Thrall event part I adjusted to data %u.",data); + break; + case TYPE_THRALL_PART2: + m_auiEncounter[3] = data; + debug_log("TSCR: Instance Old Hillsbrad: Thrall event part II adjusted to data %u.",data); + break; + case TYPE_THRALL_PART3: + m_auiEncounter[4] = data; + debug_log("TSCR: Instance Old Hillsbrad: Thrall event part III adjusted to data %u.",data); + break; + case TYPE_THRALL_PART4: + m_auiEncounter[5] = data; + debug_log("TSCR: Instance Old Hillsbrad: Thrall event part IV adjusted to data %u.",data); + break; + } + } + + uint32 GetData(uint32 data) + { + switch(data) + { + case TYPE_BARREL_DIVERSION: + return m_auiEncounter[0]; + case TYPE_THRALL_EVENT: + return m_auiEncounter[1]; + case TYPE_THRALL_PART1: + return m_auiEncounter[2]; + case TYPE_THRALL_PART2: + return m_auiEncounter[3]; + case TYPE_THRALL_PART3: + return m_auiEncounter[4]; + case TYPE_THRALL_PART4: + return m_auiEncounter[5]; + } + return 0; + } + + uint64 GetData64(uint32 data) + { + switch(data) + { + case DATA_THRALL: + return ThrallGUID; + case DATA_TARETHA: + return TarethaGUID; + case DATA_EPOCH: + return EpochGUID; + } + return 0; + } +}; +InstanceData* GetInstanceData_instance_old_hillsbrad(Map* pMap) +{ + return new instance_old_hillsbrad(pMap); +} + +void AddSC_instance_old_hillsbrad() +{ + Script *newscript; + newscript = new Script; + newscript->Name = "instance_old_hillsbrad"; + newscript->GetInstanceData = &GetInstanceData_instance_old_hillsbrad; + newscript->RegisterSelf(); +} + diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp new file mode 100644 index 00000000000..08c63954db5 --- /dev/null +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp @@ -0,0 +1,658 @@ + /* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Old_Hillsbrad +SD%Complete: 40 +SDComment: Quest support: 10283, 10284. All friendly NPC's. Thrall waypoints fairly complete, missing many details, but possible to complete escort. +SDCategory: Caverns of Time, Old Hillsbrad Foothills +EndScriptData */ + +/* ContentData +npc_erozion +npc_thrall_old_hillsbrad +npc_taretha +EndContentData */ + +#include "ScriptedPch.h" +#include "ScriptedEscortAI.h" +#include "old_hillsbrad.h" + +#define QUEST_ENTRY_HILLSBRAD 10282 +#define QUEST_ENTRY_DIVERSION 10283 +#define QUEST_ENTRY_ESCAPE 10284 +#define QUEST_ENTRY_RETURN 10285 +#define ITEM_ENTRY_BOMBS 25853 + +#define GOSSIP_HELLO_EROZION1 "I need a pack of Incendiary Bombs." +#define GOSSIP_HELLO_EROZION2 "[PH] Teleport please, i'm tired." + +/*###### +## npc_erozion +######*/ + +bool GossipHello_npc_erozion(Player* pPlayer, Creature* pCreature) +{ + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); + + ScriptedInstance* pInstance = pCreature->GetInstanceData(); + if (pInstance && pInstance->GetData(TYPE_BARREL_DIVERSION) != DONE && !pPlayer->HasItemCount(ITEM_ENTRY_BOMBS,1)) + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_EROZION1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); + + if (!pPlayer->GetQuestRewardStatus(QUEST_ENTRY_RETURN) && pPlayer->GetQuestStatus(QUEST_ENTRY_RETURN) == QUEST_STATUS_COMPLETE) + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_EROZION2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); + + pPlayer->SEND_GOSSIP_MENU(9778, pCreature->GetGUID()); + + return true; +} + +bool GossipSelect_npc_erozion(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) +{ + if (uiAction == GOSSIP_ACTION_INFO_DEF+1) + { + ItemPosCountVec dest; + uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, ITEM_ENTRY_BOMBS, 1); + if (msg == EQUIP_ERR_OK) + { + pPlayer->StoreNewItem(dest, ITEM_ENTRY_BOMBS, true); + } + pPlayer->SEND_GOSSIP_MENU(9515, pCreature->GetGUID()); + } + if (uiAction == GOSSIP_ACTION_INFO_DEF+2) + { + pPlayer->CLOSE_GOSSIP_MENU(); + } + return true; +} + +/*###### +## npc_thrall_old_hillsbrad +######*/ + +//Thrall texts +#define SAY_TH_START_EVENT_PART1 -1560023 +#define SAY_TH_ARMORY -1560024 +#define SAY_TH_SKARLOC_MEET -1560025 +#define SAY_TH_SKARLOC_TAUNT -1560026 +#define SAY_TH_START_EVENT_PART2 -1560027 +#define SAY_TH_MOUNTS_UP -1560028 +#define SAY_TH_CHURCH_END -1560029 +#define SAY_TH_MEET_TARETHA -1560030 +#define SAY_TH_EPOCH_WONDER -1560031 +#define SAY_TH_EPOCH_KILL_TARETHA -1560032 +#define SAY_TH_EVENT_COMPLETE -1560033 + +#define SAY_TH_RANDOM_LOW_HP1 -1560034 +#define SAY_TH_RANDOM_LOW_HP2 -1560035 + +#define SAY_TH_RANDOM_DIE1 -1560036 +#define SAY_TH_RANDOM_DIE2 -1560037 + +#define SAY_TH_RANDOM_AGGRO1 -1560038 +#define SAY_TH_RANDOM_AGGRO2 -1560039 +#define SAY_TH_RANDOM_AGGRO3 -1560040 +#define SAY_TH_RANDOM_AGGRO4 -1560041 + +#define SAY_TH_RANDOM_KILL1 -1560042 +#define SAY_TH_RANDOM_KILL2 -1560043 +#define SAY_TH_RANDOM_KILL3 -1560044 + +#define SAY_TH_LEAVE_COMBAT1 -1560045 +#define SAY_TH_LEAVE_COMBAT2 -1560046 +#define SAY_TH_LEAVE_COMBAT3 -1560047 + +//Taretha texts +#define SAY_TA_FREE -1560048 +#define SAY_TA_ESCAPED -1560049 + +//Misc for Thrall +#define SPELL_STRIKE 14516 +#define SPELL_SHIELD_BLOCK 12169 +#define SPELL_SUMMON_EROZION_IMAGE 33954 //if thrall dies during escort? + +#define SPEED_WALK (0.5f) +#define SPEED_RUN (1.0f) +#define SPEED_MOUNT (1.6f) + +#define THRALL_WEAPON_MODEL 22106 +#define THRALL_WEAPON_INFO 218169346 +#define THRALL_SHIELD_MODEL 18662 +#define THRALL_SHIELD_INFO 234948100 +#define THRALL_MODEL_UNEQUIPPED 17292 +#define THRALL_MODEL_EQUIPPED 18165 + +//Misc Creature entries +#define ENTRY_ARMORER 18764 +#define ENTRY_SCARLOC 17862 + +#define MOB_ENTRY_RIFLE 17820 +#define MOB_ENTRY_WARDEN 17833 +#define MOB_ENTRY_VETERAN 17860 +#define MOB_ENTRY_WATCHMAN 17814 +#define MOB_ENTRY_SENTRY 17815 + +#define MOB_ENTRY_BARN_GUARDSMAN 18092 +#define MOB_ENTRY_BARN_PROTECTOR 18093 +#define MOB_ENTRY_BARN_LOOKOUT 18094 + +#define MOB_ENTRY_CHURCH_GUARDSMAN 23175 +#define MOB_ENTRY_CHURCH_PROTECTOR 23179 +#define MOB_ENTRY_CHURCH_LOOKOUT 23177 + +#define MOB_ENTRY_INN_GUARDSMAN 23176 +#define MOB_ENTRY_INN_PROTECTOR 23180 +#define MOB_ENTRY_INN_LOOKOUT 23178 + +#define SKARLOC_MOUNT 18798 +#define SKARLOC_MOUNT_MODEL 18223 +#define EROZION_ENTRY 18723 +#define ENTRY_EPOCH 18096 + +//gossip items +#define GOSSIP_ID_START 9568 +#define GOSSIP_ID_SKARLOC1 9614 //I'm glad Taretha is alive. We now must find a way to free her... +#define GOSSIP_ITEM_SKARLOC1 "Taretha cannot see you, Thrall." +#define GOSSIP_ID_SKARLOC2 9579 //What do you mean by this? Is Taretha in danger? +#define GOSSIP_ITEM_SKARLOC2 "The situation is rather complicated, Thrall. It would be best for you to head into the mountains now, before more of Blackmoore's men show up. We'll make sure Taretha is safe." +#define GOSSIP_ID_SKARLOC3 9580 + +#define GOSSIP_ID_TARREN 9597 //tarren mill is beyond these trees +#define GOSSIP_ITEM_TARREN "We're ready, Thrall." + +#define GOSSIP_ID_COMPLETE 9578 //Thank you friends, I owe my freedom to you. Where is Taretha? I hoped to see her + +#define GOSSIP_ITEM_WALKING "[PH] Start walking." + +struct npc_thrall_old_hillsbradAI : public npc_escortAI +{ + npc_thrall_old_hillsbradAI(Creature *c) : npc_escortAI(c) + { + pInstance = c->GetInstanceData(); + HadMount = false; + me->setActive(true); + } + + ScriptedInstance *pInstance; + + uint64 TarethaGUID; + + bool LowHp; + bool HadMount; + + void WaypointReached(uint32 i) + { + if (!pInstance) + return; + + switch(i) + { + case 8: + SetRun(false); + me->SummonCreature(18764,2181.87,112.46,89.45,0.26,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + break; + case 9: + DoScriptText(SAY_TH_ARMORY, me); + me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID, THRALL_WEAPON_MODEL); + //me->SetUInt32Value(UNIT_VIRTUAL_ITEM_INFO, THRALL_WEAPON_INFO); + //me->SetUInt32Value(UNIT_VIRTUAL_ITEM_INFO+1, 781); + me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID+1, THRALL_SHIELD_MODEL); + //me->SetUInt32Value(UNIT_VIRTUAL_ITEM_INFO+2, THRALL_SHIELD_INFO); + //me->SetUInt32Value(UNIT_VIRTUAL_ITEM_INFO+3, 1038); + break; + case 10: + me->SetDisplayId(THRALL_MODEL_EQUIPPED); + break; + case 11: + SetRun(); + break; + case 15: + me->SummonCreature(MOB_ENTRY_RIFLE,2200.28,137.37,87.93,5.07,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_WARDEN,2197.44,131.83,87.93,0.78,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_VETERAN,2203.62,135.40,87.93,3.70,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_VETERAN,2200.75,130.13,87.93,1.48,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + break; + case 21: + me->SummonCreature(MOB_ENTRY_RIFLE,2135.80,154.01,67.45,4.98,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_WARDEN,2144.36,151.87,67.74,4.46,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_VETERAN,2142.12,154.41,67.12,4.56,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_VETERAN,2138.08,155.38,67.24,4.60,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + break; + case 25: + me->SummonCreature(MOB_ENTRY_RIFLE,2102.98,192.17,65.24,6.02,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_WARDEN,2108.48,198.75,65.18,5.15,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_VETERAN,2106.11,197.29,65.18,5.63,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_VETERAN,2104.18,194.82,65.18,5.75,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + break; + case 29: + DoScriptText(SAY_TH_SKARLOC_MEET, me); + me->SummonCreature(ENTRY_SCARLOC,2036.48,271.22,63.43,5.27,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000); + //temporary,skarloc should rather be triggered to walk up to thrall + break; + case 30: + SetEscortPaused(true); + me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); + SetRun(false); + break; + case 31: + DoScriptText(SAY_TH_MOUNTS_UP, me); + DoMount(); + SetRun(); + break; + case 37: + //possibly regular patrollers? If so, remove this and let database handle them + me->SummonCreature(MOB_ENTRY_WATCHMAN,2124.26,522.16,56.87,3.99,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_WATCHMAN,2121.69,525.37,57.11,4.01,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_SENTRY,2124.65,524.55,56.63,3.98,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + break; + case 59: + me->SummonCreature(SKARLOC_MOUNT,2488.64,625.77,58.26,4.71,TEMPSUMMON_TIMED_DESPAWN,10000); + DoUnmount(); + HadMount = false; + SetRun(false); + break; + case 60: + me->HandleEmoteCommand(EMOTE_ONESHOT_EXCLAMATION); + //make horsie run off + SetEscortPaused(true); + me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); + pInstance->SetData(TYPE_THRALL_PART2, DONE); + SetRun(); + break; + case 64: + SetRun(false); + break; + case 68: + me->SummonCreature(MOB_ENTRY_BARN_PROTECTOR,2500.22,692.60,55.50,2.84,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_BARN_LOOKOUT,2500.13,696.55,55.51,3.38,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_BARN_GUARDSMAN,2500.55,693.64,55.50,3.14,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_BARN_GUARDSMAN,2500.94,695.81,55.50,3.14,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + break; + case 71: + SetRun(); + break; + case 81: + SetRun(false); + break; + case 83: + me->SummonCreature(MOB_ENTRY_CHURCH_PROTECTOR,2627.33,646.82,56.03,4.28,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,5000); + me->SummonCreature(MOB_ENTRY_CHURCH_LOOKOUT,2624.14,648.03,56.03,4.50,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,5000); + me->SummonCreature(MOB_ENTRY_CHURCH_GUARDSMAN,2625.32,649.60,56.03,4.38,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,5000); + me->SummonCreature(MOB_ENTRY_CHURCH_GUARDSMAN,2627.22,649.00,56.03,4.34,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,5000); + break; + case 84: + DoScriptText(SAY_TH_CHURCH_END, me); + SetRun(); + break; + case 91: + me->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE); + SetRun(false); + break; + case 93: + me->SummonCreature(MOB_ENTRY_INN_PROTECTOR,2652.71,660.31,61.93,1.67,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_INN_LOOKOUT,2648.96,662.59,61.93,0.79,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_INN_GUARDSMAN,2657.36,662.34,61.93,2.68,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_INN_GUARDSMAN,2656.39,659.77,61.93,2.61,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + break; + case 94: + if (uint64 TarethaGUID = pInstance->GetData64(DATA_TARETHA)) + { + if (Unit* Taretha = Unit::GetUnit((*me), TarethaGUID)) + DoScriptText(SAY_TA_ESCAPED, Taretha, me); + } + break; + case 95: + DoScriptText(SAY_TH_MEET_TARETHA, me); + pInstance->SetData(TYPE_THRALL_PART3,DONE); + SetEscortPaused(true); + break; + case 96: + DoScriptText(SAY_TH_EPOCH_WONDER, me); + break; + case 97: + DoScriptText(SAY_TH_EPOCH_KILL_TARETHA, me); + SetRun(); + break; + case 98: + //trigger epoch Yell("Thrall! Come outside and face your fate! ....") + //from here, thrall should not never be allowed to move to point 106 which he currently does. + break; + + case 106: + { + //trigger taretha to run down outside + if (Creature* Taretha = pInstance->instance->GetCreature(pInstance->GetData64(DATA_TARETHA))) + { + if (Player* pPlayer = GetPlayerForEscort()) + CAST_AI(npc_escortAI, (Taretha->AI()))->Start(false, true, pPlayer->GetGUID()); + } + + //kill credit Creature for quest + Map* pMap = me->GetMap(); + Map::PlayerList const& players = pMap->GetPlayers(); + if (!players.isEmpty() && pMap->IsDungeon()) + { + for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) + { + if (Player* pPlayer = itr->getSource()) + pPlayer->KilledMonsterCredit(20156,me->GetGUID()); + } + } + + //alot will happen here, thrall and taretha talk, erozion appear at spot to explain + me->SummonCreature(EROZION_ENTRY,2646.47,680.416,55.38,4.16,TEMPSUMMON_TIMED_DESPAWN,120000); + } + break; + case 108: + //last waypoint, just set Thrall invisible, respawn is turned off + me->SetVisibility(VISIBILITY_OFF); + break; + } + } + + void Reset() + { + LowHp = false; + + if (HadMount) + DoMount(); + + if (!HasEscortState(STATE_ESCORT_ESCORTING)) + { + DoUnmount(); + HadMount = false; + me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID, 0); + me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID+1, 0); + me->SetDisplayId(THRALL_MODEL_UNEQUIPPED); + } + if (HasEscortState(STATE_ESCORT_ESCORTING)) + { + DoScriptText(RAND(SAY_TH_LEAVE_COMBAT1,SAY_TH_LEAVE_COMBAT2,SAY_TH_LEAVE_COMBAT3), me); + } + } + void StartWP() + { + me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); + SetEscortPaused(false); + } + void DoMount() + { + me->Mount(SKARLOC_MOUNT_MODEL); + me->SetSpeed(MOVE_RUN,SPEED_MOUNT); + } + void DoUnmount() + { + me->Unmount(); + me->SetSpeed(MOVE_RUN,SPEED_RUN); + } + void EnterCombat(Unit* /*who*/) + { + DoScriptText(RAND(SAY_TH_RANDOM_AGGRO1,SAY_TH_RANDOM_AGGRO2,SAY_TH_RANDOM_AGGRO3,SAY_TH_RANDOM_AGGRO4), me); + if (me->IsMounted()) + { + DoUnmount(); + HadMount = true; + } + } + + void JustSummoned(Creature* summoned) + { + switch(summoned->GetEntry()) + { + //TODO: make Scarloc start into event instead, and not start attack directly + case MOB_ENTRY_BARN_GUARDSMAN: + case MOB_ENTRY_BARN_PROTECTOR: + case MOB_ENTRY_BARN_LOOKOUT: + case SKARLOC_MOUNT: + case EROZION_ENTRY: + break; + default: + summoned->AI()->AttackStart(me); + break; + } + } + + void KilledUnit(Unit * /*victim*/) + { + DoScriptText(RAND(SAY_TH_RANDOM_KILL1,SAY_TH_RANDOM_KILL2,SAY_TH_RANDOM_KILL3), me); + } + void JustDied(Unit *slayer) + { + if (pInstance) + pInstance->SetData(TYPE_THRALL_EVENT,FAIL); + + // Don't do a yell if he kills self (if player goes too far or at the end). + if (slayer == me) + return; + + DoScriptText(RAND(SAY_TH_RANDOM_DIE1,SAY_TH_RANDOM_DIE2), me); + } + + void UpdateAI(const uint32 diff) + { + npc_escortAI::UpdateAI(diff); + + if (!UpdateVictim()) + return; + + //TODO: add his abilities'n-crap here + if (!LowHp && ((me->GetHealth()*100 / me->GetMaxHealth()) < 20)) + { + DoScriptText(RAND(SAY_TH_RANDOM_LOW_HP1,SAY_TH_RANDOM_LOW_HP2), me); + LowHp = true; + } + } +}; + +CreatureAI* GetAI_npc_thrall_old_hillsbrad(Creature* pCreature) +{ + return new npc_thrall_old_hillsbradAI(pCreature); +} + +bool GossipHello_npc_thrall_old_hillsbrad(Player* pPlayer, Creature* pCreature) +{ + if (pCreature->isQuestGiver()) + { + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); + pPlayer->SendPreparedQuest(pCreature->GetGUID()); + } + + ScriptedInstance* pInstance = pCreature->GetInstanceData(); + if (pInstance) + { + if (pInstance->GetData(TYPE_BARREL_DIVERSION) == DONE && !pInstance->GetData(TYPE_THRALL_EVENT)) + { + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_WALKING, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_START, pCreature->GetGUID()); + } + + if (pInstance->GetData(TYPE_THRALL_PART1) == DONE && !pInstance->GetData(TYPE_THRALL_PART2)) + { + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_SKARLOC1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_SKARLOC1, pCreature->GetGUID()); + } + + if (pInstance->GetData(TYPE_THRALL_PART2) == DONE && !pInstance->GetData(TYPE_THRALL_PART3)) + { + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TARREN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_TARREN, pCreature->GetGUID()); + } + } + return true; +} + +bool GossipSelect_npc_thrall_old_hillsbrad(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) +{ + ScriptedInstance* pInstance = pCreature->GetInstanceData(); + switch(uiAction) + { + case GOSSIP_ACTION_INFO_DEF+1: + pPlayer->CLOSE_GOSSIP_MENU(); + if (pInstance) + { + pInstance->SetData(TYPE_THRALL_EVENT,IN_PROGRESS); + pInstance->SetData(TYPE_THRALL_PART1,IN_PROGRESS); + } + + DoScriptText(SAY_TH_START_EVENT_PART1, pCreature); + + if (npc_escortAI* pEscortAI = CAST_AI(npc_thrall_old_hillsbradAI, pCreature->AI())) + pEscortAI->Start(true, true, pPlayer->GetGUID()); + + CAST_AI(npc_escortAI, (pCreature->AI()))->SetMaxPlayerDistance(100.0f);//not really needed, because it will not despawn if player is too far + CAST_AI(npc_escortAI, (pCreature->AI()))->SetDespawnAtEnd(false); + CAST_AI(npc_escortAI, (pCreature->AI()))->SetDespawnAtFar(false); + break; + + case GOSSIP_ACTION_INFO_DEF+2: + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_SKARLOC2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+20); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_SKARLOC2, pCreature->GetGUID()); + break; + + case GOSSIP_ACTION_INFO_DEF+20: + pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_SKARLOC3, pCreature->GetGUID()); + pCreature->SummonCreature(SKARLOC_MOUNT,2038.81,270.26,63.20,5.41,TEMPSUMMON_TIMED_DESPAWN,12000); + if (pInstance) + pInstance->SetData(TYPE_THRALL_PART2,IN_PROGRESS); + + DoScriptText(SAY_TH_START_EVENT_PART2, pCreature); + + CAST_AI(npc_thrall_old_hillsbradAI, pCreature->AI())->StartWP(); + break; + + case GOSSIP_ACTION_INFO_DEF+3: + pPlayer->CLOSE_GOSSIP_MENU(); + if (pInstance) + pInstance->SetData(TYPE_THRALL_PART3,IN_PROGRESS); + CAST_AI(npc_thrall_old_hillsbradAI, pCreature->AI())->StartWP(); + break; + } + return true; +} + +/*###### +## npc_taretha +######*/ + +#define GOSSIP_ID_EPOCH1 9610 //Thank you for helping Thrall escape, friends. Now I only hope +#define GOSSIP_ITEM_EPOCH1 "Strange wizard?" +#define GOSSIP_ID_EPOCH2 9613 //Yes, friends. This man was no wizard of +#define GOSSIP_ITEM_EPOCH2 "We'll get you out. Taretha. Don't worry. I doubt the wizard would wander too far away." + +struct npc_tarethaAI : public npc_escortAI +{ + npc_tarethaAI(Creature *c) : npc_escortAI(c) + { + pInstance = c->GetInstanceData(); + } + + ScriptedInstance *pInstance; + + void WaypointReached(uint32 i) + { + switch(i) + { + case 6: + DoScriptText(SAY_TA_FREE, me); + break; + case 7: + me->HandleEmoteCommand(EMOTE_ONESHOT_CHEER); + break; + } + } + void Reset() {} + void EnterCombat(Unit* /*who*/) {} + + void UpdateAI(const uint32 diff) + { + npc_escortAI::UpdateAI(diff); + } +}; +CreatureAI* GetAI_npc_taretha(Creature* pCreature) +{ + return new npc_tarethaAI(pCreature); +} + +bool GossipHello_npc_taretha(Player* pPlayer, Creature* pCreature) +{ + ScriptedInstance* pInstance = pCreature->GetInstanceData(); + if (pInstance && pInstance->GetData(TYPE_THRALL_PART3) == DONE && pInstance->GetData(TYPE_THRALL_PART4) == NOT_STARTED) + { + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_EPOCH1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_EPOCH1, pCreature->GetGUID()); + } + return true; +} + +bool GossipSelect_npc_taretha(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) +{ + ScriptedInstance* pInstance = pCreature->GetInstanceData(); + if (uiAction == GOSSIP_ACTION_INFO_DEF+1) + { + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_EPOCH2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_EPOCH2, pCreature->GetGUID()); + } + if (uiAction == GOSSIP_ACTION_INFO_DEF+2) + { + pPlayer->CLOSE_GOSSIP_MENU(); + + if (pInstance && pInstance->GetData(TYPE_THRALL_EVENT) == IN_PROGRESS) + { + pInstance->SetData(TYPE_THRALL_PART4,IN_PROGRESS); + if (pInstance->GetData64(DATA_EPOCH) == 0) + pCreature->SummonCreature(ENTRY_EPOCH,2639.13,698.55,65.43,4.59,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,120000); + + if (uint64 ThrallGUID = pInstance->GetData64(DATA_THRALL)) + { + Creature* Thrall = (Unit::GetCreature((*pCreature), ThrallGUID)); + if (Thrall) + CAST_AI(npc_thrall_old_hillsbradAI, Thrall->AI())->StartWP(); + } + } + } + return true; +} + +/*###### +## AddSC +######*/ + +void AddSC_old_hillsbrad() +{ + Script *newscript; + + newscript = new Script; + newscript->Name = "npc_erozion"; + newscript->pGossipHello = &GossipHello_npc_erozion; + newscript->pGossipSelect = &GossipSelect_npc_erozion; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "npc_thrall_old_hillsbrad"; + newscript->pGossipHello = &GossipHello_npc_thrall_old_hillsbrad; + newscript->pGossipSelect = &GossipSelect_npc_thrall_old_hillsbrad; + newscript->GetAI = &GetAI_npc_thrall_old_hillsbrad; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "npc_taretha"; + newscript->pGossipHello = &GossipHello_npc_taretha; + newscript->pGossipSelect = &GossipSelect_npc_taretha; + newscript->GetAI = &GetAI_npc_taretha; + newscript->RegisterSelf(); +} + diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h new file mode 100644 index 00000000000..5c398cc2647 --- /dev/null +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h @@ -0,0 +1,19 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software licensed under GPL version 2 + * Please see the included DOCS/LICENSE.TXT for more information */ + +#ifndef DEF_OLD_HILLSBRAD_H +#define DEF_OLD_HILLSBRAD_H + +#define TYPE_BARREL_DIVERSION 1 +#define TYPE_THRALL_EVENT 2 +#define TYPE_THRALL_PART1 3 +#define TYPE_THRALL_PART2 4 +#define TYPE_THRALL_PART3 5 +#define TYPE_THRALL_PART4 6 +#define DATA_THRALL 7 +#define DATA_TARETHA 8 +#define DATA_EPOCH 9 +#define WORLD_STATE_OH 2436 +#endif + diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/culling_of_stratholme/boss_epoch.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/culling_of_stratholme/boss_epoch.cpp deleted file mode 100644 index 287d3cf8e9b..00000000000 --- a/src/server/scripts/Kalimdor/CavernsOfTime/culling_of_stratholme/boss_epoch.cpp +++ /dev/null @@ -1,156 +0,0 @@ -/* -* Copyright (C) 2008-2010 Trinity -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ - - -/* Script Data Start -SDName: Boss epoch -SDAuthor: Tartalo -SD%Complete: 80 -SDComment: TODO: Intro, consecutive attacks to a random target durin time wrap, adjust timers -SDCategory: -Script Data End */ - -#include "ScriptedPch.h" -#include "culling_of_stratholme.h" - -enum Spells -{ - SPELL_CURSE_OF_EXERTION = 52772, - SPELL_TIME_WARP = 52766, //Time slows down, reducing attack, casting and movement speed by 70% for 6 sec. - SPELL_TIME_STOP = 58848, //Stops time in a 50 yard sphere for 2 sec. - SPELL_WOUNDING_STRIKE = 52771, //Used only on the tank - H_SPELL_WOUNDING_STRIKE = 58830 -}; - -enum Yells -{ - SAY_INTRO = -1595000, //"Prince Arthas Menethil, on this day, a powerful darkness has taken hold of your soul. The death you are destined to visit upon others will this day be your own." - SAY_AGGRO = -1595001, //"We'll see about that, young prince." - SAY_TIME_WARP_1 = -1595002, //"Tick tock, tick tock..." - SAY_TIME_WARP_2 = -1595003, //"Not quick enough!" - SAY_TIME_WARP_3 = -1595004, //"Let's get this over with. " - SAY_SLAY_1 = -1595005, //"There is no future for you." - SAY_SLAY_2 = -1595006, //"This is the hour of our greatest triumph!" - SAY_SLAY_3 = -1595007, //"You were destined to fail. " - SAY_DEATH = -1595008 //"*gurgles*" -}; - -struct boss_epochAI : public ScriptedAI -{ - boss_epochAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - } - - uint8 uiStep; - - uint32 uiStepTimer; - uint32 uiWoundingStrikeTimer; - uint32 uiTimeWarpTimer; - uint32 uiTimeStopTimer; - uint32 uiCurseOfExertionTimer; - - ScriptedInstance* pInstance; - - void Reset() - { - uiStep = 1; - uiStepTimer = 26000; - uiCurseOfExertionTimer = 9300; - uiTimeWarpTimer = 25300; - uiTimeStopTimer = 21300; - uiWoundingStrikeTimer = 5300; - - if (pInstance) - pInstance->SetData(DATA_EPOCH_EVENT, NOT_STARTED); - } - - void EnterCombat(Unit* /*who*/) - { - DoScriptText(SAY_AGGRO, me); - - if (pInstance) - pInstance->SetData(DATA_EPOCH_EVENT, IN_PROGRESS); - } - - void UpdateAI(const uint32 diff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - if (uiCurseOfExertionTimer < diff) - { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_CURSE_OF_EXERTION); - uiCurseOfExertionTimer = 9300; - } else uiCurseOfExertionTimer -= diff; - - if (uiWoundingStrikeTimer < diff) - { - DoCastVictim(SPELL_WOUNDING_STRIKE); - uiWoundingStrikeTimer = 5300; - } else uiWoundingStrikeTimer -= diff; - - if (uiTimeStopTimer < diff) - { - DoCastAOE(SPELL_TIME_STOP); - uiTimeStopTimer = 21300; - } else uiTimeStopTimer -= diff; - - if (uiTimeWarpTimer < diff) - { - DoScriptText(RAND(SAY_TIME_WARP_1,SAY_TIME_WARP_2,SAY_TIME_WARP_3), me); - DoCastAOE(SPELL_TIME_WARP); - uiTimeWarpTimer = 25300; - } else uiTimeWarpTimer -= diff; - - DoMeleeAttackIfReady(); - } - - void JustDied(Unit* /*killer*/) - { - DoScriptText(SAY_DEATH, me); - - if (pInstance) - pInstance->SetData(DATA_EPOCH_EVENT, DONE); - } - - void KilledUnit(Unit * victim) - { - if (victim == me) - return; - - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); - } -}; - -CreatureAI* GetAI_boss_epoch(Creature* pCreature) -{ - return new boss_epochAI (pCreature); -} - -void AddSC_boss_epoch() -{ - Script *newscript; - - newscript = new Script; - newscript->Name = "boss_epoch"; - newscript->GetAI = &GetAI_boss_epoch; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/culling_of_stratholme/boss_infinite.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/culling_of_stratholme/boss_infinite.cpp deleted file mode 100644 index 12cdf00f2a5..00000000000 --- a/src/server/scripts/Kalimdor/CavernsOfTime/culling_of_stratholme/boss_infinite.cpp +++ /dev/null @@ -1,88 +0,0 @@ -/* -* Copyright (C) 2008-2010 Trinity -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ - -#include "ScriptedPch.h" -#include "culling_of_stratholme.h" - -enum Spells -{ - SPELL_CORRUPTING_BLIGHT = 60588, - SPELL_VOID_STRIKE = 60590 -}; - -enum Yells -{ - SAY_AGGRO = -1595045, - SAY_FAIL = -1595046, - SAY_DEATH = -1595047 -}; - - -struct boss_infinite_corruptorAI : public ScriptedAI -{ - boss_infinite_corruptorAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - } - - ScriptedInstance* pInstance; - - void Reset() - { - if (pInstance) - pInstance->SetData(DATA_INFINITE_EVENT, NOT_STARTED); - } - - void EnterCombat(Unit* /*who*/) - { - if (pInstance) - pInstance->SetData(DATA_INFINITE_EVENT, IN_PROGRESS); - } - - void AttackStart(Unit* /*who*/) {} - void MoveInLineOfSight(Unit* /*who*/) {} - void UpdateAI(const uint32 /*diff*/) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - DoMeleeAttackIfReady(); - } - - void JustDied(Unit* /*killer*/) - { - if (pInstance) - pInstance->SetData(DATA_INFINITE_EVENT, DONE); - } -}; - -CreatureAI* GetAI_boss_infinite_corruptor(Creature* pCreature) -{ - return new boss_infinite_corruptorAI(pCreature); -} - -void AddSC_boss_infinite_corruptor() -{ - Script *newscript; - - newscript = new Script; - newscript->Name = "boss_infinite_corruptor"; - newscript->GetAI = &GetAI_boss_infinite_corruptor; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/culling_of_stratholme/boss_mal_ganis.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/culling_of_stratholme/boss_mal_ganis.cpp deleted file mode 100644 index a39f3289a5a..00000000000 --- a/src/server/scripts/Kalimdor/CavernsOfTime/culling_of_stratholme/boss_mal_ganis.cpp +++ /dev/null @@ -1,262 +0,0 @@ -/* -* Copyright (C) 2008-2010 Trinity -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ - -/* Script Data Start -SDName: Boss mal_ganis -SDAuthor: Tartalo -SD%Complete: 80 -SDComment: TODO: Intro & outro -SDCategory: -Script Data End */ - -/*** SQL START *** -update creature_template set scriptname = 'boss_mal_ganis' where entry = ''; -*** SQL END ***/ -#include "ScriptedPch.h" -#include "culling_of_stratholme.h" - -enum Spells -{ - SPELL_CARRION_SWARM = 52720, //A cresting wave of chaotic magic splashes over enemies in front of the caster, dealing 3230 to 3570 Shadow damage and 380 to 420 Shadow damage every 3 sec. for 15 sec. - H_SPELL_CARRION_SWARM = 58852, - SPELL_MIND_BLAST = 52722, //Inflicts 4163 to 4837 Shadow damage to an enemy. - H_SPELL_MIND_BLAST = 58850, - SPELL_SLEEP = 52721, //Puts an enemy to sleep for up to 10 sec. Any damage caused will awaken the target. - H_SPELL_SLEEP = 58849, - SPELL_VAMPIRIC_TOUCH = 52723 //Heals the caster for half the damage dealt by a melee attack. -}; - -enum Yells -{ - SAY_INTRO_1 = -1595009, - SAY_INTRO_2 = -1595010, - SAY_AGGRO = -1595011, - SAY_KILL_1 = -1595012, - SAY_KILL_2 = -1595013, - SAY_KILL_3 = -1595014, - SAY_SLAY_1 = -1595015, - SAY_SLAY_2 = -1595016, - SAY_SLAY_3 = -1595017, - SAY_SLAY_4 = -1595018, - SAY_SLEEP_1 = -1595019, - SAY_SLEEP_2 = -1595020, - SAY_30HEALTH = -1595021, - SAY_15HEALTH = -1595022, - SAY_ESCAPE_SPEECH_1 = -1595023, - SAY_ESCAPE_SPEECH_2 = -1595024, - SAY_OUTRO = -1595025, -}; - -enum CombatPhases -{ - COMBAT, - OUTRO -}; - -struct boss_mal_ganisAI : public ScriptedAI -{ - boss_mal_ganisAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - } - - uint32 uiCarrionSwarmTimer; - uint32 uiMindBlastTimer; - uint32 uiVampiricTouchTimer; - uint32 uiSleepTimer; - - uint8 uiOutroStep; - uint32 uiOutroTimer; - - bool bYelled; - bool bYelled2; - - CombatPhases Phase; - - ScriptedInstance* pInstance; - - void Reset() - { - bYelled = false; - bYelled2 = false; - Phase = COMBAT; - uiCarrionSwarmTimer = 6000; - uiMindBlastTimer = 11000; - uiVampiricTouchTimer = urand(10000,15000); - uiSleepTimer = urand(15000,20000); - uiOutroTimer = 1000; - - if (pInstance) - pInstance->SetData(DATA_MAL_GANIS_EVENT, NOT_STARTED); - } - - void EnterCombat(Unit* /*who*/) - { - DoScriptText(SAY_AGGRO, me); - if (pInstance) - pInstance->SetData(DATA_MAL_GANIS_EVENT, IN_PROGRESS); - } - - void DamageTaken(Unit *done_by, uint32 &damage) - { - if (damage >= me->GetHealth() && done_by != me) - damage = me->GetHealth()-1; - } - - void UpdateAI(const uint32 diff) - { - switch(Phase) - { - case COMBAT: - //Return since we have no target - if (!UpdateVictim()) - return; - - if (!bYelled && HealthBelowPct(30)) - { - DoScriptText(SAY_30HEALTH, me); - bYelled = true; - } - - if (!bYelled2 && HealthBelowPct(15)) - { - DoScriptText(SAY_15HEALTH, me); - bYelled2 = true; - } - - if (HealthBelowPct(1)) - { - //Handle Escape Event: Don't forget to add Player::RewardPlayerAndGroupAtEvent - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); - uiOutroStep = 1; - Phase = OUTRO; - return; - } - - if (Creature* pArthas = me->GetCreature(*me, pInstance ? pInstance->GetData64(DATA_ARTHAS) : 0)) - if (pArthas->isDead()) - { - EnterEvadeMode(); - me->DisappearAndDie(); - if (pInstance) - pInstance->SetData(DATA_MAL_GANIS_EVENT, FAIL); - } - - if (uiCarrionSwarmTimer < diff) - { - DoCastVictim(SPELL_CARRION_SWARM); - uiCarrionSwarmTimer = 7000; - } else uiCarrionSwarmTimer -= diff; - - if (uiMindBlastTimer < diff) - { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_MIND_BLAST); - uiMindBlastTimer = 6000; - } else uiMindBlastTimer -= diff; - - if (uiVampiricTouchTimer < diff) - { - DoCast(me, SPELL_VAMPIRIC_TOUCH); - uiVampiricTouchTimer = 32000; - } else uiVampiricTouchTimer -= diff; - - if (uiSleepTimer < diff) - { - DoScriptText(RAND(SAY_SLEEP_1,SAY_SLEEP_2), me); - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_SLEEP); - uiSleepTimer = urand(15000,20000); - } else uiSleepTimer -= diff; - - DoMeleeAttackIfReady(); - break; - case OUTRO: - if (uiOutroTimer < diff) - { - switch(uiOutroStep) - { - case 1: - DoScriptText(SAY_ESCAPE_SPEECH_1, me); - me->GetMotionMaster()->MoveTargetedHome(); - ++uiOutroStep; - uiOutroTimer = 8000; - break; - case 2: - me->SetUInt64Value(UNIT_FIELD_TARGET, pInstance ? pInstance->GetData64(DATA_ARTHAS) : 0); - me->HandleEmoteCommand(29); - DoScriptText(SAY_ESCAPE_SPEECH_2, me); - ++uiOutroStep; - uiOutroTimer = 9000; - break; - case 3: - DoScriptText(SAY_OUTRO, me); - ++uiOutroStep; - uiOutroTimer = 16000; - break; - case 4: - me->HandleEmoteCommand(33); - ++uiOutroStep; - uiOutroTimer = 500; - break; - case 5: - me->SetVisibility(VISIBILITY_OFF); - me->Kill(me); - break; - - } - } else uiOutroTimer -= diff; - break; - } - } - - void JustDied(Unit* /*killer*/) - { - if (pInstance) - { - pInstance->SetData(DATA_MAL_GANIS_EVENT, DONE); - - // give achievement credit to players. criteria use spell 58630 which doesn't exist. - if (pInstance) - pInstance->DoUpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET, 58630); - } - } - - void KilledUnit(Unit * victim) - { - if (victim == me) - return; - - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3,SAY_SLAY_4), me); - } -}; - -CreatureAI* GetAI_boss_mal_ganis(Creature* pCreature) -{ - return new boss_mal_ganisAI (pCreature); -} - -void AddSC_boss_mal_ganis() -{ - Script *newscript; - - newscript = new Script; - newscript->Name = "boss_mal_ganis"; - newscript->GetAI = &GetAI_boss_mal_ganis; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/culling_of_stratholme/boss_meathook.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/culling_of_stratholme/boss_meathook.cpp deleted file mode 100644 index eba9733c745..00000000000 --- a/src/server/scripts/Kalimdor/CavernsOfTime/culling_of_stratholme/boss_meathook.cpp +++ /dev/null @@ -1,140 +0,0 @@ -/* -* Copyright (C) 2008-2010 Trinity -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ - -/* Script Data Start -SDName: Boss meathook -SDAuthor: Tartalo -SD%Complete: 100 -SDComment: It may need timer adjustment -SDCategory: -Script Data End */ - -#include "ScriptedPch.h" -#include "culling_of_stratholme.h" - -enum Spells -{ - SPELL_CONSTRICTING_CHAINS = 52696, //Encases the targets in chains, dealing 1800 Physical damage every 1 sec. and stunning the target for 5 sec. - H_SPELL_CONSTRICTING_CHAINS = 58823, - SPELL_DISEASE_EXPULSION = 52666, //Meathook belches out a cloud of disease, dealing 1710 to 1890 Nature damage and interrupting the spell casting of nearby enemy targets for 4 sec. - H_SPELL_DISEASE_EXPULSION = 58824, - SPELL_FRENZY = 58841 //Increases the caster's Physical damage by 10% for 30 sec. -}; - -enum Yells -{ - SAY_AGGRO = -1595026, - SAY_SLAY_1 = -1595027, - SAY_SLAY_2 = -1595028, - SAY_SLAY_3 = -1595029, - SAY_SPAWN = -1595030, - SAY_DEATH = -1595031 -}; - -struct boss_meathookAI : public ScriptedAI -{ - boss_meathookAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - if (pInstance) - DoScriptText(SAY_SPAWN,me); - } - - uint32 uiChainTimer; - uint32 uiDiseaseTimer; - uint32 uiFrenzyTimer; - - ScriptedInstance* pInstance; - - void Reset() - { - uiChainTimer = urand(12000,17000); //seen on video 13, 17, 15, 12, 16 - uiDiseaseTimer = urand(2000,4000); //approx 3s - uiFrenzyTimer = urand(21000,26000); //made it up - - if (pInstance) - pInstance->SetData(DATA_MEATHOOK_EVENT, NOT_STARTED); - } - - void EnterCombat(Unit* /*who*/) - { - DoScriptText(SAY_AGGRO, me); - - if (pInstance) - pInstance->SetData(DATA_MEATHOOK_EVENT, IN_PROGRESS); - } - - void UpdateAI(const uint32 diff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - if (uiDiseaseTimer <= diff) - { - DoCastAOE(SPELL_DISEASE_EXPULSION); - uiDiseaseTimer = urand(1500,4000); - } else uiDiseaseTimer -= diff; - - if (uiFrenzyTimer <= diff) - { - DoCast(me, SPELL_FRENZY); - uiFrenzyTimer = urand(21000,26000); - } else uiFrenzyTimer -= diff; - - if (uiChainTimer <= diff) - { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_CONSTRICTING_CHAINS); //anyone but the tank - uiChainTimer = urand(2000,4000); - } else uiChainTimer -= diff; - - DoMeleeAttackIfReady(); - } - - void JustDied(Unit* /*killer*/) - { - DoScriptText(SAY_DEATH, me); - - if (pInstance) - pInstance->SetData(DATA_MEATHOOK_EVENT, DONE); - } - - void KilledUnit(Unit * victim) - { - if (victim == me) - return; - - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); - } -}; - -CreatureAI* GetAI_boss_meathook(Creature* pCreature) -{ - return new boss_meathookAI (pCreature); -} - -void AddSC_boss_meathook() -{ - Script *newscript; - - newscript = new Script; - newscript->Name = "boss_meathook"; - newscript->GetAI = &GetAI_boss_meathook; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/culling_of_stratholme/boss_salramm.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/culling_of_stratholme/boss_salramm.cpp deleted file mode 100644 index da1c8098517..00000000000 --- a/src/server/scripts/Kalimdor/CavernsOfTime/culling_of_stratholme/boss_salramm.cpp +++ /dev/null @@ -1,170 +0,0 @@ -/* -* Copyright (C) 2008-2010 Trinity -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ - -/* Script Data Start -SDName: Boss salramm -SDAuthor: Tartalo -SD%Complete: 80 -SDComment: TODO: Intro -SDCategory: -Script Data End */ - -/*** SQL START *** -update creature_template set scriptname = 'boss_salramm' where entry = ''; -*** SQL END ***/ -#include "ScriptedPch.h" -#include "culling_of_stratholme.h" - -enum Spells -{ - SPELL_CURSE_OF_TWISTED_FLESH = 58845, - SPELL_EXPLODE_GHOUL = 52480, - H_SPELL_EXPLODE_GHOUL = 58825, - SPELL_SHADOW_BOLT = 57725, - H_SPELL_SHADOW_BOLT = 58828, - SPELL_STEAL_FLESH = 52708, - SPELL_SUMMON_GHOULS = 52451 -}; - -enum Yells -{ - SAY_AGGRO = -1595032, - SAY_SPAWN = -1595033, - SAY_SLAY_1 = -1595034, - SAY_SLAY_2 = -1595035, - SAY_SLAY_3 = -1595036, - SAY_DEATH = -1595037, - SAY_EXPLODE_GHOUL_1 = -1595038, - SAY_EXPLODE_GHOUL_2 = -1595039, - SAY_STEAL_FLESH_1 = -1595040, - SAY_STEAL_FLESH_2 = -1595041, - SAY_STEAL_FLESH_3 = -1595042, - SAY_SUMMON_GHOULS_1 = -1595043, - SAY_SUMMON_GHOULS_2 = -1595044 -}; - -struct boss_salrammAI : public ScriptedAI -{ - boss_salrammAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - if (pInstance) - DoScriptText(SAY_SPAWN,me); - } - - uint32 uiCurseFleshTimer; - uint32 uiExplodeGhoulTimer; - uint32 uiShadowBoltTimer; - uint32 uiStealFleshTimer; - uint32 uiSummonGhoulsTimer; - - ScriptedInstance* pInstance; - - void Reset() - { - uiCurseFleshTimer = 30000; //30s DBM - uiExplodeGhoulTimer = urand(25000,28000); //approx 6 sec after summon ghouls - uiShadowBoltTimer = urand(8000,12000); // approx 10s - uiStealFleshTimer = 12345; - uiSummonGhoulsTimer = urand(19000,24000); //on a video approx 24s after aggro - - if (pInstance) - pInstance->SetData(DATA_SALRAMM_EVENT, NOT_STARTED); - } - - void EnterCombat(Unit* /*who*/) - { - DoScriptText(SAY_AGGRO, me); - - if (pInstance) - pInstance->SetData(DATA_SALRAMM_EVENT, IN_PROGRESS); - } - - void UpdateAI(const uint32 diff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - //Curse of twisted flesh timer - if (uiCurseFleshTimer <= diff) - { - DoCast(me->getVictim(), SPELL_CURSE_OF_TWISTED_FLESH); - uiCurseFleshTimer = 37000; - } else uiCurseFleshTimer -= diff; - - //Shadow bolt timer - if (uiShadowBoltTimer <= diff) - { - if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_SHADOW_BOLT); - uiShadowBoltTimer = urand(8000,12000); - } else uiShadowBoltTimer -= diff; - - //Steal Flesh timer - if (uiStealFleshTimer <= diff) - { - DoScriptText(RAND(SAY_STEAL_FLESH_1,SAY_STEAL_FLESH_2,SAY_STEAL_FLESH_3), me); - if (Unit* random_pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(random_pTarget, SPELL_STEAL_FLESH); - uiStealFleshTimer = 10000; - } else uiStealFleshTimer -= diff; - - //Summon ghouls timer - if (uiSummonGhoulsTimer <= diff) - { - DoScriptText(RAND(SAY_SUMMON_GHOULS_1,SAY_SUMMON_GHOULS_2), me); - if (Unit* random_pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(random_pTarget, SPELL_SUMMON_GHOULS); - uiSummonGhoulsTimer = 10000; - } else uiSummonGhoulsTimer -= diff; - - DoMeleeAttackIfReady(); - } - - void JustDied(Unit* /*killer*/) - { - DoScriptText(SAY_DEATH, me); - - if (pInstance) - pInstance->SetData(DATA_SALRAMM_EVENT, DONE); - } - - void KilledUnit(Unit * victim) - { - if (victim == me) - return; - - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); - } -}; - -CreatureAI* GetAI_boss_salramm(Creature* pCreature) -{ - return new boss_salrammAI (pCreature); -} - -void AddSC_boss_salramm() -{ - Script *newscript; - - newscript = new Script; - newscript->Name = "boss_salramm"; - newscript->GetAI = &GetAI_boss_salramm; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/culling_of_stratholme/culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/culling_of_stratholme/culling_of_stratholme.cpp deleted file mode 100644 index faaed2eb6db..00000000000 --- a/src/server/scripts/Kalimdor/CavernsOfTime/culling_of_stratholme/culling_of_stratholme.cpp +++ /dev/null @@ -1,1210 +0,0 @@ -/* -* Copyright (C) 2008-2010 Trinity -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ - -#include "ScriptedPch.h" -#include "culling_of_stratholme.h" -#include "ScriptedEscortAI.h" - -enum Says -{ - //First Act - Uther and Jaina Dialog - SAY_PHASE101 = -1595070, //Arthas - SAY_PHASE102 = -1595071, //Uther - SAY_PHASE103 = -1595072, //Arthas - SAY_PHASE104 = -1595073, //Arthas - SAY_PHASE105 = -1595074, //Uther - SAY_PHASE106 = -1595075, //Arthas - SAY_PHASE107 = -1595076, //Uther - SAY_PHASE108 = -1595077, //Arthas - SAY_PHASE109 = -1595078, //Arthas - SAY_PHASE110 = -1595079, //Uther - SAY_PHASE111 = -1595080, //Arthas - SAY_PHASE112 = -1595081, //Uther - SAY_PHASE113 = -1595082, //Jaina - SAY_PHASE114 = -1595083, //Arthas - SAY_PHASE115 = -1595084, //Uther - SAY_PHASE116 = -1595085, //Arthas - SAY_PHASE117 = -1595086, //Jaina - SAY_PHASE118 = -1595087, //Arthas - //Second Act - City Streets - SAY_PHASE201 = -1595088, //Arthas - SAY_PHASE202 = -1595089, //Cityman - SAY_PHASE203 = -1595090, //Arthas - SAY_PHASE204 = -1595091, //Crazyman - SAY_PHASE205 = -1595092, //Arthas - SAY_PHASE206 = -1595009, //Malganis - SAY_PHASE207 = -1595010, //Malganis - SAY_PHASE208 = -1595093, //Arthas - SAY_PHASE209 = -1595094, //Arthas - SAY_PHASE210 = -1595095, //Arthas - //Third Act - Town Hall - SAY_PHASE301 = -1595096, //Arthas - SAY_PHASE302 = -1595097, //Drakonian - SAY_PHASE303 = -1595098, //Arthas - SAY_PHASE304 = -1595099, //Arthas - SAY_PHASE305 = -1595100, //Drakonian - SAY_PHASE306 = -1595101, //Arthas - SAY_PHASE307 = -1595102, //Arthas - SAY_PHASE308 = -1595103, //Arthas - SAY_PHASE309 = -1595104, //Arthas - SAY_PHASE310 = -1595105, //Arthas - SAY_PHASE311 = -1595106, //Arthas - SAY_PHASE312 = -1595107, //Arthas - SAY_PHASE313 = -1595108, //Arthas - SAY_PHASE314 = -1595000, //Epoch - SAY_PHASE315 = -1595109, //Arthas - //Fourth Act - Fire Corridor - SAY_PHASE401 = -1595110, //Arthas - SAY_PHASE402 = -1595111, //Arthas - SAY_PHASE403 = -1595112, //Arthas - SAY_PHASE404 = -1595113, //Arthas - SAY_PHASE405 = -1595114, //Arthas - SAY_PHASE406 = -1595115, //Arthas - SAY_PHASE407 = -1595116, //Arthas - //Fifth Act - Mal'Ganis Fight - SAY_PHASE501 = -1595117, //Arthas - SAY_PHASE502 = -1595118, //Arthas - SAY_PHASE503 = -1595119, //Arthas - SAY_PHASE504 = -1595120, //Arthas -}; - -enum NPCs -{ - NPC_INFINITE_ADVERSARY = 27742, - NPC_INFINITE_HUNTER = 27743, - NPC_INFINITE_AGENT = 27744, - NPC_TIME_RIFT = 28409, - NPC_ZOMBIE = 27737, - NPC_GHOUL = 28249, - NPC_NECROMANCER = 28200, - NPC_STALKER = 28199, - NPC_FIEND = 27734, - NPC_GOLEM = 28201, - NPC_EGHOUL = 27729, - NPC_CONSTRUCT = 27736, - - NPC_INVIS_TARGET = 20562, - - NPC_KNIGHT_ESCORT = 27745, - NPC_PRIEST_ESCORT = 27747, - NPC_CITY_MAN = 28167, - NPC_CITY_MAN2 = 28169, - NPC_CITY_MAN3 = 31126, - NPC_CITY_MAN4 = 31127, -}; - -enum Spells -{ - SPELL_FEAR = 39176, - SPELL_ARTHAS_AURA = 52442, - SPELL_EXORCISM_N = 52445, - SPELL_EXORCISM_H = 58822, - SPELL_HOLY_LIGHT = 52444, -}; - -enum GossipMenuArthas -{ - GOSSIP_MENU_ARTHAS_1 = 100001, - GOSSIP_MENU_ARTHAS_2 = 100002, - GOSSIP_MENU_ARTHAS_3 = 100003, - GOSSIP_MENU_ARTHAS_4 = 100004, - GOSSIP_MENU_ARTHAS_5 = 100005 -}; - -enum -{ - ENCOUNTER_WAVES_NUMBER = 8, - ENCOUNTER_WAVES_MAX_SPAWNS = 5, - ENCOUNTER_DRACONIAN_NUMBER = 4, - ENCOUNTER_CHRONO_SPAWNS = 19 -}; - -// Locations for necromancers and add to spawn -float WavesLocations[ENCOUNTER_WAVES_NUMBER][ENCOUNTER_WAVES_MAX_SPAWNS][5]= -{ - { - {NPC_ZOMBIE, 2164.698975, 1255.392944, 135.040878, 0.490202}, - {NPC_ZOMBIE, 2183.501465, 1263.079102, 134.859055, 3.169981}, - {NPC_GHOUL, 2177.512939, 1247.313843, 135.846695, 1.696574}, - {NPC_GHOUL, 2171.991943, 1246.615845, 135.745026, 1.696574}, - {0, 0, 0, 0, 0} - }, - { - {NPC_GHOUL, 2254.434326, 1163.427612, 138.055038, 2.077358}, - {NPC_GHOUL, 2254.703613, 1158.867798, 138.212234, 2.345532}, - {NPC_GHOUL, 2257.615723, 1162.310913, 138.091202, 2.077358}, - {NPC_NECROMANCER, 2258.258057, 1157.250732, 138.272873, 2.387766}, - {0, 0, 0, 0, 0} - }, - { - {NPC_STALKER, 2348.120117, 1202.302490, 130.491104, 4.698538}, - {NPC_GHOUL, 2352.863525, 1207.819092, 130.424271, 4.949865}, - {NPC_GHOUL, 2343.593750, 1207.915039, 130.781311, 4.321547}, - {NPC_NECROMANCER, 2348.257324, 1212.202515, 130.670135, 4.450352}, - {0, 0, 0, 0, 0} - }, - { - {NPC_STALKER, 2139.825195, 1356.277100, 132.199615, 5.820131}, - {NPC_GHOUL, 2137.073486, 1362.464844, 132.271637, 5.820131}, - {NPC_GHOUL, 2134.075684, 1354.148071, 131.885864, 5.820131}, - {NPC_NECROMANCER, 2133.302246, 1358.907837, 132.037689, 5.820131}, - {0, 0, 0, 0, 0} - }, - { - {NPC_NECROMANCER, 2264.013428, 1174.055908, 138.093094, 2.860481}, - {NPC_GHOUL, 2264.207764, 1170.892700, 138.034973, 2.860481}, - {NPC_GHOUL, 2266.948975, 1176.898926, 137.976929, 2.860481}, - {NPC_STALKER, 2269.215576, 1170.109253, 137.742691, 2.860481}, - {NPC_FIEND, 2273.106689, 1176.101074, 137.880508, 2.860481} - }, - { - {NPC_GOLEM, 2349.701660, 1188.436646, 130.428864, 3.908642}, - {NPC_GHOUL, 2349.909180, 1194.582642, 130.417816, 3.577001}, - {NPC_EGHOUL, 2354.662598, 1185.692017, 130.552032, 3.577001}, - {NPC_EGHOUL, 2354.716797, 1191.614380, 130.539810, 3.577001}, - {0, 0, 0, 0, 0} - }, - { - {NPC_CONSTRUCT, 2145.212891, 1355.288086, 132.288773, 6.004838}, - {NPC_NECROMANCER, 2137.078613, 1357.612671, 132.173340, 6.004838}, - {NPC_EGHOUL, 2139.402100, 1352.541626, 132.127518, 5.812850}, - {NPC_EGHOUL, 2142.408447, 1360.760620, 132.321564, 5.812850}, - {0, 0, 0, 0, 0} - }, - { - {NPC_GHOUL, 2172.686279, 1259.618164, 134.391754, 1.865499}, - {NPC_FIEND, 2177.649170, 1256.061157, 135.096512, 1.849572}, - {NPC_CONSTRUCT, 2170.782959, 1253.594849, 134.973022, 1.849572}, - {NPC_NECROMANCER, 2175.595703, 1249.041992, 135.603531, 1.849572}, - {0, 0, 0, 0, 0} - } -}; - -// Locations for rifts to spawn and draconians to go -float RiftAndSpawnsLocations[ENCOUNTER_CHRONO_SPAWNS][5]= -{ - {NPC_TIME_RIFT, 2431.790039, 1190.670044, 148.076004, 0.187923}, - {NPC_INFINITE_ADVERSARY, 2433.857910, 1185.612061, 148.075974, 4.566168}, - {NPC_INFINITE_ADVERSARY, 2437.577881, 1188.241089, 148.075974, 0.196999}, - {NPC_INFINITE_AGENT, 2437.165527, 1192.294922, 148.075974, 0.169247}, - {NPC_INFINITE_HUNTER, 2434.989990, 1197.679565, 148.075974, 0.715971}, - {NPC_TIME_RIFT, 2403.954834, 1178.815430, 148.075943, 4.966126}, - {NPC_INFINITE_AGENT, 2403.676758, 1171.495850, 148.075607, 4.902797}, - {NPC_INFINITE_HUNTER, 2407.691162, 1172.162720, 148.075607, 4.963010}, - {NPC_TIME_RIFT, 2414.217041, 1133.446167, 148.076050, 1.706972}, - {NPC_INFINITE_ADVERSARY, 2416.024658, 1139.456177, 148.076431, 1.752129}, - {NPC_INFINITE_HUNTER, 2410.866699, 1139.680542, 148.076431, 1.752129}, - {NPC_TIME_RIFT, 2433.081543, 1099.869751, 148.076157, 1.809509}, - {NPC_INFINITE_ADVERSARY, 2426.947998, 1107.471680, 148.076019, 1.877580}, - {NPC_INFINITE_HUNTER, 2432.944580, 1108.896362, 148.208160, 2.199241}, - {NPC_TIME_RIFT, 2444.077637, 1114.366089, 148.076157, 3.049565}, - {NPC_INFINITE_ADVERSARY, 2438.190674, 1118.368164, 148.076172, 3.139232}, - {NPC_INFINITE_AGENT, 2435.861328, 1113.402954, 148.169327, 2.390271}, - {NPC_TIME_RIFT, 2463.131592, 1115.391724, 152.473129, 3.409651}, - {NPC_EPOCH, 2451.809326, 1112.901245, 149.220459, 3.363617} -}; - -struct npc_arthasAI : public npc_escortAI -{ - npc_arthasAI(Creature *pCreature) : npc_escortAI(pCreature) - { - pInstance = pCreature->GetInstanceData(); - Reset(); - } - - ScriptedInstance* pInstance; - - bool bStepping; - uint32 uiStep; - uint32 uiPhaseTimer; - uint32 uiGossipStep; - uint32 uiPlayerFaction; - uint32 uiBossEvent; - uint32 uiWave; - - uint64 uiUtherGUID; - uint64 uiJainaGUID; - uint64 uiCitymenGUID[2]; - uint64 uiWaveGUID[ENCOUNTER_WAVES_MAX_SPAWNS]; - uint64 uiInfiniteDraconianGUID[ENCOUNTER_DRACONIAN_NUMBER]; - uint64 uiStalkerGUID; - - uint64 uiBossGUID; //uiMeathookGUID || uiSalrammGUID - uint64 uiEpochGUID; - uint64 uiMalganisGUID; - uint64 uiInfiniteGUID; - - uint32 uiExorcismTimer; - - void Reset() - { - uiUtherGUID = 0; - uiJainaGUID = 0; - - for (uint8 i = 0; i < 2; ++i) - uiCitymenGUID[i] = 0; - - for (uint8 i = 0; i < ENCOUNTER_WAVES_MAX_SPAWNS; ++i) - uiWaveGUID[i] = 0; - - for (uint8 i = 0; i < ENCOUNTER_DRACONIAN_NUMBER; ++i) - uiInfiniteDraconianGUID[i] = 0; - - uiStalkerGUID = 0; - uiBossGUID = 0; - uiEpochGUID = 0; - uiMalganisGUID = 0; - uiInfiniteGUID = 0; - - if (pInstance) { - pInstance->SetData(DATA_ARTHAS_EVENT, NOT_STARTED); - switch(pInstance->GetData(DATA_ARTHAS_EVENT)) - { - case NOT_STARTED: - bStepping = true; - uiStep = 0; - me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - uiBossEvent = DATA_MEATHOOK_EVENT; - uiGossipStep = 0; - break; - } - uiPhaseTimer = 1000; - uiExorcismTimer = 7300; - uiWave = 0; - } - } - - void EnterCombat(Unit* /*who*/) - { - DoCast(me, SPELL_ARTHAS_AURA); - } - - void JustDied(Unit * /*killer*/) - { - if (pInstance) - pInstance->SetData(DATA_ARTHAS_EVENT, FAIL); - } - - void SpawnTimeRift(uint32 timeRiftID, uint64* guidVector) - { - me->SummonCreature((uint32)RiftAndSpawnsLocations[timeRiftID][0],RiftAndSpawnsLocations[timeRiftID][1],RiftAndSpawnsLocations[timeRiftID][2],RiftAndSpawnsLocations[timeRiftID][3],RiftAndSpawnsLocations[timeRiftID][4],TEMPSUMMON_TIMED_DESPAWN,11000); - - for (uint32 i = timeRiftID+1; i < ENCOUNTER_CHRONO_SPAWNS; ++i) - { - if ((uint32)RiftAndSpawnsLocations[i][0] == NPC_TIME_RIFT) break; - if (Creature* pTemp = me->SummonCreature((uint32)RiftAndSpawnsLocations[i][0],RiftAndSpawnsLocations[timeRiftID][1],RiftAndSpawnsLocations[timeRiftID][2],RiftAndSpawnsLocations[timeRiftID][3],RiftAndSpawnsLocations[timeRiftID][4],TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,900000)) - { - guidVector[i-timeRiftID-1] = pTemp->GetGUID(); - pTemp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE | UNIT_FLAG_UNK_9); - pTemp->SetReactState(REACT_PASSIVE); - pTemp->GetMotionMaster()->MovePoint(0, RiftAndSpawnsLocations[i][1],RiftAndSpawnsLocations[i][2],RiftAndSpawnsLocations[i][3]); - if ((uint32)RiftAndSpawnsLocations[i][0] == NPC_EPOCH) - uiEpochGUID = pTemp->GetGUID(); - } - } - } - - void SpawnWaveGroup(uint32 waveID, uint64* guidVector) - { - for (uint32 i = 0; i < ENCOUNTER_WAVES_MAX_SPAWNS; ++i) - { - if ((uint32)WavesLocations[waveID][i][0] == 0) break; - if (Creature* pTemp = me->SummonCreature((uint32)WavesLocations[waveID][i][0],WavesLocations[waveID][i][1],WavesLocations[waveID][i][2],WavesLocations[waveID][i][3],WavesLocations[waveID][i][4],TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,900000)) - { - guidVector[i] = pTemp->GetGUID(); - } - } - } - - void SetHoldState(bool bOnHold) - { - SetEscortPaused(bOnHold); - } - - void JumpToNextStep(uint32 uiTimer) - { - uiPhaseTimer = uiTimer; - ++uiStep; - } - - void WaypointReached(uint32 uiPointId) - { - switch(uiPointId) - { - case 0: - case 1: - case 3: - case 9: - case 10: - case 11: - case 22: - case 23: - case 26: - case 55: - case 56: - SetHoldState(true); - bStepping = true; - break; - case 7: - if (Unit* pCityman0 = me->SummonCreature(NPC_CITY_MAN,2091.977f,1275.021f,140.757f,0.558f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,60000)) - uiCitymenGUID[0] = pCityman0->GetGUID(); - if (Unit* pCityman1 = me->SummonCreature(NPC_CITY_MAN2,2093.514f,1275.842f,140.408f,3.801f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,60000)) - uiCitymenGUID[1] = pCityman1->GetGUID(); - break; - case 8: - uiGossipStep = 1; - me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - SetHoldState(true); - break; - case 12: - SetRun(true); - DoScriptText(SAY_PHASE210, me); - if (Unit* pDisguised0 = me->SummonCreature(NPC_CITY_MAN3,2398.14f,1207.81f,134.04f,5.155249f,TEMPSUMMON_DEAD_DESPAWN,180000)) - { - uiInfiniteDraconianGUID[0] = pDisguised0->GetGUID(); - if (Unit* pDisguised1 = me->SummonCreature(NPC_CITY_MAN4,2403.22f,1205.54f,134.04f,3.311264f,TEMPSUMMON_DEAD_DESPAWN,180000)) - { - uiInfiniteDraconianGUID[1] = pDisguised1->GetGUID(); - - if (Unit* pDisguised2 = me->SummonCreature(NPC_CITY_MAN,2400.82f,1201.69f,134.01f,1.534082f,TEMPSUMMON_DEAD_DESPAWN,180000)) - { - uiInfiniteDraconianGUID[2] = pDisguised2->GetGUID(); - pDisguised0->SetUInt64Value(UNIT_FIELD_TARGET, uiInfiniteDraconianGUID[1]); - pDisguised1->SetUInt64Value(UNIT_FIELD_TARGET, uiInfiniteDraconianGUID[0]); - pDisguised2->SetUInt64Value(UNIT_FIELD_TARGET, uiInfiniteDraconianGUID[1]); - } - } - } - break; - case 20: - uiGossipStep = 2; - me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - SetRun(false); - SetHoldState(true); - break; - case 21: - DoScriptText(SAY_PHASE301, me); - break; - case 25: - SetRun(false); - SpawnTimeRift(0,&uiInfiniteDraconianGUID[0]); - DoScriptText(SAY_PHASE307,me); - break; - case 29: - SetRun(false); - SpawnTimeRift(5,&uiInfiniteDraconianGUID[0]); - SpawnTimeRift(8,&uiInfiniteDraconianGUID[2]); - DoScriptText(SAY_PHASE309,me); - SetHoldState(true); - bStepping = true; - break; - case 31: - SetRun(false); - SpawnTimeRift(11,&uiInfiniteDraconianGUID[0]); - SpawnTimeRift(14,&uiInfiniteDraconianGUID[2]); - DoScriptText(SAY_PHASE311,me); - SetHoldState(true); - bStepping = true; - break; - case 32: - DoScriptText(SAY_PHASE401,me); - break; - case 34: - DoScriptText(SAY_PHASE402,me); - break; - case 35: - DoScriptText(SAY_PHASE403,me); - break; - case 36: - if (pInstance) - { - GameObject* pGate = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_SHKAF_GATE)); - pGate->SetGoState(GO_STATE_ACTIVE); - } - break; - case 45: - SetRun(true); - SetDespawnAtFar(false); - uiGossipStep = 4; - me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - SetHoldState(true); - break; - case 47: - SetRun(false); - DoScriptText(SAY_PHASE405,me); - break; - case 48: - SetRun(true); - DoScriptText(SAY_PHASE406,me); - break; - case 53: - DoScriptText(SAY_PHASE407,me); - break; - case 54: - uiGossipStep = 5; - me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - SetHoldState(true); - break; - } - } - - void UpdateAI(const uint32 diff) - { - npc_escortAI::UpdateAI(diff); - - DoMeleeAttackIfReady(); - - if (bStepping) - { - if (uiPhaseTimer <= diff) - { - switch(uiStep) - { - //After reset - case 0: - if (Unit* pJaina = GetClosestCreatureWithEntry(me, NPC_JAINA, 50.0f)) - uiJainaGUID = pJaina->GetGUID(); - else if (Unit* pJaina = me->SummonCreature(NPC_JAINA,1895.48f,1292.66f,143.706f,0.023475f,TEMPSUMMON_DEAD_DESPAWN,180000)) - uiJainaGUID = pJaina->GetGUID(); - bStepping = false; - JumpToNextStep(0); - break; - //After waypoint 0 - case 1: - me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE); - if (Unit* pUther = me->SummonCreature(NPC_UTHER,1794.357f,1272.183f,140.558f,1.37f,TEMPSUMMON_DEAD_DESPAWN,180000)) - { - uiUtherGUID = pUther->GetGUID(); - pUther->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE); - pUther->GetMotionMaster()->MovePoint(0, 1897.018f, 1287.487f, 143.481f); - pUther->SetUInt64Value(UNIT_FIELD_TARGET, me->GetGUID()); - me->SetUInt64Value(UNIT_FIELD_TARGET, uiUtherGUID); - } - JumpToNextStep(17000); - break; - case 2: - DoScriptText(SAY_PHASE101, me); - JumpToNextStep(2000); - break; - case 3: - if (Creature* pUther = Unit::GetCreature(*me, uiUtherGUID)) - { - DoScriptText(SAY_PHASE102, pUther); - } - JumpToNextStep(8000); - break; - case 4: - SetEscortPaused(false); - bStepping = false; - SetRun(false); - DoScriptText(SAY_PHASE103, me); - JumpToNextStep(0); - break; - //After waypoint 1 - case 5: - if (Creature* pJaina = Unit::GetCreature(*me, uiJainaGUID)) - pJaina->SetUInt64Value(UNIT_FIELD_TARGET, me->GetGUID()); - DoScriptText(SAY_PHASE104, me); - JumpToNextStep(10000); - break; - case 6: - if (Creature* pUther = Unit::GetCreature(*me, uiUtherGUID)) - DoScriptText(SAY_PHASE105, pUther); - JumpToNextStep(1000); - break; - case 7: - DoScriptText(SAY_PHASE106, me); - JumpToNextStep(4000); - break; - case 8: - if (Creature* pUther = Unit::GetCreature(*me, uiUtherGUID)) - DoScriptText(SAY_PHASE107, pUther); - JumpToNextStep(6000); - break; - case 9: - DoScriptText(SAY_PHASE108, me); - JumpToNextStep(4000); - break; - case 10: - if (Creature* pUther = Unit::GetCreature(*me, uiUtherGUID)) - DoScriptText(SAY_PHASE109, pUther); - JumpToNextStep(8000); - break; - case 11: - DoScriptText(SAY_PHASE110, me); - JumpToNextStep(4000); - break; - case 12: - if (Creature* pUther = Unit::GetCreature(*me, uiUtherGUID)) - DoScriptText(SAY_PHASE111, pUther); - JumpToNextStep(4000); - break; - case 13: - DoScriptText(SAY_PHASE112, me); - JumpToNextStep(11000); - break; - case 14: - if (Creature* pJaina = Unit::GetCreature(*me, uiJainaGUID)) - DoScriptText(SAY_PHASE113, pJaina); - JumpToNextStep(3000); - break; - case 15: - DoScriptText(SAY_PHASE114, me); - JumpToNextStep(9000); - break; - case 16: - if (Creature* pUther = Unit::GetCreature(*me, uiUtherGUID)) - DoScriptText(SAY_PHASE115, pUther); - JumpToNextStep(4000); - break; - case 17: - if (Creature* pUther = Unit::GetCreature(*me, uiUtherGUID)) - { - pUther->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE); - pUther->GetMotionMaster()->MovePoint(0, 1794.357f,1272.183f,140.558f); - } - JumpToNextStep(1000); - break; - case 18: - if (Creature* pJaina = Unit::GetCreature(*me, uiJainaGUID)) - { - me->SetUInt64Value(UNIT_FIELD_TARGET, uiJainaGUID); - pJaina->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE); - pJaina->GetMotionMaster()->MovePoint(0, 1794.357f,1272.183f,140.558f); - } - JumpToNextStep(1000); - break; - case 19: - DoScriptText(SAY_PHASE116, me); - JumpToNextStep(1000); - break; - case 20: - if (Creature* pJaina = Unit::GetCreature(*me, uiJainaGUID)) - DoScriptText(SAY_PHASE117, pJaina); - JumpToNextStep(3000); - break; - case 21: - SetEscortPaused(false); - bStepping = false; - me->SetUInt64Value(UNIT_FIELD_TARGET, 0); - JumpToNextStep(0); - break; - //After waypoint 3 - case 22: - DoScriptText(SAY_PHASE118, me); - me->SetUInt64Value(UNIT_FIELD_TARGET, uiJainaGUID); - JumpToNextStep(10000); - break; - case 23: - SetEscortPaused(false); - bStepping = false; - SetRun(true); - - if (Creature* pJaina = Unit::GetCreature(*me, uiJainaGUID)) - pJaina->DisappearAndDie(); - - if (Creature* pUther = Unit::GetCreature(*me, uiUtherGUID)) - pUther->DisappearAndDie(); - - me->SetUInt64Value(UNIT_FIELD_TARGET, 0); - JumpToNextStep(0); - break; - //After Gossip 1 (waypoint 8) - case 24: - if (Unit* pStalker = me->SummonCreature(NPC_INVIS_TARGET,2026.469f,1287.088f,143.596f,1.37f,TEMPSUMMON_TIMED_DESPAWN,14000)) - { - uiStalkerGUID = pStalker->GetGUID(); - me->SetUInt64Value(UNIT_FIELD_TARGET, uiStalkerGUID); - } - JumpToNextStep(1000); - break; - case 25: - DoScriptText(SAY_PHASE201, me); - JumpToNextStep(12000); - break; - case 26: - SetEscortPaused(false); - bStepping = false; - SetRun(false); - me->SetUInt64Value(UNIT_FIELD_TARGET, 0); - JumpToNextStep(0); - break; - //After waypoint 9 - case 27: - me->SetUInt64Value(UNIT_FIELD_TARGET, uiCitymenGUID[0]); - if (Creature* pCityman = Unit::GetCreature(*me, uiCitymenGUID[0])) - { - pCityman->SetUInt64Value(UNIT_FIELD_TARGET, me->GetGUID()); - pCityman->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE); - pCityman->GetMotionMaster()->MovePoint(0, 2088.625f,1279.191f,140.743f); - } - JumpToNextStep(2000); - break; - case 28: - if (Creature* pCityman = Unit::GetCreature(*me, uiCitymenGUID[0])) - DoScriptText(SAY_PHASE202, pCityman); - JumpToNextStep(4000); - break; - case 29: - SetEscortPaused(false); - bStepping = false; - DoScriptText(SAY_PHASE203, me); - JumpToNextStep(0); - break; - //After waypoint 10 - case 30: - me->HandleEmoteCommand(37); - JumpToNextStep(1000); - break; - case 31: - SetEscortPaused(false); - bStepping = false; - if (Creature* pCityman1 = Unit::GetCreature(*me, uiCitymenGUID[1])) - { - DoScriptText(SAY_PHASE204, pCityman1); - pCityman1->SetUInt64Value(UNIT_FIELD_TARGET, me->GetGUID()); - if (Creature* pCityman0 = Unit::GetCreature(*me, uiCitymenGUID[0])) - pCityman0->Kill(pCityman0); - me->SetUInt64Value(UNIT_FIELD_TARGET, uiCitymenGUID[1]); - } - JumpToNextStep(0); - break; - //After waypoint 11 - case 32: - me->HandleEmoteCommand(37); - JumpToNextStep(1000); - break; - case 33: - if (Creature* pCityman1 = Unit::GetCreature(*me, uiCitymenGUID[1])) - pCityman1->Kill(pCityman1); - JumpToNextStep(1000); - break; - case 34: - if (Unit* pStalker = me->SummonCreature(NPC_INVIS_TARGET,2081.447f,1287.770f,141.3241f,1.37f,TEMPSUMMON_TIMED_DESPAWN,10000)) - { - uiStalkerGUID = pStalker->GetGUID(); - me->SetUInt64Value(UNIT_FIELD_TARGET, uiStalkerGUID); - } - DoScriptText(SAY_PHASE205, me); - JumpToNextStep(3000); - break; - case 35: - if (Unit* pStalkerM = me->SummonCreature(NPC_INVIS_TARGET,2117.349f,1288.624f,136.271f,1.37f,TEMPSUMMON_TIMED_DESPAWN,60000)) - { - uiStalkerGUID = pStalkerM->GetGUID(); - me->SetUInt64Value(UNIT_FIELD_TARGET, uiStalkerGUID); - } - JumpToNextStep(1000); - break; - case 36: - if (Creature* pMalganis = me->SummonCreature(NPC_MAL_GANIS,2117.349f,1288.624f,136.271f,1.37f,TEMPSUMMON_TIMED_DESPAWN,60000)) - { - if (Creature* pStalkerM = Unit::GetCreature(*me, uiStalkerGUID)) - pMalganis->CastSpell(pStalkerM,63793,false); - - uiMalganisGUID = pMalganis->GetGUID(); - DoScriptText(SAY_PHASE206, pMalganis); - pMalganis->SetUInt64Value(UNIT_FIELD_TARGET, me->GetGUID()); - pMalganis->SetReactState(REACT_PASSIVE); - } - JumpToNextStep(11000); - break; - case 37: - if (Creature* pMalganis = Unit::GetCreature(*me, uiMalganisGUID)) - { - if (Creature* pZombie = GetClosestCreatureWithEntry(pMalganis, NPC_CITY_MAN, 100.0f)) - pZombie->UpdateEntry(NPC_ZOMBIE, 0); - else if (Creature* pZombie = GetClosestCreatureWithEntry(pMalganis, NPC_CITY_MAN2, 100.0f)) - pZombie->UpdateEntry(NPC_ZOMBIE, 0); - else //There's no one else to transform - uiStep++; - } - else - uiStep++; - uiPhaseTimer = 500; - break; - case 38: - if (Creature* pMalganis = Unit::GetCreature(*me, uiMalganisGUID)) - DoScriptText(SAY_PHASE207, pMalganis); - JumpToNextStep(17000); - break; - case 39: - if (Creature* pMalganis = Unit::GetCreature(*me, uiMalganisGUID)) - pMalganis->SetVisibility(VISIBILITY_OFF); - DoScriptText(SAY_PHASE208, me); - JumpToNextStep(7000); - break; - case 40: - if (Unit* pStalker = me->SummonCreature(NPC_INVIS_TARGET,2081.447f,1287.770f,141.3241f,1.37f,TEMPSUMMON_TIMED_DESPAWN,10000)) - { - uiStalkerGUID = pStalker->GetGUID(); - me->SetUInt64Value(UNIT_FIELD_TARGET, uiStalkerGUID); - } - DoScriptText(SAY_PHASE209, me); - - uiBossEvent = DATA_MEATHOOK_EVENT; - if (pInstance) - pInstance->SetData(DATA_ARTHAS_EVENT, IN_PROGRESS); - - me->SetReactState(REACT_DEFENSIVE); - SetDespawnAtFar(false); - JumpToNextStep(5000); - break; - case 41: //Summon wave group - case 43: - case 45: - case 47: - case 51: - case 53: - case 55: - case 57: - if (pInstance->GetData(uiBossEvent) != DONE) - { - SpawnWaveGroup(uiWave, uiWaveGUID); - uiWave++; - } - JumpToNextStep(500); - break; - case 42: //Wait group to die - case 44: - case 46: - case 48: - case 52: - case 54: - case 56: - case 58: - if (pInstance->GetData(uiBossEvent) != DONE) - { - uint32 mobCounter = 0; - uint32 deadCounter = 0; - for (uint8 i = 0; i < ENCOUNTER_WAVES_MAX_SPAWNS; ++i) - { - if (uiWaveGUID[i] == 0) - break; - ++mobCounter; - Unit* pTemp = Unit::GetCreature(*me, uiWaveGUID[i]); - if (!pTemp || pTemp->isDead()) - ++deadCounter; - } - - if (mobCounter <= deadCounter) //If group is dead - JumpToNextStep(1000); - else - uiPhaseTimer = 1000; - } - else - JumpToNextStep(500); - break; - case 49: //Summon Boss - case 59: - if (pInstance->GetData(uiBossEvent) != DONE) - { - uint32 uiBossID = 0; - if (uiBossEvent == DATA_MEATHOOK_EVENT) - uiBossID = NPC_MEATHOOK; - else if (uiBossEvent == DATA_SALRAMM_EVENT) - uiBossID = NPC_SALRAMM; - - if (Unit* pBoss = me->SummonCreature(uiBossID,2232.19f,1331.933f,126.662f,3.15f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,900000)) - { - uiBossGUID = pBoss->GetGUID(); - pBoss->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE); - pBoss->GetMotionMaster()->MovePoint(0, 2194.110f,1332.00f,130.00f); - } - } - JumpToNextStep(30000); - break; - case 50: //Wait Boss death - case 60: - if (pInstance) - { - if (pInstance->GetData(uiBossEvent) == DONE) - { - JumpToNextStep(1000); - if (uiBossEvent == DATA_MEATHOOK_EVENT) - uiBossEvent = DATA_SALRAMM_EVENT; - else if (uiBossEvent == DATA_SALRAMM_EVENT) - { - SetHoldState(false); - bStepping = false; - uiBossEvent = DATA_EPOCH_EVENT; - } - } - else if (pInstance->GetData(uiBossEvent) == FAIL) - npc_escortAI::EnterEvadeMode(); - else - uiPhaseTimer = 10000; - } - break; - //After Gossip 2 (waypoint 22) - case 61: - me->SetReactState(REACT_AGGRESSIVE); - if (Creature* pDisguised0 = Unit::GetCreature(*me, uiInfiniteDraconianGUID[0])) - pDisguised0->SetUInt64Value(UNIT_FIELD_TARGET, me->GetGUID()); - if (Creature* pDisguised1 = Unit::GetCreature(*me, uiInfiniteDraconianGUID[1])) - pDisguised1->SetUInt64Value(UNIT_FIELD_TARGET, me->GetGUID()); - if (Creature* pDisguised2 = Unit::GetCreature(*me, uiInfiniteDraconianGUID[2])) - pDisguised2->SetUInt64Value(UNIT_FIELD_TARGET, me->GetGUID()); - JumpToNextStep(1000); - break; - case 62: - if (Creature* pDisguised0 = Unit::GetCreature(*me, uiInfiniteDraconianGUID[0])) - DoScriptText(SAY_PHASE302, pDisguised0); - JumpToNextStep(7000); - break; - case 63: - DoScriptText(SAY_PHASE303, me); - SetHoldState(false); - bStepping = false; - JumpToNextStep(0); - break; - //After waypoint 23 - case 64: - me->HandleEmoteCommand(54); - JumpToNextStep(1000); - break; - case 65: - if (Creature* pDisguised0 = Unit::GetCreature(*me, uiInfiniteDraconianGUID[0])) - pDisguised0->HandleEmoteCommand(11); - JumpToNextStep(1000); - break; - case 66: - DoScriptText(SAY_PHASE304,me); - JumpToNextStep(2000); - break; - case 67: - if (Creature* pDisguised0 = Unit::GetCreature(*me, uiInfiniteDraconianGUID[0])) - DoScriptText(SAY_PHASE305,pDisguised0); - JumpToNextStep(1000); - break; - case 68: - if (Creature* pDisguised2 = Unit::GetCreature(*me, uiInfiniteDraconianGUID[2])) - { - pDisguised2->UpdateEntry(NPC_INFINITE_HUNTER, 0); - //Make them unattackable - pDisguised2->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE | UNIT_FLAG_UNK_9); - pDisguised2->SetReactState(REACT_PASSIVE); - } - JumpToNextStep(2000); - break; - case 69: - if (Creature* pDisguised1 = Unit::GetCreature(*me, uiInfiniteDraconianGUID[1])) - { - pDisguised1->UpdateEntry(NPC_INFINITE_AGENT, 0); - //Make them unattackable - pDisguised1->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE | UNIT_FLAG_UNK_9); - pDisguised1->SetReactState(REACT_PASSIVE); - } - JumpToNextStep(2000); - break; - case 70: - if (Creature* pDisguised0 = Unit::GetCreature(*me, uiInfiniteDraconianGUID[0])) - { - pDisguised0->UpdateEntry(NPC_INFINITE_ADVERSARY, 0); - //Make them unattackable - pDisguised0->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE | UNIT_FLAG_UNK_9); - pDisguised0->SetReactState(REACT_PASSIVE); - } - JumpToNextStep(2000); - break; - case 71: - //After waypoint 26,29,31 - case 73: - case 75: - case 77: - //Make cratures attackable - for (uint32 i = 0; i< ENCOUNTER_DRACONIAN_NUMBER; ++i) - if (Creature* pTemp = Unit::GetCreature(*me, uiInfiniteDraconianGUID[i])) - { - pTemp->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE | UNIT_FLAG_UNK_9); - pTemp->SetReactState(REACT_AGGRESSIVE); - } - JumpToNextStep(5000); - break; - case 72: - case 74: - case 76: - if (me->isInCombat()) - uiPhaseTimer = 1000; - else - { - if (uiStep == 72) DoScriptText(SAY_PHASE308,me); - if (uiStep == 74) DoScriptText(SAY_PHASE308,me); - if (uiStep == 76) DoScriptText(SAY_PHASE310,me); - SetHoldState(false); - bStepping = false; - SetRun(true); - JumpToNextStep(2000); - } - break; - case 78: - if (me->isInCombat()) - uiPhaseTimer = 1000; - else - { - DoScriptText(SAY_PHASE312,me); - JumpToNextStep(5000); - } - break; - case 79: - DoScriptText(SAY_PHASE313,me); - JumpToNextStep(1000); - break; - case 80: - if (pInstance) - if (pInstance->GetData(DATA_EPOCH_EVENT) != DONE) - { - SpawnTimeRift(17,&uiEpochGUID); - if (Creature* pEpoch = Unit::GetCreature(*me, uiEpochGUID)) - DoScriptText(SAY_PHASE314,pEpoch); - me->SetUInt64Value(UNIT_FIELD_TARGET, uiEpochGUID); - } - JumpToNextStep(18000); - break; - case 81: - if (pInstance) - if (pInstance->GetData(DATA_EPOCH_EVENT) != DONE) - DoScriptText(SAY_PHASE315, me); - JumpToNextStep(6000); - break; - case 82: - if (pInstance) - if (pInstance->GetData(DATA_EPOCH_EVENT) != DONE) - { - if (Creature* pEpoch = Unit::GetCreature(*me, uiEpochGUID)) - { - //Make Epoch attackable - pEpoch->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE | UNIT_FLAG_UNK_9); - pEpoch->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - pEpoch->SetReactState(REACT_AGGRESSIVE); - } - - } - JumpToNextStep(1000); - break; - case 83: - if (pInstance) - { - if (pInstance->GetData(DATA_EPOCH_EVENT) == DONE) - { - uiGossipStep = 3; - me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - bStepping = false; - uiBossEvent = DATA_MAL_GANIS_EVENT; - JumpToNextStep(15000); - } - else if (pInstance->GetData(DATA_EPOCH_EVENT) == FAIL) - npc_escortAI::EnterEvadeMode(); - else - uiPhaseTimer = 10000; - } - break; - //After Gossip 4 - case 84: - DoScriptText(SAY_PHASE404,me); - SetHoldState(false); - bStepping = false; - break; - //After Gossip 5 - case 85: - DoScriptText(SAY_PHASE501, me); - if (Creature* pMalganis = me->SummonCreature(NPC_MAL_GANIS,2296.665f,1502.362f,128.362f,4.961f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,900000)) - { - uiMalganisGUID = pMalganis->GetGUID(); - pMalganis->SetReactState(REACT_PASSIVE); - } - if (pInstance) - { - GameObject* pGate = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_MAL_GANIS_GATE_1)); - pGate->SetGoState(GO_STATE_ACTIVE); - } - SetHoldState(false); - bStepping = false; - JumpToNextStep(0); - break; - //After waypoint 55 - case 86: - DoScriptText(SAY_PHASE502, me); - JumpToNextStep(6000); - me->SetUInt64Value(UNIT_FIELD_TARGET, uiMalganisGUID); - break; - case 87: - if (Creature* pMalganis = Unit::GetCreature(*me, uiMalganisGUID)) - { - pMalganis->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE | UNIT_FLAG_UNK_6 | UNIT_FLAG_UNK_9 | UNIT_FLAG_UNK_15); - pMalganis->SetReactState(REACT_AGGRESSIVE); - } - JumpToNextStep(1000); - break; - case 88: - if (pInstance) - { - if (pInstance->GetData(DATA_MAL_GANIS_EVENT) == DONE) - { - SetHoldState(false); - JumpToNextStep(1000); - } - else if (pInstance->GetData(DATA_MAL_GANIS_EVENT) == FAIL) - npc_escortAI::EnterEvadeMode(); - else - uiPhaseTimer = 10000; - } - break; - //After waypoint 56 - case 89: - SetRun(true); - me->SetUInt64Value(UNIT_FIELD_TARGET, uiMalganisGUID); - DoScriptText(SAY_PHASE503, me); - JumpToNextStep(7000); - break; - case 90: - if (pInstance) - { - pInstance->SetData(DATA_ARTHAS_EVENT, DONE); //Rewards: Achiev & Chest ;D - me->SetUInt64Value(UNIT_FIELD_TARGET, pInstance->GetData64(DATA_MAL_GANIS_GATE_2)); //Look behind - } - DoScriptText(SAY_PHASE504, me); - bStepping = false; - break; - } - } else uiPhaseTimer -= diff; - } - - //Battling skills - if (!me->getVictim()) - return; - - if (uiExorcismTimer < diff) - { - if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(target, SPELL_EXORCISM_N); - uiExorcismTimer = 7300; - } else uiExorcismTimer -= diff; - - if (HealthBelowPct(40)) - DoCast(me, SPELL_HOLY_LIGHT); - } -}; - -CreatureAI* GetAI_npc_arthas(Creature* pCreature) -{ - return new npc_arthasAI(pCreature); -} - -#define GOSSIP_ITEM_ARTHAS_0 "I'm ready to start Culling of Stratholme." -#define GOSSIP_ITEM_ARTHAS_1 "Yes, my Prince. We're ready." -#define GOSSIP_ITEM_ARTHAS_2 "We're only doing what is best for Loarderon your Highness." -#define GOSSIP_ITEM_ARTHAS_3 "I'm ready." -#define GOSSIP_ITEM_ARTHAS_4 "For Lordaeron!" -#define GOSSIP_ITEM_ARTHAS_5 "I'm ready to battle the dreadlord, sire." - -bool GossipHello_npc_arthas(Player* pPlayer, Creature* pCreature) -{ - npc_arthasAI* pAI = CAST_AI(npc_arthasAI,pCreature->AI()); - - if (pAI && pAI->bStepping == false) - { - switch (pAI->uiGossipStep) - { - case 0: //This one is a workaround since the very beggining of the script is wrong. - if (pPlayer->GetQuestStatus(13149) != QUEST_STATUS_COMPLETE) - return false; - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ARTHAS_0, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); - pPlayer->SEND_GOSSIP_MENU(907, pCreature->GetGUID()); - break; - case 1: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ARTHAS_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_MENU_ARTHAS_1, pCreature->GetGUID()); - break; - case 2: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ARTHAS_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_MENU_ARTHAS_2, pCreature->GetGUID()); - break; - case 3: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ARTHAS_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_MENU_ARTHAS_3, pCreature->GetGUID()); - break; - case 4: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ARTHAS_4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_MENU_ARTHAS_4, pCreature->GetGUID()); - break; - case 5: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ARTHAS_5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_MENU_ARTHAS_5, pCreature->GetGUID()); - break; - default: - return false; - } - } - return true; -} - - -bool GossipSelect_npc_arthas(Player *pPlayer, Creature *pCreature, uint32 /*sender*/, uint32 action) -{ - npc_arthasAI* pAI = CAST_AI(npc_arthasAI,pCreature->AI()); - - if (!pAI) - return false; - - switch (action) - { - case GOSSIP_ACTION_INFO_DEF: - pAI->Start(true,true,pPlayer->GetGUID(),0,false,false); - pAI->SetDespawnAtEnd(false); - pAI->bStepping = false; - pAI->uiStep = 1; - break; - case GOSSIP_ACTION_INFO_DEF+1: - pAI->bStepping = true; - pAI->uiStep = 24; - break; - case GOSSIP_ACTION_INFO_DEF+2: - pAI->SetHoldState(false); - pAI->bStepping = false; - pAI->uiStep = 61; - break; - case GOSSIP_ACTION_INFO_DEF+3: - pAI->SetHoldState(false); - break; - case GOSSIP_ACTION_INFO_DEF+4: - pAI->bStepping = true; - pAI->uiStep = 84; - break; - case GOSSIP_ACTION_INFO_DEF+5: - pAI->bStepping = true; - pAI->uiStep = 85; - break; - } - pPlayer->CLOSE_GOSSIP_MENU(); - pAI->SetDespawnAtFar(true); - pCreature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - return true; -} - -void AddSC_culling_of_stratholme() -{ - Script *newscript; - - newscript = new Script; - newscript->Name = "npc_arthas"; - newscript->GetAI = &GetAI_npc_arthas; - newscript->pGossipHello = &GossipHello_npc_arthas; - newscript->pGossipSelect = &GossipSelect_npc_arthas; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/culling_of_stratholme/culling_of_stratholme.h b/src/server/scripts/Kalimdor/CavernsOfTime/culling_of_stratholme/culling_of_stratholme.h deleted file mode 100644 index 4278ad46500..00000000000 --- a/src/server/scripts/Kalimdor/CavernsOfTime/culling_of_stratholme/culling_of_stratholme.h +++ /dev/null @@ -1,68 +0,0 @@ -/* -* Copyright (C) 2008-2010 Trinity -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ - -#ifndef DEF_CULLING_OF_STRATHOLME_H -#define DEF_CULLING_OF_STRATHOLME_H - -enum Data -{ - DATA_MEATHOOK_EVENT, - DATA_SALRAMM_EVENT, - DATA_EPOCH_EVENT, - DATA_MAL_GANIS_EVENT, - DATA_INFINITE_EVENT, - DATA_ARTHAS_EVENT -}; - -enum Data64 -{ - DATA_ARTHAS, - DATA_MEATHOOK, - DATA_SALRAMM, - DATA_EPOCH, - DATA_MAL_GANIS, - DATA_INFINITE, - DATA_SHKAF_GATE, - DATA_MAL_GANIS_GATE_1, - DATA_MAL_GANIS_GATE_2, - DATA_EXIT_GATE, - DATA_MAL_GANIS_CHEST -}; - -enum Creatures -{ - NPC_MEATHOOK = 26529, - NPC_SALRAMM = 26530, - NPC_EPOCH = 26532, - NPC_MAL_GANIS = 26533, - NPC_INFINITE = 32273, - NPC_ARTHAS = 26499, - NPC_JAINA = 26497, - NPC_UTHER = 26528 -}; - -enum GameObjects -{ - GO_SHKAF_GATE = 188686, - GO_MALGANIS_GATE_1 = 187711, - GO_MALGANIS_GATE_2 = 187723, - GO_EXIT_GATE = 191788, - GO_MALGANIS_CHEST_N = 190663, - GO_MALGANIS_CHEST_H = 193597 -}; -#endif diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/culling_of_stratholme/instance_culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/culling_of_stratholme/instance_culling_of_stratholme.cpp deleted file mode 100644 index 73742a1e748..00000000000 --- a/src/server/scripts/Kalimdor/CavernsOfTime/culling_of_stratholme/instance_culling_of_stratholme.cpp +++ /dev/null @@ -1,244 +0,0 @@ -/* -* Copyright (C) 2008-2010 Trinity -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ - -#include "ScriptedPch.h" -#include "culling_of_stratholme.h" - -#define MAX_ENCOUNTER 5 - -/* Culling of Stratholme encounters: -0 - Meathook -1 - Salramm the Fleshcrafter -2 - Chrono-Lord Epoch -3 - Mal'Ganis -4 - Infinite Corruptor (Heroic only) -*/ - -struct instance_culling_of_stratholme : public ScriptedInstance -{ - instance_culling_of_stratholme(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; - - uint64 uiArthas; - uint64 uiMeathook; - uint64 uiSalramm; - uint64 uiEpoch; - uint64 uiMalGanis; - uint64 uiInfinite; - - uint64 uiShkafGate; - uint64 uiMalGanisGate1; - uint64 uiMalGanisGate2; - uint64 uiExitGate; - uint64 uiMalGanisChest; - - uint32 m_auiEncounter[MAX_ENCOUNTER]; - std::string str_data; - - bool IsEncounterInProgress() const - { - for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) - if (m_auiEncounter[i] == IN_PROGRESS) return true; - - return false; - } - - void OnCreatureCreate(Creature* pCreature, bool /*add*/) - { - switch(pCreature->GetEntry()) - { - case NPC_ARTHAS: - uiArthas = pCreature->GetGUID(); - break; - case NPC_MEATHOOK: - uiMeathook = pCreature->GetGUID(); - break; - case NPC_SALRAMM: - uiSalramm = pCreature->GetGUID(); - break; - case NPC_EPOCH: - uiEpoch = pCreature->GetGUID(); - break; - case NPC_MAL_GANIS: - uiMalGanis = pCreature->GetGUID(); - break; - case NPC_INFINITE: - uiInfinite = pCreature->GetGUID(); - break; - } - } - - void OnGameObjectCreate(GameObject* pGo, bool /*add*/) - { - switch(pGo->GetEntry()) - { - case GO_SHKAF_GATE: - uiShkafGate = pGo->GetGUID(); - break; - case GO_MALGANIS_GATE_1: - uiMalGanisGate1 = pGo->GetGUID(); - break; - case GO_MALGANIS_GATE_2: - uiMalGanisGate2 = pGo->GetGUID(); - break; - case GO_EXIT_GATE: - uiExitGate = pGo->GetGUID(); - if (m_auiEncounter[3] == DONE) - HandleGameObject(uiExitGate,true); - break; - case GO_MALGANIS_CHEST_N: - case GO_MALGANIS_CHEST_H: - uiMalGanisChest = pGo->GetGUID(); - if (m_auiEncounter[3] == DONE) - pGo->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_INTERACT_COND); - break; - } - } - - void SetData(uint32 type, uint32 data) - { - switch(type) - { - case DATA_MEATHOOK_EVENT: - m_auiEncounter[0] = data; - break; - case DATA_SALRAMM_EVENT: - m_auiEncounter[1] = data; - break; - case DATA_EPOCH_EVENT: - m_auiEncounter[2] = data; - break; - case DATA_MAL_GANIS_EVENT: - m_auiEncounter[3] = data; - - switch(m_auiEncounter[3]) - { - case NOT_STARTED: - HandleGameObject(uiMalGanisGate2,true); - break; - case IN_PROGRESS: - HandleGameObject(uiMalGanisGate2,false); - break; - case DONE: - HandleGameObject(uiExitGate, true); - if (GameObject *pGo = instance->GetGameObject(uiMalGanisChest)) - pGo->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_INTERACT_COND); - break; - } - break; - case DATA_INFINITE_EVENT: - m_auiEncounter[4] = data; - break; - } - - if (data == DONE) - SaveToDB(); - } - - uint32 GetData(uint32 type) - { - switch(type) - { - case DATA_MEATHOOK_EVENT: return m_auiEncounter[0]; - case DATA_SALRAMM_EVENT: return m_auiEncounter[1]; - case DATA_EPOCH_EVENT: return m_auiEncounter[2]; - case DATA_MAL_GANIS_EVENT: return m_auiEncounter[3]; - case DATA_INFINITE_EVENT: return m_auiEncounter[4]; - } - return 0; - } - - uint64 GetData64(uint32 identifier) - { - switch(identifier) - { - case DATA_ARTHAS: return uiArthas; - case DATA_MEATHOOK: return uiMeathook; - case DATA_SALRAMM: return uiSalramm; - case DATA_EPOCH: return uiEpoch; - case DATA_MAL_GANIS: return uiMalGanis; - case DATA_INFINITE: return uiInfinite; - case DATA_SHKAF_GATE: return uiShkafGate; - case DATA_MAL_GANIS_GATE_1: return uiMalGanisGate1; - case DATA_MAL_GANIS_GATE_2: return uiMalGanisGate2; - case DATA_EXIT_GATE: return uiExitGate; - case DATA_MAL_GANIS_CHEST: return uiMalGanisChest; - } - return 0; - } - - std::string GetSaveData() - { - OUT_SAVE_INST_DATA; - - std::ostringstream saveStream; - saveStream << "C S " << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " - << m_auiEncounter[2] << " " << m_auiEncounter[3] << " " << m_auiEncounter[4]; - - str_data = saveStream.str(); - - OUT_SAVE_INST_DATA_COMPLETE; - return str_data; - } - - void Load(const char* in) - { - if (!in) - { - OUT_LOAD_INST_DATA_FAIL; - return; - } - - OUT_LOAD_INST_DATA(in); - - char dataHead1, dataHead2; - uint16 data0, data1, data2, data3, data4; - - std::istringstream loadStream(in); - loadStream >> dataHead1 >> dataHead2 >> data0 >> data1 >> data2 >> data3 >> data4; - - if (dataHead1 == 'C' && dataHead2 == 'S') - { - m_auiEncounter[0] = data0; - m_auiEncounter[1] = data1; - m_auiEncounter[2] = data2; - m_auiEncounter[3] = data3; - m_auiEncounter[4] = data4; - - for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) - if (m_auiEncounter[i] == IN_PROGRESS) - m_auiEncounter[i] = NOT_STARTED; - - } else OUT_LOAD_INST_DATA_FAIL; - - OUT_LOAD_INST_DATA_COMPLETE; - } -}; - -InstanceData* GetInstanceData_instance_culling_of_stratholme(Map* pMap) -{ - return new instance_culling_of_stratholme(pMap); -} - -void AddSC_instance_culling_of_stratholme() -{ - Script *newscript; - newscript = new Script; - newscript->Name = "instance_culling_of_stratholme"; - newscript->GetInstanceData = &GetInstanceData_instance_culling_of_stratholme; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/dark_portal/boss_aeonus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/dark_portal/boss_aeonus.cpp deleted file mode 100644 index 49cf7cd4433..00000000000 --- a/src/server/scripts/Kalimdor/CavernsOfTime/dark_portal/boss_aeonus.cpp +++ /dev/null @@ -1,145 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: Boss_Aeonus -SD%Complete: 80 -SDComment: Some spells not implemented -SDCategory: Caverns of Time, The Dark Portal -EndScriptData */ - -#include "ScriptedPch.h" -#include "dark_portal.h" - -enum eEnums -{ - SAY_ENTER = -1269012, - SAY_AGGRO = -1269013, - SAY_BANISH = -1269014, - SAY_SLAY1 = -1269015, - SAY_SLAY2 = -1269016, - SAY_DEATH = -1269017, - EMOTE_FRENZY = -1269018, - - SPELL_CLEAVE = 40504, - SPELL_TIME_STOP = 31422, - SPELL_ENRAGE = 37605, - SPELL_SAND_BREATH = 31473, - H_SPELL_SAND_BREATH = 39049 -}; - -struct boss_aeonusAI : public ScriptedAI -{ - boss_aeonusAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - } - - ScriptedInstance *pInstance; - - uint32 SandBreath_Timer; - uint32 TimeStop_Timer; - uint32 Frenzy_Timer; - - void Reset() - { - SandBreath_Timer = 15000+rand()%15000; - TimeStop_Timer = 10000+rand()%5000; - Frenzy_Timer = 30000+rand()%15000; - } - - void EnterCombat(Unit * /*who*/) - { - DoScriptText(SAY_AGGRO, me); - } - - void MoveInLineOfSight(Unit *who) - { - //Despawn Time Keeper - if (who->GetTypeId() == TYPEID_UNIT && who->GetEntry() == C_TIME_KEEPER) - { - if (me->IsWithinDistInMap(who,20.0f)) - { - DoScriptText(SAY_BANISH, me); - me->DealDamage(who, who->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); - } - } - - ScriptedAI::MoveInLineOfSight(who); - } - - void JustDied(Unit * /*victim*/) - { - DoScriptText(SAY_DEATH, me); - - if (pInstance) - { - pInstance->SetData(TYPE_RIFT,DONE); - pInstance->SetData(TYPE_MEDIVH,DONE);//FIXME: later should be removed - } - } - - void KilledUnit(Unit * /*victim*/) - { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); - } - - void UpdateAI(const uint32 diff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - //Sand Breath - if (SandBreath_Timer <= diff) - { - DoCast(me->getVictim(), SPELL_SAND_BREATH); - SandBreath_Timer = 15000+rand()%10000; - } else SandBreath_Timer -= diff; - - //Time Stop - if (TimeStop_Timer <= diff) - { - DoCast(me->getVictim(), SPELL_TIME_STOP); - TimeStop_Timer = 20000+rand()%15000; - } else TimeStop_Timer -= diff; - - //Frenzy - if (Frenzy_Timer <= diff) - { - DoScriptText(EMOTE_FRENZY, me); - DoCast(me, SPELL_ENRAGE); - Frenzy_Timer = 20000+rand()%15000; - } else Frenzy_Timer -= diff; - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_boss_aeonus(Creature* pCreature) -{ - return new boss_aeonusAI (pCreature); -} - -void AddSC_boss_aeonus() -{ - Script *newscript; - newscript = new Script; - newscript->Name = "boss_aeonus"; - newscript->GetAI = &GetAI_boss_aeonus; - newscript->RegisterSelf(); -} - diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/dark_portal/boss_chrono_lord_deja.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/dark_portal/boss_chrono_lord_deja.cpp deleted file mode 100644 index 1f2b4a80612..00000000000 --- a/src/server/scripts/Kalimdor/CavernsOfTime/dark_portal/boss_chrono_lord_deja.cpp +++ /dev/null @@ -1,154 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: Boss_Chrono_Lord_Deja -SD%Complete: 65 -SDComment: All abilities not implemented -SDCategory: Caverns of Time, The Dark Portal -EndScriptData */ - -#include "ScriptedPch.h" -#include "dark_portal.h" - -enum eEnums -{ - SAY_ENTER = -1269006, - SAY_AGGRO = -1269007, - SAY_BANISH = -1269008, - SAY_SLAY1 = -1269009, - SAY_SLAY2 = -1269010, - SAY_DEATH = -1269011, - - SPELL_ARCANE_BLAST = 31457, - H_SPELL_ARCANE_BLAST = 38538, - SPELL_ARCANE_DISCHARGE = 31472, - H_SPELL_ARCANE_DISCHARGE = 38539, - SPELL_TIME_LAPSE = 31467, - SPELL_ATTRACTION = 38540 //Not Implemented (Heroic mode) -}; - -struct boss_chrono_lord_dejaAI : public ScriptedAI -{ - boss_chrono_lord_dejaAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - } - - ScriptedInstance *pInstance; - - uint32 ArcaneBlast_Timer; - uint32 TimeLapse_Timer; - uint32 Attraction_Timer; - uint32 ArcaneDischarge_Timer; - - void Reset() - { - ArcaneBlast_Timer = 18000+rand()%5000; - TimeLapse_Timer = 10000+rand()%5000; - ArcaneDischarge_Timer = 20000+rand()%10000; - Attraction_Timer = 25000+rand()%10000; - } - - void EnterCombat(Unit * /*who*/) - { - DoScriptText(SAY_AGGRO, me); - } - - void MoveInLineOfSight(Unit *who) - { - //Despawn Time Keeper - if (who->GetTypeId() == TYPEID_UNIT && who->GetEntry() == C_TIME_KEEPER) - { - if (me->IsWithinDistInMap(who,20.0f)) - { - DoScriptText(SAY_BANISH, me); - me->DealDamage(who, who->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); - } - } - - ScriptedAI::MoveInLineOfSight(who); - } - - void KilledUnit(Unit * /*victim*/) - { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); - } - - void JustDied(Unit * /*victim*/) - { - DoScriptText(SAY_DEATH, me); - - if (pInstance) - pInstance->SetData(TYPE_RIFT,SPECIAL); - } - - void UpdateAI(const uint32 diff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - //Arcane Blast - if (ArcaneBlast_Timer <= diff) - { - DoCast(me->getVictim(), SPELL_ARCANE_BLAST); - ArcaneBlast_Timer = 15000+rand()%10000; - } else ArcaneBlast_Timer -= diff; - - //Arcane Discharge - if (ArcaneDischarge_Timer <= diff) - { - Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); - DoCast(pTarget, SPELL_ARCANE_DISCHARGE); - ArcaneDischarge_Timer = 20000+rand()%10000; - } else ArcaneDischarge_Timer -= diff; - - //Time Lapse - if (TimeLapse_Timer <= diff) - { - DoScriptText(SAY_BANISH, me); - DoCast(me, SPELL_TIME_LAPSE); - TimeLapse_Timer = 15000+rand()%10000; - } else TimeLapse_Timer -= diff; - - if (IsHeroic()) - { - if (Attraction_Timer <= diff) - { - DoCast(me, SPELL_ATTRACTION); - Attraction_Timer = 25000+rand()%10000; - } else Attraction_Timer -= diff; - } - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_boss_chrono_lord_deja(Creature* pCreature) -{ - return new boss_chrono_lord_dejaAI (pCreature); -} - -void AddSC_boss_chrono_lord_deja() -{ - Script *newscript; - newscript = new Script; - newscript->Name = "boss_chrono_lord_deja"; - newscript->GetAI = &GetAI_boss_chrono_lord_deja; - newscript->RegisterSelf(); -} - diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/dark_portal/boss_temporus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/dark_portal/boss_temporus.cpp deleted file mode 100644 index 04b4b020ead..00000000000 --- a/src/server/scripts/Kalimdor/CavernsOfTime/dark_portal/boss_temporus.cpp +++ /dev/null @@ -1,152 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: Boss_Temporus -SD%Complete: 75 -SDComment: More abilities need to be implemented -SDCategory: Caverns of Time, The Dark Portal -EndScriptData */ - -#include "ScriptedPch.h" -#include "dark_portal.h" - -enum eEnums -{ - SAY_ENTER = -1269000, - SAY_AGGRO = -1269001, - SAY_BANISH = -1269002, - SAY_SLAY1 = -1269003, - SAY_SLAY2 = -1269004, - SAY_DEATH = -1269005, - - SPELL_HASTE = 31458, - SPELL_MORTAL_WOUND = 31464, - SPELL_WING_BUFFET = 31475, - H_SPELL_WING_BUFFET = 38593, - SPELL_REFLECT = 38592 //Not Implemented (Heroic mod) -}; - -struct boss_temporusAI : public ScriptedAI -{ - boss_temporusAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - } - - ScriptedInstance *pInstance; - - uint32 Haste_Timer; - uint32 SpellReflection_Timer; - uint32 MortalWound_Timer; - uint32 WingBuffet_Timer; - - void Reset() - { - Haste_Timer = 15000+rand()%8000; - SpellReflection_Timer = 30000; - MortalWound_Timer = 8000; - WingBuffet_Timer = 25000+rand()%10000; - } - - void EnterCombat(Unit * /*who*/) - { - DoScriptText(SAY_AGGRO, me); - } - - void KilledUnit(Unit * /*victim*/) - { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); - } - - void JustDied(Unit * /*victim*/) - { - DoScriptText(SAY_DEATH, me); - - if (pInstance) - pInstance->SetData(TYPE_RIFT,SPECIAL); - } - - void MoveInLineOfSight(Unit *who) - { - //Despawn Time Keeper - if (who->GetTypeId() == TYPEID_UNIT && who->GetEntry() == C_TIME_KEEPER) - { - if (me->IsWithinDistInMap(who,20.0f)) - { - DoScriptText(SAY_BANISH, me); - - me->DealDamage(who, who->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); - } - } - - ScriptedAI::MoveInLineOfSight(who); - } - - void UpdateAI(const uint32 diff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - //Attack Haste - if (Haste_Timer <= diff) - { - DoCast(me, SPELL_HASTE); - Haste_Timer = 20000+rand()%5000; - } else Haste_Timer -= diff; - - //MortalWound_Timer - if (MortalWound_Timer <= diff) - { - DoCast(me, SPELL_MORTAL_WOUND); - MortalWound_Timer = 10000+rand()%10000; - } else MortalWound_Timer -= diff; - - //Wing ruffet - if (WingBuffet_Timer <= diff) - { - DoCast(me, SPELL_WING_BUFFET); - WingBuffet_Timer = 20000+rand()%10000; - } else WingBuffet_Timer -= diff; - - if (IsHeroic()) - { - if (SpellReflection_Timer <= diff) - { - DoCast(me, SPELL_REFLECT); - SpellReflection_Timer = 25000+rand()%10000; - } else SpellReflection_Timer -= diff; - } - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_boss_temporus(Creature* pCreature) -{ - return new boss_temporusAI (pCreature); -} - -void AddSC_boss_temporus() -{ - Script *newscript; - newscript = new Script; - newscript->Name = "boss_temporus"; - newscript->GetAI = &GetAI_boss_temporus; - newscript->RegisterSelf(); -} - diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/dark_portal/dark_portal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/dark_portal/dark_portal.cpp deleted file mode 100644 index b0432a9b57c..00000000000 --- a/src/server/scripts/Kalimdor/CavernsOfTime/dark_portal/dark_portal.cpp +++ /dev/null @@ -1,404 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ - -/* ScriptData -SDName: Dark_Portal -SD%Complete: 30 -SDComment: Misc NPC's and mobs for instance. Most here far from complete. -SDCategory: Caverns of Time, The Dark Portal -EndScriptData */ - -/* ContentData -npc_medivh_bm -npc_time_rift -npc_saat -EndContentData */ - -#include "ScriptedPch.h" -#include "dark_portal.h" - -#define SAY_ENTER -1269020 //where does this belong? -#define SAY_INTRO -1269021 -#define SAY_WEAK75 -1269022 -#define SAY_WEAK50 -1269023 -#define SAY_WEAK25 -1269024 -#define SAY_DEATH -1269025 -#define SAY_WIN -1269026 -#define SAY_ORCS_ENTER -1269027 -#define SAY_ORCS_ANSWER -1269028 - -#define SPELL_CHANNEL 31556 -#define SPELL_PORTAL_RUNE 32570 //aura(portal on ground effect) - -#define SPELL_BLACK_CRYSTAL 32563 //aura -#define SPELL_PORTAL_CRYSTAL 32564 //summon - -#define SPELL_BANISH_PURPLE 32566 //aura -#define SPELL_BANISH_GREEN 32567 //aura - -#define SPELL_CORRUPT 31326 -#define SPELL_CORRUPT_AEONUS 37853 - -#define C_COUNCIL_ENFORCER 17023 - -struct npc_medivh_bmAI : public ScriptedAI -{ - npc_medivh_bmAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - } - - ScriptedInstance *pInstance; - - uint32 SpellCorrupt_Timer; - uint32 Check_Timer; - - bool Life75; - bool Life50; - bool Life25; - - void Reset() - { - SpellCorrupt_Timer = 0; - - if (!pInstance) - return; - - if (pInstance->GetData(TYPE_MEDIVH) == IN_PROGRESS) - DoCast(me, SPELL_CHANNEL, true); - else if (me->HasAura(SPELL_CHANNEL)) - me->RemoveAura(SPELL_CHANNEL); - - DoCast(me, SPELL_PORTAL_RUNE, true); - } - - void MoveInLineOfSight(Unit *who) - { - if (!pInstance) - return; - - if (who->GetTypeId() == TYPEID_PLAYER && me->IsWithinDistInMap(who, 10.0f)) - { - if (pInstance->GetData(TYPE_MEDIVH) == IN_PROGRESS || pInstance->GetData(TYPE_MEDIVH) == DONE) - return; - - DoScriptText(SAY_INTRO, me); - pInstance->SetData(TYPE_MEDIVH,IN_PROGRESS); - DoCast(me, SPELL_CHANNEL, false); - Check_Timer = 5000; - } - else if (who->GetTypeId() == TYPEID_UNIT && me->IsWithinDistInMap(who, 15.0f)) - { - if (pInstance->GetData(TYPE_MEDIVH) != IN_PROGRESS) - return; - - uint32 entry = who->GetEntry(); - if (entry == C_ASSAS || entry == C_WHELP || entry == C_CHRON || entry == C_EXECU || entry == C_VANQU) - { - who->StopMoving(); - who->CastSpell(me,SPELL_CORRUPT,false); - } - else if (entry == C_AEONUS) - { - who->StopMoving(); - who->CastSpell(me,SPELL_CORRUPT_AEONUS,false); - } - } - } - - void AttackStart(Unit * /*who*/) - { - //if (pInstance && pInstance->GetData(TYPE_MEDIVH) == IN_PROGRESS) - //return; - - //ScriptedAI::AttackStart(who); - } - - void EnterCombat(Unit * /*who*/) {} - - void SpellHit(Unit* /*caster*/, const SpellEntry* spell) - { - if (SpellCorrupt_Timer) - return; - - if (spell->Id == SPELL_CORRUPT_AEONUS) - SpellCorrupt_Timer = 1000; - - if (spell->Id == SPELL_CORRUPT) - SpellCorrupt_Timer = 3000; - } - - void JustDied(Unit* Killer) - { - if (Killer->GetEntry() == me->GetEntry()) - return; - - DoScriptText(SAY_DEATH, me); - } - - void UpdateAI(const uint32 diff) - { - if (!pInstance) - return; - - if (SpellCorrupt_Timer) - { - if (SpellCorrupt_Timer <= diff) - { - pInstance->SetData(TYPE_MEDIVH,SPECIAL); - - if (me->HasAura(SPELL_CORRUPT_AEONUS)) - SpellCorrupt_Timer = 1000; - else if (me->HasAura(SPELL_CORRUPT)) - SpellCorrupt_Timer = 3000; - else - SpellCorrupt_Timer = 0; - } else SpellCorrupt_Timer -= diff; - } - - if (Check_Timer) - { - if (Check_Timer <= diff) - { - uint32 pct = pInstance->GetData(DATA_SHIELD); - - Check_Timer = 5000; - - if (Life25 && pct <= 25) - { - DoScriptText(SAY_WEAK25, me); - Life25 = false; - } - else if (Life50 && pct <= 50) - { - DoScriptText(SAY_WEAK50, me); - Life50 = false; - } - else if (Life75 && pct <= 75) - { - DoScriptText(SAY_WEAK75, me); - Life75 = false; - } - - //if we reach this it means event was running but at some point reset. - if (pInstance->GetData(TYPE_MEDIVH) == NOT_STARTED) - { - me->DealDamage(me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); - me->RemoveCorpse(); - me->Respawn(); - return; - } - - if (pInstance->GetData(TYPE_RIFT) == DONE) - { - DoScriptText(SAY_WIN, me); - Check_Timer = 0; - - if (me->HasAura(SPELL_CHANNEL)) - me->RemoveAura(SPELL_CHANNEL); - - //TODO: start the post-event here - pInstance->SetData(TYPE_MEDIVH,DONE); - } - } else Check_Timer -= diff; - } - - //if (!UpdateVictim()) - //return; - - //DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_npc_medivh_bm(Creature* pCreature) -{ - return new npc_medivh_bmAI (pCreature); -} - -struct Wave -{ - uint32 PortalMob[4]; //spawns for portal waves (in order) -}; - -static Wave PortalWaves[]= -{ - {C_ASSAS, C_WHELP, C_CHRON, 0}, - {C_EXECU, C_CHRON, C_WHELP, C_ASSAS}, - {C_EXECU, C_VANQU, C_CHRON, C_ASSAS} -}; - -struct npc_time_riftAI : public ScriptedAI -{ - npc_time_riftAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - } - - ScriptedInstance *pInstance; - - uint32 TimeRiftWave_Timer; - uint8 mRiftWaveCount; - uint8 mPortalCount; - uint8 mWaveId; - - void Reset() - { - - TimeRiftWave_Timer = 15000; - mRiftWaveCount = 0; - - if (!pInstance) - return; - - mPortalCount = pInstance->GetData(DATA_PORTAL_COUNT); - - if (mPortalCount < 6) - mWaveId = 0; - else if (mPortalCount > 12) - mWaveId = 2; - else mWaveId = 1; - - } - void EnterCombat(Unit * /*who*/) {} - - void DoSummonAtRift(uint32 creature_entry) - { - if (!creature_entry) - return; - - if (pInstance && pInstance->GetData(TYPE_MEDIVH) != IN_PROGRESS) - { - me->InterruptNonMeleeSpells(true); - me->RemoveAllAuras(); - return; - } - - Position pos; - me->GetRandomNearPosition(pos, 10.0f); - - //normalize Z-level if we can, if rift is not at ground level. - pos.m_positionZ = std::max(me->GetMap()->GetHeight(pos.m_positionX, pos.m_positionY, MAX_HEIGHT), me->GetMap()->GetWaterLevel(pos.m_positionX, pos.m_positionY)); - - if (Unit *Summon = DoSummon(creature_entry, pos, 30000, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT)) - if (Unit *temp = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_MEDIVH) : 0)) - Summon->AddThreat(temp,0.0f); - } - - void DoSelectSummon() - { - uint32 entry = 0; - - if ((mRiftWaveCount > 2 && mWaveId < 1) || mRiftWaveCount > 3) - mRiftWaveCount = 0; - - entry = PortalWaves[mWaveId].PortalMob[mRiftWaveCount]; - debug_log("TSCR: npc_time_rift: summoning wave Creature (Wave %u, Entry %u).",mRiftWaveCount,entry); - - ++mRiftWaveCount; - - if (entry == C_WHELP) - { - for (uint8 i = 0; i < 3; ++i) - DoSummonAtRift(entry); - } else DoSummonAtRift(entry); - } - - void UpdateAI(const uint32 diff) - { - if (!pInstance) - return; - - if (TimeRiftWave_Timer <= diff) - { - DoSelectSummon(); - TimeRiftWave_Timer = 15000; - } else TimeRiftWave_Timer -= diff; - - if (me->IsNonMeleeSpellCasted(false)) - return; - - debug_log("TSCR: npc_time_rift: not casting anylonger, i need to die."); - me->setDeathState(JUST_DIED); - - if (pInstance->GetData(TYPE_RIFT) == IN_PROGRESS) - pInstance->SetData(TYPE_RIFT,SPECIAL); - } -}; - -CreatureAI* GetAI_npc_time_rift(Creature* pCreature) -{ - return new npc_time_riftAI (pCreature); -} - -#define SAY_SAAT_WELCOME -1269019 - -#define GOSSIP_ITEM_OBTAIN "[PH] Obtain Chrono-Beacon" -#define SPELL_CHRONO_BEACON 34975 -#define ITEM_CHRONO_BEACON 24289 - -bool GossipHello_npc_saat(Player* pPlayer, Creature* pCreature) -{ - if (pCreature->isQuestGiver()) - pPlayer->PrepareQuestMenu(pCreature->GetGUID()); - - if (pPlayer->GetQuestStatus(QUEST_OPENING_PORTAL) == QUEST_STATUS_INCOMPLETE && !pPlayer->HasItemCount(ITEM_CHRONO_BEACON,1)) - { - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,GOSSIP_ITEM_OBTAIN,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(10000, pCreature->GetGUID()); - return true; - } - else if (pPlayer->GetQuestRewardStatus(QUEST_OPENING_PORTAL) && !pPlayer->HasItemCount(ITEM_CHRONO_BEACON,1)) - { - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,GOSSIP_ITEM_OBTAIN,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(10001, pCreature->GetGUID()); - return true; - } - - pPlayer->SEND_GOSSIP_MENU(10002, pCreature->GetGUID()); - return true; -} - -bool GossipSelect_npc_saat(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) -{ - if (uiAction == GOSSIP_ACTION_INFO_DEF+1) - { - pPlayer->CLOSE_GOSSIP_MENU(); - pCreature->CastSpell(pPlayer,SPELL_CHRONO_BEACON,false); - } - return true; -} - -void AddSC_dark_portal() -{ - Script *newscript; - - newscript = new Script; - newscript->Name = "npc_medivh_bm"; - newscript->GetAI = &GetAI_npc_medivh_bm; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "npc_time_rift"; - newscript->GetAI = &GetAI_npc_time_rift; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "npc_saat"; - newscript->pGossipHello = &GossipHello_npc_saat; - newscript->pGossipSelect = &GossipSelect_npc_saat; - newscript->RegisterSelf(); -} - diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/dark_portal/dark_portal.h b/src/server/scripts/Kalimdor/CavernsOfTime/dark_portal/dark_portal.h deleted file mode 100644 index 7bfd8c917d7..00000000000 --- a/src/server/scripts/Kalimdor/CavernsOfTime/dark_portal/dark_portal.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 -* This program is free software licensed under GPL version 2 -* Please see the included DOCS/LICENSE.TXT for more information */ - -#ifndef DEF_DARKPORTAL_H -#define DEF_DARKPORTAL_H - -#define TYPE_MEDIVH 1 -#define TYPE_RIFT 2 - -#define DATA_MEDIVH 10 -#define DATA_PORTAL_COUNT 11 -#define DATA_SHIELD 12 - -#define WORLD_STATE_BM 2541 -#define WORLD_STATE_BM_SHIELD 2540 -#define WORLD_STATE_BM_RIFT 2784 - -#define QUEST_OPENING_PORTAL 10297 -#define QUEST_MASTER_TOUCH 9836 - -#define C_TIME_KEEPER 17918 -#define C_RKEEP 21104 -#define C_RLORD 17839 -#define C_DEJA 17879 -#define C_TEMPO 17880 -#define C_AEONUS 17881 -#define C_ASSAS 17835 -#define C_WHELP 21818 -#define C_CHRON 17892 -#define C_EXECU 18994 -#define C_VANQU 18995 - -#endif - diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/dark_portal/instance_dark_portal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/dark_portal/instance_dark_portal.cpp deleted file mode 100644 index d1280230808..00000000000 --- a/src/server/scripts/Kalimdor/CavernsOfTime/dark_portal/instance_dark_portal.cpp +++ /dev/null @@ -1,346 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ - -/* ScriptData -SDName: Instance_Dark_Portal -SD%Complete: 50 -SDComment: Quest support: 9836, 10297. Currently in progress. -SDCategory: Caverns of Time, The Dark Portal -EndScriptData */ - -#include "ScriptedPch.h" -#include "dark_portal.h" - -#define MAX_ENCOUNTER 2 - -#define C_MEDIVH 15608 -#define C_TIME_RIFT 17838 - -#define SPELL_RIFT_CHANNEL 31387 - -#define RIFT_BOSS 1 - -inline uint32 RandRiftBoss() { return ((rand()%2) ? C_RKEEP : C_RLORD); } - -float PortalLocation[4][4]= -{ - {-2041.06, 7042.08, 29.99, 1.30}, - {-1968.18, 7042.11, 21.93, 2.12}, - {-1885.82, 7107.36, 22.32, 3.07}, - {-1928.11, 7175.95, 22.11, 3.44} -}; - -struct Wave -{ - uint32 PortalBoss; //protector of current portal - uint32 NextPortalTime; //time to next portal, or 0 if portal boss need to be killed -}; - -static Wave RiftWaves[]= -{ - {RIFT_BOSS, 0}, - {C_DEJA, 0}, - {RIFT_BOSS, 120000}, - {C_TEMPO, 140000}, - {RIFT_BOSS, 120000}, - {C_AEONUS, 0} -}; - -struct instance_dark_portal : public ScriptedInstance -{ - instance_dark_portal(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; - - uint32 m_auiEncounter[MAX_ENCOUNTER]; - - uint32 mRiftPortalCount; - uint32 mShieldPercent; - uint8 mRiftWaveCount; - uint8 mRiftWaveId; - - uint32 NextPortal_Timer; - - uint64 MedivhGUID; - uint8 CurrentRiftId; - - void Initialize() - { - MedivhGUID = 0; - Clear(); - } - - void Clear() - { - memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); - - mRiftPortalCount = 0; - mShieldPercent = 100; - mRiftWaveCount = 0; - mRiftWaveId = 0; - - CurrentRiftId = 0; - - NextPortal_Timer = 0; - } - - void InitWorldState(bool Enable = true) - { - DoUpdateWorldState(WORLD_STATE_BM,Enable ? 1 : 0); - DoUpdateWorldState(WORLD_STATE_BM_SHIELD, 100); - DoUpdateWorldState(WORLD_STATE_BM_RIFT, 0); - } - - bool IsEncounterInProgress() - { - if (GetData(TYPE_MEDIVH) == IN_PROGRESS) - return true; - - return false; - } - - void OnPlayerEnter(Player* pPlayer) - { - if (GetData(TYPE_MEDIVH) == IN_PROGRESS) - return; - - pPlayer->SendUpdateWorldState(WORLD_STATE_BM,0); - } - - void OnCreatureCreate(Creature* pCreature, bool /*add*/) - { - if (pCreature->GetEntry() == C_MEDIVH) - MedivhGUID = pCreature->GetGUID(); - } - - //what other conditions to check? - bool CanProgressEvent() - { - if (instance->GetPlayers().isEmpty()) - return false; - - return true; - } - - uint8 GetRiftWaveId() - { - switch(mRiftPortalCount) - { - case 6: - mRiftWaveId = 2; - return 1; - case 12: - mRiftWaveId = 4; - return 3; - case 18: - return 5; - default: - return mRiftWaveId; - } - } - - void SetData(uint32 type, uint32 data) - { - switch(type) - { - case TYPE_MEDIVH: - if (data == SPECIAL && m_auiEncounter[0] == IN_PROGRESS) - { - --mShieldPercent; - - DoUpdateWorldState(WORLD_STATE_BM_SHIELD, mShieldPercent); - - if (!mShieldPercent) - { - if (Creature* pMedivh = instance->GetCreature(MedivhGUID)) - { - if (pMedivh->isAlive()) - { - pMedivh->DealDamage(pMedivh, pMedivh->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); - m_auiEncounter[0] = FAIL; - m_auiEncounter[1] = NOT_STARTED; - } - } - } - } - else - { - if (data == IN_PROGRESS) - { - debug_log("TSCR: Instance Dark Portal: Starting event."); - InitWorldState(); - m_auiEncounter[1] = IN_PROGRESS; - NextPortal_Timer = 15000; - } - - if (data == DONE) - { - //this may be completed further out in the post-event - debug_log("TSCR: Instance Dark Portal: Event completed."); - Map::PlayerList const& players = instance->GetPlayers(); - - if (!players.isEmpty()) - { - for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) - { - if (Player* pPlayer = itr->getSource()) - { - if (pPlayer->GetQuestStatus(QUEST_OPENING_PORTAL) == QUEST_STATUS_INCOMPLETE) - pPlayer->AreaExploredOrEventHappens(QUEST_OPENING_PORTAL); - - if (pPlayer->GetQuestStatus(QUEST_MASTER_TOUCH) == QUEST_STATUS_INCOMPLETE) - pPlayer->AreaExploredOrEventHappens(QUEST_MASTER_TOUCH); - } - } - } - } - - m_auiEncounter[0] = data; - } - break; - case TYPE_RIFT: - if (data == SPECIAL) - { - if (mRiftPortalCount < 7) - NextPortal_Timer = 5000; - } - else - m_auiEncounter[1] = data; - break; - } - } - - uint32 GetData(uint32 type) - { - switch(type) - { - case TYPE_MEDIVH: - return m_auiEncounter[0]; - case TYPE_RIFT: - return m_auiEncounter[1]; - case DATA_PORTAL_COUNT: - return mRiftPortalCount; - case DATA_SHIELD: - return mShieldPercent; - } - return 0; - } - - uint64 GetData64(uint32 data) - { - if (data == DATA_MEDIVH) - return MedivhGUID; - - return 0; - } - - Creature* SummonedPortalBoss(Creature* me) - { - uint32 entry = RiftWaves[GetRiftWaveId()].PortalBoss; - - if (entry == RIFT_BOSS) - entry = RandRiftBoss(); - - debug_log("TSCR: Instance Dark Portal: Summoning rift boss entry %u.",entry); - - Position pos; - me->GetRandomNearPosition(pos, 10.0f); - - //normalize Z-level if we can, if rift is not at ground level. - pos.m_positionZ = std::max(me->GetMap()->GetHeight(pos.m_positionX, pos.m_positionY, MAX_HEIGHT), me->GetMap()->GetWaterLevel(pos.m_positionX, pos.m_positionY)); - - if (Creature *summon = me->SummonCreature(entry, pos, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000)) - return summon; - - debug_log("TSCR: Instance Dark Portal: What just happened there? No boss, no loot, no fun..."); - return NULL; - } - - void DoSpawnPortal() - { - if (Creature* pMedivh = instance->GetCreature(MedivhGUID)) - { - uint8 tmp = urand(0,2); - - if (tmp >= CurrentRiftId) - ++tmp; - - debug_log("TSCR: Instance Dark Portal: Creating Time Rift at locationId %i (old locationId was %u).",tmp,CurrentRiftId); - - CurrentRiftId = tmp; - - Creature *pTemp = pMedivh->SummonCreature(C_TIME_RIFT, - PortalLocation[tmp][0],PortalLocation[tmp][1],PortalLocation[tmp][2],PortalLocation[tmp][3], - TEMPSUMMON_CORPSE_DESPAWN,0); - if (pTemp) - { - pTemp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - pTemp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - - if (Creature *pBoss = SummonedPortalBoss(pTemp)) - { - if (pBoss->GetEntry() == C_AEONUS) - pBoss->AddThreat(pMedivh,0.0f); - else - { - pBoss->AddThreat(pTemp,0.0f); - pTemp->CastSpell(pBoss,SPELL_RIFT_CHANNEL,false); - } - } - } - } - } - - void Update(uint32 diff) - { - if (m_auiEncounter[1] != IN_PROGRESS) - return; - - //add delay timer? - if (!CanProgressEvent()) - { - Clear(); - return; - } - - if (NextPortal_Timer) - { - if (NextPortal_Timer <= diff) - { - ++mRiftPortalCount; - - DoUpdateWorldState(WORLD_STATE_BM_RIFT, mRiftPortalCount); - - DoSpawnPortal(); - NextPortal_Timer = RiftWaves[GetRiftWaveId()].NextPortalTime; - } else NextPortal_Timer -= diff; - } - } -}; - -InstanceData* GetInstanceData_instance_dark_portal(Map* pMap) -{ - return new instance_dark_portal(pMap); -} - -void AddSC_instance_dark_portal() -{ - Script *newscript; - - newscript = new Script; - newscript->Name = "instance_dark_portal"; - newscript->GetInstanceData = &GetInstanceData_instance_dark_portal; - newscript->RegisterSelf(); -} - diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/hyjal/boss_anetheron.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/hyjal/boss_anetheron.cpp deleted file mode 100644 index 14ce4a59b37..00000000000 --- a/src/server/scripts/Kalimdor/CavernsOfTime/hyjal/boss_anetheron.cpp +++ /dev/null @@ -1,309 +0,0 @@ - -#include "ScriptedPch.h" -#include "hyjal.h" -#include "hyjal_trash.h" - -#define SPELL_CARRION_SWARM 31306 -#define SPELL_SLEEP 31298 -#define SPELL_VAMPIRIC_AURA 38196 -#define SPELL_INFERNO 31299 - -#define SAY_ONDEATH "The clock... is still... ticking." -#define SOUND_ONDEATH 10982 - -#define SAY_ONSLAY1 "Your hopes are lost!" -#define SAY_ONSLAY2 "Scream for me!" -#define SAY_ONSLAY3 "Pity, no time for a slow death!" -#define SOUND_ONSLAY1 10981 -#define SOUND_ONSLAY2 11038 -#define SOUND_ONSLAY3 11039 - -#define SAY_SWARM1 "The swarm is eager to feed!" -#define SAY_SWARM2 "Pestilence upon you!" -#define SOUND_SWARM1 10979 -#define SOUND_SWARM2 11037 - -#define SAY_SLEEP1 "You look tired..." -#define SAY_SLEEP2 "Sweet dreams..." -#define SOUND_SLEEP1 10978 -#define SOUND_SLEEP2 11545 - -#define SAY_INFERNO1 "Let fire rain from above!" -#define SAY_INFERNO2 "Earth and sky shall burn!" -#define SOUND_INFERNO1 10980 -#define SOUND_INFERNO2 11036 - -#define SAY_ONAGGRO "You are defenders of a doomed world! Flee here, and perhaps you will prolong your pathetic lives!" -#define SOUND_ONAGGRO 10977 - -struct boss_anetheronAI : public hyjal_trashAI -{ - boss_anetheronAI(Creature *c) : hyjal_trashAI(c) - { - pInstance = c->GetInstanceData(); - pGo = false; - pos = 0; - SpellEntry *TempSpell = GET_SPELL(SPELL_SLEEP); - if (TempSpell && TempSpell->EffectImplicitTargetA[0] != 1) - { - TempSpell->EffectImplicitTargetA[0] = 1; - TempSpell->EffectImplicitTargetB[0] = 0; - } - } - - uint32 SwarmTimer; - uint32 SleepTimer; - uint32 AuraTimer; - uint32 InfernoTimer; - bool pGo; - uint32 pos; - - void Reset() - { - damageTaken = 0; - SwarmTimer = 45000; - SleepTimer = 60000; - AuraTimer = 5000; - InfernoTimer = 45000; - - if (pInstance && IsEvent) - pInstance->SetData(DATA_ANETHERONEVENT, NOT_STARTED); - } - - void EnterCombat(Unit * /*who*/) - { - if (pInstance && IsEvent) - pInstance->SetData(DATA_ANETHERONEVENT, IN_PROGRESS); - DoPlaySoundToSet(me, SOUND_ONAGGRO); - me->MonsterYell(SAY_ONAGGRO, LANG_UNIVERSAL, 0); - } - - void KilledUnit(Unit * /*victim*/) - { - switch (urand(0,2)) - { - case 0: - DoPlaySoundToSet(me, SOUND_ONSLAY1); - me->MonsterYell(SAY_ONSLAY1, LANG_UNIVERSAL, 0); - break; - case 1: - DoPlaySoundToSet(me, SOUND_ONSLAY2); - me->MonsterYell(SAY_ONSLAY2, LANG_UNIVERSAL, 0); - break; - case 2: - DoPlaySoundToSet(me, SOUND_ONSLAY3); - me->MonsterYell(SAY_ONSLAY3, LANG_UNIVERSAL, 0); - break; - } - } - - void WaypointReached(uint32 i) - { - pos = i; - if (i == 7 && pInstance) - { - Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); - if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0); - } - } - - void JustDied(Unit *victim) - { - hyjal_trashAI::JustDied(victim); - if (pInstance && IsEvent) - pInstance->SetData(DATA_ANETHERONEVENT, DONE); - DoPlaySoundToSet(me, SOUND_ONDEATH); - me->MonsterYell(SAY_ONDEATH, LANG_UNIVERSAL, 0); - } - - void UpdateAI(const uint32 diff) - { - if (IsEvent) - { - //Must update npc_escortAI - npc_escortAI::UpdateAI(diff); - if (!pGo) - { - pGo = true; - if (pInstance) - { - AddWaypoint(0, 4896.08, -1576.35, 1333.65); - AddWaypoint(1, 4898.68, -1615.02, 1329.48); - AddWaypoint(2, 4907.12, -1667.08, 1321.00); - AddWaypoint(3, 4963.18, -1699.35, 1340.51); - AddWaypoint(4, 4989.16, -1716.67, 1335.74); - AddWaypoint(5, 5026.27, -1736.89, 1323.02); - AddWaypoint(6, 5037.77, -1770.56, 1324.36); - AddWaypoint(7, 5067.23, -1789.95, 1321.17); - Start(false, true); - SetDespawnAtEnd(false); - } - } - } - - //Return since we have no target - if (!UpdateVictim()) - return; - - if (SwarmTimer <= diff) - { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_CARRION_SWARM); - - SwarmTimer = urand(45000,60000); - switch (urand(0,1)) - { - case 0: - DoPlaySoundToSet(me, SOUND_SWARM1); - me->MonsterYell(SAY_SWARM1, LANG_UNIVERSAL, 0); - break; - case 1: - DoPlaySoundToSet(me, SOUND_SWARM2); - me->MonsterYell(SAY_SWARM2, LANG_UNIVERSAL, 0); - break; - } - } else SwarmTimer -= diff; - - if (SleepTimer <= diff) - { - for (uint8 i = 0; i < 3; ++i) - { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - pTarget->CastSpell(pTarget,SPELL_SLEEP,true); - } - SleepTimer = 60000; - switch (urand(0,1)) - { - case 0: - DoPlaySoundToSet(me, SOUND_SLEEP1); - me->MonsterYell(SAY_SLEEP1, LANG_UNIVERSAL, 0); - break; - case 1: - DoPlaySoundToSet(me, SOUND_SLEEP2); - me->MonsterYell(SAY_SLEEP2, LANG_UNIVERSAL, 0); - break; - } - } else SleepTimer -= diff; - if (AuraTimer <= diff) - { - DoCast(me, SPELL_VAMPIRIC_AURA, true); - AuraTimer = urand(10000,20000); - } else AuraTimer -= diff; - if (InfernoTimer <= diff) - { - DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true), SPELL_INFERNO); - InfernoTimer = 45000; - switch (urand(0,1)) - { - case 0: - DoPlaySoundToSet(me, SOUND_INFERNO1); - me->MonsterYell(SAY_INFERNO1, LANG_UNIVERSAL, 0); - break; - case 1: - DoPlaySoundToSet(me, SOUND_INFERNO2); - me->MonsterYell(SAY_INFERNO2, LANG_UNIVERSAL, 0); - break; - } - } else InfernoTimer -= diff; - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_boss_anetheron(Creature* pCreature) -{ - return new boss_anetheronAI (pCreature); -} - -#define SPELL_IMMOLATION 31303 -#define SPELL_INFERNO_EFFECT 31302 - -struct mob_towering_infernalAI : public ScriptedAI -{ - mob_towering_infernalAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - if (pInstance) - AnetheronGUID = pInstance->GetData64(DATA_ANETHERON); - } - - uint32 ImmolationTimer; - uint32 CheckTimer; - uint64 AnetheronGUID; - ScriptedInstance* pInstance; - - void Reset() - { - DoCast(me, SPELL_INFERNO_EFFECT); - ImmolationTimer = 5000; - CheckTimer = 5000; - } - - void EnterCombat(Unit * /*who*/) - { - } - - void KilledUnit(Unit * /*victim*/) - { - } - - void JustDied(Unit * /*victim*/) - { - } - - void MoveInLineOfSight(Unit *who) - { - if (me->IsWithinDist(who, 50) && !me->isInCombat() && me->IsHostileTo(who)) - AttackStart(who); - } - - void UpdateAI(const uint32 diff) - { - if (CheckTimer <= diff) - { - if (AnetheronGUID) - { - Creature* boss = Unit::GetCreature((*me),AnetheronGUID); - if (!boss || (boss && boss->isDead())) - { - me->setDeathState(JUST_DIED); - me->RemoveCorpse(); - return; - } - } - CheckTimer = 5000; - } else CheckTimer -= diff; - - //Return since we have no target - if (!UpdateVictim()) - return; - - if (ImmolationTimer <= diff) - { - DoCast(me, SPELL_IMMOLATION); - ImmolationTimer = 5000; - } else ImmolationTimer -= diff; - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_mob_towering_infernal(Creature* pCreature) -{ - return new mob_towering_infernalAI (pCreature); -} - -void AddSC_boss_anetheron() -{ - Script *newscript; - newscript = new Script; - newscript->Name = "boss_anetheron"; - newscript->GetAI = &GetAI_boss_anetheron; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_towering_infernal"; - newscript->GetAI = &GetAI_mob_towering_infernal; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/hyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/hyjal/boss_archimonde.cpp deleted file mode 100644 index 8e1fa378e07..00000000000 --- a/src/server/scripts/Kalimdor/CavernsOfTime/hyjal/boss_archimonde.cpp +++ /dev/null @@ -1,635 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: Boss_Archimonde -SD%Complete: 85 -SDComment: Doomfires not completely offlike due to core limitations for random moving. Tyrande and second phase not fully implemented. -SDCategory: Caverns of Time, Mount Hyjal -EndScriptData */ - -#include "ScriptedPch.h" -#include "hyjal.h" -#include "SpellAuras.h" -#include "hyjal_trash.h" - -//text id -1534018 are the text used when previous events complete. Not part of this script. -#define SAY_AGGRO -1534019 -#define SAY_DOOMFIRE1 -1534020 -#define SAY_DOOMFIRE2 -1534021 -#define SAY_AIR_BURST1 -1534022 -#define SAY_AIR_BURST2 -1534023 -#define SAY_SLAY1 -1534024 -#define SAY_SLAY2 -1534025 -#define SAY_SLAY3 -1534026 -#define SAY_ENRAGE -1534027 -#define SAY_DEATH -1534028 -#define SAY_SOUL_CHARGE1 -1534029 -#define SAY_SOUL_CHARGE2 -1534030 - -#define SPELL_DENOUEMENT_WISP 32124 -#define SPELL_ANCIENT_SPARK 39349 -#define SPELL_PROTECTION_OF_ELUNE 38528 - -#define SPELL_DRAIN_WORLD_TREE 39140 -#define SPELL_DRAIN_WORLD_TREE_2 39141 - -#define SPELL_FINGER_OF_DEATH 31984 -#define SPELL_HAND_OF_DEATH 35354 -#define SPELL_AIR_BURST 32014 -#define SPELL_GRIP_OF_THE_LEGION 31972 -#define SPELL_DOOMFIRE_STRIKE 31903 //summons two creatures -#define SPELL_DOOMFIRE_SPAWN 32074 -#define SPELL_DOOMFIRE 31945 -#define SPELL_SOUL_CHARGE_YELLOW 32045 -#define SPELL_SOUL_CHARGE_GREEN 32051 -#define SPELL_SOUL_CHARGE_RED 32052 -#define SPELL_UNLEASH_SOUL_YELLOW 32054 -#define SPELL_UNLEASH_SOUL_GREEN 32057 -#define SPELL_UNLEASH_SOUL_RED 32053 -#define SPELL_FEAR 31970 - -#define CREATURE_ARCHIMONDE 17968 -#define CREATURE_DOOMFIRE 18095 -#define CREATURE_DOOMFIRE_SPIRIT 18104 -#define CREATURE_ANCIENT_WISP 17946 -#define CREATURE_CHANNEL_TARGET 22418 - -#define NORDRASSIL_X 5503.713 -#define NORDRASSIL_Y -3523.436 -#define NORDRASSIL_Z 1608.781 - -struct mob_ancient_wispAI : public ScriptedAI -{ - mob_ancient_wispAI(Creature* c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - ArchimondeGUID = 0; - } - - ScriptedInstance* pInstance; - uint64 ArchimondeGUID; - uint32 CheckTimer; - - void Reset() - { - CheckTimer = 1000; - - if (pInstance) - ArchimondeGUID = pInstance->GetData64(DATA_ARCHIMONDE); - - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - } - - void EnterCombat(Unit* /*who*/) {} - - void DamageTaken(Unit* /*done_by*/, uint32 &damage) { damage = 0; } - - void UpdateAI(const uint32 diff) - { - if (CheckTimer <= diff) - { - if (Unit* Archimonde = Unit::GetUnit((*me), ArchimondeGUID)) - { - if ((((Archimonde->GetHealth()*100) / Archimonde->GetMaxHealth()) < 2) || !Archimonde->isAlive()) - DoCast(me, SPELL_DENOUEMENT_WISP); - else - DoCast(Archimonde, SPELL_ANCIENT_SPARK); - } - CheckTimer = 1000; - } else CheckTimer -= diff; - } -}; - -/* This script is merely a placeholder for the Doomfire that triggers Doomfire spell. It will - MoveChase the Doomfire Spirit always, until despawn (AttackStart is called upon it's spawn) */ -struct mob_doomfireAI : public ScriptedAI -{ - mob_doomfireAI(Creature* c) : ScriptedAI(c) {} - - void Reset() { } - - void MoveInLineOfSight(Unit* /*who*/) {} - void EnterCombat(Unit* /*who*/) {} - void DamageTaken(Unit * /*done_by*/, uint32 &damage) { damage = 0; } -}; - -/* This is the script for the Doomfire Spirit Mob. This mob simply follow players or - travels in random directions if pTarget cannot be found. */ -struct mob_doomfire_targettingAI : public ScriptedAI -{ - mob_doomfire_targettingAI(Creature* c) : ScriptedAI(c) {} - - uint64 TargetGUID; - uint32 ChangeTargetTimer; - - void Reset() - { - TargetGUID = 0; - ChangeTargetTimer = 5000; - } - - void MoveInLineOfSight(Unit* who) - { - //will update once TargetGUID is 0. In case noone actually moves(not likely) and this is 0 - //when UpdateAI needs it, it will be forced to select randomPoint - if (!TargetGUID && who->GetTypeId() == TYPEID_PLAYER) - TargetGUID = who->GetGUID(); - } - - void EnterCombat(Unit* /*who*/) {} - - void DamageTaken(Unit * /*done_by*/, uint32 &damage) { damage = 0; } - - void UpdateAI(const uint32 diff) - { - if (ChangeTargetTimer <= diff) - { - if (Unit *temp = Unit::GetUnit(*me,TargetGUID)) - { - me->GetMotionMaster()->MoveFollow(temp,0.0f,0.0f); - TargetGUID = 0; - } - else - { - Position pos; - me->GetRandomNearPosition(pos, 40); - me->GetMotionMaster()->MovePoint(0, pos.m_positionX, pos.m_positionY, pos.m_positionZ); - } - - ChangeTargetTimer = 5000; - } else ChangeTargetTimer -= diff; - } -}; - -/* Finally, Archimonde's script. His script isn't extremely complex, most are simply spells on timers. - The only complicated aspect of the battle is Finger of Death and Doomfire, with Doomfire being the - hardest bit to code. Finger of Death is simply a distance check - if no one is in melee range, then - select a random pTarget and cast the spell on them. However, if someone IS in melee range, and this - is NOT the main tank (creature's victim), then we aggro that player and they become the new victim. - For Doomfire, we summon a mob (Doomfire Spirit) for the Doomfire mob to follow. It's spirit will - randomly select it's pTarget to follow and then we create the random movement making it unpredictable. */ - -struct boss_archimondeAI : public hyjal_trashAI -{ - boss_archimondeAI(Creature *c) : hyjal_trashAI(c) - { - pInstance = c->GetInstanceData(); - } - - ScriptedInstance* pInstance; - - uint64 DoomfireSpiritGUID; - uint64 WorldTreeGUID; - - uint32 DrainNordrassilTimer; - uint32 FearTimer; - uint32 AirBurstTimer; - uint32 GripOfTheLegionTimer; - uint32 DoomfireTimer; - uint32 SoulChargeTimer; - uint32 SoulChargeCount; - uint32 MeleeRangeCheckTimer; - uint32 HandOfDeathTimer; - uint32 SummonWispTimer; - uint32 WispCount; - uint32 EnrageTimer; - uint32 CheckDistanceTimer; - - bool Enraged; - bool BelowTenPercent; - bool HasProtected; - bool IsChanneling; - - void Reset() - { - if (pInstance) - pInstance->SetData(DATA_ARCHIMONDEEVENT, NOT_STARTED); - - DoomfireSpiritGUID = 0; - damageTaken = 0; - WorldTreeGUID = 0; - - DrainNordrassilTimer = 0; - FearTimer = 42000; - AirBurstTimer = 30000; - GripOfTheLegionTimer = urand(5000,25000); - DoomfireTimer = 20000; - SoulChargeTimer = urand(2000,30000); - SoulChargeCount = 0; - MeleeRangeCheckTimer = 15000; - HandOfDeathTimer = 2000; - WispCount = 0; // When ~30 wisps are summoned, Archimonde dies - EnrageTimer = 600000; // 10 minutes - CheckDistanceTimer = 30000; // This checks if he's too close to the World Tree (75 yards from a point on the tree), if true then he will enrage - SummonWispTimer = 0; - - Enraged = false; - BelowTenPercent = false; - HasProtected = false; - IsChanneling = false; - } - - void EnterCombat(Unit * /*who*/) - { - me->InterruptSpell(CURRENT_CHANNELED_SPELL); - DoScriptText(SAY_AGGRO, me); - DoZoneInCombat(); - - if (pInstance) - pInstance->SetData(DATA_ARCHIMONDEEVENT, IN_PROGRESS); - } - - void KilledUnit(Unit * victim) - { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2,SAY_SLAY3), me); - - if (victim && (victim->GetTypeId() == TYPEID_PLAYER)) - GainSoulCharge(CAST_PLR(victim)); - } - - void GainSoulCharge(Player* victim) - { - switch(victim->getClass()) - { - case CLASS_PRIEST: - case CLASS_PALADIN: - case CLASS_WARLOCK: - victim->CastSpell(me, SPELL_SOUL_CHARGE_RED, true); - break; - case CLASS_MAGE: - case CLASS_ROGUE: - case CLASS_WARRIOR: - victim->CastSpell(me, SPELL_SOUL_CHARGE_YELLOW, true); - break; - case CLASS_DRUID: - case CLASS_SHAMAN: - case CLASS_HUNTER: - victim->CastSpell(me, SPELL_SOUL_CHARGE_GREEN, true); - break; - } - - SoulChargeTimer = urand(2000,30000); - ++SoulChargeCount; - } - - void JustDied(Unit *victim) - { - hyjal_trashAI::JustDied(victim); - DoScriptText(SAY_DEATH, me); - - if (pInstance) - pInstance->SetData(DATA_ARCHIMONDEEVENT, DONE); - } - - bool CanUseFingerOfDeath() - { - // First we check if our current victim is in melee range or not. - Unit* victim = me->getVictim(); - if (victim && me->IsWithinDistInMap(victim, me->GetAttackDistance(victim))) - return false; - - std::list& m_threatlist = me->getThreatManager().getThreatList(); - if (m_threatlist.empty()) - return false; - - std::list targets; - std::list::const_iterator itr = m_threatlist.begin(); - for (; itr != m_threatlist.end(); ++itr) - { - Unit* pUnit = Unit::GetUnit((*me), (*itr)->getUnitGuid()); - if (pUnit && pUnit->isAlive()) - targets.push_back(pUnit); - } - - if (targets.empty()) - return false; - - targets.sort(Trinity::ObjectDistanceOrderPred(me)); - Unit *pTarget = targets.front(); - if (pTarget) - { - if (!me->IsWithinDistInMap(pTarget, me->GetAttackDistance(pTarget))) - return true; // Cast Finger of Death - else // This target is closest, he is our new tank - me->AddThreat(pTarget, me->getThreatManager().getThreat(me->getVictim())); - } - - return false; - } - - void JustSummoned(Creature *summoned) - { - if (summoned->GetEntry() == CREATURE_ANCIENT_WISP) - summoned->AI()->AttackStart(me); - else - { - summoned->setFaction(me->getFaction()); - summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - } - - if (summoned->GetEntry() == CREATURE_DOOMFIRE_SPIRIT) - { - DoomfireSpiritGUID = summoned->GetGUID(); - } - - if (summoned->GetEntry() == CREATURE_DOOMFIRE) - { - summoned->CastSpell(summoned,SPELL_DOOMFIRE_SPAWN,false); - summoned->CastSpell(summoned,SPELL_DOOMFIRE,true,0,0,me->GetGUID()); - - if (Unit *DoomfireSpirit = Unit::GetUnit(*me, DoomfireSpiritGUID)) - { - summoned->GetMotionMaster()->MoveFollow(DoomfireSpirit,0.0f,0.0f); - DoomfireSpiritGUID = 0; - } - } - } - - //this is code doing close to what the summoning spell would do (spell 31903) - void SummonDoomfire(Unit *pTarget) - { - me->SummonCreature(CREATURE_DOOMFIRE_SPIRIT, - pTarget->GetPositionX()+15.0,pTarget->GetPositionY()+15.0,pTarget->GetPositionZ(),0, - TEMPSUMMON_TIMED_DESPAWN, 27000); - - me->SummonCreature(CREATURE_DOOMFIRE, - pTarget->GetPositionX()-15.0,pTarget->GetPositionY()-15.0,pTarget->GetPositionZ(),0, - TEMPSUMMON_TIMED_DESPAWN, 27000); - } - - void UnleashSoulCharge() - { - me->InterruptNonMeleeSpells(false); - - bool HasCast = false; - uint32 chargeSpell = 0; - uint32 unleashSpell = 0; - - switch (urand(0,2)) - { - case 0: - chargeSpell = SPELL_SOUL_CHARGE_RED; - unleashSpell = SPELL_UNLEASH_SOUL_RED; - break; - case 1: - chargeSpell = SPELL_SOUL_CHARGE_YELLOW; - unleashSpell = SPELL_UNLEASH_SOUL_YELLOW; - break; - case 2: - chargeSpell = SPELL_SOUL_CHARGE_GREEN; - unleashSpell = SPELL_UNLEASH_SOUL_GREEN; - break; - } - - if (me->HasAura(chargeSpell)) - { - me->RemoveAuraFromStack(chargeSpell); - DoCast(me->getVictim(), unleashSpell); - HasCast = true; - SoulChargeCount--; - } - - if (HasCast) - SoulChargeTimer = urand(2000,30000); - } - - void UpdateAI(const uint32 diff) - { - if (!me->isInCombat()) - { - if (pInstance) - { - // Do not let the raid skip straight to Archimonde. Visible and hostile ONLY if Azagalor is finished. - if ((pInstance->GetData(DATA_AZGALOREVENT) < DONE) && ((me->GetVisibility() != VISIBILITY_OFF) || (me->getFaction() != 35))) - { - me->SetVisibility(VISIBILITY_OFF); - me->setFaction(35); - } - else if ((pInstance->GetData(DATA_AZGALOREVENT) >= DONE) && ((me->GetVisibility() != VISIBILITY_ON) || (me->getFaction() == 35))) - { - me->setFaction(1720); - me->SetVisibility(VISIBILITY_ON); - } - } - - if (DrainNordrassilTimer <= diff) - { - if (!IsChanneling) - { - Creature *temp = me->SummonCreature(CREATURE_CHANNEL_TARGET, NORDRASSIL_X, NORDRASSIL_Y, NORDRASSIL_Z, 0, TEMPSUMMON_TIMED_DESPAWN, 1200000); - - if (temp) - WorldTreeGUID = temp->GetGUID(); - - if (Unit *Nordrassil = Unit::GetUnit(*me, WorldTreeGUID)) - { - Nordrassil->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - Nordrassil->SetDisplayId(11686); - DoCast(Nordrassil, SPELL_DRAIN_WORLD_TREE); - IsChanneling = true; - } - } - - if (Unit *Nordrassil = Unit::GetUnit(*me, WorldTreeGUID)) - { - Nordrassil->CastSpell(me, SPELL_DRAIN_WORLD_TREE_2, true); - DrainNordrassilTimer = 1000; - } - } else DrainNordrassilTimer -= diff; - } - - if (!UpdateVictim()) - return; - - if (((me->GetHealth()*100 / me->GetMaxHealth()) < 10) && !BelowTenPercent && !Enraged) - BelowTenPercent = true; - - if (!Enraged) - { - if (EnrageTimer <= diff) - { - if ((me->GetHealth()*100 / me->GetMaxHealth()) > 10) - { - me->GetMotionMaster()->Clear(false); - me->GetMotionMaster()->MoveIdle(); - Enraged = true; - DoScriptText(SAY_ENRAGE, me); - } - } else EnrageTimer -= diff; - - if (CheckDistanceTimer <= diff) - { - // To simplify the check, we simply summon a Creature in the location and then check how far we are from the creature - Creature* Check = me->SummonCreature(CREATURE_CHANNEL_TARGET, NORDRASSIL_X, NORDRASSIL_Y, NORDRASSIL_Z, 0, TEMPSUMMON_TIMED_DESPAWN, 2000); - if (Check) - { - Check->SetVisibility(VISIBILITY_OFF); - - if (me->IsWithinDistInMap(Check, 75)) - { - me->GetMotionMaster()->Clear(false); - me->GetMotionMaster()->MoveIdle(); - Enraged = true; - DoScriptText(SAY_ENRAGE, me); - } - } - CheckDistanceTimer = 5000; - } else CheckDistanceTimer -= diff; - } - - if (BelowTenPercent) - { - if (!HasProtected) - { - me->GetMotionMaster()->Clear(false); - me->GetMotionMaster()->MoveIdle(); - - //all members of raid must get this buff - DoCast(me->getVictim(), SPELL_PROTECTION_OF_ELUNE); - HasProtected = true; - Enraged = true; - } - - if (SummonWispTimer <= diff) - { - DoSpawnCreature(CREATURE_ANCIENT_WISP, rand()%40, rand()%40, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); - SummonWispTimer = 1500; - ++WispCount; - } else SummonWispTimer -= diff; - - if (WispCount >= 30) - me->DealDamage(me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); - } - - if (Enraged) - { - if (HandOfDeathTimer <= diff) - { - DoCast(me->getVictim(), SPELL_HAND_OF_DEATH); - HandOfDeathTimer = 2000; - } else HandOfDeathTimer -= diff; - return; // Don't do anything after this point. - } - - if (SoulChargeCount) - { - if (SoulChargeTimer <= diff) - UnleashSoulCharge(); - else SoulChargeTimer -= diff; - } - - if (GripOfTheLegionTimer <= diff) - { - DoCast(SelectUnit(SELECT_TARGET_RANDOM, 0), SPELL_GRIP_OF_THE_LEGION); - GripOfTheLegionTimer = urand(5000,25000); - } else GripOfTheLegionTimer -= diff; - - if (AirBurstTimer <= diff) - { - if (urand(0,1)) - DoScriptText(SAY_AIR_BURST1, me); - else - DoScriptText(SAY_AIR_BURST2, me); - - DoCast(SelectUnit(SELECT_TARGET_RANDOM, 1), SPELL_AIR_BURST);//not on tank - AirBurstTimer = urand(25000,40000); - } else AirBurstTimer -= diff; - - if (FearTimer <= diff) - { - DoCast(me->getVictim(), SPELL_FEAR); - FearTimer = 42000; - } else FearTimer -= diff; - - if (DoomfireTimer <= diff) - { - if (urand(0,1)) - DoScriptText(SAY_DOOMFIRE1, me); - else - DoScriptText(SAY_DOOMFIRE2, me); - - Unit *temp = SelectUnit(SELECT_TARGET_RANDOM, 1); - if (!temp) - temp = me->getVictim(); - - //replace with spell cast 31903 once implicitTarget 73 implemented - SummonDoomfire(temp); - - //supposedly three doomfire can be up at the same time - DoomfireTimer = 20000; - } else DoomfireTimer -= diff; - - if (MeleeRangeCheckTimer <= diff) - { - if (CanUseFingerOfDeath()) - { - DoCast(SelectUnit(SELECT_TARGET_RANDOM, 0), SPELL_FINGER_OF_DEATH); - MeleeRangeCheckTimer = 1000; - } - - MeleeRangeCheckTimer = 5000; - } else MeleeRangeCheckTimer -= diff; - - DoMeleeAttackIfReady(); - } - void WaypointReached(uint32 /*i*/){} -}; - -CreatureAI* GetAI_boss_archimonde(Creature* pCreature) -{ - return new boss_archimondeAI (pCreature); -} - -CreatureAI* GetAI_mob_doomfire(Creature* pCreature) -{ - return new mob_doomfireAI(pCreature); -} - -CreatureAI* GetAI_mob_doomfire_targetting(Creature* pCreature) -{ - return new mob_doomfire_targettingAI(pCreature); -} - -CreatureAI* GetAI_mob_ancient_wisp(Creature* pCreature) -{ - return new mob_ancient_wispAI(pCreature); -} - -void AddSC_boss_archimonde() -{ - Script *newscript; - newscript = new Script; - newscript->Name = "boss_archimonde"; - newscript->GetAI = &GetAI_boss_archimonde; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_doomfire"; - newscript->GetAI = &GetAI_mob_doomfire; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_doomfire_targetting"; - newscript->GetAI = &GetAI_mob_doomfire_targetting; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_ancient_wisp"; - newscript->GetAI = &GetAI_mob_ancient_wisp; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/hyjal/boss_azgalor.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/hyjal/boss_azgalor.cpp deleted file mode 100644 index 69e37f7f740..00000000000 --- a/src/server/scripts/Kalimdor/CavernsOfTime/hyjal/boss_azgalor.cpp +++ /dev/null @@ -1,285 +0,0 @@ - -#include "ScriptedPch.h" -#include "hyjal.h" -#include "hyjal_trash.h" - -#define SPELL_RAIN_OF_FIRE 31340 -#define SPELL_DOOM 31347 -#define SPELL_HOWL_OF_AZGALOR 31344 -#define SPELL_CLEAVE 31345 -#define SPELL_BERSERK 26662 - -#define SAY_ONDEATH "Your time is almost... up" -#define SOUND_ONDEATH 11002 - -#define SAY_ONSLAY1 "Reesh, hokta!" -#define SAY_ONSLAY2 "Don't fight it" -#define SAY_ONSLAY3 "No one is going to save you" -#define SOUND_ONSLAY1 11001 -#define SOUND_ONSLAY2 11048 -#define SOUND_ONSLAY3 11047 - -#define SAY_DOOM1 "Just a taste... of what awaits you" -#define SAY_DOOM2 "Suffer you despicable insect!" -#define SOUND_DOOM1 11046 -#define SOUND_DOOM2 11000 - -#define SAY_ONAGGRO "Abandon all hope! The legion has returned to finish what was begun so many years ago. This time there will be no escape!" -#define SOUND_ONAGGRO 10999 - -struct boss_azgalorAI : public hyjal_trashAI -{ - boss_azgalorAI(Creature *c) : hyjal_trashAI(c) - { - pInstance = c->GetInstanceData(); - pGo = false; - pos = 0; - SpellEntry *TempSpell = GET_SPELL(SPELL_HOWL_OF_AZGALOR); - if (TempSpell) - TempSpell->EffectRadiusIndex[0] = 12;//100yards instead of 50000?! - } - - uint32 RainTimer; - uint32 DoomTimer; - uint32 HowlTimer; - uint32 CleaveTimer; - uint32 EnrageTimer; - bool enraged; - - bool pGo; - uint32 pos; - - void Reset() - { - damageTaken = 0; - RainTimer = 20000; - DoomTimer = 50000; - HowlTimer = 30000; - CleaveTimer = 10000; - EnrageTimer = 600000; - enraged = false; - - if (pInstance && IsEvent) - pInstance->SetData(DATA_AZGALOREVENT, NOT_STARTED); - } - - void EnterCombat(Unit * /*who*/) - { - if (pInstance && IsEvent) - pInstance->SetData(DATA_AZGALOREVENT, IN_PROGRESS); - DoPlaySoundToSet(me, SOUND_ONAGGRO); - me->MonsterYell(SAY_ONAGGRO, LANG_UNIVERSAL, NULL); - } - - void KilledUnit(Unit * /*victim*/) - { - switch (urand(0,2)) - { - case 0: - DoPlaySoundToSet(me, SOUND_ONSLAY1); - me->MonsterYell(SAY_ONSLAY1, LANG_UNIVERSAL, NULL); - break; - case 1: - DoPlaySoundToSet(me, SOUND_ONSLAY2); - me->MonsterYell(SAY_ONSLAY2, LANG_UNIVERSAL, NULL); - break; - case 2: - DoPlaySoundToSet(me, SOUND_ONSLAY3); - me->MonsterYell(SAY_ONSLAY3, LANG_UNIVERSAL, NULL); - break; - } - } - - void WaypointReached(uint32 i) - { - pos = i; - if (i == 7 && pInstance) - { - Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); - if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0); - } - } - - void JustDied(Unit *victim) - { - hyjal_trashAI::JustDied(victim); - if (pInstance && IsEvent) - pInstance->SetData(DATA_AZGALOREVENT, DONE); - DoPlaySoundToSet(me, SOUND_ONDEATH); - } - - void UpdateAI(const uint32 diff) - { - if (IsEvent) - { - //Must update npc_escortAI - npc_escortAI::UpdateAI(diff); - if (!pGo) - { - pGo = true; - if (pInstance) - { - AddWaypoint(0, 5492.91, -2404.61, 1462.63); - AddWaypoint(1, 5531.76, -2460.87, 1469.55); - AddWaypoint(2, 5554.58, -2514.66, 1476.12); - AddWaypoint(3, 5554.16, -2567.23, 1479.90); - AddWaypoint(4, 5540.67, -2625.99, 1480.89); - AddWaypoint(5, 5508.16, -2659.2, 1480.15); - AddWaypoint(6, 5489.62, -2704.05, 1482.18); - AddWaypoint(7, 5457.04, -2726.26, 1485.10); - Start(false, true); - SetDespawnAtEnd(false); - } - } - } - - //Return since we have no target - if (!UpdateVictim()) - return; - - if (RainTimer <= diff) - { - DoCast(SelectTarget(SELECT_TARGET_RANDOM,0,30,true), SPELL_RAIN_OF_FIRE); - RainTimer = 20000+rand()%15000; - } else RainTimer -= diff; - - if (DoomTimer <= diff) - { - DoCast(SelectTarget(SELECT_TARGET_RANDOM,1,100,true), SPELL_DOOM);//never on tank - DoomTimer = 45000+rand()%5000; - } else DoomTimer -= diff; - - if (HowlTimer <= diff) - { - DoCast(me, SPELL_HOWL_OF_AZGALOR); - HowlTimer = 30000; - } else HowlTimer -= diff; - - if (CleaveTimer <= diff) - { - DoCast(me->getVictim(), SPELL_CLEAVE); - CleaveTimer = 10000+rand()%5000; - } else CleaveTimer -= diff; - - if (EnrageTimer < diff && !enraged) - { - me->InterruptNonMeleeSpells(false); - DoCast(me, SPELL_BERSERK, true); - enraged = true; - EnrageTimer = 600000; - } else EnrageTimer -= diff; - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_boss_azgalor(Creature* pCreature) -{ - return new boss_azgalorAI (pCreature); -} - -#define SPELL_THRASH 12787 -#define SPELL_CRIPPLE 31406 -#define SPELL_WARSTOMP 31408 - -struct mob_lesser_doomguardAI : public hyjal_trashAI -{ - mob_lesser_doomguardAI(Creature *c) : hyjal_trashAI(c) - { - pInstance = c->GetInstanceData(); - if (pInstance) - AzgalorGUID = pInstance->GetData64(DATA_AZGALOR); - } - - uint32 CrippleTimer; - uint32 WarstompTimer; - uint32 CheckTimer; - uint64 AzgalorGUID; - ScriptedInstance* pInstance; - - void Reset() - { - CrippleTimer = 50000; - WarstompTimer = 10000; - DoCast(me, SPELL_THRASH); - CheckTimer = 5000; - } - - void EnterCombat(Unit * /*who*/) - { - } - - void KilledUnit(Unit * /*victim*/) - { - } - - void WaypointReached(uint32 /*i*/) - { - } - - void MoveInLineOfSight(Unit *who) - { - if (me->IsWithinDist(who, 50) && !me->isInCombat() && me->IsHostileTo(who)) - AttackStart(who); - } - - void JustDied(Unit * /*victim*/) - { - } - - void UpdateAI(const uint32 diff) - { - if (CheckTimer <= diff) - { - if (AzgalorGUID) - { - Creature* boss = Unit::GetCreature((*me),AzgalorGUID); - if (!boss || (boss && boss->isDead())) - { - me->setDeathState(JUST_DIED); - me->RemoveCorpse(); - return; - } - } - CheckTimer = 5000; - } else CheckTimer -= diff; - - //Return since we have no target - if (!UpdateVictim()) - return; - - if (WarstompTimer <= diff) - { - DoCast(me, SPELL_WARSTOMP); - WarstompTimer = 10000+rand()%5000; - } else WarstompTimer -= diff; - - if (CrippleTimer <= diff) - { - DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true), SPELL_CRIPPLE); - CrippleTimer = 25000+rand()%5000; - } else CrippleTimer -= diff; - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_mob_lesser_doomguard(Creature* pCreature) -{ - return new mob_lesser_doomguardAI (pCreature); -} - -void AddSC_boss_azgalor() -{ - Script *newscript; - newscript = new Script; - newscript->Name = "boss_azgalor"; - newscript->GetAI = &GetAI_boss_azgalor; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_lesser_doomguard"; - newscript->GetAI = &GetAI_mob_lesser_doomguard; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/hyjal/boss_kazrogal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/hyjal/boss_kazrogal.cpp deleted file mode 100644 index b52d22842e3..00000000000 --- a/src/server/scripts/Kalimdor/CavernsOfTime/hyjal/boss_kazrogal.cpp +++ /dev/null @@ -1,197 +0,0 @@ - -#include "ScriptedPch.h" -#include "hyjal.h" -#include "hyjal_trash.h" - -#define SPELL_CLEAVE 31436 -#define SPELL_WARSTOMP 31480 -#define SPELL_MARK 31447 - -#define SOUND_ONDEATH 11018 - -#define SAY_ONSLAY1 "Shaza-Kiel!" -#define SAY_ONSLAY2 "You... are nothing!" -#define SAY_ONSLAY3 "Miserable nuisance!" -#define SOUND_ONSLAY1 11017 -#define SOUND_ONSLAY2 11053 -#define SOUND_ONSLAY3 11054 - -#define SAY_MARK1 "Your death will be a painful one." -#define SAY_MARK2 "You... are marked." -#define SOUND_MARK1 11016 -#define SOUND_MARK2 11052 - -#define SAY_ONAGGRO "Cry for mercy! Your meaningless lives will soon be forfeit." -#define SOUND_ONAGGRO 11015 - -struct boss_kazrogalAI : public hyjal_trashAI -{ - boss_kazrogalAI(Creature *c) : hyjal_trashAI(c) - { - pInstance = c->GetInstanceData(); - pGo = false; - pos = 0; - SpellEntry *TempSpell = GET_SPELL(SPELL_MARK); - if (TempSpell && TempSpell->EffectImplicitTargetA[0] != 1) - { - TempSpell->EffectImplicitTargetA[0] = 1; - TempSpell->EffectImplicitTargetB[0] = 0; - } - } - - uint32 CleaveTimer; - uint32 WarStompTimer; - uint32 MarkTimer; - uint32 MarkTimerBase; - bool pGo; - uint32 pos; - - void Reset() - { - damageTaken = 0; - CleaveTimer = 5000; - WarStompTimer = 15000; - MarkTimer = 45000; - MarkTimerBase = 45000; - - if (pInstance && IsEvent) - pInstance->SetData(DATA_KAZROGALEVENT, NOT_STARTED); - } - - void EnterCombat(Unit * /*who*/) - { - if (pInstance && IsEvent) - pInstance->SetData(DATA_KAZROGALEVENT, IN_PROGRESS); - DoPlaySoundToSet(me, SOUND_ONAGGRO); - me->MonsterYell(SAY_ONAGGRO, LANG_UNIVERSAL, NULL); - } - - void KilledUnit(Unit * /*victim*/) - { - switch (urand(0,2)) - { - case 0: - DoPlaySoundToSet(me, SOUND_ONSLAY1); - me->MonsterYell(SAY_ONSLAY1, LANG_UNIVERSAL, NULL); - break; - case 1: - DoPlaySoundToSet(me, SOUND_ONSLAY2); - me->MonsterYell(SAY_ONSLAY2, LANG_UNIVERSAL, NULL); - break; - case 2: - DoPlaySoundToSet(me, SOUND_ONSLAY3); - me->MonsterYell(SAY_ONSLAY3, LANG_UNIVERSAL, NULL); - break; - } - } - - void WaypointReached(uint32 i) - { - pos = i; - if (i == 7 && pInstance) - { - Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); - if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0); - } - } - - void JustDied(Unit *victim) - { - hyjal_trashAI::JustDied(victim); - if (pInstance && IsEvent) - pInstance->SetData(DATA_KAZROGALEVENT, DONE); - DoPlaySoundToSet(me, SOUND_ONDEATH); - } - - void UpdateAI(const uint32 diff) - { - if (IsEvent) - { - //Must update npc_escortAI - npc_escortAI::UpdateAI(diff); - if (!pGo) - { - pGo = true; - if (pInstance) - { - AddWaypoint(0, 5492.91, -2404.61, 1462.63); - AddWaypoint(1, 5531.76, -2460.87, 1469.55); - AddWaypoint(2, 5554.58, -2514.66, 1476.12); - AddWaypoint(3, 5554.16, -2567.23, 1479.90); - AddWaypoint(4, 5540.67, -2625.99, 1480.89); - AddWaypoint(5, 5508.16, -2659.2, 1480.15); - AddWaypoint(6, 5489.62, -2704.05, 1482.18); - AddWaypoint(7, 5457.04, -2726.26, 1485.10); - Start(false, true); - SetDespawnAtEnd(false); - } - } - } - - //Return since we have no target - if (!UpdateVictim()) - return; - - if (CleaveTimer <= diff) - { - DoCast(me, SPELL_CLEAVE); - CleaveTimer = 6000+rand()%15000; - } else CleaveTimer -= diff; - - if (WarStompTimer <= diff) - { - DoCast(me, SPELL_WARSTOMP); - WarStompTimer = 60000; - } else WarStompTimer -= diff; - - if (me->HasAura(SPELL_MARK)) - me->RemoveAurasDueToSpell(SPELL_MARK); - if (MarkTimer <= diff) - { - //cast dummy, useful for bos addons - me->CastCustomSpell(me, SPELL_MARK, NULL, NULL, NULL, false, NULL, NULL, me->GetGUID()); - - std::list t_list = me->getThreatManager().getThreatList(); - for (std::list::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) - { - Unit *pTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid()); - if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER && pTarget->getPowerType() == POWER_MANA) - { - pTarget->CastSpell(pTarget, SPELL_MARK,true);//only cast on mana users - } - } - MarkTimerBase -= 5000; - if (MarkTimerBase < 5500) - MarkTimerBase = 5500; - MarkTimer = MarkTimerBase; - switch (urand(0,2)) - { - case 0: - DoPlaySoundToSet(me, SOUND_MARK1); - me->MonsterYell(SAY_MARK1, LANG_UNIVERSAL, NULL); - break; - case 1: - DoPlaySoundToSet(me, SOUND_MARK2); - me->MonsterYell(SAY_MARK2, LANG_UNIVERSAL, NULL); - break; - } - } else MarkTimer -= diff; - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_boss_kazrogal(Creature* pCreature) -{ - return new boss_kazrogalAI (pCreature); -} - -void AddSC_boss_kazrogal() -{ - Script *newscript; - newscript = new Script; - newscript->Name = "boss_kazrogal"; - newscript->GetAI = &GetAI_boss_kazrogal; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/hyjal/boss_rage_winterchill.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/hyjal/boss_rage_winterchill.cpp deleted file mode 100644 index 7465b997117..00000000000 --- a/src/server/scripts/Kalimdor/CavernsOfTime/hyjal/boss_rage_winterchill.cpp +++ /dev/null @@ -1,192 +0,0 @@ - -#include "ScriptedPch.h" -#include "hyjal.h" -#include "hyjal_trash.h" - -#define SPELL_FROST_ARMOR 31256 -#define SPELL_DEATH_AND_DECAY 31258 - -#define SPELL_FROST_NOVA 31250 -#define SPELL_ICEBOLT 31249 - -#define SAY_ONDEATH "You have won this battle, but not... the... war" -#define SOUND_ONDEATH 11026 - -#define SAY_ONSLAY1 "All life must perish!" -#define SAY_ONSLAY2 "Victory to the Legion!" -#define SOUND_ONSLAY1 11025 -#define SOUND_ONSLAY2 11057 - -#define SAY_DECAY1 "Crumble and rot!" -#define SAY_DECAY2 "Ashes to ashes, dust to dust" -#define SOUND_DECAY1 11023 -#define SOUND_DECAY2 11055 - -#define SAY_NOVA1 "Succumb to the icy chill... of death!" -#define SAY_NOVA2 "It will be much colder in your grave" -#define SOUND_NOVA1 11024 -#define SOUND_NOVA2 11058 - -#define SAY_ONAGGRO "The Legion's final conquest has begun! Once again the subjugation of this world is within our grasp. Let none survive!" -#define SOUND_ONAGGRO 11022 - -struct boss_rage_winterchillAI : public hyjal_trashAI -{ - boss_rage_winterchillAI(Creature *c) : hyjal_trashAI(c) - { - pInstance = c->GetInstanceData(); - pGo = false; - pos = 0; - } - - uint32 FrostArmorTimer; - uint32 DecayTimer; - uint32 NovaTimer; - uint32 IceboltTimer; - bool pGo; - uint32 pos; - - void Reset() - { - damageTaken = 0; - FrostArmorTimer = 37000; - DecayTimer = 45000; - NovaTimer = 15000; - IceboltTimer = 10000; - - if (pInstance && IsEvent) - pInstance->SetData(DATA_RAGEWINTERCHILLEVENT, NOT_STARTED); - } - - void EnterCombat(Unit * /*who*/) - { - if (pInstance && IsEvent) - pInstance->SetData(DATA_RAGEWINTERCHILLEVENT, IN_PROGRESS); - DoPlaySoundToSet(me, SOUND_ONAGGRO); - me->MonsterYell(SAY_ONAGGRO, LANG_UNIVERSAL, 0); - } - - void KilledUnit(Unit * /*victim*/) - { - switch (urand(0,1)) - { - case 0: - DoPlaySoundToSet(me, SOUND_ONSLAY1); - me->MonsterYell(SAY_ONSLAY1, LANG_UNIVERSAL, NULL); - break; - case 1: - DoPlaySoundToSet(me, SOUND_ONSLAY2); - me->MonsterYell(SAY_ONSLAY2, LANG_UNIVERSAL, NULL); - break; - } - } - - void WaypointReached(uint32 i) - { - pos = i; - if (i == 7 && pInstance) - { - Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); - if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0f); - } - } - - void JustDied(Unit *victim) - { - hyjal_trashAI::JustDied(victim); - if (pInstance && IsEvent) - pInstance->SetData(DATA_RAGEWINTERCHILLEVENT, DONE); - DoPlaySoundToSet(me, SOUND_ONDEATH); - me->MonsterYell(SAY_ONDEATH, LANG_UNIVERSAL, NULL); - } - - void UpdateAI(const uint32 diff) - { - if (IsEvent) - { - //Must update npc_escortAI - npc_escortAI::UpdateAI(diff); - if (!pGo) - { - pGo = true; - if (pInstance) - { - AddWaypoint(0, 4896.08, -1576.35, 1333.65); - AddWaypoint(1, 4898.68, -1615.02, 1329.48); - AddWaypoint(2, 4907.12, -1667.08, 1321.00); - AddWaypoint(3, 4963.18, -1699.35, 1340.51); - AddWaypoint(4, 4989.16, -1716.67, 1335.74); - AddWaypoint(5, 5026.27, -1736.89, 1323.02); - AddWaypoint(6, 5037.77, -1770.56, 1324.36); - AddWaypoint(7, 5067.23, -1789.95, 1321.17); - Start(false, true); - SetDespawnAtEnd(false); - } - } - } - - //Return since we have no target - if (!UpdateVictim()) - return; - - if (FrostArmorTimer <= diff) - { - DoCast(me, SPELL_FROST_ARMOR); - FrostArmorTimer = 40000+rand()%20000; - } else FrostArmorTimer -= diff; - if (DecayTimer <= diff) - { - DoCast(me->getVictim(), SPELL_DEATH_AND_DECAY); - DecayTimer = 60000+rand()%20000; - switch (urand(0,1)) - { - case 0: - DoPlaySoundToSet(me, SOUND_DECAY1); - me->MonsterYell(SAY_DECAY1, LANG_UNIVERSAL, NULL); - break; - case 1: - DoPlaySoundToSet(me, SOUND_DECAY2); - me->MonsterYell(SAY_DECAY2, LANG_UNIVERSAL, NULL); - break; - } - } else DecayTimer -= diff; - if (NovaTimer <= diff) - { - DoCast(me->getVictim(), SPELL_FROST_NOVA); - NovaTimer = 30000+rand()%15000; - switch (urand(0,1)) - { - case 0: - DoPlaySoundToSet(me, SOUND_NOVA1); - me->MonsterYell(SAY_NOVA1, LANG_UNIVERSAL, NULL); - break; - case 1: - DoPlaySoundToSet(me, SOUND_NOVA2); - me->MonsterYell(SAY_NOVA2, LANG_UNIVERSAL, NULL); - break; - } - } else NovaTimer -= diff; - if (IceboltTimer <= diff) - { - DoCast(SelectTarget(SELECT_TARGET_RANDOM,0,40,true), SPELL_ICEBOLT); - IceboltTimer = 11000+rand()%20000; - } else IceboltTimer -= diff; - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_boss_rage_winterchill(Creature* pCreature) -{ - return new boss_rage_winterchillAI (pCreature); -} - -void AddSC_boss_rage_winterchill() -{ - Script *newscript; - newscript = new Script; - newscript->Name = "boss_rage_winterchill"; - newscript->GetAI = &GetAI_boss_rage_winterchill; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/hyjal/hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/hyjal/hyjal.cpp deleted file mode 100644 index 16a050939cc..00000000000 --- a/src/server/scripts/Kalimdor/CavernsOfTime/hyjal/hyjal.cpp +++ /dev/null @@ -1,247 +0,0 @@ - /* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: Hyjal -SD%Complete: 80 -SDComment: gossip text id's unknown -SDCategory: Caverns of Time, Mount Hyjal -EndScriptData */ - -/* ContentData -npc_jaina_proudmoore -npc_thrall -npc_tyrande_whisperwind -EndContentData */ - -#include "ScriptedPch.h" -#include "hyjalAI.h" - -#define GOSSIP_ITEM_BEGIN_ALLY "My companions and I are with you, Lady Proudmoore." -#define GOSSIP_ITEM_ANETHERON "We are ready for whatever Archimonde might send our way, Lady Proudmoore." - -#define GOSSIP_ITEM_BEGIN_HORDE "I am with you, Thrall." -#define GOSSIP_ITEM_AZGALOR "We have nothing to fear." - -#define GOSSIP_ITEM_RETREAT "We can't keep this up. Let's retreat!" - -#define GOSSIP_ITEM_TYRANDE "Aid us in defending Nordrassil" -#define ITEM_TEAR_OF_GODDESS 24494 - -#define GOSSIP_ITEM_GM1 "[GM] Toggle Debug Timers" - -CreatureAI* GetAI_npc_jaina_proudmoore(Creature* pCreature) -{ - hyjalAI* ai = new hyjalAI(pCreature); - - ai->Reset(); - ai->EnterEvadeMode(); - - ai->Spell[0].SpellId = SPELL_BLIZZARD; - ai->Spell[0].Cooldown = 15000 + rand()%20000; - ai->Spell[0].TargetType = TARGETTYPE_RANDOM; - - ai->Spell[1].SpellId = SPELL_PYROBLAST; - ai->Spell[1].Cooldown = 5500 + rand()%4000; - ai->Spell[1].TargetType = TARGETTYPE_RANDOM; - - ai->Spell[2].SpellId = SPELL_SUMMON_ELEMENTALS; - ai->Spell[2].Cooldown = 15000 + rand()%30000; - ai->Spell[2].TargetType = TARGETTYPE_SELF; - - return ai; -} - -bool GossipHello_npc_jaina_proudmoore(Player* pPlayer, Creature* pCreature) -{ - hyjalAI* ai = CAST_AI(hyjalAI, pCreature->AI()); - if (ai->EventBegun) - return false; - - uint32 RageEncounter = ai->GetInstanceData(DATA_RAGEWINTERCHILLEVENT); - uint32 AnetheronEncounter = ai->GetInstanceData(DATA_ANETHERONEVENT); - if (RageEncounter == NOT_STARTED) - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BEGIN_ALLY, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - else if (RageEncounter == DONE && AnetheronEncounter == NOT_STARTED) - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ANETHERON, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - else if (RageEncounter == DONE && AnetheronEncounter == DONE) - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_RETREAT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); - - if (pPlayer->isGameMaster()) - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_ITEM_GM1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); - - pPlayer->SEND_GOSSIP_MENU(907, pCreature->GetGUID()); - return true; -} - -bool GossipSelect_npc_jaina_proudmoore(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) -{ - hyjalAI* ai = CAST_AI(hyjalAI, pCreature->AI()); - switch(uiAction) - { - case GOSSIP_ACTION_INFO_DEF + 1: - ai->StartEvent(pPlayer); - break; - case GOSSIP_ACTION_INFO_DEF + 2: - ai->FirstBossDead = true; - ai->WaveCount = 9; - ai->StartEvent(pPlayer); - break; - case GOSSIP_ACTION_INFO_DEF + 3: - ai->Retreat(); - break; - case GOSSIP_ACTION_INFO_DEF: - ai->Debug = !ai->Debug; - debug_log("TSCR: HyjalAI - Debug mode has been toggled"); - break; - } - return true; -} - -CreatureAI* GetAI_npc_thrall(Creature* pCreature) -{ - hyjalAI* ai = new hyjalAI(pCreature); - - ai->Reset(); - ai->EnterEvadeMode(); - - ai->Spell[0].SpellId = SPELL_CHAIN_LIGHTNING; - ai->Spell[0].Cooldown = 3000 + rand()%5000; - ai->Spell[0].TargetType = TARGETTYPE_VICTIM; - - ai->Spell[1].SpellId = SPELL_SUMMON_DIRE_WOLF; - ai->Spell[1].Cooldown = 6000 + rand()%35000; - ai->Spell[1].TargetType = TARGETTYPE_RANDOM; - - return ai; -} - -bool GossipHello_npc_thrall(Player* pPlayer, Creature* pCreature) -{ - hyjalAI* ai = CAST_AI(hyjalAI, pCreature->AI()); - if (ai->EventBegun) - return false; - - uint32 AnetheronEvent = ai->GetInstanceData(DATA_ANETHERONEVENT); - // Only let them start the Horde phases if Anetheron is dead. - if (AnetheronEvent == DONE && ai->GetInstanceData(DATA_ALLIANCE_RETREAT)) - { - uint32 KazrogalEvent = ai->GetInstanceData(DATA_KAZROGALEVENT); - uint32 AzgalorEvent = ai->GetInstanceData(DATA_AZGALOREVENT); - if (KazrogalEvent == NOT_STARTED) - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BEGIN_HORDE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - else if (KazrogalEvent == DONE && AzgalorEvent == NOT_STARTED) - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_AZGALOR, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - else if (AzgalorEvent == DONE) - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_RETREAT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); - } - - if (pPlayer->isGameMaster()) - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_ITEM_GM1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); - - pPlayer->SEND_GOSSIP_MENU(907, pCreature->GetGUID()); - return true; -} - -bool GossipSelect_npc_thrall(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) -{ - hyjalAI* ai = CAST_AI(hyjalAI, pCreature->AI()); - ai->DeSpawnVeins();//despawn the alliance veins - switch(uiAction) - { - case GOSSIP_ACTION_INFO_DEF + 1: - ai->StartEvent(pPlayer); - break; - case GOSSIP_ACTION_INFO_DEF + 2: - ai->FirstBossDead = true; - ai->WaveCount = 9; - ai->StartEvent(pPlayer); - break; - case GOSSIP_ACTION_INFO_DEF + 3: - ai->Retreat(); - break; - case GOSSIP_ACTION_INFO_DEF: - ai->Debug = !ai->Debug; - debug_log("TSCR: HyjalAI - Debug mode has been toggled"); - break; - } - return true; -} - -CreatureAI* GetAI_npc_tyrande_whisperwind(Creature* pCreature) -{ - hyjalAI* ai = new hyjalAI(pCreature); - ai->Reset(); - ai->EnterEvadeMode(); - return ai; -} - -bool GossipHello_npc_tyrande_whisperwind(Player* pPlayer, Creature* pCreature) -{ - hyjalAI* ai = CAST_AI(hyjalAI, pCreature->AI()); - uint32 AzgalorEvent = ai->GetInstanceData(DATA_AZGALOREVENT); - - // Only let them get item if Azgalor is dead. - if (AzgalorEvent == DONE && !pPlayer->HasItemCount(ITEM_TEAR_OF_GODDESS,1)) - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TYRANDE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); - pPlayer->SEND_GOSSIP_MENU(907, pCreature->GetGUID()); - return true; -} - -bool GossipSelect_npc_tyrande_whisperwind(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) -{ - if (uiAction == GOSSIP_ACTION_INFO_DEF) - { - ItemPosCountVec dest; - uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, ITEM_TEAR_OF_GODDESS, 1); - if (msg == EQUIP_ERR_OK) - { - Item* item = pPlayer->StoreNewItem(dest, ITEM_TEAR_OF_GODDESS, true); - if (item && pPlayer) - pPlayer->SendNewItem(item,1,true,false,true); - } - pPlayer->SEND_GOSSIP_MENU(907, pCreature->GetGUID()); - CAST_AI(hyjalAI, pCreature->AI()); - } - return true; -} - -void AddSC_hyjal() -{ - Script *newscript; - - newscript = new Script; - newscript->Name = "npc_jaina_proudmoore"; - newscript->GetAI = &GetAI_npc_jaina_proudmoore; - newscript->pGossipHello = &GossipHello_npc_jaina_proudmoore; - newscript->pGossipSelect = &GossipSelect_npc_jaina_proudmoore; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "npc_thrall"; - newscript->GetAI = &GetAI_npc_thrall; - newscript->pGossipHello = &GossipHello_npc_thrall; - newscript->pGossipSelect = &GossipSelect_npc_thrall; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "npc_tyrande_whisperwind"; - newscript->pGossipHello = &GossipHello_npc_tyrande_whisperwind; - newscript->pGossipSelect = &GossipSelect_npc_tyrande_whisperwind; - newscript->GetAI = &GetAI_npc_tyrande_whisperwind; - newscript->RegisterSelf(); -} - diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/hyjal/hyjal.h b/src/server/scripts/Kalimdor/CavernsOfTime/hyjal/hyjal.h deleted file mode 100644 index bfc9a54dfd9..00000000000 --- a/src/server/scripts/Kalimdor/CavernsOfTime/hyjal/hyjal.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software licensed under GPL version 2 - * Please see the included DOCS/LICENSE.TXT for more information */ - -#ifndef DEF_HYJAL_H -#define DEF_HYJAL_H - -#define ERROR_INST_DATA "TSCR: Instance data not set properly for Mount Hyjal. Encounters will be buggy." - -enum eTypes -{ - WORLD_STATE_WAVES = 2842, - WORLD_STATE_ENEMY = 2453, - WORLD_STATE_ENEMYCOUNT = 2454, - - DATA_ANETHERON = 1, - DATA_ANETHERONEVENT = 2, - DATA_ARCHIMONDE = 3, - DATA_ARCHIMONDEEVENT = 4, - DATA_AZGALOR = 5, - DATA_AZGALOREVENT = 6, - DATA_JAINAPROUDMOORE = 7, - DATA_KAZROGAL = 8, - DATA_KAZROGALEVENT = 9, - DATA_RAGEWINTERCHILL = 10, - DATA_RAGEWINTERCHILLEVENT = 11, - DATA_THRALL = 12, - DATA_TYRANDEWHISPERWIND = 13, - DATA_TRASH = 14, - DATA_RESET_TRASH_COUNT = 15, - DATA_ALLIANCE_RETREAT = 16, - DATA_HORDE_RETREAT = 17, - DATA_RAIDDAMAGE = 18, - DATA_RESET_RAIDDAMAGE = 19, - TYPE_RETREAT = 20 -}; -#endif - diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/hyjal/hyjalAI.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/hyjal/hyjalAI.cpp deleted file mode 100644 index 3c12b54f3f4..00000000000 --- a/src/server/scripts/Kalimdor/CavernsOfTime/hyjal/hyjalAI.cpp +++ /dev/null @@ -1,1157 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: HyjalAI -SD%Complete: 90 -SDComment: -SDCategory: Caverns of Time, Mount Hyjal -EndScriptData */ - -#include "ScriptedPch.h" -#include "hyjalAI.h" -#include "hyjal_trash.h" -#include "MapManager.h" -#include "Language.h" -#include "Chat.h" -#include "Object.h" - -#define SPAWN_GARG_GATE 0 -#define SPAWN_WYRM_GATE 1 -#define SPAWN_NEAR_TOWER 2 - -#define YELL_HURRY "Hurry, we don't have much time" - -// Locations for summoning gargoyls and frost wyrms in special cases -float SpawnPointSpecial[3][3]= -{ - {5497.08, -2493.23, 1535.72}, //spawn point for the gargoyles near the horde gate - {5624.53, -2548.12, 1551.54}, //spawn point for the frost wyrm near the horde gate - {5604.41, -2811.98, 1547.77} //spawn point for the gargoyles and wyrms near the horde tower -}; - -// Locations for summoning waves in Alliance base -float AllianceBase[4][3]= -{ - {4928.48, -1526.38, 1326.83}, - {4923.54, -1514.29, 1327.98}, - {4928.41, -1510.35, 1327.99}, - {4938.35, -1521.00, 1326.69} -}; - -float JainaDummySpawn[2][4]= -{ - {5497.01, -2719.03, 1483.08, 2.90426}, - {5484.98, -2721.69, 1483.39, 6.00656} -}; - -// Locations for summoning waves in Horde base -float HordeBase[4][3]= -{ - {5458.01, -2340.27, 1459.60}, - {5466.01, -2334.69, 1460.06}, - {5468.45, -2355.13, 1459.99}, - {5479.06, -2344.16, 1461.74} -}; - -// Lady Jaina's waypoints when retreathing -float JainaWPs[2][3]= -{ - {5078.56, -1789.79, 1320.73},//next to the small stairs - {5037.38, -1778.39, 1322.61},//center of alliance base -}; - -float InfernalPos[8][3]=//spawn points for the infernals in the horde base -{ - {5453.59, -2764.52, 1493.50}, - {5478.4, -2781.77, 1497.52}, - {5506.09, -2780.53, 1496.32}, - {5532.1, -2763.42, 1492.37}, - {5544.16, -2733.99, 1487.14}, - {5536.19, -2708.18, 1480.01}, - {5510.16, -2691.75, 1479.66}, - {5482.39, -2689.19, 1481.09} -}; - -float InfernalSPWP[26][4]=//spawn points for the infernals in the horde base used in the cleaning wave -{ - {5490.96, -2718.72, 1482.96, 0.49773}, - {5449.51, -2723.32, 1485.69, 2.69685}, - {5520.83, -2624.68, 1483.82, 1.20459}, - {5558.28, -2629.26, 1485.76, 0.37992}, - {5567.97, -2758.69, 1494.10, 5.04125}, - {5384.90, -2793.47, 1503.90, 5.55412}, - {5495.33, -2814.06, 1501.56, 1.12055}, - {5472.63, -2929.39, 1538.31, 1.95777}, - {5334.72, -2952.29, 1534.34, 0.50869}, - {5398.36, -2872.46, 1512.38, 0.76787}, - {5514.39, -2768.63, 1492.30, 1.55721}, - {5598.91, -2703.75, 1495.64, 2.56644}, - {5467.80, -2655.93, 1482.27, 0.85819}, - {5399.83, -2985.24, 1545.04, 5.92559}, - {5232.13, -2967.05, 1553.09, 5.41351}, - {5272.02, -3082.52, 1567.09, 3.40681}, - {5343.26, -3120.71, 1582.92, 3.16727}, - {5371.26, -3175.24, 1587.41, 6.10466}, - {5434.67, -3177.91, 1579.25, 2.77850}, - {5237.39, -3149.25, 1593.59, 0.83855}, - {5202.15, -3016.64, 1566.28, 3.31256}, - {5302.54, -2914.37, 1528.53, 3.37146}, - {5439.04, -2834.81, 1508.80, 2.14231}, - {5421.33, -2771.04, 1494.28, 6.06223}, - {5549.76, -2692.93, 1482.68, 2.19414}, - {5459.78, -2755.71, 1490.68, 1.05139} -}; - -float VeinPos[14][8]=//spawn points of the ancient gem veins -{ - {5184.84, -1982.59, 1382.66, 2.58079, 0, 0, 0.960944, 0.276742}, //alliance - {5107.66, -2071.16, 1368.37, 2.65148, 0, 0, 0.970124, 0.242611}, //alliance - {5040.53, -2227.65, 1403.17, 3.35049, 0, 0, 0.99455, -0.104257}, //alliance - {5187.59, -2453.12, 1455.51, 5.87943, 0, 0, 0.20051, -0.979692}, //alliance - {5429.43, -2340.65, 1465.38, 4.7681, 0, 0, 0.687138, -0.726527}, //alliance - {5463.99, -2315.95, 1470.29, 1.52045, 0, 0, 0.689084, 0.724682}, //alliance - {5624.65, -2495.09, 1510.11, 0.0124869, 0, 0, 0.00624342, 0.999981}, //alliance - {5285.41, -3348.32, 1663.01, 1.57152, 0, 0, 0.707362, 0.706852}, //horde - {5417.69, -3372.52, 1656.31, 0.361993, 0, 0, 0.18001, 0.983665}, //horde - {5315.34, -3238.32, 1622.88, 3.03627, 0, 0, 0.998614, 0.0526347}, //horde - {5303.4, -3096.44, 1596.41, 1.72073, 0, 0, 0.758081, 0.65216}, //horde - {5265.13, -3177.27, 1616.22, 0.813604, 0, 0, 0.395674, 0.918391}, //horde - {5374.3, -3420.59, 1653.43, 1.45762, 0, 0, 0.665981, 0.745969}, //horde - {5441.54, -3321.59, 1651.55, 0.258306, 0, 0, 0.128794, 0.991671} //horde -}; - -float AllianceOverrunGargPos[5][4]=//gargoyle spawn points in the alliance overrun -{ - {5279.94, -2049.68, 1311.38, 0},//garg1 - {5289.15, -2219.06, 1291.12, 0},//garg2 - {5202.07, -2136.10, 1305.07, 2.8},//garg3 - {5071.52, -2425.63, 1454.48, 5.54},//garg4 - {5120.65, -2467.92, 1463.93, 2.54}//garg5 -}; - -float AllianceFirePos[92][8]=//spawn points for the fire visuals (GO) in the alliance base -{ - {5039.9, -1796.84, 1323.88, 2.59222, 0, 0, 0.962511, 0.271243}, - {5087.2, -1795.2, 1320.68, 1.03946, 0, 0, 0.496644, 0.867954}, - {5112.68, -1806.66, 1359.93, 1.37799, 0, 0, 0.63576, 0.771887}, - {5095.61, -1793.27, 1359.78, 0.580806, 0, 0, 0.286338, 0.958129}, - {5090.43, -1784.45, 1360.44, 0.796784, 0, 0, 0.387937, 0.921686}, - {5139.25, -1783.11, 1359.39, 3.30849, 0, 0, 0.99652, -0.0833509}, - {5112.16, -1763.72, 1361.35, 5.10312, 0, 0, 0.556388, -0.830922}, - {4981.18, -1793.98, 1335.7, 3.23072, 0, 0, 0.999007, -0.0445498}, - {4996.57, -1766.75, 1341.62, 3.5331, 0, 0, 0.980902, -0.194505}, - {4983.74, -1769.25, 1345.75, 3.79228, 0, 0, 0.947541, -0.319635}, - {4996.01, -1774.43, 1330.71, 3.07364, 0, 0, 0.999423, 0.0339693}, - {5094.2, -1726.13, 1330.55, 1.56175, 0, 0, 0.703901, 0.710298}, - {5079.82, -1721.24, 1336.26, 1.18868, 0, 0, 0.559964, 0.828517}, - {5077.68, -1717.15, 1327.78, 0.0145145, 0, 0, 0.00725717, 0.999974}, - {5122.27, -1738.22, 1341.67, 0.835256, 0, 0, 0.405593, 0.914054}, - {5131.88, -1741.15, 1335.25, 2.15472, 0, 0, 0.880712, 0.473653}, - {5196.93, -1772.99, 1345.2, 0.128397, 0, 0, 0.0641544, 0.99794}, - {5225.33, -1756.06, 1344.17, 3.04223, 0, 0, 0.998766, 0.0496599}, - {5224.84, -1767.05, 1360.06, 3.19538, 0, 0, 0.999638, -0.0268922}, - {5202.05, -1763.47, 1361.68, 2.59455, 0, 0, 0.962826, 0.270122}, - {5194.74, -1766.66, 1356.94, 0.0734191, 0, 0, 0.0367013, 0.999326}, - {5159.67, -1832.97, 1344.5, 5.17457, 0, 0, 0.526356, -0.850264}, - {5096.17, -1858.73, 1332.46, 5.30021, 0, 0, 0.471939, -0.881631}, - {5110.7, -1856.59, 1342.84, 5.97564, 0, 0, 0.153167, -0.9882}, - {5109.76, -1855.3, 1332.38, 4.89572, 0, 0, 0.639411, -0.768865}, - {5068.95, -1837.37, 1328.81, 2.61569, 0, 0, 0.965628, 0.25993}, - {5064.4, -1824.77, 1329.02, 2.16409, 0, 0, 0.88292, 0.469524}, - {5059.89, -1848.79, 1329.59, 0.0709955, 0, 0, 0.0354903, 0.99937}, - {5014.37, -1851.39, 1322.56, 4.66949, 0, 0, 0.722111, -0.691777}, - {5025.1, -1848.27, 1323.39, 4.44565, 0, 0, 0.794854, -0.606801}, - {4942.63, -1890.13, 1326.59, 3.28719, 0, 0, 0.997351, -0.0727343}, - {4937.95, -1888.71, 1352.41, 3.41678, 0, 0, 0.990549, -0.13716}, - {4922.48, -1881.92, 1352.41, 5.03077, 0, 0, 0.586075, -0.810257}, - {4915.35, -1894.32, 1351.24, 6.22457, 0, 0, 0.0293048, -0.999571}, - {4922.71, -1904.84, 1352.56, 1.37866, 0, 0, 0.63602, 0.771672}, - {4932.89, -1905.49, 1352.56, 1.89702, 0, 0, 0.812549, 0.582893}, - {5011.83, -1861.05, 1345.86, 4.43777, 0, 0, 0.797239, -0.603664}, - {5011.83, -1861.05, 1363.26, 4.748, 0, 0, 0.694406, -0.719583}, - {5021.46, -1858.35, 1342.17, 4.86188, 0, 0, 0.652329, -0.757936}, - {4995.02, -1698.3, 1370.38, 6.15779, 0, 0, 0.0626579, -0.998035}, - {5119.85, -1728.9, 1336.04, 5.87112, 0, 0, 0.204579, -0.97885}, - {5214.75, -1751.02, 1342.5, 5.08965, 0, 0, 0.561972, -0.827156}, - {5075.04, -1822.43, 1328.87, 3.99951, 0, 0, 0.9094, -0.415924}, - {5057.09, -1823.32, 1350.35, 3.88169, 0, 0, 0.93231, -0.361659}, - {4984.6, -1816.99, 1329.21, 3.05308, 0, 0, 0.999021, 0.0442417}, - {4983.35, -1811.55, 1356.82, 3.33975, 0, 0, 0.995096, -0.098917}, - {4984.11, -1825.73, 1350.76, 2.26375, 0, 0, 0.905211, 0.424962}, - {4968.47, -1786.46, 1354.09, 3.07663, 0, 0, 0.999473, 0.0324733}, - {5061.82, -1751.16, 1339.07, 5.94727, 0, 0, 0.167171, -0.985928}, - {5063.75, -1763, 1351.91, 0.759707, 0, 0, 0.370784, 0.928719}, - {5078.65, -1708.26, 1353.9, 1.27022, 0, 0, 0.593264, 0.805008}, - {4983.19, -1755.96, 1331.13, 4.28221, 0, 0, 0.841733, -0.539894}, - {4972.76, -1755.3, 1332.5, 4.21938, 0, 0, 0.858276, -0.513188}, - {4961.65, -1760.82, 1351.69, 3.56515, 0, 0, 0.977659, -0.210198}, - {5086.45, -1779.83, 1321.62, 6.23157, 0, 0, 0.0258051, -0.999667}, - {5063.15, -1756.74, 1328.56, 0.886926, 0, 0, 0.42907, 0.903271}, - {5042.45, -1800.61, 1323.88, 2.50093, 0, 0, 0.949131, 0.31488}, - {5084.74, -1725.35, 1327.89, 1.65034, 0, 0, 0.734663, 0.678432}, - {4993.25, -1758.1, 1331.07, 3.49995, 0, 0, 0.98399, -0.178223}, - {5078.53, -1867.85, 1348.91, 5.85612, 0, 0, 0.211913, -0.977288}, - {5080.74, -1869.73, 1333.18, 6.18206, 0, 0, 0.0505424, -0.998722}, - {5089.55, -1894.13, 1356.08, 1.52072, 0, 0, 0.689181, 0.724589}, - {5113.24, -1899.49, 1363.77, 1.50108, 0, 0, 0.682034, 0.731321}, - {4984.18, -1907.69, 1325.62, 3.82193, 0, 0, 0.942698, -0.333646}, - {5094.14, -2432.08, 1429.38, 4.70083, 0, 0, 0.711182, -0.703007}, - {5329.89, -2113.30, 1281.06, 5.60560, 0, 0, 0.332347, -0.943157}, - {5170.87, -2148.13, 1278.32, 1.63540, 0, 0, 0.729573, 0.683903 }, - {5132.94, -1960.25, 1367.8, 3.69787, 0, 0, 0.961568, -0.274566}, - {5280.82, -2351.55, 1431.57, 4.46913, 0, 0, 0.787677, -0.616088}, - {5176.78, -2121.43, 1295.27, 3.24153, 0, 0, 0.998752, -0.04995}, - {5332.75, -2101.41, 1296.37, 5.50350, 0, 0, 0.380043, -0.924969}, - {5265.70, -2050.27, 1287.57, 0.50051, 0, 0, 0.247655, 0.968848 }, - {5194.21, -2129.89, 1274.04, 3.08053, 0, 0, 0.999534, 0.0305272}, - {5225.81, -1985.50, 1364.15, 0.37247, 0, 0, 0.185163, 0.982708 }, - {5339.46, -2204.47, 1280.45, 0.99921, 0, 0, 0.479081, 0.877771 }, - {5269.63, -2020.57, 1299.62, 3.00201, 0, 0, 0.997566, 0.0697332}, - {5111.54, -2445.70, 1435.31, 2.70983, 0, 0, 0.976788, 0.214207 }, - {5111.24, -1901.14, 1355.33, 1.61028, 0, 0, 0.720929, 0.693009 }, - {5310.42, -2207.82, 1277.46, 0.50441, 0, 0, 0.249544, 0.968363 }, - {5150.81, -2042.13, 1394.3, 2.21031, 0, 0, 0.893534, 0.448995 }, - {5224.84, -2376.61, 1366.33, 5.0621, 0, 0, 0.573311, -0.819338}, - {5105.41, -2454.86, 1446.16, 4.64584, 0, 0, 0.730239, -0.683191}, - {5309.65, -2188.28, 1266.84, 5.56631, 0, 0, 0.350811, -0.936446}, - {5281.46, -2047.82, 1287.67, 2.44909, 0, 0, 0.940652, 0.339373 }, - {5325.45, -2189.41, 1309.6, 6.23783, 0, 0, 0.0226771, -0.999743}, - {5190.96, -2142.54, 1293.03, 6.25668, 0, 0, 0.0132544, -0.999912}, - {5089.99, -2467.49, 1441.8, 0.77381, 0, 0, 0.377326, 0.92608 }, - {5195.08, -2129.01, 1285.36, 3.55727, 0, 0, 0.978480, -0.206344}, - {5353.76, -2116.28, 1299.27, 6.17894, 0, 0, 0.0521006, -0.998642}, - {5271.14, -2037.38, 1299.24, 4.07879, 0, 0, 0.892201, -0.451638}, - {5332.5 , -2181.28, 1279.95, 4.6906, 0, 0, 0.714768, -0.699362}, - {5108.2 , -2429.84, 1427.73, 4.5194, 0, 0, 0.771943, -0.635691} -}; - -float HordeFirePos[65][8]=//spawn points for the fire visuals (GO) in the horde base -{ - {5524.11, -2612.73, 1483.38, 1.96198, 0, 0, 0.831047, 0.556202}, - {5514.42, -2617.19, 1505.77, 1.82453, 0, 0, 0.790892, 0.611956}, - {5510.21, -2624.77, 1485.34, 1.71065, 0, 0, 0.754783, 0.655974}, - {5570.72, -2619.04, 1487.62, 0.728898, 0, 0, 0.356435, 0.93432}, - {5570.29, -2639.37, 1487.31, 1.49308, 0, 0, 0.679104, 0.734042}, - {5583.56, -2637.2, 1503.78, 1.46559, 0, 0, 0.668951, 0.743307}, - {5571.53, -2626.81, 1510.99, 0.362107, 0, 0, 0.180066, 0.983654}, - {5545.97, -2659.62, 1489.64, 5.07055, 0, 0, 0.569845, -0.821752}, - {5557.44, -2675.91, 1482.58, 1.70118, 0, 0, 0.751671, 0.659539}, - {5594.98, -2742.31, 1495.51, 4.5993, 0, 0, 0.74594, -0.666013}, - {5599.65, -2755.6, 1505.05, 1.66896, 0, 0, 0.740947, 0.671564}, - {5565.95, -2774.75, 1499.48, 6.22425, 0, 0, 0.0294611, -0.999566}, - {5567.1, -2769.7, 1511.17, 5.99257, 0, 0, 0.144799, -0.989461}, - {5572.84, -2774.16, 1527.06, 0.836428, 0, 0, 0.406129, 0.913816}, - {5538.32, -2805.94, 1498.87, 4.30082, 0, 0, 0.836674, -0.547701}, - {5515.66, -2801.74, 1503.53, 5.57316, 0, 0, 0.347602, -0.937642}, - {5516.76, -2827.14, 1501.15, 0.35026, 0, 0, 0.174236, 0.984704}, - {5536.13, -2813.51, 1537.21, 4.51681, 0, 0, 0.772765, -0.634692}, - {5525.05, -2825.16, 1538.53, 0.489275, 0, 0, 0.242205, 0.970225}, - {5534.42, -2815.45, 1562.84, 4.62834, 0, 0, 0.736191, -0.676774}, - {5519.64, -2831.12, 1526.46, 0.611008, 0, 0, 0.300774, 0.953696}, - {5551.04, -2827.55, 1523.5, 3.35206, 0, 0, 0.994468, -0.10504}, - {5469.22, -2802.87, 1503.5, 4.99509, 0, 0, 0.600436, -0.799673}, - {5427.8, -2737.26, 1487.12, 1.78673, 0, 0, 0.779186, 0.626793}, - {5454.1, -2709.1, 1485.92, 3.03552, 0, 0, 0.998594, 0.0530137}, - {5436.3, -2718.2, 1506.02, 2.7567, 0, 0, 0.981539, 0.191261}, - {5412.6, -2740.55, 1510.79, 2.98446, 0, 0, 0.996915, 0.0784832}, - {5406.12, -2752.48, 1521.01, 2.05769, 0, 0, 0.856705, 0.515807}, - {5445.24, -2676.35, 1521.89, 2.91378, 0, 0, 0.99352, 0.113661}, - {5481.4, -2665.08, 1482.23, 4.30001, 0, 0, 0.836895, -0.547363}, - {5443.51, -2675.44, 1487.12, 2.90986, 0, 0, 0.993295, 0.115606}, - {5391.72, -2647.3, 1528.9, 3.76987, 0, 0, 0.951063, -0.308997}, - {5421.09, -2734.12, 1521.01, 2.70567, 0, 0, 0.97634, 0.216242}, - {5405.39, -2710.33, 1533.77, 2.51324, 0, 0, 0.951052, 0.309032}, - {5423.96, -2703.76, 1516.34, 2.79206, 0, 0, 0.984767, 0.173879}, - {5444.75, -2735.23, 1486.37, 2.22657, 0, 0, 0.897155, 0.441715}, - {5570.98, -2747.91, 1495.7, 5.14433, 0, 0, 0.53915, -0.84221}, - {5567.79, -2673.9, 1484.66, 2.72529, 0, 0, 0.978415, 0.20665}, - {5600.71, -2696.8, 1500.42, 0.443704, 0, 0, 0.220036, 0.975492}, - {5600.7, -2693.04, 1515.2, 5.16003, 0, 0, 0.532522, -0.846416}, - {5627.56, -2839.66, 1510.53, 5.41527, 0, 0, 0.420463, -0.907309}, - {5622.02, -2868.71, 1516.22, 2.25482, 0, 0, 0.903303, 0.429002}, - {5586.61, -2878.97, 1510.34, 4.55604, 0, 0, 0.76017, -0.649724}, - {5583.78, -2843.71, 1509.54, 5.35715, 0, 0, 0.44665, -0.894709}, - {5580.95, -2811.3, 1513.3, 3.57587, 0, 0, 0.976518, -0.215434}, - {5542.52, -2869.31, 1523.13, 5.23304, 0, 0, 0.501275, -0.865288}, - {5557.35, -2866.36, 1518.76, 4.48299, 0, 0, 0.783388, -0.621533}, - {5380.91, -2849.36, 1512.81, 3.90962, 0, 0, 0.927168, -0.374646}, - {5395.76, -2881.41, 1521.11, 4.28426, 0, 0, 0.84118, -0.540755}, - {5374.87, -2859.63, 1528.98, 3.30252, 0, 0, 0.996765, -0.0803745}, - {5356.07, -2854.66, 1520.34, 5.83933, 0, 0, 0.220108, -0.975475}, - {5363.01, -2975.72, 1539.02, 4.13738, 0, 0, 0.87859, -0.477576}, - {5336.85, -2980.74, 1561.24, 5.11126, 0, 0, 0.553001, -0.83318}, - {5335.23, -2974.62, 1540.05, 5.04451, 0, 0, 0.580496, -0.814263}, - {5422.37, -2998.87, 1549.98, 4.51831, 0, 0, 0.772288, -0.635272}, - {5405.54, -3014.6, 1562.16, 5.86761, 0, 0, 0.206298, -0.978489}, - {5427.96, -3019.4, 1561.58, 3.53498, 0, 0, 0.980718, -0.19543}, - {5348.12, -2977.84, 1582.47, 3.94025, 0, 0, 0.921323, -0.388799}, - {5331.12, -2993.71, 1576.14, 0.0642734, 0, 0, 0.0321311, 0.999484}, - {5321.63, -2986.55, 1552.2, 5.29503, 0, 0, 0.474219, -0.880407}, - {5292.1, -2914.36, 1529.52, 2.9742, 0, 0, 0.996499, 0.083601}, - {5281.77, -2926.5, 1530.62, 1.67829, 0, 0, 0.744071, 0.6681}, - {5287.19, -2909.94, 1543.49, 3.31192, 0, 0, 0.996376, -0.0850591}, - {5534.15, -2679.35, 1483.61, 0.428685, 0, 0, 0.212705, 0.977116}, - {5545.43, -2647.82, 1483.05, 5.38848, 0, 0, 0.432578, -0.901596} -}; - -hyjalAI::hyjalAI(Creature *c) : npc_escortAI(c), Summons(me) -{ - pInstance = c->GetInstanceData(); - VeinsSpawned[0] = false; - VeinsSpawned[1] = false; - for (uint8 i=0; i<14; ++i) - VeinGUID[i] = 0; - InfernalCount = 0; - TeleportTimer = 1000; - Overrun = false; - Teleported = false; - WaitForTeleport = false; - OverrunCounter = 0; - OverrunCounter2 = 0; - InfernalPoint = 0; - RespawnTimer = 10000; - DoRespawn = false; - DoHide = false; - MassTeleportTimer = 0; - DoMassTeleport = false; -} - -void hyjalAI::JustSummoned(Creature *summoned) -{ - Summons.Summon(summoned); -} - -void hyjalAI::SummonedCreatureDespawn(Creature* summoned) -{ - Summons.Despawn(summoned); -} - -void hyjalAI::Reset() -{ - IsDummy = false; - me->setActive(true); - // GUIDs - PlayerGUID = 0; - BossGUID[0] = 0; - BossGUID[1] = 0; - - // Timers - NextWaveTimer = 10000; - CheckTimer = 0; - RetreatTimer = 1000; - - // Misc - WaveCount = 0; - EnemyCount = 0; - - // Set faction properly based on Creature entry - switch(me->GetEntry()) - { - case JAINA: - Faction = 0; - DoCast(me, SPELL_BRILLIANCE_AURA, true); - break; - - case THRALL: - Faction = 1; - break; - - case TYRANDE: - Faction = 2; - break; - } - - //Bools - EventBegun = false; - FirstBossDead = false; - SecondBossDead = false; - Summon = false; - bRetreat = false; - Debug = false; - - //Flags - me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - - //Initialize spells - memset(Spell, 0, sizeof(Spell)); - - //Reset Instance Data for trash count - if (pInstance) - { - if ((!pInstance->GetData(DATA_ALLIANCE_RETREAT) && me->GetEntry() == JAINA) || (pInstance->GetData(DATA_ALLIANCE_RETREAT) && me->GetEntry() == THRALL)) - { - //Reset World States - pInstance->DoUpdateWorldState(WORLD_STATE_WAVES, 0); - pInstance->DoUpdateWorldState(WORLD_STATE_ENEMY, 0); - pInstance->DoUpdateWorldState(WORLD_STATE_ENEMYCOUNT, 0); - pInstance->SetData(DATA_RESET_TRASH_COUNT, 0); - } - } else error_log(ERROR_INST_DATA); - - //Visibility - DoHide = true; -} - -void hyjalAI::EnterEvadeMode() -{ - if (me->GetEntry() != JAINA) - me->RemoveAllAuras(); - me->DeleteThreatList(); - me->CombatStop(true); - me->LoadCreaturesAddon(); - - if (me->isAlive()) - me->GetMotionMaster()->MoveTargetedHome(); - - me->SetLootRecipient(NULL); -} - -void hyjalAI::EnterCombat(Unit * /*who*/) -{ - if (IsDummy)return; - for (uint8 i = 0; i < 3; ++i) - if (Spell[i].Cooldown) - SpellTimer[i] = Spell[i].Cooldown; - - Talk(ATTACKED); -} - -void hyjalAI::MoveInLineOfSight(Unit *who) -{ - if (IsDummy) - return; - - npc_escortAI::MoveInLineOfSight(who); -} - -void hyjalAI::SummonCreature(uint32 entry, float Base[4][3]) -{ - uint32 random = rand()%4; - float SpawnLoc[3]; - - for (uint8 i = 0; i < 3; ++i) - { - SpawnLoc[i] = Base[random][i]; - } - Creature* pCreature = NULL; - switch(entry) - { - case 17906: //GARGOYLE - - if (!FirstBossDead && (WaveCount == 1 || WaveCount == 3)) - {//summon at tower - pCreature = me->SummonCreature(entry, SpawnPointSpecial[SPAWN_NEAR_TOWER][0]+irand(-20,20), SpawnPointSpecial[SPAWN_NEAR_TOWER][1]+irand(-20,20), SpawnPointSpecial[SPAWN_NEAR_TOWER][2]+irand(-10,10), 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000); - if (pCreature) - CAST_AI(hyjal_trashAI, pCreature->AI())->useFlyPath = true; - }else{//summon at gate - pCreature = me->SummonCreature(entry, SpawnPointSpecial[SPAWN_GARG_GATE][0]+irand(-10,10), SpawnPointSpecial[SPAWN_GARG_GATE][1]+irand(-10,10), SpawnPointSpecial[SPAWN_GARG_GATE][2]+irand(-10,10), 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000); - } - break; - case 17907: //FROST_WYRM , - if (FirstBossDead && WaveCount == 1) //summon at gate - pCreature = me->SummonCreature(entry, SpawnPointSpecial[SPAWN_WYRM_GATE][0],SpawnPointSpecial[SPAWN_WYRM_GATE][1],SpawnPointSpecial[SPAWN_WYRM_GATE][2], 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000); - else - { - pCreature = me->SummonCreature(entry, SpawnPointSpecial[SPAWN_NEAR_TOWER][0], SpawnPointSpecial[SPAWN_NEAR_TOWER][1],SpawnPointSpecial[SPAWN_NEAR_TOWER][2], 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000); - if (pCreature) - CAST_AI(hyjal_trashAI, pCreature->AI())->useFlyPath = true; - } - break; - case 17908: //GIANT_INFERNAL - ++InfernalCount; - if (InfernalCount > 7) - InfernalCount = 0; - pCreature = me->SummonCreature(entry, InfernalPos[InfernalCount][0], InfernalPos[InfernalCount][1], InfernalPos[InfernalCount][2], 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000); - break; - default: - pCreature = me->SummonCreature(entry, SpawnLoc[0], SpawnLoc[1], SpawnLoc[2], 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000); - break; - - } - - if (pCreature) - { - // Increment Enemy Count to be used in World States and instance script - ++EnemyCount; - - pCreature->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE); - pCreature->setActive(true); - switch(entry) - { - case NECROMANCER: - case ABOMINATION: - case GHOUL: - case BANSHEE: - case CRYPT_FIEND: - case GARGOYLE: - case FROST_WYRM: - case GIANT_INFERNAL: - case FEL_STALKER: - case RAGE_WINTERCHILL: - case ANETHERON: - case KAZROGAL: - case AZGALOR: - CAST_AI(hyjal_trashAI, pCreature->AI())->IsEvent = true; - break; - } - if (pInstance) - { - if (pInstance->GetData(DATA_RAIDDAMAGE) < MINRAIDDAMAGE) - pCreature->SetDisableReputationGain(true);//no repu for solo farming - } - // Check if Creature is a boss. - if (pCreature->isWorldBoss()) - { - if (!FirstBossDead) BossGUID[0] = pCreature->GetGUID(); - else BossGUID[1] = pCreature->GetGUID(); - CheckTimer = 5000; - } - } -} - -void hyjalAI::SummonNextWave(Wave wave[18], uint32 Count, float Base[4][3]) -{ - // 1 in 4 chance we give a rally yell. Not sure if the chance is offilike. - if (rand()%4 == 0) - Talk(RALLY); - - if (!pInstance) - { - error_log(ERROR_INST_DATA); - return; - } - InfernalCount = 0;//reset infernal count every new wave - - EnemyCount = pInstance->GetData(DATA_TRASH); - for (uint8 i = 0; i < 18; ++i) - { - if (wave[Count].Mob[i]) - SummonCreature(wave[Count].Mob[i], Base); - } - - if (!wave[Count].IsBoss) - { - uint32 stateValue = Count+1; - if (FirstBossDead) - stateValue -= 9; // Subtract 9 from it to give the proper wave number if we are greater than 8 - - // Set world state to our current wave number - pInstance->DoUpdateWorldState(WORLD_STATE_WAVES, stateValue); // Set world state to our current wave number - // Enable world state - pInstance->DoUpdateWorldState(WORLD_STATE_ENEMY, 1); // Enable world state - - pInstance->SetData(DATA_TRASH, EnemyCount); // Send data for instance script to update count - - if (!Debug) - NextWaveTimer = wave[Count].WaveTimer; - else - { - NextWaveTimer = 15000; - debug_log("TSCR: HyjalAI: debug mode is enabled. Next Wave in 15 seconds"); - } - } - else - { - // Set world state for waves to 0 to disable it. - pInstance->DoUpdateWorldState(WORLD_STATE_WAVES, 0); - pInstance->DoUpdateWorldState(WORLD_STATE_ENEMY, 1); - - // Set World State for enemies invading to 1. - pInstance->DoUpdateWorldState(WORLD_STATE_ENEMYCOUNT, 1); - - Summon = false; - } - CheckTimer = 5000; -} - -void hyjalAI::StartEvent(Player* pPlayer) -{ - if (!pPlayer || IsDummy || !pInstance) - return; - - Talk(BEGIN); - - EventBegun = true; - Summon = true; - - NextWaveTimer = 15000; - CheckTimer = 5000; - PlayerGUID = pPlayer->GetGUID(); - - me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - - pInstance->DoUpdateWorldState(WORLD_STATE_WAVES, 0); - pInstance->DoUpdateWorldState(WORLD_STATE_ENEMY, 0); - pInstance->DoUpdateWorldState(WORLD_STATE_ENEMYCOUNT, 0); - - DeSpawnVeins(); -} - -uint32 hyjalAI::GetInstanceData(uint32 Event) -{ - if (pInstance) - return pInstance->GetData(Event); - else error_log(ERROR_INST_DATA); - - return 0; -} - -void hyjalAI::Talk(uint32 id) -{ - std::list index; - for (uint8 i = 0; i < 9; ++i) - { - if (Faction == 0) // Alliance - { - if (JainaQuotes[i].id == id) - index.push_back(i); - } - else if (Faction == 1) // Horde - { - if (ThrallQuotes[i].id == id) - index.push_back(i); - } - } - - if (index.empty()) - return; // No quotes found, no use to continue - - uint8 ind = *(index.begin()) + rand()%index.size(); - - int32 YellId = 0; - if (Faction == 0) // Alliance - { - YellId = JainaQuotes[ind].textid; - } - else if (Faction == 1) // Horde - { - YellId = ThrallQuotes[ind].textid; - } - - if (YellId) - DoScriptText(YellId, me); -} - -void hyjalAI::Retreat() -{ - if (pInstance) - { - pInstance->SetData(TYPE_RETREAT,SPECIAL); - - if (Faction == 0) - { - pInstance->SetData(DATA_ALLIANCE_RETREAT, 1); - AddWaypoint(0,JainaWPs[0][0],JainaWPs[0][1],JainaWPs[0][2]); - AddWaypoint(1,JainaWPs[1][0],JainaWPs[1][1],JainaWPs[1][2]); - Start(false, false); - SetDespawnAtEnd(false);//move to center of alliance base - } - if (Faction == 1) - { - pInstance->SetData(DATA_HORDE_RETREAT, 1); - Creature* JainaDummy = me->SummonCreature(JAINA,JainaDummySpawn[0][0],JainaDummySpawn[0][1],JainaDummySpawn[0][2],JainaDummySpawn[0][3],TEMPSUMMON_TIMED_DESPAWN,60000); - if (JainaDummy) - { - JainaDummy->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - CAST_AI(hyjalAI, JainaDummy->AI())->IsDummy = true; - DummyGuid = JainaDummy->GetGUID(); - } - AddWaypoint(0,JainaDummySpawn[1][0],JainaDummySpawn[1][1],JainaDummySpawn[1][2]); - Start(false, false); - SetDespawnAtEnd(false);//move to center of alliance base - } - } - SpawnVeins(); - Overrun = true; - me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);//cant talk after overrun event started -} - -void hyjalAI::SpawnVeins() -{ - if (Faction == 0) - { - if (VeinsSpawned[0])//prevent any buggers - return; - for (uint8 i = 0; i<7; ++i) - { - GameObject* gem = me->SummonGameObject(ANCIENT_VEIN,VeinPos[i][0],VeinPos[i][1],VeinPos[i][2],VeinPos[i][3],VeinPos[i][4],VeinPos[i][5],VeinPos[i][6],VeinPos[i][7],0); - if (gem) - VeinGUID[i]=gem->GetGUID(); - } - VeinsSpawned[0] = true; - }else{ - if (VeinsSpawned[1]) - return; - for (uint8 i = 7; i<14; ++i) - { - GameObject* gem = me->SummonGameObject(ANCIENT_VEIN,VeinPos[i][0],VeinPos[i][1],VeinPos[i][2],VeinPos[i][3],VeinPos[i][4],VeinPos[i][5],VeinPos[i][6],VeinPos[i][7],0); - if (gem) - VeinGUID[i]=gem->GetGUID(); - } - VeinsSpawned[1] = true; - } -} - -void hyjalAI::DeSpawnVeins() -{ - if (!pInstance) - return; - if (Faction == 1) - { - Creature* pUnit=Unit::GetCreature((*me),pInstance->GetData64(DATA_JAINAPROUDMOORE)); - if (!pUnit)return; - hyjalAI* ai = CAST_AI(hyjalAI, pUnit->AI()); - if (!ai)return; - for (uint8 i = 0; i<7; ++i) - { - if (GameObject* gem = pInstance->instance->GetGameObject(pInstance->GetData64(ai->VeinGUID[i]))) - gem->Delete(); - } - } else if (Faction) - { - Creature* pUnit=Unit::GetCreature((*me),pInstance->GetData64(DATA_THRALL)); - if (!pUnit)return; - hyjalAI* ai = CAST_AI(hyjalAI, pUnit->AI()); - if (!ai)return; - for (uint8 i = 7; i<14; ++i) - { - if (GameObject* gem = pInstance->instance->GetGameObject(pInstance->GetData64(ai->VeinGUID[i]))) - gem->Delete(); - } - } -} - -void hyjalAI::UpdateAI(const uint32 diff) -{ - if (IsDummy) - { - if (MassTeleportTimer < diff && DoMassTeleport) - { - DoCast(me, SPELL_MASS_TELEPORT, false); - DoMassTeleport = false; - } else MassTeleportTimer -= diff; - return; - } - if (DoHide) - { - DoHide = false; - switch(me->GetEntry()) - { - case JAINA: - if (pInstance && pInstance->GetData(DATA_ALLIANCE_RETREAT)) - { - me->SetVisibility(VISIBILITY_OFF); - HideNearPos(me->GetPositionX(), me->GetPositionY()); - HideNearPos(5037.76, -1889.71); - for (uint8 i = 0; i < 92; ++i)//summon fires - me->SummonGameObject(FLAMEOBJECT,AllianceFirePos[i][0],AllianceFirePos[i][1],AllianceFirePos[i][2],AllianceFirePos[i][3],AllianceFirePos[i][4],AllianceFirePos[i][5],AllianceFirePos[i][6],AllianceFirePos[i][7],0); - - } - else me->SetVisibility(VISIBILITY_ON); - break; - case THRALL: //thrall - if (pInstance && pInstance->GetData(DATA_HORDE_RETREAT)) - { - me->SetVisibility(VISIBILITY_OFF); - HideNearPos(me->GetPositionX(), me->GetPositionY()); - HideNearPos(5563, -2763.19); - HideNearPos(5542.2, -2629.36); - for (uint8 i = 0; i < 65; ++i)//summon fires - me->SummonGameObject(FLAMEOBJECT,HordeFirePos[i][0],HordeFirePos[i][1],HordeFirePos[i][2],HordeFirePos[i][3],HordeFirePos[i][4],HordeFirePos[i][5],HordeFirePos[i][6],HordeFirePos[i][7],0); - - } - else me->SetVisibility(VISIBILITY_ON); - break; - } - } - if (DoRespawn) - { - if (RespawnTimer <= diff) - { - DoRespawn = false; - RespawnNearPos(me->GetPositionX(), me->GetPositionY()); - if (Faction == 0) - { - RespawnNearPos(5037.76, -1889.71); - } else if (Faction == 1) - { - RespawnNearPos(5563, -2763.19); - RespawnNearPos(5542.2, -2629.36); - } - me->SetVisibility(VISIBILITY_ON); - }else{ - RespawnTimer -= diff; - me->SetVisibility(VISIBILITY_OFF); - } - return; - } - if (Overrun) - DoOverrun(Faction, diff); - if (bRetreat) - { - if (RetreatTimer <= diff) - { - IsDummy = true; - bRetreat = false; - HideNearPos(me->GetPositionX(), me->GetPositionY()); - switch(me->GetEntry()) - { - case JAINA://jaina - HideNearPos(5037.76, -1889.71); - break; - case THRALL://thrall - HideNearPos(5563, -2763.19); - HideNearPos(5542.2, -2629.36); - HideNearPos(5603.75, -2853.12); - break; - } - me->SetVisibility(VISIBILITY_OFF); - } else RetreatTimer -= diff; - } - - if (!EventBegun) - return; - - if (Summon) - { - if (pInstance && EnemyCount) - { - EnemyCount = pInstance->GetData(DATA_TRASH); - if (!EnemyCount) - NextWaveTimer = 5000; - } - - if (NextWaveTimer <= diff) - { - if (Faction == 0) - SummonNextWave(AllianceWaves, WaveCount, AllianceBase); - else if (Faction == 1) - SummonNextWave(HordeWaves, WaveCount, HordeBase); - ++WaveCount; - } else NextWaveTimer -= diff; - } - - if (CheckTimer <= diff) - { - for (uint8 i = 0; i < 2; ++i) - { - if (BossGUID[i]) - { - Unit* pUnit = Unit::GetUnit((*me), BossGUID[i]); - if (pUnit && (!pUnit->isAlive())) - { - if (BossGUID[i] == BossGUID[0]) - { - Talk(INCOMING); - FirstBossDead = true; - } - else if (BossGUID[i] == BossGUID[1]) - { - Talk(SUCCESS); - SecondBossDead = true; - } - EventBegun = false; - CheckTimer = 0; - me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - BossGUID[i] = 0; - if (pInstance) - pInstance->DoUpdateWorldState(WORLD_STATE_ENEMY, 0); // Reset world state for enemies to disable it - } - } - } - CheckTimer = 5000; - } else CheckTimer -= diff; - - if (!UpdateVictim()) - return; - - for (uint8 i = 0; i < 3; ++i) - { - if (Spell[i].SpellId) - { - if (SpellTimer[i] <= diff) - { - if (me->IsNonMeleeSpellCasted(false)) - me->InterruptNonMeleeSpells(false); - - Unit *pTarget = NULL; - - switch(Spell[i].TargetType) - { - case TARGETTYPE_SELF: pTarget = me; break; - case TARGETTYPE_RANDOM: pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); break; - case TARGETTYPE_VICTIM: pTarget = me->getVictim(); break; - } - - if (pTarget && pTarget->isAlive()) - { - DoCast(pTarget, Spell[i].SpellId); - SpellTimer[i] = Spell[i].Cooldown; - } - } else SpellTimer[i] -= diff; - } - } - - DoMeleeAttackIfReady(); -} -void hyjalAI::JustDied(Unit* /*killer*/) -{ - if (IsDummy)return; - me->Respawn(); - me->SetVisibility(VISIBILITY_OFF); - DoRespawn = true; - RespawnTimer = 120000; - Talk(DEATH); - Summons.DespawnAll();//despawn all wave's summons - if (pInstance) - {//reset encounter if boss is despawned (ex: thrall is killed, boss despawns, event stucks at inprogress) - if (pInstance->GetData(DATA_RAGEWINTERCHILLEVENT) == IN_PROGRESS) - pInstance->SetData(DATA_RAGEWINTERCHILLEVENT, NOT_STARTED); - if (pInstance->GetData(DATA_ANETHERONEVENT) == IN_PROGRESS) - pInstance->SetData(DATA_ANETHERONEVENT, NOT_STARTED); - if (pInstance->GetData(DATA_KAZROGALEVENT) == IN_PROGRESS) - pInstance->SetData(DATA_KAZROGALEVENT, NOT_STARTED); - if (pInstance->GetData(DATA_AZGALOREVENT) == IN_PROGRESS) - pInstance->SetData(DATA_AZGALOREVENT, NOT_STARTED); - pInstance->SetData(DATA_RESET_RAIDDAMAGE, NULL);//reset damage on die - } -} -void hyjalAI::HideNearPos(float x, float y) -{ - CellPair pair(Trinity::ComputeCellPair(x, y)); - Cell cell(pair); - cell.data.Part.reserved = ALL_DISTRICT; - cell.SetNoCreate(); - - // First get all creatures. - std::list creatures; - Trinity::AllFriendlyCreaturesInGrid creature_check(me); - Trinity::CreatureListSearcher creature_searcher(me, creatures, creature_check); - TypeContainerVisitor - , - GridTypeMapContainer> creature_visitor(creature_searcher); - - // Get Creatures - cell.Visit(pair, creature_visitor, *(me->GetMap())); - - if (!creatures.empty()) - { - for (std::list::const_iterator itr = creatures.begin(); itr != creatures.end(); ++itr) - { - (*itr)->SetVisibility(VISIBILITY_OFF); - (*itr)->setFaction(35);//make them friendly so mobs won't attack them - } - } -} -void hyjalAI::RespawnNearPos(float x, float y) -{ - CellPair p(Trinity::ComputeCellPair(x, y)); - Cell cell(p); - cell.data.Part.reserved = ALL_DISTRICT; - cell.SetNoCreate(); - - Trinity::RespawnDo u_do; - Trinity::WorldObjectWorker worker(me, u_do); - TypeContainerVisitor, GridTypeMapContainer > obj_worker(worker); - cell.Visit(p, obj_worker, *me->GetMap()); -} -void hyjalAI::WaypointReached(uint32 i) -{ - if (i == 1 || (i == 0 && me->GetEntry() == THRALL)) - { - me->MonsterYell(YELL_HURRY,0,0); - WaitForTeleport = true; - TeleportTimer = 20000; - if (me->GetEntry() == JAINA) - DoCast(me, SPELL_MASS_TELEPORT, false); - if (me->GetEntry() == THRALL && DummyGuid) - { - Unit* Dummy = Unit::GetUnit((*me),DummyGuid); - if (Dummy) - { - CAST_AI(hyjalAI, CAST_CRE(Dummy)->AI())->DoMassTeleport = true; - CAST_AI(hyjalAI, CAST_CRE(Dummy)->AI())->MassTeleportTimer = 20000; - Dummy->CastSpell(me, SPELL_MASS_TELEPORT, false); - } - } - //do some talking - //all alive guards walk near here - CellPair pair(Trinity::ComputeCellPair(me->GetPositionX(), me->GetPositionY())); - Cell cell(pair); - cell.data.Part.reserved = ALL_DISTRICT; - cell.SetNoCreate(); - - // First get all creatures. - std::list creatures; - Trinity::AllFriendlyCreaturesInGrid creature_check(me); - Trinity::CreatureListSearcher creature_searcher(me, creatures, creature_check); - TypeContainerVisitor - , - GridTypeMapContainer> creature_visitor(creature_searcher); - - cell.Visit(pair, creature_visitor, *(me->GetMap())); - - if (!creatures.empty()) - { - for (std::list::const_iterator itr = creatures.begin(); itr != creatures.end(); ++itr) - { - if ((*itr) && (*itr)->isAlive() && (*itr) != me && (*itr)->GetEntry() != JAINA) - { - if (!(*itr)->IsWithinDist(me, 60)) - (*itr)->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE); - float x, y, z; - (*itr)->SetDefaultMovementType(IDLE_MOTION_TYPE); - (*itr)->GetMotionMaster()->Initialize(); - float range = 10; - if (me->GetEntry() == THRALL)range = 20; - me->GetNearPoint(me, x, y, z, range, 0, me->GetAngle((*itr))); - (*itr)->GetMotionMaster()->MovePoint(0, x+irand(-5,5), y+irand(-5,5), me->GetPositionZ()); - } - } - } - } -} -void hyjalAI::DoOverrun(uint32 faction, const uint32 diff) -{ - npc_escortAI::UpdateAI(diff); - if (WaitForTeleport) - { - if (TeleportTimer <= diff) - { - CellPair pair(Trinity::ComputeCellPair(me->GetPositionX(), me->GetPositionY())); - Cell cell(pair); - cell.data.Part.reserved = ALL_DISTRICT; - cell.SetNoCreate(); - - std::list creatures; - Trinity::AllFriendlyCreaturesInGrid creature_check(me); - Trinity::CreatureListSearcher creature_searcher(me, creatures, creature_check); - TypeContainerVisitor - , - GridTypeMapContainer> creature_visitor(creature_searcher); - - cell.Visit(pair, creature_visitor, *(me->GetMap())); - - if (!creatures.empty()) - { - for (std::list::const_iterator itr = creatures.begin(); itr != creatures.end(); ++itr) - { - if ((*itr) && (*itr)->isAlive()) - { - (*itr)->CastSpell(*itr, SPELL_TELEPORT_VISUAL, true); - (*itr)->setFaction(35);//make them friendly so mobs won't attack them - (*itr)->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - } - } - DoCast(me, SPELL_TELEPORT_VISUAL); - bRetreat = true; - RetreatTimer = 1000; - } - - WaitForTeleport = false; - Teleported = true; - }TeleportTimer -= diff; - } - if (!Teleported) - return; - Overrun = false;//execute once - switch(faction) - { - case 0://alliance - for (uint8 i = 0; i < 92; ++i)//summon fires - me->SummonGameObject(FLAMEOBJECT,AllianceFirePos[i][0],AllianceFirePos[i][1],AllianceFirePos[i][2],AllianceFirePos[i][3],AllianceFirePos[i][4],AllianceFirePos[i][5],AllianceFirePos[i][6],AllianceFirePos[i][7],0); - - for (uint8 i = 0; i < 25; ++i)//summon 25 ghouls - { - uint8 r = rand()%4; - Creature* pUnit = me->SummonCreature(GHOUL, AllianceBase[r][0]+irand(-15,15), AllianceBase[r][1]+irand(-15,15), AllianceBase[r][2], 0, TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000); - if (pUnit) - { - CAST_AI(hyjal_trashAI, pUnit->AI())->faction = Faction; - CAST_AI(hyjal_trashAI, pUnit->AI())->IsOverrun = true; - CAST_AI(hyjal_trashAI, pUnit->AI())->OverrunType = i; - pUnit->setActive(true); - } - } - for (uint8 i = 0; i < 3; ++i)//summon 3 abominations - { - uint8 r = rand()%4; - Creature* pUnit = me->SummonCreature(ABOMINATION, AllianceBase[r][0]+irand(-15,15), AllianceBase[r][1]+irand(-15,15), AllianceBase[r][2], 0, TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000); - if (pUnit) - { - CAST_AI(hyjal_trashAI, pUnit->AI())->faction = Faction; - CAST_AI(hyjal_trashAI, pUnit->AI())->IsOverrun = true; - CAST_AI(hyjal_trashAI, pUnit->AI())->OverrunType = i; - pUnit->setActive(true); - } - } - for (uint8 i = 0; i < 5; ++i)//summon 5 gargoyles - { - Creature* pUnit = me->SummonCreature(GARGOYLE, AllianceOverrunGargPos[i][0], AllianceOverrunGargPos[i][1], AllianceOverrunGargPos[i][2], AllianceOverrunGargPos[i][3], TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000); - if (pUnit) - { - pUnit->SetHomePosition(AllianceOverrunGargPos[i][0], AllianceOverrunGargPos[i][1], AllianceOverrunGargPos[i][2], AllianceOverrunGargPos[i][3]); - CAST_AI(hyjal_trashAI, pUnit->AI())->faction = Faction; - CAST_AI(hyjal_trashAI, pUnit->AI())->IsOverrun = true; - CAST_AI(hyjal_trashAI, pUnit->AI())->OverrunType = i; - pUnit->setActive(true); - } - } - break; - case 1://horde - for (uint8 i = 0; i < 65; ++i)//summon fires - me->SummonGameObject(FLAMEOBJECT,HordeFirePos[i][0],HordeFirePos[i][1],HordeFirePos[i][2],HordeFirePos[i][3],HordeFirePos[i][4],HordeFirePos[i][5],HordeFirePos[i][6],HordeFirePos[i][7],0); - - for (uint8 i = 0; i < 26; ++i)//summon infernals - { - Creature* pUnit = me->SummonCreature(GIANT_INFERNAL, InfernalSPWP[i][0], InfernalSPWP[i][1], InfernalSPWP[i][2], InfernalSPWP[i][3], TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000); - if (pUnit) - { - pUnit->SetHomePosition(InfernalSPWP[i][0], InfernalSPWP[i][1], InfernalSPWP[i][2], InfernalSPWP[i][3]); - CAST_AI(hyjal_trashAI, pUnit->AI())->faction = Faction; - CAST_AI(hyjal_trashAI, pUnit->AI())->IsOverrun = true; - CAST_AI(hyjal_trashAI, pUnit->AI())->OverrunType = i; - pUnit->setActive(true); - } - } - for (uint8 i = 0; i < 25; ++i)//summon 25 ghouls - { - uint8 r = rand()%4; - Creature* pUnit = me->SummonCreature(GHOUL, HordeBase[r][0]+irand(-15,15), HordeBase[r][1]+irand(-15,15), HordeBase[r][2], 0, TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000); - if (pUnit) - { - CAST_AI(hyjal_trashAI, pUnit->AI())->faction = Faction; - CAST_AI(hyjal_trashAI, pUnit->AI())->IsOverrun = true; - CAST_AI(hyjal_trashAI, pUnit->AI())->OverrunType = i; - pUnit->setActive(true); - } - } - for (uint8 i = 0; i < 5; ++i)//summon 5 abominations - { - uint8 r = rand()%4; - Creature* pUnit = me->SummonCreature(ABOMINATION, HordeBase[r][0]+irand(-15,15), HordeBase[r][1]+irand(-15,15), HordeBase[r][2], 0, TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000); - if (pUnit) - { - CAST_AI(hyjal_trashAI, pUnit->AI())->faction = Faction; - CAST_AI(hyjal_trashAI, pUnit->AI())->IsOverrun = true; - CAST_AI(hyjal_trashAI, pUnit->AI())->OverrunType = i; - pUnit->setActive(true); - } - } - break; - } -} diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/hyjal/hyjalAI.h b/src/server/scripts/Kalimdor/CavernsOfTime/hyjal/hyjalAI.h deleted file mode 100644 index 5c75465b7b4..00000000000 --- a/src/server/scripts/Kalimdor/CavernsOfTime/hyjal/hyjalAI.h +++ /dev/null @@ -1,248 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software licensed under GPL version 2 - * Please see the included DOCS/LICENSE.TXT for more information */ - -#ifndef SC_HYJALAI_H -#define SC_HYJALAI_H - -#include "hyjal.h" -#include "ScriptedEscortAI.h" - -// Trash Mobs summoned in waves -#define NECROMANCER 17899//done -#define ABOMINATION 17898//done -#define GHOUL 17895//done -#define BANSHEE 17905//done -#define CRYPT_FIEND 17897//done -#define GARGOYLE 17906//done -#define FROST_WYRM 17907//done -#define GIANT_INFERNAL 17908//done -#define FEL_STALKER 17916//done - -#define JAINA 17772 -#define THRALL 17852 -#define TYRANDE 17948 - -#define ANCIENT_VEIN 185557 -#define FLAMEOBJECT 182592 - -// Bosses summoned after every 8 waves -#define RAGE_WINTERCHILL 17767 -#define ANETHERON 17808 -#define KAZROGAL 17888 -#define AZGALOR 17842 -#define ARCHIMONDE 17968 - -#define SPELL_TELEPORT_VISUAL 41232 -#define SPELL_MASS_TELEPORT 16807 - -//Spells for Jaina -#define SPELL_BRILLIANCE_AURA 31260 // The database must handle this spell via creature_addon(it should, but is removed in evade..) -#define SPELL_BLIZZARD 31266 -#define SPELL_PYROBLAST 31263 -#define SPELL_SUMMON_ELEMENTALS 31264 - -//Thrall spells -#define SPELL_CHAIN_LIGHTNING 31330 -#define SPELL_SUMMON_DIRE_WOLF 31331 - -struct Wave -{ - uint32 Mob[18]; // Stores Creature Entries to be summoned in Waves - uint32 WaveTimer; // The timer before the next wave is summoned - bool IsBoss; // Simply used to inform the wave summoner that the next wave contains a boss to halt all waves after that -}; - -static Wave AllianceWaves[]= // Waves that will be summoned in the Alliance Base -{ // Rage Winterchill Wave 1-8 - {GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, 0, 0, 0, 0, 0, 0, 0, 0, 120000, false}, - {GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, CRYPT_FIEND, CRYPT_FIEND, 0, 0, 0, 0, 0, 0, 120000, false}, - {GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, 0, 0, 0, 0, 0, 0, 120000, false}, - {GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, NECROMANCER, NECROMANCER, 0, 0, 0, 0, 0, 0, 120000, false}, - {GHOUL, GHOUL, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, NECROMANCER, NECROMANCER, NECROMANCER, NECROMANCER, 0, 0, 0, 0, 0, 0, 120000, false}, - {GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, ABOMINATION, ABOMINATION, ABOMINATION, ABOMINATION, ABOMINATION, ABOMINATION, 0, 0, 0, 0, 0, 0, 120000, false}, - {GHOUL, GHOUL, GHOUL, GHOUL, NECROMANCER, NECROMANCER, NECROMANCER, NECROMANCER, ABOMINATION, ABOMINATION, ABOMINATION, ABOMINATION, 0, 0, 0, 0, 0, 0, 120000, false}, - {GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, ABOMINATION, ABOMINATION, NECROMANCER, NECROMANCER, 0, 0, 0, 0, 180000, false}, - // All 8 Waves are summoned, summon Rage Winterchill, next few waves are for Anetheron - {RAGE_WINTERCHILL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, true}, - // Anetheron Wave 1-8 - {GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, 0, 0, 0, 0, 0, 0, 0, 0, 120000, false}, - {GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, ABOMINATION, ABOMINATION, ABOMINATION, ABOMINATION, 0, 0, 0, 0, 0, 0, 120000, false}, - {GHOUL, GHOUL, GHOUL, GHOUL, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, NECROMANCER, NECROMANCER, NECROMANCER, NECROMANCER, 0, 0, 0, 0, 0, 0, 120000, false}, - {NECROMANCER, NECROMANCER, NECROMANCER, NECROMANCER, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, BANSHEE, BANSHEE, 0, 0, 0, 0, 0, 0, 120000, false}, - {GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, NECROMANCER, NECROMANCER, BANSHEE, BANSHEE, BANSHEE, BANSHEE, 0, 0, 0, 0, 0, 0, 120000, false}, - {GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, ABOMINATION, ABOMINATION, NECROMANCER, NECROMANCER, NECROMANCER, NECROMANCER, 0, 0, 0, 0, 0, 0, 120000, false}, - {CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, BANSHEE, BANSHEE, BANSHEE, BANSHEE, ABOMINATION, ABOMINATION, ABOMINATION, ABOMINATION, GHOUL, GHOUL, 0, 0, 0, 0, 120000, false}, - {GHOUL, GHOUL, GHOUL, ABOMINATION, ABOMINATION, ABOMINATION, ABOMINATION, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, BANSHEE, BANSHEE, NECROMANCER, NECROMANCER, 0, 0, 0, 0, 180000, false}, - // All 8 Waves are summoned, summon Anatheron - {ANETHERON, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, true} -}; - -static Wave HordeWaves[]= // Waves that are summoned in the Horde base -{ // Kaz'Rogal Wave 1-8 - {GHOUL, GHOUL, GHOUL, GHOUL, ABOMINATION, ABOMINATION, ABOMINATION, ABOMINATION, BANSHEE, BANSHEE, NECROMANCER, NECROMANCER, 0, 0, 0, 0, 0, 0, 180000, false}, - {GHOUL, GHOUL, GHOUL, GHOUL, GARGOYLE, GARGOYLE, GARGOYLE, GARGOYLE, GARGOYLE, GARGOYLE, GARGOYLE, GARGOYLE, GARGOYLE, GARGOYLE, 0, 0, 0, 0, 180000, false}, - {GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, NECROMANCER, NECROMANCER, 0, 0, 0, 0, 180000, false}, - {CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, GARGOYLE, GARGOYLE, GARGOYLE, GARGOYLE, GARGOYLE, GARGOYLE, NECROMANCER, NECROMANCER, 0, 0, 0, 0, 180000, false}, - {GHOUL, GHOUL, GHOUL, GHOUL, ABOMINATION, ABOMINATION, ABOMINATION, ABOMINATION, ABOMINATION, ABOMINATION, NECROMANCER, NECROMANCER, NECROMANCER, NECROMANCER, 0, 0, 0, 0, 180000, false}, - {GARGOYLE, GARGOYLE, GARGOYLE, GARGOYLE, GARGOYLE, GARGOYLE, GARGOYLE, GARGOYLE, FROST_WYRM, 0, 0, 0, 0, 0, 0, 0, 0, 0, 180000, false}, - {GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, ABOMINATION, ABOMINATION, ABOMINATION, ABOMINATION, FROST_WYRM, 0, 0, 0, 0, 0, 0, 0, 180000, false}, - {GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, CRYPT_FIEND, CRYPT_FIEND, ABOMINATION, ABOMINATION, ABOMINATION, ABOMINATION, BANSHEE, BANSHEE, NECROMANCER, NECROMANCER, 0, 0, 240000, false}, - // All 8 Waves are summoned, summon Kaz'Rogal, next few waves are for Azgalor - {KAZROGAL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, true}, - // Azgalor Wave 1-8 - {ABOMINATION, ABOMINATION, ABOMINATION, ABOMINATION, ABOMINATION, ABOMINATION, NECROMANCER, NECROMANCER, NECROMANCER, NECROMANCER, NECROMANCER, NECROMANCER, 0, 0, 0, 0, 0, 0, 180000, false}, - {GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, FROST_WYRM, GARGOYLE, GARGOYLE, GARGOYLE, GARGOYLE, GARGOYLE, GARGOYLE, GARGOYLE, GARGOYLE, 0, 0, 0, 0, 180000, false}, - {GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GHOUL, GIANT_INFERNAL, GIANT_INFERNAL, GIANT_INFERNAL, GIANT_INFERNAL, GIANT_INFERNAL, GIANT_INFERNAL, GIANT_INFERNAL, GIANT_INFERNAL, 0, 0, 0, 0, 180000, false}, - {GIANT_INFERNAL, GIANT_INFERNAL, GIANT_INFERNAL, GIANT_INFERNAL, GIANT_INFERNAL, GIANT_INFERNAL, GIANT_INFERNAL, GIANT_INFERNAL, FEL_STALKER, FEL_STALKER, FEL_STALKER, FEL_STALKER, FEL_STALKER, FEL_STALKER, 0, 0, 0, 0, 180000, false}, - {FEL_STALKER, FEL_STALKER, FEL_STALKER, FEL_STALKER, FEL_STALKER, FEL_STALKER, ABOMINATION, ABOMINATION, ABOMINATION, ABOMINATION, NECROMANCER, NECROMANCER, NECROMANCER, NECROMANCER, 0, 0, 0, 0, 180000, false}, - {NECROMANCER, NECROMANCER, NECROMANCER, NECROMANCER, NECROMANCER, NECROMANCER, BANSHEE, BANSHEE, BANSHEE, BANSHEE, BANSHEE, BANSHEE, 0, 0, 0, 0, 0, 0, 180000, false}, - {GHOUL, GHOUL, CRYPT_FIEND, CRYPT_FIEND, FEL_STALKER, FEL_STALKER, GIANT_INFERNAL, GIANT_INFERNAL, GIANT_INFERNAL, GIANT_INFERNAL, GIANT_INFERNAL, GIANT_INFERNAL, GIANT_INFERNAL, GIANT_INFERNAL, 0, 0, 0, 0, 180000, false}, - {CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, CRYPT_FIEND, FEL_STALKER, FEL_STALKER, ABOMINATION, ABOMINATION, ABOMINATION, ABOMINATION, BANSHEE, BANSHEE, BANSHEE, BANSHEE, NECROMANCER, NECROMANCER, 0, 0, 240000, false}, - // All 8 Waves are summoned, summon Azgalor - {AZGALOR, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, true} -}; - -enum TargetType // Used in the spell cast system for the AI -{ - TARGETTYPE_SELF = 0, - TARGETTYPE_RANDOM = 1, - TARGETTYPE_VICTIM = 2, -}; - -struct Yells -{ - uint32 id; // Used to determine the type of yell (attack, rally, etc) - int32 textid; // The text id to be yelled -}; - -enum YellId -{ - ATTACKED = 0, // Used when attacked and set in combat - BEGIN = 1, // Used when the event is begun - INCOMING = 2, // Used to warn the raid that another wave phase is coming - RALLY = 3, // Used to rally the raid and warn that the next wave has been summoned - FAILURE = 4, // Used when raid has failed (unsure where to place) - SUCCESS = 5, // Used when the raid has sucessfully defeated a wave phase - DEATH = 6, // Used on death -}; - -static Yells JainaQuotes[]= -{ - {ATTACKED, -1534000}, - {ATTACKED, -1534001}, - {INCOMING, -1534002}, - {BEGIN, -1534003}, - {RALLY, -1534004}, - {RALLY, -1534005}, - {FAILURE, -1534006}, - {SUCCESS, -1534007}, - {DEATH, -1534008}, -}; - -static Yells ThrallQuotes[]= -{ - {ATTACKED, -1534009}, - {ATTACKED, -1534010}, - {INCOMING, -1534011}, - {BEGIN, -1534012}, - {RALLY, -1534013}, - {RALLY, -1534014}, - {FAILURE, -1534015}, - {SUCCESS, -1534016}, - {DEATH, -1534017}, -}; - -struct hyjalAI : public npc_escortAI -{ - hyjalAI(Creature *c); - - void Reset(); // Generically used to reset our variables. Do *not* call in EnterEvadeMode as this may make problems if the raid is still in combat - - void EnterEvadeMode(); // Send creature back to spawn location and evade. - - void EnterCombat(Unit * /*who*/); // Used to reset cooldowns for our spells and to inform the raid that we're under attack - - void UpdateAI(const uint32 diff); // Called to summon waves, check for boss deaths and to cast our spells. - - void JustDied(Unit* /*killer*/); // Called on death, informs the raid that they have failed. - - void SetFaction(uint32 _faction) // Set the faction to either Alliance or Horde in Hyjal - { - Faction = _faction; - } - - void Retreat(); // "Teleport" (teleport visual + set invisible) all friendly creatures away from the base. - - void SpawnVeins(); - void DeSpawnVeins(); - void JustSummoned(Creature *summoned); - void SummonedCreatureDespawn(Creature* summoned); - void HideNearPos(float x, float y); - void RespawnNearPos(float x, float y); - void WaypointReached(uint32 i); - void DoOverrun(uint32 faction, const uint32 diff); - void MoveInLineOfSight(Unit *who); - - void SummonCreature(uint32 entry, float Base[4][3]); // Summons a creature for that wave in that base - - // Summons the next wave, calls SummonCreature - void SummonNextWave(Wave wave[18], uint32 Count, float Base[4][3]); - - void StartEvent(Player* player); // Begins the event by gossip click - - uint32 GetInstanceData(uint32 Event); // Gets instance data for this instance, used to check if raid has gotten past a certain point and can access the next phase - - void Talk(uint32 id); // Searches for the appropriate yell and sound and uses it to inform the raid of various things - - public: - ScriptedInstance* pInstance; - - uint64 PlayerGUID; - uint64 BossGUID[2]; - uint64 VeinGUID[14]; - - uint32 NextWaveTimer; - uint32 WaveCount; - uint32 CheckTimer; - uint32 Faction; - uint32 EnemyCount; - uint32 RetreatTimer; - - bool EventBegun; - bool FirstBossDead; - bool SecondBossDead; - bool Summon; - bool bRetreat; - bool Debug; - bool VeinsSpawned[2]; - uint8 InfernalCount; - SummonList Summons; - bool Overrun; - bool Teleported; - bool WaitForTeleport; - uint32 TeleportTimer; - uint32 OverrunCounter; - uint32 OverrunCounter2; - uint32 InfernalPoint; - uint32 RespawnTimer; - bool DoRespawn; - bool DoHide; - bool IsDummy; - uint32 MassTeleportTimer; - bool DoMassTeleport; - uint64 DummyGuid; - - struct Spell - { - uint32 SpellId; - uint32 Cooldown; - uint32 TargetType; - }Spell[3]; - - private: - uint32 SpellTimer[3]; - //std::list CreatureList; -}; -#endif - diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/hyjal/hyjal_trash.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/hyjal/hyjal_trash.cpp deleted file mode 100644 index c4cf9ede397..00000000000 --- a/src/server/scripts/Kalimdor/CavernsOfTime/hyjal/hyjal_trash.cpp +++ /dev/null @@ -1,1440 +0,0 @@ - -#include "ScriptedPch.h" -#include "hyjal.h" -#include "hyjal_trash.h" -#include "hyjalAI.h" - -#define SPELL_METEOR 33814 //infernal visual -#define SPELL_IMMOLATION 37059 -#define SPELL_FLAME_BUFFET 31724 -#define NPC_TRIGGER 21987 //World Trigger (Tiny) -#define MODEL_INVIS 11686 //invisible model - -float HordeWPs[8][3]=//basic waypoints from spawn to leader -{ - {5492.91, -2404.61, 1462.63}, - {5531.76, -2460.87, 1469.55}, - {5554.58, -2514.66, 1476.12}, - {5554.16, -2567.23, 1479.90}, - {5540.67, -2625.99, 1480.89}, - {5508.16, -2659.20, 1480.15},//random rush starts from here - {5489.62, -2704.05, 1482.18}, - {5457.04, -2726.26, 1485.10} -}; -float AllianceWPs[8][3]=//basic waypoints from spawn to leader -{ - {4896.08, -1576.35, 1333.65}, - {4898.68, -1615.02, 1329.48}, - {4907.12, -1667.08, 1321.00}, - {4963.18, -1699.35, 1340.51}, - {4989.16, -1716.67, 1335.74},//first WP in the base, after the gate - {5026.27, -1736.89, 1323.02}, - {5037.77, -1770.56, 1324.36}, - {5067.23, -1789.95, 1321.17} -}; - -float FrostWyrmWPs[3][3]=//waypoints for the frost wyrms in horde base -{ - {5580.82, -2628.83, 1528.28}, - {5550.90, -2667.16, 1505.45}, - {5459.64, -2725.91, 1484.83} -}; - -float GargoyleWPs[3][3]=//waypoints for the gargoyles in horde base -{ - {5533.66, -2634.32, 1495.33}, - {5517.88, -2712.05, 1490.54}, - {5459.64, -2725.91, 1484.83} -}; - -float FlyPathWPs[3][3]=//waypoints for the gargoyls and frost wyrms in horde base in wave 1/3 -{ - {5531.96, -2772.83, 1516.68}, - {5498.32, -2734.84, 1497.01}, - {5456.67, -2725.48, 1493.08} -}; - -float AllianceOverrunWP[55][3]=//waypoints in the alliance base used in the end in the cleaning wave -{ - {4976.37,-1708.02,1339.43},//0spawn - {4994.83,-1725.52,1333.25},//1 start - {4982.92,-1753.7,1330.69},//2 end - {4996.75,-1721.47,1332.95},//3 start - {5015.74,-1755.05,1322.49},//4 - {4998.68,-1773.44,1329.59},//5 - {4994.83,-1725.52,1333.25},//6 start - {5022.8,-1735.46,1323.53},//7 - {5052.15,-1729.02,1320.88},//8 - {5082.43,-1726.29,1327.87},//9 - {4994.83,-1725.52,1333.25},//10 start - {5018.92,-1751.14,1322.19},//11 - {5040.09,-1792.09,1322.1},//12 - {4994.83,-1725.52,1333.25},//13 start - {5023.47,-1748.1,1322.51},//14 - {5013.43,-1842.39,1322.07},//15 - {4994.83,-1725.52,1333.25},//16 start - {5020.8,-1756.86,1322.2},//17 - {5019.53,-1824.6,1321.96},//18 - {5043.42,-1853.75,1324.52},//19 - {5053.02,-1864.13,1330.36},//20 - {5062.49,-1852.47,1330.49},//21 - {5015.27, -1738.77, 1324.83},//35//start 22 - {5027.97, -1775.25, 1321.87},//34 23 - {5015.94, -1821.24, 1321.86},//33 24 - {4983.25, -1857.4, 1320.48},//32 25 - {4981.51, -1883.7, 1322.34},//31 26 - {5002.33, -1893.98, 1325.88},//30 27 - {5049.32, -1886.54, 1331.69},//29 28 - {5089.68, -1846.88, 1328.99},//28 29 - {5127.90, -1825.14, 1335.58},//27 30 - {5163.27, -1789.08, 1337.04},//26 31 - {5138.97, -1755.88, 1334.57},//25 32 - {5096.63, -1742.22, 1329.61},//24 33 - {5065.81, -1729.43, 1325.66},//23 34 - {5049.32, -1726.31, 1320.64},//22 start - {5081.07, -1902.10, 1346.36},//36 abo start - {5107.65, -1912.03, 1356.49},//37 - {5132.83, -1927.07, 1362.42},//38 - {5147.78, -1954.41, 1365.98},//39 - {5164.96, -1966.48, 1367.04},//40 - {5189.04, -1961.06, 1367.90},//41 - {5212.27, -1975.30, 1365.58},//42 - {5221.82, -1994.18, 1364.97},//43 end1 - {5202.23, -1994.94, 1367.59},//44 end2 - {5279.94, -2049.68, 1311.38},//45 garg1 - {5289.15, -2219.06, 1291.12},//46 garg2 - {5202.07, -2136.10, 1305.07},//47 garg3 - {5071.52, -2425.63, 1454.48},//48 garg4 - {5120.65, -2467.92, 1463.93},//49 garg5 - {5283.04, -2043.26, 1300.11},//50 garg target1 - {5313.22, -2207.60, 1290.06},//51 garg target2 - {5180.41, -2121.87, 1292.62},//52 garg target3 - {5088.68, -2432.04, 1441.73},//53 garg target4 - {5111.26, -2454.73, 1449.63}//54 garg target5 - -}; - -float HordeOverrunWP[21][3]=//waypoints in the horde base used in the end in the cleaning wave -{ - {5490.72,-2702.94,1482.14},//0 start - {5469.77,-2741.34,1486.95}, - {5439.47,-2771.02,1494.59}, - {5408.85,-2811.92,1505.68}, - {5423.87,-2857.80,1515.55}, - {5428.19,-2898.15,1524.61}, - {5394.59,-2930.05,1528.23}, - {5351.11,-2935.80,1532.24}, - {5312.37,-2959.06,1536.21}, - {5264.93,-2989.80,1545.70}, - {5256.63,-3056.16,1559.24}, - {5267.32,-3119.55,1575.36}, - {5305.61,-3139.88,1586.38}, - {5330.56,-3135.37,1588.58}, - {5365.87,-3139.78,1583.96}, - {5389.39,-3163.57,1582.57},//15 end - {5500.86,-2669.89,1481.04},//16 start - {5472.08,-2715.14,1483.55}, - {5450.11,-2721.47,1485.61}, - {5433.25,-2712.93,1493.02},//19 end 1 - {5429.91,-2718.44,1493.42}//20 end 2 -}; - -hyjal_trashAI::hyjal_trashAI(Creature *c) : npc_escortAI(c) -{ - pInstance = c->GetInstanceData(); - IsEvent = false; - Delay = 0; - LastOverronPos = 0; - IsOverrun = false; - OverrunType = 0; - SetupOverrun = false; - faction = 0; - useFlyPath = false; - damageTaken = 0; - Reset(); -} - -void hyjal_trashAI::DamageTaken(Unit *done_by, uint32 &damage) -{ - if (done_by->GetTypeId() == TYPEID_PLAYER || (done_by->GetTypeId() == TYPEID_UNIT && CAST_CRE(done_by)->isPet())) - { - damageTaken += damage; - if (pInstance) - pInstance->SetData(DATA_RAIDDAMAGE,damage);//store raid's damage - } -} - -void hyjal_trashAI::UpdateAI(const uint32 /*diff*/) -{ - if (IsOverrun && !SetupOverrun) - { - SetupOverrun = true; - if (faction == 0) - { - if (me->GetEntry() == GARGOYLE) - { - DummyTarget[0] = AllianceOverrunWP[50+OverrunType][0]; //+OverrunType 0 - 4 - DummyTarget[1] = AllianceOverrunWP[50+OverrunType][1]; - DummyTarget[2] = AllianceOverrunWP[50+OverrunType][2]; - } - if (me->GetEntry() == ABOMINATION) - { - for (uint8 i = 0; i < 4; ++i) - AddWaypoint(i, AllianceWPs[i][0]+irand(-3,3), AllianceWPs[i][1]+irand(-3,3), AllianceWPs[i][2]); - switch(OverrunType) - { - case 0: - AddWaypoint(4, AllianceOverrunWP[22][0]+irand(-3,3), AllianceOverrunWP[22][1]+irand(-3,3), AllianceOverrunWP[22][2]); - AddWaypoint(5, AllianceOverrunWP[23][0]+irand(-3,3), AllianceOverrunWP[23][1]+irand(-3,3), AllianceOverrunWP[23][2]); - AddWaypoint(6, AllianceOverrunWP[24][0]+irand(-3,3), AllianceOverrunWP[24][1]+irand(-3,3), AllianceOverrunWP[24][2]); - AddWaypoint(7, AllianceOverrunWP[25][0]+irand(-3,3), AllianceOverrunWP[25][1]+irand(-3,3), AllianceOverrunWP[25][2]); - AddWaypoint(8, AllianceOverrunWP[26][0]+irand(-3,3), AllianceOverrunWP[26][1]+irand(-3,3), AllianceOverrunWP[26][2]); - AddWaypoint(9, AllianceOverrunWP[27][0]+irand(-3,3), AllianceOverrunWP[27][1]+irand(-3,3), AllianceOverrunWP[27][2]); - AddWaypoint(10, AllianceOverrunWP[28][0]+irand(-3,3), AllianceOverrunWP[28][1]+irand(-3,3), AllianceOverrunWP[28][2]); - - AddWaypoint(11, AllianceOverrunWP[36][0]+irand(-3,3), AllianceOverrunWP[36][1]+irand(-3,3), AllianceOverrunWP[36][2]); - AddWaypoint(12, AllianceOverrunWP[37][0]+irand(-3,3), AllianceOverrunWP[37][1]+irand(-3,3), AllianceOverrunWP[37][2]); - AddWaypoint(13, AllianceOverrunWP[38][0]+irand(-3,3), AllianceOverrunWP[38][1]+irand(-3,3), AllianceOverrunWP[38][2]); - AddWaypoint(14, AllianceOverrunWP[39][0]+irand(-3,3), AllianceOverrunWP[39][1]+irand(-3,3), AllianceOverrunWP[39][2]); - AddWaypoint(15, AllianceOverrunWP[40][0]+irand(-3,3), AllianceOverrunWP[40][1]+irand(-3,3), AllianceOverrunWP[40][2]); - AddWaypoint(16, AllianceOverrunWP[41][0]+irand(-3,3), AllianceOverrunWP[41][1]+irand(-3,3), AllianceOverrunWP[41][2]); - AddWaypoint(17, AllianceOverrunWP[42][0]+irand(-3,3), AllianceOverrunWP[42][1]+irand(-3,3), AllianceOverrunWP[42][2]); - AddWaypoint(18, AllianceOverrunWP[43][0]+irand(-3,3), AllianceOverrunWP[43][1]+irand(-3,3), AllianceOverrunWP[43][2]); - me->SetHomePosition(AllianceOverrunWP[43][0]+irand(-3,3), AllianceOverrunWP[43][1]+irand(-3,3), AllianceOverrunWP[43][2],0); - SetDespawnAtEnd(false); - LastOverronPos = 18; - Start(true, true); - break; - case 1: - AddWaypoint(4, AllianceOverrunWP[22][0]+irand(-3,3), AllianceOverrunWP[22][1]+irand(-3,3), AllianceOverrunWP[22][2]); - AddWaypoint(5, AllianceOverrunWP[23][0]+irand(-3,3), AllianceOverrunWP[23][1]+irand(-3,3), AllianceOverrunWP[23][2]); - AddWaypoint(6, AllianceOverrunWP[24][0]+irand(-3,3), AllianceOverrunWP[24][1]+irand(-3,3), AllianceOverrunWP[24][2]); - AddWaypoint(7, AllianceOverrunWP[25][0]+irand(-3,3), AllianceOverrunWP[25][1]+irand(-3,3), AllianceOverrunWP[25][2]); - AddWaypoint(8, AllianceOverrunWP[26][0]+irand(-3,3), AllianceOverrunWP[26][1]+irand(-3,3), AllianceOverrunWP[26][2]); - AddWaypoint(9, AllianceOverrunWP[27][0]+irand(-3,3), AllianceOverrunWP[27][1]+irand(-3,3), AllianceOverrunWP[27][2]); - AddWaypoint(10, AllianceOverrunWP[28][0]+irand(-3,3), AllianceOverrunWP[28][1]+irand(-3,3), AllianceOverrunWP[28][2]); - - AddWaypoint(11, AllianceOverrunWP[36][0]+irand(-3,3), AllianceOverrunWP[36][1]+irand(-3,3), AllianceOverrunWP[36][2]); - AddWaypoint(12, AllianceOverrunWP[37][0]+irand(-3,3), AllianceOverrunWP[37][1]+irand(-3,3), AllianceOverrunWP[37][2]); - AddWaypoint(13, AllianceOverrunWP[38][0]+irand(-3,3), AllianceOverrunWP[38][1]+irand(-3,3), AllianceOverrunWP[38][2]); - AddWaypoint(14, AllianceOverrunWP[39][0]+irand(-3,3), AllianceOverrunWP[39][1]+irand(-3,3), AllianceOverrunWP[39][2]); - AddWaypoint(15, AllianceOverrunWP[40][0]+irand(-3,3), AllianceOverrunWP[40][1]+irand(-3,3), AllianceOverrunWP[40][2]); - AddWaypoint(16, AllianceOverrunWP[41][0]+irand(-3,3), AllianceOverrunWP[41][1]+irand(-3,3), AllianceOverrunWP[41][2]); - AddWaypoint(17, AllianceOverrunWP[42][0]+irand(-3,3), AllianceOverrunWP[42][1]+irand(-3,3), AllianceOverrunWP[42][2]); - AddWaypoint(18, AllianceOverrunWP[44][0]+irand(-3,3), AllianceOverrunWP[44][1]+irand(-3,3), AllianceOverrunWP[44][2]); - me->SetHomePosition(AllianceOverrunWP[44][0]+irand(-3,3), AllianceOverrunWP[44][1]+irand(-3,3), AllianceOverrunWP[44][2],0); - SetDespawnAtEnd(false); - LastOverronPos = 18; - Start(true, true); - break; - default: - for (uint8 i = 22; i < 36; ++i) - AddWaypoint(i-18, AllianceOverrunWP[i][0]+irand(-3,3), AllianceOverrunWP[i][1]+irand(-3,3), AllianceOverrunWP[i][2]); - - SetDespawnAtEnd(true); - LastOverronPos = 17; - Start(true, true); - break; - } - } - if (me->GetEntry() == GHOUL) - { - for (uint8 i = 0; i < 4; ++i) - AddWaypoint(i, AllianceWPs[i][0]+irand(-3,3), AllianceWPs[i][1]+irand(-3,3), AllianceWPs[i][2]); - switch(OverrunType) - { - case 0: - AddWaypoint(4, AllianceOverrunWP[1][0]+irand(-3,3), AllianceOverrunWP[1][1]+irand(-3,3), AllianceOverrunWP[1][2]); - AddWaypoint(5, AllianceOverrunWP[2][0]+irand(-3,3), AllianceOverrunWP[2][1]+irand(-3,3), AllianceOverrunWP[2][2]); - me->SetHomePosition(AllianceOverrunWP[2][0]+irand(-3,3), AllianceOverrunWP[2][1]+irand(-3,3), AllianceOverrunWP[2][2],0); - SetDespawnAtEnd(false); - LastOverronPos = 5; - Start(true, true); - break; - case 1: - AddWaypoint(4, AllianceOverrunWP[3][0]+irand(-3,3), AllianceOverrunWP[3][1]+irand(-3,3), AllianceOverrunWP[3][2]); - AddWaypoint(5, AllianceOverrunWP[4][0]+irand(-3,3), AllianceOverrunWP[4][1]+irand(-3,3), AllianceOverrunWP[4][2]); - AddWaypoint(6, AllianceOverrunWP[5][0]+irand(-3,3), AllianceOverrunWP[5][1]+irand(-3,3), AllianceOverrunWP[5][2]); - me->SetHomePosition(AllianceOverrunWP[5][0]+irand(-3,3), AllianceOverrunWP[5][1]+irand(-3,3), AllianceOverrunWP[5][2],0); - SetDespawnAtEnd(false); - LastOverronPos = 6; - Start(true, true); - break; - case 2: - AddWaypoint(4, AllianceOverrunWP[6][0]+irand(-3,3), AllianceOverrunWP[6][1]+irand(-3,3), AllianceOverrunWP[6][2]); - AddWaypoint(5, AllianceOverrunWP[7][0]+irand(-3,3), AllianceOverrunWP[7][1]+irand(-3,3), AllianceOverrunWP[7][2]); - AddWaypoint(6, AllianceOverrunWP[8][0]+irand(-3,3), AllianceOverrunWP[8][1]+irand(-3,3), AllianceOverrunWP[8][2]); - AddWaypoint(7, AllianceOverrunWP[9][0]+irand(-3,3), AllianceOverrunWP[9][1]+irand(-3,3), AllianceOverrunWP[9][2]); - me->SetHomePosition(AllianceOverrunWP[9][0]+irand(-3,3), AllianceOverrunWP[9][1]+irand(-3,3), AllianceOverrunWP[9][2],0); - SetDespawnAtEnd(false); - LastOverronPos = 7; - Start(true, true); - break; - case 3: - AddWaypoint(4, AllianceOverrunWP[10][0]+irand(-3,3), AllianceOverrunWP[10][1]+irand(-3,3), AllianceOverrunWP[10][2]); - AddWaypoint(5, AllianceOverrunWP[11][0]+irand(-3,3), AllianceOverrunWP[11][1]+irand(-3,3), AllianceOverrunWP[11][2]); - AddWaypoint(6, AllianceOverrunWP[12][0]+irand(-3,3), AllianceOverrunWP[12][1]+irand(-3,3), AllianceOverrunWP[12][2]); - me->SetHomePosition(AllianceOverrunWP[12][0]+irand(-3,3), AllianceOverrunWP[12][1]+irand(-3,3), AllianceOverrunWP[12][2],0); - SetDespawnAtEnd(false); - LastOverronPos = 6; - Start(true, true); - break; - case 4: - AddWaypoint(4, AllianceOverrunWP[13][0]+irand(-3,3), AllianceOverrunWP[13][1]+irand(-3,3), AllianceOverrunWP[13][2]); - AddWaypoint(5, AllianceOverrunWP[14][0]+irand(-3,3), AllianceOverrunWP[14][1]+irand(-3,3), AllianceOverrunWP[14][2]); - AddWaypoint(6, AllianceOverrunWP[15][0]+irand(-3,3), AllianceOverrunWP[15][1]+irand(-3,3), AllianceOverrunWP[15][2]); - me->SetHomePosition(AllianceOverrunWP[15][0]+irand(-3,3), AllianceOverrunWP[15][1]+irand(-3,3), AllianceOverrunWP[15][2],0); - SetDespawnAtEnd(false); - LastOverronPos = 6; - Start(true, true); - break; - case 5: - AddWaypoint(4, AllianceOverrunWP[16][0]+irand(-3,3), AllianceOverrunWP[16][1]+irand(-3,3), AllianceOverrunWP[16][2]); - AddWaypoint(5, AllianceOverrunWP[17][0]+irand(-3,3), AllianceOverrunWP[17][1]+irand(-3,3), AllianceOverrunWP[17][2]); - AddWaypoint(6, AllianceOverrunWP[18][0]+irand(-3,3), AllianceOverrunWP[18][1]+irand(-3,3), AllianceOverrunWP[18][2]); - AddWaypoint(7, AllianceOverrunWP[19][0]+irand(-3,3), AllianceOverrunWP[19][1]+irand(-3,3), AllianceOverrunWP[19][2]); - AddWaypoint(8, AllianceOverrunWP[20][0]+irand(-3,3), AllianceOverrunWP[20][1]+irand(-3,3), AllianceOverrunWP[20][2]); - AddWaypoint(9, AllianceOverrunWP[21][0]+irand(-3,3), AllianceOverrunWP[21][1]+irand(-3,3), AllianceOverrunWP[21][2]); - me->SetHomePosition(AllianceOverrunWP[21][0]+irand(-3,3), AllianceOverrunWP[21][1]+irand(-3,3), AllianceOverrunWP[21][2],0); - SetDespawnAtEnd(false); - LastOverronPos = 9; - Start(true, true); - break; - default: - for (uint8 i = 22; i < 36; ++i) - AddWaypoint(i-18, AllianceOverrunWP[i][0]+irand(-3,3), AllianceOverrunWP[i][1]+irand(-3,3), AllianceOverrunWP[i][2]); - SetDespawnAtEnd(true); - LastOverronPos = 17; - Start(true, true); - break; - } - } - } - if (faction == 1) - { - if (me->GetEntry() == GHOUL) - { - for (uint8 i = 0; i < 6; ++i) - AddWaypoint(i, HordeWPs[i][0]+irand(-3,3), HordeWPs[i][1]+irand(-3,3), HordeWPs[i][2]); - switch(OverrunType) - { - case 0: - AddWaypoint(5, HordeOverrunWP[16][0]+irand(-10,10), HordeOverrunWP[16][1]+irand(-10,10), HordeOverrunWP[16][2]); - AddWaypoint(6, HordeOverrunWP[17][0]+irand(-10,10), HordeOverrunWP[17][1]+irand(-10,10), HordeOverrunWP[17][2]); - AddWaypoint(7, HordeOverrunWP[18][0], HordeOverrunWP[18][1], HordeOverrunWP[18][2]); - AddWaypoint(8, HordeOverrunWP[19][0], HordeOverrunWP[19][1], HordeOverrunWP[19][2]); - me->SetHomePosition(HordeOverrunWP[19][0], HordeOverrunWP[19][1], HordeOverrunWP[19][2],0); - SetDespawnAtEnd(false); - LastOverronPos = 8; - Start(true, true); - break; - case 1: - AddWaypoint(5, HordeOverrunWP[16][0]+irand(-10,10), HordeOverrunWP[16][1]+irand(-10,10), HordeOverrunWP[16][2]); - AddWaypoint(6, HordeOverrunWP[17][0]+irand(-10,10), HordeOverrunWP[17][1]+irand(-10,10), HordeOverrunWP[17][2]); - AddWaypoint(7, HordeOverrunWP[18][0], HordeOverrunWP[18][1], HordeOverrunWP[18][2]); - AddWaypoint(8, HordeOverrunWP[20][0], HordeOverrunWP[20][1], HordeOverrunWP[20][2]); - me->SetHomePosition(HordeOverrunWP[20][0], HordeOverrunWP[20][1], HordeOverrunWP[20][2],0); - SetDespawnAtEnd(false); - LastOverronPos = 8; - Start(true, true); - break; - default: - for (uint8 i = 0; i < 16; ++i) - AddWaypoint(i+6, HordeOverrunWP[i][0]+irand(-10,10), HordeOverrunWP[i][1]+irand(-10,10), HordeOverrunWP[i][2]); - SetDespawnAtEnd(true); - LastOverronPos = 21; - Start(true, true); - break; - } - } - if (me->GetEntry() == ABOMINATION) - { - for (uint8 i = 0; i < 6; ++i) - AddWaypoint(i, HordeWPs[i][0]+irand(-10,10), HordeWPs[i][1]+irand(-10,10), HordeWPs[i][2]); - for (uint8 i = 0; i < 16; ++i) - AddWaypoint(i+6, HordeOverrunWP[i][0]+irand(-10,10), HordeOverrunWP[i][1]+irand(-10,10), HordeOverrunWP[i][2]); - SetDespawnAtEnd(true); - LastOverronPos = 21; - Start(true, true); - } - } - } -} - -void hyjal_trashAI::JustDied(Unit * /*victim*/) -{ - if (!pInstance) - return; - if (IsEvent && !me->isWorldBoss()) - pInstance->SetData(DATA_TRASH, 0);//signal trash is dead - - if ((pInstance->GetData(DATA_RAIDDAMAGE) < MINRAIDDAMAGE && !me->isWorldBoss()) || (damageTaken < me->GetMaxHealth()/4 && me->isWorldBoss())) - me->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);//no loot -} - -struct mob_giant_infernalAI : public hyjal_trashAI -{ - mob_giant_infernalAI(Creature* c) : hyjal_trashAI(c) - { - pInstance = c->GetInstanceData(); - meteor = false;//call once! - CanMove = false; - Delay = rand()%30000; - me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - me->SetDisplayId(MODEL_INVIS); - pGo = false; - pos = 0; - Reset(); - } - - bool meteor; - bool CanMove; - bool WpEnabled; - bool pGo; - uint32 pos; - uint32 spawnTimer; - uint32 FlameBuffetTimer; - bool imol; - - void Reset() - { - spawnTimer = 2000; - FlameBuffetTimer= 2000; - imol = false; - } - - void EnterCombat(Unit* /*who*/) {} - - void WaypointReached(uint32 i) - { - pos = i; - if (i == 0 && pInstance && !IsOverrun) - { - if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall - { - Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); - if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0); - } - } - } - - void UpdateAI(const uint32 diff) - { - if (Delay <= diff) - { - Delay=0; - }else{ - Delay-=diff; - return; - } - if (!meteor) - { - float x,y,z; - me->GetPosition(x,y,z); - Creature* trigger = me->SummonCreature(NPC_TRIGGER,x+8,y+8,z+25+rand()%10,me->GetOrientation(),TEMPSUMMON_TIMED_DESPAWN,1000); - if (trigger) - { - trigger->SetVisibility(VISIBILITY_OFF); - trigger->setFaction(me->getFaction()); - trigger->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); - trigger->CastSpell(me,SPELL_METEOR,true); - } - me->GetMotionMaster()->Clear(); - meteor = true; - } else if (!CanMove){ - if (spawnTimer <= diff) - { - me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - me->SetDisplayId(me->GetUInt32Value(UNIT_FIELD_NATIVEDISPLAYID)); - CanMove = true; - if (pInstance) - { - if (pInstance->GetData(DATA_ALLIANCE_RETREAT) && !pInstance->GetData(DATA_HORDE_RETREAT)) - { - Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); - if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0); - } else if (pInstance->GetData(DATA_ALLIANCE_RETREAT) && pInstance->GetData(DATA_HORDE_RETREAT)){ - //do overrun - } - } - } else spawnTimer -= diff; - } - if (!CanMove)return; - hyjal_trashAI::UpdateAI(diff); - if (IsEvent || IsOverrun) - npc_escortAI::UpdateAI(diff); - if (IsEvent) - { - if (!pGo) - { - pGo = true; - if (pInstance) - { - AddWaypoint(0, HordeWPs[7][0]+irand(-3,3), HordeWPs[7][1]+irand(-3,3), HordeWPs[7][2]);//HordeWPs[7] infront of thrall - Start(true, true); - SetDespawnAtEnd(false); - } - } - } - - if (!UpdateVictim()) - return; - if (!imol) - { - DoCast(me, SPELL_IMMOLATION); - imol=true; - } - if (FlameBuffetTimer <= diff) - { - DoCast(me->getVictim(), SPELL_FLAME_BUFFET, true); - FlameBuffetTimer = 7000; - } else FlameBuffetTimer -= diff; - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_mob_giant_infernal(Creature* pCreature) -{ - return new mob_giant_infernalAI(pCreature); -} - -#define SPELL_DISEASE_CLOUD 31607 -#define SPELL_KNOCKDOWN 31610 - -struct mob_abominationAI : public hyjal_trashAI -{ - mob_abominationAI(Creature* c) : hyjal_trashAI(c) - { - pInstance = c->GetInstanceData(); - pGo = false; - pos = 0; - Reset(); - } - - bool pGo; - uint32 KnockDownTimer; - uint32 pos; - void Reset() - { - KnockDownTimer = 10000; - } - - void WaypointReached(uint32 i) - { - pos = i; - if (i == 7 && pInstance && !IsOverrun) - { - if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall - { - Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); - if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0); - }else{ - Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); - if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0); - } - } - if (i == LastOverronPos && IsOverrun) - { - if ((faction == 0 && LastOverronPos == 17) || (faction == 1 && LastOverronPos == 21)) - { - me->setDeathState(DEAD); - me->RemoveCorpse(); - } - } - } - - void EnterCombat(Unit* /*who*/) {} - - void UpdateAI(const uint32 diff) - { - hyjal_trashAI::UpdateAI(diff); - if (IsEvent || IsOverrun) - npc_escortAI::UpdateAI(diff); - if (IsEvent) - { - if (!pGo) - { - pGo = true; - if (pInstance) - { - if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs - { - for (uint8 i = 0; i < 8; ++i) - AddWaypoint(i, HordeWPs[i][0]+irand(-3,3), HordeWPs[i][1]+irand(-3,3), HordeWPs[i][2]); - Start(false, true); - SetDespawnAtEnd(false); - }else//use alliance WPs - { - for (uint8 i = 0; i < 8; ++i) - AddWaypoint(i, AllianceWPs[i][0]+irand(-3,3), AllianceWPs[i][1]+irand(-3,3), AllianceWPs[i][2]); - Start(false, true); - SetDespawnAtEnd(false); - } - } - } - } - if (!me->HasAura(SPELL_DISEASE_CLOUD)) - DoCast(me, SPELL_DISEASE_CLOUD); - if (!UpdateVictim()) - return; - if (KnockDownTimer <= diff) - { - DoCast(me->getVictim(), SPELL_KNOCKDOWN); - KnockDownTimer = 15000+rand()%10000; - } else KnockDownTimer -= diff; - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_mob_abomination(Creature* pCreature) -{ - return new mob_abominationAI(pCreature); -} - -#define SPELL_FRENZY 31540 - -struct mob_ghoulAI : public hyjal_trashAI -{ - mob_ghoulAI(Creature* c) : hyjal_trashAI(c) - { - pInstance = c->GetInstanceData(); - pGo = false; - pos = 0; - Reset(); - } - - bool pGo; - uint32 FrenzyTimer; - uint32 pos; - uint32 MoveTimer; - bool RandomMove; - void Reset() - { - FrenzyTimer = 5000+rand()%5000; - MoveTimer = 2000; - RandomMove = false; - } - - void WaypointReached(uint32 i) - { - pos = i; - if (i == 7 && pInstance && !IsOverrun) - { - if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall - { - Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); - if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0); - }else{ - Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); - if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0); - } - } - if (i == LastOverronPos && IsOverrun) - { - me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_ATTACKUNARMED); - if ((faction == 0 && LastOverronPos == 17) || (faction == 1 && LastOverronPos == 21)) - { - me->setDeathState(DEAD); - me->RemoveCorpse(); - } - - } - } - - void EnterCombat(Unit* /*who*/) {} - - void UpdateAI(const uint32 diff) - { - hyjal_trashAI::UpdateAI(diff); - if (IsEvent || IsOverrun) - npc_escortAI::UpdateAI(diff); - if (IsEvent) - { - if (!pGo) - { - pGo = true; - if (pInstance) - { - if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs - { - for (uint8 i = 0; i < 8; ++i) - AddWaypoint(i, HordeWPs[i][0]+irand(-3,3), HordeWPs[i][1]+irand(-3,3), HordeWPs[i][2]); - Start(false, true); - SetDespawnAtEnd(false); - }else//use alliance WPs - { - for (uint8 i = 0; i < 8; ++i) - AddWaypoint(i, AllianceWPs[i][0]+irand(-3,3), AllianceWPs[i][1]+irand(-3,3), AllianceWPs[i][2]); - Start(false, true); - SetDespawnAtEnd(false); - } - } - } - } - if (FrenzyTimer <= diff) - { - DoCast(me, SPELL_FRENZY); - FrenzyTimer = 15000+rand()%15000; - } else FrenzyTimer -= diff; - if (!UpdateVictim()) - return; - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_mob_ghoul(Creature* pCreature) -{ - return new mob_ghoulAI(pCreature); -} - -#define SPELL_RAISE_DEAD_1 31617 -#define SPELL_RAISE_DEAD_2 31624 -#define SPELL_RAISE_DEAD_3 31625 -#define SPELL_SHADOW_BOLT 31627 - -struct mob_necromancerAI : public hyjal_trashAI -{ - mob_necromancerAI(Creature* c) : hyjal_trashAI(c), summons(me) - { - pInstance = c->GetInstanceData(); - pGo = false; - pos = 0; - Reset(); - } - SummonList summons; - bool pGo; - uint32 ShadowBoltTimer; - uint32 pos; - void Reset() - { - ShadowBoltTimer = 1000+rand()%5000; - summons.DespawnAll(); - } - - void JustSummoned(Creature* summon) - { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0,30,true); - if (pTarget && summon) - summon->Attack(pTarget,false); - summons.Summon(summon); - } - void SummonedCreatureDespawn(Creature *summon) {summons.Despawn(summon);} - void WaypointReached(uint32 i) - { - pos = i; - if (i == 7 && pInstance && !IsOverrun) - { - if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall - { - Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); - if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0); - }else{ - Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); - if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0); - } - } - } - - void KilledUnit(Unit* /*victim*/) - { - switch (urand(0,2)) - { - case 0: - DoSpawnCreature(17902,3,0,0,0,TEMPSUMMON_TIMED_DESPAWN, 60000); - DoSpawnCreature(17902,-3,0,0,0,TEMPSUMMON_TIMED_DESPAWN, 60000); - break; - case 1: - DoSpawnCreature(17903,3,0,0,0,TEMPSUMMON_TIMED_DESPAWN, 60000); - DoSpawnCreature(17903,-3,0,0,0,TEMPSUMMON_TIMED_DESPAWN, 60000); - break; - case 2: - DoSpawnCreature(RAND(17902,17903),3,0,0,0,TEMPSUMMON_TIMED_DESPAWN, 60000); - break; - } - } - - void EnterCombat(Unit* /*who*/) {} - - void UpdateAI(const uint32 diff) - { - hyjal_trashAI::UpdateAI(diff); - if (IsEvent || IsOverrun) - npc_escortAI::UpdateAI(diff); - if (IsEvent) - { - if (!pGo) - { - pGo = true; - if (pInstance) - { - if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs - { - for (uint8 i = 0; i < 8; ++i) - AddWaypoint(i, HordeWPs[i][0]+irand(-3,3), HordeWPs[i][1]+irand(-3,3), HordeWPs[i][2]); - Start(true, true); - SetDespawnAtEnd(false); - }else//use alliance WPs - { - for (uint8 i = 0; i < 8; ++i) - AddWaypoint(i, AllianceWPs[i][0]+irand(-3,3), AllianceWPs[i][1]+irand(-3,3), AllianceWPs[i][2]); - Start(true, true); - SetDespawnAtEnd(false); - } - } - } - } - if (!UpdateVictim()) - return; - if (ShadowBoltTimer <= diff) - { - DoCast(me->getVictim(), SPELL_SHADOW_BOLT); - ShadowBoltTimer = 20000+rand()%10000; - } else ShadowBoltTimer -= diff; - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_mob_necromancer(Creature* pCreature) -{ - return new mob_necromancerAI(pCreature); -} - -#define SPELL_BANSHEE_CURSE 31651 -#define SPELL_BANSHEE_WAIL 38183 -#define SPELL_ANTI_MAGIC_SHELL 31662 - -struct mob_bansheeAI : public hyjal_trashAI -{ - mob_bansheeAI(Creature* c) : hyjal_trashAI(c) - { - pInstance = c->GetInstanceData(); - pGo = false; - pos = 0; - Reset(); - } - - bool pGo; - uint32 CourseTimer; - uint32 WailTimer; - uint32 ShellTimer; - uint32 pos; - void Reset() - { - CourseTimer = 20000+rand()%5000; - WailTimer = 15000+rand()%5000; - ShellTimer = 50000+rand()%10000; - } - - void WaypointReached(uint32 i) - { - pos = i; - if (i == 7 && pInstance && !IsOverrun) - { - if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall - { - Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); - if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0); - }else{ - Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); - if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0); - } - } - } - - void EnterCombat(Unit* /*who*/) {} - - void UpdateAI(const uint32 diff) - { - hyjal_trashAI::UpdateAI(diff); - if (IsEvent || IsOverrun) - npc_escortAI::UpdateAI(diff); - if (IsEvent) - { - if (!pGo) - { - pGo = true; - if (pInstance) - { - if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs - { - for (uint8 i = 0; i < 8; ++i) - AddWaypoint(i, HordeWPs[i][0]+irand(-3,3), HordeWPs[i][1]+irand(-3,3), HordeWPs[i][2]); - Start(false, true); - SetDespawnAtEnd(false); - }else//use alliance WPs - { - for (uint8 i = 0; i < 8; ++i) - AddWaypoint(i, AllianceWPs[i][0]+irand(-3,3), AllianceWPs[i][1]+irand(-3,3), AllianceWPs[i][2]); - Start(false, true); - SetDespawnAtEnd(false); - } - } - } - } - if (!UpdateVictim()) - return; - if (CourseTimer <= diff) - { - DoCast(me->getVictim(), SPELL_BANSHEE_CURSE); - CourseTimer = 20000+rand()%5000; - } else CourseTimer -= diff; - if (WailTimer <= diff) - { - DoCast(me->getVictim(), SPELL_BANSHEE_WAIL); - WailTimer = 15000+rand()%5000; - } else WailTimer -= diff; - if (ShellTimer <= diff) - { - DoCast(me, SPELL_ANTI_MAGIC_SHELL); - ShellTimer = 50000+rand()%10000; - } else ShellTimer -= diff; - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_mob_banshee(Creature* pCreature) -{ - return new mob_bansheeAI(pCreature); -} - -#define SPELL_WEB 28991 - -struct mob_crypt_fiendAI : public hyjal_trashAI -{ - mob_crypt_fiendAI(Creature* c) : hyjal_trashAI(c) - { - pInstance = c->GetInstanceData(); - pGo = false; - pos = 0; - Reset(); - } - - bool pGo; - uint32 WebTimer; - uint32 pos; - void Reset() - { - WebTimer = 20000+rand()%5000; - } - - void WaypointReached(uint32 i) - { - pos = i; - if (i == 7 && pInstance && !IsOverrun) - { - if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall - { - Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); - if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0); - }else{ - Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); - if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0); - } - } - } - - void EnterCombat(Unit* /*who*/) {} - - void UpdateAI(const uint32 diff) - { - hyjal_trashAI::UpdateAI(diff); - if (IsEvent || IsOverrun) - npc_escortAI::UpdateAI(diff); - if (IsEvent) - { - if (!pGo) - { - pGo = true; - if (pInstance) - { - if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs - { - for (uint8 i = 0; i < 8; ++i) - AddWaypoint(i, HordeWPs[i][0]+irand(-3,3), HordeWPs[i][1]+irand(-3,3), HordeWPs[i][2]); - Start(false, true); - SetDespawnAtEnd(false); - }else//use alliance WPs - { - for (uint8 i = 0; i < 8; ++i) - AddWaypoint(i, AllianceWPs[i][0]+irand(-3,3), AllianceWPs[i][1]+irand(-3,3), AllianceWPs[i][2]); - Start(false, true); - SetDespawnAtEnd(false); - } - - } - } - } - if (!UpdateVictim()) - return; - if (WebTimer <= diff) - { - DoCast(me->getVictim(), SPELL_WEB); - WebTimer = 20000+rand()%5000; - } else WebTimer -= diff; - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_mob_crypt_fiend(Creature* pCreature) -{ - return new mob_crypt_fiendAI(pCreature); -} - -#define SPELL_MANA_BURN 31729 - -struct mob_fel_stalkerAI : public hyjal_trashAI -{ - mob_fel_stalkerAI(Creature* c) : hyjal_trashAI(c) - { - pInstance = c->GetInstanceData(); - pGo = false; - pos = 0; - Reset(); - } - - bool pGo; - uint32 ManaBurnTimer; - uint32 pos; - void Reset() - { - ManaBurnTimer = 9000+rand()%5000; - } - - void WaypointReached(uint32 i) - { - pos = i; - if (i == 7 && pInstance && !IsOverrun) - { - if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall - { - Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); - if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0); - }else{ - Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); - if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0); - } - } - } - - void EnterCombat(Unit* /*who*/) {} - - void UpdateAI(const uint32 diff) - { - hyjal_trashAI::UpdateAI(diff); - if (IsEvent || IsOverrun) - npc_escortAI::UpdateAI(diff); - if (IsEvent) - { - if (!pGo) - { - pGo = true; - if (pInstance) - { - if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs - { - for (uint8 i = 0; i < 8; ++i) - AddWaypoint(i, HordeWPs[i][0]+irand(-3,3), HordeWPs[i][1]+irand(-3,3), HordeWPs[i][2]); - Start(false, true); - SetDespawnAtEnd(false); - }else//use alliance WPs - { - for (uint8 i = 0; i < 8; ++i) - AddWaypoint(i, AllianceWPs[i][0]+irand(-3,3), AllianceWPs[i][1]+irand(-3,3), AllianceWPs[i][2]); - Start(false, true); - SetDespawnAtEnd(false); - } - - } - } - } - if (!UpdateVictim()) - return; - if (ManaBurnTimer <= diff) - { - DoCast(me->getVictim(), SPELL_MANA_BURN); - ManaBurnTimer = 9000+rand()%5000; - } else ManaBurnTimer -= diff; - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_mob_fel_stalker(Creature* pCreature) -{ - return new mob_fel_stalkerAI(pCreature); -} - -#define SPELL_FROST_BREATH 31688 - -struct mob_frost_wyrmAI : public hyjal_trashAI -{ - mob_frost_wyrmAI(Creature* c) : hyjal_trashAI(c) - { - pInstance = c->GetInstanceData(); - pGo = false; - pos = 0; - Reset(); - } - - bool pGo; - uint32 FrostBreathTimer; - uint32 pos; - uint32 MoveTimer; - - void Reset() - { - FrostBreathTimer = 5000; - MoveTimer = 0; - me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); - } - - void WaypointReached(uint32 i) - { - pos = i; - if (i == 2 && pInstance && !IsOverrun) - { - Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); - if (pTarget && pTarget->isAlive()) - { - me->AddThreat(pTarget,0.0); - DoCast(pTarget, SPELL_FROST_BREATH, true); - } - } - } - - void JustDied(Unit * /*victim*/) - { - if (pInstance && IsEvent) - pInstance->SetData(DATA_TRASH, 0);//signal trash is dead - - float x,y,z; - me->GetPosition(x,y,z); - z = me->GetMap()->GetHeight(x, y, z); - me->GetMotionMaster()->MovePoint(0,x,y,z); - me->GetMap()->CreatureRelocation(me, x,y,z,0); - } - - void EnterCombat(Unit* /*who*/) {} - - void UpdateAI(const uint32 diff) - { - hyjal_trashAI::UpdateAI(diff); - if (IsEvent || IsOverrun) - { - CAST_AI(hyjal_trashAI, me->AI())->SetCanAttack(false); - npc_escortAI::UpdateAI(diff); - } - if (IsEvent) - { - if (!pGo) - { - pGo = true; - if (pInstance) - { - if (!useFlyPath) - { - for (uint8 i = 0; i < 3; ++i) - AddWaypoint(i, FrostWyrmWPs[i][0], FrostWyrmWPs[i][1], FrostWyrmWPs[i][2]); - Start(false, true); - SetDespawnAtEnd(false); - }else{//fly path FlyPathWPs - for (uint8 i = 0; i < 3; ++i) - AddWaypoint(i, FlyPathWPs[i][0]+irand(-10,10), FlyPathWPs[i][1]+irand(-10,10), FlyPathWPs[i][2]); - Start(false, true); - SetDespawnAtEnd(false); - } - } - } - } - if (!UpdateVictim()) - return; - if (!me->IsWithinDist(me->getVictim(), 25)){ - if (MoveTimer <= diff) - { - me->GetMotionMaster()->MoveChase(me->getVictim()); - MoveTimer = 2000; - } else MoveTimer-=diff; - } - - if (FrostBreathTimer <= diff) - { - if (!me->IsWithinDist(me->getVictim(), 25)) - { - DoCast(me->getVictim(), SPELL_FROST_BREATH); - me->StopMoving(); - me->GetMotionMaster()->Clear(); - FrostBreathTimer = 4000; - } - } else FrostBreathTimer -= diff; - } -}; - -CreatureAI* GetAI_mob_frost_wyrm(Creature* pCreature) -{ - return new mob_frost_wyrmAI(pCreature); -} - -#define SPELL_GARGOYLE_STRIKE 31664 - -struct mob_gargoyleAI : public hyjal_trashAI -{ - mob_gargoyleAI(Creature* c) : hyjal_trashAI(c) - { - pInstance = c->GetInstanceData(); - pGo = false; - pos = 0; - DummyTarget[0] = 0;DummyTarget[1] = 0;DummyTarget[2] = 0; - Reset(); - } - - bool pGo; - uint32 StrikeTimer; - uint32 pos; - uint32 MoveTimer; - float Zpos; - bool forcemove; - - void Reset() - { - forcemove = true; - Zpos = 10.0; - StrikeTimer = 2000+rand()%5000; - MoveTimer = 0; - me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); - } - - void WaypointReached(uint32 i) - { - pos = i; - if (i == 2 && pInstance && !IsOverrun) - { - Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); - if (pTarget && pTarget->isAlive()) - { - me->AddThreat(pTarget,0.0); - DoCast(pTarget, SPELL_GARGOYLE_STRIKE, true); - } - } - } - - void JustDied(Unit *victim) - { - float x,y,z; - me->GetPosition(x,y,z); - z = me->GetMap()->GetHeight(x, y, z); - me->GetMotionMaster()->MovePoint(0,x,y,z); - me->GetMap()->CreatureRelocation(me, x,y,z,0); - hyjal_trashAI::JustDied(victim); - } - - void UpdateAI(const uint32 diff) - { - hyjal_trashAI::UpdateAI(diff); - if (IsEvent || IsOverrun) - { - CAST_AI(hyjal_trashAI, me->AI())->SetCanAttack(false); - npc_escortAI::UpdateAI(diff); - } - if (IsEvent) - { - if (!pGo) - { - pGo = true; - if (pInstance) - { - if (!useFlyPath) - { - for (uint8 i = 0; i < 3; ++i) - AddWaypoint(i, GargoyleWPs[i][0]+irand(-10,10), GargoyleWPs[i][1]+irand(-10,10), GargoyleWPs[i][2]); - Start(false, true); - SetDespawnAtEnd(false); - }else{//fly path FlyPathWPs - for (uint8 i = 0; i < 3; ++i) - AddWaypoint(i, FlyPathWPs[i][0]+irand(-10,10), FlyPathWPs[i][1]+irand(-10,10), FlyPathWPs[i][2]); - Start(false, true); - SetDespawnAtEnd(false); - } - } - } - } - if (IsOverrun && !UpdateVictim()) - { - if (faction == 0)//alliance - { - if (StrikeTimer <= diff) - { - me->CastSpell(DummyTarget[0],DummyTarget[1],DummyTarget[2],SPELL_GARGOYLE_STRIKE,false); - StrikeTimer = 2000+rand()%1000; - } else StrikeTimer -= diff; - } - } - if (!UpdateVictim()) - return; - if (!me->IsWithinDist(me->getVictim(), 20) || forcemove) - { - forcemove = false; - if (forcemove) - { - Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); - if (pTarget) - me->Attack(pTarget,false); - } - if (MoveTimer <= diff) - { - float x,y,z; - me->getVictim()->GetPosition(x,y,z); - me->GetMotionMaster()->MovePoint(0,x,y,z+Zpos); - Zpos-=1.0; - if (Zpos <= 0)Zpos=0; - MoveTimer = 2000; - } else MoveTimer-=diff; - } - if (StrikeTimer <= diff) - { - if (me->IsWithinDist(me->getVictim(), 20)) - { - DoCast(me->getVictim(), SPELL_GARGOYLE_STRIKE); - me->StopMoving(); - me->GetMotionMaster()->Clear(); - StrikeTimer = 2000+rand()%1000; - } else StrikeTimer=0; - } else StrikeTimer -= diff; - } -}; - -CreatureAI* GetAI_mob_gargoyle(Creature* pCreature) -{ - return new mob_gargoyleAI(pCreature); -} - -#define SPELL_EXPLODING_SHOT 7896 - -struct alliance_riflemanAI : public Scripted_NoMovementAI -{ - alliance_riflemanAI(Creature *c) : Scripted_NoMovementAI(c) - { - Reset(); - } - - uint32 ExplodeTimer; - - void JustDied(Unit* /*who*/) - { - } - - void Reset() - { - ExplodeTimer = 5000+rand()%5000; - } - - void MoveInLineOfSight(Unit *who) - { - if (!who || me->getVictim()) - return; - - if (who->isTargetableForAttack() && me->IsHostileTo(who)) - { - //float attackRadius = me->GetAttackDistance(who); - if (me->IsWithinDistInMap(who, 30)) - AttackStart(who); - } - } - - void EnterCombat(Unit * /*who*/) - { - } - - void UpdateAI(const uint32 diff) - { - //Check if we have a target - if (!UpdateVictim()) - return; - if (ExplodeTimer <= diff) - { - if (!me->IsWithinDistInMap(me->getVictim(), 30)) - { - EnterEvadeMode(); - return; - } - int dmg = 500+rand()%700; - me->CastCustomSpell(me->getVictim(), SPELL_EXPLODING_SHOT, &dmg, 0, 0, false); - ExplodeTimer = 5000+rand()%5000; - } else ExplodeTimer -= diff; - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_alliance_rifleman(Creature* pCreature) -{ - return new alliance_riflemanAI(pCreature); -} - -void AddSC_hyjal_trash() -{ - Script *newscript = new Script; - newscript->Name = "mob_giant_infernal"; - newscript->GetAI = &GetAI_mob_giant_infernal; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_abomination"; - newscript->GetAI = &GetAI_mob_abomination; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_ghoul"; - newscript->GetAI = &GetAI_mob_ghoul; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_necromancer"; - newscript->GetAI = &GetAI_mob_necromancer; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_banshee"; - newscript->GetAI = &GetAI_mob_banshee; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_crypt_fiend"; - newscript->GetAI = &GetAI_mob_crypt_fiend; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_fel_stalker"; - newscript->GetAI = &GetAI_mob_fel_stalker; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_frost_wyrm"; - newscript->GetAI = &GetAI_mob_frost_wyrm; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_gargoyle"; - newscript->GetAI = &GetAI_mob_gargoyle; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "alliance_rifleman"; - newscript->GetAI = &GetAI_alliance_rifleman; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/hyjal/hyjal_trash.h b/src/server/scripts/Kalimdor/CavernsOfTime/hyjal/hyjal_trash.h deleted file mode 100644 index 21ee4bc06cc..00000000000 --- a/src/server/scripts/Kalimdor/CavernsOfTime/hyjal/hyjal_trash.h +++ /dev/null @@ -1,35 +0,0 @@ - -#ifndef SC_HYJAL_TRASH_AI_H -#define SC_HYJAL_TRASH_AI_H - -#include "hyjal.h" -#include "ScriptedEscortAI.h" - -#define MINRAIDDAMAGE 700000//minimal damage before trash can drop loot and reputation, resets if faction leader dies - -struct hyjal_trashAI : public npc_escortAI -{ - hyjal_trashAI(Creature *c); - - void UpdateAI(const uint32 diff); - - void JustDied(Unit* /*killer*/); - - void DamageTaken(Unit *done_by, uint32 &damage); - - public: - ScriptedInstance* pInstance; - bool IsEvent; - uint32 Delay; - uint32 LastOverronPos; - bool IsOverrun; - bool SetupOverrun; - uint32 OverrunType; - uint8 faction; - bool useFlyPath; - uint32 damageTaken; - float DummyTarget[3]; - - //private: -}; -#endif diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/hyjal/instance_hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/hyjal/instance_hyjal.cpp deleted file mode 100644 index e89d518c5bc..00000000000 --- a/src/server/scripts/Kalimdor/CavernsOfTime/hyjal/instance_hyjal.cpp +++ /dev/null @@ -1,324 +0,0 @@ - /* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: Instance_Mount_Hyjal -SD%Complete: 100 -SDComment: Instance Data Scripts and functions to acquire mobs and set encounter status for use in various Hyjal Scripts -SDCategory: Caverns of Time, Mount Hyjal -EndScriptData */ - -#include "ScriptedPch.h" -#include "hyjal.h" -#include "hyjal_trash.h" - -enum eEnums -{ - MAX_ENCOUNTER = 5, - - GO_ANCIENT_GEM = 185557 -}; -/* Battle of Mount Hyjal encounters: -0 - Rage Winterchill event -1 - Anetheron event -2 - Kaz'rogal event -3 - Azgalor event -4 - Archimonde event -*/ - -struct instance_mount_hyjal : public ScriptedInstance -{ - instance_mount_hyjal(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; - - uint32 m_auiEncounter[MAX_ENCOUNTER]; - std::string str_data; - - std::list m_uiAncientGemGUID; - - uint64 RageWinterchill; - uint64 Anetheron; - uint64 Kazrogal; - uint64 Azgalor; - uint64 Archimonde; - uint64 JainaProudmoore; - uint64 Thrall; - uint64 TyrandeWhisperwind; - uint64 HordeGate; - uint64 ElfGate; - - uint32 Trash; - - uint32 hordeRetreat; - uint32 allianceRetreat; - bool ArchiYell; - - uint32 RaidDamage; - - #define YELL_EFFORTS "All of your efforts have been in vain, for the draining of the World Tree has already begun. Soon the heart of your world will beat no more." - #define YELL_EFFORTS_NAME "Archimonde" - - void Initialize() - { - memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); - - m_uiAncientGemGUID.clear(); - - RageWinterchill = 0; - Anetheron = 0; - Kazrogal = 0; - Azgalor = 0; - Archimonde = 0; - JainaProudmoore = 0; - Thrall = 0; - TyrandeWhisperwind = 0; - HordeGate = 0; - ElfGate = 0; - ArchiYell = false; - RaidDamage = 0; - - Trash = 0; - - hordeRetreat = 0; - allianceRetreat = 0; - } - - bool IsEncounterInProgress() const - { - for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) - if (m_auiEncounter[i] == IN_PROGRESS) return true; - - return false; - } - - void OnGameObjectCreate(GameObject* pGo, bool /*add*/) - { - switch(pGo->GetEntry()) - { - case 182060: - HordeGate = pGo->GetGUID(); - if (allianceRetreat) - HandleGameObject(0, true, pGo); - else - HandleGameObject(0, false, pGo); - break; - case 182061: - ElfGate = pGo->GetGUID(); - if (hordeRetreat) - HandleGameObject(0, true, pGo); - else - HandleGameObject(0, false, pGo); - break; - case GO_ANCIENT_GEM: - m_uiAncientGemGUID.push_back(pGo->GetGUID()); - break; - } - } - - void OnCreatureCreate(Creature* pCreature, bool /*add*/) - { - switch(pCreature->GetEntry()) - { - case 17767: RageWinterchill = pCreature->GetGUID(); break; - case 17808: Anetheron = pCreature->GetGUID(); break; - case 17888: Kazrogal = pCreature->GetGUID(); break; - case 17842: Azgalor = pCreature->GetGUID(); break; - case 17968: Archimonde = pCreature->GetGUID(); break; - case 17772: JainaProudmoore = pCreature->GetGUID(); break; - case 17852: Thrall = pCreature->GetGUID(); break; - case 17948: TyrandeWhisperwind = pCreature->GetGUID(); break; - } - } - - uint64 GetData64(uint32 identifier) - { - switch(identifier) - { - case DATA_RAGEWINTERCHILL: return RageWinterchill; - case DATA_ANETHERON: return Anetheron; - case DATA_KAZROGAL: return Kazrogal; - case DATA_AZGALOR: return Azgalor; - case DATA_ARCHIMONDE: return Archimonde; - case DATA_JAINAPROUDMOORE: return JainaProudmoore; - case DATA_THRALL: return Thrall; - case DATA_TYRANDEWHISPERWIND: return TyrandeWhisperwind; - } - - return 0; - } - - void SetData(uint32 type, uint32 data) - { - switch(type) - { - case DATA_RAGEWINTERCHILLEVENT: m_auiEncounter[0] = data; break; - case DATA_ANETHERONEVENT: - m_auiEncounter[1] = data; - break; - case DATA_KAZROGALEVENT: m_auiEncounter[2] = data; break; - case DATA_AZGALOREVENT: - { - m_auiEncounter[3] = data; - if (data == DONE) - { - if (ArchiYell)break; - ArchiYell = true; - - Creature* pCreature = instance->GetCreature(Azgalor); - if (pCreature) - { - Creature* pUnit = pCreature->SummonCreature(21987,pCreature->GetPositionX(),pCreature->GetPositionY(),pCreature->GetPositionZ(),0,TEMPSUMMON_TIMED_DESPAWN,10000); - - Map* pMap = pCreature->GetMap(); - if (pMap->IsDungeon() && pUnit) - { - pUnit->SetVisibility(VISIBILITY_OFF); - Map::PlayerList const &PlayerList = pMap->GetPlayers(); - if (PlayerList.isEmpty()) - return; - - for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) - { - if (i->getSource()) - { - WorldPacket data(SMSG_MESSAGECHAT, 200); - pUnit->BuildMonsterChat(&data,CHAT_MSG_MONSTER_YELL,YELL_EFFORTS,0,YELL_EFFORTS_NAME,i->getSource()->GetGUID()); - i->getSource()->GetSession()->SendPacket(&data); - - WorldPacket data2(SMSG_PLAY_SOUND, 4); - data2 << 10986; - i->getSource()->GetSession()->SendPacket(&data2); - } - } - } - } - } - } - break; - case DATA_ARCHIMONDEEVENT: m_auiEncounter[4] = data; break; - case DATA_RESET_TRASH_COUNT: Trash = 0; break; - - case DATA_TRASH: - if (data) Trash = data; - else Trash--; - DoUpdateWorldState(WORLD_STATE_ENEMYCOUNT, Trash); - break; - case TYPE_RETREAT: - if (data == SPECIAL) - { - if (!m_uiAncientGemGUID.empty()) - { - for (std::list::const_iterator itr = m_uiAncientGemGUID.begin(); itr != m_uiAncientGemGUID.end(); ++itr) - { - //don't know how long it expected - DoRespawnGameObject(*itr,DAY); - } - } - } - break; - case DATA_ALLIANCE_RETREAT: - allianceRetreat = data; - HandleGameObject(HordeGate, true); - SaveToDB(); - break; - case DATA_HORDE_RETREAT: - hordeRetreat = data; - HandleGameObject(ElfGate, true); - SaveToDB(); - break; - case DATA_RAIDDAMAGE: - RaidDamage += data; - if (RaidDamage >= MINRAIDDAMAGE) - RaidDamage = MINRAIDDAMAGE; - break; - case DATA_RESET_RAIDDAMAGE: - RaidDamage = 0; - break; - } - - debug_log("TSCR: Instance Hyjal: Instance data updated for event %u (Data=%u)",type,data); - - if (data == DONE) - { - OUT_SAVE_INST_DATA; - - std::ostringstream saveStream; - saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " " - << m_auiEncounter[3] << " " << m_auiEncounter[4] - << " " << allianceRetreat << " " << hordeRetreat - << " " << RaidDamage; - - str_data = saveStream.str(); - - SaveToDB(); - OUT_SAVE_INST_DATA_COMPLETE; - } - - } - - uint32 GetData(uint32 type) - { - switch(type) - { - case DATA_RAGEWINTERCHILLEVENT: return m_auiEncounter[0]; - case DATA_ANETHERONEVENT: return m_auiEncounter[1]; - case DATA_KAZROGALEVENT: return m_auiEncounter[2]; - case DATA_AZGALOREVENT: return m_auiEncounter[3]; - case DATA_ARCHIMONDEEVENT: return m_auiEncounter[4]; - case DATA_TRASH: return Trash; - case DATA_ALLIANCE_RETREAT: return allianceRetreat; - case DATA_HORDE_RETREAT: return hordeRetreat; - case DATA_RAIDDAMAGE: return RaidDamage; - } - return 0; - } - - std::string GetSaveData() - { - return str_data; - } - - void Load(const char* in) - { - if (!in) - { - OUT_LOAD_INST_DATA_FAIL; - return; - } - - OUT_LOAD_INST_DATA(in); - std::istringstream loadStream(in); - loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3] >> m_auiEncounter[4] >> allianceRetreat >> hordeRetreat >> RaidDamage; - for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) - if (m_auiEncounter[i] == IN_PROGRESS) // Do not load an encounter as IN_PROGRESS - reset it instead. - m_auiEncounter[i] = NOT_STARTED; - OUT_LOAD_INST_DATA_COMPLETE; - } -}; - -InstanceData* GetInstanceData_instance_mount_hyjal(Map* pMap) -{ - return new instance_mount_hyjal(pMap); -} - -void AddSC_instance_mount_hyjal() -{ - Script *newscript; - newscript = new Script; - newscript->Name = "instance_hyjal"; - newscript->GetInstanceData = &GetInstanceData_instance_mount_hyjal; - newscript->RegisterSelf(); -} - diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/old_hillsbrad/boss_captain_skarloc.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/old_hillsbrad/boss_captain_skarloc.cpp deleted file mode 100644 index 91c9e274b83..00000000000 --- a/src/server/scripts/Kalimdor/CavernsOfTime/old_hillsbrad/boss_captain_skarloc.cpp +++ /dev/null @@ -1,152 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: Boss_Captain_Skarloc -SD%Complete: 75 -SDComment: Missing adds, missing waypoints to move up to Thrall once spawned + speech before enter combat. -SDCategory: Caverns of Time, Old Hillsbrad Foothills -EndScriptData */ - -#include "ScriptedPch.h" -#include "old_hillsbrad.h" - -#define SAY_ENTER -1560000 -#define SAY_TAUNT1 -1560001 -#define SAY_TAUNT2 -1560002 -#define SAY_SLAY1 -1560003 -#define SAY_SLAY2 -1560004 -#define SAY_DEATH -1560005 - -#define SPELL_HOLY_LIGHT 29427 -#define SPELL_CLEANSE 29380 -#define SPELL_HAMMER_OF_JUSTICE 13005 -#define SPELL_HOLY_SHIELD 31904 -#define SPELL_DEVOTION_AURA 8258 -#define SPELL_CONSECRATION 38385 - -struct boss_captain_skarlocAI : public ScriptedAI -{ - boss_captain_skarlocAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - } - - ScriptedInstance *pInstance; - - uint32 Holy_Light_Timer; - uint32 Cleanse_Timer; - uint32 HammerOfJustice_Timer; - uint32 HolyShield_Timer; - uint32 DevotionAura_Timer; - uint32 Consecration_Timer; - - void Reset() - { - Holy_Light_Timer = 20000 + rand()%10000; - Cleanse_Timer = 10000; - HammerOfJustice_Timer = 20000 + rand()%15000; - HolyShield_Timer = 240000; - DevotionAura_Timer = 3000; - Consecration_Timer = 8000; - } - - void EnterCombat(Unit * /*who*/) - { - //This is not correct. Should taunt Thrall before engage in combat - DoScriptText(SAY_TAUNT1, me); - DoScriptText(SAY_TAUNT2, me); - } - - void KilledUnit(Unit * /*victim*/) - { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); - } - - void JustDied(Unit * /*victim*/) - { - DoScriptText(SAY_DEATH, me); - - if (pInstance && pInstance->GetData(TYPE_THRALL_EVENT) == IN_PROGRESS) - pInstance->SetData(TYPE_THRALL_PART1, DONE); - } - - void UpdateAI(const uint32 diff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - //Holy_Light - if (Holy_Light_Timer <= diff) - { - DoCast(me, SPELL_HOLY_LIGHT); - Holy_Light_Timer = 30000; - } else Holy_Light_Timer -= diff; - - //Cleanse - if (Cleanse_Timer <= diff) - { - DoCast(me, SPELL_CLEANSE); - Cleanse_Timer = 10000; - } else Cleanse_Timer -= diff; - - //Hammer of Justice - if (HammerOfJustice_Timer <= diff) - { - DoCast(me->getVictim(), SPELL_HAMMER_OF_JUSTICE); - HammerOfJustice_Timer = 60000; - } else HammerOfJustice_Timer -= diff; - - //Holy Shield - if (HolyShield_Timer <= diff) - { - DoCast(me, SPELL_HOLY_SHIELD); - HolyShield_Timer = 240000; - } else HolyShield_Timer -= diff; - - //Devotion_Aura - if (DevotionAura_Timer <= diff) - { - DoCast(me, SPELL_DEVOTION_AURA); - DevotionAura_Timer = 45000 + rand()%10000; - } else DevotionAura_Timer -= diff; - - //Consecration - if (Consecration_Timer <= diff) - { - //DoCast(me->getVictim(), SPELL_CONSECRATION); - Consecration_Timer = 5000 + rand()%5000; - } else Consecration_Timer -= diff; - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_boss_captain_skarloc(Creature* pCreature) -{ - return new boss_captain_skarlocAI (pCreature); -} - -void AddSC_boss_captain_skarloc() -{ - Script *newscript; - newscript = new Script; - newscript->Name = "boss_captain_skarloc"; - newscript->GetAI = &GetAI_boss_captain_skarloc; - newscript->RegisterSelf(); -} - diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/old_hillsbrad/boss_epoch_hunter.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/old_hillsbrad/boss_epoch_hunter.cpp deleted file mode 100644 index 2c2ad96ddb7..00000000000 --- a/src/server/scripts/Kalimdor/CavernsOfTime/old_hillsbrad/boss_epoch_hunter.cpp +++ /dev/null @@ -1,138 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: Boss_Epoch_Hunter -SD%Complete: 60 -SDComment: Missing spawns pre-event, missing speech to be coordinated with rest of escort event. -SDCategory: Caverns of Time, Old Hillsbrad Foothills -EndScriptData */ - -#include "ScriptedPch.h" -#include "old_hillsbrad.h" - -#define SAY_ENTER1 -1560013 -#define SAY_ENTER2 -1560014 -#define SAY_ENTER3 -1560015 -#define SAY_AGGRO1 -1560016 -#define SAY_AGGRO2 -1560017 -#define SAY_SLAY1 -1560018 -#define SAY_SLAY2 -1560019 -#define SAY_BREATH1 -1560020 -#define SAY_BREATH2 -1560021 -#define SAY_DEATH -1560022 - -#define SPELL_SAND_BREATH 31914 -#define SPELL_IMPENDING_DEATH 31916 -#define SPELL_MAGIC_DISRUPTION_AURA 33834 -#define SPELL_WING_BUFFET 31475 - -struct boss_epoch_hunterAI : public ScriptedAI -{ - boss_epoch_hunterAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - } - - ScriptedInstance *pInstance; - - uint32 SandBreath_Timer; - uint32 ImpendingDeath_Timer; - uint32 WingBuffet_Timer; - uint32 Mda_Timer; - - void Reset() - { - SandBreath_Timer = 8000 + rand()%8000; - ImpendingDeath_Timer = 25000 + rand()%5000; - WingBuffet_Timer = 35000; - Mda_Timer = 40000; - } - - void EnterCombat(Unit * /*who*/) - { - DoScriptText(RAND(SAY_AGGRO1,SAY_AGGRO2), me); - } - - void KilledUnit(Unit * /*victim*/) - { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); - } - - void JustDied(Unit * /*victim*/) - { - DoScriptText(SAY_DEATH, me); - - if (pInstance && pInstance->GetData(TYPE_THRALL_EVENT) == IN_PROGRESS) - pInstance->SetData(TYPE_THRALL_PART4, DONE); - } - - void UpdateAI(const uint32 diff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - //Sand Breath - if (SandBreath_Timer <= diff) - { - if (me->IsNonMeleeSpellCasted(false)) - me->InterruptNonMeleeSpells(false); - - DoCast(me->getVictim(), SPELL_SAND_BREATH); - - DoScriptText(RAND(SAY_BREATH1,SAY_BREATH2), me); - - SandBreath_Timer = 10000 + rand()%10000; - } else SandBreath_Timer -= diff; - - if (ImpendingDeath_Timer <= diff) - { - DoCast(me->getVictim(), SPELL_IMPENDING_DEATH); - ImpendingDeath_Timer = 25000+rand()%5000; - } else ImpendingDeath_Timer -= diff; - - if (WingBuffet_Timer <= diff) - { - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget, SPELL_WING_BUFFET); - WingBuffet_Timer = 25000+rand()%10000; - } else WingBuffet_Timer -= diff; - - if (Mda_Timer <= diff) - { - DoCast(me, SPELL_MAGIC_DISRUPTION_AURA); - Mda_Timer = 15000; - } else Mda_Timer -= diff; - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_boss_epoch_hunter(Creature* pCreature) -{ - return new boss_epoch_hunterAI (pCreature); -} - -void AddSC_boss_epoch_hunter() -{ - Script *newscript; - newscript = new Script; - newscript->Name = "boss_epoch_hunter"; - newscript->GetAI = &GetAI_boss_epoch_hunter; - newscript->RegisterSelf(); -} - diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/old_hillsbrad/boss_leutenant_drake.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/old_hillsbrad/boss_leutenant_drake.cpp deleted file mode 100644 index dae0f5390b1..00000000000 --- a/src/server/scripts/Kalimdor/CavernsOfTime/old_hillsbrad/boss_leutenant_drake.cpp +++ /dev/null @@ -1,190 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: Boss_Luetenant_Drake -SD%Complete: 70 -SDComment: Missing proper code for patrolling area after being spawned. Script for GO (barrels) quest 10283 -SDCategory: Caverns of Time, Old Hillsbrad Foothills -EndScriptData */ - -#include "ScriptedPch.h" -#include "old_hillsbrad.h" -#include "ScriptedEscortAI.h" - -/*###### -## go_barrel_old_hillsbrad -######*/ - -bool GOHello_go_barrel_old_hillsbrad(Player* /*pPlayer*/, GameObject* pGO) -{ - if (ScriptedInstance* pInstance = pGO->GetInstanceData()) - { - if (pInstance->GetData(TYPE_BARREL_DIVERSION) == DONE) - return false; - - pInstance->SetData(TYPE_BARREL_DIVERSION, IN_PROGRESS); - } - - return false; -} - -/*###### -## boss_lieutenant_drake -######*/ - -#define SAY_ENTER -1560006 -#define SAY_AGGRO -1560007 -#define SAY_SLAY1 -1560008 -#define SAY_SLAY2 -1560009 -#define SAY_MORTAL -1560010 -#define SAY_SHOUT -1560011 -#define SAY_DEATH -1560012 - -#define SPELL_WHIRLWIND 31909 -#define SPELL_HAMSTRING 9080 -#define SPELL_MORTAL_STRIKE 31911 -#define SPELL_FRIGHTENING_SHOUT 33789 - -struct Location -{ - uint32 wpId; - float x; - float y; - float z; -}; - -static Location DrakeWP[]= -{ - {0, 2125.84, 88.2535, 54.8830}, - {1, 2111.01, 93.8022, 52.6356}, - {2, 2106.70, 114.753, 53.1965}, - {3, 2107.76, 138.746, 52.5109}, - {4, 2114.83, 160.142, 52.4738}, - {5, 2125.24, 178.909, 52.7283}, - {6, 2151.02, 208.901, 53.1551}, - {7, 2177.00, 233.069, 52.4409}, - {8, 2190.71, 227.831, 53.2742}, - {9, 2178.14, 214.219, 53.0779}, - {10, 2154.99, 202.795, 52.6446}, - {11, 2132.00, 191.834, 52.5709}, - {12, 2117.59, 166.708, 52.7686}, - {13, 2093.61, 139.441, 52.7616}, - {14, 2086.29, 104.950, 52.9246}, - {15, 2094.23, 81.2788, 52.6946}, - {16, 2108.70, 85.3075, 53.3294}, - {17, 2125.50, 88.9481, 54.7953}, - {18, 2128.20, 70.9763, 64.4221} -}; - -struct boss_lieutenant_drakeAI : public ScriptedAI -{ - boss_lieutenant_drakeAI(Creature *c) : ScriptedAI(c) {} - - bool CanPatrol; - uint32 wpId; - - uint32 Whirlwind_Timer; - uint32 Fear_Timer; - uint32 MortalStrike_Timer; - uint32 ExplodingShout_Timer; - - void Reset() - { - CanPatrol = true; - wpId = 0; - - Whirlwind_Timer = 20000; - Fear_Timer = 30000; - MortalStrike_Timer = 45000; - ExplodingShout_Timer = 25000; - } - - void EnterCombat(Unit * /*who*/) - { - DoScriptText(SAY_AGGRO, me); - } - - void KilledUnit(Unit * /*victim*/) - { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); - } - - void JustDied(Unit * /*victim*/) - { - DoScriptText(SAY_DEATH, me); - } - - void UpdateAI(const uint32 diff) - { - //TODO: make this work - if (CanPatrol && wpId == 0) - { - me->GetMotionMaster()->MovePoint(DrakeWP[0].wpId, DrakeWP[0].x, DrakeWP[0].y, DrakeWP[0].z); - ++wpId; - } - - //Return since we have no target - if (!UpdateVictim()) - return; - - //Whirlwind - if (Whirlwind_Timer <= diff) - { - DoCast(me->getVictim(), SPELL_WHIRLWIND); - Whirlwind_Timer = 20000+rand()%5000; - } else Whirlwind_Timer -= diff; - - //Fear - if (Fear_Timer <= diff) - { - DoScriptText(SAY_SHOUT, me); - DoCast(me->getVictim(), SPELL_FRIGHTENING_SHOUT); - Fear_Timer = 25000+rand()%10000; - } else Fear_Timer -= diff; - - //Mortal Strike - if (MortalStrike_Timer <= diff) - { - DoScriptText(SAY_MORTAL, me); - DoCast(me->getVictim(), SPELL_MORTAL_STRIKE); - MortalStrike_Timer = 20000+rand()%10000; - } else MortalStrike_Timer -= diff; - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_boss_lieutenant_drake(Creature* pCreature) -{ - return new boss_lieutenant_drakeAI (pCreature); -} - -void AddSC_boss_lieutenant_drake() -{ - Script *newscript; - - newscript = new Script; - newscript->Name = "go_barrel_old_hillsbrad"; - newscript->pGOHello = &GOHello_go_barrel_old_hillsbrad; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "boss_lieutenant_drake"; - newscript->GetAI = &GetAI_boss_lieutenant_drake; - newscript->RegisterSelf(); -} - diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/old_hillsbrad/instance_old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/old_hillsbrad/instance_old_hillsbrad.cpp deleted file mode 100644 index fa0b7c14595..00000000000 --- a/src/server/scripts/Kalimdor/CavernsOfTime/old_hillsbrad/instance_old_hillsbrad.cpp +++ /dev/null @@ -1,238 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: Instance_Old_Hillsbrad -SD%Complete: 75 -SDComment: If thrall escort fail, all parts will reset. In future, save sub-parts and continue from last known. -SDCategory: Caverns of Time, Old Hillsbrad Foothills -EndScriptData */ - -#include "ScriptedPch.h" -#include "old_hillsbrad.h" - -#define MAX_ENCOUNTER 6 - -#define THRALL_ENTRY 17876 -#define TARETHA_ENTRY 18887 -#define EPOCH_ENTRY 18096 - -#define DRAKE_ENTRY 17848 - -#define QUEST_ENTRY_DIVERSION 10283 -#define LODGE_QUEST_TRIGGER 20155 - -struct instance_old_hillsbrad : public ScriptedInstance -{ - instance_old_hillsbrad(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; - - uint32 m_auiEncounter[MAX_ENCOUNTER]; - uint32 mBarrelCount; - uint32 mThrallEventCount; - - uint64 ThrallGUID; - uint64 TarethaGUID; - uint64 EpochGUID; - - void Initialize() - { - memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); - - mBarrelCount = 0; - mThrallEventCount = 0; - ThrallGUID = 0; - TarethaGUID = 0; - EpochGUID = 0; - } - - Player* GetPlayerInMap() - { - Map::PlayerList const& players = instance->GetPlayers(); - - if (!players.isEmpty()) - { - for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) - { - if (Player* plr = itr->getSource()) - return plr; - } - } - - debug_log("TSCR: Instance Old Hillsbrad: GetPlayerInMap, but PlayerList is empty!"); - return NULL; - } - - void UpdateQuestCredit() - { - Map::PlayerList const& players = instance->GetPlayers(); - - if (!players.isEmpty()) - { - for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) - { - if (Player* pPlayer = itr->getSource()) - pPlayer->KilledMonsterCredit(LODGE_QUEST_TRIGGER,0); - } - } - } - - void OnCreatureCreate(Creature* pCreature, bool /*add*/) - { - switch(pCreature->GetEntry()) - { - case THRALL_ENTRY: - ThrallGUID = pCreature->GetGUID(); - break; - case TARETHA_ENTRY: - TarethaGUID = pCreature->GetGUID(); - break; - case EPOCH_ENTRY: - EpochGUID = pCreature->GetGUID(); - break; - } - } - - void SetData(uint32 type, uint32 data) - { - Player* pPlayer = GetPlayerInMap(); - - if (!pPlayer) - { - debug_log("TSCR: Instance Old Hillsbrad: SetData (Type: %u Data %u) cannot find any player.", type, data); - return; - } - - switch(type) - { - case TYPE_BARREL_DIVERSION: - { - if (data == IN_PROGRESS) - { - if (mBarrelCount >= 5) - return; - - ++mBarrelCount; - DoUpdateWorldState(WORLD_STATE_OH, mBarrelCount); - - debug_log("TSCR: Instance Old Hillsbrad: go_barrel_old_hillsbrad count %u",mBarrelCount); - - m_auiEncounter[0] = IN_PROGRESS; - - if (mBarrelCount == 5) - { - UpdateQuestCredit(); - pPlayer->SummonCreature(DRAKE_ENTRY, 2128.43, 71.01, 64.42, 1.74, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 1800000); - m_auiEncounter[0] = DONE; - } - } - break; - } - case TYPE_THRALL_EVENT: - { - if (data == FAIL) - { - if (mThrallEventCount <= 20) - { - ++mThrallEventCount; - m_auiEncounter[1] = NOT_STARTED; - debug_log("TSCR: Instance Old Hillsbrad: Thrall event failed %u times. Resetting all sub-events.",mThrallEventCount); - m_auiEncounter[2] = NOT_STARTED; - m_auiEncounter[3] = NOT_STARTED; - m_auiEncounter[4] = NOT_STARTED; - m_auiEncounter[5] = NOT_STARTED; - } - else if (mThrallEventCount > 20) - { - m_auiEncounter[1] = data; - m_auiEncounter[2] = data; - m_auiEncounter[3] = data; - m_auiEncounter[4] = data; - m_auiEncounter[5] = data; - debug_log("TSCR: Instance Old Hillsbrad: Thrall event failed %u times. Resetting all sub-events.",mThrallEventCount); - } - } - else - m_auiEncounter[1] = data; - debug_log("TSCR: Instance Old Hillsbrad: Thrall escort event adjusted to data %u.",data); - break; - } - case TYPE_THRALL_PART1: - m_auiEncounter[2] = data; - debug_log("TSCR: Instance Old Hillsbrad: Thrall event part I adjusted to data %u.",data); - break; - case TYPE_THRALL_PART2: - m_auiEncounter[3] = data; - debug_log("TSCR: Instance Old Hillsbrad: Thrall event part II adjusted to data %u.",data); - break; - case TYPE_THRALL_PART3: - m_auiEncounter[4] = data; - debug_log("TSCR: Instance Old Hillsbrad: Thrall event part III adjusted to data %u.",data); - break; - case TYPE_THRALL_PART4: - m_auiEncounter[5] = data; - debug_log("TSCR: Instance Old Hillsbrad: Thrall event part IV adjusted to data %u.",data); - break; - } - } - - uint32 GetData(uint32 data) - { - switch(data) - { - case TYPE_BARREL_DIVERSION: - return m_auiEncounter[0]; - case TYPE_THRALL_EVENT: - return m_auiEncounter[1]; - case TYPE_THRALL_PART1: - return m_auiEncounter[2]; - case TYPE_THRALL_PART2: - return m_auiEncounter[3]; - case TYPE_THRALL_PART3: - return m_auiEncounter[4]; - case TYPE_THRALL_PART4: - return m_auiEncounter[5]; - } - return 0; - } - - uint64 GetData64(uint32 data) - { - switch(data) - { - case DATA_THRALL: - return ThrallGUID; - case DATA_TARETHA: - return TarethaGUID; - case DATA_EPOCH: - return EpochGUID; - } - return 0; - } -}; -InstanceData* GetInstanceData_instance_old_hillsbrad(Map* pMap) -{ - return new instance_old_hillsbrad(pMap); -} - -void AddSC_instance_old_hillsbrad() -{ - Script *newscript; - newscript = new Script; - newscript->Name = "instance_old_hillsbrad"; - newscript->GetInstanceData = &GetInstanceData_instance_old_hillsbrad; - newscript->RegisterSelf(); -} - diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/old_hillsbrad/old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/old_hillsbrad/old_hillsbrad.cpp deleted file mode 100644 index 08c63954db5..00000000000 --- a/src/server/scripts/Kalimdor/CavernsOfTime/old_hillsbrad/old_hillsbrad.cpp +++ /dev/null @@ -1,658 +0,0 @@ - /* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: Old_Hillsbrad -SD%Complete: 40 -SDComment: Quest support: 10283, 10284. All friendly NPC's. Thrall waypoints fairly complete, missing many details, but possible to complete escort. -SDCategory: Caverns of Time, Old Hillsbrad Foothills -EndScriptData */ - -/* ContentData -npc_erozion -npc_thrall_old_hillsbrad -npc_taretha -EndContentData */ - -#include "ScriptedPch.h" -#include "ScriptedEscortAI.h" -#include "old_hillsbrad.h" - -#define QUEST_ENTRY_HILLSBRAD 10282 -#define QUEST_ENTRY_DIVERSION 10283 -#define QUEST_ENTRY_ESCAPE 10284 -#define QUEST_ENTRY_RETURN 10285 -#define ITEM_ENTRY_BOMBS 25853 - -#define GOSSIP_HELLO_EROZION1 "I need a pack of Incendiary Bombs." -#define GOSSIP_HELLO_EROZION2 "[PH] Teleport please, i'm tired." - -/*###### -## npc_erozion -######*/ - -bool GossipHello_npc_erozion(Player* pPlayer, Creature* pCreature) -{ - if (pCreature->isQuestGiver()) - pPlayer->PrepareQuestMenu(pCreature->GetGUID()); - - ScriptedInstance* pInstance = pCreature->GetInstanceData(); - if (pInstance && pInstance->GetData(TYPE_BARREL_DIVERSION) != DONE && !pPlayer->HasItemCount(ITEM_ENTRY_BOMBS,1)) - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_EROZION1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - - if (!pPlayer->GetQuestRewardStatus(QUEST_ENTRY_RETURN) && pPlayer->GetQuestStatus(QUEST_ENTRY_RETURN) == QUEST_STATUS_COMPLETE) - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_EROZION2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); - - pPlayer->SEND_GOSSIP_MENU(9778, pCreature->GetGUID()); - - return true; -} - -bool GossipSelect_npc_erozion(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) -{ - if (uiAction == GOSSIP_ACTION_INFO_DEF+1) - { - ItemPosCountVec dest; - uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, ITEM_ENTRY_BOMBS, 1); - if (msg == EQUIP_ERR_OK) - { - pPlayer->StoreNewItem(dest, ITEM_ENTRY_BOMBS, true); - } - pPlayer->SEND_GOSSIP_MENU(9515, pCreature->GetGUID()); - } - if (uiAction == GOSSIP_ACTION_INFO_DEF+2) - { - pPlayer->CLOSE_GOSSIP_MENU(); - } - return true; -} - -/*###### -## npc_thrall_old_hillsbrad -######*/ - -//Thrall texts -#define SAY_TH_START_EVENT_PART1 -1560023 -#define SAY_TH_ARMORY -1560024 -#define SAY_TH_SKARLOC_MEET -1560025 -#define SAY_TH_SKARLOC_TAUNT -1560026 -#define SAY_TH_START_EVENT_PART2 -1560027 -#define SAY_TH_MOUNTS_UP -1560028 -#define SAY_TH_CHURCH_END -1560029 -#define SAY_TH_MEET_TARETHA -1560030 -#define SAY_TH_EPOCH_WONDER -1560031 -#define SAY_TH_EPOCH_KILL_TARETHA -1560032 -#define SAY_TH_EVENT_COMPLETE -1560033 - -#define SAY_TH_RANDOM_LOW_HP1 -1560034 -#define SAY_TH_RANDOM_LOW_HP2 -1560035 - -#define SAY_TH_RANDOM_DIE1 -1560036 -#define SAY_TH_RANDOM_DIE2 -1560037 - -#define SAY_TH_RANDOM_AGGRO1 -1560038 -#define SAY_TH_RANDOM_AGGRO2 -1560039 -#define SAY_TH_RANDOM_AGGRO3 -1560040 -#define SAY_TH_RANDOM_AGGRO4 -1560041 - -#define SAY_TH_RANDOM_KILL1 -1560042 -#define SAY_TH_RANDOM_KILL2 -1560043 -#define SAY_TH_RANDOM_KILL3 -1560044 - -#define SAY_TH_LEAVE_COMBAT1 -1560045 -#define SAY_TH_LEAVE_COMBAT2 -1560046 -#define SAY_TH_LEAVE_COMBAT3 -1560047 - -//Taretha texts -#define SAY_TA_FREE -1560048 -#define SAY_TA_ESCAPED -1560049 - -//Misc for Thrall -#define SPELL_STRIKE 14516 -#define SPELL_SHIELD_BLOCK 12169 -#define SPELL_SUMMON_EROZION_IMAGE 33954 //if thrall dies during escort? - -#define SPEED_WALK (0.5f) -#define SPEED_RUN (1.0f) -#define SPEED_MOUNT (1.6f) - -#define THRALL_WEAPON_MODEL 22106 -#define THRALL_WEAPON_INFO 218169346 -#define THRALL_SHIELD_MODEL 18662 -#define THRALL_SHIELD_INFO 234948100 -#define THRALL_MODEL_UNEQUIPPED 17292 -#define THRALL_MODEL_EQUIPPED 18165 - -//Misc Creature entries -#define ENTRY_ARMORER 18764 -#define ENTRY_SCARLOC 17862 - -#define MOB_ENTRY_RIFLE 17820 -#define MOB_ENTRY_WARDEN 17833 -#define MOB_ENTRY_VETERAN 17860 -#define MOB_ENTRY_WATCHMAN 17814 -#define MOB_ENTRY_SENTRY 17815 - -#define MOB_ENTRY_BARN_GUARDSMAN 18092 -#define MOB_ENTRY_BARN_PROTECTOR 18093 -#define MOB_ENTRY_BARN_LOOKOUT 18094 - -#define MOB_ENTRY_CHURCH_GUARDSMAN 23175 -#define MOB_ENTRY_CHURCH_PROTECTOR 23179 -#define MOB_ENTRY_CHURCH_LOOKOUT 23177 - -#define MOB_ENTRY_INN_GUARDSMAN 23176 -#define MOB_ENTRY_INN_PROTECTOR 23180 -#define MOB_ENTRY_INN_LOOKOUT 23178 - -#define SKARLOC_MOUNT 18798 -#define SKARLOC_MOUNT_MODEL 18223 -#define EROZION_ENTRY 18723 -#define ENTRY_EPOCH 18096 - -//gossip items -#define GOSSIP_ID_START 9568 -#define GOSSIP_ID_SKARLOC1 9614 //I'm glad Taretha is alive. We now must find a way to free her... -#define GOSSIP_ITEM_SKARLOC1 "Taretha cannot see you, Thrall." -#define GOSSIP_ID_SKARLOC2 9579 //What do you mean by this? Is Taretha in danger? -#define GOSSIP_ITEM_SKARLOC2 "The situation is rather complicated, Thrall. It would be best for you to head into the mountains now, before more of Blackmoore's men show up. We'll make sure Taretha is safe." -#define GOSSIP_ID_SKARLOC3 9580 - -#define GOSSIP_ID_TARREN 9597 //tarren mill is beyond these trees -#define GOSSIP_ITEM_TARREN "We're ready, Thrall." - -#define GOSSIP_ID_COMPLETE 9578 //Thank you friends, I owe my freedom to you. Where is Taretha? I hoped to see her - -#define GOSSIP_ITEM_WALKING "[PH] Start walking." - -struct npc_thrall_old_hillsbradAI : public npc_escortAI -{ - npc_thrall_old_hillsbradAI(Creature *c) : npc_escortAI(c) - { - pInstance = c->GetInstanceData(); - HadMount = false; - me->setActive(true); - } - - ScriptedInstance *pInstance; - - uint64 TarethaGUID; - - bool LowHp; - bool HadMount; - - void WaypointReached(uint32 i) - { - if (!pInstance) - return; - - switch(i) - { - case 8: - SetRun(false); - me->SummonCreature(18764,2181.87,112.46,89.45,0.26,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - break; - case 9: - DoScriptText(SAY_TH_ARMORY, me); - me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID, THRALL_WEAPON_MODEL); - //me->SetUInt32Value(UNIT_VIRTUAL_ITEM_INFO, THRALL_WEAPON_INFO); - //me->SetUInt32Value(UNIT_VIRTUAL_ITEM_INFO+1, 781); - me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID+1, THRALL_SHIELD_MODEL); - //me->SetUInt32Value(UNIT_VIRTUAL_ITEM_INFO+2, THRALL_SHIELD_INFO); - //me->SetUInt32Value(UNIT_VIRTUAL_ITEM_INFO+3, 1038); - break; - case 10: - me->SetDisplayId(THRALL_MODEL_EQUIPPED); - break; - case 11: - SetRun(); - break; - case 15: - me->SummonCreature(MOB_ENTRY_RIFLE,2200.28,137.37,87.93,5.07,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_WARDEN,2197.44,131.83,87.93,0.78,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_VETERAN,2203.62,135.40,87.93,3.70,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_VETERAN,2200.75,130.13,87.93,1.48,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - break; - case 21: - me->SummonCreature(MOB_ENTRY_RIFLE,2135.80,154.01,67.45,4.98,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_WARDEN,2144.36,151.87,67.74,4.46,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_VETERAN,2142.12,154.41,67.12,4.56,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_VETERAN,2138.08,155.38,67.24,4.60,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - break; - case 25: - me->SummonCreature(MOB_ENTRY_RIFLE,2102.98,192.17,65.24,6.02,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_WARDEN,2108.48,198.75,65.18,5.15,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_VETERAN,2106.11,197.29,65.18,5.63,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_VETERAN,2104.18,194.82,65.18,5.75,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - break; - case 29: - DoScriptText(SAY_TH_SKARLOC_MEET, me); - me->SummonCreature(ENTRY_SCARLOC,2036.48,271.22,63.43,5.27,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000); - //temporary,skarloc should rather be triggered to walk up to thrall - break; - case 30: - SetEscortPaused(true); - me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - SetRun(false); - break; - case 31: - DoScriptText(SAY_TH_MOUNTS_UP, me); - DoMount(); - SetRun(); - break; - case 37: - //possibly regular patrollers? If so, remove this and let database handle them - me->SummonCreature(MOB_ENTRY_WATCHMAN,2124.26,522.16,56.87,3.99,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_WATCHMAN,2121.69,525.37,57.11,4.01,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_SENTRY,2124.65,524.55,56.63,3.98,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - break; - case 59: - me->SummonCreature(SKARLOC_MOUNT,2488.64,625.77,58.26,4.71,TEMPSUMMON_TIMED_DESPAWN,10000); - DoUnmount(); - HadMount = false; - SetRun(false); - break; - case 60: - me->HandleEmoteCommand(EMOTE_ONESHOT_EXCLAMATION); - //make horsie run off - SetEscortPaused(true); - me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - pInstance->SetData(TYPE_THRALL_PART2, DONE); - SetRun(); - break; - case 64: - SetRun(false); - break; - case 68: - me->SummonCreature(MOB_ENTRY_BARN_PROTECTOR,2500.22,692.60,55.50,2.84,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_BARN_LOOKOUT,2500.13,696.55,55.51,3.38,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_BARN_GUARDSMAN,2500.55,693.64,55.50,3.14,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_BARN_GUARDSMAN,2500.94,695.81,55.50,3.14,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - break; - case 71: - SetRun(); - break; - case 81: - SetRun(false); - break; - case 83: - me->SummonCreature(MOB_ENTRY_CHURCH_PROTECTOR,2627.33,646.82,56.03,4.28,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,5000); - me->SummonCreature(MOB_ENTRY_CHURCH_LOOKOUT,2624.14,648.03,56.03,4.50,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,5000); - me->SummonCreature(MOB_ENTRY_CHURCH_GUARDSMAN,2625.32,649.60,56.03,4.38,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,5000); - me->SummonCreature(MOB_ENTRY_CHURCH_GUARDSMAN,2627.22,649.00,56.03,4.34,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,5000); - break; - case 84: - DoScriptText(SAY_TH_CHURCH_END, me); - SetRun(); - break; - case 91: - me->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE); - SetRun(false); - break; - case 93: - me->SummonCreature(MOB_ENTRY_INN_PROTECTOR,2652.71,660.31,61.93,1.67,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_INN_LOOKOUT,2648.96,662.59,61.93,0.79,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_INN_GUARDSMAN,2657.36,662.34,61.93,2.68,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_INN_GUARDSMAN,2656.39,659.77,61.93,2.61,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - break; - case 94: - if (uint64 TarethaGUID = pInstance->GetData64(DATA_TARETHA)) - { - if (Unit* Taretha = Unit::GetUnit((*me), TarethaGUID)) - DoScriptText(SAY_TA_ESCAPED, Taretha, me); - } - break; - case 95: - DoScriptText(SAY_TH_MEET_TARETHA, me); - pInstance->SetData(TYPE_THRALL_PART3,DONE); - SetEscortPaused(true); - break; - case 96: - DoScriptText(SAY_TH_EPOCH_WONDER, me); - break; - case 97: - DoScriptText(SAY_TH_EPOCH_KILL_TARETHA, me); - SetRun(); - break; - case 98: - //trigger epoch Yell("Thrall! Come outside and face your fate! ....") - //from here, thrall should not never be allowed to move to point 106 which he currently does. - break; - - case 106: - { - //trigger taretha to run down outside - if (Creature* Taretha = pInstance->instance->GetCreature(pInstance->GetData64(DATA_TARETHA))) - { - if (Player* pPlayer = GetPlayerForEscort()) - CAST_AI(npc_escortAI, (Taretha->AI()))->Start(false, true, pPlayer->GetGUID()); - } - - //kill credit Creature for quest - Map* pMap = me->GetMap(); - Map::PlayerList const& players = pMap->GetPlayers(); - if (!players.isEmpty() && pMap->IsDungeon()) - { - for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) - { - if (Player* pPlayer = itr->getSource()) - pPlayer->KilledMonsterCredit(20156,me->GetGUID()); - } - } - - //alot will happen here, thrall and taretha talk, erozion appear at spot to explain - me->SummonCreature(EROZION_ENTRY,2646.47,680.416,55.38,4.16,TEMPSUMMON_TIMED_DESPAWN,120000); - } - break; - case 108: - //last waypoint, just set Thrall invisible, respawn is turned off - me->SetVisibility(VISIBILITY_OFF); - break; - } - } - - void Reset() - { - LowHp = false; - - if (HadMount) - DoMount(); - - if (!HasEscortState(STATE_ESCORT_ESCORTING)) - { - DoUnmount(); - HadMount = false; - me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID, 0); - me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID+1, 0); - me->SetDisplayId(THRALL_MODEL_UNEQUIPPED); - } - if (HasEscortState(STATE_ESCORT_ESCORTING)) - { - DoScriptText(RAND(SAY_TH_LEAVE_COMBAT1,SAY_TH_LEAVE_COMBAT2,SAY_TH_LEAVE_COMBAT3), me); - } - } - void StartWP() - { - me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - SetEscortPaused(false); - } - void DoMount() - { - me->Mount(SKARLOC_MOUNT_MODEL); - me->SetSpeed(MOVE_RUN,SPEED_MOUNT); - } - void DoUnmount() - { - me->Unmount(); - me->SetSpeed(MOVE_RUN,SPEED_RUN); - } - void EnterCombat(Unit* /*who*/) - { - DoScriptText(RAND(SAY_TH_RANDOM_AGGRO1,SAY_TH_RANDOM_AGGRO2,SAY_TH_RANDOM_AGGRO3,SAY_TH_RANDOM_AGGRO4), me); - if (me->IsMounted()) - { - DoUnmount(); - HadMount = true; - } - } - - void JustSummoned(Creature* summoned) - { - switch(summoned->GetEntry()) - { - //TODO: make Scarloc start into event instead, and not start attack directly - case MOB_ENTRY_BARN_GUARDSMAN: - case MOB_ENTRY_BARN_PROTECTOR: - case MOB_ENTRY_BARN_LOOKOUT: - case SKARLOC_MOUNT: - case EROZION_ENTRY: - break; - default: - summoned->AI()->AttackStart(me); - break; - } - } - - void KilledUnit(Unit * /*victim*/) - { - DoScriptText(RAND(SAY_TH_RANDOM_KILL1,SAY_TH_RANDOM_KILL2,SAY_TH_RANDOM_KILL3), me); - } - void JustDied(Unit *slayer) - { - if (pInstance) - pInstance->SetData(TYPE_THRALL_EVENT,FAIL); - - // Don't do a yell if he kills self (if player goes too far or at the end). - if (slayer == me) - return; - - DoScriptText(RAND(SAY_TH_RANDOM_DIE1,SAY_TH_RANDOM_DIE2), me); - } - - void UpdateAI(const uint32 diff) - { - npc_escortAI::UpdateAI(diff); - - if (!UpdateVictim()) - return; - - //TODO: add his abilities'n-crap here - if (!LowHp && ((me->GetHealth()*100 / me->GetMaxHealth()) < 20)) - { - DoScriptText(RAND(SAY_TH_RANDOM_LOW_HP1,SAY_TH_RANDOM_LOW_HP2), me); - LowHp = true; - } - } -}; - -CreatureAI* GetAI_npc_thrall_old_hillsbrad(Creature* pCreature) -{ - return new npc_thrall_old_hillsbradAI(pCreature); -} - -bool GossipHello_npc_thrall_old_hillsbrad(Player* pPlayer, Creature* pCreature) -{ - if (pCreature->isQuestGiver()) - { - pPlayer->PrepareQuestMenu(pCreature->GetGUID()); - pPlayer->SendPreparedQuest(pCreature->GetGUID()); - } - - ScriptedInstance* pInstance = pCreature->GetInstanceData(); - if (pInstance) - { - if (pInstance->GetData(TYPE_BARREL_DIVERSION) == DONE && !pInstance->GetData(TYPE_THRALL_EVENT)) - { - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_WALKING, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_START, pCreature->GetGUID()); - } - - if (pInstance->GetData(TYPE_THRALL_PART1) == DONE && !pInstance->GetData(TYPE_THRALL_PART2)) - { - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_SKARLOC1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_SKARLOC1, pCreature->GetGUID()); - } - - if (pInstance->GetData(TYPE_THRALL_PART2) == DONE && !pInstance->GetData(TYPE_THRALL_PART3)) - { - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TARREN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_TARREN, pCreature->GetGUID()); - } - } - return true; -} - -bool GossipSelect_npc_thrall_old_hillsbrad(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) -{ - ScriptedInstance* pInstance = pCreature->GetInstanceData(); - switch(uiAction) - { - case GOSSIP_ACTION_INFO_DEF+1: - pPlayer->CLOSE_GOSSIP_MENU(); - if (pInstance) - { - pInstance->SetData(TYPE_THRALL_EVENT,IN_PROGRESS); - pInstance->SetData(TYPE_THRALL_PART1,IN_PROGRESS); - } - - DoScriptText(SAY_TH_START_EVENT_PART1, pCreature); - - if (npc_escortAI* pEscortAI = CAST_AI(npc_thrall_old_hillsbradAI, pCreature->AI())) - pEscortAI->Start(true, true, pPlayer->GetGUID()); - - CAST_AI(npc_escortAI, (pCreature->AI()))->SetMaxPlayerDistance(100.0f);//not really needed, because it will not despawn if player is too far - CAST_AI(npc_escortAI, (pCreature->AI()))->SetDespawnAtEnd(false); - CAST_AI(npc_escortAI, (pCreature->AI()))->SetDespawnAtFar(false); - break; - - case GOSSIP_ACTION_INFO_DEF+2: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_SKARLOC2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+20); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_SKARLOC2, pCreature->GetGUID()); - break; - - case GOSSIP_ACTION_INFO_DEF+20: - pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_SKARLOC3, pCreature->GetGUID()); - pCreature->SummonCreature(SKARLOC_MOUNT,2038.81,270.26,63.20,5.41,TEMPSUMMON_TIMED_DESPAWN,12000); - if (pInstance) - pInstance->SetData(TYPE_THRALL_PART2,IN_PROGRESS); - - DoScriptText(SAY_TH_START_EVENT_PART2, pCreature); - - CAST_AI(npc_thrall_old_hillsbradAI, pCreature->AI())->StartWP(); - break; - - case GOSSIP_ACTION_INFO_DEF+3: - pPlayer->CLOSE_GOSSIP_MENU(); - if (pInstance) - pInstance->SetData(TYPE_THRALL_PART3,IN_PROGRESS); - CAST_AI(npc_thrall_old_hillsbradAI, pCreature->AI())->StartWP(); - break; - } - return true; -} - -/*###### -## npc_taretha -######*/ - -#define GOSSIP_ID_EPOCH1 9610 //Thank you for helping Thrall escape, friends. Now I only hope -#define GOSSIP_ITEM_EPOCH1 "Strange wizard?" -#define GOSSIP_ID_EPOCH2 9613 //Yes, friends. This man was no wizard of -#define GOSSIP_ITEM_EPOCH2 "We'll get you out. Taretha. Don't worry. I doubt the wizard would wander too far away." - -struct npc_tarethaAI : public npc_escortAI -{ - npc_tarethaAI(Creature *c) : npc_escortAI(c) - { - pInstance = c->GetInstanceData(); - } - - ScriptedInstance *pInstance; - - void WaypointReached(uint32 i) - { - switch(i) - { - case 6: - DoScriptText(SAY_TA_FREE, me); - break; - case 7: - me->HandleEmoteCommand(EMOTE_ONESHOT_CHEER); - break; - } - } - void Reset() {} - void EnterCombat(Unit* /*who*/) {} - - void UpdateAI(const uint32 diff) - { - npc_escortAI::UpdateAI(diff); - } -}; -CreatureAI* GetAI_npc_taretha(Creature* pCreature) -{ - return new npc_tarethaAI(pCreature); -} - -bool GossipHello_npc_taretha(Player* pPlayer, Creature* pCreature) -{ - ScriptedInstance* pInstance = pCreature->GetInstanceData(); - if (pInstance && pInstance->GetData(TYPE_THRALL_PART3) == DONE && pInstance->GetData(TYPE_THRALL_PART4) == NOT_STARTED) - { - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_EPOCH1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_EPOCH1, pCreature->GetGUID()); - } - return true; -} - -bool GossipSelect_npc_taretha(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) -{ - ScriptedInstance* pInstance = pCreature->GetInstanceData(); - if (uiAction == GOSSIP_ACTION_INFO_DEF+1) - { - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_EPOCH2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_EPOCH2, pCreature->GetGUID()); - } - if (uiAction == GOSSIP_ACTION_INFO_DEF+2) - { - pPlayer->CLOSE_GOSSIP_MENU(); - - if (pInstance && pInstance->GetData(TYPE_THRALL_EVENT) == IN_PROGRESS) - { - pInstance->SetData(TYPE_THRALL_PART4,IN_PROGRESS); - if (pInstance->GetData64(DATA_EPOCH) == 0) - pCreature->SummonCreature(ENTRY_EPOCH,2639.13,698.55,65.43,4.59,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,120000); - - if (uint64 ThrallGUID = pInstance->GetData64(DATA_THRALL)) - { - Creature* Thrall = (Unit::GetCreature((*pCreature), ThrallGUID)); - if (Thrall) - CAST_AI(npc_thrall_old_hillsbradAI, Thrall->AI())->StartWP(); - } - } - } - return true; -} - -/*###### -## AddSC -######*/ - -void AddSC_old_hillsbrad() -{ - Script *newscript; - - newscript = new Script; - newscript->Name = "npc_erozion"; - newscript->pGossipHello = &GossipHello_npc_erozion; - newscript->pGossipSelect = &GossipSelect_npc_erozion; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "npc_thrall_old_hillsbrad"; - newscript->pGossipHello = &GossipHello_npc_thrall_old_hillsbrad; - newscript->pGossipSelect = &GossipSelect_npc_thrall_old_hillsbrad; - newscript->GetAI = &GetAI_npc_thrall_old_hillsbrad; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "npc_taretha"; - newscript->pGossipHello = &GossipHello_npc_taretha; - newscript->pGossipSelect = &GossipSelect_npc_taretha; - newscript->GetAI = &GetAI_npc_taretha; - newscript->RegisterSelf(); -} - diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/old_hillsbrad/old_hillsbrad.h b/src/server/scripts/Kalimdor/CavernsOfTime/old_hillsbrad/old_hillsbrad.h deleted file mode 100644 index 5c398cc2647..00000000000 --- a/src/server/scripts/Kalimdor/CavernsOfTime/old_hillsbrad/old_hillsbrad.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software licensed under GPL version 2 - * Please see the included DOCS/LICENSE.TXT for more information */ - -#ifndef DEF_OLD_HILLSBRAD_H -#define DEF_OLD_HILLSBRAD_H - -#define TYPE_BARREL_DIVERSION 1 -#define TYPE_THRALL_EVENT 2 -#define TYPE_THRALL_PART1 3 -#define TYPE_THRALL_PART2 4 -#define TYPE_THRALL_PART3 5 -#define TYPE_THRALL_PART4 6 -#define DATA_THRALL 7 -#define DATA_TARETHA 8 -#define DATA_EPOCH 9 -#define WORLD_STATE_OH 2436 -#endif - diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h new file mode 100644 index 00000000000..4113885b6f4 --- /dev/null +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h @@ -0,0 +1,38 @@ +/* + * Copyright (C) 2009 - 2010 TrinityCore + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef DEF_AZJOL_NERUB_H +#define DEF_AZJOL_NERUB_H + +enum Data64 +{ + DATA_KRIKTHIR_THE_GATEWATCHER, + DATA_HADRONOX, + DATA_ANUBARAK, + DATA_WATCHER_GASHRA, + DATA_WATCHER_SILTHIK, + DATA_WATCHER_NARJIL +}; +enum Data +{ + DATA_KRIKTHIR_THE_GATEWATCHER_EVENT, + DATA_HADRONOX_EVENT, + DATA_ANUBARAK_EVENT +}; + +#endif diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp new file mode 100644 index 00000000000..6de6578f7bb --- /dev/null +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp @@ -0,0 +1,360 @@ +/* +* Copyright (C) 2009 - 2010 TrinityCore +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +#include "ScriptedPch.h" +#include "azjol_nerub.h" + +//SQL: UPDATE creature_template SET mechanic_immune_mask = 1073741823 WHERE name like "anub'arak%"; + +enum Spells +{ + SPELL_CARRION_BEETLES = 53520, + SPELL_SUMMON_CARRION_BEETLES = 53521, + SPELL_LEECHING_SWARM = 53467, + SPELL_POUND = 53472, + SPELL_POUND_H = 59433, + SPELL_SUBMERGE = 53421, + SPELL_IMPALE_DMG = 53454, + SPELL_IMPALE_DMG_H = 59446, + SPELL_IMPALE_SHAKEGROUND = 53455, + SPELL_IMPALE_SPIKE = 53539, //this is not the correct visual effect + //SPELL_IMPALE_TARGET = 53458, +}; + +enum Creatures +{ + CREATURE_GUARDIAN = 29216, + CREATURE_VENOMANCER = 29217, + CREATURE_DATTER = 29213, + CREATURE_IMPALE_TARGET = 89, + DISPLAY_INVISIBLE = 11686 +}; + +// not in db +enum Yells +{ + SAY_INTRO = -1601010, + SAY_AGGRO = -1601000, + SAY_SLAY_1 = -1601001, + SAY_SLAY_2 = -1601002, + SAY_SLAY_3 = -1601003, + SAY_LOCUST_1 = -1601005, + SAY_LOCUST_2 = -1601006, + SAY_LOCUST_3 = -1601007, + SAY_SUBMERGE_1 = -1601008, + SAY_SUBMERGE_2 = -1601009, + SAY_DEATH = -1601004 +}; + +enum +{ + ACHIEV_TIMED_START_EVENT = 20381, +}; + +enum Phases +{ + PHASE_MELEE = 0, + PHASE_UNDERGROUND = 1, + IMPALE_PHASE_TARGET = 0, + IMPALE_PHASE_ATTACK = 1, + IMPALE_PHASE_DMG = 2 +}; + +const Position SpawnPoint[2] = +{ + { 550.7, 282.8, 224.3 }, + { 551.1, 229.4, 224.3 }, +}; + +const Position SpawnPointGuardian[2] = +{ + { 550.348633, 316.006805, 234.2947 }, + { 550.188660, 324.264557, 237.7412 }, +}; + +struct boss_anub_arakAI : public ScriptedAI +{ + boss_anub_arakAI(Creature *c) : ScriptedAI(c), lSummons(me) + { + pInstance = c->GetInstanceData(); + } + + ScriptedInstance *pInstance; + + bool bChanneling; + bool bGuardianSummoned; + bool bVenomancerSummoned; + bool bDatterSummoned; + uint8 uiPhase; + uint32 uiUndergroundPhase; + uint32 uiCarrionBeetlesTimer; + uint32 uiLeechingSwarmTimer; + uint32 uiPoundTimer; + uint32 uiSubmergeTimer; + uint32 uiUndergroundTimer; + uint32 uiVenomancerTimer; + uint32 uiDatterTimer; + + uint32 uiImpaleTimer; + uint32 uiImpalePhase; + uint64 uiImpaleTarget; + + SummonList lSummons; + + void Reset() + { + uiCarrionBeetlesTimer = 8*IN_MILISECONDS; + uiLeechingSwarmTimer = 20*IN_MILISECONDS; + uiImpaleTimer = 9*IN_MILISECONDS; + uiPoundTimer = 15*IN_MILISECONDS; + + uiPhase = PHASE_MELEE; + uiUndergroundPhase = 0; + bChanneling = false; + uiImpalePhase = IMPALE_PHASE_TARGET; + + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE); + me->RemoveAura(SPELL_SUBMERGE); + + lSummons.DespawnAll(); + + if (pInstance) + { + pInstance->SetData(DATA_ANUBARAK_EVENT, NOT_STARTED); + pInstance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); + } + } + + Creature* DoSummonImpaleTarget(Unit *pTarget) + { + Position targetPos; + pTarget->GetPosition(&targetPos); + + if (TempSummon* pImpaleTarget = me->SummonCreature(CREATURE_IMPALE_TARGET, targetPos, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 6*IN_MILISECONDS)) + { + uiImpaleTarget = pImpaleTarget->GetGUID(); + pImpaleTarget->SetReactState(REACT_PASSIVE); + pImpaleTarget->SetDisplayId(DISPLAY_INVISIBLE); + pImpaleTarget->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE|UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE); + return pImpaleTarget; + } + + return NULL; + } + + void EnterCombat(Unit * /*pWho*/) + { + DoScriptText(SAY_AGGRO, me); + if (pInstance) + { + pInstance->SetData(DATA_ANUBARAK_EVENT, IN_PROGRESS); + pInstance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); + } + } + + void UpdateAI(const uint32 diff) + { + if (!UpdateVictim()) + return; + + switch (uiPhase) + { + case PHASE_UNDERGROUND: + if (uiImpaleTimer <= diff) + { + switch(uiImpalePhase) + { + case IMPALE_PHASE_TARGET: + if (Unit *target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + { + if (Creature *pImpaleTarget = DoSummonImpaleTarget(target)) + pImpaleTarget->CastSpell(pImpaleTarget, SPELL_IMPALE_SHAKEGROUND, true); + uiImpaleTimer = 3*IN_MILISECONDS; + uiImpalePhase = IMPALE_PHASE_ATTACK; + } + break; + case IMPALE_PHASE_ATTACK: + if (Creature* pImpaleTarget = Unit::GetCreature(*me, uiImpaleTarget)) + { + pImpaleTarget->CastSpell(pImpaleTarget, SPELL_IMPALE_SPIKE, false); + pImpaleTarget->RemoveAurasDueToSpell(SPELL_IMPALE_SHAKEGROUND); + } + uiImpalePhase = IMPALE_PHASE_DMG; + uiImpaleTimer = 1*IN_MILISECONDS; + break; + case IMPALE_PHASE_DMG: + if (Creature* pImpaleTarget = Unit::GetCreature(*me, uiImpaleTarget)) + me->CastSpell(pImpaleTarget, DUNGEON_MODE(SPELL_IMPALE_DMG, SPELL_IMPALE_DMG_H), true); + uiImpalePhase = IMPALE_PHASE_TARGET; + uiImpaleTimer = 9*IN_MILISECONDS; + break; + } + } else uiImpaleTimer -= diff; + + if (!bGuardianSummoned) + { + for (uint8 i = 0; i < 2; ++i) + { + if (Creature *Guardian = me->SummonCreature(CREATURE_GUARDIAN,SpawnPointGuardian[i],TEMPSUMMON_CORPSE_DESPAWN,0)) + { + Guardian->AddThreat(me->getVictim(), 0.0f); + DoZoneInCombat(Guardian); + } + } + bGuardianSummoned = true; + } + + if (!bVenomancerSummoned) + { + if (uiVenomancerTimer <= diff) + { + if (uiUndergroundPhase > 1) + { + for (uint8 i = 0; i < 2; ++i) + { + if (Creature *Venomancer = me->SummonCreature(CREATURE_VENOMANCER,SpawnPoint[i],TEMPSUMMON_CORPSE_DESPAWN,0)) + { + Venomancer->AddThreat(me->getVictim(), 0.0f); + DoZoneInCombat(Venomancer); + } + } + bVenomancerSummoned = true; + } + } else uiVenomancerTimer -= diff; + } + + if (!bDatterSummoned) + { + if (uiDatterTimer <= diff) + { + if (uiUndergroundPhase > 2) + { + for (uint8 i = 0; i < 2; ++i) + { + if (Creature *Datter = me->SummonCreature(CREATURE_DATTER,SpawnPoint[i],TEMPSUMMON_CORPSE_DESPAWN,0)) + { + Datter->AddThreat(me->getVictim(), 0.0f); + DoZoneInCombat(Datter); + } + } + bDatterSummoned = true; + } + } else uiDatterTimer -= diff; + } + + if (uiUndergroundTimer <= diff) + { + me->RemoveAura(SPELL_SUBMERGE); + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE); + uiPhase = PHASE_MELEE; + } else uiUndergroundTimer -= diff; + break; + + case PHASE_MELEE: + if (((uiUndergroundPhase == 0 && HealthBelowPct(75)) + || (uiUndergroundPhase == 1 && HealthBelowPct(50)) + || (uiUndergroundPhase == 2 && HealthBelowPct(25))) + && !me->hasUnitState(UNIT_STAT_CASTING)) + { + bGuardianSummoned = false; + bVenomancerSummoned = false; + bDatterSummoned = false; + + uiUndergroundTimer = 40*IN_MILISECONDS; + uiVenomancerTimer = 25*IN_MILISECONDS; + uiDatterTimer = 32*IN_MILISECONDS; + + uiImpalePhase = 0; + uiImpaleTimer = 9*IN_MILISECONDS; + + DoCast(me, SPELL_SUBMERGE, false); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE); + + uiPhase = PHASE_UNDERGROUND; + ++uiUndergroundPhase; + } + + if (bChanneling == true) + { + for (uint8 i = 0; i < 8; ++i) + DoCast(me->getVictim(), SPELL_SUMMON_CARRION_BEETLES, true); + bChanneling = false; + } + else if (uiCarrionBeetlesTimer <= diff) + { + bChanneling = true; + DoCastVictim(SPELL_CARRION_BEETLES); + uiCarrionBeetlesTimer = 25*IN_MILISECONDS; + } else uiCarrionBeetlesTimer -= diff; + + if (uiLeechingSwarmTimer <= diff) + { + DoCast(me, SPELL_LEECHING_SWARM, true); + uiLeechingSwarmTimer = 19*IN_MILISECONDS; + } else uiLeechingSwarmTimer -= diff; + + if (uiPoundTimer <= diff) + { + if (Unit *target = me->getVictim()) + { + if (Creature *pImpaleTarget = DoSummonImpaleTarget(target)) + me->CastSpell(pImpaleTarget, DUNGEON_MODE(SPELL_POUND, SPELL_POUND_H), false); + } + uiPoundTimer = 16.5*IN_MILISECONDS; + } else uiPoundTimer -= diff; + + DoMeleeAttackIfReady(); + break; + } + } + + void JustDied(Unit * /*pKiller*/) + { + DoScriptText(SAY_DEATH, me); + lSummons.DespawnAll(); + if (pInstance) + pInstance->SetData(DATA_ANUBARAK_EVENT, DONE); + } + + void KilledUnit(Unit *pVictim) + { + if (pVictim == me) + return; + DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); + } + + void JustSummoned(Creature* summon) + { + lSummons.Summon(summon); + } +}; + +CreatureAI* GetAI_boss_anub_arak(Creature *pCreature) +{ + return new boss_anub_arakAI (pCreature); +} + +void AddSC_boss_anub_arak() +{ + Script *newscript; + + newscript = new Script; + newscript->Name = "boss_anub_arak"; + newscript->GetAI = &GetAI_boss_anub_arak; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp new file mode 100644 index 00000000000..0fc4e87d7c5 --- /dev/null +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp @@ -0,0 +1,206 @@ +/* + * Copyright (C) 2009 - 2010 TrinityCore + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* +* Comment: No Waves atm and the doors spells are crazy... +* +* When your group enters the main room (the one after the bridge), you will notice a group of 3 Nerubians. +* When you engage them, 2 more groups like this one spawn behind the first one - it is important to pull the first group back, +* so you don't aggro all 3. Hadronox will be under you, fighting Nerubians. +* +* This is the timed gauntlet - waves of non-elite spiders +* will spawn from the 3 doors located a little above the main room, and will then head down to fight Hadronox. After clearing the +* main room, it is recommended to just stay in it, kill the occasional non-elites that will attack you instead of the boss, and wait for +* Hadronox to make his way to you. When Hadronox enters the main room, she will web the doors, and no more non-elites will spawn. +*/ + +#include "ScriptedPch.h" +#include "azjol_nerub.h" + +enum Spells +{ + SPELL_ACID_CLOUD = 53400, // Victim + SPELL_LEECH_POISON = 53030, // Victim + SPELL_PIERCE_ARMOR = 53418, // Victim + SPELL_WEB_GRAB = 57731, // Victim + SPELL_WEB_FRONT_DOORS = 53177, // Self + SPELL_WEB_SIDE_DOORS = 53185, // Self + H_SPELL_ACID_CLOUD = 59419, + H_SPELL_LEECH_POISON = 59417, + H_SPELL_WEB_GRAB = 59421 +}; + +struct boss_hadronoxAI : public ScriptedAI +{ + boss_hadronoxAI(Creature* c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + fMaxDistance = 50.0f; + bFirstTime = true; + } + + ScriptedInstance* pInstance; + + uint32 uiAcidTimer; + uint32 uiLeechTimer; + uint32 uiPierceTimer; + uint32 uiGrabTimer; + uint32 uiDoorsTimer; + uint32 uiCheckDistanceTimer; + + bool bFirstTime; + + float fMaxDistance; + + void Reset() + { + me->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, 9.0f); + me->SetFloatValue(UNIT_FIELD_COMBATREACH, 9.0f); + + uiAcidTimer = urand(10*IN_MILISECONDS,14*IN_MILISECONDS); + uiLeechTimer = urand(3*IN_MILISECONDS,9*IN_MILISECONDS); + uiPierceTimer = urand(1*IN_MILISECONDS,3*IN_MILISECONDS); + uiGrabTimer = urand(15*IN_MILISECONDS,19*IN_MILISECONDS); + uiDoorsTimer = urand(20*IN_MILISECONDS,30*IN_MILISECONDS); + uiCheckDistanceTimer = 2*IN_MILISECONDS; + + if (pInstance && (pInstance->GetData(DATA_HADRONOX_EVENT) != DONE && !bFirstTime)) + pInstance->SetData(DATA_HADRONOX_EVENT, FAIL); + + bFirstTime = false; + } + + //when Hadronox kills any enemy (that includes a party member) she will regain 10% of her HP if the target had Leech Poison on + void KilledUnit(Unit* Victim) + { + // not sure if this aura check is correct, I think it is though + if (!Victim || !Victim->HasAura(DUNGEON_MODE(SPELL_LEECH_POISON, H_SPELL_LEECH_POISON)) || !me->isAlive()) + return; + + uint32 health = me->GetMaxHealth()/10; + + if ((me->GetHealth()+health) >= me->GetMaxHealth()) + me->SetHealth(me->GetMaxHealth()); + else + me->SetHealth(me->GetHealth()+health); + } + + void JustDied(Unit* /*Killer*/) + { + if (pInstance) + pInstance->SetData(DATA_HADRONOX_EVENT, DONE); + } + + void EnterCombat(Unit* /*who*/) + { + if (pInstance) + pInstance->SetData(DATA_HADRONOX_EVENT, IN_PROGRESS); + me->SetInCombatWithZone(); + } + + void CheckDistance(float dist, const uint32 uiDiff) + { + if (!me->isInCombat()) + return; + + float x=0.0f, y=0.0f, z=0.0f; + me->GetRespawnCoord(x,y,z); + + if (uiCheckDistanceTimer <= uiDiff) + uiCheckDistanceTimer = 5*IN_MILISECONDS; + else + { + uiCheckDistanceTimer -= uiDiff; + return; + } + if (me->IsInEvadeMode() || !me->getVictim()) + return; + if (me->GetDistance(x,y,z) > dist) + EnterEvadeMode(); + } + + void UpdateAI(const uint32 diff) + { + //Return since we have no target + if (!UpdateVictim()) return; + + // Without he comes up through the air to players on the bridge after krikthir if players crossing this bridge! + CheckDistance(fMaxDistance, diff); + + if (me->HasAura(SPELL_WEB_FRONT_DOORS) || me->HasAura(SPELL_WEB_SIDE_DOORS)) + { + if (IsCombatMovement()) + SetCombatMovement(false); + } + else if (!IsCombatMovement()) + SetCombatMovement(true); + + if (uiPierceTimer <= diff) + { + DoCast(me->getVictim(), SPELL_PIERCE_ARMOR); + uiPierceTimer = 8*IN_MILISECONDS; + } else uiPierceTimer -= diff; + + if (uiAcidTimer <= diff) + { + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(pTarget, SPELL_ACID_CLOUD); + + uiAcidTimer = urand(20*IN_MILISECONDS,30*IN_MILISECONDS); + } else uiAcidTimer -= diff; + + if (uiLeechTimer <= diff) + { + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(pTarget, SPELL_LEECH_POISON); + + uiLeechTimer = urand(11*IN_MILISECONDS,14*IN_MILISECONDS); + } else uiLeechTimer -= diff; + + if (uiGrabTimer <= diff) + { + if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) // Draws all players (and attacking Mobs) to itself. + DoCast(pTarget, SPELL_WEB_GRAB); + + uiGrabTimer = urand(15*IN_MILISECONDS,30*IN_MILISECONDS); + } else uiGrabTimer -= diff; + + if (uiDoorsTimer <= diff) + { + //DoCast(me, RAND(SPELL_WEB_FRONT_DOORS, SPELL_WEB_SIDE_DOORS)); + uiDoorsTimer = urand(30*IN_MILISECONDS,60*IN_MILISECONDS); + } else uiDoorsTimer -= diff; + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_boss_hadronox(Creature* pCreature) +{ + return new boss_hadronoxAI (pCreature); +} + +void AddSC_boss_hadronox() +{ + Script *newscript; + + newscript = new Script; + newscript->Name = "boss_hadronox"; + newscript->GetAI = &GetAI_boss_hadronox; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp new file mode 100644 index 00000000000..4863bdcb032 --- /dev/null +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp @@ -0,0 +1,553 @@ +/* + * Copyright (C) 2009 - 2010 TrinityCore + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* + * Comment: Find in the future best timers and the event is not implemented. + */ + +#include "ScriptedPch.h" +#include "azjol_nerub.h" + +enum Spells +{ + SPELL_MIND_FLAY = 52586, + H_SPELL_MIND_FLAY = 59367, + SPELL_CURSE_OF_FATIGUE = 52592, + H_SPELL_CURSE_OF_FATIGUE = 59368, + SPELL_FRENZY = 28747, //maybe 53361 + SPELL_SUMMON_SKITTERING_SWARMER = 52438, //AOE Effect 140, maybe 52439 + SPELL_SUMMON_SKITTERING_SWARMER_1 = 52439, //Summon 3x 28735 + H_SPELL_ACID_SPLASH = 59363, + SPELL_ACID_SPLASH = 52446, + SPELL_CHARGE = 16979,//maybe is another spell + SPELL_BACKSTAB = 52540, + SPELL_SHADOW_BOLT = 52534, + H_SPELL_SHADOW_BOLT = 59357, + SPELL_SHADOW_NOVA = 52535, + H_SPELL_SHADOW_NOVA = 59358, + SPELL_STRIKE = 52532, + SPELL_CLEAVE = 49806, + SPELL_ENRAGE = 52470, + SPELL_INFECTED_BITE = 52469, + H_SPELL_INFECTED_BITE = 59364, + SPELL_WEB_WRAP = 52086,//the spell is not working properly + SPELL_BLINDING_WEBS = 52524, + H_SPELL_BLINDING_WEBS = 59365, + SPELL_POSION_SPRAY = 52493, + H_SPELL_POSION_SPRAY = 59366 +}; + +enum Mobs +{ + MOB_SKITTERING_SWARMER = 28735, + MOB_SKITTERING_SWARMER_CONTROLLER = 32593, + MOB_SKITTERING_INFECTIOR = 28736 +}; + +enum Yells +{ + SAY_AGGRO = -1601011, + SAY_SLAY_1 = -1601012, + SAY_SLAY_2 = -1601013, + SAY_DEATH = -1601014, + //Not in db + SAY_SEND_GROUP_1 = -1601020, + SAY_SEND_GROUP_2 = -1601021, + SAY_SEND_GROUP_3 = -1601022, + SAY_SWARM_1 = -1601015, + SAY_SWARM_2 = -1601016, + SAY_PREFIGHT_1 = -1601017, + SAY_PREFIGHT_2 = -1601018, + SAY_PREFIGHT_3 = -1601019 +}; + +enum Misc +{ + ACHIEV_WATH_HIM_DIE = 1296 +}; + +const Position SpawnPoint[] = +{ + { 566.164, 682.087, 769.079, 2.21657 }, + { 529.042, 706.941, 777.298, 1.0821 }, + { 489.975, 671.239, 772.131, 0.261799 }, + { 488.556, 692.95, 771.764, 4.88692 }, + { 553.34, 640.387, 777.419, 1.20428 }, + { 517.486, 706.398, 777.335, 5.35816 }, + { 504.01, 637.693, 777.479, 0.506145 }, + { 552.625, 706.408, 777.177, 3.4383 } +}; +struct boss_krik_thirAI : public ScriptedAI +{ + boss_krik_thirAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + } + + ScriptedInstance* pInstance; + + uint32 uiMindFlayTimer; + uint32 uiCurseFatigueTimer; + uint32 uiSummonTimer; + + void Reset() + { + uiMindFlayTimer = 15*IN_MILISECONDS; + uiCurseFatigueTimer = 12*IN_MILISECONDS; + + if (pInstance) + pInstance->SetData(DATA_KRIKTHIR_THE_GATEWATCHER_EVENT, NOT_STARTED); + } + + void EnterCombat(Unit* /*who*/) + { + DoScriptText(SAY_AGGRO, me); + Summon(); + uiSummonTimer = 15*IN_MILISECONDS; + + if (pInstance) + pInstance->SetData(DATA_KRIKTHIR_THE_GATEWATCHER_EVENT, IN_PROGRESS); + } + + void Summon() + { + me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[0],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS); + me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[0],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS); + me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[1],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS); + me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[1],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS); + me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[2],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS); + me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[2],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS); + me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[3],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS); + me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[3],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS); + me->SummonCreature(MOB_SKITTERING_INFECTIOR,SpawnPoint[4],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS); + me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[4],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS); + me->SummonCreature(MOB_SKITTERING_INFECTIOR,SpawnPoint[5],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS); + me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[5],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS); + me->SummonCreature(MOB_SKITTERING_INFECTIOR,SpawnPoint[6],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS); + me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[6],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS); + me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[7],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS); + me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[7],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS); + } + + void UpdateAI(const uint32 diff) + { + if (!UpdateVictim()) + return; + + if (uiSummonTimer <= diff) + { + Summon(); + uiSummonTimer = 15*IN_MILISECONDS; + } else uiSummonTimer -= diff; + + if (uiMindFlayTimer <= diff) + { + DoCast(me->getVictim(), SPELL_MIND_FLAY); + uiMindFlayTimer = 15*IN_MILISECONDS; + } else uiMindFlayTimer -= diff; + + if (uiCurseFatigueTimer <= diff) + { + //WowWiki say "Curse of Fatigue-Kirk'thir will cast Curse of Fatigue on 2-3 targets periodically." + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); + Unit *pTarget_1 = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true); + + DoCast(pTarget, SPELL_CURSE_OF_FATIGUE); + DoCast(pTarget_1, SPELL_CURSE_OF_FATIGUE); + + uiCurseFatigueTimer = 10*IN_MILISECONDS; + } else uiCurseFatigueTimer -= diff; + + if (!me->HasAura(SPELL_FRENZY) && HealthBelowPct(10)) + DoCast(me, SPELL_FRENZY, true); + + DoMeleeAttackIfReady(); + } + void JustDied(Unit* /*killer*/) + { + DoScriptText(SAY_DEATH, me); + + if (!pInstance) + return; + + pInstance->SetData(DATA_KRIKTHIR_THE_GATEWATCHER_EVENT, DONE); + //Achievement: Watch him die + Creature *pAdd = Unit::GetCreature(*me, pInstance->GetData64(DATA_WATCHER_GASHRA)); + if (!pAdd || !pAdd->isAlive()) + return; + + pAdd = Unit::GetCreature(*me, pInstance->GetData64(DATA_WATCHER_SILTHIK)); + if (!pAdd || !pAdd->isAlive()) + return; + + pAdd = Unit::GetCreature(*me, pInstance->GetData64(DATA_WATCHER_NARJIL)); + if (!pAdd || !pAdd->isAlive()) + return; + + pInstance->DoCompleteAchievement(ACHIEV_WATH_HIM_DIE); + } + + void KilledUnit(Unit * victim) + { + if (victim == me) + return; + + DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + } + + void JustSummoned(Creature* summoned) + { + summoned->GetMotionMaster()->MovePoint(0,me->GetPositionX(),me->GetPositionY(),me->GetPositionZ()); + } +}; + +struct npc_skittering_infectorAI : public ScriptedAI +{ + npc_skittering_infectorAI(Creature *c) : ScriptedAI(c) {} + + void JustDied(Unit* /*killer*/) + { + //The spell is not working propperly + DoCast(me->getVictim(),SPELL_ACID_SPLASH, true); + } + +}; + +struct npc_anub_ar_skirmisherAI : public ScriptedAI +{ + npc_anub_ar_skirmisherAI(Creature *c) : ScriptedAI(c) {} + + uint32 uiChargeTimer; + uint32 uiBackstabTimer; + + void Reset() + { + uiChargeTimer = 11*IN_MILISECONDS; + uiBackstabTimer = 7*IN_MILISECONDS; + } + + void UpdateAI(const uint32 diff) + { + if (!UpdateVictim()) + return; + + if (uiChargeTimer <= diff) + { + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + { + DoResetThreat(); + me->AddThreat(pTarget,1.0f); + DoCast(pTarget, SPELL_CHARGE, true); + } + uiChargeTimer = 15*IN_MILISECONDS; + } else uiChargeTimer -= diff; + + if (uiBackstabTimer <= diff) + { + DoCast(me->getVictim(), SPELL_BACKSTAB); + uiBackstabTimer = 12*IN_MILISECONDS; + } else uiBackstabTimer -= diff; + + DoMeleeAttackIfReady(); + + } +}; + +struct npc_anub_ar_shadowcasterAI : public ScriptedAI +{ + npc_anub_ar_shadowcasterAI(Creature *c) : ScriptedAI(c) {} + + uint32 uiShadowBoltTimer; + uint32 uiShadowNovaTimer; + + void Reset() + { + uiShadowBoltTimer = 6*IN_MILISECONDS; + uiShadowNovaTimer = 15*IN_MILISECONDS; + } + + void UpdateAI(const uint32 diff) + { + if (!UpdateVictim()) + return; + + if (uiShadowBoltTimer <= diff) + { + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(pTarget, SPELL_SHADOW_BOLT, true); + uiShadowBoltTimer = 15*IN_MILISECONDS; + } else uiShadowBoltTimer -= diff; + + if (uiShadowNovaTimer <= diff) + { + DoCast(me->getVictim(), SPELL_SHADOW_NOVA, true); + uiShadowNovaTimer = 17*IN_MILISECONDS; + } else uiShadowNovaTimer -= diff; + + DoMeleeAttackIfReady(); + } +}; + +struct npc_anub_ar_warriorAI : public ScriptedAI +{ + npc_anub_ar_warriorAI(Creature *c) : ScriptedAI(c){} + + uint32 uiCleaveTimer; + uint32 uiStrikeTimer; + + void Reset() + { + uiCleaveTimer = 11*IN_MILISECONDS; + uiStrikeTimer = 6*IN_MILISECONDS; + } + + void UpdateAI(const uint32 diff) + { + if (!UpdateVictim()) + return; + + if (uiStrikeTimer <= diff) + { + DoCast(me->getVictim(), SPELL_STRIKE, true); + uiStrikeTimer = 15*IN_MILISECONDS; + } else uiStrikeTimer -= diff; + + if (uiCleaveTimer <= diff) + { + DoCast(me->getVictim(), SPELL_CLEAVE, true); + uiCleaveTimer = 17*IN_MILISECONDS; + } else uiCleaveTimer -= diff; + + DoMeleeAttackIfReady(); + + } + +}; + +struct npc_watcher_gashraAI : public ScriptedAI +{ + npc_watcher_gashraAI(Creature *c) : ScriptedAI(c) {} + + uint32 uiWebWrapTimer; + uint32 uiInfectedBiteTimer; + + void Reset() + { + uiWebWrapTimer = 11*IN_MILISECONDS; + uiInfectedBiteTimer = 4*IN_MILISECONDS; + } + + void EnterCombat(Unit* /*who*/) + { + DoCast(me, SPELL_ENRAGE, true); + } + + void UpdateAI(const uint32 diff) + { + if (!UpdateVictim()) + return; + + if (uiWebWrapTimer <= diff) + { + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(pTarget, SPELL_WEB_WRAP, true); + uiWebWrapTimer = 17*IN_MILISECONDS; + } else uiWebWrapTimer -= diff; + + if (uiInfectedBiteTimer <= diff) + { + DoCast(me->getVictim(), SPELL_INFECTED_BITE, true); + uiInfectedBiteTimer = 15*IN_MILISECONDS; + } else uiInfectedBiteTimer -= diff; + + DoMeleeAttackIfReady(); + } +}; + +struct npc_watcher_narjilAI : public ScriptedAI +{ + npc_watcher_narjilAI(Creature *c) : ScriptedAI(c) {} + + uint32 uiWebWrapTimer; + uint32 uiInfectedBiteTimer; + uint32 uiBindingWebsTimer; + + void Reset() + { + uiWebWrapTimer = 11*IN_MILISECONDS; + uiInfectedBiteTimer = 4*IN_MILISECONDS; + uiBindingWebsTimer = 17*IN_MILISECONDS; + } + + void UpdateAI(const uint32 diff) + { + if (!UpdateVictim()) + return; + + if (uiWebWrapTimer <= diff) + { + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(pTarget, SPELL_WEB_WRAP, true); + uiWebWrapTimer = 15*IN_MILISECONDS; + } else uiWebWrapTimer -= diff; + + if (uiInfectedBiteTimer <= diff) + { + DoCast(me->getVictim(), SPELL_INFECTED_BITE, true); + uiInfectedBiteTimer = 11*IN_MILISECONDS; + } else uiInfectedBiteTimer -= diff; + + if (uiBindingWebsTimer <= diff) + { + DoCast(me->getVictim(), SPELL_BLINDING_WEBS, true); + uiBindingWebsTimer = 17*IN_MILISECONDS; + } else uiBindingWebsTimer -= diff; + + DoMeleeAttackIfReady(); + } +}; + +struct npc_watcher_silthikAI : public ScriptedAI +{ + npc_watcher_silthikAI(Creature *c) : ScriptedAI(c) {} + + uint32 uiWebWrapTimer; + uint32 uiInfectedBiteTimer; + uint32 uiPoisonSprayTimer; + + void Reset() + { + uiWebWrapTimer = 11*IN_MILISECONDS; + uiInfectedBiteTimer = 4*IN_MILISECONDS; + uiPoisonSprayTimer = 15*IN_MILISECONDS; + } + + void UpdateAI(const uint32 diff) + { + if (!UpdateVictim()) + return; + + if (uiWebWrapTimer <= diff) + { + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(pTarget, SPELL_WEB_WRAP, true); + + uiWebWrapTimer = 15*IN_MILISECONDS; + } else uiWebWrapTimer -= diff; + + if (uiInfectedBiteTimer <= diff) + { + DoCast(me->getVictim(), SPELL_INFECTED_BITE, true); + uiInfectedBiteTimer = 15*IN_MILISECONDS; + } else uiInfectedBiteTimer -= diff; + + if (uiPoisonSprayTimer <= diff) + { + DoCast(me->getVictim(), SPELL_POSION_SPRAY, true); + uiPoisonSprayTimer = 17*IN_MILISECONDS; + } else uiPoisonSprayTimer -= diff; + + DoMeleeAttackIfReady(); + + } +}; + +CreatureAI* GetAI_boss_krik_thir(Creature* pCreature) +{ + return new boss_krik_thirAI (pCreature); +} + +CreatureAI* GetAI_npc_anub_ar_skirmisher (Creature* pCreature) +{ + return new npc_anub_ar_skirmisherAI (pCreature); +} + +CreatureAI* GetAI_npc_skittering_infector (Creature* pCreature) +{ + return new npc_skittering_infectorAI (pCreature); +} + +CreatureAI* GetAI_npc_anub_ar_shadowcaster (Creature* pCreature) +{ + return new npc_anub_ar_shadowcasterAI (pCreature); +} + +CreatureAI* GetAI_npc_anub_ar_warrior (Creature* pCreature) +{ + return new npc_anub_ar_warriorAI (pCreature); +} + +CreatureAI* GetAI_npc_watcher_gashra (Creature* pCreature) +{ + return new npc_watcher_gashraAI (pCreature); +} + +CreatureAI* GetAI_npc_watcher_narjil (Creature* pCreature) +{ + return new npc_watcher_narjilAI (pCreature); +} + +CreatureAI* GetAI_npc_watcher_silthik (Creature* pCreature) +{ + return new npc_watcher_silthikAI (pCreature); +} + +void AddSC_boss_krik_thir() +{ + Script *newscript; + + newscript = new Script; + newscript->Name = "boss_krik_thir"; + newscript->GetAI = &GetAI_boss_krik_thir; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "npc_skittering_infector"; + newscript->GetAI = &GetAI_npc_skittering_infector; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "npc_anub_ar_skirmisher"; + newscript->GetAI = &GetAI_npc_anub_ar_skirmisher; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "npc_anub_ar_shadowcaster"; + newscript->GetAI = &GetAI_npc_anub_ar_shadowcaster; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "npc_watcher_gashra"; + newscript->GetAI = &GetAI_npc_watcher_gashra; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "npc_anub_ar_warrior"; + newscript->GetAI = &GetAI_npc_anub_ar_warrior; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "npc_watcher_silthik"; + newscript->GetAI = &GetAI_npc_watcher_silthik; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "npc_watcher_narjil"; + newscript->GetAI = &GetAI_npc_watcher_narjil; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp new file mode 100644 index 00000000000..d12dbd604ba --- /dev/null +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp @@ -0,0 +1,215 @@ +/* + * Copyright (C) 2009 - 2010 TrinityCore + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "ScriptedPch.h" +#include "azjol_nerub.h" + +#define MAX_ENCOUNTER 3 + +/* Azjol Nerub encounters: +0 - Krik'thir the Gatewatcher +1 - Hadronox +2 - Anub'arak +*/ + +struct instance_azjol_nerub : public ScriptedInstance +{ + instance_azjol_nerub(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; + + uint64 uiKrikthir; + uint64 uiHadronox; + uint64 uiAnubarak; + uint64 uiWatcherGashra; + uint64 uiWatcherSilthik; + uint64 uiWatcherNarjil; + uint64 uiAnubarakDoor[3]; + + uint64 uiKrikthirDoor; + + uint32 auiEncounter[MAX_ENCOUNTER]; + + void Initialize() + { + memset(&auiEncounter, 0, sizeof(auiEncounter)); + memset(&uiAnubarakDoor, 0, sizeof(uiAnubarakDoor)); + + uiKrikthir = 0; + uiHadronox = 0; + uiAnubarak = 0; + uiWatcherGashra = 0; + uiWatcherSilthik = 0; + uiWatcherNarjil = 0; + uiKrikthirDoor = 0; + } + + bool IsEncounterInProgress() const + { + for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) + if (auiEncounter[i] == IN_PROGRESS) return true; + + return false; + } + + void OnCreatureCreate(Creature* pCreature, bool /*add*/) + { + switch(pCreature->GetEntry()) + { + case 28684: uiKrikthir = pCreature->GetGUID(); break; + case 28921: uiHadronox = pCreature->GetGUID(); break; + case 29120: uiAnubarak = pCreature->GetGUID(); break; + case 28730: uiWatcherGashra = pCreature->GetGUID(); break; + case 28731: uiWatcherSilthik = pCreature->GetGUID(); break; + case 28729: uiWatcherNarjil = pCreature->GetGUID(); break; + } + } + + void OnGameObjectCreate(GameObject* pGo, bool /*add*/) + { + switch (pGo->GetEntry()) + { + case 192395: + uiKrikthirDoor = pGo->GetGUID(); + if (auiEncounter[0] == DONE) + HandleGameObject(NULL,true,pGo); + break; + case 192396: + uiAnubarakDoor[0] = pGo->GetGUID(); + break; + case 192397: + uiAnubarakDoor[1] = pGo->GetGUID(); + break; + case 192398: + uiAnubarakDoor[2] = pGo->GetGUID(); + break; + } + } + + + uint64 GetData64(uint32 identifier) + { + switch(identifier) + { + case DATA_KRIKTHIR_THE_GATEWATCHER: return uiKrikthir; + case DATA_HADRONOX: return uiHadronox; + case DATA_ANUBARAK: return uiAnubarak; + case DATA_WATCHER_GASHRA: return uiWatcherGashra; + case DATA_WATCHER_SILTHIK: return uiWatcherSilthik; + case DATA_WATCHER_NARJIL: return uiWatcherNarjil; + } + + return 0; + } + + void SetData(uint32 type, uint32 data) + { + switch(type) + { + case DATA_KRIKTHIR_THE_GATEWATCHER_EVENT: + auiEncounter[0] = data; + if (data == DONE) + HandleGameObject(uiKrikthirDoor,true); + break; + case DATA_HADRONOX_EVENT: + auiEncounter[1] = data; + break; + case DATA_ANUBARAK_EVENT: + auiEncounter[2] = data; + if (data == IN_PROGRESS) + for (uint8 i = 0; i < 3; ++i) + HandleGameObject(uiAnubarakDoor[i], false); + else if (data == NOT_STARTED || data == DONE) + for (uint8 i = 0; i < 3; ++i) + HandleGameObject(uiAnubarakDoor[i], true); + break; + } + + if (data == DONE) + { + SaveToDB(); + } + } + + uint32 GetData(uint32 type) + { + switch(type) + { + case DATA_KRIKTHIR_THE_GATEWATCHER_EVENT: return auiEncounter[0]; + case DATA_HADRONOX_EVENT: return auiEncounter[1]; + case DATA_ANUBARAK_EVENT: return auiEncounter[2]; + } + + return 0; + } + + std::string GetSaveData() + { + OUT_SAVE_INST_DATA; + + std::ostringstream saveStream; + saveStream << "A N " << auiEncounter[0] << " " << auiEncounter[1] << " " + << auiEncounter[2]; + + OUT_SAVE_INST_DATA_COMPLETE; + return saveStream.str(); + } + + void Load(const char* in) + { + if (!in) + { + OUT_LOAD_INST_DATA_FAIL; + return; + } + + OUT_LOAD_INST_DATA(in); + + char dataHead1, dataHead2; + uint16 data0,data1,data2; + + std::istringstream loadStream(in); + loadStream >> dataHead1 >> dataHead2 >> data0 >> data1 >> data2; + + if (dataHead1 == 'A' && dataHead2 == 'N') + { + auiEncounter[0] = data0; + auiEncounter[1] = data1; + auiEncounter[2] = data2; + + for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) + if (auiEncounter[i] == IN_PROGRESS) + auiEncounter[i] = NOT_STARTED; + + } else OUT_LOAD_INST_DATA_FAIL; + + OUT_LOAD_INST_DATA_COMPLETE; + } +}; + +InstanceData* GetInstanceData_instance_azjol_nerub(Map* pMap) +{ + return new instance_azjol_nerub(pMap); +} + +void AddSC_instance_azjol_nerub() +{ + Script *newscript; + newscript = new Script; + newscript->Name = "instance_azjol_nerub"; + newscript->GetInstanceData = &GetInstanceData_instance_azjol_nerub; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Northrend/AzjolNerub/azjol_nerub/azjol_nerub.h b/src/server/scripts/Northrend/AzjolNerub/azjol_nerub/azjol_nerub.h deleted file mode 100644 index 4113885b6f4..00000000000 --- a/src/server/scripts/Northrend/AzjolNerub/azjol_nerub/azjol_nerub.h +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (C) 2009 - 2010 TrinityCore - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef DEF_AZJOL_NERUB_H -#define DEF_AZJOL_NERUB_H - -enum Data64 -{ - DATA_KRIKTHIR_THE_GATEWATCHER, - DATA_HADRONOX, - DATA_ANUBARAK, - DATA_WATCHER_GASHRA, - DATA_WATCHER_SILTHIK, - DATA_WATCHER_NARJIL -}; -enum Data -{ - DATA_KRIKTHIR_THE_GATEWATCHER_EVENT, - DATA_HADRONOX_EVENT, - DATA_ANUBARAK_EVENT -}; - -#endif diff --git a/src/server/scripts/Northrend/AzjolNerub/azjol_nerub/boss_anubarak.cpp b/src/server/scripts/Northrend/AzjolNerub/azjol_nerub/boss_anubarak.cpp deleted file mode 100644 index 6de6578f7bb..00000000000 --- a/src/server/scripts/Northrend/AzjolNerub/azjol_nerub/boss_anubarak.cpp +++ /dev/null @@ -1,360 +0,0 @@ -/* -* Copyright (C) 2009 - 2010 TrinityCore -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ - -#include "ScriptedPch.h" -#include "azjol_nerub.h" - -//SQL: UPDATE creature_template SET mechanic_immune_mask = 1073741823 WHERE name like "anub'arak%"; - -enum Spells -{ - SPELL_CARRION_BEETLES = 53520, - SPELL_SUMMON_CARRION_BEETLES = 53521, - SPELL_LEECHING_SWARM = 53467, - SPELL_POUND = 53472, - SPELL_POUND_H = 59433, - SPELL_SUBMERGE = 53421, - SPELL_IMPALE_DMG = 53454, - SPELL_IMPALE_DMG_H = 59446, - SPELL_IMPALE_SHAKEGROUND = 53455, - SPELL_IMPALE_SPIKE = 53539, //this is not the correct visual effect - //SPELL_IMPALE_TARGET = 53458, -}; - -enum Creatures -{ - CREATURE_GUARDIAN = 29216, - CREATURE_VENOMANCER = 29217, - CREATURE_DATTER = 29213, - CREATURE_IMPALE_TARGET = 89, - DISPLAY_INVISIBLE = 11686 -}; - -// not in db -enum Yells -{ - SAY_INTRO = -1601010, - SAY_AGGRO = -1601000, - SAY_SLAY_1 = -1601001, - SAY_SLAY_2 = -1601002, - SAY_SLAY_3 = -1601003, - SAY_LOCUST_1 = -1601005, - SAY_LOCUST_2 = -1601006, - SAY_LOCUST_3 = -1601007, - SAY_SUBMERGE_1 = -1601008, - SAY_SUBMERGE_2 = -1601009, - SAY_DEATH = -1601004 -}; - -enum -{ - ACHIEV_TIMED_START_EVENT = 20381, -}; - -enum Phases -{ - PHASE_MELEE = 0, - PHASE_UNDERGROUND = 1, - IMPALE_PHASE_TARGET = 0, - IMPALE_PHASE_ATTACK = 1, - IMPALE_PHASE_DMG = 2 -}; - -const Position SpawnPoint[2] = -{ - { 550.7, 282.8, 224.3 }, - { 551.1, 229.4, 224.3 }, -}; - -const Position SpawnPointGuardian[2] = -{ - { 550.348633, 316.006805, 234.2947 }, - { 550.188660, 324.264557, 237.7412 }, -}; - -struct boss_anub_arakAI : public ScriptedAI -{ - boss_anub_arakAI(Creature *c) : ScriptedAI(c), lSummons(me) - { - pInstance = c->GetInstanceData(); - } - - ScriptedInstance *pInstance; - - bool bChanneling; - bool bGuardianSummoned; - bool bVenomancerSummoned; - bool bDatterSummoned; - uint8 uiPhase; - uint32 uiUndergroundPhase; - uint32 uiCarrionBeetlesTimer; - uint32 uiLeechingSwarmTimer; - uint32 uiPoundTimer; - uint32 uiSubmergeTimer; - uint32 uiUndergroundTimer; - uint32 uiVenomancerTimer; - uint32 uiDatterTimer; - - uint32 uiImpaleTimer; - uint32 uiImpalePhase; - uint64 uiImpaleTarget; - - SummonList lSummons; - - void Reset() - { - uiCarrionBeetlesTimer = 8*IN_MILISECONDS; - uiLeechingSwarmTimer = 20*IN_MILISECONDS; - uiImpaleTimer = 9*IN_MILISECONDS; - uiPoundTimer = 15*IN_MILISECONDS; - - uiPhase = PHASE_MELEE; - uiUndergroundPhase = 0; - bChanneling = false; - uiImpalePhase = IMPALE_PHASE_TARGET; - - me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE); - me->RemoveAura(SPELL_SUBMERGE); - - lSummons.DespawnAll(); - - if (pInstance) - { - pInstance->SetData(DATA_ANUBARAK_EVENT, NOT_STARTED); - pInstance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); - } - } - - Creature* DoSummonImpaleTarget(Unit *pTarget) - { - Position targetPos; - pTarget->GetPosition(&targetPos); - - if (TempSummon* pImpaleTarget = me->SummonCreature(CREATURE_IMPALE_TARGET, targetPos, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 6*IN_MILISECONDS)) - { - uiImpaleTarget = pImpaleTarget->GetGUID(); - pImpaleTarget->SetReactState(REACT_PASSIVE); - pImpaleTarget->SetDisplayId(DISPLAY_INVISIBLE); - pImpaleTarget->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE|UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE); - return pImpaleTarget; - } - - return NULL; - } - - void EnterCombat(Unit * /*pWho*/) - { - DoScriptText(SAY_AGGRO, me); - if (pInstance) - { - pInstance->SetData(DATA_ANUBARAK_EVENT, IN_PROGRESS); - pInstance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); - } - } - - void UpdateAI(const uint32 diff) - { - if (!UpdateVictim()) - return; - - switch (uiPhase) - { - case PHASE_UNDERGROUND: - if (uiImpaleTimer <= diff) - { - switch(uiImpalePhase) - { - case IMPALE_PHASE_TARGET: - if (Unit *target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - { - if (Creature *pImpaleTarget = DoSummonImpaleTarget(target)) - pImpaleTarget->CastSpell(pImpaleTarget, SPELL_IMPALE_SHAKEGROUND, true); - uiImpaleTimer = 3*IN_MILISECONDS; - uiImpalePhase = IMPALE_PHASE_ATTACK; - } - break; - case IMPALE_PHASE_ATTACK: - if (Creature* pImpaleTarget = Unit::GetCreature(*me, uiImpaleTarget)) - { - pImpaleTarget->CastSpell(pImpaleTarget, SPELL_IMPALE_SPIKE, false); - pImpaleTarget->RemoveAurasDueToSpell(SPELL_IMPALE_SHAKEGROUND); - } - uiImpalePhase = IMPALE_PHASE_DMG; - uiImpaleTimer = 1*IN_MILISECONDS; - break; - case IMPALE_PHASE_DMG: - if (Creature* pImpaleTarget = Unit::GetCreature(*me, uiImpaleTarget)) - me->CastSpell(pImpaleTarget, DUNGEON_MODE(SPELL_IMPALE_DMG, SPELL_IMPALE_DMG_H), true); - uiImpalePhase = IMPALE_PHASE_TARGET; - uiImpaleTimer = 9*IN_MILISECONDS; - break; - } - } else uiImpaleTimer -= diff; - - if (!bGuardianSummoned) - { - for (uint8 i = 0; i < 2; ++i) - { - if (Creature *Guardian = me->SummonCreature(CREATURE_GUARDIAN,SpawnPointGuardian[i],TEMPSUMMON_CORPSE_DESPAWN,0)) - { - Guardian->AddThreat(me->getVictim(), 0.0f); - DoZoneInCombat(Guardian); - } - } - bGuardianSummoned = true; - } - - if (!bVenomancerSummoned) - { - if (uiVenomancerTimer <= diff) - { - if (uiUndergroundPhase > 1) - { - for (uint8 i = 0; i < 2; ++i) - { - if (Creature *Venomancer = me->SummonCreature(CREATURE_VENOMANCER,SpawnPoint[i],TEMPSUMMON_CORPSE_DESPAWN,0)) - { - Venomancer->AddThreat(me->getVictim(), 0.0f); - DoZoneInCombat(Venomancer); - } - } - bVenomancerSummoned = true; - } - } else uiVenomancerTimer -= diff; - } - - if (!bDatterSummoned) - { - if (uiDatterTimer <= diff) - { - if (uiUndergroundPhase > 2) - { - for (uint8 i = 0; i < 2; ++i) - { - if (Creature *Datter = me->SummonCreature(CREATURE_DATTER,SpawnPoint[i],TEMPSUMMON_CORPSE_DESPAWN,0)) - { - Datter->AddThreat(me->getVictim(), 0.0f); - DoZoneInCombat(Datter); - } - } - bDatterSummoned = true; - } - } else uiDatterTimer -= diff; - } - - if (uiUndergroundTimer <= diff) - { - me->RemoveAura(SPELL_SUBMERGE); - me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE); - uiPhase = PHASE_MELEE; - } else uiUndergroundTimer -= diff; - break; - - case PHASE_MELEE: - if (((uiUndergroundPhase == 0 && HealthBelowPct(75)) - || (uiUndergroundPhase == 1 && HealthBelowPct(50)) - || (uiUndergroundPhase == 2 && HealthBelowPct(25))) - && !me->hasUnitState(UNIT_STAT_CASTING)) - { - bGuardianSummoned = false; - bVenomancerSummoned = false; - bDatterSummoned = false; - - uiUndergroundTimer = 40*IN_MILISECONDS; - uiVenomancerTimer = 25*IN_MILISECONDS; - uiDatterTimer = 32*IN_MILISECONDS; - - uiImpalePhase = 0; - uiImpaleTimer = 9*IN_MILISECONDS; - - DoCast(me, SPELL_SUBMERGE, false); - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE); - - uiPhase = PHASE_UNDERGROUND; - ++uiUndergroundPhase; - } - - if (bChanneling == true) - { - for (uint8 i = 0; i < 8; ++i) - DoCast(me->getVictim(), SPELL_SUMMON_CARRION_BEETLES, true); - bChanneling = false; - } - else if (uiCarrionBeetlesTimer <= diff) - { - bChanneling = true; - DoCastVictim(SPELL_CARRION_BEETLES); - uiCarrionBeetlesTimer = 25*IN_MILISECONDS; - } else uiCarrionBeetlesTimer -= diff; - - if (uiLeechingSwarmTimer <= diff) - { - DoCast(me, SPELL_LEECHING_SWARM, true); - uiLeechingSwarmTimer = 19*IN_MILISECONDS; - } else uiLeechingSwarmTimer -= diff; - - if (uiPoundTimer <= diff) - { - if (Unit *target = me->getVictim()) - { - if (Creature *pImpaleTarget = DoSummonImpaleTarget(target)) - me->CastSpell(pImpaleTarget, DUNGEON_MODE(SPELL_POUND, SPELL_POUND_H), false); - } - uiPoundTimer = 16.5*IN_MILISECONDS; - } else uiPoundTimer -= diff; - - DoMeleeAttackIfReady(); - break; - } - } - - void JustDied(Unit * /*pKiller*/) - { - DoScriptText(SAY_DEATH, me); - lSummons.DespawnAll(); - if (pInstance) - pInstance->SetData(DATA_ANUBARAK_EVENT, DONE); - } - - void KilledUnit(Unit *pVictim) - { - if (pVictim == me) - return; - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); - } - - void JustSummoned(Creature* summon) - { - lSummons.Summon(summon); - } -}; - -CreatureAI* GetAI_boss_anub_arak(Creature *pCreature) -{ - return new boss_anub_arakAI (pCreature); -} - -void AddSC_boss_anub_arak() -{ - Script *newscript; - - newscript = new Script; - newscript->Name = "boss_anub_arak"; - newscript->GetAI = &GetAI_boss_anub_arak; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Northrend/AzjolNerub/azjol_nerub/boss_hadronox.cpp b/src/server/scripts/Northrend/AzjolNerub/azjol_nerub/boss_hadronox.cpp deleted file mode 100644 index 0fc4e87d7c5..00000000000 --- a/src/server/scripts/Northrend/AzjolNerub/azjol_nerub/boss_hadronox.cpp +++ /dev/null @@ -1,206 +0,0 @@ -/* - * Copyright (C) 2009 - 2010 TrinityCore - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* -* Comment: No Waves atm and the doors spells are crazy... -* -* When your group enters the main room (the one after the bridge), you will notice a group of 3 Nerubians. -* When you engage them, 2 more groups like this one spawn behind the first one - it is important to pull the first group back, -* so you don't aggro all 3. Hadronox will be under you, fighting Nerubians. -* -* This is the timed gauntlet - waves of non-elite spiders -* will spawn from the 3 doors located a little above the main room, and will then head down to fight Hadronox. After clearing the -* main room, it is recommended to just stay in it, kill the occasional non-elites that will attack you instead of the boss, and wait for -* Hadronox to make his way to you. When Hadronox enters the main room, she will web the doors, and no more non-elites will spawn. -*/ - -#include "ScriptedPch.h" -#include "azjol_nerub.h" - -enum Spells -{ - SPELL_ACID_CLOUD = 53400, // Victim - SPELL_LEECH_POISON = 53030, // Victim - SPELL_PIERCE_ARMOR = 53418, // Victim - SPELL_WEB_GRAB = 57731, // Victim - SPELL_WEB_FRONT_DOORS = 53177, // Self - SPELL_WEB_SIDE_DOORS = 53185, // Self - H_SPELL_ACID_CLOUD = 59419, - H_SPELL_LEECH_POISON = 59417, - H_SPELL_WEB_GRAB = 59421 -}; - -struct boss_hadronoxAI : public ScriptedAI -{ - boss_hadronoxAI(Creature* c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - fMaxDistance = 50.0f; - bFirstTime = true; - } - - ScriptedInstance* pInstance; - - uint32 uiAcidTimer; - uint32 uiLeechTimer; - uint32 uiPierceTimer; - uint32 uiGrabTimer; - uint32 uiDoorsTimer; - uint32 uiCheckDistanceTimer; - - bool bFirstTime; - - float fMaxDistance; - - void Reset() - { - me->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, 9.0f); - me->SetFloatValue(UNIT_FIELD_COMBATREACH, 9.0f); - - uiAcidTimer = urand(10*IN_MILISECONDS,14*IN_MILISECONDS); - uiLeechTimer = urand(3*IN_MILISECONDS,9*IN_MILISECONDS); - uiPierceTimer = urand(1*IN_MILISECONDS,3*IN_MILISECONDS); - uiGrabTimer = urand(15*IN_MILISECONDS,19*IN_MILISECONDS); - uiDoorsTimer = urand(20*IN_MILISECONDS,30*IN_MILISECONDS); - uiCheckDistanceTimer = 2*IN_MILISECONDS; - - if (pInstance && (pInstance->GetData(DATA_HADRONOX_EVENT) != DONE && !bFirstTime)) - pInstance->SetData(DATA_HADRONOX_EVENT, FAIL); - - bFirstTime = false; - } - - //when Hadronox kills any enemy (that includes a party member) she will regain 10% of her HP if the target had Leech Poison on - void KilledUnit(Unit* Victim) - { - // not sure if this aura check is correct, I think it is though - if (!Victim || !Victim->HasAura(DUNGEON_MODE(SPELL_LEECH_POISON, H_SPELL_LEECH_POISON)) || !me->isAlive()) - return; - - uint32 health = me->GetMaxHealth()/10; - - if ((me->GetHealth()+health) >= me->GetMaxHealth()) - me->SetHealth(me->GetMaxHealth()); - else - me->SetHealth(me->GetHealth()+health); - } - - void JustDied(Unit* /*Killer*/) - { - if (pInstance) - pInstance->SetData(DATA_HADRONOX_EVENT, DONE); - } - - void EnterCombat(Unit* /*who*/) - { - if (pInstance) - pInstance->SetData(DATA_HADRONOX_EVENT, IN_PROGRESS); - me->SetInCombatWithZone(); - } - - void CheckDistance(float dist, const uint32 uiDiff) - { - if (!me->isInCombat()) - return; - - float x=0.0f, y=0.0f, z=0.0f; - me->GetRespawnCoord(x,y,z); - - if (uiCheckDistanceTimer <= uiDiff) - uiCheckDistanceTimer = 5*IN_MILISECONDS; - else - { - uiCheckDistanceTimer -= uiDiff; - return; - } - if (me->IsInEvadeMode() || !me->getVictim()) - return; - if (me->GetDistance(x,y,z) > dist) - EnterEvadeMode(); - } - - void UpdateAI(const uint32 diff) - { - //Return since we have no target - if (!UpdateVictim()) return; - - // Without he comes up through the air to players on the bridge after krikthir if players crossing this bridge! - CheckDistance(fMaxDistance, diff); - - if (me->HasAura(SPELL_WEB_FRONT_DOORS) || me->HasAura(SPELL_WEB_SIDE_DOORS)) - { - if (IsCombatMovement()) - SetCombatMovement(false); - } - else if (!IsCombatMovement()) - SetCombatMovement(true); - - if (uiPierceTimer <= diff) - { - DoCast(me->getVictim(), SPELL_PIERCE_ARMOR); - uiPierceTimer = 8*IN_MILISECONDS; - } else uiPierceTimer -= diff; - - if (uiAcidTimer <= diff) - { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_ACID_CLOUD); - - uiAcidTimer = urand(20*IN_MILISECONDS,30*IN_MILISECONDS); - } else uiAcidTimer -= diff; - - if (uiLeechTimer <= diff) - { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_LEECH_POISON); - - uiLeechTimer = urand(11*IN_MILISECONDS,14*IN_MILISECONDS); - } else uiLeechTimer -= diff; - - if (uiGrabTimer <= diff) - { - if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) // Draws all players (and attacking Mobs) to itself. - DoCast(pTarget, SPELL_WEB_GRAB); - - uiGrabTimer = urand(15*IN_MILISECONDS,30*IN_MILISECONDS); - } else uiGrabTimer -= diff; - - if (uiDoorsTimer <= diff) - { - //DoCast(me, RAND(SPELL_WEB_FRONT_DOORS, SPELL_WEB_SIDE_DOORS)); - uiDoorsTimer = urand(30*IN_MILISECONDS,60*IN_MILISECONDS); - } else uiDoorsTimer -= diff; - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_boss_hadronox(Creature* pCreature) -{ - return new boss_hadronoxAI (pCreature); -} - -void AddSC_boss_hadronox() -{ - Script *newscript; - - newscript = new Script; - newscript->Name = "boss_hadronox"; - newscript->GetAI = &GetAI_boss_hadronox; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Northrend/AzjolNerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp b/src/server/scripts/Northrend/AzjolNerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp deleted file mode 100644 index 4863bdcb032..00000000000 --- a/src/server/scripts/Northrend/AzjolNerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp +++ /dev/null @@ -1,553 +0,0 @@ -/* - * Copyright (C) 2009 - 2010 TrinityCore - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* - * Comment: Find in the future best timers and the event is not implemented. - */ - -#include "ScriptedPch.h" -#include "azjol_nerub.h" - -enum Spells -{ - SPELL_MIND_FLAY = 52586, - H_SPELL_MIND_FLAY = 59367, - SPELL_CURSE_OF_FATIGUE = 52592, - H_SPELL_CURSE_OF_FATIGUE = 59368, - SPELL_FRENZY = 28747, //maybe 53361 - SPELL_SUMMON_SKITTERING_SWARMER = 52438, //AOE Effect 140, maybe 52439 - SPELL_SUMMON_SKITTERING_SWARMER_1 = 52439, //Summon 3x 28735 - H_SPELL_ACID_SPLASH = 59363, - SPELL_ACID_SPLASH = 52446, - SPELL_CHARGE = 16979,//maybe is another spell - SPELL_BACKSTAB = 52540, - SPELL_SHADOW_BOLT = 52534, - H_SPELL_SHADOW_BOLT = 59357, - SPELL_SHADOW_NOVA = 52535, - H_SPELL_SHADOW_NOVA = 59358, - SPELL_STRIKE = 52532, - SPELL_CLEAVE = 49806, - SPELL_ENRAGE = 52470, - SPELL_INFECTED_BITE = 52469, - H_SPELL_INFECTED_BITE = 59364, - SPELL_WEB_WRAP = 52086,//the spell is not working properly - SPELL_BLINDING_WEBS = 52524, - H_SPELL_BLINDING_WEBS = 59365, - SPELL_POSION_SPRAY = 52493, - H_SPELL_POSION_SPRAY = 59366 -}; - -enum Mobs -{ - MOB_SKITTERING_SWARMER = 28735, - MOB_SKITTERING_SWARMER_CONTROLLER = 32593, - MOB_SKITTERING_INFECTIOR = 28736 -}; - -enum Yells -{ - SAY_AGGRO = -1601011, - SAY_SLAY_1 = -1601012, - SAY_SLAY_2 = -1601013, - SAY_DEATH = -1601014, - //Not in db - SAY_SEND_GROUP_1 = -1601020, - SAY_SEND_GROUP_2 = -1601021, - SAY_SEND_GROUP_3 = -1601022, - SAY_SWARM_1 = -1601015, - SAY_SWARM_2 = -1601016, - SAY_PREFIGHT_1 = -1601017, - SAY_PREFIGHT_2 = -1601018, - SAY_PREFIGHT_3 = -1601019 -}; - -enum Misc -{ - ACHIEV_WATH_HIM_DIE = 1296 -}; - -const Position SpawnPoint[] = -{ - { 566.164, 682.087, 769.079, 2.21657 }, - { 529.042, 706.941, 777.298, 1.0821 }, - { 489.975, 671.239, 772.131, 0.261799 }, - { 488.556, 692.95, 771.764, 4.88692 }, - { 553.34, 640.387, 777.419, 1.20428 }, - { 517.486, 706.398, 777.335, 5.35816 }, - { 504.01, 637.693, 777.479, 0.506145 }, - { 552.625, 706.408, 777.177, 3.4383 } -}; -struct boss_krik_thirAI : public ScriptedAI -{ - boss_krik_thirAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - } - - ScriptedInstance* pInstance; - - uint32 uiMindFlayTimer; - uint32 uiCurseFatigueTimer; - uint32 uiSummonTimer; - - void Reset() - { - uiMindFlayTimer = 15*IN_MILISECONDS; - uiCurseFatigueTimer = 12*IN_MILISECONDS; - - if (pInstance) - pInstance->SetData(DATA_KRIKTHIR_THE_GATEWATCHER_EVENT, NOT_STARTED); - } - - void EnterCombat(Unit* /*who*/) - { - DoScriptText(SAY_AGGRO, me); - Summon(); - uiSummonTimer = 15*IN_MILISECONDS; - - if (pInstance) - pInstance->SetData(DATA_KRIKTHIR_THE_GATEWATCHER_EVENT, IN_PROGRESS); - } - - void Summon() - { - me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[0],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS); - me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[0],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS); - me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[1],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS); - me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[1],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS); - me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[2],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS); - me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[2],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS); - me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[3],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS); - me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[3],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS); - me->SummonCreature(MOB_SKITTERING_INFECTIOR,SpawnPoint[4],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS); - me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[4],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS); - me->SummonCreature(MOB_SKITTERING_INFECTIOR,SpawnPoint[5],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS); - me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[5],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS); - me->SummonCreature(MOB_SKITTERING_INFECTIOR,SpawnPoint[6],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS); - me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[6],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS); - me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[7],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS); - me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[7],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS); - } - - void UpdateAI(const uint32 diff) - { - if (!UpdateVictim()) - return; - - if (uiSummonTimer <= diff) - { - Summon(); - uiSummonTimer = 15*IN_MILISECONDS; - } else uiSummonTimer -= diff; - - if (uiMindFlayTimer <= diff) - { - DoCast(me->getVictim(), SPELL_MIND_FLAY); - uiMindFlayTimer = 15*IN_MILISECONDS; - } else uiMindFlayTimer -= diff; - - if (uiCurseFatigueTimer <= diff) - { - //WowWiki say "Curse of Fatigue-Kirk'thir will cast Curse of Fatigue on 2-3 targets periodically." - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); - Unit *pTarget_1 = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true); - - DoCast(pTarget, SPELL_CURSE_OF_FATIGUE); - DoCast(pTarget_1, SPELL_CURSE_OF_FATIGUE); - - uiCurseFatigueTimer = 10*IN_MILISECONDS; - } else uiCurseFatigueTimer -= diff; - - if (!me->HasAura(SPELL_FRENZY) && HealthBelowPct(10)) - DoCast(me, SPELL_FRENZY, true); - - DoMeleeAttackIfReady(); - } - void JustDied(Unit* /*killer*/) - { - DoScriptText(SAY_DEATH, me); - - if (!pInstance) - return; - - pInstance->SetData(DATA_KRIKTHIR_THE_GATEWATCHER_EVENT, DONE); - //Achievement: Watch him die - Creature *pAdd = Unit::GetCreature(*me, pInstance->GetData64(DATA_WATCHER_GASHRA)); - if (!pAdd || !pAdd->isAlive()) - return; - - pAdd = Unit::GetCreature(*me, pInstance->GetData64(DATA_WATCHER_SILTHIK)); - if (!pAdd || !pAdd->isAlive()) - return; - - pAdd = Unit::GetCreature(*me, pInstance->GetData64(DATA_WATCHER_NARJIL)); - if (!pAdd || !pAdd->isAlive()) - return; - - pInstance->DoCompleteAchievement(ACHIEV_WATH_HIM_DIE); - } - - void KilledUnit(Unit * victim) - { - if (victim == me) - return; - - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); - } - - void JustSummoned(Creature* summoned) - { - summoned->GetMotionMaster()->MovePoint(0,me->GetPositionX(),me->GetPositionY(),me->GetPositionZ()); - } -}; - -struct npc_skittering_infectorAI : public ScriptedAI -{ - npc_skittering_infectorAI(Creature *c) : ScriptedAI(c) {} - - void JustDied(Unit* /*killer*/) - { - //The spell is not working propperly - DoCast(me->getVictim(),SPELL_ACID_SPLASH, true); - } - -}; - -struct npc_anub_ar_skirmisherAI : public ScriptedAI -{ - npc_anub_ar_skirmisherAI(Creature *c) : ScriptedAI(c) {} - - uint32 uiChargeTimer; - uint32 uiBackstabTimer; - - void Reset() - { - uiChargeTimer = 11*IN_MILISECONDS; - uiBackstabTimer = 7*IN_MILISECONDS; - } - - void UpdateAI(const uint32 diff) - { - if (!UpdateVictim()) - return; - - if (uiChargeTimer <= diff) - { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - { - DoResetThreat(); - me->AddThreat(pTarget,1.0f); - DoCast(pTarget, SPELL_CHARGE, true); - } - uiChargeTimer = 15*IN_MILISECONDS; - } else uiChargeTimer -= diff; - - if (uiBackstabTimer <= diff) - { - DoCast(me->getVictim(), SPELL_BACKSTAB); - uiBackstabTimer = 12*IN_MILISECONDS; - } else uiBackstabTimer -= diff; - - DoMeleeAttackIfReady(); - - } -}; - -struct npc_anub_ar_shadowcasterAI : public ScriptedAI -{ - npc_anub_ar_shadowcasterAI(Creature *c) : ScriptedAI(c) {} - - uint32 uiShadowBoltTimer; - uint32 uiShadowNovaTimer; - - void Reset() - { - uiShadowBoltTimer = 6*IN_MILISECONDS; - uiShadowNovaTimer = 15*IN_MILISECONDS; - } - - void UpdateAI(const uint32 diff) - { - if (!UpdateVictim()) - return; - - if (uiShadowBoltTimer <= diff) - { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_SHADOW_BOLT, true); - uiShadowBoltTimer = 15*IN_MILISECONDS; - } else uiShadowBoltTimer -= diff; - - if (uiShadowNovaTimer <= diff) - { - DoCast(me->getVictim(), SPELL_SHADOW_NOVA, true); - uiShadowNovaTimer = 17*IN_MILISECONDS; - } else uiShadowNovaTimer -= diff; - - DoMeleeAttackIfReady(); - } -}; - -struct npc_anub_ar_warriorAI : public ScriptedAI -{ - npc_anub_ar_warriorAI(Creature *c) : ScriptedAI(c){} - - uint32 uiCleaveTimer; - uint32 uiStrikeTimer; - - void Reset() - { - uiCleaveTimer = 11*IN_MILISECONDS; - uiStrikeTimer = 6*IN_MILISECONDS; - } - - void UpdateAI(const uint32 diff) - { - if (!UpdateVictim()) - return; - - if (uiStrikeTimer <= diff) - { - DoCast(me->getVictim(), SPELL_STRIKE, true); - uiStrikeTimer = 15*IN_MILISECONDS; - } else uiStrikeTimer -= diff; - - if (uiCleaveTimer <= diff) - { - DoCast(me->getVictim(), SPELL_CLEAVE, true); - uiCleaveTimer = 17*IN_MILISECONDS; - } else uiCleaveTimer -= diff; - - DoMeleeAttackIfReady(); - - } - -}; - -struct npc_watcher_gashraAI : public ScriptedAI -{ - npc_watcher_gashraAI(Creature *c) : ScriptedAI(c) {} - - uint32 uiWebWrapTimer; - uint32 uiInfectedBiteTimer; - - void Reset() - { - uiWebWrapTimer = 11*IN_MILISECONDS; - uiInfectedBiteTimer = 4*IN_MILISECONDS; - } - - void EnterCombat(Unit* /*who*/) - { - DoCast(me, SPELL_ENRAGE, true); - } - - void UpdateAI(const uint32 diff) - { - if (!UpdateVictim()) - return; - - if (uiWebWrapTimer <= diff) - { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_WEB_WRAP, true); - uiWebWrapTimer = 17*IN_MILISECONDS; - } else uiWebWrapTimer -= diff; - - if (uiInfectedBiteTimer <= diff) - { - DoCast(me->getVictim(), SPELL_INFECTED_BITE, true); - uiInfectedBiteTimer = 15*IN_MILISECONDS; - } else uiInfectedBiteTimer -= diff; - - DoMeleeAttackIfReady(); - } -}; - -struct npc_watcher_narjilAI : public ScriptedAI -{ - npc_watcher_narjilAI(Creature *c) : ScriptedAI(c) {} - - uint32 uiWebWrapTimer; - uint32 uiInfectedBiteTimer; - uint32 uiBindingWebsTimer; - - void Reset() - { - uiWebWrapTimer = 11*IN_MILISECONDS; - uiInfectedBiteTimer = 4*IN_MILISECONDS; - uiBindingWebsTimer = 17*IN_MILISECONDS; - } - - void UpdateAI(const uint32 diff) - { - if (!UpdateVictim()) - return; - - if (uiWebWrapTimer <= diff) - { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_WEB_WRAP, true); - uiWebWrapTimer = 15*IN_MILISECONDS; - } else uiWebWrapTimer -= diff; - - if (uiInfectedBiteTimer <= diff) - { - DoCast(me->getVictim(), SPELL_INFECTED_BITE, true); - uiInfectedBiteTimer = 11*IN_MILISECONDS; - } else uiInfectedBiteTimer -= diff; - - if (uiBindingWebsTimer <= diff) - { - DoCast(me->getVictim(), SPELL_BLINDING_WEBS, true); - uiBindingWebsTimer = 17*IN_MILISECONDS; - } else uiBindingWebsTimer -= diff; - - DoMeleeAttackIfReady(); - } -}; - -struct npc_watcher_silthikAI : public ScriptedAI -{ - npc_watcher_silthikAI(Creature *c) : ScriptedAI(c) {} - - uint32 uiWebWrapTimer; - uint32 uiInfectedBiteTimer; - uint32 uiPoisonSprayTimer; - - void Reset() - { - uiWebWrapTimer = 11*IN_MILISECONDS; - uiInfectedBiteTimer = 4*IN_MILISECONDS; - uiPoisonSprayTimer = 15*IN_MILISECONDS; - } - - void UpdateAI(const uint32 diff) - { - if (!UpdateVictim()) - return; - - if (uiWebWrapTimer <= diff) - { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_WEB_WRAP, true); - - uiWebWrapTimer = 15*IN_MILISECONDS; - } else uiWebWrapTimer -= diff; - - if (uiInfectedBiteTimer <= diff) - { - DoCast(me->getVictim(), SPELL_INFECTED_BITE, true); - uiInfectedBiteTimer = 15*IN_MILISECONDS; - } else uiInfectedBiteTimer -= diff; - - if (uiPoisonSprayTimer <= diff) - { - DoCast(me->getVictim(), SPELL_POSION_SPRAY, true); - uiPoisonSprayTimer = 17*IN_MILISECONDS; - } else uiPoisonSprayTimer -= diff; - - DoMeleeAttackIfReady(); - - } -}; - -CreatureAI* GetAI_boss_krik_thir(Creature* pCreature) -{ - return new boss_krik_thirAI (pCreature); -} - -CreatureAI* GetAI_npc_anub_ar_skirmisher (Creature* pCreature) -{ - return new npc_anub_ar_skirmisherAI (pCreature); -} - -CreatureAI* GetAI_npc_skittering_infector (Creature* pCreature) -{ - return new npc_skittering_infectorAI (pCreature); -} - -CreatureAI* GetAI_npc_anub_ar_shadowcaster (Creature* pCreature) -{ - return new npc_anub_ar_shadowcasterAI (pCreature); -} - -CreatureAI* GetAI_npc_anub_ar_warrior (Creature* pCreature) -{ - return new npc_anub_ar_warriorAI (pCreature); -} - -CreatureAI* GetAI_npc_watcher_gashra (Creature* pCreature) -{ - return new npc_watcher_gashraAI (pCreature); -} - -CreatureAI* GetAI_npc_watcher_narjil (Creature* pCreature) -{ - return new npc_watcher_narjilAI (pCreature); -} - -CreatureAI* GetAI_npc_watcher_silthik (Creature* pCreature) -{ - return new npc_watcher_silthikAI (pCreature); -} - -void AddSC_boss_krik_thir() -{ - Script *newscript; - - newscript = new Script; - newscript->Name = "boss_krik_thir"; - newscript->GetAI = &GetAI_boss_krik_thir; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "npc_skittering_infector"; - newscript->GetAI = &GetAI_npc_skittering_infector; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "npc_anub_ar_skirmisher"; - newscript->GetAI = &GetAI_npc_anub_ar_skirmisher; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "npc_anub_ar_shadowcaster"; - newscript->GetAI = &GetAI_npc_anub_ar_shadowcaster; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "npc_watcher_gashra"; - newscript->GetAI = &GetAI_npc_watcher_gashra; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "npc_anub_ar_warrior"; - newscript->GetAI = &GetAI_npc_anub_ar_warrior; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "npc_watcher_silthik"; - newscript->GetAI = &GetAI_npc_watcher_silthik; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "npc_watcher_narjil"; - newscript->GetAI = &GetAI_npc_watcher_narjil; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Northrend/AzjolNerub/azjol_nerub/instance_azjol_nerub.cpp b/src/server/scripts/Northrend/AzjolNerub/azjol_nerub/instance_azjol_nerub.cpp deleted file mode 100644 index d12dbd604ba..00000000000 --- a/src/server/scripts/Northrend/AzjolNerub/azjol_nerub/instance_azjol_nerub.cpp +++ /dev/null @@ -1,215 +0,0 @@ -/* - * Copyright (C) 2009 - 2010 TrinityCore - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "ScriptedPch.h" -#include "azjol_nerub.h" - -#define MAX_ENCOUNTER 3 - -/* Azjol Nerub encounters: -0 - Krik'thir the Gatewatcher -1 - Hadronox -2 - Anub'arak -*/ - -struct instance_azjol_nerub : public ScriptedInstance -{ - instance_azjol_nerub(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; - - uint64 uiKrikthir; - uint64 uiHadronox; - uint64 uiAnubarak; - uint64 uiWatcherGashra; - uint64 uiWatcherSilthik; - uint64 uiWatcherNarjil; - uint64 uiAnubarakDoor[3]; - - uint64 uiKrikthirDoor; - - uint32 auiEncounter[MAX_ENCOUNTER]; - - void Initialize() - { - memset(&auiEncounter, 0, sizeof(auiEncounter)); - memset(&uiAnubarakDoor, 0, sizeof(uiAnubarakDoor)); - - uiKrikthir = 0; - uiHadronox = 0; - uiAnubarak = 0; - uiWatcherGashra = 0; - uiWatcherSilthik = 0; - uiWatcherNarjil = 0; - uiKrikthirDoor = 0; - } - - bool IsEncounterInProgress() const - { - for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) - if (auiEncounter[i] == IN_PROGRESS) return true; - - return false; - } - - void OnCreatureCreate(Creature* pCreature, bool /*add*/) - { - switch(pCreature->GetEntry()) - { - case 28684: uiKrikthir = pCreature->GetGUID(); break; - case 28921: uiHadronox = pCreature->GetGUID(); break; - case 29120: uiAnubarak = pCreature->GetGUID(); break; - case 28730: uiWatcherGashra = pCreature->GetGUID(); break; - case 28731: uiWatcherSilthik = pCreature->GetGUID(); break; - case 28729: uiWatcherNarjil = pCreature->GetGUID(); break; - } - } - - void OnGameObjectCreate(GameObject* pGo, bool /*add*/) - { - switch (pGo->GetEntry()) - { - case 192395: - uiKrikthirDoor = pGo->GetGUID(); - if (auiEncounter[0] == DONE) - HandleGameObject(NULL,true,pGo); - break; - case 192396: - uiAnubarakDoor[0] = pGo->GetGUID(); - break; - case 192397: - uiAnubarakDoor[1] = pGo->GetGUID(); - break; - case 192398: - uiAnubarakDoor[2] = pGo->GetGUID(); - break; - } - } - - - uint64 GetData64(uint32 identifier) - { - switch(identifier) - { - case DATA_KRIKTHIR_THE_GATEWATCHER: return uiKrikthir; - case DATA_HADRONOX: return uiHadronox; - case DATA_ANUBARAK: return uiAnubarak; - case DATA_WATCHER_GASHRA: return uiWatcherGashra; - case DATA_WATCHER_SILTHIK: return uiWatcherSilthik; - case DATA_WATCHER_NARJIL: return uiWatcherNarjil; - } - - return 0; - } - - void SetData(uint32 type, uint32 data) - { - switch(type) - { - case DATA_KRIKTHIR_THE_GATEWATCHER_EVENT: - auiEncounter[0] = data; - if (data == DONE) - HandleGameObject(uiKrikthirDoor,true); - break; - case DATA_HADRONOX_EVENT: - auiEncounter[1] = data; - break; - case DATA_ANUBARAK_EVENT: - auiEncounter[2] = data; - if (data == IN_PROGRESS) - for (uint8 i = 0; i < 3; ++i) - HandleGameObject(uiAnubarakDoor[i], false); - else if (data == NOT_STARTED || data == DONE) - for (uint8 i = 0; i < 3; ++i) - HandleGameObject(uiAnubarakDoor[i], true); - break; - } - - if (data == DONE) - { - SaveToDB(); - } - } - - uint32 GetData(uint32 type) - { - switch(type) - { - case DATA_KRIKTHIR_THE_GATEWATCHER_EVENT: return auiEncounter[0]; - case DATA_HADRONOX_EVENT: return auiEncounter[1]; - case DATA_ANUBARAK_EVENT: return auiEncounter[2]; - } - - return 0; - } - - std::string GetSaveData() - { - OUT_SAVE_INST_DATA; - - std::ostringstream saveStream; - saveStream << "A N " << auiEncounter[0] << " " << auiEncounter[1] << " " - << auiEncounter[2]; - - OUT_SAVE_INST_DATA_COMPLETE; - return saveStream.str(); - } - - void Load(const char* in) - { - if (!in) - { - OUT_LOAD_INST_DATA_FAIL; - return; - } - - OUT_LOAD_INST_DATA(in); - - char dataHead1, dataHead2; - uint16 data0,data1,data2; - - std::istringstream loadStream(in); - loadStream >> dataHead1 >> dataHead2 >> data0 >> data1 >> data2; - - if (dataHead1 == 'A' && dataHead2 == 'N') - { - auiEncounter[0] = data0; - auiEncounter[1] = data1; - auiEncounter[2] = data2; - - for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) - if (auiEncounter[i] == IN_PROGRESS) - auiEncounter[i] = NOT_STARTED; - - } else OUT_LOAD_INST_DATA_FAIL; - - OUT_LOAD_INST_DATA_COMPLETE; - } -}; - -InstanceData* GetInstanceData_instance_azjol_nerub(Map* pMap) -{ - return new instance_azjol_nerub(pMap); -} - -void AddSC_instance_azjol_nerub() -{ - Script *newscript; - newscript = new Script; - newscript->Name = "instance_azjol_nerub"; - newscript->GetInstanceData = &GetInstanceData_instance_azjol_nerub; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp new file mode 100644 index 00000000000..c33ea69fa2d --- /dev/null +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp @@ -0,0 +1,512 @@ +/* + * Copyright (C) 2009 Trinity + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Argent Challenge Encounter. +SD%Complete: 50 % +SDComment: AI for Argent Soldiers are not implemented. AI from bosses need more improvements. +SDCategory: Trial of the Champion +EndScriptData */ + +#include "ScriptedPch.h" +#include "trial_of_the_champion.h" +#include "ScriptedEscortAI.h" + +enum eSpells +{ + //Eadric + SPELL_EADRIC_ACHIEVEMENT = 68197, + SPELL_HAMMER_JUSTICE = 66863, + SPELL_HAMMER_RIGHTEOUS = 66867, + SPELL_RADIANCE = 66935, + SPELL_VENGEANCE = 66865, + + //Paletress + SPELL_SMITE = 66536, + SPELL_SMITE_H = 67674, + SPELL_HOLY_FIRE = 66538, + SPELL_HOLY_FIRE_H = 67676, + SPELL_RENEW = 66537, + SPELL_RENEW_H = 67675, + SPELL_HOLY_NOVA = 66546, + SPELL_SHIELD = 66515, + SPELL_CONFESS = 66680, + SPELL_SUMMON_MEMORY = 66545, + + //Memory + SPELL_OLD_WOUNDS = 66620, + SPELL_OLD_WOUNDS_H = 67679, + SPELL_SHADOWS_PAST = 66619, + SPELL_SHADOWS_PAST_H = 67678, + SPELL_WAKING_NIGHTMARE = 66552, + SPELL_WAKING_NIGHTMARE_H = 67677 +}; + +struct boss_eadricAI : public ScriptedAI +{ + boss_eadricAI(Creature* pCreature) : ScriptedAI(pCreature) + { + pInstance = pCreature->GetInstanceData(); + pCreature->SetReactState(REACT_PASSIVE); + pCreature->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE); + } + + ScriptedInstance* pInstance; + + uint32 uiVenganceTimer; + uint32 uiRadianceTimer; + uint32 uiHammerJusticeTimer; + uint32 uiResetTimer; + + bool bDone; + + void Reset() + { + uiVenganceTimer = 10000; + uiRadianceTimer = 16000; + uiHammerJusticeTimer = 25000; + uiResetTimer = 5000; + + bDone = false; + } + + void DamageTaken(Unit * /*done_by*/, uint32 &damage) + { + if (damage >= me->GetHealth()) + { + damage = 0; + EnterEvadeMode(); + me->setFaction(35); + bDone = true; + } + } + + void MovementInform(uint32 MovementType, uint32 /*Data*/) + { + if (MovementType != POINT_MOTION_TYPE) + return; + + if (pInstance) + pInstance->SetData(BOSS_ARGENT_CHALLENGE_E, DONE); + + me->DisappearAndDie(); + } + + void UpdateAI(const uint32 uiDiff) + { + if (bDone && uiResetTimer <= uiDiff) + { + me->GetMotionMaster()->MovePoint(0,746.87,665.87,411.75); + bDone = false; + } else uiResetTimer -= uiDiff; + + if (!UpdateVictim()) + return; + + if (uiHammerJusticeTimer <= uiDiff) + { + me->InterruptNonMeleeSpells(true); + + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 250, true)) + { + if (pTarget && pTarget->isAlive()) + { + DoCast(pTarget, SPELL_HAMMER_JUSTICE); + DoCast(pTarget, SPELL_HAMMER_RIGHTEOUS); + } + } + uiHammerJusticeTimer = 25000; + } else uiHammerJusticeTimer -= uiDiff; + + if (uiVenganceTimer <= uiDiff) + { + DoCast(me,SPELL_VENGEANCE); + + uiVenganceTimer = 10000; + } else uiVenganceTimer -= uiDiff; + + if (uiRadianceTimer <= uiDiff) + { + DoCastAOE(SPELL_RADIANCE); + + uiRadianceTimer = 16000; + } else uiRadianceTimer -= uiDiff; + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_boss_eadric(Creature* pCreature) +{ + return new boss_eadricAI(pCreature); +} + +struct boss_paletressAI : public ScriptedAI +{ + boss_paletressAI(Creature* pCreature) : ScriptedAI(pCreature) + { + pInstance = pCreature->GetInstanceData(); + + MemoryGUID = 0; + pCreature->SetReactState(REACT_PASSIVE); + pCreature->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE); + pCreature->RestoreFaction(); + } + + ScriptedInstance* pInstance; + + Creature* pMemory; + uint64 MemoryGUID; + + bool bHealth; + bool bDone; + + uint32 uiHolyFireTimer; + uint32 uiHolySmiteTimer; + uint32 uiRenewTimer; + uint32 uiResetTimer; + + void Reset() + { + me->RemoveAllAuras(); + + uiHolyFireTimer = urand(9000,12000); + uiHolySmiteTimer = urand(5000,7000); + uiRenewTimer = urand(2000,5000); + + uiResetTimer = 7000; + + bHealth = false; + bDone = false; + + if (Creature *pMemory = Unit::GetCreature(*me, MemoryGUID)) + if (pMemory->isAlive()) + pMemory->RemoveFromWorld(); + } + + void SetData(uint32 uiId, uint32 /*uiValue*/) + { + if (uiId == 1) + me->RemoveAura(SPELL_SHIELD); + } + + void DamageTaken(Unit * /*done_by*/, uint32 &damage) + { + if (damage >= me->GetHealth()) + { + damage = 0; + EnterEvadeMode(); + me->setFaction(35); + bDone = true; + } + } + + void MovementInform(uint32 MovementType, uint32 Point) + { + if (MovementType != POINT_MOTION_TYPE || Point != 0) + return; + + if (pInstance) + pInstance->SetData(BOSS_ARGENT_CHALLENGE_P, DONE); + + me->DisappearAndDie(); + } + + void UpdateAI(const uint32 uiDiff) + { + if (bDone && uiResetTimer <= uiDiff) + { + me->GetMotionMaster()->MovePoint(0,746.87,665.87,411.75); + bDone = false; + } else uiResetTimer -= uiDiff; + + if (!UpdateVictim()) + return; + + if (uiHolyFireTimer <= uiDiff) + { + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 250, true)) + { + if (pTarget && pTarget->isAlive()) + DoCast(pTarget,SPELL_HOLY_FIRE); + } + if (me->HasAura(SPELL_SHIELD)) + uiHolyFireTimer = 13000; + else + uiHolyFireTimer = urand(9000,12000); + } else uiHolyFireTimer -= uiDiff; + + if (uiHolySmiteTimer <= uiDiff) + { + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 250, true)) + { + if (pTarget && pTarget->isAlive()) + DoCast(pTarget,SPELL_SMITE); + } + if (me->HasAura(SPELL_SHIELD)) + uiHolySmiteTimer = 9000; + else + uiHolySmiteTimer = urand(5000,7000); + } else uiHolySmiteTimer -= uiDiff; + + if (me->HasAura(SPELL_SHIELD)) + if (uiRenewTimer <= uiDiff) + { + me->InterruptNonMeleeSpells(true); + uint8 uiTarget = urand(0,1); + switch(uiTarget) + { + case 0: + DoCast(me,SPELL_RENEW); + break; + case 1: + if (Creature *pMemory = Unit::GetCreature(*me, MemoryGUID)) + if (pMemory->isAlive()) + DoCast(pMemory, SPELL_RENEW); + break; + } + uiRenewTimer = urand(15000,17000); + } else uiRenewTimer -= uiDiff; + + + if (!bHealth && me->GetHealth()*100 / me->GetMaxHealth() <= 25) + { + me->InterruptNonMeleeSpells(true); + DoCastAOE(SPELL_HOLY_NOVA,false); + DoCast(me, SPELL_SHIELD); + DoCastAOE(SPELL_SUMMON_MEMORY,false); + DoCastAOE(SPELL_CONFESS,false); + + bHealth = true; + } + + DoMeleeAttackIfReady(); + } + + void JustSummoned(Creature* pSummon) + { + MemoryGUID = pSummon->GetGUID(); + } +}; + +CreatureAI* GetAI_boss_paletress(Creature* pCreature) +{ + return new boss_paletressAI(pCreature); +} + +struct npc_memoryAI : public ScriptedAI +{ + npc_memoryAI(Creature* pCreature) : ScriptedAI(pCreature) {} + + uint32 uiOldWoundsTimer; + uint32 uiShadowPastTimer; + uint32 uiWakingNightmare; + + void Reset() + { + uiOldWoundsTimer = 12000; + uiShadowPastTimer = 5000; + uiWakingNightmare = 7000; + } + + void UpdateAI(const uint32 uiDiff) + { + if (!UpdateVictim()) + return; + + if (uiOldWoundsTimer <= uiDiff) + { + if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + { + if (pTarget && pTarget->isAlive()) + DoCast(pTarget, SPELL_OLD_WOUNDS); + } + uiOldWoundsTimer = 12000; + }else uiOldWoundsTimer -= uiDiff; + + if (uiWakingNightmare <= uiDiff) + { + DoCast(me, SPELL_WAKING_NIGHTMARE); + uiWakingNightmare = 7000; + }else uiWakingNightmare -= uiDiff; + + if (uiShadowPastTimer <= uiDiff) + { + if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM,1)) + { + if (pTarget && pTarget->isAlive()) + DoCast(pTarget,SPELL_SHADOWS_PAST); + } + uiShadowPastTimer = 5000; + }else uiShadowPastTimer -= uiDiff; + + DoMeleeAttackIfReady(); + } + + void JustDied(Unit* /*pKiller*/) + { + if (me->isSummon()) + { + if (Unit* pSummoner = CAST_SUM(me)->GetSummoner()) + { + if (pSummoner && pSummoner->isAlive()) + CAST_CRE(pSummoner)->AI()->SetData(1,0); + } + } + } +}; + +CreatureAI* GetAI_npc_memory(Creature* pCreature) +{ + return new npc_memoryAI(pCreature); +} + +// THIS AI NEEDS MORE IMPROVEMENTS +struct npc_argent_soldierAI : public npc_escortAI +{ + npc_argent_soldierAI(Creature* pCreature) : npc_escortAI(pCreature) + { + pInstance = pCreature->GetInstanceData(); + me->SetReactState(REACT_DEFENSIVE); + SetDespawnAtEnd(false); + uiWaypoint = 0; + } + + ScriptedInstance* pInstance; + + uint8 uiWaypoint; + + void WaypointReached(uint32 uiPoint) + { + if (uiPoint == 0) + { + switch(uiWaypoint) + { + case 0: + me->SetOrientation(5.81); + break; + case 1: + me->SetOrientation(4.60); + break; + case 2: + me->SetOrientation(2.79); + break; + } + + me->SendMovementFlagUpdate(); + } + } + + void SetData(uint32 uiType, uint32 /*uiData*/) + { + switch(me->GetEntry()) + { + case NPC_ARGENT_LIGHWIELDER: + switch(uiType) + { + case 0: + AddWaypoint(0,712.14,628.42,411.88); + break; + case 1: + AddWaypoint(0,742.44,650.29,411.79); + break; + case 2: + AddWaypoint(0,783.33,615.29,411.84); + break; + } + break; + case NPC_ARGENT_MONK: + switch(uiType) + { + case 0: + AddWaypoint(0,713.12,632.97,411.90); + break; + case 1: + AddWaypoint(0,746.73,650.24,411.56); + break; + case 2: + AddWaypoint(0,781.32,610.54,411.82); + break; + } + break; + case NPC_PRIESTESS: + switch(uiType) + { + case 0: + AddWaypoint(0,715.06,637.07,411.91); + break; + case 1: + AddWaypoint(0,750.72,650.20,411.77); + break; + case 2: + AddWaypoint(0,779.77,607.03,411.81); + break; + } + break; + } + + Start(false,true,0); + uiWaypoint = uiType; + } + + void UpdateAI(const uint32 uiDiff) + { + npc_escortAI::UpdateAI(uiDiff); + + if (!UpdateVictim()) + return; + + DoMeleeAttackIfReady(); + } + + void JustDied(Unit* /*pKiller*/) + { + if (pInstance) + pInstance->SetData(DATA_ARGENT_SOLDIER_DEFEATED,pInstance->GetData(DATA_ARGENT_SOLDIER_DEFEATED) + 1); + } +}; + +CreatureAI* GetAI_npc_argent_soldier(Creature* pCreature) +{ + return new npc_argent_soldierAI(pCreature); +} + +void AddSC_boss_argent_challenge() +{ + Script* NewScript; + + NewScript = new Script; + NewScript->Name = "boss_eadric"; + NewScript->GetAI = &GetAI_boss_eadric; + NewScript->RegisterSelf(); + + NewScript = new Script; + NewScript->Name = "boss_paletress"; + NewScript->GetAI = &GetAI_boss_paletress; + NewScript->RegisterSelf(); + + NewScript = new Script; + NewScript->Name = "npc_memory"; + NewScript->GetAI = &GetAI_npc_memory; + NewScript->RegisterSelf(); + + NewScript = new Script; + NewScript->Name = "npc_argent_soldier"; + NewScript->GetAI = &GetAI_npc_argent_soldier; + NewScript->RegisterSelf(); +} diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp new file mode 100644 index 00000000000..e1f4586ca6c --- /dev/null +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp @@ -0,0 +1,373 @@ +/* + * Copyright (C) 2010 Trinity + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Boss Black Knight +SD%Complete: 80% +SDComment: missing yells. not sure about timers. +SDCategory: Trial of the Champion +EndScriptData */ + +#include "ScriptedPch.h" +#include "ScriptedEscortAI.h" +#include "trial_of_the_champion.h" + +enum eSpells +{ + //phase 1 + SPELL_PLAGUE_STRIKE = 67884, + SPELL_PLAGUE_STRIKE_2 = 67724, + SPELL_ICY_TOUCH_H = 67881, + SPELL_ICY_TOUCH = 67718, + SPELL_DEATH_RESPITE = 67745, + SPELL_DEATH_RESPITE_2 = 68306, + SPELL_DEATH_RESPITE_3 = 66798, + SPELL_OBLITERATE_H = 67883, + SPELL_OBLITERATE = 67725, + //in this phase should rise herald (the spell is missing) + + //phase 2 - During this phase, the Black Knight will use the same abilities as in phase 1, except for Death's Respite + SPELL_ARMY_DEAD = 67761, + SPELL_DESECRATION = 67778, + SPELL_DESECRATION_2 = 67778, + SPELL_GHOUL_EXPLODE = 67751, + + //phase 3 + SPELL_DEATH_BITE_H = 67875, + SPELL_DEATH_BITE = 67808, + SPELL_MARKED_DEATH = 67882, + SPELL_MARKED_DEATH_2 = 67823, + + SPELL_BLACK_KNIGHT_RES = 67693, + + SPELL_LEAP = 67749, + SPELL_LEAP_H = 67880 +}; + +enum eModels +{ + MODEL_SKELETON = 29846, + MODEL_GHOST = 21300 +}; + +enum ePhases +{ + PHASE_UNDEAD = 1, + PHASE_SKELETON = 2, + PHASE_GHOST = 3 +}; + +struct boss_black_knightAI : public ScriptedAI +{ + boss_black_knightAI(Creature* pCreature) : ScriptedAI(pCreature) + { + pInstance = pCreature->GetInstanceData(); + } + + ScriptedInstance* pInstance; + + std::list SummonList; + + bool bEventInProgress; + bool bEvent; + bool bSummonArmy; + bool bDeathArmyDone; + + uint8 uiPhase; + + uint32 uiPlagueStrikeTimer; + uint32 uiIcyTouchTimer; + uint32 uiDeathRespiteTimer; + uint32 uiObliterateTimer; + uint32 uiDesecration; + uint32 uiResurrectTimer; + uint32 uiDeathArmyCheckTimer; + uint32 uiGhoulExplodeTimer; + uint32 uiDeathBiteTimer; + uint32 uiMarkedDeathTimer; + + void Reset() + { + RemoveSummons(); + me->SetDisplayId(me->GetNativeDisplayId()); + me->clearUnitState(UNIT_STAT_ROOT | UNIT_STAT_STUNNED); + + bEventInProgress = false; + bEvent = false; + bSummonArmy = false; + bDeathArmyDone = false; + + uiPhase = PHASE_UNDEAD; + + uiIcyTouchTimer = urand(5000,9000); + uiPlagueStrikeTimer = urand(10000,13000); + uiDeathRespiteTimer = urand(15000,16000); + uiObliterateTimer = urand(17000,19000); + uiDesecration = urand(15000,16000); + uiDeathArmyCheckTimer = 7000; + uiResurrectTimer = 4000; + uiGhoulExplodeTimer = 8000; + uiDeathBiteTimer = urand (2000,4000); + uiMarkedDeathTimer = urand (5000,7000); + } + + void RemoveSummons() + { + if (SummonList.empty()) + return; + + for (std::list::const_iterator itr = SummonList.begin(); itr != SummonList.end(); ++itr) + { + if (Creature* pTemp = Unit::GetCreature(*me, *itr)) + if (pTemp) + pTemp->DisappearAndDie(); + } + SummonList.clear(); + } + + void JustSummoned(Creature* pSummon) + { + SummonList.push_back(pSummon->GetGUID()); + pSummon->AI()->AttackStart(me->getVictim()); + } + + void UpdateAI(const uint32 uiDiff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + if (bEventInProgress) + if (uiResurrectTimer <= uiDiff) + { + me->SetHealth(me->GetMaxHealth()); + DoCast(me,SPELL_BLACK_KNIGHT_RES,true); + uiPhase++; + uiResurrectTimer = 4000; + bEventInProgress = false; + me->clearUnitState(UNIT_STAT_ROOT | UNIT_STAT_STUNNED); + } else uiResurrectTimer -= uiDiff; + + switch(uiPhase) + { + case PHASE_UNDEAD: + case PHASE_SKELETON: + { + if (uiIcyTouchTimer <= uiDiff) + { + DoCastVictim(SPELL_ICY_TOUCH); + uiIcyTouchTimer = urand(5000,7000); + } else uiIcyTouchTimer -= uiDiff; + if (uiPlagueStrikeTimer <= uiDiff) + { + DoCastVictim(SPELL_ICY_TOUCH); + uiPlagueStrikeTimer = urand(12000,15000); + } else uiPlagueStrikeTimer -= uiDiff; + if (uiObliterateTimer <= uiDiff) + { + DoCastVictim(SPELL_OBLITERATE); + uiObliterateTimer = urand(17000,19000); + } else uiObliterateTimer -= uiDiff; + switch(uiPhase) + { + case PHASE_UNDEAD: + { + if (uiDeathRespiteTimer <= uiDiff) + { + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + { + if (pTarget && pTarget->isAlive()) + DoCast(pTarget,SPELL_DEATH_RESPITE); + } + uiDeathRespiteTimer = urand(15000,16000); + } else uiDeathRespiteTimer -= uiDiff; + break; + } + case PHASE_SKELETON: + { + if (!bSummonArmy) + { + bSummonArmy = true; + me->addUnitState(UNIT_STAT_ROOT | UNIT_STAT_STUNNED); + DoCast(me, SPELL_ARMY_DEAD); + } + if (!bDeathArmyDone) + if (uiDeathArmyCheckTimer <= uiDiff) + { + me->clearUnitState(UNIT_STAT_ROOT | UNIT_STAT_STUNNED); + uiDeathArmyCheckTimer = 0; + bDeathArmyDone = true; + } else uiDeathArmyCheckTimer -= uiDiff; + if (uiDesecration <= uiDiff) + { + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + { + if (pTarget && pTarget->isAlive()) + DoCast(pTarget,SPELL_DESECRATION); + } + uiDesecration = urand(15000,16000); + } else uiDesecration -= uiDiff; + if (uiGhoulExplodeTimer <= uiDiff) + { + DoCast(me, SPELL_GHOUL_EXPLODE); + uiGhoulExplodeTimer = 8000; + } else uiGhoulExplodeTimer -= uiDiff; + break; + } + break; + } + break; + } + case PHASE_GHOST: + { + if (uiDeathBiteTimer <= uiDiff) + { + DoCastAOE(SPELL_DEATH_BITE); + uiDeathBiteTimer = urand (2000, 4000); + } else uiDeathBiteTimer -= uiDiff; + if (uiMarkedDeathTimer <= uiDiff) + { + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + { + if (pTarget && pTarget->isAlive()) + DoCast(pTarget,SPELL_MARKED_DEATH); + } + uiMarkedDeathTimer = urand (5000, 7000); + } else uiMarkedDeathTimer -= uiDiff; + break; + } + } + + if (!me->hasUnitState(UNIT_STAT_ROOT) && !me->GetHealth()*100 / me->GetMaxHealth() <= 0) + DoMeleeAttackIfReady(); + } + + void DamageTaken(Unit* /*pDoneBy*/, uint32& uiDamage) + { + if (uiDamage > me->GetHealth() && uiPhase <= PHASE_SKELETON) + { + uiDamage = 0; + me->SetHealth(0); + me->addUnitState(UNIT_STAT_ROOT | UNIT_STAT_STUNNED); + RemoveSummons(); + switch(uiPhase) + { + case PHASE_UNDEAD: + me->SetDisplayId(MODEL_SKELETON); + break; + case PHASE_SKELETON: + me->SetDisplayId(MODEL_GHOST); + break; + } + bEventInProgress = true; + } + } + + void JustDied(Unit* /*pKiller*/) + { + if (pInstance) + pInstance->SetData(BOSS_BLACK_KNIGHT,DONE); + } +}; + +CreatureAI* GetAI_boss_black_knight(Creature *pCreature) +{ + return new boss_black_knightAI (pCreature); +} + +struct npc_risen_ghoulAI : public ScriptedAI +{ + npc_risen_ghoulAI(Creature* pCreature) : ScriptedAI(pCreature) {} + + uint32 uiAttackTimer; + + void Reset() + { + uiAttackTimer = 3500; + } + + void UpdateAI(const uint32 uiDiff) + { + if (!UpdateVictim()) + return; + + if (uiAttackTimer <= uiDiff) + { + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true)) + { + if (pTarget && pTarget->isAlive()) + DoCast(pTarget, (SPELL_LEAP)); + } + uiAttackTimer = 3500; + } else uiAttackTimer -= uiDiff; + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_npc_risen_ghoul(Creature* pCreature) +{ + return new npc_risen_ghoulAI(pCreature); +} + +struct npc_black_knight_skeletal_gryphonAI : public npc_escortAI +{ + npc_black_knight_skeletal_gryphonAI(Creature* pCreature) : npc_escortAI(pCreature) + { + Start(false,true,0,NULL); + } + + void WaypointReached(uint32 /*i*/) + { + + } + + void UpdateAI(const uint32 uiDiff) + { + npc_escortAI::UpdateAI(uiDiff); + + if (!UpdateVictim()) + return; + } + +}; + +CreatureAI* GetAI_npc_black_knight_skeletal_gryphon(Creature* pCreature) +{ + return new npc_black_knight_skeletal_gryphonAI(pCreature); +} + +void AddSC_boss_black_knight() +{ + Script* NewScript; + + NewScript = new Script; + NewScript->Name = "boss_black_knight"; + NewScript->GetAI = &GetAI_boss_black_knight; + NewScript->RegisterSelf(); + + NewScript = new Script; + NewScript->Name = "npc_risen_ghoul"; + NewScript->GetAI = &GetAI_npc_risen_ghoul; + NewScript->RegisterSelf(); + + NewScript = new Script; + NewScript->Name = "npc_black_knight_skeletal_gryphon"; + NewScript->GetAI = &GetAI_npc_black_knight_skeletal_gryphon; + NewScript->RegisterSelf(); +} diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp new file mode 100644 index 00000000000..4bf8143a210 --- /dev/null +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp @@ -0,0 +1,993 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 +* This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: boss_grand_champions +SD%Complete: 50 % +SDComment: Is missing the ai to make the npcs look for a new mount and use it. +SDCategory: Trial Of the Champion +EndScriptData */ + +#include "ScriptedPch.h" +#include "ScriptedEscortAI.h" +#include "Vehicle.h" +#include "trial_of_the_champion.h" + +enum eSpells +{ + //Vehicle + SPELL_CHARGE = 63010, + SPELL_SHIELD_BREAKER = 68504, + SPELL_SHIELD = 66482, + + // Marshal Jacob Alerius && Mokra the Skullcrusher || Warrior + SPELL_MORTAL_STRIKE = 68783, + SPELL_MORTAL_STRIKE_H = 68784, + SPELL_BLADESTORM = 63784, + SPELL_INTERCEPT = 67540, + SPELL_ROLLING_THROW = 47115, //not implemented in the AI yet... + + // Ambrose Boltspark && Eressea Dawnsinger || Mage + SPELL_FIREBALL = 66042, + SPELL_FIREBALL_H = 68310, + SPELL_BLAST_WAVE = 66044, + SPELL_BLAST_WAVE_H = 68312, + SPELL_HASTE = 66045, + SPELL_POLYMORPH = 66043, + SPELL_POLYMORPH_H = 68311, + + // Colosos && Runok Wildmane || Shaman + SPELL_CHAIN_LIGHTNING = 67529, + SPELL_CHAIN_LIGHTNING_H = 68319, + SPELL_EARTH_SHIELD = 67530, + SPELL_HEALING_WAVE = 67528, + SPELL_HEALING_WAVE_H = 68318, + SPELL_HEX_OF_MENDING = 67534, + + // Jaelyne Evensong && Zul'tore || Hunter + SPELL_DISENGAGE = 68340, //not implemented in the AI yet... + SPELL_LIGHTNING_ARROWS = 66083, + SPELL_MULTI_SHOT = 66081, + SPELL_SHOOT = 65868, + SPELL_SHOOT_H = 67988, + + // Lana Stouthammer Evensong && Deathstalker Visceri || Rouge + SPELL_EVISCERATE = 67709, + SPELL_EVISCERATE_H = 68317, + SPELL_FAN_OF_KNIVES = 67706, + SPELL_POISON_BOTTLE = 67701 +}; + +enum eSeat +{ + SEAT_ID_0 = 0 +}; + +struct Point +{ + float x,y,z; +}; + +const Point MovementPoint[] = +{ + {746.84,623.15,411.41}, + {747.96,620.29,411.09}, + {750.23,618.35,411.09} +}; + +void AggroAllPlayers(Creature* pTemp) +{ + Map::PlayerList const &PlList = pTemp->GetMap()->GetPlayers(); + + if (PlList.isEmpty()) + return; + + for (Map::PlayerList::const_iterator i = PlList.begin(); i != PlList.end(); ++i) + { + if (Player* pPlayer = i->getSource()) + { + if (pPlayer->isGameMaster()) + continue; + + if (pPlayer->isAlive()) + { + pTemp->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); + pTemp->SetReactState(REACT_AGGRESSIVE); + pTemp->SetInCombatWith(pPlayer); + pPlayer->SetInCombatWith(pTemp); + pTemp->AddThreat(pPlayer, 0.0f); + } + } + } +} + +bool GrandChampionsOutVehicle(Creature* me) +{ + ScriptedInstance* pInstance = me->GetInstanceData(); + + if (!pInstance) + return false; + + Creature* pGrandChampion1 = Unit::GetCreature(*me, pInstance->GetData64(DATA_GRAND_CHAMPION_1)); + Creature* pGrandChampion2 = Unit::GetCreature(*me, pInstance->GetData64(DATA_GRAND_CHAMPION_2)); + Creature* pGrandChampion3 = Unit::GetCreature(*me, pInstance->GetData64(DATA_GRAND_CHAMPION_3)); + + if (pGrandChampion1 && pGrandChampion2 && pGrandChampion3) + { + if (!pGrandChampion1->HasUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT) && + !pGrandChampion2->HasUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT) && + !pGrandChampion3->HasUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT)) + return true; + } + + return false; +} + +/* +* Generic AI for vehicles used by npcs in ToC, it needs more improvements. * +* Script Complete: 25%. * +*/ + +struct generic_vehicleAI_toc5AI : public npc_escortAI +{ + generic_vehicleAI_toc5AI(Creature* pCreature) : npc_escortAI(pCreature) + { + SetDespawnAtEnd(false); + uiWaypointPath = 0; + + pInstance = pCreature->GetInstanceData(); + } + + ScriptedInstance* pInstance; + + uint32 uiChargeTimer; + uint32 uiShieldBreakerTimer; + uint32 uiBuffTimer; + + uint32 uiWaypointPath; + + void Reset() + { + uiChargeTimer = 5000; + uiShieldBreakerTimer = 8000; + uiBuffTimer = urand(30000,60000); + } + + void SetData(uint32 uiType, uint32 /*uiData*/) + { + switch(uiType) + { + case 1: + AddWaypoint(0,747.36,634.07,411.572); + AddWaypoint(1,780.43,607.15,411.82); + AddWaypoint(2,785.99,599.41,411.92); + AddWaypoint(3,778.44,601.64,411.79); + uiWaypointPath = 1; + break; + case 2: + AddWaypoint(0,747.35,634.07,411.57); + AddWaypoint(1,768.72,581.01,411.92); + AddWaypoint(2,763.55,590.52,411.71); + uiWaypointPath = 2; + break; + case 3: + AddWaypoint(0,747.35,634.07,411.57); + AddWaypoint(1,784.02,645.33,412.39); + AddWaypoint(2,775.67,641.91,411.91); + uiWaypointPath = 3; + break; + } + + if (uiType <= 3) + Start(false,true,0,NULL); + } + + void WaypointReached(uint32 i) + { + switch(i) + { + case 2: + if (pInstance && uiWaypointPath == 3 || uiWaypointPath == 2) + pInstance->SetData(DATA_MOVEMENT_DONE, pInstance->GetData(DATA_MOVEMENT_DONE)+1); + break; + case 3: + if (pInstance) + pInstance->SetData(DATA_MOVEMENT_DONE, pInstance->GetData(DATA_MOVEMENT_DONE)+1); + break; + } + } + + void EnterCombat(Unit* /*pWho*/) + { + DoCastSpellShield(); + } + + void DoCastSpellShield() + { + for (uint8 i = 0; i < 3; ++i) + DoCast(me,SPELL_SHIELD,true); + } + + void UpdateAI(const uint32 uiDiff) + { + npc_escortAI::UpdateAI(uiDiff); + + if (!UpdateVictim()) + return; + + if (uiBuffTimer <= uiDiff) + { + if (!me->HasAura(SPELL_SHIELD)) + DoCastSpellShield(); + + uiBuffTimer = urand(30000,45000); + }else uiBuffTimer -= uiDiff; + + if (uiChargeTimer <= uiDiff) + { + Map::PlayerList const& players = me->GetMap()->GetPlayers(); + if (me->GetMap()->IsDungeon() && !players.isEmpty()) + { + for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) + { + Player* pPlayer = itr->getSource(); + if (pPlayer && !pPlayer->isGameMaster() && me->IsInRange(pPlayer,8.0f,25.0f,false)) + { + DoResetThreat(); + me->AddThreat(pPlayer,1.0f); + DoCast(pPlayer, SPELL_CHARGE); + break; + } + } + } + uiChargeTimer = 5000; + }else uiChargeTimer -= uiDiff; + + //dosen't work at all + if (uiShieldBreakerTimer <= uiDiff) + { + Vehicle *pVehicle = me->GetVehicleKit(); + if (!pVehicle) + return; + + if (Unit* pPassenger = pVehicle->GetPassenger(SEAT_ID_0)) + { + Map::PlayerList const& players = me->GetMap()->GetPlayers(); + if (me->GetMap()->IsDungeon() && !players.isEmpty()) + { + for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) + { + Player* pPlayer = itr->getSource(); + if (pPlayer && !pPlayer->isGameMaster() && me->IsInRange(pPlayer,10.0f,30.0f,false)) + { + pPassenger->CastSpell(pPlayer,SPELL_SHIELD_BREAKER,true); + break; + } + } + } + } + uiShieldBreakerTimer = 7000; + }else uiShieldBreakerTimer -= uiDiff; + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_generic_vehicleAI_toc5(Creature* pCreature) +{ + return new generic_vehicleAI_toc5AI(pCreature); +} + +// Marshal Jacob Alerius && Mokra the Skullcrusher || Warrior +struct boss_warrior_toc5AI : public ScriptedAI +{ + boss_warrior_toc5AI(Creature* pCreature) : ScriptedAI(pCreature) + { + pInstance = pCreature->GetInstanceData(); + + bDone = false; + bHome = false; + + uiPhase = 0; + uiPhaseTimer = 0; + + me->SetReactState(REACT_PASSIVE); + // THIS IS A HACK, SHOULD BE REMOVED WHEN THE EVENT IS FULL SCRIPTED + me->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); + } + + ScriptedInstance* pInstance; + + uint8 uiPhase; + uint32 uiPhaseTimer; + + uint32 uiBladeStormTimer; + uint32 uiInterceptTimer; + uint32 uiMortalStrikeTimer; + uint32 uiAttackTimer; + + bool bDone; + bool bHome; + + void Reset() + { + uiBladeStormTimer = urand(15000,20000); + uiInterceptTimer = 7000; + uiMortalStrikeTimer = urand(8000,12000); + } + + void JustReachedHome() + { + ScriptedAI::JustReachedHome(); + + if (!bHome) + return; + + uiPhaseTimer = 15000; + uiPhase = 1; + + bHome = false; + } + + void UpdateAI(const uint32 uiDiff) + { + if (!bDone && GrandChampionsOutVehicle(me)) + { + bDone = true; + + if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_1)) + me->SetHomePosition(739.678,662.541,412.393,4.49); + else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_2)) + me->SetHomePosition(746.71,661.02,411.69,4.6); + else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_3)) + me->SetHomePosition(754.34,660.70,412.39,4.79); + + EnterEvadeMode(); + bHome = true; + } + + if (uiPhaseTimer <= uiDiff) + { + if (uiPhase == 1) + { + AggroAllPlayers(me); + uiPhase = 0; + } + }else uiPhaseTimer -= uiDiff; + + if (!UpdateVictim() || me->HasUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT)) + return; + + if (uiInterceptTimer <= uiDiff) + { + Map::PlayerList const& players = me->GetMap()->GetPlayers(); + if (me->GetMap()->IsDungeon() && !players.isEmpty()) + { + for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) + { + Player* pPlayer = itr->getSource(); + if (pPlayer && !pPlayer->isGameMaster() && me->IsInRange(pPlayer,8.0f,25.0f,false)) + { + DoResetThreat(); + me->AddThreat(pPlayer,5.0f); + DoCast(pPlayer,SPELL_INTERCEPT); + break; + } + } + } + uiInterceptTimer = 7000; + } else uiInterceptTimer -= uiDiff; + + if (uiBladeStormTimer <= uiDiff) + { + DoCastVictim(SPELL_BLADESTORM); + uiBladeStormTimer = urand(15000,20000); + } else uiBladeStormTimer -= uiDiff; + + if (uiMortalStrikeTimer <= uiDiff) + { + DoCastVictim(SPELL_MORTAL_STRIKE); + uiMortalStrikeTimer = urand(8000,12000); + } else uiMortalStrikeTimer -= uiDiff; + + DoMeleeAttackIfReady(); + } + + void JustDied(Unit* /*pKiller*/) + { + if (pInstance) + pInstance->SetData(BOSS_GRAND_CHAMPIONS, DONE); + } +}; + +CreatureAI* GetAI_boss_warrior_toc5(Creature* pCreature) +{ + return new boss_warrior_toc5AI(pCreature); +} + +// Ambrose Boltspark && Eressea Dawnsinger || Mage +struct boss_mage_toc5AI : public ScriptedAI +{ + boss_mage_toc5AI(Creature* pCreature) : ScriptedAI(pCreature) + { + pInstance = pCreature->GetInstanceData(); + + bDone = false; + bHome = false; + + uiPhase = 0; + uiPhaseTimer = 0; + + me->SetReactState(REACT_PASSIVE); + // THIS IS A HACK, SHOULD BE REMOVED WHEN THE EVENT IS FULL SCRIPTED + me->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); + } + + ScriptedInstance* pInstance; + + uint8 uiPhase; + uint32 uiPhaseTimer; + + uint32 uiFireBallTimer; + uint32 uiBlastWaveTimer; + uint32 uiHasteTimer; + uint32 uiPolymorphTimer; + + bool bDone; + bool bHome; + + void Reset() + { + uiFireBallTimer = 5000; + uiPolymorphTimer = 8000; + uiBlastWaveTimer = 12000; + uiHasteTimer = 22000; + } + + void JustReachedHome() + { + ScriptedAI::JustReachedHome(); + + if (!bHome) + return; + + uiPhaseTimer = 15000; + uiPhase = 1; + + bHome = false; + } + + void UpdateAI(const uint32 uiDiff) + { + if (!bDone && GrandChampionsOutVehicle(me)) + { + bDone = true; + + if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_1)) + me->SetHomePosition(739.678,662.541,412.393,4.49); + else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_2)) + me->SetHomePosition(746.71,661.02,411.69,4.6); + else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_3)) + me->SetHomePosition(754.34,660.70,412.39,4.79); + + if (pInstance) + pInstance->SetData(BOSS_GRAND_CHAMPIONS, IN_PROGRESS); + + EnterEvadeMode(); + bHome = true; + } + + if (uiPhaseTimer <= uiDiff) + { + if (uiPhase == 1) + { + AggroAllPlayers(me); + uiPhase = 0; + } + }else uiPhaseTimer -= uiDiff; + + if (uiFireBallTimer <= uiDiff) + { + if (me->getVictim()) + DoCastVictim(SPELL_FIREBALL); + uiFireBallTimer = 5000; + } else uiFireBallTimer -= uiDiff; + + + if (!UpdateVictim() || me->HasUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT)) + return; + + if (uiFireBallTimer <= uiDiff) + { + DoCastVictim(SPELL_FIREBALL); + uiFireBallTimer = 5000; + } else uiFireBallTimer -= uiDiff; + + if (uiPolymorphTimer <= uiDiff) + { + if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget, SPELL_POLYMORPH); + uiPolymorphTimer = 8000; + } else uiPolymorphTimer -= uiDiff; + + if (uiBlastWaveTimer <= uiDiff) + { + DoCastAOE(SPELL_BLAST_WAVE,false); + uiBlastWaveTimer = 13000; + } else uiBlastWaveTimer -= uiDiff; + + if (uiHasteTimer <= uiDiff) + { + me->InterruptNonMeleeSpells(true); + + DoCast(me,SPELL_HASTE); + uiHasteTimer = 22000; + } else uiHasteTimer -= uiDiff; + + DoMeleeAttackIfReady(); + } + + void JustDied(Unit* /*pKiller*/) + { + if (pInstance) + pInstance->SetData(BOSS_GRAND_CHAMPIONS, DONE); + } +}; + +CreatureAI* GetAI_boss_mage_toc5(Creature* pCreature) +{ + return new boss_mage_toc5AI(pCreature); +} + +// Colosos && Runok Wildmane || Shaman +struct boss_shaman_toc5AI : public ScriptedAI +{ + boss_shaman_toc5AI(Creature* pCreature) : ScriptedAI(pCreature) + { + pInstance = pCreature->GetInstanceData(); + + bDone = false; + bHome = false; + + uiPhase = 0; + uiPhaseTimer = 0; + + me->SetReactState(REACT_PASSIVE); + // THIS IS A HACK, SHOULD BE REMOVED WHEN THE EVENT IS FULL SCRIPTED + me->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); + } + + ScriptedInstance* pInstance; + + uint8 uiPhase; + uint32 uiPhaseTimer; + + uint32 uiChainLightningTimer; + uint32 uiEartShieldTimer; + uint32 uiHealingWaveTimer; + uint32 uiHexMendingTimer; + + bool bDone; + bool bHome; + + void Reset() + { + uiChainLightningTimer = 16000; + uiHealingWaveTimer = 12000; + uiEartShieldTimer = urand(30000,35000); + uiHexMendingTimer = urand(20000,25000); + } + + void EnterCombat(Unit* pWho) + { + DoCast(me,SPELL_EARTH_SHIELD); + DoCast(pWho,SPELL_HEX_OF_MENDING); + }; + + void JustReachedHome() + { + ScriptedAI::JustReachedHome(); + + if (!bHome) + return; + + uiPhaseTimer = 15000; + uiPhase = 1; + + bHome = false; + } + + void UpdateAI(const uint32 uiDiff) + { + if (!bDone && GrandChampionsOutVehicle(me)) + { + bDone = true; + + if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_1)) + me->SetHomePosition(739.678,662.541,412.393,4.49); + else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_2)) + me->SetHomePosition(746.71,661.02,411.69,4.6); + else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_3)) + me->SetHomePosition(754.34,660.70,412.39,4.79); + + if (pInstance) + pInstance->SetData(BOSS_GRAND_CHAMPIONS, IN_PROGRESS); + + EnterEvadeMode(); + bHome = true; + } + + if (uiPhaseTimer <= uiDiff) + { + if (uiPhase == 1) + { + AggroAllPlayers(me); + uiPhase = 0; + } + }else uiPhaseTimer -= uiDiff; + + if (!UpdateVictim() || me->HasUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT)) + return; + + if (uiChainLightningTimer <= uiDiff) + { + if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget,SPELL_CHAIN_LIGHTNING); + + uiChainLightningTimer = 16000; + } else uiChainLightningTimer -= uiDiff; + + if (uiHealingWaveTimer <= uiDiff) + { + bool bChance = urand(0,1); + + if (!bChance) + { + if (Unit* pFriend = DoSelectLowestHpFriendly(40)) + DoCast(pFriend,SPELL_HEALING_WAVE); + } else + DoCast(me,SPELL_HEALING_WAVE); + + uiHealingWaveTimer = 12000; + } else uiHealingWaveTimer -= uiDiff; + + if (uiEartShieldTimer <= uiDiff) + { + DoCast(me,SPELL_EARTH_SHIELD); + + uiEartShieldTimer = urand(30000,35000); + } else uiEartShieldTimer -= uiDiff; + + if (uiHexMendingTimer <= uiDiff) + { + DoCastVictim(SPELL_HEX_OF_MENDING,true); + + uiHexMendingTimer = urand(20000,25000); + } else uiHexMendingTimer -= uiDiff; + + DoMeleeAttackIfReady(); + } + + void JustDied(Unit* /*pKiller*/) + { + if (pInstance) + pInstance->SetData(BOSS_GRAND_CHAMPIONS, DONE); + } +}; + +CreatureAI* GetAI_boss_shaman_toc5(Creature* pCreature) +{ + return new boss_shaman_toc5AI(pCreature); +} + +// Jaelyne Evensong && Zul'tore || Hunter +struct boss_hunter_toc5AI : public ScriptedAI +{ + boss_hunter_toc5AI(Creature* pCreature) : ScriptedAI(pCreature) + { + pInstance = pCreature->GetInstanceData(); + + bDone = false; + bHome = false; + + uiPhase = 0; + uiPhaseTimer = 0; + + me->SetReactState(REACT_PASSIVE); + // THIS IS A HACK, SHOULD BE REMOVED WHEN THE EVENT IS FULL SCRIPTED + me->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); + } + + ScriptedInstance* pInstance; + + uint8 uiPhase; + uint32 uiPhaseTimer; + + uint32 uiShootTimer; + uint32 uiMultiShotTimer; + uint32 uiLightningArrowsTimer; + + uint64 uiTargetGUID; + + bool bShoot; + bool bDone; + bool bHome; + + void Reset() + { + uiShootTimer = 12000; + uiMultiShotTimer = 0; + uiLightningArrowsTimer = 7000; + + uiTargetGUID = 0; + + bShoot = false; + } + + void JustReachedHome() + { + ScriptedAI::JustReachedHome(); + + if (!bHome) + return; + + uiPhaseTimer = 15000; + uiPhase = 1; + + bHome = false; + } + + void UpdateAI(const uint32 uiDiff) + { + if (!bDone && GrandChampionsOutVehicle(me)) + { + bDone = true; + + if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_1)) + me->SetHomePosition(739.678,662.541,412.393,4.49); + else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_2)) + me->SetHomePosition(746.71,661.02,411.69,4.6); + else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_3)) + me->SetHomePosition(754.34,660.70,412.39,4.79); + + if (pInstance) + pInstance->SetData(BOSS_GRAND_CHAMPIONS, IN_PROGRESS); + + EnterEvadeMode(); + bHome = true; + } + + if (uiPhaseTimer <= uiDiff) + { + if (uiPhase == 1) + { + AggroAllPlayers(me); + uiPhase = 0; + } + }else uiPhaseTimer -= uiDiff; + + if (!UpdateVictim() || me->HasUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT)) + return; + + if (uiLightningArrowsTimer <= uiDiff) + { + DoCastAOE(SPELL_LIGHTNING_ARROWS,false); + uiLightningArrowsTimer = 7000; + } else uiLightningArrowsTimer -= uiDiff; + + if (uiShootTimer <= uiDiff) + { + if (Unit* pTarget = SelectTarget(SELECT_TARGET_FARTHEST,0,30.0f)) + { + uiTargetGUID = pTarget->GetGUID(); + DoCast(pTarget, SPELL_SHOOT); + } + uiShootTimer = 12000; + uiMultiShotTimer = 3000; + bShoot = true; + } else uiShootTimer -= uiDiff; + + if (bShoot && uiMultiShotTimer <= uiDiff) + { + me->InterruptNonMeleeSpells(true); + Unit* pTarget = Unit::GetUnit(*me, uiTargetGUID); + + if (pTarget && me->IsInRange(pTarget,5.0f,30.0f,false)) + { + DoCast(pTarget,SPELL_MULTI_SHOT); + } else + { + Map::PlayerList const& players = me->GetMap()->GetPlayers(); + if (me->GetMap()->IsDungeon() && !players.isEmpty()) + { + for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) + { + Player* pPlayer = itr->getSource(); + if (pPlayer && !pPlayer->isGameMaster() && me->IsInRange(pPlayer,5.0f,30.0f,false)) + { + DoCast(pTarget,SPELL_MULTI_SHOT); + break; + } + } + } + } + bShoot = false; + } else uiMultiShotTimer -= uiDiff; + + DoMeleeAttackIfReady(); + } + + void JustDied(Unit* /*pKiller*/) + { + if (pInstance) + pInstance->SetData(BOSS_GRAND_CHAMPIONS, DONE); + } +}; + +CreatureAI* GetAI_boss_hunter_toc5(Creature* pCreature) +{ + return new boss_hunter_toc5AI(pCreature); +} + +// Lana Stouthammer Evensong && Deathstalker Visceri || Rouge +struct boss_rouge_toc5AI : public ScriptedAI +{ + boss_rouge_toc5AI(Creature* pCreature) : ScriptedAI(pCreature) + { + pInstance = pCreature->GetInstanceData(); + + bDone = false; + bHome = false; + + uiPhase = 0; + uiPhaseTimer = 0; + + me->SetReactState(REACT_PASSIVE); + // THIS IS A HACK, SHOULD BE REMOVED WHEN THE EVENT IS FULL SCRIPTED + me->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); + } + + ScriptedInstance* pInstance; + + uint8 uiPhase; + uint32 uiPhaseTimer; + uint32 uiEviscerateTimer; + uint32 uiFanKivesTimer; + uint32 uiPosionBottleTimer; + + bool bDone; + bool bHome; + + void Reset() + { + uiEviscerateTimer = 8000; + uiFanKivesTimer = 14000; + uiPosionBottleTimer = 19000; + } + + void JustReachedHome() + { + ScriptedAI::JustReachedHome(); + + if (!bHome) + return; + + uiPhaseTimer = 15000; + uiPhase = 1; + + bHome = false; + } + + void UpdateAI(const uint32 uiDiff) + { + if (!bDone && GrandChampionsOutVehicle(me)) + { + bDone = true; + + if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_1)) + me->SetHomePosition(739.678,662.541,412.393,4.49); + else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_2)) + me->SetHomePosition(746.71,661.02,411.69,4.6); + else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_3)) + me->SetHomePosition(754.34,660.70,412.39,4.79); + + if (pInstance) + pInstance->SetData(BOSS_GRAND_CHAMPIONS, IN_PROGRESS); + + EnterEvadeMode(); + bHome = true; + } + + if (uiPhaseTimer <= uiDiff) + { + if (uiPhase == 1) + { + AggroAllPlayers(me); + uiPhase = 0; + } + } else uiPhaseTimer -= uiDiff; + + if (!UpdateVictim() || me->HasUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT)) + return; + + if (uiEviscerateTimer <= uiDiff) + { + DoCast(me->getVictim(),SPELL_EVISCERATE); + uiEviscerateTimer = 8000; + } else uiEviscerateTimer -= uiDiff; + + if (uiFanKivesTimer <= uiDiff) + { + DoCastAOE(SPELL_FAN_OF_KNIVES,false); + uiFanKivesTimer = 14000; + } else uiFanKivesTimer -= uiDiff; + + if (uiPosionBottleTimer <= uiDiff) + { + if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget,SPELL_POISON_BOTTLE); + uiPosionBottleTimer = 19000; + } else uiPosionBottleTimer -= uiDiff; + + DoMeleeAttackIfReady(); + } + + void JustDied(Unit* /*pKiller*/) + { + if (pInstance) + pInstance->SetData(BOSS_GRAND_CHAMPIONS, DONE); + } +}; + +CreatureAI* GetAI_boss_rouge_toc5(Creature* pCreature) +{ + return new boss_rouge_toc5AI(pCreature); +} + +void AddSC_boss_grand_champions() +{ + Script* NewScript; + + NewScript = new Script; + NewScript->Name = "generic_vehicleAI_toc5"; + NewScript->GetAI = &GetAI_generic_vehicleAI_toc5; + NewScript->RegisterSelf(); + + NewScript = new Script; + NewScript->Name = "boss_warrior_toc5"; + NewScript->GetAI = &GetAI_boss_warrior_toc5; + NewScript->RegisterSelf(); + + NewScript = new Script; + NewScript->Name = "boss_mage_toc5"; + NewScript->GetAI = &GetAI_boss_mage_toc5; + NewScript->RegisterSelf(); + + NewScript = new Script; + NewScript->Name = "boss_shaman_toc5"; + NewScript->GetAI = &GetAI_boss_shaman_toc5; + NewScript->RegisterSelf(); + + NewScript = new Script; + NewScript->Name = "boss_hunter_toc5"; + NewScript->GetAI = &GetAI_boss_hunter_toc5; + NewScript->RegisterSelf(); + + NewScript = new Script; + NewScript->Name = "boss_rouge_toc5"; + NewScript->GetAI = &GetAI_boss_rouge_toc5; + NewScript->RegisterSelf(); +} diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp new file mode 100644 index 00000000000..04b671ec11c --- /dev/null +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp @@ -0,0 +1,340 @@ +/* + * Copyright (C) 2010 Trinity + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + + +/* ScriptData +SDName: Instance Trial of the Champion +SDComment: +SDCategory: Trial Of the Champion +EndScriptData */ + +#include "ScriptedPch.h" +#include "trial_of_the_champion.h" + +#define MAX_ENCOUNTER 4 + +struct instance_trial_of_the_champion : public ScriptedInstance +{ + instance_trial_of_the_champion(Map* pMap) : ScriptedInstance(pMap) {Initialize();} + + uint32 m_auiEncounter[MAX_ENCOUNTER]; + + uint8 uiMovementDone; + uint8 uiGrandChampionsDeaths; + uint8 uiArgentSoldierDeaths; + + uint64 uiAnnouncerGUID; + uint64 uiMainGateGUID; + uint64 uiGrandChampionVehicle1GUID; + uint64 uiGrandChampionVehicle2GUID; + uint64 uiGrandChampionVehicle3GUID; + uint64 uiGrandChampion1GUID; + uint64 uiGrandChampion2GUID; + uint64 uiGrandChampion3GUID; + uint64 uiChampionLootGUID; + uint64 uiArgentChampionGUID; + + std::list VehicleList; + + std::string str_data; + + bool bDone; + + void Initialize() + { + uiMovementDone = 0; + uiGrandChampionsDeaths = 0; + uiArgentSoldierDeaths = 0; + + uiAnnouncerGUID = 0; + uiMainGateGUID = 0; + uiGrandChampionVehicle1GUID = 0; + uiGrandChampionVehicle2GUID = 0; + uiGrandChampionVehicle3GUID = 0; + uiGrandChampion1GUID = 0; + uiGrandChampion2GUID = 0; + uiGrandChampion3GUID = 0; + uiChampionLootGUID = 0; + uiArgentChampionGUID = 0; + + bDone = false; + + VehicleList.clear(); + + memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); + } + + bool IsEncounterInProgress() const + { + for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) + { + if (m_auiEncounter[i] == IN_PROGRESS) + return true; + } + + return false; + } + + void OnCreatureCreate(Creature* pCreature, bool /*bAdd*/) + { + Map::PlayerList const &players = instance->GetPlayers(); + uint32 TeamInInstance = 0; + + if (!players.isEmpty()) + { + if (Player* pPlayer = players.begin()->getSource()) + TeamInInstance = pPlayer->GetTeam(); + } + + switch(pCreature->GetEntry()) + { + // Champions + case VEHICLE_MOKRA_SKILLCRUSHER_MOUNT: + if (TeamInInstance == HORDE) + pCreature->UpdateEntry(VEHICLE_MARSHAL_JACOB_ALERIUS_MOUNT, ALLIANCE); + break; + case VEHICLE_ERESSEA_DAWNSINGER_MOUNT: + if (TeamInInstance == HORDE) + pCreature->UpdateEntry(VEHICLE_AMBROSE_BOLTSPARK_MOUNT, ALLIANCE); + break; + case VEHICLE_RUNOK_WILDMANE_MOUNT: + if (TeamInInstance == HORDE) + pCreature->UpdateEntry(VEHICLE_COLOSOS_MOUNT, ALLIANCE); + break; + case VEHICLE_ZUL_TORE_MOUNT: + if (TeamInInstance == HORDE) + pCreature->UpdateEntry(VEHICLE_EVENSONG_MOUNT, ALLIANCE); + break; + case VEHICLE_DEATHSTALKER_VESCERI_MOUNT: + if (TeamInInstance == HORDE) + pCreature->UpdateEntry(VEHICLE_LANA_STOUTHAMMER_MOUNT, ALLIANCE); + break; + // Coliseum Announcer || Just NPC_JAEREN must be spawned. + case NPC_JAEREN: + uiAnnouncerGUID = pCreature->GetGUID(); + if (TeamInInstance == ALLIANCE) + pCreature->UpdateEntry(NPC_ARELAS,ALLIANCE); + break; + case VEHICLE_ARGENT_WARHORSE: + case VEHICLE_ARGENT_BATTLEWORG: + VehicleList.push_back(pCreature->GetGUID()); + break; + case NPC_EADRIC: + case NPC_PALETRESS: + uiArgentChampionGUID = pCreature->GetGUID(); + break; + } + } + + void OnGameObjectCreate(GameObject* pGO, bool /*bAdd*/) + { + switch(pGO->GetEntry()) + { + case GO_MAIN_GATE: + uiMainGateGUID = pGO->GetGUID(); + break; + case GO_CHAMPIONS_LOOT: + case GO_CHAMPIONS_LOOT_H: + uiChampionLootGUID = pGO->GetGUID(); + break; + } + } + + void SetData(uint32 uiType, uint32 uiData) + { + switch(uiType) + { + case DATA_MOVEMENT_DONE: + uiMovementDone = uiData; + if (uiMovementDone == 3) + { + if (Creature* pAnnouncer = instance->GetCreature(uiAnnouncerGUID)) + pAnnouncer->AI()->SetData(DATA_IN_POSITION,0); + } + break; + case BOSS_GRAND_CHAMPIONS: + m_auiEncounter[0] = uiData; + if (uiData == IN_PROGRESS) + { + for (std::list::const_iterator itr = VehicleList.begin(); itr != VehicleList.end(); ++itr) + if (Creature* pSummon = instance->GetCreature(*itr)) + pSummon->RemoveFromWorld(); + }else if (uiData == DONE) + { + ++uiGrandChampionsDeaths; + if (uiGrandChampionsDeaths == 3) + { + if (Creature* pAnnouncer = instance->GetCreature(uiAnnouncerGUID)) + { + pAnnouncer->GetMotionMaster()->MovePoint(0,748.309,619.487,411.171); + pAnnouncer->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); + pAnnouncer->SummonGameObject(instance->IsHeroic()? GO_CHAMPIONS_LOOT_H : GO_CHAMPIONS_LOOT,746.59,618.49,411.09,1.42,0, 0, 0, 0,90000000); + } + } + } + break; + case DATA_ARGENT_SOLDIER_DEFEATED: + uiArgentSoldierDeaths = uiData; + if (uiArgentSoldierDeaths == 9) + { + if (Creature* pBoss = instance->GetCreature(uiArgentChampionGUID)) + { + pBoss->GetMotionMaster()->MovePoint(0,746.88,618.74,411.06); + pBoss->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE); + pBoss->SetReactState(REACT_AGGRESSIVE); + } + } + break; + case BOSS_ARGENT_CHALLENGE_E: + m_auiEncounter[1] = uiData; + if (Creature* pAnnouncer = instance->GetCreature(uiAnnouncerGUID)) + { + pAnnouncer->GetMotionMaster()->MovePoint(0,748.309,619.487,411.171); + pAnnouncer->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); + pAnnouncer->SummonGameObject(instance->IsHeroic()? GO_EADRIC_LOOT_H : GO_EADRIC_LOOT,746.59,618.49,411.09,1.42,0, 0, 0, 0,90000000); + } + break; + case BOSS_ARGENT_CHALLENGE_P: + m_auiEncounter[2] = uiData; + if (Creature* pAnnouncer = instance->GetCreature(uiAnnouncerGUID)) + { + pAnnouncer->GetMotionMaster()->MovePoint(0,748.309,619.487,411.171); + pAnnouncer->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); + pAnnouncer->SummonGameObject(instance->IsHeroic()? GO_PALETRESS_LOOT_H : GO_PALETRESS_LOOT,746.59,618.49,411.09,1.42,0, 0, 0, 0,90000000); + } + break; + } + + if (uiData == DONE) + SaveToDB(); + } + + uint32 GetData(uint32 uiData) + { + switch(uiData) + { + case BOSS_GRAND_CHAMPIONS: return m_auiEncounter[0]; + case BOSS_ARGENT_CHALLENGE_E: return m_auiEncounter[1]; + case BOSS_ARGENT_CHALLENGE_P: return m_auiEncounter[2]; + case BOSS_BLACK_KNIGHT: return m_auiEncounter[3]; + + case DATA_MOVEMENT_DONE: return uiMovementDone; + case DATA_ARGENT_SOLDIER_DEFEATED: return uiArgentSoldierDeaths; + } + + return 0; + } + + uint64 GetData64(uint32 uiData) + { + switch(uiData) + { + case DATA_ANNOUNCER: return uiAnnouncerGUID; + case DATA_MAIN_GATE: return uiMainGateGUID; + + case DATA_GRAND_CHAMPION_1: return uiGrandChampion1GUID; + case DATA_GRAND_CHAMPION_2: return uiGrandChampion2GUID; + case DATA_GRAND_CHAMPION_3: return uiGrandChampion3GUID; + } + + return 0; + } + + void SetData64(uint32 uiType, uint64 uiData) + { + switch(uiType) + { + case DATA_GRAND_CHAMPION_1: + uiGrandChampion1GUID = uiData; + break; + case DATA_GRAND_CHAMPION_2: + uiGrandChampion2GUID = uiData; + break; + case DATA_GRAND_CHAMPION_3: + uiGrandChampion3GUID = uiData; + break; + } + } + + std::string GetSaveData() + { + OUT_SAVE_INST_DATA; + + std::ostringstream saveStream; + + saveStream << "T C " << m_auiEncounter[0] + << " " << m_auiEncounter[1] + << " " << m_auiEncounter[2] + << " " << m_auiEncounter[3] + << " " << uiGrandChampionsDeaths + << " " << uiMovementDone; + + str_data = saveStream.str(); + + OUT_SAVE_INST_DATA_COMPLETE; + return str_data; + } + + void Load(const char* in) + { + if (!in) + { + OUT_LOAD_INST_DATA_FAIL; + return; + } + + OUT_LOAD_INST_DATA(in); + + char dataHead1, dataHead2; + uint16 data0, data1, data2, data3, data4, data5; + + std::istringstream loadStream(in); + loadStream >> dataHead1 >> dataHead2 >> data0 >> data1 >> data2 >> data3 >> data4 >> data5; + + if (dataHead1 == 'T' && dataHead2 == 'C') + { + m_auiEncounter[0] = data0; + m_auiEncounter[1] = data1; + m_auiEncounter[2] = data2; + m_auiEncounter[3] = data3; + + for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) + if (m_auiEncounter[i] == IN_PROGRESS) + m_auiEncounter[i] = NOT_STARTED; + + uiGrandChampionsDeaths = data4; + uiMovementDone = data5; + } else OUT_LOAD_INST_DATA_FAIL; + + OUT_LOAD_INST_DATA_COMPLETE; + } +}; + +InstanceData* GetInstanceData_instance_trial_of_the_champion(Map* pMap) +{ + return new instance_trial_of_the_champion(pMap); +} + +void AddSC_instance_trial_of_the_champion() +{ + Script *newscript; + newscript = new Script; + newscript->Name = "instance_trial_of_the_champion"; + newscript->GetInstanceData = &GetInstanceData_instance_trial_of_the_champion; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp new file mode 100644 index 00000000000..090b64b96cc --- /dev/null +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp @@ -0,0 +1,512 @@ +/* + * Copyright (C) 2010 Trinity + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Trial Of the Champion +SD%Complete: +SDComment: +SDCategory: trial_of_the_champion +EndScriptData */ + +/* ContentData +npc_announcer_toc5 +EndContentData */ + +#include "ScriptedPch.h" +#include "trial_of_the_champion.h" +#include "Vehicle.h" + +#define GOSSIP_START_EVENT1 "I'm ready to start challenge." +#define GOSSIP_START_EVENT2 "I'm ready for the next challenge." + +#define ORIENTATION 4.714 + +/*###### +## npc_announcer_toc5 +######*/ + +const Position SpawnPosition = {746.261,657.401,411.681,4.65}; + +struct npc_announcer_toc5AI : public ScriptedAI +{ + npc_announcer_toc5AI(Creature* pCreature) : ScriptedAI(pCreature) + { + pInstance = pCreature->GetInstanceData(); + + uiSummonTimes = 0; + uiPosition = 0; + uiLesserChampions = 0; + + uiFirstBoss = 0; + uiSecondBoss = 0; + uiThirdBoss = 0; + + uiArgentChampion = 0; + + uiPhase = 0; + uiTimer = 0; + + uiVehicle1GUID = 0; + uiVehicle2GUID = 0; + uiVehicle3GUID = 0; + + Champion1List.clear(); + Champion2List.clear(); + Champion3List.clear(); + + me->SetReactState(REACT_PASSIVE); + me->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE); + me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); + + SetGrandChampionsForEncounter(); + SetArgentChampion(); + } + + ScriptedInstance* pInstance; + + uint8 uiSummonTimes; + uint8 uiPosition; + uint8 uiLesserChampions; + + uint32 uiArgentChampion; + + uint32 uiFirstBoss; + uint32 uiSecondBoss; + uint32 uiThirdBoss; + + uint32 uiPhase; + uint32 uiTimer; + + uint64 uiVehicle1GUID; + uint64 uiVehicle2GUID; + uint64 uiVehicle3GUID; + + uint64 uiGrandChampionBoss1; + + std::list Champion1List; + std::list Champion2List; + std::list Champion3List; + + void NextStep(uint32 uiTimerStep,bool bNextStep = true,uint8 uiPhaseStep = 0) + { + uiTimer = uiTimerStep; + if (bNextStep) + ++uiPhase; + else + uiPhase = uiPhaseStep; + } + + void SetData(uint32 uiType, uint32 /*uiData*/) + { + switch (uiType) + { + case DATA_START: + DoSummonGrandChampion(uiFirstBoss); + NextStep(10000,false,1); + break; + case DATA_IN_POSITION: //movement done. + me->GetMotionMaster()->MovePoint(1,735.81,661.92,412.39); + if (GameObject* pGO = GameObject::GetGameObject(*me, pInstance->GetData64(DATA_MAIN_GATE))) + pInstance->HandleGameObject(pGO->GetGUID(),false); + NextStep(10000,false,3); + break; + case DATA_LESSER_CHAMPIONS_DEFEATED: + { + ++uiLesserChampions; + std::list TempList; + if (uiLesserChampions == 3 || uiLesserChampions == 6) + { + switch(uiLesserChampions) + { + case 3: + TempList = Champion2List; + break; + case 6: + TempList = Champion3List; + break; + } + + for (std::list::const_iterator itr = TempList.begin(); itr != TempList.end(); ++itr) + if (Creature* pSummon = Unit::GetCreature(*me, *itr)) + AggroAllPlayers(pSummon); + }else if (uiLesserChampions == 9) + StartGrandChampionsAttack(); + + break; + } + } + } + + void StartGrandChampionsAttack() + { + Creature* pGrandChampion1 = Unit::GetCreature(*me, uiVehicle1GUID); + Creature* pGrandChampion2 = Unit::GetCreature(*me, uiVehicle2GUID); + Creature* pGrandChampion3 = Unit::GetCreature(*me, uiVehicle3GUID); + + if (pGrandChampion1 && pGrandChampion2 && pGrandChampion3) + { + AggroAllPlayers(pGrandChampion1); + AggroAllPlayers(pGrandChampion2); + AggroAllPlayers(pGrandChampion3); + } + } + + void MovementInform(uint32 uiType, uint32 uiPointId) + { + if (uiType != POINT_MOTION_TYPE) + return; + + if (uiPointId == 1) + { + me->SetOrientation(ORIENTATION); + me->SendMovementFlagUpdate(); + } + } + + void DoSummonGrandChampion(uint32 uiBoss) + { + ++uiSummonTimes; + uint32 VEHICLE_TO_SUMMON1 = 0; + uint32 VEHICLE_TO_SUMMON2 = 0; + switch(uiBoss) + { + case 0: + VEHICLE_TO_SUMMON1 = VEHICLE_MOKRA_SKILLCRUSHER_MOUNT; + VEHICLE_TO_SUMMON2 = VEHICLE_ORGRIMMAR_WOLF; + break; + case 1: + VEHICLE_TO_SUMMON1 = VEHICLE_ERESSEA_DAWNSINGER_MOUNT; + VEHICLE_TO_SUMMON2 = VEHICLE_SILVERMOON_HAWKSTRIDER; + break; + case 2: + VEHICLE_TO_SUMMON1 = VEHICLE_RUNOK_WILDMANE_MOUNT; + VEHICLE_TO_SUMMON2 = VEHICLE_THUNDER_BLUFF_KODO; + break; + case 3: + VEHICLE_TO_SUMMON1 = VEHICLE_ZUL_TORE_MOUNT; + VEHICLE_TO_SUMMON2 = VEHICLE_DARKSPEAR_RAPTOR; + break; + case 4: + VEHICLE_TO_SUMMON1 = VEHICLE_DEATHSTALKER_VESCERI_MOUNT; + VEHICLE_TO_SUMMON2 = VEHICLE_FORSAKE_WARHORSE; + break; + default: + return; + } + + if (Creature* pBoss = me->SummonCreature(VEHICLE_TO_SUMMON1,SpawnPosition)) + { + switch(uiSummonTimes) + { + case 1: + { + uiVehicle1GUID = pBoss->GetGUID(); + uint64 uiGrandChampionBoss1 = 0; + if (Creature* pBoss = Unit::GetCreature(*me, uiVehicle1GUID)) + if (Vehicle* pVehicle = pBoss->GetVehicleKit()) + if (Unit* pUnit = pVehicle->GetPassenger(0)) + uiGrandChampionBoss1 = pUnit->GetGUID(); + if (pInstance) + { + pInstance->SetData64(DATA_GRAND_CHAMPION_VEHICLE_1,uiVehicle1GUID); + pInstance->SetData64(DATA_GRAND_CHAMPION_1,uiGrandChampionBoss1); + } + pBoss->AI()->SetData(1,0); + break; + } + case 2: + { + uiVehicle2GUID = pBoss->GetGUID(); + uint64 uiGrandChampionBoss2 = 0; + if (Creature* pBoss = Unit::GetCreature(*me, uiVehicle2GUID)) + if (Vehicle* pVehicle = pBoss->GetVehicleKit()) + if (Unit* pUnit = pVehicle->GetPassenger(0)) + uiGrandChampionBoss2 = pUnit->GetGUID(); + if (pInstance) + { + pInstance->SetData64(DATA_GRAND_CHAMPION_VEHICLE_2,uiVehicle2GUID); + pInstance->SetData64(DATA_GRAND_CHAMPION_2,uiGrandChampionBoss2); + } + pBoss->AI()->SetData(2,0); + break; + } + case 3: + { + uiVehicle3GUID = pBoss->GetGUID(); + uint64 uiGrandChampionBoss3 = 0; + if (Creature* pBoss = Unit::GetCreature(*me, uiVehicle3GUID)) + if (Vehicle* pVehicle = pBoss->GetVehicleKit()) + if (Unit* pUnit = pVehicle->GetPassenger(0)) + uiGrandChampionBoss3 = pUnit->GetGUID(); + if (pInstance) + { + pInstance->SetData64(DATA_GRAND_CHAMPION_VEHICLE_3,uiVehicle3GUID); + pInstance->SetData64(DATA_GRAND_CHAMPION_3,uiGrandChampionBoss3); + } + pBoss->AI()->SetData(3,0); + break; + } + default: + return; + } + + for (uint8 i = 0; i < 3; ++i) + { + if (Creature* pAdd = me->SummonCreature(VEHICLE_TO_SUMMON2,SpawnPosition,TEMPSUMMON_CORPSE_DESPAWN)) + { + switch(uiSummonTimes) + { + case 1: + Champion1List.push_back(pAdd->GetGUID()); + break; + case 2: + Champion2List.push_back(pAdd->GetGUID()); + break; + case 3: + Champion3List.push_back(pAdd->GetGUID()); + break; + } + + switch(i) + { + case 0: + pAdd->GetMotionMaster()->MoveFollow(pBoss,2.0f,M_PI); + break; + case 1: + pAdd->GetMotionMaster()->MoveFollow(pBoss,2.0f,M_PI / 2); + break; + case 2: + pAdd->GetMotionMaster()->MoveFollow(pBoss,2.0f,M_PI / 2 + M_PI); + break; + } + } + + } + } + } + + void DoStartArgentChampionEncounter() + { + me->GetMotionMaster()->MovePoint(1,735.81,661.92,412.39); + + if (Creature* pBoss = me->SummonCreature(uiArgentChampion,SpawnPosition)) + { + for (uint8 i = 0; i < 3; ++i) + { + if (Creature* pTrash = me->SummonCreature(NPC_ARGENT_LIGHWIELDER,SpawnPosition)) + pTrash->AI()->SetData(i,0); + if (Creature* pTrash = me->SummonCreature(NPC_ARGENT_MONK,SpawnPosition)) + pTrash->AI()->SetData(i,0); + if (Creature* pTrash = me->SummonCreature(NPC_PRIESTESS,SpawnPosition)) + pTrash->AI()->SetData(i,0); + } + } + } + + void SetGrandChampionsForEncounter() + { + uiFirstBoss = urand(0,4); + + while (uiSecondBoss == uiFirstBoss || uiThirdBoss == uiFirstBoss || uiThirdBoss == uiSecondBoss) + { + uiSecondBoss = urand(0,4); + uiThirdBoss = urand(0,4); + } + } + + void SetArgentChampion() + { + uint8 uiTempBoss = urand(0,1); + + switch(uiTempBoss) + { + case 0: + uiArgentChampion = NPC_EADRIC; + break; + case 1: + uiArgentChampion = NPC_PALETRESS; + break; + } + } + + void StartEncounter() + { + if (!pInstance) + return; + + me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); + + if (pInstance->GetData(BOSS_BLACK_KNIGHT) == NOT_STARTED) + { + if (pInstance->GetData(BOSS_ARGENT_CHALLENGE_E) == NOT_STARTED && pInstance->GetData(BOSS_ARGENT_CHALLENGE_P) == NOT_STARTED) + { + if (pInstance->GetData(BOSS_GRAND_CHAMPIONS) == NOT_STARTED) + me->AI()->SetData(DATA_START,0); + + if (pInstance->GetData(BOSS_GRAND_CHAMPIONS) == DONE) + DoStartArgentChampionEncounter(); + } + + if (pInstance->GetData(BOSS_GRAND_CHAMPIONS) == DONE && + pInstance->GetData(BOSS_ARGENT_CHALLENGE_E) == DONE || + pInstance->GetData(BOSS_ARGENT_CHALLENGE_P) == DONE) + me->SummonCreature(VEHICLE_BLACK_KNIGHT,769.834,651.915,447.035,0); + } + } + + void AggroAllPlayers(Creature* pTemp) + { + Map::PlayerList const &PlList = me->GetMap()->GetPlayers(); + + if (PlList.isEmpty()) + return; + + for (Map::PlayerList::const_iterator i = PlList.begin(); i != PlList.end(); ++i) + { + if (Player* pPlayer = i->getSource()) + { + if (pPlayer->isGameMaster()) + continue; + + if (pPlayer->isAlive()) + { + pTemp->SetHomePosition(me->GetPositionX(),me->GetPositionY(),me->GetPositionZ(),me->GetOrientation()); + pTemp->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE); + pTemp->SetReactState(REACT_AGGRESSIVE); + pTemp->SetInCombatWith(pPlayer); + pPlayer->SetInCombatWith(pTemp); + pTemp->AddThreat(pPlayer, 0.0f); + } + } + } + } + + + void UpdateAI(const uint32 uiDiff) + { + ScriptedAI::UpdateAI(uiDiff); + + if (uiTimer <= uiDiff) + { + switch(uiPhase) + { + case 1: + DoSummonGrandChampion(uiSecondBoss); + NextStep(10000,true); + break; + case 2: + DoSummonGrandChampion(uiThirdBoss); + NextStep(0,false); + break; + case 3: + if (!Champion1List.empty()) + { + for (std::list::const_iterator itr = Champion1List.begin(); itr != Champion1List.end(); ++itr) + if (Creature* pSummon = Unit::GetCreature(*me, *itr)) + AggroAllPlayers(pSummon); + NextStep(0,false); + } + break; + } + } else uiTimer -= uiDiff; + + if (!UpdateVictim()) + return; + } + + void JustSummoned(Creature* pSummon) + { + if (pInstance && pInstance->GetData(BOSS_GRAND_CHAMPIONS) == NOT_STARTED) + { + pSummon->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE); + pSummon->SetReactState(REACT_PASSIVE); + } + } + + void SummonedCreatureDespawn(Creature* pSummon) + { + switch(pSummon->GetEntry()) + { + case VEHICLE_DARNASSIA_NIGHTSABER: + case VEHICLE_EXODAR_ELEKK: + case VEHICLE_STORMWIND_STEED: + case VEHICLE_GNOMEREGAN_MECHANOSTRIDER: + case VEHICLE_IRONFORGE_RAM: + case VEHICLE_FORSAKE_WARHORSE: + case VEHICLE_THUNDER_BLUFF_KODO: + case VEHICLE_ORGRIMMAR_WOLF: + case VEHICLE_SILVERMOON_HAWKSTRIDER: + case VEHICLE_DARKSPEAR_RAPTOR: + me->AI()->SetData(DATA_LESSER_CHAMPIONS_DEFEATED,0); + break; + } + } +}; + +CreatureAI* GetAI_npc_announcer_toc5(Creature* pCreature) +{ + return new npc_announcer_toc5AI(pCreature); +} + +bool GossipHello_npc_announcer_toc5(Player* pPlayer, Creature* pCreature) +{ + ScriptedInstance* pInstance = pCreature->GetInstanceData(); + + if (pInstance && + pInstance->GetData(BOSS_GRAND_CHAMPIONS) == DONE && + pInstance->GetData(BOSS_BLACK_KNIGHT) == DONE && + pInstance->GetData(BOSS_ARGENT_CHALLENGE_E) == DONE || + pInstance->GetData(BOSS_ARGENT_CHALLENGE_P) == DONE) + return false; + + if (pInstance && + pInstance->GetData(BOSS_GRAND_CHAMPIONS) == NOT_STARTED && + pInstance->GetData(BOSS_ARGENT_CHALLENGE_E) == NOT_STARTED && + pInstance->GetData(BOSS_ARGENT_CHALLENGE_P) == NOT_STARTED && + pInstance->GetData(BOSS_BLACK_KNIGHT) == NOT_STARTED) + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); + else if (pInstance) + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); + + pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); + + return true; +} + +bool GossipSelect_npc_announcer_toc5(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) +{ + if (uiAction == GOSSIP_ACTION_INFO_DEF+1) + { + pPlayer->CLOSE_GOSSIP_MENU(); + CAST_AI(npc_announcer_toc5AI, pCreature->AI())->StartEncounter(); + } + + return true; +} + +void AddSC_trial_of_the_champion() +{ + Script* NewScript; + + NewScript = new Script; + NewScript->Name = "npc_announcer_toc5"; + NewScript->GetAI = &GetAI_npc_announcer_toc5; + NewScript->pGossipHello = &GossipHello_npc_announcer_toc5; + NewScript->pGossipSelect = &GossipSelect_npc_announcer_toc5; + NewScript->RegisterSelf(); +} diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h new file mode 100644 index 00000000000..221c7c0412f --- /dev/null +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h @@ -0,0 +1,115 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 +* This program is free software licensed under GPL version 2 +* Please see the included DOCS/LICENSE.TXT for more information */ + +#ifndef DEF_TOC_H +#define DEF_TOC_H + + +enum eData +{ + BOSS_GRAND_CHAMPIONS, + BOSS_ARGENT_CHALLENGE_E, + BOSS_ARGENT_CHALLENGE_P, + BOSS_BLACK_KNIGHT, + DATA_MOVEMENT_DONE, + DATA_LESSER_CHAMPIONS_DEFEATED, + DATA_START, + DATA_IN_POSITION, + DATA_ARGENT_SOLDIER_DEFEATED +}; + +enum Data64 +{ + DATA_ANNOUNCER, + DATA_MAIN_GATE, + + DATA_GRAND_CHAMPION_VEHICLE_1, + DATA_GRAND_CHAMPION_VEHICLE_2, + DATA_GRAND_CHAMPION_VEHICLE_3, + + DATA_GRAND_CHAMPION_1, + DATA_GRAND_CHAMPION_2, + DATA_GRAND_CHAMPION_3 +}; + +enum eNpcs +{ + // Horde Champions + NPC_MOKRA = 35572, + NPC_ERESSEA = 35569, + NPC_RUNOK = 35571, + NPC_ZULTORE = 35570, + NPC_VISCERI = 35617, + + // Alliance Champions + NPC_JACOB = 34705, + NPC_AMBROSE = 34702, + NPC_COLOSOS = 34701, + NPC_JAELYNE = 34657, + NPC_LANA = 34703, + + NPC_EADRIC = 35119, + NPC_PALETRESS = 34928, + + NPC_ARGENT_LIGHWIELDER = 35309, + NPC_ARGENT_MONK = 35305, + NPC_PRIESTESS = 35307, + + NPC_BLACK_KNIGHT = 35451, + + NPC_RISEN_JAEREN = 35545, + NPC_RISEN_ARELAS = 35564, + + NPC_JAEREN = 35004, + NPC_ARELAS = 35005 +}; + +enum eGameObjects +{ + GO_MAIN_GATE = 195647, + + GO_CHAMPIONS_LOOT = 195709, + GO_CHAMPIONS_LOOT_H = 195710, + + GO_EADRIC_LOOT = 195374, + GO_EADRIC_LOOT_H = 195375, + + GO_PALETRESS_LOOT = 195323, + GO_PALETRESS_LOOT_H = 195324 +}; + +enum eVehicles +{ + //Grand Champions Alliance Vehicles + VEHICLE_MARSHAL_JACOB_ALERIUS_MOUNT = 35637, + VEHICLE_AMBROSE_BOLTSPARK_MOUNT = 35633, + VEHICLE_COLOSOS_MOUNT = 35768, + VEHICLE_EVENSONG_MOUNT = 34658, + VEHICLE_LANA_STOUTHAMMER_MOUNT = 35636, + //Faction Champions (ALLIANCE) + VEHICLE_DARNASSIA_NIGHTSABER = 33298, + VEHICLE_EXODAR_ELEKK = 33416, + VEHICLE_STORMWIND_STEED = 33297, + VEHICLE_GNOMEREGAN_MECHANOSTRIDER = 33301, + VEHICLE_IRONFORGE_RAM = 33408, + //Grand Champions Horde Vehicles + VEHICLE_MOKRA_SKILLCRUSHER_MOUNT = 35638, + VEHICLE_ERESSEA_DAWNSINGER_MOUNT = 35635, + VEHICLE_RUNOK_WILDMANE_MOUNT = 35640, + VEHICLE_ZUL_TORE_MOUNT = 35641, + VEHICLE_DEATHSTALKER_VESCERI_MOUNT = 35634, + //Faction Champions (HORDE) + VEHICLE_FORSAKE_WARHORSE = 33414, + VEHICLE_THUNDER_BLUFF_KODO = 33300, + VEHICLE_ORGRIMMAR_WOLF = 33409, + VEHICLE_SILVERMOON_HAWKSTRIDER = 33418, + VEHICLE_DARKSPEAR_RAPTOR = 33299, + + VEHICLE_ARGENT_WARHORSE = 35644, + VEHICLE_ARGENT_BATTLEWORG = 36558, + + VEHICLE_BLACK_KNIGHT = 35491 +}; + +#endif diff --git a/src/server/scripts/Northrend/CrusadersColiseum/trial_of_the_champion/boss_argent_challenge.cpp b/src/server/scripts/Northrend/CrusadersColiseum/trial_of_the_champion/boss_argent_challenge.cpp deleted file mode 100644 index c33ea69fa2d..00000000000 --- a/src/server/scripts/Northrend/CrusadersColiseum/trial_of_the_champion/boss_argent_challenge.cpp +++ /dev/null @@ -1,512 +0,0 @@ -/* - * Copyright (C) 2009 Trinity - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: Argent Challenge Encounter. -SD%Complete: 50 % -SDComment: AI for Argent Soldiers are not implemented. AI from bosses need more improvements. -SDCategory: Trial of the Champion -EndScriptData */ - -#include "ScriptedPch.h" -#include "trial_of_the_champion.h" -#include "ScriptedEscortAI.h" - -enum eSpells -{ - //Eadric - SPELL_EADRIC_ACHIEVEMENT = 68197, - SPELL_HAMMER_JUSTICE = 66863, - SPELL_HAMMER_RIGHTEOUS = 66867, - SPELL_RADIANCE = 66935, - SPELL_VENGEANCE = 66865, - - //Paletress - SPELL_SMITE = 66536, - SPELL_SMITE_H = 67674, - SPELL_HOLY_FIRE = 66538, - SPELL_HOLY_FIRE_H = 67676, - SPELL_RENEW = 66537, - SPELL_RENEW_H = 67675, - SPELL_HOLY_NOVA = 66546, - SPELL_SHIELD = 66515, - SPELL_CONFESS = 66680, - SPELL_SUMMON_MEMORY = 66545, - - //Memory - SPELL_OLD_WOUNDS = 66620, - SPELL_OLD_WOUNDS_H = 67679, - SPELL_SHADOWS_PAST = 66619, - SPELL_SHADOWS_PAST_H = 67678, - SPELL_WAKING_NIGHTMARE = 66552, - SPELL_WAKING_NIGHTMARE_H = 67677 -}; - -struct boss_eadricAI : public ScriptedAI -{ - boss_eadricAI(Creature* pCreature) : ScriptedAI(pCreature) - { - pInstance = pCreature->GetInstanceData(); - pCreature->SetReactState(REACT_PASSIVE); - pCreature->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE); - } - - ScriptedInstance* pInstance; - - uint32 uiVenganceTimer; - uint32 uiRadianceTimer; - uint32 uiHammerJusticeTimer; - uint32 uiResetTimer; - - bool bDone; - - void Reset() - { - uiVenganceTimer = 10000; - uiRadianceTimer = 16000; - uiHammerJusticeTimer = 25000; - uiResetTimer = 5000; - - bDone = false; - } - - void DamageTaken(Unit * /*done_by*/, uint32 &damage) - { - if (damage >= me->GetHealth()) - { - damage = 0; - EnterEvadeMode(); - me->setFaction(35); - bDone = true; - } - } - - void MovementInform(uint32 MovementType, uint32 /*Data*/) - { - if (MovementType != POINT_MOTION_TYPE) - return; - - if (pInstance) - pInstance->SetData(BOSS_ARGENT_CHALLENGE_E, DONE); - - me->DisappearAndDie(); - } - - void UpdateAI(const uint32 uiDiff) - { - if (bDone && uiResetTimer <= uiDiff) - { - me->GetMotionMaster()->MovePoint(0,746.87,665.87,411.75); - bDone = false; - } else uiResetTimer -= uiDiff; - - if (!UpdateVictim()) - return; - - if (uiHammerJusticeTimer <= uiDiff) - { - me->InterruptNonMeleeSpells(true); - - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 250, true)) - { - if (pTarget && pTarget->isAlive()) - { - DoCast(pTarget, SPELL_HAMMER_JUSTICE); - DoCast(pTarget, SPELL_HAMMER_RIGHTEOUS); - } - } - uiHammerJusticeTimer = 25000; - } else uiHammerJusticeTimer -= uiDiff; - - if (uiVenganceTimer <= uiDiff) - { - DoCast(me,SPELL_VENGEANCE); - - uiVenganceTimer = 10000; - } else uiVenganceTimer -= uiDiff; - - if (uiRadianceTimer <= uiDiff) - { - DoCastAOE(SPELL_RADIANCE); - - uiRadianceTimer = 16000; - } else uiRadianceTimer -= uiDiff; - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_boss_eadric(Creature* pCreature) -{ - return new boss_eadricAI(pCreature); -} - -struct boss_paletressAI : public ScriptedAI -{ - boss_paletressAI(Creature* pCreature) : ScriptedAI(pCreature) - { - pInstance = pCreature->GetInstanceData(); - - MemoryGUID = 0; - pCreature->SetReactState(REACT_PASSIVE); - pCreature->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE); - pCreature->RestoreFaction(); - } - - ScriptedInstance* pInstance; - - Creature* pMemory; - uint64 MemoryGUID; - - bool bHealth; - bool bDone; - - uint32 uiHolyFireTimer; - uint32 uiHolySmiteTimer; - uint32 uiRenewTimer; - uint32 uiResetTimer; - - void Reset() - { - me->RemoveAllAuras(); - - uiHolyFireTimer = urand(9000,12000); - uiHolySmiteTimer = urand(5000,7000); - uiRenewTimer = urand(2000,5000); - - uiResetTimer = 7000; - - bHealth = false; - bDone = false; - - if (Creature *pMemory = Unit::GetCreature(*me, MemoryGUID)) - if (pMemory->isAlive()) - pMemory->RemoveFromWorld(); - } - - void SetData(uint32 uiId, uint32 /*uiValue*/) - { - if (uiId == 1) - me->RemoveAura(SPELL_SHIELD); - } - - void DamageTaken(Unit * /*done_by*/, uint32 &damage) - { - if (damage >= me->GetHealth()) - { - damage = 0; - EnterEvadeMode(); - me->setFaction(35); - bDone = true; - } - } - - void MovementInform(uint32 MovementType, uint32 Point) - { - if (MovementType != POINT_MOTION_TYPE || Point != 0) - return; - - if (pInstance) - pInstance->SetData(BOSS_ARGENT_CHALLENGE_P, DONE); - - me->DisappearAndDie(); - } - - void UpdateAI(const uint32 uiDiff) - { - if (bDone && uiResetTimer <= uiDiff) - { - me->GetMotionMaster()->MovePoint(0,746.87,665.87,411.75); - bDone = false; - } else uiResetTimer -= uiDiff; - - if (!UpdateVictim()) - return; - - if (uiHolyFireTimer <= uiDiff) - { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 250, true)) - { - if (pTarget && pTarget->isAlive()) - DoCast(pTarget,SPELL_HOLY_FIRE); - } - if (me->HasAura(SPELL_SHIELD)) - uiHolyFireTimer = 13000; - else - uiHolyFireTimer = urand(9000,12000); - } else uiHolyFireTimer -= uiDiff; - - if (uiHolySmiteTimer <= uiDiff) - { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 250, true)) - { - if (pTarget && pTarget->isAlive()) - DoCast(pTarget,SPELL_SMITE); - } - if (me->HasAura(SPELL_SHIELD)) - uiHolySmiteTimer = 9000; - else - uiHolySmiteTimer = urand(5000,7000); - } else uiHolySmiteTimer -= uiDiff; - - if (me->HasAura(SPELL_SHIELD)) - if (uiRenewTimer <= uiDiff) - { - me->InterruptNonMeleeSpells(true); - uint8 uiTarget = urand(0,1); - switch(uiTarget) - { - case 0: - DoCast(me,SPELL_RENEW); - break; - case 1: - if (Creature *pMemory = Unit::GetCreature(*me, MemoryGUID)) - if (pMemory->isAlive()) - DoCast(pMemory, SPELL_RENEW); - break; - } - uiRenewTimer = urand(15000,17000); - } else uiRenewTimer -= uiDiff; - - - if (!bHealth && me->GetHealth()*100 / me->GetMaxHealth() <= 25) - { - me->InterruptNonMeleeSpells(true); - DoCastAOE(SPELL_HOLY_NOVA,false); - DoCast(me, SPELL_SHIELD); - DoCastAOE(SPELL_SUMMON_MEMORY,false); - DoCastAOE(SPELL_CONFESS,false); - - bHealth = true; - } - - DoMeleeAttackIfReady(); - } - - void JustSummoned(Creature* pSummon) - { - MemoryGUID = pSummon->GetGUID(); - } -}; - -CreatureAI* GetAI_boss_paletress(Creature* pCreature) -{ - return new boss_paletressAI(pCreature); -} - -struct npc_memoryAI : public ScriptedAI -{ - npc_memoryAI(Creature* pCreature) : ScriptedAI(pCreature) {} - - uint32 uiOldWoundsTimer; - uint32 uiShadowPastTimer; - uint32 uiWakingNightmare; - - void Reset() - { - uiOldWoundsTimer = 12000; - uiShadowPastTimer = 5000; - uiWakingNightmare = 7000; - } - - void UpdateAI(const uint32 uiDiff) - { - if (!UpdateVictim()) - return; - - if (uiOldWoundsTimer <= uiDiff) - { - if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - { - if (pTarget && pTarget->isAlive()) - DoCast(pTarget, SPELL_OLD_WOUNDS); - } - uiOldWoundsTimer = 12000; - }else uiOldWoundsTimer -= uiDiff; - - if (uiWakingNightmare <= uiDiff) - { - DoCast(me, SPELL_WAKING_NIGHTMARE); - uiWakingNightmare = 7000; - }else uiWakingNightmare -= uiDiff; - - if (uiShadowPastTimer <= uiDiff) - { - if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM,1)) - { - if (pTarget && pTarget->isAlive()) - DoCast(pTarget,SPELL_SHADOWS_PAST); - } - uiShadowPastTimer = 5000; - }else uiShadowPastTimer -= uiDiff; - - DoMeleeAttackIfReady(); - } - - void JustDied(Unit* /*pKiller*/) - { - if (me->isSummon()) - { - if (Unit* pSummoner = CAST_SUM(me)->GetSummoner()) - { - if (pSummoner && pSummoner->isAlive()) - CAST_CRE(pSummoner)->AI()->SetData(1,0); - } - } - } -}; - -CreatureAI* GetAI_npc_memory(Creature* pCreature) -{ - return new npc_memoryAI(pCreature); -} - -// THIS AI NEEDS MORE IMPROVEMENTS -struct npc_argent_soldierAI : public npc_escortAI -{ - npc_argent_soldierAI(Creature* pCreature) : npc_escortAI(pCreature) - { - pInstance = pCreature->GetInstanceData(); - me->SetReactState(REACT_DEFENSIVE); - SetDespawnAtEnd(false); - uiWaypoint = 0; - } - - ScriptedInstance* pInstance; - - uint8 uiWaypoint; - - void WaypointReached(uint32 uiPoint) - { - if (uiPoint == 0) - { - switch(uiWaypoint) - { - case 0: - me->SetOrientation(5.81); - break; - case 1: - me->SetOrientation(4.60); - break; - case 2: - me->SetOrientation(2.79); - break; - } - - me->SendMovementFlagUpdate(); - } - } - - void SetData(uint32 uiType, uint32 /*uiData*/) - { - switch(me->GetEntry()) - { - case NPC_ARGENT_LIGHWIELDER: - switch(uiType) - { - case 0: - AddWaypoint(0,712.14,628.42,411.88); - break; - case 1: - AddWaypoint(0,742.44,650.29,411.79); - break; - case 2: - AddWaypoint(0,783.33,615.29,411.84); - break; - } - break; - case NPC_ARGENT_MONK: - switch(uiType) - { - case 0: - AddWaypoint(0,713.12,632.97,411.90); - break; - case 1: - AddWaypoint(0,746.73,650.24,411.56); - break; - case 2: - AddWaypoint(0,781.32,610.54,411.82); - break; - } - break; - case NPC_PRIESTESS: - switch(uiType) - { - case 0: - AddWaypoint(0,715.06,637.07,411.91); - break; - case 1: - AddWaypoint(0,750.72,650.20,411.77); - break; - case 2: - AddWaypoint(0,779.77,607.03,411.81); - break; - } - break; - } - - Start(false,true,0); - uiWaypoint = uiType; - } - - void UpdateAI(const uint32 uiDiff) - { - npc_escortAI::UpdateAI(uiDiff); - - if (!UpdateVictim()) - return; - - DoMeleeAttackIfReady(); - } - - void JustDied(Unit* /*pKiller*/) - { - if (pInstance) - pInstance->SetData(DATA_ARGENT_SOLDIER_DEFEATED,pInstance->GetData(DATA_ARGENT_SOLDIER_DEFEATED) + 1); - } -}; - -CreatureAI* GetAI_npc_argent_soldier(Creature* pCreature) -{ - return new npc_argent_soldierAI(pCreature); -} - -void AddSC_boss_argent_challenge() -{ - Script* NewScript; - - NewScript = new Script; - NewScript->Name = "boss_eadric"; - NewScript->GetAI = &GetAI_boss_eadric; - NewScript->RegisterSelf(); - - NewScript = new Script; - NewScript->Name = "boss_paletress"; - NewScript->GetAI = &GetAI_boss_paletress; - NewScript->RegisterSelf(); - - NewScript = new Script; - NewScript->Name = "npc_memory"; - NewScript->GetAI = &GetAI_npc_memory; - NewScript->RegisterSelf(); - - NewScript = new Script; - NewScript->Name = "npc_argent_soldier"; - NewScript->GetAI = &GetAI_npc_argent_soldier; - NewScript->RegisterSelf(); -} diff --git a/src/server/scripts/Northrend/CrusadersColiseum/trial_of_the_champion/boss_black_knight.cpp b/src/server/scripts/Northrend/CrusadersColiseum/trial_of_the_champion/boss_black_knight.cpp deleted file mode 100644 index e1f4586ca6c..00000000000 --- a/src/server/scripts/Northrend/CrusadersColiseum/trial_of_the_champion/boss_black_knight.cpp +++ /dev/null @@ -1,373 +0,0 @@ -/* - * Copyright (C) 2010 Trinity - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: Boss Black Knight -SD%Complete: 80% -SDComment: missing yells. not sure about timers. -SDCategory: Trial of the Champion -EndScriptData */ - -#include "ScriptedPch.h" -#include "ScriptedEscortAI.h" -#include "trial_of_the_champion.h" - -enum eSpells -{ - //phase 1 - SPELL_PLAGUE_STRIKE = 67884, - SPELL_PLAGUE_STRIKE_2 = 67724, - SPELL_ICY_TOUCH_H = 67881, - SPELL_ICY_TOUCH = 67718, - SPELL_DEATH_RESPITE = 67745, - SPELL_DEATH_RESPITE_2 = 68306, - SPELL_DEATH_RESPITE_3 = 66798, - SPELL_OBLITERATE_H = 67883, - SPELL_OBLITERATE = 67725, - //in this phase should rise herald (the spell is missing) - - //phase 2 - During this phase, the Black Knight will use the same abilities as in phase 1, except for Death's Respite - SPELL_ARMY_DEAD = 67761, - SPELL_DESECRATION = 67778, - SPELL_DESECRATION_2 = 67778, - SPELL_GHOUL_EXPLODE = 67751, - - //phase 3 - SPELL_DEATH_BITE_H = 67875, - SPELL_DEATH_BITE = 67808, - SPELL_MARKED_DEATH = 67882, - SPELL_MARKED_DEATH_2 = 67823, - - SPELL_BLACK_KNIGHT_RES = 67693, - - SPELL_LEAP = 67749, - SPELL_LEAP_H = 67880 -}; - -enum eModels -{ - MODEL_SKELETON = 29846, - MODEL_GHOST = 21300 -}; - -enum ePhases -{ - PHASE_UNDEAD = 1, - PHASE_SKELETON = 2, - PHASE_GHOST = 3 -}; - -struct boss_black_knightAI : public ScriptedAI -{ - boss_black_knightAI(Creature* pCreature) : ScriptedAI(pCreature) - { - pInstance = pCreature->GetInstanceData(); - } - - ScriptedInstance* pInstance; - - std::list SummonList; - - bool bEventInProgress; - bool bEvent; - bool bSummonArmy; - bool bDeathArmyDone; - - uint8 uiPhase; - - uint32 uiPlagueStrikeTimer; - uint32 uiIcyTouchTimer; - uint32 uiDeathRespiteTimer; - uint32 uiObliterateTimer; - uint32 uiDesecration; - uint32 uiResurrectTimer; - uint32 uiDeathArmyCheckTimer; - uint32 uiGhoulExplodeTimer; - uint32 uiDeathBiteTimer; - uint32 uiMarkedDeathTimer; - - void Reset() - { - RemoveSummons(); - me->SetDisplayId(me->GetNativeDisplayId()); - me->clearUnitState(UNIT_STAT_ROOT | UNIT_STAT_STUNNED); - - bEventInProgress = false; - bEvent = false; - bSummonArmy = false; - bDeathArmyDone = false; - - uiPhase = PHASE_UNDEAD; - - uiIcyTouchTimer = urand(5000,9000); - uiPlagueStrikeTimer = urand(10000,13000); - uiDeathRespiteTimer = urand(15000,16000); - uiObliterateTimer = urand(17000,19000); - uiDesecration = urand(15000,16000); - uiDeathArmyCheckTimer = 7000; - uiResurrectTimer = 4000; - uiGhoulExplodeTimer = 8000; - uiDeathBiteTimer = urand (2000,4000); - uiMarkedDeathTimer = urand (5000,7000); - } - - void RemoveSummons() - { - if (SummonList.empty()) - return; - - for (std::list::const_iterator itr = SummonList.begin(); itr != SummonList.end(); ++itr) - { - if (Creature* pTemp = Unit::GetCreature(*me, *itr)) - if (pTemp) - pTemp->DisappearAndDie(); - } - SummonList.clear(); - } - - void JustSummoned(Creature* pSummon) - { - SummonList.push_back(pSummon->GetGUID()); - pSummon->AI()->AttackStart(me->getVictim()); - } - - void UpdateAI(const uint32 uiDiff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - if (bEventInProgress) - if (uiResurrectTimer <= uiDiff) - { - me->SetHealth(me->GetMaxHealth()); - DoCast(me,SPELL_BLACK_KNIGHT_RES,true); - uiPhase++; - uiResurrectTimer = 4000; - bEventInProgress = false; - me->clearUnitState(UNIT_STAT_ROOT | UNIT_STAT_STUNNED); - } else uiResurrectTimer -= uiDiff; - - switch(uiPhase) - { - case PHASE_UNDEAD: - case PHASE_SKELETON: - { - if (uiIcyTouchTimer <= uiDiff) - { - DoCastVictim(SPELL_ICY_TOUCH); - uiIcyTouchTimer = urand(5000,7000); - } else uiIcyTouchTimer -= uiDiff; - if (uiPlagueStrikeTimer <= uiDiff) - { - DoCastVictim(SPELL_ICY_TOUCH); - uiPlagueStrikeTimer = urand(12000,15000); - } else uiPlagueStrikeTimer -= uiDiff; - if (uiObliterateTimer <= uiDiff) - { - DoCastVictim(SPELL_OBLITERATE); - uiObliterateTimer = urand(17000,19000); - } else uiObliterateTimer -= uiDiff; - switch(uiPhase) - { - case PHASE_UNDEAD: - { - if (uiDeathRespiteTimer <= uiDiff) - { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - { - if (pTarget && pTarget->isAlive()) - DoCast(pTarget,SPELL_DEATH_RESPITE); - } - uiDeathRespiteTimer = urand(15000,16000); - } else uiDeathRespiteTimer -= uiDiff; - break; - } - case PHASE_SKELETON: - { - if (!bSummonArmy) - { - bSummonArmy = true; - me->addUnitState(UNIT_STAT_ROOT | UNIT_STAT_STUNNED); - DoCast(me, SPELL_ARMY_DEAD); - } - if (!bDeathArmyDone) - if (uiDeathArmyCheckTimer <= uiDiff) - { - me->clearUnitState(UNIT_STAT_ROOT | UNIT_STAT_STUNNED); - uiDeathArmyCheckTimer = 0; - bDeathArmyDone = true; - } else uiDeathArmyCheckTimer -= uiDiff; - if (uiDesecration <= uiDiff) - { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - { - if (pTarget && pTarget->isAlive()) - DoCast(pTarget,SPELL_DESECRATION); - } - uiDesecration = urand(15000,16000); - } else uiDesecration -= uiDiff; - if (uiGhoulExplodeTimer <= uiDiff) - { - DoCast(me, SPELL_GHOUL_EXPLODE); - uiGhoulExplodeTimer = 8000; - } else uiGhoulExplodeTimer -= uiDiff; - break; - } - break; - } - break; - } - case PHASE_GHOST: - { - if (uiDeathBiteTimer <= uiDiff) - { - DoCastAOE(SPELL_DEATH_BITE); - uiDeathBiteTimer = urand (2000, 4000); - } else uiDeathBiteTimer -= uiDiff; - if (uiMarkedDeathTimer <= uiDiff) - { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - { - if (pTarget && pTarget->isAlive()) - DoCast(pTarget,SPELL_MARKED_DEATH); - } - uiMarkedDeathTimer = urand (5000, 7000); - } else uiMarkedDeathTimer -= uiDiff; - break; - } - } - - if (!me->hasUnitState(UNIT_STAT_ROOT) && !me->GetHealth()*100 / me->GetMaxHealth() <= 0) - DoMeleeAttackIfReady(); - } - - void DamageTaken(Unit* /*pDoneBy*/, uint32& uiDamage) - { - if (uiDamage > me->GetHealth() && uiPhase <= PHASE_SKELETON) - { - uiDamage = 0; - me->SetHealth(0); - me->addUnitState(UNIT_STAT_ROOT | UNIT_STAT_STUNNED); - RemoveSummons(); - switch(uiPhase) - { - case PHASE_UNDEAD: - me->SetDisplayId(MODEL_SKELETON); - break; - case PHASE_SKELETON: - me->SetDisplayId(MODEL_GHOST); - break; - } - bEventInProgress = true; - } - } - - void JustDied(Unit* /*pKiller*/) - { - if (pInstance) - pInstance->SetData(BOSS_BLACK_KNIGHT,DONE); - } -}; - -CreatureAI* GetAI_boss_black_knight(Creature *pCreature) -{ - return new boss_black_knightAI (pCreature); -} - -struct npc_risen_ghoulAI : public ScriptedAI -{ - npc_risen_ghoulAI(Creature* pCreature) : ScriptedAI(pCreature) {} - - uint32 uiAttackTimer; - - void Reset() - { - uiAttackTimer = 3500; - } - - void UpdateAI(const uint32 uiDiff) - { - if (!UpdateVictim()) - return; - - if (uiAttackTimer <= uiDiff) - { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true)) - { - if (pTarget && pTarget->isAlive()) - DoCast(pTarget, (SPELL_LEAP)); - } - uiAttackTimer = 3500; - } else uiAttackTimer -= uiDiff; - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_npc_risen_ghoul(Creature* pCreature) -{ - return new npc_risen_ghoulAI(pCreature); -} - -struct npc_black_knight_skeletal_gryphonAI : public npc_escortAI -{ - npc_black_knight_skeletal_gryphonAI(Creature* pCreature) : npc_escortAI(pCreature) - { - Start(false,true,0,NULL); - } - - void WaypointReached(uint32 /*i*/) - { - - } - - void UpdateAI(const uint32 uiDiff) - { - npc_escortAI::UpdateAI(uiDiff); - - if (!UpdateVictim()) - return; - } - -}; - -CreatureAI* GetAI_npc_black_knight_skeletal_gryphon(Creature* pCreature) -{ - return new npc_black_knight_skeletal_gryphonAI(pCreature); -} - -void AddSC_boss_black_knight() -{ - Script* NewScript; - - NewScript = new Script; - NewScript->Name = "boss_black_knight"; - NewScript->GetAI = &GetAI_boss_black_knight; - NewScript->RegisterSelf(); - - NewScript = new Script; - NewScript->Name = "npc_risen_ghoul"; - NewScript->GetAI = &GetAI_npc_risen_ghoul; - NewScript->RegisterSelf(); - - NewScript = new Script; - NewScript->Name = "npc_black_knight_skeletal_gryphon"; - NewScript->GetAI = &GetAI_npc_black_knight_skeletal_gryphon; - NewScript->RegisterSelf(); -} diff --git a/src/server/scripts/Northrend/CrusadersColiseum/trial_of_the_champion/boss_grand_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/trial_of_the_champion/boss_grand_champions.cpp deleted file mode 100644 index 4bf8143a210..00000000000 --- a/src/server/scripts/Northrend/CrusadersColiseum/trial_of_the_champion/boss_grand_champions.cpp +++ /dev/null @@ -1,993 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 -* This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: boss_grand_champions -SD%Complete: 50 % -SDComment: Is missing the ai to make the npcs look for a new mount and use it. -SDCategory: Trial Of the Champion -EndScriptData */ - -#include "ScriptedPch.h" -#include "ScriptedEscortAI.h" -#include "Vehicle.h" -#include "trial_of_the_champion.h" - -enum eSpells -{ - //Vehicle - SPELL_CHARGE = 63010, - SPELL_SHIELD_BREAKER = 68504, - SPELL_SHIELD = 66482, - - // Marshal Jacob Alerius && Mokra the Skullcrusher || Warrior - SPELL_MORTAL_STRIKE = 68783, - SPELL_MORTAL_STRIKE_H = 68784, - SPELL_BLADESTORM = 63784, - SPELL_INTERCEPT = 67540, - SPELL_ROLLING_THROW = 47115, //not implemented in the AI yet... - - // Ambrose Boltspark && Eressea Dawnsinger || Mage - SPELL_FIREBALL = 66042, - SPELL_FIREBALL_H = 68310, - SPELL_BLAST_WAVE = 66044, - SPELL_BLAST_WAVE_H = 68312, - SPELL_HASTE = 66045, - SPELL_POLYMORPH = 66043, - SPELL_POLYMORPH_H = 68311, - - // Colosos && Runok Wildmane || Shaman - SPELL_CHAIN_LIGHTNING = 67529, - SPELL_CHAIN_LIGHTNING_H = 68319, - SPELL_EARTH_SHIELD = 67530, - SPELL_HEALING_WAVE = 67528, - SPELL_HEALING_WAVE_H = 68318, - SPELL_HEX_OF_MENDING = 67534, - - // Jaelyne Evensong && Zul'tore || Hunter - SPELL_DISENGAGE = 68340, //not implemented in the AI yet... - SPELL_LIGHTNING_ARROWS = 66083, - SPELL_MULTI_SHOT = 66081, - SPELL_SHOOT = 65868, - SPELL_SHOOT_H = 67988, - - // Lana Stouthammer Evensong && Deathstalker Visceri || Rouge - SPELL_EVISCERATE = 67709, - SPELL_EVISCERATE_H = 68317, - SPELL_FAN_OF_KNIVES = 67706, - SPELL_POISON_BOTTLE = 67701 -}; - -enum eSeat -{ - SEAT_ID_0 = 0 -}; - -struct Point -{ - float x,y,z; -}; - -const Point MovementPoint[] = -{ - {746.84,623.15,411.41}, - {747.96,620.29,411.09}, - {750.23,618.35,411.09} -}; - -void AggroAllPlayers(Creature* pTemp) -{ - Map::PlayerList const &PlList = pTemp->GetMap()->GetPlayers(); - - if (PlList.isEmpty()) - return; - - for (Map::PlayerList::const_iterator i = PlList.begin(); i != PlList.end(); ++i) - { - if (Player* pPlayer = i->getSource()) - { - if (pPlayer->isGameMaster()) - continue; - - if (pPlayer->isAlive()) - { - pTemp->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); - pTemp->SetReactState(REACT_AGGRESSIVE); - pTemp->SetInCombatWith(pPlayer); - pPlayer->SetInCombatWith(pTemp); - pTemp->AddThreat(pPlayer, 0.0f); - } - } - } -} - -bool GrandChampionsOutVehicle(Creature* me) -{ - ScriptedInstance* pInstance = me->GetInstanceData(); - - if (!pInstance) - return false; - - Creature* pGrandChampion1 = Unit::GetCreature(*me, pInstance->GetData64(DATA_GRAND_CHAMPION_1)); - Creature* pGrandChampion2 = Unit::GetCreature(*me, pInstance->GetData64(DATA_GRAND_CHAMPION_2)); - Creature* pGrandChampion3 = Unit::GetCreature(*me, pInstance->GetData64(DATA_GRAND_CHAMPION_3)); - - if (pGrandChampion1 && pGrandChampion2 && pGrandChampion3) - { - if (!pGrandChampion1->HasUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT) && - !pGrandChampion2->HasUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT) && - !pGrandChampion3->HasUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT)) - return true; - } - - return false; -} - -/* -* Generic AI for vehicles used by npcs in ToC, it needs more improvements. * -* Script Complete: 25%. * -*/ - -struct generic_vehicleAI_toc5AI : public npc_escortAI -{ - generic_vehicleAI_toc5AI(Creature* pCreature) : npc_escortAI(pCreature) - { - SetDespawnAtEnd(false); - uiWaypointPath = 0; - - pInstance = pCreature->GetInstanceData(); - } - - ScriptedInstance* pInstance; - - uint32 uiChargeTimer; - uint32 uiShieldBreakerTimer; - uint32 uiBuffTimer; - - uint32 uiWaypointPath; - - void Reset() - { - uiChargeTimer = 5000; - uiShieldBreakerTimer = 8000; - uiBuffTimer = urand(30000,60000); - } - - void SetData(uint32 uiType, uint32 /*uiData*/) - { - switch(uiType) - { - case 1: - AddWaypoint(0,747.36,634.07,411.572); - AddWaypoint(1,780.43,607.15,411.82); - AddWaypoint(2,785.99,599.41,411.92); - AddWaypoint(3,778.44,601.64,411.79); - uiWaypointPath = 1; - break; - case 2: - AddWaypoint(0,747.35,634.07,411.57); - AddWaypoint(1,768.72,581.01,411.92); - AddWaypoint(2,763.55,590.52,411.71); - uiWaypointPath = 2; - break; - case 3: - AddWaypoint(0,747.35,634.07,411.57); - AddWaypoint(1,784.02,645.33,412.39); - AddWaypoint(2,775.67,641.91,411.91); - uiWaypointPath = 3; - break; - } - - if (uiType <= 3) - Start(false,true,0,NULL); - } - - void WaypointReached(uint32 i) - { - switch(i) - { - case 2: - if (pInstance && uiWaypointPath == 3 || uiWaypointPath == 2) - pInstance->SetData(DATA_MOVEMENT_DONE, pInstance->GetData(DATA_MOVEMENT_DONE)+1); - break; - case 3: - if (pInstance) - pInstance->SetData(DATA_MOVEMENT_DONE, pInstance->GetData(DATA_MOVEMENT_DONE)+1); - break; - } - } - - void EnterCombat(Unit* /*pWho*/) - { - DoCastSpellShield(); - } - - void DoCastSpellShield() - { - for (uint8 i = 0; i < 3; ++i) - DoCast(me,SPELL_SHIELD,true); - } - - void UpdateAI(const uint32 uiDiff) - { - npc_escortAI::UpdateAI(uiDiff); - - if (!UpdateVictim()) - return; - - if (uiBuffTimer <= uiDiff) - { - if (!me->HasAura(SPELL_SHIELD)) - DoCastSpellShield(); - - uiBuffTimer = urand(30000,45000); - }else uiBuffTimer -= uiDiff; - - if (uiChargeTimer <= uiDiff) - { - Map::PlayerList const& players = me->GetMap()->GetPlayers(); - if (me->GetMap()->IsDungeon() && !players.isEmpty()) - { - for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) - { - Player* pPlayer = itr->getSource(); - if (pPlayer && !pPlayer->isGameMaster() && me->IsInRange(pPlayer,8.0f,25.0f,false)) - { - DoResetThreat(); - me->AddThreat(pPlayer,1.0f); - DoCast(pPlayer, SPELL_CHARGE); - break; - } - } - } - uiChargeTimer = 5000; - }else uiChargeTimer -= uiDiff; - - //dosen't work at all - if (uiShieldBreakerTimer <= uiDiff) - { - Vehicle *pVehicle = me->GetVehicleKit(); - if (!pVehicle) - return; - - if (Unit* pPassenger = pVehicle->GetPassenger(SEAT_ID_0)) - { - Map::PlayerList const& players = me->GetMap()->GetPlayers(); - if (me->GetMap()->IsDungeon() && !players.isEmpty()) - { - for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) - { - Player* pPlayer = itr->getSource(); - if (pPlayer && !pPlayer->isGameMaster() && me->IsInRange(pPlayer,10.0f,30.0f,false)) - { - pPassenger->CastSpell(pPlayer,SPELL_SHIELD_BREAKER,true); - break; - } - } - } - } - uiShieldBreakerTimer = 7000; - }else uiShieldBreakerTimer -= uiDiff; - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_generic_vehicleAI_toc5(Creature* pCreature) -{ - return new generic_vehicleAI_toc5AI(pCreature); -} - -// Marshal Jacob Alerius && Mokra the Skullcrusher || Warrior -struct boss_warrior_toc5AI : public ScriptedAI -{ - boss_warrior_toc5AI(Creature* pCreature) : ScriptedAI(pCreature) - { - pInstance = pCreature->GetInstanceData(); - - bDone = false; - bHome = false; - - uiPhase = 0; - uiPhaseTimer = 0; - - me->SetReactState(REACT_PASSIVE); - // THIS IS A HACK, SHOULD BE REMOVED WHEN THE EVENT IS FULL SCRIPTED - me->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); - } - - ScriptedInstance* pInstance; - - uint8 uiPhase; - uint32 uiPhaseTimer; - - uint32 uiBladeStormTimer; - uint32 uiInterceptTimer; - uint32 uiMortalStrikeTimer; - uint32 uiAttackTimer; - - bool bDone; - bool bHome; - - void Reset() - { - uiBladeStormTimer = urand(15000,20000); - uiInterceptTimer = 7000; - uiMortalStrikeTimer = urand(8000,12000); - } - - void JustReachedHome() - { - ScriptedAI::JustReachedHome(); - - if (!bHome) - return; - - uiPhaseTimer = 15000; - uiPhase = 1; - - bHome = false; - } - - void UpdateAI(const uint32 uiDiff) - { - if (!bDone && GrandChampionsOutVehicle(me)) - { - bDone = true; - - if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_1)) - me->SetHomePosition(739.678,662.541,412.393,4.49); - else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_2)) - me->SetHomePosition(746.71,661.02,411.69,4.6); - else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_3)) - me->SetHomePosition(754.34,660.70,412.39,4.79); - - EnterEvadeMode(); - bHome = true; - } - - if (uiPhaseTimer <= uiDiff) - { - if (uiPhase == 1) - { - AggroAllPlayers(me); - uiPhase = 0; - } - }else uiPhaseTimer -= uiDiff; - - if (!UpdateVictim() || me->HasUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT)) - return; - - if (uiInterceptTimer <= uiDiff) - { - Map::PlayerList const& players = me->GetMap()->GetPlayers(); - if (me->GetMap()->IsDungeon() && !players.isEmpty()) - { - for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) - { - Player* pPlayer = itr->getSource(); - if (pPlayer && !pPlayer->isGameMaster() && me->IsInRange(pPlayer,8.0f,25.0f,false)) - { - DoResetThreat(); - me->AddThreat(pPlayer,5.0f); - DoCast(pPlayer,SPELL_INTERCEPT); - break; - } - } - } - uiInterceptTimer = 7000; - } else uiInterceptTimer -= uiDiff; - - if (uiBladeStormTimer <= uiDiff) - { - DoCastVictim(SPELL_BLADESTORM); - uiBladeStormTimer = urand(15000,20000); - } else uiBladeStormTimer -= uiDiff; - - if (uiMortalStrikeTimer <= uiDiff) - { - DoCastVictim(SPELL_MORTAL_STRIKE); - uiMortalStrikeTimer = urand(8000,12000); - } else uiMortalStrikeTimer -= uiDiff; - - DoMeleeAttackIfReady(); - } - - void JustDied(Unit* /*pKiller*/) - { - if (pInstance) - pInstance->SetData(BOSS_GRAND_CHAMPIONS, DONE); - } -}; - -CreatureAI* GetAI_boss_warrior_toc5(Creature* pCreature) -{ - return new boss_warrior_toc5AI(pCreature); -} - -// Ambrose Boltspark && Eressea Dawnsinger || Mage -struct boss_mage_toc5AI : public ScriptedAI -{ - boss_mage_toc5AI(Creature* pCreature) : ScriptedAI(pCreature) - { - pInstance = pCreature->GetInstanceData(); - - bDone = false; - bHome = false; - - uiPhase = 0; - uiPhaseTimer = 0; - - me->SetReactState(REACT_PASSIVE); - // THIS IS A HACK, SHOULD BE REMOVED WHEN THE EVENT IS FULL SCRIPTED - me->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); - } - - ScriptedInstance* pInstance; - - uint8 uiPhase; - uint32 uiPhaseTimer; - - uint32 uiFireBallTimer; - uint32 uiBlastWaveTimer; - uint32 uiHasteTimer; - uint32 uiPolymorphTimer; - - bool bDone; - bool bHome; - - void Reset() - { - uiFireBallTimer = 5000; - uiPolymorphTimer = 8000; - uiBlastWaveTimer = 12000; - uiHasteTimer = 22000; - } - - void JustReachedHome() - { - ScriptedAI::JustReachedHome(); - - if (!bHome) - return; - - uiPhaseTimer = 15000; - uiPhase = 1; - - bHome = false; - } - - void UpdateAI(const uint32 uiDiff) - { - if (!bDone && GrandChampionsOutVehicle(me)) - { - bDone = true; - - if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_1)) - me->SetHomePosition(739.678,662.541,412.393,4.49); - else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_2)) - me->SetHomePosition(746.71,661.02,411.69,4.6); - else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_3)) - me->SetHomePosition(754.34,660.70,412.39,4.79); - - if (pInstance) - pInstance->SetData(BOSS_GRAND_CHAMPIONS, IN_PROGRESS); - - EnterEvadeMode(); - bHome = true; - } - - if (uiPhaseTimer <= uiDiff) - { - if (uiPhase == 1) - { - AggroAllPlayers(me); - uiPhase = 0; - } - }else uiPhaseTimer -= uiDiff; - - if (uiFireBallTimer <= uiDiff) - { - if (me->getVictim()) - DoCastVictim(SPELL_FIREBALL); - uiFireBallTimer = 5000; - } else uiFireBallTimer -= uiDiff; - - - if (!UpdateVictim() || me->HasUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT)) - return; - - if (uiFireBallTimer <= uiDiff) - { - DoCastVictim(SPELL_FIREBALL); - uiFireBallTimer = 5000; - } else uiFireBallTimer -= uiDiff; - - if (uiPolymorphTimer <= uiDiff) - { - if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget, SPELL_POLYMORPH); - uiPolymorphTimer = 8000; - } else uiPolymorphTimer -= uiDiff; - - if (uiBlastWaveTimer <= uiDiff) - { - DoCastAOE(SPELL_BLAST_WAVE,false); - uiBlastWaveTimer = 13000; - } else uiBlastWaveTimer -= uiDiff; - - if (uiHasteTimer <= uiDiff) - { - me->InterruptNonMeleeSpells(true); - - DoCast(me,SPELL_HASTE); - uiHasteTimer = 22000; - } else uiHasteTimer -= uiDiff; - - DoMeleeAttackIfReady(); - } - - void JustDied(Unit* /*pKiller*/) - { - if (pInstance) - pInstance->SetData(BOSS_GRAND_CHAMPIONS, DONE); - } -}; - -CreatureAI* GetAI_boss_mage_toc5(Creature* pCreature) -{ - return new boss_mage_toc5AI(pCreature); -} - -// Colosos && Runok Wildmane || Shaman -struct boss_shaman_toc5AI : public ScriptedAI -{ - boss_shaman_toc5AI(Creature* pCreature) : ScriptedAI(pCreature) - { - pInstance = pCreature->GetInstanceData(); - - bDone = false; - bHome = false; - - uiPhase = 0; - uiPhaseTimer = 0; - - me->SetReactState(REACT_PASSIVE); - // THIS IS A HACK, SHOULD BE REMOVED WHEN THE EVENT IS FULL SCRIPTED - me->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); - } - - ScriptedInstance* pInstance; - - uint8 uiPhase; - uint32 uiPhaseTimer; - - uint32 uiChainLightningTimer; - uint32 uiEartShieldTimer; - uint32 uiHealingWaveTimer; - uint32 uiHexMendingTimer; - - bool bDone; - bool bHome; - - void Reset() - { - uiChainLightningTimer = 16000; - uiHealingWaveTimer = 12000; - uiEartShieldTimer = urand(30000,35000); - uiHexMendingTimer = urand(20000,25000); - } - - void EnterCombat(Unit* pWho) - { - DoCast(me,SPELL_EARTH_SHIELD); - DoCast(pWho,SPELL_HEX_OF_MENDING); - }; - - void JustReachedHome() - { - ScriptedAI::JustReachedHome(); - - if (!bHome) - return; - - uiPhaseTimer = 15000; - uiPhase = 1; - - bHome = false; - } - - void UpdateAI(const uint32 uiDiff) - { - if (!bDone && GrandChampionsOutVehicle(me)) - { - bDone = true; - - if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_1)) - me->SetHomePosition(739.678,662.541,412.393,4.49); - else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_2)) - me->SetHomePosition(746.71,661.02,411.69,4.6); - else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_3)) - me->SetHomePosition(754.34,660.70,412.39,4.79); - - if (pInstance) - pInstance->SetData(BOSS_GRAND_CHAMPIONS, IN_PROGRESS); - - EnterEvadeMode(); - bHome = true; - } - - if (uiPhaseTimer <= uiDiff) - { - if (uiPhase == 1) - { - AggroAllPlayers(me); - uiPhase = 0; - } - }else uiPhaseTimer -= uiDiff; - - if (!UpdateVictim() || me->HasUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT)) - return; - - if (uiChainLightningTimer <= uiDiff) - { - if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget,SPELL_CHAIN_LIGHTNING); - - uiChainLightningTimer = 16000; - } else uiChainLightningTimer -= uiDiff; - - if (uiHealingWaveTimer <= uiDiff) - { - bool bChance = urand(0,1); - - if (!bChance) - { - if (Unit* pFriend = DoSelectLowestHpFriendly(40)) - DoCast(pFriend,SPELL_HEALING_WAVE); - } else - DoCast(me,SPELL_HEALING_WAVE); - - uiHealingWaveTimer = 12000; - } else uiHealingWaveTimer -= uiDiff; - - if (uiEartShieldTimer <= uiDiff) - { - DoCast(me,SPELL_EARTH_SHIELD); - - uiEartShieldTimer = urand(30000,35000); - } else uiEartShieldTimer -= uiDiff; - - if (uiHexMendingTimer <= uiDiff) - { - DoCastVictim(SPELL_HEX_OF_MENDING,true); - - uiHexMendingTimer = urand(20000,25000); - } else uiHexMendingTimer -= uiDiff; - - DoMeleeAttackIfReady(); - } - - void JustDied(Unit* /*pKiller*/) - { - if (pInstance) - pInstance->SetData(BOSS_GRAND_CHAMPIONS, DONE); - } -}; - -CreatureAI* GetAI_boss_shaman_toc5(Creature* pCreature) -{ - return new boss_shaman_toc5AI(pCreature); -} - -// Jaelyne Evensong && Zul'tore || Hunter -struct boss_hunter_toc5AI : public ScriptedAI -{ - boss_hunter_toc5AI(Creature* pCreature) : ScriptedAI(pCreature) - { - pInstance = pCreature->GetInstanceData(); - - bDone = false; - bHome = false; - - uiPhase = 0; - uiPhaseTimer = 0; - - me->SetReactState(REACT_PASSIVE); - // THIS IS A HACK, SHOULD BE REMOVED WHEN THE EVENT IS FULL SCRIPTED - me->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); - } - - ScriptedInstance* pInstance; - - uint8 uiPhase; - uint32 uiPhaseTimer; - - uint32 uiShootTimer; - uint32 uiMultiShotTimer; - uint32 uiLightningArrowsTimer; - - uint64 uiTargetGUID; - - bool bShoot; - bool bDone; - bool bHome; - - void Reset() - { - uiShootTimer = 12000; - uiMultiShotTimer = 0; - uiLightningArrowsTimer = 7000; - - uiTargetGUID = 0; - - bShoot = false; - } - - void JustReachedHome() - { - ScriptedAI::JustReachedHome(); - - if (!bHome) - return; - - uiPhaseTimer = 15000; - uiPhase = 1; - - bHome = false; - } - - void UpdateAI(const uint32 uiDiff) - { - if (!bDone && GrandChampionsOutVehicle(me)) - { - bDone = true; - - if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_1)) - me->SetHomePosition(739.678,662.541,412.393,4.49); - else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_2)) - me->SetHomePosition(746.71,661.02,411.69,4.6); - else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_3)) - me->SetHomePosition(754.34,660.70,412.39,4.79); - - if (pInstance) - pInstance->SetData(BOSS_GRAND_CHAMPIONS, IN_PROGRESS); - - EnterEvadeMode(); - bHome = true; - } - - if (uiPhaseTimer <= uiDiff) - { - if (uiPhase == 1) - { - AggroAllPlayers(me); - uiPhase = 0; - } - }else uiPhaseTimer -= uiDiff; - - if (!UpdateVictim() || me->HasUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT)) - return; - - if (uiLightningArrowsTimer <= uiDiff) - { - DoCastAOE(SPELL_LIGHTNING_ARROWS,false); - uiLightningArrowsTimer = 7000; - } else uiLightningArrowsTimer -= uiDiff; - - if (uiShootTimer <= uiDiff) - { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_FARTHEST,0,30.0f)) - { - uiTargetGUID = pTarget->GetGUID(); - DoCast(pTarget, SPELL_SHOOT); - } - uiShootTimer = 12000; - uiMultiShotTimer = 3000; - bShoot = true; - } else uiShootTimer -= uiDiff; - - if (bShoot && uiMultiShotTimer <= uiDiff) - { - me->InterruptNonMeleeSpells(true); - Unit* pTarget = Unit::GetUnit(*me, uiTargetGUID); - - if (pTarget && me->IsInRange(pTarget,5.0f,30.0f,false)) - { - DoCast(pTarget,SPELL_MULTI_SHOT); - } else - { - Map::PlayerList const& players = me->GetMap()->GetPlayers(); - if (me->GetMap()->IsDungeon() && !players.isEmpty()) - { - for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) - { - Player* pPlayer = itr->getSource(); - if (pPlayer && !pPlayer->isGameMaster() && me->IsInRange(pPlayer,5.0f,30.0f,false)) - { - DoCast(pTarget,SPELL_MULTI_SHOT); - break; - } - } - } - } - bShoot = false; - } else uiMultiShotTimer -= uiDiff; - - DoMeleeAttackIfReady(); - } - - void JustDied(Unit* /*pKiller*/) - { - if (pInstance) - pInstance->SetData(BOSS_GRAND_CHAMPIONS, DONE); - } -}; - -CreatureAI* GetAI_boss_hunter_toc5(Creature* pCreature) -{ - return new boss_hunter_toc5AI(pCreature); -} - -// Lana Stouthammer Evensong && Deathstalker Visceri || Rouge -struct boss_rouge_toc5AI : public ScriptedAI -{ - boss_rouge_toc5AI(Creature* pCreature) : ScriptedAI(pCreature) - { - pInstance = pCreature->GetInstanceData(); - - bDone = false; - bHome = false; - - uiPhase = 0; - uiPhaseTimer = 0; - - me->SetReactState(REACT_PASSIVE); - // THIS IS A HACK, SHOULD BE REMOVED WHEN THE EVENT IS FULL SCRIPTED - me->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); - } - - ScriptedInstance* pInstance; - - uint8 uiPhase; - uint32 uiPhaseTimer; - uint32 uiEviscerateTimer; - uint32 uiFanKivesTimer; - uint32 uiPosionBottleTimer; - - bool bDone; - bool bHome; - - void Reset() - { - uiEviscerateTimer = 8000; - uiFanKivesTimer = 14000; - uiPosionBottleTimer = 19000; - } - - void JustReachedHome() - { - ScriptedAI::JustReachedHome(); - - if (!bHome) - return; - - uiPhaseTimer = 15000; - uiPhase = 1; - - bHome = false; - } - - void UpdateAI(const uint32 uiDiff) - { - if (!bDone && GrandChampionsOutVehicle(me)) - { - bDone = true; - - if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_1)) - me->SetHomePosition(739.678,662.541,412.393,4.49); - else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_2)) - me->SetHomePosition(746.71,661.02,411.69,4.6); - else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_3)) - me->SetHomePosition(754.34,660.70,412.39,4.79); - - if (pInstance) - pInstance->SetData(BOSS_GRAND_CHAMPIONS, IN_PROGRESS); - - EnterEvadeMode(); - bHome = true; - } - - if (uiPhaseTimer <= uiDiff) - { - if (uiPhase == 1) - { - AggroAllPlayers(me); - uiPhase = 0; - } - } else uiPhaseTimer -= uiDiff; - - if (!UpdateVictim() || me->HasUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT)) - return; - - if (uiEviscerateTimer <= uiDiff) - { - DoCast(me->getVictim(),SPELL_EVISCERATE); - uiEviscerateTimer = 8000; - } else uiEviscerateTimer -= uiDiff; - - if (uiFanKivesTimer <= uiDiff) - { - DoCastAOE(SPELL_FAN_OF_KNIVES,false); - uiFanKivesTimer = 14000; - } else uiFanKivesTimer -= uiDiff; - - if (uiPosionBottleTimer <= uiDiff) - { - if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget,SPELL_POISON_BOTTLE); - uiPosionBottleTimer = 19000; - } else uiPosionBottleTimer -= uiDiff; - - DoMeleeAttackIfReady(); - } - - void JustDied(Unit* /*pKiller*/) - { - if (pInstance) - pInstance->SetData(BOSS_GRAND_CHAMPIONS, DONE); - } -}; - -CreatureAI* GetAI_boss_rouge_toc5(Creature* pCreature) -{ - return new boss_rouge_toc5AI(pCreature); -} - -void AddSC_boss_grand_champions() -{ - Script* NewScript; - - NewScript = new Script; - NewScript->Name = "generic_vehicleAI_toc5"; - NewScript->GetAI = &GetAI_generic_vehicleAI_toc5; - NewScript->RegisterSelf(); - - NewScript = new Script; - NewScript->Name = "boss_warrior_toc5"; - NewScript->GetAI = &GetAI_boss_warrior_toc5; - NewScript->RegisterSelf(); - - NewScript = new Script; - NewScript->Name = "boss_mage_toc5"; - NewScript->GetAI = &GetAI_boss_mage_toc5; - NewScript->RegisterSelf(); - - NewScript = new Script; - NewScript->Name = "boss_shaman_toc5"; - NewScript->GetAI = &GetAI_boss_shaman_toc5; - NewScript->RegisterSelf(); - - NewScript = new Script; - NewScript->Name = "boss_hunter_toc5"; - NewScript->GetAI = &GetAI_boss_hunter_toc5; - NewScript->RegisterSelf(); - - NewScript = new Script; - NewScript->Name = "boss_rouge_toc5"; - NewScript->GetAI = &GetAI_boss_rouge_toc5; - NewScript->RegisterSelf(); -} diff --git a/src/server/scripts/Northrend/CrusadersColiseum/trial_of_the_champion/instance_trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/trial_of_the_champion/instance_trial_of_the_champion.cpp deleted file mode 100644 index 04b671ec11c..00000000000 --- a/src/server/scripts/Northrend/CrusadersColiseum/trial_of_the_champion/instance_trial_of_the_champion.cpp +++ /dev/null @@ -1,340 +0,0 @@ -/* - * Copyright (C) 2010 Trinity - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - - -/* ScriptData -SDName: Instance Trial of the Champion -SDComment: -SDCategory: Trial Of the Champion -EndScriptData */ - -#include "ScriptedPch.h" -#include "trial_of_the_champion.h" - -#define MAX_ENCOUNTER 4 - -struct instance_trial_of_the_champion : public ScriptedInstance -{ - instance_trial_of_the_champion(Map* pMap) : ScriptedInstance(pMap) {Initialize();} - - uint32 m_auiEncounter[MAX_ENCOUNTER]; - - uint8 uiMovementDone; - uint8 uiGrandChampionsDeaths; - uint8 uiArgentSoldierDeaths; - - uint64 uiAnnouncerGUID; - uint64 uiMainGateGUID; - uint64 uiGrandChampionVehicle1GUID; - uint64 uiGrandChampionVehicle2GUID; - uint64 uiGrandChampionVehicle3GUID; - uint64 uiGrandChampion1GUID; - uint64 uiGrandChampion2GUID; - uint64 uiGrandChampion3GUID; - uint64 uiChampionLootGUID; - uint64 uiArgentChampionGUID; - - std::list VehicleList; - - std::string str_data; - - bool bDone; - - void Initialize() - { - uiMovementDone = 0; - uiGrandChampionsDeaths = 0; - uiArgentSoldierDeaths = 0; - - uiAnnouncerGUID = 0; - uiMainGateGUID = 0; - uiGrandChampionVehicle1GUID = 0; - uiGrandChampionVehicle2GUID = 0; - uiGrandChampionVehicle3GUID = 0; - uiGrandChampion1GUID = 0; - uiGrandChampion2GUID = 0; - uiGrandChampion3GUID = 0; - uiChampionLootGUID = 0; - uiArgentChampionGUID = 0; - - bDone = false; - - VehicleList.clear(); - - memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); - } - - bool IsEncounterInProgress() const - { - for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) - { - if (m_auiEncounter[i] == IN_PROGRESS) - return true; - } - - return false; - } - - void OnCreatureCreate(Creature* pCreature, bool /*bAdd*/) - { - Map::PlayerList const &players = instance->GetPlayers(); - uint32 TeamInInstance = 0; - - if (!players.isEmpty()) - { - if (Player* pPlayer = players.begin()->getSource()) - TeamInInstance = pPlayer->GetTeam(); - } - - switch(pCreature->GetEntry()) - { - // Champions - case VEHICLE_MOKRA_SKILLCRUSHER_MOUNT: - if (TeamInInstance == HORDE) - pCreature->UpdateEntry(VEHICLE_MARSHAL_JACOB_ALERIUS_MOUNT, ALLIANCE); - break; - case VEHICLE_ERESSEA_DAWNSINGER_MOUNT: - if (TeamInInstance == HORDE) - pCreature->UpdateEntry(VEHICLE_AMBROSE_BOLTSPARK_MOUNT, ALLIANCE); - break; - case VEHICLE_RUNOK_WILDMANE_MOUNT: - if (TeamInInstance == HORDE) - pCreature->UpdateEntry(VEHICLE_COLOSOS_MOUNT, ALLIANCE); - break; - case VEHICLE_ZUL_TORE_MOUNT: - if (TeamInInstance == HORDE) - pCreature->UpdateEntry(VEHICLE_EVENSONG_MOUNT, ALLIANCE); - break; - case VEHICLE_DEATHSTALKER_VESCERI_MOUNT: - if (TeamInInstance == HORDE) - pCreature->UpdateEntry(VEHICLE_LANA_STOUTHAMMER_MOUNT, ALLIANCE); - break; - // Coliseum Announcer || Just NPC_JAEREN must be spawned. - case NPC_JAEREN: - uiAnnouncerGUID = pCreature->GetGUID(); - if (TeamInInstance == ALLIANCE) - pCreature->UpdateEntry(NPC_ARELAS,ALLIANCE); - break; - case VEHICLE_ARGENT_WARHORSE: - case VEHICLE_ARGENT_BATTLEWORG: - VehicleList.push_back(pCreature->GetGUID()); - break; - case NPC_EADRIC: - case NPC_PALETRESS: - uiArgentChampionGUID = pCreature->GetGUID(); - break; - } - } - - void OnGameObjectCreate(GameObject* pGO, bool /*bAdd*/) - { - switch(pGO->GetEntry()) - { - case GO_MAIN_GATE: - uiMainGateGUID = pGO->GetGUID(); - break; - case GO_CHAMPIONS_LOOT: - case GO_CHAMPIONS_LOOT_H: - uiChampionLootGUID = pGO->GetGUID(); - break; - } - } - - void SetData(uint32 uiType, uint32 uiData) - { - switch(uiType) - { - case DATA_MOVEMENT_DONE: - uiMovementDone = uiData; - if (uiMovementDone == 3) - { - if (Creature* pAnnouncer = instance->GetCreature(uiAnnouncerGUID)) - pAnnouncer->AI()->SetData(DATA_IN_POSITION,0); - } - break; - case BOSS_GRAND_CHAMPIONS: - m_auiEncounter[0] = uiData; - if (uiData == IN_PROGRESS) - { - for (std::list::const_iterator itr = VehicleList.begin(); itr != VehicleList.end(); ++itr) - if (Creature* pSummon = instance->GetCreature(*itr)) - pSummon->RemoveFromWorld(); - }else if (uiData == DONE) - { - ++uiGrandChampionsDeaths; - if (uiGrandChampionsDeaths == 3) - { - if (Creature* pAnnouncer = instance->GetCreature(uiAnnouncerGUID)) - { - pAnnouncer->GetMotionMaster()->MovePoint(0,748.309,619.487,411.171); - pAnnouncer->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - pAnnouncer->SummonGameObject(instance->IsHeroic()? GO_CHAMPIONS_LOOT_H : GO_CHAMPIONS_LOOT,746.59,618.49,411.09,1.42,0, 0, 0, 0,90000000); - } - } - } - break; - case DATA_ARGENT_SOLDIER_DEFEATED: - uiArgentSoldierDeaths = uiData; - if (uiArgentSoldierDeaths == 9) - { - if (Creature* pBoss = instance->GetCreature(uiArgentChampionGUID)) - { - pBoss->GetMotionMaster()->MovePoint(0,746.88,618.74,411.06); - pBoss->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE); - pBoss->SetReactState(REACT_AGGRESSIVE); - } - } - break; - case BOSS_ARGENT_CHALLENGE_E: - m_auiEncounter[1] = uiData; - if (Creature* pAnnouncer = instance->GetCreature(uiAnnouncerGUID)) - { - pAnnouncer->GetMotionMaster()->MovePoint(0,748.309,619.487,411.171); - pAnnouncer->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - pAnnouncer->SummonGameObject(instance->IsHeroic()? GO_EADRIC_LOOT_H : GO_EADRIC_LOOT,746.59,618.49,411.09,1.42,0, 0, 0, 0,90000000); - } - break; - case BOSS_ARGENT_CHALLENGE_P: - m_auiEncounter[2] = uiData; - if (Creature* pAnnouncer = instance->GetCreature(uiAnnouncerGUID)) - { - pAnnouncer->GetMotionMaster()->MovePoint(0,748.309,619.487,411.171); - pAnnouncer->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - pAnnouncer->SummonGameObject(instance->IsHeroic()? GO_PALETRESS_LOOT_H : GO_PALETRESS_LOOT,746.59,618.49,411.09,1.42,0, 0, 0, 0,90000000); - } - break; - } - - if (uiData == DONE) - SaveToDB(); - } - - uint32 GetData(uint32 uiData) - { - switch(uiData) - { - case BOSS_GRAND_CHAMPIONS: return m_auiEncounter[0]; - case BOSS_ARGENT_CHALLENGE_E: return m_auiEncounter[1]; - case BOSS_ARGENT_CHALLENGE_P: return m_auiEncounter[2]; - case BOSS_BLACK_KNIGHT: return m_auiEncounter[3]; - - case DATA_MOVEMENT_DONE: return uiMovementDone; - case DATA_ARGENT_SOLDIER_DEFEATED: return uiArgentSoldierDeaths; - } - - return 0; - } - - uint64 GetData64(uint32 uiData) - { - switch(uiData) - { - case DATA_ANNOUNCER: return uiAnnouncerGUID; - case DATA_MAIN_GATE: return uiMainGateGUID; - - case DATA_GRAND_CHAMPION_1: return uiGrandChampion1GUID; - case DATA_GRAND_CHAMPION_2: return uiGrandChampion2GUID; - case DATA_GRAND_CHAMPION_3: return uiGrandChampion3GUID; - } - - return 0; - } - - void SetData64(uint32 uiType, uint64 uiData) - { - switch(uiType) - { - case DATA_GRAND_CHAMPION_1: - uiGrandChampion1GUID = uiData; - break; - case DATA_GRAND_CHAMPION_2: - uiGrandChampion2GUID = uiData; - break; - case DATA_GRAND_CHAMPION_3: - uiGrandChampion3GUID = uiData; - break; - } - } - - std::string GetSaveData() - { - OUT_SAVE_INST_DATA; - - std::ostringstream saveStream; - - saveStream << "T C " << m_auiEncounter[0] - << " " << m_auiEncounter[1] - << " " << m_auiEncounter[2] - << " " << m_auiEncounter[3] - << " " << uiGrandChampionsDeaths - << " " << uiMovementDone; - - str_data = saveStream.str(); - - OUT_SAVE_INST_DATA_COMPLETE; - return str_data; - } - - void Load(const char* in) - { - if (!in) - { - OUT_LOAD_INST_DATA_FAIL; - return; - } - - OUT_LOAD_INST_DATA(in); - - char dataHead1, dataHead2; - uint16 data0, data1, data2, data3, data4, data5; - - std::istringstream loadStream(in); - loadStream >> dataHead1 >> dataHead2 >> data0 >> data1 >> data2 >> data3 >> data4 >> data5; - - if (dataHead1 == 'T' && dataHead2 == 'C') - { - m_auiEncounter[0] = data0; - m_auiEncounter[1] = data1; - m_auiEncounter[2] = data2; - m_auiEncounter[3] = data3; - - for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) - if (m_auiEncounter[i] == IN_PROGRESS) - m_auiEncounter[i] = NOT_STARTED; - - uiGrandChampionsDeaths = data4; - uiMovementDone = data5; - } else OUT_LOAD_INST_DATA_FAIL; - - OUT_LOAD_INST_DATA_COMPLETE; - } -}; - -InstanceData* GetInstanceData_instance_trial_of_the_champion(Map* pMap) -{ - return new instance_trial_of_the_champion(pMap); -} - -void AddSC_instance_trial_of_the_champion() -{ - Script *newscript; - newscript = new Script; - newscript->Name = "instance_trial_of_the_champion"; - newscript->GetInstanceData = &GetInstanceData_instance_trial_of_the_champion; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Northrend/CrusadersColiseum/trial_of_the_champion/trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/trial_of_the_champion/trial_of_the_champion.cpp deleted file mode 100644 index 090b64b96cc..00000000000 --- a/src/server/scripts/Northrend/CrusadersColiseum/trial_of_the_champion/trial_of_the_champion.cpp +++ /dev/null @@ -1,512 +0,0 @@ -/* - * Copyright (C) 2010 Trinity - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: Trial Of the Champion -SD%Complete: -SDComment: -SDCategory: trial_of_the_champion -EndScriptData */ - -/* ContentData -npc_announcer_toc5 -EndContentData */ - -#include "ScriptedPch.h" -#include "trial_of_the_champion.h" -#include "Vehicle.h" - -#define GOSSIP_START_EVENT1 "I'm ready to start challenge." -#define GOSSIP_START_EVENT2 "I'm ready for the next challenge." - -#define ORIENTATION 4.714 - -/*###### -## npc_announcer_toc5 -######*/ - -const Position SpawnPosition = {746.261,657.401,411.681,4.65}; - -struct npc_announcer_toc5AI : public ScriptedAI -{ - npc_announcer_toc5AI(Creature* pCreature) : ScriptedAI(pCreature) - { - pInstance = pCreature->GetInstanceData(); - - uiSummonTimes = 0; - uiPosition = 0; - uiLesserChampions = 0; - - uiFirstBoss = 0; - uiSecondBoss = 0; - uiThirdBoss = 0; - - uiArgentChampion = 0; - - uiPhase = 0; - uiTimer = 0; - - uiVehicle1GUID = 0; - uiVehicle2GUID = 0; - uiVehicle3GUID = 0; - - Champion1List.clear(); - Champion2List.clear(); - Champion3List.clear(); - - me->SetReactState(REACT_PASSIVE); - me->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE); - me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - - SetGrandChampionsForEncounter(); - SetArgentChampion(); - } - - ScriptedInstance* pInstance; - - uint8 uiSummonTimes; - uint8 uiPosition; - uint8 uiLesserChampions; - - uint32 uiArgentChampion; - - uint32 uiFirstBoss; - uint32 uiSecondBoss; - uint32 uiThirdBoss; - - uint32 uiPhase; - uint32 uiTimer; - - uint64 uiVehicle1GUID; - uint64 uiVehicle2GUID; - uint64 uiVehicle3GUID; - - uint64 uiGrandChampionBoss1; - - std::list Champion1List; - std::list Champion2List; - std::list Champion3List; - - void NextStep(uint32 uiTimerStep,bool bNextStep = true,uint8 uiPhaseStep = 0) - { - uiTimer = uiTimerStep; - if (bNextStep) - ++uiPhase; - else - uiPhase = uiPhaseStep; - } - - void SetData(uint32 uiType, uint32 /*uiData*/) - { - switch (uiType) - { - case DATA_START: - DoSummonGrandChampion(uiFirstBoss); - NextStep(10000,false,1); - break; - case DATA_IN_POSITION: //movement done. - me->GetMotionMaster()->MovePoint(1,735.81,661.92,412.39); - if (GameObject* pGO = GameObject::GetGameObject(*me, pInstance->GetData64(DATA_MAIN_GATE))) - pInstance->HandleGameObject(pGO->GetGUID(),false); - NextStep(10000,false,3); - break; - case DATA_LESSER_CHAMPIONS_DEFEATED: - { - ++uiLesserChampions; - std::list TempList; - if (uiLesserChampions == 3 || uiLesserChampions == 6) - { - switch(uiLesserChampions) - { - case 3: - TempList = Champion2List; - break; - case 6: - TempList = Champion3List; - break; - } - - for (std::list::const_iterator itr = TempList.begin(); itr != TempList.end(); ++itr) - if (Creature* pSummon = Unit::GetCreature(*me, *itr)) - AggroAllPlayers(pSummon); - }else if (uiLesserChampions == 9) - StartGrandChampionsAttack(); - - break; - } - } - } - - void StartGrandChampionsAttack() - { - Creature* pGrandChampion1 = Unit::GetCreature(*me, uiVehicle1GUID); - Creature* pGrandChampion2 = Unit::GetCreature(*me, uiVehicle2GUID); - Creature* pGrandChampion3 = Unit::GetCreature(*me, uiVehicle3GUID); - - if (pGrandChampion1 && pGrandChampion2 && pGrandChampion3) - { - AggroAllPlayers(pGrandChampion1); - AggroAllPlayers(pGrandChampion2); - AggroAllPlayers(pGrandChampion3); - } - } - - void MovementInform(uint32 uiType, uint32 uiPointId) - { - if (uiType != POINT_MOTION_TYPE) - return; - - if (uiPointId == 1) - { - me->SetOrientation(ORIENTATION); - me->SendMovementFlagUpdate(); - } - } - - void DoSummonGrandChampion(uint32 uiBoss) - { - ++uiSummonTimes; - uint32 VEHICLE_TO_SUMMON1 = 0; - uint32 VEHICLE_TO_SUMMON2 = 0; - switch(uiBoss) - { - case 0: - VEHICLE_TO_SUMMON1 = VEHICLE_MOKRA_SKILLCRUSHER_MOUNT; - VEHICLE_TO_SUMMON2 = VEHICLE_ORGRIMMAR_WOLF; - break; - case 1: - VEHICLE_TO_SUMMON1 = VEHICLE_ERESSEA_DAWNSINGER_MOUNT; - VEHICLE_TO_SUMMON2 = VEHICLE_SILVERMOON_HAWKSTRIDER; - break; - case 2: - VEHICLE_TO_SUMMON1 = VEHICLE_RUNOK_WILDMANE_MOUNT; - VEHICLE_TO_SUMMON2 = VEHICLE_THUNDER_BLUFF_KODO; - break; - case 3: - VEHICLE_TO_SUMMON1 = VEHICLE_ZUL_TORE_MOUNT; - VEHICLE_TO_SUMMON2 = VEHICLE_DARKSPEAR_RAPTOR; - break; - case 4: - VEHICLE_TO_SUMMON1 = VEHICLE_DEATHSTALKER_VESCERI_MOUNT; - VEHICLE_TO_SUMMON2 = VEHICLE_FORSAKE_WARHORSE; - break; - default: - return; - } - - if (Creature* pBoss = me->SummonCreature(VEHICLE_TO_SUMMON1,SpawnPosition)) - { - switch(uiSummonTimes) - { - case 1: - { - uiVehicle1GUID = pBoss->GetGUID(); - uint64 uiGrandChampionBoss1 = 0; - if (Creature* pBoss = Unit::GetCreature(*me, uiVehicle1GUID)) - if (Vehicle* pVehicle = pBoss->GetVehicleKit()) - if (Unit* pUnit = pVehicle->GetPassenger(0)) - uiGrandChampionBoss1 = pUnit->GetGUID(); - if (pInstance) - { - pInstance->SetData64(DATA_GRAND_CHAMPION_VEHICLE_1,uiVehicle1GUID); - pInstance->SetData64(DATA_GRAND_CHAMPION_1,uiGrandChampionBoss1); - } - pBoss->AI()->SetData(1,0); - break; - } - case 2: - { - uiVehicle2GUID = pBoss->GetGUID(); - uint64 uiGrandChampionBoss2 = 0; - if (Creature* pBoss = Unit::GetCreature(*me, uiVehicle2GUID)) - if (Vehicle* pVehicle = pBoss->GetVehicleKit()) - if (Unit* pUnit = pVehicle->GetPassenger(0)) - uiGrandChampionBoss2 = pUnit->GetGUID(); - if (pInstance) - { - pInstance->SetData64(DATA_GRAND_CHAMPION_VEHICLE_2,uiVehicle2GUID); - pInstance->SetData64(DATA_GRAND_CHAMPION_2,uiGrandChampionBoss2); - } - pBoss->AI()->SetData(2,0); - break; - } - case 3: - { - uiVehicle3GUID = pBoss->GetGUID(); - uint64 uiGrandChampionBoss3 = 0; - if (Creature* pBoss = Unit::GetCreature(*me, uiVehicle3GUID)) - if (Vehicle* pVehicle = pBoss->GetVehicleKit()) - if (Unit* pUnit = pVehicle->GetPassenger(0)) - uiGrandChampionBoss3 = pUnit->GetGUID(); - if (pInstance) - { - pInstance->SetData64(DATA_GRAND_CHAMPION_VEHICLE_3,uiVehicle3GUID); - pInstance->SetData64(DATA_GRAND_CHAMPION_3,uiGrandChampionBoss3); - } - pBoss->AI()->SetData(3,0); - break; - } - default: - return; - } - - for (uint8 i = 0; i < 3; ++i) - { - if (Creature* pAdd = me->SummonCreature(VEHICLE_TO_SUMMON2,SpawnPosition,TEMPSUMMON_CORPSE_DESPAWN)) - { - switch(uiSummonTimes) - { - case 1: - Champion1List.push_back(pAdd->GetGUID()); - break; - case 2: - Champion2List.push_back(pAdd->GetGUID()); - break; - case 3: - Champion3List.push_back(pAdd->GetGUID()); - break; - } - - switch(i) - { - case 0: - pAdd->GetMotionMaster()->MoveFollow(pBoss,2.0f,M_PI); - break; - case 1: - pAdd->GetMotionMaster()->MoveFollow(pBoss,2.0f,M_PI / 2); - break; - case 2: - pAdd->GetMotionMaster()->MoveFollow(pBoss,2.0f,M_PI / 2 + M_PI); - break; - } - } - - } - } - } - - void DoStartArgentChampionEncounter() - { - me->GetMotionMaster()->MovePoint(1,735.81,661.92,412.39); - - if (Creature* pBoss = me->SummonCreature(uiArgentChampion,SpawnPosition)) - { - for (uint8 i = 0; i < 3; ++i) - { - if (Creature* pTrash = me->SummonCreature(NPC_ARGENT_LIGHWIELDER,SpawnPosition)) - pTrash->AI()->SetData(i,0); - if (Creature* pTrash = me->SummonCreature(NPC_ARGENT_MONK,SpawnPosition)) - pTrash->AI()->SetData(i,0); - if (Creature* pTrash = me->SummonCreature(NPC_PRIESTESS,SpawnPosition)) - pTrash->AI()->SetData(i,0); - } - } - } - - void SetGrandChampionsForEncounter() - { - uiFirstBoss = urand(0,4); - - while (uiSecondBoss == uiFirstBoss || uiThirdBoss == uiFirstBoss || uiThirdBoss == uiSecondBoss) - { - uiSecondBoss = urand(0,4); - uiThirdBoss = urand(0,4); - } - } - - void SetArgentChampion() - { - uint8 uiTempBoss = urand(0,1); - - switch(uiTempBoss) - { - case 0: - uiArgentChampion = NPC_EADRIC; - break; - case 1: - uiArgentChampion = NPC_PALETRESS; - break; - } - } - - void StartEncounter() - { - if (!pInstance) - return; - - me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - - if (pInstance->GetData(BOSS_BLACK_KNIGHT) == NOT_STARTED) - { - if (pInstance->GetData(BOSS_ARGENT_CHALLENGE_E) == NOT_STARTED && pInstance->GetData(BOSS_ARGENT_CHALLENGE_P) == NOT_STARTED) - { - if (pInstance->GetData(BOSS_GRAND_CHAMPIONS) == NOT_STARTED) - me->AI()->SetData(DATA_START,0); - - if (pInstance->GetData(BOSS_GRAND_CHAMPIONS) == DONE) - DoStartArgentChampionEncounter(); - } - - if (pInstance->GetData(BOSS_GRAND_CHAMPIONS) == DONE && - pInstance->GetData(BOSS_ARGENT_CHALLENGE_E) == DONE || - pInstance->GetData(BOSS_ARGENT_CHALLENGE_P) == DONE) - me->SummonCreature(VEHICLE_BLACK_KNIGHT,769.834,651.915,447.035,0); - } - } - - void AggroAllPlayers(Creature* pTemp) - { - Map::PlayerList const &PlList = me->GetMap()->GetPlayers(); - - if (PlList.isEmpty()) - return; - - for (Map::PlayerList::const_iterator i = PlList.begin(); i != PlList.end(); ++i) - { - if (Player* pPlayer = i->getSource()) - { - if (pPlayer->isGameMaster()) - continue; - - if (pPlayer->isAlive()) - { - pTemp->SetHomePosition(me->GetPositionX(),me->GetPositionY(),me->GetPositionZ(),me->GetOrientation()); - pTemp->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE); - pTemp->SetReactState(REACT_AGGRESSIVE); - pTemp->SetInCombatWith(pPlayer); - pPlayer->SetInCombatWith(pTemp); - pTemp->AddThreat(pPlayer, 0.0f); - } - } - } - } - - - void UpdateAI(const uint32 uiDiff) - { - ScriptedAI::UpdateAI(uiDiff); - - if (uiTimer <= uiDiff) - { - switch(uiPhase) - { - case 1: - DoSummonGrandChampion(uiSecondBoss); - NextStep(10000,true); - break; - case 2: - DoSummonGrandChampion(uiThirdBoss); - NextStep(0,false); - break; - case 3: - if (!Champion1List.empty()) - { - for (std::list::const_iterator itr = Champion1List.begin(); itr != Champion1List.end(); ++itr) - if (Creature* pSummon = Unit::GetCreature(*me, *itr)) - AggroAllPlayers(pSummon); - NextStep(0,false); - } - break; - } - } else uiTimer -= uiDiff; - - if (!UpdateVictim()) - return; - } - - void JustSummoned(Creature* pSummon) - { - if (pInstance && pInstance->GetData(BOSS_GRAND_CHAMPIONS) == NOT_STARTED) - { - pSummon->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE); - pSummon->SetReactState(REACT_PASSIVE); - } - } - - void SummonedCreatureDespawn(Creature* pSummon) - { - switch(pSummon->GetEntry()) - { - case VEHICLE_DARNASSIA_NIGHTSABER: - case VEHICLE_EXODAR_ELEKK: - case VEHICLE_STORMWIND_STEED: - case VEHICLE_GNOMEREGAN_MECHANOSTRIDER: - case VEHICLE_IRONFORGE_RAM: - case VEHICLE_FORSAKE_WARHORSE: - case VEHICLE_THUNDER_BLUFF_KODO: - case VEHICLE_ORGRIMMAR_WOLF: - case VEHICLE_SILVERMOON_HAWKSTRIDER: - case VEHICLE_DARKSPEAR_RAPTOR: - me->AI()->SetData(DATA_LESSER_CHAMPIONS_DEFEATED,0); - break; - } - } -}; - -CreatureAI* GetAI_npc_announcer_toc5(Creature* pCreature) -{ - return new npc_announcer_toc5AI(pCreature); -} - -bool GossipHello_npc_announcer_toc5(Player* pPlayer, Creature* pCreature) -{ - ScriptedInstance* pInstance = pCreature->GetInstanceData(); - - if (pInstance && - pInstance->GetData(BOSS_GRAND_CHAMPIONS) == DONE && - pInstance->GetData(BOSS_BLACK_KNIGHT) == DONE && - pInstance->GetData(BOSS_ARGENT_CHALLENGE_E) == DONE || - pInstance->GetData(BOSS_ARGENT_CHALLENGE_P) == DONE) - return false; - - if (pInstance && - pInstance->GetData(BOSS_GRAND_CHAMPIONS) == NOT_STARTED && - pInstance->GetData(BOSS_ARGENT_CHALLENGE_E) == NOT_STARTED && - pInstance->GetData(BOSS_ARGENT_CHALLENGE_P) == NOT_STARTED && - pInstance->GetData(BOSS_BLACK_KNIGHT) == NOT_STARTED) - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - else if (pInstance) - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - - pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID()); - - return true; -} - -bool GossipSelect_npc_announcer_toc5(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) -{ - if (uiAction == GOSSIP_ACTION_INFO_DEF+1) - { - pPlayer->CLOSE_GOSSIP_MENU(); - CAST_AI(npc_announcer_toc5AI, pCreature->AI())->StartEncounter(); - } - - return true; -} - -void AddSC_trial_of_the_champion() -{ - Script* NewScript; - - NewScript = new Script; - NewScript->Name = "npc_announcer_toc5"; - NewScript->GetAI = &GetAI_npc_announcer_toc5; - NewScript->pGossipHello = &GossipHello_npc_announcer_toc5; - NewScript->pGossipSelect = &GossipSelect_npc_announcer_toc5; - NewScript->RegisterSelf(); -} diff --git a/src/server/scripts/Northrend/CrusadersColiseum/trial_of_the_champion/trial_of_the_champion.h b/src/server/scripts/Northrend/CrusadersColiseum/trial_of_the_champion/trial_of_the_champion.h deleted file mode 100644 index 221c7c0412f..00000000000 --- a/src/server/scripts/Northrend/CrusadersColiseum/trial_of_the_champion/trial_of_the_champion.h +++ /dev/null @@ -1,115 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 -* This program is free software licensed under GPL version 2 -* Please see the included DOCS/LICENSE.TXT for more information */ - -#ifndef DEF_TOC_H -#define DEF_TOC_H - - -enum eData -{ - BOSS_GRAND_CHAMPIONS, - BOSS_ARGENT_CHALLENGE_E, - BOSS_ARGENT_CHALLENGE_P, - BOSS_BLACK_KNIGHT, - DATA_MOVEMENT_DONE, - DATA_LESSER_CHAMPIONS_DEFEATED, - DATA_START, - DATA_IN_POSITION, - DATA_ARGENT_SOLDIER_DEFEATED -}; - -enum Data64 -{ - DATA_ANNOUNCER, - DATA_MAIN_GATE, - - DATA_GRAND_CHAMPION_VEHICLE_1, - DATA_GRAND_CHAMPION_VEHICLE_2, - DATA_GRAND_CHAMPION_VEHICLE_3, - - DATA_GRAND_CHAMPION_1, - DATA_GRAND_CHAMPION_2, - DATA_GRAND_CHAMPION_3 -}; - -enum eNpcs -{ - // Horde Champions - NPC_MOKRA = 35572, - NPC_ERESSEA = 35569, - NPC_RUNOK = 35571, - NPC_ZULTORE = 35570, - NPC_VISCERI = 35617, - - // Alliance Champions - NPC_JACOB = 34705, - NPC_AMBROSE = 34702, - NPC_COLOSOS = 34701, - NPC_JAELYNE = 34657, - NPC_LANA = 34703, - - NPC_EADRIC = 35119, - NPC_PALETRESS = 34928, - - NPC_ARGENT_LIGHWIELDER = 35309, - NPC_ARGENT_MONK = 35305, - NPC_PRIESTESS = 35307, - - NPC_BLACK_KNIGHT = 35451, - - NPC_RISEN_JAEREN = 35545, - NPC_RISEN_ARELAS = 35564, - - NPC_JAEREN = 35004, - NPC_ARELAS = 35005 -}; - -enum eGameObjects -{ - GO_MAIN_GATE = 195647, - - GO_CHAMPIONS_LOOT = 195709, - GO_CHAMPIONS_LOOT_H = 195710, - - GO_EADRIC_LOOT = 195374, - GO_EADRIC_LOOT_H = 195375, - - GO_PALETRESS_LOOT = 195323, - GO_PALETRESS_LOOT_H = 195324 -}; - -enum eVehicles -{ - //Grand Champions Alliance Vehicles - VEHICLE_MARSHAL_JACOB_ALERIUS_MOUNT = 35637, - VEHICLE_AMBROSE_BOLTSPARK_MOUNT = 35633, - VEHICLE_COLOSOS_MOUNT = 35768, - VEHICLE_EVENSONG_MOUNT = 34658, - VEHICLE_LANA_STOUTHAMMER_MOUNT = 35636, - //Faction Champions (ALLIANCE) - VEHICLE_DARNASSIA_NIGHTSABER = 33298, - VEHICLE_EXODAR_ELEKK = 33416, - VEHICLE_STORMWIND_STEED = 33297, - VEHICLE_GNOMEREGAN_MECHANOSTRIDER = 33301, - VEHICLE_IRONFORGE_RAM = 33408, - //Grand Champions Horde Vehicles - VEHICLE_MOKRA_SKILLCRUSHER_MOUNT = 35638, - VEHICLE_ERESSEA_DAWNSINGER_MOUNT = 35635, - VEHICLE_RUNOK_WILDMANE_MOUNT = 35640, - VEHICLE_ZUL_TORE_MOUNT = 35641, - VEHICLE_DEATHSTALKER_VESCERI_MOUNT = 35634, - //Faction Champions (HORDE) - VEHICLE_FORSAKE_WARHORSE = 33414, - VEHICLE_THUNDER_BLUFF_KODO = 33300, - VEHICLE_ORGRIMMAR_WOLF = 33409, - VEHICLE_SILVERMOON_HAWKSTRIDER = 33418, - VEHICLE_DARKSPEAR_RAPTOR = 33299, - - VEHICLE_ARGENT_WARHORSE = 35644, - VEHICLE_ARGENT_BATTLEWORG = 36558, - - VEHICLE_BLACK_KNIGHT = 35491 -}; - -#endif diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp new file mode 100644 index 00000000000..59db2842735 --- /dev/null +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp @@ -0,0 +1,263 @@ +/* Copyright (C) 2006 - 2010 TrinityCore + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "ScriptedPch.h" +#include "forge_of_souls.h" + +/* + * TODO: + * - Fix Soul Storm spell and remove work around. + */ + +enum Yells +{ + SAY_AGGRO = -1632001, + SAY_SLAY_1 = -1632002, + SAY_SLAY_2 = -1632003, + SAY_DEATH = -1632004, + SAY_SOUL_STORM = -1632005, + SAY_CORRUPT_SOUL = -1632006, +}; + +enum Spells +{ + SPELL_MAGIC_S_BANE = 68793, + SPELL_CORRUPT_SOUL = 68839, + SPELL_CONSUME_SOUL = 68858, + SPELL_TELEPORT = 68988, + SPELL_FEAR = 68950, + SPELL_SOULSTORM = 68872, + SPELL_SOULSTORM_AURA = 68921, + SPELL_SHADOW_BOLT = 70043, +}; + +enum Events +{ + EVENT_NONE, + EVENT_SHADOW_BOLT, + EVENT_MAGIC_BANE, + EVENT_CORRUPT_SOUL, + EVENT_SOUL_STORM, + EVENT_SOUL_STORM_AURA, + EVENT_FEAR, +}; + +enum CombatPhases +{ + PHASE_1, + PHASE_2 +}; + +struct boss_bronjahmAI : public ScriptedAI +{ + boss_bronjahmAI(Creature *c) : ScriptedAI(c) + { + pInstance = me->GetInstanceData(); + } + + ScriptedInstance* pInstance; + EventMap events; + + CombatPhases phase; + + void Reset() + { + phase = PHASE_1; + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE); + + events.Reset(); + events.ScheduleEvent(EVENT_SHADOW_BOLT, 2000); + events.ScheduleEvent(EVENT_MAGIC_BANE, urand(8000,15000)); + events.ScheduleEvent(EVENT_CORRUPT_SOUL, urand(25000,35000)); + + if (pInstance) + pInstance->SetData(DATA_BRONJAHM_EVENT, NOT_STARTED); + } + + void EnterCombat(Unit* /*who*/) + { + DoScriptText(SAY_AGGRO, me); + + if (pInstance) + pInstance->SetData(DATA_BRONJAHM_EVENT, IN_PROGRESS); + } + + void JustDied(Unit* /*killer*/) + { + DoScriptText(SAY_DEATH, me); + + if (pInstance) + pInstance->SetData(DATA_BRONJAHM_EVENT, DONE); + } + + void KilledUnit(Unit * /*who*/) + { + DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + } + + // Cast aura spell on all players farther than 10y + void ApplySoulStorm() + { + std::list targetList; + + SelectTargetList(targetList, 100, SELECT_TARGET_TOPAGGRO, -10.0f); + if (targetList.empty()) + return; + + for (std::list::const_iterator itr = targetList.begin(); itr != targetList.end(); ++itr) + { + Unit* pUnit = (*itr); + if (pUnit && pUnit->isAlive()) + me->CastSpell(pUnit, SPELL_SOULSTORM_AURA, true); + } + } + + void UpdateAI(const uint32 diff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + events.Update(diff); + + if (me->hasUnitState(UNIT_STAT_CASTING)) + return; + + if (phase == PHASE_1 && HealthBelowPct(30)) + { + phase = PHASE_2; + DoCast(me,SPELL_TELEPORT); + me->GetMotionMaster()->Clear(); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE); + events.CancelEvent(EVENT_CORRUPT_SOUL); + events.ScheduleEvent(EVENT_SOUL_STORM, 1000); + events.ScheduleEvent(EVENT_FEAR, urand(8000,12000)); + return; + } + + while (uint32 eventId = events.ExecuteEvent()) + { + switch(eventId) + { + case EVENT_CORRUPT_SOUL: + if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM,1)) + { + DoScriptText(SAY_CORRUPT_SOUL, me); + DoCast(pTarget,SPELL_CORRUPT_SOUL); + } + events.ScheduleEvent(EVENT_CORRUPT_SOUL, urand(25000,35000)); + break; + case EVENT_SOUL_STORM: + DoScriptText(SAY_SOUL_STORM, me); + // DoCast(me, SPELL_SOULSTORM); bug: put the aura without the limit of 10 yards. + events.ScheduleEvent(EVENT_SOUL_STORM_AURA, 1000); + break; + case EVENT_SOUL_STORM_AURA: + ApplySoulStorm(); + events.ScheduleEvent(EVENT_SOUL_STORM_AURA, 1000); + break; + case EVENT_FEAR: + if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM,1)) + DoCast(pTarget,SPELL_FEAR); + events.ScheduleEvent(EVENT_FEAR, urand(8000,12000)); + break; + case EVENT_SHADOW_BOLT: + DoCastVictim(SPELL_SHADOW_BOLT); + events.ScheduleEvent(EVENT_SHADOW_BOLT, 2000); + break; + case EVENT_MAGIC_BANE: + DoCastVictim(SPELL_MAGIC_S_BANE); + events.ScheduleEvent(EVENT_MAGIC_BANE, urand(8000,15000)); + break; + } + } + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_boss_bronjahm(Creature* pCreature) +{ + return new boss_bronjahmAI(pCreature); +} + +struct mob_corrupted_soul_fragmentAI : public ScriptedAI +{ + mob_corrupted_soul_fragmentAI(Creature *c) : ScriptedAI(c) + { + pInstance = me->GetInstanceData(); + } + + ScriptedInstance* pInstance; + + uint32 uiCheckTimer; + + void Reset() + { + uiCheckTimer = 0; // first check is immediate + } + + void UpdateAI(const uint32 diff) + { + if (uiCheckTimer <= diff) + { + if (pInstance) + { + Creature* pBronjham = Unit::GetCreature(*me, pInstance->GetData64(DATA_BRONJAHM)); + if (pBronjham && pBronjham->isAlive()) + { + if (me->IsWithinMeleeRange(pBronjham)) + { + pBronjham->CastSpell(pBronjham, SPELL_CONSUME_SOUL, true); + me->ForcedDespawn(); + } + else + { + Position pos; + pBronjham->GetPosition(&pos); + me->GetMotionMaster()->Clear(); + me->GetMotionMaster()->MovePoint(0, pos); + } + } + else + me->ForcedDespawn(); + } + uiCheckTimer = 500; + } + else + uiCheckTimer -= diff; + } +}; + +CreatureAI* GetAI_mob_corrupted_soul_fragment(Creature* pCreature) +{ + return new mob_corrupted_soul_fragmentAI(pCreature); +} + +void AddSC_boss_bronjahm() +{ + Script *newscript; + + newscript = new Script; + newscript->Name = "boss_bronjahm"; + newscript->GetAI = &GetAI_boss_bronjahm; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_corrupted_soul_fragment"; + newscript->GetAI = &GetAI_mob_corrupted_soul_fragment; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp new file mode 100644 index 00000000000..6811ba953e2 --- /dev/null +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp @@ -0,0 +1,349 @@ +/* Copyright (C) 2006 - 2010 TrinityCore + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "ScriptedPch.h" +#include "forge_of_souls.h" + +/* + * TODO: + * - Fix model id during unleash soul -> seems DB issue 36503 is missing (likewise 36504 is also missing). + * - Fix outro npc movement + */ + +#define PI 3.1415f + +enum Yells +{ + SAY_FACE_ANGER_AGGRO = -1632010, + SAY_FACE_DESIRE_AGGRO = -1632011, + SAY_FACE_ANGER_SLAY_1 = -1632012, + SAY_FACE_SORROW_SLAY_1 = -1632013, + SAY_FACE_DESIRE_SLAY_1 = -1632014, + SAY_FACE_ANGER_SLAY_2 = -1632015, + SAY_FACE_SORROW_SLAY_2 = -1632016, + SAY_FACE_DESIRE_SLAY_2 = -1632017, + SAY_FACE_SORROW_DEATH = -1632019, + SAY_FACE_DESIRE_DEATH = -1632020, + EMOTE_MIRRORED_SOUL = -1632021, + EMOTE_UNLEASH_SOUL = -1632022, + SAY_FACE_ANGER_UNLEASH_SOUL = -1632023, + SAY_FACE_SORROW_UNLEASH_SOUL = -1632024, + SAY_FACE_DESIRE_UNLEASH_SOUL = -1632025, + EMOTE_WAILING_SOUL = -1632026, + SAY_FACE_ANGER_WAILING_SOUL = -1632027, + SAY_FACE_DESIRE_WAILING_SOUL = -1632028, + + SAY_JAINA_OUTRO = -1632029, + SAY_SYLVANAS_OUTRO = -1632030, +}; + +enum Spells +{ + SPELL_PHANTOM_BLAST = 68982, + H_SPELL_PHANTOM_BLAST = 70322, + SPELL_MIRRORED_SOUL = 69051, + SPELL_WELL_OF_SOULS = 68820, + SPELL_WELL_OF_SOULS_VIS = 68854, + SPELL_UNLEASHED_SOULS = 68939, + SPELL_WAILING_SOULS_STARTING = 68912, // Initial spell cast at begining of wailing souls phase + SPELL_WAILING_SOULS_BEAM = 68875, // the beam visual + SPELL_WAILING_SOULS = 68873, // the actual spell + H_SPELL_WAILING_SOULS = 70324, +// 68871,68873,68875,68876,68899,68912,70324, +// 68899 trigger 68871 +}; + +enum Events +{ + EVENT_NONE, + EVENT_PHANTOM_BLAST, + EVENT_MIRRORED_SOUL, + EVENT_WELL_OF_SOULS, + EVENT_UNLEASHED_SOULS, + EVENT_WAILING_SOULS, + EVENT_WAILING_SOULS_TICK, + EVENT_FACE_ANGER, +}; + +enum eEnum +{ + ACHIEV_THREE_FACED = 4523, + DISPLAY_ANGER = 30148, + DISPLAY_SORROW = 30149, + DISPLAY_DESIRE = 30150, +}; + +struct +{ + uint32 entry[2]; + Position movePosition; +} outroPositions[] = +{ + { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5590.47, 2427.79, 705.935, 0.802851 } }, + { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5593.59, 2428.34, 705.935, 0.977384 } }, + { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5600.81, 2429.31, 705.935, 0.890118 } }, + { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5600.81, 2421.12, 705.935, 0.890118 } }, + { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5601.43, 2426.53, 705.935, 0.890118 } }, + { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5601.55, 2418.36, 705.935, 1.15192 } }, + { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5598, 2429.14, 705.935, 1.0472 } }, + { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5594.04, 2424.87, 705.935, 1.15192 } }, + { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5597.89, 2421.54, 705.935, 0.610865 } }, + { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_2_HORDE, { 5598.57, 2434.62, 705.935, 1.13446 } }, + { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_2_HORDE, { 5585.46, 2417.99, 705.935, 1.06465 } }, + { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_2_HORDE, { 5605.81, 2428.42, 705.935, 0.820305 } }, + { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_2_HORDE, { 5591.61, 2412.66, 705.935, 0.925025 } }, + { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_2_HORDE, { 5593.9, 2410.64, 705.935, 0.872665 } }, + { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_2_HORDE, { 5586.76, 2416.73, 705.935, 0.942478 } }, + { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_3_HORDE, { 5592.23, 2419.14, 705.935, 0.855211 } }, + { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_3_HORDE, { 5594.61, 2416.87, 705.935, 0.907571 } }, + { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_3_HORDE, { 5589.77, 2421.03, 705.935, 0.855211 } }, + + { NPC_KORELN, NPC_LORALEN, { 5602.58, 2435.95, 705.935, 0.959931 } }, + { NPC_ELANDRA, NPC_KALIRA, { 5606.13, 2433.16, 705.935, 0.785398 } }, + { NPC_JAINA_PART2, NPC_SYLVANAS_PART2, { 5606.12, 2436.6, 705.935, 0.890118 } }, + + { 0, 0, { 0, 0, 0, 0 } } +}; + +struct boss_devourer_of_soulsAI : public ScriptedAI +{ + boss_devourer_of_soulsAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + } + + bool bThreeFaceAchievement; + + ScriptedInstance* pInstance; + EventMap events; + + // wailing soul event + float beamAngle; + float beamAngleDiff; + int8 wailingSoulTick; + + uint64 uiMirroredSoulTarget; + + void Reset() + { + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE); + me->SetDisplayId(DISPLAY_ANGER); + me->SetReactState(REACT_AGGRESSIVE); + + events.Reset(); + + bThreeFaceAchievement = true; + uiMirroredSoulTarget = 0; + + if (pInstance) + pInstance->SetData(DATA_DEVOURER_EVENT, NOT_STARTED); + } + + void EnterCombat(Unit* /*who*/) + { + if (pInstance) + pInstance->SetData(DATA_DEVOURER_EVENT, IN_PROGRESS); + + DoScriptText(RAND(SAY_FACE_ANGER_AGGRO,SAY_FACE_DESIRE_AGGRO), me); + + events.ScheduleEvent(EVENT_PHANTOM_BLAST, 5000); + events.ScheduleEvent(EVENT_MIRRORED_SOUL, 8000); + events.ScheduleEvent(EVENT_WELL_OF_SOULS, 30000); + events.ScheduleEvent(EVENT_UNLEASHED_SOULS, 20000); + events.ScheduleEvent(EVENT_WAILING_SOULS, urand(60000,70000)); + } + + void DamageTaken(Unit * /*pDoneBy*/, uint32 &uiDamage) + { + if (uiMirroredSoulTarget && me->HasAura(SPELL_MIRRORED_SOUL)) + { + if (Player *pPlayer = Unit::GetPlayer(uiMirroredSoulTarget)) + { + if (Aura *pAura = pPlayer->GetAura(SPELL_MIRRORED_SOUL)) + { + int32 mirrorDamage = (uiDamage * 45)/100; + me->CastCustomSpell(pPlayer, 69034, &mirrorDamage, 0, 0, true); +// me->DealDamage(pPlayer, (uiDamage * 45)/100, 0, SPELL_DIRECT_DAMAGE, SPELL_SCHOOL_MASK_SHADOW); + } + else + uiMirroredSoulTarget = 0; + } + } + } + + void KilledUnit(Unit * /*victim*/) + { + DoScriptText(RAND(SAY_FACE_ANGER_SLAY_1,SAY_FACE_SORROW_SLAY_1,SAY_FACE_DESIRE_SLAY_1, + SAY_FACE_ANGER_SLAY_2,SAY_FACE_SORROW_SLAY_2,SAY_FACE_DESIRE_SLAY_2), me); + } + + void JustDied(Unit* /*killer*/) + { + Position spawnPoint = { 5618.139, 2451.873, 705.854 }; + + DoScriptText(RAND(SAY_FACE_SORROW_DEATH,SAY_FACE_DESIRE_DEATH), me); + + if (pInstance) + { + pInstance->SetData(DATA_DEVOURER_EVENT, DONE); + + if (bThreeFaceAchievement && IsHeroic()) + pInstance->DoCompleteAchievement(ACHIEV_THREE_FACED); + + int32 entryIndex; + if (pInstance->GetData(DATA_TEAM_IN_INSTANCE) == TEAM_ALLIANCE) + entryIndex = 0; + else + entryIndex = 1; + + for (int8 i = 0; outroPositions[i].entry[entryIndex] != 0; ++i) + { + if (Creature *pSummon = me->SummonCreature(outroPositions[i].entry[entryIndex], spawnPoint, TEMPSUMMON_DEAD_DESPAWN)) + { + pSummon->GetMotionMaster()->MovePoint(0, outroPositions[i].movePosition); + + if (pSummon->GetEntry() == NPC_JAINA_PART2) + DoScriptText(SAY_JAINA_OUTRO, pSummon); + else if (pSummon->GetEntry() == NPC_SYLVANAS_PART2) + DoScriptText(SAY_SYLVANAS_OUTRO, pSummon); + } + } + } + } + + void SpellHitTarget(Unit* /*pTarget*/, const SpellEntry *pSpell) + { + if (pSpell->Id == H_SPELL_PHANTOM_BLAST) + bThreeFaceAchievement = false; + } + + void UpdateAI(const uint32 diff) + { + // Return since we have no target + if (!UpdateVictim()) + return; + + events.Update(diff); + + if (me->hasUnitState(UNIT_STAT_CASTING)) + return; + + while (uint32 eventId = events.ExecuteEvent()) + { + switch(eventId) + { + case EVENT_PHANTOM_BLAST: + if (Unit *pTarget = SelectUnit(SELECT_TARGET_TOPAGGRO, 0)) + DoCast(pTarget, SPELL_PHANTOM_BLAST); + events.ScheduleEvent(EVENT_PHANTOM_BLAST, 5000); + break; + case EVENT_MIRRORED_SOUL: + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 0, true)) + { + uiMirroredSoulTarget = pTarget->GetGUID(); + DoCast(pTarget, SPELL_MIRRORED_SOUL); + DoScriptText(EMOTE_MIRRORED_SOUL, me); + } + events.ScheduleEvent(EVENT_MIRRORED_SOUL, urand(15000,30000)); + break; + case EVENT_WELL_OF_SOULS: + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, SPELL_WELL_OF_SOULS); + events.ScheduleEvent(EVENT_WELL_OF_SOULS, 20000); + break; + case EVENT_UNLEASHED_SOULS: + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, SPELL_UNLEASHED_SOULS); + me->SetDisplayId(DISPLAY_SORROW); + DoScriptText(RAND(SAY_FACE_ANGER_UNLEASH_SOUL,SAY_FACE_SORROW_UNLEASH_SOUL,SAY_FACE_DESIRE_UNLEASH_SOUL), me); + DoScriptText(EMOTE_UNLEASH_SOUL, me); + events.ScheduleEvent(EVENT_UNLEASHED_SOULS, 30000); + events.ScheduleEvent(EVENT_FACE_ANGER, 5000); + break; + case EVENT_FACE_ANGER: + me->SetDisplayId(DISPLAY_ANGER); + break; + + case EVENT_WAILING_SOULS: + me->SetDisplayId(DISPLAY_DESIRE); + DoScriptText(RAND(SAY_FACE_ANGER_WAILING_SOUL,SAY_FACE_DESIRE_WAILING_SOUL), me); + DoScriptText(EMOTE_WAILING_SOUL, me); + DoCast(me, SPELL_WAILING_SOULS_STARTING); + + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + { + me->SetOrientation(me->GetAngle(pTarget)); + DoCast(me, SPELL_WAILING_SOULS_BEAM); + } + + beamAngle = me->GetOrientation(); + + beamAngleDiff = PI/30.0f; // PI/2 in 15 sec = PI/30 per tick + if (RAND(true,false)) + beamAngleDiff = -beamAngleDiff; + + me->InterruptNonMeleeSpells(false); + me->SetReactState(REACT_PASSIVE); + + //Remove any target + me->SetUInt64Value(UNIT_FIELD_TARGET, 0); + + me->GetMotionMaster()->Clear(); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE); + + wailingSoulTick = 15; + events.DelayEvents(18000); // no other events during wailing souls + events.ScheduleEvent(EVENT_WAILING_SOULS_TICK, 3000); // first one after 3 secs. + break; + + case EVENT_WAILING_SOULS_TICK: + beamAngle += beamAngleDiff; + me->SetOrientation(beamAngle); + me->StopMoving(); + + DoCast(me, SPELL_WAILING_SOULS); + + if (--wailingSoulTick) + events.ScheduleEvent(EVENT_WAILING_SOULS_TICK, 1000); + else + { + me->SetReactState(REACT_AGGRESSIVE); + me->SetDisplayId(DISPLAY_ANGER); + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE); + me->GetMotionMaster()->MoveChase(me->getVictim()); + events.ScheduleEvent(EVENT_WAILING_SOULS, urand(60000,70000)); + } + break; + } + } + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_boss_devourer_of_souls(Creature* pCreature) +{ + return new boss_devourer_of_soulsAI(pCreature); +} + +void AddSC_boss_devourer_of_souls() +{ + Script *newscript; + newscript = new Script; + newscript->Name="boss_devourer_of_souls"; + newscript->GetAI = &GetAI_boss_devourer_of_souls; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp new file mode 100644 index 00000000000..5c85da69898 --- /dev/null +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp @@ -0,0 +1,899 @@ +/* Copyright (C) 2006 - 2010 TrinityCore + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "ScriptedPch.h" +#include "forge_of_souls.h" + +enum Spells +{ + //Spiteful Apparition + SPELL_SPITE = 68895, + H_SPELL_SPITE = 70212, + + //Spectral Warden + SPELL_VEIL_OF_SHADOWS = 69633, + SPELL_WAIL_OF_SOULS = 69148, + H_SPELL_WAIL_OF_SOULS = 70210, + + //Soulguard Watchman + SPELL_SHROUD_OF_RUNES = 69056, + SPELL_UNHOLY_RAGE = 69053, + + //Soulguard Reaper + SPELL_FROST_NOVA = 69060, + H_SPELL_FROST_NOVA = 70209, + SPELL_SHADOW_LANCE = 69058, + + //Soulguard Bonecaster + SPELL_BONE_VOLLEY = 69080, + H_SPELL_BONE_VOLLEY = 70206, + SPELL_RAISE_DEAD = 69562, + SPELL_SHIELD_OF_BONES = 69069, + H_SPELL_SHIELD_OF_BONES = 70207, + + //Soulguard Animator + // Raise dead 69562 + SPELL_SHADOW_BOLT = 69068, + H_SPELL_SHADOW_BOLT = 70208, + SPELL_SOUL_SICKNESS = 69131, + SPELL_SOUL_SIPHON = 69128, + + //Soulguard Adept + //Raise dead 69562 + //Shadow Bolt 69068/70208 + SPELL_DRAIN_LIFE = 69066, + H_SPELL_DRAIN_LIFE = 70213, + SPELL_SHADOW_MEND = 69564, + H_SPELL_SHADOW_MEND = 70205, + + //Soul Horror + SPELL_SOUL_STRIKE = 69088, + H_SPELL_SOUL_STRIKE = 70211, +}; + +enum Events +{ + EVENT_NONE, + + // Jaina/Sylvanas Intro + EVENT_INTRO_1, + EVENT_INTRO_2, + EVENT_INTRO_3, + EVENT_INTRO_4, + EVENT_INTRO_5, + EVENT_INTRO_6, + EVENT_INTRO_7, + EVENT_INTRO_8, + + //Spiteful Apparition + EVENT_SPITE, + + //Spectral Warden + EVENT_VEIL_OF_SHADOWS, + EVENT_WAIL_OF_SOULS, + + //Soulguard Watchman + EVENT_SHROUD_OF_RUNES, + EVENT_UNHOLY_RAGE, + + //Soulguard Reaper + EVENT_FROST_NOVA, + EVENT_SHADOW_LANCE, + + //Soulguard Bonecaster + EVENT_BONE_VOLLEY, + EVENT_RAISE_DEAD, + EVENT_SHIELD_OF_BONES, + + //Soulguard Animator + EVENT_SHADOW_BOLT, + EVENT_SOUL_SICKNESS, + EVENT_SOUL_SIPHON, + + //Soulguard Adept + EVENT_DRAIN_LIFE, + EVENT_SHADOW_MEND, + + //Soul Horror + EVENT_SOUL_STRIKE, +}; + +/****************************************SYLVANAS************************************/ +#define GOSSIP_SYLVANAS_ITEM "What would you have of me, Banshee Queen?" +#define GOSSIP_JAINA_ITEM "What would you have of me, my lady?" + +enum Yells +{ + SAY_JAINA_INTRO_1 = -1632040, + SAY_JAINA_INTRO_2 = -1632041, + SAY_JAINA_INTRO_3 = -1632042, + SAY_JAINA_INTRO_4 = -1632043, + SAY_JAINA_INTRO_5 = -1632044, + SAY_JAINA_INTRO_6 = -1632045, + SAY_JAINA_INTRO_7 = -1632046, + SAY_JAINA_INTRO_8 = -1632047, + + SAY_SYLVANAS_INTRO_1 = -1632050, + SAY_SYLVANAS_INTRO_2 = -1632051, + SAY_SYLVANAS_INTRO_3 = -1632052, + SAY_SYLVANAS_INTRO_4 = -1632053, + SAY_SYLVANAS_INTRO_5 = -1632054, + SAY_SYLVANAS_INTRO_6 = -1632055, +}; + +enum eSylvanas +{ + GOSSIP_SPEECHINTRO = 13525, + ACTION_INTRO, +}; + +enum Phase +{ + PHASE_NORMAL, + PHASE_INTRO, +}; + +struct npc_sylvanas_fosAI: public ScriptedAI +{ + npc_sylvanas_fosAI(Creature *c) : ScriptedAI(c) + { + pInstance = me->GetInstanceData(); + me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); + } + + ScriptedInstance* pInstance; + + EventMap events; + Phase phase; + + void Reset() + { + events.Reset(); + phase = PHASE_NORMAL; + } + + void DoAction(const int32 actionId) + { + switch(actionId) + { + case ACTION_INTRO: + { + phase = PHASE_INTRO; + me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); + events.Reset(); + events.ScheduleEvent(EVENT_INTRO_1, 1000); + } + } + } + + void UpdateAI(const uint32 diff) + { + if (phase == PHASE_INTRO) + { + if (!pInstance) + return; + + events.Update(diff); + switch(events.ExecuteEvent()) + { + case EVENT_INTRO_1: + DoScriptText(SAY_SYLVANAS_INTRO_1, me); + events.ScheduleEvent(EVENT_INTRO_2, 11500); + break; + + case EVENT_INTRO_2: + DoScriptText(SAY_SYLVANAS_INTRO_2, me); + events.ScheduleEvent(EVENT_INTRO_3, 10500); + break; + + case EVENT_INTRO_3: + DoScriptText(SAY_SYLVANAS_INTRO_3, me); + events.ScheduleEvent(EVENT_INTRO_4, 9500); + break; + + case EVENT_INTRO_4: + DoScriptText(SAY_SYLVANAS_INTRO_4, me); + events.ScheduleEvent(EVENT_INTRO_5, 10500); + break; + + case EVENT_INTRO_5: + DoScriptText(SAY_SYLVANAS_INTRO_5, me); + events.ScheduleEvent(EVENT_INTRO_6, 9500); + break; + + case EVENT_INTRO_6: + DoScriptText(SAY_SYLVANAS_INTRO_6, me); + // End of Intro + phase = PHASE_NORMAL; + break; + } + } + + //Return since we have no target + if (!UpdateVictim()) + return; + + events.Update(diff); + + //if (me->hasUnitState(UNIT_STAT_CASTING)) + // return; + + //while (uint32 eventId = events.ExecuteEvent()) + //{ + // switch(eventId) + // { + // } + //} + + DoMeleeAttackIfReady(); + } +}; + +struct npc_jaina_fosAI: public ScriptedAI +{ + npc_jaina_fosAI(Creature *c) : ScriptedAI(c) + { + pInstance = me->GetInstanceData(); + me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); + } + + ScriptedInstance* pInstance; + + EventMap events; + Phase phase; + + void Reset() + { + events.Reset(); + phase = PHASE_NORMAL; + } + + void DoAction(const int32 actionId) + { + switch(actionId) + { + case ACTION_INTRO: + { + phase = PHASE_INTRO; + me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); + events.Reset(); + events.ScheduleEvent(EVENT_INTRO_1, 1000); + } + } + } + + void UpdateAI(const uint32 diff) + { + if (phase == PHASE_INTRO) + { + if (!pInstance) + return; + + events.Update(diff); + switch(events.ExecuteEvent()) + { + case EVENT_INTRO_1: + DoScriptText(SAY_JAINA_INTRO_1, me); + events.ScheduleEvent(EVENT_INTRO_2, 8000); + break; + + case EVENT_INTRO_2: + DoScriptText(SAY_JAINA_INTRO_2, me); + events.ScheduleEvent(EVENT_INTRO_3, 8500); + break; + + case EVENT_INTRO_3: + DoScriptText(SAY_JAINA_INTRO_3, me); + events.ScheduleEvent(EVENT_INTRO_4, 8000); + break; + + case EVENT_INTRO_4: + DoScriptText(SAY_JAINA_INTRO_4, me); + events.ScheduleEvent(EVENT_INTRO_5, 10000); + break; + + case EVENT_INTRO_5: + DoScriptText(SAY_JAINA_INTRO_5, me); + events.ScheduleEvent(EVENT_INTRO_6, 8000); + break; + + case EVENT_INTRO_6: + DoScriptText(SAY_JAINA_INTRO_6, me); + events.ScheduleEvent(EVENT_INTRO_7, 12000); + break; + + case EVENT_INTRO_7: + DoScriptText(SAY_JAINA_INTRO_7, me); + events.ScheduleEvent(EVENT_INTRO_8, 8000); + break; + + case EVENT_INTRO_8: + DoScriptText(SAY_JAINA_INTRO_8, me); + // End of Intro + phase = PHASE_NORMAL; + break; + } + } + + //Return since we have no target + if (!UpdateVictim()) + return; + + events.Update(diff); + + //if (me->hasUnitState(UNIT_STAT_CASTING)) + // return; + + //while (uint32 eventId = events.ExecuteEvent()) + //{ + // switch(eventId) + // { + // } + //} + + DoMeleeAttackIfReady(); + } +}; + +bool GossipHello_npc_jaina_or_slyvanas_fos(Player* pPlayer, Creature* pCreature) +{ + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); + + if (pCreature->GetEntry() == NPC_JAINA_PART1) + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_JAINA_ITEM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); + else + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SYLVANAS_ITEM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); + + pPlayer->SEND_GOSSIP_MENU(DEFAULT_GOSSIP_MESSAGE, pCreature->GetGUID()); + return true; +} + +bool GossipSelect_npc_jaina_or_slyvanas_fos(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) +{ + switch(uiAction) + { + case GOSSIP_ACTION_INFO_DEF+1: + pPlayer->CLOSE_GOSSIP_MENU(); + + if (pCreature->AI()) + pCreature->AI()->DoAction(ACTION_INTRO); + break; + } + + return true; +} + +struct mob_spiteful_apparitionAI: public ScriptedAI +{ + mob_spiteful_apparitionAI(Creature *c) : ScriptedAI(c) + { + } + + EventMap events; + + void Reset() + { + events.Reset(); + } + + void EnterCombat(Unit* /*who*/) + { + events.ScheduleEvent(EVENT_SPITE, 8000); + } + + void UpdateAI(const uint32 diff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + events.Update(diff); + + if (me->hasUnitState(UNIT_STAT_CASTING)) + return; + + while (uint32 eventId = events.ExecuteEvent()) + { + switch(eventId) + { + case EVENT_SPITE: + DoCast(me->getVictim(), SPELL_SPITE); + events.RescheduleEvent(EVENT_SPITE, 8000); + return; + } + } + + DoMeleeAttackIfReady(); + } +}; + +struct mob_spectral_wardenAI: public ScriptedAI +{ + mob_spectral_wardenAI(Creature *c) : ScriptedAI(c) + { + } + + EventMap events; + + void Reset() + { + events.Reset(); + } + + void EnterCombat(Unit* /*who*/) + { + events.ScheduleEvent(EVENT_VEIL_OF_SHADOWS, 5000); + events.ScheduleEvent(EVENT_WAIL_OF_SOULS, 10000); + } + + void UpdateAI(const uint32 diff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + events.Update(diff); + + if (me->hasUnitState(UNIT_STAT_CASTING)) + return; + + while (uint32 eventId = events.ExecuteEvent()) + { + switch(eventId) + { + case EVENT_VEIL_OF_SHADOWS: + DoCast(me->getVictim(), SPELL_VEIL_OF_SHADOWS); + events.RescheduleEvent(EVENT_VEIL_OF_SHADOWS, 10000); + return; + case EVENT_WAIL_OF_SOULS: + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, SPELL_WAIL_OF_SOULS); + events.RescheduleEvent(EVENT_WAIL_OF_SOULS, 5000); + return; + } + } + DoMeleeAttackIfReady(); + } +}; + +struct mob_soulguard_watchmanAI: public ScriptedAI +{ + mob_soulguard_watchmanAI(Creature *c) : ScriptedAI(c) + { + } + + EventMap events; + + void Reset() + { + events.Reset(); + } + + void EnterCombat(Unit* /*who*/) + { + events.ScheduleEvent(EVENT_SHROUD_OF_RUNES, 1000); + events.ScheduleEvent(EVENT_UNHOLY_RAGE, 1000); + } + + void UpdateAI(const uint32 diff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + events.Update(diff); + + if (me->hasUnitState(UNIT_STAT_CASTING)) + return; + + while (uint32 eventId = events.ExecuteEvent()) + { + switch(eventId) + { + case EVENT_SHROUD_OF_RUNES: + DoCast(me, SPELL_SHROUD_OF_RUNES); + events.RescheduleEvent(EVENT_SHROUD_OF_RUNES, 5000); + return; + case EVENT_UNHOLY_RAGE: + DoCast(me, SPELL_UNHOLY_RAGE); + events.RescheduleEvent(EVENT_UNHOLY_RAGE, 99999); + return; + } + } + DoMeleeAttackIfReady(); + } +}; + +struct mob_soulguard_reaperAI: public ScriptedAI +{ + mob_soulguard_reaperAI(Creature *c) : ScriptedAI(c) + { + } + + EventMap events; + + void Reset() + { + events.Reset(); + } + + void EnterCombat(Unit* /*who*/) + { + events.ScheduleEvent(EVENT_FROST_NOVA, 8000); + events.ScheduleEvent(EVENT_SHADOW_LANCE, 5000); + } + + void UpdateAI(const uint32 diff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + events.Update(diff); + + if (me->hasUnitState(UNIT_STAT_CASTING)) + return; + + while (uint32 eventId = events.ExecuteEvent()) + { + switch(eventId) + { + case EVENT_FROST_NOVA: + DoCast(me, SPELL_FROST_NOVA); + events.RescheduleEvent(EVENT_FROST_NOVA, 9600); + return; + case EVENT_SHADOW_LANCE: + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, SPELL_SHADOW_LANCE); + events.RescheduleEvent(EVENT_SHADOW_LANCE, 8000); + return; + } + } + + DoMeleeAttackIfReady(); + } +}; + +struct mob_soulguard_bonecasterAI: public ScriptedAI +{ + mob_soulguard_bonecasterAI(Creature *c) : ScriptedAI(c) + { + } + + EventMap events; + + void Reset() + { + events.Reset(); + } + + void EnterCombat(Unit* /*who*/) + { + events.ScheduleEvent(EVENT_BONE_VOLLEY, 6000); + events.ScheduleEvent(EVENT_RAISE_DEAD, 25000); + events.ScheduleEvent(EVENT_SHIELD_OF_BONES, 6000); + } + + void UpdateAI(const uint32 diff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + events.Update(diff); + + if (me->hasUnitState(UNIT_STAT_CASTING)) + return; + + while (uint32 eventId = events.ExecuteEvent()) + { + switch(eventId) + { + case EVENT_BONE_VOLLEY: + DoCastAOE(SPELL_BONE_VOLLEY); + events.RescheduleEvent(EVENT_BONE_VOLLEY, 7000); + return; + case EVENT_RAISE_DEAD: + DoCast(me, SPELL_RAISE_DEAD); + events.RescheduleEvent(EVENT_RAISE_DEAD, 25000); + return; + case EVENT_SHIELD_OF_BONES: + DoCast(me, SPELL_SHIELD_OF_BONES); + events.RescheduleEvent(EVENT_SHIELD_OF_BONES, 8000); + return; + } + } + + DoMeleeAttackIfReady(); + } +}; + +struct mob_soulguard_animatorAI: public ScriptedAI +{ + mob_soulguard_animatorAI(Creature *c) : ScriptedAI(c) + { + } + + EventMap events; + + void Reset() + { + events.Reset(); + } + + void EnterCombat(Unit* /*who*/) + { + events.ScheduleEvent(EVENT_RAISE_DEAD, 25000); + events.ScheduleEvent(EVENT_SHADOW_BOLT, 5000); + events.ScheduleEvent(EVENT_SOUL_SICKNESS, 8000); + events.ScheduleEvent(EVENT_SOUL_SIPHON, 10000); + } + + void UpdateAI(const uint32 diff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + events.Update(diff); + + if (me->hasUnitState(UNIT_STAT_CASTING)) + return; + + while (uint32 eventId = events.ExecuteEvent()) + { + switch(eventId) + { + case EVENT_RAISE_DEAD: + DoCast(me, SPELL_RAISE_DEAD); + events.RescheduleEvent(EVENT_RAISE_DEAD, 25000); + return; + case EVENT_SHADOW_BOLT: + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, SPELL_SHADOW_BOLT); + events.RescheduleEvent(EVENT_SHADOW_BOLT, 5000); + return; + case EVENT_SOUL_SICKNESS: + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, SPELL_SOUL_SICKNESS); + events.RescheduleEvent(EVENT_SOUL_SICKNESS, 10000); + return; + case EVENT_SOUL_SIPHON: + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, SPELL_SOUL_SIPHON); + events.RescheduleEvent(EVENT_SOUL_SIPHON, 8000); + return; + } + } + + DoMeleeAttackIfReady(); + } +}; + +struct mob_soulguard_adeptAI: public ScriptedAI +{ + mob_soulguard_adeptAI(Creature *c) : ScriptedAI(c) + { + } + + EventMap events; + + void Reset() + { + events.Reset(); + } + + void EnterCombat(Unit* /*who*/) + { + events.ScheduleEvent(EVENT_RAISE_DEAD, 25000); + events.ScheduleEvent(EVENT_SHADOW_BOLT, 8000); + events.ScheduleEvent(EVENT_DRAIN_LIFE, 7000); + events.ScheduleEvent(EVENT_SHADOW_MEND, 35000); + } + + void UpdateAI(const uint32 diff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + events.Update(diff); + + if (me->hasUnitState(UNIT_STAT_CASTING)) + return; + + while (uint32 eventId = events.ExecuteEvent()) + { + switch(eventId) + { + case EVENT_RAISE_DEAD: + DoCast(me, SPELL_RAISE_DEAD); + events.RescheduleEvent(EVENT_RAISE_DEAD, 25000); + return; + case EVENT_SHADOW_BOLT: + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, SPELL_SHADOW_BOLT); + events.RescheduleEvent(EVENT_SHADOW_BOLT, 4000); + return; + case EVENT_DRAIN_LIFE: + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, SPELL_DRAIN_LIFE); + events.RescheduleEvent(EVENT_DRAIN_LIFE, 9000); + return; + case EVENT_SHADOW_MEND: + DoCast(me, SPELL_SHADOW_MEND); + events.RescheduleEvent(EVENT_SHADOW_MEND, 20000); + return; + } + } + + DoMeleeAttackIfReady(); + } +}; + +struct mob_soul_horrorAI: public ScriptedAI +{ + mob_soul_horrorAI(Creature *c) : ScriptedAI(c) + { + } + + EventMap events; + + void Reset() + { + events.Reset(); + } + + void EnterCombat(Unit* /*who*/) + { + events.ScheduleEvent(EVENT_SOUL_STRIKE, 6000); + } + + void UpdateAI(const uint32 diff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + events.Update(diff); + + if (me->hasUnitState(UNIT_STAT_CASTING)) + return; + + while (uint32 eventId = events.ExecuteEvent()) + { + switch(eventId) + { + case EVENT_SOUL_STRIKE: + DoCast(me->getVictim(), SPELL_SOUL_STRIKE); + events.RescheduleEvent(EVENT_SOUL_STRIKE, 8000); + return; + } + } + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_npc_jaina_fosAI(Creature* pCreature) +{ + return new npc_jaina_fosAI(pCreature); +}; + +CreatureAI* GetAI_npc_sylvanas_fosAI(Creature* pCreature) +{ + return new npc_sylvanas_fosAI(pCreature); +}; + +CreatureAI* GetAI_mob_spiteful_apparitionAI(Creature* pCreature) +{ + return new mob_spiteful_apparitionAI(pCreature); +} + +CreatureAI* GetAI_mob_spectral_wardenAI(Creature* pCreature) +{ + return new mob_spectral_wardenAI(pCreature); +} + +CreatureAI* GetAI_mob_soulguard_watchmanAI(Creature* pCreature) +{ + return new mob_soulguard_watchmanAI(pCreature); +} + +CreatureAI* GetAI_mob_soulguard_reaperAI(Creature* pCreature) +{ + return new mob_soulguard_reaperAI(pCreature); +} + +CreatureAI* GetAI_mob_soulguard_bonecasterAI(Creature* pCreature) +{ + return new mob_soulguard_bonecasterAI(pCreature); +} + +CreatureAI* GetAI_mob_soulguard_animatorAI(Creature* pCreature) +{ + return new mob_soulguard_animatorAI(pCreature); +} + +CreatureAI* GetAI_mob_soulguard_adeptAI(Creature* pCreature) +{ + return new mob_soulguard_adeptAI(pCreature); +} + +CreatureAI* GetAI_mob_soul_horrorAI(Creature* pCreature) +{ + return new mob_soul_horrorAI(pCreature); +} + +void AddSC_forge_of_souls() +{ + Script *newscript; + + newscript = new Script; + newscript->Name = "npc_sylvanas_fos"; + newscript->GetAI = &GetAI_npc_sylvanas_fosAI; + newscript->pGossipHello = &GossipHello_npc_jaina_or_slyvanas_fos; + newscript->pGossipSelect = &GossipSelect_npc_jaina_or_slyvanas_fos; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "npc_jaina_fos"; + newscript->GetAI = &GetAI_npc_jaina_fosAI; + newscript->pGossipHello = &GossipHello_npc_jaina_or_slyvanas_fos; + newscript->pGossipSelect = &GossipSelect_npc_jaina_or_slyvanas_fos; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name="mob_spiteful_apparition"; + newscript->GetAI = &GetAI_mob_spiteful_apparitionAI; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name="mob_spectral_warden"; + newscript->GetAI = &GetAI_mob_spectral_wardenAI; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name="mob_soulguard_watchman"; + newscript->GetAI = &GetAI_mob_soulguard_watchmanAI; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name="mob_soulguard_reaper"; + newscript->GetAI = &GetAI_mob_soulguard_reaperAI; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name="mob_soulguard_bonecaster"; + newscript->GetAI = &GetAI_mob_soulguard_bonecasterAI; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name="mob_soulguard_animator"; + newscript->GetAI = &GetAI_mob_soulguard_animatorAI; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name="mob_soulguard_adept"; + newscript->GetAI = &GetAI_mob_soulguard_adeptAI; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name="mob_soul_horror"; + newscript->GetAI = &GetAI_mob_soul_horrorAI; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h new file mode 100644 index 00000000000..e0479eb4d2b --- /dev/null +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h @@ -0,0 +1,52 @@ +/* Copyright (C) 2006 - 2010 TrinityCore + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef DEF_FORGE_OF_SOULS_H +#define DEF_FORGE_OF_SOULS_H + +enum Data +{ + DATA_BRONJAHM_EVENT, + DATA_DEVOURER_EVENT, + DATA_TEAM_IN_INSTANCE, +}; + +enum Data64 +{ + DATA_BRONJAHM, + DATA_DEVOURER, +}; + +enum Creatures +{ + CREATURE_BRONJAHM = 36497, + CREATURE_DEVOURER = 36502, + + NPC_SYLVANAS_PART1 = 37596, + NPC_SYLVANAS_PART2 = 38161, + NPC_JAINA_PART1 = 37597, + NPC_JAINA_PART2 = 38160, + NPC_KALIRA = 37583, + NPC_ELANDRA = 37774, + NPC_LORALEN = 37779, + NPC_KORELN = 37582, + NPC_CHAMPION_1_HORDE = 37584, + NPC_CHAMPION_2_HORDE = 37587, + NPC_CHAMPION_3_HORDE = 37588, + NPC_CHAMPION_1_ALLIANCE = 37496, + NPC_CHAMPION_2_ALLIANCE = 37497, +}; +#endif diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp new file mode 100644 index 00000000000..67a6cdb4579 --- /dev/null +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp @@ -0,0 +1,168 @@ +/* Copyright (C) 2006 - 2010 TrinityCore + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "ScriptedPch.h" +#include "forge_of_souls.h" + +#define MAX_ENCOUNTER 2 + +/* Forge of Souls encounters: +0- Bronjahm, The Godfather of Souls +1- The Devourer of Souls +*/ + +struct instance_forge_of_souls : public ScriptedInstance +{ + instance_forge_of_souls(Map* pMap) : ScriptedInstance(pMap) {}; + + uint64 uiBronjahm; + uint64 uiDevourer; + + uint32 uiEncounter[MAX_ENCOUNTER]; + uint32 uiTeamInInstance; + + void Initialize() + { + uiBronjahm = 0; + uiDevourer = 0; + + uiTeamInInstance = 0; + + for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) + uiEncounter[i] = NOT_STARTED; + } + + bool IsEncounterInProgress() const + { + for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) + if (uiEncounter[i] == IN_PROGRESS) return true; + + return false; + } + + void OnCreatureCreate(Creature* pCreature, bool /*add*/) + { + Map::PlayerList const &players = instance->GetPlayers(); + + if (!players.isEmpty()) + if (Player* pPlayer = players.begin()->getSource()) + uiTeamInInstance = pPlayer->GetTeam(); + + switch(pCreature->GetEntry()) + { + case CREATURE_BRONJAHM: + uiBronjahm = pCreature->GetGUID(); + break; + case CREATURE_DEVOURER: + uiDevourer = pCreature->GetGUID(); + break; + } + } + + void SetData(uint32 type, uint32 data) + { + switch(type) + { + case DATA_BRONJAHM_EVENT: + uiEncounter[0] = data; + break; + case DATA_DEVOURER_EVENT: + uiEncounter[1] = data; + break; + } + + if (data == DONE) + SaveToDB(); + } + + uint32 GetData(uint32 type) + { + switch(type) + { + case DATA_BRONJAHM_EVENT: return uiEncounter[0]; + case DATA_DEVOURER_EVENT: return uiEncounter[1]; + case DATA_TEAM_IN_INSTANCE: return uiTeamInInstance; + } + + return 0; + } + + uint64 GetData64(uint32 identifier) + { + switch(identifier) + { + case DATA_BRONJAHM: return uiBronjahm; + case DATA_DEVOURER: return uiBronjahm; + } + + return 0; + } + + std::string GetSaveData() + { + OUT_SAVE_INST_DATA; + + std::ostringstream saveStream; + saveStream << "F S " << uiEncounter[0] << " " << uiEncounter[1]; + + OUT_SAVE_INST_DATA_COMPLETE; + return saveStream.str(); + } + + void Load(const char* in) + { + if (!in) + { + OUT_LOAD_INST_DATA_FAIL; + return; + } + + OUT_LOAD_INST_DATA(in); + + char dataHead1, dataHead2; + uint16 data0, data1; + + std::istringstream loadStream(in); + loadStream >> dataHead1 >> dataHead2 >> data0 >> data1; + + if (dataHead1 == 'F' && dataHead2 == 'S') + { + uiEncounter[0] = data0; + uiEncounter[1] = data1; + + for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) + if (uiEncounter[i] == IN_PROGRESS) + uiEncounter[i] = NOT_STARTED; + + } else OUT_LOAD_INST_DATA_FAIL; + + OUT_LOAD_INST_DATA_COMPLETE; + } +}; + +InstanceData* GetInstanceData_instance_forge_of_souls(Map* pMap) +{ + return new instance_forge_of_souls(pMap); +} + +void AddSC_instance_forge_of_souls() +{ + Script *newscript; + newscript = new Script; + newscript->Name = "instance_forge_of_souls"; + newscript->GetInstanceData = &GetInstanceData_instance_forge_of_souls; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp new file mode 100644 index 00000000000..c9978faca6e --- /dev/null +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp @@ -0,0 +1,142 @@ +/* Copyright (C) 2006 - 2010 TrinityCore + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "ScriptedPch.h" +#include "halls_of_reflection.h" + +enum Yells +{ + SAY_AGGRO = -1668050, + SAY_SLAY_1 = -1668051, + SAY_SLAY_2 = -1668052, + SAY_DEATH = -1668053, + SAY_IMPENDING_DESPAIR = -1668054, + SAY_DEFILING_HORROR = -1668055, +}; + +enum Spells +{ + SPELL_QUIVERING_STRIKE = 72422, + SPELL_IMPENDING_DESPAIR = 72426, + SPELL_DEFILING_HORROR = 72435, + SPELL_HOPELESSNESS = 72395, + H_SPELL_HOPELESSNESS = 72390, // TODO: not in dbc. Add in DB. +}; + +enum Events +{ + EVENT_NONE, + EVENT_QUIVERING_STRIKE, + EVENT_IMPENDING_DESPAIR, + EVENT_DEFILING_HORROR, +}; + +struct boss_falricAI : public boss_horAI +{ + boss_falricAI(Creature *pCreature) : boss_horAI(pCreature) {} + + uint8 uiHopelessnessCount; + + void Reset() + { + boss_horAI::Reset(); + + uiHopelessnessCount = 0; + + if (pInstance) + pInstance->SetData(DATA_FALRIC_EVENT, NOT_STARTED); + } + + void EnterCombat(Unit* who) + { + DoScriptText(SAY_AGGRO, me); + if (pInstance) + pInstance->SetData(DATA_FALRIC_EVENT, IN_PROGRESS); + + events.ScheduleEvent(EVENT_QUIVERING_STRIKE, 23000); + events.ScheduleEvent(EVENT_IMPENDING_DESPAIR, 9000); + events.ScheduleEvent(EVENT_DEFILING_HORROR, urand(25000,45000)); // TODO adjust timer. + } + + void JustDied(Unit* killer) + { + DoScriptText(SAY_DEATH, me); + + if (pInstance) + pInstance->SetData(DATA_FALRIC_EVENT, DONE); + } + + void KilledUnit(Unit *victim) + { + DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + } + + void UpdateAI(const uint32 diff) + { + // Return since we have no target + if (!UpdateVictim()) + return; + + events.Update(diff); + + if (me->hasUnitState(UNIT_STAT_CASTING)) + return; + + switch (events.ExecuteEvent()) + { + case EVENT_QUIVERING_STRIKE: + DoCast(SPELL_QUIVERING_STRIKE); + events.ScheduleEvent(EVENT_QUIVERING_STRIKE, 10000); + break; + case EVENT_IMPENDING_DESPAIR: + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM)) + { + DoScriptText(SAY_IMPENDING_DESPAIR, me); + DoCast(pTarget, SPELL_IMPENDING_DESPAIR); + } + events.ScheduleEvent(EVENT_IMPENDING_DESPAIR, 13000); + break; + case EVENT_DEFILING_HORROR: + DoCast(SPELL_DEFILING_HORROR); + events.ScheduleEvent(EVENT_DEFILING_HORROR, urand(25000,45000)); // TODO adjust timer. + break; + } + + if ((uiHopelessnessCount < 1 && HealthBelowPct(66)) + || (uiHopelessnessCount < 2 && HealthBelowPct(33)) + || (uiHopelessnessCount < 3 && HealthBelowPct(10))) + { + uiHopelessnessCount++; + DoCast(DUNGEON_MODE(SPELL_HOPELESSNESS,H_SPELL_HOPELESSNESS)); + } + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_boss_falric(Creature* pCreature) +{ + return new boss_falricAI(pCreature); +} + +void AddSC_boss_falric() +{ + Script *newscript; + newscript = new Script; + newscript->Name="boss_falric"; + newscript->GetAI = &GetAI_boss_falric; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp new file mode 100644 index 00000000000..95fb2737ce9 --- /dev/null +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp @@ -0,0 +1,133 @@ +/* Copyright (C) 2006 - 2010 TrinityCore + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "ScriptedPch.h" +#include "halls_of_reflection.h" + +enum Yells +{ + SAY_AGGRO = -1668060, + SAY_SLAY_1 = -1668061, + SAY_SLAY_2 = -1668062, + SAY_DEATH = -1668063, + SAY_CORRUPTED_FLESH_1 = -1668064, + SAY_CORRUPTED_FLESH_2 = -1668065, +}; + +enum Spells +{ + SPELL_OBLITERATE = 72360, + SPELL_WELL_OF_CORRUPTION = 72362, + SPELL_CORRUPTED_FLESH = 72363, + SPELL_SHARED_SUFFERING = 72368, +}; + +enum Events +{ + EVENT_NONE, + EVENT_OBLITERATE, + EVENT_WELL_OF_CORRUPTION, + EVENT_CORRUPTED_FLESH, + EVENT_SHARED_SUFFERING, +}; + +struct boss_marwynAI : public boss_horAI +{ + boss_marwynAI(Creature *pCreature) : boss_horAI(pCreature) {} + + void Reset() + { + boss_horAI::Reset(); + + if (pInstance) + pInstance->SetData(DATA_MARWYN_EVENT, NOT_STARTED); + } + + void EnterCombat(Unit* who) + { + DoScriptText(SAY_AGGRO, me); + if (pInstance) + pInstance->SetData(DATA_MARWYN_EVENT, IN_PROGRESS); + + events.ScheduleEvent(EVENT_OBLITERATE, 30000); // TODO Check timer + events.ScheduleEvent(EVENT_WELL_OF_CORRUPTION, 13000); + events.ScheduleEvent(EVENT_CORRUPTED_FLESH, 20000); + events.ScheduleEvent(EVENT_SHARED_SUFFERING, 20000); // TODO Check timer + } + + void JustDied(Unit* killer) + { + DoScriptText(SAY_DEATH, me); + + if (pInstance) + pInstance->SetData(DATA_MARWYN_EVENT, DONE); + } + + void KilledUnit(Unit *victim) + { + DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + } + + void UpdateAI(const uint32 diff) + { + // Return since we have no target + if (!UpdateVictim()) + return; + + events.Update(diff); + + if (me->hasUnitState(UNIT_STAT_CASTING)) + return; + + switch (events.ExecuteEvent()) + { + case EVENT_OBLITERATE: + DoCast(SPELL_OBLITERATE); + events.ScheduleEvent(EVENT_OBLITERATE, 30000); + break; + case EVENT_WELL_OF_CORRUPTION: + DoCast(SPELL_WELL_OF_CORRUPTION); + events.ScheduleEvent(EVENT_WELL_OF_CORRUPTION, 13000); + break; + case EVENT_CORRUPTED_FLESH: + DoScriptText(RAND(SAY_CORRUPTED_FLESH_1,SAY_CORRUPTED_FLESH_2), me); + DoCast(SPELL_CORRUPTED_FLESH); + events.ScheduleEvent(EVENT_CORRUPTED_FLESH, 20000); + break; + case EVENT_SHARED_SUFFERING: + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM)) + DoCast(pTarget, SPELL_SHARED_SUFFERING); + events.ScheduleEvent(EVENT_SHARED_SUFFERING, 20000); + break; + } + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_boss_marwyn(Creature* pCreature) +{ + return new boss_marwynAI(pCreature); +} + +void AddSC_boss_marwyn() +{ + Script *newscript; + newscript = new Script; + newscript->Name="boss_marwyn"; + newscript->GetAI = &GetAI_boss_marwyn; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp new file mode 100644 index 00000000000..fb3d3d5d752 --- /dev/null +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp @@ -0,0 +1,1022 @@ +/* Copyright (C) 2006 - 2010 TrinityCore + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "ScriptedPch.h" +#include "halls_of_reflection.h" + +enum Yells +{ + SAY_JAINA_INTRO_1 = -1668001, + SAY_JAINA_INTRO_2 = -1668002, + SAY_JAINA_INTRO_3 = -1668003, + SAY_JAINA_INTRO_4 = -1668004, + SAY_UTHER_INTRO_A2_1 = -1668005, + SAY_JAINA_INTRO_5 = -1668006, + SAY_UTHER_INTRO_A2_2 = -1668007, + SAY_JAINA_INTRO_6 = -1668008, + SAY_UTHER_INTRO_A2_3 = -1668009, + SAY_JAINA_INTRO_7 = -1668010, + SAY_UTHER_INTRO_A2_4 = -1668011, + SAY_JAINA_INTRO_8 = -1668012, + SAY_UTHER_INTRO_A2_5 = -1668013, + SAY_JAINA_INTRO_9 = -1668014, + SAY_UTHER_INTRO_A2_6 = -1668015, + SAY_UTHER_INTRO_A2_7 = -1668016, + SAY_JAINA_INTRO_10 = -1668017, + SAY_UTHER_INTRO_A2_8 = -1668018, + SAY_JAINA_INTRO_11 = -1668019, + SAY_UTHER_INTRO_A2_9 = -1668020, + + SAY_SYLVANAS_INTRO_1 = -1668021, + SAY_SYLVANAS_INTRO_2 = -1668022, + SAY_SYLVANAS_INTRO_3 = -1668023, + SAY_UTHER_INTRO_H2_1 = -1668024, + SAY_SYLVANAS_INTRO_4 = -1668025, + SAY_UTHER_INTRO_H2_2 = -1668026, + SAY_SYLVANAS_INTRO_5 = -1668027, + SAY_UTHER_INTRO_H2_3 = -1668028, + SAY_SYLVANAS_INTRO_6 = -1668029, + SAY_UTHER_INTRO_H2_4 = -1668030, + SAY_SYLVANAS_INTRO_7 = -1668031, + SAY_UTHER_INTRO_H2_5 = -1668032, + SAY_UTHER_INTRO_H2_6 = -1668033, + SAY_SYLVANAS_INTRO_8 = -1668034, + SAY_UTHER_INTRO_H2_7 = -1668035, + + SAY_LK_INTRO_1 = -1668036, + SAY_LK_INTRO_2 = -1668037, + SAY_LK_INTRO_3 = -1668038, + SAY_FALRIC_INTRO_1 = -1668039, + SAY_MARWYN_INTRO_1 = -1668040, + SAY_FALRIC_INTRO_2 = -1668041, + + SAY_JAINA_INTRO_END = -1668042, + SAY_SYLVANAS_INTRO_END = -1668043, +}; + +enum Events +{ + EVENT_NONE, + + EVENT_START_INTRO, + EVENT_SKIP_INTRO, + + EVENT_INTRO_A2_1, + EVENT_INTRO_A2_2, + EVENT_INTRO_A2_3, + EVENT_INTRO_A2_4, + EVENT_INTRO_A2_5, + EVENT_INTRO_A2_6, + EVENT_INTRO_A2_7, + EVENT_INTRO_A2_8, + EVENT_INTRO_A2_9, + EVENT_INTRO_A2_10, + EVENT_INTRO_A2_11, + EVENT_INTRO_A2_12, + EVENT_INTRO_A2_13, + EVENT_INTRO_A2_14, + EVENT_INTRO_A2_15, + EVENT_INTRO_A2_16, + EVENT_INTRO_A2_17, + EVENT_INTRO_A2_18, + EVENT_INTRO_A2_19, + + EVENT_INTRO_H2_1, + EVENT_INTRO_H2_2, + EVENT_INTRO_H2_3, + EVENT_INTRO_H2_4, + EVENT_INTRO_H2_5, + EVENT_INTRO_H2_6, + EVENT_INTRO_H2_7, + EVENT_INTRO_H2_8, + EVENT_INTRO_H2_9, + EVENT_INTRO_H2_10, + EVENT_INTRO_H2_11, + EVENT_INTRO_H2_12, + EVENT_INTRO_H2_13, + EVENT_INTRO_H2_14, + EVENT_INTRO_H2_15, + + EVENT_INTRO_LK_1, + EVENT_INTRO_LK_2, + EVENT_INTRO_LK_3, + EVENT_INTRO_LK_4, + EVENT_INTRO_LK_5, + EVENT_INTRO_LK_6, + EVENT_INTRO_LK_7, + EVENT_INTRO_LK_8, + EVENT_INTRO_LK_9, + + EVENT_INTRO_END, +}; + +enum eEnum +{ + ACTION_START_INTRO, + ACTION_SKIP_INTRO, + + QUEST_DELIVRANCE_FROM_THE_PIT_A2 = 24710, + QUEST_DELIVRANCE_FROM_THE_PIT_H2 = 24712, + QUEST_WRATH_OF_THE_LICH_KING_A2 = 24500, + QUEST_WRATH_OF_THE_LICH_KING_H2 = 24802, +}; + +static Position HallsofReflectionLocs[]= +{ + {5283.234863, 1990.946777, 707.695679, 0.929097}, // 2 Loralen Follows + {5408.031250, 2102.918213, 707.695251, 0.792756}, // 9 Sylvanas Follows + {5401.866699, 2110.837402, 707.695251, 0.800610}, // 10 Loralen follows +}; + +static Position SpawnPos = {5262.540527, 1949.693726, 707.695007, 0.808736}; // Jaina/Sylvanas Beginning Position +static Position MoveThronePos = {5306.952148, 1998.499023, 709.341431, 1.277278}; // Jaina/Sylvanas walks to throne +static Position UtherSpawnPos = {5308.310059, 2003.857178, 709.341431, 4.650315}; +static Position LichKingSpawnPos = {5362.917480, 2062.307129, 707.695374, 3.945812}; +static Position LichKingMoveThronePos = {5312.080566, 2009.172119, 709.341431, 3.973301}; // Lich King walks to throne +static Position LichKingMoveAwayPos = {5400.069824, 2102.7131689, 707.69525, 0.843803}; // Lich King walks away + +// AI of Part1: handle the intro till start of gauntlet event. +struct npc_jaina_or_sylvanas_horAI : public ScriptedAI +{ + npc_jaina_or_sylvanas_horAI(Creature *pCreature) : ScriptedAI(pCreature) + { + pInstance = me->GetInstanceData(); + } + + ScriptedInstance* pInstance; + uint64 uiUther; + uint64 uiLichKing; + + EventMap events; + + void Reset() + { + events.Reset(); + + uiUther = 0; + uiLichKing = 0; + + me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); + me->SetStandState(UNIT_STAND_STATE_STAND); + me->SetVisibility(VISIBILITY_ON); + } + + void DoAction(const int32 actionId) + { + switch(actionId) + { + case ACTION_START_INTRO: + events.ScheduleEvent(EVENT_START_INTRO, 0); + break; + case ACTION_SKIP_INTRO: + events.ScheduleEvent(EVENT_SKIP_INTRO, 0); + break; + } + } + + void UpdateAI(const uint32 diff) + { + events.Update(diff); + switch(events.ExecuteEvent()) + { + case EVENT_START_INTRO: + me->GetMotionMaster()->MovePoint(0, MoveThronePos); + // Begining of intro is differents between factions as the speech sequence and timers are differents. + if (pInstance->GetData(DATA_TEAM_IN_INSTANCE) == ALLIANCE) + events.ScheduleEvent(EVENT_INTRO_A2_1, 0); + else + events.ScheduleEvent(EVENT_INTRO_H2_1, 0); + break; + + // A2 Intro Events + case EVENT_INTRO_A2_1: + DoScriptText(SAY_JAINA_INTRO_3, me); + events.ScheduleEvent(EVENT_INTRO_A2_2, 5000); + break; + case EVENT_INTRO_A2_2: + DoScriptText(SAY_JAINA_INTRO_4, me); + events.ScheduleEvent(EVENT_INTRO_A2_3, 10000); + break; + case EVENT_INTRO_A2_3: + // TODO: she's doing some kind of spell casting emote + pInstance->HandleGameObject(pInstance->GetData64(DATA_FROSTMOURNE), true); + events.ScheduleEvent(EVENT_INTRO_A2_4, 10000); + break; + case EVENT_INTRO_A2_4: + // spawn UTHER during speach 2 + if (Creature* pUther = me->SummonCreature(NPC_UTHER, UtherSpawnPos, TEMPSUMMON_MANUAL_DESPAWN)) + { + pUther->GetMotionMaster()->MoveIdle(); + pUther->SetReactState(REACT_PASSIVE); // be sure he will not aggro arthas + uiUther = pUther->GetGUID(); + } + events.ScheduleEvent(EVENT_INTRO_A2_5, 2000); + break; + case EVENT_INTRO_A2_5: + if (Creature* pUther = me->GetCreature(*me, uiUther)) + DoScriptText(SAY_UTHER_INTRO_A2_1, pUther); + events.ScheduleEvent(EVENT_INTRO_A2_6, 3000); + break; + case EVENT_INTRO_A2_6: + DoScriptText(SAY_JAINA_INTRO_5, me); + events.ScheduleEvent(EVENT_INTRO_A2_7, 6000); + break; + case EVENT_INTRO_A2_7: + if (Creature* pUther = me->GetCreature(*me, uiUther)) + DoScriptText(SAY_UTHER_INTRO_A2_2, pUther); + events.ScheduleEvent(EVENT_INTRO_A2_8, 6500); + break; + case EVENT_INTRO_A2_8: + DoScriptText(SAY_JAINA_INTRO_6, me); + events.ScheduleEvent(EVENT_INTRO_A2_9, 2000); + break; + case EVENT_INTRO_A2_9: + if (Creature* pUther = me->GetCreature(*me, uiUther)) + DoScriptText(SAY_UTHER_INTRO_A2_3, pUther); + events.ScheduleEvent(EVENT_INTRO_A2_10, 9000); + break; + case EVENT_INTRO_A2_10: + DoScriptText(SAY_JAINA_INTRO_7, me); + events.ScheduleEvent(EVENT_INTRO_A2_11, 5000); + break; + case EVENT_INTRO_A2_11: + if (Creature* pUther = me->GetCreature(*me, uiUther)) + DoScriptText(SAY_UTHER_INTRO_A2_4, pUther); + events.ScheduleEvent(EVENT_INTRO_A2_12, 11000); + break; + case EVENT_INTRO_A2_12: + DoScriptText(SAY_JAINA_INTRO_8, me); + events.ScheduleEvent(EVENT_INTRO_A2_13, 4000); + break; + case EVENT_INTRO_A2_13: + if (Creature* pUther = me->GetCreature(*me, uiUther)) + DoScriptText(SAY_UTHER_INTRO_A2_5, pUther); + events.ScheduleEvent(EVENT_INTRO_A2_14, 12500); + break; + case EVENT_INTRO_A2_14: + DoScriptText(SAY_JAINA_INTRO_9, me); + events.ScheduleEvent(EVENT_INTRO_A2_15, 10000); + break; + case EVENT_INTRO_A2_15: + if (Creature* pUther = me->GetCreature(*me, uiUther)) + DoScriptText(SAY_UTHER_INTRO_A2_6, pUther); + events.ScheduleEvent(EVENT_INTRO_A2_16, 22000); + break; + case EVENT_INTRO_A2_16: + if (Creature* pUther = me->GetCreature(*me, uiUther)) + DoScriptText(SAY_UTHER_INTRO_A2_7, pUther); + events.ScheduleEvent(EVENT_INTRO_A2_17, 4000); + break; + case EVENT_INTRO_A2_17: + DoScriptText(SAY_JAINA_INTRO_10, me); + events.ScheduleEvent(EVENT_INTRO_A2_18, 2000); + break; + case EVENT_INTRO_A2_18: + if (Creature* pUther = me->GetCreature(*me, uiUther)) + { + pUther->HandleEmoteCommand(EMOTE_ONESHOT_NO); + DoScriptText(SAY_UTHER_INTRO_A2_8, pUther); + } + events.ScheduleEvent(EVENT_INTRO_A2_19, 11000); + break; + case EVENT_INTRO_A2_19: + DoScriptText(SAY_JAINA_INTRO_11, me); + events.ScheduleEvent(EVENT_INTRO_LK_1, 2000); + break; + + // H2 Intro Events + case EVENT_INTRO_H2_1: + DoScriptText(SAY_SYLVANAS_INTRO_1, me); + events.ScheduleEvent(EVENT_INTRO_H2_2, 8000); + break; + case EVENT_INTRO_H2_2: + DoScriptText(SAY_SYLVANAS_INTRO_2, me); + events.ScheduleEvent(EVENT_INTRO_H2_3, 6000); + break; + case EVENT_INTRO_H2_3: + DoScriptText(SAY_SYLVANAS_INTRO_3, me); + // TODO: she's doing some kind of spell casting emote + events.ScheduleEvent(EVENT_INTRO_H2_4, 6000); + break; + case EVENT_INTRO_H2_4: + // spawn UTHER during speach 2 + if (Creature* pUther = me->SummonCreature(NPC_UTHER, UtherSpawnPos, TEMPSUMMON_MANUAL_DESPAWN)) + { + pUther->GetMotionMaster()->MoveIdle(); + pUther->SetReactState(REACT_PASSIVE); // be sure he will not aggro arthas + uiUther = pUther->GetGUID(); + } + events.ScheduleEvent(EVENT_INTRO_H2_5, 2000); + break; + case EVENT_INTRO_H2_5: + if (Creature* pUther = me->GetCreature(*me, uiUther)) + DoScriptText(SAY_UTHER_INTRO_H2_1, pUther); + events.ScheduleEvent(EVENT_INTRO_H2_6, 11000); + break; + case EVENT_INTRO_H2_6: + DoScriptText(SAY_SYLVANAS_INTRO_4, me); + events.ScheduleEvent(EVENT_INTRO_H2_7, 3000); + break; + case EVENT_INTRO_H2_7: + if (Creature* pUther = me->GetCreature(*me, uiUther)) + DoScriptText(SAY_UTHER_INTRO_H2_2, pUther); + events.ScheduleEvent(EVENT_INTRO_H2_8, 6000); + break; + case EVENT_INTRO_H2_8: + DoScriptText(SAY_SYLVANAS_INTRO_5, me); + events.ScheduleEvent(EVENT_INTRO_H2_9, 5000); + break; + case EVENT_INTRO_H2_9: + if (Creature* pUther = me->GetCreature(*me, uiUther)) + DoScriptText(SAY_UTHER_INTRO_H2_3, pUther); + events.ScheduleEvent(EVENT_INTRO_H2_10, 19000); + break; + case EVENT_INTRO_H2_10: + DoScriptText(SAY_SYLVANAS_INTRO_6, me); + events.ScheduleEvent(EVENT_INTRO_H2_11, 1500); + break; + case EVENT_INTRO_H2_11: + if (Creature* pUther = me->GetCreature(*me, uiUther)) + DoScriptText(SAY_UTHER_INTRO_H2_4, pUther); + events.ScheduleEvent(EVENT_INTRO_H2_12, 19500); + break; + case EVENT_INTRO_H2_12: + DoScriptText(SAY_SYLVANAS_INTRO_7, me); + events.ScheduleEvent(EVENT_INTRO_H2_13, 2000); + break; + case EVENT_INTRO_H2_13: + if (Creature* pUther = me->GetCreature(*me, uiUther)) + { + pUther->HandleEmoteCommand(EMOTE_ONESHOT_NO); + DoScriptText(SAY_UTHER_INTRO_H2_5, pUther); + } + events.ScheduleEvent(EVENT_INTRO_H2_14, 12000); + break; + case EVENT_INTRO_H2_14: + if (Creature* pUther = me->GetCreature(*me, uiUther)) + DoScriptText(SAY_UTHER_INTRO_H2_6, pUther); + events.ScheduleEvent(EVENT_INTRO_H2_15, 8000); + break; + case EVENT_INTRO_H2_15: + DoScriptText(SAY_SYLVANAS_INTRO_8, me); + events.ScheduleEvent(EVENT_INTRO_LK_1, 2000); + break; + + // Remaining Intro Events common for both faction + case EVENT_INTRO_LK_1: + // Spawn LK in front of door, and make him move to the sword. + if (Creature* pLichKing = me->SummonCreature(NPC_LICH_KING_EVENT, LichKingSpawnPos, TEMPSUMMON_MANUAL_DESPAWN)) + { + pLichKing->GetMotionMaster()->MovePoint(0, LichKingMoveThronePos); + pLichKing->SetReactState(REACT_PASSIVE); + uiLichKing = pLichKing->GetGUID(); + } + + if (Creature* pUther = me->GetCreature(*me, uiUther)) + if (pInstance->GetData(DATA_TEAM_IN_INSTANCE) == ALLIANCE) + DoScriptText(SAY_UTHER_INTRO_A2_9, pUther); + else + DoScriptText(SAY_UTHER_INTRO_H2_7, pUther); + + events.ScheduleEvent(EVENT_INTRO_LK_2, 11000); + break; + + case EVENT_INTRO_LK_2: + if (Creature* pLichKing = me->GetCreature(*me, uiLichKing)) + DoScriptText(SAY_LK_INTRO_1, pLichKing); + events.ScheduleEvent(EVENT_INTRO_LK_3, 2000); + break; + + case EVENT_INTRO_LK_3: + // The Lich King banishes Uther to the abyss. + if (Creature* pUther = me->GetCreature(*me, uiUther)) + { + pUther->DisappearAndDie(); + uiUther = 0; + } + + // He steps forward and removes the runeblade from the heap of skulls. + + events.ScheduleEvent(EVENT_INTRO_LK_4, 4000); + break; + + case EVENT_INTRO_LK_4: + if (Creature* pLichKing = me->GetCreature(*me, uiLichKing)) + DoScriptText(SAY_LK_INTRO_2, pLichKing); + events.ScheduleEvent(EVENT_INTRO_LK_5, 10000); + break; + + case EVENT_INTRO_LK_5: + // summon Falric and Marwyn. then go back to the door + if (Creature* pFalric = me->GetCreature(*me, pInstance->GetData64(DATA_FALRIC))) + pFalric->SetVisibility(VISIBILITY_ON); + if (Creature* pMarwyn = me->GetCreature(*me, pInstance->GetData64(DATA_MARWYN))) + pMarwyn->SetVisibility(VISIBILITY_ON); + + if (Creature* pLichKing = me->GetCreature(*me, uiLichKing)) + { + pLichKing->GetMotionMaster()->MovePoint(0, LichKingSpawnPos); + DoScriptText(SAY_LK_INTRO_3, pLichKing); + } + + events.ScheduleEvent(EVENT_INTRO_LK_6, 8000); + break; + + case EVENT_INTRO_LK_6: + if (Creature* pFalric = me->GetCreature(*me, pInstance->GetData64(DATA_FALRIC))) + DoScriptText(SAY_FALRIC_INTRO_1, pFalric); + + events.ScheduleEvent(EVENT_INTRO_LK_7, 2000); + break; + + case EVENT_INTRO_LK_7: + if (Creature* pMarwyn = me->GetCreature(*me, pInstance->GetData64(DATA_MARWYN))) + DoScriptText(SAY_MARWYN_INTRO_1, pMarwyn); + + events.ScheduleEvent(EVENT_INTRO_LK_8, 2000); + break; + + case EVENT_INTRO_LK_8: + if (Creature* pFalric = me->GetCreature(*me, pInstance->GetData64(DATA_FALRIC))) + DoScriptText(SAY_FALRIC_INTRO_2, pFalric); + + events.ScheduleEvent(EVENT_INTRO_LK_9, 5000); + break; + + case EVENT_INTRO_LK_9: + if (pInstance->GetData(DATA_TEAM_IN_INSTANCE) == ALLIANCE) + DoScriptText(SAY_JAINA_INTRO_END, me); + else + DoScriptText(SAY_SYLVANAS_INTRO_END, me); + + me->GetMotionMaster()->MovePoint(0, LichKingSpawnPos); + // TODO: Loralen/Koreln shall run also + events.ScheduleEvent(EVENT_INTRO_END, 10000); + break; + + case EVENT_INTRO_END: + if (pInstance) + pInstance->SetData(DATA_WAVE_COUNT, SPECIAL); // start first wave + + // Loralen or Koreln disappearAndDie() + me->DisappearAndDie(); + break; + + case EVENT_SKIP_INTRO: + // TODO: implement + + if (Creature* pFalric = me->GetCreature(*me, pInstance->GetData64(DATA_FALRIC))) + pFalric->SetVisibility(VISIBILITY_ON); + if (Creature* pMarwyn = me->GetCreature(*me, pInstance->GetData64(DATA_MARWYN))) + pMarwyn->SetVisibility(VISIBILITY_ON); + + me->GetMotionMaster()->MovePoint(0, LichKingSpawnPos); + // TODO: Loralen/Koreln shall run also + + events.ScheduleEvent(EVENT_INTRO_END, 15000); + break; + } + } +}; + +bool GossipHello_npc_sylvanas_hor(Player* pPlayer, Creature* pCreature) +{ + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); + + if (pPlayer->GetQuestStatus(QUEST_DELIVRANCE_FROM_THE_PIT_H2) == QUEST_STATUS_COMPLETE) + pPlayer->ADD_GOSSIP_ITEM( 0, "Can you remove the sword?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); + + // once last quest is completed, she offers this shortcut of the starting event + if (pPlayer->GetQuestStatus(QUEST_WRATH_OF_THE_LICH_KING_H2) == QUEST_STATUS_COMPLETE) + pPlayer->ADD_GOSSIP_ITEM( 0, "Dark Lady, I think I hear Arthas coming. Whatever you're going to do, do it quickly.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); + + pPlayer->SEND_GOSSIP_MENU(DEFAULT_GOSSIP_MESSAGE, pCreature->GetGUID()); + + return true; +} + +bool GossipHello_npc_jaina_hor(Player* pPlayer, Creature* pCreature) +{ + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); + + if (pPlayer->GetQuestStatus(QUEST_DELIVRANCE_FROM_THE_PIT_A2) == QUEST_STATUS_COMPLETE) + pPlayer->ADD_GOSSIP_ITEM( 0, "Can you remove the sword?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); + + // once last quest of the series is completed, she offers this shortcut of the starting event + if (pPlayer->GetQuestStatus(QUEST_WRATH_OF_THE_LICH_KING_A2) == QUEST_STATUS_COMPLETE) + pPlayer->ADD_GOSSIP_ITEM( 0, "My Lady, I think I hear Arthas coming. Whatever you're going to do, do it quickly.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); + + pPlayer->SEND_GOSSIP_MENU(DEFAULT_GOSSIP_MESSAGE, pCreature->GetGUID()); + return true; +} + +bool GossipSelect_npc_jaina_or_sylvanas_hor(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +{ + switch (uiAction) + { + case GOSSIP_ACTION_INFO_DEF+1: + pPlayer->CLOSE_GOSSIP_MENU(); + if (pCreature->AI()) + pCreature->AI()->DoAction(ACTION_START_INTRO); + pCreature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); + break; + case GOSSIP_ACTION_INFO_DEF+2: + pPlayer->CLOSE_GOSSIP_MENU(); + if (pCreature->AI()) + pCreature->AI()->DoAction(ACTION_SKIP_INTRO); + pCreature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); + break; + } + + return true; +} + +enum TrashSpells +{ + // Ghostly Priest + SPELL_SHADOW_WORD_PAIN = 72318, + SPELL_CIRCLE_OF_DESTRUCTION = 72320, + SPELL_COWER_IN_FEAR = 72321, + SPELL_DARK_MENDING = 72322, + + // Phantom Mage + SPELL_FIREBALL = 72163, + SPELL_FLAMESTRIKE = 72169, + SPELL_FROSTBOLT = 72166, + SPELL_CHAINS_OF_ICE = 72121, + SPELL_HALLUCINATION = 72342, + + // Phantom Hallucination (same as phantom mage + HALLUCINATION_2 when dies) + SPELL_HALLUCINATION_2 = 72344, + + // Shadowy Mercenary + SPELL_SHADOW_STEP = 72326, + SPELL_DEADLY_POISON = 72329, + SPELL_ENVENOMED_DAGGER_THROW = 72333, + SPELL_KIDNEY_SHOT = 72335, + + // Spectral Footman + SPELL_SPECTRAL_STRIKE = 72198, + SPELL_SHIELD_BASH = 72194, + SPELL_TORTURED_ENRAGE = 72203, + + // Tortured Rifleman + SPELL_SHOOT = 72208, + SPELL_CURSED_ARROW = 72222, + SPELL_FROST_TRAP = 72215, + SPELL_ICE_SHOT = 72268, +}; + +enum TrashEvents +{ + EVENT_TRASH_NONE, + + // Ghostly Priest + EVENT_SHADOW_WORD_PAIN, + EVENT_CIRCLE_OF_DESTRUCTION, + EVENT_COWER_IN_FEAR, + EVENT_DARK_MENDING, + + // Phantom Mage + EVENT_FIREBALL, + EVENT_FLAMESTRIKE, + EVENT_FROSTBOLT, + EVENT_CHAINS_OF_ICE, + EVENT_HALLUCINATION, + + // Shadowy Mercenary + EVENT_SHADOW_STEP, + EVENT_DEADLY_POISON, + EVENT_ENVENOMED_DAGGER_THROW, + EVENT_KIDNEY_SHOT, + + // Spectral Footman + EVENT_SPECTRAL_STRIKE, + EVENT_SHIELD_BASH, + EVENT_TORTURED_ENRAGE, + + // Tortured Rifleman + EVENT_SHOOT, + EVENT_CURSED_ARROW, + EVENT_FROST_TRAP, + EVENT_ICE_SHOT, +}; + +struct npc_ghostly_priestAI: public ScriptedAI +{ + npc_ghostly_priestAI(Creature *c) : ScriptedAI(c) + { + } + + EventMap events; + + void Reset() + { + events.Reset(); + } + + void EnterCombat(Unit* /*who*/) + { + events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 8000); // TODO: adjust timers + events.ScheduleEvent(EVENT_CIRCLE_OF_DESTRUCTION, 12000); + events.ScheduleEvent(EVENT_COWER_IN_FEAR, 10000); + events.ScheduleEvent(EVENT_DARK_MENDING, 20000); + } + + void UpdateAI(const uint32 diff) + { + if (!UpdateVictim()) + return; + + events.Update(diff); + + if (me->hasUnitState(UNIT_STAT_CASTING)) + return; + + while (uint32 eventId = events.ExecuteEvent()) + { + switch(eventId) + { + case EVENT_SHADOW_WORD_PAIN: + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM)) + DoCast(pTarget, SPELL_SHADOW_WORD_PAIN); + events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 8000); + return; + case EVENT_CIRCLE_OF_DESTRUCTION: + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM)) + DoCast(pTarget, SPELL_CIRCLE_OF_DESTRUCTION); + events.ScheduleEvent(EVENT_CIRCLE_OF_DESTRUCTION, 12000); + return; + case EVENT_COWER_IN_FEAR: + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM)) + DoCast(pTarget, SPELL_COWER_IN_FEAR); + events.ScheduleEvent(EVENT_COWER_IN_FEAR, 10000); + return; + case EVENT_DARK_MENDING: + // find an ally with missing HP + if (Unit *pTarget = DoSelectLowestHpFriendly(40, DUNGEON_MODE(30000,50000))) + { + DoCast(pTarget, SPELL_DARK_MENDING); + events.ScheduleEvent(EVENT_DARK_MENDING, 20000); + } + else + { + // no friendly unit with missing hp. re-check in just 5 sec. + events.ScheduleEvent(EVENT_DARK_MENDING, 5000); + } + return; + } + } + + DoMeleeAttackIfReady(); + } +}; + +struct npc_phantom_mageAI: public ScriptedAI +{ + npc_phantom_mageAI(Creature *c) : ScriptedAI(c) + { + } + + EventMap events; + + void Reset() + { + events.Reset(); + } + + void EnterCombat(Unit* /*who*/) + { + events.ScheduleEvent(EVENT_FIREBALL, 3000); // TODO: adjust timers + events.ScheduleEvent(EVENT_FLAMESTRIKE, 6000); + events.ScheduleEvent(EVENT_FROSTBOLT, 9000); + events.ScheduleEvent(EVENT_CHAINS_OF_ICE, 12000); + events.ScheduleEvent(EVENT_HALLUCINATION, 40000); + } + + void UpdateAI(const uint32 diff) + { + if (!UpdateVictim()) + return; + + events.Update(diff); + + if (me->hasUnitState(UNIT_STAT_CASTING)) + return; + + while (uint32 eventId = events.ExecuteEvent()) + { + switch(eventId) + { + case EVENT_FIREBALL: + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM)) + DoCast(pTarget, SPELL_FIREBALL); + events.ScheduleEvent(EVENT_FIREBALL, 15000); + return; + case EVENT_FLAMESTRIKE: + DoCast(SPELL_FLAMESTRIKE); + events.ScheduleEvent(EVENT_FLAMESTRIKE, 15000); + return; + case EVENT_FROSTBOLT: + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM)) + DoCast(pTarget, SPELL_FROSTBOLT); + events.ScheduleEvent(EVENT_FROSTBOLT, 15000); + return; + case EVENT_CHAINS_OF_ICE: + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM)) + DoCast(pTarget, SPELL_CHAINS_OF_ICE); + events.ScheduleEvent(EVENT_CHAINS_OF_ICE, 15000); + return; + case EVENT_HALLUCINATION: + DoCast(SPELL_HALLUCINATION); + return; + } + } + + DoMeleeAttackIfReady(); + } +}; + +struct npc_phantom_hallucinationAI: public npc_phantom_mageAI +{ + npc_phantom_hallucinationAI(Creature *c) : npc_phantom_mageAI(c) + { + } + + void JustDied(Unit * /*pWho*/) + { + DoCast(SPELL_HALLUCINATION_2); + } +}; + +struct npc_shadowy_mercenaryAI: public ScriptedAI +{ + npc_shadowy_mercenaryAI(Creature *c) : ScriptedAI(c) + { + } + + EventMap events; + + void Reset() + { + events.Reset(); + } + + void EnterCombat(Unit* /*who*/) + { + events.ScheduleEvent(EVENT_SHADOW_STEP, 8000); // TODO: adjust timers + events.ScheduleEvent(EVENT_DEADLY_POISON, 5000); + events.ScheduleEvent(EVENT_ENVENOMED_DAGGER_THROW, 10000); + events.ScheduleEvent(EVENT_KIDNEY_SHOT, 12000); + } + + void UpdateAI(const uint32 diff) + { + if (!UpdateVictim()) + return; + + events.Update(diff); + + if (me->hasUnitState(UNIT_STAT_CASTING)) + return; + + while (uint32 eventId = events.ExecuteEvent()) + { + switch(eventId) + { + case EVENT_SHADOW_STEP: + DoCast(SPELL_SHADOW_STEP); + events.ScheduleEvent(EVENT_SHADOW_STEP, 8000); + return; + case EVENT_DEADLY_POISON: + DoCast(me->getVictim(), SPELL_DEADLY_POISON); + events.ScheduleEvent(EVENT_DEADLY_POISON, 10000); + return; + case EVENT_ENVENOMED_DAGGER_THROW: + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM)) + DoCast(pTarget, SPELL_ENVENOMED_DAGGER_THROW); + events.ScheduleEvent(EVENT_ENVENOMED_DAGGER_THROW, 10000); + return; + case EVENT_KIDNEY_SHOT: + DoCast(me->getVictim(), SPELL_KIDNEY_SHOT); + events.ScheduleEvent(EVENT_KIDNEY_SHOT, 10000); + return; + } + } + + DoMeleeAttackIfReady(); + } +}; + +struct npc_spectral_footmanAI: public ScriptedAI +{ + npc_spectral_footmanAI(Creature *c) : ScriptedAI(c) + { + } + + EventMap events; + + void Reset() + { + events.Reset(); + } + + void EnterCombat(Unit* /*who*/) + { + events.ScheduleEvent(EVENT_SPECTRAL_STRIKE, 5000); // TODO: adjust timers + events.ScheduleEvent(EVENT_SHIELD_BASH, 10000); + events.ScheduleEvent(EVENT_TORTURED_ENRAGE, 15000); + } + + void UpdateAI(const uint32 diff) + { + if (!UpdateVictim()) + return; + + events.Update(diff); + + if (me->hasUnitState(UNIT_STAT_CASTING)) + return; + + while (uint32 eventId = events.ExecuteEvent()) + { + switch(eventId) + { + case EVENT_SPECTRAL_STRIKE: + DoCast(me->getVictim(), SPELL_SPECTRAL_STRIKE); + events.ScheduleEvent(EVENT_SPECTRAL_STRIKE, 5000); + return; + case EVENT_SHIELD_BASH: + DoCast(me->getVictim(), SPELL_SHIELD_BASH); + events.ScheduleEvent(EVENT_SHIELD_BASH, 5000); + return; + case EVENT_TORTURED_ENRAGE: + DoCast(SPELL_TORTURED_ENRAGE); + events.ScheduleEvent(EVENT_TORTURED_ENRAGE, 15000); + return; + } + } + + DoMeleeAttackIfReady(); + } +}; + +struct npc_tortured_riflemanAI : public ScriptedAI +{ + npc_tortured_riflemanAI(Creature *c) : ScriptedAI(c) + { + } + + EventMap events; + + void Reset() + { + events.Reset(); + } + + void EnterCombat(Unit* /*who*/) + { + events.ScheduleEvent(EVENT_SHOOT, 2000); // TODO: adjust timers + events.ScheduleEvent(EVENT_CURSED_ARROW, 10000); + events.ScheduleEvent(EVENT_FROST_TRAP, 1000); + events.ScheduleEvent(EVENT_ICE_SHOT, 15000); + } + + void UpdateAI(const uint32 diff) + { + if (!UpdateVictim()) + return; + + events.Update(diff); + + if (me->hasUnitState(UNIT_STAT_CASTING)) + return; + + while (uint32 eventId = events.ExecuteEvent()) + { + switch(eventId) + { + case EVENT_SHOOT: + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM)) + DoCast(pTarget, SPELL_SHOOT); + events.ScheduleEvent(EVENT_SHOOT, 2000); + return; + case EVENT_CURSED_ARROW: + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM)) + DoCast(pTarget, SPELL_CURSED_ARROW); + events.ScheduleEvent(EVENT_CURSED_ARROW, 10000); + return; + case EVENT_FROST_TRAP: + DoCast(SPELL_FROST_TRAP); + events.ScheduleEvent(EVENT_FROST_TRAP, 30000); + return; + case EVENT_ICE_SHOT: + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM)) + DoCast(pTarget, SPELL_ICE_SHOT); + events.ScheduleEvent(EVENT_ICE_SHOT, 15000); + return; + } + } + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_npc_jaina_or_sylvanas_horAI(Creature* pCreature) +{ + return new npc_jaina_or_sylvanas_horAI(pCreature); +} + +CreatureAI* GetAI_npc_ghostly_priestAI(Creature* pCreature) +{ + return new npc_ghostly_priestAI(pCreature); +} + +CreatureAI* GetAI_npc_phantom_mageAI(Creature* pCreature) +{ + return new npc_phantom_mageAI(pCreature); +} + +CreatureAI* GetAI_npc_phantom_hallucinationAI(Creature* pCreature) +{ + return new npc_phantom_hallucinationAI(pCreature); +} + +CreatureAI* GetAI_npc_shadowy_mercenaryAI(Creature* pCreature) +{ + return new npc_shadowy_mercenaryAI(pCreature); +} + +CreatureAI* GetAI_npc_spectral_footmanAI(Creature* pCreature) +{ + return new npc_spectral_footmanAI(pCreature); +} + +CreatureAI* GetAI_npc_tortured_riflemanAI(Creature* pCreature) +{ + return new npc_tortured_riflemanAI(pCreature); +} + +void AddSC_halls_of_reflection() +{ + Script *newscript; + + newscript = new Script; + newscript->Name = "npc_sylvanas_hor_part1"; + newscript->GetAI = &GetAI_npc_jaina_or_sylvanas_horAI; + newscript->pGossipHello = &GossipHello_npc_sylvanas_hor; + newscript->pGossipSelect = &GossipSelect_npc_jaina_or_sylvanas_hor; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "npc_jaina_hor_part1"; + newscript->GetAI = &GetAI_npc_jaina_or_sylvanas_horAI; + newscript->pGossipHello = &GossipHello_npc_jaina_hor; + newscript->pGossipSelect = &GossipSelect_npc_jaina_or_sylvanas_hor; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "npc_ghostly_priest"; + newscript->GetAI = &GetAI_npc_ghostly_priestAI; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "npc_phantom_mage"; + newscript->GetAI = &GetAI_npc_phantom_mageAI; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "npc_phantom_hallucination"; + newscript->GetAI = &GetAI_npc_phantom_hallucinationAI; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "npc_shadowy_mercenary"; + newscript->GetAI = &GetAI_npc_shadowy_mercenaryAI; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "npc_spectral_footman"; + newscript->GetAI = &GetAI_npc_spectral_footmanAI; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "npc_tortured_rifleman"; + newscript->GetAI = &GetAI_npc_tortured_riflemanAI; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h new file mode 100644 index 00000000000..46ae0cb283c --- /dev/null +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h @@ -0,0 +1,156 @@ +/* Copyright (C) 2006 - 2010 TrinityCore + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef DEF_HALLS_OF_REFLECTION_H +#define DEF_HALLS_OF_REFLECTION_H + +enum Data +{ + DATA_FALRIC_EVENT, + DATA_MARWYN_EVENT, + DATA_LICHKING_EVENT, + DATA_WAVE_COUNT, + DATA_TEAM_IN_INSTANCE, +}; + +enum Data64 +{ + DATA_FALRIC, + DATA_MARWYN, + DATA_LICHKING, + DATA_FROSTMOURNE, +}; + +enum Creatures +{ + NPC_FALRIC = 38112, + NPC_MARWYN = 38113, + NPC_LICH_KING_EVENT = 37226, + NPC_LICH_KING_BOSS = 36954, + + NPC_UTHER = 37225, + NPC_JAINA_PART1 = 37221, + NPC_JAINA_PART2 = 36955, + NPC_SYLVANAS_PART1 = 37223, + NPC_SYLVANAS_PART2 = 37554, + + NPC_WAVE_MERCENARY = 38177, + NPC_WAVE_FOOTMAN = 38173, + NPC_WAVE_RIFLEMAN = 38176, + NPC_WAVE_PRIEST = 38175, + NPC_WAVE_MAGE = 38172, +}; + +enum GameObjects +{ + GO_FROSTMOURNE = 202302, + GO_FROSTMOURNE_ALTAR = 202236, + GO_FRONT_DOOR = 201976, + GO_ARTHAS_DOOR = 197341, +}; + +enum HorWorldStates +{ + WORLD_STATE_HOR = 4884, + WORLD_STATE_HOR_WAVE_COUNT = 4882, +}; + +// Common actions from Instance Script to Boss Script +enum Actions +{ + ACTION_ENTER_COMBAT, +}; + +// Base class for FALRIC and MARWYN +// handled the summonList and the notification events to/from the InstanceData +struct boss_horAI : ScriptedAI +{ + boss_horAI(Creature *pCreature) : ScriptedAI(pCreature), summons(pCreature) + { + pInstance = me->GetInstanceData(); + } + + InstanceData* pInstance; + EventMap events; + SummonList summons; + + void Reset() + { + events.Reset(); + me->SetVisibility(VISIBILITY_OFF); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE); + me->SetReactState(REACT_PASSIVE); + } + + void DamageTaken(Unit *pWho, uint32 &uiDamage) + { + if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) + uiDamage = 0; + } + + void DoAction(const int32 actionID) + { + switch(actionID) + { + case ACTION_ENTER_COMBAT: // called by InstanceData when boss shall enter in combat. + // Just in case. Should have been done by InstanceData + me->SetVisibility(VISIBILITY_ON); + + // Reset flags + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE); + me->SetReactState(REACT_AGGRESSIVE); + + if (Unit *pUnit = me->SelectNearestTarget()) + AttackStart(pUnit); + + DoZoneInCombat(); + break; + } + } + + void JustSummoned(Creature *pSummoned) + { + summons.Summon(pSummoned); + + if (Unit *pUnit = pSummoned->SelectNearestTarget()) + { + if (pSummoned->AI()) + pSummoned->AI()->AttackStart(pUnit); + else + { + pSummoned->GetMotionMaster()->MoveChase(pUnit); + pSummoned->Attack(pUnit, true); + } + } + + if (pSummoned->AI()) + pSummoned->AI()->DoZoneInCombat(); + } + + void SummonedCreatureDespawn(Creature *pSummoned) + { + summons.Despawn(pSummoned); + if (summons.empty()) + { + if (pSummoned->isAlive()) + pInstance->SetData(DATA_WAVE_COUNT, NOT_STARTED); + else + pInstance->SetData(DATA_WAVE_COUNT, SPECIAL); + } + } +}; + +#endif diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp new file mode 100644 index 00000000000..7a5d2479b7c --- /dev/null +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp @@ -0,0 +1,431 @@ +/* Copyright (C) 2006 - 2010 TrinityCore + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "ScriptedPch.h" +#include "halls_of_reflection.h" + +#define MAX_ENCOUNTER 3 + +/* Halls of Reflection encounters: +0- Falric +1- Marwyn +2- The Lich King +*/ + +enum eEnum +{ + ENCOUNTER_WAVE_MERCENARY = 6, + ENCOUNTER_WAVE_FOOTMAN = 10, + ENCOUNTER_WAVE_RIFLEMAN = 6, + ENCOUNTER_WAVE_PRIEST = 6, + ENCOUNTER_WAVE_MAGE = 6, +}; + +enum Events +{ + EVENT_NONE, + EVENT_NEXT_WAVE, + EVENT_START_LICH_KING, +}; + +static Position PriestSpawnPos[ENCOUNTER_WAVE_PRIEST] = +{ + {5277.74,2016.88,707.778,5.96903}, + {5295.88,2040.34,707.778,5.07891}, + {5320.37,1980.13,707.778,2.00713}, + {5280.51,1997.84,707.778,0.296706}, + {5302.45,2042.22,707.778,4.90438}, + {5306.57,1977.47,707.778,1.50098}, +}; + +static Position MageSpawnPos[ENCOUNTER_WAVE_MAGE] = +{ + {5312.75,2037.12,707.778,4.59022}, + {5309.58,2042.67,707.778,4.69494}, + {5275.08,2008.72,707.778,6.21337}, + {5279.65,2004.66,707.778,0.069813}, + {5275.48,2001.14,707.778,0.174533}, + {5316.7,2041.55,707.778,4.50295}, +}; + +static Position MercenarySpawnPos[ENCOUNTER_WAVE_MERCENARY] = +{ + {5302.25,1972.41,707.778,1.37881}, + {5311.03,1972.23,707.778,1.64061}, + {5277.36,1993.23,707.778,0.401426}, + {5318.7,2036.11,707.778,4.2237}, + {5335.72,1996.86,707.778,2.74017}, + {5299.43,1979.01,707.778,1.23918}, +}; + +static Position FootmenSpawnPos[ENCOUNTER_WAVE_FOOTMAN] = +{ + {5306.06,2037,707.778,4.81711}, + {5344.15,2007.17,707.778,3.15905}, + {5337.83,2010.06,707.778,3.22886}, + {5343.29,1999.38,707.778,2.9147}, + {5340.84,1992.46,707.778,2.75762}, + {5325.07,1977.6,707.778,2.07694}, + {5336.6,2017.28,707.778,3.47321}, + {5313.82,1978.15,707.778,1.74533}, + {5280.63,2012.16,707.778,6.05629}, + {5322.96,2040.29,707.778,4.34587}, +}; + +static Position RiflemanSpawnPos[ENCOUNTER_WAVE_RIFLEMAN] = +{ + {5343.47,2015.95,707.778,3.49066}, + {5337.86,2003.4,707.778,2.98451}, + {5319.16,1974,707.778,1.91986}, + {5299.25,2036,707.778,5.02655}, + {5295.64,1973.76,707.778,1.18682}, + {5282.9,2019.6,707.778,5.88176}, +}; + +struct instance_halls_of_reflection : public ScriptedInstance +{ + instance_halls_of_reflection(Map* pMap) : ScriptedInstance(pMap) {}; + + uint64 uiFalric; + uint64 uiMarwyn; + uint64 uiLichKingEvent; + uint64 uiJainaPart1; + uint64 uiSylvanasPart1; + + uint64 uiFrostmourne; + uint64 uiFrostmourneAltar; + uint64 uiArthasDoor; + uint64 uiFrontDoor; + + uint32 uiEncounter[MAX_ENCOUNTER]; + uint32 uiTeamInInstance; + uint32 uiWaveCount; + bool bIntroDone; + + EventMap events; + + void Initialize() + { + events.Reset(); + + uiFalric = 0; + uiMarwyn = 0; + uiLichKingEvent = 0; + uiJainaPart1 = 0; + uiSylvanasPart1 = 0; + + uiFrostmourne = 0; + uiFrostmourneAltar = 0; + uiArthasDoor = 0; + uiFrontDoor = 0; + uiTeamInInstance = 0; + uiWaveCount = 0; + bIntroDone = false; + + for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) + uiEncounter[i] = NOT_STARTED; + } + + void OnCreatureCreate(Creature* pCreature, bool add) + { + if (!add) + return; + + Map::PlayerList const &players = instance->GetPlayers(); + if (!players.isEmpty()) + if (Player* pPlayer = players.begin()->getSource()) + uiTeamInInstance = pPlayer->GetTeam(); + + switch(pCreature->GetEntry()) + { + case NPC_FALRIC: + uiFalric = pCreature->GetGUID(); + break; + case NPC_MARWYN: + uiMarwyn = pCreature->GetGUID(); + break; + case NPC_LICH_KING_EVENT: + uiLichKingEvent = pCreature->GetGUID(); + break; + case NPC_JAINA_PART1: + uiJainaPart1 = pCreature->GetGUID(); + break; + case NPC_SYLVANAS_PART1: + uiSylvanasPart1 = pCreature->GetGUID(); + break; + } + } + + void OnGameObjectCreate(GameObject* pGo, bool add) + { + if (!add) + return; + + // TODO: init state depending on encounters + switch(pGo->GetEntry()) + { + case GO_FROSTMOURNE: + uiFrostmourne = pGo->GetGUID(); + pGo->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_INTERACT_COND); + HandleGameObject(0, false, pGo); + break; + case GO_FROSTMOURNE_ALTAR: + uiFrostmourneAltar = pGo->GetGUID(); + pGo->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_INTERACT_COND); + HandleGameObject(0, true, pGo); + break; + case GO_FRONT_DOOR: + uiFrontDoor = pGo->GetGUID(); + pGo->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_INTERACT_COND); + HandleGameObject(0, true, pGo); + break; + case GO_ARTHAS_DOOR: + uiArthasDoor = pGo->GetGUID(); + pGo->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_INTERACT_COND); + + if (uiEncounter[1] == DONE) + HandleGameObject(0, true, pGo); + else + HandleGameObject(0, false, pGo); + break; + } + } + + void SetData(uint32 type, uint32 data) + { + if (type == DATA_WAVE_COUNT && data == SPECIAL) + { + bIntroDone = true; + events.ScheduleEvent(EVENT_NEXT_WAVE, 10000); + return; + } + + + if (uiWaveCount && data == NOT_STARTED) + DoWipe(); + + switch(type) + { + case DATA_FALRIC_EVENT: + uiEncounter[0] = data; + if (data == DONE) + events.ScheduleEvent(EVENT_NEXT_WAVE, 60000); + break; + case DATA_MARWYN_EVENT: + uiEncounter[1] = data; + if (data == DONE) + HandleGameObject(uiArthasDoor, true); + break; + case DATA_LICHKING_EVENT: + uiEncounter[2] = data; + break; + } + + if (data == DONE) + SaveToDB(); + } + + uint32 GetData(uint32 type) + { + switch(type) + { + case DATA_FALRIC_EVENT: return uiEncounter[0]; + case DATA_MARWYN_EVENT: return uiEncounter[1]; + case DATA_LICHKING_EVENT: return uiEncounter[2]; + case DATA_WAVE_COUNT: return uiWaveCount; + case DATA_TEAM_IN_INSTANCE: return uiTeamInInstance; + } + + return 0; + } + + uint64 GetData64(uint32 identifier) + { + switch(identifier) + { + case DATA_FALRIC: return uiFalric; + case DATA_MARWYN: return uiMarwyn; + case DATA_LICHKING: return uiLichKingEvent; + case DATA_FROSTMOURNE: return uiFrostmourne; + } + + return 0; + } + + std::string GetSaveData() + { + OUT_SAVE_INST_DATA; + + std::ostringstream saveStream; + saveStream << "H R 1 " << uiEncounter[0] << " " << uiEncounter[1] << " " << uiEncounter[2]; + + OUT_SAVE_INST_DATA_COMPLETE; + return saveStream.str(); + } + + void Load(const char* in) + { + if (!in) + { + OUT_LOAD_INST_DATA_FAIL; + return; + } + + OUT_LOAD_INST_DATA(in); + + char dataHead1, dataHead2; + uint16 version; + uint16 data0, data1, data2; + + std::istringstream loadStream(in); + loadStream >> dataHead1 >> dataHead2 >> version >> data0 >> data1 >> data2; + + if (dataHead1 == 'H' && dataHead2 == 'R') + { + uiEncounter[0] = data0; + uiEncounter[1] = data1; + uiEncounter[2] = data2; + + for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) + if (uiEncounter[i] == IN_PROGRESS) + uiEncounter[i] = NOT_STARTED; + + } else OUT_LOAD_INST_DATA_FAIL; + + if (uiEncounter[0] == DONE || uiEncounter[1] == DONE) + bIntroDone = true; + + OUT_LOAD_INST_DATA_COMPLETE; + } + + void AddWave() + { + DoUpdateWorldState(WORLD_STATE_HOR, 1); + DoUpdateWorldState(WORLD_STATE_HOR_WAVE_COUNT, uiWaveCount); + + switch(uiWaveCount) + { + case 1: + case 2: + case 3: + case 4: + if (Creature *pFalric = instance->GetCreature(uiFalric)) + SpawnWave(pFalric); + break; + case 5: + if (GetData(DATA_FALRIC_EVENT) == DONE) + events.ScheduleEvent(EVENT_NEXT_WAVE, 10000); + else if (Creature *pFalric = instance->GetCreature(uiFalric)) + if (pFalric->AI()) + pFalric->AI()->DoAction(ACTION_ENTER_COMBAT); + break; + case 6: + case 7: + case 8: + case 9: + if (Creature *pMarwyn = instance->GetCreature(uiMarwyn)) + SpawnWave(pMarwyn); + break; + case 10: + if (GetData(DATA_MARWYN_EVENT) != DONE) // wave should not have been started if DONE. Check anyway to avoid bug exploit! + if (Creature *pMarwyn = instance->GetCreature(uiMarwyn)) + if (pMarwyn->AI()) + pMarwyn->AI()->DoAction(ACTION_ENTER_COMBAT); + break; + } + } + + // Wipe has been detected. Perform cleanup and reset. + void DoWipe() + { + uiWaveCount = 0; + events.Reset(); + DoUpdateWorldState(WORLD_STATE_HOR, 1); + DoUpdateWorldState(WORLD_STATE_HOR_WAVE_COUNT, uiWaveCount); + HandleGameObject(uiFrontDoor, true); + + // TODO + // in case of wipe, the event is normally restarted by jumping into the center of the room. + // As I can't find a trigger area there, just respawn Jaina/Sylvanas so the event may be restarted. + if (Creature* pJaina = instance->GetCreature(uiJainaPart1)) + pJaina->Respawn(); + if (Creature* pSylvanas = instance->GetCreature(uiSylvanasPart1)) + pSylvanas->Respawn(); + + if (Creature* pFalric = instance->GetCreature(uiFalric)) + pFalric->SetVisibility(VISIBILITY_OFF); + if (Creature* pMarwyn = instance->GetCreature(uiMarwyn)) + pMarwyn->SetVisibility(VISIBILITY_OFF); + } + + // spawn a wave on behalf of the summoner. + void SpawnWave(Creature *pSummoner) + { + uint32 index; + + pSummoner->SetVisibility(VISIBILITY_ON); + + // TODO: do composition at random. # of spawn also depends on uiWaveCount + // As of now, it is just one of each. + index = urand(0,ENCOUNTER_WAVE_MERCENARY-1); + pSummoner->SummonCreature(NPC_WAVE_MERCENARY, MercenarySpawnPos[index], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0); + + index = urand(0,ENCOUNTER_WAVE_FOOTMAN-1); + pSummoner->SummonCreature(NPC_WAVE_FOOTMAN, FootmenSpawnPos[index], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0); + + index = urand(0,ENCOUNTER_WAVE_RIFLEMAN-1); + pSummoner->SummonCreature(NPC_WAVE_RIFLEMAN, RiflemanSpawnPos[index], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0); + + index = urand(0,ENCOUNTER_WAVE_PRIEST-1); + pSummoner->SummonCreature(NPC_WAVE_PRIEST, PriestSpawnPos[index], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0); + + index = urand(0,ENCOUNTER_WAVE_MAGE-1); + pSummoner->SummonCreature(NPC_WAVE_MAGE, MageSpawnPos[index], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0); + } + + void Update(uint32 diff) + { + if (!instance->HavePlayers()) + return; + + events.Update(diff); + + switch(uint32 eventId = events.ExecuteEvent()) + { + case EVENT_NEXT_WAVE: + uiWaveCount++; + AddWave(); + break; + case EVENT_START_LICH_KING: + // TODO + break; + } + } +}; + +InstanceData* GetInstanceData_instance_halls_of_reflection(Map* pMap) +{ + return new instance_halls_of_reflection(pMap); +} + +void AddSC_instance_halls_of_reflection() +{ + Script *newscript; + newscript = new Script; + newscript->Name = "instance_halls_of_reflection"; + newscript->GetInstanceData = &GetInstanceData_instance_halls_of_reflection; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp new file mode 100644 index 00000000000..25c78c4a0d3 --- /dev/null +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp @@ -0,0 +1,209 @@ +/* Copyright (C) 2006 - 2010 TrinityCore + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "ScriptedPch.h" +#include "pit_of_saron.h" + +enum Yells +{ + SAY_AGGRO = -1658001, + SAY_SLAY_1 = -1658002, + SAY_SLAY_2 = -1658003, + SAY_DEATH = -1658004, + SAY_PHASE2 = -1658005, + SAY_PHASE3 = -1658006, + + SAY_TYRANNUS_DEATH = -1659007, +}; + +enum eEvents +{ + EVENT_NONE, + EVENT_PERMAFROST, + EVENT_THROW_SARONITE, + EVENT_CHILLINGWAVE, + EVENT_DEEPFREEZE, +}; + +enum Spells +{ + SPELL_PERMAFROST = 70326, + SPELL_PERMAFROST_TRIGGER = 68786, // triggered by PERMAFROST. Used to check aura + SPELL_THROW_SARONITE = 68788, + SPELL_THUNDERING_STOMP = 68771, + SPELL_CHILLING_WAVE = 68778, + H_SPELL_CHILLING_WAVE = 70333, + SPELL_DEEP_FREEZE = 70381, + H_SPELL_DEEP_FREEZE = 72930, + SPELL_FORGE_MACE = 68785, + H_SPELL_FORGE_MACE = 70335, + SPELL_FORGE_BLADE = 68774, + H_SPELL_FORGE_BLADE = 70334, +}; + +enum eEnums +{ + EQUIP_ID_SWORD = 49345, + EQUIP_ID_MACE = 49344, + ACHIEV_DOESNT_GO_TO_ELEVEN = 4524, +}; + +struct boss_garfrostAI : public ScriptedAI +{ + boss_garfrostAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + } + + bool phase2; + bool phase3; + bool bAchievement; + + ScriptedInstance* pInstance; + EventMap events; + + void Reset() + { + events.Reset(); + + phase2 = false; + phase3 = false; + bAchievement = true; + + if (pInstance) + pInstance->SetData(DATA_GARFROST_EVENT, NOT_STARTED); + } + + void EnterCombat(Unit* /*who*/) + { + DoScriptText(SAY_AGGRO, me); + DoCast(me, SPELL_PERMAFROST); + + if (pInstance) + pInstance->SetData(DATA_GARFROST_EVENT, IN_PROGRESS); + + events.ScheduleEvent(EVENT_THROW_SARONITE, 45000); + } + + void DamageTaken(Unit* /*pDoneBy*/, uint32& /*uiDamage*/) + { + if (HealthBelowPct(66) && !phase2) + { + phase2 = true; + DoCast(me, SPELL_THUNDERING_STOMP); + // TODO: should go to a forge + DoCast(me, SPELL_FORGE_BLADE); + // TODO: should equip when spell completes + SetEquipmentSlots(false, EQUIP_ID_SWORD, -1, -1); + me->SetByteValue(UNIT_FIELD_BYTES_2, 0, SHEATH_STATE_MELEE); + events.ScheduleEvent(EVENT_CHILLINGWAVE, 10000); + } + + if (HealthBelowPct(33) && !phase3) + { + phase3 = true; + DoCast(me, SPELL_THUNDERING_STOMP); + // TODO: should go to a forge + DoCast(me, SPELL_FORGE_MACE); + // TODO: should equip when spell completes + SetEquipmentSlots(false, EQUIP_ID_MACE, -1, -1); + me->SetByteValue(UNIT_FIELD_BYTES_2, 0, SHEATH_STATE_MELEE); + events.CancelEvent(EVENT_CHILLINGWAVE); // cast only in phase 2. + events.ScheduleEvent(EVENT_DEEPFREEZE, 10000); + } + } + + void KilledUnit(Unit * victim) + { + if (victim == me) + return; + + DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + } + + void JustDied(Unit* /*killer*/) + { + DoScriptText(SAY_DEATH, me); + if (pInstance) + { + if (Creature *pTyrannus = me->GetCreature(*me, pInstance->GetData64(DATA_TYRANNUS))) + DoScriptText(SAY_TYRANNUS_DEATH, pTyrannus); + + pInstance->SetData(DATA_GARFROST_EVENT, DONE); + if (IsHeroic() && bAchievement) + pInstance->DoCompleteAchievement(ACHIEV_DOESNT_GO_TO_ELEVEN); + } + } + + void SpellHitTarget(Unit* pTarget, const SpellEntry *spell) + { + if (spell->Id == SPELL_PERMAFROST_TRIGGER && bAchievement) + { + if (Aura *pAura = pTarget->GetAura(SPELL_PERMAFROST_TRIGGER)) + if (pAura->GetStackAmount() > 10) + bAchievement = false; + } + } + + void UpdateAI(const uint32 diff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + events.Update(diff); + + if (me->hasUnitState(UNIT_STAT_CASTING)) + return; + + while (uint32 eventId = events.ExecuteEvent()) + { + switch(eventId) + { + case EVENT_THROW_SARONITE: + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, SPELL_THROW_SARONITE); + events.RescheduleEvent(EVENT_THROW_SARONITE, 35000); + return; + case EVENT_DEEPFREEZE: + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, SPELL_DEEP_FREEZE); + events.RescheduleEvent(EVENT_DEEPFREEZE, 35000); + return; + case EVENT_CHILLINGWAVE: + DoCastAOE(SPELL_CHILLING_WAVE); + events.RescheduleEvent(EVENT_CHILLINGWAVE, 40000); + return; + } + } + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_boss_garfrost(Creature* pCreature) +{ + return new boss_garfrostAI (pCreature); +} + +void AddSC_boss_garfrost() +{ + Script *newscript; + newscript = new Script; + newscript->Name="boss_garfrost"; + newscript->GetAI = &GetAI_boss_garfrost; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp new file mode 100644 index 00000000000..8b8b03a3d4e --- /dev/null +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp @@ -0,0 +1,482 @@ +/* Copyright (C) 2006 - 2010 TrinityCore + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "ScriptedPch.h" +#include "pit_of_saron.h" + +/* + * SDComment: Spell Explosive barrage is not working. + */ + +enum Spells +{ + SPELL_PURSUED = 68987, + SPELL_CONFUSION = 69029, + SPELL_EXPLOSIVE_BARRAGE = 69263, + SPELL_MIGHTY_KICK = 69021, + SPELL_POISON_NOVA = 68989, + H_SPELL_POISON_NOVA = 70434, + SPELL_SHADOW_BOLT = 69028, + SPELL_TOXIC_WASTE = 69024, + H_SPELL_TOXIC_WASTE = 70436, +}; + +enum Yells +{ + // Krick + SAY_KRICK_AGGRO = -1658010, + SAY_KRICK_SLAY_1 = -1658011, + SAY_KRICK_SLAY_2 = -1658012, + SAY_KRICK_BARRAGE_1 = -1658013, + SAY_KRICK_BARRAGE_2 = -1658014, + SAY_KRICK_POISON_NOVA = -1658015, + SAY_KRICK_CHASE_1 = -1658016, + SAY_KRICK_CHASE_2 = -1658017, + SAY_KRICK_CHASE_3 = -1658018, + + // Ick + SAY_ICK_POISON_NOVA = -1658020, + SAY_ICK_CHASE_1 = -1658021, + + // OUTRO + SAY_KRICK_OUTRO_1 = -1658030, + SAY_JAYNA_OUTRO_2 = -1658031, + SAY_SYLVANAS_OUTRO_2 = -1658032, + SAY_KRICK_OUTRO_3 = -1658033, + SAY_JAYNA_OUTRO_4 = -1658034, + SAY_SYLVANAS_OUTRO_4 = -1658035, + SAY_KRICK_OUTRO_5 = -1658036, + SAY_TYRANNUS_OUTRO_7 = -1658037, + SAY_KRICK_OUTRO_8 = -1658038, + SAY_TYRANNUS_OUTRO_9 = -1658039, + SAY_JAYNA_OUTRO_10 = -1658040, + SAY_SYLVANAS_OUTRO_10 = -1658041, +}; + +enum Events +{ + EVENT_NONE, + EVENT_PURSUE, + EVENT_MIGHTY_KICK, + EVENT_POISON_NOVA, + EVENT_EXPLOSIVE_BARRAGE, + EVENT_END_EXPLOSIVE_BARRAGE, + + // Krick + EVENT_SHADOW_BOLT, + EVENT_TOXIC_WASTE, + + // Krick OUTRO + EVENT_OUTRO_1, + EVENT_OUTRO_2, + EVENT_OUTRO_3, + EVENT_OUTRO_4, + EVENT_OUTRO_5, + EVENT_OUTRO_6, + EVENT_OUTRO_7, + EVENT_OUTRO_8, + EVENT_OUTRO_9, + EVENT_OUTRO_10, + EVENT_OUTRO_11, + EVENT_OUTRO_12, + EVENT_OUTRO_END, +}; + +enum KrickPhase +{ + PHASE_COMBAT, + PHASE_OUTRO, +}; + +enum Actions +{ + ACTION_OUTRO, +}; + +enum Misc +{ + SEAT_KRICK = 0, + + // events GCD. Shall not be 0. + GCD_1 = 1, +}; + +// Krick is the Gnome. +// Ick is the Mount +// Common Events are handled/triggered by Ick that "drive" Krick through DoAction. + +struct boss_ickAI : public ScriptedAI +{ + boss_ickAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + } + + ScriptedInstance* pInstance; + + EventMap events; + + void Reset() + { + events.Reset(); + + if (pInstance) + pInstance->SetData(DATA_KRICKANDICK_EVENT, NOT_STARTED); + } + + Creature* GetKrick() + { + return me->GetCreature(*me, pInstance ? pInstance->GetData64(DATA_KRICK) : 0); + } + + void EnterCombat(Unit * /*who*/) + { + if (pInstance) + pInstance->SetData(DATA_KRICKANDICK_EVENT, IN_PROGRESS); + + Creature* pKrick = GetKrick(); + if (!pKrick) + pKrick = me->SummonCreature(CREATURE_KRICK, *me, TEMPSUMMON_MANUAL_DESPAWN); + + if (pKrick) + DoScriptText(SAY_KRICK_AGGRO, pKrick); + + events.ScheduleEvent(EVENT_MIGHTY_KICK, 20000, GCD_1); + events.ScheduleEvent(EVENT_PURSUE, 30000, GCD_1); + events.ScheduleEvent(EVENT_POISON_NOVA, 30000, GCD_1); + events.ScheduleEvent(EVENT_EXPLOSIVE_BARRAGE, 35000); + events.ScheduleEvent(EVENT_TOXIC_WASTE, 5000); + events.ScheduleEvent(EVENT_SHADOW_BOLT, 15000); + } + + void EnterEvadeMode() + { + me->GetMotionMaster()->Clear(); + ScriptedAI::EnterEvadeMode(); + } + + void JustDied(Unit* /*pKiller*/) + { + if (Creature* pKrick = GetKrick()) + { + if (pKrick->AI()) + pKrick->AI()->DoAction(ACTION_OUTRO); + } + + if (pInstance) + pInstance->SetData(DATA_KRICKANDICK_EVENT, DONE); + } + + void UpdateAI(const uint32 diff) + { + if (!me->isInCombat()) + return; + + if (!me->getVictim() && me->getThreatManager().isThreatListEmpty()) + { + EnterEvadeMode(); + return; + } + + events.Update(diff); + + if (me->hasUnitState(UNIT_STAT_CASTING)) + return; + + switch(events.ExecuteEvent()) + { + case EVENT_PURSUE: + if (Creature* pKrick = GetKrick()) + DoScriptText(RAND(SAY_KRICK_CHASE_1,SAY_KRICK_CHASE_2,SAY_KRICK_CHASE_3), pKrick); + + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + { + me->Attack(pTarget,false); + DoScriptText(SAY_ICK_CHASE_1, me, pTarget); + DoCast(pTarget, SPELL_PURSUED); + } + + DoCast(SPELL_CONFUSION); + events.ScheduleEvent(EVENT_PURSUE, 30000, GCD_1); + return; + + case EVENT_MIGHTY_KICK: + DoCast(me->getVictim(), SPELL_MIGHTY_KICK); + events.ScheduleEvent(EVENT_MIGHTY_KICK, 25000, GCD_1); + return; + + case EVENT_POISON_NOVA: + if (Creature* pKrick = GetKrick()) + DoScriptText(SAY_KRICK_POISON_NOVA, pKrick); + + DoScriptText(SAY_ICK_POISON_NOVA, me); + DoCastAOE(SPELL_POISON_NOVA); + events.ScheduleEvent(EVENT_POISON_NOVA, 30000, GCD_1); + return; + + case EVENT_TOXIC_WASTE: + DoCast(me->getVictim(), SPELL_TOXIC_WASTE); + events.ScheduleEvent(EVENT_TOXIC_WASTE, 5000); + return; + + case EVENT_SHADOW_BOLT: + DoCast(me->getVictim(), SPELL_SHADOW_BOLT); + events.ScheduleEvent(EVENT_SHADOW_BOLT, 15000); + return; + + case EVENT_EXPLOSIVE_BARRAGE: + if (Creature *pKrick = GetKrick()) + { + DoScriptText(SAY_KRICK_BARRAGE_1, pKrick); + DoScriptText(SAY_KRICK_BARRAGE_2, pKrick); + } + + DoCastAOE(SPELL_EXPLOSIVE_BARRAGE); + me->GetMotionMaster()->MoveIdle(); + events.DelayEvents(20000, GCD_1); // 2 sec cast + 18 sec + events.ScheduleEvent(EVENT_END_EXPLOSIVE_BARRAGE, 20000); + return; + + case EVENT_END_EXPLOSIVE_BARRAGE: + me->GetMotionMaster()->Clear(); + me->GetMotionMaster()->MoveChase(me->getVictim()); + events.ScheduleEvent(EVENT_EXPLOSIVE_BARRAGE, 25000); + break; + } + + DoMeleeAttackIfReady(); + } +}; + +struct boss_krickAI : public ScriptedAI +{ + boss_krickAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + } + + ScriptedInstance* pInstance; + EventMap events; + + KrickPhase phase; + uint64 uiNpcOutroDialog; + uint64 uiTyrannus; + + void Reset() + { + uiNpcOutroDialog = 0; + uiTyrannus = 0; + phase = PHASE_COMBAT; + + me->SetReactState(REACT_PASSIVE); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + me->SetVisibility(VISIBILITY_OFF); + } + + Creature* GetIck() + { + return me->GetCreature(*me, pInstance ? pInstance->GetData64(DATA_ICK) : 0); + } + + void KilledUnit(Unit * victim) + { + if (victim == me) + return; + + DoScriptText(RAND(SAY_KRICK_SLAY_1,SAY_KRICK_SLAY_2), me); + } + + void DamageTaken(Unit * /*pDoneBy*/, uint32 &uiDamage) + { + // if killed whatever the reason, it breaks the outro + uiDamage = 0; + } + + void DoAction(const int32 actionId) + { + switch(actionId) + { + case ACTION_OUTRO: + { + Position pos; + if (Creature* pIck = GetIck()) + { + // TODO: tele on Ick then run some distance. + pIck->GetNearPosition(pos, 5.0f, 3.14); + me->NearTeleportTo(pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), 0.0f); + } + me->SetVisibility(VISIBILITY_ON); + + Creature* pJainaOrSylvanas = me->GetCreature(*me, pInstance->GetData64(DATA_JAINA_SYLVANAS_1)); + if (pJainaOrSylvanas) { + Position pos; + me->GetNearPosition(pos, 5.0f, 0); + pJainaOrSylvanas->NearTeleportTo(pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), + pos.GetAngle(me->GetPositionX(), me->GetPositionY())); + } + else { + if (pInstance->GetData(DATA_TEAM_IN_INSTANCE) == TEAM_ALLIANCE) + pJainaOrSylvanas = me->SummonCreature(NPC_SYLVANAS_PART1, *me, TEMPSUMMON_MANUAL_DESPAWN); + else + pJainaOrSylvanas = me->SummonCreature(NPC_JAINA_PART1, *me, TEMPSUMMON_MANUAL_DESPAWN); + } + + if (pJainaOrSylvanas) + { + pJainaOrSylvanas->SetOrientation(pJainaOrSylvanas->GetAngle(me->GetPositionX(), me->GetPositionY())); + me->SetOrientation(me->GetAngle(pJainaOrSylvanas->GetPositionX(), pJainaOrSylvanas->GetPositionY())); + uiNpcOutroDialog = pJainaOrSylvanas->GetGUID(); + } + + phase = PHASE_OUTRO; + events.Reset(); + events.ScheduleEvent(EVENT_OUTRO_1, 1000); + break; + } + } + } + + void UpdateAI(const uint32 diff) + { + if (phase == PHASE_OUTRO) + { + if (!pInstance) + return; + + events.Update(diff); + switch(events.ExecuteEvent()) + { + case EVENT_OUTRO_1: + { + DoScriptText(SAY_KRICK_OUTRO_1, me); + events.ScheduleEvent(EVENT_OUTRO_2, 14000); + break; + } + case EVENT_OUTRO_2: + { + Creature* pNpcDialog = me->GetCreature(*me, uiNpcOutroDialog); + if (pNpcDialog) + { + if (pInstance->GetData(DATA_TEAM_IN_INSTANCE) == TEAM_ALLIANCE) + DoScriptText(SAY_JAYNA_OUTRO_2, pNpcDialog); + else + DoScriptText(SAY_SYLVANAS_OUTRO_2, pNpcDialog); + } + events.ScheduleEvent(EVENT_OUTRO_3, 8500); + break; + } + case EVENT_OUTRO_3: + DoScriptText(SAY_KRICK_OUTRO_3, me); + events.ScheduleEvent(EVENT_OUTRO_4, 12000); + break; + case EVENT_OUTRO_4: + { + Creature* pNpcDialog = me->GetCreature(*me, uiNpcOutroDialog); + if (pNpcDialog) + { + if (pInstance->GetData(DATA_TEAM_IN_INSTANCE) == TEAM_ALLIANCE) + DoScriptText(SAY_JAYNA_OUTRO_4, pNpcDialog); + else + DoScriptText(SAY_SYLVANAS_OUTRO_4, pNpcDialog); + } + events.ScheduleEvent(EVENT_OUTRO_5, 8000); + break; + } + case EVENT_OUTRO_5: + DoScriptText(SAY_KRICK_OUTRO_5, me); + events.ScheduleEvent(EVENT_OUTRO_6, 4000); + break; + case EVENT_OUTRO_6: + // TODO spawn Tyrannus at some distance and MovePoint near-by (flying on rimefang) + // store uiTyrannus + // Adjust timer so tyrannus has time to come + uiTyrannus = (pInstance ? pInstance->GetData64(DATA_TYRANNUS) : 0); + events.ScheduleEvent(EVENT_OUTRO_7, 1); + break; + case EVENT_OUTRO_7: + if (Creature *pTyrannus = me->GetCreature(*me, uiTyrannus)) + DoScriptText(SAY_TYRANNUS_OUTRO_7, pTyrannus); + events.ScheduleEvent(EVENT_OUTRO_8, 7000); + break; + case EVENT_OUTRO_8: + DoScriptText(SAY_KRICK_OUTRO_8, me); + // TODO: Tyrannus starts killing Krick. + // there shall be some visual spell effect + events.ScheduleEvent(EVENT_OUTRO_9, 6000); + break; + case EVENT_OUTRO_9: + // tyrannus kills krick + me->SetStandState(UNIT_STAND_STATE_DEAD); + me->SetHealth(0); + + if (Creature *pTyrannus = me->GetCreature(*me, uiTyrannus)) + DoScriptText(SAY_TYRANNUS_OUTRO_9, pTyrannus); + + events.ScheduleEvent(EVENT_OUTRO_10, 12000); + break; + case EVENT_OUTRO_10: + { + Creature* pNpcDialog = me->GetCreature(*me, uiNpcOutroDialog); + if (pNpcDialog) + { + if (pInstance->GetData(DATA_TEAM_IN_INSTANCE) == TEAM_ALLIANCE) + DoScriptText(SAY_JAYNA_OUTRO_10, pNpcDialog); + else + DoScriptText(SAY_SYLVANAS_OUTRO_10, pNpcDialog); + } + + // End of OUTRO. for now... + events.ScheduleEvent(EVENT_OUTRO_END, 8000); + break; + } + case EVENT_OUTRO_END: + { + Creature* pNpcDialog = me->GetCreature(*me, uiNpcOutroDialog); + if (pNpcDialog) + pNpcDialog->DisappearAndDie(); + + me->DisappearAndDie(); + break; + } + } + return; + } + } +}; + +CreatureAI* GetAI_boss_ick(Creature* pCreature) +{ + return new boss_ickAI(pCreature); +} + +CreatureAI* GetAI_boss_krick(Creature* pCreature) +{ + return new boss_krickAI(pCreature); +} + +void AddSC_boss_ick() +{ + Script *newscript; + newscript = new Script; + newscript->Name = "boss_ick"; + newscript->GetAI = &GetAI_boss_ick; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "boss_krick"; + newscript->GetAI = &GetAI_boss_krick; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp new file mode 100644 index 00000000000..55ffa0b4e4b --- /dev/null +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp @@ -0,0 +1,273 @@ +/* Copyright (C) 2006 - 2010 TrinityCore + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "ScriptedPch.h" +#include "pit_of_saron.h" + +/* + * SDComment: TODO: + * - implement aura for spell Overlord Brand. + * - Intro/Outro + * - improve script of Rimefang + */ + +enum Yells +{ + SAY_AMBUSH_1 = -1658050, + SAY_AMBUSH_2 = -1658051, + SAY_GAUNTLET_START = -1658052, + SAY_INTRO_1 = -1658053, + SAY_INTRO_2 = -1658054, + + SAY_AGGRO = -1658055, + SAY_SLAY_1 = -1658056, + SAY_SLAY_2 = -1658057, + SAY_DEATH = -1658058, + SAY_MARK_RIMEFANG_1 = -1658059, + SAY_MARK_RIMEFANG_2 = -1658060, + SAY_DARK_MIGHT_1 = -1658061, + SAY_DARK_MIGHT_2 = -1658062, + + SAY_GORKUN_OUTRO_1 = -1658063, + SAY_GORKUN_OUTRO_2 = -1658064, + SAY_JAYNA_OUTRO_3 = -1658065, + SAY_SYLVANAS_OUTRO_3 = -1658066, + SAY_JAYNA_OUTRO_4 = -1658067, + SAY_SYLVANAS_OUTRO_4 = -1658068, + SAY_JAYNA_OUTRO_5 = -1658069, +}; + +enum Spells +{ + SPELL_FORCEFUL_SMASH = 69155, + H_SPELL_FORCEFUL_SMASH = 69627, + SPELL_OVERLORDS_BRAND = 69172, + SPELL_DARK_MIGHT = 69167, + H_SPELL_DARK_MIGHT = 69629, + SPELL_HOARFROST = 69246, + SPELL_MARK_OF_RIMEFANG = 69275, + SPELL_ICY_BLAST = 69233, + H_SPELL_ICY_BLAST = 69646, + SPELL_ICY_BLAST_2 = 69238, + H_SPELL_ICY_BLAST_2 = 69628, +}; + +enum Events +{ + EVENT_NONE, + EVENT_FORCEFUL_SMASH, + EVENT_OVERLORDS_BRAND, + EVENT_DARK_MIGHT, + + // Rimefang + EVENT_MARK_OF_RIMEFANG, + EVENT_HOARFROST, + EVENT_ICY_BLAST, + EVENT_ICY_BLAST_2, +}; + +enum Misc +{ + SEAT_TYRANNUS = 0 +}; + +struct boss_tyrannusAI : public ScriptedAI +{ + boss_tyrannusAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + } + + ScriptedInstance* pInstance; + EventMap events; + + void Reset() + { + events.Reset(); + + if (pInstance) + pInstance->SetData(DATA_TYRANNUS_EVENT, NOT_STARTED); + } + + Creature* GetRimefang() + { + return me->GetCreature(*me, pInstance->GetData64(DATA_RIMEFANG)); + } + + void EnterCombat(Unit* /*who*/) + { + DoScriptText(SAY_AGGRO, me); + me->ExitVehicle(); + + // restore health if any damage done during intro + me->SetHealth(me->GetMaxHealth()); + + if (pInstance) + pInstance->SetData(DATA_TYRANNUS_EVENT, IN_PROGRESS); + + events.ScheduleEvent(EVENT_FORCEFUL_SMASH, 10000); + events.ScheduleEvent(EVENT_OVERLORDS_BRAND, 35000); + events.ScheduleEvent(EVENT_DARK_MIGHT, 40000); + } + + void KilledUnit(Unit * /*victim*/) + { + DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + } + + void JustDied(Unit* /*killer*/) + { + DoScriptText(SAY_DEATH, me); + + if (pInstance) + { + pInstance->SetData(DATA_TYRANNUS_EVENT, DONE); + if (Creature* pRimefang = GetRimefang()) + pRimefang->ForcedDespawn(); + } + } + + void UpdateAI(const uint32 diff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + events.Update(diff); + + if (me->hasUnitState(UNIT_STAT_CASTING)) + return; + + while (uint32 eventId = events.ExecuteEvent()) + { + switch(eventId) + { + case EVENT_FORCEFUL_SMASH: + DoCast(me->getVictim(), SPELL_FORCEFUL_SMASH); + events.ScheduleEvent(EVENT_FORCEFUL_SMASH, 10000); + return; + case EVENT_OVERLORDS_BRAND: + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, SPELL_OVERLORDS_BRAND); + events.ScheduleEvent(EVENT_OVERLORDS_BRAND, 45000); + return; + case EVENT_DARK_MIGHT: + DoScriptText(SAY_DARK_MIGHT_1, me); + DoScriptText(SAY_DARK_MIGHT_2, me); + DoCast(me, SPELL_DARK_MIGHT); + events.ScheduleEvent(EVENT_DARK_MIGHT, 60000); + return; + } + } + + DoMeleeAttackIfReady(); + } +}; + +struct boss_rimefangAI : public ScriptedAI +{ + boss_rimefangAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + } + + ScriptedInstance* pInstance; + EventMap events; + + void Reset() + { + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE); + me->InterruptSpell(CURRENT_GENERIC_SPELL); + me->HandleEmoteCommand(EMOTE_ONESHOT_LIFTOFF); + me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); + events.Reset(); + } + + void EnterCombat(Unit* /*who*/) + { + me->InterruptSpell(CURRENT_GENERIC_SPELL); + me->HandleEmoteCommand(EMOTE_ONESHOT_LIFTOFF); + me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); + events.ScheduleEvent(EVENT_MARK_OF_RIMEFANG, 25000); + events.ScheduleEvent(EVENT_ICY_BLAST, 35000); + } + + void UpdateAI(const uint32 diff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + events.Update(diff); + + if (me->hasUnitState(UNIT_STAT_CASTING)) + return; + + while (uint32 eventId = events.ExecuteEvent()) + { + switch(eventId) + { + case EVENT_MARK_OF_RIMEFANG: + DoScriptText(SAY_MARK_RIMEFANG_1, me); + DoScriptText(SAY_MARK_RIMEFANG_2, me); + + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, SPELL_MARK_OF_RIMEFANG); + events.ScheduleEvent(EVENT_HOARFROST, 5000); + return; + case EVENT_HOARFROST: + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, SPELL_HOARFROST); + events.ScheduleEvent(EVENT_MARK_OF_RIMEFANG, 20000); + return; + case EVENT_ICY_BLAST: + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, SPELL_ICY_BLAST); + events.ScheduleEvent(EVENT_ICY_BLAST_2, 5000); + return; + case EVENT_ICY_BLAST_2: + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget->getVictim(), SPELL_ICY_BLAST_2); + events.ScheduleEvent(EVENT_ICY_BLAST, 30000); + return; + } + } + } +}; + +CreatureAI* GetAI_boss_tyrannus(Creature* pCreature) +{ + return new boss_tyrannusAI(pCreature); +} + +CreatureAI* GetAI_boss_rimefang(Creature* pCreature) +{ + return new boss_rimefangAI(pCreature); +} + +void AddSC_boss_tyrannus() +{ + Script *newscript; + newscript = new Script; + newscript->Name="boss_tyrannus"; + newscript->GetAI = &GetAI_boss_tyrannus; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name="boss_rimefang"; + newscript->GetAI = &GetAI_boss_rimefang; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp new file mode 100644 index 00000000000..8512eca24c1 --- /dev/null +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp @@ -0,0 +1,236 @@ +/* Copyright (C) 2006 - 2010 TrinityCore + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "ScriptedPch.h" +#include "pit_of_saron.h" + +#define MAX_ENCOUNTER 3 + +/* Pit of Saron encounters: +0- Forgemaster Garfrost +1- Krick and Ick +2- Scourgelord Tyrannus +*/ + +struct instance_pit_of_saron : public ScriptedInstance +{ + instance_pit_of_saron(Map* pMap) : ScriptedInstance(pMap) {}; + + uint64 uiKrick; + uint64 uiIck; + uint64 uiGarfrost; + uint64 uiTyrannus; + uint64 uiRimefang; + + uint64 uiJainaOrSylvanas1; + uint64 uiJainaOrSylvanas2; + + uint32 uiTeamInInstance; + uint32 uiEncounter[MAX_ENCOUNTER]; + + void Initialize() + { + for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) + uiEncounter[i] = NOT_STARTED; + + uiGarfrost = 0; + uiKrick = 0; + uiIck = 0; + uiTyrannus = 0; + } + + bool IsEncounterInProgress() const + { + for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) + if (uiEncounter[i] == IN_PROGRESS) + return true; + + return false; + } + + void OnCreatureCreate(Creature* pCreature, bool /*add*/) + { + Map::PlayerList const &players = instance->GetPlayers(); + + if (!players.isEmpty()) + { + if (Player* pPlayer = players.begin()->getSource()) + uiTeamInInstance = pPlayer->GetTeam(); + } + + switch(pCreature->GetEntry()) + { + case CREATURE_KRICK: + uiKrick = pCreature->GetGUID(); + break; + + case CREATURE_ICK: + uiIck = pCreature->GetGUID(); + break; + + case CREATURE_GARFROST: + uiGarfrost = pCreature->GetGUID(); + break; + + case CREATURE_TYRANNUS: + uiTyrannus = pCreature->GetGUID(); + break; + + case CREATURE_RIMEFANG: + uiRimefang = pCreature->GetGUID(); + break; + + case NPC_SYLVANAS_PART1: + if (uiTeamInInstance == ALLIANCE) + pCreature->UpdateEntry(NPC_JAINA_PART1, ALLIANCE); + uiJainaOrSylvanas1 = pCreature->GetGUID(); + break; + case NPC_SYLVANAS_PART2: + if (uiTeamInInstance == ALLIANCE) + pCreature->UpdateEntry(NPC_JAINA_PART2, ALLIANCE); + uiJainaOrSylvanas2 = pCreature->GetGUID(); + break; + case NPC_KILARA: + if (uiTeamInInstance == ALLIANCE) + pCreature->UpdateEntry(NPC_ELANDRA, ALLIANCE); + break; + case NPC_KORALEN: + if (uiTeamInInstance == ALLIANCE) + pCreature->UpdateEntry(NPC_KORLAEN, ALLIANCE); + break; + case NPC_CHAMPION_1_HORDE: + if (uiTeamInInstance == ALLIANCE) + pCreature->UpdateEntry(NPC_CHAMPION_1_ALLIANCE, ALLIANCE); + break; + case NPC_CHAMPION_2_HORDE: + if (uiTeamInInstance == ALLIANCE) + pCreature->UpdateEntry(NPC_CHAMPION_2_ALLIANCE, ALLIANCE); + break; + case NPC_CHAMPION_3_HORDE: // No 3rd set for Alliance? + if (uiTeamInInstance == ALLIANCE) + pCreature->UpdateEntry(NPC_CHAMPION_2_ALLIANCE, ALLIANCE); + break; + } + } + + uint64 GetData64(uint32 identifier) + { + switch(identifier) + { + case DATA_GARFROST: return uiGarfrost; + case DATA_KRICK: return uiKrick; + case DATA_ICK: return uiIck; + case DATA_TYRANNUS: return uiTyrannus; + case DATA_RIMEFANG: return uiRimefang; + + case DATA_JAINA_SYLVANAS_1: return uiJainaOrSylvanas1; + case DATA_JAINA_SYLVANAS_2: return uiJainaOrSylvanas2; + } + + return 0; + } + + void SetData(uint32 type, uint32 data) + { + switch(type) + { + case DATA_GARFROST_EVENT: + uiEncounter[0] = data; + break; + case DATA_TYRANNUS_EVENT: + uiEncounter[1] = data; + break; + case DATA_KRICKANDICK_EVENT: + uiEncounter[2] = data; + break; + } + + if (data == DONE) + SaveToDB(); + } + + uint32 GetData(uint32 type) + { + switch(type) + { + case DATA_GARFROST_EVENT: return uiEncounter[0]; + case DATA_TYRANNUS_EVENT: return uiEncounter[1]; + case DATA_KRICKANDICK_EVENT: return uiEncounter[2]; + } + + return 0; + } + + std::string GetSaveData() + { + OUT_SAVE_INST_DATA; + + std::string str_data; + + std::ostringstream saveStream; + saveStream << "P S " << uiEncounter[0] << " " << uiEncounter[1] << " " << uiEncounter[2]; + + str_data = saveStream.str(); + + OUT_SAVE_INST_DATA_COMPLETE; + return str_data; + } + + void Load(const char* in) + { + if (!in) + { + OUT_LOAD_INST_DATA_FAIL; + return; + } + + OUT_LOAD_INST_DATA(in); + + char dataHead1, dataHead2; + uint16 data0, data1, data2; + + std::istringstream loadStream(in); + loadStream >> dataHead1 >> dataHead2 >> data0 >> data1 >> data2; + + if (dataHead1 == 'P' && dataHead2 == 'S') + { + uiEncounter[0] = data0; + uiEncounter[1] = data1; + uiEncounter[2] = data2; + + for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) + if (uiEncounter[i] == IN_PROGRESS) + uiEncounter[i] = NOT_STARTED; + + } else OUT_LOAD_INST_DATA_FAIL; + + OUT_LOAD_INST_DATA_COMPLETE; + } +}; + +InstanceData* GetInstanceData_instance_pit_of_saron(Map* pMap) +{ + return new instance_pit_of_saron(pMap); +} + +void AddSC_instance_pit_of_saron() +{ + Script *newscript; + newscript = new Script; + newscript->Name = "instance_pit_of_saron"; + newscript->GetInstanceData = &GetInstanceData_instance_pit_of_saron; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp new file mode 100644 index 00000000000..bc53efc7033 --- /dev/null +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp @@ -0,0 +1,1101 @@ +/* Copyright (C) 2006 - 2010 TrinityCore + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "ScriptedPch.h" +#include "pit_of_saron.h" + +/***************************************SPELLS*************************************/ +// Ymirjar Wrathbringer +#define SPELL_BLIGHT DUNGEON_MODE(69603,70285) + +//Ymirjar Skycaller +#define SPELL_FROSTBLADE 70291 +#define SPELL_GLACIAL_STRIKE 70292 + +//Ymirjar Flamebearer +#define SPELL_FIREBALL DUNGEON_MODE(69583,70282) +#define SPELL_HELLFIRE DUNGEON_MODE(69586,70283) +#define SPELL_TACTICAL_BLINK 69584 + +//Ymirjar Deathbringer +#define SPELL_EMPOWERED_SHADOW_BOLT DUNGEON_MODE(69528,70281) +#define SPELL_SUMMON_UNDEAD 69516 + +//Wrathbone Laborer +#define SPELL_BLINDING_DIRT 70302 +#define SPELL_PUNCTURE_WOUND DUNGEON_MODE(70278,70279) +#define SPELL_SHOVELLED DUNGEON_MODE(69572,70280) + +//Wrathbone Coldwraith +#define SPELL_FREEZING_CIRCLE DUNGEON_MODE(69574,70276) +#define SPELL_FROSTBOLT DUNGEON_MODE(69573,70277) + +//Stonespine Gargoyle +#define SPELL_GARGOYLE_STRIKE DUNGEON_MODE(69520,70275) +#define SPELL_STONEFORM 69575 + +// Plagueborn Horror +#define SPELL_BLIGHT_BOMB 69582 +#define SPELL_PUSTULANT_FLESH DUNGEON_MODE(69581,70273) +#define SPELL_TOXIC_WASTE 70274 + +//Iceborn Proto-Drake +#define SPELL_FROST_BREATH DUNGEON_MODE(69527,70272) + +//Hungering Ghoul +#define SPELL_DEVOUR_FLESH 70393 + +//Fallen Warrior +#define SPELL_ARCING_SLICE 69579 +#define SPELL_DEMORALIZING_SHOUT 61044 +#define SPELL_SHIELD_BLOCK 69580 + +//Deathwhisper Torturer +#define SPELL_BLACK_BRAND 70392 +#define SPELL_CURSE_OF_AGONY 70391 + +//Deathwhisper Shadowcaster +#define SPELL_SHADOW_BOLT DUNGEON_MODE(70386,70387) + +//Deathwhisper Necrolyte +#define SPELL_CONVERSION_BEAM DUNGEON_MODE(69578,70269) +#define SPELL_SHADOW_BOLT_2 DUNGEON_MODE(69577,70270) + +//Wrathbone Sorcerer +#define SPELL_SHADOW_BOLT_3 DUNGEON_MODE(70386,70387) + +//Geist Ambusher +#define SPELL_LEAPING_FACE_MAUL DUNGEON_MODE(69504,70271) + +/****************************************EVENTS************************************/ +enum eEvents +{ + EVENT_NONE, + + // Ymirjar Wrathbringer + EVENT_BLIGHT, + + // Ymirjar Skycaller + EVENT_FROSTBLADE, + EVENT_GLACIAL_STRIKE, + + // Ymirjar Flamebearer + EVENT_FIREBALL, + EVENT_HELLFIRE, + EVENT_TACTICAL_BLINK, + + //Ymirjar Deathbringer + EVENT_EMPOWERED_SHADOW_BOLT, + EVENT_SUMMON_UNDEAD, + + //Wrathbone Laborer + EVENT_BLINDING_DIRT, + EVENT_PUNCTURE_WOUND, + EVENT_SHOVELLED, + + //Wrathbone Coldwraith + EVENT_FREEZING_CIRCLE, + EVENT_FROSTBOLT, + + //Stonespine Gargoyle + EVENT_GARGOYLE_STRIKE, + EVENT_STONEFORM, + + //Plagueborn Horror + EVENT_BLIGHT_BOMB, + EVENT_PUSTULANT_FLESH, + EVENT_TOXIC_WASTE, + + //Iceborn Proto-Drake + EVENT_FROST_BREATH, + + //Hungering Ghoul + EVENT_DEVOUR_FLESH, + + //Fallen Warrior + EVENT_ARCING_SLICE, + EVENT_DEMORALIZING_SHOUT, + EVENT_SHIELD_BLOCK, + + //Deathwhisper Torturer + EVENT_BLACK_BRAND, + EVENT_CURSE_OF_AGONY, + + //Deathwhisper Shadowcaster + EVENT_SHADOW_BOLT, + + //Deathwhisper Necrolyte + EVENT_CONVERSION_BEAM, + EVENT_SHADOW_BOLT_2, + + EVENT_SHADOW_BOLT_3, + + //Geist Ambusher + EVENT_LEAPING_FACE_MAUL, +}; + +/****************************************AI****************************************/ +struct mob_ymirjar_wrathbringerAI : public ScriptedAI +{ + mob_ymirjar_wrathbringerAI(Creature *c) : ScriptedAI(c) + { + } + + EventMap events; + + void Reset() + { + events.Reset(); + } + + void EnterCombat(Unit* /*who*/) + { + events.ScheduleEvent(EVENT_BLIGHT, 7000); + } + + void UpdateAI(const uint32 diff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + events.Update(diff); + + if (me->hasUnitState(UNIT_STAT_CASTING)) + return; + + while (uint32 eventId = events.ExecuteEvent()) + { + switch(eventId) + { + case EVENT_BLIGHT: + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, SPELL_BLIGHT); + events.RescheduleEvent(EVENT_BLIGHT, 8000); + return; + } + } + + DoMeleeAttackIfReady(); + } +}; + +struct mob_ymirjar_skyCallerAI: public ScriptedAI +{ + mob_ymirjar_skyCallerAI(Creature *c) : ScriptedAI(c) + { + } + + EventMap events; + + void Reset() + { + events.Reset(); + } + + void EnterCombat(Unit* /*who*/) + { + events.ScheduleEvent(EVENT_FROSTBLADE, 1); + events.ScheduleEvent(EVENT_GLACIAL_STRIKE, 8000); + } + + void UpdateAI(const uint32 diff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + events.Update(diff); + + if (me->hasUnitState(UNIT_STAT_CASTING)) + return; + + while (uint32 eventId = events.ExecuteEvent()) + { + switch(eventId) + { + case EVENT_GLACIAL_STRIKE: + DoCast(me->getVictim(), SPELL_GLACIAL_STRIKE); + events.RescheduleEvent(EVENT_GLACIAL_STRIKE, 8000); + return; + case EVENT_FROSTBLADE: + DoCast(me, SPELL_FROSTBLADE); + events.CancelEvent(EVENT_FROSTBLADE); + return; + } + } + + DoMeleeAttackIfReady(); + } +}; + +struct mob_ymirjar_flamebearerAI: public ScriptedAI +{ + mob_ymirjar_flamebearerAI(Creature *c) : ScriptedAI(c) + { + } + + EventMap events; + + void Reset() + { + events.Reset(); + } + + void EnterCombat(Unit* /*who*/) + { + events.ScheduleEvent(EVENT_FIREBALL, 4000); + events.ScheduleEvent(EVENT_HELLFIRE, 8000); + events.ScheduleEvent(EVENT_TACTICAL_BLINK, 15000); + } + + void UpdateAI(const uint32 diff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + events.Update(diff); + + if (me->hasUnitState(UNIT_STAT_CASTING)) + return; + + while (uint32 eventId = events.ExecuteEvent()) + { + switch(eventId) + { + case EVENT_FIREBALL: + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, SPELL_FIREBALL); + events.RescheduleEvent(EVENT_FIREBALL, 5000); + return; + case EVENT_HELLFIRE: + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, SPELL_HELLFIRE); + events.RescheduleEvent(EVENT_HELLFIRE, 10000); + return; + case EVENT_TACTICAL_BLINK: + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, SPELL_TACTICAL_BLINK); + events.RescheduleEvent(EVENT_TACTICAL_BLINK, 12000); + return; + } + } + + DoMeleeAttackIfReady(); + } +}; + +struct mob_ymirjar_deathbringerAI: public ScriptedAI +{ + mob_ymirjar_deathbringerAI(Creature *c) : ScriptedAI(c) + { + } + + EventMap events; + + void Reset() + { + events.Reset(); + } + + void EnterCombat(Unit* /*who*/) + { + events.ScheduleEvent(EVENT_EMPOWERED_SHADOW_BOLT, 8000); + } + + void UpdateAI(const uint32 diff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + events.Update(diff); + + if (me->hasUnitState(UNIT_STAT_CASTING)) + return; + + while (uint32 eventId = events.ExecuteEvent()) + { + switch(eventId) + { + case EVENT_EMPOWERED_SHADOW_BOLT: + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, SPELL_EMPOWERED_SHADOW_BOLT); + events.RescheduleEvent(EVENT_EMPOWERED_SHADOW_BOLT, 8000); + return; + } + } + + DoMeleeAttackIfReady(); + } +}; + +struct mob_wrathbone_laborerAI: public ScriptedAI +{ + mob_wrathbone_laborerAI(Creature *c) : ScriptedAI(c) + { + } + + EventMap events; + + void Reset() + { + events.Reset(); + } + + void EnterCombat(Unit* /*who*/) + { + events.ScheduleEvent(EVENT_BLINDING_DIRT, 8000); + events.ScheduleEvent(EVENT_PUNCTURE_WOUND, 9000); + events.ScheduleEvent(EVENT_SHOVELLED, 5000); + } + + void UpdateAI(const uint32 diff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + events.Update(diff); + + if (me->hasUnitState(UNIT_STAT_CASTING)) + return; + + while (uint32 eventId = events.ExecuteEvent()) + { + switch(eventId) + { + case EVENT_BLINDING_DIRT: + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, SPELL_BLINDING_DIRT); + events.RescheduleEvent(EVENT_BLINDING_DIRT, 10000); + return; + case EVENT_PUNCTURE_WOUND: + DoCast(me->getVictim(), SPELL_PUNCTURE_WOUND); + events.RescheduleEvent(EVENT_PUNCTURE_WOUND, 9000); + return; + case EVENT_SHOVELLED: + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, SPELL_SHOVELLED); + events.RescheduleEvent(EVENT_SHOVELLED, 7000); + return; + } + } + + DoMeleeAttackIfReady(); + } +}; + +struct mob_wrathbone_coldwraithAI: public ScriptedAI +{ + mob_wrathbone_coldwraithAI(Creature *c) : ScriptedAI(c) + { + } + + EventMap events; + + void Reset() + { + events.Reset(); + } + + void EnterCombat(Unit* /*who*/) + { + events.ScheduleEvent(EVENT_FREEZING_CIRCLE, 9000); + events.ScheduleEvent(EVENT_FROSTBOLT, 5000); + } + + void UpdateAI(const uint32 diff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + events.Update(diff); + + if (me->hasUnitState(UNIT_STAT_CASTING)) + return; + + while (uint32 eventId = events.ExecuteEvent()) + { + switch(eventId) + { + case EVENT_FREEZING_CIRCLE: + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, SPELL_FREEZING_CIRCLE); + events.RescheduleEvent(EVENT_FREEZING_CIRCLE, 9000); + return; + case EVENT_FROSTBOLT: + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, SPELL_FROSTBOLT); + events.RescheduleEvent(EVENT_FROSTBOLT, 5000); + return; + } + } + + DoMeleeAttackIfReady(); + } +}; + +struct mob_stonespine_gargoyleAI: public ScriptedAI +{ + mob_stonespine_gargoyleAI(Creature *c) : ScriptedAI(c) + { + } + + EventMap events; + + void Reset() + { + events.Reset(); + } + + void EnterCombat(Unit* /*who*/) + { + events.ScheduleEvent(EVENT_GARGOYLE_STRIKE, 5000); + } + + void UpdateAI(const uint32 diff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + events.Update(diff); + + if (me->hasUnitState(UNIT_STAT_CASTING)) + return; + + while (uint32 eventId = events.ExecuteEvent()) + { + switch(eventId) + { + case EVENT_GARGOYLE_STRIKE: + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, SPELL_GARGOYLE_STRIKE); + events.RescheduleEvent(EVENT_GARGOYLE_STRIKE, 6000); + return; + case EVENT_STONEFORM: + if (HealthBelowPct(10)) + DoCast(me, SPELL_STONEFORM); + return; + } + } + + DoMeleeAttackIfReady(); + } +}; + +struct mob_plagueborn_horrorAI: public ScriptedAI +{ + mob_plagueborn_horrorAI(Creature *c) : ScriptedAI(c) + { + } + + EventMap events; + + void Reset() + { + events.Reset(); + } + + void EnterCombat(Unit* /*who*/) + { + events.ScheduleEvent(EVENT_BLIGHT_BOMB, 999999); + events.ScheduleEvent(EVENT_PUSTULANT_FLESH, 5000); + events.ScheduleEvent(EVENT_TOXIC_WASTE, 8000); + } + + void UpdateAI(const uint32 diff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + events.Update(diff); + + if (me->hasUnitState(UNIT_STAT_CASTING)) + return; + + while (uint32 eventId = events.ExecuteEvent()) + { + switch(eventId) + { + case EVENT_BLIGHT_BOMB: + if (HealthBelowPct(15)) + DoCast(me, SPELL_BLIGHT_BOMB); + return; + case EVENT_PUSTULANT_FLESH: + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, SPELL_PUSTULANT_FLESH); + events.RescheduleEvent(EVENT_PUSTULANT_FLESH, 10000); + return; + case EVENT_TOXIC_WASTE: + DoCast(me, SPELL_TOXIC_WASTE); + events.RescheduleEvent(EVENT_TOXIC_WASTE, 8000); + return; + } + } + + DoMeleeAttackIfReady(); + } +}; + +struct mob_iceborn_protodrakeAI: public ScriptedAI +{ + mob_iceborn_protodrakeAI(Creature *c) : ScriptedAI(c) + { + } + + EventMap events; + + void Reset() + { + events.Reset(); + } + + void EnterCombat(Unit* /*who*/) + { + events.ScheduleEvent(EVENT_FROST_BREATH, 5000); + } + + void UpdateAI(const uint32 diff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + events.Update(diff); + + if (me->hasUnitState(UNIT_STAT_CASTING)) + return; + + while (uint32 eventId = events.ExecuteEvent()) + { + switch(eventId) + { + case EVENT_FROST_BREATH: + DoCast(me->getVictim(), SPELL_FROST_BREATH); + events.RescheduleEvent(EVENT_FROST_BREATH, 10000); + return; + } + } + + DoMeleeAttackIfReady(); + } +}; + +struct mob_hungering_ghoulAI: public ScriptedAI +{ + mob_hungering_ghoulAI(Creature *c) : ScriptedAI(c) + { + } + + EventMap events; + + void Reset() + { + events.Reset(); + } + + void EnterCombat(Unit* /*who*/) + { + events.ScheduleEvent(EVENT_DEVOUR_FLESH, 4000); + } + + void UpdateAI(const uint32 diff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + events.Update(diff); + + if (me->hasUnitState(UNIT_STAT_CASTING)) + return; + + while (uint32 eventId = events.ExecuteEvent()) + { + switch(eventId) + { + case EVENT_DEVOUR_FLESH: + DoCast(me->getVictim(), SPELL_DEVOUR_FLESH); + events.RescheduleEvent(EVENT_DEVOUR_FLESH, 8000); + return; + } + } + + DoMeleeAttackIfReady(); + } +}; + +struct mob_fallen_warriorAI: public ScriptedAI +{ + mob_fallen_warriorAI(Creature *c) : ScriptedAI(c) + { + } + + EventMap events; + + void Reset() + { + events.Reset(); + } + + void EnterCombat(Unit* /*who*/) + { + events.ScheduleEvent(EVENT_ARCING_SLICE, 8000); + events.ScheduleEvent(EVENT_DEMORALIZING_SHOUT, 20000); + events.ScheduleEvent(EVENT_SHIELD_BLOCK, 8000); + } + + void UpdateAI(const uint32 diff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + events.Update(diff); + + if (me->hasUnitState(UNIT_STAT_CASTING)) + return; + + while (uint32 eventId = events.ExecuteEvent()) + { + switch(eventId) + { + case EVENT_ARCING_SLICE: + DoCast(me->getVictim(), SPELL_ARCING_SLICE); + events.RescheduleEvent(EVENT_ARCING_SLICE, 10000); + return; + case EVENT_DEMORALIZING_SHOUT: + DoCast(me, SPELL_DEMORALIZING_SHOUT); + events.RescheduleEvent(EVENT_DEMORALIZING_SHOUT, 20000); + return; + case EVENT_SHIELD_BLOCK: + DoCast(me->getVictim(), SPELL_SHIELD_BLOCK); + events.RescheduleEvent(EVENT_SHIELD_BLOCK, 8000); + return; + } + } + + DoMeleeAttackIfReady(); + } +}; + +struct mob_deathwhisper_torturerAI: public ScriptedAI +{ + mob_deathwhisper_torturerAI(Creature *c) : ScriptedAI(c) + { + } + + EventMap events; + + void Reset() + { + events.Reset(); + } + + void EnterCombat(Unit* /*who*/) + { + events.ScheduleEvent(EVENT_BLACK_BRAND, 10000); + events.ScheduleEvent(EVENT_CURSE_OF_AGONY, 6000); + } + + void UpdateAI(const uint32 diff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + events.Update(diff); + + if (me->hasUnitState(UNIT_STAT_CASTING)) + return; + + while (uint32 eventId = events.ExecuteEvent()) + { + switch(eventId) + { + case EVENT_BLACK_BRAND: + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, SPELL_BLACK_BRAND); + events.RescheduleEvent(EVENT_BLACK_BRAND, 10000); + return; + case EVENT_CURSE_OF_AGONY: + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, SPELL_CURSE_OF_AGONY); + events.RescheduleEvent(EVENT_CURSE_OF_AGONY, 13000); + return; + } + } + + DoMeleeAttackIfReady(); + } +}; + +struct mob_deathwhisper_shadowcasterAI: public ScriptedAI +{ + mob_deathwhisper_shadowcasterAI(Creature *c) : ScriptedAI(c) + { + } + + EventMap events; + + void Reset() + { + events.Reset(); + } + + void EnterCombat(Unit* /*who*/) + { + events.ScheduleEvent(EVENT_SHADOW_BOLT, 3000); + } + + void UpdateAI(const uint32 diff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + events.Update(diff); + + if (me->hasUnitState(UNIT_STAT_CASTING)) + return; + + while (uint32 eventId = events.ExecuteEvent()) + { + switch(eventId) + { + case EVENT_SHADOW_BOLT: + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, SPELL_SHADOW_BOLT); + events.RescheduleEvent(EVENT_SHADOW_BOLT, 5000); + return; + } + } + + DoMeleeAttackIfReady(); + } +}; + +struct mob_deathwhisper_necrolyteAI: public ScriptedAI +{ + mob_deathwhisper_necrolyteAI(Creature *c) : ScriptedAI(c) + { + } + + EventMap events; + + void Reset() + { + events.Reset(); + } + + void EnterCombat(Unit* /*who*/) + { + events.ScheduleEvent(EVENT_CONVERSION_BEAM, 12000); + events.ScheduleEvent(EVENT_SHADOW_BOLT_2, 4000); + } + + void UpdateAI(const uint32 diff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + events.Update(diff); + + if (me->hasUnitState(UNIT_STAT_CASTING)) + return; + + while (uint32 eventId = events.ExecuteEvent()) + { + switch(eventId) + { + case EVENT_CONVERSION_BEAM: + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, SPELL_CONVERSION_BEAM); + events.RescheduleEvent(EVENT_CONVERSION_BEAM, 12000); + return; + case EVENT_SHADOW_BOLT_2: + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, SPELL_SHADOW_BOLT_2); + events.RescheduleEvent(EVENT_SHADOW_BOLT_2, 5000); + return; + } + } + + DoMeleeAttackIfReady(); + } +}; + +struct mob_wrathbone_sorcererAI: public ScriptedAI +{ + mob_wrathbone_sorcererAI(Creature *c) : ScriptedAI(c) + { + } + + EventMap events; + + void Reset() + { + events.Reset(); + } + + void EnterCombat(Unit* /*who*/) + { + events.ScheduleEvent(EVENT_SHADOW_BOLT_3, 3000); + } + + void UpdateAI(const uint32 diff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + events.Update(diff); + + if (me->hasUnitState(UNIT_STAT_CASTING)) + return; + + while (uint32 eventId = events.ExecuteEvent()) + { + switch(eventId) + { + case EVENT_SHADOW_BOLT_3: + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, SPELL_SHADOW_BOLT_3); + events.RescheduleEvent(EVENT_SHADOW_BOLT_3, 5000); + return; + } + } + + DoMeleeAttackIfReady(); + } +}; + +struct mob_geist_ambusherAI: public ScriptedAI +{ + mob_geist_ambusherAI(Creature *c) : ScriptedAI(c) + { + } + + EventMap events; + + void Reset() + { + events.Reset(); + } + + void EnterCombat(Unit* /*who*/) + { + //Only here so when I figure out how to make it cast on an NPC i can do that. + events.ScheduleEvent(EVENT_LEAPING_FACE_MAUL, 99999); + } + + void UpdateAI(const uint32 diff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + events.Update(diff); + + if (me->hasUnitState(UNIT_STAT_CASTING)) + return; + + while (uint32 eventId = events.ExecuteEvent()) + { + switch(eventId) + { + //Should only be used on NPCs + case EVENT_LEAPING_FACE_MAUL: + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, SPELL_LEAPING_FACE_MAUL); + events.CancelEvent(EVENT_LEAPING_FACE_MAUL); + return; + } + } + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_mob_ymirjar_wrathbringerAI(Creature* pCreature) +{ + return new mob_ymirjar_wrathbringerAI(pCreature); +} + +CreatureAI* GetAI_mob_ymirjar_skyCallerAI(Creature* pCreature) +{ + return new mob_ymirjar_skyCallerAI(pCreature); +} + +CreatureAI* GetAI_mob_ymirjar_flamebearerAI(Creature* pCreature) +{ + return new mob_ymirjar_flamebearerAI(pCreature); +} + +CreatureAI* GetAI_mob_ymirjar_deathbringerAI(Creature* pCreature) +{ + return new mob_ymirjar_deathbringerAI(pCreature); +} + +CreatureAI* GetAI_mob_wrathbone_laborerAI(Creature* pCreature) +{ + return new mob_wrathbone_laborerAI(pCreature); +} + +CreatureAI* GetAI_mob_wrathbone_coldwraithAI(Creature* pCreature) +{ + return new mob_wrathbone_coldwraithAI(pCreature); +} + +CreatureAI* GetAI_mob_stonespine_gargoyleAI(Creature* pCreature) +{ + return new mob_stonespine_gargoyleAI(pCreature); +} + +CreatureAI* GetAI_mob_plagueborn_horrorAI(Creature* pCreature) +{ + return new mob_plagueborn_horrorAI(pCreature); +} + +CreatureAI* GetAI_mob_iceborn_protodrakeAI(Creature* pCreature) +{ + return new mob_iceborn_protodrakeAI(pCreature); +} + +CreatureAI* GetAI_mob_hungering_ghoulAI(Creature* pCreature) +{ + return new mob_hungering_ghoulAI(pCreature); +} + +CreatureAI* GetAI_mob_fallen_warriorAI(Creature* pCreature) +{ + return new mob_fallen_warriorAI(pCreature); +} + +CreatureAI* GetAI_mob_deathwhisper_torturerAI(Creature* pCreature) +{ + return new mob_deathwhisper_torturerAI(pCreature); +} + +CreatureAI* GetAI_mob_deathwhisper_shadowcasterAI(Creature* pCreature) +{ + return new mob_deathwhisper_shadowcasterAI(pCreature); +} + +CreatureAI* GetAI_mob_deathwhisper_necrolyteAI(Creature* pCreature) +{ + return new mob_deathwhisper_necrolyteAI(pCreature); +} + +CreatureAI* GetAI_mob_wrathbone_sorcererAI(Creature* pCreature) +{ + return new mob_wrathbone_sorcererAI(pCreature); +} + +CreatureAI* GetAI_mob_geist_ambusherAI(Creature* pCreature) +{ + return new mob_geist_ambusherAI(pCreature); +} + +void AddSC_pit_of_saron() +{ + Script *newscript; + newscript = new Script; + newscript->Name="mob_ymirjar_wrathbringer"; + newscript->GetAI = &GetAI_mob_ymirjar_wrathbringerAI; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name="mob_ymirjar_skycaller"; + newscript->GetAI = &GetAI_mob_ymirjar_skyCallerAI; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name="mob_ymirjar_flamebearer"; + newscript->GetAI = &GetAI_mob_ymirjar_flamebearerAI; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name="mob_ymirjar_deathbringer"; + newscript->GetAI = &GetAI_mob_ymirjar_deathbringerAI; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name="mob_wrathbone_laborer"; + newscript->GetAI = &GetAI_mob_wrathbone_laborerAI; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name="mob_wrathbone_coldwraith"; + newscript->GetAI = &GetAI_mob_wrathbone_coldwraithAI; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name="mob_stonespine_gargoyle"; + newscript->GetAI = &GetAI_mob_stonespine_gargoyleAI; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name="mob_plagueborn_horror"; + newscript->GetAI = &GetAI_mob_plagueborn_horrorAI; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name="mob_iceborn_protodrake"; + newscript->GetAI = &GetAI_mob_iceborn_protodrakeAI; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name="mob_hungering_ghoul"; + newscript->GetAI = &GetAI_mob_hungering_ghoulAI; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name="mob_fallen_warrior"; + newscript->GetAI = &GetAI_mob_fallen_warriorAI; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name="mob_deathwhisper_torturer"; + newscript->GetAI = &GetAI_mob_deathwhisper_torturerAI; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name="mob_deathwhisper_shadowcaster"; + newscript->GetAI = &GetAI_mob_deathwhisper_shadowcasterAI; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name="mob_deathwhisper_necrolyte"; + newscript->GetAI = &GetAI_mob_deathwhisper_necrolyteAI; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name="mob_wrathbone_sorcerer"; + newscript->GetAI = &GetAI_mob_wrathbone_sorcererAI; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name="mob_geist_ambusher"; + newscript->GetAI = &GetAI_mob_geist_ambusherAI; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h new file mode 100644 index 00000000000..4a221d17518 --- /dev/null +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h @@ -0,0 +1,63 @@ +/* Copyright (C) 2006 - 2010 TrinityCore + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef DEF_PIT_OF_SARON_H +#define DEF_PIT_OF_SARON_H + +enum Data +{ + DATA_GARFROST_EVENT, + DATA_KRICKANDICK_EVENT, + DATA_TYRANNUS_EVENT, + DATA_TEAM_IN_INSTANCE, +}; + +enum Data64 +{ + DATA_GARFROST, + DATA_KRICK, + DATA_ICK, + DATA_TYRANNUS, + DATA_RIMEFANG, + + DATA_JAINA_SYLVANAS_1, // GUID of either Jaina or Sylvanas part 1, depending on team, as it's the same spawn. + DATA_JAINA_SYLVANAS_2, // GUID of either Jaina or Sylvanas part 2, depending on team, as it's the same spawn. +}; + +enum Creatures +{ + CREATURE_GARFROST = 36494, + CREATURE_KRICK = 36477, + CREATURE_ICK = 36476, + CREATURE_TYRANNUS = 36658, + CREATURE_RIMEFANG = 36661, + + NPC_SYLVANAS_PART1 = 36990, + NPC_SYLVANAS_PART2 = 38189, + NPC_JAINA_PART1 = 36993, + NPC_JAINA_PART2 = 38188, + NPC_KILARA = 37583, + NPC_ELANDRA = 37774, + NPC_KORALEN = 37779, + NPC_KORLAEN = 37582, + NPC_CHAMPION_1_HORDE = 37584, + NPC_CHAMPION_2_HORDE = 37587, + NPC_CHAMPION_3_HORDE = 37588, + NPC_CHAMPION_1_ALLIANCE = 37496, + NPC_CHAMPION_2_ALLIANCE = 37497, +}; + +#endif diff --git a/src/server/scripts/Northrend/FrozenHalls/forge_of_souls/boss_bronjahm.cpp b/src/server/scripts/Northrend/FrozenHalls/forge_of_souls/boss_bronjahm.cpp deleted file mode 100644 index 59db2842735..00000000000 --- a/src/server/scripts/Northrend/FrozenHalls/forge_of_souls/boss_bronjahm.cpp +++ /dev/null @@ -1,263 +0,0 @@ -/* Copyright (C) 2006 - 2010 TrinityCore - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "ScriptedPch.h" -#include "forge_of_souls.h" - -/* - * TODO: - * - Fix Soul Storm spell and remove work around. - */ - -enum Yells -{ - SAY_AGGRO = -1632001, - SAY_SLAY_1 = -1632002, - SAY_SLAY_2 = -1632003, - SAY_DEATH = -1632004, - SAY_SOUL_STORM = -1632005, - SAY_CORRUPT_SOUL = -1632006, -}; - -enum Spells -{ - SPELL_MAGIC_S_BANE = 68793, - SPELL_CORRUPT_SOUL = 68839, - SPELL_CONSUME_SOUL = 68858, - SPELL_TELEPORT = 68988, - SPELL_FEAR = 68950, - SPELL_SOULSTORM = 68872, - SPELL_SOULSTORM_AURA = 68921, - SPELL_SHADOW_BOLT = 70043, -}; - -enum Events -{ - EVENT_NONE, - EVENT_SHADOW_BOLT, - EVENT_MAGIC_BANE, - EVENT_CORRUPT_SOUL, - EVENT_SOUL_STORM, - EVENT_SOUL_STORM_AURA, - EVENT_FEAR, -}; - -enum CombatPhases -{ - PHASE_1, - PHASE_2 -}; - -struct boss_bronjahmAI : public ScriptedAI -{ - boss_bronjahmAI(Creature *c) : ScriptedAI(c) - { - pInstance = me->GetInstanceData(); - } - - ScriptedInstance* pInstance; - EventMap events; - - CombatPhases phase; - - void Reset() - { - phase = PHASE_1; - me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE); - - events.Reset(); - events.ScheduleEvent(EVENT_SHADOW_BOLT, 2000); - events.ScheduleEvent(EVENT_MAGIC_BANE, urand(8000,15000)); - events.ScheduleEvent(EVENT_CORRUPT_SOUL, urand(25000,35000)); - - if (pInstance) - pInstance->SetData(DATA_BRONJAHM_EVENT, NOT_STARTED); - } - - void EnterCombat(Unit* /*who*/) - { - DoScriptText(SAY_AGGRO, me); - - if (pInstance) - pInstance->SetData(DATA_BRONJAHM_EVENT, IN_PROGRESS); - } - - void JustDied(Unit* /*killer*/) - { - DoScriptText(SAY_DEATH, me); - - if (pInstance) - pInstance->SetData(DATA_BRONJAHM_EVENT, DONE); - } - - void KilledUnit(Unit * /*who*/) - { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); - } - - // Cast aura spell on all players farther than 10y - void ApplySoulStorm() - { - std::list targetList; - - SelectTargetList(targetList, 100, SELECT_TARGET_TOPAGGRO, -10.0f); - if (targetList.empty()) - return; - - for (std::list::const_iterator itr = targetList.begin(); itr != targetList.end(); ++itr) - { - Unit* pUnit = (*itr); - if (pUnit && pUnit->isAlive()) - me->CastSpell(pUnit, SPELL_SOULSTORM_AURA, true); - } - } - - void UpdateAI(const uint32 diff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - events.Update(diff); - - if (me->hasUnitState(UNIT_STAT_CASTING)) - return; - - if (phase == PHASE_1 && HealthBelowPct(30)) - { - phase = PHASE_2; - DoCast(me,SPELL_TELEPORT); - me->GetMotionMaster()->Clear(); - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE); - events.CancelEvent(EVENT_CORRUPT_SOUL); - events.ScheduleEvent(EVENT_SOUL_STORM, 1000); - events.ScheduleEvent(EVENT_FEAR, urand(8000,12000)); - return; - } - - while (uint32 eventId = events.ExecuteEvent()) - { - switch(eventId) - { - case EVENT_CORRUPT_SOUL: - if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM,1)) - { - DoScriptText(SAY_CORRUPT_SOUL, me); - DoCast(pTarget,SPELL_CORRUPT_SOUL); - } - events.ScheduleEvent(EVENT_CORRUPT_SOUL, urand(25000,35000)); - break; - case EVENT_SOUL_STORM: - DoScriptText(SAY_SOUL_STORM, me); - // DoCast(me, SPELL_SOULSTORM); bug: put the aura without the limit of 10 yards. - events.ScheduleEvent(EVENT_SOUL_STORM_AURA, 1000); - break; - case EVENT_SOUL_STORM_AURA: - ApplySoulStorm(); - events.ScheduleEvent(EVENT_SOUL_STORM_AURA, 1000); - break; - case EVENT_FEAR: - if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM,1)) - DoCast(pTarget,SPELL_FEAR); - events.ScheduleEvent(EVENT_FEAR, urand(8000,12000)); - break; - case EVENT_SHADOW_BOLT: - DoCastVictim(SPELL_SHADOW_BOLT); - events.ScheduleEvent(EVENT_SHADOW_BOLT, 2000); - break; - case EVENT_MAGIC_BANE: - DoCastVictim(SPELL_MAGIC_S_BANE); - events.ScheduleEvent(EVENT_MAGIC_BANE, urand(8000,15000)); - break; - } - } - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_boss_bronjahm(Creature* pCreature) -{ - return new boss_bronjahmAI(pCreature); -} - -struct mob_corrupted_soul_fragmentAI : public ScriptedAI -{ - mob_corrupted_soul_fragmentAI(Creature *c) : ScriptedAI(c) - { - pInstance = me->GetInstanceData(); - } - - ScriptedInstance* pInstance; - - uint32 uiCheckTimer; - - void Reset() - { - uiCheckTimer = 0; // first check is immediate - } - - void UpdateAI(const uint32 diff) - { - if (uiCheckTimer <= diff) - { - if (pInstance) - { - Creature* pBronjham = Unit::GetCreature(*me, pInstance->GetData64(DATA_BRONJAHM)); - if (pBronjham && pBronjham->isAlive()) - { - if (me->IsWithinMeleeRange(pBronjham)) - { - pBronjham->CastSpell(pBronjham, SPELL_CONSUME_SOUL, true); - me->ForcedDespawn(); - } - else - { - Position pos; - pBronjham->GetPosition(&pos); - me->GetMotionMaster()->Clear(); - me->GetMotionMaster()->MovePoint(0, pos); - } - } - else - me->ForcedDespawn(); - } - uiCheckTimer = 500; - } - else - uiCheckTimer -= diff; - } -}; - -CreatureAI* GetAI_mob_corrupted_soul_fragment(Creature* pCreature) -{ - return new mob_corrupted_soul_fragmentAI(pCreature); -} - -void AddSC_boss_bronjahm() -{ - Script *newscript; - - newscript = new Script; - newscript->Name = "boss_bronjahm"; - newscript->GetAI = &GetAI_boss_bronjahm; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_corrupted_soul_fragment"; - newscript->GetAI = &GetAI_mob_corrupted_soul_fragment; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Northrend/FrozenHalls/forge_of_souls/boss_devourer_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/forge_of_souls/boss_devourer_of_souls.cpp deleted file mode 100644 index 6811ba953e2..00000000000 --- a/src/server/scripts/Northrend/FrozenHalls/forge_of_souls/boss_devourer_of_souls.cpp +++ /dev/null @@ -1,349 +0,0 @@ -/* Copyright (C) 2006 - 2010 TrinityCore - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "ScriptedPch.h" -#include "forge_of_souls.h" - -/* - * TODO: - * - Fix model id during unleash soul -> seems DB issue 36503 is missing (likewise 36504 is also missing). - * - Fix outro npc movement - */ - -#define PI 3.1415f - -enum Yells -{ - SAY_FACE_ANGER_AGGRO = -1632010, - SAY_FACE_DESIRE_AGGRO = -1632011, - SAY_FACE_ANGER_SLAY_1 = -1632012, - SAY_FACE_SORROW_SLAY_1 = -1632013, - SAY_FACE_DESIRE_SLAY_1 = -1632014, - SAY_FACE_ANGER_SLAY_2 = -1632015, - SAY_FACE_SORROW_SLAY_2 = -1632016, - SAY_FACE_DESIRE_SLAY_2 = -1632017, - SAY_FACE_SORROW_DEATH = -1632019, - SAY_FACE_DESIRE_DEATH = -1632020, - EMOTE_MIRRORED_SOUL = -1632021, - EMOTE_UNLEASH_SOUL = -1632022, - SAY_FACE_ANGER_UNLEASH_SOUL = -1632023, - SAY_FACE_SORROW_UNLEASH_SOUL = -1632024, - SAY_FACE_DESIRE_UNLEASH_SOUL = -1632025, - EMOTE_WAILING_SOUL = -1632026, - SAY_FACE_ANGER_WAILING_SOUL = -1632027, - SAY_FACE_DESIRE_WAILING_SOUL = -1632028, - - SAY_JAINA_OUTRO = -1632029, - SAY_SYLVANAS_OUTRO = -1632030, -}; - -enum Spells -{ - SPELL_PHANTOM_BLAST = 68982, - H_SPELL_PHANTOM_BLAST = 70322, - SPELL_MIRRORED_SOUL = 69051, - SPELL_WELL_OF_SOULS = 68820, - SPELL_WELL_OF_SOULS_VIS = 68854, - SPELL_UNLEASHED_SOULS = 68939, - SPELL_WAILING_SOULS_STARTING = 68912, // Initial spell cast at begining of wailing souls phase - SPELL_WAILING_SOULS_BEAM = 68875, // the beam visual - SPELL_WAILING_SOULS = 68873, // the actual spell - H_SPELL_WAILING_SOULS = 70324, -// 68871,68873,68875,68876,68899,68912,70324, -// 68899 trigger 68871 -}; - -enum Events -{ - EVENT_NONE, - EVENT_PHANTOM_BLAST, - EVENT_MIRRORED_SOUL, - EVENT_WELL_OF_SOULS, - EVENT_UNLEASHED_SOULS, - EVENT_WAILING_SOULS, - EVENT_WAILING_SOULS_TICK, - EVENT_FACE_ANGER, -}; - -enum eEnum -{ - ACHIEV_THREE_FACED = 4523, - DISPLAY_ANGER = 30148, - DISPLAY_SORROW = 30149, - DISPLAY_DESIRE = 30150, -}; - -struct -{ - uint32 entry[2]; - Position movePosition; -} outroPositions[] = -{ - { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5590.47, 2427.79, 705.935, 0.802851 } }, - { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5593.59, 2428.34, 705.935, 0.977384 } }, - { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5600.81, 2429.31, 705.935, 0.890118 } }, - { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5600.81, 2421.12, 705.935, 0.890118 } }, - { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5601.43, 2426.53, 705.935, 0.890118 } }, - { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5601.55, 2418.36, 705.935, 1.15192 } }, - { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5598, 2429.14, 705.935, 1.0472 } }, - { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5594.04, 2424.87, 705.935, 1.15192 } }, - { NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5597.89, 2421.54, 705.935, 0.610865 } }, - { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_2_HORDE, { 5598.57, 2434.62, 705.935, 1.13446 } }, - { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_2_HORDE, { 5585.46, 2417.99, 705.935, 1.06465 } }, - { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_2_HORDE, { 5605.81, 2428.42, 705.935, 0.820305 } }, - { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_2_HORDE, { 5591.61, 2412.66, 705.935, 0.925025 } }, - { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_2_HORDE, { 5593.9, 2410.64, 705.935, 0.872665 } }, - { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_2_HORDE, { 5586.76, 2416.73, 705.935, 0.942478 } }, - { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_3_HORDE, { 5592.23, 2419.14, 705.935, 0.855211 } }, - { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_3_HORDE, { 5594.61, 2416.87, 705.935, 0.907571 } }, - { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_3_HORDE, { 5589.77, 2421.03, 705.935, 0.855211 } }, - - { NPC_KORELN, NPC_LORALEN, { 5602.58, 2435.95, 705.935, 0.959931 } }, - { NPC_ELANDRA, NPC_KALIRA, { 5606.13, 2433.16, 705.935, 0.785398 } }, - { NPC_JAINA_PART2, NPC_SYLVANAS_PART2, { 5606.12, 2436.6, 705.935, 0.890118 } }, - - { 0, 0, { 0, 0, 0, 0 } } -}; - -struct boss_devourer_of_soulsAI : public ScriptedAI -{ - boss_devourer_of_soulsAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - } - - bool bThreeFaceAchievement; - - ScriptedInstance* pInstance; - EventMap events; - - // wailing soul event - float beamAngle; - float beamAngleDiff; - int8 wailingSoulTick; - - uint64 uiMirroredSoulTarget; - - void Reset() - { - me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE); - me->SetDisplayId(DISPLAY_ANGER); - me->SetReactState(REACT_AGGRESSIVE); - - events.Reset(); - - bThreeFaceAchievement = true; - uiMirroredSoulTarget = 0; - - if (pInstance) - pInstance->SetData(DATA_DEVOURER_EVENT, NOT_STARTED); - } - - void EnterCombat(Unit* /*who*/) - { - if (pInstance) - pInstance->SetData(DATA_DEVOURER_EVENT, IN_PROGRESS); - - DoScriptText(RAND(SAY_FACE_ANGER_AGGRO,SAY_FACE_DESIRE_AGGRO), me); - - events.ScheduleEvent(EVENT_PHANTOM_BLAST, 5000); - events.ScheduleEvent(EVENT_MIRRORED_SOUL, 8000); - events.ScheduleEvent(EVENT_WELL_OF_SOULS, 30000); - events.ScheduleEvent(EVENT_UNLEASHED_SOULS, 20000); - events.ScheduleEvent(EVENT_WAILING_SOULS, urand(60000,70000)); - } - - void DamageTaken(Unit * /*pDoneBy*/, uint32 &uiDamage) - { - if (uiMirroredSoulTarget && me->HasAura(SPELL_MIRRORED_SOUL)) - { - if (Player *pPlayer = Unit::GetPlayer(uiMirroredSoulTarget)) - { - if (Aura *pAura = pPlayer->GetAura(SPELL_MIRRORED_SOUL)) - { - int32 mirrorDamage = (uiDamage * 45)/100; - me->CastCustomSpell(pPlayer, 69034, &mirrorDamage, 0, 0, true); -// me->DealDamage(pPlayer, (uiDamage * 45)/100, 0, SPELL_DIRECT_DAMAGE, SPELL_SCHOOL_MASK_SHADOW); - } - else - uiMirroredSoulTarget = 0; - } - } - } - - void KilledUnit(Unit * /*victim*/) - { - DoScriptText(RAND(SAY_FACE_ANGER_SLAY_1,SAY_FACE_SORROW_SLAY_1,SAY_FACE_DESIRE_SLAY_1, - SAY_FACE_ANGER_SLAY_2,SAY_FACE_SORROW_SLAY_2,SAY_FACE_DESIRE_SLAY_2), me); - } - - void JustDied(Unit* /*killer*/) - { - Position spawnPoint = { 5618.139, 2451.873, 705.854 }; - - DoScriptText(RAND(SAY_FACE_SORROW_DEATH,SAY_FACE_DESIRE_DEATH), me); - - if (pInstance) - { - pInstance->SetData(DATA_DEVOURER_EVENT, DONE); - - if (bThreeFaceAchievement && IsHeroic()) - pInstance->DoCompleteAchievement(ACHIEV_THREE_FACED); - - int32 entryIndex; - if (pInstance->GetData(DATA_TEAM_IN_INSTANCE) == TEAM_ALLIANCE) - entryIndex = 0; - else - entryIndex = 1; - - for (int8 i = 0; outroPositions[i].entry[entryIndex] != 0; ++i) - { - if (Creature *pSummon = me->SummonCreature(outroPositions[i].entry[entryIndex], spawnPoint, TEMPSUMMON_DEAD_DESPAWN)) - { - pSummon->GetMotionMaster()->MovePoint(0, outroPositions[i].movePosition); - - if (pSummon->GetEntry() == NPC_JAINA_PART2) - DoScriptText(SAY_JAINA_OUTRO, pSummon); - else if (pSummon->GetEntry() == NPC_SYLVANAS_PART2) - DoScriptText(SAY_SYLVANAS_OUTRO, pSummon); - } - } - } - } - - void SpellHitTarget(Unit* /*pTarget*/, const SpellEntry *pSpell) - { - if (pSpell->Id == H_SPELL_PHANTOM_BLAST) - bThreeFaceAchievement = false; - } - - void UpdateAI(const uint32 diff) - { - // Return since we have no target - if (!UpdateVictim()) - return; - - events.Update(diff); - - if (me->hasUnitState(UNIT_STAT_CASTING)) - return; - - while (uint32 eventId = events.ExecuteEvent()) - { - switch(eventId) - { - case EVENT_PHANTOM_BLAST: - if (Unit *pTarget = SelectUnit(SELECT_TARGET_TOPAGGRO, 0)) - DoCast(pTarget, SPELL_PHANTOM_BLAST); - events.ScheduleEvent(EVENT_PHANTOM_BLAST, 5000); - break; - case EVENT_MIRRORED_SOUL: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 0, true)) - { - uiMirroredSoulTarget = pTarget->GetGUID(); - DoCast(pTarget, SPELL_MIRRORED_SOUL); - DoScriptText(EMOTE_MIRRORED_SOUL, me); - } - events.ScheduleEvent(EVENT_MIRRORED_SOUL, urand(15000,30000)); - break; - case EVENT_WELL_OF_SOULS: - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_WELL_OF_SOULS); - events.ScheduleEvent(EVENT_WELL_OF_SOULS, 20000); - break; - case EVENT_UNLEASHED_SOULS: - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_UNLEASHED_SOULS); - me->SetDisplayId(DISPLAY_SORROW); - DoScriptText(RAND(SAY_FACE_ANGER_UNLEASH_SOUL,SAY_FACE_SORROW_UNLEASH_SOUL,SAY_FACE_DESIRE_UNLEASH_SOUL), me); - DoScriptText(EMOTE_UNLEASH_SOUL, me); - events.ScheduleEvent(EVENT_UNLEASHED_SOULS, 30000); - events.ScheduleEvent(EVENT_FACE_ANGER, 5000); - break; - case EVENT_FACE_ANGER: - me->SetDisplayId(DISPLAY_ANGER); - break; - - case EVENT_WAILING_SOULS: - me->SetDisplayId(DISPLAY_DESIRE); - DoScriptText(RAND(SAY_FACE_ANGER_WAILING_SOUL,SAY_FACE_DESIRE_WAILING_SOUL), me); - DoScriptText(EMOTE_WAILING_SOUL, me); - DoCast(me, SPELL_WAILING_SOULS_STARTING); - - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - { - me->SetOrientation(me->GetAngle(pTarget)); - DoCast(me, SPELL_WAILING_SOULS_BEAM); - } - - beamAngle = me->GetOrientation(); - - beamAngleDiff = PI/30.0f; // PI/2 in 15 sec = PI/30 per tick - if (RAND(true,false)) - beamAngleDiff = -beamAngleDiff; - - me->InterruptNonMeleeSpells(false); - me->SetReactState(REACT_PASSIVE); - - //Remove any target - me->SetUInt64Value(UNIT_FIELD_TARGET, 0); - - me->GetMotionMaster()->Clear(); - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE); - - wailingSoulTick = 15; - events.DelayEvents(18000); // no other events during wailing souls - events.ScheduleEvent(EVENT_WAILING_SOULS_TICK, 3000); // first one after 3 secs. - break; - - case EVENT_WAILING_SOULS_TICK: - beamAngle += beamAngleDiff; - me->SetOrientation(beamAngle); - me->StopMoving(); - - DoCast(me, SPELL_WAILING_SOULS); - - if (--wailingSoulTick) - events.ScheduleEvent(EVENT_WAILING_SOULS_TICK, 1000); - else - { - me->SetReactState(REACT_AGGRESSIVE); - me->SetDisplayId(DISPLAY_ANGER); - me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE); - me->GetMotionMaster()->MoveChase(me->getVictim()); - events.ScheduleEvent(EVENT_WAILING_SOULS, urand(60000,70000)); - } - break; - } - } - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_boss_devourer_of_souls(Creature* pCreature) -{ - return new boss_devourer_of_soulsAI(pCreature); -} - -void AddSC_boss_devourer_of_souls() -{ - Script *newscript; - newscript = new Script; - newscript->Name="boss_devourer_of_souls"; - newscript->GetAI = &GetAI_boss_devourer_of_souls; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Northrend/FrozenHalls/forge_of_souls/forge_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/forge_of_souls/forge_of_souls.cpp deleted file mode 100644 index 5c85da69898..00000000000 --- a/src/server/scripts/Northrend/FrozenHalls/forge_of_souls/forge_of_souls.cpp +++ /dev/null @@ -1,899 +0,0 @@ -/* Copyright (C) 2006 - 2010 TrinityCore - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "ScriptedPch.h" -#include "forge_of_souls.h" - -enum Spells -{ - //Spiteful Apparition - SPELL_SPITE = 68895, - H_SPELL_SPITE = 70212, - - //Spectral Warden - SPELL_VEIL_OF_SHADOWS = 69633, - SPELL_WAIL_OF_SOULS = 69148, - H_SPELL_WAIL_OF_SOULS = 70210, - - //Soulguard Watchman - SPELL_SHROUD_OF_RUNES = 69056, - SPELL_UNHOLY_RAGE = 69053, - - //Soulguard Reaper - SPELL_FROST_NOVA = 69060, - H_SPELL_FROST_NOVA = 70209, - SPELL_SHADOW_LANCE = 69058, - - //Soulguard Bonecaster - SPELL_BONE_VOLLEY = 69080, - H_SPELL_BONE_VOLLEY = 70206, - SPELL_RAISE_DEAD = 69562, - SPELL_SHIELD_OF_BONES = 69069, - H_SPELL_SHIELD_OF_BONES = 70207, - - //Soulguard Animator - // Raise dead 69562 - SPELL_SHADOW_BOLT = 69068, - H_SPELL_SHADOW_BOLT = 70208, - SPELL_SOUL_SICKNESS = 69131, - SPELL_SOUL_SIPHON = 69128, - - //Soulguard Adept - //Raise dead 69562 - //Shadow Bolt 69068/70208 - SPELL_DRAIN_LIFE = 69066, - H_SPELL_DRAIN_LIFE = 70213, - SPELL_SHADOW_MEND = 69564, - H_SPELL_SHADOW_MEND = 70205, - - //Soul Horror - SPELL_SOUL_STRIKE = 69088, - H_SPELL_SOUL_STRIKE = 70211, -}; - -enum Events -{ - EVENT_NONE, - - // Jaina/Sylvanas Intro - EVENT_INTRO_1, - EVENT_INTRO_2, - EVENT_INTRO_3, - EVENT_INTRO_4, - EVENT_INTRO_5, - EVENT_INTRO_6, - EVENT_INTRO_7, - EVENT_INTRO_8, - - //Spiteful Apparition - EVENT_SPITE, - - //Spectral Warden - EVENT_VEIL_OF_SHADOWS, - EVENT_WAIL_OF_SOULS, - - //Soulguard Watchman - EVENT_SHROUD_OF_RUNES, - EVENT_UNHOLY_RAGE, - - //Soulguard Reaper - EVENT_FROST_NOVA, - EVENT_SHADOW_LANCE, - - //Soulguard Bonecaster - EVENT_BONE_VOLLEY, - EVENT_RAISE_DEAD, - EVENT_SHIELD_OF_BONES, - - //Soulguard Animator - EVENT_SHADOW_BOLT, - EVENT_SOUL_SICKNESS, - EVENT_SOUL_SIPHON, - - //Soulguard Adept - EVENT_DRAIN_LIFE, - EVENT_SHADOW_MEND, - - //Soul Horror - EVENT_SOUL_STRIKE, -}; - -/****************************************SYLVANAS************************************/ -#define GOSSIP_SYLVANAS_ITEM "What would you have of me, Banshee Queen?" -#define GOSSIP_JAINA_ITEM "What would you have of me, my lady?" - -enum Yells -{ - SAY_JAINA_INTRO_1 = -1632040, - SAY_JAINA_INTRO_2 = -1632041, - SAY_JAINA_INTRO_3 = -1632042, - SAY_JAINA_INTRO_4 = -1632043, - SAY_JAINA_INTRO_5 = -1632044, - SAY_JAINA_INTRO_6 = -1632045, - SAY_JAINA_INTRO_7 = -1632046, - SAY_JAINA_INTRO_8 = -1632047, - - SAY_SYLVANAS_INTRO_1 = -1632050, - SAY_SYLVANAS_INTRO_2 = -1632051, - SAY_SYLVANAS_INTRO_3 = -1632052, - SAY_SYLVANAS_INTRO_4 = -1632053, - SAY_SYLVANAS_INTRO_5 = -1632054, - SAY_SYLVANAS_INTRO_6 = -1632055, -}; - -enum eSylvanas -{ - GOSSIP_SPEECHINTRO = 13525, - ACTION_INTRO, -}; - -enum Phase -{ - PHASE_NORMAL, - PHASE_INTRO, -}; - -struct npc_sylvanas_fosAI: public ScriptedAI -{ - npc_sylvanas_fosAI(Creature *c) : ScriptedAI(c) - { - pInstance = me->GetInstanceData(); - me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - } - - ScriptedInstance* pInstance; - - EventMap events; - Phase phase; - - void Reset() - { - events.Reset(); - phase = PHASE_NORMAL; - } - - void DoAction(const int32 actionId) - { - switch(actionId) - { - case ACTION_INTRO: - { - phase = PHASE_INTRO; - me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - events.Reset(); - events.ScheduleEvent(EVENT_INTRO_1, 1000); - } - } - } - - void UpdateAI(const uint32 diff) - { - if (phase == PHASE_INTRO) - { - if (!pInstance) - return; - - events.Update(diff); - switch(events.ExecuteEvent()) - { - case EVENT_INTRO_1: - DoScriptText(SAY_SYLVANAS_INTRO_1, me); - events.ScheduleEvent(EVENT_INTRO_2, 11500); - break; - - case EVENT_INTRO_2: - DoScriptText(SAY_SYLVANAS_INTRO_2, me); - events.ScheduleEvent(EVENT_INTRO_3, 10500); - break; - - case EVENT_INTRO_3: - DoScriptText(SAY_SYLVANAS_INTRO_3, me); - events.ScheduleEvent(EVENT_INTRO_4, 9500); - break; - - case EVENT_INTRO_4: - DoScriptText(SAY_SYLVANAS_INTRO_4, me); - events.ScheduleEvent(EVENT_INTRO_5, 10500); - break; - - case EVENT_INTRO_5: - DoScriptText(SAY_SYLVANAS_INTRO_5, me); - events.ScheduleEvent(EVENT_INTRO_6, 9500); - break; - - case EVENT_INTRO_6: - DoScriptText(SAY_SYLVANAS_INTRO_6, me); - // End of Intro - phase = PHASE_NORMAL; - break; - } - } - - //Return since we have no target - if (!UpdateVictim()) - return; - - events.Update(diff); - - //if (me->hasUnitState(UNIT_STAT_CASTING)) - // return; - - //while (uint32 eventId = events.ExecuteEvent()) - //{ - // switch(eventId) - // { - // } - //} - - DoMeleeAttackIfReady(); - } -}; - -struct npc_jaina_fosAI: public ScriptedAI -{ - npc_jaina_fosAI(Creature *c) : ScriptedAI(c) - { - pInstance = me->GetInstanceData(); - me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - } - - ScriptedInstance* pInstance; - - EventMap events; - Phase phase; - - void Reset() - { - events.Reset(); - phase = PHASE_NORMAL; - } - - void DoAction(const int32 actionId) - { - switch(actionId) - { - case ACTION_INTRO: - { - phase = PHASE_INTRO; - me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - events.Reset(); - events.ScheduleEvent(EVENT_INTRO_1, 1000); - } - } - } - - void UpdateAI(const uint32 diff) - { - if (phase == PHASE_INTRO) - { - if (!pInstance) - return; - - events.Update(diff); - switch(events.ExecuteEvent()) - { - case EVENT_INTRO_1: - DoScriptText(SAY_JAINA_INTRO_1, me); - events.ScheduleEvent(EVENT_INTRO_2, 8000); - break; - - case EVENT_INTRO_2: - DoScriptText(SAY_JAINA_INTRO_2, me); - events.ScheduleEvent(EVENT_INTRO_3, 8500); - break; - - case EVENT_INTRO_3: - DoScriptText(SAY_JAINA_INTRO_3, me); - events.ScheduleEvent(EVENT_INTRO_4, 8000); - break; - - case EVENT_INTRO_4: - DoScriptText(SAY_JAINA_INTRO_4, me); - events.ScheduleEvent(EVENT_INTRO_5, 10000); - break; - - case EVENT_INTRO_5: - DoScriptText(SAY_JAINA_INTRO_5, me); - events.ScheduleEvent(EVENT_INTRO_6, 8000); - break; - - case EVENT_INTRO_6: - DoScriptText(SAY_JAINA_INTRO_6, me); - events.ScheduleEvent(EVENT_INTRO_7, 12000); - break; - - case EVENT_INTRO_7: - DoScriptText(SAY_JAINA_INTRO_7, me); - events.ScheduleEvent(EVENT_INTRO_8, 8000); - break; - - case EVENT_INTRO_8: - DoScriptText(SAY_JAINA_INTRO_8, me); - // End of Intro - phase = PHASE_NORMAL; - break; - } - } - - //Return since we have no target - if (!UpdateVictim()) - return; - - events.Update(diff); - - //if (me->hasUnitState(UNIT_STAT_CASTING)) - // return; - - //while (uint32 eventId = events.ExecuteEvent()) - //{ - // switch(eventId) - // { - // } - //} - - DoMeleeAttackIfReady(); - } -}; - -bool GossipHello_npc_jaina_or_slyvanas_fos(Player* pPlayer, Creature* pCreature) -{ - if (pCreature->isQuestGiver()) - pPlayer->PrepareQuestMenu(pCreature->GetGUID()); - - if (pCreature->GetEntry() == NPC_JAINA_PART1) - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_JAINA_ITEM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - else - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SYLVANAS_ITEM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - - pPlayer->SEND_GOSSIP_MENU(DEFAULT_GOSSIP_MESSAGE, pCreature->GetGUID()); - return true; -} - -bool GossipSelect_npc_jaina_or_slyvanas_fos(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) -{ - switch(uiAction) - { - case GOSSIP_ACTION_INFO_DEF+1: - pPlayer->CLOSE_GOSSIP_MENU(); - - if (pCreature->AI()) - pCreature->AI()->DoAction(ACTION_INTRO); - break; - } - - return true; -} - -struct mob_spiteful_apparitionAI: public ScriptedAI -{ - mob_spiteful_apparitionAI(Creature *c) : ScriptedAI(c) - { - } - - EventMap events; - - void Reset() - { - events.Reset(); - } - - void EnterCombat(Unit* /*who*/) - { - events.ScheduleEvent(EVENT_SPITE, 8000); - } - - void UpdateAI(const uint32 diff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - events.Update(diff); - - if (me->hasUnitState(UNIT_STAT_CASTING)) - return; - - while (uint32 eventId = events.ExecuteEvent()) - { - switch(eventId) - { - case EVENT_SPITE: - DoCast(me->getVictim(), SPELL_SPITE); - events.RescheduleEvent(EVENT_SPITE, 8000); - return; - } - } - - DoMeleeAttackIfReady(); - } -}; - -struct mob_spectral_wardenAI: public ScriptedAI -{ - mob_spectral_wardenAI(Creature *c) : ScriptedAI(c) - { - } - - EventMap events; - - void Reset() - { - events.Reset(); - } - - void EnterCombat(Unit* /*who*/) - { - events.ScheduleEvent(EVENT_VEIL_OF_SHADOWS, 5000); - events.ScheduleEvent(EVENT_WAIL_OF_SOULS, 10000); - } - - void UpdateAI(const uint32 diff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - events.Update(diff); - - if (me->hasUnitState(UNIT_STAT_CASTING)) - return; - - while (uint32 eventId = events.ExecuteEvent()) - { - switch(eventId) - { - case EVENT_VEIL_OF_SHADOWS: - DoCast(me->getVictim(), SPELL_VEIL_OF_SHADOWS); - events.RescheduleEvent(EVENT_VEIL_OF_SHADOWS, 10000); - return; - case EVENT_WAIL_OF_SOULS: - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_WAIL_OF_SOULS); - events.RescheduleEvent(EVENT_WAIL_OF_SOULS, 5000); - return; - } - } - DoMeleeAttackIfReady(); - } -}; - -struct mob_soulguard_watchmanAI: public ScriptedAI -{ - mob_soulguard_watchmanAI(Creature *c) : ScriptedAI(c) - { - } - - EventMap events; - - void Reset() - { - events.Reset(); - } - - void EnterCombat(Unit* /*who*/) - { - events.ScheduleEvent(EVENT_SHROUD_OF_RUNES, 1000); - events.ScheduleEvent(EVENT_UNHOLY_RAGE, 1000); - } - - void UpdateAI(const uint32 diff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - events.Update(diff); - - if (me->hasUnitState(UNIT_STAT_CASTING)) - return; - - while (uint32 eventId = events.ExecuteEvent()) - { - switch(eventId) - { - case EVENT_SHROUD_OF_RUNES: - DoCast(me, SPELL_SHROUD_OF_RUNES); - events.RescheduleEvent(EVENT_SHROUD_OF_RUNES, 5000); - return; - case EVENT_UNHOLY_RAGE: - DoCast(me, SPELL_UNHOLY_RAGE); - events.RescheduleEvent(EVENT_UNHOLY_RAGE, 99999); - return; - } - } - DoMeleeAttackIfReady(); - } -}; - -struct mob_soulguard_reaperAI: public ScriptedAI -{ - mob_soulguard_reaperAI(Creature *c) : ScriptedAI(c) - { - } - - EventMap events; - - void Reset() - { - events.Reset(); - } - - void EnterCombat(Unit* /*who*/) - { - events.ScheduleEvent(EVENT_FROST_NOVA, 8000); - events.ScheduleEvent(EVENT_SHADOW_LANCE, 5000); - } - - void UpdateAI(const uint32 diff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - events.Update(diff); - - if (me->hasUnitState(UNIT_STAT_CASTING)) - return; - - while (uint32 eventId = events.ExecuteEvent()) - { - switch(eventId) - { - case EVENT_FROST_NOVA: - DoCast(me, SPELL_FROST_NOVA); - events.RescheduleEvent(EVENT_FROST_NOVA, 9600); - return; - case EVENT_SHADOW_LANCE: - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_SHADOW_LANCE); - events.RescheduleEvent(EVENT_SHADOW_LANCE, 8000); - return; - } - } - - DoMeleeAttackIfReady(); - } -}; - -struct mob_soulguard_bonecasterAI: public ScriptedAI -{ - mob_soulguard_bonecasterAI(Creature *c) : ScriptedAI(c) - { - } - - EventMap events; - - void Reset() - { - events.Reset(); - } - - void EnterCombat(Unit* /*who*/) - { - events.ScheduleEvent(EVENT_BONE_VOLLEY, 6000); - events.ScheduleEvent(EVENT_RAISE_DEAD, 25000); - events.ScheduleEvent(EVENT_SHIELD_OF_BONES, 6000); - } - - void UpdateAI(const uint32 diff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - events.Update(diff); - - if (me->hasUnitState(UNIT_STAT_CASTING)) - return; - - while (uint32 eventId = events.ExecuteEvent()) - { - switch(eventId) - { - case EVENT_BONE_VOLLEY: - DoCastAOE(SPELL_BONE_VOLLEY); - events.RescheduleEvent(EVENT_BONE_VOLLEY, 7000); - return; - case EVENT_RAISE_DEAD: - DoCast(me, SPELL_RAISE_DEAD); - events.RescheduleEvent(EVENT_RAISE_DEAD, 25000); - return; - case EVENT_SHIELD_OF_BONES: - DoCast(me, SPELL_SHIELD_OF_BONES); - events.RescheduleEvent(EVENT_SHIELD_OF_BONES, 8000); - return; - } - } - - DoMeleeAttackIfReady(); - } -}; - -struct mob_soulguard_animatorAI: public ScriptedAI -{ - mob_soulguard_animatorAI(Creature *c) : ScriptedAI(c) - { - } - - EventMap events; - - void Reset() - { - events.Reset(); - } - - void EnterCombat(Unit* /*who*/) - { - events.ScheduleEvent(EVENT_RAISE_DEAD, 25000); - events.ScheduleEvent(EVENT_SHADOW_BOLT, 5000); - events.ScheduleEvent(EVENT_SOUL_SICKNESS, 8000); - events.ScheduleEvent(EVENT_SOUL_SIPHON, 10000); - } - - void UpdateAI(const uint32 diff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - events.Update(diff); - - if (me->hasUnitState(UNIT_STAT_CASTING)) - return; - - while (uint32 eventId = events.ExecuteEvent()) - { - switch(eventId) - { - case EVENT_RAISE_DEAD: - DoCast(me, SPELL_RAISE_DEAD); - events.RescheduleEvent(EVENT_RAISE_DEAD, 25000); - return; - case EVENT_SHADOW_BOLT: - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_SHADOW_BOLT); - events.RescheduleEvent(EVENT_SHADOW_BOLT, 5000); - return; - case EVENT_SOUL_SICKNESS: - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_SOUL_SICKNESS); - events.RescheduleEvent(EVENT_SOUL_SICKNESS, 10000); - return; - case EVENT_SOUL_SIPHON: - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_SOUL_SIPHON); - events.RescheduleEvent(EVENT_SOUL_SIPHON, 8000); - return; - } - } - - DoMeleeAttackIfReady(); - } -}; - -struct mob_soulguard_adeptAI: public ScriptedAI -{ - mob_soulguard_adeptAI(Creature *c) : ScriptedAI(c) - { - } - - EventMap events; - - void Reset() - { - events.Reset(); - } - - void EnterCombat(Unit* /*who*/) - { - events.ScheduleEvent(EVENT_RAISE_DEAD, 25000); - events.ScheduleEvent(EVENT_SHADOW_BOLT, 8000); - events.ScheduleEvent(EVENT_DRAIN_LIFE, 7000); - events.ScheduleEvent(EVENT_SHADOW_MEND, 35000); - } - - void UpdateAI(const uint32 diff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - events.Update(diff); - - if (me->hasUnitState(UNIT_STAT_CASTING)) - return; - - while (uint32 eventId = events.ExecuteEvent()) - { - switch(eventId) - { - case EVENT_RAISE_DEAD: - DoCast(me, SPELL_RAISE_DEAD); - events.RescheduleEvent(EVENT_RAISE_DEAD, 25000); - return; - case EVENT_SHADOW_BOLT: - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_SHADOW_BOLT); - events.RescheduleEvent(EVENT_SHADOW_BOLT, 4000); - return; - case EVENT_DRAIN_LIFE: - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_DRAIN_LIFE); - events.RescheduleEvent(EVENT_DRAIN_LIFE, 9000); - return; - case EVENT_SHADOW_MEND: - DoCast(me, SPELL_SHADOW_MEND); - events.RescheduleEvent(EVENT_SHADOW_MEND, 20000); - return; - } - } - - DoMeleeAttackIfReady(); - } -}; - -struct mob_soul_horrorAI: public ScriptedAI -{ - mob_soul_horrorAI(Creature *c) : ScriptedAI(c) - { - } - - EventMap events; - - void Reset() - { - events.Reset(); - } - - void EnterCombat(Unit* /*who*/) - { - events.ScheduleEvent(EVENT_SOUL_STRIKE, 6000); - } - - void UpdateAI(const uint32 diff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - events.Update(diff); - - if (me->hasUnitState(UNIT_STAT_CASTING)) - return; - - while (uint32 eventId = events.ExecuteEvent()) - { - switch(eventId) - { - case EVENT_SOUL_STRIKE: - DoCast(me->getVictim(), SPELL_SOUL_STRIKE); - events.RescheduleEvent(EVENT_SOUL_STRIKE, 8000); - return; - } - } - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_npc_jaina_fosAI(Creature* pCreature) -{ - return new npc_jaina_fosAI(pCreature); -}; - -CreatureAI* GetAI_npc_sylvanas_fosAI(Creature* pCreature) -{ - return new npc_sylvanas_fosAI(pCreature); -}; - -CreatureAI* GetAI_mob_spiteful_apparitionAI(Creature* pCreature) -{ - return new mob_spiteful_apparitionAI(pCreature); -} - -CreatureAI* GetAI_mob_spectral_wardenAI(Creature* pCreature) -{ - return new mob_spectral_wardenAI(pCreature); -} - -CreatureAI* GetAI_mob_soulguard_watchmanAI(Creature* pCreature) -{ - return new mob_soulguard_watchmanAI(pCreature); -} - -CreatureAI* GetAI_mob_soulguard_reaperAI(Creature* pCreature) -{ - return new mob_soulguard_reaperAI(pCreature); -} - -CreatureAI* GetAI_mob_soulguard_bonecasterAI(Creature* pCreature) -{ - return new mob_soulguard_bonecasterAI(pCreature); -} - -CreatureAI* GetAI_mob_soulguard_animatorAI(Creature* pCreature) -{ - return new mob_soulguard_animatorAI(pCreature); -} - -CreatureAI* GetAI_mob_soulguard_adeptAI(Creature* pCreature) -{ - return new mob_soulguard_adeptAI(pCreature); -} - -CreatureAI* GetAI_mob_soul_horrorAI(Creature* pCreature) -{ - return new mob_soul_horrorAI(pCreature); -} - -void AddSC_forge_of_souls() -{ - Script *newscript; - - newscript = new Script; - newscript->Name = "npc_sylvanas_fos"; - newscript->GetAI = &GetAI_npc_sylvanas_fosAI; - newscript->pGossipHello = &GossipHello_npc_jaina_or_slyvanas_fos; - newscript->pGossipSelect = &GossipSelect_npc_jaina_or_slyvanas_fos; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "npc_jaina_fos"; - newscript->GetAI = &GetAI_npc_jaina_fosAI; - newscript->pGossipHello = &GossipHello_npc_jaina_or_slyvanas_fos; - newscript->pGossipSelect = &GossipSelect_npc_jaina_or_slyvanas_fos; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name="mob_spiteful_apparition"; - newscript->GetAI = &GetAI_mob_spiteful_apparitionAI; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name="mob_spectral_warden"; - newscript->GetAI = &GetAI_mob_spectral_wardenAI; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name="mob_soulguard_watchman"; - newscript->GetAI = &GetAI_mob_soulguard_watchmanAI; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name="mob_soulguard_reaper"; - newscript->GetAI = &GetAI_mob_soulguard_reaperAI; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name="mob_soulguard_bonecaster"; - newscript->GetAI = &GetAI_mob_soulguard_bonecasterAI; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name="mob_soulguard_animator"; - newscript->GetAI = &GetAI_mob_soulguard_animatorAI; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name="mob_soulguard_adept"; - newscript->GetAI = &GetAI_mob_soulguard_adeptAI; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name="mob_soul_horror"; - newscript->GetAI = &GetAI_mob_soul_horrorAI; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Northrend/FrozenHalls/forge_of_souls/forge_of_souls.h b/src/server/scripts/Northrend/FrozenHalls/forge_of_souls/forge_of_souls.h deleted file mode 100644 index e0479eb4d2b..00000000000 --- a/src/server/scripts/Northrend/FrozenHalls/forge_of_souls/forge_of_souls.h +++ /dev/null @@ -1,52 +0,0 @@ -/* Copyright (C) 2006 - 2010 TrinityCore - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef DEF_FORGE_OF_SOULS_H -#define DEF_FORGE_OF_SOULS_H - -enum Data -{ - DATA_BRONJAHM_EVENT, - DATA_DEVOURER_EVENT, - DATA_TEAM_IN_INSTANCE, -}; - -enum Data64 -{ - DATA_BRONJAHM, - DATA_DEVOURER, -}; - -enum Creatures -{ - CREATURE_BRONJAHM = 36497, - CREATURE_DEVOURER = 36502, - - NPC_SYLVANAS_PART1 = 37596, - NPC_SYLVANAS_PART2 = 38161, - NPC_JAINA_PART1 = 37597, - NPC_JAINA_PART2 = 38160, - NPC_KALIRA = 37583, - NPC_ELANDRA = 37774, - NPC_LORALEN = 37779, - NPC_KORELN = 37582, - NPC_CHAMPION_1_HORDE = 37584, - NPC_CHAMPION_2_HORDE = 37587, - NPC_CHAMPION_3_HORDE = 37588, - NPC_CHAMPION_1_ALLIANCE = 37496, - NPC_CHAMPION_2_ALLIANCE = 37497, -}; -#endif diff --git a/src/server/scripts/Northrend/FrozenHalls/forge_of_souls/instance_forge_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/forge_of_souls/instance_forge_of_souls.cpp deleted file mode 100644 index 67a6cdb4579..00000000000 --- a/src/server/scripts/Northrend/FrozenHalls/forge_of_souls/instance_forge_of_souls.cpp +++ /dev/null @@ -1,168 +0,0 @@ -/* Copyright (C) 2006 - 2010 TrinityCore - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "ScriptedPch.h" -#include "forge_of_souls.h" - -#define MAX_ENCOUNTER 2 - -/* Forge of Souls encounters: -0- Bronjahm, The Godfather of Souls -1- The Devourer of Souls -*/ - -struct instance_forge_of_souls : public ScriptedInstance -{ - instance_forge_of_souls(Map* pMap) : ScriptedInstance(pMap) {}; - - uint64 uiBronjahm; - uint64 uiDevourer; - - uint32 uiEncounter[MAX_ENCOUNTER]; - uint32 uiTeamInInstance; - - void Initialize() - { - uiBronjahm = 0; - uiDevourer = 0; - - uiTeamInInstance = 0; - - for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) - uiEncounter[i] = NOT_STARTED; - } - - bool IsEncounterInProgress() const - { - for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) - if (uiEncounter[i] == IN_PROGRESS) return true; - - return false; - } - - void OnCreatureCreate(Creature* pCreature, bool /*add*/) - { - Map::PlayerList const &players = instance->GetPlayers(); - - if (!players.isEmpty()) - if (Player* pPlayer = players.begin()->getSource()) - uiTeamInInstance = pPlayer->GetTeam(); - - switch(pCreature->GetEntry()) - { - case CREATURE_BRONJAHM: - uiBronjahm = pCreature->GetGUID(); - break; - case CREATURE_DEVOURER: - uiDevourer = pCreature->GetGUID(); - break; - } - } - - void SetData(uint32 type, uint32 data) - { - switch(type) - { - case DATA_BRONJAHM_EVENT: - uiEncounter[0] = data; - break; - case DATA_DEVOURER_EVENT: - uiEncounter[1] = data; - break; - } - - if (data == DONE) - SaveToDB(); - } - - uint32 GetData(uint32 type) - { - switch(type) - { - case DATA_BRONJAHM_EVENT: return uiEncounter[0]; - case DATA_DEVOURER_EVENT: return uiEncounter[1]; - case DATA_TEAM_IN_INSTANCE: return uiTeamInInstance; - } - - return 0; - } - - uint64 GetData64(uint32 identifier) - { - switch(identifier) - { - case DATA_BRONJAHM: return uiBronjahm; - case DATA_DEVOURER: return uiBronjahm; - } - - return 0; - } - - std::string GetSaveData() - { - OUT_SAVE_INST_DATA; - - std::ostringstream saveStream; - saveStream << "F S " << uiEncounter[0] << " " << uiEncounter[1]; - - OUT_SAVE_INST_DATA_COMPLETE; - return saveStream.str(); - } - - void Load(const char* in) - { - if (!in) - { - OUT_LOAD_INST_DATA_FAIL; - return; - } - - OUT_LOAD_INST_DATA(in); - - char dataHead1, dataHead2; - uint16 data0, data1; - - std::istringstream loadStream(in); - loadStream >> dataHead1 >> dataHead2 >> data0 >> data1; - - if (dataHead1 == 'F' && dataHead2 == 'S') - { - uiEncounter[0] = data0; - uiEncounter[1] = data1; - - for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) - if (uiEncounter[i] == IN_PROGRESS) - uiEncounter[i] = NOT_STARTED; - - } else OUT_LOAD_INST_DATA_FAIL; - - OUT_LOAD_INST_DATA_COMPLETE; - } -}; - -InstanceData* GetInstanceData_instance_forge_of_souls(Map* pMap) -{ - return new instance_forge_of_souls(pMap); -} - -void AddSC_instance_forge_of_souls() -{ - Script *newscript; - newscript = new Script; - newscript->Name = "instance_forge_of_souls"; - newscript->GetInstanceData = &GetInstanceData_instance_forge_of_souls; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Northrend/FrozenHalls/halls_of_reflection/boss_falric.cpp b/src/server/scripts/Northrend/FrozenHalls/halls_of_reflection/boss_falric.cpp deleted file mode 100644 index c9978faca6e..00000000000 --- a/src/server/scripts/Northrend/FrozenHalls/halls_of_reflection/boss_falric.cpp +++ /dev/null @@ -1,142 +0,0 @@ -/* Copyright (C) 2006 - 2010 TrinityCore - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "ScriptedPch.h" -#include "halls_of_reflection.h" - -enum Yells -{ - SAY_AGGRO = -1668050, - SAY_SLAY_1 = -1668051, - SAY_SLAY_2 = -1668052, - SAY_DEATH = -1668053, - SAY_IMPENDING_DESPAIR = -1668054, - SAY_DEFILING_HORROR = -1668055, -}; - -enum Spells -{ - SPELL_QUIVERING_STRIKE = 72422, - SPELL_IMPENDING_DESPAIR = 72426, - SPELL_DEFILING_HORROR = 72435, - SPELL_HOPELESSNESS = 72395, - H_SPELL_HOPELESSNESS = 72390, // TODO: not in dbc. Add in DB. -}; - -enum Events -{ - EVENT_NONE, - EVENT_QUIVERING_STRIKE, - EVENT_IMPENDING_DESPAIR, - EVENT_DEFILING_HORROR, -}; - -struct boss_falricAI : public boss_horAI -{ - boss_falricAI(Creature *pCreature) : boss_horAI(pCreature) {} - - uint8 uiHopelessnessCount; - - void Reset() - { - boss_horAI::Reset(); - - uiHopelessnessCount = 0; - - if (pInstance) - pInstance->SetData(DATA_FALRIC_EVENT, NOT_STARTED); - } - - void EnterCombat(Unit* who) - { - DoScriptText(SAY_AGGRO, me); - if (pInstance) - pInstance->SetData(DATA_FALRIC_EVENT, IN_PROGRESS); - - events.ScheduleEvent(EVENT_QUIVERING_STRIKE, 23000); - events.ScheduleEvent(EVENT_IMPENDING_DESPAIR, 9000); - events.ScheduleEvent(EVENT_DEFILING_HORROR, urand(25000,45000)); // TODO adjust timer. - } - - void JustDied(Unit* killer) - { - DoScriptText(SAY_DEATH, me); - - if (pInstance) - pInstance->SetData(DATA_FALRIC_EVENT, DONE); - } - - void KilledUnit(Unit *victim) - { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); - } - - void UpdateAI(const uint32 diff) - { - // Return since we have no target - if (!UpdateVictim()) - return; - - events.Update(diff); - - if (me->hasUnitState(UNIT_STAT_CASTING)) - return; - - switch (events.ExecuteEvent()) - { - case EVENT_QUIVERING_STRIKE: - DoCast(SPELL_QUIVERING_STRIKE); - events.ScheduleEvent(EVENT_QUIVERING_STRIKE, 10000); - break; - case EVENT_IMPENDING_DESPAIR: - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM)) - { - DoScriptText(SAY_IMPENDING_DESPAIR, me); - DoCast(pTarget, SPELL_IMPENDING_DESPAIR); - } - events.ScheduleEvent(EVENT_IMPENDING_DESPAIR, 13000); - break; - case EVENT_DEFILING_HORROR: - DoCast(SPELL_DEFILING_HORROR); - events.ScheduleEvent(EVENT_DEFILING_HORROR, urand(25000,45000)); // TODO adjust timer. - break; - } - - if ((uiHopelessnessCount < 1 && HealthBelowPct(66)) - || (uiHopelessnessCount < 2 && HealthBelowPct(33)) - || (uiHopelessnessCount < 3 && HealthBelowPct(10))) - { - uiHopelessnessCount++; - DoCast(DUNGEON_MODE(SPELL_HOPELESSNESS,H_SPELL_HOPELESSNESS)); - } - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_boss_falric(Creature* pCreature) -{ - return new boss_falricAI(pCreature); -} - -void AddSC_boss_falric() -{ - Script *newscript; - newscript = new Script; - newscript->Name="boss_falric"; - newscript->GetAI = &GetAI_boss_falric; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Northrend/FrozenHalls/halls_of_reflection/boss_marwyn.cpp b/src/server/scripts/Northrend/FrozenHalls/halls_of_reflection/boss_marwyn.cpp deleted file mode 100644 index 95fb2737ce9..00000000000 --- a/src/server/scripts/Northrend/FrozenHalls/halls_of_reflection/boss_marwyn.cpp +++ /dev/null @@ -1,133 +0,0 @@ -/* Copyright (C) 2006 - 2010 TrinityCore - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "ScriptedPch.h" -#include "halls_of_reflection.h" - -enum Yells -{ - SAY_AGGRO = -1668060, - SAY_SLAY_1 = -1668061, - SAY_SLAY_2 = -1668062, - SAY_DEATH = -1668063, - SAY_CORRUPTED_FLESH_1 = -1668064, - SAY_CORRUPTED_FLESH_2 = -1668065, -}; - -enum Spells -{ - SPELL_OBLITERATE = 72360, - SPELL_WELL_OF_CORRUPTION = 72362, - SPELL_CORRUPTED_FLESH = 72363, - SPELL_SHARED_SUFFERING = 72368, -}; - -enum Events -{ - EVENT_NONE, - EVENT_OBLITERATE, - EVENT_WELL_OF_CORRUPTION, - EVENT_CORRUPTED_FLESH, - EVENT_SHARED_SUFFERING, -}; - -struct boss_marwynAI : public boss_horAI -{ - boss_marwynAI(Creature *pCreature) : boss_horAI(pCreature) {} - - void Reset() - { - boss_horAI::Reset(); - - if (pInstance) - pInstance->SetData(DATA_MARWYN_EVENT, NOT_STARTED); - } - - void EnterCombat(Unit* who) - { - DoScriptText(SAY_AGGRO, me); - if (pInstance) - pInstance->SetData(DATA_MARWYN_EVENT, IN_PROGRESS); - - events.ScheduleEvent(EVENT_OBLITERATE, 30000); // TODO Check timer - events.ScheduleEvent(EVENT_WELL_OF_CORRUPTION, 13000); - events.ScheduleEvent(EVENT_CORRUPTED_FLESH, 20000); - events.ScheduleEvent(EVENT_SHARED_SUFFERING, 20000); // TODO Check timer - } - - void JustDied(Unit* killer) - { - DoScriptText(SAY_DEATH, me); - - if (pInstance) - pInstance->SetData(DATA_MARWYN_EVENT, DONE); - } - - void KilledUnit(Unit *victim) - { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); - } - - void UpdateAI(const uint32 diff) - { - // Return since we have no target - if (!UpdateVictim()) - return; - - events.Update(diff); - - if (me->hasUnitState(UNIT_STAT_CASTING)) - return; - - switch (events.ExecuteEvent()) - { - case EVENT_OBLITERATE: - DoCast(SPELL_OBLITERATE); - events.ScheduleEvent(EVENT_OBLITERATE, 30000); - break; - case EVENT_WELL_OF_CORRUPTION: - DoCast(SPELL_WELL_OF_CORRUPTION); - events.ScheduleEvent(EVENT_WELL_OF_CORRUPTION, 13000); - break; - case EVENT_CORRUPTED_FLESH: - DoScriptText(RAND(SAY_CORRUPTED_FLESH_1,SAY_CORRUPTED_FLESH_2), me); - DoCast(SPELL_CORRUPTED_FLESH); - events.ScheduleEvent(EVENT_CORRUPTED_FLESH, 20000); - break; - case EVENT_SHARED_SUFFERING: - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM)) - DoCast(pTarget, SPELL_SHARED_SUFFERING); - events.ScheduleEvent(EVENT_SHARED_SUFFERING, 20000); - break; - } - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_boss_marwyn(Creature* pCreature) -{ - return new boss_marwynAI(pCreature); -} - -void AddSC_boss_marwyn() -{ - Script *newscript; - newscript = new Script; - newscript->Name="boss_marwyn"; - newscript->GetAI = &GetAI_boss_marwyn; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Northrend/FrozenHalls/halls_of_reflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/halls_of_reflection/halls_of_reflection.cpp deleted file mode 100644 index fb3d3d5d752..00000000000 --- a/src/server/scripts/Northrend/FrozenHalls/halls_of_reflection/halls_of_reflection.cpp +++ /dev/null @@ -1,1022 +0,0 @@ -/* Copyright (C) 2006 - 2010 TrinityCore - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "ScriptedPch.h" -#include "halls_of_reflection.h" - -enum Yells -{ - SAY_JAINA_INTRO_1 = -1668001, - SAY_JAINA_INTRO_2 = -1668002, - SAY_JAINA_INTRO_3 = -1668003, - SAY_JAINA_INTRO_4 = -1668004, - SAY_UTHER_INTRO_A2_1 = -1668005, - SAY_JAINA_INTRO_5 = -1668006, - SAY_UTHER_INTRO_A2_2 = -1668007, - SAY_JAINA_INTRO_6 = -1668008, - SAY_UTHER_INTRO_A2_3 = -1668009, - SAY_JAINA_INTRO_7 = -1668010, - SAY_UTHER_INTRO_A2_4 = -1668011, - SAY_JAINA_INTRO_8 = -1668012, - SAY_UTHER_INTRO_A2_5 = -1668013, - SAY_JAINA_INTRO_9 = -1668014, - SAY_UTHER_INTRO_A2_6 = -1668015, - SAY_UTHER_INTRO_A2_7 = -1668016, - SAY_JAINA_INTRO_10 = -1668017, - SAY_UTHER_INTRO_A2_8 = -1668018, - SAY_JAINA_INTRO_11 = -1668019, - SAY_UTHER_INTRO_A2_9 = -1668020, - - SAY_SYLVANAS_INTRO_1 = -1668021, - SAY_SYLVANAS_INTRO_2 = -1668022, - SAY_SYLVANAS_INTRO_3 = -1668023, - SAY_UTHER_INTRO_H2_1 = -1668024, - SAY_SYLVANAS_INTRO_4 = -1668025, - SAY_UTHER_INTRO_H2_2 = -1668026, - SAY_SYLVANAS_INTRO_5 = -1668027, - SAY_UTHER_INTRO_H2_3 = -1668028, - SAY_SYLVANAS_INTRO_6 = -1668029, - SAY_UTHER_INTRO_H2_4 = -1668030, - SAY_SYLVANAS_INTRO_7 = -1668031, - SAY_UTHER_INTRO_H2_5 = -1668032, - SAY_UTHER_INTRO_H2_6 = -1668033, - SAY_SYLVANAS_INTRO_8 = -1668034, - SAY_UTHER_INTRO_H2_7 = -1668035, - - SAY_LK_INTRO_1 = -1668036, - SAY_LK_INTRO_2 = -1668037, - SAY_LK_INTRO_3 = -1668038, - SAY_FALRIC_INTRO_1 = -1668039, - SAY_MARWYN_INTRO_1 = -1668040, - SAY_FALRIC_INTRO_2 = -1668041, - - SAY_JAINA_INTRO_END = -1668042, - SAY_SYLVANAS_INTRO_END = -1668043, -}; - -enum Events -{ - EVENT_NONE, - - EVENT_START_INTRO, - EVENT_SKIP_INTRO, - - EVENT_INTRO_A2_1, - EVENT_INTRO_A2_2, - EVENT_INTRO_A2_3, - EVENT_INTRO_A2_4, - EVENT_INTRO_A2_5, - EVENT_INTRO_A2_6, - EVENT_INTRO_A2_7, - EVENT_INTRO_A2_8, - EVENT_INTRO_A2_9, - EVENT_INTRO_A2_10, - EVENT_INTRO_A2_11, - EVENT_INTRO_A2_12, - EVENT_INTRO_A2_13, - EVENT_INTRO_A2_14, - EVENT_INTRO_A2_15, - EVENT_INTRO_A2_16, - EVENT_INTRO_A2_17, - EVENT_INTRO_A2_18, - EVENT_INTRO_A2_19, - - EVENT_INTRO_H2_1, - EVENT_INTRO_H2_2, - EVENT_INTRO_H2_3, - EVENT_INTRO_H2_4, - EVENT_INTRO_H2_5, - EVENT_INTRO_H2_6, - EVENT_INTRO_H2_7, - EVENT_INTRO_H2_8, - EVENT_INTRO_H2_9, - EVENT_INTRO_H2_10, - EVENT_INTRO_H2_11, - EVENT_INTRO_H2_12, - EVENT_INTRO_H2_13, - EVENT_INTRO_H2_14, - EVENT_INTRO_H2_15, - - EVENT_INTRO_LK_1, - EVENT_INTRO_LK_2, - EVENT_INTRO_LK_3, - EVENT_INTRO_LK_4, - EVENT_INTRO_LK_5, - EVENT_INTRO_LK_6, - EVENT_INTRO_LK_7, - EVENT_INTRO_LK_8, - EVENT_INTRO_LK_9, - - EVENT_INTRO_END, -}; - -enum eEnum -{ - ACTION_START_INTRO, - ACTION_SKIP_INTRO, - - QUEST_DELIVRANCE_FROM_THE_PIT_A2 = 24710, - QUEST_DELIVRANCE_FROM_THE_PIT_H2 = 24712, - QUEST_WRATH_OF_THE_LICH_KING_A2 = 24500, - QUEST_WRATH_OF_THE_LICH_KING_H2 = 24802, -}; - -static Position HallsofReflectionLocs[]= -{ - {5283.234863, 1990.946777, 707.695679, 0.929097}, // 2 Loralen Follows - {5408.031250, 2102.918213, 707.695251, 0.792756}, // 9 Sylvanas Follows - {5401.866699, 2110.837402, 707.695251, 0.800610}, // 10 Loralen follows -}; - -static Position SpawnPos = {5262.540527, 1949.693726, 707.695007, 0.808736}; // Jaina/Sylvanas Beginning Position -static Position MoveThronePos = {5306.952148, 1998.499023, 709.341431, 1.277278}; // Jaina/Sylvanas walks to throne -static Position UtherSpawnPos = {5308.310059, 2003.857178, 709.341431, 4.650315}; -static Position LichKingSpawnPos = {5362.917480, 2062.307129, 707.695374, 3.945812}; -static Position LichKingMoveThronePos = {5312.080566, 2009.172119, 709.341431, 3.973301}; // Lich King walks to throne -static Position LichKingMoveAwayPos = {5400.069824, 2102.7131689, 707.69525, 0.843803}; // Lich King walks away - -// AI of Part1: handle the intro till start of gauntlet event. -struct npc_jaina_or_sylvanas_horAI : public ScriptedAI -{ - npc_jaina_or_sylvanas_horAI(Creature *pCreature) : ScriptedAI(pCreature) - { - pInstance = me->GetInstanceData(); - } - - ScriptedInstance* pInstance; - uint64 uiUther; - uint64 uiLichKing; - - EventMap events; - - void Reset() - { - events.Reset(); - - uiUther = 0; - uiLichKing = 0; - - me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - me->SetStandState(UNIT_STAND_STATE_STAND); - me->SetVisibility(VISIBILITY_ON); - } - - void DoAction(const int32 actionId) - { - switch(actionId) - { - case ACTION_START_INTRO: - events.ScheduleEvent(EVENT_START_INTRO, 0); - break; - case ACTION_SKIP_INTRO: - events.ScheduleEvent(EVENT_SKIP_INTRO, 0); - break; - } - } - - void UpdateAI(const uint32 diff) - { - events.Update(diff); - switch(events.ExecuteEvent()) - { - case EVENT_START_INTRO: - me->GetMotionMaster()->MovePoint(0, MoveThronePos); - // Begining of intro is differents between factions as the speech sequence and timers are differents. - if (pInstance->GetData(DATA_TEAM_IN_INSTANCE) == ALLIANCE) - events.ScheduleEvent(EVENT_INTRO_A2_1, 0); - else - events.ScheduleEvent(EVENT_INTRO_H2_1, 0); - break; - - // A2 Intro Events - case EVENT_INTRO_A2_1: - DoScriptText(SAY_JAINA_INTRO_3, me); - events.ScheduleEvent(EVENT_INTRO_A2_2, 5000); - break; - case EVENT_INTRO_A2_2: - DoScriptText(SAY_JAINA_INTRO_4, me); - events.ScheduleEvent(EVENT_INTRO_A2_3, 10000); - break; - case EVENT_INTRO_A2_3: - // TODO: she's doing some kind of spell casting emote - pInstance->HandleGameObject(pInstance->GetData64(DATA_FROSTMOURNE), true); - events.ScheduleEvent(EVENT_INTRO_A2_4, 10000); - break; - case EVENT_INTRO_A2_4: - // spawn UTHER during speach 2 - if (Creature* pUther = me->SummonCreature(NPC_UTHER, UtherSpawnPos, TEMPSUMMON_MANUAL_DESPAWN)) - { - pUther->GetMotionMaster()->MoveIdle(); - pUther->SetReactState(REACT_PASSIVE); // be sure he will not aggro arthas - uiUther = pUther->GetGUID(); - } - events.ScheduleEvent(EVENT_INTRO_A2_5, 2000); - break; - case EVENT_INTRO_A2_5: - if (Creature* pUther = me->GetCreature(*me, uiUther)) - DoScriptText(SAY_UTHER_INTRO_A2_1, pUther); - events.ScheduleEvent(EVENT_INTRO_A2_6, 3000); - break; - case EVENT_INTRO_A2_6: - DoScriptText(SAY_JAINA_INTRO_5, me); - events.ScheduleEvent(EVENT_INTRO_A2_7, 6000); - break; - case EVENT_INTRO_A2_7: - if (Creature* pUther = me->GetCreature(*me, uiUther)) - DoScriptText(SAY_UTHER_INTRO_A2_2, pUther); - events.ScheduleEvent(EVENT_INTRO_A2_8, 6500); - break; - case EVENT_INTRO_A2_8: - DoScriptText(SAY_JAINA_INTRO_6, me); - events.ScheduleEvent(EVENT_INTRO_A2_9, 2000); - break; - case EVENT_INTRO_A2_9: - if (Creature* pUther = me->GetCreature(*me, uiUther)) - DoScriptText(SAY_UTHER_INTRO_A2_3, pUther); - events.ScheduleEvent(EVENT_INTRO_A2_10, 9000); - break; - case EVENT_INTRO_A2_10: - DoScriptText(SAY_JAINA_INTRO_7, me); - events.ScheduleEvent(EVENT_INTRO_A2_11, 5000); - break; - case EVENT_INTRO_A2_11: - if (Creature* pUther = me->GetCreature(*me, uiUther)) - DoScriptText(SAY_UTHER_INTRO_A2_4, pUther); - events.ScheduleEvent(EVENT_INTRO_A2_12, 11000); - break; - case EVENT_INTRO_A2_12: - DoScriptText(SAY_JAINA_INTRO_8, me); - events.ScheduleEvent(EVENT_INTRO_A2_13, 4000); - break; - case EVENT_INTRO_A2_13: - if (Creature* pUther = me->GetCreature(*me, uiUther)) - DoScriptText(SAY_UTHER_INTRO_A2_5, pUther); - events.ScheduleEvent(EVENT_INTRO_A2_14, 12500); - break; - case EVENT_INTRO_A2_14: - DoScriptText(SAY_JAINA_INTRO_9, me); - events.ScheduleEvent(EVENT_INTRO_A2_15, 10000); - break; - case EVENT_INTRO_A2_15: - if (Creature* pUther = me->GetCreature(*me, uiUther)) - DoScriptText(SAY_UTHER_INTRO_A2_6, pUther); - events.ScheduleEvent(EVENT_INTRO_A2_16, 22000); - break; - case EVENT_INTRO_A2_16: - if (Creature* pUther = me->GetCreature(*me, uiUther)) - DoScriptText(SAY_UTHER_INTRO_A2_7, pUther); - events.ScheduleEvent(EVENT_INTRO_A2_17, 4000); - break; - case EVENT_INTRO_A2_17: - DoScriptText(SAY_JAINA_INTRO_10, me); - events.ScheduleEvent(EVENT_INTRO_A2_18, 2000); - break; - case EVENT_INTRO_A2_18: - if (Creature* pUther = me->GetCreature(*me, uiUther)) - { - pUther->HandleEmoteCommand(EMOTE_ONESHOT_NO); - DoScriptText(SAY_UTHER_INTRO_A2_8, pUther); - } - events.ScheduleEvent(EVENT_INTRO_A2_19, 11000); - break; - case EVENT_INTRO_A2_19: - DoScriptText(SAY_JAINA_INTRO_11, me); - events.ScheduleEvent(EVENT_INTRO_LK_1, 2000); - break; - - // H2 Intro Events - case EVENT_INTRO_H2_1: - DoScriptText(SAY_SYLVANAS_INTRO_1, me); - events.ScheduleEvent(EVENT_INTRO_H2_2, 8000); - break; - case EVENT_INTRO_H2_2: - DoScriptText(SAY_SYLVANAS_INTRO_2, me); - events.ScheduleEvent(EVENT_INTRO_H2_3, 6000); - break; - case EVENT_INTRO_H2_3: - DoScriptText(SAY_SYLVANAS_INTRO_3, me); - // TODO: she's doing some kind of spell casting emote - events.ScheduleEvent(EVENT_INTRO_H2_4, 6000); - break; - case EVENT_INTRO_H2_4: - // spawn UTHER during speach 2 - if (Creature* pUther = me->SummonCreature(NPC_UTHER, UtherSpawnPos, TEMPSUMMON_MANUAL_DESPAWN)) - { - pUther->GetMotionMaster()->MoveIdle(); - pUther->SetReactState(REACT_PASSIVE); // be sure he will not aggro arthas - uiUther = pUther->GetGUID(); - } - events.ScheduleEvent(EVENT_INTRO_H2_5, 2000); - break; - case EVENT_INTRO_H2_5: - if (Creature* pUther = me->GetCreature(*me, uiUther)) - DoScriptText(SAY_UTHER_INTRO_H2_1, pUther); - events.ScheduleEvent(EVENT_INTRO_H2_6, 11000); - break; - case EVENT_INTRO_H2_6: - DoScriptText(SAY_SYLVANAS_INTRO_4, me); - events.ScheduleEvent(EVENT_INTRO_H2_7, 3000); - break; - case EVENT_INTRO_H2_7: - if (Creature* pUther = me->GetCreature(*me, uiUther)) - DoScriptText(SAY_UTHER_INTRO_H2_2, pUther); - events.ScheduleEvent(EVENT_INTRO_H2_8, 6000); - break; - case EVENT_INTRO_H2_8: - DoScriptText(SAY_SYLVANAS_INTRO_5, me); - events.ScheduleEvent(EVENT_INTRO_H2_9, 5000); - break; - case EVENT_INTRO_H2_9: - if (Creature* pUther = me->GetCreature(*me, uiUther)) - DoScriptText(SAY_UTHER_INTRO_H2_3, pUther); - events.ScheduleEvent(EVENT_INTRO_H2_10, 19000); - break; - case EVENT_INTRO_H2_10: - DoScriptText(SAY_SYLVANAS_INTRO_6, me); - events.ScheduleEvent(EVENT_INTRO_H2_11, 1500); - break; - case EVENT_INTRO_H2_11: - if (Creature* pUther = me->GetCreature(*me, uiUther)) - DoScriptText(SAY_UTHER_INTRO_H2_4, pUther); - events.ScheduleEvent(EVENT_INTRO_H2_12, 19500); - break; - case EVENT_INTRO_H2_12: - DoScriptText(SAY_SYLVANAS_INTRO_7, me); - events.ScheduleEvent(EVENT_INTRO_H2_13, 2000); - break; - case EVENT_INTRO_H2_13: - if (Creature* pUther = me->GetCreature(*me, uiUther)) - { - pUther->HandleEmoteCommand(EMOTE_ONESHOT_NO); - DoScriptText(SAY_UTHER_INTRO_H2_5, pUther); - } - events.ScheduleEvent(EVENT_INTRO_H2_14, 12000); - break; - case EVENT_INTRO_H2_14: - if (Creature* pUther = me->GetCreature(*me, uiUther)) - DoScriptText(SAY_UTHER_INTRO_H2_6, pUther); - events.ScheduleEvent(EVENT_INTRO_H2_15, 8000); - break; - case EVENT_INTRO_H2_15: - DoScriptText(SAY_SYLVANAS_INTRO_8, me); - events.ScheduleEvent(EVENT_INTRO_LK_1, 2000); - break; - - // Remaining Intro Events common for both faction - case EVENT_INTRO_LK_1: - // Spawn LK in front of door, and make him move to the sword. - if (Creature* pLichKing = me->SummonCreature(NPC_LICH_KING_EVENT, LichKingSpawnPos, TEMPSUMMON_MANUAL_DESPAWN)) - { - pLichKing->GetMotionMaster()->MovePoint(0, LichKingMoveThronePos); - pLichKing->SetReactState(REACT_PASSIVE); - uiLichKing = pLichKing->GetGUID(); - } - - if (Creature* pUther = me->GetCreature(*me, uiUther)) - if (pInstance->GetData(DATA_TEAM_IN_INSTANCE) == ALLIANCE) - DoScriptText(SAY_UTHER_INTRO_A2_9, pUther); - else - DoScriptText(SAY_UTHER_INTRO_H2_7, pUther); - - events.ScheduleEvent(EVENT_INTRO_LK_2, 11000); - break; - - case EVENT_INTRO_LK_2: - if (Creature* pLichKing = me->GetCreature(*me, uiLichKing)) - DoScriptText(SAY_LK_INTRO_1, pLichKing); - events.ScheduleEvent(EVENT_INTRO_LK_3, 2000); - break; - - case EVENT_INTRO_LK_3: - // The Lich King banishes Uther to the abyss. - if (Creature* pUther = me->GetCreature(*me, uiUther)) - { - pUther->DisappearAndDie(); - uiUther = 0; - } - - // He steps forward and removes the runeblade from the heap of skulls. - - events.ScheduleEvent(EVENT_INTRO_LK_4, 4000); - break; - - case EVENT_INTRO_LK_4: - if (Creature* pLichKing = me->GetCreature(*me, uiLichKing)) - DoScriptText(SAY_LK_INTRO_2, pLichKing); - events.ScheduleEvent(EVENT_INTRO_LK_5, 10000); - break; - - case EVENT_INTRO_LK_5: - // summon Falric and Marwyn. then go back to the door - if (Creature* pFalric = me->GetCreature(*me, pInstance->GetData64(DATA_FALRIC))) - pFalric->SetVisibility(VISIBILITY_ON); - if (Creature* pMarwyn = me->GetCreature(*me, pInstance->GetData64(DATA_MARWYN))) - pMarwyn->SetVisibility(VISIBILITY_ON); - - if (Creature* pLichKing = me->GetCreature(*me, uiLichKing)) - { - pLichKing->GetMotionMaster()->MovePoint(0, LichKingSpawnPos); - DoScriptText(SAY_LK_INTRO_3, pLichKing); - } - - events.ScheduleEvent(EVENT_INTRO_LK_6, 8000); - break; - - case EVENT_INTRO_LK_6: - if (Creature* pFalric = me->GetCreature(*me, pInstance->GetData64(DATA_FALRIC))) - DoScriptText(SAY_FALRIC_INTRO_1, pFalric); - - events.ScheduleEvent(EVENT_INTRO_LK_7, 2000); - break; - - case EVENT_INTRO_LK_7: - if (Creature* pMarwyn = me->GetCreature(*me, pInstance->GetData64(DATA_MARWYN))) - DoScriptText(SAY_MARWYN_INTRO_1, pMarwyn); - - events.ScheduleEvent(EVENT_INTRO_LK_8, 2000); - break; - - case EVENT_INTRO_LK_8: - if (Creature* pFalric = me->GetCreature(*me, pInstance->GetData64(DATA_FALRIC))) - DoScriptText(SAY_FALRIC_INTRO_2, pFalric); - - events.ScheduleEvent(EVENT_INTRO_LK_9, 5000); - break; - - case EVENT_INTRO_LK_9: - if (pInstance->GetData(DATA_TEAM_IN_INSTANCE) == ALLIANCE) - DoScriptText(SAY_JAINA_INTRO_END, me); - else - DoScriptText(SAY_SYLVANAS_INTRO_END, me); - - me->GetMotionMaster()->MovePoint(0, LichKingSpawnPos); - // TODO: Loralen/Koreln shall run also - events.ScheduleEvent(EVENT_INTRO_END, 10000); - break; - - case EVENT_INTRO_END: - if (pInstance) - pInstance->SetData(DATA_WAVE_COUNT, SPECIAL); // start first wave - - // Loralen or Koreln disappearAndDie() - me->DisappearAndDie(); - break; - - case EVENT_SKIP_INTRO: - // TODO: implement - - if (Creature* pFalric = me->GetCreature(*me, pInstance->GetData64(DATA_FALRIC))) - pFalric->SetVisibility(VISIBILITY_ON); - if (Creature* pMarwyn = me->GetCreature(*me, pInstance->GetData64(DATA_MARWYN))) - pMarwyn->SetVisibility(VISIBILITY_ON); - - me->GetMotionMaster()->MovePoint(0, LichKingSpawnPos); - // TODO: Loralen/Koreln shall run also - - events.ScheduleEvent(EVENT_INTRO_END, 15000); - break; - } - } -}; - -bool GossipHello_npc_sylvanas_hor(Player* pPlayer, Creature* pCreature) -{ - if (pCreature->isQuestGiver()) - pPlayer->PrepareQuestMenu(pCreature->GetGUID()); - - if (pPlayer->GetQuestStatus(QUEST_DELIVRANCE_FROM_THE_PIT_H2) == QUEST_STATUS_COMPLETE) - pPlayer->ADD_GOSSIP_ITEM( 0, "Can you remove the sword?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - - // once last quest is completed, she offers this shortcut of the starting event - if (pPlayer->GetQuestStatus(QUEST_WRATH_OF_THE_LICH_KING_H2) == QUEST_STATUS_COMPLETE) - pPlayer->ADD_GOSSIP_ITEM( 0, "Dark Lady, I think I hear Arthas coming. Whatever you're going to do, do it quickly.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); - - pPlayer->SEND_GOSSIP_MENU(DEFAULT_GOSSIP_MESSAGE, pCreature->GetGUID()); - - return true; -} - -bool GossipHello_npc_jaina_hor(Player* pPlayer, Creature* pCreature) -{ - if (pCreature->isQuestGiver()) - pPlayer->PrepareQuestMenu(pCreature->GetGUID()); - - if (pPlayer->GetQuestStatus(QUEST_DELIVRANCE_FROM_THE_PIT_A2) == QUEST_STATUS_COMPLETE) - pPlayer->ADD_GOSSIP_ITEM( 0, "Can you remove the sword?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - - // once last quest of the series is completed, she offers this shortcut of the starting event - if (pPlayer->GetQuestStatus(QUEST_WRATH_OF_THE_LICH_KING_A2) == QUEST_STATUS_COMPLETE) - pPlayer->ADD_GOSSIP_ITEM( 0, "My Lady, I think I hear Arthas coming. Whatever you're going to do, do it quickly.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); - - pPlayer->SEND_GOSSIP_MENU(DEFAULT_GOSSIP_MESSAGE, pCreature->GetGUID()); - return true; -} - -bool GossipSelect_npc_jaina_or_sylvanas_hor(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) -{ - switch (uiAction) - { - case GOSSIP_ACTION_INFO_DEF+1: - pPlayer->CLOSE_GOSSIP_MENU(); - if (pCreature->AI()) - pCreature->AI()->DoAction(ACTION_START_INTRO); - pCreature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - break; - case GOSSIP_ACTION_INFO_DEF+2: - pPlayer->CLOSE_GOSSIP_MENU(); - if (pCreature->AI()) - pCreature->AI()->DoAction(ACTION_SKIP_INTRO); - pCreature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - break; - } - - return true; -} - -enum TrashSpells -{ - // Ghostly Priest - SPELL_SHADOW_WORD_PAIN = 72318, - SPELL_CIRCLE_OF_DESTRUCTION = 72320, - SPELL_COWER_IN_FEAR = 72321, - SPELL_DARK_MENDING = 72322, - - // Phantom Mage - SPELL_FIREBALL = 72163, - SPELL_FLAMESTRIKE = 72169, - SPELL_FROSTBOLT = 72166, - SPELL_CHAINS_OF_ICE = 72121, - SPELL_HALLUCINATION = 72342, - - // Phantom Hallucination (same as phantom mage + HALLUCINATION_2 when dies) - SPELL_HALLUCINATION_2 = 72344, - - // Shadowy Mercenary - SPELL_SHADOW_STEP = 72326, - SPELL_DEADLY_POISON = 72329, - SPELL_ENVENOMED_DAGGER_THROW = 72333, - SPELL_KIDNEY_SHOT = 72335, - - // Spectral Footman - SPELL_SPECTRAL_STRIKE = 72198, - SPELL_SHIELD_BASH = 72194, - SPELL_TORTURED_ENRAGE = 72203, - - // Tortured Rifleman - SPELL_SHOOT = 72208, - SPELL_CURSED_ARROW = 72222, - SPELL_FROST_TRAP = 72215, - SPELL_ICE_SHOT = 72268, -}; - -enum TrashEvents -{ - EVENT_TRASH_NONE, - - // Ghostly Priest - EVENT_SHADOW_WORD_PAIN, - EVENT_CIRCLE_OF_DESTRUCTION, - EVENT_COWER_IN_FEAR, - EVENT_DARK_MENDING, - - // Phantom Mage - EVENT_FIREBALL, - EVENT_FLAMESTRIKE, - EVENT_FROSTBOLT, - EVENT_CHAINS_OF_ICE, - EVENT_HALLUCINATION, - - // Shadowy Mercenary - EVENT_SHADOW_STEP, - EVENT_DEADLY_POISON, - EVENT_ENVENOMED_DAGGER_THROW, - EVENT_KIDNEY_SHOT, - - // Spectral Footman - EVENT_SPECTRAL_STRIKE, - EVENT_SHIELD_BASH, - EVENT_TORTURED_ENRAGE, - - // Tortured Rifleman - EVENT_SHOOT, - EVENT_CURSED_ARROW, - EVENT_FROST_TRAP, - EVENT_ICE_SHOT, -}; - -struct npc_ghostly_priestAI: public ScriptedAI -{ - npc_ghostly_priestAI(Creature *c) : ScriptedAI(c) - { - } - - EventMap events; - - void Reset() - { - events.Reset(); - } - - void EnterCombat(Unit* /*who*/) - { - events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 8000); // TODO: adjust timers - events.ScheduleEvent(EVENT_CIRCLE_OF_DESTRUCTION, 12000); - events.ScheduleEvent(EVENT_COWER_IN_FEAR, 10000); - events.ScheduleEvent(EVENT_DARK_MENDING, 20000); - } - - void UpdateAI(const uint32 diff) - { - if (!UpdateVictim()) - return; - - events.Update(diff); - - if (me->hasUnitState(UNIT_STAT_CASTING)) - return; - - while (uint32 eventId = events.ExecuteEvent()) - { - switch(eventId) - { - case EVENT_SHADOW_WORD_PAIN: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM)) - DoCast(pTarget, SPELL_SHADOW_WORD_PAIN); - events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 8000); - return; - case EVENT_CIRCLE_OF_DESTRUCTION: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM)) - DoCast(pTarget, SPELL_CIRCLE_OF_DESTRUCTION); - events.ScheduleEvent(EVENT_CIRCLE_OF_DESTRUCTION, 12000); - return; - case EVENT_COWER_IN_FEAR: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM)) - DoCast(pTarget, SPELL_COWER_IN_FEAR); - events.ScheduleEvent(EVENT_COWER_IN_FEAR, 10000); - return; - case EVENT_DARK_MENDING: - // find an ally with missing HP - if (Unit *pTarget = DoSelectLowestHpFriendly(40, DUNGEON_MODE(30000,50000))) - { - DoCast(pTarget, SPELL_DARK_MENDING); - events.ScheduleEvent(EVENT_DARK_MENDING, 20000); - } - else - { - // no friendly unit with missing hp. re-check in just 5 sec. - events.ScheduleEvent(EVENT_DARK_MENDING, 5000); - } - return; - } - } - - DoMeleeAttackIfReady(); - } -}; - -struct npc_phantom_mageAI: public ScriptedAI -{ - npc_phantom_mageAI(Creature *c) : ScriptedAI(c) - { - } - - EventMap events; - - void Reset() - { - events.Reset(); - } - - void EnterCombat(Unit* /*who*/) - { - events.ScheduleEvent(EVENT_FIREBALL, 3000); // TODO: adjust timers - events.ScheduleEvent(EVENT_FLAMESTRIKE, 6000); - events.ScheduleEvent(EVENT_FROSTBOLT, 9000); - events.ScheduleEvent(EVENT_CHAINS_OF_ICE, 12000); - events.ScheduleEvent(EVENT_HALLUCINATION, 40000); - } - - void UpdateAI(const uint32 diff) - { - if (!UpdateVictim()) - return; - - events.Update(diff); - - if (me->hasUnitState(UNIT_STAT_CASTING)) - return; - - while (uint32 eventId = events.ExecuteEvent()) - { - switch(eventId) - { - case EVENT_FIREBALL: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM)) - DoCast(pTarget, SPELL_FIREBALL); - events.ScheduleEvent(EVENT_FIREBALL, 15000); - return; - case EVENT_FLAMESTRIKE: - DoCast(SPELL_FLAMESTRIKE); - events.ScheduleEvent(EVENT_FLAMESTRIKE, 15000); - return; - case EVENT_FROSTBOLT: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM)) - DoCast(pTarget, SPELL_FROSTBOLT); - events.ScheduleEvent(EVENT_FROSTBOLT, 15000); - return; - case EVENT_CHAINS_OF_ICE: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM)) - DoCast(pTarget, SPELL_CHAINS_OF_ICE); - events.ScheduleEvent(EVENT_CHAINS_OF_ICE, 15000); - return; - case EVENT_HALLUCINATION: - DoCast(SPELL_HALLUCINATION); - return; - } - } - - DoMeleeAttackIfReady(); - } -}; - -struct npc_phantom_hallucinationAI: public npc_phantom_mageAI -{ - npc_phantom_hallucinationAI(Creature *c) : npc_phantom_mageAI(c) - { - } - - void JustDied(Unit * /*pWho*/) - { - DoCast(SPELL_HALLUCINATION_2); - } -}; - -struct npc_shadowy_mercenaryAI: public ScriptedAI -{ - npc_shadowy_mercenaryAI(Creature *c) : ScriptedAI(c) - { - } - - EventMap events; - - void Reset() - { - events.Reset(); - } - - void EnterCombat(Unit* /*who*/) - { - events.ScheduleEvent(EVENT_SHADOW_STEP, 8000); // TODO: adjust timers - events.ScheduleEvent(EVENT_DEADLY_POISON, 5000); - events.ScheduleEvent(EVENT_ENVENOMED_DAGGER_THROW, 10000); - events.ScheduleEvent(EVENT_KIDNEY_SHOT, 12000); - } - - void UpdateAI(const uint32 diff) - { - if (!UpdateVictim()) - return; - - events.Update(diff); - - if (me->hasUnitState(UNIT_STAT_CASTING)) - return; - - while (uint32 eventId = events.ExecuteEvent()) - { - switch(eventId) - { - case EVENT_SHADOW_STEP: - DoCast(SPELL_SHADOW_STEP); - events.ScheduleEvent(EVENT_SHADOW_STEP, 8000); - return; - case EVENT_DEADLY_POISON: - DoCast(me->getVictim(), SPELL_DEADLY_POISON); - events.ScheduleEvent(EVENT_DEADLY_POISON, 10000); - return; - case EVENT_ENVENOMED_DAGGER_THROW: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM)) - DoCast(pTarget, SPELL_ENVENOMED_DAGGER_THROW); - events.ScheduleEvent(EVENT_ENVENOMED_DAGGER_THROW, 10000); - return; - case EVENT_KIDNEY_SHOT: - DoCast(me->getVictim(), SPELL_KIDNEY_SHOT); - events.ScheduleEvent(EVENT_KIDNEY_SHOT, 10000); - return; - } - } - - DoMeleeAttackIfReady(); - } -}; - -struct npc_spectral_footmanAI: public ScriptedAI -{ - npc_spectral_footmanAI(Creature *c) : ScriptedAI(c) - { - } - - EventMap events; - - void Reset() - { - events.Reset(); - } - - void EnterCombat(Unit* /*who*/) - { - events.ScheduleEvent(EVENT_SPECTRAL_STRIKE, 5000); // TODO: adjust timers - events.ScheduleEvent(EVENT_SHIELD_BASH, 10000); - events.ScheduleEvent(EVENT_TORTURED_ENRAGE, 15000); - } - - void UpdateAI(const uint32 diff) - { - if (!UpdateVictim()) - return; - - events.Update(diff); - - if (me->hasUnitState(UNIT_STAT_CASTING)) - return; - - while (uint32 eventId = events.ExecuteEvent()) - { - switch(eventId) - { - case EVENT_SPECTRAL_STRIKE: - DoCast(me->getVictim(), SPELL_SPECTRAL_STRIKE); - events.ScheduleEvent(EVENT_SPECTRAL_STRIKE, 5000); - return; - case EVENT_SHIELD_BASH: - DoCast(me->getVictim(), SPELL_SHIELD_BASH); - events.ScheduleEvent(EVENT_SHIELD_BASH, 5000); - return; - case EVENT_TORTURED_ENRAGE: - DoCast(SPELL_TORTURED_ENRAGE); - events.ScheduleEvent(EVENT_TORTURED_ENRAGE, 15000); - return; - } - } - - DoMeleeAttackIfReady(); - } -}; - -struct npc_tortured_riflemanAI : public ScriptedAI -{ - npc_tortured_riflemanAI(Creature *c) : ScriptedAI(c) - { - } - - EventMap events; - - void Reset() - { - events.Reset(); - } - - void EnterCombat(Unit* /*who*/) - { - events.ScheduleEvent(EVENT_SHOOT, 2000); // TODO: adjust timers - events.ScheduleEvent(EVENT_CURSED_ARROW, 10000); - events.ScheduleEvent(EVENT_FROST_TRAP, 1000); - events.ScheduleEvent(EVENT_ICE_SHOT, 15000); - } - - void UpdateAI(const uint32 diff) - { - if (!UpdateVictim()) - return; - - events.Update(diff); - - if (me->hasUnitState(UNIT_STAT_CASTING)) - return; - - while (uint32 eventId = events.ExecuteEvent()) - { - switch(eventId) - { - case EVENT_SHOOT: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM)) - DoCast(pTarget, SPELL_SHOOT); - events.ScheduleEvent(EVENT_SHOOT, 2000); - return; - case EVENT_CURSED_ARROW: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM)) - DoCast(pTarget, SPELL_CURSED_ARROW); - events.ScheduleEvent(EVENT_CURSED_ARROW, 10000); - return; - case EVENT_FROST_TRAP: - DoCast(SPELL_FROST_TRAP); - events.ScheduleEvent(EVENT_FROST_TRAP, 30000); - return; - case EVENT_ICE_SHOT: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM)) - DoCast(pTarget, SPELL_ICE_SHOT); - events.ScheduleEvent(EVENT_ICE_SHOT, 15000); - return; - } - } - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_npc_jaina_or_sylvanas_horAI(Creature* pCreature) -{ - return new npc_jaina_or_sylvanas_horAI(pCreature); -} - -CreatureAI* GetAI_npc_ghostly_priestAI(Creature* pCreature) -{ - return new npc_ghostly_priestAI(pCreature); -} - -CreatureAI* GetAI_npc_phantom_mageAI(Creature* pCreature) -{ - return new npc_phantom_mageAI(pCreature); -} - -CreatureAI* GetAI_npc_phantom_hallucinationAI(Creature* pCreature) -{ - return new npc_phantom_hallucinationAI(pCreature); -} - -CreatureAI* GetAI_npc_shadowy_mercenaryAI(Creature* pCreature) -{ - return new npc_shadowy_mercenaryAI(pCreature); -} - -CreatureAI* GetAI_npc_spectral_footmanAI(Creature* pCreature) -{ - return new npc_spectral_footmanAI(pCreature); -} - -CreatureAI* GetAI_npc_tortured_riflemanAI(Creature* pCreature) -{ - return new npc_tortured_riflemanAI(pCreature); -} - -void AddSC_halls_of_reflection() -{ - Script *newscript; - - newscript = new Script; - newscript->Name = "npc_sylvanas_hor_part1"; - newscript->GetAI = &GetAI_npc_jaina_or_sylvanas_horAI; - newscript->pGossipHello = &GossipHello_npc_sylvanas_hor; - newscript->pGossipSelect = &GossipSelect_npc_jaina_or_sylvanas_hor; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "npc_jaina_hor_part1"; - newscript->GetAI = &GetAI_npc_jaina_or_sylvanas_horAI; - newscript->pGossipHello = &GossipHello_npc_jaina_hor; - newscript->pGossipSelect = &GossipSelect_npc_jaina_or_sylvanas_hor; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "npc_ghostly_priest"; - newscript->GetAI = &GetAI_npc_ghostly_priestAI; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "npc_phantom_mage"; - newscript->GetAI = &GetAI_npc_phantom_mageAI; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "npc_phantom_hallucination"; - newscript->GetAI = &GetAI_npc_phantom_hallucinationAI; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "npc_shadowy_mercenary"; - newscript->GetAI = &GetAI_npc_shadowy_mercenaryAI; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "npc_spectral_footman"; - newscript->GetAI = &GetAI_npc_spectral_footmanAI; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "npc_tortured_rifleman"; - newscript->GetAI = &GetAI_npc_tortured_riflemanAI; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Northrend/FrozenHalls/halls_of_reflection/halls_of_reflection.h b/src/server/scripts/Northrend/FrozenHalls/halls_of_reflection/halls_of_reflection.h deleted file mode 100644 index 46ae0cb283c..00000000000 --- a/src/server/scripts/Northrend/FrozenHalls/halls_of_reflection/halls_of_reflection.h +++ /dev/null @@ -1,156 +0,0 @@ -/* Copyright (C) 2006 - 2010 TrinityCore - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef DEF_HALLS_OF_REFLECTION_H -#define DEF_HALLS_OF_REFLECTION_H - -enum Data -{ - DATA_FALRIC_EVENT, - DATA_MARWYN_EVENT, - DATA_LICHKING_EVENT, - DATA_WAVE_COUNT, - DATA_TEAM_IN_INSTANCE, -}; - -enum Data64 -{ - DATA_FALRIC, - DATA_MARWYN, - DATA_LICHKING, - DATA_FROSTMOURNE, -}; - -enum Creatures -{ - NPC_FALRIC = 38112, - NPC_MARWYN = 38113, - NPC_LICH_KING_EVENT = 37226, - NPC_LICH_KING_BOSS = 36954, - - NPC_UTHER = 37225, - NPC_JAINA_PART1 = 37221, - NPC_JAINA_PART2 = 36955, - NPC_SYLVANAS_PART1 = 37223, - NPC_SYLVANAS_PART2 = 37554, - - NPC_WAVE_MERCENARY = 38177, - NPC_WAVE_FOOTMAN = 38173, - NPC_WAVE_RIFLEMAN = 38176, - NPC_WAVE_PRIEST = 38175, - NPC_WAVE_MAGE = 38172, -}; - -enum GameObjects -{ - GO_FROSTMOURNE = 202302, - GO_FROSTMOURNE_ALTAR = 202236, - GO_FRONT_DOOR = 201976, - GO_ARTHAS_DOOR = 197341, -}; - -enum HorWorldStates -{ - WORLD_STATE_HOR = 4884, - WORLD_STATE_HOR_WAVE_COUNT = 4882, -}; - -// Common actions from Instance Script to Boss Script -enum Actions -{ - ACTION_ENTER_COMBAT, -}; - -// Base class for FALRIC and MARWYN -// handled the summonList and the notification events to/from the InstanceData -struct boss_horAI : ScriptedAI -{ - boss_horAI(Creature *pCreature) : ScriptedAI(pCreature), summons(pCreature) - { - pInstance = me->GetInstanceData(); - } - - InstanceData* pInstance; - EventMap events; - SummonList summons; - - void Reset() - { - events.Reset(); - me->SetVisibility(VISIBILITY_OFF); - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE); - me->SetReactState(REACT_PASSIVE); - } - - void DamageTaken(Unit *pWho, uint32 &uiDamage) - { - if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) - uiDamage = 0; - } - - void DoAction(const int32 actionID) - { - switch(actionID) - { - case ACTION_ENTER_COMBAT: // called by InstanceData when boss shall enter in combat. - // Just in case. Should have been done by InstanceData - me->SetVisibility(VISIBILITY_ON); - - // Reset flags - me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE); - me->SetReactState(REACT_AGGRESSIVE); - - if (Unit *pUnit = me->SelectNearestTarget()) - AttackStart(pUnit); - - DoZoneInCombat(); - break; - } - } - - void JustSummoned(Creature *pSummoned) - { - summons.Summon(pSummoned); - - if (Unit *pUnit = pSummoned->SelectNearestTarget()) - { - if (pSummoned->AI()) - pSummoned->AI()->AttackStart(pUnit); - else - { - pSummoned->GetMotionMaster()->MoveChase(pUnit); - pSummoned->Attack(pUnit, true); - } - } - - if (pSummoned->AI()) - pSummoned->AI()->DoZoneInCombat(); - } - - void SummonedCreatureDespawn(Creature *pSummoned) - { - summons.Despawn(pSummoned); - if (summons.empty()) - { - if (pSummoned->isAlive()) - pInstance->SetData(DATA_WAVE_COUNT, NOT_STARTED); - else - pInstance->SetData(DATA_WAVE_COUNT, SPECIAL); - } - } -}; - -#endif diff --git a/src/server/scripts/Northrend/FrozenHalls/halls_of_reflection/instance_halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/halls_of_reflection/instance_halls_of_reflection.cpp deleted file mode 100644 index 7a5d2479b7c..00000000000 --- a/src/server/scripts/Northrend/FrozenHalls/halls_of_reflection/instance_halls_of_reflection.cpp +++ /dev/null @@ -1,431 +0,0 @@ -/* Copyright (C) 2006 - 2010 TrinityCore - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "ScriptedPch.h" -#include "halls_of_reflection.h" - -#define MAX_ENCOUNTER 3 - -/* Halls of Reflection encounters: -0- Falric -1- Marwyn -2- The Lich King -*/ - -enum eEnum -{ - ENCOUNTER_WAVE_MERCENARY = 6, - ENCOUNTER_WAVE_FOOTMAN = 10, - ENCOUNTER_WAVE_RIFLEMAN = 6, - ENCOUNTER_WAVE_PRIEST = 6, - ENCOUNTER_WAVE_MAGE = 6, -}; - -enum Events -{ - EVENT_NONE, - EVENT_NEXT_WAVE, - EVENT_START_LICH_KING, -}; - -static Position PriestSpawnPos[ENCOUNTER_WAVE_PRIEST] = -{ - {5277.74,2016.88,707.778,5.96903}, - {5295.88,2040.34,707.778,5.07891}, - {5320.37,1980.13,707.778,2.00713}, - {5280.51,1997.84,707.778,0.296706}, - {5302.45,2042.22,707.778,4.90438}, - {5306.57,1977.47,707.778,1.50098}, -}; - -static Position MageSpawnPos[ENCOUNTER_WAVE_MAGE] = -{ - {5312.75,2037.12,707.778,4.59022}, - {5309.58,2042.67,707.778,4.69494}, - {5275.08,2008.72,707.778,6.21337}, - {5279.65,2004.66,707.778,0.069813}, - {5275.48,2001.14,707.778,0.174533}, - {5316.7,2041.55,707.778,4.50295}, -}; - -static Position MercenarySpawnPos[ENCOUNTER_WAVE_MERCENARY] = -{ - {5302.25,1972.41,707.778,1.37881}, - {5311.03,1972.23,707.778,1.64061}, - {5277.36,1993.23,707.778,0.401426}, - {5318.7,2036.11,707.778,4.2237}, - {5335.72,1996.86,707.778,2.74017}, - {5299.43,1979.01,707.778,1.23918}, -}; - -static Position FootmenSpawnPos[ENCOUNTER_WAVE_FOOTMAN] = -{ - {5306.06,2037,707.778,4.81711}, - {5344.15,2007.17,707.778,3.15905}, - {5337.83,2010.06,707.778,3.22886}, - {5343.29,1999.38,707.778,2.9147}, - {5340.84,1992.46,707.778,2.75762}, - {5325.07,1977.6,707.778,2.07694}, - {5336.6,2017.28,707.778,3.47321}, - {5313.82,1978.15,707.778,1.74533}, - {5280.63,2012.16,707.778,6.05629}, - {5322.96,2040.29,707.778,4.34587}, -}; - -static Position RiflemanSpawnPos[ENCOUNTER_WAVE_RIFLEMAN] = -{ - {5343.47,2015.95,707.778,3.49066}, - {5337.86,2003.4,707.778,2.98451}, - {5319.16,1974,707.778,1.91986}, - {5299.25,2036,707.778,5.02655}, - {5295.64,1973.76,707.778,1.18682}, - {5282.9,2019.6,707.778,5.88176}, -}; - -struct instance_halls_of_reflection : public ScriptedInstance -{ - instance_halls_of_reflection(Map* pMap) : ScriptedInstance(pMap) {}; - - uint64 uiFalric; - uint64 uiMarwyn; - uint64 uiLichKingEvent; - uint64 uiJainaPart1; - uint64 uiSylvanasPart1; - - uint64 uiFrostmourne; - uint64 uiFrostmourneAltar; - uint64 uiArthasDoor; - uint64 uiFrontDoor; - - uint32 uiEncounter[MAX_ENCOUNTER]; - uint32 uiTeamInInstance; - uint32 uiWaveCount; - bool bIntroDone; - - EventMap events; - - void Initialize() - { - events.Reset(); - - uiFalric = 0; - uiMarwyn = 0; - uiLichKingEvent = 0; - uiJainaPart1 = 0; - uiSylvanasPart1 = 0; - - uiFrostmourne = 0; - uiFrostmourneAltar = 0; - uiArthasDoor = 0; - uiFrontDoor = 0; - uiTeamInInstance = 0; - uiWaveCount = 0; - bIntroDone = false; - - for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) - uiEncounter[i] = NOT_STARTED; - } - - void OnCreatureCreate(Creature* pCreature, bool add) - { - if (!add) - return; - - Map::PlayerList const &players = instance->GetPlayers(); - if (!players.isEmpty()) - if (Player* pPlayer = players.begin()->getSource()) - uiTeamInInstance = pPlayer->GetTeam(); - - switch(pCreature->GetEntry()) - { - case NPC_FALRIC: - uiFalric = pCreature->GetGUID(); - break; - case NPC_MARWYN: - uiMarwyn = pCreature->GetGUID(); - break; - case NPC_LICH_KING_EVENT: - uiLichKingEvent = pCreature->GetGUID(); - break; - case NPC_JAINA_PART1: - uiJainaPart1 = pCreature->GetGUID(); - break; - case NPC_SYLVANAS_PART1: - uiSylvanasPart1 = pCreature->GetGUID(); - break; - } - } - - void OnGameObjectCreate(GameObject* pGo, bool add) - { - if (!add) - return; - - // TODO: init state depending on encounters - switch(pGo->GetEntry()) - { - case GO_FROSTMOURNE: - uiFrostmourne = pGo->GetGUID(); - pGo->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_INTERACT_COND); - HandleGameObject(0, false, pGo); - break; - case GO_FROSTMOURNE_ALTAR: - uiFrostmourneAltar = pGo->GetGUID(); - pGo->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_INTERACT_COND); - HandleGameObject(0, true, pGo); - break; - case GO_FRONT_DOOR: - uiFrontDoor = pGo->GetGUID(); - pGo->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_INTERACT_COND); - HandleGameObject(0, true, pGo); - break; - case GO_ARTHAS_DOOR: - uiArthasDoor = pGo->GetGUID(); - pGo->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_INTERACT_COND); - - if (uiEncounter[1] == DONE) - HandleGameObject(0, true, pGo); - else - HandleGameObject(0, false, pGo); - break; - } - } - - void SetData(uint32 type, uint32 data) - { - if (type == DATA_WAVE_COUNT && data == SPECIAL) - { - bIntroDone = true; - events.ScheduleEvent(EVENT_NEXT_WAVE, 10000); - return; - } - - - if (uiWaveCount && data == NOT_STARTED) - DoWipe(); - - switch(type) - { - case DATA_FALRIC_EVENT: - uiEncounter[0] = data; - if (data == DONE) - events.ScheduleEvent(EVENT_NEXT_WAVE, 60000); - break; - case DATA_MARWYN_EVENT: - uiEncounter[1] = data; - if (data == DONE) - HandleGameObject(uiArthasDoor, true); - break; - case DATA_LICHKING_EVENT: - uiEncounter[2] = data; - break; - } - - if (data == DONE) - SaveToDB(); - } - - uint32 GetData(uint32 type) - { - switch(type) - { - case DATA_FALRIC_EVENT: return uiEncounter[0]; - case DATA_MARWYN_EVENT: return uiEncounter[1]; - case DATA_LICHKING_EVENT: return uiEncounter[2]; - case DATA_WAVE_COUNT: return uiWaveCount; - case DATA_TEAM_IN_INSTANCE: return uiTeamInInstance; - } - - return 0; - } - - uint64 GetData64(uint32 identifier) - { - switch(identifier) - { - case DATA_FALRIC: return uiFalric; - case DATA_MARWYN: return uiMarwyn; - case DATA_LICHKING: return uiLichKingEvent; - case DATA_FROSTMOURNE: return uiFrostmourne; - } - - return 0; - } - - std::string GetSaveData() - { - OUT_SAVE_INST_DATA; - - std::ostringstream saveStream; - saveStream << "H R 1 " << uiEncounter[0] << " " << uiEncounter[1] << " " << uiEncounter[2]; - - OUT_SAVE_INST_DATA_COMPLETE; - return saveStream.str(); - } - - void Load(const char* in) - { - if (!in) - { - OUT_LOAD_INST_DATA_FAIL; - return; - } - - OUT_LOAD_INST_DATA(in); - - char dataHead1, dataHead2; - uint16 version; - uint16 data0, data1, data2; - - std::istringstream loadStream(in); - loadStream >> dataHead1 >> dataHead2 >> version >> data0 >> data1 >> data2; - - if (dataHead1 == 'H' && dataHead2 == 'R') - { - uiEncounter[0] = data0; - uiEncounter[1] = data1; - uiEncounter[2] = data2; - - for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) - if (uiEncounter[i] == IN_PROGRESS) - uiEncounter[i] = NOT_STARTED; - - } else OUT_LOAD_INST_DATA_FAIL; - - if (uiEncounter[0] == DONE || uiEncounter[1] == DONE) - bIntroDone = true; - - OUT_LOAD_INST_DATA_COMPLETE; - } - - void AddWave() - { - DoUpdateWorldState(WORLD_STATE_HOR, 1); - DoUpdateWorldState(WORLD_STATE_HOR_WAVE_COUNT, uiWaveCount); - - switch(uiWaveCount) - { - case 1: - case 2: - case 3: - case 4: - if (Creature *pFalric = instance->GetCreature(uiFalric)) - SpawnWave(pFalric); - break; - case 5: - if (GetData(DATA_FALRIC_EVENT) == DONE) - events.ScheduleEvent(EVENT_NEXT_WAVE, 10000); - else if (Creature *pFalric = instance->GetCreature(uiFalric)) - if (pFalric->AI()) - pFalric->AI()->DoAction(ACTION_ENTER_COMBAT); - break; - case 6: - case 7: - case 8: - case 9: - if (Creature *pMarwyn = instance->GetCreature(uiMarwyn)) - SpawnWave(pMarwyn); - break; - case 10: - if (GetData(DATA_MARWYN_EVENT) != DONE) // wave should not have been started if DONE. Check anyway to avoid bug exploit! - if (Creature *pMarwyn = instance->GetCreature(uiMarwyn)) - if (pMarwyn->AI()) - pMarwyn->AI()->DoAction(ACTION_ENTER_COMBAT); - break; - } - } - - // Wipe has been detected. Perform cleanup and reset. - void DoWipe() - { - uiWaveCount = 0; - events.Reset(); - DoUpdateWorldState(WORLD_STATE_HOR, 1); - DoUpdateWorldState(WORLD_STATE_HOR_WAVE_COUNT, uiWaveCount); - HandleGameObject(uiFrontDoor, true); - - // TODO - // in case of wipe, the event is normally restarted by jumping into the center of the room. - // As I can't find a trigger area there, just respawn Jaina/Sylvanas so the event may be restarted. - if (Creature* pJaina = instance->GetCreature(uiJainaPart1)) - pJaina->Respawn(); - if (Creature* pSylvanas = instance->GetCreature(uiSylvanasPart1)) - pSylvanas->Respawn(); - - if (Creature* pFalric = instance->GetCreature(uiFalric)) - pFalric->SetVisibility(VISIBILITY_OFF); - if (Creature* pMarwyn = instance->GetCreature(uiMarwyn)) - pMarwyn->SetVisibility(VISIBILITY_OFF); - } - - // spawn a wave on behalf of the summoner. - void SpawnWave(Creature *pSummoner) - { - uint32 index; - - pSummoner->SetVisibility(VISIBILITY_ON); - - // TODO: do composition at random. # of spawn also depends on uiWaveCount - // As of now, it is just one of each. - index = urand(0,ENCOUNTER_WAVE_MERCENARY-1); - pSummoner->SummonCreature(NPC_WAVE_MERCENARY, MercenarySpawnPos[index], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0); - - index = urand(0,ENCOUNTER_WAVE_FOOTMAN-1); - pSummoner->SummonCreature(NPC_WAVE_FOOTMAN, FootmenSpawnPos[index], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0); - - index = urand(0,ENCOUNTER_WAVE_RIFLEMAN-1); - pSummoner->SummonCreature(NPC_WAVE_RIFLEMAN, RiflemanSpawnPos[index], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0); - - index = urand(0,ENCOUNTER_WAVE_PRIEST-1); - pSummoner->SummonCreature(NPC_WAVE_PRIEST, PriestSpawnPos[index], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0); - - index = urand(0,ENCOUNTER_WAVE_MAGE-1); - pSummoner->SummonCreature(NPC_WAVE_MAGE, MageSpawnPos[index], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0); - } - - void Update(uint32 diff) - { - if (!instance->HavePlayers()) - return; - - events.Update(diff); - - switch(uint32 eventId = events.ExecuteEvent()) - { - case EVENT_NEXT_WAVE: - uiWaveCount++; - AddWave(); - break; - case EVENT_START_LICH_KING: - // TODO - break; - } - } -}; - -InstanceData* GetInstanceData_instance_halls_of_reflection(Map* pMap) -{ - return new instance_halls_of_reflection(pMap); -} - -void AddSC_instance_halls_of_reflection() -{ - Script *newscript; - newscript = new Script; - newscript->Name = "instance_halls_of_reflection"; - newscript->GetInstanceData = &GetInstanceData_instance_halls_of_reflection; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Northrend/FrozenHalls/pit_of_saron/boss_forgemaster_garfrost.cpp b/src/server/scripts/Northrend/FrozenHalls/pit_of_saron/boss_forgemaster_garfrost.cpp deleted file mode 100644 index 25c78c4a0d3..00000000000 --- a/src/server/scripts/Northrend/FrozenHalls/pit_of_saron/boss_forgemaster_garfrost.cpp +++ /dev/null @@ -1,209 +0,0 @@ -/* Copyright (C) 2006 - 2010 TrinityCore - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "ScriptedPch.h" -#include "pit_of_saron.h" - -enum Yells -{ - SAY_AGGRO = -1658001, - SAY_SLAY_1 = -1658002, - SAY_SLAY_2 = -1658003, - SAY_DEATH = -1658004, - SAY_PHASE2 = -1658005, - SAY_PHASE3 = -1658006, - - SAY_TYRANNUS_DEATH = -1659007, -}; - -enum eEvents -{ - EVENT_NONE, - EVENT_PERMAFROST, - EVENT_THROW_SARONITE, - EVENT_CHILLINGWAVE, - EVENT_DEEPFREEZE, -}; - -enum Spells -{ - SPELL_PERMAFROST = 70326, - SPELL_PERMAFROST_TRIGGER = 68786, // triggered by PERMAFROST. Used to check aura - SPELL_THROW_SARONITE = 68788, - SPELL_THUNDERING_STOMP = 68771, - SPELL_CHILLING_WAVE = 68778, - H_SPELL_CHILLING_WAVE = 70333, - SPELL_DEEP_FREEZE = 70381, - H_SPELL_DEEP_FREEZE = 72930, - SPELL_FORGE_MACE = 68785, - H_SPELL_FORGE_MACE = 70335, - SPELL_FORGE_BLADE = 68774, - H_SPELL_FORGE_BLADE = 70334, -}; - -enum eEnums -{ - EQUIP_ID_SWORD = 49345, - EQUIP_ID_MACE = 49344, - ACHIEV_DOESNT_GO_TO_ELEVEN = 4524, -}; - -struct boss_garfrostAI : public ScriptedAI -{ - boss_garfrostAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - } - - bool phase2; - bool phase3; - bool bAchievement; - - ScriptedInstance* pInstance; - EventMap events; - - void Reset() - { - events.Reset(); - - phase2 = false; - phase3 = false; - bAchievement = true; - - if (pInstance) - pInstance->SetData(DATA_GARFROST_EVENT, NOT_STARTED); - } - - void EnterCombat(Unit* /*who*/) - { - DoScriptText(SAY_AGGRO, me); - DoCast(me, SPELL_PERMAFROST); - - if (pInstance) - pInstance->SetData(DATA_GARFROST_EVENT, IN_PROGRESS); - - events.ScheduleEvent(EVENT_THROW_SARONITE, 45000); - } - - void DamageTaken(Unit* /*pDoneBy*/, uint32& /*uiDamage*/) - { - if (HealthBelowPct(66) && !phase2) - { - phase2 = true; - DoCast(me, SPELL_THUNDERING_STOMP); - // TODO: should go to a forge - DoCast(me, SPELL_FORGE_BLADE); - // TODO: should equip when spell completes - SetEquipmentSlots(false, EQUIP_ID_SWORD, -1, -1); - me->SetByteValue(UNIT_FIELD_BYTES_2, 0, SHEATH_STATE_MELEE); - events.ScheduleEvent(EVENT_CHILLINGWAVE, 10000); - } - - if (HealthBelowPct(33) && !phase3) - { - phase3 = true; - DoCast(me, SPELL_THUNDERING_STOMP); - // TODO: should go to a forge - DoCast(me, SPELL_FORGE_MACE); - // TODO: should equip when spell completes - SetEquipmentSlots(false, EQUIP_ID_MACE, -1, -1); - me->SetByteValue(UNIT_FIELD_BYTES_2, 0, SHEATH_STATE_MELEE); - events.CancelEvent(EVENT_CHILLINGWAVE); // cast only in phase 2. - events.ScheduleEvent(EVENT_DEEPFREEZE, 10000); - } - } - - void KilledUnit(Unit * victim) - { - if (victim == me) - return; - - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); - } - - void JustDied(Unit* /*killer*/) - { - DoScriptText(SAY_DEATH, me); - if (pInstance) - { - if (Creature *pTyrannus = me->GetCreature(*me, pInstance->GetData64(DATA_TYRANNUS))) - DoScriptText(SAY_TYRANNUS_DEATH, pTyrannus); - - pInstance->SetData(DATA_GARFROST_EVENT, DONE); - if (IsHeroic() && bAchievement) - pInstance->DoCompleteAchievement(ACHIEV_DOESNT_GO_TO_ELEVEN); - } - } - - void SpellHitTarget(Unit* pTarget, const SpellEntry *spell) - { - if (spell->Id == SPELL_PERMAFROST_TRIGGER && bAchievement) - { - if (Aura *pAura = pTarget->GetAura(SPELL_PERMAFROST_TRIGGER)) - if (pAura->GetStackAmount() > 10) - bAchievement = false; - } - } - - void UpdateAI(const uint32 diff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - events.Update(diff); - - if (me->hasUnitState(UNIT_STAT_CASTING)) - return; - - while (uint32 eventId = events.ExecuteEvent()) - { - switch(eventId) - { - case EVENT_THROW_SARONITE: - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_THROW_SARONITE); - events.RescheduleEvent(EVENT_THROW_SARONITE, 35000); - return; - case EVENT_DEEPFREEZE: - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_DEEP_FREEZE); - events.RescheduleEvent(EVENT_DEEPFREEZE, 35000); - return; - case EVENT_CHILLINGWAVE: - DoCastAOE(SPELL_CHILLING_WAVE); - events.RescheduleEvent(EVENT_CHILLINGWAVE, 40000); - return; - } - } - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_boss_garfrost(Creature* pCreature) -{ - return new boss_garfrostAI (pCreature); -} - -void AddSC_boss_garfrost() -{ - Script *newscript; - newscript = new Script; - newscript->Name="boss_garfrost"; - newscript->GetAI = &GetAI_boss_garfrost; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Northrend/FrozenHalls/pit_of_saron/boss_krickandick.cpp b/src/server/scripts/Northrend/FrozenHalls/pit_of_saron/boss_krickandick.cpp deleted file mode 100644 index 8b8b03a3d4e..00000000000 --- a/src/server/scripts/Northrend/FrozenHalls/pit_of_saron/boss_krickandick.cpp +++ /dev/null @@ -1,482 +0,0 @@ -/* Copyright (C) 2006 - 2010 TrinityCore - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "ScriptedPch.h" -#include "pit_of_saron.h" - -/* - * SDComment: Spell Explosive barrage is not working. - */ - -enum Spells -{ - SPELL_PURSUED = 68987, - SPELL_CONFUSION = 69029, - SPELL_EXPLOSIVE_BARRAGE = 69263, - SPELL_MIGHTY_KICK = 69021, - SPELL_POISON_NOVA = 68989, - H_SPELL_POISON_NOVA = 70434, - SPELL_SHADOW_BOLT = 69028, - SPELL_TOXIC_WASTE = 69024, - H_SPELL_TOXIC_WASTE = 70436, -}; - -enum Yells -{ - // Krick - SAY_KRICK_AGGRO = -1658010, - SAY_KRICK_SLAY_1 = -1658011, - SAY_KRICK_SLAY_2 = -1658012, - SAY_KRICK_BARRAGE_1 = -1658013, - SAY_KRICK_BARRAGE_2 = -1658014, - SAY_KRICK_POISON_NOVA = -1658015, - SAY_KRICK_CHASE_1 = -1658016, - SAY_KRICK_CHASE_2 = -1658017, - SAY_KRICK_CHASE_3 = -1658018, - - // Ick - SAY_ICK_POISON_NOVA = -1658020, - SAY_ICK_CHASE_1 = -1658021, - - // OUTRO - SAY_KRICK_OUTRO_1 = -1658030, - SAY_JAYNA_OUTRO_2 = -1658031, - SAY_SYLVANAS_OUTRO_2 = -1658032, - SAY_KRICK_OUTRO_3 = -1658033, - SAY_JAYNA_OUTRO_4 = -1658034, - SAY_SYLVANAS_OUTRO_4 = -1658035, - SAY_KRICK_OUTRO_5 = -1658036, - SAY_TYRANNUS_OUTRO_7 = -1658037, - SAY_KRICK_OUTRO_8 = -1658038, - SAY_TYRANNUS_OUTRO_9 = -1658039, - SAY_JAYNA_OUTRO_10 = -1658040, - SAY_SYLVANAS_OUTRO_10 = -1658041, -}; - -enum Events -{ - EVENT_NONE, - EVENT_PURSUE, - EVENT_MIGHTY_KICK, - EVENT_POISON_NOVA, - EVENT_EXPLOSIVE_BARRAGE, - EVENT_END_EXPLOSIVE_BARRAGE, - - // Krick - EVENT_SHADOW_BOLT, - EVENT_TOXIC_WASTE, - - // Krick OUTRO - EVENT_OUTRO_1, - EVENT_OUTRO_2, - EVENT_OUTRO_3, - EVENT_OUTRO_4, - EVENT_OUTRO_5, - EVENT_OUTRO_6, - EVENT_OUTRO_7, - EVENT_OUTRO_8, - EVENT_OUTRO_9, - EVENT_OUTRO_10, - EVENT_OUTRO_11, - EVENT_OUTRO_12, - EVENT_OUTRO_END, -}; - -enum KrickPhase -{ - PHASE_COMBAT, - PHASE_OUTRO, -}; - -enum Actions -{ - ACTION_OUTRO, -}; - -enum Misc -{ - SEAT_KRICK = 0, - - // events GCD. Shall not be 0. - GCD_1 = 1, -}; - -// Krick is the Gnome. -// Ick is the Mount -// Common Events are handled/triggered by Ick that "drive" Krick through DoAction. - -struct boss_ickAI : public ScriptedAI -{ - boss_ickAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - } - - ScriptedInstance* pInstance; - - EventMap events; - - void Reset() - { - events.Reset(); - - if (pInstance) - pInstance->SetData(DATA_KRICKANDICK_EVENT, NOT_STARTED); - } - - Creature* GetKrick() - { - return me->GetCreature(*me, pInstance ? pInstance->GetData64(DATA_KRICK) : 0); - } - - void EnterCombat(Unit * /*who*/) - { - if (pInstance) - pInstance->SetData(DATA_KRICKANDICK_EVENT, IN_PROGRESS); - - Creature* pKrick = GetKrick(); - if (!pKrick) - pKrick = me->SummonCreature(CREATURE_KRICK, *me, TEMPSUMMON_MANUAL_DESPAWN); - - if (pKrick) - DoScriptText(SAY_KRICK_AGGRO, pKrick); - - events.ScheduleEvent(EVENT_MIGHTY_KICK, 20000, GCD_1); - events.ScheduleEvent(EVENT_PURSUE, 30000, GCD_1); - events.ScheduleEvent(EVENT_POISON_NOVA, 30000, GCD_1); - events.ScheduleEvent(EVENT_EXPLOSIVE_BARRAGE, 35000); - events.ScheduleEvent(EVENT_TOXIC_WASTE, 5000); - events.ScheduleEvent(EVENT_SHADOW_BOLT, 15000); - } - - void EnterEvadeMode() - { - me->GetMotionMaster()->Clear(); - ScriptedAI::EnterEvadeMode(); - } - - void JustDied(Unit* /*pKiller*/) - { - if (Creature* pKrick = GetKrick()) - { - if (pKrick->AI()) - pKrick->AI()->DoAction(ACTION_OUTRO); - } - - if (pInstance) - pInstance->SetData(DATA_KRICKANDICK_EVENT, DONE); - } - - void UpdateAI(const uint32 diff) - { - if (!me->isInCombat()) - return; - - if (!me->getVictim() && me->getThreatManager().isThreatListEmpty()) - { - EnterEvadeMode(); - return; - } - - events.Update(diff); - - if (me->hasUnitState(UNIT_STAT_CASTING)) - return; - - switch(events.ExecuteEvent()) - { - case EVENT_PURSUE: - if (Creature* pKrick = GetKrick()) - DoScriptText(RAND(SAY_KRICK_CHASE_1,SAY_KRICK_CHASE_2,SAY_KRICK_CHASE_3), pKrick); - - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - { - me->Attack(pTarget,false); - DoScriptText(SAY_ICK_CHASE_1, me, pTarget); - DoCast(pTarget, SPELL_PURSUED); - } - - DoCast(SPELL_CONFUSION); - events.ScheduleEvent(EVENT_PURSUE, 30000, GCD_1); - return; - - case EVENT_MIGHTY_KICK: - DoCast(me->getVictim(), SPELL_MIGHTY_KICK); - events.ScheduleEvent(EVENT_MIGHTY_KICK, 25000, GCD_1); - return; - - case EVENT_POISON_NOVA: - if (Creature* pKrick = GetKrick()) - DoScriptText(SAY_KRICK_POISON_NOVA, pKrick); - - DoScriptText(SAY_ICK_POISON_NOVA, me); - DoCastAOE(SPELL_POISON_NOVA); - events.ScheduleEvent(EVENT_POISON_NOVA, 30000, GCD_1); - return; - - case EVENT_TOXIC_WASTE: - DoCast(me->getVictim(), SPELL_TOXIC_WASTE); - events.ScheduleEvent(EVENT_TOXIC_WASTE, 5000); - return; - - case EVENT_SHADOW_BOLT: - DoCast(me->getVictim(), SPELL_SHADOW_BOLT); - events.ScheduleEvent(EVENT_SHADOW_BOLT, 15000); - return; - - case EVENT_EXPLOSIVE_BARRAGE: - if (Creature *pKrick = GetKrick()) - { - DoScriptText(SAY_KRICK_BARRAGE_1, pKrick); - DoScriptText(SAY_KRICK_BARRAGE_2, pKrick); - } - - DoCastAOE(SPELL_EXPLOSIVE_BARRAGE); - me->GetMotionMaster()->MoveIdle(); - events.DelayEvents(20000, GCD_1); // 2 sec cast + 18 sec - events.ScheduleEvent(EVENT_END_EXPLOSIVE_BARRAGE, 20000); - return; - - case EVENT_END_EXPLOSIVE_BARRAGE: - me->GetMotionMaster()->Clear(); - me->GetMotionMaster()->MoveChase(me->getVictim()); - events.ScheduleEvent(EVENT_EXPLOSIVE_BARRAGE, 25000); - break; - } - - DoMeleeAttackIfReady(); - } -}; - -struct boss_krickAI : public ScriptedAI -{ - boss_krickAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - } - - ScriptedInstance* pInstance; - EventMap events; - - KrickPhase phase; - uint64 uiNpcOutroDialog; - uint64 uiTyrannus; - - void Reset() - { - uiNpcOutroDialog = 0; - uiTyrannus = 0; - phase = PHASE_COMBAT; - - me->SetReactState(REACT_PASSIVE); - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - me->SetVisibility(VISIBILITY_OFF); - } - - Creature* GetIck() - { - return me->GetCreature(*me, pInstance ? pInstance->GetData64(DATA_ICK) : 0); - } - - void KilledUnit(Unit * victim) - { - if (victim == me) - return; - - DoScriptText(RAND(SAY_KRICK_SLAY_1,SAY_KRICK_SLAY_2), me); - } - - void DamageTaken(Unit * /*pDoneBy*/, uint32 &uiDamage) - { - // if killed whatever the reason, it breaks the outro - uiDamage = 0; - } - - void DoAction(const int32 actionId) - { - switch(actionId) - { - case ACTION_OUTRO: - { - Position pos; - if (Creature* pIck = GetIck()) - { - // TODO: tele on Ick then run some distance. - pIck->GetNearPosition(pos, 5.0f, 3.14); - me->NearTeleportTo(pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), 0.0f); - } - me->SetVisibility(VISIBILITY_ON); - - Creature* pJainaOrSylvanas = me->GetCreature(*me, pInstance->GetData64(DATA_JAINA_SYLVANAS_1)); - if (pJainaOrSylvanas) { - Position pos; - me->GetNearPosition(pos, 5.0f, 0); - pJainaOrSylvanas->NearTeleportTo(pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), - pos.GetAngle(me->GetPositionX(), me->GetPositionY())); - } - else { - if (pInstance->GetData(DATA_TEAM_IN_INSTANCE) == TEAM_ALLIANCE) - pJainaOrSylvanas = me->SummonCreature(NPC_SYLVANAS_PART1, *me, TEMPSUMMON_MANUAL_DESPAWN); - else - pJainaOrSylvanas = me->SummonCreature(NPC_JAINA_PART1, *me, TEMPSUMMON_MANUAL_DESPAWN); - } - - if (pJainaOrSylvanas) - { - pJainaOrSylvanas->SetOrientation(pJainaOrSylvanas->GetAngle(me->GetPositionX(), me->GetPositionY())); - me->SetOrientation(me->GetAngle(pJainaOrSylvanas->GetPositionX(), pJainaOrSylvanas->GetPositionY())); - uiNpcOutroDialog = pJainaOrSylvanas->GetGUID(); - } - - phase = PHASE_OUTRO; - events.Reset(); - events.ScheduleEvent(EVENT_OUTRO_1, 1000); - break; - } - } - } - - void UpdateAI(const uint32 diff) - { - if (phase == PHASE_OUTRO) - { - if (!pInstance) - return; - - events.Update(diff); - switch(events.ExecuteEvent()) - { - case EVENT_OUTRO_1: - { - DoScriptText(SAY_KRICK_OUTRO_1, me); - events.ScheduleEvent(EVENT_OUTRO_2, 14000); - break; - } - case EVENT_OUTRO_2: - { - Creature* pNpcDialog = me->GetCreature(*me, uiNpcOutroDialog); - if (pNpcDialog) - { - if (pInstance->GetData(DATA_TEAM_IN_INSTANCE) == TEAM_ALLIANCE) - DoScriptText(SAY_JAYNA_OUTRO_2, pNpcDialog); - else - DoScriptText(SAY_SYLVANAS_OUTRO_2, pNpcDialog); - } - events.ScheduleEvent(EVENT_OUTRO_3, 8500); - break; - } - case EVENT_OUTRO_3: - DoScriptText(SAY_KRICK_OUTRO_3, me); - events.ScheduleEvent(EVENT_OUTRO_4, 12000); - break; - case EVENT_OUTRO_4: - { - Creature* pNpcDialog = me->GetCreature(*me, uiNpcOutroDialog); - if (pNpcDialog) - { - if (pInstance->GetData(DATA_TEAM_IN_INSTANCE) == TEAM_ALLIANCE) - DoScriptText(SAY_JAYNA_OUTRO_4, pNpcDialog); - else - DoScriptText(SAY_SYLVANAS_OUTRO_4, pNpcDialog); - } - events.ScheduleEvent(EVENT_OUTRO_5, 8000); - break; - } - case EVENT_OUTRO_5: - DoScriptText(SAY_KRICK_OUTRO_5, me); - events.ScheduleEvent(EVENT_OUTRO_6, 4000); - break; - case EVENT_OUTRO_6: - // TODO spawn Tyrannus at some distance and MovePoint near-by (flying on rimefang) - // store uiTyrannus - // Adjust timer so tyrannus has time to come - uiTyrannus = (pInstance ? pInstance->GetData64(DATA_TYRANNUS) : 0); - events.ScheduleEvent(EVENT_OUTRO_7, 1); - break; - case EVENT_OUTRO_7: - if (Creature *pTyrannus = me->GetCreature(*me, uiTyrannus)) - DoScriptText(SAY_TYRANNUS_OUTRO_7, pTyrannus); - events.ScheduleEvent(EVENT_OUTRO_8, 7000); - break; - case EVENT_OUTRO_8: - DoScriptText(SAY_KRICK_OUTRO_8, me); - // TODO: Tyrannus starts killing Krick. - // there shall be some visual spell effect - events.ScheduleEvent(EVENT_OUTRO_9, 6000); - break; - case EVENT_OUTRO_9: - // tyrannus kills krick - me->SetStandState(UNIT_STAND_STATE_DEAD); - me->SetHealth(0); - - if (Creature *pTyrannus = me->GetCreature(*me, uiTyrannus)) - DoScriptText(SAY_TYRANNUS_OUTRO_9, pTyrannus); - - events.ScheduleEvent(EVENT_OUTRO_10, 12000); - break; - case EVENT_OUTRO_10: - { - Creature* pNpcDialog = me->GetCreature(*me, uiNpcOutroDialog); - if (pNpcDialog) - { - if (pInstance->GetData(DATA_TEAM_IN_INSTANCE) == TEAM_ALLIANCE) - DoScriptText(SAY_JAYNA_OUTRO_10, pNpcDialog); - else - DoScriptText(SAY_SYLVANAS_OUTRO_10, pNpcDialog); - } - - // End of OUTRO. for now... - events.ScheduleEvent(EVENT_OUTRO_END, 8000); - break; - } - case EVENT_OUTRO_END: - { - Creature* pNpcDialog = me->GetCreature(*me, uiNpcOutroDialog); - if (pNpcDialog) - pNpcDialog->DisappearAndDie(); - - me->DisappearAndDie(); - break; - } - } - return; - } - } -}; - -CreatureAI* GetAI_boss_ick(Creature* pCreature) -{ - return new boss_ickAI(pCreature); -} - -CreatureAI* GetAI_boss_krick(Creature* pCreature) -{ - return new boss_krickAI(pCreature); -} - -void AddSC_boss_ick() -{ - Script *newscript; - newscript = new Script; - newscript->Name = "boss_ick"; - newscript->GetAI = &GetAI_boss_ick; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "boss_krick"; - newscript->GetAI = &GetAI_boss_krick; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Northrend/FrozenHalls/pit_of_saron/boss_scourgelord_tyrannus.cpp b/src/server/scripts/Northrend/FrozenHalls/pit_of_saron/boss_scourgelord_tyrannus.cpp deleted file mode 100644 index 55ffa0b4e4b..00000000000 --- a/src/server/scripts/Northrend/FrozenHalls/pit_of_saron/boss_scourgelord_tyrannus.cpp +++ /dev/null @@ -1,273 +0,0 @@ -/* Copyright (C) 2006 - 2010 TrinityCore - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "ScriptedPch.h" -#include "pit_of_saron.h" - -/* - * SDComment: TODO: - * - implement aura for spell Overlord Brand. - * - Intro/Outro - * - improve script of Rimefang - */ - -enum Yells -{ - SAY_AMBUSH_1 = -1658050, - SAY_AMBUSH_2 = -1658051, - SAY_GAUNTLET_START = -1658052, - SAY_INTRO_1 = -1658053, - SAY_INTRO_2 = -1658054, - - SAY_AGGRO = -1658055, - SAY_SLAY_1 = -1658056, - SAY_SLAY_2 = -1658057, - SAY_DEATH = -1658058, - SAY_MARK_RIMEFANG_1 = -1658059, - SAY_MARK_RIMEFANG_2 = -1658060, - SAY_DARK_MIGHT_1 = -1658061, - SAY_DARK_MIGHT_2 = -1658062, - - SAY_GORKUN_OUTRO_1 = -1658063, - SAY_GORKUN_OUTRO_2 = -1658064, - SAY_JAYNA_OUTRO_3 = -1658065, - SAY_SYLVANAS_OUTRO_3 = -1658066, - SAY_JAYNA_OUTRO_4 = -1658067, - SAY_SYLVANAS_OUTRO_4 = -1658068, - SAY_JAYNA_OUTRO_5 = -1658069, -}; - -enum Spells -{ - SPELL_FORCEFUL_SMASH = 69155, - H_SPELL_FORCEFUL_SMASH = 69627, - SPELL_OVERLORDS_BRAND = 69172, - SPELL_DARK_MIGHT = 69167, - H_SPELL_DARK_MIGHT = 69629, - SPELL_HOARFROST = 69246, - SPELL_MARK_OF_RIMEFANG = 69275, - SPELL_ICY_BLAST = 69233, - H_SPELL_ICY_BLAST = 69646, - SPELL_ICY_BLAST_2 = 69238, - H_SPELL_ICY_BLAST_2 = 69628, -}; - -enum Events -{ - EVENT_NONE, - EVENT_FORCEFUL_SMASH, - EVENT_OVERLORDS_BRAND, - EVENT_DARK_MIGHT, - - // Rimefang - EVENT_MARK_OF_RIMEFANG, - EVENT_HOARFROST, - EVENT_ICY_BLAST, - EVENT_ICY_BLAST_2, -}; - -enum Misc -{ - SEAT_TYRANNUS = 0 -}; - -struct boss_tyrannusAI : public ScriptedAI -{ - boss_tyrannusAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - } - - ScriptedInstance* pInstance; - EventMap events; - - void Reset() - { - events.Reset(); - - if (pInstance) - pInstance->SetData(DATA_TYRANNUS_EVENT, NOT_STARTED); - } - - Creature* GetRimefang() - { - return me->GetCreature(*me, pInstance->GetData64(DATA_RIMEFANG)); - } - - void EnterCombat(Unit* /*who*/) - { - DoScriptText(SAY_AGGRO, me); - me->ExitVehicle(); - - // restore health if any damage done during intro - me->SetHealth(me->GetMaxHealth()); - - if (pInstance) - pInstance->SetData(DATA_TYRANNUS_EVENT, IN_PROGRESS); - - events.ScheduleEvent(EVENT_FORCEFUL_SMASH, 10000); - events.ScheduleEvent(EVENT_OVERLORDS_BRAND, 35000); - events.ScheduleEvent(EVENT_DARK_MIGHT, 40000); - } - - void KilledUnit(Unit * /*victim*/) - { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); - } - - void JustDied(Unit* /*killer*/) - { - DoScriptText(SAY_DEATH, me); - - if (pInstance) - { - pInstance->SetData(DATA_TYRANNUS_EVENT, DONE); - if (Creature* pRimefang = GetRimefang()) - pRimefang->ForcedDespawn(); - } - } - - void UpdateAI(const uint32 diff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - events.Update(diff); - - if (me->hasUnitState(UNIT_STAT_CASTING)) - return; - - while (uint32 eventId = events.ExecuteEvent()) - { - switch(eventId) - { - case EVENT_FORCEFUL_SMASH: - DoCast(me->getVictim(), SPELL_FORCEFUL_SMASH); - events.ScheduleEvent(EVENT_FORCEFUL_SMASH, 10000); - return; - case EVENT_OVERLORDS_BRAND: - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_OVERLORDS_BRAND); - events.ScheduleEvent(EVENT_OVERLORDS_BRAND, 45000); - return; - case EVENT_DARK_MIGHT: - DoScriptText(SAY_DARK_MIGHT_1, me); - DoScriptText(SAY_DARK_MIGHT_2, me); - DoCast(me, SPELL_DARK_MIGHT); - events.ScheduleEvent(EVENT_DARK_MIGHT, 60000); - return; - } - } - - DoMeleeAttackIfReady(); - } -}; - -struct boss_rimefangAI : public ScriptedAI -{ - boss_rimefangAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - } - - ScriptedInstance* pInstance; - EventMap events; - - void Reset() - { - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE); - me->InterruptSpell(CURRENT_GENERIC_SPELL); - me->HandleEmoteCommand(EMOTE_ONESHOT_LIFTOFF); - me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); - events.Reset(); - } - - void EnterCombat(Unit* /*who*/) - { - me->InterruptSpell(CURRENT_GENERIC_SPELL); - me->HandleEmoteCommand(EMOTE_ONESHOT_LIFTOFF); - me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); - events.ScheduleEvent(EVENT_MARK_OF_RIMEFANG, 25000); - events.ScheduleEvent(EVENT_ICY_BLAST, 35000); - } - - void UpdateAI(const uint32 diff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - events.Update(diff); - - if (me->hasUnitState(UNIT_STAT_CASTING)) - return; - - while (uint32 eventId = events.ExecuteEvent()) - { - switch(eventId) - { - case EVENT_MARK_OF_RIMEFANG: - DoScriptText(SAY_MARK_RIMEFANG_1, me); - DoScriptText(SAY_MARK_RIMEFANG_2, me); - - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_MARK_OF_RIMEFANG); - events.ScheduleEvent(EVENT_HOARFROST, 5000); - return; - case EVENT_HOARFROST: - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_HOARFROST); - events.ScheduleEvent(EVENT_MARK_OF_RIMEFANG, 20000); - return; - case EVENT_ICY_BLAST: - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_ICY_BLAST); - events.ScheduleEvent(EVENT_ICY_BLAST_2, 5000); - return; - case EVENT_ICY_BLAST_2: - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget->getVictim(), SPELL_ICY_BLAST_2); - events.ScheduleEvent(EVENT_ICY_BLAST, 30000); - return; - } - } - } -}; - -CreatureAI* GetAI_boss_tyrannus(Creature* pCreature) -{ - return new boss_tyrannusAI(pCreature); -} - -CreatureAI* GetAI_boss_rimefang(Creature* pCreature) -{ - return new boss_rimefangAI(pCreature); -} - -void AddSC_boss_tyrannus() -{ - Script *newscript; - newscript = new Script; - newscript->Name="boss_tyrannus"; - newscript->GetAI = &GetAI_boss_tyrannus; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name="boss_rimefang"; - newscript->GetAI = &GetAI_boss_rimefang; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Northrend/FrozenHalls/pit_of_saron/instance_pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/pit_of_saron/instance_pit_of_saron.cpp deleted file mode 100644 index 8512eca24c1..00000000000 --- a/src/server/scripts/Northrend/FrozenHalls/pit_of_saron/instance_pit_of_saron.cpp +++ /dev/null @@ -1,236 +0,0 @@ -/* Copyright (C) 2006 - 2010 TrinityCore - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "ScriptedPch.h" -#include "pit_of_saron.h" - -#define MAX_ENCOUNTER 3 - -/* Pit of Saron encounters: -0- Forgemaster Garfrost -1- Krick and Ick -2- Scourgelord Tyrannus -*/ - -struct instance_pit_of_saron : public ScriptedInstance -{ - instance_pit_of_saron(Map* pMap) : ScriptedInstance(pMap) {}; - - uint64 uiKrick; - uint64 uiIck; - uint64 uiGarfrost; - uint64 uiTyrannus; - uint64 uiRimefang; - - uint64 uiJainaOrSylvanas1; - uint64 uiJainaOrSylvanas2; - - uint32 uiTeamInInstance; - uint32 uiEncounter[MAX_ENCOUNTER]; - - void Initialize() - { - for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) - uiEncounter[i] = NOT_STARTED; - - uiGarfrost = 0; - uiKrick = 0; - uiIck = 0; - uiTyrannus = 0; - } - - bool IsEncounterInProgress() const - { - for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) - if (uiEncounter[i] == IN_PROGRESS) - return true; - - return false; - } - - void OnCreatureCreate(Creature* pCreature, bool /*add*/) - { - Map::PlayerList const &players = instance->GetPlayers(); - - if (!players.isEmpty()) - { - if (Player* pPlayer = players.begin()->getSource()) - uiTeamInInstance = pPlayer->GetTeam(); - } - - switch(pCreature->GetEntry()) - { - case CREATURE_KRICK: - uiKrick = pCreature->GetGUID(); - break; - - case CREATURE_ICK: - uiIck = pCreature->GetGUID(); - break; - - case CREATURE_GARFROST: - uiGarfrost = pCreature->GetGUID(); - break; - - case CREATURE_TYRANNUS: - uiTyrannus = pCreature->GetGUID(); - break; - - case CREATURE_RIMEFANG: - uiRimefang = pCreature->GetGUID(); - break; - - case NPC_SYLVANAS_PART1: - if (uiTeamInInstance == ALLIANCE) - pCreature->UpdateEntry(NPC_JAINA_PART1, ALLIANCE); - uiJainaOrSylvanas1 = pCreature->GetGUID(); - break; - case NPC_SYLVANAS_PART2: - if (uiTeamInInstance == ALLIANCE) - pCreature->UpdateEntry(NPC_JAINA_PART2, ALLIANCE); - uiJainaOrSylvanas2 = pCreature->GetGUID(); - break; - case NPC_KILARA: - if (uiTeamInInstance == ALLIANCE) - pCreature->UpdateEntry(NPC_ELANDRA, ALLIANCE); - break; - case NPC_KORALEN: - if (uiTeamInInstance == ALLIANCE) - pCreature->UpdateEntry(NPC_KORLAEN, ALLIANCE); - break; - case NPC_CHAMPION_1_HORDE: - if (uiTeamInInstance == ALLIANCE) - pCreature->UpdateEntry(NPC_CHAMPION_1_ALLIANCE, ALLIANCE); - break; - case NPC_CHAMPION_2_HORDE: - if (uiTeamInInstance == ALLIANCE) - pCreature->UpdateEntry(NPC_CHAMPION_2_ALLIANCE, ALLIANCE); - break; - case NPC_CHAMPION_3_HORDE: // No 3rd set for Alliance? - if (uiTeamInInstance == ALLIANCE) - pCreature->UpdateEntry(NPC_CHAMPION_2_ALLIANCE, ALLIANCE); - break; - } - } - - uint64 GetData64(uint32 identifier) - { - switch(identifier) - { - case DATA_GARFROST: return uiGarfrost; - case DATA_KRICK: return uiKrick; - case DATA_ICK: return uiIck; - case DATA_TYRANNUS: return uiTyrannus; - case DATA_RIMEFANG: return uiRimefang; - - case DATA_JAINA_SYLVANAS_1: return uiJainaOrSylvanas1; - case DATA_JAINA_SYLVANAS_2: return uiJainaOrSylvanas2; - } - - return 0; - } - - void SetData(uint32 type, uint32 data) - { - switch(type) - { - case DATA_GARFROST_EVENT: - uiEncounter[0] = data; - break; - case DATA_TYRANNUS_EVENT: - uiEncounter[1] = data; - break; - case DATA_KRICKANDICK_EVENT: - uiEncounter[2] = data; - break; - } - - if (data == DONE) - SaveToDB(); - } - - uint32 GetData(uint32 type) - { - switch(type) - { - case DATA_GARFROST_EVENT: return uiEncounter[0]; - case DATA_TYRANNUS_EVENT: return uiEncounter[1]; - case DATA_KRICKANDICK_EVENT: return uiEncounter[2]; - } - - return 0; - } - - std::string GetSaveData() - { - OUT_SAVE_INST_DATA; - - std::string str_data; - - std::ostringstream saveStream; - saveStream << "P S " << uiEncounter[0] << " " << uiEncounter[1] << " " << uiEncounter[2]; - - str_data = saveStream.str(); - - OUT_SAVE_INST_DATA_COMPLETE; - return str_data; - } - - void Load(const char* in) - { - if (!in) - { - OUT_LOAD_INST_DATA_FAIL; - return; - } - - OUT_LOAD_INST_DATA(in); - - char dataHead1, dataHead2; - uint16 data0, data1, data2; - - std::istringstream loadStream(in); - loadStream >> dataHead1 >> dataHead2 >> data0 >> data1 >> data2; - - if (dataHead1 == 'P' && dataHead2 == 'S') - { - uiEncounter[0] = data0; - uiEncounter[1] = data1; - uiEncounter[2] = data2; - - for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) - if (uiEncounter[i] == IN_PROGRESS) - uiEncounter[i] = NOT_STARTED; - - } else OUT_LOAD_INST_DATA_FAIL; - - OUT_LOAD_INST_DATA_COMPLETE; - } -}; - -InstanceData* GetInstanceData_instance_pit_of_saron(Map* pMap) -{ - return new instance_pit_of_saron(pMap); -} - -void AddSC_instance_pit_of_saron() -{ - Script *newscript; - newscript = new Script; - newscript->Name = "instance_pit_of_saron"; - newscript->GetInstanceData = &GetInstanceData_instance_pit_of_saron; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Northrend/FrozenHalls/pit_of_saron/pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/pit_of_saron/pit_of_saron.cpp deleted file mode 100644 index bc53efc7033..00000000000 --- a/src/server/scripts/Northrend/FrozenHalls/pit_of_saron/pit_of_saron.cpp +++ /dev/null @@ -1,1101 +0,0 @@ -/* Copyright (C) 2006 - 2010 TrinityCore - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "ScriptedPch.h" -#include "pit_of_saron.h" - -/***************************************SPELLS*************************************/ -// Ymirjar Wrathbringer -#define SPELL_BLIGHT DUNGEON_MODE(69603,70285) - -//Ymirjar Skycaller -#define SPELL_FROSTBLADE 70291 -#define SPELL_GLACIAL_STRIKE 70292 - -//Ymirjar Flamebearer -#define SPELL_FIREBALL DUNGEON_MODE(69583,70282) -#define SPELL_HELLFIRE DUNGEON_MODE(69586,70283) -#define SPELL_TACTICAL_BLINK 69584 - -//Ymirjar Deathbringer -#define SPELL_EMPOWERED_SHADOW_BOLT DUNGEON_MODE(69528,70281) -#define SPELL_SUMMON_UNDEAD 69516 - -//Wrathbone Laborer -#define SPELL_BLINDING_DIRT 70302 -#define SPELL_PUNCTURE_WOUND DUNGEON_MODE(70278,70279) -#define SPELL_SHOVELLED DUNGEON_MODE(69572,70280) - -//Wrathbone Coldwraith -#define SPELL_FREEZING_CIRCLE DUNGEON_MODE(69574,70276) -#define SPELL_FROSTBOLT DUNGEON_MODE(69573,70277) - -//Stonespine Gargoyle -#define SPELL_GARGOYLE_STRIKE DUNGEON_MODE(69520,70275) -#define SPELL_STONEFORM 69575 - -// Plagueborn Horror -#define SPELL_BLIGHT_BOMB 69582 -#define SPELL_PUSTULANT_FLESH DUNGEON_MODE(69581,70273) -#define SPELL_TOXIC_WASTE 70274 - -//Iceborn Proto-Drake -#define SPELL_FROST_BREATH DUNGEON_MODE(69527,70272) - -//Hungering Ghoul -#define SPELL_DEVOUR_FLESH 70393 - -//Fallen Warrior -#define SPELL_ARCING_SLICE 69579 -#define SPELL_DEMORALIZING_SHOUT 61044 -#define SPELL_SHIELD_BLOCK 69580 - -//Deathwhisper Torturer -#define SPELL_BLACK_BRAND 70392 -#define SPELL_CURSE_OF_AGONY 70391 - -//Deathwhisper Shadowcaster -#define SPELL_SHADOW_BOLT DUNGEON_MODE(70386,70387) - -//Deathwhisper Necrolyte -#define SPELL_CONVERSION_BEAM DUNGEON_MODE(69578,70269) -#define SPELL_SHADOW_BOLT_2 DUNGEON_MODE(69577,70270) - -//Wrathbone Sorcerer -#define SPELL_SHADOW_BOLT_3 DUNGEON_MODE(70386,70387) - -//Geist Ambusher -#define SPELL_LEAPING_FACE_MAUL DUNGEON_MODE(69504,70271) - -/****************************************EVENTS************************************/ -enum eEvents -{ - EVENT_NONE, - - // Ymirjar Wrathbringer - EVENT_BLIGHT, - - // Ymirjar Skycaller - EVENT_FROSTBLADE, - EVENT_GLACIAL_STRIKE, - - // Ymirjar Flamebearer - EVENT_FIREBALL, - EVENT_HELLFIRE, - EVENT_TACTICAL_BLINK, - - //Ymirjar Deathbringer - EVENT_EMPOWERED_SHADOW_BOLT, - EVENT_SUMMON_UNDEAD, - - //Wrathbone Laborer - EVENT_BLINDING_DIRT, - EVENT_PUNCTURE_WOUND, - EVENT_SHOVELLED, - - //Wrathbone Coldwraith - EVENT_FREEZING_CIRCLE, - EVENT_FROSTBOLT, - - //Stonespine Gargoyle - EVENT_GARGOYLE_STRIKE, - EVENT_STONEFORM, - - //Plagueborn Horror - EVENT_BLIGHT_BOMB, - EVENT_PUSTULANT_FLESH, - EVENT_TOXIC_WASTE, - - //Iceborn Proto-Drake - EVENT_FROST_BREATH, - - //Hungering Ghoul - EVENT_DEVOUR_FLESH, - - //Fallen Warrior - EVENT_ARCING_SLICE, - EVENT_DEMORALIZING_SHOUT, - EVENT_SHIELD_BLOCK, - - //Deathwhisper Torturer - EVENT_BLACK_BRAND, - EVENT_CURSE_OF_AGONY, - - //Deathwhisper Shadowcaster - EVENT_SHADOW_BOLT, - - //Deathwhisper Necrolyte - EVENT_CONVERSION_BEAM, - EVENT_SHADOW_BOLT_2, - - EVENT_SHADOW_BOLT_3, - - //Geist Ambusher - EVENT_LEAPING_FACE_MAUL, -}; - -/****************************************AI****************************************/ -struct mob_ymirjar_wrathbringerAI : public ScriptedAI -{ - mob_ymirjar_wrathbringerAI(Creature *c) : ScriptedAI(c) - { - } - - EventMap events; - - void Reset() - { - events.Reset(); - } - - void EnterCombat(Unit* /*who*/) - { - events.ScheduleEvent(EVENT_BLIGHT, 7000); - } - - void UpdateAI(const uint32 diff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - events.Update(diff); - - if (me->hasUnitState(UNIT_STAT_CASTING)) - return; - - while (uint32 eventId = events.ExecuteEvent()) - { - switch(eventId) - { - case EVENT_BLIGHT: - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_BLIGHT); - events.RescheduleEvent(EVENT_BLIGHT, 8000); - return; - } - } - - DoMeleeAttackIfReady(); - } -}; - -struct mob_ymirjar_skyCallerAI: public ScriptedAI -{ - mob_ymirjar_skyCallerAI(Creature *c) : ScriptedAI(c) - { - } - - EventMap events; - - void Reset() - { - events.Reset(); - } - - void EnterCombat(Unit* /*who*/) - { - events.ScheduleEvent(EVENT_FROSTBLADE, 1); - events.ScheduleEvent(EVENT_GLACIAL_STRIKE, 8000); - } - - void UpdateAI(const uint32 diff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - events.Update(diff); - - if (me->hasUnitState(UNIT_STAT_CASTING)) - return; - - while (uint32 eventId = events.ExecuteEvent()) - { - switch(eventId) - { - case EVENT_GLACIAL_STRIKE: - DoCast(me->getVictim(), SPELL_GLACIAL_STRIKE); - events.RescheduleEvent(EVENT_GLACIAL_STRIKE, 8000); - return; - case EVENT_FROSTBLADE: - DoCast(me, SPELL_FROSTBLADE); - events.CancelEvent(EVENT_FROSTBLADE); - return; - } - } - - DoMeleeAttackIfReady(); - } -}; - -struct mob_ymirjar_flamebearerAI: public ScriptedAI -{ - mob_ymirjar_flamebearerAI(Creature *c) : ScriptedAI(c) - { - } - - EventMap events; - - void Reset() - { - events.Reset(); - } - - void EnterCombat(Unit* /*who*/) - { - events.ScheduleEvent(EVENT_FIREBALL, 4000); - events.ScheduleEvent(EVENT_HELLFIRE, 8000); - events.ScheduleEvent(EVENT_TACTICAL_BLINK, 15000); - } - - void UpdateAI(const uint32 diff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - events.Update(diff); - - if (me->hasUnitState(UNIT_STAT_CASTING)) - return; - - while (uint32 eventId = events.ExecuteEvent()) - { - switch(eventId) - { - case EVENT_FIREBALL: - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_FIREBALL); - events.RescheduleEvent(EVENT_FIREBALL, 5000); - return; - case EVENT_HELLFIRE: - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_HELLFIRE); - events.RescheduleEvent(EVENT_HELLFIRE, 10000); - return; - case EVENT_TACTICAL_BLINK: - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_TACTICAL_BLINK); - events.RescheduleEvent(EVENT_TACTICAL_BLINK, 12000); - return; - } - } - - DoMeleeAttackIfReady(); - } -}; - -struct mob_ymirjar_deathbringerAI: public ScriptedAI -{ - mob_ymirjar_deathbringerAI(Creature *c) : ScriptedAI(c) - { - } - - EventMap events; - - void Reset() - { - events.Reset(); - } - - void EnterCombat(Unit* /*who*/) - { - events.ScheduleEvent(EVENT_EMPOWERED_SHADOW_BOLT, 8000); - } - - void UpdateAI(const uint32 diff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - events.Update(diff); - - if (me->hasUnitState(UNIT_STAT_CASTING)) - return; - - while (uint32 eventId = events.ExecuteEvent()) - { - switch(eventId) - { - case EVENT_EMPOWERED_SHADOW_BOLT: - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_EMPOWERED_SHADOW_BOLT); - events.RescheduleEvent(EVENT_EMPOWERED_SHADOW_BOLT, 8000); - return; - } - } - - DoMeleeAttackIfReady(); - } -}; - -struct mob_wrathbone_laborerAI: public ScriptedAI -{ - mob_wrathbone_laborerAI(Creature *c) : ScriptedAI(c) - { - } - - EventMap events; - - void Reset() - { - events.Reset(); - } - - void EnterCombat(Unit* /*who*/) - { - events.ScheduleEvent(EVENT_BLINDING_DIRT, 8000); - events.ScheduleEvent(EVENT_PUNCTURE_WOUND, 9000); - events.ScheduleEvent(EVENT_SHOVELLED, 5000); - } - - void UpdateAI(const uint32 diff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - events.Update(diff); - - if (me->hasUnitState(UNIT_STAT_CASTING)) - return; - - while (uint32 eventId = events.ExecuteEvent()) - { - switch(eventId) - { - case EVENT_BLINDING_DIRT: - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_BLINDING_DIRT); - events.RescheduleEvent(EVENT_BLINDING_DIRT, 10000); - return; - case EVENT_PUNCTURE_WOUND: - DoCast(me->getVictim(), SPELL_PUNCTURE_WOUND); - events.RescheduleEvent(EVENT_PUNCTURE_WOUND, 9000); - return; - case EVENT_SHOVELLED: - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_SHOVELLED); - events.RescheduleEvent(EVENT_SHOVELLED, 7000); - return; - } - } - - DoMeleeAttackIfReady(); - } -}; - -struct mob_wrathbone_coldwraithAI: public ScriptedAI -{ - mob_wrathbone_coldwraithAI(Creature *c) : ScriptedAI(c) - { - } - - EventMap events; - - void Reset() - { - events.Reset(); - } - - void EnterCombat(Unit* /*who*/) - { - events.ScheduleEvent(EVENT_FREEZING_CIRCLE, 9000); - events.ScheduleEvent(EVENT_FROSTBOLT, 5000); - } - - void UpdateAI(const uint32 diff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - events.Update(diff); - - if (me->hasUnitState(UNIT_STAT_CASTING)) - return; - - while (uint32 eventId = events.ExecuteEvent()) - { - switch(eventId) - { - case EVENT_FREEZING_CIRCLE: - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_FREEZING_CIRCLE); - events.RescheduleEvent(EVENT_FREEZING_CIRCLE, 9000); - return; - case EVENT_FROSTBOLT: - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_FROSTBOLT); - events.RescheduleEvent(EVENT_FROSTBOLT, 5000); - return; - } - } - - DoMeleeAttackIfReady(); - } -}; - -struct mob_stonespine_gargoyleAI: public ScriptedAI -{ - mob_stonespine_gargoyleAI(Creature *c) : ScriptedAI(c) - { - } - - EventMap events; - - void Reset() - { - events.Reset(); - } - - void EnterCombat(Unit* /*who*/) - { - events.ScheduleEvent(EVENT_GARGOYLE_STRIKE, 5000); - } - - void UpdateAI(const uint32 diff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - events.Update(diff); - - if (me->hasUnitState(UNIT_STAT_CASTING)) - return; - - while (uint32 eventId = events.ExecuteEvent()) - { - switch(eventId) - { - case EVENT_GARGOYLE_STRIKE: - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_GARGOYLE_STRIKE); - events.RescheduleEvent(EVENT_GARGOYLE_STRIKE, 6000); - return; - case EVENT_STONEFORM: - if (HealthBelowPct(10)) - DoCast(me, SPELL_STONEFORM); - return; - } - } - - DoMeleeAttackIfReady(); - } -}; - -struct mob_plagueborn_horrorAI: public ScriptedAI -{ - mob_plagueborn_horrorAI(Creature *c) : ScriptedAI(c) - { - } - - EventMap events; - - void Reset() - { - events.Reset(); - } - - void EnterCombat(Unit* /*who*/) - { - events.ScheduleEvent(EVENT_BLIGHT_BOMB, 999999); - events.ScheduleEvent(EVENT_PUSTULANT_FLESH, 5000); - events.ScheduleEvent(EVENT_TOXIC_WASTE, 8000); - } - - void UpdateAI(const uint32 diff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - events.Update(diff); - - if (me->hasUnitState(UNIT_STAT_CASTING)) - return; - - while (uint32 eventId = events.ExecuteEvent()) - { - switch(eventId) - { - case EVENT_BLIGHT_BOMB: - if (HealthBelowPct(15)) - DoCast(me, SPELL_BLIGHT_BOMB); - return; - case EVENT_PUSTULANT_FLESH: - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_PUSTULANT_FLESH); - events.RescheduleEvent(EVENT_PUSTULANT_FLESH, 10000); - return; - case EVENT_TOXIC_WASTE: - DoCast(me, SPELL_TOXIC_WASTE); - events.RescheduleEvent(EVENT_TOXIC_WASTE, 8000); - return; - } - } - - DoMeleeAttackIfReady(); - } -}; - -struct mob_iceborn_protodrakeAI: public ScriptedAI -{ - mob_iceborn_protodrakeAI(Creature *c) : ScriptedAI(c) - { - } - - EventMap events; - - void Reset() - { - events.Reset(); - } - - void EnterCombat(Unit* /*who*/) - { - events.ScheduleEvent(EVENT_FROST_BREATH, 5000); - } - - void UpdateAI(const uint32 diff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - events.Update(diff); - - if (me->hasUnitState(UNIT_STAT_CASTING)) - return; - - while (uint32 eventId = events.ExecuteEvent()) - { - switch(eventId) - { - case EVENT_FROST_BREATH: - DoCast(me->getVictim(), SPELL_FROST_BREATH); - events.RescheduleEvent(EVENT_FROST_BREATH, 10000); - return; - } - } - - DoMeleeAttackIfReady(); - } -}; - -struct mob_hungering_ghoulAI: public ScriptedAI -{ - mob_hungering_ghoulAI(Creature *c) : ScriptedAI(c) - { - } - - EventMap events; - - void Reset() - { - events.Reset(); - } - - void EnterCombat(Unit* /*who*/) - { - events.ScheduleEvent(EVENT_DEVOUR_FLESH, 4000); - } - - void UpdateAI(const uint32 diff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - events.Update(diff); - - if (me->hasUnitState(UNIT_STAT_CASTING)) - return; - - while (uint32 eventId = events.ExecuteEvent()) - { - switch(eventId) - { - case EVENT_DEVOUR_FLESH: - DoCast(me->getVictim(), SPELL_DEVOUR_FLESH); - events.RescheduleEvent(EVENT_DEVOUR_FLESH, 8000); - return; - } - } - - DoMeleeAttackIfReady(); - } -}; - -struct mob_fallen_warriorAI: public ScriptedAI -{ - mob_fallen_warriorAI(Creature *c) : ScriptedAI(c) - { - } - - EventMap events; - - void Reset() - { - events.Reset(); - } - - void EnterCombat(Unit* /*who*/) - { - events.ScheduleEvent(EVENT_ARCING_SLICE, 8000); - events.ScheduleEvent(EVENT_DEMORALIZING_SHOUT, 20000); - events.ScheduleEvent(EVENT_SHIELD_BLOCK, 8000); - } - - void UpdateAI(const uint32 diff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - events.Update(diff); - - if (me->hasUnitState(UNIT_STAT_CASTING)) - return; - - while (uint32 eventId = events.ExecuteEvent()) - { - switch(eventId) - { - case EVENT_ARCING_SLICE: - DoCast(me->getVictim(), SPELL_ARCING_SLICE); - events.RescheduleEvent(EVENT_ARCING_SLICE, 10000); - return; - case EVENT_DEMORALIZING_SHOUT: - DoCast(me, SPELL_DEMORALIZING_SHOUT); - events.RescheduleEvent(EVENT_DEMORALIZING_SHOUT, 20000); - return; - case EVENT_SHIELD_BLOCK: - DoCast(me->getVictim(), SPELL_SHIELD_BLOCK); - events.RescheduleEvent(EVENT_SHIELD_BLOCK, 8000); - return; - } - } - - DoMeleeAttackIfReady(); - } -}; - -struct mob_deathwhisper_torturerAI: public ScriptedAI -{ - mob_deathwhisper_torturerAI(Creature *c) : ScriptedAI(c) - { - } - - EventMap events; - - void Reset() - { - events.Reset(); - } - - void EnterCombat(Unit* /*who*/) - { - events.ScheduleEvent(EVENT_BLACK_BRAND, 10000); - events.ScheduleEvent(EVENT_CURSE_OF_AGONY, 6000); - } - - void UpdateAI(const uint32 diff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - events.Update(diff); - - if (me->hasUnitState(UNIT_STAT_CASTING)) - return; - - while (uint32 eventId = events.ExecuteEvent()) - { - switch(eventId) - { - case EVENT_BLACK_BRAND: - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_BLACK_BRAND); - events.RescheduleEvent(EVENT_BLACK_BRAND, 10000); - return; - case EVENT_CURSE_OF_AGONY: - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_CURSE_OF_AGONY); - events.RescheduleEvent(EVENT_CURSE_OF_AGONY, 13000); - return; - } - } - - DoMeleeAttackIfReady(); - } -}; - -struct mob_deathwhisper_shadowcasterAI: public ScriptedAI -{ - mob_deathwhisper_shadowcasterAI(Creature *c) : ScriptedAI(c) - { - } - - EventMap events; - - void Reset() - { - events.Reset(); - } - - void EnterCombat(Unit* /*who*/) - { - events.ScheduleEvent(EVENT_SHADOW_BOLT, 3000); - } - - void UpdateAI(const uint32 diff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - events.Update(diff); - - if (me->hasUnitState(UNIT_STAT_CASTING)) - return; - - while (uint32 eventId = events.ExecuteEvent()) - { - switch(eventId) - { - case EVENT_SHADOW_BOLT: - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_SHADOW_BOLT); - events.RescheduleEvent(EVENT_SHADOW_BOLT, 5000); - return; - } - } - - DoMeleeAttackIfReady(); - } -}; - -struct mob_deathwhisper_necrolyteAI: public ScriptedAI -{ - mob_deathwhisper_necrolyteAI(Creature *c) : ScriptedAI(c) - { - } - - EventMap events; - - void Reset() - { - events.Reset(); - } - - void EnterCombat(Unit* /*who*/) - { - events.ScheduleEvent(EVENT_CONVERSION_BEAM, 12000); - events.ScheduleEvent(EVENT_SHADOW_BOLT_2, 4000); - } - - void UpdateAI(const uint32 diff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - events.Update(diff); - - if (me->hasUnitState(UNIT_STAT_CASTING)) - return; - - while (uint32 eventId = events.ExecuteEvent()) - { - switch(eventId) - { - case EVENT_CONVERSION_BEAM: - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_CONVERSION_BEAM); - events.RescheduleEvent(EVENT_CONVERSION_BEAM, 12000); - return; - case EVENT_SHADOW_BOLT_2: - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_SHADOW_BOLT_2); - events.RescheduleEvent(EVENT_SHADOW_BOLT_2, 5000); - return; - } - } - - DoMeleeAttackIfReady(); - } -}; - -struct mob_wrathbone_sorcererAI: public ScriptedAI -{ - mob_wrathbone_sorcererAI(Creature *c) : ScriptedAI(c) - { - } - - EventMap events; - - void Reset() - { - events.Reset(); - } - - void EnterCombat(Unit* /*who*/) - { - events.ScheduleEvent(EVENT_SHADOW_BOLT_3, 3000); - } - - void UpdateAI(const uint32 diff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - events.Update(diff); - - if (me->hasUnitState(UNIT_STAT_CASTING)) - return; - - while (uint32 eventId = events.ExecuteEvent()) - { - switch(eventId) - { - case EVENT_SHADOW_BOLT_3: - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_SHADOW_BOLT_3); - events.RescheduleEvent(EVENT_SHADOW_BOLT_3, 5000); - return; - } - } - - DoMeleeAttackIfReady(); - } -}; - -struct mob_geist_ambusherAI: public ScriptedAI -{ - mob_geist_ambusherAI(Creature *c) : ScriptedAI(c) - { - } - - EventMap events; - - void Reset() - { - events.Reset(); - } - - void EnterCombat(Unit* /*who*/) - { - //Only here so when I figure out how to make it cast on an NPC i can do that. - events.ScheduleEvent(EVENT_LEAPING_FACE_MAUL, 99999); - } - - void UpdateAI(const uint32 diff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - events.Update(diff); - - if (me->hasUnitState(UNIT_STAT_CASTING)) - return; - - while (uint32 eventId = events.ExecuteEvent()) - { - switch(eventId) - { - //Should only be used on NPCs - case EVENT_LEAPING_FACE_MAUL: - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_LEAPING_FACE_MAUL); - events.CancelEvent(EVENT_LEAPING_FACE_MAUL); - return; - } - } - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_mob_ymirjar_wrathbringerAI(Creature* pCreature) -{ - return new mob_ymirjar_wrathbringerAI(pCreature); -} - -CreatureAI* GetAI_mob_ymirjar_skyCallerAI(Creature* pCreature) -{ - return new mob_ymirjar_skyCallerAI(pCreature); -} - -CreatureAI* GetAI_mob_ymirjar_flamebearerAI(Creature* pCreature) -{ - return new mob_ymirjar_flamebearerAI(pCreature); -} - -CreatureAI* GetAI_mob_ymirjar_deathbringerAI(Creature* pCreature) -{ - return new mob_ymirjar_deathbringerAI(pCreature); -} - -CreatureAI* GetAI_mob_wrathbone_laborerAI(Creature* pCreature) -{ - return new mob_wrathbone_laborerAI(pCreature); -} - -CreatureAI* GetAI_mob_wrathbone_coldwraithAI(Creature* pCreature) -{ - return new mob_wrathbone_coldwraithAI(pCreature); -} - -CreatureAI* GetAI_mob_stonespine_gargoyleAI(Creature* pCreature) -{ - return new mob_stonespine_gargoyleAI(pCreature); -} - -CreatureAI* GetAI_mob_plagueborn_horrorAI(Creature* pCreature) -{ - return new mob_plagueborn_horrorAI(pCreature); -} - -CreatureAI* GetAI_mob_iceborn_protodrakeAI(Creature* pCreature) -{ - return new mob_iceborn_protodrakeAI(pCreature); -} - -CreatureAI* GetAI_mob_hungering_ghoulAI(Creature* pCreature) -{ - return new mob_hungering_ghoulAI(pCreature); -} - -CreatureAI* GetAI_mob_fallen_warriorAI(Creature* pCreature) -{ - return new mob_fallen_warriorAI(pCreature); -} - -CreatureAI* GetAI_mob_deathwhisper_torturerAI(Creature* pCreature) -{ - return new mob_deathwhisper_torturerAI(pCreature); -} - -CreatureAI* GetAI_mob_deathwhisper_shadowcasterAI(Creature* pCreature) -{ - return new mob_deathwhisper_shadowcasterAI(pCreature); -} - -CreatureAI* GetAI_mob_deathwhisper_necrolyteAI(Creature* pCreature) -{ - return new mob_deathwhisper_necrolyteAI(pCreature); -} - -CreatureAI* GetAI_mob_wrathbone_sorcererAI(Creature* pCreature) -{ - return new mob_wrathbone_sorcererAI(pCreature); -} - -CreatureAI* GetAI_mob_geist_ambusherAI(Creature* pCreature) -{ - return new mob_geist_ambusherAI(pCreature); -} - -void AddSC_pit_of_saron() -{ - Script *newscript; - newscript = new Script; - newscript->Name="mob_ymirjar_wrathbringer"; - newscript->GetAI = &GetAI_mob_ymirjar_wrathbringerAI; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name="mob_ymirjar_skycaller"; - newscript->GetAI = &GetAI_mob_ymirjar_skyCallerAI; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name="mob_ymirjar_flamebearer"; - newscript->GetAI = &GetAI_mob_ymirjar_flamebearerAI; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name="mob_ymirjar_deathbringer"; - newscript->GetAI = &GetAI_mob_ymirjar_deathbringerAI; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name="mob_wrathbone_laborer"; - newscript->GetAI = &GetAI_mob_wrathbone_laborerAI; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name="mob_wrathbone_coldwraith"; - newscript->GetAI = &GetAI_mob_wrathbone_coldwraithAI; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name="mob_stonespine_gargoyle"; - newscript->GetAI = &GetAI_mob_stonespine_gargoyleAI; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name="mob_plagueborn_horror"; - newscript->GetAI = &GetAI_mob_plagueborn_horrorAI; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name="mob_iceborn_protodrake"; - newscript->GetAI = &GetAI_mob_iceborn_protodrakeAI; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name="mob_hungering_ghoul"; - newscript->GetAI = &GetAI_mob_hungering_ghoulAI; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name="mob_fallen_warrior"; - newscript->GetAI = &GetAI_mob_fallen_warriorAI; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name="mob_deathwhisper_torturer"; - newscript->GetAI = &GetAI_mob_deathwhisper_torturerAI; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name="mob_deathwhisper_shadowcaster"; - newscript->GetAI = &GetAI_mob_deathwhisper_shadowcasterAI; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name="mob_deathwhisper_necrolyte"; - newscript->GetAI = &GetAI_mob_deathwhisper_necrolyteAI; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name="mob_wrathbone_sorcerer"; - newscript->GetAI = &GetAI_mob_wrathbone_sorcererAI; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name="mob_geist_ambusher"; - newscript->GetAI = &GetAI_mob_geist_ambusherAI; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Northrend/FrozenHalls/pit_of_saron/pit_of_saron.h b/src/server/scripts/Northrend/FrozenHalls/pit_of_saron/pit_of_saron.h deleted file mode 100644 index 4a221d17518..00000000000 --- a/src/server/scripts/Northrend/FrozenHalls/pit_of_saron/pit_of_saron.h +++ /dev/null @@ -1,63 +0,0 @@ -/* Copyright (C) 2006 - 2010 TrinityCore - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef DEF_PIT_OF_SARON_H -#define DEF_PIT_OF_SARON_H - -enum Data -{ - DATA_GARFROST_EVENT, - DATA_KRICKANDICK_EVENT, - DATA_TYRANNUS_EVENT, - DATA_TEAM_IN_INSTANCE, -}; - -enum Data64 -{ - DATA_GARFROST, - DATA_KRICK, - DATA_ICK, - DATA_TYRANNUS, - DATA_RIMEFANG, - - DATA_JAINA_SYLVANAS_1, // GUID of either Jaina or Sylvanas part 1, depending on team, as it's the same spawn. - DATA_JAINA_SYLVANAS_2, // GUID of either Jaina or Sylvanas part 2, depending on team, as it's the same spawn. -}; - -enum Creatures -{ - CREATURE_GARFROST = 36494, - CREATURE_KRICK = 36477, - CREATURE_ICK = 36476, - CREATURE_TYRANNUS = 36658, - CREATURE_RIMEFANG = 36661, - - NPC_SYLVANAS_PART1 = 36990, - NPC_SYLVANAS_PART2 = 38189, - NPC_JAINA_PART1 = 36993, - NPC_JAINA_PART2 = 38188, - NPC_KILARA = 37583, - NPC_ELANDRA = 37774, - NPC_KORALEN = 37779, - NPC_KORLAEN = 37582, - NPC_CHAMPION_1_HORDE = 37584, - NPC_CHAMPION_2_HORDE = 37587, - NPC_CHAMPION_3_HORDE = 37588, - NPC_CHAMPION_1_ALLIANCE = 37496, - NPC_CHAMPION_2_ALLIANCE = 37497, -}; - -#endif diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp new file mode 100644 index 00000000000..bbb1df2731d --- /dev/null +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp @@ -0,0 +1,175 @@ +/* Script Data Start +SDName: Boss malygos +SDAuthor: LordVanMartin +SD%Complete: +SDComment: +SDCategory: +Script Data End */ + +/*** SQL START *** +update creature_template set scriptname = '' where entry = ''; +*** SQL END ***/ +#include "ScriptedPch.h" + +//Spells +#define SPELL_ARCANE_BREATH_N 56272 +#define SPELL_ARCANE_BREATH_H 60072 +#define SPELL_ARCANE_PULSE 57432 +#define SPELL_ARCANE_STORM_1 57459 +#define SPELL_ARCANE_STORM_2 61693 +#define SPELL_ARCANE_STORM_3 61694 +#define SPELL_STATIC_FIELD 57430 +#define SPELL_SURGE_OF_POWER_1 56505 +#define SPELL_SURGE_OF_POWER_2 57407 +#define SPELL_SURGE_OF_POWER_3 60936 +#define SPELL_VORTEX 56105 + +//Dragon "mounts" spells in Phase3 +//they use Rugelike energy +#define SPELL_DMOUNT_FLAME_SPIKE 56091 //maybe not accurate +#define SPELL_DMOUNT_ENGULF_IN_FLAMES 61621 +#define SPELL_DMOUNT_REVIVIFY 57090 +#define SPELL_DMOUNT_LIFE_BURST 57143 +#define SPELL_DMOUNT_FLAME_SHIELD 57108 +//#define SPELL_DMOUNT_UNKNOWN XYZ //Increases your drake's flight speed by 500%. + +//not in db +//Yell +//-->Other +#define SAY_ANTI_MAGIC_SHELL -1616000 +#define SAY_BREATH_ATTACK -1616001 +#define SAY_HIGH_DAMAGE_MODE -1616002 +#define SAY_MAGIC_BLAST -1616003 +//--> Generic Spells +#define SAY_GENERIC_SPELL_1 -1616004 +#define SAY_GENERIC_SPELL_2 -1616005 +#define SAY_GENERIC_SPELL_3 -1616006 +#define SAY_DEATH -1616007 +//--> Prefight +#define SAY_PREFIGHT_1 -1616008 +#define SAY_PREFIGHT_2 -1616009 +#define SAY_PREFIGHT_3 -1616010 +#define SAY_PREFIGHT_4 -1616011 +#define SAY_PREFIGHT_5 -1616012 +//--> Phase1 +#define SAY_PHASE1_AGGRO -1616013 +#define SAY_PHASE1_END -1616014 +#define SAY_PHASE1_SLAY_1 -1616015 +#define SAY_PHASE1_SLAY_2 -1616016 +#define SAY_PHASE1_SLAY_3 -1616017 + +//--> Phase2 at 50% HP, + +/*Malygos himself is not targetable during this phase, it will end when the adds he spawns are all killed. However, he does continue to play a part in the encounter. +During this phase he drops anti-magic zones onto the ground the raid MUST stand inside of, it reduces magical damage taken by 50%. They shrink over time, so it's important that your raid moves to each new one he drops. +Throughout the phase, he will deep breath doing ~4k damage per second, unless you are standing inside of the anti-magic zone. +The way the fight works during this phase is there are NPCs riding around on disks in the room. There are two types of mobs, Lords and Scions. +The Lords will move down onto the group, and need to be tanked (They will one-shot a non-tank). After they die, they drop a disk that a raid member can mount onto, which allows them to fly, to attack the Scions that do not come down to the ground. +It is recommended to let melee take the first disks, then ranged. As those mobs die, they also drop disks, which allows the rest of your dps to get onto them. +The Scions will continually cast Arcane Blast on random targets on the floor, which is mitigated by the anti-magic zones. While mounted on a disk, you will not take damage. +After all of the NPCs riding on the disks die, the players on the disks need to dismount as Phase 3 is about to begin.*/ + +//not in db +#define SAY_PHASE2_AGGRO -1616018 +#define SAY_PHASE2_END -1616019 +#define SAY_PHASE2_SLAY_1 -1616020 +#define SAY_PHASE2_SLAY_2 -1616021 +#define SAY_PHASE2_SLAY_3 -1616022 +//--> Phase3 Malygos destroys the floor, encounter continues on dragon "mounts" +#define SAY_PHASE3_INTRO -1616023 +#define SAY_PHASE3_AGGRO -1616024 +#define SAY_PHASE3_SLAY_1 -1616025 +#define SAY_PHASE3_SLAY_2 -1616026 +#define SAY_PHASE3_SLAY_3 -1616027 +#define SAY_PHASE3_BIG_ATTACK -1616028 + +enum +{ + ACHIEV_TIMED_START_EVENT = 20387, +}; + +struct boss_malygosAI : public ScriptedAI +{ + boss_malygosAI(Creature *c) : ScriptedAI(c) + { + instance = me->GetInstanceData(); + } + + InstanceData *instance; + + uint32 phase; + uint32 enrage; + + void Reset() + { + phase = 1; + enrage = 615000; //Source Deadly Boss Mod + + if (instance) + instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); + } + + void EnterCombat(Unit* /*who*/) + { + if (phase == 1) + { + DoScriptText(SAY_PHASE1_AGGRO, me); + if (instance) + instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); + } + + if (phase == 2) + DoScriptText(SAY_PHASE1_AGGRO, me); + if (phase == 3) + DoScriptText(SAY_PHASE1_AGGRO, me); + } + + void UpdateAI(const uint32 /*diff*/) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + if (phase == 1 && HealthBelowPct(50)) { + phase = 2; + //spawn adds + //set malygos unatackable untill all adds spawned dead + //start phase3 + } + + DoMeleeAttackIfReady(); + } + + void JustDied(Unit* /*killer*/) + { + DoScriptText(SAY_DEATH, me); + } + + void KilledUnit(Unit * victim) + { + if (victim == me) + return; + + if (phase == 1) + DoScriptText(RAND(SAY_PHASE1_SLAY_1,SAY_PHASE1_SLAY_2,SAY_PHASE1_SLAY_3), me); + if (phase == 2) + DoScriptText(RAND(SAY_PHASE2_SLAY_1,SAY_PHASE2_SLAY_2,SAY_PHASE2_SLAY_3), me); + if (phase == 3) + DoScriptText(RAND(SAY_PHASE3_SLAY_1,SAY_PHASE3_SLAY_2,SAY_PHASE3_SLAY_3), me); + } +}; + +CreatureAI* GetAI_boss_malygos(Creature* pCreature) +{ + return new boss_malygosAI (pCreature); +} + +void AddSC_boss_malygos() +{ + Script *newscript; + + newscript = new Script; + newscript->Name = "boss_malygos"; + newscript->GetAI = &GetAI_boss_malygos; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/eye_of_eternity.h b/src/server/scripts/Northrend/Nexus/EyeOfEternity/eye_of_eternity.h new file mode 100644 index 00000000000..caa82a92e95 --- /dev/null +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/eye_of_eternity.h @@ -0,0 +1,4 @@ +#ifndef DEF_EYE_OF_ETERNITY_H +#define DEF_EYE_OF_ETERNITY_H + +#endif diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp new file mode 100644 index 00000000000..d93ec415b42 --- /dev/null +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp @@ -0,0 +1,21 @@ +#include "ScriptedPch.h" +#include "eye_of_eternity.h" + +struct instance_eye_of_eternity : public ScriptedInstance +{ + instance_eye_of_eternity(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; +}; + +InstanceData* GetInstanceData_instance_eye_of_eternity(Map* pMap) +{ + return new instance_eye_of_eternity(pMap); +} + +void AddSC_instance_eye_of_eternity() +{ + Script *newscript; + newscript = new Script; + newscript->Name = "instance_eye_of_eternity"; + newscript->GetInstanceData = &GetInstanceData_instance_eye_of_eternity; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp new file mode 100644 index 00000000000..02c39dc1232 --- /dev/null +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp @@ -0,0 +1,253 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * Copyright (C) 2008 - 2010 TrinityCore + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "ScriptedPch.h" +#include "nexus.h" + +enum Spells +{ + //Spells + SPELL_SPARK = 47751, + H_SPELL_SPARK = 57062, + SPELL_RIFT_SHIELD = 47748, + SPELL_CHARGE_RIFT = 47747, //Works wrong (affect players, not rifts) + SPELL_CREATE_RIFT = 47743, //Don't work, using WA + SPELL_ARCANE_ATTRACTION = 57063, //No idea, when it's used +}; + +enum Adds +{ + MOB_CRAZED_MANA_WRAITH = 26746, + MOB_CHAOTIC_RIFT = 26918 +}; +enum Yells +{ + //Yell + SAY_AGGRO = -1576010, + SAY_DEATH = -1576011, + SAY_RIFT = -1576012, + SAY_SHIELD = -1576013 +}; + +enum Achievs +{ + ACHIEV_CHAOS_THEORY = 2037 +}; + +const Position RiftLocation[6] = +{ + {652.64, -273.70, -8.75}, + {634.45, -265.94, -8.44}, + {620.73, -281.17, -9.02}, + {626.10, -304.67, -9.44}, + {639.87, -314.11, -9.49}, + {651.72, -297.44, -9.37} +}; + +struct boss_anomalusAI : public ScriptedAI +{ + boss_anomalusAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + } + + ScriptedInstance* pInstance; + + uint8 Phase; + uint32 uiSparkTimer; + uint32 uiCreateRiftTimer; + uint64 uiChaoticRiftGUID; + + bool bDeadChaoticRift; // needed for achievement: Chaos Theory(2037) + + void Reset() + { + Phase = 0; + uiSparkTimer = 5*IN_MILISECONDS; + uiChaoticRiftGUID = 0; + + bDeadChaoticRift = false; + + if (pInstance) + pInstance->SetData(DATA_ANOMALUS_EVENT, NOT_STARTED); + } + + void EnterCombat(Unit* /*who*/) + { + DoScriptText(SAY_AGGRO, me); + + if (pInstance) + pInstance->SetData(DATA_ANOMALUS_EVENT, IN_PROGRESS); + } + + void JustDied(Unit* /*killer*/) + { + DoScriptText(SAY_DEATH, me); + + if (pInstance) + { + if (IsHeroic() && !bDeadChaoticRift) + pInstance->DoCompleteAchievement(ACHIEV_CHAOS_THEORY); + pInstance->SetData(DATA_ANOMALUS_EVENT, DONE); + } + } + + void UpdateAI(const uint32 diff) + { + if (!UpdateVictim()) + return; + + if (me->GetDistance(me->GetHomePosition()) > 60.0f) + { + //Not blizzlike, hack to avoid an exploit + EnterEvadeMode(); + return; + } + + if (me->HasAura(SPELL_RIFT_SHIELD)) + { + if (uiChaoticRiftGUID) + { + Unit* Rift = Unit::GetUnit((*me), uiChaoticRiftGUID); + if (Rift && Rift->isDead()) + { + me->RemoveAurasDueToSpell(SPELL_RIFT_SHIELD); + uiChaoticRiftGUID = 0; + } + return; + } + } else + uiChaoticRiftGUID = 0; + + if ((Phase == 0) && HealthBelowPct(50)) + { + Phase = 1; + DoScriptText(SAY_SHIELD, me); + DoCast(me, SPELL_RIFT_SHIELD); + Creature* Rift = me->SummonCreature(MOB_CHAOTIC_RIFT, RiftLocation[urand(0,5)], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1*IN_MILISECONDS); + if (Rift) + { + //DoCast(Rift, SPELL_CHARGE_RIFT); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + Rift->AI()->AttackStart(pTarget); + uiChaoticRiftGUID = Rift->GetGUID(); + DoScriptText(SAY_RIFT , me); + } + } + + + if (uiSparkTimer <= diff) + { + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, SPELL_SPARK); + uiSparkTimer = 5*IN_MILISECONDS; + } else uiSparkTimer -= diff; + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_boss_anomalus(Creature* pCreature) +{ + return new boss_anomalusAI (pCreature); +} + +enum RiftSpells +{ + SPELL_CHAOTIC_ENERGY_BURST = 47688, + SPELL_CHARGED_CHAOTIC_ENERGY_BURST = 47737, + SPELL_ARCANEFORM = 48019 //Chaotic Rift visual +}; + +struct mob_chaotic_riftAI : public Scripted_NoMovementAI +{ + mob_chaotic_riftAI(Creature *c) : Scripted_NoMovementAI(c) + { + pInstance = c->GetInstanceData(); + } + + ScriptedInstance* pInstance; + + uint32 uiChaoticEnergyBurstTimer; + uint32 uiSummonCrazedManaWraithTimer; + + void Reset() + { + uiChaoticEnergyBurstTimer = 1*IN_MILISECONDS; + uiSummonCrazedManaWraithTimer = 5*IN_MILISECONDS; + //me->SetDisplayId(25206); //For some reason in DB models for ally and horde are different. + //Model for ally (1126) does not show auras. Horde model works perfect. + //Set model to horde number + DoCast(me, SPELL_ARCANEFORM, false); + } + + void JustDied(Unit * /*killer*/) + { + if (Creature* pAnomalus = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_ANOMALUS) : 0)) + CAST_AI(boss_anomalusAI,pAnomalus->AI())->bDeadChaoticRift = true; + } + + void UpdateAI(const uint32 diff) + { + if (!UpdateVictim()) + return; + + if (uiChaoticEnergyBurstTimer <= diff) + { + Unit* pAnomalus = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_ANOMALUS) : 0); + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + if (pAnomalus && pAnomalus->HasAura(SPELL_RIFT_SHIELD)) + DoCast(pTarget, SPELL_CHARGED_CHAOTIC_ENERGY_BURST); + else + DoCast(pTarget, SPELL_CHAOTIC_ENERGY_BURST); + uiChaoticEnergyBurstTimer = 1*IN_MILISECONDS; + } else uiChaoticEnergyBurstTimer -= diff; + + if (uiSummonCrazedManaWraithTimer <= diff) + { + Creature* Wraith = me->SummonCreature(MOB_CRAZED_MANA_WRAITH, me->GetPositionX()+1, me->GetPositionY()+1, me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1*IN_MILISECONDS); + if (Wraith) + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + Wraith->AI()->AttackStart(pTarget); + Unit* Anomalus = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_ANOMALUS) : 0); + if (Anomalus && Anomalus->HasAura(SPELL_RIFT_SHIELD)) + uiSummonCrazedManaWraithTimer = 5*IN_MILISECONDS; + else + uiSummonCrazedManaWraithTimer = 10*IN_MILISECONDS; + } else uiSummonCrazedManaWraithTimer -= diff; + } +}; + +CreatureAI* GetAI_mob_chaotic_rift(Creature* pCreature) +{ + return new mob_chaotic_riftAI (pCreature); +} + +void AddSC_boss_anomalus() +{ + Script *newscript; + + newscript = new Script; + newscript->Name = "boss_anomalus"; + newscript->GetAI = &GetAI_boss_anomalus; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_chaotic_rift"; + newscript->GetAI = &GetAI_mob_chaotic_rift; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp new file mode 100644 index 00000000000..ff633c55eac --- /dev/null +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp @@ -0,0 +1,247 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * Copyright (C) 2008 - 2010 TrinityCore + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "ScriptedPch.h" +#include "nexus.h" + +enum Spells +{ + //Spells + SPELL_FROZEN_PRISON = 47854, + SPELL_TAIL_SWEEP = 50155, + SPELL_CRYSTAL_CHAINS = 50997, + SPELL_ENRAGE = 8599, + SPELL_CRYSTALFIRE_BREATH = 48096, + H_SPELL_CRYSTALFIRE_BREATH = 57091, + SPELL_CRYSTALIZE = 48179, + SPELL_INTENSE_COLD = 48094, + SPELL_INTENSE_COLD_TRIGGERED = 48095 +}; +enum Yells +{ + //Yell + SAY_AGGRO = -1576040, + SAY_SLAY = -1576041, + SAY_ENRAGE = -1576042, + SAY_DEATH = -1576043, + SAY_CRYSTAL_NOVA = -1576044 +}; +enum Achievements +{ + ACHIEV_INTENSE_COLD = 2036 +}; +enum Misc +{ + DATA_CONTAINMENT_SPHERES = 3 +}; + +struct boss_keristraszaAI : public ScriptedAI +{ + boss_keristraszaAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + } + + ScriptedInstance* pInstance; + + uint32 uiCrystalfireBreathTimer; + uint32 uiCrystalChainsCrystalizeTimer; + uint32 uiTailSweepTimer; + bool bEnrage; + + uint64 auiContainmentSphereGUIDs[DATA_CONTAINMENT_SPHERES]; + + uint32 uiCheckIntenseColdTimer; + bool bMoreThanTwoIntenseCold; // needed for achievement: Intense Cold(2036) + + void Reset() + { + uiCrystalfireBreathTimer = 14*IN_MILISECONDS; + uiCrystalChainsCrystalizeTimer = DUNGEON_MODE(30*IN_MILISECONDS,11*IN_MILISECONDS); + uiTailSweepTimer = 5*IN_MILISECONDS; + bEnrage = false; + + uiCheckIntenseColdTimer = 2*IN_MILISECONDS; + bMoreThanTwoIntenseCold = false; + + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED); + + RemovePrison(CheckContainmentSpheres()); + + if (pInstance) + pInstance->SetData(DATA_KERISTRASZA_EVENT, NOT_STARTED); + } + + void EnterCombat(Unit* /*who*/) + { + DoScriptText(SAY_AGGRO, me); + DoCastAOE(SPELL_INTENSE_COLD); + + if (pInstance) + pInstance->SetData(DATA_KERISTRASZA_EVENT, IN_PROGRESS); + } + + void JustDied(Unit* /*killer*/) + { + DoScriptText(SAY_DEATH, me); + + if (pInstance) + { + if (IsHeroic() && !bMoreThanTwoIntenseCold) + pInstance->DoCompleteAchievement(ACHIEV_INTENSE_COLD); + pInstance->SetData(DATA_KERISTRASZA_EVENT, DONE); + } + } + + void KilledUnit(Unit * /*victim*/) + { + DoScriptText(SAY_SLAY, me); + } + + bool CheckContainmentSpheres(bool remove_prison = false) + { + if (!pInstance) + return false; + + auiContainmentSphereGUIDs[0] = pInstance->GetData64(ANOMALUS_CONTAINMET_SPHERE); + auiContainmentSphereGUIDs[1] = pInstance->GetData64(ORMOROKS_CONTAINMET_SPHERE); + auiContainmentSphereGUIDs[2] = pInstance->GetData64(TELESTRAS_CONTAINMET_SPHERE); + + GameObject *ContainmentSpheres[DATA_CONTAINMENT_SPHERES]; + + for (uint8 i = 0; i < DATA_CONTAINMENT_SPHERES; ++i) + { + ContainmentSpheres[i] = pInstance->instance->GetGameObject(auiContainmentSphereGUIDs[i]); + if (!ContainmentSpheres[i]) + return false; + if (ContainmentSpheres[i]->GetGoState() != GO_STATE_ACTIVE) + return false; + } + if (remove_prison) + RemovePrison(true); + return true; + } + + void RemovePrison(bool remove) + { + if (remove) + { + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + if (me->HasAura(SPELL_FROZEN_PRISON)) + me->RemoveAurasDueToSpell(SPELL_FROZEN_PRISON); + } + else + { + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + DoCast(me, SPELL_FROZEN_PRISON, false); + } + } + + void UpdateAI(const uint32 diff) + { + if (!UpdateVictim()) + return; + + if (uiCheckIntenseColdTimer < diff && !bMoreThanTwoIntenseCold) + { + std::list ThreatList = me->getThreatManager().getThreatList(); + for (std::list::const_iterator itr = ThreatList.begin(); itr != ThreatList.end(); ++itr) + { + Unit *pTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid()); + if (!pTarget || pTarget->GetTypeId() != TYPEID_PLAYER) + continue; + + Aura *AuraIntenseCold = pTarget->GetAura(SPELL_INTENSE_COLD_TRIGGERED); + if (AuraIntenseCold && AuraIntenseCold->GetStackAmount() > 2) + { + bMoreThanTwoIntenseCold = true; + break; + } + } + uiCheckIntenseColdTimer = 2*IN_MILISECONDS; + } else uiCheckIntenseColdTimer -= diff; + + if (!bEnrage && HealthBelowPct(25)) + { + DoScriptText(SAY_ENRAGE, me); + DoCast(me, SPELL_ENRAGE); + bEnrage = true; + } + + if (uiCrystalfireBreathTimer <= diff) + { + DoCast(me->getVictim(), SPELL_CRYSTALFIRE_BREATH); + uiCrystalfireBreathTimer = 14*IN_MILISECONDS; + } else uiCrystalfireBreathTimer -= diff; + + if (uiTailSweepTimer <= diff) + { + DoCast(me, SPELL_TAIL_SWEEP); + uiTailSweepTimer = 5*IN_MILISECONDS; + } else uiTailSweepTimer -= diff; + + if (uiCrystalChainsCrystalizeTimer <= diff) + { + DoScriptText(SAY_CRYSTAL_NOVA, me); + if (IsHeroic()) + DoCast(me, SPELL_CRYSTALIZE); + else if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(pTarget, SPELL_CRYSTAL_CHAINS); + uiCrystalChainsCrystalizeTimer = DUNGEON_MODE(30*IN_MILISECONDS,11*IN_MILISECONDS); + } else uiCrystalChainsCrystalizeTimer -= diff; + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_boss_keristrasza(Creature* pCreature) +{ + return new boss_keristraszaAI (pCreature); +} + +bool GOHello_containment_sphere(Player * /*pPlayer*/, GameObject *pGO) +{ + ScriptedInstance *pInstance = pGO->GetInstanceData(); + + Creature *pKeristrasza = Unit::GetCreature(*pGO, pInstance ? pInstance->GetData64(DATA_KERISTRASZA) : 0); + if (pKeristrasza && pKeristrasza->isAlive()) + { + // maybe these are hacks :( + pGO->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); + pGO->SetGoState(GO_STATE_ACTIVE); + + CAST_AI(boss_keristraszaAI, pKeristrasza->AI())->CheckContainmentSpheres(true); + } + return true; +} + +void AddSC_boss_keristrasza() +{ + Script *newscript; + + newscript = new Script; + newscript->Name = "boss_keristrasza"; + newscript->GetAI = &GetAI_boss_keristrasza; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "containment_sphere"; + newscript->pGOHello = &GOHello_containment_sphere; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp new file mode 100644 index 00000000000..0bf9fb07bb7 --- /dev/null +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp @@ -0,0 +1,327 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * Copyright (C) 2008 - 2010 TrinityCore + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "ScriptedPch.h" +#include "nexus.h" + +enum Spells +{ + SPELL_ICE_NOVA = 47772, + H_SPELL_ICE_NOVA = 56935, + SPELL_FIREBOMB = 47773, + H_SPELL_FIREBOMB = 56934, + SPELL_GRAVITY_WELL = 47756, + SPELL_TELESTRA_BACK = 47714, + + SPELL_FIRE_MAGUS_VISUAL = 47705, + SPELL_FROST_MAGUS_VISUAL = 47706, + SPELL_ARCANE_MAGUS_VISUAL = 47704 +}; +enum Creatures +{ + MOB_FIRE_MAGUS = 26928, + MOB_FROST_MAGUS = 26930, + MOB_ARCANE_MAGUS = 26929 +}; +enum Yells +{ + SAY_AGGRO = -1576000, + SAY_KILL = -1576001, + SAY_DEATH = -1576002, + SAY_MERGE = -1576003, + SAY_SPLIT_1 = -1576004, + SAY_SPLIT_2 = -1576005, +}; +enum Achievements +{ + ACHIEV_SPLIT_PERSONALITY = 2150, + ACHIEV_TIMER = 5*IN_MILISECONDS +}; + +const Position CenterOfRoom = {504.80, 89.07, -16.12, 6.27}; + +struct boss_magus_telestraAI : public ScriptedAI +{ + boss_magus_telestraAI(Creature* c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + } + + ScriptedInstance* pInstance; + + uint64 uiFireMagusGUID; + uint64 uiFrostMagusGUID; + uint64 uiArcaneMagusGUID; + + bool bFireMagusDead; + bool bFrostMagusDead; + bool bArcaneMagusDead; + bool bIsWaitingToAppear; + bool bIsAchievementTimerRunning; + + uint32 uiIsWaitingToAppearTimer; + uint32 uiIceNovaTimer; + uint32 uiFireBombTimer; + uint32 uiGravityWellTimer; + uint32 uiCooldown; + uint32 uiAchievementTimer; + + uint8 Phase; + uint8 uiAchievementProgress; + + void Reset() + { + Phase = 0; + //These times are probably wrong + uiIceNovaTimer = 7*IN_MILISECONDS; + uiFireBombTimer = 0; + uiGravityWellTimer = 15*IN_MILISECONDS; + uiCooldown = 0; + + uiFireMagusGUID = 0; + uiFrostMagusGUID = 0; + uiArcaneMagusGUID = 0; + + uiAchievementProgress = 0; + uiAchievementTimer = 0; + + bIsAchievementTimerRunning = false; + bIsWaitingToAppear = false; + + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + me->SetVisibility(VISIBILITY_ON); + + if (pInstance) + pInstance->SetData(DATA_MAGUS_TELESTRA_EVENT, NOT_STARTED); + } + + void EnterCombat(Unit* /*who*/) + { + DoScriptText(SAY_AGGRO, me); + + if (pInstance) + pInstance->SetData(DATA_MAGUS_TELESTRA_EVENT, IN_PROGRESS); + } + + void JustDied(Unit* /*killer*/) + { + DoScriptText(SAY_DEATH, me); + + if (pInstance) + { + if (IsHeroic() && uiAchievementProgress == 2) + pInstance->DoCompleteAchievement(ACHIEV_SPLIT_PERSONALITY); + pInstance->SetData(DATA_MAGUS_TELESTRA_EVENT, DONE); + } + } + + void KilledUnit(Unit * /*victim*/) + { + DoScriptText(SAY_KILL, me); + } + + uint64 SplitPersonality(uint32 entry) + { + if (Creature* Summoned = me->SummonCreature(entry, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1*IN_MILISECONDS)) + { + switch (entry) + { + case MOB_FIRE_MAGUS: + { + Summoned->CastSpell(Summoned, SPELL_FIRE_MAGUS_VISUAL, false); + break; + } + case MOB_FROST_MAGUS: + { + Summoned->CastSpell(Summoned, SPELL_FROST_MAGUS_VISUAL, false); + break; + } + case MOB_ARCANE_MAGUS: + { + Summoned->CastSpell(Summoned, SPELL_ARCANE_MAGUS_VISUAL, false); + break; + } + } + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + Summoned->AI()->AttackStart(pTarget); + return Summoned->GetGUID(); + } + return 0; + } + + void SummonedCreatureDespawn(Creature *summon) + { + if (summon->isAlive()) + return; + + if (summon->GetGUID() == uiFireMagusGUID) + { + bFireMagusDead = true; + bIsAchievementTimerRunning = true; + } + else if (summon->GetGUID() == uiFrostMagusGUID) + { + bFrostMagusDead = true; + bIsAchievementTimerRunning = true; + } + else if (summon->GetGUID() == uiArcaneMagusGUID) + { + bArcaneMagusDead = true; + bIsAchievementTimerRunning = true; + } + } + + void UpdateAI(const uint32 diff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + if (bIsWaitingToAppear) + { + me->StopMoving(); + me->AttackStop(); + if (uiIsWaitingToAppearTimer <= diff) + { + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + bIsWaitingToAppear = false; + } else uiIsWaitingToAppearTimer -= diff; + return; + } + + if ((Phase == 1) ||(Phase == 3)) + { + if (bIsAchievementTimerRunning) + uiAchievementTimer += diff; + if (bFireMagusDead && bFrostMagusDead && bArcaneMagusDead) + { + if (uiAchievementTimer <= ACHIEV_TIMER) + uiAchievementProgress +=1; + me->GetMotionMaster()->Clear(); + me->GetMap()->CreatureRelocation(me, CenterOfRoom.GetPositionX(), CenterOfRoom.GetPositionY(), CenterOfRoom.GetPositionZ(), CenterOfRoom.GetOrientation()); + DoCast(me, SPELL_TELESTRA_BACK); + me->SetVisibility(VISIBILITY_ON); + if (Phase == 1) + Phase = 2; + if (Phase == 3) + Phase = 4; + uiFireMagusGUID = 0; + uiFrostMagusGUID = 0; + uiArcaneMagusGUID = 0; + bIsWaitingToAppear = true; + uiIsWaitingToAppearTimer = 4*IN_MILISECONDS; + DoScriptText(SAY_MERGE, me); + bIsAchievementTimerRunning = false; + uiAchievementTimer = 0; + } + else + return; + } + + if ((Phase == 0) && HealthBelowPct(50)) + { + Phase = 1; + me->CastStop(); + me->RemoveAllAuras(); + me->SetVisibility(VISIBILITY_OFF); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + uiFireMagusGUID = SplitPersonality(MOB_FIRE_MAGUS); + uiFrostMagusGUID = SplitPersonality(MOB_FROST_MAGUS); + uiArcaneMagusGUID = SplitPersonality(MOB_ARCANE_MAGUS); + bFireMagusDead = false; + bFrostMagusDead = false; + bArcaneMagusDead = false; + DoScriptText(RAND(SAY_SPLIT_1,SAY_SPLIT_2), me); + return; + } + + if (IsHeroic() && (Phase == 2) && HealthBelowPct(10)) + { + Phase = 3; + me->CastStop(); + me->RemoveAllAuras(); + me->SetVisibility(VISIBILITY_OFF); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + uiFireMagusGUID = SplitPersonality(MOB_FIRE_MAGUS); + uiFrostMagusGUID = SplitPersonality(MOB_FROST_MAGUS); + uiArcaneMagusGUID = SplitPersonality(MOB_ARCANE_MAGUS); + bFireMagusDead = false; + bFrostMagusDead = false; + bArcaneMagusDead = false; + DoScriptText(RAND(SAY_SPLIT_1,SAY_SPLIT_2), me); + return; + } + + if (uiCooldown) + { + if (uiCooldown <= diff) + uiCooldown = 0; + else + { + uiCooldown -= diff; + return; + } + } + + if (uiIceNovaTimer <= diff) + { + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + { + DoCast(pTarget, SPELL_ICE_NOVA, false); + uiCooldown = 1.5*IN_MILISECONDS; + } + uiIceNovaTimer = 15*IN_MILISECONDS; + } else uiIceNovaTimer -= diff; + + if (uiGravityWellTimer <= diff) + { + if (Unit *pTarget = me->getVictim()) + { + DoCast(pTarget, SPELL_GRAVITY_WELL); + uiCooldown = 6*IN_MILISECONDS; + } + uiGravityWellTimer = 15*IN_MILISECONDS; + } else uiGravityWellTimer -= diff; + + if (uiFireBombTimer <= diff) + { + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + { + DoCast(pTarget, SPELL_FIREBOMB, false); + uiCooldown = 2*IN_MILISECONDS; + } + uiFireBombTimer = 2*IN_MILISECONDS; + } else uiFireBombTimer -=diff; + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_boss_magus_telestra(Creature* pCreature) +{ + return new boss_magus_telestraAI (pCreature); +} + +void AddSC_boss_magus_telestra() +{ + Script *newscript; + + newscript = new Script; + newscript->Name = "boss_magus_telestra"; + newscript->GetAI = &GetAI_boss_magus_telestra; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp new file mode 100644 index 00000000000..1304f95c7ac --- /dev/null +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp @@ -0,0 +1,298 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * Copyright (C) 2008 - 2010 TrinityCore + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "ScriptedPch.h" +#include "nexus.h" + +enum Spells +{ + SPELL_CRYSTAL_SPIKES = 47958, //Don't work, using walkaround + H_SPELL_CRYSTAL_SPIKES = 57082, //Don't work, using walkaround + SPELL_CRYSTALL_SPIKE_DAMAGE = 47944, + H_SPELL_CRYSTALL_SPIKE_DAMAGE = 57067, + SPELL_CRYSTAL_SPIKE_PREVISUAL = 50442, + MOB_CRYSTAL_SPIKE = 27099, + SPELL_SPELL_REFLECTION = 47981, + SPELL_TRAMPLE = 48016, + H_SPELL_TRAMPLE = 57066, + SPELL_FRENZY = 48017, + SPELL_SUMMON_CRYSTALLINE_TANGLER = 61564, //summons npc 32665 + SPELL_ROOTS = 28858 //proper spell id is unknown +}; +enum Yells +{ + SAY_AGGRO = -1576020, + SAY_DEATH = -1576021, + SAY_REFLECT = -1576022, + SAY_CRYSTAL_SPIKES = -1576023, + SAY_KILL = -1576024 +}; +enum Creatures +{ + MOB_CRYSTALLINE_TANGLER = 32665 +}; + +#define SPIKE_DISTANCE 5.0f + +struct boss_ormorokAI : public ScriptedAI +{ + boss_ormorokAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + } + + ScriptedInstance* pInstance; + + bool bFrenzy; + bool bCrystalSpikes; + uint8 uiCrystalSpikesCount; + float fBaseX; + float fBaseY; + float fBaseZ; + float fBaseO; + float fSpikeXY[4][2]; + + uint32 uiCrystalSpikesTimer; + uint32 uiCrystalSpikesTimer2; + uint32 uiTrampleTimer; + uint32 uiFrenzyTimer; + uint32 uiSpellReflectionTimer; + uint32 uiSummonCrystallineTanglerTimer; + + void Reset() + { + uiCrystalSpikesTimer = 12*IN_MILISECONDS; + uiTrampleTimer = 10*IN_MILISECONDS; + uiSpellReflectionTimer = 30*IN_MILISECONDS; + uiSummonCrystallineTanglerTimer = 17*IN_MILISECONDS; + bFrenzy = false; + bCrystalSpikes = false; + + if (pInstance) + pInstance->SetData(DATA_ORMOROK_EVENT, NOT_STARTED); + } + + void EnterCombat(Unit* /*who*/) + { + DoScriptText(SAY_AGGRO, me); + + if (pInstance) + pInstance->SetData(DATA_ORMOROK_EVENT, IN_PROGRESS); + } + + void JustDied(Unit* /*killer*/) + { + DoScriptText(SAY_DEATH, me); + + if (pInstance) + pInstance->SetData(DATA_ORMOROK_EVENT, DONE); + } + + void KilledUnit(Unit * /*victim*/) + { + DoScriptText(SAY_KILL, me); + } + + void UpdateAI(const uint32 diff) + { + if (!UpdateVictim()) + { + return; + } + if (bCrystalSpikes) + if (uiCrystalSpikesTimer2 <= diff) + { + fSpikeXY[0][0] = fBaseX+(SPIKE_DISTANCE*uiCrystalSpikesCount*cos(fBaseO)); + fSpikeXY[0][1] = fBaseY+(SPIKE_DISTANCE*uiCrystalSpikesCount*sin(fBaseO)); + fSpikeXY[1][0] = fBaseX-(SPIKE_DISTANCE*uiCrystalSpikesCount*cos(fBaseO)); + fSpikeXY[1][1] = fBaseY-(SPIKE_DISTANCE*uiCrystalSpikesCount*sin(fBaseO)); + fSpikeXY[2][0] = fBaseX+(SPIKE_DISTANCE*uiCrystalSpikesCount*cos(fBaseO-(M_PI/2))); + fSpikeXY[2][1] = fBaseY+(SPIKE_DISTANCE*uiCrystalSpikesCount*sin(fBaseO-(M_PI/2))); + fSpikeXY[3][0] = fBaseX-(SPIKE_DISTANCE*uiCrystalSpikesCount*cos(fBaseO-(M_PI/2))); + fSpikeXY[3][1] = fBaseY-(SPIKE_DISTANCE*uiCrystalSpikesCount*sin(fBaseO-(M_PI/2))); + for (uint8 i = 0; i < 4; ++i) + me->SummonCreature(MOB_CRYSTAL_SPIKE, fSpikeXY[i][0], fSpikeXY[i][1], fBaseZ, 0, TEMPSUMMON_TIMED_DESPAWN, 7*IN_MILISECONDS); + if (++uiCrystalSpikesCount >= 13) + bCrystalSpikes = false; + uiCrystalSpikesTimer2 = 200; + } else uiCrystalSpikesTimer2 -= diff; + + if (!bFrenzy && (me->GetHealth() < me->GetMaxHealth() * 0.25)) + { + DoCast(me, SPELL_FRENZY); + bFrenzy = true; + } + + if (uiTrampleTimer <= diff) + { + DoCast(me, SPELL_TRAMPLE); + uiTrampleTimer = 10*IN_MILISECONDS; + } else uiTrampleTimer -= diff; + + if (uiSpellReflectionTimer <= diff) + { + DoScriptText(SAY_REFLECT, me); + DoCast(me, SPELL_SPELL_REFLECTION); + uiSpellReflectionTimer = 30*IN_MILISECONDS; + } else uiSpellReflectionTimer -= diff; + + if (uiCrystalSpikesTimer <= diff) + { + DoScriptText(SAY_CRYSTAL_SPIKES, me); + bCrystalSpikes = true; + uiCrystalSpikesCount = 1; + uiCrystalSpikesTimer2 = 0; + fBaseX = me->GetPositionX(); + fBaseY = me->GetPositionY(); + fBaseZ = me->GetPositionZ(); + fBaseO = me->GetOrientation(); + uiCrystalSpikesTimer = 20*IN_MILISECONDS; + } else uiCrystalSpikesTimer -= diff; + + if (IsHeroic() && (uiSummonCrystallineTanglerTimer <= diff)) + { + Creature* Crystalline_Tangler = me->SummonCreature(MOB_CRYSTALLINE_TANGLER, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1000); + if (Crystalline_Tangler) + { + Unit *pTarget = NULL; + uint8 Healer = 0; + for (uint8 j = 1; j <= 4; j++) + { + switch (j) + { + case 1: Healer = CLASS_PRIEST; break; + case 2: Healer = CLASS_PALADIN; break; + case 3: Healer = CLASS_DRUID; break; + case 4: Healer = CLASS_SHAMAN; break; + } + std::list::const_iterator i = me->getThreatManager().getThreatList().begin(); + for (; i != me->getThreatManager().getThreatList().end(); ++i) + { + Unit* pTemp = Unit::GetUnit((*me),(*i)->getUnitGuid()); + if (pTemp && pTemp->GetTypeId() == TYPEID_PLAYER && pTemp->getClass() == Healer) + { + pTarget = pTemp; + break; + } + } + if (pTarget) + break; + } + if (!pTarget) + pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); + if (pTarget) + { + Crystalline_Tangler->AI()->AttackStart(pTarget); + Crystalline_Tangler->getThreatManager().addThreat(pTarget, 1000000000.0f); + } + } + uiSummonCrystallineTanglerTimer = 17*IN_MILISECONDS; + } else uiSummonCrystallineTanglerTimer -= diff; + + DoMeleeAttackIfReady(); + } +}; + +struct mob_crystal_spikeAI : public Scripted_NoMovementAI +{ + mob_crystal_spikeAI(Creature *c) : Scripted_NoMovementAI(c) + { + } + + uint32 SpellCrystalSpikeDamageTimer; + uint32 SpellCrystalSpikePrevisualTimer; + + void Reset() + { + SpellCrystalSpikeDamageTimer = 3.7*IN_MILISECONDS; + SpellCrystalSpikePrevisualTimer = 1*IN_MILISECONDS; + } + + void UpdateAI(const uint32 diff) + { + if (SpellCrystalSpikePrevisualTimer <= diff) + { + DoCast(me, SPELL_CRYSTAL_SPIKE_PREVISUAL); + SpellCrystalSpikePrevisualTimer = 10*IN_MILISECONDS; + } else SpellCrystalSpikePrevisualTimer -= diff; + + if (SpellCrystalSpikeDamageTimer <= diff) + { + DoCast(me, SPELL_CRYSTALL_SPIKE_DAMAGE); + SpellCrystalSpikeDamageTimer = 10*IN_MILISECONDS; + } else SpellCrystalSpikeDamageTimer -= diff; + } +}; + +struct mob_crystalline_tanglerAI : public ScriptedAI +{ + mob_crystalline_tanglerAI(Creature *c) : ScriptedAI(c) {} + + uint32 uiRootsTimer; + + void Reset() + { + uiRootsTimer = 1*IN_MILISECONDS; + } + + void UpdateAI(const uint32 diff) + { + if (uiRootsTimer <= diff) + { + if (me->IsWithinDist(me->getVictim(), 5.0f, false)) + { + DoCast(me->getVictim(), SPELL_ROOTS); + uiRootsTimer = 15*IN_MILISECONDS; + } + } else uiRootsTimer -= diff; + } +}; + +CreatureAI* GetAI_mob_crystal_spike(Creature* pCreature) +{ + return new mob_crystal_spikeAI (pCreature); +} + +CreatureAI* GetAI_mob_crystalline_tangler(Creature* pCreature) +{ + return new mob_crystalline_tanglerAI (pCreature); +} + +CreatureAI* GetAI_boss_ormorok(Creature* pCreature) +{ + return new boss_ormorokAI (pCreature); +} + +void AddSC_boss_ormorok() +{ + Script *newscript; + + newscript = new Script; + newscript->Name = "boss_ormorok"; + newscript->GetAI = &GetAI_boss_ormorok; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_crystal_spike"; + newscript->GetAI = &GetAI_mob_crystal_spike; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_crystalline_tangler"; + newscript->GetAI = &GetAI_mob_crystalline_tangler; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Northrend/Nexus/Nexus/commander_kolurg.cpp b/src/server/scripts/Northrend/Nexus/Nexus/commander_kolurg.cpp new file mode 100644 index 00000000000..4bd9f55a013 --- /dev/null +++ b/src/server/scripts/Northrend/Nexus/Nexus/commander_kolurg.cpp @@ -0,0 +1,58 @@ +/* Script Data Start +SDName: Boss Commander Kolurg +SDAuthor: LordVanMartin +SD%Complete: +SDComment: Only Alliance Heroic +SDCategory: +Script Data End */ + +/*** SQL START *** +update creature_template set scriptname = 'boss_commander_kolurg' where entry = ''; +*** SQL END ***/ +#include "ScriptedPch.h" + +#define SPELL_BATTLE_SHOUT 31403 +#define SPELL_CHARGE 60067 +#define SPELL_FRIGHTENING_SHOUT 19134 +#define SPELL_WHIRLWIND_1 38619 +#define SPELL_WHIRLWIND_2 38618 + +//not used +//Yell +#define SAY_AGGRO -1576024 +#define SAY_KILL -1576025 +#define SAY_DEATH -1576026 + +struct boss_commander_kolurgAI : public ScriptedAI +{ + boss_commander_kolurgAI(Creature *c) : ScriptedAI(c) {} + + void Reset() {} + void EnterCombat(Unit* /*who*/) {} + void AttackStart(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} + void UpdateAI(const uint32 /*diff*/) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + DoMeleeAttackIfReady(); + } + void JustDied(Unit* /*killer*/) {} +}; + +CreatureAI* GetAI_boss_commander_kolurg(Creature* pCreature) +{ + return new boss_commander_kolurgAI (pCreature); +} + +void AddSC_boss_commander_kolurg() +{ + Script *newscript; + + newscript = new Script; + newscript->Name = "boss_commander_kolurg"; + newscript->GetAI = &GetAI_boss_commander_kolurg; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Northrend/Nexus/Nexus/commander_stoutbeard.cpp b/src/server/scripts/Northrend/Nexus/Nexus/commander_stoutbeard.cpp new file mode 100644 index 00000000000..ef02baa38e6 --- /dev/null +++ b/src/server/scripts/Northrend/Nexus/Nexus/commander_stoutbeard.cpp @@ -0,0 +1,64 @@ +/* Script Data Start +SDName: Boss Commander Stoutbeard +SDAuthor: LordVanMartin +SD%Complete: +SDComment: Only Horde Heroic +SDCategory: +Script Data End */ + +/*** SQL START *** +update creature_template set scriptname = 'boss_commander_stoutbeard' where entry = ''; +*** SQL END ***/ +#include "ScriptedPch.h" + +#define SPELL_BATTLE_SHOUT 31403 +#define SPELL_CHARGE 60067 +#define SPELL_FRIGHTENING_SHOUT 19134 +#define SPELL_WHIRLWIND_1 38619 +#define SPELL_WHIRLWIND_2 38618 + +//not used +//Yell +#define SAY_AGGRO -1576021 +#define SAY_KILL -1576022 +#define SAY_DEATH -1576023 + +struct boss_commander_stoutbeardAI : public ScriptedAI +{ + boss_commander_stoutbeardAI(Creature *c) : ScriptedAI(c) {} + + void Reset() {} + void EnterCombat(Unit* /*who*/) + { + DoScriptText(SAY_AGGRO, me); + } + void AttackStart(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} + void UpdateAI(const uint32 /*diff*/) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + DoMeleeAttackIfReady(); + } + void JustDied(Unit* /*killer*/) + { + DoScriptText(SAY_DEATH, me); + } +}; + +CreatureAI* GetAI_boss_commander_stoutbeard(Creature* pCreature) +{ + return new boss_commander_stoutbeardAI (pCreature); +} + +void AddSC_boss_commander_stoutbeard() +{ + Script *newscript; + + newscript = new Script; + newscript->Name = "boss_commander_stoutbeard"; + newscript->GetAI = &GetAI_boss_commander_stoutbeard; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp new file mode 100644 index 00000000000..db70245e3a4 --- /dev/null +++ b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp @@ -0,0 +1,259 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * Copyright (C) 2008 - 2010 TrinityCore + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "ScriptedPch.h" +#include "nexus.h" + +#define NUMBER_OF_ENCOUNTERS 4 + +enum Factions +{ + FACTION_HOSTILE_FOR_ALL = 16 +}; + +struct instance_nexus : public ScriptedInstance +{ + instance_nexus(Map *pMap) : ScriptedInstance(pMap) { Initialize(); } + + uint32 m_auiEncounter[NUMBER_OF_ENCOUNTERS]; + + uint64 Anomalus; + uint64 Keristrasza; + + uint64 AnomalusContainmentSphere; + uint64 OrmoroksContainmentSphere; + uint64 TelestrasContainmentSphere; + + std::string strInstData; + + void Initialize() + { + memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); + + Anomalus = 0; + Keristrasza = 0; + } + + void OnCreatureCreate(Creature *pCreature, bool /*bAdd*/) + { + Map::PlayerList const &players = instance->GetPlayers(); + uint32 TeamInInstance = 0; + + if (!players.isEmpty()) + { + if (Player* pPlayer = players.begin()->getSource()) + TeamInInstance = pPlayer->GetTeam(); + } + switch (pCreature->GetEntry()) + { + case 26763: + Anomalus = pCreature->GetGUID(); + break; + case 26723: + Keristrasza = pCreature->GetGUID(); + break; + // Alliance npcs are spawned by default, if you are alliance, you will fight against horde npcs. + case 26800: + { + if (ServerAllowsTwoSideGroups()) + pCreature->setFaction(FACTION_HOSTILE_FOR_ALL); + if (TeamInInstance == ALLIANCE) + pCreature->UpdateEntry(26799, HORDE); + break; + } + case 26802: + { + if (ServerAllowsTwoSideGroups()) + pCreature->setFaction(FACTION_HOSTILE_FOR_ALL); + if (TeamInInstance == ALLIANCE) + pCreature->UpdateEntry(26801, HORDE); + break; + } + case 26805: + { + if (ServerAllowsTwoSideGroups()) + pCreature->setFaction(FACTION_HOSTILE_FOR_ALL); + if (TeamInInstance == ALLIANCE) + pCreature->UpdateEntry(26803, HORDE); + break; + } + case 27949: + { + if (ServerAllowsTwoSideGroups()) + pCreature->setFaction(FACTION_HOSTILE_FOR_ALL); + if (TeamInInstance == ALLIANCE) + pCreature->UpdateEntry(27947, HORDE); + break; + } + case 26796: + { + if (ServerAllowsTwoSideGroups()) + pCreature->setFaction(FACTION_HOSTILE_FOR_ALL); + if (TeamInInstance == ALLIANCE) + pCreature->UpdateEntry(26798, HORDE); + break; + } + } + } + + void OnGameObjectCreate(GameObject *pGo, bool /*bAdd*/) + { + switch (pGo->GetEntry()) + { + case 188527: + { + AnomalusContainmentSphere = pGo->GetGUID(); + if (m_auiEncounter[1] == DONE) + pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); + break; + } + case 188528: + { + OrmoroksContainmentSphere = pGo->GetGUID(); + if (m_auiEncounter[2] == DONE) + pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); + break; + } + case 188526: + { + TelestrasContainmentSphere = pGo->GetGUID(); + if (m_auiEncounter[0] == DONE) + pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); + break; + } + } + } + + uint32 GetData(uint32 identifier) + { + switch(identifier) + { + case DATA_MAGUS_TELESTRA_EVENT: return m_auiEncounter[0]; + case DATA_ANOMALUS_EVENT: return m_auiEncounter[1]; + case DATA_ORMOROK_EVENT: return m_auiEncounter[2]; + case DATA_KERISTRASZA_EVENT: return m_auiEncounter[3]; + } + return 0; + } + + void SetData(uint32 identifier, uint32 data) + { + switch (identifier) + { + case DATA_MAGUS_TELESTRA_EVENT: + { + if (data == DONE) + { + GameObject *Sphere = instance->GetGameObject(TelestrasContainmentSphere); + if (Sphere) + Sphere->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); + } + m_auiEncounter[0] = data; + break; + } + case DATA_ANOMALUS_EVENT: + { + if (data == DONE) + { + if (GameObject *Sphere = instance->GetGameObject(AnomalusContainmentSphere)) + Sphere->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); + } + m_auiEncounter[1] = data; + break; + } + case DATA_ORMOROK_EVENT: + { + if (data == DONE) + { + if (GameObject *Sphere = instance->GetGameObject(OrmoroksContainmentSphere)) + Sphere->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); + } + m_auiEncounter[2] = data; + break; + } + case DATA_KERISTRASZA_EVENT: + m_auiEncounter[3] = data; + break; + } + + if (data == DONE) + { + OUT_SAVE_INST_DATA; + + std::ostringstream saveStream; + saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " " + << m_auiEncounter[3]; + + strInstData = saveStream.str(); + + SaveToDB(); + OUT_SAVE_INST_DATA_COMPLETE; + } + } + + uint64 GetData64(uint32 uiIdentifier) + { + switch(uiIdentifier) + { + case DATA_ANOMALUS: return Anomalus; + case DATA_KERISTRASZA: return Keristrasza; + case ANOMALUS_CONTAINMET_SPHERE: return AnomalusContainmentSphere; + case ORMOROKS_CONTAINMET_SPHERE: return OrmoroksContainmentSphere; + case TELESTRAS_CONTAINMET_SPHERE: return TelestrasContainmentSphere; + } + return 0; + } + + std::string GetSaveData() + { + return strInstData; + } + + void Load(const char *chrIn) + { + if (!chrIn) + { + OUT_LOAD_INST_DATA_FAIL; + return; + } + + OUT_LOAD_INST_DATA(chrIn); + + std::istringstream loadStream(chrIn); + loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3]; + + for (uint8 i = 0; i < NUMBER_OF_ENCOUNTERS; ++i) + if (m_auiEncounter[i] == IN_PROGRESS) + m_auiEncounter[i] = NOT_STARTED; + + OUT_LOAD_INST_DATA_COMPLETE; + } +}; + +InstanceData *GetInstanceData_instance_nexus(Map *pMap) +{ + return new instance_nexus(pMap); +} + +void AddSC_instance_nexus() +{ + Script *newscript; + newscript = new Script; + newscript->Name = "instance_nexus"; + newscript->GetInstanceData = &GetInstanceData_instance_nexus; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Northrend/Nexus/Nexus/nexus.h b/src/server/scripts/Northrend/Nexus/Nexus/nexus.h new file mode 100644 index 00000000000..66902bece30 --- /dev/null +++ b/src/server/scripts/Northrend/Nexus/Nexus/nexus.h @@ -0,0 +1,35 @@ +/* Copyright (C) 2008 - 2010 TrinityCore + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef DEF_NEXUS_H +#define DEF_NEXUS_H + +enum eTypes +{ + DATA_MAGUS_TELESTRA_EVENT, + DATA_ANOMALUS_EVENT, + DATA_ORMOROK_EVENT, + DATA_KERISTRASZA_EVENT, + + DATA_ANOMALUS, + DATA_KERISTRASZA, + + ANOMALUS_CONTAINMET_SPHERE, + ORMOROKS_CONTAINMET_SPHERE, + TELESTRAS_CONTAINMET_SPHERE +}; + +#endif diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp new file mode 100644 index 00000000000..7d276206339 --- /dev/null +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp @@ -0,0 +1,218 @@ +/* Copyright (C) 2008 - 2010 TrinityCore +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +#include "ScriptedPch.h" +#include "oculus.h" + +enum Spells +{ + SPELL_MAGIC_PULL = 51336, + SPELL_MAGIC_PULL_EFFECT = 50770, + SPELL_THUNDERING_STOMP = 50774, + SPELL_THUNDERING_STOMP_H = 59370, + SPELL_UNSTABLE_SPHERE_PASSIVE = 50756, + SPELL_UNSTABLE_SPHERE_PULSE = 50757, + SPELL_UNSTABLE_SPHERE_TIMER = 50758, + NPC_UNSTABLE_SPHERE = 28166, +}; + +//not in db +enum Yells +{ + SAY_AGGRO = -1578000, + SAY_KILL_1 = -1578001, + SAY_KILL_2 = -1578002, + SAY_KILL_3 = -1578003, + SAY_DEATH = -1578004, + SAY_PULL_1 = -1578005, + SAY_PULL_2 = -1578006, + SAY_PULL_3 = -1578007, + SAY_PULL_4 = -1578008, + SAY_STOMP_1 = -1578009, + SAY_STOMP_2 = -1578010, + SAY_STOMP_3 = -1578011 +}; + +enum +{ + ACHIEV_TIMED_START_EVENT = 18153, +}; + +struct boss_drakosAI : public ScriptedAI +{ + boss_drakosAI(Creature* pCreature) : ScriptedAI(pCreature), lSummons(me) + { + pInstance = pCreature->GetInstanceData(); + } + + uint32 uiMagicPullTimer; + uint32 uiStompTimer; + uint32 uiBombSummonTimer; + + bool bPostPull; + + ScriptedInstance* pInstance; + SummonList lSummons; + + void Reset() + { + lSummons.DespawnAll(); + uiMagicPullTimer = 15000; + uiStompTimer = 17000; + uiBombSummonTimer = 2000; + + bPostPull = false; + + if (pInstance) + pInstance->SetData(DATA_DRAKOS_EVENT, NOT_STARTED); + } + + void EnterCombat(Unit* /*who*/) + { + DoScriptText(SAY_AGGRO, me); + + if (pInstance) + pInstance->SetData(DATA_DRAKOS_EVENT, IN_PROGRESS); + } + + void JustSummoned(Creature* pSummon) + { + lSummons.Summon(pSummon); + } + + void UpdateAI(const uint32 uiDiff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + if (uiBombSummonTimer <= uiDiff) + { + Position pPosition; + me->GetPosition(&pPosition); + + if (bPostPull) + { + for (uint8 uiI = 0; uiI >= 3; uiI++) + { + me->GetRandomNearPosition(pPosition, float(urand(0,10))); + me->SummonCreature(NPC_UNSTABLE_SPHERE, pPosition); + } + } + else + { + me->GetRandomNearPosition(pPosition, float(urand(0,10))); + me->SummonCreature(NPC_UNSTABLE_SPHERE, pPosition); + } + + uiBombSummonTimer = 2000; + } else uiBombSummonTimer -= uiDiff; + + if (uiMagicPullTimer <= uiDiff) + { + DoCast(SPELL_MAGIC_PULL); + + bPostPull = true; + + uiMagicPullTimer = 15000; + } else uiMagicPullTimer -= uiDiff; + + if (uiStompTimer <= uiDiff) + { + DoScriptText(RAND(SAY_STOMP_1,SAY_STOMP_2,SAY_STOMP_3), me); + DoCast(SPELL_THUNDERING_STOMP); + uiStompTimer = 17000; + } else uiStompTimer -= uiDiff; + + DoMeleeAttackIfReady(); + } + + void JustDied(Unit* /*killer*/) + { + DoScriptText(SAY_DEATH, me); + + if (pInstance) + { + pInstance->SetData(DATA_DRAKOS_EVENT, DONE); + // start achievement timer (kill Eregos within 20 min) + pInstance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); + } + + lSummons.DespawnAll(); + } + void KilledUnit(Unit* /*victim*/) + { + DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2,SAY_KILL_3), me); + } +}; + +CreatureAI* GetAI_boss_drakos(Creature* pCreature) +{ + return new boss_drakosAI (pCreature); +} + +struct npc_unstable_sphereAI : public ScriptedAI +{ + npc_unstable_sphereAI(Creature* pCreature) : ScriptedAI(pCreature) {} + + uint32 uiPulseTimer; + uint32 uiDeathTimer; + + void Reset() + { + me->SetReactState(REACT_PASSIVE); + me->GetMotionMaster()->MoveRandom(40.0f); + + me->AddAura(SPELL_UNSTABLE_SPHERE_PASSIVE, me); + me->AddAura(SPELL_UNSTABLE_SPHERE_TIMER, me); + + uiPulseTimer = 3000; + uiDeathTimer = 19000; + } + + void UpdateAI(const uint32 uiDiff) + { + if (uiPulseTimer <= uiDiff) + { + DoCast(SPELL_UNSTABLE_SPHERE_PULSE); + uiPulseTimer = 3*IN_MILISECONDS; + } else uiPulseTimer -= uiDiff; + + if (uiDeathTimer <= uiDiff) + me->DisappearAndDie(); + else uiDeathTimer -= uiDiff; + } +}; + +CreatureAI* GetAI_npc_unstable_sphere(Creature* pCreature) +{ + return new npc_unstable_sphereAI (pCreature); +} + +void AddSC_boss_drakos() +{ + Script* newscript; + + newscript = new Script; + newscript->Name = "boss_drakos"; + newscript->GetAI = &GetAI_boss_drakos; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "npc_unstable_sphere"; + newscript->GetAI = &GetAI_npc_unstable_sphere; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp new file mode 100644 index 00000000000..94fb90ab206 --- /dev/null +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp @@ -0,0 +1,129 @@ +/* Copyright (C) 2008 - 2010 TrinityCore +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +#include "ScriptedPch.h" +#include "oculus.h" + +//Types of drake mounts: Ruby(Tank), Amber(DPS), Emerald(Healer) +//Two Repeating phases + +enum Spells +{ + SPELL_ARCANE_BARRAGE = 50804, + H_SPELL_ARCANE_BARRAGE = 59381, + SPELL_ARCANE_VOLLEY = 51153, + H_SPELL_ARCANE_VOLLEY = 59382, + SPELL_ENRAGED_ASSAULT = 51170, + SPELL_PLANAR_ANOMALIES = 57959, + SPELL_PLANAR_SHIFT = 51162, +}; +/*Ruby Drake , +(npc 27756) (item 37860) +(summoned by spell Ruby Essence = 37860 ---> Call Amber Drake == 49462 ---> Summon 27756) +*/ +enum RubyDrake +{ + NPC_RUBY_DRAKE_VEHICLE = 27756, + SPELL_RIDE_RUBY_DRAKE_QUE = 49463, //Apply Aura: Periodic Trigger, Interval: 3 seconds ---> 49464 + SPELL_RUBY_DRAKE_SADDLE = 49464, //Allows you to ride on the back of an Amber Drake. ---> Dummy + SPELL_RUBY_SEARING_WRATH = 50232, //(60 yds) - Instant - Breathes a stream of fire at an enemy dragon, dealing 6800 to 9200 Fire damage and then jumping to additional dragons within 30 yards. Each jump increases the damage by 50%. Affects up to 5 total targets + SPELL_RUBY_EVASIVE_AURA = 50248, //Instant - Allows the Ruby Drake to generate Evasive Charges when hit by hostile attacks and spells. + SPELL_RUBY_EVASIVE_MANEUVERS = 50240, //Instant - 5 sec. cooldown - Allows your drake to dodge all incoming attacks and spells. Requires Evasive Charges to use. Each attack or spell dodged while this ability is active burns one Evasive Charge. Lasts 30 sec. or until all charges are exhausted. + //you do not have acces to until you kill Mage-Lord Urom + SPELL_RUBY_MARTYR = 50253 //Instant - 10 sec. cooldown - Redirect all harmful spells cast at friendly drakes to yourself for 10 sec. +}; +/*Amber Drake, +(npc 27755) (item 37859) +(summoned by spell Amber Essence = 37859 ---> Call Amber Drake == 49461 ---> Summon 27755) +*/ +enum AmberDrake +{ + NPC_AMBER_DRAKE_VEHICLE = 27755, + SPELL_RIDE_AMBER_DRAKE_QUE = 49459, //Apply Aura: Periodic Trigger, Interval: 3 seconds ---> 49460 + SPELL_AMBER_DRAKE_SADDLE = 49460, //Allows you to ride on the back of an Amber Drake. ---> Dummy + SPELL_AMBER_SHOCK_LANCE = 49840, //(60 yds) - Instant - Deals 4822 to 5602 Arcane damage and detonates all Shock Charges on an enemy dragon. Damage is increased by 6525 for each detonated. +// SPELL_AMBER_STOP_TIME //Instant - 1 min cooldown - Halts the passage of time, freezing all enemy dragons in place for 10 sec. This attack applies 5 Shock Charges to each affected target. + //you do not have access to until you kill the Mage-Lord Urom. + SPELL_AMBER_TEMPORAL_RIFT = 49592 //(60 yds) - Channeled - Channels a temporal rift on an enemy dragon for 10 sec. While trapped in the rift, all damage done to the target is increased by 100%. In addition, for every 15,000 damage done to a target affected by Temporal Rift, 1 Shock Charge is generated. +}; +/*Emerald Drake, +(npc 27692) (item 37815), + (summoned by spell Emerald Essence = 37815 ---> Call Emerald Drake == 49345 ---> Summon 27692) +*/ +enum EmeraldDrake +{ + NPC_EMERALD_DRAKE_VEHICLE = 27692, + SPELL_RIDE_EMERALD_DRAKE_QUE = 49427, //Apply Aura: Periodic Trigger, Interval: 3 seconds ---> 49346 + SPELL_EMERALD_DRAKE_SADDLE = 49346, //Allows you to ride on the back of an Amber Drake. ---> Dummy + SPELL_EMERALD_LEECHING_POISON = 50328, //(60 yds) - Instant - Poisons the enemy dragon, leeching 1300 to the caster every 2 sec. for 12 sec. Stacks up to 3 times. + SPELL_EMERALD_TOUCH_THE_NIGHTMARE = 50341, //(60 yds) - Instant - Consumes 30% of the caster's max health to inflict 25,000 nature damage to an enemy dragon and reduce the damage it deals by 25% for 30 sec. + // you do not have access to until you kill the Mage-Lord Urom + SPELL_EMERALD_DREAM_FUNNEL = 50344 //(60 yds) - Channeled - Transfers 5% of the caster's max health to a friendly drake every second for 10 seconds as long as the caster channels. +}; + +struct boss_eregosAI : public ScriptedAI +{ + boss_eregosAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + } + + ScriptedInstance* pInstance; + + void Reset() + { + if (pInstance) + pInstance->SetData(DATA_EREGOS_EVENT, NOT_STARTED); + } + + void EnterCombat(Unit* /*who*/) + { + if (pInstance) + pInstance->SetData(DATA_EREGOS_EVENT, IN_PROGRESS); + } + + void AttackStart(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} + void UpdateAI(const uint32 /*diff*/) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + DoMeleeAttackIfReady(); + } + + void JustDied(Unit* /*killer*/) + { + if (pInstance) + pInstance->SetData(DATA_EREGOS_EVENT, DONE); + } +}; + +CreatureAI* GetAI_boss_eregos(Creature* pCreature) +{ + return new boss_eregosAI (pCreature); +} + +void AddSC_boss_eregos() +{ + Script *newscript; + + newscript = new Script; + newscript->Name = "boss_eregos"; + newscript->GetAI = &GetAI_boss_eregos; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp new file mode 100644 index 00000000000..29435441d00 --- /dev/null +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp @@ -0,0 +1,356 @@ +/* Copyright (C) 2008 - 2010 TrinityCore +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +/* ScriptData +SDName: Urom +SD%Complete: 80 +SDComment: Is not working SPELL_ARCANE_SHIELD. SPELL_FROSTBOMB has some issues, the damage aura should not stack. +SDCategory: Instance Script +EndScriptData */ + +#include "ScriptedPch.h" +#include "oculus.h" + +enum Spells +{ + + SPELL_ARCANE_SHIELD = 53813, //Dummy --> Channeled, shields the caster from damage. + SPELL_EMPOWERED_ARCANE_EXPLOSION = 51110, + SPELL_EMPOWERED_ARCANE_EXPLOSION_2 = 59377, + SPELL_FROSTBOMB = 51103, //Urom throws a bomb, hitting its target with the highest aggro which inflict directly 650 frost damage and drops a frost zone on the ground. This zone deals 650 frost damage per second and reduce the movement speed by 35%. Lasts 1 minute. + SPELL_SUMMON_MENAGERIE = 50476, //Summons an assortment of creatures and teleports the caster to safety. + SPELL_SUMMON_MENAGERIE_2 = 50495, + SPELL_SUMMON_MENAGERIE_3 = 50496, + SPELL_TELEPORT = 51112, //Teleports to the center of Oculus + SPELL_TIME_BOMB = 51121, //Deals arcane damage to a random player, and after 6 seconds, deals zone damage to nearby equal to the health missing of the target afflicted by the debuff. + SPELL_TIME_BOMB_2 = 59376 +}; + +enum Yells +{ + SAY_AGGRO_1 = -1578000, + SAY_AGGRO_2 = -1578001, + SAY_AGGRO_3 = -1578002, + SAY_AGGRO_4 = -1578003, + SAY_TELEPORT = -1578004, +}; + +enum eCreature +{ + NPC_PHANTASMAL_CLOUDSCRAPER = 27645, + NPC_PHANTASMAL_MAMMOTH = 27642, + NPC_PHANTASMAL_WOLF = 27644, + + NPC_PHANTASMAL_AIR = 27650, + NPC_PHANTASMAL_FIRE = 27651, + NPC_PHANTASMAL_WATER = 27653, + + NPC_PHANTASMAL_MURLOC = 27649, + NPC_PHANTASMAL_NAGAL = 27648, + NPC_PHANTASMAL_OGRE = 27647 +}; + +struct Summons +{ + uint32 uiEntry[4]; +}; + +static Summons Group[]= +{ + {NPC_PHANTASMAL_CLOUDSCRAPER,NPC_PHANTASMAL_CLOUDSCRAPER,NPC_PHANTASMAL_MAMMOTH,NPC_PHANTASMAL_WOLF}, + {NPC_PHANTASMAL_AIR,NPC_PHANTASMAL_AIR,NPC_PHANTASMAL_WATER,NPC_PHANTASMAL_FIRE}, + {NPC_PHANTASMAL_OGRE,NPC_PHANTASMAL_OGRE,NPC_PHANTASMAL_NAGAL,NPC_PHANTASMAL_MURLOC} +}; + +static uint32 TeleportSpells[]= +{ + SPELL_SUMMON_MENAGERIE,SPELL_SUMMON_MENAGERIE_2,SPELL_SUMMON_MENAGERIE_3 +}; + +static int32 SayAggro[]= +{ + SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3,SAY_AGGRO_4 +}; + +struct boss_uromAI : public ScriptedAI +{ + boss_uromAI(Creature* pCreature) : ScriptedAI(pCreature) + { + pInstance = pCreature->GetInstanceData(); + } + + ScriptedInstance* pInstance; + + float x,y; + + bool bCanCast; + bool bCanGoBack; + + uint8 uiGroup[3]; + + uint32 uiTeleportTimer; + uint32 uiArcaneExplosionTimer; + uint32 uiCastArcaneExplosionTimer; + uint32 uiFrostBombTimer; + uint32 uiTimeBombTimer; + + void Reset() + { + if (pInstance && pInstance->GetData(DATA_VAROS_EVENT) != DONE) + DoCast(SPELL_ARCANE_SHIELD); + + if (pInstance) + pInstance->SetData(DATA_UROM_EVENT, NOT_STARTED); + + if (pInstance && pInstance->GetData(DATA_UROM_PLATAFORM) == 0) + { + uiGroup[0] = 0; + uiGroup[1] = 0; + uiGroup[2] = 0; + } + + x,y = 0.0f; + bCanCast = false; + bCanGoBack = false; + + me->GetMotionMaster()->MoveIdle(); + + uiTeleportTimer = urand(30000,35000); + uiArcaneExplosionTimer = 9000; + uiCastArcaneExplosionTimer = 2000; + uiFrostBombTimer = urand(5000,8000); + uiTimeBombTimer = urand(20000,25000); + } + + void EnterCombat(Unit* pWho) + { + if (pInstance) + pInstance->SetData(DATA_UROM_EVENT, IN_PROGRESS); + + SetGroups(); + SummonGroups(); + CastTeleport(); + + if (pInstance && pInstance->GetData(DATA_UROM_PLATAFORM) != 3) + pInstance->SetData(DATA_UROM_PLATAFORM,pInstance->GetData(DATA_UROM_PLATAFORM)+1); + } + + void AttackStart(Unit* pWho) + { + if (!pWho) + return; + + if (me->GetPositionZ() > 518.63) + DoStartNoMovement(pWho); + + if (me->GetPositionZ() < 518.63) + { + if (me->Attack(pWho, true)) + { + DoScriptText(SayAggro[3],me); + + me->SetInCombatWith(pWho); + pWho->SetInCombatWith(me); + + me->GetMotionMaster()->MoveChase(pWho, 0,0); + } + } + } + + void SetGroups() + { + if (!pInstance || pInstance->GetData(DATA_UROM_PLATAFORM) != 0) + return; + + while (uiGroup[0] == uiGroup[1] || uiGroup[0] == uiGroup[2] || uiGroup[1] == uiGroup[2]) + { + uiGroup[0] = urand(0,2); + uiGroup[1] = urand(0,2); + uiGroup[2] = urand(0,2); + } + } + + void SetPosition(uint8 uiI) + { + switch(uiI) + { + case 0: + x = me->GetPositionX() + 4; + y = me->GetPositionY() - 4; + break; + case 1: + x = me->GetPositionX() + 4; + y = me->GetPositionY() + 4; + break; + case 2: + x = me->GetPositionX() - 4; + y = me->GetPositionY() + 4; + break; + case 3: + x = me->GetPositionX() - 4; + y = me->GetPositionY() - 4; + break; + default: + break; + } + } + + void SummonGroups() + { + if (!pInstance || pInstance->GetData(DATA_UROM_PLATAFORM) > 2) + return; + + for (uint8 uiI = 0; uiI < 4 ; uiI++) + { + SetPosition(uiI); + me->SummonCreature(Group[uiGroup[pInstance->GetData(DATA_UROM_PLATAFORM)]].uiEntry[uiI],x,y,me->GetPositionZ(),me->GetOrientation()); + } + } + + void CastTeleport() + { + if (!pInstance || pInstance->GetData(DATA_UROM_PLATAFORM) > 2) + return; + + DoScriptText(SayAggro[pInstance->GetData(DATA_UROM_PLATAFORM)],me); + DoCast(TeleportSpells[pInstance->GetData(DATA_UROM_PLATAFORM)]); + } + + void UpdateAI(const uint32 uiDiff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + if (!pInstance || pInstance->GetData(DATA_UROM_PLATAFORM) < 2) + return; + + if (uiTeleportTimer <= uiDiff) + { + me->InterruptNonMeleeSpells(false); + DoScriptText(SAY_TELEPORT,me); + me->GetMotionMaster()->MoveIdle(); + DoCast(SPELL_TELEPORT); + uiTeleportTimer = urand(30000,35000); + + } else uiTeleportTimer -= uiDiff; + + if (bCanCast && !me->FindCurrentSpellBySpellId(SPELL_EMPOWERED_ARCANE_EXPLOSION)) + { + if (uiCastArcaneExplosionTimer <= uiDiff) + { + bCanCast = false; + bCanGoBack = true; + DoCastAOE(SPELL_EMPOWERED_ARCANE_EXPLOSION); + uiCastArcaneExplosionTimer = 2000; + }else uiCastArcaneExplosionTimer -= uiDiff; + } + + if (bCanGoBack) + { + if (uiArcaneExplosionTimer <= uiDiff) + { + Position pPos; + me->getVictim()->GetPosition(&pPos); + + me->NearTeleportTo(pPos.GetPositionX(),pPos.GetPositionY(),pPos.GetPositionZ(),pPos.GetOrientation()); + me->GetMotionMaster()->MoveChase(me->getVictim(),0,0); + me->SetUnitMovementFlags(MOVEMENTFLAG_WALK_MODE); + + bCanCast = false; + bCanGoBack = false; + uiArcaneExplosionTimer = 9000; + } else uiArcaneExplosionTimer -= uiDiff; + } + + if (!me->IsNonMeleeSpellCasted(false, true, true)) + { + if (uiFrostBombTimer <= uiDiff) + { + DoCastVictim(SPELL_FROSTBOMB); + uiFrostBombTimer = urand(5000,8000); + } else uiFrostBombTimer -= uiDiff; + + if (uiTimeBombTimer <= uiDiff) + { + if (Unit* pUnit = SelectTarget(SELECT_TARGET_RANDOM)) + DoCast(pUnit,SPELL_TIME_BOMB); + + uiTimeBombTimer = urand(20000,25000); + } else uiTimeBombTimer -= uiDiff; + } + + DoMeleeAttackIfReady(); + } + + void JustDied(Unit* /*killer*/) + { + if (pInstance) + pInstance->SetData(DATA_UROM_EVENT, DONE); + } + + void JustSummoned(Creature* pSummon) + { + pSummon->SetInCombatWithZone(); + } + + void LeaveCombat() + { + me->RemoveAllAuras(); + me->CombatStop(false); + me->DeleteThreatList(); + } + + void SpellHit(Unit* pCaster, const SpellEntry* pSpell) + { + switch(pSpell->Id) + { + case SPELL_SUMMON_MENAGERIE: + me->SetHomePosition(968.66,1042.53,527.32,0.077); + LeaveCombat(); + break; + case SPELL_SUMMON_MENAGERIE_2: + me->SetHomePosition(1164.02,1170.85,527.321,3.66); + LeaveCombat(); + break; + case SPELL_SUMMON_MENAGERIE_3: + me->SetHomePosition(1118.31,1080.377,508.361,4.25); + LeaveCombat(); + break; + case SPELL_TELEPORT: + me->AddUnitMovementFlag(MOVEMENTFLAG_FLY_MODE); // with out it the npc will fall down while is casting + bCanCast = true; + break; + default: + break; + } + } +}; + +CreatureAI* GetAI_boss_urom(Creature* pCreature) +{ + return new boss_uromAI (pCreature); +} + +void AddSC_boss_urom() +{ + Script* newscript; + + newscript = new Script; + newscript->Name = "boss_urom"; + newscript->GetAI = &GetAI_boss_urom; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp new file mode 100644 index 00000000000..79034250a43 --- /dev/null +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp @@ -0,0 +1,105 @@ +/* Copyright (C) 2008 - 2010 TrinityCore +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +#include "ScriptedPch.h" +#include "oculus.h" + +enum Spells +{ + SPELL_ENERGIZE_CORES = 50785, //Damage 5938 to 6562, effec2 Triggers 54069, effect3 Triggers 56251 + SPELL_ENERGIZE_CORES_TRIGGER_1 = 54069, + SPELL_ENERGIZE_CORES_TRIGGER_2 = 56251, + SPELL_ENERGIZE_CORES_2 = 59372, //Damage 9025 to 9975, effect2 Triggers 54069, effect 56251 + SPELL_CALL_AZURE_RING_CAPTAIN = 51002, //Effect Send Event (12229) + SPELL_CALL_AZURE_RING_CAPTAIN_2 = 51006, //Effect Send Event (10665) + SPELL_CALL_AZURE_RING_CAPTAIN_3 = 51007, //Effect Send Event (18454) + SPELL_CALL_AZURE_RING_CAPTAIN_4 = 51008, //Effect Send Event (18455) + SPELL_CALL_AMPLIFY_MAGIC = 51054, + SPELL_CALL_AMPLIFY_MAGIC_2 = 59371 +}; +//not in db +enum Yells +{ + SAY_AGGRO = -1578022, + SAY_KILL_1 = -1578023, + SAY_KILL_2 = -1578024, + SAY_DEATH = -1578025, + SAY_STRIKE_1 = -1578026, + SAY_STRIKE_2 = -1578027, + SAY_STRIKE_3 = -1578028, + SAY_SPAWN = -1578029 +}; + +struct boss_varosAI : public ScriptedAI +{ + boss_varosAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + } + + ScriptedInstance* pInstance; + + void Reset() + { + if (pInstance) + pInstance->SetData(DATA_VAROS_EVENT, NOT_STARTED); + } + void EnterCombat(Unit* /*who*/) + { + DoScriptText(SAY_AGGRO, me); + + if (pInstance) + pInstance->SetData(DATA_VAROS_EVENT, IN_PROGRESS); + } + void AttackStart(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} + void UpdateAI(const uint32 /*diff*/) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + DoMeleeAttackIfReady(); + } + void JustDied(Unit* /*killer*/) + { + DoScriptText(SAY_DEATH, me); + + if (pInstance) + pInstance->SetData(DATA_VAROS_EVENT, DONE); + } + void KilledUnit(Unit * victim) + { + if (victim == me) + return; + DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2), me); + } +}; + +CreatureAI* GetAI_boss_varos(Creature* pCreature) +{ + return new boss_varosAI (pCreature); +} + +void AddSC_boss_varos() +{ + Script *newscript; + + newscript = new Script; + newscript->Name = "boss_varos"; + newscript->GetAI = &GetAI_boss_varos; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp new file mode 100644 index 00000000000..49be2385a3c --- /dev/null +++ b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp @@ -0,0 +1,205 @@ +/* Copyright (C) 2008 - 2010 TrinityCore +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +#include "ScriptedPch.h" +#include "oculus.h" + +#define MAX_ENCOUNTER 4 + +/* The Occulus encounters: +0 - Drakos the Interrogator +1 - Varos Cloudstrider +2 - Mage-Lord Urom +3 - Ley-Guardian Eregos */ + +struct instance_oculus : public ScriptedInstance +{ + instance_oculus(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; + + uint64 uiDrakos; + uint64 uiVaros; + uint64 uiUrom; + uint64 uiEregos; + + uint8 uiPlataformUrom; + + uint8 m_auiEncounter[MAX_ENCOUNTER]; + std::string str_data; + + std::list GameObjectList; + + void Initialize() + { + uiPlataformUrom = 0; + } + + void OnCreatureCreate(Creature* pCreature, bool /*add*/) + { + switch(pCreature->GetEntry()) + { + case CREATURE_DRAKOS: + uiDrakos = pCreature->GetGUID(); + break; + case CREATURE_VAROS: + uiVaros = pCreature->GetGUID(); + break; + case CREATURE_UROM: + uiUrom = pCreature->GetGUID(); + break; + case CREATURE_EREGOS: + uiEregos = pCreature->GetGUID(); + break; + } + } + + void OnGameObjectCreate(GameObject* pGO, bool bAdd) + { + if (pGO->GetEntry() == GO_DRAGON_CAGE_DOOR) + { + if (DATA_DRAKOS_EVENT == DONE) + pGO->SetGoState(GO_STATE_ACTIVE); + else + pGO->SetGoState(GO_STATE_READY); + + GameObjectList.push_back(pGO->GetGUID()); + } + } + + void SetData(uint32 type, uint32 data) + { + switch(type) + { + case DATA_DRAKOS_EVENT: + m_auiEncounter[0] = data; + if (data == DONE) + OpenCageDoors(); + break; + case DATA_VAROS_EVENT: + m_auiEncounter[1] = data; + break; + case DATA_UROM_EVENT: + m_auiEncounter[2] = data; + break; + case DATA_EREGOS_EVENT: + m_auiEncounter[3] = data; + break; + case DATA_UROM_PLATAFORM: + uiPlataformUrom = data; + break; + } + + if (data == DONE) + SaveToDB(); + } + + uint32 GetData(uint32 type) + { + switch(type) + { + case DATA_DRAKOS_EVENT: return m_auiEncounter[0]; + case DATA_VAROS_EVENT: return m_auiEncounter[1]; + case DATA_UROM_EVENT: return m_auiEncounter[2]; + case DATA_EREGOS_EVENT: return m_auiEncounter[3]; + case DATA_UROM_PLATAFORM: return uiPlataformUrom; + } + + return 0; + } + + uint64 GetData64(uint32 identifier) + { + switch(identifier) + { + case DATA_DRAKOS: return uiDrakos; + case DATA_VAROS: return uiVaros; + case DATA_UROM: return uiUrom; + case DATA_EREGOS: return uiEregos; + } + + return 0; + } + + void OpenCageDoors() + { + if (GameObjectList.empty()) + return; + + for (std::list::const_iterator itr = GameObjectList.begin(); itr != GameObjectList.end(); ++itr) + { + if (GameObject* pGO = instance->GetGameObject(*itr)) + pGO->SetGoState(GO_STATE_ACTIVE); + } + } + + std::string GetSaveData() + { + OUT_SAVE_INST_DATA; + + std::ostringstream saveStream; + saveStream << "T O " << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " " << m_auiEncounter[3]; + + str_data = saveStream.str(); + + OUT_SAVE_INST_DATA_COMPLETE; + return str_data; + } + + void Load(const char* in) + { + if (!in) + { + OUT_LOAD_INST_DATA_FAIL; + return; + } + + OUT_LOAD_INST_DATA(in); + + char dataHead1, dataHead2; + uint16 data0, data1, data2, data3; + + std::istringstream loadStream(in); + loadStream >> dataHead1 >> dataHead2 >> data0 >> data1 >> data2 >> data3; + + if (dataHead1 == 'T' && dataHead2 == 'O') + { + m_auiEncounter[0] = data0; + m_auiEncounter[1] = data1; + m_auiEncounter[2] = data2; + m_auiEncounter[3] = data3; + + for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) + if (m_auiEncounter[i] == IN_PROGRESS) + m_auiEncounter[i] = NOT_STARTED; + + } else OUT_LOAD_INST_DATA_FAIL; + + OUT_LOAD_INST_DATA_COMPLETE; + } +}; + +InstanceData* GetInstanceData_instance_oculus(Map* pMap) +{ + return new instance_oculus(pMap); +} + +void AddSC_instance_oculus() +{ + Script *newscript; + newscript = new Script; + newscript->Name = "instance_oculus"; + newscript->GetInstanceData = &GetInstanceData_instance_oculus; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp new file mode 100644 index 00000000000..685583532d5 --- /dev/null +++ b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp @@ -0,0 +1,174 @@ +/* Copyright (C) 2006 - 2010 TrinityCore +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +#include "ScriptedPch.h" +#include "oculus.h" + +#define GOSSIP_ITEM_DRAKES "So where do we go from here?" +#define GOSSIP_ITEM_BELGARISTRASZ1 "I want to fly on the wings of the Red Flight" +#define GOSSIP_ITEM_BELGARISTRASZ2 "What abilities do Ruby Drakes have?" +#define GOSSIP_ITEM_VERDISA1 "I want to fly on the wings of the Green Flight" +#define GOSSIP_ITEM_VERDISA2 "What abilities do Emerald Drakes have?" +#define GOSSIP_ITEM_ETERNOS1 "I want to fly on the wings of the Bronze Flight" +#define GOSSIP_ITEM_ETERNOS2 "What abilities do Amber Drakes have?" + +#define HAS_ESSENCE(a) ((a)->HasItemCount(ITEM_EMERALD_ESSENCE,1) || (a)->HasItemCount(ITEM_AMBER_ESSENCE,1) || (a)->HasItemCount(ITEM_RUBY_ESSENCE,1)) + +enum Drakes +{ + GOSSIP_TEXTID_DRAKES = 13267, + GOSSIP_TEXTID_BELGARISTRASZ1 = 12916, + GOSSIP_TEXTID_BELGARISTRASZ2 = 13466, + GOSSIP_TEXTID_BELGARISTRASZ3 = 13254, + GOSSIP_TEXTID_VERDISA1 = 1, + GOSSIP_TEXTID_VERDISA2 = 1, + GOSSIP_TEXTID_VERDISA3 = 1, + GOSSIP_TEXTID_ETERNOS1 = 1, + GOSSIP_TEXTID_ETERNOS2 = 1, + GOSSIP_TEXTID_ETERNOS3 = 13256, + + ITEM_EMERALD_ESSENCE = 37815, + ITEM_AMBER_ESSENCE = 37859, + ITEM_RUBY_ESSENCE = 37860, + + NPC_VERDISA = 27657, + NPC_BELGARISTRASZ = 27658, + NPC_ETERNOS = 27659 +}; + +bool GossipHello_npc_oculus_drake(Player* pPlayer, Creature* pCreature) +{ + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); + + if (pCreature->GetInstanceData()->GetData(DATA_DRAKOS_EVENT) == DONE) + { + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_DRAKES, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_DRAKES, pCreature->GetGUID()); + } + + return true; +} + +bool GossipSelect_npc_oculus_drake(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) +{ + switch(pCreature->GetEntry()) + { + case NPC_VERDISA: //Verdisa + switch(uiAction) + { + case GOSSIP_ACTION_INFO_DEF + 1: + if (!HAS_ESSENCE(pPlayer)) + { + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_VERDISA1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_VERDISA2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_VERDISA1, pCreature->GetGUID()); + } + else + { + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_VERDISA2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_VERDISA2, pCreature->GetGUID()); + } + break; + case GOSSIP_ACTION_INFO_DEF + 2: + { + ItemPosCountVec dest; + uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, ITEM_EMERALD_ESSENCE, 1); + if (msg == EQUIP_ERR_OK) + pPlayer->StoreNewItem(dest, ITEM_EMERALD_ESSENCE, true); + pPlayer->CLOSE_GOSSIP_MENU(); + break; + } + case GOSSIP_ACTION_INFO_DEF + 3: + pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_VERDISA3, pCreature->GetGUID()); + break; + } + break; + case NPC_BELGARISTRASZ: //Belgaristrasz + switch(uiAction) + { + case GOSSIP_ACTION_INFO_DEF + 1: + if (!HAS_ESSENCE(pPlayer)) + { + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BELGARISTRASZ1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BELGARISTRASZ2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_BELGARISTRASZ1, pCreature->GetGUID()); + } + else + { + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BELGARISTRASZ2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_BELGARISTRASZ2, pCreature->GetGUID()); + } + break; + case GOSSIP_ACTION_INFO_DEF + 2: + { + ItemPosCountVec dest; + uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, ITEM_RUBY_ESSENCE, 1); + if (msg == EQUIP_ERR_OK) + pPlayer->StoreNewItem(dest, ITEM_RUBY_ESSENCE, true); + pPlayer->CLOSE_GOSSIP_MENU(); + break; + } + case GOSSIP_ACTION_INFO_DEF + 3: + pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_BELGARISTRASZ3, pCreature->GetGUID()); + break; + } + break; + case NPC_ETERNOS: //Eternos + switch(uiAction) + { + case GOSSIP_ACTION_INFO_DEF + 1: + if (!HAS_ESSENCE(pPlayer)) + { + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ETERNOS1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ETERNOS2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_ETERNOS1, pCreature->GetGUID()); + } + else + { + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ETERNOS2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); + pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_ETERNOS2, pCreature->GetGUID()); + } + break; + case GOSSIP_ACTION_INFO_DEF + 2: + { + ItemPosCountVec dest; + uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, ITEM_AMBER_ESSENCE, 1); + if (msg == EQUIP_ERR_OK) + pPlayer->StoreNewItem(dest, ITEM_AMBER_ESSENCE, true); + pPlayer->CLOSE_GOSSIP_MENU(); + break; + } + case GOSSIP_ACTION_INFO_DEF + 3: + pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_ETERNOS3, pCreature->GetGUID()); + break; + } + break; + } + + return true; +} + +void AddSC_oculus() +{ + Script *newscript; + + newscript = new Script; + newscript->Name = "npc_oculus_drake"; + newscript->pGossipHello = &GossipHello_npc_oculus_drake; + newscript->pGossipSelect = &GossipSelect_npc_oculus_drake; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Northrend/Nexus/Oculus/oculus.h b/src/server/scripts/Northrend/Nexus/Oculus/oculus.h new file mode 100644 index 00000000000..b212c9b8b6a --- /dev/null +++ b/src/server/scripts/Northrend/Nexus/Oculus/oculus.h @@ -0,0 +1,34 @@ +#ifndef DEF_OCULUS_H +#define DEF_OCULUS_H + +enum Data +{ + DATA_DRAKOS_EVENT, + DATA_VAROS_EVENT, + DATA_UROM_EVENT, + DATA_EREGOS_EVENT, + DATA_UROM_PLATAFORM +}; + +enum Data64 +{ + DATA_DRAKOS, + DATA_VAROS, + DATA_UROM, + DATA_EREGOS +}; + +enum Bosses +{ + CREATURE_DRAKOS = 27654, + CREATURE_VAROS = 27447, + CREATURE_UROM = 27655, + CREATURE_EREGOS = 27656 +}; + +enum GameObjects +{ + GO_DRAGON_CAGE_DOOR = 193995 +}; + +#endif diff --git a/src/server/scripts/Northrend/TheNexus/eye_of_eternity/boss_malygos.cpp b/src/server/scripts/Northrend/TheNexus/eye_of_eternity/boss_malygos.cpp deleted file mode 100644 index bbb1df2731d..00000000000 --- a/src/server/scripts/Northrend/TheNexus/eye_of_eternity/boss_malygos.cpp +++ /dev/null @@ -1,175 +0,0 @@ -/* Script Data Start -SDName: Boss malygos -SDAuthor: LordVanMartin -SD%Complete: -SDComment: -SDCategory: -Script Data End */ - -/*** SQL START *** -update creature_template set scriptname = '' where entry = ''; -*** SQL END ***/ -#include "ScriptedPch.h" - -//Spells -#define SPELL_ARCANE_BREATH_N 56272 -#define SPELL_ARCANE_BREATH_H 60072 -#define SPELL_ARCANE_PULSE 57432 -#define SPELL_ARCANE_STORM_1 57459 -#define SPELL_ARCANE_STORM_2 61693 -#define SPELL_ARCANE_STORM_3 61694 -#define SPELL_STATIC_FIELD 57430 -#define SPELL_SURGE_OF_POWER_1 56505 -#define SPELL_SURGE_OF_POWER_2 57407 -#define SPELL_SURGE_OF_POWER_3 60936 -#define SPELL_VORTEX 56105 - -//Dragon "mounts" spells in Phase3 -//they use Rugelike energy -#define SPELL_DMOUNT_FLAME_SPIKE 56091 //maybe not accurate -#define SPELL_DMOUNT_ENGULF_IN_FLAMES 61621 -#define SPELL_DMOUNT_REVIVIFY 57090 -#define SPELL_DMOUNT_LIFE_BURST 57143 -#define SPELL_DMOUNT_FLAME_SHIELD 57108 -//#define SPELL_DMOUNT_UNKNOWN XYZ //Increases your drake's flight speed by 500%. - -//not in db -//Yell -//-->Other -#define SAY_ANTI_MAGIC_SHELL -1616000 -#define SAY_BREATH_ATTACK -1616001 -#define SAY_HIGH_DAMAGE_MODE -1616002 -#define SAY_MAGIC_BLAST -1616003 -//--> Generic Spells -#define SAY_GENERIC_SPELL_1 -1616004 -#define SAY_GENERIC_SPELL_2 -1616005 -#define SAY_GENERIC_SPELL_3 -1616006 -#define SAY_DEATH -1616007 -//--> Prefight -#define SAY_PREFIGHT_1 -1616008 -#define SAY_PREFIGHT_2 -1616009 -#define SAY_PREFIGHT_3 -1616010 -#define SAY_PREFIGHT_4 -1616011 -#define SAY_PREFIGHT_5 -1616012 -//--> Phase1 -#define SAY_PHASE1_AGGRO -1616013 -#define SAY_PHASE1_END -1616014 -#define SAY_PHASE1_SLAY_1 -1616015 -#define SAY_PHASE1_SLAY_2 -1616016 -#define SAY_PHASE1_SLAY_3 -1616017 - -//--> Phase2 at 50% HP, - -/*Malygos himself is not targetable during this phase, it will end when the adds he spawns are all killed. However, he does continue to play a part in the encounter. -During this phase he drops anti-magic zones onto the ground the raid MUST stand inside of, it reduces magical damage taken by 50%. They shrink over time, so it's important that your raid moves to each new one he drops. -Throughout the phase, he will deep breath doing ~4k damage per second, unless you are standing inside of the anti-magic zone. -The way the fight works during this phase is there are NPCs riding around on disks in the room. There are two types of mobs, Lords and Scions. -The Lords will move down onto the group, and need to be tanked (They will one-shot a non-tank). After they die, they drop a disk that a raid member can mount onto, which allows them to fly, to attack the Scions that do not come down to the ground. -It is recommended to let melee take the first disks, then ranged. As those mobs die, they also drop disks, which allows the rest of your dps to get onto them. -The Scions will continually cast Arcane Blast on random targets on the floor, which is mitigated by the anti-magic zones. While mounted on a disk, you will not take damage. -After all of the NPCs riding on the disks die, the players on the disks need to dismount as Phase 3 is about to begin.*/ - -//not in db -#define SAY_PHASE2_AGGRO -1616018 -#define SAY_PHASE2_END -1616019 -#define SAY_PHASE2_SLAY_1 -1616020 -#define SAY_PHASE2_SLAY_2 -1616021 -#define SAY_PHASE2_SLAY_3 -1616022 -//--> Phase3 Malygos destroys the floor, encounter continues on dragon "mounts" -#define SAY_PHASE3_INTRO -1616023 -#define SAY_PHASE3_AGGRO -1616024 -#define SAY_PHASE3_SLAY_1 -1616025 -#define SAY_PHASE3_SLAY_2 -1616026 -#define SAY_PHASE3_SLAY_3 -1616027 -#define SAY_PHASE3_BIG_ATTACK -1616028 - -enum -{ - ACHIEV_TIMED_START_EVENT = 20387, -}; - -struct boss_malygosAI : public ScriptedAI -{ - boss_malygosAI(Creature *c) : ScriptedAI(c) - { - instance = me->GetInstanceData(); - } - - InstanceData *instance; - - uint32 phase; - uint32 enrage; - - void Reset() - { - phase = 1; - enrage = 615000; //Source Deadly Boss Mod - - if (instance) - instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); - } - - void EnterCombat(Unit* /*who*/) - { - if (phase == 1) - { - DoScriptText(SAY_PHASE1_AGGRO, me); - if (instance) - instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); - } - - if (phase == 2) - DoScriptText(SAY_PHASE1_AGGRO, me); - if (phase == 3) - DoScriptText(SAY_PHASE1_AGGRO, me); - } - - void UpdateAI(const uint32 /*diff*/) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - if (phase == 1 && HealthBelowPct(50)) { - phase = 2; - //spawn adds - //set malygos unatackable untill all adds spawned dead - //start phase3 - } - - DoMeleeAttackIfReady(); - } - - void JustDied(Unit* /*killer*/) - { - DoScriptText(SAY_DEATH, me); - } - - void KilledUnit(Unit * victim) - { - if (victim == me) - return; - - if (phase == 1) - DoScriptText(RAND(SAY_PHASE1_SLAY_1,SAY_PHASE1_SLAY_2,SAY_PHASE1_SLAY_3), me); - if (phase == 2) - DoScriptText(RAND(SAY_PHASE2_SLAY_1,SAY_PHASE2_SLAY_2,SAY_PHASE2_SLAY_3), me); - if (phase == 3) - DoScriptText(RAND(SAY_PHASE3_SLAY_1,SAY_PHASE3_SLAY_2,SAY_PHASE3_SLAY_3), me); - } -}; - -CreatureAI* GetAI_boss_malygos(Creature* pCreature) -{ - return new boss_malygosAI (pCreature); -} - -void AddSC_boss_malygos() -{ - Script *newscript; - - newscript = new Script; - newscript->Name = "boss_malygos"; - newscript->GetAI = &GetAI_boss_malygos; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Northrend/TheNexus/eye_of_eternity/eye_of_eternity.h b/src/server/scripts/Northrend/TheNexus/eye_of_eternity/eye_of_eternity.h deleted file mode 100644 index caa82a92e95..00000000000 --- a/src/server/scripts/Northrend/TheNexus/eye_of_eternity/eye_of_eternity.h +++ /dev/null @@ -1,4 +0,0 @@ -#ifndef DEF_EYE_OF_ETERNITY_H -#define DEF_EYE_OF_ETERNITY_H - -#endif diff --git a/src/server/scripts/Northrend/TheNexus/eye_of_eternity/instance_eye_of_eternity.cpp b/src/server/scripts/Northrend/TheNexus/eye_of_eternity/instance_eye_of_eternity.cpp deleted file mode 100644 index d93ec415b42..00000000000 --- a/src/server/scripts/Northrend/TheNexus/eye_of_eternity/instance_eye_of_eternity.cpp +++ /dev/null @@ -1,21 +0,0 @@ -#include "ScriptedPch.h" -#include "eye_of_eternity.h" - -struct instance_eye_of_eternity : public ScriptedInstance -{ - instance_eye_of_eternity(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; -}; - -InstanceData* GetInstanceData_instance_eye_of_eternity(Map* pMap) -{ - return new instance_eye_of_eternity(pMap); -} - -void AddSC_instance_eye_of_eternity() -{ - Script *newscript; - newscript = new Script; - newscript->Name = "instance_eye_of_eternity"; - newscript->GetInstanceData = &GetInstanceData_instance_eye_of_eternity; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Northrend/TheNexus/nexus/boss_anomalus.cpp b/src/server/scripts/Northrend/TheNexus/nexus/boss_anomalus.cpp deleted file mode 100644 index 02c39dc1232..00000000000 --- a/src/server/scripts/Northrend/TheNexus/nexus/boss_anomalus.cpp +++ /dev/null @@ -1,253 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * Copyright (C) 2008 - 2010 TrinityCore - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "ScriptedPch.h" -#include "nexus.h" - -enum Spells -{ - //Spells - SPELL_SPARK = 47751, - H_SPELL_SPARK = 57062, - SPELL_RIFT_SHIELD = 47748, - SPELL_CHARGE_RIFT = 47747, //Works wrong (affect players, not rifts) - SPELL_CREATE_RIFT = 47743, //Don't work, using WA - SPELL_ARCANE_ATTRACTION = 57063, //No idea, when it's used -}; - -enum Adds -{ - MOB_CRAZED_MANA_WRAITH = 26746, - MOB_CHAOTIC_RIFT = 26918 -}; -enum Yells -{ - //Yell - SAY_AGGRO = -1576010, - SAY_DEATH = -1576011, - SAY_RIFT = -1576012, - SAY_SHIELD = -1576013 -}; - -enum Achievs -{ - ACHIEV_CHAOS_THEORY = 2037 -}; - -const Position RiftLocation[6] = -{ - {652.64, -273.70, -8.75}, - {634.45, -265.94, -8.44}, - {620.73, -281.17, -9.02}, - {626.10, -304.67, -9.44}, - {639.87, -314.11, -9.49}, - {651.72, -297.44, -9.37} -}; - -struct boss_anomalusAI : public ScriptedAI -{ - boss_anomalusAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - } - - ScriptedInstance* pInstance; - - uint8 Phase; - uint32 uiSparkTimer; - uint32 uiCreateRiftTimer; - uint64 uiChaoticRiftGUID; - - bool bDeadChaoticRift; // needed for achievement: Chaos Theory(2037) - - void Reset() - { - Phase = 0; - uiSparkTimer = 5*IN_MILISECONDS; - uiChaoticRiftGUID = 0; - - bDeadChaoticRift = false; - - if (pInstance) - pInstance->SetData(DATA_ANOMALUS_EVENT, NOT_STARTED); - } - - void EnterCombat(Unit* /*who*/) - { - DoScriptText(SAY_AGGRO, me); - - if (pInstance) - pInstance->SetData(DATA_ANOMALUS_EVENT, IN_PROGRESS); - } - - void JustDied(Unit* /*killer*/) - { - DoScriptText(SAY_DEATH, me); - - if (pInstance) - { - if (IsHeroic() && !bDeadChaoticRift) - pInstance->DoCompleteAchievement(ACHIEV_CHAOS_THEORY); - pInstance->SetData(DATA_ANOMALUS_EVENT, DONE); - } - } - - void UpdateAI(const uint32 diff) - { - if (!UpdateVictim()) - return; - - if (me->GetDistance(me->GetHomePosition()) > 60.0f) - { - //Not blizzlike, hack to avoid an exploit - EnterEvadeMode(); - return; - } - - if (me->HasAura(SPELL_RIFT_SHIELD)) - { - if (uiChaoticRiftGUID) - { - Unit* Rift = Unit::GetUnit((*me), uiChaoticRiftGUID); - if (Rift && Rift->isDead()) - { - me->RemoveAurasDueToSpell(SPELL_RIFT_SHIELD); - uiChaoticRiftGUID = 0; - } - return; - } - } else - uiChaoticRiftGUID = 0; - - if ((Phase == 0) && HealthBelowPct(50)) - { - Phase = 1; - DoScriptText(SAY_SHIELD, me); - DoCast(me, SPELL_RIFT_SHIELD); - Creature* Rift = me->SummonCreature(MOB_CHAOTIC_RIFT, RiftLocation[urand(0,5)], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1*IN_MILISECONDS); - if (Rift) - { - //DoCast(Rift, SPELL_CHARGE_RIFT); - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - Rift->AI()->AttackStart(pTarget); - uiChaoticRiftGUID = Rift->GetGUID(); - DoScriptText(SAY_RIFT , me); - } - } - - - if (uiSparkTimer <= diff) - { - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_SPARK); - uiSparkTimer = 5*IN_MILISECONDS; - } else uiSparkTimer -= diff; - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_boss_anomalus(Creature* pCreature) -{ - return new boss_anomalusAI (pCreature); -} - -enum RiftSpells -{ - SPELL_CHAOTIC_ENERGY_BURST = 47688, - SPELL_CHARGED_CHAOTIC_ENERGY_BURST = 47737, - SPELL_ARCANEFORM = 48019 //Chaotic Rift visual -}; - -struct mob_chaotic_riftAI : public Scripted_NoMovementAI -{ - mob_chaotic_riftAI(Creature *c) : Scripted_NoMovementAI(c) - { - pInstance = c->GetInstanceData(); - } - - ScriptedInstance* pInstance; - - uint32 uiChaoticEnergyBurstTimer; - uint32 uiSummonCrazedManaWraithTimer; - - void Reset() - { - uiChaoticEnergyBurstTimer = 1*IN_MILISECONDS; - uiSummonCrazedManaWraithTimer = 5*IN_MILISECONDS; - //me->SetDisplayId(25206); //For some reason in DB models for ally and horde are different. - //Model for ally (1126) does not show auras. Horde model works perfect. - //Set model to horde number - DoCast(me, SPELL_ARCANEFORM, false); - } - - void JustDied(Unit * /*killer*/) - { - if (Creature* pAnomalus = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_ANOMALUS) : 0)) - CAST_AI(boss_anomalusAI,pAnomalus->AI())->bDeadChaoticRift = true; - } - - void UpdateAI(const uint32 diff) - { - if (!UpdateVictim()) - return; - - if (uiChaoticEnergyBurstTimer <= diff) - { - Unit* pAnomalus = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_ANOMALUS) : 0); - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - if (pAnomalus && pAnomalus->HasAura(SPELL_RIFT_SHIELD)) - DoCast(pTarget, SPELL_CHARGED_CHAOTIC_ENERGY_BURST); - else - DoCast(pTarget, SPELL_CHAOTIC_ENERGY_BURST); - uiChaoticEnergyBurstTimer = 1*IN_MILISECONDS; - } else uiChaoticEnergyBurstTimer -= diff; - - if (uiSummonCrazedManaWraithTimer <= diff) - { - Creature* Wraith = me->SummonCreature(MOB_CRAZED_MANA_WRAITH, me->GetPositionX()+1, me->GetPositionY()+1, me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1*IN_MILISECONDS); - if (Wraith) - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - Wraith->AI()->AttackStart(pTarget); - Unit* Anomalus = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_ANOMALUS) : 0); - if (Anomalus && Anomalus->HasAura(SPELL_RIFT_SHIELD)) - uiSummonCrazedManaWraithTimer = 5*IN_MILISECONDS; - else - uiSummonCrazedManaWraithTimer = 10*IN_MILISECONDS; - } else uiSummonCrazedManaWraithTimer -= diff; - } -}; - -CreatureAI* GetAI_mob_chaotic_rift(Creature* pCreature) -{ - return new mob_chaotic_riftAI (pCreature); -} - -void AddSC_boss_anomalus() -{ - Script *newscript; - - newscript = new Script; - newscript->Name = "boss_anomalus"; - newscript->GetAI = &GetAI_boss_anomalus; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_chaotic_rift"; - newscript->GetAI = &GetAI_mob_chaotic_rift; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Northrend/TheNexus/nexus/boss_keristrasza.cpp b/src/server/scripts/Northrend/TheNexus/nexus/boss_keristrasza.cpp deleted file mode 100644 index ff633c55eac..00000000000 --- a/src/server/scripts/Northrend/TheNexus/nexus/boss_keristrasza.cpp +++ /dev/null @@ -1,247 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * Copyright (C) 2008 - 2010 TrinityCore - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "ScriptedPch.h" -#include "nexus.h" - -enum Spells -{ - //Spells - SPELL_FROZEN_PRISON = 47854, - SPELL_TAIL_SWEEP = 50155, - SPELL_CRYSTAL_CHAINS = 50997, - SPELL_ENRAGE = 8599, - SPELL_CRYSTALFIRE_BREATH = 48096, - H_SPELL_CRYSTALFIRE_BREATH = 57091, - SPELL_CRYSTALIZE = 48179, - SPELL_INTENSE_COLD = 48094, - SPELL_INTENSE_COLD_TRIGGERED = 48095 -}; -enum Yells -{ - //Yell - SAY_AGGRO = -1576040, - SAY_SLAY = -1576041, - SAY_ENRAGE = -1576042, - SAY_DEATH = -1576043, - SAY_CRYSTAL_NOVA = -1576044 -}; -enum Achievements -{ - ACHIEV_INTENSE_COLD = 2036 -}; -enum Misc -{ - DATA_CONTAINMENT_SPHERES = 3 -}; - -struct boss_keristraszaAI : public ScriptedAI -{ - boss_keristraszaAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - } - - ScriptedInstance* pInstance; - - uint32 uiCrystalfireBreathTimer; - uint32 uiCrystalChainsCrystalizeTimer; - uint32 uiTailSweepTimer; - bool bEnrage; - - uint64 auiContainmentSphereGUIDs[DATA_CONTAINMENT_SPHERES]; - - uint32 uiCheckIntenseColdTimer; - bool bMoreThanTwoIntenseCold; // needed for achievement: Intense Cold(2036) - - void Reset() - { - uiCrystalfireBreathTimer = 14*IN_MILISECONDS; - uiCrystalChainsCrystalizeTimer = DUNGEON_MODE(30*IN_MILISECONDS,11*IN_MILISECONDS); - uiTailSweepTimer = 5*IN_MILISECONDS; - bEnrage = false; - - uiCheckIntenseColdTimer = 2*IN_MILISECONDS; - bMoreThanTwoIntenseCold = false; - - me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED); - - RemovePrison(CheckContainmentSpheres()); - - if (pInstance) - pInstance->SetData(DATA_KERISTRASZA_EVENT, NOT_STARTED); - } - - void EnterCombat(Unit* /*who*/) - { - DoScriptText(SAY_AGGRO, me); - DoCastAOE(SPELL_INTENSE_COLD); - - if (pInstance) - pInstance->SetData(DATA_KERISTRASZA_EVENT, IN_PROGRESS); - } - - void JustDied(Unit* /*killer*/) - { - DoScriptText(SAY_DEATH, me); - - if (pInstance) - { - if (IsHeroic() && !bMoreThanTwoIntenseCold) - pInstance->DoCompleteAchievement(ACHIEV_INTENSE_COLD); - pInstance->SetData(DATA_KERISTRASZA_EVENT, DONE); - } - } - - void KilledUnit(Unit * /*victim*/) - { - DoScriptText(SAY_SLAY, me); - } - - bool CheckContainmentSpheres(bool remove_prison = false) - { - if (!pInstance) - return false; - - auiContainmentSphereGUIDs[0] = pInstance->GetData64(ANOMALUS_CONTAINMET_SPHERE); - auiContainmentSphereGUIDs[1] = pInstance->GetData64(ORMOROKS_CONTAINMET_SPHERE); - auiContainmentSphereGUIDs[2] = pInstance->GetData64(TELESTRAS_CONTAINMET_SPHERE); - - GameObject *ContainmentSpheres[DATA_CONTAINMENT_SPHERES]; - - for (uint8 i = 0; i < DATA_CONTAINMENT_SPHERES; ++i) - { - ContainmentSpheres[i] = pInstance->instance->GetGameObject(auiContainmentSphereGUIDs[i]); - if (!ContainmentSpheres[i]) - return false; - if (ContainmentSpheres[i]->GetGoState() != GO_STATE_ACTIVE) - return false; - } - if (remove_prison) - RemovePrison(true); - return true; - } - - void RemovePrison(bool remove) - { - if (remove) - { - me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); - me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - if (me->HasAura(SPELL_FROZEN_PRISON)) - me->RemoveAurasDueToSpell(SPELL_FROZEN_PRISON); - } - else - { - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - DoCast(me, SPELL_FROZEN_PRISON, false); - } - } - - void UpdateAI(const uint32 diff) - { - if (!UpdateVictim()) - return; - - if (uiCheckIntenseColdTimer < diff && !bMoreThanTwoIntenseCold) - { - std::list ThreatList = me->getThreatManager().getThreatList(); - for (std::list::const_iterator itr = ThreatList.begin(); itr != ThreatList.end(); ++itr) - { - Unit *pTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid()); - if (!pTarget || pTarget->GetTypeId() != TYPEID_PLAYER) - continue; - - Aura *AuraIntenseCold = pTarget->GetAura(SPELL_INTENSE_COLD_TRIGGERED); - if (AuraIntenseCold && AuraIntenseCold->GetStackAmount() > 2) - { - bMoreThanTwoIntenseCold = true; - break; - } - } - uiCheckIntenseColdTimer = 2*IN_MILISECONDS; - } else uiCheckIntenseColdTimer -= diff; - - if (!bEnrage && HealthBelowPct(25)) - { - DoScriptText(SAY_ENRAGE, me); - DoCast(me, SPELL_ENRAGE); - bEnrage = true; - } - - if (uiCrystalfireBreathTimer <= diff) - { - DoCast(me->getVictim(), SPELL_CRYSTALFIRE_BREATH); - uiCrystalfireBreathTimer = 14*IN_MILISECONDS; - } else uiCrystalfireBreathTimer -= diff; - - if (uiTailSweepTimer <= diff) - { - DoCast(me, SPELL_TAIL_SWEEP); - uiTailSweepTimer = 5*IN_MILISECONDS; - } else uiTailSweepTimer -= diff; - - if (uiCrystalChainsCrystalizeTimer <= diff) - { - DoScriptText(SAY_CRYSTAL_NOVA, me); - if (IsHeroic()) - DoCast(me, SPELL_CRYSTALIZE); - else if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_CRYSTAL_CHAINS); - uiCrystalChainsCrystalizeTimer = DUNGEON_MODE(30*IN_MILISECONDS,11*IN_MILISECONDS); - } else uiCrystalChainsCrystalizeTimer -= diff; - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_boss_keristrasza(Creature* pCreature) -{ - return new boss_keristraszaAI (pCreature); -} - -bool GOHello_containment_sphere(Player * /*pPlayer*/, GameObject *pGO) -{ - ScriptedInstance *pInstance = pGO->GetInstanceData(); - - Creature *pKeristrasza = Unit::GetCreature(*pGO, pInstance ? pInstance->GetData64(DATA_KERISTRASZA) : 0); - if (pKeristrasza && pKeristrasza->isAlive()) - { - // maybe these are hacks :( - pGO->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); - pGO->SetGoState(GO_STATE_ACTIVE); - - CAST_AI(boss_keristraszaAI, pKeristrasza->AI())->CheckContainmentSpheres(true); - } - return true; -} - -void AddSC_boss_keristrasza() -{ - Script *newscript; - - newscript = new Script; - newscript->Name = "boss_keristrasza"; - newscript->GetAI = &GetAI_boss_keristrasza; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "containment_sphere"; - newscript->pGOHello = &GOHello_containment_sphere; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Northrend/TheNexus/nexus/boss_magus_telestra.cpp b/src/server/scripts/Northrend/TheNexus/nexus/boss_magus_telestra.cpp deleted file mode 100644 index 0bf9fb07bb7..00000000000 --- a/src/server/scripts/Northrend/TheNexus/nexus/boss_magus_telestra.cpp +++ /dev/null @@ -1,327 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * Copyright (C) 2008 - 2010 TrinityCore - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "ScriptedPch.h" -#include "nexus.h" - -enum Spells -{ - SPELL_ICE_NOVA = 47772, - H_SPELL_ICE_NOVA = 56935, - SPELL_FIREBOMB = 47773, - H_SPELL_FIREBOMB = 56934, - SPELL_GRAVITY_WELL = 47756, - SPELL_TELESTRA_BACK = 47714, - - SPELL_FIRE_MAGUS_VISUAL = 47705, - SPELL_FROST_MAGUS_VISUAL = 47706, - SPELL_ARCANE_MAGUS_VISUAL = 47704 -}; -enum Creatures -{ - MOB_FIRE_MAGUS = 26928, - MOB_FROST_MAGUS = 26930, - MOB_ARCANE_MAGUS = 26929 -}; -enum Yells -{ - SAY_AGGRO = -1576000, - SAY_KILL = -1576001, - SAY_DEATH = -1576002, - SAY_MERGE = -1576003, - SAY_SPLIT_1 = -1576004, - SAY_SPLIT_2 = -1576005, -}; -enum Achievements -{ - ACHIEV_SPLIT_PERSONALITY = 2150, - ACHIEV_TIMER = 5*IN_MILISECONDS -}; - -const Position CenterOfRoom = {504.80, 89.07, -16.12, 6.27}; - -struct boss_magus_telestraAI : public ScriptedAI -{ - boss_magus_telestraAI(Creature* c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - } - - ScriptedInstance* pInstance; - - uint64 uiFireMagusGUID; - uint64 uiFrostMagusGUID; - uint64 uiArcaneMagusGUID; - - bool bFireMagusDead; - bool bFrostMagusDead; - bool bArcaneMagusDead; - bool bIsWaitingToAppear; - bool bIsAchievementTimerRunning; - - uint32 uiIsWaitingToAppearTimer; - uint32 uiIceNovaTimer; - uint32 uiFireBombTimer; - uint32 uiGravityWellTimer; - uint32 uiCooldown; - uint32 uiAchievementTimer; - - uint8 Phase; - uint8 uiAchievementProgress; - - void Reset() - { - Phase = 0; - //These times are probably wrong - uiIceNovaTimer = 7*IN_MILISECONDS; - uiFireBombTimer = 0; - uiGravityWellTimer = 15*IN_MILISECONDS; - uiCooldown = 0; - - uiFireMagusGUID = 0; - uiFrostMagusGUID = 0; - uiArcaneMagusGUID = 0; - - uiAchievementProgress = 0; - uiAchievementTimer = 0; - - bIsAchievementTimerRunning = false; - bIsWaitingToAppear = false; - - me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - me->SetVisibility(VISIBILITY_ON); - - if (pInstance) - pInstance->SetData(DATA_MAGUS_TELESTRA_EVENT, NOT_STARTED); - } - - void EnterCombat(Unit* /*who*/) - { - DoScriptText(SAY_AGGRO, me); - - if (pInstance) - pInstance->SetData(DATA_MAGUS_TELESTRA_EVENT, IN_PROGRESS); - } - - void JustDied(Unit* /*killer*/) - { - DoScriptText(SAY_DEATH, me); - - if (pInstance) - { - if (IsHeroic() && uiAchievementProgress == 2) - pInstance->DoCompleteAchievement(ACHIEV_SPLIT_PERSONALITY); - pInstance->SetData(DATA_MAGUS_TELESTRA_EVENT, DONE); - } - } - - void KilledUnit(Unit * /*victim*/) - { - DoScriptText(SAY_KILL, me); - } - - uint64 SplitPersonality(uint32 entry) - { - if (Creature* Summoned = me->SummonCreature(entry, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1*IN_MILISECONDS)) - { - switch (entry) - { - case MOB_FIRE_MAGUS: - { - Summoned->CastSpell(Summoned, SPELL_FIRE_MAGUS_VISUAL, false); - break; - } - case MOB_FROST_MAGUS: - { - Summoned->CastSpell(Summoned, SPELL_FROST_MAGUS_VISUAL, false); - break; - } - case MOB_ARCANE_MAGUS: - { - Summoned->CastSpell(Summoned, SPELL_ARCANE_MAGUS_VISUAL, false); - break; - } - } - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - Summoned->AI()->AttackStart(pTarget); - return Summoned->GetGUID(); - } - return 0; - } - - void SummonedCreatureDespawn(Creature *summon) - { - if (summon->isAlive()) - return; - - if (summon->GetGUID() == uiFireMagusGUID) - { - bFireMagusDead = true; - bIsAchievementTimerRunning = true; - } - else if (summon->GetGUID() == uiFrostMagusGUID) - { - bFrostMagusDead = true; - bIsAchievementTimerRunning = true; - } - else if (summon->GetGUID() == uiArcaneMagusGUID) - { - bArcaneMagusDead = true; - bIsAchievementTimerRunning = true; - } - } - - void UpdateAI(const uint32 diff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - if (bIsWaitingToAppear) - { - me->StopMoving(); - me->AttackStop(); - if (uiIsWaitingToAppearTimer <= diff) - { - me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - bIsWaitingToAppear = false; - } else uiIsWaitingToAppearTimer -= diff; - return; - } - - if ((Phase == 1) ||(Phase == 3)) - { - if (bIsAchievementTimerRunning) - uiAchievementTimer += diff; - if (bFireMagusDead && bFrostMagusDead && bArcaneMagusDead) - { - if (uiAchievementTimer <= ACHIEV_TIMER) - uiAchievementProgress +=1; - me->GetMotionMaster()->Clear(); - me->GetMap()->CreatureRelocation(me, CenterOfRoom.GetPositionX(), CenterOfRoom.GetPositionY(), CenterOfRoom.GetPositionZ(), CenterOfRoom.GetOrientation()); - DoCast(me, SPELL_TELESTRA_BACK); - me->SetVisibility(VISIBILITY_ON); - if (Phase == 1) - Phase = 2; - if (Phase == 3) - Phase = 4; - uiFireMagusGUID = 0; - uiFrostMagusGUID = 0; - uiArcaneMagusGUID = 0; - bIsWaitingToAppear = true; - uiIsWaitingToAppearTimer = 4*IN_MILISECONDS; - DoScriptText(SAY_MERGE, me); - bIsAchievementTimerRunning = false; - uiAchievementTimer = 0; - } - else - return; - } - - if ((Phase == 0) && HealthBelowPct(50)) - { - Phase = 1; - me->CastStop(); - me->RemoveAllAuras(); - me->SetVisibility(VISIBILITY_OFF); - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - uiFireMagusGUID = SplitPersonality(MOB_FIRE_MAGUS); - uiFrostMagusGUID = SplitPersonality(MOB_FROST_MAGUS); - uiArcaneMagusGUID = SplitPersonality(MOB_ARCANE_MAGUS); - bFireMagusDead = false; - bFrostMagusDead = false; - bArcaneMagusDead = false; - DoScriptText(RAND(SAY_SPLIT_1,SAY_SPLIT_2), me); - return; - } - - if (IsHeroic() && (Phase == 2) && HealthBelowPct(10)) - { - Phase = 3; - me->CastStop(); - me->RemoveAllAuras(); - me->SetVisibility(VISIBILITY_OFF); - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - uiFireMagusGUID = SplitPersonality(MOB_FIRE_MAGUS); - uiFrostMagusGUID = SplitPersonality(MOB_FROST_MAGUS); - uiArcaneMagusGUID = SplitPersonality(MOB_ARCANE_MAGUS); - bFireMagusDead = false; - bFrostMagusDead = false; - bArcaneMagusDead = false; - DoScriptText(RAND(SAY_SPLIT_1,SAY_SPLIT_2), me); - return; - } - - if (uiCooldown) - { - if (uiCooldown <= diff) - uiCooldown = 0; - else - { - uiCooldown -= diff; - return; - } - } - - if (uiIceNovaTimer <= diff) - { - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - { - DoCast(pTarget, SPELL_ICE_NOVA, false); - uiCooldown = 1.5*IN_MILISECONDS; - } - uiIceNovaTimer = 15*IN_MILISECONDS; - } else uiIceNovaTimer -= diff; - - if (uiGravityWellTimer <= diff) - { - if (Unit *pTarget = me->getVictim()) - { - DoCast(pTarget, SPELL_GRAVITY_WELL); - uiCooldown = 6*IN_MILISECONDS; - } - uiGravityWellTimer = 15*IN_MILISECONDS; - } else uiGravityWellTimer -= diff; - - if (uiFireBombTimer <= diff) - { - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - { - DoCast(pTarget, SPELL_FIREBOMB, false); - uiCooldown = 2*IN_MILISECONDS; - } - uiFireBombTimer = 2*IN_MILISECONDS; - } else uiFireBombTimer -=diff; - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_boss_magus_telestra(Creature* pCreature) -{ - return new boss_magus_telestraAI (pCreature); -} - -void AddSC_boss_magus_telestra() -{ - Script *newscript; - - newscript = new Script; - newscript->Name = "boss_magus_telestra"; - newscript->GetAI = &GetAI_boss_magus_telestra; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Northrend/TheNexus/nexus/boss_ormorok.cpp b/src/server/scripts/Northrend/TheNexus/nexus/boss_ormorok.cpp deleted file mode 100644 index 1304f95c7ac..00000000000 --- a/src/server/scripts/Northrend/TheNexus/nexus/boss_ormorok.cpp +++ /dev/null @@ -1,298 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * Copyright (C) 2008 - 2010 TrinityCore - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "ScriptedPch.h" -#include "nexus.h" - -enum Spells -{ - SPELL_CRYSTAL_SPIKES = 47958, //Don't work, using walkaround - H_SPELL_CRYSTAL_SPIKES = 57082, //Don't work, using walkaround - SPELL_CRYSTALL_SPIKE_DAMAGE = 47944, - H_SPELL_CRYSTALL_SPIKE_DAMAGE = 57067, - SPELL_CRYSTAL_SPIKE_PREVISUAL = 50442, - MOB_CRYSTAL_SPIKE = 27099, - SPELL_SPELL_REFLECTION = 47981, - SPELL_TRAMPLE = 48016, - H_SPELL_TRAMPLE = 57066, - SPELL_FRENZY = 48017, - SPELL_SUMMON_CRYSTALLINE_TANGLER = 61564, //summons npc 32665 - SPELL_ROOTS = 28858 //proper spell id is unknown -}; -enum Yells -{ - SAY_AGGRO = -1576020, - SAY_DEATH = -1576021, - SAY_REFLECT = -1576022, - SAY_CRYSTAL_SPIKES = -1576023, - SAY_KILL = -1576024 -}; -enum Creatures -{ - MOB_CRYSTALLINE_TANGLER = 32665 -}; - -#define SPIKE_DISTANCE 5.0f - -struct boss_ormorokAI : public ScriptedAI -{ - boss_ormorokAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - } - - ScriptedInstance* pInstance; - - bool bFrenzy; - bool bCrystalSpikes; - uint8 uiCrystalSpikesCount; - float fBaseX; - float fBaseY; - float fBaseZ; - float fBaseO; - float fSpikeXY[4][2]; - - uint32 uiCrystalSpikesTimer; - uint32 uiCrystalSpikesTimer2; - uint32 uiTrampleTimer; - uint32 uiFrenzyTimer; - uint32 uiSpellReflectionTimer; - uint32 uiSummonCrystallineTanglerTimer; - - void Reset() - { - uiCrystalSpikesTimer = 12*IN_MILISECONDS; - uiTrampleTimer = 10*IN_MILISECONDS; - uiSpellReflectionTimer = 30*IN_MILISECONDS; - uiSummonCrystallineTanglerTimer = 17*IN_MILISECONDS; - bFrenzy = false; - bCrystalSpikes = false; - - if (pInstance) - pInstance->SetData(DATA_ORMOROK_EVENT, NOT_STARTED); - } - - void EnterCombat(Unit* /*who*/) - { - DoScriptText(SAY_AGGRO, me); - - if (pInstance) - pInstance->SetData(DATA_ORMOROK_EVENT, IN_PROGRESS); - } - - void JustDied(Unit* /*killer*/) - { - DoScriptText(SAY_DEATH, me); - - if (pInstance) - pInstance->SetData(DATA_ORMOROK_EVENT, DONE); - } - - void KilledUnit(Unit * /*victim*/) - { - DoScriptText(SAY_KILL, me); - } - - void UpdateAI(const uint32 diff) - { - if (!UpdateVictim()) - { - return; - } - if (bCrystalSpikes) - if (uiCrystalSpikesTimer2 <= diff) - { - fSpikeXY[0][0] = fBaseX+(SPIKE_DISTANCE*uiCrystalSpikesCount*cos(fBaseO)); - fSpikeXY[0][1] = fBaseY+(SPIKE_DISTANCE*uiCrystalSpikesCount*sin(fBaseO)); - fSpikeXY[1][0] = fBaseX-(SPIKE_DISTANCE*uiCrystalSpikesCount*cos(fBaseO)); - fSpikeXY[1][1] = fBaseY-(SPIKE_DISTANCE*uiCrystalSpikesCount*sin(fBaseO)); - fSpikeXY[2][0] = fBaseX+(SPIKE_DISTANCE*uiCrystalSpikesCount*cos(fBaseO-(M_PI/2))); - fSpikeXY[2][1] = fBaseY+(SPIKE_DISTANCE*uiCrystalSpikesCount*sin(fBaseO-(M_PI/2))); - fSpikeXY[3][0] = fBaseX-(SPIKE_DISTANCE*uiCrystalSpikesCount*cos(fBaseO-(M_PI/2))); - fSpikeXY[3][1] = fBaseY-(SPIKE_DISTANCE*uiCrystalSpikesCount*sin(fBaseO-(M_PI/2))); - for (uint8 i = 0; i < 4; ++i) - me->SummonCreature(MOB_CRYSTAL_SPIKE, fSpikeXY[i][0], fSpikeXY[i][1], fBaseZ, 0, TEMPSUMMON_TIMED_DESPAWN, 7*IN_MILISECONDS); - if (++uiCrystalSpikesCount >= 13) - bCrystalSpikes = false; - uiCrystalSpikesTimer2 = 200; - } else uiCrystalSpikesTimer2 -= diff; - - if (!bFrenzy && (me->GetHealth() < me->GetMaxHealth() * 0.25)) - { - DoCast(me, SPELL_FRENZY); - bFrenzy = true; - } - - if (uiTrampleTimer <= diff) - { - DoCast(me, SPELL_TRAMPLE); - uiTrampleTimer = 10*IN_MILISECONDS; - } else uiTrampleTimer -= diff; - - if (uiSpellReflectionTimer <= diff) - { - DoScriptText(SAY_REFLECT, me); - DoCast(me, SPELL_SPELL_REFLECTION); - uiSpellReflectionTimer = 30*IN_MILISECONDS; - } else uiSpellReflectionTimer -= diff; - - if (uiCrystalSpikesTimer <= diff) - { - DoScriptText(SAY_CRYSTAL_SPIKES, me); - bCrystalSpikes = true; - uiCrystalSpikesCount = 1; - uiCrystalSpikesTimer2 = 0; - fBaseX = me->GetPositionX(); - fBaseY = me->GetPositionY(); - fBaseZ = me->GetPositionZ(); - fBaseO = me->GetOrientation(); - uiCrystalSpikesTimer = 20*IN_MILISECONDS; - } else uiCrystalSpikesTimer -= diff; - - if (IsHeroic() && (uiSummonCrystallineTanglerTimer <= diff)) - { - Creature* Crystalline_Tangler = me->SummonCreature(MOB_CRYSTALLINE_TANGLER, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1000); - if (Crystalline_Tangler) - { - Unit *pTarget = NULL; - uint8 Healer = 0; - for (uint8 j = 1; j <= 4; j++) - { - switch (j) - { - case 1: Healer = CLASS_PRIEST; break; - case 2: Healer = CLASS_PALADIN; break; - case 3: Healer = CLASS_DRUID; break; - case 4: Healer = CLASS_SHAMAN; break; - } - std::list::const_iterator i = me->getThreatManager().getThreatList().begin(); - for (; i != me->getThreatManager().getThreatList().end(); ++i) - { - Unit* pTemp = Unit::GetUnit((*me),(*i)->getUnitGuid()); - if (pTemp && pTemp->GetTypeId() == TYPEID_PLAYER && pTemp->getClass() == Healer) - { - pTarget = pTemp; - break; - } - } - if (pTarget) - break; - } - if (!pTarget) - pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); - if (pTarget) - { - Crystalline_Tangler->AI()->AttackStart(pTarget); - Crystalline_Tangler->getThreatManager().addThreat(pTarget, 1000000000.0f); - } - } - uiSummonCrystallineTanglerTimer = 17*IN_MILISECONDS; - } else uiSummonCrystallineTanglerTimer -= diff; - - DoMeleeAttackIfReady(); - } -}; - -struct mob_crystal_spikeAI : public Scripted_NoMovementAI -{ - mob_crystal_spikeAI(Creature *c) : Scripted_NoMovementAI(c) - { - } - - uint32 SpellCrystalSpikeDamageTimer; - uint32 SpellCrystalSpikePrevisualTimer; - - void Reset() - { - SpellCrystalSpikeDamageTimer = 3.7*IN_MILISECONDS; - SpellCrystalSpikePrevisualTimer = 1*IN_MILISECONDS; - } - - void UpdateAI(const uint32 diff) - { - if (SpellCrystalSpikePrevisualTimer <= diff) - { - DoCast(me, SPELL_CRYSTAL_SPIKE_PREVISUAL); - SpellCrystalSpikePrevisualTimer = 10*IN_MILISECONDS; - } else SpellCrystalSpikePrevisualTimer -= diff; - - if (SpellCrystalSpikeDamageTimer <= diff) - { - DoCast(me, SPELL_CRYSTALL_SPIKE_DAMAGE); - SpellCrystalSpikeDamageTimer = 10*IN_MILISECONDS; - } else SpellCrystalSpikeDamageTimer -= diff; - } -}; - -struct mob_crystalline_tanglerAI : public ScriptedAI -{ - mob_crystalline_tanglerAI(Creature *c) : ScriptedAI(c) {} - - uint32 uiRootsTimer; - - void Reset() - { - uiRootsTimer = 1*IN_MILISECONDS; - } - - void UpdateAI(const uint32 diff) - { - if (uiRootsTimer <= diff) - { - if (me->IsWithinDist(me->getVictim(), 5.0f, false)) - { - DoCast(me->getVictim(), SPELL_ROOTS); - uiRootsTimer = 15*IN_MILISECONDS; - } - } else uiRootsTimer -= diff; - } -}; - -CreatureAI* GetAI_mob_crystal_spike(Creature* pCreature) -{ - return new mob_crystal_spikeAI (pCreature); -} - -CreatureAI* GetAI_mob_crystalline_tangler(Creature* pCreature) -{ - return new mob_crystalline_tanglerAI (pCreature); -} - -CreatureAI* GetAI_boss_ormorok(Creature* pCreature) -{ - return new boss_ormorokAI (pCreature); -} - -void AddSC_boss_ormorok() -{ - Script *newscript; - - newscript = new Script; - newscript->Name = "boss_ormorok"; - newscript->GetAI = &GetAI_boss_ormorok; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_crystal_spike"; - newscript->GetAI = &GetAI_mob_crystal_spike; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_crystalline_tangler"; - newscript->GetAI = &GetAI_mob_crystalline_tangler; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Northrend/TheNexus/nexus/commander_kolurg.cpp b/src/server/scripts/Northrend/TheNexus/nexus/commander_kolurg.cpp deleted file mode 100644 index 4bd9f55a013..00000000000 --- a/src/server/scripts/Northrend/TheNexus/nexus/commander_kolurg.cpp +++ /dev/null @@ -1,58 +0,0 @@ -/* Script Data Start -SDName: Boss Commander Kolurg -SDAuthor: LordVanMartin -SD%Complete: -SDComment: Only Alliance Heroic -SDCategory: -Script Data End */ - -/*** SQL START *** -update creature_template set scriptname = 'boss_commander_kolurg' where entry = ''; -*** SQL END ***/ -#include "ScriptedPch.h" - -#define SPELL_BATTLE_SHOUT 31403 -#define SPELL_CHARGE 60067 -#define SPELL_FRIGHTENING_SHOUT 19134 -#define SPELL_WHIRLWIND_1 38619 -#define SPELL_WHIRLWIND_2 38618 - -//not used -//Yell -#define SAY_AGGRO -1576024 -#define SAY_KILL -1576025 -#define SAY_DEATH -1576026 - -struct boss_commander_kolurgAI : public ScriptedAI -{ - boss_commander_kolurgAI(Creature *c) : ScriptedAI(c) {} - - void Reset() {} - void EnterCombat(Unit* /*who*/) {} - void AttackStart(Unit* /*who*/) {} - void MoveInLineOfSight(Unit* /*who*/) {} - void UpdateAI(const uint32 /*diff*/) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - DoMeleeAttackIfReady(); - } - void JustDied(Unit* /*killer*/) {} -}; - -CreatureAI* GetAI_boss_commander_kolurg(Creature* pCreature) -{ - return new boss_commander_kolurgAI (pCreature); -} - -void AddSC_boss_commander_kolurg() -{ - Script *newscript; - - newscript = new Script; - newscript->Name = "boss_commander_kolurg"; - newscript->GetAI = &GetAI_boss_commander_kolurg; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Northrend/TheNexus/nexus/commander_stoutbeard.cpp b/src/server/scripts/Northrend/TheNexus/nexus/commander_stoutbeard.cpp deleted file mode 100644 index ef02baa38e6..00000000000 --- a/src/server/scripts/Northrend/TheNexus/nexus/commander_stoutbeard.cpp +++ /dev/null @@ -1,64 +0,0 @@ -/* Script Data Start -SDName: Boss Commander Stoutbeard -SDAuthor: LordVanMartin -SD%Complete: -SDComment: Only Horde Heroic -SDCategory: -Script Data End */ - -/*** SQL START *** -update creature_template set scriptname = 'boss_commander_stoutbeard' where entry = ''; -*** SQL END ***/ -#include "ScriptedPch.h" - -#define SPELL_BATTLE_SHOUT 31403 -#define SPELL_CHARGE 60067 -#define SPELL_FRIGHTENING_SHOUT 19134 -#define SPELL_WHIRLWIND_1 38619 -#define SPELL_WHIRLWIND_2 38618 - -//not used -//Yell -#define SAY_AGGRO -1576021 -#define SAY_KILL -1576022 -#define SAY_DEATH -1576023 - -struct boss_commander_stoutbeardAI : public ScriptedAI -{ - boss_commander_stoutbeardAI(Creature *c) : ScriptedAI(c) {} - - void Reset() {} - void EnterCombat(Unit* /*who*/) - { - DoScriptText(SAY_AGGRO, me); - } - void AttackStart(Unit* /*who*/) {} - void MoveInLineOfSight(Unit* /*who*/) {} - void UpdateAI(const uint32 /*diff*/) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - DoMeleeAttackIfReady(); - } - void JustDied(Unit* /*killer*/) - { - DoScriptText(SAY_DEATH, me); - } -}; - -CreatureAI* GetAI_boss_commander_stoutbeard(Creature* pCreature) -{ - return new boss_commander_stoutbeardAI (pCreature); -} - -void AddSC_boss_commander_stoutbeard() -{ - Script *newscript; - - newscript = new Script; - newscript->Name = "boss_commander_stoutbeard"; - newscript->GetAI = &GetAI_boss_commander_stoutbeard; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Northrend/TheNexus/nexus/instance_nexus.cpp b/src/server/scripts/Northrend/TheNexus/nexus/instance_nexus.cpp deleted file mode 100644 index db70245e3a4..00000000000 --- a/src/server/scripts/Northrend/TheNexus/nexus/instance_nexus.cpp +++ /dev/null @@ -1,259 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * Copyright (C) 2008 - 2010 TrinityCore - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "ScriptedPch.h" -#include "nexus.h" - -#define NUMBER_OF_ENCOUNTERS 4 - -enum Factions -{ - FACTION_HOSTILE_FOR_ALL = 16 -}; - -struct instance_nexus : public ScriptedInstance -{ - instance_nexus(Map *pMap) : ScriptedInstance(pMap) { Initialize(); } - - uint32 m_auiEncounter[NUMBER_OF_ENCOUNTERS]; - - uint64 Anomalus; - uint64 Keristrasza; - - uint64 AnomalusContainmentSphere; - uint64 OrmoroksContainmentSphere; - uint64 TelestrasContainmentSphere; - - std::string strInstData; - - void Initialize() - { - memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); - - Anomalus = 0; - Keristrasza = 0; - } - - void OnCreatureCreate(Creature *pCreature, bool /*bAdd*/) - { - Map::PlayerList const &players = instance->GetPlayers(); - uint32 TeamInInstance = 0; - - if (!players.isEmpty()) - { - if (Player* pPlayer = players.begin()->getSource()) - TeamInInstance = pPlayer->GetTeam(); - } - switch (pCreature->GetEntry()) - { - case 26763: - Anomalus = pCreature->GetGUID(); - break; - case 26723: - Keristrasza = pCreature->GetGUID(); - break; - // Alliance npcs are spawned by default, if you are alliance, you will fight against horde npcs. - case 26800: - { - if (ServerAllowsTwoSideGroups()) - pCreature->setFaction(FACTION_HOSTILE_FOR_ALL); - if (TeamInInstance == ALLIANCE) - pCreature->UpdateEntry(26799, HORDE); - break; - } - case 26802: - { - if (ServerAllowsTwoSideGroups()) - pCreature->setFaction(FACTION_HOSTILE_FOR_ALL); - if (TeamInInstance == ALLIANCE) - pCreature->UpdateEntry(26801, HORDE); - break; - } - case 26805: - { - if (ServerAllowsTwoSideGroups()) - pCreature->setFaction(FACTION_HOSTILE_FOR_ALL); - if (TeamInInstance == ALLIANCE) - pCreature->UpdateEntry(26803, HORDE); - break; - } - case 27949: - { - if (ServerAllowsTwoSideGroups()) - pCreature->setFaction(FACTION_HOSTILE_FOR_ALL); - if (TeamInInstance == ALLIANCE) - pCreature->UpdateEntry(27947, HORDE); - break; - } - case 26796: - { - if (ServerAllowsTwoSideGroups()) - pCreature->setFaction(FACTION_HOSTILE_FOR_ALL); - if (TeamInInstance == ALLIANCE) - pCreature->UpdateEntry(26798, HORDE); - break; - } - } - } - - void OnGameObjectCreate(GameObject *pGo, bool /*bAdd*/) - { - switch (pGo->GetEntry()) - { - case 188527: - { - AnomalusContainmentSphere = pGo->GetGUID(); - if (m_auiEncounter[1] == DONE) - pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); - break; - } - case 188528: - { - OrmoroksContainmentSphere = pGo->GetGUID(); - if (m_auiEncounter[2] == DONE) - pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); - break; - } - case 188526: - { - TelestrasContainmentSphere = pGo->GetGUID(); - if (m_auiEncounter[0] == DONE) - pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); - break; - } - } - } - - uint32 GetData(uint32 identifier) - { - switch(identifier) - { - case DATA_MAGUS_TELESTRA_EVENT: return m_auiEncounter[0]; - case DATA_ANOMALUS_EVENT: return m_auiEncounter[1]; - case DATA_ORMOROK_EVENT: return m_auiEncounter[2]; - case DATA_KERISTRASZA_EVENT: return m_auiEncounter[3]; - } - return 0; - } - - void SetData(uint32 identifier, uint32 data) - { - switch (identifier) - { - case DATA_MAGUS_TELESTRA_EVENT: - { - if (data == DONE) - { - GameObject *Sphere = instance->GetGameObject(TelestrasContainmentSphere); - if (Sphere) - Sphere->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); - } - m_auiEncounter[0] = data; - break; - } - case DATA_ANOMALUS_EVENT: - { - if (data == DONE) - { - if (GameObject *Sphere = instance->GetGameObject(AnomalusContainmentSphere)) - Sphere->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); - } - m_auiEncounter[1] = data; - break; - } - case DATA_ORMOROK_EVENT: - { - if (data == DONE) - { - if (GameObject *Sphere = instance->GetGameObject(OrmoroksContainmentSphere)) - Sphere->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); - } - m_auiEncounter[2] = data; - break; - } - case DATA_KERISTRASZA_EVENT: - m_auiEncounter[3] = data; - break; - } - - if (data == DONE) - { - OUT_SAVE_INST_DATA; - - std::ostringstream saveStream; - saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " " - << m_auiEncounter[3]; - - strInstData = saveStream.str(); - - SaveToDB(); - OUT_SAVE_INST_DATA_COMPLETE; - } - } - - uint64 GetData64(uint32 uiIdentifier) - { - switch(uiIdentifier) - { - case DATA_ANOMALUS: return Anomalus; - case DATA_KERISTRASZA: return Keristrasza; - case ANOMALUS_CONTAINMET_SPHERE: return AnomalusContainmentSphere; - case ORMOROKS_CONTAINMET_SPHERE: return OrmoroksContainmentSphere; - case TELESTRAS_CONTAINMET_SPHERE: return TelestrasContainmentSphere; - } - return 0; - } - - std::string GetSaveData() - { - return strInstData; - } - - void Load(const char *chrIn) - { - if (!chrIn) - { - OUT_LOAD_INST_DATA_FAIL; - return; - } - - OUT_LOAD_INST_DATA(chrIn); - - std::istringstream loadStream(chrIn); - loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3]; - - for (uint8 i = 0; i < NUMBER_OF_ENCOUNTERS; ++i) - if (m_auiEncounter[i] == IN_PROGRESS) - m_auiEncounter[i] = NOT_STARTED; - - OUT_LOAD_INST_DATA_COMPLETE; - } -}; - -InstanceData *GetInstanceData_instance_nexus(Map *pMap) -{ - return new instance_nexus(pMap); -} - -void AddSC_instance_nexus() -{ - Script *newscript; - newscript = new Script; - newscript->Name = "instance_nexus"; - newscript->GetInstanceData = &GetInstanceData_instance_nexus; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Northrend/TheNexus/nexus/nexus.h b/src/server/scripts/Northrend/TheNexus/nexus/nexus.h deleted file mode 100644 index 66902bece30..00000000000 --- a/src/server/scripts/Northrend/TheNexus/nexus/nexus.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright (C) 2008 - 2010 TrinityCore - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef DEF_NEXUS_H -#define DEF_NEXUS_H - -enum eTypes -{ - DATA_MAGUS_TELESTRA_EVENT, - DATA_ANOMALUS_EVENT, - DATA_ORMOROK_EVENT, - DATA_KERISTRASZA_EVENT, - - DATA_ANOMALUS, - DATA_KERISTRASZA, - - ANOMALUS_CONTAINMET_SPHERE, - ORMOROKS_CONTAINMET_SPHERE, - TELESTRAS_CONTAINMET_SPHERE -}; - -#endif diff --git a/src/server/scripts/Northrend/TheNexus/oculus/boss_drakos.cpp b/src/server/scripts/Northrend/TheNexus/oculus/boss_drakos.cpp deleted file mode 100644 index 7d276206339..00000000000 --- a/src/server/scripts/Northrend/TheNexus/oculus/boss_drakos.cpp +++ /dev/null @@ -1,218 +0,0 @@ -/* Copyright (C) 2008 - 2010 TrinityCore -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ - -#include "ScriptedPch.h" -#include "oculus.h" - -enum Spells -{ - SPELL_MAGIC_PULL = 51336, - SPELL_MAGIC_PULL_EFFECT = 50770, - SPELL_THUNDERING_STOMP = 50774, - SPELL_THUNDERING_STOMP_H = 59370, - SPELL_UNSTABLE_SPHERE_PASSIVE = 50756, - SPELL_UNSTABLE_SPHERE_PULSE = 50757, - SPELL_UNSTABLE_SPHERE_TIMER = 50758, - NPC_UNSTABLE_SPHERE = 28166, -}; - -//not in db -enum Yells -{ - SAY_AGGRO = -1578000, - SAY_KILL_1 = -1578001, - SAY_KILL_2 = -1578002, - SAY_KILL_3 = -1578003, - SAY_DEATH = -1578004, - SAY_PULL_1 = -1578005, - SAY_PULL_2 = -1578006, - SAY_PULL_3 = -1578007, - SAY_PULL_4 = -1578008, - SAY_STOMP_1 = -1578009, - SAY_STOMP_2 = -1578010, - SAY_STOMP_3 = -1578011 -}; - -enum -{ - ACHIEV_TIMED_START_EVENT = 18153, -}; - -struct boss_drakosAI : public ScriptedAI -{ - boss_drakosAI(Creature* pCreature) : ScriptedAI(pCreature), lSummons(me) - { - pInstance = pCreature->GetInstanceData(); - } - - uint32 uiMagicPullTimer; - uint32 uiStompTimer; - uint32 uiBombSummonTimer; - - bool bPostPull; - - ScriptedInstance* pInstance; - SummonList lSummons; - - void Reset() - { - lSummons.DespawnAll(); - uiMagicPullTimer = 15000; - uiStompTimer = 17000; - uiBombSummonTimer = 2000; - - bPostPull = false; - - if (pInstance) - pInstance->SetData(DATA_DRAKOS_EVENT, NOT_STARTED); - } - - void EnterCombat(Unit* /*who*/) - { - DoScriptText(SAY_AGGRO, me); - - if (pInstance) - pInstance->SetData(DATA_DRAKOS_EVENT, IN_PROGRESS); - } - - void JustSummoned(Creature* pSummon) - { - lSummons.Summon(pSummon); - } - - void UpdateAI(const uint32 uiDiff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - if (uiBombSummonTimer <= uiDiff) - { - Position pPosition; - me->GetPosition(&pPosition); - - if (bPostPull) - { - for (uint8 uiI = 0; uiI >= 3; uiI++) - { - me->GetRandomNearPosition(pPosition, float(urand(0,10))); - me->SummonCreature(NPC_UNSTABLE_SPHERE, pPosition); - } - } - else - { - me->GetRandomNearPosition(pPosition, float(urand(0,10))); - me->SummonCreature(NPC_UNSTABLE_SPHERE, pPosition); - } - - uiBombSummonTimer = 2000; - } else uiBombSummonTimer -= uiDiff; - - if (uiMagicPullTimer <= uiDiff) - { - DoCast(SPELL_MAGIC_PULL); - - bPostPull = true; - - uiMagicPullTimer = 15000; - } else uiMagicPullTimer -= uiDiff; - - if (uiStompTimer <= uiDiff) - { - DoScriptText(RAND(SAY_STOMP_1,SAY_STOMP_2,SAY_STOMP_3), me); - DoCast(SPELL_THUNDERING_STOMP); - uiStompTimer = 17000; - } else uiStompTimer -= uiDiff; - - DoMeleeAttackIfReady(); - } - - void JustDied(Unit* /*killer*/) - { - DoScriptText(SAY_DEATH, me); - - if (pInstance) - { - pInstance->SetData(DATA_DRAKOS_EVENT, DONE); - // start achievement timer (kill Eregos within 20 min) - pInstance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); - } - - lSummons.DespawnAll(); - } - void KilledUnit(Unit* /*victim*/) - { - DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2,SAY_KILL_3), me); - } -}; - -CreatureAI* GetAI_boss_drakos(Creature* pCreature) -{ - return new boss_drakosAI (pCreature); -} - -struct npc_unstable_sphereAI : public ScriptedAI -{ - npc_unstable_sphereAI(Creature* pCreature) : ScriptedAI(pCreature) {} - - uint32 uiPulseTimer; - uint32 uiDeathTimer; - - void Reset() - { - me->SetReactState(REACT_PASSIVE); - me->GetMotionMaster()->MoveRandom(40.0f); - - me->AddAura(SPELL_UNSTABLE_SPHERE_PASSIVE, me); - me->AddAura(SPELL_UNSTABLE_SPHERE_TIMER, me); - - uiPulseTimer = 3000; - uiDeathTimer = 19000; - } - - void UpdateAI(const uint32 uiDiff) - { - if (uiPulseTimer <= uiDiff) - { - DoCast(SPELL_UNSTABLE_SPHERE_PULSE); - uiPulseTimer = 3*IN_MILISECONDS; - } else uiPulseTimer -= uiDiff; - - if (uiDeathTimer <= uiDiff) - me->DisappearAndDie(); - else uiDeathTimer -= uiDiff; - } -}; - -CreatureAI* GetAI_npc_unstable_sphere(Creature* pCreature) -{ - return new npc_unstable_sphereAI (pCreature); -} - -void AddSC_boss_drakos() -{ - Script* newscript; - - newscript = new Script; - newscript->Name = "boss_drakos"; - newscript->GetAI = &GetAI_boss_drakos; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "npc_unstable_sphere"; - newscript->GetAI = &GetAI_npc_unstable_sphere; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Northrend/TheNexus/oculus/boss_eregos.cpp b/src/server/scripts/Northrend/TheNexus/oculus/boss_eregos.cpp deleted file mode 100644 index 94fb90ab206..00000000000 --- a/src/server/scripts/Northrend/TheNexus/oculus/boss_eregos.cpp +++ /dev/null @@ -1,129 +0,0 @@ -/* Copyright (C) 2008 - 2010 TrinityCore -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ - -#include "ScriptedPch.h" -#include "oculus.h" - -//Types of drake mounts: Ruby(Tank), Amber(DPS), Emerald(Healer) -//Two Repeating phases - -enum Spells -{ - SPELL_ARCANE_BARRAGE = 50804, - H_SPELL_ARCANE_BARRAGE = 59381, - SPELL_ARCANE_VOLLEY = 51153, - H_SPELL_ARCANE_VOLLEY = 59382, - SPELL_ENRAGED_ASSAULT = 51170, - SPELL_PLANAR_ANOMALIES = 57959, - SPELL_PLANAR_SHIFT = 51162, -}; -/*Ruby Drake , -(npc 27756) (item 37860) -(summoned by spell Ruby Essence = 37860 ---> Call Amber Drake == 49462 ---> Summon 27756) -*/ -enum RubyDrake -{ - NPC_RUBY_DRAKE_VEHICLE = 27756, - SPELL_RIDE_RUBY_DRAKE_QUE = 49463, //Apply Aura: Periodic Trigger, Interval: 3 seconds ---> 49464 - SPELL_RUBY_DRAKE_SADDLE = 49464, //Allows you to ride on the back of an Amber Drake. ---> Dummy - SPELL_RUBY_SEARING_WRATH = 50232, //(60 yds) - Instant - Breathes a stream of fire at an enemy dragon, dealing 6800 to 9200 Fire damage and then jumping to additional dragons within 30 yards. Each jump increases the damage by 50%. Affects up to 5 total targets - SPELL_RUBY_EVASIVE_AURA = 50248, //Instant - Allows the Ruby Drake to generate Evasive Charges when hit by hostile attacks and spells. - SPELL_RUBY_EVASIVE_MANEUVERS = 50240, //Instant - 5 sec. cooldown - Allows your drake to dodge all incoming attacks and spells. Requires Evasive Charges to use. Each attack or spell dodged while this ability is active burns one Evasive Charge. Lasts 30 sec. or until all charges are exhausted. - //you do not have acces to until you kill Mage-Lord Urom - SPELL_RUBY_MARTYR = 50253 //Instant - 10 sec. cooldown - Redirect all harmful spells cast at friendly drakes to yourself for 10 sec. -}; -/*Amber Drake, -(npc 27755) (item 37859) -(summoned by spell Amber Essence = 37859 ---> Call Amber Drake == 49461 ---> Summon 27755) -*/ -enum AmberDrake -{ - NPC_AMBER_DRAKE_VEHICLE = 27755, - SPELL_RIDE_AMBER_DRAKE_QUE = 49459, //Apply Aura: Periodic Trigger, Interval: 3 seconds ---> 49460 - SPELL_AMBER_DRAKE_SADDLE = 49460, //Allows you to ride on the back of an Amber Drake. ---> Dummy - SPELL_AMBER_SHOCK_LANCE = 49840, //(60 yds) - Instant - Deals 4822 to 5602 Arcane damage and detonates all Shock Charges on an enemy dragon. Damage is increased by 6525 for each detonated. -// SPELL_AMBER_STOP_TIME //Instant - 1 min cooldown - Halts the passage of time, freezing all enemy dragons in place for 10 sec. This attack applies 5 Shock Charges to each affected target. - //you do not have access to until you kill the Mage-Lord Urom. - SPELL_AMBER_TEMPORAL_RIFT = 49592 //(60 yds) - Channeled - Channels a temporal rift on an enemy dragon for 10 sec. While trapped in the rift, all damage done to the target is increased by 100%. In addition, for every 15,000 damage done to a target affected by Temporal Rift, 1 Shock Charge is generated. -}; -/*Emerald Drake, -(npc 27692) (item 37815), - (summoned by spell Emerald Essence = 37815 ---> Call Emerald Drake == 49345 ---> Summon 27692) -*/ -enum EmeraldDrake -{ - NPC_EMERALD_DRAKE_VEHICLE = 27692, - SPELL_RIDE_EMERALD_DRAKE_QUE = 49427, //Apply Aura: Periodic Trigger, Interval: 3 seconds ---> 49346 - SPELL_EMERALD_DRAKE_SADDLE = 49346, //Allows you to ride on the back of an Amber Drake. ---> Dummy - SPELL_EMERALD_LEECHING_POISON = 50328, //(60 yds) - Instant - Poisons the enemy dragon, leeching 1300 to the caster every 2 sec. for 12 sec. Stacks up to 3 times. - SPELL_EMERALD_TOUCH_THE_NIGHTMARE = 50341, //(60 yds) - Instant - Consumes 30% of the caster's max health to inflict 25,000 nature damage to an enemy dragon and reduce the damage it deals by 25% for 30 sec. - // you do not have access to until you kill the Mage-Lord Urom - SPELL_EMERALD_DREAM_FUNNEL = 50344 //(60 yds) - Channeled - Transfers 5% of the caster's max health to a friendly drake every second for 10 seconds as long as the caster channels. -}; - -struct boss_eregosAI : public ScriptedAI -{ - boss_eregosAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - } - - ScriptedInstance* pInstance; - - void Reset() - { - if (pInstance) - pInstance->SetData(DATA_EREGOS_EVENT, NOT_STARTED); - } - - void EnterCombat(Unit* /*who*/) - { - if (pInstance) - pInstance->SetData(DATA_EREGOS_EVENT, IN_PROGRESS); - } - - void AttackStart(Unit* /*who*/) {} - void MoveInLineOfSight(Unit* /*who*/) {} - void UpdateAI(const uint32 /*diff*/) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - DoMeleeAttackIfReady(); - } - - void JustDied(Unit* /*killer*/) - { - if (pInstance) - pInstance->SetData(DATA_EREGOS_EVENT, DONE); - } -}; - -CreatureAI* GetAI_boss_eregos(Creature* pCreature) -{ - return new boss_eregosAI (pCreature); -} - -void AddSC_boss_eregos() -{ - Script *newscript; - - newscript = new Script; - newscript->Name = "boss_eregos"; - newscript->GetAI = &GetAI_boss_eregos; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Northrend/TheNexus/oculus/boss_urom.cpp b/src/server/scripts/Northrend/TheNexus/oculus/boss_urom.cpp deleted file mode 100644 index 29435441d00..00000000000 --- a/src/server/scripts/Northrend/TheNexus/oculus/boss_urom.cpp +++ /dev/null @@ -1,356 +0,0 @@ -/* Copyright (C) 2008 - 2010 TrinityCore -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ - -/* ScriptData -SDName: Urom -SD%Complete: 80 -SDComment: Is not working SPELL_ARCANE_SHIELD. SPELL_FROSTBOMB has some issues, the damage aura should not stack. -SDCategory: Instance Script -EndScriptData */ - -#include "ScriptedPch.h" -#include "oculus.h" - -enum Spells -{ - - SPELL_ARCANE_SHIELD = 53813, //Dummy --> Channeled, shields the caster from damage. - SPELL_EMPOWERED_ARCANE_EXPLOSION = 51110, - SPELL_EMPOWERED_ARCANE_EXPLOSION_2 = 59377, - SPELL_FROSTBOMB = 51103, //Urom throws a bomb, hitting its target with the highest aggro which inflict directly 650 frost damage and drops a frost zone on the ground. This zone deals 650 frost damage per second and reduce the movement speed by 35%. Lasts 1 minute. - SPELL_SUMMON_MENAGERIE = 50476, //Summons an assortment of creatures and teleports the caster to safety. - SPELL_SUMMON_MENAGERIE_2 = 50495, - SPELL_SUMMON_MENAGERIE_3 = 50496, - SPELL_TELEPORT = 51112, //Teleports to the center of Oculus - SPELL_TIME_BOMB = 51121, //Deals arcane damage to a random player, and after 6 seconds, deals zone damage to nearby equal to the health missing of the target afflicted by the debuff. - SPELL_TIME_BOMB_2 = 59376 -}; - -enum Yells -{ - SAY_AGGRO_1 = -1578000, - SAY_AGGRO_2 = -1578001, - SAY_AGGRO_3 = -1578002, - SAY_AGGRO_4 = -1578003, - SAY_TELEPORT = -1578004, -}; - -enum eCreature -{ - NPC_PHANTASMAL_CLOUDSCRAPER = 27645, - NPC_PHANTASMAL_MAMMOTH = 27642, - NPC_PHANTASMAL_WOLF = 27644, - - NPC_PHANTASMAL_AIR = 27650, - NPC_PHANTASMAL_FIRE = 27651, - NPC_PHANTASMAL_WATER = 27653, - - NPC_PHANTASMAL_MURLOC = 27649, - NPC_PHANTASMAL_NAGAL = 27648, - NPC_PHANTASMAL_OGRE = 27647 -}; - -struct Summons -{ - uint32 uiEntry[4]; -}; - -static Summons Group[]= -{ - {NPC_PHANTASMAL_CLOUDSCRAPER,NPC_PHANTASMAL_CLOUDSCRAPER,NPC_PHANTASMAL_MAMMOTH,NPC_PHANTASMAL_WOLF}, - {NPC_PHANTASMAL_AIR,NPC_PHANTASMAL_AIR,NPC_PHANTASMAL_WATER,NPC_PHANTASMAL_FIRE}, - {NPC_PHANTASMAL_OGRE,NPC_PHANTASMAL_OGRE,NPC_PHANTASMAL_NAGAL,NPC_PHANTASMAL_MURLOC} -}; - -static uint32 TeleportSpells[]= -{ - SPELL_SUMMON_MENAGERIE,SPELL_SUMMON_MENAGERIE_2,SPELL_SUMMON_MENAGERIE_3 -}; - -static int32 SayAggro[]= -{ - SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3,SAY_AGGRO_4 -}; - -struct boss_uromAI : public ScriptedAI -{ - boss_uromAI(Creature* pCreature) : ScriptedAI(pCreature) - { - pInstance = pCreature->GetInstanceData(); - } - - ScriptedInstance* pInstance; - - float x,y; - - bool bCanCast; - bool bCanGoBack; - - uint8 uiGroup[3]; - - uint32 uiTeleportTimer; - uint32 uiArcaneExplosionTimer; - uint32 uiCastArcaneExplosionTimer; - uint32 uiFrostBombTimer; - uint32 uiTimeBombTimer; - - void Reset() - { - if (pInstance && pInstance->GetData(DATA_VAROS_EVENT) != DONE) - DoCast(SPELL_ARCANE_SHIELD); - - if (pInstance) - pInstance->SetData(DATA_UROM_EVENT, NOT_STARTED); - - if (pInstance && pInstance->GetData(DATA_UROM_PLATAFORM) == 0) - { - uiGroup[0] = 0; - uiGroup[1] = 0; - uiGroup[2] = 0; - } - - x,y = 0.0f; - bCanCast = false; - bCanGoBack = false; - - me->GetMotionMaster()->MoveIdle(); - - uiTeleportTimer = urand(30000,35000); - uiArcaneExplosionTimer = 9000; - uiCastArcaneExplosionTimer = 2000; - uiFrostBombTimer = urand(5000,8000); - uiTimeBombTimer = urand(20000,25000); - } - - void EnterCombat(Unit* pWho) - { - if (pInstance) - pInstance->SetData(DATA_UROM_EVENT, IN_PROGRESS); - - SetGroups(); - SummonGroups(); - CastTeleport(); - - if (pInstance && pInstance->GetData(DATA_UROM_PLATAFORM) != 3) - pInstance->SetData(DATA_UROM_PLATAFORM,pInstance->GetData(DATA_UROM_PLATAFORM)+1); - } - - void AttackStart(Unit* pWho) - { - if (!pWho) - return; - - if (me->GetPositionZ() > 518.63) - DoStartNoMovement(pWho); - - if (me->GetPositionZ() < 518.63) - { - if (me->Attack(pWho, true)) - { - DoScriptText(SayAggro[3],me); - - me->SetInCombatWith(pWho); - pWho->SetInCombatWith(me); - - me->GetMotionMaster()->MoveChase(pWho, 0,0); - } - } - } - - void SetGroups() - { - if (!pInstance || pInstance->GetData(DATA_UROM_PLATAFORM) != 0) - return; - - while (uiGroup[0] == uiGroup[1] || uiGroup[0] == uiGroup[2] || uiGroup[1] == uiGroup[2]) - { - uiGroup[0] = urand(0,2); - uiGroup[1] = urand(0,2); - uiGroup[2] = urand(0,2); - } - } - - void SetPosition(uint8 uiI) - { - switch(uiI) - { - case 0: - x = me->GetPositionX() + 4; - y = me->GetPositionY() - 4; - break; - case 1: - x = me->GetPositionX() + 4; - y = me->GetPositionY() + 4; - break; - case 2: - x = me->GetPositionX() - 4; - y = me->GetPositionY() + 4; - break; - case 3: - x = me->GetPositionX() - 4; - y = me->GetPositionY() - 4; - break; - default: - break; - } - } - - void SummonGroups() - { - if (!pInstance || pInstance->GetData(DATA_UROM_PLATAFORM) > 2) - return; - - for (uint8 uiI = 0; uiI < 4 ; uiI++) - { - SetPosition(uiI); - me->SummonCreature(Group[uiGroup[pInstance->GetData(DATA_UROM_PLATAFORM)]].uiEntry[uiI],x,y,me->GetPositionZ(),me->GetOrientation()); - } - } - - void CastTeleport() - { - if (!pInstance || pInstance->GetData(DATA_UROM_PLATAFORM) > 2) - return; - - DoScriptText(SayAggro[pInstance->GetData(DATA_UROM_PLATAFORM)],me); - DoCast(TeleportSpells[pInstance->GetData(DATA_UROM_PLATAFORM)]); - } - - void UpdateAI(const uint32 uiDiff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - if (!pInstance || pInstance->GetData(DATA_UROM_PLATAFORM) < 2) - return; - - if (uiTeleportTimer <= uiDiff) - { - me->InterruptNonMeleeSpells(false); - DoScriptText(SAY_TELEPORT,me); - me->GetMotionMaster()->MoveIdle(); - DoCast(SPELL_TELEPORT); - uiTeleportTimer = urand(30000,35000); - - } else uiTeleportTimer -= uiDiff; - - if (bCanCast && !me->FindCurrentSpellBySpellId(SPELL_EMPOWERED_ARCANE_EXPLOSION)) - { - if (uiCastArcaneExplosionTimer <= uiDiff) - { - bCanCast = false; - bCanGoBack = true; - DoCastAOE(SPELL_EMPOWERED_ARCANE_EXPLOSION); - uiCastArcaneExplosionTimer = 2000; - }else uiCastArcaneExplosionTimer -= uiDiff; - } - - if (bCanGoBack) - { - if (uiArcaneExplosionTimer <= uiDiff) - { - Position pPos; - me->getVictim()->GetPosition(&pPos); - - me->NearTeleportTo(pPos.GetPositionX(),pPos.GetPositionY(),pPos.GetPositionZ(),pPos.GetOrientation()); - me->GetMotionMaster()->MoveChase(me->getVictim(),0,0); - me->SetUnitMovementFlags(MOVEMENTFLAG_WALK_MODE); - - bCanCast = false; - bCanGoBack = false; - uiArcaneExplosionTimer = 9000; - } else uiArcaneExplosionTimer -= uiDiff; - } - - if (!me->IsNonMeleeSpellCasted(false, true, true)) - { - if (uiFrostBombTimer <= uiDiff) - { - DoCastVictim(SPELL_FROSTBOMB); - uiFrostBombTimer = urand(5000,8000); - } else uiFrostBombTimer -= uiDiff; - - if (uiTimeBombTimer <= uiDiff) - { - if (Unit* pUnit = SelectTarget(SELECT_TARGET_RANDOM)) - DoCast(pUnit,SPELL_TIME_BOMB); - - uiTimeBombTimer = urand(20000,25000); - } else uiTimeBombTimer -= uiDiff; - } - - DoMeleeAttackIfReady(); - } - - void JustDied(Unit* /*killer*/) - { - if (pInstance) - pInstance->SetData(DATA_UROM_EVENT, DONE); - } - - void JustSummoned(Creature* pSummon) - { - pSummon->SetInCombatWithZone(); - } - - void LeaveCombat() - { - me->RemoveAllAuras(); - me->CombatStop(false); - me->DeleteThreatList(); - } - - void SpellHit(Unit* pCaster, const SpellEntry* pSpell) - { - switch(pSpell->Id) - { - case SPELL_SUMMON_MENAGERIE: - me->SetHomePosition(968.66,1042.53,527.32,0.077); - LeaveCombat(); - break; - case SPELL_SUMMON_MENAGERIE_2: - me->SetHomePosition(1164.02,1170.85,527.321,3.66); - LeaveCombat(); - break; - case SPELL_SUMMON_MENAGERIE_3: - me->SetHomePosition(1118.31,1080.377,508.361,4.25); - LeaveCombat(); - break; - case SPELL_TELEPORT: - me->AddUnitMovementFlag(MOVEMENTFLAG_FLY_MODE); // with out it the npc will fall down while is casting - bCanCast = true; - break; - default: - break; - } - } -}; - -CreatureAI* GetAI_boss_urom(Creature* pCreature) -{ - return new boss_uromAI (pCreature); -} - -void AddSC_boss_urom() -{ - Script* newscript; - - newscript = new Script; - newscript->Name = "boss_urom"; - newscript->GetAI = &GetAI_boss_urom; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Northrend/TheNexus/oculus/boss_varos.cpp b/src/server/scripts/Northrend/TheNexus/oculus/boss_varos.cpp deleted file mode 100644 index 79034250a43..00000000000 --- a/src/server/scripts/Northrend/TheNexus/oculus/boss_varos.cpp +++ /dev/null @@ -1,105 +0,0 @@ -/* Copyright (C) 2008 - 2010 TrinityCore -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ - -#include "ScriptedPch.h" -#include "oculus.h" - -enum Spells -{ - SPELL_ENERGIZE_CORES = 50785, //Damage 5938 to 6562, effec2 Triggers 54069, effect3 Triggers 56251 - SPELL_ENERGIZE_CORES_TRIGGER_1 = 54069, - SPELL_ENERGIZE_CORES_TRIGGER_2 = 56251, - SPELL_ENERGIZE_CORES_2 = 59372, //Damage 9025 to 9975, effect2 Triggers 54069, effect 56251 - SPELL_CALL_AZURE_RING_CAPTAIN = 51002, //Effect Send Event (12229) - SPELL_CALL_AZURE_RING_CAPTAIN_2 = 51006, //Effect Send Event (10665) - SPELL_CALL_AZURE_RING_CAPTAIN_3 = 51007, //Effect Send Event (18454) - SPELL_CALL_AZURE_RING_CAPTAIN_4 = 51008, //Effect Send Event (18455) - SPELL_CALL_AMPLIFY_MAGIC = 51054, - SPELL_CALL_AMPLIFY_MAGIC_2 = 59371 -}; -//not in db -enum Yells -{ - SAY_AGGRO = -1578022, - SAY_KILL_1 = -1578023, - SAY_KILL_2 = -1578024, - SAY_DEATH = -1578025, - SAY_STRIKE_1 = -1578026, - SAY_STRIKE_2 = -1578027, - SAY_STRIKE_3 = -1578028, - SAY_SPAWN = -1578029 -}; - -struct boss_varosAI : public ScriptedAI -{ - boss_varosAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - } - - ScriptedInstance* pInstance; - - void Reset() - { - if (pInstance) - pInstance->SetData(DATA_VAROS_EVENT, NOT_STARTED); - } - void EnterCombat(Unit* /*who*/) - { - DoScriptText(SAY_AGGRO, me); - - if (pInstance) - pInstance->SetData(DATA_VAROS_EVENT, IN_PROGRESS); - } - void AttackStart(Unit* /*who*/) {} - void MoveInLineOfSight(Unit* /*who*/) {} - void UpdateAI(const uint32 /*diff*/) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - DoMeleeAttackIfReady(); - } - void JustDied(Unit* /*killer*/) - { - DoScriptText(SAY_DEATH, me); - - if (pInstance) - pInstance->SetData(DATA_VAROS_EVENT, DONE); - } - void KilledUnit(Unit * victim) - { - if (victim == me) - return; - DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2), me); - } -}; - -CreatureAI* GetAI_boss_varos(Creature* pCreature) -{ - return new boss_varosAI (pCreature); -} - -void AddSC_boss_varos() -{ - Script *newscript; - - newscript = new Script; - newscript->Name = "boss_varos"; - newscript->GetAI = &GetAI_boss_varos; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Northrend/TheNexus/oculus/instance_oculus.cpp b/src/server/scripts/Northrend/TheNexus/oculus/instance_oculus.cpp deleted file mode 100644 index 49be2385a3c..00000000000 --- a/src/server/scripts/Northrend/TheNexus/oculus/instance_oculus.cpp +++ /dev/null @@ -1,205 +0,0 @@ -/* Copyright (C) 2008 - 2010 TrinityCore -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ - -#include "ScriptedPch.h" -#include "oculus.h" - -#define MAX_ENCOUNTER 4 - -/* The Occulus encounters: -0 - Drakos the Interrogator -1 - Varos Cloudstrider -2 - Mage-Lord Urom -3 - Ley-Guardian Eregos */ - -struct instance_oculus : public ScriptedInstance -{ - instance_oculus(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; - - uint64 uiDrakos; - uint64 uiVaros; - uint64 uiUrom; - uint64 uiEregos; - - uint8 uiPlataformUrom; - - uint8 m_auiEncounter[MAX_ENCOUNTER]; - std::string str_data; - - std::list GameObjectList; - - void Initialize() - { - uiPlataformUrom = 0; - } - - void OnCreatureCreate(Creature* pCreature, bool /*add*/) - { - switch(pCreature->GetEntry()) - { - case CREATURE_DRAKOS: - uiDrakos = pCreature->GetGUID(); - break; - case CREATURE_VAROS: - uiVaros = pCreature->GetGUID(); - break; - case CREATURE_UROM: - uiUrom = pCreature->GetGUID(); - break; - case CREATURE_EREGOS: - uiEregos = pCreature->GetGUID(); - break; - } - } - - void OnGameObjectCreate(GameObject* pGO, bool bAdd) - { - if (pGO->GetEntry() == GO_DRAGON_CAGE_DOOR) - { - if (DATA_DRAKOS_EVENT == DONE) - pGO->SetGoState(GO_STATE_ACTIVE); - else - pGO->SetGoState(GO_STATE_READY); - - GameObjectList.push_back(pGO->GetGUID()); - } - } - - void SetData(uint32 type, uint32 data) - { - switch(type) - { - case DATA_DRAKOS_EVENT: - m_auiEncounter[0] = data; - if (data == DONE) - OpenCageDoors(); - break; - case DATA_VAROS_EVENT: - m_auiEncounter[1] = data; - break; - case DATA_UROM_EVENT: - m_auiEncounter[2] = data; - break; - case DATA_EREGOS_EVENT: - m_auiEncounter[3] = data; - break; - case DATA_UROM_PLATAFORM: - uiPlataformUrom = data; - break; - } - - if (data == DONE) - SaveToDB(); - } - - uint32 GetData(uint32 type) - { - switch(type) - { - case DATA_DRAKOS_EVENT: return m_auiEncounter[0]; - case DATA_VAROS_EVENT: return m_auiEncounter[1]; - case DATA_UROM_EVENT: return m_auiEncounter[2]; - case DATA_EREGOS_EVENT: return m_auiEncounter[3]; - case DATA_UROM_PLATAFORM: return uiPlataformUrom; - } - - return 0; - } - - uint64 GetData64(uint32 identifier) - { - switch(identifier) - { - case DATA_DRAKOS: return uiDrakos; - case DATA_VAROS: return uiVaros; - case DATA_UROM: return uiUrom; - case DATA_EREGOS: return uiEregos; - } - - return 0; - } - - void OpenCageDoors() - { - if (GameObjectList.empty()) - return; - - for (std::list::const_iterator itr = GameObjectList.begin(); itr != GameObjectList.end(); ++itr) - { - if (GameObject* pGO = instance->GetGameObject(*itr)) - pGO->SetGoState(GO_STATE_ACTIVE); - } - } - - std::string GetSaveData() - { - OUT_SAVE_INST_DATA; - - std::ostringstream saveStream; - saveStream << "T O " << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " " << m_auiEncounter[3]; - - str_data = saveStream.str(); - - OUT_SAVE_INST_DATA_COMPLETE; - return str_data; - } - - void Load(const char* in) - { - if (!in) - { - OUT_LOAD_INST_DATA_FAIL; - return; - } - - OUT_LOAD_INST_DATA(in); - - char dataHead1, dataHead2; - uint16 data0, data1, data2, data3; - - std::istringstream loadStream(in); - loadStream >> dataHead1 >> dataHead2 >> data0 >> data1 >> data2 >> data3; - - if (dataHead1 == 'T' && dataHead2 == 'O') - { - m_auiEncounter[0] = data0; - m_auiEncounter[1] = data1; - m_auiEncounter[2] = data2; - m_auiEncounter[3] = data3; - - for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) - if (m_auiEncounter[i] == IN_PROGRESS) - m_auiEncounter[i] = NOT_STARTED; - - } else OUT_LOAD_INST_DATA_FAIL; - - OUT_LOAD_INST_DATA_COMPLETE; - } -}; - -InstanceData* GetInstanceData_instance_oculus(Map* pMap) -{ - return new instance_oculus(pMap); -} - -void AddSC_instance_oculus() -{ - Script *newscript; - newscript = new Script; - newscript->Name = "instance_oculus"; - newscript->GetInstanceData = &GetInstanceData_instance_oculus; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Northrend/TheNexus/oculus/oculus.cpp b/src/server/scripts/Northrend/TheNexus/oculus/oculus.cpp deleted file mode 100644 index 685583532d5..00000000000 --- a/src/server/scripts/Northrend/TheNexus/oculus/oculus.cpp +++ /dev/null @@ -1,174 +0,0 @@ -/* Copyright (C) 2006 - 2010 TrinityCore -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ - -#include "ScriptedPch.h" -#include "oculus.h" - -#define GOSSIP_ITEM_DRAKES "So where do we go from here?" -#define GOSSIP_ITEM_BELGARISTRASZ1 "I want to fly on the wings of the Red Flight" -#define GOSSIP_ITEM_BELGARISTRASZ2 "What abilities do Ruby Drakes have?" -#define GOSSIP_ITEM_VERDISA1 "I want to fly on the wings of the Green Flight" -#define GOSSIP_ITEM_VERDISA2 "What abilities do Emerald Drakes have?" -#define GOSSIP_ITEM_ETERNOS1 "I want to fly on the wings of the Bronze Flight" -#define GOSSIP_ITEM_ETERNOS2 "What abilities do Amber Drakes have?" - -#define HAS_ESSENCE(a) ((a)->HasItemCount(ITEM_EMERALD_ESSENCE,1) || (a)->HasItemCount(ITEM_AMBER_ESSENCE,1) || (a)->HasItemCount(ITEM_RUBY_ESSENCE,1)) - -enum Drakes -{ - GOSSIP_TEXTID_DRAKES = 13267, - GOSSIP_TEXTID_BELGARISTRASZ1 = 12916, - GOSSIP_TEXTID_BELGARISTRASZ2 = 13466, - GOSSIP_TEXTID_BELGARISTRASZ3 = 13254, - GOSSIP_TEXTID_VERDISA1 = 1, - GOSSIP_TEXTID_VERDISA2 = 1, - GOSSIP_TEXTID_VERDISA3 = 1, - GOSSIP_TEXTID_ETERNOS1 = 1, - GOSSIP_TEXTID_ETERNOS2 = 1, - GOSSIP_TEXTID_ETERNOS3 = 13256, - - ITEM_EMERALD_ESSENCE = 37815, - ITEM_AMBER_ESSENCE = 37859, - ITEM_RUBY_ESSENCE = 37860, - - NPC_VERDISA = 27657, - NPC_BELGARISTRASZ = 27658, - NPC_ETERNOS = 27659 -}; - -bool GossipHello_npc_oculus_drake(Player* pPlayer, Creature* pCreature) -{ - if (pCreature->isQuestGiver()) - pPlayer->PrepareQuestMenu(pCreature->GetGUID()); - - if (pCreature->GetInstanceData()->GetData(DATA_DRAKOS_EVENT) == DONE) - { - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_DRAKES, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_DRAKES, pCreature->GetGUID()); - } - - return true; -} - -bool GossipSelect_npc_oculus_drake(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) -{ - switch(pCreature->GetEntry()) - { - case NPC_VERDISA: //Verdisa - switch(uiAction) - { - case GOSSIP_ACTION_INFO_DEF + 1: - if (!HAS_ESSENCE(pPlayer)) - { - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_VERDISA1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_VERDISA2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_VERDISA1, pCreature->GetGUID()); - } - else - { - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_VERDISA2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_VERDISA2, pCreature->GetGUID()); - } - break; - case GOSSIP_ACTION_INFO_DEF + 2: - { - ItemPosCountVec dest; - uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, ITEM_EMERALD_ESSENCE, 1); - if (msg == EQUIP_ERR_OK) - pPlayer->StoreNewItem(dest, ITEM_EMERALD_ESSENCE, true); - pPlayer->CLOSE_GOSSIP_MENU(); - break; - } - case GOSSIP_ACTION_INFO_DEF + 3: - pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_VERDISA3, pCreature->GetGUID()); - break; - } - break; - case NPC_BELGARISTRASZ: //Belgaristrasz - switch(uiAction) - { - case GOSSIP_ACTION_INFO_DEF + 1: - if (!HAS_ESSENCE(pPlayer)) - { - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BELGARISTRASZ1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BELGARISTRASZ2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_BELGARISTRASZ1, pCreature->GetGUID()); - } - else - { - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BELGARISTRASZ2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_BELGARISTRASZ2, pCreature->GetGUID()); - } - break; - case GOSSIP_ACTION_INFO_DEF + 2: - { - ItemPosCountVec dest; - uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, ITEM_RUBY_ESSENCE, 1); - if (msg == EQUIP_ERR_OK) - pPlayer->StoreNewItem(dest, ITEM_RUBY_ESSENCE, true); - pPlayer->CLOSE_GOSSIP_MENU(); - break; - } - case GOSSIP_ACTION_INFO_DEF + 3: - pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_BELGARISTRASZ3, pCreature->GetGUID()); - break; - } - break; - case NPC_ETERNOS: //Eternos - switch(uiAction) - { - case GOSSIP_ACTION_INFO_DEF + 1: - if (!HAS_ESSENCE(pPlayer)) - { - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ETERNOS1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ETERNOS2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_ETERNOS1, pCreature->GetGUID()); - } - else - { - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ETERNOS2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); - pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_ETERNOS2, pCreature->GetGUID()); - } - break; - case GOSSIP_ACTION_INFO_DEF + 2: - { - ItemPosCountVec dest; - uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, ITEM_AMBER_ESSENCE, 1); - if (msg == EQUIP_ERR_OK) - pPlayer->StoreNewItem(dest, ITEM_AMBER_ESSENCE, true); - pPlayer->CLOSE_GOSSIP_MENU(); - break; - } - case GOSSIP_ACTION_INFO_DEF + 3: - pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXTID_ETERNOS3, pCreature->GetGUID()); - break; - } - break; - } - - return true; -} - -void AddSC_oculus() -{ - Script *newscript; - - newscript = new Script; - newscript->Name = "npc_oculus_drake"; - newscript->pGossipHello = &GossipHello_npc_oculus_drake; - newscript->pGossipSelect = &GossipSelect_npc_oculus_drake; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Northrend/TheNexus/oculus/oculus.h b/src/server/scripts/Northrend/TheNexus/oculus/oculus.h deleted file mode 100644 index b212c9b8b6a..00000000000 --- a/src/server/scripts/Northrend/TheNexus/oculus/oculus.h +++ /dev/null @@ -1,34 +0,0 @@ -#ifndef DEF_OCULUS_H -#define DEF_OCULUS_H - -enum Data -{ - DATA_DRAKOS_EVENT, - DATA_VAROS_EVENT, - DATA_UROM_EVENT, - DATA_EREGOS_EVENT, - DATA_UROM_PLATAFORM -}; - -enum Data64 -{ - DATA_DRAKOS, - DATA_VAROS, - DATA_UROM, - DATA_EREGOS -}; - -enum Bosses -{ - CREATURE_DRAKOS = 27654, - CREATURE_VAROS = 27447, - CREATURE_UROM = 27655, - CREATURE_EREGOS = 27656 -}; - -enum GameObjects -{ - GO_DRAGON_CAGE_DOOR = 193995 -}; - -#endif diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp new file mode 100644 index 00000000000..c2da2a24e71 --- /dev/null +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp @@ -0,0 +1,432 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Boss General Bjarngrim +SD%Complete: 70% +SDComment: Waypoint needed, we expect boss to always have 2x Stormforged Lieutenant following +SDCategory: Halls of Lightning +EndScriptData */ + +#include "ScriptedPch.h" +#include "halls_of_lightning.h" + +enum eEnums +{ + //Yell + SAY_AGGRO = -1602000, + SAY_SLAY_1 = -1602001, + SAY_SLAY_2 = -1602002, + SAY_SLAY_3 = -1602003, + SAY_DEATH = -1602004, + SAY_BATTLE_STANCE = -1602005, + EMOTE_BATTLE_STANCE = -1602006, + SAY_BERSEKER_STANCE = -1602007, + EMOTE_BERSEKER_STANCE = -1602008, + SAY_DEFENSIVE_STANCE = -1602009, + EMOTE_DEFENSIVE_STANCE = -1602010, + + SPELL_DEFENSIVE_STANCE = 53790, + //SPELL_DEFENSIVE_AURA = 41105, + SPELL_SPELL_REFLECTION = 36096, + SPELL_PUMMEL = 12555, + SPELL_KNOCK_AWAY = 52029, + SPELL_IRONFORM = 52022, + + SPELL_BERSEKER_STANCE = 53791, + //SPELL_BERSEKER_AURA = 41107, + SPELL_INTERCEPT = 58769, + SPELL_WHIRLWIND = 52027, + SPELL_CLEAVE = 15284, + + SPELL_BATTLE_STANCE = 53792, + //SPELL_BATTLE_AURA = 41106, + SPELL_MORTAL_STRIKE = 16856, + SPELL_SLAM = 52026, + + //OTHER SPELLS + //SPELL_CHARGE_UP = 52098, // only used when starting walk from one platform to the other + //SPELL_TEMPORARY_ELECTRICAL_CHARGE = 52092, // triggered part of above + + NPC_STORMFORGED_LIEUTENANT = 29240, + SPELL_ARC_WELD = 59085, + SPELL_RENEW_STEEL_N = 52774, + SPELL_RENEW_STEEL_H = 59160, + + EQUIP_SWORD = 37871, + EQUIP_SHIELD = 35642, + EQUIP_MACE = 43623, + + STANCE_DEFENSIVE = 0, + STANCE_BERSERKER = 1, + STANCE_BATTLE = 2 +}; + +/*###### +## boss_bjarngrim +######*/ + +struct boss_bjarngrimAI : public ScriptedAI +{ + boss_bjarngrimAI(Creature *pCreature) : ScriptedAI(pCreature) + { + m_pInstance = pCreature->GetInstanceData(); + m_uiStance = STANCE_DEFENSIVE; + memset(&m_auiStormforgedLieutenantGUID, 0, sizeof(m_auiStormforgedLieutenantGUID)); + } + + ScriptedInstance* m_pInstance; + + bool m_bIsChangingStance; + + uint8 m_uiChargingStatus; + uint8 m_uiStance; + + uint32 m_uiCharge_Timer; + uint32 m_uiChangeStance_Timer; + + uint32 m_uiReflection_Timer; + uint32 m_uiKnockAway_Timer; + uint32 m_uiPummel_Timer; + uint32 m_uiIronform_Timer; + + uint32 m_uiIntercept_Timer; + uint32 m_uiWhirlwind_Timer; + uint32 m_uiCleave_Timer; + + uint32 m_uiMortalStrike_Timer; + uint32 m_uiSlam_Timer; + + uint64 m_auiStormforgedLieutenantGUID[2]; + + void Reset() + { + m_bIsChangingStance = false; + + m_uiChargingStatus = 0; + m_uiCharge_Timer = 1000; + + m_uiChangeStance_Timer = 20000 + rand()%5000; + + m_uiReflection_Timer = 8000; + m_uiKnockAway_Timer = 20000; + m_uiPummel_Timer = 10000; + m_uiIronform_Timer = 25000; + + m_uiIntercept_Timer = 5000; + m_uiWhirlwind_Timer = 10000; + m_uiCleave_Timer = 8000; + + m_uiMortalStrike_Timer = 8000; + m_uiSlam_Timer = 10000; + + for (uint8 i = 0; i < 2; ++i) + { + if (Creature* pStormforgedLieutenant = (Unit::GetCreature((*me), m_auiStormforgedLieutenantGUID[i]))) + { + if (!pStormforgedLieutenant->isAlive()) + pStormforgedLieutenant->Respawn(); + } + } + + if (m_uiStance != STANCE_DEFENSIVE) + { + DoRemoveStanceAura(m_uiStance); + DoCast(me, SPELL_DEFENSIVE_STANCE); + m_uiStance = STANCE_DEFENSIVE; + } + + SetEquipmentSlots(false, EQUIP_SWORD, EQUIP_SHIELD, EQUIP_NO_CHANGE); + + if (m_pInstance) + m_pInstance->SetData(TYPE_BJARNGRIM, NOT_STARTED); + } + + void EnterCombat(Unit* /*pWho*/) + { + DoScriptText(SAY_AGGRO, me); + + //must get both lieutenants here and make sure they are with him + me->CallForHelp(30.0f); + + if (m_pInstance) + m_pInstance->SetData(TYPE_BJARNGRIM, IN_PROGRESS); + } + + void KilledUnit(Unit* /*pVictim*/) + { + DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); + } + + void JustDied(Unit* /*pKiller*/) + { + DoScriptText(SAY_DEATH, me); + + if (m_pInstance) + m_pInstance->SetData(TYPE_BJARNGRIM, DONE); + } + + //TODO: remove when removal is done by the core + void DoRemoveStanceAura(uint8 uiStance) + { + switch(uiStance) + { + case STANCE_DEFENSIVE: + me->RemoveAurasDueToSpell(SPELL_DEFENSIVE_STANCE); + break; + case STANCE_BERSERKER: + me->RemoveAurasDueToSpell(SPELL_BERSEKER_STANCE); + break; + case STANCE_BATTLE: + me->RemoveAurasDueToSpell(SPELL_BATTLE_STANCE); + break; + } + } + + void UpdateAI(const uint32 uiDiff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + // Change stance + if (m_uiChangeStance_Timer <= uiDiff) + { + //wait for current spell to finish before change stance + if (me->IsNonMeleeSpellCasted(false)) + return; + + DoRemoveStanceAura(m_uiStance); + + int uiTempStance = rand()%(3-1); + + if (uiTempStance >= m_uiStance) + ++uiTempStance; + + m_uiStance = uiTempStance; + + switch(m_uiStance) + { + case STANCE_DEFENSIVE: + DoScriptText(SAY_DEFENSIVE_STANCE, me); + DoScriptText(EMOTE_DEFENSIVE_STANCE, me); + DoCast(me, SPELL_DEFENSIVE_STANCE); + SetEquipmentSlots(false, EQUIP_SWORD, EQUIP_SHIELD, EQUIP_NO_CHANGE); + break; + case STANCE_BERSERKER: + DoScriptText(SAY_BERSEKER_STANCE, me); + DoScriptText(EMOTE_BERSEKER_STANCE, me); + DoCast(me, SPELL_BERSEKER_STANCE); + SetEquipmentSlots(false, EQUIP_SWORD, EQUIP_SWORD, EQUIP_NO_CHANGE); + break; + case STANCE_BATTLE: + DoScriptText(SAY_BATTLE_STANCE, me); + DoScriptText(EMOTE_BATTLE_STANCE, me); + DoCast(me, SPELL_BATTLE_STANCE); + SetEquipmentSlots(false, EQUIP_MACE, EQUIP_UNEQUIP, EQUIP_NO_CHANGE); + break; + } + + m_uiChangeStance_Timer = 20000 + rand()%5000; + return; + } + else + m_uiChangeStance_Timer -= uiDiff; + + switch(m_uiStance) + { + case STANCE_DEFENSIVE: + { + if (m_uiReflection_Timer <= uiDiff) + { + DoCast(me, SPELL_SPELL_REFLECTION); + m_uiReflection_Timer = 8000 + rand()%1000; + } + else + m_uiReflection_Timer -= uiDiff; + + if (m_uiKnockAway_Timer <= uiDiff) + { + DoCast(me, SPELL_KNOCK_AWAY); + m_uiKnockAway_Timer = 20000 + rand()%1000; + } + else + m_uiKnockAway_Timer -= uiDiff; + + if (m_uiPummel_Timer <= uiDiff) + { + DoCast(me->getVictim(), SPELL_PUMMEL); + m_uiPummel_Timer = 10000 + rand()%1000; + } + else + m_uiPummel_Timer -= uiDiff; + + if (m_uiIronform_Timer <= uiDiff) + { + DoCast(me, SPELL_IRONFORM); + m_uiIronform_Timer = 25000 + rand()%1000; + } + else + m_uiIronform_Timer -= uiDiff; + + break; + } + case STANCE_BERSERKER: + { + if (m_uiIntercept_Timer <= uiDiff) + { + //not much point is this, better random target and more often? + DoCast(me->getVictim(), SPELL_INTERCEPT); + m_uiIntercept_Timer = 45000 + rand()%1000; + } + else + m_uiIntercept_Timer -= uiDiff; + + if (m_uiWhirlwind_Timer <= uiDiff) + { + DoCast(me, SPELL_WHIRLWIND); + m_uiWhirlwind_Timer = 10000 + rand()%1000; + } + else + m_uiWhirlwind_Timer -= uiDiff; + + if (m_uiCleave_Timer <= uiDiff) + { + DoCast(me->getVictim(), SPELL_CLEAVE); + m_uiCleave_Timer = 8000 + rand()%1000; + } + else + m_uiCleave_Timer -= uiDiff; + + break; + } + case STANCE_BATTLE: + { + if (m_uiMortalStrike_Timer <= uiDiff) + { + DoCast(me->getVictim(), SPELL_MORTAL_STRIKE); + m_uiMortalStrike_Timer = 20000 + rand()%1000; + } + else + m_uiMortalStrike_Timer -= uiDiff; + + if (m_uiSlam_Timer <= uiDiff) + { + DoCast(me->getVictim(), SPELL_SLAM); + m_uiSlam_Timer = 15000 + rand()%1000; + } + else + m_uiSlam_Timer -= uiDiff; + + break; + } + } + + DoMeleeAttackIfReady(); + } +}; + +/*###### +## mob_stormforged_lieutenant +######*/ + +struct mob_stormforged_lieutenantAI : public ScriptedAI +{ + mob_stormforged_lieutenantAI(Creature *pCreature) : ScriptedAI(pCreature) + { + m_pInstance = pCreature->GetInstanceData(); + } + + ScriptedInstance* m_pInstance; + + uint32 m_uiArcWeld_Timer; + uint32 m_uiRenewSteel_Timer; + + void Reset() + { + m_uiArcWeld_Timer = 20000 + rand()%1000; + m_uiRenewSteel_Timer = 10000 + rand()%1000; + } + + void EnterCombat(Unit* pWho) + { + if (m_pInstance) + { + if (Creature* pBjarngrim = m_pInstance->instance->GetCreature(m_pInstance->GetData64(DATA_BJARNGRIM))) + { + if (pBjarngrim->isAlive() && !pBjarngrim->getVictim()) + pBjarngrim->AI()->AttackStart(pWho); + } + } + } + + void UpdateAI(const uint32 uiDiff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + if (m_uiArcWeld_Timer <= uiDiff) + { + DoCast(me->getVictim(), SPELL_ARC_WELD); + m_uiArcWeld_Timer = 20000 + rand()%1000; + } + else + m_uiArcWeld_Timer -= uiDiff; + + if (m_uiRenewSteel_Timer <= uiDiff) + { + if (m_pInstance) + { + if (Creature* pBjarngrim = m_pInstance->instance->GetCreature(m_pInstance->GetData64(DATA_BJARNGRIM))) + { + if (pBjarngrim->isAlive()) + DoCast(pBjarngrim, SPELL_RENEW_STEEL_N); + } + } + m_uiRenewSteel_Timer = 10000 + rand()%4000; + } + else + m_uiRenewSteel_Timer -= uiDiff; + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_boss_bjarngrim(Creature* pCreature) +{ + return new boss_bjarngrimAI(pCreature); +} + +CreatureAI* GetAI_mob_stormforged_lieutenant(Creature* pCreature) +{ + return new mob_stormforged_lieutenantAI(pCreature); +} + +void AddSC_boss_bjarngrim() +{ + Script *newscript; + + newscript = new Script; + newscript->Name = "boss_bjarngrim"; + newscript->GetAI = &GetAI_boss_bjarngrim; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_stormforged_lieutenant"; + newscript->GetAI = &GetAI_mob_stormforged_lieutenant; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp new file mode 100644 index 00000000000..ecf61188b3e --- /dev/null +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp @@ -0,0 +1,388 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * Copyright (C) 2008 - 2010 TrinityCore + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* + * Comment: Timer check pending + */ + +#include "ScriptedPch.h" +#include "halls_of_lightning.h" + +enum Spells +{ + SPELL_BALL_LIGHTNING = 52780, + H_SPELL_BALL_LIGHTNING = 59800, + SPELL_STATIC_OVERLOAD = 52658, + H_SPELL_STATIC_OVERLOAD = 59795, + + SPELL_DISPERSE = 52770, + SPELL_SUMMON_SPARK = 52746, + SPELL_SPARK_DESPAWN = 52776, + + //Spark of Ionar + SPELL_SPARK_VISUAL_TRIGGER = 52667, + H_SPELL_SPARK_VISUAL_TRIGGER = 59833 +}; + +enum Yells +{ + SAY_AGGRO = -1602011, + SAY_SLAY_1 = -1602012, + SAY_SLAY_2 = -1602013, + SAY_SLAY_3 = -1602014, + SAY_DEATH = -1602015, + SAY_SPLIT_1 = -1602016, + SAY_SPLIT_2 = -1602017 +}; + +enum Creatures +{ + NPC_SPARK_OF_IONAR = 28926 +}; + +enum Misc +{ + DATA_MAX_SPARKS = 5, + DATA_MAX_SPARK_DISTANCE = 90, // Distance to boss - prevent runs through the whole instance + DATA_POINT_CALLBACK = 0 +}; + +/*###### +## Boss Ionar +######*/ + +struct boss_ionarAI : public ScriptedAI +{ + boss_ionarAI(Creature *pCreature) : ScriptedAI(pCreature), lSparkList(pCreature) + { + pInstance = pCreature->GetInstanceData(); + } + + ScriptedInstance* pInstance; + + SummonList lSparkList; + + bool bIsSplitPhase; + bool bHasDispersed; + + uint32 uiSplitTimer; + + uint32 uiStaticOverloadTimer; + uint32 uiBallLightningTimer; + + uint32 uiDisperseHealth; + + void Reset() + { + lSparkList.DespawnAll(); + + bIsSplitPhase = true; + bHasDispersed = false; + + uiSplitTimer = 25*IN_MILISECONDS; + + uiStaticOverloadTimer = urand(5*IN_MILISECONDS, 6*IN_MILISECONDS); + uiBallLightningTimer = urand(10*IN_MILISECONDS, 11*IN_MILISECONDS); + + uiDisperseHealth = 45 + urand(0,10); + + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE|UNIT_FLAG_DISABLE_MOVE); + + if (me->GetVisibility() == VISIBILITY_OFF) + me->SetVisibility(VISIBILITY_ON); + + if (pInstance) + pInstance->SetData(TYPE_IONAR, NOT_STARTED); + } + + void EnterCombat(Unit* /*who*/) + { + DoScriptText(SAY_AGGRO, me); + + if (pInstance) + pInstance->SetData(TYPE_IONAR, IN_PROGRESS); + } + + void JustDied(Unit* /*killer*/) + { + DoScriptText(SAY_DEATH, me); + + lSparkList.DespawnAll(); + + if (pInstance) + pInstance->SetData(TYPE_IONAR, DONE); + } + + void KilledUnit(Unit * /*victim*/) + { + DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); + } + + //make sparks come back + void CallBackSparks() + { + //should never be empty here, but check + if (lSparkList.empty()) + return; + + Position pos; + me->GetPosition(&pos); + + for (std::list::const_iterator itr = lSparkList.begin(); itr != lSparkList.end(); ++itr) + { + if (Creature* pSpark = Unit::GetCreature(*me, *itr)) + { + if (pSpark->isAlive()) + { + pSpark->SetSpeed(MOVE_RUN, 2.0f); + pSpark->GetMotionMaster()->Clear(); + pSpark->GetMotionMaster()->MovePoint(DATA_POINT_CALLBACK, pos); + } + else + pSpark->ForcedDespawn(); + } + } + } + + void DamageTaken(Unit * /*pDoneBy*/, uint32 &uiDamage) + { + if (me->GetVisibility() == VISIBILITY_OFF) + uiDamage = 0; + } + + void JustSummoned(Creature* pSummoned) + { + if (pSummoned->GetEntry() == NPC_SPARK_OF_IONAR) + { + lSparkList.Summon(pSummoned); + + pSummoned->CastSpell(pSummoned, DUNGEON_MODE(SPELL_SPARK_VISUAL_TRIGGER,H_SPELL_SPARK_VISUAL_TRIGGER), true); + + Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); + if (pTarget) + { + pSummoned->SetInCombatWith(pTarget); + pSummoned->GetMotionMaster()->Clear(); + pSummoned->GetMotionMaster()->MoveFollow(pTarget, 0.0f, 0.0f); + } + } + } + + void SummonedCreatureDespawn(Creature *pSummoned) + { + if (pSummoned->GetEntry() == NPC_SPARK_OF_IONAR) + lSparkList.Despawn(pSummoned); + } + + void UpdateAI(const uint32 uiDiff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + // Splitted + if (me->GetVisibility() == VISIBILITY_OFF) + { + if (uiSplitTimer <= uiDiff) + { + uiSplitTimer = 2.5*IN_MILISECONDS; + + // Return sparks to where Ionar splitted + if (bIsSplitPhase) + { + CallBackSparks(); + bIsSplitPhase = false; + } + // Lightning effect and restore Ionar + else if (lSparkList.empty()) + { + me->SetVisibility(VISIBILITY_ON); + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE|UNIT_FLAG_DISABLE_MOVE); + + DoCast(me, SPELL_SPARK_DESPAWN, false); + + uiSplitTimer = 25*IN_MILISECONDS; + bIsSplitPhase = true; + + if (me->getVictim()) + me->GetMotionMaster()->MoveChase(me->getVictim()); + } + } + else + uiSplitTimer -= uiDiff; + + return; + } + + if (uiStaticOverloadTimer <= uiDiff) + { + if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, SPELL_STATIC_OVERLOAD); + + uiStaticOverloadTimer = urand(5*IN_MILISECONDS, 6*IN_MILISECONDS); + } + else + uiStaticOverloadTimer -= uiDiff; + + if (uiBallLightningTimer <= uiDiff) + { + DoCast(me->getVictim(), SPELL_BALL_LIGHTNING); + uiBallLightningTimer = urand(10*IN_MILISECONDS, 11*IN_MILISECONDS); + } + else + uiBallLightningTimer -= uiDiff; + + // Health check + if (!bHasDispersed && HealthBelowPct(uiDisperseHealth)) + { + bHasDispersed = true; + + DoScriptText(RAND(SAY_SPLIT_1,SAY_SPLIT_2), me); + + if (me->IsNonMeleeSpellCasted(false)) + me->InterruptNonMeleeSpells(false); + + DoCast(me, SPELL_DISPERSE, true); + } + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_boss_ionar(Creature* pCreature) +{ + return new boss_ionarAI(pCreature); +} + +bool EffectDummyCreature_boss_ionar(Unit* /*pCaster*/, uint32 uiSpellId, uint32 uiEffIndex, Creature* pCreatureTarget) +{ + //always check spellid and effectindex + if (uiSpellId == SPELL_DISPERSE && uiEffIndex == 0) + { + if (pCreatureTarget->GetEntry() != NPC_IONAR) + return true; + + for (uint8 i = 0; i < DATA_MAX_SPARKS; ++i) + pCreatureTarget->CastSpell(pCreatureTarget, SPELL_SUMMON_SPARK, true); + + pCreatureTarget->AttackStop(); + pCreatureTarget->SetVisibility(VISIBILITY_OFF); + pCreatureTarget->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE|UNIT_FLAG_DISABLE_MOVE); + + pCreatureTarget->GetMotionMaster()->Clear(); + pCreatureTarget->GetMotionMaster()->MoveIdle(); + + //always return true when we are handling this spell and effect + return true; + } + return false; +} + +/*###### +## mob_spark_of_ionar +######*/ + +struct mob_spark_of_ionarAI : public ScriptedAI +{ + mob_spark_of_ionarAI(Creature *pCreature) : ScriptedAI(pCreature) + { + pInstance = pCreature->GetInstanceData(); + } + + ScriptedInstance* pInstance; + + uint32 uiCheckTimer; + + void Reset() + { + uiCheckTimer = 2*IN_MILISECONDS; + me->SetReactState(REACT_PASSIVE); + } + + void MovementInform(uint32 uiType, uint32 uiPointId) + { + if (uiType != POINT_MOTION_TYPE || !pInstance) + return; + + if (uiPointId == DATA_POINT_CALLBACK) + me->ForcedDespawn(); + } + + void DamageTaken(Unit * /*pDoneBy*/, uint32 &uiDamage) + { + uiDamage = 0; + } + + void UpdateAI(const uint32 uiDiff) + { + // Despawn if the encounter is not running + if (pInstance && pInstance->GetData(TYPE_IONAR) != IN_PROGRESS) + { + me->ForcedDespawn(); + return; + } + + // Prevent them to follow players through the whole instance + if (uiCheckTimer <= uiDiff) + { + if (pInstance) + { + Creature* pIonar = pInstance->instance->GetCreature(pInstance->GetData64(DATA_IONAR)); + if (pIonar && pIonar->isAlive()) + { + if (me->GetDistance(pIonar) > DATA_MAX_SPARK_DISTANCE) + { + Position pos; + pIonar->GetPosition(&pos); + + me->SetSpeed(MOVE_RUN, 2.0f); + me->GetMotionMaster()->Clear(); + me->GetMotionMaster()->MovePoint(DATA_POINT_CALLBACK, pos); + } + } + else + me->ForcedDespawn(); + } + uiCheckTimer = 2*IN_MILISECONDS; + } + else + uiCheckTimer -= uiDiff; + + // No melee attack at all! + } +}; + +CreatureAI* GetAI_mob_spark_of_ionar(Creature* pCreature) +{ + return new mob_spark_of_ionarAI(pCreature); +} + +void AddSC_boss_ionar() +{ + Script *newscript; + + newscript = new Script; + newscript->Name = "boss_ionar"; + newscript->GetAI = &GetAI_boss_ionar; + newscript->pEffectDummyCreature = &EffectDummyCreature_boss_ionar; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_spark_of_ionar"; + newscript->GetAI = &GetAI_mob_spark_of_ionar; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp new file mode 100644 index 00000000000..f08c19efca2 --- /dev/null +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp @@ -0,0 +1,222 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Boss Loken +SD%Complete: 60% +SDComment: Missing intro. Remove hack of Pulsing Shockwave when core supports. Aura is not working (59414) +SDCategory: Halls of Lightning +EndScriptData */ + +#include "ScriptedPch.h" +#include "halls_of_lightning.h" + +enum eEnums +{ + ACHIEV_TIMELY_DEATH_START_EVENT = 20384, + + SAY_AGGRO = -1602018, + SAY_INTRO_1 = -1602019, + SAY_INTRO_2 = -1602020, + SAY_SLAY_1 = -1602021, + SAY_SLAY_2 = -1602022, + SAY_SLAY_3 = -1602023, + SAY_DEATH = -1602024, + SAY_NOVA_1 = -1602025, + SAY_NOVA_2 = -1602026, + SAY_NOVA_3 = -1602027, + SAY_75HEALTH = -1602028, + SAY_50HEALTH = -1602029, + SAY_25HEALTH = -1602030, + EMOTE_NOVA = -1602031, + + SPELL_ARC_LIGHTNING = 52921, + SPELL_LIGHTNING_NOVA_N = 52960, + SPELL_LIGHTNING_NOVA_H = 59835, + + SPELL_PULSING_SHOCKWAVE_N = 52961, + SPELL_PULSING_SHOCKWAVE_H = 59836, + SPELL_PULSING_SHOCKWAVE_AURA = 59414 +}; + +/*###### +## Boss Loken +######*/ + +struct boss_lokenAI : public ScriptedAI +{ + boss_lokenAI(Creature* pCreature) : ScriptedAI(pCreature) + { + m_pInstance = pCreature->GetInstanceData(); + } + + ScriptedInstance* m_pInstance; + + bool m_bIsAura; + + uint32 m_uiArcLightning_Timer; + uint32 m_uiLightningNova_Timer; + uint32 m_uiPulsingShockwave_Timer; + uint32 m_uiResumePulsingShockwave_Timer; + + uint32 m_uiHealthAmountModifier; + + void Reset() + { + m_bIsAura = false; + + m_uiArcLightning_Timer = 15000; + m_uiLightningNova_Timer = 20000; + m_uiPulsingShockwave_Timer = 2000; + m_uiResumePulsingShockwave_Timer = 15000; + + m_uiHealthAmountModifier = 1; + + if (m_pInstance) + { + m_pInstance->SetData(TYPE_LOKEN, NOT_STARTED); + m_pInstance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMELY_DEATH_START_EVENT); + } + } + + void EnterCombat(Unit* /*pWho*/) + { + DoScriptText(SAY_AGGRO, me); + + if (m_pInstance) + { + m_pInstance->SetData(TYPE_LOKEN, IN_PROGRESS); + m_pInstance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMELY_DEATH_START_EVENT); + } + } + + void JustDied(Unit* /*pKiller*/) + { + DoScriptText(SAY_DEATH, me); + + if (m_pInstance) + m_pInstance->SetData(TYPE_LOKEN, DONE); + } + + void KilledUnit(Unit* /*pVictim*/) + { + DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); + } + + void UpdateAI(const uint32 uiDiff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + if (m_bIsAura) + { + // workaround for PULSING_SHOCKWAVE + if (m_uiPulsingShockwave_Timer <= uiDiff) + { + Map* pMap = me->GetMap(); + if (pMap->IsDungeon()) + { + Map::PlayerList const &PlayerList = pMap->GetPlayers(); + + if (PlayerList.isEmpty()) + return; + + for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) + if (i->getSource() && i->getSource()->isAlive() && i->getSource()->isTargetableForAttack()) + { + int32 dmg; + float m_fDist = me->GetExactDist(i->getSource()->GetPositionX(), i->getSource()->GetPositionY(), i->getSource()->GetPositionZ()); + + dmg = DUNGEON_MODE(100, 150); // need to correct damage + if (m_fDist > 1.0f) // Further from 1 yard + dmg *= m_fDist; + + me->CastCustomSpell(i->getSource(), DUNGEON_MODE(52942, 59837), &dmg, 0, 0, false); + } + } + m_uiPulsingShockwave_Timer = 2000; + } else m_uiPulsingShockwave_Timer -= uiDiff; + } + else + { + if (m_uiResumePulsingShockwave_Timer <= uiDiff) + { + //breaks at movement, can we assume when it's time, this spell is casted and also must stop movement? + DoCast(me, SPELL_PULSING_SHOCKWAVE_AURA, true); + + DoCast(me, SPELL_PULSING_SHOCKWAVE_N); // need core support + m_bIsAura = true; + m_uiResumePulsingShockwave_Timer = 0; + } + else + m_uiResumePulsingShockwave_Timer -= uiDiff; + } + + if (m_uiArcLightning_Timer <= uiDiff) + { + if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, SPELL_ARC_LIGHTNING); + + m_uiArcLightning_Timer = 15000 + rand()%1000; + } + else + m_uiArcLightning_Timer -= uiDiff; + + if (m_uiLightningNova_Timer <= uiDiff) + { + DoScriptText(RAND(SAY_NOVA_1,SAY_NOVA_2,SAY_NOVA_3), me); + DoScriptText(EMOTE_NOVA, me); + DoCast(me, SPELL_LIGHTNING_NOVA_N); + + m_bIsAura = false; + m_uiResumePulsingShockwave_Timer = DUNGEON_MODE(5000, 4000); // Pause Pulsing Shockwave aura + m_uiLightningNova_Timer = 20000 + rand()%1000; + } + else + m_uiLightningNova_Timer -= uiDiff; + + // Health check + if ((me->GetHealth()*100 / me->GetMaxHealth()) < (100-(25*m_uiHealthAmountModifier))) + { + switch(m_uiHealthAmountModifier) + { + case 1: DoScriptText(SAY_75HEALTH, me); break; + case 2: DoScriptText(SAY_50HEALTH, me); break; + case 3: DoScriptText(SAY_25HEALTH, me); break; + } + + ++m_uiHealthAmountModifier; + } + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_boss_loken(Creature* pCreature) +{ + return new boss_lokenAI(pCreature); +} + +void AddSC_boss_loken() +{ + Script *newscript; + + newscript = new Script; + newscript->Name = "boss_loken"; + newscript->GetAI = &GetAI_boss_loken; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp new file mode 100644 index 00000000000..184050e3103 --- /dev/null +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp @@ -0,0 +1,478 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Boss Volkhan +SD%Complete: 60% +SDComment: Not considered complete. Some events may fail and need further development +SDCategory: Halls of Lightning +EndScriptData */ + +#include "ScriptedPch.h" +#include "halls_of_lightning.h" + +enum eEnums +{ + SAY_AGGRO = -1602032, + SAY_SLAY_1 = -1602033, + SAY_SLAY_2 = -1602034, + SAY_SLAY_3 = -1602035, + SAY_DEATH = -1602036, + SAY_STOMP_1 = -1602037, + SAY_STOMP_2 = -1602038, + SAY_FORGE_1 = -1602039, + SAY_FORGE_2 = -1602040, + EMOTE_TO_ANVIL = -1602041, + EMOTE_SHATTER = -1602042, + + SPELL_HEAT_N = 52387, + SPELL_HEAT_H = 59528, + SPELL_SHATTERING_STOMP_N = 52237, + SPELL_SHATTERING_STOMP_H = 59529, + + //unclear how "directions" of spells must be. Last, summoning GO, what is it for? Script depend on: + SPELL_TEMPER = 52238, //TARGET_SCRIPT boss->anvil + SPELL_TEMPER_DUMMY = 52654, //TARGET_SCRIPT anvil->boss + + //SPELL_TEMPER_VISUAL = 52661, //summons GO + + SPELL_SUMMON_MOLTEN_GOLEM = 52405, + + //Molten Golem + SPELL_BLAST_WAVE = 23113, + SPELL_IMMOLATION_STRIKE_N = 52433, + SPELL_IMMOLATION_STRIKE_H = 59530, + SPELL_SHATTER_N = 52429, + SPELL_SHATTER_H = 59527, + + NPC_VOLKHAN_ANVIL = 28823, + NPC_MOLTEN_GOLEM = 28695, + NPC_BRITTLE_GOLEM = 28681, + + POINT_ID_ANVIL = 0, + MAX_GOLEM = 2, + + ACHIEVEMENT_SHATTER_RESISTANT = 2042 +}; + +/*###### +## Boss Volkhan +######*/ + +struct boss_volkhanAI : public ScriptedAI +{ + boss_volkhanAI(Creature *pCreature) : ScriptedAI(pCreature) + { + m_pInstance = pCreature->GetInstanceData(); + } + + ScriptedInstance* m_pInstance; + + std::list m_lGolemGUIDList; + + bool m_bHasTemper; + bool m_bIsStriking; + bool m_bCanShatterGolem; + + uint8 GolemsShattered; + uint32 m_uiPause_Timer; + uint32 m_uiShatteringStomp_Timer; + uint32 m_uiShatter_Timer; + + uint32 m_uiHealthAmountModifier; + + void Reset() + { + m_bIsStriking = false; + m_bHasTemper = false; + m_bCanShatterGolem = false; + + m_uiPause_Timer = 3500; + m_uiShatteringStomp_Timer = 0; + m_uiShatter_Timer = 5000; + GolemsShattered = 0; + + m_uiHealthAmountModifier = 1; + + DespawnGolem(); + m_lGolemGUIDList.clear(); + + if (m_pInstance) + m_pInstance->SetData(TYPE_VOLKHAN, NOT_STARTED); + } + + void EnterCombat(Unit* /*pWho*/) + { + DoScriptText(SAY_AGGRO, me); + + if (m_pInstance) + m_pInstance->SetData(TYPE_VOLKHAN, IN_PROGRESS); + } + + void AttackStart(Unit* pWho) + { + if (me->Attack(pWho, true)) + { + me->AddThreat(pWho, 0.0f); + me->SetInCombatWith(pWho); + pWho->SetInCombatWith(me); + + if (!m_bHasTemper) + me->GetMotionMaster()->MoveChase(pWho); + } + } + + void JustDied(Unit* /*pKiller*/) + { + DoScriptText(SAY_DEATH, me); + DespawnGolem(); + + if (m_pInstance) + m_pInstance->SetData(TYPE_VOLKHAN, DONE); + + if (IsHeroic() && GolemsShattered < 5) + { + AchievementEntry const *AchievShatterResistant = GetAchievementStore()->LookupEntry(ACHIEVEMENT_SHATTER_RESISTANT); + if (AchievShatterResistant) + { + Map* pMap = me->GetMap(); + if (pMap && pMap->IsDungeon()) + { + Map::PlayerList const &players = pMap->GetPlayers(); + for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) + itr->getSource()->CompletedAchievement(AchievShatterResistant); + } + } + } + } + + void KilledUnit(Unit* /*pVictim*/) + { + DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); + } + + void DespawnGolem() + { + if (m_lGolemGUIDList.empty()) + return; + + for (std::list::const_iterator itr = m_lGolemGUIDList.begin(); itr != m_lGolemGUIDList.end(); ++itr) + { + if (Creature* pTemp = Unit::GetCreature(*me, *itr)) + { + if (pTemp->isAlive()) + pTemp->ForcedDespawn(); + } + } + + m_lGolemGUIDList.clear(); + } + + void ShatterGolem() + { + if (m_lGolemGUIDList.empty()) + return; + + for (std::list::const_iterator itr = m_lGolemGUIDList.begin(); itr != m_lGolemGUIDList.end(); ++itr) + { + if (Creature* pTemp = Unit::GetCreature(*me, *itr)) + { + // only shatter brittle golems + if (pTemp->isAlive() && pTemp->GetEntry() == NPC_BRITTLE_GOLEM) + { + pTemp->CastSpell(pTemp, DUNGEON_MODE(SPELL_SHATTER_N, SPELL_SHATTER_H), false); + GolemsShattered += 1; + } + } + } + } + + void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpell) + { + if (pSpell->Id == SPELL_TEMPER_DUMMY) + m_bIsStriking = true; + } + + void JustSummoned(Creature* pSummoned) + { + if (pSummoned->GetEntry() == NPC_MOLTEN_GOLEM) + { + m_lGolemGUIDList.push_back(pSummoned->GetGUID()); + + if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + pSummoned->AI()->AttackStart(pTarget); + + //why healing when just summoned? + pSummoned->CastSpell(pSummoned, DUNGEON_MODE(SPELL_HEAT_N, SPELL_HEAT_H), false, NULL, NULL, me->GetGUID()); + } + } + + void UpdateAI(const uint32 uiDiff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + if (m_bIsStriking) + { + if (m_uiPause_Timer <= uiDiff) + { + if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() != TARGETED_MOTION_TYPE) + { + if (me->getVictim()) + me->GetMotionMaster()->MoveChase(me->getVictim()); + } + + m_bHasTemper = false; + m_bIsStriking = false; + m_uiPause_Timer = 3500; + } + else + m_uiPause_Timer -= uiDiff; + + return; + } + + // When to start shatter? After 60, 40 or 20% hp? + if (!m_bHasTemper && m_uiHealthAmountModifier >= 3) + { + if (m_uiShatteringStomp_Timer <= uiDiff) + { + //should he stomp even if he has no brittle golem to shatter? + + DoScriptText(RAND(SAY_STOMP_1,SAY_STOMP_2), me); + + DoCast(me, SPELL_SHATTERING_STOMP_N); + + DoScriptText(EMOTE_SHATTER, me); + + m_uiShatteringStomp_Timer = 30000; + m_bCanShatterGolem = true; + } + else + m_uiShatteringStomp_Timer -= uiDiff; + } + + // Shatter Golems 3 seconds after Shattering Stomp + if (m_bCanShatterGolem) + { + if (m_uiShatter_Timer <= uiDiff) + { + ShatterGolem(); + m_uiShatter_Timer = 3000; + m_bCanShatterGolem = false; + } + else + m_uiShatter_Timer -= uiDiff; + } + + // Health check + if (!m_bCanShatterGolem && (me->GetHealth()*100 / me->GetMaxHealth()) < (100-(20*m_uiHealthAmountModifier))) + { + ++m_uiHealthAmountModifier; + + if (me->IsNonMeleeSpellCasted(false)) + me->InterruptNonMeleeSpells(false); + + DoScriptText(RAND(SAY_FORGE_1,SAY_FORGE_2), me); + + m_bHasTemper = true; + + DoCast(me, SPELL_TEMPER, false); + } + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_boss_volkhan(Creature* pCreature) +{ + return new boss_volkhanAI(pCreature); +} + +bool EffectDummyCreature_boss_volkhan(Unit* pCaster, uint32 uiSpellId, uint32 uiEffIndex, Creature* pCreatureTarget) +{ + //always check spellid and effectindex + if (uiSpellId == SPELL_TEMPER_DUMMY && uiEffIndex == 0) + { + if (pCaster->GetEntry() != NPC_VOLKHAN_ANVIL || pCreatureTarget->GetEntry() != NPC_VOLKHAN) + return true; + + for (uint8 i = 0; i < MAX_GOLEM; ++i) + { + pCreatureTarget->CastSpell(pCaster, SPELL_SUMMON_MOLTEN_GOLEM, true); + } + + //always return true when we are handling this spell and effect + return true; + } + + return false; +} + +/*###### +## npc_volkhan_anvil +######*/ + +bool EffectDummyCreature_npc_volkhan_anvil(Unit* pCaster, uint32 uiSpellId, uint32 uiEffIndex, Creature* pCreatureTarget) +{ + //always check spellid and effectindex + if (uiSpellId == SPELL_TEMPER && uiEffIndex == 0) + { + if (pCaster->GetEntry() != NPC_VOLKHAN || pCreatureTarget->GetEntry() != NPC_VOLKHAN_ANVIL) + return true; + + Creature *cre = CAST_CRE(pCaster); + + DoScriptText(EMOTE_TO_ANVIL, pCaster); + + float fX, fY, fZ; + pCreatureTarget->GetContactPoint(pCaster, fX, fY, fZ, INTERACTION_DISTANCE); + + pCaster->AttackStop(); + + if (pCaster->GetMotionMaster()->GetCurrentMovementGeneratorType() == TARGETED_MOTION_TYPE) + pCaster->GetMotionMaster()->MovementExpired(); + + cre->GetMap()->CreatureRelocation(cre, fX, fY, fZ, pCreatureTarget->GetOrientation()); + cre->SendMonsterMove(fX, fY, fZ, 0, cre->GetUnitMovementFlags(), 1); + + pCreatureTarget->CastSpell(pCaster, SPELL_TEMPER_DUMMY, false); + + //always return true when we are handling this spell and effect + return true; + } + + return false; +} + +/*###### +## mob_molten_golem +######*/ + +struct mob_molten_golemAI : public ScriptedAI +{ + mob_molten_golemAI(Creature *pCreature) : ScriptedAI(pCreature) + { + } + + bool m_bIsFrozen; + + uint32 m_uiBlast_Timer; + uint32 m_uiDeathDelay_Timer; + uint32 m_uiImmolation_Timer; + + void Reset() + { + m_bIsFrozen = false; + + m_uiBlast_Timer = 20000; + m_uiDeathDelay_Timer = 0; + m_uiImmolation_Timer = 5000; + } + + void AttackStart(Unit* pWho) + { + if (me->Attack(pWho, true)) + { + me->AddThreat(pWho, 0.0f); + me->SetInCombatWith(pWho); + pWho->SetInCombatWith(me); + + if (!m_bIsFrozen) + me->GetMotionMaster()->MoveChase(pWho); + } + } + + void DamageTaken(Unit* /*pDoneBy*/, uint32 &uiDamage) + { + if (uiDamage > me->GetHealth()) + { + me->UpdateEntry(NPC_BRITTLE_GOLEM); + me->SetHealth(1); + uiDamage = 0; + me->RemoveAllAuras(); + me->AttackStop(); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED); + if (me->IsNonMeleeSpellCasted(false)) + me->InterruptNonMeleeSpells(false); + if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() == TARGETED_MOTION_TYPE) + me->GetMotionMaster()->MovementExpired(); + m_bIsFrozen = true; + } + } + + void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpell) + { + //this is the dummy effect of the spells + if (pSpell->Id == SPELL_SHATTER_N || pSpell->Id == SPELL_SHATTER_H) + { + if (me->GetEntry() == NPC_BRITTLE_GOLEM) + me->ForcedDespawn(); + } + } + + void UpdateAI(const uint32 uiDiff) + { + //Return since we have no target or if we are frozen + if (!UpdateVictim() || m_bIsFrozen) + return; + + if (m_uiBlast_Timer <= uiDiff) + { + DoCast(me, SPELL_BLAST_WAVE); + m_uiBlast_Timer = 20000; + } + else + m_uiBlast_Timer -= uiDiff; + + if (m_uiImmolation_Timer <= uiDiff) + { + DoCast(me->getVictim(), SPELL_IMMOLATION_STRIKE_N); + m_uiImmolation_Timer = 5000; + } + else + m_uiImmolation_Timer -= uiDiff; + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_mob_molten_golem(Creature* pCreature) +{ + return new mob_molten_golemAI(pCreature); +} + +void AddSC_boss_volkhan() +{ + Script *newscript; + + newscript = new Script; + newscript->Name = "boss_volkhan"; + newscript->GetAI = &GetAI_boss_volkhan; + newscript->pEffectDummyCreature = &EffectDummyCreature_boss_volkhan; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "npc_volkhan_anvil"; + newscript->pEffectDummyCreature = &EffectDummyCreature_npc_volkhan_anvil; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_molten_golem"; + newscript->GetAI = &GetAI_mob_molten_golem; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h new file mode 100644 index 00000000000..d9739fdf888 --- /dev/null +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h @@ -0,0 +1,34 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software licensed under GPL version 2 + * Please see the included DOCS/LICENSE.TXT for more information */ + +#ifndef DEF_HALLS_OF_LIGHTNING_H +#define DEF_HALLS_OF_LIGHTNING_H + +enum eTypes +{ + MAX_ENCOUNTER = 4, + + DATA_BJARNGRIM = 1, + DATA_IONAR = 2, + DATA_LOKEN = 3, + DATA_VOLKHAN = 4, + + TYPE_BJARNGRIM = 10, + TYPE_IONAR = 11, + TYPE_LOKEN = 12, + TYPE_VOLKHAN = 13, + + NPC_BJARNGRIM = 28586, + NPC_VOLKHAN = 28587, + NPC_IONAR = 28546, + NPC_LOKEN = 28923, + + GO_BJARNGRIM_DOOR = 191416, //_doors10 + GO_VOLKHAN_DOOR = 191325, //_doors07 + GO_IONAR_DOOR = 191326, //_doors05 + GO_LOKEN_DOOR = 191324, //_doors02 + GO_LOKEN_THRONE = 192654 +}; + +#endif diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp new file mode 100644 index 00000000000..46cd5c9cccc --- /dev/null +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp @@ -0,0 +1,248 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Instance_Halls_of_Lightning +SD%Complete: 90% +SDComment: All ready. +SDCategory: Halls of Lightning +EndScriptData */ + +#include "ScriptedPch.h" +#include "halls_of_lightning.h" + +/* Halls of Lightning encounters: +0 - General Bjarngrim +1 - Volkhan +2 - Ionar +3 - Loken +*/ + +struct instance_halls_of_lightning : public ScriptedInstance +{ + instance_halls_of_lightning(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; + + uint32 m_auiEncounter[MAX_ENCOUNTER]; + + uint64 m_uiGeneralBjarngrimGUID; + uint64 m_uiIonarGUID; + uint64 m_uiLokenGUID; + uint64 m_uiVolkhanGUID; + + uint64 m_uiBjarngrimDoorGUID; + uint64 m_uiVolkhanDoorGUID; + uint64 m_uiIonarDoorGUID; + uint64 m_uiLokenDoorGUID; + uint64 m_uiLokenGlobeGUID; + + void Initialize() + { + memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); + + m_uiGeneralBjarngrimGUID = 0; + m_uiVolkhanGUID = 0; + m_uiIonarGUID = 0; + m_uiLokenGUID = 0; + + m_uiBjarngrimDoorGUID = 0; + m_uiVolkhanDoorGUID = 0; + m_uiIonarDoorGUID = 0; + m_uiLokenDoorGUID = 0; + m_uiLokenGlobeGUID = 0; + } + + void OnCreatureCreate(Creature* pCreature, bool /*add*/) + { + switch(pCreature->GetEntry()) + { + case NPC_BJARNGRIM: + m_uiGeneralBjarngrimGUID = pCreature->GetGUID(); + break; + case NPC_VOLKHAN: + m_uiVolkhanGUID = pCreature->GetGUID(); + break; + case NPC_IONAR: + m_uiIonarGUID = pCreature->GetGUID(); + break; + case NPC_LOKEN: + m_uiLokenGUID = pCreature->GetGUID(); + break; + } + } + + void OnGameObjectCreate(GameObject* pGo, bool /*add*/) + { + switch(pGo->GetEntry()) + { + case GO_BJARNGRIM_DOOR: + m_uiBjarngrimDoorGUID = pGo->GetGUID(); + if (m_auiEncounter[0] == DONE) + pGo->SetGoState(GO_STATE_ACTIVE); + else + pGo->SetGoState(GO_STATE_READY); + break; + case GO_VOLKHAN_DOOR: + m_uiVolkhanDoorGUID = pGo->GetGUID(); + if (m_auiEncounter[1] == DONE) + pGo->SetGoState(GO_STATE_ACTIVE); + else + pGo->SetGoState(GO_STATE_READY); + break; + case GO_IONAR_DOOR: + m_uiIonarDoorGUID = pGo->GetGUID(); + if (m_auiEncounter[2] == DONE) + pGo->SetGoState(GO_STATE_ACTIVE); + else + pGo->SetGoState(GO_STATE_READY); + break; + case GO_LOKEN_DOOR: + m_uiLokenDoorGUID = pGo->GetGUID(); + if (m_auiEncounter[3] == DONE) + pGo->SetGoState(GO_STATE_ACTIVE); + else + pGo->SetGoState(GO_STATE_READY); + break; + case GO_LOKEN_THRONE: + m_uiLokenGlobeGUID = pGo->GetGUID(); + break; + } + } + + void SetData(uint32 uiType, uint32 uiData) + { + switch(uiType) + { + case TYPE_BJARNGRIM: + if (uiData == DONE) + DoUseDoorOrButton(m_uiBjarngrimDoorGUID); + m_auiEncounter[0] = uiData; + break; + case TYPE_VOLKHAN: + if (uiData == DONE) + DoUseDoorOrButton(m_uiVolkhanDoorGUID); + m_auiEncounter[1] = uiData; + break; + case TYPE_IONAR: + if (uiData == DONE) + DoUseDoorOrButton(m_uiIonarDoorGUID); + m_auiEncounter[2] = uiData; + break; + case TYPE_LOKEN: + if (uiData == DONE) + { + DoUseDoorOrButton(m_uiLokenDoorGUID); + + //Appears to be type 5 GO with animation. Need to figure out how this work, code below only placeholder + if (GameObject* pGlobe = instance->GetGameObject(m_uiLokenGlobeGUID)) + pGlobe->SetGoState(GO_STATE_ACTIVE); + } + m_auiEncounter[3] = uiData; + break; + } + + if (uiData == DONE) + SaveToDB(); + } + + uint32 GetData(uint32 uiType) + { + switch(uiType) + { + case TYPE_BJARNGRIM: + return m_auiEncounter[0]; + case TYPE_VOLKHAN: + return m_auiEncounter[1]; + case TYPE_IONAR: + return m_auiEncounter[2]; + case TYPE_LOKEN: + return m_auiEncounter[3]; + } + return 0; + } + + uint64 GetData64(uint32 uiData) + { + switch(uiData) + { + case DATA_BJARNGRIM: + return m_uiGeneralBjarngrimGUID; + case DATA_VOLKHAN: + return m_uiVolkhanGUID; + case DATA_IONAR: + return m_uiIonarGUID; + case DATA_LOKEN: + return m_uiLokenGUID; + } + return 0; + } + + std::string GetSaveData() + { + OUT_SAVE_INST_DATA; + + std::ostringstream saveStream; + saveStream << "H L " << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " + << m_auiEncounter[2] << " " << m_auiEncounter[3]; + + OUT_SAVE_INST_DATA_COMPLETE; + return saveStream.str(); + } + + void Load(const char* in) + { + if (!in) + { + OUT_LOAD_INST_DATA_FAIL; + return; + } + + OUT_LOAD_INST_DATA(in); + + char dataHead1, dataHead2; + uint16 data0, data1, data2, data3; + + std::istringstream loadStream(in); + loadStream >> dataHead1 >> dataHead2 >> data0 >> data1 >> data2 >> data3; + + if (dataHead1 == 'H' && dataHead2 == 'L') + { + m_auiEncounter[0] = data0; + m_auiEncounter[1] = data1; + m_auiEncounter[2] = data2; + m_auiEncounter[3] = data3; + + for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) + if (m_auiEncounter[i] == IN_PROGRESS) + m_auiEncounter[i] = NOT_STARTED; + } else OUT_LOAD_INST_DATA_FAIL; + + OUT_LOAD_INST_DATA_COMPLETE; + } +}; + +InstanceData* GetInstanceData_instance_halls_of_lightning(Map* pMap) +{ + return new instance_halls_of_lightning(pMap); +} + +void AddSC_instance_halls_of_lightning() +{ + Script *newscript; + newscript = new Script; + newscript->Name = "instance_halls_of_lightning"; + newscript->GetInstanceData = &GetInstanceData_instance_halls_of_lightning; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp new file mode 100644 index 00000000000..0674b7c79eb --- /dev/null +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp @@ -0,0 +1,148 @@ +/* Script Data Start +SDName: Boss krystallus +SDAuthor: LordVanMartin +SD%Complete: +SDComment: +SDCategory: +Script Data End */ + +/*** SQL START *** +update creature_template set scriptname = 'boss_krystallus' where entry = ''; +*** SQL END ***/ +#include "ScriptedPch.h" +#include "halls_of_stone.h" + +enum Spells +{ + SPELL_BOULDER_TOSS = 50843, + H_SPELL_BOULDER_TOSS = 59742, + SPELL_GROUND_SPIKE = 59750, + SPELL_GROUND_SLAM = 50827, + SPELL_SHATTER = 50810, + H_SPELL_SHATTER = 61546, + SPELL_STOMP = 48131, + H_SPELL_STOMP = 59744 +}; + +enum Yells +{ + SAY_AGGRO = -1599007, + SAY_KILL = -1599008, + SAY_DEATH = -1599009, + SAY_SHATTER = -1599010 +}; + +struct boss_krystallusAI : public ScriptedAI +{ + boss_krystallusAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + } + + uint32 uiBoulderTossTimer; + uint32 uiGroundSpikeTimer; + uint32 uiGroundSlamTimer; + uint32 uiShatterTimer; + uint32 uiStompTimer; + + bool bIsSlam; + + ScriptedInstance* pInstance; + + void Reset() + { + bIsSlam = false; + + uiBoulderTossTimer = 3000 + rand()%6000; + uiGroundSpikeTimer = 9000 + rand()%5000; + uiGroundSlamTimer = 15000 + rand()%3000; + uiStompTimer = 20000 + rand()%9000; + uiShatterTimer = 0; + + if (pInstance) + pInstance->SetData(DATA_KRYSTALLUS_EVENT, NOT_STARTED); + } + void EnterCombat(Unit* /*who*/) + { + DoScriptText(SAY_AGGRO, me); + + if (pInstance) + pInstance->SetData(DATA_KRYSTALLUS_EVENT, IN_PROGRESS); + } + + void UpdateAI(const uint32 diff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + if (uiBoulderTossTimer <= diff) + { + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(pTarget, SPELL_BOULDER_TOSS); + uiBoulderTossTimer = 9000 + rand()%6000; + } else uiBoulderTossTimer -= diff; + + if (uiGroundSpikeTimer <= diff) + { + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(pTarget, SPELL_GROUND_SPIKE); + uiGroundSpikeTimer = 12000 + rand()%5000; + } else uiGroundSpikeTimer -= diff; + + if (uiStompTimer <= diff) + { + DoCast(me, SPELL_STOMP); + uiStompTimer = 20000 + rand()%9000; + } else uiStompTimer -= diff; + + if (uiGroundSlamTimer <= diff) + { + DoCast(me, SPELL_GROUND_SLAM); + bIsSlam = true; + uiShatterTimer = 10000; + uiGroundSlamTimer = 15000 + rand()%3000; + } else uiGroundSlamTimer -= diff; + + if (bIsSlam) + { + if (uiShatterTimer <= diff) + { + DoCast(me, SPELL_SHATTER); + bIsSlam = false; + } else uiShatterTimer -= diff; + } + + DoMeleeAttackIfReady(); + } + + void JustDied(Unit* /*killer*/) + { + DoScriptText(SAY_DEATH, me); + + if (pInstance) + pInstance->SetData(DATA_KRYSTALLUS_EVENT, DONE); + } + + void KilledUnit(Unit * victim) + { + if (victim == me) + return; + DoScriptText(SAY_KILL, me); + } +}; + +CreatureAI* GetAI_boss_krystallus(Creature* pCreature) +{ + return new boss_krystallusAI (pCreature); +} + +void AddSC_boss_krystallus() +{ + Script *newscript; + + newscript = new Script; + newscript->Name = "boss_krystallus"; + newscript->GetAI = &GetAI_boss_krystallus; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp new file mode 100644 index 00000000000..b3c3c675347 --- /dev/null +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp @@ -0,0 +1,166 @@ +/* Script Data Start +SDName: Boss maiden_of_grief +SDAuthor: LordVanMartin +SD%Complete: +SDComment: +SDCategory: +Script Data End */ + +/*** SQL START *** +update creature_template set scriptname = 'boss_maiden_of_grief' where entry = ''; +*** SQL END ***/ +#include "ScriptedPch.h" +#include "halls_of_stone.h" + +enum Spells +{ + SPELL_PARTING_SORROW = 59723, + SPELL_STORM_OF_GRIEF_N = 50752, + SPELL_STORM_OF_GRIEF_H = 59772, + SPELL_SHOCK_OF_SORROW_N = 50760, + SPELL_SHOCK_OF_SORROW_H = 59726, + SPELL_PILLAR_OF_WOE_N = 50761, + SPELL_PILLAR_OF_WOE_H = 59727 +}; + +enum Yells +{ + SAY_AGGRO = -1599000, + SAY_SLAY_1 = -1599001, + SAY_SLAY_2 = -1599002, + SAY_SLAY_3 = -1599003, + SAY_SLAY_4 = -1599004, + SAY_DEATH = -1599005, + SAY_STUN = -1599006 +}; + +enum Achievements +{ + ACHIEV_GOOD_GRIEF_START_EVENT = 20383, +}; + +struct boss_maiden_of_griefAI : public ScriptedAI +{ + boss_maiden_of_griefAI(Creature *c) : ScriptedAI(c) + { + pInstance = me->GetInstanceData(); + } + + ScriptedInstance* pInstance; + + uint32 PartingSorrowTimer; + uint32 StormOfGriefTimer; + uint32 ShockOfSorrowTimer; + uint32 PillarOfWoeTimer; + + void Reset() + { + PartingSorrowTimer = 25000 + rand()%5000; + StormOfGriefTimer = 10000; + ShockOfSorrowTimer = 20000+rand()%5000; + PillarOfWoeTimer = 5000 + rand()%10000; + + if (pInstance) + { + pInstance->SetData(DATA_MAIDEN_OF_GRIEF_EVENT, NOT_STARTED); + pInstance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_GOOD_GRIEF_START_EVENT); + } + } + + void EnterCombat(Unit* /*who*/) + { + DoScriptText(SAY_AGGRO, me); + + if (pInstance) + { + if (GameObject *pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_MAIDEN_DOOR))) + if (pDoor->GetGoState() == GO_STATE_READY) + { + EnterEvadeMode(); + return; + } + + pInstance->SetData(DATA_MAIDEN_OF_GRIEF_EVENT, IN_PROGRESS); + pInstance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_GOOD_GRIEF_START_EVENT); + } + } + + void UpdateAI(const uint32 diff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + if (IsHeroic()) + { + if (PartingSorrowTimer <= diff) + { + Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); + + if (pTarget) + DoCast(pTarget, SPELL_PARTING_SORROW); + + PartingSorrowTimer = 30000 + rand()%10000; + } else PartingSorrowTimer -= diff; + } + + if (StormOfGriefTimer <= diff) + { + DoCast(me->getVictim(), SPELL_STORM_OF_GRIEF_N, true); + StormOfGriefTimer = 15000 + rand()%5000; + } else StormOfGriefTimer -= diff; + + if (ShockOfSorrowTimer <= diff) + { + DoResetThreat(); + DoScriptText(SAY_STUN, me); + DoCast(me, SPELL_SHOCK_OF_SORROW_N); + ShockOfSorrowTimer = 20000 + rand()%10000; + } else ShockOfSorrowTimer -= diff; + + if (PillarOfWoeTimer <= diff) + { + Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 1); + + if (pTarget) + DoCast(pTarget, SPELL_PILLAR_OF_WOE_N); + else + DoCast(me->getVictim(), SPELL_PILLAR_OF_WOE_N); + + PillarOfWoeTimer = 5000 + rand()%20000; + } else PillarOfWoeTimer -= diff; + + DoMeleeAttackIfReady(); + } + + void JustDied(Unit* /*killer*/) + { + DoScriptText(SAY_DEATH, me); + + if (pInstance) + pInstance->SetData(DATA_MAIDEN_OF_GRIEF_EVENT, DONE); + } + + void KilledUnit(Unit * victim) + { + if (victim == me) + return; + + DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3,SAY_SLAY_4), me); + } +}; + +CreatureAI* GetAI_boss_maiden_of_grief(Creature* pCreature) +{ + return new boss_maiden_of_griefAI (pCreature); +} + +void AddSC_boss_maiden_of_grief() +{ + Script *newscript; + + newscript = new Script; + newscript->Name = "boss_maiden_of_grief"; + newscript->GetAI = &GetAI_boss_maiden_of_grief; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp new file mode 100644 index 00000000000..68c3e34e6bf --- /dev/null +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp @@ -0,0 +1,300 @@ +/* Script Data Start +SDName: Boss sjonnir +SDAuthor: LordVanMartin +SD%Complete: +SDComment: +SDCategory: +Script Data End */ + +/*** SQL START *** +update creature_template set scriptname = 'boss_sjonnir' where entry = ''; +*** SQL END ***/ +#include "ScriptedPch.h" +#include "halls_of_stone.h" + +enum Spells +{ + SPELL_LIGHTING_RING = 51849, //Periodic Trigger (interval 2s) spell = 50841 + H_SPELL_LIGHTING_RING = 59861, //Periodic Trigger (interval 2s) spell = 59849 + SPELL_LIGHTING_RING_1 = 50840, //Periodic Trigger (interval 2s) spell = 50841 + H_SPELL_LIGHTING_RING_1 = 59848, //Periodic Trigger (interval 2s) spell = 59849 + SPELL_STATIC_CHARGE = 50834, //Periodic Trigger 2s interval, spell =50835 + H_SPELL_STATIC_CHARGE = 59846, //Periodic Trigger 2s interval, spell =50847 + SPELL_CHAIN_LIGHTING = 50830, + H_SPELL_CHAIN_LIGHTING = 59844, + SPELL_LIGHTING_SHIELD = 50831, + H_SPELL_LIGHTING_SHIELD = 59845, + SPELL_FRENZY = 28747 +}; + +enum Yells +{ + SAY_AGGRO = -1599011, + SAY_SLAY_1 = -1599012, + SAY_SLAY_2 = -1599013, + SAY_SLAY_3 = -1599014, + SAY_DEATH = -1599015 +}; + +#define EMOTE_GENERIC_FRENZY -1000002 + +enum SjonnirCreatures +{ + CREATURE_FORGED_IRON_TROGG = 27979, + CREATURE_MALFORMED_OOZE = 27981, + CREATURE_FORGED_IRON_DWARF = 27982, + CREATURE_IRON_SLUDGE = 28165 +}; + +enum Misc +{ + DATA_TIME_BEFORE_OOZE = 150000, //2min 30 secs + ACHIEV_ABUSE_THE_OOZE = 2155 +}; + +struct Locations +{ + float x, y, z; +}; + +static Locations PipeLocations[] = +{ + {1295.44, 734.07, 200.3}, //left + {1297.7, 595.6, 199.9} //right +}; + +static Locations CenterPoint = {1295.21, 667.157, 189.691}; + +struct boss_sjonnirAI : public ScriptedAI +{ + boss_sjonnirAI(Creature *c) : ScriptedAI(c), lSummons(me) + { + pInstance = c->GetInstanceData(); + } + + bool bIsFrenzy; + + uint32 uiChainLightningTimer; + uint32 uiLightningShieldTimer; + uint32 uiStaticChargeTimer; + uint32 uiLightningRingTimer; + uint32 uiSummonTimer; + uint32 uiFrenzyTimer; + uint32 uiEncounterTimer; + uint32 uiKilledIronSludges; + + SummonList lSummons; + + ScriptedInstance* pInstance; + + void Reset() + { + bIsFrenzy = false; + + uiEncounterTimer = 0; + uiChainLightningTimer = 3000 + rand()%5000; + uiLightningShieldTimer = 20000 + rand()%5000; + uiStaticChargeTimer = 20000 + rand()%5000; + uiLightningRingTimer = 30000 + rand()%5000; + uiSummonTimer = 5000; + uiFrenzyTimer = 300000; //5 minutes + uiKilledIronSludges = 0; + + lSummons.DespawnAll(); + + if (pInstance) + pInstance->SetData(DATA_SJONNIR_EVENT, NOT_STARTED); + } + + void EnterCombat(Unit* /*who*/) + { + DoScriptText(SAY_AGGRO, me); + + uiEncounterTimer = 0; + + if (pInstance) + { + if (GameObject *pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_SJONNIR_DOOR))) + if (pDoor->GetGoState() == GO_STATE_READY) + { + EnterEvadeMode(); + return; + } + + pInstance->SetData(DATA_SJONNIR_EVENT, IN_PROGRESS); + } + } + + void UpdateAI(const uint32 diff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + if (uiChainLightningTimer <= diff) + { + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(pTarget, SPELL_CHAIN_LIGHTING); + uiChainLightningTimer = 10000 + rand()%5000; + } else uiChainLightningTimer -= diff; + + if (uiLightningShieldTimer <= diff) + { + DoCast(me, SPELL_LIGHTING_SHIELD); + uiLightningShieldTimer -= diff; + } + + if (uiStaticChargeTimer <= diff) + { + DoCast(me->getVictim(), SPELL_STATIC_CHARGE); + uiStaticChargeTimer = 20000 + rand()%5000; + } uiStaticChargeTimer -= diff; + + if (uiLightningRingTimer <= diff) + { + if (me->IsNonMeleeSpellCasted(false)) + me->InterruptNonMeleeSpells(false); + DoCast(me, SPELL_LIGHTING_RING); + uiLightningRingTimer = 30000 + rand()%5000; + } else uiLightningRingTimer -= diff; + + if (uiSummonTimer <= diff) + { + uint32 uiSummonPipe = rand()%2; + me->SummonCreature(uiEncounterTimer > DATA_TIME_BEFORE_OOZE ? CREATURE_MALFORMED_OOZE : + RAND(CREATURE_FORGED_IRON_DWARF,CREATURE_FORGED_IRON_TROGG), + PipeLocations[uiSummonPipe].x, PipeLocations[uiSummonPipe].y, PipeLocations[uiSummonPipe].z, 0.0f, + TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000); + uiSummonTimer = 20000; + } else uiSummonTimer -= diff; + + if (!bIsFrenzy) + { + if (uiFrenzyTimer <= diff) + { + DoCast(me, SPELL_FRENZY); + bIsFrenzy = true; + } + else uiFrenzyTimer -= diff; + } + + uiEncounterTimer +=diff; + + DoMeleeAttackIfReady(); + } + + void JustSummoned(Creature* summon) + { + summon->GetMotionMaster()->MovePoint(0, CenterPoint.x, CenterPoint.y, CenterPoint.z); + /*if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + summon->AI()->AttackStart(pTarget);*/ + lSummons.Summon(summon); + } + + void JustDied(Unit* /*killer*/) + { + DoScriptText(SAY_DEATH, me); + lSummons.DespawnAll(); + + if (pInstance) + { + pInstance->SetData(DATA_SJONNIR_EVENT, DONE); + if (IsHeroic() && uiKilledIronSludges > 4) + pInstance->DoCompleteAchievement(ACHIEV_ABUSE_THE_OOZE); + } + } + void KilledUnit(Unit * victim) + { + if (victim == me) + return; + DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); + } + + void KilledIronSludge() + { + ++uiKilledIronSludges; + } +}; + +CreatureAI* GetAI_boss_sjonnir(Creature* pCreature) +{ + return new boss_sjonnirAI (pCreature); +} + +struct mob_malformed_oozeAI : public ScriptedAI +{ + mob_malformed_oozeAI(Creature *c) : ScriptedAI(c) {} + + uint32 uiMergeTimer; + + void Reset() + { + uiMergeTimer = 10000; + } + + void UpdateAI(const uint32 diff) + { + if (uiMergeTimer <= diff) + { + if (Creature* pTemp = me->FindNearestCreature(CREATURE_MALFORMED_OOZE, 3.0f, true)) + { + DoSpawnCreature(CREATURE_IRON_SLUDGE, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 20000); + pTemp->DisappearAndDie(); + me->DisappearAndDie(); + } + uiMergeTimer = 3000; + } else uiMergeTimer -= diff; + + if (!UpdateVictim()) + return; + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_mob_malformed_ooze(Creature* pCreature) +{ + return new mob_malformed_oozeAI(pCreature); +} + +struct mob_iron_sludgeAI : public ScriptedAI +{ + mob_iron_sludgeAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + } + + ScriptedInstance* pInstance; + + void JustDied(Unit* /*pKiller*/) + { + if (pInstance) + if (Creature* pSjonnir = Unit::GetCreature(*me, pInstance->GetData64(DATA_SJONNIR))) + CAST_AI(boss_sjonnirAI, pSjonnir->AI())->KilledIronSludge(); + } +}; + +CreatureAI* GetAI_mob_iron_sludge(Creature* pCreature) +{ + return new mob_iron_sludgeAI(pCreature); +} + +void AddSC_boss_sjonnir() +{ + Script *newscript; + + newscript = new Script; + newscript->Name = "boss_sjonnir"; + newscript->GetAI = &GetAI_boss_sjonnir; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_malformed_ooze"; + newscript->GetAI = &GetAI_mob_malformed_ooze; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_iron_sludge"; + newscript->GetAI = &GetAI_mob_iron_sludge; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp new file mode 100644 index 00000000000..8febdaab879 --- /dev/null +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp @@ -0,0 +1,724 @@ +#include "ScriptedPch.h" +#include "ScriptedEscortAI.h" +#include "halls_of_stone.h" + +enum Texts +{ + SAY_KILL_1 = -1599016, + SAY_KILL_2 = -1599017, + SAY_KILL_3 = -1599018, + SAY_LOW_HEALTH = -1599019, + SAY_DEATH = -1599020, + SAY_PLAYER_DEATH_1 = -1599021, + SAY_PLAYER_DEATH_2 = -1599022, + SAY_PLAYER_DEATH_3 = -1599023, + SAY_ESCORT_START = -1599024, + + SAY_SPAWN_DWARF = -1599025, + SAY_SPAWN_TROGG = -1599026, + SAY_SPAWN_OOZE = -1599027, + SAY_SPAWN_EARTHEN = -1599028, + + SAY_EVENT_INTRO_1 = -1599029, + SAY_EVENT_INTRO_2 = -1599030, + SAY_EVENT_INTRO_3_ABED = -1599031, + + SAY_EVENT_A_1 = -1599032, + SAY_EVENT_A_2_KADD = -1599033, + SAY_EVENT_A_3 = -1599034, + + SAY_EVENT_B_1 = -1599035, + SAY_EVENT_B_2_MARN = -1599036, + SAY_EVENT_B_3 = -1599037, + + SAY_EVENT_C_1 = -1599038, + SAY_EVENT_C_2_ABED = -1599039, + SAY_EVENT_C_3 = -1599040, + + SAY_EVENT_D_1 = -1599041, + SAY_EVENT_D_2_ABED = -1599042, + SAY_EVENT_D_3 = -1599043, + SAY_EVENT_D_4_ABED = -1599044, + + SAY_EVENT_END_01 = -1599045, + SAY_EVENT_END_02 = -1599046, + SAY_EVENT_END_03_ABED = -1599047, + SAY_EVENT_END_04 = -1599048, + SAY_EVENT_END_05_ABED = -1599049, + SAY_EVENT_END_06 = -1599050, + SAY_EVENT_END_07_ABED = -1599051, + SAY_EVENT_END_08 = -1599052, + SAY_EVENT_END_09_KADD = -1599053, + SAY_EVENT_END_10 = -1599054, + SAY_EVENT_END_11_KADD = -1599055, + SAY_EVENT_END_12 = -1599056, + SAY_EVENT_END_13_KADD = -1599057, + SAY_EVENT_END_14 = -1599058, + SAY_EVENT_END_15_MARN = -1599059, + SAY_EVENT_END_16 = -1599060, + SAY_EVENT_END_17_MARN = -1599061, + SAY_EVENT_END_18 = -1599062, + SAY_EVENT_END_19_MARN = -1599063, + SAY_EVENT_END_20 = -1599064, + SAY_EVENT_END_21_ABED = -1599065, + + SAY_VICTORY_SJONNIR_1 = -1599066, + SAY_VICTORY_SJONNIR_2 = -1599067, + + SAY_ENTRANCE_MEET = -1599068, + + TEXT_ID_START = 13100, + TEXT_ID_PROGRESS = 13101 +}; + +enum BrannCreatures +{ + CREATURE_TRIBUNAL_OF_THE_AGES = 28234, + CREATURE_BRANN_BRONZEBEARD = 28070, + CREATURE_DARK_MATTER_TARGET = 28237, + CREATURE_SEARING_GAZE_TARGET = 28265, + CREATURE_DARK_RUNE_PROTECTOR = 27983, + CREATURE_DARK_RUNE_STORMCALLER = 27984, + CREATURE_IRON_GOLEM_CUSTODIAN = 27985, +}; + +enum Spells +{ + SPELL_STEALTH = 58506, + //Kadrak + SPELL_GLARE_OF_THE_TRIBUNAL = 50988, + H_SPELL_GLARE_OF_THE_TRIBUNAL = 59868, + //Marnak + SPELL_DARK_MATTER = 51012, + H_SPELL_DARK_MATTER = 59868, + //Abedneum + SPELL_SEARING_GAZE = 51136, + H_SPELL_SEARING_GAZE = 59867 +}; + +enum Quests +{ + QUEST_HALLS_OF_STONE = 13207 +}; + +enum Achievements +{ + ACHIEV_BRANN_SPANKIN_NEW = 2154 +}; + +#define GOSSIP_ITEM_START "Brann, it would be our honor!" +#define GOSSIP_ITEM_PROGRESS "Let's move Brann, enough of the history lessons!" + +static Position SpawnLocations[]= +{ + {946.992, 397.016, 208.374}, + {960.748, 382.944, 208.374}, +}; + +struct mob_tribuna_controllerAI : public ScriptedAI +{ + mob_tribuna_controllerAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + SetCombatMovement(false); + } + + ScriptedInstance* pInstance; + + uint32 uiKaddrakEncounterTimer; + uint32 uiMarnakEncounterTimer; + uint32 uiAbedneumEncounterTimer; + + bool bKaddrakActivated; + bool bMarnakActivated; + bool bAbedneumActivated; + + std::list KaddrakGUIDList; + + void Reset() + { + uiKaddrakEncounterTimer = 1500; + uiMarnakEncounterTimer = 10000; + uiAbedneumEncounterTimer = 10000; + + bKaddrakActivated = false; + bMarnakActivated = false; + bAbedneumActivated = false; + + if (pInstance) + { + pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_KADDRAK),false); + pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_MARNAK),false); + pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_ABEDNEUM),false); + pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_SKY_FLOOR),false); + } + + KaddrakGUIDList.clear(); + } + + void UpdateFacesList() + { + /*GetCreatureListWithEntryInGrid(lKaddrakGUIDList, me, CREATURE_KADDRAK, 50.0f); + if (!lKaddrakGUIDList.empty()) + { + uint32 uiPositionCounter = 0; + for (std::list::const_iterator itr = lKaddrakGUIDList.begin(); itr != lKaddrakGUIDList.end(); ++itr) + { + if ((*itr)->isAlive()) + { + if (uiPositionCounter == 0) + { + (*itr)->GetMap()->CreatureRelocation((*itr), 927.265, 333.200, 218.780, (*itr)->GetOrientation()); + (*itr)->SendMonsterMove(927.265, 333.200, 218.780, 0, (*itr)->GetMovementFlags(), 1); + } + else + { + (*itr)->GetMap()->CreatureRelocation((*itr), 921.745, 328.076, 218.780, (*itr)->GetOrientation()); + (*itr)->SendMonsterMove(921.745, 328.076, 218.780, 0, (*itr)->GetMovementFlags(), 1); + } + } + ++uiPositionCounter; + } + }*/ + } + + void UpdateAI(const uint32 diff) + { + if (bKaddrakActivated) + { + if (uiKaddrakEncounterTimer <= diff) + { + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (!KaddrakGUIDList.empty()) + for (std::list::const_iterator itr = KaddrakGUIDList.begin(); itr != KaddrakGUIDList.end(); ++itr) + { + if (Creature *pKaddrak = Unit::GetCreature(*me, *itr)) + { + if (pKaddrak->isAlive()) + pKaddrak->CastSpell(pTarget, DUNGEON_MODE(SPELL_GLARE_OF_THE_TRIBUNAL, H_SPELL_GLARE_OF_THE_TRIBUNAL), true); + } + } + uiKaddrakEncounterTimer = 1500; + } else uiKaddrakEncounterTimer -= diff; + } + if (bMarnakActivated) + { + if (uiMarnakEncounterTimer <= diff) + { + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + { + if (Creature* pSummon = me->SummonCreature(CREATURE_DARK_MATTER_TARGET, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN, 1000)) + { + pSummon->SetDisplayId(11686); + pSummon->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + pSummon->CastSpell(pTarget, DUNGEON_MODE(SPELL_DARK_MATTER, H_SPELL_DARK_MATTER), true); + } + } + uiMarnakEncounterTimer = 30000 + rand()%1000; + } else uiMarnakEncounterTimer -= diff; + } + if (bAbedneumActivated) + { + if (uiAbedneumEncounterTimer <= diff) + { + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + { + if (Creature* pSummon = me->SummonCreature(CREATURE_SEARING_GAZE_TARGET, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN, 1000)) + { + pSummon->SetDisplayId(11686); + pSummon->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + pSummon->CastSpell(pTarget, DUNGEON_MODE(SPELL_SEARING_GAZE, H_SPELL_SEARING_GAZE), true); + } + } + uiAbedneumEncounterTimer = 30000 + rand()%1000; + } else uiAbedneumEncounterTimer -= diff; + } + } +}; + +struct npc_brann_hosAI : public npc_escortAI +{ + npc_brann_hosAI(Creature *c) : npc_escortAI(c) + { + pInstance = c->GetInstanceData(); + } + + uint32 uiStep; + uint32 uiPhaseTimer; + + uint64 uiControllerGUID; + std::list lDwarfGUIDList; + + ScriptedInstance* pInstance; + + bool bIsBattle; + bool bIsLowHP; + bool bHasBeenDamaged; + + void Reset() + { + if (!HasEscortState(STATE_ESCORT_ESCORTING)) + { + bIsLowHP = false; + bIsBattle = false; + bHasBeenDamaged = false; + uiStep = 0; + uiPhaseTimer = 0; + uiControllerGUID = 0; + + DespawnDwarf(); + + if (pInstance) + pInstance->SetData(DATA_BRANN_EVENT, NOT_STARTED); + } + } + + void DespawnDwarf() + { + if (lDwarfGUIDList.empty()) + return; + for (std::list::const_iterator itr = lDwarfGUIDList.begin(); itr != lDwarfGUIDList.end(); ++itr) + { + Creature* pTemp = Unit::GetCreature(*me, pInstance ? (*itr) : 0); + if (pTemp && pTemp->isAlive()) + pTemp->ForcedDespawn(); + } + lDwarfGUIDList.clear(); + } + + void WaypointReached(uint32 uiPointId) + { + switch(uiPointId) + { + case 7: + if (Creature* pCreature = GetClosestCreatureWithEntry(me, CREATURE_TRIBUNAL_OF_THE_AGES, 100.0f)) + { + if (!pCreature->isAlive()) + pCreature->Respawn(); + CAST_AI(mob_tribuna_controllerAI, pCreature->AI())->UpdateFacesList(); + uiControllerGUID = pCreature->GetGUID(); + } + break; + case 13: + DoScriptText(SAY_EVENT_INTRO_1, me); + SetEscortPaused(true); + JumpToNextStep(20000); + break; + case 17: + DoScriptText(SAY_EVENT_INTRO_2, me); + if (pInstance) + pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_TRIBUNAL_CONSOLE),true); + me->SetStandState(UNIT_STAND_STATE_KNEEL); + SetEscortPaused(true); + JumpToNextStep(8500); + break; + case 18: + SetEscortPaused(true); + break; + } + } + + void SpawnDwarf(uint32 uiType) + { + switch(uiType) + { + case 1: + { + uint32 uiSpawnNumber = DUNGEON_MODE(2,3); + for (uint8 i = 0; i < uiSpawnNumber; ++i) + me->SummonCreature(CREATURE_DARK_RUNE_PROTECTOR, SpawnLocations[0], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000); + me->SummonCreature(CREATURE_DARK_RUNE_STORMCALLER, SpawnLocations[0], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000); + break; + } + case 2: + for (uint8 i = 0; i < 2; ++i) + me->SummonCreature(CREATURE_DARK_RUNE_STORMCALLER, SpawnLocations[0], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000); + break; + case 3: + me->SummonCreature(CREATURE_IRON_GOLEM_CUSTODIAN, SpawnLocations[0], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000); + break; + } + } + + void JustSummoned(Creature* pSummoned) + { + lDwarfGUIDList.push_back(pSummoned->GetGUID()); + pSummoned->AddThreat(me, 0.0f); + pSummoned->AI()->AttackStart(me); + } + + void JumpToNextStep(uint32 uiTimer) + { + uiPhaseTimer = uiTimer; + ++uiStep; + } + + void StartWP() + { + me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); + SetEscortPaused(false); + uiStep = 1; + Start(); + } + + void DamageTaken(Unit* /*done_by*/, uint32 & /*damage*/) + { + if (!bHasBeenDamaged) + bHasBeenDamaged = true; + } + + void UpdateEscortAI(const uint32 uiDiff) + { + if (uiPhaseTimer <= uiDiff) + { + switch(uiStep) + { + case 1: + if (pInstance) + { + if (pInstance->GetData(DATA_BRANN_EVENT) != NOT_STARTED) + return; + pInstance->SetData(DATA_BRANN_EVENT, IN_PROGRESS); + } + bIsBattle = false; + DoScriptText(SAY_ESCORT_START, me); + SetRun(true); + JumpToNextStep(0); + break; + case 3: + SetEscortPaused(false); + JumpToNextStep(0); + break; + case 5: + if (pInstance) + if (Creature* pTemp = (Unit::GetCreature(*me, pInstance->GetData64(DATA_ABEDNEUM)))) + DoScriptText(SAY_EVENT_INTRO_3_ABED, pTemp); + JumpToNextStep(8500); + break; + case 6: + DoScriptText(SAY_EVENT_A_1, me); + JumpToNextStep(6500); + break; + case 7: + if (pInstance) + if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(DATA_KADDRAK))) + DoScriptText(SAY_EVENT_A_2_KADD, pTemp); + JumpToNextStep(12500); + break; + case 8: + DoScriptText(SAY_EVENT_A_3, me); + if (pInstance) + pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_KADDRAK),true); + if (Creature* pTemp = Unit::GetCreature(*me, uiControllerGUID)) + CAST_AI(mob_tribuna_controllerAI, pTemp->AI())->bKaddrakActivated = true; + JumpToNextStep(5000); + break; + case 9: + me->SetReactState(REACT_PASSIVE); + SpawnDwarf(1); + JumpToNextStep(20000); + break; + case 10: + DoScriptText(SAY_EVENT_B_1, me); + JumpToNextStep(6000); + break; + case 11: + if (pInstance) + if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(DATA_MARNAK))) + DoScriptText(SAY_EVENT_B_2_MARN, pTemp); + SpawnDwarf(1); + JumpToNextStep(20000); + break; + case 12: + DoScriptText(SAY_EVENT_B_3, me); + if (pInstance) + pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_MARNAK),true); + if (Creature* pTemp = Unit::GetCreature(*me, uiControllerGUID)) + CAST_AI(mob_tribuna_controllerAI, pTemp->AI())->bMarnakActivated = true; + JumpToNextStep(10000); + break; + case 13: + SpawnDwarf(1); + JumpToNextStep(10000); + break; + case 14: + SpawnDwarf(2); + JumpToNextStep(20000); + break; + case 15: + DoScriptText(SAY_EVENT_C_1, me); + SpawnDwarf(1); + JumpToNextStep(10000); + break; + case 16: + SpawnDwarf(2); + JumpToNextStep(20000); + break; + case 17: + if (pInstance) + if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(DATA_ABEDNEUM))) + DoScriptText(SAY_EVENT_C_2_ABED, pTemp); + SpawnDwarf(1); + JumpToNextStep(20000); + break; + case 18: + DoScriptText(SAY_EVENT_C_3, me); + if (pInstance) + pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_ABEDNEUM),true); + if (Creature* pTemp = Unit::GetCreature(*me, uiControllerGUID)) + CAST_AI(mob_tribuna_controllerAI, pTemp->AI())->bAbedneumActivated = true; + JumpToNextStep(5000); + break; + case 19: + SpawnDwarf(2); + JumpToNextStep(10000); + break; + case 20: + SpawnDwarf(1); + JumpToNextStep(15000); + break; + case 21: + DoScriptText(SAY_EVENT_D_1, me); + SpawnDwarf(3); + JumpToNextStep(20000); + break; + case 22: + if (pInstance) + if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(DATA_ABEDNEUM))) + DoScriptText(SAY_EVENT_D_2_ABED, pTemp); + SpawnDwarf(1); + JumpToNextStep(5000); + break; + case 23: + SpawnDwarf(2); + JumpToNextStep(15000); + break; + case 24: + DoScriptText(SAY_EVENT_D_3, me); + SpawnDwarf(3); + JumpToNextStep(5000); + break; + case 25: + SpawnDwarf(1); + JumpToNextStep(5000); + break; + case 26: + SpawnDwarf(2); + JumpToNextStep(10000); + break; + case 27: + if (pInstance) + if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(DATA_ABEDNEUM))) + DoScriptText(SAY_EVENT_D_4_ABED, pTemp); + SpawnDwarf(1); + JumpToNextStep(10000); + break; + case 28: + me->SetReactState(REACT_DEFENSIVE); + DoScriptText(SAY_EVENT_END_01, me); + me->SetStandState(UNIT_STAND_STATE_STAND); + if (pInstance) + pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_SKY_FLOOR),true); + if (Creature* pTemp = Unit::GetCreature(*me, uiControllerGUID)) + pTemp->DealDamage(pTemp, pTemp->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); + bIsBattle = true; + SetEscortPaused(false); + JumpToNextStep(6500); + break; + case 29: + DoScriptText(SAY_EVENT_END_02, me); + if (pInstance) + { + pInstance->SetData(DATA_BRANN_EVENT, DONE); + + // Achievement criteria is with spell 59046 which does not exist. + // There is thus no way it can be given by casting the spell on the players. + pInstance->DoUpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET, 59046); + + if (!bHasBeenDamaged) + pInstance->DoCompleteAchievement(ACHIEV_BRANN_SPANKIN_NEW); + } + + JumpToNextStep(5500); + break; + case 30: + if (pInstance) + if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(DATA_ABEDNEUM))) + DoScriptText(SAY_EVENT_END_03_ABED, pTemp); + JumpToNextStep(8500); + break; + case 31: + DoScriptText(SAY_EVENT_END_04, me); + JumpToNextStep(11500); + break; + case 32: + if (pInstance) + if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(DATA_ABEDNEUM))) + DoScriptText(SAY_EVENT_END_05_ABED, pTemp); + JumpToNextStep(11500); + break; + case 33: + DoScriptText(SAY_EVENT_END_06, me); + JumpToNextStep(4500); + break; + case 34: + if (pInstance) + if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(DATA_ABEDNEUM))) + DoScriptText(SAY_EVENT_END_07_ABED, pTemp); + JumpToNextStep(22500); + break; + case 35: + DoScriptText(SAY_EVENT_END_08, me); + JumpToNextStep(7500); + break; + case 36: + if (pInstance) + if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(DATA_KADDRAK))) + DoScriptText(SAY_EVENT_END_09_KADD, pTemp); + JumpToNextStep(18500); + break; + case 37: + DoScriptText(SAY_EVENT_END_10, me); + JumpToNextStep(5500); + break; + case 38: + if (pInstance) + if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(DATA_KADDRAK))) + DoScriptText(SAY_EVENT_END_11_KADD, pTemp); + JumpToNextStep(20500); + break; + case 39: + DoScriptText(SAY_EVENT_END_12, me); + JumpToNextStep(2500); + break; + case 40: + if (pInstance) + if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(DATA_KADDRAK))) + DoScriptText(SAY_EVENT_END_13_KADD, pTemp); + JumpToNextStep(19500); + break; + case 41: + DoScriptText(SAY_EVENT_END_14, me); + JumpToNextStep(10500); + break; + case 42: + if (pInstance) + if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(DATA_MARNAK))) + DoScriptText(SAY_EVENT_END_15_MARN, pTemp); + JumpToNextStep(6500); + break; + case 43: + DoScriptText(SAY_EVENT_END_16, me); + JumpToNextStep(6500); + break; + case 44: + if (pInstance) + if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(DATA_MARNAK))) + DoScriptText(SAY_EVENT_END_17_MARN, pTemp); + JumpToNextStep(25500); + break; + case 45: + DoScriptText(SAY_EVENT_END_18, me); + JumpToNextStep(23500); + break; + case 46: + if (pInstance) + if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(DATA_MARNAK))) + DoScriptText(SAY_EVENT_END_19_MARN, pTemp); + JumpToNextStep(3500); + break; + case 47: + DoScriptText(SAY_EVENT_END_20, me); + JumpToNextStep(8500); + break; + case 48: + if (pInstance) + if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(DATA_ABEDNEUM))) + DoScriptText(SAY_EVENT_END_21_ABED, pTemp); + JumpToNextStep(5500); + break; + case 49: + { + if (pInstance) + { + pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_KADDRAK),false); + pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_MARNAK),false); + pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_ABEDNEUM),false); + pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_SKY_FLOOR),false); + } + Player* pPlayer = GetPlayerForEscort(); + if (pPlayer) + pPlayer->GroupEventHappens(QUEST_HALLS_OF_STONE, me); + me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); + JumpToNextStep(180000); + break; + } + case 50: + SetEscortPaused(false); + break; + } + } else uiPhaseTimer -= uiDiff; + + if (!bIsLowHP && HealthBelowPct(30)) + { + DoScriptText(SAY_LOW_HEALTH, me); + bIsLowHP = true; + } + else if (bIsLowHP && !HealthBelowPct(30)) + bIsLowHP = false; + + if (!UpdateVictim()) + return; + + DoMeleeAttackIfReady(); + } +}; + +bool GossipHello_npc_brann_hos(Player* pPlayer, Creature* pCreature) +{ + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); + + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_START, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); + pPlayer->SEND_GOSSIP_MENU(TEXT_ID_START, pCreature->GetGUID()); + + return true; +} + +bool GossipSelect_npc_brann_hos(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) +{ + if (uiAction == GOSSIP_ACTION_INFO_DEF+1 || uiAction == GOSSIP_ACTION_INFO_DEF+2) + { + pPlayer->CLOSE_GOSSIP_MENU(); + CAST_AI(npc_brann_hosAI, pCreature->AI())->StartWP(); + } + + return true; +} + +CreatureAI* GetAI_mob_tribuna_controller(Creature* pCreature) +{ + return new mob_tribuna_controllerAI(pCreature); +} + +CreatureAI* GetAI_npc_brann_hos(Creature* pCreature) +{ + return new npc_brann_hosAI(pCreature); +} + +void AddSC_halls_of_stone() +{ + Script *newscript; + + newscript = new Script; + newscript->Name = "npc_brann_hos"; + newscript->GetAI = &GetAI_npc_brann_hos; + newscript->pGossipHello = &GossipHello_npc_brann_hos; + newscript->pGossipSelect = &GossipSelect_npc_brann_hos; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_tribuna_controller"; + newscript->GetAI = &GetAI_mob_tribuna_controller; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.h b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.h new file mode 100644 index 00000000000..b61e7057ddc --- /dev/null +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.h @@ -0,0 +1,48 @@ +#ifndef DEF_HALLS_OF_STONE_H +#define DEF_HALLS_OF_STONE_H +enum Data +{ + DATA_KRYSTALLUS_EVENT, + DATA_MAIDEN_OF_GRIEF_EVENT, + DATA_SJONNIR_EVENT, + DATA_BRANN_EVENT +}; +enum Data64 +{ + DATA_KRYSTALLUS, + DATA_MAIDEN_OF_GRIEF, + DATA_SJONNIR, + DATA_KADDRAK, + DATA_MARNAK, + DATA_ABEDNEUM, + DATA_GO_TRIBUNAL_CONSOLE, + DATA_GO_KADDRAK, + DATA_GO_MARNAK, + DATA_GO_ABEDNEUM, + DATA_GO_SKY_FLOOR, + DATA_SJONNIR_DOOR, + DATA_MAIDEN_DOOR +}; +enum Creatures +{ + CREATURE_MAIDEN = 27975, + CREATURE_KRYSTALLUS = 27977, + CREATURE_SJONNIR = 27978, + CREATURE_MARNAK = 30897, + CREATURE_KADDRAK = 30898, + CREATURE_ABEDNEUM = 30899, + CREATURE_BRANN = 28070 +}; +enum GameObjects +{ + GO_ABEDNEUM = 191669, + GO_MARNAK = 192170, + GO_KADDRAK = 192171, + GO_MAIDEN_DOOR = 191292, + GO_BRANN_DOOR = 191295, + GO_SJONNIR_DOOR = 191296, + GO_TRIBUNAL_CONSOLE = 193907, + GO_TRIBUNAL_CHEST = 190586, + GO_TRIBUNAL_CHEST_HERO = 193996 +}; +#endif diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp new file mode 100644 index 00000000000..69bb3779e70 --- /dev/null +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp @@ -0,0 +1,254 @@ +#include "ScriptedPch.h" +#include "halls_of_stone.h" + +#define MAX_ENCOUNTER 4 + +/* Halls of Stone encounters: +0- Krystallus +1- Maiden of Grief +2- Escort Event +3- Sjonnir The Ironshaper +*/ + +struct instance_halls_of_stone : public ScriptedInstance +{ + instance_halls_of_stone(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; + + uint64 uiMaidenOfGrief; + uint64 uiKrystallus; + uint64 uiSjonnir; + + uint64 uiKaddrak; + uint64 uiAbedneum; + uint64 uiMarnak; + uint64 uiBrann; + + uint64 uiMaidenOfGriefDoor; + uint64 uiSjonnirDoor; + uint64 uiBrannDoor; + uint64 uiTribunalConsole; + uint64 uiTribunalChest; + uint64 uiTribunalSkyFloor; + uint64 uiKaddrakGo; + uint64 uiAbedneumGo; + uint64 uiMarnakGo; + + uint32 m_auiEncounter[MAX_ENCOUNTER]; + + std::string str_data; + + void Initialize() + { + uiMaidenOfGrief = 0; + uiKrystallus = 0; + uiSjonnir = 0; + + uiKaddrak = 0; + uiMarnak = 0; + uiAbedneum = 0; + uiBrann = 0; + + uiMaidenOfGriefDoor = 0; + uiSjonnirDoor = 0; + uiBrannDoor = 0; + uiKaddrakGo = 0; + uiMarnakGo = 0; + uiAbedneumGo = 0; + uiTribunalConsole = 0; + uiTribunalChest = 0; + uiTribunalSkyFloor = 0; + + for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) + m_auiEncounter[i] = NOT_STARTED; + } + + void OnCreatureCreate(Creature* pCreature, bool /*add*/) + { + switch(pCreature->GetEntry()) + { + case CREATURE_MAIDEN: uiMaidenOfGrief = pCreature->GetGUID(); break; + case CREATURE_KRYSTALLUS: uiKrystallus = pCreature->GetGUID(); break; + case CREATURE_SJONNIR: uiSjonnir = pCreature->GetGUID(); break; + case CREATURE_MARNAK: uiMarnak = pCreature->GetGUID(); break; + case CREATURE_KADDRAK: uiKaddrak = pCreature->GetGUID(); break; + case CREATURE_ABEDNEUM: uiAbedneum = pCreature->GetGUID(); break; + case CREATURE_BRANN: uiBrann = pCreature->GetGUID(); break; + } + } + + void OnGameObjectCreate(GameObject* pGo, bool /*add*/) + { + switch(pGo->GetEntry()) + { + case GO_ABEDNEUM: + uiAbedneumGo = pGo->GetGUID(); + break; + case GO_MARNAK: + uiMarnakGo = pGo->GetGUID(); + break; + case GO_KADDRAK: + uiKaddrakGo = pGo->GetGUID(); + break; + case GO_MAIDEN_DOOR: + uiMaidenOfGriefDoor = pGo->GetGUID(); + if (m_auiEncounter[0] == DONE) + pGo->SetGoState(GO_STATE_ACTIVE); + else + pGo->SetGoState(GO_STATE_READY); + break; + case GO_BRANN_DOOR: + uiBrannDoor = pGo->GetGUID(); + if (m_auiEncounter[1] == DONE) + pGo->SetGoState(GO_STATE_ACTIVE); + else + pGo->SetGoState(GO_STATE_READY); + break; + case GO_SJONNIR_DOOR: + uiSjonnirDoor = pGo->GetGUID(); + if (m_auiEncounter[2] == DONE) + pGo->SetGoState(GO_STATE_ACTIVE); + else + pGo->SetGoState(GO_STATE_READY); + break; + case GO_TRIBUNAL_CONSOLE: + uiTribunalConsole = pGo->GetGUID(); + break; + case GO_TRIBUNAL_CHEST: + case GO_TRIBUNAL_CHEST_HERO: + uiTribunalChest = pGo->GetGUID(); + if (m_auiEncounter[2] == DONE) + pGo->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_INTERACT_COND); + break; + case 191527: + uiTribunalSkyFloor = pGo->GetGUID(); + break; + } + } + + void SetData(uint32 type, uint32 data) + { + switch(type) + { + case DATA_MAIDEN_OF_GRIEF_EVENT: + m_auiEncounter[1] = data; + if (m_auiEncounter[1] == DONE) + HandleGameObject(uiBrannDoor,true); + break; + case DATA_KRYSTALLUS_EVENT: + m_auiEncounter[0] = data; + if (m_auiEncounter[0] == DONE) + HandleGameObject(uiMaidenOfGriefDoor,true); + break; + case DATA_SJONNIR_EVENT: + m_auiEncounter[3] = data; + break; + case DATA_BRANN_EVENT: + m_auiEncounter[2] = data; + if (m_auiEncounter[2] == DONE) + { + HandleGameObject(uiSjonnirDoor,true); + GameObject *pGo = instance->GetGameObject(uiTribunalChest); + if (pGo) + pGo->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_INTERACT_COND); + } + break; + } + + if (data == DONE) + SaveToDB(); + } + + uint32 GetData(uint32 type) + { + switch(type) + { + case DATA_KRYSTALLUS_EVENT: return m_auiEncounter[0]; + case DATA_MAIDEN_OF_GRIEF_EVENT: return m_auiEncounter[1]; + case DATA_SJONNIR_EVENT: return m_auiEncounter[2]; + case DATA_BRANN_EVENT: return m_auiEncounter[3]; + } + + return 0; + } + + uint64 GetData64(uint32 identifier) + { + switch(identifier) + { + case DATA_MAIDEN_OF_GRIEF: return uiMaidenOfGrief; + case DATA_KRYSTALLUS: return uiKrystallus; + case DATA_SJONNIR: return uiSjonnir; + case DATA_KADDRAK: return uiKaddrak; + case DATA_MARNAK: return uiMarnak; + case DATA_ABEDNEUM: return uiAbedneum; + case DATA_GO_TRIBUNAL_CONSOLE: return uiTribunalConsole; + case DATA_GO_KADDRAK: return uiKaddrakGo; + case DATA_GO_ABEDNEUM: return uiAbedneumGo; + case DATA_GO_MARNAK: return uiMarnakGo; + case DATA_GO_SKY_FLOOR: return uiTribunalSkyFloor; + case DATA_SJONNIR_DOOR: return uiSjonnirDoor; + case DATA_MAIDEN_DOOR: return uiMaidenOfGriefDoor; + } + + return 0; + } + + std::string GetSaveData() + { + OUT_SAVE_INST_DATA; + + std::ostringstream saveStream; + saveStream << "H S " << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " " << m_auiEncounter[3]; + + str_data = saveStream.str(); + + OUT_SAVE_INST_DATA_COMPLETE; + return str_data; + } + + void Load(const char* in) + { + if (!in) + { + OUT_LOAD_INST_DATA_FAIL; + return; + } + + OUT_LOAD_INST_DATA(in); + + char dataHead1, dataHead2; + uint16 data0, data1, data2, data3; + + std::istringstream loadStream(in); + loadStream >> dataHead1 >> dataHead2 >> data0 >> data1 >> data2 >> data3; + + if (dataHead1 == 'H' && dataHead2 == 'S') + { + m_auiEncounter[0] = data0; + m_auiEncounter[1] = data1; + m_auiEncounter[2] = data2; + m_auiEncounter[3] = data3; + + for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) + if (m_auiEncounter[i] == IN_PROGRESS) + m_auiEncounter[i] = NOT_STARTED; + + } else OUT_LOAD_INST_DATA_FAIL; + + OUT_LOAD_INST_DATA_COMPLETE; + } +}; + +InstanceData* GetInstanceData_instance_halls_of_stone(Map* pMap) +{ + return new instance_halls_of_stone(pMap); +} + +void AddSC_instance_halls_of_stone() +{ + Script *newscript; + newscript = new Script; + newscript->Name = "instance_halls_of_stone"; + newscript->GetInstanceData = &GetInstanceData_instance_halls_of_stone; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Northrend/Ulduar/halls_of_lightning/boss_bjarngrim.cpp b/src/server/scripts/Northrend/Ulduar/halls_of_lightning/boss_bjarngrim.cpp deleted file mode 100644 index c2da2a24e71..00000000000 --- a/src/server/scripts/Northrend/Ulduar/halls_of_lightning/boss_bjarngrim.cpp +++ /dev/null @@ -1,432 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: Boss General Bjarngrim -SD%Complete: 70% -SDComment: Waypoint needed, we expect boss to always have 2x Stormforged Lieutenant following -SDCategory: Halls of Lightning -EndScriptData */ - -#include "ScriptedPch.h" -#include "halls_of_lightning.h" - -enum eEnums -{ - //Yell - SAY_AGGRO = -1602000, - SAY_SLAY_1 = -1602001, - SAY_SLAY_2 = -1602002, - SAY_SLAY_3 = -1602003, - SAY_DEATH = -1602004, - SAY_BATTLE_STANCE = -1602005, - EMOTE_BATTLE_STANCE = -1602006, - SAY_BERSEKER_STANCE = -1602007, - EMOTE_BERSEKER_STANCE = -1602008, - SAY_DEFENSIVE_STANCE = -1602009, - EMOTE_DEFENSIVE_STANCE = -1602010, - - SPELL_DEFENSIVE_STANCE = 53790, - //SPELL_DEFENSIVE_AURA = 41105, - SPELL_SPELL_REFLECTION = 36096, - SPELL_PUMMEL = 12555, - SPELL_KNOCK_AWAY = 52029, - SPELL_IRONFORM = 52022, - - SPELL_BERSEKER_STANCE = 53791, - //SPELL_BERSEKER_AURA = 41107, - SPELL_INTERCEPT = 58769, - SPELL_WHIRLWIND = 52027, - SPELL_CLEAVE = 15284, - - SPELL_BATTLE_STANCE = 53792, - //SPELL_BATTLE_AURA = 41106, - SPELL_MORTAL_STRIKE = 16856, - SPELL_SLAM = 52026, - - //OTHER SPELLS - //SPELL_CHARGE_UP = 52098, // only used when starting walk from one platform to the other - //SPELL_TEMPORARY_ELECTRICAL_CHARGE = 52092, // triggered part of above - - NPC_STORMFORGED_LIEUTENANT = 29240, - SPELL_ARC_WELD = 59085, - SPELL_RENEW_STEEL_N = 52774, - SPELL_RENEW_STEEL_H = 59160, - - EQUIP_SWORD = 37871, - EQUIP_SHIELD = 35642, - EQUIP_MACE = 43623, - - STANCE_DEFENSIVE = 0, - STANCE_BERSERKER = 1, - STANCE_BATTLE = 2 -}; - -/*###### -## boss_bjarngrim -######*/ - -struct boss_bjarngrimAI : public ScriptedAI -{ - boss_bjarngrimAI(Creature *pCreature) : ScriptedAI(pCreature) - { - m_pInstance = pCreature->GetInstanceData(); - m_uiStance = STANCE_DEFENSIVE; - memset(&m_auiStormforgedLieutenantGUID, 0, sizeof(m_auiStormforgedLieutenantGUID)); - } - - ScriptedInstance* m_pInstance; - - bool m_bIsChangingStance; - - uint8 m_uiChargingStatus; - uint8 m_uiStance; - - uint32 m_uiCharge_Timer; - uint32 m_uiChangeStance_Timer; - - uint32 m_uiReflection_Timer; - uint32 m_uiKnockAway_Timer; - uint32 m_uiPummel_Timer; - uint32 m_uiIronform_Timer; - - uint32 m_uiIntercept_Timer; - uint32 m_uiWhirlwind_Timer; - uint32 m_uiCleave_Timer; - - uint32 m_uiMortalStrike_Timer; - uint32 m_uiSlam_Timer; - - uint64 m_auiStormforgedLieutenantGUID[2]; - - void Reset() - { - m_bIsChangingStance = false; - - m_uiChargingStatus = 0; - m_uiCharge_Timer = 1000; - - m_uiChangeStance_Timer = 20000 + rand()%5000; - - m_uiReflection_Timer = 8000; - m_uiKnockAway_Timer = 20000; - m_uiPummel_Timer = 10000; - m_uiIronform_Timer = 25000; - - m_uiIntercept_Timer = 5000; - m_uiWhirlwind_Timer = 10000; - m_uiCleave_Timer = 8000; - - m_uiMortalStrike_Timer = 8000; - m_uiSlam_Timer = 10000; - - for (uint8 i = 0; i < 2; ++i) - { - if (Creature* pStormforgedLieutenant = (Unit::GetCreature((*me), m_auiStormforgedLieutenantGUID[i]))) - { - if (!pStormforgedLieutenant->isAlive()) - pStormforgedLieutenant->Respawn(); - } - } - - if (m_uiStance != STANCE_DEFENSIVE) - { - DoRemoveStanceAura(m_uiStance); - DoCast(me, SPELL_DEFENSIVE_STANCE); - m_uiStance = STANCE_DEFENSIVE; - } - - SetEquipmentSlots(false, EQUIP_SWORD, EQUIP_SHIELD, EQUIP_NO_CHANGE); - - if (m_pInstance) - m_pInstance->SetData(TYPE_BJARNGRIM, NOT_STARTED); - } - - void EnterCombat(Unit* /*pWho*/) - { - DoScriptText(SAY_AGGRO, me); - - //must get both lieutenants here and make sure they are with him - me->CallForHelp(30.0f); - - if (m_pInstance) - m_pInstance->SetData(TYPE_BJARNGRIM, IN_PROGRESS); - } - - void KilledUnit(Unit* /*pVictim*/) - { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); - } - - void JustDied(Unit* /*pKiller*/) - { - DoScriptText(SAY_DEATH, me); - - if (m_pInstance) - m_pInstance->SetData(TYPE_BJARNGRIM, DONE); - } - - //TODO: remove when removal is done by the core - void DoRemoveStanceAura(uint8 uiStance) - { - switch(uiStance) - { - case STANCE_DEFENSIVE: - me->RemoveAurasDueToSpell(SPELL_DEFENSIVE_STANCE); - break; - case STANCE_BERSERKER: - me->RemoveAurasDueToSpell(SPELL_BERSEKER_STANCE); - break; - case STANCE_BATTLE: - me->RemoveAurasDueToSpell(SPELL_BATTLE_STANCE); - break; - } - } - - void UpdateAI(const uint32 uiDiff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - // Change stance - if (m_uiChangeStance_Timer <= uiDiff) - { - //wait for current spell to finish before change stance - if (me->IsNonMeleeSpellCasted(false)) - return; - - DoRemoveStanceAura(m_uiStance); - - int uiTempStance = rand()%(3-1); - - if (uiTempStance >= m_uiStance) - ++uiTempStance; - - m_uiStance = uiTempStance; - - switch(m_uiStance) - { - case STANCE_DEFENSIVE: - DoScriptText(SAY_DEFENSIVE_STANCE, me); - DoScriptText(EMOTE_DEFENSIVE_STANCE, me); - DoCast(me, SPELL_DEFENSIVE_STANCE); - SetEquipmentSlots(false, EQUIP_SWORD, EQUIP_SHIELD, EQUIP_NO_CHANGE); - break; - case STANCE_BERSERKER: - DoScriptText(SAY_BERSEKER_STANCE, me); - DoScriptText(EMOTE_BERSEKER_STANCE, me); - DoCast(me, SPELL_BERSEKER_STANCE); - SetEquipmentSlots(false, EQUIP_SWORD, EQUIP_SWORD, EQUIP_NO_CHANGE); - break; - case STANCE_BATTLE: - DoScriptText(SAY_BATTLE_STANCE, me); - DoScriptText(EMOTE_BATTLE_STANCE, me); - DoCast(me, SPELL_BATTLE_STANCE); - SetEquipmentSlots(false, EQUIP_MACE, EQUIP_UNEQUIP, EQUIP_NO_CHANGE); - break; - } - - m_uiChangeStance_Timer = 20000 + rand()%5000; - return; - } - else - m_uiChangeStance_Timer -= uiDiff; - - switch(m_uiStance) - { - case STANCE_DEFENSIVE: - { - if (m_uiReflection_Timer <= uiDiff) - { - DoCast(me, SPELL_SPELL_REFLECTION); - m_uiReflection_Timer = 8000 + rand()%1000; - } - else - m_uiReflection_Timer -= uiDiff; - - if (m_uiKnockAway_Timer <= uiDiff) - { - DoCast(me, SPELL_KNOCK_AWAY); - m_uiKnockAway_Timer = 20000 + rand()%1000; - } - else - m_uiKnockAway_Timer -= uiDiff; - - if (m_uiPummel_Timer <= uiDiff) - { - DoCast(me->getVictim(), SPELL_PUMMEL); - m_uiPummel_Timer = 10000 + rand()%1000; - } - else - m_uiPummel_Timer -= uiDiff; - - if (m_uiIronform_Timer <= uiDiff) - { - DoCast(me, SPELL_IRONFORM); - m_uiIronform_Timer = 25000 + rand()%1000; - } - else - m_uiIronform_Timer -= uiDiff; - - break; - } - case STANCE_BERSERKER: - { - if (m_uiIntercept_Timer <= uiDiff) - { - //not much point is this, better random target and more often? - DoCast(me->getVictim(), SPELL_INTERCEPT); - m_uiIntercept_Timer = 45000 + rand()%1000; - } - else - m_uiIntercept_Timer -= uiDiff; - - if (m_uiWhirlwind_Timer <= uiDiff) - { - DoCast(me, SPELL_WHIRLWIND); - m_uiWhirlwind_Timer = 10000 + rand()%1000; - } - else - m_uiWhirlwind_Timer -= uiDiff; - - if (m_uiCleave_Timer <= uiDiff) - { - DoCast(me->getVictim(), SPELL_CLEAVE); - m_uiCleave_Timer = 8000 + rand()%1000; - } - else - m_uiCleave_Timer -= uiDiff; - - break; - } - case STANCE_BATTLE: - { - if (m_uiMortalStrike_Timer <= uiDiff) - { - DoCast(me->getVictim(), SPELL_MORTAL_STRIKE); - m_uiMortalStrike_Timer = 20000 + rand()%1000; - } - else - m_uiMortalStrike_Timer -= uiDiff; - - if (m_uiSlam_Timer <= uiDiff) - { - DoCast(me->getVictim(), SPELL_SLAM); - m_uiSlam_Timer = 15000 + rand()%1000; - } - else - m_uiSlam_Timer -= uiDiff; - - break; - } - } - - DoMeleeAttackIfReady(); - } -}; - -/*###### -## mob_stormforged_lieutenant -######*/ - -struct mob_stormforged_lieutenantAI : public ScriptedAI -{ - mob_stormforged_lieutenantAI(Creature *pCreature) : ScriptedAI(pCreature) - { - m_pInstance = pCreature->GetInstanceData(); - } - - ScriptedInstance* m_pInstance; - - uint32 m_uiArcWeld_Timer; - uint32 m_uiRenewSteel_Timer; - - void Reset() - { - m_uiArcWeld_Timer = 20000 + rand()%1000; - m_uiRenewSteel_Timer = 10000 + rand()%1000; - } - - void EnterCombat(Unit* pWho) - { - if (m_pInstance) - { - if (Creature* pBjarngrim = m_pInstance->instance->GetCreature(m_pInstance->GetData64(DATA_BJARNGRIM))) - { - if (pBjarngrim->isAlive() && !pBjarngrim->getVictim()) - pBjarngrim->AI()->AttackStart(pWho); - } - } - } - - void UpdateAI(const uint32 uiDiff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - if (m_uiArcWeld_Timer <= uiDiff) - { - DoCast(me->getVictim(), SPELL_ARC_WELD); - m_uiArcWeld_Timer = 20000 + rand()%1000; - } - else - m_uiArcWeld_Timer -= uiDiff; - - if (m_uiRenewSteel_Timer <= uiDiff) - { - if (m_pInstance) - { - if (Creature* pBjarngrim = m_pInstance->instance->GetCreature(m_pInstance->GetData64(DATA_BJARNGRIM))) - { - if (pBjarngrim->isAlive()) - DoCast(pBjarngrim, SPELL_RENEW_STEEL_N); - } - } - m_uiRenewSteel_Timer = 10000 + rand()%4000; - } - else - m_uiRenewSteel_Timer -= uiDiff; - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_boss_bjarngrim(Creature* pCreature) -{ - return new boss_bjarngrimAI(pCreature); -} - -CreatureAI* GetAI_mob_stormforged_lieutenant(Creature* pCreature) -{ - return new mob_stormforged_lieutenantAI(pCreature); -} - -void AddSC_boss_bjarngrim() -{ - Script *newscript; - - newscript = new Script; - newscript->Name = "boss_bjarngrim"; - newscript->GetAI = &GetAI_boss_bjarngrim; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_stormforged_lieutenant"; - newscript->GetAI = &GetAI_mob_stormforged_lieutenant; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Northrend/Ulduar/halls_of_lightning/boss_ionar.cpp b/src/server/scripts/Northrend/Ulduar/halls_of_lightning/boss_ionar.cpp deleted file mode 100644 index ecf61188b3e..00000000000 --- a/src/server/scripts/Northrend/Ulduar/halls_of_lightning/boss_ionar.cpp +++ /dev/null @@ -1,388 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * Copyright (C) 2008 - 2010 TrinityCore - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* - * Comment: Timer check pending - */ - -#include "ScriptedPch.h" -#include "halls_of_lightning.h" - -enum Spells -{ - SPELL_BALL_LIGHTNING = 52780, - H_SPELL_BALL_LIGHTNING = 59800, - SPELL_STATIC_OVERLOAD = 52658, - H_SPELL_STATIC_OVERLOAD = 59795, - - SPELL_DISPERSE = 52770, - SPELL_SUMMON_SPARK = 52746, - SPELL_SPARK_DESPAWN = 52776, - - //Spark of Ionar - SPELL_SPARK_VISUAL_TRIGGER = 52667, - H_SPELL_SPARK_VISUAL_TRIGGER = 59833 -}; - -enum Yells -{ - SAY_AGGRO = -1602011, - SAY_SLAY_1 = -1602012, - SAY_SLAY_2 = -1602013, - SAY_SLAY_3 = -1602014, - SAY_DEATH = -1602015, - SAY_SPLIT_1 = -1602016, - SAY_SPLIT_2 = -1602017 -}; - -enum Creatures -{ - NPC_SPARK_OF_IONAR = 28926 -}; - -enum Misc -{ - DATA_MAX_SPARKS = 5, - DATA_MAX_SPARK_DISTANCE = 90, // Distance to boss - prevent runs through the whole instance - DATA_POINT_CALLBACK = 0 -}; - -/*###### -## Boss Ionar -######*/ - -struct boss_ionarAI : public ScriptedAI -{ - boss_ionarAI(Creature *pCreature) : ScriptedAI(pCreature), lSparkList(pCreature) - { - pInstance = pCreature->GetInstanceData(); - } - - ScriptedInstance* pInstance; - - SummonList lSparkList; - - bool bIsSplitPhase; - bool bHasDispersed; - - uint32 uiSplitTimer; - - uint32 uiStaticOverloadTimer; - uint32 uiBallLightningTimer; - - uint32 uiDisperseHealth; - - void Reset() - { - lSparkList.DespawnAll(); - - bIsSplitPhase = true; - bHasDispersed = false; - - uiSplitTimer = 25*IN_MILISECONDS; - - uiStaticOverloadTimer = urand(5*IN_MILISECONDS, 6*IN_MILISECONDS); - uiBallLightningTimer = urand(10*IN_MILISECONDS, 11*IN_MILISECONDS); - - uiDisperseHealth = 45 + urand(0,10); - - me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE|UNIT_FLAG_DISABLE_MOVE); - - if (me->GetVisibility() == VISIBILITY_OFF) - me->SetVisibility(VISIBILITY_ON); - - if (pInstance) - pInstance->SetData(TYPE_IONAR, NOT_STARTED); - } - - void EnterCombat(Unit* /*who*/) - { - DoScriptText(SAY_AGGRO, me); - - if (pInstance) - pInstance->SetData(TYPE_IONAR, IN_PROGRESS); - } - - void JustDied(Unit* /*killer*/) - { - DoScriptText(SAY_DEATH, me); - - lSparkList.DespawnAll(); - - if (pInstance) - pInstance->SetData(TYPE_IONAR, DONE); - } - - void KilledUnit(Unit * /*victim*/) - { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); - } - - //make sparks come back - void CallBackSparks() - { - //should never be empty here, but check - if (lSparkList.empty()) - return; - - Position pos; - me->GetPosition(&pos); - - for (std::list::const_iterator itr = lSparkList.begin(); itr != lSparkList.end(); ++itr) - { - if (Creature* pSpark = Unit::GetCreature(*me, *itr)) - { - if (pSpark->isAlive()) - { - pSpark->SetSpeed(MOVE_RUN, 2.0f); - pSpark->GetMotionMaster()->Clear(); - pSpark->GetMotionMaster()->MovePoint(DATA_POINT_CALLBACK, pos); - } - else - pSpark->ForcedDespawn(); - } - } - } - - void DamageTaken(Unit * /*pDoneBy*/, uint32 &uiDamage) - { - if (me->GetVisibility() == VISIBILITY_OFF) - uiDamage = 0; - } - - void JustSummoned(Creature* pSummoned) - { - if (pSummoned->GetEntry() == NPC_SPARK_OF_IONAR) - { - lSparkList.Summon(pSummoned); - - pSummoned->CastSpell(pSummoned, DUNGEON_MODE(SPELL_SPARK_VISUAL_TRIGGER,H_SPELL_SPARK_VISUAL_TRIGGER), true); - - Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); - if (pTarget) - { - pSummoned->SetInCombatWith(pTarget); - pSummoned->GetMotionMaster()->Clear(); - pSummoned->GetMotionMaster()->MoveFollow(pTarget, 0.0f, 0.0f); - } - } - } - - void SummonedCreatureDespawn(Creature *pSummoned) - { - if (pSummoned->GetEntry() == NPC_SPARK_OF_IONAR) - lSparkList.Despawn(pSummoned); - } - - void UpdateAI(const uint32 uiDiff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - // Splitted - if (me->GetVisibility() == VISIBILITY_OFF) - { - if (uiSplitTimer <= uiDiff) - { - uiSplitTimer = 2.5*IN_MILISECONDS; - - // Return sparks to where Ionar splitted - if (bIsSplitPhase) - { - CallBackSparks(); - bIsSplitPhase = false; - } - // Lightning effect and restore Ionar - else if (lSparkList.empty()) - { - me->SetVisibility(VISIBILITY_ON); - me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE|UNIT_FLAG_DISABLE_MOVE); - - DoCast(me, SPELL_SPARK_DESPAWN, false); - - uiSplitTimer = 25*IN_MILISECONDS; - bIsSplitPhase = true; - - if (me->getVictim()) - me->GetMotionMaster()->MoveChase(me->getVictim()); - } - } - else - uiSplitTimer -= uiDiff; - - return; - } - - if (uiStaticOverloadTimer <= uiDiff) - { - if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_STATIC_OVERLOAD); - - uiStaticOverloadTimer = urand(5*IN_MILISECONDS, 6*IN_MILISECONDS); - } - else - uiStaticOverloadTimer -= uiDiff; - - if (uiBallLightningTimer <= uiDiff) - { - DoCast(me->getVictim(), SPELL_BALL_LIGHTNING); - uiBallLightningTimer = urand(10*IN_MILISECONDS, 11*IN_MILISECONDS); - } - else - uiBallLightningTimer -= uiDiff; - - // Health check - if (!bHasDispersed && HealthBelowPct(uiDisperseHealth)) - { - bHasDispersed = true; - - DoScriptText(RAND(SAY_SPLIT_1,SAY_SPLIT_2), me); - - if (me->IsNonMeleeSpellCasted(false)) - me->InterruptNonMeleeSpells(false); - - DoCast(me, SPELL_DISPERSE, true); - } - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_boss_ionar(Creature* pCreature) -{ - return new boss_ionarAI(pCreature); -} - -bool EffectDummyCreature_boss_ionar(Unit* /*pCaster*/, uint32 uiSpellId, uint32 uiEffIndex, Creature* pCreatureTarget) -{ - //always check spellid and effectindex - if (uiSpellId == SPELL_DISPERSE && uiEffIndex == 0) - { - if (pCreatureTarget->GetEntry() != NPC_IONAR) - return true; - - for (uint8 i = 0; i < DATA_MAX_SPARKS; ++i) - pCreatureTarget->CastSpell(pCreatureTarget, SPELL_SUMMON_SPARK, true); - - pCreatureTarget->AttackStop(); - pCreatureTarget->SetVisibility(VISIBILITY_OFF); - pCreatureTarget->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE|UNIT_FLAG_DISABLE_MOVE); - - pCreatureTarget->GetMotionMaster()->Clear(); - pCreatureTarget->GetMotionMaster()->MoveIdle(); - - //always return true when we are handling this spell and effect - return true; - } - return false; -} - -/*###### -## mob_spark_of_ionar -######*/ - -struct mob_spark_of_ionarAI : public ScriptedAI -{ - mob_spark_of_ionarAI(Creature *pCreature) : ScriptedAI(pCreature) - { - pInstance = pCreature->GetInstanceData(); - } - - ScriptedInstance* pInstance; - - uint32 uiCheckTimer; - - void Reset() - { - uiCheckTimer = 2*IN_MILISECONDS; - me->SetReactState(REACT_PASSIVE); - } - - void MovementInform(uint32 uiType, uint32 uiPointId) - { - if (uiType != POINT_MOTION_TYPE || !pInstance) - return; - - if (uiPointId == DATA_POINT_CALLBACK) - me->ForcedDespawn(); - } - - void DamageTaken(Unit * /*pDoneBy*/, uint32 &uiDamage) - { - uiDamage = 0; - } - - void UpdateAI(const uint32 uiDiff) - { - // Despawn if the encounter is not running - if (pInstance && pInstance->GetData(TYPE_IONAR) != IN_PROGRESS) - { - me->ForcedDespawn(); - return; - } - - // Prevent them to follow players through the whole instance - if (uiCheckTimer <= uiDiff) - { - if (pInstance) - { - Creature* pIonar = pInstance->instance->GetCreature(pInstance->GetData64(DATA_IONAR)); - if (pIonar && pIonar->isAlive()) - { - if (me->GetDistance(pIonar) > DATA_MAX_SPARK_DISTANCE) - { - Position pos; - pIonar->GetPosition(&pos); - - me->SetSpeed(MOVE_RUN, 2.0f); - me->GetMotionMaster()->Clear(); - me->GetMotionMaster()->MovePoint(DATA_POINT_CALLBACK, pos); - } - } - else - me->ForcedDespawn(); - } - uiCheckTimer = 2*IN_MILISECONDS; - } - else - uiCheckTimer -= uiDiff; - - // No melee attack at all! - } -}; - -CreatureAI* GetAI_mob_spark_of_ionar(Creature* pCreature) -{ - return new mob_spark_of_ionarAI(pCreature); -} - -void AddSC_boss_ionar() -{ - Script *newscript; - - newscript = new Script; - newscript->Name = "boss_ionar"; - newscript->GetAI = &GetAI_boss_ionar; - newscript->pEffectDummyCreature = &EffectDummyCreature_boss_ionar; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_spark_of_ionar"; - newscript->GetAI = &GetAI_mob_spark_of_ionar; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Northrend/Ulduar/halls_of_lightning/boss_loken.cpp b/src/server/scripts/Northrend/Ulduar/halls_of_lightning/boss_loken.cpp deleted file mode 100644 index f08c19efca2..00000000000 --- a/src/server/scripts/Northrend/Ulduar/halls_of_lightning/boss_loken.cpp +++ /dev/null @@ -1,222 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: Boss Loken -SD%Complete: 60% -SDComment: Missing intro. Remove hack of Pulsing Shockwave when core supports. Aura is not working (59414) -SDCategory: Halls of Lightning -EndScriptData */ - -#include "ScriptedPch.h" -#include "halls_of_lightning.h" - -enum eEnums -{ - ACHIEV_TIMELY_DEATH_START_EVENT = 20384, - - SAY_AGGRO = -1602018, - SAY_INTRO_1 = -1602019, - SAY_INTRO_2 = -1602020, - SAY_SLAY_1 = -1602021, - SAY_SLAY_2 = -1602022, - SAY_SLAY_3 = -1602023, - SAY_DEATH = -1602024, - SAY_NOVA_1 = -1602025, - SAY_NOVA_2 = -1602026, - SAY_NOVA_3 = -1602027, - SAY_75HEALTH = -1602028, - SAY_50HEALTH = -1602029, - SAY_25HEALTH = -1602030, - EMOTE_NOVA = -1602031, - - SPELL_ARC_LIGHTNING = 52921, - SPELL_LIGHTNING_NOVA_N = 52960, - SPELL_LIGHTNING_NOVA_H = 59835, - - SPELL_PULSING_SHOCKWAVE_N = 52961, - SPELL_PULSING_SHOCKWAVE_H = 59836, - SPELL_PULSING_SHOCKWAVE_AURA = 59414 -}; - -/*###### -## Boss Loken -######*/ - -struct boss_lokenAI : public ScriptedAI -{ - boss_lokenAI(Creature* pCreature) : ScriptedAI(pCreature) - { - m_pInstance = pCreature->GetInstanceData(); - } - - ScriptedInstance* m_pInstance; - - bool m_bIsAura; - - uint32 m_uiArcLightning_Timer; - uint32 m_uiLightningNova_Timer; - uint32 m_uiPulsingShockwave_Timer; - uint32 m_uiResumePulsingShockwave_Timer; - - uint32 m_uiHealthAmountModifier; - - void Reset() - { - m_bIsAura = false; - - m_uiArcLightning_Timer = 15000; - m_uiLightningNova_Timer = 20000; - m_uiPulsingShockwave_Timer = 2000; - m_uiResumePulsingShockwave_Timer = 15000; - - m_uiHealthAmountModifier = 1; - - if (m_pInstance) - { - m_pInstance->SetData(TYPE_LOKEN, NOT_STARTED); - m_pInstance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMELY_DEATH_START_EVENT); - } - } - - void EnterCombat(Unit* /*pWho*/) - { - DoScriptText(SAY_AGGRO, me); - - if (m_pInstance) - { - m_pInstance->SetData(TYPE_LOKEN, IN_PROGRESS); - m_pInstance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMELY_DEATH_START_EVENT); - } - } - - void JustDied(Unit* /*pKiller*/) - { - DoScriptText(SAY_DEATH, me); - - if (m_pInstance) - m_pInstance->SetData(TYPE_LOKEN, DONE); - } - - void KilledUnit(Unit* /*pVictim*/) - { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); - } - - void UpdateAI(const uint32 uiDiff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - if (m_bIsAura) - { - // workaround for PULSING_SHOCKWAVE - if (m_uiPulsingShockwave_Timer <= uiDiff) - { - Map* pMap = me->GetMap(); - if (pMap->IsDungeon()) - { - Map::PlayerList const &PlayerList = pMap->GetPlayers(); - - if (PlayerList.isEmpty()) - return; - - for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) - if (i->getSource() && i->getSource()->isAlive() && i->getSource()->isTargetableForAttack()) - { - int32 dmg; - float m_fDist = me->GetExactDist(i->getSource()->GetPositionX(), i->getSource()->GetPositionY(), i->getSource()->GetPositionZ()); - - dmg = DUNGEON_MODE(100, 150); // need to correct damage - if (m_fDist > 1.0f) // Further from 1 yard - dmg *= m_fDist; - - me->CastCustomSpell(i->getSource(), DUNGEON_MODE(52942, 59837), &dmg, 0, 0, false); - } - } - m_uiPulsingShockwave_Timer = 2000; - } else m_uiPulsingShockwave_Timer -= uiDiff; - } - else - { - if (m_uiResumePulsingShockwave_Timer <= uiDiff) - { - //breaks at movement, can we assume when it's time, this spell is casted and also must stop movement? - DoCast(me, SPELL_PULSING_SHOCKWAVE_AURA, true); - - DoCast(me, SPELL_PULSING_SHOCKWAVE_N); // need core support - m_bIsAura = true; - m_uiResumePulsingShockwave_Timer = 0; - } - else - m_uiResumePulsingShockwave_Timer -= uiDiff; - } - - if (m_uiArcLightning_Timer <= uiDiff) - { - if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_ARC_LIGHTNING); - - m_uiArcLightning_Timer = 15000 + rand()%1000; - } - else - m_uiArcLightning_Timer -= uiDiff; - - if (m_uiLightningNova_Timer <= uiDiff) - { - DoScriptText(RAND(SAY_NOVA_1,SAY_NOVA_2,SAY_NOVA_3), me); - DoScriptText(EMOTE_NOVA, me); - DoCast(me, SPELL_LIGHTNING_NOVA_N); - - m_bIsAura = false; - m_uiResumePulsingShockwave_Timer = DUNGEON_MODE(5000, 4000); // Pause Pulsing Shockwave aura - m_uiLightningNova_Timer = 20000 + rand()%1000; - } - else - m_uiLightningNova_Timer -= uiDiff; - - // Health check - if ((me->GetHealth()*100 / me->GetMaxHealth()) < (100-(25*m_uiHealthAmountModifier))) - { - switch(m_uiHealthAmountModifier) - { - case 1: DoScriptText(SAY_75HEALTH, me); break; - case 2: DoScriptText(SAY_50HEALTH, me); break; - case 3: DoScriptText(SAY_25HEALTH, me); break; - } - - ++m_uiHealthAmountModifier; - } - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_boss_loken(Creature* pCreature) -{ - return new boss_lokenAI(pCreature); -} - -void AddSC_boss_loken() -{ - Script *newscript; - - newscript = new Script; - newscript->Name = "boss_loken"; - newscript->GetAI = &GetAI_boss_loken; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Northrend/Ulduar/halls_of_lightning/boss_volkhan.cpp b/src/server/scripts/Northrend/Ulduar/halls_of_lightning/boss_volkhan.cpp deleted file mode 100644 index 184050e3103..00000000000 --- a/src/server/scripts/Northrend/Ulduar/halls_of_lightning/boss_volkhan.cpp +++ /dev/null @@ -1,478 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: Boss Volkhan -SD%Complete: 60% -SDComment: Not considered complete. Some events may fail and need further development -SDCategory: Halls of Lightning -EndScriptData */ - -#include "ScriptedPch.h" -#include "halls_of_lightning.h" - -enum eEnums -{ - SAY_AGGRO = -1602032, - SAY_SLAY_1 = -1602033, - SAY_SLAY_2 = -1602034, - SAY_SLAY_3 = -1602035, - SAY_DEATH = -1602036, - SAY_STOMP_1 = -1602037, - SAY_STOMP_2 = -1602038, - SAY_FORGE_1 = -1602039, - SAY_FORGE_2 = -1602040, - EMOTE_TO_ANVIL = -1602041, - EMOTE_SHATTER = -1602042, - - SPELL_HEAT_N = 52387, - SPELL_HEAT_H = 59528, - SPELL_SHATTERING_STOMP_N = 52237, - SPELL_SHATTERING_STOMP_H = 59529, - - //unclear how "directions" of spells must be. Last, summoning GO, what is it for? Script depend on: - SPELL_TEMPER = 52238, //TARGET_SCRIPT boss->anvil - SPELL_TEMPER_DUMMY = 52654, //TARGET_SCRIPT anvil->boss - - //SPELL_TEMPER_VISUAL = 52661, //summons GO - - SPELL_SUMMON_MOLTEN_GOLEM = 52405, - - //Molten Golem - SPELL_BLAST_WAVE = 23113, - SPELL_IMMOLATION_STRIKE_N = 52433, - SPELL_IMMOLATION_STRIKE_H = 59530, - SPELL_SHATTER_N = 52429, - SPELL_SHATTER_H = 59527, - - NPC_VOLKHAN_ANVIL = 28823, - NPC_MOLTEN_GOLEM = 28695, - NPC_BRITTLE_GOLEM = 28681, - - POINT_ID_ANVIL = 0, - MAX_GOLEM = 2, - - ACHIEVEMENT_SHATTER_RESISTANT = 2042 -}; - -/*###### -## Boss Volkhan -######*/ - -struct boss_volkhanAI : public ScriptedAI -{ - boss_volkhanAI(Creature *pCreature) : ScriptedAI(pCreature) - { - m_pInstance = pCreature->GetInstanceData(); - } - - ScriptedInstance* m_pInstance; - - std::list m_lGolemGUIDList; - - bool m_bHasTemper; - bool m_bIsStriking; - bool m_bCanShatterGolem; - - uint8 GolemsShattered; - uint32 m_uiPause_Timer; - uint32 m_uiShatteringStomp_Timer; - uint32 m_uiShatter_Timer; - - uint32 m_uiHealthAmountModifier; - - void Reset() - { - m_bIsStriking = false; - m_bHasTemper = false; - m_bCanShatterGolem = false; - - m_uiPause_Timer = 3500; - m_uiShatteringStomp_Timer = 0; - m_uiShatter_Timer = 5000; - GolemsShattered = 0; - - m_uiHealthAmountModifier = 1; - - DespawnGolem(); - m_lGolemGUIDList.clear(); - - if (m_pInstance) - m_pInstance->SetData(TYPE_VOLKHAN, NOT_STARTED); - } - - void EnterCombat(Unit* /*pWho*/) - { - DoScriptText(SAY_AGGRO, me); - - if (m_pInstance) - m_pInstance->SetData(TYPE_VOLKHAN, IN_PROGRESS); - } - - void AttackStart(Unit* pWho) - { - if (me->Attack(pWho, true)) - { - me->AddThreat(pWho, 0.0f); - me->SetInCombatWith(pWho); - pWho->SetInCombatWith(me); - - if (!m_bHasTemper) - me->GetMotionMaster()->MoveChase(pWho); - } - } - - void JustDied(Unit* /*pKiller*/) - { - DoScriptText(SAY_DEATH, me); - DespawnGolem(); - - if (m_pInstance) - m_pInstance->SetData(TYPE_VOLKHAN, DONE); - - if (IsHeroic() && GolemsShattered < 5) - { - AchievementEntry const *AchievShatterResistant = GetAchievementStore()->LookupEntry(ACHIEVEMENT_SHATTER_RESISTANT); - if (AchievShatterResistant) - { - Map* pMap = me->GetMap(); - if (pMap && pMap->IsDungeon()) - { - Map::PlayerList const &players = pMap->GetPlayers(); - for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) - itr->getSource()->CompletedAchievement(AchievShatterResistant); - } - } - } - } - - void KilledUnit(Unit* /*pVictim*/) - { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); - } - - void DespawnGolem() - { - if (m_lGolemGUIDList.empty()) - return; - - for (std::list::const_iterator itr = m_lGolemGUIDList.begin(); itr != m_lGolemGUIDList.end(); ++itr) - { - if (Creature* pTemp = Unit::GetCreature(*me, *itr)) - { - if (pTemp->isAlive()) - pTemp->ForcedDespawn(); - } - } - - m_lGolemGUIDList.clear(); - } - - void ShatterGolem() - { - if (m_lGolemGUIDList.empty()) - return; - - for (std::list::const_iterator itr = m_lGolemGUIDList.begin(); itr != m_lGolemGUIDList.end(); ++itr) - { - if (Creature* pTemp = Unit::GetCreature(*me, *itr)) - { - // only shatter brittle golems - if (pTemp->isAlive() && pTemp->GetEntry() == NPC_BRITTLE_GOLEM) - { - pTemp->CastSpell(pTemp, DUNGEON_MODE(SPELL_SHATTER_N, SPELL_SHATTER_H), false); - GolemsShattered += 1; - } - } - } - } - - void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpell) - { - if (pSpell->Id == SPELL_TEMPER_DUMMY) - m_bIsStriking = true; - } - - void JustSummoned(Creature* pSummoned) - { - if (pSummoned->GetEntry() == NPC_MOLTEN_GOLEM) - { - m_lGolemGUIDList.push_back(pSummoned->GetGUID()); - - if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - pSummoned->AI()->AttackStart(pTarget); - - //why healing when just summoned? - pSummoned->CastSpell(pSummoned, DUNGEON_MODE(SPELL_HEAT_N, SPELL_HEAT_H), false, NULL, NULL, me->GetGUID()); - } - } - - void UpdateAI(const uint32 uiDiff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - if (m_bIsStriking) - { - if (m_uiPause_Timer <= uiDiff) - { - if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() != TARGETED_MOTION_TYPE) - { - if (me->getVictim()) - me->GetMotionMaster()->MoveChase(me->getVictim()); - } - - m_bHasTemper = false; - m_bIsStriking = false; - m_uiPause_Timer = 3500; - } - else - m_uiPause_Timer -= uiDiff; - - return; - } - - // When to start shatter? After 60, 40 or 20% hp? - if (!m_bHasTemper && m_uiHealthAmountModifier >= 3) - { - if (m_uiShatteringStomp_Timer <= uiDiff) - { - //should he stomp even if he has no brittle golem to shatter? - - DoScriptText(RAND(SAY_STOMP_1,SAY_STOMP_2), me); - - DoCast(me, SPELL_SHATTERING_STOMP_N); - - DoScriptText(EMOTE_SHATTER, me); - - m_uiShatteringStomp_Timer = 30000; - m_bCanShatterGolem = true; - } - else - m_uiShatteringStomp_Timer -= uiDiff; - } - - // Shatter Golems 3 seconds after Shattering Stomp - if (m_bCanShatterGolem) - { - if (m_uiShatter_Timer <= uiDiff) - { - ShatterGolem(); - m_uiShatter_Timer = 3000; - m_bCanShatterGolem = false; - } - else - m_uiShatter_Timer -= uiDiff; - } - - // Health check - if (!m_bCanShatterGolem && (me->GetHealth()*100 / me->GetMaxHealth()) < (100-(20*m_uiHealthAmountModifier))) - { - ++m_uiHealthAmountModifier; - - if (me->IsNonMeleeSpellCasted(false)) - me->InterruptNonMeleeSpells(false); - - DoScriptText(RAND(SAY_FORGE_1,SAY_FORGE_2), me); - - m_bHasTemper = true; - - DoCast(me, SPELL_TEMPER, false); - } - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_boss_volkhan(Creature* pCreature) -{ - return new boss_volkhanAI(pCreature); -} - -bool EffectDummyCreature_boss_volkhan(Unit* pCaster, uint32 uiSpellId, uint32 uiEffIndex, Creature* pCreatureTarget) -{ - //always check spellid and effectindex - if (uiSpellId == SPELL_TEMPER_DUMMY && uiEffIndex == 0) - { - if (pCaster->GetEntry() != NPC_VOLKHAN_ANVIL || pCreatureTarget->GetEntry() != NPC_VOLKHAN) - return true; - - for (uint8 i = 0; i < MAX_GOLEM; ++i) - { - pCreatureTarget->CastSpell(pCaster, SPELL_SUMMON_MOLTEN_GOLEM, true); - } - - //always return true when we are handling this spell and effect - return true; - } - - return false; -} - -/*###### -## npc_volkhan_anvil -######*/ - -bool EffectDummyCreature_npc_volkhan_anvil(Unit* pCaster, uint32 uiSpellId, uint32 uiEffIndex, Creature* pCreatureTarget) -{ - //always check spellid and effectindex - if (uiSpellId == SPELL_TEMPER && uiEffIndex == 0) - { - if (pCaster->GetEntry() != NPC_VOLKHAN || pCreatureTarget->GetEntry() != NPC_VOLKHAN_ANVIL) - return true; - - Creature *cre = CAST_CRE(pCaster); - - DoScriptText(EMOTE_TO_ANVIL, pCaster); - - float fX, fY, fZ; - pCreatureTarget->GetContactPoint(pCaster, fX, fY, fZ, INTERACTION_DISTANCE); - - pCaster->AttackStop(); - - if (pCaster->GetMotionMaster()->GetCurrentMovementGeneratorType() == TARGETED_MOTION_TYPE) - pCaster->GetMotionMaster()->MovementExpired(); - - cre->GetMap()->CreatureRelocation(cre, fX, fY, fZ, pCreatureTarget->GetOrientation()); - cre->SendMonsterMove(fX, fY, fZ, 0, cre->GetUnitMovementFlags(), 1); - - pCreatureTarget->CastSpell(pCaster, SPELL_TEMPER_DUMMY, false); - - //always return true when we are handling this spell and effect - return true; - } - - return false; -} - -/*###### -## mob_molten_golem -######*/ - -struct mob_molten_golemAI : public ScriptedAI -{ - mob_molten_golemAI(Creature *pCreature) : ScriptedAI(pCreature) - { - } - - bool m_bIsFrozen; - - uint32 m_uiBlast_Timer; - uint32 m_uiDeathDelay_Timer; - uint32 m_uiImmolation_Timer; - - void Reset() - { - m_bIsFrozen = false; - - m_uiBlast_Timer = 20000; - m_uiDeathDelay_Timer = 0; - m_uiImmolation_Timer = 5000; - } - - void AttackStart(Unit* pWho) - { - if (me->Attack(pWho, true)) - { - me->AddThreat(pWho, 0.0f); - me->SetInCombatWith(pWho); - pWho->SetInCombatWith(me); - - if (!m_bIsFrozen) - me->GetMotionMaster()->MoveChase(pWho); - } - } - - void DamageTaken(Unit* /*pDoneBy*/, uint32 &uiDamage) - { - if (uiDamage > me->GetHealth()) - { - me->UpdateEntry(NPC_BRITTLE_GOLEM); - me->SetHealth(1); - uiDamage = 0; - me->RemoveAllAuras(); - me->AttackStop(); - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED); - if (me->IsNonMeleeSpellCasted(false)) - me->InterruptNonMeleeSpells(false); - if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() == TARGETED_MOTION_TYPE) - me->GetMotionMaster()->MovementExpired(); - m_bIsFrozen = true; - } - } - - void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpell) - { - //this is the dummy effect of the spells - if (pSpell->Id == SPELL_SHATTER_N || pSpell->Id == SPELL_SHATTER_H) - { - if (me->GetEntry() == NPC_BRITTLE_GOLEM) - me->ForcedDespawn(); - } - } - - void UpdateAI(const uint32 uiDiff) - { - //Return since we have no target or if we are frozen - if (!UpdateVictim() || m_bIsFrozen) - return; - - if (m_uiBlast_Timer <= uiDiff) - { - DoCast(me, SPELL_BLAST_WAVE); - m_uiBlast_Timer = 20000; - } - else - m_uiBlast_Timer -= uiDiff; - - if (m_uiImmolation_Timer <= uiDiff) - { - DoCast(me->getVictim(), SPELL_IMMOLATION_STRIKE_N); - m_uiImmolation_Timer = 5000; - } - else - m_uiImmolation_Timer -= uiDiff; - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_mob_molten_golem(Creature* pCreature) -{ - return new mob_molten_golemAI(pCreature); -} - -void AddSC_boss_volkhan() -{ - Script *newscript; - - newscript = new Script; - newscript->Name = "boss_volkhan"; - newscript->GetAI = &GetAI_boss_volkhan; - newscript->pEffectDummyCreature = &EffectDummyCreature_boss_volkhan; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "npc_volkhan_anvil"; - newscript->pEffectDummyCreature = &EffectDummyCreature_npc_volkhan_anvil; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_molten_golem"; - newscript->GetAI = &GetAI_mob_molten_golem; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Northrend/Ulduar/halls_of_lightning/halls_of_lightning.h b/src/server/scripts/Northrend/Ulduar/halls_of_lightning/halls_of_lightning.h deleted file mode 100644 index d9739fdf888..00000000000 --- a/src/server/scripts/Northrend/Ulduar/halls_of_lightning/halls_of_lightning.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software licensed under GPL version 2 - * Please see the included DOCS/LICENSE.TXT for more information */ - -#ifndef DEF_HALLS_OF_LIGHTNING_H -#define DEF_HALLS_OF_LIGHTNING_H - -enum eTypes -{ - MAX_ENCOUNTER = 4, - - DATA_BJARNGRIM = 1, - DATA_IONAR = 2, - DATA_LOKEN = 3, - DATA_VOLKHAN = 4, - - TYPE_BJARNGRIM = 10, - TYPE_IONAR = 11, - TYPE_LOKEN = 12, - TYPE_VOLKHAN = 13, - - NPC_BJARNGRIM = 28586, - NPC_VOLKHAN = 28587, - NPC_IONAR = 28546, - NPC_LOKEN = 28923, - - GO_BJARNGRIM_DOOR = 191416, //_doors10 - GO_VOLKHAN_DOOR = 191325, //_doors07 - GO_IONAR_DOOR = 191326, //_doors05 - GO_LOKEN_DOOR = 191324, //_doors02 - GO_LOKEN_THRONE = 192654 -}; - -#endif diff --git a/src/server/scripts/Northrend/Ulduar/halls_of_lightning/instance_halls_of_lightning.cpp b/src/server/scripts/Northrend/Ulduar/halls_of_lightning/instance_halls_of_lightning.cpp deleted file mode 100644 index 46cd5c9cccc..00000000000 --- a/src/server/scripts/Northrend/Ulduar/halls_of_lightning/instance_halls_of_lightning.cpp +++ /dev/null @@ -1,248 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: Instance_Halls_of_Lightning -SD%Complete: 90% -SDComment: All ready. -SDCategory: Halls of Lightning -EndScriptData */ - -#include "ScriptedPch.h" -#include "halls_of_lightning.h" - -/* Halls of Lightning encounters: -0 - General Bjarngrim -1 - Volkhan -2 - Ionar -3 - Loken -*/ - -struct instance_halls_of_lightning : public ScriptedInstance -{ - instance_halls_of_lightning(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; - - uint32 m_auiEncounter[MAX_ENCOUNTER]; - - uint64 m_uiGeneralBjarngrimGUID; - uint64 m_uiIonarGUID; - uint64 m_uiLokenGUID; - uint64 m_uiVolkhanGUID; - - uint64 m_uiBjarngrimDoorGUID; - uint64 m_uiVolkhanDoorGUID; - uint64 m_uiIonarDoorGUID; - uint64 m_uiLokenDoorGUID; - uint64 m_uiLokenGlobeGUID; - - void Initialize() - { - memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); - - m_uiGeneralBjarngrimGUID = 0; - m_uiVolkhanGUID = 0; - m_uiIonarGUID = 0; - m_uiLokenGUID = 0; - - m_uiBjarngrimDoorGUID = 0; - m_uiVolkhanDoorGUID = 0; - m_uiIonarDoorGUID = 0; - m_uiLokenDoorGUID = 0; - m_uiLokenGlobeGUID = 0; - } - - void OnCreatureCreate(Creature* pCreature, bool /*add*/) - { - switch(pCreature->GetEntry()) - { - case NPC_BJARNGRIM: - m_uiGeneralBjarngrimGUID = pCreature->GetGUID(); - break; - case NPC_VOLKHAN: - m_uiVolkhanGUID = pCreature->GetGUID(); - break; - case NPC_IONAR: - m_uiIonarGUID = pCreature->GetGUID(); - break; - case NPC_LOKEN: - m_uiLokenGUID = pCreature->GetGUID(); - break; - } - } - - void OnGameObjectCreate(GameObject* pGo, bool /*add*/) - { - switch(pGo->GetEntry()) - { - case GO_BJARNGRIM_DOOR: - m_uiBjarngrimDoorGUID = pGo->GetGUID(); - if (m_auiEncounter[0] == DONE) - pGo->SetGoState(GO_STATE_ACTIVE); - else - pGo->SetGoState(GO_STATE_READY); - break; - case GO_VOLKHAN_DOOR: - m_uiVolkhanDoorGUID = pGo->GetGUID(); - if (m_auiEncounter[1] == DONE) - pGo->SetGoState(GO_STATE_ACTIVE); - else - pGo->SetGoState(GO_STATE_READY); - break; - case GO_IONAR_DOOR: - m_uiIonarDoorGUID = pGo->GetGUID(); - if (m_auiEncounter[2] == DONE) - pGo->SetGoState(GO_STATE_ACTIVE); - else - pGo->SetGoState(GO_STATE_READY); - break; - case GO_LOKEN_DOOR: - m_uiLokenDoorGUID = pGo->GetGUID(); - if (m_auiEncounter[3] == DONE) - pGo->SetGoState(GO_STATE_ACTIVE); - else - pGo->SetGoState(GO_STATE_READY); - break; - case GO_LOKEN_THRONE: - m_uiLokenGlobeGUID = pGo->GetGUID(); - break; - } - } - - void SetData(uint32 uiType, uint32 uiData) - { - switch(uiType) - { - case TYPE_BJARNGRIM: - if (uiData == DONE) - DoUseDoorOrButton(m_uiBjarngrimDoorGUID); - m_auiEncounter[0] = uiData; - break; - case TYPE_VOLKHAN: - if (uiData == DONE) - DoUseDoorOrButton(m_uiVolkhanDoorGUID); - m_auiEncounter[1] = uiData; - break; - case TYPE_IONAR: - if (uiData == DONE) - DoUseDoorOrButton(m_uiIonarDoorGUID); - m_auiEncounter[2] = uiData; - break; - case TYPE_LOKEN: - if (uiData == DONE) - { - DoUseDoorOrButton(m_uiLokenDoorGUID); - - //Appears to be type 5 GO with animation. Need to figure out how this work, code below only placeholder - if (GameObject* pGlobe = instance->GetGameObject(m_uiLokenGlobeGUID)) - pGlobe->SetGoState(GO_STATE_ACTIVE); - } - m_auiEncounter[3] = uiData; - break; - } - - if (uiData == DONE) - SaveToDB(); - } - - uint32 GetData(uint32 uiType) - { - switch(uiType) - { - case TYPE_BJARNGRIM: - return m_auiEncounter[0]; - case TYPE_VOLKHAN: - return m_auiEncounter[1]; - case TYPE_IONAR: - return m_auiEncounter[2]; - case TYPE_LOKEN: - return m_auiEncounter[3]; - } - return 0; - } - - uint64 GetData64(uint32 uiData) - { - switch(uiData) - { - case DATA_BJARNGRIM: - return m_uiGeneralBjarngrimGUID; - case DATA_VOLKHAN: - return m_uiVolkhanGUID; - case DATA_IONAR: - return m_uiIonarGUID; - case DATA_LOKEN: - return m_uiLokenGUID; - } - return 0; - } - - std::string GetSaveData() - { - OUT_SAVE_INST_DATA; - - std::ostringstream saveStream; - saveStream << "H L " << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " - << m_auiEncounter[2] << " " << m_auiEncounter[3]; - - OUT_SAVE_INST_DATA_COMPLETE; - return saveStream.str(); - } - - void Load(const char* in) - { - if (!in) - { - OUT_LOAD_INST_DATA_FAIL; - return; - } - - OUT_LOAD_INST_DATA(in); - - char dataHead1, dataHead2; - uint16 data0, data1, data2, data3; - - std::istringstream loadStream(in); - loadStream >> dataHead1 >> dataHead2 >> data0 >> data1 >> data2 >> data3; - - if (dataHead1 == 'H' && dataHead2 == 'L') - { - m_auiEncounter[0] = data0; - m_auiEncounter[1] = data1; - m_auiEncounter[2] = data2; - m_auiEncounter[3] = data3; - - for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) - if (m_auiEncounter[i] == IN_PROGRESS) - m_auiEncounter[i] = NOT_STARTED; - } else OUT_LOAD_INST_DATA_FAIL; - - OUT_LOAD_INST_DATA_COMPLETE; - } -}; - -InstanceData* GetInstanceData_instance_halls_of_lightning(Map* pMap) -{ - return new instance_halls_of_lightning(pMap); -} - -void AddSC_instance_halls_of_lightning() -{ - Script *newscript; - newscript = new Script; - newscript->Name = "instance_halls_of_lightning"; - newscript->GetInstanceData = &GetInstanceData_instance_halls_of_lightning; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Northrend/Ulduar/halls_of_stone/boss_krystallus.cpp b/src/server/scripts/Northrend/Ulduar/halls_of_stone/boss_krystallus.cpp deleted file mode 100644 index 0674b7c79eb..00000000000 --- a/src/server/scripts/Northrend/Ulduar/halls_of_stone/boss_krystallus.cpp +++ /dev/null @@ -1,148 +0,0 @@ -/* Script Data Start -SDName: Boss krystallus -SDAuthor: LordVanMartin -SD%Complete: -SDComment: -SDCategory: -Script Data End */ - -/*** SQL START *** -update creature_template set scriptname = 'boss_krystallus' where entry = ''; -*** SQL END ***/ -#include "ScriptedPch.h" -#include "halls_of_stone.h" - -enum Spells -{ - SPELL_BOULDER_TOSS = 50843, - H_SPELL_BOULDER_TOSS = 59742, - SPELL_GROUND_SPIKE = 59750, - SPELL_GROUND_SLAM = 50827, - SPELL_SHATTER = 50810, - H_SPELL_SHATTER = 61546, - SPELL_STOMP = 48131, - H_SPELL_STOMP = 59744 -}; - -enum Yells -{ - SAY_AGGRO = -1599007, - SAY_KILL = -1599008, - SAY_DEATH = -1599009, - SAY_SHATTER = -1599010 -}; - -struct boss_krystallusAI : public ScriptedAI -{ - boss_krystallusAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - } - - uint32 uiBoulderTossTimer; - uint32 uiGroundSpikeTimer; - uint32 uiGroundSlamTimer; - uint32 uiShatterTimer; - uint32 uiStompTimer; - - bool bIsSlam; - - ScriptedInstance* pInstance; - - void Reset() - { - bIsSlam = false; - - uiBoulderTossTimer = 3000 + rand()%6000; - uiGroundSpikeTimer = 9000 + rand()%5000; - uiGroundSlamTimer = 15000 + rand()%3000; - uiStompTimer = 20000 + rand()%9000; - uiShatterTimer = 0; - - if (pInstance) - pInstance->SetData(DATA_KRYSTALLUS_EVENT, NOT_STARTED); - } - void EnterCombat(Unit* /*who*/) - { - DoScriptText(SAY_AGGRO, me); - - if (pInstance) - pInstance->SetData(DATA_KRYSTALLUS_EVENT, IN_PROGRESS); - } - - void UpdateAI(const uint32 diff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - if (uiBoulderTossTimer <= diff) - { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_BOULDER_TOSS); - uiBoulderTossTimer = 9000 + rand()%6000; - } else uiBoulderTossTimer -= diff; - - if (uiGroundSpikeTimer <= diff) - { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_GROUND_SPIKE); - uiGroundSpikeTimer = 12000 + rand()%5000; - } else uiGroundSpikeTimer -= diff; - - if (uiStompTimer <= diff) - { - DoCast(me, SPELL_STOMP); - uiStompTimer = 20000 + rand()%9000; - } else uiStompTimer -= diff; - - if (uiGroundSlamTimer <= diff) - { - DoCast(me, SPELL_GROUND_SLAM); - bIsSlam = true; - uiShatterTimer = 10000; - uiGroundSlamTimer = 15000 + rand()%3000; - } else uiGroundSlamTimer -= diff; - - if (bIsSlam) - { - if (uiShatterTimer <= diff) - { - DoCast(me, SPELL_SHATTER); - bIsSlam = false; - } else uiShatterTimer -= diff; - } - - DoMeleeAttackIfReady(); - } - - void JustDied(Unit* /*killer*/) - { - DoScriptText(SAY_DEATH, me); - - if (pInstance) - pInstance->SetData(DATA_KRYSTALLUS_EVENT, DONE); - } - - void KilledUnit(Unit * victim) - { - if (victim == me) - return; - DoScriptText(SAY_KILL, me); - } -}; - -CreatureAI* GetAI_boss_krystallus(Creature* pCreature) -{ - return new boss_krystallusAI (pCreature); -} - -void AddSC_boss_krystallus() -{ - Script *newscript; - - newscript = new Script; - newscript->Name = "boss_krystallus"; - newscript->GetAI = &GetAI_boss_krystallus; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Northrend/Ulduar/halls_of_stone/boss_maiden_of_grief.cpp b/src/server/scripts/Northrend/Ulduar/halls_of_stone/boss_maiden_of_grief.cpp deleted file mode 100644 index b3c3c675347..00000000000 --- a/src/server/scripts/Northrend/Ulduar/halls_of_stone/boss_maiden_of_grief.cpp +++ /dev/null @@ -1,166 +0,0 @@ -/* Script Data Start -SDName: Boss maiden_of_grief -SDAuthor: LordVanMartin -SD%Complete: -SDComment: -SDCategory: -Script Data End */ - -/*** SQL START *** -update creature_template set scriptname = 'boss_maiden_of_grief' where entry = ''; -*** SQL END ***/ -#include "ScriptedPch.h" -#include "halls_of_stone.h" - -enum Spells -{ - SPELL_PARTING_SORROW = 59723, - SPELL_STORM_OF_GRIEF_N = 50752, - SPELL_STORM_OF_GRIEF_H = 59772, - SPELL_SHOCK_OF_SORROW_N = 50760, - SPELL_SHOCK_OF_SORROW_H = 59726, - SPELL_PILLAR_OF_WOE_N = 50761, - SPELL_PILLAR_OF_WOE_H = 59727 -}; - -enum Yells -{ - SAY_AGGRO = -1599000, - SAY_SLAY_1 = -1599001, - SAY_SLAY_2 = -1599002, - SAY_SLAY_3 = -1599003, - SAY_SLAY_4 = -1599004, - SAY_DEATH = -1599005, - SAY_STUN = -1599006 -}; - -enum Achievements -{ - ACHIEV_GOOD_GRIEF_START_EVENT = 20383, -}; - -struct boss_maiden_of_griefAI : public ScriptedAI -{ - boss_maiden_of_griefAI(Creature *c) : ScriptedAI(c) - { - pInstance = me->GetInstanceData(); - } - - ScriptedInstance* pInstance; - - uint32 PartingSorrowTimer; - uint32 StormOfGriefTimer; - uint32 ShockOfSorrowTimer; - uint32 PillarOfWoeTimer; - - void Reset() - { - PartingSorrowTimer = 25000 + rand()%5000; - StormOfGriefTimer = 10000; - ShockOfSorrowTimer = 20000+rand()%5000; - PillarOfWoeTimer = 5000 + rand()%10000; - - if (pInstance) - { - pInstance->SetData(DATA_MAIDEN_OF_GRIEF_EVENT, NOT_STARTED); - pInstance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_GOOD_GRIEF_START_EVENT); - } - } - - void EnterCombat(Unit* /*who*/) - { - DoScriptText(SAY_AGGRO, me); - - if (pInstance) - { - if (GameObject *pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_MAIDEN_DOOR))) - if (pDoor->GetGoState() == GO_STATE_READY) - { - EnterEvadeMode(); - return; - } - - pInstance->SetData(DATA_MAIDEN_OF_GRIEF_EVENT, IN_PROGRESS); - pInstance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_GOOD_GRIEF_START_EVENT); - } - } - - void UpdateAI(const uint32 diff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - if (IsHeroic()) - { - if (PartingSorrowTimer <= diff) - { - Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); - - if (pTarget) - DoCast(pTarget, SPELL_PARTING_SORROW); - - PartingSorrowTimer = 30000 + rand()%10000; - } else PartingSorrowTimer -= diff; - } - - if (StormOfGriefTimer <= diff) - { - DoCast(me->getVictim(), SPELL_STORM_OF_GRIEF_N, true); - StormOfGriefTimer = 15000 + rand()%5000; - } else StormOfGriefTimer -= diff; - - if (ShockOfSorrowTimer <= diff) - { - DoResetThreat(); - DoScriptText(SAY_STUN, me); - DoCast(me, SPELL_SHOCK_OF_SORROW_N); - ShockOfSorrowTimer = 20000 + rand()%10000; - } else ShockOfSorrowTimer -= diff; - - if (PillarOfWoeTimer <= diff) - { - Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 1); - - if (pTarget) - DoCast(pTarget, SPELL_PILLAR_OF_WOE_N); - else - DoCast(me->getVictim(), SPELL_PILLAR_OF_WOE_N); - - PillarOfWoeTimer = 5000 + rand()%20000; - } else PillarOfWoeTimer -= diff; - - DoMeleeAttackIfReady(); - } - - void JustDied(Unit* /*killer*/) - { - DoScriptText(SAY_DEATH, me); - - if (pInstance) - pInstance->SetData(DATA_MAIDEN_OF_GRIEF_EVENT, DONE); - } - - void KilledUnit(Unit * victim) - { - if (victim == me) - return; - - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3,SAY_SLAY_4), me); - } -}; - -CreatureAI* GetAI_boss_maiden_of_grief(Creature* pCreature) -{ - return new boss_maiden_of_griefAI (pCreature); -} - -void AddSC_boss_maiden_of_grief() -{ - Script *newscript; - - newscript = new Script; - newscript->Name = "boss_maiden_of_grief"; - newscript->GetAI = &GetAI_boss_maiden_of_grief; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Northrend/Ulduar/halls_of_stone/boss_sjonnir.cpp b/src/server/scripts/Northrend/Ulduar/halls_of_stone/boss_sjonnir.cpp deleted file mode 100644 index 68c3e34e6bf..00000000000 --- a/src/server/scripts/Northrend/Ulduar/halls_of_stone/boss_sjonnir.cpp +++ /dev/null @@ -1,300 +0,0 @@ -/* Script Data Start -SDName: Boss sjonnir -SDAuthor: LordVanMartin -SD%Complete: -SDComment: -SDCategory: -Script Data End */ - -/*** SQL START *** -update creature_template set scriptname = 'boss_sjonnir' where entry = ''; -*** SQL END ***/ -#include "ScriptedPch.h" -#include "halls_of_stone.h" - -enum Spells -{ - SPELL_LIGHTING_RING = 51849, //Periodic Trigger (interval 2s) spell = 50841 - H_SPELL_LIGHTING_RING = 59861, //Periodic Trigger (interval 2s) spell = 59849 - SPELL_LIGHTING_RING_1 = 50840, //Periodic Trigger (interval 2s) spell = 50841 - H_SPELL_LIGHTING_RING_1 = 59848, //Periodic Trigger (interval 2s) spell = 59849 - SPELL_STATIC_CHARGE = 50834, //Periodic Trigger 2s interval, spell =50835 - H_SPELL_STATIC_CHARGE = 59846, //Periodic Trigger 2s interval, spell =50847 - SPELL_CHAIN_LIGHTING = 50830, - H_SPELL_CHAIN_LIGHTING = 59844, - SPELL_LIGHTING_SHIELD = 50831, - H_SPELL_LIGHTING_SHIELD = 59845, - SPELL_FRENZY = 28747 -}; - -enum Yells -{ - SAY_AGGRO = -1599011, - SAY_SLAY_1 = -1599012, - SAY_SLAY_2 = -1599013, - SAY_SLAY_3 = -1599014, - SAY_DEATH = -1599015 -}; - -#define EMOTE_GENERIC_FRENZY -1000002 - -enum SjonnirCreatures -{ - CREATURE_FORGED_IRON_TROGG = 27979, - CREATURE_MALFORMED_OOZE = 27981, - CREATURE_FORGED_IRON_DWARF = 27982, - CREATURE_IRON_SLUDGE = 28165 -}; - -enum Misc -{ - DATA_TIME_BEFORE_OOZE = 150000, //2min 30 secs - ACHIEV_ABUSE_THE_OOZE = 2155 -}; - -struct Locations -{ - float x, y, z; -}; - -static Locations PipeLocations[] = -{ - {1295.44, 734.07, 200.3}, //left - {1297.7, 595.6, 199.9} //right -}; - -static Locations CenterPoint = {1295.21, 667.157, 189.691}; - -struct boss_sjonnirAI : public ScriptedAI -{ - boss_sjonnirAI(Creature *c) : ScriptedAI(c), lSummons(me) - { - pInstance = c->GetInstanceData(); - } - - bool bIsFrenzy; - - uint32 uiChainLightningTimer; - uint32 uiLightningShieldTimer; - uint32 uiStaticChargeTimer; - uint32 uiLightningRingTimer; - uint32 uiSummonTimer; - uint32 uiFrenzyTimer; - uint32 uiEncounterTimer; - uint32 uiKilledIronSludges; - - SummonList lSummons; - - ScriptedInstance* pInstance; - - void Reset() - { - bIsFrenzy = false; - - uiEncounterTimer = 0; - uiChainLightningTimer = 3000 + rand()%5000; - uiLightningShieldTimer = 20000 + rand()%5000; - uiStaticChargeTimer = 20000 + rand()%5000; - uiLightningRingTimer = 30000 + rand()%5000; - uiSummonTimer = 5000; - uiFrenzyTimer = 300000; //5 minutes - uiKilledIronSludges = 0; - - lSummons.DespawnAll(); - - if (pInstance) - pInstance->SetData(DATA_SJONNIR_EVENT, NOT_STARTED); - } - - void EnterCombat(Unit* /*who*/) - { - DoScriptText(SAY_AGGRO, me); - - uiEncounterTimer = 0; - - if (pInstance) - { - if (GameObject *pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_SJONNIR_DOOR))) - if (pDoor->GetGoState() == GO_STATE_READY) - { - EnterEvadeMode(); - return; - } - - pInstance->SetData(DATA_SJONNIR_EVENT, IN_PROGRESS); - } - } - - void UpdateAI(const uint32 diff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - if (uiChainLightningTimer <= diff) - { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_CHAIN_LIGHTING); - uiChainLightningTimer = 10000 + rand()%5000; - } else uiChainLightningTimer -= diff; - - if (uiLightningShieldTimer <= diff) - { - DoCast(me, SPELL_LIGHTING_SHIELD); - uiLightningShieldTimer -= diff; - } - - if (uiStaticChargeTimer <= diff) - { - DoCast(me->getVictim(), SPELL_STATIC_CHARGE); - uiStaticChargeTimer = 20000 + rand()%5000; - } uiStaticChargeTimer -= diff; - - if (uiLightningRingTimer <= diff) - { - if (me->IsNonMeleeSpellCasted(false)) - me->InterruptNonMeleeSpells(false); - DoCast(me, SPELL_LIGHTING_RING); - uiLightningRingTimer = 30000 + rand()%5000; - } else uiLightningRingTimer -= diff; - - if (uiSummonTimer <= diff) - { - uint32 uiSummonPipe = rand()%2; - me->SummonCreature(uiEncounterTimer > DATA_TIME_BEFORE_OOZE ? CREATURE_MALFORMED_OOZE : - RAND(CREATURE_FORGED_IRON_DWARF,CREATURE_FORGED_IRON_TROGG), - PipeLocations[uiSummonPipe].x, PipeLocations[uiSummonPipe].y, PipeLocations[uiSummonPipe].z, 0.0f, - TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000); - uiSummonTimer = 20000; - } else uiSummonTimer -= diff; - - if (!bIsFrenzy) - { - if (uiFrenzyTimer <= diff) - { - DoCast(me, SPELL_FRENZY); - bIsFrenzy = true; - } - else uiFrenzyTimer -= diff; - } - - uiEncounterTimer +=diff; - - DoMeleeAttackIfReady(); - } - - void JustSummoned(Creature* summon) - { - summon->GetMotionMaster()->MovePoint(0, CenterPoint.x, CenterPoint.y, CenterPoint.z); - /*if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - summon->AI()->AttackStart(pTarget);*/ - lSummons.Summon(summon); - } - - void JustDied(Unit* /*killer*/) - { - DoScriptText(SAY_DEATH, me); - lSummons.DespawnAll(); - - if (pInstance) - { - pInstance->SetData(DATA_SJONNIR_EVENT, DONE); - if (IsHeroic() && uiKilledIronSludges > 4) - pInstance->DoCompleteAchievement(ACHIEV_ABUSE_THE_OOZE); - } - } - void KilledUnit(Unit * victim) - { - if (victim == me) - return; - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); - } - - void KilledIronSludge() - { - ++uiKilledIronSludges; - } -}; - -CreatureAI* GetAI_boss_sjonnir(Creature* pCreature) -{ - return new boss_sjonnirAI (pCreature); -} - -struct mob_malformed_oozeAI : public ScriptedAI -{ - mob_malformed_oozeAI(Creature *c) : ScriptedAI(c) {} - - uint32 uiMergeTimer; - - void Reset() - { - uiMergeTimer = 10000; - } - - void UpdateAI(const uint32 diff) - { - if (uiMergeTimer <= diff) - { - if (Creature* pTemp = me->FindNearestCreature(CREATURE_MALFORMED_OOZE, 3.0f, true)) - { - DoSpawnCreature(CREATURE_IRON_SLUDGE, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 20000); - pTemp->DisappearAndDie(); - me->DisappearAndDie(); - } - uiMergeTimer = 3000; - } else uiMergeTimer -= diff; - - if (!UpdateVictim()) - return; - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_mob_malformed_ooze(Creature* pCreature) -{ - return new mob_malformed_oozeAI(pCreature); -} - -struct mob_iron_sludgeAI : public ScriptedAI -{ - mob_iron_sludgeAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - } - - ScriptedInstance* pInstance; - - void JustDied(Unit* /*pKiller*/) - { - if (pInstance) - if (Creature* pSjonnir = Unit::GetCreature(*me, pInstance->GetData64(DATA_SJONNIR))) - CAST_AI(boss_sjonnirAI, pSjonnir->AI())->KilledIronSludge(); - } -}; - -CreatureAI* GetAI_mob_iron_sludge(Creature* pCreature) -{ - return new mob_iron_sludgeAI(pCreature); -} - -void AddSC_boss_sjonnir() -{ - Script *newscript; - - newscript = new Script; - newscript->Name = "boss_sjonnir"; - newscript->GetAI = &GetAI_boss_sjonnir; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_malformed_ooze"; - newscript->GetAI = &GetAI_mob_malformed_ooze; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_iron_sludge"; - newscript->GetAI = &GetAI_mob_iron_sludge; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Northrend/Ulduar/halls_of_stone/halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/halls_of_stone/halls_of_stone.cpp deleted file mode 100644 index 8febdaab879..00000000000 --- a/src/server/scripts/Northrend/Ulduar/halls_of_stone/halls_of_stone.cpp +++ /dev/null @@ -1,724 +0,0 @@ -#include "ScriptedPch.h" -#include "ScriptedEscortAI.h" -#include "halls_of_stone.h" - -enum Texts -{ - SAY_KILL_1 = -1599016, - SAY_KILL_2 = -1599017, - SAY_KILL_3 = -1599018, - SAY_LOW_HEALTH = -1599019, - SAY_DEATH = -1599020, - SAY_PLAYER_DEATH_1 = -1599021, - SAY_PLAYER_DEATH_2 = -1599022, - SAY_PLAYER_DEATH_3 = -1599023, - SAY_ESCORT_START = -1599024, - - SAY_SPAWN_DWARF = -1599025, - SAY_SPAWN_TROGG = -1599026, - SAY_SPAWN_OOZE = -1599027, - SAY_SPAWN_EARTHEN = -1599028, - - SAY_EVENT_INTRO_1 = -1599029, - SAY_EVENT_INTRO_2 = -1599030, - SAY_EVENT_INTRO_3_ABED = -1599031, - - SAY_EVENT_A_1 = -1599032, - SAY_EVENT_A_2_KADD = -1599033, - SAY_EVENT_A_3 = -1599034, - - SAY_EVENT_B_1 = -1599035, - SAY_EVENT_B_2_MARN = -1599036, - SAY_EVENT_B_3 = -1599037, - - SAY_EVENT_C_1 = -1599038, - SAY_EVENT_C_2_ABED = -1599039, - SAY_EVENT_C_3 = -1599040, - - SAY_EVENT_D_1 = -1599041, - SAY_EVENT_D_2_ABED = -1599042, - SAY_EVENT_D_3 = -1599043, - SAY_EVENT_D_4_ABED = -1599044, - - SAY_EVENT_END_01 = -1599045, - SAY_EVENT_END_02 = -1599046, - SAY_EVENT_END_03_ABED = -1599047, - SAY_EVENT_END_04 = -1599048, - SAY_EVENT_END_05_ABED = -1599049, - SAY_EVENT_END_06 = -1599050, - SAY_EVENT_END_07_ABED = -1599051, - SAY_EVENT_END_08 = -1599052, - SAY_EVENT_END_09_KADD = -1599053, - SAY_EVENT_END_10 = -1599054, - SAY_EVENT_END_11_KADD = -1599055, - SAY_EVENT_END_12 = -1599056, - SAY_EVENT_END_13_KADD = -1599057, - SAY_EVENT_END_14 = -1599058, - SAY_EVENT_END_15_MARN = -1599059, - SAY_EVENT_END_16 = -1599060, - SAY_EVENT_END_17_MARN = -1599061, - SAY_EVENT_END_18 = -1599062, - SAY_EVENT_END_19_MARN = -1599063, - SAY_EVENT_END_20 = -1599064, - SAY_EVENT_END_21_ABED = -1599065, - - SAY_VICTORY_SJONNIR_1 = -1599066, - SAY_VICTORY_SJONNIR_2 = -1599067, - - SAY_ENTRANCE_MEET = -1599068, - - TEXT_ID_START = 13100, - TEXT_ID_PROGRESS = 13101 -}; - -enum BrannCreatures -{ - CREATURE_TRIBUNAL_OF_THE_AGES = 28234, - CREATURE_BRANN_BRONZEBEARD = 28070, - CREATURE_DARK_MATTER_TARGET = 28237, - CREATURE_SEARING_GAZE_TARGET = 28265, - CREATURE_DARK_RUNE_PROTECTOR = 27983, - CREATURE_DARK_RUNE_STORMCALLER = 27984, - CREATURE_IRON_GOLEM_CUSTODIAN = 27985, -}; - -enum Spells -{ - SPELL_STEALTH = 58506, - //Kadrak - SPELL_GLARE_OF_THE_TRIBUNAL = 50988, - H_SPELL_GLARE_OF_THE_TRIBUNAL = 59868, - //Marnak - SPELL_DARK_MATTER = 51012, - H_SPELL_DARK_MATTER = 59868, - //Abedneum - SPELL_SEARING_GAZE = 51136, - H_SPELL_SEARING_GAZE = 59867 -}; - -enum Quests -{ - QUEST_HALLS_OF_STONE = 13207 -}; - -enum Achievements -{ - ACHIEV_BRANN_SPANKIN_NEW = 2154 -}; - -#define GOSSIP_ITEM_START "Brann, it would be our honor!" -#define GOSSIP_ITEM_PROGRESS "Let's move Brann, enough of the history lessons!" - -static Position SpawnLocations[]= -{ - {946.992, 397.016, 208.374}, - {960.748, 382.944, 208.374}, -}; - -struct mob_tribuna_controllerAI : public ScriptedAI -{ - mob_tribuna_controllerAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - SetCombatMovement(false); - } - - ScriptedInstance* pInstance; - - uint32 uiKaddrakEncounterTimer; - uint32 uiMarnakEncounterTimer; - uint32 uiAbedneumEncounterTimer; - - bool bKaddrakActivated; - bool bMarnakActivated; - bool bAbedneumActivated; - - std::list KaddrakGUIDList; - - void Reset() - { - uiKaddrakEncounterTimer = 1500; - uiMarnakEncounterTimer = 10000; - uiAbedneumEncounterTimer = 10000; - - bKaddrakActivated = false; - bMarnakActivated = false; - bAbedneumActivated = false; - - if (pInstance) - { - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_KADDRAK),false); - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_MARNAK),false); - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_ABEDNEUM),false); - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_SKY_FLOOR),false); - } - - KaddrakGUIDList.clear(); - } - - void UpdateFacesList() - { - /*GetCreatureListWithEntryInGrid(lKaddrakGUIDList, me, CREATURE_KADDRAK, 50.0f); - if (!lKaddrakGUIDList.empty()) - { - uint32 uiPositionCounter = 0; - for (std::list::const_iterator itr = lKaddrakGUIDList.begin(); itr != lKaddrakGUIDList.end(); ++itr) - { - if ((*itr)->isAlive()) - { - if (uiPositionCounter == 0) - { - (*itr)->GetMap()->CreatureRelocation((*itr), 927.265, 333.200, 218.780, (*itr)->GetOrientation()); - (*itr)->SendMonsterMove(927.265, 333.200, 218.780, 0, (*itr)->GetMovementFlags(), 1); - } - else - { - (*itr)->GetMap()->CreatureRelocation((*itr), 921.745, 328.076, 218.780, (*itr)->GetOrientation()); - (*itr)->SendMonsterMove(921.745, 328.076, 218.780, 0, (*itr)->GetMovementFlags(), 1); - } - } - ++uiPositionCounter; - } - }*/ - } - - void UpdateAI(const uint32 diff) - { - if (bKaddrakActivated) - { - if (uiKaddrakEncounterTimer <= diff) - { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - if (!KaddrakGUIDList.empty()) - for (std::list::const_iterator itr = KaddrakGUIDList.begin(); itr != KaddrakGUIDList.end(); ++itr) - { - if (Creature *pKaddrak = Unit::GetCreature(*me, *itr)) - { - if (pKaddrak->isAlive()) - pKaddrak->CastSpell(pTarget, DUNGEON_MODE(SPELL_GLARE_OF_THE_TRIBUNAL, H_SPELL_GLARE_OF_THE_TRIBUNAL), true); - } - } - uiKaddrakEncounterTimer = 1500; - } else uiKaddrakEncounterTimer -= diff; - } - if (bMarnakActivated) - { - if (uiMarnakEncounterTimer <= diff) - { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - { - if (Creature* pSummon = me->SummonCreature(CREATURE_DARK_MATTER_TARGET, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN, 1000)) - { - pSummon->SetDisplayId(11686); - pSummon->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - pSummon->CastSpell(pTarget, DUNGEON_MODE(SPELL_DARK_MATTER, H_SPELL_DARK_MATTER), true); - } - } - uiMarnakEncounterTimer = 30000 + rand()%1000; - } else uiMarnakEncounterTimer -= diff; - } - if (bAbedneumActivated) - { - if (uiAbedneumEncounterTimer <= diff) - { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - { - if (Creature* pSummon = me->SummonCreature(CREATURE_SEARING_GAZE_TARGET, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN, 1000)) - { - pSummon->SetDisplayId(11686); - pSummon->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - pSummon->CastSpell(pTarget, DUNGEON_MODE(SPELL_SEARING_GAZE, H_SPELL_SEARING_GAZE), true); - } - } - uiAbedneumEncounterTimer = 30000 + rand()%1000; - } else uiAbedneumEncounterTimer -= diff; - } - } -}; - -struct npc_brann_hosAI : public npc_escortAI -{ - npc_brann_hosAI(Creature *c) : npc_escortAI(c) - { - pInstance = c->GetInstanceData(); - } - - uint32 uiStep; - uint32 uiPhaseTimer; - - uint64 uiControllerGUID; - std::list lDwarfGUIDList; - - ScriptedInstance* pInstance; - - bool bIsBattle; - bool bIsLowHP; - bool bHasBeenDamaged; - - void Reset() - { - if (!HasEscortState(STATE_ESCORT_ESCORTING)) - { - bIsLowHP = false; - bIsBattle = false; - bHasBeenDamaged = false; - uiStep = 0; - uiPhaseTimer = 0; - uiControllerGUID = 0; - - DespawnDwarf(); - - if (pInstance) - pInstance->SetData(DATA_BRANN_EVENT, NOT_STARTED); - } - } - - void DespawnDwarf() - { - if (lDwarfGUIDList.empty()) - return; - for (std::list::const_iterator itr = lDwarfGUIDList.begin(); itr != lDwarfGUIDList.end(); ++itr) - { - Creature* pTemp = Unit::GetCreature(*me, pInstance ? (*itr) : 0); - if (pTemp && pTemp->isAlive()) - pTemp->ForcedDespawn(); - } - lDwarfGUIDList.clear(); - } - - void WaypointReached(uint32 uiPointId) - { - switch(uiPointId) - { - case 7: - if (Creature* pCreature = GetClosestCreatureWithEntry(me, CREATURE_TRIBUNAL_OF_THE_AGES, 100.0f)) - { - if (!pCreature->isAlive()) - pCreature->Respawn(); - CAST_AI(mob_tribuna_controllerAI, pCreature->AI())->UpdateFacesList(); - uiControllerGUID = pCreature->GetGUID(); - } - break; - case 13: - DoScriptText(SAY_EVENT_INTRO_1, me); - SetEscortPaused(true); - JumpToNextStep(20000); - break; - case 17: - DoScriptText(SAY_EVENT_INTRO_2, me); - if (pInstance) - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_TRIBUNAL_CONSOLE),true); - me->SetStandState(UNIT_STAND_STATE_KNEEL); - SetEscortPaused(true); - JumpToNextStep(8500); - break; - case 18: - SetEscortPaused(true); - break; - } - } - - void SpawnDwarf(uint32 uiType) - { - switch(uiType) - { - case 1: - { - uint32 uiSpawnNumber = DUNGEON_MODE(2,3); - for (uint8 i = 0; i < uiSpawnNumber; ++i) - me->SummonCreature(CREATURE_DARK_RUNE_PROTECTOR, SpawnLocations[0], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000); - me->SummonCreature(CREATURE_DARK_RUNE_STORMCALLER, SpawnLocations[0], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000); - break; - } - case 2: - for (uint8 i = 0; i < 2; ++i) - me->SummonCreature(CREATURE_DARK_RUNE_STORMCALLER, SpawnLocations[0], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000); - break; - case 3: - me->SummonCreature(CREATURE_IRON_GOLEM_CUSTODIAN, SpawnLocations[0], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000); - break; - } - } - - void JustSummoned(Creature* pSummoned) - { - lDwarfGUIDList.push_back(pSummoned->GetGUID()); - pSummoned->AddThreat(me, 0.0f); - pSummoned->AI()->AttackStart(me); - } - - void JumpToNextStep(uint32 uiTimer) - { - uiPhaseTimer = uiTimer; - ++uiStep; - } - - void StartWP() - { - me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - SetEscortPaused(false); - uiStep = 1; - Start(); - } - - void DamageTaken(Unit* /*done_by*/, uint32 & /*damage*/) - { - if (!bHasBeenDamaged) - bHasBeenDamaged = true; - } - - void UpdateEscortAI(const uint32 uiDiff) - { - if (uiPhaseTimer <= uiDiff) - { - switch(uiStep) - { - case 1: - if (pInstance) - { - if (pInstance->GetData(DATA_BRANN_EVENT) != NOT_STARTED) - return; - pInstance->SetData(DATA_BRANN_EVENT, IN_PROGRESS); - } - bIsBattle = false; - DoScriptText(SAY_ESCORT_START, me); - SetRun(true); - JumpToNextStep(0); - break; - case 3: - SetEscortPaused(false); - JumpToNextStep(0); - break; - case 5: - if (pInstance) - if (Creature* pTemp = (Unit::GetCreature(*me, pInstance->GetData64(DATA_ABEDNEUM)))) - DoScriptText(SAY_EVENT_INTRO_3_ABED, pTemp); - JumpToNextStep(8500); - break; - case 6: - DoScriptText(SAY_EVENT_A_1, me); - JumpToNextStep(6500); - break; - case 7: - if (pInstance) - if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(DATA_KADDRAK))) - DoScriptText(SAY_EVENT_A_2_KADD, pTemp); - JumpToNextStep(12500); - break; - case 8: - DoScriptText(SAY_EVENT_A_3, me); - if (pInstance) - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_KADDRAK),true); - if (Creature* pTemp = Unit::GetCreature(*me, uiControllerGUID)) - CAST_AI(mob_tribuna_controllerAI, pTemp->AI())->bKaddrakActivated = true; - JumpToNextStep(5000); - break; - case 9: - me->SetReactState(REACT_PASSIVE); - SpawnDwarf(1); - JumpToNextStep(20000); - break; - case 10: - DoScriptText(SAY_EVENT_B_1, me); - JumpToNextStep(6000); - break; - case 11: - if (pInstance) - if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(DATA_MARNAK))) - DoScriptText(SAY_EVENT_B_2_MARN, pTemp); - SpawnDwarf(1); - JumpToNextStep(20000); - break; - case 12: - DoScriptText(SAY_EVENT_B_3, me); - if (pInstance) - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_MARNAK),true); - if (Creature* pTemp = Unit::GetCreature(*me, uiControllerGUID)) - CAST_AI(mob_tribuna_controllerAI, pTemp->AI())->bMarnakActivated = true; - JumpToNextStep(10000); - break; - case 13: - SpawnDwarf(1); - JumpToNextStep(10000); - break; - case 14: - SpawnDwarf(2); - JumpToNextStep(20000); - break; - case 15: - DoScriptText(SAY_EVENT_C_1, me); - SpawnDwarf(1); - JumpToNextStep(10000); - break; - case 16: - SpawnDwarf(2); - JumpToNextStep(20000); - break; - case 17: - if (pInstance) - if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(DATA_ABEDNEUM))) - DoScriptText(SAY_EVENT_C_2_ABED, pTemp); - SpawnDwarf(1); - JumpToNextStep(20000); - break; - case 18: - DoScriptText(SAY_EVENT_C_3, me); - if (pInstance) - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_ABEDNEUM),true); - if (Creature* pTemp = Unit::GetCreature(*me, uiControllerGUID)) - CAST_AI(mob_tribuna_controllerAI, pTemp->AI())->bAbedneumActivated = true; - JumpToNextStep(5000); - break; - case 19: - SpawnDwarf(2); - JumpToNextStep(10000); - break; - case 20: - SpawnDwarf(1); - JumpToNextStep(15000); - break; - case 21: - DoScriptText(SAY_EVENT_D_1, me); - SpawnDwarf(3); - JumpToNextStep(20000); - break; - case 22: - if (pInstance) - if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(DATA_ABEDNEUM))) - DoScriptText(SAY_EVENT_D_2_ABED, pTemp); - SpawnDwarf(1); - JumpToNextStep(5000); - break; - case 23: - SpawnDwarf(2); - JumpToNextStep(15000); - break; - case 24: - DoScriptText(SAY_EVENT_D_3, me); - SpawnDwarf(3); - JumpToNextStep(5000); - break; - case 25: - SpawnDwarf(1); - JumpToNextStep(5000); - break; - case 26: - SpawnDwarf(2); - JumpToNextStep(10000); - break; - case 27: - if (pInstance) - if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(DATA_ABEDNEUM))) - DoScriptText(SAY_EVENT_D_4_ABED, pTemp); - SpawnDwarf(1); - JumpToNextStep(10000); - break; - case 28: - me->SetReactState(REACT_DEFENSIVE); - DoScriptText(SAY_EVENT_END_01, me); - me->SetStandState(UNIT_STAND_STATE_STAND); - if (pInstance) - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_SKY_FLOOR),true); - if (Creature* pTemp = Unit::GetCreature(*me, uiControllerGUID)) - pTemp->DealDamage(pTemp, pTemp->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); - bIsBattle = true; - SetEscortPaused(false); - JumpToNextStep(6500); - break; - case 29: - DoScriptText(SAY_EVENT_END_02, me); - if (pInstance) - { - pInstance->SetData(DATA_BRANN_EVENT, DONE); - - // Achievement criteria is with spell 59046 which does not exist. - // There is thus no way it can be given by casting the spell on the players. - pInstance->DoUpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET, 59046); - - if (!bHasBeenDamaged) - pInstance->DoCompleteAchievement(ACHIEV_BRANN_SPANKIN_NEW); - } - - JumpToNextStep(5500); - break; - case 30: - if (pInstance) - if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(DATA_ABEDNEUM))) - DoScriptText(SAY_EVENT_END_03_ABED, pTemp); - JumpToNextStep(8500); - break; - case 31: - DoScriptText(SAY_EVENT_END_04, me); - JumpToNextStep(11500); - break; - case 32: - if (pInstance) - if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(DATA_ABEDNEUM))) - DoScriptText(SAY_EVENT_END_05_ABED, pTemp); - JumpToNextStep(11500); - break; - case 33: - DoScriptText(SAY_EVENT_END_06, me); - JumpToNextStep(4500); - break; - case 34: - if (pInstance) - if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(DATA_ABEDNEUM))) - DoScriptText(SAY_EVENT_END_07_ABED, pTemp); - JumpToNextStep(22500); - break; - case 35: - DoScriptText(SAY_EVENT_END_08, me); - JumpToNextStep(7500); - break; - case 36: - if (pInstance) - if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(DATA_KADDRAK))) - DoScriptText(SAY_EVENT_END_09_KADD, pTemp); - JumpToNextStep(18500); - break; - case 37: - DoScriptText(SAY_EVENT_END_10, me); - JumpToNextStep(5500); - break; - case 38: - if (pInstance) - if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(DATA_KADDRAK))) - DoScriptText(SAY_EVENT_END_11_KADD, pTemp); - JumpToNextStep(20500); - break; - case 39: - DoScriptText(SAY_EVENT_END_12, me); - JumpToNextStep(2500); - break; - case 40: - if (pInstance) - if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(DATA_KADDRAK))) - DoScriptText(SAY_EVENT_END_13_KADD, pTemp); - JumpToNextStep(19500); - break; - case 41: - DoScriptText(SAY_EVENT_END_14, me); - JumpToNextStep(10500); - break; - case 42: - if (pInstance) - if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(DATA_MARNAK))) - DoScriptText(SAY_EVENT_END_15_MARN, pTemp); - JumpToNextStep(6500); - break; - case 43: - DoScriptText(SAY_EVENT_END_16, me); - JumpToNextStep(6500); - break; - case 44: - if (pInstance) - if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(DATA_MARNAK))) - DoScriptText(SAY_EVENT_END_17_MARN, pTemp); - JumpToNextStep(25500); - break; - case 45: - DoScriptText(SAY_EVENT_END_18, me); - JumpToNextStep(23500); - break; - case 46: - if (pInstance) - if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(DATA_MARNAK))) - DoScriptText(SAY_EVENT_END_19_MARN, pTemp); - JumpToNextStep(3500); - break; - case 47: - DoScriptText(SAY_EVENT_END_20, me); - JumpToNextStep(8500); - break; - case 48: - if (pInstance) - if (Creature* pTemp = Unit::GetCreature(*me, pInstance->GetData64(DATA_ABEDNEUM))) - DoScriptText(SAY_EVENT_END_21_ABED, pTemp); - JumpToNextStep(5500); - break; - case 49: - { - if (pInstance) - { - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_KADDRAK),false); - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_MARNAK),false); - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_ABEDNEUM),false); - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_SKY_FLOOR),false); - } - Player* pPlayer = GetPlayerForEscort(); - if (pPlayer) - pPlayer->GroupEventHappens(QUEST_HALLS_OF_STONE, me); - me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - JumpToNextStep(180000); - break; - } - case 50: - SetEscortPaused(false); - break; - } - } else uiPhaseTimer -= uiDiff; - - if (!bIsLowHP && HealthBelowPct(30)) - { - DoScriptText(SAY_LOW_HEALTH, me); - bIsLowHP = true; - } - else if (bIsLowHP && !HealthBelowPct(30)) - bIsLowHP = false; - - if (!UpdateVictim()) - return; - - DoMeleeAttackIfReady(); - } -}; - -bool GossipHello_npc_brann_hos(Player* pPlayer, Creature* pCreature) -{ - if (pCreature->isQuestGiver()) - pPlayer->PrepareQuestMenu(pCreature->GetGUID()); - - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_START, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(TEXT_ID_START, pCreature->GetGUID()); - - return true; -} - -bool GossipSelect_npc_brann_hos(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) -{ - if (uiAction == GOSSIP_ACTION_INFO_DEF+1 || uiAction == GOSSIP_ACTION_INFO_DEF+2) - { - pPlayer->CLOSE_GOSSIP_MENU(); - CAST_AI(npc_brann_hosAI, pCreature->AI())->StartWP(); - } - - return true; -} - -CreatureAI* GetAI_mob_tribuna_controller(Creature* pCreature) -{ - return new mob_tribuna_controllerAI(pCreature); -} - -CreatureAI* GetAI_npc_brann_hos(Creature* pCreature) -{ - return new npc_brann_hosAI(pCreature); -} - -void AddSC_halls_of_stone() -{ - Script *newscript; - - newscript = new Script; - newscript->Name = "npc_brann_hos"; - newscript->GetAI = &GetAI_npc_brann_hos; - newscript->pGossipHello = &GossipHello_npc_brann_hos; - newscript->pGossipSelect = &GossipSelect_npc_brann_hos; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_tribuna_controller"; - newscript->GetAI = &GetAI_mob_tribuna_controller; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Northrend/Ulduar/halls_of_stone/halls_of_stone.h b/src/server/scripts/Northrend/Ulduar/halls_of_stone/halls_of_stone.h deleted file mode 100644 index b61e7057ddc..00000000000 --- a/src/server/scripts/Northrend/Ulduar/halls_of_stone/halls_of_stone.h +++ /dev/null @@ -1,48 +0,0 @@ -#ifndef DEF_HALLS_OF_STONE_H -#define DEF_HALLS_OF_STONE_H -enum Data -{ - DATA_KRYSTALLUS_EVENT, - DATA_MAIDEN_OF_GRIEF_EVENT, - DATA_SJONNIR_EVENT, - DATA_BRANN_EVENT -}; -enum Data64 -{ - DATA_KRYSTALLUS, - DATA_MAIDEN_OF_GRIEF, - DATA_SJONNIR, - DATA_KADDRAK, - DATA_MARNAK, - DATA_ABEDNEUM, - DATA_GO_TRIBUNAL_CONSOLE, - DATA_GO_KADDRAK, - DATA_GO_MARNAK, - DATA_GO_ABEDNEUM, - DATA_GO_SKY_FLOOR, - DATA_SJONNIR_DOOR, - DATA_MAIDEN_DOOR -}; -enum Creatures -{ - CREATURE_MAIDEN = 27975, - CREATURE_KRYSTALLUS = 27977, - CREATURE_SJONNIR = 27978, - CREATURE_MARNAK = 30897, - CREATURE_KADDRAK = 30898, - CREATURE_ABEDNEUM = 30899, - CREATURE_BRANN = 28070 -}; -enum GameObjects -{ - GO_ABEDNEUM = 191669, - GO_MARNAK = 192170, - GO_KADDRAK = 192171, - GO_MAIDEN_DOOR = 191292, - GO_BRANN_DOOR = 191295, - GO_SJONNIR_DOOR = 191296, - GO_TRIBUNAL_CONSOLE = 193907, - GO_TRIBUNAL_CHEST = 190586, - GO_TRIBUNAL_CHEST_HERO = 193996 -}; -#endif diff --git a/src/server/scripts/Northrend/Ulduar/halls_of_stone/instance_halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/halls_of_stone/instance_halls_of_stone.cpp deleted file mode 100644 index 69bb3779e70..00000000000 --- a/src/server/scripts/Northrend/Ulduar/halls_of_stone/instance_halls_of_stone.cpp +++ /dev/null @@ -1,254 +0,0 @@ -#include "ScriptedPch.h" -#include "halls_of_stone.h" - -#define MAX_ENCOUNTER 4 - -/* Halls of Stone encounters: -0- Krystallus -1- Maiden of Grief -2- Escort Event -3- Sjonnir The Ironshaper -*/ - -struct instance_halls_of_stone : public ScriptedInstance -{ - instance_halls_of_stone(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; - - uint64 uiMaidenOfGrief; - uint64 uiKrystallus; - uint64 uiSjonnir; - - uint64 uiKaddrak; - uint64 uiAbedneum; - uint64 uiMarnak; - uint64 uiBrann; - - uint64 uiMaidenOfGriefDoor; - uint64 uiSjonnirDoor; - uint64 uiBrannDoor; - uint64 uiTribunalConsole; - uint64 uiTribunalChest; - uint64 uiTribunalSkyFloor; - uint64 uiKaddrakGo; - uint64 uiAbedneumGo; - uint64 uiMarnakGo; - - uint32 m_auiEncounter[MAX_ENCOUNTER]; - - std::string str_data; - - void Initialize() - { - uiMaidenOfGrief = 0; - uiKrystallus = 0; - uiSjonnir = 0; - - uiKaddrak = 0; - uiMarnak = 0; - uiAbedneum = 0; - uiBrann = 0; - - uiMaidenOfGriefDoor = 0; - uiSjonnirDoor = 0; - uiBrannDoor = 0; - uiKaddrakGo = 0; - uiMarnakGo = 0; - uiAbedneumGo = 0; - uiTribunalConsole = 0; - uiTribunalChest = 0; - uiTribunalSkyFloor = 0; - - for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) - m_auiEncounter[i] = NOT_STARTED; - } - - void OnCreatureCreate(Creature* pCreature, bool /*add*/) - { - switch(pCreature->GetEntry()) - { - case CREATURE_MAIDEN: uiMaidenOfGrief = pCreature->GetGUID(); break; - case CREATURE_KRYSTALLUS: uiKrystallus = pCreature->GetGUID(); break; - case CREATURE_SJONNIR: uiSjonnir = pCreature->GetGUID(); break; - case CREATURE_MARNAK: uiMarnak = pCreature->GetGUID(); break; - case CREATURE_KADDRAK: uiKaddrak = pCreature->GetGUID(); break; - case CREATURE_ABEDNEUM: uiAbedneum = pCreature->GetGUID(); break; - case CREATURE_BRANN: uiBrann = pCreature->GetGUID(); break; - } - } - - void OnGameObjectCreate(GameObject* pGo, bool /*add*/) - { - switch(pGo->GetEntry()) - { - case GO_ABEDNEUM: - uiAbedneumGo = pGo->GetGUID(); - break; - case GO_MARNAK: - uiMarnakGo = pGo->GetGUID(); - break; - case GO_KADDRAK: - uiKaddrakGo = pGo->GetGUID(); - break; - case GO_MAIDEN_DOOR: - uiMaidenOfGriefDoor = pGo->GetGUID(); - if (m_auiEncounter[0] == DONE) - pGo->SetGoState(GO_STATE_ACTIVE); - else - pGo->SetGoState(GO_STATE_READY); - break; - case GO_BRANN_DOOR: - uiBrannDoor = pGo->GetGUID(); - if (m_auiEncounter[1] == DONE) - pGo->SetGoState(GO_STATE_ACTIVE); - else - pGo->SetGoState(GO_STATE_READY); - break; - case GO_SJONNIR_DOOR: - uiSjonnirDoor = pGo->GetGUID(); - if (m_auiEncounter[2] == DONE) - pGo->SetGoState(GO_STATE_ACTIVE); - else - pGo->SetGoState(GO_STATE_READY); - break; - case GO_TRIBUNAL_CONSOLE: - uiTribunalConsole = pGo->GetGUID(); - break; - case GO_TRIBUNAL_CHEST: - case GO_TRIBUNAL_CHEST_HERO: - uiTribunalChest = pGo->GetGUID(); - if (m_auiEncounter[2] == DONE) - pGo->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_INTERACT_COND); - break; - case 191527: - uiTribunalSkyFloor = pGo->GetGUID(); - break; - } - } - - void SetData(uint32 type, uint32 data) - { - switch(type) - { - case DATA_MAIDEN_OF_GRIEF_EVENT: - m_auiEncounter[1] = data; - if (m_auiEncounter[1] == DONE) - HandleGameObject(uiBrannDoor,true); - break; - case DATA_KRYSTALLUS_EVENT: - m_auiEncounter[0] = data; - if (m_auiEncounter[0] == DONE) - HandleGameObject(uiMaidenOfGriefDoor,true); - break; - case DATA_SJONNIR_EVENT: - m_auiEncounter[3] = data; - break; - case DATA_BRANN_EVENT: - m_auiEncounter[2] = data; - if (m_auiEncounter[2] == DONE) - { - HandleGameObject(uiSjonnirDoor,true); - GameObject *pGo = instance->GetGameObject(uiTribunalChest); - if (pGo) - pGo->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_INTERACT_COND); - } - break; - } - - if (data == DONE) - SaveToDB(); - } - - uint32 GetData(uint32 type) - { - switch(type) - { - case DATA_KRYSTALLUS_EVENT: return m_auiEncounter[0]; - case DATA_MAIDEN_OF_GRIEF_EVENT: return m_auiEncounter[1]; - case DATA_SJONNIR_EVENT: return m_auiEncounter[2]; - case DATA_BRANN_EVENT: return m_auiEncounter[3]; - } - - return 0; - } - - uint64 GetData64(uint32 identifier) - { - switch(identifier) - { - case DATA_MAIDEN_OF_GRIEF: return uiMaidenOfGrief; - case DATA_KRYSTALLUS: return uiKrystallus; - case DATA_SJONNIR: return uiSjonnir; - case DATA_KADDRAK: return uiKaddrak; - case DATA_MARNAK: return uiMarnak; - case DATA_ABEDNEUM: return uiAbedneum; - case DATA_GO_TRIBUNAL_CONSOLE: return uiTribunalConsole; - case DATA_GO_KADDRAK: return uiKaddrakGo; - case DATA_GO_ABEDNEUM: return uiAbedneumGo; - case DATA_GO_MARNAK: return uiMarnakGo; - case DATA_GO_SKY_FLOOR: return uiTribunalSkyFloor; - case DATA_SJONNIR_DOOR: return uiSjonnirDoor; - case DATA_MAIDEN_DOOR: return uiMaidenOfGriefDoor; - } - - return 0; - } - - std::string GetSaveData() - { - OUT_SAVE_INST_DATA; - - std::ostringstream saveStream; - saveStream << "H S " << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " " << m_auiEncounter[3]; - - str_data = saveStream.str(); - - OUT_SAVE_INST_DATA_COMPLETE; - return str_data; - } - - void Load(const char* in) - { - if (!in) - { - OUT_LOAD_INST_DATA_FAIL; - return; - } - - OUT_LOAD_INST_DATA(in); - - char dataHead1, dataHead2; - uint16 data0, data1, data2, data3; - - std::istringstream loadStream(in); - loadStream >> dataHead1 >> dataHead2 >> data0 >> data1 >> data2 >> data3; - - if (dataHead1 == 'H' && dataHead2 == 'S') - { - m_auiEncounter[0] = data0; - m_auiEncounter[1] = data1; - m_auiEncounter[2] = data2; - m_auiEncounter[3] = data3; - - for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) - if (m_auiEncounter[i] == IN_PROGRESS) - m_auiEncounter[i] = NOT_STARTED; - - } else OUT_LOAD_INST_DATA_FAIL; - - OUT_LOAD_INST_DATA_COMPLETE; - } -}; - -InstanceData* GetInstanceData_instance_halls_of_stone(Map* pMap) -{ - return new instance_halls_of_stone(pMap); -} - -void AddSC_instance_halls_of_stone() -{ - Script *newscript; - newscript = new Script; - newscript->Name = "instance_halls_of_stone"; - newscript->GetInstanceData = &GetInstanceData_instance_halls_of_stone; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp new file mode 100644 index 00000000000..77f824c48d5 --- /dev/null +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp @@ -0,0 +1,442 @@ +/* + * Copyright (C) 2009 Trinity + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Boss_Ingvar_The_Plunderer +SD%Complete: 95 +SDComment: Some Problems with Annhylde Movement, Blizzlike Timers +SDCategory: Udgarde Keep +EndScriptData */ + +#include "ScriptedPch.h" +#include "utgarde_keep.h" + +enum Yells +{ + //Yells Ingvar + YELL_AGGRO_1 = -1574005, + YELL_AGGRO_2 = -1574006, + + YELL_DEAD_1 = -1574007, + YELL_DEAD_2 = -1574008, + + YELL_KILL_1 = -1574009, + YELL_KILL_2 = -1574010, +}; + +enum Creatures +{ + MOB_INGVAR_HUMAN = 23954, + MOB_ANNHYLDE_THE_CALLER = 24068, + MOB_INGVAR_UNDEAD = 23980, +}; + +enum Spells +{ + //Ingvar Spells human form + SPELL_CLEAVE = 42724, + SPELL_SMASH = 42669, + H_SPELL_SMASH = 59706, + SPELL_STAGGERING_ROAR = 42708, + H_SPELL_STAGGERING_ROAR = 59708, + SPELL_ENRAGE = 42705, + H_SPELL_ENRAGE = 59707, + + SPELL_INGVAR_FEIGN_DEATH = 42795, + SPELL_SUMMON_BANSHEE = 42912, + SPELL_SCOURG_RESURRECTION = 42863, // Spawn resurrect effect around Ingvar + + //Ingvar Spells undead form + SPELL_DARK_SMASH = 42723, + SPELL_DREADFUL_ROAR = 42729, + H_SPELL_DREADFUL_ROAR = 59734, + SPELL_WOE_STRIKE = 42730, + H_SPELL_WOE_STRIKE = 59735, + + ENTRY_THROW_TARGET = 23996, + SPELL_SHADOW_AXE_SUMMON = 42749 +}; + +struct boss_ingvar_the_plundererAI : public ScriptedAI +{ + boss_ingvar_the_plundererAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + } + + ScriptedInstance* pInstance; + + bool bIsUndead; + bool bEventInProgress; + + uint32 uiCleaveTimer; + uint32 uiSmashTimer; + uint32 uiEnrageTimer; + uint32 uiRoarTimer; + uint32 uiSpawnResTimer; + + void Reset() + { + if (bIsUndead) + me->UpdateEntry(MOB_INGVAR_HUMAN); + + bIsUndead = false; + bEventInProgress = false; + + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); + me->SetStandState(UNIT_STAND_STATE_STAND); + + uiCleaveTimer = 2000; + uiSmashTimer = 5000; + uiEnrageTimer = 10000; + uiRoarTimer = 15000; + + uiSpawnResTimer = 3000; + + if (pInstance) + pInstance->SetData(DATA_INGVAR_EVENT, NOT_STARTED); + } + + void DamageTaken(Unit * /*done_by*/, uint32 &damage) + { + if (damage >= me->GetHealth() && !bIsUndead) + { + //DoCast(me, SPELL_INGVAR_FEIGN_DEATH, true); // Dont work ??? + // visuel hack + me->SetHealth(0); + me->InterruptNonMeleeSpells(true); + me->RemoveAllAuras(); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); + me->GetMotionMaster()->MovementExpired(false); + me->GetMotionMaster()->MoveIdle(); + me->SetStandState(UNIT_STAND_STATE_DEAD); + // visuel hack end + + bEventInProgress = true; + bIsUndead = true; + + DoScriptText(YELL_DEAD_1,me); + } + + if (bEventInProgress) + { + damage = 0; + } + } + + void StartZombiePhase() + { + bIsUndead = true; + bEventInProgress = false; + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); + me->UpdateEntry(MOB_INGVAR_UNDEAD); + me->SetInCombatWith(me->getVictim()); + me->GetMotionMaster()->MoveChase(me->getVictim()); + + DoScriptText(YELL_AGGRO_2,me); + } + + void EnterCombat(Unit * /*who*/) + { + DoScriptText(YELL_AGGRO_1,me); + + if (pInstance) + pInstance->SetData(DATA_INGVAR_EVENT, IN_PROGRESS); + } + + void JustDied(Unit* /*killer*/) + { + DoScriptText(YELL_DEAD_2,me); + + if (pInstance) + pInstance->SetData(DATA_INGVAR_EVENT, DONE); + } + + void KilledUnit(Unit * /*victim*/) + { + if (bIsUndead) + DoScriptText(YELL_KILL_1,me); + else + DoScriptText(YELL_KILL_2,me); + } + + void UpdateAI(const uint32 diff) + { + if (!UpdateVictim()) + return; + + if (bEventInProgress) + { + if (uiSpawnResTimer) + if (uiSpawnResTimer <= diff) + { + DoCast(me, SPELL_SUMMON_BANSHEE); // Summons directly on caster position + // DoCast(me, SPELL_SCOURG_RESURRECTION, true); // Not needed ? + uiSpawnResTimer = 0; + } else uiSpawnResTimer -= diff; + + return; + } + + if (uiCleaveTimer <= diff) + { + if (!me->hasUnitState(UNIT_STAT_CASTING)) + { + if (bIsUndead) + DoCast(me->getVictim(), SPELL_WOE_STRIKE); + else + DoCast(me->getVictim(), SPELL_CLEAVE); + uiCleaveTimer = rand()%5000 + 2000; + } + } else uiCleaveTimer -= diff; + + if (uiSmashTimer <= diff) + { + if (!me->hasUnitState(UNIT_STAT_CASTING)) + { + if (bIsUndead) + DoCast(me->getVictim(), SPELL_DARK_SMASH); + else + DoCast(me->getVictim(), SPELL_SMASH); + uiSmashTimer = 10000; + } + } else uiSmashTimer -= diff; + + if (!bIsUndead) + { + if (uiEnrageTimer <= diff) + { + DoCast(me, SPELL_ENRAGE); + uiEnrageTimer = 10000; + } else uiEnrageTimer -= diff; + } else // In Undead form used to summon weapon + { + if (uiEnrageTimer <= diff) + { + if (!me->hasUnitState(UNIT_STAT_CASTING)) + { + // Spawn target for Axe + Unit *pTarget = SelectUnit(SELECT_TARGET_TOPAGGRO, 1); + if (pTarget) + { + me->SummonCreature(ENTRY_THROW_TARGET,pTarget->GetPositionX(),pTarget->GetPositionY(),pTarget->GetPositionZ(),0,TEMPSUMMON_TIMED_DESPAWN,2000); + + DoCast(me, SPELL_SHADOW_AXE_SUMMON); + } + uiEnrageTimer = 30000; + } + } else uiEnrageTimer -= diff; + } + + if (uiRoarTimer <= diff) + { + if (!me->hasUnitState(UNIT_STAT_CASTING)) + { + if (bIsUndead) + DoCast(me, SPELL_DREADFUL_ROAR); + else + DoCast(me, SPELL_STAGGERING_ROAR); + uiRoarTimer = 10000; + } + } else uiRoarTimer -= diff; + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_boss_ingvar_the_plunderer(Creature* pCreature) +{ + return new boss_ingvar_the_plundererAI(pCreature); +} + +enum eSpells +{ +//we don't have that text in db so comment it until we get this text +// YELL_RESSURECT = -1574025, + +//Spells for Annhylde + SPELL_SCOURG_RESURRECTION_HEAL = 42704, //Heal Max + DummyAura + SPELL_SCOURG_RESURRECTION_BEAM = 42857, //Channeling Beam of Annhylde + SPELL_SCOURG_RESURRECTION_DUMMY = 42862, //Some Emote Dummy? + SPELL_INGVAR_TRANSFORM = 42796 +}; + +struct mob_annhylde_the_callerAI : public ScriptedAI +{ + mob_annhylde_the_callerAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + } + + float x,y,z; + ScriptedInstance* pInstance; + uint32 uiResurectTimer; + uint32 uiResurectPhase; + + void Reset() + { + me->AddUnitMovementFlag(MOVEMENTFLAG_FLYING | MOVEMENTFLAG_HOVER); + me->SetSpeed(MOVE_SWIM , 1.0f); + me->SetSpeed(MOVE_RUN , 1.0f); + me->SetSpeed(MOVE_WALK , 1.0f); + //me->SetSpeed(MOVE_FLIGHT , 1.0f); + + me->GetPosition(x,y,z); + DoTeleportTo(x+1,y,z+30); + + Unit* ingvar = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_INGVAR) : 0); + if (ingvar) + { + me->GetMotionMaster()->MovePoint(1,x,y,z+15); + +// DoScriptText(YELL_RESSURECT,me); + } + } + + void MovementInform(uint32 type, uint32 id) + { + if (type != POINT_MOTION_TYPE) + return; + Unit* ingvar = Unit::GetUnit((*me), pInstance ? pInstance->GetData64(DATA_INGVAR) : 0); + if (ingvar) + { + switch (id) + { + case 1: + ingvar->RemoveAura(SPELL_SUMMON_BANSHEE); + ingvar->CastSpell(ingvar,SPELL_SCOURG_RESURRECTION_DUMMY,true); + DoCast(ingvar, SPELL_SCOURG_RESURRECTION_BEAM); + uiResurectTimer = 8000; + uiResurectPhase = 1; + break; + case 2: + me->SetVisibility(VISIBILITY_OFF); + me->DealDamage(me,me->GetHealth()); + me->RemoveCorpse(); + break; + } + } + } + + void AttackStart(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} + void EnterCombat(Unit * /*who*/) {} + void UpdateAI(const uint32 diff) + { + if (uiResurectTimer) + if (uiResurectTimer <= diff) + { + if (uiResurectPhase == 1) + { + Unit* ingvar = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_INGVAR) : 0); + if (ingvar) + { + ingvar->SetStandState(UNIT_STAND_STATE_STAND); + ingvar->CastSpell(ingvar,SPELL_SCOURG_RESURRECTION_HEAL,false); + } + uiResurectTimer = 3000; + uiResurectPhase = 2; + } + else if (uiResurectPhase == 2) + { + if (Creature* ingvar = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_INGVAR) : 0)) + { + ingvar->RemoveAurasDueToSpell(SPELL_SCOURG_RESURRECTION_DUMMY); + + if (boss_ingvar_the_plundererAI* pAI = CAST_AI(boss_ingvar_the_plundererAI, ingvar->AI())) + pAI->StartZombiePhase(); + + me->GetMotionMaster()->MovePoint(2,x+1,y,z+30); + ++uiResurectPhase; + uiResurectTimer = 0; + } + } + + } else uiResurectTimer -= diff; + } +}; + +CreatureAI* GetAI_mob_annhylde_the_caller(Creature* pCreature) +{ + return new mob_annhylde_the_callerAI (pCreature); +} + +enum eShadowAxe +{ + SPELL_SHADOW_AXE_DAMAGE = 42750, + H_SPELL_SHADOW_AXE_DAMAGE = 59719 +}; + +struct mob_ingvar_throw_dummyAI : public ScriptedAI +{ + mob_ingvar_throw_dummyAI(Creature *c) : ScriptedAI(c) + { + } + + uint32 uiDespawnTimer; + + void Reset() + { + Unit *pTarget = me->FindNearestCreature(ENTRY_THROW_TARGET,50); + if (pTarget) + { + DoCast(me, SPELL_SHADOW_AXE_DAMAGE); + float x,y,z; + pTarget->GetPosition(x,y,z); + me->GetMotionMaster()->MovePoint(0,x,y,z); + } + uiDespawnTimer = 7000; + } + void AttackStart(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} + void EnterCombat(Unit * /*who*/) {} + void UpdateAI(const uint32 diff) + { + if (uiDespawnTimer <= diff) + { + me->DealDamage(me,me->GetHealth()); + me->RemoveCorpse(); + uiDespawnTimer = 0; + } else uiDespawnTimer -= diff; + } +}; + +CreatureAI* GetAI_mob_ingvar_throw_dummy(Creature* pCreature) +{ + return new mob_ingvar_throw_dummyAI (pCreature); +} + +void AddSC_boss_ingvar_the_plunderer() +{ + Script *newscript; + + newscript = new Script; + newscript->Name = "boss_ingvar_the_plunderer"; + newscript->GetAI = &GetAI_boss_ingvar_the_plunderer; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_annhylde_the_caller"; + newscript->GetAI = &GetAI_mob_annhylde_the_caller; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_ingvar_throw_dummy"; + newscript->GetAI = &GetAI_mob_ingvar_throw_dummy; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp new file mode 100644 index 00000000000..d69f0eee846 --- /dev/null +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp @@ -0,0 +1,361 @@ +/* + * Copyright (C) 2009 Trinity + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Boss_Prince_Keleseth +SD%Complete: 90 +SDComment: Needs Prince Movements, Needs adjustments to blizzlike timers, Needs Shadowbolt castbar, Needs right Ressurect Visual, Needs Some Heroic Spells +SDCategory: Utgarde Keep +EndScriptData */ + +#include "ScriptedPch.h" +#include "utgarde_keep.h" + +enum eEnums +{ + ACHIEVEMENT_ON_THE_ROCKS = 1919, + + SPELL_SHADOWBOLT = 43667, + SPELL_SHADOWBOLT_HEROIC = 59389, + SPELL_FROST_TOMB = 48400, + SPELL_FROST_TOMB_SUMMON = 42714, + SPELL_DECREPIFY = 42702, + SPELL_SCOURGE_RESSURRECTION = 42704, + CREATURE_FROSTTOMB = 23965, + CREATURE_SKELETON = 23970, + + SAY_AGGRO = -1574000, + SAY_FROST_TOMB = -1574001, + SAY_SKELETONS = -1574002, + SAY_KILL = -1574003, + SAY_DEATH = -1574004 +}; + +#define SKELETONSPAWN_Z 42.8668 + +float SkeletonSpawnPoint[5][5]= +{ + {156.2559, 259.2093}, + {156.2559, 259.2093}, + {156.2559, 259.2093}, + {156.2559, 259.2093}, + {156.2559, 259.2093}, +}; + +float AttackLoc[3]={197.636, 194.046, 40.8164}; + +bool ShatterFrostTomb; // needed for achievement: On The Rocks(1919) + +struct mob_frost_tombAI : public ScriptedAI +{ + mob_frost_tombAI(Creature *c) : ScriptedAI(c) + { + FrostTombGUID = 0; + } + + uint64 FrostTombGUID; + + void SetPrisoner(Unit* uPrisoner) + { + FrostTombGUID = uPrisoner->GetGUID(); + } + + void Reset(){ FrostTombGUID = 0; } + void EnterCombat(Unit* /*who*/) {} + void AttackStart(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} + + void JustDied(Unit *killer) + { + if (killer->GetGUID() != me->GetGUID()) + ShatterFrostTomb = true; + + if (FrostTombGUID) + { + Unit* FrostTomb = Unit::GetUnit((*me),FrostTombGUID); + if (FrostTomb) + FrostTomb->RemoveAurasDueToSpell(SPELL_FROST_TOMB); + } + } + + void UpdateAI(const uint32 /*diff*/) + { + Unit* temp = Unit::GetUnit((*me),FrostTombGUID); + if ((temp && temp->isAlive() && !temp->HasAura(SPELL_FROST_TOMB)) || !temp) + me->DealDamage(me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); + } +}; + +struct boss_kelesethAI : public ScriptedAI +{ + boss_kelesethAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + } + + ScriptedInstance* pInstance; + + uint32 FrostTombTimer; + uint32 SummonSkeletonsTimer; + uint32 RespawnSkeletonsTimer; + uint32 ShadowboltTimer; + uint64 SkeletonGUID[5]; + bool Skeletons; + bool RespawnSkeletons; + + void Reset() + { + ShadowboltTimer = 0; + Skeletons = false; + + ShatterFrostTomb = false; + + ResetTimer(); + + if (pInstance) + pInstance->SetData(DATA_PRINCEKELESETH_EVENT, NOT_STARTED); + } + + void KilledUnit(Unit * victim) + { + if (victim == me) + return; + + DoScriptText(SAY_KILL, me); + } + + void JustDied(Unit* /*killer*/) + { + DoScriptText(SAY_DEATH, me); + + if (IsHeroic() && !ShatterFrostTomb) + { + AchievementEntry const *AchievOnTheRocks = GetAchievementStore()->LookupEntry(ACHIEVEMENT_ON_THE_ROCKS); + if (AchievOnTheRocks) + { + Map* pMap = me->GetMap(); + if (pMap && pMap->IsDungeon()) + { + Map::PlayerList const &players = pMap->GetPlayers(); + for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) + itr->getSource()->CompletedAchievement(AchievOnTheRocks); + } + } + } + + if (pInstance) + pInstance->SetData(DATA_PRINCEKELESETH_EVENT, DONE); + } + + void EnterCombat(Unit* /*who*/) + { + DoScriptText(SAY_AGGRO, me); + DoZoneInCombat(); + + if (pInstance) + pInstance->SetData(DATA_PRINCEKELESETH_EVENT, IN_PROGRESS); + } + + void ResetTimer(uint32 inc = 0) + { + SummonSkeletonsTimer = 5000 + inc; + FrostTombTimer = 28000 + inc; + } + + void UpdateAI(const uint32 diff) + { + if (!UpdateVictim()) + return; + + if (ShadowboltTimer <= diff) + { + Unit *pTarget = SelectUnit(SELECT_TARGET_TOPAGGRO, 0); + if (pTarget && pTarget->isAlive() && pTarget->GetTypeId() == TYPEID_PLAYER) + me->CastSpell(pTarget, DUNGEON_MODE(SPELL_SHADOWBOLT, SPELL_SHADOWBOLT_HEROIC), true); + ShadowboltTimer = 10000; + } else ShadowboltTimer -= diff; + + if (!Skeletons) + if ((SummonSkeletonsTimer <= diff)) + { + Creature* Skeleton; + DoScriptText(SAY_SKELETONS, me); + for (uint8 i = 0; i < 5; ++i) + { + Skeleton = me->SummonCreature(CREATURE_SKELETON, SkeletonSpawnPoint[i][0], SkeletonSpawnPoint[i][1] , SKELETONSPAWN_Z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000); + if (Skeleton) + { + Skeleton->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE); + Skeleton->GetMotionMaster()->MovePoint(0, me->GetPositionX(), me->GetPositionY() , me->GetPositionZ()); + Skeleton->AddThreat(me->getVictim(), 0.0f); + DoZoneInCombat(Skeleton); + } + } + Skeletons = true; + } else SummonSkeletonsTimer -= diff; + + if (FrostTombTimer <= diff) + { + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (pTarget->isAlive()) + { + //DoCast(pTarget, SPELL_FROST_TOMB_SUMMON, true); + if (Creature *pChains = me->SummonCreature(CREATURE_FROSTTOMB, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 20000)) + { + CAST_AI(mob_frost_tombAI, pChains->AI())->SetPrisoner(pTarget); + pChains->CastSpell(pTarget, SPELL_FROST_TOMB, true); + + DoScriptText(SAY_FROST_TOMB, me); + } + } + FrostTombTimer = 15000; + } else FrostTombTimer -= diff; + + DoMeleeAttackIfReady(); + } +}; + +struct mob_vrykul_skeletonAI : public ScriptedAI +{ + mob_vrykul_skeletonAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + } + + ScriptedInstance *pInstance; + uint32 Respawn_Time; + uint64 Target_Guid; + uint32 Decrepify_Timer; + + bool isDead; + + void Reset() + { + Respawn_Time = 12000; + Decrepify_Timer = urand(10000,20000); + isDead = false; + } + + void EnterCombat(Unit * /*who*/){} + void DamageTaken(Unit *done_by, uint32 &damage) + { + if (done_by->GetGUID() == me->GetGUID()) + return; + + if (damage >= me->GetHealth()) + { + PretendToDie(); + damage = 0; + } + } + + void PretendToDie() + { + isDead = true; + me->InterruptNonMeleeSpells(true); + me->RemoveAllAuras(); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + me->GetMotionMaster()->MovementExpired(false); + me->GetMotionMaster()->MoveIdle(); + me->SetStandState(UNIT_STAND_STATE_DEAD); + }; + + void Resurrect() + { + isDead = false; + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + me->SetStandState(UNIT_STAND_STATE_STAND); + DoCast(me, SPELL_SCOURGE_RESSURRECTION, true); + + if (me->getVictim()) + { + me->GetMotionMaster()->MoveChase(me->getVictim()); + me->AI()->AttackStart(me->getVictim()); + } + else + me->GetMotionMaster()->Initialize(); + }; + + void UpdateAI(const uint32 diff) + { + if (pInstance && pInstance->GetData(DATA_PRINCEKELESETH_EVENT) == IN_PROGRESS) + { + if (isDead) + { + if (Respawn_Time <= diff) + { + Resurrect(); + Respawn_Time = 12000; + } else Respawn_Time -= diff; + } + else + { + if (!UpdateVictim()) + return; + + if (Decrepify_Timer <= diff) + { + DoCast(me->getVictim(), SPELL_DECREPIFY); + Decrepify_Timer = 30000; + } else Decrepify_Timer -= diff; + + DoMeleeAttackIfReady(); + } + }else + { + if (me->isAlive()) + me->DealDamage(me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); + } + + } +}; + +CreatureAI* GetAI_mob_frost_tomb(Creature* pCreature) +{ + return new mob_frost_tombAI(pCreature); +} + +CreatureAI* GetAI_boss_keleseth(Creature* pCreature) +{ + return new boss_kelesethAI (pCreature); +} + +CreatureAI* GetAI_mob_vrykul_skeleton(Creature* pCreature) +{ + return new mob_vrykul_skeletonAI (pCreature); +} + +void AddSC_boss_keleseth() +{ + Script *newscript; + + newscript = new Script; + newscript->Name = "boss_keleseth"; + newscript->GetAI = &GetAI_boss_keleseth; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_frost_tomb"; + newscript->GetAI = &GetAI_mob_frost_tomb; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_vrykul_skeleton"; + newscript->GetAI = &GetAI_mob_vrykul_skeleton; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp new file mode 100644 index 00000000000..2146d37635b --- /dev/null +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp @@ -0,0 +1,389 @@ +/* + * Copyright (C) 2009 Trinity + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Boss_Skarvald_Dalronn +SD%Complete: 95 +SDComment: Needs adjustments to blizzlike timers, Yell Text + Sound to DB +SDCategory: Utgarde Keep +EndScriptData */ + +#include "ScriptedPch.h" +#include "utgarde_keep.h" + +enum eEnums +{ + //signed for 24200, but used by 24200,27390 + YELL_SKARVALD_AGGRO = -1574011, + YELL_SKARVALD_DAL_DIED = -1574012, + YELL_SKARVALD_SKA_DIEDFIRST = -1574013, + YELL_SKARVALD_KILL = -1574014, + YELL_SKARVALD_DAL_DIEDFIRST = -1574015, + + //signed for 24201, but used by 24201,27389 + YELL_DALRONN_AGGRO = -1574016, + YELL_DALRONN_SKA_DIED = -1574017, + YELL_DALRONN_DAL_DIEDFIRST = -1574018, + YELL_DALRONN_KILL = -1574019, + YELL_DALRONN_SKA_DIEDFIRST = -1574020, + +//Spells of Skarvald and his Ghost + MOB_SKARVALD_THE_CONSTRUCTOR = 24200, + SPELL_CHARGE = 43651, + SPELL_STONE_STRIKE = 48583, + SPELL_SUMMON_SKARVALD_GHOST = 48613, + MOB_SKARVALD_GHOST = 27390, +//Spells of Dalronn and his Ghost + MOB_DALRONN_THE_CONTROLLER = 24201, + SPELL_SHADOW_BOLT = 43649, + H_SPELL_SHADOW_BOLT = 59575, + H_SPELL_SUMMON_SKELETONS = 52611, + SPELL_DEBILITATE = 43650, + SPELL_SUMMON_DALRONN_GHOST = 48612, + MOB_DALRONN_GHOST = 27389 +}; + +struct boss_skarvald_the_constructorAI : public ScriptedAI +{ + boss_skarvald_the_constructorAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + } + + ScriptedInstance* pInstance; + + bool ghost; + uint32 Charge_Timer; + uint32 StoneStrike_Timer; + uint32 Response_Timer; + uint32 Check_Timer; + bool Dalronn_isDead; + + void Reset() + { + Charge_Timer = 5000; + StoneStrike_Timer = 10000; + Dalronn_isDead = false; + Check_Timer = 5000; + + ghost = (me->GetEntry() == MOB_SKARVALD_GHOST); + if (!ghost && pInstance) + { + Unit* dalronn = Unit::GetUnit((*me),pInstance->GetData64(DATA_DALRONN)); + if (dalronn && dalronn->isDead()) + CAST_CRE(dalronn)->Respawn(); + + pInstance->SetData(DATA_SKARVALD_DALRONN_EVENT, NOT_STARTED); + } + } + + void EnterCombat(Unit * who) + { + if (!ghost && pInstance) + { + DoScriptText(YELL_SKARVALD_AGGRO,me); + + Unit* dalronn = Unit::GetUnit((*me),pInstance->GetData64(DATA_DALRONN)); + if (dalronn && dalronn->isAlive() && !dalronn->getVictim()) + dalronn->getThreatManager().addThreat(who,0.0f); + + pInstance->SetData(DATA_SKARVALD_DALRONN_EVENT, IN_PROGRESS); + } + } + + void JustDied(Unit* Killer) + { + if (!ghost && pInstance) + { + Unit* dalronn = Unit::GetUnit((*me),pInstance->GetData64(DATA_DALRONN)); + if (dalronn) + { + if (dalronn->isDead()) + { + DoScriptText(YELL_SKARVALD_DAL_DIED,me); + + pInstance->SetData(DATA_SKARVALD_DALRONN_EVENT, DONE); + } + else + { + DoScriptText(YELL_SKARVALD_SKA_DIEDFIRST,me); + + me->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); + //DoCast(me, SPELL_SUMMON_SKARVALD_GHOST, true); + Creature* temp = me->SummonCreature(MOB_SKARVALD_GHOST,me->GetPositionX(),me->GetPositionY(),me->GetPositionZ(),0,TEMPSUMMON_CORPSE_DESPAWN,5000); + if (temp) + { + temp->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE); + temp->AI()->AttackStart(Killer); + } + } + } + } + } + + void KilledUnit(Unit * /*victim*/) + { + if (!ghost) + { + DoScriptText(YELL_SKARVALD_KILL,me); + } + } + + void UpdateAI(const uint32 diff) + { + if (ghost) + { + if (pInstance && pInstance->GetData(DATA_SKARVALD_DALRONN_EVENT) != IN_PROGRESS) + me->DealDamage(me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); + } + + if (!UpdateVictim()) + return; + + if (!ghost) + { + if (Check_Timer) + if (Check_Timer <= diff) + { + Check_Timer = 5000; + Unit* dalronn = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_DALRONN) : 0); + if (dalronn && dalronn->isDead()) + { + Dalronn_isDead = true; + Response_Timer = 2000; + Check_Timer = 0; + } + } else Check_Timer -= diff; + + if (Response_Timer) + if (Dalronn_isDead) + if (Response_Timer <= diff) + { + DoScriptText(YELL_SKARVALD_DAL_DIEDFIRST,me); + + Response_Timer = 0; + } else Response_Timer -= diff; + } + + if (Charge_Timer <= diff) + { + DoCast(SelectUnit(SELECT_TARGET_RANDOM, 1), SPELL_CHARGE); + Charge_Timer = 5000+rand()%5000; + } else Charge_Timer -= diff; + + if (StoneStrike_Timer <= diff) + { + DoCast(me->getVictim(), SPELL_STONE_STRIKE); + StoneStrike_Timer = 5000+rand()%5000; + } else StoneStrike_Timer -= diff; + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_boss_skarvald_the_constructor(Creature* pCreature) +{ + return new boss_skarvald_the_constructorAI (pCreature); +} + +struct boss_dalronn_the_controllerAI : public ScriptedAI +{ + boss_dalronn_the_controllerAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + } + + ScriptedInstance* pInstance; + + bool ghost; + uint32 ShadowBolt_Timer; + uint32 Debilitate_Timer; + uint32 Summon_Timer; + + uint32 Response_Timer; + uint32 Check_Timer; + uint32 AggroYell_Timer; + bool Skarvald_isDead; + + void Reset() + { + ShadowBolt_Timer = 1000; + Debilitate_Timer = 5000; + Summon_Timer = 10000; + Check_Timer = 5000; + Skarvald_isDead = false; + AggroYell_Timer = 0; + + ghost = me->GetEntry() == MOB_DALRONN_GHOST; + if (!ghost && pInstance) + { + Unit* skarvald = Unit::GetUnit((*me),pInstance->GetData64(DATA_SKARVALD)); + if (skarvald && skarvald->isDead()) + CAST_CRE(skarvald)->Respawn(); + + pInstance->SetData(DATA_SKARVALD_DALRONN_EVENT, NOT_STARTED); + } + } + + void EnterCombat(Unit * who) + { + if (!ghost && pInstance) + { + Unit* skarvald = Unit::GetUnit((*me),pInstance->GetData64(DATA_SKARVALD)); + if (skarvald && skarvald->isAlive() && !skarvald->getVictim()) + skarvald->getThreatManager().addThreat(who,0.0f); + + AggroYell_Timer = 5000; + + if (pInstance) + pInstance->SetData(DATA_SKARVALD_DALRONN_EVENT, IN_PROGRESS); + } + } + + void JustDied(Unit* Killer) + { + if (!ghost && pInstance) + { + Unit* skarvald = Unit::GetUnit((*me),pInstance->GetData64(DATA_SKARVALD)); + if (skarvald) + if (skarvald->isDead()) + { + DoScriptText(YELL_DALRONN_SKA_DIED,me); + + if (pInstance) + pInstance->SetData(DATA_SKARVALD_DALRONN_EVENT, DONE); + } + else + { + DoScriptText(YELL_DALRONN_DAL_DIEDFIRST,me); + + me->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); + //DoCast(me, SPELL_SUMMON_DALRONN_GHOST, true); + Creature* temp = me->SummonCreature(MOB_DALRONN_GHOST,me->GetPositionX(),me->GetPositionY(),me->GetPositionZ(),0,TEMPSUMMON_CORPSE_DESPAWN,5000); + if (temp) + { + temp->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE); + temp->AI()->AttackStart(Killer); + } + } + } + } + + void KilledUnit(Unit * /*victim*/) + { + if (!ghost) + { + DoScriptText(YELL_DALRONN_KILL,me); + } + } + + void UpdateAI(const uint32 diff) + { + if (ghost) + { + if (pInstance && pInstance->GetData(DATA_SKARVALD_DALRONN_EVENT) != IN_PROGRESS) + me->DealDamage(me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); + } + + if (!UpdateVictim()) + return; + + if (AggroYell_Timer) + if (AggroYell_Timer <= diff) + { + DoScriptText(YELL_DALRONN_AGGRO,me); + + AggroYell_Timer = 0; + } else AggroYell_Timer -= diff; + + if (!ghost) + { + if (Check_Timer) + if (Check_Timer <= diff) + { + Check_Timer = 5000; + Unit* skarvald = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_SKARVALD) : 0); + if (skarvald && skarvald->isDead()) + { + Skarvald_isDead = true; + Response_Timer = 2000; + Check_Timer = 0; + } + } else Check_Timer -= diff; + + if (Response_Timer) + if (Skarvald_isDead) + if (Response_Timer <= diff) + { + DoScriptText(YELL_DALRONN_SKA_DIEDFIRST,me); + + Response_Timer = 0; + } else Response_Timer -= diff; + } + + if (ShadowBolt_Timer <= diff) + { + if (!me->IsNonMeleeSpellCasted(false)) + { + DoCast(SelectUnit(SELECT_TARGET_RANDOM, 0), SPELL_SHADOW_BOLT); + ShadowBolt_Timer = 2100;//give a 100ms pause to try cast other spells + } + } else ShadowBolt_Timer -= diff; + + if (Debilitate_Timer <= diff) + { + if (!me->IsNonMeleeSpellCasted(false)) + { + DoCast(SelectUnit(SELECT_TARGET_RANDOM, 0), SPELL_DEBILITATE); + Debilitate_Timer = 5000+rand()%5000; + } + } else Debilitate_Timer -= diff; + + if (IsHeroic()) + if (Summon_Timer <= diff) + { + if (!me->IsNonMeleeSpellCasted(false)) + { + DoCast(me, H_SPELL_SUMMON_SKELETONS); + Summon_Timer = (rand()%10000) + 20000; + } + } else Summon_Timer -= diff; + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_boss_dalronn_the_controller(Creature* pCreature) +{ + return new boss_dalronn_the_controllerAI (pCreature); +} + +void AddSC_boss_skarvald_dalronn() +{ + Script *newscript; + + newscript = new Script; + newscript->Name = "boss_skarvald_the_constructor"; + newscript->GetAI = &GetAI_boss_skarvald_the_constructor; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "boss_dalronn_the_controller"; + newscript->GetAI = &GetAI_boss_dalronn_the_controller; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp new file mode 100644 index 00000000000..03f97b1d27e --- /dev/null +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp @@ -0,0 +1,312 @@ +/* + * Copyright (C) 2009 Trinity + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Instance_Utgarde_Keep +SD%Complete: 90 +SDComment: Instance Data Scripts and functions to acquire mobs and set encounter status for use in various Utgarde Keep Scripts +SDCategory: Utgarde Keep +EndScriptData */ + +#include "ScriptedPch.h" +#include "utgarde_keep.h" + +#define MAX_ENCOUNTER 3 + +#define ENTRY_BELLOW_1 186688 +#define ENTRY_BELLOW_2 186689 +#define ENTRY_BELLOW_3 186690 + +#define ENTRY_FORGEFIRE_1 186692 +#define ENTRY_FORGEFIRE_2 186693 +#define ENTRY_FORGEFIRE_3 186691 + +#define ENTRY_GLOWING_ANVIL_1 186609 +#define ENTRY_GLOWING_ANVIL_2 186610 +#define ENTRY_GLOWING_ANVIL_3 186611 + +#define ENTRY_GIANT_PORTCULLIS_1 186756 +#define ENTRY_GIANT_PORTCULLIS_2 186694 + +/* Utgarde Keep encounters: +0 - Prince Keleseth +1 - Skarvald Dalronn +2 - Ingvar the Plunderer +*/ + +struct instance_utgarde_keep : public ScriptedInstance +{ + instance_utgarde_keep(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; + + uint64 Keleseth; + uint64 Skarvald; + uint64 Dalronn; + uint64 Ingvar; + + uint64 forge_bellow[3]; + uint64 forge_fire[3]; + uint64 forge_anvil[3]; + uint64 portcullis[2]; + + uint32 m_auiEncounter[MAX_ENCOUNTER]; + uint32 forge_event[3]; + std::string str_data; + + void Initialize() + { + memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); + + Keleseth = 0; + Skarvald = 0; + Dalronn = 0; + Ingvar = 0; + + for (uint8 i = 0; i < 3; ++i) + { + forge_bellow[i] = 0; + forge_fire[i] = 0; + forge_anvil[i] = 0; + forge_event[i] = NOT_STARTED; + } + + portcullis[0] = 0; + portcullis[1] = 0; + } + + bool IsEncounterInProgress() const + { + for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) + if (m_auiEncounter[i] == IN_PROGRESS) return true; + + return false; + } + + Player* GetPlayerInMap() + { + Map::PlayerList const& players = instance->GetPlayers(); + + if (!players.isEmpty()) + { + for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) + { + if (Player* plr = itr->getSource()) + return plr; + } + } + + debug_log("TSCR: Instance Utgarde Keep: GetPlayerInMap, but PlayerList is empty!"); + return NULL; + } + + void OnCreatureCreate(Creature* pCreature, bool /*add*/) + { + switch(pCreature->GetEntry()) + { + case 23953: Keleseth = pCreature->GetGUID(); break; + case 24201: Dalronn = pCreature->GetGUID(); break; + case 24200: Skarvald = pCreature->GetGUID(); break; + case 23954: Ingvar = pCreature->GetGUID(); break; + } + } + + void OnGameObjectCreate(GameObject* pGo, bool /*add*/) + { + switch(pGo->GetEntry()) + { + //door and object id + case ENTRY_BELLOW_1: forge_bellow[0] = pGo->GetGUID(); + if (forge_event[0] != NOT_STARTED)HandleGameObject(NULL,true,pGo);break; + case ENTRY_BELLOW_2: forge_bellow[1] = pGo->GetGUID(); + if (forge_event[1] != NOT_STARTED)HandleGameObject(NULL,true,pGo);break; + case ENTRY_BELLOW_3: forge_bellow[2] = pGo->GetGUID(); + if (forge_event[2] != NOT_STARTED)HandleGameObject(NULL,true,pGo);break; + case ENTRY_FORGEFIRE_1: forge_fire[0] = pGo->GetGUID(); + if (forge_event[0] != NOT_STARTED)HandleGameObject(NULL,true,pGo);break; + case ENTRY_FORGEFIRE_2: forge_fire[1] = pGo->GetGUID(); + if (forge_event[1] != NOT_STARTED)HandleGameObject(NULL,true,pGo);break; + case ENTRY_FORGEFIRE_3: forge_fire[2] = pGo->GetGUID(); + if (forge_event[2] != NOT_STARTED)HandleGameObject(NULL,true,pGo);break; + case ENTRY_GLOWING_ANVIL_1: forge_anvil[0] = pGo->GetGUID(); + if (forge_event[0] != NOT_STARTED)HandleGameObject(NULL,true,pGo);break; + case ENTRY_GLOWING_ANVIL_2: forge_anvil[1] = pGo->GetGUID(); + if (forge_event[1] != NOT_STARTED)HandleGameObject(NULL,true,pGo);break; + case ENTRY_GLOWING_ANVIL_3: forge_anvil[2] = pGo->GetGUID(); + if (forge_event[2] != NOT_STARTED)HandleGameObject(NULL,true,pGo);break; + case ENTRY_GIANT_PORTCULLIS_1: portcullis[0] = pGo->GetGUID(); + if (m_auiEncounter[2] == DONE)HandleGameObject(NULL,true,pGo);break; + case ENTRY_GIANT_PORTCULLIS_2: portcullis[1] = pGo->GetGUID(); + if (m_auiEncounter[2] == DONE)HandleGameObject(NULL,true,pGo);break; + } + } + + uint64 GetData64(uint32 identifier) + { + switch(identifier) + { + case DATA_PRINCEKELESETH: return Keleseth; + case DATA_DALRONN: return Dalronn; + case DATA_SKARVALD: return Skarvald; + case DATA_INGVAR: return Ingvar; + } + + return 0; + } + + void SetData(uint32 type, uint32 data) + { + switch(type) + { + case DATA_PRINCEKELESETH_EVENT: + m_auiEncounter[0] = data; + break; + case DATA_SKARVALD_DALRONN_EVENT: + m_auiEncounter[1] = data; + break; + case DATA_INGVAR_EVENT: + if (data == DONE) + { + HandleGameObject(portcullis[0], true); + HandleGameObject(portcullis[1], true); + } + m_auiEncounter[2] = data; + break; + case EVENT_FORGE_1: + if (data == NOT_STARTED) + { + HandleGameObject(forge_bellow[0],false); + HandleGameObject(forge_fire[0],false); + HandleGameObject(forge_anvil[0],false); + }else + { + HandleGameObject(forge_bellow[0],true); + HandleGameObject(forge_fire[0],true); + HandleGameObject(forge_anvil[0],true); + } + forge_event[0] = data; + break; + case EVENT_FORGE_2: + if (data == NOT_STARTED) + { + HandleGameObject(forge_bellow[1],false); + HandleGameObject(forge_fire[1],false); + HandleGameObject(forge_anvil[1],false); + }else + { + HandleGameObject(forge_bellow[1],true); + HandleGameObject(forge_fire[1],true); + HandleGameObject(forge_anvil[1],true); + } + forge_event[1] = data; + break; + case EVENT_FORGE_3: + if (data == NOT_STARTED) + { + HandleGameObject(forge_bellow[2],false); + HandleGameObject(forge_fire[2],false); + HandleGameObject(forge_anvil[2],false); + }else + { + HandleGameObject(forge_bellow[2],true); + HandleGameObject(forge_fire[2],true); + HandleGameObject(forge_anvil[2],true); + } + forge_event[2] = data; + break; + } + + if (data == DONE) + { + SaveToDB(); + } + } + + uint32 GetData(uint32 type) + { + switch(type) + { + case DATA_PRINCEKELESETH_EVENT: return m_auiEncounter[0]; + case DATA_SKARVALD_DALRONN_EVENT: return m_auiEncounter[1]; + case DATA_INGVAR_EVENT: return m_auiEncounter[2]; + } + + return 0; + } + + std::string GetSaveData() + { + OUT_SAVE_INST_DATA; + + std::ostringstream saveStream; + saveStream << "U K " << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " + << m_auiEncounter[2] << " " << forge_event[0] << " " << forge_event[1] << " " << forge_event[2]; + + str_data = saveStream.str(); + + OUT_SAVE_INST_DATA_COMPLETE; + return str_data; + } + + void Load(const char* in) + { + if (!in) + { + OUT_LOAD_INST_DATA_FAIL; + return; + } + + OUT_LOAD_INST_DATA(in); + + char dataHead1, dataHead2; + uint16 data0, data1, data2, data3, data4, data5; + + std::istringstream loadStream(in); + loadStream >> dataHead1 >> dataHead2 >> data0 >> data1 >> data2 >> data3 >> data4 >> data5; + + if (dataHead1 == 'U' && dataHead2 == 'K') + { + m_auiEncounter[0] = data0; + m_auiEncounter[1] = data1; + m_auiEncounter[2] = data2; + + for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) + if (m_auiEncounter[i] == IN_PROGRESS) + m_auiEncounter[i] = NOT_STARTED; + + forge_event[0] = data3; + forge_event[1] = data4; + forge_event[2] = data5; + + } else OUT_LOAD_INST_DATA_FAIL; + + OUT_LOAD_INST_DATA_COMPLETE; + } +}; + +InstanceData* GetInstanceData_instance_utgarde_keep(Map* pMap) +{ + return new instance_utgarde_keep(pMap); +} + +void AddSC_instance_utgarde_keep() +{ + Script *newscript; + newscript = new Script; + newscript->Name = "instance_utgarde_keep"; + newscript->GetInstanceData = &GetInstanceData_instance_utgarde_keep; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp new file mode 100644 index 00000000000..95825aa49b6 --- /dev/null +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp @@ -0,0 +1,160 @@ +/* + * Copyright (C) 2009 Trinity + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "ScriptedPch.h" +#include "utgarde_keep.h" + +uint32 entry_search[3] = +{ + 186609, + 186610, + 186611 +}; + +struct npc_dragonflayer_forge_masterAI : public ScriptedAI +{ + npc_dragonflayer_forge_masterAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + fm_Type = 0; + } + + ScriptedInstance* pInstance; + uint8 fm_Type; + + void Reset() + { + if (fm_Type == 0) fm_Type = GetForgeMasterType(); + CheckForge(); + } + + void CheckForge() + { + if (pInstance) + { + switch(fm_Type) + { + case 1: + pInstance->SetData(EVENT_FORGE_1,me->isAlive() ? NOT_STARTED : DONE); + break; + case 2: + pInstance->SetData(EVENT_FORGE_2,me->isAlive() ? NOT_STARTED : DONE); + break; + case 3: + pInstance->SetData(EVENT_FORGE_3,me->isAlive() ? NOT_STARTED : DONE); + break; + } + } + } + + void JustDied(Unit * /*killer*/) + { + if (fm_Type == 0) fm_Type = GetForgeMasterType(); + if (pInstance) + { + switch(fm_Type) + { + case 1: + pInstance->SetData(EVENT_FORGE_1,DONE); + break; + case 2: + pInstance->SetData(EVENT_FORGE_2,DONE); + break; + case 3: + pInstance->SetData(EVENT_FORGE_3,DONE); + break; + } + } + } + + void EnterCombat(Unit * /*who*/) + { + if (fm_Type == 0) fm_Type = GetForgeMasterType(); + if (pInstance) + { + switch(fm_Type) + { + case 1: + pInstance->SetData(EVENT_FORGE_1,IN_PROGRESS); + break; + case 2: + pInstance->SetData(EVENT_FORGE_2,IN_PROGRESS); + break; + case 3: + pInstance->SetData(EVENT_FORGE_3,IN_PROGRESS); + break; + } + } + me->SetUInt32Value(UNIT_NPC_EMOTESTATE ,EMOTE_ONESHOT_NONE); + } + + uint8 GetForgeMasterType() + { + float diff = 30.0f; + int near_f = 0; + + for (uint8 i = 0; i < 3 ; ++i) + { + GameObject* temp; + temp = me->FindNearestGameObject(entry_search[i],30); + if (temp) + { + if (me->IsWithinDist(temp,diff,false)) + { + near_f = i + 1; + diff = me->GetDistance2d(temp); + + } + } + } + + switch (near_f) + { + case 1: return 1; + case 2: return 2; + case 3: return 3; + default: return 0; + } + } + + void UpdateAI(const uint32 /*diff*/) + { + if (fm_Type == 0) + fm_Type = GetForgeMasterType(); + + if (!UpdateVictim()) + return; + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_npc_dragonflayer_forge_master(Creature* pCreature) +{ + return new npc_dragonflayer_forge_masterAI(pCreature); +} + +void AddSC_utgarde_keep() +{ + Script *newscript; + + newscript = new Script; + newscript->Name = "npc_dragonflayer_forge_master"; + newscript->GetAI = &GetAI_npc_dragonflayer_forge_master; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h new file mode 100644 index 00000000000..b630e156564 --- /dev/null +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2009 Trinity + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef DEF_UTGARDE_KEEP_H +#define DEF_UTGARDE_KEEP_H + +#define DATA_PRINCEKELESETH 1 +#define DATA_SKARVALD 3 +#define DATA_DALRONN 4 +#define DATA_INGVAR 6 + +#define DATA_PRINCEKELESETH_EVENT 2 +#define DATA_SKARVALD_DALRONN_EVENT 5 +#define DATA_INGVAR_EVENT 7 + +#define EVENT_FORGE_1 8 +#define EVENT_FORGE_2 9 +#define EVENT_FORGE_3 10 + +#endif diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp new file mode 100644 index 00000000000..297fe37b7d8 --- /dev/null +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp @@ -0,0 +1,830 @@ +/* Script Data Start +SDName: Boss palehoof +SDAuthor: LordVanMartin +SD%Complete: +SDComment: +SDCategory: +Script Data End */ + +/*** SQL START *** +update creature_template set scriptname = 'boss_palehoof' where entry = ''; +*** SQL END ***/ +#include "ScriptedPch.h" +#include "utgarde_pinnacle.h" + +enum Spells +{ + SPELL_ARCING_SMASH = 48260, + SPELL_IMPALE = 48261, + H_SPELL_IMPALE = 59268, + SPELL_WITHERING_ROAR = 48256, + H_SPELL_WITHERING_ROAR = 59267, + SPELL_FREEZE = 16245 +}; + +//Orb spells +enum OrbSpells +{ + SPELL_ORB_VISUAL = 48044, + SPELL_ORB_CHANNEL = 48048 +}; + +//not in db +enum Yells +{ + SAY_AGGRO = -1575000, + SAY_SLAY_1 = -1575001, + SAY_SLAY_2 = -1575002, + SAY_DEATH = -1575003 +}; + +enum Creatures +{ + MOB_STASIS_CONTROLLER = 26688 +}; + +struct Locations +{ + float x, y, z; +}; + +struct Locations moveLocs[]= +{ + {261.6,-449.3,109.5}, + {263.3,-454.0,109.5}, + {291.5,-450.4,109.5}, + {291.5,-454.0,109.5}, + {310.0,-453.4,109.5}, + {238.6,-460.7,109.5} +}; + +enum Phase +{ + PHASE_FRENZIED_WORGEN, + PHASE_RAVENOUS_FURLBORG, + PHASE_MASSIVE_JORMUNGAR, + PHASE_FEROCIOUS_RHINO, + PHASE_GORTOK_PALEHOOF, + PHASE_NONE +}; + +struct boss_palehoofAI : public ScriptedAI +{ + boss_palehoofAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + } + + uint32 uiArcingSmashTimer; + uint32 uiImpaleTimer; + uint32 uiWhiteringRoarTimer; + uint32 uiWaitingTimer; + Phase currentPhase; + uint8 AddCount; + bool DoneAdds[4]; + + ScriptedInstance *pInstance; + + void Reset() + { + uiArcingSmashTimer = 15000; + uiImpaleTimer = 12000; + uiWhiteringRoarTimer = 10000; + + me->GetMotionMaster()->MoveTargetedHome(); + + for (uint32 i=0;i<4;i++) + DoneAdds[i]=false; + AddCount=0; + + currentPhase=PHASE_NONE; + + if (pInstance) + { + pInstance->SetData(DATA_GORTOK_PALEHOOF_EVENT, NOT_STARTED); + + Creature* pTemp = Unit::GetCreature((*me), pInstance->GetData64(DATA_MOB_FRENZIED_WORGEN)); + if (pTemp && !pTemp->isAlive()) + pTemp->Respawn(); + + pTemp = Unit::GetCreature((*me), pInstance->GetData64(DATA_MOB_FEROCIOUS_RHINO)); + if (pTemp && !pTemp->isAlive()) + pTemp->Respawn(); + + pTemp = Unit::GetCreature((*me), pInstance->GetData64(DATA_MOB_MASSIVE_JORMUNGAR)); + if (pTemp && !pTemp->isAlive()) + pTemp->Respawn(); + + pTemp = Unit::GetCreature((*me), pInstance->GetData64(DATA_MOB_RAVENOUS_FURBOLG)); + if (pTemp && !pTemp->isAlive()) + pTemp->Respawn(); + + GameObject* pGo = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_GORTOK_PALEHOOF_SPHERE)); + if (pGo) + { + pGo->SetGoState(GO_STATE_READY); + pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); + } + } + } + + void EnterCombat(Unit* /*who*/) + { + DoScriptText(SAY_AGGRO, me); + } + + void AttackStart(Unit* who) + { + if (!who) + return; + + if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) + return; + + if (me->Attack(who, true)) + { + me->AddThreat(who, 0.0f); + me->SetInCombatWith(who); + who->SetInCombatWith(me); + DoStartMovement(who); + } + } + + void UpdateAI(const uint32 diff) + { + if (currentPhase != PHASE_GORTOK_PALEHOOF) + return; + //Return since we have no target + if (!UpdateVictim()) + return; + + Creature* pTemp = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_ORB) : 0); + if (pTemp && pTemp->isAlive()) + pTemp->DisappearAndDie(); + + if (uiArcingSmashTimer <= diff) + { + DoCast(me, SPELL_ARCING_SMASH); + uiArcingSmashTimer = urand(13000,17000); + } else uiArcingSmashTimer -= diff; + + if (uiImpaleTimer <= diff) + { + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(pTarget, SPELL_IMPALE); + uiImpaleTimer = urand(8000,12000); + } else uiImpaleTimer -= diff; + + if (uiWhiteringRoarTimer <= diff) + { + DoCast(me, SPELL_WITHERING_ROAR); + uiWhiteringRoarTimer = urand(8000,12000); + } else uiWhiteringRoarTimer -= diff; + + DoMeleeAttackIfReady(); + } + + void JustDied(Unit* /*killer*/) + { + DoScriptText(SAY_DEATH, me); + if (pInstance) + pInstance->SetData(DATA_GORTOK_PALEHOOF_EVENT, DONE); + Creature* pTemp = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_ORB) : 0); + if (pTemp && pTemp->isAlive()) + pTemp->DisappearAndDie(); + } + + void KilledUnit(Unit * /*victim*/) + { + DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + } + + void NextPhase() + { + if (currentPhase == PHASE_NONE) + { + pInstance->SetData(DATA_GORTOK_PALEHOOF_EVENT, IN_PROGRESS); + me->SummonCreature(MOB_STASIS_CONTROLLER,moveLocs[5].x,moveLocs[5].y,moveLocs[5].z,0,TEMPSUMMON_CORPSE_DESPAWN); + } + Phase move = PHASE_NONE; + if (AddCount >= DUNGEON_MODE(2,4)) + move = PHASE_GORTOK_PALEHOOF; + else + { + //select random not yet defeated add + uint8 next = urand(0,3); + for (uint8 i=0; i < 16; i++) + { + if (!DoneAdds[i%4] && next == 0) + { + move = (Phase)(i%4); + break; + } else if (!DoneAdds[i%4] && next > 0) + --next; + } + ++AddCount; + DoneAdds[move] = true; + move = (Phase)(move%4); + } + //send orb to summon spot + Creature *pOrb = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_ORB) : 0); + if (pOrb && pOrb->isAlive()) + { + if (currentPhase == PHASE_NONE) + pOrb->CastSpell(me,SPELL_ORB_VISUAL,true); + pOrb->GetMotionMaster()->MovePoint(move,moveLocs[move].x,moveLocs[move].y,moveLocs[move].z); + } + currentPhase = move; + } + + void JustReachedHome() + { + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE|UNIT_FLAG_NOT_ATTACKABLE_1|UNIT_FLAG_OOC_NOT_ATTACKABLE); + me->SetStandState(UNIT_STAND_STATE_STAND); + DoCast(me, SPELL_FREEZE); + } +}; + +CreatureAI* GetAI_boss_palehoof(Creature* pCreature) +{ + return new boss_palehoofAI (pCreature); +} + +//ravenous furbolg's spells +enum RavenousSpells +{ + SPELL_CHAIN_LIGHTING = 48140, + H_SPELL_CHAIN_LIGHTING = 59273, + SPELL_CRAZED = 48139, + SPELL_TERRIFYING_ROAR = 48144 +}; + +struct mob_ravenous_furbolgAI : public ScriptedAI +{ + mob_ravenous_furbolgAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + } + + uint32 uiChainLightingTimer; + uint32 uiCrazedTimer; + uint32 uiTerrifyingRoarTimer; + + ScriptedInstance *pInstance; + + void Reset() + { + uiChainLightingTimer = 5000; + uiCrazedTimer = 10000; + uiTerrifyingRoarTimer = 15000; + + me->GetMotionMaster()->MoveTargetedHome(); + + if (pInstance) + if (pInstance->GetData(DATA_GORTOK_PALEHOOF_EVENT) == IN_PROGRESS) + { + Creature *pPalehoof = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); + if (pPalehoof && pPalehoof->isAlive()) + CAST_AI(boss_palehoofAI, pPalehoof->AI())->Reset(); + } + } + + void UpdateAI(const uint32 diff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + if (uiChainLightingTimer <= diff) + { + DoCast(me->getVictim(), SPELL_CHAIN_LIGHTING); + uiChainLightingTimer = 5000 + rand()%5000; + } else uiChainLightingTimer -= diff; + + if (uiCrazedTimer <= diff) + { + DoCast(me, SPELL_CRAZED); + uiCrazedTimer = 8000 + rand()%4000; + } else uiCrazedTimer -= diff; + + if (uiTerrifyingRoarTimer <= diff) + { + DoCast(me, SPELL_TERRIFYING_ROAR); + uiTerrifyingRoarTimer = 10000 + rand()%10000; + } else uiTerrifyingRoarTimer -= diff; + + DoMeleeAttackIfReady(); + } + + void AttackStart(Unit* who) + { + if (!who) + return; + + if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) + return; + + if (me->Attack(who, true)) + { + me->AddThreat(who, 0.0f); + me->SetInCombatWith(who); + who->SetInCombatWith(me); + DoStartMovement(who); + } + } + + void JustDied(Unit* /*killer*/) + { + if (pInstance) + { + Creature *pPalehoof = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); + if (pPalehoof) + CAST_AI(boss_palehoofAI, pPalehoof->AI())->NextPhase(); + } + } + + void JustReachedHome() + { + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE|UNIT_FLAG_NOT_ATTACKABLE_1|UNIT_FLAG_OOC_NOT_ATTACKABLE); + me->SetStandState(UNIT_STAND_STATE_STAND); + DoCast(me, SPELL_FREEZE); + } +}; + +CreatureAI* GetAI_mob_ravenous_furbolg(Creature* pCreature) +{ + return new mob_ravenous_furbolgAI (pCreature); +} + +//frenzied worgen's spells +enum FrenziedSpells +{ + SPELL_MORTAL_WOUND = 48137, + H_SPELL_MORTAL_WOUND = 59265, + SPELL_ENRAGE_1 = 48138, + SPELL_ENRAGE_2 = 48142 +}; + +struct mob_frenzied_worgenAI : public ScriptedAI +{ + mob_frenzied_worgenAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + } + + uint32 uiMortalWoundTimer; + uint32 uiEnrage1Timer; + uint32 uiEnrage2Timer; + + ScriptedInstance *pInstance; + + void Reset() + { + uiMortalWoundTimer = 5000; + uiEnrage1Timer = 15000; + uiEnrage2Timer = 10000; + + me->GetMotionMaster()->MoveTargetedHome(); + + if (pInstance) + if (pInstance->GetData(DATA_GORTOK_PALEHOOF_EVENT) == IN_PROGRESS) + { + Creature *pPalehoof = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); + if (pPalehoof && pPalehoof->isAlive()) + CAST_AI(boss_palehoofAI, pPalehoof->AI())->Reset(); + } + } + + void UpdateAI(const uint32 diff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + if (uiMortalWoundTimer <= diff) + { + DoCast(me->getVictim(), SPELL_MORTAL_WOUND); + uiMortalWoundTimer = 3000 + rand()%4000; + } else uiMortalWoundTimer -= diff; + + if (uiEnrage1Timer <= diff) + { + DoCast(me, SPELL_ENRAGE_1); + uiEnrage1Timer = 15000; + } else uiEnrage1Timer -= diff; + + if (uiEnrage2Timer <= diff) + { + DoCast(me, SPELL_ENRAGE_2); + uiEnrage2Timer = 10000; + } else uiEnrage2Timer -= diff; + + DoMeleeAttackIfReady(); + } + + void AttackStart(Unit* who) + { + if (!who) + return; + + if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) + return; + + if (me->Attack(who, true)) + { + me->AddThreat(who, 0.0f); + me->SetInCombatWith(who); + who->SetInCombatWith(me); + DoStartMovement(who); + } + if (pInstance) + pInstance->SetData(DATA_GORTOK_PALEHOOF_EVENT, IN_PROGRESS); + } + + void JustDied(Unit* /*killer*/) + { + if (pInstance) + { + Creature *pPalehoof = Unit::GetCreature((*me), pInstance->GetData64(DATA_GORTOK_PALEHOOF)); + if (pPalehoof) + CAST_AI(boss_palehoofAI, pPalehoof->AI())->NextPhase(); + } + } + + void JustReachedHome() + { + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE|UNIT_FLAG_NOT_ATTACKABLE_1|UNIT_FLAG_OOC_NOT_ATTACKABLE); + me->SetStandState(UNIT_STAND_STATE_STAND); + DoCast(me, SPELL_FREEZE); + } +}; + +CreatureAI* GetAI_mob_frenzied_worgen(Creature* pCreature) +{ + return new mob_frenzied_worgenAI (pCreature); +} + +//ferocious rhino's spells +enum FerociousSpells +{ + SPELL_GORE = 48130, + H_SPELL_GORE = 59264, + SPELL_GRIEVOUS_WOUND = 48105, + H_SPELL_GRIEVOUS_WOUND = 59263, + SPELL_STOMP = 48131 +}; + +struct mob_ferocious_rhinoAI : public ScriptedAI +{ + mob_ferocious_rhinoAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + } + + uint32 uiStompTimer; + uint32 uiGoreTimer; + uint32 uiGrievousWoundTimer; + + ScriptedInstance *pInstance; + + void Reset() + { + uiStompTimer = 10000; + uiGoreTimer = 15000; + uiGrievousWoundTimer = 20000; + + me->GetMotionMaster()->MoveTargetedHome(); + + if (pInstance) + if (pInstance->GetData(DATA_GORTOK_PALEHOOF_EVENT) == IN_PROGRESS) + { + Creature *pPalehoof = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); + if (pPalehoof && pPalehoof->isAlive()) + CAST_AI(boss_palehoofAI, pPalehoof->AI())->Reset(); + } + } + + void UpdateAI(const uint32 diff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + if (uiStompTimer <= diff) + { + DoCast(me->getVictim(), SPELL_STOMP); + uiStompTimer = 8000 + rand()%4000; + } else uiStompTimer -= diff; + + if (uiGoreTimer <= diff) + { + DoCast(me->getVictim(), SPELL_GORE); + uiGoreTimer = 13000 + rand()%4000; + } else uiGoreTimer -= diff; + + if (uiGrievousWoundTimer <= diff) + { + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(pTarget, SPELL_GRIEVOUS_WOUND); + uiGrievousWoundTimer = 18000 + rand()%4000; + } else uiGrievousWoundTimer -= diff; + + DoMeleeAttackIfReady(); + } + + void AttackStart(Unit* who) + { + if (!who) + return; + + if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) + return; + + if (me->Attack(who, true)) + { + me->AddThreat(who, 0.0f); + me->SetInCombatWith(who); + who->SetInCombatWith(me); + DoStartMovement(who); + } + } + + void JustDied(Unit* /*killer*/) + { + if (pInstance) + { + Creature *pPalehoof = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); + if (pPalehoof) + CAST_AI(boss_palehoofAI, pPalehoof->AI())->NextPhase(); + } + } + + void JustReachedHome() + { + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE|UNIT_FLAG_NOT_ATTACKABLE_1|UNIT_FLAG_OOC_NOT_ATTACKABLE); + me->SetStandState(UNIT_STAND_STATE_STAND); + DoCast(me, SPELL_FREEZE); + } +}; + +CreatureAI* GetAI_mob_ferocious_rhino(Creature* pCreature) +{ + return new mob_ferocious_rhinoAI (pCreature); +} + +//massive jormungar's spells +enum MassiveSpells +{ + SPELL_ACID_SPIT = 48132, + SPELL_ACID_SPLATTER = 48136, + H_SPELL_ACID_SPLATTER = 59272, + SPELL_POISON_BREATH = 48133, + H_SPELL_POISON_BREATH = 59271 +}; + +enum MassiveAdds +{ + CREATURE_JORMUNGAR_WORM = 27228 +}; + +struct mob_massive_jormungarAI : public ScriptedAI +{ + mob_massive_jormungarAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + } + + uint32 uiAcidSpitTimer; + uint32 uiAcidSplatterTimer; + uint32 uiPoisonBreathTimer; + + ScriptedInstance *pInstance; + + void Reset() + { + uiAcidSpitTimer = 3000; + uiAcidSplatterTimer = 12000; + uiPoisonBreathTimer = 10000; + + me->GetMotionMaster()->MoveTargetedHome(); + + if (pInstance) + if (pInstance->GetData(DATA_GORTOK_PALEHOOF_EVENT) == IN_PROGRESS) + { + Creature *pPalehoof = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); + if (pPalehoof && pPalehoof->isAlive()) + CAST_AI(boss_palehoofAI, pPalehoof->AI())->Reset(); + } + } + + void UpdateAI(const uint32 diff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + if (uiAcidSpitTimer <= diff) + { + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(pTarget, SPELL_ACID_SPIT); + uiAcidSpitTimer = 2000 + rand()%2000; + } else uiAcidSpitTimer -= diff; + + if (uiAcidSplatterTimer <= diff) + { + DoCast(me, SPELL_POISON_BREATH); + uiAcidSplatterTimer = 10000 + rand()%4000; + } else uiAcidSplatterTimer -= diff; + + if (uiPoisonBreathTimer <= diff) + { + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(pTarget, SPELL_POISON_BREATH); + uiPoisonBreathTimer = 8000 + rand()%4000; + } else uiPoisonBreathTimer -= diff; + + DoMeleeAttackIfReady(); + } + + void AttackStart(Unit* who) + { + if (!who) + return; + + if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) + return; + + if (me->Attack(who, true)) + { + me->AddThreat(who, 0.0f); + me->SetInCombatWith(who); + who->SetInCombatWith(me); + DoStartMovement(who); + } + } + + void JustDied(Unit* /*killer*/) + { + if (pInstance) + { + Creature *pPalehoof = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); + if (pPalehoof) + CAST_AI(boss_palehoofAI,pPalehoof->AI())->NextPhase(); + } + } + + void JustReachedHome() + { + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE|UNIT_FLAG_NOT_ATTACKABLE_1|UNIT_FLAG_OOC_NOT_ATTACKABLE); + me->SetStandState(UNIT_STAND_STATE_STAND); + DoCast(me, SPELL_FREEZE); + } +}; + +CreatureAI* GetAI_mob_massive_jormungar(Creature* pCreature) +{ + return new mob_massive_jormungarAI (pCreature); +} + + +struct mob_palehoof_orbAI : public ScriptedAI +{ + mob_palehoof_orbAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + } + + ScriptedInstance *pInstance; + uint32 SummonTimer; + Phase currentPhase; + + void Reset() + { + currentPhase=PHASE_NONE; + SummonTimer=5000; + me->AddUnitMovementFlag(MOVEMENTFLAG_FLYING); + me->RemoveAurasDueToSpell(SPELL_ORB_VISUAL); + me->SetSpeed(MOVE_FLIGHT , 0.5f); + } + + void UpdateAI(const uint32 diff) + { + if (currentPhase == PHASE_NONE) + return; + + if (SummonTimer <= diff) + { + if (currentPhase<5&¤tPhase >= 0) + { + Creature *pNext = NULL; + switch(currentPhase) + { + case PHASE_FRENZIED_WORGEN: pNext = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_FRENZIED_WORGEN) : 0); break; + case PHASE_RAVENOUS_FURLBORG: pNext = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_RAVENOUS_FURBOLG) : 0); break; + case PHASE_MASSIVE_JORMUNGAR: pNext = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_MASSIVE_JORMUNGAR) : 0); break; + case PHASE_FEROCIOUS_RHINO: pNext = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_FEROCIOUS_RHINO) : 0); break; + case PHASE_GORTOK_PALEHOOF: pNext = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); break; + } + + if (pNext) + { + pNext->RemoveAurasDueToSpell(SPELL_FREEZE); + pNext->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE|UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_ATTACKABLE_1|UNIT_FLAG_OOC_NOT_ATTACKABLE); + pNext->SetStandState(UNIT_STAND_STATE_STAND); + pNext->SetInCombatWithZone(); + pNext->Attack(pNext->SelectNearestTarget(100),true); + + } + currentPhase=PHASE_NONE; + } + } else SummonTimer-=diff; + } + + void MovementInform(uint32 type, uint32 id) + { + if (type != POINT_MOTION_TYPE) + return; + if (id<0 || id>4) + return; + Creature *pNext = NULL; + switch(id) + { + case PHASE_FRENZIED_WORGEN: pNext = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_FRENZIED_WORGEN) : 0); break; + case PHASE_RAVENOUS_FURLBORG: pNext = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_RAVENOUS_FURBOLG) : 0); break; + case PHASE_MASSIVE_JORMUNGAR: pNext = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_MASSIVE_JORMUNGAR) : 0); break; + case PHASE_FEROCIOUS_RHINO: pNext = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_FEROCIOUS_RHINO) : 0); break; + case PHASE_GORTOK_PALEHOOF: pNext = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); break; + } + if (pNext) + DoCast(pNext, SPELL_ORB_CHANNEL, false); + currentPhase=(Phase)id; + SummonTimer=5000; + } +}; + +CreatureAI* GetAI_mob_palehoof_orb(Creature* pCreature) +{ + return new mob_palehoof_orbAI (pCreature); +} + + + +bool GOHello_palehoof_sphere(Player * /*pPlayer*/, GameObject *pGO) +{ + ScriptedInstance *pInstance = pGO->GetInstanceData(); + + Creature *pPalehoof = Unit::GetCreature(*pGO, pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); + if (pPalehoof && pPalehoof->isAlive()) + { + // maybe these are hacks :( + pGO->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); + pGO->SetGoState(GO_STATE_ACTIVE); + + CAST_AI(boss_palehoofAI, pPalehoof->AI())->NextPhase(); + } + return true; +} + + + +void AddSC_boss_palehoof() +{ + Script *newscript; + + newscript = new Script; + newscript->Name = "boss_palehoof"; + newscript->GetAI = &GetAI_boss_palehoof; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_ravenous_furbolg"; + newscript->GetAI = &GetAI_mob_ravenous_furbolg; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_frenzied_worgen"; + newscript->GetAI = &GetAI_mob_frenzied_worgen; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_ferocious_rhino"; + newscript->GetAI = &GetAI_mob_ferocious_rhino; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_massive_jormungar"; + newscript->GetAI = &GetAI_mob_massive_jormungar; + newscript->RegisterSelf(); + + + newscript = new Script; + newscript->Name = "mob_palehoof_orb"; + newscript->GetAI = &GetAI_mob_palehoof_orb; + newscript->RegisterSelf(); + + + newscript = new Script; + newscript->Name = "go_palehoof_sphere"; + newscript->pGOHello=&GOHello_palehoof_sphere; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp new file mode 100644 index 00000000000..a75eb3465be --- /dev/null +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp @@ -0,0 +1,477 @@ +/* Copyright (C) 2008 - 2010 Trinity + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* Script Data Start +SDName: Boss_Skadi +SDAuthor: LordVanMartin, JohnHoliver +SD%Complete: 90% +SDComment: + After Unmount() he appears to still be flying even with SetFlying(false) + +SDCategory: Utgarde Pinnacle +Script Data End */ + +#include "ScriptedPch.h" +#include "utgarde_pinnacle.h" + +//Yell +enum eYells +{ + SAY_AGGRO = -1575004, + SAY_KILL_1 = -1575005, + SAY_KILL_2 = -1575006, + EMOTE_RANGE = -1575007, //Skadi + SAY_DEATH = -1575008, + SAY_DRAKE_DEATH = -1575009, + EMOTE_BREATH = -1575010, //Grauf + SAY_DRAKE_BREATH_1 = -1575011, + SAY_DRAKE_BREATH_2 = -1575012, + SAY_DRAKE_BREATH_3 = -1575013, +}; + +static Position SpawnLoc = {468.931, -513.555, 104.723}; +static Position Location[]= +{ + // Boss + {341.740997, -516.955017, 104.66900}, // 0 + {293.299, -505.95, 142.03}, // 1 + {301.664, -535.164, 146.097}, // 2 + {521.031006, -544.667847, 128.80064}, // 3 + {477.311981, -509.296814, 104.72308}, // 4 + {341.740997, -516.955017, 104.66900}, // 5 + {341.740997, -516.955017, 104.66900}, // 6 + {341.740997, -516.955017, 104.66900}, // 7 + // Triggers Left + {469.661, -484.546, 104.712}, // 8 + {483.315, -485.028, 104.718}, // 9 + {476.87, -487.994, 104.735}, //10 + {477.512, -497.772, 104.728}, //11 + {486.287, -500.759, 104.722}, //12 + {480.1, -503.895, 104.722}, //13 + {472.391, -505.103, 104.723}, //14 + {478.885, -510.803, 104.723}, //15 + {489.529, -508.615, 104.723}, //16 + {484.272, -508.589, 104.723}, //17 + {465.328, -506.495, 104.427}, //18 + {456.885, -508.104, 104.447}, //19 + {450.177, -507.989, 105.247}, //20 + {442.273, -508.029, 104.813}, //21 + {434.225, -508.19, 104.787}, //22 + {423.902, -508.525, 104.274}, //23 + {414.551, -508.645, 105.136}, //24 + {405.787, -508.755, 104.988}, //25 + {398.812, -507.224, 104.82}, //26 + {389.702, -506.846, 104.729}, //27 + {381.856, -506.76, 104.756}, //28 + {372.881, -507.254, 104.779}, //29 + {364.978, -508.182, 104.673}, //30 + {357.633, -508.075, 104.647}, //31 + {350.008, -506.826, 104.588}, //32 + {341.69, -506.77, 104.499}, //33 + {335.31, -505.745, 105.18}, //34 + {471.178, -510.74, 104.723}, //35 + {461.759, -510.365, 104.199}, //36 + {424.07287, -510.082916, 104.711082}, //37 + // Triggers Right + {489.46, -513.297, 105.413}, //38 + {485.706, -517.175, 104.724}, //39 + {480.98, -519.313, 104.724}, //40 + {475.05, -520.52, 104.724}, //41 + {482.97, -512.099, 104.724}, //42 + {477.082, -514.172, 104.724}, //43 + {468.991, -516.691, 104.724}, //44 + {461.722, -517.063, 104.627}, //45 + {455.88, -517.681, 104.707}, //46 + {450.499, -519.099, 104.701}, //47 + {444.889, -518.963, 104.82}, //48 + {440.181, -518.893, 104.861}, //49 + {434.393, -518.758, 104.891}, //50 + {429.328, -518.583, 104.904}, //51 + {423.844, -518.394, 105.004}, //52 + {418.707, -518.266, 105.135}, //53 + {413.377, -518.085, 105.153}, //54 + {407.277, -517.844, 104.893}, //55 + {401.082, -517.443, 104.723}, //56 + {394.933, -514.64, 104.724}, //57 + {388.917, -514.688, 104.734}, //58 + {383.814, -515.834, 104.73}, //59 + {377.887, -518.653, 104.777}, //60 + {371.376, -518.289, 104.781}, //61 + {365.669, -517.822, 104.758}, //62 + {359.572, -517.314, 104.706}, //63 + {353.632, -517.146, 104.647}, //64 + {347.998, -517.038, 104.538}, //65 + {341.803, -516.98, 104.584}, //66 + {335.879, -516.674, 104.628}, //67 + {329.871, -515.92, 104.711}, //68 + // Breach Zone + {485.4577, -511.2515, 115.3011}, //69 + {435.1892, -514.5232, 118.6719}, //70 + {413.9327, -540.9407, 138.2614}, //71 +}; + +enum eCombatPhase +{ + FLYING, + SKADI +}; + +enum eSpells +{ + //Skadi Spells + SPELL_CRUSH = 50234, + SPELL_POISONED_SPEAR = 50225, //isn't being casted =/ + SPELL_WHIRLWIND = 50228, //random target, but not the tank approx. every 20s + SPELL_RAPID_FIRE = 56570, + SPELL_HARPOON_DAMAGE = 56578, + SPELL_FREEZING_CLOUD = 47579, +}; + +enum eCreature +{ + CREATURE_YMIRJAR_WARRIOR = 26690, + CREATURE_YMIRJAR_WITCH_DOCTOR = 26691, + CREATURE_YMIRJAR_HARPOONER = 26692, + CREATURE_GRAUF = 26893, + CREATURE_TRIGGER = 28351, + DATA_MOUNT = 27043, +}; + +enum eAchievments +{ + ACHIEV_TIMED_START_EVENT = 17726, +}; + +struct boss_skadiAI : public ScriptedAI +{ + boss_skadiAI(Creature *c) : ScriptedAI(c), Summons(me) + { + m_pInstance = c->GetInstanceData(); + } + + ScriptedInstance* m_pInstance; + SummonList Summons; + uint64 m_uiGraufGUID; + std::vector triggersGUID; + + uint32 m_uiCrushTimer; + uint32 m_uiPoisonedSpearTimer; + uint32 m_uiWhirlwindTimer; + uint32 m_uiWaypointId; + uint32 m_uiMovementTimer; + uint32 m_uiMountTimer; + uint32 m_uiSummonTimer; + uint8 m_uiSpellHitCount; + bool m_bSaidEmote; + + eCombatPhase Phase; + + void Reset() + { + triggersGUID.clear(); + + m_uiCrushTimer = 8000; + m_uiPoisonedSpearTimer = 10000; + m_uiWhirlwindTimer = 20000; + m_uiMountTimer = 3000; + m_uiWaypointId = 0; + m_bSaidEmote = false; + m_uiSpellHitCount = 0; + + Phase = SKADI; + + Summons.DespawnAll(); + me->SetSpeed(MOVE_FLIGHT, 3.0f); + if ((Unit::GetCreature((*me), m_uiGraufGUID) == NULL) && !me->IsMounted()) + me->SummonCreature(CREATURE_GRAUF,Location[0].GetPositionX(),Location[0].GetPositionY(),Location[0].GetPositionZ(),3.0f); + if (m_pInstance) + { + m_pInstance->SetData(DATA_SKADI_THE_RUTHLESS_EVENT, NOT_STARTED); + m_pInstance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); + } + } + + void JustReachedHome() + { + me->SetFlying(false); + me->Unmount(); + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NON_ATTACKABLE); + if (Unit::GetCreature((*me), m_uiGraufGUID) == NULL) + me->SummonCreature(CREATURE_GRAUF,Location[0].GetPositionX(),Location[0].GetPositionY(),Location[0].GetPositionZ(),3.0f); + } + + void EnterCombat(Unit* /*who*/) + { + DoScriptText(SAY_AGGRO, me); + + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NON_ATTACKABLE); + + Phase = FLYING; + + m_uiMovementTimer = 1000; + m_uiSummonTimer = 10000; + me->SetInCombatWithZone(); + if (m_pInstance) + { + m_pInstance->SetData(DATA_SKADI_THE_RUTHLESS_EVENT, IN_PROGRESS); + m_pInstance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); + me->GetMotionMaster()->MoveJump(Location[0].GetPositionX(), Location[0].GetPositionY(), Location[0].GetPositionZ(), 5.0f, 10.0f); + me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE); + m_uiMountTimer = 1000; + Summons.DespawnEntry(CREATURE_GRAUF); + } + } + + void JustSummoned(Creature* pSummoned) + { + switch (pSummoned->GetEntry()) + { + case CREATURE_GRAUF: + m_uiGraufGUID = pSummoned->GetGUID(); + break; + case CREATURE_YMIRJAR_WARRIOR: + case CREATURE_YMIRJAR_WITCH_DOCTOR: + case CREATURE_YMIRJAR_HARPOONER: + pSummoned->setActive(true); + pSummoned->SetInCombatWithZone(); + if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + pSummoned->AI()->AttackStart(pTarget); + break; + case CREATURE_TRIGGER: + pSummoned->CastSpell((Unit*)NULL, SPELL_FREEZING_CLOUD, true); + pSummoned->ForcedDespawn(10*IN_MILISECONDS); + break; + } + Summons.Summon(pSummoned); + } + + void SummonedCreatureDespawn(Creature* pSummoned) + { + if (pSummoned->GetEntry() == CREATURE_GRAUF) + m_uiGraufGUID = 0; + Summons.Despawn(pSummoned); + } + + void SpellHit(Unit *caster, const SpellEntry *spell) + { + if (spell->Id == SPELL_HARPOON_DAMAGE) + { + m_uiSpellHitCount++; + if (m_uiSpellHitCount >= 5) + { + Phase = SKADI; + me->SetFlying(false); + me->Unmount(); + if(Creature* pGrauf = me->SummonCreature(CREATURE_GRAUF, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 3*IN_MILISECONDS)) + { + pGrauf->GetMotionMaster()->MoveFall(0); + pGrauf->HandleEmoteCommand(EMOTE_ONESHOT_FLYDEATH); + } + sLog.outBasic("[Skadi] Fly off"); + me->GetMotionMaster()->MoveJump(Location[4].GetPositionX(), Location[4].GetPositionY(), Location[4].GetPositionZ(), 5.0f, 10.0f); + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NON_ATTACKABLE); + DoScriptText(SAY_DRAKE_DEATH, me); + m_uiCrushTimer = 8000; + m_uiPoisonedSpearTimer = 10000; + m_uiWhirlwindTimer = 20000; + me->AI()->AttackStart(SelectTarget(SELECT_TARGET_RANDOM)); + } + } + } + + + void UpdateAI(const uint32 diff) + { + switch(Phase) + { + case FLYING: + if (!UpdateVictim()) + return; + + if (me->GetPositionX() >= 519) + { + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NON_ATTACKABLE); + if (!m_bSaidEmote) + { + DoScriptText(EMOTE_RANGE, me); + m_bSaidEmote = true; + } + } + else + { + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NON_ATTACKABLE); + m_bSaidEmote = false; + } + + if (m_uiMountTimer && m_uiMountTimer <= diff) + { + me->Mount(DATA_MOUNT); + me->SetFlying(true); + m_uiMountTimer = 0; + } else m_uiMountTimer -= diff; + + if (m_uiSummonTimer <= diff) + { + SpawnMobs(); + m_uiSummonTimer = 25000; + } else m_uiSummonTimer -= diff; + + if (m_uiMovementTimer <= diff) + { + switch(m_uiWaypointId) + { + case 0: + me->GetMotionMaster()->MovePoint(0, Location[1].GetPositionX(), Location[1].GetPositionY(), Location[1].GetPositionZ()); + m_uiMovementTimer = 5000; + break; + case 1: + me->GetMotionMaster()->MovePoint(0, Location[2].GetPositionX(), Location[2].GetPositionY(), Location[2].GetPositionZ()); + m_uiMovementTimer = 2000; + break; + case 2: + me->GetMotionMaster()->MovePoint(0, Location[3].GetPositionX(), Location[3].GetPositionY(), Location[3].GetPositionZ()); + m_uiMovementTimer = 15000; + break; + case 3: + me->GetMotionMaster()->MovePoint(0, Location[69].GetPositionX(), Location[69].GetPositionY(), Location[69].GetPositionZ()); + DoScriptText(RAND(SAY_DRAKE_BREATH_1,SAY_DRAKE_BREATH_2), me); + DoScriptText(EMOTE_BREATH, me); + m_uiMovementTimer = 2500; + break; + case 4: + me->GetMotionMaster()->MovePoint(0, Location[70].GetPositionX(), Location[70].GetPositionY(), Location[70].GetPositionZ()); + m_uiMovementTimer = 2000; + SpawnTrigger(); + break; + case 5: + me->GetMotionMaster()->MovePoint(0, Location[71].GetPositionX(), Location[71].GetPositionY(), Location[71].GetPositionZ()); + m_uiMovementTimer = 3000; + break; + case 6: + me->GetMotionMaster()->MovePoint(0, Location[3].GetPositionX(), Location[3].GetPositionY(), Location[3].GetPositionZ()); + m_uiWaypointId = 2; + m_uiMovementTimer = 15000; + break; + } + m_uiWaypointId++; + } else m_uiMovementTimer -= diff; + break; + case SKADI: + //Return since we have no target + if (!UpdateVictim()) + return; + + if (m_uiCrushTimer <= diff) + { + DoCastVictim(SPELL_CRUSH); + m_uiCrushTimer = 8000; + } else m_uiCrushTimer -= diff; + + if (m_uiPoisonedSpearTimer <= diff) + { + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM)) + DoCast(pTarget, SPELL_POISONED_SPEAR); + m_uiPoisonedSpearTimer = 10000; + } else m_uiPoisonedSpearTimer -= diff; + + if (m_uiWhirlwindTimer <= diff) + { + DoCastAOE(SPELL_WHIRLWIND); + m_uiWhirlwindTimer = 20000; + } else m_uiWhirlwindTimer -= diff; + + DoMeleeAttackIfReady(); + break; + } + } + + void JustDied(Unit* /*killer*/) + { + DoScriptText(SAY_DEATH, me); + Summons.DespawnAll(); + if (m_pInstance) + m_pInstance->SetData(DATA_SKADI_THE_RUTHLESS_EVENT, DONE); + } + + void KilledUnit(Unit * /*victim*/) + { + DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2), me); + } + + void SpawnMobs() + { + for (uint8 i = 0; i < DUNGEON_MODE(5,6); ++i) + { + switch (urand(0,2)) + { + case 0: me->SummonCreature(CREATURE_YMIRJAR_WARRIOR, SpawnLoc.GetPositionX()+rand()%5, SpawnLoc.GetPositionY()+rand()%5, SpawnLoc.GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); break; + case 1: me->SummonCreature(CREATURE_YMIRJAR_WITCH_DOCTOR, SpawnLoc.GetPositionX()+rand()%5, SpawnLoc.GetPositionY()+rand()%5, SpawnLoc.GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); break; + case 2: me->SummonCreature(CREATURE_YMIRJAR_HARPOONER, SpawnLoc.GetPositionX()+rand()%5, SpawnLoc.GetPositionY()+rand()%5, SpawnLoc.GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); break; + } + } + } + + void SpawnTrigger() + { + uint8 iStart,iEnd; + switch (urand(0,1)) + { + case 0: + iStart = 8; + iEnd = 37; + break; + case 1: + iStart = 38; + iEnd = 68; + break; + } + for(uint32 i = iStart; i < iEnd; ++i) + me->SummonCreature(CREATURE_TRIGGER,Location[i]); + } +}; + +bool GOHello_go_harpoon_launcher(Player *pPlayer, GameObject *pGO) +{ + ScriptedInstance* m_pInstance; + m_pInstance = (ScriptedInstance*)pGO->GetInstanceData(); + if (!m_pInstance) return false; + + if (Creature* pSkadi = Unit::GetCreature((*pGO),m_pInstance->GetData64(DATA_SKADI_THE_RUTHLESS))) + { + pPlayer->CastSpell(pSkadi,SPELL_RAPID_FIRE, true); + } + return false; +} + +CreatureAI* GetAI_boss_skadi(Creature* pCreature) +{ + return new boss_skadiAI (pCreature); +} + +void AddSC_boss_skadi() +{ + Script *newscript; + + newscript = new Script; + newscript->Name = "boss_skadi"; + newscript->GetAI = &GetAI_boss_skadi; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "go_harpoon_launcher"; + newscript->pGOHello = &GOHello_go_harpoon_launcher; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp new file mode 100644 index 00000000000..aae1015ddab --- /dev/null +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp @@ -0,0 +1,408 @@ +/* Copyright (C) 2008 - 2010 TrinityCore + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "ScriptedPch.h" +#include "utgarde_pinnacle.h" + +enum Spells +{ + SPELL_CALL_FLAMES = 48258, + SPELL_RITUAL_OF_THE_SWORD = 48276, //Effect #1 Teleport, Effect #2 Dummy + SPELL_SINSTER_STRIKE = 15667, + H_SPELL_SINSTER_STRIKE = 59409, + SPELL_SVALA_TRANSFORMING1 = 54140, + SPELL_SVALA_TRANSFORMING2 = 54205 +}; +//not in db +enum Yells +{ + SAY_DIALOG_WITH_ARTHAS_1 = -1575015, + SAY_DIALOG_WITH_ARTHAS_2 = -1575016, + SAY_DIALOG_WITH_ARTHAS_3 = -1575017, + SAY_AGGRO = -1575018, + SAY_SLAY_1 = -1575019, + SAY_SLAY_2 = -1575020, + SAY_SLAY_3 = -1575021, + SAY_DEATH = -1575022, + SAY_SACRIFICE_PLAYER_1 = -1575023, + SAY_SACRIFICE_PLAYER_2 = -1575024, + SAY_SACRIFICE_PLAYER_3 = -1575025, + SAY_SACRIFICE_PLAYER_4 = -1575026, + SAY_SACRIFICE_PLAYER_5 = -1575027, + SAY_DIALOG_OF_ARTHAS_1 = -1575028, + SAY_DIALOG_OF_ARTHAS_2 = -1575029 +}; +enum Creatures +{ + CREATURE_ARTHAS = 24266, // Image of Arthas + CREATURE_SVALA_SORROWGRAVE = 26668, // Svala after transformation + CREATURE_SVALA = 29281, // Svala before transformation + CREATURE_RITUAL_CHANNELER = 27281 +}; +enum ChannelerSpells +{ + //ritual channeler's spells + SPELL_PARALYZE = 48278, + SPELL_SHADOWS_IN_THE_DARK = 59407 +}; +enum Misc +{ + DATA_SVALA_DISPLAY_ID = 25944 +}; +enum IntroPhase +{ + IDLE, + INTRO, + FINISHED +}; +enum CombatPhase +{ + NORMAL, + SACRIFICING +}; + +static Position RitualChannelerPos[]= +{ + {296.42, -355.01, 90.94}, + {302.36, -352.01, 90.54}, + {291.39, -350.89, 90.54} +}; +static Position ArthasPos = { 295.81, -366.16, 92.57, 1.58 }; +static Position SvalaPos = { 296.632, -346.075, 90.6307, 1.58 }; + +struct boss_svalaAI : public ScriptedAI +{ + boss_svalaAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + } + + uint32 uiIntroTimer; + + uint8 uiIntroPhase; + + IntroPhase Phase; + + TempSummon* pArthas; + uint64 uiArthasGUID; + + ScriptedInstance* pInstance; + + void Reset() + { + Phase = IDLE; + uiIntroTimer = 1*IN_MILISECONDS; + uiIntroPhase = 0; + uiArthasGUID = 0; + + if (pInstance) + pInstance->SetData(DATA_SVALA_SORROWGRAVE_EVENT, NOT_STARTED); + } + + void MoveInLineOfSight(Unit* pWho) + { + if (!pWho) + return; + + if (Phase == IDLE && pWho->isTargetableForAttack() && me->IsHostileTo(pWho) && me->IsWithinDistInMap(pWho, 40)) + { + Phase = INTRO; + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + + if (Creature *pArthas = me->SummonCreature(CREATURE_ARTHAS, ArthasPos, TEMPSUMMON_MANUAL_DESPAWN)) + { + pArthas->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE); + pArthas->SetFloatValue(OBJECT_FIELD_SCALE_X, 5); + uiArthasGUID = pArthas->GetGUID(); + } + } + } + + void AttackStart(Unit* /*who*/) {} + + void UpdateAI(const uint32 diff) + { + if (Phase != INTRO) + return; + + if (uiIntroTimer <= diff) + { + Creature *pArthas = Unit::GetCreature(*me, uiArthasGUID); + if (!pArthas) + return; + + switch (uiIntroPhase) + { + case 0: + DoScriptText(SAY_DIALOG_WITH_ARTHAS_1, me); + ++uiIntroPhase; + uiIntroTimer = 3.5*IN_MILISECONDS; + break; + case 1: + DoScriptText(SAY_DIALOG_OF_ARTHAS_1, pArthas); + ++uiIntroPhase; + uiIntroTimer = 3.5*IN_MILISECONDS; + break; + case 2: + DoScriptText(SAY_DIALOG_WITH_ARTHAS_2, me); + ++uiIntroPhase; + uiIntroTimer = 3.5*IN_MILISECONDS; + break; + case 3: + DoScriptText(SAY_DIALOG_OF_ARTHAS_2, pArthas); + ++uiIntroPhase; + uiIntroTimer = 3.5*IN_MILISECONDS; + break; + case 4: + DoScriptText(SAY_DIALOG_WITH_ARTHAS_3, me); + DoCast(me, SPELL_SVALA_TRANSFORMING1); + ++uiIntroPhase; + uiIntroTimer = 2.8*IN_MILISECONDS; + break; + case 5: + DoCast(me, SPELL_SVALA_TRANSFORMING2); + ++uiIntroPhase; + uiIntroTimer = 200; + break; + case 6: + if (Creature* pSvalaSorrowgrave = me->SummonCreature(CREATURE_SVALA_SORROWGRAVE, SvalaPos, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 60*IN_MILISECONDS)) + { + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE); + me->SetDisplayId(DATA_SVALA_DISPLAY_ID); + pArthas->ToTempSummon()->UnSummon(); + uiArthasGUID = 0; + Phase = FINISHED; + } + else + Reset(); + break; + } + } else uiIntroTimer -= diff; + } +}; + +struct mob_ritual_channelerAI : public Scripted_NoMovementAI +{ + mob_ritual_channelerAI(Creature *c) :Scripted_NoMovementAI(c) + { + pInstance = c->GetInstanceData(); + } + + ScriptedInstance* pInstance; + + void Reset() + { + DoCast(me, SPELL_SHADOWS_IN_THE_DARK); + } + + // called by svala sorrowgrave to set guid of victim + void DoAction(uint32 /*action*/) + { + if (pInstance) + if (Unit *pVictim = me->GetUnit(*me, pInstance->GetData64(DATA_SACRIFICED_PLAYER))) + DoCast(pVictim, SPELL_PARALYZE); + } + + void EnterCombat(Unit* /*who*/) + { + } +}; + +struct boss_svala_sorrowgraveAI : public ScriptedAI +{ + boss_svala_sorrowgraveAI(Creature *c) : ScriptedAI(c), summons(c) + { + pInstance = c->GetInstanceData(); + } + + uint32 uiSinsterStrikeTimer; + uint32 uiCallFlamesTimer; + uint32 uiRitualOfSwordTimer; + uint32 uiSacrificeTimer; + + CombatPhase Phase; + + SummonList summons; + + bool bSacrificed; + + ScriptedInstance* pInstance; + + void Reset() + { + uiSinsterStrikeTimer = 7*IN_MILISECONDS; + uiCallFlamesTimer = 10*IN_MILISECONDS; + uiRitualOfSwordTimer = 20*IN_MILISECONDS; + uiSacrificeTimer = 8*IN_MILISECONDS; + + bSacrificed = false; + + Phase = NORMAL; + + DoTeleportTo(296.632, -346.075, 90.6307); + me->SetUnitMovementFlags(MOVEMENTFLAG_WALK_MODE); + + summons.DespawnAll(); + + if (pInstance) + { + pInstance->SetData(DATA_SVALA_SORROWGRAVE_EVENT, NOT_STARTED); + pInstance->SetData64(DATA_SACRIFICED_PLAYER,0); + } + } + + void EnterCombat(Unit* /*who*/) + { + DoScriptText(SAY_AGGRO, me); + + if (pInstance) + pInstance->SetData(DATA_SVALA_SORROWGRAVE_EVENT, IN_PROGRESS); + } + + void JustSummoned(Creature *summon) + { + summons.Summon(summon); + } + + void SummonedCreatureDespawn(Creature *summon) + { + summons.Despawn(summon); + } + + void UpdateAI(const uint32 diff) + { + if (Phase == NORMAL) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + if (uiSinsterStrikeTimer <= diff) + { + DoCast(me->getVictim(), SPELL_SINSTER_STRIKE); + uiSinsterStrikeTimer = urand(5*IN_MILISECONDS,9*IN_MILISECONDS); + } else uiSinsterStrikeTimer -= diff; + + if (uiCallFlamesTimer <= diff) + { + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + { + DoCast(pTarget, SPELL_CALL_FLAMES); + uiCallFlamesTimer = urand(8*IN_MILISECONDS,12*IN_MILISECONDS); + } + } else uiCallFlamesTimer -= diff; + + if (!bSacrificed) + if (uiRitualOfSwordTimer <= diff) + { + if (Unit* pSacrificeTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + { + DoScriptText(RAND(SAY_SACRIFICE_PLAYER_1,SAY_SACRIFICE_PLAYER_2,SAY_SACRIFICE_PLAYER_3,SAY_SACRIFICE_PLAYER_4,SAY_SACRIFICE_PLAYER_5),me); + DoCast(pSacrificeTarget, SPELL_RITUAL_OF_THE_SWORD); + //Spell doesn't teleport + DoTeleportPlayer(pSacrificeTarget, 296.632, -346.075, 90.63, 4.6); + me->SetUnitMovementFlags(MOVEMENTFLAG_FLY_MODE); + DoTeleportTo(296.632, -346.075, 120.85); + Phase = SACRIFICING; + if (pInstance) + { + pInstance->SetData64(DATA_SACRIFICED_PLAYER,pSacrificeTarget->GetGUID()); + + for (uint8 i = 0; i < 3; ++i) + if (Creature* pSummon = me->SummonCreature(CREATURE_RITUAL_CHANNELER, RitualChannelerPos[i], TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 360000)) + pSummon->AI()->DoAction(0); + } + + bSacrificed = true; + } + } else uiRitualOfSwordTimer -= diff; + + DoMeleeAttackIfReady(); + } + else //SACRIFICING + { + if (uiSacrificeTimer <= diff) + { + Unit* pSacrificeTarget = pInstance ? Unit::GetUnit(*me, pInstance->GetData64(DATA_SACRIFICED_PLAYER)) : NULL; + if (pInstance && !summons.empty() && pSacrificeTarget && pSacrificeTarget->isAlive()) + me->Kill(pSacrificeTarget, false); // durability damage? + + //go down + Phase = NORMAL; + pSacrificeTarget = NULL; + me->SetUnitMovementFlags(MOVEMENTFLAG_WALK_MODE); + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + me->GetMotionMaster()->MoveChase(pTarget); + + uiSacrificeTimer = 8*IN_MILISECONDS; + } + else uiSacrificeTimer -= diff; + } + } + + void KilledUnit(Unit* /*pVictim*/) + { + DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); + } + + void JustDied(Unit* pKiller) + { + if (pInstance) + { + Creature* pSvala = Unit::GetCreature((*me), pInstance->GetData64(DATA_SVALA)); + if (pSvala && pSvala->isAlive()) + pKiller->Kill(pSvala); + + pInstance->SetData(DATA_SVALA_SORROWGRAVE_EVENT, DONE); + } + DoScriptText(SAY_DEATH, me); + } +}; + +CreatureAI* GetAI_boss_svala(Creature* pCreature) +{ + return new boss_svalaAI (pCreature); +} + +CreatureAI* GetAI_mob_ritual_channeler(Creature* pCreature) +{ + return new mob_ritual_channelerAI(pCreature); +} + +CreatureAI* GetAI_boss_svala_sorrowgrave(Creature* pCreature) +{ + return new boss_svala_sorrowgraveAI(pCreature); +} + +void AddSC_boss_svala() +{ + Script *newscript; + + newscript = new Script; + newscript->Name = "boss_svala"; + newscript->GetAI = &GetAI_boss_svala; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_ritual_channeler"; + newscript->GetAI = &GetAI_mob_ritual_channeler; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "boss_svala_sorrowgrave"; + newscript->GetAI = &GetAI_boss_svala_sorrowgrave; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp new file mode 100644 index 00000000000..1a650f94101 --- /dev/null +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp @@ -0,0 +1,367 @@ +/* Script Data Start +SDName: Boss ymiron +SDAuthor: LordVanMartin +SD%Complete: +SDComment: +SDCategory: +Script Data End */ + +/*** SQL START *** +update creature_template set scriptname = 'boss_ymiron' where entry = ''; +*** SQL END ***/ +#include "ScriptedPch.h" +#include "utgarde_pinnacle.h" + +enum Spells +{ + SPELL_BANE = 48294, + H_SPELL_BANE = 59301, + SPELL_DARK_SLASH = 48292, + SPELL_FETID_ROT = 48291, + H_SPELL_FETID_ROT = 59300, + SPELL_SCREAMS_OF_THE_DEAD = 51750, + SPELL_SPIRIT_BURST = 48529, + H_SPELL_SPIRIT_BURST = 59305, + SPELL_SPIRIT_STRIKE = 48423, + H_SPELL_SPIRIT_STRIKE = 59304, + SPELL_ANCESTORS_VENGEANCE = 16939, + + SPELL_SUMMON_AVENGING_SPIRIT = 48592, + SPELL_SUMMON_SPIRIT_FOUNT = 48386, + + SPELL_CHANNEL_SPIRIT_TO_YMIRON = 48316, + SPELL_CHANNEL_YMIRON_TO_SPIRIT = 48307, + + SPELL_SPIRIT_FOUNT = 48380, + H_SPELL_SPIRIT_FOUNT = 59320 +}; + +//not in db +enum Yells +{ + SAY_AGGRO = -1575028, + SAY_SLAY_1 = -1575029, + SAY_SLAY_2 = -1575030, + SAY_SLAY_3 = -1575031, + SAY_SLAY_4 = -1575032, + SAY_DEATH = -1575033, + SAY_SUMMON_BJORN = -1575034, + SAY_SUMMON_HALDOR = -1575035, + SAY_SUMMON_RANULF = -1575036, + SAY_SUMMON_TORGYN = -1575037 +}; + +enum Creatures +{ + CREATURE_BJORN = 27303, + CREATURE_BJORN_VISUAL = 27304, + CREATURE_HALDOR = 27307, + CREATURE_HALDOR_VISUAL = 27310, + CREATURE_RANULF = 27308, + CREATURE_RANULF_VISUAL = 27311, + CREATURE_TORGYN = 27309, + CREATURE_TORGYN_VISUAL = 27312, + CREATURE_SPIRIT_FOUNT = 27339, + CREATURE_AVENGING_SPIRIT = 27386 +}; + +struct ActiveBoatStruct +{ + uint32 npc; + int32 say; + float MoveX,MoveY,MoveZ,SpawnX,SpawnY,SpawnZ,SpawnO; +}; + +static ActiveBoatStruct ActiveBot[4] = +{ + {CREATURE_BJORN_VISUAL, SAY_SUMMON_BJORN, 404.379, -335.335, 104.756, 413.594, -335.408, 107.995, 3.157}, + {CREATURE_HALDOR_VISUAL, SAY_SUMMON_HALDOR, 380.813, -335.069, 104.756, 369.994, -334.771, 107.995, 6.232}, + {CREATURE_RANULF_VISUAL, SAY_SUMMON_RANULF, 381.546, -314.362, 104.756, 370.841, -314.426, 107.995, 6.232}, + {CREATURE_TORGYN_VISUAL, SAY_SUMMON_TORGYN, 404.310, -314.761, 104.756, 413.992, -314.703, 107.995, 3.157} +}; + +struct boss_ymironAI : public ScriptedAI +{ + boss_ymironAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + srand(time(NULL)); + for (int i = 0; i < 4; ++i) + m_uiActiveOrder[i] = i; + for (int i = 0; i < 3; ++i) + { + int r = i + (rand()%(4-i)); + int temp = m_uiActiveOrder[i]; + m_uiActiveOrder[i] = m_uiActiveOrder[r]; + m_uiActiveOrder[r] = temp; + } + } + + bool m_bIsWalking; + bool m_bIsPause; + bool m_bIsActiveWithBJORN; + bool m_bIsActiveWithHALDOR; + bool m_bIsActiveWithRANULF; + bool m_bIsActiveWithTORGYN; + + uint8 m_uiActiveOrder[4]; + uint8 m_uiActivedNumber; + + uint32 m_uiFetidRot_Timer; + uint32 m_uiBane_Timer; + uint32 m_uiDarkSlash_Timer; + uint32 m_uiAncestors_Vengeance_Timer; + + uint32 m_uiAbility_BJORN_Timer; + uint32 m_uiAbility_HALDOR_Timer; + uint32 m_uiAbility_RANULF_Timer; + uint32 m_uiAbility_TORGYN_Timer; + + uint32 m_uiPause_Timer; + uint32 m_uiHealthAmountModifier; + uint32 m_uiHealthAmountMultipler; + + uint64 m_uiActivedCreatureGUID; + uint64 m_uiOrbGUID; + + ScriptedInstance *pInstance; + + void Reset() + { + m_bIsPause = false; + m_bIsActiveWithBJORN = false; + m_bIsActiveWithHALDOR = false; + m_bIsActiveWithRANULF = false; + m_bIsActiveWithTORGYN = false; + + m_uiFetidRot_Timer = urand(8000,13000); + m_uiBane_Timer = urand(18000,23000); + m_uiDarkSlash_Timer = urand(28000,33000); + m_uiAncestors_Vengeance_Timer = DUNGEON_MODE(60000,45000); + m_uiPause_Timer = 0; + + m_uiAbility_BJORN_Timer = 0; + m_uiAbility_HALDOR_Timer = 0; + m_uiAbility_RANULF_Timer = 0; + m_uiAbility_TORGYN_Timer = 0; + + m_uiActivedNumber = 0; + m_uiHealthAmountModifier = 1; + m_uiHealthAmountMultipler = DUNGEON_MODE(20,25); + + DespawnBoatGhosts(m_uiActivedCreatureGUID); + DespawnBoatGhosts(m_uiOrbGUID); + + if (pInstance) + pInstance->SetData(DATA_KING_YMIRON_EVENT, NOT_STARTED); + } + + void EnterCombat(Unit* /*who*/) + { + DoScriptText(SAY_AGGRO, me); + + if (pInstance) + pInstance->SetData(DATA_KING_YMIRON_EVENT, IN_PROGRESS); + } + + void UpdateAI(const uint32 diff) + { + if (m_bIsWalking) + { + if (m_uiPause_Timer <= diff) + { + DoScriptText(ActiveBot[m_uiActiveOrder[m_uiActivedNumber]].say, me); + DoCast(me, SPELL_CHANNEL_YMIRON_TO_SPIRIT); // should be on spirit + if (Creature* pTemp = me->SummonCreature(ActiveBot[m_uiActiveOrder[m_uiActivedNumber]].npc, ActiveBot[m_uiActiveOrder[m_uiActivedNumber]].SpawnX, ActiveBot[m_uiActiveOrder[m_uiActivedNumber]].SpawnY, ActiveBot[m_uiActiveOrder[m_uiActivedNumber]].SpawnZ, ActiveBot[m_uiActiveOrder[m_uiActivedNumber]].SpawnO, TEMPSUMMON_CORPSE_DESPAWN, 0)) + { + m_uiActivedCreatureGUID = pTemp->GetGUID(); + pTemp->CastSpell(me, SPELL_CHANNEL_SPIRIT_TO_YMIRON, true); + pTemp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + pTemp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + pTemp->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); + switch(m_uiActiveOrder[m_uiActivedNumber]) + { + case 0: m_bIsActiveWithBJORN = true; break; + case 1: m_bIsActiveWithHALDOR = true; break; + case 2: m_bIsActiveWithRANULF = true; break; + case 3: m_bIsActiveWithTORGYN = true; break; + } + } + + m_bIsPause = true; + m_bIsWalking = false; + m_uiPause_Timer = 3000; + } else m_uiPause_Timer -= diff; + return; + } + else if (m_bIsPause) + { + if (m_uiPause_Timer <= diff) + { + m_uiAbility_BJORN_Timer = 5000; + m_uiAbility_HALDOR_Timer = 5000; + m_uiAbility_RANULF_Timer = 5000; + m_uiAbility_TORGYN_Timer = 5000; + + m_bIsPause = false; + m_uiPause_Timer = 0; + } else m_uiPause_Timer -= diff; + return; + } + + //Return since we have no target + if (!UpdateVictim()) + return; + + if (!m_bIsPause) + { + // Normal spells ------------------------------------------------------------------------ + if (m_uiBane_Timer <= diff) + { + DoCast(me, SPELL_BANE); + m_uiBane_Timer = urand(20000,25000); + } else m_uiBane_Timer -= diff; + + if (m_uiFetidRot_Timer <= diff) + { + DoCast(me->getVictim(), SPELL_FETID_ROT); + m_uiFetidRot_Timer = urand(10000,15000); + } else m_uiFetidRot_Timer -= diff; + + if (m_uiDarkSlash_Timer <= diff) + { + DoCast(me->getVictim(), SPELL_DARK_SLASH); + m_uiDarkSlash_Timer = urand(30000,35000); + } else m_uiDarkSlash_Timer -= diff; + + if (m_uiAncestors_Vengeance_Timer <= diff) + { + DoCast(me, SPELL_ANCESTORS_VENGEANCE); + m_uiAncestors_Vengeance_Timer = DUNGEON_MODE(urand(60000,65000),urand(45000,50000)); + } else m_uiAncestors_Vengeance_Timer -= diff; + + // Abilities ------------------------------------------------------------------------------ + if (m_bIsActiveWithBJORN && m_uiAbility_BJORN_Timer <= diff) + { + //DoCast(me, SPELL_SUMMON_SPIRIT_FOUNT); // works fine, but using summon has better control + if (Creature* pTemp = me->SummonCreature(CREATURE_SPIRIT_FOUNT, 385+rand()%10, -330+rand()%10, 104.756, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 180000)) + { + pTemp->SetSpeed(MOVE_RUN, 0.4f); + pTemp->CastSpell(pTemp, DUNGEON_MODE(SPELL_SPIRIT_FOUNT, H_SPELL_SPIRIT_FOUNT), true); + pTemp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + pTemp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + pTemp->SetDisplayId(11686); + //pTemp->GetMotionMaster()->MoveChase(me->getVictim()); + m_uiOrbGUID = pTemp->GetGUID(); + } + m_bIsActiveWithBJORN = false; // only one orb + } else m_uiAbility_BJORN_Timer -= diff; + + if (m_bIsActiveWithHALDOR && m_uiAbility_HALDOR_Timer <= diff) + { + DoCast(me->getVictim(), SPELL_SPIRIT_STRIKE); + m_uiAbility_HALDOR_Timer = 5000; // overtime + } else m_uiAbility_HALDOR_Timer -= diff; + + if (m_bIsActiveWithRANULF && m_uiAbility_RANULF_Timer <= diff) + { + DoCast(me, SPELL_SPIRIT_BURST); + m_uiAbility_RANULF_Timer = 10000; // overtime + } else m_uiAbility_RANULF_Timer -= diff; + + if (m_bIsActiveWithTORGYN && m_uiAbility_TORGYN_Timer <= diff) + { + float x,y,z; + x = me->GetPositionX()-5; + y = me->GetPositionY()-5; + z = me->GetPositionZ(); + for (uint8 i = 0; i < 4; ++i) + { + //DoCast(me, SPELL_SUMMON_AVENGING_SPIRIT); // works fine, but using summon has better control + if (Creature* pTemp = me->SummonCreature(CREATURE_AVENGING_SPIRIT, x+rand()%10, y+rand()%10, z, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000)) + { + if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + { + pTemp->AddThreat(pTarget, 0.0f); + pTemp->AI()->AttackStart(pTarget); + } + } + } + m_uiAbility_TORGYN_Timer = 15000; // overtime + } else m_uiAbility_TORGYN_Timer -= diff; + + // Health check ----------------------------------------------------------------------------- + if ((me->GetHealth()*100 / me->GetMaxHealth()) < (100-(m_uiHealthAmountMultipler * m_uiHealthAmountModifier))) + { + uint8 m_uiOrder = m_uiHealthAmountModifier - 1; + ++m_uiHealthAmountModifier; + + me->InterruptNonMeleeSpells(true); + DoCast(me, SPELL_SCREAMS_OF_THE_DEAD); + me->GetMotionMaster()->Clear(); + me->StopMoving(); + me->AttackStop(); + me->GetMotionMaster()->MovePoint(0, ActiveBot[m_uiActiveOrder[m_uiOrder]].MoveX, ActiveBot[m_uiActiveOrder[m_uiOrder]].MoveY, ActiveBot[m_uiActiveOrder[m_uiOrder]].MoveZ); + + DespawnBoatGhosts(m_uiActivedCreatureGUID); + DespawnBoatGhosts(m_uiOrbGUID); + + m_bIsActiveWithBJORN = false; + m_bIsActiveWithHALDOR = false; + m_bIsActiveWithRANULF = false; + m_bIsActiveWithTORGYN = false; + + m_uiBane_Timer += 8000; + m_uiFetidRot_Timer += 8000; + m_uiDarkSlash_Timer += 8000; + m_uiAncestors_Vengeance_Timer += 8000; + + m_uiActivedNumber = m_uiOrder; + m_bIsWalking = true; + m_uiPause_Timer = 2000; + return; + } + DoMeleeAttackIfReady(); + } + } + + void JustDied(Unit* /*killer*/) + { + DoScriptText(SAY_DEATH, me); + + DespawnBoatGhosts(m_uiActivedCreatureGUID); + DespawnBoatGhosts(m_uiOrbGUID); + + if (pInstance) + pInstance->SetData(DATA_KING_YMIRON_EVENT, DONE); + } + + void KilledUnit(Unit * /*victim*/) + { + DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3,SAY_SLAY_4), me); + } + + void DespawnBoatGhosts(uint64& m_uiCreatureGUID) + { + if (m_uiCreatureGUID) + if (Creature* pTemp = Unit::GetCreature(*me, m_uiCreatureGUID)) + pTemp->DisappearAndDie(); + + m_uiCreatureGUID = 0; + } +}; + +CreatureAI* GetAI_boss_ymiron(Creature* pCreature) +{ + return new boss_ymironAI(pCreature); +} + +void AddSC_boss_ymiron() +{ + Script *newscript; + + newscript = new Script; + newscript->Name = "boss_ymiron"; + newscript->GetAI = &GetAI_boss_ymiron; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp new file mode 100644 index 00000000000..cf042867707 --- /dev/null +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp @@ -0,0 +1,241 @@ +#include "ScriptedPch.h" +#include "utgarde_pinnacle.h" + +#define MAX_ENCOUNTER 4 + +/* Utgarde Pinnacle encounters: +0 - Svala Sorrowgrave +1 - Gortok Palehoof +2 - Skadi the Ruthless +3 - King Ymiron +*/ + +enum GameObjects +{ + ENTRY_SKADI_THE_RUTHLESS_DOOR = 192173, + ENTRY_KING_YMIRON_DOOR = 192174, + ENTRY_GORK_PALEHOOF_SPHERE = 188593 +}; + +struct instance_pinnacle : public ScriptedInstance +{ + instance_pinnacle(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; + + uint64 uiSvalaSorrowgrave; + uint64 uiGortokPalehoof; + uint64 uiSkadiTheRuthless; + uint64 uiKingYmiron; + + uint64 uiSkadiTheRuthlessDoor; + uint64 uiKingYmironDoor; + uint64 uiGortokPalehoofSphere; + + uint64 uiFrenziedWorgen; + uint64 uiRavenousFurbolg; + uint64 uiFerociousRhino; + uint64 uiMassiveJormungar; + uint64 uiPalehoofOrb; + + uint64 uiSvala; + uint64 uiSacrificedPlayer; + + uint32 m_auiEncounter[MAX_ENCOUNTER]; + + std::string str_data; + + void Initialize() + { + for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) + m_auiEncounter[i] = NOT_STARTED; + + uiSvalaSorrowgrave = 0; + uiGortokPalehoof = 0; + uiSkadiTheRuthless = 0; + uiKingYmiron = 0; + + uiSkadiTheRuthlessDoor = 0; + uiKingYmironDoor = 0; + uiGortokPalehoofSphere = 0; + + uiFrenziedWorgen = 0; + uiRavenousFurbolg = 0; + uiFerociousRhino = 0; + uiMassiveJormungar = 0; + uiPalehoofOrb = 0; + + uiSvala = 0; + uiSacrificedPlayer = 0; + } + + bool IsEncounterInProgress() const + { + for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) + if (m_auiEncounter[i] == IN_PROGRESS) return true; + + return false; + } + + void OnCreatureCreate(Creature* pCreature, bool /*add*/) + { + switch(pCreature->GetEntry()) + { + case BOSS_SVALA_SORROWGRAVE: uiSvalaSorrowgrave = pCreature->GetGUID(); break; + case BOSS_GORTOK_PALEHOOF: uiGortokPalehoof = pCreature->GetGUID(); break; + case BOSS_SKADI_RUTHLESS: uiSkadiTheRuthless = pCreature->GetGUID(); break; + case BOSS_KING_YMIRON: uiKingYmiron = pCreature->GetGUID(); break; + case MOB_FRENZIED_WORGEN: uiFrenziedWorgen = pCreature->GetGUID(); break; + case MOB_RAVENOUS_FURBOLG: uiRavenousFurbolg = pCreature->GetGUID(); break; + case MOB_MASSIVE_JORMUNGAR: uiMassiveJormungar = pCreature->GetGUID(); break; + case MOB_FEROCIOUS_RHINO: uiFerociousRhino = pCreature->GetGUID(); break; + case MOB_SVALA: uiSvala = pCreature->GetGUID(); break; + case MOB_PALEHOOF_ORB: uiPalehoofOrb = pCreature->GetGUID(); break; + } + } + + void OnGameObjectCreate(GameObject* pGo, bool /*add*/) + { + switch(pGo->GetEntry()) + { + case ENTRY_SKADI_THE_RUTHLESS_DOOR: + uiSkadiTheRuthlessDoor = pGo->GetGUID(); + if (m_auiEncounter[2] == DONE) HandleGameObject(NULL,true,pGo); + break; + case ENTRY_KING_YMIRON_DOOR: + uiKingYmironDoor = pGo->GetGUID(); + if (m_auiEncounter[3] == DONE) HandleGameObject(NULL,true,pGo); + break; + case ENTRY_GORK_PALEHOOF_SPHERE: + uiGortokPalehoofSphere = pGo->GetGUID(); + if (m_auiEncounter[1] == DONE) + { + HandleGameObject(NULL,true,pGo); + pGo->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); + } + break; + } + } + + void SetData(uint32 type, uint32 data) + { + switch(type) + { + case DATA_SVALA_SORROWGRAVE_EVENT: + m_auiEncounter[0] = data; + break; + case DATA_GORTOK_PALEHOOF_EVENT: + m_auiEncounter[1] = data; + break; + case DATA_SKADI_THE_RUTHLESS_EVENT: + if (data == DONE) + HandleGameObject(uiSkadiTheRuthlessDoor,true); + m_auiEncounter[2] = data; + break; + case DATA_KING_YMIRON_EVENT: + if (data == DONE) + HandleGameObject(uiKingYmironDoor,true); + m_auiEncounter[3] = data; + break; + } + + if (data == DONE) + SaveToDB(); + } + + void SetData64(uint32 type, uint64 data) + { + if (type == DATA_SACRIFICED_PLAYER) + uiSacrificedPlayer = data; + } + + uint32 GetData(uint32 type) + { + switch(type) + { + case DATA_SVALA_SORROWGRAVE_EVENT: return m_auiEncounter[0]; + case DATA_GORTOK_PALEHOOF_EVENT: return m_auiEncounter[1]; + case DATA_SKADI_THE_RUTHLESS_EVENT: return m_auiEncounter[2]; + case DATA_KING_YMIRON_EVENT: return m_auiEncounter[3]; + } + return 0; + } + + uint64 GetData64(uint32 identifier) + { + switch(identifier) + { + case DATA_SVALA_SORROWGRAVE: return uiSvalaSorrowgrave; + case DATA_GORTOK_PALEHOOF: return uiGortokPalehoof; + case DATA_SKADI_THE_RUTHLESS: return uiSkadiTheRuthless; + case DATA_KING_YMIRON: return uiKingYmiron; + case DATA_MOB_FRENZIED_WORGEN: return uiFrenziedWorgen; + case DATA_MOB_RAVENOUS_FURBOLG: return uiRavenousFurbolg; + case DATA_MOB_MASSIVE_JORMUNGAR: return uiMassiveJormungar; + case DATA_MOB_FEROCIOUS_RHINO: return uiFerociousRhino; + case DATA_MOB_ORB: return uiPalehoofOrb; + case DATA_SVALA: return uiSvala; + case DATA_GORTOK_PALEHOOF_SPHERE: return uiGortokPalehoofSphere; + } + + return 0; + } + + std::string GetSaveData() + { + OUT_SAVE_INST_DATA; + + std::ostringstream saveStream; + saveStream << "U P " << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " + << m_auiEncounter[2] << " " << m_auiEncounter[3]; + + str_data = saveStream.str(); + + OUT_SAVE_INST_DATA_COMPLETE; + return str_data; + } + + void Load(const char* in) + { + if (!in) + { + OUT_LOAD_INST_DATA_FAIL; + return; + } + + OUT_LOAD_INST_DATA(in); + + char dataHead1, dataHead2; + uint16 data0, data1, data2, data3; + + std::istringstream loadStream(in); + loadStream >> dataHead1 >> dataHead2 >> data0 >> data1 >> data2 >> data3; + + if (dataHead1 == 'U' && dataHead2 == 'P') + { + m_auiEncounter[0] = data0; + m_auiEncounter[1] = data1; + m_auiEncounter[2] = data2; + m_auiEncounter[3] = data3; + + for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) + if (m_auiEncounter[i] == IN_PROGRESS) + m_auiEncounter[i] = NOT_STARTED; + + } else OUT_LOAD_INST_DATA_FAIL; + + OUT_LOAD_INST_DATA_COMPLETE; + } +}; + +InstanceData* GetInstanceData_instance_utgarde_pinnacle(Map* pMap) +{ + return new instance_pinnacle(pMap); +} + +void AddSC_instance_utgarde_pinnacle() +{ + Script *newscript; + newscript = new Script; + newscript->Name = "instance_utgarde_pinnacle"; + newscript->GetInstanceData = &GetInstanceData_instance_utgarde_pinnacle; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h new file mode 100644 index 00000000000..a51d7aceda0 --- /dev/null +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h @@ -0,0 +1,42 @@ +#ifndef DEF_PINNACLE_H +#define DEF_PINNACLE_H + +enum Data +{ + DATA_SVALA_SORROWGRAVE_EVENT, + DATA_GORTOK_PALEHOOF_EVENT, + DATA_SKADI_THE_RUTHLESS_EVENT, + DATA_KING_YMIRON_EVENT +}; +enum Data64 +{ + DATA_SVALA, + DATA_SVALA_SORROWGRAVE, + DATA_GORTOK_PALEHOOF, + DATA_SKADI_THE_RUTHLESS, + DATA_MOB_GRAUF, + DATA_KING_YMIRON, + DATA_MOB_FRENZIED_WORGEN, + DATA_MOB_RAVENOUS_FURBOLG, + DATA_MOB_MASSIVE_JORMUNGAR, + DATA_MOB_FEROCIOUS_RHINO, + DATA_MOB_ORB, + DATA_GORTOK_PALEHOOF_SPHERE, + DATA_SACRIFICED_PLAYER +}; + +enum eCreatures +{ + BOSS_SVALA_SORROWGRAVE = 26668, + BOSS_GORTOK_PALEHOOF = 26687, + BOSS_SKADI_RUTHLESS = 26693, + BOSS_KING_YMIRON = 26861, + MOB_FRENZIED_WORGEN = 26683, + MOB_RAVENOUS_FURBOLG = 26684, + MOB_MASSIVE_JORMUNGAR = 26685, + MOB_FEROCIOUS_RHINO = 26686, + MOB_SVALA = 29281, + MOB_PALEHOOF_ORB = 26688, +}; + +#endif diff --git a/src/server/scripts/Northrend/UtgardeKeep/utgarde_keep/boss_ingvar_the_plunderer.cpp b/src/server/scripts/Northrend/UtgardeKeep/utgarde_keep/boss_ingvar_the_plunderer.cpp deleted file mode 100644 index 77f824c48d5..00000000000 --- a/src/server/scripts/Northrend/UtgardeKeep/utgarde_keep/boss_ingvar_the_plunderer.cpp +++ /dev/null @@ -1,442 +0,0 @@ -/* - * Copyright (C) 2009 Trinity - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: Boss_Ingvar_The_Plunderer -SD%Complete: 95 -SDComment: Some Problems with Annhylde Movement, Blizzlike Timers -SDCategory: Udgarde Keep -EndScriptData */ - -#include "ScriptedPch.h" -#include "utgarde_keep.h" - -enum Yells -{ - //Yells Ingvar - YELL_AGGRO_1 = -1574005, - YELL_AGGRO_2 = -1574006, - - YELL_DEAD_1 = -1574007, - YELL_DEAD_2 = -1574008, - - YELL_KILL_1 = -1574009, - YELL_KILL_2 = -1574010, -}; - -enum Creatures -{ - MOB_INGVAR_HUMAN = 23954, - MOB_ANNHYLDE_THE_CALLER = 24068, - MOB_INGVAR_UNDEAD = 23980, -}; - -enum Spells -{ - //Ingvar Spells human form - SPELL_CLEAVE = 42724, - SPELL_SMASH = 42669, - H_SPELL_SMASH = 59706, - SPELL_STAGGERING_ROAR = 42708, - H_SPELL_STAGGERING_ROAR = 59708, - SPELL_ENRAGE = 42705, - H_SPELL_ENRAGE = 59707, - - SPELL_INGVAR_FEIGN_DEATH = 42795, - SPELL_SUMMON_BANSHEE = 42912, - SPELL_SCOURG_RESURRECTION = 42863, // Spawn resurrect effect around Ingvar - - //Ingvar Spells undead form - SPELL_DARK_SMASH = 42723, - SPELL_DREADFUL_ROAR = 42729, - H_SPELL_DREADFUL_ROAR = 59734, - SPELL_WOE_STRIKE = 42730, - H_SPELL_WOE_STRIKE = 59735, - - ENTRY_THROW_TARGET = 23996, - SPELL_SHADOW_AXE_SUMMON = 42749 -}; - -struct boss_ingvar_the_plundererAI : public ScriptedAI -{ - boss_ingvar_the_plundererAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - } - - ScriptedInstance* pInstance; - - bool bIsUndead; - bool bEventInProgress; - - uint32 uiCleaveTimer; - uint32 uiSmashTimer; - uint32 uiEnrageTimer; - uint32 uiRoarTimer; - uint32 uiSpawnResTimer; - - void Reset() - { - if (bIsUndead) - me->UpdateEntry(MOB_INGVAR_HUMAN); - - bIsUndead = false; - bEventInProgress = false; - - me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); - me->SetStandState(UNIT_STAND_STATE_STAND); - - uiCleaveTimer = 2000; - uiSmashTimer = 5000; - uiEnrageTimer = 10000; - uiRoarTimer = 15000; - - uiSpawnResTimer = 3000; - - if (pInstance) - pInstance->SetData(DATA_INGVAR_EVENT, NOT_STARTED); - } - - void DamageTaken(Unit * /*done_by*/, uint32 &damage) - { - if (damage >= me->GetHealth() && !bIsUndead) - { - //DoCast(me, SPELL_INGVAR_FEIGN_DEATH, true); // Dont work ??? - // visuel hack - me->SetHealth(0); - me->InterruptNonMeleeSpells(true); - me->RemoveAllAuras(); - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); - me->GetMotionMaster()->MovementExpired(false); - me->GetMotionMaster()->MoveIdle(); - me->SetStandState(UNIT_STAND_STATE_DEAD); - // visuel hack end - - bEventInProgress = true; - bIsUndead = true; - - DoScriptText(YELL_DEAD_1,me); - } - - if (bEventInProgress) - { - damage = 0; - } - } - - void StartZombiePhase() - { - bIsUndead = true; - bEventInProgress = false; - me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); - me->UpdateEntry(MOB_INGVAR_UNDEAD); - me->SetInCombatWith(me->getVictim()); - me->GetMotionMaster()->MoveChase(me->getVictim()); - - DoScriptText(YELL_AGGRO_2,me); - } - - void EnterCombat(Unit * /*who*/) - { - DoScriptText(YELL_AGGRO_1,me); - - if (pInstance) - pInstance->SetData(DATA_INGVAR_EVENT, IN_PROGRESS); - } - - void JustDied(Unit* /*killer*/) - { - DoScriptText(YELL_DEAD_2,me); - - if (pInstance) - pInstance->SetData(DATA_INGVAR_EVENT, DONE); - } - - void KilledUnit(Unit * /*victim*/) - { - if (bIsUndead) - DoScriptText(YELL_KILL_1,me); - else - DoScriptText(YELL_KILL_2,me); - } - - void UpdateAI(const uint32 diff) - { - if (!UpdateVictim()) - return; - - if (bEventInProgress) - { - if (uiSpawnResTimer) - if (uiSpawnResTimer <= diff) - { - DoCast(me, SPELL_SUMMON_BANSHEE); // Summons directly on caster position - // DoCast(me, SPELL_SCOURG_RESURRECTION, true); // Not needed ? - uiSpawnResTimer = 0; - } else uiSpawnResTimer -= diff; - - return; - } - - if (uiCleaveTimer <= diff) - { - if (!me->hasUnitState(UNIT_STAT_CASTING)) - { - if (bIsUndead) - DoCast(me->getVictim(), SPELL_WOE_STRIKE); - else - DoCast(me->getVictim(), SPELL_CLEAVE); - uiCleaveTimer = rand()%5000 + 2000; - } - } else uiCleaveTimer -= diff; - - if (uiSmashTimer <= diff) - { - if (!me->hasUnitState(UNIT_STAT_CASTING)) - { - if (bIsUndead) - DoCast(me->getVictim(), SPELL_DARK_SMASH); - else - DoCast(me->getVictim(), SPELL_SMASH); - uiSmashTimer = 10000; - } - } else uiSmashTimer -= diff; - - if (!bIsUndead) - { - if (uiEnrageTimer <= diff) - { - DoCast(me, SPELL_ENRAGE); - uiEnrageTimer = 10000; - } else uiEnrageTimer -= diff; - } else // In Undead form used to summon weapon - { - if (uiEnrageTimer <= diff) - { - if (!me->hasUnitState(UNIT_STAT_CASTING)) - { - // Spawn target for Axe - Unit *pTarget = SelectUnit(SELECT_TARGET_TOPAGGRO, 1); - if (pTarget) - { - me->SummonCreature(ENTRY_THROW_TARGET,pTarget->GetPositionX(),pTarget->GetPositionY(),pTarget->GetPositionZ(),0,TEMPSUMMON_TIMED_DESPAWN,2000); - - DoCast(me, SPELL_SHADOW_AXE_SUMMON); - } - uiEnrageTimer = 30000; - } - } else uiEnrageTimer -= diff; - } - - if (uiRoarTimer <= diff) - { - if (!me->hasUnitState(UNIT_STAT_CASTING)) - { - if (bIsUndead) - DoCast(me, SPELL_DREADFUL_ROAR); - else - DoCast(me, SPELL_STAGGERING_ROAR); - uiRoarTimer = 10000; - } - } else uiRoarTimer -= diff; - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_boss_ingvar_the_plunderer(Creature* pCreature) -{ - return new boss_ingvar_the_plundererAI(pCreature); -} - -enum eSpells -{ -//we don't have that text in db so comment it until we get this text -// YELL_RESSURECT = -1574025, - -//Spells for Annhylde - SPELL_SCOURG_RESURRECTION_HEAL = 42704, //Heal Max + DummyAura - SPELL_SCOURG_RESURRECTION_BEAM = 42857, //Channeling Beam of Annhylde - SPELL_SCOURG_RESURRECTION_DUMMY = 42862, //Some Emote Dummy? - SPELL_INGVAR_TRANSFORM = 42796 -}; - -struct mob_annhylde_the_callerAI : public ScriptedAI -{ - mob_annhylde_the_callerAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - } - - float x,y,z; - ScriptedInstance* pInstance; - uint32 uiResurectTimer; - uint32 uiResurectPhase; - - void Reset() - { - me->AddUnitMovementFlag(MOVEMENTFLAG_FLYING | MOVEMENTFLAG_HOVER); - me->SetSpeed(MOVE_SWIM , 1.0f); - me->SetSpeed(MOVE_RUN , 1.0f); - me->SetSpeed(MOVE_WALK , 1.0f); - //me->SetSpeed(MOVE_FLIGHT , 1.0f); - - me->GetPosition(x,y,z); - DoTeleportTo(x+1,y,z+30); - - Unit* ingvar = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_INGVAR) : 0); - if (ingvar) - { - me->GetMotionMaster()->MovePoint(1,x,y,z+15); - -// DoScriptText(YELL_RESSURECT,me); - } - } - - void MovementInform(uint32 type, uint32 id) - { - if (type != POINT_MOTION_TYPE) - return; - Unit* ingvar = Unit::GetUnit((*me), pInstance ? pInstance->GetData64(DATA_INGVAR) : 0); - if (ingvar) - { - switch (id) - { - case 1: - ingvar->RemoveAura(SPELL_SUMMON_BANSHEE); - ingvar->CastSpell(ingvar,SPELL_SCOURG_RESURRECTION_DUMMY,true); - DoCast(ingvar, SPELL_SCOURG_RESURRECTION_BEAM); - uiResurectTimer = 8000; - uiResurectPhase = 1; - break; - case 2: - me->SetVisibility(VISIBILITY_OFF); - me->DealDamage(me,me->GetHealth()); - me->RemoveCorpse(); - break; - } - } - } - - void AttackStart(Unit* /*who*/) {} - void MoveInLineOfSight(Unit* /*who*/) {} - void EnterCombat(Unit * /*who*/) {} - void UpdateAI(const uint32 diff) - { - if (uiResurectTimer) - if (uiResurectTimer <= diff) - { - if (uiResurectPhase == 1) - { - Unit* ingvar = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_INGVAR) : 0); - if (ingvar) - { - ingvar->SetStandState(UNIT_STAND_STATE_STAND); - ingvar->CastSpell(ingvar,SPELL_SCOURG_RESURRECTION_HEAL,false); - } - uiResurectTimer = 3000; - uiResurectPhase = 2; - } - else if (uiResurectPhase == 2) - { - if (Creature* ingvar = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_INGVAR) : 0)) - { - ingvar->RemoveAurasDueToSpell(SPELL_SCOURG_RESURRECTION_DUMMY); - - if (boss_ingvar_the_plundererAI* pAI = CAST_AI(boss_ingvar_the_plundererAI, ingvar->AI())) - pAI->StartZombiePhase(); - - me->GetMotionMaster()->MovePoint(2,x+1,y,z+30); - ++uiResurectPhase; - uiResurectTimer = 0; - } - } - - } else uiResurectTimer -= diff; - } -}; - -CreatureAI* GetAI_mob_annhylde_the_caller(Creature* pCreature) -{ - return new mob_annhylde_the_callerAI (pCreature); -} - -enum eShadowAxe -{ - SPELL_SHADOW_AXE_DAMAGE = 42750, - H_SPELL_SHADOW_AXE_DAMAGE = 59719 -}; - -struct mob_ingvar_throw_dummyAI : public ScriptedAI -{ - mob_ingvar_throw_dummyAI(Creature *c) : ScriptedAI(c) - { - } - - uint32 uiDespawnTimer; - - void Reset() - { - Unit *pTarget = me->FindNearestCreature(ENTRY_THROW_TARGET,50); - if (pTarget) - { - DoCast(me, SPELL_SHADOW_AXE_DAMAGE); - float x,y,z; - pTarget->GetPosition(x,y,z); - me->GetMotionMaster()->MovePoint(0,x,y,z); - } - uiDespawnTimer = 7000; - } - void AttackStart(Unit* /*who*/) {} - void MoveInLineOfSight(Unit* /*who*/) {} - void EnterCombat(Unit * /*who*/) {} - void UpdateAI(const uint32 diff) - { - if (uiDespawnTimer <= diff) - { - me->DealDamage(me,me->GetHealth()); - me->RemoveCorpse(); - uiDespawnTimer = 0; - } else uiDespawnTimer -= diff; - } -}; - -CreatureAI* GetAI_mob_ingvar_throw_dummy(Creature* pCreature) -{ - return new mob_ingvar_throw_dummyAI (pCreature); -} - -void AddSC_boss_ingvar_the_plunderer() -{ - Script *newscript; - - newscript = new Script; - newscript->Name = "boss_ingvar_the_plunderer"; - newscript->GetAI = &GetAI_boss_ingvar_the_plunderer; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_annhylde_the_caller"; - newscript->GetAI = &GetAI_mob_annhylde_the_caller; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_ingvar_throw_dummy"; - newscript->GetAI = &GetAI_mob_ingvar_throw_dummy; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Northrend/UtgardeKeep/utgarde_keep/boss_keleseth.cpp b/src/server/scripts/Northrend/UtgardeKeep/utgarde_keep/boss_keleseth.cpp deleted file mode 100644 index d69f0eee846..00000000000 --- a/src/server/scripts/Northrend/UtgardeKeep/utgarde_keep/boss_keleseth.cpp +++ /dev/null @@ -1,361 +0,0 @@ -/* - * Copyright (C) 2009 Trinity - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: Boss_Prince_Keleseth -SD%Complete: 90 -SDComment: Needs Prince Movements, Needs adjustments to blizzlike timers, Needs Shadowbolt castbar, Needs right Ressurect Visual, Needs Some Heroic Spells -SDCategory: Utgarde Keep -EndScriptData */ - -#include "ScriptedPch.h" -#include "utgarde_keep.h" - -enum eEnums -{ - ACHIEVEMENT_ON_THE_ROCKS = 1919, - - SPELL_SHADOWBOLT = 43667, - SPELL_SHADOWBOLT_HEROIC = 59389, - SPELL_FROST_TOMB = 48400, - SPELL_FROST_TOMB_SUMMON = 42714, - SPELL_DECREPIFY = 42702, - SPELL_SCOURGE_RESSURRECTION = 42704, - CREATURE_FROSTTOMB = 23965, - CREATURE_SKELETON = 23970, - - SAY_AGGRO = -1574000, - SAY_FROST_TOMB = -1574001, - SAY_SKELETONS = -1574002, - SAY_KILL = -1574003, - SAY_DEATH = -1574004 -}; - -#define SKELETONSPAWN_Z 42.8668 - -float SkeletonSpawnPoint[5][5]= -{ - {156.2559, 259.2093}, - {156.2559, 259.2093}, - {156.2559, 259.2093}, - {156.2559, 259.2093}, - {156.2559, 259.2093}, -}; - -float AttackLoc[3]={197.636, 194.046, 40.8164}; - -bool ShatterFrostTomb; // needed for achievement: On The Rocks(1919) - -struct mob_frost_tombAI : public ScriptedAI -{ - mob_frost_tombAI(Creature *c) : ScriptedAI(c) - { - FrostTombGUID = 0; - } - - uint64 FrostTombGUID; - - void SetPrisoner(Unit* uPrisoner) - { - FrostTombGUID = uPrisoner->GetGUID(); - } - - void Reset(){ FrostTombGUID = 0; } - void EnterCombat(Unit* /*who*/) {} - void AttackStart(Unit* /*who*/) {} - void MoveInLineOfSight(Unit* /*who*/) {} - - void JustDied(Unit *killer) - { - if (killer->GetGUID() != me->GetGUID()) - ShatterFrostTomb = true; - - if (FrostTombGUID) - { - Unit* FrostTomb = Unit::GetUnit((*me),FrostTombGUID); - if (FrostTomb) - FrostTomb->RemoveAurasDueToSpell(SPELL_FROST_TOMB); - } - } - - void UpdateAI(const uint32 /*diff*/) - { - Unit* temp = Unit::GetUnit((*me),FrostTombGUID); - if ((temp && temp->isAlive() && !temp->HasAura(SPELL_FROST_TOMB)) || !temp) - me->DealDamage(me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); - } -}; - -struct boss_kelesethAI : public ScriptedAI -{ - boss_kelesethAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - } - - ScriptedInstance* pInstance; - - uint32 FrostTombTimer; - uint32 SummonSkeletonsTimer; - uint32 RespawnSkeletonsTimer; - uint32 ShadowboltTimer; - uint64 SkeletonGUID[5]; - bool Skeletons; - bool RespawnSkeletons; - - void Reset() - { - ShadowboltTimer = 0; - Skeletons = false; - - ShatterFrostTomb = false; - - ResetTimer(); - - if (pInstance) - pInstance->SetData(DATA_PRINCEKELESETH_EVENT, NOT_STARTED); - } - - void KilledUnit(Unit * victim) - { - if (victim == me) - return; - - DoScriptText(SAY_KILL, me); - } - - void JustDied(Unit* /*killer*/) - { - DoScriptText(SAY_DEATH, me); - - if (IsHeroic() && !ShatterFrostTomb) - { - AchievementEntry const *AchievOnTheRocks = GetAchievementStore()->LookupEntry(ACHIEVEMENT_ON_THE_ROCKS); - if (AchievOnTheRocks) - { - Map* pMap = me->GetMap(); - if (pMap && pMap->IsDungeon()) - { - Map::PlayerList const &players = pMap->GetPlayers(); - for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) - itr->getSource()->CompletedAchievement(AchievOnTheRocks); - } - } - } - - if (pInstance) - pInstance->SetData(DATA_PRINCEKELESETH_EVENT, DONE); - } - - void EnterCombat(Unit* /*who*/) - { - DoScriptText(SAY_AGGRO, me); - DoZoneInCombat(); - - if (pInstance) - pInstance->SetData(DATA_PRINCEKELESETH_EVENT, IN_PROGRESS); - } - - void ResetTimer(uint32 inc = 0) - { - SummonSkeletonsTimer = 5000 + inc; - FrostTombTimer = 28000 + inc; - } - - void UpdateAI(const uint32 diff) - { - if (!UpdateVictim()) - return; - - if (ShadowboltTimer <= diff) - { - Unit *pTarget = SelectUnit(SELECT_TARGET_TOPAGGRO, 0); - if (pTarget && pTarget->isAlive() && pTarget->GetTypeId() == TYPEID_PLAYER) - me->CastSpell(pTarget, DUNGEON_MODE(SPELL_SHADOWBOLT, SPELL_SHADOWBOLT_HEROIC), true); - ShadowboltTimer = 10000; - } else ShadowboltTimer -= diff; - - if (!Skeletons) - if ((SummonSkeletonsTimer <= diff)) - { - Creature* Skeleton; - DoScriptText(SAY_SKELETONS, me); - for (uint8 i = 0; i < 5; ++i) - { - Skeleton = me->SummonCreature(CREATURE_SKELETON, SkeletonSpawnPoint[i][0], SkeletonSpawnPoint[i][1] , SKELETONSPAWN_Z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000); - if (Skeleton) - { - Skeleton->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE); - Skeleton->GetMotionMaster()->MovePoint(0, me->GetPositionX(), me->GetPositionY() , me->GetPositionZ()); - Skeleton->AddThreat(me->getVictim(), 0.0f); - DoZoneInCombat(Skeleton); - } - } - Skeletons = true; - } else SummonSkeletonsTimer -= diff; - - if (FrostTombTimer <= diff) - { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - if (pTarget->isAlive()) - { - //DoCast(pTarget, SPELL_FROST_TOMB_SUMMON, true); - if (Creature *pChains = me->SummonCreature(CREATURE_FROSTTOMB, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 20000)) - { - CAST_AI(mob_frost_tombAI, pChains->AI())->SetPrisoner(pTarget); - pChains->CastSpell(pTarget, SPELL_FROST_TOMB, true); - - DoScriptText(SAY_FROST_TOMB, me); - } - } - FrostTombTimer = 15000; - } else FrostTombTimer -= diff; - - DoMeleeAttackIfReady(); - } -}; - -struct mob_vrykul_skeletonAI : public ScriptedAI -{ - mob_vrykul_skeletonAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - } - - ScriptedInstance *pInstance; - uint32 Respawn_Time; - uint64 Target_Guid; - uint32 Decrepify_Timer; - - bool isDead; - - void Reset() - { - Respawn_Time = 12000; - Decrepify_Timer = urand(10000,20000); - isDead = false; - } - - void EnterCombat(Unit * /*who*/){} - void DamageTaken(Unit *done_by, uint32 &damage) - { - if (done_by->GetGUID() == me->GetGUID()) - return; - - if (damage >= me->GetHealth()) - { - PretendToDie(); - damage = 0; - } - } - - void PretendToDie() - { - isDead = true; - me->InterruptNonMeleeSpells(true); - me->RemoveAllAuras(); - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - me->GetMotionMaster()->MovementExpired(false); - me->GetMotionMaster()->MoveIdle(); - me->SetStandState(UNIT_STAND_STATE_DEAD); - }; - - void Resurrect() - { - isDead = false; - me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - me->SetStandState(UNIT_STAND_STATE_STAND); - DoCast(me, SPELL_SCOURGE_RESSURRECTION, true); - - if (me->getVictim()) - { - me->GetMotionMaster()->MoveChase(me->getVictim()); - me->AI()->AttackStart(me->getVictim()); - } - else - me->GetMotionMaster()->Initialize(); - }; - - void UpdateAI(const uint32 diff) - { - if (pInstance && pInstance->GetData(DATA_PRINCEKELESETH_EVENT) == IN_PROGRESS) - { - if (isDead) - { - if (Respawn_Time <= diff) - { - Resurrect(); - Respawn_Time = 12000; - } else Respawn_Time -= diff; - } - else - { - if (!UpdateVictim()) - return; - - if (Decrepify_Timer <= diff) - { - DoCast(me->getVictim(), SPELL_DECREPIFY); - Decrepify_Timer = 30000; - } else Decrepify_Timer -= diff; - - DoMeleeAttackIfReady(); - } - }else - { - if (me->isAlive()) - me->DealDamage(me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); - } - - } -}; - -CreatureAI* GetAI_mob_frost_tomb(Creature* pCreature) -{ - return new mob_frost_tombAI(pCreature); -} - -CreatureAI* GetAI_boss_keleseth(Creature* pCreature) -{ - return new boss_kelesethAI (pCreature); -} - -CreatureAI* GetAI_mob_vrykul_skeleton(Creature* pCreature) -{ - return new mob_vrykul_skeletonAI (pCreature); -} - -void AddSC_boss_keleseth() -{ - Script *newscript; - - newscript = new Script; - newscript->Name = "boss_keleseth"; - newscript->GetAI = &GetAI_boss_keleseth; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_frost_tomb"; - newscript->GetAI = &GetAI_mob_frost_tomb; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_vrykul_skeleton"; - newscript->GetAI = &GetAI_mob_vrykul_skeleton; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Northrend/UtgardeKeep/utgarde_keep/boss_skarvald_dalronn.cpp b/src/server/scripts/Northrend/UtgardeKeep/utgarde_keep/boss_skarvald_dalronn.cpp deleted file mode 100644 index 2146d37635b..00000000000 --- a/src/server/scripts/Northrend/UtgardeKeep/utgarde_keep/boss_skarvald_dalronn.cpp +++ /dev/null @@ -1,389 +0,0 @@ -/* - * Copyright (C) 2009 Trinity - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: Boss_Skarvald_Dalronn -SD%Complete: 95 -SDComment: Needs adjustments to blizzlike timers, Yell Text + Sound to DB -SDCategory: Utgarde Keep -EndScriptData */ - -#include "ScriptedPch.h" -#include "utgarde_keep.h" - -enum eEnums -{ - //signed for 24200, but used by 24200,27390 - YELL_SKARVALD_AGGRO = -1574011, - YELL_SKARVALD_DAL_DIED = -1574012, - YELL_SKARVALD_SKA_DIEDFIRST = -1574013, - YELL_SKARVALD_KILL = -1574014, - YELL_SKARVALD_DAL_DIEDFIRST = -1574015, - - //signed for 24201, but used by 24201,27389 - YELL_DALRONN_AGGRO = -1574016, - YELL_DALRONN_SKA_DIED = -1574017, - YELL_DALRONN_DAL_DIEDFIRST = -1574018, - YELL_DALRONN_KILL = -1574019, - YELL_DALRONN_SKA_DIEDFIRST = -1574020, - -//Spells of Skarvald and his Ghost - MOB_SKARVALD_THE_CONSTRUCTOR = 24200, - SPELL_CHARGE = 43651, - SPELL_STONE_STRIKE = 48583, - SPELL_SUMMON_SKARVALD_GHOST = 48613, - MOB_SKARVALD_GHOST = 27390, -//Spells of Dalronn and his Ghost - MOB_DALRONN_THE_CONTROLLER = 24201, - SPELL_SHADOW_BOLT = 43649, - H_SPELL_SHADOW_BOLT = 59575, - H_SPELL_SUMMON_SKELETONS = 52611, - SPELL_DEBILITATE = 43650, - SPELL_SUMMON_DALRONN_GHOST = 48612, - MOB_DALRONN_GHOST = 27389 -}; - -struct boss_skarvald_the_constructorAI : public ScriptedAI -{ - boss_skarvald_the_constructorAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - } - - ScriptedInstance* pInstance; - - bool ghost; - uint32 Charge_Timer; - uint32 StoneStrike_Timer; - uint32 Response_Timer; - uint32 Check_Timer; - bool Dalronn_isDead; - - void Reset() - { - Charge_Timer = 5000; - StoneStrike_Timer = 10000; - Dalronn_isDead = false; - Check_Timer = 5000; - - ghost = (me->GetEntry() == MOB_SKARVALD_GHOST); - if (!ghost && pInstance) - { - Unit* dalronn = Unit::GetUnit((*me),pInstance->GetData64(DATA_DALRONN)); - if (dalronn && dalronn->isDead()) - CAST_CRE(dalronn)->Respawn(); - - pInstance->SetData(DATA_SKARVALD_DALRONN_EVENT, NOT_STARTED); - } - } - - void EnterCombat(Unit * who) - { - if (!ghost && pInstance) - { - DoScriptText(YELL_SKARVALD_AGGRO,me); - - Unit* dalronn = Unit::GetUnit((*me),pInstance->GetData64(DATA_DALRONN)); - if (dalronn && dalronn->isAlive() && !dalronn->getVictim()) - dalronn->getThreatManager().addThreat(who,0.0f); - - pInstance->SetData(DATA_SKARVALD_DALRONN_EVENT, IN_PROGRESS); - } - } - - void JustDied(Unit* Killer) - { - if (!ghost && pInstance) - { - Unit* dalronn = Unit::GetUnit((*me),pInstance->GetData64(DATA_DALRONN)); - if (dalronn) - { - if (dalronn->isDead()) - { - DoScriptText(YELL_SKARVALD_DAL_DIED,me); - - pInstance->SetData(DATA_SKARVALD_DALRONN_EVENT, DONE); - } - else - { - DoScriptText(YELL_SKARVALD_SKA_DIEDFIRST,me); - - me->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); - //DoCast(me, SPELL_SUMMON_SKARVALD_GHOST, true); - Creature* temp = me->SummonCreature(MOB_SKARVALD_GHOST,me->GetPositionX(),me->GetPositionY(),me->GetPositionZ(),0,TEMPSUMMON_CORPSE_DESPAWN,5000); - if (temp) - { - temp->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE); - temp->AI()->AttackStart(Killer); - } - } - } - } - } - - void KilledUnit(Unit * /*victim*/) - { - if (!ghost) - { - DoScriptText(YELL_SKARVALD_KILL,me); - } - } - - void UpdateAI(const uint32 diff) - { - if (ghost) - { - if (pInstance && pInstance->GetData(DATA_SKARVALD_DALRONN_EVENT) != IN_PROGRESS) - me->DealDamage(me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); - } - - if (!UpdateVictim()) - return; - - if (!ghost) - { - if (Check_Timer) - if (Check_Timer <= diff) - { - Check_Timer = 5000; - Unit* dalronn = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_DALRONN) : 0); - if (dalronn && dalronn->isDead()) - { - Dalronn_isDead = true; - Response_Timer = 2000; - Check_Timer = 0; - } - } else Check_Timer -= diff; - - if (Response_Timer) - if (Dalronn_isDead) - if (Response_Timer <= diff) - { - DoScriptText(YELL_SKARVALD_DAL_DIEDFIRST,me); - - Response_Timer = 0; - } else Response_Timer -= diff; - } - - if (Charge_Timer <= diff) - { - DoCast(SelectUnit(SELECT_TARGET_RANDOM, 1), SPELL_CHARGE); - Charge_Timer = 5000+rand()%5000; - } else Charge_Timer -= diff; - - if (StoneStrike_Timer <= diff) - { - DoCast(me->getVictim(), SPELL_STONE_STRIKE); - StoneStrike_Timer = 5000+rand()%5000; - } else StoneStrike_Timer -= diff; - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_boss_skarvald_the_constructor(Creature* pCreature) -{ - return new boss_skarvald_the_constructorAI (pCreature); -} - -struct boss_dalronn_the_controllerAI : public ScriptedAI -{ - boss_dalronn_the_controllerAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - } - - ScriptedInstance* pInstance; - - bool ghost; - uint32 ShadowBolt_Timer; - uint32 Debilitate_Timer; - uint32 Summon_Timer; - - uint32 Response_Timer; - uint32 Check_Timer; - uint32 AggroYell_Timer; - bool Skarvald_isDead; - - void Reset() - { - ShadowBolt_Timer = 1000; - Debilitate_Timer = 5000; - Summon_Timer = 10000; - Check_Timer = 5000; - Skarvald_isDead = false; - AggroYell_Timer = 0; - - ghost = me->GetEntry() == MOB_DALRONN_GHOST; - if (!ghost && pInstance) - { - Unit* skarvald = Unit::GetUnit((*me),pInstance->GetData64(DATA_SKARVALD)); - if (skarvald && skarvald->isDead()) - CAST_CRE(skarvald)->Respawn(); - - pInstance->SetData(DATA_SKARVALD_DALRONN_EVENT, NOT_STARTED); - } - } - - void EnterCombat(Unit * who) - { - if (!ghost && pInstance) - { - Unit* skarvald = Unit::GetUnit((*me),pInstance->GetData64(DATA_SKARVALD)); - if (skarvald && skarvald->isAlive() && !skarvald->getVictim()) - skarvald->getThreatManager().addThreat(who,0.0f); - - AggroYell_Timer = 5000; - - if (pInstance) - pInstance->SetData(DATA_SKARVALD_DALRONN_EVENT, IN_PROGRESS); - } - } - - void JustDied(Unit* Killer) - { - if (!ghost && pInstance) - { - Unit* skarvald = Unit::GetUnit((*me),pInstance->GetData64(DATA_SKARVALD)); - if (skarvald) - if (skarvald->isDead()) - { - DoScriptText(YELL_DALRONN_SKA_DIED,me); - - if (pInstance) - pInstance->SetData(DATA_SKARVALD_DALRONN_EVENT, DONE); - } - else - { - DoScriptText(YELL_DALRONN_DAL_DIEDFIRST,me); - - me->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); - //DoCast(me, SPELL_SUMMON_DALRONN_GHOST, true); - Creature* temp = me->SummonCreature(MOB_DALRONN_GHOST,me->GetPositionX(),me->GetPositionY(),me->GetPositionZ(),0,TEMPSUMMON_CORPSE_DESPAWN,5000); - if (temp) - { - temp->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE); - temp->AI()->AttackStart(Killer); - } - } - } - } - - void KilledUnit(Unit * /*victim*/) - { - if (!ghost) - { - DoScriptText(YELL_DALRONN_KILL,me); - } - } - - void UpdateAI(const uint32 diff) - { - if (ghost) - { - if (pInstance && pInstance->GetData(DATA_SKARVALD_DALRONN_EVENT) != IN_PROGRESS) - me->DealDamage(me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); - } - - if (!UpdateVictim()) - return; - - if (AggroYell_Timer) - if (AggroYell_Timer <= diff) - { - DoScriptText(YELL_DALRONN_AGGRO,me); - - AggroYell_Timer = 0; - } else AggroYell_Timer -= diff; - - if (!ghost) - { - if (Check_Timer) - if (Check_Timer <= diff) - { - Check_Timer = 5000; - Unit* skarvald = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_SKARVALD) : 0); - if (skarvald && skarvald->isDead()) - { - Skarvald_isDead = true; - Response_Timer = 2000; - Check_Timer = 0; - } - } else Check_Timer -= diff; - - if (Response_Timer) - if (Skarvald_isDead) - if (Response_Timer <= diff) - { - DoScriptText(YELL_DALRONN_SKA_DIEDFIRST,me); - - Response_Timer = 0; - } else Response_Timer -= diff; - } - - if (ShadowBolt_Timer <= diff) - { - if (!me->IsNonMeleeSpellCasted(false)) - { - DoCast(SelectUnit(SELECT_TARGET_RANDOM, 0), SPELL_SHADOW_BOLT); - ShadowBolt_Timer = 2100;//give a 100ms pause to try cast other spells - } - } else ShadowBolt_Timer -= diff; - - if (Debilitate_Timer <= diff) - { - if (!me->IsNonMeleeSpellCasted(false)) - { - DoCast(SelectUnit(SELECT_TARGET_RANDOM, 0), SPELL_DEBILITATE); - Debilitate_Timer = 5000+rand()%5000; - } - } else Debilitate_Timer -= diff; - - if (IsHeroic()) - if (Summon_Timer <= diff) - { - if (!me->IsNonMeleeSpellCasted(false)) - { - DoCast(me, H_SPELL_SUMMON_SKELETONS); - Summon_Timer = (rand()%10000) + 20000; - } - } else Summon_Timer -= diff; - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_boss_dalronn_the_controller(Creature* pCreature) -{ - return new boss_dalronn_the_controllerAI (pCreature); -} - -void AddSC_boss_skarvald_dalronn() -{ - Script *newscript; - - newscript = new Script; - newscript->Name = "boss_skarvald_the_constructor"; - newscript->GetAI = &GetAI_boss_skarvald_the_constructor; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "boss_dalronn_the_controller"; - newscript->GetAI = &GetAI_boss_dalronn_the_controller; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Northrend/UtgardeKeep/utgarde_keep/instance_utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/utgarde_keep/instance_utgarde_keep.cpp deleted file mode 100644 index 03f97b1d27e..00000000000 --- a/src/server/scripts/Northrend/UtgardeKeep/utgarde_keep/instance_utgarde_keep.cpp +++ /dev/null @@ -1,312 +0,0 @@ -/* - * Copyright (C) 2009 Trinity - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: Instance_Utgarde_Keep -SD%Complete: 90 -SDComment: Instance Data Scripts and functions to acquire mobs and set encounter status for use in various Utgarde Keep Scripts -SDCategory: Utgarde Keep -EndScriptData */ - -#include "ScriptedPch.h" -#include "utgarde_keep.h" - -#define MAX_ENCOUNTER 3 - -#define ENTRY_BELLOW_1 186688 -#define ENTRY_BELLOW_2 186689 -#define ENTRY_BELLOW_3 186690 - -#define ENTRY_FORGEFIRE_1 186692 -#define ENTRY_FORGEFIRE_2 186693 -#define ENTRY_FORGEFIRE_3 186691 - -#define ENTRY_GLOWING_ANVIL_1 186609 -#define ENTRY_GLOWING_ANVIL_2 186610 -#define ENTRY_GLOWING_ANVIL_3 186611 - -#define ENTRY_GIANT_PORTCULLIS_1 186756 -#define ENTRY_GIANT_PORTCULLIS_2 186694 - -/* Utgarde Keep encounters: -0 - Prince Keleseth -1 - Skarvald Dalronn -2 - Ingvar the Plunderer -*/ - -struct instance_utgarde_keep : public ScriptedInstance -{ - instance_utgarde_keep(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; - - uint64 Keleseth; - uint64 Skarvald; - uint64 Dalronn; - uint64 Ingvar; - - uint64 forge_bellow[3]; - uint64 forge_fire[3]; - uint64 forge_anvil[3]; - uint64 portcullis[2]; - - uint32 m_auiEncounter[MAX_ENCOUNTER]; - uint32 forge_event[3]; - std::string str_data; - - void Initialize() - { - memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); - - Keleseth = 0; - Skarvald = 0; - Dalronn = 0; - Ingvar = 0; - - for (uint8 i = 0; i < 3; ++i) - { - forge_bellow[i] = 0; - forge_fire[i] = 0; - forge_anvil[i] = 0; - forge_event[i] = NOT_STARTED; - } - - portcullis[0] = 0; - portcullis[1] = 0; - } - - bool IsEncounterInProgress() const - { - for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) - if (m_auiEncounter[i] == IN_PROGRESS) return true; - - return false; - } - - Player* GetPlayerInMap() - { - Map::PlayerList const& players = instance->GetPlayers(); - - if (!players.isEmpty()) - { - for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) - { - if (Player* plr = itr->getSource()) - return plr; - } - } - - debug_log("TSCR: Instance Utgarde Keep: GetPlayerInMap, but PlayerList is empty!"); - return NULL; - } - - void OnCreatureCreate(Creature* pCreature, bool /*add*/) - { - switch(pCreature->GetEntry()) - { - case 23953: Keleseth = pCreature->GetGUID(); break; - case 24201: Dalronn = pCreature->GetGUID(); break; - case 24200: Skarvald = pCreature->GetGUID(); break; - case 23954: Ingvar = pCreature->GetGUID(); break; - } - } - - void OnGameObjectCreate(GameObject* pGo, bool /*add*/) - { - switch(pGo->GetEntry()) - { - //door and object id - case ENTRY_BELLOW_1: forge_bellow[0] = pGo->GetGUID(); - if (forge_event[0] != NOT_STARTED)HandleGameObject(NULL,true,pGo);break; - case ENTRY_BELLOW_2: forge_bellow[1] = pGo->GetGUID(); - if (forge_event[1] != NOT_STARTED)HandleGameObject(NULL,true,pGo);break; - case ENTRY_BELLOW_3: forge_bellow[2] = pGo->GetGUID(); - if (forge_event[2] != NOT_STARTED)HandleGameObject(NULL,true,pGo);break; - case ENTRY_FORGEFIRE_1: forge_fire[0] = pGo->GetGUID(); - if (forge_event[0] != NOT_STARTED)HandleGameObject(NULL,true,pGo);break; - case ENTRY_FORGEFIRE_2: forge_fire[1] = pGo->GetGUID(); - if (forge_event[1] != NOT_STARTED)HandleGameObject(NULL,true,pGo);break; - case ENTRY_FORGEFIRE_3: forge_fire[2] = pGo->GetGUID(); - if (forge_event[2] != NOT_STARTED)HandleGameObject(NULL,true,pGo);break; - case ENTRY_GLOWING_ANVIL_1: forge_anvil[0] = pGo->GetGUID(); - if (forge_event[0] != NOT_STARTED)HandleGameObject(NULL,true,pGo);break; - case ENTRY_GLOWING_ANVIL_2: forge_anvil[1] = pGo->GetGUID(); - if (forge_event[1] != NOT_STARTED)HandleGameObject(NULL,true,pGo);break; - case ENTRY_GLOWING_ANVIL_3: forge_anvil[2] = pGo->GetGUID(); - if (forge_event[2] != NOT_STARTED)HandleGameObject(NULL,true,pGo);break; - case ENTRY_GIANT_PORTCULLIS_1: portcullis[0] = pGo->GetGUID(); - if (m_auiEncounter[2] == DONE)HandleGameObject(NULL,true,pGo);break; - case ENTRY_GIANT_PORTCULLIS_2: portcullis[1] = pGo->GetGUID(); - if (m_auiEncounter[2] == DONE)HandleGameObject(NULL,true,pGo);break; - } - } - - uint64 GetData64(uint32 identifier) - { - switch(identifier) - { - case DATA_PRINCEKELESETH: return Keleseth; - case DATA_DALRONN: return Dalronn; - case DATA_SKARVALD: return Skarvald; - case DATA_INGVAR: return Ingvar; - } - - return 0; - } - - void SetData(uint32 type, uint32 data) - { - switch(type) - { - case DATA_PRINCEKELESETH_EVENT: - m_auiEncounter[0] = data; - break; - case DATA_SKARVALD_DALRONN_EVENT: - m_auiEncounter[1] = data; - break; - case DATA_INGVAR_EVENT: - if (data == DONE) - { - HandleGameObject(portcullis[0], true); - HandleGameObject(portcullis[1], true); - } - m_auiEncounter[2] = data; - break; - case EVENT_FORGE_1: - if (data == NOT_STARTED) - { - HandleGameObject(forge_bellow[0],false); - HandleGameObject(forge_fire[0],false); - HandleGameObject(forge_anvil[0],false); - }else - { - HandleGameObject(forge_bellow[0],true); - HandleGameObject(forge_fire[0],true); - HandleGameObject(forge_anvil[0],true); - } - forge_event[0] = data; - break; - case EVENT_FORGE_2: - if (data == NOT_STARTED) - { - HandleGameObject(forge_bellow[1],false); - HandleGameObject(forge_fire[1],false); - HandleGameObject(forge_anvil[1],false); - }else - { - HandleGameObject(forge_bellow[1],true); - HandleGameObject(forge_fire[1],true); - HandleGameObject(forge_anvil[1],true); - } - forge_event[1] = data; - break; - case EVENT_FORGE_3: - if (data == NOT_STARTED) - { - HandleGameObject(forge_bellow[2],false); - HandleGameObject(forge_fire[2],false); - HandleGameObject(forge_anvil[2],false); - }else - { - HandleGameObject(forge_bellow[2],true); - HandleGameObject(forge_fire[2],true); - HandleGameObject(forge_anvil[2],true); - } - forge_event[2] = data; - break; - } - - if (data == DONE) - { - SaveToDB(); - } - } - - uint32 GetData(uint32 type) - { - switch(type) - { - case DATA_PRINCEKELESETH_EVENT: return m_auiEncounter[0]; - case DATA_SKARVALD_DALRONN_EVENT: return m_auiEncounter[1]; - case DATA_INGVAR_EVENT: return m_auiEncounter[2]; - } - - return 0; - } - - std::string GetSaveData() - { - OUT_SAVE_INST_DATA; - - std::ostringstream saveStream; - saveStream << "U K " << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " - << m_auiEncounter[2] << " " << forge_event[0] << " " << forge_event[1] << " " << forge_event[2]; - - str_data = saveStream.str(); - - OUT_SAVE_INST_DATA_COMPLETE; - return str_data; - } - - void Load(const char* in) - { - if (!in) - { - OUT_LOAD_INST_DATA_FAIL; - return; - } - - OUT_LOAD_INST_DATA(in); - - char dataHead1, dataHead2; - uint16 data0, data1, data2, data3, data4, data5; - - std::istringstream loadStream(in); - loadStream >> dataHead1 >> dataHead2 >> data0 >> data1 >> data2 >> data3 >> data4 >> data5; - - if (dataHead1 == 'U' && dataHead2 == 'K') - { - m_auiEncounter[0] = data0; - m_auiEncounter[1] = data1; - m_auiEncounter[2] = data2; - - for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) - if (m_auiEncounter[i] == IN_PROGRESS) - m_auiEncounter[i] = NOT_STARTED; - - forge_event[0] = data3; - forge_event[1] = data4; - forge_event[2] = data5; - - } else OUT_LOAD_INST_DATA_FAIL; - - OUT_LOAD_INST_DATA_COMPLETE; - } -}; - -InstanceData* GetInstanceData_instance_utgarde_keep(Map* pMap) -{ - return new instance_utgarde_keep(pMap); -} - -void AddSC_instance_utgarde_keep() -{ - Script *newscript; - newscript = new Script; - newscript->Name = "instance_utgarde_keep"; - newscript->GetInstanceData = &GetInstanceData_instance_utgarde_keep; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Northrend/UtgardeKeep/utgarde_keep/utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/utgarde_keep/utgarde_keep.cpp deleted file mode 100644 index 95825aa49b6..00000000000 --- a/src/server/scripts/Northrend/UtgardeKeep/utgarde_keep/utgarde_keep.cpp +++ /dev/null @@ -1,160 +0,0 @@ -/* - * Copyright (C) 2009 Trinity - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "ScriptedPch.h" -#include "utgarde_keep.h" - -uint32 entry_search[3] = -{ - 186609, - 186610, - 186611 -}; - -struct npc_dragonflayer_forge_masterAI : public ScriptedAI -{ - npc_dragonflayer_forge_masterAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - fm_Type = 0; - } - - ScriptedInstance* pInstance; - uint8 fm_Type; - - void Reset() - { - if (fm_Type == 0) fm_Type = GetForgeMasterType(); - CheckForge(); - } - - void CheckForge() - { - if (pInstance) - { - switch(fm_Type) - { - case 1: - pInstance->SetData(EVENT_FORGE_1,me->isAlive() ? NOT_STARTED : DONE); - break; - case 2: - pInstance->SetData(EVENT_FORGE_2,me->isAlive() ? NOT_STARTED : DONE); - break; - case 3: - pInstance->SetData(EVENT_FORGE_3,me->isAlive() ? NOT_STARTED : DONE); - break; - } - } - } - - void JustDied(Unit * /*killer*/) - { - if (fm_Type == 0) fm_Type = GetForgeMasterType(); - if (pInstance) - { - switch(fm_Type) - { - case 1: - pInstance->SetData(EVENT_FORGE_1,DONE); - break; - case 2: - pInstance->SetData(EVENT_FORGE_2,DONE); - break; - case 3: - pInstance->SetData(EVENT_FORGE_3,DONE); - break; - } - } - } - - void EnterCombat(Unit * /*who*/) - { - if (fm_Type == 0) fm_Type = GetForgeMasterType(); - if (pInstance) - { - switch(fm_Type) - { - case 1: - pInstance->SetData(EVENT_FORGE_1,IN_PROGRESS); - break; - case 2: - pInstance->SetData(EVENT_FORGE_2,IN_PROGRESS); - break; - case 3: - pInstance->SetData(EVENT_FORGE_3,IN_PROGRESS); - break; - } - } - me->SetUInt32Value(UNIT_NPC_EMOTESTATE ,EMOTE_ONESHOT_NONE); - } - - uint8 GetForgeMasterType() - { - float diff = 30.0f; - int near_f = 0; - - for (uint8 i = 0; i < 3 ; ++i) - { - GameObject* temp; - temp = me->FindNearestGameObject(entry_search[i],30); - if (temp) - { - if (me->IsWithinDist(temp,diff,false)) - { - near_f = i + 1; - diff = me->GetDistance2d(temp); - - } - } - } - - switch (near_f) - { - case 1: return 1; - case 2: return 2; - case 3: return 3; - default: return 0; - } - } - - void UpdateAI(const uint32 /*diff*/) - { - if (fm_Type == 0) - fm_Type = GetForgeMasterType(); - - if (!UpdateVictim()) - return; - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_npc_dragonflayer_forge_master(Creature* pCreature) -{ - return new npc_dragonflayer_forge_masterAI(pCreature); -} - -void AddSC_utgarde_keep() -{ - Script *newscript; - - newscript = new Script; - newscript->Name = "npc_dragonflayer_forge_master"; - newscript->GetAI = &GetAI_npc_dragonflayer_forge_master; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Northrend/UtgardeKeep/utgarde_keep/utgarde_keep.h b/src/server/scripts/Northrend/UtgardeKeep/utgarde_keep/utgarde_keep.h deleted file mode 100644 index b630e156564..00000000000 --- a/src/server/scripts/Northrend/UtgardeKeep/utgarde_keep/utgarde_keep.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (C) 2009 Trinity - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef DEF_UTGARDE_KEEP_H -#define DEF_UTGARDE_KEEP_H - -#define DATA_PRINCEKELESETH 1 -#define DATA_SKARVALD 3 -#define DATA_DALRONN 4 -#define DATA_INGVAR 6 - -#define DATA_PRINCEKELESETH_EVENT 2 -#define DATA_SKARVALD_DALRONN_EVENT 5 -#define DATA_INGVAR_EVENT 7 - -#define EVENT_FORGE_1 8 -#define EVENT_FORGE_2 9 -#define EVENT_FORGE_3 10 - -#endif diff --git a/src/server/scripts/Northrend/UtgardeKeep/utgarde_pinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/utgarde_pinnacle/boss_palehoof.cpp deleted file mode 100644 index 297fe37b7d8..00000000000 --- a/src/server/scripts/Northrend/UtgardeKeep/utgarde_pinnacle/boss_palehoof.cpp +++ /dev/null @@ -1,830 +0,0 @@ -/* Script Data Start -SDName: Boss palehoof -SDAuthor: LordVanMartin -SD%Complete: -SDComment: -SDCategory: -Script Data End */ - -/*** SQL START *** -update creature_template set scriptname = 'boss_palehoof' where entry = ''; -*** SQL END ***/ -#include "ScriptedPch.h" -#include "utgarde_pinnacle.h" - -enum Spells -{ - SPELL_ARCING_SMASH = 48260, - SPELL_IMPALE = 48261, - H_SPELL_IMPALE = 59268, - SPELL_WITHERING_ROAR = 48256, - H_SPELL_WITHERING_ROAR = 59267, - SPELL_FREEZE = 16245 -}; - -//Orb spells -enum OrbSpells -{ - SPELL_ORB_VISUAL = 48044, - SPELL_ORB_CHANNEL = 48048 -}; - -//not in db -enum Yells -{ - SAY_AGGRO = -1575000, - SAY_SLAY_1 = -1575001, - SAY_SLAY_2 = -1575002, - SAY_DEATH = -1575003 -}; - -enum Creatures -{ - MOB_STASIS_CONTROLLER = 26688 -}; - -struct Locations -{ - float x, y, z; -}; - -struct Locations moveLocs[]= -{ - {261.6,-449.3,109.5}, - {263.3,-454.0,109.5}, - {291.5,-450.4,109.5}, - {291.5,-454.0,109.5}, - {310.0,-453.4,109.5}, - {238.6,-460.7,109.5} -}; - -enum Phase -{ - PHASE_FRENZIED_WORGEN, - PHASE_RAVENOUS_FURLBORG, - PHASE_MASSIVE_JORMUNGAR, - PHASE_FEROCIOUS_RHINO, - PHASE_GORTOK_PALEHOOF, - PHASE_NONE -}; - -struct boss_palehoofAI : public ScriptedAI -{ - boss_palehoofAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - } - - uint32 uiArcingSmashTimer; - uint32 uiImpaleTimer; - uint32 uiWhiteringRoarTimer; - uint32 uiWaitingTimer; - Phase currentPhase; - uint8 AddCount; - bool DoneAdds[4]; - - ScriptedInstance *pInstance; - - void Reset() - { - uiArcingSmashTimer = 15000; - uiImpaleTimer = 12000; - uiWhiteringRoarTimer = 10000; - - me->GetMotionMaster()->MoveTargetedHome(); - - for (uint32 i=0;i<4;i++) - DoneAdds[i]=false; - AddCount=0; - - currentPhase=PHASE_NONE; - - if (pInstance) - { - pInstance->SetData(DATA_GORTOK_PALEHOOF_EVENT, NOT_STARTED); - - Creature* pTemp = Unit::GetCreature((*me), pInstance->GetData64(DATA_MOB_FRENZIED_WORGEN)); - if (pTemp && !pTemp->isAlive()) - pTemp->Respawn(); - - pTemp = Unit::GetCreature((*me), pInstance->GetData64(DATA_MOB_FEROCIOUS_RHINO)); - if (pTemp && !pTemp->isAlive()) - pTemp->Respawn(); - - pTemp = Unit::GetCreature((*me), pInstance->GetData64(DATA_MOB_MASSIVE_JORMUNGAR)); - if (pTemp && !pTemp->isAlive()) - pTemp->Respawn(); - - pTemp = Unit::GetCreature((*me), pInstance->GetData64(DATA_MOB_RAVENOUS_FURBOLG)); - if (pTemp && !pTemp->isAlive()) - pTemp->Respawn(); - - GameObject* pGo = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_GORTOK_PALEHOOF_SPHERE)); - if (pGo) - { - pGo->SetGoState(GO_STATE_READY); - pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); - } - } - } - - void EnterCombat(Unit* /*who*/) - { - DoScriptText(SAY_AGGRO, me); - } - - void AttackStart(Unit* who) - { - if (!who) - return; - - if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) - return; - - if (me->Attack(who, true)) - { - me->AddThreat(who, 0.0f); - me->SetInCombatWith(who); - who->SetInCombatWith(me); - DoStartMovement(who); - } - } - - void UpdateAI(const uint32 diff) - { - if (currentPhase != PHASE_GORTOK_PALEHOOF) - return; - //Return since we have no target - if (!UpdateVictim()) - return; - - Creature* pTemp = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_ORB) : 0); - if (pTemp && pTemp->isAlive()) - pTemp->DisappearAndDie(); - - if (uiArcingSmashTimer <= diff) - { - DoCast(me, SPELL_ARCING_SMASH); - uiArcingSmashTimer = urand(13000,17000); - } else uiArcingSmashTimer -= diff; - - if (uiImpaleTimer <= diff) - { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_IMPALE); - uiImpaleTimer = urand(8000,12000); - } else uiImpaleTimer -= diff; - - if (uiWhiteringRoarTimer <= diff) - { - DoCast(me, SPELL_WITHERING_ROAR); - uiWhiteringRoarTimer = urand(8000,12000); - } else uiWhiteringRoarTimer -= diff; - - DoMeleeAttackIfReady(); - } - - void JustDied(Unit* /*killer*/) - { - DoScriptText(SAY_DEATH, me); - if (pInstance) - pInstance->SetData(DATA_GORTOK_PALEHOOF_EVENT, DONE); - Creature* pTemp = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_ORB) : 0); - if (pTemp && pTemp->isAlive()) - pTemp->DisappearAndDie(); - } - - void KilledUnit(Unit * /*victim*/) - { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); - } - - void NextPhase() - { - if (currentPhase == PHASE_NONE) - { - pInstance->SetData(DATA_GORTOK_PALEHOOF_EVENT, IN_PROGRESS); - me->SummonCreature(MOB_STASIS_CONTROLLER,moveLocs[5].x,moveLocs[5].y,moveLocs[5].z,0,TEMPSUMMON_CORPSE_DESPAWN); - } - Phase move = PHASE_NONE; - if (AddCount >= DUNGEON_MODE(2,4)) - move = PHASE_GORTOK_PALEHOOF; - else - { - //select random not yet defeated add - uint8 next = urand(0,3); - for (uint8 i=0; i < 16; i++) - { - if (!DoneAdds[i%4] && next == 0) - { - move = (Phase)(i%4); - break; - } else if (!DoneAdds[i%4] && next > 0) - --next; - } - ++AddCount; - DoneAdds[move] = true; - move = (Phase)(move%4); - } - //send orb to summon spot - Creature *pOrb = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_ORB) : 0); - if (pOrb && pOrb->isAlive()) - { - if (currentPhase == PHASE_NONE) - pOrb->CastSpell(me,SPELL_ORB_VISUAL,true); - pOrb->GetMotionMaster()->MovePoint(move,moveLocs[move].x,moveLocs[move].y,moveLocs[move].z); - } - currentPhase = move; - } - - void JustReachedHome() - { - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE|UNIT_FLAG_NOT_ATTACKABLE_1|UNIT_FLAG_OOC_NOT_ATTACKABLE); - me->SetStandState(UNIT_STAND_STATE_STAND); - DoCast(me, SPELL_FREEZE); - } -}; - -CreatureAI* GetAI_boss_palehoof(Creature* pCreature) -{ - return new boss_palehoofAI (pCreature); -} - -//ravenous furbolg's spells -enum RavenousSpells -{ - SPELL_CHAIN_LIGHTING = 48140, - H_SPELL_CHAIN_LIGHTING = 59273, - SPELL_CRAZED = 48139, - SPELL_TERRIFYING_ROAR = 48144 -}; - -struct mob_ravenous_furbolgAI : public ScriptedAI -{ - mob_ravenous_furbolgAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - } - - uint32 uiChainLightingTimer; - uint32 uiCrazedTimer; - uint32 uiTerrifyingRoarTimer; - - ScriptedInstance *pInstance; - - void Reset() - { - uiChainLightingTimer = 5000; - uiCrazedTimer = 10000; - uiTerrifyingRoarTimer = 15000; - - me->GetMotionMaster()->MoveTargetedHome(); - - if (pInstance) - if (pInstance->GetData(DATA_GORTOK_PALEHOOF_EVENT) == IN_PROGRESS) - { - Creature *pPalehoof = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); - if (pPalehoof && pPalehoof->isAlive()) - CAST_AI(boss_palehoofAI, pPalehoof->AI())->Reset(); - } - } - - void UpdateAI(const uint32 diff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - if (uiChainLightingTimer <= diff) - { - DoCast(me->getVictim(), SPELL_CHAIN_LIGHTING); - uiChainLightingTimer = 5000 + rand()%5000; - } else uiChainLightingTimer -= diff; - - if (uiCrazedTimer <= diff) - { - DoCast(me, SPELL_CRAZED); - uiCrazedTimer = 8000 + rand()%4000; - } else uiCrazedTimer -= diff; - - if (uiTerrifyingRoarTimer <= diff) - { - DoCast(me, SPELL_TERRIFYING_ROAR); - uiTerrifyingRoarTimer = 10000 + rand()%10000; - } else uiTerrifyingRoarTimer -= diff; - - DoMeleeAttackIfReady(); - } - - void AttackStart(Unit* who) - { - if (!who) - return; - - if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) - return; - - if (me->Attack(who, true)) - { - me->AddThreat(who, 0.0f); - me->SetInCombatWith(who); - who->SetInCombatWith(me); - DoStartMovement(who); - } - } - - void JustDied(Unit* /*killer*/) - { - if (pInstance) - { - Creature *pPalehoof = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); - if (pPalehoof) - CAST_AI(boss_palehoofAI, pPalehoof->AI())->NextPhase(); - } - } - - void JustReachedHome() - { - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE|UNIT_FLAG_NOT_ATTACKABLE_1|UNIT_FLAG_OOC_NOT_ATTACKABLE); - me->SetStandState(UNIT_STAND_STATE_STAND); - DoCast(me, SPELL_FREEZE); - } -}; - -CreatureAI* GetAI_mob_ravenous_furbolg(Creature* pCreature) -{ - return new mob_ravenous_furbolgAI (pCreature); -} - -//frenzied worgen's spells -enum FrenziedSpells -{ - SPELL_MORTAL_WOUND = 48137, - H_SPELL_MORTAL_WOUND = 59265, - SPELL_ENRAGE_1 = 48138, - SPELL_ENRAGE_2 = 48142 -}; - -struct mob_frenzied_worgenAI : public ScriptedAI -{ - mob_frenzied_worgenAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - } - - uint32 uiMortalWoundTimer; - uint32 uiEnrage1Timer; - uint32 uiEnrage2Timer; - - ScriptedInstance *pInstance; - - void Reset() - { - uiMortalWoundTimer = 5000; - uiEnrage1Timer = 15000; - uiEnrage2Timer = 10000; - - me->GetMotionMaster()->MoveTargetedHome(); - - if (pInstance) - if (pInstance->GetData(DATA_GORTOK_PALEHOOF_EVENT) == IN_PROGRESS) - { - Creature *pPalehoof = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); - if (pPalehoof && pPalehoof->isAlive()) - CAST_AI(boss_palehoofAI, pPalehoof->AI())->Reset(); - } - } - - void UpdateAI(const uint32 diff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - if (uiMortalWoundTimer <= diff) - { - DoCast(me->getVictim(), SPELL_MORTAL_WOUND); - uiMortalWoundTimer = 3000 + rand()%4000; - } else uiMortalWoundTimer -= diff; - - if (uiEnrage1Timer <= diff) - { - DoCast(me, SPELL_ENRAGE_1); - uiEnrage1Timer = 15000; - } else uiEnrage1Timer -= diff; - - if (uiEnrage2Timer <= diff) - { - DoCast(me, SPELL_ENRAGE_2); - uiEnrage2Timer = 10000; - } else uiEnrage2Timer -= diff; - - DoMeleeAttackIfReady(); - } - - void AttackStart(Unit* who) - { - if (!who) - return; - - if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) - return; - - if (me->Attack(who, true)) - { - me->AddThreat(who, 0.0f); - me->SetInCombatWith(who); - who->SetInCombatWith(me); - DoStartMovement(who); - } - if (pInstance) - pInstance->SetData(DATA_GORTOK_PALEHOOF_EVENT, IN_PROGRESS); - } - - void JustDied(Unit* /*killer*/) - { - if (pInstance) - { - Creature *pPalehoof = Unit::GetCreature((*me), pInstance->GetData64(DATA_GORTOK_PALEHOOF)); - if (pPalehoof) - CAST_AI(boss_palehoofAI, pPalehoof->AI())->NextPhase(); - } - } - - void JustReachedHome() - { - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE|UNIT_FLAG_NOT_ATTACKABLE_1|UNIT_FLAG_OOC_NOT_ATTACKABLE); - me->SetStandState(UNIT_STAND_STATE_STAND); - DoCast(me, SPELL_FREEZE); - } -}; - -CreatureAI* GetAI_mob_frenzied_worgen(Creature* pCreature) -{ - return new mob_frenzied_worgenAI (pCreature); -} - -//ferocious rhino's spells -enum FerociousSpells -{ - SPELL_GORE = 48130, - H_SPELL_GORE = 59264, - SPELL_GRIEVOUS_WOUND = 48105, - H_SPELL_GRIEVOUS_WOUND = 59263, - SPELL_STOMP = 48131 -}; - -struct mob_ferocious_rhinoAI : public ScriptedAI -{ - mob_ferocious_rhinoAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - } - - uint32 uiStompTimer; - uint32 uiGoreTimer; - uint32 uiGrievousWoundTimer; - - ScriptedInstance *pInstance; - - void Reset() - { - uiStompTimer = 10000; - uiGoreTimer = 15000; - uiGrievousWoundTimer = 20000; - - me->GetMotionMaster()->MoveTargetedHome(); - - if (pInstance) - if (pInstance->GetData(DATA_GORTOK_PALEHOOF_EVENT) == IN_PROGRESS) - { - Creature *pPalehoof = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); - if (pPalehoof && pPalehoof->isAlive()) - CAST_AI(boss_palehoofAI, pPalehoof->AI())->Reset(); - } - } - - void UpdateAI(const uint32 diff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - if (uiStompTimer <= diff) - { - DoCast(me->getVictim(), SPELL_STOMP); - uiStompTimer = 8000 + rand()%4000; - } else uiStompTimer -= diff; - - if (uiGoreTimer <= diff) - { - DoCast(me->getVictim(), SPELL_GORE); - uiGoreTimer = 13000 + rand()%4000; - } else uiGoreTimer -= diff; - - if (uiGrievousWoundTimer <= diff) - { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_GRIEVOUS_WOUND); - uiGrievousWoundTimer = 18000 + rand()%4000; - } else uiGrievousWoundTimer -= diff; - - DoMeleeAttackIfReady(); - } - - void AttackStart(Unit* who) - { - if (!who) - return; - - if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) - return; - - if (me->Attack(who, true)) - { - me->AddThreat(who, 0.0f); - me->SetInCombatWith(who); - who->SetInCombatWith(me); - DoStartMovement(who); - } - } - - void JustDied(Unit* /*killer*/) - { - if (pInstance) - { - Creature *pPalehoof = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); - if (pPalehoof) - CAST_AI(boss_palehoofAI, pPalehoof->AI())->NextPhase(); - } - } - - void JustReachedHome() - { - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE|UNIT_FLAG_NOT_ATTACKABLE_1|UNIT_FLAG_OOC_NOT_ATTACKABLE); - me->SetStandState(UNIT_STAND_STATE_STAND); - DoCast(me, SPELL_FREEZE); - } -}; - -CreatureAI* GetAI_mob_ferocious_rhino(Creature* pCreature) -{ - return new mob_ferocious_rhinoAI (pCreature); -} - -//massive jormungar's spells -enum MassiveSpells -{ - SPELL_ACID_SPIT = 48132, - SPELL_ACID_SPLATTER = 48136, - H_SPELL_ACID_SPLATTER = 59272, - SPELL_POISON_BREATH = 48133, - H_SPELL_POISON_BREATH = 59271 -}; - -enum MassiveAdds -{ - CREATURE_JORMUNGAR_WORM = 27228 -}; - -struct mob_massive_jormungarAI : public ScriptedAI -{ - mob_massive_jormungarAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - } - - uint32 uiAcidSpitTimer; - uint32 uiAcidSplatterTimer; - uint32 uiPoisonBreathTimer; - - ScriptedInstance *pInstance; - - void Reset() - { - uiAcidSpitTimer = 3000; - uiAcidSplatterTimer = 12000; - uiPoisonBreathTimer = 10000; - - me->GetMotionMaster()->MoveTargetedHome(); - - if (pInstance) - if (pInstance->GetData(DATA_GORTOK_PALEHOOF_EVENT) == IN_PROGRESS) - { - Creature *pPalehoof = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); - if (pPalehoof && pPalehoof->isAlive()) - CAST_AI(boss_palehoofAI, pPalehoof->AI())->Reset(); - } - } - - void UpdateAI(const uint32 diff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - if (uiAcidSpitTimer <= diff) - { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_ACID_SPIT); - uiAcidSpitTimer = 2000 + rand()%2000; - } else uiAcidSpitTimer -= diff; - - if (uiAcidSplatterTimer <= diff) - { - DoCast(me, SPELL_POISON_BREATH); - uiAcidSplatterTimer = 10000 + rand()%4000; - } else uiAcidSplatterTimer -= diff; - - if (uiPoisonBreathTimer <= diff) - { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, SPELL_POISON_BREATH); - uiPoisonBreathTimer = 8000 + rand()%4000; - } else uiPoisonBreathTimer -= diff; - - DoMeleeAttackIfReady(); - } - - void AttackStart(Unit* who) - { - if (!who) - return; - - if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) - return; - - if (me->Attack(who, true)) - { - me->AddThreat(who, 0.0f); - me->SetInCombatWith(who); - who->SetInCombatWith(me); - DoStartMovement(who); - } - } - - void JustDied(Unit* /*killer*/) - { - if (pInstance) - { - Creature *pPalehoof = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); - if (pPalehoof) - CAST_AI(boss_palehoofAI,pPalehoof->AI())->NextPhase(); - } - } - - void JustReachedHome() - { - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE|UNIT_FLAG_NOT_ATTACKABLE_1|UNIT_FLAG_OOC_NOT_ATTACKABLE); - me->SetStandState(UNIT_STAND_STATE_STAND); - DoCast(me, SPELL_FREEZE); - } -}; - -CreatureAI* GetAI_mob_massive_jormungar(Creature* pCreature) -{ - return new mob_massive_jormungarAI (pCreature); -} - - -struct mob_palehoof_orbAI : public ScriptedAI -{ - mob_palehoof_orbAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - } - - ScriptedInstance *pInstance; - uint32 SummonTimer; - Phase currentPhase; - - void Reset() - { - currentPhase=PHASE_NONE; - SummonTimer=5000; - me->AddUnitMovementFlag(MOVEMENTFLAG_FLYING); - me->RemoveAurasDueToSpell(SPELL_ORB_VISUAL); - me->SetSpeed(MOVE_FLIGHT , 0.5f); - } - - void UpdateAI(const uint32 diff) - { - if (currentPhase == PHASE_NONE) - return; - - if (SummonTimer <= diff) - { - if (currentPhase<5&¤tPhase >= 0) - { - Creature *pNext = NULL; - switch(currentPhase) - { - case PHASE_FRENZIED_WORGEN: pNext = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_FRENZIED_WORGEN) : 0); break; - case PHASE_RAVENOUS_FURLBORG: pNext = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_RAVENOUS_FURBOLG) : 0); break; - case PHASE_MASSIVE_JORMUNGAR: pNext = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_MASSIVE_JORMUNGAR) : 0); break; - case PHASE_FEROCIOUS_RHINO: pNext = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_FEROCIOUS_RHINO) : 0); break; - case PHASE_GORTOK_PALEHOOF: pNext = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); break; - } - - if (pNext) - { - pNext->RemoveAurasDueToSpell(SPELL_FREEZE); - pNext->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE|UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_ATTACKABLE_1|UNIT_FLAG_OOC_NOT_ATTACKABLE); - pNext->SetStandState(UNIT_STAND_STATE_STAND); - pNext->SetInCombatWithZone(); - pNext->Attack(pNext->SelectNearestTarget(100),true); - - } - currentPhase=PHASE_NONE; - } - } else SummonTimer-=diff; - } - - void MovementInform(uint32 type, uint32 id) - { - if (type != POINT_MOTION_TYPE) - return; - if (id<0 || id>4) - return; - Creature *pNext = NULL; - switch(id) - { - case PHASE_FRENZIED_WORGEN: pNext = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_FRENZIED_WORGEN) : 0); break; - case PHASE_RAVENOUS_FURLBORG: pNext = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_RAVENOUS_FURBOLG) : 0); break; - case PHASE_MASSIVE_JORMUNGAR: pNext = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_MASSIVE_JORMUNGAR) : 0); break; - case PHASE_FEROCIOUS_RHINO: pNext = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_MOB_FEROCIOUS_RHINO) : 0); break; - case PHASE_GORTOK_PALEHOOF: pNext = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); break; - } - if (pNext) - DoCast(pNext, SPELL_ORB_CHANNEL, false); - currentPhase=(Phase)id; - SummonTimer=5000; - } -}; - -CreatureAI* GetAI_mob_palehoof_orb(Creature* pCreature) -{ - return new mob_palehoof_orbAI (pCreature); -} - - - -bool GOHello_palehoof_sphere(Player * /*pPlayer*/, GameObject *pGO) -{ - ScriptedInstance *pInstance = pGO->GetInstanceData(); - - Creature *pPalehoof = Unit::GetCreature(*pGO, pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); - if (pPalehoof && pPalehoof->isAlive()) - { - // maybe these are hacks :( - pGO->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); - pGO->SetGoState(GO_STATE_ACTIVE); - - CAST_AI(boss_palehoofAI, pPalehoof->AI())->NextPhase(); - } - return true; -} - - - -void AddSC_boss_palehoof() -{ - Script *newscript; - - newscript = new Script; - newscript->Name = "boss_palehoof"; - newscript->GetAI = &GetAI_boss_palehoof; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_ravenous_furbolg"; - newscript->GetAI = &GetAI_mob_ravenous_furbolg; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_frenzied_worgen"; - newscript->GetAI = &GetAI_mob_frenzied_worgen; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_ferocious_rhino"; - newscript->GetAI = &GetAI_mob_ferocious_rhino; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_massive_jormungar"; - newscript->GetAI = &GetAI_mob_massive_jormungar; - newscript->RegisterSelf(); - - - newscript = new Script; - newscript->Name = "mob_palehoof_orb"; - newscript->GetAI = &GetAI_mob_palehoof_orb; - newscript->RegisterSelf(); - - - newscript = new Script; - newscript->Name = "go_palehoof_sphere"; - newscript->pGOHello=&GOHello_palehoof_sphere; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Northrend/UtgardeKeep/utgarde_pinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/utgarde_pinnacle/boss_skadi.cpp deleted file mode 100644 index a75eb3465be..00000000000 --- a/src/server/scripts/Northrend/UtgardeKeep/utgarde_pinnacle/boss_skadi.cpp +++ /dev/null @@ -1,477 +0,0 @@ -/* Copyright (C) 2008 - 2010 Trinity - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* Script Data Start -SDName: Boss_Skadi -SDAuthor: LordVanMartin, JohnHoliver -SD%Complete: 90% -SDComment: - After Unmount() he appears to still be flying even with SetFlying(false) - -SDCategory: Utgarde Pinnacle -Script Data End */ - -#include "ScriptedPch.h" -#include "utgarde_pinnacle.h" - -//Yell -enum eYells -{ - SAY_AGGRO = -1575004, - SAY_KILL_1 = -1575005, - SAY_KILL_2 = -1575006, - EMOTE_RANGE = -1575007, //Skadi - SAY_DEATH = -1575008, - SAY_DRAKE_DEATH = -1575009, - EMOTE_BREATH = -1575010, //Grauf - SAY_DRAKE_BREATH_1 = -1575011, - SAY_DRAKE_BREATH_2 = -1575012, - SAY_DRAKE_BREATH_3 = -1575013, -}; - -static Position SpawnLoc = {468.931, -513.555, 104.723}; -static Position Location[]= -{ - // Boss - {341.740997, -516.955017, 104.66900}, // 0 - {293.299, -505.95, 142.03}, // 1 - {301.664, -535.164, 146.097}, // 2 - {521.031006, -544.667847, 128.80064}, // 3 - {477.311981, -509.296814, 104.72308}, // 4 - {341.740997, -516.955017, 104.66900}, // 5 - {341.740997, -516.955017, 104.66900}, // 6 - {341.740997, -516.955017, 104.66900}, // 7 - // Triggers Left - {469.661, -484.546, 104.712}, // 8 - {483.315, -485.028, 104.718}, // 9 - {476.87, -487.994, 104.735}, //10 - {477.512, -497.772, 104.728}, //11 - {486.287, -500.759, 104.722}, //12 - {480.1, -503.895, 104.722}, //13 - {472.391, -505.103, 104.723}, //14 - {478.885, -510.803, 104.723}, //15 - {489.529, -508.615, 104.723}, //16 - {484.272, -508.589, 104.723}, //17 - {465.328, -506.495, 104.427}, //18 - {456.885, -508.104, 104.447}, //19 - {450.177, -507.989, 105.247}, //20 - {442.273, -508.029, 104.813}, //21 - {434.225, -508.19, 104.787}, //22 - {423.902, -508.525, 104.274}, //23 - {414.551, -508.645, 105.136}, //24 - {405.787, -508.755, 104.988}, //25 - {398.812, -507.224, 104.82}, //26 - {389.702, -506.846, 104.729}, //27 - {381.856, -506.76, 104.756}, //28 - {372.881, -507.254, 104.779}, //29 - {364.978, -508.182, 104.673}, //30 - {357.633, -508.075, 104.647}, //31 - {350.008, -506.826, 104.588}, //32 - {341.69, -506.77, 104.499}, //33 - {335.31, -505.745, 105.18}, //34 - {471.178, -510.74, 104.723}, //35 - {461.759, -510.365, 104.199}, //36 - {424.07287, -510.082916, 104.711082}, //37 - // Triggers Right - {489.46, -513.297, 105.413}, //38 - {485.706, -517.175, 104.724}, //39 - {480.98, -519.313, 104.724}, //40 - {475.05, -520.52, 104.724}, //41 - {482.97, -512.099, 104.724}, //42 - {477.082, -514.172, 104.724}, //43 - {468.991, -516.691, 104.724}, //44 - {461.722, -517.063, 104.627}, //45 - {455.88, -517.681, 104.707}, //46 - {450.499, -519.099, 104.701}, //47 - {444.889, -518.963, 104.82}, //48 - {440.181, -518.893, 104.861}, //49 - {434.393, -518.758, 104.891}, //50 - {429.328, -518.583, 104.904}, //51 - {423.844, -518.394, 105.004}, //52 - {418.707, -518.266, 105.135}, //53 - {413.377, -518.085, 105.153}, //54 - {407.277, -517.844, 104.893}, //55 - {401.082, -517.443, 104.723}, //56 - {394.933, -514.64, 104.724}, //57 - {388.917, -514.688, 104.734}, //58 - {383.814, -515.834, 104.73}, //59 - {377.887, -518.653, 104.777}, //60 - {371.376, -518.289, 104.781}, //61 - {365.669, -517.822, 104.758}, //62 - {359.572, -517.314, 104.706}, //63 - {353.632, -517.146, 104.647}, //64 - {347.998, -517.038, 104.538}, //65 - {341.803, -516.98, 104.584}, //66 - {335.879, -516.674, 104.628}, //67 - {329.871, -515.92, 104.711}, //68 - // Breach Zone - {485.4577, -511.2515, 115.3011}, //69 - {435.1892, -514.5232, 118.6719}, //70 - {413.9327, -540.9407, 138.2614}, //71 -}; - -enum eCombatPhase -{ - FLYING, - SKADI -}; - -enum eSpells -{ - //Skadi Spells - SPELL_CRUSH = 50234, - SPELL_POISONED_SPEAR = 50225, //isn't being casted =/ - SPELL_WHIRLWIND = 50228, //random target, but not the tank approx. every 20s - SPELL_RAPID_FIRE = 56570, - SPELL_HARPOON_DAMAGE = 56578, - SPELL_FREEZING_CLOUD = 47579, -}; - -enum eCreature -{ - CREATURE_YMIRJAR_WARRIOR = 26690, - CREATURE_YMIRJAR_WITCH_DOCTOR = 26691, - CREATURE_YMIRJAR_HARPOONER = 26692, - CREATURE_GRAUF = 26893, - CREATURE_TRIGGER = 28351, - DATA_MOUNT = 27043, -}; - -enum eAchievments -{ - ACHIEV_TIMED_START_EVENT = 17726, -}; - -struct boss_skadiAI : public ScriptedAI -{ - boss_skadiAI(Creature *c) : ScriptedAI(c), Summons(me) - { - m_pInstance = c->GetInstanceData(); - } - - ScriptedInstance* m_pInstance; - SummonList Summons; - uint64 m_uiGraufGUID; - std::vector triggersGUID; - - uint32 m_uiCrushTimer; - uint32 m_uiPoisonedSpearTimer; - uint32 m_uiWhirlwindTimer; - uint32 m_uiWaypointId; - uint32 m_uiMovementTimer; - uint32 m_uiMountTimer; - uint32 m_uiSummonTimer; - uint8 m_uiSpellHitCount; - bool m_bSaidEmote; - - eCombatPhase Phase; - - void Reset() - { - triggersGUID.clear(); - - m_uiCrushTimer = 8000; - m_uiPoisonedSpearTimer = 10000; - m_uiWhirlwindTimer = 20000; - m_uiMountTimer = 3000; - m_uiWaypointId = 0; - m_bSaidEmote = false; - m_uiSpellHitCount = 0; - - Phase = SKADI; - - Summons.DespawnAll(); - me->SetSpeed(MOVE_FLIGHT, 3.0f); - if ((Unit::GetCreature((*me), m_uiGraufGUID) == NULL) && !me->IsMounted()) - me->SummonCreature(CREATURE_GRAUF,Location[0].GetPositionX(),Location[0].GetPositionY(),Location[0].GetPositionZ(),3.0f); - if (m_pInstance) - { - m_pInstance->SetData(DATA_SKADI_THE_RUTHLESS_EVENT, NOT_STARTED); - m_pInstance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); - } - } - - void JustReachedHome() - { - me->SetFlying(false); - me->Unmount(); - me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NON_ATTACKABLE); - if (Unit::GetCreature((*me), m_uiGraufGUID) == NULL) - me->SummonCreature(CREATURE_GRAUF,Location[0].GetPositionX(),Location[0].GetPositionY(),Location[0].GetPositionZ(),3.0f); - } - - void EnterCombat(Unit* /*who*/) - { - DoScriptText(SAY_AGGRO, me); - - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NON_ATTACKABLE); - - Phase = FLYING; - - m_uiMovementTimer = 1000; - m_uiSummonTimer = 10000; - me->SetInCombatWithZone(); - if (m_pInstance) - { - m_pInstance->SetData(DATA_SKADI_THE_RUTHLESS_EVENT, IN_PROGRESS); - m_pInstance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); - me->GetMotionMaster()->MoveJump(Location[0].GetPositionX(), Location[0].GetPositionY(), Location[0].GetPositionZ(), 5.0f, 10.0f); - me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE); - m_uiMountTimer = 1000; - Summons.DespawnEntry(CREATURE_GRAUF); - } - } - - void JustSummoned(Creature* pSummoned) - { - switch (pSummoned->GetEntry()) - { - case CREATURE_GRAUF: - m_uiGraufGUID = pSummoned->GetGUID(); - break; - case CREATURE_YMIRJAR_WARRIOR: - case CREATURE_YMIRJAR_WITCH_DOCTOR: - case CREATURE_YMIRJAR_HARPOONER: - pSummoned->setActive(true); - pSummoned->SetInCombatWithZone(); - if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - pSummoned->AI()->AttackStart(pTarget); - break; - case CREATURE_TRIGGER: - pSummoned->CastSpell((Unit*)NULL, SPELL_FREEZING_CLOUD, true); - pSummoned->ForcedDespawn(10*IN_MILISECONDS); - break; - } - Summons.Summon(pSummoned); - } - - void SummonedCreatureDespawn(Creature* pSummoned) - { - if (pSummoned->GetEntry() == CREATURE_GRAUF) - m_uiGraufGUID = 0; - Summons.Despawn(pSummoned); - } - - void SpellHit(Unit *caster, const SpellEntry *spell) - { - if (spell->Id == SPELL_HARPOON_DAMAGE) - { - m_uiSpellHitCount++; - if (m_uiSpellHitCount >= 5) - { - Phase = SKADI; - me->SetFlying(false); - me->Unmount(); - if(Creature* pGrauf = me->SummonCreature(CREATURE_GRAUF, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 3*IN_MILISECONDS)) - { - pGrauf->GetMotionMaster()->MoveFall(0); - pGrauf->HandleEmoteCommand(EMOTE_ONESHOT_FLYDEATH); - } - sLog.outBasic("[Skadi] Fly off"); - me->GetMotionMaster()->MoveJump(Location[4].GetPositionX(), Location[4].GetPositionY(), Location[4].GetPositionZ(), 5.0f, 10.0f); - me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NON_ATTACKABLE); - DoScriptText(SAY_DRAKE_DEATH, me); - m_uiCrushTimer = 8000; - m_uiPoisonedSpearTimer = 10000; - m_uiWhirlwindTimer = 20000; - me->AI()->AttackStart(SelectTarget(SELECT_TARGET_RANDOM)); - } - } - } - - - void UpdateAI(const uint32 diff) - { - switch(Phase) - { - case FLYING: - if (!UpdateVictim()) - return; - - if (me->GetPositionX() >= 519) - { - me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NON_ATTACKABLE); - if (!m_bSaidEmote) - { - DoScriptText(EMOTE_RANGE, me); - m_bSaidEmote = true; - } - } - else - { - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NON_ATTACKABLE); - m_bSaidEmote = false; - } - - if (m_uiMountTimer && m_uiMountTimer <= diff) - { - me->Mount(DATA_MOUNT); - me->SetFlying(true); - m_uiMountTimer = 0; - } else m_uiMountTimer -= diff; - - if (m_uiSummonTimer <= diff) - { - SpawnMobs(); - m_uiSummonTimer = 25000; - } else m_uiSummonTimer -= diff; - - if (m_uiMovementTimer <= diff) - { - switch(m_uiWaypointId) - { - case 0: - me->GetMotionMaster()->MovePoint(0, Location[1].GetPositionX(), Location[1].GetPositionY(), Location[1].GetPositionZ()); - m_uiMovementTimer = 5000; - break; - case 1: - me->GetMotionMaster()->MovePoint(0, Location[2].GetPositionX(), Location[2].GetPositionY(), Location[2].GetPositionZ()); - m_uiMovementTimer = 2000; - break; - case 2: - me->GetMotionMaster()->MovePoint(0, Location[3].GetPositionX(), Location[3].GetPositionY(), Location[3].GetPositionZ()); - m_uiMovementTimer = 15000; - break; - case 3: - me->GetMotionMaster()->MovePoint(0, Location[69].GetPositionX(), Location[69].GetPositionY(), Location[69].GetPositionZ()); - DoScriptText(RAND(SAY_DRAKE_BREATH_1,SAY_DRAKE_BREATH_2), me); - DoScriptText(EMOTE_BREATH, me); - m_uiMovementTimer = 2500; - break; - case 4: - me->GetMotionMaster()->MovePoint(0, Location[70].GetPositionX(), Location[70].GetPositionY(), Location[70].GetPositionZ()); - m_uiMovementTimer = 2000; - SpawnTrigger(); - break; - case 5: - me->GetMotionMaster()->MovePoint(0, Location[71].GetPositionX(), Location[71].GetPositionY(), Location[71].GetPositionZ()); - m_uiMovementTimer = 3000; - break; - case 6: - me->GetMotionMaster()->MovePoint(0, Location[3].GetPositionX(), Location[3].GetPositionY(), Location[3].GetPositionZ()); - m_uiWaypointId = 2; - m_uiMovementTimer = 15000; - break; - } - m_uiWaypointId++; - } else m_uiMovementTimer -= diff; - break; - case SKADI: - //Return since we have no target - if (!UpdateVictim()) - return; - - if (m_uiCrushTimer <= diff) - { - DoCastVictim(SPELL_CRUSH); - m_uiCrushTimer = 8000; - } else m_uiCrushTimer -= diff; - - if (m_uiPoisonedSpearTimer <= diff) - { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM)) - DoCast(pTarget, SPELL_POISONED_SPEAR); - m_uiPoisonedSpearTimer = 10000; - } else m_uiPoisonedSpearTimer -= diff; - - if (m_uiWhirlwindTimer <= diff) - { - DoCastAOE(SPELL_WHIRLWIND); - m_uiWhirlwindTimer = 20000; - } else m_uiWhirlwindTimer -= diff; - - DoMeleeAttackIfReady(); - break; - } - } - - void JustDied(Unit* /*killer*/) - { - DoScriptText(SAY_DEATH, me); - Summons.DespawnAll(); - if (m_pInstance) - m_pInstance->SetData(DATA_SKADI_THE_RUTHLESS_EVENT, DONE); - } - - void KilledUnit(Unit * /*victim*/) - { - DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2), me); - } - - void SpawnMobs() - { - for (uint8 i = 0; i < DUNGEON_MODE(5,6); ++i) - { - switch (urand(0,2)) - { - case 0: me->SummonCreature(CREATURE_YMIRJAR_WARRIOR, SpawnLoc.GetPositionX()+rand()%5, SpawnLoc.GetPositionY()+rand()%5, SpawnLoc.GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); break; - case 1: me->SummonCreature(CREATURE_YMIRJAR_WITCH_DOCTOR, SpawnLoc.GetPositionX()+rand()%5, SpawnLoc.GetPositionY()+rand()%5, SpawnLoc.GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); break; - case 2: me->SummonCreature(CREATURE_YMIRJAR_HARPOONER, SpawnLoc.GetPositionX()+rand()%5, SpawnLoc.GetPositionY()+rand()%5, SpawnLoc.GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); break; - } - } - } - - void SpawnTrigger() - { - uint8 iStart,iEnd; - switch (urand(0,1)) - { - case 0: - iStart = 8; - iEnd = 37; - break; - case 1: - iStart = 38; - iEnd = 68; - break; - } - for(uint32 i = iStart; i < iEnd; ++i) - me->SummonCreature(CREATURE_TRIGGER,Location[i]); - } -}; - -bool GOHello_go_harpoon_launcher(Player *pPlayer, GameObject *pGO) -{ - ScriptedInstance* m_pInstance; - m_pInstance = (ScriptedInstance*)pGO->GetInstanceData(); - if (!m_pInstance) return false; - - if (Creature* pSkadi = Unit::GetCreature((*pGO),m_pInstance->GetData64(DATA_SKADI_THE_RUTHLESS))) - { - pPlayer->CastSpell(pSkadi,SPELL_RAPID_FIRE, true); - } - return false; -} - -CreatureAI* GetAI_boss_skadi(Creature* pCreature) -{ - return new boss_skadiAI (pCreature); -} - -void AddSC_boss_skadi() -{ - Script *newscript; - - newscript = new Script; - newscript->Name = "boss_skadi"; - newscript->GetAI = &GetAI_boss_skadi; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "go_harpoon_launcher"; - newscript->pGOHello = &GOHello_go_harpoon_launcher; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Northrend/UtgardeKeep/utgarde_pinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/utgarde_pinnacle/boss_svala.cpp deleted file mode 100644 index aae1015ddab..00000000000 --- a/src/server/scripts/Northrend/UtgardeKeep/utgarde_pinnacle/boss_svala.cpp +++ /dev/null @@ -1,408 +0,0 @@ -/* Copyright (C) 2008 - 2010 TrinityCore - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "ScriptedPch.h" -#include "utgarde_pinnacle.h" - -enum Spells -{ - SPELL_CALL_FLAMES = 48258, - SPELL_RITUAL_OF_THE_SWORD = 48276, //Effect #1 Teleport, Effect #2 Dummy - SPELL_SINSTER_STRIKE = 15667, - H_SPELL_SINSTER_STRIKE = 59409, - SPELL_SVALA_TRANSFORMING1 = 54140, - SPELL_SVALA_TRANSFORMING2 = 54205 -}; -//not in db -enum Yells -{ - SAY_DIALOG_WITH_ARTHAS_1 = -1575015, - SAY_DIALOG_WITH_ARTHAS_2 = -1575016, - SAY_DIALOG_WITH_ARTHAS_3 = -1575017, - SAY_AGGRO = -1575018, - SAY_SLAY_1 = -1575019, - SAY_SLAY_2 = -1575020, - SAY_SLAY_3 = -1575021, - SAY_DEATH = -1575022, - SAY_SACRIFICE_PLAYER_1 = -1575023, - SAY_SACRIFICE_PLAYER_2 = -1575024, - SAY_SACRIFICE_PLAYER_3 = -1575025, - SAY_SACRIFICE_PLAYER_4 = -1575026, - SAY_SACRIFICE_PLAYER_5 = -1575027, - SAY_DIALOG_OF_ARTHAS_1 = -1575028, - SAY_DIALOG_OF_ARTHAS_2 = -1575029 -}; -enum Creatures -{ - CREATURE_ARTHAS = 24266, // Image of Arthas - CREATURE_SVALA_SORROWGRAVE = 26668, // Svala after transformation - CREATURE_SVALA = 29281, // Svala before transformation - CREATURE_RITUAL_CHANNELER = 27281 -}; -enum ChannelerSpells -{ - //ritual channeler's spells - SPELL_PARALYZE = 48278, - SPELL_SHADOWS_IN_THE_DARK = 59407 -}; -enum Misc -{ - DATA_SVALA_DISPLAY_ID = 25944 -}; -enum IntroPhase -{ - IDLE, - INTRO, - FINISHED -}; -enum CombatPhase -{ - NORMAL, - SACRIFICING -}; - -static Position RitualChannelerPos[]= -{ - {296.42, -355.01, 90.94}, - {302.36, -352.01, 90.54}, - {291.39, -350.89, 90.54} -}; -static Position ArthasPos = { 295.81, -366.16, 92.57, 1.58 }; -static Position SvalaPos = { 296.632, -346.075, 90.6307, 1.58 }; - -struct boss_svalaAI : public ScriptedAI -{ - boss_svalaAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - } - - uint32 uiIntroTimer; - - uint8 uiIntroPhase; - - IntroPhase Phase; - - TempSummon* pArthas; - uint64 uiArthasGUID; - - ScriptedInstance* pInstance; - - void Reset() - { - Phase = IDLE; - uiIntroTimer = 1*IN_MILISECONDS; - uiIntroPhase = 0; - uiArthasGUID = 0; - - if (pInstance) - pInstance->SetData(DATA_SVALA_SORROWGRAVE_EVENT, NOT_STARTED); - } - - void MoveInLineOfSight(Unit* pWho) - { - if (!pWho) - return; - - if (Phase == IDLE && pWho->isTargetableForAttack() && me->IsHostileTo(pWho) && me->IsWithinDistInMap(pWho, 40)) - { - Phase = INTRO; - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - - if (Creature *pArthas = me->SummonCreature(CREATURE_ARTHAS, ArthasPos, TEMPSUMMON_MANUAL_DESPAWN)) - { - pArthas->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE); - pArthas->SetFloatValue(OBJECT_FIELD_SCALE_X, 5); - uiArthasGUID = pArthas->GetGUID(); - } - } - } - - void AttackStart(Unit* /*who*/) {} - - void UpdateAI(const uint32 diff) - { - if (Phase != INTRO) - return; - - if (uiIntroTimer <= diff) - { - Creature *pArthas = Unit::GetCreature(*me, uiArthasGUID); - if (!pArthas) - return; - - switch (uiIntroPhase) - { - case 0: - DoScriptText(SAY_DIALOG_WITH_ARTHAS_1, me); - ++uiIntroPhase; - uiIntroTimer = 3.5*IN_MILISECONDS; - break; - case 1: - DoScriptText(SAY_DIALOG_OF_ARTHAS_1, pArthas); - ++uiIntroPhase; - uiIntroTimer = 3.5*IN_MILISECONDS; - break; - case 2: - DoScriptText(SAY_DIALOG_WITH_ARTHAS_2, me); - ++uiIntroPhase; - uiIntroTimer = 3.5*IN_MILISECONDS; - break; - case 3: - DoScriptText(SAY_DIALOG_OF_ARTHAS_2, pArthas); - ++uiIntroPhase; - uiIntroTimer = 3.5*IN_MILISECONDS; - break; - case 4: - DoScriptText(SAY_DIALOG_WITH_ARTHAS_3, me); - DoCast(me, SPELL_SVALA_TRANSFORMING1); - ++uiIntroPhase; - uiIntroTimer = 2.8*IN_MILISECONDS; - break; - case 5: - DoCast(me, SPELL_SVALA_TRANSFORMING2); - ++uiIntroPhase; - uiIntroTimer = 200; - break; - case 6: - if (Creature* pSvalaSorrowgrave = me->SummonCreature(CREATURE_SVALA_SORROWGRAVE, SvalaPos, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 60*IN_MILISECONDS)) - { - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE); - me->SetDisplayId(DATA_SVALA_DISPLAY_ID); - pArthas->ToTempSummon()->UnSummon(); - uiArthasGUID = 0; - Phase = FINISHED; - } - else - Reset(); - break; - } - } else uiIntroTimer -= diff; - } -}; - -struct mob_ritual_channelerAI : public Scripted_NoMovementAI -{ - mob_ritual_channelerAI(Creature *c) :Scripted_NoMovementAI(c) - { - pInstance = c->GetInstanceData(); - } - - ScriptedInstance* pInstance; - - void Reset() - { - DoCast(me, SPELL_SHADOWS_IN_THE_DARK); - } - - // called by svala sorrowgrave to set guid of victim - void DoAction(uint32 /*action*/) - { - if (pInstance) - if (Unit *pVictim = me->GetUnit(*me, pInstance->GetData64(DATA_SACRIFICED_PLAYER))) - DoCast(pVictim, SPELL_PARALYZE); - } - - void EnterCombat(Unit* /*who*/) - { - } -}; - -struct boss_svala_sorrowgraveAI : public ScriptedAI -{ - boss_svala_sorrowgraveAI(Creature *c) : ScriptedAI(c), summons(c) - { - pInstance = c->GetInstanceData(); - } - - uint32 uiSinsterStrikeTimer; - uint32 uiCallFlamesTimer; - uint32 uiRitualOfSwordTimer; - uint32 uiSacrificeTimer; - - CombatPhase Phase; - - SummonList summons; - - bool bSacrificed; - - ScriptedInstance* pInstance; - - void Reset() - { - uiSinsterStrikeTimer = 7*IN_MILISECONDS; - uiCallFlamesTimer = 10*IN_MILISECONDS; - uiRitualOfSwordTimer = 20*IN_MILISECONDS; - uiSacrificeTimer = 8*IN_MILISECONDS; - - bSacrificed = false; - - Phase = NORMAL; - - DoTeleportTo(296.632, -346.075, 90.6307); - me->SetUnitMovementFlags(MOVEMENTFLAG_WALK_MODE); - - summons.DespawnAll(); - - if (pInstance) - { - pInstance->SetData(DATA_SVALA_SORROWGRAVE_EVENT, NOT_STARTED); - pInstance->SetData64(DATA_SACRIFICED_PLAYER,0); - } - } - - void EnterCombat(Unit* /*who*/) - { - DoScriptText(SAY_AGGRO, me); - - if (pInstance) - pInstance->SetData(DATA_SVALA_SORROWGRAVE_EVENT, IN_PROGRESS); - } - - void JustSummoned(Creature *summon) - { - summons.Summon(summon); - } - - void SummonedCreatureDespawn(Creature *summon) - { - summons.Despawn(summon); - } - - void UpdateAI(const uint32 diff) - { - if (Phase == NORMAL) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - if (uiSinsterStrikeTimer <= diff) - { - DoCast(me->getVictim(), SPELL_SINSTER_STRIKE); - uiSinsterStrikeTimer = urand(5*IN_MILISECONDS,9*IN_MILISECONDS); - } else uiSinsterStrikeTimer -= diff; - - if (uiCallFlamesTimer <= diff) - { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - { - DoCast(pTarget, SPELL_CALL_FLAMES); - uiCallFlamesTimer = urand(8*IN_MILISECONDS,12*IN_MILISECONDS); - } - } else uiCallFlamesTimer -= diff; - - if (!bSacrificed) - if (uiRitualOfSwordTimer <= diff) - { - if (Unit* pSacrificeTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - { - DoScriptText(RAND(SAY_SACRIFICE_PLAYER_1,SAY_SACRIFICE_PLAYER_2,SAY_SACRIFICE_PLAYER_3,SAY_SACRIFICE_PLAYER_4,SAY_SACRIFICE_PLAYER_5),me); - DoCast(pSacrificeTarget, SPELL_RITUAL_OF_THE_SWORD); - //Spell doesn't teleport - DoTeleportPlayer(pSacrificeTarget, 296.632, -346.075, 90.63, 4.6); - me->SetUnitMovementFlags(MOVEMENTFLAG_FLY_MODE); - DoTeleportTo(296.632, -346.075, 120.85); - Phase = SACRIFICING; - if (pInstance) - { - pInstance->SetData64(DATA_SACRIFICED_PLAYER,pSacrificeTarget->GetGUID()); - - for (uint8 i = 0; i < 3; ++i) - if (Creature* pSummon = me->SummonCreature(CREATURE_RITUAL_CHANNELER, RitualChannelerPos[i], TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 360000)) - pSummon->AI()->DoAction(0); - } - - bSacrificed = true; - } - } else uiRitualOfSwordTimer -= diff; - - DoMeleeAttackIfReady(); - } - else //SACRIFICING - { - if (uiSacrificeTimer <= diff) - { - Unit* pSacrificeTarget = pInstance ? Unit::GetUnit(*me, pInstance->GetData64(DATA_SACRIFICED_PLAYER)) : NULL; - if (pInstance && !summons.empty() && pSacrificeTarget && pSacrificeTarget->isAlive()) - me->Kill(pSacrificeTarget, false); // durability damage? - - //go down - Phase = NORMAL; - pSacrificeTarget = NULL; - me->SetUnitMovementFlags(MOVEMENTFLAG_WALK_MODE); - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - me->GetMotionMaster()->MoveChase(pTarget); - - uiSacrificeTimer = 8*IN_MILISECONDS; - } - else uiSacrificeTimer -= diff; - } - } - - void KilledUnit(Unit* /*pVictim*/) - { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); - } - - void JustDied(Unit* pKiller) - { - if (pInstance) - { - Creature* pSvala = Unit::GetCreature((*me), pInstance->GetData64(DATA_SVALA)); - if (pSvala && pSvala->isAlive()) - pKiller->Kill(pSvala); - - pInstance->SetData(DATA_SVALA_SORROWGRAVE_EVENT, DONE); - } - DoScriptText(SAY_DEATH, me); - } -}; - -CreatureAI* GetAI_boss_svala(Creature* pCreature) -{ - return new boss_svalaAI (pCreature); -} - -CreatureAI* GetAI_mob_ritual_channeler(Creature* pCreature) -{ - return new mob_ritual_channelerAI(pCreature); -} - -CreatureAI* GetAI_boss_svala_sorrowgrave(Creature* pCreature) -{ - return new boss_svala_sorrowgraveAI(pCreature); -} - -void AddSC_boss_svala() -{ - Script *newscript; - - newscript = new Script; - newscript->Name = "boss_svala"; - newscript->GetAI = &GetAI_boss_svala; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_ritual_channeler"; - newscript->GetAI = &GetAI_mob_ritual_channeler; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "boss_svala_sorrowgrave"; - newscript->GetAI = &GetAI_boss_svala_sorrowgrave; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Northrend/UtgardeKeep/utgarde_pinnacle/boss_ymiron.cpp b/src/server/scripts/Northrend/UtgardeKeep/utgarde_pinnacle/boss_ymiron.cpp deleted file mode 100644 index 1a650f94101..00000000000 --- a/src/server/scripts/Northrend/UtgardeKeep/utgarde_pinnacle/boss_ymiron.cpp +++ /dev/null @@ -1,367 +0,0 @@ -/* Script Data Start -SDName: Boss ymiron -SDAuthor: LordVanMartin -SD%Complete: -SDComment: -SDCategory: -Script Data End */ - -/*** SQL START *** -update creature_template set scriptname = 'boss_ymiron' where entry = ''; -*** SQL END ***/ -#include "ScriptedPch.h" -#include "utgarde_pinnacle.h" - -enum Spells -{ - SPELL_BANE = 48294, - H_SPELL_BANE = 59301, - SPELL_DARK_SLASH = 48292, - SPELL_FETID_ROT = 48291, - H_SPELL_FETID_ROT = 59300, - SPELL_SCREAMS_OF_THE_DEAD = 51750, - SPELL_SPIRIT_BURST = 48529, - H_SPELL_SPIRIT_BURST = 59305, - SPELL_SPIRIT_STRIKE = 48423, - H_SPELL_SPIRIT_STRIKE = 59304, - SPELL_ANCESTORS_VENGEANCE = 16939, - - SPELL_SUMMON_AVENGING_SPIRIT = 48592, - SPELL_SUMMON_SPIRIT_FOUNT = 48386, - - SPELL_CHANNEL_SPIRIT_TO_YMIRON = 48316, - SPELL_CHANNEL_YMIRON_TO_SPIRIT = 48307, - - SPELL_SPIRIT_FOUNT = 48380, - H_SPELL_SPIRIT_FOUNT = 59320 -}; - -//not in db -enum Yells -{ - SAY_AGGRO = -1575028, - SAY_SLAY_1 = -1575029, - SAY_SLAY_2 = -1575030, - SAY_SLAY_3 = -1575031, - SAY_SLAY_4 = -1575032, - SAY_DEATH = -1575033, - SAY_SUMMON_BJORN = -1575034, - SAY_SUMMON_HALDOR = -1575035, - SAY_SUMMON_RANULF = -1575036, - SAY_SUMMON_TORGYN = -1575037 -}; - -enum Creatures -{ - CREATURE_BJORN = 27303, - CREATURE_BJORN_VISUAL = 27304, - CREATURE_HALDOR = 27307, - CREATURE_HALDOR_VISUAL = 27310, - CREATURE_RANULF = 27308, - CREATURE_RANULF_VISUAL = 27311, - CREATURE_TORGYN = 27309, - CREATURE_TORGYN_VISUAL = 27312, - CREATURE_SPIRIT_FOUNT = 27339, - CREATURE_AVENGING_SPIRIT = 27386 -}; - -struct ActiveBoatStruct -{ - uint32 npc; - int32 say; - float MoveX,MoveY,MoveZ,SpawnX,SpawnY,SpawnZ,SpawnO; -}; - -static ActiveBoatStruct ActiveBot[4] = -{ - {CREATURE_BJORN_VISUAL, SAY_SUMMON_BJORN, 404.379, -335.335, 104.756, 413.594, -335.408, 107.995, 3.157}, - {CREATURE_HALDOR_VISUAL, SAY_SUMMON_HALDOR, 380.813, -335.069, 104.756, 369.994, -334.771, 107.995, 6.232}, - {CREATURE_RANULF_VISUAL, SAY_SUMMON_RANULF, 381.546, -314.362, 104.756, 370.841, -314.426, 107.995, 6.232}, - {CREATURE_TORGYN_VISUAL, SAY_SUMMON_TORGYN, 404.310, -314.761, 104.756, 413.992, -314.703, 107.995, 3.157} -}; - -struct boss_ymironAI : public ScriptedAI -{ - boss_ymironAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - srand(time(NULL)); - for (int i = 0; i < 4; ++i) - m_uiActiveOrder[i] = i; - for (int i = 0; i < 3; ++i) - { - int r = i + (rand()%(4-i)); - int temp = m_uiActiveOrder[i]; - m_uiActiveOrder[i] = m_uiActiveOrder[r]; - m_uiActiveOrder[r] = temp; - } - } - - bool m_bIsWalking; - bool m_bIsPause; - bool m_bIsActiveWithBJORN; - bool m_bIsActiveWithHALDOR; - bool m_bIsActiveWithRANULF; - bool m_bIsActiveWithTORGYN; - - uint8 m_uiActiveOrder[4]; - uint8 m_uiActivedNumber; - - uint32 m_uiFetidRot_Timer; - uint32 m_uiBane_Timer; - uint32 m_uiDarkSlash_Timer; - uint32 m_uiAncestors_Vengeance_Timer; - - uint32 m_uiAbility_BJORN_Timer; - uint32 m_uiAbility_HALDOR_Timer; - uint32 m_uiAbility_RANULF_Timer; - uint32 m_uiAbility_TORGYN_Timer; - - uint32 m_uiPause_Timer; - uint32 m_uiHealthAmountModifier; - uint32 m_uiHealthAmountMultipler; - - uint64 m_uiActivedCreatureGUID; - uint64 m_uiOrbGUID; - - ScriptedInstance *pInstance; - - void Reset() - { - m_bIsPause = false; - m_bIsActiveWithBJORN = false; - m_bIsActiveWithHALDOR = false; - m_bIsActiveWithRANULF = false; - m_bIsActiveWithTORGYN = false; - - m_uiFetidRot_Timer = urand(8000,13000); - m_uiBane_Timer = urand(18000,23000); - m_uiDarkSlash_Timer = urand(28000,33000); - m_uiAncestors_Vengeance_Timer = DUNGEON_MODE(60000,45000); - m_uiPause_Timer = 0; - - m_uiAbility_BJORN_Timer = 0; - m_uiAbility_HALDOR_Timer = 0; - m_uiAbility_RANULF_Timer = 0; - m_uiAbility_TORGYN_Timer = 0; - - m_uiActivedNumber = 0; - m_uiHealthAmountModifier = 1; - m_uiHealthAmountMultipler = DUNGEON_MODE(20,25); - - DespawnBoatGhosts(m_uiActivedCreatureGUID); - DespawnBoatGhosts(m_uiOrbGUID); - - if (pInstance) - pInstance->SetData(DATA_KING_YMIRON_EVENT, NOT_STARTED); - } - - void EnterCombat(Unit* /*who*/) - { - DoScriptText(SAY_AGGRO, me); - - if (pInstance) - pInstance->SetData(DATA_KING_YMIRON_EVENT, IN_PROGRESS); - } - - void UpdateAI(const uint32 diff) - { - if (m_bIsWalking) - { - if (m_uiPause_Timer <= diff) - { - DoScriptText(ActiveBot[m_uiActiveOrder[m_uiActivedNumber]].say, me); - DoCast(me, SPELL_CHANNEL_YMIRON_TO_SPIRIT); // should be on spirit - if (Creature* pTemp = me->SummonCreature(ActiveBot[m_uiActiveOrder[m_uiActivedNumber]].npc, ActiveBot[m_uiActiveOrder[m_uiActivedNumber]].SpawnX, ActiveBot[m_uiActiveOrder[m_uiActivedNumber]].SpawnY, ActiveBot[m_uiActiveOrder[m_uiActivedNumber]].SpawnZ, ActiveBot[m_uiActiveOrder[m_uiActivedNumber]].SpawnO, TEMPSUMMON_CORPSE_DESPAWN, 0)) - { - m_uiActivedCreatureGUID = pTemp->GetGUID(); - pTemp->CastSpell(me, SPELL_CHANNEL_SPIRIT_TO_YMIRON, true); - pTemp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - pTemp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - pTemp->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); - switch(m_uiActiveOrder[m_uiActivedNumber]) - { - case 0: m_bIsActiveWithBJORN = true; break; - case 1: m_bIsActiveWithHALDOR = true; break; - case 2: m_bIsActiveWithRANULF = true; break; - case 3: m_bIsActiveWithTORGYN = true; break; - } - } - - m_bIsPause = true; - m_bIsWalking = false; - m_uiPause_Timer = 3000; - } else m_uiPause_Timer -= diff; - return; - } - else if (m_bIsPause) - { - if (m_uiPause_Timer <= diff) - { - m_uiAbility_BJORN_Timer = 5000; - m_uiAbility_HALDOR_Timer = 5000; - m_uiAbility_RANULF_Timer = 5000; - m_uiAbility_TORGYN_Timer = 5000; - - m_bIsPause = false; - m_uiPause_Timer = 0; - } else m_uiPause_Timer -= diff; - return; - } - - //Return since we have no target - if (!UpdateVictim()) - return; - - if (!m_bIsPause) - { - // Normal spells ------------------------------------------------------------------------ - if (m_uiBane_Timer <= diff) - { - DoCast(me, SPELL_BANE); - m_uiBane_Timer = urand(20000,25000); - } else m_uiBane_Timer -= diff; - - if (m_uiFetidRot_Timer <= diff) - { - DoCast(me->getVictim(), SPELL_FETID_ROT); - m_uiFetidRot_Timer = urand(10000,15000); - } else m_uiFetidRot_Timer -= diff; - - if (m_uiDarkSlash_Timer <= diff) - { - DoCast(me->getVictim(), SPELL_DARK_SLASH); - m_uiDarkSlash_Timer = urand(30000,35000); - } else m_uiDarkSlash_Timer -= diff; - - if (m_uiAncestors_Vengeance_Timer <= diff) - { - DoCast(me, SPELL_ANCESTORS_VENGEANCE); - m_uiAncestors_Vengeance_Timer = DUNGEON_MODE(urand(60000,65000),urand(45000,50000)); - } else m_uiAncestors_Vengeance_Timer -= diff; - - // Abilities ------------------------------------------------------------------------------ - if (m_bIsActiveWithBJORN && m_uiAbility_BJORN_Timer <= diff) - { - //DoCast(me, SPELL_SUMMON_SPIRIT_FOUNT); // works fine, but using summon has better control - if (Creature* pTemp = me->SummonCreature(CREATURE_SPIRIT_FOUNT, 385+rand()%10, -330+rand()%10, 104.756, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 180000)) - { - pTemp->SetSpeed(MOVE_RUN, 0.4f); - pTemp->CastSpell(pTemp, DUNGEON_MODE(SPELL_SPIRIT_FOUNT, H_SPELL_SPIRIT_FOUNT), true); - pTemp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - pTemp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - pTemp->SetDisplayId(11686); - //pTemp->GetMotionMaster()->MoveChase(me->getVictim()); - m_uiOrbGUID = pTemp->GetGUID(); - } - m_bIsActiveWithBJORN = false; // only one orb - } else m_uiAbility_BJORN_Timer -= diff; - - if (m_bIsActiveWithHALDOR && m_uiAbility_HALDOR_Timer <= diff) - { - DoCast(me->getVictim(), SPELL_SPIRIT_STRIKE); - m_uiAbility_HALDOR_Timer = 5000; // overtime - } else m_uiAbility_HALDOR_Timer -= diff; - - if (m_bIsActiveWithRANULF && m_uiAbility_RANULF_Timer <= diff) - { - DoCast(me, SPELL_SPIRIT_BURST); - m_uiAbility_RANULF_Timer = 10000; // overtime - } else m_uiAbility_RANULF_Timer -= diff; - - if (m_bIsActiveWithTORGYN && m_uiAbility_TORGYN_Timer <= diff) - { - float x,y,z; - x = me->GetPositionX()-5; - y = me->GetPositionY()-5; - z = me->GetPositionZ(); - for (uint8 i = 0; i < 4; ++i) - { - //DoCast(me, SPELL_SUMMON_AVENGING_SPIRIT); // works fine, but using summon has better control - if (Creature* pTemp = me->SummonCreature(CREATURE_AVENGING_SPIRIT, x+rand()%10, y+rand()%10, z, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000)) - { - if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - { - pTemp->AddThreat(pTarget, 0.0f); - pTemp->AI()->AttackStart(pTarget); - } - } - } - m_uiAbility_TORGYN_Timer = 15000; // overtime - } else m_uiAbility_TORGYN_Timer -= diff; - - // Health check ----------------------------------------------------------------------------- - if ((me->GetHealth()*100 / me->GetMaxHealth()) < (100-(m_uiHealthAmountMultipler * m_uiHealthAmountModifier))) - { - uint8 m_uiOrder = m_uiHealthAmountModifier - 1; - ++m_uiHealthAmountModifier; - - me->InterruptNonMeleeSpells(true); - DoCast(me, SPELL_SCREAMS_OF_THE_DEAD); - me->GetMotionMaster()->Clear(); - me->StopMoving(); - me->AttackStop(); - me->GetMotionMaster()->MovePoint(0, ActiveBot[m_uiActiveOrder[m_uiOrder]].MoveX, ActiveBot[m_uiActiveOrder[m_uiOrder]].MoveY, ActiveBot[m_uiActiveOrder[m_uiOrder]].MoveZ); - - DespawnBoatGhosts(m_uiActivedCreatureGUID); - DespawnBoatGhosts(m_uiOrbGUID); - - m_bIsActiveWithBJORN = false; - m_bIsActiveWithHALDOR = false; - m_bIsActiveWithRANULF = false; - m_bIsActiveWithTORGYN = false; - - m_uiBane_Timer += 8000; - m_uiFetidRot_Timer += 8000; - m_uiDarkSlash_Timer += 8000; - m_uiAncestors_Vengeance_Timer += 8000; - - m_uiActivedNumber = m_uiOrder; - m_bIsWalking = true; - m_uiPause_Timer = 2000; - return; - } - DoMeleeAttackIfReady(); - } - } - - void JustDied(Unit* /*killer*/) - { - DoScriptText(SAY_DEATH, me); - - DespawnBoatGhosts(m_uiActivedCreatureGUID); - DespawnBoatGhosts(m_uiOrbGUID); - - if (pInstance) - pInstance->SetData(DATA_KING_YMIRON_EVENT, DONE); - } - - void KilledUnit(Unit * /*victim*/) - { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3,SAY_SLAY_4), me); - } - - void DespawnBoatGhosts(uint64& m_uiCreatureGUID) - { - if (m_uiCreatureGUID) - if (Creature* pTemp = Unit::GetCreature(*me, m_uiCreatureGUID)) - pTemp->DisappearAndDie(); - - m_uiCreatureGUID = 0; - } -}; - -CreatureAI* GetAI_boss_ymiron(Creature* pCreature) -{ - return new boss_ymironAI(pCreature); -} - -void AddSC_boss_ymiron() -{ - Script *newscript; - - newscript = new Script; - newscript->Name = "boss_ymiron"; - newscript->GetAI = &GetAI_boss_ymiron; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Northrend/UtgardeKeep/utgarde_pinnacle/instance_pinnacle.cpp b/src/server/scripts/Northrend/UtgardeKeep/utgarde_pinnacle/instance_pinnacle.cpp deleted file mode 100644 index cf042867707..00000000000 --- a/src/server/scripts/Northrend/UtgardeKeep/utgarde_pinnacle/instance_pinnacle.cpp +++ /dev/null @@ -1,241 +0,0 @@ -#include "ScriptedPch.h" -#include "utgarde_pinnacle.h" - -#define MAX_ENCOUNTER 4 - -/* Utgarde Pinnacle encounters: -0 - Svala Sorrowgrave -1 - Gortok Palehoof -2 - Skadi the Ruthless -3 - King Ymiron -*/ - -enum GameObjects -{ - ENTRY_SKADI_THE_RUTHLESS_DOOR = 192173, - ENTRY_KING_YMIRON_DOOR = 192174, - ENTRY_GORK_PALEHOOF_SPHERE = 188593 -}; - -struct instance_pinnacle : public ScriptedInstance -{ - instance_pinnacle(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; - - uint64 uiSvalaSorrowgrave; - uint64 uiGortokPalehoof; - uint64 uiSkadiTheRuthless; - uint64 uiKingYmiron; - - uint64 uiSkadiTheRuthlessDoor; - uint64 uiKingYmironDoor; - uint64 uiGortokPalehoofSphere; - - uint64 uiFrenziedWorgen; - uint64 uiRavenousFurbolg; - uint64 uiFerociousRhino; - uint64 uiMassiveJormungar; - uint64 uiPalehoofOrb; - - uint64 uiSvala; - uint64 uiSacrificedPlayer; - - uint32 m_auiEncounter[MAX_ENCOUNTER]; - - std::string str_data; - - void Initialize() - { - for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) - m_auiEncounter[i] = NOT_STARTED; - - uiSvalaSorrowgrave = 0; - uiGortokPalehoof = 0; - uiSkadiTheRuthless = 0; - uiKingYmiron = 0; - - uiSkadiTheRuthlessDoor = 0; - uiKingYmironDoor = 0; - uiGortokPalehoofSphere = 0; - - uiFrenziedWorgen = 0; - uiRavenousFurbolg = 0; - uiFerociousRhino = 0; - uiMassiveJormungar = 0; - uiPalehoofOrb = 0; - - uiSvala = 0; - uiSacrificedPlayer = 0; - } - - bool IsEncounterInProgress() const - { - for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) - if (m_auiEncounter[i] == IN_PROGRESS) return true; - - return false; - } - - void OnCreatureCreate(Creature* pCreature, bool /*add*/) - { - switch(pCreature->GetEntry()) - { - case BOSS_SVALA_SORROWGRAVE: uiSvalaSorrowgrave = pCreature->GetGUID(); break; - case BOSS_GORTOK_PALEHOOF: uiGortokPalehoof = pCreature->GetGUID(); break; - case BOSS_SKADI_RUTHLESS: uiSkadiTheRuthless = pCreature->GetGUID(); break; - case BOSS_KING_YMIRON: uiKingYmiron = pCreature->GetGUID(); break; - case MOB_FRENZIED_WORGEN: uiFrenziedWorgen = pCreature->GetGUID(); break; - case MOB_RAVENOUS_FURBOLG: uiRavenousFurbolg = pCreature->GetGUID(); break; - case MOB_MASSIVE_JORMUNGAR: uiMassiveJormungar = pCreature->GetGUID(); break; - case MOB_FEROCIOUS_RHINO: uiFerociousRhino = pCreature->GetGUID(); break; - case MOB_SVALA: uiSvala = pCreature->GetGUID(); break; - case MOB_PALEHOOF_ORB: uiPalehoofOrb = pCreature->GetGUID(); break; - } - } - - void OnGameObjectCreate(GameObject* pGo, bool /*add*/) - { - switch(pGo->GetEntry()) - { - case ENTRY_SKADI_THE_RUTHLESS_DOOR: - uiSkadiTheRuthlessDoor = pGo->GetGUID(); - if (m_auiEncounter[2] == DONE) HandleGameObject(NULL,true,pGo); - break; - case ENTRY_KING_YMIRON_DOOR: - uiKingYmironDoor = pGo->GetGUID(); - if (m_auiEncounter[3] == DONE) HandleGameObject(NULL,true,pGo); - break; - case ENTRY_GORK_PALEHOOF_SPHERE: - uiGortokPalehoofSphere = pGo->GetGUID(); - if (m_auiEncounter[1] == DONE) - { - HandleGameObject(NULL,true,pGo); - pGo->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); - } - break; - } - } - - void SetData(uint32 type, uint32 data) - { - switch(type) - { - case DATA_SVALA_SORROWGRAVE_EVENT: - m_auiEncounter[0] = data; - break; - case DATA_GORTOK_PALEHOOF_EVENT: - m_auiEncounter[1] = data; - break; - case DATA_SKADI_THE_RUTHLESS_EVENT: - if (data == DONE) - HandleGameObject(uiSkadiTheRuthlessDoor,true); - m_auiEncounter[2] = data; - break; - case DATA_KING_YMIRON_EVENT: - if (data == DONE) - HandleGameObject(uiKingYmironDoor,true); - m_auiEncounter[3] = data; - break; - } - - if (data == DONE) - SaveToDB(); - } - - void SetData64(uint32 type, uint64 data) - { - if (type == DATA_SACRIFICED_PLAYER) - uiSacrificedPlayer = data; - } - - uint32 GetData(uint32 type) - { - switch(type) - { - case DATA_SVALA_SORROWGRAVE_EVENT: return m_auiEncounter[0]; - case DATA_GORTOK_PALEHOOF_EVENT: return m_auiEncounter[1]; - case DATA_SKADI_THE_RUTHLESS_EVENT: return m_auiEncounter[2]; - case DATA_KING_YMIRON_EVENT: return m_auiEncounter[3]; - } - return 0; - } - - uint64 GetData64(uint32 identifier) - { - switch(identifier) - { - case DATA_SVALA_SORROWGRAVE: return uiSvalaSorrowgrave; - case DATA_GORTOK_PALEHOOF: return uiGortokPalehoof; - case DATA_SKADI_THE_RUTHLESS: return uiSkadiTheRuthless; - case DATA_KING_YMIRON: return uiKingYmiron; - case DATA_MOB_FRENZIED_WORGEN: return uiFrenziedWorgen; - case DATA_MOB_RAVENOUS_FURBOLG: return uiRavenousFurbolg; - case DATA_MOB_MASSIVE_JORMUNGAR: return uiMassiveJormungar; - case DATA_MOB_FEROCIOUS_RHINO: return uiFerociousRhino; - case DATA_MOB_ORB: return uiPalehoofOrb; - case DATA_SVALA: return uiSvala; - case DATA_GORTOK_PALEHOOF_SPHERE: return uiGortokPalehoofSphere; - } - - return 0; - } - - std::string GetSaveData() - { - OUT_SAVE_INST_DATA; - - std::ostringstream saveStream; - saveStream << "U P " << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " - << m_auiEncounter[2] << " " << m_auiEncounter[3]; - - str_data = saveStream.str(); - - OUT_SAVE_INST_DATA_COMPLETE; - return str_data; - } - - void Load(const char* in) - { - if (!in) - { - OUT_LOAD_INST_DATA_FAIL; - return; - } - - OUT_LOAD_INST_DATA(in); - - char dataHead1, dataHead2; - uint16 data0, data1, data2, data3; - - std::istringstream loadStream(in); - loadStream >> dataHead1 >> dataHead2 >> data0 >> data1 >> data2 >> data3; - - if (dataHead1 == 'U' && dataHead2 == 'P') - { - m_auiEncounter[0] = data0; - m_auiEncounter[1] = data1; - m_auiEncounter[2] = data2; - m_auiEncounter[3] = data3; - - for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) - if (m_auiEncounter[i] == IN_PROGRESS) - m_auiEncounter[i] = NOT_STARTED; - - } else OUT_LOAD_INST_DATA_FAIL; - - OUT_LOAD_INST_DATA_COMPLETE; - } -}; - -InstanceData* GetInstanceData_instance_utgarde_pinnacle(Map* pMap) -{ - return new instance_pinnacle(pMap); -} - -void AddSC_instance_utgarde_pinnacle() -{ - Script *newscript; - newscript = new Script; - newscript->Name = "instance_utgarde_pinnacle"; - newscript->GetInstanceData = &GetInstanceData_instance_utgarde_pinnacle; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Northrend/UtgardeKeep/utgarde_pinnacle/utgarde_pinnacle.h b/src/server/scripts/Northrend/UtgardeKeep/utgarde_pinnacle/utgarde_pinnacle.h deleted file mode 100644 index a51d7aceda0..00000000000 --- a/src/server/scripts/Northrend/UtgardeKeep/utgarde_pinnacle/utgarde_pinnacle.h +++ /dev/null @@ -1,42 +0,0 @@ -#ifndef DEF_PINNACLE_H -#define DEF_PINNACLE_H - -enum Data -{ - DATA_SVALA_SORROWGRAVE_EVENT, - DATA_GORTOK_PALEHOOF_EVENT, - DATA_SKADI_THE_RUTHLESS_EVENT, - DATA_KING_YMIRON_EVENT -}; -enum Data64 -{ - DATA_SVALA, - DATA_SVALA_SORROWGRAVE, - DATA_GORTOK_PALEHOOF, - DATA_SKADI_THE_RUTHLESS, - DATA_MOB_GRAUF, - DATA_KING_YMIRON, - DATA_MOB_FRENZIED_WORGEN, - DATA_MOB_RAVENOUS_FURBOLG, - DATA_MOB_MASSIVE_JORMUNGAR, - DATA_MOB_FEROCIOUS_RHINO, - DATA_MOB_ORB, - DATA_GORTOK_PALEHOOF_SPHERE, - DATA_SACRIFICED_PLAYER -}; - -enum eCreatures -{ - BOSS_SVALA_SORROWGRAVE = 26668, - BOSS_GORTOK_PALEHOOF = 26687, - BOSS_SKADI_RUTHLESS = 26693, - BOSS_KING_YMIRON = 26861, - MOB_FRENZIED_WORGEN = 26683, - MOB_RAVENOUS_FURBOLG = 26684, - MOB_MASSIVE_JORMUNGAR = 26685, - MOB_FEROCIOUS_RHINO = 26686, - MOB_SVALA = 29281, - MOB_PALEHOOF_ORB = 26688, -}; - -#endif diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp new file mode 100644 index 00000000000..bfde95ffcb0 --- /dev/null +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp @@ -0,0 +1,348 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Boss_Exarch_Maladaar +SD%Complete: 95 +SDComment: Most of event implemented, some adjustments to timers remain and possibly make some better code for switching his dark side in to better "images" of player. +SDCategory: Auchindoun, Auchenai Crypts +EndScriptData */ + +/* ContentData +mob_stolen_soul +boss_exarch_maladaar +mob_avatar_of_martyred +EndContentData */ + +#include "ScriptedPch.h" + +#define SPELL_MOONFIRE 37328 +#define SPELL_FIREBALL 37329 +#define SPELL_MIND_FLAY 37330 +#define SPELL_HEMORRHAGE 37331 +#define SPELL_FROSTSHOCK 37332 +#define SPELL_CURSE_OF_AGONY 37334 +#define SPELL_MORTAL_STRIKE 37335 +#define SPELL_FREEZING_TRAP 37368 +#define SPELL_HAMMER_OF_JUSTICE 37369 + +struct mob_stolen_soulAI : public ScriptedAI +{ + mob_stolen_soulAI(Creature *c) : ScriptedAI(c) {} + + uint8 myClass; + uint32 Class_Timer; + + void Reset() + { + Class_Timer = 1000; + } + + void EnterCombat(Unit * /*who*/) + { } + + void SetMyClass(uint8 myclass) + { + myClass = myclass; + } + + void UpdateAI(const uint32 diff) + { + if (!UpdateVictim()) + return; + + if (Class_Timer <= diff) + { + switch (myClass) + { + case CLASS_WARRIOR: + DoCast(me->getVictim(), SPELL_MORTAL_STRIKE); + Class_Timer = 6000; + break; + case CLASS_PALADIN: + DoCast(me->getVictim(), SPELL_HAMMER_OF_JUSTICE); + Class_Timer = 6000; + break; + case CLASS_HUNTER: + DoCast(me->getVictim(), SPELL_FREEZING_TRAP); + Class_Timer = 20000; + break; + case CLASS_ROGUE: + DoCast(me->getVictim(), SPELL_HEMORRHAGE); + Class_Timer = 10000; + break; + case CLASS_PRIEST: + DoCast(me->getVictim(), SPELL_MIND_FLAY); + Class_Timer = 5000; + break; + case CLASS_SHAMAN: + DoCast(me->getVictim(), SPELL_FROSTSHOCK); + Class_Timer = 8000; + break; + case CLASS_MAGE: + DoCast(me->getVictim(), SPELL_FIREBALL); + Class_Timer = 5000; + break; + case CLASS_WARLOCK: + DoCast(me->getVictim(), SPELL_CURSE_OF_AGONY); + Class_Timer = 20000; + break; + case CLASS_DRUID: + DoCast(me->getVictim(), SPELL_MOONFIRE); + Class_Timer = 10000; + break; + } + } else Class_Timer -= diff; + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_mob_stolen_soul(Creature* pCreature) +{ + return new mob_stolen_soulAI (pCreature); +} + +#define SAY_INTRO -1558000 +#define SAY_SUMMON -1558001 + +#define SAY_AGGRO_1 -1558002 +#define SAY_AGGRO_2 -1558003 +#define SAY_AGGRO_3 -1558004 + +#define SAY_ROAR -1558005 +#define SAY_SOUL_CLEAVE -1558006 + +#define SAY_SLAY_1 -1558007 +#define SAY_SLAY_2 -1558008 + +#define SAY_DEATH -1558009 + +#define SPELL_RIBBON_OF_SOULS 32422 +#define SPELL_SOUL_SCREAM 32421 + +#define SPELL_STOLEN_SOUL 32346 +#define SPELL_STOLEN_SOUL_VISUAL 32395 + +#define SPELL_SUMMON_AVATAR 32424 + +#define ENTRY_STOLEN_SOUL 18441 + +struct boss_exarch_maladaarAI : public ScriptedAI +{ + boss_exarch_maladaarAI(Creature *c) : ScriptedAI(c) + { + HasTaunted = false; + } + + uint32 soulmodel; + uint64 soulholder; + uint8 soulclass; + + uint32 Fear_timer; + uint32 Ribbon_of_Souls_timer; + uint32 StolenSoul_Timer; + + bool HasTaunted; + bool Avatar_summoned; + + void Reset() + { + soulmodel = 0; + soulholder = 0; + soulclass = 0; + + Fear_timer = 15000 + rand()% 5000; + Ribbon_of_Souls_timer = 5000; + StolenSoul_Timer = 25000 + rand()% 10000; + + Avatar_summoned = false; + } + + void MoveInLineOfSight(Unit *who) + { + if (!HasTaunted && me->IsWithinDistInMap(who, 150.0)) + { + DoScriptText(SAY_INTRO, me); + HasTaunted = true; + } + + ScriptedAI::MoveInLineOfSight(who); + } + + void EnterCombat(Unit * /*who*/) + { + DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); + } + + void JustSummoned(Creature *summoned) + { + if (summoned->GetEntry() == ENTRY_STOLEN_SOUL) + { + //SPELL_STOLEN_SOUL_VISUAL has shapeshift effect, but not implemented feature in Trinity for this spell. + summoned->CastSpell(summoned,SPELL_STOLEN_SOUL_VISUAL,false); + summoned->SetDisplayId(soulmodel); + summoned->setFaction(me->getFaction()); + + if (Unit *pTarget = Unit::GetUnit(*me,soulholder)) + { + + CAST_AI(mob_stolen_soulAI, summoned->AI())->SetMyClass(soulclass); + summoned->AI()->AttackStart(pTarget); + } + } + } + + void KilledUnit(Unit* /*victim*/) + { + if (rand()%2) + return; + + DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + } + + void JustDied(Unit* /*Killer*/) + { + DoScriptText(SAY_DEATH, me); + //When Exarch Maladar is defeated D'ore appear. + me->SummonCreature(19412, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 600000); + } + + void UpdateAI(const uint32 diff) + { + if (!UpdateVictim()) + return; + + if (!Avatar_summoned && ((me->GetHealth()*100) / me->GetMaxHealth() < 25)) + { + if (me->IsNonMeleeSpellCasted(false)) + me->InterruptNonMeleeSpells(true); + + DoScriptText(SAY_SUMMON, me); + + DoCast(me, SPELL_SUMMON_AVATAR); + Avatar_summoned = true; + StolenSoul_Timer = 15000 + rand()% 15000; + } + + if (StolenSoul_Timer <= diff) + { + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + { + if (pTarget->GetTypeId() == TYPEID_PLAYER) + { + if (me->IsNonMeleeSpellCasted(false)) + me->InterruptNonMeleeSpells(true); + + uint32 i = urand(1,2); + if (i == 1) + DoScriptText(SAY_ROAR, me); + else + DoScriptText(SAY_SOUL_CLEAVE, me); + + soulmodel = pTarget->GetDisplayId(); + soulholder = pTarget->GetGUID(); + soulclass = pTarget->getClass(); + + DoCast(pTarget, SPELL_STOLEN_SOUL); + me->SummonCreature(ENTRY_STOLEN_SOUL, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); + + StolenSoul_Timer = 20000 + rand()% 10000; + } else StolenSoul_Timer = 1000; + } + } else StolenSoul_Timer -= diff; + + if (Ribbon_of_Souls_timer <= diff) + { + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget, SPELL_RIBBON_OF_SOULS); + + Ribbon_of_Souls_timer = 5000 + (rand()%20 * 1000); + } else Ribbon_of_Souls_timer -= diff; + + if (Fear_timer <= diff) + { + DoCast(me, SPELL_SOUL_SCREAM); + Fear_timer = 15000 + rand()% 15000; + } else Fear_timer -= diff; + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_boss_exarch_maladaar(Creature* pCreature) +{ + return new boss_exarch_maladaarAI (pCreature); +} + +#define SPELL_AV_MORTAL_STRIKE 16856 +#define SPELL_AV_SUNDER_ARMOR 16145 + +struct mob_avatar_of_martyredAI : public ScriptedAI +{ + mob_avatar_of_martyredAI(Creature *c) : ScriptedAI(c) {} + + uint32 Mortal_Strike_timer; + + void Reset() + { + Mortal_Strike_timer = 10000; + } + + void EnterCombat(Unit * /*who*/) + { + } + + void UpdateAI(const uint32 diff) + { + if (!UpdateVictim()) + return; + + if (Mortal_Strike_timer <= diff) + { + DoCast(me->getVictim(), SPELL_AV_MORTAL_STRIKE); + Mortal_Strike_timer = 10000 + rand()%20 * 1000; + } else Mortal_Strike_timer -= diff; + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_mob_avatar_of_martyred(Creature* pCreature) +{ + return new mob_avatar_of_martyredAI (pCreature); +} + +void AddSC_boss_exarch_maladaar() +{ + Script *newscript; + + newscript = new Script; + newscript->Name = "boss_exarch_maladaar"; + newscript->GetAI = &GetAI_boss_exarch_maladaar; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_avatar_of_martyred"; + newscript->GetAI = &GetAI_mob_avatar_of_martyred; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_stolen_soul"; + newscript->GetAI = &GetAI_mob_stolen_soul; + newscript->RegisterSelf(); +} + diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp new file mode 100644 index 00000000000..c13e2905171 --- /dev/null +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp @@ -0,0 +1,211 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +Name: Boss_Shirrak_the_dead_watcher +%Complete: 80 +Comment: InhibitMagic should stack slower far from the boss, proper Visual for Focus Fire, heroic implemented +Category: Auchindoun, Auchenai Crypts +EndScriptData */ + +#include "ScriptedPch.h" + +#define SPELL_INHIBITMAGIC 32264 +#define SPELL_ATTRACTMAGIC 32265 +#define N_SPELL_CARNIVOROUSBITE 36383 +#define H_SPELL_CARNIVOROUSBITE 39382 +#define SPELL_CARNIVOROUSBITE DUNGEON_MODE(N_SPELL_CARNIVOROUSBITE, H_SPELL_CARNIVOROUSBITE) + +#define ENTRY_FOCUS_FIRE 18374 + +#define N_SPELL_FIERY_BLAST 32302 +#define H_SPELL_FIERY_BLAST 38382 +#define SPELL_FIERY_BLAST DUNGEON_MODE(N_SPELL_FIERY_BLAST, H_SPELL_FIERY_BLAST) +#define SPELL_FOCUS_FIRE_VISUAL 42075 //need to find better visual + +#define EMOTE_FOCUSES_ON "focuses on " + +struct boss_shirrak_the_dead_watcherAI : public ScriptedAI +{ + boss_shirrak_the_dead_watcherAI(Creature *c) : ScriptedAI(c) + { + } + + uint32 Inhibitmagic_Timer; + uint32 Attractmagic_Timer; + uint32 Carnivorousbite_Timer; + uint32 FocusFire_Timer; + + uint64 FocusedTargetGUID; + + void Reset() + { + Inhibitmagic_Timer = 0; + Attractmagic_Timer = 28000; + Carnivorousbite_Timer = 10000; + FocusFire_Timer = 17000; + FocusedTargetGUID = 0; + } + + void EnterCombat(Unit * /*who*/) + { } + + void JustSummoned(Creature *summoned) + { + if (summoned && summoned->GetEntry() == ENTRY_FOCUS_FIRE) + { + summoned->CastSpell(summoned,SPELL_FOCUS_FIRE_VISUAL,false); + summoned->setFaction(me->getFaction()); + summoned->SetLevel(me->getLevel()); + summoned->addUnitState(UNIT_STAT_ROOT); + + if (Unit *pFocusedTarget = Unit::GetUnit(*me, FocusedTargetGUID)) + summoned->AI()->AttackStart(pFocusedTarget); + } + } + + void UpdateAI(const uint32 diff) + { + //Inhibitmagic_Timer + if (Inhibitmagic_Timer <= diff) + { + float dist; + Map* pMap = me->GetMap(); + Map::PlayerList const &PlayerList = pMap->GetPlayers(); + for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) + if (Player* i_pl = i->getSource()) + if (i_pl->isAlive() && (dist = i_pl->IsWithinDist(me, 45))) + { + i_pl->RemoveAurasDueToSpell(SPELL_INHIBITMAGIC); + me->AddAura(SPELL_INHIBITMAGIC, i_pl); + if (dist < 35) + me->AddAura(SPELL_INHIBITMAGIC, i_pl); + if (dist < 25) + me->AddAura(SPELL_INHIBITMAGIC, i_pl); + if (dist < 15) + me->AddAura(SPELL_INHIBITMAGIC, i_pl); + } + Inhibitmagic_Timer = 3000+(rand()%1000); + } else Inhibitmagic_Timer -= diff; + + //Return since we have no target + if (!UpdateVictim()) + return; + + //Attractmagic_Timer + if (Attractmagic_Timer <= diff) + { + DoCast(me, SPELL_ATTRACTMAGIC); + Attractmagic_Timer = 30000; + Carnivorousbite_Timer = 1500; + } else Attractmagic_Timer -= diff; + + //Carnivorousbite_Timer + if (Carnivorousbite_Timer <= diff) + { + DoCast(me, SPELL_CARNIVOROUSBITE); + Carnivorousbite_Timer = 10000; + } else Carnivorousbite_Timer -= diff; + + //FocusFire_Timer + if (FocusFire_Timer <= diff) + { + // Summon Focus Fire & Emote + Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,1); + if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER && pTarget->isAlive()) + { + FocusedTargetGUID = pTarget->GetGUID(); + me->SummonCreature(ENTRY_FOCUS_FIRE,pTarget->GetPositionX(),pTarget->GetPositionY(),pTarget->GetPositionZ(),0,TEMPSUMMON_TIMED_DESPAWN,5500); + + // TODO: Find better way to handle emote + // Emote + std::string *emote = new std::string(EMOTE_FOCUSES_ON); + emote->append(pTarget->GetName()); + emote->append("!"); + const char* text = emote->c_str(); + me->MonsterTextEmote(text, 0, true); + delete emote; + } + FocusFire_Timer = 15000+(rand()%5000); + } else FocusFire_Timer -= diff; + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_boss_shirrak_the_dead_watcher(Creature* pCreature) +{ + return new boss_shirrak_the_dead_watcherAI (pCreature); +} + +struct mob_focus_fireAI : public ScriptedAI +{ + mob_focus_fireAI(Creature *c) : ScriptedAI(c) + { + } + + uint32 FieryBlast_Timer; + bool fiery1, fiery2; + + void Reset() + { + FieryBlast_Timer = 3000+(rand()%1000); + fiery1 = fiery2 = true; + } + + void EnterCombat(Unit * /*who*/) + { } + + void UpdateAI(const uint32 diff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + //FieryBlast_Timer + if (fiery2 && FieryBlast_Timer <= diff) + { + DoCast(me, SPELL_FIERY_BLAST); + + if (fiery1) fiery1 = false; + else if (fiery2) fiery2 = false; + + FieryBlast_Timer = 1000; + } else FieryBlast_Timer -= diff; + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_mob_focus_fire(Creature* pCreature) +{ + return new mob_focus_fireAI (pCreature); +} + +void AddSC_boss_shirrak_the_dead_watcher() +{ + Script *newscript; + newscript = new Script; + newscript->Name = "boss_shirrak_the_dead_watcher"; + newscript->GetAI = &GetAI_boss_shirrak_the_dead_watcher; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_focus_fire"; + newscript->GetAI = &GetAI_mob_focus_fire; + newscript->RegisterSelf(); +} + diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp new file mode 100644 index 00000000000..5b15178c33e --- /dev/null +++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp @@ -0,0 +1,358 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Boss_NexusPrince_Shaffar +SD%Complete: 80 +SDComment: Need more tuning of spell timers, it should not be as linear fight as current. Also should possibly find a better way to deal with his three initial beacons to make sure all aggro. +SDCategory: Auchindoun, Mana Tombs +EndScriptData */ + +/* ContentData +boss_nexusprince_shaffar +mob_ethereal_beacon +EndContentData */ + +#include "ScriptedPch.h" + +enum ePrince +{ + SAY_INTRO = -1557000, + SAY_AGGRO_1 = -1557001, + SAY_AGGRO_2 = -1557002, + SAY_AGGRO_3 = -1557003, + SAY_SLAY_1 = -1557004, + SAY_SLAY_2 = -1557005, + SAY_SUMMON = -1557006, + SAY_DEAD = -1557007, + + SPELL_BLINK = 34605, + SPELL_FROSTBOLT = 32364, + SPELL_FIREBALL = 32363, + SPELL_FROSTNOVA = 32365, + + SPELL_ETHEREAL_BEACON = 32371, // Summons NPC_BEACON + SPELL_ETHEREAL_BEACON_VISUAL = 32368, + + NPC_BEACON = 18431, + NPC_SHAFFAR = 18344, + + NR_INITIAL_BEACONS = 3 +}; + +struct boss_nexusprince_shaffarAI : public ScriptedAI +{ + boss_nexusprince_shaffarAI(Creature *c) : ScriptedAI(c), summons(me) { HasTaunted = false; } + + uint32 Blink_Timer; + uint32 Beacon_Timer; + uint32 FireBall_Timer; + uint32 Frostbolt_Timer; + uint32 FrostNova_Timer; + + SummonList summons; + + bool HasTaunted; + bool CanBlink; + + void Reset() + { + Blink_Timer = 1500; + Beacon_Timer = 10000; + FireBall_Timer = 8000; + Frostbolt_Timer = 4000; + FrostNova_Timer = 15000; + + CanBlink = false; + + float dist = 8.0f; + float posX, posY, posZ, angle; + me->GetHomePosition(posX, posY, posZ, angle); + + me->SummonCreature(NPC_BEACON, posX - dist, posY - dist, posZ, angle, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 7200000); + me->SummonCreature(NPC_BEACON, posX - dist, posY + dist, posZ, angle, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 7200000); + me->SummonCreature(NPC_BEACON, posX + dist, posY, posZ, angle, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 7200000); + } + + void EnterEvadeMode() + { + summons.DespawnAll(); + ScriptedAI::EnterEvadeMode(); + } + + void MoveInLineOfSight(Unit *who) + { + if (!HasTaunted && who->GetTypeId() == TYPEID_PLAYER && me->IsWithinDistInMap(who, 100.0f)) + { + DoScriptText(SAY_INTRO, me); + HasTaunted = true; + } + } + + void EnterCombat(Unit * /*who*/) + { + DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); + + DoZoneInCombat(); + summons.DoZoneInCombat(); + } + + void JustSummoned(Creature *summoned) + { + if (summoned->GetEntry() == NPC_BEACON) + { + summoned->CastSpell(summoned,SPELL_ETHEREAL_BEACON_VISUAL,false); + + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + summoned->AI()->AttackStart(pTarget); + } + + summons.Summon(summoned); + } + + void SummonedCreatureDespawn(Creature *summon) + { + summons.Despawn(summon); + } + + void KilledUnit(Unit* /*victim*/) + { + DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + } + + void JustDied(Unit* /*Killer*/) + { + DoScriptText(SAY_DEAD, me); + summons.DespawnAll(); + } + + void UpdateAI(const uint32 diff) + { + if (!UpdateVictim()) + return; + + if (FrostNova_Timer <= diff) + { + if (me->IsNonMeleeSpellCasted(false)) + me->InterruptNonMeleeSpells(true); + + DoCast(me, SPELL_FROSTNOVA); + FrostNova_Timer = 17500 + rand()%7500; + CanBlink = true; + } else FrostNova_Timer -= diff; + + if (Frostbolt_Timer <= diff) + { + DoCast(me->getVictim(), SPELL_FROSTBOLT); + Frostbolt_Timer = 4500 + rand()%1500; + } else Frostbolt_Timer -= diff; + + if (FireBall_Timer <= diff) + { + DoCast(me->getVictim(), SPELL_FIREBALL); + FireBall_Timer = 4500 + rand()%1500; + } else FireBall_Timer -= diff; + + if (CanBlink) + { + if (Blink_Timer <= diff) + { + if (me->IsNonMeleeSpellCasted(false)) + me->InterruptNonMeleeSpells(true); + + //expire movement, will prevent from running right back to victim after cast + //(but should MoveChase be used again at a certain time or should he not move?) + if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() == TARGETED_MOTION_TYPE) + me->GetMotionMaster()->MovementExpired(); + + DoCast(me, SPELL_BLINK); + Blink_Timer = 1000 + rand()%1500; + CanBlink = false; + } else Blink_Timer -= diff; + } + + if (Beacon_Timer <= diff) + { + if (me->IsNonMeleeSpellCasted(false)) + me->InterruptNonMeleeSpells(true); + + if (!urand(0,3)) + DoScriptText(SAY_SUMMON, me); + + DoCast(me, SPELL_ETHEREAL_BEACON, true); + + Beacon_Timer = 10000; + } else Beacon_Timer -= diff; + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_boss_nexusprince_shaffar(Creature* pCreature) +{ + return new boss_nexusprince_shaffarAI (pCreature); +} + +enum eEnums +{ + SPELL_ARCANE_BOLT = 15254, + SPELL_ETHEREAL_APPRENTICE = 32372 // Summon 18430 +}; + +struct mob_ethereal_beaconAI : public ScriptedAI +{ + mob_ethereal_beaconAI(Creature *c) : ScriptedAI(c) + { + } + + uint32 Apprentice_Timer; + uint32 ArcaneBolt_Timer; + uint32 Check_Timer; + + void KillSelf() + { + me->Kill(me); + } + + void Reset() + { + Apprentice_Timer = DUNGEON_MODE(20000, 10000); + ArcaneBolt_Timer = 1000; + Check_Timer = 1000; + } + + void EnterCombat(Unit * who) + { + // Send Shaffar to fight + Creature* Shaffar = me->FindNearestCreature(NPC_SHAFFAR, 100); + if (!Shaffar || Shaffar->isDead()) + { + KillSelf(); + return; + } + if (!Shaffar->isInCombat()) + Shaffar->AI()->AttackStart(who); + } + + void JustSummoned(Creature *summoned) + { + summoned->AI()->AttackStart(me->getVictim()); + } + + void UpdateAI(const uint32 diff) + { + if (!UpdateVictim()) + return; + + if (Check_Timer <= diff) + { + Creature *Shaffar = me->FindNearestCreature(NPC_SHAFFAR, 100); + if (!Shaffar || Shaffar->isDead() || !Shaffar->isInCombat()) + { + KillSelf(); + return; + } + Check_Timer = 1000; + } else Check_Timer -= diff; + + if (ArcaneBolt_Timer <= diff) + { + DoCast(me->getVictim(), SPELL_ARCANE_BOLT); + ArcaneBolt_Timer = 2000 + rand()%2500; + } else ArcaneBolt_Timer -= diff; + + if (Apprentice_Timer <= diff) + { + if (me->IsNonMeleeSpellCasted(false)) + me->InterruptNonMeleeSpells(true); + + DoCast(me, SPELL_ETHEREAL_APPRENTICE, true); + me->ForcedDespawn(); + return; + } else Apprentice_Timer -= diff; + } +}; + +CreatureAI* GetAI_mob_ethereal_beacon(Creature* pCreature) +{ + return new mob_ethereal_beaconAI (pCreature); +} + +enum eEthereal +{ + SPELL_ETHEREAL_APPRENTICE_FIREBOLT = 32369, + SPELL_ETHEREAL_APPRENTICE_FROSTBOLT = 32370 +}; + +struct mob_ethereal_apprenticeAI : public ScriptedAI +{ + mob_ethereal_apprenticeAI(Creature *c) : ScriptedAI(c) {} + + uint32 Cast_Timer; + + bool isFireboltTurn; + + void Reset() + { + Cast_Timer = 3000; + isFireboltTurn = true; + } + + void UpdateAI(const uint32 diff) + { + if (!UpdateVictim()) + return; + + if (Cast_Timer <= diff) + { + if (isFireboltTurn) + { + DoCast(me->getVictim(), SPELL_ETHEREAL_APPRENTICE_FIREBOLT, true); + isFireboltTurn = false; + }else{ + DoCast(me->getVictim(), SPELL_ETHEREAL_APPRENTICE_FROSTBOLT, true); + isFireboltTurn = true; + } + Cast_Timer = 3000; + } else Cast_Timer -= diff; + } +}; + +CreatureAI* GetAI_mob_ethereal_apprentice(Creature* pCreature) +{ + return new mob_ethereal_apprenticeAI (pCreature); +} + +void AddSC_boss_nexusprince_shaffar() +{ + Script *newscript; + + newscript = new Script; + newscript->Name = "boss_nexusprince_shaffar"; + newscript->GetAI = &GetAI_boss_nexusprince_shaffar; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_ethereal_beacon"; + newscript->GetAI = &GetAI_mob_ethereal_beacon; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_ethereal_apprentice"; + newscript->GetAI = &GetAI_mob_ethereal_apprentice; + newscript->RegisterSelf(); +} + diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp new file mode 100644 index 00000000000..51ec2e83b46 --- /dev/null +++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp @@ -0,0 +1,126 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Boss_Pandemonius +SD%Complete: 75 +SDComment: Not known how void blast is done (amount of rapid cast seems to be related to players in party). All mobs remaining in surrounding area should aggro when engaged. +SDCategory: Auchindoun, Mana Tombs +EndScriptData */ + +#include "ScriptedPch.h" + +#define SAY_AGGRO_1 -1557008 +#define SAY_AGGRO_2 -1557009 +#define SAY_AGGRO_3 -1557010 + +#define SAY_KILL_1 -1557011 +#define SAY_KILL_2 -1557012 + +#define SAY_DEATH -1557013 + +#define EMOTE_DARK_SHELL -1557014 + +#define SPELL_VOID_BLAST 32325 +#define H_SPELL_VOID_BLAST 38760 +#define SPELL_DARK_SHELL 32358 +#define H_SPELL_DARK_SHELL 38759 + +struct boss_pandemoniusAI : public ScriptedAI +{ + boss_pandemoniusAI(Creature *c) : ScriptedAI(c) + { + } + + uint32 VoidBlast_Timer; + uint32 DarkShell_Timer; + uint32 VoidBlast_Counter; + + void Reset() + { + VoidBlast_Timer = 8000+rand()%15000; + DarkShell_Timer = 20000; + VoidBlast_Counter = 0; + } + + void JustDied(Unit* /*Killer*/) + { + DoScriptText(SAY_DEATH, me); + } + + void KilledUnit(Unit* /*victim*/) + { + DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2), me); + } + + void EnterCombat(Unit * /*who*/) + { + DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); + } + + void UpdateAI(const uint32 diff) + { + if (!UpdateVictim()) + return; + + if (VoidBlast_Timer <= diff) + { + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + { + DoCast(pTarget, SPELL_VOID_BLAST); + VoidBlast_Timer = 500; + ++VoidBlast_Counter; + } + + if (VoidBlast_Counter == 5) + { + VoidBlast_Timer = 15000+rand()%10000; + VoidBlast_Counter = 0; + } + } else VoidBlast_Timer -= diff; + + if (!VoidBlast_Counter) + { + if (DarkShell_Timer <= diff) + { + if (me->IsNonMeleeSpellCasted(false)) + me->InterruptNonMeleeSpells(true); + + DoScriptText(EMOTE_DARK_SHELL, me); + + DoCast(me, SPELL_DARK_SHELL); + DarkShell_Timer = 20000; + } else DarkShell_Timer -= diff; + } + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_boss_pandemonius(Creature* pCreature) +{ + return new boss_pandemoniusAI (pCreature); +} + +void AddSC_boss_pandemonius() +{ + Script *newscript; + newscript = new Script; + newscript->Name = "boss_pandemonius"; + newscript->GetAI = &GetAI_boss_pandemonius; + newscript->RegisterSelf(); +} + diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp new file mode 100644 index 00000000000..9628fa1a98f --- /dev/null +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp @@ -0,0 +1,414 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Boss_Darkweaver_Syth +SD%Complete: 85 +SDComment: Shock spells/times need more work. Heroic partly implemented. +SDCategory: Auchindoun, Sethekk Halls +EndScriptData */ + +#include "ScriptedPch.h" + +#define SAY_SUMMON -1556000 + +#define SAY_AGGRO_1 -1556001 +#define SAY_AGGRO_2 -1556002 +#define SAY_AGGRO_3 -1556003 + +#define SAY_SLAY_1 -1556004 +#define SAY_SLAY_2 -1556005 + +#define SAY_DEATH -1556006 + +#define SPELL_FROST_SHOCK 21401 //37865 +#define SPELL_FLAME_SHOCK 34354 +#define SPELL_SHADOW_SHOCK 30138 +#define SPELL_ARCANE_SHOCK 37132 + +#define SPELL_CHAIN_LIGHTNING 15659 //15305 + +#define SPELL_SUMMON_SYTH_FIRE 33537 // Spawns 19203 +#define SPELL_SUMMON_SYTH_ARCANE 33538 // Spawns 19205 +#define SPELL_SUMMON_SYTH_FROST 33539 // Spawns 19204 +#define SPELL_SUMMON_SYTH_SHADOW 33540 // Spawns 19206 + +#define SPELL_FLAME_BUFFET DUNGEON_MODE(33526, 38141) +#define SPELL_ARCANE_BUFFET DUNGEON_MODE(33527, 38138) +#define SPELL_FROST_BUFFET DUNGEON_MODE(33528, 38142) +#define SPELL_SHADOW_BUFFET DUNGEON_MODE(33529, 38143) + +struct boss_darkweaver_sythAI : public ScriptedAI +{ + boss_darkweaver_sythAI(Creature *c) : ScriptedAI(c) + { + } + + uint32 flameshock_timer; + uint32 arcaneshock_timer; + uint32 frostshock_timer; + uint32 shadowshock_timer; + uint32 chainlightning_timer; + + bool summon90; + bool summon50; + bool summon10; + + void Reset() + { + flameshock_timer = 2000; + arcaneshock_timer = 4000; + frostshock_timer = 6000; + shadowshock_timer = 8000; + chainlightning_timer = 15000; + + summon90 = false; + summon50 = false; + summon10 = false; + } + + void EnterCombat(Unit * /*who*/) + { + DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); + } + + void JustDied(Unit* /*Killer*/) + { + DoScriptText(SAY_DEATH, me); + } + + void KilledUnit(Unit* /*victim*/) + { + if (rand()%2) + return; + + DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + } + + void JustSummoned(Creature *summoned) + { + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + summoned->AI()->AttackStart(pTarget); + } + + void SythSummoning() + { + DoScriptText(SAY_SUMMON, me); + + if (me->IsNonMeleeSpellCasted(false)) + me->InterruptNonMeleeSpells(false); + + DoCast(me, SPELL_SUMMON_SYTH_ARCANE, true); //front + DoCast(me, SPELL_SUMMON_SYTH_FIRE, true); //back + DoCast(me, SPELL_SUMMON_SYTH_FROST, true); //left + DoCast(me, SPELL_SUMMON_SYTH_SHADOW, true); //right + } + + void UpdateAI(const uint32 diff) + { + if (!UpdateVictim()) + return; + + if (((me->GetHealth()*100) / me->GetMaxHealth() < 90) && !summon90) + { + SythSummoning(); + summon90 = true; + } + + if (((me->GetHealth()*100) / me->GetMaxHealth() < 50) && !summon50) + { + SythSummoning(); + summon50 = true; + } + + if (((me->GetHealth()*100) / me->GetMaxHealth() < 10) && !summon10) + { + SythSummoning(); + summon10 = true; + } + + if (flameshock_timer <= diff) + { + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget, SPELL_FLAME_SHOCK); + + flameshock_timer = 10000 + rand()%5000; + } else flameshock_timer -= diff; + + if (arcaneshock_timer <= diff) + { + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget, SPELL_ARCANE_SHOCK); + + arcaneshock_timer = 10000 + rand()%5000; + } else arcaneshock_timer -= diff; + + if (frostshock_timer <= diff) + { + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget, SPELL_FROST_SHOCK); + + frostshock_timer = 10000 + rand()%5000; + } else frostshock_timer -= diff; + + if (shadowshock_timer <= diff) + { + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget, SPELL_SHADOW_SHOCK); + + shadowshock_timer = 10000 + rand()%5000; + } else shadowshock_timer -= diff; + + if (chainlightning_timer <= diff) + { + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget, SPELL_CHAIN_LIGHTNING); + + chainlightning_timer = 25000; + } else chainlightning_timer -= diff; + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_boss_darkweaver_syth(Creature* pCreature) +{ + return new boss_darkweaver_sythAI (pCreature); +} + +/* ELEMENTALS */ + +struct mob_syth_fireAI : public ScriptedAI +{ + mob_syth_fireAI(Creature *c) : ScriptedAI(c) + { + } + + uint32 flameshock_timer; + uint32 flamebuffet_timer; + + void Reset() + { + me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FIRE, true); + flameshock_timer = 2500; + flamebuffet_timer = 5000; + } + + void EnterCombat(Unit * /*who*/) { } + + void UpdateAI(const uint32 diff) + { + if (!UpdateVictim()) + return; + + if (flameshock_timer <= diff) + { + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget, SPELL_FLAME_SHOCK); + + flameshock_timer = 5000; + } else flameshock_timer -= diff; + + if (flamebuffet_timer <= diff) + { + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget, SPELL_FLAME_BUFFET); + + flamebuffet_timer = 5000; + } else flamebuffet_timer -= diff; + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_mob_syth_fire(Creature* pCreature) +{ + return new mob_syth_fireAI (pCreature); +} + +struct mob_syth_arcaneAI : public ScriptedAI +{ + mob_syth_arcaneAI(Creature *c) : ScriptedAI(c) + { + } + + uint32 arcaneshock_timer; + uint32 arcanebuffet_timer; + + void Reset() + { + me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_ARCANE, true); + arcaneshock_timer = 2500; + arcanebuffet_timer = 5000; + } + + void EnterCombat(Unit * /*who*/) { } + + void UpdateAI(const uint32 diff) + { + if (!UpdateVictim()) + return; + + if (arcaneshock_timer <= diff) + { + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget, SPELL_ARCANE_SHOCK); + + arcaneshock_timer = 5000; + } else arcaneshock_timer -= diff; + + if (arcanebuffet_timer <= diff) + { + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget, SPELL_ARCANE_BUFFET); + + arcanebuffet_timer = 5000; + } else arcanebuffet_timer -= diff; + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_mob_syth_arcane(Creature* pCreature) +{ + return new mob_syth_arcaneAI (pCreature); +} + +struct mob_syth_frostAI : public ScriptedAI +{ + mob_syth_frostAI(Creature *c) : ScriptedAI(c) + { + } + + uint32 frostshock_timer; + uint32 frostbuffet_timer; + + void Reset() + { + me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FROST, true); + frostshock_timer = 2500; + frostbuffet_timer = 5000; + } + + void EnterCombat(Unit * /*who*/) { } + + void UpdateAI(const uint32 diff) + { + if (!UpdateVictim()) + return; + + if (frostshock_timer <= diff) + { + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget, SPELL_FROST_SHOCK); + + frostshock_timer = 5000; + } else frostshock_timer -= diff; + + if (frostbuffet_timer <= diff) + { + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget, SPELL_FROST_BUFFET); + + frostbuffet_timer = 5000; + } else frostbuffet_timer -= diff; + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_mob_syth_frost(Creature* pCreature) +{ + return new mob_syth_frostAI (pCreature); +} + +struct mob_syth_shadowAI : public ScriptedAI +{ + mob_syth_shadowAI(Creature *c) : ScriptedAI(c) + { + } + + uint32 shadowshock_timer; + uint32 shadowbuffet_timer; + + void Reset() + { + me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_SHADOW, true); + shadowshock_timer = 2500; + shadowbuffet_timer = 5000; + } + + void EnterCombat(Unit * /*who*/) { } + + void UpdateAI(const uint32 diff) + { + if (!UpdateVictim()) + return; + + if (shadowshock_timer <= diff) + { + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget, SPELL_SHADOW_SHOCK); + + shadowshock_timer = 5000; + } else shadowshock_timer -= diff; + + if (shadowbuffet_timer <= diff) + { + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget, SPELL_SHADOW_BUFFET); + + shadowbuffet_timer = 5000; + } else shadowbuffet_timer -= diff; + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_mob_syth_shadow(Creature* pCreature) +{ + return new mob_syth_shadowAI (pCreature); +} + +void AddSC_boss_darkweaver_syth() +{ + Script *newscript; + newscript = new Script; + newscript->Name = "boss_darkweaver_syth"; + newscript->GetAI = &GetAI_boss_darkweaver_syth; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_syth_fire"; + newscript->GetAI = &GetAI_mob_syth_arcane; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_syth_arcane"; + newscript->GetAI = &GetAI_mob_syth_arcane; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_syth_frost"; + newscript->GetAI = &GetAI_mob_syth_frost; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_syth_shadow"; + newscript->GetAI = &GetAI_mob_syth_shadow; + newscript->RegisterSelf(); +} + diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp new file mode 100644 index 00000000000..32b97293ca3 --- /dev/null +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp @@ -0,0 +1,213 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Boss_Talon_King_Ikiss +SD%Complete: 80 +SDComment: Heroic supported. Some details missing, but most are spell related. +SDCategory: Auchindoun, Sethekk Halls +EndScriptData */ + +#include "ScriptedPch.h" +#include "sethekk_halls.h" + +#define SAY_INTRO -1556007 + +#define SAY_AGGRO_1 -1556008 +#define SAY_AGGRO_2 -1556009 +#define SAY_AGGRO_3 -1556010 + +#define SAY_SLAY_1 -1556011 +#define SAY_SLAY_2 -1556012 +#define SAY_DEATH -1556013 +#define EMOTE_ARCANE_EXP -1556015 + +#define SPELL_BLINK 38194 +#define SPELL_BLINK_TELEPORT 38203 +#define SPELL_MANA_SHIELD 38151 +#define SPELL_ARCANE_BUBBLE 9438 +#define H_SPELL_SLOW 35032 + +#define SPELL_POLYMORPH 38245 +#define H_SPELL_POLYMORPH 43309 + +#define SPELL_ARCANE_VOLLEY 35059 +#define H_SPELL_ARCANE_VOLLEY 40424 + +#define SPELL_ARCANE_EXPLOSION 38197 +#define H_SPELL_ARCANE_EXPLOSION 40425 + +struct boss_talon_king_ikissAI : public ScriptedAI +{ + boss_talon_king_ikissAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + } + + ScriptedInstance* pInstance; + + uint32 ArcaneVolley_Timer; + uint32 Sheep_Timer; + uint32 Blink_Timer; + uint32 Slow_Timer; + + bool ManaShield; + bool Blink; + bool Intro; + + void Reset() + { + ArcaneVolley_Timer = 5000; + Sheep_Timer = 8000; + Blink_Timer = 35000; + Slow_Timer = 15000+rand()%15000; + Blink = false; + Intro = false; + ManaShield = false; + } + + void MoveInLineOfSight(Unit *who) + { + if (!me->getVictim() && who->isTargetableForAttack() && (me->IsHostileTo(who)) && who->isInAccessiblePlaceFor(me)) + { + if (!Intro && me->IsWithinDistInMap(who, 100)) + { + Intro = true; + DoScriptText(SAY_INTRO, me); + } + + if (!me->canFly() && me->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) + return; + + float attackRadius = me->GetAttackDistance(who); + if (me->IsWithinDistInMap(who, attackRadius) && me->IsWithinLOSInMap(who)) + { + //who->RemoveSpellsCausingAura(SPELL_AURA_MOD_STEALTH); + AttackStart(who); + } + } + } + + void EnterCombat(Unit * /*who*/) + { + DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); + } + + void JustDied(Unit* /*Killer*/) + { + DoScriptText(SAY_DEATH, me); + + if (pInstance) + pInstance->SetData(DATA_IKISSDOOREVENT, DONE); + } + + void KilledUnit(Unit* /*victim*/) + { + DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + } + + void UpdateAI(const uint32 diff) + { + if (!UpdateVictim()) + return; + + if (Blink) + { + DoCast(me, SPELL_ARCANE_EXPLOSION); + DoCast(me, SPELL_ARCANE_BUBBLE, true); + Blink = false; + } + + if (ArcaneVolley_Timer <= diff) + { + DoCast(me, SPELL_ARCANE_VOLLEY); + ArcaneVolley_Timer = 7000+rand()%5000; + } else ArcaneVolley_Timer -= diff; + + if (Sheep_Timer <= diff) + { + Unit *pTarget; + + //second top aggro target in normal, random target in heroic correct? + if (IsHeroic()) + pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); + else + pTarget = SelectUnit(SELECT_TARGET_TOPAGGRO,1); + + if (pTarget) + DoCast(pTarget, SPELL_POLYMORPH); + Sheep_Timer = 15000+rand()%2500; + } else Sheep_Timer -= diff; + + //may not be correct time to cast + if (!ManaShield && ((me->GetHealth()*100) / me->GetMaxHealth() < 20)) + { + DoCast(me, SPELL_MANA_SHIELD); + ManaShield = true; + } + + if (IsHeroic()) + { + if (Slow_Timer <= diff) + { + DoCast(me, H_SPELL_SLOW); + Slow_Timer = 15000+rand()%25000; + } else Slow_Timer -= diff; + } + + if (Blink_Timer <= diff) + { + DoScriptText(EMOTE_ARCANE_EXP, me); + + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + { + if (me->IsNonMeleeSpellCasted(false)) + me->InterruptNonMeleeSpells(false); + + //Spell doesn't work, but we use for visual effect at least + DoCast(pTarget, SPELL_BLINK); + + float X = pTarget->GetPositionX(); + float Y = pTarget->GetPositionY(); + float Z = pTarget->GetPositionZ(); + + DoTeleportTo(X,Y,Z); + + DoCast(pTarget, SPELL_BLINK_TELEPORT); + Blink = true; + } + Blink_Timer = 35000+rand()%5000; + } else Blink_Timer -= diff; + + if (!Blink) + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_boss_talon_king_ikiss(Creature* pCreature) +{ + return new boss_talon_king_ikissAI (pCreature); +} + +void AddSC_boss_talon_king_ikiss() +{ + Script *newscript; + newscript = new Script; + newscript->Name = "boss_talon_king_ikiss"; + newscript->GetAI = &GetAI_boss_talon_king_ikiss; + newscript->RegisterSelf(); +} + diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp new file mode 100644 index 00000000000..ee27da3cff5 --- /dev/null +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp @@ -0,0 +1,91 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Instance - Sethekk Halls +SD%Complete: 50 +SDComment: Instance Data for Sethekk Halls instance +SDCategory: Auchindoun, Sethekk Halls +EndScriptData */ + +#include "ScriptedPch.h" +#include "sethekk_halls.h" + +enum eEnums +{ + NPC_ANZU = 23035, + IKISS_DOOR = 177203, +}; + +struct instance_sethekk_halls : public ScriptedInstance +{ + instance_sethekk_halls(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; + + uint32 AnzuEncounter; + uint64 m_uiIkissDoorGUID; + + void Initialize() + { + AnzuEncounter = NOT_STARTED; + m_uiIkissDoorGUID = 0; + } + + void OnCreatureCreate(Creature* pCreature, bool /*add*/) + { + if (pCreature->GetEntry() == NPC_ANZU) + { + if (AnzuEncounter >= IN_PROGRESS) + pCreature->DisappearAndDie(); + else + AnzuEncounter = IN_PROGRESS; + } + } + + void OnGameObjectCreate(GameObject* pGo, bool /*add*/) + { + if (pGo->GetEntry() == IKISS_DOOR) + m_uiIkissDoorGUID = pGo->GetGUID(); + } + + void SetData(uint32 type, uint32 data) + { + switch(type) + { + case DATA_IKISSDOOREVENT: + if (data == DONE) + DoUseDoorOrButton(m_uiIkissDoorGUID,DAY*IN_MILISECONDS); + break; + case TYPE_ANZU_ENCOUNTER: + AnzuEncounter = data; + break; + } + } +}; + +InstanceData* GetInstanceData_instance_sethekk_halls(Map* pMap) +{ + return new instance_sethekk_halls(pMap); +} + +void AddSC_instance_sethekk_halls() +{ + Script *newscript; + newscript = new Script; + newscript->Name = "instance_sethekk_halls"; + newscript->GetInstanceData = &GetInstanceData_instance_sethekk_halls; + newscript->RegisterSelf(); +} + diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h b/src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h new file mode 100644 index 00000000000..79a6cd4952d --- /dev/null +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h @@ -0,0 +1,14 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software licensed under GPL version 2 + * Please see the included DOCS/LICENSE.TXT for more information */ + +#ifndef DEF_SETHEKK_HALLS_H +#define DEF_SETHEKK_HALLS_H + +enum eTypes +{ + DATA_IKISSDOOREVENT = 1, + TYPE_ANZU_ENCOUNTER = 2, +}; +#endif + diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp new file mode 100644 index 00000000000..2bb6a717a5a --- /dev/null +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp @@ -0,0 +1,206 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Boss_Ambassador_Hellmaw +SD%Complete: 80 +SDComment: Enrage spell missing/not known +SDCategory: Auchindoun, Shadow Labyrinth +EndScriptData */ + +#include "ScriptedPch.h" +#include "ScriptedEscortAI.h" +#include "shadow_labyrinth.h" + +enum eEnums +{ + SAY_INTRO = -1555000, + SAY_AGGRO1 = -1555001, + SAY_AGGRO2 = -1555002, + SAY_AGGRO3 = -1555003, + SAY_HELP = -1555004, + SAY_SLAY1 = -1555005, + SAY_SLAY2 = -1555006, + SAY_DEATH = -1555007, + + SPELL_BANISH = 30231, + SPELL_CORROSIVE_ACID = 33551, + SPELL_FEAR = 33547, + SPELL_ENRAGE = 34970 +}; + +struct boss_ambassador_hellmawAI : public npc_escortAI +{ + boss_ambassador_hellmawAI(Creature* pCreature) : npc_escortAI(pCreature) + { + m_pInstance = pCreature->GetInstanceData(); + } + + ScriptedInstance* m_pInstance; + + uint32 EventCheck_Timer; + uint32 CorrosiveAcid_Timer; + uint32 Fear_Timer; + uint32 Enrage_Timer; + bool Intro; + bool IsBanished; + bool Enraged; + + void Reset() + { + EventCheck_Timer = 5000; + CorrosiveAcid_Timer = 5000 + rand()%5000; + Fear_Timer = 25000 + rand()%5000; + Enrage_Timer = 180000; + Intro = false; + IsBanished = true; + Enraged = false; + + if (m_pInstance && me->isAlive()) + { + if (m_pInstance->GetData(TYPE_OVERSEER) != DONE) + DoCast(me, SPELL_BANISH, true); + } + } + + void JustReachedHome() + { + if (m_pInstance) + m_pInstance->SetData(TYPE_HELLMAW, FAIL); + } + + void MoveInLineOfSight(Unit* pWho) + { + if (me->HasAura(SPELL_BANISH)) + return; + + npc_escortAI::MoveInLineOfSight(pWho); + } + + void WaypointReached(uint32 /*i*/) + { + } + + void DoIntro() + { + if (me->HasAura(SPELL_BANISH)) + me->RemoveAurasDueToSpell(SPELL_BANISH); + + IsBanished = false; + Intro = true; + + if (m_pInstance) + { + if (m_pInstance->GetData(TYPE_HELLMAW) != FAIL) + { + DoScriptText(SAY_INTRO, me); + Start(true, false, 0, NULL, false, true); + } + + m_pInstance->SetData(TYPE_HELLMAW, IN_PROGRESS); + } + } + + void EnterCombat(Unit * /*who*/) + { + DoScriptText(RAND(SAY_AGGRO1,SAY_AGGRO2,SAY_AGGRO3), me); + } + + void KilledUnit(Unit * /*victim*/) + { + DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); + } + + void JustDied(Unit * /*victim*/) + { + DoScriptText(SAY_DEATH, me); + + if (m_pInstance) + m_pInstance->SetData(TYPE_HELLMAW, DONE); + } + + void UpdateAI(const uint32 diff) + { + if (!Intro && !HasEscortState(STATE_ESCORT_ESCORTING)) + { + if (EventCheck_Timer <= diff) + { + if (m_pInstance) + { + if (m_pInstance->GetData(TYPE_OVERSEER) == DONE) + { + DoIntro(); + return; + } + } + EventCheck_Timer = 5000; + return; + } + else + { + EventCheck_Timer -= diff; + return; + } + } + + npc_escortAI::UpdateAI(diff); + + if (!UpdateVictim()) + return; + + if (me->HasAura(SPELL_BANISH, 0)) + { + EnterEvadeMode(); + return; + } + + if (CorrosiveAcid_Timer <= diff) + { + DoCast(me->getVictim(), SPELL_CORROSIVE_ACID); + CorrosiveAcid_Timer = 15000 + rand()%10000; + } else CorrosiveAcid_Timer -= diff; + + if (Fear_Timer <= diff) + { + DoCast(me, SPELL_FEAR); + Fear_Timer = 20000 + rand()%15000; + } else Fear_Timer -= diff; + + if (IsHeroic()) + { + if (!Enraged && Enrage_Timer <= diff) + { + DoCast(me, SPELL_ENRAGE); + Enraged = true; + } else Enrage_Timer -= diff; + } + } +}; + +CreatureAI* GetAI_boss_ambassador_hellmaw(Creature* pCreature) +{ + return new boss_ambassador_hellmawAI(pCreature); +} + +void AddSC_boss_ambassador_hellmaw() +{ + Script *newscript; + newscript = new Script; + newscript->Name = "boss_ambassador_hellmaw"; + newscript->GetAI = &GetAI_boss_ambassador_hellmaw; + newscript->RegisterSelf(); +} + diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp new file mode 100644 index 00000000000..52c60ae0d0e --- /dev/null +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp @@ -0,0 +1,169 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Boss_Blackheart_the_Inciter +SD%Complete: 75 +SDComment: Incite Chaos not functional since core lacks Mind Control support +SDCategory: Auchindoun, Shadow Labyrinth +EndScriptData */ + +#include "ScriptedPch.h" +#include "shadow_labyrinth.h" + +#define SPELL_INCITE_CHAOS 33676 +#define SPELL_INCITE_CHAOS_B 33684 //debuff applied to each member of party +#define SPELL_CHARGE 33709 +#define SPELL_WAR_STOMP 33707 + +#define SAY_INTRO1 -1555008 //not used +#define SAY_INTRO2 -1555009 //not used +#define SAY_INTRO3 -1555010 //not used +#define SAY_AGGRO1 -1555011 +#define SAY_AGGRO2 -1555012 +#define SAY_AGGRO3 -1555013 +#define SAY_SLAY1 -1555014 +#define SAY_SLAY2 -1555015 +#define SAY_HELP -1555016 //not used +#define SAY_DEATH -1555017 + +//below, not used +#define SAY2_INTRO1 -1555018 +#define SAY2_INTRO2 -1555019 +#define SAY2_INTRO3 -1555020 +#define SAY2_AGGRO1 -1555021 +#define SAY2_AGGRO2 -1555022 +#define SAY2_AGGRO3 -1555023 +#define SAY2_SLAY1 -1555024 +#define SAY2_SLAY2 -1555025 +#define SAY2_HELP -1555026 +#define SAY2_DEATH -1555027 + +struct boss_blackheart_the_inciterAI : public ScriptedAI +{ + boss_blackheart_the_inciterAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + } + + ScriptedInstance *pInstance; + + bool InciteChaos; + uint32 InciteChaos_Timer; + uint32 InciteChaosWait_Timer; + uint32 Charge_Timer; + uint32 Knockback_Timer; + + void Reset() + { + InciteChaos = false; + InciteChaos_Timer = 20000; + InciteChaosWait_Timer = 15000; + Charge_Timer = 5000; + Knockback_Timer = 15000; + + if (pInstance) + pInstance->SetData(DATA_BLACKHEARTTHEINCITEREVENT, NOT_STARTED); + } + + void KilledUnit(Unit * /*victim*/) + { + DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); + } + + void JustDied(Unit * /*victim*/) + { + DoScriptText(SAY_DEATH, me); + + if (pInstance) + pInstance->SetData(DATA_BLACKHEARTTHEINCITEREVENT, DONE); + } + + void EnterCombat(Unit * /*who*/) + { + DoScriptText(RAND(SAY_AGGRO1,SAY_AGGRO2,SAY_AGGRO3), me); + + if (pInstance) + pInstance->SetData(DATA_BLACKHEARTTHEINCITEREVENT, IN_PROGRESS); + } + + void UpdateAI(const uint32 diff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + if (InciteChaos) + { + if (InciteChaosWait_Timer <= diff) + { + InciteChaos = false; + InciteChaosWait_Timer = 15000; + } else InciteChaosWait_Timer -= diff; + + return; + } + + if (InciteChaos_Timer <= diff) + { + DoCast(me, SPELL_INCITE_CHAOS); + + std::list t_list = me->getThreatManager().getThreatList(); + for (std::list::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) + { + Unit *pTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid()); + if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER) + pTarget->CastSpell(pTarget,SPELL_INCITE_CHAOS_B,true); + } + + DoResetThreat(); + InciteChaos = true; + InciteChaos_Timer = 40000; + return; + } else InciteChaos_Timer -= diff; + + //Charge_Timer + if (Charge_Timer <= diff) + { + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, SPELL_CHARGE); + Charge_Timer = 15000 + rand()%10000; + } else Charge_Timer -= diff; + + //Knockback_Timer + if (Knockback_Timer <= diff) + { + DoCast(me, SPELL_WAR_STOMP); + Knockback_Timer = 18000 + rand()%6000; + } else Knockback_Timer -= diff; + + DoMeleeAttackIfReady(); + } +}; +CreatureAI* GetAI_boss_blackheart_the_inciter(Creature* pCreature) +{ + return new boss_blackheart_the_inciterAI (pCreature); +} + +void AddSC_boss_blackheart_the_inciter() +{ + Script *newscript; + newscript = new Script; + newscript->Name = "boss_blackheart_the_inciter"; + newscript->GetAI = &GetAI_boss_blackheart_the_inciter; + newscript->RegisterSelf(); +} + diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp new file mode 100644 index 00000000000..8b63b765b47 --- /dev/null +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp @@ -0,0 +1,313 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Boss_Grandmaster_Vorpil +SD%Complete: 100 +SDComment: +SDCategory: Auchindoun, Shadow Labyrinth +EndScriptData */ + +#include "ScriptedPch.h" +#include "shadow_labyrinth.h" + +#define SAY_INTRO -1555028 +#define SAY_AGGRO1 -1555029 +#define SAY_AGGRO2 -1555030 +#define SAY_AGGRO3 -1555031 +#define SAY_HELP -1555032 +#define SAY_SLAY1 -1555033 +#define SAY_SLAY2 -1555034 +#define SAY_DEATH -1555035 + +#define SPELL_RAIN_OF_FIRE 33617 +#define H_SPELL_RAIN_OF_FIRE 39363 + +#define SPELL_DRAW_SHADOWS 33563 +#define SPELL_SHADOWBOLT_VOLLEY 33841 +#define SPELL_BANISH 38791 + +#define MOB_VOID_TRAVELER 19226 +#define SPELL_SACRIFICE 33587 +#define SPELL_SHADOW_NOVA 33846 +#define SPELL_EMPOWERING_SHADOWS 33783 +#define H_SPELL_EMPOWERING_SHADOWS 39364 + +#define MOB_VOID_PORTAL 19224 +#define SPELL_VOID_PORTAL_VISUAL 33569 + +float VorpilPosition[3] = {-252.8820,-264.3030,17.1}; + +float VoidPortalCoords[5][3] = +{ + {-283.5894, -239.5718, 12.7}, + {-306.5853, -258.4539, 12.7}, + {-295.8789, -269.0899, 12.7}, + {-209.3401, -262.7564, 17.1}, + {-261.4533, -297.3298, 17.1} +}; + +struct mob_voidtravelerAI : public ScriptedAI +{ + mob_voidtravelerAI(Creature *c) : ScriptedAI(c) + { + } + + uint64 VorpilGUID; + uint32 move; + bool sacrificed; + + void Reset() + { + VorpilGUID = 0; + move = 0; + sacrificed = false; + } + + void EnterCombat(Unit * /*who*/){} + + void UpdateAI(const uint32 diff) + { + if (!VorpilGUID) + { + me->Kill(me); + return; + } + if (move <= diff) + { + Creature *Vorpil = Unit::GetCreature(*me, VorpilGUID); + if (!Vorpil) + { + VorpilGUID = 0; + return; + } + + if (sacrificed) + { + me->AddAura(DUNGEON_MODE(SPELL_EMPOWERING_SHADOWS, H_SPELL_EMPOWERING_SHADOWS), Vorpil); + Vorpil->SetHealth(Vorpil->GetHealth() + Vorpil->GetMaxHealth()/25); + DoCast(me, SPELL_SHADOW_NOVA, true); + me->Kill(me); + return; + } + me->GetMotionMaster()->MoveFollow(Vorpil,0,0); + if (me->IsWithinDist(Vorpil, 3)) + { + DoCast(me, SPELL_SACRIFICE, false); + sacrificed = true; + move = 500; + return; + } + if (!Vorpil->isInCombat() || Vorpil->isDead()) + { + me->Kill(me); + return; + } + move = 1000; + } else move -= diff; + } +}; +CreatureAI* GetAI_mob_voidtraveler(Creature* pCreature) +{ + return new mob_voidtravelerAI (pCreature); +} + +struct boss_grandmaster_vorpilAI : public ScriptedAI +{ + boss_grandmaster_vorpilAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + Intro = false; + } + + ScriptedInstance *pInstance; + bool Intro, HelpYell; + bool sumportals; + + uint32 ShadowBoltVolley_Timer; + uint32 DrawShadows_Timer; + uint32 summonTraveler_Timer; + uint32 banish_Timer; + uint64 PortalsGuid[5]; + + void Reset() + { + ShadowBoltVolley_Timer = 7000 + rand()%7000; + DrawShadows_Timer = 45000; + summonTraveler_Timer = 90000; + banish_Timer = 17000; + HelpYell = false; + destroyPortals(); + + if (pInstance) + pInstance->SetData(DATA_GRANDMASTERVORPILEVENT, NOT_STARTED); + } + + void summonPortals() + { + if (!sumportals) + { + for (uint8 i = 0; i < 5; ++i) + { + Creature *Portal = NULL; + Portal = me->SummonCreature(MOB_VOID_PORTAL,VoidPortalCoords[i][0],VoidPortalCoords[i][1],VoidPortalCoords[i][2],0,TEMPSUMMON_CORPSE_DESPAWN,3000000); + if (Portal) + { + PortalsGuid[i] = Portal->GetGUID(); + Portal->CastSpell(Portal,SPELL_VOID_PORTAL_VISUAL,false); + } + } + sumportals = true; + summonTraveler_Timer = 5000; + } + } + + void destroyPortals() + { + if (sumportals) + { + for (uint8 i = 0; i < 5; ++i) + { + Unit *Portal = Unit::GetUnit((*me), PortalsGuid[i]); + if (Portal && Portal->isAlive()) + Portal->DealDamage(Portal, Portal->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); + PortalsGuid[i] = 0; + } + sumportals = false; + } + } + + void spawnVoidTraveler() + { + int pos = urand(0,4); + me->SummonCreature(MOB_VOID_TRAVELER,VoidPortalCoords[pos][0],VoidPortalCoords[pos][1],VoidPortalCoords[pos][2],0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,5000); + if (!HelpYell) + { + DoScriptText(SAY_HELP, me); + HelpYell = true; + } + } + + void JustSummoned(Creature *summoned) + { + if (summoned && summoned->GetEntry() == MOB_VOID_TRAVELER) + CAST_AI(mob_voidtravelerAI, summoned->AI())->VorpilGUID = me->GetGUID(); + } + + void KilledUnit(Unit * /*victim*/) + { + DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); + } + + void JustDied(Unit * /*victim*/) + { + DoScriptText(SAY_DEATH, me); + destroyPortals(); + + if (pInstance) + pInstance->SetData(DATA_GRANDMASTERVORPILEVENT, DONE); + } + + void EnterCombat(Unit * /*who*/) + { + DoScriptText(RAND(SAY_AGGRO1,SAY_AGGRO2,SAY_AGGRO3), me); + summonPortals(); + + if (pInstance) + pInstance->SetData(DATA_GRANDMASTERVORPILEVENT, IN_PROGRESS); + } + + void MoveInLineOfSight(Unit *who) + { + ScriptedAI::MoveInLineOfSight(who); + + if (!Intro && me->IsWithinLOSInMap(who)&& me->IsWithinDistInMap(who, 100) && me->IsHostileTo(who)) + { + DoScriptText(SAY_INTRO, me); + Intro = true; + } + } + + void UpdateAI(const uint32 diff) + { + if (!UpdateVictim()) + return; + + if (ShadowBoltVolley_Timer <= diff) + { + DoCast(me, SPELL_SHADOWBOLT_VOLLEY); + ShadowBoltVolley_Timer = 15000 + rand()%15000; + } else ShadowBoltVolley_Timer -= diff; + + if (IsHeroic() && banish_Timer <= diff) + { + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0,30,false); + if (pTarget) + { + DoCast(pTarget, SPELL_BANISH); + banish_Timer = 16000; + } + } else banish_Timer -= diff; + + if (DrawShadows_Timer <= diff) + { + Map* pMap = me->GetMap(); + Map::PlayerList const &PlayerList = pMap->GetPlayers(); + for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) + if (Player* i_pl = i->getSource()) + if (i_pl->isAlive() && !i_pl->HasAura(SPELL_BANISH)) + i_pl->TeleportTo(me->GetMapId(), VorpilPosition[0],VorpilPosition[1],VorpilPosition[2], 0, TELE_TO_NOT_LEAVE_COMBAT); + + me->GetMap()->CreatureRelocation(me, VorpilPosition[0],VorpilPosition[1],VorpilPosition[2],0.0f); + DoCast(me, SPELL_DRAW_SHADOWS, true); + + DoCast(me, SPELL_RAIN_OF_FIRE); + + ShadowBoltVolley_Timer = 6000; + DrawShadows_Timer = 30000; + } else DrawShadows_Timer -= diff; + + if (summonTraveler_Timer <= diff) + { + spawnVoidTraveler(); + summonTraveler_Timer = 10000; + //enrage at 20% + if ((me->GetHealth()*5) < me->GetMaxHealth()) + summonTraveler_Timer = 5000; + } else summonTraveler_Timer -=diff; + + DoMeleeAttackIfReady(); + } +}; +CreatureAI* GetAI_boss_grandmaster_vorpil(Creature* pCreature) +{ + return new boss_grandmaster_vorpilAI (pCreature); +} + +void AddSC_boss_grandmaster_vorpil() +{ + Script *newscript; + newscript = new Script; + newscript->Name = "boss_grandmaster_vorpil"; + newscript->GetAI = &GetAI_boss_grandmaster_vorpil; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_voidtraveler"; + newscript->GetAI = &GetAI_mob_voidtraveler; + newscript->RegisterSelf(); +} + diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp new file mode 100644 index 00000000000..14bf249c3b5 --- /dev/null +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp @@ -0,0 +1,205 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Boss_Murmur +SD%Complete: 90 +SDComment: Timers may be incorrect +SDCategory: Auchindoun, Shadow Labyrinth +EndScriptData */ + +#include "ScriptedPch.h" +#include "shadow_labyrinth.h" + +#define EMOTE_SONIC_BOOM -1555036 + +#define SPELL_SONIC_BOOM_CAST DUNGEON_MODE(33923, 38796) +#define SPELL_SONIC_BOOM_EFFECT DUNGEON_MODE(33666, 38795) +#define SPELL_RESONANCE 33657 +#define SPELL_MURMURS_TOUCH DUNGEON_MODE(33711, 38794) +#define SPELL_MAGNETIC_PULL 33689 +#define SPELL_SONIC_SHOCK 38797 +#define SPELL_THUNDERING_STORM 39365 + +struct boss_murmurAI : public ScriptedAI +{ + boss_murmurAI(Creature *c) : ScriptedAI(c) + { + SetCombatMovement(false); + } + + uint32 SonicBoom_Timer; + uint32 MurmursTouch_Timer; + uint32 Resonance_Timer; + uint32 MagneticPull_Timer; + uint32 SonicShock_Timer; + uint32 ThunderingStorm_Timer; + bool SonicBoom; + + void Reset() + { + SonicBoom_Timer = 30000; + MurmursTouch_Timer = 8000 + rand()%12000; + Resonance_Timer = 5000; + MagneticPull_Timer = 15000 + rand()%15000; + ThunderingStorm_Timer = 15000; + SonicShock_Timer = 10000; + SonicBoom = false; + + //database should have `RegenHealth`=0 to prevent regen + uint32 hp = (me->GetMaxHealth()*40)/100; + if (hp) me->SetHealth(hp); + me->ResetPlayerDamageReq(); + } + + void SonicBoomEffect() + { + std::list t_list = me->getThreatManager().getThreatList(); + for (std::list::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) + { + Unit *pTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid()); + if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER) + { + //Not do anything without aura, spell can be resisted! + if (pTarget->HasAura(SPELL_SONIC_BOOM_CAST) && me->IsWithinDistInMap(pTarget, 34.0f)) + { + //This will be wrong calculation. Also, comments suggest it must deal damage + pTarget->SetHealth(uint32(pTarget->GetMaxHealth() - pTarget->GetMaxHealth() * 0.8)); + } + } + } + } + + void EnterCombat(Unit * /*who*/) { } + + // Sonic Boom instant damage (needs core fix instead of this) + void SpellHitTarget(Unit *pTarget, const SpellEntry *spell) + { + if (pTarget && pTarget->isAlive() && spell && spell->Id == uint32(SPELL_SONIC_BOOM_EFFECT)) + me->DealDamage(pTarget,(pTarget->GetHealth()*90)/100,NULL,SPELL_DIRECT_DAMAGE,SPELL_SCHOOL_MASK_NATURE,spell); + } + + void UpdateAI(const uint32 diff) + { + //Return since we have no target or casting + if (!UpdateVictim() || me->IsNonMeleeSpellCasted(false)) + return; + + // Sonic Boom + if (SonicBoom) + { + DoCast(me, SPELL_SONIC_BOOM_EFFECT, true); + SonicBoomEffect(); + + SonicBoom = false; + Resonance_Timer = 1500; + } + if (SonicBoom_Timer <= diff) + { + DoScriptText(EMOTE_SONIC_BOOM, me); + DoCast(me, SPELL_SONIC_BOOM_CAST); + SonicBoom_Timer = 30000; + SonicBoom = true; + return; + } else SonicBoom_Timer -= diff; + + // Murmur's Touch + if (MurmursTouch_Timer <= diff) + { + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0,80,true)) + DoCast(pTarget, SPELL_MURMURS_TOUCH); + MurmursTouch_Timer = 25000 + rand()%10000; + } else MurmursTouch_Timer -= diff; + + // Resonance + if (!SonicBoom && !(me->IsWithinMeleeRange(me->getVictim()))) + { + if (Resonance_Timer <= diff) + { + DoCast(me, SPELL_RESONANCE); + Resonance_Timer = 5000; + } else Resonance_Timer -= diff; + } + + // Magnetic Pull + if (MagneticPull_Timer <= diff) + { + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + if (pTarget->GetTypeId() == TYPEID_PLAYER && pTarget->isAlive()) + { + DoCast(pTarget, SPELL_MAGNETIC_PULL); + MagneticPull_Timer = 15000+rand()%15000; + return; + } + MagneticPull_Timer = 500; + } else MagneticPull_Timer -= diff; + + if (IsHeroic()) + { + // Thundering Storm + if (ThunderingStorm_Timer <= diff) + { + std::list& m_threatlist = me->getThreatManager().getThreatList(); + for (std::list::const_iterator i = m_threatlist.begin(); i != m_threatlist.end(); ++i) + if (Unit *pTarget = Unit::GetUnit((*me),(*i)->getUnitGuid())) + if (pTarget->isAlive() && !me->IsWithinDist(pTarget, 35, false)) + DoCast(pTarget, SPELL_THUNDERING_STORM, true); + ThunderingStorm_Timer = 15000; + } else ThunderingStorm_Timer -= diff; + + // Sonic Shock + if (SonicShock_Timer <= diff) + { + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0,20,false)) + if (pTarget->isAlive()) + DoCast(pTarget, SPELL_SONIC_SHOCK); + SonicShock_Timer = 10000+rand()%10000; + } else SonicShock_Timer -= diff; + } + + // Select nearest most aggro target if top aggro too far + if (!me->isAttackReady()) + return; + if (!me->IsWithinMeleeRange(me->getVictim())) + { + std::list& m_threatlist = me->getThreatManager().getThreatList(); + for (std::list::const_iterator i = m_threatlist.begin(); i != m_threatlist.end(); ++i) + if (Unit *pTarget = Unit::GetUnit((*me),(*i)->getUnitGuid())) + if (pTarget->isAlive() && me->IsWithinMeleeRange(pTarget)) + { + me->TauntApply(pTarget); + break; + } + } + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_boss_murmur(Creature* pCreature) +{ + return new boss_murmurAI (pCreature); +} + +void AddSC_boss_murmur() +{ + Script *newscript; + newscript = new Script; + newscript->Name = "boss_murmur"; + newscript->GetAI = &GetAI_boss_murmur; + newscript->RegisterSelf(); +} + diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp new file mode 100644 index 00000000000..78340e5e132 --- /dev/null +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp @@ -0,0 +1,227 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Instance_Shadow_Labyrinth +SD%Complete: 85 +SDComment: Some cleanup left along with save +SDCategory: Auchindoun, Shadow Labyrinth +EndScriptData */ + +#include "ScriptedPch.h" +#include "shadow_labyrinth.h" + +#define MAX_ENCOUNTER 5 + +#define REFECTORY_DOOR 183296 //door opened when blackheart the inciter dies +#define SCREAMING_HALL_DOOR 183295 //door opened when grandmaster vorpil dies + +/* Shadow Labyrinth encounters: +1 - Ambassador Hellmaw event +2 - Blackheart the Inciter event +3 - Grandmaster Vorpil event +4 - Murmur event +*/ + +struct instance_shadow_labyrinth : public ScriptedInstance +{ + instance_shadow_labyrinth(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; + + uint32 m_auiEncounter[MAX_ENCOUNTER]; + std::string str_data; + + uint64 m_uiRefectoryDoorGUID; + uint64 m_uiScreamingHallDoorGUID; + + uint64 m_uiGrandmasterVorpil; + uint32 m_uiFelOverseerCount; + + void Initialize() + { + memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); + + m_uiRefectoryDoorGUID = 0; + m_uiScreamingHallDoorGUID = 0; + + m_uiGrandmasterVorpil = 0; + m_uiFelOverseerCount = 0; + } + + bool IsEncounterInProgress() const + { + for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) + if (m_auiEncounter[i] == IN_PROGRESS) return true; + + return false; + } + + void OnGameObjectCreate(GameObject* pGo, bool /*add*/) + { + switch(pGo->GetEntry()) + { + case REFECTORY_DOOR: + m_uiRefectoryDoorGUID = pGo->GetGUID(); + if (m_auiEncounter[2] == DONE) + pGo->SetGoState(GO_STATE_ACTIVE); + break; + case SCREAMING_HALL_DOOR: + m_uiScreamingHallDoorGUID = pGo->GetGUID(); + if (m_auiEncounter[3] == DONE) + pGo->SetGoState(GO_STATE_ACTIVE); + break; + } + } + + void OnCreatureCreate(Creature* pCreature, bool /*add*/) + { + switch(pCreature->GetEntry()) + { + case 18732: + m_uiGrandmasterVorpil = pCreature->GetGUID(); + break; + case 18796: + if (pCreature->isAlive()) + { + ++m_uiFelOverseerCount; + debug_log("TSCR: Shadow Labyrinth: counting %u Fel Overseers.",m_uiFelOverseerCount); + } + break; + } + } + + void SetData(uint32 type, uint32 uiData) + { + switch(type) + { + case TYPE_HELLMAW: + m_auiEncounter[0] = uiData; + break; + + case TYPE_OVERSEER: + if (uiData != DONE) + { + error_log("TSCR: Shadow Labyrinth: TYPE_OVERSEER did not expect other data than DONE"); + return; + } + if (m_uiFelOverseerCount) + { + --m_uiFelOverseerCount; + + if (m_uiFelOverseerCount) + debug_log("TSCR: Shadow Labyrinth: %u Fel Overseers left to kill.",m_uiFelOverseerCount); + else + { + m_auiEncounter[1] = DONE; + debug_log("TSCR: Shadow Labyrinth: TYPE_OVERSEER == DONE"); + } + } + break; + + case DATA_BLACKHEARTTHEINCITEREVENT: + if (uiData == DONE) + DoUseDoorOrButton(m_uiRefectoryDoorGUID); + m_auiEncounter[2] = uiData; + break; + + case DATA_GRANDMASTERVORPILEVENT: + if (uiData == DONE) + DoUseDoorOrButton(m_uiScreamingHallDoorGUID); + m_auiEncounter[3] = uiData; + break; + + case DATA_MURMUREVENT: + m_auiEncounter[4] = uiData; + break; + } + + if (uiData == DONE) + { + if (type == TYPE_OVERSEER && m_uiFelOverseerCount != 0) + return; + + OUT_SAVE_INST_DATA; + + std::ostringstream saveStream; + saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " + << m_auiEncounter[2] << " " << m_auiEncounter[3] << " " << m_auiEncounter[4]; + + str_data = saveStream.str(); + + SaveToDB(); + OUT_SAVE_INST_DATA_COMPLETE; + } + } + + uint32 GetData(uint32 type) + { + switch(type) + { + case TYPE_HELLMAW: return m_auiEncounter[0]; + case TYPE_OVERSEER: return m_auiEncounter[1]; + case DATA_GRANDMASTERVORPILEVENT: return m_auiEncounter[3]; + case DATA_MURMUREVENT: return m_auiEncounter[4]; + } + return false; + } + + uint64 GetData64(uint32 identifier) + { + if (identifier == DATA_GRANDMASTERVORPIL) + return m_uiGrandmasterVorpil; + + return 0; + } + + std::string GetSaveData() + { + return str_data; + } + + void Load(const char* in) + { + if (!in) + { + OUT_LOAD_INST_DATA_FAIL; + return; + } + + OUT_LOAD_INST_DATA(in); + + std::istringstream loadStream(in); + loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3] >> m_auiEncounter[4]; + + for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) + if (m_auiEncounter[i] == IN_PROGRESS) + m_auiEncounter[i] = NOT_STARTED; + + OUT_LOAD_INST_DATA_COMPLETE; + } +}; + +InstanceData* GetInstanceData_instance_shadow_labyrinth(Map* pMap) +{ + return new instance_shadow_labyrinth(pMap); +} + +void AddSC_instance_shadow_labyrinth() +{ + Script *newscript; + newscript = new Script; + newscript->Name = "instance_shadow_labyrinth"; + newscript->GetInstanceData = &GetInstanceData_instance_shadow_labyrinth; + newscript->RegisterSelf(); +} + diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h new file mode 100644 index 00000000000..a78955368bf --- /dev/null +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h @@ -0,0 +1,15 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software licensed under GPL version 2 + * Please see the included DOCS/LICENSE.TXT for more information */ + +#ifndef DEF_SHADOW_LABYRINTH_H +#define DEF_SHADOW_LABYRINTH_H + +#define TYPE_HELLMAW 1 +#define TYPE_OVERSEER 2 +#define DATA_BLACKHEARTTHEINCITEREVENT 3 +#define DATA_GRANDMASTERVORPILEVENT 4 +#define DATA_MURMUREVENT 5 +#define DATA_GRANDMASTERVORPIL 6 +#endif + diff --git a/src/server/scripts/Outland/Auchindoun/auchenai_crypts/boss_exarch_maladaar.cpp b/src/server/scripts/Outland/Auchindoun/auchenai_crypts/boss_exarch_maladaar.cpp deleted file mode 100644 index bfde95ffcb0..00000000000 --- a/src/server/scripts/Outland/Auchindoun/auchenai_crypts/boss_exarch_maladaar.cpp +++ /dev/null @@ -1,348 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: Boss_Exarch_Maladaar -SD%Complete: 95 -SDComment: Most of event implemented, some adjustments to timers remain and possibly make some better code for switching his dark side in to better "images" of player. -SDCategory: Auchindoun, Auchenai Crypts -EndScriptData */ - -/* ContentData -mob_stolen_soul -boss_exarch_maladaar -mob_avatar_of_martyred -EndContentData */ - -#include "ScriptedPch.h" - -#define SPELL_MOONFIRE 37328 -#define SPELL_FIREBALL 37329 -#define SPELL_MIND_FLAY 37330 -#define SPELL_HEMORRHAGE 37331 -#define SPELL_FROSTSHOCK 37332 -#define SPELL_CURSE_OF_AGONY 37334 -#define SPELL_MORTAL_STRIKE 37335 -#define SPELL_FREEZING_TRAP 37368 -#define SPELL_HAMMER_OF_JUSTICE 37369 - -struct mob_stolen_soulAI : public ScriptedAI -{ - mob_stolen_soulAI(Creature *c) : ScriptedAI(c) {} - - uint8 myClass; - uint32 Class_Timer; - - void Reset() - { - Class_Timer = 1000; - } - - void EnterCombat(Unit * /*who*/) - { } - - void SetMyClass(uint8 myclass) - { - myClass = myclass; - } - - void UpdateAI(const uint32 diff) - { - if (!UpdateVictim()) - return; - - if (Class_Timer <= diff) - { - switch (myClass) - { - case CLASS_WARRIOR: - DoCast(me->getVictim(), SPELL_MORTAL_STRIKE); - Class_Timer = 6000; - break; - case CLASS_PALADIN: - DoCast(me->getVictim(), SPELL_HAMMER_OF_JUSTICE); - Class_Timer = 6000; - break; - case CLASS_HUNTER: - DoCast(me->getVictim(), SPELL_FREEZING_TRAP); - Class_Timer = 20000; - break; - case CLASS_ROGUE: - DoCast(me->getVictim(), SPELL_HEMORRHAGE); - Class_Timer = 10000; - break; - case CLASS_PRIEST: - DoCast(me->getVictim(), SPELL_MIND_FLAY); - Class_Timer = 5000; - break; - case CLASS_SHAMAN: - DoCast(me->getVictim(), SPELL_FROSTSHOCK); - Class_Timer = 8000; - break; - case CLASS_MAGE: - DoCast(me->getVictim(), SPELL_FIREBALL); - Class_Timer = 5000; - break; - case CLASS_WARLOCK: - DoCast(me->getVictim(), SPELL_CURSE_OF_AGONY); - Class_Timer = 20000; - break; - case CLASS_DRUID: - DoCast(me->getVictim(), SPELL_MOONFIRE); - Class_Timer = 10000; - break; - } - } else Class_Timer -= diff; - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_mob_stolen_soul(Creature* pCreature) -{ - return new mob_stolen_soulAI (pCreature); -} - -#define SAY_INTRO -1558000 -#define SAY_SUMMON -1558001 - -#define SAY_AGGRO_1 -1558002 -#define SAY_AGGRO_2 -1558003 -#define SAY_AGGRO_3 -1558004 - -#define SAY_ROAR -1558005 -#define SAY_SOUL_CLEAVE -1558006 - -#define SAY_SLAY_1 -1558007 -#define SAY_SLAY_2 -1558008 - -#define SAY_DEATH -1558009 - -#define SPELL_RIBBON_OF_SOULS 32422 -#define SPELL_SOUL_SCREAM 32421 - -#define SPELL_STOLEN_SOUL 32346 -#define SPELL_STOLEN_SOUL_VISUAL 32395 - -#define SPELL_SUMMON_AVATAR 32424 - -#define ENTRY_STOLEN_SOUL 18441 - -struct boss_exarch_maladaarAI : public ScriptedAI -{ - boss_exarch_maladaarAI(Creature *c) : ScriptedAI(c) - { - HasTaunted = false; - } - - uint32 soulmodel; - uint64 soulholder; - uint8 soulclass; - - uint32 Fear_timer; - uint32 Ribbon_of_Souls_timer; - uint32 StolenSoul_Timer; - - bool HasTaunted; - bool Avatar_summoned; - - void Reset() - { - soulmodel = 0; - soulholder = 0; - soulclass = 0; - - Fear_timer = 15000 + rand()% 5000; - Ribbon_of_Souls_timer = 5000; - StolenSoul_Timer = 25000 + rand()% 10000; - - Avatar_summoned = false; - } - - void MoveInLineOfSight(Unit *who) - { - if (!HasTaunted && me->IsWithinDistInMap(who, 150.0)) - { - DoScriptText(SAY_INTRO, me); - HasTaunted = true; - } - - ScriptedAI::MoveInLineOfSight(who); - } - - void EnterCombat(Unit * /*who*/) - { - DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); - } - - void JustSummoned(Creature *summoned) - { - if (summoned->GetEntry() == ENTRY_STOLEN_SOUL) - { - //SPELL_STOLEN_SOUL_VISUAL has shapeshift effect, but not implemented feature in Trinity for this spell. - summoned->CastSpell(summoned,SPELL_STOLEN_SOUL_VISUAL,false); - summoned->SetDisplayId(soulmodel); - summoned->setFaction(me->getFaction()); - - if (Unit *pTarget = Unit::GetUnit(*me,soulholder)) - { - - CAST_AI(mob_stolen_soulAI, summoned->AI())->SetMyClass(soulclass); - summoned->AI()->AttackStart(pTarget); - } - } - } - - void KilledUnit(Unit* /*victim*/) - { - if (rand()%2) - return; - - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); - } - - void JustDied(Unit* /*Killer*/) - { - DoScriptText(SAY_DEATH, me); - //When Exarch Maladar is defeated D'ore appear. - me->SummonCreature(19412, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 600000); - } - - void UpdateAI(const uint32 diff) - { - if (!UpdateVictim()) - return; - - if (!Avatar_summoned && ((me->GetHealth()*100) / me->GetMaxHealth() < 25)) - { - if (me->IsNonMeleeSpellCasted(false)) - me->InterruptNonMeleeSpells(true); - - DoScriptText(SAY_SUMMON, me); - - DoCast(me, SPELL_SUMMON_AVATAR); - Avatar_summoned = true; - StolenSoul_Timer = 15000 + rand()% 15000; - } - - if (StolenSoul_Timer <= diff) - { - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - { - if (pTarget->GetTypeId() == TYPEID_PLAYER) - { - if (me->IsNonMeleeSpellCasted(false)) - me->InterruptNonMeleeSpells(true); - - uint32 i = urand(1,2); - if (i == 1) - DoScriptText(SAY_ROAR, me); - else - DoScriptText(SAY_SOUL_CLEAVE, me); - - soulmodel = pTarget->GetDisplayId(); - soulholder = pTarget->GetGUID(); - soulclass = pTarget->getClass(); - - DoCast(pTarget, SPELL_STOLEN_SOUL); - me->SummonCreature(ENTRY_STOLEN_SOUL, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); - - StolenSoul_Timer = 20000 + rand()% 10000; - } else StolenSoul_Timer = 1000; - } - } else StolenSoul_Timer -= diff; - - if (Ribbon_of_Souls_timer <= diff) - { - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget, SPELL_RIBBON_OF_SOULS); - - Ribbon_of_Souls_timer = 5000 + (rand()%20 * 1000); - } else Ribbon_of_Souls_timer -= diff; - - if (Fear_timer <= diff) - { - DoCast(me, SPELL_SOUL_SCREAM); - Fear_timer = 15000 + rand()% 15000; - } else Fear_timer -= diff; - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_boss_exarch_maladaar(Creature* pCreature) -{ - return new boss_exarch_maladaarAI (pCreature); -} - -#define SPELL_AV_MORTAL_STRIKE 16856 -#define SPELL_AV_SUNDER_ARMOR 16145 - -struct mob_avatar_of_martyredAI : public ScriptedAI -{ - mob_avatar_of_martyredAI(Creature *c) : ScriptedAI(c) {} - - uint32 Mortal_Strike_timer; - - void Reset() - { - Mortal_Strike_timer = 10000; - } - - void EnterCombat(Unit * /*who*/) - { - } - - void UpdateAI(const uint32 diff) - { - if (!UpdateVictim()) - return; - - if (Mortal_Strike_timer <= diff) - { - DoCast(me->getVictim(), SPELL_AV_MORTAL_STRIKE); - Mortal_Strike_timer = 10000 + rand()%20 * 1000; - } else Mortal_Strike_timer -= diff; - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_mob_avatar_of_martyred(Creature* pCreature) -{ - return new mob_avatar_of_martyredAI (pCreature); -} - -void AddSC_boss_exarch_maladaar() -{ - Script *newscript; - - newscript = new Script; - newscript->Name = "boss_exarch_maladaar"; - newscript->GetAI = &GetAI_boss_exarch_maladaar; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_avatar_of_martyred"; - newscript->GetAI = &GetAI_mob_avatar_of_martyred; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_stolen_soul"; - newscript->GetAI = &GetAI_mob_stolen_soul; - newscript->RegisterSelf(); -} - diff --git a/src/server/scripts/Outland/Auchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp b/src/server/scripts/Outland/Auchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp deleted file mode 100644 index c13e2905171..00000000000 --- a/src/server/scripts/Outland/Auchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp +++ /dev/null @@ -1,211 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -Name: Boss_Shirrak_the_dead_watcher -%Complete: 80 -Comment: InhibitMagic should stack slower far from the boss, proper Visual for Focus Fire, heroic implemented -Category: Auchindoun, Auchenai Crypts -EndScriptData */ - -#include "ScriptedPch.h" - -#define SPELL_INHIBITMAGIC 32264 -#define SPELL_ATTRACTMAGIC 32265 -#define N_SPELL_CARNIVOROUSBITE 36383 -#define H_SPELL_CARNIVOROUSBITE 39382 -#define SPELL_CARNIVOROUSBITE DUNGEON_MODE(N_SPELL_CARNIVOROUSBITE, H_SPELL_CARNIVOROUSBITE) - -#define ENTRY_FOCUS_FIRE 18374 - -#define N_SPELL_FIERY_BLAST 32302 -#define H_SPELL_FIERY_BLAST 38382 -#define SPELL_FIERY_BLAST DUNGEON_MODE(N_SPELL_FIERY_BLAST, H_SPELL_FIERY_BLAST) -#define SPELL_FOCUS_FIRE_VISUAL 42075 //need to find better visual - -#define EMOTE_FOCUSES_ON "focuses on " - -struct boss_shirrak_the_dead_watcherAI : public ScriptedAI -{ - boss_shirrak_the_dead_watcherAI(Creature *c) : ScriptedAI(c) - { - } - - uint32 Inhibitmagic_Timer; - uint32 Attractmagic_Timer; - uint32 Carnivorousbite_Timer; - uint32 FocusFire_Timer; - - uint64 FocusedTargetGUID; - - void Reset() - { - Inhibitmagic_Timer = 0; - Attractmagic_Timer = 28000; - Carnivorousbite_Timer = 10000; - FocusFire_Timer = 17000; - FocusedTargetGUID = 0; - } - - void EnterCombat(Unit * /*who*/) - { } - - void JustSummoned(Creature *summoned) - { - if (summoned && summoned->GetEntry() == ENTRY_FOCUS_FIRE) - { - summoned->CastSpell(summoned,SPELL_FOCUS_FIRE_VISUAL,false); - summoned->setFaction(me->getFaction()); - summoned->SetLevel(me->getLevel()); - summoned->addUnitState(UNIT_STAT_ROOT); - - if (Unit *pFocusedTarget = Unit::GetUnit(*me, FocusedTargetGUID)) - summoned->AI()->AttackStart(pFocusedTarget); - } - } - - void UpdateAI(const uint32 diff) - { - //Inhibitmagic_Timer - if (Inhibitmagic_Timer <= diff) - { - float dist; - Map* pMap = me->GetMap(); - Map::PlayerList const &PlayerList = pMap->GetPlayers(); - for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) - if (Player* i_pl = i->getSource()) - if (i_pl->isAlive() && (dist = i_pl->IsWithinDist(me, 45))) - { - i_pl->RemoveAurasDueToSpell(SPELL_INHIBITMAGIC); - me->AddAura(SPELL_INHIBITMAGIC, i_pl); - if (dist < 35) - me->AddAura(SPELL_INHIBITMAGIC, i_pl); - if (dist < 25) - me->AddAura(SPELL_INHIBITMAGIC, i_pl); - if (dist < 15) - me->AddAura(SPELL_INHIBITMAGIC, i_pl); - } - Inhibitmagic_Timer = 3000+(rand()%1000); - } else Inhibitmagic_Timer -= diff; - - //Return since we have no target - if (!UpdateVictim()) - return; - - //Attractmagic_Timer - if (Attractmagic_Timer <= diff) - { - DoCast(me, SPELL_ATTRACTMAGIC); - Attractmagic_Timer = 30000; - Carnivorousbite_Timer = 1500; - } else Attractmagic_Timer -= diff; - - //Carnivorousbite_Timer - if (Carnivorousbite_Timer <= diff) - { - DoCast(me, SPELL_CARNIVOROUSBITE); - Carnivorousbite_Timer = 10000; - } else Carnivorousbite_Timer -= diff; - - //FocusFire_Timer - if (FocusFire_Timer <= diff) - { - // Summon Focus Fire & Emote - Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,1); - if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER && pTarget->isAlive()) - { - FocusedTargetGUID = pTarget->GetGUID(); - me->SummonCreature(ENTRY_FOCUS_FIRE,pTarget->GetPositionX(),pTarget->GetPositionY(),pTarget->GetPositionZ(),0,TEMPSUMMON_TIMED_DESPAWN,5500); - - // TODO: Find better way to handle emote - // Emote - std::string *emote = new std::string(EMOTE_FOCUSES_ON); - emote->append(pTarget->GetName()); - emote->append("!"); - const char* text = emote->c_str(); - me->MonsterTextEmote(text, 0, true); - delete emote; - } - FocusFire_Timer = 15000+(rand()%5000); - } else FocusFire_Timer -= diff; - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_boss_shirrak_the_dead_watcher(Creature* pCreature) -{ - return new boss_shirrak_the_dead_watcherAI (pCreature); -} - -struct mob_focus_fireAI : public ScriptedAI -{ - mob_focus_fireAI(Creature *c) : ScriptedAI(c) - { - } - - uint32 FieryBlast_Timer; - bool fiery1, fiery2; - - void Reset() - { - FieryBlast_Timer = 3000+(rand()%1000); - fiery1 = fiery2 = true; - } - - void EnterCombat(Unit * /*who*/) - { } - - void UpdateAI(const uint32 diff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - //FieryBlast_Timer - if (fiery2 && FieryBlast_Timer <= diff) - { - DoCast(me, SPELL_FIERY_BLAST); - - if (fiery1) fiery1 = false; - else if (fiery2) fiery2 = false; - - FieryBlast_Timer = 1000; - } else FieryBlast_Timer -= diff; - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_mob_focus_fire(Creature* pCreature) -{ - return new mob_focus_fireAI (pCreature); -} - -void AddSC_boss_shirrak_the_dead_watcher() -{ - Script *newscript; - newscript = new Script; - newscript->Name = "boss_shirrak_the_dead_watcher"; - newscript->GetAI = &GetAI_boss_shirrak_the_dead_watcher; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_focus_fire"; - newscript->GetAI = &GetAI_mob_focus_fire; - newscript->RegisterSelf(); -} - diff --git a/src/server/scripts/Outland/Auchindoun/mana_tombs/boss_nexusprince_shaffar.cpp b/src/server/scripts/Outland/Auchindoun/mana_tombs/boss_nexusprince_shaffar.cpp deleted file mode 100644 index 5b15178c33e..00000000000 --- a/src/server/scripts/Outland/Auchindoun/mana_tombs/boss_nexusprince_shaffar.cpp +++ /dev/null @@ -1,358 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: Boss_NexusPrince_Shaffar -SD%Complete: 80 -SDComment: Need more tuning of spell timers, it should not be as linear fight as current. Also should possibly find a better way to deal with his three initial beacons to make sure all aggro. -SDCategory: Auchindoun, Mana Tombs -EndScriptData */ - -/* ContentData -boss_nexusprince_shaffar -mob_ethereal_beacon -EndContentData */ - -#include "ScriptedPch.h" - -enum ePrince -{ - SAY_INTRO = -1557000, - SAY_AGGRO_1 = -1557001, - SAY_AGGRO_2 = -1557002, - SAY_AGGRO_3 = -1557003, - SAY_SLAY_1 = -1557004, - SAY_SLAY_2 = -1557005, - SAY_SUMMON = -1557006, - SAY_DEAD = -1557007, - - SPELL_BLINK = 34605, - SPELL_FROSTBOLT = 32364, - SPELL_FIREBALL = 32363, - SPELL_FROSTNOVA = 32365, - - SPELL_ETHEREAL_BEACON = 32371, // Summons NPC_BEACON - SPELL_ETHEREAL_BEACON_VISUAL = 32368, - - NPC_BEACON = 18431, - NPC_SHAFFAR = 18344, - - NR_INITIAL_BEACONS = 3 -}; - -struct boss_nexusprince_shaffarAI : public ScriptedAI -{ - boss_nexusprince_shaffarAI(Creature *c) : ScriptedAI(c), summons(me) { HasTaunted = false; } - - uint32 Blink_Timer; - uint32 Beacon_Timer; - uint32 FireBall_Timer; - uint32 Frostbolt_Timer; - uint32 FrostNova_Timer; - - SummonList summons; - - bool HasTaunted; - bool CanBlink; - - void Reset() - { - Blink_Timer = 1500; - Beacon_Timer = 10000; - FireBall_Timer = 8000; - Frostbolt_Timer = 4000; - FrostNova_Timer = 15000; - - CanBlink = false; - - float dist = 8.0f; - float posX, posY, posZ, angle; - me->GetHomePosition(posX, posY, posZ, angle); - - me->SummonCreature(NPC_BEACON, posX - dist, posY - dist, posZ, angle, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 7200000); - me->SummonCreature(NPC_BEACON, posX - dist, posY + dist, posZ, angle, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 7200000); - me->SummonCreature(NPC_BEACON, posX + dist, posY, posZ, angle, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 7200000); - } - - void EnterEvadeMode() - { - summons.DespawnAll(); - ScriptedAI::EnterEvadeMode(); - } - - void MoveInLineOfSight(Unit *who) - { - if (!HasTaunted && who->GetTypeId() == TYPEID_PLAYER && me->IsWithinDistInMap(who, 100.0f)) - { - DoScriptText(SAY_INTRO, me); - HasTaunted = true; - } - } - - void EnterCombat(Unit * /*who*/) - { - DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); - - DoZoneInCombat(); - summons.DoZoneInCombat(); - } - - void JustSummoned(Creature *summoned) - { - if (summoned->GetEntry() == NPC_BEACON) - { - summoned->CastSpell(summoned,SPELL_ETHEREAL_BEACON_VISUAL,false); - - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - summoned->AI()->AttackStart(pTarget); - } - - summons.Summon(summoned); - } - - void SummonedCreatureDespawn(Creature *summon) - { - summons.Despawn(summon); - } - - void KilledUnit(Unit* /*victim*/) - { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); - } - - void JustDied(Unit* /*Killer*/) - { - DoScriptText(SAY_DEAD, me); - summons.DespawnAll(); - } - - void UpdateAI(const uint32 diff) - { - if (!UpdateVictim()) - return; - - if (FrostNova_Timer <= diff) - { - if (me->IsNonMeleeSpellCasted(false)) - me->InterruptNonMeleeSpells(true); - - DoCast(me, SPELL_FROSTNOVA); - FrostNova_Timer = 17500 + rand()%7500; - CanBlink = true; - } else FrostNova_Timer -= diff; - - if (Frostbolt_Timer <= diff) - { - DoCast(me->getVictim(), SPELL_FROSTBOLT); - Frostbolt_Timer = 4500 + rand()%1500; - } else Frostbolt_Timer -= diff; - - if (FireBall_Timer <= diff) - { - DoCast(me->getVictim(), SPELL_FIREBALL); - FireBall_Timer = 4500 + rand()%1500; - } else FireBall_Timer -= diff; - - if (CanBlink) - { - if (Blink_Timer <= diff) - { - if (me->IsNonMeleeSpellCasted(false)) - me->InterruptNonMeleeSpells(true); - - //expire movement, will prevent from running right back to victim after cast - //(but should MoveChase be used again at a certain time or should he not move?) - if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() == TARGETED_MOTION_TYPE) - me->GetMotionMaster()->MovementExpired(); - - DoCast(me, SPELL_BLINK); - Blink_Timer = 1000 + rand()%1500; - CanBlink = false; - } else Blink_Timer -= diff; - } - - if (Beacon_Timer <= diff) - { - if (me->IsNonMeleeSpellCasted(false)) - me->InterruptNonMeleeSpells(true); - - if (!urand(0,3)) - DoScriptText(SAY_SUMMON, me); - - DoCast(me, SPELL_ETHEREAL_BEACON, true); - - Beacon_Timer = 10000; - } else Beacon_Timer -= diff; - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_boss_nexusprince_shaffar(Creature* pCreature) -{ - return new boss_nexusprince_shaffarAI (pCreature); -} - -enum eEnums -{ - SPELL_ARCANE_BOLT = 15254, - SPELL_ETHEREAL_APPRENTICE = 32372 // Summon 18430 -}; - -struct mob_ethereal_beaconAI : public ScriptedAI -{ - mob_ethereal_beaconAI(Creature *c) : ScriptedAI(c) - { - } - - uint32 Apprentice_Timer; - uint32 ArcaneBolt_Timer; - uint32 Check_Timer; - - void KillSelf() - { - me->Kill(me); - } - - void Reset() - { - Apprentice_Timer = DUNGEON_MODE(20000, 10000); - ArcaneBolt_Timer = 1000; - Check_Timer = 1000; - } - - void EnterCombat(Unit * who) - { - // Send Shaffar to fight - Creature* Shaffar = me->FindNearestCreature(NPC_SHAFFAR, 100); - if (!Shaffar || Shaffar->isDead()) - { - KillSelf(); - return; - } - if (!Shaffar->isInCombat()) - Shaffar->AI()->AttackStart(who); - } - - void JustSummoned(Creature *summoned) - { - summoned->AI()->AttackStart(me->getVictim()); - } - - void UpdateAI(const uint32 diff) - { - if (!UpdateVictim()) - return; - - if (Check_Timer <= diff) - { - Creature *Shaffar = me->FindNearestCreature(NPC_SHAFFAR, 100); - if (!Shaffar || Shaffar->isDead() || !Shaffar->isInCombat()) - { - KillSelf(); - return; - } - Check_Timer = 1000; - } else Check_Timer -= diff; - - if (ArcaneBolt_Timer <= diff) - { - DoCast(me->getVictim(), SPELL_ARCANE_BOLT); - ArcaneBolt_Timer = 2000 + rand()%2500; - } else ArcaneBolt_Timer -= diff; - - if (Apprentice_Timer <= diff) - { - if (me->IsNonMeleeSpellCasted(false)) - me->InterruptNonMeleeSpells(true); - - DoCast(me, SPELL_ETHEREAL_APPRENTICE, true); - me->ForcedDespawn(); - return; - } else Apprentice_Timer -= diff; - } -}; - -CreatureAI* GetAI_mob_ethereal_beacon(Creature* pCreature) -{ - return new mob_ethereal_beaconAI (pCreature); -} - -enum eEthereal -{ - SPELL_ETHEREAL_APPRENTICE_FIREBOLT = 32369, - SPELL_ETHEREAL_APPRENTICE_FROSTBOLT = 32370 -}; - -struct mob_ethereal_apprenticeAI : public ScriptedAI -{ - mob_ethereal_apprenticeAI(Creature *c) : ScriptedAI(c) {} - - uint32 Cast_Timer; - - bool isFireboltTurn; - - void Reset() - { - Cast_Timer = 3000; - isFireboltTurn = true; - } - - void UpdateAI(const uint32 diff) - { - if (!UpdateVictim()) - return; - - if (Cast_Timer <= diff) - { - if (isFireboltTurn) - { - DoCast(me->getVictim(), SPELL_ETHEREAL_APPRENTICE_FIREBOLT, true); - isFireboltTurn = false; - }else{ - DoCast(me->getVictim(), SPELL_ETHEREAL_APPRENTICE_FROSTBOLT, true); - isFireboltTurn = true; - } - Cast_Timer = 3000; - } else Cast_Timer -= diff; - } -}; - -CreatureAI* GetAI_mob_ethereal_apprentice(Creature* pCreature) -{ - return new mob_ethereal_apprenticeAI (pCreature); -} - -void AddSC_boss_nexusprince_shaffar() -{ - Script *newscript; - - newscript = new Script; - newscript->Name = "boss_nexusprince_shaffar"; - newscript->GetAI = &GetAI_boss_nexusprince_shaffar; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_ethereal_beacon"; - newscript->GetAI = &GetAI_mob_ethereal_beacon; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_ethereal_apprentice"; - newscript->GetAI = &GetAI_mob_ethereal_apprentice; - newscript->RegisterSelf(); -} - diff --git a/src/server/scripts/Outland/Auchindoun/mana_tombs/boss_pandemonius.cpp b/src/server/scripts/Outland/Auchindoun/mana_tombs/boss_pandemonius.cpp deleted file mode 100644 index 51ec2e83b46..00000000000 --- a/src/server/scripts/Outland/Auchindoun/mana_tombs/boss_pandemonius.cpp +++ /dev/null @@ -1,126 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: Boss_Pandemonius -SD%Complete: 75 -SDComment: Not known how void blast is done (amount of rapid cast seems to be related to players in party). All mobs remaining in surrounding area should aggro when engaged. -SDCategory: Auchindoun, Mana Tombs -EndScriptData */ - -#include "ScriptedPch.h" - -#define SAY_AGGRO_1 -1557008 -#define SAY_AGGRO_2 -1557009 -#define SAY_AGGRO_3 -1557010 - -#define SAY_KILL_1 -1557011 -#define SAY_KILL_2 -1557012 - -#define SAY_DEATH -1557013 - -#define EMOTE_DARK_SHELL -1557014 - -#define SPELL_VOID_BLAST 32325 -#define H_SPELL_VOID_BLAST 38760 -#define SPELL_DARK_SHELL 32358 -#define H_SPELL_DARK_SHELL 38759 - -struct boss_pandemoniusAI : public ScriptedAI -{ - boss_pandemoniusAI(Creature *c) : ScriptedAI(c) - { - } - - uint32 VoidBlast_Timer; - uint32 DarkShell_Timer; - uint32 VoidBlast_Counter; - - void Reset() - { - VoidBlast_Timer = 8000+rand()%15000; - DarkShell_Timer = 20000; - VoidBlast_Counter = 0; - } - - void JustDied(Unit* /*Killer*/) - { - DoScriptText(SAY_DEATH, me); - } - - void KilledUnit(Unit* /*victim*/) - { - DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2), me); - } - - void EnterCombat(Unit * /*who*/) - { - DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); - } - - void UpdateAI(const uint32 diff) - { - if (!UpdateVictim()) - return; - - if (VoidBlast_Timer <= diff) - { - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - { - DoCast(pTarget, SPELL_VOID_BLAST); - VoidBlast_Timer = 500; - ++VoidBlast_Counter; - } - - if (VoidBlast_Counter == 5) - { - VoidBlast_Timer = 15000+rand()%10000; - VoidBlast_Counter = 0; - } - } else VoidBlast_Timer -= diff; - - if (!VoidBlast_Counter) - { - if (DarkShell_Timer <= diff) - { - if (me->IsNonMeleeSpellCasted(false)) - me->InterruptNonMeleeSpells(true); - - DoScriptText(EMOTE_DARK_SHELL, me); - - DoCast(me, SPELL_DARK_SHELL); - DarkShell_Timer = 20000; - } else DarkShell_Timer -= diff; - } - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_boss_pandemonius(Creature* pCreature) -{ - return new boss_pandemoniusAI (pCreature); -} - -void AddSC_boss_pandemonius() -{ - Script *newscript; - newscript = new Script; - newscript->Name = "boss_pandemonius"; - newscript->GetAI = &GetAI_boss_pandemonius; - newscript->RegisterSelf(); -} - diff --git a/src/server/scripts/Outland/Auchindoun/sethekk_halls/boss_darkweaver_syth.cpp b/src/server/scripts/Outland/Auchindoun/sethekk_halls/boss_darkweaver_syth.cpp deleted file mode 100644 index 9628fa1a98f..00000000000 --- a/src/server/scripts/Outland/Auchindoun/sethekk_halls/boss_darkweaver_syth.cpp +++ /dev/null @@ -1,414 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: Boss_Darkweaver_Syth -SD%Complete: 85 -SDComment: Shock spells/times need more work. Heroic partly implemented. -SDCategory: Auchindoun, Sethekk Halls -EndScriptData */ - -#include "ScriptedPch.h" - -#define SAY_SUMMON -1556000 - -#define SAY_AGGRO_1 -1556001 -#define SAY_AGGRO_2 -1556002 -#define SAY_AGGRO_3 -1556003 - -#define SAY_SLAY_1 -1556004 -#define SAY_SLAY_2 -1556005 - -#define SAY_DEATH -1556006 - -#define SPELL_FROST_SHOCK 21401 //37865 -#define SPELL_FLAME_SHOCK 34354 -#define SPELL_SHADOW_SHOCK 30138 -#define SPELL_ARCANE_SHOCK 37132 - -#define SPELL_CHAIN_LIGHTNING 15659 //15305 - -#define SPELL_SUMMON_SYTH_FIRE 33537 // Spawns 19203 -#define SPELL_SUMMON_SYTH_ARCANE 33538 // Spawns 19205 -#define SPELL_SUMMON_SYTH_FROST 33539 // Spawns 19204 -#define SPELL_SUMMON_SYTH_SHADOW 33540 // Spawns 19206 - -#define SPELL_FLAME_BUFFET DUNGEON_MODE(33526, 38141) -#define SPELL_ARCANE_BUFFET DUNGEON_MODE(33527, 38138) -#define SPELL_FROST_BUFFET DUNGEON_MODE(33528, 38142) -#define SPELL_SHADOW_BUFFET DUNGEON_MODE(33529, 38143) - -struct boss_darkweaver_sythAI : public ScriptedAI -{ - boss_darkweaver_sythAI(Creature *c) : ScriptedAI(c) - { - } - - uint32 flameshock_timer; - uint32 arcaneshock_timer; - uint32 frostshock_timer; - uint32 shadowshock_timer; - uint32 chainlightning_timer; - - bool summon90; - bool summon50; - bool summon10; - - void Reset() - { - flameshock_timer = 2000; - arcaneshock_timer = 4000; - frostshock_timer = 6000; - shadowshock_timer = 8000; - chainlightning_timer = 15000; - - summon90 = false; - summon50 = false; - summon10 = false; - } - - void EnterCombat(Unit * /*who*/) - { - DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); - } - - void JustDied(Unit* /*Killer*/) - { - DoScriptText(SAY_DEATH, me); - } - - void KilledUnit(Unit* /*victim*/) - { - if (rand()%2) - return; - - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); - } - - void JustSummoned(Creature *summoned) - { - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - summoned->AI()->AttackStart(pTarget); - } - - void SythSummoning() - { - DoScriptText(SAY_SUMMON, me); - - if (me->IsNonMeleeSpellCasted(false)) - me->InterruptNonMeleeSpells(false); - - DoCast(me, SPELL_SUMMON_SYTH_ARCANE, true); //front - DoCast(me, SPELL_SUMMON_SYTH_FIRE, true); //back - DoCast(me, SPELL_SUMMON_SYTH_FROST, true); //left - DoCast(me, SPELL_SUMMON_SYTH_SHADOW, true); //right - } - - void UpdateAI(const uint32 diff) - { - if (!UpdateVictim()) - return; - - if (((me->GetHealth()*100) / me->GetMaxHealth() < 90) && !summon90) - { - SythSummoning(); - summon90 = true; - } - - if (((me->GetHealth()*100) / me->GetMaxHealth() < 50) && !summon50) - { - SythSummoning(); - summon50 = true; - } - - if (((me->GetHealth()*100) / me->GetMaxHealth() < 10) && !summon10) - { - SythSummoning(); - summon10 = true; - } - - if (flameshock_timer <= diff) - { - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget, SPELL_FLAME_SHOCK); - - flameshock_timer = 10000 + rand()%5000; - } else flameshock_timer -= diff; - - if (arcaneshock_timer <= diff) - { - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget, SPELL_ARCANE_SHOCK); - - arcaneshock_timer = 10000 + rand()%5000; - } else arcaneshock_timer -= diff; - - if (frostshock_timer <= diff) - { - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget, SPELL_FROST_SHOCK); - - frostshock_timer = 10000 + rand()%5000; - } else frostshock_timer -= diff; - - if (shadowshock_timer <= diff) - { - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget, SPELL_SHADOW_SHOCK); - - shadowshock_timer = 10000 + rand()%5000; - } else shadowshock_timer -= diff; - - if (chainlightning_timer <= diff) - { - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget, SPELL_CHAIN_LIGHTNING); - - chainlightning_timer = 25000; - } else chainlightning_timer -= diff; - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_boss_darkweaver_syth(Creature* pCreature) -{ - return new boss_darkweaver_sythAI (pCreature); -} - -/* ELEMENTALS */ - -struct mob_syth_fireAI : public ScriptedAI -{ - mob_syth_fireAI(Creature *c) : ScriptedAI(c) - { - } - - uint32 flameshock_timer; - uint32 flamebuffet_timer; - - void Reset() - { - me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FIRE, true); - flameshock_timer = 2500; - flamebuffet_timer = 5000; - } - - void EnterCombat(Unit * /*who*/) { } - - void UpdateAI(const uint32 diff) - { - if (!UpdateVictim()) - return; - - if (flameshock_timer <= diff) - { - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget, SPELL_FLAME_SHOCK); - - flameshock_timer = 5000; - } else flameshock_timer -= diff; - - if (flamebuffet_timer <= diff) - { - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget, SPELL_FLAME_BUFFET); - - flamebuffet_timer = 5000; - } else flamebuffet_timer -= diff; - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_mob_syth_fire(Creature* pCreature) -{ - return new mob_syth_fireAI (pCreature); -} - -struct mob_syth_arcaneAI : public ScriptedAI -{ - mob_syth_arcaneAI(Creature *c) : ScriptedAI(c) - { - } - - uint32 arcaneshock_timer; - uint32 arcanebuffet_timer; - - void Reset() - { - me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_ARCANE, true); - arcaneshock_timer = 2500; - arcanebuffet_timer = 5000; - } - - void EnterCombat(Unit * /*who*/) { } - - void UpdateAI(const uint32 diff) - { - if (!UpdateVictim()) - return; - - if (arcaneshock_timer <= diff) - { - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget, SPELL_ARCANE_SHOCK); - - arcaneshock_timer = 5000; - } else arcaneshock_timer -= diff; - - if (arcanebuffet_timer <= diff) - { - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget, SPELL_ARCANE_BUFFET); - - arcanebuffet_timer = 5000; - } else arcanebuffet_timer -= diff; - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_mob_syth_arcane(Creature* pCreature) -{ - return new mob_syth_arcaneAI (pCreature); -} - -struct mob_syth_frostAI : public ScriptedAI -{ - mob_syth_frostAI(Creature *c) : ScriptedAI(c) - { - } - - uint32 frostshock_timer; - uint32 frostbuffet_timer; - - void Reset() - { - me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FROST, true); - frostshock_timer = 2500; - frostbuffet_timer = 5000; - } - - void EnterCombat(Unit * /*who*/) { } - - void UpdateAI(const uint32 diff) - { - if (!UpdateVictim()) - return; - - if (frostshock_timer <= diff) - { - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget, SPELL_FROST_SHOCK); - - frostshock_timer = 5000; - } else frostshock_timer -= diff; - - if (frostbuffet_timer <= diff) - { - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget, SPELL_FROST_BUFFET); - - frostbuffet_timer = 5000; - } else frostbuffet_timer -= diff; - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_mob_syth_frost(Creature* pCreature) -{ - return new mob_syth_frostAI (pCreature); -} - -struct mob_syth_shadowAI : public ScriptedAI -{ - mob_syth_shadowAI(Creature *c) : ScriptedAI(c) - { - } - - uint32 shadowshock_timer; - uint32 shadowbuffet_timer; - - void Reset() - { - me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_SHADOW, true); - shadowshock_timer = 2500; - shadowbuffet_timer = 5000; - } - - void EnterCombat(Unit * /*who*/) { } - - void UpdateAI(const uint32 diff) - { - if (!UpdateVictim()) - return; - - if (shadowshock_timer <= diff) - { - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget, SPELL_SHADOW_SHOCK); - - shadowshock_timer = 5000; - } else shadowshock_timer -= diff; - - if (shadowbuffet_timer <= diff) - { - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget, SPELL_SHADOW_BUFFET); - - shadowbuffet_timer = 5000; - } else shadowbuffet_timer -= diff; - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_mob_syth_shadow(Creature* pCreature) -{ - return new mob_syth_shadowAI (pCreature); -} - -void AddSC_boss_darkweaver_syth() -{ - Script *newscript; - newscript = new Script; - newscript->Name = "boss_darkweaver_syth"; - newscript->GetAI = &GetAI_boss_darkweaver_syth; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_syth_fire"; - newscript->GetAI = &GetAI_mob_syth_arcane; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_syth_arcane"; - newscript->GetAI = &GetAI_mob_syth_arcane; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_syth_frost"; - newscript->GetAI = &GetAI_mob_syth_frost; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_syth_shadow"; - newscript->GetAI = &GetAI_mob_syth_shadow; - newscript->RegisterSelf(); -} - diff --git a/src/server/scripts/Outland/Auchindoun/sethekk_halls/boss_tailonking_ikiss.cpp b/src/server/scripts/Outland/Auchindoun/sethekk_halls/boss_tailonking_ikiss.cpp deleted file mode 100644 index 32b97293ca3..00000000000 --- a/src/server/scripts/Outland/Auchindoun/sethekk_halls/boss_tailonking_ikiss.cpp +++ /dev/null @@ -1,213 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: Boss_Talon_King_Ikiss -SD%Complete: 80 -SDComment: Heroic supported. Some details missing, but most are spell related. -SDCategory: Auchindoun, Sethekk Halls -EndScriptData */ - -#include "ScriptedPch.h" -#include "sethekk_halls.h" - -#define SAY_INTRO -1556007 - -#define SAY_AGGRO_1 -1556008 -#define SAY_AGGRO_2 -1556009 -#define SAY_AGGRO_3 -1556010 - -#define SAY_SLAY_1 -1556011 -#define SAY_SLAY_2 -1556012 -#define SAY_DEATH -1556013 -#define EMOTE_ARCANE_EXP -1556015 - -#define SPELL_BLINK 38194 -#define SPELL_BLINK_TELEPORT 38203 -#define SPELL_MANA_SHIELD 38151 -#define SPELL_ARCANE_BUBBLE 9438 -#define H_SPELL_SLOW 35032 - -#define SPELL_POLYMORPH 38245 -#define H_SPELL_POLYMORPH 43309 - -#define SPELL_ARCANE_VOLLEY 35059 -#define H_SPELL_ARCANE_VOLLEY 40424 - -#define SPELL_ARCANE_EXPLOSION 38197 -#define H_SPELL_ARCANE_EXPLOSION 40425 - -struct boss_talon_king_ikissAI : public ScriptedAI -{ - boss_talon_king_ikissAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - } - - ScriptedInstance* pInstance; - - uint32 ArcaneVolley_Timer; - uint32 Sheep_Timer; - uint32 Blink_Timer; - uint32 Slow_Timer; - - bool ManaShield; - bool Blink; - bool Intro; - - void Reset() - { - ArcaneVolley_Timer = 5000; - Sheep_Timer = 8000; - Blink_Timer = 35000; - Slow_Timer = 15000+rand()%15000; - Blink = false; - Intro = false; - ManaShield = false; - } - - void MoveInLineOfSight(Unit *who) - { - if (!me->getVictim() && who->isTargetableForAttack() && (me->IsHostileTo(who)) && who->isInAccessiblePlaceFor(me)) - { - if (!Intro && me->IsWithinDistInMap(who, 100)) - { - Intro = true; - DoScriptText(SAY_INTRO, me); - } - - if (!me->canFly() && me->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) - return; - - float attackRadius = me->GetAttackDistance(who); - if (me->IsWithinDistInMap(who, attackRadius) && me->IsWithinLOSInMap(who)) - { - //who->RemoveSpellsCausingAura(SPELL_AURA_MOD_STEALTH); - AttackStart(who); - } - } - } - - void EnterCombat(Unit * /*who*/) - { - DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); - } - - void JustDied(Unit* /*Killer*/) - { - DoScriptText(SAY_DEATH, me); - - if (pInstance) - pInstance->SetData(DATA_IKISSDOOREVENT, DONE); - } - - void KilledUnit(Unit* /*victim*/) - { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); - } - - void UpdateAI(const uint32 diff) - { - if (!UpdateVictim()) - return; - - if (Blink) - { - DoCast(me, SPELL_ARCANE_EXPLOSION); - DoCast(me, SPELL_ARCANE_BUBBLE, true); - Blink = false; - } - - if (ArcaneVolley_Timer <= diff) - { - DoCast(me, SPELL_ARCANE_VOLLEY); - ArcaneVolley_Timer = 7000+rand()%5000; - } else ArcaneVolley_Timer -= diff; - - if (Sheep_Timer <= diff) - { - Unit *pTarget; - - //second top aggro target in normal, random target in heroic correct? - if (IsHeroic()) - pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); - else - pTarget = SelectUnit(SELECT_TARGET_TOPAGGRO,1); - - if (pTarget) - DoCast(pTarget, SPELL_POLYMORPH); - Sheep_Timer = 15000+rand()%2500; - } else Sheep_Timer -= diff; - - //may not be correct time to cast - if (!ManaShield && ((me->GetHealth()*100) / me->GetMaxHealth() < 20)) - { - DoCast(me, SPELL_MANA_SHIELD); - ManaShield = true; - } - - if (IsHeroic()) - { - if (Slow_Timer <= diff) - { - DoCast(me, H_SPELL_SLOW); - Slow_Timer = 15000+rand()%25000; - } else Slow_Timer -= diff; - } - - if (Blink_Timer <= diff) - { - DoScriptText(EMOTE_ARCANE_EXP, me); - - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - { - if (me->IsNonMeleeSpellCasted(false)) - me->InterruptNonMeleeSpells(false); - - //Spell doesn't work, but we use for visual effect at least - DoCast(pTarget, SPELL_BLINK); - - float X = pTarget->GetPositionX(); - float Y = pTarget->GetPositionY(); - float Z = pTarget->GetPositionZ(); - - DoTeleportTo(X,Y,Z); - - DoCast(pTarget, SPELL_BLINK_TELEPORT); - Blink = true; - } - Blink_Timer = 35000+rand()%5000; - } else Blink_Timer -= diff; - - if (!Blink) - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_boss_talon_king_ikiss(Creature* pCreature) -{ - return new boss_talon_king_ikissAI (pCreature); -} - -void AddSC_boss_talon_king_ikiss() -{ - Script *newscript; - newscript = new Script; - newscript->Name = "boss_talon_king_ikiss"; - newscript->GetAI = &GetAI_boss_talon_king_ikiss; - newscript->RegisterSelf(); -} - diff --git a/src/server/scripts/Outland/Auchindoun/sethekk_halls/instance_sethekk_halls.cpp b/src/server/scripts/Outland/Auchindoun/sethekk_halls/instance_sethekk_halls.cpp deleted file mode 100644 index ee27da3cff5..00000000000 --- a/src/server/scripts/Outland/Auchindoun/sethekk_halls/instance_sethekk_halls.cpp +++ /dev/null @@ -1,91 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: Instance - Sethekk Halls -SD%Complete: 50 -SDComment: Instance Data for Sethekk Halls instance -SDCategory: Auchindoun, Sethekk Halls -EndScriptData */ - -#include "ScriptedPch.h" -#include "sethekk_halls.h" - -enum eEnums -{ - NPC_ANZU = 23035, - IKISS_DOOR = 177203, -}; - -struct instance_sethekk_halls : public ScriptedInstance -{ - instance_sethekk_halls(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; - - uint32 AnzuEncounter; - uint64 m_uiIkissDoorGUID; - - void Initialize() - { - AnzuEncounter = NOT_STARTED; - m_uiIkissDoorGUID = 0; - } - - void OnCreatureCreate(Creature* pCreature, bool /*add*/) - { - if (pCreature->GetEntry() == NPC_ANZU) - { - if (AnzuEncounter >= IN_PROGRESS) - pCreature->DisappearAndDie(); - else - AnzuEncounter = IN_PROGRESS; - } - } - - void OnGameObjectCreate(GameObject* pGo, bool /*add*/) - { - if (pGo->GetEntry() == IKISS_DOOR) - m_uiIkissDoorGUID = pGo->GetGUID(); - } - - void SetData(uint32 type, uint32 data) - { - switch(type) - { - case DATA_IKISSDOOREVENT: - if (data == DONE) - DoUseDoorOrButton(m_uiIkissDoorGUID,DAY*IN_MILISECONDS); - break; - case TYPE_ANZU_ENCOUNTER: - AnzuEncounter = data; - break; - } - } -}; - -InstanceData* GetInstanceData_instance_sethekk_halls(Map* pMap) -{ - return new instance_sethekk_halls(pMap); -} - -void AddSC_instance_sethekk_halls() -{ - Script *newscript; - newscript = new Script; - newscript->Name = "instance_sethekk_halls"; - newscript->GetInstanceData = &GetInstanceData_instance_sethekk_halls; - newscript->RegisterSelf(); -} - diff --git a/src/server/scripts/Outland/Auchindoun/sethekk_halls/sethekk_halls.h b/src/server/scripts/Outland/Auchindoun/sethekk_halls/sethekk_halls.h deleted file mode 100644 index 79a6cd4952d..00000000000 --- a/src/server/scripts/Outland/Auchindoun/sethekk_halls/sethekk_halls.h +++ /dev/null @@ -1,14 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software licensed under GPL version 2 - * Please see the included DOCS/LICENSE.TXT for more information */ - -#ifndef DEF_SETHEKK_HALLS_H -#define DEF_SETHEKK_HALLS_H - -enum eTypes -{ - DATA_IKISSDOOREVENT = 1, - TYPE_ANZU_ENCOUNTER = 2, -}; -#endif - diff --git a/src/server/scripts/Outland/Auchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp b/src/server/scripts/Outland/Auchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp deleted file mode 100644 index 2bb6a717a5a..00000000000 --- a/src/server/scripts/Outland/Auchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp +++ /dev/null @@ -1,206 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: Boss_Ambassador_Hellmaw -SD%Complete: 80 -SDComment: Enrage spell missing/not known -SDCategory: Auchindoun, Shadow Labyrinth -EndScriptData */ - -#include "ScriptedPch.h" -#include "ScriptedEscortAI.h" -#include "shadow_labyrinth.h" - -enum eEnums -{ - SAY_INTRO = -1555000, - SAY_AGGRO1 = -1555001, - SAY_AGGRO2 = -1555002, - SAY_AGGRO3 = -1555003, - SAY_HELP = -1555004, - SAY_SLAY1 = -1555005, - SAY_SLAY2 = -1555006, - SAY_DEATH = -1555007, - - SPELL_BANISH = 30231, - SPELL_CORROSIVE_ACID = 33551, - SPELL_FEAR = 33547, - SPELL_ENRAGE = 34970 -}; - -struct boss_ambassador_hellmawAI : public npc_escortAI -{ - boss_ambassador_hellmawAI(Creature* pCreature) : npc_escortAI(pCreature) - { - m_pInstance = pCreature->GetInstanceData(); - } - - ScriptedInstance* m_pInstance; - - uint32 EventCheck_Timer; - uint32 CorrosiveAcid_Timer; - uint32 Fear_Timer; - uint32 Enrage_Timer; - bool Intro; - bool IsBanished; - bool Enraged; - - void Reset() - { - EventCheck_Timer = 5000; - CorrosiveAcid_Timer = 5000 + rand()%5000; - Fear_Timer = 25000 + rand()%5000; - Enrage_Timer = 180000; - Intro = false; - IsBanished = true; - Enraged = false; - - if (m_pInstance && me->isAlive()) - { - if (m_pInstance->GetData(TYPE_OVERSEER) != DONE) - DoCast(me, SPELL_BANISH, true); - } - } - - void JustReachedHome() - { - if (m_pInstance) - m_pInstance->SetData(TYPE_HELLMAW, FAIL); - } - - void MoveInLineOfSight(Unit* pWho) - { - if (me->HasAura(SPELL_BANISH)) - return; - - npc_escortAI::MoveInLineOfSight(pWho); - } - - void WaypointReached(uint32 /*i*/) - { - } - - void DoIntro() - { - if (me->HasAura(SPELL_BANISH)) - me->RemoveAurasDueToSpell(SPELL_BANISH); - - IsBanished = false; - Intro = true; - - if (m_pInstance) - { - if (m_pInstance->GetData(TYPE_HELLMAW) != FAIL) - { - DoScriptText(SAY_INTRO, me); - Start(true, false, 0, NULL, false, true); - } - - m_pInstance->SetData(TYPE_HELLMAW, IN_PROGRESS); - } - } - - void EnterCombat(Unit * /*who*/) - { - DoScriptText(RAND(SAY_AGGRO1,SAY_AGGRO2,SAY_AGGRO3), me); - } - - void KilledUnit(Unit * /*victim*/) - { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); - } - - void JustDied(Unit * /*victim*/) - { - DoScriptText(SAY_DEATH, me); - - if (m_pInstance) - m_pInstance->SetData(TYPE_HELLMAW, DONE); - } - - void UpdateAI(const uint32 diff) - { - if (!Intro && !HasEscortState(STATE_ESCORT_ESCORTING)) - { - if (EventCheck_Timer <= diff) - { - if (m_pInstance) - { - if (m_pInstance->GetData(TYPE_OVERSEER) == DONE) - { - DoIntro(); - return; - } - } - EventCheck_Timer = 5000; - return; - } - else - { - EventCheck_Timer -= diff; - return; - } - } - - npc_escortAI::UpdateAI(diff); - - if (!UpdateVictim()) - return; - - if (me->HasAura(SPELL_BANISH, 0)) - { - EnterEvadeMode(); - return; - } - - if (CorrosiveAcid_Timer <= diff) - { - DoCast(me->getVictim(), SPELL_CORROSIVE_ACID); - CorrosiveAcid_Timer = 15000 + rand()%10000; - } else CorrosiveAcid_Timer -= diff; - - if (Fear_Timer <= diff) - { - DoCast(me, SPELL_FEAR); - Fear_Timer = 20000 + rand()%15000; - } else Fear_Timer -= diff; - - if (IsHeroic()) - { - if (!Enraged && Enrage_Timer <= diff) - { - DoCast(me, SPELL_ENRAGE); - Enraged = true; - } else Enrage_Timer -= diff; - } - } -}; - -CreatureAI* GetAI_boss_ambassador_hellmaw(Creature* pCreature) -{ - return new boss_ambassador_hellmawAI(pCreature); -} - -void AddSC_boss_ambassador_hellmaw() -{ - Script *newscript; - newscript = new Script; - newscript->Name = "boss_ambassador_hellmaw"; - newscript->GetAI = &GetAI_boss_ambassador_hellmaw; - newscript->RegisterSelf(); -} - diff --git a/src/server/scripts/Outland/Auchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp b/src/server/scripts/Outland/Auchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp deleted file mode 100644 index 52c60ae0d0e..00000000000 --- a/src/server/scripts/Outland/Auchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp +++ /dev/null @@ -1,169 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: Boss_Blackheart_the_Inciter -SD%Complete: 75 -SDComment: Incite Chaos not functional since core lacks Mind Control support -SDCategory: Auchindoun, Shadow Labyrinth -EndScriptData */ - -#include "ScriptedPch.h" -#include "shadow_labyrinth.h" - -#define SPELL_INCITE_CHAOS 33676 -#define SPELL_INCITE_CHAOS_B 33684 //debuff applied to each member of party -#define SPELL_CHARGE 33709 -#define SPELL_WAR_STOMP 33707 - -#define SAY_INTRO1 -1555008 //not used -#define SAY_INTRO2 -1555009 //not used -#define SAY_INTRO3 -1555010 //not used -#define SAY_AGGRO1 -1555011 -#define SAY_AGGRO2 -1555012 -#define SAY_AGGRO3 -1555013 -#define SAY_SLAY1 -1555014 -#define SAY_SLAY2 -1555015 -#define SAY_HELP -1555016 //not used -#define SAY_DEATH -1555017 - -//below, not used -#define SAY2_INTRO1 -1555018 -#define SAY2_INTRO2 -1555019 -#define SAY2_INTRO3 -1555020 -#define SAY2_AGGRO1 -1555021 -#define SAY2_AGGRO2 -1555022 -#define SAY2_AGGRO3 -1555023 -#define SAY2_SLAY1 -1555024 -#define SAY2_SLAY2 -1555025 -#define SAY2_HELP -1555026 -#define SAY2_DEATH -1555027 - -struct boss_blackheart_the_inciterAI : public ScriptedAI -{ - boss_blackheart_the_inciterAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - } - - ScriptedInstance *pInstance; - - bool InciteChaos; - uint32 InciteChaos_Timer; - uint32 InciteChaosWait_Timer; - uint32 Charge_Timer; - uint32 Knockback_Timer; - - void Reset() - { - InciteChaos = false; - InciteChaos_Timer = 20000; - InciteChaosWait_Timer = 15000; - Charge_Timer = 5000; - Knockback_Timer = 15000; - - if (pInstance) - pInstance->SetData(DATA_BLACKHEARTTHEINCITEREVENT, NOT_STARTED); - } - - void KilledUnit(Unit * /*victim*/) - { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); - } - - void JustDied(Unit * /*victim*/) - { - DoScriptText(SAY_DEATH, me); - - if (pInstance) - pInstance->SetData(DATA_BLACKHEARTTHEINCITEREVENT, DONE); - } - - void EnterCombat(Unit * /*who*/) - { - DoScriptText(RAND(SAY_AGGRO1,SAY_AGGRO2,SAY_AGGRO3), me); - - if (pInstance) - pInstance->SetData(DATA_BLACKHEARTTHEINCITEREVENT, IN_PROGRESS); - } - - void UpdateAI(const uint32 diff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - if (InciteChaos) - { - if (InciteChaosWait_Timer <= diff) - { - InciteChaos = false; - InciteChaosWait_Timer = 15000; - } else InciteChaosWait_Timer -= diff; - - return; - } - - if (InciteChaos_Timer <= diff) - { - DoCast(me, SPELL_INCITE_CHAOS); - - std::list t_list = me->getThreatManager().getThreatList(); - for (std::list::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) - { - Unit *pTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid()); - if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER) - pTarget->CastSpell(pTarget,SPELL_INCITE_CHAOS_B,true); - } - - DoResetThreat(); - InciteChaos = true; - InciteChaos_Timer = 40000; - return; - } else InciteChaos_Timer -= diff; - - //Charge_Timer - if (Charge_Timer <= diff) - { - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_CHARGE); - Charge_Timer = 15000 + rand()%10000; - } else Charge_Timer -= diff; - - //Knockback_Timer - if (Knockback_Timer <= diff) - { - DoCast(me, SPELL_WAR_STOMP); - Knockback_Timer = 18000 + rand()%6000; - } else Knockback_Timer -= diff; - - DoMeleeAttackIfReady(); - } -}; -CreatureAI* GetAI_boss_blackheart_the_inciter(Creature* pCreature) -{ - return new boss_blackheart_the_inciterAI (pCreature); -} - -void AddSC_boss_blackheart_the_inciter() -{ - Script *newscript; - newscript = new Script; - newscript->Name = "boss_blackheart_the_inciter"; - newscript->GetAI = &GetAI_boss_blackheart_the_inciter; - newscript->RegisterSelf(); -} - diff --git a/src/server/scripts/Outland/Auchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp b/src/server/scripts/Outland/Auchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp deleted file mode 100644 index 8b63b765b47..00000000000 --- a/src/server/scripts/Outland/Auchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp +++ /dev/null @@ -1,313 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: Boss_Grandmaster_Vorpil -SD%Complete: 100 -SDComment: -SDCategory: Auchindoun, Shadow Labyrinth -EndScriptData */ - -#include "ScriptedPch.h" -#include "shadow_labyrinth.h" - -#define SAY_INTRO -1555028 -#define SAY_AGGRO1 -1555029 -#define SAY_AGGRO2 -1555030 -#define SAY_AGGRO3 -1555031 -#define SAY_HELP -1555032 -#define SAY_SLAY1 -1555033 -#define SAY_SLAY2 -1555034 -#define SAY_DEATH -1555035 - -#define SPELL_RAIN_OF_FIRE 33617 -#define H_SPELL_RAIN_OF_FIRE 39363 - -#define SPELL_DRAW_SHADOWS 33563 -#define SPELL_SHADOWBOLT_VOLLEY 33841 -#define SPELL_BANISH 38791 - -#define MOB_VOID_TRAVELER 19226 -#define SPELL_SACRIFICE 33587 -#define SPELL_SHADOW_NOVA 33846 -#define SPELL_EMPOWERING_SHADOWS 33783 -#define H_SPELL_EMPOWERING_SHADOWS 39364 - -#define MOB_VOID_PORTAL 19224 -#define SPELL_VOID_PORTAL_VISUAL 33569 - -float VorpilPosition[3] = {-252.8820,-264.3030,17.1}; - -float VoidPortalCoords[5][3] = -{ - {-283.5894, -239.5718, 12.7}, - {-306.5853, -258.4539, 12.7}, - {-295.8789, -269.0899, 12.7}, - {-209.3401, -262.7564, 17.1}, - {-261.4533, -297.3298, 17.1} -}; - -struct mob_voidtravelerAI : public ScriptedAI -{ - mob_voidtravelerAI(Creature *c) : ScriptedAI(c) - { - } - - uint64 VorpilGUID; - uint32 move; - bool sacrificed; - - void Reset() - { - VorpilGUID = 0; - move = 0; - sacrificed = false; - } - - void EnterCombat(Unit * /*who*/){} - - void UpdateAI(const uint32 diff) - { - if (!VorpilGUID) - { - me->Kill(me); - return; - } - if (move <= diff) - { - Creature *Vorpil = Unit::GetCreature(*me, VorpilGUID); - if (!Vorpil) - { - VorpilGUID = 0; - return; - } - - if (sacrificed) - { - me->AddAura(DUNGEON_MODE(SPELL_EMPOWERING_SHADOWS, H_SPELL_EMPOWERING_SHADOWS), Vorpil); - Vorpil->SetHealth(Vorpil->GetHealth() + Vorpil->GetMaxHealth()/25); - DoCast(me, SPELL_SHADOW_NOVA, true); - me->Kill(me); - return; - } - me->GetMotionMaster()->MoveFollow(Vorpil,0,0); - if (me->IsWithinDist(Vorpil, 3)) - { - DoCast(me, SPELL_SACRIFICE, false); - sacrificed = true; - move = 500; - return; - } - if (!Vorpil->isInCombat() || Vorpil->isDead()) - { - me->Kill(me); - return; - } - move = 1000; - } else move -= diff; - } -}; -CreatureAI* GetAI_mob_voidtraveler(Creature* pCreature) -{ - return new mob_voidtravelerAI (pCreature); -} - -struct boss_grandmaster_vorpilAI : public ScriptedAI -{ - boss_grandmaster_vorpilAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - Intro = false; - } - - ScriptedInstance *pInstance; - bool Intro, HelpYell; - bool sumportals; - - uint32 ShadowBoltVolley_Timer; - uint32 DrawShadows_Timer; - uint32 summonTraveler_Timer; - uint32 banish_Timer; - uint64 PortalsGuid[5]; - - void Reset() - { - ShadowBoltVolley_Timer = 7000 + rand()%7000; - DrawShadows_Timer = 45000; - summonTraveler_Timer = 90000; - banish_Timer = 17000; - HelpYell = false; - destroyPortals(); - - if (pInstance) - pInstance->SetData(DATA_GRANDMASTERVORPILEVENT, NOT_STARTED); - } - - void summonPortals() - { - if (!sumportals) - { - for (uint8 i = 0; i < 5; ++i) - { - Creature *Portal = NULL; - Portal = me->SummonCreature(MOB_VOID_PORTAL,VoidPortalCoords[i][0],VoidPortalCoords[i][1],VoidPortalCoords[i][2],0,TEMPSUMMON_CORPSE_DESPAWN,3000000); - if (Portal) - { - PortalsGuid[i] = Portal->GetGUID(); - Portal->CastSpell(Portal,SPELL_VOID_PORTAL_VISUAL,false); - } - } - sumportals = true; - summonTraveler_Timer = 5000; - } - } - - void destroyPortals() - { - if (sumportals) - { - for (uint8 i = 0; i < 5; ++i) - { - Unit *Portal = Unit::GetUnit((*me), PortalsGuid[i]); - if (Portal && Portal->isAlive()) - Portal->DealDamage(Portal, Portal->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); - PortalsGuid[i] = 0; - } - sumportals = false; - } - } - - void spawnVoidTraveler() - { - int pos = urand(0,4); - me->SummonCreature(MOB_VOID_TRAVELER,VoidPortalCoords[pos][0],VoidPortalCoords[pos][1],VoidPortalCoords[pos][2],0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,5000); - if (!HelpYell) - { - DoScriptText(SAY_HELP, me); - HelpYell = true; - } - } - - void JustSummoned(Creature *summoned) - { - if (summoned && summoned->GetEntry() == MOB_VOID_TRAVELER) - CAST_AI(mob_voidtravelerAI, summoned->AI())->VorpilGUID = me->GetGUID(); - } - - void KilledUnit(Unit * /*victim*/) - { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); - } - - void JustDied(Unit * /*victim*/) - { - DoScriptText(SAY_DEATH, me); - destroyPortals(); - - if (pInstance) - pInstance->SetData(DATA_GRANDMASTERVORPILEVENT, DONE); - } - - void EnterCombat(Unit * /*who*/) - { - DoScriptText(RAND(SAY_AGGRO1,SAY_AGGRO2,SAY_AGGRO3), me); - summonPortals(); - - if (pInstance) - pInstance->SetData(DATA_GRANDMASTERVORPILEVENT, IN_PROGRESS); - } - - void MoveInLineOfSight(Unit *who) - { - ScriptedAI::MoveInLineOfSight(who); - - if (!Intro && me->IsWithinLOSInMap(who)&& me->IsWithinDistInMap(who, 100) && me->IsHostileTo(who)) - { - DoScriptText(SAY_INTRO, me); - Intro = true; - } - } - - void UpdateAI(const uint32 diff) - { - if (!UpdateVictim()) - return; - - if (ShadowBoltVolley_Timer <= diff) - { - DoCast(me, SPELL_SHADOWBOLT_VOLLEY); - ShadowBoltVolley_Timer = 15000 + rand()%15000; - } else ShadowBoltVolley_Timer -= diff; - - if (IsHeroic() && banish_Timer <= diff) - { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0,30,false); - if (pTarget) - { - DoCast(pTarget, SPELL_BANISH); - banish_Timer = 16000; - } - } else banish_Timer -= diff; - - if (DrawShadows_Timer <= diff) - { - Map* pMap = me->GetMap(); - Map::PlayerList const &PlayerList = pMap->GetPlayers(); - for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) - if (Player* i_pl = i->getSource()) - if (i_pl->isAlive() && !i_pl->HasAura(SPELL_BANISH)) - i_pl->TeleportTo(me->GetMapId(), VorpilPosition[0],VorpilPosition[1],VorpilPosition[2], 0, TELE_TO_NOT_LEAVE_COMBAT); - - me->GetMap()->CreatureRelocation(me, VorpilPosition[0],VorpilPosition[1],VorpilPosition[2],0.0f); - DoCast(me, SPELL_DRAW_SHADOWS, true); - - DoCast(me, SPELL_RAIN_OF_FIRE); - - ShadowBoltVolley_Timer = 6000; - DrawShadows_Timer = 30000; - } else DrawShadows_Timer -= diff; - - if (summonTraveler_Timer <= diff) - { - spawnVoidTraveler(); - summonTraveler_Timer = 10000; - //enrage at 20% - if ((me->GetHealth()*5) < me->GetMaxHealth()) - summonTraveler_Timer = 5000; - } else summonTraveler_Timer -=diff; - - DoMeleeAttackIfReady(); - } -}; -CreatureAI* GetAI_boss_grandmaster_vorpil(Creature* pCreature) -{ - return new boss_grandmaster_vorpilAI (pCreature); -} - -void AddSC_boss_grandmaster_vorpil() -{ - Script *newscript; - newscript = new Script; - newscript->Name = "boss_grandmaster_vorpil"; - newscript->GetAI = &GetAI_boss_grandmaster_vorpil; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_voidtraveler"; - newscript->GetAI = &GetAI_mob_voidtraveler; - newscript->RegisterSelf(); -} - diff --git a/src/server/scripts/Outland/Auchindoun/shadow_labyrinth/boss_murmur.cpp b/src/server/scripts/Outland/Auchindoun/shadow_labyrinth/boss_murmur.cpp deleted file mode 100644 index 14bf249c3b5..00000000000 --- a/src/server/scripts/Outland/Auchindoun/shadow_labyrinth/boss_murmur.cpp +++ /dev/null @@ -1,205 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: Boss_Murmur -SD%Complete: 90 -SDComment: Timers may be incorrect -SDCategory: Auchindoun, Shadow Labyrinth -EndScriptData */ - -#include "ScriptedPch.h" -#include "shadow_labyrinth.h" - -#define EMOTE_SONIC_BOOM -1555036 - -#define SPELL_SONIC_BOOM_CAST DUNGEON_MODE(33923, 38796) -#define SPELL_SONIC_BOOM_EFFECT DUNGEON_MODE(33666, 38795) -#define SPELL_RESONANCE 33657 -#define SPELL_MURMURS_TOUCH DUNGEON_MODE(33711, 38794) -#define SPELL_MAGNETIC_PULL 33689 -#define SPELL_SONIC_SHOCK 38797 -#define SPELL_THUNDERING_STORM 39365 - -struct boss_murmurAI : public ScriptedAI -{ - boss_murmurAI(Creature *c) : ScriptedAI(c) - { - SetCombatMovement(false); - } - - uint32 SonicBoom_Timer; - uint32 MurmursTouch_Timer; - uint32 Resonance_Timer; - uint32 MagneticPull_Timer; - uint32 SonicShock_Timer; - uint32 ThunderingStorm_Timer; - bool SonicBoom; - - void Reset() - { - SonicBoom_Timer = 30000; - MurmursTouch_Timer = 8000 + rand()%12000; - Resonance_Timer = 5000; - MagneticPull_Timer = 15000 + rand()%15000; - ThunderingStorm_Timer = 15000; - SonicShock_Timer = 10000; - SonicBoom = false; - - //database should have `RegenHealth`=0 to prevent regen - uint32 hp = (me->GetMaxHealth()*40)/100; - if (hp) me->SetHealth(hp); - me->ResetPlayerDamageReq(); - } - - void SonicBoomEffect() - { - std::list t_list = me->getThreatManager().getThreatList(); - for (std::list::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) - { - Unit *pTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid()); - if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER) - { - //Not do anything without aura, spell can be resisted! - if (pTarget->HasAura(SPELL_SONIC_BOOM_CAST) && me->IsWithinDistInMap(pTarget, 34.0f)) - { - //This will be wrong calculation. Also, comments suggest it must deal damage - pTarget->SetHealth(uint32(pTarget->GetMaxHealth() - pTarget->GetMaxHealth() * 0.8)); - } - } - } - } - - void EnterCombat(Unit * /*who*/) { } - - // Sonic Boom instant damage (needs core fix instead of this) - void SpellHitTarget(Unit *pTarget, const SpellEntry *spell) - { - if (pTarget && pTarget->isAlive() && spell && spell->Id == uint32(SPELL_SONIC_BOOM_EFFECT)) - me->DealDamage(pTarget,(pTarget->GetHealth()*90)/100,NULL,SPELL_DIRECT_DAMAGE,SPELL_SCHOOL_MASK_NATURE,spell); - } - - void UpdateAI(const uint32 diff) - { - //Return since we have no target or casting - if (!UpdateVictim() || me->IsNonMeleeSpellCasted(false)) - return; - - // Sonic Boom - if (SonicBoom) - { - DoCast(me, SPELL_SONIC_BOOM_EFFECT, true); - SonicBoomEffect(); - - SonicBoom = false; - Resonance_Timer = 1500; - } - if (SonicBoom_Timer <= diff) - { - DoScriptText(EMOTE_SONIC_BOOM, me); - DoCast(me, SPELL_SONIC_BOOM_CAST); - SonicBoom_Timer = 30000; - SonicBoom = true; - return; - } else SonicBoom_Timer -= diff; - - // Murmur's Touch - if (MurmursTouch_Timer <= diff) - { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0,80,true)) - DoCast(pTarget, SPELL_MURMURS_TOUCH); - MurmursTouch_Timer = 25000 + rand()%10000; - } else MurmursTouch_Timer -= diff; - - // Resonance - if (!SonicBoom && !(me->IsWithinMeleeRange(me->getVictim()))) - { - if (Resonance_Timer <= diff) - { - DoCast(me, SPELL_RESONANCE); - Resonance_Timer = 5000; - } else Resonance_Timer -= diff; - } - - // Magnetic Pull - if (MagneticPull_Timer <= diff) - { - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - if (pTarget->GetTypeId() == TYPEID_PLAYER && pTarget->isAlive()) - { - DoCast(pTarget, SPELL_MAGNETIC_PULL); - MagneticPull_Timer = 15000+rand()%15000; - return; - } - MagneticPull_Timer = 500; - } else MagneticPull_Timer -= diff; - - if (IsHeroic()) - { - // Thundering Storm - if (ThunderingStorm_Timer <= diff) - { - std::list& m_threatlist = me->getThreatManager().getThreatList(); - for (std::list::const_iterator i = m_threatlist.begin(); i != m_threatlist.end(); ++i) - if (Unit *pTarget = Unit::GetUnit((*me),(*i)->getUnitGuid())) - if (pTarget->isAlive() && !me->IsWithinDist(pTarget, 35, false)) - DoCast(pTarget, SPELL_THUNDERING_STORM, true); - ThunderingStorm_Timer = 15000; - } else ThunderingStorm_Timer -= diff; - - // Sonic Shock - if (SonicShock_Timer <= diff) - { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0,20,false)) - if (pTarget->isAlive()) - DoCast(pTarget, SPELL_SONIC_SHOCK); - SonicShock_Timer = 10000+rand()%10000; - } else SonicShock_Timer -= diff; - } - - // Select nearest most aggro target if top aggro too far - if (!me->isAttackReady()) - return; - if (!me->IsWithinMeleeRange(me->getVictim())) - { - std::list& m_threatlist = me->getThreatManager().getThreatList(); - for (std::list::const_iterator i = m_threatlist.begin(); i != m_threatlist.end(); ++i) - if (Unit *pTarget = Unit::GetUnit((*me),(*i)->getUnitGuid())) - if (pTarget->isAlive() && me->IsWithinMeleeRange(pTarget)) - { - me->TauntApply(pTarget); - break; - } - } - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_boss_murmur(Creature* pCreature) -{ - return new boss_murmurAI (pCreature); -} - -void AddSC_boss_murmur() -{ - Script *newscript; - newscript = new Script; - newscript->Name = "boss_murmur"; - newscript->GetAI = &GetAI_boss_murmur; - newscript->RegisterSelf(); -} - diff --git a/src/server/scripts/Outland/Auchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp b/src/server/scripts/Outland/Auchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp deleted file mode 100644 index 78340e5e132..00000000000 --- a/src/server/scripts/Outland/Auchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp +++ /dev/null @@ -1,227 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: Instance_Shadow_Labyrinth -SD%Complete: 85 -SDComment: Some cleanup left along with save -SDCategory: Auchindoun, Shadow Labyrinth -EndScriptData */ - -#include "ScriptedPch.h" -#include "shadow_labyrinth.h" - -#define MAX_ENCOUNTER 5 - -#define REFECTORY_DOOR 183296 //door opened when blackheart the inciter dies -#define SCREAMING_HALL_DOOR 183295 //door opened when grandmaster vorpil dies - -/* Shadow Labyrinth encounters: -1 - Ambassador Hellmaw event -2 - Blackheart the Inciter event -3 - Grandmaster Vorpil event -4 - Murmur event -*/ - -struct instance_shadow_labyrinth : public ScriptedInstance -{ - instance_shadow_labyrinth(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; - - uint32 m_auiEncounter[MAX_ENCOUNTER]; - std::string str_data; - - uint64 m_uiRefectoryDoorGUID; - uint64 m_uiScreamingHallDoorGUID; - - uint64 m_uiGrandmasterVorpil; - uint32 m_uiFelOverseerCount; - - void Initialize() - { - memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); - - m_uiRefectoryDoorGUID = 0; - m_uiScreamingHallDoorGUID = 0; - - m_uiGrandmasterVorpil = 0; - m_uiFelOverseerCount = 0; - } - - bool IsEncounterInProgress() const - { - for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) - if (m_auiEncounter[i] == IN_PROGRESS) return true; - - return false; - } - - void OnGameObjectCreate(GameObject* pGo, bool /*add*/) - { - switch(pGo->GetEntry()) - { - case REFECTORY_DOOR: - m_uiRefectoryDoorGUID = pGo->GetGUID(); - if (m_auiEncounter[2] == DONE) - pGo->SetGoState(GO_STATE_ACTIVE); - break; - case SCREAMING_HALL_DOOR: - m_uiScreamingHallDoorGUID = pGo->GetGUID(); - if (m_auiEncounter[3] == DONE) - pGo->SetGoState(GO_STATE_ACTIVE); - break; - } - } - - void OnCreatureCreate(Creature* pCreature, bool /*add*/) - { - switch(pCreature->GetEntry()) - { - case 18732: - m_uiGrandmasterVorpil = pCreature->GetGUID(); - break; - case 18796: - if (pCreature->isAlive()) - { - ++m_uiFelOverseerCount; - debug_log("TSCR: Shadow Labyrinth: counting %u Fel Overseers.",m_uiFelOverseerCount); - } - break; - } - } - - void SetData(uint32 type, uint32 uiData) - { - switch(type) - { - case TYPE_HELLMAW: - m_auiEncounter[0] = uiData; - break; - - case TYPE_OVERSEER: - if (uiData != DONE) - { - error_log("TSCR: Shadow Labyrinth: TYPE_OVERSEER did not expect other data than DONE"); - return; - } - if (m_uiFelOverseerCount) - { - --m_uiFelOverseerCount; - - if (m_uiFelOverseerCount) - debug_log("TSCR: Shadow Labyrinth: %u Fel Overseers left to kill.",m_uiFelOverseerCount); - else - { - m_auiEncounter[1] = DONE; - debug_log("TSCR: Shadow Labyrinth: TYPE_OVERSEER == DONE"); - } - } - break; - - case DATA_BLACKHEARTTHEINCITEREVENT: - if (uiData == DONE) - DoUseDoorOrButton(m_uiRefectoryDoorGUID); - m_auiEncounter[2] = uiData; - break; - - case DATA_GRANDMASTERVORPILEVENT: - if (uiData == DONE) - DoUseDoorOrButton(m_uiScreamingHallDoorGUID); - m_auiEncounter[3] = uiData; - break; - - case DATA_MURMUREVENT: - m_auiEncounter[4] = uiData; - break; - } - - if (uiData == DONE) - { - if (type == TYPE_OVERSEER && m_uiFelOverseerCount != 0) - return; - - OUT_SAVE_INST_DATA; - - std::ostringstream saveStream; - saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " - << m_auiEncounter[2] << " " << m_auiEncounter[3] << " " << m_auiEncounter[4]; - - str_data = saveStream.str(); - - SaveToDB(); - OUT_SAVE_INST_DATA_COMPLETE; - } - } - - uint32 GetData(uint32 type) - { - switch(type) - { - case TYPE_HELLMAW: return m_auiEncounter[0]; - case TYPE_OVERSEER: return m_auiEncounter[1]; - case DATA_GRANDMASTERVORPILEVENT: return m_auiEncounter[3]; - case DATA_MURMUREVENT: return m_auiEncounter[4]; - } - return false; - } - - uint64 GetData64(uint32 identifier) - { - if (identifier == DATA_GRANDMASTERVORPIL) - return m_uiGrandmasterVorpil; - - return 0; - } - - std::string GetSaveData() - { - return str_data; - } - - void Load(const char* in) - { - if (!in) - { - OUT_LOAD_INST_DATA_FAIL; - return; - } - - OUT_LOAD_INST_DATA(in); - - std::istringstream loadStream(in); - loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3] >> m_auiEncounter[4]; - - for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) - if (m_auiEncounter[i] == IN_PROGRESS) - m_auiEncounter[i] = NOT_STARTED; - - OUT_LOAD_INST_DATA_COMPLETE; - } -}; - -InstanceData* GetInstanceData_instance_shadow_labyrinth(Map* pMap) -{ - return new instance_shadow_labyrinth(pMap); -} - -void AddSC_instance_shadow_labyrinth() -{ - Script *newscript; - newscript = new Script; - newscript->Name = "instance_shadow_labyrinth"; - newscript->GetInstanceData = &GetInstanceData_instance_shadow_labyrinth; - newscript->RegisterSelf(); -} - diff --git a/src/server/scripts/Outland/Auchindoun/shadow_labyrinth/shadow_labyrinth.h b/src/server/scripts/Outland/Auchindoun/shadow_labyrinth/shadow_labyrinth.h deleted file mode 100644 index a78955368bf..00000000000 --- a/src/server/scripts/Outland/Auchindoun/shadow_labyrinth/shadow_labyrinth.h +++ /dev/null @@ -1,15 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software licensed under GPL version 2 - * Please see the included DOCS/LICENSE.TXT for more information */ - -#ifndef DEF_SHADOW_LABYRINTH_H -#define DEF_SHADOW_LABYRINTH_H - -#define TYPE_HELLMAW 1 -#define TYPE_OVERSEER 2 -#define DATA_BLACKHEARTTHEINCITEREVENT 3 -#define DATA_GRANDMASTERVORPILEVENT 4 -#define DATA_MURMUREVENT 5 -#define DATA_GRANDMASTERVORPIL 6 -#endif - diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp new file mode 100644 index 00000000000..69a969adda0 --- /dev/null +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp @@ -0,0 +1,746 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Boss_Fathomlord_Karathress +SD%Complete: 70 +SDComment: Cyclone workaround +SDCategory: Coilfang Resevoir, Serpent Shrine Cavern +EndScriptData */ + +#include "ScriptedPch.h" +#include "serpent_shrine.h" +#include "ScriptedEscortAI.h" + +#define SAY_AGGRO -1548021 +#define SAY_GAIN_BLESSING -1548022 +#define SAY_GAIN_ABILITY1 -1548023 +#define SAY_GAIN_ABILITY2 -1548024 +#define SAY_GAIN_ABILITY3 -1548025 +#define SAY_SLAY1 -1548026 +#define SAY_SLAY2 -1548027 +#define SAY_SLAY3 -1548028 +#define SAY_DEATH -1548029 + +//Karathress spells +#define SPELL_CATACLYSMIC_BOLT 38441 +#define SPELL_POWER_OF_SHARKKIS 38455 +#define SPELL_POWER_OF_TIDALVESS 38452 +#define SPELL_POWER_OF_CARIBDIS 38451 +#define SPELL_ENRAGE 24318 +#define SPELL_SEAR_NOVA 38445 +#define SPELL_BLESSING_OF_THE_TIDES 38449 + +//Sharkkis spells +#define SPELL_LEECHING_THROW 29436 +#define SPELL_THE_BEAST_WITHIN 38373 +#define SPELL_MULTISHOT 38366 +#define SPELL_SUMMON_FATHOM_LURKER 38433 +#define SPELL_SUMMON_FATHOM_SPOREBAT 38431 +#define SPELL_PET_ENRAGE 19574 + +//Tidalvess spells +#define SPELL_FROST_SHOCK 38234 +#define SPELL_SPITFIRE_TOTEM 38236 +#define SPELL_POISON_CLEANSING_TOTEM 38306 +// Spell obsolete +// #define SPELL_POISON_CLEANSING_EFFECT 8167 +#define SPELL_EARTHBIND_TOTEM 38304 +#define SPELL_EARTHBIND_TOTEM_EFFECT 6474 +#define SPELL_WINDFURY_WEAPON 38184 + +//Caribdis Spells +#define SPELL_WATER_BOLT_VOLLEY 38335 +#define SPELL_TIDAL_SURGE 38358 +#define SPELL_TIDAL_SURGE_FREEZE 38357 +#define SPELL_HEAL 38330 +#define SPELL_SUMMON_CYCLONE 38337 +#define SPELL_CYCLONE_CYCLONE 29538 + +//Yells and Quotes +#define SAY_GAIN_BLESSING_OF_TIDES "Your overconfidence will be your undoing! Guards, lend me your strength!" +#define SOUND_GAIN_BLESSING_OF_TIDES 11278 +#define SAY_MISC "Alana be'lendor!" //don't know what use this +#define SOUND_MISC 11283 + +//Summoned Unit GUIDs +#define CREATURE_CYCLONE 22104 +#define CREATURE_FATHOM_SPOREBAT 22120 +#define CREATURE_FATHOM_LURKER 22119 +#define CREATURE_SPITFIRE_TOTEM 22091 +#define CREATURE_EARTHBIND_TOTEM 22486 +#define CREATURE_POISON_CLEANSING_TOTEM 22487 + +//entry and position for Seer Olum +#define SEER_OLUM 22820 +#define OLUM_X 446.78f +#define OLUM_Y -542.76f +#define OLUM_Z -7.54773f +#define OLUM_O 0.401581f + +//Fathom-Lord Karathress AI +struct boss_fathomlord_karathressAI : public ScriptedAI +{ + boss_fathomlord_karathressAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + Advisors[0] = 0; + Advisors[1] = 0; + Advisors[2] = 0; + } + + ScriptedInstance* pInstance; + + uint32 CataclysmicBolt_Timer; + uint32 Enrage_Timer; + uint32 SearNova_Timer; + + bool BlessingOfTides; + + uint64 Advisors[3]; + + void Reset() + { + CataclysmicBolt_Timer = 10000; + Enrage_Timer = 600000; //10 minutes + SearNova_Timer = 20000+rand()%40000; // 20 - 60 seconds + + BlessingOfTides = false; + + if (pInstance) + { + uint64 RAdvisors[3]; + RAdvisors[0] = pInstance->GetData64(DATA_SHARKKIS); + RAdvisors[1] = pInstance->GetData64(DATA_TIDALVESS); + RAdvisors[2] = pInstance->GetData64(DATA_CARIBDIS); + //Respawn of the 3 Advisors + Creature* pAdvisor = NULL; + for (int i=0; i<3; ++i) + + if (RAdvisors[i]) + { + pAdvisor = (Unit::GetCreature((*me), RAdvisors[i])); + if (pAdvisor && !pAdvisor->isAlive()) + { + pAdvisor->Respawn(); + pAdvisor->AI()->EnterEvadeMode(); + pAdvisor->GetMotionMaster()->MoveTargetedHome(); + } + } + pInstance->SetData(DATA_KARATHRESSEVENT, NOT_STARTED); + } + + } + + void EventSharkkisDeath() + { + DoScriptText(SAY_GAIN_ABILITY1, me); + DoCast(me, SPELL_POWER_OF_SHARKKIS); + } + + void EventTidalvessDeath() + { + DoScriptText(SAY_GAIN_ABILITY2, me); + DoCast(me, SPELL_POWER_OF_TIDALVESS); + } + + void EventCaribdisDeath() + { + DoScriptText(SAY_GAIN_ABILITY3, me); + DoCast(me, SPELL_POWER_OF_CARIBDIS); + } + + void GetAdvisors() + { + if (!pInstance) + return; + + Advisors[0] = pInstance->GetData64(DATA_SHARKKIS); + Advisors[1] = pInstance->GetData64(DATA_TIDALVESS); + Advisors[2] = pInstance->GetData64(DATA_CARIBDIS); + } + + void StartEvent(Unit *who) + { + if (!pInstance) + return; + + GetAdvisors(); + + DoScriptText(SAY_AGGRO, me); + DoZoneInCombat(); + + pInstance->SetData64(DATA_KARATHRESSEVENT_STARTER, who->GetGUID()); + pInstance->SetData(DATA_KARATHRESSEVENT, IN_PROGRESS); + } + + void KilledUnit(Unit * /*victim*/) + { + DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2,SAY_SLAY3), me); + } + + void JustDied(Unit * /*killer*/) + { + DoScriptText(SAY_DEATH, me); + + if (pInstance) + pInstance->SetData(DATA_FATHOMLORDKARATHRESSEVENT, DONE); + + //support for quest 10944 + me->SummonCreature(SEER_OLUM, OLUM_X, OLUM_Y, OLUM_Z, OLUM_O, TEMPSUMMON_TIMED_DESPAWN, 3600000); + } + + void EnterCombat(Unit * who) + { + StartEvent(who); + } + + void UpdateAI(const uint32 diff) + { + //Only if not incombat check if the event is started + if (!me->isInCombat() && pInstance && pInstance->GetData(DATA_KARATHRESSEVENT)) + { + Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_KARATHRESSEVENT_STARTER)); + + if (pTarget) + { + AttackStart(pTarget); + GetAdvisors(); + } + } + + //Return since we have no target + if (!UpdateVictim()) + return; + + //someone evaded! + if (pInstance && !pInstance->GetData(DATA_KARATHRESSEVENT)) + { + EnterEvadeMode(); + return; + } + + //CataclysmicBolt_Timer + if (CataclysmicBolt_Timer <= diff) + { + //select a random unit other than the main tank + Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 1); + + //if there aren't other units, cast on the tank + if (!pTarget) + pTarget = me->getVictim(); + + if (pTarget) + DoCast(pTarget, SPELL_CATACLYSMIC_BOLT); + CataclysmicBolt_Timer = 10000; + } else CataclysmicBolt_Timer -= diff; + + //SearNova_Timer + if (SearNova_Timer <= diff) + { + DoCast(me->getVictim(), SPELL_SEAR_NOVA); + SearNova_Timer = 20000+rand()%40000; + } else SearNova_Timer -= diff; + + //Enrage_Timer + if (Enrage_Timer <= diff) + { + DoCast(me, SPELL_ENRAGE); + Enrage_Timer = 90000; + } else Enrage_Timer -= diff; + + //Blessing of Tides Trigger + if ((me->GetHealth()*100 / me->GetMaxHealth()) <= 75 && !BlessingOfTides) + { + BlessingOfTides = true; + bool continueTriggering = false; + Creature* Advisor; + for (uint8 i = 0; i < 4; ++i) + if (Advisors[i]) + { + Advisor = (Unit::GetCreature(*me, Advisors[i])); + if (Advisor && Advisor->isAlive()) + { + continueTriggering = true; + break; + } + } + if (continueTriggering) + { + DoCast(me, SPELL_BLESSING_OF_THE_TIDES); + me->MonsterYell(SAY_GAIN_BLESSING_OF_TIDES, LANG_UNIVERSAL, NULL); + DoPlaySoundToSet(me, SOUND_GAIN_BLESSING_OF_TIDES); + } + } + + DoMeleeAttackIfReady(); + } +}; + +//Fathom-Guard Sharkkis AI +struct boss_fathomguard_sharkkisAI : public ScriptedAI +{ + boss_fathomguard_sharkkisAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + } + + ScriptedInstance* pInstance; + + uint32 LeechingThrow_Timer; + uint32 TheBeastWithin_Timer; + uint32 Multishot_Timer; + uint32 Pet_Timer; + + bool pet; + + uint64 SummonedPet; + + void Reset() + { + LeechingThrow_Timer = 20000; + TheBeastWithin_Timer = 30000; + Multishot_Timer = 15000; + Pet_Timer = 10000; + + pet = false; + + Creature *Pet = Unit::GetCreature(*me, SummonedPet); + if (Pet && Pet->isAlive()) + { + Pet->DealDamage(Pet, Pet->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); + } + + SummonedPet = 0; + + if (pInstance) + pInstance->SetData(DATA_KARATHRESSEVENT, NOT_STARTED); + } + + void JustDied(Unit * /*victim*/) + { + if (pInstance) + { + Creature *Karathress = NULL; + Karathress = (Unit::GetCreature((*me), pInstance->GetData64(DATA_KARATHRESS))); + + if (Karathress) + CAST_AI(boss_fathomlord_karathressAI, Karathress->AI())->EventSharkkisDeath(); + CAST_AI(boss_fathomlord_karathressAI, Karathress->AI())->EventSharkkisDeath(); + } + } + + void EnterCombat(Unit * who) + { + if (pInstance) + { + pInstance->SetData64(DATA_KARATHRESSEVENT_STARTER, who->GetGUID()); + pInstance->SetData(DATA_KARATHRESSEVENT, IN_PROGRESS); + } + } + + void UpdateAI(const uint32 diff) + { + //Only if not incombat check if the event is started + if (!me->isInCombat() && pInstance && pInstance->GetData(DATA_KARATHRESSEVENT)) + { + Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_KARATHRESSEVENT_STARTER)); + + if (pTarget) + { + AttackStart(pTarget); + } + } + + //Return since we have no target + if (!UpdateVictim()) + return; + + //someone evaded! + if (pInstance && !pInstance->GetData(DATA_KARATHRESSEVENT)) + { + EnterEvadeMode(); + return; + } + + //LeechingThrow_Timer + if (LeechingThrow_Timer <= diff) + { + DoCast(me->getVictim(), SPELL_LEECHING_THROW); + LeechingThrow_Timer = 20000; + } else LeechingThrow_Timer -= diff; + + //Multishot_Timer + if (Multishot_Timer <= diff) + { + DoCast(me->getVictim(), SPELL_MULTISHOT); + Multishot_Timer = 20000; + } else Multishot_Timer -= diff; + + //TheBeastWithin_Timer + if (TheBeastWithin_Timer <= diff) + { + DoCast(me, SPELL_THE_BEAST_WITHIN); + Creature *Pet = Unit::GetCreature(*me, SummonedPet); + if (Pet && Pet->isAlive()) + { + Pet->CastSpell(Pet, SPELL_PET_ENRAGE, true); + } + TheBeastWithin_Timer = 30000; + } else TheBeastWithin_Timer -= diff; + + //Pet_Timer + if (Pet_Timer < diff && pet == false) + { + pet = true; + //uint32 spell_id; + uint32 pet_id; + if (!urand(0,1)) + { + //spell_id = SPELL_SUMMON_FATHOM_LURKER; + pet_id = CREATURE_FATHOM_LURKER; + } + else + { + //spell_id = SPELL_SUMMON_FATHOM_SPOREBAT; + pet_id = CREATURE_FATHOM_SPOREBAT; + } + //DoCast(me, spell_id, true); + Creature *Pet = DoSpawnCreature(pet_id,0,0,0,0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); + Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); + if (Pet && pTarget) + { + Pet->AI()->AttackStart(pTarget); + SummonedPet = Pet->GetGUID(); + } + } else Pet_Timer -= diff; + + DoMeleeAttackIfReady(); + } +}; + +//Fathom-Guard Tidalvess AI +struct boss_fathomguard_tidalvessAI : public ScriptedAI +{ + boss_fathomguard_tidalvessAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + } + + ScriptedInstance* pInstance; + + uint32 FrostShock_Timer; + uint32 Spitfire_Timer; + uint32 PoisonCleansing_Timer; + uint32 Earthbind_Timer; + + void Reset() + { + FrostShock_Timer = 25000; + Spitfire_Timer = 60000; + PoisonCleansing_Timer = 30000; + Earthbind_Timer = 45000; + + if (pInstance) + pInstance->SetData(DATA_KARATHRESSEVENT, NOT_STARTED); + } + + void JustDied(Unit * /*victim*/) + { + if (pInstance) + { + Creature *Karathress = NULL; + Karathress = (Unit::GetCreature((*me), pInstance->GetData64(DATA_KARATHRESS))); + + if (Karathress) + if (!me->isAlive() && Karathress) + CAST_AI(boss_fathomlord_karathressAI, Karathress->AI())->EventTidalvessDeath(); + } + } + + void EnterCombat(Unit * who) + { + if (pInstance) + { + pInstance->SetData64(DATA_KARATHRESSEVENT_STARTER, who->GetGUID()); + pInstance->SetData(DATA_KARATHRESSEVENT, IN_PROGRESS); + } + DoCast(me, SPELL_WINDFURY_WEAPON); + } + + void UpdateAI(const uint32 diff) + { + //Only if not incombat check if the event is started + if (!me->isInCombat() && pInstance && pInstance->GetData(DATA_KARATHRESSEVENT)) + { + Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_KARATHRESSEVENT_STARTER)); + + if (pTarget) + { + AttackStart(pTarget); + } + } + + //Return since we have no target + if (!UpdateVictim()) + return; + + //someone evaded! + if (pInstance && !pInstance->GetData(DATA_KARATHRESSEVENT)) + { + EnterEvadeMode(); + return; + } + + if (!me->HasAura(SPELL_WINDFURY_WEAPON)) + { + DoCast(me, SPELL_WINDFURY_WEAPON); + } + + //FrostShock_Timer + if (FrostShock_Timer <= diff) + { + DoCast(me->getVictim(), SPELL_FROST_SHOCK); + FrostShock_Timer = 25000+rand()%5000; + } else FrostShock_Timer -= diff; + + //Spitfire_Timer + if (Spitfire_Timer <= diff) + { + DoCast(me, SPELL_SPITFIRE_TOTEM); + Unit *SpitfireTotem = Unit::GetUnit(*me, CREATURE_SPITFIRE_TOTEM); + if (SpitfireTotem) + { + CAST_CRE(SpitfireTotem)->AI()->AttackStart(me->getVictim()); + } + Spitfire_Timer = 60000; + } else Spitfire_Timer -= diff; + + //PoisonCleansing_Timer + if (PoisonCleansing_Timer <= diff) + { + DoCast(me, SPELL_POISON_CLEANSING_TOTEM); + PoisonCleansing_Timer = 30000; + } else PoisonCleansing_Timer -= diff; + + //Earthbind_Timer + if (Earthbind_Timer <= diff) + { + DoCast(me, SPELL_EARTHBIND_TOTEM); + Earthbind_Timer = 45000; + } else Earthbind_Timer -= diff; + + DoMeleeAttackIfReady(); + } +}; + +//Fathom-Guard Caribdis AI +struct boss_fathomguard_caribdisAI : public ScriptedAI +{ + boss_fathomguard_caribdisAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + } + + ScriptedInstance* pInstance; + + uint32 WaterBoltVolley_Timer; + uint32 TidalSurge_Timer; + uint32 Heal_Timer; + uint32 Cyclone_Timer; + + void Reset() + { + WaterBoltVolley_Timer = 35000; + TidalSurge_Timer = 15000+rand()%5000; + Heal_Timer = 55000; + Cyclone_Timer = 30000+rand()%10000; + + if (pInstance) + pInstance->SetData(DATA_KARATHRESSEVENT, NOT_STARTED); + } + + void JustDied(Unit * /*victim*/) + { + if (pInstance) + { + Creature *Karathress = NULL; + Karathress = (Unit::GetCreature((*me), pInstance->GetData64(DATA_KARATHRESS))); + + if (Karathress) + if (!me->isAlive() && Karathress) + CAST_AI(boss_fathomlord_karathressAI, Karathress->AI())->EventCaribdisDeath(); + } + } + + void EnterCombat(Unit * who) + { + if (pInstance) + { + pInstance->SetData64(DATA_KARATHRESSEVENT_STARTER, who->GetGUID()); + pInstance->SetData(DATA_KARATHRESSEVENT, IN_PROGRESS); + } + } + + void UpdateAI(const uint32 diff) + { + //Only if not incombat check if the event is started + if (!me->isInCombat() && pInstance && pInstance->GetData(DATA_KARATHRESSEVENT)) + { + Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_KARATHRESSEVENT_STARTER)); + + if (pTarget) + { + AttackStart(pTarget); + } + } + + //Return since we have no target + if (!UpdateVictim()) + return; + + //someone evaded! + if (pInstance && !pInstance->GetData(DATA_KARATHRESSEVENT)) + { + EnterEvadeMode(); + return; + } + + //WaterBoltVolley_Timer + if (WaterBoltVolley_Timer <= diff) + { + DoCast(me->getVictim(), SPELL_WATER_BOLT_VOLLEY); + WaterBoltVolley_Timer = 30000; + } else WaterBoltVolley_Timer -= diff; + + //TidalSurge_Timer + if (TidalSurge_Timer <= diff) + { + DoCast(me->getVictim(), SPELL_TIDAL_SURGE); + // Hacky way to do it - won't trigger elseways + me->getVictim()->CastSpell(me->getVictim(), SPELL_TIDAL_SURGE_FREEZE, true); + TidalSurge_Timer = 15000+rand()%5000; + } else TidalSurge_Timer -= diff; + + //Cyclone_Timer + if (Cyclone_Timer <= diff) + { + //DoCast(me, SPELL_SUMMON_CYCLONE); // Doesn't work + Cyclone_Timer = 30000+rand()%10000; + Creature *Cyclone = me->SummonCreature(CREATURE_CYCLONE, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), (rand()%5), TEMPSUMMON_TIMED_DESPAWN, 15000); + if (Cyclone) + { + CAST_CRE(Cyclone)->SetFloatValue(OBJECT_FIELD_SCALE_X, 3.0f); + Cyclone->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + Cyclone->setFaction(me->getFaction()); + Cyclone->CastSpell(Cyclone, SPELL_CYCLONE_CYCLONE, true); + Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); + if (pTarget) + { + Cyclone->AI()->AttackStart(pTarget); + } + } + } else Cyclone_Timer -= diff; + + //Heal_Timer + if (Heal_Timer <= diff) + { + // It can be cast on any of the mobs + Unit *pUnit = NULL; + + while (pUnit == NULL || !pUnit->isAlive()) + { + pUnit = selectAdvisorUnit(); + } + + if (pUnit && pUnit->isAlive()) + DoCast(pUnit, SPELL_HEAL); + Heal_Timer = 60000; + } else Heal_Timer -= diff; + + DoMeleeAttackIfReady(); + } + + Unit* selectAdvisorUnit() + { + Unit* pUnit = NULL; + if (pInstance) + { + switch(rand()%4) + { + case 0: + pUnit = Unit::GetUnit((*me), pInstance->GetData64(DATA_KARATHRESS)); + break; + case 1: + pUnit = Unit::GetUnit((*me), pInstance->GetData64(DATA_SHARKKIS)); + break; + case 2: + pUnit = Unit::GetUnit((*me), pInstance->GetData64(DATA_TIDALVESS)); + break; + case 3: + pUnit = me; + break; + } + } else pUnit = me; + + return pUnit; + } +}; + +CreatureAI* GetAI_boss_fathomlord_karathress(Creature* pCreature) +{ + return new boss_fathomlord_karathressAI (pCreature); +} + +CreatureAI* GetAI_boss_fathomguard_sharkkis(Creature* pCreature) +{ + return new boss_fathomguard_sharkkisAI (pCreature); +} + +CreatureAI* GetAI_boss_fathomguard_tidalvess(Creature* pCreature) +{ + return new boss_fathomguard_tidalvessAI (pCreature); +} + +CreatureAI* GetAI_boss_fathomguard_caribdis(Creature* pCreature) +{ + return new boss_fathomguard_caribdisAI (pCreature); +} + +void AddSC_boss_fathomlord_karathress() +{ + Script *newscript; + newscript = new Script; + newscript->Name = "boss_fathomlord_karathress"; + newscript->GetAI = &GetAI_boss_fathomlord_karathress; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "boss_fathomguard_sharkkis"; + newscript->GetAI = &GetAI_boss_fathomguard_sharkkis; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "boss_fathomguard_tidalvess"; + newscript->GetAI = &GetAI_boss_fathomguard_tidalvess; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "boss_fathomguard_caribdis"; + newscript->GetAI = &GetAI_boss_fathomguard_caribdis; + newscript->RegisterSelf(); +} + diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp new file mode 100644 index 00000000000..923fdf55f80 --- /dev/null +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp @@ -0,0 +1,379 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Boss_Hydross_The_Unstable +SD%Complete: 90 +SDComment: Some details and adjustments left to do, probably nothing major. Spawns may be spawned in different way/location. +SDCategory: Coilfang Resevoir, Serpent Shrine Cavern +EndScriptData */ + +#include "ScriptedPch.h" +#include "serpent_shrine.h" + +#define SAY_AGGRO -1548000 +#define SAY_SWITCH_TO_CLEAN -1548001 +#define SAY_CLEAN_SLAY1 -1548002 +#define SAY_CLEAN_SLAY2 -1548003 +#define SAY_CLEAN_DEATH -1548004 +#define SAY_SWITCH_TO_CORRUPT -1548005 +#define SAY_CORRUPT_SLAY1 -1548006 +#define SAY_CORRUPT_SLAY2 -1548007 +#define SAY_CORRUPT_DEATH -1548008 + +#define SWITCH_RADIUS 18 + +#define MODEL_CORRUPT 20609 +#define MODEL_CLEAN 20162 + +#define SPELL_WATER_TOMB 38235 +#define SPELL_MARK_OF_HYDROSS1 38215 +#define SPELL_MARK_OF_HYDROSS2 38216 +#define SPELL_MARK_OF_HYDROSS3 38217 +#define SPELL_MARK_OF_HYDROSS4 38218 +#define SPELL_MARK_OF_HYDROSS5 38231 +#define SPELL_MARK_OF_HYDROSS6 40584 +#define SPELL_MARK_OF_CORRUPTION1 38219 +#define SPELL_MARK_OF_CORRUPTION2 38220 +#define SPELL_MARK_OF_CORRUPTION3 38221 +#define SPELL_MARK_OF_CORRUPTION4 38222 +#define SPELL_MARK_OF_CORRUPTION5 38230 +#define SPELL_MARK_OF_CORRUPTION6 40583 +#define SPELL_VILE_SLUDGE 38246 +#define SPELL_ENRAGE 27680 //this spell need verification +#define SPELL_SUMMON_WATER_ELEMENT 36459 //not in use yet(in use ever?) +#define SPELL_ELEMENTAL_SPAWNIN 25035 +#define SPELL_BLUE_BEAM 40227 //channeled Hydross Beam Helper (not in use yet) + +#define ENTRY_PURE_SPAWN 22035 +#define ENTRY_TAINTED_SPAWN 22036 +#define ENTRY_BEAM_DUMMY 21934 + +#define HYDROSS_X -239.439 +#define HYDROSS_Y -363.481 + +#define SPAWN_X_DIFF1 6.934003 +#define SPAWN_Y_DIFF1 -11.255012 +#define SPAWN_X_DIFF2 -6.934003 +#define SPAWN_Y_DIFF2 11.255012 +#define SPAWN_X_DIFF3 -12.577011 +#define SPAWN_Y_DIFF3 -4.72702 +#define SPAWN_X_DIFF4 12.577011 +#define SPAWN_Y_DIFF4 4.72702 + +struct boss_hydross_the_unstableAI : public ScriptedAI +{ + boss_hydross_the_unstableAI(Creature *c) : ScriptedAI(c), Summons(me) + { + pInstance = c->GetInstanceData(); + } + + ScriptedInstance* pInstance; + + uint64 beams[2]; + uint32 PosCheck_Timer; + uint32 MarkOfHydross_Timer; + uint32 MarkOfCorruption_Timer; + uint32 WaterTomb_Timer; + uint32 VileSludge_Timer; + uint32 MarkOfHydross_Count; + uint32 MarkOfCorruption_Count; + uint32 EnrageTimer; + bool CorruptedForm; + bool beam; + SummonList Summons; + + void Reset() + { + DeSummonBeams(); + beams[0] = 0; + beams[1] = 0; + PosCheck_Timer = 2500; + MarkOfHydross_Timer = 15000; + MarkOfCorruption_Timer = 15000; + WaterTomb_Timer = 7000; + VileSludge_Timer = 7000; + MarkOfHydross_Count = 0; + MarkOfCorruption_Count = 0; + EnrageTimer = 600000; + + CorruptedForm = false; + me->SetMeleeDamageSchool(SPELL_SCHOOL_FROST); + me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FROST, true); + me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_NATURE, false); + + me->SetDisplayId(MODEL_CLEAN); + + if (pInstance) + pInstance->SetData(DATA_HYDROSSTHEUNSTABLEEVENT, NOT_STARTED); + beam = false; + Summons.DespawnAll(); + } + + void SummonBeams() + { + Creature* beamer = me->SummonCreature(ENTRY_BEAM_DUMMY,-258.333,-356.34,22.0499,5.90835,TEMPSUMMON_CORPSE_DESPAWN,0); + if (beamer) + { + beamer->CastSpell(me,SPELL_BLUE_BEAM,true); + beamer->SetDisplayId(11686); //invisible + beamer->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + beams[0]=beamer->GetGUID(); + } + beamer = beamer = me->SummonCreature(ENTRY_BEAM_DUMMY,-219.918,-371.308,22.0042,2.73072,TEMPSUMMON_CORPSE_DESPAWN,0); + if (beamer) + { + beamer->CastSpell(me,SPELL_BLUE_BEAM,true); + beamer->SetDisplayId(11686); //invisible + beamer->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + beams[1]=beamer->GetGUID(); + } + } + void DeSummonBeams() + { + for (uint8 i=0; i<2; ++i) + { + Creature* mob = Unit::GetCreature(*me,beams[i]); + if (mob) + { + mob->setDeathState(DEAD); + mob->RemoveCorpse(); + } + } + } + void EnterCombat(Unit * /*who*/) + { + DoScriptText(SAY_AGGRO, me); + + if (pInstance) + pInstance->SetData(DATA_HYDROSSTHEUNSTABLEEVENT, IN_PROGRESS); + } + + void KilledUnit(Unit * /*victim*/) + { + if (CorruptedForm) + { + DoScriptText(RAND(SAY_CORRUPT_SLAY1,SAY_CORRUPT_SLAY2), me); + } + else + { + DoScriptText(RAND(SAY_CLEAN_SLAY1,SAY_CLEAN_SLAY2), me); + } + } + + void JustSummoned(Creature* summoned) + { + if (summoned->GetEntry() == ENTRY_PURE_SPAWN) + { + summoned->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FROST, true); + summoned->CastSpell(summoned,SPELL_ELEMENTAL_SPAWNIN,true); + Summons.Summon(summoned); + } + if (summoned->GetEntry() == ENTRY_TAINTED_SPAWN) + { + summoned->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_NATURE, true); + summoned->CastSpell(summoned,SPELL_ELEMENTAL_SPAWNIN,true); + Summons.Summon(summoned); + } + } + + void SummonedCreatureDespawn(Creature *summon) + { + Summons.Despawn(summon); + } + + void JustDied(Unit * /*victim*/) + { + if (CorruptedForm) + DoScriptText(SAY_CORRUPT_DEATH, me); + else + DoScriptText(SAY_CLEAN_DEATH, me); + + if (pInstance) + pInstance->SetData(DATA_HYDROSSTHEUNSTABLEEVENT, DONE); + Summons.DespawnAll(); + } + + void UpdateAI(const uint32 diff) + { + if (!beam) + { + SummonBeams(); + beam=true; + } + //Return since we have no target + if (!UpdateVictim()) + return; + + // corrupted form + if (CorruptedForm) + { + //MarkOfCorruption_Timer + if (MarkOfCorruption_Timer <= diff) + { + if (MarkOfCorruption_Count <= 5) + { + uint32 mark_spell = 0; + + switch (MarkOfCorruption_Count) + { + case 0: mark_spell = SPELL_MARK_OF_CORRUPTION1; break; + case 1: mark_spell = SPELL_MARK_OF_CORRUPTION2; break; + case 2: mark_spell = SPELL_MARK_OF_CORRUPTION3; break; + case 3: mark_spell = SPELL_MARK_OF_CORRUPTION4; break; + case 4: mark_spell = SPELL_MARK_OF_CORRUPTION5; break; + case 5: mark_spell = SPELL_MARK_OF_CORRUPTION6; break; + } + + DoCast(me->getVictim(), mark_spell); + + if (MarkOfCorruption_Count < 5) + ++MarkOfCorruption_Count; + } + + MarkOfCorruption_Timer = 15000; + } else MarkOfCorruption_Timer -= diff; + + //VileSludge_Timer + if (VileSludge_Timer <= diff) + { + Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); + if (pTarget) + DoCast(pTarget, SPELL_VILE_SLUDGE); + + VileSludge_Timer = 15000; + } else VileSludge_Timer -= diff; + + //PosCheck_Timer + if (PosCheck_Timer <= diff) + { + if (me->IsWithinDist2d(HYDROSS_X, HYDROSS_Y, SWITCH_RADIUS)) + { + // switch to clean form + me->SetDisplayId(MODEL_CLEAN); + CorruptedForm = false; + MarkOfHydross_Count = 0; + + DoScriptText(SAY_SWITCH_TO_CLEAN, me); + DoResetThreat(); + SummonBeams(); + + // spawn 4 adds + DoSpawnCreature(ENTRY_PURE_SPAWN, SPAWN_X_DIFF1, SPAWN_Y_DIFF1, 3, 0, TEMPSUMMON_CORPSE_DESPAWN, 0); + DoSpawnCreature(ENTRY_PURE_SPAWN, SPAWN_X_DIFF2, SPAWN_Y_DIFF2, 3, 0, TEMPSUMMON_CORPSE_DESPAWN, 0); + DoSpawnCreature(ENTRY_PURE_SPAWN, SPAWN_X_DIFF3, SPAWN_Y_DIFF3, 3, 0, TEMPSUMMON_CORPSE_DESPAWN, 0); + DoSpawnCreature(ENTRY_PURE_SPAWN, SPAWN_X_DIFF4, SPAWN_Y_DIFF4, 3, 0, TEMPSUMMON_CORPSE_DESPAWN, 0); + + me->SetMeleeDamageSchool(SPELL_SCHOOL_FROST); + me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FROST, true); + me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_NATURE, false); + } + + PosCheck_Timer = 2500; + } else PosCheck_Timer -=diff; + } + // clean form + else + { + //MarkOfHydross_Timer + if (MarkOfHydross_Timer <= diff) + { + if (MarkOfHydross_Count <= 5) + { + uint32 mark_spell = NULL; + + switch(MarkOfHydross_Count) + { + case 0: mark_spell = SPELL_MARK_OF_HYDROSS1; break; + case 1: mark_spell = SPELL_MARK_OF_HYDROSS2; break; + case 2: mark_spell = SPELL_MARK_OF_HYDROSS3; break; + case 3: mark_spell = SPELL_MARK_OF_HYDROSS4; break; + case 4: mark_spell = SPELL_MARK_OF_HYDROSS5; break; + case 5: mark_spell = SPELL_MARK_OF_HYDROSS6; break; + } + + DoCast(me->getVictim(), mark_spell); + + if (MarkOfHydross_Count < 5) + ++MarkOfHydross_Count; + } + + MarkOfHydross_Timer = 15000; + } else MarkOfHydross_Timer -= diff; + + //WaterTomb_Timer + if (WaterTomb_Timer <= diff) + { + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); + if (pTarget) + DoCast(pTarget, SPELL_WATER_TOMB); + + WaterTomb_Timer = 7000; + } else WaterTomb_Timer -= diff; + + //PosCheck_Timer + if (PosCheck_Timer <= diff) + { + if (!me->IsWithinDist2d(HYDROSS_X, HYDROSS_Y, SWITCH_RADIUS)) + { + // switch to corrupted form + me->SetDisplayId(MODEL_CORRUPT); + MarkOfCorruption_Count = 0; + CorruptedForm = true; + + DoScriptText(SAY_SWITCH_TO_CORRUPT, me); + DoResetThreat(); + DeSummonBeams(); + + // spawn 4 adds + DoSpawnCreature(ENTRY_TAINTED_SPAWN, SPAWN_X_DIFF1, SPAWN_Y_DIFF1, 3, 0, TEMPSUMMON_CORPSE_DESPAWN, 0); + DoSpawnCreature(ENTRY_TAINTED_SPAWN, SPAWN_X_DIFF2, SPAWN_Y_DIFF2, 3, 0, TEMPSUMMON_CORPSE_DESPAWN, 0); + DoSpawnCreature(ENTRY_TAINTED_SPAWN, SPAWN_X_DIFF3, SPAWN_Y_DIFF3, 3, 0, TEMPSUMMON_CORPSE_DESPAWN, 0); + DoSpawnCreature(ENTRY_TAINTED_SPAWN, SPAWN_X_DIFF4, SPAWN_Y_DIFF4, 3, 0, TEMPSUMMON_CORPSE_DESPAWN, 0); + + me->SetMeleeDamageSchool(SPELL_SCHOOL_NATURE); + me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_NATURE, true); + me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FROST, false); + } + + PosCheck_Timer = 2500; + } else PosCheck_Timer -=diff; + } + + //EnrageTimer + if (EnrageTimer <= diff) + { + DoCast(me, SPELL_ENRAGE); + EnrageTimer = 60000; + } else EnrageTimer -= diff; + + DoMeleeAttackIfReady(); + } +}; +CreatureAI* GetAI_boss_hydross_the_unstable(Creature* pCreature) +{ + return new boss_hydross_the_unstableAI (pCreature); +} + +void AddSC_boss_hydross_the_unstable() +{ + Script *newscript; + newscript = new Script; + newscript->Name = "boss_hydross_the_unstable"; + newscript->GetAI = &GetAI_boss_hydross_the_unstable; + newscript->RegisterSelf(); +} + diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp new file mode 100644 index 00000000000..2f0485d0e6c --- /dev/null +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp @@ -0,0 +1,1039 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA02111-1307USA + */ + +/* ScriptData +SDName: Boss_Lady_Vashj +SD%Complete: 99 +SDComment: Missing blizzlike Shield Generators coords +SDCategory: Coilfang Resevoir, Serpent Shrine Cavern +EndScriptData */ + +#include "ScriptedPch.h" +#include "serpent_shrine.h" +#include "ScriptedSimpleAI.h" +#include "Spell.h" + +#define SAY_INTRO -1548042 +#define SAY_AGGRO1 -1548043 +#define SAY_AGGRO2 -1548044 +#define SAY_AGGRO3 -1548045 +#define SAY_AGGRO4 -1548046 +#define SAY_PHASE1 -1548047 +#define SAY_PHASE2 -1548048 +#define SAY_PHASE3 -1548049 +#define SAY_BOWSHOT1 -1548050 +#define SAY_BOWSHOT2 -1548051 +#define SAY_SLAY1 -1548052 +#define SAY_SLAY2 -1548053 +#define SAY_SLAY3 -1548054 +#define SAY_DEATH -1548055 + +#define SPELL_SURGE 38044 +#define SPELL_MULTI_SHOT 38310 +#define SPELL_SHOCK_BLAST 38509 +#define SPELL_ENTANGLE 38316 +#define SPELL_STATIC_CHARGE_TRIGGER 38280 +#define SPELL_FORKED_LIGHTNING 40088 +#define SPELL_SHOOT 40873 +#define SPELL_POISON_BOLT 40095 +#define SPELL_TOXIC_SPORES 38575 +#define SPELL_MAGIC_BARRIER 38112 + +#define MIDDLE_X 30.134 +#define MIDDLE_Y -923.65 +#define MIDDLE_Z 42.9 + +#define SPOREBAT_X 30.977156 +#define SPOREBAT_Y -925.297761 +#define SPOREBAT_Z 77.176567 +#define SPOREBAT_O 5.223932 + +#define SHIED_GENERATOR_CHANNEL 19870 +#define ENCHANTED_ELEMENTAL 21958 +#define TAINTED_ELEMENTAL 22009 +#define COILFANG_STRIDER 22056 +#define COILFANG_ELITE 22055 +#define TOXIC_SPOREBAT 22140 +#define TOXIC_SPORES_TRIGGER 22207 + +#define TEXT_NOT_INITIALIZED "Instance script not initialized" +#define TEXT_ALREADY_DEACTIVATED "Already deactivated" + +float ElementPos[8][4] = +{ + {8.3, -835.3, 21.9, 5}, + {53.4, -835.3, 21.9, 4.5}, + {96, -861.9, 21.8, 4}, + {96, -986.4, 21.4, 2.5}, + {54.4, -1010.6, 22, 1.8}, + {9.8, -1012, 21.7, 1.4}, + {-35, -987.6, 21.5, 0.8}, + {-58.9, -901.6, 21.5, 6} +}; + +float ElementWPPos[8][3] = +{ + {71.700752, -883.905884, 41.097168}, + {45.039848, -868.022827, 41.097015}, + {14.585141, -867.894470, 41.097061}, + {-25.415508, -906.737732, 41.097061}, + {-11.801594, -963.405884, 41.097067}, + {14.556657, -979.051514, 41.097137}, + {43.466549, -979.406677, 41.097027}, + {69.945908, -964.663940, 41.097054} +}; + +float SporebatWPPos[8][3] = +{ + {31.6,-896.3,59.1}, + {9.1, -913.9, 56}, + {5.2, -934.4, 52.4}, + {20.7, -946.9, 49.7}, + {41, -941.9, 51}, + {47.7, -927.3, 55}, + {42.2, -912.4, 51.7}, + {27, -905.9, 50} +}; + +float CoilfangElitePos[3][4] = +{ + {28.84, -923.28, 42.9, 6}, + {31.183281, -953.502625, 41.523602, 1.640957}, + {58.895180, -923.124268, 41.545307, 3.152848} +}; + +float CoilfangStriderPos[3][4] = +{ + {66.427010, -948.778503, 41.262245, 2.584220}, + {7.513962, -959.538208, 41.300422, 1.034629}, + {-12.843201, -907.798401, 41.239620, 6.087094} +}; + +float ShieldGeneratorChannelPos[4][4] = +{ + {49.6262, -902.181, 43.0975, 3.95683}, + {10.988, -901.616, 42.5371, 5.4373}, + {10.3859, -944.036, 42.5446, 0.779888}, + {49.3126, -943.398, 42.5501, 2.40174} +}; + +//Lady Vashj AI +struct boss_lady_vashjAI : public ScriptedAI +{ + boss_lady_vashjAI (Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + Intro = false; + JustCreated = true; + c->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); //set it only once on Creature create (no need do intro if wiped) + } + + ScriptedInstance *pInstance; + + uint64 ShieldGeneratorChannel[4]; + + uint32 AggroTimer; + uint32 ShockBlast_Timer; + uint32 Entangle_Timer; + uint32 StaticCharge_Timer; + uint32 ForkedLightning_Timer; + uint32 Check_Timer; + uint32 EnchantedElemental_Timer; + uint32 TaintedElemental_Timer; + uint32 CoilfangElite_Timer; + uint32 CoilfangStrider_Timer; + uint32 SummonSporebat_Timer; + uint32 SummonSporebat_StaticTimer; + uint8 EnchantedElemental_Pos; + uint8 Phase; + + bool Entangle; + bool Intro; + bool CanAttack; + bool JustCreated; + + void Reset() + { + AggroTimer = 19000; + ShockBlast_Timer = 1+rand()%60000; + Entangle_Timer = 30000; + StaticCharge_Timer = 10000+rand()%15000; + ForkedLightning_Timer = 2000; + Check_Timer = 15000; + EnchantedElemental_Timer = 5000; + TaintedElemental_Timer = 50000; + CoilfangElite_Timer = 45000+rand()%5000; + CoilfangStrider_Timer = 60000+rand()%10000; + SummonSporebat_Timer = 10000; + SummonSporebat_StaticTimer = 30000; + EnchantedElemental_Pos = 0; + Phase = 0; + + Entangle = false; + if (JustCreated) + { + CanAttack = false; + JustCreated = false; + } else CanAttack = true; + + Unit *remo; + for (uint8 i = 0; i < 4; ++i) + { + remo = Unit::GetUnit(*me, ShieldGeneratorChannel[i]); + if (remo) + remo->setDeathState(JUST_DIED); + } + + if (pInstance) + pInstance->SetData(DATA_LADYVASHJEVENT, NOT_STARTED); + ShieldGeneratorChannel[0] = 0; + ShieldGeneratorChannel[1] = 0; + ShieldGeneratorChannel[2] = 0; + ShieldGeneratorChannel[3] = 0; + + me->SetCorpseDelay(1000*60*60); + } + + //Called when a tainted elemental dies + void EventTaintedElementalDeath() + { + //the next will spawn 50 seconds after the previous one's death + if (TaintedElemental_Timer > 50000) + TaintedElemental_Timer = 50000; + } + void KilledUnit(Unit * /*victim*/) + { + DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2,SAY_SLAY3), me); + } + + void JustDied(Unit * /*victim*/) + { + DoScriptText(SAY_DEATH, me); + + if (pInstance) + pInstance->SetData(DATA_LADYVASHJEVENT, DONE); + } + + void StartEvent() + { + DoScriptText(RAND(SAY_AGGRO1,SAY_AGGRO2,SAY_AGGRO3,SAY_AGGRO4), me); + + Phase = 1; + + if (pInstance) + pInstance->SetData(DATA_LADYVASHJEVENT, IN_PROGRESS); + } + + void EnterCombat(Unit * who) + { + if (pInstance) + { + //remove old tainted cores to prevent cheating in phase 2 + Map* pMap = me->GetMap(); + Map::PlayerList const &PlayerList = pMap->GetPlayers(); + for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) + { + if (Player* i_pl = i->getSource()) + { + i_pl->DestroyItemCount(31088, 1, true); + } + } + } + StartEvent();//this is EnterCombat(), so were are 100% in combat, start the event + + if (Phase != 2) + AttackStart(who); + } + + void MoveInLineOfSight(Unit *who) + { + if (!Intro) + { + Intro = true; + DoScriptText(SAY_INTRO, me); + } + if (!CanAttack) + return; + if (!who || me->getVictim()) + return; + + if (who->isTargetableForAttack() && who->isInAccessiblePlaceFor(me) && me->IsHostileTo(who)) + { + float attackRadius = me->GetAttackDistance(who); + if (me->IsWithinDistInMap(who, attackRadius) && me->GetDistanceZ(who) <= CREATURE_Z_ATTACK_RANGE && me->IsWithinLOSInMap(who)) + { + //if (who->HasStealthAura()) + // who->RemoveSpellsCausingAura(SPELL_AURA_MOD_STEALTH); + + if (!me->isInCombat())//AttackStart() sets UNIT_FLAG_IN_COMBAT, so this msut be before attacking + StartEvent(); + + if (Phase != 2) + AttackStart(who); + } + } + } + + void CastShootOrMultishot() + { + switch (urand(0,1)) + { + case 0: + //Shoot + //Used in Phases 1 and 3 after Entangle or while having nobody in melee range. A shot that hits her target for 4097-5543 Physical damage. + DoCast(me->getVictim(), SPELL_SHOOT); + break; + case 1: + //Multishot + //Used in Phases 1 and 3 after Entangle or while having nobody in melee range. A shot that hits 1 person and 4 people around him for 6475-7525 physical damage. + DoCast(me->getVictim(), SPELL_MULTI_SHOT); + break; + } + if (rand()%3) + { + DoScriptText(RAND(SAY_BOWSHOT1,SAY_BOWSHOT2), me); + } + } + + void UpdateAI(const uint32 diff) + { + if (!CanAttack && Intro) + { + if (AggroTimer <= diff) + { + CanAttack = true; + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + AggroTimer=19000; + }else + { + AggroTimer-=diff; + return; + } + } + //to prevent abuses during phase 2 + if (Phase == 2 && !me->getVictim() && me->isInCombat()) + { + EnterEvadeMode(); + return; + } + //Return since we have no target + if (!UpdateVictim()) + return; + + if (Phase == 1 || Phase == 3) + { + //ShockBlast_Timer + if (ShockBlast_Timer <= diff) + { + //Shock Burst + //Randomly used in Phases 1 and 3 on Vashj's target, it's a Shock spell doing 8325-9675 nature damage and stunning the target for 5 seconds, during which she will not attack her target but switch to the next person on the aggro list. + DoCast(me->getVictim(), SPELL_SHOCK_BLAST); + me->TauntApply(me->getVictim()); + + ShockBlast_Timer = 1000+rand()%14000; //random cooldown + } else ShockBlast_Timer -= diff; + + //StaticCharge_Timer + if (StaticCharge_Timer <= diff) + { + //Static Charge + //Used on random people (only 1 person at any given time) in Phases 1 and 3, it's a debuff doing 2775 to 3225 Nature damage to the target and everybody in about 5 yards around it, every 1 seconds for 30 seconds. It can be removed by Cloak of Shadows, Iceblock, Divine Shield, etc, but not by Cleanse or Dispel Magic. + Unit *pTarget = NULL; + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 200, true); + + if (pTarget && !pTarget->HasAura(SPELL_STATIC_CHARGE_TRIGGER)) + //cast Static Charge every 2 seconds for 20 seconds + DoCast(pTarget, SPELL_STATIC_CHARGE_TRIGGER); + + StaticCharge_Timer = 10000+rand()%20000; //blizzlike + } else StaticCharge_Timer -= diff; + + //Entangle_Timer + if (Entangle_Timer <= diff) + { + if (!Entangle) + { + //Entangle + //Used in Phases 1 and 3, it casts Entangling Roots on everybody in a 15 yard radius of Vashj, immobilzing them for 10 seconds and dealing 500 damage every 2 seconds. It's not a magic effect so it cannot be dispelled, but is removed by various buffs such as Cloak of Shadows or Blessing of Freedom. + DoCast(me->getVictim(), SPELL_ENTANGLE); + Entangle = true; + Entangle_Timer = 10000; + } + else + { + CastShootOrMultishot(); + Entangle = false; + Entangle_Timer = 20000+rand()%5000; + } + } else Entangle_Timer -= diff; + + //Phase 1 + if (Phase == 1) + { + //Start phase 2 + if ((me->GetHealth()*100 / me->GetMaxHealth()) < 70) + { + //Phase 2 begins when Vashj hits 70%. She will run to the middle of her platform and surround herself in a shield making her invulerable. + Phase = 2; + + me->GetMotionMaster()->Clear(); + DoTeleportTo(MIDDLE_X, MIDDLE_Y, MIDDLE_Z); + + Creature *pCreature; + for (uint8 i = 0; i < 4; ++i) + { + pCreature = me->SummonCreature(SHIED_GENERATOR_CHANNEL, ShieldGeneratorChannelPos[i][0], ShieldGeneratorChannelPos[i][1], ShieldGeneratorChannelPos[i][2], ShieldGeneratorChannelPos[i][3], TEMPSUMMON_CORPSE_DESPAWN, 0); + if (pCreature) + ShieldGeneratorChannel[i] = pCreature->GetGUID(); + } + DoScriptText(SAY_PHASE2, me); + } + } + //Phase 3 + else + { + //SummonSporebat_Timer + if (SummonSporebat_Timer <= diff) + { + Creature *Sporebat = NULL; + Sporebat = me->SummonCreature(TOXIC_SPOREBAT, SPOREBAT_X, SPOREBAT_Y, SPOREBAT_Z, SPOREBAT_O, TEMPSUMMON_CORPSE_DESPAWN, 0); + + if (Sporebat) + { + Unit *pTarget = NULL; + pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); + if (pTarget) + Sporebat->AI()->AttackStart(pTarget); + } + + //summon sporebats faster and faster + if (SummonSporebat_StaticTimer > 1000) + SummonSporebat_StaticTimer -= 1000; + + SummonSporebat_Timer = SummonSporebat_StaticTimer; + + if (SummonSporebat_Timer < 5000) + SummonSporebat_Timer = 5000; + + } else SummonSporebat_Timer -= diff; + } + + //Melee attack + DoMeleeAttackIfReady(); + + //Check_Timer - used to check if somebody is in melee range + if (Check_Timer <= diff) + { + bool InMeleeRange = false; + Unit *pTarget; + std::list t_list = me->getThreatManager().getThreatList(); + for (std::list::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) + { + pTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid()); + //if in melee range + if (pTarget && pTarget->IsWithinDistInMap(me, 5)) + { + InMeleeRange = true; + break; + } + } + + //if nobody is in melee range + if (!InMeleeRange) + CastShootOrMultishot(); + + Check_Timer = 5000; + } else Check_Timer -= diff; + } + //Phase 2 + else + { + //ForkedLightning_Timer + if (ForkedLightning_Timer <= diff) + { + //Forked Lightning + //Used constantly in Phase 2, it shoots out completely randomly targeted bolts of lightning which hit everybody in a roughtly 60 degree cone in front of Vashj for 2313-2687 nature damage. + Unit *pTarget = NULL; + pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); + + if (!pTarget) + pTarget = me->getVictim(); + + DoCast(pTarget, SPELL_FORKED_LIGHTNING); + + ForkedLightning_Timer = 2000+rand()%6000; //blizzlike + } else ForkedLightning_Timer -= diff; + + //EnchantedElemental_Timer + if (EnchantedElemental_Timer <= diff) + { + Creature *Elemental; + Elemental = me->SummonCreature(ENCHANTED_ELEMENTAL, ElementPos[EnchantedElemental_Pos][0], ElementPos[EnchantedElemental_Pos][1], ElementPos[EnchantedElemental_Pos][2], ElementPos[EnchantedElemental_Pos][3], TEMPSUMMON_CORPSE_DESPAWN, 0); + + if (EnchantedElemental_Pos == 7) + EnchantedElemental_Pos = 0; + else + ++EnchantedElemental_Pos; + + EnchantedElemental_Timer = 10000+rand()%5000; + } else EnchantedElemental_Timer -= diff; + + //TaintedElemental_Timer + if (TaintedElemental_Timer <= diff) + { + Creature *Tain_Elemental; + uint32 pos = rand()%8; + Tain_Elemental = me->SummonCreature(TAINTED_ELEMENTAL, ElementPos[pos][0], ElementPos[pos][1], ElementPos[pos][2], ElementPos[pos][3], TEMPSUMMON_DEAD_DESPAWN, 0); + + TaintedElemental_Timer = 120000; + } else TaintedElemental_Timer -= diff; + + //CoilfangElite_Timer + if (CoilfangElite_Timer <= diff) + { + uint32 pos = rand()%3; + Creature* CoilfangElite = NULL; + CoilfangElite = me->SummonCreature(COILFANG_ELITE, CoilfangElitePos[pos][0], CoilfangElitePos[pos][1], CoilfangElitePos[pos][2], CoilfangElitePos[pos][3], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + if (CoilfangElite) + { + Unit *pTarget = NULL; + pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); + if (pTarget) + CoilfangElite->AI()->AttackStart(pTarget); + else if (me->getVictim()) + CoilfangElite->AI()->AttackStart(me->getVictim()); + } + CoilfangElite_Timer = 45000+rand()%5000; + } else CoilfangElite_Timer -= diff; + + //CoilfangStrider_Timer + if (CoilfangStrider_Timer <= diff) + { + uint32 pos = rand()%3; + Creature* CoilfangStrider = NULL; + CoilfangStrider = me->SummonCreature(COILFANG_STRIDER, CoilfangStriderPos[pos][0], CoilfangStriderPos[pos][1], CoilfangStriderPos[pos][2], CoilfangStriderPos[pos][3], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + if (CoilfangStrider) + { + Unit *pTarget = NULL; + pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); + if (pTarget) + CoilfangStrider->AI()->AttackStart(pTarget); + else if (me->getVictim()) + CoilfangStrider->AI()->AttackStart(me->getVictim()); + } + CoilfangStrider_Timer = 60000+rand()%10000; + } else CoilfangStrider_Timer -= diff; + + //Check_Timer + if (Check_Timer <= diff) + { + //Start Phase 3 + if (pInstance && pInstance->GetData(DATA_CANSTARTPHASE3)) + { + //set life 50% + me->SetHealth(me->GetMaxHealth()/2); + + me->RemoveAurasDueToSpell(SPELL_MAGIC_BARRIER); + + DoScriptText(SAY_PHASE3, me); + + Phase = 3; + + //return to the tank + me->GetMotionMaster()->MoveChase(me->getVictim()); + } + Check_Timer = 1000; + } else Check_Timer -= diff; + } + } +}; + +//Enchanted Elemental +//If one of them reaches Vashj he will increase her damage done by 5%. +struct mob_enchanted_elementalAI : public ScriptedAI +{ + mob_enchanted_elementalAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + } + + ScriptedInstance *pInstance; + uint32 move; + uint32 phase; + float x, y, z; + + uint64 VashjGUID; + + void Reset() + { + me->SetSpeed(MOVE_WALK,0.6);//walk + me->SetSpeed(MOVE_RUN,0.6);//run + move = 0; + phase = 1; + + VashjGUID = 0; + + for (int i = 0; i<8; ++i)//search for nearest waypoint (up on stairs) + { + if (!x || !y || !z) + { + x = ElementWPPos[i][0]; + y = ElementWPPos[i][1]; + z = ElementWPPos[i][2]; + } + else + { + if (me->GetDistance(ElementWPPos[i][0],ElementWPPos[i][1],ElementWPPos[i][2]) < me->GetDistance(x,y,z)) + { + x = ElementWPPos[i][0]; + y = ElementWPPos[i][1]; + z = ElementWPPos[i][2]; + } + } + } + if (pInstance) + VashjGUID = pInstance->GetData64(DATA_LADYVASHJ); + } + + void EnterCombat(Unit * /*who*/) {} + + void MoveInLineOfSight(Unit * /*who*/) {} + + void UpdateAI(const uint32 diff) + { + if (!pInstance) + return; + + if (!VashjGUID) + return; + + if (move <= diff) + { + me->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE); + if (phase == 1) + me->GetMotionMaster()->MovePoint(0, x, y, z); + if (phase == 1 && me->IsWithinDist3d(x,y,z, 0.1)) + phase = 2; + if (phase == 2) + { + me->GetMotionMaster()->MovePoint(0, MIDDLE_X, MIDDLE_Y, MIDDLE_Z); + phase = 3; + } + if (phase == 3) + { + me->GetMotionMaster()->MovePoint(0, MIDDLE_X, MIDDLE_Y, MIDDLE_Z); + if (me->IsWithinDist3d(MIDDLE_X, MIDDLE_Y, MIDDLE_Z, 3)) + DoCast(me, SPELL_SURGE); + } + if (Creature *Vashj = Unit::GetCreature(*me, VashjGUID)) + { + if (!Vashj->isInCombat() || CAST_AI(boss_lady_vashjAI, Vashj->AI())->Phase != 2 || Vashj->isDead()) + { + //call Unsummon() + me->Kill(me); + } + } + move = 1000; + } else move -= diff; + } +}; + +//Tainted Elemental +//This mob has 7,900 life, doesn't move, and shoots Poison Bolts at one person anywhere in the area, doing 3,000 nature damage and placing a posion doing 2,000 damage every 2 seconds. He will switch targets often, or sometimes just hang on a single player, but there is nothing you can do about it except heal the damage and kill the Tainted Elemental +struct mob_tainted_elementalAI : public ScriptedAI +{ + mob_tainted_elementalAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + } + + ScriptedInstance *pInstance; + + uint32 PoisonBolt_Timer; + uint32 Despawn_Timer; + + void Reset() + { + PoisonBolt_Timer = 5000+rand()%5000; + Despawn_Timer = 30000; + } + + void JustDied(Unit * /*killer*/) + { + if (pInstance) + { + Creature *Vashj = NULL; + Vashj = (Unit::GetCreature((*me), pInstance->GetData64(DATA_LADYVASHJ))); + + if (Vashj) + CAST_AI(boss_lady_vashjAI, Vashj->AI())->EventTaintedElementalDeath(); + } + } + + void EnterCombat(Unit * who) + { + me->AddThreat(who, 0.1f); + } + + void UpdateAI(const uint32 diff) + { + //PoisonBolt_Timer + if (PoisonBolt_Timer <= diff) + { + Unit *pTarget = NULL; + pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); + + if (pTarget && pTarget->IsWithinDistInMap(me, 30)) + DoCast(pTarget, SPELL_POISON_BOLT); + + PoisonBolt_Timer = 5000+rand()%5000; + } else PoisonBolt_Timer -= diff; + + //Despawn_Timer + if (Despawn_Timer <= diff) + { + //call Unsummon() + me->setDeathState(DEAD); + + //to prevent crashes + Despawn_Timer = 1000; + } else Despawn_Timer -= diff; + } +}; + +//Toxic Sporebat +//Toxic Spores: Used in Phase 3 by the Spore Bats, it creates a contaminated green patch of ground, dealing about 2775-3225 nature damage every second to anyone who stands in it. +struct mob_toxic_sporebatAI : public ScriptedAI +{ + mob_toxic_sporebatAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + EnterEvadeMode(); + } + + ScriptedInstance *pInstance; + + uint32 movement_timer; + uint32 ToxicSpore_Timer; + uint32 bolt_timer; + uint32 Check_Timer; + + void Reset() + { + me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); + me->setFaction(14); + movement_timer = 0; + ToxicSpore_Timer = 5000; + bolt_timer = 5500; + Check_Timer = 1000; + } + + void EnterCombat(Unit * /*who*/) + { + + } + + void MoveInLineOfSight(Unit * /*who*/) + { + + } + + void MovementInform(uint32 type, uint32 id) + { + if (type != POINT_MOTION_TYPE) + return; + + if (id == 1) + movement_timer = 0; + } + + void UpdateAI (const uint32 diff) + { + //Random movement + if (movement_timer <= diff) + { + uint32 rndpos = rand()%8; + me->GetMotionMaster()->MovePoint(1,SporebatWPPos[rndpos][0], SporebatWPPos[rndpos][1], SporebatWPPos[rndpos][2]); + movement_timer = 6000; + } else movement_timer -= diff; + + //toxic spores + if (bolt_timer <= diff) + { + Unit *pTarget = NULL; + pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); + if (pTarget) + { + Creature* trig = me->SummonCreature(TOXIC_SPORES_TRIGGER,pTarget->GetPositionX(),pTarget->GetPositionY(),pTarget->GetPositionZ(),0,TEMPSUMMON_TIMED_DESPAWN,30000); + if (trig) + { + trig->setFaction(14); + trig->CastSpell(trig, SPELL_TOXIC_SPORES,true); + } + } + bolt_timer = 10000+rand()%5000; + } + else bolt_timer -= diff; + + //Check_Timer + if (Check_Timer <= diff) + { + if (pInstance) + { + //check if vashj is death + Unit *Vashj = NULL; + Vashj = Unit::GetUnit((*me), pInstance->GetData64(DATA_LADYVASHJ)); + if (!Vashj || (Vashj && !Vashj->isAlive()) || (Vashj && CAST_AI(boss_lady_vashjAI, CAST_CRE(Vashj)->AI())->Phase != 3)) + { + //remove + me->setDeathState(DEAD); + me->RemoveCorpse(); + me->setFaction(35); + } + } + + Check_Timer = 1000; + } else Check_Timer -= diff; + } +}; + +//Coilfang Elite +//It's an elite Naga mob with 170,000 HP. It does about 5000 damage on plate, and has a nasty cleave hitting for about 7500 damage +CreatureAI* GetAI_mob_coilfang_elite(Creature* pCreature) +{ + SimpleAI* ai = new SimpleAI (pCreature); + + ai->Spell[0].Enabled = true; + ai->Spell[0].Spell_Id = 31345; //Cleave + ai->Spell[0].Cooldown = 15000; + ai->Spell[0].CooldownRandomAddition = 5000; + ai->Spell[0].First_Cast = 5000; + ai->Spell[0].Cast_Target_Type = CAST_HOSTILE_RANDOM; + + ai->EnterEvadeMode(); + + return ai; +} + +//Coilfang Strider +//It hits plate for about 8000 damage, has a Mind Blast spell doing about 3000 shadow damage, and a Psychic Scream Aura, which fears everybody in a 8 yard range of it every 2-3 seconds , for 5 seconds and increasing their movement speed by 150% during the fear. +CreatureAI* GetAI_mob_coilfang_strider(Creature* pCreature) +{ + SimpleAI* ai = new SimpleAI (pCreature); + + ai->Spell[0].Enabled = true; + ai->Spell[0].Spell_Id = 41374; //Mind Blast + ai->Spell[0].Cooldown = 30000; + ai->Spell[0].CooldownRandomAddition = 10000; + ai->Spell[0].First_Cast = 8000; + ai->Spell[0].Cast_Target_Type = CAST_HOSTILE_TARGET; + + //Scream aura not implemented + + ai->EnterEvadeMode(); + + return ai; +} + +struct mob_shield_generator_channelAI : public ScriptedAI +{ + mob_shield_generator_channelAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + } + + ScriptedInstance *pInstance; + uint32 Check_Timer; + bool Casted; + void Reset() + { + Check_Timer = 0; + Casted = false; + me->SetDisplayId(11686); //invisible + + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + } + + void EnterCombat(Unit * /*who*/) {} + + void MoveInLineOfSight(Unit * /*who*/) {} + + void UpdateAI (const uint32 diff) + { + if (!pInstance) + return; + + if (Check_Timer <= diff) + { + Unit *Vashj = NULL; + Vashj = Unit::GetUnit((*me), pInstance->GetData64(DATA_LADYVASHJ)); + + if (Vashj && Vashj->isAlive()) + { + //start visual channel + if (!Casted || !Vashj->HasAura(SPELL_MAGIC_BARRIER)) + { + DoCast(Vashj, SPELL_MAGIC_BARRIER, true); + Casted = true; + } + } + Check_Timer = 1000; + } else Check_Timer -= diff; + } +}; + +bool ItemUse_item_tainted_core(Player* pPlayer, Item* /*_Item*/, SpellCastTargets const& targets) +{ + ScriptedInstance *pInstance = pPlayer->GetInstanceData(); + + if (!pInstance) + { + pPlayer->GetSession()->SendNotification(TEXT_NOT_INITIALIZED); + return true; + } + + Creature *Vashj = NULL; + Vashj = (Unit::GetCreature((*pPlayer), pInstance->GetData64(DATA_LADYVASHJ))); + if (Vashj && CAST_AI(boss_lady_vashjAI, Vashj->AI())->Phase == 2) + { + if (targets.getGOTarget() && targets.getGOTarget()->GetTypeId() == TYPEID_GAMEOBJECT) + { + uint32 identifier; + uint8 channel_identifier; + switch(targets.getGOTarget()->GetEntry()) + { + case 185052: + identifier = DATA_SHIELDGENERATOR1; + channel_identifier = 0; + break; + case 185053: + identifier = DATA_SHIELDGENERATOR2; + channel_identifier = 1; + break; + case 185051: + identifier = DATA_SHIELDGENERATOR3; + channel_identifier = 2; + break; + case 185054: + identifier = DATA_SHIELDGENERATOR4; + channel_identifier = 3; + break; + default: + return true; + } + + if (pInstance->GetData(identifier)) + { + pPlayer->GetSession()->SendNotification(TEXT_ALREADY_DEACTIVATED); + return true; + } + + //get and remove channel + Unit *Channel = NULL; + Channel = Unit::GetCreature(*Vashj, CAST_AI(boss_lady_vashjAI, Vashj->AI())->ShieldGeneratorChannel[channel_identifier]); + if (Channel) + { + //call Unsummon() + Channel->setDeathState(JUST_DIED); + } + + pInstance->SetData(identifier, 1); + + //remove this item + pPlayer->DestroyItemCount(31088, 1, true); + return true; + } + else if (targets.getUnitTarget()->GetTypeId() == TYPEID_UNIT) + return false; + else if (targets.getUnitTarget()->GetTypeId() == TYPEID_PLAYER) + { + pPlayer->DestroyItemCount(31088, 1, true); + pPlayer->CastSpell(targets.getUnitTarget(), 38134, true); + return true; + } + } + return true; +} + +CreatureAI* GetAI_boss_lady_vashj(Creature* pCreature) +{ + return new boss_lady_vashjAI (pCreature); +} + +CreatureAI* GetAI_mob_enchanted_elemental(Creature* pCreature) +{ + return new mob_enchanted_elementalAI (pCreature); +} + +CreatureAI* GetAI_mob_tainted_elemental(Creature* pCreature) +{ + return new mob_tainted_elementalAI (pCreature); +} + +CreatureAI* GetAI_mob_toxic_sporebat(Creature* pCreature) +{ + return new mob_toxic_sporebatAI (pCreature); +} + +CreatureAI* GetAI_mob_shield_generator_channel(Creature* pCreature) +{ + return new mob_shield_generator_channelAI (pCreature); +} + +void AddSC_boss_lady_vashj() +{ + Script *newscript; + newscript = new Script; + newscript->Name = "boss_lady_vashj"; + newscript->GetAI = &GetAI_boss_lady_vashj; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_enchanted_elemental"; + newscript->GetAI = &GetAI_mob_enchanted_elemental; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_tainted_elemental"; + newscript->GetAI = &GetAI_mob_tainted_elemental; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_toxic_sporebat"; + newscript->GetAI = &GetAI_mob_toxic_sporebat; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_coilfang_elite"; + newscript->GetAI = &GetAI_mob_coilfang_elite; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_coilfang_strider"; + newscript->GetAI = &GetAI_mob_coilfang_strider; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_shield_generator_channel"; + newscript->GetAI = &GetAI_mob_shield_generator_channel; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "item_tainted_core"; + newscript->pItemUse = &ItemUse_item_tainted_core; + newscript->RegisterSelf(); +} + diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp new file mode 100644 index 00000000000..61c9ed9d527 --- /dev/null +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp @@ -0,0 +1,787 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Boss_Leotheras_The_Blind +SD%Complete: 80 +SDComment: Possesion Support +SDCategory: Coilfang Resevoir, Serpent Shrine Cavern +EndScriptData */ + +#include "ScriptedPch.h" +#include "serpent_shrine.h" + +// --- Spells used by Leotheras The Blind +#define SPELL_WHIRLWIND 37640 +#define SPELL_CHAOS_BLAST 37674 +#define SPELL_BERSERK 26662 +#define SPELL_INSIDIOUS_WHISPER 37676 +#define SPELL_DUAL_WIELD 42459 + +// --- Spells used in banish phase --- +#define BANISH_BEAM 38909 +#define AURA_BANISH 37833 + +// --- Spells used by Greyheart Spellbinders +#define SPELL_EARTHSHOCK 39076 +#define SPELL_MINDBLAST 37531 + +// --- Spells used by Inner Demons and Creature ID +#define INNER_DEMON_ID 21857 +#define AURA_DEMONIC_ALIGNMENT 37713 +#define SPELL_SHADOWBOLT 39309 +#define SPELL_SOUL_LINK 38007 +#define SPELL_CONSUMING_MADNESS 37749 //not supported by core yet + +//Misc. +#define MODEL_DEMON 20125 +#define MODEL_NIGHTELF 20514 +#define DEMON_FORM 21875 +#define MOB_SPELLBINDER 21806 + +#define SAY_AGGRO -1548009 +#define SAY_SWITCH_TO_DEMON -1548010 +#define SAY_INNER_DEMONS -1548011 +#define SAY_DEMON_SLAY1 -1548012 +#define SAY_DEMON_SLAY2 -1548013 +#define SAY_DEMON_SLAY3 -1548014 +#define SAY_NIGHTELF_SLAY1 -1548015 +#define SAY_NIGHTELF_SLAY2 -1548016 +#define SAY_NIGHTELF_SLAY3 -1548017 +#define SAY_FINAL_FORM -1548018 +#define SAY_FREE -1548019 +#define SAY_DEATH -1548020 + +struct mob_inner_demonAI : public ScriptedAI +{ + mob_inner_demonAI(Creature *c) : ScriptedAI(c) + { + victimGUID = 0; + } + + uint32 ShadowBolt_Timer; + + uint32 Link_Timer; + uint64 victimGUID; + + void Reset() + { + ShadowBolt_Timer = 10000; + Link_Timer = 1000; + } + void JustDied(Unit * /*victim*/) + { + Unit* pUnit = Unit::GetUnit((*me),victimGUID); + if (pUnit && pUnit->HasAura(SPELL_INSIDIOUS_WHISPER)) + pUnit->RemoveAurasDueToSpell(SPELL_INSIDIOUS_WHISPER); + } + + void DamageTaken(Unit *done_by, uint32 &damage) + { + if (done_by->GetGUID() != victimGUID && done_by->GetGUID() != me->GetGUID()) + { + damage = 0; + DoModifyThreatPercent(done_by, -100); + } + } + + void EnterCombat(Unit * /*who*/) + { + if (!victimGUID) return; + } + + void UpdateAI(const uint32 diff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + if (me->getVictim()->GetGUID() != victimGUID) + { + DoModifyThreatPercent(me->getVictim(), -100); + Unit* owner = Unit::GetUnit((*me),victimGUID); + if (owner && owner->isAlive()) + { + me->AddThreat(owner,999999); + AttackStart(owner); + } else if (owner && owner->isDead()) + { + me->DealDamage(me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); + return; + } + } + + if (Link_Timer <= diff) + { + DoCast(me->getVictim(), SPELL_SOUL_LINK, true); + Link_Timer = 1000; + } else Link_Timer -= diff; + + if (!me->HasAura(AURA_DEMONIC_ALIGNMENT)) + DoCast(me, AURA_DEMONIC_ALIGNMENT, true); + + if (ShadowBolt_Timer <= diff) + { + DoCast(me->getVictim(), SPELL_SHADOWBOLT, false); + ShadowBolt_Timer = 10000; + } else ShadowBolt_Timer -= diff; + + DoMeleeAttackIfReady(); + } +}; +//Original Leotheras the Blind AI +struct boss_leotheras_the_blindAI : public ScriptedAI +{ + boss_leotheras_the_blindAI(Creature *c) : ScriptedAI(c) + { + c->GetPosition(x,y,z); + pInstance = c->GetInstanceData(); + Demon = 0; + + for (uint8 i = 0; i < 3; ++i)//clear guids + SpellBinderGUID[i] = 0; + } + + ScriptedInstance *pInstance; + + uint32 Whirlwind_Timer; + uint32 ChaosBlast_Timer; + uint32 SwitchToDemon_Timer; + uint32 SwitchToHuman_Timer; + uint32 Berserk_Timer; + uint32 InnerDemons_Timer; + uint32 BanishTimer; + + bool DealDamage; + bool NeedThreatReset; + bool DemonForm; + bool IsFinalForm; + bool EnrageUsed; + float x,y,z; + + uint64 InnderDemon[5]; + uint32 InnerDemon_Count; + uint64 Demon; + uint64 SpellBinderGUID[3]; + + void Reset() + { + CheckChannelers(); + BanishTimer = 1000; + Whirlwind_Timer = 15000; + ChaosBlast_Timer = 1000; + SwitchToDemon_Timer = 45000; + SwitchToHuman_Timer = 60000; + Berserk_Timer = 600000; + InnerDemons_Timer = 30000; + me->SetCanDualWield(true); + DealDamage = true; + DemonForm = false; + IsFinalForm = false; + NeedThreatReset = false; + EnrageUsed = false; + InnerDemon_Count = 0; + me->SetSpeed(MOVE_RUN, 2.0f, true); + me->SetDisplayId(MODEL_NIGHTELF); + me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID , 0); + me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID+1, 0); + DoCast(me, SPELL_DUAL_WIELD, true); + me->SetCorpseDelay(1000*60*60); + if (pInstance) + pInstance->SetData(DATA_LEOTHERASTHEBLINDEVENT, NOT_STARTED); + } + + void CheckChannelers(/*bool DoEvade = true*/) + { + for (uint8 i = 0; i < 3; ++i) + { + if (Creature *add = Unit::GetCreature(*me,SpellBinderGUID[i])) + add->DisappearAndDie(); + + float nx = x; + float ny = y; + float o = 2.4f; + if (i == 0) {nx += 10; ny -= 5; o=2.5f;} + if (i == 1) {nx -= 8; ny -= 7; o=0.9f;} + if (i == 2) {nx -= 3; ny += 9; o=5.0f;} + Creature* binder = me->SummonCreature(MOB_SPELLBINDER,nx,ny,z,o,TEMPSUMMON_DEAD_DESPAWN,0); + if (binder) + SpellBinderGUID[i] = binder->GetGUID(); + + } + } + void MoveInLineOfSight(Unit *who) + { + if (me->HasAura(AURA_BANISH)) + return; + + if (!me->getVictim() && who->isTargetableForAttack() && (me->IsHostileTo(who)) && who->isInAccessiblePlaceFor(me)) + { + if (me->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) + return; + + float attackRadius = me->GetAttackDistance(who); + if (me->IsWithinDistInMap(who, attackRadius)) + { + // Check first that object is in an angle in front of this one before LoS check + if (me->HasInArc(M_PI/2.0f, who) && me->IsWithinLOSInMap(who)) + { + AttackStart(who); + } + } + } + } + + void StartEvent() + { + DoScriptText(SAY_AGGRO, me); + if (pInstance) + pInstance->SetData(DATA_LEOTHERASTHEBLINDEVENT, IN_PROGRESS); + } + + void CheckBanish() + { + uint8 AliveChannelers = 0; + for (uint8 i = 0; i < 3; ++i) + { + Unit *add = Unit::GetUnit(*me,SpellBinderGUID[i]); + if (add && add->isAlive()) + ++AliveChannelers; + } + + // channelers == 0 remove banish aura + if (AliveChannelers == 0 && me->HasAura(AURA_BANISH)) + { + // removing banish aura + me->RemoveAurasDueToSpell(AURA_BANISH); + + // Leotheras is getting immune again + me->ApplySpellImmune(AURA_BANISH, IMMUNITY_MECHANIC, MECHANIC_BANISH, true); + + // changing model to bloodelf + me->SetDisplayId(MODEL_NIGHTELF); + + // and reseting equipment + me->LoadEquipment(me->GetEquipmentId()); + + if (pInstance && pInstance->GetData64(DATA_LEOTHERAS_EVENT_STARTER)) + { + Unit *victim = NULL; + victim = Unit::GetUnit(*me, pInstance->GetData64(DATA_LEOTHERAS_EVENT_STARTER)); + if (victim) + me->getThreatManager().addThreat(victim, 1); + StartEvent(); + } + } + else if (AliveChannelers != 0 && !me->HasAura(AURA_BANISH)) + { + // channelers != 0 apply banish aura + // removing Leotheras banish immune to apply AURA_BANISH + me->ApplySpellImmune(AURA_BANISH, IMMUNITY_MECHANIC, MECHANIC_BANISH, false); + DoCast(me, AURA_BANISH); + + // changing model + me->SetDisplayId(MODEL_DEMON); + + // and removing weapons + me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID , 0); + me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID+1, 0); + } + } + + //Despawn all Inner Demon summoned + void DespawnDemon() + { + for (uint8 i=0; i<5; ++i) + { + if (InnderDemon[i]) + { + //delete creature + Creature* pCreature = Unit::GetCreature((*me), InnderDemon[i]); + if (pCreature && pCreature->isAlive()) + { + pCreature->ForcedDespawn(); + } + InnderDemon[i] = 0; + } + } + + InnerDemon_Count = 0; + } + + void CastConsumingMadness() //remove this once SPELL_INSIDIOUS_WHISPER is supported by core + { + for (uint8 i=0; i<5; ++i) + { + if (InnderDemon[i] > 0) + { + Creature* pUnit = Unit::GetCreature((*me), InnderDemon[i]); + if (pUnit && pUnit->isAlive()) + { + Unit* pUnit_pTarget = Unit::GetUnit(*pUnit, CAST_AI(mob_inner_demonAI, pUnit->AI())->victimGUID); + if (pUnit_pTarget && pUnit_pTarget->isAlive()) + { + pUnit->CastSpell(pUnit_pTarget, SPELL_CONSUMING_MADNESS, true); + DoModifyThreatPercent(pUnit_pTarget, -100); + } + } + } + } + } + + void KilledUnit(Unit * victim) + { + if (victim->GetTypeId() != TYPEID_PLAYER) + return; + + if (DemonForm) + { + DoScriptText(RAND(SAY_DEMON_SLAY1,SAY_DEMON_SLAY2,SAY_DEMON_SLAY3), me); + } + else + { + DoScriptText(RAND(SAY_NIGHTELF_SLAY1,SAY_NIGHTELF_SLAY2,SAY_NIGHTELF_SLAY3), me); + } + } + + void JustDied(Unit * /*victim*/) + { + DoScriptText(SAY_DEATH, me); + + //despawn copy + if (Demon) + { + if (Creature* pDemon = Unit::GetCreature(*me, Demon)) + pDemon->ForcedDespawn(); + } + if (pInstance) + pInstance->SetData(DATA_LEOTHERASTHEBLINDEVENT, DONE); + } + + void EnterCombat(Unit * /*who*/) + { + if (me->HasAura(AURA_BANISH)) + return; + + me->LoadEquipment(me->GetEquipmentId()); + } + + void UpdateAI(const uint32 diff) + { + //Return since we have no target + if (me->HasAura(AURA_BANISH) || !UpdateVictim()) + { + if (BanishTimer <= diff) + { + CheckBanish();//no need to check every update tick + BanishTimer = 1000; + } else BanishTimer -= diff; + return; + } + if (me->HasAura(SPELL_WHIRLWIND)) + if (Whirlwind_Timer <= diff) + { + Unit *newTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); + if (newTarget) + { + DoResetThreat(); + me->GetMotionMaster()->Clear(); + me->GetMotionMaster()->MovePoint(0,newTarget->GetPositionX(),newTarget->GetPositionY(),newTarget->GetPositionZ()); + } + Whirlwind_Timer = 2000; + } else Whirlwind_Timer -= diff; + + // reseting after changing forms and after ending whirlwind + if (NeedThreatReset && !me->HasAura(SPELL_WHIRLWIND)) + { + // when changing forms seting timers (or when ending whirlwind - to avoid adding new variable i use Whirlwind_Timer to countdown 2s while whirlwinding) + if (DemonForm) + InnerDemons_Timer = 30000; + else + Whirlwind_Timer = 15000; + + NeedThreatReset = false; + DoResetThreat(); + me->GetMotionMaster()->Clear(); + me->GetMotionMaster()->MoveChase(me->getVictim()); + } + + //Enrage_Timer (10 min) + if (Berserk_Timer < diff && !EnrageUsed) + { + me->InterruptNonMeleeSpells(false); + DoCast(me, SPELL_BERSERK); + EnrageUsed = true; + } else Berserk_Timer -= diff; + + if (!DemonForm) + { + //Whirldind Timer + if (!me->HasAura(SPELL_WHIRLWIND)) + { + if (Whirlwind_Timer <= diff) + { + DoCast(me, SPELL_WHIRLWIND); + // while whirlwinding this variable is used to countdown target's change + Whirlwind_Timer = 2000; + NeedThreatReset = true; + } else Whirlwind_Timer -= diff; + } + //Switch_Timer + + if (!IsFinalForm) + if (SwitchToDemon_Timer <= diff) + { + //switch to demon form + me->RemoveAurasDueToSpell(SPELL_WHIRLWIND,0); + me->SetDisplayId(MODEL_DEMON); + DoScriptText(SAY_SWITCH_TO_DEMON, me); + me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID , 0); + me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID+1, 0); + DemonForm = true; + NeedThreatReset = true; + SwitchToDemon_Timer = 45000; + } else SwitchToDemon_Timer -= diff; + DoMeleeAttackIfReady(); + } + else + { + //ChaosBlast_Timer + if (!me->getVictim()) + return; + if (me->IsWithinDist(me->getVictim(), 30)) + me->StopMoving(); + if (ChaosBlast_Timer <= diff) + { + // will cast only when in range of spell + if (me->IsWithinDist(me->getVictim(), 30)) + { + //DoCast(me->getVictim(), SPELL_CHAOS_BLAST, true); + int damage = 100; + me->CastCustomSpell(me->getVictim(), SPELL_CHAOS_BLAST, &damage, NULL, NULL, false, NULL, NULL, me->GetGUID()); + } + ChaosBlast_Timer = 3000; + } else ChaosBlast_Timer -= diff; + //Summon Inner Demon + if (InnerDemons_Timer <= diff) + { + std::list& ThreatList = me->getThreatManager().getThreatList(); + std::vector TargetList; + for (std::list::const_iterator itr = ThreatList.begin(); itr != ThreatList.end(); ++itr) + { + Unit *tempTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid()); + if (tempTarget && tempTarget->GetTypeId() == TYPEID_PLAYER && tempTarget->GetGUID() != me->getVictim()->GetGUID() && TargetList.size()<5) + TargetList.push_back(tempTarget); + } + //SpellEntry *spell = GET_SPELL(SPELL_INSIDIOUS_WHISPER); + for (std::vector::const_iterator itr = TargetList.begin(); itr != TargetList.end(); ++itr) + { + if ((*itr) && (*itr)->isAlive()) + { + Creature * demon = me->SummonCreature(INNER_DEMON_ID, (*itr)->GetPositionX()+10, (*itr)->GetPositionY()+10, (*itr)->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + if (demon) + { + demon->AI()->AttackStart((*itr)); + CAST_AI(mob_inner_demonAI, demon->AI())->victimGUID = (*itr)->GetGUID(); + + (*itr)->AddAura(SPELL_INSIDIOUS_WHISPER, *itr); + + if (InnerDemon_Count > 4) + InnerDemon_Count = 0; + + //Safe storing of creatures + InnderDemon[InnerDemon_Count] = demon->GetGUID(); + + //Update demon count + ++InnerDemon_Count; + } + } + } + DoScriptText(SAY_INNER_DEMONS, me); + + InnerDemons_Timer = 999999; + } else InnerDemons_Timer -= diff; + + //Switch_Timer + if (SwitchToHuman_Timer <= diff) + { + //switch to nightelf form + me->SetDisplayId(MODEL_NIGHTELF); + me->LoadEquipment(me->GetEquipmentId()); + + CastConsumingMadness(); + DespawnDemon(); + + DemonForm = false; + NeedThreatReset = true; + + SwitchToHuman_Timer = 60000; + } else SwitchToHuman_Timer -= diff; + } + + if (!IsFinalForm && (me->GetHealth()*100 / me->GetMaxHealth()) < 15) + { + //at this point he divides himself in two parts + CastConsumingMadness(); + DespawnDemon(); + Creature *Copy = NULL; + Copy = DoSpawnCreature(DEMON_FORM, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 6000); + if (Copy) + { + Demon = Copy->GetGUID(); + if (me->getVictim()) + Copy->AI()->AttackStart(me->getVictim()); + } + //set nightelf final form + IsFinalForm = true; + DemonForm = false; + + DoScriptText(SAY_FINAL_FORM, me); + me->SetDisplayId(MODEL_NIGHTELF); + me->LoadEquipment(me->GetEquipmentId()); + } + } +}; + +//Leotheras the Blind Demon Form AI +struct boss_leotheras_the_blind_demonformAI : public ScriptedAI +{ + boss_leotheras_the_blind_demonformAI(Creature *c) : ScriptedAI(c) {} + + uint32 ChaosBlast_Timer; + bool DealDamage; + + void Reset() + { + ChaosBlast_Timer = 1000; + DealDamage = true; + } + + void StartEvent() + { + DoScriptText(SAY_FREE, me); + } + + void KilledUnit(Unit * victim) + { + if (victim->GetTypeId() != TYPEID_PLAYER) + return; + + DoScriptText(RAND(SAY_DEMON_SLAY1,SAY_DEMON_SLAY2,SAY_DEMON_SLAY3), me); + } + + void JustDied(Unit * /*victim*/) + { + //invisibility (blizzlike, at the end of the fight he doesn't die, he disappears) + DoCast(me, 8149, true); + } + + void EnterCombat(Unit * /*who*/) + { + StartEvent(); + } + + void UpdateAI(const uint32 diff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + //ChaosBlast_Timer + if (me->IsWithinDist(me->getVictim(), 30)) + me->StopMoving(); + + if (ChaosBlast_Timer <= diff) + { + // will cast only when in range od spell + if (me->IsWithinDist(me->getVictim(), 30)) + { + //DoCast(me->getVictim(), SPELL_CHAOS_BLAST, true); + int damage = 100; + me->CastCustomSpell(me->getVictim(), SPELL_CHAOS_BLAST, &damage, NULL, NULL, false, NULL, NULL, me->GetGUID()); + ChaosBlast_Timer = 3000; + } + } else ChaosBlast_Timer -= diff; + + //Do NOT deal any melee damage to the target. + } +}; +struct mob_greyheart_spellbinderAI : public ScriptedAI +{ + mob_greyheart_spellbinderAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + leotherasGUID = 0; + AddedBanish = false; + } + + ScriptedInstance *pInstance; + + uint64 leotherasGUID; + + uint32 Mindblast_Timer; + uint32 Earthshock_Timer; + + bool AddedBanish; + + void Reset() + { + Mindblast_Timer = 3000 + rand()%5000; + Earthshock_Timer = 5000 + rand()%5000; + + if (pInstance) + { + pInstance->SetData64(DATA_LEOTHERAS_EVENT_STARTER, 0); + Creature *leotheras = Unit::GetCreature(*me, leotherasGUID); + if (leotheras && leotheras->isAlive()) + CAST_AI(boss_leotheras_the_blindAI, leotheras->AI())->CheckChannelers(/*false*/); + } + } + + void EnterCombat(Unit * who) + { + me->InterruptNonMeleeSpells(false); + if (pInstance) + pInstance->SetData64(DATA_LEOTHERAS_EVENT_STARTER, who->GetGUID()); + } + + void JustRespawned() + { + AddedBanish = false; + Reset(); + } + + void CastChanneling() + { + if (!me->isInCombat() && !me->GetCurrentSpell(CURRENT_CHANNELED_SPELL)) + { + if (leotherasGUID) + { + Creature *leotheras = Unit::GetCreature(*me, leotherasGUID); + if (leotheras && leotheras->isAlive()) + DoCast(leotheras, BANISH_BEAM); + } + } + } + + void UpdateAI(const uint32 diff) + { + if (pInstance) + { + if (!leotherasGUID) + leotherasGUID = pInstance->GetData64(DATA_LEOTHERAS); + + if (!me->isInCombat() && pInstance->GetData64(DATA_LEOTHERAS_EVENT_STARTER)) + { + Unit *victim = NULL; + victim = Unit::GetUnit(*me, pInstance->GetData64(DATA_LEOTHERAS_EVENT_STARTER)); + if (victim) + AttackStart(victim); + } + } + + if (!UpdateVictim()) + { + CastChanneling(); + return; + } + + if (pInstance && !pInstance->GetData64(DATA_LEOTHERAS_EVENT_STARTER)) + { + EnterEvadeMode(); + return; + } + + if (Mindblast_Timer <= diff) + { + Unit *pTarget = NULL; + pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); + + if (pTarget)DoCast(pTarget, SPELL_MINDBLAST); + + Mindblast_Timer = 10000 + rand()%5000; + } else Mindblast_Timer -= diff; + + if (Earthshock_Timer <= diff) + { + Map* pMap = me->GetMap(); + Map::PlayerList const &PlayerList = pMap->GetPlayers(); + for (Map::PlayerList::const_iterator itr = PlayerList.begin(); itr != PlayerList.end(); ++itr) + { + if (Player* i_pl = itr->getSource()) + { + bool isCasting = false; + for (uint8 i = 0; i < CURRENT_MAX_SPELL; ++i) + if (i_pl->GetCurrentSpell(i)) + isCasting = true; + + if (isCasting) + { + DoCast(i_pl, SPELL_EARTHSHOCK); + break; + } + } + } + Earthshock_Timer = 8000 + rand()%7000; + } else Earthshock_Timer -= diff; + DoMeleeAttackIfReady(); + } + + void JustDied(Unit * /*killer*/) {} +}; +CreatureAI* GetAI_boss_leotheras_the_blind(Creature* pCreature) +{ + return new boss_leotheras_the_blindAI (pCreature); +} + +CreatureAI* GetAI_boss_leotheras_the_blind_demonform(Creature* pCreature) +{ + return new boss_leotheras_the_blind_demonformAI (pCreature); +} + +CreatureAI* GetAI_mob_greyheart_spellbinder(Creature* pCreature) +{ + return new mob_greyheart_spellbinderAI (pCreature); +} + +CreatureAI* GetAI_mob_inner_demon(Creature* pCreature) +{ + return new mob_inner_demonAI (pCreature); +} +void AddSC_boss_leotheras_the_blind() +{ + Script *newscript; + + newscript = new Script; + newscript->Name = "boss_leotheras_the_blind"; + newscript->GetAI = &GetAI_boss_leotheras_the_blind; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "boss_leotheras_the_blind_demonform"; + newscript->GetAI = &GetAI_boss_leotheras_the_blind_demonform; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_greyheart_spellbinder"; + newscript->GetAI = &GetAI_mob_greyheart_spellbinder; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_inner_demon"; + newscript->GetAI = &GetAI_mob_inner_demon; + newscript->RegisterSelf(); +} + diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp new file mode 100644 index 00000000000..b1c0c10bcce --- /dev/null +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp @@ -0,0 +1,458 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: boss_the_lurker_below +SD%Complete: 80 +SDComment: Coilfang Frenzy, find out how could we fishing in the strangepool +SDCategory: The Lurker Below +EndScriptData */ + +#include "ScriptedPch.h" +#include "serpent_shrine.h" +#include "ScriptedSimpleAI.h" +#include "Spell.h" + +#define SPELL_SPOUT 37433 +#define SPELL_SPOUT_ANIM 42835 +#define SPELL_SPOUT_BREATH 37431 +#define SPELL_KNOCKBACK 19813 +#define SPELL_GEYSER 37478 +#define SPELL_WHIRL 37660 +#define SPELL_WATERBOLT 37138 +#define SPELL_SUBMERGE 37550 +#define SPELL_EMERGE 20568 + +#define EMOTE_SPOUT "The Lurker Below takes a deep breath." + +#define SPOUT_DIST 100 + +#define MOB_COILFANG_GUARDIAN 21873 +#define MOB_COILFANG_AMBUSHER 21865 + +//Ambusher spells +#define SPELL_SPREAD_SHOT 37790 +#define SPELL_SHOOT 37770 + +//Guardian spells +#define SPELL_ARCINGSMASH 38761 // Wrong SpellId. Can't find the right one. +#define SPELL_HAMSTRING 26211 + +float AddPos[9][3] = +{ + {2.8553810, -459.823914, -19.182686}, //MOVE_AMBUSHER_1 X, Y, Z + {12.400000, -466.042267, -19.182686}, //MOVE_AMBUSHER_2 X, Y, Z + {51.366653, -460.836060, -19.182686}, //MOVE_AMBUSHER_3 X, Y, Z + {62.597980, -457.433044, -19.182686}, //MOVE_AMBUSHER_4 X, Y, Z + {77.607452, -384.302765, -19.182686}, //MOVE_AMBUSHER_5 X, Y, Z + {63.897900, -378.984924, -19.182686}, //MOVE_AMBUSHER_6 X, Y, Z + {34.447250, -387.333618, -19.182686}, //MOVE_GUARDIAN_1 X, Y, Z + {14.388216, -423.468018, -19.625271}, //MOVE_GUARDIAN_2 X, Y, Z + {42.471519, -445.115295, -19.769423} //MOVE_GUARDIAN_3 X, Y, Z +}; + +struct boss_the_lurker_belowAI : public Scripted_NoMovementAI +{ + boss_the_lurker_belowAI(Creature *c) : Scripted_NoMovementAI(c), Summons(me) + { + pInstance = c->GetInstanceData(); + SpellEntry *TempSpell = GET_SPELL(SPELL_SPOUT_ANIM); + if (TempSpell) + { + TempSpell->Effect[0] = 0;//remove all spell effect, only anim is needed + TempSpell->Effect[1] = 0; + TempSpell->Effect[2] = 0; + } + } + + ScriptedInstance* pInstance; + SummonList Summons; + + bool Spawned; + bool Submerged; + bool InRange; + bool CanStartEvent; + uint32 RotTimer; + uint32 SpoutAnimTimer; + uint32 WaterboltTimer; + uint32 SpoutTimer; + uint32 WhirlTimer; + uint32 PhaseTimer; + uint32 GeyserTimer; + uint32 CheckTimer; + uint32 WaitTimer; + uint32 WaitTimer2; + + bool CheckCanStart()//check if players fished + { + if (pInstance && pInstance->GetData(DATA_STRANGE_POOL) == NOT_STARTED) + return false; + return true; + } + void Reset() + { + me->AddUnitMovementFlag(MOVEMENTFLAG_SWIMMING | MOVEMENTFLAG_LEVITATING); + SpoutAnimTimer = 1000; + RotTimer = 0; + WaterboltTimer = 15000;//give time to get in range when fight starts + SpoutTimer = 45000; + WhirlTimer = 18000;//after avery spout + PhaseTimer = 120000; + GeyserTimer = rand()%5000 + 15000; + CheckTimer = 15000;//give time to get in range when fight starts + WaitTimer = 60000;//never reached + WaitTimer2 = 60000;//never reached + + Submerged = true;//will be false at combat start + Spawned = false; + InRange = false; + CanStartEvent = false; + + Summons.DespawnAll(); + + if (pInstance) + { + pInstance->SetData(DATA_THELURKERBELOWEVENT, NOT_STARTED); + pInstance->SetData(DATA_STRANGE_POOL, NOT_STARTED); + } + DoCast(me, SPELL_SUBMERGE);//submerge anim + me->SetVisibility(VISIBILITY_OFF);//we start invis under water, submerged + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); + } + + void JustDied(Unit* /*Killer*/) + { + if (pInstance) + pInstance->SetData(DATA_THELURKERBELOWEVENT, DONE); + + Summons.DespawnAll(); + } + + void EnterCombat(Unit * who) + { + if (pInstance) + pInstance->SetData(DATA_THELURKERBELOWEVENT, IN_PROGRESS); + Scripted_NoMovementAI::EnterCombat(who); + } + + void MoveInLineOfSight(Unit *who) + { + if (!CanStartEvent)//boss is invisible, don't attack + return; + if (!me->getVictim() && who->isTargetableForAttack() && (me->IsHostileTo(who))) + { + float attackRadius = me->GetAttackDistance(who); + if (me->IsWithinDistInMap(who, attackRadius)) + { + AttackStart(who); + } + } + } + + void MovementInform(uint32 type, uint32 /*id*/) + { + if (type == ROTATE_MOTION_TYPE) + me->SetReactState(REACT_AGGRESSIVE); + } + + void UpdateAI(const uint32 diff) + { + if (!CanStartEvent)//boss is invisible, don't attack + { + if (CheckCanStart()) + { + if (Submerged) + { + me->SetVisibility(VISIBILITY_ON); + Submerged = false; + WaitTimer2 = 500; + } + if (!Submerged && WaitTimer2 <= diff)//wait 500ms before emerge anim + { + me->RemoveAllAuras(); + me->RemoveFlag(UNIT_NPC_EMOTESTATE,EMOTE_STATE_SUBMERGED); + DoCast(me, SPELL_EMERGE, false); + WaitTimer2 = 60000;//never reached + WaitTimer = 3000; + } else WaitTimer2 -= diff; + + if (WaitTimer <= diff)//wait 3secs for emerge anim, then attack + { + WaitTimer = 3000; + CanStartEvent=true;//fresh fished from pool + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + } else WaitTimer -= diff; + } + return; + } + + if (me->getThreatManager().getThreatList().empty())//check if should evade + { + if (me->isInCombat()) + EnterEvadeMode(); + return; + } + if (!Submerged) + { + if (PhaseTimer <= diff) + { + me->InterruptNonMeleeSpells(false); + DoCast(me, SPELL_SUBMERGE); + PhaseTimer = 60000;//60secs submerged + Submerged = true; + } else PhaseTimer-=diff; + + if (SpoutTimer <= diff) + { + me->MonsterTextEmote(EMOTE_SPOUT,0,true); + me->SetReactState(REACT_PASSIVE); + me->GetMotionMaster()->MoveRotate(20000, rand()%2 ? ROTATE_DIRECTION_LEFT : ROTATE_DIRECTION_RIGHT); + SpoutTimer = 45000; + WhirlTimer = 20000;//whirl directly after spout + RotTimer = 20000; + return; + } else SpoutTimer -= diff; + + //Whirl directly after a Spout and at random times + if (WhirlTimer <= diff) + { + WhirlTimer = 18000; + DoCast(me, SPELL_WHIRL); + } else WhirlTimer -= diff; + + if (CheckTimer <= diff)//check if there are players in melee range + { + InRange = false; + Map* pMap = me->GetMap(); + Map::PlayerList const &PlayerList = pMap->GetPlayers(); + if (!PlayerList.isEmpty()) + { + for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) + { + if (me->IsWithinMeleeRange(i->getSource())) + InRange = true; + } + } + CheckTimer = 2000; + } else CheckTimer -= diff; + + if (RotTimer) + { + Map* pMap = me->GetMap(); + if (pMap->IsDungeon()) + { + Map::PlayerList const &PlayerList = pMap->GetPlayers(); + for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) + { + if (i->getSource() && i->getSource()->isAlive() && me->HasInArc((double)diff/20000*(double)M_PI*2,i->getSource()) && me->IsWithinDist(i->getSource(), SPOUT_DIST) && !i->getSource()->IsInWater()) + DoCast(i->getSource(), SPELL_SPOUT, true);//only knock back palyers in arc, in 100yards, not in water + } + } + + if (SpoutAnimTimer <= diff) + { + DoCast(me, SPELL_SPOUT_ANIM, true); + SpoutAnimTimer = 1000; + } else SpoutAnimTimer -= diff; + + if (RotTimer <= diff) + { + RotTimer = 0; + } else RotTimer -= diff; + return; + } + + if (GeyserTimer <= diff) + { + Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,1); + if (!pTarget && me->getVictim()) + pTarget = me->getVictim(); + if (pTarget) + DoCast(pTarget, SPELL_GEYSER, true); + GeyserTimer = rand()%5000 + 15000; + } else GeyserTimer -= diff; + + if (!InRange)//if on players in melee range cast Waterbolt + { + if (WaterboltTimer <= diff) + { + Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); + if (!pTarget && me->getVictim()) + pTarget = me->getVictim(); + if (pTarget) + DoCast(pTarget, SPELL_WATERBOLT, true); + WaterboltTimer = 3000; + } else WaterboltTimer -= diff; + } + + if (!UpdateCombatState()) + return; + + DoMeleeAttackIfReady(); + + }else//submerged + { + if (PhaseTimer <= diff) + { + Submerged = false; + me->InterruptNonMeleeSpells(false);//shouldn't be any + me->RemoveAllAuras(); + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); + me->RemoveFlag(UNIT_NPC_EMOTESTATE,EMOTE_STATE_SUBMERGED); + DoCast(me, SPELL_EMERGE, true); + Spawned = false; + SpoutTimer = 3000; // directly cast Spout after emerging! + PhaseTimer = 120000; + return; + } else PhaseTimer-=diff; + + if (me->getThreatManager().getThreatList().empty())//check if should evade + { + EnterEvadeMode(); + return; + } + if (!me->isInCombat()) + DoZoneInCombat(); + + if (!Spawned) + { + me->SetUInt32Value(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); + //spawn adds + for (uint8 i = 0; i < 9; ++i) + { + Creature* Summoned; + if (i < 6) + Summoned = me->SummonCreature(MOB_COILFANG_AMBUSHER,AddPos[i][0],AddPos[i][1],AddPos[i][2], 0, TEMPSUMMON_CORPSE_DESPAWN, 0); + else Summoned = me->SummonCreature(MOB_COILFANG_GUARDIAN,AddPos[i][0],AddPos[i][1],AddPos[i][2], 0, TEMPSUMMON_CORPSE_DESPAWN, 0); + + if (Summoned) + Summons.Summon(Summoned); + } + Spawned = true; + } + } + } + }; + +CreatureAI* GetAI_mob_coilfang_guardian(Creature* pCreature) +{ + SimpleAI* ai = new SimpleAI (pCreature); + + ai->Spell[0].Enabled = true; + ai->Spell[0].Spell_Id = SPELL_ARCINGSMASH; + ai->Spell[0].Cooldown = 15000; + ai->Spell[0].First_Cast = 5000; + ai->Spell[0].Cast_Target_Type = CAST_HOSTILE_TARGET; + + ai->Spell[1].Enabled = true; + ai->Spell[1].Spell_Id = SPELL_HAMSTRING; + ai->Spell[1].Cooldown = 10000; + ai->Spell[1].First_Cast = 2000; + ai->Spell[1].Cast_Target_Type = CAST_HOSTILE_TARGET; + + return ai; +} + +struct mob_coilfang_ambusherAI : public Scripted_NoMovementAI +{ + mob_coilfang_ambusherAI(Creature *c) : Scripted_NoMovementAI(c) + { + SpellEntry *TempSpell = GET_SPELL(SPELL_SHOOT); + if (TempSpell) + TempSpell->Effect[0] = 2;//change spell effect from weapon % dmg to simple phisical dmg + } + + uint32 MultiShotTimer; + uint32 ShootBowTimer; + + void Reset() + { + MultiShotTimer = 10000; + ShootBowTimer = 4000; + + } + + void EnterCombat(Unit * /*who*/) + { + + } + + void MoveInLineOfSight(Unit *who) + { + if (!who || me->getVictim()) return; + + if (who->isTargetableForAttack() && who->isInAccessiblePlaceFor(me) && me->IsHostileTo(who) && me->IsWithinDistInMap(who, 45)) + { + AttackStart(who); + } + } + + void UpdateAI(const uint32 diff) + { + if (MultiShotTimer <= diff) + { + if (me->getVictim()) + DoCast(me->getVictim(), SPELL_SPREAD_SHOT, true); + + MultiShotTimer = 10000+rand()%10000; + ShootBowTimer += 1500;//add global cooldown + } else MultiShotTimer -= diff; + + if (ShootBowTimer <= diff) + { + Unit *pTarget = NULL; + pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); + int bp0 = 1100; + if (pTarget) + me->CastCustomSpell(pTarget,SPELL_SHOOT,&bp0,NULL,NULL,true); + ShootBowTimer = 4000+rand()%5000; + MultiShotTimer += 1500;//add global cooldown + } else ShootBowTimer -= diff; + } +}; + +CreatureAI* GetAI_mob_coilfang_ambusher(Creature* pCreature) +{ + return new mob_coilfang_ambusherAI (pCreature); +} + +CreatureAI* GetAI_boss_the_lurker_below(Creature* pCreature) +{ + return new boss_the_lurker_belowAI (pCreature); +} + +void AddSC_boss_the_lurker_below() +{ + Script *newscript; + newscript = new Script; + newscript->Name = "boss_the_lurker_below"; + newscript->GetAI = &GetAI_boss_the_lurker_below; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_coilfang_guardian"; + newscript->GetAI = &GetAI_mob_coilfang_guardian; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_coilfang_ambusher"; + newscript->GetAI = &GetAI_mob_coilfang_ambusher; + newscript->RegisterSelf(); +} + + diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp new file mode 100644 index 00000000000..14c87aee141 --- /dev/null +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp @@ -0,0 +1,369 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +/* ScriptData +SDName: Boss_Morogrim_Tidewalker +SD%Complete: 90 +SDComment: Water globules don't explode properly, remove hacks +SDCategory: Coilfang Resevoir, Serpent Shrine Cavern +EndScriptData */ + +#include "ScriptedPch.h" +#include "serpent_shrine.h" + +#define SAY_AGGRO -1548030 +#define SAY_SUMMON1 -1548031 +#define SAY_SUMMON2 -1548032 +#define SAY_SUMMON_BUBL1 -1548033 +#define SAY_SUMMON_BUBL2 -1548034 +#define SAY_SLAY1 -1548035 +#define SAY_SLAY2 -1548036 +#define SAY_SLAY3 -1548037 +#define SAY_DEATH -1548038 +#define EMOTE_WATERY_GRAVE -1548039 +#define EMOTE_EARTHQUAKE -1548040 +#define EMOTE_WATERY_GLOBULES -1548041 + +#define SPELL_TIDAL_WAVE 37730 +#define SPELL_WATERY_GRAVE 38049 +#define SPELL_EARTHQUAKE 37764 +#define SPELL_WATERY_GRAVE_EXPLOSION 37852 + +#define WATERY_GRAVE_X1 334.64 +#define WATERY_GRAVE_Y1 -728.89 +#define WATERY_GRAVE_Z1 -14.42 +#define WATERY_GRAVE_X2 365.51 +#define WATERY_GRAVE_Y2 -737.14 +#define WATERY_GRAVE_Z2 -14.44 +#define WATERY_GRAVE_X3 366.19 +#define WATERY_GRAVE_Y3 -709.59 +#define WATERY_GRAVE_Z3 -14.36 +#define WATERY_GRAVE_X4 372.93 +#define WATERY_GRAVE_Y4 -690.96 +#define WATERY_GRAVE_Z4 -14.44 + +#define SPELL_WATERY_GRAVE_1 38023 +#define SPELL_WATERY_GRAVE_2 38024 +#define SPELL_WATERY_GRAVE_3 38025 +#define SPELL_WATERY_GRAVE_4 37850 + +#define SPELL_SUMMON_WATER_GLOBULE_1 37854 +#define SPELL_SUMMON_WATER_GLOBULE_2 37858 +#define SPELL_SUMMON_WATER_GLOBULE_3 37860 +#define SPELL_SUMMON_WATER_GLOBULE_4 37861 + +/*#define SPELL_SUMMON_MURLOC_A6 39813 +#define SPELL_SUMMON_MURLOC_A7 39814 +#define SPELL_SUMMON_MURLOC_A8 39815 +#define SPELL_SUMMON_MURLOC_A9 39816 +#define SPELL_SUMMON_MURLOC_A10 39817 + +#define SPELL_SUMMON_MURLOC_B6 39818 +#define SPELL_SUMMON_MURLOC_B7 39819 +#define SPELL_SUMMON_MURLOC_B8 39820 +#define SPELL_SUMMON_MURLOC_B9 39821 +#define SPELL_SUMMON_MURLOC_B10 39822*/ + +float MurlocCords[10][5] = +{ + {21920, 424.36, -715.4, -7.14, 0.124}, + {21920, 425.13, -719.3, -7.14, 0.124}, + {21920, 425.05, -724.23, -7.14, 0.124}, + {21920, 424.91, -728.68, -7.14, 0.124}, + {21920, 424.84, -732.18, -7.14, 0.124}, + {21920, 321.05, -734.2, -13.15, 0.124}, + {21920, 321.05, -729.4, -13.15, 0.124}, + {21920, 321.05, -724.03, -13.15, 0.124}, + {21920, 321.05, -718.73, -13.15, 0.124}, + {21920, 321.05, -714.24, -13.15, 0.124} +}; + +//Creatures +#define WATER_GLOBULE 21913 +#define TIDEWALKER_LURKER 21920 + +//Morogrim Tidewalker AI +struct boss_morogrim_tidewalkerAI : public ScriptedAI +{ + boss_morogrim_tidewalkerAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + } + + ScriptedInstance* pInstance; + + Map::PlayerList const *PlayerList; + + uint32 TidalWave_Timer; + uint32 WateryGrave_Timer; + uint32 Earthquake_Timer; + uint32 WateryGlobules_Timer; + uint32 globulespell[4]; + int8 Playercount; + int8 counter; + + bool Earthquake; + bool Phase2; + + void Reset() + { + TidalWave_Timer = 10000; + WateryGrave_Timer = 30000; + Earthquake_Timer = 40000; + WateryGlobules_Timer = 0; + globulespell[0] = SPELL_SUMMON_WATER_GLOBULE_1; + globulespell[1] = SPELL_SUMMON_WATER_GLOBULE_2; + globulespell[2] = SPELL_SUMMON_WATER_GLOBULE_3; + globulespell[3] = SPELL_SUMMON_WATER_GLOBULE_4; + + Earthquake = false; + Phase2 = false; + + if (pInstance) + pInstance->SetData(DATA_MOROGRIMTIDEWALKEREVENT, NOT_STARTED); + } + + void StartEvent() + { + DoScriptText(SAY_AGGRO, me); + + if (pInstance) + pInstance->SetData(DATA_MOROGRIMTIDEWALKEREVENT, IN_PROGRESS); + } + + void KilledUnit(Unit * /*victim*/) + { + DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2,SAY_SLAY3), me); + } + + void JustDied(Unit * /*victim*/) + { + DoScriptText(SAY_DEATH, me); + + if (pInstance) + pInstance->SetData(DATA_MOROGRIMTIDEWALKEREVENT, DONE); + } + + void EnterCombat(Unit * /*who*/) + { + PlayerList = &me->GetMap()->GetPlayers(); + Playercount = PlayerList->getSize(); + StartEvent(); + } + + void ApplyWateryGrave(Unit* pPlayer, uint8 i) + { + switch(i) + { + case 0: pPlayer->CastSpell(pPlayer, SPELL_WATERY_GRAVE_1, true); break; + case 1: pPlayer->CastSpell(pPlayer, SPELL_WATERY_GRAVE_2, true); break; + case 2: pPlayer->CastSpell(pPlayer, SPELL_WATERY_GRAVE_3, true); break; + case 3: pPlayer->CastSpell(pPlayer, SPELL_WATERY_GRAVE_4, true); break; + } + } + + void UpdateAI(const uint32 diff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + //Earthquake_Timer + if (Earthquake_Timer <= diff) + { + if (!Earthquake) + { + DoCast(me->getVictim(), SPELL_EARTHQUAKE); + Earthquake = true; + Earthquake_Timer = 10000; + } + else + { + DoScriptText(RAND(SAY_SUMMON1,SAY_SUMMON2), me); + + for (uint8 i = 0; i < 10; ++i) + { + Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); + Creature* Murloc = me->SummonCreature(MurlocCords[i][0],MurlocCords[i][1],MurlocCords[i][2],MurlocCords[i][3],MurlocCords[i][4], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); + if (pTarget && Murloc) + Murloc->AI()->AttackStart(pTarget); + } + DoScriptText(EMOTE_EARTHQUAKE, me); + Earthquake = false; + Earthquake_Timer = 40000+rand()%5000; + } + } else Earthquake_Timer -= diff; + + //TidalWave_Timer + if (TidalWave_Timer <= diff) + { + DoCast(me->getVictim(), SPELL_TIDAL_WAVE); + TidalWave_Timer = 20000; + } else TidalWave_Timer -= diff; + + if (!Phase2) + { + //WateryGrave_Timer + if (WateryGrave_Timer <= diff) + { + //Teleport 4 players under the waterfalls + Unit *pTarget; + using std::set; + setlist; + set::const_iterator itr; + for (uint8 i = 0; i < 4; ++i) + { + counter = 0; + do + { + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 50, true); //target players only + if (counter < Playercount) + break; + if (pTarget) + itr = list.find(pTarget->GetGUID()); + ++counter; + } while (itr != list.end()); + + if (pTarget) + { + list.insert(pTarget->GetGUID()); + ApplyWateryGrave(pTarget, i); + } + } + + DoScriptText(RAND(SAY_SUMMON_BUBL1,SAY_SUMMON_BUBL2), me); + + DoScriptText(EMOTE_WATERY_GRAVE, me); + WateryGrave_Timer = 30000; + } else WateryGrave_Timer -= diff; + + //Start Phase2 + if ((me->GetHealth()*100 / me->GetMaxHealth()) < 25) + Phase2 = true; + } + else + { + //WateryGlobules_Timer + if (WateryGlobules_Timer <= diff) + { + Unit* pGlobuleTarget; + using std::set; + setglobulelist; + set::const_iterator itr; + for (uint8 g = 0; g < 4; g++) //one unit can't cast more than one spell per update, so some players have to cast for us XD + { + counter = 0; + do { + pGlobuleTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 50, true); + if (pGlobuleTarget) + itr = globulelist.find(pGlobuleTarget->GetGUID()); + if (counter > Playercount) + break; + ++counter; + } while (itr != globulelist.end()); + if (pGlobuleTarget) + globulelist.insert(pGlobuleTarget->GetGUID()); + pGlobuleTarget->CastSpell(pGlobuleTarget, globulespell[g], true); + } + DoScriptText(EMOTE_WATERY_GLOBULES, me); + WateryGlobules_Timer = 25000; + } else WateryGlobules_Timer -= diff; + } + + DoMeleeAttackIfReady(); + } +}; + +//Water Globule AI +#define SPELL_GLOBULE_EXPLOSION 37871 + +struct mob_water_globuleAI : public ScriptedAI +{ + mob_water_globuleAI(Creature *c) : ScriptedAI(c) {} + + uint32 Check_Timer; + + void Reset() + { + Check_Timer = 1000; + + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + me->setFaction(14); + } + + void EnterCombat(Unit * /*who*/) {} + + void MoveInLineOfSight(Unit *who) + { + if (!who || me->getVictim()) + return; + + if (who->isTargetableForAttack() && who->isInAccessiblePlaceFor(me) && me->IsHostileTo(who)) + { + //no attack radius check - it attacks the first target that moves in his los + //who->RemoveSpellsCausingAura(SPELL_AURA_MOD_STEALTH); + AttackStart(who); + } + } + + void UpdateAI(const uint32 diff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + if (Check_Timer <= diff) + { + if (me->IsWithinDistInMap(me->getVictim(), 5)) + { + DoCast(me->getVictim(), SPELL_GLOBULE_EXPLOSION); + + //despawn + me->ForcedDespawn(); + return; + } + Check_Timer = 500; + } else Check_Timer -= diff; + + //do NOT deal any melee damage to the target. + } +}; + +CreatureAI* GetAI_boss_morogrim_tidewalker(Creature* pCreature) +{ + return new boss_morogrim_tidewalkerAI (pCreature); +} +CreatureAI* GetAI_mob_water_globule(Creature* pCreature) +{ + return new mob_water_globuleAI (pCreature); +} + +void AddSC_boss_morogrim_tidewalker() +{ + Script *newscript; + + newscript = new Script; + newscript->Name = "boss_morogrim_tidewalker"; + newscript->GetAI = &GetAI_boss_morogrim_tidewalker; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_water_globule"; + newscript->GetAI = &GetAI_mob_water_globule; + newscript->RegisterSelf(); +} + diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp new file mode 100644 index 00000000000..c80afae15c7 --- /dev/null +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp @@ -0,0 +1,398 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Instance_Serpent_Shrine +SD%Complete: 100 +SDComment: Instance Data Scripts and functions to acquire mobs and set encounter status for use in various Serpent Shrine Scripts +SDCategory: Coilfang Resevoir, Serpent Shrine Cavern +EndScriptData */ + +#include "ScriptedPch.h" +#include "serpent_shrine.h" + +#define MAX_ENCOUNTER 6 +#define SPELL_SCALDINGWATER 37284 +#define MOB_COILFANG_FRENZY 21508 +#define TRASHMOB_COILFANG_PRIESTESS 21220 //6*2 +#define TRASHMOB_COILFANG_SHATTERER 21301 //6*3 + +#define MIN_KILLS 30 + +//NOTE: there are 6 platforms +//there should be 3 shatterers and 2 priestess on all platforms, total of 30 elites, else it won't work! +//delete all other elites not on platforms! these mobs should only be on those platforms nowhere else. + +/* Serpentshrine cavern encounters: +0 - Hydross The Unstable event +1 - Leotheras The Blind Event +2 - The Lurker Below Event +3 - Fathom-Lord Karathress Event +4 - Morogrim Tidewalker Event +5 - Lady Vashj Event +*/ + +bool GOHello_go_bridge_console(Player* /*pPlayer*/, GameObject* pGo) +{ + ScriptedInstance* pInstance = pGo->GetInstanceData(); + + if (!pInstance) + return false; + + if (pInstance) + pInstance->SetData(DATA_CONTROL_CONSOLE, DONE); + + return true; +} + +struct instance_serpentshrine_cavern : public ScriptedInstance +{ + instance_serpentshrine_cavern(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; + + uint64 LurkerBelow; + uint64 Sharkkis; + uint64 Tidalvess; + uint64 Caribdis; + uint64 LadyVashj; + uint64 Karathress; + uint64 KarathressEvent_Starter; + uint64 LeotherasTheBlind; + uint64 LeotherasEventStarter; + + uint64 ControlConsole; + uint64 BridgePart[3]; + uint32 StrangePool; + uint32 FishingTimer; + uint32 LurkerSubEvent; + uint32 WaterCheckTimer; + uint32 FrenzySpawnTimer; + uint32 Water; + uint32 TrashCount; + + bool ShieldGeneratorDeactivated[4]; + uint32 m_auiEncounter[MAX_ENCOUNTER]; + bool DoSpawnFrenzy; + + void Initialize() + { + memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); + + LurkerBelow = 0; + Sharkkis = 0; + Tidalvess = 0; + Caribdis = 0; + LadyVashj = 0; + Karathress = 0; + KarathressEvent_Starter = 0; + LeotherasTheBlind = 0; + LeotherasEventStarter = 0; + + ControlConsole = 0; + BridgePart[0] = 0; + BridgePart[1] = 0; + BridgePart[2] = 0; + StrangePool = 0; + Water = WATERSTATE_FRENZY; + + ShieldGeneratorDeactivated[0] = false; + ShieldGeneratorDeactivated[1] = false; + ShieldGeneratorDeactivated[2] = false; + ShieldGeneratorDeactivated[3] = false; + FishingTimer = 1000; + LurkerSubEvent = 0; + WaterCheckTimer = 500; + FrenzySpawnTimer = 2000; + DoSpawnFrenzy = false; + TrashCount = 0; + + } + + bool IsEncounterInProgress() const + { + for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) + if (m_auiEncounter[i] == IN_PROGRESS) return true; + + return false; + } + + void Update (uint32 diff) + { + //Lurker Fishing event + if (LurkerSubEvent == LURKER_FISHING) + { + if (FishingTimer <= diff) + { + LurkerSubEvent = LURKER_HOOKED; + SetData(DATA_STRANGE_POOL, IN_PROGRESS);//just fished, signal Lurker script to emerge and start fight, we use IN_PROGRESS so it won't get saved and lurker will be alway invis at start if server restarted + } else FishingTimer -= diff; + } + //Water checks + if (WaterCheckTimer <= diff) + { + if (TrashCount >= MIN_KILLS) + Water = WATERSTATE_SCALDING; + else + Water = WATERSTATE_FRENZY; + + Map::PlayerList const &PlayerList = instance->GetPlayers(); + if (PlayerList.isEmpty()) + return; + for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) + { + if (Player* pPlayer = i->getSource()) + { + if (pPlayer->isAlive() && /*i->getSource()->GetPositionZ() <= -21.434931f*/pPlayer->IsInWater()) + { + if (Water == WATERSTATE_SCALDING) + { + + if (!pPlayer->HasAura(SPELL_SCALDINGWATER)) + { + pPlayer->CastSpell(pPlayer, SPELL_SCALDINGWATER,true); + } + } else if (Water == WATERSTATE_FRENZY) + { + //spawn frenzy + if (DoSpawnFrenzy) + { + if (Creature* frenzy = pPlayer->SummonCreature(MOB_COILFANG_FRENZY,pPlayer->GetPositionX(),pPlayer->GetPositionY(),pPlayer->GetPositionZ(),pPlayer->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,2000)) + { + frenzy->Attack(pPlayer,false); + frenzy->AddUnitMovementFlag(MOVEMENTFLAG_SWIMMING | MOVEMENTFLAG_LEVITATING); + } + DoSpawnFrenzy = false; + } + } + } + if (!pPlayer->IsInWater()) + pPlayer->RemoveAurasDueToSpell(SPELL_SCALDINGWATER); + } + + } + WaterCheckTimer = 500;//remove stress from core + } else WaterCheckTimer -= diff; + if (FrenzySpawnTimer <= diff) + { + DoSpawnFrenzy = true; + FrenzySpawnTimer = 2000; + } else FrenzySpawnTimer -= diff; + } + + void OnGameObjectCreate(GameObject* pGo, bool /*add*/) + { + switch(pGo->GetEntry()) + { + case 184568: + ControlConsole = pGo->GetGUID(); + pGo->setActive(true); + break; + + case 184203: + BridgePart[0] = pGo->GetGUID(); + pGo->setActive(true); + break; + + case 184204: + BridgePart[1] = pGo->GetGUID(); + pGo->setActive(true); + break; + + case 184205: + BridgePart[2] = pGo->GetGUID(); + pGo->setActive(true); + break; + case GAMEOBJECT_FISHINGNODE_ENTRY://no way checking if fish is hooked, so we create a timed event + if (LurkerSubEvent == LURKER_NOT_STARTED) + { + FishingTimer = 10000+rand()%30000;//random time before lurker emerges + LurkerSubEvent = LURKER_FISHING; + } + break; + } + } + + void OnCreatureCreate(Creature* pCreature, bool /*add*/) + { + switch(pCreature->GetEntry()) + { + case 21212: LadyVashj = pCreature->GetGUID(); break; + case 21214: Karathress = pCreature->GetGUID(); break; + case 21966: Sharkkis = pCreature->GetGUID(); break; + case 21217: LurkerBelow = pCreature->GetGUID(); break; + case 21965: Tidalvess = pCreature->GetGUID(); break; + case 21964: Caribdis = pCreature->GetGUID(); break; + case 21215: LeotherasTheBlind = pCreature->GetGUID(); break; + /*case TRASHMOB_COILFANG_PRIESTESS: + case TRASHMOB_COILFANG_SHATTERER: + if (pCreature->isAlive()) + ++TrashCount; + break;*/ + } + } + + void SetData64(uint32 type, uint64 data) + { + if (type == DATA_KARATHRESSEVENT_STARTER) + KarathressEvent_Starter = data; + if (type == DATA_LEOTHERAS_EVENT_STARTER) + LeotherasEventStarter = data; + } + + uint64 GetData64(uint32 identifier) + { + switch(identifier) + { + case DATA_THELURKERBELOW: return LurkerBelow; + case DATA_SHARKKIS: return Sharkkis; + case DATA_TIDALVESS: return Tidalvess; + case DATA_CARIBDIS: return Caribdis; + case DATA_LADYVASHJ: return LadyVashj; + case DATA_KARATHRESS: return Karathress; + case DATA_KARATHRESSEVENT_STARTER: return KarathressEvent_Starter; + case DATA_LEOTHERAS: return LeotherasTheBlind; + case DATA_LEOTHERAS_EVENT_STARTER: return LeotherasEventStarter; + } + return 0; + } + + void SetData(uint32 type, uint32 data) + { + switch(type) + { + case DATA_STRANGE_POOL: + { + StrangePool = data; + if (data == NOT_STARTED) + LurkerSubEvent = LURKER_NOT_STARTED; + } + break; + case DATA_CONTROL_CONSOLE: + if (data == DONE) + { + HandleGameObject(BridgePart[0], true); + HandleGameObject(BridgePart[0], true); + HandleGameObject(BridgePart[0], true); + } + ControlConsole = data;break; + case DATA_TRASH : + { + if (data == 1 && TrashCount < MIN_KILLS) + ++TrashCount;//+1 died + SaveToDB(); + break; + } + case DATA_WATER : Water = data;break; + case DATA_HYDROSSTHEUNSTABLEEVENT: m_auiEncounter[0] = data; break; + case DATA_LEOTHERASTHEBLINDEVENT: m_auiEncounter[1] = data; break; + case DATA_THELURKERBELOWEVENT: m_auiEncounter[2] = data; break; + case DATA_KARATHRESSEVENT: m_auiEncounter[3] = data; break; + case DATA_MOROGRIMTIDEWALKEREVENT: m_auiEncounter[4] = data; break; + //Lady Vashj + case DATA_LADYVASHJEVENT: + if (data == NOT_STARTED) + { + ShieldGeneratorDeactivated[0] = false; + ShieldGeneratorDeactivated[1] = false; + ShieldGeneratorDeactivated[2] = false; + ShieldGeneratorDeactivated[3] = false; + } + m_auiEncounter[5] = data; break; + case DATA_SHIELDGENERATOR1:ShieldGeneratorDeactivated[0] = (data) ? true : false; break; + case DATA_SHIELDGENERATOR2:ShieldGeneratorDeactivated[1] = (data) ? true : false; break; + case DATA_SHIELDGENERATOR3:ShieldGeneratorDeactivated[2] = (data) ? true : false; break; + case DATA_SHIELDGENERATOR4:ShieldGeneratorDeactivated[3] = (data) ? true : false; break; + } + + if (data == DONE) + SaveToDB(); + } + + uint32 GetData(uint32 type) + { + switch(type) + { + case DATA_HYDROSSTHEUNSTABLEEVENT: return m_auiEncounter[0]; + case DATA_LEOTHERASTHEBLINDEVENT: return m_auiEncounter[1]; + case DATA_THELURKERBELOWEVENT: return m_auiEncounter[2]; + case DATA_KARATHRESSEVENT: return m_auiEncounter[3]; + case DATA_MOROGRIMTIDEWALKEREVENT: return m_auiEncounter[4]; + //Lady Vashj + case DATA_LADYVASHJEVENT: return m_auiEncounter[5]; + case DATA_SHIELDGENERATOR1: return ShieldGeneratorDeactivated[0]; + case DATA_SHIELDGENERATOR2: return ShieldGeneratorDeactivated[1]; + case DATA_SHIELDGENERATOR3: return ShieldGeneratorDeactivated[2]; + case DATA_SHIELDGENERATOR4: return ShieldGeneratorDeactivated[3]; + case DATA_CANSTARTPHASE3: + if (ShieldGeneratorDeactivated[0] && ShieldGeneratorDeactivated[1] && ShieldGeneratorDeactivated[2] && ShieldGeneratorDeactivated[3])return 1;break; + case DATA_STRANGE_POOL: return StrangePool; + case DATA_WATER: return Water; + } + return 0; + } + std::string GetSaveData() + { + OUT_SAVE_INST_DATA; + std::ostringstream stream; + stream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " " + << m_auiEncounter[3] << " " << m_auiEncounter[4] << " " << m_auiEncounter[5] << " " << TrashCount; + char* out = new char[stream.str().length() + 1]; + strcpy(out, stream.str().c_str()); + if (out) + { + OUT_SAVE_INST_DATA_COMPLETE; + return out; + } + return NULL; + } + + void Load(const char* in) + { + if (!in) + { + OUT_LOAD_INST_DATA_FAIL; + return; + } + OUT_LOAD_INST_DATA(in); + std::istringstream stream(in); + stream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3] + >> m_auiEncounter[4] >> m_auiEncounter[5] >> TrashCount; + for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) + if (m_auiEncounter[i] == IN_PROGRESS) // Do not load an encounter as "In Progress" - reset it instead. + m_auiEncounter[i] = NOT_STARTED; + OUT_LOAD_INST_DATA_COMPLETE; + } +}; + +InstanceData* GetInstanceData_instance_serpentshrine_cavern(Map* pMap) +{ + return new instance_serpentshrine_cavern(pMap); +} + +void AddSC_instance_serpentshrine_cavern() +{ + Script *newscript; + + newscript = new Script; + newscript->Name = "instance_serpent_shrine"; + newscript->GetInstanceData = &GetInstanceData_instance_serpentshrine_cavern; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "go_bridge_console"; + newscript->pGOHello = &GOHello_go_bridge_console; + newscript->RegisterSelf(); +} + diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h new file mode 100644 index 00000000000..adfa39dc7e0 --- /dev/null +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h @@ -0,0 +1,45 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software licensed under GPL version 2 + * Please see the included DOCS/LICENSE.TXT for more information */ + +#ifndef DEF_SERPENT_SHRINE_H +#define DEF_SERPENT_SHRINE_H +enum LurkerEventState +{ + LURKER_NOT_STARTED = 0, + LURKER_FISHING = 1, + LURKER_HOOKED = 2 +}; +enum WaterEventState +{ + WATERSTATE_NONE = 0, + WATERSTATE_FRENZY = 1, + WATERSTATE_SCALDING = 2 +}; +#define DATA_CANSTARTPHASE3 1 +#define DATA_CARIBDIS 2 +#define DATA_HYDROSSTHEUNSTABLEEVENT 3 +#define DATA_KARATHRESS 4 +#define DATA_KARATHRESSEVENT 5 +#define DATA_KARATHRESSEVENT_STARTER 6 +#define DATA_LADYVASHJ 7 +#define DATA_LADYVASHJEVENT 8 +#define DATA_LEOTHERASTHEBLINDEVENT 9 +#define DATA_MOROGRIMTIDEWALKEREVENT 10 +#define DATA_SHARKKIS 11 +#define DATA_SHIELDGENERATOR1 12 +#define DATA_SHIELDGENERATOR2 13 +#define DATA_SHIELDGENERATOR3 14 +#define DATA_SHIELDGENERATOR4 15 +#define DATA_THELURKERBELOW 16 +#define DATA_THELURKERBELOWEVENT 17 +#define DATA_TIDALVESS 18 +#define DATA_FATHOMLORDKARATHRESSEVENT 19 +#define DATA_LEOTHERAS 20 +#define DATA_LEOTHERAS_EVENT_STARTER 21 +#define DATA_CONTROL_CONSOLE 22 +#define DATA_STRANGE_POOL 23 +#define DATA_WATER 24 +#define DATA_TRASH 25 +#endif + diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp new file mode 100644 index 00000000000..8e1b438bdc5 --- /dev/null +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp @@ -0,0 +1,187 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Boss_Hydromancer_Thespia +SD%Complete: 80 +SDComment: Needs additional adjustments (when instance script is adjusted) +SDCategory: Coilfang Resevoir, The Steamvault +EndScriptData */ + +/* ContentData +boss_hydromancer_thespia +mob_coilfang_waterelemental +EndContentData */ + +#include "ScriptedPch.h" +#include "steam_vault.h" + +#define SAY_SUMMON -1545000 +#define SAY_AGGRO_1 -1545001 +#define SAY_AGGRO_2 -1545002 +#define SAY_AGGRO_3 -1545003 +#define SAY_SLAY_1 -1545004 +#define SAY_SLAY_2 -1545005 +#define SAY_DEAD -1545006 + +#define SPELL_LIGHTNING_CLOUD 25033 +#define SPELL_LUNG_BURST 31481 +#define SPELL_ENVELOPING_WINDS 31718 + +struct boss_thespiaAI : public ScriptedAI +{ + boss_thespiaAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + } + + ScriptedInstance *pInstance; + + uint32 LightningCloud_Timer; + uint32 LungBurst_Timer; + uint32 EnvelopingWinds_Timer; + + void Reset() + { + LightningCloud_Timer = 15000; + LungBurst_Timer = 7000; + EnvelopingWinds_Timer = 9000; + + if (pInstance) + pInstance->SetData(TYPE_HYDROMANCER_THESPIA, NOT_STARTED); + } + + void JustDied(Unit* /*Killer*/) + { + DoScriptText(SAY_DEAD, me); + + if (pInstance) + pInstance->SetData(TYPE_HYDROMANCER_THESPIA, DONE); + } + + void KilledUnit(Unit* /*victim*/) + { + DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + } + + void EnterCombat(Unit * /*who*/) + { + DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); + + if (pInstance) + pInstance->SetData(TYPE_HYDROMANCER_THESPIA, IN_PROGRESS); + } + + void UpdateAI(const uint32 diff) + { + if (!UpdateVictim()) + return; + + //LightningCloud_Timer + if (LightningCloud_Timer <= diff) + { + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget, SPELL_LIGHTNING_CLOUD); + + //cast twice in Heroic mode + if (IsHeroic()) + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget, SPELL_LIGHTNING_CLOUD); + + LightningCloud_Timer = 15000+rand()%10000; + } else LightningCloud_Timer -=diff; + + //LungBurst_Timer + if (LungBurst_Timer <= diff) + { + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget, SPELL_LUNG_BURST); + LungBurst_Timer = 7000+rand()%5000; + } else LungBurst_Timer -=diff; + + //EnvelopingWinds_Timer + if (EnvelopingWinds_Timer <= diff) + { + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget, SPELL_ENVELOPING_WINDS); + + //cast twice in Heroic mode + if (IsHeroic()) + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget, SPELL_ENVELOPING_WINDS); + EnvelopingWinds_Timer = 10000+rand()%5000; + } else EnvelopingWinds_Timer -=diff; + + DoMeleeAttackIfReady(); + } +}; + +#define SPELL_WATER_BOLT_VOLLEY 34449 +#define H_SPELL_WATER_BOLT_VOLLEY 37924 + +struct mob_coilfang_waterelementalAI : public ScriptedAI +{ + mob_coilfang_waterelementalAI(Creature *c) : ScriptedAI(c) {} + + uint32 WaterBoltVolley_Timer; + + void Reset() + { + WaterBoltVolley_Timer = 3000+rand()%3000; + } + + void EnterCombat(Unit * /*who*/) { } + + void UpdateAI(const uint32 diff) + { + if (!UpdateVictim()) + return; + + if (WaterBoltVolley_Timer <= diff) + { + DoCast(me, SPELL_WATER_BOLT_VOLLEY); + WaterBoltVolley_Timer = 7000+rand()%5000; + } else WaterBoltVolley_Timer -= diff; + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_boss_thespiaAI(Creature* pCreature) +{ + return new boss_thespiaAI (pCreature); +} + +CreatureAI* GetAI_mob_coilfang_waterelementalAI(Creature* pCreature) +{ + return new mob_coilfang_waterelementalAI (pCreature); +} + +void AddSC_boss_hydromancer_thespia() +{ + Script *newscript; + + newscript = new Script; + newscript->Name = "boss_hydromancer_thespia"; + newscript->GetAI = &GetAI_boss_thespiaAI; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_coilfang_waterelemental"; + newscript->GetAI = &GetAI_mob_coilfang_waterelementalAI; + newscript->RegisterSelf(); +} + diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp new file mode 100644 index 00000000000..f2da4058e44 --- /dev/null +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp @@ -0,0 +1,264 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Boss_Mekgineer_Steamrigger +SD%Complete: 60 +SDComment: Mechanics' interrrupt heal doesn't work very well, also a proper movement needs to be implemented -> summon further away and move towards pTarget to repair. +SDCategory: Coilfang Resevoir, The Steamvault +EndScriptData */ + +/* ContentData +boss_mekgineer_steamrigger +mob_steamrigger_mechanic +EndContentData */ + +#include "ScriptedPch.h" +#include "steam_vault.h" + +#define SAY_MECHANICS -1545007 +#define SAY_AGGRO_1 -1545008 +#define SAY_AGGRO_2 -1545009 +#define SAY_AGGRO_3 -1545010 +#define SAY_AGGRO_4 -1545011 +#define SAY_SLAY_1 -1545012 +#define SAY_SLAY_2 -1545013 +#define SAY_SLAY_3 -1545014 +#define SAY_DEATH -1545015 + +#define SPELL_SUPER_SHRINK_RAY 31485 +#define SPELL_SAW_BLADE 31486 +#define SPELL_ELECTRIFIED_NET 35107 +#define H_SPELL_ENRAGE 1 //corrent enrage spell not known + +#define ENTRY_STREAMRIGGER_MECHANIC 17951 + +struct boss_mekgineer_steamriggerAI : public ScriptedAI +{ + boss_mekgineer_steamriggerAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + } + + ScriptedInstance *pInstance; + + uint32 Shrink_Timer; + uint32 Saw_Blade_Timer; + uint32 Electrified_Net_Timer; + bool Summon75; + bool Summon50; + bool Summon25; + + void Reset() + { + Shrink_Timer = 20000; + Saw_Blade_Timer = 15000; + Electrified_Net_Timer = 10000; + + Summon75 = false; + Summon50 = false; + Summon25 = false; + + if (pInstance) + pInstance->SetData(TYPE_MEKGINEER_STEAMRIGGER, NOT_STARTED); + } + + void JustDied(Unit* /*Killer*/) + { + DoScriptText(SAY_DEATH, me); + + if (pInstance) + pInstance->SetData(TYPE_MEKGINEER_STEAMRIGGER, DONE); + } + + void KilledUnit(Unit* /*victim*/) + { + DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); + } + + void EnterCombat(Unit * /*who*/) + { + DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); + + if (pInstance) + pInstance->SetData(TYPE_MEKGINEER_STEAMRIGGER, IN_PROGRESS); + } + + //no known summon spells exist + void SummonMechanichs() + { + DoScriptText(SAY_MECHANICS, me); + + DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC,5,5,0,0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000); + DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC,-5,5,0,0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000); + DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC,-5,-5,0,0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000); + + if (rand()%2) + DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC,5,-7,0,0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000); + if (rand()%2) + DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC,7,-5,0,0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000); + } + + void UpdateAI(const uint32 diff) + { + if (!UpdateVictim()) + return; + + if (Shrink_Timer <= diff) + { + DoCast(me->getVictim(), SPELL_SUPER_SHRINK_RAY); + Shrink_Timer = 20000; + } else Shrink_Timer -= diff; + + if (Saw_Blade_Timer <= diff) + { + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,1)) + DoCast(pTarget, SPELL_SAW_BLADE); + else + DoCast(me->getVictim(), SPELL_SAW_BLADE); + + Saw_Blade_Timer = 15000; + } else Saw_Blade_Timer -= diff; + + if (Electrified_Net_Timer <= diff) + { + DoCast(me->getVictim(), SPELL_ELECTRIFIED_NET); + Electrified_Net_Timer = 10000; + } + else Electrified_Net_Timer -= diff; + + if (!Summon75) + { + if ((me->GetHealth()*100 / me->GetMaxHealth()) < 75) + { + SummonMechanichs(); + Summon75 = true; + } + } + + if (!Summon50) + { + if ((me->GetHealth()*100 / me->GetMaxHealth()) < 50) + { + SummonMechanichs(); + Summon50 = true; + } + } + + if (!Summon25) + { + if ((me->GetHealth()*100 / me->GetMaxHealth()) < 25) + { + SummonMechanichs(); + Summon25 = true; + } + } + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_boss_mekgineer_steamrigger(Creature* pCreature) +{ + return new boss_mekgineer_steamriggerAI (pCreature); +} + +#define SPELL_DISPEL_MAGIC 17201 +#define SPELL_REPAIR 31532 +#define H_SPELL_REPAIR 37936 + +#define MAX_REPAIR_RANGE (13.0f) //we should be at least at this range for repair +#define MIN_REPAIR_RANGE (7.0f) //we can stop movement at this range to repair but not required + +struct mob_steamrigger_mechanicAI : public ScriptedAI +{ + mob_steamrigger_mechanicAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + } + + ScriptedInstance* pInstance; + + uint32 Repair_Timer; + + void Reset() + { + Repair_Timer = 2000; + } + + void MoveInLineOfSight(Unit* /*who*/) + { + //react only if attacked + } + + void EnterCombat(Unit * /*who*/) { } + + void UpdateAI(const uint32 diff) + { + if (Repair_Timer <= diff) + { + if (pInstance && pInstance->GetData64(DATA_MEKGINEERSTEAMRIGGER) && pInstance->GetData(TYPE_MEKGINEER_STEAMRIGGER) == IN_PROGRESS) + { + if (Unit* pMekgineer = Unit::GetUnit((*me), pInstance->GetData64(DATA_MEKGINEERSTEAMRIGGER))) + { + if (me->IsWithinDistInMap(pMekgineer, MAX_REPAIR_RANGE)) + { + //are we already channeling? Doesn't work very well, find better check? + if (!me->GetUInt32Value(UNIT_CHANNEL_SPELL)) + { + //me->GetMotionMaster()->MovementExpired(); + //me->GetMotionMaster()->MoveIdle(); + + DoCast(me, SPELL_REPAIR, true); + } + Repair_Timer = 5000; + } + else + { + //me->GetMotionMaster()->MovementExpired(); + //me->GetMotionMaster()->MoveFollow(pMekgineer,0,0); + } + } + } else Repair_Timer = 5000; + } else Repair_Timer -= diff; + + if (!UpdateVictim()) + return; + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_mob_steamrigger_mechanic(Creature* pCreature) +{ + return new mob_steamrigger_mechanicAI (pCreature); +} + +void AddSC_boss_mekgineer_steamrigger() +{ + Script *newscript; + + newscript = new Script; + newscript->Name = "boss_mekgineer_steamrigger"; + newscript->GetAI = &GetAI_boss_mekgineer_steamrigger; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_steamrigger_mechanic"; + newscript->GetAI = &GetAI_mob_steamrigger_mechanic; + newscript->RegisterSelf(); +} + diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp new file mode 100644 index 00000000000..f46956dda81 --- /dev/null +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp @@ -0,0 +1,204 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Boss_Warlord_Kalithres +SD%Complete: 65 +SDComment: Contains workarounds regarding warlord's rage spells not acting as expected. Both scripts here require review and fine tuning. +SDCategory: Coilfang Resevoir, The Steamvault +EndScriptData */ + +#include "ScriptedPch.h" +#include "steam_vault.h" + +#define SAY_INTRO -1545016 +#define SAY_REGEN -1545017 +#define SAY_AGGRO1 -1545018 +#define SAY_AGGRO2 -1545019 +#define SAY_AGGRO3 -1545020 +#define SAY_SLAY1 -1545021 +#define SAY_SLAY2 -1545022 +#define SAY_DEATH -1545023 + +#define SPELL_SPELL_REFLECTION 31534 +#define SPELL_IMPALE 39061 +#define SPELL_WARLORDS_RAGE 37081 +#define SPELL_WARLORDS_RAGE_NAGA 31543 + +#define SPELL_WARLORDS_RAGE_PROC 36453 + +struct mob_naga_distillerAI : public ScriptedAI +{ + mob_naga_distillerAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + } + + ScriptedInstance *pInstance; + + void Reset() + { + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + + //hack, due to really weird spell behaviour :( + if (pInstance) + { + if (pInstance->GetData(TYPE_DISTILLER) == IN_PROGRESS) + { + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + } + } + } + + void EnterCombat(Unit * /*who*/) { } + + void StartRageGen(Unit * /*caster*/) + { + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + + DoCast(me, SPELL_WARLORDS_RAGE_NAGA, true); + + if (pInstance) + pInstance->SetData(TYPE_DISTILLER,IN_PROGRESS); + } + + void DamageTaken(Unit * /*done_by*/, uint32 &damage) + { + if (me->GetHealth() <= damage) + if (pInstance) + pInstance->SetData(TYPE_DISTILLER,DONE); + } +}; + +struct boss_warlord_kalithreshAI : public ScriptedAI +{ + boss_warlord_kalithreshAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + } + + ScriptedInstance *pInstance; + + uint32 Reflection_Timer; + uint32 Impale_Timer; + uint32 Rage_Timer; + bool CanRage; + + void Reset() + { + Reflection_Timer = 10000; + Impale_Timer = 7000+rand()%7000; + Rage_Timer = 45000; + CanRage = false; + + if (pInstance) + pInstance->SetData(TYPE_WARLORD_KALITHRESH, NOT_STARTED); + } + + void EnterCombat(Unit * /*who*/) + { + DoScriptText(RAND(SAY_AGGRO1,SAY_AGGRO2,SAY_AGGRO3), me); + + if (pInstance) + pInstance->SetData(TYPE_WARLORD_KALITHRESH, IN_PROGRESS); + } + + void KilledUnit(Unit* /*victim*/) + { + DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); + } + + void SpellHit(Unit * /*caster*/, const SpellEntry *spell) + { + //hack :( + if (spell->Id == SPELL_WARLORDS_RAGE_PROC) + if (pInstance) + if (pInstance->GetData(TYPE_DISTILLER) == DONE) + me->RemoveAurasDueToSpell(SPELL_WARLORDS_RAGE_PROC); + } + + void JustDied(Unit* /*Killer*/) + { + DoScriptText(SAY_DEATH, me); + + if (pInstance) + pInstance->SetData(TYPE_WARLORD_KALITHRESH, DONE); + } + + void UpdateAI(const uint32 diff) + { + if (!UpdateVictim()) + return; + + if (Rage_Timer <= diff) + { + if (Creature* distiller = me->FindNearestCreature(17954, 100.0f)) + { + DoScriptText(SAY_REGEN, me); + DoCast(me, SPELL_WARLORDS_RAGE); + CAST_AI(mob_naga_distillerAI, distiller->AI())->StartRageGen(me); + } + Rage_Timer = 3000+rand()%15000; + } else Rage_Timer -= diff; + + //Reflection_Timer + if (Reflection_Timer <= diff) + { + DoCast(me, SPELL_SPELL_REFLECTION); + Reflection_Timer = 15000+rand()%10000; + } else Reflection_Timer -= diff; + + //Impale_Timer + if (Impale_Timer <= diff) + { + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget, SPELL_IMPALE); + + Impale_Timer = 7500+rand()%5000; + } else Impale_Timer -= diff; + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_mob_naga_distiller(Creature* pCreature) +{ + return new mob_naga_distillerAI (pCreature); +} + +CreatureAI* GetAI_boss_warlord_kalithresh(Creature* pCreature) +{ + return new boss_warlord_kalithreshAI (pCreature); +} + +void AddSC_boss_warlord_kalithresh() +{ + Script *newscript; + + newscript = new Script; + newscript->Name = "mob_naga_distiller"; + newscript->GetAI = &GetAI_mob_naga_distiller; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "boss_warlord_kalithresh"; + newscript->GetAI = &GetAI_boss_warlord_kalithresh; + newscript->RegisterSelf(); +} + diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp new file mode 100644 index 00000000000..188a23738f5 --- /dev/null +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp @@ -0,0 +1,231 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Instance_Steam_Vault +SD%Complete: 80 +SDComment: Instance script and access panel GO +SDCategory: Coilfang Resevoir, The Steamvault +EndScriptData */ + +#include "ScriptedPch.h" +#include "steam_vault.h" + +#define MAX_ENCOUNTER 4 + +#define MAIN_CHAMBERS_DOOR 183049 +#define ACCESS_PANEL_HYDRO 184125 +#define ACCESS_PANEL_MEK 184126 + +/* Steam Vaults encounters: +1 - Hydromancer Thespia Event +2 - Mekgineer Steamrigger Event +3 - Warlord Kalithresh Event +*/ + +bool GOHello_go_main_chambers_access_panel(Player* /*pPlayer*/, GameObject* pGo) +{ + ScriptedInstance* pInstance = pGo->GetInstanceData(); + + if (!pInstance) + return false; + + if (pGo->GetEntry() == ACCESS_PANEL_HYDRO && (pInstance->GetData(TYPE_HYDROMANCER_THESPIA) == DONE || pInstance->GetData(TYPE_HYDROMANCER_THESPIA) == SPECIAL)) + pInstance->SetData(TYPE_HYDROMANCER_THESPIA,SPECIAL); + + if (pGo->GetEntry() == ACCESS_PANEL_MEK && (pInstance->GetData(TYPE_MEKGINEER_STEAMRIGGER) == DONE || pInstance->GetData(TYPE_MEKGINEER_STEAMRIGGER) == SPECIAL)) + pInstance->SetData(TYPE_MEKGINEER_STEAMRIGGER,SPECIAL); + + return true; +} + +struct instance_steam_vault : public ScriptedInstance +{ + instance_steam_vault(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; + + uint32 m_auiEncounter[MAX_ENCOUNTER]; + + uint64 ThespiaGUID; + uint64 MekgineerGUID; + uint64 KalithreshGUID; + + uint64 MainChambersDoor; + uint64 AccessPanelHydro; + uint64 AccessPanelMek; + + void Initialize() + { + memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); + + ThespiaGUID = 0; + MekgineerGUID = 0; + KalithreshGUID = 0; + MainChambersDoor = 0; + AccessPanelHydro = 0; + AccessPanelMek = 0; + } + + bool IsEncounterInProgress() const + { + for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) + if (m_auiEncounter[i] == IN_PROGRESS) + return true; + + return false; + } + + void OnCreatureCreate(Creature* pCreature, bool /*add*/) + { + switch(pCreature->GetEntry()) + { + case 17797: ThespiaGUID = pCreature->GetGUID(); break; + case 17796: MekgineerGUID = pCreature->GetGUID(); break; + case 17798: KalithreshGUID = pCreature->GetGUID(); break; + } + } + + void OnGameObjectCreate(GameObject* pGo, bool /*add*/) + { + switch(pGo->GetEntry()) + { + case MAIN_CHAMBERS_DOOR: MainChambersDoor = pGo->GetGUID(); break; + case ACCESS_PANEL_HYDRO: AccessPanelHydro = pGo->GetGUID(); break; + case ACCESS_PANEL_MEK: AccessPanelMek = pGo->GetGUID(); break; + } + } + + void SetData(uint32 type, uint32 data) + { + switch(type) + { + case TYPE_HYDROMANCER_THESPIA: + if (data == SPECIAL) + { + HandleGameObject(AccessPanelHydro, true); + + if (GetData(TYPE_MEKGINEER_STEAMRIGGER) == SPECIAL) + HandleGameObject(MainChambersDoor, true); + + debug_log("TSCR: Instance Steamvault: Access panel used."); + } + m_auiEncounter[0] = data; + break; + case TYPE_MEKGINEER_STEAMRIGGER: + if (data == SPECIAL) + { + HandleGameObject(AccessPanelMek, true); + + if (GetData(TYPE_HYDROMANCER_THESPIA) == SPECIAL) + HandleGameObject(MainChambersDoor, true); + + debug_log("TSCR: Instance Steamvault: Access panel used."); + } + m_auiEncounter[1] = data; + break; + case TYPE_WARLORD_KALITHRESH: + m_auiEncounter[2] = data; + break; + case TYPE_DISTILLER: + m_auiEncounter[3] = data; + break; + } + + if (data == DONE || data == SPECIAL) + SaveToDB(); + } + + uint32 GetData(uint32 type) + { + switch(type) + { + case TYPE_HYDROMANCER_THESPIA: + return m_auiEncounter[0]; + case TYPE_MEKGINEER_STEAMRIGGER: + return m_auiEncounter[1]; + case TYPE_WARLORD_KALITHRESH: + return m_auiEncounter[2]; + case TYPE_DISTILLER: + return m_auiEncounter[3]; + } + return 0; + } + + uint64 GetData64(uint32 data) + { + switch(data) + { + case DATA_THESPIA: + return ThespiaGUID; + case DATA_MEKGINEERSTEAMRIGGER: + return MekgineerGUID; + case DATA_KALITRESH: + return KalithreshGUID; + } + return 0; + } + + std::string GetSaveData() + { + OUT_SAVE_INST_DATA; + std::ostringstream stream; + stream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " " << m_auiEncounter[3]; + char* out = new char[stream.str().length() + 1]; + strcpy(out, stream.str().c_str()); + if (out) + { + OUT_SAVE_INST_DATA_COMPLETE; + return out; + } + return NULL; + } + + void Load(const char* in) + { + if (!in) + { + OUT_LOAD_INST_DATA_FAIL; + return; + } + OUT_LOAD_INST_DATA(in); + std::istringstream stream(in); + stream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3]; + for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) + if (m_auiEncounter[i] == IN_PROGRESS) + m_auiEncounter[i] = NOT_STARTED; + OUT_LOAD_INST_DATA_COMPLETE; + } +}; + +InstanceData* GetInstanceData_instance_steam_vault(Map* pMap) +{ + return new instance_steam_vault(pMap); +} + +void AddSC_instance_steam_vault() +{ + Script *newscript; + + newscript = new Script; + newscript->Name = "go_main_chambers_access_panel"; + newscript->pGOHello = &GOHello_go_main_chambers_access_panel; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "instance_steam_vault"; + newscript->GetInstanceData = &GetInstanceData_instance_steam_vault; + newscript->RegisterSelf(); +} + diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h new file mode 100644 index 00000000000..4b407ac4816 --- /dev/null +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h @@ -0,0 +1,17 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software licensed under GPL version 2 + * Please see the included DOCS/LICENSE.TXT for more information */ + +#ifndef DEF_STEAM_VAULT_H +#define DEF_STEAM_VAULT_H + +#define TYPE_HYDROMANCER_THESPIA 1 +#define TYPE_MEKGINEER_STEAMRIGGER 2 +#define TYPE_WARLORD_KALITHRESH 3 +#define TYPE_DISTILLER 4 + +#define DATA_MEKGINEERSTEAMRIGGER 5 +#define DATA_KALITRESH 6 +#define DATA_THESPIA 7 +#endif + diff --git a/src/server/scripts/Outland/CoilfangReservoir/serpent_shrine/boss_fathomlord_karathress.cpp b/src/server/scripts/Outland/CoilfangReservoir/serpent_shrine/boss_fathomlord_karathress.cpp deleted file mode 100644 index 69a969adda0..00000000000 --- a/src/server/scripts/Outland/CoilfangReservoir/serpent_shrine/boss_fathomlord_karathress.cpp +++ /dev/null @@ -1,746 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: Boss_Fathomlord_Karathress -SD%Complete: 70 -SDComment: Cyclone workaround -SDCategory: Coilfang Resevoir, Serpent Shrine Cavern -EndScriptData */ - -#include "ScriptedPch.h" -#include "serpent_shrine.h" -#include "ScriptedEscortAI.h" - -#define SAY_AGGRO -1548021 -#define SAY_GAIN_BLESSING -1548022 -#define SAY_GAIN_ABILITY1 -1548023 -#define SAY_GAIN_ABILITY2 -1548024 -#define SAY_GAIN_ABILITY3 -1548025 -#define SAY_SLAY1 -1548026 -#define SAY_SLAY2 -1548027 -#define SAY_SLAY3 -1548028 -#define SAY_DEATH -1548029 - -//Karathress spells -#define SPELL_CATACLYSMIC_BOLT 38441 -#define SPELL_POWER_OF_SHARKKIS 38455 -#define SPELL_POWER_OF_TIDALVESS 38452 -#define SPELL_POWER_OF_CARIBDIS 38451 -#define SPELL_ENRAGE 24318 -#define SPELL_SEAR_NOVA 38445 -#define SPELL_BLESSING_OF_THE_TIDES 38449 - -//Sharkkis spells -#define SPELL_LEECHING_THROW 29436 -#define SPELL_THE_BEAST_WITHIN 38373 -#define SPELL_MULTISHOT 38366 -#define SPELL_SUMMON_FATHOM_LURKER 38433 -#define SPELL_SUMMON_FATHOM_SPOREBAT 38431 -#define SPELL_PET_ENRAGE 19574 - -//Tidalvess spells -#define SPELL_FROST_SHOCK 38234 -#define SPELL_SPITFIRE_TOTEM 38236 -#define SPELL_POISON_CLEANSING_TOTEM 38306 -// Spell obsolete -// #define SPELL_POISON_CLEANSING_EFFECT 8167 -#define SPELL_EARTHBIND_TOTEM 38304 -#define SPELL_EARTHBIND_TOTEM_EFFECT 6474 -#define SPELL_WINDFURY_WEAPON 38184 - -//Caribdis Spells -#define SPELL_WATER_BOLT_VOLLEY 38335 -#define SPELL_TIDAL_SURGE 38358 -#define SPELL_TIDAL_SURGE_FREEZE 38357 -#define SPELL_HEAL 38330 -#define SPELL_SUMMON_CYCLONE 38337 -#define SPELL_CYCLONE_CYCLONE 29538 - -//Yells and Quotes -#define SAY_GAIN_BLESSING_OF_TIDES "Your overconfidence will be your undoing! Guards, lend me your strength!" -#define SOUND_GAIN_BLESSING_OF_TIDES 11278 -#define SAY_MISC "Alana be'lendor!" //don't know what use this -#define SOUND_MISC 11283 - -//Summoned Unit GUIDs -#define CREATURE_CYCLONE 22104 -#define CREATURE_FATHOM_SPOREBAT 22120 -#define CREATURE_FATHOM_LURKER 22119 -#define CREATURE_SPITFIRE_TOTEM 22091 -#define CREATURE_EARTHBIND_TOTEM 22486 -#define CREATURE_POISON_CLEANSING_TOTEM 22487 - -//entry and position for Seer Olum -#define SEER_OLUM 22820 -#define OLUM_X 446.78f -#define OLUM_Y -542.76f -#define OLUM_Z -7.54773f -#define OLUM_O 0.401581f - -//Fathom-Lord Karathress AI -struct boss_fathomlord_karathressAI : public ScriptedAI -{ - boss_fathomlord_karathressAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - Advisors[0] = 0; - Advisors[1] = 0; - Advisors[2] = 0; - } - - ScriptedInstance* pInstance; - - uint32 CataclysmicBolt_Timer; - uint32 Enrage_Timer; - uint32 SearNova_Timer; - - bool BlessingOfTides; - - uint64 Advisors[3]; - - void Reset() - { - CataclysmicBolt_Timer = 10000; - Enrage_Timer = 600000; //10 minutes - SearNova_Timer = 20000+rand()%40000; // 20 - 60 seconds - - BlessingOfTides = false; - - if (pInstance) - { - uint64 RAdvisors[3]; - RAdvisors[0] = pInstance->GetData64(DATA_SHARKKIS); - RAdvisors[1] = pInstance->GetData64(DATA_TIDALVESS); - RAdvisors[2] = pInstance->GetData64(DATA_CARIBDIS); - //Respawn of the 3 Advisors - Creature* pAdvisor = NULL; - for (int i=0; i<3; ++i) - - if (RAdvisors[i]) - { - pAdvisor = (Unit::GetCreature((*me), RAdvisors[i])); - if (pAdvisor && !pAdvisor->isAlive()) - { - pAdvisor->Respawn(); - pAdvisor->AI()->EnterEvadeMode(); - pAdvisor->GetMotionMaster()->MoveTargetedHome(); - } - } - pInstance->SetData(DATA_KARATHRESSEVENT, NOT_STARTED); - } - - } - - void EventSharkkisDeath() - { - DoScriptText(SAY_GAIN_ABILITY1, me); - DoCast(me, SPELL_POWER_OF_SHARKKIS); - } - - void EventTidalvessDeath() - { - DoScriptText(SAY_GAIN_ABILITY2, me); - DoCast(me, SPELL_POWER_OF_TIDALVESS); - } - - void EventCaribdisDeath() - { - DoScriptText(SAY_GAIN_ABILITY3, me); - DoCast(me, SPELL_POWER_OF_CARIBDIS); - } - - void GetAdvisors() - { - if (!pInstance) - return; - - Advisors[0] = pInstance->GetData64(DATA_SHARKKIS); - Advisors[1] = pInstance->GetData64(DATA_TIDALVESS); - Advisors[2] = pInstance->GetData64(DATA_CARIBDIS); - } - - void StartEvent(Unit *who) - { - if (!pInstance) - return; - - GetAdvisors(); - - DoScriptText(SAY_AGGRO, me); - DoZoneInCombat(); - - pInstance->SetData64(DATA_KARATHRESSEVENT_STARTER, who->GetGUID()); - pInstance->SetData(DATA_KARATHRESSEVENT, IN_PROGRESS); - } - - void KilledUnit(Unit * /*victim*/) - { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2,SAY_SLAY3), me); - } - - void JustDied(Unit * /*killer*/) - { - DoScriptText(SAY_DEATH, me); - - if (pInstance) - pInstance->SetData(DATA_FATHOMLORDKARATHRESSEVENT, DONE); - - //support for quest 10944 - me->SummonCreature(SEER_OLUM, OLUM_X, OLUM_Y, OLUM_Z, OLUM_O, TEMPSUMMON_TIMED_DESPAWN, 3600000); - } - - void EnterCombat(Unit * who) - { - StartEvent(who); - } - - void UpdateAI(const uint32 diff) - { - //Only if not incombat check if the event is started - if (!me->isInCombat() && pInstance && pInstance->GetData(DATA_KARATHRESSEVENT)) - { - Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_KARATHRESSEVENT_STARTER)); - - if (pTarget) - { - AttackStart(pTarget); - GetAdvisors(); - } - } - - //Return since we have no target - if (!UpdateVictim()) - return; - - //someone evaded! - if (pInstance && !pInstance->GetData(DATA_KARATHRESSEVENT)) - { - EnterEvadeMode(); - return; - } - - //CataclysmicBolt_Timer - if (CataclysmicBolt_Timer <= diff) - { - //select a random unit other than the main tank - Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 1); - - //if there aren't other units, cast on the tank - if (!pTarget) - pTarget = me->getVictim(); - - if (pTarget) - DoCast(pTarget, SPELL_CATACLYSMIC_BOLT); - CataclysmicBolt_Timer = 10000; - } else CataclysmicBolt_Timer -= diff; - - //SearNova_Timer - if (SearNova_Timer <= diff) - { - DoCast(me->getVictim(), SPELL_SEAR_NOVA); - SearNova_Timer = 20000+rand()%40000; - } else SearNova_Timer -= diff; - - //Enrage_Timer - if (Enrage_Timer <= diff) - { - DoCast(me, SPELL_ENRAGE); - Enrage_Timer = 90000; - } else Enrage_Timer -= diff; - - //Blessing of Tides Trigger - if ((me->GetHealth()*100 / me->GetMaxHealth()) <= 75 && !BlessingOfTides) - { - BlessingOfTides = true; - bool continueTriggering = false; - Creature* Advisor; - for (uint8 i = 0; i < 4; ++i) - if (Advisors[i]) - { - Advisor = (Unit::GetCreature(*me, Advisors[i])); - if (Advisor && Advisor->isAlive()) - { - continueTriggering = true; - break; - } - } - if (continueTriggering) - { - DoCast(me, SPELL_BLESSING_OF_THE_TIDES); - me->MonsterYell(SAY_GAIN_BLESSING_OF_TIDES, LANG_UNIVERSAL, NULL); - DoPlaySoundToSet(me, SOUND_GAIN_BLESSING_OF_TIDES); - } - } - - DoMeleeAttackIfReady(); - } -}; - -//Fathom-Guard Sharkkis AI -struct boss_fathomguard_sharkkisAI : public ScriptedAI -{ - boss_fathomguard_sharkkisAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - } - - ScriptedInstance* pInstance; - - uint32 LeechingThrow_Timer; - uint32 TheBeastWithin_Timer; - uint32 Multishot_Timer; - uint32 Pet_Timer; - - bool pet; - - uint64 SummonedPet; - - void Reset() - { - LeechingThrow_Timer = 20000; - TheBeastWithin_Timer = 30000; - Multishot_Timer = 15000; - Pet_Timer = 10000; - - pet = false; - - Creature *Pet = Unit::GetCreature(*me, SummonedPet); - if (Pet && Pet->isAlive()) - { - Pet->DealDamage(Pet, Pet->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); - } - - SummonedPet = 0; - - if (pInstance) - pInstance->SetData(DATA_KARATHRESSEVENT, NOT_STARTED); - } - - void JustDied(Unit * /*victim*/) - { - if (pInstance) - { - Creature *Karathress = NULL; - Karathress = (Unit::GetCreature((*me), pInstance->GetData64(DATA_KARATHRESS))); - - if (Karathress) - CAST_AI(boss_fathomlord_karathressAI, Karathress->AI())->EventSharkkisDeath(); - CAST_AI(boss_fathomlord_karathressAI, Karathress->AI())->EventSharkkisDeath(); - } - } - - void EnterCombat(Unit * who) - { - if (pInstance) - { - pInstance->SetData64(DATA_KARATHRESSEVENT_STARTER, who->GetGUID()); - pInstance->SetData(DATA_KARATHRESSEVENT, IN_PROGRESS); - } - } - - void UpdateAI(const uint32 diff) - { - //Only if not incombat check if the event is started - if (!me->isInCombat() && pInstance && pInstance->GetData(DATA_KARATHRESSEVENT)) - { - Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_KARATHRESSEVENT_STARTER)); - - if (pTarget) - { - AttackStart(pTarget); - } - } - - //Return since we have no target - if (!UpdateVictim()) - return; - - //someone evaded! - if (pInstance && !pInstance->GetData(DATA_KARATHRESSEVENT)) - { - EnterEvadeMode(); - return; - } - - //LeechingThrow_Timer - if (LeechingThrow_Timer <= diff) - { - DoCast(me->getVictim(), SPELL_LEECHING_THROW); - LeechingThrow_Timer = 20000; - } else LeechingThrow_Timer -= diff; - - //Multishot_Timer - if (Multishot_Timer <= diff) - { - DoCast(me->getVictim(), SPELL_MULTISHOT); - Multishot_Timer = 20000; - } else Multishot_Timer -= diff; - - //TheBeastWithin_Timer - if (TheBeastWithin_Timer <= diff) - { - DoCast(me, SPELL_THE_BEAST_WITHIN); - Creature *Pet = Unit::GetCreature(*me, SummonedPet); - if (Pet && Pet->isAlive()) - { - Pet->CastSpell(Pet, SPELL_PET_ENRAGE, true); - } - TheBeastWithin_Timer = 30000; - } else TheBeastWithin_Timer -= diff; - - //Pet_Timer - if (Pet_Timer < diff && pet == false) - { - pet = true; - //uint32 spell_id; - uint32 pet_id; - if (!urand(0,1)) - { - //spell_id = SPELL_SUMMON_FATHOM_LURKER; - pet_id = CREATURE_FATHOM_LURKER; - } - else - { - //spell_id = SPELL_SUMMON_FATHOM_SPOREBAT; - pet_id = CREATURE_FATHOM_SPOREBAT; - } - //DoCast(me, spell_id, true); - Creature *Pet = DoSpawnCreature(pet_id,0,0,0,0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); - Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); - if (Pet && pTarget) - { - Pet->AI()->AttackStart(pTarget); - SummonedPet = Pet->GetGUID(); - } - } else Pet_Timer -= diff; - - DoMeleeAttackIfReady(); - } -}; - -//Fathom-Guard Tidalvess AI -struct boss_fathomguard_tidalvessAI : public ScriptedAI -{ - boss_fathomguard_tidalvessAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - } - - ScriptedInstance* pInstance; - - uint32 FrostShock_Timer; - uint32 Spitfire_Timer; - uint32 PoisonCleansing_Timer; - uint32 Earthbind_Timer; - - void Reset() - { - FrostShock_Timer = 25000; - Spitfire_Timer = 60000; - PoisonCleansing_Timer = 30000; - Earthbind_Timer = 45000; - - if (pInstance) - pInstance->SetData(DATA_KARATHRESSEVENT, NOT_STARTED); - } - - void JustDied(Unit * /*victim*/) - { - if (pInstance) - { - Creature *Karathress = NULL; - Karathress = (Unit::GetCreature((*me), pInstance->GetData64(DATA_KARATHRESS))); - - if (Karathress) - if (!me->isAlive() && Karathress) - CAST_AI(boss_fathomlord_karathressAI, Karathress->AI())->EventTidalvessDeath(); - } - } - - void EnterCombat(Unit * who) - { - if (pInstance) - { - pInstance->SetData64(DATA_KARATHRESSEVENT_STARTER, who->GetGUID()); - pInstance->SetData(DATA_KARATHRESSEVENT, IN_PROGRESS); - } - DoCast(me, SPELL_WINDFURY_WEAPON); - } - - void UpdateAI(const uint32 diff) - { - //Only if not incombat check if the event is started - if (!me->isInCombat() && pInstance && pInstance->GetData(DATA_KARATHRESSEVENT)) - { - Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_KARATHRESSEVENT_STARTER)); - - if (pTarget) - { - AttackStart(pTarget); - } - } - - //Return since we have no target - if (!UpdateVictim()) - return; - - //someone evaded! - if (pInstance && !pInstance->GetData(DATA_KARATHRESSEVENT)) - { - EnterEvadeMode(); - return; - } - - if (!me->HasAura(SPELL_WINDFURY_WEAPON)) - { - DoCast(me, SPELL_WINDFURY_WEAPON); - } - - //FrostShock_Timer - if (FrostShock_Timer <= diff) - { - DoCast(me->getVictim(), SPELL_FROST_SHOCK); - FrostShock_Timer = 25000+rand()%5000; - } else FrostShock_Timer -= diff; - - //Spitfire_Timer - if (Spitfire_Timer <= diff) - { - DoCast(me, SPELL_SPITFIRE_TOTEM); - Unit *SpitfireTotem = Unit::GetUnit(*me, CREATURE_SPITFIRE_TOTEM); - if (SpitfireTotem) - { - CAST_CRE(SpitfireTotem)->AI()->AttackStart(me->getVictim()); - } - Spitfire_Timer = 60000; - } else Spitfire_Timer -= diff; - - //PoisonCleansing_Timer - if (PoisonCleansing_Timer <= diff) - { - DoCast(me, SPELL_POISON_CLEANSING_TOTEM); - PoisonCleansing_Timer = 30000; - } else PoisonCleansing_Timer -= diff; - - //Earthbind_Timer - if (Earthbind_Timer <= diff) - { - DoCast(me, SPELL_EARTHBIND_TOTEM); - Earthbind_Timer = 45000; - } else Earthbind_Timer -= diff; - - DoMeleeAttackIfReady(); - } -}; - -//Fathom-Guard Caribdis AI -struct boss_fathomguard_caribdisAI : public ScriptedAI -{ - boss_fathomguard_caribdisAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - } - - ScriptedInstance* pInstance; - - uint32 WaterBoltVolley_Timer; - uint32 TidalSurge_Timer; - uint32 Heal_Timer; - uint32 Cyclone_Timer; - - void Reset() - { - WaterBoltVolley_Timer = 35000; - TidalSurge_Timer = 15000+rand()%5000; - Heal_Timer = 55000; - Cyclone_Timer = 30000+rand()%10000; - - if (pInstance) - pInstance->SetData(DATA_KARATHRESSEVENT, NOT_STARTED); - } - - void JustDied(Unit * /*victim*/) - { - if (pInstance) - { - Creature *Karathress = NULL; - Karathress = (Unit::GetCreature((*me), pInstance->GetData64(DATA_KARATHRESS))); - - if (Karathress) - if (!me->isAlive() && Karathress) - CAST_AI(boss_fathomlord_karathressAI, Karathress->AI())->EventCaribdisDeath(); - } - } - - void EnterCombat(Unit * who) - { - if (pInstance) - { - pInstance->SetData64(DATA_KARATHRESSEVENT_STARTER, who->GetGUID()); - pInstance->SetData(DATA_KARATHRESSEVENT, IN_PROGRESS); - } - } - - void UpdateAI(const uint32 diff) - { - //Only if not incombat check if the event is started - if (!me->isInCombat() && pInstance && pInstance->GetData(DATA_KARATHRESSEVENT)) - { - Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_KARATHRESSEVENT_STARTER)); - - if (pTarget) - { - AttackStart(pTarget); - } - } - - //Return since we have no target - if (!UpdateVictim()) - return; - - //someone evaded! - if (pInstance && !pInstance->GetData(DATA_KARATHRESSEVENT)) - { - EnterEvadeMode(); - return; - } - - //WaterBoltVolley_Timer - if (WaterBoltVolley_Timer <= diff) - { - DoCast(me->getVictim(), SPELL_WATER_BOLT_VOLLEY); - WaterBoltVolley_Timer = 30000; - } else WaterBoltVolley_Timer -= diff; - - //TidalSurge_Timer - if (TidalSurge_Timer <= diff) - { - DoCast(me->getVictim(), SPELL_TIDAL_SURGE); - // Hacky way to do it - won't trigger elseways - me->getVictim()->CastSpell(me->getVictim(), SPELL_TIDAL_SURGE_FREEZE, true); - TidalSurge_Timer = 15000+rand()%5000; - } else TidalSurge_Timer -= diff; - - //Cyclone_Timer - if (Cyclone_Timer <= diff) - { - //DoCast(me, SPELL_SUMMON_CYCLONE); // Doesn't work - Cyclone_Timer = 30000+rand()%10000; - Creature *Cyclone = me->SummonCreature(CREATURE_CYCLONE, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), (rand()%5), TEMPSUMMON_TIMED_DESPAWN, 15000); - if (Cyclone) - { - CAST_CRE(Cyclone)->SetFloatValue(OBJECT_FIELD_SCALE_X, 3.0f); - Cyclone->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - Cyclone->setFaction(me->getFaction()); - Cyclone->CastSpell(Cyclone, SPELL_CYCLONE_CYCLONE, true); - Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); - if (pTarget) - { - Cyclone->AI()->AttackStart(pTarget); - } - } - } else Cyclone_Timer -= diff; - - //Heal_Timer - if (Heal_Timer <= diff) - { - // It can be cast on any of the mobs - Unit *pUnit = NULL; - - while (pUnit == NULL || !pUnit->isAlive()) - { - pUnit = selectAdvisorUnit(); - } - - if (pUnit && pUnit->isAlive()) - DoCast(pUnit, SPELL_HEAL); - Heal_Timer = 60000; - } else Heal_Timer -= diff; - - DoMeleeAttackIfReady(); - } - - Unit* selectAdvisorUnit() - { - Unit* pUnit = NULL; - if (pInstance) - { - switch(rand()%4) - { - case 0: - pUnit = Unit::GetUnit((*me), pInstance->GetData64(DATA_KARATHRESS)); - break; - case 1: - pUnit = Unit::GetUnit((*me), pInstance->GetData64(DATA_SHARKKIS)); - break; - case 2: - pUnit = Unit::GetUnit((*me), pInstance->GetData64(DATA_TIDALVESS)); - break; - case 3: - pUnit = me; - break; - } - } else pUnit = me; - - return pUnit; - } -}; - -CreatureAI* GetAI_boss_fathomlord_karathress(Creature* pCreature) -{ - return new boss_fathomlord_karathressAI (pCreature); -} - -CreatureAI* GetAI_boss_fathomguard_sharkkis(Creature* pCreature) -{ - return new boss_fathomguard_sharkkisAI (pCreature); -} - -CreatureAI* GetAI_boss_fathomguard_tidalvess(Creature* pCreature) -{ - return new boss_fathomguard_tidalvessAI (pCreature); -} - -CreatureAI* GetAI_boss_fathomguard_caribdis(Creature* pCreature) -{ - return new boss_fathomguard_caribdisAI (pCreature); -} - -void AddSC_boss_fathomlord_karathress() -{ - Script *newscript; - newscript = new Script; - newscript->Name = "boss_fathomlord_karathress"; - newscript->GetAI = &GetAI_boss_fathomlord_karathress; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "boss_fathomguard_sharkkis"; - newscript->GetAI = &GetAI_boss_fathomguard_sharkkis; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "boss_fathomguard_tidalvess"; - newscript->GetAI = &GetAI_boss_fathomguard_tidalvess; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "boss_fathomguard_caribdis"; - newscript->GetAI = &GetAI_boss_fathomguard_caribdis; - newscript->RegisterSelf(); -} - diff --git a/src/server/scripts/Outland/CoilfangReservoir/serpent_shrine/boss_hydross_the_unstable.cpp b/src/server/scripts/Outland/CoilfangReservoir/serpent_shrine/boss_hydross_the_unstable.cpp deleted file mode 100644 index 923fdf55f80..00000000000 --- a/src/server/scripts/Outland/CoilfangReservoir/serpent_shrine/boss_hydross_the_unstable.cpp +++ /dev/null @@ -1,379 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: Boss_Hydross_The_Unstable -SD%Complete: 90 -SDComment: Some details and adjustments left to do, probably nothing major. Spawns may be spawned in different way/location. -SDCategory: Coilfang Resevoir, Serpent Shrine Cavern -EndScriptData */ - -#include "ScriptedPch.h" -#include "serpent_shrine.h" - -#define SAY_AGGRO -1548000 -#define SAY_SWITCH_TO_CLEAN -1548001 -#define SAY_CLEAN_SLAY1 -1548002 -#define SAY_CLEAN_SLAY2 -1548003 -#define SAY_CLEAN_DEATH -1548004 -#define SAY_SWITCH_TO_CORRUPT -1548005 -#define SAY_CORRUPT_SLAY1 -1548006 -#define SAY_CORRUPT_SLAY2 -1548007 -#define SAY_CORRUPT_DEATH -1548008 - -#define SWITCH_RADIUS 18 - -#define MODEL_CORRUPT 20609 -#define MODEL_CLEAN 20162 - -#define SPELL_WATER_TOMB 38235 -#define SPELL_MARK_OF_HYDROSS1 38215 -#define SPELL_MARK_OF_HYDROSS2 38216 -#define SPELL_MARK_OF_HYDROSS3 38217 -#define SPELL_MARK_OF_HYDROSS4 38218 -#define SPELL_MARK_OF_HYDROSS5 38231 -#define SPELL_MARK_OF_HYDROSS6 40584 -#define SPELL_MARK_OF_CORRUPTION1 38219 -#define SPELL_MARK_OF_CORRUPTION2 38220 -#define SPELL_MARK_OF_CORRUPTION3 38221 -#define SPELL_MARK_OF_CORRUPTION4 38222 -#define SPELL_MARK_OF_CORRUPTION5 38230 -#define SPELL_MARK_OF_CORRUPTION6 40583 -#define SPELL_VILE_SLUDGE 38246 -#define SPELL_ENRAGE 27680 //this spell need verification -#define SPELL_SUMMON_WATER_ELEMENT 36459 //not in use yet(in use ever?) -#define SPELL_ELEMENTAL_SPAWNIN 25035 -#define SPELL_BLUE_BEAM 40227 //channeled Hydross Beam Helper (not in use yet) - -#define ENTRY_PURE_SPAWN 22035 -#define ENTRY_TAINTED_SPAWN 22036 -#define ENTRY_BEAM_DUMMY 21934 - -#define HYDROSS_X -239.439 -#define HYDROSS_Y -363.481 - -#define SPAWN_X_DIFF1 6.934003 -#define SPAWN_Y_DIFF1 -11.255012 -#define SPAWN_X_DIFF2 -6.934003 -#define SPAWN_Y_DIFF2 11.255012 -#define SPAWN_X_DIFF3 -12.577011 -#define SPAWN_Y_DIFF3 -4.72702 -#define SPAWN_X_DIFF4 12.577011 -#define SPAWN_Y_DIFF4 4.72702 - -struct boss_hydross_the_unstableAI : public ScriptedAI -{ - boss_hydross_the_unstableAI(Creature *c) : ScriptedAI(c), Summons(me) - { - pInstance = c->GetInstanceData(); - } - - ScriptedInstance* pInstance; - - uint64 beams[2]; - uint32 PosCheck_Timer; - uint32 MarkOfHydross_Timer; - uint32 MarkOfCorruption_Timer; - uint32 WaterTomb_Timer; - uint32 VileSludge_Timer; - uint32 MarkOfHydross_Count; - uint32 MarkOfCorruption_Count; - uint32 EnrageTimer; - bool CorruptedForm; - bool beam; - SummonList Summons; - - void Reset() - { - DeSummonBeams(); - beams[0] = 0; - beams[1] = 0; - PosCheck_Timer = 2500; - MarkOfHydross_Timer = 15000; - MarkOfCorruption_Timer = 15000; - WaterTomb_Timer = 7000; - VileSludge_Timer = 7000; - MarkOfHydross_Count = 0; - MarkOfCorruption_Count = 0; - EnrageTimer = 600000; - - CorruptedForm = false; - me->SetMeleeDamageSchool(SPELL_SCHOOL_FROST); - me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FROST, true); - me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_NATURE, false); - - me->SetDisplayId(MODEL_CLEAN); - - if (pInstance) - pInstance->SetData(DATA_HYDROSSTHEUNSTABLEEVENT, NOT_STARTED); - beam = false; - Summons.DespawnAll(); - } - - void SummonBeams() - { - Creature* beamer = me->SummonCreature(ENTRY_BEAM_DUMMY,-258.333,-356.34,22.0499,5.90835,TEMPSUMMON_CORPSE_DESPAWN,0); - if (beamer) - { - beamer->CastSpell(me,SPELL_BLUE_BEAM,true); - beamer->SetDisplayId(11686); //invisible - beamer->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - beams[0]=beamer->GetGUID(); - } - beamer = beamer = me->SummonCreature(ENTRY_BEAM_DUMMY,-219.918,-371.308,22.0042,2.73072,TEMPSUMMON_CORPSE_DESPAWN,0); - if (beamer) - { - beamer->CastSpell(me,SPELL_BLUE_BEAM,true); - beamer->SetDisplayId(11686); //invisible - beamer->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - beams[1]=beamer->GetGUID(); - } - } - void DeSummonBeams() - { - for (uint8 i=0; i<2; ++i) - { - Creature* mob = Unit::GetCreature(*me,beams[i]); - if (mob) - { - mob->setDeathState(DEAD); - mob->RemoveCorpse(); - } - } - } - void EnterCombat(Unit * /*who*/) - { - DoScriptText(SAY_AGGRO, me); - - if (pInstance) - pInstance->SetData(DATA_HYDROSSTHEUNSTABLEEVENT, IN_PROGRESS); - } - - void KilledUnit(Unit * /*victim*/) - { - if (CorruptedForm) - { - DoScriptText(RAND(SAY_CORRUPT_SLAY1,SAY_CORRUPT_SLAY2), me); - } - else - { - DoScriptText(RAND(SAY_CLEAN_SLAY1,SAY_CLEAN_SLAY2), me); - } - } - - void JustSummoned(Creature* summoned) - { - if (summoned->GetEntry() == ENTRY_PURE_SPAWN) - { - summoned->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FROST, true); - summoned->CastSpell(summoned,SPELL_ELEMENTAL_SPAWNIN,true); - Summons.Summon(summoned); - } - if (summoned->GetEntry() == ENTRY_TAINTED_SPAWN) - { - summoned->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_NATURE, true); - summoned->CastSpell(summoned,SPELL_ELEMENTAL_SPAWNIN,true); - Summons.Summon(summoned); - } - } - - void SummonedCreatureDespawn(Creature *summon) - { - Summons.Despawn(summon); - } - - void JustDied(Unit * /*victim*/) - { - if (CorruptedForm) - DoScriptText(SAY_CORRUPT_DEATH, me); - else - DoScriptText(SAY_CLEAN_DEATH, me); - - if (pInstance) - pInstance->SetData(DATA_HYDROSSTHEUNSTABLEEVENT, DONE); - Summons.DespawnAll(); - } - - void UpdateAI(const uint32 diff) - { - if (!beam) - { - SummonBeams(); - beam=true; - } - //Return since we have no target - if (!UpdateVictim()) - return; - - // corrupted form - if (CorruptedForm) - { - //MarkOfCorruption_Timer - if (MarkOfCorruption_Timer <= diff) - { - if (MarkOfCorruption_Count <= 5) - { - uint32 mark_spell = 0; - - switch (MarkOfCorruption_Count) - { - case 0: mark_spell = SPELL_MARK_OF_CORRUPTION1; break; - case 1: mark_spell = SPELL_MARK_OF_CORRUPTION2; break; - case 2: mark_spell = SPELL_MARK_OF_CORRUPTION3; break; - case 3: mark_spell = SPELL_MARK_OF_CORRUPTION4; break; - case 4: mark_spell = SPELL_MARK_OF_CORRUPTION5; break; - case 5: mark_spell = SPELL_MARK_OF_CORRUPTION6; break; - } - - DoCast(me->getVictim(), mark_spell); - - if (MarkOfCorruption_Count < 5) - ++MarkOfCorruption_Count; - } - - MarkOfCorruption_Timer = 15000; - } else MarkOfCorruption_Timer -= diff; - - //VileSludge_Timer - if (VileSludge_Timer <= diff) - { - Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); - if (pTarget) - DoCast(pTarget, SPELL_VILE_SLUDGE); - - VileSludge_Timer = 15000; - } else VileSludge_Timer -= diff; - - //PosCheck_Timer - if (PosCheck_Timer <= diff) - { - if (me->IsWithinDist2d(HYDROSS_X, HYDROSS_Y, SWITCH_RADIUS)) - { - // switch to clean form - me->SetDisplayId(MODEL_CLEAN); - CorruptedForm = false; - MarkOfHydross_Count = 0; - - DoScriptText(SAY_SWITCH_TO_CLEAN, me); - DoResetThreat(); - SummonBeams(); - - // spawn 4 adds - DoSpawnCreature(ENTRY_PURE_SPAWN, SPAWN_X_DIFF1, SPAWN_Y_DIFF1, 3, 0, TEMPSUMMON_CORPSE_DESPAWN, 0); - DoSpawnCreature(ENTRY_PURE_SPAWN, SPAWN_X_DIFF2, SPAWN_Y_DIFF2, 3, 0, TEMPSUMMON_CORPSE_DESPAWN, 0); - DoSpawnCreature(ENTRY_PURE_SPAWN, SPAWN_X_DIFF3, SPAWN_Y_DIFF3, 3, 0, TEMPSUMMON_CORPSE_DESPAWN, 0); - DoSpawnCreature(ENTRY_PURE_SPAWN, SPAWN_X_DIFF4, SPAWN_Y_DIFF4, 3, 0, TEMPSUMMON_CORPSE_DESPAWN, 0); - - me->SetMeleeDamageSchool(SPELL_SCHOOL_FROST); - me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FROST, true); - me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_NATURE, false); - } - - PosCheck_Timer = 2500; - } else PosCheck_Timer -=diff; - } - // clean form - else - { - //MarkOfHydross_Timer - if (MarkOfHydross_Timer <= diff) - { - if (MarkOfHydross_Count <= 5) - { - uint32 mark_spell = NULL; - - switch(MarkOfHydross_Count) - { - case 0: mark_spell = SPELL_MARK_OF_HYDROSS1; break; - case 1: mark_spell = SPELL_MARK_OF_HYDROSS2; break; - case 2: mark_spell = SPELL_MARK_OF_HYDROSS3; break; - case 3: mark_spell = SPELL_MARK_OF_HYDROSS4; break; - case 4: mark_spell = SPELL_MARK_OF_HYDROSS5; break; - case 5: mark_spell = SPELL_MARK_OF_HYDROSS6; break; - } - - DoCast(me->getVictim(), mark_spell); - - if (MarkOfHydross_Count < 5) - ++MarkOfHydross_Count; - } - - MarkOfHydross_Timer = 15000; - } else MarkOfHydross_Timer -= diff; - - //WaterTomb_Timer - if (WaterTomb_Timer <= diff) - { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); - if (pTarget) - DoCast(pTarget, SPELL_WATER_TOMB); - - WaterTomb_Timer = 7000; - } else WaterTomb_Timer -= diff; - - //PosCheck_Timer - if (PosCheck_Timer <= diff) - { - if (!me->IsWithinDist2d(HYDROSS_X, HYDROSS_Y, SWITCH_RADIUS)) - { - // switch to corrupted form - me->SetDisplayId(MODEL_CORRUPT); - MarkOfCorruption_Count = 0; - CorruptedForm = true; - - DoScriptText(SAY_SWITCH_TO_CORRUPT, me); - DoResetThreat(); - DeSummonBeams(); - - // spawn 4 adds - DoSpawnCreature(ENTRY_TAINTED_SPAWN, SPAWN_X_DIFF1, SPAWN_Y_DIFF1, 3, 0, TEMPSUMMON_CORPSE_DESPAWN, 0); - DoSpawnCreature(ENTRY_TAINTED_SPAWN, SPAWN_X_DIFF2, SPAWN_Y_DIFF2, 3, 0, TEMPSUMMON_CORPSE_DESPAWN, 0); - DoSpawnCreature(ENTRY_TAINTED_SPAWN, SPAWN_X_DIFF3, SPAWN_Y_DIFF3, 3, 0, TEMPSUMMON_CORPSE_DESPAWN, 0); - DoSpawnCreature(ENTRY_TAINTED_SPAWN, SPAWN_X_DIFF4, SPAWN_Y_DIFF4, 3, 0, TEMPSUMMON_CORPSE_DESPAWN, 0); - - me->SetMeleeDamageSchool(SPELL_SCHOOL_NATURE); - me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_NATURE, true); - me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FROST, false); - } - - PosCheck_Timer = 2500; - } else PosCheck_Timer -=diff; - } - - //EnrageTimer - if (EnrageTimer <= diff) - { - DoCast(me, SPELL_ENRAGE); - EnrageTimer = 60000; - } else EnrageTimer -= diff; - - DoMeleeAttackIfReady(); - } -}; -CreatureAI* GetAI_boss_hydross_the_unstable(Creature* pCreature) -{ - return new boss_hydross_the_unstableAI (pCreature); -} - -void AddSC_boss_hydross_the_unstable() -{ - Script *newscript; - newscript = new Script; - newscript->Name = "boss_hydross_the_unstable"; - newscript->GetAI = &GetAI_boss_hydross_the_unstable; - newscript->RegisterSelf(); -} - diff --git a/src/server/scripts/Outland/CoilfangReservoir/serpent_shrine/boss_lady_vashj.cpp b/src/server/scripts/Outland/CoilfangReservoir/serpent_shrine/boss_lady_vashj.cpp deleted file mode 100644 index 2f0485d0e6c..00000000000 --- a/src/server/scripts/Outland/CoilfangReservoir/serpent_shrine/boss_lady_vashj.cpp +++ /dev/null @@ -1,1039 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA02111-1307USA - */ - -/* ScriptData -SDName: Boss_Lady_Vashj -SD%Complete: 99 -SDComment: Missing blizzlike Shield Generators coords -SDCategory: Coilfang Resevoir, Serpent Shrine Cavern -EndScriptData */ - -#include "ScriptedPch.h" -#include "serpent_shrine.h" -#include "ScriptedSimpleAI.h" -#include "Spell.h" - -#define SAY_INTRO -1548042 -#define SAY_AGGRO1 -1548043 -#define SAY_AGGRO2 -1548044 -#define SAY_AGGRO3 -1548045 -#define SAY_AGGRO4 -1548046 -#define SAY_PHASE1 -1548047 -#define SAY_PHASE2 -1548048 -#define SAY_PHASE3 -1548049 -#define SAY_BOWSHOT1 -1548050 -#define SAY_BOWSHOT2 -1548051 -#define SAY_SLAY1 -1548052 -#define SAY_SLAY2 -1548053 -#define SAY_SLAY3 -1548054 -#define SAY_DEATH -1548055 - -#define SPELL_SURGE 38044 -#define SPELL_MULTI_SHOT 38310 -#define SPELL_SHOCK_BLAST 38509 -#define SPELL_ENTANGLE 38316 -#define SPELL_STATIC_CHARGE_TRIGGER 38280 -#define SPELL_FORKED_LIGHTNING 40088 -#define SPELL_SHOOT 40873 -#define SPELL_POISON_BOLT 40095 -#define SPELL_TOXIC_SPORES 38575 -#define SPELL_MAGIC_BARRIER 38112 - -#define MIDDLE_X 30.134 -#define MIDDLE_Y -923.65 -#define MIDDLE_Z 42.9 - -#define SPOREBAT_X 30.977156 -#define SPOREBAT_Y -925.297761 -#define SPOREBAT_Z 77.176567 -#define SPOREBAT_O 5.223932 - -#define SHIED_GENERATOR_CHANNEL 19870 -#define ENCHANTED_ELEMENTAL 21958 -#define TAINTED_ELEMENTAL 22009 -#define COILFANG_STRIDER 22056 -#define COILFANG_ELITE 22055 -#define TOXIC_SPOREBAT 22140 -#define TOXIC_SPORES_TRIGGER 22207 - -#define TEXT_NOT_INITIALIZED "Instance script not initialized" -#define TEXT_ALREADY_DEACTIVATED "Already deactivated" - -float ElementPos[8][4] = -{ - {8.3, -835.3, 21.9, 5}, - {53.4, -835.3, 21.9, 4.5}, - {96, -861.9, 21.8, 4}, - {96, -986.4, 21.4, 2.5}, - {54.4, -1010.6, 22, 1.8}, - {9.8, -1012, 21.7, 1.4}, - {-35, -987.6, 21.5, 0.8}, - {-58.9, -901.6, 21.5, 6} -}; - -float ElementWPPos[8][3] = -{ - {71.700752, -883.905884, 41.097168}, - {45.039848, -868.022827, 41.097015}, - {14.585141, -867.894470, 41.097061}, - {-25.415508, -906.737732, 41.097061}, - {-11.801594, -963.405884, 41.097067}, - {14.556657, -979.051514, 41.097137}, - {43.466549, -979.406677, 41.097027}, - {69.945908, -964.663940, 41.097054} -}; - -float SporebatWPPos[8][3] = -{ - {31.6,-896.3,59.1}, - {9.1, -913.9, 56}, - {5.2, -934.4, 52.4}, - {20.7, -946.9, 49.7}, - {41, -941.9, 51}, - {47.7, -927.3, 55}, - {42.2, -912.4, 51.7}, - {27, -905.9, 50} -}; - -float CoilfangElitePos[3][4] = -{ - {28.84, -923.28, 42.9, 6}, - {31.183281, -953.502625, 41.523602, 1.640957}, - {58.895180, -923.124268, 41.545307, 3.152848} -}; - -float CoilfangStriderPos[3][4] = -{ - {66.427010, -948.778503, 41.262245, 2.584220}, - {7.513962, -959.538208, 41.300422, 1.034629}, - {-12.843201, -907.798401, 41.239620, 6.087094} -}; - -float ShieldGeneratorChannelPos[4][4] = -{ - {49.6262, -902.181, 43.0975, 3.95683}, - {10.988, -901.616, 42.5371, 5.4373}, - {10.3859, -944.036, 42.5446, 0.779888}, - {49.3126, -943.398, 42.5501, 2.40174} -}; - -//Lady Vashj AI -struct boss_lady_vashjAI : public ScriptedAI -{ - boss_lady_vashjAI (Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - Intro = false; - JustCreated = true; - c->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); //set it only once on Creature create (no need do intro if wiped) - } - - ScriptedInstance *pInstance; - - uint64 ShieldGeneratorChannel[4]; - - uint32 AggroTimer; - uint32 ShockBlast_Timer; - uint32 Entangle_Timer; - uint32 StaticCharge_Timer; - uint32 ForkedLightning_Timer; - uint32 Check_Timer; - uint32 EnchantedElemental_Timer; - uint32 TaintedElemental_Timer; - uint32 CoilfangElite_Timer; - uint32 CoilfangStrider_Timer; - uint32 SummonSporebat_Timer; - uint32 SummonSporebat_StaticTimer; - uint8 EnchantedElemental_Pos; - uint8 Phase; - - bool Entangle; - bool Intro; - bool CanAttack; - bool JustCreated; - - void Reset() - { - AggroTimer = 19000; - ShockBlast_Timer = 1+rand()%60000; - Entangle_Timer = 30000; - StaticCharge_Timer = 10000+rand()%15000; - ForkedLightning_Timer = 2000; - Check_Timer = 15000; - EnchantedElemental_Timer = 5000; - TaintedElemental_Timer = 50000; - CoilfangElite_Timer = 45000+rand()%5000; - CoilfangStrider_Timer = 60000+rand()%10000; - SummonSporebat_Timer = 10000; - SummonSporebat_StaticTimer = 30000; - EnchantedElemental_Pos = 0; - Phase = 0; - - Entangle = false; - if (JustCreated) - { - CanAttack = false; - JustCreated = false; - } else CanAttack = true; - - Unit *remo; - for (uint8 i = 0; i < 4; ++i) - { - remo = Unit::GetUnit(*me, ShieldGeneratorChannel[i]); - if (remo) - remo->setDeathState(JUST_DIED); - } - - if (pInstance) - pInstance->SetData(DATA_LADYVASHJEVENT, NOT_STARTED); - ShieldGeneratorChannel[0] = 0; - ShieldGeneratorChannel[1] = 0; - ShieldGeneratorChannel[2] = 0; - ShieldGeneratorChannel[3] = 0; - - me->SetCorpseDelay(1000*60*60); - } - - //Called when a tainted elemental dies - void EventTaintedElementalDeath() - { - //the next will spawn 50 seconds after the previous one's death - if (TaintedElemental_Timer > 50000) - TaintedElemental_Timer = 50000; - } - void KilledUnit(Unit * /*victim*/) - { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2,SAY_SLAY3), me); - } - - void JustDied(Unit * /*victim*/) - { - DoScriptText(SAY_DEATH, me); - - if (pInstance) - pInstance->SetData(DATA_LADYVASHJEVENT, DONE); - } - - void StartEvent() - { - DoScriptText(RAND(SAY_AGGRO1,SAY_AGGRO2,SAY_AGGRO3,SAY_AGGRO4), me); - - Phase = 1; - - if (pInstance) - pInstance->SetData(DATA_LADYVASHJEVENT, IN_PROGRESS); - } - - void EnterCombat(Unit * who) - { - if (pInstance) - { - //remove old tainted cores to prevent cheating in phase 2 - Map* pMap = me->GetMap(); - Map::PlayerList const &PlayerList = pMap->GetPlayers(); - for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) - { - if (Player* i_pl = i->getSource()) - { - i_pl->DestroyItemCount(31088, 1, true); - } - } - } - StartEvent();//this is EnterCombat(), so were are 100% in combat, start the event - - if (Phase != 2) - AttackStart(who); - } - - void MoveInLineOfSight(Unit *who) - { - if (!Intro) - { - Intro = true; - DoScriptText(SAY_INTRO, me); - } - if (!CanAttack) - return; - if (!who || me->getVictim()) - return; - - if (who->isTargetableForAttack() && who->isInAccessiblePlaceFor(me) && me->IsHostileTo(who)) - { - float attackRadius = me->GetAttackDistance(who); - if (me->IsWithinDistInMap(who, attackRadius) && me->GetDistanceZ(who) <= CREATURE_Z_ATTACK_RANGE && me->IsWithinLOSInMap(who)) - { - //if (who->HasStealthAura()) - // who->RemoveSpellsCausingAura(SPELL_AURA_MOD_STEALTH); - - if (!me->isInCombat())//AttackStart() sets UNIT_FLAG_IN_COMBAT, so this msut be before attacking - StartEvent(); - - if (Phase != 2) - AttackStart(who); - } - } - } - - void CastShootOrMultishot() - { - switch (urand(0,1)) - { - case 0: - //Shoot - //Used in Phases 1 and 3 after Entangle or while having nobody in melee range. A shot that hits her target for 4097-5543 Physical damage. - DoCast(me->getVictim(), SPELL_SHOOT); - break; - case 1: - //Multishot - //Used in Phases 1 and 3 after Entangle or while having nobody in melee range. A shot that hits 1 person and 4 people around him for 6475-7525 physical damage. - DoCast(me->getVictim(), SPELL_MULTI_SHOT); - break; - } - if (rand()%3) - { - DoScriptText(RAND(SAY_BOWSHOT1,SAY_BOWSHOT2), me); - } - } - - void UpdateAI(const uint32 diff) - { - if (!CanAttack && Intro) - { - if (AggroTimer <= diff) - { - CanAttack = true; - me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - AggroTimer=19000; - }else - { - AggroTimer-=diff; - return; - } - } - //to prevent abuses during phase 2 - if (Phase == 2 && !me->getVictim() && me->isInCombat()) - { - EnterEvadeMode(); - return; - } - //Return since we have no target - if (!UpdateVictim()) - return; - - if (Phase == 1 || Phase == 3) - { - //ShockBlast_Timer - if (ShockBlast_Timer <= diff) - { - //Shock Burst - //Randomly used in Phases 1 and 3 on Vashj's target, it's a Shock spell doing 8325-9675 nature damage and stunning the target for 5 seconds, during which she will not attack her target but switch to the next person on the aggro list. - DoCast(me->getVictim(), SPELL_SHOCK_BLAST); - me->TauntApply(me->getVictim()); - - ShockBlast_Timer = 1000+rand()%14000; //random cooldown - } else ShockBlast_Timer -= diff; - - //StaticCharge_Timer - if (StaticCharge_Timer <= diff) - { - //Static Charge - //Used on random people (only 1 person at any given time) in Phases 1 and 3, it's a debuff doing 2775 to 3225 Nature damage to the target and everybody in about 5 yards around it, every 1 seconds for 30 seconds. It can be removed by Cloak of Shadows, Iceblock, Divine Shield, etc, but not by Cleanse or Dispel Magic. - Unit *pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 200, true); - - if (pTarget && !pTarget->HasAura(SPELL_STATIC_CHARGE_TRIGGER)) - //cast Static Charge every 2 seconds for 20 seconds - DoCast(pTarget, SPELL_STATIC_CHARGE_TRIGGER); - - StaticCharge_Timer = 10000+rand()%20000; //blizzlike - } else StaticCharge_Timer -= diff; - - //Entangle_Timer - if (Entangle_Timer <= diff) - { - if (!Entangle) - { - //Entangle - //Used in Phases 1 and 3, it casts Entangling Roots on everybody in a 15 yard radius of Vashj, immobilzing them for 10 seconds and dealing 500 damage every 2 seconds. It's not a magic effect so it cannot be dispelled, but is removed by various buffs such as Cloak of Shadows or Blessing of Freedom. - DoCast(me->getVictim(), SPELL_ENTANGLE); - Entangle = true; - Entangle_Timer = 10000; - } - else - { - CastShootOrMultishot(); - Entangle = false; - Entangle_Timer = 20000+rand()%5000; - } - } else Entangle_Timer -= diff; - - //Phase 1 - if (Phase == 1) - { - //Start phase 2 - if ((me->GetHealth()*100 / me->GetMaxHealth()) < 70) - { - //Phase 2 begins when Vashj hits 70%. She will run to the middle of her platform and surround herself in a shield making her invulerable. - Phase = 2; - - me->GetMotionMaster()->Clear(); - DoTeleportTo(MIDDLE_X, MIDDLE_Y, MIDDLE_Z); - - Creature *pCreature; - for (uint8 i = 0; i < 4; ++i) - { - pCreature = me->SummonCreature(SHIED_GENERATOR_CHANNEL, ShieldGeneratorChannelPos[i][0], ShieldGeneratorChannelPos[i][1], ShieldGeneratorChannelPos[i][2], ShieldGeneratorChannelPos[i][3], TEMPSUMMON_CORPSE_DESPAWN, 0); - if (pCreature) - ShieldGeneratorChannel[i] = pCreature->GetGUID(); - } - DoScriptText(SAY_PHASE2, me); - } - } - //Phase 3 - else - { - //SummonSporebat_Timer - if (SummonSporebat_Timer <= diff) - { - Creature *Sporebat = NULL; - Sporebat = me->SummonCreature(TOXIC_SPOREBAT, SPOREBAT_X, SPOREBAT_Y, SPOREBAT_Z, SPOREBAT_O, TEMPSUMMON_CORPSE_DESPAWN, 0); - - if (Sporebat) - { - Unit *pTarget = NULL; - pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); - if (pTarget) - Sporebat->AI()->AttackStart(pTarget); - } - - //summon sporebats faster and faster - if (SummonSporebat_StaticTimer > 1000) - SummonSporebat_StaticTimer -= 1000; - - SummonSporebat_Timer = SummonSporebat_StaticTimer; - - if (SummonSporebat_Timer < 5000) - SummonSporebat_Timer = 5000; - - } else SummonSporebat_Timer -= diff; - } - - //Melee attack - DoMeleeAttackIfReady(); - - //Check_Timer - used to check if somebody is in melee range - if (Check_Timer <= diff) - { - bool InMeleeRange = false; - Unit *pTarget; - std::list t_list = me->getThreatManager().getThreatList(); - for (std::list::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) - { - pTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid()); - //if in melee range - if (pTarget && pTarget->IsWithinDistInMap(me, 5)) - { - InMeleeRange = true; - break; - } - } - - //if nobody is in melee range - if (!InMeleeRange) - CastShootOrMultishot(); - - Check_Timer = 5000; - } else Check_Timer -= diff; - } - //Phase 2 - else - { - //ForkedLightning_Timer - if (ForkedLightning_Timer <= diff) - { - //Forked Lightning - //Used constantly in Phase 2, it shoots out completely randomly targeted bolts of lightning which hit everybody in a roughtly 60 degree cone in front of Vashj for 2313-2687 nature damage. - Unit *pTarget = NULL; - pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); - - if (!pTarget) - pTarget = me->getVictim(); - - DoCast(pTarget, SPELL_FORKED_LIGHTNING); - - ForkedLightning_Timer = 2000+rand()%6000; //blizzlike - } else ForkedLightning_Timer -= diff; - - //EnchantedElemental_Timer - if (EnchantedElemental_Timer <= diff) - { - Creature *Elemental; - Elemental = me->SummonCreature(ENCHANTED_ELEMENTAL, ElementPos[EnchantedElemental_Pos][0], ElementPos[EnchantedElemental_Pos][1], ElementPos[EnchantedElemental_Pos][2], ElementPos[EnchantedElemental_Pos][3], TEMPSUMMON_CORPSE_DESPAWN, 0); - - if (EnchantedElemental_Pos == 7) - EnchantedElemental_Pos = 0; - else - ++EnchantedElemental_Pos; - - EnchantedElemental_Timer = 10000+rand()%5000; - } else EnchantedElemental_Timer -= diff; - - //TaintedElemental_Timer - if (TaintedElemental_Timer <= diff) - { - Creature *Tain_Elemental; - uint32 pos = rand()%8; - Tain_Elemental = me->SummonCreature(TAINTED_ELEMENTAL, ElementPos[pos][0], ElementPos[pos][1], ElementPos[pos][2], ElementPos[pos][3], TEMPSUMMON_DEAD_DESPAWN, 0); - - TaintedElemental_Timer = 120000; - } else TaintedElemental_Timer -= diff; - - //CoilfangElite_Timer - if (CoilfangElite_Timer <= diff) - { - uint32 pos = rand()%3; - Creature* CoilfangElite = NULL; - CoilfangElite = me->SummonCreature(COILFANG_ELITE, CoilfangElitePos[pos][0], CoilfangElitePos[pos][1], CoilfangElitePos[pos][2], CoilfangElitePos[pos][3], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); - if (CoilfangElite) - { - Unit *pTarget = NULL; - pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); - if (pTarget) - CoilfangElite->AI()->AttackStart(pTarget); - else if (me->getVictim()) - CoilfangElite->AI()->AttackStart(me->getVictim()); - } - CoilfangElite_Timer = 45000+rand()%5000; - } else CoilfangElite_Timer -= diff; - - //CoilfangStrider_Timer - if (CoilfangStrider_Timer <= diff) - { - uint32 pos = rand()%3; - Creature* CoilfangStrider = NULL; - CoilfangStrider = me->SummonCreature(COILFANG_STRIDER, CoilfangStriderPos[pos][0], CoilfangStriderPos[pos][1], CoilfangStriderPos[pos][2], CoilfangStriderPos[pos][3], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); - if (CoilfangStrider) - { - Unit *pTarget = NULL; - pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); - if (pTarget) - CoilfangStrider->AI()->AttackStart(pTarget); - else if (me->getVictim()) - CoilfangStrider->AI()->AttackStart(me->getVictim()); - } - CoilfangStrider_Timer = 60000+rand()%10000; - } else CoilfangStrider_Timer -= diff; - - //Check_Timer - if (Check_Timer <= diff) - { - //Start Phase 3 - if (pInstance && pInstance->GetData(DATA_CANSTARTPHASE3)) - { - //set life 50% - me->SetHealth(me->GetMaxHealth()/2); - - me->RemoveAurasDueToSpell(SPELL_MAGIC_BARRIER); - - DoScriptText(SAY_PHASE3, me); - - Phase = 3; - - //return to the tank - me->GetMotionMaster()->MoveChase(me->getVictim()); - } - Check_Timer = 1000; - } else Check_Timer -= diff; - } - } -}; - -//Enchanted Elemental -//If one of them reaches Vashj he will increase her damage done by 5%. -struct mob_enchanted_elementalAI : public ScriptedAI -{ - mob_enchanted_elementalAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - } - - ScriptedInstance *pInstance; - uint32 move; - uint32 phase; - float x, y, z; - - uint64 VashjGUID; - - void Reset() - { - me->SetSpeed(MOVE_WALK,0.6);//walk - me->SetSpeed(MOVE_RUN,0.6);//run - move = 0; - phase = 1; - - VashjGUID = 0; - - for (int i = 0; i<8; ++i)//search for nearest waypoint (up on stairs) - { - if (!x || !y || !z) - { - x = ElementWPPos[i][0]; - y = ElementWPPos[i][1]; - z = ElementWPPos[i][2]; - } - else - { - if (me->GetDistance(ElementWPPos[i][0],ElementWPPos[i][1],ElementWPPos[i][2]) < me->GetDistance(x,y,z)) - { - x = ElementWPPos[i][0]; - y = ElementWPPos[i][1]; - z = ElementWPPos[i][2]; - } - } - } - if (pInstance) - VashjGUID = pInstance->GetData64(DATA_LADYVASHJ); - } - - void EnterCombat(Unit * /*who*/) {} - - void MoveInLineOfSight(Unit * /*who*/) {} - - void UpdateAI(const uint32 diff) - { - if (!pInstance) - return; - - if (!VashjGUID) - return; - - if (move <= diff) - { - me->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE); - if (phase == 1) - me->GetMotionMaster()->MovePoint(0, x, y, z); - if (phase == 1 && me->IsWithinDist3d(x,y,z, 0.1)) - phase = 2; - if (phase == 2) - { - me->GetMotionMaster()->MovePoint(0, MIDDLE_X, MIDDLE_Y, MIDDLE_Z); - phase = 3; - } - if (phase == 3) - { - me->GetMotionMaster()->MovePoint(0, MIDDLE_X, MIDDLE_Y, MIDDLE_Z); - if (me->IsWithinDist3d(MIDDLE_X, MIDDLE_Y, MIDDLE_Z, 3)) - DoCast(me, SPELL_SURGE); - } - if (Creature *Vashj = Unit::GetCreature(*me, VashjGUID)) - { - if (!Vashj->isInCombat() || CAST_AI(boss_lady_vashjAI, Vashj->AI())->Phase != 2 || Vashj->isDead()) - { - //call Unsummon() - me->Kill(me); - } - } - move = 1000; - } else move -= diff; - } -}; - -//Tainted Elemental -//This mob has 7,900 life, doesn't move, and shoots Poison Bolts at one person anywhere in the area, doing 3,000 nature damage and placing a posion doing 2,000 damage every 2 seconds. He will switch targets often, or sometimes just hang on a single player, but there is nothing you can do about it except heal the damage and kill the Tainted Elemental -struct mob_tainted_elementalAI : public ScriptedAI -{ - mob_tainted_elementalAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - } - - ScriptedInstance *pInstance; - - uint32 PoisonBolt_Timer; - uint32 Despawn_Timer; - - void Reset() - { - PoisonBolt_Timer = 5000+rand()%5000; - Despawn_Timer = 30000; - } - - void JustDied(Unit * /*killer*/) - { - if (pInstance) - { - Creature *Vashj = NULL; - Vashj = (Unit::GetCreature((*me), pInstance->GetData64(DATA_LADYVASHJ))); - - if (Vashj) - CAST_AI(boss_lady_vashjAI, Vashj->AI())->EventTaintedElementalDeath(); - } - } - - void EnterCombat(Unit * who) - { - me->AddThreat(who, 0.1f); - } - - void UpdateAI(const uint32 diff) - { - //PoisonBolt_Timer - if (PoisonBolt_Timer <= diff) - { - Unit *pTarget = NULL; - pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); - - if (pTarget && pTarget->IsWithinDistInMap(me, 30)) - DoCast(pTarget, SPELL_POISON_BOLT); - - PoisonBolt_Timer = 5000+rand()%5000; - } else PoisonBolt_Timer -= diff; - - //Despawn_Timer - if (Despawn_Timer <= diff) - { - //call Unsummon() - me->setDeathState(DEAD); - - //to prevent crashes - Despawn_Timer = 1000; - } else Despawn_Timer -= diff; - } -}; - -//Toxic Sporebat -//Toxic Spores: Used in Phase 3 by the Spore Bats, it creates a contaminated green patch of ground, dealing about 2775-3225 nature damage every second to anyone who stands in it. -struct mob_toxic_sporebatAI : public ScriptedAI -{ - mob_toxic_sporebatAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - EnterEvadeMode(); - } - - ScriptedInstance *pInstance; - - uint32 movement_timer; - uint32 ToxicSpore_Timer; - uint32 bolt_timer; - uint32 Check_Timer; - - void Reset() - { - me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); - me->setFaction(14); - movement_timer = 0; - ToxicSpore_Timer = 5000; - bolt_timer = 5500; - Check_Timer = 1000; - } - - void EnterCombat(Unit * /*who*/) - { - - } - - void MoveInLineOfSight(Unit * /*who*/) - { - - } - - void MovementInform(uint32 type, uint32 id) - { - if (type != POINT_MOTION_TYPE) - return; - - if (id == 1) - movement_timer = 0; - } - - void UpdateAI (const uint32 diff) - { - //Random movement - if (movement_timer <= diff) - { - uint32 rndpos = rand()%8; - me->GetMotionMaster()->MovePoint(1,SporebatWPPos[rndpos][0], SporebatWPPos[rndpos][1], SporebatWPPos[rndpos][2]); - movement_timer = 6000; - } else movement_timer -= diff; - - //toxic spores - if (bolt_timer <= diff) - { - Unit *pTarget = NULL; - pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); - if (pTarget) - { - Creature* trig = me->SummonCreature(TOXIC_SPORES_TRIGGER,pTarget->GetPositionX(),pTarget->GetPositionY(),pTarget->GetPositionZ(),0,TEMPSUMMON_TIMED_DESPAWN,30000); - if (trig) - { - trig->setFaction(14); - trig->CastSpell(trig, SPELL_TOXIC_SPORES,true); - } - } - bolt_timer = 10000+rand()%5000; - } - else bolt_timer -= diff; - - //Check_Timer - if (Check_Timer <= diff) - { - if (pInstance) - { - //check if vashj is death - Unit *Vashj = NULL; - Vashj = Unit::GetUnit((*me), pInstance->GetData64(DATA_LADYVASHJ)); - if (!Vashj || (Vashj && !Vashj->isAlive()) || (Vashj && CAST_AI(boss_lady_vashjAI, CAST_CRE(Vashj)->AI())->Phase != 3)) - { - //remove - me->setDeathState(DEAD); - me->RemoveCorpse(); - me->setFaction(35); - } - } - - Check_Timer = 1000; - } else Check_Timer -= diff; - } -}; - -//Coilfang Elite -//It's an elite Naga mob with 170,000 HP. It does about 5000 damage on plate, and has a nasty cleave hitting for about 7500 damage -CreatureAI* GetAI_mob_coilfang_elite(Creature* pCreature) -{ - SimpleAI* ai = new SimpleAI (pCreature); - - ai->Spell[0].Enabled = true; - ai->Spell[0].Spell_Id = 31345; //Cleave - ai->Spell[0].Cooldown = 15000; - ai->Spell[0].CooldownRandomAddition = 5000; - ai->Spell[0].First_Cast = 5000; - ai->Spell[0].Cast_Target_Type = CAST_HOSTILE_RANDOM; - - ai->EnterEvadeMode(); - - return ai; -} - -//Coilfang Strider -//It hits plate for about 8000 damage, has a Mind Blast spell doing about 3000 shadow damage, and a Psychic Scream Aura, which fears everybody in a 8 yard range of it every 2-3 seconds , for 5 seconds and increasing their movement speed by 150% during the fear. -CreatureAI* GetAI_mob_coilfang_strider(Creature* pCreature) -{ - SimpleAI* ai = new SimpleAI (pCreature); - - ai->Spell[0].Enabled = true; - ai->Spell[0].Spell_Id = 41374; //Mind Blast - ai->Spell[0].Cooldown = 30000; - ai->Spell[0].CooldownRandomAddition = 10000; - ai->Spell[0].First_Cast = 8000; - ai->Spell[0].Cast_Target_Type = CAST_HOSTILE_TARGET; - - //Scream aura not implemented - - ai->EnterEvadeMode(); - - return ai; -} - -struct mob_shield_generator_channelAI : public ScriptedAI -{ - mob_shield_generator_channelAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - } - - ScriptedInstance *pInstance; - uint32 Check_Timer; - bool Casted; - void Reset() - { - Check_Timer = 0; - Casted = false; - me->SetDisplayId(11686); //invisible - - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - } - - void EnterCombat(Unit * /*who*/) {} - - void MoveInLineOfSight(Unit * /*who*/) {} - - void UpdateAI (const uint32 diff) - { - if (!pInstance) - return; - - if (Check_Timer <= diff) - { - Unit *Vashj = NULL; - Vashj = Unit::GetUnit((*me), pInstance->GetData64(DATA_LADYVASHJ)); - - if (Vashj && Vashj->isAlive()) - { - //start visual channel - if (!Casted || !Vashj->HasAura(SPELL_MAGIC_BARRIER)) - { - DoCast(Vashj, SPELL_MAGIC_BARRIER, true); - Casted = true; - } - } - Check_Timer = 1000; - } else Check_Timer -= diff; - } -}; - -bool ItemUse_item_tainted_core(Player* pPlayer, Item* /*_Item*/, SpellCastTargets const& targets) -{ - ScriptedInstance *pInstance = pPlayer->GetInstanceData(); - - if (!pInstance) - { - pPlayer->GetSession()->SendNotification(TEXT_NOT_INITIALIZED); - return true; - } - - Creature *Vashj = NULL; - Vashj = (Unit::GetCreature((*pPlayer), pInstance->GetData64(DATA_LADYVASHJ))); - if (Vashj && CAST_AI(boss_lady_vashjAI, Vashj->AI())->Phase == 2) - { - if (targets.getGOTarget() && targets.getGOTarget()->GetTypeId() == TYPEID_GAMEOBJECT) - { - uint32 identifier; - uint8 channel_identifier; - switch(targets.getGOTarget()->GetEntry()) - { - case 185052: - identifier = DATA_SHIELDGENERATOR1; - channel_identifier = 0; - break; - case 185053: - identifier = DATA_SHIELDGENERATOR2; - channel_identifier = 1; - break; - case 185051: - identifier = DATA_SHIELDGENERATOR3; - channel_identifier = 2; - break; - case 185054: - identifier = DATA_SHIELDGENERATOR4; - channel_identifier = 3; - break; - default: - return true; - } - - if (pInstance->GetData(identifier)) - { - pPlayer->GetSession()->SendNotification(TEXT_ALREADY_DEACTIVATED); - return true; - } - - //get and remove channel - Unit *Channel = NULL; - Channel = Unit::GetCreature(*Vashj, CAST_AI(boss_lady_vashjAI, Vashj->AI())->ShieldGeneratorChannel[channel_identifier]); - if (Channel) - { - //call Unsummon() - Channel->setDeathState(JUST_DIED); - } - - pInstance->SetData(identifier, 1); - - //remove this item - pPlayer->DestroyItemCount(31088, 1, true); - return true; - } - else if (targets.getUnitTarget()->GetTypeId() == TYPEID_UNIT) - return false; - else if (targets.getUnitTarget()->GetTypeId() == TYPEID_PLAYER) - { - pPlayer->DestroyItemCount(31088, 1, true); - pPlayer->CastSpell(targets.getUnitTarget(), 38134, true); - return true; - } - } - return true; -} - -CreatureAI* GetAI_boss_lady_vashj(Creature* pCreature) -{ - return new boss_lady_vashjAI (pCreature); -} - -CreatureAI* GetAI_mob_enchanted_elemental(Creature* pCreature) -{ - return new mob_enchanted_elementalAI (pCreature); -} - -CreatureAI* GetAI_mob_tainted_elemental(Creature* pCreature) -{ - return new mob_tainted_elementalAI (pCreature); -} - -CreatureAI* GetAI_mob_toxic_sporebat(Creature* pCreature) -{ - return new mob_toxic_sporebatAI (pCreature); -} - -CreatureAI* GetAI_mob_shield_generator_channel(Creature* pCreature) -{ - return new mob_shield_generator_channelAI (pCreature); -} - -void AddSC_boss_lady_vashj() -{ - Script *newscript; - newscript = new Script; - newscript->Name = "boss_lady_vashj"; - newscript->GetAI = &GetAI_boss_lady_vashj; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_enchanted_elemental"; - newscript->GetAI = &GetAI_mob_enchanted_elemental; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_tainted_elemental"; - newscript->GetAI = &GetAI_mob_tainted_elemental; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_toxic_sporebat"; - newscript->GetAI = &GetAI_mob_toxic_sporebat; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_coilfang_elite"; - newscript->GetAI = &GetAI_mob_coilfang_elite; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_coilfang_strider"; - newscript->GetAI = &GetAI_mob_coilfang_strider; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_shield_generator_channel"; - newscript->GetAI = &GetAI_mob_shield_generator_channel; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "item_tainted_core"; - newscript->pItemUse = &ItemUse_item_tainted_core; - newscript->RegisterSelf(); -} - diff --git a/src/server/scripts/Outland/CoilfangReservoir/serpent_shrine/boss_leotheras_the_blind.cpp b/src/server/scripts/Outland/CoilfangReservoir/serpent_shrine/boss_leotheras_the_blind.cpp deleted file mode 100644 index 61c9ed9d527..00000000000 --- a/src/server/scripts/Outland/CoilfangReservoir/serpent_shrine/boss_leotheras_the_blind.cpp +++ /dev/null @@ -1,787 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: Boss_Leotheras_The_Blind -SD%Complete: 80 -SDComment: Possesion Support -SDCategory: Coilfang Resevoir, Serpent Shrine Cavern -EndScriptData */ - -#include "ScriptedPch.h" -#include "serpent_shrine.h" - -// --- Spells used by Leotheras The Blind -#define SPELL_WHIRLWIND 37640 -#define SPELL_CHAOS_BLAST 37674 -#define SPELL_BERSERK 26662 -#define SPELL_INSIDIOUS_WHISPER 37676 -#define SPELL_DUAL_WIELD 42459 - -// --- Spells used in banish phase --- -#define BANISH_BEAM 38909 -#define AURA_BANISH 37833 - -// --- Spells used by Greyheart Spellbinders -#define SPELL_EARTHSHOCK 39076 -#define SPELL_MINDBLAST 37531 - -// --- Spells used by Inner Demons and Creature ID -#define INNER_DEMON_ID 21857 -#define AURA_DEMONIC_ALIGNMENT 37713 -#define SPELL_SHADOWBOLT 39309 -#define SPELL_SOUL_LINK 38007 -#define SPELL_CONSUMING_MADNESS 37749 //not supported by core yet - -//Misc. -#define MODEL_DEMON 20125 -#define MODEL_NIGHTELF 20514 -#define DEMON_FORM 21875 -#define MOB_SPELLBINDER 21806 - -#define SAY_AGGRO -1548009 -#define SAY_SWITCH_TO_DEMON -1548010 -#define SAY_INNER_DEMONS -1548011 -#define SAY_DEMON_SLAY1 -1548012 -#define SAY_DEMON_SLAY2 -1548013 -#define SAY_DEMON_SLAY3 -1548014 -#define SAY_NIGHTELF_SLAY1 -1548015 -#define SAY_NIGHTELF_SLAY2 -1548016 -#define SAY_NIGHTELF_SLAY3 -1548017 -#define SAY_FINAL_FORM -1548018 -#define SAY_FREE -1548019 -#define SAY_DEATH -1548020 - -struct mob_inner_demonAI : public ScriptedAI -{ - mob_inner_demonAI(Creature *c) : ScriptedAI(c) - { - victimGUID = 0; - } - - uint32 ShadowBolt_Timer; - - uint32 Link_Timer; - uint64 victimGUID; - - void Reset() - { - ShadowBolt_Timer = 10000; - Link_Timer = 1000; - } - void JustDied(Unit * /*victim*/) - { - Unit* pUnit = Unit::GetUnit((*me),victimGUID); - if (pUnit && pUnit->HasAura(SPELL_INSIDIOUS_WHISPER)) - pUnit->RemoveAurasDueToSpell(SPELL_INSIDIOUS_WHISPER); - } - - void DamageTaken(Unit *done_by, uint32 &damage) - { - if (done_by->GetGUID() != victimGUID && done_by->GetGUID() != me->GetGUID()) - { - damage = 0; - DoModifyThreatPercent(done_by, -100); - } - } - - void EnterCombat(Unit * /*who*/) - { - if (!victimGUID) return; - } - - void UpdateAI(const uint32 diff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - if (me->getVictim()->GetGUID() != victimGUID) - { - DoModifyThreatPercent(me->getVictim(), -100); - Unit* owner = Unit::GetUnit((*me),victimGUID); - if (owner && owner->isAlive()) - { - me->AddThreat(owner,999999); - AttackStart(owner); - } else if (owner && owner->isDead()) - { - me->DealDamage(me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); - return; - } - } - - if (Link_Timer <= diff) - { - DoCast(me->getVictim(), SPELL_SOUL_LINK, true); - Link_Timer = 1000; - } else Link_Timer -= diff; - - if (!me->HasAura(AURA_DEMONIC_ALIGNMENT)) - DoCast(me, AURA_DEMONIC_ALIGNMENT, true); - - if (ShadowBolt_Timer <= diff) - { - DoCast(me->getVictim(), SPELL_SHADOWBOLT, false); - ShadowBolt_Timer = 10000; - } else ShadowBolt_Timer -= diff; - - DoMeleeAttackIfReady(); - } -}; -//Original Leotheras the Blind AI -struct boss_leotheras_the_blindAI : public ScriptedAI -{ - boss_leotheras_the_blindAI(Creature *c) : ScriptedAI(c) - { - c->GetPosition(x,y,z); - pInstance = c->GetInstanceData(); - Demon = 0; - - for (uint8 i = 0; i < 3; ++i)//clear guids - SpellBinderGUID[i] = 0; - } - - ScriptedInstance *pInstance; - - uint32 Whirlwind_Timer; - uint32 ChaosBlast_Timer; - uint32 SwitchToDemon_Timer; - uint32 SwitchToHuman_Timer; - uint32 Berserk_Timer; - uint32 InnerDemons_Timer; - uint32 BanishTimer; - - bool DealDamage; - bool NeedThreatReset; - bool DemonForm; - bool IsFinalForm; - bool EnrageUsed; - float x,y,z; - - uint64 InnderDemon[5]; - uint32 InnerDemon_Count; - uint64 Demon; - uint64 SpellBinderGUID[3]; - - void Reset() - { - CheckChannelers(); - BanishTimer = 1000; - Whirlwind_Timer = 15000; - ChaosBlast_Timer = 1000; - SwitchToDemon_Timer = 45000; - SwitchToHuman_Timer = 60000; - Berserk_Timer = 600000; - InnerDemons_Timer = 30000; - me->SetCanDualWield(true); - DealDamage = true; - DemonForm = false; - IsFinalForm = false; - NeedThreatReset = false; - EnrageUsed = false; - InnerDemon_Count = 0; - me->SetSpeed(MOVE_RUN, 2.0f, true); - me->SetDisplayId(MODEL_NIGHTELF); - me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID , 0); - me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID+1, 0); - DoCast(me, SPELL_DUAL_WIELD, true); - me->SetCorpseDelay(1000*60*60); - if (pInstance) - pInstance->SetData(DATA_LEOTHERASTHEBLINDEVENT, NOT_STARTED); - } - - void CheckChannelers(/*bool DoEvade = true*/) - { - for (uint8 i = 0; i < 3; ++i) - { - if (Creature *add = Unit::GetCreature(*me,SpellBinderGUID[i])) - add->DisappearAndDie(); - - float nx = x; - float ny = y; - float o = 2.4f; - if (i == 0) {nx += 10; ny -= 5; o=2.5f;} - if (i == 1) {nx -= 8; ny -= 7; o=0.9f;} - if (i == 2) {nx -= 3; ny += 9; o=5.0f;} - Creature* binder = me->SummonCreature(MOB_SPELLBINDER,nx,ny,z,o,TEMPSUMMON_DEAD_DESPAWN,0); - if (binder) - SpellBinderGUID[i] = binder->GetGUID(); - - } - } - void MoveInLineOfSight(Unit *who) - { - if (me->HasAura(AURA_BANISH)) - return; - - if (!me->getVictim() && who->isTargetableForAttack() && (me->IsHostileTo(who)) && who->isInAccessiblePlaceFor(me)) - { - if (me->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) - return; - - float attackRadius = me->GetAttackDistance(who); - if (me->IsWithinDistInMap(who, attackRadius)) - { - // Check first that object is in an angle in front of this one before LoS check - if (me->HasInArc(M_PI/2.0f, who) && me->IsWithinLOSInMap(who)) - { - AttackStart(who); - } - } - } - } - - void StartEvent() - { - DoScriptText(SAY_AGGRO, me); - if (pInstance) - pInstance->SetData(DATA_LEOTHERASTHEBLINDEVENT, IN_PROGRESS); - } - - void CheckBanish() - { - uint8 AliveChannelers = 0; - for (uint8 i = 0; i < 3; ++i) - { - Unit *add = Unit::GetUnit(*me,SpellBinderGUID[i]); - if (add && add->isAlive()) - ++AliveChannelers; - } - - // channelers == 0 remove banish aura - if (AliveChannelers == 0 && me->HasAura(AURA_BANISH)) - { - // removing banish aura - me->RemoveAurasDueToSpell(AURA_BANISH); - - // Leotheras is getting immune again - me->ApplySpellImmune(AURA_BANISH, IMMUNITY_MECHANIC, MECHANIC_BANISH, true); - - // changing model to bloodelf - me->SetDisplayId(MODEL_NIGHTELF); - - // and reseting equipment - me->LoadEquipment(me->GetEquipmentId()); - - if (pInstance && pInstance->GetData64(DATA_LEOTHERAS_EVENT_STARTER)) - { - Unit *victim = NULL; - victim = Unit::GetUnit(*me, pInstance->GetData64(DATA_LEOTHERAS_EVENT_STARTER)); - if (victim) - me->getThreatManager().addThreat(victim, 1); - StartEvent(); - } - } - else if (AliveChannelers != 0 && !me->HasAura(AURA_BANISH)) - { - // channelers != 0 apply banish aura - // removing Leotheras banish immune to apply AURA_BANISH - me->ApplySpellImmune(AURA_BANISH, IMMUNITY_MECHANIC, MECHANIC_BANISH, false); - DoCast(me, AURA_BANISH); - - // changing model - me->SetDisplayId(MODEL_DEMON); - - // and removing weapons - me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID , 0); - me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID+1, 0); - } - } - - //Despawn all Inner Demon summoned - void DespawnDemon() - { - for (uint8 i=0; i<5; ++i) - { - if (InnderDemon[i]) - { - //delete creature - Creature* pCreature = Unit::GetCreature((*me), InnderDemon[i]); - if (pCreature && pCreature->isAlive()) - { - pCreature->ForcedDespawn(); - } - InnderDemon[i] = 0; - } - } - - InnerDemon_Count = 0; - } - - void CastConsumingMadness() //remove this once SPELL_INSIDIOUS_WHISPER is supported by core - { - for (uint8 i=0; i<5; ++i) - { - if (InnderDemon[i] > 0) - { - Creature* pUnit = Unit::GetCreature((*me), InnderDemon[i]); - if (pUnit && pUnit->isAlive()) - { - Unit* pUnit_pTarget = Unit::GetUnit(*pUnit, CAST_AI(mob_inner_demonAI, pUnit->AI())->victimGUID); - if (pUnit_pTarget && pUnit_pTarget->isAlive()) - { - pUnit->CastSpell(pUnit_pTarget, SPELL_CONSUMING_MADNESS, true); - DoModifyThreatPercent(pUnit_pTarget, -100); - } - } - } - } - } - - void KilledUnit(Unit * victim) - { - if (victim->GetTypeId() != TYPEID_PLAYER) - return; - - if (DemonForm) - { - DoScriptText(RAND(SAY_DEMON_SLAY1,SAY_DEMON_SLAY2,SAY_DEMON_SLAY3), me); - } - else - { - DoScriptText(RAND(SAY_NIGHTELF_SLAY1,SAY_NIGHTELF_SLAY2,SAY_NIGHTELF_SLAY3), me); - } - } - - void JustDied(Unit * /*victim*/) - { - DoScriptText(SAY_DEATH, me); - - //despawn copy - if (Demon) - { - if (Creature* pDemon = Unit::GetCreature(*me, Demon)) - pDemon->ForcedDespawn(); - } - if (pInstance) - pInstance->SetData(DATA_LEOTHERASTHEBLINDEVENT, DONE); - } - - void EnterCombat(Unit * /*who*/) - { - if (me->HasAura(AURA_BANISH)) - return; - - me->LoadEquipment(me->GetEquipmentId()); - } - - void UpdateAI(const uint32 diff) - { - //Return since we have no target - if (me->HasAura(AURA_BANISH) || !UpdateVictim()) - { - if (BanishTimer <= diff) - { - CheckBanish();//no need to check every update tick - BanishTimer = 1000; - } else BanishTimer -= diff; - return; - } - if (me->HasAura(SPELL_WHIRLWIND)) - if (Whirlwind_Timer <= diff) - { - Unit *newTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); - if (newTarget) - { - DoResetThreat(); - me->GetMotionMaster()->Clear(); - me->GetMotionMaster()->MovePoint(0,newTarget->GetPositionX(),newTarget->GetPositionY(),newTarget->GetPositionZ()); - } - Whirlwind_Timer = 2000; - } else Whirlwind_Timer -= diff; - - // reseting after changing forms and after ending whirlwind - if (NeedThreatReset && !me->HasAura(SPELL_WHIRLWIND)) - { - // when changing forms seting timers (or when ending whirlwind - to avoid adding new variable i use Whirlwind_Timer to countdown 2s while whirlwinding) - if (DemonForm) - InnerDemons_Timer = 30000; - else - Whirlwind_Timer = 15000; - - NeedThreatReset = false; - DoResetThreat(); - me->GetMotionMaster()->Clear(); - me->GetMotionMaster()->MoveChase(me->getVictim()); - } - - //Enrage_Timer (10 min) - if (Berserk_Timer < diff && !EnrageUsed) - { - me->InterruptNonMeleeSpells(false); - DoCast(me, SPELL_BERSERK); - EnrageUsed = true; - } else Berserk_Timer -= diff; - - if (!DemonForm) - { - //Whirldind Timer - if (!me->HasAura(SPELL_WHIRLWIND)) - { - if (Whirlwind_Timer <= diff) - { - DoCast(me, SPELL_WHIRLWIND); - // while whirlwinding this variable is used to countdown target's change - Whirlwind_Timer = 2000; - NeedThreatReset = true; - } else Whirlwind_Timer -= diff; - } - //Switch_Timer - - if (!IsFinalForm) - if (SwitchToDemon_Timer <= diff) - { - //switch to demon form - me->RemoveAurasDueToSpell(SPELL_WHIRLWIND,0); - me->SetDisplayId(MODEL_DEMON); - DoScriptText(SAY_SWITCH_TO_DEMON, me); - me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID , 0); - me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID+1, 0); - DemonForm = true; - NeedThreatReset = true; - SwitchToDemon_Timer = 45000; - } else SwitchToDemon_Timer -= diff; - DoMeleeAttackIfReady(); - } - else - { - //ChaosBlast_Timer - if (!me->getVictim()) - return; - if (me->IsWithinDist(me->getVictim(), 30)) - me->StopMoving(); - if (ChaosBlast_Timer <= diff) - { - // will cast only when in range of spell - if (me->IsWithinDist(me->getVictim(), 30)) - { - //DoCast(me->getVictim(), SPELL_CHAOS_BLAST, true); - int damage = 100; - me->CastCustomSpell(me->getVictim(), SPELL_CHAOS_BLAST, &damage, NULL, NULL, false, NULL, NULL, me->GetGUID()); - } - ChaosBlast_Timer = 3000; - } else ChaosBlast_Timer -= diff; - //Summon Inner Demon - if (InnerDemons_Timer <= diff) - { - std::list& ThreatList = me->getThreatManager().getThreatList(); - std::vector TargetList; - for (std::list::const_iterator itr = ThreatList.begin(); itr != ThreatList.end(); ++itr) - { - Unit *tempTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid()); - if (tempTarget && tempTarget->GetTypeId() == TYPEID_PLAYER && tempTarget->GetGUID() != me->getVictim()->GetGUID() && TargetList.size()<5) - TargetList.push_back(tempTarget); - } - //SpellEntry *spell = GET_SPELL(SPELL_INSIDIOUS_WHISPER); - for (std::vector::const_iterator itr = TargetList.begin(); itr != TargetList.end(); ++itr) - { - if ((*itr) && (*itr)->isAlive()) - { - Creature * demon = me->SummonCreature(INNER_DEMON_ID, (*itr)->GetPositionX()+10, (*itr)->GetPositionY()+10, (*itr)->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); - if (demon) - { - demon->AI()->AttackStart((*itr)); - CAST_AI(mob_inner_demonAI, demon->AI())->victimGUID = (*itr)->GetGUID(); - - (*itr)->AddAura(SPELL_INSIDIOUS_WHISPER, *itr); - - if (InnerDemon_Count > 4) - InnerDemon_Count = 0; - - //Safe storing of creatures - InnderDemon[InnerDemon_Count] = demon->GetGUID(); - - //Update demon count - ++InnerDemon_Count; - } - } - } - DoScriptText(SAY_INNER_DEMONS, me); - - InnerDemons_Timer = 999999; - } else InnerDemons_Timer -= diff; - - //Switch_Timer - if (SwitchToHuman_Timer <= diff) - { - //switch to nightelf form - me->SetDisplayId(MODEL_NIGHTELF); - me->LoadEquipment(me->GetEquipmentId()); - - CastConsumingMadness(); - DespawnDemon(); - - DemonForm = false; - NeedThreatReset = true; - - SwitchToHuman_Timer = 60000; - } else SwitchToHuman_Timer -= diff; - } - - if (!IsFinalForm && (me->GetHealth()*100 / me->GetMaxHealth()) < 15) - { - //at this point he divides himself in two parts - CastConsumingMadness(); - DespawnDemon(); - Creature *Copy = NULL; - Copy = DoSpawnCreature(DEMON_FORM, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 6000); - if (Copy) - { - Demon = Copy->GetGUID(); - if (me->getVictim()) - Copy->AI()->AttackStart(me->getVictim()); - } - //set nightelf final form - IsFinalForm = true; - DemonForm = false; - - DoScriptText(SAY_FINAL_FORM, me); - me->SetDisplayId(MODEL_NIGHTELF); - me->LoadEquipment(me->GetEquipmentId()); - } - } -}; - -//Leotheras the Blind Demon Form AI -struct boss_leotheras_the_blind_demonformAI : public ScriptedAI -{ - boss_leotheras_the_blind_demonformAI(Creature *c) : ScriptedAI(c) {} - - uint32 ChaosBlast_Timer; - bool DealDamage; - - void Reset() - { - ChaosBlast_Timer = 1000; - DealDamage = true; - } - - void StartEvent() - { - DoScriptText(SAY_FREE, me); - } - - void KilledUnit(Unit * victim) - { - if (victim->GetTypeId() != TYPEID_PLAYER) - return; - - DoScriptText(RAND(SAY_DEMON_SLAY1,SAY_DEMON_SLAY2,SAY_DEMON_SLAY3), me); - } - - void JustDied(Unit * /*victim*/) - { - //invisibility (blizzlike, at the end of the fight he doesn't die, he disappears) - DoCast(me, 8149, true); - } - - void EnterCombat(Unit * /*who*/) - { - StartEvent(); - } - - void UpdateAI(const uint32 diff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - //ChaosBlast_Timer - if (me->IsWithinDist(me->getVictim(), 30)) - me->StopMoving(); - - if (ChaosBlast_Timer <= diff) - { - // will cast only when in range od spell - if (me->IsWithinDist(me->getVictim(), 30)) - { - //DoCast(me->getVictim(), SPELL_CHAOS_BLAST, true); - int damage = 100; - me->CastCustomSpell(me->getVictim(), SPELL_CHAOS_BLAST, &damage, NULL, NULL, false, NULL, NULL, me->GetGUID()); - ChaosBlast_Timer = 3000; - } - } else ChaosBlast_Timer -= diff; - - //Do NOT deal any melee damage to the target. - } -}; -struct mob_greyheart_spellbinderAI : public ScriptedAI -{ - mob_greyheart_spellbinderAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - leotherasGUID = 0; - AddedBanish = false; - } - - ScriptedInstance *pInstance; - - uint64 leotherasGUID; - - uint32 Mindblast_Timer; - uint32 Earthshock_Timer; - - bool AddedBanish; - - void Reset() - { - Mindblast_Timer = 3000 + rand()%5000; - Earthshock_Timer = 5000 + rand()%5000; - - if (pInstance) - { - pInstance->SetData64(DATA_LEOTHERAS_EVENT_STARTER, 0); - Creature *leotheras = Unit::GetCreature(*me, leotherasGUID); - if (leotheras && leotheras->isAlive()) - CAST_AI(boss_leotheras_the_blindAI, leotheras->AI())->CheckChannelers(/*false*/); - } - } - - void EnterCombat(Unit * who) - { - me->InterruptNonMeleeSpells(false); - if (pInstance) - pInstance->SetData64(DATA_LEOTHERAS_EVENT_STARTER, who->GetGUID()); - } - - void JustRespawned() - { - AddedBanish = false; - Reset(); - } - - void CastChanneling() - { - if (!me->isInCombat() && !me->GetCurrentSpell(CURRENT_CHANNELED_SPELL)) - { - if (leotherasGUID) - { - Creature *leotheras = Unit::GetCreature(*me, leotherasGUID); - if (leotheras && leotheras->isAlive()) - DoCast(leotheras, BANISH_BEAM); - } - } - } - - void UpdateAI(const uint32 diff) - { - if (pInstance) - { - if (!leotherasGUID) - leotherasGUID = pInstance->GetData64(DATA_LEOTHERAS); - - if (!me->isInCombat() && pInstance->GetData64(DATA_LEOTHERAS_EVENT_STARTER)) - { - Unit *victim = NULL; - victim = Unit::GetUnit(*me, pInstance->GetData64(DATA_LEOTHERAS_EVENT_STARTER)); - if (victim) - AttackStart(victim); - } - } - - if (!UpdateVictim()) - { - CastChanneling(); - return; - } - - if (pInstance && !pInstance->GetData64(DATA_LEOTHERAS_EVENT_STARTER)) - { - EnterEvadeMode(); - return; - } - - if (Mindblast_Timer <= diff) - { - Unit *pTarget = NULL; - pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); - - if (pTarget)DoCast(pTarget, SPELL_MINDBLAST); - - Mindblast_Timer = 10000 + rand()%5000; - } else Mindblast_Timer -= diff; - - if (Earthshock_Timer <= diff) - { - Map* pMap = me->GetMap(); - Map::PlayerList const &PlayerList = pMap->GetPlayers(); - for (Map::PlayerList::const_iterator itr = PlayerList.begin(); itr != PlayerList.end(); ++itr) - { - if (Player* i_pl = itr->getSource()) - { - bool isCasting = false; - for (uint8 i = 0; i < CURRENT_MAX_SPELL; ++i) - if (i_pl->GetCurrentSpell(i)) - isCasting = true; - - if (isCasting) - { - DoCast(i_pl, SPELL_EARTHSHOCK); - break; - } - } - } - Earthshock_Timer = 8000 + rand()%7000; - } else Earthshock_Timer -= diff; - DoMeleeAttackIfReady(); - } - - void JustDied(Unit * /*killer*/) {} -}; -CreatureAI* GetAI_boss_leotheras_the_blind(Creature* pCreature) -{ - return new boss_leotheras_the_blindAI (pCreature); -} - -CreatureAI* GetAI_boss_leotheras_the_blind_demonform(Creature* pCreature) -{ - return new boss_leotheras_the_blind_demonformAI (pCreature); -} - -CreatureAI* GetAI_mob_greyheart_spellbinder(Creature* pCreature) -{ - return new mob_greyheart_spellbinderAI (pCreature); -} - -CreatureAI* GetAI_mob_inner_demon(Creature* pCreature) -{ - return new mob_inner_demonAI (pCreature); -} -void AddSC_boss_leotheras_the_blind() -{ - Script *newscript; - - newscript = new Script; - newscript->Name = "boss_leotheras_the_blind"; - newscript->GetAI = &GetAI_boss_leotheras_the_blind; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "boss_leotheras_the_blind_demonform"; - newscript->GetAI = &GetAI_boss_leotheras_the_blind_demonform; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_greyheart_spellbinder"; - newscript->GetAI = &GetAI_mob_greyheart_spellbinder; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_inner_demon"; - newscript->GetAI = &GetAI_mob_inner_demon; - newscript->RegisterSelf(); -} - diff --git a/src/server/scripts/Outland/CoilfangReservoir/serpent_shrine/boss_lurker_below.cpp b/src/server/scripts/Outland/CoilfangReservoir/serpent_shrine/boss_lurker_below.cpp deleted file mode 100644 index b1c0c10bcce..00000000000 --- a/src/server/scripts/Outland/CoilfangReservoir/serpent_shrine/boss_lurker_below.cpp +++ /dev/null @@ -1,458 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: boss_the_lurker_below -SD%Complete: 80 -SDComment: Coilfang Frenzy, find out how could we fishing in the strangepool -SDCategory: The Lurker Below -EndScriptData */ - -#include "ScriptedPch.h" -#include "serpent_shrine.h" -#include "ScriptedSimpleAI.h" -#include "Spell.h" - -#define SPELL_SPOUT 37433 -#define SPELL_SPOUT_ANIM 42835 -#define SPELL_SPOUT_BREATH 37431 -#define SPELL_KNOCKBACK 19813 -#define SPELL_GEYSER 37478 -#define SPELL_WHIRL 37660 -#define SPELL_WATERBOLT 37138 -#define SPELL_SUBMERGE 37550 -#define SPELL_EMERGE 20568 - -#define EMOTE_SPOUT "The Lurker Below takes a deep breath." - -#define SPOUT_DIST 100 - -#define MOB_COILFANG_GUARDIAN 21873 -#define MOB_COILFANG_AMBUSHER 21865 - -//Ambusher spells -#define SPELL_SPREAD_SHOT 37790 -#define SPELL_SHOOT 37770 - -//Guardian spells -#define SPELL_ARCINGSMASH 38761 // Wrong SpellId. Can't find the right one. -#define SPELL_HAMSTRING 26211 - -float AddPos[9][3] = -{ - {2.8553810, -459.823914, -19.182686}, //MOVE_AMBUSHER_1 X, Y, Z - {12.400000, -466.042267, -19.182686}, //MOVE_AMBUSHER_2 X, Y, Z - {51.366653, -460.836060, -19.182686}, //MOVE_AMBUSHER_3 X, Y, Z - {62.597980, -457.433044, -19.182686}, //MOVE_AMBUSHER_4 X, Y, Z - {77.607452, -384.302765, -19.182686}, //MOVE_AMBUSHER_5 X, Y, Z - {63.897900, -378.984924, -19.182686}, //MOVE_AMBUSHER_6 X, Y, Z - {34.447250, -387.333618, -19.182686}, //MOVE_GUARDIAN_1 X, Y, Z - {14.388216, -423.468018, -19.625271}, //MOVE_GUARDIAN_2 X, Y, Z - {42.471519, -445.115295, -19.769423} //MOVE_GUARDIAN_3 X, Y, Z -}; - -struct boss_the_lurker_belowAI : public Scripted_NoMovementAI -{ - boss_the_lurker_belowAI(Creature *c) : Scripted_NoMovementAI(c), Summons(me) - { - pInstance = c->GetInstanceData(); - SpellEntry *TempSpell = GET_SPELL(SPELL_SPOUT_ANIM); - if (TempSpell) - { - TempSpell->Effect[0] = 0;//remove all spell effect, only anim is needed - TempSpell->Effect[1] = 0; - TempSpell->Effect[2] = 0; - } - } - - ScriptedInstance* pInstance; - SummonList Summons; - - bool Spawned; - bool Submerged; - bool InRange; - bool CanStartEvent; - uint32 RotTimer; - uint32 SpoutAnimTimer; - uint32 WaterboltTimer; - uint32 SpoutTimer; - uint32 WhirlTimer; - uint32 PhaseTimer; - uint32 GeyserTimer; - uint32 CheckTimer; - uint32 WaitTimer; - uint32 WaitTimer2; - - bool CheckCanStart()//check if players fished - { - if (pInstance && pInstance->GetData(DATA_STRANGE_POOL) == NOT_STARTED) - return false; - return true; - } - void Reset() - { - me->AddUnitMovementFlag(MOVEMENTFLAG_SWIMMING | MOVEMENTFLAG_LEVITATING); - SpoutAnimTimer = 1000; - RotTimer = 0; - WaterboltTimer = 15000;//give time to get in range when fight starts - SpoutTimer = 45000; - WhirlTimer = 18000;//after avery spout - PhaseTimer = 120000; - GeyserTimer = rand()%5000 + 15000; - CheckTimer = 15000;//give time to get in range when fight starts - WaitTimer = 60000;//never reached - WaitTimer2 = 60000;//never reached - - Submerged = true;//will be false at combat start - Spawned = false; - InRange = false; - CanStartEvent = false; - - Summons.DespawnAll(); - - if (pInstance) - { - pInstance->SetData(DATA_THELURKERBELOWEVENT, NOT_STARTED); - pInstance->SetData(DATA_STRANGE_POOL, NOT_STARTED); - } - DoCast(me, SPELL_SUBMERGE);//submerge anim - me->SetVisibility(VISIBILITY_OFF);//we start invis under water, submerged - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); - } - - void JustDied(Unit* /*Killer*/) - { - if (pInstance) - pInstance->SetData(DATA_THELURKERBELOWEVENT, DONE); - - Summons.DespawnAll(); - } - - void EnterCombat(Unit * who) - { - if (pInstance) - pInstance->SetData(DATA_THELURKERBELOWEVENT, IN_PROGRESS); - Scripted_NoMovementAI::EnterCombat(who); - } - - void MoveInLineOfSight(Unit *who) - { - if (!CanStartEvent)//boss is invisible, don't attack - return; - if (!me->getVictim() && who->isTargetableForAttack() && (me->IsHostileTo(who))) - { - float attackRadius = me->GetAttackDistance(who); - if (me->IsWithinDistInMap(who, attackRadius)) - { - AttackStart(who); - } - } - } - - void MovementInform(uint32 type, uint32 /*id*/) - { - if (type == ROTATE_MOTION_TYPE) - me->SetReactState(REACT_AGGRESSIVE); - } - - void UpdateAI(const uint32 diff) - { - if (!CanStartEvent)//boss is invisible, don't attack - { - if (CheckCanStart()) - { - if (Submerged) - { - me->SetVisibility(VISIBILITY_ON); - Submerged = false; - WaitTimer2 = 500; - } - if (!Submerged && WaitTimer2 <= diff)//wait 500ms before emerge anim - { - me->RemoveAllAuras(); - me->RemoveFlag(UNIT_NPC_EMOTESTATE,EMOTE_STATE_SUBMERGED); - DoCast(me, SPELL_EMERGE, false); - WaitTimer2 = 60000;//never reached - WaitTimer = 3000; - } else WaitTimer2 -= diff; - - if (WaitTimer <= diff)//wait 3secs for emerge anim, then attack - { - WaitTimer = 3000; - CanStartEvent=true;//fresh fished from pool - me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); - me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - } else WaitTimer -= diff; - } - return; - } - - if (me->getThreatManager().getThreatList().empty())//check if should evade - { - if (me->isInCombat()) - EnterEvadeMode(); - return; - } - if (!Submerged) - { - if (PhaseTimer <= diff) - { - me->InterruptNonMeleeSpells(false); - DoCast(me, SPELL_SUBMERGE); - PhaseTimer = 60000;//60secs submerged - Submerged = true; - } else PhaseTimer-=diff; - - if (SpoutTimer <= diff) - { - me->MonsterTextEmote(EMOTE_SPOUT,0,true); - me->SetReactState(REACT_PASSIVE); - me->GetMotionMaster()->MoveRotate(20000, rand()%2 ? ROTATE_DIRECTION_LEFT : ROTATE_DIRECTION_RIGHT); - SpoutTimer = 45000; - WhirlTimer = 20000;//whirl directly after spout - RotTimer = 20000; - return; - } else SpoutTimer -= diff; - - //Whirl directly after a Spout and at random times - if (WhirlTimer <= diff) - { - WhirlTimer = 18000; - DoCast(me, SPELL_WHIRL); - } else WhirlTimer -= diff; - - if (CheckTimer <= diff)//check if there are players in melee range - { - InRange = false; - Map* pMap = me->GetMap(); - Map::PlayerList const &PlayerList = pMap->GetPlayers(); - if (!PlayerList.isEmpty()) - { - for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) - { - if (me->IsWithinMeleeRange(i->getSource())) - InRange = true; - } - } - CheckTimer = 2000; - } else CheckTimer -= diff; - - if (RotTimer) - { - Map* pMap = me->GetMap(); - if (pMap->IsDungeon()) - { - Map::PlayerList const &PlayerList = pMap->GetPlayers(); - for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) - { - if (i->getSource() && i->getSource()->isAlive() && me->HasInArc((double)diff/20000*(double)M_PI*2,i->getSource()) && me->IsWithinDist(i->getSource(), SPOUT_DIST) && !i->getSource()->IsInWater()) - DoCast(i->getSource(), SPELL_SPOUT, true);//only knock back palyers in arc, in 100yards, not in water - } - } - - if (SpoutAnimTimer <= diff) - { - DoCast(me, SPELL_SPOUT_ANIM, true); - SpoutAnimTimer = 1000; - } else SpoutAnimTimer -= diff; - - if (RotTimer <= diff) - { - RotTimer = 0; - } else RotTimer -= diff; - return; - } - - if (GeyserTimer <= diff) - { - Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,1); - if (!pTarget && me->getVictim()) - pTarget = me->getVictim(); - if (pTarget) - DoCast(pTarget, SPELL_GEYSER, true); - GeyserTimer = rand()%5000 + 15000; - } else GeyserTimer -= diff; - - if (!InRange)//if on players in melee range cast Waterbolt - { - if (WaterboltTimer <= diff) - { - Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); - if (!pTarget && me->getVictim()) - pTarget = me->getVictim(); - if (pTarget) - DoCast(pTarget, SPELL_WATERBOLT, true); - WaterboltTimer = 3000; - } else WaterboltTimer -= diff; - } - - if (!UpdateCombatState()) - return; - - DoMeleeAttackIfReady(); - - }else//submerged - { - if (PhaseTimer <= diff) - { - Submerged = false; - me->InterruptNonMeleeSpells(false);//shouldn't be any - me->RemoveAllAuras(); - me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); - me->RemoveFlag(UNIT_NPC_EMOTESTATE,EMOTE_STATE_SUBMERGED); - DoCast(me, SPELL_EMERGE, true); - Spawned = false; - SpoutTimer = 3000; // directly cast Spout after emerging! - PhaseTimer = 120000; - return; - } else PhaseTimer-=diff; - - if (me->getThreatManager().getThreatList().empty())//check if should evade - { - EnterEvadeMode(); - return; - } - if (!me->isInCombat()) - DoZoneInCombat(); - - if (!Spawned) - { - me->SetUInt32Value(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); - //spawn adds - for (uint8 i = 0; i < 9; ++i) - { - Creature* Summoned; - if (i < 6) - Summoned = me->SummonCreature(MOB_COILFANG_AMBUSHER,AddPos[i][0],AddPos[i][1],AddPos[i][2], 0, TEMPSUMMON_CORPSE_DESPAWN, 0); - else Summoned = me->SummonCreature(MOB_COILFANG_GUARDIAN,AddPos[i][0],AddPos[i][1],AddPos[i][2], 0, TEMPSUMMON_CORPSE_DESPAWN, 0); - - if (Summoned) - Summons.Summon(Summoned); - } - Spawned = true; - } - } - } - }; - -CreatureAI* GetAI_mob_coilfang_guardian(Creature* pCreature) -{ - SimpleAI* ai = new SimpleAI (pCreature); - - ai->Spell[0].Enabled = true; - ai->Spell[0].Spell_Id = SPELL_ARCINGSMASH; - ai->Spell[0].Cooldown = 15000; - ai->Spell[0].First_Cast = 5000; - ai->Spell[0].Cast_Target_Type = CAST_HOSTILE_TARGET; - - ai->Spell[1].Enabled = true; - ai->Spell[1].Spell_Id = SPELL_HAMSTRING; - ai->Spell[1].Cooldown = 10000; - ai->Spell[1].First_Cast = 2000; - ai->Spell[1].Cast_Target_Type = CAST_HOSTILE_TARGET; - - return ai; -} - -struct mob_coilfang_ambusherAI : public Scripted_NoMovementAI -{ - mob_coilfang_ambusherAI(Creature *c) : Scripted_NoMovementAI(c) - { - SpellEntry *TempSpell = GET_SPELL(SPELL_SHOOT); - if (TempSpell) - TempSpell->Effect[0] = 2;//change spell effect from weapon % dmg to simple phisical dmg - } - - uint32 MultiShotTimer; - uint32 ShootBowTimer; - - void Reset() - { - MultiShotTimer = 10000; - ShootBowTimer = 4000; - - } - - void EnterCombat(Unit * /*who*/) - { - - } - - void MoveInLineOfSight(Unit *who) - { - if (!who || me->getVictim()) return; - - if (who->isTargetableForAttack() && who->isInAccessiblePlaceFor(me) && me->IsHostileTo(who) && me->IsWithinDistInMap(who, 45)) - { - AttackStart(who); - } - } - - void UpdateAI(const uint32 diff) - { - if (MultiShotTimer <= diff) - { - if (me->getVictim()) - DoCast(me->getVictim(), SPELL_SPREAD_SHOT, true); - - MultiShotTimer = 10000+rand()%10000; - ShootBowTimer += 1500;//add global cooldown - } else MultiShotTimer -= diff; - - if (ShootBowTimer <= diff) - { - Unit *pTarget = NULL; - pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); - int bp0 = 1100; - if (pTarget) - me->CastCustomSpell(pTarget,SPELL_SHOOT,&bp0,NULL,NULL,true); - ShootBowTimer = 4000+rand()%5000; - MultiShotTimer += 1500;//add global cooldown - } else ShootBowTimer -= diff; - } -}; - -CreatureAI* GetAI_mob_coilfang_ambusher(Creature* pCreature) -{ - return new mob_coilfang_ambusherAI (pCreature); -} - -CreatureAI* GetAI_boss_the_lurker_below(Creature* pCreature) -{ - return new boss_the_lurker_belowAI (pCreature); -} - -void AddSC_boss_the_lurker_below() -{ - Script *newscript; - newscript = new Script; - newscript->Name = "boss_the_lurker_below"; - newscript->GetAI = &GetAI_boss_the_lurker_below; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_coilfang_guardian"; - newscript->GetAI = &GetAI_mob_coilfang_guardian; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_coilfang_ambusher"; - newscript->GetAI = &GetAI_mob_coilfang_ambusher; - newscript->RegisterSelf(); -} - - diff --git a/src/server/scripts/Outland/CoilfangReservoir/serpent_shrine/boss_morogrim_tidewalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/serpent_shrine/boss_morogrim_tidewalker.cpp deleted file mode 100644 index 14c87aee141..00000000000 --- a/src/server/scripts/Outland/CoilfangReservoir/serpent_shrine/boss_morogrim_tidewalker.cpp +++ /dev/null @@ -1,369 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ - -/* ScriptData -SDName: Boss_Morogrim_Tidewalker -SD%Complete: 90 -SDComment: Water globules don't explode properly, remove hacks -SDCategory: Coilfang Resevoir, Serpent Shrine Cavern -EndScriptData */ - -#include "ScriptedPch.h" -#include "serpent_shrine.h" - -#define SAY_AGGRO -1548030 -#define SAY_SUMMON1 -1548031 -#define SAY_SUMMON2 -1548032 -#define SAY_SUMMON_BUBL1 -1548033 -#define SAY_SUMMON_BUBL2 -1548034 -#define SAY_SLAY1 -1548035 -#define SAY_SLAY2 -1548036 -#define SAY_SLAY3 -1548037 -#define SAY_DEATH -1548038 -#define EMOTE_WATERY_GRAVE -1548039 -#define EMOTE_EARTHQUAKE -1548040 -#define EMOTE_WATERY_GLOBULES -1548041 - -#define SPELL_TIDAL_WAVE 37730 -#define SPELL_WATERY_GRAVE 38049 -#define SPELL_EARTHQUAKE 37764 -#define SPELL_WATERY_GRAVE_EXPLOSION 37852 - -#define WATERY_GRAVE_X1 334.64 -#define WATERY_GRAVE_Y1 -728.89 -#define WATERY_GRAVE_Z1 -14.42 -#define WATERY_GRAVE_X2 365.51 -#define WATERY_GRAVE_Y2 -737.14 -#define WATERY_GRAVE_Z2 -14.44 -#define WATERY_GRAVE_X3 366.19 -#define WATERY_GRAVE_Y3 -709.59 -#define WATERY_GRAVE_Z3 -14.36 -#define WATERY_GRAVE_X4 372.93 -#define WATERY_GRAVE_Y4 -690.96 -#define WATERY_GRAVE_Z4 -14.44 - -#define SPELL_WATERY_GRAVE_1 38023 -#define SPELL_WATERY_GRAVE_2 38024 -#define SPELL_WATERY_GRAVE_3 38025 -#define SPELL_WATERY_GRAVE_4 37850 - -#define SPELL_SUMMON_WATER_GLOBULE_1 37854 -#define SPELL_SUMMON_WATER_GLOBULE_2 37858 -#define SPELL_SUMMON_WATER_GLOBULE_3 37860 -#define SPELL_SUMMON_WATER_GLOBULE_4 37861 - -/*#define SPELL_SUMMON_MURLOC_A6 39813 -#define SPELL_SUMMON_MURLOC_A7 39814 -#define SPELL_SUMMON_MURLOC_A8 39815 -#define SPELL_SUMMON_MURLOC_A9 39816 -#define SPELL_SUMMON_MURLOC_A10 39817 - -#define SPELL_SUMMON_MURLOC_B6 39818 -#define SPELL_SUMMON_MURLOC_B7 39819 -#define SPELL_SUMMON_MURLOC_B8 39820 -#define SPELL_SUMMON_MURLOC_B9 39821 -#define SPELL_SUMMON_MURLOC_B10 39822*/ - -float MurlocCords[10][5] = -{ - {21920, 424.36, -715.4, -7.14, 0.124}, - {21920, 425.13, -719.3, -7.14, 0.124}, - {21920, 425.05, -724.23, -7.14, 0.124}, - {21920, 424.91, -728.68, -7.14, 0.124}, - {21920, 424.84, -732.18, -7.14, 0.124}, - {21920, 321.05, -734.2, -13.15, 0.124}, - {21920, 321.05, -729.4, -13.15, 0.124}, - {21920, 321.05, -724.03, -13.15, 0.124}, - {21920, 321.05, -718.73, -13.15, 0.124}, - {21920, 321.05, -714.24, -13.15, 0.124} -}; - -//Creatures -#define WATER_GLOBULE 21913 -#define TIDEWALKER_LURKER 21920 - -//Morogrim Tidewalker AI -struct boss_morogrim_tidewalkerAI : public ScriptedAI -{ - boss_morogrim_tidewalkerAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - } - - ScriptedInstance* pInstance; - - Map::PlayerList const *PlayerList; - - uint32 TidalWave_Timer; - uint32 WateryGrave_Timer; - uint32 Earthquake_Timer; - uint32 WateryGlobules_Timer; - uint32 globulespell[4]; - int8 Playercount; - int8 counter; - - bool Earthquake; - bool Phase2; - - void Reset() - { - TidalWave_Timer = 10000; - WateryGrave_Timer = 30000; - Earthquake_Timer = 40000; - WateryGlobules_Timer = 0; - globulespell[0] = SPELL_SUMMON_WATER_GLOBULE_1; - globulespell[1] = SPELL_SUMMON_WATER_GLOBULE_2; - globulespell[2] = SPELL_SUMMON_WATER_GLOBULE_3; - globulespell[3] = SPELL_SUMMON_WATER_GLOBULE_4; - - Earthquake = false; - Phase2 = false; - - if (pInstance) - pInstance->SetData(DATA_MOROGRIMTIDEWALKEREVENT, NOT_STARTED); - } - - void StartEvent() - { - DoScriptText(SAY_AGGRO, me); - - if (pInstance) - pInstance->SetData(DATA_MOROGRIMTIDEWALKEREVENT, IN_PROGRESS); - } - - void KilledUnit(Unit * /*victim*/) - { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2,SAY_SLAY3), me); - } - - void JustDied(Unit * /*victim*/) - { - DoScriptText(SAY_DEATH, me); - - if (pInstance) - pInstance->SetData(DATA_MOROGRIMTIDEWALKEREVENT, DONE); - } - - void EnterCombat(Unit * /*who*/) - { - PlayerList = &me->GetMap()->GetPlayers(); - Playercount = PlayerList->getSize(); - StartEvent(); - } - - void ApplyWateryGrave(Unit* pPlayer, uint8 i) - { - switch(i) - { - case 0: pPlayer->CastSpell(pPlayer, SPELL_WATERY_GRAVE_1, true); break; - case 1: pPlayer->CastSpell(pPlayer, SPELL_WATERY_GRAVE_2, true); break; - case 2: pPlayer->CastSpell(pPlayer, SPELL_WATERY_GRAVE_3, true); break; - case 3: pPlayer->CastSpell(pPlayer, SPELL_WATERY_GRAVE_4, true); break; - } - } - - void UpdateAI(const uint32 diff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - //Earthquake_Timer - if (Earthquake_Timer <= diff) - { - if (!Earthquake) - { - DoCast(me->getVictim(), SPELL_EARTHQUAKE); - Earthquake = true; - Earthquake_Timer = 10000; - } - else - { - DoScriptText(RAND(SAY_SUMMON1,SAY_SUMMON2), me); - - for (uint8 i = 0; i < 10; ++i) - { - Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); - Creature* Murloc = me->SummonCreature(MurlocCords[i][0],MurlocCords[i][1],MurlocCords[i][2],MurlocCords[i][3],MurlocCords[i][4], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); - if (pTarget && Murloc) - Murloc->AI()->AttackStart(pTarget); - } - DoScriptText(EMOTE_EARTHQUAKE, me); - Earthquake = false; - Earthquake_Timer = 40000+rand()%5000; - } - } else Earthquake_Timer -= diff; - - //TidalWave_Timer - if (TidalWave_Timer <= diff) - { - DoCast(me->getVictim(), SPELL_TIDAL_WAVE); - TidalWave_Timer = 20000; - } else TidalWave_Timer -= diff; - - if (!Phase2) - { - //WateryGrave_Timer - if (WateryGrave_Timer <= diff) - { - //Teleport 4 players under the waterfalls - Unit *pTarget; - using std::set; - setlist; - set::const_iterator itr; - for (uint8 i = 0; i < 4; ++i) - { - counter = 0; - do - { - pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 50, true); //target players only - if (counter < Playercount) - break; - if (pTarget) - itr = list.find(pTarget->GetGUID()); - ++counter; - } while (itr != list.end()); - - if (pTarget) - { - list.insert(pTarget->GetGUID()); - ApplyWateryGrave(pTarget, i); - } - } - - DoScriptText(RAND(SAY_SUMMON_BUBL1,SAY_SUMMON_BUBL2), me); - - DoScriptText(EMOTE_WATERY_GRAVE, me); - WateryGrave_Timer = 30000; - } else WateryGrave_Timer -= diff; - - //Start Phase2 - if ((me->GetHealth()*100 / me->GetMaxHealth()) < 25) - Phase2 = true; - } - else - { - //WateryGlobules_Timer - if (WateryGlobules_Timer <= diff) - { - Unit* pGlobuleTarget; - using std::set; - setglobulelist; - set::const_iterator itr; - for (uint8 g = 0; g < 4; g++) //one unit can't cast more than one spell per update, so some players have to cast for us XD - { - counter = 0; - do { - pGlobuleTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 50, true); - if (pGlobuleTarget) - itr = globulelist.find(pGlobuleTarget->GetGUID()); - if (counter > Playercount) - break; - ++counter; - } while (itr != globulelist.end()); - if (pGlobuleTarget) - globulelist.insert(pGlobuleTarget->GetGUID()); - pGlobuleTarget->CastSpell(pGlobuleTarget, globulespell[g], true); - } - DoScriptText(EMOTE_WATERY_GLOBULES, me); - WateryGlobules_Timer = 25000; - } else WateryGlobules_Timer -= diff; - } - - DoMeleeAttackIfReady(); - } -}; - -//Water Globule AI -#define SPELL_GLOBULE_EXPLOSION 37871 - -struct mob_water_globuleAI : public ScriptedAI -{ - mob_water_globuleAI(Creature *c) : ScriptedAI(c) {} - - uint32 Check_Timer; - - void Reset() - { - Check_Timer = 1000; - - me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - me->setFaction(14); - } - - void EnterCombat(Unit * /*who*/) {} - - void MoveInLineOfSight(Unit *who) - { - if (!who || me->getVictim()) - return; - - if (who->isTargetableForAttack() && who->isInAccessiblePlaceFor(me) && me->IsHostileTo(who)) - { - //no attack radius check - it attacks the first target that moves in his los - //who->RemoveSpellsCausingAura(SPELL_AURA_MOD_STEALTH); - AttackStart(who); - } - } - - void UpdateAI(const uint32 diff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - if (Check_Timer <= diff) - { - if (me->IsWithinDistInMap(me->getVictim(), 5)) - { - DoCast(me->getVictim(), SPELL_GLOBULE_EXPLOSION); - - //despawn - me->ForcedDespawn(); - return; - } - Check_Timer = 500; - } else Check_Timer -= diff; - - //do NOT deal any melee damage to the target. - } -}; - -CreatureAI* GetAI_boss_morogrim_tidewalker(Creature* pCreature) -{ - return new boss_morogrim_tidewalkerAI (pCreature); -} -CreatureAI* GetAI_mob_water_globule(Creature* pCreature) -{ - return new mob_water_globuleAI (pCreature); -} - -void AddSC_boss_morogrim_tidewalker() -{ - Script *newscript; - - newscript = new Script; - newscript->Name = "boss_morogrim_tidewalker"; - newscript->GetAI = &GetAI_boss_morogrim_tidewalker; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_water_globule"; - newscript->GetAI = &GetAI_mob_water_globule; - newscript->RegisterSelf(); -} - diff --git a/src/server/scripts/Outland/CoilfangReservoir/serpent_shrine/instance_serpent_shrine.cpp b/src/server/scripts/Outland/CoilfangReservoir/serpent_shrine/instance_serpent_shrine.cpp deleted file mode 100644 index c80afae15c7..00000000000 --- a/src/server/scripts/Outland/CoilfangReservoir/serpent_shrine/instance_serpent_shrine.cpp +++ /dev/null @@ -1,398 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: Instance_Serpent_Shrine -SD%Complete: 100 -SDComment: Instance Data Scripts and functions to acquire mobs and set encounter status for use in various Serpent Shrine Scripts -SDCategory: Coilfang Resevoir, Serpent Shrine Cavern -EndScriptData */ - -#include "ScriptedPch.h" -#include "serpent_shrine.h" - -#define MAX_ENCOUNTER 6 -#define SPELL_SCALDINGWATER 37284 -#define MOB_COILFANG_FRENZY 21508 -#define TRASHMOB_COILFANG_PRIESTESS 21220 //6*2 -#define TRASHMOB_COILFANG_SHATTERER 21301 //6*3 - -#define MIN_KILLS 30 - -//NOTE: there are 6 platforms -//there should be 3 shatterers and 2 priestess on all platforms, total of 30 elites, else it won't work! -//delete all other elites not on platforms! these mobs should only be on those platforms nowhere else. - -/* Serpentshrine cavern encounters: -0 - Hydross The Unstable event -1 - Leotheras The Blind Event -2 - The Lurker Below Event -3 - Fathom-Lord Karathress Event -4 - Morogrim Tidewalker Event -5 - Lady Vashj Event -*/ - -bool GOHello_go_bridge_console(Player* /*pPlayer*/, GameObject* pGo) -{ - ScriptedInstance* pInstance = pGo->GetInstanceData(); - - if (!pInstance) - return false; - - if (pInstance) - pInstance->SetData(DATA_CONTROL_CONSOLE, DONE); - - return true; -} - -struct instance_serpentshrine_cavern : public ScriptedInstance -{ - instance_serpentshrine_cavern(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; - - uint64 LurkerBelow; - uint64 Sharkkis; - uint64 Tidalvess; - uint64 Caribdis; - uint64 LadyVashj; - uint64 Karathress; - uint64 KarathressEvent_Starter; - uint64 LeotherasTheBlind; - uint64 LeotherasEventStarter; - - uint64 ControlConsole; - uint64 BridgePart[3]; - uint32 StrangePool; - uint32 FishingTimer; - uint32 LurkerSubEvent; - uint32 WaterCheckTimer; - uint32 FrenzySpawnTimer; - uint32 Water; - uint32 TrashCount; - - bool ShieldGeneratorDeactivated[4]; - uint32 m_auiEncounter[MAX_ENCOUNTER]; - bool DoSpawnFrenzy; - - void Initialize() - { - memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); - - LurkerBelow = 0; - Sharkkis = 0; - Tidalvess = 0; - Caribdis = 0; - LadyVashj = 0; - Karathress = 0; - KarathressEvent_Starter = 0; - LeotherasTheBlind = 0; - LeotherasEventStarter = 0; - - ControlConsole = 0; - BridgePart[0] = 0; - BridgePart[1] = 0; - BridgePart[2] = 0; - StrangePool = 0; - Water = WATERSTATE_FRENZY; - - ShieldGeneratorDeactivated[0] = false; - ShieldGeneratorDeactivated[1] = false; - ShieldGeneratorDeactivated[2] = false; - ShieldGeneratorDeactivated[3] = false; - FishingTimer = 1000; - LurkerSubEvent = 0; - WaterCheckTimer = 500; - FrenzySpawnTimer = 2000; - DoSpawnFrenzy = false; - TrashCount = 0; - - } - - bool IsEncounterInProgress() const - { - for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) - if (m_auiEncounter[i] == IN_PROGRESS) return true; - - return false; - } - - void Update (uint32 diff) - { - //Lurker Fishing event - if (LurkerSubEvent == LURKER_FISHING) - { - if (FishingTimer <= diff) - { - LurkerSubEvent = LURKER_HOOKED; - SetData(DATA_STRANGE_POOL, IN_PROGRESS);//just fished, signal Lurker script to emerge and start fight, we use IN_PROGRESS so it won't get saved and lurker will be alway invis at start if server restarted - } else FishingTimer -= diff; - } - //Water checks - if (WaterCheckTimer <= diff) - { - if (TrashCount >= MIN_KILLS) - Water = WATERSTATE_SCALDING; - else - Water = WATERSTATE_FRENZY; - - Map::PlayerList const &PlayerList = instance->GetPlayers(); - if (PlayerList.isEmpty()) - return; - for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) - { - if (Player* pPlayer = i->getSource()) - { - if (pPlayer->isAlive() && /*i->getSource()->GetPositionZ() <= -21.434931f*/pPlayer->IsInWater()) - { - if (Water == WATERSTATE_SCALDING) - { - - if (!pPlayer->HasAura(SPELL_SCALDINGWATER)) - { - pPlayer->CastSpell(pPlayer, SPELL_SCALDINGWATER,true); - } - } else if (Water == WATERSTATE_FRENZY) - { - //spawn frenzy - if (DoSpawnFrenzy) - { - if (Creature* frenzy = pPlayer->SummonCreature(MOB_COILFANG_FRENZY,pPlayer->GetPositionX(),pPlayer->GetPositionY(),pPlayer->GetPositionZ(),pPlayer->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,2000)) - { - frenzy->Attack(pPlayer,false); - frenzy->AddUnitMovementFlag(MOVEMENTFLAG_SWIMMING | MOVEMENTFLAG_LEVITATING); - } - DoSpawnFrenzy = false; - } - } - } - if (!pPlayer->IsInWater()) - pPlayer->RemoveAurasDueToSpell(SPELL_SCALDINGWATER); - } - - } - WaterCheckTimer = 500;//remove stress from core - } else WaterCheckTimer -= diff; - if (FrenzySpawnTimer <= diff) - { - DoSpawnFrenzy = true; - FrenzySpawnTimer = 2000; - } else FrenzySpawnTimer -= diff; - } - - void OnGameObjectCreate(GameObject* pGo, bool /*add*/) - { - switch(pGo->GetEntry()) - { - case 184568: - ControlConsole = pGo->GetGUID(); - pGo->setActive(true); - break; - - case 184203: - BridgePart[0] = pGo->GetGUID(); - pGo->setActive(true); - break; - - case 184204: - BridgePart[1] = pGo->GetGUID(); - pGo->setActive(true); - break; - - case 184205: - BridgePart[2] = pGo->GetGUID(); - pGo->setActive(true); - break; - case GAMEOBJECT_FISHINGNODE_ENTRY://no way checking if fish is hooked, so we create a timed event - if (LurkerSubEvent == LURKER_NOT_STARTED) - { - FishingTimer = 10000+rand()%30000;//random time before lurker emerges - LurkerSubEvent = LURKER_FISHING; - } - break; - } - } - - void OnCreatureCreate(Creature* pCreature, bool /*add*/) - { - switch(pCreature->GetEntry()) - { - case 21212: LadyVashj = pCreature->GetGUID(); break; - case 21214: Karathress = pCreature->GetGUID(); break; - case 21966: Sharkkis = pCreature->GetGUID(); break; - case 21217: LurkerBelow = pCreature->GetGUID(); break; - case 21965: Tidalvess = pCreature->GetGUID(); break; - case 21964: Caribdis = pCreature->GetGUID(); break; - case 21215: LeotherasTheBlind = pCreature->GetGUID(); break; - /*case TRASHMOB_COILFANG_PRIESTESS: - case TRASHMOB_COILFANG_SHATTERER: - if (pCreature->isAlive()) - ++TrashCount; - break;*/ - } - } - - void SetData64(uint32 type, uint64 data) - { - if (type == DATA_KARATHRESSEVENT_STARTER) - KarathressEvent_Starter = data; - if (type == DATA_LEOTHERAS_EVENT_STARTER) - LeotherasEventStarter = data; - } - - uint64 GetData64(uint32 identifier) - { - switch(identifier) - { - case DATA_THELURKERBELOW: return LurkerBelow; - case DATA_SHARKKIS: return Sharkkis; - case DATA_TIDALVESS: return Tidalvess; - case DATA_CARIBDIS: return Caribdis; - case DATA_LADYVASHJ: return LadyVashj; - case DATA_KARATHRESS: return Karathress; - case DATA_KARATHRESSEVENT_STARTER: return KarathressEvent_Starter; - case DATA_LEOTHERAS: return LeotherasTheBlind; - case DATA_LEOTHERAS_EVENT_STARTER: return LeotherasEventStarter; - } - return 0; - } - - void SetData(uint32 type, uint32 data) - { - switch(type) - { - case DATA_STRANGE_POOL: - { - StrangePool = data; - if (data == NOT_STARTED) - LurkerSubEvent = LURKER_NOT_STARTED; - } - break; - case DATA_CONTROL_CONSOLE: - if (data == DONE) - { - HandleGameObject(BridgePart[0], true); - HandleGameObject(BridgePart[0], true); - HandleGameObject(BridgePart[0], true); - } - ControlConsole = data;break; - case DATA_TRASH : - { - if (data == 1 && TrashCount < MIN_KILLS) - ++TrashCount;//+1 died - SaveToDB(); - break; - } - case DATA_WATER : Water = data;break; - case DATA_HYDROSSTHEUNSTABLEEVENT: m_auiEncounter[0] = data; break; - case DATA_LEOTHERASTHEBLINDEVENT: m_auiEncounter[1] = data; break; - case DATA_THELURKERBELOWEVENT: m_auiEncounter[2] = data; break; - case DATA_KARATHRESSEVENT: m_auiEncounter[3] = data; break; - case DATA_MOROGRIMTIDEWALKEREVENT: m_auiEncounter[4] = data; break; - //Lady Vashj - case DATA_LADYVASHJEVENT: - if (data == NOT_STARTED) - { - ShieldGeneratorDeactivated[0] = false; - ShieldGeneratorDeactivated[1] = false; - ShieldGeneratorDeactivated[2] = false; - ShieldGeneratorDeactivated[3] = false; - } - m_auiEncounter[5] = data; break; - case DATA_SHIELDGENERATOR1:ShieldGeneratorDeactivated[0] = (data) ? true : false; break; - case DATA_SHIELDGENERATOR2:ShieldGeneratorDeactivated[1] = (data) ? true : false; break; - case DATA_SHIELDGENERATOR3:ShieldGeneratorDeactivated[2] = (data) ? true : false; break; - case DATA_SHIELDGENERATOR4:ShieldGeneratorDeactivated[3] = (data) ? true : false; break; - } - - if (data == DONE) - SaveToDB(); - } - - uint32 GetData(uint32 type) - { - switch(type) - { - case DATA_HYDROSSTHEUNSTABLEEVENT: return m_auiEncounter[0]; - case DATA_LEOTHERASTHEBLINDEVENT: return m_auiEncounter[1]; - case DATA_THELURKERBELOWEVENT: return m_auiEncounter[2]; - case DATA_KARATHRESSEVENT: return m_auiEncounter[3]; - case DATA_MOROGRIMTIDEWALKEREVENT: return m_auiEncounter[4]; - //Lady Vashj - case DATA_LADYVASHJEVENT: return m_auiEncounter[5]; - case DATA_SHIELDGENERATOR1: return ShieldGeneratorDeactivated[0]; - case DATA_SHIELDGENERATOR2: return ShieldGeneratorDeactivated[1]; - case DATA_SHIELDGENERATOR3: return ShieldGeneratorDeactivated[2]; - case DATA_SHIELDGENERATOR4: return ShieldGeneratorDeactivated[3]; - case DATA_CANSTARTPHASE3: - if (ShieldGeneratorDeactivated[0] && ShieldGeneratorDeactivated[1] && ShieldGeneratorDeactivated[2] && ShieldGeneratorDeactivated[3])return 1;break; - case DATA_STRANGE_POOL: return StrangePool; - case DATA_WATER: return Water; - } - return 0; - } - std::string GetSaveData() - { - OUT_SAVE_INST_DATA; - std::ostringstream stream; - stream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " " - << m_auiEncounter[3] << " " << m_auiEncounter[4] << " " << m_auiEncounter[5] << " " << TrashCount; - char* out = new char[stream.str().length() + 1]; - strcpy(out, stream.str().c_str()); - if (out) - { - OUT_SAVE_INST_DATA_COMPLETE; - return out; - } - return NULL; - } - - void Load(const char* in) - { - if (!in) - { - OUT_LOAD_INST_DATA_FAIL; - return; - } - OUT_LOAD_INST_DATA(in); - std::istringstream stream(in); - stream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3] - >> m_auiEncounter[4] >> m_auiEncounter[5] >> TrashCount; - for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) - if (m_auiEncounter[i] == IN_PROGRESS) // Do not load an encounter as "In Progress" - reset it instead. - m_auiEncounter[i] = NOT_STARTED; - OUT_LOAD_INST_DATA_COMPLETE; - } -}; - -InstanceData* GetInstanceData_instance_serpentshrine_cavern(Map* pMap) -{ - return new instance_serpentshrine_cavern(pMap); -} - -void AddSC_instance_serpentshrine_cavern() -{ - Script *newscript; - - newscript = new Script; - newscript->Name = "instance_serpent_shrine"; - newscript->GetInstanceData = &GetInstanceData_instance_serpentshrine_cavern; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "go_bridge_console"; - newscript->pGOHello = &GOHello_go_bridge_console; - newscript->RegisterSelf(); -} - diff --git a/src/server/scripts/Outland/CoilfangReservoir/serpent_shrine/serpent_shrine.h b/src/server/scripts/Outland/CoilfangReservoir/serpent_shrine/serpent_shrine.h deleted file mode 100644 index adfa39dc7e0..00000000000 --- a/src/server/scripts/Outland/CoilfangReservoir/serpent_shrine/serpent_shrine.h +++ /dev/null @@ -1,45 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software licensed under GPL version 2 - * Please see the included DOCS/LICENSE.TXT for more information */ - -#ifndef DEF_SERPENT_SHRINE_H -#define DEF_SERPENT_SHRINE_H -enum LurkerEventState -{ - LURKER_NOT_STARTED = 0, - LURKER_FISHING = 1, - LURKER_HOOKED = 2 -}; -enum WaterEventState -{ - WATERSTATE_NONE = 0, - WATERSTATE_FRENZY = 1, - WATERSTATE_SCALDING = 2 -}; -#define DATA_CANSTARTPHASE3 1 -#define DATA_CARIBDIS 2 -#define DATA_HYDROSSTHEUNSTABLEEVENT 3 -#define DATA_KARATHRESS 4 -#define DATA_KARATHRESSEVENT 5 -#define DATA_KARATHRESSEVENT_STARTER 6 -#define DATA_LADYVASHJ 7 -#define DATA_LADYVASHJEVENT 8 -#define DATA_LEOTHERASTHEBLINDEVENT 9 -#define DATA_MOROGRIMTIDEWALKEREVENT 10 -#define DATA_SHARKKIS 11 -#define DATA_SHIELDGENERATOR1 12 -#define DATA_SHIELDGENERATOR2 13 -#define DATA_SHIELDGENERATOR3 14 -#define DATA_SHIELDGENERATOR4 15 -#define DATA_THELURKERBELOW 16 -#define DATA_THELURKERBELOWEVENT 17 -#define DATA_TIDALVESS 18 -#define DATA_FATHOMLORDKARATHRESSEVENT 19 -#define DATA_LEOTHERAS 20 -#define DATA_LEOTHERAS_EVENT_STARTER 21 -#define DATA_CONTROL_CONSOLE 22 -#define DATA_STRANGE_POOL 23 -#define DATA_WATER 24 -#define DATA_TRASH 25 -#endif - diff --git a/src/server/scripts/Outland/CoilfangReservoir/steam_vault/boss_hydromancer_thespia.cpp b/src/server/scripts/Outland/CoilfangReservoir/steam_vault/boss_hydromancer_thespia.cpp deleted file mode 100644 index 8e1b438bdc5..00000000000 --- a/src/server/scripts/Outland/CoilfangReservoir/steam_vault/boss_hydromancer_thespia.cpp +++ /dev/null @@ -1,187 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: Boss_Hydromancer_Thespia -SD%Complete: 80 -SDComment: Needs additional adjustments (when instance script is adjusted) -SDCategory: Coilfang Resevoir, The Steamvault -EndScriptData */ - -/* ContentData -boss_hydromancer_thespia -mob_coilfang_waterelemental -EndContentData */ - -#include "ScriptedPch.h" -#include "steam_vault.h" - -#define SAY_SUMMON -1545000 -#define SAY_AGGRO_1 -1545001 -#define SAY_AGGRO_2 -1545002 -#define SAY_AGGRO_3 -1545003 -#define SAY_SLAY_1 -1545004 -#define SAY_SLAY_2 -1545005 -#define SAY_DEAD -1545006 - -#define SPELL_LIGHTNING_CLOUD 25033 -#define SPELL_LUNG_BURST 31481 -#define SPELL_ENVELOPING_WINDS 31718 - -struct boss_thespiaAI : public ScriptedAI -{ - boss_thespiaAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - } - - ScriptedInstance *pInstance; - - uint32 LightningCloud_Timer; - uint32 LungBurst_Timer; - uint32 EnvelopingWinds_Timer; - - void Reset() - { - LightningCloud_Timer = 15000; - LungBurst_Timer = 7000; - EnvelopingWinds_Timer = 9000; - - if (pInstance) - pInstance->SetData(TYPE_HYDROMANCER_THESPIA, NOT_STARTED); - } - - void JustDied(Unit* /*Killer*/) - { - DoScriptText(SAY_DEAD, me); - - if (pInstance) - pInstance->SetData(TYPE_HYDROMANCER_THESPIA, DONE); - } - - void KilledUnit(Unit* /*victim*/) - { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); - } - - void EnterCombat(Unit * /*who*/) - { - DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); - - if (pInstance) - pInstance->SetData(TYPE_HYDROMANCER_THESPIA, IN_PROGRESS); - } - - void UpdateAI(const uint32 diff) - { - if (!UpdateVictim()) - return; - - //LightningCloud_Timer - if (LightningCloud_Timer <= diff) - { - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget, SPELL_LIGHTNING_CLOUD); - - //cast twice in Heroic mode - if (IsHeroic()) - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget, SPELL_LIGHTNING_CLOUD); - - LightningCloud_Timer = 15000+rand()%10000; - } else LightningCloud_Timer -=diff; - - //LungBurst_Timer - if (LungBurst_Timer <= diff) - { - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget, SPELL_LUNG_BURST); - LungBurst_Timer = 7000+rand()%5000; - } else LungBurst_Timer -=diff; - - //EnvelopingWinds_Timer - if (EnvelopingWinds_Timer <= diff) - { - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget, SPELL_ENVELOPING_WINDS); - - //cast twice in Heroic mode - if (IsHeroic()) - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget, SPELL_ENVELOPING_WINDS); - EnvelopingWinds_Timer = 10000+rand()%5000; - } else EnvelopingWinds_Timer -=diff; - - DoMeleeAttackIfReady(); - } -}; - -#define SPELL_WATER_BOLT_VOLLEY 34449 -#define H_SPELL_WATER_BOLT_VOLLEY 37924 - -struct mob_coilfang_waterelementalAI : public ScriptedAI -{ - mob_coilfang_waterelementalAI(Creature *c) : ScriptedAI(c) {} - - uint32 WaterBoltVolley_Timer; - - void Reset() - { - WaterBoltVolley_Timer = 3000+rand()%3000; - } - - void EnterCombat(Unit * /*who*/) { } - - void UpdateAI(const uint32 diff) - { - if (!UpdateVictim()) - return; - - if (WaterBoltVolley_Timer <= diff) - { - DoCast(me, SPELL_WATER_BOLT_VOLLEY); - WaterBoltVolley_Timer = 7000+rand()%5000; - } else WaterBoltVolley_Timer -= diff; - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_boss_thespiaAI(Creature* pCreature) -{ - return new boss_thespiaAI (pCreature); -} - -CreatureAI* GetAI_mob_coilfang_waterelementalAI(Creature* pCreature) -{ - return new mob_coilfang_waterelementalAI (pCreature); -} - -void AddSC_boss_hydromancer_thespia() -{ - Script *newscript; - - newscript = new Script; - newscript->Name = "boss_hydromancer_thespia"; - newscript->GetAI = &GetAI_boss_thespiaAI; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_coilfang_waterelemental"; - newscript->GetAI = &GetAI_mob_coilfang_waterelementalAI; - newscript->RegisterSelf(); -} - diff --git a/src/server/scripts/Outland/CoilfangReservoir/steam_vault/boss_mekgineer_steamrigger.cpp b/src/server/scripts/Outland/CoilfangReservoir/steam_vault/boss_mekgineer_steamrigger.cpp deleted file mode 100644 index f2da4058e44..00000000000 --- a/src/server/scripts/Outland/CoilfangReservoir/steam_vault/boss_mekgineer_steamrigger.cpp +++ /dev/null @@ -1,264 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: Boss_Mekgineer_Steamrigger -SD%Complete: 60 -SDComment: Mechanics' interrrupt heal doesn't work very well, also a proper movement needs to be implemented -> summon further away and move towards pTarget to repair. -SDCategory: Coilfang Resevoir, The Steamvault -EndScriptData */ - -/* ContentData -boss_mekgineer_steamrigger -mob_steamrigger_mechanic -EndContentData */ - -#include "ScriptedPch.h" -#include "steam_vault.h" - -#define SAY_MECHANICS -1545007 -#define SAY_AGGRO_1 -1545008 -#define SAY_AGGRO_2 -1545009 -#define SAY_AGGRO_3 -1545010 -#define SAY_AGGRO_4 -1545011 -#define SAY_SLAY_1 -1545012 -#define SAY_SLAY_2 -1545013 -#define SAY_SLAY_3 -1545014 -#define SAY_DEATH -1545015 - -#define SPELL_SUPER_SHRINK_RAY 31485 -#define SPELL_SAW_BLADE 31486 -#define SPELL_ELECTRIFIED_NET 35107 -#define H_SPELL_ENRAGE 1 //corrent enrage spell not known - -#define ENTRY_STREAMRIGGER_MECHANIC 17951 - -struct boss_mekgineer_steamriggerAI : public ScriptedAI -{ - boss_mekgineer_steamriggerAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - } - - ScriptedInstance *pInstance; - - uint32 Shrink_Timer; - uint32 Saw_Blade_Timer; - uint32 Electrified_Net_Timer; - bool Summon75; - bool Summon50; - bool Summon25; - - void Reset() - { - Shrink_Timer = 20000; - Saw_Blade_Timer = 15000; - Electrified_Net_Timer = 10000; - - Summon75 = false; - Summon50 = false; - Summon25 = false; - - if (pInstance) - pInstance->SetData(TYPE_MEKGINEER_STEAMRIGGER, NOT_STARTED); - } - - void JustDied(Unit* /*Killer*/) - { - DoScriptText(SAY_DEATH, me); - - if (pInstance) - pInstance->SetData(TYPE_MEKGINEER_STEAMRIGGER, DONE); - } - - void KilledUnit(Unit* /*victim*/) - { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me); - } - - void EnterCombat(Unit * /*who*/) - { - DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); - - if (pInstance) - pInstance->SetData(TYPE_MEKGINEER_STEAMRIGGER, IN_PROGRESS); - } - - //no known summon spells exist - void SummonMechanichs() - { - DoScriptText(SAY_MECHANICS, me); - - DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC,5,5,0,0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000); - DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC,-5,5,0,0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000); - DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC,-5,-5,0,0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000); - - if (rand()%2) - DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC,5,-7,0,0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000); - if (rand()%2) - DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC,7,-5,0,0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000); - } - - void UpdateAI(const uint32 diff) - { - if (!UpdateVictim()) - return; - - if (Shrink_Timer <= diff) - { - DoCast(me->getVictim(), SPELL_SUPER_SHRINK_RAY); - Shrink_Timer = 20000; - } else Shrink_Timer -= diff; - - if (Saw_Blade_Timer <= diff) - { - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,1)) - DoCast(pTarget, SPELL_SAW_BLADE); - else - DoCast(me->getVictim(), SPELL_SAW_BLADE); - - Saw_Blade_Timer = 15000; - } else Saw_Blade_Timer -= diff; - - if (Electrified_Net_Timer <= diff) - { - DoCast(me->getVictim(), SPELL_ELECTRIFIED_NET); - Electrified_Net_Timer = 10000; - } - else Electrified_Net_Timer -= diff; - - if (!Summon75) - { - if ((me->GetHealth()*100 / me->GetMaxHealth()) < 75) - { - SummonMechanichs(); - Summon75 = true; - } - } - - if (!Summon50) - { - if ((me->GetHealth()*100 / me->GetMaxHealth()) < 50) - { - SummonMechanichs(); - Summon50 = true; - } - } - - if (!Summon25) - { - if ((me->GetHealth()*100 / me->GetMaxHealth()) < 25) - { - SummonMechanichs(); - Summon25 = true; - } - } - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_boss_mekgineer_steamrigger(Creature* pCreature) -{ - return new boss_mekgineer_steamriggerAI (pCreature); -} - -#define SPELL_DISPEL_MAGIC 17201 -#define SPELL_REPAIR 31532 -#define H_SPELL_REPAIR 37936 - -#define MAX_REPAIR_RANGE (13.0f) //we should be at least at this range for repair -#define MIN_REPAIR_RANGE (7.0f) //we can stop movement at this range to repair but not required - -struct mob_steamrigger_mechanicAI : public ScriptedAI -{ - mob_steamrigger_mechanicAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - } - - ScriptedInstance* pInstance; - - uint32 Repair_Timer; - - void Reset() - { - Repair_Timer = 2000; - } - - void MoveInLineOfSight(Unit* /*who*/) - { - //react only if attacked - } - - void EnterCombat(Unit * /*who*/) { } - - void UpdateAI(const uint32 diff) - { - if (Repair_Timer <= diff) - { - if (pInstance && pInstance->GetData64(DATA_MEKGINEERSTEAMRIGGER) && pInstance->GetData(TYPE_MEKGINEER_STEAMRIGGER) == IN_PROGRESS) - { - if (Unit* pMekgineer = Unit::GetUnit((*me), pInstance->GetData64(DATA_MEKGINEERSTEAMRIGGER))) - { - if (me->IsWithinDistInMap(pMekgineer, MAX_REPAIR_RANGE)) - { - //are we already channeling? Doesn't work very well, find better check? - if (!me->GetUInt32Value(UNIT_CHANNEL_SPELL)) - { - //me->GetMotionMaster()->MovementExpired(); - //me->GetMotionMaster()->MoveIdle(); - - DoCast(me, SPELL_REPAIR, true); - } - Repair_Timer = 5000; - } - else - { - //me->GetMotionMaster()->MovementExpired(); - //me->GetMotionMaster()->MoveFollow(pMekgineer,0,0); - } - } - } else Repair_Timer = 5000; - } else Repair_Timer -= diff; - - if (!UpdateVictim()) - return; - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_mob_steamrigger_mechanic(Creature* pCreature) -{ - return new mob_steamrigger_mechanicAI (pCreature); -} - -void AddSC_boss_mekgineer_steamrigger() -{ - Script *newscript; - - newscript = new Script; - newscript->Name = "boss_mekgineer_steamrigger"; - newscript->GetAI = &GetAI_boss_mekgineer_steamrigger; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_steamrigger_mechanic"; - newscript->GetAI = &GetAI_mob_steamrigger_mechanic; - newscript->RegisterSelf(); -} - diff --git a/src/server/scripts/Outland/CoilfangReservoir/steam_vault/boss_warlord_kalithresh.cpp b/src/server/scripts/Outland/CoilfangReservoir/steam_vault/boss_warlord_kalithresh.cpp deleted file mode 100644 index f46956dda81..00000000000 --- a/src/server/scripts/Outland/CoilfangReservoir/steam_vault/boss_warlord_kalithresh.cpp +++ /dev/null @@ -1,204 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: Boss_Warlord_Kalithres -SD%Complete: 65 -SDComment: Contains workarounds regarding warlord's rage spells not acting as expected. Both scripts here require review and fine tuning. -SDCategory: Coilfang Resevoir, The Steamvault -EndScriptData */ - -#include "ScriptedPch.h" -#include "steam_vault.h" - -#define SAY_INTRO -1545016 -#define SAY_REGEN -1545017 -#define SAY_AGGRO1 -1545018 -#define SAY_AGGRO2 -1545019 -#define SAY_AGGRO3 -1545020 -#define SAY_SLAY1 -1545021 -#define SAY_SLAY2 -1545022 -#define SAY_DEATH -1545023 - -#define SPELL_SPELL_REFLECTION 31534 -#define SPELL_IMPALE 39061 -#define SPELL_WARLORDS_RAGE 37081 -#define SPELL_WARLORDS_RAGE_NAGA 31543 - -#define SPELL_WARLORDS_RAGE_PROC 36453 - -struct mob_naga_distillerAI : public ScriptedAI -{ - mob_naga_distillerAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - } - - ScriptedInstance *pInstance; - - void Reset() - { - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - - //hack, due to really weird spell behaviour :( - if (pInstance) - { - if (pInstance->GetData(TYPE_DISTILLER) == IN_PROGRESS) - { - me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - } - } - } - - void EnterCombat(Unit * /*who*/) { } - - void StartRageGen(Unit * /*caster*/) - { - me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - - DoCast(me, SPELL_WARLORDS_RAGE_NAGA, true); - - if (pInstance) - pInstance->SetData(TYPE_DISTILLER,IN_PROGRESS); - } - - void DamageTaken(Unit * /*done_by*/, uint32 &damage) - { - if (me->GetHealth() <= damage) - if (pInstance) - pInstance->SetData(TYPE_DISTILLER,DONE); - } -}; - -struct boss_warlord_kalithreshAI : public ScriptedAI -{ - boss_warlord_kalithreshAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - } - - ScriptedInstance *pInstance; - - uint32 Reflection_Timer; - uint32 Impale_Timer; - uint32 Rage_Timer; - bool CanRage; - - void Reset() - { - Reflection_Timer = 10000; - Impale_Timer = 7000+rand()%7000; - Rage_Timer = 45000; - CanRage = false; - - if (pInstance) - pInstance->SetData(TYPE_WARLORD_KALITHRESH, NOT_STARTED); - } - - void EnterCombat(Unit * /*who*/) - { - DoScriptText(RAND(SAY_AGGRO1,SAY_AGGRO2,SAY_AGGRO3), me); - - if (pInstance) - pInstance->SetData(TYPE_WARLORD_KALITHRESH, IN_PROGRESS); - } - - void KilledUnit(Unit* /*victim*/) - { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); - } - - void SpellHit(Unit * /*caster*/, const SpellEntry *spell) - { - //hack :( - if (spell->Id == SPELL_WARLORDS_RAGE_PROC) - if (pInstance) - if (pInstance->GetData(TYPE_DISTILLER) == DONE) - me->RemoveAurasDueToSpell(SPELL_WARLORDS_RAGE_PROC); - } - - void JustDied(Unit* /*Killer*/) - { - DoScriptText(SAY_DEATH, me); - - if (pInstance) - pInstance->SetData(TYPE_WARLORD_KALITHRESH, DONE); - } - - void UpdateAI(const uint32 diff) - { - if (!UpdateVictim()) - return; - - if (Rage_Timer <= diff) - { - if (Creature* distiller = me->FindNearestCreature(17954, 100.0f)) - { - DoScriptText(SAY_REGEN, me); - DoCast(me, SPELL_WARLORDS_RAGE); - CAST_AI(mob_naga_distillerAI, distiller->AI())->StartRageGen(me); - } - Rage_Timer = 3000+rand()%15000; - } else Rage_Timer -= diff; - - //Reflection_Timer - if (Reflection_Timer <= diff) - { - DoCast(me, SPELL_SPELL_REFLECTION); - Reflection_Timer = 15000+rand()%10000; - } else Reflection_Timer -= diff; - - //Impale_Timer - if (Impale_Timer <= diff) - { - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget, SPELL_IMPALE); - - Impale_Timer = 7500+rand()%5000; - } else Impale_Timer -= diff; - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_mob_naga_distiller(Creature* pCreature) -{ - return new mob_naga_distillerAI (pCreature); -} - -CreatureAI* GetAI_boss_warlord_kalithresh(Creature* pCreature) -{ - return new boss_warlord_kalithreshAI (pCreature); -} - -void AddSC_boss_warlord_kalithresh() -{ - Script *newscript; - - newscript = new Script; - newscript->Name = "mob_naga_distiller"; - newscript->GetAI = &GetAI_mob_naga_distiller; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "boss_warlord_kalithresh"; - newscript->GetAI = &GetAI_boss_warlord_kalithresh; - newscript->RegisterSelf(); -} - diff --git a/src/server/scripts/Outland/CoilfangReservoir/steam_vault/instance_steam_vault.cpp b/src/server/scripts/Outland/CoilfangReservoir/steam_vault/instance_steam_vault.cpp deleted file mode 100644 index 188a23738f5..00000000000 --- a/src/server/scripts/Outland/CoilfangReservoir/steam_vault/instance_steam_vault.cpp +++ /dev/null @@ -1,231 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: Instance_Steam_Vault -SD%Complete: 80 -SDComment: Instance script and access panel GO -SDCategory: Coilfang Resevoir, The Steamvault -EndScriptData */ - -#include "ScriptedPch.h" -#include "steam_vault.h" - -#define MAX_ENCOUNTER 4 - -#define MAIN_CHAMBERS_DOOR 183049 -#define ACCESS_PANEL_HYDRO 184125 -#define ACCESS_PANEL_MEK 184126 - -/* Steam Vaults encounters: -1 - Hydromancer Thespia Event -2 - Mekgineer Steamrigger Event -3 - Warlord Kalithresh Event -*/ - -bool GOHello_go_main_chambers_access_panel(Player* /*pPlayer*/, GameObject* pGo) -{ - ScriptedInstance* pInstance = pGo->GetInstanceData(); - - if (!pInstance) - return false; - - if (pGo->GetEntry() == ACCESS_PANEL_HYDRO && (pInstance->GetData(TYPE_HYDROMANCER_THESPIA) == DONE || pInstance->GetData(TYPE_HYDROMANCER_THESPIA) == SPECIAL)) - pInstance->SetData(TYPE_HYDROMANCER_THESPIA,SPECIAL); - - if (pGo->GetEntry() == ACCESS_PANEL_MEK && (pInstance->GetData(TYPE_MEKGINEER_STEAMRIGGER) == DONE || pInstance->GetData(TYPE_MEKGINEER_STEAMRIGGER) == SPECIAL)) - pInstance->SetData(TYPE_MEKGINEER_STEAMRIGGER,SPECIAL); - - return true; -} - -struct instance_steam_vault : public ScriptedInstance -{ - instance_steam_vault(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; - - uint32 m_auiEncounter[MAX_ENCOUNTER]; - - uint64 ThespiaGUID; - uint64 MekgineerGUID; - uint64 KalithreshGUID; - - uint64 MainChambersDoor; - uint64 AccessPanelHydro; - uint64 AccessPanelMek; - - void Initialize() - { - memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); - - ThespiaGUID = 0; - MekgineerGUID = 0; - KalithreshGUID = 0; - MainChambersDoor = 0; - AccessPanelHydro = 0; - AccessPanelMek = 0; - } - - bool IsEncounterInProgress() const - { - for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) - if (m_auiEncounter[i] == IN_PROGRESS) - return true; - - return false; - } - - void OnCreatureCreate(Creature* pCreature, bool /*add*/) - { - switch(pCreature->GetEntry()) - { - case 17797: ThespiaGUID = pCreature->GetGUID(); break; - case 17796: MekgineerGUID = pCreature->GetGUID(); break; - case 17798: KalithreshGUID = pCreature->GetGUID(); break; - } - } - - void OnGameObjectCreate(GameObject* pGo, bool /*add*/) - { - switch(pGo->GetEntry()) - { - case MAIN_CHAMBERS_DOOR: MainChambersDoor = pGo->GetGUID(); break; - case ACCESS_PANEL_HYDRO: AccessPanelHydro = pGo->GetGUID(); break; - case ACCESS_PANEL_MEK: AccessPanelMek = pGo->GetGUID(); break; - } - } - - void SetData(uint32 type, uint32 data) - { - switch(type) - { - case TYPE_HYDROMANCER_THESPIA: - if (data == SPECIAL) - { - HandleGameObject(AccessPanelHydro, true); - - if (GetData(TYPE_MEKGINEER_STEAMRIGGER) == SPECIAL) - HandleGameObject(MainChambersDoor, true); - - debug_log("TSCR: Instance Steamvault: Access panel used."); - } - m_auiEncounter[0] = data; - break; - case TYPE_MEKGINEER_STEAMRIGGER: - if (data == SPECIAL) - { - HandleGameObject(AccessPanelMek, true); - - if (GetData(TYPE_HYDROMANCER_THESPIA) == SPECIAL) - HandleGameObject(MainChambersDoor, true); - - debug_log("TSCR: Instance Steamvault: Access panel used."); - } - m_auiEncounter[1] = data; - break; - case TYPE_WARLORD_KALITHRESH: - m_auiEncounter[2] = data; - break; - case TYPE_DISTILLER: - m_auiEncounter[3] = data; - break; - } - - if (data == DONE || data == SPECIAL) - SaveToDB(); - } - - uint32 GetData(uint32 type) - { - switch(type) - { - case TYPE_HYDROMANCER_THESPIA: - return m_auiEncounter[0]; - case TYPE_MEKGINEER_STEAMRIGGER: - return m_auiEncounter[1]; - case TYPE_WARLORD_KALITHRESH: - return m_auiEncounter[2]; - case TYPE_DISTILLER: - return m_auiEncounter[3]; - } - return 0; - } - - uint64 GetData64(uint32 data) - { - switch(data) - { - case DATA_THESPIA: - return ThespiaGUID; - case DATA_MEKGINEERSTEAMRIGGER: - return MekgineerGUID; - case DATA_KALITRESH: - return KalithreshGUID; - } - return 0; - } - - std::string GetSaveData() - { - OUT_SAVE_INST_DATA; - std::ostringstream stream; - stream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " " << m_auiEncounter[3]; - char* out = new char[stream.str().length() + 1]; - strcpy(out, stream.str().c_str()); - if (out) - { - OUT_SAVE_INST_DATA_COMPLETE; - return out; - } - return NULL; - } - - void Load(const char* in) - { - if (!in) - { - OUT_LOAD_INST_DATA_FAIL; - return; - } - OUT_LOAD_INST_DATA(in); - std::istringstream stream(in); - stream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3]; - for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) - if (m_auiEncounter[i] == IN_PROGRESS) - m_auiEncounter[i] = NOT_STARTED; - OUT_LOAD_INST_DATA_COMPLETE; - } -}; - -InstanceData* GetInstanceData_instance_steam_vault(Map* pMap) -{ - return new instance_steam_vault(pMap); -} - -void AddSC_instance_steam_vault() -{ - Script *newscript; - - newscript = new Script; - newscript->Name = "go_main_chambers_access_panel"; - newscript->pGOHello = &GOHello_go_main_chambers_access_panel; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "instance_steam_vault"; - newscript->GetInstanceData = &GetInstanceData_instance_steam_vault; - newscript->RegisterSelf(); -} - diff --git a/src/server/scripts/Outland/CoilfangReservoir/steam_vault/steam_vault.h b/src/server/scripts/Outland/CoilfangReservoir/steam_vault/steam_vault.h deleted file mode 100644 index 4b407ac4816..00000000000 --- a/src/server/scripts/Outland/CoilfangReservoir/steam_vault/steam_vault.h +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software licensed under GPL version 2 - * Please see the included DOCS/LICENSE.TXT for more information */ - -#ifndef DEF_STEAM_VAULT_H -#define DEF_STEAM_VAULT_H - -#define TYPE_HYDROMANCER_THESPIA 1 -#define TYPE_MEKGINEER_STEAMRIGGER 2 -#define TYPE_WARLORD_KALITHRESH 3 -#define TYPE_DISTILLER 4 - -#define DATA_MEKGINEERSTEAMRIGGER 5 -#define DATA_KALITRESH 6 -#define DATA_THESPIA 7 -#endif - diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h new file mode 100644 index 00000000000..b845c66823f --- /dev/null +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h @@ -0,0 +1,29 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software licensed under GPL version 2 + * Please see the included DOCS/LICENSE.TXT for more information */ + +#ifndef DEF_BLOOD_FURNACE_H +#define DEF_BLOOD_FURNACE_H + +#define DATA_THE_MAKER 1 +#define DATA_BROGGOK 2 +#define DATA_KELIDAN_THE_MAKER 3 +#define TYPE_THE_MAKER_EVENT 4 +#define TYPE_BROGGOK_EVENT 5 +#define TYPE_KELIDAN_THE_BREAKER_EVENT 6 +#define DATA_DOOR1 7 +#define DATA_DOOR2 8 +#define DATA_DOOR3 9 +#define DATA_DOOR4 10 +#define DATA_DOOR5 11 +#define DATA_DOOR6 12 +#define DATA_PRISON_CELL1 13 +#define DATA_PRISON_CELL2 14 +#define DATA_PRISON_CELL3 15 +#define DATA_PRISON_CELL4 16 +#define DATA_PRISON_CELL5 17 +#define DATA_PRISON_CELL6 18 +#define DATA_PRISON_CELL7 19 +#define DATA_PRISON_CELL8 20 +#endif + diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp new file mode 100644 index 00000000000..d5fb9bdba49 --- /dev/null +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp @@ -0,0 +1,131 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Boss_Broggok +SD%Complete: 70 +SDComment: pre-event not made +SDCategory: Hellfire Citadel, Blood Furnace +EndScriptData */ + +#include "ScriptedPch.h" +#include "blood_furnace.h" + +enum eEnums +{ + SAY_AGGRO = -1542008, + + SPELL_SLIME_SPRAY = 30913, + SPELL_POISON_CLOUD = 30916, + SPELL_POISON_BOLT = 30917, + + SPELL_POISON = 30914 +}; + +struct boss_broggokAI : public ScriptedAI +{ + boss_broggokAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + } + + ScriptedInstance* pInstance; + + uint32 AcidSpray_Timer; + uint32 PoisonSpawn_Timer; + uint32 PoisonBolt_Timer; + + void Reset() + { + AcidSpray_Timer = 10000; + PoisonSpawn_Timer = 5000; + PoisonBolt_Timer = 7000; + if (pInstance) + { + pInstance->SetData(TYPE_BROGGOK_EVENT, NOT_STARTED); + pInstance->HandleGameObject(pInstance->GetData64(DATA_DOOR4), true); + } + } + + void EnterCombat(Unit * /*who*/) + { + DoScriptText(SAY_AGGRO, me); + if (pInstance) + { + pInstance->SetData(TYPE_BROGGOK_EVENT, IN_PROGRESS); + pInstance->HandleGameObject(pInstance->GetData64(DATA_DOOR4), false); + } + } + + void JustSummoned(Creature *summoned) + { + summoned->setFaction(16); + summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + summoned->CastSpell(summoned,SPELL_POISON,false,0,0,me->GetGUID()); + } + + void UpdateAI(const uint32 diff) + { + if (!UpdateVictim()) + return; + + if (AcidSpray_Timer <= diff) + { + DoCast(me->getVictim(), SPELL_SLIME_SPRAY); + AcidSpray_Timer = 4000+rand()%8000; + } else AcidSpray_Timer -=diff; + + if (PoisonBolt_Timer <= diff) + { + DoCast(me->getVictim(), SPELL_POISON_BOLT); + PoisonBolt_Timer = 4000+rand()%8000; + } else PoisonBolt_Timer -=diff; + + if (PoisonSpawn_Timer <= diff) + { + DoCast(me, SPELL_POISON_CLOUD); + PoisonSpawn_Timer = 20000; + } else PoisonSpawn_Timer -=diff; + + DoMeleeAttackIfReady(); + } + + void JustDied(Unit* /*who*/) + { + if (pInstance) + { + pInstance->HandleGameObject(pInstance->GetData64(DATA_DOOR4), true); + pInstance->HandleGameObject(pInstance->GetData64(DATA_DOOR5), true); + pInstance->SetData(TYPE_BROGGOK_EVENT, DONE); + } + } + +}; + +CreatureAI* GetAI_boss_broggok(Creature* pCreature) +{ + return new boss_broggokAI (pCreature); +} + +void AddSC_boss_broggok() +{ + Script *newscript; + newscript = new Script; + newscript->Name = "boss_broggok"; + newscript->GetAI = &GetAI_boss_broggok; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp new file mode 100644 index 00000000000..a44ad9cc3c8 --- /dev/null +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp @@ -0,0 +1,356 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Boss_Kelidan_The_Breaker +SD%Complete: 100 +SDComment: +SDCategory: Hellfire Citadel, Blood Furnace +EndScriptData */ + +/* ContentData +boss_kelidan_the_breaker +mob_shadowmoon_channeler +EndContentData */ + +#include "ScriptedPch.h" +#include "blood_furnace.h" + +enum eKelidan +{ + SAY_WAKE = -1542000, + SAY_ADD_AGGRO_1 = -1542001, + SAY_ADD_AGGRO_2 = -1542002, + SAY_ADD_AGGRO_3 = -1542003, + SAY_KILL_1 = -1542004, + SAY_KILL_2 = -1542005, + SAY_NOVA = -1542006, + SAY_DIE = -1542007, + + SPELL_CORRUPTION = 30938, + SPELL_EVOCATION = 30935, + + SPELL_FIRE_NOVA = 33132, + H_SPELL_FIRE_NOVA = 37371, + + SPELL_SHADOW_BOLT_VOLLEY = 28599, + H_SPELL_SHADOW_BOLT_VOLLEY = 40070, + + SPELL_BURNING_NOVA = 30940, + SPELL_VORTEX = 37370, + + ENTRY_KELIDAN = 17377, + ENTRY_CHANNELER = 17653 +}; + +const float ShadowmoonChannelers[5][4]= +{ + {302,-87,-24.4,0.157}, + {321,-63.5,-24.6,4.887}, + {346,-74.5,-24.6,3.595}, + {344,-103.5,-24.5,2.356}, + {316,-109,-24.6,1.257} +}; + +struct boss_kelidan_the_breakerAI : public ScriptedAI +{ + boss_kelidan_the_breakerAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + for (uint8 i=0; i<5; ++i) + Channelers[i] = 0; + } + + ScriptedInstance* pInstance; + + uint32 ShadowVolley_Timer; + uint32 BurningNova_Timer; + uint32 Firenova_Timer; + uint32 Corruption_Timer; + uint32 check_Timer; + bool Firenova; + bool addYell; + uint64 Channelers[5]; + + void Reset() + { + ShadowVolley_Timer = 1000; + BurningNova_Timer = 15000; + Corruption_Timer = 5000; + check_Timer = 0; + Firenova = false; + addYell = false; + SummonChannelers(); + if (pInstance) + pInstance->SetData(TYPE_KELIDAN_THE_BREAKER_EVENT, NOT_STARTED); + } + + void EnterCombat(Unit* who) + { + DoScriptText(SAY_WAKE, me); + if (me->IsNonMeleeSpellCasted(false)) + me->InterruptNonMeleeSpells(true); + DoStartMovement(who); + if (pInstance) + pInstance->SetData(TYPE_KELIDAN_THE_BREAKER_EVENT, IN_PROGRESS); + } + + void KilledUnit(Unit* /*victim*/) + { + if (rand()%2) + return; + + DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2), me); + } + + void ChannelerEngaged(Unit* who) + { + if (who && !addYell) + { + addYell = true; + DoScriptText(RAND(SAY_ADD_AGGRO_1,SAY_ADD_AGGRO_2,SAY_ADD_AGGRO_3), me); + } + for (uint8 i=0; i<5; ++i) + { + Creature *channeler = Unit::GetCreature(*me, Channelers[i]); + if (who && channeler && !channeler->isInCombat()) + channeler->AI()->AttackStart(who); + } + } + + void ChannelerDied(Unit* killer) + { + for (uint8 i=0; i<5; ++i) + { + Creature *channeler = Unit::GetCreature(*me, Channelers[i]); + if (channeler && channeler->isAlive()) + return; + } + + if (killer) + me->AI()->AttackStart(killer); + } + + uint64 GetChanneled(Creature *channeler1) + { + SummonChannelers(); + if (!channeler1) return NULL; + uint8 i; + for (i=0; i<5; ++i) + { + Creature *channeler = Unit::GetCreature(*me, Channelers[i]); + if (channeler && channeler->GetGUID() == channeler1->GetGUID()) + break; + } + return Channelers[(i+2)%5]; + } + + void SummonChannelers() + { + for (uint8 i=0; i<5; ++i) + { + Creature *channeler = Unit::GetCreature(*me, Channelers[i]); + if (!channeler || channeler->isDead()) + channeler = me->SummonCreature(ENTRY_CHANNELER,ShadowmoonChannelers[i][0],ShadowmoonChannelers[i][1],ShadowmoonChannelers[i][2],ShadowmoonChannelers[i][3],TEMPSUMMON_CORPSE_TIMED_DESPAWN,300000); + if (channeler) + Channelers[i] = channeler->GetGUID(); + else + Channelers[i] = 0; + } + } + + void JustDied(Unit* /*Killer*/) + { + DoScriptText(SAY_DIE, me); + + if (!pInstance) + return; + + pInstance->SetData(TYPE_KELIDAN_THE_BREAKER_EVENT, DONE); + pInstance->HandleGameObject(pInstance->GetData64(DATA_DOOR1), true); + pInstance->HandleGameObject(pInstance->GetData64(DATA_DOOR6), true); + } + + void UpdateAI(const uint32 diff) + { + if (!UpdateVictim()) + { + if (check_Timer <= diff) + { + if (!me->IsNonMeleeSpellCasted(false)) + DoCast(me, SPELL_EVOCATION); + check_Timer = 5000; + } else check_Timer -= diff; + return; + } + + if (Firenova) + { + if (Firenova_Timer <= diff) + { + DoCast(me, SPELL_FIRE_NOVA, true); + Firenova = false; + ShadowVolley_Timer = 2000; + } else Firenova_Timer -=diff; + + return; + } + + if (ShadowVolley_Timer <= diff) + { + DoCast(me, SPELL_SHADOW_BOLT_VOLLEY); + ShadowVolley_Timer = 5000+rand()%8000; + } else ShadowVolley_Timer -=diff; + + if (Corruption_Timer <= diff) + { + DoCast(me, SPELL_CORRUPTION); + Corruption_Timer = 30000+rand()%20000; + } else Corruption_Timer -=diff; + + if (BurningNova_Timer <= diff) + { + if (me->IsNonMeleeSpellCasted(false)) + me->InterruptNonMeleeSpells(true); + + DoScriptText(SAY_NOVA, me); + + if (SpellEntry *nova = GET_SPELL(SPELL_BURNING_NOVA)) + { + if (Aura * aura = Aura::TryCreate(nova, me, me)) + aura->ApplyForTargets(); + } + + if (IsHeroic()) + DoTeleportAll(me->GetPositionX(),me->GetPositionY(),me->GetPositionZ(),me->GetOrientation()); + + BurningNova_Timer = 20000+rand()%8000; + Firenova_Timer= 5000; + Firenova = true; + } else BurningNova_Timer -=diff; + + DoMeleeAttackIfReady(); + } + +}; + +CreatureAI* GetAI_boss_kelidan_the_breaker(Creature* pCreature) +{ + return new boss_kelidan_the_breakerAI (pCreature); +} + +/*###### +## mob_shadowmoon_channeler +######*/ + +enum eShadowmoon +{ + SPELL_SHADOW_BOLT = 12739, + H_SPELL_SHADOW_BOLT = 15472, + + SPELL_MARK_OF_SHADOW = 30937, + SPELL_CHANNELING = 39123 +}; + +struct mob_shadowmoon_channelerAI : public ScriptedAI +{ + mob_shadowmoon_channelerAI(Creature *c) : ScriptedAI(c) + { + } + + uint32 ShadowBolt_Timer; + uint32 MarkOfShadow_Timer; + uint32 check_Timer; + + void Reset() + { + ShadowBolt_Timer = 1000+rand()%1000; + MarkOfShadow_Timer = 5000+rand()%2000; + check_Timer = 0; + if (me->IsNonMeleeSpellCasted(false)) + me->InterruptNonMeleeSpells(true); + } + + void EnterCombat(Unit* who) + { + if (Creature *Kelidan = me->FindNearestCreature(ENTRY_KELIDAN, 100)) + CAST_AI(boss_kelidan_the_breakerAI, Kelidan->AI())->ChannelerEngaged(who); + if (me->IsNonMeleeSpellCasted(false)) + me->InterruptNonMeleeSpells(true); + DoStartMovement(who); + } + + void JustDied(Unit* Killer) + { + if (Creature *Kelidan = me->FindNearestCreature(ENTRY_KELIDAN, 100)) + CAST_AI(boss_kelidan_the_breakerAI, Kelidan->AI())->ChannelerDied(Killer); + } + + void UpdateAI(const uint32 diff) + { + if (!UpdateVictim()) + { + if (check_Timer <= diff) + { + if (!me->IsNonMeleeSpellCasted(false)) + if (Creature *Kelidan = me->FindNearestCreature(ENTRY_KELIDAN, 100)) + { + uint64 channeler = CAST_AI(boss_kelidan_the_breakerAI, Kelidan->AI())->GetChanneled(me); + if (Unit *channeled = Unit::GetUnit(*me, channeler)) + DoCast(channeled, SPELL_CHANNELING); + } + check_Timer = 5000; + } else check_Timer -= diff; + return; + } + + if (MarkOfShadow_Timer <= diff) + { + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, SPELL_MARK_OF_SHADOW); + MarkOfShadow_Timer = 15000+rand()%5000; + } else MarkOfShadow_Timer -=diff; + + if (ShadowBolt_Timer <= diff) + { + DoCast(me->getVictim(), SPELL_SHADOW_BOLT); + ShadowBolt_Timer = 5000+rand()%1000; + } else ShadowBolt_Timer -=diff; + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_mob_shadowmoon_channeler(Creature* pCreature) +{ + return new mob_shadowmoon_channelerAI (pCreature); +} + +void AddSC_boss_kelidan_the_breaker() +{ + Script *newscript; + + newscript = new Script; + newscript->Name = "boss_kelidan_the_breaker"; + newscript->GetAI = &GetAI_boss_kelidan_the_breaker; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_shadowmoon_channeler"; + newscript->GetAI = &GetAI_mob_shadowmoon_channeler; + newscript->RegisterSelf(); +} + diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp new file mode 100644 index 00000000000..45219b6509b --- /dev/null +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp @@ -0,0 +1,152 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Boss_The_Maker +SD%Complete: 80 +SDComment: Mind control no support +SDCategory: Hellfire Citadel, Blood Furnace +EndScriptData */ + +#include "ScriptedPch.h" +#include "blood_furnace.h" + +enum eEnums +{ + SAY_AGGRO_1 = -1542009, + SAY_AGGRO_2 = -1542010, + SAY_AGGRO_3 = -1542011, + SAY_KILL_1 = -1542012, + SAY_KILL_2 = -1542013, + SAY_DIE = -1542014, + + SPELL_ACID_SPRAY = 38153, // heroic 38973 ??? 38153 + SPELL_EXPLODING_BREAKER = 30925, + SPELL_KNOCKDOWN = 20276, + SPELL_DOMINATION = 25772 // ??? +}; + +struct boss_the_makerAI : public ScriptedAI +{ + boss_the_makerAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + } + + ScriptedInstance* pInstance; + + uint32 AcidSpray_Timer; + uint32 ExplodingBreaker_Timer; + uint32 Domination_Timer; + uint32 Knockdown_Timer; + + void Reset() + { + AcidSpray_Timer = 15000; + ExplodingBreaker_Timer = 6000; + Domination_Timer = 120000; + Knockdown_Timer = 10000; + + if (!pInstance) + return; + + pInstance->SetData(TYPE_THE_MAKER_EVENT, NOT_STARTED); + pInstance->HandleGameObject(pInstance->GetData64(DATA_DOOR2), true); + } + + void EnterCombat(Unit * /*who*/) + { + DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); + + if (!pInstance) + return; + + pInstance->SetData(TYPE_THE_MAKER_EVENT, IN_PROGRESS); + pInstance->HandleGameObject(pInstance->GetData64(DATA_DOOR2), false); + } + + void KilledUnit(Unit* /*victim*/) + { + DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2), me); + } + + void JustDied(Unit* /*Killer*/) + { + DoScriptText(SAY_DIE, me); + + if (!pInstance) + return; + + pInstance->SetData(TYPE_THE_MAKER_EVENT, DONE); + pInstance->HandleGameObject(pInstance->GetData64(DATA_DOOR2), true); + pInstance->HandleGameObject(pInstance->GetData64(DATA_DOOR3), true); + + } + + void UpdateAI(const uint32 diff) + { + if (!UpdateVictim()) + return; + + if (AcidSpray_Timer <= diff) + { + DoCast(me->getVictim(), SPELL_ACID_SPRAY); + AcidSpray_Timer = 15000+rand()%8000; + } else AcidSpray_Timer -=diff; + + if (ExplodingBreaker_Timer <= diff) + { + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget, SPELL_EXPLODING_BREAKER); + ExplodingBreaker_Timer = 4000+rand()%8000; + } else ExplodingBreaker_Timer -=diff; + + /* // Disabled until Core Support for mind control + if (domination_timer_timer <= diff) + { + Unit *pTarget; + pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); + + DoCast(pTarget, SPELL_DOMINATION); + + domination_timer = 120000; + } else domination_timer -=diff; + */ + + if (Knockdown_Timer <= diff) + { + DoCast(me->getVictim(), SPELL_KNOCKDOWN); + Knockdown_Timer = 4000+rand()%8000; + } else Knockdown_Timer -=diff; + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_boss_the_makerAI(Creature* pCreature) +{ + return new boss_the_makerAI (pCreature); +} + +void AddSC_boss_the_maker() +{ + Script *newscript; + newscript = new Script; + newscript->Name = "boss_the_maker"; + newscript->GetAI = &GetAI_boss_the_makerAI; + newscript->RegisterSelf(); +} + diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp new file mode 100644 index 00000000000..3a2eb8ba5ee --- /dev/null +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp @@ -0,0 +1,232 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Instance_Blood_Furnace +SD%Complete: 85 +SDComment: +SDCategory: Hellfire Citadel, Blood Furnace +EndScriptData */ + +#include "ScriptedPch.h" +#include "blood_furnace.h" + +#define ENTRY_SEWER1 181823 +#define ENTRY_SEWER2 181766 +#define MAX_ENCOUNTER 3 + +struct instance_blood_furnace : public ScriptedInstance +{ + instance_blood_furnace(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; + + uint64 The_MakerGUID; + uint64 BroggokGUID; + uint64 Kelidan_The_BreakerGUID; + + uint64 Door1GUID; + uint64 Door2GUID; + uint64 Door3GUID; + uint64 Door4GUID; + uint64 Door5GUID; + uint64 Door6GUID; + + uint64 PrisonCell1GUID; + uint64 PrisonCell2GUID; + uint64 PrisonCell3GUID; + uint64 PrisonCell4GUID; + uint64 PrisonCell5GUID; + uint64 PrisonCell6GUID; + uint64 PrisonCell7GUID; + uint64 PrisonCell8GUID; + + uint32 m_auiEncounter[MAX_ENCOUNTER]; + std::string str_data; + + void Initialize() + { + memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); + + The_MakerGUID = 0; + BroggokGUID = 0; + Kelidan_The_BreakerGUID = 0; + + Door1GUID = 0; + Door2GUID = 0; + Door3GUID = 0; + Door4GUID = 0; + Door5GUID = 0; + Door6GUID = 0; + + PrisonCell1GUID = 0; + PrisonCell2GUID = 0; + PrisonCell3GUID = 0; + PrisonCell4GUID = 0; + PrisonCell5GUID = 0; + PrisonCell6GUID = 0; + PrisonCell7GUID = 0; + PrisonCell8GUID = 0; + } + + void OnCreatureCreate(Creature* pCreature, bool add) + { + if (!add) + return; + + switch(pCreature->GetEntry()) + { + case 17381: The_MakerGUID = pCreature->GetGUID(); break; + case 17380: BroggokGUID = pCreature->GetGUID(); break; + case 17377: Kelidan_The_BreakerGUID = pCreature->GetGUID(); break; + } + } + + void OnGameObjectCreate(GameObject* pGo, bool add) + { + if (!add) + return; + + if (pGo->GetEntry() == 181766) //Final exit door + Door1GUID = pGo->GetGUID(); + if (pGo->GetEntry() == 181811) //The Maker Front door + Door2GUID = pGo->GetGUID(); + if (pGo->GetEntry() == 181812) //The Maker Rear door + Door3GUID = pGo->GetGUID(); + if (pGo->GetEntry() == 181822) //Broggok Front door + Door4GUID = pGo->GetGUID(); + if (pGo->GetEntry() == 181819) //Broggok Rear door + Door5GUID = pGo->GetGUID(); + if (pGo->GetEntry() == 181823) //Kelidan exit door + Door6GUID = pGo->GetGUID(); + + if (pGo->GetEntry() == 181813) //The Maker prison cell front right + PrisonCell1GUID = pGo->GetGUID(); + if (pGo->GetEntry() == 181814) //The Maker prison cell back right + PrisonCell2GUID = pGo->GetGUID(); + if (pGo->GetEntry() == 181816) //The Maker prison cell front left + PrisonCell3GUID = pGo->GetGUID(); + if (pGo->GetEntry() == 181815) //The Maker prison cell back left + PrisonCell4GUID = pGo->GetGUID(); + if (pGo->GetEntry() == 181821) //Broggok prison cell front right + PrisonCell5GUID = pGo->GetGUID(); + if (pGo->GetEntry() == 181818) //Broggok prison cell back right + PrisonCell6GUID = pGo->GetGUID(); + if (pGo->GetEntry() == 181820) //Broggok prison cell front left + PrisonCell7GUID = pGo->GetGUID(); + if (pGo->GetEntry() == 181817) //Broggok prison cell back left + PrisonCell8GUID = pGo->GetGUID(); + } + + uint64 GetData64(uint32 data) + { + switch(data) + { + case DATA_THE_MAKER: return The_MakerGUID; + case DATA_BROGGOK: return BroggokGUID; + case DATA_KELIDAN_THE_MAKER: return Kelidan_The_BreakerGUID; + case DATA_DOOR1: return Door1GUID; + case DATA_DOOR2: return Door2GUID; + case DATA_DOOR3: return Door3GUID; + case DATA_DOOR4: return Door4GUID; + case DATA_DOOR5: return Door5GUID; + case DATA_DOOR6: return Door6GUID; + case DATA_PRISON_CELL1: return PrisonCell1GUID; + case DATA_PRISON_CELL2: return PrisonCell2GUID; + case DATA_PRISON_CELL3: return PrisonCell3GUID; + case DATA_PRISON_CELL4: return PrisonCell4GUID; + case DATA_PRISON_CELL5: return PrisonCell5GUID; + case DATA_PRISON_CELL6: return PrisonCell6GUID; + case DATA_PRISON_CELL7: return PrisonCell7GUID; + case DATA_PRISON_CELL8: return PrisonCell8GUID; + } + + return 0; + } + + void SetData(uint32 /*type*/, uint32 data) + { + switch(data) + { + case TYPE_THE_MAKER_EVENT: m_auiEncounter[0] = data; break; + case TYPE_BROGGOK_EVENT: m_auiEncounter[1] = data; break; + case TYPE_KELIDAN_THE_BREAKER_EVENT: m_auiEncounter[2] = data; break; + } + + if (data == DONE) + { + OUT_SAVE_INST_DATA; + + std::ostringstream saveStream; + saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2]; + + str_data = saveStream.str(); + + SaveToDB(); + OUT_SAVE_INST_DATA_COMPLETE; + } + } + + uint32 GetData(uint32 data) + { + switch(data) + { + case TYPE_THE_MAKER_EVENT: return m_auiEncounter[0]; + case TYPE_BROGGOK_EVENT: return m_auiEncounter[1]; + case TYPE_KELIDAN_THE_BREAKER_EVENT: return m_auiEncounter[2]; + } + + return 0; + } + + const char* Save() + { + return str_data.c_str(); + } + + void Load(const char* in) + { + if (!in) + { + OUT_LOAD_INST_DATA_FAIL; + return; + } + + OUT_LOAD_INST_DATA(in); + + std::istringstream loadStream(in); + loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2]; + + for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) + if (m_auiEncounter[i] == IN_PROGRESS || m_auiEncounter[i] == FAIL) + m_auiEncounter[i] = NOT_STARTED; + + OUT_LOAD_INST_DATA_COMPLETE; + } +}; + +InstanceData* GetInstanceData_instance_blood_furnace(Map* pMap) +{ + return new instance_blood_furnace(pMap); +} + +void AddSC_instance_blood_furnace() +{ + Script *newscript; + newscript = new Script; + newscript->Name = "instance_blood_furnace"; + newscript->GetInstanceData = &GetInstanceData_instance_blood_furnace; + newscript->RegisterSelf(); +} + diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp new file mode 100644 index 00000000000..d6c0b2fd401 --- /dev/null +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp @@ -0,0 +1,206 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Boss_Omar_The_Unscarred +SD%Complete: 90 +SDComment: Temporary solution for orbital/shadow whip-ability. Needs more core support before making it more proper. +SDCategory: Hellfire Citadel, Hellfire Ramparts +EndScriptData */ + +#include "ScriptedPch.h" + +#define SAY_AGGRO_1 -1543009 +#define SAY_AGGRO_2 -1543010 +#define SAY_AGGRO_3 -1543011 +#define SAY_SUMMON -1543012 +#define SAY_CURSE -1543013 +#define SAY_KILL_1 -1543014 +#define SAY_DIE -1543015 +#define SAY_WIPE -1543016 + +#define SPELL_ORBITAL_STRIKE 30637 +#define SPELL_SHADOW_WHIP 30638 +#define SPELL_TREACHEROUS_AURA 30695 +#define H_SPELL_BANE_OF_TREACHERY 37566 +#define SPELL_DEMONIC_SHIELD 31901 +#define SPELL_SHADOW_BOLT 30686 +#define H_SPELL_SHADOW_BOLT 39297 +#define SPELL_SUMMON_FIENDISH_HOUND 30707 + +struct boss_omor_the_unscarredAI : public ScriptedAI +{ + boss_omor_the_unscarredAI(Creature *c) : ScriptedAI(c) + { + SetCombatMovement(false); + } + + uint32 OrbitalStrike_Timer; + uint32 ShadowWhip_Timer; + uint32 Aura_Timer; + uint32 DemonicShield_Timer; + uint32 Shadowbolt_Timer; + uint32 Summon_Timer; + uint32 SummonedCount; + uint64 PlayerGUID; + bool CanPullBack; + + void Reset() + { + DoScriptText(SAY_WIPE, me); + + OrbitalStrike_Timer = 25000; + ShadowWhip_Timer = 2000; + Aura_Timer = 10000; + DemonicShield_Timer = 1000; + Shadowbolt_Timer = 2000; + Summon_Timer = 10000; + SummonedCount = 0; + PlayerGUID = 0; + CanPullBack = false; + } + + void EnterCombat(Unit * /*who*/) + { + DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); + } + + void KilledUnit(Unit* /*victim*/) + { + if (rand()%2) + return; + + DoScriptText(SAY_KILL_1, me); + } + + void JustSummoned(Creature* summoned) + { + DoScriptText(SAY_SUMMON, me); + + if (Unit* random = SelectUnit(SELECT_TARGET_RANDOM,0)) + summoned->AI()->AttackStart(random); + + ++SummonedCount; + } + + void JustDied(Unit* /*Killer*/) + { + DoScriptText(SAY_DIE, me); + } + + void UpdateAI(const uint32 diff) + { + if (!UpdateVictim()) + return; + + //only two may be wrong, perhaps increase timer and spawn periodically instead. + if (SummonedCount < 2) + { + if (Summon_Timer <= diff) + { + me->InterruptNonMeleeSpells(false); + DoCast(me, SPELL_SUMMON_FIENDISH_HOUND); + Summon_Timer = 15000+rand()%15000; + } else Summon_Timer -= diff; + } + + if (CanPullBack) + { + if (ShadowWhip_Timer <= diff) + { + if (Player* temp = Unit::GetPlayer(PlayerGUID)) + { + //if unit dosen't have this flag, then no pulling back (script will attempt cast, even if orbital strike was resisted) + if (temp->HasUnitMovementFlag(MOVEMENTFLAG_FALLING)) + { + me->InterruptNonMeleeSpells(false); + DoCast(temp, SPELL_SHADOW_WHIP); + } + } + PlayerGUID = 0; + ShadowWhip_Timer = 2000; + CanPullBack = false; + } else ShadowWhip_Timer -= diff; + } + else if (OrbitalStrike_Timer <= diff) + { + Unit* temp = NULL; + if (me->IsWithinMeleeRange(me->getVictim())) + temp = me->getVictim(); + else temp = SelectUnit(SELECT_TARGET_RANDOM,0); + + if (temp && temp->GetTypeId() == TYPEID_PLAYER) + { + DoCast(temp, SPELL_ORBITAL_STRIKE); + OrbitalStrike_Timer = 14000+rand()%2000; + PlayerGUID = temp->GetGUID(); + + if (PlayerGUID) + CanPullBack = true; + } + } else OrbitalStrike_Timer -= diff; + + if ((me->GetHealth()*100) / me->GetMaxHealth() < 20) + { + if (DemonicShield_Timer <= diff) + { + DoCast(me, SPELL_DEMONIC_SHIELD); + DemonicShield_Timer = 15000; + } else DemonicShield_Timer -= diff; + } + + if (Aura_Timer <= diff) + { + DoScriptText(SAY_CURSE, me); + + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + { + DoCast(pTarget, SPELL_TREACHEROUS_AURA); + Aura_Timer = 8000+rand()%8000; + } + } else Aura_Timer -= diff; + + if (Shadowbolt_Timer <= diff) + { + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + { + if (pTarget) + pTarget = me->getVictim(); + + DoCast(pTarget, SPELL_SHADOW_BOLT); + Shadowbolt_Timer = 4000+rand()%2500; + } + } else Shadowbolt_Timer -= diff; + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_boss_omor_the_unscarredAI(Creature* pCreature) +{ + return new boss_omor_the_unscarredAI (pCreature); +} + +void AddSC_boss_omor_the_unscarred() +{ + Script *newscript; + + newscript = new Script; + newscript->Name = "boss_omor_the_unscarred"; + newscript->GetAI = &GetAI_boss_omor_the_unscarredAI; + newscript->RegisterSelf(); +} + diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp new file mode 100644 index 00000000000..181911f77a4 --- /dev/null +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp @@ -0,0 +1,467 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +Name: Boss_Vazruden_the_Herald +%Complete: 90 +Comment: +Category: Hellfire Citadel, Hellfire Ramparts +EndScriptData */ + +#include "ScriptedPch.h" + +#define SPELL_FIREBALL DUNGEON_MODE(34653, 36920) +#define SPELL_CONE_OF_FIRE DUNGEON_MODE(30926, 36921) +#define SPELL_SUMMON_LIQUID_FIRE DUNGEON_MODE(23971, 30928) +#define SPELL_BELLOWING_ROAR 39427 +#define SPELL_REVENGE DUNGEON_MODE(19130, 40392) +#define SPELL_KIDNEY_SHOT 30621 +#define SPELL_FIRE_NOVA_VISUAL 19823 + +#define ENTRY_HELLFIRE_SENTRY 17517 +#define ENTRY_VAZRUDEN_HERALD 17307 +#define ENTRY_VAZRUDEN 17537 +#define ENTRY_NAZAN 17536 +#define ENTRY_LIQUID_FIRE 22515 +#define ENTRY_REINFORCED_FEL_IRON_CHEST DUNGEON_MODE(185168, 185169) + +#define SAY_INTRO -1543017 +#define SAY_WIPE -1543018 +#define SAY_AGGRO_1 -1543019 +#define SAY_AGGRO_2 -1543020 +#define SAY_AGGRO_3 -1543021 +#define SAY_KILL_1 -1543022 +#define SAY_KILL_2 -1543023 +#define SAY_DIE -1543024 +#define EMOTE -1543025 + +#define PATH_ENTRY 2081 + +const float VazrudenMiddle[3] = {-1406.5, 1746.5, 81.2}; +const float VazrudenRing[2][3] = +{ + {-1430, 1705, 112}, + {-1377, 1760, 112} +}; + +struct boss_nazanAI : public ScriptedAI +{ + boss_nazanAI(Creature *c) : ScriptedAI(c) + { + VazrudenGUID = 0; + flight = true; + } + + uint32 Fireball_Timer; + uint32 ConeOfFire_Timer; + uint32 BellowingRoar_Timer; + uint32 Fly_Timer; + uint32 Turn_Timer; + uint32 UnsummonCheck; + bool flight; + uint64 VazrudenGUID; + SpellEntry *liquid_fire; + + void Reset() + { + Fireball_Timer = 4000; + Fly_Timer = 45000; + Turn_Timer = 0; + UnsummonCheck = 5000; + } + + void EnterCombat(Unit* /*who*/) {} + + void JustSummoned(Creature *summoned) + { + if (summoned && summoned->GetEntry() == ENTRY_LIQUID_FIRE) + { + summoned->SetLevel(me->getLevel()); + summoned->setFaction(me->getFaction()); + summoned->CastSpell(summoned,SPELL_SUMMON_LIQUID_FIRE,true); + summoned->CastSpell(summoned,SPELL_FIRE_NOVA_VISUAL,true); + } + } + + void SpellHitTarget(Unit *pTarget, const SpellEntry* entry) + { + if (pTarget && entry->Id == uint32(SPELL_FIREBALL)) + me->SummonCreature(ENTRY_LIQUID_FIRE,pTarget->GetPositionX(),pTarget->GetPositionY(),pTarget->GetPositionZ(),pTarget->GetOrientation(),TEMPSUMMON_TIMED_DESPAWN,30000); + } + + void UpdateAI(const uint32 diff) + { + if (!UpdateVictim()) + { + if (UnsummonCheck < diff && me->isAlive()) + me->DisappearAndDie(); + else + UnsummonCheck -= diff; + return; + } + + if (Fireball_Timer <= diff) + { + if (Unit *victim = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(victim, SPELL_FIREBALL, true); + Fireball_Timer = urand(4000,7000); + } else Fireball_Timer -= diff; + + if (flight) // phase 1 - the flight + { + Creature *Vazruden = Unit::GetCreature(*me,VazrudenGUID); + if (Fly_Timer < diff || !(Vazruden && Vazruden->isAlive() && (Vazruden->GetHealth()*5 > Vazruden->GetMaxHealth()))) + { + flight = false; + BellowingRoar_Timer = 6000; + ConeOfFire_Timer = 12000; + me->RemoveUnitMovementFlag(MOVEMENTFLAG_LEVITATING); + me->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE); + me->GetMotionMaster()->Clear(); + if (Unit *victim = SelectUnit(SELECT_TARGET_NEAREST,0)) + me->AI()->AttackStart(victim); + DoStartMovement(me->getVictim()); + DoScriptText(EMOTE, me); + return; + } else Fly_Timer -= diff; + + if (Turn_Timer <= diff) + { + uint32 waypoint = (Fly_Timer/10000)%2; + if (me->IsWithinDist3d(VazrudenRing[waypoint][0],VazrudenRing[waypoint][1],VazrudenRing[waypoint][2], 5)) + me->GetMotionMaster()->MovePoint(0,VazrudenRing[waypoint][0],VazrudenRing[waypoint][1],VazrudenRing[waypoint][2]); + Turn_Timer = 10000; + } else Turn_Timer -= diff; + } + else // phase 2 - land fight + { + if (ConeOfFire_Timer <= diff) + { + DoCast(me, SPELL_CONE_OF_FIRE); + ConeOfFire_Timer = 12000; + Fireball_Timer = 4000; + } else ConeOfFire_Timer -= diff; + + if (IsHeroic()) + if (BellowingRoar_Timer <= diff) + { + DoCast(me, SPELL_BELLOWING_ROAR); + BellowingRoar_Timer = 45000; + } else BellowingRoar_Timer -= diff; + + DoMeleeAttackIfReady(); + } + } +}; + +struct boss_vazrudenAI : public ScriptedAI +{ + boss_vazrudenAI(Creature *c) : ScriptedAI(c) + { + } + + uint32 Revenge_Timer; + bool WipeSaid; + uint32 UnsummonCheck; + + void Reset() + { + Revenge_Timer = 4000; + UnsummonCheck = 2000; + WipeSaid = false; + } + + void EnterCombat(Unit * /*who*/) + { + DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); + } + + void KilledUnit(Unit* who) + { + if (who && who->GetEntry() != ENTRY_VAZRUDEN) + DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2), me); + } + + void JustDied(Unit* who) + { + if (who && who != me) + DoScriptText(SAY_DIE, me); + } + + void UpdateAI(const uint32 diff) + { + if (!UpdateVictim()) + { + if (UnsummonCheck < diff && me->isAlive()) + { + if (!WipeSaid) + { + DoScriptText(SAY_WIPE, me); + WipeSaid = true; + } + me->DisappearAndDie(); + } else UnsummonCheck -= diff; + return; + } + + if (Revenge_Timer <= diff) + { + if (Unit *victim = me->getVictim()) + DoCast(victim, SPELL_REVENGE); + Revenge_Timer = 5000; + } else Revenge_Timer -= diff; + + DoMeleeAttackIfReady(); + } +}; + +struct boss_vazruden_the_heraldAI : public ScriptedAI +{ + boss_vazruden_the_heraldAI(Creature *c) : ScriptedAI(c) + { + summoned = false; + sentryDown = false; + NazanGUID = 0; + VazrudenGUID = 0; + } + + uint32 phase; + uint32 waypoint; + uint32 check; + bool sentryDown; + uint64 NazanGUID; + uint64 VazrudenGUID; + bool summoned; + + void Reset() + { + phase = 0; + waypoint = 0; + check = 0; + UnsummonAdds(); + me->GetMotionMaster()->MovePath(PATH_ENTRY, true); + } + + void UnsummonAdds() + { + if (summoned) + { + Creature *Nazan = Unit::GetCreature(*me, NazanGUID); + if (!Nazan) + Nazan = me->FindNearestCreature(ENTRY_NAZAN, 5000); + if (Nazan) + { + Nazan->DisappearAndDie(); + NazanGUID = 0; + } + + Creature *Vazruden = Unit::GetCreature(*me, VazrudenGUID); + if (!Vazruden) + Vazruden = me->FindNearestCreature(ENTRY_VAZRUDEN, 5000); + if (Vazruden) + { + Vazruden->DisappearAndDie(); + VazrudenGUID = 0; + } + summoned = false; + me->clearUnitState(UNIT_STAT_ROOT); + me->SetVisibility(VISIBILITY_ON); + } + } + + void SummonAdds() + { + if (!summoned) + { + if (Creature* Vazruden = me->SummonCreature(ENTRY_VAZRUDEN,VazrudenMiddle[0],VazrudenMiddle[1],VazrudenMiddle[2],0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,6000000)) + VazrudenGUID = Vazruden->GetGUID(); + if (Creature* Nazan = me->SummonCreature(ENTRY_NAZAN,VazrudenMiddle[0],VazrudenMiddle[1],VazrudenMiddle[2],0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,6000000)) + NazanGUID = Nazan->GetGUID(); + summoned = true; + me->SetVisibility(VISIBILITY_OFF); + me->addUnitState(UNIT_STAT_ROOT); + } + } + + void EnterCombat(Unit * /*who*/) + { + if (phase == 0) + { + phase = 1; + check = 0; + DoScriptText(SAY_INTRO, me); + } + } + + void JustSummoned(Creature *summoned) + { + if (!summoned) return; + Unit *victim = me->getVictim(); + if (summoned->GetEntry() == ENTRY_NAZAN) + { + CAST_AI(boss_nazanAI, summoned->AI())->VazrudenGUID = VazrudenGUID; + summoned->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); + summoned->SetSpeed(MOVE_FLIGHT, 2.5); + if (victim) + AttackStartNoMove(victim); + } + else if (victim) + summoned->AI()->AttackStart(victim); + } + + void SentryDownBy(Unit* killer) + { + if (sentryDown) + { + AttackStartNoMove(killer); + sentryDown = false; + } + else + sentryDown = true; + } + + void UpdateAI(const uint32 diff) + { + switch(phase) + { + case 0: // circle around the platform + return; + break; + case 1: // go to the middle and begin the fight + if (check <= diff) + { + if (!me->IsWithinDist3d(VazrudenMiddle[0],VazrudenMiddle[1],VazrudenMiddle[2],5)) + { + me->GetMotionMaster()->Clear(); + me->GetMotionMaster()->MovePoint(0,VazrudenMiddle[0],VazrudenMiddle[1],VazrudenMiddle[2]); + check = 1000; + } + else + { + SummonAdds(); + phase = 2; + return; + } + } else check -= diff; + break; + default: // adds do the job now + if (check <= diff) + { + Creature *Nazan = Unit::GetCreature(*me, NazanGUID); + Creature *Vazruden = Unit::GetCreature(*me, VazrudenGUID); + if (Nazan && Nazan->isAlive() || Vazruden && Vazruden->isAlive()) + { + if (Nazan && Nazan->getVictim() || Vazruden && Vazruden->getVictim()) + return; + else + { + UnsummonAdds(); + EnterEvadeMode(); + return; + } + } + else + { + me->SummonGameObject(ENTRY_REINFORCED_FEL_IRON_CHEST,VazrudenMiddle[0],VazrudenMiddle[1],VazrudenMiddle[2],0,0,0,0,0,0); + me->SetLootRecipient(NULL); // don't think this is necessary.. + me->Kill(me); + } + check = 2000; + } else check -= diff; + break; + } + } +}; + +struct mob_hellfire_sentryAI : public ScriptedAI +{ + mob_hellfire_sentryAI(Creature *c) : ScriptedAI(c) {} + + uint32 KidneyShot_Timer; + + void Reset() + { + KidneyShot_Timer = urand(3000,7000); + } + + void EnterCombat(Unit* /*who*/) {} + + void JustDied(Unit* who) + { + if (Creature *herald = me->FindNearestCreature(ENTRY_VAZRUDEN_HERALD,150)) + CAST_AI(boss_vazruden_the_heraldAI, herald->AI())->SentryDownBy(who); + } + + void UpdateAI(const uint32 diff) + { + if (!UpdateVictim()) + return; + + if (KidneyShot_Timer <= diff) + { + if (Unit *victim = me->getVictim()) + DoCast(victim, SPELL_KIDNEY_SHOT); + KidneyShot_Timer = 20000; + } else KidneyShot_Timer -= diff; + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_boss_vazruden_the_herald(Creature* pCreature) +{ + return new boss_vazruden_the_heraldAI (pCreature); +} + +CreatureAI* GetAI_boss_vazruden(Creature* pCreature) +{ + return new boss_vazrudenAI (pCreature); +} + +CreatureAI* GetAI_boss_nazan(Creature* pCreature) +{ + return new boss_nazanAI (pCreature); +} + +CreatureAI* GetAI_mob_hellfire_sentry(Creature* pCreature) +{ + return new mob_hellfire_sentryAI (pCreature); +} + +void AddSC_boss_vazruden_the_herald() +{ + Script *newscript; + newscript = new Script; + newscript->Name = "boss_vazruden_the_herald"; + newscript->GetAI = &GetAI_boss_vazruden_the_herald; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "boss_vazruden"; + newscript->GetAI = &GetAI_boss_vazruden; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "boss_nazan"; + newscript->GetAI = &GetAI_boss_nazan; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_hellfire_sentry"; + newscript->GetAI = &GetAI_mob_hellfire_sentry; + newscript->RegisterSelf(); +} + diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp new file mode 100644 index 00000000000..f0e813d3890 --- /dev/null +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp @@ -0,0 +1,156 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Boss_Watchkeeper_Gargolmar +SD%Complete: 80 +SDComment: Missing adds to heal him. Surge should be used on pTarget furthest away, not random. +SDCategory: Hellfire Citadel, Hellfire Ramparts +EndScriptData */ + +#include "ScriptedPch.h" + +#define SAY_TAUNT -1543000 +#define SAY_HEAL -1543001 +#define SAY_SURGE -1543002 +#define SAY_AGGRO_1 -1543003 +#define SAY_AGGRO_2 -1543004 +#define SAY_AGGRO_3 -1543005 +#define SAY_KILL_1 -1543006 +#define SAY_KILL_2 -1543007 +#define SAY_DIE -1543008 + +#define SPELL_MORTAL_WOUND 30641 +#define H_SPELL_MORTAL_WOUND 36814 +#define SPELL_SURGE 34645 +#define SPELL_RETALIATION 22857 + +struct boss_watchkeeper_gargolmarAI : public ScriptedAI +{ + boss_watchkeeper_gargolmarAI(Creature *c) : ScriptedAI(c) + { + } + + uint32 Surge_Timer; + uint32 MortalWound_Timer; + uint32 Retaliation_Timer; + + bool HasTaunted; + bool YelledForHeal; + + void Reset() + { + Surge_Timer = 5000; + MortalWound_Timer = 4000; + Retaliation_Timer = 0; + + HasTaunted = false; + YelledForHeal = false; + } + + void EnterCombat(Unit * /*who*/) + { + DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); + } + + void MoveInLineOfSight(Unit* who) + { + if (!me->getVictim() && who->isTargetableForAttack() && (me->IsHostileTo(who)) && who->isInAccessiblePlaceFor(me)) + { + if (!me->canFly() && me->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) + return; + + float attackRadius = me->GetAttackDistance(who); + if (me->IsWithinDistInMap(who, attackRadius) && me->IsWithinLOSInMap(who)) + { + //who->RemoveSpellsCausingAura(SPELL_AURA_MOD_STEALTH); + AttackStart(who); + } + else if (!HasTaunted && me->IsWithinDistInMap(who, 60.0f)) + { + DoScriptText(SAY_TAUNT, me); + HasTaunted = true; + } + } + } + + void KilledUnit(Unit* /*victim*/) + { + DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2), me); + } + + void JustDied(Unit* /*Killer*/) + { + DoScriptText(SAY_DIE, me); + } + + void UpdateAI(const uint32 diff) + { + if (!UpdateVictim()) + return; + + if (MortalWound_Timer <= diff) + { + DoCast(me->getVictim(), SPELL_MORTAL_WOUND); + MortalWound_Timer = 5000+rand()%8000; + } else MortalWound_Timer -= diff; + + if (Surge_Timer <= diff) + { + DoScriptText(SAY_SURGE, me); + + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget, SPELL_SURGE); + + Surge_Timer = 5000+rand()%8000; + } else Surge_Timer -= diff; + + if ((me->GetHealth()*100) / me->GetMaxHealth() < 20) + { + if (Retaliation_Timer <= diff) + { + DoCast(me, SPELL_RETALIATION); + Retaliation_Timer = 30000; + } else Retaliation_Timer -= diff; + } + + if (!YelledForHeal) + { + if ((me->GetHealth()*100) / me->GetMaxHealth() < 40) + { + DoScriptText(SAY_HEAL, me); + YelledForHeal = true; + } + } + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_boss_watchkeeper_gargolmarAI(Creature* pCreature) +{ + return new boss_watchkeeper_gargolmarAI (pCreature); +} + +void AddSC_boss_watchkeeper_gargolmar() +{ + Script *newscript; + newscript = new Script; + newscript->Name = "boss_watchkeeper_gargolmar"; + newscript->GetAI = &GetAI_boss_watchkeeper_gargolmarAI; + newscript->RegisterSelf(); +} + diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h new file mode 100644 index 00000000000..599aa237774 --- /dev/null +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h @@ -0,0 +1,16 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software licensed under GPL version 2 + * Please see the included DOCS/LICENSE.TXT for more information */ + +#ifndef DEF_RAMPARTS_H +#define DEF_RAMPARTS_H + +#define MAX_ENCOUNTER 2 + +enum eTypes +{ + TYPE_VAZRUDEN = 1, + TYPE_NAZAN = 2 +}; + +#endif diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp new file mode 100644 index 00000000000..29c58675e9c --- /dev/null +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp @@ -0,0 +1,84 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Instance_Hellfire_Ramparts +SD%Complete: 50 +SDComment: +SDCategory: Hellfire Ramparts +EndScriptData */ + +#include "ScriptedPch.h" +#include "hellfire_ramparts.h" + +struct instance_ramparts : public ScriptedInstance +{ + instance_ramparts(Map* pMap) : ScriptedInstance(pMap) {Initialize();} + + uint32 m_auiEncounter[MAX_ENCOUNTER]; + uint64 m_uiChestNGUID; + uint64 m_uiChestHGUID; + + void Initialize() + { + memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); + + m_uiChestNGUID = 0; + m_uiChestHGUID = 0; + } + + void OnGameObjectCreate(GameObject* pGo, bool /*add*/) + { + switch(pGo->GetEntry()) + { + case 185168: m_uiChestNGUID = pGo->GetGUID(); break; + case 185169: m_uiChestHGUID = pGo->GetGUID(); break; + } + } + + void SetData(uint32 uiType, uint32 uiData) + { + debug_log("TSCR: Instance Ramparts: SetData received for type %u with data %u",uiType,uiData); + + switch(uiType) + { + case TYPE_VAZRUDEN: + if (uiData == DONE && m_auiEncounter[1] == DONE) + DoRespawnGameObject(instance->IsHeroic() ? m_uiChestHGUID : m_uiChestNGUID, HOUR*IN_MILISECONDS); + m_auiEncounter[0] = uiData; + break; + case TYPE_NAZAN: + if (uiData == DONE && m_auiEncounter[0] == DONE) + DoRespawnGameObject(instance->IsHeroic() ? m_uiChestHGUID : m_uiChestNGUID, HOUR*IN_MILISECONDS); + m_auiEncounter[1] = uiData; + break; + } + } +}; + +InstanceData* GetInstanceData_instance_ramparts(Map* pMap) +{ + return new instance_ramparts(pMap); +} + +void AddSC_instance_ramparts() +{ + Script* pNewScript; + pNewScript = new Script; + pNewScript->Name = "instance_ramparts"; + pNewScript->GetInstanceData = &GetInstanceData_instance_ramparts; + pNewScript->RegisterSelf(); +} diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp new file mode 100644 index 00000000000..5fb381f4065 --- /dev/null +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp @@ -0,0 +1,570 @@ +/* Copyright(C) 2006 - 2008 ScriptDev2 +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +*(at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +/* ScriptData +SDName: Boss_Magtheridon +SD%Complete: 60 +SDComment: In Development +SDCategory: Hellfire Citadel, Magtheridon's lair +EndScriptData */ + +#include "ScriptedPch.h" +#include "magtheridons_lair.h" + +struct Yell +{ + int32 id; +}; + +static Yell RandomTaunt[]= +{ + {-1544000}, + {-1544001}, + {-1544002}, + {-1544003}, + {-1544004}, + {-1544005}, +}; + +#define SAY_FREED -1544006 +#define SAY_AGGRO -1544007 +#define SAY_BANISH -1544008 +#define SAY_CHAMBER_DESTROY -1544009 +#define SAY_PLAYER_KILLED -1544010 +#define SAY_DEATH -1544011 + +#define EMOTE_BERSERK -1544012 +#define EMOTE_BLASTNOVA -1544013 +#define EMOTE_BEGIN -1544014 + +#define MOB_MAGTHERIDON 17257 +#define MOB_ROOM 17516 +#define MOB_CHANNELLER 17256 +#define MOB_ABYSSAL 17454 + +#define SPELL_BLASTNOVA 30616 +#define SPELL_CLEAVE 30619 +#define SPELL_QUAKE_TRIGGER 30657 // must be cast with 30561 as the proc spell +#define SPELL_QUAKE_KNOCKBACK 30571 +#define SPELL_BLAZE_TARGET 30541 // core bug, does not support target 7 +#define SPELL_BLAZE_TRAP 30542 +#define SPELL_DEBRIS_KNOCKDOWN 36449 +#define SPELL_DEBRIS_VISUAL 30632 +#define SPELL_DEBRIS_DAMAGE 30631 // core bug, does not support target 8 +#define SPELL_CAMERA_SHAKE 36455 +#define SPELL_BERSERK 27680 + +#define SPELL_SHADOW_CAGE 30168 +#define SPELL_SHADOW_GRASP 30410 +#define SPELL_SHADOW_GRASP_VISUAL 30166 +#define SPELL_MIND_EXHAUSTION 44032 //Casted by the cubes when channeling ends + +#define SPELL_SHADOW_CAGE_C 30205 +#define SPELL_SHADOW_GRASP_C 30207 + +#define SPELL_SHADOW_BOLT_VOLLEY 30510 +#define SPELL_DARK_MENDING 30528 +#define SPELL_FEAR 30530 //39176 +#define SPELL_BURNING_ABYSSAL 30511 +#define SPELL_SOUL_TRANSFER 30531 // core bug, does not support target 7 + +#define SPELL_FIRE_BLAST 37110 + +// count of clickers needed to interrupt blast nova +#define CLICKERS_COUNT 5 + +typedef std::map CubeMap; + +struct mob_abyssalAI : public ScriptedAI +{ + mob_abyssalAI(Creature *c) : ScriptedAI(c) + { + trigger = 0; + Despawn_Timer = 60000; + } + + uint32 FireBlast_Timer; + uint32 Despawn_Timer; + uint32 trigger; + + void Reset() + { + FireBlast_Timer = 6000; + } + + void SpellHit(Unit*, const SpellEntry *spell) + { + if (trigger == 2 && spell->Id == SPELL_BLAZE_TARGET) + { + DoCast(me, SPELL_BLAZE_TRAP, true); + me->SetVisibility(VISIBILITY_OFF); + Despawn_Timer = 130000; + } + } + + void SetTrigger(uint32 _trigger) + { + trigger = _trigger; + me->SetDisplayId(11686); + if (trigger == 1) //debris + { + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + DoCast(me, SPELL_DEBRIS_VISUAL, true); + FireBlast_Timer = 5000; + Despawn_Timer = 10000; + } + } + + void EnterCombat(Unit* /*who*/) {DoZoneInCombat();} + void AttackStart(Unit *who) {if (!trigger) ScriptedAI::AttackStart(who);} + void MoveInLineOfSight(Unit *who) {if (!trigger) ScriptedAI::MoveInLineOfSight(who);} + + void UpdateAI(const uint32 diff) + { + if (trigger) + { + if (trigger == 1) + { + if (FireBlast_Timer <= diff) + { + DoCast(me, SPELL_DEBRIS_DAMAGE, true); + trigger = 3; + } else FireBlast_Timer -= diff; + } + return; + } + + if (Despawn_Timer <= diff) + { + me->ForcedDespawn(); + } else Despawn_Timer -= diff; + + if (!UpdateVictim()) + return; + + if (FireBlast_Timer <= diff) + { + DoCast(me->getVictim(), SPELL_FIRE_BLAST); + FireBlast_Timer = 5000+rand()%10000; + } else FireBlast_Timer -= diff; + + DoMeleeAttackIfReady(); + } +}; + +struct boss_magtheridonAI : public ScriptedAI +{ + boss_magtheridonAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + me->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, 10); + me->SetFloatValue(UNIT_FIELD_COMBATREACH, 10); + + // target 7, random target with certain entry spell, need core fix + SpellEntry *TempSpell; + TempSpell = GET_SPELL(SPELL_BLAZE_TARGET); + if (TempSpell && TempSpell->EffectImplicitTargetA[0] != 6) + { + TempSpell->EffectImplicitTargetA[0] = 6; + TempSpell->EffectImplicitTargetB[0] = 0; + } + TempSpell = GET_SPELL(SPELL_QUAKE_TRIGGER); + if (TempSpell && TempSpell->EffectTriggerSpell[0] != SPELL_QUAKE_KNOCKBACK) + { + TempSpell->EffectTriggerSpell[0] = SPELL_QUAKE_KNOCKBACK; + } + } + + CubeMap Cube; + + ScriptedInstance* pInstance; + + uint32 Berserk_Timer; + uint32 Quake_Timer; + uint32 Cleave_Timer; + uint32 BlastNova_Timer; + uint32 Blaze_Timer; + uint32 Debris_Timer; + uint32 RandChat_Timer; + + bool Phase3; + bool NeedCheckCube; + + void Reset() + { + Berserk_Timer = 1320000; + Quake_Timer = 40000; + Debris_Timer = 10000; + Blaze_Timer = 10000+rand()%20000; + BlastNova_Timer = 60000; + Cleave_Timer = 15000; + RandChat_Timer = 90000; + + Phase3 = false; + NeedCheckCube = false; + + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); + me->addUnitState(UNIT_STAT_STUNNED); + DoCast(me, SPELL_SHADOW_CAGE_C, true); + } + + void JustReachedHome() + { + if (pInstance) + { + pInstance->SetData(DATA_MAGTHERIDON_EVENT, NOT_STARTED); + pInstance->SetData(DATA_COLLAPSE, false); + } + } + + void SetClicker(uint64 cubeGUID, uint64 clickerGUID) + { + // to avoid multiclicks from 1 cube + if (uint64 guid = Cube[cubeGUID]) + DebuffClicker(Unit::GetUnit(*me, guid)); + Cube[cubeGUID] = clickerGUID; + NeedCheckCube = true; + } + + //function to interrupt channeling and debuff clicker with mind exh(used if second person clicks with same cube or after dispeling/ending shadow grasp DoT) + void DebuffClicker(Unit *clicker) + { + if (!clicker || !clicker->isAlive()) + return; + + clicker->RemoveAurasDueToSpell(SPELL_SHADOW_GRASP); // cannot interrupt triggered spells + clicker->InterruptNonMeleeSpells(false); + clicker->CastSpell(clicker, SPELL_MIND_EXHAUSTION, true); + } + + void NeedCheckCubeStatus() + { + uint32 ClickerNum = 0; + // now checking if every clicker has debuff from manticron(it is dispelable atm rev 6110 : S) + // if not - apply mind exhaustion and delete from clicker's list + for (CubeMap::iterator i = Cube.begin(); i != Cube.end(); ++i) + { + Unit *clicker = Unit::GetUnit(*me, (*i).second); + if (!clicker || !clicker->HasAura(SPELL_SHADOW_GRASP)) + { + DebuffClicker(clicker); + (*i).second = 0; + } else ++ClickerNum; + } + + // if 5 clickers from other cubes apply shadow cage + if (ClickerNum >= CLICKERS_COUNT && !me->HasAura(SPELL_SHADOW_CAGE)) + { + DoScriptText(SAY_BANISH, me); + DoCast(me, SPELL_SHADOW_CAGE, true); + } + else if (ClickerNum < CLICKERS_COUNT && me->HasAura(SPELL_SHADOW_CAGE)) + me->RemoveAurasDueToSpell(SPELL_SHADOW_CAGE); + + if (!ClickerNum) NeedCheckCube = false; + } + + void KilledUnit(Unit* /*victim*/) + { + DoScriptText(SAY_PLAYER_KILLED, me); + } + + void JustDied(Unit* /*Killer*/) + { + if (pInstance) + pInstance->SetData(DATA_MAGTHERIDON_EVENT, DONE); + + DoScriptText(SAY_DEATH, me); + } + + void MoveInLineOfSight(Unit* /*who*/) {} + + void AttackStart(Unit *who) + { + if (!me->hasUnitState(UNIT_STAT_STUNNED)) + ScriptedAI::AttackStart(who); + } + + void EnterCombat(Unit * /*who*/) + { + if (pInstance) + pInstance->SetData(DATA_MAGTHERIDON_EVENT, IN_PROGRESS); + DoZoneInCombat(); + + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + me->RemoveAurasDueToSpell(SPELL_SHADOW_CAGE_C); + + DoScriptText(SAY_FREED, me); + } + + void UpdateAI(const uint32 diff) + { + if (!me->isInCombat()) + { + if (RandChat_Timer <= diff) + { + DoScriptText(RandomTaunt[rand()%6].id, me); + RandChat_Timer = 90000; + } else RandChat_Timer -= diff; + } + + if (!UpdateVictim()) + return; + + if (NeedCheckCube) NeedCheckCubeStatus(); + + if (Berserk_Timer <= diff) + { + DoCast(me, SPELL_BERSERK, true); + DoScriptText(EMOTE_BERSERK, me); + Berserk_Timer = 60000; + } else Berserk_Timer -= diff; + + if (Cleave_Timer <= diff) + { + DoCast(me->getVictim(), SPELL_CLEAVE); + Cleave_Timer = 10000; + } else Cleave_Timer -= diff; + + if (BlastNova_Timer <= diff) + { + // to avoid earthquake interruption + if (!me->hasUnitState(UNIT_STAT_STUNNED)) + { + DoScriptText(EMOTE_BLASTNOVA, me); + DoCast(me, SPELL_BLASTNOVA); + BlastNova_Timer = 60000; + } + } else BlastNova_Timer -= diff; + + if (Quake_Timer <= diff) + { + // to avoid blastnova interruption + if (!me->IsNonMeleeSpellCasted(false)) + { + DoCast(me, SPELL_QUAKE_TRIGGER, true); + Quake_Timer = 50000; + } + } else Quake_Timer -= diff; + + if (Blaze_Timer <= diff) + { + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + { + float x, y, z; + pTarget->GetPosition(x, y, z); + Creature *summon = me->SummonCreature(MOB_ABYSSAL, x, y, z, 0, TEMPSUMMON_CORPSE_DESPAWN, 0); + if (summon) + { + CAST_AI(mob_abyssalAI, summon->AI())->SetTrigger(2); + DoCast(summon, SPELL_BLAZE_TARGET, true); + summon->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + } + } + Blaze_Timer = 20000 + rand()%20000; + } else Blaze_Timer -= diff; + + if (!Phase3 && me->GetHealth()*10 < me->GetMaxHealth()*3 + && !me->IsNonMeleeSpellCasted(false) // blast nova + && !me->hasUnitState(UNIT_STAT_STUNNED)) // shadow cage and earthquake + { + Phase3 = true; + DoScriptText(SAY_CHAMBER_DESTROY, me); + DoCast(me, SPELL_CAMERA_SHAKE, true); + DoCast(me, SPELL_DEBRIS_KNOCKDOWN, true); + + if (pInstance) + pInstance->SetData(DATA_COLLAPSE, true); + } + + if (Phase3) + { + if (Debris_Timer <= diff) + { + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + { + float x, y, z; + pTarget->GetPosition(x, y, z); + Creature *summon = me->SummonCreature(MOB_ABYSSAL, x, y, z, 0, TEMPSUMMON_CORPSE_DESPAWN, 0); + if (summon) CAST_AI(mob_abyssalAI, summon->AI())->SetTrigger(1); + } + Debris_Timer = 10000; + } else Debris_Timer -= diff; + } + + DoMeleeAttackIfReady(); + } +}; + +struct mob_hellfire_channelerAI : public ScriptedAI +{ + mob_hellfire_channelerAI(Creature *c) : ScriptedAI(c) + { + pInstance =me->GetInstanceData(); + } + + ScriptedInstance* pInstance; + + uint32 ShadowBoltVolley_Timer; + uint32 DarkMending_Timer; + uint32 Fear_Timer; + uint32 Infernal_Timer; + + uint32 Check_Timer; + + void Reset() + { + ShadowBoltVolley_Timer = 8000 + rand()%2000; + DarkMending_Timer = 10000; + Fear_Timer = 15000 + rand()%5000; + Infernal_Timer = 10000 + rand()%40000; + + Check_Timer = 5000; + } + + void EnterCombat(Unit * /*who*/) + { + if (pInstance) + pInstance->SetData(DATA_CHANNELER_EVENT, IN_PROGRESS); + + me->InterruptNonMeleeSpells(false); + DoZoneInCombat(); + } + + void JustReachedHome() + { + if (pInstance) + pInstance->SetData(DATA_CHANNELER_EVENT, NOT_STARTED); + + DoCast(me, SPELL_SHADOW_GRASP_C, false); + } + + void JustSummoned(Creature *summon) + { + summon->AI()->AttackStart(me->getVictim()); + } + + void DamageTaken(Unit*, uint32 &damage) + { + if (damage >= me->GetHealth()) + DoCast(me, SPELL_SOUL_TRANSFER, true); + } + + void JustDied(Unit* /*who*/) + { + if (pInstance) + pInstance->SetData(DATA_CHANNELER_EVENT, DONE); + } + + void UpdateAI(const uint32 diff) + { + if (!UpdateVictim()) + return; + + if (ShadowBoltVolley_Timer <= diff) + { + DoCast(me, SPELL_SHADOW_BOLT_VOLLEY); + ShadowBoltVolley_Timer = 10000 + rand()%10000; + } else ShadowBoltVolley_Timer -= diff; + + if (DarkMending_Timer <= diff) + { + if ((me->GetHealth()*100 / me->GetMaxHealth()) < 50) + DoCast(me, SPELL_DARK_MENDING); + DarkMending_Timer = 10000 +(rand() % 10000); + } else DarkMending_Timer -= diff; + + if (Fear_Timer <= diff) + { + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 1)) + DoCast(pTarget, SPELL_FEAR); + Fear_Timer = 25000 + rand()%15000; + } else Fear_Timer -= diff; + + if (Infernal_Timer <= diff) + { + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, SPELL_BURNING_ABYSSAL, true); + Infernal_Timer = 30000 + rand()%10000; + } else Infernal_Timer -= diff; + + DoMeleeAttackIfReady(); + } +}; + +//Manticron Cube +bool GOHello_go_Manticron_Cube(Player* pPlayer, GameObject* pGo) +{ + ScriptedInstance* pInstance = pGo->GetInstanceData(); + if (!pInstance) + return true; + if (pInstance->GetData(DATA_MAGTHERIDON_EVENT) != IN_PROGRESS) return true; + Creature *Magtheridon =Unit::GetCreature(*pGo, pInstance->GetData64(DATA_MAGTHERIDON)); + if (!Magtheridon || !Magtheridon->isAlive()) return true; + + // if exhausted or already channeling return + if (pPlayer->HasAura(SPELL_MIND_EXHAUSTION) || pPlayer->HasAura(SPELL_SHADOW_GRASP)) + return true; + + pPlayer->InterruptNonMeleeSpells(false); + pPlayer->CastSpell(pPlayer, SPELL_SHADOW_GRASP, true); + pPlayer->CastSpell(pPlayer, SPELL_SHADOW_GRASP_VISUAL, false); + CAST_AI(boss_magtheridonAI, Magtheridon->AI())->SetClicker(pGo->GetGUID(), pPlayer->GetGUID()); + return true; +} + +CreatureAI* GetAI_boss_magtheridon(Creature* pCreature) +{ + return new boss_magtheridonAI(pCreature); +} + +CreatureAI* GetAI_mob_hellfire_channeler(Creature* pCreature) +{ + return new mob_hellfire_channelerAI(pCreature); +} + +CreatureAI* GetAI_mob_abyssalAI(Creature* pCreature) +{ + return new mob_abyssalAI(pCreature); +} + +void AddSC_boss_magtheridon() +{ + Script *newscript; + newscript = new Script; + newscript->Name = "boss_magtheridon"; + newscript->GetAI = &GetAI_boss_magtheridon; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_hellfire_channeler"; + newscript->GetAI = &GetAI_mob_hellfire_channeler; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "go_manticron_cube"; + newscript->pGOHello = &GOHello_go_Manticron_Cube; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_abyssal"; + newscript->GetAI = &GetAI_mob_abyssalAI; + newscript->RegisterSelf(); + +} + diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp new file mode 100644 index 00000000000..d5b459a1fa1 --- /dev/null +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp @@ -0,0 +1,254 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Instance_Magtheridons_Lair +SD%Complete: 100 +SDComment: +SDCategory: Hellfire Citadel, Magtheridon's lair +EndScriptData */ + +#include "ScriptedPch.h" +#include "magtheridons_lair.h" + +#define SPELL_SOUL_TRANSFER 30531 // core bug, does not support target 7 +#define SPELL_BLAZE_TARGET 30541 // core bug, does not support target 7 + +#define CHAMBER_CENTER_X -15.14 +#define CHAMBER_CENTER_Y 1.8 +#define CHAMBER_CENTER_Z -0.4 + +#define MAX_ENCOUNTER 2 + +#define EMOTE_BONDS_WEAKEN "'s bonds begin to weaken!" + +struct instance_magtheridons_lair : public ScriptedInstance +{ + instance_magtheridons_lair(Map* pMap) : ScriptedInstance(pMap) + { + Initialize(); + } + + uint32 m_auiEncounter[MAX_ENCOUNTER]; + + uint64 MagtheridonGUID; + std::set ChannelerGUID; + uint64 DoorGUID; + std::set ColumnGUID; + + uint32 CageTimer; + uint32 RespawnTimer; + + void Initialize() + { + memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); + + MagtheridonGUID = 0; + ChannelerGUID.clear(); + DoorGUID = 0; + ColumnGUID.clear(); + + CageTimer = 0; + RespawnTimer = 0; + } + + bool IsEncounterInProgress() const + { + for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) + if (m_auiEncounter[i] == IN_PROGRESS) return true; + return false; + } + + void OnCreatureCreate(Creature* pCreature, bool /*add*/) + { + switch(pCreature->GetEntry()) + { + case 17257: + MagtheridonGUID = pCreature->GetGUID(); + break; + case 17256: + ChannelerGUID.insert(pCreature->GetGUID()); + break; + } + } + + void OnGameObjectCreate(GameObject* pGo, bool /*add*/) + { + switch(pGo->GetEntry()) + { + case 181713: + pGo->SetUInt32Value(GAMEOBJECT_FLAGS, 0); + break; + case 183847: + DoorGUID = pGo->GetGUID(); + break; + case 184653: // hall + case 184634: // six columns + case 184635: + case 184636: + case 184637: + case 184638: + case 184639: + ColumnGUID.insert(pGo->GetGUID()); + break; + } + } + + uint64 GetData64(uint32 type) + { + switch(type) + { + case DATA_MAGTHERIDON: + return MagtheridonGUID; + } + return 0; + } + + void SetData(uint32 type, uint32 data) + { + switch(type) + { + case DATA_MAGTHERIDON_EVENT: + m_auiEncounter[0] = data; + if (data == NOT_STARTED) + RespawnTimer = 10000; + if (data != IN_PROGRESS) + HandleGameObject(DoorGUID, true); + break; + case DATA_CHANNELER_EVENT: + switch(data) + { + case NOT_STARTED: // Reset all channelers once one is reset. + if (m_auiEncounter[1] != NOT_STARTED) + { + m_auiEncounter[1] = NOT_STARTED; + for (std::set::const_iterator i = ChannelerGUID.begin(); i != ChannelerGUID.end(); ++i) + { + if (Creature *Channeler = instance->GetCreature(*i)) + { + if (Channeler->isAlive()) + Channeler->AI()->EnterEvadeMode(); + else + Channeler->Respawn(); + } + } + CageTimer = 0; + HandleGameObject(DoorGUID, true); + } + break; + case IN_PROGRESS: // Event start. + if (m_auiEncounter[1] != IN_PROGRESS) + { + m_auiEncounter[1] = IN_PROGRESS; + // Let all five channelers aggro. + for (std::set::const_iterator i = ChannelerGUID.begin(); i != ChannelerGUID.end(); ++i) + { + Creature *Channeler = instance->GetCreature(*i); + if (Channeler && Channeler->isAlive()) + Channeler->AI()->AttackStart(Channeler->SelectNearestTarget(999)); + } + // Release Magtheridon after two minutes. + Creature *Magtheridon = instance->GetCreature(MagtheridonGUID); + if (Magtheridon && Magtheridon->isAlive()) + { + Magtheridon->MonsterTextEmote(EMOTE_BONDS_WEAKEN, 0); + CageTimer = 120000; + } + HandleGameObject(DoorGUID, false); + } + break; + case DONE: // Add buff and check if all channelers are dead. + for (std::set::const_iterator i = ChannelerGUID.begin(); i != ChannelerGUID.end(); ++i) + { + Creature *Channeler = instance->GetCreature(*i); + if (Channeler && Channeler->isAlive()) + { + //Channeler->CastSpell(Channeler, SPELL_SOUL_TRANSFER, true); + data = IN_PROGRESS; + break; + } + } + break; + } + m_auiEncounter[1] = data; + break; + case DATA_COLLAPSE: + // true - collapse / false - reset + for (std::set::const_iterator i = ColumnGUID.begin(); i != ColumnGUID.end(); ++i) + DoUseDoorOrButton(*i); + break; + default: + break; + } + } + + uint32 GetData(uint32 type) + { + if (type == DATA_MAGTHERIDON_EVENT) + return m_auiEncounter[0]; + return 0; + } + + void Update(uint32 diff) + { + if (CageTimer) + { + if (CageTimer <= diff) + { + Creature *Magtheridon = instance->GetCreature(MagtheridonGUID); + if (Magtheridon && Magtheridon->isAlive()) + { + Magtheridon->clearUnitState(UNIT_STAT_STUNNED); + Magtheridon->AI()->AttackStart(Magtheridon->SelectNearestTarget(999)); + } + CageTimer = 0; + } else CageTimer -= diff; + } + + if (RespawnTimer) + { + if (RespawnTimer <= diff) + { + for (std::set::const_iterator i = ChannelerGUID.begin(); i != ChannelerGUID.end(); ++i) + { + if (Creature *Channeler = instance->GetCreature(*i)) + { + if (Channeler->isAlive()) + Channeler->AI()->EnterEvadeMode(); + else + Channeler->Respawn(); + } + } + RespawnTimer = 0; + } else RespawnTimer -= diff; + } + } +}; + +InstanceData* GetInstanceData_instance_magtheridons_lair(Map* pMap) +{ + return new instance_magtheridons_lair(pMap); +} + +void AddSC_instance_magtheridons_lair() +{ + Script *newscript; + newscript = new Script; + newscript->Name = "instance_magtheridons_lair"; + newscript->GetInstanceData = &GetInstanceData_instance_magtheridons_lair; + newscript->RegisterSelf(); +} + diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h new file mode 100644 index 00000000000..1b3e525fc54 --- /dev/null +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h @@ -0,0 +1,14 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software licensed under GPL version 2 + * Please see the included DOCS/LICENSE.TXT for more information */ + +#ifndef DEF_MAGTHERIDONS_LAIR_H +#define DEF_MAGTHERIDONS_LAIR_H + +#define DATA_MAGTHERIDON_EVENT 1 +#define DATA_MAGTHERIDON 3 +#define DATA_CHANNELER_EVENT 2 +#define DATA_COLLAPSE 6 +#define DATA_CHANNELER 9 +#endif + diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp new file mode 100644 index 00000000000..e3ded52edc9 --- /dev/null +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp @@ -0,0 +1,396 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Boss_Grand_Warlock_Nethekurse +SD%Complete: 75 +SDComment: encounter not fully completed. missing part where boss kill minions. +SDCategory: Hellfire Citadel, Shattered Halls +EndScriptData */ + +/* ContentData +boss_grand_warlock_nethekurse +mob_fel_orc_convert +mob_lesser_shadow_fissure +EndContentData */ + +#include "ScriptedPch.h" +#include "shattered_halls.h" + +struct Say +{ + int32 id; +}; + +static Say PeonAttacked[]= +{ + {-1540001}, + {-1540002}, + {-1540003}, + {-1540004}, +}; +static Say PeonDies[]= +{ + {-1540005}, + {-1540006}, + {-1540007}, + {-1540008}, +}; + +#define SAY_INTRO -1540000 +#define SAY_TAUNT_1 -1540009 +#define SAY_TAUNT_2 -1540010 +#define SAY_TAUNT_3 -1540011 +#define SAY_AGGRO_1 -1540012 +#define SAY_AGGRO_2 -1540013 +#define SAY_AGGRO_3 -1540014 +#define SAY_SLAY_1 -1540015 +#define SAY_SLAY_2 -1540016 +#define SAY_DIE -1540017 + +#define SPELL_DEATH_COIL 30500 +#define SPELL_DARK_SPIN 30502 // core bug spell attack caster :D +#define SPELL_SHADOW_FISSURE 30496 // Summon the ShadowFissure NPC + +#define SPELL_SHADOW_CLEAVE 30495 +#define H_SPELL_SHADOW_SLAM 35953 + +#define SPELL_HEMORRHAGE 30478 + +#define SPELL_CONSUMPTION 30497 +#define SPELL_TEMPORARY_VISUAL 39312 // this is wrong, a temporary solution. spell consumption already has the purple visual, but doesn't display as it should + +struct boss_grand_warlock_nethekurseAI : public ScriptedAI +{ + boss_grand_warlock_nethekurseAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + } + + ScriptedInstance* pInstance; + + bool IntroOnce; + bool IsIntroEvent; + bool IsMainEvent; + bool SpinOnce; + //bool HasTaunted; + bool Phase; + + uint32 PeonEngagedCount; + uint32 PeonKilledCount; + + uint32 IntroEvent_Timer; + uint32 DeathCoil_Timer; + uint32 ShadowFissure_Timer; + uint32 Cleave_Timer; + + void Reset() + { + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + + IsIntroEvent = false; + IntroOnce = false; + IsMainEvent = false; + //HasTaunted = false; + SpinOnce = false; + Phase = false; + + PeonEngagedCount = 0; + PeonKilledCount = 0; + + IntroEvent_Timer = 90000; //how long before getting bored and kills his minions? + DeathCoil_Timer = 20000; + ShadowFissure_Timer = 8000; + Cleave_Timer = 5000; + } + + void DoYellForPeonAggro() + { + if (PeonEngagedCount >= 4) + return; + + DoScriptText(PeonAttacked[PeonEngagedCount].id, me); + ++PeonEngagedCount; + } + + void DoYellForPeonDeath() + { + if (PeonKilledCount >= 4) + return; + + DoScriptText(PeonDies[PeonKilledCount].id, me); + ++PeonKilledCount; + + if (PeonKilledCount == 4) + { + IsIntroEvent = false; + IsMainEvent = true; + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + } + } + + void DoTauntPeons() + { + DoScriptText(RAND(SAY_TAUNT_1,SAY_TAUNT_2,SAY_TAUNT_3), me); + + //TODO: kill the peons first + IsIntroEvent = false; + PeonEngagedCount = 4; + PeonKilledCount = 4; + IsMainEvent = true; + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + } + + void AttackStart(Unit* who) + { + if (IsIntroEvent || !IsMainEvent) + return; + + if (me->Attack(who, true)) + { + if (Phase) + DoStartNoMovement(who); + else + DoStartMovement(who); + } + } + + void MoveInLineOfSight(Unit *who) + { + if (!IntroOnce && me->IsWithinDistInMap(who, 50.0f)) + { + if (who->GetTypeId() != TYPEID_PLAYER) + return; + + DoScriptText(SAY_INTRO, me); + IntroOnce = true; + IsIntroEvent = true; + + if (pInstance) + pInstance->SetData(TYPE_NETHEKURSE,IN_PROGRESS); + } + + if (IsIntroEvent || !IsMainEvent) + return; + + ScriptedAI::MoveInLineOfSight(who); + } + + void EnterCombat(Unit * /*who*/) + { + DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); + } + + void JustSummoned(Creature *summoned) + { + summoned->setFaction(16); + summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + + //triggered spell of consumption does not properly show it's SpellVisual, wrong spellid? + summoned->CastSpell(summoned,SPELL_TEMPORARY_VISUAL,true); + summoned->CastSpell(summoned,SPELL_CONSUMPTION,false,0,0,me->GetGUID()); + } + + void KilledUnit(Unit* /*victim*/) + { + DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + } + + void JustDied(Unit* /*Killer*/) + { + DoScriptText(SAY_DIE, me); + + if (!pInstance) + return; + + pInstance->SetData(TYPE_NETHEKURSE,DONE); + pInstance->HandleGameObject(pInstance->GetData64(DATA_NETHEKURSE_DOOR), true); + } + + void UpdateAI(const uint32 diff) + { + if (IsIntroEvent) + { + if (!pInstance) + return; + + if (pInstance->GetData(TYPE_NETHEKURSE) == IN_PROGRESS) + { + if (IntroEvent_Timer <= diff) + DoTauntPeons(); + else + IntroEvent_Timer -= diff; + } + } + + if (!UpdateVictim()) + return; + + if (!IsMainEvent) + return; + + if (Phase) + { + if (!SpinOnce) + { + DoCast(me->getVictim(), SPELL_DARK_SPIN); + SpinOnce = true; + } + + if (Cleave_Timer <= diff) + { + DoCast(me->getVictim(), SPELL_SHADOW_CLEAVE); + Cleave_Timer = 6000+rand()%2500; + } else Cleave_Timer -= diff; + } + else + { + if (ShadowFissure_Timer <= diff) + { + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget, SPELL_SHADOW_FISSURE); + ShadowFissure_Timer = urand(7500,15000); + } else ShadowFissure_Timer -= diff; + + if (DeathCoil_Timer <= diff) + { + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(pTarget, SPELL_DEATH_COIL); + DeathCoil_Timer = urand(15000,20000); + } else DeathCoil_Timer -= diff; + + if ((me->GetHealth()*100) / me->GetMaxHealth() <= 20) + Phase = true; + + DoMeleeAttackIfReady(); + } + } +}; + +struct mob_fel_orc_convertAI : public ScriptedAI +{ + mob_fel_orc_convertAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + } + + ScriptedInstance* pInstance; + uint32 Hemorrhage_Timer; + + void Reset() + { + me->SetNoCallAssistance(true); //we don't want any assistance (WE R HEROZ!) + Hemorrhage_Timer = 3000; + } + + void MoveInLineOfSight(Unit * /*who*/) + { + } + + void EnterCombat(Unit* /*who*/) + { + if (pInstance) + { + if (pInstance->GetData64(DATA_NETHEKURSE)) + { + Creature *pKurse = Unit::GetCreature(*me,pInstance->GetData64(DATA_NETHEKURSE)); + if (pKurse && me->IsWithinDist(pKurse, 45.0f)) + { + CAST_AI(boss_grand_warlock_nethekurseAI, pKurse->AI())->DoYellForPeonAggro(); + + if (pInstance->GetData(TYPE_NETHEKURSE) == IN_PROGRESS) + return; + else + pInstance->SetData(TYPE_NETHEKURSE,IN_PROGRESS); + } + } + } + } + + void JustDied(Unit* /*Killer*/) + { + if (pInstance) + { + if (pInstance->GetData(TYPE_NETHEKURSE) != IN_PROGRESS) + return; + if (pInstance->GetData64(DATA_NETHEKURSE)) + if (Creature *pKurse = Unit::GetCreature(*me,pInstance->GetData64(DATA_NETHEKURSE))) + CAST_AI(boss_grand_warlock_nethekurseAI, pKurse->AI())->DoYellForPeonDeath(); + } + } + + void UpdateAI(const uint32 diff) + { + if (!UpdateVictim()) + return; + + if (Hemorrhage_Timer <= diff) + { + DoCast(me->getVictim(), SPELL_HEMORRHAGE); + Hemorrhage_Timer = 15000; + } else Hemorrhage_Timer -= diff; + + DoMeleeAttackIfReady(); + } +}; + +//NOTE: this Creature are also summoned by other spells, for different creatures +struct mob_lesser_shadow_fissureAI : public ScriptedAI +{ + mob_lesser_shadow_fissureAI(Creature *c) : ScriptedAI(c) {} + + void Reset() { } + void MoveInLineOfSight(Unit * /*who*/) {} + void AttackStart(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) {} +}; + +CreatureAI* GetAI_boss_grand_warlock_nethekurse(Creature* pCreature) +{ + return new boss_grand_warlock_nethekurseAI (pCreature); +} + +CreatureAI* GetAI_mob_fel_orc_convert(Creature* pCreature) +{ + return new mob_fel_orc_convertAI (pCreature); +} + +CreatureAI* GetAI_mob_lesser_shadow_fissure(Creature* pCreature) +{ + return new mob_lesser_shadow_fissureAI (pCreature); +} + +void AddSC_boss_grand_warlock_nethekurse() +{ + Script *newscript; + + newscript = new Script; + newscript->Name = "boss_grand_warlock_nethekurse"; + newscript->GetAI = &GetAI_boss_grand_warlock_nethekurse; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_fel_orc_convert"; + newscript->GetAI = &GetAI_mob_fel_orc_convert; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_lesser_shadow_fissure"; + newscript->GetAI = &GetAI_mob_lesser_shadow_fissure; + newscript->RegisterSelf(); +} + diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp new file mode 100644 index 00000000000..6fa1c9efe33 --- /dev/null +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp @@ -0,0 +1,404 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Boss_Warbringer_Omrogg +SD%Complete: 85 +SDComment: Heroic enabled. Spell timing may need additional tweaks +SDCategory: Hellfire Citadel, Shattered Halls +EndScriptData */ + +/* ContentData +mob_omrogg_heads +boss_warbringer_omrogg +EndContentData */ + +#include "ScriptedPch.h" +#include "shattered_halls.h" + +enum eEnums +{ + YELL_DIE_L = -1540039, + YELL_DIE_R = -1540040, + EMOTE_ENRAGE = -1540041, + + SPELL_BLAST_WAVE = 30600, + SPELL_FEAR = 30584, + SPELL_THUNDERCLAP = 30633, + + SPELL_BURNING_MAUL = 30598, + H_SPELL_BURNING_MAUL = 36056, + + NPC_LEFT_HEAD = 19523, + NPC_RIGHT_HEAD = 19524 +}; + +struct Yell +{ + int32 id; + uint32 creature; +}; + +static Yell GoCombat[]= +{ + {-1540018, NPC_LEFT_HEAD}, + {-1540019, NPC_LEFT_HEAD}, + {-1540020, NPC_LEFT_HEAD}, +}; +static Yell GoCombatDelay[]= +{ + {-1540021, NPC_RIGHT_HEAD}, + {-1540022, NPC_RIGHT_HEAD}, + {-1540023, NPC_RIGHT_HEAD}, +}; + +static Yell Threat[]= +{ + {-1540024, NPC_LEFT_HEAD}, + {-1540025, NPC_RIGHT_HEAD}, + {-1540026, NPC_LEFT_HEAD}, + {-1540027, NPC_LEFT_HEAD}, +}; +static Yell ThreatDelay1[]= +{ + {-1540028, NPC_RIGHT_HEAD}, + {-1540029, NPC_LEFT_HEAD}, + {-1540030, NPC_RIGHT_HEAD}, + {-1540031, NPC_RIGHT_HEAD}, +}; +static Yell ThreatDelay2[]= +{ + {-1540032, NPC_LEFT_HEAD}, + {-1540033, NPC_RIGHT_HEAD}, + {-1540034, NPC_LEFT_HEAD}, + {-1540035, NPC_LEFT_HEAD}, +}; + +static Yell Killing[]= +{ + {-1540036, NPC_LEFT_HEAD}, + {-1540037, NPC_RIGHT_HEAD}, +}; +static Yell KillingDelay[]= +{ + {-1540038, NPC_RIGHT_HEAD}, + {-1000000, NPC_LEFT_HEAD}, +}; + +struct mob_omrogg_headsAI : public ScriptedAI +{ + mob_omrogg_headsAI(Creature *c) : ScriptedAI(c) {} + + bool DeathYell; + uint32 Death_Timer; + + void Reset() + { + Death_Timer = 4000; + DeathYell = false; + } + void EnterCombat(Unit* /*who*/) {} + + void DoDeathYell() + { + DeathYell = true; + } + + void UpdateAI(const uint32 diff) + { + if (!DeathYell) + return; + + if (Death_Timer <= diff) + { + DoScriptText(YELL_DIE_R, me); + Death_Timer = false; + me->setDeathState(JUST_DIED); + } else Death_Timer -= diff; + } +}; + +struct boss_warbringer_omroggAI : public ScriptedAI +{ + boss_warbringer_omroggAI(Creature *c) : ScriptedAI(c) + { + LeftHeadGUID = 0; + RightHeadGUID = 0; + pInstance = c->GetInstanceData(); + } + + ScriptedInstance* pInstance; + + uint64 LeftHeadGUID; + uint64 RightHeadGUID; + int iaggro; + int ithreat; + int ikilling; + + bool AggroYell; + bool ThreatYell; + bool ThreatYell2; + bool KillingYell; + + uint32 Delay_Timer; + uint32 BlastWave_Timer; + uint32 BlastCount; + uint32 Fear_Timer; + uint32 BurningMaul_Timer; + uint32 ThunderClap_Timer; + uint32 ResetThreat_Timer; + + void Reset() + { + if (Unit* pLeftHead = Unit::GetUnit(*me,LeftHeadGUID)) + { + pLeftHead->setDeathState(JUST_DIED); + LeftHeadGUID = 0; + } + + if (Unit* pRightHead = Unit::GetUnit(*me,RightHeadGUID)) + { + pRightHead->setDeathState(JUST_DIED); + RightHeadGUID = 0; + } + + AggroYell = false; + ThreatYell = false; + ThreatYell2 = false; + KillingYell = false; + + Delay_Timer = 4000; + BlastWave_Timer = 0; + BlastCount = 0; + Fear_Timer = 8000; + BurningMaul_Timer = 25000; + ThunderClap_Timer = 15000; + ResetThreat_Timer = 30000; + + if (pInstance) + pInstance->SetData(TYPE_OMROGG, NOT_STARTED); //End boss can use this later. O'mrogg must be defeated(DONE) or he will come to aid. + } + + void DoYellForThreat() + { + Unit *pLeftHead = Unit::GetUnit(*me,LeftHeadGUID); + Unit *pRightHead = Unit::GetUnit(*me,RightHeadGUID); + + if (!pLeftHead || !pRightHead) + return; + + ithreat = rand()%4; + + Unit *source = (pLeftHead->GetEntry() == Threat[ithreat].creature ? pLeftHead : pRightHead); + + DoScriptText(Threat[ithreat].id, source); + + Delay_Timer = 3500; + ThreatYell = true; + } + + void EnterCombat(Unit * /*who*/) + { + me->SummonCreature(NPC_LEFT_HEAD, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0); + me->SummonCreature(NPC_RIGHT_HEAD, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0); + + if (Unit *pLeftHead = Unit::GetUnit(*me,LeftHeadGUID)) + { + iaggro = rand()%3; + + DoScriptText(GoCombat[iaggro].id, pLeftHead); + + Delay_Timer = 3500; + AggroYell = true; + } + + if (pInstance) + pInstance->SetData(TYPE_OMROGG, IN_PROGRESS); + } + + void JustSummoned(Creature *summoned) + { + if (summoned->GetEntry() == NPC_LEFT_HEAD) + LeftHeadGUID = summoned->GetGUID(); + + if (summoned->GetEntry() == NPC_RIGHT_HEAD) + RightHeadGUID = summoned->GetGUID(); + + //summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + //summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + summoned->SetVisibility(VISIBILITY_OFF); + } + + void KilledUnit(Unit* /*victim*/) + { + Unit* pLeftHead = Unit::GetUnit(*me,LeftHeadGUID); + Unit* pRightHead = Unit::GetUnit(*me,RightHeadGUID); + + if (!pLeftHead || !pRightHead) + return; + + ikilling = rand()%2; + + Unit *source = (pLeftHead->GetEntry() == Killing[ikilling].creature ? pLeftHead : pRightHead); + + switch(ikilling) + { + case 0: + DoScriptText(Killing[ikilling].id, source); + Delay_Timer = 3500; + KillingYell = true; + break; + case 1: + DoScriptText(Killing[ikilling].id, source); + KillingYell = false; + break; + } + } + + void JustDied(Unit* /*Killer*/) + { + Unit* pLeftHead = Unit::GetUnit(*me,LeftHeadGUID); + Unit* pRightHead = Unit::GetUnit(*me,RightHeadGUID); + + if (!pLeftHead || !pRightHead) + return; + + DoScriptText(YELL_DIE_L, pLeftHead); + + CAST_AI(mob_omrogg_headsAI, CAST_CRE(pRightHead)->AI())->DoDeathYell(); + + if (pInstance) + pInstance->SetData(TYPE_OMROGG, DONE); + } + + void UpdateAI(const uint32 diff) + { + if (Delay_Timer <= diff) + { + Delay_Timer = 3500; + + Unit* pLeftHead = Unit::GetUnit(*me,LeftHeadGUID); + Unit* pRightHead = Unit::GetUnit(*me,RightHeadGUID); + + if (!pLeftHead || !pRightHead) + return; + + if (AggroYell) + { + DoScriptText(GoCombatDelay[iaggro].id, pRightHead); + AggroYell = false; + } + + if (ThreatYell2) + { + Unit *source = (pLeftHead->GetEntry() == ThreatDelay2[ithreat].creature ? pLeftHead : pRightHead); + + DoScriptText(ThreatDelay2[ithreat].id, source); + ThreatYell2 = false; + } + + if (ThreatYell) + { + Unit *source = (pLeftHead->GetEntry() == ThreatDelay1[ithreat].creature ? pLeftHead : pRightHead); + + DoScriptText(ThreatDelay1[ithreat].id, source); + ThreatYell = false; + ThreatYell2 = true; + } + + if (KillingYell) + { + Unit *source = (pLeftHead->GetEntry() == KillingDelay[ikilling].creature ? pLeftHead : pRightHead); + + DoScriptText(KillingDelay[ikilling].id, source); + KillingYell = false; + } + } else Delay_Timer -= diff; + + if (!UpdateVictim()) + return; + + if (BlastCount && BlastWave_Timer <= diff) + { + DoCast(me, SPELL_BLAST_WAVE); + BlastWave_Timer = 5000; + ++BlastCount; + + if (BlastCount == 3) + BlastCount = 0; + } else BlastWave_Timer -= diff; + + if (BurningMaul_Timer <= diff) + { + DoScriptText(EMOTE_ENRAGE, me); + DoCast(me, SPELL_BURNING_MAUL); + BurningMaul_Timer = 40000; + BlastWave_Timer = 16000; + BlastCount = 1; + } else BurningMaul_Timer -= diff; + + if (ResetThreat_Timer <= diff) + { + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + { + DoYellForThreat(); + DoResetThreat(); + me->AddThreat(pTarget, 0.0f); + } + ResetThreat_Timer = 25000+rand()%15000; + } else ResetThreat_Timer -= diff; + + if (Fear_Timer <= diff) + { + DoCast(me, SPELL_FEAR); + Fear_Timer = 15000+rand()%20000; + } else Fear_Timer -= diff; + + if (ThunderClap_Timer <= diff) + { + DoCast(me, SPELL_THUNDERCLAP); + ThunderClap_Timer = 15000+rand()%15000; + } else ThunderClap_Timer -= diff; + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_boss_warbringer_omrogg(Creature* pCreature) +{ + return new boss_warbringer_omroggAI (pCreature); +} + +CreatureAI* GetAI_mob_omrogg_heads(Creature* pCreature) +{ + return new mob_omrogg_headsAI (pCreature); +} + +void AddSC_boss_warbringer_omrogg() +{ + Script *newscript; + + newscript = new Script; + newscript->Name = "boss_warbringer_omrogg"; + newscript->GetAI = &GetAI_boss_warbringer_omrogg; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_omrogg_heads"; + newscript->GetAI = &GetAI_mob_omrogg_heads; + newscript->RegisterSelf(); +} + diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp new file mode 100644 index 00000000000..b108077518a --- /dev/null +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp @@ -0,0 +1,288 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Boss_Warchief_Kargath_Bladefist +SD%Complete: 90 +SDComment: +SDCategory: Hellfire Citadel, Shattered Halls +EndScriptData */ + +/* ContentData +boss_warchief_kargath_bladefist +EndContentData */ + +#include "ScriptedPch.h" + +#define SAY_AGGRO1 -1540042 +#define SAY_AGGRO2 -1540043 +#define SAY_AGGRO3 -1540044 +#define SAY_SLAY1 -1540045 +#define SAY_SLAY2 -1540046 +#define SAY_DEATH -1540047 + +#define SPELL_BLADE_DANCE 30739 +#define H_SPELL_CHARGE 25821 + +#define TARGET_NUM 5 + +#define MOB_SHATTERED_ASSASSIN 17695 +#define MOB_HEARTHEN_GUARD 17621 +#define MOB_SHARPSHOOTER_GUARD 17622 +#define MOB_REAVER_GUARD 17623 + +float AssassEntrance[3] = {275.136,-84.29,2.3}; // y -8 +float AssassExit[3] = {184.233,-84.29,2.3}; // y -8 +float AddsEntrance[3] = {306.036,-84.29,1.93}; + +struct boss_warchief_kargath_bladefistAI : public ScriptedAI +{ + boss_warchief_kargath_bladefistAI(Creature *c) : ScriptedAI(c) + { + } + + std::vector adds; + std::vector assassins; + + uint32 Charge_timer; + uint32 Blade_Dance_Timer; + uint32 Summon_Assistant_Timer; + uint32 resetcheck_timer; + uint32 Wait_Timer; + + uint32 Assassins_Timer; + + uint32 summoned; + bool InBlade; + + uint32 target_num; + + void Reset() + { + removeAdds(); + + me->SetSpeed(MOVE_RUN,2); + me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE); + + summoned = 2; + InBlade = false; + Wait_Timer = 0; + + Charge_timer = 0; + Blade_Dance_Timer = 45000; + Summon_Assistant_Timer = 30000; + Assassins_Timer = 5000; + resetcheck_timer = 5000; + } + + void EnterCombat(Unit * /*who*/) + { + DoScriptText(RAND(SAY_AGGRO1,SAY_AGGRO2,SAY_AGGRO3), me); + } + + void JustSummoned(Creature *summoned) + { + switch(summoned->GetEntry()) + { + case MOB_HEARTHEN_GUARD: + case MOB_SHARPSHOOTER_GUARD: + case MOB_REAVER_GUARD: + summoned->AI()->AttackStart(SelectUnit(SELECT_TARGET_RANDOM,0)); + adds.push_back(summoned->GetGUID()); + break; + case MOB_SHATTERED_ASSASSIN: + assassins.push_back(summoned->GetGUID()); + break; + } + } + + void KilledUnit(Unit* victim) + { + if (victim->GetTypeId() == TYPEID_PLAYER) + { + DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); + } + } + + void JustDied(Unit* /*Killer*/) + { + DoScriptText(SAY_DEATH, me); + removeAdds(); + } + + void MovementInform(uint32 type, uint32 id) + { + if (InBlade) + { + if (type != POINT_MOTION_TYPE) + return; + + if (id != 1) + return; + + if (target_num > 0) // to prevent loops + { + Wait_Timer = 1; + DoCast(me, SPELL_BLADE_DANCE, true); + target_num--; + } + } + } + + void removeAdds() + { + for (std::vector::const_iterator itr = adds.begin(); itr!= adds.end(); ++itr) + { + Unit* temp = Unit::GetUnit((*me),*itr); + if (temp && temp->isAlive()) + { + (*temp).GetMotionMaster()->Clear(true); + me->DealDamage(temp,temp->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); + CAST_CRE(temp)->RemoveCorpse(); + } + } + adds.clear(); + + for (std::vector::const_iterator itr = assassins.begin(); itr!= assassins.end(); ++itr) + { + Unit* temp = Unit::GetUnit((*me),*itr); + if (temp && temp->isAlive()) + { + (*temp).GetMotionMaster()->Clear(true); + me->DealDamage(temp,temp->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); + CAST_CRE(temp)->RemoveCorpse(); + } + } + assassins.clear(); + } + void SpawnAssassin() + { + me->SummonCreature(MOB_SHATTERED_ASSASSIN,AssassEntrance[0],AssassEntrance[1]+8, AssassEntrance[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000); + me->SummonCreature(MOB_SHATTERED_ASSASSIN,AssassEntrance[0],AssassEntrance[1]-8, AssassEntrance[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000); + me->SummonCreature(MOB_SHATTERED_ASSASSIN,AssassExit[0],AssassExit[1]+8, AssassExit[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000); + me->SummonCreature(MOB_SHATTERED_ASSASSIN,AssassExit[0],AssassExit[1]-8, AssassExit[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000); + } + + void UpdateAI(const uint32 diff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + if (Assassins_Timer) + if (Assassins_Timer <= diff) + { + SpawnAssassin(); + Assassins_Timer = 0; + } else Assassins_Timer -= diff; + + if (InBlade) + { + if (Wait_Timer) + if (Wait_Timer <= diff) + { + if (target_num <= 0) + { + // stop bladedance + InBlade = false; + me->SetSpeed(MOVE_RUN,2); + me->GetMotionMaster()->MoveChase(me->getVictim()); + Blade_Dance_Timer = 30000; + Wait_Timer = 0; + if (IsHeroic()) + Charge_timer = 5000; + } + else + { + //move in bladedance + float x,y,randx,randy; + randx = (rand()%40); + randy = (rand()%40); + x = 210+ randx ; + y = -60- randy ; + me->GetMotionMaster()->MovePoint(1,x,y,me->GetPositionZ()); + Wait_Timer = 0; + } + } else Wait_Timer -= diff; + } + else + { + if (Blade_Dance_Timer) + if (Blade_Dance_Timer <= diff) + { + target_num = TARGET_NUM; + Wait_Timer = 1; + InBlade = true; + Blade_Dance_Timer = 0; + me->SetSpeed(MOVE_RUN,4); + return; + } else Blade_Dance_Timer -= diff; + + if (Charge_timer) + if (Charge_timer <= diff) + { + DoCast(SelectUnit(SELECT_TARGET_RANDOM, 0), H_SPELL_CHARGE); + Charge_timer = 0; + } else Charge_timer -= diff; + + if (Summon_Assistant_Timer <= diff) + { + for (uint8 i = 0; i < summoned; ++i) + { + switch (urand(0,2)) + { + case 0: me->SummonCreature(MOB_HEARTHEN_GUARD,AddsEntrance[0],AddsEntrance[1], AddsEntrance[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000); break; + case 1: me->SummonCreature(MOB_SHARPSHOOTER_GUARD,AddsEntrance[0],AddsEntrance[1], AddsEntrance[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000); break; + case 2: me->SummonCreature(MOB_REAVER_GUARD,AddsEntrance[0],AddsEntrance[1], AddsEntrance[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000); break; + } + } + if (urand(0,9) < 2) + ++summoned; + Summon_Assistant_Timer = urand(25000,35000); + } else Summon_Assistant_Timer -= diff; + + DoMeleeAttackIfReady(); + } + + if (resetcheck_timer <= diff) + { + uint32 tempx,tempy; + tempx = uint32(me->GetPositionX()); + tempy = uint32(me->GetPositionY()); + if (tempx > 255 || tempx < 205) + { + EnterEvadeMode(); + return; + } + resetcheck_timer = 5000; + } else resetcheck_timer -= diff; + } +}; + +CreatureAI* GetAI_boss_warchief_kargath_bladefist(Creature* pCreature) +{ + return new boss_warchief_kargath_bladefistAI (pCreature); +} + +void AddSC_boss_warchief_kargath_bladefist() +{ + Script *newscript; + newscript = new Script; + newscript->Name = "boss_warchief_kargath_bladefist"; + newscript->GetAI = &GetAI_boss_warchief_kargath_bladefist; + newscript->RegisterSelf(); +} + diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp new file mode 100644 index 00000000000..c29df4d6411 --- /dev/null +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp @@ -0,0 +1,114 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Instance_Shattered_Halls +SD%Complete: 50 +SDComment: currently missing info about door. instance not complete +SDCategory: Hellfire Citadel, Shattered Halls +EndScriptData */ + +#include "ScriptedPch.h" +#include "shattered_halls.h" + +#define MAX_ENCOUNTER 2 + +#define DOOR_NETHEKURSE 1 + +struct instance_shattered_halls : public ScriptedInstance +{ + instance_shattered_halls(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; + + uint32 m_auiEncounter[MAX_ENCOUNTER]; + uint64 nethekurseGUID; + uint64 nethekurseDoorGUID; + + void Initialize() + { + memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); + + nethekurseGUID = 0; + nethekurseDoorGUID = 0; + } + + void OnGameObjectCreate(GameObject* pGo, bool /*add*/) + { + switch(pGo->GetEntry()) + { + case DOOR_NETHEKURSE: nethekurseDoorGUID = pGo->GetGUID(); break; + } + } + + void OnCreatureCreate(Creature* pCreature, bool /*add*/) + { + switch(pCreature->GetEntry()) + { + case 16807: nethekurseGUID = pCreature->GetGUID(); break; + } + } + + void SetData(uint32 type, uint32 data) + { + switch(type) + { + case TYPE_NETHEKURSE: + m_auiEncounter[0] = data; + break; + case TYPE_OMROGG: + m_auiEncounter[1] = data; + break; + } + } + + uint32 GetData(uint32 type) + { + switch(type) + { + case TYPE_NETHEKURSE: + return m_auiEncounter[0]; + case TYPE_OMROGG: + return m_auiEncounter[1]; + } + return 0; + } + + uint64 GetData64(uint32 data) + { + switch(data) + { + case DATA_NETHEKURSE: + return nethekurseGUID; + case DATA_NETHEKURSE_DOOR: + return nethekurseDoorGUID; + } + return 0; + } +}; + +InstanceData* GetInstanceData_instance_shattered_halls(Map* pMap) +{ + return new instance_shattered_halls(pMap); +} + +void AddSC_instance_shattered_halls() +{ + Script *newscript; + newscript = new Script; + newscript->Name = "instance_shattered_halls"; + newscript->GetInstanceData = &GetInstanceData_instance_shattered_halls; + newscript->RegisterSelf(); +} + diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h new file mode 100644 index 00000000000..cbfa23ec4e0 --- /dev/null +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h @@ -0,0 +1,14 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software licensed under GPL version 2 + * Please see the included DOCS/LICENSE.TXT for more information */ + +#ifndef DEF_SHATTERED_H +#define DEF_SHATTERED_H + +#define TYPE_NETHEKURSE 1 +#define DATA_NETHEKURSE 2 +#define DATA_NETHEKURSE_DOOR 3 + +#define TYPE_OMROGG 4 +#endif + diff --git a/src/server/scripts/Outland/HellfireCitadel/blood_furnace/blood_furnace.h b/src/server/scripts/Outland/HellfireCitadel/blood_furnace/blood_furnace.h deleted file mode 100644 index b845c66823f..00000000000 --- a/src/server/scripts/Outland/HellfireCitadel/blood_furnace/blood_furnace.h +++ /dev/null @@ -1,29 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software licensed under GPL version 2 - * Please see the included DOCS/LICENSE.TXT for more information */ - -#ifndef DEF_BLOOD_FURNACE_H -#define DEF_BLOOD_FURNACE_H - -#define DATA_THE_MAKER 1 -#define DATA_BROGGOK 2 -#define DATA_KELIDAN_THE_MAKER 3 -#define TYPE_THE_MAKER_EVENT 4 -#define TYPE_BROGGOK_EVENT 5 -#define TYPE_KELIDAN_THE_BREAKER_EVENT 6 -#define DATA_DOOR1 7 -#define DATA_DOOR2 8 -#define DATA_DOOR3 9 -#define DATA_DOOR4 10 -#define DATA_DOOR5 11 -#define DATA_DOOR6 12 -#define DATA_PRISON_CELL1 13 -#define DATA_PRISON_CELL2 14 -#define DATA_PRISON_CELL3 15 -#define DATA_PRISON_CELL4 16 -#define DATA_PRISON_CELL5 17 -#define DATA_PRISON_CELL6 18 -#define DATA_PRISON_CELL7 19 -#define DATA_PRISON_CELL8 20 -#endif - diff --git a/src/server/scripts/Outland/HellfireCitadel/blood_furnace/boss_broggok.cpp b/src/server/scripts/Outland/HellfireCitadel/blood_furnace/boss_broggok.cpp deleted file mode 100644 index d5fb9bdba49..00000000000 --- a/src/server/scripts/Outland/HellfireCitadel/blood_furnace/boss_broggok.cpp +++ /dev/null @@ -1,131 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: Boss_Broggok -SD%Complete: 70 -SDComment: pre-event not made -SDCategory: Hellfire Citadel, Blood Furnace -EndScriptData */ - -#include "ScriptedPch.h" -#include "blood_furnace.h" - -enum eEnums -{ - SAY_AGGRO = -1542008, - - SPELL_SLIME_SPRAY = 30913, - SPELL_POISON_CLOUD = 30916, - SPELL_POISON_BOLT = 30917, - - SPELL_POISON = 30914 -}; - -struct boss_broggokAI : public ScriptedAI -{ - boss_broggokAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - } - - ScriptedInstance* pInstance; - - uint32 AcidSpray_Timer; - uint32 PoisonSpawn_Timer; - uint32 PoisonBolt_Timer; - - void Reset() - { - AcidSpray_Timer = 10000; - PoisonSpawn_Timer = 5000; - PoisonBolt_Timer = 7000; - if (pInstance) - { - pInstance->SetData(TYPE_BROGGOK_EVENT, NOT_STARTED); - pInstance->HandleGameObject(pInstance->GetData64(DATA_DOOR4), true); - } - } - - void EnterCombat(Unit * /*who*/) - { - DoScriptText(SAY_AGGRO, me); - if (pInstance) - { - pInstance->SetData(TYPE_BROGGOK_EVENT, IN_PROGRESS); - pInstance->HandleGameObject(pInstance->GetData64(DATA_DOOR4), false); - } - } - - void JustSummoned(Creature *summoned) - { - summoned->setFaction(16); - summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - summoned->CastSpell(summoned,SPELL_POISON,false,0,0,me->GetGUID()); - } - - void UpdateAI(const uint32 diff) - { - if (!UpdateVictim()) - return; - - if (AcidSpray_Timer <= diff) - { - DoCast(me->getVictim(), SPELL_SLIME_SPRAY); - AcidSpray_Timer = 4000+rand()%8000; - } else AcidSpray_Timer -=diff; - - if (PoisonBolt_Timer <= diff) - { - DoCast(me->getVictim(), SPELL_POISON_BOLT); - PoisonBolt_Timer = 4000+rand()%8000; - } else PoisonBolt_Timer -=diff; - - if (PoisonSpawn_Timer <= diff) - { - DoCast(me, SPELL_POISON_CLOUD); - PoisonSpawn_Timer = 20000; - } else PoisonSpawn_Timer -=diff; - - DoMeleeAttackIfReady(); - } - - void JustDied(Unit* /*who*/) - { - if (pInstance) - { - pInstance->HandleGameObject(pInstance->GetData64(DATA_DOOR4), true); - pInstance->HandleGameObject(pInstance->GetData64(DATA_DOOR5), true); - pInstance->SetData(TYPE_BROGGOK_EVENT, DONE); - } - } - -}; - -CreatureAI* GetAI_boss_broggok(Creature* pCreature) -{ - return new boss_broggokAI (pCreature); -} - -void AddSC_boss_broggok() -{ - Script *newscript; - newscript = new Script; - newscript->Name = "boss_broggok"; - newscript->GetAI = &GetAI_boss_broggok; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Outland/HellfireCitadel/blood_furnace/boss_kelidan_the_breaker.cpp b/src/server/scripts/Outland/HellfireCitadel/blood_furnace/boss_kelidan_the_breaker.cpp deleted file mode 100644 index a44ad9cc3c8..00000000000 --- a/src/server/scripts/Outland/HellfireCitadel/blood_furnace/boss_kelidan_the_breaker.cpp +++ /dev/null @@ -1,356 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: Boss_Kelidan_The_Breaker -SD%Complete: 100 -SDComment: -SDCategory: Hellfire Citadel, Blood Furnace -EndScriptData */ - -/* ContentData -boss_kelidan_the_breaker -mob_shadowmoon_channeler -EndContentData */ - -#include "ScriptedPch.h" -#include "blood_furnace.h" - -enum eKelidan -{ - SAY_WAKE = -1542000, - SAY_ADD_AGGRO_1 = -1542001, - SAY_ADD_AGGRO_2 = -1542002, - SAY_ADD_AGGRO_3 = -1542003, - SAY_KILL_1 = -1542004, - SAY_KILL_2 = -1542005, - SAY_NOVA = -1542006, - SAY_DIE = -1542007, - - SPELL_CORRUPTION = 30938, - SPELL_EVOCATION = 30935, - - SPELL_FIRE_NOVA = 33132, - H_SPELL_FIRE_NOVA = 37371, - - SPELL_SHADOW_BOLT_VOLLEY = 28599, - H_SPELL_SHADOW_BOLT_VOLLEY = 40070, - - SPELL_BURNING_NOVA = 30940, - SPELL_VORTEX = 37370, - - ENTRY_KELIDAN = 17377, - ENTRY_CHANNELER = 17653 -}; - -const float ShadowmoonChannelers[5][4]= -{ - {302,-87,-24.4,0.157}, - {321,-63.5,-24.6,4.887}, - {346,-74.5,-24.6,3.595}, - {344,-103.5,-24.5,2.356}, - {316,-109,-24.6,1.257} -}; - -struct boss_kelidan_the_breakerAI : public ScriptedAI -{ - boss_kelidan_the_breakerAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - for (uint8 i=0; i<5; ++i) - Channelers[i] = 0; - } - - ScriptedInstance* pInstance; - - uint32 ShadowVolley_Timer; - uint32 BurningNova_Timer; - uint32 Firenova_Timer; - uint32 Corruption_Timer; - uint32 check_Timer; - bool Firenova; - bool addYell; - uint64 Channelers[5]; - - void Reset() - { - ShadowVolley_Timer = 1000; - BurningNova_Timer = 15000; - Corruption_Timer = 5000; - check_Timer = 0; - Firenova = false; - addYell = false; - SummonChannelers(); - if (pInstance) - pInstance->SetData(TYPE_KELIDAN_THE_BREAKER_EVENT, NOT_STARTED); - } - - void EnterCombat(Unit* who) - { - DoScriptText(SAY_WAKE, me); - if (me->IsNonMeleeSpellCasted(false)) - me->InterruptNonMeleeSpells(true); - DoStartMovement(who); - if (pInstance) - pInstance->SetData(TYPE_KELIDAN_THE_BREAKER_EVENT, IN_PROGRESS); - } - - void KilledUnit(Unit* /*victim*/) - { - if (rand()%2) - return; - - DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2), me); - } - - void ChannelerEngaged(Unit* who) - { - if (who && !addYell) - { - addYell = true; - DoScriptText(RAND(SAY_ADD_AGGRO_1,SAY_ADD_AGGRO_2,SAY_ADD_AGGRO_3), me); - } - for (uint8 i=0; i<5; ++i) - { - Creature *channeler = Unit::GetCreature(*me, Channelers[i]); - if (who && channeler && !channeler->isInCombat()) - channeler->AI()->AttackStart(who); - } - } - - void ChannelerDied(Unit* killer) - { - for (uint8 i=0; i<5; ++i) - { - Creature *channeler = Unit::GetCreature(*me, Channelers[i]); - if (channeler && channeler->isAlive()) - return; - } - - if (killer) - me->AI()->AttackStart(killer); - } - - uint64 GetChanneled(Creature *channeler1) - { - SummonChannelers(); - if (!channeler1) return NULL; - uint8 i; - for (i=0; i<5; ++i) - { - Creature *channeler = Unit::GetCreature(*me, Channelers[i]); - if (channeler && channeler->GetGUID() == channeler1->GetGUID()) - break; - } - return Channelers[(i+2)%5]; - } - - void SummonChannelers() - { - for (uint8 i=0; i<5; ++i) - { - Creature *channeler = Unit::GetCreature(*me, Channelers[i]); - if (!channeler || channeler->isDead()) - channeler = me->SummonCreature(ENTRY_CHANNELER,ShadowmoonChannelers[i][0],ShadowmoonChannelers[i][1],ShadowmoonChannelers[i][2],ShadowmoonChannelers[i][3],TEMPSUMMON_CORPSE_TIMED_DESPAWN,300000); - if (channeler) - Channelers[i] = channeler->GetGUID(); - else - Channelers[i] = 0; - } - } - - void JustDied(Unit* /*Killer*/) - { - DoScriptText(SAY_DIE, me); - - if (!pInstance) - return; - - pInstance->SetData(TYPE_KELIDAN_THE_BREAKER_EVENT, DONE); - pInstance->HandleGameObject(pInstance->GetData64(DATA_DOOR1), true); - pInstance->HandleGameObject(pInstance->GetData64(DATA_DOOR6), true); - } - - void UpdateAI(const uint32 diff) - { - if (!UpdateVictim()) - { - if (check_Timer <= diff) - { - if (!me->IsNonMeleeSpellCasted(false)) - DoCast(me, SPELL_EVOCATION); - check_Timer = 5000; - } else check_Timer -= diff; - return; - } - - if (Firenova) - { - if (Firenova_Timer <= diff) - { - DoCast(me, SPELL_FIRE_NOVA, true); - Firenova = false; - ShadowVolley_Timer = 2000; - } else Firenova_Timer -=diff; - - return; - } - - if (ShadowVolley_Timer <= diff) - { - DoCast(me, SPELL_SHADOW_BOLT_VOLLEY); - ShadowVolley_Timer = 5000+rand()%8000; - } else ShadowVolley_Timer -=diff; - - if (Corruption_Timer <= diff) - { - DoCast(me, SPELL_CORRUPTION); - Corruption_Timer = 30000+rand()%20000; - } else Corruption_Timer -=diff; - - if (BurningNova_Timer <= diff) - { - if (me->IsNonMeleeSpellCasted(false)) - me->InterruptNonMeleeSpells(true); - - DoScriptText(SAY_NOVA, me); - - if (SpellEntry *nova = GET_SPELL(SPELL_BURNING_NOVA)) - { - if (Aura * aura = Aura::TryCreate(nova, me, me)) - aura->ApplyForTargets(); - } - - if (IsHeroic()) - DoTeleportAll(me->GetPositionX(),me->GetPositionY(),me->GetPositionZ(),me->GetOrientation()); - - BurningNova_Timer = 20000+rand()%8000; - Firenova_Timer= 5000; - Firenova = true; - } else BurningNova_Timer -=diff; - - DoMeleeAttackIfReady(); - } - -}; - -CreatureAI* GetAI_boss_kelidan_the_breaker(Creature* pCreature) -{ - return new boss_kelidan_the_breakerAI (pCreature); -} - -/*###### -## mob_shadowmoon_channeler -######*/ - -enum eShadowmoon -{ - SPELL_SHADOW_BOLT = 12739, - H_SPELL_SHADOW_BOLT = 15472, - - SPELL_MARK_OF_SHADOW = 30937, - SPELL_CHANNELING = 39123 -}; - -struct mob_shadowmoon_channelerAI : public ScriptedAI -{ - mob_shadowmoon_channelerAI(Creature *c) : ScriptedAI(c) - { - } - - uint32 ShadowBolt_Timer; - uint32 MarkOfShadow_Timer; - uint32 check_Timer; - - void Reset() - { - ShadowBolt_Timer = 1000+rand()%1000; - MarkOfShadow_Timer = 5000+rand()%2000; - check_Timer = 0; - if (me->IsNonMeleeSpellCasted(false)) - me->InterruptNonMeleeSpells(true); - } - - void EnterCombat(Unit* who) - { - if (Creature *Kelidan = me->FindNearestCreature(ENTRY_KELIDAN, 100)) - CAST_AI(boss_kelidan_the_breakerAI, Kelidan->AI())->ChannelerEngaged(who); - if (me->IsNonMeleeSpellCasted(false)) - me->InterruptNonMeleeSpells(true); - DoStartMovement(who); - } - - void JustDied(Unit* Killer) - { - if (Creature *Kelidan = me->FindNearestCreature(ENTRY_KELIDAN, 100)) - CAST_AI(boss_kelidan_the_breakerAI, Kelidan->AI())->ChannelerDied(Killer); - } - - void UpdateAI(const uint32 diff) - { - if (!UpdateVictim()) - { - if (check_Timer <= diff) - { - if (!me->IsNonMeleeSpellCasted(false)) - if (Creature *Kelidan = me->FindNearestCreature(ENTRY_KELIDAN, 100)) - { - uint64 channeler = CAST_AI(boss_kelidan_the_breakerAI, Kelidan->AI())->GetChanneled(me); - if (Unit *channeled = Unit::GetUnit(*me, channeler)) - DoCast(channeled, SPELL_CHANNELING); - } - check_Timer = 5000; - } else check_Timer -= diff; - return; - } - - if (MarkOfShadow_Timer <= diff) - { - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_MARK_OF_SHADOW); - MarkOfShadow_Timer = 15000+rand()%5000; - } else MarkOfShadow_Timer -=diff; - - if (ShadowBolt_Timer <= diff) - { - DoCast(me->getVictim(), SPELL_SHADOW_BOLT); - ShadowBolt_Timer = 5000+rand()%1000; - } else ShadowBolt_Timer -=diff; - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_mob_shadowmoon_channeler(Creature* pCreature) -{ - return new mob_shadowmoon_channelerAI (pCreature); -} - -void AddSC_boss_kelidan_the_breaker() -{ - Script *newscript; - - newscript = new Script; - newscript->Name = "boss_kelidan_the_breaker"; - newscript->GetAI = &GetAI_boss_kelidan_the_breaker; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_shadowmoon_channeler"; - newscript->GetAI = &GetAI_mob_shadowmoon_channeler; - newscript->RegisterSelf(); -} - diff --git a/src/server/scripts/Outland/HellfireCitadel/blood_furnace/boss_the_maker.cpp b/src/server/scripts/Outland/HellfireCitadel/blood_furnace/boss_the_maker.cpp deleted file mode 100644 index 45219b6509b..00000000000 --- a/src/server/scripts/Outland/HellfireCitadel/blood_furnace/boss_the_maker.cpp +++ /dev/null @@ -1,152 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: Boss_The_Maker -SD%Complete: 80 -SDComment: Mind control no support -SDCategory: Hellfire Citadel, Blood Furnace -EndScriptData */ - -#include "ScriptedPch.h" -#include "blood_furnace.h" - -enum eEnums -{ - SAY_AGGRO_1 = -1542009, - SAY_AGGRO_2 = -1542010, - SAY_AGGRO_3 = -1542011, - SAY_KILL_1 = -1542012, - SAY_KILL_2 = -1542013, - SAY_DIE = -1542014, - - SPELL_ACID_SPRAY = 38153, // heroic 38973 ??? 38153 - SPELL_EXPLODING_BREAKER = 30925, - SPELL_KNOCKDOWN = 20276, - SPELL_DOMINATION = 25772 // ??? -}; - -struct boss_the_makerAI : public ScriptedAI -{ - boss_the_makerAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - } - - ScriptedInstance* pInstance; - - uint32 AcidSpray_Timer; - uint32 ExplodingBreaker_Timer; - uint32 Domination_Timer; - uint32 Knockdown_Timer; - - void Reset() - { - AcidSpray_Timer = 15000; - ExplodingBreaker_Timer = 6000; - Domination_Timer = 120000; - Knockdown_Timer = 10000; - - if (!pInstance) - return; - - pInstance->SetData(TYPE_THE_MAKER_EVENT, NOT_STARTED); - pInstance->HandleGameObject(pInstance->GetData64(DATA_DOOR2), true); - } - - void EnterCombat(Unit * /*who*/) - { - DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); - - if (!pInstance) - return; - - pInstance->SetData(TYPE_THE_MAKER_EVENT, IN_PROGRESS); - pInstance->HandleGameObject(pInstance->GetData64(DATA_DOOR2), false); - } - - void KilledUnit(Unit* /*victim*/) - { - DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2), me); - } - - void JustDied(Unit* /*Killer*/) - { - DoScriptText(SAY_DIE, me); - - if (!pInstance) - return; - - pInstance->SetData(TYPE_THE_MAKER_EVENT, DONE); - pInstance->HandleGameObject(pInstance->GetData64(DATA_DOOR2), true); - pInstance->HandleGameObject(pInstance->GetData64(DATA_DOOR3), true); - - } - - void UpdateAI(const uint32 diff) - { - if (!UpdateVictim()) - return; - - if (AcidSpray_Timer <= diff) - { - DoCast(me->getVictim(), SPELL_ACID_SPRAY); - AcidSpray_Timer = 15000+rand()%8000; - } else AcidSpray_Timer -=diff; - - if (ExplodingBreaker_Timer <= diff) - { - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget, SPELL_EXPLODING_BREAKER); - ExplodingBreaker_Timer = 4000+rand()%8000; - } else ExplodingBreaker_Timer -=diff; - - /* // Disabled until Core Support for mind control - if (domination_timer_timer <= diff) - { - Unit *pTarget; - pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); - - DoCast(pTarget, SPELL_DOMINATION); - - domination_timer = 120000; - } else domination_timer -=diff; - */ - - if (Knockdown_Timer <= diff) - { - DoCast(me->getVictim(), SPELL_KNOCKDOWN); - Knockdown_Timer = 4000+rand()%8000; - } else Knockdown_Timer -=diff; - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_boss_the_makerAI(Creature* pCreature) -{ - return new boss_the_makerAI (pCreature); -} - -void AddSC_boss_the_maker() -{ - Script *newscript; - newscript = new Script; - newscript->Name = "boss_the_maker"; - newscript->GetAI = &GetAI_boss_the_makerAI; - newscript->RegisterSelf(); -} - diff --git a/src/server/scripts/Outland/HellfireCitadel/blood_furnace/instance_blood_furnace.cpp b/src/server/scripts/Outland/HellfireCitadel/blood_furnace/instance_blood_furnace.cpp deleted file mode 100644 index 3a2eb8ba5ee..00000000000 --- a/src/server/scripts/Outland/HellfireCitadel/blood_furnace/instance_blood_furnace.cpp +++ /dev/null @@ -1,232 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: Instance_Blood_Furnace -SD%Complete: 85 -SDComment: -SDCategory: Hellfire Citadel, Blood Furnace -EndScriptData */ - -#include "ScriptedPch.h" -#include "blood_furnace.h" - -#define ENTRY_SEWER1 181823 -#define ENTRY_SEWER2 181766 -#define MAX_ENCOUNTER 3 - -struct instance_blood_furnace : public ScriptedInstance -{ - instance_blood_furnace(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; - - uint64 The_MakerGUID; - uint64 BroggokGUID; - uint64 Kelidan_The_BreakerGUID; - - uint64 Door1GUID; - uint64 Door2GUID; - uint64 Door3GUID; - uint64 Door4GUID; - uint64 Door5GUID; - uint64 Door6GUID; - - uint64 PrisonCell1GUID; - uint64 PrisonCell2GUID; - uint64 PrisonCell3GUID; - uint64 PrisonCell4GUID; - uint64 PrisonCell5GUID; - uint64 PrisonCell6GUID; - uint64 PrisonCell7GUID; - uint64 PrisonCell8GUID; - - uint32 m_auiEncounter[MAX_ENCOUNTER]; - std::string str_data; - - void Initialize() - { - memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); - - The_MakerGUID = 0; - BroggokGUID = 0; - Kelidan_The_BreakerGUID = 0; - - Door1GUID = 0; - Door2GUID = 0; - Door3GUID = 0; - Door4GUID = 0; - Door5GUID = 0; - Door6GUID = 0; - - PrisonCell1GUID = 0; - PrisonCell2GUID = 0; - PrisonCell3GUID = 0; - PrisonCell4GUID = 0; - PrisonCell5GUID = 0; - PrisonCell6GUID = 0; - PrisonCell7GUID = 0; - PrisonCell8GUID = 0; - } - - void OnCreatureCreate(Creature* pCreature, bool add) - { - if (!add) - return; - - switch(pCreature->GetEntry()) - { - case 17381: The_MakerGUID = pCreature->GetGUID(); break; - case 17380: BroggokGUID = pCreature->GetGUID(); break; - case 17377: Kelidan_The_BreakerGUID = pCreature->GetGUID(); break; - } - } - - void OnGameObjectCreate(GameObject* pGo, bool add) - { - if (!add) - return; - - if (pGo->GetEntry() == 181766) //Final exit door - Door1GUID = pGo->GetGUID(); - if (pGo->GetEntry() == 181811) //The Maker Front door - Door2GUID = pGo->GetGUID(); - if (pGo->GetEntry() == 181812) //The Maker Rear door - Door3GUID = pGo->GetGUID(); - if (pGo->GetEntry() == 181822) //Broggok Front door - Door4GUID = pGo->GetGUID(); - if (pGo->GetEntry() == 181819) //Broggok Rear door - Door5GUID = pGo->GetGUID(); - if (pGo->GetEntry() == 181823) //Kelidan exit door - Door6GUID = pGo->GetGUID(); - - if (pGo->GetEntry() == 181813) //The Maker prison cell front right - PrisonCell1GUID = pGo->GetGUID(); - if (pGo->GetEntry() == 181814) //The Maker prison cell back right - PrisonCell2GUID = pGo->GetGUID(); - if (pGo->GetEntry() == 181816) //The Maker prison cell front left - PrisonCell3GUID = pGo->GetGUID(); - if (pGo->GetEntry() == 181815) //The Maker prison cell back left - PrisonCell4GUID = pGo->GetGUID(); - if (pGo->GetEntry() == 181821) //Broggok prison cell front right - PrisonCell5GUID = pGo->GetGUID(); - if (pGo->GetEntry() == 181818) //Broggok prison cell back right - PrisonCell6GUID = pGo->GetGUID(); - if (pGo->GetEntry() == 181820) //Broggok prison cell front left - PrisonCell7GUID = pGo->GetGUID(); - if (pGo->GetEntry() == 181817) //Broggok prison cell back left - PrisonCell8GUID = pGo->GetGUID(); - } - - uint64 GetData64(uint32 data) - { - switch(data) - { - case DATA_THE_MAKER: return The_MakerGUID; - case DATA_BROGGOK: return BroggokGUID; - case DATA_KELIDAN_THE_MAKER: return Kelidan_The_BreakerGUID; - case DATA_DOOR1: return Door1GUID; - case DATA_DOOR2: return Door2GUID; - case DATA_DOOR3: return Door3GUID; - case DATA_DOOR4: return Door4GUID; - case DATA_DOOR5: return Door5GUID; - case DATA_DOOR6: return Door6GUID; - case DATA_PRISON_CELL1: return PrisonCell1GUID; - case DATA_PRISON_CELL2: return PrisonCell2GUID; - case DATA_PRISON_CELL3: return PrisonCell3GUID; - case DATA_PRISON_CELL4: return PrisonCell4GUID; - case DATA_PRISON_CELL5: return PrisonCell5GUID; - case DATA_PRISON_CELL6: return PrisonCell6GUID; - case DATA_PRISON_CELL7: return PrisonCell7GUID; - case DATA_PRISON_CELL8: return PrisonCell8GUID; - } - - return 0; - } - - void SetData(uint32 /*type*/, uint32 data) - { - switch(data) - { - case TYPE_THE_MAKER_EVENT: m_auiEncounter[0] = data; break; - case TYPE_BROGGOK_EVENT: m_auiEncounter[1] = data; break; - case TYPE_KELIDAN_THE_BREAKER_EVENT: m_auiEncounter[2] = data; break; - } - - if (data == DONE) - { - OUT_SAVE_INST_DATA; - - std::ostringstream saveStream; - saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2]; - - str_data = saveStream.str(); - - SaveToDB(); - OUT_SAVE_INST_DATA_COMPLETE; - } - } - - uint32 GetData(uint32 data) - { - switch(data) - { - case TYPE_THE_MAKER_EVENT: return m_auiEncounter[0]; - case TYPE_BROGGOK_EVENT: return m_auiEncounter[1]; - case TYPE_KELIDAN_THE_BREAKER_EVENT: return m_auiEncounter[2]; - } - - return 0; - } - - const char* Save() - { - return str_data.c_str(); - } - - void Load(const char* in) - { - if (!in) - { - OUT_LOAD_INST_DATA_FAIL; - return; - } - - OUT_LOAD_INST_DATA(in); - - std::istringstream loadStream(in); - loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2]; - - for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) - if (m_auiEncounter[i] == IN_PROGRESS || m_auiEncounter[i] == FAIL) - m_auiEncounter[i] = NOT_STARTED; - - OUT_LOAD_INST_DATA_COMPLETE; - } -}; - -InstanceData* GetInstanceData_instance_blood_furnace(Map* pMap) -{ - return new instance_blood_furnace(pMap); -} - -void AddSC_instance_blood_furnace() -{ - Script *newscript; - newscript = new Script; - newscript->Name = "instance_blood_furnace"; - newscript->GetInstanceData = &GetInstanceData_instance_blood_furnace; - newscript->RegisterSelf(); -} - diff --git a/src/server/scripts/Outland/HellfireCitadel/hellfire_ramparts/boss_omor_the_unscarred.cpp b/src/server/scripts/Outland/HellfireCitadel/hellfire_ramparts/boss_omor_the_unscarred.cpp deleted file mode 100644 index d6c0b2fd401..00000000000 --- a/src/server/scripts/Outland/HellfireCitadel/hellfire_ramparts/boss_omor_the_unscarred.cpp +++ /dev/null @@ -1,206 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: Boss_Omar_The_Unscarred -SD%Complete: 90 -SDComment: Temporary solution for orbital/shadow whip-ability. Needs more core support before making it more proper. -SDCategory: Hellfire Citadel, Hellfire Ramparts -EndScriptData */ - -#include "ScriptedPch.h" - -#define SAY_AGGRO_1 -1543009 -#define SAY_AGGRO_2 -1543010 -#define SAY_AGGRO_3 -1543011 -#define SAY_SUMMON -1543012 -#define SAY_CURSE -1543013 -#define SAY_KILL_1 -1543014 -#define SAY_DIE -1543015 -#define SAY_WIPE -1543016 - -#define SPELL_ORBITAL_STRIKE 30637 -#define SPELL_SHADOW_WHIP 30638 -#define SPELL_TREACHEROUS_AURA 30695 -#define H_SPELL_BANE_OF_TREACHERY 37566 -#define SPELL_DEMONIC_SHIELD 31901 -#define SPELL_SHADOW_BOLT 30686 -#define H_SPELL_SHADOW_BOLT 39297 -#define SPELL_SUMMON_FIENDISH_HOUND 30707 - -struct boss_omor_the_unscarredAI : public ScriptedAI -{ - boss_omor_the_unscarredAI(Creature *c) : ScriptedAI(c) - { - SetCombatMovement(false); - } - - uint32 OrbitalStrike_Timer; - uint32 ShadowWhip_Timer; - uint32 Aura_Timer; - uint32 DemonicShield_Timer; - uint32 Shadowbolt_Timer; - uint32 Summon_Timer; - uint32 SummonedCount; - uint64 PlayerGUID; - bool CanPullBack; - - void Reset() - { - DoScriptText(SAY_WIPE, me); - - OrbitalStrike_Timer = 25000; - ShadowWhip_Timer = 2000; - Aura_Timer = 10000; - DemonicShield_Timer = 1000; - Shadowbolt_Timer = 2000; - Summon_Timer = 10000; - SummonedCount = 0; - PlayerGUID = 0; - CanPullBack = false; - } - - void EnterCombat(Unit * /*who*/) - { - DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); - } - - void KilledUnit(Unit* /*victim*/) - { - if (rand()%2) - return; - - DoScriptText(SAY_KILL_1, me); - } - - void JustSummoned(Creature* summoned) - { - DoScriptText(SAY_SUMMON, me); - - if (Unit* random = SelectUnit(SELECT_TARGET_RANDOM,0)) - summoned->AI()->AttackStart(random); - - ++SummonedCount; - } - - void JustDied(Unit* /*Killer*/) - { - DoScriptText(SAY_DIE, me); - } - - void UpdateAI(const uint32 diff) - { - if (!UpdateVictim()) - return; - - //only two may be wrong, perhaps increase timer and spawn periodically instead. - if (SummonedCount < 2) - { - if (Summon_Timer <= diff) - { - me->InterruptNonMeleeSpells(false); - DoCast(me, SPELL_SUMMON_FIENDISH_HOUND); - Summon_Timer = 15000+rand()%15000; - } else Summon_Timer -= diff; - } - - if (CanPullBack) - { - if (ShadowWhip_Timer <= diff) - { - if (Player* temp = Unit::GetPlayer(PlayerGUID)) - { - //if unit dosen't have this flag, then no pulling back (script will attempt cast, even if orbital strike was resisted) - if (temp->HasUnitMovementFlag(MOVEMENTFLAG_FALLING)) - { - me->InterruptNonMeleeSpells(false); - DoCast(temp, SPELL_SHADOW_WHIP); - } - } - PlayerGUID = 0; - ShadowWhip_Timer = 2000; - CanPullBack = false; - } else ShadowWhip_Timer -= diff; - } - else if (OrbitalStrike_Timer <= diff) - { - Unit* temp = NULL; - if (me->IsWithinMeleeRange(me->getVictim())) - temp = me->getVictim(); - else temp = SelectUnit(SELECT_TARGET_RANDOM,0); - - if (temp && temp->GetTypeId() == TYPEID_PLAYER) - { - DoCast(temp, SPELL_ORBITAL_STRIKE); - OrbitalStrike_Timer = 14000+rand()%2000; - PlayerGUID = temp->GetGUID(); - - if (PlayerGUID) - CanPullBack = true; - } - } else OrbitalStrike_Timer -= diff; - - if ((me->GetHealth()*100) / me->GetMaxHealth() < 20) - { - if (DemonicShield_Timer <= diff) - { - DoCast(me, SPELL_DEMONIC_SHIELD); - DemonicShield_Timer = 15000; - } else DemonicShield_Timer -= diff; - } - - if (Aura_Timer <= diff) - { - DoScriptText(SAY_CURSE, me); - - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - { - DoCast(pTarget, SPELL_TREACHEROUS_AURA); - Aura_Timer = 8000+rand()%8000; - } - } else Aura_Timer -= diff; - - if (Shadowbolt_Timer <= diff) - { - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - { - if (pTarget) - pTarget = me->getVictim(); - - DoCast(pTarget, SPELL_SHADOW_BOLT); - Shadowbolt_Timer = 4000+rand()%2500; - } - } else Shadowbolt_Timer -= diff; - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_boss_omor_the_unscarredAI(Creature* pCreature) -{ - return new boss_omor_the_unscarredAI (pCreature); -} - -void AddSC_boss_omor_the_unscarred() -{ - Script *newscript; - - newscript = new Script; - newscript->Name = "boss_omor_the_unscarred"; - newscript->GetAI = &GetAI_boss_omor_the_unscarredAI; - newscript->RegisterSelf(); -} - diff --git a/src/server/scripts/Outland/HellfireCitadel/hellfire_ramparts/boss_vazruden_the_herald.cpp b/src/server/scripts/Outland/HellfireCitadel/hellfire_ramparts/boss_vazruden_the_herald.cpp deleted file mode 100644 index 181911f77a4..00000000000 --- a/src/server/scripts/Outland/HellfireCitadel/hellfire_ramparts/boss_vazruden_the_herald.cpp +++ /dev/null @@ -1,467 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -Name: Boss_Vazruden_the_Herald -%Complete: 90 -Comment: -Category: Hellfire Citadel, Hellfire Ramparts -EndScriptData */ - -#include "ScriptedPch.h" - -#define SPELL_FIREBALL DUNGEON_MODE(34653, 36920) -#define SPELL_CONE_OF_FIRE DUNGEON_MODE(30926, 36921) -#define SPELL_SUMMON_LIQUID_FIRE DUNGEON_MODE(23971, 30928) -#define SPELL_BELLOWING_ROAR 39427 -#define SPELL_REVENGE DUNGEON_MODE(19130, 40392) -#define SPELL_KIDNEY_SHOT 30621 -#define SPELL_FIRE_NOVA_VISUAL 19823 - -#define ENTRY_HELLFIRE_SENTRY 17517 -#define ENTRY_VAZRUDEN_HERALD 17307 -#define ENTRY_VAZRUDEN 17537 -#define ENTRY_NAZAN 17536 -#define ENTRY_LIQUID_FIRE 22515 -#define ENTRY_REINFORCED_FEL_IRON_CHEST DUNGEON_MODE(185168, 185169) - -#define SAY_INTRO -1543017 -#define SAY_WIPE -1543018 -#define SAY_AGGRO_1 -1543019 -#define SAY_AGGRO_2 -1543020 -#define SAY_AGGRO_3 -1543021 -#define SAY_KILL_1 -1543022 -#define SAY_KILL_2 -1543023 -#define SAY_DIE -1543024 -#define EMOTE -1543025 - -#define PATH_ENTRY 2081 - -const float VazrudenMiddle[3] = {-1406.5, 1746.5, 81.2}; -const float VazrudenRing[2][3] = -{ - {-1430, 1705, 112}, - {-1377, 1760, 112} -}; - -struct boss_nazanAI : public ScriptedAI -{ - boss_nazanAI(Creature *c) : ScriptedAI(c) - { - VazrudenGUID = 0; - flight = true; - } - - uint32 Fireball_Timer; - uint32 ConeOfFire_Timer; - uint32 BellowingRoar_Timer; - uint32 Fly_Timer; - uint32 Turn_Timer; - uint32 UnsummonCheck; - bool flight; - uint64 VazrudenGUID; - SpellEntry *liquid_fire; - - void Reset() - { - Fireball_Timer = 4000; - Fly_Timer = 45000; - Turn_Timer = 0; - UnsummonCheck = 5000; - } - - void EnterCombat(Unit* /*who*/) {} - - void JustSummoned(Creature *summoned) - { - if (summoned && summoned->GetEntry() == ENTRY_LIQUID_FIRE) - { - summoned->SetLevel(me->getLevel()); - summoned->setFaction(me->getFaction()); - summoned->CastSpell(summoned,SPELL_SUMMON_LIQUID_FIRE,true); - summoned->CastSpell(summoned,SPELL_FIRE_NOVA_VISUAL,true); - } - } - - void SpellHitTarget(Unit *pTarget, const SpellEntry* entry) - { - if (pTarget && entry->Id == uint32(SPELL_FIREBALL)) - me->SummonCreature(ENTRY_LIQUID_FIRE,pTarget->GetPositionX(),pTarget->GetPositionY(),pTarget->GetPositionZ(),pTarget->GetOrientation(),TEMPSUMMON_TIMED_DESPAWN,30000); - } - - void UpdateAI(const uint32 diff) - { - if (!UpdateVictim()) - { - if (UnsummonCheck < diff && me->isAlive()) - me->DisappearAndDie(); - else - UnsummonCheck -= diff; - return; - } - - if (Fireball_Timer <= diff) - { - if (Unit *victim = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(victim, SPELL_FIREBALL, true); - Fireball_Timer = urand(4000,7000); - } else Fireball_Timer -= diff; - - if (flight) // phase 1 - the flight - { - Creature *Vazruden = Unit::GetCreature(*me,VazrudenGUID); - if (Fly_Timer < diff || !(Vazruden && Vazruden->isAlive() && (Vazruden->GetHealth()*5 > Vazruden->GetMaxHealth()))) - { - flight = false; - BellowingRoar_Timer = 6000; - ConeOfFire_Timer = 12000; - me->RemoveUnitMovementFlag(MOVEMENTFLAG_LEVITATING); - me->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE); - me->GetMotionMaster()->Clear(); - if (Unit *victim = SelectUnit(SELECT_TARGET_NEAREST,0)) - me->AI()->AttackStart(victim); - DoStartMovement(me->getVictim()); - DoScriptText(EMOTE, me); - return; - } else Fly_Timer -= diff; - - if (Turn_Timer <= diff) - { - uint32 waypoint = (Fly_Timer/10000)%2; - if (me->IsWithinDist3d(VazrudenRing[waypoint][0],VazrudenRing[waypoint][1],VazrudenRing[waypoint][2], 5)) - me->GetMotionMaster()->MovePoint(0,VazrudenRing[waypoint][0],VazrudenRing[waypoint][1],VazrudenRing[waypoint][2]); - Turn_Timer = 10000; - } else Turn_Timer -= diff; - } - else // phase 2 - land fight - { - if (ConeOfFire_Timer <= diff) - { - DoCast(me, SPELL_CONE_OF_FIRE); - ConeOfFire_Timer = 12000; - Fireball_Timer = 4000; - } else ConeOfFire_Timer -= diff; - - if (IsHeroic()) - if (BellowingRoar_Timer <= diff) - { - DoCast(me, SPELL_BELLOWING_ROAR); - BellowingRoar_Timer = 45000; - } else BellowingRoar_Timer -= diff; - - DoMeleeAttackIfReady(); - } - } -}; - -struct boss_vazrudenAI : public ScriptedAI -{ - boss_vazrudenAI(Creature *c) : ScriptedAI(c) - { - } - - uint32 Revenge_Timer; - bool WipeSaid; - uint32 UnsummonCheck; - - void Reset() - { - Revenge_Timer = 4000; - UnsummonCheck = 2000; - WipeSaid = false; - } - - void EnterCombat(Unit * /*who*/) - { - DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); - } - - void KilledUnit(Unit* who) - { - if (who && who->GetEntry() != ENTRY_VAZRUDEN) - DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2), me); - } - - void JustDied(Unit* who) - { - if (who && who != me) - DoScriptText(SAY_DIE, me); - } - - void UpdateAI(const uint32 diff) - { - if (!UpdateVictim()) - { - if (UnsummonCheck < diff && me->isAlive()) - { - if (!WipeSaid) - { - DoScriptText(SAY_WIPE, me); - WipeSaid = true; - } - me->DisappearAndDie(); - } else UnsummonCheck -= diff; - return; - } - - if (Revenge_Timer <= diff) - { - if (Unit *victim = me->getVictim()) - DoCast(victim, SPELL_REVENGE); - Revenge_Timer = 5000; - } else Revenge_Timer -= diff; - - DoMeleeAttackIfReady(); - } -}; - -struct boss_vazruden_the_heraldAI : public ScriptedAI -{ - boss_vazruden_the_heraldAI(Creature *c) : ScriptedAI(c) - { - summoned = false; - sentryDown = false; - NazanGUID = 0; - VazrudenGUID = 0; - } - - uint32 phase; - uint32 waypoint; - uint32 check; - bool sentryDown; - uint64 NazanGUID; - uint64 VazrudenGUID; - bool summoned; - - void Reset() - { - phase = 0; - waypoint = 0; - check = 0; - UnsummonAdds(); - me->GetMotionMaster()->MovePath(PATH_ENTRY, true); - } - - void UnsummonAdds() - { - if (summoned) - { - Creature *Nazan = Unit::GetCreature(*me, NazanGUID); - if (!Nazan) - Nazan = me->FindNearestCreature(ENTRY_NAZAN, 5000); - if (Nazan) - { - Nazan->DisappearAndDie(); - NazanGUID = 0; - } - - Creature *Vazruden = Unit::GetCreature(*me, VazrudenGUID); - if (!Vazruden) - Vazruden = me->FindNearestCreature(ENTRY_VAZRUDEN, 5000); - if (Vazruden) - { - Vazruden->DisappearAndDie(); - VazrudenGUID = 0; - } - summoned = false; - me->clearUnitState(UNIT_STAT_ROOT); - me->SetVisibility(VISIBILITY_ON); - } - } - - void SummonAdds() - { - if (!summoned) - { - if (Creature* Vazruden = me->SummonCreature(ENTRY_VAZRUDEN,VazrudenMiddle[0],VazrudenMiddle[1],VazrudenMiddle[2],0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,6000000)) - VazrudenGUID = Vazruden->GetGUID(); - if (Creature* Nazan = me->SummonCreature(ENTRY_NAZAN,VazrudenMiddle[0],VazrudenMiddle[1],VazrudenMiddle[2],0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,6000000)) - NazanGUID = Nazan->GetGUID(); - summoned = true; - me->SetVisibility(VISIBILITY_OFF); - me->addUnitState(UNIT_STAT_ROOT); - } - } - - void EnterCombat(Unit * /*who*/) - { - if (phase == 0) - { - phase = 1; - check = 0; - DoScriptText(SAY_INTRO, me); - } - } - - void JustSummoned(Creature *summoned) - { - if (!summoned) return; - Unit *victim = me->getVictim(); - if (summoned->GetEntry() == ENTRY_NAZAN) - { - CAST_AI(boss_nazanAI, summoned->AI())->VazrudenGUID = VazrudenGUID; - summoned->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); - summoned->SetSpeed(MOVE_FLIGHT, 2.5); - if (victim) - AttackStartNoMove(victim); - } - else if (victim) - summoned->AI()->AttackStart(victim); - } - - void SentryDownBy(Unit* killer) - { - if (sentryDown) - { - AttackStartNoMove(killer); - sentryDown = false; - } - else - sentryDown = true; - } - - void UpdateAI(const uint32 diff) - { - switch(phase) - { - case 0: // circle around the platform - return; - break; - case 1: // go to the middle and begin the fight - if (check <= diff) - { - if (!me->IsWithinDist3d(VazrudenMiddle[0],VazrudenMiddle[1],VazrudenMiddle[2],5)) - { - me->GetMotionMaster()->Clear(); - me->GetMotionMaster()->MovePoint(0,VazrudenMiddle[0],VazrudenMiddle[1],VazrudenMiddle[2]); - check = 1000; - } - else - { - SummonAdds(); - phase = 2; - return; - } - } else check -= diff; - break; - default: // adds do the job now - if (check <= diff) - { - Creature *Nazan = Unit::GetCreature(*me, NazanGUID); - Creature *Vazruden = Unit::GetCreature(*me, VazrudenGUID); - if (Nazan && Nazan->isAlive() || Vazruden && Vazruden->isAlive()) - { - if (Nazan && Nazan->getVictim() || Vazruden && Vazruden->getVictim()) - return; - else - { - UnsummonAdds(); - EnterEvadeMode(); - return; - } - } - else - { - me->SummonGameObject(ENTRY_REINFORCED_FEL_IRON_CHEST,VazrudenMiddle[0],VazrudenMiddle[1],VazrudenMiddle[2],0,0,0,0,0,0); - me->SetLootRecipient(NULL); // don't think this is necessary.. - me->Kill(me); - } - check = 2000; - } else check -= diff; - break; - } - } -}; - -struct mob_hellfire_sentryAI : public ScriptedAI -{ - mob_hellfire_sentryAI(Creature *c) : ScriptedAI(c) {} - - uint32 KidneyShot_Timer; - - void Reset() - { - KidneyShot_Timer = urand(3000,7000); - } - - void EnterCombat(Unit* /*who*/) {} - - void JustDied(Unit* who) - { - if (Creature *herald = me->FindNearestCreature(ENTRY_VAZRUDEN_HERALD,150)) - CAST_AI(boss_vazruden_the_heraldAI, herald->AI())->SentryDownBy(who); - } - - void UpdateAI(const uint32 diff) - { - if (!UpdateVictim()) - return; - - if (KidneyShot_Timer <= diff) - { - if (Unit *victim = me->getVictim()) - DoCast(victim, SPELL_KIDNEY_SHOT); - KidneyShot_Timer = 20000; - } else KidneyShot_Timer -= diff; - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_boss_vazruden_the_herald(Creature* pCreature) -{ - return new boss_vazruden_the_heraldAI (pCreature); -} - -CreatureAI* GetAI_boss_vazruden(Creature* pCreature) -{ - return new boss_vazrudenAI (pCreature); -} - -CreatureAI* GetAI_boss_nazan(Creature* pCreature) -{ - return new boss_nazanAI (pCreature); -} - -CreatureAI* GetAI_mob_hellfire_sentry(Creature* pCreature) -{ - return new mob_hellfire_sentryAI (pCreature); -} - -void AddSC_boss_vazruden_the_herald() -{ - Script *newscript; - newscript = new Script; - newscript->Name = "boss_vazruden_the_herald"; - newscript->GetAI = &GetAI_boss_vazruden_the_herald; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "boss_vazruden"; - newscript->GetAI = &GetAI_boss_vazruden; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "boss_nazan"; - newscript->GetAI = &GetAI_boss_nazan; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_hellfire_sentry"; - newscript->GetAI = &GetAI_mob_hellfire_sentry; - newscript->RegisterSelf(); -} - diff --git a/src/server/scripts/Outland/HellfireCitadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp b/src/server/scripts/Outland/HellfireCitadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp deleted file mode 100644 index f0e813d3890..00000000000 --- a/src/server/scripts/Outland/HellfireCitadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp +++ /dev/null @@ -1,156 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: Boss_Watchkeeper_Gargolmar -SD%Complete: 80 -SDComment: Missing adds to heal him. Surge should be used on pTarget furthest away, not random. -SDCategory: Hellfire Citadel, Hellfire Ramparts -EndScriptData */ - -#include "ScriptedPch.h" - -#define SAY_TAUNT -1543000 -#define SAY_HEAL -1543001 -#define SAY_SURGE -1543002 -#define SAY_AGGRO_1 -1543003 -#define SAY_AGGRO_2 -1543004 -#define SAY_AGGRO_3 -1543005 -#define SAY_KILL_1 -1543006 -#define SAY_KILL_2 -1543007 -#define SAY_DIE -1543008 - -#define SPELL_MORTAL_WOUND 30641 -#define H_SPELL_MORTAL_WOUND 36814 -#define SPELL_SURGE 34645 -#define SPELL_RETALIATION 22857 - -struct boss_watchkeeper_gargolmarAI : public ScriptedAI -{ - boss_watchkeeper_gargolmarAI(Creature *c) : ScriptedAI(c) - { - } - - uint32 Surge_Timer; - uint32 MortalWound_Timer; - uint32 Retaliation_Timer; - - bool HasTaunted; - bool YelledForHeal; - - void Reset() - { - Surge_Timer = 5000; - MortalWound_Timer = 4000; - Retaliation_Timer = 0; - - HasTaunted = false; - YelledForHeal = false; - } - - void EnterCombat(Unit * /*who*/) - { - DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); - } - - void MoveInLineOfSight(Unit* who) - { - if (!me->getVictim() && who->isTargetableForAttack() && (me->IsHostileTo(who)) && who->isInAccessiblePlaceFor(me)) - { - if (!me->canFly() && me->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) - return; - - float attackRadius = me->GetAttackDistance(who); - if (me->IsWithinDistInMap(who, attackRadius) && me->IsWithinLOSInMap(who)) - { - //who->RemoveSpellsCausingAura(SPELL_AURA_MOD_STEALTH); - AttackStart(who); - } - else if (!HasTaunted && me->IsWithinDistInMap(who, 60.0f)) - { - DoScriptText(SAY_TAUNT, me); - HasTaunted = true; - } - } - } - - void KilledUnit(Unit* /*victim*/) - { - DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2), me); - } - - void JustDied(Unit* /*Killer*/) - { - DoScriptText(SAY_DIE, me); - } - - void UpdateAI(const uint32 diff) - { - if (!UpdateVictim()) - return; - - if (MortalWound_Timer <= diff) - { - DoCast(me->getVictim(), SPELL_MORTAL_WOUND); - MortalWound_Timer = 5000+rand()%8000; - } else MortalWound_Timer -= diff; - - if (Surge_Timer <= diff) - { - DoScriptText(SAY_SURGE, me); - - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget, SPELL_SURGE); - - Surge_Timer = 5000+rand()%8000; - } else Surge_Timer -= diff; - - if ((me->GetHealth()*100) / me->GetMaxHealth() < 20) - { - if (Retaliation_Timer <= diff) - { - DoCast(me, SPELL_RETALIATION); - Retaliation_Timer = 30000; - } else Retaliation_Timer -= diff; - } - - if (!YelledForHeal) - { - if ((me->GetHealth()*100) / me->GetMaxHealth() < 40) - { - DoScriptText(SAY_HEAL, me); - YelledForHeal = true; - } - } - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_boss_watchkeeper_gargolmarAI(Creature* pCreature) -{ - return new boss_watchkeeper_gargolmarAI (pCreature); -} - -void AddSC_boss_watchkeeper_gargolmar() -{ - Script *newscript; - newscript = new Script; - newscript->Name = "boss_watchkeeper_gargolmar"; - newscript->GetAI = &GetAI_boss_watchkeeper_gargolmarAI; - newscript->RegisterSelf(); -} - diff --git a/src/server/scripts/Outland/HellfireCitadel/hellfire_ramparts/hellfire_ramparts.h b/src/server/scripts/Outland/HellfireCitadel/hellfire_ramparts/hellfire_ramparts.h deleted file mode 100644 index 599aa237774..00000000000 --- a/src/server/scripts/Outland/HellfireCitadel/hellfire_ramparts/hellfire_ramparts.h +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software licensed under GPL version 2 - * Please see the included DOCS/LICENSE.TXT for more information */ - -#ifndef DEF_RAMPARTS_H -#define DEF_RAMPARTS_H - -#define MAX_ENCOUNTER 2 - -enum eTypes -{ - TYPE_VAZRUDEN = 1, - TYPE_NAZAN = 2 -}; - -#endif diff --git a/src/server/scripts/Outland/HellfireCitadel/hellfire_ramparts/instance_hellfire_ramparts.cpp b/src/server/scripts/Outland/HellfireCitadel/hellfire_ramparts/instance_hellfire_ramparts.cpp deleted file mode 100644 index 29c58675e9c..00000000000 --- a/src/server/scripts/Outland/HellfireCitadel/hellfire_ramparts/instance_hellfire_ramparts.cpp +++ /dev/null @@ -1,84 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: Instance_Hellfire_Ramparts -SD%Complete: 50 -SDComment: -SDCategory: Hellfire Ramparts -EndScriptData */ - -#include "ScriptedPch.h" -#include "hellfire_ramparts.h" - -struct instance_ramparts : public ScriptedInstance -{ - instance_ramparts(Map* pMap) : ScriptedInstance(pMap) {Initialize();} - - uint32 m_auiEncounter[MAX_ENCOUNTER]; - uint64 m_uiChestNGUID; - uint64 m_uiChestHGUID; - - void Initialize() - { - memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); - - m_uiChestNGUID = 0; - m_uiChestHGUID = 0; - } - - void OnGameObjectCreate(GameObject* pGo, bool /*add*/) - { - switch(pGo->GetEntry()) - { - case 185168: m_uiChestNGUID = pGo->GetGUID(); break; - case 185169: m_uiChestHGUID = pGo->GetGUID(); break; - } - } - - void SetData(uint32 uiType, uint32 uiData) - { - debug_log("TSCR: Instance Ramparts: SetData received for type %u with data %u",uiType,uiData); - - switch(uiType) - { - case TYPE_VAZRUDEN: - if (uiData == DONE && m_auiEncounter[1] == DONE) - DoRespawnGameObject(instance->IsHeroic() ? m_uiChestHGUID : m_uiChestNGUID, HOUR*IN_MILISECONDS); - m_auiEncounter[0] = uiData; - break; - case TYPE_NAZAN: - if (uiData == DONE && m_auiEncounter[0] == DONE) - DoRespawnGameObject(instance->IsHeroic() ? m_uiChestHGUID : m_uiChestNGUID, HOUR*IN_MILISECONDS); - m_auiEncounter[1] = uiData; - break; - } - } -}; - -InstanceData* GetInstanceData_instance_ramparts(Map* pMap) -{ - return new instance_ramparts(pMap); -} - -void AddSC_instance_ramparts() -{ - Script* pNewScript; - pNewScript = new Script; - pNewScript->Name = "instance_ramparts"; - pNewScript->GetInstanceData = &GetInstanceData_instance_ramparts; - pNewScript->RegisterSelf(); -} diff --git a/src/server/scripts/Outland/HellfireCitadel/magtheridons_lair/boss_magtheridon.cpp b/src/server/scripts/Outland/HellfireCitadel/magtheridons_lair/boss_magtheridon.cpp deleted file mode 100644 index 5fb381f4065..00000000000 --- a/src/server/scripts/Outland/HellfireCitadel/magtheridons_lair/boss_magtheridon.cpp +++ /dev/null @@ -1,570 +0,0 @@ -/* Copyright(C) 2006 - 2008 ScriptDev2 -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -*(at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ - -/* ScriptData -SDName: Boss_Magtheridon -SD%Complete: 60 -SDComment: In Development -SDCategory: Hellfire Citadel, Magtheridon's lair -EndScriptData */ - -#include "ScriptedPch.h" -#include "magtheridons_lair.h" - -struct Yell -{ - int32 id; -}; - -static Yell RandomTaunt[]= -{ - {-1544000}, - {-1544001}, - {-1544002}, - {-1544003}, - {-1544004}, - {-1544005}, -}; - -#define SAY_FREED -1544006 -#define SAY_AGGRO -1544007 -#define SAY_BANISH -1544008 -#define SAY_CHAMBER_DESTROY -1544009 -#define SAY_PLAYER_KILLED -1544010 -#define SAY_DEATH -1544011 - -#define EMOTE_BERSERK -1544012 -#define EMOTE_BLASTNOVA -1544013 -#define EMOTE_BEGIN -1544014 - -#define MOB_MAGTHERIDON 17257 -#define MOB_ROOM 17516 -#define MOB_CHANNELLER 17256 -#define MOB_ABYSSAL 17454 - -#define SPELL_BLASTNOVA 30616 -#define SPELL_CLEAVE 30619 -#define SPELL_QUAKE_TRIGGER 30657 // must be cast with 30561 as the proc spell -#define SPELL_QUAKE_KNOCKBACK 30571 -#define SPELL_BLAZE_TARGET 30541 // core bug, does not support target 7 -#define SPELL_BLAZE_TRAP 30542 -#define SPELL_DEBRIS_KNOCKDOWN 36449 -#define SPELL_DEBRIS_VISUAL 30632 -#define SPELL_DEBRIS_DAMAGE 30631 // core bug, does not support target 8 -#define SPELL_CAMERA_SHAKE 36455 -#define SPELL_BERSERK 27680 - -#define SPELL_SHADOW_CAGE 30168 -#define SPELL_SHADOW_GRASP 30410 -#define SPELL_SHADOW_GRASP_VISUAL 30166 -#define SPELL_MIND_EXHAUSTION 44032 //Casted by the cubes when channeling ends - -#define SPELL_SHADOW_CAGE_C 30205 -#define SPELL_SHADOW_GRASP_C 30207 - -#define SPELL_SHADOW_BOLT_VOLLEY 30510 -#define SPELL_DARK_MENDING 30528 -#define SPELL_FEAR 30530 //39176 -#define SPELL_BURNING_ABYSSAL 30511 -#define SPELL_SOUL_TRANSFER 30531 // core bug, does not support target 7 - -#define SPELL_FIRE_BLAST 37110 - -// count of clickers needed to interrupt blast nova -#define CLICKERS_COUNT 5 - -typedef std::map CubeMap; - -struct mob_abyssalAI : public ScriptedAI -{ - mob_abyssalAI(Creature *c) : ScriptedAI(c) - { - trigger = 0; - Despawn_Timer = 60000; - } - - uint32 FireBlast_Timer; - uint32 Despawn_Timer; - uint32 trigger; - - void Reset() - { - FireBlast_Timer = 6000; - } - - void SpellHit(Unit*, const SpellEntry *spell) - { - if (trigger == 2 && spell->Id == SPELL_BLAZE_TARGET) - { - DoCast(me, SPELL_BLAZE_TRAP, true); - me->SetVisibility(VISIBILITY_OFF); - Despawn_Timer = 130000; - } - } - - void SetTrigger(uint32 _trigger) - { - trigger = _trigger; - me->SetDisplayId(11686); - if (trigger == 1) //debris - { - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - DoCast(me, SPELL_DEBRIS_VISUAL, true); - FireBlast_Timer = 5000; - Despawn_Timer = 10000; - } - } - - void EnterCombat(Unit* /*who*/) {DoZoneInCombat();} - void AttackStart(Unit *who) {if (!trigger) ScriptedAI::AttackStart(who);} - void MoveInLineOfSight(Unit *who) {if (!trigger) ScriptedAI::MoveInLineOfSight(who);} - - void UpdateAI(const uint32 diff) - { - if (trigger) - { - if (trigger == 1) - { - if (FireBlast_Timer <= diff) - { - DoCast(me, SPELL_DEBRIS_DAMAGE, true); - trigger = 3; - } else FireBlast_Timer -= diff; - } - return; - } - - if (Despawn_Timer <= diff) - { - me->ForcedDespawn(); - } else Despawn_Timer -= diff; - - if (!UpdateVictim()) - return; - - if (FireBlast_Timer <= diff) - { - DoCast(me->getVictim(), SPELL_FIRE_BLAST); - FireBlast_Timer = 5000+rand()%10000; - } else FireBlast_Timer -= diff; - - DoMeleeAttackIfReady(); - } -}; - -struct boss_magtheridonAI : public ScriptedAI -{ - boss_magtheridonAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - me->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, 10); - me->SetFloatValue(UNIT_FIELD_COMBATREACH, 10); - - // target 7, random target with certain entry spell, need core fix - SpellEntry *TempSpell; - TempSpell = GET_SPELL(SPELL_BLAZE_TARGET); - if (TempSpell && TempSpell->EffectImplicitTargetA[0] != 6) - { - TempSpell->EffectImplicitTargetA[0] = 6; - TempSpell->EffectImplicitTargetB[0] = 0; - } - TempSpell = GET_SPELL(SPELL_QUAKE_TRIGGER); - if (TempSpell && TempSpell->EffectTriggerSpell[0] != SPELL_QUAKE_KNOCKBACK) - { - TempSpell->EffectTriggerSpell[0] = SPELL_QUAKE_KNOCKBACK; - } - } - - CubeMap Cube; - - ScriptedInstance* pInstance; - - uint32 Berserk_Timer; - uint32 Quake_Timer; - uint32 Cleave_Timer; - uint32 BlastNova_Timer; - uint32 Blaze_Timer; - uint32 Debris_Timer; - uint32 RandChat_Timer; - - bool Phase3; - bool NeedCheckCube; - - void Reset() - { - Berserk_Timer = 1320000; - Quake_Timer = 40000; - Debris_Timer = 10000; - Blaze_Timer = 10000+rand()%20000; - BlastNova_Timer = 60000; - Cleave_Timer = 15000; - RandChat_Timer = 90000; - - Phase3 = false; - NeedCheckCube = false; - - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); - me->addUnitState(UNIT_STAT_STUNNED); - DoCast(me, SPELL_SHADOW_CAGE_C, true); - } - - void JustReachedHome() - { - if (pInstance) - { - pInstance->SetData(DATA_MAGTHERIDON_EVENT, NOT_STARTED); - pInstance->SetData(DATA_COLLAPSE, false); - } - } - - void SetClicker(uint64 cubeGUID, uint64 clickerGUID) - { - // to avoid multiclicks from 1 cube - if (uint64 guid = Cube[cubeGUID]) - DebuffClicker(Unit::GetUnit(*me, guid)); - Cube[cubeGUID] = clickerGUID; - NeedCheckCube = true; - } - - //function to interrupt channeling and debuff clicker with mind exh(used if second person clicks with same cube or after dispeling/ending shadow grasp DoT) - void DebuffClicker(Unit *clicker) - { - if (!clicker || !clicker->isAlive()) - return; - - clicker->RemoveAurasDueToSpell(SPELL_SHADOW_GRASP); // cannot interrupt triggered spells - clicker->InterruptNonMeleeSpells(false); - clicker->CastSpell(clicker, SPELL_MIND_EXHAUSTION, true); - } - - void NeedCheckCubeStatus() - { - uint32 ClickerNum = 0; - // now checking if every clicker has debuff from manticron(it is dispelable atm rev 6110 : S) - // if not - apply mind exhaustion and delete from clicker's list - for (CubeMap::iterator i = Cube.begin(); i != Cube.end(); ++i) - { - Unit *clicker = Unit::GetUnit(*me, (*i).second); - if (!clicker || !clicker->HasAura(SPELL_SHADOW_GRASP)) - { - DebuffClicker(clicker); - (*i).second = 0; - } else ++ClickerNum; - } - - // if 5 clickers from other cubes apply shadow cage - if (ClickerNum >= CLICKERS_COUNT && !me->HasAura(SPELL_SHADOW_CAGE)) - { - DoScriptText(SAY_BANISH, me); - DoCast(me, SPELL_SHADOW_CAGE, true); - } - else if (ClickerNum < CLICKERS_COUNT && me->HasAura(SPELL_SHADOW_CAGE)) - me->RemoveAurasDueToSpell(SPELL_SHADOW_CAGE); - - if (!ClickerNum) NeedCheckCube = false; - } - - void KilledUnit(Unit* /*victim*/) - { - DoScriptText(SAY_PLAYER_KILLED, me); - } - - void JustDied(Unit* /*Killer*/) - { - if (pInstance) - pInstance->SetData(DATA_MAGTHERIDON_EVENT, DONE); - - DoScriptText(SAY_DEATH, me); - } - - void MoveInLineOfSight(Unit* /*who*/) {} - - void AttackStart(Unit *who) - { - if (!me->hasUnitState(UNIT_STAT_STUNNED)) - ScriptedAI::AttackStart(who); - } - - void EnterCombat(Unit * /*who*/) - { - if (pInstance) - pInstance->SetData(DATA_MAGTHERIDON_EVENT, IN_PROGRESS); - DoZoneInCombat(); - - me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - me->RemoveAurasDueToSpell(SPELL_SHADOW_CAGE_C); - - DoScriptText(SAY_FREED, me); - } - - void UpdateAI(const uint32 diff) - { - if (!me->isInCombat()) - { - if (RandChat_Timer <= diff) - { - DoScriptText(RandomTaunt[rand()%6].id, me); - RandChat_Timer = 90000; - } else RandChat_Timer -= diff; - } - - if (!UpdateVictim()) - return; - - if (NeedCheckCube) NeedCheckCubeStatus(); - - if (Berserk_Timer <= diff) - { - DoCast(me, SPELL_BERSERK, true); - DoScriptText(EMOTE_BERSERK, me); - Berserk_Timer = 60000; - } else Berserk_Timer -= diff; - - if (Cleave_Timer <= diff) - { - DoCast(me->getVictim(), SPELL_CLEAVE); - Cleave_Timer = 10000; - } else Cleave_Timer -= diff; - - if (BlastNova_Timer <= diff) - { - // to avoid earthquake interruption - if (!me->hasUnitState(UNIT_STAT_STUNNED)) - { - DoScriptText(EMOTE_BLASTNOVA, me); - DoCast(me, SPELL_BLASTNOVA); - BlastNova_Timer = 60000; - } - } else BlastNova_Timer -= diff; - - if (Quake_Timer <= diff) - { - // to avoid blastnova interruption - if (!me->IsNonMeleeSpellCasted(false)) - { - DoCast(me, SPELL_QUAKE_TRIGGER, true); - Quake_Timer = 50000; - } - } else Quake_Timer -= diff; - - if (Blaze_Timer <= diff) - { - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - { - float x, y, z; - pTarget->GetPosition(x, y, z); - Creature *summon = me->SummonCreature(MOB_ABYSSAL, x, y, z, 0, TEMPSUMMON_CORPSE_DESPAWN, 0); - if (summon) - { - CAST_AI(mob_abyssalAI, summon->AI())->SetTrigger(2); - DoCast(summon, SPELL_BLAZE_TARGET, true); - summon->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - } - } - Blaze_Timer = 20000 + rand()%20000; - } else Blaze_Timer -= diff; - - if (!Phase3 && me->GetHealth()*10 < me->GetMaxHealth()*3 - && !me->IsNonMeleeSpellCasted(false) // blast nova - && !me->hasUnitState(UNIT_STAT_STUNNED)) // shadow cage and earthquake - { - Phase3 = true; - DoScriptText(SAY_CHAMBER_DESTROY, me); - DoCast(me, SPELL_CAMERA_SHAKE, true); - DoCast(me, SPELL_DEBRIS_KNOCKDOWN, true); - - if (pInstance) - pInstance->SetData(DATA_COLLAPSE, true); - } - - if (Phase3) - { - if (Debris_Timer <= diff) - { - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - { - float x, y, z; - pTarget->GetPosition(x, y, z); - Creature *summon = me->SummonCreature(MOB_ABYSSAL, x, y, z, 0, TEMPSUMMON_CORPSE_DESPAWN, 0); - if (summon) CAST_AI(mob_abyssalAI, summon->AI())->SetTrigger(1); - } - Debris_Timer = 10000; - } else Debris_Timer -= diff; - } - - DoMeleeAttackIfReady(); - } -}; - -struct mob_hellfire_channelerAI : public ScriptedAI -{ - mob_hellfire_channelerAI(Creature *c) : ScriptedAI(c) - { - pInstance =me->GetInstanceData(); - } - - ScriptedInstance* pInstance; - - uint32 ShadowBoltVolley_Timer; - uint32 DarkMending_Timer; - uint32 Fear_Timer; - uint32 Infernal_Timer; - - uint32 Check_Timer; - - void Reset() - { - ShadowBoltVolley_Timer = 8000 + rand()%2000; - DarkMending_Timer = 10000; - Fear_Timer = 15000 + rand()%5000; - Infernal_Timer = 10000 + rand()%40000; - - Check_Timer = 5000; - } - - void EnterCombat(Unit * /*who*/) - { - if (pInstance) - pInstance->SetData(DATA_CHANNELER_EVENT, IN_PROGRESS); - - me->InterruptNonMeleeSpells(false); - DoZoneInCombat(); - } - - void JustReachedHome() - { - if (pInstance) - pInstance->SetData(DATA_CHANNELER_EVENT, NOT_STARTED); - - DoCast(me, SPELL_SHADOW_GRASP_C, false); - } - - void JustSummoned(Creature *summon) - { - summon->AI()->AttackStart(me->getVictim()); - } - - void DamageTaken(Unit*, uint32 &damage) - { - if (damage >= me->GetHealth()) - DoCast(me, SPELL_SOUL_TRANSFER, true); - } - - void JustDied(Unit* /*who*/) - { - if (pInstance) - pInstance->SetData(DATA_CHANNELER_EVENT, DONE); - } - - void UpdateAI(const uint32 diff) - { - if (!UpdateVictim()) - return; - - if (ShadowBoltVolley_Timer <= diff) - { - DoCast(me, SPELL_SHADOW_BOLT_VOLLEY); - ShadowBoltVolley_Timer = 10000 + rand()%10000; - } else ShadowBoltVolley_Timer -= diff; - - if (DarkMending_Timer <= diff) - { - if ((me->GetHealth()*100 / me->GetMaxHealth()) < 50) - DoCast(me, SPELL_DARK_MENDING); - DarkMending_Timer = 10000 +(rand() % 10000); - } else DarkMending_Timer -= diff; - - if (Fear_Timer <= diff) - { - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 1)) - DoCast(pTarget, SPELL_FEAR); - Fear_Timer = 25000 + rand()%15000; - } else Fear_Timer -= diff; - - if (Infernal_Timer <= diff) - { - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_BURNING_ABYSSAL, true); - Infernal_Timer = 30000 + rand()%10000; - } else Infernal_Timer -= diff; - - DoMeleeAttackIfReady(); - } -}; - -//Manticron Cube -bool GOHello_go_Manticron_Cube(Player* pPlayer, GameObject* pGo) -{ - ScriptedInstance* pInstance = pGo->GetInstanceData(); - if (!pInstance) - return true; - if (pInstance->GetData(DATA_MAGTHERIDON_EVENT) != IN_PROGRESS) return true; - Creature *Magtheridon =Unit::GetCreature(*pGo, pInstance->GetData64(DATA_MAGTHERIDON)); - if (!Magtheridon || !Magtheridon->isAlive()) return true; - - // if exhausted or already channeling return - if (pPlayer->HasAura(SPELL_MIND_EXHAUSTION) || pPlayer->HasAura(SPELL_SHADOW_GRASP)) - return true; - - pPlayer->InterruptNonMeleeSpells(false); - pPlayer->CastSpell(pPlayer, SPELL_SHADOW_GRASP, true); - pPlayer->CastSpell(pPlayer, SPELL_SHADOW_GRASP_VISUAL, false); - CAST_AI(boss_magtheridonAI, Magtheridon->AI())->SetClicker(pGo->GetGUID(), pPlayer->GetGUID()); - return true; -} - -CreatureAI* GetAI_boss_magtheridon(Creature* pCreature) -{ - return new boss_magtheridonAI(pCreature); -} - -CreatureAI* GetAI_mob_hellfire_channeler(Creature* pCreature) -{ - return new mob_hellfire_channelerAI(pCreature); -} - -CreatureAI* GetAI_mob_abyssalAI(Creature* pCreature) -{ - return new mob_abyssalAI(pCreature); -} - -void AddSC_boss_magtheridon() -{ - Script *newscript; - newscript = new Script; - newscript->Name = "boss_magtheridon"; - newscript->GetAI = &GetAI_boss_magtheridon; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_hellfire_channeler"; - newscript->GetAI = &GetAI_mob_hellfire_channeler; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "go_manticron_cube"; - newscript->pGOHello = &GOHello_go_Manticron_Cube; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_abyssal"; - newscript->GetAI = &GetAI_mob_abyssalAI; - newscript->RegisterSelf(); - -} - diff --git a/src/server/scripts/Outland/HellfireCitadel/magtheridons_lair/instance_magtheridons_lair.cpp b/src/server/scripts/Outland/HellfireCitadel/magtheridons_lair/instance_magtheridons_lair.cpp deleted file mode 100644 index d5b459a1fa1..00000000000 --- a/src/server/scripts/Outland/HellfireCitadel/magtheridons_lair/instance_magtheridons_lair.cpp +++ /dev/null @@ -1,254 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: Instance_Magtheridons_Lair -SD%Complete: 100 -SDComment: -SDCategory: Hellfire Citadel, Magtheridon's lair -EndScriptData */ - -#include "ScriptedPch.h" -#include "magtheridons_lair.h" - -#define SPELL_SOUL_TRANSFER 30531 // core bug, does not support target 7 -#define SPELL_BLAZE_TARGET 30541 // core bug, does not support target 7 - -#define CHAMBER_CENTER_X -15.14 -#define CHAMBER_CENTER_Y 1.8 -#define CHAMBER_CENTER_Z -0.4 - -#define MAX_ENCOUNTER 2 - -#define EMOTE_BONDS_WEAKEN "'s bonds begin to weaken!" - -struct instance_magtheridons_lair : public ScriptedInstance -{ - instance_magtheridons_lair(Map* pMap) : ScriptedInstance(pMap) - { - Initialize(); - } - - uint32 m_auiEncounter[MAX_ENCOUNTER]; - - uint64 MagtheridonGUID; - std::set ChannelerGUID; - uint64 DoorGUID; - std::set ColumnGUID; - - uint32 CageTimer; - uint32 RespawnTimer; - - void Initialize() - { - memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); - - MagtheridonGUID = 0; - ChannelerGUID.clear(); - DoorGUID = 0; - ColumnGUID.clear(); - - CageTimer = 0; - RespawnTimer = 0; - } - - bool IsEncounterInProgress() const - { - for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) - if (m_auiEncounter[i] == IN_PROGRESS) return true; - return false; - } - - void OnCreatureCreate(Creature* pCreature, bool /*add*/) - { - switch(pCreature->GetEntry()) - { - case 17257: - MagtheridonGUID = pCreature->GetGUID(); - break; - case 17256: - ChannelerGUID.insert(pCreature->GetGUID()); - break; - } - } - - void OnGameObjectCreate(GameObject* pGo, bool /*add*/) - { - switch(pGo->GetEntry()) - { - case 181713: - pGo->SetUInt32Value(GAMEOBJECT_FLAGS, 0); - break; - case 183847: - DoorGUID = pGo->GetGUID(); - break; - case 184653: // hall - case 184634: // six columns - case 184635: - case 184636: - case 184637: - case 184638: - case 184639: - ColumnGUID.insert(pGo->GetGUID()); - break; - } - } - - uint64 GetData64(uint32 type) - { - switch(type) - { - case DATA_MAGTHERIDON: - return MagtheridonGUID; - } - return 0; - } - - void SetData(uint32 type, uint32 data) - { - switch(type) - { - case DATA_MAGTHERIDON_EVENT: - m_auiEncounter[0] = data; - if (data == NOT_STARTED) - RespawnTimer = 10000; - if (data != IN_PROGRESS) - HandleGameObject(DoorGUID, true); - break; - case DATA_CHANNELER_EVENT: - switch(data) - { - case NOT_STARTED: // Reset all channelers once one is reset. - if (m_auiEncounter[1] != NOT_STARTED) - { - m_auiEncounter[1] = NOT_STARTED; - for (std::set::const_iterator i = ChannelerGUID.begin(); i != ChannelerGUID.end(); ++i) - { - if (Creature *Channeler = instance->GetCreature(*i)) - { - if (Channeler->isAlive()) - Channeler->AI()->EnterEvadeMode(); - else - Channeler->Respawn(); - } - } - CageTimer = 0; - HandleGameObject(DoorGUID, true); - } - break; - case IN_PROGRESS: // Event start. - if (m_auiEncounter[1] != IN_PROGRESS) - { - m_auiEncounter[1] = IN_PROGRESS; - // Let all five channelers aggro. - for (std::set::const_iterator i = ChannelerGUID.begin(); i != ChannelerGUID.end(); ++i) - { - Creature *Channeler = instance->GetCreature(*i); - if (Channeler && Channeler->isAlive()) - Channeler->AI()->AttackStart(Channeler->SelectNearestTarget(999)); - } - // Release Magtheridon after two minutes. - Creature *Magtheridon = instance->GetCreature(MagtheridonGUID); - if (Magtheridon && Magtheridon->isAlive()) - { - Magtheridon->MonsterTextEmote(EMOTE_BONDS_WEAKEN, 0); - CageTimer = 120000; - } - HandleGameObject(DoorGUID, false); - } - break; - case DONE: // Add buff and check if all channelers are dead. - for (std::set::const_iterator i = ChannelerGUID.begin(); i != ChannelerGUID.end(); ++i) - { - Creature *Channeler = instance->GetCreature(*i); - if (Channeler && Channeler->isAlive()) - { - //Channeler->CastSpell(Channeler, SPELL_SOUL_TRANSFER, true); - data = IN_PROGRESS; - break; - } - } - break; - } - m_auiEncounter[1] = data; - break; - case DATA_COLLAPSE: - // true - collapse / false - reset - for (std::set::const_iterator i = ColumnGUID.begin(); i != ColumnGUID.end(); ++i) - DoUseDoorOrButton(*i); - break; - default: - break; - } - } - - uint32 GetData(uint32 type) - { - if (type == DATA_MAGTHERIDON_EVENT) - return m_auiEncounter[0]; - return 0; - } - - void Update(uint32 diff) - { - if (CageTimer) - { - if (CageTimer <= diff) - { - Creature *Magtheridon = instance->GetCreature(MagtheridonGUID); - if (Magtheridon && Magtheridon->isAlive()) - { - Magtheridon->clearUnitState(UNIT_STAT_STUNNED); - Magtheridon->AI()->AttackStart(Magtheridon->SelectNearestTarget(999)); - } - CageTimer = 0; - } else CageTimer -= diff; - } - - if (RespawnTimer) - { - if (RespawnTimer <= diff) - { - for (std::set::const_iterator i = ChannelerGUID.begin(); i != ChannelerGUID.end(); ++i) - { - if (Creature *Channeler = instance->GetCreature(*i)) - { - if (Channeler->isAlive()) - Channeler->AI()->EnterEvadeMode(); - else - Channeler->Respawn(); - } - } - RespawnTimer = 0; - } else RespawnTimer -= diff; - } - } -}; - -InstanceData* GetInstanceData_instance_magtheridons_lair(Map* pMap) -{ - return new instance_magtheridons_lair(pMap); -} - -void AddSC_instance_magtheridons_lair() -{ - Script *newscript; - newscript = new Script; - newscript->Name = "instance_magtheridons_lair"; - newscript->GetInstanceData = &GetInstanceData_instance_magtheridons_lair; - newscript->RegisterSelf(); -} - diff --git a/src/server/scripts/Outland/HellfireCitadel/magtheridons_lair/magtheridons_lair.h b/src/server/scripts/Outland/HellfireCitadel/magtheridons_lair/magtheridons_lair.h deleted file mode 100644 index 1b3e525fc54..00000000000 --- a/src/server/scripts/Outland/HellfireCitadel/magtheridons_lair/magtheridons_lair.h +++ /dev/null @@ -1,14 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software licensed under GPL version 2 - * Please see the included DOCS/LICENSE.TXT for more information */ - -#ifndef DEF_MAGTHERIDONS_LAIR_H -#define DEF_MAGTHERIDONS_LAIR_H - -#define DATA_MAGTHERIDON_EVENT 1 -#define DATA_MAGTHERIDON 3 -#define DATA_CHANNELER_EVENT 2 -#define DATA_COLLAPSE 6 -#define DATA_CHANNELER 9 -#endif - diff --git a/src/server/scripts/Outland/HellfireCitadel/shattered_halls/boss_nethekurse.cpp b/src/server/scripts/Outland/HellfireCitadel/shattered_halls/boss_nethekurse.cpp deleted file mode 100644 index e3ded52edc9..00000000000 --- a/src/server/scripts/Outland/HellfireCitadel/shattered_halls/boss_nethekurse.cpp +++ /dev/null @@ -1,396 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: Boss_Grand_Warlock_Nethekurse -SD%Complete: 75 -SDComment: encounter not fully completed. missing part where boss kill minions. -SDCategory: Hellfire Citadel, Shattered Halls -EndScriptData */ - -/* ContentData -boss_grand_warlock_nethekurse -mob_fel_orc_convert -mob_lesser_shadow_fissure -EndContentData */ - -#include "ScriptedPch.h" -#include "shattered_halls.h" - -struct Say -{ - int32 id; -}; - -static Say PeonAttacked[]= -{ - {-1540001}, - {-1540002}, - {-1540003}, - {-1540004}, -}; -static Say PeonDies[]= -{ - {-1540005}, - {-1540006}, - {-1540007}, - {-1540008}, -}; - -#define SAY_INTRO -1540000 -#define SAY_TAUNT_1 -1540009 -#define SAY_TAUNT_2 -1540010 -#define SAY_TAUNT_3 -1540011 -#define SAY_AGGRO_1 -1540012 -#define SAY_AGGRO_2 -1540013 -#define SAY_AGGRO_3 -1540014 -#define SAY_SLAY_1 -1540015 -#define SAY_SLAY_2 -1540016 -#define SAY_DIE -1540017 - -#define SPELL_DEATH_COIL 30500 -#define SPELL_DARK_SPIN 30502 // core bug spell attack caster :D -#define SPELL_SHADOW_FISSURE 30496 // Summon the ShadowFissure NPC - -#define SPELL_SHADOW_CLEAVE 30495 -#define H_SPELL_SHADOW_SLAM 35953 - -#define SPELL_HEMORRHAGE 30478 - -#define SPELL_CONSUMPTION 30497 -#define SPELL_TEMPORARY_VISUAL 39312 // this is wrong, a temporary solution. spell consumption already has the purple visual, but doesn't display as it should - -struct boss_grand_warlock_nethekurseAI : public ScriptedAI -{ - boss_grand_warlock_nethekurseAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - } - - ScriptedInstance* pInstance; - - bool IntroOnce; - bool IsIntroEvent; - bool IsMainEvent; - bool SpinOnce; - //bool HasTaunted; - bool Phase; - - uint32 PeonEngagedCount; - uint32 PeonKilledCount; - - uint32 IntroEvent_Timer; - uint32 DeathCoil_Timer; - uint32 ShadowFissure_Timer; - uint32 Cleave_Timer; - - void Reset() - { - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - - IsIntroEvent = false; - IntroOnce = false; - IsMainEvent = false; - //HasTaunted = false; - SpinOnce = false; - Phase = false; - - PeonEngagedCount = 0; - PeonKilledCount = 0; - - IntroEvent_Timer = 90000; //how long before getting bored and kills his minions? - DeathCoil_Timer = 20000; - ShadowFissure_Timer = 8000; - Cleave_Timer = 5000; - } - - void DoYellForPeonAggro() - { - if (PeonEngagedCount >= 4) - return; - - DoScriptText(PeonAttacked[PeonEngagedCount].id, me); - ++PeonEngagedCount; - } - - void DoYellForPeonDeath() - { - if (PeonKilledCount >= 4) - return; - - DoScriptText(PeonDies[PeonKilledCount].id, me); - ++PeonKilledCount; - - if (PeonKilledCount == 4) - { - IsIntroEvent = false; - IsMainEvent = true; - me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - } - } - - void DoTauntPeons() - { - DoScriptText(RAND(SAY_TAUNT_1,SAY_TAUNT_2,SAY_TAUNT_3), me); - - //TODO: kill the peons first - IsIntroEvent = false; - PeonEngagedCount = 4; - PeonKilledCount = 4; - IsMainEvent = true; - me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - } - - void AttackStart(Unit* who) - { - if (IsIntroEvent || !IsMainEvent) - return; - - if (me->Attack(who, true)) - { - if (Phase) - DoStartNoMovement(who); - else - DoStartMovement(who); - } - } - - void MoveInLineOfSight(Unit *who) - { - if (!IntroOnce && me->IsWithinDistInMap(who, 50.0f)) - { - if (who->GetTypeId() != TYPEID_PLAYER) - return; - - DoScriptText(SAY_INTRO, me); - IntroOnce = true; - IsIntroEvent = true; - - if (pInstance) - pInstance->SetData(TYPE_NETHEKURSE,IN_PROGRESS); - } - - if (IsIntroEvent || !IsMainEvent) - return; - - ScriptedAI::MoveInLineOfSight(who); - } - - void EnterCombat(Unit * /*who*/) - { - DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); - } - - void JustSummoned(Creature *summoned) - { - summoned->setFaction(16); - summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - - //triggered spell of consumption does not properly show it's SpellVisual, wrong spellid? - summoned->CastSpell(summoned,SPELL_TEMPORARY_VISUAL,true); - summoned->CastSpell(summoned,SPELL_CONSUMPTION,false,0,0,me->GetGUID()); - } - - void KilledUnit(Unit* /*victim*/) - { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); - } - - void JustDied(Unit* /*Killer*/) - { - DoScriptText(SAY_DIE, me); - - if (!pInstance) - return; - - pInstance->SetData(TYPE_NETHEKURSE,DONE); - pInstance->HandleGameObject(pInstance->GetData64(DATA_NETHEKURSE_DOOR), true); - } - - void UpdateAI(const uint32 diff) - { - if (IsIntroEvent) - { - if (!pInstance) - return; - - if (pInstance->GetData(TYPE_NETHEKURSE) == IN_PROGRESS) - { - if (IntroEvent_Timer <= diff) - DoTauntPeons(); - else - IntroEvent_Timer -= diff; - } - } - - if (!UpdateVictim()) - return; - - if (!IsMainEvent) - return; - - if (Phase) - { - if (!SpinOnce) - { - DoCast(me->getVictim(), SPELL_DARK_SPIN); - SpinOnce = true; - } - - if (Cleave_Timer <= diff) - { - DoCast(me->getVictim(), SPELL_SHADOW_CLEAVE); - Cleave_Timer = 6000+rand()%2500; - } else Cleave_Timer -= diff; - } - else - { - if (ShadowFissure_Timer <= diff) - { - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget, SPELL_SHADOW_FISSURE); - ShadowFissure_Timer = urand(7500,15000); - } else ShadowFissure_Timer -= diff; - - if (DeathCoil_Timer <= diff) - { - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget, SPELL_DEATH_COIL); - DeathCoil_Timer = urand(15000,20000); - } else DeathCoil_Timer -= diff; - - if ((me->GetHealth()*100) / me->GetMaxHealth() <= 20) - Phase = true; - - DoMeleeAttackIfReady(); - } - } -}; - -struct mob_fel_orc_convertAI : public ScriptedAI -{ - mob_fel_orc_convertAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - } - - ScriptedInstance* pInstance; - uint32 Hemorrhage_Timer; - - void Reset() - { - me->SetNoCallAssistance(true); //we don't want any assistance (WE R HEROZ!) - Hemorrhage_Timer = 3000; - } - - void MoveInLineOfSight(Unit * /*who*/) - { - } - - void EnterCombat(Unit* /*who*/) - { - if (pInstance) - { - if (pInstance->GetData64(DATA_NETHEKURSE)) - { - Creature *pKurse = Unit::GetCreature(*me,pInstance->GetData64(DATA_NETHEKURSE)); - if (pKurse && me->IsWithinDist(pKurse, 45.0f)) - { - CAST_AI(boss_grand_warlock_nethekurseAI, pKurse->AI())->DoYellForPeonAggro(); - - if (pInstance->GetData(TYPE_NETHEKURSE) == IN_PROGRESS) - return; - else - pInstance->SetData(TYPE_NETHEKURSE,IN_PROGRESS); - } - } - } - } - - void JustDied(Unit* /*Killer*/) - { - if (pInstance) - { - if (pInstance->GetData(TYPE_NETHEKURSE) != IN_PROGRESS) - return; - if (pInstance->GetData64(DATA_NETHEKURSE)) - if (Creature *pKurse = Unit::GetCreature(*me,pInstance->GetData64(DATA_NETHEKURSE))) - CAST_AI(boss_grand_warlock_nethekurseAI, pKurse->AI())->DoYellForPeonDeath(); - } - } - - void UpdateAI(const uint32 diff) - { - if (!UpdateVictim()) - return; - - if (Hemorrhage_Timer <= diff) - { - DoCast(me->getVictim(), SPELL_HEMORRHAGE); - Hemorrhage_Timer = 15000; - } else Hemorrhage_Timer -= diff; - - DoMeleeAttackIfReady(); - } -}; - -//NOTE: this Creature are also summoned by other spells, for different creatures -struct mob_lesser_shadow_fissureAI : public ScriptedAI -{ - mob_lesser_shadow_fissureAI(Creature *c) : ScriptedAI(c) {} - - void Reset() { } - void MoveInLineOfSight(Unit * /*who*/) {} - void AttackStart(Unit* /*who*/) {} - void EnterCombat(Unit* /*who*/) {} -}; - -CreatureAI* GetAI_boss_grand_warlock_nethekurse(Creature* pCreature) -{ - return new boss_grand_warlock_nethekurseAI (pCreature); -} - -CreatureAI* GetAI_mob_fel_orc_convert(Creature* pCreature) -{ - return new mob_fel_orc_convertAI (pCreature); -} - -CreatureAI* GetAI_mob_lesser_shadow_fissure(Creature* pCreature) -{ - return new mob_lesser_shadow_fissureAI (pCreature); -} - -void AddSC_boss_grand_warlock_nethekurse() -{ - Script *newscript; - - newscript = new Script; - newscript->Name = "boss_grand_warlock_nethekurse"; - newscript->GetAI = &GetAI_boss_grand_warlock_nethekurse; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_fel_orc_convert"; - newscript->GetAI = &GetAI_mob_fel_orc_convert; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_lesser_shadow_fissure"; - newscript->GetAI = &GetAI_mob_lesser_shadow_fissure; - newscript->RegisterSelf(); -} - diff --git a/src/server/scripts/Outland/HellfireCitadel/shattered_halls/boss_warbringer_omrogg.cpp b/src/server/scripts/Outland/HellfireCitadel/shattered_halls/boss_warbringer_omrogg.cpp deleted file mode 100644 index 6fa1c9efe33..00000000000 --- a/src/server/scripts/Outland/HellfireCitadel/shattered_halls/boss_warbringer_omrogg.cpp +++ /dev/null @@ -1,404 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: Boss_Warbringer_Omrogg -SD%Complete: 85 -SDComment: Heroic enabled. Spell timing may need additional tweaks -SDCategory: Hellfire Citadel, Shattered Halls -EndScriptData */ - -/* ContentData -mob_omrogg_heads -boss_warbringer_omrogg -EndContentData */ - -#include "ScriptedPch.h" -#include "shattered_halls.h" - -enum eEnums -{ - YELL_DIE_L = -1540039, - YELL_DIE_R = -1540040, - EMOTE_ENRAGE = -1540041, - - SPELL_BLAST_WAVE = 30600, - SPELL_FEAR = 30584, - SPELL_THUNDERCLAP = 30633, - - SPELL_BURNING_MAUL = 30598, - H_SPELL_BURNING_MAUL = 36056, - - NPC_LEFT_HEAD = 19523, - NPC_RIGHT_HEAD = 19524 -}; - -struct Yell -{ - int32 id; - uint32 creature; -}; - -static Yell GoCombat[]= -{ - {-1540018, NPC_LEFT_HEAD}, - {-1540019, NPC_LEFT_HEAD}, - {-1540020, NPC_LEFT_HEAD}, -}; -static Yell GoCombatDelay[]= -{ - {-1540021, NPC_RIGHT_HEAD}, - {-1540022, NPC_RIGHT_HEAD}, - {-1540023, NPC_RIGHT_HEAD}, -}; - -static Yell Threat[]= -{ - {-1540024, NPC_LEFT_HEAD}, - {-1540025, NPC_RIGHT_HEAD}, - {-1540026, NPC_LEFT_HEAD}, - {-1540027, NPC_LEFT_HEAD}, -}; -static Yell ThreatDelay1[]= -{ - {-1540028, NPC_RIGHT_HEAD}, - {-1540029, NPC_LEFT_HEAD}, - {-1540030, NPC_RIGHT_HEAD}, - {-1540031, NPC_RIGHT_HEAD}, -}; -static Yell ThreatDelay2[]= -{ - {-1540032, NPC_LEFT_HEAD}, - {-1540033, NPC_RIGHT_HEAD}, - {-1540034, NPC_LEFT_HEAD}, - {-1540035, NPC_LEFT_HEAD}, -}; - -static Yell Killing[]= -{ - {-1540036, NPC_LEFT_HEAD}, - {-1540037, NPC_RIGHT_HEAD}, -}; -static Yell KillingDelay[]= -{ - {-1540038, NPC_RIGHT_HEAD}, - {-1000000, NPC_LEFT_HEAD}, -}; - -struct mob_omrogg_headsAI : public ScriptedAI -{ - mob_omrogg_headsAI(Creature *c) : ScriptedAI(c) {} - - bool DeathYell; - uint32 Death_Timer; - - void Reset() - { - Death_Timer = 4000; - DeathYell = false; - } - void EnterCombat(Unit* /*who*/) {} - - void DoDeathYell() - { - DeathYell = true; - } - - void UpdateAI(const uint32 diff) - { - if (!DeathYell) - return; - - if (Death_Timer <= diff) - { - DoScriptText(YELL_DIE_R, me); - Death_Timer = false; - me->setDeathState(JUST_DIED); - } else Death_Timer -= diff; - } -}; - -struct boss_warbringer_omroggAI : public ScriptedAI -{ - boss_warbringer_omroggAI(Creature *c) : ScriptedAI(c) - { - LeftHeadGUID = 0; - RightHeadGUID = 0; - pInstance = c->GetInstanceData(); - } - - ScriptedInstance* pInstance; - - uint64 LeftHeadGUID; - uint64 RightHeadGUID; - int iaggro; - int ithreat; - int ikilling; - - bool AggroYell; - bool ThreatYell; - bool ThreatYell2; - bool KillingYell; - - uint32 Delay_Timer; - uint32 BlastWave_Timer; - uint32 BlastCount; - uint32 Fear_Timer; - uint32 BurningMaul_Timer; - uint32 ThunderClap_Timer; - uint32 ResetThreat_Timer; - - void Reset() - { - if (Unit* pLeftHead = Unit::GetUnit(*me,LeftHeadGUID)) - { - pLeftHead->setDeathState(JUST_DIED); - LeftHeadGUID = 0; - } - - if (Unit* pRightHead = Unit::GetUnit(*me,RightHeadGUID)) - { - pRightHead->setDeathState(JUST_DIED); - RightHeadGUID = 0; - } - - AggroYell = false; - ThreatYell = false; - ThreatYell2 = false; - KillingYell = false; - - Delay_Timer = 4000; - BlastWave_Timer = 0; - BlastCount = 0; - Fear_Timer = 8000; - BurningMaul_Timer = 25000; - ThunderClap_Timer = 15000; - ResetThreat_Timer = 30000; - - if (pInstance) - pInstance->SetData(TYPE_OMROGG, NOT_STARTED); //End boss can use this later. O'mrogg must be defeated(DONE) or he will come to aid. - } - - void DoYellForThreat() - { - Unit *pLeftHead = Unit::GetUnit(*me,LeftHeadGUID); - Unit *pRightHead = Unit::GetUnit(*me,RightHeadGUID); - - if (!pLeftHead || !pRightHead) - return; - - ithreat = rand()%4; - - Unit *source = (pLeftHead->GetEntry() == Threat[ithreat].creature ? pLeftHead : pRightHead); - - DoScriptText(Threat[ithreat].id, source); - - Delay_Timer = 3500; - ThreatYell = true; - } - - void EnterCombat(Unit * /*who*/) - { - me->SummonCreature(NPC_LEFT_HEAD, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0); - me->SummonCreature(NPC_RIGHT_HEAD, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0); - - if (Unit *pLeftHead = Unit::GetUnit(*me,LeftHeadGUID)) - { - iaggro = rand()%3; - - DoScriptText(GoCombat[iaggro].id, pLeftHead); - - Delay_Timer = 3500; - AggroYell = true; - } - - if (pInstance) - pInstance->SetData(TYPE_OMROGG, IN_PROGRESS); - } - - void JustSummoned(Creature *summoned) - { - if (summoned->GetEntry() == NPC_LEFT_HEAD) - LeftHeadGUID = summoned->GetGUID(); - - if (summoned->GetEntry() == NPC_RIGHT_HEAD) - RightHeadGUID = summoned->GetGUID(); - - //summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - //summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - summoned->SetVisibility(VISIBILITY_OFF); - } - - void KilledUnit(Unit* /*victim*/) - { - Unit* pLeftHead = Unit::GetUnit(*me,LeftHeadGUID); - Unit* pRightHead = Unit::GetUnit(*me,RightHeadGUID); - - if (!pLeftHead || !pRightHead) - return; - - ikilling = rand()%2; - - Unit *source = (pLeftHead->GetEntry() == Killing[ikilling].creature ? pLeftHead : pRightHead); - - switch(ikilling) - { - case 0: - DoScriptText(Killing[ikilling].id, source); - Delay_Timer = 3500; - KillingYell = true; - break; - case 1: - DoScriptText(Killing[ikilling].id, source); - KillingYell = false; - break; - } - } - - void JustDied(Unit* /*Killer*/) - { - Unit* pLeftHead = Unit::GetUnit(*me,LeftHeadGUID); - Unit* pRightHead = Unit::GetUnit(*me,RightHeadGUID); - - if (!pLeftHead || !pRightHead) - return; - - DoScriptText(YELL_DIE_L, pLeftHead); - - CAST_AI(mob_omrogg_headsAI, CAST_CRE(pRightHead)->AI())->DoDeathYell(); - - if (pInstance) - pInstance->SetData(TYPE_OMROGG, DONE); - } - - void UpdateAI(const uint32 diff) - { - if (Delay_Timer <= diff) - { - Delay_Timer = 3500; - - Unit* pLeftHead = Unit::GetUnit(*me,LeftHeadGUID); - Unit* pRightHead = Unit::GetUnit(*me,RightHeadGUID); - - if (!pLeftHead || !pRightHead) - return; - - if (AggroYell) - { - DoScriptText(GoCombatDelay[iaggro].id, pRightHead); - AggroYell = false; - } - - if (ThreatYell2) - { - Unit *source = (pLeftHead->GetEntry() == ThreatDelay2[ithreat].creature ? pLeftHead : pRightHead); - - DoScriptText(ThreatDelay2[ithreat].id, source); - ThreatYell2 = false; - } - - if (ThreatYell) - { - Unit *source = (pLeftHead->GetEntry() == ThreatDelay1[ithreat].creature ? pLeftHead : pRightHead); - - DoScriptText(ThreatDelay1[ithreat].id, source); - ThreatYell = false; - ThreatYell2 = true; - } - - if (KillingYell) - { - Unit *source = (pLeftHead->GetEntry() == KillingDelay[ikilling].creature ? pLeftHead : pRightHead); - - DoScriptText(KillingDelay[ikilling].id, source); - KillingYell = false; - } - } else Delay_Timer -= diff; - - if (!UpdateVictim()) - return; - - if (BlastCount && BlastWave_Timer <= diff) - { - DoCast(me, SPELL_BLAST_WAVE); - BlastWave_Timer = 5000; - ++BlastCount; - - if (BlastCount == 3) - BlastCount = 0; - } else BlastWave_Timer -= diff; - - if (BurningMaul_Timer <= diff) - { - DoScriptText(EMOTE_ENRAGE, me); - DoCast(me, SPELL_BURNING_MAUL); - BurningMaul_Timer = 40000; - BlastWave_Timer = 16000; - BlastCount = 1; - } else BurningMaul_Timer -= diff; - - if (ResetThreat_Timer <= diff) - { - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - { - DoYellForThreat(); - DoResetThreat(); - me->AddThreat(pTarget, 0.0f); - } - ResetThreat_Timer = 25000+rand()%15000; - } else ResetThreat_Timer -= diff; - - if (Fear_Timer <= diff) - { - DoCast(me, SPELL_FEAR); - Fear_Timer = 15000+rand()%20000; - } else Fear_Timer -= diff; - - if (ThunderClap_Timer <= diff) - { - DoCast(me, SPELL_THUNDERCLAP); - ThunderClap_Timer = 15000+rand()%15000; - } else ThunderClap_Timer -= diff; - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_boss_warbringer_omrogg(Creature* pCreature) -{ - return new boss_warbringer_omroggAI (pCreature); -} - -CreatureAI* GetAI_mob_omrogg_heads(Creature* pCreature) -{ - return new mob_omrogg_headsAI (pCreature); -} - -void AddSC_boss_warbringer_omrogg() -{ - Script *newscript; - - newscript = new Script; - newscript->Name = "boss_warbringer_omrogg"; - newscript->GetAI = &GetAI_boss_warbringer_omrogg; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_omrogg_heads"; - newscript->GetAI = &GetAI_mob_omrogg_heads; - newscript->RegisterSelf(); -} - diff --git a/src/server/scripts/Outland/HellfireCitadel/shattered_halls/boss_warchief_kargath_bladefist.cpp b/src/server/scripts/Outland/HellfireCitadel/shattered_halls/boss_warchief_kargath_bladefist.cpp deleted file mode 100644 index b108077518a..00000000000 --- a/src/server/scripts/Outland/HellfireCitadel/shattered_halls/boss_warchief_kargath_bladefist.cpp +++ /dev/null @@ -1,288 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: Boss_Warchief_Kargath_Bladefist -SD%Complete: 90 -SDComment: -SDCategory: Hellfire Citadel, Shattered Halls -EndScriptData */ - -/* ContentData -boss_warchief_kargath_bladefist -EndContentData */ - -#include "ScriptedPch.h" - -#define SAY_AGGRO1 -1540042 -#define SAY_AGGRO2 -1540043 -#define SAY_AGGRO3 -1540044 -#define SAY_SLAY1 -1540045 -#define SAY_SLAY2 -1540046 -#define SAY_DEATH -1540047 - -#define SPELL_BLADE_DANCE 30739 -#define H_SPELL_CHARGE 25821 - -#define TARGET_NUM 5 - -#define MOB_SHATTERED_ASSASSIN 17695 -#define MOB_HEARTHEN_GUARD 17621 -#define MOB_SHARPSHOOTER_GUARD 17622 -#define MOB_REAVER_GUARD 17623 - -float AssassEntrance[3] = {275.136,-84.29,2.3}; // y -8 -float AssassExit[3] = {184.233,-84.29,2.3}; // y -8 -float AddsEntrance[3] = {306.036,-84.29,1.93}; - -struct boss_warchief_kargath_bladefistAI : public ScriptedAI -{ - boss_warchief_kargath_bladefistAI(Creature *c) : ScriptedAI(c) - { - } - - std::vector adds; - std::vector assassins; - - uint32 Charge_timer; - uint32 Blade_Dance_Timer; - uint32 Summon_Assistant_Timer; - uint32 resetcheck_timer; - uint32 Wait_Timer; - - uint32 Assassins_Timer; - - uint32 summoned; - bool InBlade; - - uint32 target_num; - - void Reset() - { - removeAdds(); - - me->SetSpeed(MOVE_RUN,2); - me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE); - - summoned = 2; - InBlade = false; - Wait_Timer = 0; - - Charge_timer = 0; - Blade_Dance_Timer = 45000; - Summon_Assistant_Timer = 30000; - Assassins_Timer = 5000; - resetcheck_timer = 5000; - } - - void EnterCombat(Unit * /*who*/) - { - DoScriptText(RAND(SAY_AGGRO1,SAY_AGGRO2,SAY_AGGRO3), me); - } - - void JustSummoned(Creature *summoned) - { - switch(summoned->GetEntry()) - { - case MOB_HEARTHEN_GUARD: - case MOB_SHARPSHOOTER_GUARD: - case MOB_REAVER_GUARD: - summoned->AI()->AttackStart(SelectUnit(SELECT_TARGET_RANDOM,0)); - adds.push_back(summoned->GetGUID()); - break; - case MOB_SHATTERED_ASSASSIN: - assassins.push_back(summoned->GetGUID()); - break; - } - } - - void KilledUnit(Unit* victim) - { - if (victim->GetTypeId() == TYPEID_PLAYER) - { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); - } - } - - void JustDied(Unit* /*Killer*/) - { - DoScriptText(SAY_DEATH, me); - removeAdds(); - } - - void MovementInform(uint32 type, uint32 id) - { - if (InBlade) - { - if (type != POINT_MOTION_TYPE) - return; - - if (id != 1) - return; - - if (target_num > 0) // to prevent loops - { - Wait_Timer = 1; - DoCast(me, SPELL_BLADE_DANCE, true); - target_num--; - } - } - } - - void removeAdds() - { - for (std::vector::const_iterator itr = adds.begin(); itr!= adds.end(); ++itr) - { - Unit* temp = Unit::GetUnit((*me),*itr); - if (temp && temp->isAlive()) - { - (*temp).GetMotionMaster()->Clear(true); - me->DealDamage(temp,temp->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); - CAST_CRE(temp)->RemoveCorpse(); - } - } - adds.clear(); - - for (std::vector::const_iterator itr = assassins.begin(); itr!= assassins.end(); ++itr) - { - Unit* temp = Unit::GetUnit((*me),*itr); - if (temp && temp->isAlive()) - { - (*temp).GetMotionMaster()->Clear(true); - me->DealDamage(temp,temp->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); - CAST_CRE(temp)->RemoveCorpse(); - } - } - assassins.clear(); - } - void SpawnAssassin() - { - me->SummonCreature(MOB_SHATTERED_ASSASSIN,AssassEntrance[0],AssassEntrance[1]+8, AssassEntrance[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000); - me->SummonCreature(MOB_SHATTERED_ASSASSIN,AssassEntrance[0],AssassEntrance[1]-8, AssassEntrance[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000); - me->SummonCreature(MOB_SHATTERED_ASSASSIN,AssassExit[0],AssassExit[1]+8, AssassExit[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000); - me->SummonCreature(MOB_SHATTERED_ASSASSIN,AssassExit[0],AssassExit[1]-8, AssassExit[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000); - } - - void UpdateAI(const uint32 diff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - if (Assassins_Timer) - if (Assassins_Timer <= diff) - { - SpawnAssassin(); - Assassins_Timer = 0; - } else Assassins_Timer -= diff; - - if (InBlade) - { - if (Wait_Timer) - if (Wait_Timer <= diff) - { - if (target_num <= 0) - { - // stop bladedance - InBlade = false; - me->SetSpeed(MOVE_RUN,2); - me->GetMotionMaster()->MoveChase(me->getVictim()); - Blade_Dance_Timer = 30000; - Wait_Timer = 0; - if (IsHeroic()) - Charge_timer = 5000; - } - else - { - //move in bladedance - float x,y,randx,randy; - randx = (rand()%40); - randy = (rand()%40); - x = 210+ randx ; - y = -60- randy ; - me->GetMotionMaster()->MovePoint(1,x,y,me->GetPositionZ()); - Wait_Timer = 0; - } - } else Wait_Timer -= diff; - } - else - { - if (Blade_Dance_Timer) - if (Blade_Dance_Timer <= diff) - { - target_num = TARGET_NUM; - Wait_Timer = 1; - InBlade = true; - Blade_Dance_Timer = 0; - me->SetSpeed(MOVE_RUN,4); - return; - } else Blade_Dance_Timer -= diff; - - if (Charge_timer) - if (Charge_timer <= diff) - { - DoCast(SelectUnit(SELECT_TARGET_RANDOM, 0), H_SPELL_CHARGE); - Charge_timer = 0; - } else Charge_timer -= diff; - - if (Summon_Assistant_Timer <= diff) - { - for (uint8 i = 0; i < summoned; ++i) - { - switch (urand(0,2)) - { - case 0: me->SummonCreature(MOB_HEARTHEN_GUARD,AddsEntrance[0],AddsEntrance[1], AddsEntrance[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000); break; - case 1: me->SummonCreature(MOB_SHARPSHOOTER_GUARD,AddsEntrance[0],AddsEntrance[1], AddsEntrance[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000); break; - case 2: me->SummonCreature(MOB_REAVER_GUARD,AddsEntrance[0],AddsEntrance[1], AddsEntrance[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000); break; - } - } - if (urand(0,9) < 2) - ++summoned; - Summon_Assistant_Timer = urand(25000,35000); - } else Summon_Assistant_Timer -= diff; - - DoMeleeAttackIfReady(); - } - - if (resetcheck_timer <= diff) - { - uint32 tempx,tempy; - tempx = uint32(me->GetPositionX()); - tempy = uint32(me->GetPositionY()); - if (tempx > 255 || tempx < 205) - { - EnterEvadeMode(); - return; - } - resetcheck_timer = 5000; - } else resetcheck_timer -= diff; - } -}; - -CreatureAI* GetAI_boss_warchief_kargath_bladefist(Creature* pCreature) -{ - return new boss_warchief_kargath_bladefistAI (pCreature); -} - -void AddSC_boss_warchief_kargath_bladefist() -{ - Script *newscript; - newscript = new Script; - newscript->Name = "boss_warchief_kargath_bladefist"; - newscript->GetAI = &GetAI_boss_warchief_kargath_bladefist; - newscript->RegisterSelf(); -} - diff --git a/src/server/scripts/Outland/HellfireCitadel/shattered_halls/instance_shattered_halls.cpp b/src/server/scripts/Outland/HellfireCitadel/shattered_halls/instance_shattered_halls.cpp deleted file mode 100644 index c29df4d6411..00000000000 --- a/src/server/scripts/Outland/HellfireCitadel/shattered_halls/instance_shattered_halls.cpp +++ /dev/null @@ -1,114 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: Instance_Shattered_Halls -SD%Complete: 50 -SDComment: currently missing info about door. instance not complete -SDCategory: Hellfire Citadel, Shattered Halls -EndScriptData */ - -#include "ScriptedPch.h" -#include "shattered_halls.h" - -#define MAX_ENCOUNTER 2 - -#define DOOR_NETHEKURSE 1 - -struct instance_shattered_halls : public ScriptedInstance -{ - instance_shattered_halls(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; - - uint32 m_auiEncounter[MAX_ENCOUNTER]; - uint64 nethekurseGUID; - uint64 nethekurseDoorGUID; - - void Initialize() - { - memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); - - nethekurseGUID = 0; - nethekurseDoorGUID = 0; - } - - void OnGameObjectCreate(GameObject* pGo, bool /*add*/) - { - switch(pGo->GetEntry()) - { - case DOOR_NETHEKURSE: nethekurseDoorGUID = pGo->GetGUID(); break; - } - } - - void OnCreatureCreate(Creature* pCreature, bool /*add*/) - { - switch(pCreature->GetEntry()) - { - case 16807: nethekurseGUID = pCreature->GetGUID(); break; - } - } - - void SetData(uint32 type, uint32 data) - { - switch(type) - { - case TYPE_NETHEKURSE: - m_auiEncounter[0] = data; - break; - case TYPE_OMROGG: - m_auiEncounter[1] = data; - break; - } - } - - uint32 GetData(uint32 type) - { - switch(type) - { - case TYPE_NETHEKURSE: - return m_auiEncounter[0]; - case TYPE_OMROGG: - return m_auiEncounter[1]; - } - return 0; - } - - uint64 GetData64(uint32 data) - { - switch(data) - { - case DATA_NETHEKURSE: - return nethekurseGUID; - case DATA_NETHEKURSE_DOOR: - return nethekurseDoorGUID; - } - return 0; - } -}; - -InstanceData* GetInstanceData_instance_shattered_halls(Map* pMap) -{ - return new instance_shattered_halls(pMap); -} - -void AddSC_instance_shattered_halls() -{ - Script *newscript; - newscript = new Script; - newscript->Name = "instance_shattered_halls"; - newscript->GetInstanceData = &GetInstanceData_instance_shattered_halls; - newscript->RegisterSelf(); -} - diff --git a/src/server/scripts/Outland/HellfireCitadel/shattered_halls/shattered_halls.h b/src/server/scripts/Outland/HellfireCitadel/shattered_halls/shattered_halls.h deleted file mode 100644 index cbfa23ec4e0..00000000000 --- a/src/server/scripts/Outland/HellfireCitadel/shattered_halls/shattered_halls.h +++ /dev/null @@ -1,14 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software licensed under GPL version 2 - * Please see the included DOCS/LICENSE.TXT for more information */ - -#ifndef DEF_SHATTERED_H -#define DEF_SHATTERED_H - -#define TYPE_NETHEKURSE 1 -#define DATA_NETHEKURSE 2 -#define DATA_NETHEKURSE_DOOR 3 - -#define TYPE_OMROGG 4 -#endif - diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp new file mode 100644 index 00000000000..af5f1bd95c1 --- /dev/null +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp @@ -0,0 +1,523 @@ +/* Copyright(C) 2006 - 2008 ScriptDev2 +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +*(at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +/* ScriptData +SDName: boss_alar +SD%Complete: 95 +SDComment: +SDCategory: Tempest Keep, The Eye +EndScriptData */ + +#include "ScriptedPch.h" +#include "the_eye.h" + +#define SPELL_FLAME_BUFFET 34121 // Flame Buffet - every 1,5 secs in phase 1 if there is no victim in melee range and after Dive Bomb in phase 2 with same conditions +#define SPELL_FLAME_QUILLS 34229 // Randomly after changing position in phase after watching tonns of movies, set probability 20% +#define SPELL_REBIRTH 34342 // Rebirth - beginning of second phase(after loose all health in phase 1) +#define SPELL_REBIRTH_2 35369 // Rebirth(another, without healing to full HP) - after Dive Bomb in phase 2 +#define SPELL_MELT_ARMOR 35410 // Melt Armor - every 60 sec in phase 2 +#define SPELL_CHARGE 35412 // Charge - 30 sec cooldown +#define SPELL_DIVE_BOMB_VISUAL 35367 // Bosskillers says 30 sec cooldown, wowwiki says 30 sec colldown, DBM and BigWigs addons says ~47 sec +#define SPELL_DIVE_BOMB 35181 // after watching tonns of movies, set cooldown to 40+rand()%5. +#define SPELL_BERSERK 45078 // 10 minutes after phase 2 starts(id is wrong, but proper id is unknown) + +#define CREATURE_EMBER_OF_ALAR 19551 // Al'ar summons one Ember of Al'ar every position change in phase 1 and two after Dive Bomb. Also in phase 2 when Ember of Al'ar dies, boss loose 3% health. +#define SPELL_EMBER_BLAST 34133 // When Ember of Al'ar dies, it casts Ember Blast + +#define CREATURE_FLAME_PATCH_ALAR 20602 // Flame Patch - every 30 sec in phase 2 +#define SPELL_FLAME_PATCH 35380 // + +static float waypoint[6][3] = +{ + {340.15, 58.65, 17.71}, + {388.09, 31.54, 20.18}, + {388.18, -32.85, 20.18}, + {340.29, -60.19, 17.72}, + {332, 0.01, 39}, // better not use the same xy coord + {331, 0.01, -2.39} +}; + +enum WaitEventType +{ + WE_NONE = 0, + WE_DUMMY = 1, + WE_PLATFORM = 2, + WE_QUILL = 3, + WE_DIE = 4, + WE_REVIVE = 5, + WE_CHARGE = 6, + WE_METEOR = 7, + WE_DIVE = 8, + WE_LAND = 9, + WE_SUMMON = 10 +}; + +struct boss_alarAI : public ScriptedAI +{ + boss_alarAI(Creature *c) : ScriptedAI(c) + { + pInstance =c->GetInstanceData(); + DefaultMoveSpeedRate = c->GetSpeedRate(MOVE_RUN); + } + + ScriptedInstance *pInstance; + + WaitEventType WaitEvent; + uint32 WaitTimer; + + bool AfterMoving; + + uint32 Platforms_Move_Timer; + uint32 DiveBomb_Timer; + uint32 MeltArmor_Timer; + uint32 Charge_Timer; + uint32 FlamePatch_Timer; + uint32 Berserk_Timer; + + float DefaultMoveSpeedRate; + + bool Phase1; + bool ForceMove; + uint32 ForceTimer; + + int8 cur_wp; + + void Reset() + { + if (pInstance) + pInstance->SetData(DATA_ALAREVENT, NOT_STARTED); + + Berserk_Timer = 1200000; + Platforms_Move_Timer = 0; + + Phase1 = true; + WaitEvent = WE_NONE; + WaitTimer = 0; + AfterMoving = false; + ForceMove = false; + ForceTimer = 5000; + + cur_wp = 4; + + me->SetDisplayId(me->GetNativeDisplayId()); + me->SetSpeed(MOVE_RUN, DefaultMoveSpeedRate); + //me->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, 10); + //me->SetFloatValue(UNIT_FIELD_COMBATREACH, 10); + me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FIRE, true); + me->SetUnitMovementFlags(MOVEMENTFLAG_LEVITATING); + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + me->setActive(false); + } + + void EnterCombat(Unit * /*who*/) + { + if (pInstance) + pInstance->SetData(DATA_ALAREVENT, IN_PROGRESS); + + me->SetUnitMovementFlags(MOVEMENTFLAG_LEVITATING); // after enterevademode will be set walk movement + DoZoneInCombat(); + me->setActive(true); + } + + void JustDied(Unit * /*victim*/) + { + if (pInstance) + pInstance->SetData(DATA_ALAREVENT, DONE); + } + + void JustSummoned(Creature *summon) + { + if (summon->GetEntry() == CREATURE_EMBER_OF_ALAR) + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + summon->AI()->AttackStart(pTarget); + } + + void MoveInLineOfSight(Unit * /*who*/) {} + + void AttackStart(Unit* who) + { + if (Phase1) + AttackStartNoMove(who); + else + ScriptedAI::AttackStart(who); + } + + void DamageTaken(Unit* /*pKiller*/, uint32 &damage) + { + if (damage >= me->GetHealth() && Phase1) + { + damage = 0; + if (!WaitEvent) + { + WaitEvent = WE_DIE; + WaitTimer = 0; + me->SetHealth(0); + me->InterruptNonMeleeSpells(true); + me->RemoveAllAuras(); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + me->AttackStop(); + me->SetUInt64Value(UNIT_FIELD_TARGET, 0); + me->SetSpeed(MOVE_RUN, 5.0f); + me->GetMotionMaster()->Clear(); + me->GetMotionMaster()->MovePoint(0, waypoint[5][0], waypoint[5][1], waypoint[5][2]); + } + } + } + + void SpellHit(Unit*, const SpellEntry *spell) + { + if (spell->Id == SPELL_DIVE_BOMB_VISUAL) + { + me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FIRE, true); + me->SetDisplayId(11686); + //me->SendUpdateObjectToAllExcept(NULL); + } + } + + void MovementInform(uint32 type, uint32 /*id*/) + { + if (type == POINT_MOTION_TYPE) + { + WaitTimer = 1; + AfterMoving = true; + ForceMove = false; + } + } + + void UpdateAI(const uint32 diff) + { + if (!me->isInCombat()) // sometimes isincombat but !incombat, faction bug? + return; + + if (Berserk_Timer <= diff) + { + DoCast(me, SPELL_BERSERK, true); + Berserk_Timer = 60000; + } else Berserk_Timer -= diff; + + if (ForceMove) + { + if (ForceTimer <= diff) + { + me->GetMotionMaster()->MovePoint(0, waypoint[cur_wp][0], waypoint[cur_wp][1], waypoint[cur_wp][2]); + ForceTimer = 5000; + } else ForceTimer -= diff; + + } + if (WaitEvent) + { + if (WaitTimer) + { + if (WaitTimer <= diff) + { + if (AfterMoving) + { + me->GetMotionMaster()->MoveIdle(); + AfterMoving = false; + } + + switch(WaitEvent) + { + case WE_PLATFORM: + Platforms_Move_Timer = 30000+rand()%5000; + break; + case WE_QUILL: + DoCast(me, SPELL_FLAME_QUILLS, true); + Platforms_Move_Timer = 1; + WaitTimer = 10000; + WaitEvent = WE_DUMMY; + return; + case WE_DIE: + ForceMove = false; + me->SetUInt32Value(UNIT_FIELD_BYTES_1, UNIT_STAND_STATE_DEAD); + WaitTimer = 5000; + WaitEvent = WE_REVIVE; + return; + case WE_REVIVE: + me->SetUInt32Value(UNIT_FIELD_BYTES_1, UNIT_STAND_STATE_STAND); + me->SetHealth(me->GetMaxHealth()); + me->SetSpeed(MOVE_RUN, DefaultMoveSpeedRate); + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + DoZoneInCombat(); + DoCast(me, SPELL_REBIRTH, true); + MeltArmor_Timer = 60000; + Charge_Timer = 7000; + DiveBomb_Timer = 40000+rand()%5000; + FlamePatch_Timer = 30000; + Phase1 = false; + break; + case WE_METEOR: + me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FIRE, false); + DoCast(me, SPELL_DIVE_BOMB_VISUAL, false); + WaitEvent = WE_DIVE; + WaitTimer = 4000; + return; + case WE_DIVE: + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + { + me->RemoveAurasDueToSpell(SPELL_DIVE_BOMB_VISUAL); + DoCast(pTarget, SPELL_DIVE_BOMB, true); + float dist = 3.0f; + if (me->IsWithinDist3d(pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 5.0f)) + dist = 5.0f; + WaitTimer = 1000 + floor(dist / 80 * 1000.0f); + me->GetMap()->CreatureRelocation(me, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(),0.0f); + me->StopMoving(); + WaitEvent = WE_LAND; + } + else + { + EnterEvadeMode(); + return; + } + case WE_LAND: + WaitEvent = WE_SUMMON; + WaitTimer = 2000; + return; + case WE_SUMMON: + for (uint8 i = 0; i < 2; ++i) + DoSpawnCreature(CREATURE_EMBER_OF_ALAR, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, 10); + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + me->SetDisplayId(me->GetNativeDisplayId()); + DoCast(me, SPELL_REBIRTH_2, true); + break; + case WE_DUMMY: + default: + break; + } + + WaitEvent = WE_NONE; + WaitTimer = 0; + } else WaitTimer -= diff; + } + return; + } + + if (Phase1) + { + if (me->getThreatManager().getThreatList().empty()) + { + EnterEvadeMode(); + return; + } + + if (Platforms_Move_Timer <= diff) + { + if (cur_wp == 4) + { + cur_wp = 0; + WaitEvent = WE_PLATFORM; + } + else + { + if (urand(0,4)) // next platform + { + DoSpawnCreature(CREATURE_EMBER_OF_ALAR, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + if (cur_wp == 3) + cur_wp = 0; + else + ++cur_wp; + WaitEvent = WE_PLATFORM; + } + else // flame quill + { + cur_wp = 4; + WaitEvent = WE_QUILL; + } + } + ForceMove = true; + ForceTimer = 5000; + me->GetMotionMaster()->MovePoint(0, waypoint[cur_wp][0], waypoint[cur_wp][1], waypoint[cur_wp][2]); + WaitTimer = 0; + return; + } else Platforms_Move_Timer -= diff; + } + else + { + if (Charge_Timer <= diff) + { + Unit *pTarget= SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true); + if (pTarget) + DoCast(pTarget, SPELL_CHARGE); + Charge_Timer = 30000; + } else Charge_Timer -= diff; + + if (MeltArmor_Timer <= diff) + { + DoCast(me->getVictim(), SPELL_MELT_ARMOR); + MeltArmor_Timer = 60000; + } else MeltArmor_Timer -= diff; + + if (DiveBomb_Timer <= diff) + { + me->AttackStop(); + me->GetMotionMaster()->MovePoint(6, waypoint[4][0], waypoint[4][1], waypoint[4][2]); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + me->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, 50); + WaitEvent = WE_METEOR; + WaitTimer = 0; + DiveBomb_Timer = 40000+rand()%5000; + return; + } else DiveBomb_Timer -= diff; + + if (FlamePatch_Timer <= diff) + { + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + { + Creature* Summoned = me->SummonCreature(CREATURE_FLAME_PATCH_ALAR, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 120000); + if (Summoned) + { + Summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + Summoned->SetFloatValue(OBJECT_FIELD_SCALE_X, Summoned->GetFloatValue(OBJECT_FIELD_SCALE_X)*2.5f); + Summoned->SetDisplayId(11686); + Summoned->setFaction(me->getFaction()); + Summoned->SetLevel(me->getLevel()); + Summoned->CastSpell(Summoned, SPELL_FLAME_PATCH, false); + } + } + FlamePatch_Timer = 30000; + } else FlamePatch_Timer -= diff; + } + + DoMeleeAttackIfReady(); + } + + void DoMeleeAttackIfReady() + { + if (me->isAttackReady() && !me->IsNonMeleeSpellCasted(false)) + { + if (me->IsWithinMeleeRange(me->getVictim())) + { + me->AttackerStateUpdate(me->getVictim()); + me->resetAttackTimer(); + } + else + { + Unit *pTarget = NULL; + pTarget = me->SelectNearestTargetInAttackDistance(5); + if (pTarget) + me->AI()->AttackStart(pTarget); + else + { + DoCast(me, SPELL_FLAME_BUFFET, true); + me->setAttackTimer(BASE_ATTACK, 1500); + } + } + } + } +}; + +CreatureAI* GetAI_boss_alar(Creature* pCreature) +{ + return new boss_alarAI(pCreature); +} + +struct mob_ember_of_alarAI : public ScriptedAI +{ + mob_ember_of_alarAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + c->SetUnitMovementFlags(MOVEMENTFLAG_LEVITATING); + c->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FIRE, true); + } + + ScriptedInstance *pInstance; + bool toDie; + + void Reset() {toDie = false;} + void EnterCombat(Unit * /*who*/) {DoZoneInCombat();} + void EnterEvadeMode() {me->setDeathState(JUST_DIED);} + + void DamageTaken(Unit* pKiller, uint32 &damage) + { + if (damage >= me->GetHealth() && pKiller != me && !toDie) + { + damage = 0; + DoCast(me, SPELL_EMBER_BLAST, true); + me->SetDisplayId(11686); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + if (pInstance && pInstance->GetData(DATA_ALAREVENT) == 2) + { + if (Unit* Alar = Unit::GetUnit((*me), pInstance->GetData64(DATA_ALAR))) + { + int AlarHealth = Alar->GetHealth() - Alar->GetMaxHealth()*0.03; + if (AlarHealth > 0) + Alar->SetHealth(AlarHealth); + else + Alar->SetHealth(1); + } + } + toDie = true; + } + } + + void UpdateAI(const uint32 /*diff*/) + { + if (!UpdateVictim()) + return; + + if (toDie) + { + me->DealDamage(me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); + //me->SetVisibility(VISIBILITY_OFF); + } + + DoMeleeAttackIfReady(); + } + +}; + +CreatureAI* GetAI_mob_ember_of_alar(Creature* pCreature) +{ + return new mob_ember_of_alarAI(pCreature); +} + +struct mob_flame_patch_alarAI : public ScriptedAI +{ + mob_flame_patch_alarAI(Creature *c) : ScriptedAI(c) {} + void Reset() {} + void EnterCombat(Unit * /*who*/) {} + void AttackStart(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} + void UpdateAI(const uint32 /*diff*/) {} +}; + +CreatureAI* GetAI_mob_flame_patch_alar(Creature* pCreature) +{ + return new mob_flame_patch_alarAI(pCreature); +} + +void AddSC_boss_alar() +{ + Script *newscript; + + newscript = new Script; + newscript->Name = "boss_alar"; + newscript->GetAI = &GetAI_boss_alar; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_ember_of_alar"; + newscript->GetAI = &GetAI_mob_ember_of_alar; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_flame_patch_alar"; + newscript->GetAI = &GetAI_mob_flame_patch_alar; + newscript->RegisterSelf(); +} + diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp new file mode 100644 index 00000000000..e9e217a5c62 --- /dev/null +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp @@ -0,0 +1,466 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Boss_Astromancer +SD%Complete: 80 +SDComment: +SDCategory: Tempest Keep, The Eye +EndScriptData */ + +#include "ScriptedPch.h" +#include "the_eye.h" + +enum eEnums +{ + SAY_AGGRO = -1550007, + SAY_SUMMON1 = -1550008, + SAY_SUMMON2 = -1550009, + SAY_KILL1 = -1550010, + SAY_KILL2 = -1550011, + SAY_KILL3 = -1550012, + SAY_DEATH = -1550013, + SAY_VOIDA = -1550014, + SAY_VOIDB = -1550015, + + SPELL_ARCANE_MISSILES = 33031, + SPELL_WRATH_OF_THE_ASTROMANCER = 42783, + SPELL_BLINDING_LIGHT = 33009, + SPELL_FEAR = 34322, + SPELL_VOID_BOLT = 39329, + + SPELL_SPOTLIGHT = 25824, + NPC_ASTROMANCER_SOLARIAN_SPOTLIGHT = 18928, + + NPC_SOLARIUM_AGENT = 18925, + NPC_SOLARIUM_PRIEST = 18806, + + MODEL_HUMAN = 18239, + MODEL_VOIDWALKER = 18988, + + SPELL_SOLARIUM_GREAT_HEAL = 33387, + SPELL_SOLARIUM_HOLY_SMITE = 25054, + SPELL_SOLARIUM_ARCANE_TORRENT = 33390, + + WV_ARMOR = 31000 +}; + +const float CENTER_X = 432.909f; +const float CENTER_Y = -373.424f; +const float CENTER_Z = 17.9608f; +const float CENTER_O = 1.06421f; +const float SMALL_PORTAL_RADIUS = 12.6f; +const float LARGE_PORTAL_RADIUS = 26.0f; +const float PORTAL_Z = 17.005f; + + // x, y, z, o +static float SolarianPos[4] = {432.909, -373.424, 17.9608, 1.06421}; + +struct boss_high_astromancer_solarianAI : public ScriptedAI +{ + boss_high_astromancer_solarianAI(Creature *c) : ScriptedAI(c), Summons(me) + { + pInstance = c->GetInstanceData(); + + defaultarmor = c->GetArmor(); + defaultsize = c->GetFloatValue(OBJECT_FIELD_SCALE_X); + } + + ScriptedInstance *pInstance; + SummonList Summons; + + uint8 Phase; + + uint32 ArcaneMissiles_Timer; + uint32 m_uiWrathOfTheAstromancer_Timer; + uint32 BlindingLight_Timer; + uint32 Fear_Timer; + uint32 VoidBolt_Timer; + uint32 Phase1_Timer; + uint32 Phase2_Timer; + uint32 Phase3_Timer; + uint32 AppearDelay_Timer; + uint32 defaultarmor; + uint32 Wrath_Timer; + + float defaultsize; + float Portals[3][3]; + + bool AppearDelay; + bool BlindingLight; + + void Reset() + { + ArcaneMissiles_Timer = 2000; + m_uiWrathOfTheAstromancer_Timer = 15000; + BlindingLight_Timer = 41000; + Fear_Timer = 20000; + VoidBolt_Timer = 10000; + Phase1_Timer = 50000; + Phase2_Timer = 10000; + Phase3_Timer = 15000; + AppearDelay_Timer = 2000; + BlindingLight = false; + AppearDelay = false; + Wrath_Timer = 20000+rand()%5000;//twice in phase one + Phase = 1; + Wrath_Timer = 20000+rand()%5000;//twice in phase one + + if (pInstance) + pInstance->SetData(DATA_HIGHASTROMANCERSOLARIANEVENT, NOT_STARTED); + + me->SetArmor(defaultarmor); + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + me->SetVisibility(VISIBILITY_ON); + me->SetFloatValue(OBJECT_FIELD_SCALE_X, defaultsize); + me->SetDisplayId(MODEL_HUMAN); + + Summons.DespawnAll(); + } + + void KilledUnit(Unit * /*victim*/) + { + DoScriptText(RAND(SAY_KILL1,SAY_KILL2,SAY_KILL3), me); + } + + void JustDied(Unit * /*victim*/) + { + me->SetFloatValue(OBJECT_FIELD_SCALE_X, defaultsize); + me->SetDisplayId(MODEL_HUMAN); + DoScriptText(SAY_DEATH, me); + + if (pInstance) + pInstance->SetData(DATA_HIGHASTROMANCERSOLARIANEVENT, DONE); + } + + void EnterCombat(Unit * /*who*/) + { + DoScriptText(SAY_AGGRO, me); + DoZoneInCombat(); + + if (pInstance) + pInstance->SetData(DATA_HIGHASTROMANCERSOLARIANEVENT, IN_PROGRESS); + } + + void SummonMinion(uint32 entry, float x, float y, float z) + { + Creature* Summoned = me->SummonCreature(entry, x, y, z, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + if (Summoned) + { + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + Summoned->AI()->AttackStart(pTarget); + + Summons.Summon(Summoned); + } + } + + float Portal_X(float radius) + { + if (urand(0,1)) + radius = -radius; + + return radius * (float)(rand()%100)/100.0f + CENTER_X; + } + + float Portal_Y(float x, float radius) + { + float z = RAND(1, -1); + + return (z*sqrt(radius*radius - (x - CENTER_X)*(x - CENTER_X)) + CENTER_Y); + } + + void UpdateAI(const uint32 diff) + { + if (!UpdateVictim()) + return; + + if (AppearDelay) + { + me->StopMoving(); + me->AttackStop(); + if (AppearDelay_Timer <= diff) + { + AppearDelay = false; + if (Phase == 2) + { + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + me->SetVisibility(VISIBILITY_OFF); + } + AppearDelay_Timer = 2000; + } else AppearDelay_Timer -= diff; + } + + if (Phase == 1) + { + if (BlindingLight_Timer <= diff) + { + BlindingLight = true; + BlindingLight_Timer = 45000; + } else BlindingLight_Timer -= diff; + + if (Wrath_Timer <= diff) + { + me->InterruptNonMeleeSpells(false); + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true)) + DoCast(pTarget, SPELL_WRATH_OF_THE_ASTROMANCER, true); + Wrath_Timer = 20000+rand()%5000; + } else Wrath_Timer -= diff; + + if (ArcaneMissiles_Timer <= diff) + { + if (BlindingLight) + { + DoCast(me->getVictim(), SPELL_BLINDING_LIGHT); + BlindingLight = false; + }else{ + Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); + + if (!me->HasInArc(2.5f, pTarget)) + pTarget = me->getVictim(); + + if (pTarget) + DoCast(pTarget, SPELL_ARCANE_MISSILES); + } + ArcaneMissiles_Timer = 3000; + } else ArcaneMissiles_Timer -= diff; + + if (m_uiWrathOfTheAstromancer_Timer <= diff) + { + me->InterruptNonMeleeSpells(false); + + //Target the tank ? + if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 1)) + if (pTarget->GetTypeId() == TYPEID_PLAYER) + { + DoCast(pTarget, SPELL_WRATH_OF_THE_ASTROMANCER); + m_uiWrathOfTheAstromancer_Timer = 25000; + } + else + m_uiWrathOfTheAstromancer_Timer = 1000; + } else m_uiWrathOfTheAstromancer_Timer -= diff; + + //Phase1_Timer + if (Phase1_Timer <= diff) + { + Phase = 2; + Phase1_Timer = 50000; + //After these 50 seconds she portals to the middle of the room and disappears, leaving 3 light portals behind. + me->GetMotionMaster()->Clear(); + me->GetMap()->CreatureRelocation(me, CENTER_X, CENTER_Y, CENTER_Z, CENTER_O); + for (uint8 i=0; i <= 2; ++i) + { + if (!i) + { + Portals[i][0] = Portal_X(SMALL_PORTAL_RADIUS); + Portals[i][1] = Portal_Y(Portals[i][0], SMALL_PORTAL_RADIUS); + Portals[i][2] = CENTER_Z; + } + else + { + Portals[i][0] = Portal_X(LARGE_PORTAL_RADIUS); + Portals[i][1] = Portal_Y(Portals[i][0], LARGE_PORTAL_RADIUS); + Portals[i][2] = PORTAL_Z; + } + } + if ((abs(Portals[2][0] - Portals[1][0]) < 7) && (abs(Portals[2][1] - Portals[1][1]) < 7)) + { + int i=1; + if (abs(CENTER_X + 26.0f - Portals[2][0]) < 7) + i = -1; + Portals[2][0] = Portals[2][0]+7*i; + Portals[2][1] = Portal_Y(Portals[2][0], LARGE_PORTAL_RADIUS); + } + for (int i=0; i <= 2; ++i) + { + if (Creature* Summoned = me->SummonCreature(NPC_ASTROMANCER_SOLARIAN_SPOTLIGHT, Portals[i][0], Portals[i][1], Portals[i][2], CENTER_O, TEMPSUMMON_TIMED_DESPAWN, Phase2_Timer+Phase3_Timer+AppearDelay_Timer+1700)) + { + Summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + Summoned->CastSpell(Summoned, SPELL_SPOTLIGHT, false); + } + } + AppearDelay = true; + } else Phase1_Timer-=diff; + } + else if (Phase == 2) + { + //10 seconds after Solarian disappears, 12 mobs spawn out of the three portals. + me->AttackStop(); + me->StopMoving(); + if (Phase2_Timer <= diff) + { + Phase = 3; + for (int i=0; i <= 2; ++i) + for (int j=1; j <= 4; j++) + SummonMinion(NPC_SOLARIUM_AGENT, Portals[i][0], Portals[i][1], Portals[i][2]); + + DoScriptText(SAY_SUMMON1, me); + Phase2_Timer = 10000; + } else Phase2_Timer -= diff; + } + else if (Phase == 3) + { + me->AttackStop(); + me->StopMoving(); + + //Check Phase3_Timer + if (Phase3_Timer <= diff) + { + Phase = 1; + + //15 seconds later Solarian reappears out of one of the 3 portals. Simultaneously, 2 healers appear in the two other portals. + int i = rand()%3; + me->GetMotionMaster()->Clear(); + me->GetMap()->CreatureRelocation(me, Portals[i][0], Portals[i][1], Portals[i][2], CENTER_O); + + for (int j=0; j <= 2; j++) + if (j != i) + SummonMinion(NPC_SOLARIUM_PRIEST, Portals[j][0], Portals[j][1], Portals[j][2]); + + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + me->SetVisibility(VISIBILITY_ON); + + DoScriptText(SAY_SUMMON2, me); + AppearDelay = true; + Phase3_Timer = 15000; + } else Phase3_Timer -= diff; + } + else if (Phase == 4) + { + //Fear_Timer + if (Fear_Timer <= diff) + { + DoCast(me, SPELL_FEAR); + Fear_Timer = 20000; + } else Fear_Timer -= diff; + + //VoidBolt_Timer + if (VoidBolt_Timer <= diff) + { + DoCast(me->getVictim(), SPELL_VOID_BOLT); + VoidBolt_Timer = 10000; + } else VoidBolt_Timer -= diff; + } + + //When Solarian reaches 20% she will transform into a huge void walker. + if (Phase != 4 && ((me->GetHealth()*100 / me->GetMaxHealth())<20)) + { + Phase = 4; + + //To make sure she wont be invisible or not selecatble + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + me->SetVisibility(VISIBILITY_ON); + DoScriptText(SAY_VOIDA, me); + DoScriptText(SAY_VOIDB, me); + me->SetArmor(WV_ARMOR); + me->SetDisplayId(MODEL_VOIDWALKER); + me->SetFloatValue(OBJECT_FIELD_SCALE_X, defaultsize*2.5f); + } + + DoMeleeAttackIfReady(); + } +}; + +struct mob_solarium_priestAI : public ScriptedAI +{ + mob_solarium_priestAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + } + + ScriptedInstance *pInstance; + + uint32 healTimer; + uint32 holysmiteTimer; + uint32 aoesilenceTimer; + + void Reset() + { + healTimer = 9000; + holysmiteTimer = 1; + aoesilenceTimer = 15000; + } + + void EnterCombat(Unit * /*who*/) + { + } + + void UpdateAI(const uint32 diff) + { + if (!UpdateVictim()) + return; + + if (healTimer <= diff) + { + Unit *pTarget = NULL; + + switch (urand(0,1)) + { + case 0: + if (pInstance) + pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_ASTROMANCER)); + break; + case 1: + pTarget = me; + break; + } + + if (pTarget) + { + DoCast(pTarget, SPELL_SOLARIUM_GREAT_HEAL); + healTimer = 9000; + } + } else healTimer -= diff; + + if (holysmiteTimer <= diff) + { + DoCast(me->getVictim(), SPELL_SOLARIUM_HOLY_SMITE); + holysmiteTimer = 4000; + } else holysmiteTimer -= diff; + + if (aoesilenceTimer <= diff) + { + DoCast(me->getVictim(), SPELL_SOLARIUM_ARCANE_TORRENT); + aoesilenceTimer = 13000; + } else aoesilenceTimer -= diff; + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_mob_solarium_priest(Creature* pCreature) +{ + return new mob_solarium_priestAI (pCreature); +} + +CreatureAI* GetAI_boss_high_astromancer_solarian(Creature* pCreature) +{ + return new boss_high_astromancer_solarianAI (pCreature); +} + +void AddSC_boss_high_astromancer_solarian() +{ + Script *newscript; + newscript = new Script; + newscript->Name = "boss_high_astromancer_solarian"; + newscript->GetAI = &GetAI_boss_high_astromancer_solarian; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_solarium_priest"; + newscript->GetAI = &GetAI_mob_solarium_priest; + newscript->RegisterSelf(); +} + diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp new file mode 100644 index 00000000000..05681fb7539 --- /dev/null +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp @@ -0,0 +1,1498 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Boss_Kaelthas +SD%Complete: 60 +SDComment: SQL, weapon scripts, mind control, need correct spells(interruptible/uninterruptible), phoenix spawn location & animation, phoenix behaviour & spawn during gravity lapse +SDCategory: Tempest Keep, The Eye +EndScriptData */ + +#include "ScriptedPch.h" +#include "the_eye.h" +#include "WorldPacket.h" + +enum eEnums +{ + //kael'thas Speech + SAY_INTRO = -1550016, + SAY_INTRO_CAPERNIAN = -1550017, + SAY_INTRO_TELONICUS = -1550018, + SAY_INTRO_THALADRED = -1550019, + SAY_INTRO_SANGUINAR = -1550020, + SAY_PHASE2_WEAPON = -1550021, + SAY_PHASE3_ADVANCE = -1550022, + SAY_PHASE4_INTRO2 = -1550023, + SAY_PHASE5_NUTS = -1550024, + SAY_SLAY1 = -1550025, + SAY_SLAY2 = -1550026, + SAY_SLAY3 = -1550027, + SAY_MINDCONTROL1 = -1550028, + SAY_MINDCONTROL2 = -1550029, + SAY_GRAVITYLAPSE1 = -1550030, + SAY_GRAVITYLAPSE2 = -1550031, + SAY_SUMMON_PHOENIX1 = -1550032, + SAY_SUMMON_PHOENIX2 = -1550033, + SAY_DEATH = -1550034, + + //Thaladred the Darkener speech + SAY_THALADRED_AGGRO = -1550035, + SAY_THALADRED_DEATH = -1550036, + EMOTE_THALADRED_GAZE = -1550037, + + //Lord Sanguinar speech + SAY_SANGUINAR_AGGRO = -1550038, + SAY_SANGUINAR_DEATH = -1550039, + + //Grand Astromancer Capernian speech + SAY_CAPERNIAN_AGGRO = -1550040, + SAY_CAPERNIAN_DEATH = -1550041, + + //Master Engineer Telonicus speech + SAY_TELONICUS_AGGRO = -1550042, + SAY_TELONICUS_DEATH = -1550043, + + //Phase 2 spells + SPELL_SUMMON_WEAPONS = 36976, + SPELL_SUMMON_WEAPONA = 36958, + SPELL_SUMMON_WEAPONB = 36959, + SPELL_SUMMON_WEAPONC = 36960, + SPELL_SUMMON_WEAPOND = 36961, + SPELL_SUMMON_WEAPONE = 36962, + SPELL_SUMMON_WEAPONF = 36963, + SPELL_SUMMON_WEAPONG = 36964, + SPELL_RES_VISUAL = 24171, + + //Phase 4 spells + SPELL_FIREBALL = 22088, //wrong but works with CastCustomSpell + SPELL_PYROBLAST = 36819, + SPELL_FLAME_STRIKE = 36735, + SPELL_FLAME_STRIKE_VIS = 36730, + SPELL_FLAME_STRIKE_DMG = 36731, + SPELL_ARCANE_DISRUPTION = 36834, + SPELL_SHOCK_BARRIER = 36815, + SPELL_PHOENIX_ANIMATION = 36723, + SPELL_MIND_CONTROL = 32830, + + //Phase 5 spells + SPELL_EXPLODE = 36092, + SPELL_FULLPOWER = 36187, + SPELL_KNOCKBACK = 11027, + SPELL_GRAVITY_LAPSE = 34480, + SPELL_GRAVITY_LAPSE_AURA = 39432, + SPELL_NETHER_BEAM = 35873, + + //Thaladred the Darkener spells + SPELL_PSYCHIC_BLOW = 10689, + SPELL_SILENCE = 30225, + //Lord Sanguinar spells + SPELL_BELLOWING_ROAR = 40636, + //Grand Astromancer Capernian spells + + SPELL_CAPERNIAN_FIREBALL = 36971, + SPELL_CONFLAGRATION = 37018, + SPELL_ARCANE_EXPLOSION = 36970, + //Master Engineer Telonicus spells + SPELL_BOMB = 37036, + SPELL_REMOTE_TOY = 37027, + //Nether Vapor spell + SPELL_NETHER_VAPOR = 35859, + //Phoenix spell + SPELL_BURN = 36720, + SPELL_EMBER_BLAST = 34341, + SPELL_REBIRTH = 41587, + + //Creature IDs + NPC_PHOENIX = 21362, + NPC_PHOENIX_EGG = 21364, + + //Phoenix egg and phoenix model + MODEL_ID_PHOENIX = 19682, + MODEL_ID_PHOENIX_EGG = 20245, + + MAX_ADVISORS = 4 +}; + +uint32 m_auiSpellSummonWeapon[]= +{ + SPELL_SUMMON_WEAPONA, SPELL_SUMMON_WEAPONB, SPELL_SUMMON_WEAPONC, SPELL_SUMMON_WEAPOND, + SPELL_SUMMON_WEAPONE, SPELL_SUMMON_WEAPONF, SPELL_SUMMON_WEAPONG +}; + +const float CAPERNIAN_DISTANCE = 20.0f; //she casts away from the target +const float KAEL_VISIBLE_RANGE = 50.0f; + +const float afGravityPos[3] = {795.0f, 0.0f, 70.0f}; + +#define TIME_PHASE_2_3 120000 +#define TIME_PHASE_3_4 180000 + +//Base AI for Advisors +struct advisorbase_ai : public ScriptedAI +{ + advisorbase_ai(Creature* pCreature) : ScriptedAI(pCreature) + { + m_pInstance = pCreature->GetInstanceData(); + m_bDoubled_Health = false; + } + + ScriptedInstance* m_pInstance; + bool FakeDeath; + bool m_bDoubled_Health; + uint32 DelayRes_Timer; + uint64 DelayRes_Target; + + void Reset() + { + if (m_bDoubled_Health) + { + me->SetMaxHealth(me->GetMaxHealth() / 2); + m_bDoubled_Health = false; + } + + FakeDeath = false; + DelayRes_Timer = 0; + DelayRes_Target = 0; + + me->SetStandState(UNIT_STAND_STATE_STAND); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + + //reset encounter + if (m_pInstance && (m_pInstance->GetData(DATA_KAELTHASEVENT) == 1 || m_pInstance->GetData(DATA_KAELTHASEVENT) == 3)) + if (Creature *Kaelthas = Unit::GetCreature((*me), m_pInstance->GetData64(DATA_KAELTHAS))) + Kaelthas->AI()->EnterEvadeMode(); + } + + void MoveInLineOfSight(Unit *who) + { + if (!who || FakeDeath || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) + return; + + ScriptedAI::MoveInLineOfSight(who); + } + + void AttackStart(Unit* who) + { + if (!who || FakeDeath || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) + return; + + ScriptedAI::AttackStart(who); + } + + void Revive(Unit* /*Target*/) + { + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + // double health for phase 3 + me->SetMaxHealth(me->GetMaxHealth() * 2); + m_bDoubled_Health = true; + me->SetHealth(me->GetMaxHealth()); + me->SetStandState(UNIT_STAND_STATE_STAND); + + DoCast(me, SPELL_RES_VISUAL, false); + DelayRes_Timer = 2000; + } + + void DamageTaken(Unit* pKiller, uint32 &damage) + { + if (damage < me->GetHealth()) + return; + + //Prevent glitch if in fake death + if (FakeDeath && m_pInstance && m_pInstance->GetData(DATA_KAELTHASEVENT) != 0) + { + damage = 0; + return; + } + + //Don't really die in phase 1 & 3, only die after that + if (m_pInstance && m_pInstance->GetData(DATA_KAELTHASEVENT) != 0) + { + //prevent death + damage = 0; + FakeDeath = true; + + me->InterruptNonMeleeSpells(false); + me->SetHealth(0); + me->StopMoving(); + me->ClearComboPointHolders(); + me->RemoveAllAurasOnDeath(); + me->ModifyAuraState(AURA_STATE_HEALTHLESS_20_PERCENT, false); + me->ModifyAuraState(AURA_STATE_HEALTHLESS_35_PERCENT, false); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + me->ClearAllReactives(); + me->SetUInt64Value(UNIT_FIELD_TARGET,0); + me->GetMotionMaster()->Clear(); + me->GetMotionMaster()->MoveIdle(); + me->SetStandState(UNIT_STAND_STATE_DEAD); + JustDied(pKiller); + } + } + + void UpdateAI(const uint32 diff) + { + if (DelayRes_Timer) + { + if (DelayRes_Timer <= diff) + { + DelayRes_Timer = 0; + FakeDeath = false; + + Unit* Target = Unit::GetUnit((*me), DelayRes_Target); + if (!Target) + Target = me->getVictim(); + + DoResetThreat(); + AttackStart(Target); + me->GetMotionMaster()->Clear(); + me->GetMotionMaster()->MoveChase(Target); + me->AddThreat(Target, 0.0f); + } else DelayRes_Timer -= diff; + } + } + +}; + +//Kael'thas AI +struct boss_kaelthasAI : public ScriptedAI +{ + boss_kaelthasAI(Creature* pCreature) : ScriptedAI(pCreature), summons(me) + { + m_pInstance = pCreature->GetInstanceData(); + memset(&m_auiAdvisorGuid, 0, sizeof(m_auiAdvisorGuid)); + } + + ScriptedInstance* m_pInstance; + + uint32 Fireball_Timer; + uint32 ArcaneDisruption_Timer; + uint32 Phoenix_Timer; + uint32 ShockBarrier_Timer; + uint32 GravityLapse_Timer; + uint32 GravityLapse_Phase; + uint32 NetherBeam_Timer; + uint32 NetherVapor_Timer; + uint32 FlameStrike_Timer; + uint32 MindControl_Timer; + uint32 Phase; + uint32 PhaseSubphase; //generic + uint32 Phase_Timer; //generic timer + uint32 PyrosCasted; + + bool InGravityLapse; + bool IsCastingFireball; + bool ChainPyros; + + SummonList summons; + + uint64 m_auiAdvisorGuid[MAX_ADVISORS]; + + void Reset() + { + Fireball_Timer = 5000+rand()%10000; + ArcaneDisruption_Timer = 45000; + MindControl_Timer = 40000; + Phoenix_Timer = 50000; + ShockBarrier_Timer = 60000; + FlameStrike_Timer = 30000; + GravityLapse_Timer = 20000; + GravityLapse_Phase = 0; + NetherBeam_Timer = 8000; + NetherVapor_Timer = 10000; + PyrosCasted = 0; + Phase = 0; + InGravityLapse = false; + IsCastingFireball = false; + ChainPyros = false; + + if (me->isInCombat()) + PrepareAdvisors(); + + summons.DespawnAll(); + + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + + if (m_pInstance) + m_pInstance->SetData(DATA_KAELTHASEVENT, 0); + } + + void PrepareAdvisors() + { + for (uint8 i = 0; i < MAX_ADVISORS; ++i) + { + if (Creature *pCreature = Unit::GetCreature((*me), m_auiAdvisorGuid[i])) + { + pCreature->Respawn(); + pCreature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + pCreature->setFaction(me->getFaction()); + pCreature->AI()->EnterEvadeMode(); + } + } + } + + void StartEvent() + { + if (!m_pInstance) + return; + + m_auiAdvisorGuid[0] = m_pInstance->GetData64(DATA_THALADREDTHEDARKENER); + m_auiAdvisorGuid[1] = m_pInstance->GetData64(DATA_LORDSANGUINAR); + m_auiAdvisorGuid[2] = m_pInstance->GetData64(DATA_GRANDASTROMANCERCAPERNIAN); + m_auiAdvisorGuid[3] = m_pInstance->GetData64(DATA_MASTERENGINEERTELONICUS); + + if (!m_auiAdvisorGuid[0] || !m_auiAdvisorGuid[1] || !m_auiAdvisorGuid[2] || !m_auiAdvisorGuid[3]) + { + error_log("TSCR: Kael'Thas One or more advisors missing, Skipping Phases 1-3"); + + DoScriptText(SAY_PHASE4_INTRO2, me); + + Phase = 4; + + m_pInstance->SetData(DATA_KAELTHASEVENT, 4); + + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + AttackStart(pTarget); + + } + else + { + PrepareAdvisors(); + + DoScriptText(SAY_INTRO, me); + + m_pInstance->SetData(DATA_KAELTHASEVENT, 1); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + + PhaseSubphase = 0; + Phase_Timer = 23000; + Phase = 1; + } + } + + void MoveInLineOfSight(Unit *who) + { + if (!me->hasUnitState(UNIT_STAT_STUNNED) && who->isTargetableForAttack() && + me->IsHostileTo(who) && who->isInAccessiblePlaceFor(me)) + { + if (!me->canFly() && me->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) + return; + + float attackRadius = me->GetAttackDistance(who); + if (me->IsWithinDistInMap(who, attackRadius) && me->IsWithinLOSInMap(who)) + { + if (!me->getVictim() && Phase >= 4) + { + who->RemoveAurasDueToSpell(SPELL_AURA_MOD_STEALTH); + AttackStart(who); + } + else if (me->GetMap()->IsDungeon()) + { + if (m_pInstance && !m_pInstance->GetData(DATA_KAELTHASEVENT) && !Phase) + StartEvent(); + + who->SetInCombatWith(me); + me->AddThreat(who, 0.0f); + } + } + } + } + + void Aggro(Unit * /*who*/) + { + if (m_pInstance && !m_pInstance->GetData(DATA_KAELTHASEVENT) && !Phase) + StartEvent(); + } + + void KilledUnit() + { + DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2,SAY_SLAY3), me); + } + + void JustSummoned(Creature* pSummoned) + { + // if not phoenix, then it's one of the 7 weapons + if (pSummoned->GetEntry() != NPC_PHOENIX) + { + if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + pSummoned->AI()->AttackStart(pTarget); + + summons.Summon(pSummoned); + } + } + + void SummonedCreatureDespawn(Creature *summon) {summons.Despawn(summon);} + + void JustDied(Unit* /*Killer*/) + { + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + + DoScriptText(SAY_DEATH, me); + + summons.DespawnAll(); + + if (m_pInstance) + m_pInstance->SetData(DATA_KAELTHASEVENT, 0); + + for (uint8 i = 0; i < MAX_ADVISORS; ++i) + { + if (Unit* pAdvisor = Unit::GetUnit((*me), m_auiAdvisorGuid[i])) + pAdvisor->Kill(pAdvisor); + } + } + + void UpdateAI(const uint32 diff) + { + //Phase 1 + switch (Phase) + { + case 1: + { + Unit *pTarget = NULL; + Creature* Advisor = NULL; + + //Subphase switch + switch(PhaseSubphase) + { + //Subphase 1 - Start + case 0: + if (Phase_Timer <= diff) + { + DoScriptText(SAY_INTRO_THALADRED, me); + + //start advisor within 7 seconds + Phase_Timer = 7000; + ++PhaseSubphase; + } else Phase_Timer -= diff; + break; + + //Subphase 1 - Unlock advisor + case 1: + if (Phase_Timer <= diff) + { + Advisor = (Unit::GetCreature((*me), m_auiAdvisorGuid[0])); + + if (Advisor) + { + Advisor->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + Advisor->setFaction(me->getFaction()); + + pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); + if (pTarget) + Advisor->AI()->AttackStart(pTarget); + } + + ++PhaseSubphase; + } else Phase_Timer -= diff; + break; + + //Subphase 2 - Start + case 2: + Advisor = (Unit::GetCreature((*me), m_auiAdvisorGuid[0])); + + if (Advisor && (Advisor->getStandState() == UNIT_STAND_STATE_DEAD)) + { + DoScriptText(SAY_INTRO_SANGUINAR, me); + + //start advisor within 12.5 seconds + Phase_Timer = 12500; + ++PhaseSubphase; + } + break; + + //Subphase 2 - Unlock advisor + case 3: + if (Phase_Timer <= diff) + { + Advisor = (Unit::GetCreature((*me), m_auiAdvisorGuid[1])); + + if (Advisor) + { + Advisor->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + Advisor->setFaction(me->getFaction()); + + pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); + if (pTarget) + Advisor->AI()->AttackStart(pTarget); + } + + ++PhaseSubphase; + } else Phase_Timer -= diff; + break; + + //Subphase 3 - Start + case 4: + Advisor = (Unit::GetCreature((*me), m_auiAdvisorGuid[1])); + + if (Advisor && (Advisor->getStandState() == UNIT_STAND_STATE_DEAD)) + { + DoScriptText(SAY_INTRO_CAPERNIAN, me); + + //start advisor within 7 seconds + Phase_Timer = 7000; + ++PhaseSubphase; + } + break; + + //Subphase 3 - Unlock advisor + case 5: + if (Phase_Timer <= diff) + { + Advisor = (Unit::GetCreature((*me), m_auiAdvisorGuid[2])); + + if (Advisor) + { + Advisor->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + Advisor->setFaction(me->getFaction()); + + pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); + if (pTarget) + Advisor->AI()->AttackStart(pTarget); + } + + ++PhaseSubphase; + } else Phase_Timer -= diff; + break; + + //Subphase 4 - Start + case 6: + Advisor = (Unit::GetCreature((*me), m_auiAdvisorGuid[2])); + + if (Advisor && (Advisor->getStandState() == UNIT_STAND_STATE_DEAD)) + { + DoScriptText(SAY_INTRO_TELONICUS, me); + + //start advisor within 8.4 seconds + Phase_Timer = 8400; + ++PhaseSubphase; + } + break; + + //Subphase 4 - Unlock advisor + case 7: + if (Phase_Timer <= diff) + { + Advisor = (Unit::GetCreature((*me), m_auiAdvisorGuid[3])); + + if (Advisor) + { + Advisor->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + Advisor->setFaction(me->getFaction()); + + pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); + if (pTarget) + Advisor->AI()->AttackStart(pTarget); + } + + Phase_Timer = 3000; + ++PhaseSubphase; + } else Phase_Timer -= diff; + break; + + //End of phase 1 + case 8: + Advisor = (Unit::GetCreature((*me), m_auiAdvisorGuid[3])); + + if (Advisor && (Advisor->getStandState() == UNIT_STAND_STATE_DEAD)) + { + Phase = 2; + if (m_pInstance) + m_pInstance->SetData(DATA_KAELTHASEVENT, 2); + + DoScriptText(SAY_PHASE2_WEAPON, me); + + PhaseSubphase = 0; + Phase_Timer = 3500; + DoCast(me, SPELL_SUMMON_WEAPONS); + } + break; + } + } + break; + + case 2: + { + if (PhaseSubphase == 0) + { + if (Phase_Timer <= diff) + { + PhaseSubphase = 1; + } else Phase_Timer -= diff; + } + + //Spawn weapons + if (PhaseSubphase == 1) + { + DoCast(me, SPELL_SUMMON_WEAPONS, false); + + uint8 uiMaxWeapon = sizeof(m_auiSpellSummonWeapon)/sizeof(uint32); + + for (uint32 i = 0; i < uiMaxWeapon; ++i) + DoCast(me, m_auiSpellSummonWeapon[i], true); + + PhaseSubphase = 2; + Phase_Timer = TIME_PHASE_2_3; + } + + if (PhaseSubphase == 2) + { + if (Phase_Timer <= diff) + { + DoScriptText(SAY_PHASE3_ADVANCE, me); + if (m_pInstance) + m_pInstance->SetData(DATA_KAELTHASEVENT, 3); + Phase = 3; + PhaseSubphase = 0; + } else Phase_Timer -= diff; + } + } + break; + + case 3: + { + if (PhaseSubphase == 0) + { + //Respawn advisors + Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); + + Creature *Advisor; + for (uint8 i = 0; i < MAX_ADVISORS; ++i) + { + Advisor = Unit::GetCreature((*me), m_auiAdvisorGuid[i]); + + if (!Advisor) + error_log("SD2: Kael'Thas Advisor %u does not exist. Possibly despawned? Incorrectly Killed?", i); + else + CAST_AI(advisorbase_ai, Advisor->AI())->Revive(pTarget); + } + + PhaseSubphase = 1; + Phase_Timer = TIME_PHASE_3_4; + } + + if (Phase_Timer <= diff) + { + DoScriptText(SAY_PHASE4_INTRO2, me); + Phase = 4; + + if (m_pInstance) + m_pInstance->SetData(DATA_KAELTHASEVENT, 4); + + // Sometimes people can collect Aggro in Phase 1-3. Reset threat before releasing Kael. + DoResetThreat(); + + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + AttackStart(pTarget); + + Phase_Timer = 30000; + } else Phase_Timer -= diff; + } + break; + + case 4: + case 5: + case 6: + { + //Return since we have no target + if (!UpdateVictim()) + return; + + //Fireball_Timer + if (!InGravityLapse && !ChainPyros && Phase != 5) + { + if (Fireball_Timer <= diff) + { + if (!IsCastingFireball) + { + if (!me->IsNonMeleeSpellCasted(false)) + { + //interruptable + me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_INTERRUPT_CAST, false); + int32 dmg = 20000+rand()%5000; + me->CastCustomSpell(me->getVictim(), SPELL_FIREBALL, &dmg, 0, 0, false); + IsCastingFireball = true; + Fireball_Timer = 2500; + } + } + else + { + //apply resistance + me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_INTERRUPT_CAST, true); + IsCastingFireball = false; + Fireball_Timer = 5000+rand()%10000; + } + } else Fireball_Timer -= diff; + + //ArcaneDisruption_Timer + if (ArcaneDisruption_Timer <= diff) + { + DoCast(me->getVictim(), SPELL_ARCANE_DISRUPTION, true); + ArcaneDisruption_Timer = 60000; + } else ArcaneDisruption_Timer -= diff; + + if (FlameStrike_Timer <= diff) + { + if (Unit* pUnit = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(pUnit, SPELL_FLAME_STRIKE); + + FlameStrike_Timer = 30000; + } else FlameStrike_Timer -= diff; + + if (MindControl_Timer <= diff) + { + if (me->getThreatManager().getThreatList().size() >= 2) + for (uint32 i = 0; i < 3; ++i) + { + debug_log("SD2: Kael'Thas mind control not supported."); + //DoCast(pUnit, SPELL_MIND_CONTROL); + } + + MindControl_Timer = 60000; + } else MindControl_Timer -= diff; + } + + //Phoenix_Timer + if (Phoenix_Timer <= diff) + { + DoCast(me, SPELL_PHOENIX_ANIMATION); + DoScriptText(RAND(SAY_SUMMON_PHOENIX1,SAY_SUMMON_PHOENIX2), me); + + Phoenix_Timer = 60000; + } else Phoenix_Timer -= diff; + + //Phase 4 specific spells + if (Phase == 4) + { + if (me->GetHealth()*100 / me->GetMaxHealth() < 50) + { + if (m_pInstance) + m_pInstance->SetData(DATA_KAELTHASEVENT, 4); + Phase = 5; + Phase_Timer = 10000; + + DoScriptText(SAY_PHASE5_NUTS, me); + + me->StopMoving(); + me->GetMotionMaster()->Clear(); + me->GetMotionMaster()->MoveIdle(); + me->GetMap()->CreatureRelocation(me, afGravityPos[0], afGravityPos[1], afGravityPos[2], 0); + me->SendMonsterMove(afGravityPos[0], afGravityPos[1], afGravityPos[2], 0, 0, 0); + + me->InterruptNonMeleeSpells(false); + DoCast(me, SPELL_FULLPOWER); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + } + + //ShockBarrier_Timer + if (ShockBarrier_Timer <= diff) + { + DoCast(me, SPELL_SHOCK_BARRIER); + ChainPyros = true; + PyrosCasted = 0; + ShockBarrier_Timer = 60000; + } else ShockBarrier_Timer -= diff; + + //Chain Pyros (3 of them max) + if (ChainPyros && !me->IsNonMeleeSpellCasted(false)) + { + if (PyrosCasted < 3) + { + DoCast(me->getVictim(), SPELL_PYROBLAST); + ++PyrosCasted; + } + else + { + ChainPyros = false; + Fireball_Timer = 2500; + ArcaneDisruption_Timer = 60000; + } + } + } + + if (Phase == 5) + { + if (Phase_Timer <= diff) + { + me->InterruptNonMeleeSpells(false); + me->RemoveAurasDueToSpell(SPELL_FULLPOWER); + + DoCast(me, SPELL_EXPLODE); + + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + Phase = 6; + AttackStart(me->getVictim()); + } else Phase_Timer -= diff; + } + + //Phase 5 + if (Phase == 6) + { + + //GravityLapse_Timer + if (GravityLapse_Timer <= diff) + { + std::list::const_iterator i = me->getThreatManager().getThreatList().begin(); + switch (GravityLapse_Phase) + { + case 0: + me->StopMoving(); + me->GetMotionMaster()->Clear(); + me->GetMotionMaster()->MoveIdle(); + me->GetMap()->CreatureRelocation(me, afGravityPos[0], afGravityPos[1], afGravityPos[2], 0); + me->SendMonsterMove(afGravityPos[0], afGravityPos[1], afGravityPos[2], 0, MOVEMENTFLAG_NONE, 0); + + // 1) Kael'thas will portal the whole raid right into his body + for (i = me->getThreatManager().getThreatList().begin(); i!= me->getThreatManager().getThreatList().end(); ++i) + { + Unit* pUnit = Unit::GetUnit((*me), (*i)->getUnitGuid()); + if (pUnit && (pUnit->GetTypeId() == TYPEID_PLAYER)) + { + //Use work around packet to prevent player from being dropped from combat + DoTeleportPlayer(pUnit, afGravityPos[0], afGravityPos[1], afGravityPos[2], pUnit->GetOrientation()); + } + } + + GravityLapse_Timer = 500; + ++GravityLapse_Phase; + InGravityLapse = true; + ShockBarrier_Timer = 1000; + NetherBeam_Timer = 5000; + break; + + case 1: + DoScriptText(RAND(SAY_GRAVITYLAPSE1,SAY_GRAVITYLAPSE2), me); + + // 2) At that point he will put a Gravity Lapse debuff on everyone + for (i = me->getThreatManager().getThreatList().begin(); i != me->getThreatManager().getThreatList().end(); ++i) + { + if (Unit* pUnit = Unit::GetUnit((*me), (*i)->getUnitGuid())) + { + DoCast(pUnit, SPELL_KNOCKBACK, true); + //Gravity lapse - needs an exception in Spell system to work + + pUnit->CastSpell(pUnit, SPELL_GRAVITY_LAPSE, true, 0, 0, me->GetGUID()); + pUnit->CastSpell(pUnit, SPELL_GRAVITY_LAPSE_AURA, true, 0, 0, me->GetGUID()); + + //Using packet workaround + WorldPacket data(12); + data.SetOpcode(SMSG_MOVE_SET_CAN_FLY); + data.append(pUnit->GetPackGUID()); + data << uint32(0); + pUnit->SendMessageToSet(&data, true); + } + } + GravityLapse_Timer = 10000; + ++GravityLapse_Phase; + break; + + case 2: + //Cast nether vapor aura on self + me->InterruptNonMeleeSpells(false); + DoCast(me, SPELL_NETHER_VAPOR); + + GravityLapse_Timer = 20000; + ++GravityLapse_Phase; + break; + + case 3: + //Remove flight + for (i = me->getThreatManager().getThreatList().begin(); i!= me->getThreatManager().getThreatList().end(); ++i) + { + if (Unit* pUnit = Unit::GetUnit((*me), (*i)->getUnitGuid())) + { + //Using packet workaround + WorldPacket data(12); + data.SetOpcode(SMSG_MOVE_UNSET_CAN_FLY); + data.append(pUnit->GetPackGUID()); + data << uint32(0); + pUnit->SendMessageToSet(&data, true); + } + } + + me->RemoveAurasDueToSpell(SPELL_NETHER_VAPOR); + InGravityLapse = false; + GravityLapse_Timer = 60000; + GravityLapse_Phase = 0; + AttackStart(me->getVictim()); + break; + } + } else GravityLapse_Timer -= diff; + + if (InGravityLapse) + { + //ShockBarrier_Timer + if (ShockBarrier_Timer <= diff) + { + DoCast(me, SPELL_SHOCK_BARRIER); + ShockBarrier_Timer = 20000; + } else ShockBarrier_Timer -= diff; + + //NetherBeam_Timer + if (NetherBeam_Timer <= diff) + { + if (Unit* pUnit = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(pUnit, SPELL_NETHER_BEAM); + + NetherBeam_Timer = 4000; + } else NetherBeam_Timer -= diff; + } + } + + if (!InGravityLapse) + DoMeleeAttackIfReady(); + } + } + } +}; + +//Thaladred the Darkener AI +struct boss_thaladred_the_darkenerAI : public advisorbase_ai +{ + boss_thaladred_the_darkenerAI(Creature* pCreature) : advisorbase_ai(pCreature) {} + + uint32 Gaze_Timer; + uint32 Silence_Timer; + uint32 PsychicBlow_Timer; + + void Reset() + { + Gaze_Timer = 100; + Silence_Timer = 20000; + PsychicBlow_Timer = 10000; + + advisorbase_ai::Reset(); + } + + void Aggro(Unit *who) + { + if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) + return; + + if (!who || FakeDeath) + return; + + DoScriptText(SAY_THALADRED_AGGRO, me); + me->AddThreat(who, 5000000.0f); + } + + void JustDied(Unit* /*pKiller*/) + { + if (m_pInstance && m_pInstance->GetData(DATA_KAELTHASEVENT) == 3) + DoScriptText(SAY_THALADRED_DEATH, me); + } + + void UpdateAI(const uint32 diff) + { + advisorbase_ai::UpdateAI(diff); + + //Faking death, don't do anything + if (FakeDeath) + return; + + //Return since we have no target + if (!UpdateVictim()) + return; + + //Gaze_Timer + if (Gaze_Timer <= diff) + { + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + { + DoResetThreat(); + me->AddThreat(pTarget, 5000000.0f); + DoScriptText(EMOTE_THALADRED_GAZE, me, pTarget); + Gaze_Timer = 8500; + } + } else Gaze_Timer -= diff; + + //Silence_Timer + if (Silence_Timer <= diff) + { + DoCast(me->getVictim(), SPELL_SILENCE); + Silence_Timer = 20000; + } else Silence_Timer -= diff; + + //PsychicBlow_Timer + if (PsychicBlow_Timer <= diff) + { + DoCast(me->getVictim(), SPELL_PSYCHIC_BLOW); + PsychicBlow_Timer = 20000+rand()%5000; + } else PsychicBlow_Timer -= diff; + + DoMeleeAttackIfReady(); + } +}; + +//Lord Sanguinar AI +struct boss_lord_sanguinarAI : public advisorbase_ai +{ + boss_lord_sanguinarAI(Creature* pCreature) : advisorbase_ai(pCreature) {} + + uint32 Fear_Timer; + + void Reset() + { + Fear_Timer = 20000; + advisorbase_ai::Reset(); + } + + void Aggro(Unit *who) + { + if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) + return; + + if (!who || FakeDeath) + return; + + DoScriptText(SAY_SANGUINAR_AGGRO, me); + } + + void JustDied(Unit* /*Killer*/) + { + if (m_pInstance && m_pInstance->GetData(DATA_KAELTHASEVENT) == 3) + DoScriptText(SAY_SANGUINAR_DEATH, me); + } + + void UpdateAI(const uint32 diff) + { + advisorbase_ai::UpdateAI(diff); + + //Faking death, don't do anything + if (FakeDeath) + return; + + //Return since we have no target + if (!UpdateVictim()) + return; + + //Fear_Timer + if (Fear_Timer <= diff) + { + DoCast(me->getVictim(), SPELL_BELLOWING_ROAR); + Fear_Timer = 25000+rand()%10000; //approximately every 30 seconds + } else Fear_Timer -= diff; + + DoMeleeAttackIfReady(); + } +}; + +//Grand Astromancer Capernian AI +struct boss_grand_astromancer_capernianAI : public advisorbase_ai +{ + boss_grand_astromancer_capernianAI(Creature* pCreature) : advisorbase_ai(pCreature) {} + + uint32 Fireball_Timer; + uint32 Conflagration_Timer; + uint32 ArcaneExplosion_Timer; + uint32 Yell_Timer; + bool Yell; + + void Reset() + { + Fireball_Timer = 2000; + Conflagration_Timer = 20000; + ArcaneExplosion_Timer = 5000; + Yell_Timer = 2000; + Yell = false; + + advisorbase_ai::Reset(); + } + + void JustDied(Unit* /*pKiller*/) + { + if (m_pInstance && m_pInstance->GetData(DATA_KAELTHASEVENT) == 3) + DoScriptText(SAY_CAPERNIAN_DEATH, me); + } + + void AttackStart(Unit* who) + { + if (!who || FakeDeath || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) + return; + + if (me->Attack(who, true)) + { + me->AddThreat(who, 0.0f); + me->SetInCombatWith(who); + who->SetInCombatWith(me); + + me->GetMotionMaster()->MoveChase(who, CAPERNIAN_DISTANCE); + } + } + + void Aggro(Unit *who) + { + if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) + return; + + if (!who || FakeDeath) + return; + } + + void UpdateAI(const uint32 diff) + { + advisorbase_ai::UpdateAI(diff); + + //Faking Death, don't do anything + if (FakeDeath) + return; + + //Return since we have no target + if (!UpdateVictim()) + return; + + //Yell_Timer + if (!Yell) + { + if (Yell_Timer <= diff) + { + DoScriptText(SAY_CAPERNIAN_AGGRO, me); + Yell = true; + } else Yell_Timer -= diff; + } + + //Fireball_Timer + if (Fireball_Timer <= diff) + { + DoCast(me->getVictim(), SPELL_CAPERNIAN_FIREBALL); + Fireball_Timer = 4000; + } else Fireball_Timer -= diff; + + //Conflagration_Timer + if (Conflagration_Timer <= diff) + { + Unit *pTarget = NULL; + pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); + + if (pTarget && me->IsWithinDistInMap(pTarget, 30)) + DoCast(pTarget, SPELL_CONFLAGRATION); + else + DoCast(me->getVictim(), SPELL_CONFLAGRATION); + + Conflagration_Timer = 10000+rand()%5000; + } else Conflagration_Timer -= diff; + + //ArcaneExplosion_Timer + if (ArcaneExplosion_Timer <= diff) + { + bool InMeleeRange = false; + Unit *pTarget = NULL; + std::list& m_threatlist = me->getThreatManager().getThreatList(); + for (std::list::const_iterator i = m_threatlist.begin(); i!= m_threatlist.end(); ++i) + { + Unit* pUnit = Unit::GetUnit((*me), (*i)->getUnitGuid()); + //if in melee range + if (pUnit && pUnit->IsWithinDistInMap(me, 5)) + { + InMeleeRange = true; + pTarget = pUnit; + break; + } + } + + if (InMeleeRange) + DoCast(pTarget, SPELL_ARCANE_EXPLOSION); + + ArcaneExplosion_Timer = 4000+rand()%2000; + } else ArcaneExplosion_Timer -= diff; + + //Do NOT deal any melee damage. + } +}; + +//Master Engineer Telonicus AI +struct boss_master_engineer_telonicusAI : public advisorbase_ai +{ + boss_master_engineer_telonicusAI(Creature* pCreature) : advisorbase_ai(pCreature) {} + + uint32 Bomb_Timer; + uint32 RemoteToy_Timer; + + void Reset() + { + Bomb_Timer = 10000; + RemoteToy_Timer = 5000; + + advisorbase_ai::Reset(); + } + + void JustDied(Unit* /*pKiller*/) + { + if (m_pInstance && m_pInstance->GetData(DATA_KAELTHASEVENT) == 3) + DoScriptText(SAY_TELONICUS_DEATH, me); + } + + void Aggro(Unit *who) + { + if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) + return; + + if (!who || FakeDeath) + return; + + DoScriptText(SAY_TELONICUS_AGGRO, me); + } + + void UpdateAI(const uint32 diff) + { + advisorbase_ai::UpdateAI(diff); + + //Faking Death, do nothing + if (FakeDeath) + return; + + //Return since we have no target + if (!UpdateVictim()) + return; + + //Bomb_Timer + if (Bomb_Timer <= diff) + { + DoCast(me->getVictim(), SPELL_BOMB); + Bomb_Timer = 25000; + } else Bomb_Timer -= diff; + + //RemoteToy_Timer + if (RemoteToy_Timer <= diff) + { + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, SPELL_REMOTE_TOY); + + RemoteToy_Timer = 10000+rand()%5000; + } else RemoteToy_Timer -= diff; + + DoMeleeAttackIfReady(); + } +}; + +//Flame Strike AI +struct mob_kael_flamestrikeAI : public Scripted_NoMovementAI +{ + mob_kael_flamestrikeAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature) {} + + uint32 Timer; + bool Casting; + bool KillSelf; + + void Reset() + { + Timer = 5000; + Casting = false; + KillSelf = false; + + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + me->setFaction(14); + } + + void MoveInLineOfSight(Unit * /*who*/) {} + + void EnterCombat(Unit * /*who*/) {} + + void UpdateAI(const uint32 diff) + { + if (!Casting) + { + DoCast(me, SPELL_FLAME_STRIKE_VIS); + Casting = true; + } + + //Timer + if (Timer <= diff) + { + if (!KillSelf) + { + me->InterruptNonMeleeSpells(false); + DoCast(me, SPELL_FLAME_STRIKE_DMG); + } else me->Kill(me); + + KillSelf = true; + Timer = 1000; + } else Timer -= diff; + } +}; + +//Phoenix AI +struct mob_phoenix_tkAI : public ScriptedAI +{ + mob_phoenix_tkAI(Creature* pCreature) : ScriptedAI(pCreature) {} + + uint32 Cycle_Timer; + + void Reset() + { + Cycle_Timer = 2000; + DoCast(me, SPELL_BURN, true); + } + + void JustDied(Unit* /*killer*/) + { + //is this spell in use anylonger? + //DoCast(me, SPELL_EMBER_BLAST, true); + me->SummonCreature(NPC_PHOENIX_EGG,me->GetPositionX(),me->GetPositionY(),me->GetPositionZ(),me->GetOrientation(),TEMPSUMMON_TIMED_DESPAWN,16000); + } + + void UpdateAI(const uint32 diff) + { + if (!UpdateVictim()) + return; + + if (Cycle_Timer <= diff) + { + //spell Burn should possible do this, but it doesn't, so do this for now. + uint32 dmg = urand(4500,5500); + if (me->GetHealth() > dmg) + me->SetHealth(uint32(me->GetHealth()-dmg)); + Cycle_Timer = 2000; + } else Cycle_Timer -= diff; + + DoMeleeAttackIfReady(); + } +}; + +//Phoenix Egg AI +struct mob_phoenix_egg_tkAI : public ScriptedAI +{ + mob_phoenix_egg_tkAI(Creature* pCreature) : ScriptedAI(pCreature) {} + + uint32 Rebirth_Timer; + + void Reset() + { + Rebirth_Timer = 15000; + } + + //ignore any + void MoveInLineOfSight(Unit* /*who*/) {} + + void AttackStart(Unit* who) + { + if (me->Attack(who, false)) + { + me->SetInCombatWith(who); + who->SetInCombatWith(me); + + DoStartNoMovement(who); + } + } + + void JustSummoned(Creature* summoned) + { + summoned->AddThreat(me->getVictim(), 0.0f); + summoned->CastSpell(summoned,SPELL_REBIRTH,false); + } + + void UpdateAI(const uint32 diff) + { + if (!Rebirth_Timer) + return; + + if (Rebirth_Timer <= diff) + { + me->SummonCreature(NPC_PHOENIX,me->GetPositionX(),me->GetPositionY(),me->GetPositionZ(),me->GetOrientation(),TEMPSUMMON_CORPSE_DESPAWN,5000); + Rebirth_Timer = 0; + } else Rebirth_Timer -= diff; + } +}; + +CreatureAI* GetAI_boss_kaelthas(Creature* pCreature) +{ + return new boss_kaelthasAI(pCreature); +} + +CreatureAI* GetAI_boss_thaladred_the_darkener(Creature* pCreature) +{ + return new boss_thaladred_the_darkenerAI(pCreature); +} + +CreatureAI* GetAI_boss_lord_sanguinar(Creature* pCreature) +{ + return new boss_lord_sanguinarAI(pCreature); +} + +CreatureAI* GetAI_boss_grand_astromancer_capernian(Creature* pCreature) +{ + return new boss_grand_astromancer_capernianAI(pCreature); +} + +CreatureAI* GetAI_boss_master_engineer_telonicus(Creature* pCreature) +{ + return new boss_master_engineer_telonicusAI(pCreature); +} + +CreatureAI* GetAI_mob_kael_flamestrike(Creature* pCreature) +{ + return new mob_kael_flamestrikeAI(pCreature); +} + +CreatureAI* GetAI_mob_phoenix_tk(Creature* pCreature) +{ + return new mob_phoenix_tkAI(pCreature); +} + +CreatureAI* GetAI_mob_phoenix_egg_tk(Creature* pCreature) +{ + return new mob_phoenix_egg_tkAI(pCreature); +} + +void AddSC_boss_kaelthas() +{ + Script *newscript; + newscript = new Script; + newscript->Name = "boss_kaelthas"; + newscript->GetAI = &GetAI_boss_kaelthas; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "boss_thaladred_the_darkener"; + newscript->GetAI = &GetAI_boss_thaladred_the_darkener; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "boss_lord_sanguinar"; + newscript->GetAI = &GetAI_boss_lord_sanguinar; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "boss_grand_astromancer_capernian"; + newscript->GetAI = &GetAI_boss_grand_astromancer_capernian; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "boss_master_engineer_telonicus"; + newscript->GetAI = &GetAI_boss_master_engineer_telonicus; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_kael_flamestrike"; + newscript->GetAI = &GetAI_mob_kael_flamestrike; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_phoenix_tk"; + newscript->GetAI = &GetAI_mob_phoenix_tk; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_phoenix_egg_tk"; + newscript->GetAI = &GetAI_mob_phoenix_egg_tk; + newscript->RegisterSelf(); +} diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp new file mode 100644 index 00000000000..e1b60b20948 --- /dev/null +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp @@ -0,0 +1,179 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Boss_Void_Reaver +SD%Complete: 90 +SDComment: Should reset if raid are out of room. +SDCategory: Tempest Keep, The Eye +EndScriptData */ + +#include "ScriptedPch.h" +#include "the_eye.h" + +enum eEnums +{ + SAY_AGGRO = -1550000, + SAY_SLAY1 = -1550001, + SAY_SLAY2 = -1550002, + SAY_SLAY3 = -1550003, + SAY_DEATH = -1550004, + SAY_POUNDING1 = -1550005, + SAY_POUNDING2 = -1550006, + + SPELL_POUNDING = 34162, + SPELL_ARCANE_ORB = 34172, + SPELL_KNOCK_AWAY = 25778, + SPELL_BERSERK = 27680 +}; + +struct boss_void_reaverAI : public ScriptedAI +{ + boss_void_reaverAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + } + + ScriptedInstance* pInstance; + + uint32 Pounding_Timer; + uint32 ArcaneOrb_Timer; + uint32 KnockAway_Timer; + uint32 Berserk_Timer; + + bool Enraged; + + void Reset() + { + Pounding_Timer = 15000; + ArcaneOrb_Timer = 3000; + KnockAway_Timer = 30000; + Berserk_Timer = 600000; + + Enraged = false; + + if (pInstance && me->isAlive()) + pInstance->SetData(DATA_VOIDREAVEREVENT, NOT_STARTED); + } + + void KilledUnit(Unit * /*victim*/) + { + DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2,SAY_SLAY3), me); + } + + void JustDied(Unit * /*victim*/) + { + DoScriptText(SAY_DEATH, me); + DoZoneInCombat(); + + if (pInstance) + pInstance->SetData(DATA_VOIDREAVEREVENT, DONE); + } + + void EnterCombat(Unit * /*who*/) + { + DoScriptText(SAY_AGGRO, me); + + if (pInstance) + pInstance->SetData(DATA_VOIDREAVEREVENT, IN_PROGRESS); + } + + void UpdateAI(const uint32 diff) + { + if (!UpdateVictim()) + return; + + // Pounding + if (Pounding_Timer <= diff) + { + DoCast(me->getVictim(), SPELL_POUNDING); + + DoScriptText(RAND(SAY_POUNDING1,SAY_POUNDING2), me); + Pounding_Timer = 15000; //cast time(3000) + cooldown time(12000) + } else Pounding_Timer -= diff; + + // Arcane Orb + if (ArcaneOrb_Timer <= diff) + { + Unit *pTarget = NULL; + std::list t_list = me->getThreatManager().getThreatList(); + std::vector target_list; + for (std::list::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) + { + pTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid()); + if (!pTarget) + continue; + + // exclude pets & totems + if (pTarget->GetTypeId() != TYPEID_PLAYER) + continue; + + //18 yard radius minimum + if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER && pTarget->isAlive() && !pTarget->IsWithinDist(me, 18, false)) + target_list.push_back(pTarget); + pTarget = NULL; + } + + if (target_list.size()) + pTarget = *(target_list.begin()+rand()%target_list.size()); + else + pTarget = me->getVictim(); + + if (pTarget) + me->CastSpell(pTarget->GetPositionX(),pTarget->GetPositionY(),pTarget->GetPositionZ(), SPELL_ARCANE_ORB, false, NULL, NULL, NULL, pTarget); + + ArcaneOrb_Timer = 3000; + } else ArcaneOrb_Timer -= diff; + + // Single Target knock back, reduces aggro + if (KnockAway_Timer <= diff) + { + DoCast(me->getVictim(), SPELL_KNOCK_AWAY); + + //Drop 25% aggro + if (DoGetThreat(me->getVictim())) + DoModifyThreatPercent(me->getVictim(),-25); + + KnockAway_Timer = 30000; + } else KnockAway_Timer -= diff; + + //Berserk + if (Berserk_Timer < diff && !Enraged) + { + DoCast(me, SPELL_BERSERK); + Enraged = true; + } else Berserk_Timer -= diff; + + DoMeleeAttackIfReady(); + + EnterEvadeIfOutOfCombatArea(diff); + } +}; + +CreatureAI* GetAI_boss_void_reaver(Creature* pCreature) +{ + return new boss_void_reaverAI (pCreature); +} + +void AddSC_boss_void_reaver() +{ + Script *newscript; + newscript = new Script; + newscript->Name = "boss_void_reaver"; + newscript->GetAI = &GetAI_boss_void_reaver; + newscript->RegisterSelf(); +} + diff --git a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp new file mode 100644 index 00000000000..59c72071238 --- /dev/null +++ b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp @@ -0,0 +1,176 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Instance_The_Eye +SD%Complete: 100 +SDComment: +SDCategory: Tempest Keep, The Eye +EndScriptData */ + +#include "ScriptedPch.h" +#include "the_eye.h" + +#define MAX_ENCOUNTER 5 + +/* The Eye encounters: +0 - Kael'thas event +1 - Al' ar event +2 - Solarian Event +3 - Void Reaver event +*/ + +struct instance_the_eye : public ScriptedInstance +{ + instance_the_eye(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; + + uint64 ThaladredTheDarkener; + uint64 LordSanguinar; + uint64 GrandAstromancerCapernian; + uint64 MasterEngineerTelonicus; + uint64 Kaelthas; + uint64 Astromancer; + uint64 Alar; + + uint8 KaelthasEventPhase; + uint8 AlarEventPhase; + + uint32 m_auiEncounter[MAX_ENCOUNTER]; + + void Initialize() + { + memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); + + ThaladredTheDarkener = 0; + LordSanguinar = 0; + GrandAstromancerCapernian = 0; + MasterEngineerTelonicus = 0; + Kaelthas = 0; + Astromancer = 0; + Alar = 0; + + KaelthasEventPhase = 0; + AlarEventPhase = 0; + } + + bool IsEncounterInProgress() const + { + for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) + if (m_auiEncounter[i] == IN_PROGRESS) return true; + + return false; + } + + void OnCreatureCreate(Creature* pCreature, bool /*add*/) + { + switch(pCreature->GetEntry()) + { + case 20064: ThaladredTheDarkener = pCreature->GetGUID(); break; + case 20063: MasterEngineerTelonicus = pCreature->GetGUID(); break; + case 20062: GrandAstromancerCapernian = pCreature->GetGUID(); break; + case 20060: LordSanguinar = pCreature->GetGUID(); break; + case 19622: Kaelthas = pCreature->GetGUID(); break; + case 18805: Astromancer = pCreature->GetGUID(); break; + case 19514: Alar = pCreature->GetGUID(); break; + } + } + + uint64 GetData64(uint32 identifier) + { + switch(identifier) + { + case DATA_THALADREDTHEDARKENER: return ThaladredTheDarkener; + case DATA_LORDSANGUINAR: return LordSanguinar; + case DATA_GRANDASTROMANCERCAPERNIAN: return GrandAstromancerCapernian; + case DATA_MASTERENGINEERTELONICUS: return MasterEngineerTelonicus; + case DATA_KAELTHAS: return Kaelthas; + case DATA_ASTROMANCER: return Astromancer; + case DATA_ALAR: return Alar; + } + return 0; + } + + void SetData(uint32 type, uint32 data) + { + switch(type) + { + case DATA_ALAREVENT: AlarEventPhase = data; m_auiEncounter[0] = data; break; + case DATA_HIGHASTROMANCERSOLARIANEVENT: m_auiEncounter[1] = data; break; + case DATA_VOIDREAVEREVENT: m_auiEncounter[2] = data; break; + case DATA_KAELTHASEVENT: KaelthasEventPhase = data; m_auiEncounter[3] = data; break; + } + if (data == DONE) + SaveToDB(); + } + + uint32 GetData(uint32 type) + { + switch(type) + { + case DATA_ALAREVENT: return AlarEventPhase; + case DATA_HIGHASTROMANCERSOLARIANEVENT: return m_auiEncounter[1]; + case DATA_VOIDREAVEREVENT: return m_auiEncounter[2]; + case DATA_KAELTHASEVENT: return KaelthasEventPhase; + } + return 0; + } + + std::string GetSaveData() + { + OUT_SAVE_INST_DATA; + std::ostringstream stream; + stream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " " << m_auiEncounter[3]; + char* out = new char[stream.str().length() + 1]; + strcpy(out, stream.str().c_str()); + if (out) + { + OUT_SAVE_INST_DATA_COMPLETE; + return out; + } + return NULL; + } + + void Load(const char* in) + { + if (!in) + { + OUT_LOAD_INST_DATA_FAIL; + return; + } + OUT_LOAD_INST_DATA(in); + std::istringstream stream(in); + stream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3]; + for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) + if (m_auiEncounter[i] == IN_PROGRESS) // Do not load an encounter as "In Progress" - reset it instead. + m_auiEncounter[i] = NOT_STARTED; + OUT_LOAD_INST_DATA_COMPLETE; + } +}; + +InstanceData* GetInstanceData_instance_the_eye(Map* pMap) +{ + return new instance_the_eye(pMap); +} + +void AddSC_instance_the_eye() +{ + Script *newscript; + newscript = new Script; + newscript->Name = "instance_the_eye"; + newscript->GetInstanceData = &GetInstanceData_instance_the_eye; + newscript->RegisterSelf(); +} + diff --git a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp new file mode 100644 index 00000000000..97021fdc031 --- /dev/null +++ b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp @@ -0,0 +1,98 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: The_Eye +SD%Complete: 100 +SDComment: +SDCategory: Tempest Keep, The Eye +EndScriptData */ + +/* ContentData +mob_crystalcore_devastator +EndContentData */ + +#include "ScriptedPch.h" +#include "the_eye.h" + +#define SPELL_COUNTERCHARGE 35035 +#define SPELL_KNOCKAWAY 22893 + +struct mob_crystalcore_devastatorAI : public ScriptedAI +{ + mob_crystalcore_devastatorAI(Creature *c) : ScriptedAI(c) {} + + uint32 Knockaway_Timer; + uint32 Countercharge_Timer; + + void Reset() + { + Countercharge_Timer = 9000; + Knockaway_Timer = 25000; + } + + void EnterCombat(Unit * /*who*/) + { + } + + void UpdateAI(const uint32 diff) + { + if (!UpdateVictim()) + return; + + //Check if we have a current target + //Knockaway_Timer + if (Knockaway_Timer <= diff) + { + DoCast(me->getVictim(), SPELL_KNOCKAWAY, true); + + // current aggro target is knocked away pick new target + Unit* pTarget = SelectUnit(SELECT_TARGET_TOPAGGRO, 0); + + if (!pTarget || pTarget == me->getVictim()) + pTarget = SelectUnit(SELECT_TARGET_TOPAGGRO, 1); + + if (pTarget) + me->TauntApply(pTarget); + + Knockaway_Timer = 23000; + } else Knockaway_Timer -= diff; + + //Countercharge_Timer + if (Countercharge_Timer <= diff) + { + DoCast(me, SPELL_COUNTERCHARGE); + Countercharge_Timer = 45000; + } else Countercharge_Timer -= diff; + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_mob_crystalcore_devastator(Creature* pCreature) +{ + return new mob_crystalcore_devastatorAI (pCreature); +} + +void AddSC_the_eye() +{ + Script *newscript; + newscript = new Script; + newscript->Name = "mob_crystalcore_devastator"; + newscript->GetAI = &GetAI_mob_crystalcore_devastator; + newscript->RegisterSelf(); +} + diff --git a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.h b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.h new file mode 100644 index 00000000000..d0d3ea09061 --- /dev/null +++ b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.h @@ -0,0 +1,20 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software licensed under GPL version 2 + * Please see the included DOCS/LICENSE.TXT for more information */ + +#ifndef DEF_THE_EYE_H +#define DEF_THE_EYE_H + +#define DATA_ALAREVENT 1 +#define DATA_ASTROMANCER 2 +#define DATA_GRANDASTROMANCERCAPERNIAN 3 +#define DATA_HIGHASTROMANCERSOLARIANEVENT 4 +#define DATA_KAELTHAS 5 +#define DATA_KAELTHASEVENT 6 +#define DATA_LORDSANGUINAR 7 +#define DATA_MASTERENGINEERTELONICUS 8 +#define DATA_THALADREDTHEDARKENER 10 +#define DATA_VOIDREAVEREVENT 11 +#define DATA_ALAR 12 +#endif + diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp new file mode 100644 index 00000000000..b9c365eda65 --- /dev/null +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp @@ -0,0 +1,39 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Boss_Gatewatcher_Gyrokill +SD%Complete: 0 +SDComment: Place Holder +SDCategory: Tempest Keep, The Mechanar +EndScriptData */ + +#include "ScriptedPch.h" + +//not used +#define SAY_AGGRO -1554000 +#define SAY_SAW_ATTACK1 -1554001 +#define SAY_SAW_ATTACK2 -1554002 +#define SAY_SLAY1 -1554003 +#define SAY_SLAY2 -1554004 +#define SAY_DEATH -1554005 + +#define SPELL_STREAM_OF_MACHINE_FLUID 35311 +#define SPELL_SAW_BLADE 35318 +#define H_SPELL_SAW_BLADE 39192 +#define SPELL_SHADOW_POWER 35322 +#define H_SPELL_SHADOW_POWER 39193 + diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp new file mode 100644 index 00000000000..50c3a6171ce --- /dev/null +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp @@ -0,0 +1,130 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +/* ScriptData +SDName: Boss_Gatewatcher_Ironhand +SD%Complete: 75 +SDComment: +SDCategory: Tempest Keep, The Mechanar +EndScriptData */ + +#include "ScriptedPch.h" + +#define SAY_AGGRO_1 -1554006 +#define SAY_HAMMER_1 -1554007 +#define SAY_HAMMER_2 -1554008 +#define SAY_SLAY_1 -1554009 +#define SAY_SLAY_2 -1554010 +#define SAY_DEATH_1 -1554011 +#define EMOTE_HAMMER -1554012 + +// Spells to be casted +#define SPELL_SHADOW_POWER 35322 +#define H_SPELL_SHADOW_POWER 39193 +#define SPELL_HAMMER_PUNCH 35326 +#define SPELL_JACKHAMMER 35327 +#define H_SPELL_JACKHAMMER 39194 +#define SPELL_STREAM_OF_MACHINE_FLUID 35311 + +// Gatewatcher Iron-Hand AI +struct boss_gatewatcher_iron_handAI : public ScriptedAI +{ + boss_gatewatcher_iron_handAI(Creature *c) : ScriptedAI(c) + { + } + + uint32 Shadow_Power_Timer; + uint32 Jackhammer_Timer; + uint32 Stream_of_Machine_Fluid_Timer; + + void Reset() + { + Shadow_Power_Timer = 25000; + Jackhammer_Timer = 45000; + Stream_of_Machine_Fluid_Timer = 55000; + + } + void EnterCombat(Unit * /*who*/) + { + DoScriptText(SAY_AGGRO_1, me); + } + + void KilledUnit(Unit* /*victim*/) + { + if (rand()%2) + return; + + DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + } + + void JustDied(Unit* /*Killer*/) + { + DoScriptText(SAY_DEATH_1, me); + //TODO: Add door check/open code + } + + void UpdateAI(const uint32 diff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + //Shadow Power + if (Shadow_Power_Timer <= diff) + { + DoCast(me, SPELL_SHADOW_POWER); + Shadow_Power_Timer = 20000 + rand()%8000; + } else Shadow_Power_Timer -= diff; + + //Jack Hammer + if (Jackhammer_Timer <= diff) + { + //TODO: expect cast this about 5 times in a row (?), announce it by emote only once + DoScriptText(EMOTE_HAMMER, me); + DoCast(me->getVictim(), SPELL_JACKHAMMER); + + //chance to yell, but not same time as emote (after spell in fact casted) + if (rand()%2) + return; + + DoScriptText(RAND(SAY_HAMMER_1,SAY_HAMMER_2), me); + Jackhammer_Timer = 30000; + } else Jackhammer_Timer -= diff; + + //Stream of Machine Fluid + if (Stream_of_Machine_Fluid_Timer <= diff) + { + DoCast(me->getVictim(), SPELL_STREAM_OF_MACHINE_FLUID); + Stream_of_Machine_Fluid_Timer = 35000 + rand()%15000; + } else Stream_of_Machine_Fluid_Timer -= diff; + + DoMeleeAttackIfReady(); + } +}; +CreatureAI* GetAI_boss_gatewatcher_iron_hand(Creature* pCreature) +{ + return new boss_gatewatcher_iron_handAI (pCreature); +} + +void AddSC_boss_gatewatcher_iron_hand() +{ + Script *newscript; + newscript = new Script; + newscript->Name = "boss_gatewatcher_iron_hand"; + newscript->GetAI = &GetAI_boss_gatewatcher_iron_hand; + newscript->RegisterSelf(); +} + diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp new file mode 100644 index 00000000000..ededec0196d --- /dev/null +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp @@ -0,0 +1,245 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +/* ScriptData +SDName: Boss_Nethermancer_Sepethrea +SD%Complete: 90 +SDComment: Need adjustments to initial summons +SDCategory: Tempest Keep, The Mechanar +EndScriptData */ + +#include "ScriptedPch.h" +#include "mechanar.h" + +#define SAY_AGGRO -1554013 +#define SAY_SUMMON -1554014 +#define SAY_DRAGONS_BREATH_1 -1554015 +#define SAY_DRAGONS_BREATH_2 -1554016 +#define SAY_SLAY1 -1554017 +#define SAY_SLAY2 -1554018 +#define SAY_DEATH -1554019 + +#define SPELL_SUMMON_RAGIN_FLAMES 35275 +#define H_SPELL_SUMMON_RAGIN_FLAMES 39084 + +#define SPELL_FROST_ATTACK 35263 +#define SPELL_ARCANE_BLAST 35314 +#define SPELL_DRAGONS_BREATH 35250 +#define SPELL_KNOCKBACK 37317 +#define SPELL_SOLARBURN 35267 + +struct boss_nethermancer_sepethreaAI : public ScriptedAI +{ + boss_nethermancer_sepethreaAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + } + + ScriptedInstance *pInstance; + + uint32 frost_attack_Timer; + uint32 arcane_blast_Timer; + uint32 dragons_breath_Timer; + uint32 knockback_Timer; + uint32 solarburn_Timer; + + void Reset() + { + frost_attack_Timer = 7000 + rand()%3000; + arcane_blast_Timer = 12000 + rand()%6000; + dragons_breath_Timer = 18000 + rand()%4000; + knockback_Timer = 22000 + rand()%6000; + solarburn_Timer = 30000; + + if (pInstance) + pInstance->SetData(DATA_NETHERMANCER_EVENT, NOT_STARTED); + } + + void EnterCombat(Unit* who) + { + if (pInstance) + pInstance->SetData(DATA_NETHERMANCER_EVENT, IN_PROGRESS); + + DoScriptText(SAY_AGGRO, me); + DoCast(who, SPELL_SUMMON_RAGIN_FLAMES); + DoScriptText(SAY_SUMMON, me); + } + + void KilledUnit(Unit* /*victim*/) + { + DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); + } + + void JustDied(Unit* /*Killer*/) + { + DoScriptText(SAY_DEATH, me); + + if (pInstance) + pInstance->SetData(DATA_NETHERMANCER_EVENT, DONE); + } + + void UpdateAI(const uint32 diff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + //Frost Attack + if (frost_attack_Timer <= diff) + { + DoCast(me->getVictim(), SPELL_FROST_ATTACK); + frost_attack_Timer = 7000 + rand()%3000; + } else frost_attack_Timer -= diff; + + //Arcane Blast + if (arcane_blast_Timer <= diff) + { + DoCast(me->getVictim(), SPELL_ARCANE_BLAST); + arcane_blast_Timer = 15000; + } else arcane_blast_Timer -= diff; + + //Dragons Breath + if (dragons_breath_Timer <= diff) + { + DoCast(me->getVictim(), SPELL_DRAGONS_BREATH); + { + if (rand()%2) + return; + + DoScriptText(RAND(SAY_DRAGONS_BREATH_1,SAY_DRAGONS_BREATH_2), me); + } + dragons_breath_Timer = 12000 + rand()%10000; + } else dragons_breath_Timer -= diff; + + //Knockback + if (knockback_Timer <= diff) + { + DoCast(me->getVictim(), SPELL_KNOCKBACK); + knockback_Timer = 15000 + rand()%10000; + } else knockback_Timer -= diff; + + //Solarburn + if (solarburn_Timer <= diff) + { + DoCast(me->getVictim(), SPELL_SOLARBURN); + solarburn_Timer = 30000; + } else solarburn_Timer -= diff; + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_boss_nethermancer_sepethrea(Creature* pCreature) +{ + return new boss_nethermancer_sepethreaAI (pCreature); +} + +#define SPELL_INFERNO 35268 +#define H_SPELL_INFERNO 39346 +#define SPELL_FIRE_TAIL 35278 + +struct mob_ragin_flamesAI : public ScriptedAI +{ + mob_ragin_flamesAI(Creature *c) : ScriptedAI(c) + { + pInstance = c->GetInstanceData(); + } + + ScriptedInstance *pInstance; + + uint32 inferno_Timer; + uint32 flame_timer; + uint32 Check_Timer; + + bool onlyonce; + + void Reset() + { + inferno_Timer = 10000; + flame_timer = 500; + Check_Timer = 2000; + onlyonce = false; + me->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_MAGIC, true); + me->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, true); + me->SetSpeed(MOVE_RUN, DUNGEON_MODE(0.5f, 0.7f)); + } + + void EnterCombat(Unit* /*who*/) + { + } + + void UpdateAI(const uint32 diff) + { + //Check_Timer + if (Check_Timer <= diff) + { + if (pInstance) + { + if (pInstance->GetData(DATA_NETHERMANCER_EVENT) != IN_PROGRESS) + { + //remove + me->setDeathState(JUST_DIED); + me->RemoveCorpse(); + } + } + Check_Timer = 1000; + } else Check_Timer -= diff; + + if (!UpdateVictim()) + return; + + if (!onlyonce) + { + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) + me->GetMotionMaster()->MoveChase(pTarget); + onlyonce = true; + } + + if (inferno_Timer <= diff) + { + DoCast(me->getVictim(), SPELL_INFERNO); + me->TauntApply(me->getVictim()); + inferno_Timer = 10000; + } else inferno_Timer -= diff; + + if (flame_timer <= diff) + { + DoCast(me, SPELL_FIRE_TAIL); + flame_timer = 500; + } else flame_timer -=diff; + + DoMeleeAttackIfReady(); + } + +}; +CreatureAI* GetAI_mob_ragin_flames(Creature* pCreature) +{ + return new mob_ragin_flamesAI (pCreature); +} +void AddSC_boss_nethermancer_sepethrea() +{ + Script *newscript; + newscript = new Script; + newscript->Name = "boss_nethermancer_sepethrea"; + newscript->GetAI = &GetAI_boss_nethermancer_sepethrea; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_ragin_flames"; + newscript->GetAI = &GetAI_mob_ragin_flames; + newscript->RegisterSelf(); +} + diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp new file mode 100644 index 00000000000..c0c06704db7 --- /dev/null +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp @@ -0,0 +1,246 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +/* ScriptData +SDName: Boss Pathaleon the Calculator +SD%Complete: 50 +SDComment: Event missing. Script for himself 99% blizzlike. +SDCategory: Tempest Keep, The Mechanar +EndScriptData */ + +#include "ScriptedPch.h" + +#define SAY_AGGRO -1554020 +#define SAY_DOMINATION_1 -1554021 +#define SAY_DOMINATION_2 -1554022 +#define SAY_SUMMON -1554023 +#define SAY_ENRAGE -1554024 +#define SAY_SLAY_1 -1554025 +#define SAY_SLAY_2 -1554026 +#define SAY_DEATH -1554027 + +// Spells to be casted +#define SPELL_MANA_TAP 36021 +#define SPELL_ARCANE_TORRENT 36022 +#define SPELL_DOMINATION 35280 +#define H_SPELL_ARCANE_EXPLOSION 15453 +#define SPELL_FRENZY 36992 + +#define SPELL_SUMMON_NETHER_WRAITH_1 35285 //Spells work, but not implemented +#define SPELL_SUMMON_NETHER_WRAITH_2 35286 +#define SPELL_SUMMON_NETHER_WRAITH_3 35287 +#define SPELL_SUMMON_NETHER_WRAITH_4 35288 + +// Add Spells +#define SPELL_DETONATION 35058 +#define SPELL_ARCANE_MISSILES 35034 + +struct boss_pathaleon_the_calculatorAI : public ScriptedAI +{ + boss_pathaleon_the_calculatorAI(Creature *c) : ScriptedAI(c), summons(me) + { + } + + uint32 Summon_Timer; + SummonList summons; + uint32 ManaTap_Timer; + uint32 ArcaneTorrent_Timer; + uint32 Domination_Timer; + uint32 ArcaneExplosion_Timer; + + bool Enraged; + + uint32 Counter; + + void Reset() + { + Summon_Timer = 30000; + ManaTap_Timer = 12000 + rand()%8000; + ArcaneTorrent_Timer = 16000 + rand()%9000; + Domination_Timer = 25000 + rand()%15000; + ArcaneExplosion_Timer = 8000 + rand()%5000; + + Enraged = false; + + Counter = 0; + summons.DespawnAll(); + } + void EnterCombat(Unit * /*who*/) + { + DoScriptText(SAY_AGGRO, me); + } + + void KilledUnit(Unit* /*victim*/) + { + DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + } + + void JustDied(Unit* /*Killer*/) + { + DoScriptText(SAY_DEATH, me); + + summons.DespawnAll(); + } + + void JustSummoned(Creature *summon) {summons.Summon(summon);} + void SummonedCreatureDespawn(Creature *summon) {summons.Despawn(summon);} + + void UpdateAI(const uint32 diff) + { + //Return since we have no target + if (!UpdateVictim()) + return; + + if (Summon_Timer <= diff) + { + for (uint8 i = 0; i < 3; ++i) + { + Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); + Creature* Wraith = me->SummonCreature(21062,me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); + if (pTarget && Wraith) + Wraith->AI()->AttackStart(pTarget); + } + DoScriptText(SAY_SUMMON, me); + Summon_Timer = 30000 + rand()%15000; + } else Summon_Timer -= diff; + + if (ManaTap_Timer <= diff) + { + DoCast(me->getVictim(), SPELL_MANA_TAP); + ManaTap_Timer = 14000 + rand()%8000; + } else ManaTap_Timer -= diff; + + if (ArcaneTorrent_Timer <= diff) + { + DoCast(me->getVictim(), SPELL_ARCANE_TORRENT); + ArcaneTorrent_Timer = 12000 + rand()%6000; + } else ArcaneTorrent_Timer -= diff; + + if (Domination_Timer <= diff) + { + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,1)) + { + DoScriptText(RAND(SAY_DOMINATION_1,SAY_DOMINATION_2), me); + + DoCast(pTarget, SPELL_DOMINATION); + } + Domination_Timer = 25000 + rand()%5000; + } else Domination_Timer -= diff; + + //Only casting if Heroic Mode is used + if (IsHeroic()) + { + if (ArcaneExplosion_Timer <= diff) + { + DoCast(me->getVictim(), H_SPELL_ARCANE_EXPLOSION); + ArcaneExplosion_Timer = 10000 + rand()%4000; + } else ArcaneExplosion_Timer -= diff; + } + + if (!Enraged && me->GetHealth()*100 / me->GetMaxHealth() < 21) + { + DoCast(me, SPELL_FRENZY); + DoScriptText(SAY_ENRAGE, me); + Enraged = true; + + } + + DoMeleeAttackIfReady(); + } +}; +CreatureAI* GetAI_boss_pathaleon_the_calculator(Creature* pCreature) +{ + return new boss_pathaleon_the_calculatorAI (pCreature); +} + +struct mob_nether_wraithAI : public ScriptedAI +{ + mob_nether_wraithAI(Creature *c) : ScriptedAI(c) {} + + uint32 ArcaneMissiles_Timer; + uint32 Detonation_Timer; + uint32 Die_Timer; + bool Detonation; + + void Reset() + { + ArcaneMissiles_Timer = 1000 + rand()%3000; + Detonation_Timer = 20000; + Die_Timer = 2200; + Detonation = false; + + } + + void EnterCombat(Unit* /*who*/) + { + } + + void UpdateAI(const uint32 diff) + { + if (!UpdateVictim()) + return; + + if (ArcaneMissiles_Timer <= diff) + { + if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,1)) + DoCast(pTarget, SPELL_ARCANE_MISSILES); + else + DoCast(me->getVictim(), SPELL_ARCANE_MISSILES); + + ArcaneMissiles_Timer = 5000 + rand()%5000; + } else ArcaneMissiles_Timer -=diff; + + if (!Detonation) + { + if (Detonation_Timer <= diff) + { + DoCast(me, SPELL_DETONATION); + Detonation = true; + } else Detonation_Timer -= diff; + } + + if (Detonation) + { + if (Die_Timer <= diff) + { + me->setDeathState(JUST_DIED); + me->RemoveCorpse(); + } else Die_Timer -= diff; + } + + DoMeleeAttackIfReady(); + } + +}; +CreatureAI* GetAI_mob_nether_wraith(Creature* pCreature) +{ + return new mob_nether_wraithAI (pCreature); +} + +void AddSC_boss_pathaleon_the_calculator() +{ + Script *newscript; + newscript = new Script; + newscript->Name = "boss_pathaleon_the_calculator"; + newscript->GetAI = &GetAI_boss_pathaleon_the_calculator; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "mob_nether_wraith"; + newscript->GetAI = &GetAI_mob_nether_wraith; + newscript->RegisterSelf(); +} + diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp new file mode 100644 index 00000000000..c70da24ea3f --- /dev/null +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp @@ -0,0 +1,86 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* ScriptData +SDName: Instance_Mechanar +SD%Complete: 100 +SDComment: +SDCategory: Mechanar +EndScriptData */ + +#include "ScriptedPch.h" +#include "mechanar.h" + +#define MAX_ENCOUNTER 1 + +struct instance_mechanar : public ScriptedInstance +{ + instance_mechanar(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; + + uint32 m_auiEncounter[MAX_ENCOUNTER]; + + void Initialize() + { + memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); + } + + bool IsEncounterInProgress() const + { + for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) + if (m_auiEncounter[i] == IN_PROGRESS) + return true; + + return false; + } + + uint32 GetData(uint32 type) + { + switch(type) + { + case DATA_NETHERMANCER_EVENT: return m_auiEncounter[0]; + } + + return false; + } + + uint64 GetData64 (uint32 /*identifier*/) + { + return 0; + } + + void SetData(uint32 type, uint32 data) + { + switch(type) + { + case DATA_NETHERMANCER_EVENT: m_auiEncounter[0] = data; break; + } + } +}; + +InstanceData* GetInstanceData_instance_mechanar(Map* pMap) +{ + return new instance_mechanar(pMap); +} + +void AddSC_instance_mechanar() +{ + Script *newscript; + newscript = new Script; + newscript->Name = "instance_mechanar"; + newscript->GetInstanceData = &GetInstanceData_instance_mechanar; + newscript->RegisterSelf(); +} + diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/mechanar.h b/src/server/scripts/Outland/TempestKeep/Mechanar/mechanar.h new file mode 100644 index 00000000000..d1b53eebf53 --- /dev/null +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/mechanar.h @@ -0,0 +1,6 @@ +#ifndef DEF_MECHANAR_H +#define DEF_MECHANAR_H + +#define DATA_NETHERMANCER_EVENT 1 +#endif + diff --git a/src/server/scripts/Outland/TempestKeep/the_eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/the_eye/boss_alar.cpp deleted file mode 100644 index af5f1bd95c1..00000000000 --- a/src/server/scripts/Outland/TempestKeep/the_eye/boss_alar.cpp +++ /dev/null @@ -1,523 +0,0 @@ -/* Copyright(C) 2006 - 2008 ScriptDev2 -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -*(at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ - -/* ScriptData -SDName: boss_alar -SD%Complete: 95 -SDComment: -SDCategory: Tempest Keep, The Eye -EndScriptData */ - -#include "ScriptedPch.h" -#include "the_eye.h" - -#define SPELL_FLAME_BUFFET 34121 // Flame Buffet - every 1,5 secs in phase 1 if there is no victim in melee range and after Dive Bomb in phase 2 with same conditions -#define SPELL_FLAME_QUILLS 34229 // Randomly after changing position in phase after watching tonns of movies, set probability 20% -#define SPELL_REBIRTH 34342 // Rebirth - beginning of second phase(after loose all health in phase 1) -#define SPELL_REBIRTH_2 35369 // Rebirth(another, without healing to full HP) - after Dive Bomb in phase 2 -#define SPELL_MELT_ARMOR 35410 // Melt Armor - every 60 sec in phase 2 -#define SPELL_CHARGE 35412 // Charge - 30 sec cooldown -#define SPELL_DIVE_BOMB_VISUAL 35367 // Bosskillers says 30 sec cooldown, wowwiki says 30 sec colldown, DBM and BigWigs addons says ~47 sec -#define SPELL_DIVE_BOMB 35181 // after watching tonns of movies, set cooldown to 40+rand()%5. -#define SPELL_BERSERK 45078 // 10 minutes after phase 2 starts(id is wrong, but proper id is unknown) - -#define CREATURE_EMBER_OF_ALAR 19551 // Al'ar summons one Ember of Al'ar every position change in phase 1 and two after Dive Bomb. Also in phase 2 when Ember of Al'ar dies, boss loose 3% health. -#define SPELL_EMBER_BLAST 34133 // When Ember of Al'ar dies, it casts Ember Blast - -#define CREATURE_FLAME_PATCH_ALAR 20602 // Flame Patch - every 30 sec in phase 2 -#define SPELL_FLAME_PATCH 35380 // - -static float waypoint[6][3] = -{ - {340.15, 58.65, 17.71}, - {388.09, 31.54, 20.18}, - {388.18, -32.85, 20.18}, - {340.29, -60.19, 17.72}, - {332, 0.01, 39}, // better not use the same xy coord - {331, 0.01, -2.39} -}; - -enum WaitEventType -{ - WE_NONE = 0, - WE_DUMMY = 1, - WE_PLATFORM = 2, - WE_QUILL = 3, - WE_DIE = 4, - WE_REVIVE = 5, - WE_CHARGE = 6, - WE_METEOR = 7, - WE_DIVE = 8, - WE_LAND = 9, - WE_SUMMON = 10 -}; - -struct boss_alarAI : public ScriptedAI -{ - boss_alarAI(Creature *c) : ScriptedAI(c) - { - pInstance =c->GetInstanceData(); - DefaultMoveSpeedRate = c->GetSpeedRate(MOVE_RUN); - } - - ScriptedInstance *pInstance; - - WaitEventType WaitEvent; - uint32 WaitTimer; - - bool AfterMoving; - - uint32 Platforms_Move_Timer; - uint32 DiveBomb_Timer; - uint32 MeltArmor_Timer; - uint32 Charge_Timer; - uint32 FlamePatch_Timer; - uint32 Berserk_Timer; - - float DefaultMoveSpeedRate; - - bool Phase1; - bool ForceMove; - uint32 ForceTimer; - - int8 cur_wp; - - void Reset() - { - if (pInstance) - pInstance->SetData(DATA_ALAREVENT, NOT_STARTED); - - Berserk_Timer = 1200000; - Platforms_Move_Timer = 0; - - Phase1 = true; - WaitEvent = WE_NONE; - WaitTimer = 0; - AfterMoving = false; - ForceMove = false; - ForceTimer = 5000; - - cur_wp = 4; - - me->SetDisplayId(me->GetNativeDisplayId()); - me->SetSpeed(MOVE_RUN, DefaultMoveSpeedRate); - //me->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, 10); - //me->SetFloatValue(UNIT_FIELD_COMBATREACH, 10); - me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FIRE, true); - me->SetUnitMovementFlags(MOVEMENTFLAG_LEVITATING); - me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - me->setActive(false); - } - - void EnterCombat(Unit * /*who*/) - { - if (pInstance) - pInstance->SetData(DATA_ALAREVENT, IN_PROGRESS); - - me->SetUnitMovementFlags(MOVEMENTFLAG_LEVITATING); // after enterevademode will be set walk movement - DoZoneInCombat(); - me->setActive(true); - } - - void JustDied(Unit * /*victim*/) - { - if (pInstance) - pInstance->SetData(DATA_ALAREVENT, DONE); - } - - void JustSummoned(Creature *summon) - { - if (summon->GetEntry() == CREATURE_EMBER_OF_ALAR) - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - summon->AI()->AttackStart(pTarget); - } - - void MoveInLineOfSight(Unit * /*who*/) {} - - void AttackStart(Unit* who) - { - if (Phase1) - AttackStartNoMove(who); - else - ScriptedAI::AttackStart(who); - } - - void DamageTaken(Unit* /*pKiller*/, uint32 &damage) - { - if (damage >= me->GetHealth() && Phase1) - { - damage = 0; - if (!WaitEvent) - { - WaitEvent = WE_DIE; - WaitTimer = 0; - me->SetHealth(0); - me->InterruptNonMeleeSpells(true); - me->RemoveAllAuras(); - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - me->AttackStop(); - me->SetUInt64Value(UNIT_FIELD_TARGET, 0); - me->SetSpeed(MOVE_RUN, 5.0f); - me->GetMotionMaster()->Clear(); - me->GetMotionMaster()->MovePoint(0, waypoint[5][0], waypoint[5][1], waypoint[5][2]); - } - } - } - - void SpellHit(Unit*, const SpellEntry *spell) - { - if (spell->Id == SPELL_DIVE_BOMB_VISUAL) - { - me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FIRE, true); - me->SetDisplayId(11686); - //me->SendUpdateObjectToAllExcept(NULL); - } - } - - void MovementInform(uint32 type, uint32 /*id*/) - { - if (type == POINT_MOTION_TYPE) - { - WaitTimer = 1; - AfterMoving = true; - ForceMove = false; - } - } - - void UpdateAI(const uint32 diff) - { - if (!me->isInCombat()) // sometimes isincombat but !incombat, faction bug? - return; - - if (Berserk_Timer <= diff) - { - DoCast(me, SPELL_BERSERK, true); - Berserk_Timer = 60000; - } else Berserk_Timer -= diff; - - if (ForceMove) - { - if (ForceTimer <= diff) - { - me->GetMotionMaster()->MovePoint(0, waypoint[cur_wp][0], waypoint[cur_wp][1], waypoint[cur_wp][2]); - ForceTimer = 5000; - } else ForceTimer -= diff; - - } - if (WaitEvent) - { - if (WaitTimer) - { - if (WaitTimer <= diff) - { - if (AfterMoving) - { - me->GetMotionMaster()->MoveIdle(); - AfterMoving = false; - } - - switch(WaitEvent) - { - case WE_PLATFORM: - Platforms_Move_Timer = 30000+rand()%5000; - break; - case WE_QUILL: - DoCast(me, SPELL_FLAME_QUILLS, true); - Platforms_Move_Timer = 1; - WaitTimer = 10000; - WaitEvent = WE_DUMMY; - return; - case WE_DIE: - ForceMove = false; - me->SetUInt32Value(UNIT_FIELD_BYTES_1, UNIT_STAND_STATE_DEAD); - WaitTimer = 5000; - WaitEvent = WE_REVIVE; - return; - case WE_REVIVE: - me->SetUInt32Value(UNIT_FIELD_BYTES_1, UNIT_STAND_STATE_STAND); - me->SetHealth(me->GetMaxHealth()); - me->SetSpeed(MOVE_RUN, DefaultMoveSpeedRate); - me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - DoZoneInCombat(); - DoCast(me, SPELL_REBIRTH, true); - MeltArmor_Timer = 60000; - Charge_Timer = 7000; - DiveBomb_Timer = 40000+rand()%5000; - FlamePatch_Timer = 30000; - Phase1 = false; - break; - case WE_METEOR: - me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FIRE, false); - DoCast(me, SPELL_DIVE_BOMB_VISUAL, false); - WaitEvent = WE_DIVE; - WaitTimer = 4000; - return; - case WE_DIVE: - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - { - me->RemoveAurasDueToSpell(SPELL_DIVE_BOMB_VISUAL); - DoCast(pTarget, SPELL_DIVE_BOMB, true); - float dist = 3.0f; - if (me->IsWithinDist3d(pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 5.0f)) - dist = 5.0f; - WaitTimer = 1000 + floor(dist / 80 * 1000.0f); - me->GetMap()->CreatureRelocation(me, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(),0.0f); - me->StopMoving(); - WaitEvent = WE_LAND; - } - else - { - EnterEvadeMode(); - return; - } - case WE_LAND: - WaitEvent = WE_SUMMON; - WaitTimer = 2000; - return; - case WE_SUMMON: - for (uint8 i = 0; i < 2; ++i) - DoSpawnCreature(CREATURE_EMBER_OF_ALAR, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); - me->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, 10); - me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - me->SetDisplayId(me->GetNativeDisplayId()); - DoCast(me, SPELL_REBIRTH_2, true); - break; - case WE_DUMMY: - default: - break; - } - - WaitEvent = WE_NONE; - WaitTimer = 0; - } else WaitTimer -= diff; - } - return; - } - - if (Phase1) - { - if (me->getThreatManager().getThreatList().empty()) - { - EnterEvadeMode(); - return; - } - - if (Platforms_Move_Timer <= diff) - { - if (cur_wp == 4) - { - cur_wp = 0; - WaitEvent = WE_PLATFORM; - } - else - { - if (urand(0,4)) // next platform - { - DoSpawnCreature(CREATURE_EMBER_OF_ALAR, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); - if (cur_wp == 3) - cur_wp = 0; - else - ++cur_wp; - WaitEvent = WE_PLATFORM; - } - else // flame quill - { - cur_wp = 4; - WaitEvent = WE_QUILL; - } - } - ForceMove = true; - ForceTimer = 5000; - me->GetMotionMaster()->MovePoint(0, waypoint[cur_wp][0], waypoint[cur_wp][1], waypoint[cur_wp][2]); - WaitTimer = 0; - return; - } else Platforms_Move_Timer -= diff; - } - else - { - if (Charge_Timer <= diff) - { - Unit *pTarget= SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true); - if (pTarget) - DoCast(pTarget, SPELL_CHARGE); - Charge_Timer = 30000; - } else Charge_Timer -= diff; - - if (MeltArmor_Timer <= diff) - { - DoCast(me->getVictim(), SPELL_MELT_ARMOR); - MeltArmor_Timer = 60000; - } else MeltArmor_Timer -= diff; - - if (DiveBomb_Timer <= diff) - { - me->AttackStop(); - me->GetMotionMaster()->MovePoint(6, waypoint[4][0], waypoint[4][1], waypoint[4][2]); - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - me->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, 50); - WaitEvent = WE_METEOR; - WaitTimer = 0; - DiveBomb_Timer = 40000+rand()%5000; - return; - } else DiveBomb_Timer -= diff; - - if (FlamePatch_Timer <= diff) - { - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - { - Creature* Summoned = me->SummonCreature(CREATURE_FLAME_PATCH_ALAR, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 120000); - if (Summoned) - { - Summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - Summoned->SetFloatValue(OBJECT_FIELD_SCALE_X, Summoned->GetFloatValue(OBJECT_FIELD_SCALE_X)*2.5f); - Summoned->SetDisplayId(11686); - Summoned->setFaction(me->getFaction()); - Summoned->SetLevel(me->getLevel()); - Summoned->CastSpell(Summoned, SPELL_FLAME_PATCH, false); - } - } - FlamePatch_Timer = 30000; - } else FlamePatch_Timer -= diff; - } - - DoMeleeAttackIfReady(); - } - - void DoMeleeAttackIfReady() - { - if (me->isAttackReady() && !me->IsNonMeleeSpellCasted(false)) - { - if (me->IsWithinMeleeRange(me->getVictim())) - { - me->AttackerStateUpdate(me->getVictim()); - me->resetAttackTimer(); - } - else - { - Unit *pTarget = NULL; - pTarget = me->SelectNearestTargetInAttackDistance(5); - if (pTarget) - me->AI()->AttackStart(pTarget); - else - { - DoCast(me, SPELL_FLAME_BUFFET, true); - me->setAttackTimer(BASE_ATTACK, 1500); - } - } - } - } -}; - -CreatureAI* GetAI_boss_alar(Creature* pCreature) -{ - return new boss_alarAI(pCreature); -} - -struct mob_ember_of_alarAI : public ScriptedAI -{ - mob_ember_of_alarAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - c->SetUnitMovementFlags(MOVEMENTFLAG_LEVITATING); - c->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FIRE, true); - } - - ScriptedInstance *pInstance; - bool toDie; - - void Reset() {toDie = false;} - void EnterCombat(Unit * /*who*/) {DoZoneInCombat();} - void EnterEvadeMode() {me->setDeathState(JUST_DIED);} - - void DamageTaken(Unit* pKiller, uint32 &damage) - { - if (damage >= me->GetHealth() && pKiller != me && !toDie) - { - damage = 0; - DoCast(me, SPELL_EMBER_BLAST, true); - me->SetDisplayId(11686); - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - if (pInstance && pInstance->GetData(DATA_ALAREVENT) == 2) - { - if (Unit* Alar = Unit::GetUnit((*me), pInstance->GetData64(DATA_ALAR))) - { - int AlarHealth = Alar->GetHealth() - Alar->GetMaxHealth()*0.03; - if (AlarHealth > 0) - Alar->SetHealth(AlarHealth); - else - Alar->SetHealth(1); - } - } - toDie = true; - } - } - - void UpdateAI(const uint32 /*diff*/) - { - if (!UpdateVictim()) - return; - - if (toDie) - { - me->DealDamage(me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); - //me->SetVisibility(VISIBILITY_OFF); - } - - DoMeleeAttackIfReady(); - } - -}; - -CreatureAI* GetAI_mob_ember_of_alar(Creature* pCreature) -{ - return new mob_ember_of_alarAI(pCreature); -} - -struct mob_flame_patch_alarAI : public ScriptedAI -{ - mob_flame_patch_alarAI(Creature *c) : ScriptedAI(c) {} - void Reset() {} - void EnterCombat(Unit * /*who*/) {} - void AttackStart(Unit* /*who*/) {} - void MoveInLineOfSight(Unit* /*who*/) {} - void UpdateAI(const uint32 /*diff*/) {} -}; - -CreatureAI* GetAI_mob_flame_patch_alar(Creature* pCreature) -{ - return new mob_flame_patch_alarAI(pCreature); -} - -void AddSC_boss_alar() -{ - Script *newscript; - - newscript = new Script; - newscript->Name = "boss_alar"; - newscript->GetAI = &GetAI_boss_alar; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_ember_of_alar"; - newscript->GetAI = &GetAI_mob_ember_of_alar; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_flame_patch_alar"; - newscript->GetAI = &GetAI_mob_flame_patch_alar; - newscript->RegisterSelf(); -} - diff --git a/src/server/scripts/Outland/TempestKeep/the_eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/the_eye/boss_astromancer.cpp deleted file mode 100644 index e9e217a5c62..00000000000 --- a/src/server/scripts/Outland/TempestKeep/the_eye/boss_astromancer.cpp +++ /dev/null @@ -1,466 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: Boss_Astromancer -SD%Complete: 80 -SDComment: -SDCategory: Tempest Keep, The Eye -EndScriptData */ - -#include "ScriptedPch.h" -#include "the_eye.h" - -enum eEnums -{ - SAY_AGGRO = -1550007, - SAY_SUMMON1 = -1550008, - SAY_SUMMON2 = -1550009, - SAY_KILL1 = -1550010, - SAY_KILL2 = -1550011, - SAY_KILL3 = -1550012, - SAY_DEATH = -1550013, - SAY_VOIDA = -1550014, - SAY_VOIDB = -1550015, - - SPELL_ARCANE_MISSILES = 33031, - SPELL_WRATH_OF_THE_ASTROMANCER = 42783, - SPELL_BLINDING_LIGHT = 33009, - SPELL_FEAR = 34322, - SPELL_VOID_BOLT = 39329, - - SPELL_SPOTLIGHT = 25824, - NPC_ASTROMANCER_SOLARIAN_SPOTLIGHT = 18928, - - NPC_SOLARIUM_AGENT = 18925, - NPC_SOLARIUM_PRIEST = 18806, - - MODEL_HUMAN = 18239, - MODEL_VOIDWALKER = 18988, - - SPELL_SOLARIUM_GREAT_HEAL = 33387, - SPELL_SOLARIUM_HOLY_SMITE = 25054, - SPELL_SOLARIUM_ARCANE_TORRENT = 33390, - - WV_ARMOR = 31000 -}; - -const float CENTER_X = 432.909f; -const float CENTER_Y = -373.424f; -const float CENTER_Z = 17.9608f; -const float CENTER_O = 1.06421f; -const float SMALL_PORTAL_RADIUS = 12.6f; -const float LARGE_PORTAL_RADIUS = 26.0f; -const float PORTAL_Z = 17.005f; - - // x, y, z, o -static float SolarianPos[4] = {432.909, -373.424, 17.9608, 1.06421}; - -struct boss_high_astromancer_solarianAI : public ScriptedAI -{ - boss_high_astromancer_solarianAI(Creature *c) : ScriptedAI(c), Summons(me) - { - pInstance = c->GetInstanceData(); - - defaultarmor = c->GetArmor(); - defaultsize = c->GetFloatValue(OBJECT_FIELD_SCALE_X); - } - - ScriptedInstance *pInstance; - SummonList Summons; - - uint8 Phase; - - uint32 ArcaneMissiles_Timer; - uint32 m_uiWrathOfTheAstromancer_Timer; - uint32 BlindingLight_Timer; - uint32 Fear_Timer; - uint32 VoidBolt_Timer; - uint32 Phase1_Timer; - uint32 Phase2_Timer; - uint32 Phase3_Timer; - uint32 AppearDelay_Timer; - uint32 defaultarmor; - uint32 Wrath_Timer; - - float defaultsize; - float Portals[3][3]; - - bool AppearDelay; - bool BlindingLight; - - void Reset() - { - ArcaneMissiles_Timer = 2000; - m_uiWrathOfTheAstromancer_Timer = 15000; - BlindingLight_Timer = 41000; - Fear_Timer = 20000; - VoidBolt_Timer = 10000; - Phase1_Timer = 50000; - Phase2_Timer = 10000; - Phase3_Timer = 15000; - AppearDelay_Timer = 2000; - BlindingLight = false; - AppearDelay = false; - Wrath_Timer = 20000+rand()%5000;//twice in phase one - Phase = 1; - Wrath_Timer = 20000+rand()%5000;//twice in phase one - - if (pInstance) - pInstance->SetData(DATA_HIGHASTROMANCERSOLARIANEVENT, NOT_STARTED); - - me->SetArmor(defaultarmor); - me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - me->SetVisibility(VISIBILITY_ON); - me->SetFloatValue(OBJECT_FIELD_SCALE_X, defaultsize); - me->SetDisplayId(MODEL_HUMAN); - - Summons.DespawnAll(); - } - - void KilledUnit(Unit * /*victim*/) - { - DoScriptText(RAND(SAY_KILL1,SAY_KILL2,SAY_KILL3), me); - } - - void JustDied(Unit * /*victim*/) - { - me->SetFloatValue(OBJECT_FIELD_SCALE_X, defaultsize); - me->SetDisplayId(MODEL_HUMAN); - DoScriptText(SAY_DEATH, me); - - if (pInstance) - pInstance->SetData(DATA_HIGHASTROMANCERSOLARIANEVENT, DONE); - } - - void EnterCombat(Unit * /*who*/) - { - DoScriptText(SAY_AGGRO, me); - DoZoneInCombat(); - - if (pInstance) - pInstance->SetData(DATA_HIGHASTROMANCERSOLARIANEVENT, IN_PROGRESS); - } - - void SummonMinion(uint32 entry, float x, float y, float z) - { - Creature* Summoned = me->SummonCreature(entry, x, y, z, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); - if (Summoned) - { - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - Summoned->AI()->AttackStart(pTarget); - - Summons.Summon(Summoned); - } - } - - float Portal_X(float radius) - { - if (urand(0,1)) - radius = -radius; - - return radius * (float)(rand()%100)/100.0f + CENTER_X; - } - - float Portal_Y(float x, float radius) - { - float z = RAND(1, -1); - - return (z*sqrt(radius*radius - (x - CENTER_X)*(x - CENTER_X)) + CENTER_Y); - } - - void UpdateAI(const uint32 diff) - { - if (!UpdateVictim()) - return; - - if (AppearDelay) - { - me->StopMoving(); - me->AttackStop(); - if (AppearDelay_Timer <= diff) - { - AppearDelay = false; - if (Phase == 2) - { - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - me->SetVisibility(VISIBILITY_OFF); - } - AppearDelay_Timer = 2000; - } else AppearDelay_Timer -= diff; - } - - if (Phase == 1) - { - if (BlindingLight_Timer <= diff) - { - BlindingLight = true; - BlindingLight_Timer = 45000; - } else BlindingLight_Timer -= diff; - - if (Wrath_Timer <= diff) - { - me->InterruptNonMeleeSpells(false); - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true)) - DoCast(pTarget, SPELL_WRATH_OF_THE_ASTROMANCER, true); - Wrath_Timer = 20000+rand()%5000; - } else Wrath_Timer -= diff; - - if (ArcaneMissiles_Timer <= diff) - { - if (BlindingLight) - { - DoCast(me->getVictim(), SPELL_BLINDING_LIGHT); - BlindingLight = false; - }else{ - Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); - - if (!me->HasInArc(2.5f, pTarget)) - pTarget = me->getVictim(); - - if (pTarget) - DoCast(pTarget, SPELL_ARCANE_MISSILES); - } - ArcaneMissiles_Timer = 3000; - } else ArcaneMissiles_Timer -= diff; - - if (m_uiWrathOfTheAstromancer_Timer <= diff) - { - me->InterruptNonMeleeSpells(false); - - //Target the tank ? - if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 1)) - if (pTarget->GetTypeId() == TYPEID_PLAYER) - { - DoCast(pTarget, SPELL_WRATH_OF_THE_ASTROMANCER); - m_uiWrathOfTheAstromancer_Timer = 25000; - } - else - m_uiWrathOfTheAstromancer_Timer = 1000; - } else m_uiWrathOfTheAstromancer_Timer -= diff; - - //Phase1_Timer - if (Phase1_Timer <= diff) - { - Phase = 2; - Phase1_Timer = 50000; - //After these 50 seconds she portals to the middle of the room and disappears, leaving 3 light portals behind. - me->GetMotionMaster()->Clear(); - me->GetMap()->CreatureRelocation(me, CENTER_X, CENTER_Y, CENTER_Z, CENTER_O); - for (uint8 i=0; i <= 2; ++i) - { - if (!i) - { - Portals[i][0] = Portal_X(SMALL_PORTAL_RADIUS); - Portals[i][1] = Portal_Y(Portals[i][0], SMALL_PORTAL_RADIUS); - Portals[i][2] = CENTER_Z; - } - else - { - Portals[i][0] = Portal_X(LARGE_PORTAL_RADIUS); - Portals[i][1] = Portal_Y(Portals[i][0], LARGE_PORTAL_RADIUS); - Portals[i][2] = PORTAL_Z; - } - } - if ((abs(Portals[2][0] - Portals[1][0]) < 7) && (abs(Portals[2][1] - Portals[1][1]) < 7)) - { - int i=1; - if (abs(CENTER_X + 26.0f - Portals[2][0]) < 7) - i = -1; - Portals[2][0] = Portals[2][0]+7*i; - Portals[2][1] = Portal_Y(Portals[2][0], LARGE_PORTAL_RADIUS); - } - for (int i=0; i <= 2; ++i) - { - if (Creature* Summoned = me->SummonCreature(NPC_ASTROMANCER_SOLARIAN_SPOTLIGHT, Portals[i][0], Portals[i][1], Portals[i][2], CENTER_O, TEMPSUMMON_TIMED_DESPAWN, Phase2_Timer+Phase3_Timer+AppearDelay_Timer+1700)) - { - Summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - Summoned->CastSpell(Summoned, SPELL_SPOTLIGHT, false); - } - } - AppearDelay = true; - } else Phase1_Timer-=diff; - } - else if (Phase == 2) - { - //10 seconds after Solarian disappears, 12 mobs spawn out of the three portals. - me->AttackStop(); - me->StopMoving(); - if (Phase2_Timer <= diff) - { - Phase = 3; - for (int i=0; i <= 2; ++i) - for (int j=1; j <= 4; j++) - SummonMinion(NPC_SOLARIUM_AGENT, Portals[i][0], Portals[i][1], Portals[i][2]); - - DoScriptText(SAY_SUMMON1, me); - Phase2_Timer = 10000; - } else Phase2_Timer -= diff; - } - else if (Phase == 3) - { - me->AttackStop(); - me->StopMoving(); - - //Check Phase3_Timer - if (Phase3_Timer <= diff) - { - Phase = 1; - - //15 seconds later Solarian reappears out of one of the 3 portals. Simultaneously, 2 healers appear in the two other portals. - int i = rand()%3; - me->GetMotionMaster()->Clear(); - me->GetMap()->CreatureRelocation(me, Portals[i][0], Portals[i][1], Portals[i][2], CENTER_O); - - for (int j=0; j <= 2; j++) - if (j != i) - SummonMinion(NPC_SOLARIUM_PRIEST, Portals[j][0], Portals[j][1], Portals[j][2]); - - me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - me->SetVisibility(VISIBILITY_ON); - - DoScriptText(SAY_SUMMON2, me); - AppearDelay = true; - Phase3_Timer = 15000; - } else Phase3_Timer -= diff; - } - else if (Phase == 4) - { - //Fear_Timer - if (Fear_Timer <= diff) - { - DoCast(me, SPELL_FEAR); - Fear_Timer = 20000; - } else Fear_Timer -= diff; - - //VoidBolt_Timer - if (VoidBolt_Timer <= diff) - { - DoCast(me->getVictim(), SPELL_VOID_BOLT); - VoidBolt_Timer = 10000; - } else VoidBolt_Timer -= diff; - } - - //When Solarian reaches 20% she will transform into a huge void walker. - if (Phase != 4 && ((me->GetHealth()*100 / me->GetMaxHealth())<20)) - { - Phase = 4; - - //To make sure she wont be invisible or not selecatble - me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - me->SetVisibility(VISIBILITY_ON); - DoScriptText(SAY_VOIDA, me); - DoScriptText(SAY_VOIDB, me); - me->SetArmor(WV_ARMOR); - me->SetDisplayId(MODEL_VOIDWALKER); - me->SetFloatValue(OBJECT_FIELD_SCALE_X, defaultsize*2.5f); - } - - DoMeleeAttackIfReady(); - } -}; - -struct mob_solarium_priestAI : public ScriptedAI -{ - mob_solarium_priestAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - } - - ScriptedInstance *pInstance; - - uint32 healTimer; - uint32 holysmiteTimer; - uint32 aoesilenceTimer; - - void Reset() - { - healTimer = 9000; - holysmiteTimer = 1; - aoesilenceTimer = 15000; - } - - void EnterCombat(Unit * /*who*/) - { - } - - void UpdateAI(const uint32 diff) - { - if (!UpdateVictim()) - return; - - if (healTimer <= diff) - { - Unit *pTarget = NULL; - - switch (urand(0,1)) - { - case 0: - if (pInstance) - pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_ASTROMANCER)); - break; - case 1: - pTarget = me; - break; - } - - if (pTarget) - { - DoCast(pTarget, SPELL_SOLARIUM_GREAT_HEAL); - healTimer = 9000; - } - } else healTimer -= diff; - - if (holysmiteTimer <= diff) - { - DoCast(me->getVictim(), SPELL_SOLARIUM_HOLY_SMITE); - holysmiteTimer = 4000; - } else holysmiteTimer -= diff; - - if (aoesilenceTimer <= diff) - { - DoCast(me->getVictim(), SPELL_SOLARIUM_ARCANE_TORRENT); - aoesilenceTimer = 13000; - } else aoesilenceTimer -= diff; - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_mob_solarium_priest(Creature* pCreature) -{ - return new mob_solarium_priestAI (pCreature); -} - -CreatureAI* GetAI_boss_high_astromancer_solarian(Creature* pCreature) -{ - return new boss_high_astromancer_solarianAI (pCreature); -} - -void AddSC_boss_high_astromancer_solarian() -{ - Script *newscript; - newscript = new Script; - newscript->Name = "boss_high_astromancer_solarian"; - newscript->GetAI = &GetAI_boss_high_astromancer_solarian; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_solarium_priest"; - newscript->GetAI = &GetAI_mob_solarium_priest; - newscript->RegisterSelf(); -} - diff --git a/src/server/scripts/Outland/TempestKeep/the_eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/the_eye/boss_kaelthas.cpp deleted file mode 100644 index 05681fb7539..00000000000 --- a/src/server/scripts/Outland/TempestKeep/the_eye/boss_kaelthas.cpp +++ /dev/null @@ -1,1498 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: Boss_Kaelthas -SD%Complete: 60 -SDComment: SQL, weapon scripts, mind control, need correct spells(interruptible/uninterruptible), phoenix spawn location & animation, phoenix behaviour & spawn during gravity lapse -SDCategory: Tempest Keep, The Eye -EndScriptData */ - -#include "ScriptedPch.h" -#include "the_eye.h" -#include "WorldPacket.h" - -enum eEnums -{ - //kael'thas Speech - SAY_INTRO = -1550016, - SAY_INTRO_CAPERNIAN = -1550017, - SAY_INTRO_TELONICUS = -1550018, - SAY_INTRO_THALADRED = -1550019, - SAY_INTRO_SANGUINAR = -1550020, - SAY_PHASE2_WEAPON = -1550021, - SAY_PHASE3_ADVANCE = -1550022, - SAY_PHASE4_INTRO2 = -1550023, - SAY_PHASE5_NUTS = -1550024, - SAY_SLAY1 = -1550025, - SAY_SLAY2 = -1550026, - SAY_SLAY3 = -1550027, - SAY_MINDCONTROL1 = -1550028, - SAY_MINDCONTROL2 = -1550029, - SAY_GRAVITYLAPSE1 = -1550030, - SAY_GRAVITYLAPSE2 = -1550031, - SAY_SUMMON_PHOENIX1 = -1550032, - SAY_SUMMON_PHOENIX2 = -1550033, - SAY_DEATH = -1550034, - - //Thaladred the Darkener speech - SAY_THALADRED_AGGRO = -1550035, - SAY_THALADRED_DEATH = -1550036, - EMOTE_THALADRED_GAZE = -1550037, - - //Lord Sanguinar speech - SAY_SANGUINAR_AGGRO = -1550038, - SAY_SANGUINAR_DEATH = -1550039, - - //Grand Astromancer Capernian speech - SAY_CAPERNIAN_AGGRO = -1550040, - SAY_CAPERNIAN_DEATH = -1550041, - - //Master Engineer Telonicus speech - SAY_TELONICUS_AGGRO = -1550042, - SAY_TELONICUS_DEATH = -1550043, - - //Phase 2 spells - SPELL_SUMMON_WEAPONS = 36976, - SPELL_SUMMON_WEAPONA = 36958, - SPELL_SUMMON_WEAPONB = 36959, - SPELL_SUMMON_WEAPONC = 36960, - SPELL_SUMMON_WEAPOND = 36961, - SPELL_SUMMON_WEAPONE = 36962, - SPELL_SUMMON_WEAPONF = 36963, - SPELL_SUMMON_WEAPONG = 36964, - SPELL_RES_VISUAL = 24171, - - //Phase 4 spells - SPELL_FIREBALL = 22088, //wrong but works with CastCustomSpell - SPELL_PYROBLAST = 36819, - SPELL_FLAME_STRIKE = 36735, - SPELL_FLAME_STRIKE_VIS = 36730, - SPELL_FLAME_STRIKE_DMG = 36731, - SPELL_ARCANE_DISRUPTION = 36834, - SPELL_SHOCK_BARRIER = 36815, - SPELL_PHOENIX_ANIMATION = 36723, - SPELL_MIND_CONTROL = 32830, - - //Phase 5 spells - SPELL_EXPLODE = 36092, - SPELL_FULLPOWER = 36187, - SPELL_KNOCKBACK = 11027, - SPELL_GRAVITY_LAPSE = 34480, - SPELL_GRAVITY_LAPSE_AURA = 39432, - SPELL_NETHER_BEAM = 35873, - - //Thaladred the Darkener spells - SPELL_PSYCHIC_BLOW = 10689, - SPELL_SILENCE = 30225, - //Lord Sanguinar spells - SPELL_BELLOWING_ROAR = 40636, - //Grand Astromancer Capernian spells - - SPELL_CAPERNIAN_FIREBALL = 36971, - SPELL_CONFLAGRATION = 37018, - SPELL_ARCANE_EXPLOSION = 36970, - //Master Engineer Telonicus spells - SPELL_BOMB = 37036, - SPELL_REMOTE_TOY = 37027, - //Nether Vapor spell - SPELL_NETHER_VAPOR = 35859, - //Phoenix spell - SPELL_BURN = 36720, - SPELL_EMBER_BLAST = 34341, - SPELL_REBIRTH = 41587, - - //Creature IDs - NPC_PHOENIX = 21362, - NPC_PHOENIX_EGG = 21364, - - //Phoenix egg and phoenix model - MODEL_ID_PHOENIX = 19682, - MODEL_ID_PHOENIX_EGG = 20245, - - MAX_ADVISORS = 4 -}; - -uint32 m_auiSpellSummonWeapon[]= -{ - SPELL_SUMMON_WEAPONA, SPELL_SUMMON_WEAPONB, SPELL_SUMMON_WEAPONC, SPELL_SUMMON_WEAPOND, - SPELL_SUMMON_WEAPONE, SPELL_SUMMON_WEAPONF, SPELL_SUMMON_WEAPONG -}; - -const float CAPERNIAN_DISTANCE = 20.0f; //she casts away from the target -const float KAEL_VISIBLE_RANGE = 50.0f; - -const float afGravityPos[3] = {795.0f, 0.0f, 70.0f}; - -#define TIME_PHASE_2_3 120000 -#define TIME_PHASE_3_4 180000 - -//Base AI for Advisors -struct advisorbase_ai : public ScriptedAI -{ - advisorbase_ai(Creature* pCreature) : ScriptedAI(pCreature) - { - m_pInstance = pCreature->GetInstanceData(); - m_bDoubled_Health = false; - } - - ScriptedInstance* m_pInstance; - bool FakeDeath; - bool m_bDoubled_Health; - uint32 DelayRes_Timer; - uint64 DelayRes_Target; - - void Reset() - { - if (m_bDoubled_Health) - { - me->SetMaxHealth(me->GetMaxHealth() / 2); - m_bDoubled_Health = false; - } - - FakeDeath = false; - DelayRes_Timer = 0; - DelayRes_Target = 0; - - me->SetStandState(UNIT_STAND_STATE_STAND); - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - - //reset encounter - if (m_pInstance && (m_pInstance->GetData(DATA_KAELTHASEVENT) == 1 || m_pInstance->GetData(DATA_KAELTHASEVENT) == 3)) - if (Creature *Kaelthas = Unit::GetCreature((*me), m_pInstance->GetData64(DATA_KAELTHAS))) - Kaelthas->AI()->EnterEvadeMode(); - } - - void MoveInLineOfSight(Unit *who) - { - if (!who || FakeDeath || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) - return; - - ScriptedAI::MoveInLineOfSight(who); - } - - void AttackStart(Unit* who) - { - if (!who || FakeDeath || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) - return; - - ScriptedAI::AttackStart(who); - } - - void Revive(Unit* /*Target*/) - { - me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - // double health for phase 3 - me->SetMaxHealth(me->GetMaxHealth() * 2); - m_bDoubled_Health = true; - me->SetHealth(me->GetMaxHealth()); - me->SetStandState(UNIT_STAND_STATE_STAND); - - DoCast(me, SPELL_RES_VISUAL, false); - DelayRes_Timer = 2000; - } - - void DamageTaken(Unit* pKiller, uint32 &damage) - { - if (damage < me->GetHealth()) - return; - - //Prevent glitch if in fake death - if (FakeDeath && m_pInstance && m_pInstance->GetData(DATA_KAELTHASEVENT) != 0) - { - damage = 0; - return; - } - - //Don't really die in phase 1 & 3, only die after that - if (m_pInstance && m_pInstance->GetData(DATA_KAELTHASEVENT) != 0) - { - //prevent death - damage = 0; - FakeDeath = true; - - me->InterruptNonMeleeSpells(false); - me->SetHealth(0); - me->StopMoving(); - me->ClearComboPointHolders(); - me->RemoveAllAurasOnDeath(); - me->ModifyAuraState(AURA_STATE_HEALTHLESS_20_PERCENT, false); - me->ModifyAuraState(AURA_STATE_HEALTHLESS_35_PERCENT, false); - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - me->ClearAllReactives(); - me->SetUInt64Value(UNIT_FIELD_TARGET,0); - me->GetMotionMaster()->Clear(); - me->GetMotionMaster()->MoveIdle(); - me->SetStandState(UNIT_STAND_STATE_DEAD); - JustDied(pKiller); - } - } - - void UpdateAI(const uint32 diff) - { - if (DelayRes_Timer) - { - if (DelayRes_Timer <= diff) - { - DelayRes_Timer = 0; - FakeDeath = false; - - Unit* Target = Unit::GetUnit((*me), DelayRes_Target); - if (!Target) - Target = me->getVictim(); - - DoResetThreat(); - AttackStart(Target); - me->GetMotionMaster()->Clear(); - me->GetMotionMaster()->MoveChase(Target); - me->AddThreat(Target, 0.0f); - } else DelayRes_Timer -= diff; - } - } - -}; - -//Kael'thas AI -struct boss_kaelthasAI : public ScriptedAI -{ - boss_kaelthasAI(Creature* pCreature) : ScriptedAI(pCreature), summons(me) - { - m_pInstance = pCreature->GetInstanceData(); - memset(&m_auiAdvisorGuid, 0, sizeof(m_auiAdvisorGuid)); - } - - ScriptedInstance* m_pInstance; - - uint32 Fireball_Timer; - uint32 ArcaneDisruption_Timer; - uint32 Phoenix_Timer; - uint32 ShockBarrier_Timer; - uint32 GravityLapse_Timer; - uint32 GravityLapse_Phase; - uint32 NetherBeam_Timer; - uint32 NetherVapor_Timer; - uint32 FlameStrike_Timer; - uint32 MindControl_Timer; - uint32 Phase; - uint32 PhaseSubphase; //generic - uint32 Phase_Timer; //generic timer - uint32 PyrosCasted; - - bool InGravityLapse; - bool IsCastingFireball; - bool ChainPyros; - - SummonList summons; - - uint64 m_auiAdvisorGuid[MAX_ADVISORS]; - - void Reset() - { - Fireball_Timer = 5000+rand()%10000; - ArcaneDisruption_Timer = 45000; - MindControl_Timer = 40000; - Phoenix_Timer = 50000; - ShockBarrier_Timer = 60000; - FlameStrike_Timer = 30000; - GravityLapse_Timer = 20000; - GravityLapse_Phase = 0; - NetherBeam_Timer = 8000; - NetherVapor_Timer = 10000; - PyrosCasted = 0; - Phase = 0; - InGravityLapse = false; - IsCastingFireball = false; - ChainPyros = false; - - if (me->isInCombat()) - PrepareAdvisors(); - - summons.DespawnAll(); - - me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - - if (m_pInstance) - m_pInstance->SetData(DATA_KAELTHASEVENT, 0); - } - - void PrepareAdvisors() - { - for (uint8 i = 0; i < MAX_ADVISORS; ++i) - { - if (Creature *pCreature = Unit::GetCreature((*me), m_auiAdvisorGuid[i])) - { - pCreature->Respawn(); - pCreature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - pCreature->setFaction(me->getFaction()); - pCreature->AI()->EnterEvadeMode(); - } - } - } - - void StartEvent() - { - if (!m_pInstance) - return; - - m_auiAdvisorGuid[0] = m_pInstance->GetData64(DATA_THALADREDTHEDARKENER); - m_auiAdvisorGuid[1] = m_pInstance->GetData64(DATA_LORDSANGUINAR); - m_auiAdvisorGuid[2] = m_pInstance->GetData64(DATA_GRANDASTROMANCERCAPERNIAN); - m_auiAdvisorGuid[3] = m_pInstance->GetData64(DATA_MASTERENGINEERTELONICUS); - - if (!m_auiAdvisorGuid[0] || !m_auiAdvisorGuid[1] || !m_auiAdvisorGuid[2] || !m_auiAdvisorGuid[3]) - { - error_log("TSCR: Kael'Thas One or more advisors missing, Skipping Phases 1-3"); - - DoScriptText(SAY_PHASE4_INTRO2, me); - - Phase = 4; - - m_pInstance->SetData(DATA_KAELTHASEVENT, 4); - - me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - AttackStart(pTarget); - - } - else - { - PrepareAdvisors(); - - DoScriptText(SAY_INTRO, me); - - m_pInstance->SetData(DATA_KAELTHASEVENT, 1); - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - - PhaseSubphase = 0; - Phase_Timer = 23000; - Phase = 1; - } - } - - void MoveInLineOfSight(Unit *who) - { - if (!me->hasUnitState(UNIT_STAT_STUNNED) && who->isTargetableForAttack() && - me->IsHostileTo(who) && who->isInAccessiblePlaceFor(me)) - { - if (!me->canFly() && me->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE) - return; - - float attackRadius = me->GetAttackDistance(who); - if (me->IsWithinDistInMap(who, attackRadius) && me->IsWithinLOSInMap(who)) - { - if (!me->getVictim() && Phase >= 4) - { - who->RemoveAurasDueToSpell(SPELL_AURA_MOD_STEALTH); - AttackStart(who); - } - else if (me->GetMap()->IsDungeon()) - { - if (m_pInstance && !m_pInstance->GetData(DATA_KAELTHASEVENT) && !Phase) - StartEvent(); - - who->SetInCombatWith(me); - me->AddThreat(who, 0.0f); - } - } - } - } - - void Aggro(Unit * /*who*/) - { - if (m_pInstance && !m_pInstance->GetData(DATA_KAELTHASEVENT) && !Phase) - StartEvent(); - } - - void KilledUnit() - { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2,SAY_SLAY3), me); - } - - void JustSummoned(Creature* pSummoned) - { - // if not phoenix, then it's one of the 7 weapons - if (pSummoned->GetEntry() != NPC_PHOENIX) - { - if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - pSummoned->AI()->AttackStart(pTarget); - - summons.Summon(pSummoned); - } - } - - void SummonedCreatureDespawn(Creature *summon) {summons.Despawn(summon);} - - void JustDied(Unit* /*Killer*/) - { - me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - - DoScriptText(SAY_DEATH, me); - - summons.DespawnAll(); - - if (m_pInstance) - m_pInstance->SetData(DATA_KAELTHASEVENT, 0); - - for (uint8 i = 0; i < MAX_ADVISORS; ++i) - { - if (Unit* pAdvisor = Unit::GetUnit((*me), m_auiAdvisorGuid[i])) - pAdvisor->Kill(pAdvisor); - } - } - - void UpdateAI(const uint32 diff) - { - //Phase 1 - switch (Phase) - { - case 1: - { - Unit *pTarget = NULL; - Creature* Advisor = NULL; - - //Subphase switch - switch(PhaseSubphase) - { - //Subphase 1 - Start - case 0: - if (Phase_Timer <= diff) - { - DoScriptText(SAY_INTRO_THALADRED, me); - - //start advisor within 7 seconds - Phase_Timer = 7000; - ++PhaseSubphase; - } else Phase_Timer -= diff; - break; - - //Subphase 1 - Unlock advisor - case 1: - if (Phase_Timer <= diff) - { - Advisor = (Unit::GetCreature((*me), m_auiAdvisorGuid[0])); - - if (Advisor) - { - Advisor->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - Advisor->setFaction(me->getFaction()); - - pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); - if (pTarget) - Advisor->AI()->AttackStart(pTarget); - } - - ++PhaseSubphase; - } else Phase_Timer -= diff; - break; - - //Subphase 2 - Start - case 2: - Advisor = (Unit::GetCreature((*me), m_auiAdvisorGuid[0])); - - if (Advisor && (Advisor->getStandState() == UNIT_STAND_STATE_DEAD)) - { - DoScriptText(SAY_INTRO_SANGUINAR, me); - - //start advisor within 12.5 seconds - Phase_Timer = 12500; - ++PhaseSubphase; - } - break; - - //Subphase 2 - Unlock advisor - case 3: - if (Phase_Timer <= diff) - { - Advisor = (Unit::GetCreature((*me), m_auiAdvisorGuid[1])); - - if (Advisor) - { - Advisor->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - Advisor->setFaction(me->getFaction()); - - pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); - if (pTarget) - Advisor->AI()->AttackStart(pTarget); - } - - ++PhaseSubphase; - } else Phase_Timer -= diff; - break; - - //Subphase 3 - Start - case 4: - Advisor = (Unit::GetCreature((*me), m_auiAdvisorGuid[1])); - - if (Advisor && (Advisor->getStandState() == UNIT_STAND_STATE_DEAD)) - { - DoScriptText(SAY_INTRO_CAPERNIAN, me); - - //start advisor within 7 seconds - Phase_Timer = 7000; - ++PhaseSubphase; - } - break; - - //Subphase 3 - Unlock advisor - case 5: - if (Phase_Timer <= diff) - { - Advisor = (Unit::GetCreature((*me), m_auiAdvisorGuid[2])); - - if (Advisor) - { - Advisor->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - Advisor->setFaction(me->getFaction()); - - pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); - if (pTarget) - Advisor->AI()->AttackStart(pTarget); - } - - ++PhaseSubphase; - } else Phase_Timer -= diff; - break; - - //Subphase 4 - Start - case 6: - Advisor = (Unit::GetCreature((*me), m_auiAdvisorGuid[2])); - - if (Advisor && (Advisor->getStandState() == UNIT_STAND_STATE_DEAD)) - { - DoScriptText(SAY_INTRO_TELONICUS, me); - - //start advisor within 8.4 seconds - Phase_Timer = 8400; - ++PhaseSubphase; - } - break; - - //Subphase 4 - Unlock advisor - case 7: - if (Phase_Timer <= diff) - { - Advisor = (Unit::GetCreature((*me), m_auiAdvisorGuid[3])); - - if (Advisor) - { - Advisor->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - Advisor->setFaction(me->getFaction()); - - pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); - if (pTarget) - Advisor->AI()->AttackStart(pTarget); - } - - Phase_Timer = 3000; - ++PhaseSubphase; - } else Phase_Timer -= diff; - break; - - //End of phase 1 - case 8: - Advisor = (Unit::GetCreature((*me), m_auiAdvisorGuid[3])); - - if (Advisor && (Advisor->getStandState() == UNIT_STAND_STATE_DEAD)) - { - Phase = 2; - if (m_pInstance) - m_pInstance->SetData(DATA_KAELTHASEVENT, 2); - - DoScriptText(SAY_PHASE2_WEAPON, me); - - PhaseSubphase = 0; - Phase_Timer = 3500; - DoCast(me, SPELL_SUMMON_WEAPONS); - } - break; - } - } - break; - - case 2: - { - if (PhaseSubphase == 0) - { - if (Phase_Timer <= diff) - { - PhaseSubphase = 1; - } else Phase_Timer -= diff; - } - - //Spawn weapons - if (PhaseSubphase == 1) - { - DoCast(me, SPELL_SUMMON_WEAPONS, false); - - uint8 uiMaxWeapon = sizeof(m_auiSpellSummonWeapon)/sizeof(uint32); - - for (uint32 i = 0; i < uiMaxWeapon; ++i) - DoCast(me, m_auiSpellSummonWeapon[i], true); - - PhaseSubphase = 2; - Phase_Timer = TIME_PHASE_2_3; - } - - if (PhaseSubphase == 2) - { - if (Phase_Timer <= diff) - { - DoScriptText(SAY_PHASE3_ADVANCE, me); - if (m_pInstance) - m_pInstance->SetData(DATA_KAELTHASEVENT, 3); - Phase = 3; - PhaseSubphase = 0; - } else Phase_Timer -= diff; - } - } - break; - - case 3: - { - if (PhaseSubphase == 0) - { - //Respawn advisors - Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); - - Creature *Advisor; - for (uint8 i = 0; i < MAX_ADVISORS; ++i) - { - Advisor = Unit::GetCreature((*me), m_auiAdvisorGuid[i]); - - if (!Advisor) - error_log("SD2: Kael'Thas Advisor %u does not exist. Possibly despawned? Incorrectly Killed?", i); - else - CAST_AI(advisorbase_ai, Advisor->AI())->Revive(pTarget); - } - - PhaseSubphase = 1; - Phase_Timer = TIME_PHASE_3_4; - } - - if (Phase_Timer <= diff) - { - DoScriptText(SAY_PHASE4_INTRO2, me); - Phase = 4; - - if (m_pInstance) - m_pInstance->SetData(DATA_KAELTHASEVENT, 4); - - // Sometimes people can collect Aggro in Phase 1-3. Reset threat before releasing Kael. - DoResetThreat(); - - me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - AttackStart(pTarget); - - Phase_Timer = 30000; - } else Phase_Timer -= diff; - } - break; - - case 4: - case 5: - case 6: - { - //Return since we have no target - if (!UpdateVictim()) - return; - - //Fireball_Timer - if (!InGravityLapse && !ChainPyros && Phase != 5) - { - if (Fireball_Timer <= diff) - { - if (!IsCastingFireball) - { - if (!me->IsNonMeleeSpellCasted(false)) - { - //interruptable - me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_INTERRUPT_CAST, false); - int32 dmg = 20000+rand()%5000; - me->CastCustomSpell(me->getVictim(), SPELL_FIREBALL, &dmg, 0, 0, false); - IsCastingFireball = true; - Fireball_Timer = 2500; - } - } - else - { - //apply resistance - me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_INTERRUPT_CAST, true); - IsCastingFireball = false; - Fireball_Timer = 5000+rand()%10000; - } - } else Fireball_Timer -= diff; - - //ArcaneDisruption_Timer - if (ArcaneDisruption_Timer <= diff) - { - DoCast(me->getVictim(), SPELL_ARCANE_DISRUPTION, true); - ArcaneDisruption_Timer = 60000; - } else ArcaneDisruption_Timer -= diff; - - if (FlameStrike_Timer <= diff) - { - if (Unit* pUnit = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pUnit, SPELL_FLAME_STRIKE); - - FlameStrike_Timer = 30000; - } else FlameStrike_Timer -= diff; - - if (MindControl_Timer <= diff) - { - if (me->getThreatManager().getThreatList().size() >= 2) - for (uint32 i = 0; i < 3; ++i) - { - debug_log("SD2: Kael'Thas mind control not supported."); - //DoCast(pUnit, SPELL_MIND_CONTROL); - } - - MindControl_Timer = 60000; - } else MindControl_Timer -= diff; - } - - //Phoenix_Timer - if (Phoenix_Timer <= diff) - { - DoCast(me, SPELL_PHOENIX_ANIMATION); - DoScriptText(RAND(SAY_SUMMON_PHOENIX1,SAY_SUMMON_PHOENIX2), me); - - Phoenix_Timer = 60000; - } else Phoenix_Timer -= diff; - - //Phase 4 specific spells - if (Phase == 4) - { - if (me->GetHealth()*100 / me->GetMaxHealth() < 50) - { - if (m_pInstance) - m_pInstance->SetData(DATA_KAELTHASEVENT, 4); - Phase = 5; - Phase_Timer = 10000; - - DoScriptText(SAY_PHASE5_NUTS, me); - - me->StopMoving(); - me->GetMotionMaster()->Clear(); - me->GetMotionMaster()->MoveIdle(); - me->GetMap()->CreatureRelocation(me, afGravityPos[0], afGravityPos[1], afGravityPos[2], 0); - me->SendMonsterMove(afGravityPos[0], afGravityPos[1], afGravityPos[2], 0, 0, 0); - - me->InterruptNonMeleeSpells(false); - DoCast(me, SPELL_FULLPOWER); - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - } - - //ShockBarrier_Timer - if (ShockBarrier_Timer <= diff) - { - DoCast(me, SPELL_SHOCK_BARRIER); - ChainPyros = true; - PyrosCasted = 0; - ShockBarrier_Timer = 60000; - } else ShockBarrier_Timer -= diff; - - //Chain Pyros (3 of them max) - if (ChainPyros && !me->IsNonMeleeSpellCasted(false)) - { - if (PyrosCasted < 3) - { - DoCast(me->getVictim(), SPELL_PYROBLAST); - ++PyrosCasted; - } - else - { - ChainPyros = false; - Fireball_Timer = 2500; - ArcaneDisruption_Timer = 60000; - } - } - } - - if (Phase == 5) - { - if (Phase_Timer <= diff) - { - me->InterruptNonMeleeSpells(false); - me->RemoveAurasDueToSpell(SPELL_FULLPOWER); - - DoCast(me, SPELL_EXPLODE); - - me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - Phase = 6; - AttackStart(me->getVictim()); - } else Phase_Timer -= diff; - } - - //Phase 5 - if (Phase == 6) - { - - //GravityLapse_Timer - if (GravityLapse_Timer <= diff) - { - std::list::const_iterator i = me->getThreatManager().getThreatList().begin(); - switch (GravityLapse_Phase) - { - case 0: - me->StopMoving(); - me->GetMotionMaster()->Clear(); - me->GetMotionMaster()->MoveIdle(); - me->GetMap()->CreatureRelocation(me, afGravityPos[0], afGravityPos[1], afGravityPos[2], 0); - me->SendMonsterMove(afGravityPos[0], afGravityPos[1], afGravityPos[2], 0, MOVEMENTFLAG_NONE, 0); - - // 1) Kael'thas will portal the whole raid right into his body - for (i = me->getThreatManager().getThreatList().begin(); i!= me->getThreatManager().getThreatList().end(); ++i) - { - Unit* pUnit = Unit::GetUnit((*me), (*i)->getUnitGuid()); - if (pUnit && (pUnit->GetTypeId() == TYPEID_PLAYER)) - { - //Use work around packet to prevent player from being dropped from combat - DoTeleportPlayer(pUnit, afGravityPos[0], afGravityPos[1], afGravityPos[2], pUnit->GetOrientation()); - } - } - - GravityLapse_Timer = 500; - ++GravityLapse_Phase; - InGravityLapse = true; - ShockBarrier_Timer = 1000; - NetherBeam_Timer = 5000; - break; - - case 1: - DoScriptText(RAND(SAY_GRAVITYLAPSE1,SAY_GRAVITYLAPSE2), me); - - // 2) At that point he will put a Gravity Lapse debuff on everyone - for (i = me->getThreatManager().getThreatList().begin(); i != me->getThreatManager().getThreatList().end(); ++i) - { - if (Unit* pUnit = Unit::GetUnit((*me), (*i)->getUnitGuid())) - { - DoCast(pUnit, SPELL_KNOCKBACK, true); - //Gravity lapse - needs an exception in Spell system to work - - pUnit->CastSpell(pUnit, SPELL_GRAVITY_LAPSE, true, 0, 0, me->GetGUID()); - pUnit->CastSpell(pUnit, SPELL_GRAVITY_LAPSE_AURA, true, 0, 0, me->GetGUID()); - - //Using packet workaround - WorldPacket data(12); - data.SetOpcode(SMSG_MOVE_SET_CAN_FLY); - data.append(pUnit->GetPackGUID()); - data << uint32(0); - pUnit->SendMessageToSet(&data, true); - } - } - GravityLapse_Timer = 10000; - ++GravityLapse_Phase; - break; - - case 2: - //Cast nether vapor aura on self - me->InterruptNonMeleeSpells(false); - DoCast(me, SPELL_NETHER_VAPOR); - - GravityLapse_Timer = 20000; - ++GravityLapse_Phase; - break; - - case 3: - //Remove flight - for (i = me->getThreatManager().getThreatList().begin(); i!= me->getThreatManager().getThreatList().end(); ++i) - { - if (Unit* pUnit = Unit::GetUnit((*me), (*i)->getUnitGuid())) - { - //Using packet workaround - WorldPacket data(12); - data.SetOpcode(SMSG_MOVE_UNSET_CAN_FLY); - data.append(pUnit->GetPackGUID()); - data << uint32(0); - pUnit->SendMessageToSet(&data, true); - } - } - - me->RemoveAurasDueToSpell(SPELL_NETHER_VAPOR); - InGravityLapse = false; - GravityLapse_Timer = 60000; - GravityLapse_Phase = 0; - AttackStart(me->getVictim()); - break; - } - } else GravityLapse_Timer -= diff; - - if (InGravityLapse) - { - //ShockBarrier_Timer - if (ShockBarrier_Timer <= diff) - { - DoCast(me, SPELL_SHOCK_BARRIER); - ShockBarrier_Timer = 20000; - } else ShockBarrier_Timer -= diff; - - //NetherBeam_Timer - if (NetherBeam_Timer <= diff) - { - if (Unit* pUnit = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pUnit, SPELL_NETHER_BEAM); - - NetherBeam_Timer = 4000; - } else NetherBeam_Timer -= diff; - } - } - - if (!InGravityLapse) - DoMeleeAttackIfReady(); - } - } - } -}; - -//Thaladred the Darkener AI -struct boss_thaladred_the_darkenerAI : public advisorbase_ai -{ - boss_thaladred_the_darkenerAI(Creature* pCreature) : advisorbase_ai(pCreature) {} - - uint32 Gaze_Timer; - uint32 Silence_Timer; - uint32 PsychicBlow_Timer; - - void Reset() - { - Gaze_Timer = 100; - Silence_Timer = 20000; - PsychicBlow_Timer = 10000; - - advisorbase_ai::Reset(); - } - - void Aggro(Unit *who) - { - if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) - return; - - if (!who || FakeDeath) - return; - - DoScriptText(SAY_THALADRED_AGGRO, me); - me->AddThreat(who, 5000000.0f); - } - - void JustDied(Unit* /*pKiller*/) - { - if (m_pInstance && m_pInstance->GetData(DATA_KAELTHASEVENT) == 3) - DoScriptText(SAY_THALADRED_DEATH, me); - } - - void UpdateAI(const uint32 diff) - { - advisorbase_ai::UpdateAI(diff); - - //Faking death, don't do anything - if (FakeDeath) - return; - - //Return since we have no target - if (!UpdateVictim()) - return; - - //Gaze_Timer - if (Gaze_Timer <= diff) - { - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - { - DoResetThreat(); - me->AddThreat(pTarget, 5000000.0f); - DoScriptText(EMOTE_THALADRED_GAZE, me, pTarget); - Gaze_Timer = 8500; - } - } else Gaze_Timer -= diff; - - //Silence_Timer - if (Silence_Timer <= diff) - { - DoCast(me->getVictim(), SPELL_SILENCE); - Silence_Timer = 20000; - } else Silence_Timer -= diff; - - //PsychicBlow_Timer - if (PsychicBlow_Timer <= diff) - { - DoCast(me->getVictim(), SPELL_PSYCHIC_BLOW); - PsychicBlow_Timer = 20000+rand()%5000; - } else PsychicBlow_Timer -= diff; - - DoMeleeAttackIfReady(); - } -}; - -//Lord Sanguinar AI -struct boss_lord_sanguinarAI : public advisorbase_ai -{ - boss_lord_sanguinarAI(Creature* pCreature) : advisorbase_ai(pCreature) {} - - uint32 Fear_Timer; - - void Reset() - { - Fear_Timer = 20000; - advisorbase_ai::Reset(); - } - - void Aggro(Unit *who) - { - if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) - return; - - if (!who || FakeDeath) - return; - - DoScriptText(SAY_SANGUINAR_AGGRO, me); - } - - void JustDied(Unit* /*Killer*/) - { - if (m_pInstance && m_pInstance->GetData(DATA_KAELTHASEVENT) == 3) - DoScriptText(SAY_SANGUINAR_DEATH, me); - } - - void UpdateAI(const uint32 diff) - { - advisorbase_ai::UpdateAI(diff); - - //Faking death, don't do anything - if (FakeDeath) - return; - - //Return since we have no target - if (!UpdateVictim()) - return; - - //Fear_Timer - if (Fear_Timer <= diff) - { - DoCast(me->getVictim(), SPELL_BELLOWING_ROAR); - Fear_Timer = 25000+rand()%10000; //approximately every 30 seconds - } else Fear_Timer -= diff; - - DoMeleeAttackIfReady(); - } -}; - -//Grand Astromancer Capernian AI -struct boss_grand_astromancer_capernianAI : public advisorbase_ai -{ - boss_grand_astromancer_capernianAI(Creature* pCreature) : advisorbase_ai(pCreature) {} - - uint32 Fireball_Timer; - uint32 Conflagration_Timer; - uint32 ArcaneExplosion_Timer; - uint32 Yell_Timer; - bool Yell; - - void Reset() - { - Fireball_Timer = 2000; - Conflagration_Timer = 20000; - ArcaneExplosion_Timer = 5000; - Yell_Timer = 2000; - Yell = false; - - advisorbase_ai::Reset(); - } - - void JustDied(Unit* /*pKiller*/) - { - if (m_pInstance && m_pInstance->GetData(DATA_KAELTHASEVENT) == 3) - DoScriptText(SAY_CAPERNIAN_DEATH, me); - } - - void AttackStart(Unit* who) - { - if (!who || FakeDeath || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) - return; - - if (me->Attack(who, true)) - { - me->AddThreat(who, 0.0f); - me->SetInCombatWith(who); - who->SetInCombatWith(me); - - me->GetMotionMaster()->MoveChase(who, CAPERNIAN_DISTANCE); - } - } - - void Aggro(Unit *who) - { - if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) - return; - - if (!who || FakeDeath) - return; - } - - void UpdateAI(const uint32 diff) - { - advisorbase_ai::UpdateAI(diff); - - //Faking Death, don't do anything - if (FakeDeath) - return; - - //Return since we have no target - if (!UpdateVictim()) - return; - - //Yell_Timer - if (!Yell) - { - if (Yell_Timer <= diff) - { - DoScriptText(SAY_CAPERNIAN_AGGRO, me); - Yell = true; - } else Yell_Timer -= diff; - } - - //Fireball_Timer - if (Fireball_Timer <= diff) - { - DoCast(me->getVictim(), SPELL_CAPERNIAN_FIREBALL); - Fireball_Timer = 4000; - } else Fireball_Timer -= diff; - - //Conflagration_Timer - if (Conflagration_Timer <= diff) - { - Unit *pTarget = NULL; - pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); - - if (pTarget && me->IsWithinDistInMap(pTarget, 30)) - DoCast(pTarget, SPELL_CONFLAGRATION); - else - DoCast(me->getVictim(), SPELL_CONFLAGRATION); - - Conflagration_Timer = 10000+rand()%5000; - } else Conflagration_Timer -= diff; - - //ArcaneExplosion_Timer - if (ArcaneExplosion_Timer <= diff) - { - bool InMeleeRange = false; - Unit *pTarget = NULL; - std::list& m_threatlist = me->getThreatManager().getThreatList(); - for (std::list::const_iterator i = m_threatlist.begin(); i!= m_threatlist.end(); ++i) - { - Unit* pUnit = Unit::GetUnit((*me), (*i)->getUnitGuid()); - //if in melee range - if (pUnit && pUnit->IsWithinDistInMap(me, 5)) - { - InMeleeRange = true; - pTarget = pUnit; - break; - } - } - - if (InMeleeRange) - DoCast(pTarget, SPELL_ARCANE_EXPLOSION); - - ArcaneExplosion_Timer = 4000+rand()%2000; - } else ArcaneExplosion_Timer -= diff; - - //Do NOT deal any melee damage. - } -}; - -//Master Engineer Telonicus AI -struct boss_master_engineer_telonicusAI : public advisorbase_ai -{ - boss_master_engineer_telonicusAI(Creature* pCreature) : advisorbase_ai(pCreature) {} - - uint32 Bomb_Timer; - uint32 RemoteToy_Timer; - - void Reset() - { - Bomb_Timer = 10000; - RemoteToy_Timer = 5000; - - advisorbase_ai::Reset(); - } - - void JustDied(Unit* /*pKiller*/) - { - if (m_pInstance && m_pInstance->GetData(DATA_KAELTHASEVENT) == 3) - DoScriptText(SAY_TELONICUS_DEATH, me); - } - - void Aggro(Unit *who) - { - if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) - return; - - if (!who || FakeDeath) - return; - - DoScriptText(SAY_TELONICUS_AGGRO, me); - } - - void UpdateAI(const uint32 diff) - { - advisorbase_ai::UpdateAI(diff); - - //Faking Death, do nothing - if (FakeDeath) - return; - - //Return since we have no target - if (!UpdateVictim()) - return; - - //Bomb_Timer - if (Bomb_Timer <= diff) - { - DoCast(me->getVictim(), SPELL_BOMB); - Bomb_Timer = 25000; - } else Bomb_Timer -= diff; - - //RemoteToy_Timer - if (RemoteToy_Timer <= diff) - { - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, SPELL_REMOTE_TOY); - - RemoteToy_Timer = 10000+rand()%5000; - } else RemoteToy_Timer -= diff; - - DoMeleeAttackIfReady(); - } -}; - -//Flame Strike AI -struct mob_kael_flamestrikeAI : public Scripted_NoMovementAI -{ - mob_kael_flamestrikeAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature) {} - - uint32 Timer; - bool Casting; - bool KillSelf; - - void Reset() - { - Timer = 5000; - Casting = false; - KillSelf = false; - - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - me->setFaction(14); - } - - void MoveInLineOfSight(Unit * /*who*/) {} - - void EnterCombat(Unit * /*who*/) {} - - void UpdateAI(const uint32 diff) - { - if (!Casting) - { - DoCast(me, SPELL_FLAME_STRIKE_VIS); - Casting = true; - } - - //Timer - if (Timer <= diff) - { - if (!KillSelf) - { - me->InterruptNonMeleeSpells(false); - DoCast(me, SPELL_FLAME_STRIKE_DMG); - } else me->Kill(me); - - KillSelf = true; - Timer = 1000; - } else Timer -= diff; - } -}; - -//Phoenix AI -struct mob_phoenix_tkAI : public ScriptedAI -{ - mob_phoenix_tkAI(Creature* pCreature) : ScriptedAI(pCreature) {} - - uint32 Cycle_Timer; - - void Reset() - { - Cycle_Timer = 2000; - DoCast(me, SPELL_BURN, true); - } - - void JustDied(Unit* /*killer*/) - { - //is this spell in use anylonger? - //DoCast(me, SPELL_EMBER_BLAST, true); - me->SummonCreature(NPC_PHOENIX_EGG,me->GetPositionX(),me->GetPositionY(),me->GetPositionZ(),me->GetOrientation(),TEMPSUMMON_TIMED_DESPAWN,16000); - } - - void UpdateAI(const uint32 diff) - { - if (!UpdateVictim()) - return; - - if (Cycle_Timer <= diff) - { - //spell Burn should possible do this, but it doesn't, so do this for now. - uint32 dmg = urand(4500,5500); - if (me->GetHealth() > dmg) - me->SetHealth(uint32(me->GetHealth()-dmg)); - Cycle_Timer = 2000; - } else Cycle_Timer -= diff; - - DoMeleeAttackIfReady(); - } -}; - -//Phoenix Egg AI -struct mob_phoenix_egg_tkAI : public ScriptedAI -{ - mob_phoenix_egg_tkAI(Creature* pCreature) : ScriptedAI(pCreature) {} - - uint32 Rebirth_Timer; - - void Reset() - { - Rebirth_Timer = 15000; - } - - //ignore any - void MoveInLineOfSight(Unit* /*who*/) {} - - void AttackStart(Unit* who) - { - if (me->Attack(who, false)) - { - me->SetInCombatWith(who); - who->SetInCombatWith(me); - - DoStartNoMovement(who); - } - } - - void JustSummoned(Creature* summoned) - { - summoned->AddThreat(me->getVictim(), 0.0f); - summoned->CastSpell(summoned,SPELL_REBIRTH,false); - } - - void UpdateAI(const uint32 diff) - { - if (!Rebirth_Timer) - return; - - if (Rebirth_Timer <= diff) - { - me->SummonCreature(NPC_PHOENIX,me->GetPositionX(),me->GetPositionY(),me->GetPositionZ(),me->GetOrientation(),TEMPSUMMON_CORPSE_DESPAWN,5000); - Rebirth_Timer = 0; - } else Rebirth_Timer -= diff; - } -}; - -CreatureAI* GetAI_boss_kaelthas(Creature* pCreature) -{ - return new boss_kaelthasAI(pCreature); -} - -CreatureAI* GetAI_boss_thaladred_the_darkener(Creature* pCreature) -{ - return new boss_thaladred_the_darkenerAI(pCreature); -} - -CreatureAI* GetAI_boss_lord_sanguinar(Creature* pCreature) -{ - return new boss_lord_sanguinarAI(pCreature); -} - -CreatureAI* GetAI_boss_grand_astromancer_capernian(Creature* pCreature) -{ - return new boss_grand_astromancer_capernianAI(pCreature); -} - -CreatureAI* GetAI_boss_master_engineer_telonicus(Creature* pCreature) -{ - return new boss_master_engineer_telonicusAI(pCreature); -} - -CreatureAI* GetAI_mob_kael_flamestrike(Creature* pCreature) -{ - return new mob_kael_flamestrikeAI(pCreature); -} - -CreatureAI* GetAI_mob_phoenix_tk(Creature* pCreature) -{ - return new mob_phoenix_tkAI(pCreature); -} - -CreatureAI* GetAI_mob_phoenix_egg_tk(Creature* pCreature) -{ - return new mob_phoenix_egg_tkAI(pCreature); -} - -void AddSC_boss_kaelthas() -{ - Script *newscript; - newscript = new Script; - newscript->Name = "boss_kaelthas"; - newscript->GetAI = &GetAI_boss_kaelthas; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "boss_thaladred_the_darkener"; - newscript->GetAI = &GetAI_boss_thaladred_the_darkener; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "boss_lord_sanguinar"; - newscript->GetAI = &GetAI_boss_lord_sanguinar; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "boss_grand_astromancer_capernian"; - newscript->GetAI = &GetAI_boss_grand_astromancer_capernian; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "boss_master_engineer_telonicus"; - newscript->GetAI = &GetAI_boss_master_engineer_telonicus; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_kael_flamestrike"; - newscript->GetAI = &GetAI_mob_kael_flamestrike; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_phoenix_tk"; - newscript->GetAI = &GetAI_mob_phoenix_tk; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_phoenix_egg_tk"; - newscript->GetAI = &GetAI_mob_phoenix_egg_tk; - newscript->RegisterSelf(); -} diff --git a/src/server/scripts/Outland/TempestKeep/the_eye/boss_void_reaver.cpp b/src/server/scripts/Outland/TempestKeep/the_eye/boss_void_reaver.cpp deleted file mode 100644 index e1b60b20948..00000000000 --- a/src/server/scripts/Outland/TempestKeep/the_eye/boss_void_reaver.cpp +++ /dev/null @@ -1,179 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: Boss_Void_Reaver -SD%Complete: 90 -SDComment: Should reset if raid are out of room. -SDCategory: Tempest Keep, The Eye -EndScriptData */ - -#include "ScriptedPch.h" -#include "the_eye.h" - -enum eEnums -{ - SAY_AGGRO = -1550000, - SAY_SLAY1 = -1550001, - SAY_SLAY2 = -1550002, - SAY_SLAY3 = -1550003, - SAY_DEATH = -1550004, - SAY_POUNDING1 = -1550005, - SAY_POUNDING2 = -1550006, - - SPELL_POUNDING = 34162, - SPELL_ARCANE_ORB = 34172, - SPELL_KNOCK_AWAY = 25778, - SPELL_BERSERK = 27680 -}; - -struct boss_void_reaverAI : public ScriptedAI -{ - boss_void_reaverAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - } - - ScriptedInstance* pInstance; - - uint32 Pounding_Timer; - uint32 ArcaneOrb_Timer; - uint32 KnockAway_Timer; - uint32 Berserk_Timer; - - bool Enraged; - - void Reset() - { - Pounding_Timer = 15000; - ArcaneOrb_Timer = 3000; - KnockAway_Timer = 30000; - Berserk_Timer = 600000; - - Enraged = false; - - if (pInstance && me->isAlive()) - pInstance->SetData(DATA_VOIDREAVEREVENT, NOT_STARTED); - } - - void KilledUnit(Unit * /*victim*/) - { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2,SAY_SLAY3), me); - } - - void JustDied(Unit * /*victim*/) - { - DoScriptText(SAY_DEATH, me); - DoZoneInCombat(); - - if (pInstance) - pInstance->SetData(DATA_VOIDREAVEREVENT, DONE); - } - - void EnterCombat(Unit * /*who*/) - { - DoScriptText(SAY_AGGRO, me); - - if (pInstance) - pInstance->SetData(DATA_VOIDREAVEREVENT, IN_PROGRESS); - } - - void UpdateAI(const uint32 diff) - { - if (!UpdateVictim()) - return; - - // Pounding - if (Pounding_Timer <= diff) - { - DoCast(me->getVictim(), SPELL_POUNDING); - - DoScriptText(RAND(SAY_POUNDING1,SAY_POUNDING2), me); - Pounding_Timer = 15000; //cast time(3000) + cooldown time(12000) - } else Pounding_Timer -= diff; - - // Arcane Orb - if (ArcaneOrb_Timer <= diff) - { - Unit *pTarget = NULL; - std::list t_list = me->getThreatManager().getThreatList(); - std::vector target_list; - for (std::list::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) - { - pTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid()); - if (!pTarget) - continue; - - // exclude pets & totems - if (pTarget->GetTypeId() != TYPEID_PLAYER) - continue; - - //18 yard radius minimum - if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER && pTarget->isAlive() && !pTarget->IsWithinDist(me, 18, false)) - target_list.push_back(pTarget); - pTarget = NULL; - } - - if (target_list.size()) - pTarget = *(target_list.begin()+rand()%target_list.size()); - else - pTarget = me->getVictim(); - - if (pTarget) - me->CastSpell(pTarget->GetPositionX(),pTarget->GetPositionY(),pTarget->GetPositionZ(), SPELL_ARCANE_ORB, false, NULL, NULL, NULL, pTarget); - - ArcaneOrb_Timer = 3000; - } else ArcaneOrb_Timer -= diff; - - // Single Target knock back, reduces aggro - if (KnockAway_Timer <= diff) - { - DoCast(me->getVictim(), SPELL_KNOCK_AWAY); - - //Drop 25% aggro - if (DoGetThreat(me->getVictim())) - DoModifyThreatPercent(me->getVictim(),-25); - - KnockAway_Timer = 30000; - } else KnockAway_Timer -= diff; - - //Berserk - if (Berserk_Timer < diff && !Enraged) - { - DoCast(me, SPELL_BERSERK); - Enraged = true; - } else Berserk_Timer -= diff; - - DoMeleeAttackIfReady(); - - EnterEvadeIfOutOfCombatArea(diff); - } -}; - -CreatureAI* GetAI_boss_void_reaver(Creature* pCreature) -{ - return new boss_void_reaverAI (pCreature); -} - -void AddSC_boss_void_reaver() -{ - Script *newscript; - newscript = new Script; - newscript->Name = "boss_void_reaver"; - newscript->GetAI = &GetAI_boss_void_reaver; - newscript->RegisterSelf(); -} - diff --git a/src/server/scripts/Outland/TempestKeep/the_eye/instance_the_eye.cpp b/src/server/scripts/Outland/TempestKeep/the_eye/instance_the_eye.cpp deleted file mode 100644 index 59c72071238..00000000000 --- a/src/server/scripts/Outland/TempestKeep/the_eye/instance_the_eye.cpp +++ /dev/null @@ -1,176 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: Instance_The_Eye -SD%Complete: 100 -SDComment: -SDCategory: Tempest Keep, The Eye -EndScriptData */ - -#include "ScriptedPch.h" -#include "the_eye.h" - -#define MAX_ENCOUNTER 5 - -/* The Eye encounters: -0 - Kael'thas event -1 - Al' ar event -2 - Solarian Event -3 - Void Reaver event -*/ - -struct instance_the_eye : public ScriptedInstance -{ - instance_the_eye(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; - - uint64 ThaladredTheDarkener; - uint64 LordSanguinar; - uint64 GrandAstromancerCapernian; - uint64 MasterEngineerTelonicus; - uint64 Kaelthas; - uint64 Astromancer; - uint64 Alar; - - uint8 KaelthasEventPhase; - uint8 AlarEventPhase; - - uint32 m_auiEncounter[MAX_ENCOUNTER]; - - void Initialize() - { - memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); - - ThaladredTheDarkener = 0; - LordSanguinar = 0; - GrandAstromancerCapernian = 0; - MasterEngineerTelonicus = 0; - Kaelthas = 0; - Astromancer = 0; - Alar = 0; - - KaelthasEventPhase = 0; - AlarEventPhase = 0; - } - - bool IsEncounterInProgress() const - { - for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) - if (m_auiEncounter[i] == IN_PROGRESS) return true; - - return false; - } - - void OnCreatureCreate(Creature* pCreature, bool /*add*/) - { - switch(pCreature->GetEntry()) - { - case 20064: ThaladredTheDarkener = pCreature->GetGUID(); break; - case 20063: MasterEngineerTelonicus = pCreature->GetGUID(); break; - case 20062: GrandAstromancerCapernian = pCreature->GetGUID(); break; - case 20060: LordSanguinar = pCreature->GetGUID(); break; - case 19622: Kaelthas = pCreature->GetGUID(); break; - case 18805: Astromancer = pCreature->GetGUID(); break; - case 19514: Alar = pCreature->GetGUID(); break; - } - } - - uint64 GetData64(uint32 identifier) - { - switch(identifier) - { - case DATA_THALADREDTHEDARKENER: return ThaladredTheDarkener; - case DATA_LORDSANGUINAR: return LordSanguinar; - case DATA_GRANDASTROMANCERCAPERNIAN: return GrandAstromancerCapernian; - case DATA_MASTERENGINEERTELONICUS: return MasterEngineerTelonicus; - case DATA_KAELTHAS: return Kaelthas; - case DATA_ASTROMANCER: return Astromancer; - case DATA_ALAR: return Alar; - } - return 0; - } - - void SetData(uint32 type, uint32 data) - { - switch(type) - { - case DATA_ALAREVENT: AlarEventPhase = data; m_auiEncounter[0] = data; break; - case DATA_HIGHASTROMANCERSOLARIANEVENT: m_auiEncounter[1] = data; break; - case DATA_VOIDREAVEREVENT: m_auiEncounter[2] = data; break; - case DATA_KAELTHASEVENT: KaelthasEventPhase = data; m_auiEncounter[3] = data; break; - } - if (data == DONE) - SaveToDB(); - } - - uint32 GetData(uint32 type) - { - switch(type) - { - case DATA_ALAREVENT: return AlarEventPhase; - case DATA_HIGHASTROMANCERSOLARIANEVENT: return m_auiEncounter[1]; - case DATA_VOIDREAVEREVENT: return m_auiEncounter[2]; - case DATA_KAELTHASEVENT: return KaelthasEventPhase; - } - return 0; - } - - std::string GetSaveData() - { - OUT_SAVE_INST_DATA; - std::ostringstream stream; - stream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " " << m_auiEncounter[3]; - char* out = new char[stream.str().length() + 1]; - strcpy(out, stream.str().c_str()); - if (out) - { - OUT_SAVE_INST_DATA_COMPLETE; - return out; - } - return NULL; - } - - void Load(const char* in) - { - if (!in) - { - OUT_LOAD_INST_DATA_FAIL; - return; - } - OUT_LOAD_INST_DATA(in); - std::istringstream stream(in); - stream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3]; - for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) - if (m_auiEncounter[i] == IN_PROGRESS) // Do not load an encounter as "In Progress" - reset it instead. - m_auiEncounter[i] = NOT_STARTED; - OUT_LOAD_INST_DATA_COMPLETE; - } -}; - -InstanceData* GetInstanceData_instance_the_eye(Map* pMap) -{ - return new instance_the_eye(pMap); -} - -void AddSC_instance_the_eye() -{ - Script *newscript; - newscript = new Script; - newscript->Name = "instance_the_eye"; - newscript->GetInstanceData = &GetInstanceData_instance_the_eye; - newscript->RegisterSelf(); -} - diff --git a/src/server/scripts/Outland/TempestKeep/the_eye/the_eye.cpp b/src/server/scripts/Outland/TempestKeep/the_eye/the_eye.cpp deleted file mode 100644 index 97021fdc031..00000000000 --- a/src/server/scripts/Outland/TempestKeep/the_eye/the_eye.cpp +++ /dev/null @@ -1,98 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: The_Eye -SD%Complete: 100 -SDComment: -SDCategory: Tempest Keep, The Eye -EndScriptData */ - -/* ContentData -mob_crystalcore_devastator -EndContentData */ - -#include "ScriptedPch.h" -#include "the_eye.h" - -#define SPELL_COUNTERCHARGE 35035 -#define SPELL_KNOCKAWAY 22893 - -struct mob_crystalcore_devastatorAI : public ScriptedAI -{ - mob_crystalcore_devastatorAI(Creature *c) : ScriptedAI(c) {} - - uint32 Knockaway_Timer; - uint32 Countercharge_Timer; - - void Reset() - { - Countercharge_Timer = 9000; - Knockaway_Timer = 25000; - } - - void EnterCombat(Unit * /*who*/) - { - } - - void UpdateAI(const uint32 diff) - { - if (!UpdateVictim()) - return; - - //Check if we have a current target - //Knockaway_Timer - if (Knockaway_Timer <= diff) - { - DoCast(me->getVictim(), SPELL_KNOCKAWAY, true); - - // current aggro target is knocked away pick new target - Unit* pTarget = SelectUnit(SELECT_TARGET_TOPAGGRO, 0); - - if (!pTarget || pTarget == me->getVictim()) - pTarget = SelectUnit(SELECT_TARGET_TOPAGGRO, 1); - - if (pTarget) - me->TauntApply(pTarget); - - Knockaway_Timer = 23000; - } else Knockaway_Timer -= diff; - - //Countercharge_Timer - if (Countercharge_Timer <= diff) - { - DoCast(me, SPELL_COUNTERCHARGE); - Countercharge_Timer = 45000; - } else Countercharge_Timer -= diff; - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_mob_crystalcore_devastator(Creature* pCreature) -{ - return new mob_crystalcore_devastatorAI (pCreature); -} - -void AddSC_the_eye() -{ - Script *newscript; - newscript = new Script; - newscript->Name = "mob_crystalcore_devastator"; - newscript->GetAI = &GetAI_mob_crystalcore_devastator; - newscript->RegisterSelf(); -} - diff --git a/src/server/scripts/Outland/TempestKeep/the_eye/the_eye.h b/src/server/scripts/Outland/TempestKeep/the_eye/the_eye.h deleted file mode 100644 index d0d3ea09061..00000000000 --- a/src/server/scripts/Outland/TempestKeep/the_eye/the_eye.h +++ /dev/null @@ -1,20 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software licensed under GPL version 2 - * Please see the included DOCS/LICENSE.TXT for more information */ - -#ifndef DEF_THE_EYE_H -#define DEF_THE_EYE_H - -#define DATA_ALAREVENT 1 -#define DATA_ASTROMANCER 2 -#define DATA_GRANDASTROMANCERCAPERNIAN 3 -#define DATA_HIGHASTROMANCERSOLARIANEVENT 4 -#define DATA_KAELTHAS 5 -#define DATA_KAELTHASEVENT 6 -#define DATA_LORDSANGUINAR 7 -#define DATA_MASTERENGINEERTELONICUS 8 -#define DATA_THALADREDTHEDARKENER 10 -#define DATA_VOIDREAVEREVENT 11 -#define DATA_ALAR 12 -#endif - diff --git a/src/server/scripts/Outland/TempestKeep/the_mechanar/boss_gatewatcher_gyrokill.cpp b/src/server/scripts/Outland/TempestKeep/the_mechanar/boss_gatewatcher_gyrokill.cpp deleted file mode 100644 index b9c365eda65..00000000000 --- a/src/server/scripts/Outland/TempestKeep/the_mechanar/boss_gatewatcher_gyrokill.cpp +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: Boss_Gatewatcher_Gyrokill -SD%Complete: 0 -SDComment: Place Holder -SDCategory: Tempest Keep, The Mechanar -EndScriptData */ - -#include "ScriptedPch.h" - -//not used -#define SAY_AGGRO -1554000 -#define SAY_SAW_ATTACK1 -1554001 -#define SAY_SAW_ATTACK2 -1554002 -#define SAY_SLAY1 -1554003 -#define SAY_SLAY2 -1554004 -#define SAY_DEATH -1554005 - -#define SPELL_STREAM_OF_MACHINE_FLUID 35311 -#define SPELL_SAW_BLADE 35318 -#define H_SPELL_SAW_BLADE 39192 -#define SPELL_SHADOW_POWER 35322 -#define H_SPELL_SHADOW_POWER 39193 - diff --git a/src/server/scripts/Outland/TempestKeep/the_mechanar/boss_gatewatcher_ironhand.cpp b/src/server/scripts/Outland/TempestKeep/the_mechanar/boss_gatewatcher_ironhand.cpp deleted file mode 100644 index 50c3a6171ce..00000000000 --- a/src/server/scripts/Outland/TempestKeep/the_mechanar/boss_gatewatcher_ironhand.cpp +++ /dev/null @@ -1,130 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ - -/* ScriptData -SDName: Boss_Gatewatcher_Ironhand -SD%Complete: 75 -SDComment: -SDCategory: Tempest Keep, The Mechanar -EndScriptData */ - -#include "ScriptedPch.h" - -#define SAY_AGGRO_1 -1554006 -#define SAY_HAMMER_1 -1554007 -#define SAY_HAMMER_2 -1554008 -#define SAY_SLAY_1 -1554009 -#define SAY_SLAY_2 -1554010 -#define SAY_DEATH_1 -1554011 -#define EMOTE_HAMMER -1554012 - -// Spells to be casted -#define SPELL_SHADOW_POWER 35322 -#define H_SPELL_SHADOW_POWER 39193 -#define SPELL_HAMMER_PUNCH 35326 -#define SPELL_JACKHAMMER 35327 -#define H_SPELL_JACKHAMMER 39194 -#define SPELL_STREAM_OF_MACHINE_FLUID 35311 - -// Gatewatcher Iron-Hand AI -struct boss_gatewatcher_iron_handAI : public ScriptedAI -{ - boss_gatewatcher_iron_handAI(Creature *c) : ScriptedAI(c) - { - } - - uint32 Shadow_Power_Timer; - uint32 Jackhammer_Timer; - uint32 Stream_of_Machine_Fluid_Timer; - - void Reset() - { - Shadow_Power_Timer = 25000; - Jackhammer_Timer = 45000; - Stream_of_Machine_Fluid_Timer = 55000; - - } - void EnterCombat(Unit * /*who*/) - { - DoScriptText(SAY_AGGRO_1, me); - } - - void KilledUnit(Unit* /*victim*/) - { - if (rand()%2) - return; - - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); - } - - void JustDied(Unit* /*Killer*/) - { - DoScriptText(SAY_DEATH_1, me); - //TODO: Add door check/open code - } - - void UpdateAI(const uint32 diff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - //Shadow Power - if (Shadow_Power_Timer <= diff) - { - DoCast(me, SPELL_SHADOW_POWER); - Shadow_Power_Timer = 20000 + rand()%8000; - } else Shadow_Power_Timer -= diff; - - //Jack Hammer - if (Jackhammer_Timer <= diff) - { - //TODO: expect cast this about 5 times in a row (?), announce it by emote only once - DoScriptText(EMOTE_HAMMER, me); - DoCast(me->getVictim(), SPELL_JACKHAMMER); - - //chance to yell, but not same time as emote (after spell in fact casted) - if (rand()%2) - return; - - DoScriptText(RAND(SAY_HAMMER_1,SAY_HAMMER_2), me); - Jackhammer_Timer = 30000; - } else Jackhammer_Timer -= diff; - - //Stream of Machine Fluid - if (Stream_of_Machine_Fluid_Timer <= diff) - { - DoCast(me->getVictim(), SPELL_STREAM_OF_MACHINE_FLUID); - Stream_of_Machine_Fluid_Timer = 35000 + rand()%15000; - } else Stream_of_Machine_Fluid_Timer -= diff; - - DoMeleeAttackIfReady(); - } -}; -CreatureAI* GetAI_boss_gatewatcher_iron_hand(Creature* pCreature) -{ - return new boss_gatewatcher_iron_handAI (pCreature); -} - -void AddSC_boss_gatewatcher_iron_hand() -{ - Script *newscript; - newscript = new Script; - newscript->Name = "boss_gatewatcher_iron_hand"; - newscript->GetAI = &GetAI_boss_gatewatcher_iron_hand; - newscript->RegisterSelf(); -} - diff --git a/src/server/scripts/Outland/TempestKeep/the_mechanar/boss_nethermancer_sepethrea.cpp b/src/server/scripts/Outland/TempestKeep/the_mechanar/boss_nethermancer_sepethrea.cpp deleted file mode 100644 index ededec0196d..00000000000 --- a/src/server/scripts/Outland/TempestKeep/the_mechanar/boss_nethermancer_sepethrea.cpp +++ /dev/null @@ -1,245 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ - -/* ScriptData -SDName: Boss_Nethermancer_Sepethrea -SD%Complete: 90 -SDComment: Need adjustments to initial summons -SDCategory: Tempest Keep, The Mechanar -EndScriptData */ - -#include "ScriptedPch.h" -#include "mechanar.h" - -#define SAY_AGGRO -1554013 -#define SAY_SUMMON -1554014 -#define SAY_DRAGONS_BREATH_1 -1554015 -#define SAY_DRAGONS_BREATH_2 -1554016 -#define SAY_SLAY1 -1554017 -#define SAY_SLAY2 -1554018 -#define SAY_DEATH -1554019 - -#define SPELL_SUMMON_RAGIN_FLAMES 35275 -#define H_SPELL_SUMMON_RAGIN_FLAMES 39084 - -#define SPELL_FROST_ATTACK 35263 -#define SPELL_ARCANE_BLAST 35314 -#define SPELL_DRAGONS_BREATH 35250 -#define SPELL_KNOCKBACK 37317 -#define SPELL_SOLARBURN 35267 - -struct boss_nethermancer_sepethreaAI : public ScriptedAI -{ - boss_nethermancer_sepethreaAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - } - - ScriptedInstance *pInstance; - - uint32 frost_attack_Timer; - uint32 arcane_blast_Timer; - uint32 dragons_breath_Timer; - uint32 knockback_Timer; - uint32 solarburn_Timer; - - void Reset() - { - frost_attack_Timer = 7000 + rand()%3000; - arcane_blast_Timer = 12000 + rand()%6000; - dragons_breath_Timer = 18000 + rand()%4000; - knockback_Timer = 22000 + rand()%6000; - solarburn_Timer = 30000; - - if (pInstance) - pInstance->SetData(DATA_NETHERMANCER_EVENT, NOT_STARTED); - } - - void EnterCombat(Unit* who) - { - if (pInstance) - pInstance->SetData(DATA_NETHERMANCER_EVENT, IN_PROGRESS); - - DoScriptText(SAY_AGGRO, me); - DoCast(who, SPELL_SUMMON_RAGIN_FLAMES); - DoScriptText(SAY_SUMMON, me); - } - - void KilledUnit(Unit* /*victim*/) - { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); - } - - void JustDied(Unit* /*Killer*/) - { - DoScriptText(SAY_DEATH, me); - - if (pInstance) - pInstance->SetData(DATA_NETHERMANCER_EVENT, DONE); - } - - void UpdateAI(const uint32 diff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - //Frost Attack - if (frost_attack_Timer <= diff) - { - DoCast(me->getVictim(), SPELL_FROST_ATTACK); - frost_attack_Timer = 7000 + rand()%3000; - } else frost_attack_Timer -= diff; - - //Arcane Blast - if (arcane_blast_Timer <= diff) - { - DoCast(me->getVictim(), SPELL_ARCANE_BLAST); - arcane_blast_Timer = 15000; - } else arcane_blast_Timer -= diff; - - //Dragons Breath - if (dragons_breath_Timer <= diff) - { - DoCast(me->getVictim(), SPELL_DRAGONS_BREATH); - { - if (rand()%2) - return; - - DoScriptText(RAND(SAY_DRAGONS_BREATH_1,SAY_DRAGONS_BREATH_2), me); - } - dragons_breath_Timer = 12000 + rand()%10000; - } else dragons_breath_Timer -= diff; - - //Knockback - if (knockback_Timer <= diff) - { - DoCast(me->getVictim(), SPELL_KNOCKBACK); - knockback_Timer = 15000 + rand()%10000; - } else knockback_Timer -= diff; - - //Solarburn - if (solarburn_Timer <= diff) - { - DoCast(me->getVictim(), SPELL_SOLARBURN); - solarburn_Timer = 30000; - } else solarburn_Timer -= diff; - - DoMeleeAttackIfReady(); - } -}; - -CreatureAI* GetAI_boss_nethermancer_sepethrea(Creature* pCreature) -{ - return new boss_nethermancer_sepethreaAI (pCreature); -} - -#define SPELL_INFERNO 35268 -#define H_SPELL_INFERNO 39346 -#define SPELL_FIRE_TAIL 35278 - -struct mob_ragin_flamesAI : public ScriptedAI -{ - mob_ragin_flamesAI(Creature *c) : ScriptedAI(c) - { - pInstance = c->GetInstanceData(); - } - - ScriptedInstance *pInstance; - - uint32 inferno_Timer; - uint32 flame_timer; - uint32 Check_Timer; - - bool onlyonce; - - void Reset() - { - inferno_Timer = 10000; - flame_timer = 500; - Check_Timer = 2000; - onlyonce = false; - me->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_MAGIC, true); - me->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, true); - me->SetSpeed(MOVE_RUN, DUNGEON_MODE(0.5f, 0.7f)); - } - - void EnterCombat(Unit* /*who*/) - { - } - - void UpdateAI(const uint32 diff) - { - //Check_Timer - if (Check_Timer <= diff) - { - if (pInstance) - { - if (pInstance->GetData(DATA_NETHERMANCER_EVENT) != IN_PROGRESS) - { - //remove - me->setDeathState(JUST_DIED); - me->RemoveCorpse(); - } - } - Check_Timer = 1000; - } else Check_Timer -= diff; - - if (!UpdateVictim()) - return; - - if (!onlyonce) - { - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - me->GetMotionMaster()->MoveChase(pTarget); - onlyonce = true; - } - - if (inferno_Timer <= diff) - { - DoCast(me->getVictim(), SPELL_INFERNO); - me->TauntApply(me->getVictim()); - inferno_Timer = 10000; - } else inferno_Timer -= diff; - - if (flame_timer <= diff) - { - DoCast(me, SPELL_FIRE_TAIL); - flame_timer = 500; - } else flame_timer -=diff; - - DoMeleeAttackIfReady(); - } - -}; -CreatureAI* GetAI_mob_ragin_flames(Creature* pCreature) -{ - return new mob_ragin_flamesAI (pCreature); -} -void AddSC_boss_nethermancer_sepethrea() -{ - Script *newscript; - newscript = new Script; - newscript->Name = "boss_nethermancer_sepethrea"; - newscript->GetAI = &GetAI_boss_nethermancer_sepethrea; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_ragin_flames"; - newscript->GetAI = &GetAI_mob_ragin_flames; - newscript->RegisterSelf(); -} - diff --git a/src/server/scripts/Outland/TempestKeep/the_mechanar/boss_pathaleon_the_calculator.cpp b/src/server/scripts/Outland/TempestKeep/the_mechanar/boss_pathaleon_the_calculator.cpp deleted file mode 100644 index c0c06704db7..00000000000 --- a/src/server/scripts/Outland/TempestKeep/the_mechanar/boss_pathaleon_the_calculator.cpp +++ /dev/null @@ -1,246 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ - -/* ScriptData -SDName: Boss Pathaleon the Calculator -SD%Complete: 50 -SDComment: Event missing. Script for himself 99% blizzlike. -SDCategory: Tempest Keep, The Mechanar -EndScriptData */ - -#include "ScriptedPch.h" - -#define SAY_AGGRO -1554020 -#define SAY_DOMINATION_1 -1554021 -#define SAY_DOMINATION_2 -1554022 -#define SAY_SUMMON -1554023 -#define SAY_ENRAGE -1554024 -#define SAY_SLAY_1 -1554025 -#define SAY_SLAY_2 -1554026 -#define SAY_DEATH -1554027 - -// Spells to be casted -#define SPELL_MANA_TAP 36021 -#define SPELL_ARCANE_TORRENT 36022 -#define SPELL_DOMINATION 35280 -#define H_SPELL_ARCANE_EXPLOSION 15453 -#define SPELL_FRENZY 36992 - -#define SPELL_SUMMON_NETHER_WRAITH_1 35285 //Spells work, but not implemented -#define SPELL_SUMMON_NETHER_WRAITH_2 35286 -#define SPELL_SUMMON_NETHER_WRAITH_3 35287 -#define SPELL_SUMMON_NETHER_WRAITH_4 35288 - -// Add Spells -#define SPELL_DETONATION 35058 -#define SPELL_ARCANE_MISSILES 35034 - -struct boss_pathaleon_the_calculatorAI : public ScriptedAI -{ - boss_pathaleon_the_calculatorAI(Creature *c) : ScriptedAI(c), summons(me) - { - } - - uint32 Summon_Timer; - SummonList summons; - uint32 ManaTap_Timer; - uint32 ArcaneTorrent_Timer; - uint32 Domination_Timer; - uint32 ArcaneExplosion_Timer; - - bool Enraged; - - uint32 Counter; - - void Reset() - { - Summon_Timer = 30000; - ManaTap_Timer = 12000 + rand()%8000; - ArcaneTorrent_Timer = 16000 + rand()%9000; - Domination_Timer = 25000 + rand()%15000; - ArcaneExplosion_Timer = 8000 + rand()%5000; - - Enraged = false; - - Counter = 0; - summons.DespawnAll(); - } - void EnterCombat(Unit * /*who*/) - { - DoScriptText(SAY_AGGRO, me); - } - - void KilledUnit(Unit* /*victim*/) - { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); - } - - void JustDied(Unit* /*Killer*/) - { - DoScriptText(SAY_DEATH, me); - - summons.DespawnAll(); - } - - void JustSummoned(Creature *summon) {summons.Summon(summon);} - void SummonedCreatureDespawn(Creature *summon) {summons.Despawn(summon);} - - void UpdateAI(const uint32 diff) - { - //Return since we have no target - if (!UpdateVictim()) - return; - - if (Summon_Timer <= diff) - { - for (uint8 i = 0; i < 3; ++i) - { - Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); - Creature* Wraith = me->SummonCreature(21062,me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); - if (pTarget && Wraith) - Wraith->AI()->AttackStart(pTarget); - } - DoScriptText(SAY_SUMMON, me); - Summon_Timer = 30000 + rand()%15000; - } else Summon_Timer -= diff; - - if (ManaTap_Timer <= diff) - { - DoCast(me->getVictim(), SPELL_MANA_TAP); - ManaTap_Timer = 14000 + rand()%8000; - } else ManaTap_Timer -= diff; - - if (ArcaneTorrent_Timer <= diff) - { - DoCast(me->getVictim(), SPELL_ARCANE_TORRENT); - ArcaneTorrent_Timer = 12000 + rand()%6000; - } else ArcaneTorrent_Timer -= diff; - - if (Domination_Timer <= diff) - { - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,1)) - { - DoScriptText(RAND(SAY_DOMINATION_1,SAY_DOMINATION_2), me); - - DoCast(pTarget, SPELL_DOMINATION); - } - Domination_Timer = 25000 + rand()%5000; - } else Domination_Timer -= diff; - - //Only casting if Heroic Mode is used - if (IsHeroic()) - { - if (ArcaneExplosion_Timer <= diff) - { - DoCast(me->getVictim(), H_SPELL_ARCANE_EXPLOSION); - ArcaneExplosion_Timer = 10000 + rand()%4000; - } else ArcaneExplosion_Timer -= diff; - } - - if (!Enraged && me->GetHealth()*100 / me->GetMaxHealth() < 21) - { - DoCast(me, SPELL_FRENZY); - DoScriptText(SAY_ENRAGE, me); - Enraged = true; - - } - - DoMeleeAttackIfReady(); - } -}; -CreatureAI* GetAI_boss_pathaleon_the_calculator(Creature* pCreature) -{ - return new boss_pathaleon_the_calculatorAI (pCreature); -} - -struct mob_nether_wraithAI : public ScriptedAI -{ - mob_nether_wraithAI(Creature *c) : ScriptedAI(c) {} - - uint32 ArcaneMissiles_Timer; - uint32 Detonation_Timer; - uint32 Die_Timer; - bool Detonation; - - void Reset() - { - ArcaneMissiles_Timer = 1000 + rand()%3000; - Detonation_Timer = 20000; - Die_Timer = 2200; - Detonation = false; - - } - - void EnterCombat(Unit* /*who*/) - { - } - - void UpdateAI(const uint32 diff) - { - if (!UpdateVictim()) - return; - - if (ArcaneMissiles_Timer <= diff) - { - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,1)) - DoCast(pTarget, SPELL_ARCANE_MISSILES); - else - DoCast(me->getVictim(), SPELL_ARCANE_MISSILES); - - ArcaneMissiles_Timer = 5000 + rand()%5000; - } else ArcaneMissiles_Timer -=diff; - - if (!Detonation) - { - if (Detonation_Timer <= diff) - { - DoCast(me, SPELL_DETONATION); - Detonation = true; - } else Detonation_Timer -= diff; - } - - if (Detonation) - { - if (Die_Timer <= diff) - { - me->setDeathState(JUST_DIED); - me->RemoveCorpse(); - } else Die_Timer -= diff; - } - - DoMeleeAttackIfReady(); - } - -}; -CreatureAI* GetAI_mob_nether_wraith(Creature* pCreature) -{ - return new mob_nether_wraithAI (pCreature); -} - -void AddSC_boss_pathaleon_the_calculator() -{ - Script *newscript; - newscript = new Script; - newscript->Name = "boss_pathaleon_the_calculator"; - newscript->GetAI = &GetAI_boss_pathaleon_the_calculator; - newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "mob_nether_wraith"; - newscript->GetAI = &GetAI_mob_nether_wraith; - newscript->RegisterSelf(); -} - diff --git a/src/server/scripts/Outland/TempestKeep/the_mechanar/instance_mechanar.cpp b/src/server/scripts/Outland/TempestKeep/the_mechanar/instance_mechanar.cpp deleted file mode 100644 index c70da24ea3f..00000000000 --- a/src/server/scripts/Outland/TempestKeep/the_mechanar/instance_mechanar.cpp +++ /dev/null @@ -1,86 +0,0 @@ -/* Copyright (C) 2006 - 2009 ScriptDev2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: Instance_Mechanar -SD%Complete: 100 -SDComment: -SDCategory: Mechanar -EndScriptData */ - -#include "ScriptedPch.h" -#include "mechanar.h" - -#define MAX_ENCOUNTER 1 - -struct instance_mechanar : public ScriptedInstance -{ - instance_mechanar(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; - - uint32 m_auiEncounter[MAX_ENCOUNTER]; - - void Initialize() - { - memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); - } - - bool IsEncounterInProgress() const - { - for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) - if (m_auiEncounter[i] == IN_PROGRESS) - return true; - - return false; - } - - uint32 GetData(uint32 type) - { - switch(type) - { - case DATA_NETHERMANCER_EVENT: return m_auiEncounter[0]; - } - - return false; - } - - uint64 GetData64 (uint32 /*identifier*/) - { - return 0; - } - - void SetData(uint32 type, uint32 data) - { - switch(type) - { - case DATA_NETHERMANCER_EVENT: m_auiEncounter[0] = data; break; - } - } -}; - -InstanceData* GetInstanceData_instance_mechanar(Map* pMap) -{ - return new instance_mechanar(pMap); -} - -void AddSC_instance_mechanar() -{ - Script *newscript; - newscript = new Script; - newscript->Name = "instance_mechanar"; - newscript->GetInstanceData = &GetInstanceData_instance_mechanar; - newscript->RegisterSelf(); -} - diff --git a/src/server/scripts/Outland/TempestKeep/the_mechanar/mechanar.h b/src/server/scripts/Outland/TempestKeep/the_mechanar/mechanar.h deleted file mode 100644 index d1b53eebf53..00000000000 --- a/src/server/scripts/Outland/TempestKeep/the_mechanar/mechanar.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef DEF_MECHANAR_H -#define DEF_MECHANAR_H - -#define DATA_NETHERMANCER_EVENT 1 -#endif - -- cgit v1.2.3 From 071df5528cc3504302e538699cb9e5c52d958b23 Mon Sep 17 00:00:00 2001 From: XTZGZoReX Date: Mon, 7 Jun 2010 01:18:27 +0200 Subject: * Rename Transports.cpp/.h to Transport.cpp/.h. --HG-- branch : trunk --- src/server/game/Entities/Transport/Transport.cpp | 589 ++++++++++++++++++++++ src/server/game/Entities/Transport/Transport.h | 108 ++++ src/server/game/Entities/Transport/Transports.cpp | 589 ---------------------- src/server/game/Entities/Transport/Transports.h | 108 ---- 4 files changed, 697 insertions(+), 697 deletions(-) create mode 100644 src/server/game/Entities/Transport/Transport.cpp create mode 100644 src/server/game/Entities/Transport/Transport.h delete mode 100644 src/server/game/Entities/Transport/Transports.cpp delete mode 100644 src/server/game/Entities/Transport/Transports.h (limited to 'src') diff --git a/src/server/game/Entities/Transport/Transport.cpp b/src/server/game/Entities/Transport/Transport.cpp new file mode 100644 index 00000000000..444e115f8b9 --- /dev/null +++ b/src/server/game/Entities/Transport/Transport.cpp @@ -0,0 +1,589 @@ +/* + * Copyright (C) 2005-2009 MaNGOS + * + * Copyright (C) 2008-2010 Trinity + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "Common.h" + +#include "Transports.h" +#include "MapManager.h" +#include "ObjectMgr.h" +#include "Path.h" + +#include "WorldPacket.h" +#include "DBCStores.h" +#include "ProgressBar.h" + +#include "World.h" + +void MapManager::LoadTransports() +{ + QueryResult_AutoPtr result = WorldDatabase.Query("SELECT entry, name, period FROM transports"); + + uint32 count = 0; + + if (!result) + { + barGoLink bar(1); + bar.step(); + + sLog.outString(); + sLog.outString(">> Loaded %u transports", count); + return; + } + + barGoLink bar(result->GetRowCount()); + + do + { + bar.step(); + + Transport *t = new Transport; + + Field *fields = result->Fetch(); + + uint32 entry = fields[0].GetUInt32(); + std::string name = fields[1].GetCppString(); + t->m_period = fields[2].GetUInt32(); + + const GameObjectInfo *goinfo = objmgr.GetGameObjectInfo(entry); + + if (!goinfo) + { + sLog.outErrorDb("Transport ID:%u, Name: %s, will not be loaded, gameobject_template missing", entry, name.c_str()); + delete t; + continue; + } + + if (goinfo->type != GAMEOBJECT_TYPE_MO_TRANSPORT) + { + sLog.outErrorDb("Transport ID:%u, Name: %s, will not be loaded, gameobject_template type wrong", entry, name.c_str()); + delete t; + continue; + } + + // sLog.outString("Loading transport %d between %s, %s", entry, name.c_str(), goinfo->name); + + std::set mapsUsed; + + if (!t->GenerateWaypoints(goinfo->moTransport.taxiPathId, mapsUsed)) + // skip transports with empty waypoints list + { + sLog.outErrorDb("Transport (path id %u) path size = 0. Transport ignored, check DBC files or transport GO data0 field.",goinfo->moTransport.taxiPathId); + delete t; + continue; + } + + float x, y, z, o; + uint32 mapid; + x = t->m_WayPoints[0].x; y = t->m_WayPoints[0].y; z = t->m_WayPoints[0].z; mapid = t->m_WayPoints[0].mapid; o = 1; + + // creates the Gameobject + if (!t->Create(entry, mapid, x, y, z, o, 100, 0)) + { + delete t; + continue; + } + + m_Transports.insert(t); + + for (std::set::const_iterator i = mapsUsed.begin(); i != mapsUsed.end(); ++i) + m_TransportsByMap[*i].insert(t); + + //If we someday decide to use the grid to track transports, here: + t->SetMap(MapManager::Instance().CreateMap(mapid, t, 0)); + + //t->GetMap()->Add((GameObject *)t); + ++count; + } while (result->NextRow()); + + sLog.outString(); + sLog.outString(">> Loaded %u transports", count); + + // check transport data DB integrity + result = WorldDatabase.Query("SELECT gameobject.guid,gameobject.id,transports.name FROM gameobject,transports WHERE gameobject.id = transports.entry"); + if (result) // wrong data found + { + do + { + Field *fields = result->Fetch(); + + uint32 guid = fields[0].GetUInt32(); + uint32 entry = fields[1].GetUInt32(); + std::string name = fields[2].GetCppString(); + sLog.outErrorDb("Transport %u '%s' have record (GUID: %u) in `gameobject`. Transports DON'T must have any records in `gameobject` or its behavior will be unpredictable/bugged.",entry,name.c_str(),guid); + } + while (result->NextRow()); + } +} + +Transport::Transport() : GameObject() +{ + m_updateFlag = (UPDATEFLAG_TRANSPORT | UPDATEFLAG_HIGHGUID | UPDATEFLAG_HAS_POSITION | UPDATEFLAG_ROTATION); +} + +bool Transport::Create(uint32 guidlow, uint32 mapid, float x, float y, float z, float ang, uint32 animprogress, uint32 dynflags) +{ + Relocate(x,y,z,ang); + // instance id and phaseMask isn't set to values different from std. + + if (!IsPositionValid()) + { + sLog.outError("Transport (GUID: %u) not created. Suggested coordinates isn't valid (X: %f Y: %f)", + guidlow,x,y); + return false; + } + + Object::_Create(guidlow, 0, HIGHGUID_MO_TRANSPORT); + + GameObjectInfo const* goinfo = objmgr.GetGameObjectInfo(guidlow); + + if (!goinfo) + { + sLog.outErrorDb("Transport not created: entry in `gameobject_template` not found, guidlow: %u map: %u (X: %f Y: %f Z: %f) ang: %f",guidlow, mapid, x, y, z, ang); + return false; + } + + m_goInfo = goinfo; + + SetFloatValue(OBJECT_FIELD_SCALE_X, goinfo->size); + + SetUInt32Value(GAMEOBJECT_FACTION, goinfo->faction); + //SetUInt32Value(GAMEOBJECT_FLAGS, goinfo->flags); + SetUInt32Value(GAMEOBJECT_FLAGS, MAKE_PAIR32(0x28, 0x64)); + SetUInt32Value(GAMEOBJECT_LEVEL, m_period); + SetEntry(goinfo->id); + + SetUInt32Value(GAMEOBJECT_DISPLAYID, goinfo->displayId); + + SetGoState(GO_STATE_READY); + SetGoType(GameobjectTypes(goinfo->type)); + + SetGoAnimProgress(animprogress); + if (dynflags) + SetUInt32Value(GAMEOBJECT_DYNAMIC, MAKE_PAIR32(0, dynflags)); + + SetName(goinfo->name); + + return true; +} + +struct keyFrame +{ + keyFrame(float _x, float _y, float _z, uint32 _mapid, int _actionflag, int _delay) + { + x = _x; y = _y; z = _z; mapid = _mapid; actionflag = _actionflag; delay = _delay; distFromPrev = -1; distSinceStop = -1; distUntilStop = -1; + tFrom = 0; tTo = 0; + } + + float x; + float y; + float z; + uint32 mapid; + int actionflag; + int delay; + float distSinceStop; + float distUntilStop; + float distFromPrev; + float tFrom, tTo; +}; + +bool Transport::GenerateWaypoints(uint32 pathid, std::set &mapids) +{ + TransportPath path; + objmgr.GetTransportPathNodes(pathid, path); + + if (path.Empty()) + return false; + + std::vector keyFrames; + int mapChange = 0; + mapids.clear(); + for (size_t i = 1; i < path.Size() - 1; ++i) + { + if (mapChange == 0) + { + if ((path[i].mapid == path[i+1].mapid)) + { + keyFrame k(path[i].x, path[i].y, path[i].z, path[i].mapid, path[i].actionFlag, path[i].delay); + keyFrames.push_back(k); + mapids.insert(k.mapid); + } + else + { + mapChange = 1; + } + } + else + { + --mapChange; + } + } + + int lastStop = -1; + int firstStop = -1; + + // first cell is arrived at by teleportation :S + keyFrames[0].distFromPrev = 0; + if (keyFrames[0].actionflag == 2) + { + lastStop = 0; + } + + // find the rest of the distances between key points + for (size_t i = 1; i < keyFrames.size(); ++i) + { + if ((keyFrames[i].actionflag == 1) || (keyFrames[i].mapid != keyFrames[i-1].mapid)) + { + keyFrames[i].distFromPrev = 0; + } + else + { + keyFrames[i].distFromPrev = + sqrt(pow(keyFrames[i].x - keyFrames[i - 1].x, 2) + + pow(keyFrames[i].y - keyFrames[i - 1].y, 2) + + pow(keyFrames[i].z - keyFrames[i - 1].z, 2)); + } + if (keyFrames[i].actionflag == 2) + { + // remember first stop frame + if (firstStop == -1) + firstStop = i; + lastStop = i; + } + } + + float tmpDist = 0; + for (size_t i = 0; i < keyFrames.size(); ++i) + { + int j = (i + lastStop) % keyFrames.size(); + if (keyFrames[j].actionflag == 2) + tmpDist = 0; + else + tmpDist += keyFrames[j].distFromPrev; + keyFrames[j].distSinceStop = tmpDist; + } + + for (int i = int(keyFrames.size()) - 1; i >= 0; i--) + { + int j = (i + (firstStop+1)) % keyFrames.size(); + tmpDist += keyFrames[(j + 1) % keyFrames.size()].distFromPrev; + keyFrames[j].distUntilStop = tmpDist; + if (keyFrames[j].actionflag == 2) + tmpDist = 0; + } + + for (size_t i = 0; i < keyFrames.size(); ++i) + { + if (keyFrames[i].distSinceStop < (30 * 30 * 0.5f)) + keyFrames[i].tFrom = sqrt(2 * keyFrames[i].distSinceStop); + else + keyFrames[i].tFrom = ((keyFrames[i].distSinceStop - (30 * 30 * 0.5f)) / 30) + 30; + + if (keyFrames[i].distUntilStop < (30 * 30 * 0.5f)) + keyFrames[i].tTo = sqrt(2 * keyFrames[i].distUntilStop); + else + keyFrames[i].tTo = ((keyFrames[i].distUntilStop - (30 * 30 * 0.5f)) / 30) + 30; + + keyFrames[i].tFrom *= 1000; + keyFrames[i].tTo *= 1000; + } + + // for (int i = 0; i < keyFrames.size(); ++i) { + // sLog.outString("%f, %f, %f, %f, %f, %f, %f", keyFrames[i].x, keyFrames[i].y, keyFrames[i].distUntilStop, keyFrames[i].distSinceStop, keyFrames[i].distFromPrev, keyFrames[i].tFrom, keyFrames[i].tTo); + // } + + // Now we're completely set up; we can move along the length of each waypoint at 100 ms intervals + // speed = max(30, t) (remember x = 0.5s^2, and when accelerating, a = 1 unit/s^2 + int t = 0; + bool teleport = false; + if (keyFrames[keyFrames.size() - 1].mapid != keyFrames[0].mapid) + teleport = true; + + WayPoint pos(keyFrames[0].mapid, keyFrames[0].x, keyFrames[0].y, keyFrames[0].z, teleport, 0); + m_WayPoints[0] = pos; + t += keyFrames[0].delay * 1000; + + uint32 cM = keyFrames[0].mapid; + for (size_t i = 0; i < keyFrames.size() - 1; ++i) + { + float d = 0; + float tFrom = keyFrames[i].tFrom; + float tTo = keyFrames[i].tTo; + + // keep the generation of all these points; we use only a few now, but may need the others later + if (((d < keyFrames[i + 1].distFromPrev) && (tTo > 0))) + { + while ((d < keyFrames[i + 1].distFromPrev) && (tTo > 0)) + { + tFrom += 100; + tTo -= 100; + + if (d > 0) + { + float newX, newY, newZ; + newX = keyFrames[i].x + (keyFrames[i + 1].x - keyFrames[i].x) * d / keyFrames[i + 1].distFromPrev; + newY = keyFrames[i].y + (keyFrames[i + 1].y - keyFrames[i].y) * d / keyFrames[i + 1].distFromPrev; + newZ = keyFrames[i].z + (keyFrames[i + 1].z - keyFrames[i].z) * d / keyFrames[i + 1].distFromPrev; + + bool teleport = false; + if (keyFrames[i].mapid != cM) + { + teleport = true; + cM = keyFrames[i].mapid; + } + + // sLog.outString("T: %d, D: %f, x: %f, y: %f, z: %f", t, d, newX, newY, newZ); + WayPoint pos(keyFrames[i].mapid, newX, newY, newZ, teleport, i); + if (teleport) + m_WayPoints[t] = pos; + } + + if (tFrom < tTo) // caught in tFrom dock's "gravitational pull" + { + if (tFrom <= 30000) + { + d = 0.5f * (tFrom / 1000) * (tFrom / 1000); + } + else + { + d = 0.5f * 30 * 30 + 30 * ((tFrom - 30000) / 1000); + } + d = d - keyFrames[i].distSinceStop; + } + else + { + if (tTo <= 30000) + { + d = 0.5f * (tTo / 1000) * (tTo / 1000); + } + else + { + d = 0.5f * 30 * 30 + 30 * ((tTo - 30000) / 1000); + } + d = keyFrames[i].distUntilStop - d; + } + t += 100; + } + t -= 100; + } + + if (keyFrames[i + 1].tFrom > keyFrames[i + 1].tTo) + t += 100 - ((long)keyFrames[i + 1].tTo % 100); + else + t += (long)keyFrames[i + 1].tTo % 100; + + bool teleport = false; + if ((keyFrames[i + 1].actionflag == 1) || (keyFrames[i + 1].mapid != keyFrames[i].mapid)) + { + teleport = true; + cM = keyFrames[i + 1].mapid; + } + + WayPoint pos(keyFrames[i + 1].mapid, keyFrames[i + 1].x, keyFrames[i + 1].y, keyFrames[i + 1].z, teleport, i); + + // sLog.outString("T: %d, x: %f, y: %f, z: %f, t:%d", t, pos.x, pos.y, pos.z, teleport); +/* + if (keyFrames[i+1].delay > 5) + pos.delayed = true; +*/ + //if (teleport) + m_WayPoints[t] = pos; + + t += keyFrames[i + 1].delay * 1000; + // sLog.outString("------"); + } + + uint32 timer = t; + + // sLog.outDetail(" Generated %lu waypoints, total time %u.", (unsigned long)m_WayPoints.size(), timer); + + m_curr = m_WayPoints.begin(); + m_curr = GetNextWayPoint(); + m_next = GetNextWayPoint(); + m_pathTime = timer; + + m_nextNodeTime = m_curr->first; + + return true; +} + +Transport::WayPointMap::const_iterator Transport::GetNextWayPoint() +{ + WayPointMap::const_iterator iter = m_curr; + ++iter; + if (iter == m_WayPoints.end()) + iter = m_WayPoints.begin(); + return iter; +} + +void Transport::TeleportTransport(uint32 newMapid, float x, float y, float z) +{ + Map const* oldMap = GetMap(); + Relocate(x, y, z); + + for (PlayerSet::const_iterator itr = m_passengers.begin(); itr != m_passengers.end();) + { + Player *plr = *itr; + ++itr; + + if (plr->isDead() && !plr->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_GHOST)) + { + plr->ResurrectPlayer(1.0); + } + plr->TeleportTo(newMapid, x, y, z, GetOrientation(), TELE_TO_NOT_LEAVE_TRANSPORT); + + //WorldPacket data(SMSG_811, 4); + //data << uint32(0); + //plr->GetSession()->SendPacket(&data); + } + + //we need to create and save new Map object with 'newMapid' because if not done -> lead to invalid Map object reference... + //player far teleport would try to create same instance, but we need it NOW for transport... + //correct me if I'm wrong O.o + //yes, you're right + + ResetMap(); + Map * newMap = MapManager::Instance().CreateMap(newMapid, this, 0); + SetMap(newMap); + assert (GetMap()); + + if (oldMap != newMap) + { + UpdateForMap(oldMap); + UpdateForMap(newMap); + } +} + +bool Transport::AddPassenger(Player* passenger) +{ + if (m_passengers.insert(passenger).second) + sLog.outDetail("Player %s boarded transport %s.", passenger->GetName(), GetName()); + return true; +} + +bool Transport::RemovePassenger(Player* passenger) +{ + if (m_passengers.erase(passenger)) + sLog.outDetail("Player %s removed from transport %s.", passenger->GetName(), GetName()); + return true; +} + +void Transport::CheckForEvent(uint32 entry, uint32 wp_id) +{ + uint32 key = entry*100+wp_id; + if (objmgr.TransportEventMap.find(key) != objmgr.TransportEventMap.end()) + GetMap()->ScriptsStart(sEventScripts, objmgr.TransportEventMap[key], this, NULL); +} + +void Transport::Update(uint32 /*p_time*/) +{ + if (m_WayPoints.size() <= 1) + return; + + m_timer = getMSTime() % m_period; + while (((m_timer - m_curr->first) % m_pathTime) > ((m_next->first - m_curr->first) % m_pathTime)) + { + m_curr = GetNextWayPoint(); + m_next = GetNextWayPoint(); + + // first check help in case client-server transport coordinates de-synchronization + if (m_curr->second.mapid != GetMapId() || m_curr->second.teleport) + { + TeleportTransport(m_curr->second.mapid, m_curr->second.x, m_curr->second.y, m_curr->second.z); + } + else + { + Relocate(m_curr->second.x, m_curr->second.y, m_curr->second.z); + } +/* + if (m_curr->second.delayed) + { + switch (GetEntry()) + { + case 176495: + case 164871: + case 175080: + SendPlaySound(11804, false); break; // ZeppelinDocked + case 20808: + case 181646: + case 176231: + case 176244: + case 176310: + case 177233: + SendPlaySound(5495, false);break; // BoatDockingWarning + default: + SendPlaySound(5154, false); break; // ShipDocked + } + } +*/ + /* + for (PlayerSet::const_iterator itr = m_passengers.begin(); itr != m_passengers.end();) + { + PlayerSet::const_iterator it2 = itr; + ++itr; + //(*it2)->SetPosition(m_curr->second.x + (*it2)->GetTransOffsetX(), m_curr->second.y + (*it2)->GetTransOffsetY(), m_curr->second.z + (*it2)->GetTransOffsetZ(), (*it2)->GetTransOffsetO()); + } + */ + + m_nextNodeTime = m_curr->first; + + if (m_curr == m_WayPoints.begin() && (sLog.getLogFilter() & LOG_FILTER_TRANSPORT_MOVES) == 0) + sLog.outDetail(" ************ BEGIN ************** %s", this->m_name.c_str()); + + if ((sLog.getLogFilter() & LOG_FILTER_TRANSPORT_MOVES) == 0) + sLog.outDetail("%s moved to %d %f %f %f %d", this->m_name.c_str(), m_curr->second.id, m_curr->second.x, m_curr->second.y, m_curr->second.z, m_curr->second.mapid); + + //Transport Event System + CheckForEvent(this->GetEntry(), m_curr->second.id); + } +} + +void Transport::UpdateForMap(Map const* targetMap) +{ + Map::PlayerList const& pl = targetMap->GetPlayers(); + if (pl.isEmpty()) + return; + + if (GetMapId() == targetMap->GetId()) + { + for (Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr) + { + if (this != itr->getSource()->GetTransport()) + { + UpdateData transData; + BuildCreateUpdateBlockForPlayer(&transData, itr->getSource()); + WorldPacket packet; + transData.BuildPacket(&packet); + itr->getSource()->SendDirectMessage(&packet); + } + } + } + else + { + UpdateData transData; + BuildOutOfRangeUpdateBlock(&transData); + WorldPacket out_packet; + transData.BuildPacket(&out_packet); + + for (Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr) + if (this != itr->getSource()->GetTransport()) + itr->getSource()->SendDirectMessage(&out_packet); + } +} + diff --git a/src/server/game/Entities/Transport/Transport.h b/src/server/game/Entities/Transport/Transport.h new file mode 100644 index 00000000000..25b9ade1461 --- /dev/null +++ b/src/server/game/Entities/Transport/Transport.h @@ -0,0 +1,108 @@ +/* + * Copyright (C) 2005-2009 MaNGOS + * + * Copyright (C) 2008-2010 Trinity + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef TRANSPORTS_H +#define TRANSPORTS_H + +#include "GameObject.h" + +#include +#include +#include + +class TransportPath +{ + public: + struct PathNode + { + uint32 mapid; + float x,y,z; + uint32 actionFlag; + uint32 delay; + }; + + void SetLength(const unsigned int sz) + { + i_nodes.resize(sz); + } + + unsigned int Size(void) const { return i_nodes.size(); } + bool Empty(void) const { return i_nodes.empty(); } + void Resize(unsigned int sz) { i_nodes.resize(sz); } + void Clear(void) { i_nodes.clear(); } + PathNode* GetNodes(void) { return static_cast(&i_nodes[0]); } + + PathNode& operator[](const unsigned int idx) { return i_nodes[idx]; } + const PathNode& operator()(const unsigned int idx) const { return i_nodes[idx]; } + + protected: + std::vector i_nodes; +}; + +class Transport : public GameObject +{ + public: + explicit Transport(); + + bool Create(uint32 guidlow, uint32 mapid, float x, float y, float z, float ang, uint32 animprogress, uint32 dynflags); + bool GenerateWaypoints(uint32 pathid, std::set &mapids); + void Update(uint32 p_time); + bool AddPassenger(Player* passenger); + bool RemovePassenger(Player* passenger); + void CheckForEvent(uint32 entry, uint32 wp_id); + + typedef std::set PlayerSet; + PlayerSet const& GetPassengers() const { return m_passengers; } + + private: + struct WayPoint + { + WayPoint() : mapid(0), x(0), y(0), z(0), teleport(false), id(0) {} + WayPoint(uint32 _mapid, float _x, float _y, float _z, bool _teleport, uint32 _id) : + mapid(_mapid), x(_x), y(_y), z(_z), teleport(_teleport), id(_id) {} + uint32 mapid; + float x; + float y; + float z; + bool teleport; + uint32 id; + }; + + typedef std::map WayPointMap; + + WayPointMap::const_iterator m_curr; + WayPointMap::const_iterator m_next; + uint32 m_pathTime; + uint32 m_timer; + + PlayerSet m_passengers; + + public: + WayPointMap m_WayPoints; + uint32 m_nextNodeTime; + uint32 m_period; + + private: + void TeleportTransport(uint32 newMapid, float x, float y, float z); + void UpdateForMap(Map const* map); + WayPointMap::const_iterator GetNextWayPoint(); +}; +#endif + diff --git a/src/server/game/Entities/Transport/Transports.cpp b/src/server/game/Entities/Transport/Transports.cpp deleted file mode 100644 index 444e115f8b9..00000000000 --- a/src/server/game/Entities/Transport/Transports.cpp +++ /dev/null @@ -1,589 +0,0 @@ -/* - * Copyright (C) 2005-2009 MaNGOS - * - * Copyright (C) 2008-2010 Trinity - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "Common.h" - -#include "Transports.h" -#include "MapManager.h" -#include "ObjectMgr.h" -#include "Path.h" - -#include "WorldPacket.h" -#include "DBCStores.h" -#include "ProgressBar.h" - -#include "World.h" - -void MapManager::LoadTransports() -{ - QueryResult_AutoPtr result = WorldDatabase.Query("SELECT entry, name, period FROM transports"); - - uint32 count = 0; - - if (!result) - { - barGoLink bar(1); - bar.step(); - - sLog.outString(); - sLog.outString(">> Loaded %u transports", count); - return; - } - - barGoLink bar(result->GetRowCount()); - - do - { - bar.step(); - - Transport *t = new Transport; - - Field *fields = result->Fetch(); - - uint32 entry = fields[0].GetUInt32(); - std::string name = fields[1].GetCppString(); - t->m_period = fields[2].GetUInt32(); - - const GameObjectInfo *goinfo = objmgr.GetGameObjectInfo(entry); - - if (!goinfo) - { - sLog.outErrorDb("Transport ID:%u, Name: %s, will not be loaded, gameobject_template missing", entry, name.c_str()); - delete t; - continue; - } - - if (goinfo->type != GAMEOBJECT_TYPE_MO_TRANSPORT) - { - sLog.outErrorDb("Transport ID:%u, Name: %s, will not be loaded, gameobject_template type wrong", entry, name.c_str()); - delete t; - continue; - } - - // sLog.outString("Loading transport %d between %s, %s", entry, name.c_str(), goinfo->name); - - std::set mapsUsed; - - if (!t->GenerateWaypoints(goinfo->moTransport.taxiPathId, mapsUsed)) - // skip transports with empty waypoints list - { - sLog.outErrorDb("Transport (path id %u) path size = 0. Transport ignored, check DBC files or transport GO data0 field.",goinfo->moTransport.taxiPathId); - delete t; - continue; - } - - float x, y, z, o; - uint32 mapid; - x = t->m_WayPoints[0].x; y = t->m_WayPoints[0].y; z = t->m_WayPoints[0].z; mapid = t->m_WayPoints[0].mapid; o = 1; - - // creates the Gameobject - if (!t->Create(entry, mapid, x, y, z, o, 100, 0)) - { - delete t; - continue; - } - - m_Transports.insert(t); - - for (std::set::const_iterator i = mapsUsed.begin(); i != mapsUsed.end(); ++i) - m_TransportsByMap[*i].insert(t); - - //If we someday decide to use the grid to track transports, here: - t->SetMap(MapManager::Instance().CreateMap(mapid, t, 0)); - - //t->GetMap()->Add((GameObject *)t); - ++count; - } while (result->NextRow()); - - sLog.outString(); - sLog.outString(">> Loaded %u transports", count); - - // check transport data DB integrity - result = WorldDatabase.Query("SELECT gameobject.guid,gameobject.id,transports.name FROM gameobject,transports WHERE gameobject.id = transports.entry"); - if (result) // wrong data found - { - do - { - Field *fields = result->Fetch(); - - uint32 guid = fields[0].GetUInt32(); - uint32 entry = fields[1].GetUInt32(); - std::string name = fields[2].GetCppString(); - sLog.outErrorDb("Transport %u '%s' have record (GUID: %u) in `gameobject`. Transports DON'T must have any records in `gameobject` or its behavior will be unpredictable/bugged.",entry,name.c_str(),guid); - } - while (result->NextRow()); - } -} - -Transport::Transport() : GameObject() -{ - m_updateFlag = (UPDATEFLAG_TRANSPORT | UPDATEFLAG_HIGHGUID | UPDATEFLAG_HAS_POSITION | UPDATEFLAG_ROTATION); -} - -bool Transport::Create(uint32 guidlow, uint32 mapid, float x, float y, float z, float ang, uint32 animprogress, uint32 dynflags) -{ - Relocate(x,y,z,ang); - // instance id and phaseMask isn't set to values different from std. - - if (!IsPositionValid()) - { - sLog.outError("Transport (GUID: %u) not created. Suggested coordinates isn't valid (X: %f Y: %f)", - guidlow,x,y); - return false; - } - - Object::_Create(guidlow, 0, HIGHGUID_MO_TRANSPORT); - - GameObjectInfo const* goinfo = objmgr.GetGameObjectInfo(guidlow); - - if (!goinfo) - { - sLog.outErrorDb("Transport not created: entry in `gameobject_template` not found, guidlow: %u map: %u (X: %f Y: %f Z: %f) ang: %f",guidlow, mapid, x, y, z, ang); - return false; - } - - m_goInfo = goinfo; - - SetFloatValue(OBJECT_FIELD_SCALE_X, goinfo->size); - - SetUInt32Value(GAMEOBJECT_FACTION, goinfo->faction); - //SetUInt32Value(GAMEOBJECT_FLAGS, goinfo->flags); - SetUInt32Value(GAMEOBJECT_FLAGS, MAKE_PAIR32(0x28, 0x64)); - SetUInt32Value(GAMEOBJECT_LEVEL, m_period); - SetEntry(goinfo->id); - - SetUInt32Value(GAMEOBJECT_DISPLAYID, goinfo->displayId); - - SetGoState(GO_STATE_READY); - SetGoType(GameobjectTypes(goinfo->type)); - - SetGoAnimProgress(animprogress); - if (dynflags) - SetUInt32Value(GAMEOBJECT_DYNAMIC, MAKE_PAIR32(0, dynflags)); - - SetName(goinfo->name); - - return true; -} - -struct keyFrame -{ - keyFrame(float _x, float _y, float _z, uint32 _mapid, int _actionflag, int _delay) - { - x = _x; y = _y; z = _z; mapid = _mapid; actionflag = _actionflag; delay = _delay; distFromPrev = -1; distSinceStop = -1; distUntilStop = -1; - tFrom = 0; tTo = 0; - } - - float x; - float y; - float z; - uint32 mapid; - int actionflag; - int delay; - float distSinceStop; - float distUntilStop; - float distFromPrev; - float tFrom, tTo; -}; - -bool Transport::GenerateWaypoints(uint32 pathid, std::set &mapids) -{ - TransportPath path; - objmgr.GetTransportPathNodes(pathid, path); - - if (path.Empty()) - return false; - - std::vector keyFrames; - int mapChange = 0; - mapids.clear(); - for (size_t i = 1; i < path.Size() - 1; ++i) - { - if (mapChange == 0) - { - if ((path[i].mapid == path[i+1].mapid)) - { - keyFrame k(path[i].x, path[i].y, path[i].z, path[i].mapid, path[i].actionFlag, path[i].delay); - keyFrames.push_back(k); - mapids.insert(k.mapid); - } - else - { - mapChange = 1; - } - } - else - { - --mapChange; - } - } - - int lastStop = -1; - int firstStop = -1; - - // first cell is arrived at by teleportation :S - keyFrames[0].distFromPrev = 0; - if (keyFrames[0].actionflag == 2) - { - lastStop = 0; - } - - // find the rest of the distances between key points - for (size_t i = 1; i < keyFrames.size(); ++i) - { - if ((keyFrames[i].actionflag == 1) || (keyFrames[i].mapid != keyFrames[i-1].mapid)) - { - keyFrames[i].distFromPrev = 0; - } - else - { - keyFrames[i].distFromPrev = - sqrt(pow(keyFrames[i].x - keyFrames[i - 1].x, 2) + - pow(keyFrames[i].y - keyFrames[i - 1].y, 2) + - pow(keyFrames[i].z - keyFrames[i - 1].z, 2)); - } - if (keyFrames[i].actionflag == 2) - { - // remember first stop frame - if (firstStop == -1) - firstStop = i; - lastStop = i; - } - } - - float tmpDist = 0; - for (size_t i = 0; i < keyFrames.size(); ++i) - { - int j = (i + lastStop) % keyFrames.size(); - if (keyFrames[j].actionflag == 2) - tmpDist = 0; - else - tmpDist += keyFrames[j].distFromPrev; - keyFrames[j].distSinceStop = tmpDist; - } - - for (int i = int(keyFrames.size()) - 1; i >= 0; i--) - { - int j = (i + (firstStop+1)) % keyFrames.size(); - tmpDist += keyFrames[(j + 1) % keyFrames.size()].distFromPrev; - keyFrames[j].distUntilStop = tmpDist; - if (keyFrames[j].actionflag == 2) - tmpDist = 0; - } - - for (size_t i = 0; i < keyFrames.size(); ++i) - { - if (keyFrames[i].distSinceStop < (30 * 30 * 0.5f)) - keyFrames[i].tFrom = sqrt(2 * keyFrames[i].distSinceStop); - else - keyFrames[i].tFrom = ((keyFrames[i].distSinceStop - (30 * 30 * 0.5f)) / 30) + 30; - - if (keyFrames[i].distUntilStop < (30 * 30 * 0.5f)) - keyFrames[i].tTo = sqrt(2 * keyFrames[i].distUntilStop); - else - keyFrames[i].tTo = ((keyFrames[i].distUntilStop - (30 * 30 * 0.5f)) / 30) + 30; - - keyFrames[i].tFrom *= 1000; - keyFrames[i].tTo *= 1000; - } - - // for (int i = 0; i < keyFrames.size(); ++i) { - // sLog.outString("%f, %f, %f, %f, %f, %f, %f", keyFrames[i].x, keyFrames[i].y, keyFrames[i].distUntilStop, keyFrames[i].distSinceStop, keyFrames[i].distFromPrev, keyFrames[i].tFrom, keyFrames[i].tTo); - // } - - // Now we're completely set up; we can move along the length of each waypoint at 100 ms intervals - // speed = max(30, t) (remember x = 0.5s^2, and when accelerating, a = 1 unit/s^2 - int t = 0; - bool teleport = false; - if (keyFrames[keyFrames.size() - 1].mapid != keyFrames[0].mapid) - teleport = true; - - WayPoint pos(keyFrames[0].mapid, keyFrames[0].x, keyFrames[0].y, keyFrames[0].z, teleport, 0); - m_WayPoints[0] = pos; - t += keyFrames[0].delay * 1000; - - uint32 cM = keyFrames[0].mapid; - for (size_t i = 0; i < keyFrames.size() - 1; ++i) - { - float d = 0; - float tFrom = keyFrames[i].tFrom; - float tTo = keyFrames[i].tTo; - - // keep the generation of all these points; we use only a few now, but may need the others later - if (((d < keyFrames[i + 1].distFromPrev) && (tTo > 0))) - { - while ((d < keyFrames[i + 1].distFromPrev) && (tTo > 0)) - { - tFrom += 100; - tTo -= 100; - - if (d > 0) - { - float newX, newY, newZ; - newX = keyFrames[i].x + (keyFrames[i + 1].x - keyFrames[i].x) * d / keyFrames[i + 1].distFromPrev; - newY = keyFrames[i].y + (keyFrames[i + 1].y - keyFrames[i].y) * d / keyFrames[i + 1].distFromPrev; - newZ = keyFrames[i].z + (keyFrames[i + 1].z - keyFrames[i].z) * d / keyFrames[i + 1].distFromPrev; - - bool teleport = false; - if (keyFrames[i].mapid != cM) - { - teleport = true; - cM = keyFrames[i].mapid; - } - - // sLog.outString("T: %d, D: %f, x: %f, y: %f, z: %f", t, d, newX, newY, newZ); - WayPoint pos(keyFrames[i].mapid, newX, newY, newZ, teleport, i); - if (teleport) - m_WayPoints[t] = pos; - } - - if (tFrom < tTo) // caught in tFrom dock's "gravitational pull" - { - if (tFrom <= 30000) - { - d = 0.5f * (tFrom / 1000) * (tFrom / 1000); - } - else - { - d = 0.5f * 30 * 30 + 30 * ((tFrom - 30000) / 1000); - } - d = d - keyFrames[i].distSinceStop; - } - else - { - if (tTo <= 30000) - { - d = 0.5f * (tTo / 1000) * (tTo / 1000); - } - else - { - d = 0.5f * 30 * 30 + 30 * ((tTo - 30000) / 1000); - } - d = keyFrames[i].distUntilStop - d; - } - t += 100; - } - t -= 100; - } - - if (keyFrames[i + 1].tFrom > keyFrames[i + 1].tTo) - t += 100 - ((long)keyFrames[i + 1].tTo % 100); - else - t += (long)keyFrames[i + 1].tTo % 100; - - bool teleport = false; - if ((keyFrames[i + 1].actionflag == 1) || (keyFrames[i + 1].mapid != keyFrames[i].mapid)) - { - teleport = true; - cM = keyFrames[i + 1].mapid; - } - - WayPoint pos(keyFrames[i + 1].mapid, keyFrames[i + 1].x, keyFrames[i + 1].y, keyFrames[i + 1].z, teleport, i); - - // sLog.outString("T: %d, x: %f, y: %f, z: %f, t:%d", t, pos.x, pos.y, pos.z, teleport); -/* - if (keyFrames[i+1].delay > 5) - pos.delayed = true; -*/ - //if (teleport) - m_WayPoints[t] = pos; - - t += keyFrames[i + 1].delay * 1000; - // sLog.outString("------"); - } - - uint32 timer = t; - - // sLog.outDetail(" Generated %lu waypoints, total time %u.", (unsigned long)m_WayPoints.size(), timer); - - m_curr = m_WayPoints.begin(); - m_curr = GetNextWayPoint(); - m_next = GetNextWayPoint(); - m_pathTime = timer; - - m_nextNodeTime = m_curr->first; - - return true; -} - -Transport::WayPointMap::const_iterator Transport::GetNextWayPoint() -{ - WayPointMap::const_iterator iter = m_curr; - ++iter; - if (iter == m_WayPoints.end()) - iter = m_WayPoints.begin(); - return iter; -} - -void Transport::TeleportTransport(uint32 newMapid, float x, float y, float z) -{ - Map const* oldMap = GetMap(); - Relocate(x, y, z); - - for (PlayerSet::const_iterator itr = m_passengers.begin(); itr != m_passengers.end();) - { - Player *plr = *itr; - ++itr; - - if (plr->isDead() && !plr->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_GHOST)) - { - plr->ResurrectPlayer(1.0); - } - plr->TeleportTo(newMapid, x, y, z, GetOrientation(), TELE_TO_NOT_LEAVE_TRANSPORT); - - //WorldPacket data(SMSG_811, 4); - //data << uint32(0); - //plr->GetSession()->SendPacket(&data); - } - - //we need to create and save new Map object with 'newMapid' because if not done -> lead to invalid Map object reference... - //player far teleport would try to create same instance, but we need it NOW for transport... - //correct me if I'm wrong O.o - //yes, you're right - - ResetMap(); - Map * newMap = MapManager::Instance().CreateMap(newMapid, this, 0); - SetMap(newMap); - assert (GetMap()); - - if (oldMap != newMap) - { - UpdateForMap(oldMap); - UpdateForMap(newMap); - } -} - -bool Transport::AddPassenger(Player* passenger) -{ - if (m_passengers.insert(passenger).second) - sLog.outDetail("Player %s boarded transport %s.", passenger->GetName(), GetName()); - return true; -} - -bool Transport::RemovePassenger(Player* passenger) -{ - if (m_passengers.erase(passenger)) - sLog.outDetail("Player %s removed from transport %s.", passenger->GetName(), GetName()); - return true; -} - -void Transport::CheckForEvent(uint32 entry, uint32 wp_id) -{ - uint32 key = entry*100+wp_id; - if (objmgr.TransportEventMap.find(key) != objmgr.TransportEventMap.end()) - GetMap()->ScriptsStart(sEventScripts, objmgr.TransportEventMap[key], this, NULL); -} - -void Transport::Update(uint32 /*p_time*/) -{ - if (m_WayPoints.size() <= 1) - return; - - m_timer = getMSTime() % m_period; - while (((m_timer - m_curr->first) % m_pathTime) > ((m_next->first - m_curr->first) % m_pathTime)) - { - m_curr = GetNextWayPoint(); - m_next = GetNextWayPoint(); - - // first check help in case client-server transport coordinates de-synchronization - if (m_curr->second.mapid != GetMapId() || m_curr->second.teleport) - { - TeleportTransport(m_curr->second.mapid, m_curr->second.x, m_curr->second.y, m_curr->second.z); - } - else - { - Relocate(m_curr->second.x, m_curr->second.y, m_curr->second.z); - } -/* - if (m_curr->second.delayed) - { - switch (GetEntry()) - { - case 176495: - case 164871: - case 175080: - SendPlaySound(11804, false); break; // ZeppelinDocked - case 20808: - case 181646: - case 176231: - case 176244: - case 176310: - case 177233: - SendPlaySound(5495, false);break; // BoatDockingWarning - default: - SendPlaySound(5154, false); break; // ShipDocked - } - } -*/ - /* - for (PlayerSet::const_iterator itr = m_passengers.begin(); itr != m_passengers.end();) - { - PlayerSet::const_iterator it2 = itr; - ++itr; - //(*it2)->SetPosition(m_curr->second.x + (*it2)->GetTransOffsetX(), m_curr->second.y + (*it2)->GetTransOffsetY(), m_curr->second.z + (*it2)->GetTransOffsetZ(), (*it2)->GetTransOffsetO()); - } - */ - - m_nextNodeTime = m_curr->first; - - if (m_curr == m_WayPoints.begin() && (sLog.getLogFilter() & LOG_FILTER_TRANSPORT_MOVES) == 0) - sLog.outDetail(" ************ BEGIN ************** %s", this->m_name.c_str()); - - if ((sLog.getLogFilter() & LOG_FILTER_TRANSPORT_MOVES) == 0) - sLog.outDetail("%s moved to %d %f %f %f %d", this->m_name.c_str(), m_curr->second.id, m_curr->second.x, m_curr->second.y, m_curr->second.z, m_curr->second.mapid); - - //Transport Event System - CheckForEvent(this->GetEntry(), m_curr->second.id); - } -} - -void Transport::UpdateForMap(Map const* targetMap) -{ - Map::PlayerList const& pl = targetMap->GetPlayers(); - if (pl.isEmpty()) - return; - - if (GetMapId() == targetMap->GetId()) - { - for (Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr) - { - if (this != itr->getSource()->GetTransport()) - { - UpdateData transData; - BuildCreateUpdateBlockForPlayer(&transData, itr->getSource()); - WorldPacket packet; - transData.BuildPacket(&packet); - itr->getSource()->SendDirectMessage(&packet); - } - } - } - else - { - UpdateData transData; - BuildOutOfRangeUpdateBlock(&transData); - WorldPacket out_packet; - transData.BuildPacket(&out_packet); - - for (Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr) - if (this != itr->getSource()->GetTransport()) - itr->getSource()->SendDirectMessage(&out_packet); - } -} - diff --git a/src/server/game/Entities/Transport/Transports.h b/src/server/game/Entities/Transport/Transports.h deleted file mode 100644 index 25b9ade1461..00000000000 --- a/src/server/game/Entities/Transport/Transports.h +++ /dev/null @@ -1,108 +0,0 @@ -/* - * Copyright (C) 2005-2009 MaNGOS - * - * Copyright (C) 2008-2010 Trinity - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef TRANSPORTS_H -#define TRANSPORTS_H - -#include "GameObject.h" - -#include -#include -#include - -class TransportPath -{ - public: - struct PathNode - { - uint32 mapid; - float x,y,z; - uint32 actionFlag; - uint32 delay; - }; - - void SetLength(const unsigned int sz) - { - i_nodes.resize(sz); - } - - unsigned int Size(void) const { return i_nodes.size(); } - bool Empty(void) const { return i_nodes.empty(); } - void Resize(unsigned int sz) { i_nodes.resize(sz); } - void Clear(void) { i_nodes.clear(); } - PathNode* GetNodes(void) { return static_cast(&i_nodes[0]); } - - PathNode& operator[](const unsigned int idx) { return i_nodes[idx]; } - const PathNode& operator()(const unsigned int idx) const { return i_nodes[idx]; } - - protected: - std::vector i_nodes; -}; - -class Transport : public GameObject -{ - public: - explicit Transport(); - - bool Create(uint32 guidlow, uint32 mapid, float x, float y, float z, float ang, uint32 animprogress, uint32 dynflags); - bool GenerateWaypoints(uint32 pathid, std::set &mapids); - void Update(uint32 p_time); - bool AddPassenger(Player* passenger); - bool RemovePassenger(Player* passenger); - void CheckForEvent(uint32 entry, uint32 wp_id); - - typedef std::set PlayerSet; - PlayerSet const& GetPassengers() const { return m_passengers; } - - private: - struct WayPoint - { - WayPoint() : mapid(0), x(0), y(0), z(0), teleport(false), id(0) {} - WayPoint(uint32 _mapid, float _x, float _y, float _z, bool _teleport, uint32 _id) : - mapid(_mapid), x(_x), y(_y), z(_z), teleport(_teleport), id(_id) {} - uint32 mapid; - float x; - float y; - float z; - bool teleport; - uint32 id; - }; - - typedef std::map WayPointMap; - - WayPointMap::const_iterator m_curr; - WayPointMap::const_iterator m_next; - uint32 m_pathTime; - uint32 m_timer; - - PlayerSet m_passengers; - - public: - WayPointMap m_WayPoints; - uint32 m_nextNodeTime; - uint32 m_period; - - private: - void TeleportTransport(uint32 newMapid, float x, float y, float z); - void UpdateForMap(Map const* map); - WayPointMap::const_iterator GetNextWayPoint(); -}; -#endif - -- cgit v1.2.3 From 6b33457e505e3900a6adfd0724072a628cc7224d Mon Sep 17 00:00:00 2001 From: XTZGZoReX Date: Mon, 7 Jun 2010 01:38:11 +0200 Subject: * Rename BIH.cpp/.h to BoundingIntervalHierarchy.cpp/.h. --HG-- branch : trunk --- src/server/game/CollisionDetection/BIH.cpp | 304 ---------------- src/server/game/CollisionDetection/BIH.h | 391 --------------------- .../BoundingIntervalHierarchy.cpp | 304 ++++++++++++++++ .../CollisionDetection/BoundingIntervalHierarchy.h | 391 +++++++++++++++++++++ 4 files changed, 695 insertions(+), 695 deletions(-) delete mode 100644 src/server/game/CollisionDetection/BIH.cpp delete mode 100644 src/server/game/CollisionDetection/BIH.h create mode 100644 src/server/game/CollisionDetection/BoundingIntervalHierarchy.cpp create mode 100644 src/server/game/CollisionDetection/BoundingIntervalHierarchy.h (limited to 'src') diff --git a/src/server/game/CollisionDetection/BIH.cpp b/src/server/game/CollisionDetection/BIH.cpp deleted file mode 100644 index 4bd6b3c701e..00000000000 --- a/src/server/game/CollisionDetection/BIH.cpp +++ /dev/null @@ -1,304 +0,0 @@ -/* - * Copyright (C) 2005-2010 MaNGOS - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "BIH.h" - -void BIH::buildHierarchy(std::vector &tempTree, buildData &dat, BuildStats &stats) -{ - // create space for the first node - tempTree.push_back(3 << 30); // dummy leaf - tempTree.insert(tempTree.end(), 2, 0); - //tempTree.add(0); - - // seed bbox - AABound gridBox = { bounds.low(), bounds.high() }; - AABound nodeBox = gridBox; - // seed subdivide function - subdivide(0, dat.numPrims - 1, tempTree, dat, gridBox, nodeBox, 0, 1, stats); -} - -void BIH::subdivide(int left, int right, std::vector &tempTree, buildData &dat, AABound &gridBox, AABound &nodeBox, int nodeIndex, int depth, BuildStats &stats) -{ - if ((right - left + 1) <= dat.maxPrims || depth >= MAX_STACK_SIZE) - { - // write leaf node - stats.updateLeaf(depth, right - left + 1); - createNode(tempTree, nodeIndex, left, right); - return; - } - // calculate extents - int axis = -1, prevAxis, rightOrig; - float clipL = G3D::fnan(), clipR = G3D::fnan(), prevClip = G3D::fnan(); - float split = G3D::fnan(), prevSplit; - bool wasLeft = true; - while (true) - { - prevAxis = axis; - prevSplit = split; - // perform quick consistency checks - Vector3 d( gridBox.hi - gridBox.lo ); - if (d.x < 0 || d.y < 0 || d.z < 0) - throw std::logic_error("negative node extents"); - for (int i = 0; i < 3; i++) - { - if (nodeBox.hi[i] < gridBox.lo[i] || nodeBox.lo[i] > gridBox.hi[i]) - { - //UI.printError(Module.ACCEL, "Reached tree area in error - discarding node with: %d objects", right - left + 1); - throw std::logic_error("invalid node overlap"); - } - } - // find longest axis - axis = d.primaryAxis(); - split = 0.5f * (gridBox.lo[axis] + gridBox.hi[axis]); - // partition L/R subsets - clipL = -G3D::inf(); - clipR = G3D::inf(); - rightOrig = right; // save this for later - float nodeL = G3D::inf(); - float nodeR = -G3D::inf(); - for (int i = left; i <= right;) - { - int obj = dat.indices[i]; - float minb = dat.primBound[obj].low()[axis]; - float maxb = dat.primBound[obj].high()[axis]; - float center = (minb + maxb) * 0.5f; - if (center <= split) - { - // stay left - i++; - if (clipL < maxb) - clipL = maxb; - } - else - { - // move to the right most - int t = dat.indices[i]; - dat.indices[i] = dat.indices[right]; - dat.indices[right] = t; - right--; - if (clipR > minb) - clipR = minb; - } - nodeL = std::min(nodeL, minb); - nodeR = std::max(nodeR, maxb); - } - // check for empty space - if (nodeL > nodeBox.lo[axis] && nodeR < nodeBox.hi[axis]) - { - float nodeBoxW = nodeBox.hi[axis] - nodeBox.lo[axis]; - float nodeNewW = nodeR - nodeL; - // node box is too big compare to space occupied by primitives? - if (1.3f * nodeNewW < nodeBoxW) - { - stats.updateBVH2(); - int nextIndex = tempTree.size(); - // allocate child - tempTree.push_back(0); - tempTree.push_back(0); - tempTree.push_back(0); - // write bvh2 clip node - stats.updateInner(); - tempTree[nodeIndex + 0] = (axis << 30) | (1 << 29) | nextIndex; - tempTree[nodeIndex + 1] = floatToRawIntBits(nodeL); - tempTree[nodeIndex + 2] = floatToRawIntBits(nodeR); - // update nodebox and recurse - nodeBox.lo[axis] = nodeL; - nodeBox.hi[axis] = nodeR; - subdivide(left, rightOrig, tempTree, dat, gridBox, nodeBox, nextIndex, depth + 1, stats); - return; - } - } - // ensure we are making progress in the subdivision - if (right == rightOrig) - { - // all left - if (prevAxis == axis && prevSplit == split) { - // we are stuck here - create a leaf - stats.updateLeaf(depth, right - left + 1); - createNode(tempTree, nodeIndex, left, right); - return; - } - if (clipL <= split) { - // keep looping on left half - gridBox.hi[axis] = split; - prevClip = clipL; - wasLeft = true; - continue; - } - gridBox.hi[axis] = split; - prevClip = G3D::fnan(); - } - else if (left > right) - { - // all right - if (prevAxis == axis && prevSplit == split) { - // we are stuck here - create a leaf - stats.updateLeaf(depth, right - left + 1); - createNode(tempTree, nodeIndex, left, right); - return; - } - right = rightOrig; - if (clipR >= split) { - // keep looping on right half - gridBox.lo[axis] = split; - prevClip = clipR; - wasLeft = false; - continue; - } - gridBox.lo[axis] = split; - prevClip = G3D::fnan(); - } - else - { - // we are actually splitting stuff - if (prevAxis != -1 && !isnan(prevClip)) - { - // second time through - lets create the previous split - // since it produced empty space - int nextIndex = tempTree.size(); - // allocate child node - tempTree.push_back(0); - tempTree.push_back(0); - tempTree.push_back(0); - if (wasLeft) { - // create a node with a left child - // write leaf node - stats.updateInner(); - tempTree[nodeIndex + 0] = (prevAxis << 30) | nextIndex; - tempTree[nodeIndex + 1] = floatToRawIntBits(prevClip); - tempTree[nodeIndex + 2] = floatToRawIntBits(G3D::inf()); - } else { - // create a node with a right child - // write leaf node - stats.updateInner(); - tempTree[nodeIndex + 0] = (prevAxis << 30) | (nextIndex - 3); - tempTree[nodeIndex + 1] = floatToRawIntBits(-G3D::inf()); - tempTree[nodeIndex + 2] = floatToRawIntBits(prevClip); - } - // count stats for the unused leaf - depth++; - stats.updateLeaf(depth, 0); - // now we keep going as we are, with a new nodeIndex: - nodeIndex = nextIndex; - } - break; - } - } - // compute index of child nodes - int nextIndex = tempTree.size(); - // allocate left node - int nl = right - left + 1; - int nr = rightOrig - (right + 1) + 1; - if (nl > 0) { - tempTree.push_back(0); - tempTree.push_back(0); - tempTree.push_back(0); - } else - nextIndex -= 3; - // allocate right node - if (nr > 0) { - tempTree.push_back(0); - tempTree.push_back(0); - tempTree.push_back(0); - } - // write leaf node - stats.updateInner(); - tempTree[nodeIndex + 0] = (axis << 30) | nextIndex; - tempTree[nodeIndex + 1] = floatToRawIntBits(clipL); - tempTree[nodeIndex + 2] = floatToRawIntBits(clipR); - // prepare L/R child boxes - AABound gridBoxL(gridBox), gridBoxR(gridBox); - AABound nodeBoxL(nodeBox), nodeBoxR(nodeBox); - gridBoxL.hi[axis] = gridBoxR.lo[axis] = split; - nodeBoxL.hi[axis] = clipL; - nodeBoxR.lo[axis] = clipR; - // recurse - if (nl > 0) - subdivide(left, right, tempTree, dat, gridBoxL, nodeBoxL, nextIndex, depth + 1, stats); - else - stats.updateLeaf(depth + 1, 0); - if (nr > 0) - subdivide(right + 1, rightOrig, tempTree, dat, gridBoxR, nodeBoxR, nextIndex + 3, depth + 1, stats); - else - stats.updateLeaf(depth + 1, 0); -} - -bool BIH::writeToFile(FILE *wf) const -{ - uint32 treeSize = tree.size(); - uint32 check=0, count=0; - check += fwrite(&bounds.low(), sizeof(float), 3, wf); - check += fwrite(&bounds.high(), sizeof(float), 3, wf); - check += fwrite(&treeSize, sizeof(uint32), 1, wf); - check += fwrite(&tree[0], sizeof(uint32), treeSize, wf); - count = objects.size(); - check += fwrite(&count, sizeof(uint32), 1, wf); - check += fwrite(&objects[0], sizeof(uint32), count, wf); - return check == (3 + 3 + 2 + treeSize + count); -} - -bool BIH::readFromFile(FILE *rf) -{ - uint32 treeSize; - Vector3 lo, hi; - uint32 check=0, count=0; - check += fread(&lo, sizeof(float), 3, rf); - check += fread(&hi, sizeof(float), 3, rf); - bounds = AABox(lo, hi); - check += fread(&treeSize, sizeof(uint32), 1, rf); - tree.resize(treeSize); - check += fread(&tree[0], sizeof(uint32), treeSize, rf); - check += fread(&count, sizeof(uint32), 1, rf); - objects.resize(count); // = new uint32[nObjects]; - check += fread(&objects[0], sizeof(uint32), count, rf); - return check == (3 + 3 + 2 + treeSize + count); -} - -void BIH::BuildStats::updateLeaf(int depth, int n) -{ - numLeaves++; - minDepth = std::min(depth, minDepth); - maxDepth = std::max(depth, maxDepth); - sumDepth += depth; - minObjects = std::min(n, minObjects); - maxObjects = std::max(n, maxObjects); - sumObjects += n; - int nl = std::min(n, 5); - ++numLeavesN[nl]; -} - -void BIH::BuildStats::printStats() -{ - printf("Tree stats:\n"); - printf(" * Nodes: %d\n", numNodes); - printf(" * Leaves: %d\n", numLeaves); - printf(" * Objects: min %d\n", minObjects); - printf(" avg %.2f\n", (float) sumObjects / numLeaves); - printf(" avg(n>0) %.2f\n", (float) sumObjects / (numLeaves - numLeavesN[0])); - printf(" max %d\n", maxObjects); - printf(" * Depth: min %d\n", minDepth); - printf(" avg %.2f\n", (float) sumDepth / numLeaves); - printf(" max %d\n", maxDepth); - printf(" * Leaves w/: N=0 %3d%%\n", 100 * numLeavesN[0] / numLeaves); - printf(" N=1 %3d%%\n", 100 * numLeavesN[1] / numLeaves); - printf(" N=2 %3d%%\n", 100 * numLeavesN[2] / numLeaves); - printf(" N=3 %3d%%\n", 100 * numLeavesN[3] / numLeaves); - printf(" N=4 %3d%%\n", 100 * numLeavesN[4] / numLeaves); - printf(" N>4 %3d%%\n", 100 * numLeavesN[5] / numLeaves); - printf(" * BVH2 nodes: %d (%3d%%)\n", numBVH2, 100 * numBVH2 / (numNodes + numLeaves - 2 * numBVH2)); -} diff --git a/src/server/game/CollisionDetection/BIH.h b/src/server/game/CollisionDetection/BIH.h deleted file mode 100644 index 15ae90c23eb..00000000000 --- a/src/server/game/CollisionDetection/BIH.h +++ /dev/null @@ -1,391 +0,0 @@ -/* - * Copyright (C) 2005-2010 MaNGOS - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef _BIH_H -#define _BIH_H - -#include -#include -#include - -#include - -#include -#include -#include -#include -#include - -#define MAX_STACK_SIZE 64 - -#ifdef _MSC_VER - #define isnan(x) _isnan(x) -#endif - -using G3D::Vector3; -using G3D::AABox; -using G3D::Ray; - -static inline uint32 floatToRawIntBits(float f) -{ - union - { - uint32 ival; - float fval; - } temp; - temp.fval=f; - return temp.ival; -} - -static inline float intBitsToFloat(uint32 i) -{ - union - { - uint32 ival; - float fval; - } temp; - temp.ival=i; - return temp.fval; -} - -struct AABound -{ - Vector3 lo, hi; -}; - -/** Bounding Interval Hierarchy Class. - Building and Ray-Intersection functions based on BIH from - Sunflow, a Java Raytracer, released under MIT/X11 License - http://sunflow.sourceforge.net/ - Copyright (c) 2003-2007 Christopher Kulla -*/ - -class BIH -{ - public: - BIH() {}; - template< class T, class BoundsFunc > - void build(const std::vector &primitives, BoundsFunc &getBounds, uint32 leafSize = 3, bool printStats=false) - { - if(primitives.size() == 0) - return; - buildData dat; - dat.maxPrims = leafSize; - dat.numPrims = primitives.size(); - dat.indices = new uint32[dat.numPrims]; - dat.primBound = new AABox[dat.numPrims]; - getBounds(primitives[0], bounds); - for (uint32 i=0; i tempTree; - BuildStats stats; - buildHierarchy(tempTree, dat, stats); - if (printStats) - stats.printStats(); - - objects.resize(dat.numPrims); - for (uint32 i=0; i - void intersectRay(const Ray &r, RayCallback& intersectCallback, float &maxDist, bool stopAtFirst=false) const - { - float intervalMin = 0.f; - float intervalMax = maxDist; - Vector3 org = r.origin(); - Vector3 dir = r.direction(); - Vector3 invDir; - float t1, t2; - for(int i=0; i<3; ++i) - { - invDir[i] = 1.f / dir[i]; - t1 = (bounds.low()[i] - org[i]) * invDir[i]; - t2 = (bounds.high()[i] - org[i]) * invDir[i]; - if (invDir[i] > 0) { - if (t1 > intervalMin) - intervalMin = t1; - if (t2 < intervalMax) - intervalMax = t2; - } else { - if (t2 > intervalMin) - intervalMin = t2; - if (t1 < intervalMax) - intervalMax = t1; - } - if (intervalMin > intervalMax) - return; - } - - uint32 offsetFront[3]; - uint32 offsetBack[3]; - uint32 offsetFront3[3]; - uint32 offsetBack3[3]; - // compute custom offsets from direction sign bit - - for(int i=0; i<3; ++i) - { - offsetFront[i] = floatToRawIntBits(dir[i]) >> 31; - offsetBack[i] = offsetFront[i] ^ 1; - offsetFront3[i] = offsetFront[i] * 3; - offsetBack3[i] = offsetBack[i] * 3; - - // avoid always adding 1 during the inner loop - ++offsetFront[i]; - ++offsetBack[i]; - } - - StackNode stack[MAX_STACK_SIZE]; - int stackPos = 0; - int node = 0; - - while (true) { - while (true) - { - uint32 tn = tree[node]; - uint32 axis = (tn & (3 << 30)) >> 30; - bool BVH2 = tn & (1 << 29); - int offset = tn & ~(7 << 29); - if (!BVH2) - { - if (axis < 3) - { - // "normal" interior node - float tf = (intBitsToFloat(tree[node + offsetFront[axis]]) - org[axis]) * invDir[axis]; - float tb = (intBitsToFloat(tree[node + offsetBack[axis]]) - org[axis]) * invDir[axis]; - // ray passes between clip zones - if (tf < intervalMin && tb > intervalMax) - break; - int back = offset + offsetBack3[axis]; - node = back; - // ray passes through far node only - if (tf < intervalMin) { - intervalMin = (tb >= intervalMin) ? tb : intervalMin; - continue; - } - node = offset + offsetFront3[axis]; // front - // ray passes through near node only - if (tb > intervalMax) { - intervalMax = (tf <= intervalMax) ? tf : intervalMax; - continue; - } - // ray passes through both nodes - // push back node - stack[stackPos].node = back; - stack[stackPos].tnear = (tb >= intervalMin) ? tb : intervalMin; - stack[stackPos].tfar = intervalMax; - stackPos++; - // update ray interval for front node - intervalMax = (tf <= intervalMax) ? tf : intervalMax; - continue; - } - else - { - // leaf - test some objects - int n = tree[node + 1]; - while (n > 0) { - bool hit = intersectCallback(r, objects[offset], maxDist, stopAtFirst); - if(stopAtFirst && hit) return; - --n; - ++offset; - } - break; - } - } - else - { - if (axis>2) - return; // should not happen - float tf = (intBitsToFloat(tree[node + offsetFront[axis]]) - org[axis]) * invDir[axis]; - float tb = (intBitsToFloat(tree[node + offsetBack[axis]]) - org[axis]) * invDir[axis]; - node = offset; - intervalMin = (tf >= intervalMin) ? tf : intervalMin; - intervalMax = (tb <= intervalMax) ? tb : intervalMax; - if (intervalMin > intervalMax) - break; - continue; - } - } // traversal loop - do - { - // stack is empty? - if (stackPos == 0) - return; - // move back up the stack - stackPos--; - intervalMin = stack[stackPos].tnear; - if (maxDist < intervalMin) - continue; - node = stack[stackPos].node; - intervalMax = stack[stackPos].tfar; - break; - } while (true); - } - } - - template - void intersectPoint(const Vector3 &p, IsectCallback& intersectCallback) const - { - if (!bounds.contains(p)) - return; - - StackNode stack[MAX_STACK_SIZE]; - int stackPos = 0; - int node = 0; - - while (true) { - while (true) - { - uint32 tn = tree[node]; - uint32 axis = (tn & (3 << 30)) >> 30; - bool BVH2 = tn & (1 << 29); - int offset = tn & ~(7 << 29); - if (!BVH2) - { - if (axis < 3) - { - // "normal" interior node - float tl = intBitsToFloat(tree[node + 1]); - float tr = intBitsToFloat(tree[node + 2]); - // point is between clip zones - if (tl < p[axis] && tr > p[axis]) - break; - int right = offset + 3; - node = right; - // point is in right node only - if (tl < p[axis]) { - continue; - } - node = offset; // left - // point is in left node only - if (tr > p[axis]) { - continue; - } - // point is in both nodes - // push back right node - stack[stackPos].node = right; - stackPos++; - continue; - } - else - { - // leaf - test some objects - int n = tree[node + 1]; - while (n > 0) { - intersectCallback(p, objects[offset]); // !!! - --n; - ++offset; - } - break; - } - } - else // BVH2 node (empty space cut off left and right) - { - if (axis>2) - return; // should not happen - float tl = intBitsToFloat(tree[node + 1]); - float tr = intBitsToFloat(tree[node + 2]); - node = offset; - if (tl > p[axis] || tr < p[axis]) - break; - continue; - } - } // traversal loop - - // stack is empty? - if (stackPos == 0) - return; - // move back up the stack - stackPos--; - node = stack[stackPos].node; - } - } - - bool writeToFile(FILE *wf) const; - bool readFromFile(FILE *rf); - - protected: - std::vector tree; - std::vector objects; - AABox bounds; - - struct buildData - { - uint32 *indices; - AABox *primBound; - uint32 numPrims; - int maxPrims; - }; - struct StackNode - { - uint32 node; - float tnear; - float tfar; - }; - - class BuildStats - { - private: - int numNodes; - int numLeaves; - int sumObjects; - int minObjects; - int maxObjects; - int sumDepth; - int minDepth; - int maxDepth; - int numLeavesN[6]; - int numBVH2; - - public: - BuildStats(): - numNodes(0), numLeaves(0), sumObjects(0), minObjects(0x0FFFFFFF), - maxObjects(0xFFFFFFFF), sumDepth(0), minDepth(0x0FFFFFFF), - maxDepth(0xFFFFFFFF), numBVH2(0) - { - for(int i=0; i<6; ++i) numLeavesN[i] = 0; - } - - void updateInner() { numNodes++; } - void updateBVH2() { numBVH2++; } - void updateLeaf(int depth, int n); - void printStats(); - }; - - void buildHierarchy(std::vector &tempTree, buildData &dat, BuildStats &stats); - - void createNode(std::vector &tempTree, int nodeIndex, uint32 left, uint32 right) { - // write leaf node - tempTree[nodeIndex + 0] = (3 << 30) | left; - tempTree[nodeIndex + 1] = right - left + 1; - } - - void subdivide(int left, int right, std::vector &tempTree, buildData &dat, AABound &gridBox, AABound &nodeBox, int nodeIndex, int depth, BuildStats &stats); -}; - -#endif // _BIH_H diff --git a/src/server/game/CollisionDetection/BoundingIntervalHierarchy.cpp b/src/server/game/CollisionDetection/BoundingIntervalHierarchy.cpp new file mode 100644 index 00000000000..4bd6b3c701e --- /dev/null +++ b/src/server/game/CollisionDetection/BoundingIntervalHierarchy.cpp @@ -0,0 +1,304 @@ +/* + * Copyright (C) 2005-2010 MaNGOS + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "BIH.h" + +void BIH::buildHierarchy(std::vector &tempTree, buildData &dat, BuildStats &stats) +{ + // create space for the first node + tempTree.push_back(3 << 30); // dummy leaf + tempTree.insert(tempTree.end(), 2, 0); + //tempTree.add(0); + + // seed bbox + AABound gridBox = { bounds.low(), bounds.high() }; + AABound nodeBox = gridBox; + // seed subdivide function + subdivide(0, dat.numPrims - 1, tempTree, dat, gridBox, nodeBox, 0, 1, stats); +} + +void BIH::subdivide(int left, int right, std::vector &tempTree, buildData &dat, AABound &gridBox, AABound &nodeBox, int nodeIndex, int depth, BuildStats &stats) +{ + if ((right - left + 1) <= dat.maxPrims || depth >= MAX_STACK_SIZE) + { + // write leaf node + stats.updateLeaf(depth, right - left + 1); + createNode(tempTree, nodeIndex, left, right); + return; + } + // calculate extents + int axis = -1, prevAxis, rightOrig; + float clipL = G3D::fnan(), clipR = G3D::fnan(), prevClip = G3D::fnan(); + float split = G3D::fnan(), prevSplit; + bool wasLeft = true; + while (true) + { + prevAxis = axis; + prevSplit = split; + // perform quick consistency checks + Vector3 d( gridBox.hi - gridBox.lo ); + if (d.x < 0 || d.y < 0 || d.z < 0) + throw std::logic_error("negative node extents"); + for (int i = 0; i < 3; i++) + { + if (nodeBox.hi[i] < gridBox.lo[i] || nodeBox.lo[i] > gridBox.hi[i]) + { + //UI.printError(Module.ACCEL, "Reached tree area in error - discarding node with: %d objects", right - left + 1); + throw std::logic_error("invalid node overlap"); + } + } + // find longest axis + axis = d.primaryAxis(); + split = 0.5f * (gridBox.lo[axis] + gridBox.hi[axis]); + // partition L/R subsets + clipL = -G3D::inf(); + clipR = G3D::inf(); + rightOrig = right; // save this for later + float nodeL = G3D::inf(); + float nodeR = -G3D::inf(); + for (int i = left; i <= right;) + { + int obj = dat.indices[i]; + float minb = dat.primBound[obj].low()[axis]; + float maxb = dat.primBound[obj].high()[axis]; + float center = (minb + maxb) * 0.5f; + if (center <= split) + { + // stay left + i++; + if (clipL < maxb) + clipL = maxb; + } + else + { + // move to the right most + int t = dat.indices[i]; + dat.indices[i] = dat.indices[right]; + dat.indices[right] = t; + right--; + if (clipR > minb) + clipR = minb; + } + nodeL = std::min(nodeL, minb); + nodeR = std::max(nodeR, maxb); + } + // check for empty space + if (nodeL > nodeBox.lo[axis] && nodeR < nodeBox.hi[axis]) + { + float nodeBoxW = nodeBox.hi[axis] - nodeBox.lo[axis]; + float nodeNewW = nodeR - nodeL; + // node box is too big compare to space occupied by primitives? + if (1.3f * nodeNewW < nodeBoxW) + { + stats.updateBVH2(); + int nextIndex = tempTree.size(); + // allocate child + tempTree.push_back(0); + tempTree.push_back(0); + tempTree.push_back(0); + // write bvh2 clip node + stats.updateInner(); + tempTree[nodeIndex + 0] = (axis << 30) | (1 << 29) | nextIndex; + tempTree[nodeIndex + 1] = floatToRawIntBits(nodeL); + tempTree[nodeIndex + 2] = floatToRawIntBits(nodeR); + // update nodebox and recurse + nodeBox.lo[axis] = nodeL; + nodeBox.hi[axis] = nodeR; + subdivide(left, rightOrig, tempTree, dat, gridBox, nodeBox, nextIndex, depth + 1, stats); + return; + } + } + // ensure we are making progress in the subdivision + if (right == rightOrig) + { + // all left + if (prevAxis == axis && prevSplit == split) { + // we are stuck here - create a leaf + stats.updateLeaf(depth, right - left + 1); + createNode(tempTree, nodeIndex, left, right); + return; + } + if (clipL <= split) { + // keep looping on left half + gridBox.hi[axis] = split; + prevClip = clipL; + wasLeft = true; + continue; + } + gridBox.hi[axis] = split; + prevClip = G3D::fnan(); + } + else if (left > right) + { + // all right + if (prevAxis == axis && prevSplit == split) { + // we are stuck here - create a leaf + stats.updateLeaf(depth, right - left + 1); + createNode(tempTree, nodeIndex, left, right); + return; + } + right = rightOrig; + if (clipR >= split) { + // keep looping on right half + gridBox.lo[axis] = split; + prevClip = clipR; + wasLeft = false; + continue; + } + gridBox.lo[axis] = split; + prevClip = G3D::fnan(); + } + else + { + // we are actually splitting stuff + if (prevAxis != -1 && !isnan(prevClip)) + { + // second time through - lets create the previous split + // since it produced empty space + int nextIndex = tempTree.size(); + // allocate child node + tempTree.push_back(0); + tempTree.push_back(0); + tempTree.push_back(0); + if (wasLeft) { + // create a node with a left child + // write leaf node + stats.updateInner(); + tempTree[nodeIndex + 0] = (prevAxis << 30) | nextIndex; + tempTree[nodeIndex + 1] = floatToRawIntBits(prevClip); + tempTree[nodeIndex + 2] = floatToRawIntBits(G3D::inf()); + } else { + // create a node with a right child + // write leaf node + stats.updateInner(); + tempTree[nodeIndex + 0] = (prevAxis << 30) | (nextIndex - 3); + tempTree[nodeIndex + 1] = floatToRawIntBits(-G3D::inf()); + tempTree[nodeIndex + 2] = floatToRawIntBits(prevClip); + } + // count stats for the unused leaf + depth++; + stats.updateLeaf(depth, 0); + // now we keep going as we are, with a new nodeIndex: + nodeIndex = nextIndex; + } + break; + } + } + // compute index of child nodes + int nextIndex = tempTree.size(); + // allocate left node + int nl = right - left + 1; + int nr = rightOrig - (right + 1) + 1; + if (nl > 0) { + tempTree.push_back(0); + tempTree.push_back(0); + tempTree.push_back(0); + } else + nextIndex -= 3; + // allocate right node + if (nr > 0) { + tempTree.push_back(0); + tempTree.push_back(0); + tempTree.push_back(0); + } + // write leaf node + stats.updateInner(); + tempTree[nodeIndex + 0] = (axis << 30) | nextIndex; + tempTree[nodeIndex + 1] = floatToRawIntBits(clipL); + tempTree[nodeIndex + 2] = floatToRawIntBits(clipR); + // prepare L/R child boxes + AABound gridBoxL(gridBox), gridBoxR(gridBox); + AABound nodeBoxL(nodeBox), nodeBoxR(nodeBox); + gridBoxL.hi[axis] = gridBoxR.lo[axis] = split; + nodeBoxL.hi[axis] = clipL; + nodeBoxR.lo[axis] = clipR; + // recurse + if (nl > 0) + subdivide(left, right, tempTree, dat, gridBoxL, nodeBoxL, nextIndex, depth + 1, stats); + else + stats.updateLeaf(depth + 1, 0); + if (nr > 0) + subdivide(right + 1, rightOrig, tempTree, dat, gridBoxR, nodeBoxR, nextIndex + 3, depth + 1, stats); + else + stats.updateLeaf(depth + 1, 0); +} + +bool BIH::writeToFile(FILE *wf) const +{ + uint32 treeSize = tree.size(); + uint32 check=0, count=0; + check += fwrite(&bounds.low(), sizeof(float), 3, wf); + check += fwrite(&bounds.high(), sizeof(float), 3, wf); + check += fwrite(&treeSize, sizeof(uint32), 1, wf); + check += fwrite(&tree[0], sizeof(uint32), treeSize, wf); + count = objects.size(); + check += fwrite(&count, sizeof(uint32), 1, wf); + check += fwrite(&objects[0], sizeof(uint32), count, wf); + return check == (3 + 3 + 2 + treeSize + count); +} + +bool BIH::readFromFile(FILE *rf) +{ + uint32 treeSize; + Vector3 lo, hi; + uint32 check=0, count=0; + check += fread(&lo, sizeof(float), 3, rf); + check += fread(&hi, sizeof(float), 3, rf); + bounds = AABox(lo, hi); + check += fread(&treeSize, sizeof(uint32), 1, rf); + tree.resize(treeSize); + check += fread(&tree[0], sizeof(uint32), treeSize, rf); + check += fread(&count, sizeof(uint32), 1, rf); + objects.resize(count); // = new uint32[nObjects]; + check += fread(&objects[0], sizeof(uint32), count, rf); + return check == (3 + 3 + 2 + treeSize + count); +} + +void BIH::BuildStats::updateLeaf(int depth, int n) +{ + numLeaves++; + minDepth = std::min(depth, minDepth); + maxDepth = std::max(depth, maxDepth); + sumDepth += depth; + minObjects = std::min(n, minObjects); + maxObjects = std::max(n, maxObjects); + sumObjects += n; + int nl = std::min(n, 5); + ++numLeavesN[nl]; +} + +void BIH::BuildStats::printStats() +{ + printf("Tree stats:\n"); + printf(" * Nodes: %d\n", numNodes); + printf(" * Leaves: %d\n", numLeaves); + printf(" * Objects: min %d\n", minObjects); + printf(" avg %.2f\n", (float) sumObjects / numLeaves); + printf(" avg(n>0) %.2f\n", (float) sumObjects / (numLeaves - numLeavesN[0])); + printf(" max %d\n", maxObjects); + printf(" * Depth: min %d\n", minDepth); + printf(" avg %.2f\n", (float) sumDepth / numLeaves); + printf(" max %d\n", maxDepth); + printf(" * Leaves w/: N=0 %3d%%\n", 100 * numLeavesN[0] / numLeaves); + printf(" N=1 %3d%%\n", 100 * numLeavesN[1] / numLeaves); + printf(" N=2 %3d%%\n", 100 * numLeavesN[2] / numLeaves); + printf(" N=3 %3d%%\n", 100 * numLeavesN[3] / numLeaves); + printf(" N=4 %3d%%\n", 100 * numLeavesN[4] / numLeaves); + printf(" N>4 %3d%%\n", 100 * numLeavesN[5] / numLeaves); + printf(" * BVH2 nodes: %d (%3d%%)\n", numBVH2, 100 * numBVH2 / (numNodes + numLeaves - 2 * numBVH2)); +} diff --git a/src/server/game/CollisionDetection/BoundingIntervalHierarchy.h b/src/server/game/CollisionDetection/BoundingIntervalHierarchy.h new file mode 100644 index 00000000000..15ae90c23eb --- /dev/null +++ b/src/server/game/CollisionDetection/BoundingIntervalHierarchy.h @@ -0,0 +1,391 @@ +/* + * Copyright (C) 2005-2010 MaNGOS + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef _BIH_H +#define _BIH_H + +#include +#include +#include + +#include + +#include +#include +#include +#include +#include + +#define MAX_STACK_SIZE 64 + +#ifdef _MSC_VER + #define isnan(x) _isnan(x) +#endif + +using G3D::Vector3; +using G3D::AABox; +using G3D::Ray; + +static inline uint32 floatToRawIntBits(float f) +{ + union + { + uint32 ival; + float fval; + } temp; + temp.fval=f; + return temp.ival; +} + +static inline float intBitsToFloat(uint32 i) +{ + union + { + uint32 ival; + float fval; + } temp; + temp.ival=i; + return temp.fval; +} + +struct AABound +{ + Vector3 lo, hi; +}; + +/** Bounding Interval Hierarchy Class. + Building and Ray-Intersection functions based on BIH from + Sunflow, a Java Raytracer, released under MIT/X11 License + http://sunflow.sourceforge.net/ + Copyright (c) 2003-2007 Christopher Kulla +*/ + +class BIH +{ + public: + BIH() {}; + template< class T, class BoundsFunc > + void build(const std::vector &primitives, BoundsFunc &getBounds, uint32 leafSize = 3, bool printStats=false) + { + if(primitives.size() == 0) + return; + buildData dat; + dat.maxPrims = leafSize; + dat.numPrims = primitives.size(); + dat.indices = new uint32[dat.numPrims]; + dat.primBound = new AABox[dat.numPrims]; + getBounds(primitives[0], bounds); + for (uint32 i=0; i tempTree; + BuildStats stats; + buildHierarchy(tempTree, dat, stats); + if (printStats) + stats.printStats(); + + objects.resize(dat.numPrims); + for (uint32 i=0; i + void intersectRay(const Ray &r, RayCallback& intersectCallback, float &maxDist, bool stopAtFirst=false) const + { + float intervalMin = 0.f; + float intervalMax = maxDist; + Vector3 org = r.origin(); + Vector3 dir = r.direction(); + Vector3 invDir; + float t1, t2; + for(int i=0; i<3; ++i) + { + invDir[i] = 1.f / dir[i]; + t1 = (bounds.low()[i] - org[i]) * invDir[i]; + t2 = (bounds.high()[i] - org[i]) * invDir[i]; + if (invDir[i] > 0) { + if (t1 > intervalMin) + intervalMin = t1; + if (t2 < intervalMax) + intervalMax = t2; + } else { + if (t2 > intervalMin) + intervalMin = t2; + if (t1 < intervalMax) + intervalMax = t1; + } + if (intervalMin > intervalMax) + return; + } + + uint32 offsetFront[3]; + uint32 offsetBack[3]; + uint32 offsetFront3[3]; + uint32 offsetBack3[3]; + // compute custom offsets from direction sign bit + + for(int i=0; i<3; ++i) + { + offsetFront[i] = floatToRawIntBits(dir[i]) >> 31; + offsetBack[i] = offsetFront[i] ^ 1; + offsetFront3[i] = offsetFront[i] * 3; + offsetBack3[i] = offsetBack[i] * 3; + + // avoid always adding 1 during the inner loop + ++offsetFront[i]; + ++offsetBack[i]; + } + + StackNode stack[MAX_STACK_SIZE]; + int stackPos = 0; + int node = 0; + + while (true) { + while (true) + { + uint32 tn = tree[node]; + uint32 axis = (tn & (3 << 30)) >> 30; + bool BVH2 = tn & (1 << 29); + int offset = tn & ~(7 << 29); + if (!BVH2) + { + if (axis < 3) + { + // "normal" interior node + float tf = (intBitsToFloat(tree[node + offsetFront[axis]]) - org[axis]) * invDir[axis]; + float tb = (intBitsToFloat(tree[node + offsetBack[axis]]) - org[axis]) * invDir[axis]; + // ray passes between clip zones + if (tf < intervalMin && tb > intervalMax) + break; + int back = offset + offsetBack3[axis]; + node = back; + // ray passes through far node only + if (tf < intervalMin) { + intervalMin = (tb >= intervalMin) ? tb : intervalMin; + continue; + } + node = offset + offsetFront3[axis]; // front + // ray passes through near node only + if (tb > intervalMax) { + intervalMax = (tf <= intervalMax) ? tf : intervalMax; + continue; + } + // ray passes through both nodes + // push back node + stack[stackPos].node = back; + stack[stackPos].tnear = (tb >= intervalMin) ? tb : intervalMin; + stack[stackPos].tfar = intervalMax; + stackPos++; + // update ray interval for front node + intervalMax = (tf <= intervalMax) ? tf : intervalMax; + continue; + } + else + { + // leaf - test some objects + int n = tree[node + 1]; + while (n > 0) { + bool hit = intersectCallback(r, objects[offset], maxDist, stopAtFirst); + if(stopAtFirst && hit) return; + --n; + ++offset; + } + break; + } + } + else + { + if (axis>2) + return; // should not happen + float tf = (intBitsToFloat(tree[node + offsetFront[axis]]) - org[axis]) * invDir[axis]; + float tb = (intBitsToFloat(tree[node + offsetBack[axis]]) - org[axis]) * invDir[axis]; + node = offset; + intervalMin = (tf >= intervalMin) ? tf : intervalMin; + intervalMax = (tb <= intervalMax) ? tb : intervalMax; + if (intervalMin > intervalMax) + break; + continue; + } + } // traversal loop + do + { + // stack is empty? + if (stackPos == 0) + return; + // move back up the stack + stackPos--; + intervalMin = stack[stackPos].tnear; + if (maxDist < intervalMin) + continue; + node = stack[stackPos].node; + intervalMax = stack[stackPos].tfar; + break; + } while (true); + } + } + + template + void intersectPoint(const Vector3 &p, IsectCallback& intersectCallback) const + { + if (!bounds.contains(p)) + return; + + StackNode stack[MAX_STACK_SIZE]; + int stackPos = 0; + int node = 0; + + while (true) { + while (true) + { + uint32 tn = tree[node]; + uint32 axis = (tn & (3 << 30)) >> 30; + bool BVH2 = tn & (1 << 29); + int offset = tn & ~(7 << 29); + if (!BVH2) + { + if (axis < 3) + { + // "normal" interior node + float tl = intBitsToFloat(tree[node + 1]); + float tr = intBitsToFloat(tree[node + 2]); + // point is between clip zones + if (tl < p[axis] && tr > p[axis]) + break; + int right = offset + 3; + node = right; + // point is in right node only + if (tl < p[axis]) { + continue; + } + node = offset; // left + // point is in left node only + if (tr > p[axis]) { + continue; + } + // point is in both nodes + // push back right node + stack[stackPos].node = right; + stackPos++; + continue; + } + else + { + // leaf - test some objects + int n = tree[node + 1]; + while (n > 0) { + intersectCallback(p, objects[offset]); // !!! + --n; + ++offset; + } + break; + } + } + else // BVH2 node (empty space cut off left and right) + { + if (axis>2) + return; // should not happen + float tl = intBitsToFloat(tree[node + 1]); + float tr = intBitsToFloat(tree[node + 2]); + node = offset; + if (tl > p[axis] || tr < p[axis]) + break; + continue; + } + } // traversal loop + + // stack is empty? + if (stackPos == 0) + return; + // move back up the stack + stackPos--; + node = stack[stackPos].node; + } + } + + bool writeToFile(FILE *wf) const; + bool readFromFile(FILE *rf); + + protected: + std::vector tree; + std::vector objects; + AABox bounds; + + struct buildData + { + uint32 *indices; + AABox *primBound; + uint32 numPrims; + int maxPrims; + }; + struct StackNode + { + uint32 node; + float tnear; + float tfar; + }; + + class BuildStats + { + private: + int numNodes; + int numLeaves; + int sumObjects; + int minObjects; + int maxObjects; + int sumDepth; + int minDepth; + int maxDepth; + int numLeavesN[6]; + int numBVH2; + + public: + BuildStats(): + numNodes(0), numLeaves(0), sumObjects(0), minObjects(0x0FFFFFFF), + maxObjects(0xFFFFFFFF), sumDepth(0), minDepth(0x0FFFFFFF), + maxDepth(0xFFFFFFFF), numBVH2(0) + { + for(int i=0; i<6; ++i) numLeavesN[i] = 0; + } + + void updateInner() { numNodes++; } + void updateBVH2() { numBVH2++; } + void updateLeaf(int depth, int n); + void printStats(); + }; + + void buildHierarchy(std::vector &tempTree, buildData &dat, BuildStats &stats); + + void createNode(std::vector &tempTree, int nodeIndex, uint32 left, uint32 right) { + // write leaf node + tempTree[nodeIndex + 0] = (3 << 30) | left; + tempTree[nodeIndex + 1] = right - left + 1; + } + + void subdivide(int left, int right, std::vector &tempTree, buildData &dat, AABound &gridBox, AABound &nodeBox, int nodeIndex, int depth, BuildStats &stats); +}; + +#endif // _BIH_H -- cgit v1.2.3 From 770ae68e66266cccfae63cf07518d6bfa0dfd105 Mon Sep 17 00:00:00 2001 From: XTZGZoReX Date: Mon, 7 Jun 2010 01:51:25 +0200 Subject: * Rename vmap_assembler.cpp to VMapAssembler.cpp. --HG-- branch : trunk --- src/tools/vmap3_assembler/CMakeLists.txt | 4 +- src/tools/vmap3_assembler/VMapAssembler.cpp | 120 +++++++++++++++++++++++++++ src/tools/vmap3_assembler/splitConfig.txt | 21 ----- src/tools/vmap3_assembler/vmap_assembler.cpp | 120 --------------------------- 4 files changed, 122 insertions(+), 143 deletions(-) create mode 100644 src/tools/vmap3_assembler/VMapAssembler.cpp delete mode 100644 src/tools/vmap3_assembler/splitConfig.txt delete mode 100644 src/tools/vmap3_assembler/vmap_assembler.cpp (limited to 'src') diff --git a/src/tools/vmap3_assembler/CMakeLists.txt b/src/tools/vmap3_assembler/CMakeLists.txt index fd4994b67ed..42f9a972a25 100644 --- a/src/tools/vmap3_assembler/CMakeLists.txt +++ b/src/tools/vmap3_assembler/CMakeLists.txt @@ -67,7 +67,7 @@ add_library(g3dlite ../../dep/src/g3dlite/AABox.cpp ) add_library(vmap - ../../src/shared/vmap/BIH.cpp + ../../src/shared/vmap/BoundingIntervalHierarchy.cpp ../../src/shared/vmap/VMapManager2.cpp ../../src/shared/vmap/MapTree.cpp ../../src/shared/vmap/TileAssembler.cpp @@ -77,7 +77,7 @@ add_library(vmap target_link_libraries(vmap g3dlite z) -add_executable(vmap_assembler vmap_assembler.cpp) +add_executable(vmap_assembler VMapAssembler.cpp) target_link_libraries(vmap_assembler vmap) # add_executable(vmap_test coordinate_test.cpp) diff --git a/src/tools/vmap3_assembler/VMapAssembler.cpp b/src/tools/vmap3_assembler/VMapAssembler.cpp new file mode 100644 index 00000000000..6666b54356c --- /dev/null +++ b/src/tools/vmap3_assembler/VMapAssembler.cpp @@ -0,0 +1,120 @@ +#include +#include +#include + +#include "TileAssembler.h" + +//======================================================= +// remove last return or LF and tailing SPACE +// remove all char after a # + +void chompAndTrim(std::string& str) +{ + for(unsigned int i=0;i0) { + char lc = str[str.length()-1]; + if(lc == '\r' || lc == '\n' || lc == ' ') { + str = str.substr(0,str.length()-1); + } else { + break; + } + } +} + +//======================================================= +/** +This callback method is called for each model found in the dir file. +return true if it should be included in the vmap +*/ +bool modelNameFilter(char *pName) +{ +#if 0 + bool result; + result = !Wildcard::wildcardfit("*bush[0-9]*", pName); + if(result) result = !Wildcard::wildcardfit("*shrub[0-9]*", pName); + if(result) result = !Wildcard::wildcardfit("*_Bushes_*", pName); + if(result) result = !Wildcard::wildcardfit("*_Bush_*", pName); + if(!result) { + printf("%s",pName); + } +#endif + return true; +} + +//======================================================= +/** +File contains map names that should be split into tiles +A '#' at the beginning of a line defines a comment +*/ + +/* bool readConfigFile(char *pConffile, VMAP::TileAssembler* pTa) +{ + bool result = false; + char buffer[501]; + FILE *cf = fopen(pConffile, "rb"); + if(cf) { + while(fgets(buffer, 500, cf)) { + std::string name = std::string(buffer); + size_t pos = name.find_first_not_of(' '); + name = name.substr(pos); + chompAndTrim(name); // just to be sure + if(name[0] != '#' && name.size() >0) { // comment? + unsigned int mapId = atoi(name.c_str()); + pTa->addWorldAreaMapId(mapId); + } + } + fclose(cf); + result = true; + } + return(result); +} */ +//======================================================= +int main(int argc, char* argv[]) +{ + if(argc != 3 && argc != 4) + { + printf("\nusage: %s [config file name]\n", argv[0]); + return 1; + } + + char *src = argv[1]; + char *dest = argv[2]; + char *conffile = NULL; + if(argc >= 4) + conffile = argv[3]; + + VMAP::TileAssembler* ta = new VMAP::TileAssembler(std::string(src), std::string(dest)); + ta->setModelNameFilterMethod(modelNameFilter); + + /* + All the names in the list are considered to be world maps or huge instances. + These maps will be spilt into tiles in the vmap assemble process + */ + /* if(conffile != NULL) + { + if(!readConfigFile(conffile, ta)) + { + printf("Can not open file config file: %s\n", conffile); + delete ta; + return 1; + } + } */ + + if(!ta->convertWorld2()) + { + printf("exit with errors\n"); + delete ta; + return 1; + } + + delete ta; + printf("Ok, all done\n"); + return 0; +} diff --git a/src/tools/vmap3_assembler/splitConfig.txt b/src/tools/vmap3_assembler/splitConfig.txt deleted file mode 100644 index 8d217b8e967..00000000000 --- a/src/tools/vmap3_assembler/splitConfig.txt +++ /dev/null @@ -1,21 +0,0 @@ -# list of map names - -509 #AhnQiraj -469 #BlackwingLair -189 #MonasteryInstances -030 #PVPZone01 -037 #PVPZone02 -033 #Shadowfang -533 #Stratholme Raid -209 #TanarisInstance -309 #Zul'gurub -560 #HillsbradPast -534 #HyjalPast -532 #Karazahn -543 #HellfireRampart -568 #ZulAman -564 #BlackTemple -574 #UtgardeKeep -575 #UtgardePinnacle -609 #EbonHold -628 #IsleOfConquest \ No newline at end of file diff --git a/src/tools/vmap3_assembler/vmap_assembler.cpp b/src/tools/vmap3_assembler/vmap_assembler.cpp deleted file mode 100644 index 6666b54356c..00000000000 --- a/src/tools/vmap3_assembler/vmap_assembler.cpp +++ /dev/null @@ -1,120 +0,0 @@ -#include -#include -#include - -#include "TileAssembler.h" - -//======================================================= -// remove last return or LF and tailing SPACE -// remove all char after a # - -void chompAndTrim(std::string& str) -{ - for(unsigned int i=0;i0) { - char lc = str[str.length()-1]; - if(lc == '\r' || lc == '\n' || lc == ' ') { - str = str.substr(0,str.length()-1); - } else { - break; - } - } -} - -//======================================================= -/** -This callback method is called for each model found in the dir file. -return true if it should be included in the vmap -*/ -bool modelNameFilter(char *pName) -{ -#if 0 - bool result; - result = !Wildcard::wildcardfit("*bush[0-9]*", pName); - if(result) result = !Wildcard::wildcardfit("*shrub[0-9]*", pName); - if(result) result = !Wildcard::wildcardfit("*_Bushes_*", pName); - if(result) result = !Wildcard::wildcardfit("*_Bush_*", pName); - if(!result) { - printf("%s",pName); - } -#endif - return true; -} - -//======================================================= -/** -File contains map names that should be split into tiles -A '#' at the beginning of a line defines a comment -*/ - -/* bool readConfigFile(char *pConffile, VMAP::TileAssembler* pTa) -{ - bool result = false; - char buffer[501]; - FILE *cf = fopen(pConffile, "rb"); - if(cf) { - while(fgets(buffer, 500, cf)) { - std::string name = std::string(buffer); - size_t pos = name.find_first_not_of(' '); - name = name.substr(pos); - chompAndTrim(name); // just to be sure - if(name[0] != '#' && name.size() >0) { // comment? - unsigned int mapId = atoi(name.c_str()); - pTa->addWorldAreaMapId(mapId); - } - } - fclose(cf); - result = true; - } - return(result); -} */ -//======================================================= -int main(int argc, char* argv[]) -{ - if(argc != 3 && argc != 4) - { - printf("\nusage: %s [config file name]\n", argv[0]); - return 1; - } - - char *src = argv[1]; - char *dest = argv[2]; - char *conffile = NULL; - if(argc >= 4) - conffile = argv[3]; - - VMAP::TileAssembler* ta = new VMAP::TileAssembler(std::string(src), std::string(dest)); - ta->setModelNameFilterMethod(modelNameFilter); - - /* - All the names in the list are considered to be world maps or huge instances. - These maps will be spilt into tiles in the vmap assemble process - */ - /* if(conffile != NULL) - { - if(!readConfigFile(conffile, ta)) - { - printf("Can not open file config file: %s\n", conffile); - delete ta; - return 1; - } - } */ - - if(!ta->convertWorld2()) - { - printf("exit with errors\n"); - delete ta; - return 1; - } - - delete ta; - printf("Ok, all done\n"); - return 0; -} -- cgit v1.2.3 From fa4c813368cee13357adedba12457a9f4fb119fc Mon Sep 17 00:00:00 2001 From: Machiavelli Date: Mon, 7 Jun 2010 01:59:04 +0200 Subject: Fix SPELL_AURA_CLONE_CASTER on summoned creatures, it will now properly clone the appearance of the caster. (Mirror Image is currently a hacked exception and was already working) Still need to correctly implement cloning of weapons, though. --HG-- branch : trunk --- src/server/game/Spells/Auras/SpellEffects.cpp | 5 ++++- .../scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp | 3 --- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/server/game/Spells/Auras/SpellEffects.cpp b/src/server/game/Spells/Auras/SpellEffects.cpp index 2f7486d53d9..6d224af30ed 100644 --- a/src/server/game/Spells/Auras/SpellEffects.cpp +++ b/src/server/game/Spells/Auras/SpellEffects.cpp @@ -3706,7 +3706,7 @@ void Spell::EffectSummonType(uint32 i) TempSummonType summonType = (duration == 0) ? TEMPSUMMON_DEAD_DESPAWN : TEMPSUMMON_TIMED_DESPAWN; - TempSummon * summon = m_originalCaster->SummonCreature(entry, pos, summonType, duration); + summon = m_originalCaster->SummonCreature(entry, pos, summonType, duration); if (!summon) continue; if (properties->Category == SUMMON_CATEGORY_ALLY) @@ -3747,7 +3747,10 @@ void Spell::EffectSummonType(uint32 i) } if (summon) + { summon->SetUInt32Value(UNIT_CREATED_BY_SPELL, m_spellInfo->Id); + summon->SetCreatorGUID(m_originalCaster->GetGUID()); + } } void Spell::EffectLearnSpell(uint32 i) diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp index 16c291d6484..d522089a37d 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp @@ -125,9 +125,6 @@ struct boss_volazjAI : public ScriptedAI // Summon clone if (Unit *summon = me->SummonCreature(MOB_TWISTED_VISAGE, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation(),TEMPSUMMON_CORPSE_DESPAWN,0)) { - // required for correct visual - // Fixme: allow mirror image query to send other guid to get rid of minion status - summon->SetUInt64Value(UNIT_FIELD_CREATEDBY, plr->GetGUID()); // clone plr->CastSpell(summon, SPELL_CLONE_PLAYER, true); // set phase -- cgit v1.2.3 From f260a4d4ad5cd9d0002e85c60b6c824bf9d44366 Mon Sep 17 00:00:00 2001 From: Machiavelli Date: Mon, 7 Jun 2010 09:06:17 +0200 Subject: Attempt to trace down a crash issue related to Aura::__UnapplyForTarget --HG-- branch : trunk --- src/server/game/Entities/Unit/Unit.cpp | 16 +++++++--------- src/server/game/Spells/Auras/SpellAuras.cpp | 13 ++++++++++--- 2 files changed, 17 insertions(+), 12 deletions(-) (limited to 'src') diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 720e177075f..d92e7b4770a 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -4335,16 +4335,14 @@ void Unit::RemoveAreaAurasDueToLeaveWorld() void Unit::RemoveAllAuras() { - while (!m_appliedAuras.empty() || !m_ownedAuras.empty()) - { - AuraApplicationMap::iterator aurAppIter = m_appliedAuras.begin(); - while (!m_appliedAuras.empty()) - _UnapplyAura(aurAppIter, AURA_REMOVE_BY_DEFAULT); + AuraApplicationMap::iterator aurAppIter; + for (aurAppIter = m_appliedAuras.begin(); aurAppIter != m_appliedAuras.end()) + _UnapplyAura(aurAppIter, AURA_REMOVE_BY_DEFAULT); + + AuraMap::iterator aurIter; + for (aurIter = m_ownedAuras.begin(); aurIter != m_ownedAuras.end()) + RemoveOwnedAura(aurIter); - AuraMap::iterator aurIter = m_ownedAuras.begin(); - while (!m_ownedAuras.empty()) - RemoveOwnedAura(aurIter); - } } void Unit::RemoveArenaAuras(bool onleave) diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp index 1b75ab75473..753cbbe6264 100644 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -391,9 +391,16 @@ void Aura::_UnapplyForTarget(Unit * target, Unit * caster, AuraApplication * aur assert(auraApp); ApplicationMap::iterator itr = m_applications.find(target->GetGUID()); + // TODO: Figure out why this happens. + if (itr == m_applications.end()) + { + sLog.outError("Aura::_UnapplyForTarget, target:%u, caster:%u, spell:%u was not found in owners application map!", + target->GetGUIDLow(), caster->GetGUIDLow(), auraApp->GetBase()->GetSpellProto()->Id); + m_applications.erase(itr); + + } // aura has to be already applied - assert(itr->second == auraApp); - m_applications.erase(itr); + //assert(itr->second == auraApp); m_removedApplications.push_back(auraApp); // reset cooldown state for spells @@ -412,7 +419,7 @@ void Aura::_Remove(AuraRemoveMode removeMode) assert (!m_isRemoved); m_isRemoved = true; ApplicationMap::iterator appItr = m_applications.begin(); - while (!m_applications.empty()) + for (appItr = m_applications.begin(); appItr != m_applications.end();) { AuraApplication * aurApp = appItr->second; Unit * target = aurApp->GetTarget(); -- cgit v1.2.3 From e7bb8bca1e1345d398efff92a645ae01fc18ed29 Mon Sep 17 00:00:00 2001 From: Spp Date: Mon, 7 Jun 2010 09:37:36 +0200 Subject: Group::Disband: remove no longer needed code check. --HG-- branch : trunk --- src/server/game/Groups/Group.cpp | 7 ------- 1 file changed, 7 deletions(-) (limited to 'src') diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp index acd19e02838..f5840e2c287 100644 --- a/src/server/game/Groups/Group.cpp +++ b/src/server/game/Groups/Group.cpp @@ -486,13 +486,6 @@ void Group::Disband(bool hideDestroy) CharacterDatabase.CommitTransaction(); ResetInstances(INSTANCE_RESET_GROUP_DISBAND, false, NULL); ResetInstances(INSTANCE_RESET_GROUP_DISBAND, true, NULL); - // FIXME - Safe check! Debug purposes - Will remove after a time if got no reports - QueryResult_AutoPtr result = CharacterDatabase.PQuery("SELECT COUNT(1) FROM group_instance WHERE guid=%u", lowguid); - if (result) - { - sLog.outError("Group::Disband: %u instances are not being properly deleted from group %u", (*result)[0].GetUInt8(), lowguid); - CharacterDatabase.PExecute("DELETE FROM group_instance WHERE guid=%u", lowguid); - } } m_guid = 0; -- cgit v1.2.3 From 74b3fb53c06f98d29c5fe069d6a6250833c21c71 Mon Sep 17 00:00:00 2001 From: Tartalo Date: Mon, 7 Jun 2010 12:13:15 +0200 Subject: Some fixes for shared/CMakeLists.txt Adjust game/CMakeLists.txt to the new structure (needs more work) --HG-- branch : trunk --- src/server/game/CMakeLists.txt | 353 +++++++++++++++++++-------------------- src/server/shared/CMakeLists.txt | 14 +- 2 files changed, 182 insertions(+), 185 deletions(-) (limited to 'src') diff --git a/src/server/game/CMakeLists.txt b/src/server/game/CMakeLists.txt index 44fe870baa4..553d95b447d 100644 --- a/src/server/game/CMakeLists.txt +++ b/src/server/game/CMakeLists.txt @@ -4,216 +4,192 @@ IF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX) ENDIF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX) SET(game_STAT_SRCS - Account/AccountMgr.cpp - Account/AccountMgr.h + Accounts/AccountMgr.cpp + Accounts/AccountMgr.h Achievements/AchievementMgr.h Achievements/AchievementMgr.cpp Addons/AddonMgr.cpp Addons/AddonMgr.h - Addons/AddonHandler.cpp - Addons/AddonHandler.h - AI/AuctionHouseBot/AuctionHouseBot.cpp - AI/AuctionHouseBot/AuctionHouseBot.h + AI/CoreAI/CombatAI.cpp + AI/CoreAI/CombatAI.h + AI/CoreAI/GuardAI.cpp + AI/CoreAI/GuardAI.h + AI/CoreAI/PassiveAI.cpp + AI/CoreAI/PassiveAI.h + AI/CoreAI/PetAI.cpp + AI/CoreAI/PetAI.h + AI/CoreAI/ReactorAI.cpp + AI/CoreAI/ReactorAI.h + AI/CoreAI/TotemAI.cpp + AI/CoreAI/TotemAI.h + AI/CoreAI/UnitAI.cpp + AI/CoreAI/UnitAI.h AI/EventAI/CreatureEventAI.cpp AI/EventAI/CreatureEventAIMgr.cpp AI/ScriptedAI/ScriptedSmartAI.cpp AI/ScriptedAI/ScriptedSmartAI.h - AI/CombatAI.cpp - AI/CombatAI.h - AI/CreatureAI.cpp - AI/CreatureAI.h AI/CreatureAIFactory.h AI/CreatureAIImpl.h AI/CreatureAIRegistry.cpp AI/CreatureAIRegistry.h AI/CreatureAISelector.cpp AI/CreatureAISelector.h - AI/GuardAI.cpp - AI/GuardAI.h - AI/PassiveAI.cpp - AI/PassiveAI.h - AI/PetAI.cpp - AI/PetAI.h - AI/ReactorAI.cpp - AI/ReactorAI.h - AI/TotemAI.cpp - AI/TotemAI.h - AI/UnitAI.cpp - AI/UnitAI.h - AuctionHouse/AuctionHouseHandler.cpp AuctionHouse/AuctionHouseMgr.cpp AuctionHouse/AuctionHouseMgr.h + AuctionHouse/AuctionHouseBot/AuctionHouseBot.cpp + AuctionHouse/AuctionHouseBot/AuctionHouseBot.h BattleGrounds/ArenaTeam.cpp BattleGrounds/ArenaTeam.h - BattleGrounds/ArenaTeamHandler.cpp + BattleGrounds/Zones/BattleGroundAA.cpp + BattleGrounds/Zones/BattleGroundAA.h + BattleGrounds/Zones/BattleGroundAB.cpp + BattleGrounds/Zones/BattleGroundAB.h + BattleGrounds/Zones/BattleGroundRB.cpp + BattleGrounds/Zones/BattleGroundRB.h + BattleGrounds/Zones/BattleGroundAV.cpp + BattleGrounds/Zones/BattleGroundAV.h + BattleGrounds/Zones/BattleGroundBE.cpp + BattleGrounds/Zones/BattleGroundBE.h + BattleGrounds/Zones/BattleGroundDS.cpp + BattleGrounds/Zones/BattleGroundDS.h + BattleGrounds/Zones/BattleGroundEY.cpp + BattleGrounds/Zones/BattleGroundEY.h + BattleGrounds/Zones/BattleGroundIC.cpp + BattleGrounds/Zones/BattleGroundIC.h + BattleGrounds/Zones/BattleGroundNA.cpp + BattleGrounds/Zones/BattleGroundNA.h + BattleGrounds/Zones/BattleGroundRL.cpp + BattleGrounds/Zones/BattleGroundRL.h + BattleGrounds/Zones/BattleGroundRV.cpp + BattleGrounds/Zones/BattleGroundRV.h + BattleGrounds/Zones/BattleGroundSA.cpp + BattleGrounds/Zones/BattleGroundSA.h + BattleGrounds/Zones/BattleGroundWS.cpp + BattleGrounds/Zones/BattleGroundWS.h BattleGrounds/BattleGround.cpp - BattleGrounds/BattleGroundAA.cpp - BattleGrounds/BattleGroundAB.cpp - BattleGrounds/BattleGroundRB.cpp - BattleGrounds/BattleGroundAV.cpp - BattleGrounds/BattleGroundBE.cpp - BattleGrounds/BattleGroundDS.cpp - BattleGrounds/BattleGroundEY.cpp - BattleGrounds/BattleGroundIC.cpp - BattleGrounds/BattleGroundNA.cpp - BattleGrounds/BattleGroundRL.cpp - BattleGrounds/BattleGroundRV.cpp - BattleGrounds/BattleGroundSA.cpp - BattleGrounds/BattleGroundWS.cpp BattleGrounds/BattleGround.h - BattleGrounds/BattleGroundAA.h - BattleGrounds/BattleGroundAB.h - BattleGrounds/BattleGroundRB.h - BattleGrounds/BattleGroundAV.h - BattleGrounds/BattleGroundBE.h - BattleGrounds/BattleGroundDS.h - BattleGrounds/BattleGroundEY.h - BattleGrounds/BattleGroundIC.h - BattleGrounds/BattleGroundNA.h - BattleGrounds/BattleGroundRL.h - BattleGrounds/BattleGroundRV.h - BattleGrounds/BattleGroundSA.h - BattleGrounds/BattleGroundWS.h - BattleGrounds/BattleGroundHandler.cpp BattleGrounds/BattleGroundMgr.cpp BattleGrounds/BattleGroundMgr.h Calendar/Calendar.cpp Calendar/Calendar.h - Calendar/CalendarHandler.cpp - Chat/Channel.cpp - Chat/Channel.h - Chat/ChannelHandler.cpp - Chat/ChannelMgr.h - Chat/ChannelMgr.cpp + Chat/Channels/Channel.cpp + Chat/Channels/Channel.h + Chat/Channels/ChannelMgr.h + Chat/Channels/ChannelMgr.cpp + Chat/Commands/Debugcmds.cpp + Chat/Commands/Level0.cpp + Chat/Commands/Level1.cpp + Chat/Commands/Level2.cpp + Chat/Commands/Level3.cpp Chat/Chat.cpp Chat/Chat.h - Chat/ChatHandler.cpp - Chat/Debugcmds.cpp - Chat/Level0.cpp - Chat/Level1.cpp - Chat/Level2.cpp - Chat/Level3.cpp - Combat/CombatHandler.cpp Combat/HostileRefManager.cpp Combat/HostileRefManager.h Combat/ThreatManager.cpp Combat/ThreatManager.h - ConditionMgr/ConditionMgr.cpp - ConditionMgr/ConditionMgr.h + Combat/UnitEvents.h + Conditions/ConditionMgr.cpp + Conditions/ConditionMgr.h DataStores/DBCEnums.h DataStores/DBCStores.cpp DataStores/DBCStores.h DataStores/DBCStructure.h DataStores/DBCfmt.h + DungeonFinding/LFG.h + DungeonFinding/LFGMgr.cpp + DungeonFinding/LFGMgr.h + Entities/Corpse/Corpse.cpp + Entities/Corpse/Corpse.h Entities/Creature/Creature.cpp Entities/Creature/Creature.h Entities/Creature/CreatureGroups.cpp Entities/Creature/CreatureGroups.h Entities/Creature/GossipDef.cpp Entities/Creature/GossipDef.h - Entities/Creature/NPCHandler.cpp - Entities/Creature/NPCHandler.h Entities/Creature/TemporarySummon.cpp Entities/Creature/TemporarySummon.h + Entities/DynamicObject/DynamicObject.cpp + Entities/DynamicObject/DynamicObject.h Entities/GameObject/GameObject.cpp Entities/GameObject/GameObject.h - Entities/Item/Bag.cpp - Entities/Item/Bag.h + Entities/Item/Container/Bag.cpp + Entities/Item/Container/Bag.h Entities/Item/Item.cpp Entities/Item/Item.h Entities/Item/ItemEnchantmentMgr.cpp Entities/Item/ItemEnchantmentMgr.h - Entities/Item/ItemHandler.cpp Entities/Item/ItemPrototype.h - Entities/Object/Corpse.cpp - Entities/Object/Corpse.h - Entities/Object/DynamicObject.cpp - Entities/Object/DynamicObject.h - Entities/Object/ObjectAccessor.cpp - Entities/Object/ObjectAccessor.h - Entities/Object/Object.cpp + Entities/Object/Updates/UpdateData.cpp + Entities/Object/Updates/UpdateData.h + Entities/Object/Updates/UpdateFields.h + Entities/Object/Updates/UpdateMask.h Entities/Object/ObjectDefines.h + Entities/Object/Object.cpp Entities/Object/Object.h - Entities/Object/ObjectMgr.cpp - Entities/Object/ObjectMgr.h - Entities/Object/UpdateData.cpp - Entities/Object/UpdateData.h - Entities/Object/UpdateFields.h - Entities/Object/UpdateMask.h + Entities/Object/ObjectPosSelector.cpp + Entities/Object/ObjectPosSelector.h Entities/Pet/Pet.cpp Entities/Pet/Pet.h - Entities/Pet/PetHandler.cpp - Entities/Player/DuelHandler.cpp - Entities/Player/MiscHandler.cpp - Entities/Player/PetitionsHandler.cpp Entities/Player/Player.cpp Entities/Player/Player.h Entities/Player/SocialMgr.cpp Entities/Player/SocialMgr.h - Entities/Player/TicketHandler.cpp - Entities/Player/TradeHandler.cpp - Entities/Player/VoiceChatHandler.cpp - Entities/Player/CharacterHandler.cpp Entities/Unit/StatSystem.cpp Entities/Unit/Unit.cpp Entities/Unit/Unit.h Entities/Totem/Totem.cpp Entities/Totem/Totem.h + Entities/Transport/Transport.cpp + Entities/Transport/Transport.h Entities/Vehicle/Vehicle.cpp Entities/Vehicle/Vehicle.h Events/GameEventMgr.cpp Events/GameEventMgr.h - Events/GlobalEvents.cpp - Events/GlobalEvents.h - Events/UnitEvents.h - Globals/Formulas.h - Globals/Language.h - Globals/SharedDefines.h + Globals/GlobalEvents.cpp + Globals/GlobalEvents.h + Globals/ObjectAccessor.cpp + Globals/ObjectAccessor.h + Globals/ObjectMgr.cpp + Globals/ObjectMgr.h + Grids/Cells/Cell.h + Grids/Cells/CellImpl.h + Grids/Notifiers/GridNotifiers.cpp + Grids/Notifiers/GridNotifiers.h + Grids/Notifiers/GridNotifiersImpl.h + Grids/GridDefines.h + Grids/GridStates.cpp + Grids/GridStates.h + Grids/ObjectGridLoader.cpp + Grids/ObjectGridLoader.h Groups/Group.cpp Groups/Group.h - Groups/GroupHandler.cpp Groups/GroupReference.cpp Groups/GroupReference.h Groups/GroupRefManager.h Guilds/Guild.cpp Guilds/Guild.h - Guilds/GuildHandler.cpp Instances/InstanceData.cpp Instances/InstanceData.h Instances/InstanceSaveMgr.cpp Instances/InstanceSaveMgr.h - LookingForGroup/LFG.h - LookingForGroup/LFGHandler.cpp - LookingForGroup/LFGMgr.cpp - LookingForGroup/LFGMgr.h - Loot/LootHandler.cpp Loot/LootMgr.cpp Loot/LootMgr.h Mails/Mail.cpp Mails/Mail.h - Map/Cell/Cell.h - Map/Cell/CellImpl.h - Map/Grid/GridDefines.h - Map/Grid/GridNotifiers.cpp - Map/Grid/GridNotifiers.h - Map/Grid/GridNotifiersImpl.h - Map/Grid/GridStates.cpp - Map/Grid/GridStates.h - Map/Grid/ObjectGridLoader.cpp - Map/Grid/ObjectGridLoader.h - Map/Map.cpp - Map/Map.h - Map/MapInstanced.cpp - Map/MapInstanced.h - Map/MapManager.cpp - Map/MapManager.h - Map/MapUpdater.cpp - Map/MapUpdater.h - Map/MapReference.h - Map/MapRefManager.h - Map/ObjectPosSelector.cpp - Map/ObjectPosSelector.h - Map/ZoneScript.h + Maps/Map.cpp + Maps/Map.h + Maps/MapInstanced.cpp + Maps/MapInstanced.h + Maps/MapManager.cpp + Maps/MapManager.h + Maps/MapUpdater.cpp + Maps/MapUpdater.h + Maps/MapReference.h + Maps/MapRefManager.h + Maps/ZoneScript.h + Miscellaneous/Formulas.h + Miscellaneous/Language.h + Miscellaneous/SharedDefines.h Movement/MovementGenerators/ConfusedMovementGenerator.cpp Movement/MovementGenerators/ConfusedMovementGenerator.h Movement/MovementGenerators/FleeingMovementGenerator.cpp @@ -222,9 +198,6 @@ SET(game_STAT_SRCS Movement/MovementGenerators/HomeMovementGenerator.h Movement/MovementGenerators/IdleMovementGenerator.cpp Movement/MovementGenerators/IdleMovementGenerator.h - Movement/MovementGenerators/MovementGenerator.cpp - Movement/MovementGenerators/MovementGenerator.h - Movement/MovementGenerators/MovementGeneratorImpl.h Movement/MovementGenerators/PointMovementGenerator.cpp Movement/MovementGenerators/PointMovementGenerator.h Movement/MovementGenerators/RandomMovementGenerator.cpp @@ -233,6 +206,9 @@ SET(game_STAT_SRCS Movement/MovementGenerators/TargetedMovementGenerator.h Movement/MovementGenerators/WaypointMovementGenerator.cpp Movement/MovementGenerators/WaypointMovementGenerator.h + Movement/Waypoints/Path.h + Movement/Waypoints/WaypointManager.cpp + Movement/Waypoints/WaypointManager.h Movement/DestinationHolder.cpp Movement/DestinationHolder.h Movement/DestinationHolderImp.h @@ -241,48 +217,79 @@ SET(game_STAT_SRCS Movement/FollowerRefManager.h Movement/MotionMaster.cpp Movement/MotionMaster.h - Movement/MovementHandler.cpp - Movement/Path.h - Movement/TaxiHandler.cpp - Movement/Transports.cpp - Movement/Transports.h + Movement/MovementGenerator.cpp + Movement/MovementGenerator.h + Movement/MovementGeneratorImpl.h Movement/Traveller.h - Movement/WaypointManager.cpp - Movement/WaypointManager.h - Opcodes/Opcodes.cpp - Opcodes/Opcodes.h + OutdoorPvP/Zones/OutdoorPvPEP.cpp + OutdoorPvP/Zones/OutdoorPvPEP.h + OutdoorPvP/Zones/OutdoorPvPHP.cpp + OutdoorPvP/Zones/OutdoorPvPHP.h + OutdoorPvP/Zones/OutdoorPvPNA.cpp + OutdoorPvP/Zones/OutdoorPvPNA.h + OutdoorPvP/Zones/OutdoorPvPSI.cpp + OutdoorPvP/Zones/OutdoorPvPSI.h + OutdoorPvP/Zones/OutdoorPvPTF.cpp + OutdoorPvP/Zones/OutdoorPvPTF.h + OutdoorPvP/Zones/OutdoorPvPZM.cpp + OutdoorPvP/Zones/OutdoorPvPZM.h OutdoorPvP/OutdoorPvP.cpp OutdoorPvP/OutdoorPvP.h - OutdoorPvP/OutdoorPvPEP.cpp - OutdoorPvP/OutdoorPvPEP.h - OutdoorPvP/OutdoorPvPHP.cpp - OutdoorPvP/OutdoorPvPHP.h OutdoorPvP/OutdoorPvPImpl.h OutdoorPvP/OutdoorPvPMgr.cpp OutdoorPvP/OutdoorPvPMgr.h - OutdoorPvP/OutdoorPvPNA.cpp - OutdoorPvP/OutdoorPvPNA.h - OutdoorPvP/OutdoorPvPSI.cpp - OutdoorPvP/OutdoorPvPSI.h - OutdoorPvP/OutdoorPvPTF.cpp - OutdoorPvP/OutdoorPvPTF.h - OutdoorPvP/OutdoorPvPZM.cpp - OutdoorPvP/OutdoorPvPZM.h Pools/PoolHandler.cpp Pools/PoolHandler.h - Quests/QueryHandler.cpp Quests/QuestDef.cpp Quests/QuestDef.h - Quests/QuestHandler.cpp Reputation/ReputationMgr.cpp Reputation/ReputationMgr.h - ScriptMgr/ScriptLoader.cpp - ScriptMgr/ScriptLoader.h - ScriptMgr/ScriptMgr.cpp - ScriptMgr/ScriptMgr.h - ScriptMgr/ScriptSystem.cpp - ScriptMgr/ScriptSystem.h - Skills/SkillHandler.cpp + Scripting/ScriptLoader.cpp + Scripting/ScriptLoader.h + Scripting/ScriptMgr.cpp + Scripting/ScriptMgr.h + Scripting/ScriptSystem.cpp + Scripting/ScriptSystem.h + Server/Protocol/Handlers/AddonHandler.cpp + Server/Protocol/Handlers/AddonHandler.h + Server/Protocol/Handlers/ArenaTeamHandler.cpp + Server/Protocol/Handlers/AuctionHouseHandler.cpp + Server/Protocol/Handlers/BattleGroundHandler.cpp + Server/Protocol/Handlers/CalendarHandler.cpp + Server/Protocol/Handlers/ChannelHandler.cpp + Server/Protocol/Handlers/CharacterHandler.cpp + Server/Protocol/Handlers/ChatHandler.cpp + Server/Protocol/Handlers/CombatHandler.cpp + Server/Protocol/Handlers/DuelHandler.cpp + Server/Protocol/Handlers/GroupHandler.cpp + Server/Protocol/Handlers/GuildHandler.cpp + Server/Protocol/Handlers/ItemHandler.cpp + Server/Protocol/Handlers/LFGHandler.cpp + Server/Protocol/Handlers/LootHandler.cpp + Server/Protocol/Handlers/MiscHandler.cpp + Server/Protocol/Handlers/MovementHandler.cpp + Server/Protocol/Handlers/NPCHandler.cpp + Server/Protocol/Handlers/NPCHandler.h + Server/Protocol/Handlers/PetHandler.cpp + Server/Protocol/Handlers/PetitionsHandler.cpp + Server/Protocol/Handlers/QueryHandler.cpp + Server/Protocol/Handlers/QuestHandler.cpp + Server/Protocol/Handlers/SkillHandler.cpp + Server/Protocol/Handlers/SpellHandler.cpp + Server/Protocol/Handlers/TaxiHandler.cpp + Server/Protocol/Handlers/TicketHandler.cpp + Server/Protocol/Handlers/TradeHandler.cpp + Server/Protocol/Handlers/VoiceChatHandler.cpp + Server/Protocol/Opcodes.cpp + Server/Protocol/Opcodes.h + Server/Protocol/WorldLog.cpp + Server/Protocol/WorldLog.h + Server/WorldSession.cpp + Server/WorldSession.h + Server/WorldSocket.cpp + Server/WorldSocket.h + Server/WorldSocketMgr.cpp + Server/WorldSocketMgr.h Skills/SkillDiscovery.cpp Skills/SkillDiscovery.h Skills/SkillExtraItems.cpp @@ -295,7 +302,6 @@ SET(game_STAT_SRCS Spells/Auras/SpellEffects.cpp Spells/Spell.cpp Spells/Spell.h - Spells/SpellHandler.cpp Spells/SpellMgr.cpp Spells/SpellMgr.h Tools/PlayerDump.cpp @@ -306,30 +312,19 @@ SET(game_STAT_SRCS Weather/Weather.h World/World.cpp World/World.h - World/WorldLog.cpp - World/WorldLog.h - World/WorldSession.cpp - World/WorldSession.h - World/WorldSocket.cpp - World/WorldSocket.h - World/WorldSocketMgr.cpp - World/WorldSocketMgr.h ) include_directories( ${ACE_INCLUDE_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/dep/include - ${CMAKE_SOURCE_DIR}/src/server/framework ${CMAKE_SOURCE_DIR}/src/server/shared - ${CMAKE_SOURCE_DIR}/src/server/shared/vmap ${CMAKE_SOURCE_DIR}/src/server/shared/Database ${CMAKE_SOURCE_DIR}/src/server/game - ${CMAKE_SOURCE_DIR}/src/server/game/Account + ${CMAKE_SOURCE_DIR}/src/server/game/Accounts ${CMAKE_SOURCE_DIR}/src/server/game/Achievements ${CMAKE_SOURCE_DIR}/src/server/game/Addons ${CMAKE_SOURCE_DIR}/src/server/game/AI - ${CMAKE_SOURCE_DIR}/src/server/game/AI/AuctionHouseBot ${CMAKE_SOURCE_DIR}/src/server/game/AI/EventAI ${CMAKE_SOURCE_DIR}/src/server/game/AI/ScriptedAI ${CMAKE_SOURCE_DIR}/src/server/game/AuctionHouse @@ -337,7 +332,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/src/server/game/Calendar ${CMAKE_SOURCE_DIR}/src/server/game/Chat ${CMAKE_SOURCE_DIR}/src/server/game/Combat - ${CMAKE_SOURCE_DIR}/src/server/game/ConditionMgr + ${CMAKE_SOURCE_DIR}/src/server/game/Conditions ${CMAKE_SOURCE_DIR}/src/server/game/DataStores ${CMAKE_SOURCE_DIR}/src/server/game/Entities ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Creature @@ -354,20 +349,16 @@ include_directories( ${CMAKE_SOURCE_DIR}/src/server/game/Groups ${CMAKE_SOURCE_DIR}/src/server/game/Guilds ${CMAKE_SOURCE_DIR}/src/server/game/Instances - ${CMAKE_SOURCE_DIR}/src/server/game/LookingForGroup ${CMAKE_SOURCE_DIR}/src/server/game/Loot ${CMAKE_SOURCE_DIR}/src/server/game/Mails - ${CMAKE_SOURCE_DIR}/src/server/game/Map - ${CMAKE_SOURCE_DIR}/src/server/game/Map/Cell - ${CMAKE_SOURCE_DIR}/src/server/game/Map/Grid + ${CMAKE_SOURCE_DIR}/src/server/game/Maps ${CMAKE_SOURCE_DIR}/src/server/game/Movement ${CMAKE_SOURCE_DIR}/src/server/game/Movement/MovementGenerators - ${CMAKE_SOURCE_DIR}/src/server/game/Opcodes ${CMAKE_SOURCE_DIR}/src/server/game/OutdoorPvP ${CMAKE_SOURCE_DIR}/src/server/game/Pools ${CMAKE_SOURCE_DIR}/src/server/game/Quests ${CMAKE_SOURCE_DIR}/src/server/game/Reputation - ${CMAKE_SOURCE_DIR}/src/server/game/ScriptMgr + ${CMAKE_SOURCE_DIR}/src/server/game/Scripting ${CMAKE_SOURCE_DIR}/src/server/game/Skills ${CMAKE_SOURCE_DIR}/src/server/game/Spells ${CMAKE_SOURCE_DIR}/src/server/game/Spells/Auras diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt index ed43a4eb6cd..5e0a2f40adf 100644 --- a/src/server/shared/CMakeLists.txt +++ b/src/server/shared/CMakeLists.txt @@ -1,7 +1,14 @@ -add_subdirectory(vmap) -add_subdirectory(Auth) -add_subdirectory(Config) +add_subdirectory(Configuration) +add_subdirectory(Cryptography) add_subdirectory(Database) +add_subdirectory(DataStores) +add_subdirectory(Debugging) +add_subdirectory(Dynamic) +add_subdirectory(Logging) +add_subdirectory(Packets) +add_subdirectory(Policies) +add_subdirectory(Threading) +add_subdirectory(Utilities) ########### next target ############### @@ -30,7 +37,6 @@ include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/dep/include ${CMAKE_SOURCE_DIR}/dep/include/sockets - ${CMAKE_SOURCE_DIR}/src/server/framework ${CMAKE_SOURCE_DIR}/src/server/shared ${MYSQL_INCLUDE_DIR} ) -- cgit v1.2.3 From ce1b22ed0c4cd86783848cad9dfa54fbc1bf9a4b Mon Sep 17 00:00:00 2001 From: Tartalo Date: Mon, 7 Jun 2010 12:41:57 +0200 Subject: More cmake fixes. Now cmake runs without errors with -DO_SCRIPTS=0 --HG-- branch : trunk --- src/server/authserver/CMakeLists.txt | 18 +- src/server/game/CMakeLists.txt | 6 +- src/server/scripts/CMakeLists.txt | 1120 ++++++++++++------------- src/server/shared/CMakeLists.txt | 28 +- src/server/shared/Cryptography/CMakeLists.txt | 21 +- src/server/shared/Database/CMakeLists.txt | 7 +- src/server/worldserver/CMakeLists.txt | 14 +- 7 files changed, 605 insertions(+), 609 deletions(-) (limited to 'src') diff --git a/src/server/authserver/CMakeLists.txt b/src/server/authserver/CMakeLists.txt index 5a993be5377..496f1ff689e 100644 --- a/src/server/authserver/CMakeLists.txt +++ b/src/server/authserver/CMakeLists.txt @@ -1,16 +1,16 @@ ########### next target ############### SET(trinity-realm_SRCS -AuthCodes.cpp -AuthCodes.h -AuthSocket.cpp -AuthSocket.h +Authentication/AuthCodes.cpp +Authentication/AuthCodes.h +Realms/RealmList.cpp +Realms/RealmList.h +Server/AuthSocket.cpp +Server/AuthSocket.h +Server/RealmSocket.h +Server/RealmSocket.cpp +Server/RealmAcceptor.h Main.cpp -RealmList.cpp -RealmList.h -RealmSocket.h -RealmSocket.cpp -RealmAcceptor.h ) include_directories( diff --git a/src/server/game/CMakeLists.txt b/src/server/game/CMakeLists.txt index 553d95b447d..444f181f4a9 100644 --- a/src/server/game/CMakeLists.txt +++ b/src/server/game/CMakeLists.txt @@ -372,8 +372,6 @@ if(NOT DO_SCRIPTS) SET(game_STAT_SRCS ${game_STAT_SRCS} AI/ScriptedAI/ScriptedEscortAI.cpp AI/ScriptedAI/ScriptedEscortAI.h - ScriptMgr/ScriptedPch.cpp - ScriptMgr/ScriptedPch.h AI/ScriptedAI/ScriptedCreature.cpp AI/ScriptedAI/ScriptedCreature.h AI/ScriptedAI/ScriptedFollowerAI.cpp @@ -384,6 +382,8 @@ if(NOT DO_SCRIPTS) AI/ScriptedAI/ScriptedInstance.h AI/ScriptedAI/ScriptedSimpleAI.cpp AI/ScriptedAI/ScriptedSimpleAI.h + PrecompiledHeaders/ScriptPCH.cpp + PrecompiledHeaders/ScriptPCH.h ) message("-- Added Script Engine to GAME lib") endif(NOT DO_SCRIPTS) @@ -393,6 +393,6 @@ ADD_DEPENDENCIES(game revision.h) # Generate precompiled header IF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX) - ADD_PRECOMPILED_HEADER(game ${CMAKE_SOURCE_DIR}/src/server/game/PrecompiledHeaders/pchlinux.h) + ADD_PRECOMPILED_HEADER(game ${CMAKE_SOURCE_DIR}/src/server/game/PrecompiledHeaders/NixCorePCH.h) ENDIF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX) diff --git a/src/server/scripts/CMakeLists.txt b/src/server/scripts/CMakeLists.txt index d29670e4fc9..b9dfbc5fab2 100644 --- a/src/server/scripts/CMakeLists.txt +++ b/src/server/scripts/CMakeLists.txt @@ -4,8 +4,8 @@ IF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX) ENDIF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX) SET(scripts_STAT_SRCS - ../game/ScriptMgr/ScriptedPch.cpp - ../game/ScriptMgr/ScriptedPch.h + ../game/Scripting/ScriptedPch.cpp + ../game/Scripting/ScriptedPch.h ../game/AI/ScriptedAI/ScriptedEscortAI.cpp ../game/AI/ScriptedAI/ScriptedEscortAI.h ../game/AI/ScriptedAI/ScriptedCreature.cpp @@ -18,564 +18,564 @@ SET(scripts_STAT_SRCS ../game/AI/ScriptedAI/ScriptedInstance.h ../game/AI/ScriptedAI/ScriptedSimpleAI.cpp ../game/AI/ScriptedAI/ScriptedSimpleAI.h - custom/on_events.cpp - eastern_kingdoms/alterac_valley/alterac_valley.cpp - eastern_kingdoms/alterac_valley/boss_balinda.cpp - eastern_kingdoms/alterac_valley/boss_drekthar.cpp - eastern_kingdoms/alterac_valley/boss_galvangar.cpp - eastern_kingdoms/alterac_valley/boss_vanndar.cpp - eastern_kingdoms/blackrock_depths/blackrock_depths.cpp - eastern_kingdoms/blackrock_depths/boss_ambassador_flamelash.cpp - eastern_kingdoms/blackrock_depths/boss_anubshiah.cpp - eastern_kingdoms/blackrock_depths/boss_emperor_dagran_thaurissan.cpp - eastern_kingdoms/blackrock_depths/boss_general_angerforge.cpp - eastern_kingdoms/blackrock_depths/boss_gorosh_the_dervish.cpp - eastern_kingdoms/blackrock_depths/boss_grizzle.cpp - eastern_kingdoms/blackrock_depths/boss_high_interrogator_gerstahn.cpp - eastern_kingdoms/blackrock_depths/boss_magmus.cpp - eastern_kingdoms/blackrock_depths/boss_moira_bronzebeard.cpp - eastern_kingdoms/blackrock_depths/boss_tomb_of_seven.cpp - eastern_kingdoms/blackrock_depths/blackrock_depths.h - eastern_kingdoms/blackrock_depths/instance_blackrock_depths.cpp - eastern_kingdoms/blackrock_spire/blackrock_spire.cpp - eastern_kingdoms/blackrock_spire/boss_drakkisath.cpp - eastern_kingdoms/blackrock_spire/boss_gyth.cpp - eastern_kingdoms/blackrock_spire/boss_halycon.cpp - eastern_kingdoms/blackrock_spire/boss_highlord_omokk.cpp - eastern_kingdoms/blackrock_spire/boss_mother_smolderweb.cpp - eastern_kingdoms/blackrock_spire/boss_overlord_wyrmthalak.cpp - eastern_kingdoms/blackrock_spire/boss_pyroguard_emberseer.cpp - eastern_kingdoms/blackrock_spire/boss_quartermaster_zigris.cpp - eastern_kingdoms/blackrock_spire/boss_rend_blackhand.cpp - eastern_kingdoms/blackrock_spire/boss_shadow_hunter_voshgajin.cpp - eastern_kingdoms/blackrock_spire/boss_the_beast.cpp - eastern_kingdoms/blackrock_spire/boss_warmaster_voone.cpp - eastern_kingdoms/blackrock_spire/blackrock_spire.h - eastern_kingdoms/blackrock_spire/instance_blackrock_spire.cpp - eastern_kingdoms/blackwing_lair/boss_broodlord_lashlayer.cpp - eastern_kingdoms/blackwing_lair/boss_chromaggus.cpp - eastern_kingdoms/blackwing_lair/boss_ebonroc.cpp - eastern_kingdoms/blackwing_lair/boss_firemaw.cpp - eastern_kingdoms/blackwing_lair/boss_flamegor.cpp - eastern_kingdoms/blackwing_lair/boss_nefarian.cpp - eastern_kingdoms/blackwing_lair/boss_razorgore.cpp - eastern_kingdoms/blackwing_lair/boss_vaelastrasz.cpp - eastern_kingdoms/blackwing_lair/boss_victor_nefarius.cpp - eastern_kingdoms/blackwing_lair/instance_blackwing_lair.cpp - eastern_kingdoms/deadmines/boss_mr_smite.cpp - eastern_kingdoms/deadmines/deadmines.h - eastern_kingdoms/deadmines/deadmines.cpp - eastern_kingdoms/deadmines/instance_deadmines.cpp - eastern_kingdoms/gnomeregan/gnomeregan.h - eastern_kingdoms/gnomeregan/gnomeregan.cpp - eastern_kingdoms/gnomeregan/instance_gnomeregan.cpp - eastern_kingdoms/karazhan/boss_curator.cpp - eastern_kingdoms/karazhan/boss_maiden_of_virtue.cpp - eastern_kingdoms/karazhan/boss_midnight.cpp - eastern_kingdoms/karazhan/boss_moroes.cpp - eastern_kingdoms/karazhan/boss_netherspite.cpp - eastern_kingdoms/karazhan/boss_nightbane.cpp - eastern_kingdoms/karazhan/boss_prince_malchezaar.cpp - eastern_kingdoms/karazhan/boss_shade_of_aran.cpp - eastern_kingdoms/karazhan/boss_terestian_illhoof.cpp - eastern_kingdoms/karazhan/bosses_opera.cpp - eastern_kingdoms/karazhan/karazhan.h - eastern_kingdoms/karazhan/instance_karazhan.cpp - eastern_kingdoms/karazhan/karazhan.cpp - eastern_kingdoms/magisters_terrace/boss_felblood_kaelthas.cpp - eastern_kingdoms/magisters_terrace/boss_priestess_delrissa.cpp - eastern_kingdoms/magisters_terrace/boss_selin_fireheart.cpp - eastern_kingdoms/magisters_terrace/boss_vexallus.cpp - eastern_kingdoms/magisters_terrace/magisters_terrace.h - eastern_kingdoms/magisters_terrace/instance_magisters_terrace.cpp - eastern_kingdoms/magisters_terrace/magisters_terrace.cpp - eastern_kingdoms/molten_core/boss_baron_geddon.cpp - eastern_kingdoms/molten_core/boss_garr.cpp - eastern_kingdoms/molten_core/boss_gehennas.cpp - eastern_kingdoms/molten_core/boss_golemagg.cpp - eastern_kingdoms/molten_core/boss_lucifron.cpp - eastern_kingdoms/molten_core/boss_magmadar.cpp - eastern_kingdoms/molten_core/boss_majordomo_executus.cpp - eastern_kingdoms/molten_core/boss_ragnaros.cpp - eastern_kingdoms/molten_core/boss_shazzrah.cpp - eastern_kingdoms/molten_core/boss_sulfuron_harbinger.cpp - eastern_kingdoms/molten_core/molten_core.h - eastern_kingdoms/molten_core/instance_molten_core.cpp - eastern_kingdoms/molten_core/molten_core.cpp - eastern_kingdoms/scarlet_enclave/the_scarlet_enclave.cpp - eastern_kingdoms/scarlet_enclave/chapter1.cpp - eastern_kingdoms/scarlet_enclave/chapter2.cpp - eastern_kingdoms/scarlet_enclave/chapter5.cpp - eastern_kingdoms/scarlet_monastery/boss_arcanist_doan.cpp - eastern_kingdoms/scarlet_monastery/boss_azshir_the_sleepless.cpp - eastern_kingdoms/scarlet_monastery/boss_bloodmage_thalnos.cpp - eastern_kingdoms/scarlet_monastery/boss_herod.cpp - eastern_kingdoms/scarlet_monastery/boss_high_inquisitor_fairbanks.cpp - eastern_kingdoms/scarlet_monastery/boss_houndmaster_loksey.cpp - eastern_kingdoms/scarlet_monastery/boss_interrogator_vishas.cpp - eastern_kingdoms/scarlet_monastery/boss_scorn.cpp - eastern_kingdoms/scarlet_monastery/boss_headless_horseman.cpp - eastern_kingdoms/scarlet_monastery/boss_mograine_and_whitemane.cpp - eastern_kingdoms/scarlet_monastery/instance_scarlet_monastery.cpp - eastern_kingdoms/scarlet_monastery/scarlet_monastery.h - eastern_kingdoms/scholomance/boss_darkmaster_gandling.cpp - eastern_kingdoms/scholomance/boss_death_knight_darkreaver.cpp - eastern_kingdoms/scholomance/boss_doctor_theolen_krastinov.cpp - eastern_kingdoms/scholomance/boss_illucia_barov.cpp - eastern_kingdoms/scholomance/boss_instructor_malicia.cpp - eastern_kingdoms/scholomance/boss_jandice_barov.cpp - eastern_kingdoms/scholomance/boss_kormok.cpp - eastern_kingdoms/scholomance/boss_lord_alexei_barov.cpp - eastern_kingdoms/scholomance/boss_lorekeeper_polkelt.cpp - eastern_kingdoms/scholomance/boss_ras_frostwhisper.cpp - eastern_kingdoms/scholomance/boss_the_ravenian.cpp - eastern_kingdoms/scholomance/boss_vectus.cpp - eastern_kingdoms/scholomance/scholomance.h - eastern_kingdoms/scholomance/instance_scholomance.cpp - eastern_kingdoms/shadowfang_keep/shadowfang_keep.h - eastern_kingdoms/shadowfang_keep/instance_shadowfang_keep.cpp - eastern_kingdoms/shadowfang_keep/shadowfang_keep.cpp - eastern_kingdoms/stratholme/boss_baron_rivendare.cpp - eastern_kingdoms/stratholme/boss_baroness_anastari.cpp - eastern_kingdoms/stratholme/boss_cannon_master_willey.cpp - eastern_kingdoms/stratholme/boss_dathrohan_balnazzar.cpp - eastern_kingdoms/stratholme/boss_magistrate_barthilas.cpp - eastern_kingdoms/stratholme/boss_maleki_the_pallid.cpp - eastern_kingdoms/stratholme/boss_nerubenkan.cpp - eastern_kingdoms/stratholme/boss_order_of_silver_hand.cpp - eastern_kingdoms/stratholme/boss_postmaster_malown.cpp - eastern_kingdoms/stratholme/boss_ramstein_the_gorger.cpp - eastern_kingdoms/stratholme/boss_timmy_the_cruel.cpp - eastern_kingdoms/stratholme/stratholme.h - eastern_kingdoms/stratholme/instance_stratholme.cpp - eastern_kingdoms/stratholme/stratholme.cpp - eastern_kingdoms/sunken_temple/sunken_temple.h - eastern_kingdoms/sunken_temple/instance_sunken_temple.cpp - eastern_kingdoms/sunken_temple/sunken_temple.cpp - eastern_kingdoms/sunwell_plateau/boss_kiljaeden.cpp - eastern_kingdoms/sunwell_plateau/boss_muru.cpp - eastern_kingdoms/sunwell_plateau/boss_eredar_twins.cpp - eastern_kingdoms/sunwell_plateau/boss_felmyst.cpp - eastern_kingdoms/sunwell_plateau/boss_brutallus.cpp - eastern_kingdoms/sunwell_plateau/boss_kalecgos.cpp - eastern_kingdoms/sunwell_plateau/sunwell_plateau.cpp - eastern_kingdoms/sunwell_plateau/sunwell_plateau.h - eastern_kingdoms/sunwell_plateau/instance_sunwell_plateau.cpp - eastern_kingdoms/uldaman/boss_archaedas.cpp - eastern_kingdoms/uldaman/instance_uldaman.cpp - eastern_kingdoms/uldaman/boss_ironaya.cpp - eastern_kingdoms/uldaman/uldaman.cpp - eastern_kingdoms/zulaman/boss_akilzon.cpp - eastern_kingdoms/zulaman/boss_halazzi.cpp - eastern_kingdoms/zulaman/boss_hexlord.cpp - eastern_kingdoms/zulaman/boss_janalai.cpp - eastern_kingdoms/zulaman/boss_nalorakk.cpp - eastern_kingdoms/zulaman/boss_zuljin.cpp - eastern_kingdoms/zulaman/zulaman.h - eastern_kingdoms/zulaman/instance_zulaman.cpp - eastern_kingdoms/zulaman/zulaman.cpp - eastern_kingdoms/zulgurub/boss_arlokk.cpp - eastern_kingdoms/zulgurub/boss_gahzranka.cpp - eastern_kingdoms/zulgurub/boss_grilek.cpp - eastern_kingdoms/zulgurub/boss_hakkar.cpp - eastern_kingdoms/zulgurub/boss_hazzarah.cpp - eastern_kingdoms/zulgurub/boss_jeklik.cpp - eastern_kingdoms/zulgurub/boss_jindo.cpp - eastern_kingdoms/zulgurub/boss_mandokir.cpp - eastern_kingdoms/zulgurub/boss_marli.cpp - eastern_kingdoms/zulgurub/boss_renataki.cpp - eastern_kingdoms/zulgurub/boss_thekal.cpp - eastern_kingdoms/zulgurub/boss_venoxis.cpp - eastern_kingdoms/zulgurub/boss_wushoolay.cpp - eastern_kingdoms/zulgurub/zulgurub.h - eastern_kingdoms/zulgurub/instance_zulgurub.cpp - eastern_kingdoms/alterac_mountains.cpp - eastern_kingdoms/arathi_highlands.cpp - eastern_kingdoms/blasted_lands.cpp - eastern_kingdoms/boss_kruul.cpp - eastern_kingdoms/burning_steppes.cpp - eastern_kingdoms/dun_morogh.cpp - eastern_kingdoms/duskwood.cpp - eastern_kingdoms/eastern_plaguelands.cpp - eastern_kingdoms/elwynn_forest.cpp - eastern_kingdoms/eversong_woods.cpp - eastern_kingdoms/ghostlands.cpp - eastern_kingdoms/hinterlands.cpp - eastern_kingdoms/ironforge.cpp - eastern_kingdoms/isle_of_queldanas.cpp - eastern_kingdoms/loch_modan.cpp - eastern_kingdoms/redridge_mountains.cpp - eastern_kingdoms/searing_gorge.cpp - eastern_kingdoms/silvermoon_city.cpp - eastern_kingdoms/silverpine_forest.cpp - eastern_kingdoms/stormwind_city.cpp - eastern_kingdoms/stranglethorn_vale.cpp - eastern_kingdoms/tirisfal_glades.cpp - eastern_kingdoms/undercity.cpp - eastern_kingdoms/western_plaguelands.cpp - eastern_kingdoms/westfall.cpp - eastern_kingdoms/wetlands.cpp - examples/example_creature.cpp - examples/example_escort.cpp - examples/example_gossip_codebox.cpp - examples/example_misc.cpp - kalimdor/blackfathom_depths/boss_gelihast.cpp - kalimdor/blackfathom_depths/boss_kelris.cpp - kalimdor/blackfathom_depths/boss_aku_mai.cpp - kalimdor/blackfathom_depths/instance_blackfathom_deeps.cpp - kalimdor/blackfathom_depths/blackfathom_deeps.cpp - kalimdor/blackfathom_depths/blackfathom_deeps.h - kalimdor/caverns_of_time/culling_of_stratholme/instance_culling_of_stratholme.cpp - kalimdor/caverns_of_time/culling_of_stratholme/boss_meathook.cpp - kalimdor/caverns_of_time/culling_of_stratholme/boss_epoch.cpp - kalimdor/caverns_of_time/culling_of_stratholme/boss_mal_ganis.cpp - kalimdor/caverns_of_time/culling_of_stratholme/boss_salramm.cpp - kalimdor/caverns_of_time/culling_of_stratholme/boss_infinite.cpp - kalimdor/caverns_of_time/culling_of_stratholme/culling_of_stratholme.cpp - kalimdor/caverns_of_time/culling_of_stratholme/culling_of_stratholme.h - kalimdor/caverns_of_time/dark_portal/dark_portal.h - kalimdor/caverns_of_time/dark_portal/instance_dark_portal.cpp - kalimdor/caverns_of_time/dark_portal/dark_portal.cpp - kalimdor/caverns_of_time/dark_portal/boss_aeonus.cpp - kalimdor/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp - kalimdor/caverns_of_time/dark_portal/boss_temporus.cpp - kalimdor/caverns_of_time/hyjal/boss_anetheron.cpp - kalimdor/caverns_of_time/hyjal/boss_archimonde.cpp - kalimdor/caverns_of_time/hyjal/boss_azgalor.cpp - kalimdor/caverns_of_time/hyjal/boss_kazrogal.cpp - kalimdor/caverns_of_time/hyjal/boss_rage_winterchill.cpp - kalimdor/caverns_of_time/hyjal/hyjal.h - kalimdor/caverns_of_time/hyjal/hyjal.cpp - kalimdor/caverns_of_time/hyjal/hyjal_trash.cpp - kalimdor/caverns_of_time/hyjal/hyjal_trash.h - kalimdor/caverns_of_time/hyjal/hyjalAI.cpp - kalimdor/caverns_of_time/hyjal/hyjalAI.h - kalimdor/caverns_of_time/hyjal/instance_hyjal.cpp - kalimdor/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp - kalimdor/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp - kalimdor/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp - kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.h - kalimdor/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp - kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp - kalimdor/maraudon/boss_celebras_the_cursed.cpp - kalimdor/maraudon/boss_landslide.cpp - kalimdor/maraudon/boss_noxxion.cpp - kalimdor/maraudon/boss_princess_theradras.cpp - kalimdor/onyxias_lair/boss_onyxia.cpp - kalimdor/onyxias_lair/instance_onyxias_lair.cpp - kalimdor/razorfen_downs/boss_amnennar_the_coldbringer.cpp - kalimdor/razorfen_downs/razorfen_downs.cpp - kalimdor/razorfen_downs/instance_razorfen_downs.cpp - kalimdor/razorfen_downs/razorfen_downs.h - kalimdor/razorfen_kraul/razorfen_kraul.h - kalimdor/razorfen_kraul/instance_razorfen_kraul.cpp - kalimdor/razorfen_kraul/razorfen_kraul.cpp - kalimdor/ruins_of_ahnqiraj/boss_ayamiss.cpp - kalimdor/ruins_of_ahnqiraj/boss_buru.cpp - kalimdor/ruins_of_ahnqiraj/boss_kurinnaxx.cpp - kalimdor/ruins_of_ahnqiraj/boss_moam.cpp - kalimdor/ruins_of_ahnqiraj/boss_ossirian.cpp - kalimdor/ruins_of_ahnqiraj/boss_rajaxx.cpp - kalimdor/ruins_of_ahnqiraj/ruins_of_ahnqiraj.h - kalimdor/ruins_of_ahnqiraj/instance_ruins_of_ahnqiraj.cpp - kalimdor/temple_of_ahnqiraj/boss_bug_trio.cpp - kalimdor/temple_of_ahnqiraj/boss_cthun.cpp - kalimdor/temple_of_ahnqiraj/boss_fankriss.cpp - kalimdor/temple_of_ahnqiraj/boss_huhuran.cpp - kalimdor/temple_of_ahnqiraj/boss_ouro.cpp - kalimdor/temple_of_ahnqiraj/boss_sartura.cpp - kalimdor/temple_of_ahnqiraj/boss_skeram.cpp - kalimdor/temple_of_ahnqiraj/boss_twinemperors.cpp - kalimdor/temple_of_ahnqiraj/boss_viscidus.cpp - kalimdor/temple_of_ahnqiraj/temple_of_ahnqiraj.h - kalimdor/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp - kalimdor/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp - kalimdor/wailing_caverns/wailing_caverns.h - kalimdor/wailing_caverns/instance_wailing_caverns.cpp - kalimdor/wailing_caverns/wailing_caverns.cpp - kalimdor/zulfarrak/zulfarrak.cpp - kalimdor/zulfarrak/instance_zulfarrak.cpp - kalimdor/ashenvale.cpp - kalimdor/azshara.cpp - kalimdor/azuremyst_isle.cpp - kalimdor/bloodmyst_isle.cpp - kalimdor/boss_azuregos.cpp - kalimdor/darkshore.cpp - kalimdor/desolace.cpp - kalimdor/durotar.cpp - kalimdor/dustwallow_marsh.cpp - kalimdor/felwood.cpp - kalimdor/feralas.cpp - kalimdor/moonglade.cpp - kalimdor/mulgore.cpp - kalimdor/orgrimmar.cpp - kalimdor/silithus.cpp - kalimdor/stonetalon_mountains.cpp - kalimdor/tanaris.cpp - kalimdor/teldrassil.cpp - kalimdor/the_barrens.cpp - kalimdor/thousand_needles.cpp - kalimdor/thunder_bluff.cpp - kalimdor/ungoro_crater.cpp - kalimdor/winterspring.cpp - northrend/azjol_nerub/azjol_nerub/instance_azjol_nerub.cpp - northrend/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp - northrend/azjol_nerub/azjol_nerub/boss_hadronox.cpp - northrend/azjol_nerub/azjol_nerub/boss_anubarak.cpp - northrend/azjol_nerub/azjol_nerub/azjol_nerub.h - northrend/azjol_nerub/ahnkahet/instance_ahnkahet.cpp - northrend/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp - northrend/azjol_nerub/ahnkahet/boss_elder_nadox.cpp - northrend/azjol_nerub/ahnkahet/boss_jedoga_shadowseeker.cpp - northrend/azjol_nerub/ahnkahet/boss_herald_volazj.cpp - northrend/azjol_nerub/ahnkahet/boss_amanitar.cpp - northrend/azjol_nerub/ahnkahet/ahnkahet.h - northrend/crusaders_coliseum/trial_of_the_champion/boss_argent_challenge.cpp - northrend/crusaders_coliseum/trial_of_the_champion/boss_black_knight.cpp - northrend/crusaders_coliseum/trial_of_the_champion/boss_grand_champions.cpp - northrend/crusaders_coliseum/trial_of_the_champion/instance_trial_of_the_champion.cpp - northrend/crusaders_coliseum/trial_of_the_champion/trial_of_the_champion.cpp - northrend/crusaders_coliseum/trial_of_the_champion/trial_of_the_champion.h - northrend/draktharon_keep/instance_drak_tharon_keep.cpp - northrend/draktharon_keep/boss_trollgore.cpp - northrend/draktharon_keep/boss_novos.cpp - northrend/draktharon_keep/boss_dred.cpp - northrend/draktharon_keep/boss_tharon_ja.cpp - northrend/draktharon_keep/drak_tharon_keep.h - northrend/frozen_halls/forge_of_souls/instance_forge_of_souls.cpp - northrend/frozen_halls/forge_of_souls/boss_bronjahm.cpp - northrend/frozen_halls/forge_of_souls/boss_devourer_of_souls.cpp - northrend/frozen_halls/forge_of_souls/forge_of_souls.h - northrend/frozen_halls/forge_of_souls/forge_of_souls.cpp - northrend/frozen_halls/halls_of_reflection/boss_falric.cpp - northrend/frozen_halls/halls_of_reflection/boss_marwyn.cpp - northrend/frozen_halls/halls_of_reflection/instance_halls_of_reflection.cpp - northrend/frozen_halls/halls_of_reflection/halls_of_reflection.cpp - northrend/frozen_halls/halls_of_reflection/halls_of_reflection.h - northrend/frozen_halls/pit_of_saron/boss_forgemaster_garfrost.cpp - northrend/frozen_halls/pit_of_saron/boss_krickandick.cpp - northrend/frozen_halls/pit_of_saron/boss_scourgelord_tyrannus.cpp - northrend/frozen_halls/pit_of_saron/instance_pit_of_saron.cpp - northrend/frozen_halls/pit_of_saron/pit_of_saron.cpp - northrend/frozen_halls/pit_of_saron/pit_of_saron.h - northrend/gundrak/instance_gundrak.cpp - northrend/gundrak/boss_slad_ran.cpp - northrend/gundrak/boss_moorabi.cpp - northrend/gundrak/boss_drakkari_colossus.cpp - northrend/gundrak/boss_gal_darah.cpp - northrend/gundrak/boss_eck.cpp - northrend/gundrak/gundrak.h - northrend/naxxramas/boss_anubrekhan.cpp - northrend/naxxramas/boss_faerlina.cpp - northrend/naxxramas/boss_gluth.cpp - northrend/naxxramas/boss_gothik.cpp - northrend/naxxramas/boss_grobbulus.cpp - northrend/naxxramas/boss_heigan.cpp - northrend/naxxramas/boss_kelthuzad.cpp - northrend/naxxramas/boss_four_horsemen.cpp - northrend/naxxramas/boss_loatheb.cpp - northrend/naxxramas/boss_maexxna.cpp - northrend/naxxramas/boss_noth.cpp - northrend/naxxramas/boss_patchwerk.cpp - northrend/naxxramas/boss_razuvious.cpp - northrend/naxxramas/boss_sapphiron.cpp - northrend/naxxramas/boss_thaddius.cpp - northrend/naxxramas/naxxramas.h - northrend/naxxramas/instance_naxxramas.cpp - northrend/nexus/eye_of_eternity/instance_eye_of_eternity.cpp - northrend/nexus/eye_of_eternity/boss_malygos.cpp - northrend/nexus/eye_of_eternity/eye_of_eternity.h - northrend/nexus/nexus/instance_nexus.cpp - northrend/nexus/nexus/boss_magus_telestra.cpp - northrend/nexus/nexus/boss_anomalus.cpp - northrend/nexus/nexus/boss_ormorok.cpp - northrend/nexus/nexus/boss_keristrasza.cpp - northrend/nexus/nexus/commander_stoutbeard.cpp - northrend/nexus/nexus/commander_kolurg.cpp - northrend/nexus/nexus/nexus.h - northrend/nexus/oculus/instance_oculus.cpp - northrend/nexus/oculus/boss_drakos.cpp - northrend/nexus/oculus/boss_urom.cpp - northrend/nexus/oculus/boss_varos.cpp - northrend/nexus/oculus/boss_eregos.cpp - northrend/nexus/oculus/oculus.h - northrend/nexus/oculus/oculus.cpp - northrend/obsidian_sanctum/instance_obsidian_sanctum.cpp - northrend/obsidian_sanctum/boss_sartharion.cpp - northrend/obsidian_sanctum/obsidian_sanctum.h - northrend/ulduar/halls_of_stone/instance_halls_of_stone.cpp - northrend/ulduar/halls_of_stone/boss_maiden_of_grief.cpp - northrend/ulduar/halls_of_stone/boss_krystallus.cpp - northrend/ulduar/halls_of_stone/boss_sjonnir.cpp - northrend/ulduar/halls_of_stone/halls_of_stone.h - northrend/ulduar/halls_of_stone/halls_of_stone.cpp - northrend/ulduar/halls_of_lightning/instance_halls_of_lightning.cpp - northrend/ulduar/halls_of_lightning/boss_bjarngrim.cpp - northrend/ulduar/halls_of_lightning/boss_ionar.cpp - northrend/ulduar/halls_of_lightning/boss_volkhan.cpp - northrend/ulduar/halls_of_lightning/boss_loken.cpp - northrend/ulduar/halls_of_lightning/halls_of_lightning.h - northrend/ulduar/ulduar/boss_algalon.cpp - northrend/ulduar/ulduar/boss_assembly_of_iron.cpp - northrend/ulduar/ulduar/boss_auriaya.cpp - northrend/ulduar/ulduar/boss_flame_leviathan.cpp - northrend/ulduar/ulduar/boss_freya.cpp - northrend/ulduar/ulduar/boss_general_vezax.cpp - northrend/ulduar/ulduar/boss_hodir.cpp - northrend/ulduar/ulduar/boss_ignis.cpp - northrend/ulduar/ulduar/boss_kologarn.cpp - northrend/ulduar/ulduar/boss_mimiron.cpp - northrend/ulduar/ulduar/boss_razorscale.cpp - northrend/ulduar/ulduar/boss_thorim.cpp - northrend/ulduar/ulduar/boss_xt002.cpp - northrend/ulduar/ulduar/boss_yoggsaron.cpp - northrend/ulduar/ulduar/ulduar_teleporter.cpp - northrend/ulduar/ulduar/ulduar.h - northrend/ulduar/ulduar/instance_ulduar.cpp - northrend/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp - northrend/utgarde_keep/utgarde_keep/boss_keleseth.cpp - northrend/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp - northrend/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp - northrend/utgarde_keep/utgarde_keep/utgarde_keep.h - northrend/utgarde_keep/utgarde_keep/utgarde_keep.cpp - northrend/utgarde_keep/utgarde_pinnacle/instance_pinnacle.cpp - northrend/utgarde_keep/utgarde_pinnacle/boss_skadi.cpp - northrend/utgarde_keep/utgarde_pinnacle/boss_ymiron.cpp - northrend/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp - northrend/utgarde_keep/utgarde_pinnacle/boss_svala.cpp - northrend/utgarde_keep/utgarde_pinnacle/utgarde_pinnacle.h - northrend/vault_of_archavon/instance_vault_of_archavon.cpp - northrend/vault_of_archavon/boss_archavon.cpp - northrend/vault_of_archavon/boss_emalon.cpp - northrend/vault_of_archavon/boss_koralon.cpp - northrend/vault_of_archavon/boss_toravon.cpp - northrend/vault_of_archavon/vault_of_archavon.h - northrend/violet_hold/instance_violet_hold.cpp - northrend/violet_hold/boss_cyanigosa.cpp - northrend/violet_hold/boss_erekem.cpp - northrend/violet_hold/boss_ichoron.cpp - northrend/violet_hold/boss_lavanthor.cpp - northrend/violet_hold/boss_moragg.cpp - northrend/violet_hold/boss_xevozz.cpp - northrend/violet_hold/boss_zuramat.cpp - northrend/violet_hold/violet_hold.h - northrend/violet_hold/violet_hold.cpp - northrend/dalaran.cpp - northrend/borean_tundra.cpp - northrend/dragonblight.cpp - northrend/grizzly_hills.cpp - northrend/howling_fjord.cpp - northrend/icecrown.cpp - northrend/sholazar_basin.cpp - northrend/storm_peaks.cpp - northrend/zuldrak.cpp - northrend/crystalsong_forest.cpp - outland/auchindoun/auchenai_crypts/boss_exarch_maladaar.cpp - outland/auchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp - outland/auchindoun/mana_tombs/boss_nexusprince_shaffar.cpp - outland/auchindoun/mana_tombs/boss_pandemonius.cpp - outland/auchindoun/sethekk_halls/boss_darkweaver_syth.cpp - outland/auchindoun/sethekk_halls/boss_tailonking_ikiss.cpp - outland/auchindoun/sethekk_halls/sethekk_halls.h - outland/auchindoun/sethekk_halls/instance_sethekk_halls.cpp - outland/auchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp - outland/auchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp - outland/auchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp - outland/auchindoun/shadow_labyrinth/boss_murmur.cpp - outland/auchindoun/shadow_labyrinth/shadow_labyrinth.h - outland/auchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp - outland/black_temple/black_temple.cpp - outland/black_temple/boss_bloodboil.cpp - outland/black_temple/boss_illidan.cpp - outland/black_temple/boss_mother_shahraz.cpp - outland/black_temple/boss_reliquary_of_souls.cpp - outland/black_temple/boss_shade_of_akama.cpp - outland/black_temple/boss_supremus.cpp - outland/black_temple/boss_teron_gorefiend.cpp - outland/black_temple/boss_warlord_najentus.cpp - outland/black_temple/black_temple.h - outland/black_temple/illidari_council.cpp - outland/black_temple/instance_black_temple.cpp - outland/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp - outland/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp - outland/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp - outland/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp - outland/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp - outland/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp - outland/coilfang_resevoir/serpent_shrine/serpent_shrine.h - outland/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp - outland/coilfang_resevoir/steam_vault/boss_hydromancer_thespia.cpp - outland/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp - outland/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp - outland/coilfang_resevoir/steam_vault/steam_vault.h - outland/coilfang_resevoir/steam_vault/instance_steam_vault.cpp - outland/coilfang_resevoir/underbog/boss_hungarfen.cpp - outland/coilfang_resevoir/underbog/boss_the_black_stalker.cpp - outland/gruuls_lair/boss_gruul.cpp - outland/gruuls_lair/boss_high_king_maulgar.cpp - outland/gruuls_lair/gruuls_lair.h - outland/gruuls_lair/instance_gruuls_lair.cpp - outland/hellfire_citadel/blood_furnace/boss_broggok.cpp - outland/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp - outland/hellfire_citadel/blood_furnace/boss_the_maker.cpp - outland/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp - outland/hellfire_citadel/blood_furnace/blood_furnace.h - outland/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp - outland/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp - outland/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp - outland/hellfire_citadel/hellfire_ramparts/hellfire_ramparts.h - outland/hellfire_citadel/hellfire_ramparts/instance_hellfire_ramparts.cpp - outland/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp - outland/hellfire_citadel/magtheridons_lair/magtheridons_lair.h - outland/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp - outland/hellfire_citadel/shattered_halls/boss_nethekurse.cpp - outland/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp - outland/hellfire_citadel/shattered_halls/shattered_halls.h - outland/hellfire_citadel/shattered_halls/instance_shattered_halls.cpp - outland/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp - outland/tempest_keep/arcatraz/arcatraz.cpp - outland/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp - outland/tempest_keep/arcatraz/arcatraz.h - outland/tempest_keep/arcatraz/instance_arcatraz.cpp - outland/tempest_keep/botanica/boss_high_botanist_freywinn.cpp - outland/tempest_keep/botanica/boss_laj.cpp - outland/tempest_keep/botanica/boss_warp_splinter.cpp - outland/tempest_keep/the_eye/boss_alar.cpp - outland/tempest_keep/the_eye/boss_astromancer.cpp - outland/tempest_keep/the_eye/boss_kaelthas.cpp - outland/tempest_keep/the_eye/boss_void_reaver.cpp - outland/tempest_keep/the_eye/the_eye.h - outland/tempest_keep/the_eye/instance_the_eye.cpp - outland/tempest_keep/the_eye/the_eye.cpp - outland/tempest_keep/the_mechanar/boss_gatewatcher_gyrokill.cpp - outland/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp - outland/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp - outland/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp - outland/tempest_keep/the_mechanar/mechanar.h - outland/tempest_keep/the_mechanar/instance_mechanar.cpp - outland/blades_edge_mountains.cpp - outland/boss_doomlord_kazzak.cpp - outland/boss_doomwalker.cpp - outland/hellfire_peninsula.cpp - outland/nagrand.cpp - outland/netherstorm.cpp - outland/shadowmoon_valley.cpp - outland/shattrath_city.cpp - outland/terokkar_forest.cpp - outland/zangarmarsh.cpp - world/areatrigger_scripts.cpp - world/boss_emeriss.cpp - world/boss_lethon.cpp - world/boss_taerar.cpp - world/boss_ysondre.cpp - world/go_scripts.cpp - world/guards.cpp - world/item_scripts.cpp - world/mob_generic_creature.cpp - world/npc_innkeeper.cpp - world/npc_professions.cpp - world/npcs_special.cpp - world/npc_taxi.cpp + Custom/on_events.cpp + EasternKingdoms/alterac_valley/alterac_valley.cpp + EasternKingdoms/alterac_valley/boss_balinda.cpp + EasternKingdoms/alterac_valley/boss_drekthar.cpp + EasternKingdoms/alterac_valley/boss_galvangar.cpp + EasternKingdoms/alterac_valley/boss_vanndar.cpp + EasternKingdoms/blackrock_depths/blackrock_depths.cpp + EasternKingdoms/blackrock_depths/boss_ambassador_flamelash.cpp + EasternKingdoms/blackrock_depths/boss_anubshiah.cpp + EasternKingdoms/blackrock_depths/boss_emperor_dagran_thaurissan.cpp + EasternKingdoms/blackrock_depths/boss_general_angerforge.cpp + EasternKingdoms/blackrock_depths/boss_gorosh_the_dervish.cpp + EasternKingdoms/blackrock_depths/boss_grizzle.cpp + EasternKingdoms/blackrock_depths/boss_high_interrogator_gerstahn.cpp + EasternKingdoms/blackrock_depths/boss_magmus.cpp + EasternKingdoms/blackrock_depths/boss_moira_bronzebeard.cpp + EasternKingdoms/blackrock_depths/boss_tomb_of_seven.cpp + EasternKingdoms/blackrock_depths/blackrock_depths.h + EasternKingdoms/blackrock_depths/instance_blackrock_depths.cpp + EasternKingdoms/blackrock_spire/blackrock_spire.cpp + EasternKingdoms/blackrock_spire/boss_drakkisath.cpp + EasternKingdoms/blackrock_spire/boss_gyth.cpp + EasternKingdoms/blackrock_spire/boss_halycon.cpp + EasternKingdoms/blackrock_spire/boss_highlord_omokk.cpp + EasternKingdoms/blackrock_spire/boss_mother_smolderweb.cpp + EasternKingdoms/blackrock_spire/boss_overlord_wyrmthalak.cpp + EasternKingdoms/blackrock_spire/boss_pyroguard_emberseer.cpp + EasternKingdoms/blackrock_spire/boss_quartermaster_zigris.cpp + EasternKingdoms/blackrock_spire/boss_rend_blackhand.cpp + EasternKingdoms/blackrock_spire/boss_shadow_hunter_voshgajin.cpp + EasternKingdoms/blackrock_spire/boss_the_beast.cpp + EasternKingdoms/blackrock_spire/boss_warmaster_voone.cpp + EasternKingdoms/blackrock_spire/blackrock_spire.h + EasternKingdoms/blackrock_spire/instance_blackrock_spire.cpp + EasternKingdoms/blackwing_lair/boss_broodlord_lashlayer.cpp + EasternKingdoms/blackwing_lair/boss_chromaggus.cpp + EasternKingdoms/blackwing_lair/boss_ebonroc.cpp + EasternKingdoms/blackwing_lair/boss_firemaw.cpp + EasternKingdoms/blackwing_lair/boss_flamegor.cpp + EasternKingdoms/blackwing_lair/boss_nefarian.cpp + EasternKingdoms/blackwing_lair/boss_razorgore.cpp + EasternKingdoms/blackwing_lair/boss_vaelastrasz.cpp + EasternKingdoms/blackwing_lair/boss_victor_nefarius.cpp + EasternKingdoms/blackwing_lair/instance_blackwing_lair.cpp + EasternKingdoms/deadmines/boss_mr_smite.cpp + EasternKingdoms/deadmines/deadmines.h + EasternKingdoms/deadmines/deadmines.cpp + EasternKingdoms/deadmines/instance_deadmines.cpp + EasternKingdoms/gnomeregan/gnomeregan.h + EasternKingdoms/gnomeregan/gnomeregan.cpp + EasternKingdoms/gnomeregan/instance_gnomeregan.cpp + EasternKingdoms/karazhan/boss_curator.cpp + EasternKingdoms/karazhan/boss_maiden_of_virtue.cpp + EasternKingdoms/karazhan/boss_midnight.cpp + EasternKingdoms/karazhan/boss_moroes.cpp + EasternKingdoms/karazhan/boss_netherspite.cpp + EasternKingdoms/karazhan/boss_nightbane.cpp + EasternKingdoms/karazhan/boss_prince_malchezaar.cpp + EasternKingdoms/karazhan/boss_shade_of_aran.cpp + EasternKingdoms/karazhan/boss_terestian_illhoof.cpp + EasternKingdoms/karazhan/bosses_opera.cpp + EasternKingdoms/karazhan/karazhan.h + EasternKingdoms/karazhan/instance_karazhan.cpp + EasternKingdoms/karazhan/karazhan.cpp + EasternKingdoms/magisters_terrace/boss_felblood_kaelthas.cpp + EasternKingdoms/magisters_terrace/boss_priestess_delrissa.cpp + EasternKingdoms/magisters_terrace/boss_selin_fireheart.cpp + EasternKingdoms/magisters_terrace/boss_vexallus.cpp + EasternKingdoms/magisters_terrace/magisters_terrace.h + EasternKingdoms/magisters_terrace/instance_magisters_terrace.cpp + EasternKingdoms/magisters_terrace/magisters_terrace.cpp + EasternKingdoms/molten_core/boss_baron_geddon.cpp + EasternKingdoms/molten_core/boss_garr.cpp + EasternKingdoms/molten_core/boss_gehennas.cpp + EasternKingdoms/molten_core/boss_golemagg.cpp + EasternKingdoms/molten_core/boss_lucifron.cpp + EasternKingdoms/molten_core/boss_magmadar.cpp + EasternKingdoms/molten_core/boss_majordomo_executus.cpp + EasternKingdoms/molten_core/boss_ragnaros.cpp + EasternKingdoms/molten_core/boss_shazzrah.cpp + EasternKingdoms/molten_core/boss_sulfuron_harbinger.cpp + EasternKingdoms/molten_core/molten_core.h + EasternKingdoms/molten_core/instance_molten_core.cpp + EasternKingdoms/molten_core/molten_core.cpp + EasternKingdoms/scarlet_enclave/the_scarlet_enclave.cpp + EasternKingdoms/scarlet_enclave/chapter1.cpp + EasternKingdoms/scarlet_enclave/chapter2.cpp + EasternKingdoms/scarlet_enclave/chapter5.cpp + EasternKingdoms/scarlet_monastery/boss_arcanist_doan.cpp + EasternKingdoms/scarlet_monastery/boss_azshir_the_sleepless.cpp + EasternKingdoms/scarlet_monastery/boss_bloodmage_thalnos.cpp + EasternKingdoms/scarlet_monastery/boss_herod.cpp + EasternKingdoms/scarlet_monastery/boss_high_inquisitor_fairbanks.cpp + EasternKingdoms/scarlet_monastery/boss_houndmaster_loksey.cpp + EasternKingdoms/scarlet_monastery/boss_interrogator_vishas.cpp + EasternKingdoms/scarlet_monastery/boss_scorn.cpp + EasternKingdoms/scarlet_monastery/boss_headless_horseman.cpp + EasternKingdoms/scarlet_monastery/boss_mograine_and_whitemane.cpp + EasternKingdoms/scarlet_monastery/instance_scarlet_monastery.cpp + EasternKingdoms/scarlet_monastery/scarlet_monastery.h + EasternKingdoms/scholomance/boss_darkmaster_gandling.cpp + EasternKingdoms/scholomance/boss_death_knight_darkreaver.cpp + EasternKingdoms/scholomance/boss_doctor_theolen_krastinov.cpp + EasternKingdoms/scholomance/boss_illucia_barov.cpp + EasternKingdoms/scholomance/boss_instructor_malicia.cpp + EasternKingdoms/scholomance/boss_jandice_barov.cpp + EasternKingdoms/scholomance/boss_kormok.cpp + EasternKingdoms/scholomance/boss_lord_alexei_barov.cpp + EasternKingdoms/scholomance/boss_lorekeeper_polkelt.cpp + EasternKingdoms/scholomance/boss_ras_frostwhisper.cpp + EasternKingdoms/scholomance/boss_the_ravenian.cpp + EasternKingdoms/scholomance/boss_vectus.cpp + EasternKingdoms/scholomance/scholomance.h + EasternKingdoms/scholomance/instance_scholomance.cpp + EasternKingdoms/shadowfang_keep/shadowfang_keep.h + EasternKingdoms/shadowfang_keep/instance_shadowfang_keep.cpp + EasternKingdoms/shadowfang_keep/shadowfang_keep.cpp + EasternKingdoms/stratholme/boss_baron_rivendare.cpp + EasternKingdoms/stratholme/boss_baroness_anastari.cpp + EasternKingdoms/stratholme/boss_cannon_master_willey.cpp + EasternKingdoms/stratholme/boss_dathrohan_balnazzar.cpp + EasternKingdoms/stratholme/boss_magistrate_barthilas.cpp + EasternKingdoms/stratholme/boss_maleki_the_pallid.cpp + EasternKingdoms/stratholme/boss_nerubenkan.cpp + EasternKingdoms/stratholme/boss_order_of_silver_hand.cpp + EasternKingdoms/stratholme/boss_postmaster_malown.cpp + EasternKingdoms/stratholme/boss_ramstein_the_gorger.cpp + EasternKingdoms/stratholme/boss_timmy_the_cruel.cpp + EasternKingdoms/stratholme/stratholme.h + EasternKingdoms/stratholme/instance_stratholme.cpp + EasternKingdoms/stratholme/stratholme.cpp + EasternKingdoms/sunken_temple/sunken_temple.h + EasternKingdoms/sunken_temple/instance_sunken_temple.cpp + EasternKingdoms/sunken_temple/sunken_temple.cpp + EasternKingdoms/sunwell_plateau/boss_kiljaeden.cpp + EasternKingdoms/sunwell_plateau/boss_muru.cpp + EasternKingdoms/sunwell_plateau/boss_eredar_twins.cpp + EasternKingdoms/sunwell_plateau/boss_felmyst.cpp + EasternKingdoms/sunwell_plateau/boss_brutallus.cpp + EasternKingdoms/sunwell_plateau/boss_kalecgos.cpp + EasternKingdoms/sunwell_plateau/sunwell_plateau.cpp + EasternKingdoms/sunwell_plateau/sunwell_plateau.h + EasternKingdoms/sunwell_plateau/instance_sunwell_plateau.cpp + EasternKingdoms/uldaman/boss_archaedas.cpp + EasternKingdoms/uldaman/instance_uldaman.cpp + EasternKingdoms/uldaman/boss_ironaya.cpp + EasternKingdoms/uldaman/uldaman.cpp + EasternKingdoms/zulaman/boss_akilzon.cpp + EasternKingdoms/zulaman/boss_halazzi.cpp + EasternKingdoms/zulaman/boss_hexlord.cpp + EasternKingdoms/zulaman/boss_janalai.cpp + EasternKingdoms/zulaman/boss_nalorakk.cpp + EasternKingdoms/zulaman/boss_zuljin.cpp + EasternKingdoms/zulaman/zulaman.h + EasternKingdoms/zulaman/instance_zulaman.cpp + EasternKingdoms/zulaman/zulaman.cpp + EasternKingdoms/zulgurub/boss_arlokk.cpp + EasternKingdoms/zulgurub/boss_gahzranka.cpp + EasternKingdoms/zulgurub/boss_grilek.cpp + EasternKingdoms/zulgurub/boss_hakkar.cpp + EasternKingdoms/zulgurub/boss_hazzarah.cpp + EasternKingdoms/zulgurub/boss_jeklik.cpp + EasternKingdoms/zulgurub/boss_jindo.cpp + EasternKingdoms/zulgurub/boss_mandokir.cpp + EasternKingdoms/zulgurub/boss_marli.cpp + EasternKingdoms/zulgurub/boss_renataki.cpp + EasternKingdoms/zulgurub/boss_thekal.cpp + EasternKingdoms/zulgurub/boss_venoxis.cpp + EasternKingdoms/zulgurub/boss_wushoolay.cpp + EasternKingdoms/zulgurub/zulgurub.h + EasternKingdoms/zulgurub/instance_zulgurub.cpp + EasternKingdoms/alterac_mountains.cpp + EasternKingdoms/arathi_highlands.cpp + EasternKingdoms/blasted_lands.cpp + EasternKingdoms/boss_kruul.cpp + EasternKingdoms/burning_steppes.cpp + EasternKingdoms/dun_morogh.cpp + EasternKingdoms/duskwood.cpp + EasternKingdoms/eastern_plaguelands.cpp + EasternKingdoms/elwynn_forest.cpp + EasternKingdoms/eversong_woods.cpp + EasternKingdoms/ghostlands.cpp + EasternKingdoms/hinterlands.cpp + EasternKingdoms/ironforge.cpp + EasternKingdoms/isle_of_queldanas.cpp + EasternKingdoms/loch_modan.cpp + EasternKingdoms/redridge_mountains.cpp + EasternKingdoms/searing_gorge.cpp + EasternKingdoms/silvermoon_city.cpp + EasternKingdoms/silverpine_forest.cpp + EasternKingdoms/stormwind_city.cpp + EasternKingdoms/stranglethorn_vale.cpp + EasternKingdoms/tirisfal_glades.cpp + EasternKingdoms/undercity.cpp + EasternKingdoms/western_plaguelands.cpp + EasternKingdoms/westfall.cpp + EasternKingdoms/wetlands.cpp + Examples/example_creature.cpp + Examples/example_escort.cpp + Examples/example_gossip_codebox.cpp + Examples/example_misc.cpp + Kalimdor/blackfathom_depths/boss_gelihast.cpp + Kalimdor/blackfathom_depths/boss_kelris.cpp + Kalimdor/blackfathom_depths/boss_aku_mai.cpp + Kalimdor/blackfathom_depths/instance_blackfathom_deeps.cpp + Kalimdor/blackfathom_depths/blackfathom_deeps.cpp + Kalimdor/blackfathom_depths/blackfathom_deeps.h + Kalimdor/caverns_of_time/culling_of_stratholme/instance_culling_of_stratholme.cpp + Kalimdor/caverns_of_time/culling_of_stratholme/boss_meathook.cpp + Kalimdor/caverns_of_time/culling_of_stratholme/boss_epoch.cpp + Kalimdor/caverns_of_time/culling_of_stratholme/boss_mal_ganis.cpp + Kalimdor/caverns_of_time/culling_of_stratholme/boss_salramm.cpp + Kalimdor/caverns_of_time/culling_of_stratholme/boss_infinite.cpp + Kalimdor/caverns_of_time/culling_of_stratholme/culling_of_stratholme.cpp + Kalimdor/caverns_of_time/culling_of_stratholme/culling_of_stratholme.h + Kalimdor/caverns_of_time/dark_portal/dark_portal.h + Kalimdor/caverns_of_time/dark_portal/instance_dark_portal.cpp + Kalimdor/caverns_of_time/dark_portal/dark_portal.cpp + Kalimdor/caverns_of_time/dark_portal/boss_aeonus.cpp + Kalimdor/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp + Kalimdor/caverns_of_time/dark_portal/boss_temporus.cpp + Kalimdor/caverns_of_time/hyjal/boss_anetheron.cpp + Kalimdor/caverns_of_time/hyjal/boss_archimonde.cpp + Kalimdor/caverns_of_time/hyjal/boss_azgalor.cpp + Kalimdor/caverns_of_time/hyjal/boss_kazrogal.cpp + Kalimdor/caverns_of_time/hyjal/boss_rage_winterchill.cpp + Kalimdor/caverns_of_time/hyjal/hyjal.h + Kalimdor/caverns_of_time/hyjal/hyjal.cpp + Kalimdor/caverns_of_time/hyjal/hyjal_trash.cpp + Kalimdor/caverns_of_time/hyjal/hyjal_trash.h + Kalimdor/caverns_of_time/hyjal/hyjalAI.cpp + Kalimdor/caverns_of_time/hyjal/hyjalAI.h + Kalimdor/caverns_of_time/hyjal/instance_hyjal.cpp + Kalimdor/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp + Kalimdor/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp + Kalimdor/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp + Kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.h + Kalimdor/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp + Kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp + Kalimdor/maraudon/boss_celebras_the_cursed.cpp + Kalimdor/maraudon/boss_landslide.cpp + Kalimdor/maraudon/boss_noxxion.cpp + Kalimdor/maraudon/boss_princess_theradras.cpp + Kalimdor/onyxias_lair/boss_onyxia.cpp + Kalimdor/onyxias_lair/instance_onyxias_lair.cpp + Kalimdor/razorfen_downs/boss_amnennar_the_coldbringer.cpp + Kalimdor/razorfen_downs/razorfen_downs.cpp + Kalimdor/razorfen_downs/instance_razorfen_downs.cpp + Kalimdor/razorfen_downs/razorfen_downs.h + Kalimdor/razorfen_kraul/razorfen_kraul.h + Kalimdor/razorfen_kraul/instance_razorfen_kraul.cpp + Kalimdor/razorfen_kraul/razorfen_kraul.cpp + Kalimdor/ruins_of_ahnqiraj/boss_ayamiss.cpp + Kalimdor/ruins_of_ahnqiraj/boss_buru.cpp + Kalimdor/ruins_of_ahnqiraj/boss_kurinnaxx.cpp + Kalimdor/ruins_of_ahnqiraj/boss_moam.cpp + Kalimdor/ruins_of_ahnqiraj/boss_ossirian.cpp + Kalimdor/ruins_of_ahnqiraj/boss_rajaxx.cpp + Kalimdor/ruins_of_ahnqiraj/ruins_of_ahnqiraj.h + Kalimdor/ruins_of_ahnqiraj/instance_ruins_of_ahnqiraj.cpp + Kalimdor/temple_of_ahnqiraj/boss_bug_trio.cpp + Kalimdor/temple_of_ahnqiraj/boss_cthun.cpp + Kalimdor/temple_of_ahnqiraj/boss_fankriss.cpp + Kalimdor/temple_of_ahnqiraj/boss_huhuran.cpp + Kalimdor/temple_of_ahnqiraj/boss_ouro.cpp + Kalimdor/temple_of_ahnqiraj/boss_sartura.cpp + Kalimdor/temple_of_ahnqiraj/boss_skeram.cpp + Kalimdor/temple_of_ahnqiraj/boss_twinemperors.cpp + Kalimdor/temple_of_ahnqiraj/boss_viscidus.cpp + Kalimdor/temple_of_ahnqiraj/temple_of_ahnqiraj.h + Kalimdor/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp + Kalimdor/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp + Kalimdor/wailing_caverns/wailing_caverns.h + Kalimdor/wailing_caverns/instance_wailing_caverns.cpp + Kalimdor/wailing_caverns/wailing_caverns.cpp + Kalimdor/zulfarrak/zulfarrak.cpp + Kalimdor/zulfarrak/instance_zulfarrak.cpp + Kalimdor/ashenvale.cpp + Kalimdor/azshara.cpp + Kalimdor/azuremyst_isle.cpp + Kalimdor/bloodmyst_isle.cpp + Kalimdor/boss_azuregos.cpp + Kalimdor/darkshore.cpp + Kalimdor/desolace.cpp + Kalimdor/durotar.cpp + Kalimdor/dustwallow_marsh.cpp + Kalimdor/felwood.cpp + Kalimdor/feralas.cpp + Kalimdor/moonglade.cpp + Kalimdor/mulgore.cpp + Kalimdor/orgrimmar.cpp + Kalimdor/silithus.cpp + Kalimdor/stonetalon_mountains.cpp + Kalimdor/tanaris.cpp + Kalimdor/teldrassil.cpp + Kalimdor/the_barrens.cpp + Kalimdor/thousand_needles.cpp + Kalimdor/thunder_bluff.cpp + Kalimdor/ungoro_crater.cpp + Kalimdor/winterspring.cpp + Northrend/azjol_nerub/azjol_nerub/instance_azjol_nerub.cpp + Northrend/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp + Northrend/azjol_nerub/azjol_nerub/boss_hadronox.cpp + Northrend/azjol_nerub/azjol_nerub/boss_anubarak.cpp + Northrend/azjol_nerub/azjol_nerub/azjol_nerub.h + Northrend/azjol_nerub/ahnkahet/instance_ahnkahet.cpp + Northrend/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp + Northrend/azjol_nerub/ahnkahet/boss_elder_nadox.cpp + Northrend/azjol_nerub/ahnkahet/boss_jedoga_shadowseeker.cpp + Northrend/azjol_nerub/ahnkahet/boss_herald_volazj.cpp + Northrend/azjol_nerub/ahnkahet/boss_amanitar.cpp + Northrend/azjol_nerub/ahnkahet/ahnkahet.h + Northrend/crusaders_coliseum/trial_of_the_champion/boss_argent_challenge.cpp + Northrend/crusaders_coliseum/trial_of_the_champion/boss_black_knight.cpp + Northrend/crusaders_coliseum/trial_of_the_champion/boss_grand_champions.cpp + Northrend/crusaders_coliseum/trial_of_the_champion/instance_trial_of_the_champion.cpp + Northrend/crusaders_coliseum/trial_of_the_champion/trial_of_the_champion.cpp + Northrend/crusaders_coliseum/trial_of_the_champion/trial_of_the_champion.h + Northrend/draktharon_keep/instance_drak_tharon_keep.cpp + Northrend/draktharon_keep/boss_trollgore.cpp + Northrend/draktharon_keep/boss_novos.cpp + Northrend/draktharon_keep/boss_dred.cpp + Northrend/draktharon_keep/boss_tharon_ja.cpp + Northrend/draktharon_keep/drak_tharon_keep.h + Northrend/frozen_halls/forge_of_souls/instance_forge_of_souls.cpp + Northrend/frozen_halls/forge_of_souls/boss_bronjahm.cpp + Northrend/frozen_halls/forge_of_souls/boss_devourer_of_souls.cpp + Northrend/frozen_halls/forge_of_souls/forge_of_souls.h + Northrend/frozen_halls/forge_of_souls/forge_of_souls.cpp + Northrend/frozen_halls/halls_of_reflection/boss_falric.cpp + Northrend/frozen_halls/halls_of_reflection/boss_marwyn.cpp + Northrend/frozen_halls/halls_of_reflection/instance_halls_of_reflection.cpp + Northrend/frozen_halls/halls_of_reflection/halls_of_reflection.cpp + Northrend/frozen_halls/halls_of_reflection/halls_of_reflection.h + Northrend/frozen_halls/pit_of_saron/boss_forgemaster_garfrost.cpp + Northrend/frozen_halls/pit_of_saron/boss_krickandick.cpp + Northrend/frozen_halls/pit_of_saron/boss_scourgelord_tyrannus.cpp + Northrend/frozen_halls/pit_of_saron/instance_pit_of_saron.cpp + Northrend/frozen_halls/pit_of_saron/pit_of_saron.cpp + Northrend/frozen_halls/pit_of_saron/pit_of_saron.h + Northrend/gundrak/instance_gundrak.cpp + Northrend/gundrak/boss_slad_ran.cpp + Northrend/gundrak/boss_moorabi.cpp + Northrend/gundrak/boss_drakkari_colossus.cpp + Northrend/gundrak/boss_gal_darah.cpp + Northrend/gundrak/boss_eck.cpp + Northrend/gundrak/gundrak.h + Northrend/naxxramas/boss_anubrekhan.cpp + Northrend/naxxramas/boss_faerlina.cpp + Northrend/naxxramas/boss_gluth.cpp + Northrend/naxxramas/boss_gothik.cpp + Northrend/naxxramas/boss_grobbulus.cpp + Northrend/naxxramas/boss_heigan.cpp + Northrend/naxxramas/boss_kelthuzad.cpp + Northrend/naxxramas/boss_four_horsemen.cpp + Northrend/naxxramas/boss_loatheb.cpp + Northrend/naxxramas/boss_maexxna.cpp + Northrend/naxxramas/boss_noth.cpp + Northrend/naxxramas/boss_patchwerk.cpp + Northrend/naxxramas/boss_razuvious.cpp + Northrend/naxxramas/boss_sapphiron.cpp + Northrend/naxxramas/boss_thaddius.cpp + Northrend/naxxramas/naxxramas.h + Northrend/naxxramas/instance_naxxramas.cpp + Northrend/nexus/eye_of_eternity/instance_eye_of_eternity.cpp + Northrend/nexus/eye_of_eternity/boss_malygos.cpp + Northrend/nexus/eye_of_eternity/eye_of_eternity.h + Northrend/nexus/nexus/instance_nexus.cpp + Northrend/nexus/nexus/boss_magus_telestra.cpp + Northrend/nexus/nexus/boss_anomalus.cpp + Northrend/nexus/nexus/boss_ormorok.cpp + Northrend/nexus/nexus/boss_keristrasza.cpp + Northrend/nexus/nexus/commander_stoutbeard.cpp + Northrend/nexus/nexus/commander_kolurg.cpp + Northrend/nexus/nexus/nexus.h + Northrend/nexus/oculus/instance_oculus.cpp + Northrend/nexus/oculus/boss_drakos.cpp + Northrend/nexus/oculus/boss_urom.cpp + Northrend/nexus/oculus/boss_varos.cpp + Northrend/nexus/oculus/boss_eregos.cpp + Northrend/nexus/oculus/oculus.h + Northrend/nexus/oculus/oculus.cpp + Northrend/obsidian_sanctum/instance_obsidian_sanctum.cpp + Northrend/obsidian_sanctum/boss_sartharion.cpp + Northrend/obsidian_sanctum/obsidian_sanctum.h + Northrend/ulduar/halls_of_stone/instance_halls_of_stone.cpp + Northrend/ulduar/halls_of_stone/boss_maiden_of_grief.cpp + Northrend/ulduar/halls_of_stone/boss_krystallus.cpp + Northrend/ulduar/halls_of_stone/boss_sjonnir.cpp + Northrend/ulduar/halls_of_stone/halls_of_stone.h + Northrend/ulduar/halls_of_stone/halls_of_stone.cpp + Northrend/ulduar/halls_of_lightning/instance_halls_of_lightning.cpp + Northrend/ulduar/halls_of_lightning/boss_bjarngrim.cpp + Northrend/ulduar/halls_of_lightning/boss_ionar.cpp + Northrend/ulduar/halls_of_lightning/boss_volkhan.cpp + Northrend/ulduar/halls_of_lightning/boss_loken.cpp + Northrend/ulduar/halls_of_lightning/halls_of_lightning.h + Northrend/ulduar/ulduar/boss_algalon.cpp + Northrend/ulduar/ulduar/boss_assembly_of_iron.cpp + Northrend/ulduar/ulduar/boss_auriaya.cpp + Northrend/ulduar/ulduar/boss_flame_leviathan.cpp + Northrend/ulduar/ulduar/boss_freya.cpp + Northrend/ulduar/ulduar/boss_general_vezax.cpp + Northrend/ulduar/ulduar/boss_hodir.cpp + Northrend/ulduar/ulduar/boss_ignis.cpp + Northrend/ulduar/ulduar/boss_kologarn.cpp + Northrend/ulduar/ulduar/boss_mimiron.cpp + Northrend/ulduar/ulduar/boss_razorscale.cpp + Northrend/ulduar/ulduar/boss_thorim.cpp + Northrend/ulduar/ulduar/boss_xt002.cpp + Northrend/ulduar/ulduar/boss_yoggsaron.cpp + Northrend/ulduar/ulduar/ulduar_teleporter.cpp + Northrend/ulduar/ulduar/ulduar.h + Northrend/ulduar/ulduar/instance_ulduar.cpp + Northrend/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp + Northrend/utgarde_keep/utgarde_keep/boss_keleseth.cpp + Northrend/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp + Northrend/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp + Northrend/utgarde_keep/utgarde_keep/utgarde_keep.h + Northrend/utgarde_keep/utgarde_keep/utgarde_keep.cpp + Northrend/utgarde_keep/utgarde_pinnacle/instance_pinnacle.cpp + Northrend/utgarde_keep/utgarde_pinnacle/boss_skadi.cpp + Northrend/utgarde_keep/utgarde_pinnacle/boss_ymiron.cpp + Northrend/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp + Northrend/utgarde_keep/utgarde_pinnacle/boss_svala.cpp + Northrend/utgarde_keep/utgarde_pinnacle/utgarde_pinnacle.h + Northrend/vault_of_archavon/instance_vault_of_archavon.cpp + Northrend/vault_of_archavon/boss_archavon.cpp + Northrend/vault_of_archavon/boss_emalon.cpp + Northrend/vault_of_archavon/boss_koralon.cpp + Northrend/vault_of_archavon/boss_toravon.cpp + Northrend/vault_of_archavon/vault_of_archavon.h + Northrend/violet_hold/instance_violet_hold.cpp + Northrend/violet_hold/boss_cyanigosa.cpp + Northrend/violet_hold/boss_erekem.cpp + Northrend/violet_hold/boss_ichoron.cpp + Northrend/violet_hold/boss_lavanthor.cpp + Northrend/violet_hold/boss_moragg.cpp + Northrend/violet_hold/boss_xevozz.cpp + Northrend/violet_hold/boss_zuramat.cpp + Northrend/violet_hold/violet_hold.h + Northrend/violet_hold/violet_hold.cpp + Northrend/dalaran.cpp + Northrend/borean_tundra.cpp + Northrend/dragonblight.cpp + Northrend/grizzly_hills.cpp + Northrend/howling_fjord.cpp + Northrend/icecrown.cpp + Northrend/sholazar_basin.cpp + Northrend/storm_peaks.cpp + Northrend/zuldrak.cpp + Northrend/crystalsong_forest.cpp + Outland/auchindoun/auchenai_crypts/boss_exarch_maladaar.cpp + Outland/auchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp + Outland/auchindoun/mana_tombs/boss_nexusprince_shaffar.cpp + Outland/auchindoun/mana_tombs/boss_pandemonius.cpp + Outland/auchindoun/sethekk_halls/boss_darkweaver_syth.cpp + Outland/auchindoun/sethekk_halls/boss_tailonking_ikiss.cpp + Outland/auchindoun/sethekk_halls/sethekk_halls.h + Outland/auchindoun/sethekk_halls/instance_sethekk_halls.cpp + Outland/auchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp + Outland/auchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp + Outland/auchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp + Outland/auchindoun/shadow_labyrinth/boss_murmur.cpp + Outland/auchindoun/shadow_labyrinth/shadow_labyrinth.h + Outland/auchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp + Outland/black_temple/black_temple.cpp + Outland/black_temple/boss_bloodboil.cpp + Outland/black_temple/boss_illidan.cpp + Outland/black_temple/boss_mother_shahraz.cpp + Outland/black_temple/boss_reliquary_of_souls.cpp + Outland/black_temple/boss_shade_of_akama.cpp + Outland/black_temple/boss_supremus.cpp + Outland/black_temple/boss_teron_gorefiend.cpp + Outland/black_temple/boss_warlord_najentus.cpp + Outland/black_temple/black_temple.h + Outland/black_temple/illidari_council.cpp + Outland/black_temple/instance_black_temple.cpp + Outland/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp + Outland/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp + Outland/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp + Outland/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp + Outland/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp + Outland/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp + Outland/coilfang_resevoir/serpent_shrine/serpent_shrine.h + Outland/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp + Outland/coilfang_resevoir/steam_vault/boss_hydromancer_thespia.cpp + Outland/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp + Outland/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp + Outland/coilfang_resevoir/steam_vault/steam_vault.h + Outland/coilfang_resevoir/steam_vault/instance_steam_vault.cpp + Outland/coilfang_resevoir/underbog/boss_hungarfen.cpp + Outland/coilfang_resevoir/underbog/boss_the_black_stalker.cpp + Outland/gruuls_lair/boss_gruul.cpp + Outland/gruuls_lair/boss_high_king_maulgar.cpp + Outland/gruuls_lair/gruuls_lair.h + Outland/gruuls_lair/instance_gruuls_lair.cpp + Outland/hellfire_citadel/blood_furnace/boss_broggok.cpp + Outland/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp + Outland/hellfire_citadel/blood_furnace/boss_the_maker.cpp + Outland/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp + Outland/hellfire_citadel/blood_furnace/blood_furnace.h + Outland/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp + Outland/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp + Outland/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp + Outland/hellfire_citadel/hellfire_ramparts/hellfire_ramparts.h + Outland/hellfire_citadel/hellfire_ramparts/instance_hellfire_ramparts.cpp + Outland/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp + Outland/hellfire_citadel/magtheridons_lair/magtheridons_lair.h + Outland/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp + Outland/hellfire_citadel/shattered_halls/boss_nethekurse.cpp + Outland/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp + Outland/hellfire_citadel/shattered_halls/shattered_halls.h + Outland/hellfire_citadel/shattered_halls/instance_shattered_halls.cpp + Outland/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp + Outland/tempest_keep/arcatraz/arcatraz.cpp + Outland/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp + Outland/tempest_keep/arcatraz/arcatraz.h + Outland/tempest_keep/arcatraz/instance_arcatraz.cpp + Outland/tempest_keep/botanica/boss_high_botanist_freywinn.cpp + Outland/tempest_keep/botanica/boss_laj.cpp + Outland/tempest_keep/botanica/boss_warp_splinter.cpp + Outland/tempest_keep/the_eye/boss_alar.cpp + Outland/tempest_keep/the_eye/boss_astromancer.cpp + Outland/tempest_keep/the_eye/boss_kaelthas.cpp + Outland/tempest_keep/the_eye/boss_void_reaver.cpp + Outland/tempest_keep/the_eye/the_eye.h + Outland/tempest_keep/the_eye/instance_the_eye.cpp + Outland/tempest_keep/the_eye/the_eye.cpp + Outland/tempest_keep/the_mechanar/boss_gatewatcher_gyrokill.cpp + Outland/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp + Outland/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp + Outland/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp + Outland/tempest_keep/the_mechanar/mechanar.h + Outland/tempest_keep/the_mechanar/instance_mechanar.cpp + Outland/blades_edge_mountains.cpp + Outland/boss_doomlord_kazzak.cpp + Outland/boss_doomwalker.cpp + Outland/hellfire_peninsula.cpp + Outland/nagrand.cpp + Outland/netherstorm.cpp + Outland/shadowmoon_valley.cpp + Outland/shattrath_city.cpp + Outland/terokkar_forest.cpp + Outland/zangarmarsh.cpp + World/areatrigger_scripts.cpp + World/boss_emeriss.cpp + World/boss_lethon.cpp + World/boss_taerar.cpp + World/boss_ysondre.cpp + World/go_scripts.cpp + World/guards.cpp + World/item_scripts.cpp + World/mob_generic_creature.cpp + World/npc_innkeeper.cpp + World/npc_professions.cpp + World/npcs_special.cpp + World/npc_taxi.cpp ) message("-- Added Script Engine to SCRIPTS lib") diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt index 5e0a2f40adf..a9ecb23e72b 100644 --- a/src/server/shared/CMakeLists.txt +++ b/src/server/shared/CMakeLists.txt @@ -13,22 +13,22 @@ add_subdirectory(Utilities) ########### next target ############### SET(shared_STAT_SRCS - ByteBuffer.h + Debugging/Errors.h + Logging/Log.cpp + Logging/Log.h + Packets/ByteBuffer.h + Packets/WorldPacket.h + Threading/DelayExecutor.cpp + Threading/DelayExecutor.h + Threading/Threading.cpp + Utilities/ProgressBar.cpp + Utilities/ProgressBar.h + Utilities/SignalHandler.h + Utilities/Timer.h + Utilities/Util.cpp + Utilities/Util.h Common.cpp Common.h - DelayExecutor.cpp - DelayExecutor.h - Errors.h - Log.cpp - Log.h - ProgressBar.cpp - ProgressBar.h - SignalHandler.h - Threading.cpp - Timer.h - Util.cpp - Util.h - WorldPacket.h SystemConfig.h ) diff --git a/src/server/shared/Cryptography/CMakeLists.txt b/src/server/shared/Cryptography/CMakeLists.txt index 6e5d10d40e5..cdd9ece3fa0 100644 --- a/src/server/shared/Cryptography/CMakeLists.txt +++ b/src/server/shared/Cryptography/CMakeLists.txt @@ -2,25 +2,24 @@ ########### next target ############### SET(trinityauth_STAT_SRCS - AuthCrypt.cpp - AuthCrypt.h + Authentication/AuthCrypt.cpp + Authentication/AuthCrypt.h BigNumber.cpp BigNumber.h - Hmac.cpp - Hmac.h - Sha1.cpp - Sha1.h - md5.c - md5.h - SARC4.cpp - SARC4.h + HMACSHA1.cpp + HMACSHA1.h + SHA1.cpp + SHA1.h + MD5.c + MD5.h + ARC4.cpp + ARC4.h ) include_directories( ${ACE_INCLUDE_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/src/server/shared - ${CMAKE_SOURCE_DIR}/src/server/framework ${MYSQL_INCLUDE_DIR} ) diff --git a/src/server/shared/Database/CMakeLists.txt b/src/server/shared/Database/CMakeLists.txt index e30c8ae3ca2..cfe36b8c7d3 100644 --- a/src/server/shared/Database/CMakeLists.txt +++ b/src/server/shared/Database/CMakeLists.txt @@ -1,7 +1,7 @@ SET(trinitydatabase_STAT_SRCS - DBCFileLoader.cpp - DBCFileLoader.h - DBCStore.h + ../DataStores/DBCFileLoader.cpp + ../DataStores/DBCFileLoader.h + ../DataStores/DBCStore.h Database.cpp Database.h DatabaseEnv.h @@ -23,7 +23,6 @@ include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/src/server/shared ${CMAKE_SOURCE_DIR}/src/server/shared/Database - ${CMAKE_SOURCE_DIR}/src/server/framework ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object ${MYSQL_INCLUDE_DIR} ) diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt index 3adfbf0339f..61f68851408 100644 --- a/src/server/worldserver/CMakeLists.txt +++ b/src/server/worldserver/CMakeLists.txt @@ -2,15 +2,15 @@ ########### next target ############### SET(trinity-core_SRCS -CliRunnable.cpp -CliRunnable.h +CommandLine/CliRunnable.cpp +CommandLine/CliRunnable.h +RemoteAccess/RASocket.cpp +RemoteAccess/RASocket.h +WorldThread/WorldRunnable.cpp +WorldThread/WorldRunnable.h Main.cpp Master.cpp Master.h -RASocket.cpp -RASocket.h -WorldRunnable.cpp -WorldRunnable.h ) include_directories( @@ -19,8 +19,6 @@ include_directories( ${CMAKE_SOURCE_DIR}/dep/include ${CMAKE_SOURCE_DIR}/src/server/shared ${CMAKE_SOURCE_DIR}/src/server/shared/Database - ${CMAKE_SOURCE_DIR}/src/server/shared/vmap - ${CMAKE_SOURCE_DIR}/src/server/framework ${CMAKE_SOURCE_DIR}/src/server/game ${CMAKE_SOURCE_DIR}/src/server/game/Account ${CMAKE_SOURCE_DIR}/src/server/game/Achievements -- cgit v1.2.3 From bef0ed9a7ff9cab7acf198558a695bc914c61d13 Mon Sep 17 00:00:00 2001 From: Tartalo Date: Mon, 7 Jun 2010 12:57:21 +0200 Subject: Fix some paths on shared/ includes and CMakeLists.txt --HG-- branch : trunk --- src/server/shared/CMakeLists.txt | 11 +++++++++++ src/server/shared/Common.h | 4 ++-- src/server/shared/Define.h | 2 +- 3 files changed, 14 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt index a9ecb23e72b..028c2185b79 100644 --- a/src/server/shared/CMakeLists.txt +++ b/src/server/shared/CMakeLists.txt @@ -38,6 +38,17 @@ include_directories( ${CMAKE_SOURCE_DIR}/dep/include ${CMAKE_SOURCE_DIR}/dep/include/sockets ${CMAKE_SOURCE_DIR}/src/server/shared + ${CMAKE_SOURCE_DIR}/src/server/shared/Configuration + ${CMAKE_SOURCE_DIR}/src/server/shared/Cryptography + ${CMAKE_SOURCE_DIR}/src/server/shared/Database + ${CMAKE_SOURCE_DIR}/src/server/shared/DataStores + ${CMAKE_SOURCE_DIR}/src/server/shared/Debugging + ${CMAKE_SOURCE_DIR}/src/server/shared/Dynamic + ${CMAKE_SOURCE_DIR}/src/server/shared/Logging + ${CMAKE_SOURCE_DIR}/src/server/shared/Packets + ${CMAKE_SOURCE_DIR}/src/server/shared/Policies + ${CMAKE_SOURCE_DIR}/src/server/shared/Threading + ${CMAKE_SOURCE_DIR}/src/server/shared/Utilities ${MYSQL_INCLUDE_DIR} ) diff --git a/src/server/shared/Common.h b/src/server/shared/Common.h index 4a6aac43390..b4ba254fbeb 100644 --- a/src/server/shared/Common.h +++ b/src/server/shared/Common.h @@ -59,7 +59,7 @@ #undef VERSION #endif //HAVE_CONFIG_H -#include "Platform/Define.h" +#include "Define.h" #if COMPILER == COMPILER_MICROSOFT # pragma warning(disable:4996) // 'function': was declared deprecated @@ -76,7 +76,7 @@ #endif // __SHOW_STUPID_WARNINGS__ #endif // __GNUC__ -#include "Utilities/UnorderedMap.h" +#include "UnorderedMap.h" #include #include #include diff --git a/src/server/shared/Define.h b/src/server/shared/Define.h index 9285bf289f9..980cf9023e1 100644 --- a/src/server/shared/Define.h +++ b/src/server/shared/Define.h @@ -26,7 +26,7 @@ #include #include -#include "Platform/CompilerDefs.h" +#include "CompilerDefs.h" #define TRINITY_LITTLEENDIAN 0 #define TRINITY_BIGENDIAN 1 -- cgit v1.2.3 From 24c720d8993804b7575a31bfc1b83514a1dfd492 Mon Sep 17 00:00:00 2001 From: Machiavelli Date: Mon, 7 Jun 2010 13:24:32 +0200 Subject: Fix a typo, spotted by tigercop773. If the reset of the repo wasn´t entirely borked, this would have fixed compile. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --HG-- branch : trunk --- src/server/game/Entities/Unit/Unit.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index d92e7b4770a..7f488945139 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -4336,11 +4336,11 @@ void Unit::RemoveAreaAurasDueToLeaveWorld() void Unit::RemoveAllAuras() { AuraApplicationMap::iterator aurAppIter; - for (aurAppIter = m_appliedAuras.begin(); aurAppIter != m_appliedAuras.end()) + for (aurAppIter = m_appliedAuras.begin(); aurAppIter != m_appliedAuras.end();) _UnapplyAura(aurAppIter, AURA_REMOVE_BY_DEFAULT); AuraMap::iterator aurIter; - for (aurIter = m_ownedAuras.begin(); aurIter != m_ownedAuras.end()) + for (aurIter = m_ownedAuras.begin(); aurIter != m_ownedAuras.end();) RemoveOwnedAura(aurIter); } -- cgit v1.2.3 From fcd58c134dc532a99dbc19a884b9f3aa9ec70b69 Mon Sep 17 00:00:00 2001 From: XTZGZoReX Date: Mon, 7 Jun 2010 13:57:34 +0200 Subject: * Move VMap3 code to a separate static 'collision' library. --HG-- branch : trunk --- src/server/CMakeLists.txt | 5 +- src/server/collision/BoundingIntervalHierarchy.cpp | 304 ++++++++++++ src/server/collision/BoundingIntervalHierarchy.h | 391 +++++++++++++++ src/server/collision/CMakeLists.txt | 29 ++ src/server/collision/Management/IVMapManager.h | 106 ++++ src/server/collision/Management/VMapFactory.cpp | 136 ++++++ src/server/collision/Management/VMapFactory.h | 43 ++ src/server/collision/Management/VMapManager2.cpp | 336 +++++++++++++ src/server/collision/Management/VMapManager2.h | 114 +++++ src/server/collision/Maps/MapTree.cpp | 450 +++++++++++++++++ src/server/collision/Maps/MapTree.h | 97 ++++ src/server/collision/Maps/TileAssembler.cpp | 494 +++++++++++++++++++ src/server/collision/Maps/TileAssembler.h | 89 ++++ src/server/collision/Models/ModelInstance.cpp | 219 +++++++++ src/server/collision/Models/ModelInstance.h | 81 ++++ src/server/collision/Models/WorldModel.cpp | 535 +++++++++++++++++++++ src/server/collision/Models/WorldModel.h | 123 +++++ src/server/collision/VMapDefinitions.h | 42 ++ src/server/collision/VMapTools.h | 150 ++++++ .../BoundingIntervalHierarchy.cpp | 304 ------------ .../CollisionDetection/BoundingIntervalHierarchy.h | 391 --------------- src/server/game/CollisionDetection/CMakeLists.txt | 30 -- src/server/game/CollisionDetection/IVMapManager.h | 106 ---- src/server/game/CollisionDetection/MapTree.cpp | 450 ----------------- src/server/game/CollisionDetection/MapTree.h | 97 ---- .../game/CollisionDetection/ModelInstance.cpp | 219 --------- src/server/game/CollisionDetection/ModelInstance.h | 81 ---- .../game/CollisionDetection/TileAssembler.cpp | 494 ------------------- src/server/game/CollisionDetection/TileAssembler.h | 89 ---- .../game/CollisionDetection/VMapDefinitions.h | 42 -- src/server/game/CollisionDetection/VMapFactory.cpp | 136 ------ src/server/game/CollisionDetection/VMapFactory.h | 43 -- .../game/CollisionDetection/VMapManager2.cpp | 336 ------------- src/server/game/CollisionDetection/VMapManager2.h | 114 ----- src/server/game/CollisionDetection/VMapTools.h | 150 ------ src/server/game/CollisionDetection/WorldModel.cpp | 535 --------------------- src/server/game/CollisionDetection/WorldModel.h | 123 ----- 37 files changed, 3742 insertions(+), 3742 deletions(-) create mode 100644 src/server/collision/BoundingIntervalHierarchy.cpp create mode 100644 src/server/collision/BoundingIntervalHierarchy.h create mode 100644 src/server/collision/CMakeLists.txt create mode 100644 src/server/collision/Management/IVMapManager.h create mode 100644 src/server/collision/Management/VMapFactory.cpp create mode 100644 src/server/collision/Management/VMapFactory.h create mode 100644 src/server/collision/Management/VMapManager2.cpp create mode 100644 src/server/collision/Management/VMapManager2.h create mode 100644 src/server/collision/Maps/MapTree.cpp create mode 100644 src/server/collision/Maps/MapTree.h create mode 100644 src/server/collision/Maps/TileAssembler.cpp create mode 100644 src/server/collision/Maps/TileAssembler.h create mode 100644 src/server/collision/Models/ModelInstance.cpp create mode 100644 src/server/collision/Models/ModelInstance.h create mode 100644 src/server/collision/Models/WorldModel.cpp create mode 100644 src/server/collision/Models/WorldModel.h create mode 100644 src/server/collision/VMapDefinitions.h create mode 100644 src/server/collision/VMapTools.h delete mode 100644 src/server/game/CollisionDetection/BoundingIntervalHierarchy.cpp delete mode 100644 src/server/game/CollisionDetection/BoundingIntervalHierarchy.h delete mode 100644 src/server/game/CollisionDetection/CMakeLists.txt delete mode 100644 src/server/game/CollisionDetection/IVMapManager.h delete mode 100644 src/server/game/CollisionDetection/MapTree.cpp delete mode 100644 src/server/game/CollisionDetection/MapTree.h delete mode 100644 src/server/game/CollisionDetection/ModelInstance.cpp delete mode 100644 src/server/game/CollisionDetection/ModelInstance.h delete mode 100644 src/server/game/CollisionDetection/TileAssembler.cpp delete mode 100644 src/server/game/CollisionDetection/TileAssembler.h delete mode 100644 src/server/game/CollisionDetection/VMapDefinitions.h delete mode 100644 src/server/game/CollisionDetection/VMapFactory.cpp delete mode 100644 src/server/game/CollisionDetection/VMapFactory.h delete mode 100644 src/server/game/CollisionDetection/VMapManager2.cpp delete mode 100644 src/server/game/CollisionDetection/VMapManager2.h delete mode 100644 src/server/game/CollisionDetection/VMapTools.h delete mode 100644 src/server/game/CollisionDetection/WorldModel.cpp delete mode 100644 src/server/game/CollisionDetection/WorldModel.h (limited to 'src') diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt index fa0cd1acce2..1a6321c23e3 100644 --- a/src/server/CMakeLists.txt +++ b/src/server/CMakeLists.txt @@ -1,7 +1,8 @@ +add_subdirectory(shared) add_subdirectory(game) +add_subdirectory(collision) if (DO_SCRIPTS) add_subdirectory(scripts) endif (DO_SCRIPTS) -add_subdirectory(shared) -add_subdirectory(worldserver) add_subdirectory(authserver) +add_subdirectory(worldserver) diff --git a/src/server/collision/BoundingIntervalHierarchy.cpp b/src/server/collision/BoundingIntervalHierarchy.cpp new file mode 100644 index 00000000000..4bd6b3c701e --- /dev/null +++ b/src/server/collision/BoundingIntervalHierarchy.cpp @@ -0,0 +1,304 @@ +/* + * Copyright (C) 2005-2010 MaNGOS + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "BIH.h" + +void BIH::buildHierarchy(std::vector &tempTree, buildData &dat, BuildStats &stats) +{ + // create space for the first node + tempTree.push_back(3 << 30); // dummy leaf + tempTree.insert(tempTree.end(), 2, 0); + //tempTree.add(0); + + // seed bbox + AABound gridBox = { bounds.low(), bounds.high() }; + AABound nodeBox = gridBox; + // seed subdivide function + subdivide(0, dat.numPrims - 1, tempTree, dat, gridBox, nodeBox, 0, 1, stats); +} + +void BIH::subdivide(int left, int right, std::vector &tempTree, buildData &dat, AABound &gridBox, AABound &nodeBox, int nodeIndex, int depth, BuildStats &stats) +{ + if ((right - left + 1) <= dat.maxPrims || depth >= MAX_STACK_SIZE) + { + // write leaf node + stats.updateLeaf(depth, right - left + 1); + createNode(tempTree, nodeIndex, left, right); + return; + } + // calculate extents + int axis = -1, prevAxis, rightOrig; + float clipL = G3D::fnan(), clipR = G3D::fnan(), prevClip = G3D::fnan(); + float split = G3D::fnan(), prevSplit; + bool wasLeft = true; + while (true) + { + prevAxis = axis; + prevSplit = split; + // perform quick consistency checks + Vector3 d( gridBox.hi - gridBox.lo ); + if (d.x < 0 || d.y < 0 || d.z < 0) + throw std::logic_error("negative node extents"); + for (int i = 0; i < 3; i++) + { + if (nodeBox.hi[i] < gridBox.lo[i] || nodeBox.lo[i] > gridBox.hi[i]) + { + //UI.printError(Module.ACCEL, "Reached tree area in error - discarding node with: %d objects", right - left + 1); + throw std::logic_error("invalid node overlap"); + } + } + // find longest axis + axis = d.primaryAxis(); + split = 0.5f * (gridBox.lo[axis] + gridBox.hi[axis]); + // partition L/R subsets + clipL = -G3D::inf(); + clipR = G3D::inf(); + rightOrig = right; // save this for later + float nodeL = G3D::inf(); + float nodeR = -G3D::inf(); + for (int i = left; i <= right;) + { + int obj = dat.indices[i]; + float minb = dat.primBound[obj].low()[axis]; + float maxb = dat.primBound[obj].high()[axis]; + float center = (minb + maxb) * 0.5f; + if (center <= split) + { + // stay left + i++; + if (clipL < maxb) + clipL = maxb; + } + else + { + // move to the right most + int t = dat.indices[i]; + dat.indices[i] = dat.indices[right]; + dat.indices[right] = t; + right--; + if (clipR > minb) + clipR = minb; + } + nodeL = std::min(nodeL, minb); + nodeR = std::max(nodeR, maxb); + } + // check for empty space + if (nodeL > nodeBox.lo[axis] && nodeR < nodeBox.hi[axis]) + { + float nodeBoxW = nodeBox.hi[axis] - nodeBox.lo[axis]; + float nodeNewW = nodeR - nodeL; + // node box is too big compare to space occupied by primitives? + if (1.3f * nodeNewW < nodeBoxW) + { + stats.updateBVH2(); + int nextIndex = tempTree.size(); + // allocate child + tempTree.push_back(0); + tempTree.push_back(0); + tempTree.push_back(0); + // write bvh2 clip node + stats.updateInner(); + tempTree[nodeIndex + 0] = (axis << 30) | (1 << 29) | nextIndex; + tempTree[nodeIndex + 1] = floatToRawIntBits(nodeL); + tempTree[nodeIndex + 2] = floatToRawIntBits(nodeR); + // update nodebox and recurse + nodeBox.lo[axis] = nodeL; + nodeBox.hi[axis] = nodeR; + subdivide(left, rightOrig, tempTree, dat, gridBox, nodeBox, nextIndex, depth + 1, stats); + return; + } + } + // ensure we are making progress in the subdivision + if (right == rightOrig) + { + // all left + if (prevAxis == axis && prevSplit == split) { + // we are stuck here - create a leaf + stats.updateLeaf(depth, right - left + 1); + createNode(tempTree, nodeIndex, left, right); + return; + } + if (clipL <= split) { + // keep looping on left half + gridBox.hi[axis] = split; + prevClip = clipL; + wasLeft = true; + continue; + } + gridBox.hi[axis] = split; + prevClip = G3D::fnan(); + } + else if (left > right) + { + // all right + if (prevAxis == axis && prevSplit == split) { + // we are stuck here - create a leaf + stats.updateLeaf(depth, right - left + 1); + createNode(tempTree, nodeIndex, left, right); + return; + } + right = rightOrig; + if (clipR >= split) { + // keep looping on right half + gridBox.lo[axis] = split; + prevClip = clipR; + wasLeft = false; + continue; + } + gridBox.lo[axis] = split; + prevClip = G3D::fnan(); + } + else + { + // we are actually splitting stuff + if (prevAxis != -1 && !isnan(prevClip)) + { + // second time through - lets create the previous split + // since it produced empty space + int nextIndex = tempTree.size(); + // allocate child node + tempTree.push_back(0); + tempTree.push_back(0); + tempTree.push_back(0); + if (wasLeft) { + // create a node with a left child + // write leaf node + stats.updateInner(); + tempTree[nodeIndex + 0] = (prevAxis << 30) | nextIndex; + tempTree[nodeIndex + 1] = floatToRawIntBits(prevClip); + tempTree[nodeIndex + 2] = floatToRawIntBits(G3D::inf()); + } else { + // create a node with a right child + // write leaf node + stats.updateInner(); + tempTree[nodeIndex + 0] = (prevAxis << 30) | (nextIndex - 3); + tempTree[nodeIndex + 1] = floatToRawIntBits(-G3D::inf()); + tempTree[nodeIndex + 2] = floatToRawIntBits(prevClip); + } + // count stats for the unused leaf + depth++; + stats.updateLeaf(depth, 0); + // now we keep going as we are, with a new nodeIndex: + nodeIndex = nextIndex; + } + break; + } + } + // compute index of child nodes + int nextIndex = tempTree.size(); + // allocate left node + int nl = right - left + 1; + int nr = rightOrig - (right + 1) + 1; + if (nl > 0) { + tempTree.push_back(0); + tempTree.push_back(0); + tempTree.push_back(0); + } else + nextIndex -= 3; + // allocate right node + if (nr > 0) { + tempTree.push_back(0); + tempTree.push_back(0); + tempTree.push_back(0); + } + // write leaf node + stats.updateInner(); + tempTree[nodeIndex + 0] = (axis << 30) | nextIndex; + tempTree[nodeIndex + 1] = floatToRawIntBits(clipL); + tempTree[nodeIndex + 2] = floatToRawIntBits(clipR); + // prepare L/R child boxes + AABound gridBoxL(gridBox), gridBoxR(gridBox); + AABound nodeBoxL(nodeBox), nodeBoxR(nodeBox); + gridBoxL.hi[axis] = gridBoxR.lo[axis] = split; + nodeBoxL.hi[axis] = clipL; + nodeBoxR.lo[axis] = clipR; + // recurse + if (nl > 0) + subdivide(left, right, tempTree, dat, gridBoxL, nodeBoxL, nextIndex, depth + 1, stats); + else + stats.updateLeaf(depth + 1, 0); + if (nr > 0) + subdivide(right + 1, rightOrig, tempTree, dat, gridBoxR, nodeBoxR, nextIndex + 3, depth + 1, stats); + else + stats.updateLeaf(depth + 1, 0); +} + +bool BIH::writeToFile(FILE *wf) const +{ + uint32 treeSize = tree.size(); + uint32 check=0, count=0; + check += fwrite(&bounds.low(), sizeof(float), 3, wf); + check += fwrite(&bounds.high(), sizeof(float), 3, wf); + check += fwrite(&treeSize, sizeof(uint32), 1, wf); + check += fwrite(&tree[0], sizeof(uint32), treeSize, wf); + count = objects.size(); + check += fwrite(&count, sizeof(uint32), 1, wf); + check += fwrite(&objects[0], sizeof(uint32), count, wf); + return check == (3 + 3 + 2 + treeSize + count); +} + +bool BIH::readFromFile(FILE *rf) +{ + uint32 treeSize; + Vector3 lo, hi; + uint32 check=0, count=0; + check += fread(&lo, sizeof(float), 3, rf); + check += fread(&hi, sizeof(float), 3, rf); + bounds = AABox(lo, hi); + check += fread(&treeSize, sizeof(uint32), 1, rf); + tree.resize(treeSize); + check += fread(&tree[0], sizeof(uint32), treeSize, rf); + check += fread(&count, sizeof(uint32), 1, rf); + objects.resize(count); // = new uint32[nObjects]; + check += fread(&objects[0], sizeof(uint32), count, rf); + return check == (3 + 3 + 2 + treeSize + count); +} + +void BIH::BuildStats::updateLeaf(int depth, int n) +{ + numLeaves++; + minDepth = std::min(depth, minDepth); + maxDepth = std::max(depth, maxDepth); + sumDepth += depth; + minObjects = std::min(n, minObjects); + maxObjects = std::max(n, maxObjects); + sumObjects += n; + int nl = std::min(n, 5); + ++numLeavesN[nl]; +} + +void BIH::BuildStats::printStats() +{ + printf("Tree stats:\n"); + printf(" * Nodes: %d\n", numNodes); + printf(" * Leaves: %d\n", numLeaves); + printf(" * Objects: min %d\n", minObjects); + printf(" avg %.2f\n", (float) sumObjects / numLeaves); + printf(" avg(n>0) %.2f\n", (float) sumObjects / (numLeaves - numLeavesN[0])); + printf(" max %d\n", maxObjects); + printf(" * Depth: min %d\n", minDepth); + printf(" avg %.2f\n", (float) sumDepth / numLeaves); + printf(" max %d\n", maxDepth); + printf(" * Leaves w/: N=0 %3d%%\n", 100 * numLeavesN[0] / numLeaves); + printf(" N=1 %3d%%\n", 100 * numLeavesN[1] / numLeaves); + printf(" N=2 %3d%%\n", 100 * numLeavesN[2] / numLeaves); + printf(" N=3 %3d%%\n", 100 * numLeavesN[3] / numLeaves); + printf(" N=4 %3d%%\n", 100 * numLeavesN[4] / numLeaves); + printf(" N>4 %3d%%\n", 100 * numLeavesN[5] / numLeaves); + printf(" * BVH2 nodes: %d (%3d%%)\n", numBVH2, 100 * numBVH2 / (numNodes + numLeaves - 2 * numBVH2)); +} diff --git a/src/server/collision/BoundingIntervalHierarchy.h b/src/server/collision/BoundingIntervalHierarchy.h new file mode 100644 index 00000000000..15ae90c23eb --- /dev/null +++ b/src/server/collision/BoundingIntervalHierarchy.h @@ -0,0 +1,391 @@ +/* + * Copyright (C) 2005-2010 MaNGOS + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef _BIH_H +#define _BIH_H + +#include +#include +#include + +#include + +#include +#include +#include +#include +#include + +#define MAX_STACK_SIZE 64 + +#ifdef _MSC_VER + #define isnan(x) _isnan(x) +#endif + +using G3D::Vector3; +using G3D::AABox; +using G3D::Ray; + +static inline uint32 floatToRawIntBits(float f) +{ + union + { + uint32 ival; + float fval; + } temp; + temp.fval=f; + return temp.ival; +} + +static inline float intBitsToFloat(uint32 i) +{ + union + { + uint32 ival; + float fval; + } temp; + temp.ival=i; + return temp.fval; +} + +struct AABound +{ + Vector3 lo, hi; +}; + +/** Bounding Interval Hierarchy Class. + Building and Ray-Intersection functions based on BIH from + Sunflow, a Java Raytracer, released under MIT/X11 License + http://sunflow.sourceforge.net/ + Copyright (c) 2003-2007 Christopher Kulla +*/ + +class BIH +{ + public: + BIH() {}; + template< class T, class BoundsFunc > + void build(const std::vector &primitives, BoundsFunc &getBounds, uint32 leafSize = 3, bool printStats=false) + { + if(primitives.size() == 0) + return; + buildData dat; + dat.maxPrims = leafSize; + dat.numPrims = primitives.size(); + dat.indices = new uint32[dat.numPrims]; + dat.primBound = new AABox[dat.numPrims]; + getBounds(primitives[0], bounds); + for (uint32 i=0; i tempTree; + BuildStats stats; + buildHierarchy(tempTree, dat, stats); + if (printStats) + stats.printStats(); + + objects.resize(dat.numPrims); + for (uint32 i=0; i + void intersectRay(const Ray &r, RayCallback& intersectCallback, float &maxDist, bool stopAtFirst=false) const + { + float intervalMin = 0.f; + float intervalMax = maxDist; + Vector3 org = r.origin(); + Vector3 dir = r.direction(); + Vector3 invDir; + float t1, t2; + for(int i=0; i<3; ++i) + { + invDir[i] = 1.f / dir[i]; + t1 = (bounds.low()[i] - org[i]) * invDir[i]; + t2 = (bounds.high()[i] - org[i]) * invDir[i]; + if (invDir[i] > 0) { + if (t1 > intervalMin) + intervalMin = t1; + if (t2 < intervalMax) + intervalMax = t2; + } else { + if (t2 > intervalMin) + intervalMin = t2; + if (t1 < intervalMax) + intervalMax = t1; + } + if (intervalMin > intervalMax) + return; + } + + uint32 offsetFront[3]; + uint32 offsetBack[3]; + uint32 offsetFront3[3]; + uint32 offsetBack3[3]; + // compute custom offsets from direction sign bit + + for(int i=0; i<3; ++i) + { + offsetFront[i] = floatToRawIntBits(dir[i]) >> 31; + offsetBack[i] = offsetFront[i] ^ 1; + offsetFront3[i] = offsetFront[i] * 3; + offsetBack3[i] = offsetBack[i] * 3; + + // avoid always adding 1 during the inner loop + ++offsetFront[i]; + ++offsetBack[i]; + } + + StackNode stack[MAX_STACK_SIZE]; + int stackPos = 0; + int node = 0; + + while (true) { + while (true) + { + uint32 tn = tree[node]; + uint32 axis = (tn & (3 << 30)) >> 30; + bool BVH2 = tn & (1 << 29); + int offset = tn & ~(7 << 29); + if (!BVH2) + { + if (axis < 3) + { + // "normal" interior node + float tf = (intBitsToFloat(tree[node + offsetFront[axis]]) - org[axis]) * invDir[axis]; + float tb = (intBitsToFloat(tree[node + offsetBack[axis]]) - org[axis]) * invDir[axis]; + // ray passes between clip zones + if (tf < intervalMin && tb > intervalMax) + break; + int back = offset + offsetBack3[axis]; + node = back; + // ray passes through far node only + if (tf < intervalMin) { + intervalMin = (tb >= intervalMin) ? tb : intervalMin; + continue; + } + node = offset + offsetFront3[axis]; // front + // ray passes through near node only + if (tb > intervalMax) { + intervalMax = (tf <= intervalMax) ? tf : intervalMax; + continue; + } + // ray passes through both nodes + // push back node + stack[stackPos].node = back; + stack[stackPos].tnear = (tb >= intervalMin) ? tb : intervalMin; + stack[stackPos].tfar = intervalMax; + stackPos++; + // update ray interval for front node + intervalMax = (tf <= intervalMax) ? tf : intervalMax; + continue; + } + else + { + // leaf - test some objects + int n = tree[node + 1]; + while (n > 0) { + bool hit = intersectCallback(r, objects[offset], maxDist, stopAtFirst); + if(stopAtFirst && hit) return; + --n; + ++offset; + } + break; + } + } + else + { + if (axis>2) + return; // should not happen + float tf = (intBitsToFloat(tree[node + offsetFront[axis]]) - org[axis]) * invDir[axis]; + float tb = (intBitsToFloat(tree[node + offsetBack[axis]]) - org[axis]) * invDir[axis]; + node = offset; + intervalMin = (tf >= intervalMin) ? tf : intervalMin; + intervalMax = (tb <= intervalMax) ? tb : intervalMax; + if (intervalMin > intervalMax) + break; + continue; + } + } // traversal loop + do + { + // stack is empty? + if (stackPos == 0) + return; + // move back up the stack + stackPos--; + intervalMin = stack[stackPos].tnear; + if (maxDist < intervalMin) + continue; + node = stack[stackPos].node; + intervalMax = stack[stackPos].tfar; + break; + } while (true); + } + } + + template + void intersectPoint(const Vector3 &p, IsectCallback& intersectCallback) const + { + if (!bounds.contains(p)) + return; + + StackNode stack[MAX_STACK_SIZE]; + int stackPos = 0; + int node = 0; + + while (true) { + while (true) + { + uint32 tn = tree[node]; + uint32 axis = (tn & (3 << 30)) >> 30; + bool BVH2 = tn & (1 << 29); + int offset = tn & ~(7 << 29); + if (!BVH2) + { + if (axis < 3) + { + // "normal" interior node + float tl = intBitsToFloat(tree[node + 1]); + float tr = intBitsToFloat(tree[node + 2]); + // point is between clip zones + if (tl < p[axis] && tr > p[axis]) + break; + int right = offset + 3; + node = right; + // point is in right node only + if (tl < p[axis]) { + continue; + } + node = offset; // left + // point is in left node only + if (tr > p[axis]) { + continue; + } + // point is in both nodes + // push back right node + stack[stackPos].node = right; + stackPos++; + continue; + } + else + { + // leaf - test some objects + int n = tree[node + 1]; + while (n > 0) { + intersectCallback(p, objects[offset]); // !!! + --n; + ++offset; + } + break; + } + } + else // BVH2 node (empty space cut off left and right) + { + if (axis>2) + return; // should not happen + float tl = intBitsToFloat(tree[node + 1]); + float tr = intBitsToFloat(tree[node + 2]); + node = offset; + if (tl > p[axis] || tr < p[axis]) + break; + continue; + } + } // traversal loop + + // stack is empty? + if (stackPos == 0) + return; + // move back up the stack + stackPos--; + node = stack[stackPos].node; + } + } + + bool writeToFile(FILE *wf) const; + bool readFromFile(FILE *rf); + + protected: + std::vector tree; + std::vector objects; + AABox bounds; + + struct buildData + { + uint32 *indices; + AABox *primBound; + uint32 numPrims; + int maxPrims; + }; + struct StackNode + { + uint32 node; + float tnear; + float tfar; + }; + + class BuildStats + { + private: + int numNodes; + int numLeaves; + int sumObjects; + int minObjects; + int maxObjects; + int sumDepth; + int minDepth; + int maxDepth; + int numLeavesN[6]; + int numBVH2; + + public: + BuildStats(): + numNodes(0), numLeaves(0), sumObjects(0), minObjects(0x0FFFFFFF), + maxObjects(0xFFFFFFFF), sumDepth(0), minDepth(0x0FFFFFFF), + maxDepth(0xFFFFFFFF), numBVH2(0) + { + for(int i=0; i<6; ++i) numLeavesN[i] = 0; + } + + void updateInner() { numNodes++; } + void updateBVH2() { numBVH2++; } + void updateLeaf(int depth, int n); + void printStats(); + }; + + void buildHierarchy(std::vector &tempTree, buildData &dat, BuildStats &stats); + + void createNode(std::vector &tempTree, int nodeIndex, uint32 left, uint32 right) { + // write leaf node + tempTree[nodeIndex + 0] = (3 << 30) | left; + tempTree[nodeIndex + 1] = right - left + 1; + } + + void subdivide(int left, int right, std::vector &tempTree, buildData &dat, AABound &gridBox, AABound &nodeBox, int nodeIndex, int depth, BuildStats &stats); +}; + +#endif // _BIH_H diff --git a/src/server/collision/CMakeLists.txt b/src/server/collision/CMakeLists.txt new file mode 100644 index 00000000000..e30b9a2bf36 --- /dev/null +++ b/src/server/collision/CMakeLists.txt @@ -0,0 +1,29 @@ + +########### next target ############### + +SET(collision_STAT_SRCS + BIH.h + BIH.cpp + Management/IVMapManager.h + Maps/MapTree.cpp + Maps/MapTree.h + Models/ModelInstance.cpp + Models/ModelInstance.h + Maps/TileAssembler.cpp + Maps/TileAssembler.h + VMapDefinitions.h + Management/VMapFactory.cpp + Management/VMapFactory.h + Management/VMapManager2.cpp + Management/VMapManager2.h + VMapTools.h + Models/WorldModel.cpp + Models/WorldModel.h +) + +include_directories( + ${ACE_INCLUDE_DIR} + ${CMAKE_SOURCE_DIR}/dep/include/g3dlite +) + +add_library(collision STATIC ${collision_STAT_SRCS}) diff --git a/src/server/collision/Management/IVMapManager.h b/src/server/collision/Management/IVMapManager.h new file mode 100644 index 00000000000..00629eb122c --- /dev/null +++ b/src/server/collision/Management/IVMapManager.h @@ -0,0 +1,106 @@ +/* + * Copyright (C) 2005-2010 MaNGOS + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef _IVMAPMANAGER_H +#define _IVMAPMANAGER_H + +#include +#include + +//=========================================================== + +/** +This is the minimum interface to the VMapMamager. +*/ + +namespace VMAP +{ + + enum VMAP_LOAD_RESULT + { + VMAP_LOAD_RESULT_ERROR, + VMAP_LOAD_RESULT_OK, + VMAP_LOAD_RESULT_IGNORED, + }; + + #define VMAP_INVALID_HEIGHT -100000.0f // for check + #define VMAP_INVALID_HEIGHT_VALUE -200000.0f // real assigned value in unknown height case + + //=========================================================== + class IVMapManager + { + private: + bool iEnableLineOfSightCalc; + bool iEnableHeightCalc; + + public: + IVMapManager() : iEnableLineOfSightCalc(true), iEnableHeightCalc(true) {} + + virtual ~IVMapManager(void) {} + + virtual int loadMap(const char* pBasePath, unsigned int pMapId, int x, int y) = 0; + + virtual bool existsMap(const char* pBasePath, unsigned int pMapId, int x, int y) = 0; + + virtual void unloadMap(unsigned int pMapId, int x, int y) = 0; + virtual void unloadMap(unsigned int pMapId) = 0; + + virtual bool isInLineOfSight(unsigned int pMapId, float x1, float y1, float z1, float x2, float y2, float z2) = 0; + virtual float getHeight(unsigned int pMapId, float x, float y, float z) = 0; + /** + test if we hit an object. return true if we hit one. rx,ry,rz will hold the hit position or the dest position, if no intersection was found + return a position, that is pReduceDist closer to the origin + */ + virtual bool getObjectHitPos(unsigned int pMapId, float x1, float y1, float z1, float x2, float y2, float z2, float& rx, float &ry, float& rz, float pModifyDist) = 0; + /** + send debug commands + */ + virtual bool processCommand(char *pCommand)= 0; + + /** + Enable/disable LOS calculation + It is enabled by default. If it is enabled in mid game the maps have to loaded manualy + */ + void setEnableLineOfSightCalc(bool pVal) { iEnableLineOfSightCalc = pVal; } + /** + Enable/disable model height calculation + It is enabled by default. If it is enabled in mid game the maps have to loaded manualy + */ + void setEnableHeightCalc(bool pVal) { iEnableHeightCalc = pVal; } + + bool isLineOfSightCalcEnabled() const { return(iEnableLineOfSightCalc); } + bool isHeightCalcEnabled() const { return(iEnableHeightCalc); } + bool isMapLoadingEnabled() const { return(iEnableLineOfSightCalc || iEnableHeightCalc ); } + + virtual std::string getDirFileName(unsigned int pMapId, int x, int y) const =0; + /** + Block maps from being used. + parameter: String of map ids. Delimiter = "," + e.g.: "0,1,530" + */ + virtual void preventMapsFromBeingUsed(const char* pMapIdString) =0; + /** + Query world model area info. + \param z gets adjusted to the ground height for which this are info is valid + */ + virtual bool getAreaInfo(unsigned int pMapId, float x, float y, float &z, uint32 &flags, int32 &adtId, int32 &rootId, int32 &groupId) const=0; + virtual bool GetLiquidLevel(uint32 pMapId, float x, float y, float z, uint8 ReqLiquidType, float &level, float &floor, uint32 &type) const=0; + }; + +} +#endif diff --git a/src/server/collision/Management/VMapFactory.cpp b/src/server/collision/Management/VMapFactory.cpp new file mode 100644 index 00000000000..331acbace47 --- /dev/null +++ b/src/server/collision/Management/VMapFactory.cpp @@ -0,0 +1,136 @@ +/* + * Copyright (C) 2005-2010 MaNGOS + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include +#include "VMapFactory.h" +#include "VMapManager2.h" + +using namespace G3D; + +namespace VMAP +{ + void chompAndTrim(std::string& str) + { + while(str.length() >0) + { + char lc = str[str.length()-1]; + if(lc == '\r' || lc == '\n' || lc == ' ' || lc == '"' || lc == '\'') + { + str = str.substr(0,str.length()-1); + } + else + { + break; + } + } + while(str.length() >0) + { + char lc = str[0]; + if(lc == ' ' || lc == '"' || lc == '\'') + { + str = str.substr(1,str.length()-1); + } + else + { + break; + } + } + } + + IVMapManager *gVMapManager = 0; + Table* iIgnoreSpellIds=0; + + //=============================================== + // result false, if no more id are found + + bool getNextId(const std::string& pString, unsigned int& pStartPos, unsigned int& pId) + { + bool result = false; + unsigned int i; + for(i=pStartPos;ipStartPos) + { + std::string idString = pString.substr(pStartPos, i-pStartPos); + pStartPos = i+1; + chompAndTrim(idString); + pId = atoi(idString.c_str()); + result = true; + } + return(result); + } + + //=============================================== + /** + parameter: String of map ids. Delimiter = "," + */ + + void VMapFactory::preventSpellsFromBeingTestedForLoS(const char* pSpellIdString) + { + if(!iIgnoreSpellIds) + iIgnoreSpellIds = new Table(); + if(pSpellIdString != NULL) + { + unsigned int pos =0; + unsigned int id; + std::string confString(pSpellIdString); + chompAndTrim(confString); + while(getNextId(confString, pos, id)) + { + iIgnoreSpellIds->set(id, true); + } + } + } + + //=============================================== + + bool VMapFactory::checkSpellForLoS(unsigned int pSpellId) + { + return(!iIgnoreSpellIds->containsKey(pSpellId)); + } + + //=============================================== + // just return the instance + IVMapManager* VMapFactory::createOrGetVMapManager() + { + if(gVMapManager == 0) + gVMapManager= new VMapManager2(); // should be taken from config ... Please change if you like :-) + return gVMapManager; + } + + //=============================================== + // delete all internal data structures + void VMapFactory::clear() + { + if(iIgnoreSpellIds) + { + delete iIgnoreSpellIds; + iIgnoreSpellIds = NULL; + } + if(gVMapManager) + { + delete gVMapManager; + gVMapManager = NULL; + } + } +} diff --git a/src/server/collision/Management/VMapFactory.h b/src/server/collision/Management/VMapFactory.h new file mode 100644 index 00000000000..8dc2c01938a --- /dev/null +++ b/src/server/collision/Management/VMapFactory.h @@ -0,0 +1,43 @@ +/* + * Copyright (C) 2005-2010 MaNGOS + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef _VMAPFACTORY_H +#define _VMAPFACTORY_H + +#include "IVMapManager.h" + +/** +This is the access point to the VMapManager. +*/ + +namespace VMAP +{ + //=========================================================== + + class VMapFactory + { + public: + static IVMapManager* createOrGetVMapManager(); + static void clear(); + + static void preventSpellsFromBeingTestedForLoS(const char* pSpellIdString); + static bool checkSpellForLoS(unsigned int pSpellId); + }; + +} +#endif diff --git a/src/server/collision/Management/VMapManager2.cpp b/src/server/collision/Management/VMapManager2.cpp new file mode 100644 index 00000000000..1e8a84aee52 --- /dev/null +++ b/src/server/collision/Management/VMapManager2.cpp @@ -0,0 +1,336 @@ +/* + * Copyright (C) 2005-2010 MaNGOS + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include +#include +#include +#include +#include "VMapManager2.h" +#include "MapTree.h" +#include "ModelInstance.h" +#include "WorldModel.h" +#include "VMapDefinitions.h" + +using G3D::Vector3; + +namespace VMAP +{ + + //========================================================= + + VMapManager2::VMapManager2() + { + } + + //========================================================= + + VMapManager2::~VMapManager2(void) + { + for (InstanceTreeMap::iterator i = iInstanceMapTrees.begin(); i != iInstanceMapTrees.end(); ++i) + { + delete i->second; + } + for (ModelFileMap::iterator i = iLoadedModelFiles.begin(); i != iLoadedModelFiles.end(); ++i) + { + delete i->second.getModel(); + } + } + + //========================================================= + + Vector3 VMapManager2::convertPositionToInternalRep(float x, float y, float z) const + { + Vector3 pos; + const float mid = 0.5 * 64.0 * 533.33333333f; + pos.x = mid - x; + pos.y = mid - y; + pos.z = z; + + return pos; + } + + //========================================================= + + Vector3 VMapManager2::convertPositionToMangosRep(float x, float y, float z) const + { + Vector3 pos; + const float mid = 0.5 * 64.0 * 533.33333333f; + pos.x = mid - x; + pos.y = mid - y; + pos.z = z; + + return pos; + } + //========================================================= + + // move to MapTree too? + std::string VMapManager2::getMapFileName(unsigned int pMapId) + { + std::stringstream fname; + fname.width(3); + fname << std::setfill('0') << pMapId << std::string(MAP_FILENAME_EXTENSION2); + return fname.str(); + } + + //========================================================= + /** + Block maps from being used. + parameter: String of map ids. Delimiter = "," + e.g.: "0,1,590" + */ + + void VMapManager2::preventMapsFromBeingUsed(const char* pMapIdString) + { + iIgnoreMapIds.clear(); + if (pMapIdString != NULL) + { + std::string map_str; + std::stringstream map_ss; + map_ss.str(std::string(pMapIdString)); + while (std::getline(map_ss, map_str, ',')) + { + std::stringstream ss2(map_str); + int map_num = -1; + ss2 >> map_num; + if (map_num >= 0) + { + std::cout << "ingoring Map " << map_num << " for VMaps\n"; + iIgnoreMapIds[map_num] = true; + // unload map in case it is loaded + unloadMap(map_num); + } + } + } + } + + //========================================================= + + int VMapManager2::loadMap(const char* pBasePath, unsigned int pMapId, int x, int y) + { + int result = VMAP_LOAD_RESULT_IGNORED; + if (isMapLoadingEnabled() && !iIgnoreMapIds.count(pMapId)) + { + if (_loadMap(pMapId, pBasePath, x, y)) + result = VMAP_LOAD_RESULT_OK; + else + result = VMAP_LOAD_RESULT_ERROR; + } + return result; + } + + //========================================================= + // load one tile (internal use only) + + bool VMapManager2::_loadMap(unsigned int pMapId, const std::string &basePath, uint32 tileX, uint32 tileY) + { + InstanceTreeMap::iterator instanceTree = iInstanceMapTrees.find(pMapId); + if (instanceTree == iInstanceMapTrees.end()) + { + std::string mapFileName = getMapFileName(pMapId); + StaticMapTree *newTree = new StaticMapTree(pMapId, basePath); + if (!newTree->InitMap(mapFileName, this)) + return false; + instanceTree = iInstanceMapTrees.insert(InstanceTreeMap::value_type(pMapId, newTree)).first; + } + return instanceTree->second->LoadMapTile(tileX, tileY, this); + } + + //========================================================= + + void VMapManager2::unloadMap(unsigned int pMapId) + { + InstanceTreeMap::iterator instanceTree = iInstanceMapTrees.find(pMapId); + if (instanceTree != iInstanceMapTrees.end()) + { + instanceTree->second->UnloadMap(this); + if (instanceTree->second->numLoadedTiles() == 0) + { + delete instanceTree->second; + iInstanceMapTrees.erase(pMapId); + } + } + } + + //========================================================= + + void VMapManager2::unloadMap(unsigned int pMapId, int x, int y) + { + InstanceTreeMap::iterator instanceTree = iInstanceMapTrees.find(pMapId); + if (instanceTree != iInstanceMapTrees.end()) + { + instanceTree->second->UnloadMapTile(x, y, this); + if (instanceTree->second->numLoadedTiles() == 0) + { + delete instanceTree->second; + iInstanceMapTrees.erase(pMapId); + } + } + } + + //========================================================== + + bool VMapManager2::isInLineOfSight(unsigned int pMapId, float x1, float y1, float z1, float x2, float y2, float z2) + { + if (!isLineOfSightCalcEnabled()) return true; + bool result = true; + InstanceTreeMap::iterator instanceTree = iInstanceMapTrees.find(pMapId); + if (instanceTree != iInstanceMapTrees.end()) + { + Vector3 pos1 = convertPositionToInternalRep(x1,y1,z1); + Vector3 pos2 = convertPositionToInternalRep(x2,y2,z2); + if (pos1 != pos2) + { + result = instanceTree->second->isInLineOfSight(pos1, pos2); + } + } + return result; + } + //========================================================= + /** + get the hit position and return true if we hit something + otherwise the result pos will be the dest pos + */ + bool VMapManager2::getObjectHitPos(unsigned int pMapId, float x1, float y1, float z1, float x2, float y2, float z2, float& rx, float &ry, float& rz, float pModifyDist) + { + bool result = false; + rx=x2; + ry=y2; + rz=z2; + if (isLineOfSightCalcEnabled()) + { + InstanceTreeMap::iterator instanceTree = iInstanceMapTrees.find(pMapId); + if (instanceTree != iInstanceMapTrees.end()) + { + Vector3 pos1 = convertPositionToInternalRep(x1,y1,z1); + Vector3 pos2 = convertPositionToInternalRep(x2,y2,z2); + Vector3 resultPos; + result = instanceTree->second->getObjectHitPos(pos1, pos2, resultPos, pModifyDist); + resultPos = convertPositionToMangosRep(resultPos.x,resultPos.y,resultPos.z); + rx = resultPos.x; + ry = resultPos.y; + rz = resultPos.z; + } + } + return result; + } + + //========================================================= + /** + get height or INVALID_HEIGHT if no height available + */ + + float VMapManager2::getHeight(unsigned int pMapId, float x, float y, float z) + { + float height = VMAP_INVALID_HEIGHT_VALUE; //no height + if (isHeightCalcEnabled()) + { + InstanceTreeMap::iterator instanceTree = iInstanceMapTrees.find(pMapId); + if (instanceTree != iInstanceMapTrees.end()) + { + Vector3 pos = convertPositionToInternalRep(x,y,z); + height = instanceTree->second->getHeight(pos); + if (!(height < G3D::inf())) + { + height = VMAP_INVALID_HEIGHT_VALUE; //no height + } + } + } + return height; + } + + //========================================================= + + bool VMapManager2::getAreaInfo(unsigned int pMapId, float x, float y, float &z, uint32 &flags, int32 &adtId, int32 &rootId, int32 &groupId) const + { + bool result=false; + InstanceTreeMap::const_iterator instanceTree = iInstanceMapTrees.find(pMapId); + if (instanceTree != iInstanceMapTrees.end()) + { + Vector3 pos = convertPositionToInternalRep(x, y, z); + result = instanceTree->second->getAreaInfo(pos, flags, adtId, rootId, groupId); + // z is not touched by convertPositionToMangosRep(), so just copy + z = pos.z; + } + return(result); + } + + bool VMapManager2::GetLiquidLevel(uint32 pMapId, float x, float y, float z, uint8 ReqLiquidType, float &level, float &floor, uint32 &type) const + { + InstanceTreeMap::const_iterator instanceTree = iInstanceMapTrees.find(pMapId); + if (instanceTree != iInstanceMapTrees.end()) + { + LocationInfo info; + Vector3 pos = convertPositionToInternalRep(x, y, z); + if (instanceTree->second->GetLocationInfo(pos, info)) + { + floor = info.ground_Z; + type = info.hitModel->GetLiquidType(); + if (ReqLiquidType && !(type & ReqLiquidType)) + return false; + if (info.hitInstance->GetLiquidLevel(pos, info, level)) + return true; + } + } + return false; + } + + //========================================================= + + WorldModel* VMapManager2::acquireModelInstance(const std::string &basepath, const std::string &filename) + { + ModelFileMap::iterator model = iLoadedModelFiles.find(filename); + if (model == iLoadedModelFiles.end()) + { + WorldModel *worldmodel = new WorldModel(); + if (!worldmodel->readFile(basepath + filename + ".vmo")) + { + std::cout << "VMapManager2: could not load '" << basepath << filename << ".vmo'!\n"; + delete worldmodel; + return NULL; + } + std::cout << "VMapManager2: loading file '" << basepath << filename << "'.\n"; + model = iLoadedModelFiles.insert(std::pair(filename, ManagedModel())).first; + model->second.setModel(worldmodel); + } + model->second.incRefCount(); + return model->second.getModel(); + } + + void VMapManager2::releaseModelInstance(const std::string &filename) + { + ModelFileMap::iterator model = iLoadedModelFiles.find(filename); + if (model == iLoadedModelFiles.end()) + { + std::cout << "VMapManager2: trying to unload non-loaded file '" << filename << "'!\n"; + return; + } + if( model->second.decRefCount() == 0) + { + std::cout << "VMapManager2: unloading file '" << filename << "'.\n"; + delete model->second.getModel(); + iLoadedModelFiles.erase(model); + } + } + //========================================================= + + bool VMapManager2::existsMap(const char* pBasePath, unsigned int pMapId, int x, int y) + { + return StaticMapTree::CanLoadMap(std::string(pBasePath), pMapId, x, y); + } + +} // namespace VMAP diff --git a/src/server/collision/Management/VMapManager2.h b/src/server/collision/Management/VMapManager2.h new file mode 100644 index 00000000000..5f03b87b07f --- /dev/null +++ b/src/server/collision/Management/VMapManager2.h @@ -0,0 +1,114 @@ +/* + * Copyright (C) 2005-2010 MaNGOS + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef _VMAPMANAGER2_H +#define _VMAPMANAGER2_H + +#include "IVMapManager.h" +#include "Utilities/UnorderedMap.h" +#include "Platform/Define.h" +#include + +//=========================================================== + +#define MAP_FILENAME_EXTENSION2 ".vmtree" + +#define FILENAMEBUFFER_SIZE 500 + +/** +This is the main Class to manage loading and unloading of maps, line of sight, height calculation and so on. +For each map or map tile to load it reads a directory file that contains the ModelContainer files used by this map or map tile. +Each global map or instance has its own dynamic BSP-Tree. +The loaded ModelContainers are included in one of these BSP-Trees. +Additionally a table to match map ids and map names is used. +*/ + +//=========================================================== + +namespace VMAP +{ + class StaticMapTree; + class WorldModel; + + class ManagedModel + { + public: + ManagedModel(): iModel(0), iRefCount(0) {} + void setModel(WorldModel *model) { iModel = model; } + WorldModel *getModel() { return iModel; } + void incRefCount() { ++iRefCount; } + int decRefCount() { return --iRefCount; } + protected: + WorldModel *iModel; + int iRefCount; + }; + + typedef UNORDERED_MAP InstanceTreeMap; + typedef UNORDERED_MAP ModelFileMap; + + class VMapManager2 : public IVMapManager + { + protected: + // Tree to check collision + ModelFileMap iLoadedModelFiles; + InstanceTreeMap iInstanceMapTrees; + // UNORDERED_MAP iMapsSplitIntoTiles; + UNORDERED_MAP iIgnoreMapIds; + + bool _loadMap(uint32 pMapId, const std::string &basePath, uint32 tileX, uint32 tileY); + /* void _unloadMap(uint32 pMapId, uint32 x, uint32 y); */ + + public: + // public for debug + G3D::Vector3 convertPositionToInternalRep(float x, float y, float z) const; + G3D::Vector3 convertPositionToMangosRep(float x, float y, float z) const; + static std::string getMapFileName(unsigned int pMapId); + + VMapManager2(); + ~VMapManager2(void); + + int loadMap(const char* pBasePath, unsigned int pMapId, int x, int y); + + void unloadMap(unsigned int pMapId, int x, int y); + void unloadMap(unsigned int pMapId); + + bool isInLineOfSight(unsigned int pMapId, float x1, float y1, float z1, float x2, float y2, float z2) ; + /** + fill the hit pos and return true, if an object was hit + */ + bool getObjectHitPos(unsigned int pMapId, float x1, float y1, float z1, float x2, float y2, float z2, float& rx, float &ry, float& rz, float pModifyDist); + float getHeight(unsigned int pMapId, float x, float y, float z); + + bool processCommand(char *pCommand) { return false; } // for debug and extensions + + void preventMapsFromBeingUsed(const char* pMapIdString); + bool getAreaInfo(unsigned int pMapId, float x, float y, float &z, uint32 &flags, int32 &adtId, int32 &rootId, int32 &groupId) const; + bool GetLiquidLevel(uint32 pMapId, float x, float y, float z, uint8 ReqLiquidType, float &level, float &floor, uint32 &type) const; + + WorldModel* acquireModelInstance(const std::string &basepath, const std::string &filename); + void releaseModelInstance(const std::string &filename); + + // what's the use of this? o.O + virtual std::string getDirFileName(unsigned int pMapId, int x, int y) const + { + return getMapFileName(pMapId); + } + virtual bool existsMap(const char* pBasePath, unsigned int pMapId, int x, int y); + }; +} +#endif diff --git a/src/server/collision/Maps/MapTree.cpp b/src/server/collision/Maps/MapTree.cpp new file mode 100644 index 00000000000..8c77ee109f3 --- /dev/null +++ b/src/server/collision/Maps/MapTree.cpp @@ -0,0 +1,450 @@ +/* + * Copyright (C) 2005-2010 MaNGOS + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "MapTree.h" +#include "ModelInstance.h" +#include "VMapManager2.h" +#include "VMapDefinitions.h" + +#include +#include +#include + +using G3D::Vector3; + +namespace VMAP +{ + + class MapRayCallback + { + public: + MapRayCallback(ModelInstance *val): prims(val) {} + ModelInstance *prims; + bool operator()(const G3D::Ray& ray, uint32 entry, float& distance, bool pStopAtFirstHit=true) + { + return prims[entry].intersectRay(ray, distance, pStopAtFirstHit); + //std::cout << "trying to intersect '" << entity->name << "'\n"; + } + }; + + class AreaInfoCallback + { + public: + AreaInfoCallback(ModelInstance *val): prims(val) {} + void operator()(const Vector3& point, uint32 entry) + { +#ifdef VMAP_DEBUG + std::cout << "trying to intersect '" << prims[entry].name << "'\n"; +#endif + prims[entry].intersectPoint(point, aInfo); + } + + ModelInstance *prims; + AreaInfo aInfo; + }; + + class LocationInfoCallback + { + public: + LocationInfoCallback(ModelInstance *val, LocationInfo &info): prims(val), locInfo(info), result(false) {} + void operator()(const Vector3& point, uint32 entry) + { +#ifdef VMAP_DEBUG + std::cout << "trying to intersect '" << prims[entry].name << "'\n"; +#endif + if (prims[entry].GetLocationInfo(point, locInfo)) + result = true; + } + + ModelInstance *prims; + LocationInfo &locInfo; + bool result; + }; + + + //========================================================= + + std::string StaticMapTree::getTileFileName(uint32 mapID, uint32 tileX, uint32 tileY) + { + std::stringstream tilefilename; + tilefilename.fill('0'); + tilefilename << std::setw(3) << mapID << "_"; + //tilefilename << std::setw(2) << tileX << "_" << std::setw(2) << tileY << ".vmtile"; + tilefilename << std::setw(2) << tileY << "_" << std::setw(2) << tileX << ".vmtile"; + return tilefilename.str(); + } + + bool StaticMapTree::getAreaInfo(Vector3 &pos, uint32 &flags, int32 &adtId, int32 &rootId, int32 &groupId) const + { + AreaInfoCallback intersectionCallBack(iTreeValues); + iTree.intersectPoint(pos, intersectionCallBack); + if (intersectionCallBack.aInfo.result) + { + flags = intersectionCallBack.aInfo.flags; + adtId = intersectionCallBack.aInfo.adtId; + rootId = intersectionCallBack.aInfo.rootId; + groupId = intersectionCallBack.aInfo.groupId; + pos.z = intersectionCallBack.aInfo.ground_Z; + return true; + } + return false; + } + + bool StaticMapTree::GetLocationInfo(const Vector3 &pos, LocationInfo &info) const + { + LocationInfoCallback intersectionCallBack(iTreeValues, info); + iTree.intersectPoint(pos, intersectionCallBack); + return intersectionCallBack.result; + } + + StaticMapTree::StaticMapTree(uint32 mapID, const std::string &basePath): + iMapID(mapID), /* iTree(0), */ iTreeValues(0), iBasePath(basePath) + { + if (iBasePath.length() > 0 && (iBasePath[iBasePath.length()-1] != '/' || iBasePath[iBasePath.length()-1] != '\\')) + { + iBasePath.append("/"); + } + } + + //========================================================= + //! Make sure to call unloadMap() to unregister acquired model references before destroying + StaticMapTree::~StaticMapTree() + { + delete[] iTreeValues; + } + + //========================================================= + /** + return dist to hit or inf() if no hit + */ + + float StaticMapTree::getIntersectionTime(const G3D::Ray& pRay, float pMaxDist, bool pStopAtFirstHit) const + { + float distance = pMaxDist; + MapRayCallback intersectionCallBack(iTreeValues); + iTree.intersectRay(pRay, intersectionCallBack, distance, pStopAtFirstHit); + return distance; + } + //========================================================= + + bool StaticMapTree::isInLineOfSight(const Vector3& pos1, const Vector3& pos2) const + { + bool result = true; + float maxDist = (pos2 - pos1).magnitude(); + // prevent NaN values which can cause BIH intersection to enter infinite loop + if (maxDist < 1e-10f) + return true; + // direction with length of 1 + G3D::Ray ray = G3D::Ray::fromOriginAndDirection(pos1, (pos2 - pos1)/maxDist); + float resultDist = getIntersectionTime(ray, maxDist, true); + if (resultDist < maxDist) + { + result = false; + } + return result; + } + //========================================================= + /** + When moving from pos1 to pos2 check if we hit an object. Return true and the position if we hit one + Return the hit pos or the original dest pos + */ + + bool StaticMapTree::getObjectHitPos(const Vector3& pPos1, const Vector3& pPos2, Vector3& pResultHitPos, float pModifyDist) const + { + bool result=false; + float maxDist = (pPos2 - pPos1).magnitude(); + // prevent NaN values which can cause BIH intersection to enter infinite loop + if (maxDist < 1e-10f) + { + pResultHitPos = pPos2; + return false; + } + Vector3 dir = (pPos2 - pPos1)/maxDist; // direction with length of 1 + G3D::Ray ray(pPos1, dir); + float dist = getIntersectionTime(ray, maxDist, false); + if (dist < maxDist) + { + pResultHitPos = pPos1 + dir * dist; + if (pModifyDist < 0) + { + if ((pResultHitPos - pPos1).magnitude() > -pModifyDist) + { + pResultHitPos = pResultHitPos + dir*pModifyDist; + } + else + { + pResultHitPos = pPos1; + } + } + else + { + pResultHitPos = pResultHitPos + dir*pModifyDist; + } + result = true; + } + else + { + pResultHitPos = pPos2; + result = false; + } + return result; + } + + //========================================================= + + float StaticMapTree::getHeight(const Vector3& pPos) const + { + float height = G3D::inf(); + Vector3 dir = Vector3(0,0,-1); + G3D::Ray ray(pPos, dir); // direction with length of 1 + float maxDist = VMapDefinitions::getMaxCanFallDistance(); + float dist = getIntersectionTime(ray, maxDist, false); + if (dist < maxDist) + { + height = pPos.z - dist; + } + return(height); + } + + //========================================================= + + bool StaticMapTree::CanLoadMap(const std::string &vmapPath, uint32 mapID, uint32 tileX, uint32 tileY) + { + std::string basePath = vmapPath; + if (basePath.length() > 0 && (basePath[basePath.length()-1] != '/' || basePath[basePath.length()-1] != '\\')) + basePath.append("/"); + std::string fullname = basePath + VMapManager2::getMapFileName(mapID); + bool success = true; + FILE *rf = fopen(fullname.c_str(), "rb"); + if (!rf) + return false; + // TODO: check magic number when implemented... + char tiled; + char chunk[8]; + if (!readChunk(rf, chunk, VMAP_MAGIC, 8) || fread(&tiled, sizeof(char), 1, rf) != 1) + { + fclose(rf); + return false; + } + if (tiled) + { + std::string tilefile = basePath + getTileFileName(mapID, tileX, tileY); + FILE* tf = fopen(tilefile.c_str(), "rb"); + if (!tf) + success = false; + else + fclose(tf); + } + fclose(rf); + return success; + } + + //========================================================= + + bool StaticMapTree::InitMap(const std::string &fname, VMapManager2 *vm) + { + std::cout << "Initializing StaticMapTree '" << fname << "'\n"; + bool success = true; + std::string fullname = iBasePath + fname; + FILE *rf = fopen(fullname.c_str(), "rb"); + if (!rf) + return false; + else + { + char chunk[8]; + //general info + if (!readChunk(rf, chunk, VMAP_MAGIC, 8)) success = false; + char tiled; + if (success && fread(&tiled, sizeof(char), 1, rf) != 1) success = false; + iIsTiled = bool(tiled); + // Nodes + if (success && !readChunk(rf, chunk, "NODE", 4)) success = false; + if (success) success = iTree.readFromFile(rf); + if (success) + { + iNTreeValues = iTree.primCount(); + iTreeValues = new ModelInstance[iNTreeValues]; + } + + if (success && !readChunk(rf, chunk, "GOBJ", 4)) success = false; + // global model spawns + // only non-tiled maps have them, and if so exactly one (so far at least...) + ModelSpawn spawn; +#ifdef VMAP_DEBUG + std::cout << "Map isTiled:" << bool(iIsTiled) << std::endl; +#endif + if (!iIsTiled && ModelSpawn::readFromFile(rf, spawn)) + { + WorldModel *model = vm->acquireModelInstance(iBasePath, spawn.name); + std::cout << "StaticMapTree::InitMap(): loading " << spawn.name << std::endl; + if (model) + { + // assume that global model always is the first and only tree value (could be improved...) + iTreeValues[0] = ModelInstance(spawn, model); + iLoadedSpawns[0] = 1; + } + else + { + success = false; + std::cout << "error: could not acquire WorldModel pointer!\n"; + } + } + + fclose(rf); + } + return success; + } + + //========================================================= + + void StaticMapTree::UnloadMap(VMapManager2 *vm) + { + for (loadedSpawnMap::iterator i = iLoadedSpawns.begin(); i != iLoadedSpawns.end(); ++i) + { + iTreeValues[i->first].setUnloaded(); + for (uint32 refCount = 0; refCount < i->second; ++refCount) + vm->releaseModelInstance(iTreeValues[i->first].name); + } + iLoadedSpawns.clear(); + iLoadedTiles.clear(); + } + + //========================================================= + + bool StaticMapTree::LoadMapTile(uint32 tileX, uint32 tileY, VMapManager2 *vm) + { + if (!iIsTiled) + { + // currently, core creates grids for all maps, whether it has terrain tiles or not + // so we need "fake" tile loads to know when we can unload map geometry + iLoadedTiles[packTileID(tileX, tileY)] = false; + return true; + } + if (!iTreeValues) + { + std::cout << "Tree has not been initialized!\n"; + return false; + } + bool result = true; + + std::string tilefile = iBasePath + getTileFileName(iMapID, tileX, tileY); + FILE* tf = fopen(tilefile.c_str(), "rb"); + if (tf) + { + uint32 numSpawns; + if (fread(&numSpawns, sizeof(uint32), 1, tf) != 1) + result = false; + for (uint32 i=0; iacquireModelInstance(iBasePath, spawn.name); + if (!model) std::cout << "error: could not acquire WorldModel pointer!\n"; + + // update tree + uint32 referencedVal; + + fread(&referencedVal, sizeof(uint32), 1, tf); + if (!iLoadedSpawns.count(referencedVal)) + { +#ifdef VMAP_DEBUG + if (referencedVal > iNTreeValues) + { + std::cout << "invalid tree element! (" << referencedVal << "/" << iNTreeValues << ")\n"; + continue; + } +#endif + iTreeValues[referencedVal] = ModelInstance(spawn, model); + iLoadedSpawns[referencedVal] = 1; + } + else + { + ++iLoadedSpawns[referencedVal]; +#ifdef VMAP_DEBUG + if (iTreeValues[referencedVal].ID != spawn.ID) std::cout << "error: trying to load wrong spawn in node!\n"; + else if (iTreeValues[referencedVal].name != spawn.name) std::cout << "error: name collision on GUID="<< spawn.ID << "\n"; +#endif + } + } + } + iLoadedTiles[packTileID(tileX, tileY)] = true; + fclose(tf); + } + else + iLoadedTiles[packTileID(tileX, tileY)] = false; + return result; + } + + //========================================================= + + void StaticMapTree::UnloadMapTile(uint32 tileX, uint32 tileY, VMapManager2 *vm) + { + uint32 tileID = packTileID(tileX, tileY); + loadedTileMap::iterator tile = iLoadedTiles.find(tileID); + if (tile == iLoadedTiles.end()) + { + std::cout << "WARNING: trying to unload non-loaded tile. Map:" << iMapID << " X:" << tileX << " Y:" << tileY << std::endl; + return; + } + if (tile->second) // file associated with tile + { + std::string tilefile = iBasePath + getTileFileName(iMapID, tileX, tileY); + FILE* tf = fopen(tilefile.c_str(), "rb"); + if (tf) + { + bool result=true; + uint32 numSpawns; + if (fread(&numSpawns, sizeof(uint32), 1, tf) != 1) + result = false; + for (uint32 i=0; ireleaseModelInstance(spawn.name); + + // update tree + uint32 referencedNode; + + fread(&referencedNode, sizeof(uint32), 1, tf); + if (!iLoadedSpawns.count(referencedNode)) + { + std::cout << "error! trying to unload non-referenced model '" << spawn.name << "' (ID:" << spawn.ID << ")\n"; + } + else if (--iLoadedSpawns[referencedNode] == 0) + { + //std::cout << "MapTree: removing '" << spawn.name << "' from tree\n"; + iTreeValues[referencedNode].setUnloaded(); + iLoadedSpawns.erase(referencedNode); + } + } + } + fclose(tf); + } + } + iLoadedTiles.erase(tile); + } + +} diff --git a/src/server/collision/Maps/MapTree.h b/src/server/collision/Maps/MapTree.h new file mode 100644 index 00000000000..7955cb92d68 --- /dev/null +++ b/src/server/collision/Maps/MapTree.h @@ -0,0 +1,97 @@ +/* + * Copyright (C) 2005-2010 MaNGOS + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef _MAPTREE_H +#define _MAPTREE_H + +#include "Platform/Define.h" +#include "Utilities/UnorderedMap.h" +#include "BIH.h" + +namespace VMAP +{ + class ModelInstance; + class GroupModel; + class VMapManager2; + + struct LocationInfo + { + LocationInfo(): hitInstance(0), hitModel(0), ground_Z(-G3D::inf()) {}; + const ModelInstance *hitInstance; + const GroupModel *hitModel; + float ground_Z; + }; + + class StaticMapTree + { + typedef UNORDERED_MAP loadedTileMap; + typedef UNORDERED_MAP loadedSpawnMap; + private: + uint32 iMapID; + bool iIsTiled; + BIH iTree; + ModelInstance *iTreeValues; // the tree entries + uint32 iNTreeValues; + + // Store all the map tile idents that are loaded for that map + // some maps are not splitted into tiles and we have to make sure, not removing the map before all tiles are removed + // empty tiles have no tile file, hence map with bool instead of just a set (consistency check) + loadedTileMap iLoadedTiles; + // stores to invalidate tree values, unload map, and to be able to report errors + loadedSpawnMap iLoadedSpawns; + std::string iBasePath; + + private: + float getIntersectionTime(const G3D::Ray& pRay, float pMaxDist, bool pStopAtFirstHit) const; + //bool containsLoadedMapTile(unsigned int pTileIdent) const { return(iLoadedMapTiles.containsKey(pTileIdent)); } + public: + static std::string getTileFileName(uint32 mapID, uint32 tileX, uint32 tileY); + static uint32 packTileID(uint32 tileX, uint32 tileY) { return tileX<<16 | tileY; } + static void unpackTileID(uint32 ID, uint32 &tileX, uint32 &tileY) { tileX = ID>>16; tileY = ID&0xFF; } + static bool CanLoadMap(const std::string &basePath, uint32 mapID, uint32 tileX, uint32 tileY); + + StaticMapTree(uint32 mapID, const std::string &basePath); + ~StaticMapTree(); + + bool isInLineOfSight(const G3D::Vector3& pos1, const G3D::Vector3& pos2) const; + bool getObjectHitPos(const G3D::Vector3& pos1, const G3D::Vector3& pos2, G3D::Vector3& pResultHitPos, float pModifyDist) const; + float getHeight(const G3D::Vector3& pPos) const; + bool getAreaInfo(G3D::Vector3 &pos, uint32 &flags, int32 &adtId, int32 &rootId, int32 &groupId) const; + bool GetLocationInfo(const Vector3 &pos, LocationInfo &info) const; + + bool InitMap(const std::string &fname, VMapManager2 *vm); + void UnloadMap(VMapManager2 *vm); + bool LoadMapTile(uint32 tileX, uint32 tileY, VMapManager2 *vm); + void UnloadMapTile(uint32 tileX, uint32 tileY, VMapManager2 *vm); + bool isTiled() const { return iIsTiled; } + uint32 numLoadedTiles() const { return iLoadedTiles.size(); } + }; + + struct AreaInfo + { + AreaInfo(): result(false), ground_Z(-G3D::inf()) {}; + bool result; + float ground_Z; + uint32 flags; + int32 adtId; + int32 rootId; + int32 groupId; + }; +} // VMAP + +#endif // _MAPTREE_H diff --git a/src/server/collision/Maps/TileAssembler.cpp b/src/server/collision/Maps/TileAssembler.cpp new file mode 100644 index 00000000000..d01b54a7564 --- /dev/null +++ b/src/server/collision/Maps/TileAssembler.cpp @@ -0,0 +1,494 @@ +/* + * Copyright (C) 2005-2010 MaNGOS + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "WorldModel.h" +#include "TileAssembler.h" +#include "MapTree.h" +#include "BIH.h" +#include "VMapDefinitions.h" + +#include +#include +#include +#include + +using G3D::Vector3; +using G3D::AABox; +using G3D::inf; +using std::pair; + +template<> struct BoundsTrait +{ + static void getBounds(const VMAP::ModelSpawn* const &obj, G3D::AABox& out) { out = obj->getBounds(); } +}; + +namespace VMAP +{ + bool readChunk(FILE *rf, char *dest, const char *compare, uint32 len) + { + if (fread(dest, sizeof(char), len, rf) != len) return false; + return memcmp(dest, compare, len) == 0; + } + + Vector3 ModelPosition::transform(const Vector3& pIn) const + { + Vector3 out = pIn * iScale; + out = iRotation * out; + return(out); + } + + //================================================================= + + TileAssembler::TileAssembler(const std::string& pSrcDirName, const std::string& pDestDirName) + { + iCurrentUniqueNameId = 0; + iFilterMethod = NULL; + iSrcDir = pSrcDirName; + iDestDir = pDestDirName; + //mkdir(iDestDir); + //init(); + } + + TileAssembler::~TileAssembler() + { + //delete iCoordModelMapping; + } + + bool TileAssembler::convertWorld2() + { + std::set spawnedModelFiles; + bool success = readMapSpawns(); + if (!success) + return false; + + // export Map data + for (MapData::iterator map_iter = mapData.begin(); map_iter != mapData.end() && success; ++map_iter) + { + // build global map tree + std::vector mapSpawns; + UniqueEntryMap::iterator entry; + for (entry = map_iter->second->UniqueEntries.begin(); entry != map_iter->second->UniqueEntries.end(); ++entry) + { + // M2 models don't have a bound set in WDT/ADT placement data, i still think they're not used for LoS at all on retail + if (entry->second.flags & MOD_M2) + { + if (!calculateTransformedBound(entry->second)) + break; + } + else if (entry->second.flags & MOD_WORLDSPAWN) // WMO maps and terrain maps use different origin, so we need to adapt :/ + { + // TODO: remove extractor hack and uncomment below line: + //entry->second.iPos += Vector3(533.33333f*32, 533.33333f*32, 0.f); + entry->second.iBound = entry->second.iBound + Vector3(533.33333f*32, 533.33333f*32, 0.f); + } + mapSpawns.push_back(&(entry->second)); + spawnedModelFiles.insert(entry->second.name); + } + + BIH pTree; + pTree.build(mapSpawns, BoundsTrait::getBounds); + + // ===> possibly move this code to StaticMapTree class + std::map modelNodeIdx; + for (uint32 i=0; i(mapSpawns[i]->ID, i)); + if (!modelNodeIdx.empty()) + printf("min GUID: %u, max GUID: %u\n", modelNodeIdx.begin()->first, modelNodeIdx.rbegin()->first); + + // write map tree file + std::stringstream mapfilename; + mapfilename << iDestDir << "/" << std::setfill('0') << std::setw(3) << map_iter->first << ".vmtree"; + FILE *mapfile = fopen(mapfilename.str().c_str(), "wb"); + if (!mapfile) + { + success = false; + printf("Cannot open %s\n", mapfilename.str().c_str()); + break; + } + + //general info + if (success && fwrite(VMAP_MAGIC, 1, 8, mapfile) != 8) success = false; + uint32 globalTileID = StaticMapTree::packTileID(65, 65); + pair globalRange = map_iter->second->TileEntries.equal_range(globalTileID); + char isTiled = globalRange.first == globalRange.second; // only maps without terrain (tiles) have global WMO + if (success && fwrite(&isTiled, sizeof(char), 1, mapfile) != 1) success = false; + // Nodes + if (success && fwrite("NODE", 4, 1, mapfile) != 1) success = false; + if (success) success = pTree.writeToFile(mapfile); + // global map spawns (WDT), if any (most instances) + if (success && fwrite("GOBJ", 4, 1, mapfile) != 1) success = false; + + for (TileMap::iterator glob=globalRange.first; glob != globalRange.second && success; ++glob) + { + success = ModelSpawn::writeToFile(mapfile, map_iter->second->UniqueEntries[glob->second]); + } + + fclose(mapfile); + + // <==== + + // write map tile files, similar to ADT files, only with extra BSP tree node info + TileMap &tileEntries = map_iter->second->TileEntries; + TileMap::iterator tile; + for (tile = tileEntries.begin(); tile != tileEntries.end(); ++tile) + { + const ModelSpawn &spawn = map_iter->second->UniqueEntries[tile->second]; + if (spawn.flags & MOD_WORLDSPAWN) // WDT spawn, saved as tile 65/65 currently... + continue; + uint32 nSpawns = tileEntries.count(tile->first); + std::stringstream tilefilename; + tilefilename.fill('0'); + tilefilename << iDestDir << "/" << std::setw(3) << map_iter->first << "_"; + uint32 x, y; + StaticMapTree::unpackTileID(tile->first, x, y); + tilefilename << std::setw(2) << x << "_" << std::setw(2) << y << ".vmtile"; + FILE *tilefile = fopen(tilefilename.str().c_str(), "wb"); + // write number of tile spawns + if (success && fwrite(&nSpawns, sizeof(uint32), 1, tilefile) != 1) success = false; + // write tile spawns + for (uint32 s=0; ssecond->UniqueEntries[tile->second]; + success = success && ModelSpawn::writeToFile(tilefile, spawn2); + // MapTree nodes to update when loading tile: + std::map::iterator nIdx = modelNodeIdx.find(spawn2.ID); + if (success && fwrite(&nIdx->second, sizeof(uint32), 1, tilefile) != 1) success = false; + } + fclose(tilefile); + } + // break; //test, extract only first map; TODO: remvoe this line + } + + // export objects + std::cout << "\nConverting Model Files" << std::endl; + for (std::set::iterator mfile = spawnedModelFiles.begin(); mfile != spawnedModelFiles.end(); ++mfile) + { + std::cout << "Converting " << *mfile << std::endl; + if (!convertRawFile(*mfile)) + { + std::cout << "error converting " << *mfile << std::endl; + success = false; + break; + } + } + + //cleanup: + for (MapData::iterator map_iter = mapData.begin(); map_iter != mapData.end(); ++map_iter) + { + delete map_iter->second; + } + return success; + } + + bool TileAssembler::readMapSpawns() + { + std::string fname = iSrcDir + "/dir_bin"; + FILE *dirf = fopen(fname.c_str(), "rb"); + if (!dirf) + { + printf("Could not read dir_bin file!\n"); + return false; + } + printf("Read coordinate mapping...\n"); + uint32 mapID, tileX, tileY, check=0; + G3D::Vector3 v1, v2; + ModelSpawn spawn; + while (!feof(dirf)) + { + check = 0; + // read mapID, tileX, tileY, Flags, adtID, ID, Pos, Rot, Scale, Bound_lo, Bound_hi, name + check += fread(&mapID, sizeof(uint32), 1, dirf); + if (check == 0) // EoF... + break; + check += fread(&tileX, sizeof(uint32), 1, dirf); + check += fread(&tileY, sizeof(uint32), 1, dirf); + if (!ModelSpawn::readFromFile(dirf, spawn)) + break; + + MapSpawns *current; + MapData::iterator map_iter = mapData.find(mapID); + if (map_iter == mapData.end()) + { + printf("spawning Map %d\n", mapID); + mapData[mapID] = current = new MapSpawns(); + } + else current = (*map_iter).second; + current->UniqueEntries.insert(pair(spawn.ID, spawn)); + current->TileEntries.insert(pair(StaticMapTree::packTileID(tileX, tileY), spawn.ID)); + } + bool success = (ferror(dirf) == 0); + fclose(dirf); + return success; + } + + bool TileAssembler::calculateTransformedBound(ModelSpawn &spawn) + { + std::string modelFilename = iSrcDir + "/" + spawn.name; + ModelPosition modelPosition; + modelPosition.iDir = spawn.iRot; + modelPosition.iScale = spawn.iScale; + modelPosition.init(); + + FILE *rf = fopen(modelFilename.c_str(), "rb"); + if (!rf) + { + printf("ERROR: Can't open model file: %s\n", modelFilename.c_str()); + return false; + } + + AABox modelBound; + bool boundEmpty=true; + char ident[8]; + + int readOperation = 1; + + // temporary use defines to simplify read/check code (close file and return at fail) + #define READ_OR_RETURN(V,S) if(fread((V), (S), 1, rf) != 1) { \ + fclose(rf); printf("readfail, op = %i\n", readOperation); return(false); }readOperation++; + #define CMP_OR_RETURN(V,S) if(strcmp((V),(S)) != 0) { \ + fclose(rf); printf("cmpfail, %s!=%s\n", V, S);return(false); } + + READ_OR_RETURN(&ident, 8); + CMP_OR_RETURN(ident, "VMAP003"); + + // we have to read one int. This is needed during the export and we have to skip it here + uint32 tempNVectors; + READ_OR_RETURN(&tempNVectors, sizeof(tempNVectors)); + + uint32 groups, wmoRootId; + char blockId[5]; + blockId[4] = 0; + int blocksize; + float *vectorarray = 0; + + READ_OR_RETURN(&groups, sizeof(uint32)); + READ_OR_RETURN(&wmoRootId, sizeof(uint32)); + if (groups != 1) printf("Warning: '%s' does not seem to be a M2 model!\n", modelFilename.c_str()); + + for (uint32 g=0; g0) + { + vectorarray = new float[nvectors*3]; + READ_OR_RETURN(vectorarray, nvectors*sizeof(float)*3); + } + else + { + std::cout << "error: model '" << spawn.name << "' has no geometry!" << std::endl; + return false; + } + + for (uint32 i=0, indexNo=0; indexNo0) + filename.append("/"); + filename.append(pModelFilename); + FILE *rf = fopen(filename.c_str(), "rb"); + + if (!rf) + { + printf("ERROR: Can't open model file in form: %s",pModelFilename.c_str()); + printf("... or form: %s",filename.c_str() ); + return false; + } + + char ident[8]; + + int readOperation = 1; + + // temporary use defines to simplify read/check code (close file and return at fail) + #define READ_OR_RETURN(V,S) if(fread((V), (S), 1, rf) != 1) { \ + fclose(rf); printf("readfail, op = %i\n", readOperation); return(false); }readOperation++; + #define CMP_OR_RETURN(V,S) if(strcmp((V),(S)) != 0) { \ + fclose(rf); printf("cmpfail, %s!=%s\n", V, S);return(false); } + + READ_OR_RETURN(&ident, 8); + CMP_OR_RETURN(ident, "VMAP003"); + + // we have to read one int. This is needed during the export and we have to skip it here + uint32 tempNVectors; + READ_OR_RETURN(&tempNVectors, sizeof(tempNVectors)); + + uint32 groups; + uint32 RootWMOID; + char blockId[5]; + blockId[4] = 0; + int blocksize; + + READ_OR_RETURN(&groups, sizeof(uint32)); + READ_OR_RETURN(&RootWMOID, sizeof(uint32)); + + std::vector groupsArray; + + for (uint32 g=0; g triangles; + std::vector vertexArray; + + uint32 mogpflags, GroupWMOID; + READ_OR_RETURN(&mogpflags, sizeof(uint32)); + READ_OR_RETURN(&GroupWMOID, sizeof(uint32)); + + float bbox1[3], bbox2[3]; + READ_OR_RETURN(bbox1, sizeof(float)*3); + READ_OR_RETURN(bbox2, sizeof(float)*3); + + uint32 liquidflags; + READ_OR_RETURN(&liquidflags, sizeof(uint32)); + + // will this ever be used? what is it good for anyway?? + uint32 branches; + READ_OR_RETURN(&blockId, 4); + CMP_OR_RETURN(blockId, "GRP "); + READ_OR_RETURN(&blocksize, sizeof(int)); + READ_OR_RETURN(&branches, sizeof(uint32)); + for (uint32 b=0; b0) + { + uint16 *indexarray = new uint16[nindexes]; + READ_OR_RETURN(indexarray, nindexes*sizeof(uint16)); + for (uint32 i=0; i0) + { + float *vectorarray = new float[nvectors*3]; + READ_OR_RETURN(vectorarray, nvectors*sizeof(float)*3); + for (uint32 i=0; iGetHeightStorage(), size*sizeof(float)); + size = hlq.xtiles*hlq.ytiles; + READ_OR_RETURN(liquid->GetFlagsStorage(), size); + } + + groupsArray.push_back(GroupModel(mogpflags, GroupWMOID, AABox(Vector3(bbox1), Vector3(bbox2)))); + groupsArray.back().setMeshData(vertexArray, triangles); + groupsArray.back().setLiquidData(liquid); + + // drop of temporary use defines + #undef READ_OR_RETURN + #undef CMP_OR_RETURN + + } + fclose(rf); + + // write WorldModel + WorldModel model; + model.setRootWmoID(RootWMOID); + if (groupsArray.size()) + { + model.setGroupModels(groupsArray); + success = model.writeFile(iDestDir + "/" + pModelFilename + ".vmo"); + } + + //std::cout << "readRawFile2: '" << pModelFilename << "' tris: " << nElements << " nodes: " << nNodes << std::endl; + return success; + } +} diff --git a/src/server/collision/Maps/TileAssembler.h b/src/server/collision/Maps/TileAssembler.h new file mode 100644 index 00000000000..b26735708af --- /dev/null +++ b/src/server/collision/Maps/TileAssembler.h @@ -0,0 +1,89 @@ +/* + * Copyright (C) 2005-2010 MaNGOS + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef _TILEASSEMBLER_H_ +#define _TILEASSEMBLER_H_ + +#include +#include +#include + +#include "ModelInstance.h" + +namespace VMAP +{ + /** + This Class is used to convert raw vector data into balanced BSP-Trees. + To start the conversion call convertWorld(). + */ + //=============================================== + + class ModelPosition + { + private: + G3D::Matrix3 iRotation; + public: + G3D::Vector3 iPos; + G3D::Vector3 iDir; + float iScale; + void init() + { + iRotation = G3D::Matrix3::fromEulerAnglesZYX(G3D::pi()*iDir.y/180.f, G3D::pi()*iDir.x/180.f, G3D::pi()*iDir.z/180.f); + } + G3D::Vector3 transform(const G3D::Vector3& pIn) const; + void moveToBasePos(const G3D::Vector3& pBasePos) { iPos -= pBasePos; } + }; + + typedef std::map UniqueEntryMap; + typedef std::multimap TileMap; + + struct MapSpawns + { + UniqueEntryMap UniqueEntries; + TileMap TileEntries; + }; + + typedef std::map MapData; + //=============================================== + + class TileAssembler + { + private: + std::string iDestDir; + std::string iSrcDir; + bool (*iFilterMethod)(char *pName); + G3D::Table iUniqueNameIds; + unsigned int iCurrentUniqueNameId; + MapData mapData; + + public: + TileAssembler(const std::string& pSrcDirName, const std::string& pDestDirName); + virtual ~TileAssembler(); + + bool convertWorld2(); + bool readMapSpawns(); + bool calculateTransformedBound(ModelSpawn &spawn); + + bool convertRawFile(const std::string& pModelFilename); + void setModelNameFilterMethod(bool (*pFilterMethod)(char *pName)) { iFilterMethod = pFilterMethod; } + std::string getDirEntryNameFromModName(unsigned int pMapId, const std::string& pModPosName); + unsigned int getUniqueNameId(const std::string pName); + }; + +} // VMAP +#endif /*_TILEASSEMBLER_H_*/ diff --git a/src/server/collision/Models/ModelInstance.cpp b/src/server/collision/Models/ModelInstance.cpp new file mode 100644 index 00000000000..677a08e147a --- /dev/null +++ b/src/server/collision/Models/ModelInstance.cpp @@ -0,0 +1,219 @@ +/* + * Copyright (C) 2005-2010 MaNGOS + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "ModelInstance.h" +#include "WorldModel.h" +#include "MapTree.h" + +using G3D::Vector3; +using G3D::Ray; + +namespace VMAP +{ + ModelInstance::ModelInstance(const ModelSpawn &spawn, WorldModel *model): ModelSpawn(spawn), iModel(model) + { + iInvRot = G3D::Matrix3::fromEulerAnglesZYX(G3D::pi()*iRot.y/180.f, G3D::pi()*iRot.x/180.f, G3D::pi()*iRot.z/180.f).inverse(); + iInvScale = 1.f/iScale; + } + + bool ModelInstance::intersectRay(const G3D::Ray& pRay, float& pMaxDist, bool pStopAtFirstHit) const + { + if (!iModel) + { + //std::cout << "\n"; + return false; + } + float time = pRay.intersectionTime(iBound); + if (time == G3D::inf()) + { +// std::cout << "Ray does not hit '" << name << "'\n"; + + return false; + } +// std::cout << "Ray crosses bound of '" << name << "'\n"; +/* std::cout << "ray from:" << pRay.origin().x << ", " << pRay.origin().y << ", " << pRay.origin().z + << " dir:" << pRay.direction().x << ", " << pRay.direction().y << ", " << pRay.direction().z + << " t/tmax:" << time << "/" << pMaxDist; + std::cout << "\nBound lo:" << iBound.low().x << ", " << iBound.low().y << ", " << iBound.low().z << " hi: " + << iBound.high().x << ", " << iBound.high().y << ", " << iBound.high().z << std::endl; */ + // child bounds are defined in object space: + Vector3 p = iInvRot * (pRay.origin() - iPos) * iInvScale; + Ray modRay(p, iInvRot * pRay.direction()); + float distance = pMaxDist * iInvScale; + bool hit = iModel->IntersectRay(modRay, distance, pStopAtFirstHit); + distance *= iScale; + pMaxDist = distance; + return hit; + } + + void ModelInstance::intersectPoint(const G3D::Vector3& p, AreaInfo &info) const + { + if (!iModel) + { +#ifdef VMAP_DEBUG + std::cout << "\n"; +#endif + return; + } + + // M2 files don't contain area info, only WMO files + if (flags & MOD_M2) + return; + if (!iBound.contains(p)) + return; + // child bounds are defined in object space: + Vector3 pModel = iInvRot * (p - iPos) * iInvScale; + Vector3 zDirModel = iInvRot * Vector3(0.f, 0.f, -1.f); + float zDist; + if (iModel->IntersectPoint(pModel, zDirModel, zDist, info)) + { + Vector3 modelGround = pModel + zDist * zDirModel; + // Transform back to world space. Note that: + // Mat * vec == vec * Mat.transpose() + // and for rotation matrices: Mat.inverse() == Mat.transpose() + float world_Z = ((modelGround * iInvRot) * iScale + iPos).z; + if (info.ground_Z < world_Z) + { + info.ground_Z = world_Z; + info.adtId = adtId; + } + } + } + + bool ModelInstance::GetLocationInfo(const G3D::Vector3& p, LocationInfo &info) const + { + if (!iModel) + { +#ifdef VMAP_DEBUG + std::cout << "\n"; +#endif + return false; + } + + // M2 files don't contain area info, only WMO files + if (flags & MOD_M2) + return false; + if (!iBound.contains(p)) + return false; + // child bounds are defined in object space: + Vector3 pModel = iInvRot * (p - iPos) * iInvScale; + Vector3 zDirModel = iInvRot * Vector3(0.f, 0.f, -1.f); + float zDist; + if (iModel->GetLocationInfo(pModel, zDirModel, zDist, info)) + { + Vector3 modelGround = pModel + zDist * zDirModel; + // Transform back to world space. Note that: + // Mat * vec == vec * Mat.transpose() + // and for rotation matrices: Mat.inverse() == Mat.transpose() + float world_Z = ((modelGround * iInvRot) * iScale + iPos).z; + if (info.ground_Z < world_Z) // hm...could it be handled automatically with zDist at intersection? + { + info.ground_Z = world_Z; + info.hitInstance = this; + return true; + } + } + return false; + } + + bool ModelInstance::GetLiquidLevel(const G3D::Vector3& p, LocationInfo &info, float &liqHeight) const + { + // child bounds are defined in object space: + Vector3 pModel = iInvRot * (p - iPos) * iInvScale; + //Vector3 zDirModel = iInvRot * Vector3(0.f, 0.f, -1.f); + float zDist; + if (info.hitModel->GetLiquidLevel(pModel, zDist)) + { + // calculate world height (zDist in model coords): + // assume WMO not tilted (wouldn't make much sense anyway) + liqHeight = zDist * iScale + iPos.z; + return true; + } + return false; + } + + bool ModelSpawn::readFromFile(FILE *rf, ModelSpawn &spawn) + { + uint32 check=0, nameLen; + check += fread(&spawn.flags, sizeof(uint32), 1, rf); + // EoF? + if (!check) + { + if (ferror(rf)) + std::cout << "Error reading ModelSpawn!\n"; + return false; + } + check += fread(&spawn.adtId, sizeof(uint16), 1, rf); + check += fread(&spawn.ID, sizeof(uint32), 1, rf); + check += fread(&spawn.iPos, sizeof(float), 3, rf); + check += fread(&spawn.iRot, sizeof(float), 3, rf); + check += fread(&spawn.iScale, sizeof(float), 1, rf); + bool has_bound = (spawn.flags & MOD_HAS_BOUND); + if (has_bound) // only WMOs have bound in MPQ, only available after computation + { + Vector3 bLow, bHigh; + check += fread(&bLow, sizeof(float), 3, rf); + check += fread(&bHigh, sizeof(float), 3, rf); + spawn.iBound = G3D::AABox(bLow, bHigh); + } + check += fread(&nameLen, sizeof(uint32), 1, rf); + if(check != (has_bound ? 17 : 11)) + { + std::cout << "Error reading ModelSpawn!\n"; + return false; + } + char nameBuff[500]; + if (nameLen>500) // file names should never be that long, must be file error + { + std::cout << "Error reading ModelSpawn, file name too long!\n"; + return false; + } + check = fread(nameBuff, sizeof(char), nameLen, rf); + if (check != nameLen) + { + std::cout << "Error reading ModelSpawn!\n"; + return false; + } + spawn.name = std::string(nameBuff, nameLen); + return true; + } + + bool ModelSpawn::writeToFile(FILE *wf, const ModelSpawn &spawn) + { + uint32 check=0; + check += fwrite(&spawn.flags, sizeof(uint32), 1, wf); + check += fwrite(&spawn.adtId, sizeof(uint16), 1, wf); + check += fwrite(&spawn.ID, sizeof(uint32), 1, wf); + check += fwrite(&spawn.iPos, sizeof(float), 3, wf); + check += fwrite(&spawn.iRot, sizeof(float), 3, wf); + check += fwrite(&spawn.iScale, sizeof(float), 1, wf); + bool has_bound = (spawn.flags & MOD_HAS_BOUND); + if(has_bound) // only WMOs have bound in MPQ, only available after computation + { + check += fwrite(&spawn.iBound.low(), sizeof(float), 3, wf); + check += fwrite(&spawn.iBound.high(), sizeof(float), 3, wf); + } + uint32 nameLen = spawn.name.length(); + check += fwrite(&nameLen, sizeof(uint32), 1, wf); + if(check != (has_bound ? 17 : 11)) return false; + check = fwrite(spawn.name.c_str(), sizeof(char), nameLen, wf); + if(check != nameLen) return false; + return true; + } + +} diff --git a/src/server/collision/Models/ModelInstance.h b/src/server/collision/Models/ModelInstance.h new file mode 100644 index 00000000000..97b3ab632a1 --- /dev/null +++ b/src/server/collision/Models/ModelInstance.h @@ -0,0 +1,81 @@ +/* + * Copyright (C) 2005-2010 MaNGOS + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef _MODELINSTANCE_H_ +#define _MODELINSTANCE_H_ + +#include +#include +#include +#include + +#include "Platform/Define.h" + +namespace VMAP +{ + class WorldModel; + struct AreaInfo; + struct LocationInfo; + + enum ModelFlags + { + MOD_M2 = 1, + MOD_WORLDSPAWN = 1<<1, + MOD_HAS_BOUND = 1<<2 + }; + + class ModelSpawn + { + public: + //mapID, tileX, tileY, Flags, ID, Pos, Rot, Scale, Bound_lo, Bound_hi, name + uint32 flags; + uint16 adtId; + uint32 ID; + G3D::Vector3 iPos; + G3D::Vector3 iRot; + float iScale; + G3D::AABox iBound; + std::string name; + bool operator==(const ModelSpawn &other) const { return ID == other.ID; } + //uint32 hashCode() const { return ID; } + // temp? + const G3D::AABox& getBounds() const { return iBound; } + + + static bool readFromFile(FILE *rf, ModelSpawn &spawn); + static bool writeToFile(FILE *rw, const ModelSpawn &spawn); + }; + + class ModelInstance: public ModelSpawn + { + public: + ModelInstance(): iModel(0) {} + ModelInstance(const ModelSpawn &spawn, WorldModel *model); + void setUnloaded() { iModel = 0; } + bool intersectRay(const G3D::Ray& pRay, float& pMaxDist, bool pStopAtFirstHit) const; + void intersectPoint(const G3D::Vector3& p, AreaInfo &info) const; + bool GetLocationInfo(const G3D::Vector3& p, LocationInfo &info) const; + bool GetLiquidLevel(const G3D::Vector3& p, LocationInfo &info, float &liqHeight) const; + protected: + G3D::Matrix3 iInvRot; + float iInvScale; + WorldModel *iModel; + }; +} // namespace VMAP + +#endif // _MODELINSTANCE diff --git a/src/server/collision/Models/WorldModel.cpp b/src/server/collision/Models/WorldModel.cpp new file mode 100644 index 00000000000..690c77577ae --- /dev/null +++ b/src/server/collision/Models/WorldModel.cpp @@ -0,0 +1,535 @@ +/* + * Copyright (C) 2005-2010 MaNGOS + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "WorldModel.h" +#include "VMapDefinitions.h" +#include "MapTree.h" + +using G3D::Vector3; +using G3D::Ray; + +template<> struct BoundsTrait +{ + static void getBounds(const VMAP::GroupModel& obj, G3D::AABox& out) { out = obj.GetBound(); } +}; + + +namespace VMAP +{ + bool IntersectTriangle(const MeshTriangle &tri, std::vector::const_iterator points, const G3D::Ray &ray, float &distance) + { + static const float EPS = 1e-5f; + + // See RTR2 ch. 13.7 for the algorithm. + + const Vector3 e1 = points[tri.idx1] - points[tri.idx0]; + const Vector3 e2 = points[tri.idx2] - points[tri.idx0]; + const Vector3 p(ray.direction().cross(e2)); + const float a = e1.dot(p); + + if (abs(a) < EPS) { + // Determinant is ill-conditioned; abort early + return false; + } + + const float f = 1.0f / a; + const Vector3 s(ray.origin() - points[tri.idx0]); + const float u = f * s.dot(p); + + if ((u < 0.0f) || (u > 1.0f)) { + // We hit the plane of the m_geometry, but outside the m_geometry + return false; + } + + const Vector3 q(s.cross(e1)); + const float v = f * ray.direction().dot(q); + + if ((v < 0.0f) || ((u + v) > 1.0f)) { + // We hit the plane of the triangle, but outside the triangle + return false; + } + + const float t = f * e2.dot(q); + + if ((t > 0.0f) && (t < distance)) + { + // This is a new hit, closer than the previous one + distance = t; + + /* baryCoord[0] = 1.0 - u - v; + baryCoord[1] = u; + baryCoord[2] = v; */ + + return true; + } + // This hit is after the previous hit, so ignore it + return false; + } + + class TriBoundFunc + { + public: + TriBoundFunc(std::vector &vert): vertices(vert.begin()) {} + void operator()(const MeshTriangle &tri, G3D::AABox &out) const + { + G3D::Vector3 lo = vertices[tri.idx0]; + G3D::Vector3 hi = lo; + + lo = (lo.min(vertices[tri.idx1])).min(vertices[tri.idx2]); + hi = (hi.max(vertices[tri.idx1])).max(vertices[tri.idx2]); + + out = G3D::AABox(lo, hi); + } + protected: + const std::vector::const_iterator vertices; + }; + + // ===================== WmoLiquid ================================== + + WmoLiquid::WmoLiquid(uint32 width, uint32 height, const Vector3 &corner, uint32 type): + iTilesX(width), iTilesY(height), iCorner(corner), iType(type) + { + iHeight = new float[(width+1)*(height+1)]; + iFlags = new uint8[width*height]; + } + + WmoLiquid::WmoLiquid(const WmoLiquid &other): iHeight(0), iFlags(0) + { + *this = other; // use assignment operator... + } + + WmoLiquid::~WmoLiquid() + { + delete[] iHeight; + delete[] iFlags; + } + + WmoLiquid& WmoLiquid::operator=(const WmoLiquid &other) + { + if (this == &other) + return *this; + iTilesX = other.iTilesX; + iTilesY = other.iTilesY; + iCorner = other.iCorner; + iType = other.iType; + delete iHeight; + delete iFlags; + if (other.iHeight) + { + iHeight = new float[(iTilesX+1)*(iTilesY+1)]; + memcpy(iHeight, other.iHeight, (iTilesX+1)*(iTilesY+1)*sizeof(float)); + } + else + iHeight = 0; + if (other.iFlags) + { + iFlags = new uint8[iTilesX * iTilesY]; + memcpy(iFlags, other.iFlags, iTilesX * iTilesY); + } + else + iFlags = 0; + return *this; + } + + bool WmoLiquid::GetLiquidHeight(const Vector3 &pos, float &liqHeight) const + { + uint32 tx = (pos.x - iCorner.x)/LIQUID_TILE_SIZE; + if (tx<0 || tx >= iTilesX) return false; + uint32 ty = (pos.y - iCorner.y)/LIQUID_TILE_SIZE; + if (ty<0 || ty >= iTilesY) return false; + // checking for 0x08 *might* be enough, but disabled tiles always are 0x?F: + if ((iFlags[tx + ty*iTilesX] & 0x0F) == 0x0F) + return false; + //placeholder...use only lower left corner vertex + liqHeight = /* iCorner.z + */ iHeight[tx + ty*(iTilesX+1)]; + return true; + } + + uint32 WmoLiquid::GetFileSize() + { + return 2 * sizeof(uint32) + + sizeof(Vector3) + + (iTilesX + 1)*(iTilesY + 1) * sizeof(float) + + iTilesX * iTilesY; + } + + bool WmoLiquid::writeToFile(FILE *wf) + { + bool result = true; + if (result && fwrite(&iTilesX, sizeof(uint32), 1, wf) != 1) result = false; + if (result && fwrite(&iTilesY, sizeof(uint32), 1, wf) != 1) result = false; + if (result && fwrite(&iCorner, sizeof(Vector3), 1, wf) != 1) result = false; + if (result && fwrite(&iType, sizeof(uint32), 1, wf) != 1) result = false; + uint32 size = (iTilesX + 1)*(iTilesY + 1); + if (result && fwrite(iHeight, sizeof(float), size, wf) != size) result = false; + size = iTilesX*iTilesY; + if (result && fwrite(iFlags, sizeof(uint8), size, wf) != size) result = false; + return result; + } + + bool WmoLiquid::readFromFile(FILE *rf, WmoLiquid *&out) + { + bool result = true; + WmoLiquid *liquid = new WmoLiquid(); + if (result && fread(&liquid->iTilesX, sizeof(uint32), 1, rf) != 1) result = false; + if (result && fread(&liquid->iTilesY, sizeof(uint32), 1, rf) != 1) result = false; + if (result && fread(&liquid->iCorner, sizeof(Vector3), 1, rf) != 1) result = false; + if (result && fread(&liquid->iType, sizeof(uint32), 1, rf) != 1) result = false; + uint32 size = (liquid->iTilesX + 1)*(liquid->iTilesY + 1); + liquid->iHeight = new float[size]; + if (result && fread(liquid->iHeight, sizeof(float), size, rf) != size) result = false; + size = liquid->iTilesX * liquid->iTilesY; + liquid->iFlags = new uint8[size]; + if (result && fread(liquid->iFlags, sizeof(uint8), size, rf) != size) result = false; + if (!result) + delete liquid; + out = liquid; + return result; + } + + // ===================== GroupModel ================================== + + GroupModel::GroupModel(const GroupModel &other): + iBound(other.iBound), iMogpFlags(other.iMogpFlags), iGroupWMOID(other.iGroupWMOID), + vertices(other.vertices), triangles(other.triangles), meshTree(other.meshTree), iLiquid(0) + { + if (other.iLiquid) + iLiquid = new WmoLiquid(*other.iLiquid); + } + + void GroupModel::setMeshData(std::vector &vert, std::vector &tri) + { + vertices.swap(vert); + triangles.swap(tri); + TriBoundFunc bFunc(vertices); + meshTree.build(triangles, bFunc); + } + + bool GroupModel::writeToFile(FILE *wf) + { + bool result = true; + uint32 chunkSize, count; + + if (result && fwrite(&iBound, sizeof(G3D::AABox), 1, wf) != 1) result = false; + if (result && fwrite(&iMogpFlags, sizeof(uint32), 1, wf) != 1) result = false; + if (result && fwrite(&iGroupWMOID, sizeof(uint32), 1, wf) != 1) result = false; + + // write vertices + if (result && fwrite("VERT", 1, 4, wf) != 4) result = false; + count = vertices.size(); + chunkSize = sizeof(uint32)+ sizeof(Vector3)*count; + if (result && fwrite(&chunkSize, sizeof(uint32), 1, wf) != 1) result = false; + if (result && fwrite(&count, sizeof(uint32), 1, wf) != 1) result = false; + if (!count) // models without (collision) geometry end here, unsure if they are useful + return result; + if (result && fwrite(&vertices[0], sizeof(Vector3), count, wf) != count) result = false; + + // write triangle mesh + if (result && fwrite("TRIM", 1, 4, wf) != 4) result = false; + count = triangles.size(); + chunkSize = sizeof(uint32)+ sizeof(MeshTriangle)*count; + if (result && fwrite(&chunkSize, sizeof(uint32), 1, wf) != 1) result = false; + if (result && fwrite(&count, sizeof(uint32), 1, wf) != 1) result = false; + if (result && fwrite(&triangles[0], sizeof(MeshTriangle), count, wf) != count) result = false; + + // write mesh BIH + if (result && fwrite("MBIH", 1, 4, wf) != 4) result = false; + if (result) result = meshTree.writeToFile(wf); + + // write liquid data + if (result && fwrite("LIQU", 1, 4, wf) != 4) result = false; + if (!iLiquid) + { + chunkSize = 0; + if (result && fwrite(&chunkSize, sizeof(uint32), 1, wf) != 1) result = false; + return result; + } + chunkSize = iLiquid->GetFileSize(); + if (result && fwrite(&chunkSize, sizeof(uint32), 1, wf) != 1) result = false; + if (result) result = iLiquid->writeToFile(wf); + + return result; + } + + bool GroupModel::readFromFile(FILE *rf) + { + char chunk[8]; + bool result = true; + uint32 chunkSize, count; + triangles.clear(); + vertices.clear(); + delete iLiquid; + iLiquid = 0; + + if (result && fread(&iBound, sizeof(G3D::AABox), 1, rf) != 1) result = false; + if (result && fread(&iMogpFlags, sizeof(uint32), 1, rf) != 1) result = false; + if (result && fread(&iGroupWMOID, sizeof(uint32), 1, rf) != 1) result = false; + + // read vertices + if (result && !readChunk(rf, chunk, "VERT", 4)) result = false; + if (result && fread(&chunkSize, sizeof(uint32), 1, rf) != 1) result = false; + if (result && fread(&count, sizeof(uint32), 1, rf) != 1) result = false; + if (!count) // models without (collision) geometry end here, unsure if they are useful + return result; + if (result) vertices.resize(count); + if (result && fread(&vertices[0], sizeof(Vector3), count, rf) != count) result = false; + + // read triangle mesh + if (result && !readChunk(rf, chunk, "TRIM", 4)) result = false; + if (result && fread(&chunkSize, sizeof(uint32), 1, rf) != 1) result = false; + if (result && fread(&count, sizeof(uint32), 1, rf) != 1) result = false; + if (result) triangles.resize(count); + if (result && fread(&triangles[0], sizeof(MeshTriangle), count, rf) != count) result = false; + + // read mesh BIH + if (result && !readChunk(rf, chunk, "MBIH", 4)) result = false; + if (result) result = meshTree.readFromFile(rf); + + // write liquid data + if (result && !readChunk(rf, chunk, "LIQU", 4)) result = false; + if (result && fread(&chunkSize, sizeof(uint32), 1, rf) != 1) result = false; + if (result && chunkSize > 0) + result = WmoLiquid::readFromFile(rf, iLiquid); + return result; + } + + struct GModelRayCallback + { + GModelRayCallback(const std::vector &tris, const std::vector &vert): + vertices(vert.begin()), triangles(tris.begin()), hit(false) {} + bool operator()(const G3D::Ray& ray, uint32 entry, float& distance, bool pStopAtFirstHit) + { + bool result = IntersectTriangle(triangles[entry], vertices, ray, distance); + if (result) hit=true; + return hit; + } + std::vector::const_iterator vertices; + std::vector::const_iterator triangles; + bool hit; + }; + + bool GroupModel::IntersectRay(const G3D::Ray &ray, float &distance, bool stopAtFirstHit) const + { + if (!triangles.size()) + return false; + GModelRayCallback callback(triangles, vertices); + meshTree.intersectRay(ray, callback, distance, stopAtFirstHit); + return callback.hit; + } + + bool GroupModel::IsInsideObject(const Vector3 &pos, const Vector3 &down, float &z_dist) const + { + if (!triangles.size() || !iBound.contains(pos)) + return false; + GModelRayCallback callback(triangles, vertices); + Vector3 rPos = pos - 0.1f * down; + float dist = G3D::inf(); + G3D::Ray ray(rPos, down); + bool hit = IntersectRay(ray, dist, false); + if (hit) + z_dist = dist - 0.1f; + return hit; + } + + bool GroupModel::GetLiquidLevel(const Vector3 &pos, float &liqHeight) const + { + if (iLiquid) + return iLiquid->GetLiquidHeight(pos, liqHeight); + return false; + } + + uint32 GroupModel::GetLiquidType() const + { + // convert to type mask, matching MAP_LIQUID_TYPE_* defines in Map.h + if (iLiquid) + return (1 << iLiquid->GetType()); + return 0; + } + + // ===================== WorldModel ================================== + + void WorldModel::setGroupModels(std::vector &models) + { + groupModels.swap(models); + groupTree.build(groupModels, BoundsTrait::getBounds, 1); + } + + struct WModelRayCallBack + { + WModelRayCallBack(const std::vector &mod): models(mod.begin()), hit(false) {} + bool operator()(const G3D::Ray& ray, uint32 entry, float& distance, bool pStopAtFirstHit) + { + bool result = models[entry].IntersectRay(ray, distance, pStopAtFirstHit); + if (result) hit=true; + return hit; + } + std::vector::const_iterator models; + bool hit; + }; + + bool WorldModel::IntersectRay(const G3D::Ray &ray, float &distance, bool stopAtFirstHit) const + { + // small M2 workaround, maybe better make separate class with virtual intersection funcs + // in any case, there's no need to use a bound tree if we only have one submodel + if (groupModels.size() == 1) + return groupModels[0].IntersectRay(ray, distance, stopAtFirstHit); + + WModelRayCallBack isc(groupModels); + groupTree.intersectRay(ray, isc, distance, stopAtFirstHit); + return isc.hit; + } + + class WModelAreaCallback { + public: + WModelAreaCallback(const std::vector &vals, const Vector3 &down): + prims(vals.begin()), hit(vals.end()), minVol(G3D::inf()), zDist(G3D::inf()), zVec(down) {} + std::vector::const_iterator prims; + std::vector::const_iterator hit; + float minVol; + float zDist; + Vector3 zVec; + void operator()(const Vector3& point, uint32 entry) + { + float group_Z; + //float pVol = prims[entry].GetBound().volume(); + //if(pVol < minVol) + //{ + /* if (prims[entry].iBound.contains(point)) */ + if (prims[entry].IsInsideObject(point, zVec, group_Z)) + { + //minVol = pVol; + //hit = prims + entry; + if (group_Z < zDist) + { + zDist = group_Z; + hit = prims + entry; + } +#ifdef VMAP_DEBUG + const GroupModel &gm = prims[entry]; + printf("%10u %8X %7.3f,%7.3f,%7.3f | %7.3f,%7.3f,%7.3f | z=%f, p_z=%f\n", gm.GetWmoID(), gm.GetMogpFlags(), + gm.GetBound().low().x, gm.GetBound().low().y, gm.GetBound().low().z, + gm.GetBound().high().x, gm.GetBound().high().y, gm.GetBound().high().z, group_Z, point.z); +#endif + } + //} + //std::cout << "trying to intersect '" << prims[entry].name << "'\n"; + } + }; + + bool WorldModel::IntersectPoint(const G3D::Vector3 &p, const G3D::Vector3 &down, float &dist, AreaInfo &info) const + { + if (!groupModels.size()) + return false; + WModelAreaCallback callback(groupModels, down); + groupTree.intersectPoint(p, callback); + if (callback.hit != groupModels.end()) + { + info.rootId = RootWMOID; + info.groupId = callback.hit->GetWmoID(); + info.flags = callback.hit->GetMogpFlags(); + info.result = true; + dist = callback.zDist; + return true; + } + return false; + } + + bool WorldModel::GetLocationInfo(const G3D::Vector3 &p, const G3D::Vector3 &down, float &dist, LocationInfo &info) const + { + if (!groupModels.size()) + return false; + WModelAreaCallback callback(groupModels, down); + groupTree.intersectPoint(p, callback); + if (callback.hit != groupModels.end()) + { + info.hitModel = &(*callback.hit); + dist = callback.zDist; + return true; + } + return false; + } + + bool WorldModel::writeFile(const std::string &filename) + { + FILE *wf = fopen(filename.c_str(), "wb"); + if (!wf) + return false; + + bool result = true; + uint32 chunkSize, count; + result = fwrite(VMAP_MAGIC,1,8,wf) == 8; + if (result && fwrite("WMOD", 1, 4, wf) != 4) result = false; + chunkSize = sizeof(uint32) + sizeof(uint32); + if (result && fwrite(&chunkSize, sizeof(uint32), 1, wf) != 1) result = false; + if (result && fwrite(&RootWMOID, sizeof(uint32), 1, wf) != 1) result = false; + + // write group models + count=groupModels.size(); + if (count) + { + if (result && fwrite("GMOD", 1, 4, wf) != 4) result = false; + //chunkSize = sizeof(uint32)+ sizeof(GroupModel)*count; + //if (result && fwrite(&chunkSize, sizeof(uint32), 1, wf) != 1) result = false; + if (result && fwrite(&count, sizeof(uint32), 1, wf) != 1) result = false; + for (uint32 i=0; i + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef _WORLDMODEL_H +#define _WORLDMODEL_H + +#include +#include +#include +#include +#include "BIH.h" + +#include "Platform/Define.h" + +namespace VMAP +{ + class TreeNode; + struct AreaInfo; + struct LocationInfo; + + class MeshTriangle + { + public: + MeshTriangle(){}; + MeshTriangle(uint32 na, uint32 nb, uint32 nc): idx0(na), idx1(nb), idx2(nc) {}; + + uint32 idx0; + uint32 idx1; + uint32 idx2; + }; + + class WmoLiquid + { + public: + WmoLiquid(uint32 width, uint32 height, const Vector3 &corner, uint32 type); + WmoLiquid(const WmoLiquid &other); + ~WmoLiquid(); + WmoLiquid& operator=(const WmoLiquid &other); + bool GetLiquidHeight(const Vector3 &pos, float &liqHeight) const; + uint32 GetType() const { return iType; } + float *GetHeightStorage() { return iHeight; } + uint8 *GetFlagsStorage() { return iFlags; } + uint32 GetFileSize(); + bool writeToFile(FILE *wf); + static bool readFromFile(FILE *rf, WmoLiquid *&liquid); + private: + WmoLiquid(): iHeight(0), iFlags(0) {}; + uint32 iTilesX; //!< number of tiles in x direction, each + uint32 iTilesY; + Vector3 iCorner; //!< the lower corner + uint32 iType; //!< liquid type + float *iHeight; //!< (tilesX + 1)*(tilesY + 1) height values + uint8 *iFlags; //!< info if liquid tile is used + }; + + /*! holding additional info for WMO group files */ + class GroupModel + { + public: + GroupModel(): iLiquid(0) {} + GroupModel(const GroupModel &other); + GroupModel(uint32 mogpFlags, uint32 groupWMOID, const AABox &bound): + iBound(bound), iMogpFlags(mogpFlags), iGroupWMOID(groupWMOID), iLiquid(0) {} + ~GroupModel() { delete iLiquid; } + + //! pass mesh data to object and create BIH. Passed vectors get get swapped with old geometry! + void setMeshData(std::vector &vert, std::vector &tri); + void setLiquidData(WmoLiquid *liquid) { iLiquid = liquid; } + bool IntersectRay(const G3D::Ray &ray, float &distance, bool stopAtFirstHit) const; + bool IsInsideObject(const Vector3 &pos, const Vector3 &down, float &z_dist) const; + bool GetLiquidLevel(const Vector3 &pos, float &liqHeight) const; + uint32 GetLiquidType() const; + bool writeToFile(FILE *wf); + bool readFromFile(FILE *rf); + const G3D::AABox& GetBound() const { return iBound; } + uint32 GetMogpFlags() const { return iMogpFlags; } + uint32 GetWmoID() const { return iGroupWMOID; } + protected: + G3D::AABox iBound; + uint32 iMogpFlags;// 0x8 outdor; 0x2000 indoor + uint32 iGroupWMOID; + std::vector vertices; + std::vector triangles; + BIH meshTree; + WmoLiquid *iLiquid; + }; + /*! Holds a model (converted M2 or WMO) in its original coordinate space */ + class WorldModel + { + public: + WorldModel(): RootWMOID(0) {} + + //! pass group models to WorldModel and create BIH. Passed vector is swapped with old geometry! + void setGroupModels(std::vector &models); + void setRootWmoID(uint32 id) { RootWMOID = id; } + bool IntersectRay(const G3D::Ray &ray, float &distance, bool stopAtFirstHit) const; + bool IntersectPoint(const G3D::Vector3 &p, const G3D::Vector3 &down, float &dist, AreaInfo &info) const; + bool GetLocationInfo(const G3D::Vector3 &p, const G3D::Vector3 &down, float &dist, LocationInfo &info) const; + bool writeFile(const std::string &filename); + bool readFile(const std::string &filename); + protected: + uint32 RootWMOID; + std::vector groupModels; + BIH groupTree; + }; +} // namespace VMAP + +#endif // _WORLDMODEL_H diff --git a/src/server/collision/VMapDefinitions.h b/src/server/collision/VMapDefinitions.h new file mode 100644 index 00000000000..e4a34cc1397 --- /dev/null +++ b/src/server/collision/VMapDefinitions.h @@ -0,0 +1,42 @@ +/* + * Copyright (C) 2005-2010 MaNGOS + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef _VMAPDEFINITIONS_H +#define _VMAPDEFINITIONS_H +#include + +#define LIQUID_TILE_SIZE (533.333f / 128.f) + +namespace VMAP +{ + //===================================== + #define MAX_CAN_FALL_DISTANCE 10.0f + const char VMAP_MAGIC[] = "VMAP_3.0"; + + class VMapDefinitions + { + public: + static float getMaxCanFallDistance() { return MAX_CAN_FALL_DISTANCE; } + }; + + //====================================== + + // defined in TileAssembler.cpp currently... + bool readChunk(FILE *rf, char *dest, const char *compare, uint32 len); +} +#endif diff --git a/src/server/collision/VMapTools.h b/src/server/collision/VMapTools.h new file mode 100644 index 00000000000..dbbd9af9271 --- /dev/null +++ b/src/server/collision/VMapTools.h @@ -0,0 +1,150 @@ +/* +* Copyright (C) 2005-2010 MaNGOS +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +#ifndef _VMAPTOOLS_H +#define _VMAPTOOLS_H + +#include +#include + +#include "NodeValueAccess.h" + +/** +The Class is mainly taken from G3D/AABSPTree.h but modified to be able to use our internal data structure. +This is an iterator that helps us analysing the BSP-Trees. +The collision detection is modified to return true, if we are inside an object. +*/ + +namespace VMAP +{ + template + class IntersectionCallBack { + public: + TValue* closestEntity; + G3D::Vector3 hitLocation; + G3D::Vector3 hitNormal; + + void operator()(const G3D::Ray& ray, const TValue* entity, bool pStopAtFirstHit, float& distance) { + entity->intersect(ray, distance, pStopAtFirstHit, hitLocation, hitNormal); + } + }; + + //============================================================== + //============================================================== + //============================================================== + + class MyCollisionDetection + { + private: + public: + + static bool collisionLocationForMovingPointFixedAABox( + const G3D::Vector3& origin, + const G3D::Vector3& dir, + const G3D::AABox& box, + G3D::Vector3& location, + bool& Inside) + { + + // Integer representation of a floating-point value. +#define IR(x) (reinterpret_cast(x)) + + Inside = true; + const G3D::Vector3& MinB = box.low(); + const G3D::Vector3& MaxB = box.high(); + G3D::Vector3 MaxT(-1.0f, -1.0f, -1.0f); + + // Find candidate planes. + for (int i = 0; i < 3; ++i) + { + if (origin[i] < MinB[i]) + { + location[i] = MinB[i]; + Inside = false; + + // Calculate T distances to candidate planes + if (IR(dir[i])) + { + MaxT[i] = (MinB[i] - origin[i]) / dir[i]; + } + } + else if (origin[i] > MaxB[i]) + { + location[i] = MaxB[i]; + Inside = false; + + // Calculate T distances to candidate planes + if (IR(dir[i])) + { + MaxT[i] = (MaxB[i] - origin[i]) / dir[i]; + } + } + } + + if (Inside) + { + // definite hit + location = origin; + return true; + } + + // Get largest of the maxT's for final choice of intersection + int WhichPlane = 0; + if (MaxT[1] > MaxT[WhichPlane]) + { + WhichPlane = 1; + } + + if (MaxT[2] > MaxT[WhichPlane]) + { + WhichPlane = 2; + } + + // Check final candidate actually inside box + if (IR(MaxT[WhichPlane]) & 0x80000000) + { + // Miss the box + return false; + } + + for (int i = 0; i < 3; ++i) + { + if (i != WhichPlane) + { + location[i] = origin[i] + MaxT[WhichPlane] * dir[i]; + if ((location[i] < MinB[i]) || + (location[i] > MaxB[i])) + { + // On this plane we're outside the box extents, so + // we miss the box + return false; + } + } + } + /* + // Choose the normal to be the plane normal facing into the ray + normal = G3D::Vector3::zero(); + normal[WhichPlane] = (dir[WhichPlane] > 0) ? -1.0 : 1.0; + */ + return true; + +#undef IR + } + }; +} +#endif diff --git a/src/server/game/CollisionDetection/BoundingIntervalHierarchy.cpp b/src/server/game/CollisionDetection/BoundingIntervalHierarchy.cpp deleted file mode 100644 index 4bd6b3c701e..00000000000 --- a/src/server/game/CollisionDetection/BoundingIntervalHierarchy.cpp +++ /dev/null @@ -1,304 +0,0 @@ -/* - * Copyright (C) 2005-2010 MaNGOS - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "BIH.h" - -void BIH::buildHierarchy(std::vector &tempTree, buildData &dat, BuildStats &stats) -{ - // create space for the first node - tempTree.push_back(3 << 30); // dummy leaf - tempTree.insert(tempTree.end(), 2, 0); - //tempTree.add(0); - - // seed bbox - AABound gridBox = { bounds.low(), bounds.high() }; - AABound nodeBox = gridBox; - // seed subdivide function - subdivide(0, dat.numPrims - 1, tempTree, dat, gridBox, nodeBox, 0, 1, stats); -} - -void BIH::subdivide(int left, int right, std::vector &tempTree, buildData &dat, AABound &gridBox, AABound &nodeBox, int nodeIndex, int depth, BuildStats &stats) -{ - if ((right - left + 1) <= dat.maxPrims || depth >= MAX_STACK_SIZE) - { - // write leaf node - stats.updateLeaf(depth, right - left + 1); - createNode(tempTree, nodeIndex, left, right); - return; - } - // calculate extents - int axis = -1, prevAxis, rightOrig; - float clipL = G3D::fnan(), clipR = G3D::fnan(), prevClip = G3D::fnan(); - float split = G3D::fnan(), prevSplit; - bool wasLeft = true; - while (true) - { - prevAxis = axis; - prevSplit = split; - // perform quick consistency checks - Vector3 d( gridBox.hi - gridBox.lo ); - if (d.x < 0 || d.y < 0 || d.z < 0) - throw std::logic_error("negative node extents"); - for (int i = 0; i < 3; i++) - { - if (nodeBox.hi[i] < gridBox.lo[i] || nodeBox.lo[i] > gridBox.hi[i]) - { - //UI.printError(Module.ACCEL, "Reached tree area in error - discarding node with: %d objects", right - left + 1); - throw std::logic_error("invalid node overlap"); - } - } - // find longest axis - axis = d.primaryAxis(); - split = 0.5f * (gridBox.lo[axis] + gridBox.hi[axis]); - // partition L/R subsets - clipL = -G3D::inf(); - clipR = G3D::inf(); - rightOrig = right; // save this for later - float nodeL = G3D::inf(); - float nodeR = -G3D::inf(); - for (int i = left; i <= right;) - { - int obj = dat.indices[i]; - float minb = dat.primBound[obj].low()[axis]; - float maxb = dat.primBound[obj].high()[axis]; - float center = (minb + maxb) * 0.5f; - if (center <= split) - { - // stay left - i++; - if (clipL < maxb) - clipL = maxb; - } - else - { - // move to the right most - int t = dat.indices[i]; - dat.indices[i] = dat.indices[right]; - dat.indices[right] = t; - right--; - if (clipR > minb) - clipR = minb; - } - nodeL = std::min(nodeL, minb); - nodeR = std::max(nodeR, maxb); - } - // check for empty space - if (nodeL > nodeBox.lo[axis] && nodeR < nodeBox.hi[axis]) - { - float nodeBoxW = nodeBox.hi[axis] - nodeBox.lo[axis]; - float nodeNewW = nodeR - nodeL; - // node box is too big compare to space occupied by primitives? - if (1.3f * nodeNewW < nodeBoxW) - { - stats.updateBVH2(); - int nextIndex = tempTree.size(); - // allocate child - tempTree.push_back(0); - tempTree.push_back(0); - tempTree.push_back(0); - // write bvh2 clip node - stats.updateInner(); - tempTree[nodeIndex + 0] = (axis << 30) | (1 << 29) | nextIndex; - tempTree[nodeIndex + 1] = floatToRawIntBits(nodeL); - tempTree[nodeIndex + 2] = floatToRawIntBits(nodeR); - // update nodebox and recurse - nodeBox.lo[axis] = nodeL; - nodeBox.hi[axis] = nodeR; - subdivide(left, rightOrig, tempTree, dat, gridBox, nodeBox, nextIndex, depth + 1, stats); - return; - } - } - // ensure we are making progress in the subdivision - if (right == rightOrig) - { - // all left - if (prevAxis == axis && prevSplit == split) { - // we are stuck here - create a leaf - stats.updateLeaf(depth, right - left + 1); - createNode(tempTree, nodeIndex, left, right); - return; - } - if (clipL <= split) { - // keep looping on left half - gridBox.hi[axis] = split; - prevClip = clipL; - wasLeft = true; - continue; - } - gridBox.hi[axis] = split; - prevClip = G3D::fnan(); - } - else if (left > right) - { - // all right - if (prevAxis == axis && prevSplit == split) { - // we are stuck here - create a leaf - stats.updateLeaf(depth, right - left + 1); - createNode(tempTree, nodeIndex, left, right); - return; - } - right = rightOrig; - if (clipR >= split) { - // keep looping on right half - gridBox.lo[axis] = split; - prevClip = clipR; - wasLeft = false; - continue; - } - gridBox.lo[axis] = split; - prevClip = G3D::fnan(); - } - else - { - // we are actually splitting stuff - if (prevAxis != -1 && !isnan(prevClip)) - { - // second time through - lets create the previous split - // since it produced empty space - int nextIndex = tempTree.size(); - // allocate child node - tempTree.push_back(0); - tempTree.push_back(0); - tempTree.push_back(0); - if (wasLeft) { - // create a node with a left child - // write leaf node - stats.updateInner(); - tempTree[nodeIndex + 0] = (prevAxis << 30) | nextIndex; - tempTree[nodeIndex + 1] = floatToRawIntBits(prevClip); - tempTree[nodeIndex + 2] = floatToRawIntBits(G3D::inf()); - } else { - // create a node with a right child - // write leaf node - stats.updateInner(); - tempTree[nodeIndex + 0] = (prevAxis << 30) | (nextIndex - 3); - tempTree[nodeIndex + 1] = floatToRawIntBits(-G3D::inf()); - tempTree[nodeIndex + 2] = floatToRawIntBits(prevClip); - } - // count stats for the unused leaf - depth++; - stats.updateLeaf(depth, 0); - // now we keep going as we are, with a new nodeIndex: - nodeIndex = nextIndex; - } - break; - } - } - // compute index of child nodes - int nextIndex = tempTree.size(); - // allocate left node - int nl = right - left + 1; - int nr = rightOrig - (right + 1) + 1; - if (nl > 0) { - tempTree.push_back(0); - tempTree.push_back(0); - tempTree.push_back(0); - } else - nextIndex -= 3; - // allocate right node - if (nr > 0) { - tempTree.push_back(0); - tempTree.push_back(0); - tempTree.push_back(0); - } - // write leaf node - stats.updateInner(); - tempTree[nodeIndex + 0] = (axis << 30) | nextIndex; - tempTree[nodeIndex + 1] = floatToRawIntBits(clipL); - tempTree[nodeIndex + 2] = floatToRawIntBits(clipR); - // prepare L/R child boxes - AABound gridBoxL(gridBox), gridBoxR(gridBox); - AABound nodeBoxL(nodeBox), nodeBoxR(nodeBox); - gridBoxL.hi[axis] = gridBoxR.lo[axis] = split; - nodeBoxL.hi[axis] = clipL; - nodeBoxR.lo[axis] = clipR; - // recurse - if (nl > 0) - subdivide(left, right, tempTree, dat, gridBoxL, nodeBoxL, nextIndex, depth + 1, stats); - else - stats.updateLeaf(depth + 1, 0); - if (nr > 0) - subdivide(right + 1, rightOrig, tempTree, dat, gridBoxR, nodeBoxR, nextIndex + 3, depth + 1, stats); - else - stats.updateLeaf(depth + 1, 0); -} - -bool BIH::writeToFile(FILE *wf) const -{ - uint32 treeSize = tree.size(); - uint32 check=0, count=0; - check += fwrite(&bounds.low(), sizeof(float), 3, wf); - check += fwrite(&bounds.high(), sizeof(float), 3, wf); - check += fwrite(&treeSize, sizeof(uint32), 1, wf); - check += fwrite(&tree[0], sizeof(uint32), treeSize, wf); - count = objects.size(); - check += fwrite(&count, sizeof(uint32), 1, wf); - check += fwrite(&objects[0], sizeof(uint32), count, wf); - return check == (3 + 3 + 2 + treeSize + count); -} - -bool BIH::readFromFile(FILE *rf) -{ - uint32 treeSize; - Vector3 lo, hi; - uint32 check=0, count=0; - check += fread(&lo, sizeof(float), 3, rf); - check += fread(&hi, sizeof(float), 3, rf); - bounds = AABox(lo, hi); - check += fread(&treeSize, sizeof(uint32), 1, rf); - tree.resize(treeSize); - check += fread(&tree[0], sizeof(uint32), treeSize, rf); - check += fread(&count, sizeof(uint32), 1, rf); - objects.resize(count); // = new uint32[nObjects]; - check += fread(&objects[0], sizeof(uint32), count, rf); - return check == (3 + 3 + 2 + treeSize + count); -} - -void BIH::BuildStats::updateLeaf(int depth, int n) -{ - numLeaves++; - minDepth = std::min(depth, minDepth); - maxDepth = std::max(depth, maxDepth); - sumDepth += depth; - minObjects = std::min(n, minObjects); - maxObjects = std::max(n, maxObjects); - sumObjects += n; - int nl = std::min(n, 5); - ++numLeavesN[nl]; -} - -void BIH::BuildStats::printStats() -{ - printf("Tree stats:\n"); - printf(" * Nodes: %d\n", numNodes); - printf(" * Leaves: %d\n", numLeaves); - printf(" * Objects: min %d\n", minObjects); - printf(" avg %.2f\n", (float) sumObjects / numLeaves); - printf(" avg(n>0) %.2f\n", (float) sumObjects / (numLeaves - numLeavesN[0])); - printf(" max %d\n", maxObjects); - printf(" * Depth: min %d\n", minDepth); - printf(" avg %.2f\n", (float) sumDepth / numLeaves); - printf(" max %d\n", maxDepth); - printf(" * Leaves w/: N=0 %3d%%\n", 100 * numLeavesN[0] / numLeaves); - printf(" N=1 %3d%%\n", 100 * numLeavesN[1] / numLeaves); - printf(" N=2 %3d%%\n", 100 * numLeavesN[2] / numLeaves); - printf(" N=3 %3d%%\n", 100 * numLeavesN[3] / numLeaves); - printf(" N=4 %3d%%\n", 100 * numLeavesN[4] / numLeaves); - printf(" N>4 %3d%%\n", 100 * numLeavesN[5] / numLeaves); - printf(" * BVH2 nodes: %d (%3d%%)\n", numBVH2, 100 * numBVH2 / (numNodes + numLeaves - 2 * numBVH2)); -} diff --git a/src/server/game/CollisionDetection/BoundingIntervalHierarchy.h b/src/server/game/CollisionDetection/BoundingIntervalHierarchy.h deleted file mode 100644 index 15ae90c23eb..00000000000 --- a/src/server/game/CollisionDetection/BoundingIntervalHierarchy.h +++ /dev/null @@ -1,391 +0,0 @@ -/* - * Copyright (C) 2005-2010 MaNGOS - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef _BIH_H -#define _BIH_H - -#include -#include -#include - -#include - -#include -#include -#include -#include -#include - -#define MAX_STACK_SIZE 64 - -#ifdef _MSC_VER - #define isnan(x) _isnan(x) -#endif - -using G3D::Vector3; -using G3D::AABox; -using G3D::Ray; - -static inline uint32 floatToRawIntBits(float f) -{ - union - { - uint32 ival; - float fval; - } temp; - temp.fval=f; - return temp.ival; -} - -static inline float intBitsToFloat(uint32 i) -{ - union - { - uint32 ival; - float fval; - } temp; - temp.ival=i; - return temp.fval; -} - -struct AABound -{ - Vector3 lo, hi; -}; - -/** Bounding Interval Hierarchy Class. - Building and Ray-Intersection functions based on BIH from - Sunflow, a Java Raytracer, released under MIT/X11 License - http://sunflow.sourceforge.net/ - Copyright (c) 2003-2007 Christopher Kulla -*/ - -class BIH -{ - public: - BIH() {}; - template< class T, class BoundsFunc > - void build(const std::vector &primitives, BoundsFunc &getBounds, uint32 leafSize = 3, bool printStats=false) - { - if(primitives.size() == 0) - return; - buildData dat; - dat.maxPrims = leafSize; - dat.numPrims = primitives.size(); - dat.indices = new uint32[dat.numPrims]; - dat.primBound = new AABox[dat.numPrims]; - getBounds(primitives[0], bounds); - for (uint32 i=0; i tempTree; - BuildStats stats; - buildHierarchy(tempTree, dat, stats); - if (printStats) - stats.printStats(); - - objects.resize(dat.numPrims); - for (uint32 i=0; i - void intersectRay(const Ray &r, RayCallback& intersectCallback, float &maxDist, bool stopAtFirst=false) const - { - float intervalMin = 0.f; - float intervalMax = maxDist; - Vector3 org = r.origin(); - Vector3 dir = r.direction(); - Vector3 invDir; - float t1, t2; - for(int i=0; i<3; ++i) - { - invDir[i] = 1.f / dir[i]; - t1 = (bounds.low()[i] - org[i]) * invDir[i]; - t2 = (bounds.high()[i] - org[i]) * invDir[i]; - if (invDir[i] > 0) { - if (t1 > intervalMin) - intervalMin = t1; - if (t2 < intervalMax) - intervalMax = t2; - } else { - if (t2 > intervalMin) - intervalMin = t2; - if (t1 < intervalMax) - intervalMax = t1; - } - if (intervalMin > intervalMax) - return; - } - - uint32 offsetFront[3]; - uint32 offsetBack[3]; - uint32 offsetFront3[3]; - uint32 offsetBack3[3]; - // compute custom offsets from direction sign bit - - for(int i=0; i<3; ++i) - { - offsetFront[i] = floatToRawIntBits(dir[i]) >> 31; - offsetBack[i] = offsetFront[i] ^ 1; - offsetFront3[i] = offsetFront[i] * 3; - offsetBack3[i] = offsetBack[i] * 3; - - // avoid always adding 1 during the inner loop - ++offsetFront[i]; - ++offsetBack[i]; - } - - StackNode stack[MAX_STACK_SIZE]; - int stackPos = 0; - int node = 0; - - while (true) { - while (true) - { - uint32 tn = tree[node]; - uint32 axis = (tn & (3 << 30)) >> 30; - bool BVH2 = tn & (1 << 29); - int offset = tn & ~(7 << 29); - if (!BVH2) - { - if (axis < 3) - { - // "normal" interior node - float tf = (intBitsToFloat(tree[node + offsetFront[axis]]) - org[axis]) * invDir[axis]; - float tb = (intBitsToFloat(tree[node + offsetBack[axis]]) - org[axis]) * invDir[axis]; - // ray passes between clip zones - if (tf < intervalMin && tb > intervalMax) - break; - int back = offset + offsetBack3[axis]; - node = back; - // ray passes through far node only - if (tf < intervalMin) { - intervalMin = (tb >= intervalMin) ? tb : intervalMin; - continue; - } - node = offset + offsetFront3[axis]; // front - // ray passes through near node only - if (tb > intervalMax) { - intervalMax = (tf <= intervalMax) ? tf : intervalMax; - continue; - } - // ray passes through both nodes - // push back node - stack[stackPos].node = back; - stack[stackPos].tnear = (tb >= intervalMin) ? tb : intervalMin; - stack[stackPos].tfar = intervalMax; - stackPos++; - // update ray interval for front node - intervalMax = (tf <= intervalMax) ? tf : intervalMax; - continue; - } - else - { - // leaf - test some objects - int n = tree[node + 1]; - while (n > 0) { - bool hit = intersectCallback(r, objects[offset], maxDist, stopAtFirst); - if(stopAtFirst && hit) return; - --n; - ++offset; - } - break; - } - } - else - { - if (axis>2) - return; // should not happen - float tf = (intBitsToFloat(tree[node + offsetFront[axis]]) - org[axis]) * invDir[axis]; - float tb = (intBitsToFloat(tree[node + offsetBack[axis]]) - org[axis]) * invDir[axis]; - node = offset; - intervalMin = (tf >= intervalMin) ? tf : intervalMin; - intervalMax = (tb <= intervalMax) ? tb : intervalMax; - if (intervalMin > intervalMax) - break; - continue; - } - } // traversal loop - do - { - // stack is empty? - if (stackPos == 0) - return; - // move back up the stack - stackPos--; - intervalMin = stack[stackPos].tnear; - if (maxDist < intervalMin) - continue; - node = stack[stackPos].node; - intervalMax = stack[stackPos].tfar; - break; - } while (true); - } - } - - template - void intersectPoint(const Vector3 &p, IsectCallback& intersectCallback) const - { - if (!bounds.contains(p)) - return; - - StackNode stack[MAX_STACK_SIZE]; - int stackPos = 0; - int node = 0; - - while (true) { - while (true) - { - uint32 tn = tree[node]; - uint32 axis = (tn & (3 << 30)) >> 30; - bool BVH2 = tn & (1 << 29); - int offset = tn & ~(7 << 29); - if (!BVH2) - { - if (axis < 3) - { - // "normal" interior node - float tl = intBitsToFloat(tree[node + 1]); - float tr = intBitsToFloat(tree[node + 2]); - // point is between clip zones - if (tl < p[axis] && tr > p[axis]) - break; - int right = offset + 3; - node = right; - // point is in right node only - if (tl < p[axis]) { - continue; - } - node = offset; // left - // point is in left node only - if (tr > p[axis]) { - continue; - } - // point is in both nodes - // push back right node - stack[stackPos].node = right; - stackPos++; - continue; - } - else - { - // leaf - test some objects - int n = tree[node + 1]; - while (n > 0) { - intersectCallback(p, objects[offset]); // !!! - --n; - ++offset; - } - break; - } - } - else // BVH2 node (empty space cut off left and right) - { - if (axis>2) - return; // should not happen - float tl = intBitsToFloat(tree[node + 1]); - float tr = intBitsToFloat(tree[node + 2]); - node = offset; - if (tl > p[axis] || tr < p[axis]) - break; - continue; - } - } // traversal loop - - // stack is empty? - if (stackPos == 0) - return; - // move back up the stack - stackPos--; - node = stack[stackPos].node; - } - } - - bool writeToFile(FILE *wf) const; - bool readFromFile(FILE *rf); - - protected: - std::vector tree; - std::vector objects; - AABox bounds; - - struct buildData - { - uint32 *indices; - AABox *primBound; - uint32 numPrims; - int maxPrims; - }; - struct StackNode - { - uint32 node; - float tnear; - float tfar; - }; - - class BuildStats - { - private: - int numNodes; - int numLeaves; - int sumObjects; - int minObjects; - int maxObjects; - int sumDepth; - int minDepth; - int maxDepth; - int numLeavesN[6]; - int numBVH2; - - public: - BuildStats(): - numNodes(0), numLeaves(0), sumObjects(0), minObjects(0x0FFFFFFF), - maxObjects(0xFFFFFFFF), sumDepth(0), minDepth(0x0FFFFFFF), - maxDepth(0xFFFFFFFF), numBVH2(0) - { - for(int i=0; i<6; ++i) numLeavesN[i] = 0; - } - - void updateInner() { numNodes++; } - void updateBVH2() { numBVH2++; } - void updateLeaf(int depth, int n); - void printStats(); - }; - - void buildHierarchy(std::vector &tempTree, buildData &dat, BuildStats &stats); - - void createNode(std::vector &tempTree, int nodeIndex, uint32 left, uint32 right) { - // write leaf node - tempTree[nodeIndex + 0] = (3 << 30) | left; - tempTree[nodeIndex + 1] = right - left + 1; - } - - void subdivide(int left, int right, std::vector &tempTree, buildData &dat, AABound &gridBox, AABound &nodeBox, int nodeIndex, int depth, BuildStats &stats); -}; - -#endif // _BIH_H diff --git a/src/server/game/CollisionDetection/CMakeLists.txt b/src/server/game/CollisionDetection/CMakeLists.txt deleted file mode 100644 index 7d865d354e7..00000000000 --- a/src/server/game/CollisionDetection/CMakeLists.txt +++ /dev/null @@ -1,30 +0,0 @@ - -########### next target ############### - -SET(vmaps_STAT_SRCS - BIH.h - BIH.cpp - IVMapManager.h - MapTree.cpp - MapTree.h - ModelInstance.cpp - ModelInstance.h - TileAssembler.cpp - TileAssembler.h - VMapDefinitions.h - VMapFactory.cpp - VMapFactory.h - VMapManager2.cpp - VMapManager2.h - VMapTools.h - WorldModel.cpp - WorldModel.h -) - -include_directories( - ${ACE_INCLUDE_DIR} - ${CMAKE_SOURCE_DIR}/src/server/framework - ${CMAKE_SOURCE_DIR}/dep/include/g3dlite -) - -add_library(vmaps STATIC ${vmaps_STAT_SRCS}) diff --git a/src/server/game/CollisionDetection/IVMapManager.h b/src/server/game/CollisionDetection/IVMapManager.h deleted file mode 100644 index 00629eb122c..00000000000 --- a/src/server/game/CollisionDetection/IVMapManager.h +++ /dev/null @@ -1,106 +0,0 @@ -/* - * Copyright (C) 2005-2010 MaNGOS - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef _IVMAPMANAGER_H -#define _IVMAPMANAGER_H - -#include -#include - -//=========================================================== - -/** -This is the minimum interface to the VMapMamager. -*/ - -namespace VMAP -{ - - enum VMAP_LOAD_RESULT - { - VMAP_LOAD_RESULT_ERROR, - VMAP_LOAD_RESULT_OK, - VMAP_LOAD_RESULT_IGNORED, - }; - - #define VMAP_INVALID_HEIGHT -100000.0f // for check - #define VMAP_INVALID_HEIGHT_VALUE -200000.0f // real assigned value in unknown height case - - //=========================================================== - class IVMapManager - { - private: - bool iEnableLineOfSightCalc; - bool iEnableHeightCalc; - - public: - IVMapManager() : iEnableLineOfSightCalc(true), iEnableHeightCalc(true) {} - - virtual ~IVMapManager(void) {} - - virtual int loadMap(const char* pBasePath, unsigned int pMapId, int x, int y) = 0; - - virtual bool existsMap(const char* pBasePath, unsigned int pMapId, int x, int y) = 0; - - virtual void unloadMap(unsigned int pMapId, int x, int y) = 0; - virtual void unloadMap(unsigned int pMapId) = 0; - - virtual bool isInLineOfSight(unsigned int pMapId, float x1, float y1, float z1, float x2, float y2, float z2) = 0; - virtual float getHeight(unsigned int pMapId, float x, float y, float z) = 0; - /** - test if we hit an object. return true if we hit one. rx,ry,rz will hold the hit position or the dest position, if no intersection was found - return a position, that is pReduceDist closer to the origin - */ - virtual bool getObjectHitPos(unsigned int pMapId, float x1, float y1, float z1, float x2, float y2, float z2, float& rx, float &ry, float& rz, float pModifyDist) = 0; - /** - send debug commands - */ - virtual bool processCommand(char *pCommand)= 0; - - /** - Enable/disable LOS calculation - It is enabled by default. If it is enabled in mid game the maps have to loaded manualy - */ - void setEnableLineOfSightCalc(bool pVal) { iEnableLineOfSightCalc = pVal; } - /** - Enable/disable model height calculation - It is enabled by default. If it is enabled in mid game the maps have to loaded manualy - */ - void setEnableHeightCalc(bool pVal) { iEnableHeightCalc = pVal; } - - bool isLineOfSightCalcEnabled() const { return(iEnableLineOfSightCalc); } - bool isHeightCalcEnabled() const { return(iEnableHeightCalc); } - bool isMapLoadingEnabled() const { return(iEnableLineOfSightCalc || iEnableHeightCalc ); } - - virtual std::string getDirFileName(unsigned int pMapId, int x, int y) const =0; - /** - Block maps from being used. - parameter: String of map ids. Delimiter = "," - e.g.: "0,1,530" - */ - virtual void preventMapsFromBeingUsed(const char* pMapIdString) =0; - /** - Query world model area info. - \param z gets adjusted to the ground height for which this are info is valid - */ - virtual bool getAreaInfo(unsigned int pMapId, float x, float y, float &z, uint32 &flags, int32 &adtId, int32 &rootId, int32 &groupId) const=0; - virtual bool GetLiquidLevel(uint32 pMapId, float x, float y, float z, uint8 ReqLiquidType, float &level, float &floor, uint32 &type) const=0; - }; - -} -#endif diff --git a/src/server/game/CollisionDetection/MapTree.cpp b/src/server/game/CollisionDetection/MapTree.cpp deleted file mode 100644 index 8c77ee109f3..00000000000 --- a/src/server/game/CollisionDetection/MapTree.cpp +++ /dev/null @@ -1,450 +0,0 @@ -/* - * Copyright (C) 2005-2010 MaNGOS - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "MapTree.h" -#include "ModelInstance.h" -#include "VMapManager2.h" -#include "VMapDefinitions.h" - -#include -#include -#include - -using G3D::Vector3; - -namespace VMAP -{ - - class MapRayCallback - { - public: - MapRayCallback(ModelInstance *val): prims(val) {} - ModelInstance *prims; - bool operator()(const G3D::Ray& ray, uint32 entry, float& distance, bool pStopAtFirstHit=true) - { - return prims[entry].intersectRay(ray, distance, pStopAtFirstHit); - //std::cout << "trying to intersect '" << entity->name << "'\n"; - } - }; - - class AreaInfoCallback - { - public: - AreaInfoCallback(ModelInstance *val): prims(val) {} - void operator()(const Vector3& point, uint32 entry) - { -#ifdef VMAP_DEBUG - std::cout << "trying to intersect '" << prims[entry].name << "'\n"; -#endif - prims[entry].intersectPoint(point, aInfo); - } - - ModelInstance *prims; - AreaInfo aInfo; - }; - - class LocationInfoCallback - { - public: - LocationInfoCallback(ModelInstance *val, LocationInfo &info): prims(val), locInfo(info), result(false) {} - void operator()(const Vector3& point, uint32 entry) - { -#ifdef VMAP_DEBUG - std::cout << "trying to intersect '" << prims[entry].name << "'\n"; -#endif - if (prims[entry].GetLocationInfo(point, locInfo)) - result = true; - } - - ModelInstance *prims; - LocationInfo &locInfo; - bool result; - }; - - - //========================================================= - - std::string StaticMapTree::getTileFileName(uint32 mapID, uint32 tileX, uint32 tileY) - { - std::stringstream tilefilename; - tilefilename.fill('0'); - tilefilename << std::setw(3) << mapID << "_"; - //tilefilename << std::setw(2) << tileX << "_" << std::setw(2) << tileY << ".vmtile"; - tilefilename << std::setw(2) << tileY << "_" << std::setw(2) << tileX << ".vmtile"; - return tilefilename.str(); - } - - bool StaticMapTree::getAreaInfo(Vector3 &pos, uint32 &flags, int32 &adtId, int32 &rootId, int32 &groupId) const - { - AreaInfoCallback intersectionCallBack(iTreeValues); - iTree.intersectPoint(pos, intersectionCallBack); - if (intersectionCallBack.aInfo.result) - { - flags = intersectionCallBack.aInfo.flags; - adtId = intersectionCallBack.aInfo.adtId; - rootId = intersectionCallBack.aInfo.rootId; - groupId = intersectionCallBack.aInfo.groupId; - pos.z = intersectionCallBack.aInfo.ground_Z; - return true; - } - return false; - } - - bool StaticMapTree::GetLocationInfo(const Vector3 &pos, LocationInfo &info) const - { - LocationInfoCallback intersectionCallBack(iTreeValues, info); - iTree.intersectPoint(pos, intersectionCallBack); - return intersectionCallBack.result; - } - - StaticMapTree::StaticMapTree(uint32 mapID, const std::string &basePath): - iMapID(mapID), /* iTree(0), */ iTreeValues(0), iBasePath(basePath) - { - if (iBasePath.length() > 0 && (iBasePath[iBasePath.length()-1] != '/' || iBasePath[iBasePath.length()-1] != '\\')) - { - iBasePath.append("/"); - } - } - - //========================================================= - //! Make sure to call unloadMap() to unregister acquired model references before destroying - StaticMapTree::~StaticMapTree() - { - delete[] iTreeValues; - } - - //========================================================= - /** - return dist to hit or inf() if no hit - */ - - float StaticMapTree::getIntersectionTime(const G3D::Ray& pRay, float pMaxDist, bool pStopAtFirstHit) const - { - float distance = pMaxDist; - MapRayCallback intersectionCallBack(iTreeValues); - iTree.intersectRay(pRay, intersectionCallBack, distance, pStopAtFirstHit); - return distance; - } - //========================================================= - - bool StaticMapTree::isInLineOfSight(const Vector3& pos1, const Vector3& pos2) const - { - bool result = true; - float maxDist = (pos2 - pos1).magnitude(); - // prevent NaN values which can cause BIH intersection to enter infinite loop - if (maxDist < 1e-10f) - return true; - // direction with length of 1 - G3D::Ray ray = G3D::Ray::fromOriginAndDirection(pos1, (pos2 - pos1)/maxDist); - float resultDist = getIntersectionTime(ray, maxDist, true); - if (resultDist < maxDist) - { - result = false; - } - return result; - } - //========================================================= - /** - When moving from pos1 to pos2 check if we hit an object. Return true and the position if we hit one - Return the hit pos or the original dest pos - */ - - bool StaticMapTree::getObjectHitPos(const Vector3& pPos1, const Vector3& pPos2, Vector3& pResultHitPos, float pModifyDist) const - { - bool result=false; - float maxDist = (pPos2 - pPos1).magnitude(); - // prevent NaN values which can cause BIH intersection to enter infinite loop - if (maxDist < 1e-10f) - { - pResultHitPos = pPos2; - return false; - } - Vector3 dir = (pPos2 - pPos1)/maxDist; // direction with length of 1 - G3D::Ray ray(pPos1, dir); - float dist = getIntersectionTime(ray, maxDist, false); - if (dist < maxDist) - { - pResultHitPos = pPos1 + dir * dist; - if (pModifyDist < 0) - { - if ((pResultHitPos - pPos1).magnitude() > -pModifyDist) - { - pResultHitPos = pResultHitPos + dir*pModifyDist; - } - else - { - pResultHitPos = pPos1; - } - } - else - { - pResultHitPos = pResultHitPos + dir*pModifyDist; - } - result = true; - } - else - { - pResultHitPos = pPos2; - result = false; - } - return result; - } - - //========================================================= - - float StaticMapTree::getHeight(const Vector3& pPos) const - { - float height = G3D::inf(); - Vector3 dir = Vector3(0,0,-1); - G3D::Ray ray(pPos, dir); // direction with length of 1 - float maxDist = VMapDefinitions::getMaxCanFallDistance(); - float dist = getIntersectionTime(ray, maxDist, false); - if (dist < maxDist) - { - height = pPos.z - dist; - } - return(height); - } - - //========================================================= - - bool StaticMapTree::CanLoadMap(const std::string &vmapPath, uint32 mapID, uint32 tileX, uint32 tileY) - { - std::string basePath = vmapPath; - if (basePath.length() > 0 && (basePath[basePath.length()-1] != '/' || basePath[basePath.length()-1] != '\\')) - basePath.append("/"); - std::string fullname = basePath + VMapManager2::getMapFileName(mapID); - bool success = true; - FILE *rf = fopen(fullname.c_str(), "rb"); - if (!rf) - return false; - // TODO: check magic number when implemented... - char tiled; - char chunk[8]; - if (!readChunk(rf, chunk, VMAP_MAGIC, 8) || fread(&tiled, sizeof(char), 1, rf) != 1) - { - fclose(rf); - return false; - } - if (tiled) - { - std::string tilefile = basePath + getTileFileName(mapID, tileX, tileY); - FILE* tf = fopen(tilefile.c_str(), "rb"); - if (!tf) - success = false; - else - fclose(tf); - } - fclose(rf); - return success; - } - - //========================================================= - - bool StaticMapTree::InitMap(const std::string &fname, VMapManager2 *vm) - { - std::cout << "Initializing StaticMapTree '" << fname << "'\n"; - bool success = true; - std::string fullname = iBasePath + fname; - FILE *rf = fopen(fullname.c_str(), "rb"); - if (!rf) - return false; - else - { - char chunk[8]; - //general info - if (!readChunk(rf, chunk, VMAP_MAGIC, 8)) success = false; - char tiled; - if (success && fread(&tiled, sizeof(char), 1, rf) != 1) success = false; - iIsTiled = bool(tiled); - // Nodes - if (success && !readChunk(rf, chunk, "NODE", 4)) success = false; - if (success) success = iTree.readFromFile(rf); - if (success) - { - iNTreeValues = iTree.primCount(); - iTreeValues = new ModelInstance[iNTreeValues]; - } - - if (success && !readChunk(rf, chunk, "GOBJ", 4)) success = false; - // global model spawns - // only non-tiled maps have them, and if so exactly one (so far at least...) - ModelSpawn spawn; -#ifdef VMAP_DEBUG - std::cout << "Map isTiled:" << bool(iIsTiled) << std::endl; -#endif - if (!iIsTiled && ModelSpawn::readFromFile(rf, spawn)) - { - WorldModel *model = vm->acquireModelInstance(iBasePath, spawn.name); - std::cout << "StaticMapTree::InitMap(): loading " << spawn.name << std::endl; - if (model) - { - // assume that global model always is the first and only tree value (could be improved...) - iTreeValues[0] = ModelInstance(spawn, model); - iLoadedSpawns[0] = 1; - } - else - { - success = false; - std::cout << "error: could not acquire WorldModel pointer!\n"; - } - } - - fclose(rf); - } - return success; - } - - //========================================================= - - void StaticMapTree::UnloadMap(VMapManager2 *vm) - { - for (loadedSpawnMap::iterator i = iLoadedSpawns.begin(); i != iLoadedSpawns.end(); ++i) - { - iTreeValues[i->first].setUnloaded(); - for (uint32 refCount = 0; refCount < i->second; ++refCount) - vm->releaseModelInstance(iTreeValues[i->first].name); - } - iLoadedSpawns.clear(); - iLoadedTiles.clear(); - } - - //========================================================= - - bool StaticMapTree::LoadMapTile(uint32 tileX, uint32 tileY, VMapManager2 *vm) - { - if (!iIsTiled) - { - // currently, core creates grids for all maps, whether it has terrain tiles or not - // so we need "fake" tile loads to know when we can unload map geometry - iLoadedTiles[packTileID(tileX, tileY)] = false; - return true; - } - if (!iTreeValues) - { - std::cout << "Tree has not been initialized!\n"; - return false; - } - bool result = true; - - std::string tilefile = iBasePath + getTileFileName(iMapID, tileX, tileY); - FILE* tf = fopen(tilefile.c_str(), "rb"); - if (tf) - { - uint32 numSpawns; - if (fread(&numSpawns, sizeof(uint32), 1, tf) != 1) - result = false; - for (uint32 i=0; iacquireModelInstance(iBasePath, spawn.name); - if (!model) std::cout << "error: could not acquire WorldModel pointer!\n"; - - // update tree - uint32 referencedVal; - - fread(&referencedVal, sizeof(uint32), 1, tf); - if (!iLoadedSpawns.count(referencedVal)) - { -#ifdef VMAP_DEBUG - if (referencedVal > iNTreeValues) - { - std::cout << "invalid tree element! (" << referencedVal << "/" << iNTreeValues << ")\n"; - continue; - } -#endif - iTreeValues[referencedVal] = ModelInstance(spawn, model); - iLoadedSpawns[referencedVal] = 1; - } - else - { - ++iLoadedSpawns[referencedVal]; -#ifdef VMAP_DEBUG - if (iTreeValues[referencedVal].ID != spawn.ID) std::cout << "error: trying to load wrong spawn in node!\n"; - else if (iTreeValues[referencedVal].name != spawn.name) std::cout << "error: name collision on GUID="<< spawn.ID << "\n"; -#endif - } - } - } - iLoadedTiles[packTileID(tileX, tileY)] = true; - fclose(tf); - } - else - iLoadedTiles[packTileID(tileX, tileY)] = false; - return result; - } - - //========================================================= - - void StaticMapTree::UnloadMapTile(uint32 tileX, uint32 tileY, VMapManager2 *vm) - { - uint32 tileID = packTileID(tileX, tileY); - loadedTileMap::iterator tile = iLoadedTiles.find(tileID); - if (tile == iLoadedTiles.end()) - { - std::cout << "WARNING: trying to unload non-loaded tile. Map:" << iMapID << " X:" << tileX << " Y:" << tileY << std::endl; - return; - } - if (tile->second) // file associated with tile - { - std::string tilefile = iBasePath + getTileFileName(iMapID, tileX, tileY); - FILE* tf = fopen(tilefile.c_str(), "rb"); - if (tf) - { - bool result=true; - uint32 numSpawns; - if (fread(&numSpawns, sizeof(uint32), 1, tf) != 1) - result = false; - for (uint32 i=0; ireleaseModelInstance(spawn.name); - - // update tree - uint32 referencedNode; - - fread(&referencedNode, sizeof(uint32), 1, tf); - if (!iLoadedSpawns.count(referencedNode)) - { - std::cout << "error! trying to unload non-referenced model '" << spawn.name << "' (ID:" << spawn.ID << ")\n"; - } - else if (--iLoadedSpawns[referencedNode] == 0) - { - //std::cout << "MapTree: removing '" << spawn.name << "' from tree\n"; - iTreeValues[referencedNode].setUnloaded(); - iLoadedSpawns.erase(referencedNode); - } - } - } - fclose(tf); - } - } - iLoadedTiles.erase(tile); - } - -} diff --git a/src/server/game/CollisionDetection/MapTree.h b/src/server/game/CollisionDetection/MapTree.h deleted file mode 100644 index 7955cb92d68..00000000000 --- a/src/server/game/CollisionDetection/MapTree.h +++ /dev/null @@ -1,97 +0,0 @@ -/* - * Copyright (C) 2005-2010 MaNGOS - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef _MAPTREE_H -#define _MAPTREE_H - -#include "Platform/Define.h" -#include "Utilities/UnorderedMap.h" -#include "BIH.h" - -namespace VMAP -{ - class ModelInstance; - class GroupModel; - class VMapManager2; - - struct LocationInfo - { - LocationInfo(): hitInstance(0), hitModel(0), ground_Z(-G3D::inf()) {}; - const ModelInstance *hitInstance; - const GroupModel *hitModel; - float ground_Z; - }; - - class StaticMapTree - { - typedef UNORDERED_MAP loadedTileMap; - typedef UNORDERED_MAP loadedSpawnMap; - private: - uint32 iMapID; - bool iIsTiled; - BIH iTree; - ModelInstance *iTreeValues; // the tree entries - uint32 iNTreeValues; - - // Store all the map tile idents that are loaded for that map - // some maps are not splitted into tiles and we have to make sure, not removing the map before all tiles are removed - // empty tiles have no tile file, hence map with bool instead of just a set (consistency check) - loadedTileMap iLoadedTiles; - // stores to invalidate tree values, unload map, and to be able to report errors - loadedSpawnMap iLoadedSpawns; - std::string iBasePath; - - private: - float getIntersectionTime(const G3D::Ray& pRay, float pMaxDist, bool pStopAtFirstHit) const; - //bool containsLoadedMapTile(unsigned int pTileIdent) const { return(iLoadedMapTiles.containsKey(pTileIdent)); } - public: - static std::string getTileFileName(uint32 mapID, uint32 tileX, uint32 tileY); - static uint32 packTileID(uint32 tileX, uint32 tileY) { return tileX<<16 | tileY; } - static void unpackTileID(uint32 ID, uint32 &tileX, uint32 &tileY) { tileX = ID>>16; tileY = ID&0xFF; } - static bool CanLoadMap(const std::string &basePath, uint32 mapID, uint32 tileX, uint32 tileY); - - StaticMapTree(uint32 mapID, const std::string &basePath); - ~StaticMapTree(); - - bool isInLineOfSight(const G3D::Vector3& pos1, const G3D::Vector3& pos2) const; - bool getObjectHitPos(const G3D::Vector3& pos1, const G3D::Vector3& pos2, G3D::Vector3& pResultHitPos, float pModifyDist) const; - float getHeight(const G3D::Vector3& pPos) const; - bool getAreaInfo(G3D::Vector3 &pos, uint32 &flags, int32 &adtId, int32 &rootId, int32 &groupId) const; - bool GetLocationInfo(const Vector3 &pos, LocationInfo &info) const; - - bool InitMap(const std::string &fname, VMapManager2 *vm); - void UnloadMap(VMapManager2 *vm); - bool LoadMapTile(uint32 tileX, uint32 tileY, VMapManager2 *vm); - void UnloadMapTile(uint32 tileX, uint32 tileY, VMapManager2 *vm); - bool isTiled() const { return iIsTiled; } - uint32 numLoadedTiles() const { return iLoadedTiles.size(); } - }; - - struct AreaInfo - { - AreaInfo(): result(false), ground_Z(-G3D::inf()) {}; - bool result; - float ground_Z; - uint32 flags; - int32 adtId; - int32 rootId; - int32 groupId; - }; -} // VMAP - -#endif // _MAPTREE_H diff --git a/src/server/game/CollisionDetection/ModelInstance.cpp b/src/server/game/CollisionDetection/ModelInstance.cpp deleted file mode 100644 index 677a08e147a..00000000000 --- a/src/server/game/CollisionDetection/ModelInstance.cpp +++ /dev/null @@ -1,219 +0,0 @@ -/* - * Copyright (C) 2005-2010 MaNGOS - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "ModelInstance.h" -#include "WorldModel.h" -#include "MapTree.h" - -using G3D::Vector3; -using G3D::Ray; - -namespace VMAP -{ - ModelInstance::ModelInstance(const ModelSpawn &spawn, WorldModel *model): ModelSpawn(spawn), iModel(model) - { - iInvRot = G3D::Matrix3::fromEulerAnglesZYX(G3D::pi()*iRot.y/180.f, G3D::pi()*iRot.x/180.f, G3D::pi()*iRot.z/180.f).inverse(); - iInvScale = 1.f/iScale; - } - - bool ModelInstance::intersectRay(const G3D::Ray& pRay, float& pMaxDist, bool pStopAtFirstHit) const - { - if (!iModel) - { - //std::cout << "\n"; - return false; - } - float time = pRay.intersectionTime(iBound); - if (time == G3D::inf()) - { -// std::cout << "Ray does not hit '" << name << "'\n"; - - return false; - } -// std::cout << "Ray crosses bound of '" << name << "'\n"; -/* std::cout << "ray from:" << pRay.origin().x << ", " << pRay.origin().y << ", " << pRay.origin().z - << " dir:" << pRay.direction().x << ", " << pRay.direction().y << ", " << pRay.direction().z - << " t/tmax:" << time << "/" << pMaxDist; - std::cout << "\nBound lo:" << iBound.low().x << ", " << iBound.low().y << ", " << iBound.low().z << " hi: " - << iBound.high().x << ", " << iBound.high().y << ", " << iBound.high().z << std::endl; */ - // child bounds are defined in object space: - Vector3 p = iInvRot * (pRay.origin() - iPos) * iInvScale; - Ray modRay(p, iInvRot * pRay.direction()); - float distance = pMaxDist * iInvScale; - bool hit = iModel->IntersectRay(modRay, distance, pStopAtFirstHit); - distance *= iScale; - pMaxDist = distance; - return hit; - } - - void ModelInstance::intersectPoint(const G3D::Vector3& p, AreaInfo &info) const - { - if (!iModel) - { -#ifdef VMAP_DEBUG - std::cout << "\n"; -#endif - return; - } - - // M2 files don't contain area info, only WMO files - if (flags & MOD_M2) - return; - if (!iBound.contains(p)) - return; - // child bounds are defined in object space: - Vector3 pModel = iInvRot * (p - iPos) * iInvScale; - Vector3 zDirModel = iInvRot * Vector3(0.f, 0.f, -1.f); - float zDist; - if (iModel->IntersectPoint(pModel, zDirModel, zDist, info)) - { - Vector3 modelGround = pModel + zDist * zDirModel; - // Transform back to world space. Note that: - // Mat * vec == vec * Mat.transpose() - // and for rotation matrices: Mat.inverse() == Mat.transpose() - float world_Z = ((modelGround * iInvRot) * iScale + iPos).z; - if (info.ground_Z < world_Z) - { - info.ground_Z = world_Z; - info.adtId = adtId; - } - } - } - - bool ModelInstance::GetLocationInfo(const G3D::Vector3& p, LocationInfo &info) const - { - if (!iModel) - { -#ifdef VMAP_DEBUG - std::cout << "\n"; -#endif - return false; - } - - // M2 files don't contain area info, only WMO files - if (flags & MOD_M2) - return false; - if (!iBound.contains(p)) - return false; - // child bounds are defined in object space: - Vector3 pModel = iInvRot * (p - iPos) * iInvScale; - Vector3 zDirModel = iInvRot * Vector3(0.f, 0.f, -1.f); - float zDist; - if (iModel->GetLocationInfo(pModel, zDirModel, zDist, info)) - { - Vector3 modelGround = pModel + zDist * zDirModel; - // Transform back to world space. Note that: - // Mat * vec == vec * Mat.transpose() - // and for rotation matrices: Mat.inverse() == Mat.transpose() - float world_Z = ((modelGround * iInvRot) * iScale + iPos).z; - if (info.ground_Z < world_Z) // hm...could it be handled automatically with zDist at intersection? - { - info.ground_Z = world_Z; - info.hitInstance = this; - return true; - } - } - return false; - } - - bool ModelInstance::GetLiquidLevel(const G3D::Vector3& p, LocationInfo &info, float &liqHeight) const - { - // child bounds are defined in object space: - Vector3 pModel = iInvRot * (p - iPos) * iInvScale; - //Vector3 zDirModel = iInvRot * Vector3(0.f, 0.f, -1.f); - float zDist; - if (info.hitModel->GetLiquidLevel(pModel, zDist)) - { - // calculate world height (zDist in model coords): - // assume WMO not tilted (wouldn't make much sense anyway) - liqHeight = zDist * iScale + iPos.z; - return true; - } - return false; - } - - bool ModelSpawn::readFromFile(FILE *rf, ModelSpawn &spawn) - { - uint32 check=0, nameLen; - check += fread(&spawn.flags, sizeof(uint32), 1, rf); - // EoF? - if (!check) - { - if (ferror(rf)) - std::cout << "Error reading ModelSpawn!\n"; - return false; - } - check += fread(&spawn.adtId, sizeof(uint16), 1, rf); - check += fread(&spawn.ID, sizeof(uint32), 1, rf); - check += fread(&spawn.iPos, sizeof(float), 3, rf); - check += fread(&spawn.iRot, sizeof(float), 3, rf); - check += fread(&spawn.iScale, sizeof(float), 1, rf); - bool has_bound = (spawn.flags & MOD_HAS_BOUND); - if (has_bound) // only WMOs have bound in MPQ, only available after computation - { - Vector3 bLow, bHigh; - check += fread(&bLow, sizeof(float), 3, rf); - check += fread(&bHigh, sizeof(float), 3, rf); - spawn.iBound = G3D::AABox(bLow, bHigh); - } - check += fread(&nameLen, sizeof(uint32), 1, rf); - if(check != (has_bound ? 17 : 11)) - { - std::cout << "Error reading ModelSpawn!\n"; - return false; - } - char nameBuff[500]; - if (nameLen>500) // file names should never be that long, must be file error - { - std::cout << "Error reading ModelSpawn, file name too long!\n"; - return false; - } - check = fread(nameBuff, sizeof(char), nameLen, rf); - if (check != nameLen) - { - std::cout << "Error reading ModelSpawn!\n"; - return false; - } - spawn.name = std::string(nameBuff, nameLen); - return true; - } - - bool ModelSpawn::writeToFile(FILE *wf, const ModelSpawn &spawn) - { - uint32 check=0; - check += fwrite(&spawn.flags, sizeof(uint32), 1, wf); - check += fwrite(&spawn.adtId, sizeof(uint16), 1, wf); - check += fwrite(&spawn.ID, sizeof(uint32), 1, wf); - check += fwrite(&spawn.iPos, sizeof(float), 3, wf); - check += fwrite(&spawn.iRot, sizeof(float), 3, wf); - check += fwrite(&spawn.iScale, sizeof(float), 1, wf); - bool has_bound = (spawn.flags & MOD_HAS_BOUND); - if(has_bound) // only WMOs have bound in MPQ, only available after computation - { - check += fwrite(&spawn.iBound.low(), sizeof(float), 3, wf); - check += fwrite(&spawn.iBound.high(), sizeof(float), 3, wf); - } - uint32 nameLen = spawn.name.length(); - check += fwrite(&nameLen, sizeof(uint32), 1, wf); - if(check != (has_bound ? 17 : 11)) return false; - check = fwrite(spawn.name.c_str(), sizeof(char), nameLen, wf); - if(check != nameLen) return false; - return true; - } - -} diff --git a/src/server/game/CollisionDetection/ModelInstance.h b/src/server/game/CollisionDetection/ModelInstance.h deleted file mode 100644 index 97b3ab632a1..00000000000 --- a/src/server/game/CollisionDetection/ModelInstance.h +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright (C) 2005-2010 MaNGOS - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef _MODELINSTANCE_H_ -#define _MODELINSTANCE_H_ - -#include -#include -#include -#include - -#include "Platform/Define.h" - -namespace VMAP -{ - class WorldModel; - struct AreaInfo; - struct LocationInfo; - - enum ModelFlags - { - MOD_M2 = 1, - MOD_WORLDSPAWN = 1<<1, - MOD_HAS_BOUND = 1<<2 - }; - - class ModelSpawn - { - public: - //mapID, tileX, tileY, Flags, ID, Pos, Rot, Scale, Bound_lo, Bound_hi, name - uint32 flags; - uint16 adtId; - uint32 ID; - G3D::Vector3 iPos; - G3D::Vector3 iRot; - float iScale; - G3D::AABox iBound; - std::string name; - bool operator==(const ModelSpawn &other) const { return ID == other.ID; } - //uint32 hashCode() const { return ID; } - // temp? - const G3D::AABox& getBounds() const { return iBound; } - - - static bool readFromFile(FILE *rf, ModelSpawn &spawn); - static bool writeToFile(FILE *rw, const ModelSpawn &spawn); - }; - - class ModelInstance: public ModelSpawn - { - public: - ModelInstance(): iModel(0) {} - ModelInstance(const ModelSpawn &spawn, WorldModel *model); - void setUnloaded() { iModel = 0; } - bool intersectRay(const G3D::Ray& pRay, float& pMaxDist, bool pStopAtFirstHit) const; - void intersectPoint(const G3D::Vector3& p, AreaInfo &info) const; - bool GetLocationInfo(const G3D::Vector3& p, LocationInfo &info) const; - bool GetLiquidLevel(const G3D::Vector3& p, LocationInfo &info, float &liqHeight) const; - protected: - G3D::Matrix3 iInvRot; - float iInvScale; - WorldModel *iModel; - }; -} // namespace VMAP - -#endif // _MODELINSTANCE diff --git a/src/server/game/CollisionDetection/TileAssembler.cpp b/src/server/game/CollisionDetection/TileAssembler.cpp deleted file mode 100644 index d01b54a7564..00000000000 --- a/src/server/game/CollisionDetection/TileAssembler.cpp +++ /dev/null @@ -1,494 +0,0 @@ -/* - * Copyright (C) 2005-2010 MaNGOS - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "WorldModel.h" -#include "TileAssembler.h" -#include "MapTree.h" -#include "BIH.h" -#include "VMapDefinitions.h" - -#include -#include -#include -#include - -using G3D::Vector3; -using G3D::AABox; -using G3D::inf; -using std::pair; - -template<> struct BoundsTrait -{ - static void getBounds(const VMAP::ModelSpawn* const &obj, G3D::AABox& out) { out = obj->getBounds(); } -}; - -namespace VMAP -{ - bool readChunk(FILE *rf, char *dest, const char *compare, uint32 len) - { - if (fread(dest, sizeof(char), len, rf) != len) return false; - return memcmp(dest, compare, len) == 0; - } - - Vector3 ModelPosition::transform(const Vector3& pIn) const - { - Vector3 out = pIn * iScale; - out = iRotation * out; - return(out); - } - - //================================================================= - - TileAssembler::TileAssembler(const std::string& pSrcDirName, const std::string& pDestDirName) - { - iCurrentUniqueNameId = 0; - iFilterMethod = NULL; - iSrcDir = pSrcDirName; - iDestDir = pDestDirName; - //mkdir(iDestDir); - //init(); - } - - TileAssembler::~TileAssembler() - { - //delete iCoordModelMapping; - } - - bool TileAssembler::convertWorld2() - { - std::set spawnedModelFiles; - bool success = readMapSpawns(); - if (!success) - return false; - - // export Map data - for (MapData::iterator map_iter = mapData.begin(); map_iter != mapData.end() && success; ++map_iter) - { - // build global map tree - std::vector mapSpawns; - UniqueEntryMap::iterator entry; - for (entry = map_iter->second->UniqueEntries.begin(); entry != map_iter->second->UniqueEntries.end(); ++entry) - { - // M2 models don't have a bound set in WDT/ADT placement data, i still think they're not used for LoS at all on retail - if (entry->second.flags & MOD_M2) - { - if (!calculateTransformedBound(entry->second)) - break; - } - else if (entry->second.flags & MOD_WORLDSPAWN) // WMO maps and terrain maps use different origin, so we need to adapt :/ - { - // TODO: remove extractor hack and uncomment below line: - //entry->second.iPos += Vector3(533.33333f*32, 533.33333f*32, 0.f); - entry->second.iBound = entry->second.iBound + Vector3(533.33333f*32, 533.33333f*32, 0.f); - } - mapSpawns.push_back(&(entry->second)); - spawnedModelFiles.insert(entry->second.name); - } - - BIH pTree; - pTree.build(mapSpawns, BoundsTrait::getBounds); - - // ===> possibly move this code to StaticMapTree class - std::map modelNodeIdx; - for (uint32 i=0; i(mapSpawns[i]->ID, i)); - if (!modelNodeIdx.empty()) - printf("min GUID: %u, max GUID: %u\n", modelNodeIdx.begin()->first, modelNodeIdx.rbegin()->first); - - // write map tree file - std::stringstream mapfilename; - mapfilename << iDestDir << "/" << std::setfill('0') << std::setw(3) << map_iter->first << ".vmtree"; - FILE *mapfile = fopen(mapfilename.str().c_str(), "wb"); - if (!mapfile) - { - success = false; - printf("Cannot open %s\n", mapfilename.str().c_str()); - break; - } - - //general info - if (success && fwrite(VMAP_MAGIC, 1, 8, mapfile) != 8) success = false; - uint32 globalTileID = StaticMapTree::packTileID(65, 65); - pair globalRange = map_iter->second->TileEntries.equal_range(globalTileID); - char isTiled = globalRange.first == globalRange.second; // only maps without terrain (tiles) have global WMO - if (success && fwrite(&isTiled, sizeof(char), 1, mapfile) != 1) success = false; - // Nodes - if (success && fwrite("NODE", 4, 1, mapfile) != 1) success = false; - if (success) success = pTree.writeToFile(mapfile); - // global map spawns (WDT), if any (most instances) - if (success && fwrite("GOBJ", 4, 1, mapfile) != 1) success = false; - - for (TileMap::iterator glob=globalRange.first; glob != globalRange.second && success; ++glob) - { - success = ModelSpawn::writeToFile(mapfile, map_iter->second->UniqueEntries[glob->second]); - } - - fclose(mapfile); - - // <==== - - // write map tile files, similar to ADT files, only with extra BSP tree node info - TileMap &tileEntries = map_iter->second->TileEntries; - TileMap::iterator tile; - for (tile = tileEntries.begin(); tile != tileEntries.end(); ++tile) - { - const ModelSpawn &spawn = map_iter->second->UniqueEntries[tile->second]; - if (spawn.flags & MOD_WORLDSPAWN) // WDT spawn, saved as tile 65/65 currently... - continue; - uint32 nSpawns = tileEntries.count(tile->first); - std::stringstream tilefilename; - tilefilename.fill('0'); - tilefilename << iDestDir << "/" << std::setw(3) << map_iter->first << "_"; - uint32 x, y; - StaticMapTree::unpackTileID(tile->first, x, y); - tilefilename << std::setw(2) << x << "_" << std::setw(2) << y << ".vmtile"; - FILE *tilefile = fopen(tilefilename.str().c_str(), "wb"); - // write number of tile spawns - if (success && fwrite(&nSpawns, sizeof(uint32), 1, tilefile) != 1) success = false; - // write tile spawns - for (uint32 s=0; ssecond->UniqueEntries[tile->second]; - success = success && ModelSpawn::writeToFile(tilefile, spawn2); - // MapTree nodes to update when loading tile: - std::map::iterator nIdx = modelNodeIdx.find(spawn2.ID); - if (success && fwrite(&nIdx->second, sizeof(uint32), 1, tilefile) != 1) success = false; - } - fclose(tilefile); - } - // break; //test, extract only first map; TODO: remvoe this line - } - - // export objects - std::cout << "\nConverting Model Files" << std::endl; - for (std::set::iterator mfile = spawnedModelFiles.begin(); mfile != spawnedModelFiles.end(); ++mfile) - { - std::cout << "Converting " << *mfile << std::endl; - if (!convertRawFile(*mfile)) - { - std::cout << "error converting " << *mfile << std::endl; - success = false; - break; - } - } - - //cleanup: - for (MapData::iterator map_iter = mapData.begin(); map_iter != mapData.end(); ++map_iter) - { - delete map_iter->second; - } - return success; - } - - bool TileAssembler::readMapSpawns() - { - std::string fname = iSrcDir + "/dir_bin"; - FILE *dirf = fopen(fname.c_str(), "rb"); - if (!dirf) - { - printf("Could not read dir_bin file!\n"); - return false; - } - printf("Read coordinate mapping...\n"); - uint32 mapID, tileX, tileY, check=0; - G3D::Vector3 v1, v2; - ModelSpawn spawn; - while (!feof(dirf)) - { - check = 0; - // read mapID, tileX, tileY, Flags, adtID, ID, Pos, Rot, Scale, Bound_lo, Bound_hi, name - check += fread(&mapID, sizeof(uint32), 1, dirf); - if (check == 0) // EoF... - break; - check += fread(&tileX, sizeof(uint32), 1, dirf); - check += fread(&tileY, sizeof(uint32), 1, dirf); - if (!ModelSpawn::readFromFile(dirf, spawn)) - break; - - MapSpawns *current; - MapData::iterator map_iter = mapData.find(mapID); - if (map_iter == mapData.end()) - { - printf("spawning Map %d\n", mapID); - mapData[mapID] = current = new MapSpawns(); - } - else current = (*map_iter).second; - current->UniqueEntries.insert(pair(spawn.ID, spawn)); - current->TileEntries.insert(pair(StaticMapTree::packTileID(tileX, tileY), spawn.ID)); - } - bool success = (ferror(dirf) == 0); - fclose(dirf); - return success; - } - - bool TileAssembler::calculateTransformedBound(ModelSpawn &spawn) - { - std::string modelFilename = iSrcDir + "/" + spawn.name; - ModelPosition modelPosition; - modelPosition.iDir = spawn.iRot; - modelPosition.iScale = spawn.iScale; - modelPosition.init(); - - FILE *rf = fopen(modelFilename.c_str(), "rb"); - if (!rf) - { - printf("ERROR: Can't open model file: %s\n", modelFilename.c_str()); - return false; - } - - AABox modelBound; - bool boundEmpty=true; - char ident[8]; - - int readOperation = 1; - - // temporary use defines to simplify read/check code (close file and return at fail) - #define READ_OR_RETURN(V,S) if(fread((V), (S), 1, rf) != 1) { \ - fclose(rf); printf("readfail, op = %i\n", readOperation); return(false); }readOperation++; - #define CMP_OR_RETURN(V,S) if(strcmp((V),(S)) != 0) { \ - fclose(rf); printf("cmpfail, %s!=%s\n", V, S);return(false); } - - READ_OR_RETURN(&ident, 8); - CMP_OR_RETURN(ident, "VMAP003"); - - // we have to read one int. This is needed during the export and we have to skip it here - uint32 tempNVectors; - READ_OR_RETURN(&tempNVectors, sizeof(tempNVectors)); - - uint32 groups, wmoRootId; - char blockId[5]; - blockId[4] = 0; - int blocksize; - float *vectorarray = 0; - - READ_OR_RETURN(&groups, sizeof(uint32)); - READ_OR_RETURN(&wmoRootId, sizeof(uint32)); - if (groups != 1) printf("Warning: '%s' does not seem to be a M2 model!\n", modelFilename.c_str()); - - for (uint32 g=0; g0) - { - vectorarray = new float[nvectors*3]; - READ_OR_RETURN(vectorarray, nvectors*sizeof(float)*3); - } - else - { - std::cout << "error: model '" << spawn.name << "' has no geometry!" << std::endl; - return false; - } - - for (uint32 i=0, indexNo=0; indexNo0) - filename.append("/"); - filename.append(pModelFilename); - FILE *rf = fopen(filename.c_str(), "rb"); - - if (!rf) - { - printf("ERROR: Can't open model file in form: %s",pModelFilename.c_str()); - printf("... or form: %s",filename.c_str() ); - return false; - } - - char ident[8]; - - int readOperation = 1; - - // temporary use defines to simplify read/check code (close file and return at fail) - #define READ_OR_RETURN(V,S) if(fread((V), (S), 1, rf) != 1) { \ - fclose(rf); printf("readfail, op = %i\n", readOperation); return(false); }readOperation++; - #define CMP_OR_RETURN(V,S) if(strcmp((V),(S)) != 0) { \ - fclose(rf); printf("cmpfail, %s!=%s\n", V, S);return(false); } - - READ_OR_RETURN(&ident, 8); - CMP_OR_RETURN(ident, "VMAP003"); - - // we have to read one int. This is needed during the export and we have to skip it here - uint32 tempNVectors; - READ_OR_RETURN(&tempNVectors, sizeof(tempNVectors)); - - uint32 groups; - uint32 RootWMOID; - char blockId[5]; - blockId[4] = 0; - int blocksize; - - READ_OR_RETURN(&groups, sizeof(uint32)); - READ_OR_RETURN(&RootWMOID, sizeof(uint32)); - - std::vector groupsArray; - - for (uint32 g=0; g triangles; - std::vector vertexArray; - - uint32 mogpflags, GroupWMOID; - READ_OR_RETURN(&mogpflags, sizeof(uint32)); - READ_OR_RETURN(&GroupWMOID, sizeof(uint32)); - - float bbox1[3], bbox2[3]; - READ_OR_RETURN(bbox1, sizeof(float)*3); - READ_OR_RETURN(bbox2, sizeof(float)*3); - - uint32 liquidflags; - READ_OR_RETURN(&liquidflags, sizeof(uint32)); - - // will this ever be used? what is it good for anyway?? - uint32 branches; - READ_OR_RETURN(&blockId, 4); - CMP_OR_RETURN(blockId, "GRP "); - READ_OR_RETURN(&blocksize, sizeof(int)); - READ_OR_RETURN(&branches, sizeof(uint32)); - for (uint32 b=0; b0) - { - uint16 *indexarray = new uint16[nindexes]; - READ_OR_RETURN(indexarray, nindexes*sizeof(uint16)); - for (uint32 i=0; i0) - { - float *vectorarray = new float[nvectors*3]; - READ_OR_RETURN(vectorarray, nvectors*sizeof(float)*3); - for (uint32 i=0; iGetHeightStorage(), size*sizeof(float)); - size = hlq.xtiles*hlq.ytiles; - READ_OR_RETURN(liquid->GetFlagsStorage(), size); - } - - groupsArray.push_back(GroupModel(mogpflags, GroupWMOID, AABox(Vector3(bbox1), Vector3(bbox2)))); - groupsArray.back().setMeshData(vertexArray, triangles); - groupsArray.back().setLiquidData(liquid); - - // drop of temporary use defines - #undef READ_OR_RETURN - #undef CMP_OR_RETURN - - } - fclose(rf); - - // write WorldModel - WorldModel model; - model.setRootWmoID(RootWMOID); - if (groupsArray.size()) - { - model.setGroupModels(groupsArray); - success = model.writeFile(iDestDir + "/" + pModelFilename + ".vmo"); - } - - //std::cout << "readRawFile2: '" << pModelFilename << "' tris: " << nElements << " nodes: " << nNodes << std::endl; - return success; - } -} diff --git a/src/server/game/CollisionDetection/TileAssembler.h b/src/server/game/CollisionDetection/TileAssembler.h deleted file mode 100644 index b26735708af..00000000000 --- a/src/server/game/CollisionDetection/TileAssembler.h +++ /dev/null @@ -1,89 +0,0 @@ -/* - * Copyright (C) 2005-2010 MaNGOS - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef _TILEASSEMBLER_H_ -#define _TILEASSEMBLER_H_ - -#include -#include -#include - -#include "ModelInstance.h" - -namespace VMAP -{ - /** - This Class is used to convert raw vector data into balanced BSP-Trees. - To start the conversion call convertWorld(). - */ - //=============================================== - - class ModelPosition - { - private: - G3D::Matrix3 iRotation; - public: - G3D::Vector3 iPos; - G3D::Vector3 iDir; - float iScale; - void init() - { - iRotation = G3D::Matrix3::fromEulerAnglesZYX(G3D::pi()*iDir.y/180.f, G3D::pi()*iDir.x/180.f, G3D::pi()*iDir.z/180.f); - } - G3D::Vector3 transform(const G3D::Vector3& pIn) const; - void moveToBasePos(const G3D::Vector3& pBasePos) { iPos -= pBasePos; } - }; - - typedef std::map UniqueEntryMap; - typedef std::multimap TileMap; - - struct MapSpawns - { - UniqueEntryMap UniqueEntries; - TileMap TileEntries; - }; - - typedef std::map MapData; - //=============================================== - - class TileAssembler - { - private: - std::string iDestDir; - std::string iSrcDir; - bool (*iFilterMethod)(char *pName); - G3D::Table iUniqueNameIds; - unsigned int iCurrentUniqueNameId; - MapData mapData; - - public: - TileAssembler(const std::string& pSrcDirName, const std::string& pDestDirName); - virtual ~TileAssembler(); - - bool convertWorld2(); - bool readMapSpawns(); - bool calculateTransformedBound(ModelSpawn &spawn); - - bool convertRawFile(const std::string& pModelFilename); - void setModelNameFilterMethod(bool (*pFilterMethod)(char *pName)) { iFilterMethod = pFilterMethod; } - std::string getDirEntryNameFromModName(unsigned int pMapId, const std::string& pModPosName); - unsigned int getUniqueNameId(const std::string pName); - }; - -} // VMAP -#endif /*_TILEASSEMBLER_H_*/ diff --git a/src/server/game/CollisionDetection/VMapDefinitions.h b/src/server/game/CollisionDetection/VMapDefinitions.h deleted file mode 100644 index e4a34cc1397..00000000000 --- a/src/server/game/CollisionDetection/VMapDefinitions.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2005-2010 MaNGOS - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef _VMAPDEFINITIONS_H -#define _VMAPDEFINITIONS_H -#include - -#define LIQUID_TILE_SIZE (533.333f / 128.f) - -namespace VMAP -{ - //===================================== - #define MAX_CAN_FALL_DISTANCE 10.0f - const char VMAP_MAGIC[] = "VMAP_3.0"; - - class VMapDefinitions - { - public: - static float getMaxCanFallDistance() { return MAX_CAN_FALL_DISTANCE; } - }; - - //====================================== - - // defined in TileAssembler.cpp currently... - bool readChunk(FILE *rf, char *dest, const char *compare, uint32 len); -} -#endif diff --git a/src/server/game/CollisionDetection/VMapFactory.cpp b/src/server/game/CollisionDetection/VMapFactory.cpp deleted file mode 100644 index 331acbace47..00000000000 --- a/src/server/game/CollisionDetection/VMapFactory.cpp +++ /dev/null @@ -1,136 +0,0 @@ -/* - * Copyright (C) 2005-2010 MaNGOS - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include -#include "VMapFactory.h" -#include "VMapManager2.h" - -using namespace G3D; - -namespace VMAP -{ - void chompAndTrim(std::string& str) - { - while(str.length() >0) - { - char lc = str[str.length()-1]; - if(lc == '\r' || lc == '\n' || lc == ' ' || lc == '"' || lc == '\'') - { - str = str.substr(0,str.length()-1); - } - else - { - break; - } - } - while(str.length() >0) - { - char lc = str[0]; - if(lc == ' ' || lc == '"' || lc == '\'') - { - str = str.substr(1,str.length()-1); - } - else - { - break; - } - } - } - - IVMapManager *gVMapManager = 0; - Table* iIgnoreSpellIds=0; - - //=============================================== - // result false, if no more id are found - - bool getNextId(const std::string& pString, unsigned int& pStartPos, unsigned int& pId) - { - bool result = false; - unsigned int i; - for(i=pStartPos;ipStartPos) - { - std::string idString = pString.substr(pStartPos, i-pStartPos); - pStartPos = i+1; - chompAndTrim(idString); - pId = atoi(idString.c_str()); - result = true; - } - return(result); - } - - //=============================================== - /** - parameter: String of map ids. Delimiter = "," - */ - - void VMapFactory::preventSpellsFromBeingTestedForLoS(const char* pSpellIdString) - { - if(!iIgnoreSpellIds) - iIgnoreSpellIds = new Table(); - if(pSpellIdString != NULL) - { - unsigned int pos =0; - unsigned int id; - std::string confString(pSpellIdString); - chompAndTrim(confString); - while(getNextId(confString, pos, id)) - { - iIgnoreSpellIds->set(id, true); - } - } - } - - //=============================================== - - bool VMapFactory::checkSpellForLoS(unsigned int pSpellId) - { - return(!iIgnoreSpellIds->containsKey(pSpellId)); - } - - //=============================================== - // just return the instance - IVMapManager* VMapFactory::createOrGetVMapManager() - { - if(gVMapManager == 0) - gVMapManager= new VMapManager2(); // should be taken from config ... Please change if you like :-) - return gVMapManager; - } - - //=============================================== - // delete all internal data structures - void VMapFactory::clear() - { - if(iIgnoreSpellIds) - { - delete iIgnoreSpellIds; - iIgnoreSpellIds = NULL; - } - if(gVMapManager) - { - delete gVMapManager; - gVMapManager = NULL; - } - } -} diff --git a/src/server/game/CollisionDetection/VMapFactory.h b/src/server/game/CollisionDetection/VMapFactory.h deleted file mode 100644 index 8dc2c01938a..00000000000 --- a/src/server/game/CollisionDetection/VMapFactory.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (C) 2005-2010 MaNGOS - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef _VMAPFACTORY_H -#define _VMAPFACTORY_H - -#include "IVMapManager.h" - -/** -This is the access point to the VMapManager. -*/ - -namespace VMAP -{ - //=========================================================== - - class VMapFactory - { - public: - static IVMapManager* createOrGetVMapManager(); - static void clear(); - - static void preventSpellsFromBeingTestedForLoS(const char* pSpellIdString); - static bool checkSpellForLoS(unsigned int pSpellId); - }; - -} -#endif diff --git a/src/server/game/CollisionDetection/VMapManager2.cpp b/src/server/game/CollisionDetection/VMapManager2.cpp deleted file mode 100644 index 1e8a84aee52..00000000000 --- a/src/server/game/CollisionDetection/VMapManager2.cpp +++ /dev/null @@ -1,336 +0,0 @@ -/* - * Copyright (C) 2005-2010 MaNGOS - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include -#include -#include -#include -#include "VMapManager2.h" -#include "MapTree.h" -#include "ModelInstance.h" -#include "WorldModel.h" -#include "VMapDefinitions.h" - -using G3D::Vector3; - -namespace VMAP -{ - - //========================================================= - - VMapManager2::VMapManager2() - { - } - - //========================================================= - - VMapManager2::~VMapManager2(void) - { - for (InstanceTreeMap::iterator i = iInstanceMapTrees.begin(); i != iInstanceMapTrees.end(); ++i) - { - delete i->second; - } - for (ModelFileMap::iterator i = iLoadedModelFiles.begin(); i != iLoadedModelFiles.end(); ++i) - { - delete i->second.getModel(); - } - } - - //========================================================= - - Vector3 VMapManager2::convertPositionToInternalRep(float x, float y, float z) const - { - Vector3 pos; - const float mid = 0.5 * 64.0 * 533.33333333f; - pos.x = mid - x; - pos.y = mid - y; - pos.z = z; - - return pos; - } - - //========================================================= - - Vector3 VMapManager2::convertPositionToMangosRep(float x, float y, float z) const - { - Vector3 pos; - const float mid = 0.5 * 64.0 * 533.33333333f; - pos.x = mid - x; - pos.y = mid - y; - pos.z = z; - - return pos; - } - //========================================================= - - // move to MapTree too? - std::string VMapManager2::getMapFileName(unsigned int pMapId) - { - std::stringstream fname; - fname.width(3); - fname << std::setfill('0') << pMapId << std::string(MAP_FILENAME_EXTENSION2); - return fname.str(); - } - - //========================================================= - /** - Block maps from being used. - parameter: String of map ids. Delimiter = "," - e.g.: "0,1,590" - */ - - void VMapManager2::preventMapsFromBeingUsed(const char* pMapIdString) - { - iIgnoreMapIds.clear(); - if (pMapIdString != NULL) - { - std::string map_str; - std::stringstream map_ss; - map_ss.str(std::string(pMapIdString)); - while (std::getline(map_ss, map_str, ',')) - { - std::stringstream ss2(map_str); - int map_num = -1; - ss2 >> map_num; - if (map_num >= 0) - { - std::cout << "ingoring Map " << map_num << " for VMaps\n"; - iIgnoreMapIds[map_num] = true; - // unload map in case it is loaded - unloadMap(map_num); - } - } - } - } - - //========================================================= - - int VMapManager2::loadMap(const char* pBasePath, unsigned int pMapId, int x, int y) - { - int result = VMAP_LOAD_RESULT_IGNORED; - if (isMapLoadingEnabled() && !iIgnoreMapIds.count(pMapId)) - { - if (_loadMap(pMapId, pBasePath, x, y)) - result = VMAP_LOAD_RESULT_OK; - else - result = VMAP_LOAD_RESULT_ERROR; - } - return result; - } - - //========================================================= - // load one tile (internal use only) - - bool VMapManager2::_loadMap(unsigned int pMapId, const std::string &basePath, uint32 tileX, uint32 tileY) - { - InstanceTreeMap::iterator instanceTree = iInstanceMapTrees.find(pMapId); - if (instanceTree == iInstanceMapTrees.end()) - { - std::string mapFileName = getMapFileName(pMapId); - StaticMapTree *newTree = new StaticMapTree(pMapId, basePath); - if (!newTree->InitMap(mapFileName, this)) - return false; - instanceTree = iInstanceMapTrees.insert(InstanceTreeMap::value_type(pMapId, newTree)).first; - } - return instanceTree->second->LoadMapTile(tileX, tileY, this); - } - - //========================================================= - - void VMapManager2::unloadMap(unsigned int pMapId) - { - InstanceTreeMap::iterator instanceTree = iInstanceMapTrees.find(pMapId); - if (instanceTree != iInstanceMapTrees.end()) - { - instanceTree->second->UnloadMap(this); - if (instanceTree->second->numLoadedTiles() == 0) - { - delete instanceTree->second; - iInstanceMapTrees.erase(pMapId); - } - } - } - - //========================================================= - - void VMapManager2::unloadMap(unsigned int pMapId, int x, int y) - { - InstanceTreeMap::iterator instanceTree = iInstanceMapTrees.find(pMapId); - if (instanceTree != iInstanceMapTrees.end()) - { - instanceTree->second->UnloadMapTile(x, y, this); - if (instanceTree->second->numLoadedTiles() == 0) - { - delete instanceTree->second; - iInstanceMapTrees.erase(pMapId); - } - } - } - - //========================================================== - - bool VMapManager2::isInLineOfSight(unsigned int pMapId, float x1, float y1, float z1, float x2, float y2, float z2) - { - if (!isLineOfSightCalcEnabled()) return true; - bool result = true; - InstanceTreeMap::iterator instanceTree = iInstanceMapTrees.find(pMapId); - if (instanceTree != iInstanceMapTrees.end()) - { - Vector3 pos1 = convertPositionToInternalRep(x1,y1,z1); - Vector3 pos2 = convertPositionToInternalRep(x2,y2,z2); - if (pos1 != pos2) - { - result = instanceTree->second->isInLineOfSight(pos1, pos2); - } - } - return result; - } - //========================================================= - /** - get the hit position and return true if we hit something - otherwise the result pos will be the dest pos - */ - bool VMapManager2::getObjectHitPos(unsigned int pMapId, float x1, float y1, float z1, float x2, float y2, float z2, float& rx, float &ry, float& rz, float pModifyDist) - { - bool result = false; - rx=x2; - ry=y2; - rz=z2; - if (isLineOfSightCalcEnabled()) - { - InstanceTreeMap::iterator instanceTree = iInstanceMapTrees.find(pMapId); - if (instanceTree != iInstanceMapTrees.end()) - { - Vector3 pos1 = convertPositionToInternalRep(x1,y1,z1); - Vector3 pos2 = convertPositionToInternalRep(x2,y2,z2); - Vector3 resultPos; - result = instanceTree->second->getObjectHitPos(pos1, pos2, resultPos, pModifyDist); - resultPos = convertPositionToMangosRep(resultPos.x,resultPos.y,resultPos.z); - rx = resultPos.x; - ry = resultPos.y; - rz = resultPos.z; - } - } - return result; - } - - //========================================================= - /** - get height or INVALID_HEIGHT if no height available - */ - - float VMapManager2::getHeight(unsigned int pMapId, float x, float y, float z) - { - float height = VMAP_INVALID_HEIGHT_VALUE; //no height - if (isHeightCalcEnabled()) - { - InstanceTreeMap::iterator instanceTree = iInstanceMapTrees.find(pMapId); - if (instanceTree != iInstanceMapTrees.end()) - { - Vector3 pos = convertPositionToInternalRep(x,y,z); - height = instanceTree->second->getHeight(pos); - if (!(height < G3D::inf())) - { - height = VMAP_INVALID_HEIGHT_VALUE; //no height - } - } - } - return height; - } - - //========================================================= - - bool VMapManager2::getAreaInfo(unsigned int pMapId, float x, float y, float &z, uint32 &flags, int32 &adtId, int32 &rootId, int32 &groupId) const - { - bool result=false; - InstanceTreeMap::const_iterator instanceTree = iInstanceMapTrees.find(pMapId); - if (instanceTree != iInstanceMapTrees.end()) - { - Vector3 pos = convertPositionToInternalRep(x, y, z); - result = instanceTree->second->getAreaInfo(pos, flags, adtId, rootId, groupId); - // z is not touched by convertPositionToMangosRep(), so just copy - z = pos.z; - } - return(result); - } - - bool VMapManager2::GetLiquidLevel(uint32 pMapId, float x, float y, float z, uint8 ReqLiquidType, float &level, float &floor, uint32 &type) const - { - InstanceTreeMap::const_iterator instanceTree = iInstanceMapTrees.find(pMapId); - if (instanceTree != iInstanceMapTrees.end()) - { - LocationInfo info; - Vector3 pos = convertPositionToInternalRep(x, y, z); - if (instanceTree->second->GetLocationInfo(pos, info)) - { - floor = info.ground_Z; - type = info.hitModel->GetLiquidType(); - if (ReqLiquidType && !(type & ReqLiquidType)) - return false; - if (info.hitInstance->GetLiquidLevel(pos, info, level)) - return true; - } - } - return false; - } - - //========================================================= - - WorldModel* VMapManager2::acquireModelInstance(const std::string &basepath, const std::string &filename) - { - ModelFileMap::iterator model = iLoadedModelFiles.find(filename); - if (model == iLoadedModelFiles.end()) - { - WorldModel *worldmodel = new WorldModel(); - if (!worldmodel->readFile(basepath + filename + ".vmo")) - { - std::cout << "VMapManager2: could not load '" << basepath << filename << ".vmo'!\n"; - delete worldmodel; - return NULL; - } - std::cout << "VMapManager2: loading file '" << basepath << filename << "'.\n"; - model = iLoadedModelFiles.insert(std::pair(filename, ManagedModel())).first; - model->second.setModel(worldmodel); - } - model->second.incRefCount(); - return model->second.getModel(); - } - - void VMapManager2::releaseModelInstance(const std::string &filename) - { - ModelFileMap::iterator model = iLoadedModelFiles.find(filename); - if (model == iLoadedModelFiles.end()) - { - std::cout << "VMapManager2: trying to unload non-loaded file '" << filename << "'!\n"; - return; - } - if( model->second.decRefCount() == 0) - { - std::cout << "VMapManager2: unloading file '" << filename << "'.\n"; - delete model->second.getModel(); - iLoadedModelFiles.erase(model); - } - } - //========================================================= - - bool VMapManager2::existsMap(const char* pBasePath, unsigned int pMapId, int x, int y) - { - return StaticMapTree::CanLoadMap(std::string(pBasePath), pMapId, x, y); - } - -} // namespace VMAP diff --git a/src/server/game/CollisionDetection/VMapManager2.h b/src/server/game/CollisionDetection/VMapManager2.h deleted file mode 100644 index 5f03b87b07f..00000000000 --- a/src/server/game/CollisionDetection/VMapManager2.h +++ /dev/null @@ -1,114 +0,0 @@ -/* - * Copyright (C) 2005-2010 MaNGOS - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef _VMAPMANAGER2_H -#define _VMAPMANAGER2_H - -#include "IVMapManager.h" -#include "Utilities/UnorderedMap.h" -#include "Platform/Define.h" -#include - -//=========================================================== - -#define MAP_FILENAME_EXTENSION2 ".vmtree" - -#define FILENAMEBUFFER_SIZE 500 - -/** -This is the main Class to manage loading and unloading of maps, line of sight, height calculation and so on. -For each map or map tile to load it reads a directory file that contains the ModelContainer files used by this map or map tile. -Each global map or instance has its own dynamic BSP-Tree. -The loaded ModelContainers are included in one of these BSP-Trees. -Additionally a table to match map ids and map names is used. -*/ - -//=========================================================== - -namespace VMAP -{ - class StaticMapTree; - class WorldModel; - - class ManagedModel - { - public: - ManagedModel(): iModel(0), iRefCount(0) {} - void setModel(WorldModel *model) { iModel = model; } - WorldModel *getModel() { return iModel; } - void incRefCount() { ++iRefCount; } - int decRefCount() { return --iRefCount; } - protected: - WorldModel *iModel; - int iRefCount; - }; - - typedef UNORDERED_MAP InstanceTreeMap; - typedef UNORDERED_MAP ModelFileMap; - - class VMapManager2 : public IVMapManager - { - protected: - // Tree to check collision - ModelFileMap iLoadedModelFiles; - InstanceTreeMap iInstanceMapTrees; - // UNORDERED_MAP iMapsSplitIntoTiles; - UNORDERED_MAP iIgnoreMapIds; - - bool _loadMap(uint32 pMapId, const std::string &basePath, uint32 tileX, uint32 tileY); - /* void _unloadMap(uint32 pMapId, uint32 x, uint32 y); */ - - public: - // public for debug - G3D::Vector3 convertPositionToInternalRep(float x, float y, float z) const; - G3D::Vector3 convertPositionToMangosRep(float x, float y, float z) const; - static std::string getMapFileName(unsigned int pMapId); - - VMapManager2(); - ~VMapManager2(void); - - int loadMap(const char* pBasePath, unsigned int pMapId, int x, int y); - - void unloadMap(unsigned int pMapId, int x, int y); - void unloadMap(unsigned int pMapId); - - bool isInLineOfSight(unsigned int pMapId, float x1, float y1, float z1, float x2, float y2, float z2) ; - /** - fill the hit pos and return true, if an object was hit - */ - bool getObjectHitPos(unsigned int pMapId, float x1, float y1, float z1, float x2, float y2, float z2, float& rx, float &ry, float& rz, float pModifyDist); - float getHeight(unsigned int pMapId, float x, float y, float z); - - bool processCommand(char *pCommand) { return false; } // for debug and extensions - - void preventMapsFromBeingUsed(const char* pMapIdString); - bool getAreaInfo(unsigned int pMapId, float x, float y, float &z, uint32 &flags, int32 &adtId, int32 &rootId, int32 &groupId) const; - bool GetLiquidLevel(uint32 pMapId, float x, float y, float z, uint8 ReqLiquidType, float &level, float &floor, uint32 &type) const; - - WorldModel* acquireModelInstance(const std::string &basepath, const std::string &filename); - void releaseModelInstance(const std::string &filename); - - // what's the use of this? o.O - virtual std::string getDirFileName(unsigned int pMapId, int x, int y) const - { - return getMapFileName(pMapId); - } - virtual bool existsMap(const char* pBasePath, unsigned int pMapId, int x, int y); - }; -} -#endif diff --git a/src/server/game/CollisionDetection/VMapTools.h b/src/server/game/CollisionDetection/VMapTools.h deleted file mode 100644 index dbbd9af9271..00000000000 --- a/src/server/game/CollisionDetection/VMapTools.h +++ /dev/null @@ -1,150 +0,0 @@ -/* -* Copyright (C) 2005-2010 MaNGOS -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ - -#ifndef _VMAPTOOLS_H -#define _VMAPTOOLS_H - -#include -#include - -#include "NodeValueAccess.h" - -/** -The Class is mainly taken from G3D/AABSPTree.h but modified to be able to use our internal data structure. -This is an iterator that helps us analysing the BSP-Trees. -The collision detection is modified to return true, if we are inside an object. -*/ - -namespace VMAP -{ - template - class IntersectionCallBack { - public: - TValue* closestEntity; - G3D::Vector3 hitLocation; - G3D::Vector3 hitNormal; - - void operator()(const G3D::Ray& ray, const TValue* entity, bool pStopAtFirstHit, float& distance) { - entity->intersect(ray, distance, pStopAtFirstHit, hitLocation, hitNormal); - } - }; - - //============================================================== - //============================================================== - //============================================================== - - class MyCollisionDetection - { - private: - public: - - static bool collisionLocationForMovingPointFixedAABox( - const G3D::Vector3& origin, - const G3D::Vector3& dir, - const G3D::AABox& box, - G3D::Vector3& location, - bool& Inside) - { - - // Integer representation of a floating-point value. -#define IR(x) (reinterpret_cast(x)) - - Inside = true; - const G3D::Vector3& MinB = box.low(); - const G3D::Vector3& MaxB = box.high(); - G3D::Vector3 MaxT(-1.0f, -1.0f, -1.0f); - - // Find candidate planes. - for (int i = 0; i < 3; ++i) - { - if (origin[i] < MinB[i]) - { - location[i] = MinB[i]; - Inside = false; - - // Calculate T distances to candidate planes - if (IR(dir[i])) - { - MaxT[i] = (MinB[i] - origin[i]) / dir[i]; - } - } - else if (origin[i] > MaxB[i]) - { - location[i] = MaxB[i]; - Inside = false; - - // Calculate T distances to candidate planes - if (IR(dir[i])) - { - MaxT[i] = (MaxB[i] - origin[i]) / dir[i]; - } - } - } - - if (Inside) - { - // definite hit - location = origin; - return true; - } - - // Get largest of the maxT's for final choice of intersection - int WhichPlane = 0; - if (MaxT[1] > MaxT[WhichPlane]) - { - WhichPlane = 1; - } - - if (MaxT[2] > MaxT[WhichPlane]) - { - WhichPlane = 2; - } - - // Check final candidate actually inside box - if (IR(MaxT[WhichPlane]) & 0x80000000) - { - // Miss the box - return false; - } - - for (int i = 0; i < 3; ++i) - { - if (i != WhichPlane) - { - location[i] = origin[i] + MaxT[WhichPlane] * dir[i]; - if ((location[i] < MinB[i]) || - (location[i] > MaxB[i])) - { - // On this plane we're outside the box extents, so - // we miss the box - return false; - } - } - } - /* - // Choose the normal to be the plane normal facing into the ray - normal = G3D::Vector3::zero(); - normal[WhichPlane] = (dir[WhichPlane] > 0) ? -1.0 : 1.0; - */ - return true; - -#undef IR - } - }; -} -#endif diff --git a/src/server/game/CollisionDetection/WorldModel.cpp b/src/server/game/CollisionDetection/WorldModel.cpp deleted file mode 100644 index 690c77577ae..00000000000 --- a/src/server/game/CollisionDetection/WorldModel.cpp +++ /dev/null @@ -1,535 +0,0 @@ -/* - * Copyright (C) 2005-2010 MaNGOS - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "WorldModel.h" -#include "VMapDefinitions.h" -#include "MapTree.h" - -using G3D::Vector3; -using G3D::Ray; - -template<> struct BoundsTrait -{ - static void getBounds(const VMAP::GroupModel& obj, G3D::AABox& out) { out = obj.GetBound(); } -}; - - -namespace VMAP -{ - bool IntersectTriangle(const MeshTriangle &tri, std::vector::const_iterator points, const G3D::Ray &ray, float &distance) - { - static const float EPS = 1e-5f; - - // See RTR2 ch. 13.7 for the algorithm. - - const Vector3 e1 = points[tri.idx1] - points[tri.idx0]; - const Vector3 e2 = points[tri.idx2] - points[tri.idx0]; - const Vector3 p(ray.direction().cross(e2)); - const float a = e1.dot(p); - - if (abs(a) < EPS) { - // Determinant is ill-conditioned; abort early - return false; - } - - const float f = 1.0f / a; - const Vector3 s(ray.origin() - points[tri.idx0]); - const float u = f * s.dot(p); - - if ((u < 0.0f) || (u > 1.0f)) { - // We hit the plane of the m_geometry, but outside the m_geometry - return false; - } - - const Vector3 q(s.cross(e1)); - const float v = f * ray.direction().dot(q); - - if ((v < 0.0f) || ((u + v) > 1.0f)) { - // We hit the plane of the triangle, but outside the triangle - return false; - } - - const float t = f * e2.dot(q); - - if ((t > 0.0f) && (t < distance)) - { - // This is a new hit, closer than the previous one - distance = t; - - /* baryCoord[0] = 1.0 - u - v; - baryCoord[1] = u; - baryCoord[2] = v; */ - - return true; - } - // This hit is after the previous hit, so ignore it - return false; - } - - class TriBoundFunc - { - public: - TriBoundFunc(std::vector &vert): vertices(vert.begin()) {} - void operator()(const MeshTriangle &tri, G3D::AABox &out) const - { - G3D::Vector3 lo = vertices[tri.idx0]; - G3D::Vector3 hi = lo; - - lo = (lo.min(vertices[tri.idx1])).min(vertices[tri.idx2]); - hi = (hi.max(vertices[tri.idx1])).max(vertices[tri.idx2]); - - out = G3D::AABox(lo, hi); - } - protected: - const std::vector::const_iterator vertices; - }; - - // ===================== WmoLiquid ================================== - - WmoLiquid::WmoLiquid(uint32 width, uint32 height, const Vector3 &corner, uint32 type): - iTilesX(width), iTilesY(height), iCorner(corner), iType(type) - { - iHeight = new float[(width+1)*(height+1)]; - iFlags = new uint8[width*height]; - } - - WmoLiquid::WmoLiquid(const WmoLiquid &other): iHeight(0), iFlags(0) - { - *this = other; // use assignment operator... - } - - WmoLiquid::~WmoLiquid() - { - delete[] iHeight; - delete[] iFlags; - } - - WmoLiquid& WmoLiquid::operator=(const WmoLiquid &other) - { - if (this == &other) - return *this; - iTilesX = other.iTilesX; - iTilesY = other.iTilesY; - iCorner = other.iCorner; - iType = other.iType; - delete iHeight; - delete iFlags; - if (other.iHeight) - { - iHeight = new float[(iTilesX+1)*(iTilesY+1)]; - memcpy(iHeight, other.iHeight, (iTilesX+1)*(iTilesY+1)*sizeof(float)); - } - else - iHeight = 0; - if (other.iFlags) - { - iFlags = new uint8[iTilesX * iTilesY]; - memcpy(iFlags, other.iFlags, iTilesX * iTilesY); - } - else - iFlags = 0; - return *this; - } - - bool WmoLiquid::GetLiquidHeight(const Vector3 &pos, float &liqHeight) const - { - uint32 tx = (pos.x - iCorner.x)/LIQUID_TILE_SIZE; - if (tx<0 || tx >= iTilesX) return false; - uint32 ty = (pos.y - iCorner.y)/LIQUID_TILE_SIZE; - if (ty<0 || ty >= iTilesY) return false; - // checking for 0x08 *might* be enough, but disabled tiles always are 0x?F: - if ((iFlags[tx + ty*iTilesX] & 0x0F) == 0x0F) - return false; - //placeholder...use only lower left corner vertex - liqHeight = /* iCorner.z + */ iHeight[tx + ty*(iTilesX+1)]; - return true; - } - - uint32 WmoLiquid::GetFileSize() - { - return 2 * sizeof(uint32) + - sizeof(Vector3) + - (iTilesX + 1)*(iTilesY + 1) * sizeof(float) + - iTilesX * iTilesY; - } - - bool WmoLiquid::writeToFile(FILE *wf) - { - bool result = true; - if (result && fwrite(&iTilesX, sizeof(uint32), 1, wf) != 1) result = false; - if (result && fwrite(&iTilesY, sizeof(uint32), 1, wf) != 1) result = false; - if (result && fwrite(&iCorner, sizeof(Vector3), 1, wf) != 1) result = false; - if (result && fwrite(&iType, sizeof(uint32), 1, wf) != 1) result = false; - uint32 size = (iTilesX + 1)*(iTilesY + 1); - if (result && fwrite(iHeight, sizeof(float), size, wf) != size) result = false; - size = iTilesX*iTilesY; - if (result && fwrite(iFlags, sizeof(uint8), size, wf) != size) result = false; - return result; - } - - bool WmoLiquid::readFromFile(FILE *rf, WmoLiquid *&out) - { - bool result = true; - WmoLiquid *liquid = new WmoLiquid(); - if (result && fread(&liquid->iTilesX, sizeof(uint32), 1, rf) != 1) result = false; - if (result && fread(&liquid->iTilesY, sizeof(uint32), 1, rf) != 1) result = false; - if (result && fread(&liquid->iCorner, sizeof(Vector3), 1, rf) != 1) result = false; - if (result && fread(&liquid->iType, sizeof(uint32), 1, rf) != 1) result = false; - uint32 size = (liquid->iTilesX + 1)*(liquid->iTilesY + 1); - liquid->iHeight = new float[size]; - if (result && fread(liquid->iHeight, sizeof(float), size, rf) != size) result = false; - size = liquid->iTilesX * liquid->iTilesY; - liquid->iFlags = new uint8[size]; - if (result && fread(liquid->iFlags, sizeof(uint8), size, rf) != size) result = false; - if (!result) - delete liquid; - out = liquid; - return result; - } - - // ===================== GroupModel ================================== - - GroupModel::GroupModel(const GroupModel &other): - iBound(other.iBound), iMogpFlags(other.iMogpFlags), iGroupWMOID(other.iGroupWMOID), - vertices(other.vertices), triangles(other.triangles), meshTree(other.meshTree), iLiquid(0) - { - if (other.iLiquid) - iLiquid = new WmoLiquid(*other.iLiquid); - } - - void GroupModel::setMeshData(std::vector &vert, std::vector &tri) - { - vertices.swap(vert); - triangles.swap(tri); - TriBoundFunc bFunc(vertices); - meshTree.build(triangles, bFunc); - } - - bool GroupModel::writeToFile(FILE *wf) - { - bool result = true; - uint32 chunkSize, count; - - if (result && fwrite(&iBound, sizeof(G3D::AABox), 1, wf) != 1) result = false; - if (result && fwrite(&iMogpFlags, sizeof(uint32), 1, wf) != 1) result = false; - if (result && fwrite(&iGroupWMOID, sizeof(uint32), 1, wf) != 1) result = false; - - // write vertices - if (result && fwrite("VERT", 1, 4, wf) != 4) result = false; - count = vertices.size(); - chunkSize = sizeof(uint32)+ sizeof(Vector3)*count; - if (result && fwrite(&chunkSize, sizeof(uint32), 1, wf) != 1) result = false; - if (result && fwrite(&count, sizeof(uint32), 1, wf) != 1) result = false; - if (!count) // models without (collision) geometry end here, unsure if they are useful - return result; - if (result && fwrite(&vertices[0], sizeof(Vector3), count, wf) != count) result = false; - - // write triangle mesh - if (result && fwrite("TRIM", 1, 4, wf) != 4) result = false; - count = triangles.size(); - chunkSize = sizeof(uint32)+ sizeof(MeshTriangle)*count; - if (result && fwrite(&chunkSize, sizeof(uint32), 1, wf) != 1) result = false; - if (result && fwrite(&count, sizeof(uint32), 1, wf) != 1) result = false; - if (result && fwrite(&triangles[0], sizeof(MeshTriangle), count, wf) != count) result = false; - - // write mesh BIH - if (result && fwrite("MBIH", 1, 4, wf) != 4) result = false; - if (result) result = meshTree.writeToFile(wf); - - // write liquid data - if (result && fwrite("LIQU", 1, 4, wf) != 4) result = false; - if (!iLiquid) - { - chunkSize = 0; - if (result && fwrite(&chunkSize, sizeof(uint32), 1, wf) != 1) result = false; - return result; - } - chunkSize = iLiquid->GetFileSize(); - if (result && fwrite(&chunkSize, sizeof(uint32), 1, wf) != 1) result = false; - if (result) result = iLiquid->writeToFile(wf); - - return result; - } - - bool GroupModel::readFromFile(FILE *rf) - { - char chunk[8]; - bool result = true; - uint32 chunkSize, count; - triangles.clear(); - vertices.clear(); - delete iLiquid; - iLiquid = 0; - - if (result && fread(&iBound, sizeof(G3D::AABox), 1, rf) != 1) result = false; - if (result && fread(&iMogpFlags, sizeof(uint32), 1, rf) != 1) result = false; - if (result && fread(&iGroupWMOID, sizeof(uint32), 1, rf) != 1) result = false; - - // read vertices - if (result && !readChunk(rf, chunk, "VERT", 4)) result = false; - if (result && fread(&chunkSize, sizeof(uint32), 1, rf) != 1) result = false; - if (result && fread(&count, sizeof(uint32), 1, rf) != 1) result = false; - if (!count) // models without (collision) geometry end here, unsure if they are useful - return result; - if (result) vertices.resize(count); - if (result && fread(&vertices[0], sizeof(Vector3), count, rf) != count) result = false; - - // read triangle mesh - if (result && !readChunk(rf, chunk, "TRIM", 4)) result = false; - if (result && fread(&chunkSize, sizeof(uint32), 1, rf) != 1) result = false; - if (result && fread(&count, sizeof(uint32), 1, rf) != 1) result = false; - if (result) triangles.resize(count); - if (result && fread(&triangles[0], sizeof(MeshTriangle), count, rf) != count) result = false; - - // read mesh BIH - if (result && !readChunk(rf, chunk, "MBIH", 4)) result = false; - if (result) result = meshTree.readFromFile(rf); - - // write liquid data - if (result && !readChunk(rf, chunk, "LIQU", 4)) result = false; - if (result && fread(&chunkSize, sizeof(uint32), 1, rf) != 1) result = false; - if (result && chunkSize > 0) - result = WmoLiquid::readFromFile(rf, iLiquid); - return result; - } - - struct GModelRayCallback - { - GModelRayCallback(const std::vector &tris, const std::vector &vert): - vertices(vert.begin()), triangles(tris.begin()), hit(false) {} - bool operator()(const G3D::Ray& ray, uint32 entry, float& distance, bool pStopAtFirstHit) - { - bool result = IntersectTriangle(triangles[entry], vertices, ray, distance); - if (result) hit=true; - return hit; - } - std::vector::const_iterator vertices; - std::vector::const_iterator triangles; - bool hit; - }; - - bool GroupModel::IntersectRay(const G3D::Ray &ray, float &distance, bool stopAtFirstHit) const - { - if (!triangles.size()) - return false; - GModelRayCallback callback(triangles, vertices); - meshTree.intersectRay(ray, callback, distance, stopAtFirstHit); - return callback.hit; - } - - bool GroupModel::IsInsideObject(const Vector3 &pos, const Vector3 &down, float &z_dist) const - { - if (!triangles.size() || !iBound.contains(pos)) - return false; - GModelRayCallback callback(triangles, vertices); - Vector3 rPos = pos - 0.1f * down; - float dist = G3D::inf(); - G3D::Ray ray(rPos, down); - bool hit = IntersectRay(ray, dist, false); - if (hit) - z_dist = dist - 0.1f; - return hit; - } - - bool GroupModel::GetLiquidLevel(const Vector3 &pos, float &liqHeight) const - { - if (iLiquid) - return iLiquid->GetLiquidHeight(pos, liqHeight); - return false; - } - - uint32 GroupModel::GetLiquidType() const - { - // convert to type mask, matching MAP_LIQUID_TYPE_* defines in Map.h - if (iLiquid) - return (1 << iLiquid->GetType()); - return 0; - } - - // ===================== WorldModel ================================== - - void WorldModel::setGroupModels(std::vector &models) - { - groupModels.swap(models); - groupTree.build(groupModels, BoundsTrait::getBounds, 1); - } - - struct WModelRayCallBack - { - WModelRayCallBack(const std::vector &mod): models(mod.begin()), hit(false) {} - bool operator()(const G3D::Ray& ray, uint32 entry, float& distance, bool pStopAtFirstHit) - { - bool result = models[entry].IntersectRay(ray, distance, pStopAtFirstHit); - if (result) hit=true; - return hit; - } - std::vector::const_iterator models; - bool hit; - }; - - bool WorldModel::IntersectRay(const G3D::Ray &ray, float &distance, bool stopAtFirstHit) const - { - // small M2 workaround, maybe better make separate class with virtual intersection funcs - // in any case, there's no need to use a bound tree if we only have one submodel - if (groupModels.size() == 1) - return groupModels[0].IntersectRay(ray, distance, stopAtFirstHit); - - WModelRayCallBack isc(groupModels); - groupTree.intersectRay(ray, isc, distance, stopAtFirstHit); - return isc.hit; - } - - class WModelAreaCallback { - public: - WModelAreaCallback(const std::vector &vals, const Vector3 &down): - prims(vals.begin()), hit(vals.end()), minVol(G3D::inf()), zDist(G3D::inf()), zVec(down) {} - std::vector::const_iterator prims; - std::vector::const_iterator hit; - float minVol; - float zDist; - Vector3 zVec; - void operator()(const Vector3& point, uint32 entry) - { - float group_Z; - //float pVol = prims[entry].GetBound().volume(); - //if(pVol < minVol) - //{ - /* if (prims[entry].iBound.contains(point)) */ - if (prims[entry].IsInsideObject(point, zVec, group_Z)) - { - //minVol = pVol; - //hit = prims + entry; - if (group_Z < zDist) - { - zDist = group_Z; - hit = prims + entry; - } -#ifdef VMAP_DEBUG - const GroupModel &gm = prims[entry]; - printf("%10u %8X %7.3f,%7.3f,%7.3f | %7.3f,%7.3f,%7.3f | z=%f, p_z=%f\n", gm.GetWmoID(), gm.GetMogpFlags(), - gm.GetBound().low().x, gm.GetBound().low().y, gm.GetBound().low().z, - gm.GetBound().high().x, gm.GetBound().high().y, gm.GetBound().high().z, group_Z, point.z); -#endif - } - //} - //std::cout << "trying to intersect '" << prims[entry].name << "'\n"; - } - }; - - bool WorldModel::IntersectPoint(const G3D::Vector3 &p, const G3D::Vector3 &down, float &dist, AreaInfo &info) const - { - if (!groupModels.size()) - return false; - WModelAreaCallback callback(groupModels, down); - groupTree.intersectPoint(p, callback); - if (callback.hit != groupModels.end()) - { - info.rootId = RootWMOID; - info.groupId = callback.hit->GetWmoID(); - info.flags = callback.hit->GetMogpFlags(); - info.result = true; - dist = callback.zDist; - return true; - } - return false; - } - - bool WorldModel::GetLocationInfo(const G3D::Vector3 &p, const G3D::Vector3 &down, float &dist, LocationInfo &info) const - { - if (!groupModels.size()) - return false; - WModelAreaCallback callback(groupModels, down); - groupTree.intersectPoint(p, callback); - if (callback.hit != groupModels.end()) - { - info.hitModel = &(*callback.hit); - dist = callback.zDist; - return true; - } - return false; - } - - bool WorldModel::writeFile(const std::string &filename) - { - FILE *wf = fopen(filename.c_str(), "wb"); - if (!wf) - return false; - - bool result = true; - uint32 chunkSize, count; - result = fwrite(VMAP_MAGIC,1,8,wf) == 8; - if (result && fwrite("WMOD", 1, 4, wf) != 4) result = false; - chunkSize = sizeof(uint32) + sizeof(uint32); - if (result && fwrite(&chunkSize, sizeof(uint32), 1, wf) != 1) result = false; - if (result && fwrite(&RootWMOID, sizeof(uint32), 1, wf) != 1) result = false; - - // write group models - count=groupModels.size(); - if (count) - { - if (result && fwrite("GMOD", 1, 4, wf) != 4) result = false; - //chunkSize = sizeof(uint32)+ sizeof(GroupModel)*count; - //if (result && fwrite(&chunkSize, sizeof(uint32), 1, wf) != 1) result = false; - if (result && fwrite(&count, sizeof(uint32), 1, wf) != 1) result = false; - for (uint32 i=0; i - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef _WORLDMODEL_H -#define _WORLDMODEL_H - -#include -#include -#include -#include -#include "BIH.h" - -#include "Platform/Define.h" - -namespace VMAP -{ - class TreeNode; - struct AreaInfo; - struct LocationInfo; - - class MeshTriangle - { - public: - MeshTriangle(){}; - MeshTriangle(uint32 na, uint32 nb, uint32 nc): idx0(na), idx1(nb), idx2(nc) {}; - - uint32 idx0; - uint32 idx1; - uint32 idx2; - }; - - class WmoLiquid - { - public: - WmoLiquid(uint32 width, uint32 height, const Vector3 &corner, uint32 type); - WmoLiquid(const WmoLiquid &other); - ~WmoLiquid(); - WmoLiquid& operator=(const WmoLiquid &other); - bool GetLiquidHeight(const Vector3 &pos, float &liqHeight) const; - uint32 GetType() const { return iType; } - float *GetHeightStorage() { return iHeight; } - uint8 *GetFlagsStorage() { return iFlags; } - uint32 GetFileSize(); - bool writeToFile(FILE *wf); - static bool readFromFile(FILE *rf, WmoLiquid *&liquid); - private: - WmoLiquid(): iHeight(0), iFlags(0) {}; - uint32 iTilesX; //!< number of tiles in x direction, each - uint32 iTilesY; - Vector3 iCorner; //!< the lower corner - uint32 iType; //!< liquid type - float *iHeight; //!< (tilesX + 1)*(tilesY + 1) height values - uint8 *iFlags; //!< info if liquid tile is used - }; - - /*! holding additional info for WMO group files */ - class GroupModel - { - public: - GroupModel(): iLiquid(0) {} - GroupModel(const GroupModel &other); - GroupModel(uint32 mogpFlags, uint32 groupWMOID, const AABox &bound): - iBound(bound), iMogpFlags(mogpFlags), iGroupWMOID(groupWMOID), iLiquid(0) {} - ~GroupModel() { delete iLiquid; } - - //! pass mesh data to object and create BIH. Passed vectors get get swapped with old geometry! - void setMeshData(std::vector &vert, std::vector &tri); - void setLiquidData(WmoLiquid *liquid) { iLiquid = liquid; } - bool IntersectRay(const G3D::Ray &ray, float &distance, bool stopAtFirstHit) const; - bool IsInsideObject(const Vector3 &pos, const Vector3 &down, float &z_dist) const; - bool GetLiquidLevel(const Vector3 &pos, float &liqHeight) const; - uint32 GetLiquidType() const; - bool writeToFile(FILE *wf); - bool readFromFile(FILE *rf); - const G3D::AABox& GetBound() const { return iBound; } - uint32 GetMogpFlags() const { return iMogpFlags; } - uint32 GetWmoID() const { return iGroupWMOID; } - protected: - G3D::AABox iBound; - uint32 iMogpFlags;// 0x8 outdor; 0x2000 indoor - uint32 iGroupWMOID; - std::vector vertices; - std::vector triangles; - BIH meshTree; - WmoLiquid *iLiquid; - }; - /*! Holds a model (converted M2 or WMO) in its original coordinate space */ - class WorldModel - { - public: - WorldModel(): RootWMOID(0) {} - - //! pass group models to WorldModel and create BIH. Passed vector is swapped with old geometry! - void setGroupModels(std::vector &models); - void setRootWmoID(uint32 id) { RootWMOID = id; } - bool IntersectRay(const G3D::Ray &ray, float &distance, bool stopAtFirstHit) const; - bool IntersectPoint(const G3D::Vector3 &p, const G3D::Vector3 &down, float &dist, AreaInfo &info) const; - bool GetLocationInfo(const G3D::Vector3 &p, const G3D::Vector3 &down, float &dist, LocationInfo &info) const; - bool writeFile(const std::string &filename); - bool readFile(const std::string &filename); - protected: - uint32 RootWMOID; - std::vector groupModels; - BIH groupTree; - }; -} // namespace VMAP - -#endif // _WORLDMODEL_H -- cgit v1.2.3 From cbaf5587d62459df3ddd0a4312cb549649c30a4a Mon Sep 17 00:00:00 2001 From: Brian Date: Mon, 7 Jun 2010 07:13:35 -0600 Subject: * shared lib builds again under Linux. --HG-- branch : trunk --- dep/include/mersennetwister/MersenneTwister.h | 2 +- dep/include/utf8cpp/utf8/core.h | 2 +- src/server/collision/CMakeLists.txt | 4 ++-- src/server/shared/Configuration/Config.h | 2 +- src/server/shared/Database/Database.h | 2 +- src/server/shared/Debugging/MemoryLeaks.h | 2 +- src/server/shared/Dynamic/UnorderedMap.h | 4 ++-- src/server/shared/Logging/Log.cpp | 2 +- src/server/shared/Policies/CreationPolicy.h | 2 +- src/server/shared/Policies/ObjectLifeTime.h | 2 +- src/server/shared/Policies/ThreadingModel.h | 2 +- src/server/shared/Utilities/ProgressBar.h | 2 +- src/server/shared/Utilities/Timer.h | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-) (limited to 'src') diff --git a/dep/include/mersennetwister/MersenneTwister.h b/dep/include/mersennetwister/MersenneTwister.h index a4a3bbdd415..1cff879643f 100644 --- a/dep/include/mersennetwister/MersenneTwister.h +++ b/dep/include/mersennetwister/MersenneTwister.h @@ -60,7 +60,7 @@ // Not thread safe (unless auto-initialization is avoided and each thread has // its own MTRand object) -#include"Platform/Define.h" +#include"Define.h" #include #include diff --git a/dep/include/utf8cpp/utf8/core.h b/dep/include/utf8cpp/utf8/core.h index 389dd3e8ca5..3b6edf70b96 100644 --- a/dep/include/utf8cpp/utf8/core.h +++ b/dep/include/utf8cpp/utf8/core.h @@ -31,7 +31,7 @@ DEALINGS IN THE SOFTWARE. #include // use Trinity core types -#include "Platform/Define.h" +#include "Define.h" namespace utf8 { diff --git a/src/server/collision/CMakeLists.txt b/src/server/collision/CMakeLists.txt index e30b9a2bf36..e9fa25d8674 100644 --- a/src/server/collision/CMakeLists.txt +++ b/src/server/collision/CMakeLists.txt @@ -2,8 +2,8 @@ ########### next target ############### SET(collision_STAT_SRCS - BIH.h - BIH.cpp + BoundingIntervalHierarchy.h + BoundingIntervalHierarchy.cpp Management/IVMapManager.h Maps/MapTree.cpp Maps/MapTree.h diff --git a/src/server/shared/Configuration/Config.h b/src/server/shared/Configuration/Config.h index ccc76073e46..bfcb324ee62 100644 --- a/src/server/shared/Configuration/Config.h +++ b/src/server/shared/Configuration/Config.h @@ -22,7 +22,7 @@ #define CONFIG_H #include -#include "Platform/Define.h" +#include "Define.h" class DOTCONFDocument; diff --git a/src/server/shared/Database/Database.h b/src/server/shared/Database/Database.h index 4ad5d29c993..f99f7c93c8f 100644 --- a/src/server/shared/Database/Database.h +++ b/src/server/shared/Database/Database.h @@ -22,7 +22,7 @@ #define DATABASE_H #include "Threading.h" -#include "Utilities/UnorderedMap.h" +#include "Dynamic/UnorderedMap.h" #include "Database/SqlDelayThread.h" #include "Policies/Singleton.h" #include "ace/Thread_Mutex.h" diff --git a/src/server/shared/Debugging/MemoryLeaks.h b/src/server/shared/Debugging/MemoryLeaks.h index c8b8fb8e1b1..bc722f241bd 100644 --- a/src/server/shared/Debugging/MemoryLeaks.h +++ b/src/server/shared/Debugging/MemoryLeaks.h @@ -19,7 +19,7 @@ #ifndef TRINITYSERVER_MEMORY_H #define TRINITYSERVER_MEMORY_H -#include "Platform/CompilerDefs.h" +#include "shared/CompilerDefs.h" #if COMPILER == COMPILER_MICROSOFT diff --git a/src/server/shared/Dynamic/UnorderedMap.h b/src/server/shared/Dynamic/UnorderedMap.h index fce5ec82bfc..fa87411258d 100644 --- a/src/server/shared/Dynamic/UnorderedMap.h +++ b/src/server/shared/Dynamic/UnorderedMap.h @@ -21,8 +21,8 @@ #ifndef TRINITY_UNORDERED_MAP_H #define TRINITY_UNORDERED_MAP_H -#include "Platform/CompilerDefs.h" -#include "Platform/Define.h" +#include "CompilerDefs.h" +#include "Define.h" #if COMPILER == COMPILER_INTEL #include diff --git a/src/server/shared/Logging/Log.cpp b/src/server/shared/Logging/Log.cpp index 187b9eaa79b..e701e073d5c 100644 --- a/src/server/shared/Logging/Log.cpp +++ b/src/server/shared/Logging/Log.cpp @@ -21,7 +21,7 @@ #include "Common.h" #include "Log.h" #include "Policies/SingletonImp.h" -#include "Config/ConfigEnv.h" +#include "Configuration/ConfigEnv.h" #include "Util.h" #include diff --git a/src/server/shared/Policies/CreationPolicy.h b/src/server/shared/Policies/CreationPolicy.h index 8552ce7da52..cc38d704e99 100644 --- a/src/server/shared/Policies/CreationPolicy.h +++ b/src/server/shared/Policies/CreationPolicy.h @@ -22,7 +22,7 @@ #define TRINITY_CREATIONPOLICY_H #include -#include "Platform/Define.h" +#include "Define.h" namespace Trinity { diff --git a/src/server/shared/Policies/ObjectLifeTime.h b/src/server/shared/Policies/ObjectLifeTime.h index 61b90b59f6e..205434cb613 100644 --- a/src/server/shared/Policies/ObjectLifeTime.h +++ b/src/server/shared/Policies/ObjectLifeTime.h @@ -22,7 +22,7 @@ #define TRINITY_OBJECTLIFETIME_H #include -#include "Platform/Define.h" +#include "Define.h" typedef void (* Destroyer)(void); diff --git a/src/server/shared/Policies/ThreadingModel.h b/src/server/shared/Policies/ThreadingModel.h index d4c5e9a2333..a792bf1b7d7 100644 --- a/src/server/shared/Policies/ThreadingModel.h +++ b/src/server/shared/Policies/ThreadingModel.h @@ -26,7 +26,7 @@ * */ -#include "Platform/Define.h" +#include "Define.h" namespace Trinity { diff --git a/src/server/shared/Utilities/ProgressBar.h b/src/server/shared/Utilities/ProgressBar.h index e7565590278..cae23254f30 100644 --- a/src/server/shared/Utilities/ProgressBar.h +++ b/src/server/shared/Utilities/ProgressBar.h @@ -20,7 +20,7 @@ #ifndef TRINITYCORE_PROGRESSBAR_H #define TRINITYCORE_PROGRESSBAR_H -#include "Platform/Define.h" +#include "Define.h" class barGoLink { diff --git a/src/server/shared/Utilities/Timer.h b/src/server/shared/Utilities/Timer.h index 3e0a369b655..ed78c1d42e7 100644 --- a/src/server/shared/Utilities/Timer.h +++ b/src/server/shared/Utilities/Timer.h @@ -21,7 +21,7 @@ #ifndef TRINITY_TIMER_H #define TRINITY_TIMER_H -#include "Platform/CompilerDefs.h" +#include "shared/CompilerDefs.h" #if PLATFORM == PLATFORM_WINDOWS # include -- cgit v1.2.3 From 36584926e6684c0df19562e3a438f45ff38dee10 Mon Sep 17 00:00:00 2001 From: Brian Date: Mon, 7 Jun 2010 07:43:20 -0600 Subject: * Auth lib builds again. --HG-- branch : trunk --- src/server/shared/Common.h | 6 +++--- src/server/shared/Cryptography/ARC4.cpp | 2 +- src/server/shared/Cryptography/Authentication/AuthCrypt.cpp | 6 +++--- src/server/shared/Cryptography/Authentication/AuthCrypt.h | 2 +- src/server/shared/Cryptography/BigNumber.cpp | 2 +- src/server/shared/Cryptography/HMACSHA1.cpp | 2 +- src/server/shared/Cryptography/MD5.c | 2 +- src/server/shared/Cryptography/SHA1.cpp | 4 ++-- src/server/shared/Database/Database.h | 2 +- src/server/shared/Database/DatabaseEnv.h | 4 ++-- src/server/shared/Database/SqlDelayThread.h | 2 +- src/server/shared/Threading/LockedQueue.h | 2 +- 12 files changed, 18 insertions(+), 18 deletions(-) (limited to 'src') diff --git a/src/server/shared/Common.h b/src/server/shared/Common.h index b4ba254fbeb..0922ac254dc 100644 --- a/src/server/shared/Common.h +++ b/src/server/shared/Common.h @@ -76,7 +76,7 @@ #endif // __SHOW_STUPID_WARNINGS__ #endif // __GNUC__ -#include "UnorderedMap.h" +#include "Dynamic/UnorderedMap.h" #include #include #include @@ -100,8 +100,8 @@ #include #include -#include "LockedQueue.h" -#include "Threading.h" +#include "Threading/LockedQueue.h" +#include "Threading/Threading.h" #include #include diff --git a/src/server/shared/Cryptography/ARC4.cpp b/src/server/shared/Cryptography/ARC4.cpp index 80cad4991e9..8427640ba2a 100644 --- a/src/server/shared/Cryptography/ARC4.cpp +++ b/src/server/shared/Cryptography/ARC4.cpp @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "Auth/SARC4.h" +#include "ARC4.h" #include SARC4::SARC4(uint8 len) diff --git a/src/server/shared/Cryptography/Authentication/AuthCrypt.cpp b/src/server/shared/Cryptography/Authentication/AuthCrypt.cpp index b34b922b16a..2dfcebfa932 100644 --- a/src/server/shared/Cryptography/Authentication/AuthCrypt.cpp +++ b/src/server/shared/Cryptography/Authentication/AuthCrypt.cpp @@ -19,9 +19,9 @@ */ #include "AuthCrypt.h" -#include "Hmac.h" -#include "Log.h" -#include "BigNumber.h" +#include "Cryptography/HMACSHA1.h" +#include "Logging/Log.h" +#include "Cryptography/BigNumber.h" AuthCrypt::AuthCrypt() : _clientDecrypt(SHA_DIGEST_LENGTH), _serverEncrypt(SHA_DIGEST_LENGTH) { diff --git a/src/server/shared/Cryptography/Authentication/AuthCrypt.h b/src/server/shared/Cryptography/Authentication/AuthCrypt.h index 6695dc580cc..5a2430611a4 100644 --- a/src/server/shared/Cryptography/Authentication/AuthCrypt.h +++ b/src/server/shared/Cryptography/Authentication/AuthCrypt.h @@ -22,7 +22,7 @@ #define _AUTHCRYPT_H #include -#include "SARC4.h" +#include "Cryptography/ARC4.h" class BigNumber; diff --git a/src/server/shared/Cryptography/BigNumber.cpp b/src/server/shared/Cryptography/BigNumber.cpp index 64e9ef21ccc..c05258c73a0 100644 --- a/src/server/shared/Cryptography/BigNumber.cpp +++ b/src/server/shared/Cryptography/BigNumber.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "Auth/BigNumber.h" +#include "Cryptography/BigNumber.h" #include #include diff --git a/src/server/shared/Cryptography/HMACSHA1.cpp b/src/server/shared/Cryptography/HMACSHA1.cpp index a30f1b2d1e2..aed8940372b 100644 --- a/src/server/shared/Cryptography/HMACSHA1.cpp +++ b/src/server/shared/Cryptography/HMACSHA1.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "Auth/Hmac.h" +#include "HMACSHA1.h" #include "BigNumber.h" HmacHash::HmacHash(uint32 len, uint8 *seed) diff --git a/src/server/shared/Cryptography/MD5.c b/src/server/shared/Cryptography/MD5.c index 3e9735e2dbb..45897503455 100644 --- a/src/server/shared/Cryptography/MD5.c +++ b/src/server/shared/Cryptography/MD5.c @@ -51,7 +51,7 @@ self-checking. 1999-05-03 lpd Original version. */ -#include "md5.h" +#include "MD5.h" #include #undef BYTE_ORDER /* 1 = big-endian, -1 = little-endian, 0 = unknown */ diff --git a/src/server/shared/Cryptography/SHA1.cpp b/src/server/shared/Cryptography/SHA1.cpp index b63deb2c5f3..b50f72af4d3 100644 --- a/src/server/shared/Cryptography/SHA1.cpp +++ b/src/server/shared/Cryptography/SHA1.cpp @@ -18,8 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "Auth/Sha1.h" -#include "Auth/BigNumber.h" +#include "SHA1.h" +#include "BigNumber.h" #include Sha1Hash::Sha1Hash() diff --git a/src/server/shared/Database/Database.h b/src/server/shared/Database/Database.h index f99f7c93c8f..1a516bdc3d7 100644 --- a/src/server/shared/Database/Database.h +++ b/src/server/shared/Database/Database.h @@ -21,7 +21,7 @@ #ifndef DATABASE_H #define DATABASE_H -#include "Threading.h" +#include "Threading/Threading.h" #include "Dynamic/UnorderedMap.h" #include "Database/SqlDelayThread.h" #include "Policies/Singleton.h" diff --git a/src/server/shared/Database/DatabaseEnv.h b/src/server/shared/Database/DatabaseEnv.h index 69236b076e9..15c1b1c599e 100644 --- a/src/server/shared/Database/DatabaseEnv.h +++ b/src/server/shared/Database/DatabaseEnv.h @@ -22,8 +22,8 @@ #define DATABASEENV_H #include "Common.h" -#include "Log.h" -#include "Errors.h" +#include "Logging/Log.h" +#include "Debugging/Errors.h" #include "Database/Field.h" #include "Database/QueryResult.h" diff --git a/src/server/shared/Database/SqlDelayThread.h b/src/server/shared/Database/SqlDelayThread.h index d603813c8fa..4ef9c67aa5b 100644 --- a/src/server/shared/Database/SqlDelayThread.h +++ b/src/server/shared/Database/SqlDelayThread.h @@ -23,7 +23,7 @@ #include "ace/Thread_Mutex.h" #include "ace/Activation_Queue.h" -#include "Threading.h" +#include "Threading/Threading.h" class Database; class SqlOperation; diff --git a/src/server/shared/Threading/LockedQueue.h b/src/server/shared/Threading/LockedQueue.h index 9f8afae6c14..ff6056350f3 100644 --- a/src/server/shared/Threading/LockedQueue.h +++ b/src/server/shared/Threading/LockedQueue.h @@ -23,7 +23,7 @@ #include #include #include -#include "Errors.h" +#include "Debugging/Errors.h" namespace ACE_Based { -- cgit v1.2.3 From 12dc250bf06d2eccc0678a5eb2f5a881fec08744 Mon Sep 17 00:00:00 2001 From: Brian Date: Mon, 7 Jun 2010 07:58:31 -0600 Subject: * Lib trinitydatabase builds again --HG-- branch : trunk --- src/server/shared/DataStores/DBCFileLoader.h | 2 +- src/server/shared/Database/Database.cpp | 12 ++++++------ src/server/shared/Database/SQLStorageImpl.h | 6 +++--- src/server/shared/Database/SqlOperations.h | 4 ++-- src/server/shared/Utilities/ByteConverter.h | 2 +- src/server/shared/Utilities/Timer.h | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) (limited to 'src') diff --git a/src/server/shared/DataStores/DBCFileLoader.h b/src/server/shared/DataStores/DBCFileLoader.h index a97ab4d60fa..f59ad038ce0 100644 --- a/src/server/shared/DataStores/DBCFileLoader.h +++ b/src/server/shared/DataStores/DBCFileLoader.h @@ -18,7 +18,7 @@ #ifndef DBC_FILE_LOADER_H #define DBC_FILE_LOADER_H -#include "Platform/Define.h" +#include "Define.h" #include "Utilities/ByteConverter.h" #include diff --git a/src/server/shared/Database/Database.cpp b/src/server/shared/Database/Database.cpp index 7646a451eb4..91275716bf8 100644 --- a/src/server/shared/Database/Database.cpp +++ b/src/server/shared/Database/Database.cpp @@ -19,18 +19,18 @@ */ #include "DatabaseEnv.h" -#include "Config/ConfigEnv.h" +#include "Configuration/ConfigEnv.h" #include "Common.h" -#include "UpdateFields.h" +#include "Updates/UpdateFields.h" -#include "Util.h" +#include "Utilities/Util.h" #include "Policies/SingletonImp.h" -#include "Platform/Define.h" -#include "Threading.h" +#include "Define.h" +#include "Threading/Threading.h" #include "Database/SqlDelayThread.h" #include "Database/SqlOperations.h" -#include "Timer.h" +#include "Utilities/Timer.h" #include diff --git a/src/server/shared/Database/SQLStorageImpl.h b/src/server/shared/Database/SQLStorageImpl.h index c74be48c34c..b3d06484e2e 100644 --- a/src/server/shared/Database/SQLStorageImpl.h +++ b/src/server/shared/Database/SQLStorageImpl.h @@ -16,9 +16,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "ProgressBar.h" -#include "Log.h" -#include "DBCFileLoader.h" +#include "Utilities/ProgressBar.h" +#include "Logging/Log.h" +#include "DataStores/DBCFileLoader.h" template template diff --git a/src/server/shared/Database/SqlOperations.h b/src/server/shared/Database/SqlOperations.h index f2e09c0c921..eb28a2c0790 100644 --- a/src/server/shared/Database/SqlOperations.h +++ b/src/server/shared/Database/SqlOperations.h @@ -25,9 +25,9 @@ #include "ace/Thread_Mutex.h" #include "ace/Method_Request.h" -#include "LockedQueue.h" +#include "Threading/LockedQueue.h" #include -#include "Utilities/Callback.h" +#include "Threading/Callback.h" #include "QueryResult.h" /// ---- BASE --- diff --git a/src/server/shared/Utilities/ByteConverter.h b/src/server/shared/Utilities/ByteConverter.h index f8b6bd72498..24a89f464b8 100644 --- a/src/server/shared/Utilities/ByteConverter.h +++ b/src/server/shared/Utilities/ByteConverter.h @@ -25,7 +25,7 @@ for cross platform where they have different endians. */ -#include +#include "Define.h" #include namespace ByteConverter diff --git a/src/server/shared/Utilities/Timer.h b/src/server/shared/Utilities/Timer.h index ed78c1d42e7..326df71bf50 100644 --- a/src/server/shared/Utilities/Timer.h +++ b/src/server/shared/Utilities/Timer.h @@ -21,7 +21,7 @@ #ifndef TRINITY_TIMER_H #define TRINITY_TIMER_H -#include "shared/CompilerDefs.h" +#include "CompilerDefs.h" #if PLATFORM == PLATFORM_WINDOWS # include -- cgit v1.2.3 From 2435b4152d056225329772158cc8a9fc7e4b7f11 Mon Sep 17 00:00:00 2001 From: Brian Date: Mon, 7 Jun 2010 09:04:14 -0600 Subject: * Nope still won't build yet --HG-- branch : trunk --- src/server/game/DataStores/DBCStructure.h | 4 ++-- src/server/game/Entities/Object/Object.h | 8 ++++---- src/server/game/Entities/Object/ObjectDefines.h | 2 +- src/server/game/Entities/Object/Updates/UpdateData.h | 2 +- src/server/game/Entities/Unit/Unit.h | 2 +- src/server/game/Globals/ObjectAccessor.h | 8 ++++---- src/server/game/Grids/Cells/Cell.h | 6 +++--- src/server/game/Grids/Grid.h | 6 +++--- src/server/game/Grids/GridDefines.h | 2 +- src/server/game/Grids/GridRefManager.h | 2 +- src/server/game/Grids/GridReference.h | 2 +- src/server/game/Grids/NGrid.h | 8 ++++---- src/server/game/Maps/Map.h | 14 +++++++------- src/server/game/Maps/MapManager.h | 4 ++-- src/server/game/Maps/MapRefManager.h | 2 +- src/server/game/Maps/MapUpdater.h | 2 +- src/server/game/Miscellaneous/SharedDefines.h | 2 +- src/server/game/PrecompiledHeaders/NixCorePCH.h | 4 ++-- src/server/game/Server/Protocol/Opcodes.h | 2 +- src/server/game/Server/WorldSession.h | 8 ++++---- src/server/game/Server/WorldSocket.h | 2 +- src/server/game/World/World.h | 6 +++--- src/server/shared/Dynamic/LinkedReference/RefManager.h | 4 ++-- src/server/shared/Dynamic/LinkedReference/Reference.h | 2 +- src/server/shared/Dynamic/TypeContainer.h | 6 +++--- src/server/shared/Dynamic/TypeContainerFunctions.h | 4 ++-- src/server/shared/Dynamic/TypeContainerVisitor.h | 4 ++-- src/server/shared/Packets/ByteBuffer.h | 4 ++-- 28 files changed, 61 insertions(+), 61 deletions(-) (limited to 'src') diff --git a/src/server/game/DataStores/DBCStructure.h b/src/server/game/DataStores/DBCStructure.h index 0fc0d1251f5..480aceb26e6 100644 --- a/src/server/game/DataStores/DBCStructure.h +++ b/src/server/game/DataStores/DBCStructure.h @@ -22,8 +22,8 @@ #define TRINITY_DBCSTRUCTURE_H #include "DBCEnums.h" -#include "Platform/Define.h" -#include "Util.h" +#include "Define.h" +#include "Utilities/Util.h" #include #include diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h index c5a412c3ab7..edeac0a20ef 100644 --- a/src/server/game/Entities/Object/Object.h +++ b/src/server/game/Entities/Object/Object.h @@ -22,11 +22,11 @@ #define _OBJECT_H #include "Common.h" -#include "UpdateFields.h" -#include "UpdateData.h" -#include "GameSystem/GridReference.h" +#include "Updates/UpdateFields.h" +#include "Updates/UpdateData.h" +#include "Grids/GridReference.h" #include "ObjectDefines.h" -#include "GridDefines.h" +#include "Grids/GridDefines.h" #include "Map.h" #include diff --git a/src/server/game/Entities/Object/ObjectDefines.h b/src/server/game/Entities/Object/ObjectDefines.h index a0e5ac1952d..15ce30d9a81 100644 --- a/src/server/game/Entities/Object/ObjectDefines.h +++ b/src/server/game/Entities/Object/ObjectDefines.h @@ -21,7 +21,7 @@ #ifndef TRINITY_OBJECTDEFINES_H #define TRINITY_OBJECTDEFINES_H -#include "Platform/Define.h" +#include "Define.h" // used for creating values for respawn for example #define MAKE_PAIR64(l, h) uint64(uint32(l) | (uint64(h) << 32)) diff --git a/src/server/game/Entities/Object/Updates/UpdateData.h b/src/server/game/Entities/Object/Updates/UpdateData.h index e560db842f5..eb10696a26e 100644 --- a/src/server/game/Entities/Object/Updates/UpdateData.h +++ b/src/server/game/Entities/Object/Updates/UpdateData.h @@ -21,7 +21,7 @@ #ifndef __UPDATEDATA_H #define __UPDATEDATA_H -#include "ByteBuffer.h" +#include "Packets/ByteBuffer.h" class WorldPacket; enum OBJECT_UPDATE_TYPE diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index a2f4b2cd388..c41a00f2e43 100644 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -23,7 +23,7 @@ #include "Common.h" #include "Object.h" -#include "Opcodes.h" +#include "Server/Protocol/Opcodes.h" #include "SpellAuraDefines.h" #include "UpdateFields.h" #include "SharedDefines.h" diff --git a/src/server/game/Globals/ObjectAccessor.h b/src/server/game/Globals/ObjectAccessor.h index 8e64eb48fa0..1f865229d42 100644 --- a/src/server/game/Globals/ObjectAccessor.h +++ b/src/server/game/Globals/ObjectAccessor.h @@ -21,15 +21,15 @@ #ifndef TRINITY_OBJECTACCESSOR_H #define TRINITY_OBJECTACCESSOR_H -#include "Platform/Define.h" +#include "Define.h" #include "Policies/Singleton.h" #include -#include "Utilities/UnorderedMap.h" +#include "Dynamic/UnorderedMap.h" #include "Policies/ThreadingModel.h" -#include "UpdateData.h" +#include "Updates/UpdateData.h" -#include "GridDefines.h" +#include "Grids/GridDefines.h" #include "Object.h" #include "Player.h" diff --git a/src/server/game/Grids/Cells/Cell.h b/src/server/game/Grids/Cells/Cell.h index 49e0329ace6..657cc403e2a 100644 --- a/src/server/game/Grids/Cells/Cell.h +++ b/src/server/game/Grids/Cells/Cell.h @@ -23,10 +23,10 @@ #include -#include "GameSystem/TypeContainer.h" -#include "GameSystem/TypeContainerVisitor.h" +#include "Dynamic/TypeContainer.h" +#include "Dynamic/TypeContainerVisitor.h" -#include "GridDefines.h" +#include "Grids/GridDefines.h" class Map; class WorldObject; diff --git a/src/server/game/Grids/Grid.h b/src/server/game/Grids/Grid.h index 65bf3c92f9d..0085bc70152 100644 --- a/src/server/game/Grids/Grid.h +++ b/src/server/game/Grids/Grid.h @@ -32,10 +32,10 @@ Grid's perspective, the loader meets its API requirement is suffice. */ -#include "Platform/Define.h" +#include "Define.h" #include "Policies/ThreadingModel.h" -#include "TypeContainer.h" -#include "TypeContainerVisitor.h" +#include "Dynamic/TypeContainer.h" +#include "Dynamic/TypeContainerVisitor.h" // forward declaration template class GridLoader; diff --git a/src/server/game/Grids/GridDefines.h b/src/server/game/Grids/GridDefines.h index 5269d0a094d..e27ebec4a46 100644 --- a/src/server/game/Grids/GridDefines.h +++ b/src/server/game/Grids/GridDefines.h @@ -22,7 +22,7 @@ #define TRINITY_GRIDDEFINES_H #include "Common.h" -#include "GameSystem/NGrid.h" +#include "Grids/NGrid.h" #include // Forward class definitions diff --git a/src/server/game/Grids/GridRefManager.h b/src/server/game/Grids/GridRefManager.h index 79799105fb7..8f3430a0b4a 100644 --- a/src/server/game/Grids/GridRefManager.h +++ b/src/server/game/Grids/GridRefManager.h @@ -21,7 +21,7 @@ #ifndef _GRIDREFMANAGER #define _GRIDREFMANAGER -#include "Utilities/LinkedReference/RefManager.h" +#include "Dynamic/LinkedReference/RefManager.h" template class GridReference; diff --git a/src/server/game/Grids/GridReference.h b/src/server/game/Grids/GridReference.h index d2e3a455895..ac7c8e154b2 100644 --- a/src/server/game/Grids/GridReference.h +++ b/src/server/game/Grids/GridReference.h @@ -21,7 +21,7 @@ #ifndef _GRIDREFERENCE_H #define _GRIDREFERENCE_H -#include "Utilities/LinkedReference/Reference.h" +#include "Dynamic/LinkedReference/Reference.h" template class GridRefManager; diff --git a/src/server/game/Grids/NGrid.h b/src/server/game/Grids/NGrid.h index 3810286e123..1d8967e4d9a 100644 --- a/src/server/game/Grids/NGrid.h +++ b/src/server/game/Grids/NGrid.h @@ -24,10 +24,10 @@ /** NGrid is nothing more than a wrapper of the Grid with an NxN cells */ -#include "GameSystem/Grid.h" -#include "GameSystem/GridReference.h" -#include "Timer.h" -#include "Util.h" +#include "Grids/Grid.h" +#include "Grids/GridReference.h" +#include "Utilities/Timer.h" +#include "Utilities/Util.h" #define DEFAULT_VISIBILITY_NOTIFY_PERIOD 1000 diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h index ceb526b8244..a0e3a2a93f8 100644 --- a/src/server/game/Maps/Map.h +++ b/src/server/game/Maps/Map.h @@ -21,18 +21,18 @@ #ifndef TRINITY_MAP_H #define TRINITY_MAP_H -#include "Platform/Define.h" +#include "Define.h" #include "Policies/ThreadingModel.h" #include "ace/RW_Thread_Mutex.h" #include "ace/Thread_Mutex.h" #include "DBCStructure.h" -#include "GridDefines.h" -#include "Cell.h" -#include "Timer.h" -#include "SharedDefines.h" -#include "GameSystem/GridRefManager.h" -#include "MapRefManager.h" +#include "Grids/GridDefines.h" +#include "Grids/Cells/Cell.h" +#include "Utilities/Timer.h" +#include "Miscellaneous/SharedDefines.h" +#include "Grids/GridRefManager.h" +#include "Maps/MapRefManager.h" #include "mersennetwister/MersenneTwister.h" #include diff --git a/src/server/game/Maps/MapManager.h b/src/server/game/Maps/MapManager.h index d94f9fced0e..891e95d75f9 100644 --- a/src/server/game/Maps/MapManager.h +++ b/src/server/game/Maps/MapManager.h @@ -21,12 +21,12 @@ #ifndef TRINITY_MAPMANAGER_H #define TRINITY_MAPMANAGER_H -#include "Platform/Define.h" +#include "Define.h" #include "Policies/Singleton.h" #include "ace/Thread_Mutex.h" #include "Common.h" #include "Map.h" -#include "GridStates.h" +#include "Grids/GridStates.h" #include "MapUpdater.h" class Transport; diff --git a/src/server/game/Maps/MapRefManager.h b/src/server/game/Maps/MapRefManager.h index 4337aa75fd9..8712d343958 100644 --- a/src/server/game/Maps/MapRefManager.h +++ b/src/server/game/Maps/MapRefManager.h @@ -19,7 +19,7 @@ #ifndef _MAPREFMANAGER #define _MAPREFMANAGER -#include "Utilities/LinkedReference/RefManager.h" +#include "Dynamic/LinkedReference/RefManager.h" class MapReference; diff --git a/src/server/game/Maps/MapUpdater.h b/src/server/game/Maps/MapUpdater.h index f301b15ca2f..48cd8db0c36 100644 --- a/src/server/game/Maps/MapUpdater.h +++ b/src/server/game/Maps/MapUpdater.h @@ -4,7 +4,7 @@ #include #include -#include "DelayExecutor.h" +#include "Threading/DelayExecutor.h" class Map; diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h index 903dd4b09ca..381114c6f38 100644 --- a/src/server/game/Miscellaneous/SharedDefines.h +++ b/src/server/game/Miscellaneous/SharedDefines.h @@ -21,7 +21,7 @@ #ifndef TRINITY_SHAREDDEFINES_H #define TRINITY_SHAREDDEFINES_H -#include "Platform/Define.h" +#include "Define.h" #include // loot modes for creatures and gameobjects, bitmask! diff --git a/src/server/game/PrecompiledHeaders/NixCorePCH.h b/src/server/game/PrecompiledHeaders/NixCorePCH.h index 7252e980e7d..cb42e4138e4 100644 --- a/src/server/game/PrecompiledHeaders/NixCorePCH.h +++ b/src/server/game/PrecompiledHeaders/NixCorePCH.h @@ -1,9 +1,9 @@ //add here most rarely modified headers to speed up debug build compilation -#include "WorldSocket.h" // must be first to make ACE happy with ACE includes in it +#include "Server/WorldSocket.h" // must be first to make ACE happy with ACE includes in it #include "Common.h" #include "MapManager.h" -#include "Log.h" +#include "Logging/Log.h" #include "ObjectAccessor.h" #include "ObjectDefines.h" #include "Database/SQLStorage.h" diff --git a/src/server/game/Server/Protocol/Opcodes.h b/src/server/game/Server/Protocol/Opcodes.h index 4ae6931c3f5..67f2026f1f5 100644 --- a/src/server/game/Server/Protocol/Opcodes.h +++ b/src/server/game/Server/Protocol/Opcodes.h @@ -31,7 +31,7 @@ // if this class definition not complite then VS for x64 release use different size for // struct OpcodeHandler in this header and Opcode.cpp and get totally wrong data from // table opcodeTable in source when Opcode.h included but WorldSession.h not included -#include "WorldSession.h" +#include "Server/WorldSession.h" /// List of Opcodes enum Opcodes diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h index c17f3e3f3e6..d2e8f6cdada 100644 --- a/src/server/game/Server/WorldSession.h +++ b/src/server/game/Server/WorldSession.h @@ -26,10 +26,10 @@ #define __WORLDSESSION_H #include "Common.h" -#include "SharedDefines.h" -#include "AddonMgr.h" -#include "QueryResult.h" -#include "World.h" +#include "Miscellaneous/SharedDefines.h" +#include "Addons/AddonMgr.h" +#include "Database/QueryResult.h" +#include "World/World.h" struct ItemPrototype; struct AuctionEntry; diff --git a/src/server/game/Server/WorldSocket.h b/src/server/game/Server/WorldSocket.h index 70654274215..61158799bec 100644 --- a/src/server/game/Server/WorldSocket.h +++ b/src/server/game/Server/WorldSocket.h @@ -43,7 +43,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "Common.h" -#include "Auth/AuthCrypt.h" +#include "Cryptography/Authentication/AuthCrypt.h" class ACE_Message_Block; class WorldPacket; diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h index 1a95253fa03..dfd13e60d46 100644 --- a/src/server/game/World/World.h +++ b/src/server/game/World/World.h @@ -26,11 +26,11 @@ #define __WORLD_H #include "Common.h" -#include "Timer.h" +#include "Utilities/Timer.h" #include "Policies/Singleton.h" -#include "SharedDefines.h" +#include "Miscellaneous/SharedDefines.h" #include "ace/Atomic_Op.h" -#include "QueryResult.h" +#include "Database/QueryResult.h" #include #include diff --git a/src/server/shared/Dynamic/LinkedReference/RefManager.h b/src/server/shared/Dynamic/LinkedReference/RefManager.h index 7e294b4f5f0..ea79d5e1784 100644 --- a/src/server/shared/Dynamic/LinkedReference/RefManager.h +++ b/src/server/shared/Dynamic/LinkedReference/RefManager.h @@ -22,8 +22,8 @@ #define _REFMANAGER_H //===================================================== -#include "Utilities/LinkedList.h" -#include "Utilities/LinkedReference/Reference.h" +#include "Dynamic/LinkedList.h" +#include "Dynamic/LinkedReference/Reference.h" template class RefManager : public LinkedListHead { diff --git a/src/server/shared/Dynamic/LinkedReference/Reference.h b/src/server/shared/Dynamic/LinkedReference/Reference.h index 4a1545f8f12..8891199a5eb 100644 --- a/src/server/shared/Dynamic/LinkedReference/Reference.h +++ b/src/server/shared/Dynamic/LinkedReference/Reference.h @@ -21,7 +21,7 @@ #ifndef _REFERENCE_H #define _REFERENCE_H -#include "Utilities/LinkedList.h" +#include "Dynamic/LinkedList.h" //===================================================== diff --git a/src/server/shared/Dynamic/TypeContainer.h b/src/server/shared/Dynamic/TypeContainer.h index c2c9b4fcdea..0fa61f5e562 100644 --- a/src/server/shared/Dynamic/TypeContainer.h +++ b/src/server/shared/Dynamic/TypeContainer.h @@ -28,9 +28,9 @@ #include #include -#include "Platform/Define.h" -#include "Utilities/TypeList.h" -#include "GameSystem/GridRefManager.h" +#include "Define.h" +#include "Dynamic/TypeList.h" +#include "Grids/GridRefManager.h" /* * @class ContainerMapList is a mulit-type container for map elements diff --git a/src/server/shared/Dynamic/TypeContainerFunctions.h b/src/server/shared/Dynamic/TypeContainerFunctions.h index edfbb40e659..7ab2151461e 100644 --- a/src/server/shared/Dynamic/TypeContainerFunctions.h +++ b/src/server/shared/Dynamic/TypeContainerFunctions.h @@ -27,8 +27,8 @@ * to access or mutate the container. */ -#include "Platform/Define.h" -#include "Utilities/TypeList.h" +#include "Define.h" +#include "Dynamic/TypeList.h" #include namespace Trinity diff --git a/src/server/shared/Dynamic/TypeContainerVisitor.h b/src/server/shared/Dynamic/TypeContainerVisitor.h index f15075e5afd..6057eb32fc3 100644 --- a/src/server/shared/Dynamic/TypeContainerVisitor.h +++ b/src/server/shared/Dynamic/TypeContainerVisitor.h @@ -27,8 +27,8 @@ * to overload its types as a visit method is called. */ -#include "Platform/Define.h" -#include "TypeContainer.h" +#include "Define.h" +#include "Dynamic/TypeContainer.h" // forward declaration template class TypeContainerVisitor; diff --git a/src/server/shared/Packets/ByteBuffer.h b/src/server/shared/Packets/ByteBuffer.h index ba0240fb58b..98709a5b0e0 100644 --- a/src/server/shared/Packets/ByteBuffer.h +++ b/src/server/shared/Packets/ByteBuffer.h @@ -22,8 +22,8 @@ #define _BYTEBUFFER_H #include "Common.h" -#include "Errors.h" -#include "Log.h" +#include "Debugging/Errors.h" +#include "Logging/Log.h" #include "Utilities/ByteConverter.h" class ByteBufferException -- cgit v1.2.3 From 2e0f8fb6e558088b33bdee83bc5ff20014e983b3 Mon Sep 17 00:00:00 2001 From: Brian Date: Mon, 7 Jun 2010 09:23:19 -0600 Subject: * Nope not yet --HG-- branch : trunk --- src/server/game/BattleGrounds/BattleGround.h | 4 ++-- src/server/game/Combat/HostileRefManager.h | 2 +- src/server/game/Combat/ThreatManager.h | 6 +++--- src/server/game/Entities/Creature/Creature.h | 4 ++-- src/server/game/Entities/Object/Updates/UpdateMask.h | 2 +- src/server/game/Entities/Player/Player.h | 10 +++++----- src/server/game/Entities/Unit/Unit.h | 12 ++++++------ src/server/game/Groups/GroupRefManager.h | 2 +- src/server/game/Groups/GroupReference.h | 2 +- src/server/game/Loot/LootMgr.h | 8 ++++---- src/server/game/Movement/FollowerRefManager.h | 2 +- src/server/game/Movement/FollowerReference.h | 2 +- src/server/game/Movement/MotionMaster.h | 2 +- src/server/game/Quests/QuestDef.h | 2 +- src/server/shared/Utilities/EventProcessor.h | 2 +- 15 files changed, 31 insertions(+), 31 deletions(-) (limited to 'src') diff --git a/src/server/game/BattleGrounds/BattleGround.h b/src/server/game/BattleGrounds/BattleGround.h index 6f46b6f8f6d..36fdb18f1bc 100644 --- a/src/server/game/BattleGrounds/BattleGround.h +++ b/src/server/game/BattleGrounds/BattleGround.h @@ -22,8 +22,8 @@ #define __BATTLEGROUND_H #include "Common.h" -#include "SharedDefines.h" -#include "DBCEnums.h" +#include "Miscellaneous/SharedDefines.h" +#include "DataStores/DBCEnums.h" class Creature; class GameObject; diff --git a/src/server/game/Combat/HostileRefManager.h b/src/server/game/Combat/HostileRefManager.h index 80b676312a1..ce5947ffc64 100644 --- a/src/server/game/Combat/HostileRefManager.h +++ b/src/server/game/Combat/HostileRefManager.h @@ -22,7 +22,7 @@ #define _HOSTILEREFMANAGER #include "Common.h" -#include "Utilities/LinkedReference/RefManager.h" +#include "Dynamic/LinkedReference/RefManager.h" class Unit; class ThreatManager; diff --git a/src/server/game/Combat/ThreatManager.h b/src/server/game/Combat/ThreatManager.h index 723a553e9d7..517f4548121 100644 --- a/src/server/game/Combat/ThreatManager.h +++ b/src/server/game/Combat/ThreatManager.h @@ -22,9 +22,9 @@ #define _THREATMANAGER #include "Common.h" -#include "SharedDefines.h" -#include "Utilities/LinkedReference/Reference.h" -#include "UnitEvents.h" +#include "Miscellaneous/SharedDefines.h" +#include "Dynamic/LinkedReference/Reference.h" +#include "Combat/UnitEvents.h" #include diff --git a/src/server/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h index d2d93d787da..0d4a4b0930e 100644 --- a/src/server/game/Entities/Creature/Creature.h +++ b/src/server/game/Entities/Creature/Creature.h @@ -23,11 +23,11 @@ #include "Common.h" #include "Unit.h" -#include "UpdateMask.h" +#include "Updates/UpdateMask.h" #include "ItemPrototype.h" #include "LootMgr.h" #include "Database/DatabaseEnv.h" -#include "Cell.h" +#include "Grids/Cells/Cell.h" #include diff --git a/src/server/game/Entities/Object/Updates/UpdateMask.h b/src/server/game/Entities/Object/Updates/UpdateMask.h index 527bec42aa7..9db2fcecbcc 100644 --- a/src/server/game/Entities/Object/Updates/UpdateMask.h +++ b/src/server/game/Entities/Object/Updates/UpdateMask.h @@ -22,7 +22,7 @@ #define __UPDATEMASK_H #include "UpdateFields.h" -#include "Errors.h" +#include "Debugging/Errors.h" class UpdateMask { diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index d6de8679323..314b122d346 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -27,11 +27,11 @@ #include "Item.h" #include "Database/DatabaseEnv.h" -#include "NPCHandler.h" -#include "QuestDef.h" -#include "Group.h" -#include "Bag.h" -#include "WorldSession.h" +#include "Server/Protocol/Handlers/NPCHandler.h" +#include "Quests/QuestDef.h" +#include "Groups/Group.h" +#include "Item/Container/Bag.h" +#include "Server/WorldSession.h" #include "Pet.h" #include "MapReference.h" #include "Util.h" // for Tokens typedef diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index c41a00f2e43..dc90411d88b 100644 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -25,12 +25,12 @@ #include "Object.h" #include "Server/Protocol/Opcodes.h" #include "SpellAuraDefines.h" -#include "UpdateFields.h" -#include "SharedDefines.h" -#include "ThreatManager.h" -#include "HostileRefManager.h" -#include "FollowerReference.h" -#include "FollowerRefManager.h" +#include "Updates/UpdateFields.h" +#include "Miscellaneous/SharedDefines.h" +#include "Combat/ThreatManager.h" +#include "Combat/HostileRefManager.h" +#include "Movement/FollowerReference.h" +#include "Movement/FollowerRefManager.h" #include "Utilities/EventProcessor.h" #include "MotionMaster.h" #include "DBCStructure.h" diff --git a/src/server/game/Groups/GroupRefManager.h b/src/server/game/Groups/GroupRefManager.h index 4fdeba2dd8c..f80e8d0989a 100644 --- a/src/server/game/Groups/GroupRefManager.h +++ b/src/server/game/Groups/GroupRefManager.h @@ -21,7 +21,7 @@ #ifndef _GROUPREFMANAGER #define _GROUPREFMANAGER -#include "Utilities/LinkedReference/RefManager.h" +#include "Dynamic/LinkedReference/RefManager.h" class Group; class Player; diff --git a/src/server/game/Groups/GroupReference.h b/src/server/game/Groups/GroupReference.h index 76f54c5230f..530f6dd8f10 100644 --- a/src/server/game/Groups/GroupReference.h +++ b/src/server/game/Groups/GroupReference.h @@ -21,7 +21,7 @@ #ifndef _GROUPREFERENCE_H #define _GROUPREFERENCE_H -#include "Utilities/LinkedReference/Reference.h" +#include "Dynamic/LinkedReference/Reference.h" class Group; class Player; diff --git a/src/server/game/Loot/LootMgr.h b/src/server/game/Loot/LootMgr.h index 65fe3de22e1..55bb35eda6f 100644 --- a/src/server/game/Loot/LootMgr.h +++ b/src/server/game/Loot/LootMgr.h @@ -22,10 +22,10 @@ #define TRINITY_LOOTMGR_H #include "ItemEnchantmentMgr.h" -#include "ByteBuffer.h" -#include "Utilities/LinkedReference/RefManager.h" -#include "SharedDefines.h" -#include "ConditionMgr.h" +#include "Packets/ByteBuffer.h" +#include "Dynamic/LinkedReference/RefManager.h" +#include "Miscellaneous/SharedDefines.h" +#include "Conditions/ConditionMgr.h" #include #include diff --git a/src/server/game/Movement/FollowerRefManager.h b/src/server/game/Movement/FollowerRefManager.h index c2068b36f81..a0364e03db4 100644 --- a/src/server/game/Movement/FollowerRefManager.h +++ b/src/server/game/Movement/FollowerRefManager.h @@ -21,7 +21,7 @@ #ifndef _FOLLOWERREFMANAGER #define _FOLLOWERREFMANAGER -#include "Utilities/LinkedReference/RefManager.h" +#include "Dynamic/LinkedReference/RefManager.h" class Unit; class TargetedMovementGeneratorBase; diff --git a/src/server/game/Movement/FollowerReference.h b/src/server/game/Movement/FollowerReference.h index e468f79f017..db66ec4d022 100644 --- a/src/server/game/Movement/FollowerReference.h +++ b/src/server/game/Movement/FollowerReference.h @@ -21,7 +21,7 @@ #ifndef _FOLLOWERREFERENCE_H #define _FOLLOWERREFERENCE_H -#include "Utilities/LinkedReference/Reference.h" +#include "Dynamic/LinkedReference/Reference.h" class TargetedMovementGeneratorBase; class Unit; diff --git a/src/server/game/Movement/MotionMaster.h b/src/server/game/Movement/MotionMaster.h index c4082ba086a..5bd81cd965c 100644 --- a/src/server/game/Movement/MotionMaster.h +++ b/src/server/game/Movement/MotionMaster.h @@ -23,7 +23,7 @@ #include "Common.h" #include -#include "SharedDefines.h" +#include "Miscellaneous/SharedDefines.h" #include "Object.h" class MovementGenerator; diff --git a/src/server/game/Quests/QuestDef.h b/src/server/game/Quests/QuestDef.h index 20d4ca3d28d..8da1f822b45 100644 --- a/src/server/game/Quests/QuestDef.h +++ b/src/server/game/Quests/QuestDef.h @@ -21,7 +21,7 @@ #ifndef TRINITYCORE_QUEST_H #define TRINITYCORE_QUEST_H -#include "Platform/Define.h" +#include "Define.h" #include "Database/DatabaseEnv.h" #include diff --git a/src/server/shared/Utilities/EventProcessor.h b/src/server/shared/Utilities/EventProcessor.h index 2712967e1b7..421f88b659a 100644 --- a/src/server/shared/Utilities/EventProcessor.h +++ b/src/server/shared/Utilities/EventProcessor.h @@ -21,7 +21,7 @@ #ifndef __EVENTPROCESSOR_H #define __EVENTPROCESSOR_H -#include "Platform/Define.h" +#include "Define.h" #include -- cgit v1.2.3 From 15f8bbe9ca7a41d99de31ff32e2a919538d11066 Mon Sep 17 00:00:00 2001 From: Brian Date: Mon, 7 Jun 2010 12:08:15 -0600 Subject: * More cleanup --HG-- branch : trunk --- src/server/game/AI/CoreAI/GuardAI.cpp | 2 +- src/server/game/AI/CoreAI/GuardAI.h | 2 +- src/server/game/AI/CoreAI/PetAI.cpp | 4 +- src/server/game/AI/CoreAI/PetAI.h | 2 +- src/server/game/AI/CoreAI/ReactorAI.cpp | 6 +- src/server/game/AI/CoreAI/TotemAI.cpp | 6 +- src/server/game/AI/CoreAI/TotemAI.h | 2 +- src/server/game/AI/CoreAI/UnitAI.h | 2 +- src/server/game/AI/CreatureAI.h | 2 +- src/server/game/AI/CreatureAIImpl.h | 2 +- src/server/game/AI/CreatureAIRegistry.cpp | 18 +- src/server/game/AI/CreatureAISelector.cpp | 2 +- src/server/game/AI/EventAI/CreatureEventAI.cpp | 8 +- src/server/game/AI/EventAI/CreatureEventAIMgr.cpp | 4 +- src/server/game/Accounts/AccountMgr.cpp | 4 +- src/server/game/Achievements/AchievementMgr.cpp | 16 +- src/server/game/Addons/AddonMgr.cpp | 6 +- .../AuctionHouse/AuctionHouseBot/AuctionHouseBot.h | 2 +- src/server/game/AuctionHouse/AuctionHouseMgr.cpp | 10 +- src/server/game/AuctionHouse/AuctionHouseMgr.h | 4 +- src/server/game/BattleGrounds/ArenaTeam.cpp | 2 +- src/server/game/BattleGrounds/BattleGround.cpp | 12 +- src/server/game/BattleGrounds/BattleGroundMgr.cpp | 34 +- .../game/BattleGrounds/Zones/BattleGroundAA.cpp | 2 +- .../game/BattleGrounds/Zones/BattleGroundAB.cpp | 6 +- .../game/BattleGrounds/Zones/BattleGroundAV.cpp | 6 +- .../game/BattleGrounds/Zones/BattleGroundBE.cpp | 4 +- .../game/BattleGrounds/Zones/BattleGroundDS.cpp | 4 +- .../game/BattleGrounds/Zones/BattleGroundEY.cpp | 6 +- .../game/BattleGrounds/Zones/BattleGroundEY.h | 2 +- .../game/BattleGrounds/Zones/BattleGroundIC.cpp | 2 +- .../game/BattleGrounds/Zones/BattleGroundNA.cpp | 4 +- .../game/BattleGrounds/Zones/BattleGroundRB.cpp | 2 +- .../game/BattleGrounds/Zones/BattleGroundRL.cpp | 4 +- .../game/BattleGrounds/Zones/BattleGroundRV.cpp | 4 +- .../game/BattleGrounds/Zones/BattleGroundSA.cpp | 4 +- .../game/BattleGrounds/Zones/BattleGroundWS.cpp | 4 +- src/server/game/Chat/Channels/Channel.h | 4 +- src/server/game/Chat/Chat.h | 2 +- src/server/game/Chat/Commands/Debugcmds.cpp | 16 +- src/server/game/Chat/Commands/Level0.cpp | 6 +- src/server/game/DataStores/DBCStores.h | 4 +- src/server/game/DungeonFinding/LFG.h | 2 +- src/server/game/Entities/Corpse/Corpse.h | 2 +- src/server/game/Entities/Creature/GossipDef.h | 2 +- src/server/game/Entities/GameObject/GameObject.h | 2 +- src/server/game/Entities/Player/Player.h | 12 +- src/server/game/Events/GameEventMgr.h | 4 +- src/server/game/Globals/ObjectMgr.h | 12 +- src/server/game/Grids/GridLoader.h | 4 +- src/server/game/Grids/Notifiers/GridNotifiers.h | 8 +- .../game/Grids/Notifiers/GridNotifiersImpl.h | 6 +- src/server/game/Grids/ObjectGridLoader.h | 10 +- src/server/game/Instances/InstanceSaveMgr.cpp | 2 +- src/server/game/Instances/InstanceSaveMgr.h | 4 +- src/server/game/Maps/MapReference.h | 2 +- src/server/game/Movement/DestinationHolder.h | 4 +- src/server/game/Movement/MovementGenerator.h | 2 +- .../MovementGenerators/WaypointMovementGenerator.h | 4 +- src/server/game/PrecompiledHeaders/NixCorePCH.h | 4 +- src/server/game/Reputation/ReputationMgr.h | 8 +- src/server/game/Scripting/ScriptMgr.h | 4 +- src/server/game/Spells/Spell.h | 4 +- src/server/game/Spells/SpellMgr.h | 4 +- src/server/scripts/CMakeLists.txt | 662 ++++++++++----------- src/server/shared/DataStores/DBCStore.h | 2 +- src/server/shared/Dynamic/FactoryHolder.h | 4 +- src/server/shared/Dynamic/ObjectRegistry.h | 4 +- src/server/shared/SystemConfig.h | 2 +- 69 files changed, 509 insertions(+), 509 deletions(-) (limited to 'src') diff --git a/src/server/game/AI/CoreAI/GuardAI.cpp b/src/server/game/AI/CoreAI/GuardAI.cpp index 19d5b5d8354..f4da814e86b 100644 --- a/src/server/game/AI/CoreAI/GuardAI.cpp +++ b/src/server/game/AI/CoreAI/GuardAI.cpp @@ -19,7 +19,7 @@ */ #include "GuardAI.h" -#include "Errors.h" +#include "Debugging/Errors.h" #include "Player.h" #include "ObjectAccessor.h" #include "World.h" diff --git a/src/server/game/AI/CoreAI/GuardAI.h b/src/server/game/AI/CoreAI/GuardAI.h index 73e3692a770..3d884e28906 100644 --- a/src/server/game/AI/CoreAI/GuardAI.h +++ b/src/server/game/AI/CoreAI/GuardAI.h @@ -22,7 +22,7 @@ #define TRINITY_GUARDAI_H #include "CreatureAI.h" -#include "Timer.h" +#include "Utilities/Timer.h" class Creature; diff --git a/src/server/game/AI/CoreAI/PetAI.cpp b/src/server/game/AI/CoreAI/PetAI.cpp index 09ec8fae53f..72f0db20cb5 100644 --- a/src/server/game/AI/CoreAI/PetAI.cpp +++ b/src/server/game/AI/CoreAI/PetAI.cpp @@ -19,7 +19,7 @@ */ #include "PetAI.h" -#include "Errors.h" +#include "Debugging/Errors.h" #include "Pet.h" #include "Player.h" #include "DBCStores.h" @@ -28,7 +28,7 @@ #include "SpellMgr.h" #include "Creature.h" #include "World.h" -#include "Util.h" +#include "Utilities/Util.h" int PetAI::Permissible(const Creature *creature) { diff --git a/src/server/game/AI/CoreAI/PetAI.h b/src/server/game/AI/CoreAI/PetAI.h index f6087a129ae..52568999cd1 100644 --- a/src/server/game/AI/CoreAI/PetAI.h +++ b/src/server/game/AI/CoreAI/PetAI.h @@ -22,7 +22,7 @@ #define TRINITY_PETAI_H #include "CreatureAI.h" -#include "Timer.h" +#include "Utilities/Timer.h" class Creature; class Spell; diff --git a/src/server/game/AI/CoreAI/ReactorAI.cpp b/src/server/game/AI/CoreAI/ReactorAI.cpp index fdca6314747..f5e3739ccbf 100644 --- a/src/server/game/AI/CoreAI/ReactorAI.cpp +++ b/src/server/game/AI/CoreAI/ReactorAI.cpp @@ -18,10 +18,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "ByteBuffer.h" +#include "Packets/ByteBuffer.h" #include "ReactorAI.h" -#include "Errors.h" -#include "Log.h" +#include "Debugging/Errors.h" +#include "Logging/Log.h" #include "ObjectAccessor.h" #include "CreatureAIImpl.h" diff --git a/src/server/game/AI/CoreAI/TotemAI.cpp b/src/server/game/AI/CoreAI/TotemAI.cpp index a6464f189e8..58045153efd 100644 --- a/src/server/game/AI/CoreAI/TotemAI.cpp +++ b/src/server/game/AI/CoreAI/TotemAI.cpp @@ -25,9 +25,9 @@ #include "ObjectAccessor.h" #include "SpellMgr.h" -#include "GridNotifiers.h" -#include "GridNotifiersImpl.h" -#include "CellImpl.h" +#include "Grids/Notifiers/GridNotifiers.h" +#include "Grids/Notifiers/GridNotifiersImpl.h" +#include "Grids/Cells/CellImpl.h" int TotemAI::Permissible(const Creature *creature) diff --git a/src/server/game/AI/CoreAI/TotemAI.h b/src/server/game/AI/CoreAI/TotemAI.h index 34f4dfa9945..63459ace023 100644 --- a/src/server/game/AI/CoreAI/TotemAI.h +++ b/src/server/game/AI/CoreAI/TotemAI.h @@ -22,7 +22,7 @@ #define TRINITY_TOTEMAI_H #include "CreatureAI.h" -#include "Timer.h" +#include "Utilities/Timer.h" class Creature; class Totem; diff --git a/src/server/game/AI/CoreAI/UnitAI.h b/src/server/game/AI/CoreAI/UnitAI.h index 62b7090a2d0..3033f0556db 100644 --- a/src/server/game/AI/CoreAI/UnitAI.h +++ b/src/server/game/AI/CoreAI/UnitAI.h @@ -21,7 +21,7 @@ #ifndef TRINITY_UNITAI_H #define TRINITY_UNITAI_H -#include "Platform/Define.h" +#include "Define.h" #include #include "Unit.h" diff --git a/src/server/game/AI/CreatureAI.h b/src/server/game/AI/CreatureAI.h index c03d3dd09d0..58020c785dd 100644 --- a/src/server/game/AI/CreatureAI.h +++ b/src/server/game/AI/CreatureAI.h @@ -21,7 +21,7 @@ #ifndef TRINITY_CREATUREAI_H #define TRINITY_CREATUREAI_H -#include "UnitAI.h" +#include "AI/CoreAI/UnitAI.h" #include "Common.h" class WorldObject; diff --git a/src/server/game/AI/CreatureAIImpl.h b/src/server/game/AI/CreatureAIImpl.h index d2f96ffcabc..0f05d233891 100644 --- a/src/server/game/AI/CreatureAIImpl.h +++ b/src/server/game/AI/CreatureAIImpl.h @@ -19,7 +19,7 @@ #define CREATUREAIIMPL_H #include "Common.h" -#include "Platform/Define.h" +#include "Define.h" #include "TemporarySummon.h" #include "CreatureAI.h" #include "SpellMgr.h" diff --git a/src/server/game/AI/CreatureAIRegistry.cpp b/src/server/game/AI/CreatureAIRegistry.cpp index 9db30a0a5c4..7b96e7a97d1 100644 --- a/src/server/game/AI/CreatureAIRegistry.cpp +++ b/src/server/game/AI/CreatureAIRegistry.cpp @@ -18,15 +18,15 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "PassiveAI.h" -#include "ReactorAI.h" -#include "CombatAI.h" -#include "GuardAI.h" -#include "PetAI.h" -#include "TotemAI.h" -#include "CreatureEventAI.h" -#include "RandomMovementGenerator.h" -#include "MovementGeneratorImpl.h" +#include "CoreAI/PassiveAI.h" +#include "CoreAI/ReactorAI.h" +#include "CoreAI/CombatAI.h" +#include "CoreAI/GuardAI.h" +#include "CoreAI/PetAI.h" +#include "CoreAI/TotemAI.h" +#include "EventAI/CreatureEventAI.h" +#include "Movement/MovementGenerators/RandomMovementGenerator.h" +#include "Movement/MovementGeneratorImpl.h" #include "CreatureAIRegistry.h" #include "WaypointMovementGenerator.h" #include "CreatureAIFactory.h" diff --git a/src/server/game/AI/CreatureAISelector.cpp b/src/server/game/AI/CreatureAISelector.cpp index d3fd5a8aed9..6985edaaf2b 100644 --- a/src/server/game/AI/CreatureAISelector.cpp +++ b/src/server/game/AI/CreatureAISelector.cpp @@ -20,7 +20,7 @@ #include "Creature.h" #include "CreatureAISelector.h" -#include "PassiveAI.h" +#include "AI/CoreAI/PassiveAI.h" #include "Policies/SingletonImp.h" #include "MovementGenerator.h" #include "Pet.h" diff --git a/src/server/game/AI/EventAI/CreatureEventAI.cpp b/src/server/game/AI/EventAI/CreatureEventAI.cpp index 47c8e9e6ad8..4162a002d99 100644 --- a/src/server/game/AI/EventAI/CreatureEventAI.cpp +++ b/src/server/game/AI/EventAI/CreatureEventAI.cpp @@ -24,11 +24,11 @@ #include "ObjectMgr.h" #include "Spell.h" #include "World.h" -#include "Cell.h" -#include "CellImpl.h" +#include "Grids/Cells/Cell.h" +#include "Grids/Cells/CellImpl.h" #include "GameEventMgr.h" -#include "GridNotifiers.h" -#include "GridNotifiersImpl.h" +#include "Grids/Notifiers/GridNotifiers.h" +#include "Grids/Notifiers/GridNotifiersImpl.h" #include "InstanceData.h" #include "SpellMgr.h" #include "CreatureAIImpl.h" diff --git a/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp b/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp index 83d62ca74dc..f24226ee913 100644 --- a/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp +++ b/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp @@ -22,10 +22,10 @@ #include "CreatureEventAI.h" #include "CreatureEventAIMgr.h" #include "ObjectMgr.h" -#include "ProgressBar.h" +#include "Utilities/ProgressBar.h" #include "Policies/SingletonImp.h" #include "ObjectDefines.h" -#include "GridDefines.h" +#include "Grids/GridDefines.h" #include "ConditionMgr.h" INSTANTIATE_SINGLETON_1(CreatureEventAIMgr); diff --git a/src/server/game/Accounts/AccountMgr.cpp b/src/server/game/Accounts/AccountMgr.cpp index 52906fb5454..8089b4d624d 100644 --- a/src/server/game/Accounts/AccountMgr.cpp +++ b/src/server/game/Accounts/AccountMgr.cpp @@ -24,8 +24,8 @@ #include "AccountMgr.h" #include "ObjectAccessor.h" #include "Player.h" -#include "Util.h" -#include "Auth/Sha1.h" +#include "Utilities/Util.h" +#include "Cryptography/SHA1.h" extern DatabaseType LoginDatabase; diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp index e0a79fc71ed..9f449105005 100644 --- a/src/server/game/Achievements/AchievementMgr.cpp +++ b/src/server/game/Achievements/AchievementMgr.cpp @@ -20,24 +20,24 @@ #include "DBCEnums.h" #include "ObjectMgr.h" #include "World.h" -#include "WorldPacket.h" +#include "Packets/WorldPacket.h" #include "Database/DatabaseEnv.h" #include "Policies/SingletonImp.h" #include "AchievementMgr.h" #include "ArenaTeam.h" -#include "CellImpl.h" -#include "GameEventMgr.h" -#include "GridNotifiersImpl.h" -#include "Guild.h" -#include "Language.h" +#include "Grids/Cells/CellImpl.h" +#include "Events/GameEventMgr.h" +#include "Grids/Notifiers/GridNotifiersImpl.h" +#include "Guilds/Guild.h" +#include "Miscellaneous/Language.h" #include "Player.h" -#include "ProgressBar.h" +#include "Utilities/ProgressBar.h" #include "SpellMgr.h" #include "MapManager.h" #include "BattleGround.h" -#include "BattleGroundAB.h" +#include "BattleGrounds/Zones/BattleGroundAB.h" #include "Map.h" #include "InstanceData.h" diff --git a/src/server/game/Addons/AddonMgr.cpp b/src/server/game/Addons/AddonMgr.cpp index 66e4fbc8765..b87ddd023f7 100644 --- a/src/server/game/Addons/AddonMgr.cpp +++ b/src/server/game/Addons/AddonMgr.cpp @@ -24,9 +24,9 @@ #include "AddonMgr.h" #include "ObjectAccessor.h" #include "Player.h" -#include "Util.h" -#include "Auth/Sha1.h" -#include "ProgressBar.h" +#include "Utilities/Util.h" +#include "Cryptography/SHA1.h" +#include "Utilities/ProgressBar.h" extern DatabaseType LoginDatabase; diff --git a/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.h b/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.h index 208a09aa0b2..08e93fca232 100644 --- a/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.h +++ b/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.h @@ -2,7 +2,7 @@ #define AUCTION_HOUSE_BOT_H #include "World.h" -#include "Config/ConfigEnv.h" +#include "Configuration/ConfigEnv.h" #include "ItemPrototype.h" #define AHB_GREY 0 diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp index ddd44bbefa2..5f00d36ba45 100644 --- a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp +++ b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp @@ -20,8 +20,8 @@ #include "ObjectMgr.h" #include "Player.h" #include "World.h" -#include "WorldPacket.h" -#include "WorldSession.h" +#include "Packets/WorldPacket.h" +#include "Server/WorldSession.h" #include "Database/DatabaseEnv.h" #include "Database/SQLStorage.h" #include "Policies/SingletonImp.h" @@ -30,9 +30,9 @@ #include "AccountMgr.h" #include "AuctionHouseMgr.h" #include "Item.h" -#include "Language.h" -#include "Log.h" -#include "ProgressBar.h" +#include "Miscellaneous/Language.h" +#include "Logging/Log.h" +#include "Utilities/ProgressBar.h" #include INSTANTIATE_SINGLETON_1(AuctionHouseMgr); diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.h b/src/server/game/AuctionHouse/AuctionHouseMgr.h index b92cec986c7..2c29986f87a 100644 --- a/src/server/game/AuctionHouse/AuctionHouseMgr.h +++ b/src/server/game/AuctionHouse/AuctionHouseMgr.h @@ -23,9 +23,9 @@ #include "Policies/Singleton.h" -#include "SharedDefines.h" +#include "Miscellaneous/SharedDefines.h" -#include "AuctionHouseBot.h" +#include "AuctionHouse/AuctionHouseBot/AuctionHouseBot.h" class Item; class Player; diff --git a/src/server/game/BattleGrounds/ArenaTeam.cpp b/src/server/game/BattleGrounds/ArenaTeam.cpp index 4224ff6357a..b5fe5c16dfe 100644 --- a/src/server/game/BattleGrounds/ArenaTeam.cpp +++ b/src/server/game/BattleGrounds/ArenaTeam.cpp @@ -17,7 +17,7 @@ */ #include "ObjectMgr.h" -#include "WorldPacket.h" +#include "Packets/WorldPacket.h" #include "ArenaTeam.h" #include "World.h" diff --git a/src/server/game/BattleGrounds/BattleGround.cpp b/src/server/game/BattleGrounds/BattleGround.cpp index 5bfe2e139b6..ed8ad8b62a8 100644 --- a/src/server/game/BattleGrounds/BattleGround.cpp +++ b/src/server/game/BattleGrounds/BattleGround.cpp @@ -21,21 +21,21 @@ #include "Player.h" #include "ObjectMgr.h" #include "World.h" -#include "WorldPacket.h" +#include "Packets/WorldPacket.h" #include "ArenaTeam.h" #include "BattleGround.h" #include "BattleGroundMgr.h" #include "Creature.h" -#include "Formulas.h" -#include "GridNotifiersImpl.h" +#include "Miscellaneous/Formulas.h" +#include "Grids/Notifiers/GridNotifiersImpl.h" #include "Group.h" -#include "Language.h" +#include "Miscellaneous/Language.h" #include "MapManager.h" #include "Object.h" #include "SpellAuras.h" #include "SpellAuraEffects.h" -#include "Util.h" +#include "Utilities/Util.h" namespace Trinity { @@ -1962,4 +1962,4 @@ void BattleGround::RewardXPAtKill(Player* plr, Player* victim) if (Pet* pet = plr->GetPet()) pet->GivePetXP(xp); } -} \ No newline at end of file +} diff --git a/src/server/game/BattleGrounds/BattleGroundMgr.cpp b/src/server/game/BattleGrounds/BattleGroundMgr.cpp index 3bbe8c3cf31..faf8b517f15 100644 --- a/src/server/game/BattleGrounds/BattleGroundMgr.cpp +++ b/src/server/game/BattleGrounds/BattleGroundMgr.cpp @@ -21,33 +21,33 @@ #include "Common.h" #include "ObjectMgr.h" #include "World.h" -#include "WorldPacket.h" +#include "Packets/WorldPacket.h" #include "Policies/SingletonImp.h" #include "ArenaTeam.h" #include "BattleGroundMgr.h" -#include "BattleGroundAV.h" -#include "BattleGroundAB.h" -#include "BattleGroundEY.h" -#include "BattleGroundWS.h" -#include "BattleGroundNA.h" -#include "BattleGroundBE.h" -#include "BattleGroundAA.h" -#include "BattleGroundRL.h" -#include "BattleGroundSA.h" -#include "BattleGroundDS.h" -#include "BattleGroundRV.h" -#include "BattleGroundIC.h" -#include "BattleGroundRB.h" +#include "Zones/BattleGroundAV.h" +#include "Zones/BattleGroundAB.h" +#include "Zones/BattleGroundEY.h" +#include "Zones/BattleGroundWS.h" +#include "Zones/BattleGroundNA.h" +#include "Zones/BattleGroundBE.h" +#include "Zones/BattleGroundAA.h" +#include "Zones/BattleGroundRL.h" +#include "Zones/BattleGroundSA.h" +#include "Zones/BattleGroundDS.h" +#include "Zones/BattleGroundRV.h" +#include "Zones/BattleGroundIC.h" +#include "Zones/BattleGroundRB.h" #include "Chat.h" #include "Map.h" #include "MapInstanced.h" #include "MapManager.h" #include "Player.h" #include "GameEventMgr.h" -#include "ProgressBar.h" -#include "SharedDefines.h" -#include "Formulas.h" +#include "Utilities/ProgressBar.h" +#include "Miscellaneous/SharedDefines.h" +#include "Miscellaneous/Formulas.h" INSTANTIATE_SINGLETON_1(BattleGroundMgr); diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundAA.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundAA.cpp index 56cf3ebed15..9b2dd152c5e 100644 --- a/src/server/game/BattleGrounds/Zones/BattleGroundAA.cpp +++ b/src/server/game/BattleGrounds/Zones/BattleGroundAA.cpp @@ -20,7 +20,7 @@ #include "BattleGround.h" #include "BattleGroundAA.h" -#include "Language.h" +#include "Miscellaneous/Language.h" #include "Player.h" BattleGroundAA::BattleGroundAA() diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundAB.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundAB.cpp index 38671e85597..549b844cd20 100644 --- a/src/server/game/BattleGrounds/Zones/BattleGroundAB.cpp +++ b/src/server/game/BattleGrounds/Zones/BattleGroundAB.cpp @@ -19,16 +19,16 @@ */ #include "World.h" -#include "WorldPacket.h" +#include "Packets/WorldPacket.h" #include "ObjectMgr.h" #include "BattleGroundMgr.h" #include "BattleGround.h" #include "BattleGroundAB.h" #include "Creature.h" -#include "Language.h" +#include "Miscellaneous/Language.h" #include "Object.h" #include "Player.h" -#include "Util.h" +#include "Utilities/Util.h" // these variables aren't used outside of this file, so declare them only here uint32 BG_AB_HonorScoreTicks[BG_HONOR_MODE_NUM] = { diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundAV.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundAV.cpp index 7f5482cbf16..32334840f51 100644 --- a/src/server/game/BattleGrounds/Zones/BattleGroundAV.cpp +++ b/src/server/game/BattleGrounds/Zones/BattleGroundAV.cpp @@ -19,13 +19,13 @@ */ #include "ObjectMgr.h" -#include "WorldPacket.h" +#include "Packets/WorldPacket.h" #include "BattleGround.h" #include "BattleGroundAV.h" -#include "Formulas.h" +#include "Miscellaneous/Formulas.h" #include "GameObject.h" -#include "Language.h" +#include "Miscellaneous/Language.h" #include "Player.h" #include "SpellAuras.h" diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundBE.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundBE.cpp index d6debe45ae3..e5199115bcd 100644 --- a/src/server/game/BattleGrounds/Zones/BattleGroundBE.cpp +++ b/src/server/game/BattleGrounds/Zones/BattleGroundBE.cpp @@ -20,11 +20,11 @@ #include "BattleGround.h" #include "BattleGroundBE.h" -#include "Language.h" +#include "Miscellaneous/Language.h" #include "Object.h" #include "ObjectMgr.h" #include "Player.h" -#include "WorldPacket.h" +#include "Packets/WorldPacket.h" BattleGroundBE::BattleGroundBE() { diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundDS.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundDS.cpp index 9036ef83f93..8a4ca9fb497 100644 --- a/src/server/game/BattleGrounds/Zones/BattleGroundDS.cpp +++ b/src/server/game/BattleGrounds/Zones/BattleGroundDS.cpp @@ -18,11 +18,11 @@ #include "BattleGround.h" #include "BattleGroundDS.h" -#include "Language.h" +#include "Miscellaneous/Language.h" #include "Player.h" #include "Object.h" #include "ObjectMgr.h" -#include "WorldPacket.h" +#include "Packets/WorldPacket.h" BattleGroundDS::BattleGroundDS() { diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundEY.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundEY.cpp index 20f023e4c2a..a81a54f6b98 100644 --- a/src/server/game/BattleGrounds/Zones/BattleGroundEY.cpp +++ b/src/server/game/BattleGrounds/Zones/BattleGroundEY.cpp @@ -20,15 +20,15 @@ #include "ObjectMgr.h" #include "World.h" -#include "WorldPacket.h" +#include "Packets/WorldPacket.h" #include "BattleGroundMgr.h" #include "BattleGround.h" #include "BattleGroundEY.h" #include "Creature.h" -#include "Language.h" +#include "Miscellaneous/Language.h" #include "Object.h" #include "Player.h" -#include "Util.h" +#include "Utilities/Util.h" // these variables aren't used outside of this file, so declare them only here uint32 BG_EY_HonorScoreTicks[BG_HONOR_MODE_NUM] = { diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundEY.h b/src/server/game/BattleGrounds/Zones/BattleGroundEY.h index 4fe23c4c821..d4bd89552be 100644 --- a/src/server/game/BattleGrounds/Zones/BattleGroundEY.h +++ b/src/server/game/BattleGrounds/Zones/BattleGroundEY.h @@ -21,7 +21,7 @@ #ifndef __BATTLEGROUNDEY_H #define __BATTLEGROUNDEY_H -#include "Language.h" +#include "Miscellaneous/Language.h" class BattleGround; diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundIC.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundIC.cpp index 8dbcc81e5c6..8e759046f47 100644 --- a/src/server/game/BattleGrounds/Zones/BattleGroundIC.cpp +++ b/src/server/game/BattleGrounds/Zones/BattleGroundIC.cpp @@ -19,7 +19,7 @@ #include "Player.h" #include "BattleGround.h" #include "BattleGroundIC.h" -#include "Language.h" +#include "Miscellaneous/Language.h" BattleGroundIC::BattleGroundIC() { diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundNA.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundNA.cpp index 793cf13b3cb..09f8fef44de 100644 --- a/src/server/game/BattleGrounds/Zones/BattleGroundNA.cpp +++ b/src/server/game/BattleGrounds/Zones/BattleGroundNA.cpp @@ -20,11 +20,11 @@ #include "BattleGround.h" #include "BattleGroundNA.h" -#include "Language.h" +#include "Miscellaneous/Language.h" #include "Object.h" #include "ObjectMgr.h" #include "Player.h" -#include "WorldPacket.h" +#include "Packets/WorldPacket.h" BattleGroundNA::BattleGroundNA() { diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundRB.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundRB.cpp index cf22154ed11..2777268a33c 100644 --- a/src/server/game/BattleGrounds/Zones/BattleGroundRB.cpp +++ b/src/server/game/BattleGrounds/Zones/BattleGroundRB.cpp @@ -21,7 +21,7 @@ #include "Player.h" #include "BattleGround.h" #include "BattleGroundRB.h" -#include "Language.h" +#include "Miscellaneous/Language.h" BattleGroundRB::BattleGroundRB() { diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundRL.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundRL.cpp index ef2ec3cfa94..94374ace289 100644 --- a/src/server/game/BattleGrounds/Zones/BattleGroundRL.cpp +++ b/src/server/game/BattleGrounds/Zones/BattleGroundRL.cpp @@ -20,11 +20,11 @@ #include "BattleGround.h" #include "BattleGroundRL.h" -#include "Language.h" +#include "Miscellaneous/Language.h" #include "Object.h" #include "ObjectMgr.h" #include "Player.h" -#include "WorldPacket.h" +#include "Packets/WorldPacket.h" BattleGroundRL::BattleGroundRL() { diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundRV.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundRV.cpp index fcc53dbbcf9..32e578ae5ed 100644 --- a/src/server/game/BattleGrounds/Zones/BattleGroundRV.cpp +++ b/src/server/game/BattleGrounds/Zones/BattleGroundRV.cpp @@ -21,9 +21,9 @@ #include "BattleGround.h" #include "BattleGroundRV.h" #include "ObjectAccessor.h" -#include "Language.h" +#include "Miscellaneous/Language.h" #include "Player.h" -#include "WorldPacket.h" +#include "Packets/WorldPacket.h" #include "GameObject.h" BattleGroundRV::BattleGroundRV() diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundSA.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundSA.cpp index ccde43ce948..f67ad9b3300 100644 --- a/src/server/game/BattleGrounds/Zones/BattleGroundSA.cpp +++ b/src/server/game/BattleGrounds/Zones/BattleGroundSA.cpp @@ -18,11 +18,11 @@ #include "BattleGround.h" #include "BattleGroundSA.h" -#include "Language.h" +#include "Miscellaneous/Language.h" #include "Player.h" #include "GameObject.h" #include "ObjectMgr.h" -#include "WorldPacket.h" +#include "Packets/WorldPacket.h" BattleGroundSA::BattleGroundSA() diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundWS.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundWS.cpp index 71872511274..2eb94ca9958 100644 --- a/src/server/game/BattleGrounds/Zones/BattleGroundWS.cpp +++ b/src/server/game/BattleGrounds/Zones/BattleGroundWS.cpp @@ -22,13 +22,13 @@ #include "BattleGroundWS.h" #include "Creature.h" #include "GameObject.h" -#include "Language.h" +#include "Miscellaneous/Language.h" #include "Object.h" #include "ObjectMgr.h" #include "BattleGroundMgr.h" #include "Player.h" #include "World.h" -#include "WorldPacket.h" +#include "Packets/WorldPacket.h" // these variables aren't used outside of this file, so declare them only here enum BG_WSG_Rewards diff --git a/src/server/game/Chat/Channels/Channel.h b/src/server/game/Chat/Channels/Channel.h index d0b5923e30e..cafa814e1c9 100644 --- a/src/server/game/Chat/Channels/Channel.h +++ b/src/server/game/Chat/Channels/Channel.h @@ -27,9 +27,9 @@ #include "Common.h" -#include "Opcodes.h" +#include "Server/Protocol/Opcodes.h" #include "Player.h" -#include "WorldPacket.h" +#include "Packets/WorldPacket.h" enum ChatNotify { diff --git a/src/server/game/Chat/Chat.h b/src/server/game/Chat/Chat.h index 58e6f6214c8..6aa42995663 100644 --- a/src/server/game/Chat/Chat.h +++ b/src/server/game/Chat/Chat.h @@ -21,7 +21,7 @@ #ifndef TRINITYCORE_CHAT_H #define TRINITYCORE_CHAT_H -#include "SharedDefines.h" +#include "Miscellaneous/SharedDefines.h" class ChatHandler; class WorldSession; diff --git a/src/server/game/Chat/Commands/Debugcmds.cpp b/src/server/game/Chat/Commands/Debugcmds.cpp index ee8c623c3d0..247e67ed135 100644 --- a/src/server/game/Chat/Commands/Debugcmds.cpp +++ b/src/server/game/Chat/Commands/Debugcmds.cpp @@ -20,22 +20,22 @@ #include "Common.h" #include "Database/DatabaseEnv.h" -#include "WorldPacket.h" +#include "Packets/WorldPacket.h" #include "Vehicle.h" #include "Player.h" -#include "Opcodes.h" +#include "Server/Protocol/Opcodes.h" #include "Chat.h" -#include "Log.h" +#include "Logging/Log.h" #include "Unit.h" #include "GossipDef.h" -#include "Language.h" +#include "Miscellaneous/Language.h" #include "BattleGroundMgr.h" #include #include "ObjectMgr.h" -#include "Cell.h" -#include "CellImpl.h" -#include "GridNotifiers.h" -#include "GridNotifiersImpl.h" +#include "Grids/Cells/Cell.h" +#include "Grids/Cells/CellImpl.h" +#include "Grids/Notifiers/GridNotifiers.h" +#include "Grids/Notifiers/GridNotifiersImpl.h" #include "SpellMgr.h" #include "ScriptMgr.h" diff --git a/src/server/game/Chat/Commands/Level0.cpp b/src/server/game/Chat/Commands/Level0.cpp index ed021ac00d4..fd6dc165fc6 100644 --- a/src/server/game/Chat/Commands/Level0.cpp +++ b/src/server/game/Chat/Commands/Level0.cpp @@ -22,14 +22,14 @@ #include "Database/DatabaseEnv.h" #include "World.h" #include "Player.h" -#include "Opcodes.h" +#include "Server/Protocol/Opcodes.h" #include "Chat.h" #include "ObjectAccessor.h" -#include "Language.h" +#include "Miscellaneous/Language.h" #include "AccountMgr.h" #include "SystemConfig.h" #include "revision.h" -#include "Util.h" +#include "Utilities/Util.h" bool ChatHandler::HandleHelpCommand(const char* args) { diff --git a/src/server/game/DataStores/DBCStores.h b/src/server/game/DataStores/DBCStores.h index b14814e07a1..f4404bce447 100644 --- a/src/server/game/DataStores/DBCStores.h +++ b/src/server/game/DataStores/DBCStores.h @@ -20,8 +20,8 @@ #define TRINITY_DBCSTORES_H #include "Common.h" -#include "Database/DBCStore.h" -#include "DBCStructure.h" +#include "DataStores/DBCStore.h" +#include "DataStores/DBCStructure.h" #include diff --git a/src/server/game/DungeonFinding/LFG.h b/src/server/game/DungeonFinding/LFG.h index c1b55443852..a5461029c8d 100644 --- a/src/server/game/DungeonFinding/LFG.h +++ b/src/server/game/DungeonFinding/LFG.h @@ -19,7 +19,7 @@ #ifndef _LFG_H #define _LFG_H -#include "Platform/Define.h" +#include "Define.h" #include "Object.h" enum LfgRoles diff --git a/src/server/game/Entities/Corpse/Corpse.h b/src/server/game/Entities/Corpse/Corpse.h index bab95e99d14..17c8e597d87 100644 --- a/src/server/game/Entities/Corpse/Corpse.h +++ b/src/server/game/Entities/Corpse/Corpse.h @@ -23,7 +23,7 @@ #include "Object.h" #include "Database/DatabaseEnv.h" -#include "GridDefines.h" +#include "Grids/GridDefines.h" #include "LootMgr.h" enum CorpseType diff --git a/src/server/game/Entities/Creature/GossipDef.h b/src/server/game/Entities/Creature/GossipDef.h index ce2049cc23f..42ca4cc4ab3 100644 --- a/src/server/game/Entities/Creature/GossipDef.h +++ b/src/server/game/Entities/Creature/GossipDef.h @@ -23,7 +23,7 @@ #include "Common.h" #include "QuestDef.h" -#include "NPCHandler.h" +#include "Server/Protocol/Handlers/NPCHandler.h" class WorldSession; diff --git a/src/server/game/Entities/GameObject/GameObject.h b/src/server/game/Entities/GameObject/GameObject.h index 2154adf80c0..be760e9bf41 100644 --- a/src/server/game/Entities/GameObject/GameObject.h +++ b/src/server/game/Entities/GameObject/GameObject.h @@ -22,7 +22,7 @@ #define TRINITYCORE_GAMEOBJECT_H #include "Common.h" -#include "SharedDefines.h" +#include "Miscellaneous/SharedDefines.h" #include "Object.h" #include "LootMgr.h" #include "Database/DatabaseEnv.h" diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index 314b122d346..983d10f5e02 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -34,12 +34,12 @@ #include "Server/WorldSession.h" #include "Pet.h" #include "MapReference.h" -#include "Util.h" // for Tokens typedef -#include "AchievementMgr.h" -#include "ReputationMgr.h" -#include "BattleGround.h" -#include "DBCEnums.h" -#include "LFG.h" +#include "Utilities/Util.h" // for Tokens typedef +#include "Achievements/AchievementMgr.h" +#include "Reputation/ReputationMgr.h" +#include "BattleGrounds/BattleGround.h" +#include "DataStores/DBCEnums.h" +#include "DungeonFinding/LFG.h" #include #include diff --git a/src/server/game/Events/GameEventMgr.h b/src/server/game/Events/GameEventMgr.h index 2c3e41f5f20..2ad8fd3de59 100644 --- a/src/server/game/Events/GameEventMgr.h +++ b/src/server/game/Events/GameEventMgr.h @@ -22,8 +22,8 @@ #define TRINITY_GAMEEVENT_MGR_H #include "Common.h" -#include "SharedDefines.h" -#include "Platform/Define.h" +#include "Miscellaneous/SharedDefines.h" +#include "Define.h" #include "Policies/Singleton.h" #define max_ge_check_delay DAY // 1 day in seconds diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h index 79b6ffdd0eb..d8a0f81c698 100644 --- a/src/server/game/Globals/ObjectMgr.h +++ b/src/server/game/Globals/ObjectMgr.h @@ -21,18 +21,18 @@ #ifndef _OBJECTMGR_H #define _OBJECTMGR_H -#include "Log.h" +#include "Logging/Log.h" #include "Object.h" -#include "Bag.h" +#include "Entities/Item/Container/Bag.h" #include "Creature.h" #include "Player.h" -#include "DynamicObject.h" +#include "Entities/DynamicObject/DynamicObject.h" #include "GameObject.h" -#include "Corpse.h" +#include "Entities/Corpse/Corpse.h" #include "QuestDef.h" -#include "Path.h" +#include "Movement/Waypoints/Path.h" #include "ItemPrototype.h" -#include "NPCHandler.h" +#include "Server/Protocol/Handlers/NPCHandler.h" #include "Database/DatabaseEnv.h" #include "Mail.h" #include "Map.h" diff --git a/src/server/game/Grids/GridLoader.h b/src/server/game/Grids/GridLoader.h index 03fa0f5b813..191ace29d34 100644 --- a/src/server/game/Grids/GridLoader.h +++ b/src/server/game/Grids/GridLoader.h @@ -32,9 +32,9 @@ GridLoader manages the grid (both local and remote). */ -#include "Platform/Define.h" +#include "Define.h" #include "Grid.h" -#include "TypeContainerVisitor.h" +#include "Dynamic/TypeContainerVisitor.h" template < diff --git a/src/server/game/Grids/Notifiers/GridNotifiers.h b/src/server/game/Grids/Notifiers/GridNotifiers.h index b0abf0aae79..9cbcb078128 100644 --- a/src/server/game/Grids/Notifiers/GridNotifiers.h +++ b/src/server/game/Grids/Notifiers/GridNotifiers.h @@ -21,13 +21,13 @@ #ifndef TRINITY_GRIDNOTIFIERS_H #define TRINITY_GRIDNOTIFIERS_H -#include "ObjectGridLoader.h" -#include "UpdateData.h" +#include "Grids/ObjectGridLoader.h" +#include "Updates/UpdateData.h" #include -#include "Corpse.h" +#include "Entities/Corpse/Corpse.h" #include "Object.h" -#include "DynamicObject.h" +#include "Entities/DynamicObject/DynamicObject.h" #include "GameObject.h" #include "Player.h" #include "Unit.h" diff --git a/src/server/game/Grids/Notifiers/GridNotifiersImpl.h b/src/server/game/Grids/Notifiers/GridNotifiersImpl.h index 26a9c0bd328..43cb94540c3 100644 --- a/src/server/game/Grids/Notifiers/GridNotifiersImpl.h +++ b/src/server/game/Grids/Notifiers/GridNotifiersImpl.h @@ -22,10 +22,10 @@ #define TRINITY_GRIDNOTIFIERSIMPL_H #include "GridNotifiers.h" -#include "WorldPacket.h" -#include "Corpse.h" +#include "Packets/WorldPacket.h" +#include "Corpse/Corpse.h" #include "Player.h" -#include "UpdateData.h" +#include "Updates/UpdateData.h" #include "CreatureAI.h" #include "SpellAuras.h" diff --git a/src/server/game/Grids/ObjectGridLoader.h b/src/server/game/Grids/ObjectGridLoader.h index e890bf8d482..90e3383fbc8 100644 --- a/src/server/game/Grids/ObjectGridLoader.h +++ b/src/server/game/Grids/ObjectGridLoader.h @@ -21,11 +21,11 @@ #ifndef TRINITY_OBJECTGRIDLOADER_H #define TRINITY_OBJECTGRIDLOADER_H -#include "Utilities/TypeList.h" -#include "Platform/Define.h" -#include "GameSystem/GridLoader.h" -#include "GridDefines.h" -#include "Cell.h" +#include "Dynamic/TypeList.h" +#include "Define.h" +#include "Grids/GridLoader.h" +#include "Grids/GridDefines.h" +#include "Grids/Cells/Cell.h" class ObjectWorldLoader; diff --git a/src/server/game/Instances/InstanceSaveMgr.cpp b/src/server/game/Instances/InstanceSaveMgr.cpp index d67364966d6..2d3ba0d3b75 100644 --- a/src/server/game/Instances/InstanceSaveMgr.cpp +++ b/src/server/game/Instances/InstanceSaveMgr.cpp @@ -31,7 +31,7 @@ #include "MapManager.h" #include "MapInstanced.h" #include "InstanceSaveMgr.h" -#include "Timer.h" +#include "Utilities/Timer.h" #include "GridNotifiersImpl.h" #include "Config/ConfigEnv.h" #include "Transports.h" diff --git a/src/server/game/Instances/InstanceSaveMgr.h b/src/server/game/Instances/InstanceSaveMgr.h index 91cd3d9ebe6..c8f6c756f2c 100644 --- a/src/server/game/Instances/InstanceSaveMgr.h +++ b/src/server/game/Instances/InstanceSaveMgr.h @@ -22,12 +22,12 @@ #ifndef __InstanceSaveMgr_H #define __InstanceSaveMgr_H -#include "Platform/Define.h" +#include "Define.h" #include "Policies/Singleton.h" #include "ace/Thread_Mutex.h" #include #include -#include "Utilities/UnorderedMap.h" +#include "Dynamic/UnorderedMap.h" #include "Database/DatabaseEnv.h" #include "DBCEnums.h" #include "ObjectDefines.h" diff --git a/src/server/game/Maps/MapReference.h b/src/server/game/Maps/MapReference.h index 7cd4fcde76c..c32be406af0 100644 --- a/src/server/game/Maps/MapReference.h +++ b/src/server/game/Maps/MapReference.h @@ -19,7 +19,7 @@ #ifndef _MAPREFERENCE_H #define _MAPREFERENCE_H -#include "Utilities/LinkedReference/Reference.h" +#include "Dynamic/LinkedReference/Reference.h" #include "Map.h" class MapReference : public Reference diff --git a/src/server/game/Movement/DestinationHolder.h b/src/server/game/Movement/DestinationHolder.h index e09a153615c..7adf6f4cb11 100644 --- a/src/server/game/Movement/DestinationHolder.h +++ b/src/server/game/Movement/DestinationHolder.h @@ -21,8 +21,8 @@ #ifndef TRINITY_DESTINATION_HOLDER_H #define TRINITY_DESTINATION_HOLDER_H -#include "Platform/Define.h" -#include "Timer.h" +#include "Define.h" +#include "Utilities/Timer.h" class WorldObject; class Map; diff --git a/src/server/game/Movement/MovementGenerator.h b/src/server/game/Movement/MovementGenerator.h index ab7a52c483e..fa7291b8601 100644 --- a/src/server/game/Movement/MovementGenerator.h +++ b/src/server/game/Movement/MovementGenerator.h @@ -21,7 +21,7 @@ #ifndef TRINITY_MOVEMENTGENERATOR_H #define TRINITY_MOVEMENTGENERATOR_H -#include "Platform/Define.h" +#include "Define.h" #include "Policies/Singleton.h" #include "Dynamic/ObjectRegistry.h" #include "Dynamic/FactoryHolder.h" diff --git a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h index 4b74e80e168..9216aac5d0c 100644 --- a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h @@ -29,8 +29,8 @@ #include "MovementGenerator.h" #include "DestinationHolder.h" -#include "WaypointManager.h" -#include "Path.h" +#include "Movement/Waypoints/WaypointManager.h" +#include "Movement/Waypoints/Path.h" #include "Traveller.h" #include "Player.h" diff --git a/src/server/game/PrecompiledHeaders/NixCorePCH.h b/src/server/game/PrecompiledHeaders/NixCorePCH.h index cb42e4138e4..3587d270131 100644 --- a/src/server/game/PrecompiledHeaders/NixCorePCH.h +++ b/src/server/game/PrecompiledHeaders/NixCorePCH.h @@ -7,6 +7,6 @@ #include "ObjectAccessor.h" #include "ObjectDefines.h" #include "Database/SQLStorage.h" -#include "Opcodes.h" -#include "SharedDefines.h" +#include "Server/Protocol/Opcodes.h" +#include "Miscellaneous/SharedDefines.h" #include "ObjectMgr.h" diff --git a/src/server/game/Reputation/ReputationMgr.h b/src/server/game/Reputation/ReputationMgr.h index 4c0fd778a4d..9fc0efdf850 100644 --- a/src/server/game/Reputation/ReputationMgr.h +++ b/src/server/game/Reputation/ReputationMgr.h @@ -20,10 +20,10 @@ #define __TRINITY_REPUTATION_MGR_H #include "Common.h" -#include "SharedDefines.h" -#include "Language.h" -#include "DBCStructure.h" -#include "QueryResult.h" +#include "Miscellaneous/SharedDefines.h" +#include "Miscellaneous/Language.h" +#include "DataStores/DBCStructure.h" +#include "Database/QueryResult.h" #include static uint32 ReputationRankStrIndex[MAX_REPUTATION_RANK] = diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h index ed7200d5786..1814148e5e5 100644 --- a/src/server/game/Scripting/ScriptMgr.h +++ b/src/server/game/Scripting/ScriptMgr.h @@ -9,9 +9,9 @@ #define SC_SCRIPTMGR_H #include "Common.h" -#include "Platform/CompilerDefs.h" +#include "CompilerDefs.h" #include "DBCStructure.h" -#include "Config/ConfigEnv.h" +#include "Configuration/ConfigEnv.h" class Player; class Creature; diff --git a/src/server/game/Spells/Spell.h b/src/server/game/Spells/Spell.h index a987e35e65d..ef21e4a14b3 100644 --- a/src/server/game/Spells/Spell.h +++ b/src/server/game/Spells/Spell.h @@ -21,8 +21,8 @@ #ifndef __SPELL_H #define __SPELL_H -#include "GridDefines.h" -#include "SharedDefines.h" +#include "Grids/GridDefines.h" +#include "Miscellaneous/SharedDefines.h" class Unit; class Player; diff --git a/src/server/game/Spells/SpellMgr.h b/src/server/game/Spells/SpellMgr.h index 224760029e7..b6768348417 100644 --- a/src/server/game/Spells/SpellMgr.h +++ b/src/server/game/Spells/SpellMgr.h @@ -24,13 +24,13 @@ // For static or at-server-startup loaded spell data // For more high level function for sSpellStore data -#include "SharedDefines.h" +#include "Miscellaneous/SharedDefines.h" #include "SpellAuraDefines.h" #include "DBCStructure.h" #include "DBCStores.h" #include "Database/SQLStorage.h" -#include "Utilities/UnorderedMap.h" +#include "Dynamic/UnorderedMap.h" #include "Player.h" diff --git a/src/server/scripts/CMakeLists.txt b/src/server/scripts/CMakeLists.txt index b9dfbc5fab2..2a2e2c84e19 100644 --- a/src/server/scripts/CMakeLists.txt +++ b/src/server/scripts/CMakeLists.txt @@ -4,8 +4,8 @@ IF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX) ENDIF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX) SET(scripts_STAT_SRCS - ../game/Scripting/ScriptedPch.cpp - ../game/Scripting/ScriptedPch.h + ../game/PrecompiledHeaders/ScriptPCH.cpp + ../game/PrecompiledHeaders/ScriptPCH.h ../game/AI/ScriptedAI/ScriptedEscortAI.cpp ../game/AI/ScriptedAI/ScriptedEscortAI.h ../game/AI/ScriptedAI/ScriptedCreature.cpp @@ -19,176 +19,176 @@ SET(scripts_STAT_SRCS ../game/AI/ScriptedAI/ScriptedSimpleAI.cpp ../game/AI/ScriptedAI/ScriptedSimpleAI.h Custom/on_events.cpp - EasternKingdoms/alterac_valley/alterac_valley.cpp - EasternKingdoms/alterac_valley/boss_balinda.cpp - EasternKingdoms/alterac_valley/boss_drekthar.cpp - EasternKingdoms/alterac_valley/boss_galvangar.cpp - EasternKingdoms/alterac_valley/boss_vanndar.cpp - EasternKingdoms/blackrock_depths/blackrock_depths.cpp - EasternKingdoms/blackrock_depths/boss_ambassador_flamelash.cpp - EasternKingdoms/blackrock_depths/boss_anubshiah.cpp - EasternKingdoms/blackrock_depths/boss_emperor_dagran_thaurissan.cpp - EasternKingdoms/blackrock_depths/boss_general_angerforge.cpp - EasternKingdoms/blackrock_depths/boss_gorosh_the_dervish.cpp - EasternKingdoms/blackrock_depths/boss_grizzle.cpp - EasternKingdoms/blackrock_depths/boss_high_interrogator_gerstahn.cpp - EasternKingdoms/blackrock_depths/boss_magmus.cpp - EasternKingdoms/blackrock_depths/boss_moira_bronzebeard.cpp - EasternKingdoms/blackrock_depths/boss_tomb_of_seven.cpp - EasternKingdoms/blackrock_depths/blackrock_depths.h - EasternKingdoms/blackrock_depths/instance_blackrock_depths.cpp - EasternKingdoms/blackrock_spire/blackrock_spire.cpp - EasternKingdoms/blackrock_spire/boss_drakkisath.cpp - EasternKingdoms/blackrock_spire/boss_gyth.cpp - EasternKingdoms/blackrock_spire/boss_halycon.cpp - EasternKingdoms/blackrock_spire/boss_highlord_omokk.cpp - EasternKingdoms/blackrock_spire/boss_mother_smolderweb.cpp - EasternKingdoms/blackrock_spire/boss_overlord_wyrmthalak.cpp - EasternKingdoms/blackrock_spire/boss_pyroguard_emberseer.cpp - EasternKingdoms/blackrock_spire/boss_quartermaster_zigris.cpp - EasternKingdoms/blackrock_spire/boss_rend_blackhand.cpp - EasternKingdoms/blackrock_spire/boss_shadow_hunter_voshgajin.cpp - EasternKingdoms/blackrock_spire/boss_the_beast.cpp - EasternKingdoms/blackrock_spire/boss_warmaster_voone.cpp - EasternKingdoms/blackrock_spire/blackrock_spire.h - EasternKingdoms/blackrock_spire/instance_blackrock_spire.cpp - EasternKingdoms/blackwing_lair/boss_broodlord_lashlayer.cpp - EasternKingdoms/blackwing_lair/boss_chromaggus.cpp - EasternKingdoms/blackwing_lair/boss_ebonroc.cpp - EasternKingdoms/blackwing_lair/boss_firemaw.cpp - EasternKingdoms/blackwing_lair/boss_flamegor.cpp - EasternKingdoms/blackwing_lair/boss_nefarian.cpp - EasternKingdoms/blackwing_lair/boss_razorgore.cpp - EasternKingdoms/blackwing_lair/boss_vaelastrasz.cpp - EasternKingdoms/blackwing_lair/boss_victor_nefarius.cpp - EasternKingdoms/blackwing_lair/instance_blackwing_lair.cpp - EasternKingdoms/deadmines/boss_mr_smite.cpp - EasternKingdoms/deadmines/deadmines.h - EasternKingdoms/deadmines/deadmines.cpp - EasternKingdoms/deadmines/instance_deadmines.cpp - EasternKingdoms/gnomeregan/gnomeregan.h - EasternKingdoms/gnomeregan/gnomeregan.cpp - EasternKingdoms/gnomeregan/instance_gnomeregan.cpp - EasternKingdoms/karazhan/boss_curator.cpp - EasternKingdoms/karazhan/boss_maiden_of_virtue.cpp - EasternKingdoms/karazhan/boss_midnight.cpp - EasternKingdoms/karazhan/boss_moroes.cpp - EasternKingdoms/karazhan/boss_netherspite.cpp - EasternKingdoms/karazhan/boss_nightbane.cpp - EasternKingdoms/karazhan/boss_prince_malchezaar.cpp - EasternKingdoms/karazhan/boss_shade_of_aran.cpp - EasternKingdoms/karazhan/boss_terestian_illhoof.cpp - EasternKingdoms/karazhan/bosses_opera.cpp - EasternKingdoms/karazhan/karazhan.h - EasternKingdoms/karazhan/instance_karazhan.cpp - EasternKingdoms/karazhan/karazhan.cpp - EasternKingdoms/magisters_terrace/boss_felblood_kaelthas.cpp - EasternKingdoms/magisters_terrace/boss_priestess_delrissa.cpp - EasternKingdoms/magisters_terrace/boss_selin_fireheart.cpp - EasternKingdoms/magisters_terrace/boss_vexallus.cpp - EasternKingdoms/magisters_terrace/magisters_terrace.h - EasternKingdoms/magisters_terrace/instance_magisters_terrace.cpp - EasternKingdoms/magisters_terrace/magisters_terrace.cpp - EasternKingdoms/molten_core/boss_baron_geddon.cpp - EasternKingdoms/molten_core/boss_garr.cpp - EasternKingdoms/molten_core/boss_gehennas.cpp - EasternKingdoms/molten_core/boss_golemagg.cpp - EasternKingdoms/molten_core/boss_lucifron.cpp - EasternKingdoms/molten_core/boss_magmadar.cpp - EasternKingdoms/molten_core/boss_majordomo_executus.cpp - EasternKingdoms/molten_core/boss_ragnaros.cpp - EasternKingdoms/molten_core/boss_shazzrah.cpp - EasternKingdoms/molten_core/boss_sulfuron_harbinger.cpp - EasternKingdoms/molten_core/molten_core.h - EasternKingdoms/molten_core/instance_molten_core.cpp - EasternKingdoms/molten_core/molten_core.cpp - EasternKingdoms/scarlet_enclave/the_scarlet_enclave.cpp - EasternKingdoms/scarlet_enclave/chapter1.cpp - EasternKingdoms/scarlet_enclave/chapter2.cpp - EasternKingdoms/scarlet_enclave/chapter5.cpp - EasternKingdoms/scarlet_monastery/boss_arcanist_doan.cpp - EasternKingdoms/scarlet_monastery/boss_azshir_the_sleepless.cpp - EasternKingdoms/scarlet_monastery/boss_bloodmage_thalnos.cpp - EasternKingdoms/scarlet_monastery/boss_herod.cpp - EasternKingdoms/scarlet_monastery/boss_high_inquisitor_fairbanks.cpp - EasternKingdoms/scarlet_monastery/boss_houndmaster_loksey.cpp - EasternKingdoms/scarlet_monastery/boss_interrogator_vishas.cpp - EasternKingdoms/scarlet_monastery/boss_scorn.cpp - EasternKingdoms/scarlet_monastery/boss_headless_horseman.cpp - EasternKingdoms/scarlet_monastery/boss_mograine_and_whitemane.cpp - EasternKingdoms/scarlet_monastery/instance_scarlet_monastery.cpp - EasternKingdoms/scarlet_monastery/scarlet_monastery.h - EasternKingdoms/scholomance/boss_darkmaster_gandling.cpp - EasternKingdoms/scholomance/boss_death_knight_darkreaver.cpp - EasternKingdoms/scholomance/boss_doctor_theolen_krastinov.cpp - EasternKingdoms/scholomance/boss_illucia_barov.cpp - EasternKingdoms/scholomance/boss_instructor_malicia.cpp - EasternKingdoms/scholomance/boss_jandice_barov.cpp - EasternKingdoms/scholomance/boss_kormok.cpp - EasternKingdoms/scholomance/boss_lord_alexei_barov.cpp - EasternKingdoms/scholomance/boss_lorekeeper_polkelt.cpp - EasternKingdoms/scholomance/boss_ras_frostwhisper.cpp - EasternKingdoms/scholomance/boss_the_ravenian.cpp - EasternKingdoms/scholomance/boss_vectus.cpp - EasternKingdoms/scholomance/scholomance.h - EasternKingdoms/scholomance/instance_scholomance.cpp - EasternKingdoms/shadowfang_keep/shadowfang_keep.h - EasternKingdoms/shadowfang_keep/instance_shadowfang_keep.cpp - EasternKingdoms/shadowfang_keep/shadowfang_keep.cpp - EasternKingdoms/stratholme/boss_baron_rivendare.cpp - EasternKingdoms/stratholme/boss_baroness_anastari.cpp - EasternKingdoms/stratholme/boss_cannon_master_willey.cpp - EasternKingdoms/stratholme/boss_dathrohan_balnazzar.cpp - EasternKingdoms/stratholme/boss_magistrate_barthilas.cpp - EasternKingdoms/stratholme/boss_maleki_the_pallid.cpp - EasternKingdoms/stratholme/boss_nerubenkan.cpp - EasternKingdoms/stratholme/boss_order_of_silver_hand.cpp - EasternKingdoms/stratholme/boss_postmaster_malown.cpp - EasternKingdoms/stratholme/boss_ramstein_the_gorger.cpp - EasternKingdoms/stratholme/boss_timmy_the_cruel.cpp - EasternKingdoms/stratholme/stratholme.h - EasternKingdoms/stratholme/instance_stratholme.cpp - EasternKingdoms/stratholme/stratholme.cpp - EasternKingdoms/sunken_temple/sunken_temple.h - EasternKingdoms/sunken_temple/instance_sunken_temple.cpp - EasternKingdoms/sunken_temple/sunken_temple.cpp - EasternKingdoms/sunwell_plateau/boss_kiljaeden.cpp - EasternKingdoms/sunwell_plateau/boss_muru.cpp - EasternKingdoms/sunwell_plateau/boss_eredar_twins.cpp - EasternKingdoms/sunwell_plateau/boss_felmyst.cpp - EasternKingdoms/sunwell_plateau/boss_brutallus.cpp - EasternKingdoms/sunwell_plateau/boss_kalecgos.cpp - EasternKingdoms/sunwell_plateau/sunwell_plateau.cpp - EasternKingdoms/sunwell_plateau/sunwell_plateau.h - EasternKingdoms/sunwell_plateau/instance_sunwell_plateau.cpp - EasternKingdoms/uldaman/boss_archaedas.cpp - EasternKingdoms/uldaman/instance_uldaman.cpp - EasternKingdoms/uldaman/boss_ironaya.cpp - EasternKingdoms/uldaman/uldaman.cpp - EasternKingdoms/zulaman/boss_akilzon.cpp - EasternKingdoms/zulaman/boss_halazzi.cpp - EasternKingdoms/zulaman/boss_hexlord.cpp - EasternKingdoms/zulaman/boss_janalai.cpp - EasternKingdoms/zulaman/boss_nalorakk.cpp - EasternKingdoms/zulaman/boss_zuljin.cpp - EasternKingdoms/zulaman/zulaman.h - EasternKingdoms/zulaman/instance_zulaman.cpp - EasternKingdoms/zulaman/zulaman.cpp - EasternKingdoms/zulgurub/boss_arlokk.cpp - EasternKingdoms/zulgurub/boss_gahzranka.cpp - EasternKingdoms/zulgurub/boss_grilek.cpp - EasternKingdoms/zulgurub/boss_hakkar.cpp - EasternKingdoms/zulgurub/boss_hazzarah.cpp - EasternKingdoms/zulgurub/boss_jeklik.cpp - EasternKingdoms/zulgurub/boss_jindo.cpp - EasternKingdoms/zulgurub/boss_mandokir.cpp - EasternKingdoms/zulgurub/boss_marli.cpp - EasternKingdoms/zulgurub/boss_renataki.cpp - EasternKingdoms/zulgurub/boss_thekal.cpp - EasternKingdoms/zulgurub/boss_venoxis.cpp - EasternKingdoms/zulgurub/boss_wushoolay.cpp - EasternKingdoms/zulgurub/zulgurub.h - EasternKingdoms/zulgurub/instance_zulgurub.cpp + EasternKingdoms/AlteracValley/alterac_valley.cpp + EasternKingdoms/AlteracValley/boss_balinda.cpp + EasternKingdoms/AlteracValley/boss_drekthar.cpp + EasternKingdoms/AlteracValley/boss_galvangar.cpp + EasternKingdoms/AlteracValley/boss_vanndar.cpp + EasternKingdoms/BlackrockDepths/blackrock_depths.cpp + EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp + EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp + EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp + EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp + EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp + EasternKingdoms/BlackrockDepths/boss_grizzle.cpp + EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp + EasternKingdoms/BlackrockDepths/boss_magmus.cpp + EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp + EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp + EasternKingdoms/BlackrockDepths//blackrock_depths.h + EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp + EasternKingdoms/BlackrockSpire/blackrock_spire.cpp + EasternKingdoms/BlackrockSpire/boss_drakkisath.cpp + EasternKingdoms/BlackrockSpire/boss_gyth.cpp + EasternKingdoms/BlackrockSpire/boss_halycon.cpp + EasternKingdoms/BlackrockSpire/boss_highlord_omokk.cpp + EasternKingdoms/BlackrockSpire/boss_mother_smolderweb.cpp + EasternKingdoms/BlackrockSpire/boss_overlord_wyrmthalak.cpp + EasternKingdoms/BlackrockSpire/boss_pyroguard_emberseer.cpp + EasternKingdoms/BlackrockSpire/boss_quartermaster_zigris.cpp + EasternKingdoms/BlackrockSpire/boss_rend_blackhand.cpp + EasternKingdoms/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp + EasternKingdoms/BlackrockSpire/boss_the_beast.cpp + EasternKingdoms/BlackrockSpire/boss_warmaster_voone.cpp + EasternKingdoms/BlackrockSpire/blackrock_spire.h + EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp + EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp + EasternKingdoms/BlackwingLair/boss_chromaggus.cpp + EasternKingdoms/BlackwingLair/boss_ebonroc.cpp + EasternKingdoms/BlackwingLair/boss_firemaw.cpp + EasternKingdoms/BlackwingLair/boss_flamegor.cpp + EasternKingdoms/BlackwingLair/boss_nefarian.cpp + EasternKingdoms/BlackwingLair/boss_razorgore.cpp + EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp + EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp + EasternKingdoms/BlackwingLair/instance_blackwing_lair.cpp + EasternKingdoms/Deadmines/boss_mr_smite.cpp + EasternKingdoms/Deadmines/deadmines.h + EasternKingdoms/Deadmines/deadmines.cpp + EasternKingdoms/Deadmines/instance_deadmines.cpp + EasternKingdoms/Gnomeregan/gnomeregan.h + EasternKingdoms/Gnomeregan/gnomeregan.cpp + EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp + EasternKingdoms/Karazhan/boss_curator.cpp + EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp + EasternKingdoms/Karazhan/boss_midnight.cpp + EasternKingdoms/Karazhan/boss_moroes.cpp + EasternKingdoms/Karazhan/boss_netherspite.cpp + EasternKingdoms/Karazhan/boss_nightbane.cpp + EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp + EasternKingdoms/Karazhan/boss_shade_of_aran.cpp + EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp + EasternKingdoms/Karazhan/bosses_opera.cpp + EasternKingdoms/Karazhan/karazhan.h + EasternKingdoms/Karazhan/instance_karazhan.cpp + EasternKingdoms/Karazhan/karazhan.cpp + EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp + EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp + EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp + EasternKingdoms/MagistersTerrace/boss_vexallus.cpp + EasternKingdoms/MagistersTerrace/magisters_terrace.h + EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp + EasternKingdoms/MagistersTerrace/magisters_terrace.cpp + EasternKingdoms/MoltenCore/boss_baron_geddon.cpp + EasternKingdoms/MoltenCore/boss_garr.cpp + EasternKingdoms/MoltenCore/boss_gehennas.cpp + EasternKingdoms/MoltenCore/boss_golemagg.cpp + EasternKingdoms/MoltenCore/boss_lucifron.cpp + EasternKingdoms/MoltenCore/boss_magmadar.cpp + EasternKingdoms/MoltenCore/boss_majordomo_executus.cpp + EasternKingdoms/MoltenCore/boss_ragnaros.cpp + EasternKingdoms/MoltenCore/boss_shazzrah.cpp + EasternKingdoms/MoltenCore/boss_sulfuron_harbinger.cpp + EasternKingdoms/MoltenCore/molten_core.h + EasternKingdoms/MoltenCore/instance_molten_core.cpp + EasternKingdoms/MoltenCore/molten_core.cpp + EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp + EasternKingdoms/ScarletEnclave/chapter1.cpp + EasternKingdoms/ScarletEnclave/chapter2.cpp + EasternKingdoms/ScarletEnclave/chapter5.cpp + EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp + EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp + EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp + EasternKingdoms/ScarletMonastery/boss_herod.cpp + EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp + EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp + EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp + EasternKingdoms/ScarletMonastery/boss_scorn.cpp + EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp + EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp + EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp + EasternKingdoms/ScarletMonastery/scarlet_monastery.h + EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp + EasternKingdoms/Scholomance/boss_death_knight_darkreaver.cpp + EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp + EasternKingdoms/Scholomance/boss_illucia_barov.cpp + EasternKingdoms/Scholomance/boss_instructor_malicia.cpp + EasternKingdoms/Scholomance/boss_jandice_barov.cpp + EasternKingdoms/Scholomance/boss_kormok.cpp + EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp + EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp + EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp + EasternKingdoms/Scholomance/boss_the_ravenian.cpp + EasternKingdoms/Scholomance/boss_vectus.cpp + EasternKingdoms/Scholomance/scholomance.h + EasternKingdoms/Scholomance/instance_scholomance.cpp + EasternKingdoms/ShadowfangKeep/shadowfang_keep.h + EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp + EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp + EasternKingdoms/Stratholme/boss_baron_rivendare.cpp + EasternKingdoms/Stratholme/boss_baroness_anastari.cpp + EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp + EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp + EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp + EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp + EasternKingdoms/Stratholme/boss_nerubenkan.cpp + EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp + EasternKingdoms/Stratholme/boss_postmaster_malown.cpp + EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp + EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp + EasternKingdoms/Stratholme/stratholme.h + EasternKingdoms/Stratholme/instance_stratholme.cpp + EasternKingdoms/Stratholme/stratholme.cpp + EasternKingdoms/SunkenTemple/sunken_temple.h + EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp + EasternKingdoms/SunkenTemple/sunken_temple.cpp + EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp + EasternKingdoms/SunwellPlateau/boss_muru.cpp + EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp + EasternKingdoms/SunwellPlateau/boss_felmyst.cpp + EasternKingdoms/SunwellPlateau/boss_brutallus.cpp + EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp + EasternKingdoms/SunwellPlateau/sunwell_plateau.cpp + EasternKingdoms/SunwellPlateau/sunwell_plateau.h + EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp + EasternKingdoms/Uldaman/boss_archaedas.cpp + EasternKingdoms/Uldaman/instance_uldaman.cpp + EasternKingdoms/Uldaman/boss_ironaya.cpp + EasternKingdoms/Uldaman/uldaman.cpp + EasternKingdoms/ZulAman/boss_akilzon.cpp + EasternKingdoms/ZulAman/boss_halazzi.cpp + EasternKingdoms/ZulAman/boss_hexlord.cpp + EasternKingdoms/ZulAman/boss_janalai.cpp + EasternKingdoms/ZulAman/boss_nalorakk.cpp + EasternKingdoms/ZulAman/boss_zuljin.cpp + EasternKingdoms/ZulAman/zulaman.h + EasternKingdoms/ZulAman/instance_zulaman.cpp + EasternKingdoms/ZulAman/zulaman.cpp + EasternKingdoms/ZulGurub/boss_arlokk.cpp + EasternKingdoms/ZulGurub/boss_gahzranka.cpp + EasternKingdoms/ZulGurub/boss_grilek.cpp + EasternKingdoms/ZulGurub/boss_hakkar.cpp + EasternKingdoms/ZulGurub/boss_hazzarah.cpp + EasternKingdoms/ZulGurub/boss_jeklik.cpp + EasternKingdoms/ZulGurub/boss_jindo.cpp + EasternKingdoms/ZulGurub/boss_mandokir.cpp + EasternKingdoms/ZulGurub/boss_marli.cpp + EasternKingdoms/ZulGurub/boss_renataki.cpp + EasternKingdoms/ZulGurub/boss_thekal.cpp + EasternKingdoms/ZulGurub/boss_venoxis.cpp + EasternKingdoms/ZulGurub/boss_wushoolay.cpp + EasternKingdoms/ZulGurub/zulgurub.h + EasternKingdoms/ZulGurub/instance_zulgurub.cpp EasternKingdoms/alterac_mountains.cpp EasternKingdoms/arathi_highlands.cpp EasternKingdoms/blasted_lands.cpp @@ -219,82 +219,82 @@ SET(scripts_STAT_SRCS Examples/example_escort.cpp Examples/example_gossip_codebox.cpp Examples/example_misc.cpp - Kalimdor/blackfathom_depths/boss_gelihast.cpp - Kalimdor/blackfathom_depths/boss_kelris.cpp - Kalimdor/blackfathom_depths/boss_aku_mai.cpp - Kalimdor/blackfathom_depths/instance_blackfathom_deeps.cpp - Kalimdor/blackfathom_depths/blackfathom_deeps.cpp - Kalimdor/blackfathom_depths/blackfathom_deeps.h - Kalimdor/caverns_of_time/culling_of_stratholme/instance_culling_of_stratholme.cpp - Kalimdor/caverns_of_time/culling_of_stratholme/boss_meathook.cpp - Kalimdor/caverns_of_time/culling_of_stratholme/boss_epoch.cpp - Kalimdor/caverns_of_time/culling_of_stratholme/boss_mal_ganis.cpp - Kalimdor/caverns_of_time/culling_of_stratholme/boss_salramm.cpp - Kalimdor/caverns_of_time/culling_of_stratholme/boss_infinite.cpp - Kalimdor/caverns_of_time/culling_of_stratholme/culling_of_stratholme.cpp - Kalimdor/caverns_of_time/culling_of_stratholme/culling_of_stratholme.h - Kalimdor/caverns_of_time/dark_portal/dark_portal.h - Kalimdor/caverns_of_time/dark_portal/instance_dark_portal.cpp - Kalimdor/caverns_of_time/dark_portal/dark_portal.cpp - Kalimdor/caverns_of_time/dark_portal/boss_aeonus.cpp - Kalimdor/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp - Kalimdor/caverns_of_time/dark_portal/boss_temporus.cpp - Kalimdor/caverns_of_time/hyjal/boss_anetheron.cpp - Kalimdor/caverns_of_time/hyjal/boss_archimonde.cpp - Kalimdor/caverns_of_time/hyjal/boss_azgalor.cpp - Kalimdor/caverns_of_time/hyjal/boss_kazrogal.cpp - Kalimdor/caverns_of_time/hyjal/boss_rage_winterchill.cpp - Kalimdor/caverns_of_time/hyjal/hyjal.h - Kalimdor/caverns_of_time/hyjal/hyjal.cpp - Kalimdor/caverns_of_time/hyjal/hyjal_trash.cpp - Kalimdor/caverns_of_time/hyjal/hyjal_trash.h - Kalimdor/caverns_of_time/hyjal/hyjalAI.cpp - Kalimdor/caverns_of_time/hyjal/hyjalAI.h - Kalimdor/caverns_of_time/hyjal/instance_hyjal.cpp - Kalimdor/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp - Kalimdor/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp - Kalimdor/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp - Kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.h - Kalimdor/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp - Kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp - Kalimdor/maraudon/boss_celebras_the_cursed.cpp - Kalimdor/maraudon/boss_landslide.cpp - Kalimdor/maraudon/boss_noxxion.cpp - Kalimdor/maraudon/boss_princess_theradras.cpp - Kalimdor/onyxias_lair/boss_onyxia.cpp - Kalimdor/onyxias_lair/instance_onyxias_lair.cpp - Kalimdor/razorfen_downs/boss_amnennar_the_coldbringer.cpp - Kalimdor/razorfen_downs/razorfen_downs.cpp - Kalimdor/razorfen_downs/instance_razorfen_downs.cpp - Kalimdor/razorfen_downs/razorfen_downs.h - Kalimdor/razorfen_kraul/razorfen_kraul.h - Kalimdor/razorfen_kraul/instance_razorfen_kraul.cpp - Kalimdor/razorfen_kraul/razorfen_kraul.cpp - Kalimdor/ruins_of_ahnqiraj/boss_ayamiss.cpp - Kalimdor/ruins_of_ahnqiraj/boss_buru.cpp - Kalimdor/ruins_of_ahnqiraj/boss_kurinnaxx.cpp - Kalimdor/ruins_of_ahnqiraj/boss_moam.cpp - Kalimdor/ruins_of_ahnqiraj/boss_ossirian.cpp - Kalimdor/ruins_of_ahnqiraj/boss_rajaxx.cpp - Kalimdor/ruins_of_ahnqiraj/ruins_of_ahnqiraj.h - Kalimdor/ruins_of_ahnqiraj/instance_ruins_of_ahnqiraj.cpp - Kalimdor/temple_of_ahnqiraj/boss_bug_trio.cpp - Kalimdor/temple_of_ahnqiraj/boss_cthun.cpp - Kalimdor/temple_of_ahnqiraj/boss_fankriss.cpp - Kalimdor/temple_of_ahnqiraj/boss_huhuran.cpp - Kalimdor/temple_of_ahnqiraj/boss_ouro.cpp - Kalimdor/temple_of_ahnqiraj/boss_sartura.cpp - Kalimdor/temple_of_ahnqiraj/boss_skeram.cpp - Kalimdor/temple_of_ahnqiraj/boss_twinemperors.cpp - Kalimdor/temple_of_ahnqiraj/boss_viscidus.cpp - Kalimdor/temple_of_ahnqiraj/temple_of_ahnqiraj.h - Kalimdor/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp - Kalimdor/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp - Kalimdor/wailing_caverns/wailing_caverns.h - Kalimdor/wailing_caverns/instance_wailing_caverns.cpp - Kalimdor/wailing_caverns/wailing_caverns.cpp - Kalimdor/zulfarrak/zulfarrak.cpp - Kalimdor/zulfarrak/instance_zulfarrak.cpp + Kalimdor/BlackfathomDeeps/boss_gelihast.cpp + Kalimdor/BlackfathomDeeps/boss_kelris.cpp + Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp + Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp + Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp + Kalimdor/BlackfathomDeeps/blackfathom_deeps.h + Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp + Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp + Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp + Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp + Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp + Kalimdor/CavernsOfTime/BattleForMountHyjal/BattleForMountHyjal.h + Kalimdor/CavernsOfTime/BattleForMountHyjal/BattleForMountHyjal.cpp + Kalimdor/CavernsOfTime/BattleForMountHyjal/BattleForMountHyjal_trash.cpp + Kalimdor/CavernsOfTime/BattleForMountHyjal/BattleForMountHyjal_trash.h + Kalimdor/CavernsOfTime/BattleForMountHyjal/BattleForMountHyjalAI.cpp + Kalimdor/CavernsOfTime/BattleForMountHyjal/BattleForMountHyjalAI.h + Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_BattleForMountHyjal.cpp + Kalimdor/CavernsOfTime/CullingOfStratholme/instance_CullingOfStratholme.cpp + Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp + Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp + Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp + Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp + Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp + Kalimdor/CavernsOfTime/CullingOfStratholme/CullingOfStratholme.cpp + Kalimdor/CavernsOfTime/CullingOfStratholme/CullingOfStratholme.h + Kalimdor/CavernsOfTime/DarkPortal/DarkPortal.h + Kalimdor/CavernsOfTime/DarkPortal/instance_DarkPortal.cpp + Kalimdor/CavernsOfTime/DarkPortal/DarkPortal.cpp + Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp + Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp + Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp + Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp + Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp + Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp + Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/EscapeFromDurnholdeKeep.h + Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_EscapeFromDurnholdeKeep.cpp + Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/EscapeFromDurnholdeKeep.cpp + Kalimdor/Maraudon/boss_celebras_the_cursed.cpp + Kalimdor/Maraudon/boss_landslide.cpp + Kalimdor/Maraudon/boss_noxxion.cpp + Kalimdor/Maraudon/boss_princess_theradras.cpp + Kalimdor/OnyxiasLair/boss_onyxia.cpp + Kalimdor/OnyxiasLair/instance_OnyxiasLair.cpp + Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp + Kalimdor/RazorfenDowns/RazorfenDowns.cpp + Kalimdor/RazorfenDowns/instance_RazorfenDowns.cpp + Kalimdor/RazorfenDowns/RazorfenDowns.h + Kalimdor/RazorfenKraul/RazorfenKraul.h + Kalimdor/RazorfenKraul/instance_RazorfenKraul.cpp + Kalimdor/RazorfenKraul/RazorfenKraul.cpp + Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp + Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp + Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp + Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp + Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp + Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp + Kalimdor/RuinsOfAhnQiraj/RuinsOfAhnQiraj.h + Kalimdor/RuinsOfAhnQiraj/instance_RuinsOfAhnQiraj.cpp + Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp + Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp + Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp + Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp + Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp + Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp + Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp + Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp + Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp + Kalimdor/TempleOfAhnQiraj/TempleOfAhnQiraj.h + Kalimdor/TempleOfAhnQiraj/instance_TempleOfAhnQiraj.cpp + Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp + Kalimdor/WailingCaverns/WailingCaverns.h + Kalimdor/WailingCaverns/instance_WailingCaverns.cpp + Kalimdor/WailingCaverns/WailingCaverns.cpp + Kalimdor/ZulFarrak/ZulFarrak.cpp + Kalimdor/ZulFarrak/instance_ZulFarrak.cpp Kalimdor/ashenvale.cpp Kalimdor/azshara.cpp Kalimdor/azuremyst_isle.cpp @@ -318,88 +318,88 @@ SET(scripts_STAT_SRCS Kalimdor/thunder_bluff.cpp Kalimdor/ungoro_crater.cpp Kalimdor/winterspring.cpp - Northrend/azjol_nerub/azjol_nerub/instance_azjol_nerub.cpp - Northrend/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp - Northrend/azjol_nerub/azjol_nerub/boss_hadronox.cpp - Northrend/azjol_nerub/azjol_nerub/boss_anubarak.cpp - Northrend/azjol_nerub/azjol_nerub/azjol_nerub.h - Northrend/azjol_nerub/ahnkahet/instance_ahnkahet.cpp - Northrend/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp - Northrend/azjol_nerub/ahnkahet/boss_elder_nadox.cpp - Northrend/azjol_nerub/ahnkahet/boss_jedoga_shadowseeker.cpp - Northrend/azjol_nerub/ahnkahet/boss_herald_volazj.cpp - Northrend/azjol_nerub/ahnkahet/boss_amanitar.cpp - Northrend/azjol_nerub/ahnkahet/ahnkahet.h - Northrend/crusaders_coliseum/trial_of_the_champion/boss_argent_challenge.cpp - Northrend/crusaders_coliseum/trial_of_the_champion/boss_black_knight.cpp - Northrend/crusaders_coliseum/trial_of_the_champion/boss_grand_champions.cpp - Northrend/crusaders_coliseum/trial_of_the_champion/instance_trial_of_the_champion.cpp - Northrend/crusaders_coliseum/trial_of_the_champion/trial_of_the_champion.cpp - Northrend/crusaders_coliseum/trial_of_the_champion/trial_of_the_champion.h - Northrend/draktharon_keep/instance_drak_tharon_keep.cpp - Northrend/draktharon_keep/boss_trollgore.cpp - Northrend/draktharon_keep/boss_novos.cpp - Northrend/draktharon_keep/boss_dred.cpp - Northrend/draktharon_keep/boss_tharon_ja.cpp - Northrend/draktharon_keep/drak_tharon_keep.h - Northrend/frozen_halls/forge_of_souls/instance_forge_of_souls.cpp - Northrend/frozen_halls/forge_of_souls/boss_bronjahm.cpp - Northrend/frozen_halls/forge_of_souls/boss_devourer_of_souls.cpp - Northrend/frozen_halls/forge_of_souls/forge_of_souls.h - Northrend/frozen_halls/forge_of_souls/forge_of_souls.cpp - Northrend/frozen_halls/halls_of_reflection/boss_falric.cpp - Northrend/frozen_halls/halls_of_reflection/boss_marwyn.cpp - Northrend/frozen_halls/halls_of_reflection/instance_halls_of_reflection.cpp - Northrend/frozen_halls/halls_of_reflection/halls_of_reflection.cpp - Northrend/frozen_halls/halls_of_reflection/halls_of_reflection.h - Northrend/frozen_halls/pit_of_saron/boss_forgemaster_garfrost.cpp - Northrend/frozen_halls/pit_of_saron/boss_krickandick.cpp - Northrend/frozen_halls/pit_of_saron/boss_scourgelord_tyrannus.cpp - Northrend/frozen_halls/pit_of_saron/instance_pit_of_saron.cpp - Northrend/frozen_halls/pit_of_saron/pit_of_saron.cpp - Northrend/frozen_halls/pit_of_saron/pit_of_saron.h - Northrend/gundrak/instance_gundrak.cpp - Northrend/gundrak/boss_slad_ran.cpp - Northrend/gundrak/boss_moorabi.cpp - Northrend/gundrak/boss_drakkari_colossus.cpp - Northrend/gundrak/boss_gal_darah.cpp - Northrend/gundrak/boss_eck.cpp - Northrend/gundrak/gundrak.h - Northrend/naxxramas/boss_anubrekhan.cpp - Northrend/naxxramas/boss_faerlina.cpp - Northrend/naxxramas/boss_gluth.cpp - Northrend/naxxramas/boss_gothik.cpp - Northrend/naxxramas/boss_grobbulus.cpp - Northrend/naxxramas/boss_heigan.cpp - Northrend/naxxramas/boss_kelthuzad.cpp - Northrend/naxxramas/boss_four_horsemen.cpp - Northrend/naxxramas/boss_loatheb.cpp - Northrend/naxxramas/boss_maexxna.cpp - Northrend/naxxramas/boss_noth.cpp - Northrend/naxxramas/boss_patchwerk.cpp - Northrend/naxxramas/boss_razuvious.cpp - Northrend/naxxramas/boss_sapphiron.cpp - Northrend/naxxramas/boss_thaddius.cpp - Northrend/naxxramas/naxxramas.h - Northrend/naxxramas/instance_naxxramas.cpp - Northrend/nexus/eye_of_eternity/instance_eye_of_eternity.cpp - Northrend/nexus/eye_of_eternity/boss_malygos.cpp - Northrend/nexus/eye_of_eternity/eye_of_eternity.h - Northrend/nexus/nexus/instance_nexus.cpp - Northrend/nexus/nexus/boss_magus_telestra.cpp - Northrend/nexus/nexus/boss_anomalus.cpp - Northrend/nexus/nexus/boss_ormorok.cpp - Northrend/nexus/nexus/boss_keristrasza.cpp - Northrend/nexus/nexus/commander_stoutbeard.cpp - Northrend/nexus/nexus/commander_kolurg.cpp - Northrend/nexus/nexus/nexus.h - Northrend/nexus/oculus/instance_oculus.cpp - Northrend/nexus/oculus/boss_drakos.cpp - Northrend/nexus/oculus/boss_urom.cpp - Northrend/nexus/oculus/boss_varos.cpp - Northrend/nexus/oculus/boss_eregos.cpp - Northrend/nexus/oculus/oculus.h - Northrend/nexus/oculus/oculus.cpp + Northrend/AzjolNerub/AzjolNerub/instance_AzjolNerub.cpp + Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp + Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp + Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp + Northrend/AzjolNerub/AzjolNerub/AzjolNerub.h + Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp + Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp + Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp + Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp + Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp + Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp + Northrend/AzjolNerub/ahnkahet/ahnkahet.h + Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp + Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp + Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp + Northrend/CrusadersColiseum/TrialOfTheChampion/instance_TrialOfTheChampion.cpp + Northrend/CrusadersColiseum/TrialOfTheChampion/TrialOfTheChampion.cpp + Northrend/CrusadersColiseum/TrialOfTheChampion/TrialOfTheChampion.h + Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp + Northrend/DraktharonKeep/boss_trollgore.cpp + Northrend/DraktharonKeep/boss_novos.cpp + Northrend/DraktharonKeep/boss_dred.cpp + Northrend/DraktharonKeep/boss_tharon_ja.cpp + Northrend/DraktharonKeep/drak_tharon_keep.h + Northrend/FrozenHalls/ForgeOfSouls/instance_ForgeOfSouls.cpp + Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp + Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp + Northrend/FrozenHalls/ForgeOfSouls/ForgeOfSouls.h + Northrend/FrozenHalls/ForgeOfSouls/ForgeOfSouls.cpp + Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp + Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp + Northrend/FrozenHalls/HallsOfReflection/instance_HallsOfReflection.cpp + Northrend/FrozenHalls/HallsOfReflection/HallsOfReflection.cpp + Northrend/FrozenHalls/HallsOfReflection/HallsOfReflection.h + Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp + Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp + Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp + Northrend/FrozenHalls/PitOfSaron/instance_PitOfSaron.cpp + Northrend/FrozenHalls/PitOfSaron/PitOfSaron.cpp + Northrend/FrozenHalls/PitOfSaron/PitOfSaron.h + Northrend/Gundrak/instance_Gundrak.cpp + Northrend/Gundrak/boss_slad_ran.cpp + Northrend/Gundrak/boss_moorabi.cpp + Northrend/Gundrak/boss_drakkari_colossus.cpp + Northrend/Gundrak/boss_gal_darah.cpp + Northrend/Gundrak/boss_eck.cpp + Northrend/Gundrak/Gundrak.h + Northrend/Naxxramas/boss_anubrekhan.cpp + Northrend/Naxxramas/boss_faerlina.cpp + Northrend/Naxxramas/boss_gluth.cpp + Northrend/Naxxramas/boss_gothik.cpp + Northrend/Naxxramas/boss_grobbulus.cpp + Northrend/Naxxramas/boss_heigan.cpp + Northrend/Naxxramas/boss_kelthuzad.cpp + Northrend/Naxxramas/boss_four_horsemen.cpp + Northrend/Naxxramas/boss_loatheb.cpp + Northrend/Naxxramas/boss_maexxna.cpp + Northrend/Naxxramas/boss_noth.cpp + Northrend/Naxxramas/boss_patchwerk.cpp + Northrend/Naxxramas/boss_razuvious.cpp + Northrend/Naxxramas/boss_sapphiron.cpp + Northrend/Naxxramas/boss_thaddius.cpp + Northrend/Naxxramas/Naxxramas.h + Northrend/Naxxramas/instance_Naxxramas.cpp + Northrend/Nexus/EyeOfEternity/instance_EyeOfEternity.cpp + Northrend/Nexus/EyeOfEternity/boss_malygos.cpp + Northrend/Nexus/EyeOfEternity/EyeOfEternity.h + Northrend/Nexus/Nexus/instance_Nexus.cpp + Northrend/Nexus/Nexus/boss_magus_telestra.cpp + Northrend/Nexus/Nexus/boss_anomalus.cpp + Northrend/Nexus/Nexus/boss_ormorok.cpp + Northrend/Nexus/Nexus/boss_keristrasza.cpp + Northrend/Nexus/Nexus/commander_stoutbeard.cpp + Northrend/Nexus/Nexus/commander_kolurg.cpp + Northrend/Nexus/Nexus/Nexus.h + Northrend/Nexus/Oculus/instance_Oculus.cpp + Northrend/Nexus/Oculus/boss_drakos.cpp + Northrend/Nexus/Oculus/boss_urom.cpp + Northrend/Nexus/Oculus/boss_varos.cpp + Northrend/Nexus/Oculus/boss_eregos.cpp + Northrend/Nexus/Oculus/Oculus.h + Northrend/Nexus/Oculus/Oculus.cpp Northrend/obsidian_sanctum/instance_obsidian_sanctum.cpp Northrend/obsidian_sanctum/boss_sartharion.cpp Northrend/obsidian_sanctum/obsidian_sanctum.h @@ -472,7 +472,7 @@ SET(scripts_STAT_SRCS Northrend/crystalsong_forest.cpp Outland/auchindoun/auchenai_crypts/boss_exarch_maladaar.cpp Outland/auchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp - Outland/auchindoun/mana_tombs/boss_nexusprince_shaffar.cpp + Outland/auchindoun/mana_tombs/boss_Nexusprince_shaffar.cpp Outland/auchindoun/mana_tombs/boss_pandemonius.cpp Outland/auchindoun/sethekk_halls/boss_darkweaver_syth.cpp Outland/auchindoun/sethekk_halls/boss_tailonking_ikiss.cpp diff --git a/src/server/shared/DataStores/DBCStore.h b/src/server/shared/DataStores/DBCStore.h index 61e2f7a6d06..cd1d1881d68 100644 --- a/src/server/shared/DataStores/DBCStore.h +++ b/src/server/shared/DataStores/DBCStore.h @@ -20,7 +20,7 @@ #define DBCSTORE_H #include "DBCFileLoader.h" -#include "Log.h" +#include "Logging/Log.h" struct SqlDbc { diff --git a/src/server/shared/Dynamic/FactoryHolder.h b/src/server/shared/Dynamic/FactoryHolder.h index 282968d6097..fd5925f5f75 100644 --- a/src/server/shared/Dynamic/FactoryHolder.h +++ b/src/server/shared/Dynamic/FactoryHolder.h @@ -21,8 +21,8 @@ #ifndef TRINITY_FACTORY_HOLDER #define TRINITY_FACTORY_HOLDER -#include "Platform/Define.h" -#include "Utilities/TypeList.h" +#include "Define.h" +#include "Dynamic/TypeList.h" #include "ObjectRegistry.h" #include "Policies/SingletonImp.h" diff --git a/src/server/shared/Dynamic/ObjectRegistry.h b/src/server/shared/Dynamic/ObjectRegistry.h index e6619427885..eaf8e1acd2d 100644 --- a/src/server/shared/Dynamic/ObjectRegistry.h +++ b/src/server/shared/Dynamic/ObjectRegistry.h @@ -21,8 +21,8 @@ #ifndef TRINITY_OBJECTREGISTRY_H #define TRINITY_OBJECTREGISTRY_H -#include "Platform/Define.h" -#include "Utilities/UnorderedMap.h" +#include "Define.h" +#include "Dynamic/UnorderedMap.h" #include "Policies/Singleton.h" #include diff --git a/src/server/shared/SystemConfig.h b/src/server/shared/SystemConfig.h index ac531cbbc94..fd380d72b79 100644 --- a/src/server/shared/SystemConfig.h +++ b/src/server/shared/SystemConfig.h @@ -24,7 +24,7 @@ #ifndef TRINITY_SYSTEMCONFIG_H #define TRINITY_SYSTEMCONFIG_H -#include "Platform/Define.h" +#include "Define.h" #include "revision.h" #define _PACKAGENAME "TrinityCore " -- cgit v1.2.3 From 7120513afe6b3016856a1f7d7179552ed58022b4 Mon Sep 17 00:00:00 2001 From: Machiavelli Date: Mon, 7 Jun 2010 20:12:14 +0200 Subject: Fix logic. --HG-- branch : trunk --- src/server/game/Spells/Auras/SpellAuras.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp index 753cbbe6264..0b49322ab8b 100644 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -396,9 +396,10 @@ void Aura::_UnapplyForTarget(Unit * target, Unit * caster, AuraApplication * aur { sLog.outError("Aura::_UnapplyForTarget, target:%u, caster:%u, spell:%u was not found in owners application map!", target->GetGUIDLow(), caster->GetGUIDLow(), auraApp->GetBase()->GetSpellProto()->Id); - m_applications.erase(itr); - } + else + m_applications.erase(itr); + // aura has to be already applied //assert(itr->second == auraApp); m_removedApplications.push_back(auraApp); -- cgit v1.2.3 From 1a3f840a173061de97d78f98532b6f4316f41f3e Mon Sep 17 00:00:00 2001 From: Brian Date: Mon, 7 Jun 2010 13:20:46 -0600 Subject: * broken --HG-- branch : trunk --- CMakeLists.txt | 1 - src/server/game/Chat/Commands/Level1.cpp | 14 +++++++------- src/server/shared/CMakeLists.txt | 5 +++-- src/server/shared/Utilities/Util.cpp | 6 +++--- 4 files changed, 13 insertions(+), 13 deletions(-) (limited to 'src') diff --git a/CMakeLists.txt b/CMakeLists.txt index 874d695da1a..a122268a52c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -183,7 +183,6 @@ set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) -add_subdirectory(dep) add_subdirectory(src) if(DO_SQL) message("* Copy SQL files ON") diff --git a/src/server/game/Chat/Commands/Level1.cpp b/src/server/game/Chat/Commands/Level1.cpp index 11189d519a0..8a739df76d8 100644 --- a/src/server/game/Chat/Commands/Level1.cpp +++ b/src/server/game/Chat/Commands/Level1.cpp @@ -20,21 +20,21 @@ #include "Common.h" #include "Database/DatabaseEnv.h" -#include "WorldPacket.h" -#include "WorldSession.h" +#include "Packets/WorldPacket.h" +#include "Server/WorldSession.h" #include "World.h" #include "ObjectMgr.h" #include "Player.h" #include "AccountMgr.h" -#include "Opcodes.h" +#include "Server/Protocol/Opcodes.h" #include "Chat.h" -#include "Log.h" +#include "Logging/Log.h" #include "MapManager.h" #include "ObjectAccessor.h" -#include "Language.h" -#include "CellImpl.h" +#include "Miscellaneous/Language.h" +#include "Grids/Cells/CellImpl.h" #include "InstanceSaveMgr.h" -#include "Util.h" +#include "Utilities/Util.h" #ifdef _DEBUG_VMAPS #include "VMapFactory.h" diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt index 028c2185b79..e65b75c79ae 100644 --- a/src/server/shared/CMakeLists.txt +++ b/src/server/shared/CMakeLists.txt @@ -35,8 +35,9 @@ SET(shared_STAT_SRCS include_directories( ${ACE_INCLUDE_DIR} ${CMAKE_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/dep/include - ${CMAKE_SOURCE_DIR}/dep/include/sockets + ${CMAKE_BINARY_DIR}/externals/SFMT + ${CMAKE_SOURCE_DIR}/externals/sockets/include + ${CMAKE_SOURCE_DIR}/externals/utf8cpp ${CMAKE_SOURCE_DIR}/src/server/shared ${CMAKE_SOURCE_DIR}/src/server/shared/Configuration ${CMAKE_SOURCE_DIR}/src/server/shared/Cryptography diff --git a/src/server/shared/Utilities/Util.cpp b/src/server/shared/Utilities/Util.cpp index a3c017fdbfd..dfeb8f62c4d 100644 --- a/src/server/shared/Utilities/Util.cpp +++ b/src/server/shared/Utilities/Util.cpp @@ -20,9 +20,9 @@ #include "Util.h" -#include "sockets/socket_include.h" -#include "utf8cpp/utf8.h" -#include "mersennetwister/MersenneTwister.h" +#include "socket_include.h" +#include "utf8.h" +#include "SFMT.h" #include typedef ACE_TSS MTRandTSS; -- cgit v1.2.3 From f1d39c2aa25d399f7a728db0592242edd7a713f9 Mon Sep 17 00:00:00 2001 From: Brian Date: Mon, 7 Jun 2010 13:33:31 -0600 Subject: * Fixed damn copy / paste type from my last commit. It is still very broken * though :P --HG-- branch : trunk --- src/server/shared/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt index e65b75c79ae..2dfe0c6ede1 100644 --- a/src/server/shared/CMakeLists.txt +++ b/src/server/shared/CMakeLists.txt @@ -35,7 +35,7 @@ SET(shared_STAT_SRCS include_directories( ${ACE_INCLUDE_DIR} ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}/externals/SFMT + ${CMAKE_SOURCE_DIR}/externals/SFMT ${CMAKE_SOURCE_DIR}/externals/sockets/include ${CMAKE_SOURCE_DIR}/externals/utf8cpp ${CMAKE_SOURCE_DIR}/src/server/shared -- cgit v1.2.3 From d9127cdee7142a47797a3dafa07f9d8ee0d5d9f7 Mon Sep 17 00:00:00 2001 From: Brian Date: Mon, 7 Jun 2010 14:13:56 -0600 Subject: * Reverted to the old Mersenne Twister till the new one can be properly added --HG-- branch : trunk --- externals/mersennetwister/MersenneTwister.h | 405 ++++++++++++++++++++++++++++ src/server/game/CMakeLists.txt | 2 +- src/server/game/Maps/Map.h | 2 +- src/server/shared/CMakeLists.txt | 1 + src/server/shared/Utilities/Util.cpp | 3 +- 5 files changed, 410 insertions(+), 3 deletions(-) create mode 100644 externals/mersennetwister/MersenneTwister.h (limited to 'src') diff --git a/externals/mersennetwister/MersenneTwister.h b/externals/mersennetwister/MersenneTwister.h new file mode 100644 index 00000000000..1cff879643f --- /dev/null +++ b/externals/mersennetwister/MersenneTwister.h @@ -0,0 +1,405 @@ +// MersenneTwister.h +// Mersenne Twister random number generator -- a C++ class MTRand +// Based on code by Makoto Matsumoto, Takuji Nishimura, and Shawn Cokus +// Richard J. Wagner v1.0 15 May 2003 rjwagner@writeme.com + +// The Mersenne Twister is an algorithm for generating random numbers. It +// was designed with consideration of the flaws in various other generators. +// The period, 2^19937-1, and the order of equidistribution, 623 dimensions, +// are far greater. The generator is also fast; it avoids multiplication and +// division, and it benefits from caches and pipelines. For more information +// see the inventors' web page at http://www.math.keio.ac.jp/~matumoto/emt.html + +// Reference +// M. Matsumoto and T. Nishimura, "Mersenne Twister: A 623-Dimensionally +// Equidistributed Uniform Pseudo-Random Number Generator", ACM Transactions on +// Modeling and Computer Simulation, Vol. 8, No. 1, January 1998, pp 3-30. + +// Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura, +// Copyright (C) 2000 - 2003, Richard J. Wagner +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions +// are met: +// +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// 3. The names of its contributors may not be used to endorse or promote +// products derived from this software without specific prior written +// permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +// The original code included the following notice: +// +// When you use this, send an email to: matumoto@math.keio.ac.jp +// with an appropriate reference to your work. +// +// It would be nice to CC: rjwagner@writeme.com and Cokus@math.washington.edu +// when you write. + +#ifndef MERSENNETWISTER_H +#define MERSENNETWISTER_H + +// Not thread safe (unless auto-initialization is avoided and each thread has +// its own MTRand object) + +#include"Define.h" + +#include +#include +#include + +class MTRand { +// Data +public: + typedef ::uint32 uint32; + enum { N = 624 }; // length of state vector + enum { SAVE = N + 1 }; // length of array for save() + +protected: + enum { M = 397 }; // period parameter + + uint32 state[N]; // internal state + uint32 *pNext; // next value to get from state + int left; // number of values left before reload needed + +//Methods +public: + MTRand( const uint32& oneSeed ); // initialize with a simple uint32 + MTRand( uint32 *const bigSeed, uint32 const seedLength = N ); // or an array + MTRand(); // auto-initialize with /dev/urandom or time() and clock() + MTRand(const MTRand&); // prevent copy constructor + MTRand& operator=(const MTRand&); // no-op operator= + + // Do NOT use for CRYPTOGRAPHY without securely hashing several returned + // values together, otherwise the generator state can be learned after + // reading 624 consecutive values. + + // Access to 32-bit random numbers + double rand(); // real number in [0,1] + double rand( const double& n ); // real number in [0,n] + double randExc(); // real number in [0,1) + double randExc( const double& n ); // real number in [0,n) + double randDblExc(); // real number in (0,1) + double randDblExc( const double& n ); // real number in (0,n) + uint32 randInt(); // integer in [0,2^32-1] + uint32 randInt( const uint32& n ); // integer in [0,n] for n < 2^32 + double operator()() { return rand(); } // same as rand() + + // Access to 53-bit random numbers (capacity of IEEE double precision) + double rand53(); // real number in [0,1) + + // Access to nonuniform random number distributions + double randNorm( const double& mean = 0.0, const double& variance = 0.0 ); + + // Re-seeding functions with same behavior as initializers + void seed( const uint32 oneSeed ); + void seed( uint32 *const bigSeed, const uint32 seedLength = N ); + void seed(); + + // Saving and loading generator state + void save( uint32* saveArray ) const; // to array of size SAVE + void load( uint32 *const loadArray ); // from such array + /* Trinity not use streams for random values output + friend std::ostream& operator<<( std::ostream& os, const MTRand& mtrand ); + friend std::istream& operator>>( std::istream& is, MTRand& mtrand ); + */ +protected: + void initialize( const uint32 oneSeed ); + void reload(); + uint32 hiBit( const uint32& u ) const { return u & 0x80000000UL; } + uint32 loBit( const uint32& u ) const { return u & 0x00000001UL; } + uint32 loBits( const uint32& u ) const { return u & 0x7fffffffUL; } + uint32 mixBits( const uint32& u, const uint32& v ) const + { return hiBit(u) | loBits(v); } + uint32 twist( const uint32& m, const uint32& s0, const uint32& s1 ) const + { return m ^ (mixBits(s0,s1)>>1) ^ uint32(-(int32)(loBit(s1) & 0x9908b0dfUL)); } + static uint32 hash( time_t t, clock_t c ); +}; + +inline MTRand::MTRand(const MTRand&) + { seed(); } + +inline MTRand& MTRand::operator=(const MTRand&) + { return *this; } + +inline MTRand::MTRand( const uint32& oneSeed ) + { seed(oneSeed); } + +inline MTRand::MTRand( uint32 *const bigSeed, const uint32 seedLength ) + { seed(bigSeed,seedLength); } + +inline MTRand::MTRand() + { seed(); } + +inline double MTRand::rand() + { return double(randInt()) * (1.0/4294967295.0); } + +inline double MTRand::rand( const double& n ) + { return rand() * n; } + +inline double MTRand::randExc() + { return double(randInt()) * (1.0/4294967296.0); } + +inline double MTRand::randExc( const double& n ) + { return randExc() * n; } + +inline double MTRand::randDblExc() + { return ( double(randInt()) + 0.5 ) * (1.0/4294967296.0); } + +inline double MTRand::randDblExc( const double& n ) + { return randDblExc() * n; } + +inline double MTRand::rand53() +{ + uint32 a = randInt() >> 5, b = randInt() >> 6; + return ( a * 67108864.0 + b ) * (1.0/9007199254740992.0); // by Isaku Wada +} + +inline double MTRand::randNorm( const double& mean, const double& variance ) +{ + // Return a real number from a normal (Gaussian) distribution with given + // mean and variance by Box-Muller method + double r = sqrt( -2.0 * log( 1.0-randDblExc()) ) * variance; + double phi = 2.0 * 3.14159265358979323846264338328 * randExc(); + return mean + r * cos(phi); +} + +inline MTRand::uint32 MTRand::randInt() +{ + // Pull a 32-bit integer from the generator state + // Every other access function simply transforms the numbers extracted here + + if( left == 0 ) reload(); + --left; + + register uint32 s1; + s1 = *pNext++; + s1 ^= (s1 >> 11); + s1 ^= (s1 << 7) & 0x9d2c5680UL; + s1 ^= (s1 << 15) & 0xefc60000UL; + return ( s1 ^ (s1 >> 18) ); +} + +inline MTRand::uint32 MTRand::randInt( const uint32& n ) +{ + // Find which bits are used in n + // Optimized by Magnus Jonsson (magnus@smartelectronix.com) + uint32 used = n; + used |= used >> 1; + used |= used >> 2; + used |= used >> 4; + used |= used >> 8; + used |= used >> 16; + + // Draw numbers until one is found in [0,n] + uint32 i; + do + i = randInt() & used; // toss unused bits to shorten search + while( i > n ); + return i; +} + +inline void MTRand::seed( const uint32 oneSeed ) +{ + // Seed the generator with a simple uint32 + initialize(oneSeed); + reload(); +} + +inline void MTRand::seed( uint32 *const bigSeed, const uint32 seedLength ) +{ + // Seed the generator with an array of uint32's + // There are 2^19937-1 possible initial states. This function allows + // all of those to be accessed by providing at least 19937 bits (with a + // default seed length of N = 624 uint32's). Any bits above the lower 32 + // in each element are discarded. + // Just call seed() if you want to get array from /dev/urandom + initialize(19650218UL); + register int i = 1; + register uint32 j = 0; + register int k = ( N > int(seedLength) ? N : int(seedLength) ); + for (; k; --k ) + { + state[i] = + state[i] ^ ( (state[i-1] ^ (state[i-1] >> 30)) * 1664525UL ); + state[i] += ( bigSeed[j] & 0xffffffffUL ) + j; + state[i] &= 0xffffffffUL; + ++i; ++j; + if( i >= N ) { state[0] = state[N-1]; i = 1; } + if( j >= seedLength ) j = 0; + } + for (k = N - 1; k; --k ) + { + state[i] = + state[i] ^ ( (state[i-1] ^ (state[i-1] >> 30)) * 1566083941UL ); + state[i] -= i; + state[i] &= 0xffffffffUL; + ++i; + if( i >= N ) { state[0] = state[N-1]; i = 1; } + } + state[0] = 0x80000000UL; // MSB is 1, assuring non-zero initial array + reload(); +} + +inline void MTRand::seed() +{ + // Seed the generator with hash of time() and clock() values + seed( hash( time(NULL), clock() ) ); +} + +inline void MTRand::initialize( const uint32 seed ) +{ + // Initialize generator state with seed + // See Knuth TAOCP Vol 2, 3rd Ed, p.106 for multiplier. + // In previous versions, most significant bits (MSBs) of the seed affect + // only MSBs of the state array. Modified 9 Jan 2002 by Makoto Matsumoto. + register uint32 *s = state; + register uint32 *r = state; + register int i = 1; + *s++ = seed & 0xffffffffUL; + for (; i < N; ++i ) + { + *s++ = ( 1812433253UL * ( *r ^ (*r >> 30) ) + i ) & 0xffffffffUL; + r++; + } +} + +inline void MTRand::reload() +{ + // Generate N new values in state + // Made clearer and faster by Matthew Bellew (matthew.bellew@home.com) + register uint32 *p = state; + register int i; + for (i = N - M; i--; ++p ) + *p = twist( p[M], p[0], p[1] ); + for (i = M; --i; ++p ) + *p = twist( p[M-N], p[0], p[1] ); + *p = twist( p[M-N], p[0], state[0] ); + + left = N, pNext = state; +} + +inline MTRand::uint32 MTRand::hash( time_t t, clock_t c ) +{ + // Get a uint32 from t and c + // Better than uint32(x) in case x is floating point in [0,1] + // Based on code by Lawrence Kirby (fred@genesis.demon.co.uk) + + static uint32 differ = 0; // guarantee time-based seeds will change + + uint32 h1 = 0; + unsigned char *p = (unsigned char *) &t; + for (size_t i = 0; i < sizeof(t); ++i ) + { + h1 *= UCHAR_MAX + 2U; + h1 += p[i]; + } + uint32 h2 = 0; + p = (unsigned char *) &c; + for (size_t j = 0; j < sizeof(c); ++j ) + { + h2 *= UCHAR_MAX + 2U; + h2 += p[j]; + } + return ( h1 + differ++ ) ^ h2; +} + +inline void MTRand::save( uint32* saveArray ) const +{ + register uint32 *sa = saveArray; + register const uint32 *s = state; + register int i = N; + for (; i--; *sa++ = *s++ ) {} + *sa = left; +} + +inline void MTRand::load( uint32 *const loadArray ) +{ + register uint32 *s = state; + register uint32 *la = loadArray; + register int i = N; + for (; i--; *s++ = *la++ ) {} + left = *la; + pNext = &state[N-left]; +} + +/* Trinity not use streams for random values output +inline std::ostream& operator<<( std::ostream& os, const MTRand& mtrand ) +{ + register const MTRand::uint32 *s = mtrand.state; + register int i = mtrand.N; + for (; i--; os << *s++ << "\t" ) {} + return os << mtrand.left; +} + +inline std::istream& operator>>( std::istream& is, MTRand& mtrand ) +{ + register MTRand::uint32 *s = mtrand.state; + register int i = mtrand.N; + for (; i--; is >> *s++ ) {} + is >> mtrand.left; + mtrand.pNext = &mtrand.state[mtrand.N-mtrand.left]; + return is; +} +*/ + +#endif // MERSENNETWISTER_H + +// Change log: +// +// v0.1 - First release on 15 May 2000 +// - Based on code by Makoto Matsumoto, Takuji Nishimura, and Shawn Cokus +// - Translated from C to C++ +// - Made completely ANSI compliant +// - Designed convenient interface for initialization, seeding, and +// obtaining numbers in default or user-defined ranges +// - Added automatic seeding from /dev/urandom or time() and clock() +// - Provided functions for saving and loading generator state +// +// v0.2 - Fixed bug which reloaded generator one step too late +// +// v0.3 - Switched to clearer, faster reload() code from Matthew Bellew +// +// v0.4 - Removed trailing newline in saved generator format to be consistent +// with output format of built-in types +// +// v0.5 - Improved portability by replacing static const int's with enum's and +// clarifying return values in seed(); suggested by Eric Heimburg +// - Removed MAXINT constant; use 0xffffffffUL instead +// +// v0.6 - Eliminated seed overflow when uint32 is larger than 32 bits +// - Changed integer [0,n] generator to give better uniformity +// +// v0.7 - Fixed operator precedence ambiguity in reload() +// - Added access for real numbers in (0,1) and (0,n) +// +// v0.8 - Included time.h header to properly support time_t and clock_t +// +// v1.0 - Revised seeding to match 26 Jan 2002 update of Nishimura and Matsumoto +// - Allowed for seeding with arrays of any length +// - Added access for real numbers in [0,1) with 53-bit resolution +// - Added access for real numbers from normal (Gaussian) distributions +// - Increased overall speed by optimizing twist() +// - Doubled speed of integer [0,n] generation +// - Fixed out-of-range number generation on 64-bit machines +// - Improved portability by substituting literal constants for long enum's +// - Changed license from GNU LGPL to BSD + diff --git a/src/server/game/CMakeLists.txt b/src/server/game/CMakeLists.txt index 444f181f4a9..00c9898eec8 100644 --- a/src/server/game/CMakeLists.txt +++ b/src/server/game/CMakeLists.txt @@ -317,7 +317,7 @@ SET(game_STAT_SRCS include_directories( ${ACE_INCLUDE_DIR} ${CMAKE_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/dep/include + ${CMAKE_SOURCE_DIR}/externals/mersennetwister ${CMAKE_SOURCE_DIR}/src/server/shared ${CMAKE_SOURCE_DIR}/src/server/shared/Database ${CMAKE_SOURCE_DIR}/src/server/game diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h index a0e3a2a93f8..5445401c487 100644 --- a/src/server/game/Maps/Map.h +++ b/src/server/game/Maps/Map.h @@ -33,7 +33,7 @@ #include "Miscellaneous/SharedDefines.h" #include "Grids/GridRefManager.h" #include "Maps/MapRefManager.h" -#include "mersennetwister/MersenneTwister.h" +#include "MersenneTwister.h" #include #include diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt index 2dfe0c6ede1..933fed1c74c 100644 --- a/src/server/shared/CMakeLists.txt +++ b/src/server/shared/CMakeLists.txt @@ -35,6 +35,7 @@ SET(shared_STAT_SRCS include_directories( ${ACE_INCLUDE_DIR} ${CMAKE_BINARY_DIR} + ${CMAKE_SOURCE_DIR}/externals/mersennetwister ${CMAKE_SOURCE_DIR}/externals/SFMT ${CMAKE_SOURCE_DIR}/externals/sockets/include ${CMAKE_SOURCE_DIR}/externals/utf8cpp diff --git a/src/server/shared/Utilities/Util.cpp b/src/server/shared/Utilities/Util.cpp index dfeb8f62c4d..14c0431c967 100644 --- a/src/server/shared/Utilities/Util.cpp +++ b/src/server/shared/Utilities/Util.cpp @@ -22,7 +22,8 @@ #include "socket_include.h" #include "utf8.h" -#include "SFMT.h" +//#include "SFMT.h" +#include "MersenneTwister.h" #include typedef ACE_TSS MTRandTSS; -- cgit v1.2.3 From 156f4c3057d4c5aeb5a175d0490113655fb47c35 Mon Sep 17 00:00:00 2001 From: Tartalo Date: Mon, 7 Jun 2010 22:34:36 +0200 Subject: Merge cmake files from shared/ --HG-- branch : trunk --- src/server/shared/CMakeLists.txt | 94 ++++++++++++++++++++++---- src/server/shared/Configuration/CMakeLists.txt | 22 ------ src/server/shared/Cryptography/CMakeLists.txt | 26 ------- src/server/shared/Database/CMakeLists.txt | 30 -------- 4 files changed, 81 insertions(+), 91 deletions(-) delete mode 100644 src/server/shared/Configuration/CMakeLists.txt delete mode 100644 src/server/shared/Cryptography/CMakeLists.txt delete mode 100644 src/server/shared/Database/CMakeLists.txt (limited to 'src') diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt index 933fed1c74c..3495a47f915 100644 --- a/src/server/shared/CMakeLists.txt +++ b/src/server/shared/CMakeLists.txt @@ -1,16 +1,4 @@ -add_subdirectory(Configuration) -add_subdirectory(Cryptography) -add_subdirectory(Database) -add_subdirectory(DataStores) -add_subdirectory(Debugging) -add_subdirectory(Dynamic) -add_subdirectory(Logging) -add_subdirectory(Packets) -add_subdirectory(Policies) -add_subdirectory(Threading) -add_subdirectory(Utilities) - -########### next target ############### +########### shared ############### SET(shared_STAT_SRCS Debugging/Errors.h @@ -59,3 +47,83 @@ target_link_libraries( shared ${ACE_LIBRARY} ) + + +########### trinityconfig ############### + +SET(trinityconfig_STAT_SRCS + Configuration/dotconfpp/dotconfpp.cpp + Configuration/dotconfpp/dotconfpp.h + Configuration/dotconfpp/mempool.cpp + Configuration/dotconfpp/mempool.h + Configuration/Config.cpp + Configuration/Config.h + Configuration/ConfigEnv.h +) + +include_directories( + ${ACE_INCLUDE_DIR} + ${CMAKE_BINARY_DIR} + ${CMAKE_SOURCE_DIR}/src/server/shared +) + +add_library(trinityconfig STATIC ${trinityconfig_STAT_SRCS}) + +########### trinityauth ############### + +SET(trinityauth_STAT_SRCS + Cryptography/Authentication/AuthCrypt.cpp + Cryptography/Authentication/AuthCrypt.h + Cryptography/BigNumber.cpp + Cryptography/BigNumber.h + Cryptography/HMACSHA1.cpp + Cryptography/HMACSHA1.h + Cryptography/SHA1.cpp + Cryptography/SHA1.h + Cryptography/MD5.c + Cryptography/MD5.h + Cryptography/ARC4.cpp + Cryptography/ARC4.h +) + +include_directories( + ${ACE_INCLUDE_DIR} + ${CMAKE_BINARY_DIR} + ${CMAKE_SOURCE_DIR}/src/server/shared + ${MYSQL_INCLUDE_DIR} +) + +add_library(trinityauth STATIC ${trinityauth_STAT_SRCS}) + +########### trinitydatabase ############### + +SET(trinitydatabase_STAT_SRCS + DataStores/DBCFileLoader.cpp + DataStores/DBCFileLoader.h + DataStores/DBCStore.h + Database/Database.cpp + Database/Database.h + Database/DatabaseEnv.h + Database/DatabaseImpl.h + Database/Field.cpp + Database/Field.h + Database/QueryResult.cpp + Database/QueryResult.h + Database/SQLStorage.cpp + Database/SQLStorage.h + Database/SqlDelayThread.cpp + Database/SqlDelayThread.h + Database/SqlOperations.cpp + Database/SqlOperations.h +) + +include_directories( + ${ACE_INCLUDE_DIR} + ${CMAKE_BINARY_DIR} + ${CMAKE_SOURCE_DIR}/src/server/shared + ${CMAKE_SOURCE_DIR}/src/server/shared/Database + ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object + ${MYSQL_INCLUDE_DIR} +) + +add_library(trinitydatabase STATIC ${trinitydatabase_STAT_SRCS}) \ No newline at end of file diff --git a/src/server/shared/Configuration/CMakeLists.txt b/src/server/shared/Configuration/CMakeLists.txt deleted file mode 100644 index da1c2e8aa3b..00000000000 --- a/src/server/shared/Configuration/CMakeLists.txt +++ /dev/null @@ -1,22 +0,0 @@ - -########### next target ############### - -SET(trinityconfig_STAT_SRCS - dotconfpp/dotconfpp.cpp - dotconfpp/dotconfpp.h - dotconfpp/mempool.cpp - dotconfpp/mempool.h - Config.cpp - Config.h - ConfigEnv.h -) - -include_directories( - ${ACE_INCLUDE_DIR} - ${CMAKE_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/src/server/shared - ${CMAKE_SOURCE_DIR}/src/server/framework -) - -add_library(trinityconfig STATIC ${trinityconfig_STAT_SRCS}) - diff --git a/src/server/shared/Cryptography/CMakeLists.txt b/src/server/shared/Cryptography/CMakeLists.txt deleted file mode 100644 index cdd9ece3fa0..00000000000 --- a/src/server/shared/Cryptography/CMakeLists.txt +++ /dev/null @@ -1,26 +0,0 @@ - -########### next target ############### - -SET(trinityauth_STAT_SRCS - Authentication/AuthCrypt.cpp - Authentication/AuthCrypt.h - BigNumber.cpp - BigNumber.h - HMACSHA1.cpp - HMACSHA1.h - SHA1.cpp - SHA1.h - MD5.c - MD5.h - ARC4.cpp - ARC4.h -) - -include_directories( - ${ACE_INCLUDE_DIR} - ${CMAKE_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/src/server/shared - ${MYSQL_INCLUDE_DIR} -) - -add_library(trinityauth STATIC ${trinityauth_STAT_SRCS}) diff --git a/src/server/shared/Database/CMakeLists.txt b/src/server/shared/Database/CMakeLists.txt deleted file mode 100644 index cfe36b8c7d3..00000000000 --- a/src/server/shared/Database/CMakeLists.txt +++ /dev/null @@ -1,30 +0,0 @@ -SET(trinitydatabase_STAT_SRCS - ../DataStores/DBCFileLoader.cpp - ../DataStores/DBCFileLoader.h - ../DataStores/DBCStore.h - Database.cpp - Database.h - DatabaseEnv.h - DatabaseImpl.h - Field.cpp - Field.h - QueryResult.cpp - QueryResult.h - SQLStorage.cpp - SQLStorage.h - SqlDelayThread.cpp - SqlDelayThread.h - SqlOperations.cpp - SqlOperations.h -) - -include_directories( - ${ACE_INCLUDE_DIR} - ${CMAKE_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/src/server/shared - ${CMAKE_SOURCE_DIR}/src/server/shared/Database - ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object - ${MYSQL_INCLUDE_DIR} -) - -add_library(trinitydatabase STATIC ${trinitydatabase_STAT_SRCS}) -- cgit v1.2.3 From b0e1605455973e56bd9eb1235ee85d2d3909790d Mon Sep 17 00:00:00 2001 From: Brian Date: Mon, 7 Jun 2010 14:44:18 -0600 Subject: * Getting closer (at least for Linux :) ) --HG-- branch : trunk --- src/server/game/Chat/Chat.cpp | 16 ++++++++-------- src/server/game/Chat/Commands/Level2.cpp | 8 ++++---- src/server/game/Chat/Commands/Level3.cpp | 20 ++++++++++---------- src/server/game/Conditions/ConditionMgr.cpp | 2 +- src/server/game/DataStores/DBCStores.cpp | 6 +++--- src/server/game/DungeonFinding/LFGMgr.cpp | 4 ++-- src/server/game/Entities/Corpse/Corpse.cpp | 4 ++-- src/server/game/Entities/Creature/Creature.cpp | 16 ++++++++-------- src/server/game/Entities/Creature/CreatureGroups.cpp | 2 +- src/server/game/Entities/Creature/GossipDef.cpp | 8 ++++---- .../game/Entities/Creature/TemporarySummon.cpp | 2 +- .../game/Entities/DynamicObject/DynamicObject.cpp | 10 +++++----- src/server/game/Entities/GameObject/GameObject.cpp | 16 ++++++++-------- src/server/game/Entities/Item/Container/Bag.cpp | 4 ++-- src/server/game/Entities/Item/Item.cpp | 4 ++-- src/server/game/OutdoorPvP/OutdoorPvP.h | 4 ++-- src/server/game/Pools/PoolHandler.h | 2 +- src/server/game/Weather/Weather.h | 4 ++-- 18 files changed, 66 insertions(+), 66 deletions(-) (limited to 'src') diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp index 6e1adffa625..0d9f1485d20 100644 --- a/src/server/game/Chat/Chat.cpp +++ b/src/server/game/Chat/Chat.cpp @@ -21,19 +21,19 @@ #include "Common.h" #include "ObjectMgr.h" #include "World.h" -#include "WorldPacket.h" -#include "WorldSession.h" +#include "Packets/WorldPacket.h" +#include "Server/WorldSession.h" #include "Database/DatabaseEnv.h" #include "AccountMgr.h" -#include "CellImpl.h" +#include "Grids/Cells/CellImpl.h" #include "Chat.h" -#include "GridNotifiersImpl.h" -#include "Language.h" -#include "Log.h" -#include "Opcodes.h" +#include "Grids/Notifiers/GridNotifiersImpl.h" +#include "Miscellaneous/Language.h" +#include "Logging/Log.h" +#include "Server/Protocol/Opcodes.h" #include "Player.h" -#include "UpdateMask.h" +#include "Entities/Object/Updates/UpdateMask.h" #include "SpellMgr.h" // Supported shift-links (client generated and server side) diff --git a/src/server/game/Chat/Commands/Level2.cpp b/src/server/game/Chat/Commands/Level2.cpp index 4f299c932e8..fbca47ebad0 100644 --- a/src/server/game/Chat/Commands/Level2.cpp +++ b/src/server/game/Chat/Commands/Level2.cpp @@ -25,17 +25,17 @@ #include "Player.h" #include "Item.h" #include "GameObject.h" -#include "Opcodes.h" +#include "Server/Protocol/Opcodes.h" #include "Chat.h" #include "MapManager.h" -#include "Language.h" +#include "Miscellaneous/Language.h" #include "World.h" #include "GameEventMgr.h" #include "SpellMgr.h" #include "PoolHandler.h" #include "AccountMgr.h" -#include "WaypointManager.h" -#include "Util.h" +#include "Movement/Waypoints/WaypointManager.h" +#include "Utilities/Util.h" #include #include #include diff --git a/src/server/game/Chat/Commands/Level3.cpp b/src/server/game/Chat/Commands/Level3.cpp index 8ac26cc5e8f..deabbe62871 100644 --- a/src/server/game/Chat/Commands/Level3.cpp +++ b/src/server/game/Chat/Commands/Level3.cpp @@ -20,8 +20,8 @@ #include "Common.h" #include "Database/DatabaseEnv.h" -#include "WorldPacket.h" -#include "WorldSession.h" +#include "Packets/WorldPacket.h" +#include "Server/WorldSession.h" #include "World.h" #include "ObjectMgr.h" #include "AuctionHouseMgr.h" @@ -29,29 +29,29 @@ #include "PlayerDump.h" #include "SpellMgr.h" #include "Player.h" -#include "Opcodes.h" +#include "Server/Protocol/Opcodes.h" #include "GameObject.h" #include "Chat.h" -#include "Log.h" +#include "Logging/Log.h" #include "Guild.h" #include "ObjectAccessor.h" #include "MapManager.h" -#include "Language.h" -#include "GridNotifiersImpl.h" -#include "CellImpl.h" +#include "Miscellaneous/Language.h" +#include "Grids/Notifiers/GridNotifiersImpl.h" +#include "Grids/Cells/CellImpl.h" #include "Weather.h" #include "PointMovementGenerator.h" #include "TargetedMovementGenerator.h" #include "SkillDiscovery.h" #include "SkillExtraItems.h" #include "SystemConfig.h" -#include "Config/ConfigEnv.h" -#include "Util.h" +#include "Configuration/ConfigEnv.h" +#include "Utilities/Util.h" #include "ItemEnchantmentMgr.h" #include "BattleGroundMgr.h" #include "InstanceSaveMgr.h" #include "InstanceData.h" -#include "AuctionHouseBot.h" +#include "AuctionHouse/AuctionHouseBot/AuctionHouseBot.h" #include "CreatureEventAIMgr.h" #include "SpellAuraEffects.h" #include "DBCEnums.h" diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index 8e5a7e5677e..bdd475f884d 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -25,7 +25,7 @@ #include "SpellMgr.h" #include "GameEventMgr.h" #include "ObjectMgr.h" -#include "ProgressBar.h" +#include "Utilities/ProgressBar.h" #include "InstanceData.h" #include "ConditionMgr.h" diff --git a/src/server/game/DataStores/DBCStores.cpp b/src/server/game/DataStores/DBCStores.cpp index ba0e3af9a64..55eb63ddb1e 100644 --- a/src/server/game/DataStores/DBCStores.cpp +++ b/src/server/game/DataStores/DBCStores.cpp @@ -20,9 +20,9 @@ #include "DBCStores.h" #include "Policies/SingletonImp.h" -#include "Log.h" -#include "ProgressBar.h" -#include "SharedDefines.h" +#include "Logging/Log.h" +#include "Utilities/ProgressBar.h" +#include "Miscellaneous/SharedDefines.h" #include "SpellMgr.h" #include "DBCfmt.h" diff --git a/src/server/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp index ba418cdb191..71f27ead4d5 100644 --- a/src/server/game/DungeonFinding/LFGMgr.cpp +++ b/src/server/game/DungeonFinding/LFGMgr.cpp @@ -17,12 +17,12 @@ */ #include "Policies/SingletonImp.h" #include "Common.h" -#include "SharedDefines.h" +#include "Miscellaneous/SharedDefines.h" #include "Group.h" #include "Player.h" #include "LFGMgr.h" #include "ObjectMgr.h" -#include "WorldPacket.h" +#include "Packets/WorldPacket.h" INSTANTIATE_SINGLETON_1(LFGMgr); diff --git a/src/server/game/Entities/Corpse/Corpse.cpp b/src/server/game/Entities/Corpse/Corpse.cpp index 510ea13e78b..96e5423a085 100644 --- a/src/server/game/Entities/Corpse/Corpse.cpp +++ b/src/server/game/Entities/Corpse/Corpse.cpp @@ -21,10 +21,10 @@ #include "Common.h" #include "Corpse.h" #include "Player.h" -#include "UpdateMask.h" +#include "Entities/Object/Updates/UpdateMask.h" #include "ObjectAccessor.h" #include "Database/DatabaseEnv.h" -#include "Opcodes.h" +#include "Server/Protocol/Opcodes.h" #include "GossipDef.h" #include "World.h" diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index fbfae17a48b..f7ac131342e 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -20,7 +20,7 @@ #include "Common.h" #include "Database/DatabaseEnv.h" -#include "WorldPacket.h" +#include "Packets/WorldPacket.h" #include "World.h" #include "ObjectMgr.h" #include "SpellMgr.h" @@ -29,20 +29,20 @@ #include "GossipDef.h" #include "Player.h" #include "PoolHandler.h" -#include "Opcodes.h" -#include "Log.h" +#include "Server/Protocol/Opcodes.h" +#include "Logging/Log.h" #include "LootMgr.h" #include "MapManager.h" #include "CreatureAI.h" #include "CreatureAISelector.h" -#include "Formulas.h" +#include "Miscellaneous/Formulas.h" #include "WaypointMovementGenerator.h" #include "InstanceData.h" #include "BattleGroundMgr.h" -#include "Util.h" -#include "GridNotifiers.h" -#include "GridNotifiersImpl.h" -#include "CellImpl.h" +#include "Utilities/Util.h" +#include "Grids/Notifiers/GridNotifiers.h" +#include "Grids/Notifiers/GridNotifiersImpl.h" +#include "Grids/Cells/CellImpl.h" #include "OutdoorPvPMgr.h" #include "GameEventMgr.h" #include "CreatureGroups.h" diff --git a/src/server/game/Entities/Creature/CreatureGroups.cpp b/src/server/game/Entities/Creature/CreatureGroups.cpp index c2af59458f7..03cb8da00bf 100644 --- a/src/server/game/Entities/Creature/CreatureGroups.cpp +++ b/src/server/game/Entities/Creature/CreatureGroups.cpp @@ -21,7 +21,7 @@ #include "Creature.h" #include "CreatureGroups.h" #include "ObjectMgr.h" -#include "ProgressBar.h" +#include "Utilities/ProgressBar.h" #include "Policies/SingletonImp.h" #include "CreatureAI.h" diff --git a/src/server/game/Entities/Creature/GossipDef.cpp b/src/server/game/Entities/Creature/GossipDef.cpp index 3e0fec52bc7..e2cd8965373 100644 --- a/src/server/game/Entities/Creature/GossipDef.cpp +++ b/src/server/game/Entities/Creature/GossipDef.cpp @@ -21,10 +21,10 @@ #include "QuestDef.h" #include "GossipDef.h" #include "ObjectMgr.h" -#include "Opcodes.h" -#include "WorldPacket.h" -#include "WorldSession.h" -#include "Formulas.h" +#include "Server/Protocol/Opcodes.h" +#include "Packets/WorldPacket.h" +#include "Server/WorldSession.h" +#include "Miscellaneous/Formulas.h" GossipMenu::GossipMenu() { diff --git a/src/server/game/Entities/Creature/TemporarySummon.cpp b/src/server/game/Entities/Creature/TemporarySummon.cpp index 11652460fc5..860bdf21803 100644 --- a/src/server/game/Entities/Creature/TemporarySummon.cpp +++ b/src/server/game/Entities/Creature/TemporarySummon.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "Log.h" +#include "Logging/Log.h" #include "ObjectAccessor.h" #include "CreatureAI.h" #include "ObjectMgr.h" diff --git a/src/server/game/Entities/DynamicObject/DynamicObject.cpp b/src/server/game/Entities/DynamicObject/DynamicObject.cpp index 48179190a6e..49f82f19b80 100644 --- a/src/server/game/Entities/DynamicObject/DynamicObject.cpp +++ b/src/server/game/Entities/DynamicObject/DynamicObject.cpp @@ -19,14 +19,14 @@ */ #include "Common.h" -#include "UpdateMask.h" -#include "Opcodes.h" +#include "Entities/Object/Updates/UpdateMask.h" +#include "Server/Protocol/Opcodes.h" #include "World.h" #include "ObjectAccessor.h" #include "Database/DatabaseEnv.h" -#include "GridNotifiers.h" -#include "CellImpl.h" -#include "GridNotifiersImpl.h" +#include "Grids/Notifiers/GridNotifiers.h" +#include "Grids/Cells/CellImpl.h" +#include "Grids/Notifiers/GridNotifiersImpl.h" DynamicObject::DynamicObject() : WorldObject() { diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index 596b156bd35..9bc1e2ff5e2 100644 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -25,20 +25,20 @@ #include "PoolHandler.h" #include "SpellMgr.h" #include "Spell.h" -#include "UpdateMask.h" -#include "Opcodes.h" -#include "WorldPacket.h" +#include "Entities/Object/Updates/UpdateMask.h" +#include "Server/Protocol/Opcodes.h" +#include "Packets/WorldPacket.h" #include "World.h" #include "Database/DatabaseEnv.h" #include "LootMgr.h" -#include "GridNotifiers.h" -#include "GridNotifiersImpl.h" -#include "CellImpl.h" +#include "Grids/Notifiers/GridNotifiers.h" +#include "Grids/Notifiers/GridNotifiersImpl.h" +#include "Grids/Cells/CellImpl.h" #include "InstanceData.h" #include "BattleGround.h" -#include "Util.h" +#include "Utilities/Util.h" #include "OutdoorPvPMgr.h" -#include "BattleGroundAV.h" +#include "BattleGrounds/Zones/BattleGroundAV.h" #include "ScriptMgr.h" GameObject::GameObject() : WorldObject(), m_goValue(new GameObjectValue) diff --git a/src/server/game/Entities/Item/Container/Bag.cpp b/src/server/game/Entities/Item/Container/Bag.cpp index aa78126b198..e1488e2390c 100644 --- a/src/server/game/Entities/Item/Container/Bag.cpp +++ b/src/server/game/Entities/Item/Container/Bag.cpp @@ -23,8 +23,8 @@ #include "Database/DatabaseEnv.h" #include "Bag.h" -#include "Log.h" -#include "UpdateData.h" +#include "Logging/Log.h" +#include "Entities/Object/Updates/UpdateData.h" Bag::Bag(): Item() { diff --git a/src/server/game/Entities/Item/Item.cpp b/src/server/game/Entities/Item/Item.cpp index 5c2d94d399b..d6b07ecac01 100644 --- a/src/server/game/Entities/Item/Item.cpp +++ b/src/server/game/Entities/Item/Item.cpp @@ -21,7 +21,7 @@ #include "Common.h" #include "Item.h" #include "ObjectMgr.h" -#include "WorldPacket.h" +#include "Packets/WorldPacket.h" #include "Database/DatabaseEnv.h" #include "ItemEnchantmentMgr.h" #include "SpellMgr.h" @@ -1147,4 +1147,4 @@ uint32 Item::GetPlayedTime() bool Item::IsRefundExpired() { return (GetPlayedTime() > 2*HOUR); -} \ No newline at end of file +} diff --git a/src/server/game/OutdoorPvP/OutdoorPvP.h b/src/server/game/OutdoorPvP/OutdoorPvP.h index 55ea98a2a1f..4f8d32c9383 100644 --- a/src/server/game/OutdoorPvP/OutdoorPvP.h +++ b/src/server/game/OutdoorPvP/OutdoorPvP.h @@ -19,8 +19,8 @@ #ifndef OUTDOOR_PVP_H_ #define OUTDOOR_PVP_H_ -#include "Util.h" -#include "SharedDefines.h" +#include "Utilities/Util.h" +#include "Miscellaneous/SharedDefines.h" #include "ZoneScript.h" class GameObject; diff --git a/src/server/game/Pools/PoolHandler.h b/src/server/game/Pools/PoolHandler.h index 0ba4cc7769f..7263eb7a7f7 100644 --- a/src/server/game/Pools/PoolHandler.h +++ b/src/server/game/Pools/PoolHandler.h @@ -19,7 +19,7 @@ #ifndef TRINITY_POOLHANDLER_H #define TRINITY_POOLHANDLER_H -#include "Platform/Define.h" +#include "Define.h" #include "Policies/Singleton.h" #include "Creature.h" #include "GameObject.h" diff --git a/src/server/game/Weather/Weather.h b/src/server/game/Weather/Weather.h index 874eccba64f..35012a5f9dc 100644 --- a/src/server/game/Weather/Weather.h +++ b/src/server/game/Weather/Weather.h @@ -26,8 +26,8 @@ #define __WEATHER_H #include "Common.h" -#include "SharedDefines.h" -#include "Timer.h" +#include "Miscellaneous/SharedDefines.h" +#include "Utilities/Timer.h" class Player; -- cgit v1.2.3 From fdae709af76ad3d3839433b34bede93ad911abef Mon Sep 17 00:00:00 2001 From: Tartalo Date: Mon, 7 Jun 2010 22:58:24 +0200 Subject: Fix include dirs in game/ cmake file --HG-- branch : trunk --- src/server/game/CMakeLists.txt | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'src') diff --git a/src/server/game/CMakeLists.txt b/src/server/game/CMakeLists.txt index 00c9898eec8..65084629b38 100644 --- a/src/server/game/CMakeLists.txt +++ b/src/server/game/CMakeLists.txt @@ -319,7 +319,17 @@ include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/externals/mersennetwister ${CMAKE_SOURCE_DIR}/src/server/shared + ${CMAKE_SOURCE_DIR}/src/server/shared/Configuration + ${CMAKE_SOURCE_DIR}/src/server/shared/Cryptography ${CMAKE_SOURCE_DIR}/src/server/shared/Database + ${CMAKE_SOURCE_DIR}/src/server/shared/DataStores + ${CMAKE_SOURCE_DIR}/src/server/shared/Debugging + ${CMAKE_SOURCE_DIR}/src/server/shared/Dynamic + ${CMAKE_SOURCE_DIR}/src/server/shared/Logging + ${CMAKE_SOURCE_DIR}/src/server/shared/Packets + ${CMAKE_SOURCE_DIR}/src/server/shared/Policies + ${CMAKE_SOURCE_DIR}/src/server/shared/Threading + ${CMAKE_SOURCE_DIR}/src/server/shared/Utilities ${CMAKE_SOURCE_DIR}/src/server/game ${CMAKE_SOURCE_DIR}/src/server/game/Accounts ${CMAKE_SOURCE_DIR}/src/server/game/Achievements @@ -352,13 +362,17 @@ include_directories( ${CMAKE_SOURCE_DIR}/src/server/game/Loot ${CMAKE_SOURCE_DIR}/src/server/game/Mails ${CMAKE_SOURCE_DIR}/src/server/game/Maps + ${CMAKE_SOURCE_DIR}/src/server/game/Miscellaneous ${CMAKE_SOURCE_DIR}/src/server/game/Movement ${CMAKE_SOURCE_DIR}/src/server/game/Movement/MovementGenerators + ${CMAKE_SOURCE_DIR}/src/server/game/Movement/Waypoints ${CMAKE_SOURCE_DIR}/src/server/game/OutdoorPvP ${CMAKE_SOURCE_DIR}/src/server/game/Pools ${CMAKE_SOURCE_DIR}/src/server/game/Quests ${CMAKE_SOURCE_DIR}/src/server/game/Reputation ${CMAKE_SOURCE_DIR}/src/server/game/Scripting + ${CMAKE_SOURCE_DIR}/src/server/game/Server/Protocol + ${CMAKE_SOURCE_DIR}/src/server/game/Server ${CMAKE_SOURCE_DIR}/src/server/game/Skills ${CMAKE_SOURCE_DIR}/src/server/game/Spells ${CMAKE_SOURCE_DIR}/src/server/game/Spells/Auras -- cgit v1.2.3 From c8344494006b79351b69d06f57b6f6e3b971f3ee Mon Sep 17 00:00:00 2001 From: Tartalo Date: Mon, 7 Jun 2010 23:40:17 +0200 Subject: More fixes for game/ cmake compilation --HG-- branch : trunk --- src/server/collision/Management/IVMapManager.h | 4 ++-- src/server/game/CMakeLists.txt | 21 ++++++++++++++++++++- src/server/game/Entities/Object/Object.cpp | 2 +- src/server/game/Entities/Player/Player.cpp | 2 +- src/server/game/Entities/Transport/Transport.cpp | 2 +- src/server/game/Entities/Unit/Unit.cpp | 2 +- src/server/game/Globals/GlobalEvents.cpp | 2 +- src/server/game/Globals/ObjectMgr.cpp | 2 +- src/server/game/Grids/GridStates.cpp | 2 +- src/server/game/Grids/Notifiers/GridNotifiers.cpp | 2 +- src/server/game/Guilds/Guild.cpp | 2 +- src/server/game/Instances/InstanceSaveMgr.cpp | 10 +++++----- 12 files changed, 36 insertions(+), 17 deletions(-) (limited to 'src') diff --git a/src/server/collision/Management/IVMapManager.h b/src/server/collision/Management/IVMapManager.h index 00629eb122c..6a0e7179fa7 100644 --- a/src/server/collision/Management/IVMapManager.h +++ b/src/server/collision/Management/IVMapManager.h @@ -19,8 +19,8 @@ #ifndef _IVMAPMANAGER_H #define _IVMAPMANAGER_H -#include -#include +#include +#include "Define.h" //=========================================================== diff --git a/src/server/game/CMakeLists.txt b/src/server/game/CMakeLists.txt index 65084629b38..44c5e32baa1 100644 --- a/src/server/game/CMakeLists.txt +++ b/src/server/game/CMakeLists.txt @@ -315,15 +315,19 @@ SET(game_STAT_SRCS ) include_directories( - ${ACE_INCLUDE_DIR} ${CMAKE_BINARY_DIR} + ${CMAKE_SOURCE_DIR}/externals ${CMAKE_SOURCE_DIR}/externals/mersennetwister + ${CMAKE_SOURCE_DIR}/src/server/collision + ${CMAKE_SOURCE_DIR}/src/server/collision/Management ${CMAKE_SOURCE_DIR}/src/server/shared ${CMAKE_SOURCE_DIR}/src/server/shared/Configuration ${CMAKE_SOURCE_DIR}/src/server/shared/Cryptography ${CMAKE_SOURCE_DIR}/src/server/shared/Database ${CMAKE_SOURCE_DIR}/src/server/shared/DataStores ${CMAKE_SOURCE_DIR}/src/server/shared/Debugging + ${CMAKE_SOURCE_DIR}/src/server/shared/Dynamic/CountedReference + ${CMAKE_SOURCE_DIR}/src/server/shared/Dynamic/LinkedReference ${CMAKE_SOURCE_DIR}/src/server/shared/Dynamic ${CMAKE_SOURCE_DIR}/src/server/shared/Logging ${CMAKE_SOURCE_DIR}/src/server/shared/Packets @@ -335,27 +339,40 @@ include_directories( ${CMAKE_SOURCE_DIR}/src/server/game/Achievements ${CMAKE_SOURCE_DIR}/src/server/game/Addons ${CMAKE_SOURCE_DIR}/src/server/game/AI + ${CMAKE_SOURCE_DIR}/src/server/game/AI/CoreAI ${CMAKE_SOURCE_DIR}/src/server/game/AI/EventAI ${CMAKE_SOURCE_DIR}/src/server/game/AI/ScriptedAI ${CMAKE_SOURCE_DIR}/src/server/game/AuctionHouse + ${CMAKE_SOURCE_DIR}/src/server/game/AuctionHouse/AuctionHouseBot ${CMAKE_SOURCE_DIR}/src/server/game/BattleGrounds + ${CMAKE_SOURCE_DIR}/src/server/game/BattleGrounds/Zones ${CMAKE_SOURCE_DIR}/src/server/game/Calendar ${CMAKE_SOURCE_DIR}/src/server/game/Chat + ${CMAKE_SOURCE_DIR}/src/server/game/Chat/Channels + ${CMAKE_SOURCE_DIR}/src/server/game/Chat/Commands ${CMAKE_SOURCE_DIR}/src/server/game/Combat ${CMAKE_SOURCE_DIR}/src/server/game/Conditions ${CMAKE_SOURCE_DIR}/src/server/game/DataStores + ${CMAKE_SOURCE_DIR}/src/server/game/DungeonFinding ${CMAKE_SOURCE_DIR}/src/server/game/Entities ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Creature + ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Corpse + ${CMAKE_SOURCE_DIR}/src/server/game/Entities/DynamicObject ${CMAKE_SOURCE_DIR}/src/server/game/Entities/GameObject ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Item ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object + ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object/Updates ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Pet ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Player ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Totem ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Unit ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Vehicle + ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Transport ${CMAKE_SOURCE_DIR}/src/server/game/Events ${CMAKE_SOURCE_DIR}/src/server/game/Globals + ${CMAKE_SOURCE_DIR}/src/server/game/Grids/Cells + ${CMAKE_SOURCE_DIR}/src/server/game/Grids/Notifiers + ${CMAKE_SOURCE_DIR}/src/server/game/Grids ${CMAKE_SOURCE_DIR}/src/server/game/Groups ${CMAKE_SOURCE_DIR}/src/server/game/Guilds ${CMAKE_SOURCE_DIR}/src/server/game/Instances @@ -367,6 +384,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/src/server/game/Movement/MovementGenerators ${CMAKE_SOURCE_DIR}/src/server/game/Movement/Waypoints ${CMAKE_SOURCE_DIR}/src/server/game/OutdoorPvP + ${CMAKE_SOURCE_DIR}/src/server/game/OutdoorPvP/Zones ${CMAKE_SOURCE_DIR}/src/server/game/Pools ${CMAKE_SOURCE_DIR}/src/server/game/Quests ${CMAKE_SOURCE_DIR}/src/server/game/Reputation @@ -380,6 +398,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/src/server/game/Weather ${CMAKE_SOURCE_DIR}/src/server/game/World ${MYSQL_INCLUDE_DIR} + ${ACE_INCLUDE_DIR} ) if(NOT DO_SCRIPTS) diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index 2a7397db8b8..5be2639bc3e 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -35,7 +35,7 @@ #include "MapManager.h" #include "ObjectAccessor.h" #include "Log.h" -#include "Transports.h" +#include "Transport.h" #include "TargetedMovementGenerator.h" #include "WaypointMovementGenerator.h" #include "VMapFactory.h" diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 2221098a9be..7ee5248dd54 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -50,7 +50,7 @@ #include "Guild.h" #include "Pet.h" #include "Util.h" -#include "Transports.h" +#include "Transport.h" #include "Weather.h" #include "BattleGround.h" #include "BattleGroundAV.h" diff --git a/src/server/game/Entities/Transport/Transport.cpp b/src/server/game/Entities/Transport/Transport.cpp index 444e115f8b9..e06b76f1c96 100644 --- a/src/server/game/Entities/Transport/Transport.cpp +++ b/src/server/game/Entities/Transport/Transport.cpp @@ -20,7 +20,7 @@ #include "Common.h" -#include "Transports.h" +#include "Transport.h" #include "MapManager.h" #include "ObjectMgr.h" #include "Path.h" diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 7f488945139..703ea029460 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -54,7 +54,7 @@ #include "Traveller.h" #include "TemporarySummon.h" #include "Vehicle.h" -#include "Transports.h" +#include "Transport.h" #include diff --git a/src/server/game/Globals/GlobalEvents.cpp b/src/server/game/Globals/GlobalEvents.cpp index 300527aad73..69895e14f5a 100644 --- a/src/server/game/Globals/GlobalEvents.cpp +++ b/src/server/game/Globals/GlobalEvents.cpp @@ -25,7 +25,7 @@ #include "Log.h" #include "Database/DatabaseEnv.h" #include "Database/DatabaseImpl.h" -#include "Platform/Define.h" +#include "Define.h" #include "MapManager.h" #include "ObjectAccessor.h" #include "GlobalEvents.h" diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index ce86c2a4e77..7290af9d3fa 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -33,7 +33,7 @@ #include "Group.h" #include "Guild.h" #include "ArenaTeam.h" -#include "Transports.h" +#include "Transport.h" #include "ProgressBar.h" #include "Language.h" #include "GameEventMgr.h" diff --git a/src/server/game/Grids/GridStates.cpp b/src/server/game/Grids/GridStates.cpp index 9d39531cfad..0f725539d00 100644 --- a/src/server/game/Grids/GridStates.cpp +++ b/src/server/game/Grids/GridStates.cpp @@ -20,7 +20,7 @@ #include "GridStates.h" #include "GridNotifiers.h" -#include "GameSystem/Grid.h" +#include "Grid.h" #include "Log.h" void diff --git a/src/server/game/Grids/Notifiers/GridNotifiers.cpp b/src/server/game/Grids/Notifiers/GridNotifiers.cpp index b10dfa8791e..88d17b0286f 100644 --- a/src/server/game/Grids/Notifiers/GridNotifiers.cpp +++ b/src/server/game/Grids/Notifiers/GridNotifiers.cpp @@ -25,7 +25,7 @@ #include "UpdateData.h" #include "Item.h" #include "Map.h" -#include "Transports.h" +#include "Transport.h" #include "ObjectAccessor.h" #include "CellImpl.h" diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp index 418e409998f..02243776057 100644 --- a/src/server/game/Guilds/Guild.cpp +++ b/src/server/game/Guilds/Guild.cpp @@ -30,7 +30,7 @@ #include "Util.h" #include "Language.h" #include "World.h" -#include "Config/ConfigEnv.h" +#include "ConfigEnv.h" Guild::Guild() { diff --git a/src/server/game/Instances/InstanceSaveMgr.cpp b/src/server/game/Instances/InstanceSaveMgr.cpp index 2d3ba0d3b75..cd024ec6686 100644 --- a/src/server/game/Instances/InstanceSaveMgr.cpp +++ b/src/server/game/Instances/InstanceSaveMgr.cpp @@ -31,17 +31,17 @@ #include "MapManager.h" #include "MapInstanced.h" #include "InstanceSaveMgr.h" -#include "Utilities/Timer.h" +#include "Timer.h" #include "GridNotifiersImpl.h" -#include "Config/ConfigEnv.h" -#include "Transports.h" +#include "ConfigEnv.h" +#include "Transport.h" #include "ObjectMgr.h" #include "World.h" #include "Group.h" #include "InstanceData.h" #include "ProgressBar.h" -#include "Policies/Singleton.h" -#include "Policies/SingletonImp.h" +#include "Singleton.h" +#include "SingletonImp.h" INSTANTIATE_SINGLETON_1(InstanceSaveManager); -- cgit v1.2.3 From 6650068b5e6b007e6534445cf39f45dbfdb292f5 Mon Sep 17 00:00:00 2001 From: Brian Date: Mon, 7 Jun 2010 15:59:21 -0600 Subject: * Nearly done with fixing the Linux build. * Thanks to samccstudios for saving me some time with the Outlands scripts. --HG-- branch : trunk --- src/server/game/CMakeLists.txt | 3 +- .../game/Entities/Object/Updates/UpdateData.cpp | 2 +- src/server/game/Maps/Map.cpp | 4 +- src/server/game/Maps/MapManager.cpp | 4 +- src/server/game/Scripting/ScriptLoader.cpp | 2 +- src/server/scripts/CMakeLists.txt | 413 +++++++++++---------- 6 files changed, 215 insertions(+), 213 deletions(-) (limited to 'src') diff --git a/src/server/game/CMakeLists.txt b/src/server/game/CMakeLists.txt index 44c5e32baa1..7f9c936cff9 100644 --- a/src/server/game/CMakeLists.txt +++ b/src/server/game/CMakeLists.txt @@ -316,8 +316,8 @@ SET(game_STAT_SRCS include_directories( ${CMAKE_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/externals ${CMAKE_SOURCE_DIR}/externals/mersennetwister + ${CMAKE_SOURCE_DIR}/externals/zlib ${CMAKE_SOURCE_DIR}/src/server/collision ${CMAKE_SOURCE_DIR}/src/server/collision/Management ${CMAKE_SOURCE_DIR}/src/server/shared @@ -386,6 +386,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/src/server/game/OutdoorPvP ${CMAKE_SOURCE_DIR}/src/server/game/OutdoorPvP/Zones ${CMAKE_SOURCE_DIR}/src/server/game/Pools + ${CMAKE_SOURCE_DIR}/src/server/game/PrecompiledHeaders ${CMAKE_SOURCE_DIR}/src/server/game/Quests ${CMAKE_SOURCE_DIR}/src/server/game/Reputation ${CMAKE_SOURCE_DIR}/src/server/game/Scripting diff --git a/src/server/game/Entities/Object/Updates/UpdateData.cpp b/src/server/game/Entities/Object/Updates/UpdateData.cpp index 68f0501f304..0b7a553d666 100644 --- a/src/server/game/Entities/Object/Updates/UpdateData.cpp +++ b/src/server/game/Entities/Object/Updates/UpdateData.cpp @@ -25,7 +25,7 @@ #include "Log.h" #include "Opcodes.h" #include "World.h" -#include +#include "zlib.h" UpdateData::UpdateData() : m_blockCount(0) { diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index 11bfdcd6f99..72337452d07 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -28,8 +28,8 @@ #include "InstanceData.h" #include "Map.h" #include "GridNotifiersImpl.h" -#include "Config/ConfigEnv.h" -#include "Transports.h" +#include "Configuration/ConfigEnv.h" +#include "Transport.h" #include "ObjectAccessor.h" #include "ObjectMgr.h" #include "World.h" diff --git a/src/server/game/Maps/MapManager.cpp b/src/server/game/Maps/MapManager.cpp index de3d0ebbaff..0585098cae0 100644 --- a/src/server/game/Maps/MapManager.cpp +++ b/src/server/game/Maps/MapManager.cpp @@ -24,12 +24,12 @@ #include "Database/DatabaseEnv.h" #include "Log.h" #include "ObjectAccessor.h" -#include "Transports.h" +#include "Transport.h" #include "GridDefines.h" #include "MapInstanced.h" #include "InstanceData.h" #include "DestinationHolderImp.h" -#include "Config/ConfigEnv.h" +#include "Configuration/ConfigEnv.h" #include "World.h" #include "CellImpl.h" #include "Corpse.h" diff --git a/src/server/game/Scripting/ScriptLoader.cpp b/src/server/game/Scripting/ScriptLoader.cpp index 2006c091287..37af3c50691 100644 --- a/src/server/game/Scripting/ScriptLoader.cpp +++ b/src/server/game/Scripting/ScriptLoader.cpp @@ -14,7 +14,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "ScriptedPch.h" +#include "ScriptPCH.h" #ifdef WIN32 #define DO_SCRIPTS diff --git a/src/server/scripts/CMakeLists.txt b/src/server/scripts/CMakeLists.txt index 2a2e2c84e19..b718a52326c 100644 --- a/src/server/scripts/CMakeLists.txt +++ b/src/server/scripts/CMakeLists.txt @@ -35,7 +35,7 @@ SET(scripts_STAT_SRCS EasternKingdoms/BlackrockDepths/boss_magmus.cpp EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp - EasternKingdoms/BlackrockDepths//blackrock_depths.h + EasternKingdoms/BlackrockDepths/blackrock_depths.h EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp EasternKingdoms/BlackrockSpire/blackrock_spire.cpp EasternKingdoms/BlackrockSpire/boss_drakkisath.cpp @@ -225,59 +225,59 @@ SET(scripts_STAT_SRCS Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp Kalimdor/BlackfathomDeeps/blackfathom_deeps.h - Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp - Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp - Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp - Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp - Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp - Kalimdor/CavernsOfTime/BattleForMountHyjal/BattleForMountHyjal.h - Kalimdor/CavernsOfTime/BattleForMountHyjal/BattleForMountHyjal.cpp - Kalimdor/CavernsOfTime/BattleForMountHyjal/BattleForMountHyjal_trash.cpp - Kalimdor/CavernsOfTime/BattleForMountHyjal/BattleForMountHyjal_trash.h - Kalimdor/CavernsOfTime/BattleForMountHyjal/BattleForMountHyjalAI.cpp - Kalimdor/CavernsOfTime/BattleForMountHyjal/BattleForMountHyjalAI.h - Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_BattleForMountHyjal.cpp - Kalimdor/CavernsOfTime/CullingOfStratholme/instance_CullingOfStratholme.cpp + Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp - Kalimdor/CavernsOfTime/CullingOfStratholme/CullingOfStratholme.cpp - Kalimdor/CavernsOfTime/CullingOfStratholme/CullingOfStratholme.h - Kalimdor/CavernsOfTime/DarkPortal/DarkPortal.h - Kalimdor/CavernsOfTime/DarkPortal/instance_DarkPortal.cpp - Kalimdor/CavernsOfTime/DarkPortal/DarkPortal.cpp + Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp + Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.h + Kalimdor/CavernsOfTime/DarkPortal/dark_portal.h + Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp + Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp + Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp + Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp + Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp + Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp + Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp + Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h + Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp + Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp + Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.h + Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp + Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h + Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp - Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/EscapeFromDurnholdeKeep.h - Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_EscapeFromDurnholdeKeep.cpp - Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/EscapeFromDurnholdeKeep.cpp + Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h + Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp + Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp Kalimdor/Maraudon/boss_celebras_the_cursed.cpp Kalimdor/Maraudon/boss_landslide.cpp Kalimdor/Maraudon/boss_noxxion.cpp Kalimdor/Maraudon/boss_princess_theradras.cpp Kalimdor/OnyxiasLair/boss_onyxia.cpp - Kalimdor/OnyxiasLair/instance_OnyxiasLair.cpp + Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp - Kalimdor/RazorfenDowns/RazorfenDowns.cpp - Kalimdor/RazorfenDowns/instance_RazorfenDowns.cpp - Kalimdor/RazorfenDowns/RazorfenDowns.h - Kalimdor/RazorfenKraul/RazorfenKraul.h - Kalimdor/RazorfenKraul/instance_RazorfenKraul.cpp - Kalimdor/RazorfenKraul/RazorfenKraul.cpp + Kalimdor/RazorfenDowns/razorfen_downs.cpp + Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp + Kalimdor/RazorfenDowns/razorfen_downs.h + Kalimdor/RazorfenKraul/razorfen_kraul.h + Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp + Kalimdor/RazorfenKraul/razorfen_kraul.cpp Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp - Kalimdor/RuinsOfAhnQiraj/RuinsOfAhnQiraj.h - Kalimdor/RuinsOfAhnQiraj/instance_RuinsOfAhnQiraj.cpp + Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.h + Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp @@ -287,14 +287,14 @@ SET(scripts_STAT_SRCS Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp - Kalimdor/TempleOfAhnQiraj/TempleOfAhnQiraj.h - Kalimdor/TempleOfAhnQiraj/instance_TempleOfAhnQiraj.cpp + Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h + Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp - Kalimdor/WailingCaverns/WailingCaverns.h - Kalimdor/WailingCaverns/instance_WailingCaverns.cpp - Kalimdor/WailingCaverns/WailingCaverns.cpp - Kalimdor/ZulFarrak/ZulFarrak.cpp - Kalimdor/ZulFarrak/instance_ZulFarrak.cpp + Kalimdor/WailingCaverns/wailing_caverns.h + Kalimdor/WailingCaverns/instance_wailing_caverns.cpp + Kalimdor/WailingCaverns/wailing_caverns.cpp + Kalimdor/ZulFarrak/zulfarrak.cpp + Kalimdor/ZulFarrak/instance_zulfarrak.cpp Kalimdor/ashenvale.cpp Kalimdor/azshara.cpp Kalimdor/azuremyst_isle.cpp @@ -318,11 +318,11 @@ SET(scripts_STAT_SRCS Kalimdor/thunder_bluff.cpp Kalimdor/ungoro_crater.cpp Kalimdor/winterspring.cpp - Northrend/AzjolNerub/AzjolNerub/instance_AzjolNerub.cpp + Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp - Northrend/AzjolNerub/AzjolNerub/AzjolNerub.h + Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp @@ -333,38 +333,38 @@ SET(scripts_STAT_SRCS Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp - Northrend/CrusadersColiseum/TrialOfTheChampion/instance_TrialOfTheChampion.cpp - Northrend/CrusadersColiseum/TrialOfTheChampion/TrialOfTheChampion.cpp - Northrend/CrusadersColiseum/TrialOfTheChampion/TrialOfTheChampion.h + Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp + Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp + Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp Northrend/DraktharonKeep/boss_trollgore.cpp Northrend/DraktharonKeep/boss_novos.cpp Northrend/DraktharonKeep/boss_dred.cpp Northrend/DraktharonKeep/boss_tharon_ja.cpp Northrend/DraktharonKeep/drak_tharon_keep.h - Northrend/FrozenHalls/ForgeOfSouls/instance_ForgeOfSouls.cpp + Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp - Northrend/FrozenHalls/ForgeOfSouls/ForgeOfSouls.h - Northrend/FrozenHalls/ForgeOfSouls/ForgeOfSouls.cpp + Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h + Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp - Northrend/FrozenHalls/HallsOfReflection/instance_HallsOfReflection.cpp - Northrend/FrozenHalls/HallsOfReflection/HallsOfReflection.cpp - Northrend/FrozenHalls/HallsOfReflection/HallsOfReflection.h + Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp + Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp + Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp - Northrend/FrozenHalls/PitOfSaron/instance_PitOfSaron.cpp - Northrend/FrozenHalls/PitOfSaron/PitOfSaron.cpp - Northrend/FrozenHalls/PitOfSaron/PitOfSaron.h - Northrend/Gundrak/instance_Gundrak.cpp + Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp + Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp + Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h + Northrend/Gundrak/instance_gundrak.cpp Northrend/Gundrak/boss_slad_ran.cpp Northrend/Gundrak/boss_moorabi.cpp Northrend/Gundrak/boss_drakkari_colossus.cpp Northrend/Gundrak/boss_gal_darah.cpp Northrend/Gundrak/boss_eck.cpp - Northrend/Gundrak/Gundrak.h + Northrend/Gundrak/gundrak.h Northrend/Naxxramas/boss_anubrekhan.cpp Northrend/Naxxramas/boss_faerlina.cpp Northrend/Naxxramas/boss_gluth.cpp @@ -380,86 +380,86 @@ SET(scripts_STAT_SRCS Northrend/Naxxramas/boss_razuvious.cpp Northrend/Naxxramas/boss_sapphiron.cpp Northrend/Naxxramas/boss_thaddius.cpp - Northrend/Naxxramas/Naxxramas.h - Northrend/Naxxramas/instance_Naxxramas.cpp - Northrend/Nexus/EyeOfEternity/instance_EyeOfEternity.cpp + Northrend/Naxxramas/naxxramas.h + Northrend/Naxxramas/instance_naxxramas.cpp + Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp Northrend/Nexus/EyeOfEternity/boss_malygos.cpp - Northrend/Nexus/EyeOfEternity/EyeOfEternity.h - Northrend/Nexus/Nexus/instance_Nexus.cpp + Northrend/Nexus/EyeOfEternity/eye_of_eternity.h + Northrend/Nexus/Nexus/instance_nexus.cpp Northrend/Nexus/Nexus/boss_magus_telestra.cpp Northrend/Nexus/Nexus/boss_anomalus.cpp Northrend/Nexus/Nexus/boss_ormorok.cpp Northrend/Nexus/Nexus/boss_keristrasza.cpp Northrend/Nexus/Nexus/commander_stoutbeard.cpp Northrend/Nexus/Nexus/commander_kolurg.cpp - Northrend/Nexus/Nexus/Nexus.h - Northrend/Nexus/Oculus/instance_Oculus.cpp + Northrend/Nexus/Nexus/nexus.h + Northrend/Nexus/Oculus/instance_oculus.cpp Northrend/Nexus/Oculus/boss_drakos.cpp Northrend/Nexus/Oculus/boss_urom.cpp Northrend/Nexus/Oculus/boss_varos.cpp Northrend/Nexus/Oculus/boss_eregos.cpp - Northrend/Nexus/Oculus/Oculus.h - Northrend/Nexus/Oculus/Oculus.cpp - Northrend/obsidian_sanctum/instance_obsidian_sanctum.cpp - Northrend/obsidian_sanctum/boss_sartharion.cpp - Northrend/obsidian_sanctum/obsidian_sanctum.h - Northrend/ulduar/halls_of_stone/instance_halls_of_stone.cpp - Northrend/ulduar/halls_of_stone/boss_maiden_of_grief.cpp - Northrend/ulduar/halls_of_stone/boss_krystallus.cpp - Northrend/ulduar/halls_of_stone/boss_sjonnir.cpp - Northrend/ulduar/halls_of_stone/halls_of_stone.h - Northrend/ulduar/halls_of_stone/halls_of_stone.cpp - Northrend/ulduar/halls_of_lightning/instance_halls_of_lightning.cpp - Northrend/ulduar/halls_of_lightning/boss_bjarngrim.cpp - Northrend/ulduar/halls_of_lightning/boss_ionar.cpp - Northrend/ulduar/halls_of_lightning/boss_volkhan.cpp - Northrend/ulduar/halls_of_lightning/boss_loken.cpp - Northrend/ulduar/halls_of_lightning/halls_of_lightning.h - Northrend/ulduar/ulduar/boss_algalon.cpp - Northrend/ulduar/ulduar/boss_assembly_of_iron.cpp - Northrend/ulduar/ulduar/boss_auriaya.cpp - Northrend/ulduar/ulduar/boss_flame_leviathan.cpp - Northrend/ulduar/ulduar/boss_freya.cpp - Northrend/ulduar/ulduar/boss_general_vezax.cpp - Northrend/ulduar/ulduar/boss_hodir.cpp - Northrend/ulduar/ulduar/boss_ignis.cpp - Northrend/ulduar/ulduar/boss_kologarn.cpp - Northrend/ulduar/ulduar/boss_mimiron.cpp - Northrend/ulduar/ulduar/boss_razorscale.cpp - Northrend/ulduar/ulduar/boss_thorim.cpp - Northrend/ulduar/ulduar/boss_xt002.cpp - Northrend/ulduar/ulduar/boss_yoggsaron.cpp - Northrend/ulduar/ulduar/ulduar_teleporter.cpp - Northrend/ulduar/ulduar/ulduar.h - Northrend/ulduar/ulduar/instance_ulduar.cpp - Northrend/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp - Northrend/utgarde_keep/utgarde_keep/boss_keleseth.cpp - Northrend/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp - Northrend/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp - Northrend/utgarde_keep/utgarde_keep/utgarde_keep.h - Northrend/utgarde_keep/utgarde_keep/utgarde_keep.cpp - Northrend/utgarde_keep/utgarde_pinnacle/instance_pinnacle.cpp - Northrend/utgarde_keep/utgarde_pinnacle/boss_skadi.cpp - Northrend/utgarde_keep/utgarde_pinnacle/boss_ymiron.cpp - Northrend/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp - Northrend/utgarde_keep/utgarde_pinnacle/boss_svala.cpp - Northrend/utgarde_keep/utgarde_pinnacle/utgarde_pinnacle.h - Northrend/vault_of_archavon/instance_vault_of_archavon.cpp - Northrend/vault_of_archavon/boss_archavon.cpp - Northrend/vault_of_archavon/boss_emalon.cpp - Northrend/vault_of_archavon/boss_koralon.cpp - Northrend/vault_of_archavon/boss_toravon.cpp - Northrend/vault_of_archavon/vault_of_archavon.h - Northrend/violet_hold/instance_violet_hold.cpp - Northrend/violet_hold/boss_cyanigosa.cpp - Northrend/violet_hold/boss_erekem.cpp - Northrend/violet_hold/boss_ichoron.cpp - Northrend/violet_hold/boss_lavanthor.cpp - Northrend/violet_hold/boss_moragg.cpp - Northrend/violet_hold/boss_xevozz.cpp - Northrend/violet_hold/boss_zuramat.cpp - Northrend/violet_hold/violet_hold.h - Northrend/violet_hold/violet_hold.cpp + Northrend/Nexus/Oculus/oculus.h + Northrend/Nexus/Oculus/oculus.cpp + Northrend/ObsidianSanctum/instance_obsidian_sanctum.cpp + Northrend/ObsidianSanctum/boss_sartharion.cpp + Northrend/ObsidianSanctum/obsidian_sanctum.h + Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp + Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp + Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp + Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp + Northrend/Ulduar/HallsOfStone/halls_of_stone.h + Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp + Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp + Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp + Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp + Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp + Northrend/Ulduar/HallsOfLightning/boss_loken.cpp + Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h + Northrend/Ulduar/ulduar/boss_algalon.cpp + Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp + Northrend/Ulduar/ulduar/boss_auriaya.cpp + Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp + Northrend/Ulduar/ulduar/boss_freya.cpp + Northrend/Ulduar/ulduar/boss_general_vezax.cpp + Northrend/Ulduar/ulduar/boss_hodir.cpp + Northrend/Ulduar/ulduar/boss_ignis.cpp + Northrend/Ulduar/ulduar/boss_kologarn.cpp + Northrend/Ulduar/ulduar/boss_mimiron.cpp + Northrend/Ulduar/ulduar/boss_razorscale.cpp + Northrend/Ulduar/ulduar/boss_thorim.cpp + Northrend/Ulduar/ulduar/boss_xt002.cpp + Northrend/Ulduar/ulduar/boss_yoggsaron.cpp + Northrend/Ulduar/ulduar/ulduar_teleporter.cpp + Northrend/Ulduar/ulduar/ulduar.h + Northrend/Ulduar/ulduar/instance_ulduar.cpp + Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp + Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp + Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp + Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp + Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h + Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp + Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp + Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp + Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp + Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp + Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp + Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h + Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp + Northrend/VaultOfArchavon/boss_archavon.cpp + Northrend/VaultOfArchavon/boss_emalon.cpp + Northrend/VaultOfArchavon/boss_koralon.cpp + Northrend/VaultOfArchavon/boss_toravon.cpp + Northrend/VaultOfArchavon/vault_of_archavon.h + Northrend/VioletHold/instance_violet_hold.cpp + Northrend/VioletHold/boss_cyanigosa.cpp + Northrend/VioletHold/boss_erekem.cpp + Northrend/VioletHold/boss_ichoron.cpp + Northrend/VioletHold/boss_lavanthor.cpp + Northrend/VioletHold/boss_moragg.cpp + Northrend/VioletHold/boss_xevozz.cpp + Northrend/VioletHold/boss_zuramat.cpp + Northrend/VioletHold/violet_hold.h + Northrend/VioletHold/violet_hold.cpp Northrend/dalaran.cpp Northrend/borean_tundra.cpp Northrend/dragonblight.cpp @@ -470,89 +470,89 @@ SET(scripts_STAT_SRCS Northrend/storm_peaks.cpp Northrend/zuldrak.cpp Northrend/crystalsong_forest.cpp - Outland/auchindoun/auchenai_crypts/boss_exarch_maladaar.cpp - Outland/auchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp - Outland/auchindoun/mana_tombs/boss_Nexusprince_shaffar.cpp - Outland/auchindoun/mana_tombs/boss_pandemonius.cpp - Outland/auchindoun/sethekk_halls/boss_darkweaver_syth.cpp - Outland/auchindoun/sethekk_halls/boss_tailonking_ikiss.cpp - Outland/auchindoun/sethekk_halls/sethekk_halls.h - Outland/auchindoun/sethekk_halls/instance_sethekk_halls.cpp - Outland/auchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp - Outland/auchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp - Outland/auchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp - Outland/auchindoun/shadow_labyrinth/boss_murmur.cpp - Outland/auchindoun/shadow_labyrinth/shadow_labyrinth.h - Outland/auchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp - Outland/black_temple/black_temple.cpp - Outland/black_temple/boss_bloodboil.cpp - Outland/black_temple/boss_illidan.cpp - Outland/black_temple/boss_mother_shahraz.cpp - Outland/black_temple/boss_reliquary_of_souls.cpp - Outland/black_temple/boss_shade_of_akama.cpp - Outland/black_temple/boss_supremus.cpp - Outland/black_temple/boss_teron_gorefiend.cpp - Outland/black_temple/boss_warlord_najentus.cpp - Outland/black_temple/black_temple.h - Outland/black_temple/illidari_council.cpp - Outland/black_temple/instance_black_temple.cpp - Outland/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp - Outland/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp - Outland/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp - Outland/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp - Outland/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp - Outland/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp - Outland/coilfang_resevoir/serpent_shrine/serpent_shrine.h - Outland/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp - Outland/coilfang_resevoir/steam_vault/boss_hydromancer_thespia.cpp - Outland/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp - Outland/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp - Outland/coilfang_resevoir/steam_vault/steam_vault.h - Outland/coilfang_resevoir/steam_vault/instance_steam_vault.cpp - Outland/coilfang_resevoir/underbog/boss_hungarfen.cpp - Outland/coilfang_resevoir/underbog/boss_the_black_stalker.cpp - Outland/gruuls_lair/boss_gruul.cpp - Outland/gruuls_lair/boss_high_king_maulgar.cpp - Outland/gruuls_lair/gruuls_lair.h - Outland/gruuls_lair/instance_gruuls_lair.cpp - Outland/hellfire_citadel/blood_furnace/boss_broggok.cpp - Outland/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp - Outland/hellfire_citadel/blood_furnace/boss_the_maker.cpp - Outland/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp - Outland/hellfire_citadel/blood_furnace/blood_furnace.h - Outland/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp - Outland/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp - Outland/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp - Outland/hellfire_citadel/hellfire_ramparts/hellfire_ramparts.h - Outland/hellfire_citadel/hellfire_ramparts/instance_hellfire_ramparts.cpp - Outland/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp - Outland/hellfire_citadel/magtheridons_lair/magtheridons_lair.h - Outland/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp - Outland/hellfire_citadel/shattered_halls/boss_nethekurse.cpp - Outland/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp - Outland/hellfire_citadel/shattered_halls/shattered_halls.h - Outland/hellfire_citadel/shattered_halls/instance_shattered_halls.cpp - Outland/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp - Outland/tempest_keep/arcatraz/arcatraz.cpp - Outland/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp - Outland/tempest_keep/arcatraz/arcatraz.h - Outland/tempest_keep/arcatraz/instance_arcatraz.cpp - Outland/tempest_keep/botanica/boss_high_botanist_freywinn.cpp - Outland/tempest_keep/botanica/boss_laj.cpp - Outland/tempest_keep/botanica/boss_warp_splinter.cpp - Outland/tempest_keep/the_eye/boss_alar.cpp - Outland/tempest_keep/the_eye/boss_astromancer.cpp - Outland/tempest_keep/the_eye/boss_kaelthas.cpp - Outland/tempest_keep/the_eye/boss_void_reaver.cpp - Outland/tempest_keep/the_eye/the_eye.h - Outland/tempest_keep/the_eye/instance_the_eye.cpp - Outland/tempest_keep/the_eye/the_eye.cpp - Outland/tempest_keep/the_mechanar/boss_gatewatcher_gyrokill.cpp - Outland/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp - Outland/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp - Outland/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp - Outland/tempest_keep/the_mechanar/mechanar.h - Outland/tempest_keep/the_mechanar/instance_mechanar.cpp + Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp + Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp + Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp + Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp + Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp + Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp + Outland/Auchindoun/SethekkHalls/sethekk_halls.h + Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp + Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp + Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp + Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp + Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp + Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h + Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp + Outland/BlackTemple/black_temple.cpp + Outland/BlackTemple/boss_bloodboil.cpp + Outland/BlackTemple/boss_illidan.cpp + Outland/BlackTemple/boss_mother_shahraz.cpp + Outland/BlackTemple/boss_reliquary_of_souls.cpp + Outland/BlackTemple/boss_shade_of_akama.cpp + Outland/BlackTemple/boss_supremus.cpp + Outland/BlackTemple/boss_teron_gorefiend.cpp + Outland/BlackTemple/boss_warlord_najentus.cpp + Outland/BlackTemple/black_temple.h + Outland/BlackTemple/illidari_council.cpp + Outland/BlackTemple/instance_black_temple.cpp + Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp + Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp + Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp + Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp + Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp + Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp + Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h + Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp + Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp + Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp + Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp + Outland/CoilfangReservoir/SteamVault/steam_vault.h + Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp + Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp + Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp + Outland/GruulsLair/boss_gruul.cpp + Outland/GruulsLair/boss_high_king_maulgar.cpp + Outland/GruulsLair/gruuls_lair.h + Outland/GruulsLair/instance_gruuls_lair.cpp + Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp + Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp + Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp + Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp + Outland/HellfireCitadel/BloodFurnace/blood_furnace.h + Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp + Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp + Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp + Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h + Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp + Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp + Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h + Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp + Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp + Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp + Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h + Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp + Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp + Outland/TempestKeep/arcatraz/arcatraz.cpp + Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp + Outland/TempestKeep/arcatraz/arcatraz.h + Outland/TempestKeep/arcatraz/instance_arcatraz.cpp + Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp + Outland/TempestKeep/botanica/boss_laj.cpp + Outland/TempestKeep/botanica/boss_warp_splinter.cpp + Outland/TempestKeep/Eye/boss_alar.cpp + Outland/TempestKeep/Eye/boss_astromancer.cpp + Outland/TempestKeep/Eye/boss_kaelthas.cpp + Outland/TempestKeep/Eye/boss_void_reaver.cpp + Outland/TempestKeep/Eye/the_eye.h + Outland/TempestKeep/Eye/instance_the_eye.cpp + Outland/TempestKeep/Eye/the_eye.cpp + Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp + Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp + Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp + Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp + Outland/TempestKeep/Mechanar/mechanar.h + Outland/TempestKeep/Mechanar/instance_mechanar.cpp Outland/blades_edge_mountains.cpp Outland/boss_doomlord_kazzak.cpp Outland/boss_doomwalker.cpp @@ -639,3 +639,4 @@ add_library(scripts STATIC ${scripts_STAT_SRCS}) IF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX) ADD_PRECOMPILED_HEADER(scripts ${CMAKE_SOURCE_DIR}/src/server/game/ScriptMgr/ScriptedPch.h) ENDIF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX) + -- cgit v1.2.3 From 498f62f4cc0c5f8464a94492a26f6d17d6609b58 Mon Sep 17 00:00:00 2001 From: Brian Date: Mon, 7 Jun 2010 16:21:52 -0600 Subject: * Well 94% isn't bad. Last thing to fix is collision compiling. * But I need a break. --HG-- branch : trunk --- src/server/collision/BoundingIntervalHierarchy.cpp | 2 +- src/server/collision/BoundingIntervalHierarchy.h | 8 ++++---- src/server/collision/CMakeLists.txt | 5 ++++- src/server/game/AI/ScriptedAI/ScriptedCreature.cpp | 2 +- src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp | 2 +- src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp | 2 +- src/server/game/AI/ScriptedAI/ScriptedGuardAI.cpp | 2 +- src/server/game/AI/ScriptedAI/ScriptedSimpleAI.cpp | 2 +- src/server/game/PrecompiledHeaders/ScriptPCH.cpp | 2 +- src/server/game/Scripting/ScriptMgr.cpp | 4 ++-- src/server/game/Scripting/ScriptSystem.cpp | 2 +- src/server/game/Server/Protocol/Handlers/AddonHandler.cpp | 2 +- src/server/game/Server/Protocol/Handlers/AddonHandler.h | 2 +- src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp | 2 +- src/server/game/Server/Protocol/Handlers/MiscHandler.cpp | 6 +++--- src/server/game/Server/Protocol/Handlers/MovementHandler.cpp | 2 +- src/server/game/Server/Protocol/WorldLog.cpp | 2 +- src/server/game/Server/WorldSession.cpp | 2 +- src/server/game/Server/WorldSocket.cpp | 4 ++-- src/server/game/Server/WorldSocketMgr.cpp | 2 +- src/server/game/World/World.cpp | 4 ++-- 21 files changed, 32 insertions(+), 29 deletions(-) (limited to 'src') diff --git a/src/server/collision/BoundingIntervalHierarchy.cpp b/src/server/collision/BoundingIntervalHierarchy.cpp index 4bd6b3c701e..7bb44a97e86 100644 --- a/src/server/collision/BoundingIntervalHierarchy.cpp +++ b/src/server/collision/BoundingIntervalHierarchy.cpp @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "BIH.h" +#include "BoundingIntervalHierarchy.h" void BIH::buildHierarchy(std::vector &tempTree, buildData &dat, BuildStats &stats) { diff --git a/src/server/collision/BoundingIntervalHierarchy.h b/src/server/collision/BoundingIntervalHierarchy.h index 15ae90c23eb..2ee4e207c19 100644 --- a/src/server/collision/BoundingIntervalHierarchy.h +++ b/src/server/collision/BoundingIntervalHierarchy.h @@ -19,11 +19,11 @@ #ifndef _BIH_H #define _BIH_H -#include -#include -#include +#include "Vector3.h" +#include "Ray.h" +#include "AABox.h" -#include +#include #include #include diff --git a/src/server/collision/CMakeLists.txt b/src/server/collision/CMakeLists.txt index e9fa25d8674..b9d7d420d5d 100644 --- a/src/server/collision/CMakeLists.txt +++ b/src/server/collision/CMakeLists.txt @@ -23,7 +23,10 @@ SET(collision_STAT_SRCS include_directories( ${ACE_INCLUDE_DIR} - ${CMAKE_SOURCE_DIR}/dep/include/g3dlite + ${CMAKE_SOURCE_DIR}/externals/g3dlite + ${CMAKE_SOURCE_DIR}/externals/g3dlite/G3D.lib + ${CMAKE_SOURCE_DIR}/externals/g3dlite/G3D.lib/include + ${CMAKE_SOURCE_DIR}/externals/g3dlite/G3D.lib/include/G3D ) add_library(collision STATIC ${collision_STAT_SRCS}) diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp index 8c4ddd14f07..a10d576e309 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp @@ -5,7 +5,7 @@ * This program is free software licensed under GPL version 2 * Please see the included DOCS/LICENSE.TXT for more information */ -#include "ScriptedPch.h" +#include "ScriptPCH.h" #include "Item.h" #include "Spell.h" #include "ObjectMgr.h" diff --git a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp index 8b7aca888e1..217dd066310 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp @@ -9,7 +9,7 @@ SDComment: SDCategory: Npc EndScriptData */ -#include "ScriptedPch.h" +#include "ScriptPCH.h" #include "ScriptedEscortAI.h" enum ePoints diff --git a/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp index 4f1543dc778..b4a51f9eb27 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp @@ -9,7 +9,7 @@ SDComment: This AI is under development SDCategory: Npc EndScriptData */ -#include "ScriptedPch.h" +#include "ScriptPCH.h" #include "ScriptedFollowerAI.h" const float MAX_PLAYER_DISTANCE = 100.0f; diff --git a/src/server/game/AI/ScriptedAI/ScriptedGuardAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedGuardAI.cpp index 68dc8690470..4dd19547dda 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedGuardAI.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedGuardAI.cpp @@ -21,7 +21,7 @@ SDComment: SDCategory: Guards EndScriptData */ -#include "ScriptedPch.h" +#include "ScriptPCH.h" #include "ScriptedGuardAI.h" // **** This script is for use within every single guard to save coding time **** diff --git a/src/server/game/AI/ScriptedAI/ScriptedSimpleAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedSimpleAI.cpp index 08797515837..7d86c8e54a6 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedSimpleAI.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedSimpleAI.cpp @@ -21,7 +21,7 @@ SDComment: Base Class for SimpleAI creatures SDCategory: Creatures EndScriptData */ -#include "ScriptedPch.h" +#include "ScriptPCH.h" #include "ScriptedSimpleAI.h" SimpleAI::SimpleAI(Creature *c) : ScriptedAI(c) diff --git a/src/server/game/PrecompiledHeaders/ScriptPCH.cpp b/src/server/game/PrecompiledHeaders/ScriptPCH.cpp index a80690d05da..41fecf3c60d 100644 --- a/src/server/game/PrecompiledHeaders/ScriptPCH.cpp +++ b/src/server/game/PrecompiledHeaders/ScriptPCH.cpp @@ -2,5 +2,5 @@ * This program is free software licensed under GPL version 2 * Please see the included DOCS/LICENSE.TXT for more information */ -#include "ScriptedPch.h" +#include "ScriptPCH.h" diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp index 2dcfd258942..3c506f9a90f 100644 --- a/src/server/game/Scripting/ScriptMgr.cpp +++ b/src/server/game/Scripting/ScriptMgr.cpp @@ -2,8 +2,8 @@ * This program is free software licensed under GPL version 2 * Please see the included DOCS/LICENSE.TXT for more information */ -#include "ScriptedPch.h" -#include "Config/Config.h" +#include "ScriptPCH.h" +#include "Configuration/Config.h" #include "Database/DatabaseEnv.h" #include "DBCStores.h" #include "ObjectMgr.h" diff --git a/src/server/game/Scripting/ScriptSystem.cpp b/src/server/game/Scripting/ScriptSystem.cpp index 0037b100412..9c25475aa41 100644 --- a/src/server/game/Scripting/ScriptSystem.cpp +++ b/src/server/game/Scripting/ScriptSystem.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "ScriptedPch.h" +#include "ScriptPCH.h" #include "ScriptSystem.h" #include "ProgressBar.h" #include "ObjectMgr.h" diff --git a/src/server/game/Server/Protocol/Handlers/AddonHandler.cpp b/src/server/game/Server/Protocol/Handlers/AddonHandler.cpp index a9c8101d7b1..ee2efcaffb2 100644 --- a/src/server/game/Server/Protocol/Handlers/AddonHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/AddonHandler.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "zlib/zlib.h" +#include "zlib.h" #include "AddonHandler.h" #include "Database/DatabaseEnv.h" diff --git a/src/server/game/Server/Protocol/Handlers/AddonHandler.h b/src/server/game/Server/Protocol/Handlers/AddonHandler.h index 999785339bc..956b6030171 100644 --- a/src/server/game/Server/Protocol/Handlers/AddonHandler.h +++ b/src/server/game/Server/Protocol/Handlers/AddonHandler.h @@ -22,7 +22,7 @@ #define __ADDONHANDLER_H #include "Common.h" -#include "Config/ConfigEnv.h" +#include "Configuration/ConfigEnv.h" #include "Policies/Singleton.h" #include "WorldPacket.h" diff --git a/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp b/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp index 416827d73ea..e57a5295df5 100644 --- a/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp @@ -25,7 +25,7 @@ #include "World.h" #include "WorldPacket.h" #include "WorldSession.h" -#include "Auth/md5.h" +#include "MD5.h" #include "Database/DatabaseEnv.h" #include "Database/DatabaseImpl.h" diff --git a/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp b/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp index ea6f892c126..f1ec828447a 100644 --- a/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp @@ -30,12 +30,12 @@ #include "World.h" #include "ObjectMgr.h" #include "WorldSession.h" -#include "Auth/BigNumber.h" -#include "Auth/Sha1.h" +#include "BigNumber.h" +#include "SHA1.h" #include "UpdateData.h" #include "LootMgr.h" #include "Chat.h" -#include +#include "zlib.h" #include "ObjectAccessor.h" #include "Object.h" #include "BattleGround.h" diff --git a/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp b/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp index 1148fe174fc..1b850434726 100644 --- a/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp @@ -28,7 +28,7 @@ #include "Vehicle.h" #include "SpellAuras.h" #include "MapManager.h" -#include "Transports.h" +#include "Transport.h" #include "BattleGround.h" #include "WaypointMovementGenerator.h" #include "InstanceSaveMgr.h" diff --git a/src/server/game/Server/Protocol/WorldLog.cpp b/src/server/game/Server/Protocol/WorldLog.cpp index 7c6c4020336..6cccb27ae87 100644 --- a/src/server/game/Server/Protocol/WorldLog.cpp +++ b/src/server/game/Server/Protocol/WorldLog.cpp @@ -24,7 +24,7 @@ #include "WorldLog.h" #include "Policies/SingletonImp.h" -#include "Config/ConfigEnv.h" +#include "Configuration/ConfigEnv.h" #include "Log.h" #define CLASS_LOCK Trinity::ClassLevelLockable diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp index bc737717840..97c54c1f37e 100644 --- a/src/server/game/Server/WorldSession.cpp +++ b/src/server/game/Server/WorldSession.cpp @@ -40,7 +40,7 @@ #include "OutdoorPvPMgr.h" #include "MapManager.h" #include "SocialMgr.h" -#include "zlib/zlib.h" +#include "zlib.h" #include "ScriptMgr.h" #include "LFGMgr.h" diff --git a/src/server/game/Server/WorldSocket.cpp b/src/server/game/Server/WorldSocket.cpp index c07b369d0b9..b792ad2faf1 100644 --- a/src/server/game/Server/WorldSocket.cpp +++ b/src/server/game/Server/WorldSocket.cpp @@ -39,8 +39,8 @@ #include "ByteBuffer.h" #include "Opcodes.h" #include "Database/DatabaseEnv.h" -#include "Auth/BigNumber.h" -#include "Auth/Sha1.h" +#include "BigNumber.h" +#include "SHA1.h" #include "WorldSession.h" #include "WorldSocketMgr.h" #include "Log.h" diff --git a/src/server/game/Server/WorldSocketMgr.cpp b/src/server/game/Server/WorldSocketMgr.cpp index c23d08e6f78..f7bb3949ee0 100644 --- a/src/server/game/Server/WorldSocketMgr.cpp +++ b/src/server/game/Server/WorldSocketMgr.cpp @@ -42,7 +42,7 @@ #include "Log.h" #include "Common.h" -#include "Config/ConfigEnv.h" +#include "Configuration/ConfigEnv.h" #include "Database/DatabaseEnv.h" #include "WorldSocket.h" diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index 0b00621dc72..30cedf28b4d 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -24,7 +24,7 @@ #include "Common.h" #include "Database/DatabaseEnv.h" -#include "Config/ConfigEnv.h" +#include "Configuration/ConfigEnv.h" #include "SystemConfig.h" #include "Log.h" #include "Opcodes.h" @@ -65,7 +65,7 @@ #include "Util.h" #include "Language.h" #include "CreatureGroups.h" -#include "Transports.h" +#include "Transport.h" #include "ProgressBar.h" #include "ScriptMgr.h" #include "AddonMgr.h" -- cgit v1.2.3 From a5f4e3de948f388505b7a6d1baf107ceacfd718b Mon Sep 17 00:00:00 2001 From: Tartalo Date: Tue, 8 Jun 2010 01:20:06 +0200 Subject: more cmake fixes. comment collision compilation until fixed --HG-- branch : trunk --- src/server/CMakeLists.txt | 2 +- src/server/authserver/CMakeLists.txt | 13 +++++++++---- src/server/authserver/Main.cpp | 2 +- src/server/authserver/Server/AuthSocket.cpp | 4 ++-- src/server/authserver/Server/AuthSocket.h | 2 +- src/server/collision/CMakeLists.txt | 6 +++++- src/server/collision/Maps/MapTree.h | 6 +++--- src/server/collision/Models/ModelInstance.h | 2 +- src/server/collision/Models/WorldModel.h | 4 ++-- src/server/shared/CMakeLists.txt | 1 + 10 files changed, 26 insertions(+), 16 deletions(-) (limited to 'src') diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt index 1a6321c23e3..ccf7b894eb4 100644 --- a/src/server/CMakeLists.txt +++ b/src/server/CMakeLists.txt @@ -1,6 +1,6 @@ add_subdirectory(shared) add_subdirectory(game) -add_subdirectory(collision) +#add_subdirectory(collision) if (DO_SCRIPTS) add_subdirectory(scripts) endif (DO_SCRIPTS) diff --git a/src/server/authserver/CMakeLists.txt b/src/server/authserver/CMakeLists.txt index 496f1ff689e..98142e88729 100644 --- a/src/server/authserver/CMakeLists.txt +++ b/src/server/authserver/CMakeLists.txt @@ -18,7 +18,15 @@ include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/src/server/shared ${CMAKE_SOURCE_DIR}/src/server/shared/Database - ${CMAKE_SOURCE_DIR}/src/server/framework + ${CMAKE_SOURCE_DIR}/src/server/shared/Packets + ${CMAKE_SOURCE_DIR}/src/server/shared/Cryptography + ${CMAKE_SOURCE_DIR}/src/server/shared/Cryptography/Authentication + ${CMAKE_SOURCE_DIR}/src/server/shared/Logging + ${CMAKE_SOURCE_DIR}/src/server/shared/Utilities + ${CMAKE_SOURCE_DIR}/src/server/authserver + ${CMAKE_SOURCE_DIR}/src/server/authserver/Authentication + ${CMAKE_SOURCE_DIR}/src/server/authserver/Realms + ${CMAKE_SOURCE_DIR}/src/server/authserver/Server ${MYSQL_INCLUDE_DIR} ) @@ -41,12 +49,9 @@ SET_TARGET_PROPERTIES(trinity-realm PROPERTIES LINK_FLAGS "${trinity-realm_LINK_ target_link_libraries( trinity-realm shared -trinityframework -trinitysockets trinitydatabase trinityauth trinityconfig -zlib ${SSLLIB} ${MYSQL_LIBRARIES} ${OSX_LIBS} diff --git a/src/server/authserver/Main.cpp b/src/server/authserver/Main.cpp index 09bae4908e0..4d5362608a7 100644 --- a/src/server/authserver/Main.cpp +++ b/src/server/authserver/Main.cpp @@ -25,7 +25,7 @@ #include "Common.h" #include "Database/DatabaseEnv.h" -#include "Config/ConfigEnv.h" +#include "Configuration/ConfigEnv.h" #include "Log.h" #include "SystemConfig.h" #include "Util.h" diff --git a/src/server/authserver/Server/AuthSocket.cpp b/src/server/authserver/Server/AuthSocket.cpp index cc293097977..c33f84a9669 100644 --- a/src/server/authserver/Server/AuthSocket.cpp +++ b/src/server/authserver/Server/AuthSocket.cpp @@ -25,13 +25,13 @@ #include "Common.h" #include "Database/DatabaseEnv.h" #include "ByteBuffer.h" -#include "Config/ConfigEnv.h" +#include "Configuration/ConfigEnv.h" #include "Log.h" #include "RealmList.h" #include "AuthSocket.h" #include "AuthCodes.h" #include -#include "Auth/Sha1.h" +#include "SHA1.h" //#include "Util.h" -- for commented utf8ToUpperOnlyLatin extern DatabaseType LoginDatabase; diff --git a/src/server/authserver/Server/AuthSocket.h b/src/server/authserver/Server/AuthSocket.h index bfd0fa4fdca..0ad40b6930b 100644 --- a/src/server/authserver/Server/AuthSocket.h +++ b/src/server/authserver/Server/AuthSocket.h @@ -26,7 +26,7 @@ #define _AUTHSOCKET_H #include "Common.h" -#include "Auth/BigNumber.h" +#include "BigNumber.h" #include "RealmSocket.h" diff --git a/src/server/collision/CMakeLists.txt b/src/server/collision/CMakeLists.txt index b9d7d420d5d..a67cd8d660a 100644 --- a/src/server/collision/CMakeLists.txt +++ b/src/server/collision/CMakeLists.txt @@ -1,5 +1,5 @@ -########### next target ############### +########### collision ############### SET(collision_STAT_SRCS BoundingIntervalHierarchy.h @@ -27,6 +27,10 @@ include_directories( ${CMAKE_SOURCE_DIR}/externals/g3dlite/G3D.lib ${CMAKE_SOURCE_DIR}/externals/g3dlite/G3D.lib/include ${CMAKE_SOURCE_DIR}/externals/g3dlite/G3D.lib/include/G3D + ${CMAKE_SOURCE_DIR}/src/server/shared + ${CMAKE_SOURCE_DIR}/src/server/shared/Dynamic + ${CMAKE_SOURCE_DIR}/src/server/collision + ${CMAKE_SOURCE_DIR}/src/server/collision/Maps ) add_library(collision STATIC ${collision_STAT_SRCS}) diff --git a/src/server/collision/Maps/MapTree.h b/src/server/collision/Maps/MapTree.h index 7955cb92d68..282f34d42fd 100644 --- a/src/server/collision/Maps/MapTree.h +++ b/src/server/collision/Maps/MapTree.h @@ -19,9 +19,9 @@ #ifndef _MAPTREE_H #define _MAPTREE_H -#include "Platform/Define.h" -#include "Utilities/UnorderedMap.h" -#include "BIH.h" +#include "Define.h" +#include "UnorderedMap.h" +#include "BoundingIntervalHierarchy.cpp" namespace VMAP { diff --git a/src/server/collision/Models/ModelInstance.h b/src/server/collision/Models/ModelInstance.h index 97b3ab632a1..42b92c8fb89 100644 --- a/src/server/collision/Models/ModelInstance.h +++ b/src/server/collision/Models/ModelInstance.h @@ -24,7 +24,7 @@ #include #include -#include "Platform/Define.h" +#include "Define.h" namespace VMAP { diff --git a/src/server/collision/Models/WorldModel.h b/src/server/collision/Models/WorldModel.h index f12efed4f5d..b23f4ae3f00 100644 --- a/src/server/collision/Models/WorldModel.h +++ b/src/server/collision/Models/WorldModel.h @@ -23,9 +23,9 @@ #include #include #include -#include "BIH.h" +#include "BoundingIntervalHierarchy.cpp" -#include "Platform/Define.h" +#include "Define.h" namespace VMAP { diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt index 3495a47f915..6c796d60f11 100644 --- a/src/server/shared/CMakeLists.txt +++ b/src/server/shared/CMakeLists.txt @@ -6,6 +6,7 @@ SET(shared_STAT_SRCS Logging/Log.h Packets/ByteBuffer.h Packets/WorldPacket.h + Policies/ObjectLifeTime.cpp Threading/DelayExecutor.cpp Threading/DelayExecutor.h Threading/Threading.cpp -- cgit v1.2.3 From 726a76e93aa3f20f4e642a01027f977f368a979e Mon Sep 17 00:00:00 2001 From: Tartalo Date: Tue, 8 Jun 2010 01:34:51 +0200 Subject: Some cmake fixes for worldserver --HG-- branch : trunk --- src/server/worldserver/CMakeLists.txt | 56 +++++++++++++++++----- src/server/worldserver/CommandLine/CliRunnable.cpp | 2 +- src/server/worldserver/Main.cpp | 2 +- src/server/worldserver/Master.cpp | 18 +++---- src/server/worldserver/RemoteAccess/RASocket.cpp | 2 +- src/server/worldserver/RemoteAccess/RASocket.h | 2 +- 6 files changed, 56 insertions(+), 26 deletions(-) (limited to 'src') diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt index 61f68851408..0cedd5da0ca 100644 --- a/src/server/worldserver/CMakeLists.txt +++ b/src/server/worldserver/CMakeLists.txt @@ -16,60 +16,93 @@ Master.h include_directories( ${ACE_INCLUDE_DIR} ${CMAKE_BINARY_DIR} + ${CMAKE_SOURCE_DIR}/externals/sockets/include + ${CMAKE_SOURCE_DIR}/externals/mersennetwister ${CMAKE_SOURCE_DIR}/dep/include + ${CMAKE_SOURCE_DIR}/src/server/collision + ${CMAKE_SOURCE_DIR}/src/server/collision/Management ${CMAKE_SOURCE_DIR}/src/server/shared + ${CMAKE_SOURCE_DIR}/src/server/shared/Configuration + ${CMAKE_SOURCE_DIR}/src/server/shared/Cryptography ${CMAKE_SOURCE_DIR}/src/server/shared/Database + ${CMAKE_SOURCE_DIR}/src/server/shared/DataStores + ${CMAKE_SOURCE_DIR}/src/server/shared/Debugging + ${CMAKE_SOURCE_DIR}/src/server/shared/Dynamic/CountedReference + ${CMAKE_SOURCE_DIR}/src/server/shared/Dynamic/LinkedReference + ${CMAKE_SOURCE_DIR}/src/server/shared/Dynamic + ${CMAKE_SOURCE_DIR}/src/server/shared/Logging + ${CMAKE_SOURCE_DIR}/src/server/shared/Packets + ${CMAKE_SOURCE_DIR}/src/server/shared/Policies + ${CMAKE_SOURCE_DIR}/src/server/shared/Threading + ${CMAKE_SOURCE_DIR}/src/server/shared/Utilities ${CMAKE_SOURCE_DIR}/src/server/game - ${CMAKE_SOURCE_DIR}/src/server/game/Account + ${CMAKE_SOURCE_DIR}/src/server/game/Accounts ${CMAKE_SOURCE_DIR}/src/server/game/Achievements ${CMAKE_SOURCE_DIR}/src/server/game/Addons ${CMAKE_SOURCE_DIR}/src/server/game/AI - ${CMAKE_SOURCE_DIR}/src/server/game/AI/AuctionHouseBot + ${CMAKE_SOURCE_DIR}/src/server/game/AI/CoreAI ${CMAKE_SOURCE_DIR}/src/server/game/AI/EventAI ${CMAKE_SOURCE_DIR}/src/server/game/AI/ScriptedAI ${CMAKE_SOURCE_DIR}/src/server/game/AuctionHouse + ${CMAKE_SOURCE_DIR}/src/server/game/AuctionHouse/AuctionHouseBot ${CMAKE_SOURCE_DIR}/src/server/game/BattleGrounds + ${CMAKE_SOURCE_DIR}/src/server/game/BattleGrounds/Zones ${CMAKE_SOURCE_DIR}/src/server/game/Calendar ${CMAKE_SOURCE_DIR}/src/server/game/Chat + ${CMAKE_SOURCE_DIR}/src/server/game/Chat/Channels + ${CMAKE_SOURCE_DIR}/src/server/game/Chat/Commands ${CMAKE_SOURCE_DIR}/src/server/game/Combat - ${CMAKE_SOURCE_DIR}/src/server/game/ConditionMgr + ${CMAKE_SOURCE_DIR}/src/server/game/Conditions ${CMAKE_SOURCE_DIR}/src/server/game/DataStores + ${CMAKE_SOURCE_DIR}/src/server/game/DungeonFinding ${CMAKE_SOURCE_DIR}/src/server/game/Entities ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Creature + ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Corpse + ${CMAKE_SOURCE_DIR}/src/server/game/Entities/DynamicObject ${CMAKE_SOURCE_DIR}/src/server/game/Entities/GameObject ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Item ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object + ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object/Updates ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Pet ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Player ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Totem ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Unit ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Vehicle + ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Transport ${CMAKE_SOURCE_DIR}/src/server/game/Events ${CMAKE_SOURCE_DIR}/src/server/game/Globals + ${CMAKE_SOURCE_DIR}/src/server/game/Grids/Cells + ${CMAKE_SOURCE_DIR}/src/server/game/Grids/Notifiers + ${CMAKE_SOURCE_DIR}/src/server/game/Grids ${CMAKE_SOURCE_DIR}/src/server/game/Groups ${CMAKE_SOURCE_DIR}/src/server/game/Guilds ${CMAKE_SOURCE_DIR}/src/server/game/Instances - ${CMAKE_SOURCE_DIR}/src/server/game/LookingForGroup ${CMAKE_SOURCE_DIR}/src/server/game/Loot ${CMAKE_SOURCE_DIR}/src/server/game/Mails - ${CMAKE_SOURCE_DIR}/src/server/game/Map - ${CMAKE_SOURCE_DIR}/src/server/game/Map/Cell - ${CMAKE_SOURCE_DIR}/src/server/game/Map/Grid + ${CMAKE_SOURCE_DIR}/src/server/game/Maps + ${CMAKE_SOURCE_DIR}/src/server/game/Miscellaneous ${CMAKE_SOURCE_DIR}/src/server/game/Movement ${CMAKE_SOURCE_DIR}/src/server/game/Movement/MovementGenerators - ${CMAKE_SOURCE_DIR}/src/server/game/Opcodes + ${CMAKE_SOURCE_DIR}/src/server/game/Movement/Waypoints ${CMAKE_SOURCE_DIR}/src/server/game/OutdoorPvP + ${CMAKE_SOURCE_DIR}/src/server/game/OutdoorPvP/Zones ${CMAKE_SOURCE_DIR}/src/server/game/Pools ${CMAKE_SOURCE_DIR}/src/server/game/PrecompiledHeaders ${CMAKE_SOURCE_DIR}/src/server/game/Quests ${CMAKE_SOURCE_DIR}/src/server/game/Reputation - ${CMAKE_SOURCE_DIR}/src/server/game/ScriptMgr + ${CMAKE_SOURCE_DIR}/src/server/game/Scripting + ${CMAKE_SOURCE_DIR}/src/server/game/Server/Protocol + ${CMAKE_SOURCE_DIR}/src/server/game/Server ${CMAKE_SOURCE_DIR}/src/server/game/Skills ${CMAKE_SOURCE_DIR}/src/server/game/Spells ${CMAKE_SOURCE_DIR}/src/server/game/Spells/Auras ${CMAKE_SOURCE_DIR}/src/server/game/Tools ${CMAKE_SOURCE_DIR}/src/server/game/Weather ${CMAKE_SOURCE_DIR}/src/server/game/World + ${CMAKE_SOURCE_DIR}/src/server/worldserver + ${CMAKE_SOURCE_DIR}/src/server/worldserver/CommandLine + ${CMAKE_SOURCE_DIR}/src/server/worldserver/RemoteAccess + ${CMAKE_SOURCE_DIR}/src/server/worldserver/WorldThread ${MYSQL_INCLUDE_DIR} ) @@ -100,13 +133,10 @@ target_link_libraries( trinity-core game shared -zlib -trinityframework -trinitysockets trinitydatabase trinityauth trinityconfig -vmaps +collision g3dlite jmalloc ${SCRIPT_LIB} diff --git a/src/server/worldserver/CommandLine/CliRunnable.cpp b/src/server/worldserver/CommandLine/CliRunnable.cpp index b39faf694db..c72e454700c 100644 --- a/src/server/worldserver/CommandLine/CliRunnable.cpp +++ b/src/server/worldserver/CommandLine/CliRunnable.cpp @@ -26,7 +26,7 @@ #include "ObjectMgr.h" #include "World.h" #include "WorldSession.h" -#include "Config/ConfigEnv.h" +#include "Configuration/ConfigEnv.h" #include "AccountMgr.h" #include "Chat.h" diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp index 95bb39eca91..9c10094c37c 100644 --- a/src/server/worldserver/Main.cpp +++ b/src/server/worldserver/Main.cpp @@ -28,7 +28,7 @@ #include "Common.h" #include "Database/DatabaseEnv.h" -#include "Config/ConfigEnv.h" +#include "Configuration/ConfigEnv.h" #include "Log.h" #include "Master.h" diff --git a/src/server/worldserver/Master.cpp b/src/server/worldserver/Master.cpp index 8b34b512f57..1137a131008 100644 --- a/src/server/worldserver/Master.cpp +++ b/src/server/worldserver/Master.cpp @@ -31,9 +31,9 @@ #include "WorldRunnable.h" #include "WorldSocket.h" #include "WorldSocketMgr.h" -#include "Config/ConfigEnv.h" +#include "Configuration/ConfigEnv.h" #include "Database/DatabaseEnv.h" -#include "Policies/SingletonImp.h" +#include "SingletonImp.h" #include "CliRunnable.h" #include "Log.h" @@ -42,13 +42,13 @@ #include "Timer.h" #include "Util.h" -#include "sockets/TcpSocket.h" -#include "sockets/Utility.h" -#include "sockets/Parse.h" -#include "sockets/Socket.h" -#include "sockets/SocketHandler.h" -#include "sockets/ListenSocket.h" -#include "Auth/BigNumber.h" +#include "TcpSocket.h" +#include "Utility.h" +#include "Parse.h" +#include "Socket.h" +#include "SocketHandler.h" +#include "ListenSocket.h" +#include "BigNumber.h" #ifdef WIN32 #include "ServiceWin32.h" diff --git a/src/server/worldserver/RemoteAccess/RASocket.cpp b/src/server/worldserver/RemoteAccess/RASocket.cpp index 32c16d9980f..227968d4c9c 100644 --- a/src/server/worldserver/RemoteAccess/RASocket.cpp +++ b/src/server/worldserver/RemoteAccess/RASocket.cpp @@ -23,7 +23,7 @@ */ #include "Common.h" -#include "Config/ConfigEnv.h" +#include "Configuration/ConfigEnv.h" #include "Database/DatabaseEnv.h" #include "AccountMgr.h" #include "Log.h" diff --git a/src/server/worldserver/RemoteAccess/RASocket.h b/src/server/worldserver/RemoteAccess/RASocket.h index 5c13724f90d..25a21d52044 100644 --- a/src/server/worldserver/RemoteAccess/RASocket.h +++ b/src/server/worldserver/RemoteAccess/RASocket.h @@ -25,7 +25,7 @@ #ifndef _RASOCKET_H #define _RASOCKET_H -#include "sockets/TcpSocket.h" +#include "TcpSocket.h" #include "Common.h" -- cgit v1.2.3 From 1fd70827128177aba3ac1334135fc12422819db0 Mon Sep 17 00:00:00 2001 From: Brian Date: Mon, 7 Jun 2010 18:32:20 -0600 Subject: * Reverted to the old G3D library, however collision still will not compile * and is therefore commented out. --HG-- branch : trunk --- externals/PackageList.txt | 2 +- externals/g3dlite/G3D.lib/include/G3D/AABSPTree.h | 1609 --------------- externals/g3dlite/G3D.lib/include/G3D/AABox.h | 281 --- externals/g3dlite/G3D.lib/include/G3D/AnyVal.h | 506 ----- externals/g3dlite/G3D.lib/include/G3D/Array.h | 1180 ----------- .../g3dlite/G3D.lib/include/G3D/AtomicInt32.h | 166 -- .../g3dlite/G3D.lib/include/G3D/BinaryFormat.h | 140 -- .../g3dlite/G3D.lib/include/G3D/BinaryInput.h | 441 ---- .../g3dlite/G3D.lib/include/G3D/BinaryOutput.h | 421 ---- .../g3dlite/G3D.lib/include/G3D/BoundsTrait.h | 20 - externals/g3dlite/G3D.lib/include/G3D/Box.h | 193 -- externals/g3dlite/G3D.lib/include/G3D/Capsule.h | 90 - .../G3D.lib/include/G3D/CollisionDetection.h | 1178 ----------- externals/g3dlite/G3D.lib/include/G3D/Color1.h | 129 -- .../g3dlite/G3D.lib/include/G3D/Color1uint8.h | 107 - externals/g3dlite/G3D.lib/include/G3D/Color3.h | 390 ---- .../g3dlite/G3D.lib/include/G3D/Color3uint8.h | 127 -- externals/g3dlite/G3D.lib/include/G3D/Color4.h | 324 --- .../g3dlite/G3D.lib/include/G3D/Color4uint8.h | 133 -- externals/g3dlite/G3D.lib/include/G3D/Cone.h | 68 - .../g3dlite/G3D.lib/include/G3D/ConvexPolyhedron.h | 179 -- .../g3dlite/G3D.lib/include/G3D/CoordinateFrame.h | 315 --- externals/g3dlite/G3D.lib/include/G3D/Crypto.h | 96 - externals/g3dlite/G3D.lib/include/G3D/Cylinder.h | 92 - externals/g3dlite/G3D.lib/include/G3D/Discovery.h | 589 ------ .../g3dlite/G3D.lib/include/G3D/EqualsTrait.h | 26 - externals/g3dlite/G3D.lib/include/G3D/G3D.h | 150 -- externals/g3dlite/G3D.lib/include/G3D/G3DAll.h | 26 - .../g3dlite/G3D.lib/include/G3D/G3DGameUnits.h | 44 - externals/g3dlite/G3D.lib/include/G3D/GCamera.h | 294 --- externals/g3dlite/G3D.lib/include/G3D/GImage.h | 550 ----- externals/g3dlite/G3D.lib/include/G3D/GLight.h | 72 - externals/g3dlite/G3D.lib/include/G3D/GThread.h | 169 -- externals/g3dlite/G3D.lib/include/G3D/GUniqueID.h | 69 - externals/g3dlite/G3D.lib/include/G3D/HashTrait.h | 63 - externals/g3dlite/G3D.lib/include/G3D/Image1.h | 79 - .../g3dlite/G3D.lib/include/G3D/Image1uint8.h | 80 - externals/g3dlite/G3D.lib/include/G3D/Image3.h | 79 - .../g3dlite/G3D.lib/include/G3D/Image3uint8.h | 85 - externals/g3dlite/G3D.lib/include/G3D/Image4.h | 80 - .../g3dlite/G3D.lib/include/G3D/Image4uint8.h | 85 - .../g3dlite/G3D.lib/include/G3D/ImageFormat.h | 362 ---- externals/g3dlite/G3D.lib/include/G3D/Line.h | 105 - .../g3dlite/G3D.lib/include/G3D/LineSegment.h | 115 -- externals/g3dlite/G3D.lib/include/G3D/Log.h | 109 - externals/g3dlite/G3D.lib/include/G3D/Map2D.h | 665 ------ externals/g3dlite/G3D.lib/include/G3D/Matrix.h | 634 ------ externals/g3dlite/G3D.lib/include/G3D/Matrix2.h | 69 - externals/g3dlite/G3D.lib/include/G3D/Matrix3.h | 323 --- externals/g3dlite/G3D.lib/include/G3D/Matrix4.h | 206 -- externals/g3dlite/G3D.lib/include/G3D/MeshAlg.h | 718 ------- .../g3dlite/G3D.lib/include/G3D/MeshBuilder.h | 82 - externals/g3dlite/G3D.lib/include/G3D/NetAddress.h | 132 -- .../g3dlite/G3D.lib/include/G3D/NetworkDevice.h | 738 ------- .../g3dlite/G3D.lib/include/G3D/PhysicsFrame.h | 74 - externals/g3dlite/G3D.lib/include/G3D/Plane.h | 161 -- .../g3dlite/G3D.lib/include/G3D/PointAABSPTree.h | 1207 ----------- .../g3dlite/G3D.lib/include/G3D/PointHashGrid.h | 894 -------- externals/g3dlite/G3D.lib/include/G3D/Pointer.h | 275 --- .../g3dlite/G3D.lib/include/G3D/PositionTrait.h | 7 - externals/g3dlite/G3D.lib/include/G3D/Quat.h | 725 ------- externals/g3dlite/G3D.lib/include/G3D/Queue.h | 355 ---- externals/g3dlite/G3D.lib/include/G3D/Ray.h | 329 --- externals/g3dlite/G3D.lib/include/G3D/Rect2D.h | 391 ---- .../g3dlite/G3D.lib/include/G3D/ReferenceCount.h | 597 ------ .../g3dlite/G3D.lib/include/G3D/RegistryUtil.h | 97 - externals/g3dlite/G3D.lib/include/G3D/Set.h | 160 -- externals/g3dlite/G3D.lib/include/G3D/Sphere.h | 143 -- externals/g3dlite/G3D.lib/include/G3D/Spline.h | 367 ---- externals/g3dlite/G3D.lib/include/G3D/Stopwatch.h | 108 - externals/g3dlite/G3D.lib/include/G3D/System.h | 390 ---- externals/g3dlite/G3D.lib/include/G3D/Table.h | 770 ------- externals/g3dlite/G3D.lib/include/G3D/TextInput.h | 693 ------- externals/g3dlite/G3D.lib/include/G3D/TextOutput.h | 249 --- externals/g3dlite/G3D.lib/include/G3D/ThreadSet.h | 79 - externals/g3dlite/G3D.lib/include/G3D/Triangle.h | 143 -- .../g3dlite/G3D.lib/include/G3D/UprightFrame.h | 83 - externals/g3dlite/G3D.lib/include/G3D/Vector2.h | 457 ----- .../g3dlite/G3D.lib/include/G3D/Vector2int16.h | 137 -- externals/g3dlite/G3D.lib/include/G3D/Vector3.h | 761 ------- .../g3dlite/G3D.lib/include/G3D/Vector3int16.h | 130 -- .../g3dlite/G3D.lib/include/G3D/Vector3int32.h | 138 -- externals/g3dlite/G3D.lib/include/G3D/Vector4.h | 717 ------- .../g3dlite/G3D.lib/include/G3D/Vector4int8.h | 113 - externals/g3dlite/G3D.lib/include/G3D/WeakCache.h | 90 - externals/g3dlite/G3D.lib/include/G3D/WrapMode.h | 79 - externals/g3dlite/G3D.lib/include/G3D/debug.h | 66 - .../g3dlite/G3D.lib/include/G3D/debugAssert.h | 236 --- .../g3dlite/G3D.lib/include/G3D/debugPrintf.h | 62 - externals/g3dlite/G3D.lib/include/G3D/enumclass.h | 141 -- externals/g3dlite/G3D.lib/include/G3D/fileutils.h | 246 --- externals/g3dlite/G3D.lib/include/G3D/filter.h | 29 - externals/g3dlite/G3D.lib/include/G3D/format.h | 44 - externals/g3dlite/G3D.lib/include/G3D/g3dmath.h | 810 -------- externals/g3dlite/G3D.lib/include/G3D/platform.h | 256 --- externals/g3dlite/G3D.lib/include/G3D/prompt.h | 67 - externals/g3dlite/G3D.lib/include/G3D/serialize.h | 30 - externals/g3dlite/G3D.lib/include/G3D/splinefunc.h | 118 -- .../g3dlite/G3D.lib/include/G3D/stringutils.h | 130 -- externals/g3dlite/G3D.lib/include/G3D/uint128.h | 51 - externals/g3dlite/G3D.lib/include/G3D/vectorMath.h | 235 --- externals/g3dlite/G3D.lib/source/AABox.cpp | 342 ---- externals/g3dlite/G3D.lib/source/AnyVal.cpp | 1381 ------------- externals/g3dlite/G3D.lib/source/BinaryFormat.cpp | 81 - externals/g3dlite/G3D.lib/source/BinaryInput.cpp | 568 ------ externals/g3dlite/G3D.lib/source/BinaryOutput.cpp | 518 ----- externals/g3dlite/G3D.lib/source/Box.cpp | 393 ---- externals/g3dlite/G3D.lib/source/Capsule.cpp | 179 -- .../g3dlite/G3D.lib/source/CollisionDetection.cpp | 2152 -------------------- externals/g3dlite/G3D.lib/source/Color1.cpp | 40 - externals/g3dlite/G3D.lib/source/Color1uint8.cpp | 38 - externals/g3dlite/G3D.lib/source/Color3.cpp | 321 --- externals/g3dlite/G3D.lib/source/Color3uint8.cpp | 45 - externals/g3dlite/G3D.lib/source/Color4.cpp | 140 -- externals/g3dlite/G3D.lib/source/Color4uint8.cpp | 47 - externals/g3dlite/G3D.lib/source/Cone.cpp | 79 - .../g3dlite/G3D.lib/source/ConvexPolyhedron.cpp | 449 ---- .../g3dlite/G3D.lib/source/CoordinateFrame.cpp | 381 ---- externals/g3dlite/G3D.lib/source/Crypto.cpp | 70 - externals/g3dlite/G3D.lib/source/Crypto_md5.cpp | 471 ----- externals/g3dlite/G3D.lib/source/Cylinder.cpp | 176 -- externals/g3dlite/G3D.lib/source/Discovery.cpp | 170 -- externals/g3dlite/G3D.lib/source/GCamera.cpp | 399 ---- externals/g3dlite/G3D.lib/source/GImage.cpp | 1065 ---------- externals/g3dlite/G3D.lib/source/GImage_bayer.cpp | 298 --- externals/g3dlite/G3D.lib/source/GImage_bmp.cpp | 716 ------- externals/g3dlite/G3D.lib/source/GImage_jpeg.cpp | 445 ---- externals/g3dlite/G3D.lib/source/GImage_png.cpp | 245 --- externals/g3dlite/G3D.lib/source/GImage_ppm.cpp | 185 -- externals/g3dlite/G3D.lib/source/GImage_tga.cpp | 179 -- externals/g3dlite/G3D.lib/source/GLight.cpp | 143 -- externals/g3dlite/G3D.lib/source/GThread.cpp | 203 -- externals/g3dlite/G3D.lib/source/GUniqueID.cpp | 78 - externals/g3dlite/G3D.lib/source/Image1.cpp | 224 -- externals/g3dlite/G3D.lib/source/Image1uint8.cpp | 212 -- externals/g3dlite/G3D.lib/source/Image3.cpp | 224 -- externals/g3dlite/G3D.lib/source/Image3uint8.cpp | 225 -- externals/g3dlite/G3D.lib/source/Image4.cpp | 226 -- externals/g3dlite/G3D.lib/source/Image4uint8.cpp | 222 -- externals/g3dlite/G3D.lib/source/ImageFormat.cpp | 440 ---- .../g3dlite/G3D.lib/source/ImageFormat_convert.cpp | 1305 ------------ externals/g3dlite/G3D.lib/source/Line.cpp | 89 - externals/g3dlite/G3D.lib/source/LineSegment.cpp | 236 --- externals/g3dlite/G3D.lib/source/Log.cpp | 157 -- externals/g3dlite/G3D.lib/source/Matrix.cpp | 1801 ---------------- externals/g3dlite/G3D.lib/source/Matrix3.cpp | 1725 ---------------- externals/g3dlite/G3D.lib/source/Matrix4.cpp | 433 ---- externals/g3dlite/G3D.lib/source/MeshAlg.cpp | 733 ------- .../g3dlite/G3D.lib/source/MeshAlgAdjacency.cpp | 729 ------- externals/g3dlite/G3D.lib/source/MeshAlgWeld.cpp | 213 -- externals/g3dlite/G3D.lib/source/MeshAlgWeld2.cpp | 377 ---- externals/g3dlite/G3D.lib/source/MeshBuilder.cpp | 113 - externals/g3dlite/G3D.lib/source/NetAddress.cpp | 164 -- externals/g3dlite/G3D.lib/source/NetworkDevice.cpp | 1362 ------------- externals/g3dlite/G3D.lib/source/PhysicsFrame.cpp | 77 - externals/g3dlite/G3D.lib/source/Plane.cpp | 149 -- externals/g3dlite/G3D.lib/source/Quat.cpp | 583 ------ externals/g3dlite/G3D.lib/source/Ray.cpp | 112 - externals/g3dlite/G3D.lib/source/RegistryUtil.cpp | 290 --- externals/g3dlite/G3D.lib/source/Sphere.cpp | 196 -- externals/g3dlite/G3D.lib/source/SplineBase.cpp | 162 -- externals/g3dlite/G3D.lib/source/Stopwatch.cpp | 96 - externals/g3dlite/G3D.lib/source/System.cpp | 1864 ----------------- externals/g3dlite/G3D.lib/source/TextInput.cpp | 988 --------- externals/g3dlite/G3D.lib/source/TextOutput.cpp | 452 ---- externals/g3dlite/G3D.lib/source/ThreadSet.cpp | 147 -- externals/g3dlite/G3D.lib/source/Triangle.cpp | 135 -- externals/g3dlite/G3D.lib/source/UprightFrame.cpp | 132 -- externals/g3dlite/G3D.lib/source/Vector2.cpp | 211 -- externals/g3dlite/G3D.lib/source/Vector2int16.cpp | 47 - externals/g3dlite/G3D.lib/source/Vector3.cpp | 493 ----- externals/g3dlite/G3D.lib/source/Vector3int16.cpp | 49 - externals/g3dlite/G3D.lib/source/Vector3int32.cpp | 57 - externals/g3dlite/G3D.lib/source/Vector4.cpp | 475 ----- externals/g3dlite/G3D.lib/source/Vector4int8.cpp | 58 - externals/g3dlite/G3D.lib/source/WinMain.cpp | 155 -- externals/g3dlite/G3D.lib/source/debugAssert.cpp | 392 ---- externals/g3dlite/G3D.lib/source/fileutils.cpp | 1092 ---------- externals/g3dlite/G3D.lib/source/filter.cpp | 32 - externals/g3dlite/G3D.lib/source/format.cpp | 164 -- externals/g3dlite/G3D.lib/source/g3dmath.cpp | 70 - externals/g3dlite/G3D.lib/source/license.cpp | 70 - externals/g3dlite/G3D.lib/source/prompt.cpp | 716 ------- externals/g3dlite/G3D.lib/source/stringutils.cpp | 231 --- externals/g3dlite/G3D.lib/source/uint128.cpp | 155 -- externals/g3dlite/G3D/AABox.h | 272 +++ externals/g3dlite/G3D/Any.h | 570 ++++++ externals/g3dlite/G3D/AnyVal.h | 512 +++++ externals/g3dlite/G3D/AreaMemoryManager.h | 93 + externals/g3dlite/G3D/Array.h | 1274 ++++++++++++ externals/g3dlite/G3D/AtomicInt32.h | 164 ++ externals/g3dlite/G3D/BinaryFormat.h | 140 ++ externals/g3dlite/G3D/BinaryInput.h | 441 ++++ externals/g3dlite/G3D/BinaryOutput.h | 421 ++++ externals/g3dlite/G3D/BoundsTrait.h | 20 + externals/g3dlite/G3D/Box.h | 195 ++ externals/g3dlite/G3D/Box2D.h | 121 ++ externals/g3dlite/G3D/BumpMapPreprocess.h | 61 + externals/g3dlite/G3D/Capsule.h | 90 + externals/g3dlite/G3D/CollisionDetection.h | 1205 +++++++++++ externals/g3dlite/G3D/Color1.h | 144 ++ externals/g3dlite/G3D/Color1uint8.h | 91 + externals/g3dlite/G3D/Color3.h | 432 ++++ externals/g3dlite/G3D/Color3uint8.h | 110 + externals/g3dlite/G3D/Color4.h | 338 +++ externals/g3dlite/G3D/Color4uint8.h | 115 ++ externals/g3dlite/G3D/Cone.h | 68 + externals/g3dlite/G3D/ConvexPolyhedron.h | 180 ++ externals/g3dlite/G3D/CoordinateFrame.h | 331 +++ externals/g3dlite/G3D/Crypto.h | 96 + externals/g3dlite/G3D/Cylinder.h | 92 + externals/g3dlite/G3D/EqualsTrait.h | 26 + externals/g3dlite/G3D/G3D.h | 162 ++ externals/g3dlite/G3D/G3DAll.h | 26 + externals/g3dlite/G3D/G3DGameUnits.h | 42 + externals/g3dlite/G3D/GCamera.h | 337 +++ externals/g3dlite/G3D/GImage.h | 607 ++++++ externals/g3dlite/G3D/GLight.h | 106 + externals/g3dlite/G3D/GMutex.h | 123 ++ externals/g3dlite/G3D/GThread.h | 121 ++ externals/g3dlite/G3D/GUniqueID.h | 69 + externals/g3dlite/G3D/HashTrait.h | 92 + externals/g3dlite/G3D/Image1.h | 81 + externals/g3dlite/G3D/Image1uint8.h | 80 + externals/g3dlite/G3D/Image3.h | 81 + externals/g3dlite/G3D/Image3uint8.h | 85 + externals/g3dlite/G3D/Image4.h | 86 + externals/g3dlite/G3D/Image4uint8.h | 85 + externals/g3dlite/G3D/ImageFormat.h | 419 ++++ externals/g3dlite/G3D/Intersect.h | 55 + externals/g3dlite/G3D/KDTree.h | 1667 +++++++++++++++ externals/g3dlite/G3D/Line.h | 105 + externals/g3dlite/G3D/LineSegment.h | 115 ++ externals/g3dlite/G3D/Log.h | 109 + externals/g3dlite/G3D/Map2D.h | 667 ++++++ externals/g3dlite/G3D/Matrix.h | 634 ++++++ externals/g3dlite/G3D/Matrix2.h | 69 + externals/g3dlite/G3D/Matrix3.h | 366 ++++ externals/g3dlite/G3D/Matrix4.h | 249 +++ externals/g3dlite/G3D/MemoryManager.h | 93 + externals/g3dlite/G3D/MeshAlg.h | 683 +++++++ externals/g3dlite/G3D/MeshBuilder.h | 82 + externals/g3dlite/G3D/NetAddress.h | 132 ++ externals/g3dlite/G3D/NetworkDevice.h | 738 +++++++ externals/g3dlite/G3D/ParseError.h | 59 + externals/g3dlite/G3D/PhysicsFrame.h | 74 + externals/g3dlite/G3D/Plane.h | 161 ++ externals/g3dlite/G3D/PointHashGrid.h | 917 +++++++++ externals/g3dlite/G3D/PointKDTree.h | 1185 +++++++++++ externals/g3dlite/G3D/Pointer.h | 292 +++ externals/g3dlite/G3D/PositionTrait.h | 7 + externals/g3dlite/G3D/PrecomputedRandom.h | 110 + externals/g3dlite/G3D/Quat.h | 725 +++++++ externals/g3dlite/G3D/Quat.inl | 36 + externals/g3dlite/G3D/Queue.h | 364 ++++ externals/g3dlite/G3D/Random.h | 139 ++ externals/g3dlite/G3D/Ray.h | 371 ++++ externals/g3dlite/G3D/Rect2D.h | 417 ++++ externals/g3dlite/G3D/ReferenceCount.h | 570 ++++++ externals/g3dlite/G3D/RegistryUtil.h | 97 + externals/g3dlite/G3D/Set.h | 186 ++ externals/g3dlite/G3D/SmallArray.h | 155 ++ externals/g3dlite/G3D/Sphere.h | 148 ++ externals/g3dlite/G3D/Spline.h | 367 ++++ externals/g3dlite/G3D/Stopwatch.h | 144 ++ externals/g3dlite/G3D/System.h | 507 +++++ externals/g3dlite/G3D/Table.h | 924 +++++++++ externals/g3dlite/G3D/TextInput.h | 801 ++++++++ externals/g3dlite/G3D/TextOutput.h | 249 +++ externals/g3dlite/G3D/ThreadSet.h | 87 + externals/g3dlite/G3D/Triangle.h | 160 ++ externals/g3dlite/G3D/UprightFrame.h | 83 + externals/g3dlite/G3D/Vector2.h | 454 +++++ externals/g3dlite/G3D/Vector2.inl | 18 + externals/g3dlite/G3D/Vector2int16.h | 127 ++ externals/g3dlite/G3D/Vector3.h | 798 ++++++++ externals/g3dlite/G3D/Vector3.inl | 249 +++ externals/g3dlite/G3D/Vector3int16.h | 127 ++ externals/g3dlite/G3D/Vector3int32.h | 128 ++ externals/g3dlite/G3D/Vector4.h | 716 +++++++ externals/g3dlite/G3D/Vector4.inl | 191 ++ externals/g3dlite/G3D/Vector4int8.h | 113 + externals/g3dlite/G3D/WeakCache.h | 122 ++ externals/g3dlite/G3D/Welder.h | 82 + externals/g3dlite/G3D/WrapMode.h | 93 + externals/g3dlite/G3D/constants.h | 129 ++ externals/g3dlite/G3D/debug.h | 66 + externals/g3dlite/G3D/debugAssert.h | 233 +++ externals/g3dlite/G3D/debugPrintf.h | 62 + externals/g3dlite/G3D/enumclass.h | 147 ++ externals/g3dlite/G3D/fileutils.h | 254 +++ externals/g3dlite/G3D/filter.h | 29 + externals/g3dlite/G3D/format.h | 44 + externals/g3dlite/G3D/g3dfnmatch.h | 83 + externals/g3dlite/G3D/g3dmath.h | 845 ++++++++ externals/g3dlite/G3D/g3dmath.inl | 288 +++ externals/g3dlite/G3D/platform.h | 331 +++ externals/g3dlite/G3D/prompt.h | 67 + externals/g3dlite/G3D/serialize.h | 30 + externals/g3dlite/G3D/splinefunc.h | 118 ++ externals/g3dlite/G3D/stringutils.h | 140 ++ externals/g3dlite/G3D/uint128.h | 51 + externals/g3dlite/G3D/units.h | 126 ++ externals/g3dlite/G3D/vectorMath.h | 235 +++ externals/g3dlite/doc-files/changelog.dox | 1872 ----------------- externals/g3dlite/doc-files/contributors.dox | 85 - externals/g3dlite/doc-files/license.dox | 120 -- externals/g3dlite/win/VC90/g3dlite.vcproj | 463 ----- externals/g3dlite/win/g3dlite.sln | 25 - externals/g3dlite/zip.lib/include/zip/ioapi.h | 75 - externals/g3dlite/zip.lib/include/zip/unzip.h | 354 ---- externals/g3dlite/zip.lib/include/zip/zip.h | 235 --- externals/g3dlite/zip.lib/source/crypt.h | 132 -- externals/g3dlite/zip.lib/source/ioapi.c | 177 -- externals/g3dlite/zip.lib/source/iowin32.c | 272 --- externals/g3dlite/zip.lib/source/iowin32.h | 23 - externals/g3dlite/zip.lib/source/unzip.c | 1604 --------------- externals/g3dlite/zip.lib/source/zip.c | 1221 ----------- src/server/collision/BoundingIntervalHierarchy.h | 8 +- src/server/collision/CMakeLists.txt | 5 +- src/server/collision/Management/VMapManager2.h | 4 +- src/server/collision/Maps/TileAssembler.cpp | 2 +- 322 files changed, 31809 insertions(+), 68149 deletions(-) delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/AABSPTree.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/AABox.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/AnyVal.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/Array.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/AtomicInt32.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/BinaryFormat.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/BinaryInput.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/BinaryOutput.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/BoundsTrait.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/Box.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/Capsule.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/CollisionDetection.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/Color1.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/Color1uint8.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/Color3.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/Color3uint8.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/Color4.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/Color4uint8.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/Cone.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/ConvexPolyhedron.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/CoordinateFrame.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/Crypto.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/Cylinder.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/Discovery.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/EqualsTrait.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/G3D.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/G3DAll.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/G3DGameUnits.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/GCamera.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/GImage.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/GLight.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/GThread.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/GUniqueID.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/HashTrait.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/Image1.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/Image1uint8.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/Image3.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/Image3uint8.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/Image4.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/Image4uint8.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/ImageFormat.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/Line.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/LineSegment.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/Log.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/Map2D.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/Matrix.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/Matrix2.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/Matrix3.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/Matrix4.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/MeshAlg.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/MeshBuilder.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/NetAddress.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/NetworkDevice.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/PhysicsFrame.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/Plane.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/PointAABSPTree.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/PointHashGrid.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/Pointer.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/PositionTrait.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/Quat.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/Queue.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/Ray.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/Rect2D.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/ReferenceCount.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/RegistryUtil.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/Set.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/Sphere.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/Spline.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/Stopwatch.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/System.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/Table.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/TextInput.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/TextOutput.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/ThreadSet.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/Triangle.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/UprightFrame.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/Vector2.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/Vector2int16.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/Vector3.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/Vector3int16.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/Vector3int32.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/Vector4.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/Vector4int8.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/WeakCache.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/WrapMode.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/debug.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/debugAssert.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/debugPrintf.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/enumclass.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/fileutils.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/filter.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/format.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/g3dmath.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/platform.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/prompt.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/serialize.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/splinefunc.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/stringutils.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/uint128.h delete mode 100644 externals/g3dlite/G3D.lib/include/G3D/vectorMath.h delete mode 100644 externals/g3dlite/G3D.lib/source/AABox.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/AnyVal.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/BinaryFormat.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/BinaryInput.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/BinaryOutput.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/Box.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/Capsule.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/CollisionDetection.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/Color1.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/Color1uint8.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/Color3.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/Color3uint8.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/Color4.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/Color4uint8.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/Cone.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/ConvexPolyhedron.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/CoordinateFrame.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/Crypto.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/Crypto_md5.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/Cylinder.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/Discovery.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/GCamera.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/GImage.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/GImage_bayer.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/GImage_bmp.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/GImage_jpeg.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/GImage_png.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/GImage_ppm.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/GImage_tga.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/GLight.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/GThread.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/GUniqueID.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/Image1.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/Image1uint8.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/Image3.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/Image3uint8.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/Image4.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/Image4uint8.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/ImageFormat.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/ImageFormat_convert.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/Line.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/LineSegment.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/Log.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/Matrix.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/Matrix3.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/Matrix4.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/MeshAlg.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/MeshAlgAdjacency.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/MeshAlgWeld.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/MeshAlgWeld2.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/MeshBuilder.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/NetAddress.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/NetworkDevice.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/PhysicsFrame.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/Plane.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/Quat.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/Ray.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/RegistryUtil.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/Sphere.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/SplineBase.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/Stopwatch.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/System.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/TextInput.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/TextOutput.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/ThreadSet.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/Triangle.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/UprightFrame.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/Vector2.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/Vector2int16.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/Vector3.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/Vector3int16.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/Vector3int32.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/Vector4.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/Vector4int8.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/WinMain.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/debugAssert.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/fileutils.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/filter.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/format.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/g3dmath.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/license.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/prompt.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/stringutils.cpp delete mode 100644 externals/g3dlite/G3D.lib/source/uint128.cpp create mode 100644 externals/g3dlite/G3D/AABox.h create mode 100644 externals/g3dlite/G3D/Any.h create mode 100644 externals/g3dlite/G3D/AnyVal.h create mode 100644 externals/g3dlite/G3D/AreaMemoryManager.h create mode 100644 externals/g3dlite/G3D/Array.h create mode 100644 externals/g3dlite/G3D/AtomicInt32.h create mode 100644 externals/g3dlite/G3D/BinaryFormat.h create mode 100644 externals/g3dlite/G3D/BinaryInput.h create mode 100644 externals/g3dlite/G3D/BinaryOutput.h create mode 100644 externals/g3dlite/G3D/BoundsTrait.h create mode 100644 externals/g3dlite/G3D/Box.h create mode 100644 externals/g3dlite/G3D/Box2D.h create mode 100644 externals/g3dlite/G3D/BumpMapPreprocess.h create mode 100644 externals/g3dlite/G3D/Capsule.h create mode 100644 externals/g3dlite/G3D/CollisionDetection.h create mode 100644 externals/g3dlite/G3D/Color1.h create mode 100644 externals/g3dlite/G3D/Color1uint8.h create mode 100644 externals/g3dlite/G3D/Color3.h create mode 100644 externals/g3dlite/G3D/Color3uint8.h create mode 100644 externals/g3dlite/G3D/Color4.h create mode 100644 externals/g3dlite/G3D/Color4uint8.h create mode 100644 externals/g3dlite/G3D/Cone.h create mode 100644 externals/g3dlite/G3D/ConvexPolyhedron.h create mode 100644 externals/g3dlite/G3D/CoordinateFrame.h create mode 100644 externals/g3dlite/G3D/Crypto.h create mode 100644 externals/g3dlite/G3D/Cylinder.h create mode 100644 externals/g3dlite/G3D/EqualsTrait.h create mode 100644 externals/g3dlite/G3D/G3D.h create mode 100644 externals/g3dlite/G3D/G3DAll.h create mode 100644 externals/g3dlite/G3D/G3DGameUnits.h create mode 100644 externals/g3dlite/G3D/GCamera.h create mode 100644 externals/g3dlite/G3D/GImage.h create mode 100644 externals/g3dlite/G3D/GLight.h create mode 100644 externals/g3dlite/G3D/GMutex.h create mode 100644 externals/g3dlite/G3D/GThread.h create mode 100644 externals/g3dlite/G3D/GUniqueID.h create mode 100644 externals/g3dlite/G3D/HashTrait.h create mode 100644 externals/g3dlite/G3D/Image1.h create mode 100644 externals/g3dlite/G3D/Image1uint8.h create mode 100644 externals/g3dlite/G3D/Image3.h create mode 100644 externals/g3dlite/G3D/Image3uint8.h create mode 100644 externals/g3dlite/G3D/Image4.h create mode 100644 externals/g3dlite/G3D/Image4uint8.h create mode 100644 externals/g3dlite/G3D/ImageFormat.h create mode 100644 externals/g3dlite/G3D/Intersect.h create mode 100644 externals/g3dlite/G3D/KDTree.h create mode 100644 externals/g3dlite/G3D/Line.h create mode 100644 externals/g3dlite/G3D/LineSegment.h create mode 100644 externals/g3dlite/G3D/Log.h create mode 100644 externals/g3dlite/G3D/Map2D.h create mode 100644 externals/g3dlite/G3D/Matrix.h create mode 100644 externals/g3dlite/G3D/Matrix2.h create mode 100644 externals/g3dlite/G3D/Matrix3.h create mode 100644 externals/g3dlite/G3D/Matrix4.h create mode 100644 externals/g3dlite/G3D/MemoryManager.h create mode 100644 externals/g3dlite/G3D/MeshAlg.h create mode 100644 externals/g3dlite/G3D/MeshBuilder.h create mode 100644 externals/g3dlite/G3D/NetAddress.h create mode 100644 externals/g3dlite/G3D/NetworkDevice.h create mode 100644 externals/g3dlite/G3D/ParseError.h create mode 100644 externals/g3dlite/G3D/PhysicsFrame.h create mode 100644 externals/g3dlite/G3D/Plane.h create mode 100644 externals/g3dlite/G3D/PointHashGrid.h create mode 100644 externals/g3dlite/G3D/PointKDTree.h create mode 100644 externals/g3dlite/G3D/Pointer.h create mode 100644 externals/g3dlite/G3D/PositionTrait.h create mode 100644 externals/g3dlite/G3D/PrecomputedRandom.h create mode 100644 externals/g3dlite/G3D/Quat.h create mode 100644 externals/g3dlite/G3D/Quat.inl create mode 100644 externals/g3dlite/G3D/Queue.h create mode 100644 externals/g3dlite/G3D/Random.h create mode 100644 externals/g3dlite/G3D/Ray.h create mode 100644 externals/g3dlite/G3D/Rect2D.h create mode 100644 externals/g3dlite/G3D/ReferenceCount.h create mode 100644 externals/g3dlite/G3D/RegistryUtil.h create mode 100644 externals/g3dlite/G3D/Set.h create mode 100644 externals/g3dlite/G3D/SmallArray.h create mode 100644 externals/g3dlite/G3D/Sphere.h create mode 100644 externals/g3dlite/G3D/Spline.h create mode 100644 externals/g3dlite/G3D/Stopwatch.h create mode 100644 externals/g3dlite/G3D/System.h create mode 100644 externals/g3dlite/G3D/Table.h create mode 100644 externals/g3dlite/G3D/TextInput.h create mode 100644 externals/g3dlite/G3D/TextOutput.h create mode 100644 externals/g3dlite/G3D/ThreadSet.h create mode 100644 externals/g3dlite/G3D/Triangle.h create mode 100644 externals/g3dlite/G3D/UprightFrame.h create mode 100644 externals/g3dlite/G3D/Vector2.h create mode 100644 externals/g3dlite/G3D/Vector2.inl create mode 100644 externals/g3dlite/G3D/Vector2int16.h create mode 100644 externals/g3dlite/G3D/Vector3.h create mode 100644 externals/g3dlite/G3D/Vector3.inl create mode 100644 externals/g3dlite/G3D/Vector3int16.h create mode 100644 externals/g3dlite/G3D/Vector3int32.h create mode 100644 externals/g3dlite/G3D/Vector4.h create mode 100644 externals/g3dlite/G3D/Vector4.inl create mode 100644 externals/g3dlite/G3D/Vector4int8.h create mode 100644 externals/g3dlite/G3D/WeakCache.h create mode 100644 externals/g3dlite/G3D/Welder.h create mode 100644 externals/g3dlite/G3D/WrapMode.h create mode 100644 externals/g3dlite/G3D/constants.h create mode 100644 externals/g3dlite/G3D/debug.h create mode 100644 externals/g3dlite/G3D/debugAssert.h create mode 100644 externals/g3dlite/G3D/debugPrintf.h create mode 100644 externals/g3dlite/G3D/enumclass.h create mode 100644 externals/g3dlite/G3D/fileutils.h create mode 100644 externals/g3dlite/G3D/filter.h create mode 100644 externals/g3dlite/G3D/format.h create mode 100644 externals/g3dlite/G3D/g3dfnmatch.h create mode 100644 externals/g3dlite/G3D/g3dmath.h create mode 100644 externals/g3dlite/G3D/g3dmath.inl create mode 100644 externals/g3dlite/G3D/platform.h create mode 100644 externals/g3dlite/G3D/prompt.h create mode 100644 externals/g3dlite/G3D/serialize.h create mode 100644 externals/g3dlite/G3D/splinefunc.h create mode 100644 externals/g3dlite/G3D/stringutils.h create mode 100644 externals/g3dlite/G3D/uint128.h create mode 100644 externals/g3dlite/G3D/units.h create mode 100644 externals/g3dlite/G3D/vectorMath.h delete mode 100644 externals/g3dlite/doc-files/changelog.dox delete mode 100644 externals/g3dlite/doc-files/contributors.dox delete mode 100644 externals/g3dlite/doc-files/license.dox delete mode 100644 externals/g3dlite/win/VC90/g3dlite.vcproj delete mode 100644 externals/g3dlite/win/g3dlite.sln delete mode 100644 externals/g3dlite/zip.lib/include/zip/ioapi.h delete mode 100644 externals/g3dlite/zip.lib/include/zip/unzip.h delete mode 100644 externals/g3dlite/zip.lib/include/zip/zip.h delete mode 100644 externals/g3dlite/zip.lib/source/crypt.h delete mode 100644 externals/g3dlite/zip.lib/source/ioapi.c delete mode 100644 externals/g3dlite/zip.lib/source/iowin32.c delete mode 100644 externals/g3dlite/zip.lib/source/iowin32.h delete mode 100644 externals/g3dlite/zip.lib/source/unzip.c delete mode 100644 externals/g3dlite/zip.lib/source/zip.c (limited to 'src') diff --git a/externals/PackageList.txt b/externals/PackageList.txt index 52341a01cd4..168d0428983 100644 --- a/externals/PackageList.txt +++ b/externals/PackageList.txt @@ -6,7 +6,7 @@ ACE (ADAPTIVE Communication Environment) bzip2 (a freely available, patent free, high-quality data compressor) http://www.bzip.org/ -G3D (a commercial-grade C++ 3D engine available as Open Source (BSD License) +G3D 6.09 (a commercial-grade C++ 3D engine available as Open Source (BSD License) http://g3d.sourceforge.net/ jemalloc (a general-purpose scalable concurrent malloc-implementation) diff --git a/externals/g3dlite/G3D.lib/include/G3D/AABSPTree.h b/externals/g3dlite/G3D.lib/include/G3D/AABSPTree.h deleted file mode 100644 index 1178fad93c3..00000000000 --- a/externals/g3dlite/G3D.lib/include/G3D/AABSPTree.h +++ /dev/null @@ -1,1609 +0,0 @@ -/** - @file AABSPTree.h - - @maintainer Morgan McGuire, matrix@graphics3d.com - - @created 2004-01-11 - @edited 2008-11-19 - - Copyright 2000-2008, Morgan McGuire. - All rights reserved. - - */ - -#ifndef G3D_KDTREE_H -#define G3D_KDTREE_H - -#include "G3D/platform.h" -#include "G3D/Array.h" -#include "G3D/Table.h" -#include "G3D/Vector2.h" -#include "G3D/Vector3.h" -#include "G3D/Vector4.h" -#include "G3D/AABox.h" -#include "G3D/Sphere.h" -#include "G3D/Box.h" -#include "G3D/Triangle.h" -#include "G3D/Ray.h" -#include "G3D/GCamera.h" -#include "G3D/BinaryInput.h" -#include "G3D/BinaryOutput.h" -#include "G3D/CollisionDetection.h" -#include "G3D/GCamera.h" -#include "G3D/BoundsTrait.h" -#include - -// If defined, in debug mode the tree is checked for consistency -// as a way of detecting corruption due to implementation bugs -// #define VERIFY_TREE - -template<> struct BoundsTrait { - static void getBounds(const G3D::Vector2& v, G3D::AABox& out) { out = G3D::AABox(G3D::Vector3(v, 0)); } -}; - -template<> struct BoundsTrait { - static void getBounds(const G3D::Vector3& v, G3D::AABox& out) { out = G3D::AABox(v); } -}; - -template<> struct BoundsTrait { - static void getBounds(const G3D::Vector4& v, G3D::AABox& out) { out = G3D::AABox(v.xyz()); } -}; - -template<> struct BoundsTrait { - static void getBounds(const G3D::AABox& v, G3D::AABox& out) { out = v; } -}; - -template<> struct BoundsTrait { - static void getBounds(const G3D::Sphere& s, G3D::AABox& out) { s.getBounds(out); } -}; - -template<> struct BoundsTrait { - static void getBounds(const G3D::Box& b, G3D::AABox& out) { b.getBounds(out); } -}; - -template<> struct BoundsTrait { - static void getBounds(const G3D::Vector2*& v, G3D::AABox& out) { out = G3D::AABox(G3D::Vector3(*v, 0)); } -}; - -template<> struct BoundsTrait { - static void getBounds(const G3D::Vector3*& v, G3D::AABox& out) { out = G3D::AABox(*v); } -}; - -template<> struct BoundsTrait { - static void getBounds(const G3D::Vector4*& v, G3D::AABox& out) { out = G3D::AABox(v->xyz()); } -}; - -template<> struct BoundsTrait { - static void getBounds(const G3D::AABox*& v, G3D::AABox& out) { out = *v; } -}; - -template<> struct BoundsTrait { - static void getBounds(const G3D::Sphere*& s, G3D::AABox& out) { s->getBounds(out); } -}; - -template<> struct BoundsTrait { - static void getBounds(const G3D::Box*& b, G3D::AABox& out) { b->getBounds(out); } -}; - - -template<> struct BoundsTrait { - static void getBounds(const G3D::Triangle*& t, G3D::AABox& out) { t->getBounds(out); } -}; - -namespace G3D { - namespace _internal { - - /** - Wraps a pointer value so that it can be treated as the instance itself; - convenient for inserting pointers into a Table but using the - object equality instead of pointer equality. - */ - template - class Indirector { - public: - Type* handle; - - inline Indirector(Type* h) : handle(h) {} - - inline Indirector() : handle(NULL) {} - - /** Returns true iff the values referenced by the handles are equivalent. */ - inline bool operator==(const Indirector& m) const { - return *handle == *(m.handle); - } - - inline bool operator==(const Type& m) const { - return *handle == m; - } - - inline size_t hashCode() const { - return handle->hashCode(); - } - }; - } // namespace internal -} // namespace G3D - -template struct HashTrait > { - static size_t hashCode(const G3D::_internal::Indirector& key) { return key.hashCode(); } -}; - -namespace G3D { - -/** - A set that supports spatial queries using a KD tree (axis-aligned - BSP tree) for speed. - - KDTree allows you to quickly find objects in 3D that lie within - a box or along a ray. For large sets of objects it is much faster - than testing each object for a collision. - - KDTree is as powerful as but more general than a Quad Tree, Oct - Tree, or regular KD tree that cycles through axes, but less general than an unconstrained BSP tree - (which is much slower to create). - - Internally, objects - are arranged into a tree according to their - axis-aligned bounds. This increases the cost of insertion to - O(log n) but allows fast overlap queries. - - Template Parameters -
The template parameter T must be one for which - the following functions are all overloaded: - - 
-  T::T(); (public constructor of no arguments)
-  template <> struct HashTrait { static size_t hashCode(int key); };
-  template<> struct BoundsTrait { static void getBounds(const T& obj, G3D::AABox& out); };
-
- - G3D provides these for common classes like G3D::Vector3 and G3D::Sphere. - If you use a custom class, or a pointer to a custom class, you will need - to define those functions. - - Moving %Set Members -
It is important that objects do not move without updating the - KDTree. If the axis-aligned bounds of an object are about - to change, KDTree::remove it before they change and - KDTree::insert it again afterward. For objects - where the hashCode and == operator are invariant with respect - to the 3D position, - you can use the KDTree::update method as a shortcut to - insert/remove an object in one step after it has moved. - - - Note: Do not mutate any value once it has been inserted into KDTree. Values - are copied interally. All KDTree iterators convert to pointers to constant - values to reinforce this. - - If you want to mutate the objects you intend to store in a KDTree - simply insert pointers to your objects instead of the objects - themselves, and ensure that the above operations are defined. (And - actually, because values are copied, if your values are large you may - want to insert pointers anyway, to save space and make the balance - operation faster.) - - Dimensions - Although designed as a 3D-data structure, you can use the KDTree - for data distributed along 2 or 1 axes by simply returning bounds - that are always zero along one or more dimensions. - -*/ -template< class T, - class BoundsFunc = BoundsTrait, - class HashFunc = HashTrait, - class EqualsFunc = EqualsTrait > -class KDTree { -protected: -#define TreeType KDTree - - /** Wrapper for a value that includes a cache of its bounds. - Except for the test value used in a set-query operation, there - is only ever one instance of the handle associated with any - value and the memberTable and Nodes maintain pointers to that - heap-allocated value. - */ - class Handle { - public: - /** The bounds of each object are constrained to AABox::large */ - AABox bounds; - - /** Center of bounds. We cache this value to avoid recomputing it - during the median sort, and because MSVC 6 std::sort goes into - an infinite loop if we compute the midpoint on the fly (possibly - a floating point roundoff issue, where B& point, - int beginIndex, - int endIndex) { - - Vector3 lo = Vector3::inf(); - Vector3 hi = -lo; - - debugAssertM(beginIndex <= endIndex, "No points"); - for (int p = beginIndex; p <= endIndex; ++p) { - // This code is written with the vector min and max expanded - // because otherwise it compiles incorrectly with -O3 on - // gcc 3.4 - - const Vector3& pLo = point[p]->bounds.low(); - const Vector3& pHi = point[p]->bounds.high(); - for (int a = 0; a < 3; ++a) { - lo[a] = G3D::min(lo[a], pLo[a]); - hi[a] = G3D::max(hi[a], pHi[a]); - } - } - - return AABox(lo, hi); - } - - /** Compares centers */ - class CenterComparator { - public: - Vector3::Axis sortAxis; - - CenterComparator(Vector3::Axis a) : sortAxis(a) {} - - inline int operator()(Handle* A, const Handle* B) const { - float a = A->center[sortAxis]; - float b = B->center[sortAxis]; - - if (a < b) { - return 1; - } else if (a > b) { - return -1; - } else { - return 0; - } - } - }; - - - /** Compares bounds for strict >, <, or overlap*/ - class BoundsComparator { - public: - Vector3::Axis sortAxis; - - BoundsComparator(Vector3::Axis a) : sortAxis(a) {} - - inline int operator()(Handle* A, const Handle* B) const { - const AABox& a = A->bounds; - const AABox& b = B->bounds; - - if (a.high()[sortAxis] < b.low()[sortAxis]) { - return 1; - } else if (a.low()[sortAxis] > b.high()[sortAxis]) { - return -1; - } else { - return 0; - } - } - }; - - - /** Compares bounds to the sort location */ - class Comparator { - public: - Vector3::Axis sortAxis; - float sortLocation; - - Comparator(Vector3::Axis a, float l) : sortAxis(a), sortLocation(l) {} - - inline int operator()(Handle* ignore, const Handle* handle) const { - const AABox& box = handle->bounds; - debugAssert(ignore == NULL); - - if (box.high()[sortAxis] < sortLocation) { - // Box is strictly below the sort location - return -1; - } else if (box.low()[sortAxis] > sortLocation) { - // Box is strictly above the sort location - return 1; - } else { - // Box overlaps the sort location - return 0; - } - } - }; - - // Using System::malloc with this class provided no speed improvement. - class Node { - public: - - /** Spatial bounds on all values at this node and its children, based purely on - the parent's splitting planes. May be infinite. */ - AABox splitBounds; - - Vector3::Axis splitAxis; - - /** Location along the specified axis */ - float splitLocation; - - /** child[0] contains all values strictly - smaller than splitLocation along splitAxis. - - child[1] contains all values strictly - larger. - - Both may be NULL if there are not enough - values to bother recursing. - */ - Node* child[2]; - - /** Array of values at this node (i.e., values - straddling the split plane + all values if - this is a leaf node). - - This is an array of pointers because that minimizes - data movement during tree building, which accounts - for about 15% of the time cost of tree building. - */ - Array valueArray; - - /** For each object in the value array, a copy of its bounds. - Packing these into an array at the node level - instead putting them in the valueArray improves - cache coherence, which is about a 3x performance - increase when performing intersection computations. - */ - Array boundsArray; - - /** Creates node with NULL children */ - Node() { - splitAxis = Vector3::X_AXIS; - splitLocation = 0; - splitBounds = AABox(-Vector3::inf(), Vector3::inf()); - for (int i = 0; i < 2; ++i) { - child[i] = NULL; - } - } - - /** - Doesn't clone children. - */ - Node(const Node& other) : valueArray(other.valueArray), boundsArray(other.boundsArray) { - splitAxis = other.splitAxis; - splitLocation = other.splitLocation; - splitBounds = other.splitBounds; - for (int i = 0; i < 2; ++i) { - child[i] = NULL; - } - } - - /** Copies the specified subarray of pt into point, NULLs the children. - Assumes a second pass will set splitBounds. */ - Node(const Array& pt) : valueArray(pt) { - splitAxis = Vector3::X_AXIS; - splitLocation = 0; - for (int i = 0; i < 2; ++i) { - child[i] = NULL; - } - - boundsArray.resize(valueArray.size()); - for (int i = 0; i < valueArray.size(); ++i) { - boundsArray[i] = valueArray[i]->bounds; - } - } - - /** Deletes the children (but not the values) */ - ~Node() { - for (int i = 0; i < 2; ++i) { - delete child[i]; - } - } - - /** Returns true if this node is a leaf (no children) */ - inline bool isLeaf() const { - return (child[0] == NULL) && (child[1] == NULL); - } - - - /** - Recursively appends all handles and children's handles - to the array. - */ - void getHandles(Array& handleArray) const { - handleArray.append(valueArray); - for (int i = 0; i < 2; ++i) { - if (child[i] != NULL) { - child[i]->getHandles(handleArray); - } - } - } - - void verifyNode(const Vector3& lo, const Vector3& hi) { - // debugPrintf("Verifying: split %d @ %f [%f, %f, %f], [%f, %f, %f]\n", - // splitAxis, splitLocation, lo.x, lo.y, lo.z, hi.x, hi.y, hi.z); - - debugAssertM(lo == splitBounds.low(), - format("lo = %s, splitBounds.lo = %s", - lo.toString().c_str(), splitBounds.low().toString().c_str())); - debugAssert(hi == splitBounds.high()); - - for (int i = 0; i < valueArray.length(); ++i) { - const AABox& b = valueArray[i]->bounds; - debugAssert(b == boundsArray[i]); - - for(int axis = 0; axis < 3; ++axis) { - debugAssert(b.low()[axis] <= b.high()[axis]); - debugAssert(b.low()[axis] >= lo[axis]); - debugAssert(b.high()[axis] <= hi[axis]); - } - } - - if (child[0] || child[1]) { - debugAssert(lo[splitAxis] < splitLocation); - debugAssert(hi[splitAxis] > splitLocation); - } - - Vector3 newLo = lo; - newLo[splitAxis] = splitLocation; - Vector3 newHi = hi; - newHi[splitAxis] = splitLocation; - - if (child[0] != NULL) { - child[0]->verifyNode(lo, newHi); - } - - if (child[1] != NULL) { - child[1]->verifyNode(newLo, hi); - } - } - - - /** - Stores the locations of the splitting planes (the structure but not the content) - so that the tree can be quickly rebuilt from a previous configuration without - calling balance. - */ - static void serializeStructure(const Node* n, BinaryOutput& bo) { - if (n == NULL) { - bo.writeUInt8(0); - } else { - bo.writeUInt8(1); - n->splitBounds.serialize(bo); - serialize(n->splitAxis, bo); - bo.writeFloat32(n->splitLocation); - for (int c = 0; c < 2; ++c) { - serializeStructure(n->child[c], bo); - } - } - } - - /** Clears the member table */ - static Node* deserializeStructure(BinaryInput& bi) { - if (bi.readUInt8() == 0) { - return NULL; - } else { - Node* n = new Node(); - n->splitBounds.deserialize(bi); - deserialize(n->splitAxis, bi); - n->splitLocation = bi.readFloat32(); - for (int c = 0; c < 2; ++c) { - n->child[c] = deserializeStructure(bi); - } - return n; - } - } - - /** Returns the deepest node that completely contains bounds. */ - Node* findDeepestContainingNode(const AABox& bounds) { - - // See which side of the splitting plane the bounds are on - if (bounds.high()[splitAxis] < splitLocation) { - // Bounds are on the low side. Recurse into the child - // if it exists. - if (child[0] != NULL) { - return child[0]->findDeepestContainingNode(bounds); - } - } else if (bounds.low()[splitAxis] > splitLocation) { - // Bounds are on the high side, recurse into the child - // if it exists. - if (child[1] != NULL) { - return child[1]->findDeepestContainingNode(bounds); - } - } - - // There was no containing child, so this node is the - // deepest containing node. - return this; - } - - - /** Appends all members that intersect the box. - If useSphere is true, members that pass the box test - face a second test against the sphere. */ - void getIntersectingMembers( - const AABox& box, - const Sphere& sphere, - Array& members, - bool useSphere) const { - - // Test all values at this node - for (int v = 0; v < boundsArray.size(); ++v) { - const AABox& bounds = boundsArray[v]; - if (bounds.intersects(box) && - (! useSphere || bounds.intersects(sphere))) { - members.append(valueArray[v]->value); - } - } - - // If the left child overlaps the box, recurse into it - if ((child[0] != NULL) && (box.low()[splitAxis] < splitLocation)) { - child[0]->getIntersectingMembers(box, sphere, members, useSphere); - } - - // If the right child overlaps the box, recurse into it - if ((child[1] != NULL) && (box.high()[splitAxis] > splitLocation)) { - child[1]->getIntersectingMembers(box, sphere, members, useSphere); - } - } - - /** - Recurse through the tree, assigning splitBounds fields. - */ - void assignSplitBounds(const AABox& myBounds) { - splitBounds = myBounds; - - AABox childBounds[2]; - myBounds.split(splitAxis, splitLocation, childBounds[0], childBounds[1]); - -# if defined(G3D_DEBUG) && defined(VERIFY_TREE) - // Verify the split - for (int v = 0; v < boundsArray.size(); ++v) { - const AABox& bounds = boundsArray[v]; - debugAssert(myBounds.contains(bounds)); - } -# endif - - for (int c = 0; c < 2; ++c) { - if (child[c]) { - child[c]->assignSplitBounds(childBounds[c]); - } - } - } - - /** Returns true if the ray intersects this node */ - bool intersects(const Ray& ray, float distance) const { - // See if the ray will ever hit this node or its children - Vector3 location; - bool alreadyInsideBounds = false; - bool rayWillHitBounds = - CollisionDetection::collisionLocationForMovingPointFixedAABox( - ray.origin, ray.direction, splitBounds, location, alreadyInsideBounds); - - bool canHitThisNode = (alreadyInsideBounds || - (rayWillHitBounds && ((location - ray.origin).squaredLength() < square(distance)))); - - return canHitThisNode; - } - - template - void intersectRay( - const Ray& ray, - RayCallback& intersectCallback, - float& distance, - bool intersectCallbackIsFast) const { - - if (! intersects(ray, distance)) { - // The ray doesn't hit this node, so it can't hit the children of the node. - return; - } - - // Test for intersection against every object at this node. - for (int v = 0; v < valueArray.size(); ++v) { - bool canHitThisObject = true; - - if (! intersectCallbackIsFast) { - // See if - Vector3 location; - const AABox& bounds = boundsArray[v]; - bool alreadyInsideBounds = false; - bool rayWillHitBounds = - CollisionDetection::collisionLocationForMovingPointFixedAABox( - ray.origin, ray.direction, bounds, location, alreadyInsideBounds); - - canHitThisObject = (alreadyInsideBounds || - (rayWillHitBounds && ((location - ray.origin).squaredLength() < square(distance)))); - } - - if (canHitThisObject) { - // It is possible that this ray hits this object. Look for the intersection using the - // callback. - const T& value = valueArray[v]->value; - intersectCallback(ray, value, distance); - } - } - - // There are three cases to consider next: - // - // 1. the ray can start on one side of the splitting plane and never enter the other, - // 2. the ray can start on one side and enter the other, and - // 3. the ray can travel exactly down the splitting plane - - enum {NONE = -1}; - int firstChild = NONE; - int secondChild = NONE; - - if (ray.origin[splitAxis] < splitLocation) { - - // The ray starts on the small side - firstChild = 0; - - if (ray.direction[splitAxis] > 0) { - // The ray will eventually reach the other side - secondChild = 1; - } - - } else if (ray.origin[splitAxis] > splitLocation) { - - // The ray starts on the large side - firstChild = 1; - - if (ray.direction[splitAxis] < 0) { - secondChild = 0; - } - } else { - // The ray starts on the splitting plane - if (ray.direction[splitAxis] < 0) { - // ...and goes to the small side - firstChild = 0; - } else if (ray.direction[splitAxis] > 0) { - // ...and goes to the large side - firstChild = 1; - } - } - - // Test on the side closer to the ray origin. - if ((firstChild != NONE) && child[firstChild]) { - child[firstChild]->intersectRay(ray, intersectCallback, distance, intersectCallbackIsFast); - } - - if (ray.direction[splitAxis] != 0) { - // See if there was an intersection before hitting the splitting plane. - // If so, there is no need to look on the far side and recursion terminates. - float distanceToSplittingPlane = (splitLocation - ray.origin[splitAxis]) / ray.direction[splitAxis]; - if (distanceToSplittingPlane > distance) { - // We aren't going to hit anything else before hitting the splitting plane, - // so don't bother looking on the far side of the splitting plane at the other - // child. - return; - } - } - - // Test on the side farther from the ray origin. - if ((secondChild != NONE) && child[secondChild]) { - child[secondChild]->intersectRay(ray, intersectCallback, distance, intersectCallbackIsFast); - } - - } - }; - - - /** - Recursively subdivides the subarray. - - Clears the source array as soon as it is no longer needed. - - Call assignSplitBounds() on the root node after making a tree. - */ - Node* makeNode( - Array& source, - int valuesPerNode, - int numMeanSplits, - Array& temp) { - - Node* node = NULL; - - if (source.size() <= valuesPerNode) { - // Make a new leaf node - node = new Node(source); - - // Set the pointers in the memberTable - for (int i = 0; i < source.size(); ++i) { - memberTable.set(Member(source[i]), node); - } - source.clear(); - - } else { - // Make a new internal node - node = new Node(); - - const AABox& bounds = computeBounds(source, 0, source.size() - 1); - const Vector3& extent = bounds.high() - bounds.low(); - - Vector3::Axis splitAxis = extent.primaryAxis(); - - float splitLocation; - - // Arrays for holding the children - Array lt, gt; - - if (numMeanSplits <= 0) { - - source.medianPartition(lt, node->valueArray, gt, temp, CenterComparator(splitAxis)); - - // Choose the split location to be the center of whatever fell in the center - splitLocation = node->valueArray[0]->center[splitAxis]; - - // Some of the elements in the lt or gt array might really overlap the split location. - // Move them as needed. - for (int i = 0; i < lt.size(); ++i) { - const AABox& bounds = lt[i]->bounds; - if ((bounds.low()[splitAxis] <= splitLocation) && (bounds.high()[splitAxis] >= splitLocation)) { - node->valueArray.append(lt[i]); - // Remove this element and process the new one that - // is swapped in in its place. - lt.fastRemove(i); --i; - } - } - - for (int i = 0; i < gt.size(); ++i) { - const AABox& bounds = gt[i]->bounds; - if ((bounds.low()[splitAxis] <= splitLocation) && (bounds.high()[splitAxis] >= splitLocation)) { - node->valueArray.append(gt[i]); - // Remove this element and process the new one that - // is swapped in in its place. - gt.fastRemove(i); --i; - } - } - - if ((node->valueArray.size() > (source.size() / 2)) && - (source.size() > 6)) { - // This was a bad partition; we ended up putting the splitting plane right in the middle of most of the - // objects. We could try to split on a different axis, or use a different partition (e.g., the extents mean, - // or geometric mean). This implementation falls back on the extents mean, since that case is already handled - // below. - numMeanSplits = 1; - } - } - - // Note: numMeanSplits may have been increased by the code in the previous case above in order to - // force a re-partition. - - if (numMeanSplits > 0) { - // Split along the mean - splitLocation = - bounds.high()[splitAxis] * 0.5f + - bounds.low()[splitAxis] * 0.5f; - - debugAssertM(isFinite(splitLocation), - "Internal error: split location must be finite."); - - source.partition(NULL, lt, node->valueArray, gt, Comparator(splitAxis, splitLocation)); - - // The Comparator ensures that elements are strictly on the correct side of the split - } - - -# if defined(G3D_DEBUG) && defined(VERIFY_TREE) - debugAssert(lt.size() + node->valueArray.size() + gt.size() == source.size()); - // Verify that all objects ended up on the correct side of the split. - // (i.e., make sure that the Array partition was correct) - for (int i = 0; i < lt.size(); ++i) { - const AABox& bounds = lt[i]->bounds; - debugAssert(bounds.high()[splitAxis] < splitLocation); - } - - for (int i = 0; i < gt.size(); ++i) { - const AABox& bounds = gt[i]->bounds; - debugAssert(bounds.low()[splitAxis] > splitLocation); - } - - for (int i = 0; i < node->valueArray.size(); ++i) { - const AABox& bounds = node->valueArray[i]->bounds; - debugAssert(bounds.high()[splitAxis] >= splitLocation); - debugAssert(bounds.low()[splitAxis] <= splitLocation); - } -# endif - - // The source array is no longer needed - source.clear(); - - node->splitAxis = splitAxis; - node->splitLocation = splitLocation; - - // Update the bounds array and member table - node->boundsArray.resize(node->valueArray.size()); - for (int i = 0; i < node->valueArray.size(); ++i) { - Handle* v = node->valueArray[i]; - node->boundsArray[i] = v->bounds; - memberTable.set(Member(v), node); - } - - if (lt.size() > 0) { - node->child[0] = makeNode(lt, valuesPerNode, numMeanSplits - 1, temp); - } - - if (gt.size() > 0) { - node->child[1] = makeNode(gt, valuesPerNode, numMeanSplits - 1, temp); - } - - } - - return node; - } - - /** - Recursively clone the passed in node tree, setting - pointers for members in the memberTable as appropriate. - called by the assignment operator. - */ - Node* cloneTree(Node* src) { - Node* dst = new Node(*src); - - // Make back pointers - for (int i = 0; i < dst->valueArray.size(); ++i) { - memberTable.set(Member(dst->valueArray[i]), dst); - } - - // Clone children - for (int i = 0; i < 2; ++i) { - if (src->child[i] != NULL) { - dst->child[i] = cloneTree(src->child[i]); - } - } - - return dst; - } - - /** - Wrapper for a Handle; used to create a memberTable that acts like Table but - stores only Handle* internally to avoid memory copies. - */ - typedef _internal::Indirector Member; - - typedef Table MemberTable; - - /** Maps members to the node containing them */ - MemberTable memberTable; - - Node* root; - -public: - - /** To construct a balanced tree, insert the elements and then call - KDTree::balance(). */ - KDTree() : root(NULL) {} - - - KDTree(const KDTree& src) : root(NULL) { - *this = src; - } - - - KDTree& operator=(const KDTree& src) { - delete root; - // Clone tree takes care of filling out the memberTable. - root = cloneTree(src.root); - return *this; - } - - - ~KDTree() { - clear(); - } - - /** - Throws out all elements of the set. - */ - void clear() { - typedef typename Table<_internal::Indirector, Node*>::Iterator It; - - // Delete all handles stored in the member table - It cur = memberTable.begin(); - It end = memberTable.end(); - while (cur != end) { - delete cur->key.handle; - cur->key.handle = NULL; - ++cur; - } - memberTable.clear(); - - // Delete the tree structure itself - delete root; - root = NULL; - } - - int size() const { - return memberTable.size(); - } - - /** - Inserts an object into the set if it is not - already present. O(log n) time. Does not - cause the tree to be balanced. - */ - void insert(const T& value) { - if (contains(value)) { - // Already in the set - return; - } - - Handle* h = new Handle(value); - - if (root == NULL) { - // This is the first node; create a root node - root = new Node(); - } - - Node* node = root->findDeepestContainingNode(h->bounds); - - // Insert into the node - node->valueArray.append(h); - node->boundsArray.append(h->bounds); - - // Insert into the node table - Member m(h); - memberTable.set(m, node); - } - - /** Inserts each elements in the array in turn. If the tree - begins empty (no structure and no elements), this is faster - than inserting each element in turn. You still need to balance - the tree at the end.*/ - void insert(const Array& valueArray) { - if (root == NULL) { - // Optimized case for an empty tree; don't bother - // searching or reallocating the root node's valueArray - // as we incrementally insert. - root = new Node(); - root->valueArray.resize(valueArray.size()); - root->boundsArray.resize(root->valueArray.size()); - for (int i = 0; i < valueArray.size(); ++i) { - // Insert in opposite order so that we have the exact same - // data structure as if we inserted each (i.e., order is reversed - // from array). - Handle* h = new Handle(valueArray[i]); - int j = valueArray.size() - i - 1; - root->valueArray[j] = h; - root->boundsArray[j] = h->bounds; - memberTable.set(Member(h), root); - } - - } else { - // Insert at appropriate tree depth. - for (int i = 0; i < valueArray.size(); ++i) { - insert(valueArray[i]); - } - } - } - - - /** - Returns true if this object is in the set, otherwise - returns false. O(1) time. - */ - bool contains(const T& value) { - // Temporarily create a handle and member - Handle h(value); - return memberTable.containsKey(Member(&h)); - } - - - /** - Removes an object from the set in O(1) time. - It is an error to remove members that are not already - present. May unbalance the tree. - - Removing an element never causes a node (split plane) to be removed... - nodes are only changed when the tree is rebalanced. This behavior - is desirable because it allows the split planes to be serialized, - and then deserialized into an empty tree which can be repopulated. - */ - void remove(const T& value) { - debugAssertM(contains(value), - "Tried to remove an element from a " - "KDTree that was not present"); - - // Get the list of elements at the node - Handle h(value); - Member m(&h); - - Array& list = memberTable[m]->valueArray; - - Handle* ptr = NULL; - - // Find the element and remove it - for (int i = list.length() - 1; i >= 0; --i) { - if (list[i]->value == value) { - // This was the element. Grab the pointer so that - // we can delete it below - ptr = list[i]; - - // Remove the handle from the node - list.fastRemove(i); - - // Remove the corresponding bounds - memberTable[m]->boundsArray.fastRemove(i); - break; - } - } - - // Remove the member - memberTable.remove(m); - - // Delete the handle data structure - delete ptr; - ptr = NULL; - } - - - /** - If the element is in the set, it is removed. - The element is then inserted. - - This is useful when the == and hashCode methods - on T are independent of the bounds. In - that case, you may call update(v) to insert an - element for the first time and call update(v) - again every time it moves to keep the tree - up to date. - */ - void update(const T& value) { - if (contains(value)) { - remove(value); - } - insert(value); - } - - - /** - Rebalances the tree (slow). Call when objects - have moved substantially from their original positions - (which unbalances the tree and causes the spatial - queries to be slow). - - @param valuesPerNode Maximum number of elements to put at - a node. - - @param numMeanSplits numMeanSplits = 0 gives a - fully axis aligned BSP-tree, where the balance operation attempts to balance - the tree so that every splitting plane has an equal number of left - and right children (i.e. it is a median split along that axis). - This tends to maximize average performance. - - You can override this behavior by - setting a number of mean (average) splits. numMeanSplits = MAX_INT - creates a full oct-tree, which tends to optimize peak performance at the expense of - average performance. It tends to have better clustering behavior when - members are not uniformly distributed. - */ - void balance(int valuesPerNode = 5, int numMeanSplits = 3) { - if (root == NULL) { - // Tree is empty - return; - } - - // Get all handles and delete the old tree structure - Node* oldRoot = root; - for (int c = 0; c < 2; ++c) { - if (root->child[c] != NULL) { - root->child[c]->getHandles(root->valueArray); - - // Delete the child; this will delete all structure below it - delete root->child[c]; - root->child[c] = NULL; - } - } - - Array temp; - // Make a new root. Work with a copy of the value array because - // makeNode clears the source array as it progresses - Array copy(oldRoot->valueArray); - root = makeNode(copy, valuesPerNode, numMeanSplits, temp); - - // Throw away the old root node - delete oldRoot; - oldRoot = NULL; - - // Walk the tree, assigning splitBounds. We start with unbounded - // space. This will override the current member table. - const AABox& LARGE = AABox::large(); - root->assignSplitBounds(LARGE); - -# ifdef _DEBUG - { - // Ensure that the balanced tree is still correct - root->verifyNode(LARGE.low(), LARGE.high()); - } -# endif - } - -protected: - - /** - @param parentMask The mask that this node returned from culledBy. - */ - static void getIntersectingMembers( - const Array& plane, - Array& members, - Node* node, - uint32 parentMask) { - - int dummy; - - if (parentMask == 0) { - // None of these planes can cull anything - for (int v = node->valueArray.size() - 1; v >= 0; --v) { - members.append(node->valueArray[v]->value); - } - - // Iterate through child nodes - for (int c = 0; c < 2; ++c) { - if (node->child[c]) { - getIntersectingMembers(plane, members, node->child[c], 0); - } - } - } else { - - // Test values at this node against remaining planes - for (int v = node->boundsArray.size() - 1; v >= 0; --v) { - if (! node->boundsArray[v].culledBy(plane, dummy, parentMask)) { - members.append(node->valueArray[v]->value); - } - } - - uint32 childMask = 0xFFFFFF; - - // Iterate through child nodes - for (int c = 0; c < 2; ++c) { - if (node->child[c] && - ! node->child[c]->splitBounds.culledBy(plane, dummy, parentMask, childMask)) { - // This node was not culled - getIntersectingMembers(plane, members, node->child[c], childMask); - } - } - } - } - -public: - - /** - Returns all members inside the set of planes. - @param members The results are appended to this array. - */ - void getIntersectingMembers(const Array& plane, Array& members) const { - if (root == NULL) { - return; - } - - getIntersectingMembers(plane, members, root, 0xFFFFFF); - } - - /** - Typically used to find all visible - objects inside the view frustum (see also GCamera::getClipPlanes)... i.e. all objects - not culled by frustum. - - Example: - 
-        Array  visible;
-        tree.getIntersectingMembers(camera.frustum(), visible);
-        // ... Draw all objects in the visible array.
-
- @param members The results are appended to this array. - */ - void getIntersectingMembers(const GCamera::Frustum& frustum, Array& members) const { - Array plane; - - for (int i = 0; i < frustum.faceArray.size(); ++i) { - plane.append(frustum.faceArray[i].plane); - } - - getIntersectingMembers(plane, members); - } - - /** - C++ STL style iterator variable. See beginBoxIntersection(). - The iterator overloads the -> (dereference) operator, so this - acts like a pointer to the current member. - */ - // This iterator turns Node::getIntersectingMembers into a - // coroutine. It first translates that method from recursive to - // stack based, then captures the system state (analogous to a Scheme - // continuation) after each element is appended to the member array, - // and allowing the computation to be restarted. - class BoxIntersectionIterator { - private: - friend class TreeType; - - /** True if this is the "end" iterator instance */ - bool isEnd; - - /** The box that we're testing against. */ - AABox box; - - /** Node that we're currently looking at. Undefined if isEnd - is true. */ - Node* node; - - /** Nodes waiting to be processed */ - // We could use backpointers within the tree and careful - // state management to avoid ever storing the stack-- but - // it is much easier this way and only inefficient if the - // caller uses post increment (which they shouldn't!). - Array stack; - - /** The next index of current->valueArray to return. - Undefined when isEnd is true.*/ - int nextValueArrayIndex; - - BoxIntersectionIterator() : isEnd(true) {} - - BoxIntersectionIterator(const AABox& b, const Node* root) : - isEnd(root == NULL), box(b), - node(const_cast(root)), nextValueArrayIndex(-1) { - - // We intentionally start at the "-1" index of the current - // node so we can use the preincrement operator to move - // ourselves to element 0 instead of repeating all of the - // code from the preincrement method. Note that this might - // cause us to become the "end" instance. - ++(*this); - } - - public: - - inline bool operator!=(const BoxIntersectionIterator& other) const { - return ! (*this == other); - } - - bool operator==(const BoxIntersectionIterator& other) const { - if (isEnd) { - return other.isEnd; - } else if (other.isEnd) { - return false; - } else { - // Two non-end iterators; see if they match. This is kind of - // silly; users shouldn't call == on iterators in general unless - // one of them is the end iterator. - if ((box != other.box) || (node != other.node) || - (nextValueArrayIndex != other.nextValueArrayIndex) || - (stack.length() != other.stack.length())) { - return false; - } - - // See if the stacks are the same - for (int i = 0; i < stack.length(); ++i) { - if (stack[i] != other.stack[i]) { - return false; - } - } - - // We failed to find a difference; they must be the same - return true; - } - } - - /** - Pre increment. - */ - BoxIntersectionIterator& operator++() { - ++nextValueArrayIndex; - - bool foundIntersection = false; - while (! isEnd && ! foundIntersection) { - - // Search for the next node if we've exhausted this one - while ((! isEnd) && (nextValueArrayIndex >= node->valueArray.length())) { - // If we entered this loop, then the iterator has exhausted the elements at - // node (possibly because it just switched to a child node with no members). - // This loop continues until it finds a node with members or reaches - // the end of the whole intersection search. - - // If the right child overlaps the box, push it onto the stack for - // processing. - if ((node->child[1] != NULL) && - (box.high()[node->splitAxis] > node->splitLocation)) { - stack.push(node->child[1]); - } - - // If the left child overlaps the box, push it onto the stack for - // processing. - if ((node->child[0] != NULL) && - (box.low()[node->splitAxis] < node->splitLocation)) { - stack.push(node->child[0]); - } - - if (stack.length() > 0) { - // Go on to the next node (which may be either one of the ones we - // just pushed, or one from farther back the tree). - node = stack.pop(); - nextValueArrayIndex = 0; - } else { - // That was the last node; we're done iterating - isEnd = true; - } - } - - // Search for the next intersection at this node until we run out of children - while (! isEnd && ! foundIntersection && (nextValueArrayIndex < node->valueArray.length())) { - if (box.intersects(node->boundsArray[nextValueArrayIndex])) { - foundIntersection = true; - } else { - ++nextValueArrayIndex; - // If we exhaust this node, we'll loop around the master loop - // to find a new node. - } - } - } - - return *this; - } - - private: - /** - Post increment (much slower than preincrement!). Intentionally overloaded to preclude accidentally slow code. - */ - BoxIntersectionIterator operator++(int); - /*{ - BoxIntersectionIterator old = *this; - ++this; - return old; - }*/ - - public: - - /** Overloaded dereference operator so the iterator can masquerade as a pointer - to a member */ - const T& operator*() const { - alwaysAssertM(! isEnd, "Can't dereference the end element of an iterator"); - return node->valueArray[nextValueArrayIndex]->value; - } - - /** Overloaded dereference operator so the iterator can masquerade as a pointer - to a member */ - T const * operator->() const { - alwaysAssertM(! isEnd, "Can't dereference the end element of an iterator"); - return &(stack.last()->valueArray[nextValueArrayIndex]->value); - } - - /** Overloaded cast operator so the iterator can masquerade as a pointer - to a member */ - operator T*() const { - alwaysAssertM(! isEnd, "Can't dereference the end element of an iterator"); - return &(stack.last()->valueArray[nextValueArrayIndex]->value); - } - }; - - - /** - Iterates through the members that intersect the box - */ - BoxIntersectionIterator beginBoxIntersection(const AABox& box) const { - return BoxIntersectionIterator(box, root); - } - - BoxIntersectionIterator endBoxIntersection() const { - // The "end" iterator instance - return BoxIntersectionIterator(); - } - - /** - Appends all members whose bounds intersect the box. - See also KDTree::beginBoxIntersection. - */ - void getIntersectingMembers(const AABox& box, Array& members) const { - if (root == NULL) { - return; - } - root->getIntersectingMembers(box, Sphere(Vector3::zero(), 0), members, false); - } - - - /** - Invoke a callback for every member along a ray until the closest intersection is found. - - @param callback either a function or an instance of a class with an overloaded operator() of the form: - - void callback(const Ray& ray, const T& object, float& distance). If the ray hits the object - before travelling distance distance, updates distance with the new distance to - the intersection, otherwise leaves it unmodified. A common example is: - - 
-            class Entity {
-            public:
-
-                void intersect(const Ray& ray, float& maxDist, Vector3& outLocation, Vector3& outNormal) {
-                    float d = maxDist;
-
-                    // ... search for intersection distance d
-
-                    if ((d > 0) && (d < maxDist)) {
-                        // Intersection occured
-                        maxDist = d;
-                        outLocation = ...;
-                        outNormal = ...;
-                    }
-                }
-            };
-
-            // Finds the surface normal and location of the first intersection with the scene
-            class Intersection {
-            public:
-                Entity*     closestEntity;
-                Vector3     hitLocation;
-                Vector3     hitNormal;
-
-                void operator()(const Ray& ray, const Entity* entity, float& distance) {
-                    entity->intersect(ray, distance, hitLocation, hitNormal);
-                }
-            };
-
-            KDTree scene;
-
-            Intersection intersection;
-            float distance = inf();
-            scene.intersectRay(camera.worldRay(x, y), intersection, distance);
-
- - - @param distance When the method is invoked, this is the maximum distance that the tree should search for an intersection. - On return, this is set to the distance to the first intersection encountered. - - @param intersectCallbackIsFast If false, each object's bounds are tested before the intersectCallback is invoked. - If the intersect callback runs at the same speed or faster than AABox-ray intersection, set this to true. - */ - template - void intersectRay( - const Ray& ray, - RayCallback& intersectCallback, - float& distance, - bool intersectCallbackIsFast = false) const { - - root->intersectRay(ray, intersectCallback, distance, intersectCallbackIsFast); - - } - - - /** - @brief Finds all members whose bounding boxes intersect the sphere. The actual - elements may not intersect the sphere. - - @param members The results are appended to this array. - */ - void getIntersectingMembers(const Sphere& sphere, Array& members) const { - if (root == NULL) { - return; - } - - AABox box; - sphere.getBounds(box); - root->getIntersectingMembers(box, sphere, members, true); - - } - - /** - Stores the locations of the splitting planes (the structure but not the content) - so that the tree can be quickly rebuilt from a previous configuration without - calling balance. - */ - void serializeStructure(BinaryOutput& bo) const { - Node::serializeStructure(root, bo); - } - - /** Clears the member table */ - void deserializeStructure(BinaryInput& bi) { - clear(); - root = Node::deserializeStructure(bi); - } - - /** - Returns an array of all members of the set. See also KDTree::begin. - */ - void getMembers(Array& members) const { - Array temp; - memberTable.getKeys(temp); - for (int i = 0; i < temp.size(); ++i) { - members.append(*(temp.handle)); - } - } - - - /** - C++ STL style iterator variable. See begin(). - Overloads the -> (dereference) operator, so this acts like a pointer - to the current member. - */ - class Iterator { - private: - friend class TreeType; - - // Note: this is a Table iterator, we are currently defining - // Set iterator - typename Table::Iterator it; - - Iterator(const typename Table::Iterator& it) : it(it) {} - - public: - - inline bool operator!=(const Iterator& other) const { - return !(*this == other); - } - - bool operator==(const Iterator& other) const { - return it == other.it; - } - - /** - Pre increment. - */ - Iterator& operator++() { - ++it; - return *this; - } - - private: - /** - Post increment (slower than preincrement). Intentionally unimplemented to prevent slow code. - */ - Iterator operator++(int);/* { - Iterator old = *this; - ++(*this); - return old; - }*/ - public: - - const T& operator*() const { - return it->key.handle->value; - } - - T* operator->() const { - return &(it->key.handle->value); - } - - operator T*() const { - return &(it->key.handle->value); - } - }; - - - /** - C++ STL style iterator method. Returns the first member. - Use preincrement (++entry) to get to the next element (iteration - order is arbitrary). - Do not modify the set while iterating. - */ - Iterator begin() const { - return Iterator(memberTable.begin()); - } - - - /** - C++ STL style iterator method. Returns one after the last iterator - element. - */ - Iterator end() const { - return Iterator(memberTable.end()); - } -#undef TreeType -}; - -/** @deprecated For backwards compatibility */ -#define AABSPTree KDTree - -} - -#endif diff --git a/externals/g3dlite/G3D.lib/include/G3D/AABox.h b/externals/g3dlite/G3D.lib/include/G3D/AABox.h deleted file mode 100644 index 76c5d6d5195..00000000000 --- a/externals/g3dlite/G3D.lib/include/G3D/AABox.h +++ /dev/null @@ -1,281 +0,0 @@ -/** - @file AABox.h - - Axis-aligned box class - - @maintainer Morgan McGuire, matrix@graphics3d.com - - @created 2004-01-10 - @edited 2006-02-10 - - Copyright 2000-2006, Morgan McGuire. - All rights reserved. - */ - -#ifndef G3D_AABOX_H -#define G3D_AABOX_H - -#include "G3D/platform.h" -#include "G3D/Vector3.h" -#include "G3D/debug.h" -#include "G3D/Array.h" -#include "G3D/Plane.h" - -namespace G3D { - -/** - An axis-aligned box. - */ -class AABox { -private: - - /** Optional argument placeholder */ - static int dummy; - - Vector3 lo; - Vector3 hi; - -public: - - /** Does not initialize the fields */ - inline AABox() {} - - /** - Constructs a zero-area AABox at v. - */ - inline explicit AABox(const Vector3& v) { - lo = hi = v; - } - - /** Assumes that low is less than or equal to high along each dimension. - To have this automatically enforced, use - AABox(low.min(high), low.max(high)); - */ - inline AABox(const Vector3& low, const Vector3& high) { - set(low, high); - } - - /** Assumes that low is less than or equal to high along each dimension. - */ - inline void set(const Vector3& low, const Vector3& high) { - debugAssert( - (low.x <= high.x) && - (low.y <= high.y) && - (low.z <= high.z)); - lo = low; - hi = high; - } - - /** - Grows to include the bounds of a - */ - inline void merge(const AABox& a) { - lo = lo.min(a.lo); - hi = hi.max(a.hi); - } - - inline void merge(const Vector3& a) { - lo = lo.min(a); - hi = hi.max(a); - } - - void serialize(class BinaryOutput& b) const; - - void deserialize(class BinaryInput& b); - - inline const Vector3& low() const { - return lo; - } - - inline const Vector3& high() const { - return hi; - } - - /** - The largest possible finite box. - */ - static inline const AABox& maxFinite() { - static const AABox b = AABox(Vector3::minFinite(), - Vector3::maxFinite()); - return b; - } - - /** A large finite box. This is smaller than FLT_MAX - because it leaves room to add boxes together. */ - static inline const AABox& large() { - static const AABox b = AABox(Vector3::minFinite() * 0.5f, - Vector3::maxFinite() * 0.5f); - return b; - } - - static inline const AABox& inf() { - static const AABox b = AABox(-Vector3::inf(), Vector3::inf()); - return b; - } - - static inline const AABox& zero() { - static const AABox b = AABox(Vector3::zero(), Vector3::zero()); - return b; - } - - /** - Returns the centroid of the box. - */ - inline Vector3 center() const { - return (lo + hi) * 0.5; - } - - Vector3 corner(int index) const; - - /** - Distance from corner(0) to the next corner along axis a. - */ - inline float extent(int a) const { - debugAssert(a < 3); - return hi[a] - lo[a]; - } - - - inline Vector3 extent() const { - return hi - lo; - } - - - /** - Splits the box into two AABoxes along the specified axis. low contains - the part that was closer to negative infinity along axis, high contains - the other part. Either may have zero volume. - */ - void split(const Vector3::Axis& axis, float location, AABox& low, AABox& high) const; - - /** - Conservative culling test for up to 32 planes. - Returns true if there exists a plane[p] for - which the entire object is in the negative half space - (opposite the plane normal). - - testMask and childMask - are used for optimizing bounding volume hierarchies. - The version of this method that produces childMask - is slower than the version without; it should only - be used for parent nodes. - - @param cullingPlaneIndex The index of the first plane for which - the entire object is in the negative half-space. The function - exits early when one plane is found. -1 when the function - returns false (i.e. when no plane culls the whole object). - - @param testMask If bit p is 0, the - bounding volume automatically passes the culling test for - plane[p] (i.e. it is known that the volume - is entirely within the positive half space). The function - must return false if testMask is 0 and test all planes - when testMask is -1 (0xFFFFFFFF). - - @param childMask Test mask for the children of this volume. - - */ - bool culledBy( - const Array& plane, - int32& cullingPlaneIndex, - const uint32 testMask, - uint32& childMask) const; - - /** - Conservative culling test that does not produce a mask for children. - */ - bool culledBy( - const Array& plane, - int32& cullingPlaneIndex = dummy, - const uint32 testMask = 0xFFFFFFFF) const; - - /** less than or equal to containment */ - inline bool contains(const AABox& other) const { - return - (other.hi.x <= hi.x) && - (other.hi.y <= hi.y) && - (other.hi.z <= hi.z) && - (other.lo.x >= lo.x) && - (other.lo.y >= lo.y) && - (other.lo.z >= lo.z); - } - - inline bool contains( - const Vector3& point) const { - return - (point.x >= lo.x) && - (point.y >= lo.y) && - (point.z >= lo.z) && - (point.x <= hi.x) && - (point.y <= hi.y) && - (point.z <= hi.z); - } - - inline float area() const { - Vector3 diag = hi - lo; - return 2.0f * (diag.x * diag.y + diag.y * diag.z + diag.x * diag.z); - } - - inline float volume() const { - Vector3 diag = hi - lo; - return diag.x * diag.y * diag.z; - } - - Vector3 randomInteriorPoint() const; - - Vector3 randomSurfacePoint() const; - - /** Returns true if there is any overlap */ - bool intersects(const AABox& other) const; - - /** Returns true if there is any overlap. - @cite Jim Arvo's algorithm from Graphics Gems II*/ - bool intersects(const class Sphere& other) const; - - /** Return the intersection of the two boxes */ - AABox intersect(const AABox& other) const { - Vector3 H = hi.min(other.hi); - Vector3 L = lo.max(other.lo).min(H); - return AABox(L, H); - } - - inline size_t hashCode() const { - return lo.hashCode() + hi.hashCode(); - } - - inline bool operator==(const AABox& b) const { - return (lo == b.lo) && (hi == b.hi); - } - - inline bool operator!=(const AABox& b) const { - return !((lo == b.lo) && (hi == b.hi)); - } - - inline AABox operator+(const Vector3& v) const { - AABox out; - out.lo = lo + v; - out.hi = hi + v; - return out; - } - - inline AABox operator-(const Vector3& v) const { - AABox out; - out.lo = lo - v; - out.hi = hi - v; - return out; - } - - void getBounds(AABox& out) const { - out = *this; - } -}; - -} - -template <> struct HashTrait { - static size_t hashCode(const G3D::AABox& key) { return key.hashCode(); } -}; - - - -#endif diff --git a/externals/g3dlite/G3D.lib/include/G3D/AnyVal.h b/externals/g3dlite/G3D.lib/include/G3D/AnyVal.h deleted file mode 100644 index 8254dd73c93..00000000000 --- a/externals/g3dlite/G3D.lib/include/G3D/AnyVal.h +++ /dev/null @@ -1,506 +0,0 @@ -/** - @file AnyVal.h - @author Morgan McGuire - @created 2006-06-11 - @edited 2008-07-14 - */ - -#ifndef G3D_ANYVAL_H -#define G3D_ANYVAL_H - -#include "G3D/platform.h" -#include -#include "G3D/Array.h" -#include "G3D/TextInput.h" - -namespace G3D { -// Forward declarations for G3D types -class Vector2; -class Vector3; -class Vector4; -class Color1; -class Color3; -class Color4; -class Quat; -class Matrix2; -class Matrix3; -class Matrix4; -class CoordinateFrame; -class TextInput; -class TextOutput; -class BinaryInput; -class BinaryOutput; -class Rect2D; -class AABox; - -/** - A generic value, useful for defining property trees that can - be loaded from and saved to disk. The values are intentionally - restricted to a small set. - - When written to files, the syntax is as follows. Note that you can - nest arrays and tables in order to create full tree (i.e., XML-like) - structures as configuration files: - - - - - - - - - - - - - - - - - - - - - - - -
NULLNil
doubleThe number in printf double format
booltrue or false
std::stringThe string in double-quotes (")
Rect2DR(x0,y0,x1,y1)
Color1C1(value)
Color3C3(r,g,b)
Color4C4(r,g,b,a)
Vector2V2(x,y)
Vector3V3(x,y,z)
Vector4V4(x,y,z,w)
QuatV(x,y,z,w)
AABoxAAB(low Vector3, high Vector3)
Matrix2M2(r0c0, r0c1, -
   r1c0, r1c1)
Matrix3M3(r0c0, r0c1, r0c2, -
   r1c0, r1c1, r1c2, -
   r2c0, r2c1, r2c2)
Matrix4M4(r0c0, r0c1, r0c2, r0c3, -
   r1c0, r1c1, r1c2, r1c3, -
   r2c0, r2c1, r2c2, r2c3, -
   r3c0, r3c1, r3c2, r3c3)
CoordinateFrameCF(r0c0, r0c1, r0c2, r0c3, -
   r1c0, r1c1, r1c2, r1c3, -
   r2c0, r2c1, r2c2, r2c3)
CoordinateFrameCF(V3(x, y, z), yaw deg, pitch deg, optional roll deg)
Array[element0, element1, ... , elementn-1]
Table{symbol0 = value0 -
 symbol1 = value1 -
 ... -
 symboln-1 = valuen-1}
- - See also boost::any for a more general purpose but slightly harder to use - "any" for C++. - - The semantics of operator[] and the get() methods are slightly different; - operator[] acts more like a scripting language that automatically extends - arrays and tables instead of generating errors. get() has more strict semantics, - like a C++ class. - - AnyVal uses copy-on-mutate, so that AnyVal a = b semantically copies b (like int a = b would), although in practice - it delays the copy until one is mutated so that it is still fast to "copy" large arrays and tables. - - Reading example: - 
-    AnyVal property = AnyVal::fromFile("c:/tmp/test.txt"));
-
-    Vector3 vel = property["angular velocity"]
-
-    Using defaults to handle errors:
-       If there was no "enabled" value, this will return the default instead of failing
-    bool enabled = property["enabled"].boolean(true);
-
-
- - Writing to a file: - 
-    AnyVal dict(AnyVal::TABLE);
-
-    dict["enabled"] = AnyVal(true);
-    dict["weight"] = 100;
-    dict["angular velocity"] = Vector3(1, -3, 4.5);
-
-    TextOutput t("c:/tmp/test.txt");
-    dict.serialize(t);
-    t.commit();
-
- - Example of a data file: - 
-   {
-      heights = [1, 17, 32]
-      model = 
-        {
-           color = C3(1, 1, 1)
-           filename = "foo.md2"
-        }
-      position = V3(23, 14, 0)
-      name = "Elmer"
-   }
-
- -

- What's the difference from boost::any? -
I think that AnyVal will be easier for novice C++ users. It addresses the problem that - even though G3D::TextInput makes reading configuration files extremely simple, many people - still don't use it. So AnyVal makes it ridiculously simple to read and write a tree of G3D - types to a file. - - AnyVal: -

-{
-AnyVal tree(TextInput("config.txt"));
-
-bool enabled = tree.get("enabled", false);
-Vector3 direction = tree.get("direction", Vector3::zero());
-...
-}
-
- -boost: -
-{
-bool enabled = false;
-Vector3 direction;
-Table tree;
-
- ...write lots of file parsing code...
-
-   if (tree.containsKey("enabled")) {
-      const boost::any& val = tree["enabled"];
-      try {
-        enabled = any_cast(val);
-      } catch(const boost::bad_any_cast &) {
-      }
-    }
-
-   if (tree.containsKey("direction")) {
-      const boost::any& val = tree["direction"];
-      try {
-        direction = any_cast(val);
-      } catch(const boost::bad_any_cast &) {
-      }
-    }
-   ...
-}
-
- */ -class AnyVal { -public: - - /** Array and table values are all Any.*/ - enum Type { - NIL, - NUMBER, - BOOLEAN, - STRING, - VECTOR2, - VECTOR3, - VECTOR4, - MATRIX2, - MATRIX3, - MATRIX4, - QUAT, - COORDINATEFRAME, - COORDINATEFRAME2D, - CFRAME = COORDINATEFRAME, - CFRAME2D = COORDINATEFRAME2D, - COLOR1, - COLOR3, - COLOR4, - RECT2D, - AABOX2D = RECT2D, - AABOX, - ARRAY, - TABLE}; - - /** Base class for all AnyVal exceptions.*/ - class Exception { - public: - virtual ~Exception() {} - }; - - /** Thrown when an inappropriate operation is performed (e.g., operator[] on a number) */ - class WrongType : public Exception { - public: - Type expected; - Type actual; - WrongType() : expected(NIL), actual(NIL) {} - WrongType(Type e, Type a) : expected(e), actual(a) {} - }; - - /** Thrown by operator[] when a key is not present. */ - class KeyNotFound : public Exception { - public: - std::string key; - KeyNotFound() {} - KeyNotFound(const std::string& k) : key(k) {} - }; - - class IndexOutOfBounds : public Exception { - public: - int index; - int size; - IndexOutOfBounds() : index(0), size(0) {} - IndexOutOfBounds(int i, int s) : index(i), size(s) {} - }; - - /** Thrown when deserialize() when the input is incorrectly formatted. */ - class CorruptText : public Exception { - public: - std::string message; - - /** Token where the problem occurred.*/ - G3D::Token token; - - CorruptText() {} - CorruptText(const std::string& s, const G3D::Token& t) : message(s), token(t) {} - }; - -private: - - Type m_type; - void* m_value; - - /** For table and array types, *m_value is shared between multiple - instances. Mutation is allowed only if the reference count is - exactly 1, otherwise the mutating instance must copy the - value. This is not used for other types. - */ - int* m_referenceCount; - - /** Decrements the reference count (if there is one). If the - reference count is zero or does not exist. Calls delete on @a - m_value and sets it to NULL. - */ - void deleteValue(); - - /** Returns a copy of the value. */ - void* copyValue() const; - - /** Assumes isSharedType. Ensures that this has a unique reference */ - void makeMutable(); - - /** True if this is a shared value between multiple instances. */ - inline bool isShared() const { - return m_referenceCount && (*m_referenceCount > 1); - } - - /** True when m_value is a double pointer */ - inline bool isSharedType() const { - return (m_type == TABLE) || (m_type == ARRAY); - } - -public: - - AnyVal(); - - /** Deserialize */ - explicit AnyVal(G3D::TextInput& t); - - static AnyVal fromFile(const std::string& filename); - - void load(const std::string& filename); - - void save(const std::string& filename) const; - - ///** Deserialize */ - //explicit AnyVal(G3D::BinaryInput& t); - - /** Construct a number */ - AnyVal(double); - AnyVal(int); - - // Explicit to avoid ambiguity with the 'double' constructor - // when an integer type is constructed - AnyVal(bool); - AnyVal(const G3D::Vector2&); - AnyVal(const G3D::Vector3&); - AnyVal(const G3D::Vector4&); - - AnyVal(const G3D::Color1&); - AnyVal(const G3D::Color3&); - AnyVal(const G3D::Color4&); - - AnyVal(const std::string&); - AnyVal(const char*); - - AnyVal(const G3D::Quat&); - - AnyVal(const G3D::Rect2D&); - AnyVal(const G3D::AABox&); - - AnyVal(const G3D::CoordinateFrame&); - AnyVal(const G3D::Matrix2&); - AnyVal(const G3D::Matrix3&); - AnyVal(const G3D::Matrix4&); - - AnyVal(const AnyVal&); - - AnyVal(Type arrayOrTable); - - AnyVal& operator=(const AnyVal&); - - /** Frees the underlying storage */ - ~AnyVal(); - - Type type() const; - - bool isNil() const { - return type() == NIL; - } - - void serialize(G3D::TextOutput& t) const; - //void serialize(G3D::BinaryOutput& t) const; - void deserialize(G3D::TextInput& t); - //void deserialize(G3D::BinaryInput& t); - - /** Array dereference. If the index is out of bounds, IndexOutOfBounds is thrown */ - const AnyVal& operator[](int) const; - - /** Extend this array by one element. */ - void append(const AnyVal&); - - /** If the index is out of bounds, the array is resized. If the index is negative, - IndexOutOfBounds is thrown.*/ - AnyVal& operator[](int); - - /** If @a i is out of bounds or this is not an ARRAY, defaultVal is returned.*/ - const AnyVal& get(int i, const AnyVal& defaultVal) const; - - /** If out of bounds, IndexOutOfBounds is thrown. */ - const AnyVal& get(int i) const; - - /** Returns defaultVal if this is not a TABLE or the key is not found. */ - const AnyVal& get(const std::string& key, const AnyVal& defaultVal) const; - - /** Throws KeyNotFound exception if the key is not present.*/ - const AnyVal& get(const std::string& key) const; - - /** Table reference */ - const AnyVal& operator[](const std::string&) const; - - /** Table reference. If the element does not exist, it is created. */ - AnyVal& operator[](const std::string&); - - /** Table reference */ - const AnyVal& operator[](const char*) const; - - /** Table reference. If the element does not exist, it is created. */ - AnyVal& operator[](const char*); - - /** If this value is not a number throws a WrongType exception. */ - double number() const; - - /** If this value is not a number, returns defaultVal. */ - double number(double defaultVal) const; - - operator double () const { - return number(); - } - - operator float () const { - return (float)number(); - } - - bool boolean() const; - bool boolean(bool b) const; - - operator bool() const { - return boolean(); - } - - const std::string& string() const; - const std::string& string(const std::string& defaultVal) const; - - operator const std::string& () const { - return string(); - } - - const G3D::Rect2D& rect2D() const; - const G3D::Rect2D& rect2D(const G3D::Rect2D& defaultVal) const; - - operator const Rect2D& () const { - return rect2D(); - } - - const G3D::AABox& aabox() const; - const G3D::AABox& aabox(const G3D::AABox& defaultVal) const; - - operator const AABox& () const { - return aabox(); - } - - const G3D::Vector2& vector2() const; - const G3D::Vector2& vector2(const G3D::Vector2& defaultVal) const; - - operator const Vector2& () const { - return vector2(); - } - - const G3D::Vector3& vector3() const; - const G3D::Vector3& vector3(const G3D::Vector3& defaultVal) const; - - operator const Vector3& () { - return vector3(); - } - - const G3D::Vector4& vector4() const; - const G3D::Vector4& vector4(const G3D::Vector4& defaultVal) const; - - operator const Vector4& () const { - return vector4(); - } - - const G3D::Color1& color1() const; - const G3D::Color1& color1(const G3D::Color1& defaultVal) const; - - const G3D::Color3& color3() const; - const G3D::Color3& color3(const G3D::Color3& defaultVal) const; - - operator const Color3& () const { - return color3(); - } - - const G3D::Color4& color4() const; - const G3D::Color4& color4(const G3D::Color4& defaultVal) const; - - operator const Color4& () const { - return color4(); - } - - const G3D::CoordinateFrame& coordinateFrame() const; - const G3D::CoordinateFrame& coordinateFrame(const G3D::CoordinateFrame& defaultVal) const; - - operator const CoordinateFrame& () const { - return coordinateFrame(); - } - - const G3D::Matrix2& matrix2() const; - const G3D::Matrix2& matrix2(const G3D::Matrix2& defaultVal) const; - - operator const Matrix2& () const { - return matrix2(); - } - - const G3D::Matrix3& matrix3() const; - const G3D::Matrix3& matrix3(const G3D::Matrix3& defaultVal) const; - - operator const Matrix3& () const { - return matrix3(); - } - - const G3D::Matrix4& matrix4() const; - const G3D::Matrix4& matrix4(const G3D::Matrix4& defaultVal) const; - - operator const Matrix4& () const { - return matrix4(); - } - - const G3D::Quat& quat() const; - const G3D::Quat& quat(const G3D::Quat& defaultVal) const; - - operator const Quat& () const { - return quat(); - } - - std::string toString() const; - - /** Number of elements for an array or table.*/ - int size() const; - - /** For a table, returns the keys. */ - void getKeys(G3D::Array&) const; -}; - -} - -#endif diff --git a/externals/g3dlite/G3D.lib/include/G3D/Array.h b/externals/g3dlite/G3D.lib/include/G3D/Array.h deleted file mode 100644 index ae4eea8ab40..00000000000 --- a/externals/g3dlite/G3D.lib/include/G3D/Array.h +++ /dev/null @@ -1,1180 +0,0 @@ -/** - @file Array.h - - @maintainer Morgan McGuire, graphics3d.com - @cite Portions written by Aaron Orenstein, a@orenstein.name - - @created 2001-03-11 - @edited 2008-07-09 - - Copyright 2000-2008, Morgan McGuire, morgan@cs.williams.edu - All rights reserved. - */ - -#ifndef G3D_ARRAY_H -#define G3D_ARRAY_H - -#include "G3D/platform.h" -#include "G3D/debug.h" -#include "G3D/System.h" -#ifdef G3D_DEBUG -// For formatting error messages -# include "G3D/format.h" -#endif -#include -#include - -#ifdef _MSC_VER -# include - -# pragma warning (push) - // debug information too long -# pragma warning( disable : 4312) -# pragma warning( disable : 4786) -#endif - - -namespace G3D { - -/** - Constant for passing to Array::resize - */ -const bool DONT_SHRINK_UNDERLYING_ARRAY = false; - -/** Constant for Array::sort */ -const int SORT_INCREASING = 1; -/** Constant for Array::sort */ -const int SORT_DECREASING = -1; - -/** - Dynamic 1D array. - - Objects must have a default constructor (constructor that - takes no arguments) in order to be used with this template. - You will get the error "no appropriate default constructor found" - if they do not. - - Do not use with objects that overload placement operator new, - since the speed of Array is partly due to pooled allocation. - - If SSE is defined Arrays allocate the first element aligned to - 16 bytes. - - - Array is highly optimized compared to std::vector. - Array operations are less expensive than on std::vector and for large - amounts of data, Array consumes only 1.5x the total size of the - data, while std::vector consumes 2.0x. The default - array takes up zero heap space. The first resize (or append) - operation grows it to a reasonable internal size so it is efficient - to append to small arrays. Memory is allocated using - System::alignedMalloc, which produces pointers aligned to 16-byte - boundaries for use with SSE instructions and uses pooled storage for - fast allocation. When Array needs to copy - data internally on a resize operation it correctly invokes copy - constructors of the elements (the MSVC6 implementation of - std::vector uses realloc, which can create memory leaks for classes - containing references and pointers). Array provides a guaranteed - safe way to access the underlying data as a flat C array -- - Array::getCArray. Although (T*)std::vector::begin() can be used for - this purpose, it is not guaranteed to succeed on all platforms. - - To serialize an array, see G3D::serialize. - - The template parameter MIN_ELEMENTS indicates the smallest number of - elements that will be allocated. The default of 10 is designed to avoid - the overhead of repeatedly allocating the array as it grows from 1, to 2, and so on. - If you are creating a lot of small Arrays, however, you may want to set this smaller - to reduce the memory cost. Once the array has been allocated, it will never - deallocate the underlying array unless MIN_ELEMENTS is set to 0, MIN_BYTES is 0, and the array - is empty. - - Do not subclass an Array. - */ -template -class Array { -private: - /** 0...num-1 are initialized elements, num...numAllocated-1 are not */ - T* data; - - int num; - int numAllocated; - - void init(int n, int a) { - debugAssert(n <= a); - debugAssert(n >= 0); - this->num = 0; - this->numAllocated = 0; - data = NULL; - if (a > 0) { - resize(n); - } else { - data = NULL; - } - } - - void _copy(const Array &other) { - init(other.num, other.num); - for (int i = 0; i < num; i++) { - data[i] = other.data[i]; - } - } - - /** - Returns true iff address points to an element of this array. - Used by append. - */ - inline bool inArray(const T* address) { - return (address >= data) && (address < data + num); - } - - - /** Only compiled if you use the sort procedure. */ - static bool __cdecl compareGT(const T& a, const T& b) { - return a > b; - } - - - /** - Allocates a new array of size numAllocated (not a parameter to the method) - and then copies at most oldNum elements from the old array to it. Destructors are - called for oldNum elements of the old array. - */ - void realloc(int oldNum) { - T* oldData = data; - - // The allocation is separate from the constructor invocation because we don't want - // to pay for the cost of constructors until the newly allocated - // elements are actually revealed to the application. They - // will be constructed in the resize() method. - - data = (T*)System::alignedMalloc(sizeof(T) * numAllocated, 16); - - // Call the copy constructors - {const int N = G3D::min(oldNum, numAllocated); - const T* end = data + N; - T* oldPtr = oldData; - for (T* ptr = data; ptr < end; ++ptr, ++oldPtr) { - - // Use placement new to invoke the constructor at the location - // that we determined. Use the copy constructor to make the assignment. - const T* constructed = new (ptr) T(*oldPtr); - - (void)constructed; - debugAssertM(constructed == ptr, - "new returned a different address than the one provided by Array."); - }} - - // Call destructors on the old array (if there is no destructor, this will compile away) - {const T* end = oldData + oldNum; - for (T* ptr = oldData; ptr < end; ++ptr) { - ptr->~T(); - }} - - - System::alignedFree(oldData); - } - -public: - - /** - G3D C++ STL style iterator variable. Call begin() to get - the first iterator, pre-increment (++i) the iterator to get to - the next value. Use dereference (*i) to access the element. - */ - typedef T* Iterator; - /** G3D C++ STL style const iterator in same style as Iterator. */ - typedef const T* ConstIterator; - - /** stl porting compatibility helper */ - typedef Iterator iterator; - /** stl porting compatibility helper */ - typedef ConstIterator const_iterator; - /** stl porting compatibility helper */ - typedef T value_type; - /** stl porting compatibility helper */ - typedef int size_type; - /** stl porting compatibility helper */ - typedef int difference_type; - - /** - C++ STL style iterator method. Returns the first iterator element. - Do not change the size of the array while iterating. - */ - Iterator begin() { - return data; - } - - ConstIterator begin() const { - return data; - } - /** - C++ STL style iterator method. Returns one after the last iterator - element. - */ - ConstIterator end() const { - return data + num; - } - - Iterator end() { - return data + num; - } - - /** - The array returned is only valid until the next append() or resize call, or - the Array is deallocated. - */ - T* getCArray() { - return data; - } - - /** - The array returned is only valid until the next append() or resize call, or - the Array is deallocated. - */ - const T* getCArray() const { - return data; - } - - /** Creates a zero length array (no heap allocation occurs until resize). */ - Array() { - init(0, 0); - } - - /** - Creates an array of size. - */ - Array(int size) { - init(size, size); - } - - /** - Copy constructor - */ - Array(const Array& other) { - _copy(other); - } - - /** - Destructor does not delete() the objects if T is a pointer type - (e.g. T = int*) instead, it deletes the pointers themselves and - leaves the objects. Call deleteAll if you want to dealocate - the objects referenced. Do not call deleteAll if T is not a pointer - type (e.g. do call Array::deleteAll, do not call Array::deleteAll). - */ - ~Array() { - // Invoke the destructors on the elements - for (int i = 0; i < num; i++) { - (data + i)->~T(); - } - - System::alignedFree(data); - // Set to 0 in case this Array is global and gets referenced during app exit - data = NULL; - num = 0; - numAllocated = 0; - } - - - /** - Removes all elements. Use resize(0, false) or fastClear if you want to - remove all elements without deallocating the underlying array - so that future append() calls will be faster. - */ - void clear(bool shrink = true) { - resize(0, shrink); - } - - /** resize(0, false) - @deprecated*/ - void fastClear() { - clear(false); - } - - /** - Assignment operator. - */ - Array& operator=(const Array& other) { - resize(other.num); - for (int i = 0; i < num; ++i) { - data[i] = other[i]; - } - return *this; - } - - Array& operator=(const std::vector& other) { - resize((int)other.size()); - for (int i = 0; i < num; ++i) { - data[i] = other[i]; - } - return *this; - } - - /** - Number of elements in the array. - */ - inline int size() const { - return num; - } - - /** - Number of elements in the array. (Same as size; this is just - here for convenience). - */ - inline int length() const { - return size(); - } - - /** - Swaps element index with the last element in the array then - shrinks the array by one. - */ - void fastRemove(int index, bool shrinkIfNecessary = false) { - debugAssert(index >= 0); - debugAssert(index < num); - data[index] = data[num - 1]; - resize(size() - 1, shrinkIfNecessary); - } - - /** Resizes without shrinking the underlying array. Same as resize(n, false). - @deprecated*/ - void fastResize(int n) { - resize(n, false); - } - - - /** - Inserts at the specified index and shifts all other elements up by one. - */ - void insert(int n, const T& value) { - // Add space for the extra element - resize(num + 1, false); - - for (int i = num - 1; i > n; --i) { - data[i] = data[i - 1]; - } - data[n] = value; - } - - /** @param shrinkIfNecessary if false, memory will never be - reallocated when the array shrinks. This makes resizing much - faster but can waste memory. */ - void resize(int n, bool shrinkIfNecessary = true) { - int oldNum = num; - num = n; - - // Call the destructors on newly hidden elements if there are any - for (int i = num; i < oldNum; ++i) { - (data + i)->~T(); - } - - // Once allocated, always maintain MIN_ELEMENTS elements or 32 bytes, whichever is higher. - static const int minSize = G3D::max(MIN_ELEMENTS, (int)(MIN_BYTES / sizeof(T))); - - if ((MIN_ELEMENTS == 0) && (MIN_BYTES == 0) && (n == 0) && shrinkIfNecessary) { - // Deallocate the array completely - numAllocated = 0; - System::alignedFree(data); - data = NULL; - return; - } - - if (num > numAllocated) { - // Grow the underlying array - - if (numAllocated == 0) { - // First allocation; grow to exactly the size requested to avoid wasting space. - numAllocated = n; - debugAssert(oldNum == 0); - realloc(oldNum); - } else { - - if (num < minSize) { - // Grow to at least the minimum size - numAllocated = minSize; - - } else { - - // Increase the underlying size of the array. Grow aggressively - // up to 64k, less aggressively up to 400k, and then grow relatively - // slowly (1.5x per resize) to avoid excessive space consumption. - // - // These numbers are tweaked according to performance tests. - - float growFactor = 3.0; - - size_t oldSizeBytes = numAllocated * sizeof(T); - if (oldSizeBytes > 400000) { - // Avoid bloat - growFactor = 1.5; - } else if (oldSizeBytes > 64000) { - // This is what std:: uses at all times - growFactor = 2.0; - } - - numAllocated = (num - numAllocated) + (int)(numAllocated * growFactor); - - if (numAllocated < minSize) { - numAllocated = minSize; - } - } - - realloc(oldNum); - } - - } else if ((num <= numAllocated / 3) && shrinkIfNecessary && (num > minSize)) { - // Shrink the underlying array - - // Only copy over old elements that still remain after resizing - // (destructors were called for others if we're shrinking) - realloc(iMin(num, oldNum)); - - } - - // Call the constructors on newly revealed elements. - // Do not use parens because we don't want the intializer - // invoked for POD types. - for (int i = oldNum; i < num; ++i) { - new (data + i) T; - } - } - - /** - Add an element to the end of the array. Will not shrink the underlying array - under any circumstances. It is safe to append an element that is already - in the array. - */ - inline void append(const T& value) { - - if (num < numAllocated) { - // This is a simple situation; just stick it in the next free slot using - // the copy constructor. - new (data + num) T(value); - ++num; - } else if (inArray(&value)) { - // The value was in the original array; resizing - // is dangerous because it may move the value - // we have a reference to. - T tmp = value; - append(tmp); - } else { - // Here we run the empty initializer where we don't have to, but - // this simplifies the computation. - resize(num + 1, DONT_SHRINK_UNDERLYING_ARRAY); - data[num - 1] = value; - } - } - - - inline void append(const T& v1, const T& v2) { - if (inArray(&v1) || inArray(&v2)) { - // Copy into temporaries so that the references won't break when - // the array resizes. - T t1 = v1; - T t2 = v2; - append(t1, t2); - } else if (num + 1 < numAllocated) { - // This is a simple situation; just stick it in the next free slot using - // the copy constructor. - new (data + num) T(v1); - new (data + num + 1) T(v2); - num += 2; - } else { - // Resize the array. Note that neither value is already in the array. - resize(num + 2, DONT_SHRINK_UNDERLYING_ARRAY); - data[num - 2] = v1; - data[num - 1] = v2; - } - } - - - inline void append(const T& v1, const T& v2, const T& v3) { - if (inArray(&v1) || inArray(&v2) || inArray(&v3)) { - T t1 = v1; - T t2 = v2; - T t3 = v3; - append(t1, t2, t3); - } else if (num + 2 < numAllocated) { - // This is a simple situation; just stick it in the next free slot using - // the copy constructor. - new (data + num) T(v1); - new (data + num + 1) T(v2); - new (data + num + 2) T(v3); - num += 3; - } else { - resize(num + 3, DONT_SHRINK_UNDERLYING_ARRAY); - data[num - 3] = v1; - data[num - 2] = v2; - data[num - 1] = v3; - } - } - - - inline void append(const T& v1, const T& v2, const T& v3, const T& v4) { - if (inArray(&v1) || inArray(&v2) || inArray(&v3) || inArray(&v4)) { - T t1 = v1; - T t2 = v2; - T t3 = v3; - T t4 = v4; - append(t1, t2, t3, t4); - } else if (num + 3 < numAllocated) { - // This is a simple situation; just stick it in the next free slot using - // the copy constructor. - new (data + num) T(v1); - new (data + num + 1) T(v2); - new (data + num + 2) T(v3); - new (data + num + 3) T(v4); - num += 4; - } else { - resize(num + 4, DONT_SHRINK_UNDERLYING_ARRAY); - data[num - 4] = v1; - data[num - 3] = v2; - data[num - 2] = v3; - data[num - 1] = v4; - } - } - - /** - Returns true if the given element is in the array. - */ - bool contains(const T& e) const { - for (int i = 0; i < size(); ++i) { - if ((*this)[i] == e) { - return true; - } - } - - return false; - } - - /** - Append the elements of array. Cannot be called with this array - as an argument. - */ - void append(const Array& array) { - debugAssert(this != &array); - int oldNum = num; - int arrayLength = array.length(); - - resize(num + arrayLength, false); - - for (int i = 0; i < arrayLength; i++) { - data[oldNum + i] = array.data[i]; - } - } - - /** - Pushes a new element onto the end and returns its address. - This is the same as A.resize(A.size() + 1, false); A.last() - */ - inline T& next() { - resize(num + 1, false); - return last(); - } - - /** - Pushes an element onto the end (appends) - */ - inline void push(const T& value) { - append(value); - } - - inline void push(const Array& array) { - append(array); - } - - /** Alias to provide std::vector compatibility */ - inline void push_back(const T& v) { - push(v); - } - - /** "The member function removes the last element of the controlled sequence, which must be non-empty." - For compatibility with std::vector. */ - inline void pop_back() { - pop(); - } - - /** - "The member function returns the storage currently allocated to hold the controlled - sequence, a value at least as large as size()" - For compatibility with std::vector. - */ - int capacity() const { - return numAllocated; - } - - /** - "The member function returns a reference to the first element of the controlled sequence, - which must be non-empty." - For compatibility with std::vector. - */ - T& front() { - return (*this)[0]; - } - - /** - "The member function returns a reference to the first element of the controlled sequence, - which must be non-empty." - For compatibility with std::vector. - */ - const T& front() const { - return (*this)[0]; - } - - /** - Removes the last element and returns it. By default, shrinks the underlying array. - */ - inline T pop(bool shrinkUnderlyingArrayIfNecessary = true) { - debugAssert(num > 0); - T temp = data[num - 1]; - resize(num - 1, shrinkUnderlyingArrayIfNecessary); - return temp; - } - - /** Pops the last element and discards it without returning anything. Faster than pop. - By default, does not shrink the underlying array.*/ - inline void popDiscard(bool shrinkUnderlyingArrayIfNecessary = false) { - debugAssert(num > 0); - resize(num - 1, shrinkUnderlyingArrayIfNecessary); - } - - - /** - "The member function swaps the controlled sequences between *this and str." - Note that this is slower than the optimal std implementation. - - For compatibility with std::vector. - */ - void swap(Array& str) { - Array temp = str; - str = *this; - *this = temp; - } - - - /** - Performs bounds checks in debug mode - */ - inline T& operator[](int n) { - debugAssertM((n >= 0) && (n < num), format("Array index out of bounds. n = %d, size() = %d", n, num)); - debugAssert(data!=NULL); - return data[n]; - } - - inline T& operator[](unsigned int n) { - debugAssertM(n < (unsigned int)num, format("Array index out of bounds. n = %d, size() = %d", n, num)); - return data[n]; - } - - /** - Performs bounds checks in debug mode - */ - inline const T& operator[](int n) const { - debugAssert((n >= 0) && (n < num)); - debugAssert(data!=NULL); - return data[n]; - } - - inline const T& operator[](unsigned int n) const { - debugAssert((n < (unsigned int)num)); - debugAssert(data!=NULL); - return data[n]; - } - - inline T& randomElement() { - debugAssert(num > 0); - debugAssert(data!=NULL); - return data[iRandom(0, num - 1)]; - } - - inline const T& randomElement() const { - debugAssert(num > 0); - debugAssert(data!=NULL); - return data[iRandom(0, num - 1)]; - } - - /** - Returns the last element, performing a check in - debug mode that there is at least one element. - */ - inline const T& last() const { - debugAssert(num > 0); - debugAssert(data!=NULL); - return data[num - 1]; - } - - /** Returns element lastIndex() */ - inline T& last() { - debugAssert(num > 0); - debugAssert(data!=NULL); - return data[num - 1]; - } - - /** Returns size() - 1 */ - inline int lastIndex() const { - debugAssertM(num > 0, "Array is empty"); - return num - 1; - } - - inline int firstIndex() const { - debugAssertM(num > 0, "Array is empty"); - return 0; - } - - /** Returns element firstIndex(), performing a check in debug mode to ensure that there is at least one */ - inline T& first() { - debugAssertM(num > 0, "Array is empty"); - return data[0]; - } - - inline const T& first() const { - debugAssertM(num > 0, "Array is empty"); - return data[0]; - } - - /** Returns iFloor(size() / 2), throws an assertion in debug mode if the array is empty */ - inline int middleIndex() const { - debugAssertM(num > 0, "Array is empty"); - return num >> 1; - } - - /** Returns element middleIndex() */ - inline const T& middle() const { - debugAssertM(num > 0, "Array is empty"); - return data[num >> 1]; - } - - /** Returns element middleIndex() */ - inline T& middle() { - debugAssertM(num > 0, "Array is empty"); - return data[num >> 1]; - } - - /** - Calls delete on all objects[0...size-1] - and sets the size to zero. - */ - void deleteAll() { - for (int i = 0; i < num; i++) { - delete data[i]; - } - resize(0); - } - - /** - Returns the index of (the first occurance of) an index or -1 if - not found. - */ - int findIndex(const T& value) const { - for (int i = 0; i < num; ++i) { - if (data[i] == value) { - return i; - } - } - return -1; - } - - /** - Finds an element and returns the iterator to it. If the element - isn't found then returns end(). - */ - Iterator find(const T& value) { - for (int i = 0; i < num; ++i) { - if (data[i] == value) { - return data + i; - } - } - return end(); - } - - ConstIterator find(const T& value) const { - for (int i = 0; i < num; ++i) { - if (data[i] == value) { - return data + i; - } - } - return end(); - } - - /** - Removes count elements from the array - referenced either by index or Iterator. - */ - void remove(Iterator element, int count = 1) { - debugAssert((element >= begin()) && (element < end())); - debugAssert((count > 0) && (element + count) <= end()); - Iterator last = end() - count; - - while(element < last) { - element[0] = element[count]; - ++element; - } - - resize(num - count); - } - - void remove(int index, int count = 1) { - debugAssert((index >= 0) && (index < num)); - debugAssert((count > 0) && (index + count <= num)); - - remove(begin() + index, count); - } - - /** - Reverse the elements of the array in place. - */ - void reverse() { - T temp; - - int n2 = num / 2; - for (int i = 0; i < n2; ++i) { - temp = data[num - 1 - i]; - data[num - 1 - i] = data[i]; - data[i] = temp; - } - } - - /** - Sort using a specific less-than function, e.g.: - - 
-    bool __cdecl myLT(const MyClass& elem1, const MyClass& elem2) {
-        return elem1.x < elem2.x;
-    }
-
- - Note that for pointer arrays, the const must come - after the class name, e.g., Array uses: - - 
-    bool __cdecl myLT(MyClass*const& elem1, MyClass*const& elem2) {
-        return elem1->x < elem2->x;
-    }
-
- */ - void sort(bool (__cdecl *lessThan)(const T& elem1, const T& elem2)) { - std::sort(data, data + num, lessThan); - } - - - /** - Sorts the array in increasing order using the > or < operator. To - invoke this method on Array, T must override those operator. - You can overide these operators as follows: - - bool T::operator>(const T& other) const { - return ...; - } - bool T::operator<(const T& other) const { - return ...; - } - - */ - void sort(int direction = SORT_INCREASING) { - if (direction == SORT_INCREASING) { - std::sort(data, data + num); - } else { - std::sort(data, data + num, compareGT); - } - } - - /** - Sorts elements beginIndex through and including endIndex. - */ - void sortSubArray(int beginIndex, int endIndex, int direction = SORT_INCREASING) { - if (direction == SORT_INCREASING) { - std::sort(data + beginIndex, data + endIndex + 1); - } else { - std::sort(data + beginIndex, data + endIndex + 1, compareGT); - } - } - - void sortSubArray(int beginIndex, int endIndex, bool (__cdecl *lessThan)(const T& elem1, const T& elem2)) { - std::sort(data + beginIndex, data + endIndex + 1, lessThan); - } - - /** - The StrictWeakOrdering can be either a class that overloads the function call operator() or - a function pointer of the form bool (__cdecl *lessThan)(const T& elem1, const T& elem2) - */ - template - void sortSubArray(int beginIndex, int endIndex, StrictWeakOrdering& lessThan) { - std::sort(data + beginIndex, data + endIndex + 1, lessThan); - } - - /** Uses < and == to evaluate operator(); this is the default comparator for Array::partition. */ - class DefaultComparator { - public: - inline int operator()(const T& A, const T& B) const { - if (A < B) { - return 1; - } else if (A == B) { - return 0; - } else { - return -1; - } - } - }; - - /** The output arrays are resized with fastClear() so that if they are already of the same size - as this array no memory is allocated during partitioning. - - @param comparator A function, or class instance with an overloaded operator() that compares - two elements of type T and returns 0 if they are equal, -1 if the second is smaller, - and 1 if the first is smaller (i.e., following the conventions of std::string::compare). For example: - - 
-        int compare(int A, int B) {
-            if (A < B) {
-                return 1;
-            } else if (A == B) {
-                return 0;
-            } else {
-                return -1;
-            }
-        }
-
- */ - template - void partition( - const T& partitionElement, - Array& ltArray, - Array& eqArray, - Array& gtArray, - const Comparator& comparator) const { - - // Make sure all arrays are independent - debugAssert(<Array != this); - debugAssert(&eqArray != this); - debugAssert(>Array != this); - debugAssert(<Array != &eqArray); - debugAssert(<Array != >Array); - debugAssert(&eqArray != >Array); - - // Clear the arrays - ltArray.fastClear(); - eqArray.fastClear(); - gtArray.fastClear(); - - // Form a table of buckets for lt, eq, and gt - Array* bucket[3] = {<Array, &eqArray, >Array}; - - for (int i = 0; i < num; ++i) { - int c = comparator(partitionElement, data[i]); - debugAssertM(c >= -1 && c <= 1, "Comparator returned an illegal value."); - - // Insert into the correct bucket, 0, 1, or 2 - bucket[c + 1]->append(data[i]); - } - } - - /** - Uses < and == on elements to perform a partition. See partition(). - */ - void partition( - const T& partitionElement, - Array& ltArray, - Array& eqArray, - Array& gtArray) const { - - partition(partitionElement, ltArray, eqArray, gtArray, typename Array::DefaultComparator()); - } - - /** - Paritions the array into those below the median, those above the median, and those elements - equal to the median in expected O(n) time using quickselect. If the array has an even - number of different elements, the median for partition purposes is the largest value - less than the median. - - @param tempArray used for working scratch space - @param comparator see parition() for a discussion.*/ - template - void medianPartition( - Array& ltMedian, - Array& eqMedian, - Array& gtMedian, - Array& tempArray, - const Comparator& comparator) const { - - ltMedian.fastClear(); - eqMedian.fastClear(); - gtMedian.fastClear(); - - // Handle trivial cases first - switch (size()) { - case 0: - // Array is empty; no parition is possible - return; - - case 1: - // One element - eqMedian.append(first()); - return; - - case 2: - { - // Two element array; median is the smaller - int c = comparator(first(), last()); - - switch (c) { - case -1: - // first was bigger - eqMedian.append(last()); - gtMedian.append(first()); - break; - - case 0: - // Both equal to the median - eqMedian.append(first(), last()); - break; - - case 1: - // Last was bigger - eqMedian.append(first()); - gtMedian.append(last()); - break; - } - } - return; - } - - // All other cases use a recursive randomized median - - // Number of values less than all in the current arrays - int ltBoost = 0; - - // Number of values greater than all in the current arrays - int gtBoost = 0; - - // For even length arrays, force the gt array to be one larger than the - // lt array: - // [1 2 3] size = 3, choose half = (s + 1) /2 - // - int lowerHalfSize, upperHalfSize; - if (isEven(size())) { - lowerHalfSize = size() / 2; - upperHalfSize = lowerHalfSize + 1; - } else { - lowerHalfSize = upperHalfSize = (size() + 1) / 2; - } - const T* xPtr = NULL; - - // Maintain pointers to the arrays; we'll switch these around during sorting - // to avoid copies. - const Array* source = this; - Array* lt = <Median; - Array* eq = &eqMedian; - Array* gt = >Median; - Array* extra = &tempArray; - - while (true) { - // Choose a random element -- choose the middle element; this is theoretically - // suboptimal, but for loosly sorted array is actually the best strategy - - xPtr = &(source->middle()); - if (source->size() == 1) { - // Done; there's only one element left - break; - } - const T& x = *xPtr; - - // Note: partition (fast) clears the arrays for us - source->partition(x, *lt, *eq, *gt, comparator); - - int L = lt->size() + ltBoost + eq->size(); - int U = gt->size() + gtBoost + eq->size(); - if ((L >= lowerHalfSize) && - (U >= upperHalfSize)) { - - // x must be the partition median - break; - - } else if (L < lowerHalfSize) { - - // x must be smaller than the median. Recurse into the 'gt' array. - ltBoost += lt->size() + eq->size(); - - // The new gt array will be the old source array, unless - // that was the this pointer (i.e., unless we are on the - // first iteration) - Array* newGt = (source == this) ? extra : const_cast*>(source); - - // Now set up the gt array as the new source - source = gt; - gt = newGt; - - } else { - - // x must be bigger than the median. Recurse into the 'lt' array. - gtBoost += gt->size() + eq->size(); - - // The new lt array will be the old source array, unless - // that was the this pointer (i.e., unless we are on the - // first iteration) - Array* newLt = (source == this) ? extra : const_cast*>(source); - - // Now set up the lt array as the new source - source = lt; - lt = newLt; - } - } - - // Now that we know the median, make a copy of it (since we're about to destroy the array that it - // points into). - T median = *xPtr; - xPtr = NULL; - - // Partition the original array (note that this fast clears for us) - partition(median, ltMedian, eqMedian, gtMedian, comparator); - } - - /** - Computes a median partition using the default comparator and a dynamically allocated temporary - working array. If the median is not in the array, it is chosen to be the largest value smaller - than the true median. - */ - void medianPartition( - Array& ltMedian, - Array& eqMedian, - Array& gtMedian) const { - - Array temp; - medianPartition(ltMedian, eqMedian, gtMedian, temp, DefaultComparator()); - } - - - /** Redistributes the elements so that the new order is statistically independent - of the original order. O(n) time.*/ - void randomize() { - T temp; - - for (int i = size() - 1; i >= 0; --i) { - int x = iRandom(0, i); - - temp = data[i]; - data[i] = data[x]; - data[x] = temp; - } - } - - -}; - - -/** Array::contains for C-arrays */ -template bool contains(const T* array, int len, const T& e) { - for (int i = len - 1; i >= 0; --i) { - if (array[i] == e) { - return true; - } - } - return false; -} - -} // namespace - -#ifdef _MSC_VER -# pragma warning (pop) -#endif - -#endif diff --git a/externals/g3dlite/G3D.lib/include/G3D/AtomicInt32.h b/externals/g3dlite/G3D.lib/include/G3D/AtomicInt32.h deleted file mode 100644 index 9d58e02efe5..00000000000 --- a/externals/g3dlite/G3D.lib/include/G3D/AtomicInt32.h +++ /dev/null @@ -1,166 +0,0 @@ -/** - @file AtomicInt32.h - - @maintainer Morgan McGuire, matrix@graphics3d.com - - @created 2005-09-01 - @edited 2006-06-21 - */ -#ifndef G3D_ATOMICINT32_H -#define G3D_ATOMICINT32_H - -#include "G3D/platform.h" -#include "G3D/g3dmath.h" - -#if defined(G3D_OSX) - #include -#endif - -namespace G3D { - -/** - An integer that may safely be used on different threads without - external locking. - - On Win32, Linux, FreeBSD, and Mac OS X this is implemented without locks. - - BETA API This is unsupported and may change - */ -class AtomicInt32 { -private: -# if defined(G3D_WIN32) - volatile long m_value; -# elif defined(G3D_OSX) - int32_t m_value; -# else - volatile int32 m_value; -# endif - - -public: - - /** Initial value is undefined. */ - AtomicInt32() {} - - /** Atomic set */ - explicit AtomicInt32(const int32 x) { - m_value = x; - } - - /** Atomic set */ - AtomicInt32(const AtomicInt32& x) { - m_value = x.m_value; - } - - /** Atomic set */ - const AtomicInt32& operator=(const int32 x) { - m_value = x; - return *this; - } - - /** Atomic set */ - void operator=(const AtomicInt32& x) { - m_value = x.m_value; - } - - /** Returns the current value */ - int32 value() const { - return m_value; - } - - /** Returns the old value, before the add. */ - int32 add(const int32 x) { -# if defined(G3D_WIN32) - - return InterlockedExchangeAdd(&m_value, x); - -# elif defined(G3D_LINUX) || defined(G3D_FREEBSD) - - int32 old; - asm volatile ("lock; xaddl %0,%1" - : "=r"(old), "=m"(m_value) /* outputs */ - : "0"(x), "m"(m_value) /* inputs */ - : "memory", "cc"); - return old; - -# elif defined(G3D_OSX) - - int32 old = m_value; - OSAtomicAdd32(x, &m_value); - return old; - -# endif - } - - /** Returns old value. */ - int32 sub(const int32 x) { - return add(-x); - } - - void increment() { -# if defined(G3D_WIN32) - // Note: returns the newly incremented value - InterlockedIncrement(&m_value); -# elif defined(G3D_LINUX) || defined(G3D_FREEBSD) - add(1); -# elif defined(G3D_OSX) - // Note: returns the newly incremented value - OSAtomicIncrement32(&m_value); -# endif - } - - /** Returns zero if the result is zero after decrement, non-zero otherwise.*/ - int32 decrement() { -# if defined(G3D_WIN32) - // Note: returns the newly decremented value - return InterlockedDecrement(&m_value); -# elif defined(G3D_LINUX) || defined(G3D_FREEBSD) - unsigned char nz; - - asm volatile ("lock; decl %1;\n\t" - "setnz %%al" - : "=a" (nz) - : "m" (m_value) - : "memory", "cc"); - return nz; -# elif defined(G3D_OSX) - // Note: returns the newly decremented value - return OSAtomicDecrement32(&m_value); -# endif - } - - - /** Atomic test-and-set: if *this == comperand then *this := exchange else do nothing. - In both cases, returns the old value of *this. - - Performs an atomic comparison of this with the Comperand value. - If this is equal to the Comperand value, the Exchange value is stored in this. - Otherwise, no operation is performed. - - Under VC6 the sign bit may be lost. - - */ - int32 compareAndSet(const int32 comperand, const int32 exchange) { -# if defined(G3D_WIN32) - return InterlockedCompareExchange(&m_value, exchange, comperand); -# elif defined(G3D_LINUX) || defined(G3D_FREEBSD) - int32 ret; - asm volatile ("lock; cmpxchgl %1, %2" - : "=a" (ret) - : "r" (exchange), "m" (m_value), "0"(comperand) - : "memory", "cc"); - return ret; -# elif defined(G3D_OSX) - int32 old = m_value; - - OSAtomicCompareAndSwap32(comperand, exchange, &m_value); - - return old; -# endif - } - -}; - -} // namespace - -#endif diff --git a/externals/g3dlite/G3D.lib/include/G3D/BinaryFormat.h b/externals/g3dlite/G3D.lib/include/G3D/BinaryFormat.h deleted file mode 100644 index 53f0c144bf6..00000000000 --- a/externals/g3dlite/G3D.lib/include/G3D/BinaryFormat.h +++ /dev/null @@ -1,140 +0,0 @@ -/** - @file BinaryFormat.h - @maintainer Morgan McGuire, matrix@graphics3d.com - - @author 2005-06-03 - @edited 2005-06-03 - - Copyright 2000-2005, Morgan McGuire. - All rights reserved. - */ - -#ifndef G3D_BINARYFORMAT_H -#define G3D_BINARYFORMAT_H - -#include "G3D/platform.h" -#include "G3D/g3dmath.h" - -namespace G3D { - -class Vector2; -class Vector2int16; -class Vector3; -class Vector3int16; -class Vector4; -class Vector4int16; -class Color3; -class Color3uint8; -class Color4; -class Color4uint8; - -/** - Some values like float16 and int128 have no current CPU data structure that implements them but are useful - for file formats and for GPUs. - - CHUNK_BINFMT data follows the protocol. - */ -// Must be packed int 16 bits for the chunk reader -// We can't name these just "INT8" etc. because some libraries #define names like that -enum BinaryFormat { - FIRST_BINFMT = 1000, - - BOOL8_BINFMT, - UINT8_BINFMT, INT8_BINFMT, UINT16_BINFMT, INT16_BINFMT, UINT32_BINFMT, INT32_BINFMT, UINT64_BINFMT, INT64_BINFMT, UINT128_BINFMT, INT128_BINFMT, - FLOAT16_BINFMT, FLOAT32_BINFMT, FLOAT64_BINFMT, - VECTOR2_BINFMT, VECTOR2INT16_BINFMT, - VECTOR3_BINFMT, VECTOR3INT16_BINFMT, - VECTOR4_BINFMT, VECTOR4INT16_BINFMT, - COLOR3_BINFMT, COLOR3UINT8_BINFMT, COLOR3INT16_BINFMT, - COLOR4_BINFMT, COLOR4UINT8_BINFMT, COLOR4INT16_BINFMT, - STRING_BINFMT, STRINGEVEN_BINFMT, STRING8_BINFMT, STRING16_BINFMT, STRING32_BINFMT, - - CHUNK_BINFMT, - - CUSTOM_BINFMT, - - LAST_BINFMT -}; - -} - -/** A macro that maps G3D types to format constants. - (e.g. binaryFormatOf(Vector3) == VECTOR3_BINFMT). -*/ -// This implementation is designed to meet the following constraints: -// 1. Work around the many MSVC++ partial template bugs -// 2. Work for primitive types (e.g. int) -#define binaryFormatOf(T) (G3D::_internal::_BinaryFormat::x()) - -namespace G3D { -namespace _internal { - - -template class _BinaryFormat { -public: - static BinaryFormat x() { - return CUSTOM_BINFMT; - } -}; -}} - - -/** - Macro to declare the underlying format (as will be returned by glFormatOf) - of a type. For example, - - 
-    DECLARE_BINARYFORMATOF(Vector4, VECTOR4_BINFMT)
-
- - Use this so you can make vertex arrays of your own classes and not just - the standard ones. - */ -#define DECLARE_BINARYFORMATOF(CType, EnumType) \ -namespace G3D { \ - namespace _internal { \ - template<> class _BinaryFormat { \ - public: \ - static BinaryFormat x() { \ - return EnumType; \ - } \ - }; \ - } \ -} - -DECLARE_BINARYFORMATOF( bool, BOOL8_BINFMT ) - -DECLARE_BINARYFORMATOF( uint8, UINT8_BINFMT ) -DECLARE_BINARYFORMATOF( int8, INT8_BINFMT ) -DECLARE_BINARYFORMATOF( uint16, UINT16_BINFMT ) -DECLARE_BINARYFORMATOF( int16, INT16_BINFMT ) -DECLARE_BINARYFORMATOF( uint32, UINT32_BINFMT ) -DECLARE_BINARYFORMATOF( int32, INT32_BINFMT ) -DECLARE_BINARYFORMATOF( uint64, UINT64_BINFMT ) -DECLARE_BINARYFORMATOF( int64, INT64_BINFMT ) - -DECLARE_BINARYFORMATOF( float32, FLOAT32_BINFMT ) -DECLARE_BINARYFORMATOF( float64, FLOAT64_BINFMT ) - -DECLARE_BINARYFORMATOF( Vector2, VECTOR2_BINFMT ) -DECLARE_BINARYFORMATOF( Vector2int16, VECTOR2INT16_BINFMT ) -DECLARE_BINARYFORMATOF( Vector3, VECTOR3_BINFMT ) -DECLARE_BINARYFORMATOF( Vector3int16, VECTOR3INT16_BINFMT ) -DECLARE_BINARYFORMATOF( Vector4, VECTOR4_BINFMT ) -DECLARE_BINARYFORMATOF( Vector4int16, VECTOR4INT16_BINFMT ) - -DECLARE_BINARYFORMATOF( Color3, COLOR3_BINFMT ) -DECLARE_BINARYFORMATOF( Color3uint8, COLOR3UINT8_BINFMT ) -DECLARE_BINARYFORMATOF( Color4, COLOR4_BINFMT ) -DECLARE_BINARYFORMATOF( Color4uint8, COLOR4UINT8_BINFMT ) - -namespace G3D { - -/** Returns -1 if the format is custom, otherwise the byte size - of a single element in this format.*/ -int32 byteSize(BinaryFormat f); - - -} //G3D - -#endif diff --git a/externals/g3dlite/G3D.lib/include/G3D/BinaryInput.h b/externals/g3dlite/G3D.lib/include/G3D/BinaryInput.h deleted file mode 100644 index c0ab9052402..00000000000 --- a/externals/g3dlite/G3D.lib/include/G3D/BinaryInput.h +++ /dev/null @@ -1,441 +0,0 @@ -/** - @file BinaryInput.h - - @maintainer Morgan McGuire, graphics3d.com - - @created 2001-08-09 - @edited 2006-07-19 - - Copyright 2000-2007, Morgan McGuire. - All rights reserved. - */ - -#ifndef G3D_BINARYINPUT_H -#define G3D_BINARYINPUT_H - -#ifdef _MSC_VER -// Disable conditional expression is constant, which occurs incorrectly on inlined functions -# pragma warning(push) -# pragma warning( disable : 4127 ) -#endif - -#include -#include -#include -#include -#include -#include -#include "G3D/platform.h" -#include "G3D/Array.h" -#include "G3D/Color4.h" -#include "G3D/Color3.h" -#include "G3D/Vector4.h" -#include "G3D/Vector3.h" -#include "G3D/Vector2.h" -#include "G3D/g3dmath.h" -#include "G3D/debug.h" -#include "G3D/System.h" - - -namespace G3D { - -#if defined(G3D_WIN32) || defined(G3D_LINUX) - // Allow writing of integers to non-word aligned locations. - // This is legal on x86, but not on other platforms. - #define G3D_ALLOW_UNALIGNED_WRITES -#endif - -/** - Sequential or random access byte-order independent binary file access. - Files compressed with zlib and beginning with an unsigned 32-bit int - size are transparently decompressed when the compressed = true flag is - specified to the constructor. - - For every readX method there are also versions that operate on a whole - Array, std::vector, or C-array. e.g. readFloat32(Array& array, n) - These methods resize the array or std::vector to the appropriate size - before reading. For a C-array, they require the pointer to reference - a memory block at least large enough to hold n elements. - - Most classes define serialize/deserialize methods that use BinaryInput, - BinaryOutput, TextInput, and TextOutput. There are text serializer - functions for primitive types (e.g. int, std::string, float, double) but not - binary serializers-- you must call the BinaryInput::readInt32 or - other appropriate function. This is because it would be very hard to - debug the error sequence: serialize(1.0, bo); ... float f; deserialize(f, bi); - in which a double is serialized and then deserialized as a float. - */ -class BinaryInput { -private: - - // The initial buffer will be no larger than this, but - // may grow if a large memory read occurs. 50 MB - enum {INITIAL_BUFFER_LENGTH = 50000000}; - - /** - is the file big or little endian - */ - G3DEndian m_fileEndian; - std::string m_filename; - - bool m_swapBytes; - - /** Next position to read from in bitString during readBits. */ - int m_bitPos; - - /** Bits currently being read by readBits. - Contains at most 8 (low) bits. Note that - beginBits/readBits actually consumes one extra byte, which - will be restored by writeBits.*/ - uint32 m_bitString; - - /** 1 when between beginBits and endBits, 0 otherwise. */ - int m_beginEndBits; - - /** When operating on huge files, we cannot load the whole file into memory. - This is the file position to which buffer[0] corresponds. - */ - int64 m_alreadyRead; - - /** - Length of the entire file, in bytes. - For the length of the buffer, see bufferLength - */ - int64 m_length; - - /** Length of the array referenced by buffer. May go past the end of the file!*/ - int64 m_bufferLength; - uint8* m_buffer; - - /** - Next byte in file, relative to buffer. - */ - int64 m_pos; - - /** - When true, the buffer is freed in the destructor. - */ - bool m_freeBuffer; - - /** Ensures that we are able to read at least minLength from startPosition (relative - to start of file). */ - void loadIntoMemory(int64 startPosition, int64 minLength = 0); - - /** Verifies that at least this number of bytes can be read.*/ - inline void prepareToRead(int64 nbytes) { - debugAssertM(m_length > 0, m_filename + " not found or corrupt."); - debugAssertM(m_pos + nbytes + m_alreadyRead <= m_length, "Read past end of file."); - - if (m_pos + nbytes > m_bufferLength) { - loadIntoMemory(m_pos + m_alreadyRead, nbytes); - } - } - - // Not implemented on purpose, don't use - BinaryInput(const BinaryInput&); - BinaryInput& operator=(const BinaryInput&); - bool operator==(const BinaryInput&); - - /** Buffer is compressed; replace it with a decompressed version */ - void decompress(); -public: - - /** false, constant to use with the copyMemory option */ - static const bool NO_COPY; - - /** - If the file cannot be opened, a zero length buffer is presented. - Automatically opens files that are inside zipfiles. - - @param compressed Set to true if and only if the file was - compressed using BinaryOutput's zlib compression. This has - nothing to do with whether the input is in a zipfile. - */ - BinaryInput( - const std::string& filename, - G3DEndian fileEndian, - bool compressed = false); - - /** - Creates input stream from an in memory source. - Unless you specify copyMemory = false, the data is copied - from the pointer, so you may deallocate it as soon as the - object is constructed. It is an error to specify copyMemory = false - and compressed = true. - - To decompress part of a file, you can follow the following paradigm: - - 
-        BinaryInput master(...);
-
-        // read from master to point where compressed data exists.
-
-        BinaryInput subset(master.getCArray() + master.getPosition(), 
-                           master.length() - master.getPosition(),
-                           master.endian(), true, true);
-
-        // Now read from subset (it is ok for master to go out of scope)
-
- */ - BinaryInput( - const uint8* data, - int64 dataLen, - G3DEndian dataEndian, - bool compressed = false, - bool copyMemory = true); - - virtual ~BinaryInput(); - - /** Change the endian-ness of the file. This only changes the - interpretation of the file for future read calls; the - underlying data is unmodified.*/ - void setEndian(G3DEndian endian); - - G3DEndian endian() const { - return m_fileEndian; - } - - std::string getFilename() const { - return m_filename; - } - - /** - Returns a pointer to the internal memory buffer. - May throw an exception for huge files. - */ - const uint8* getCArray() const { - if (m_alreadyRead > 0) { - throw "Cannot getCArray for a huge file"; - } - return m_buffer; - } - - /** - Performs bounds checks in debug mode. [] are relative to - the start of the file, not the current position. - Seeks to the new position before reading (and leaves - that as the current position) - */ - inline uint8 operator[](int64 n) { - setPosition(n); - return readUInt8(); - } - - /** - Returns the length of the file in bytes. - */ - inline int64 getLength() const { - return m_length; - } - - inline int64 size() const { - return getLength(); - } - - /** - Returns the current byte position in the file, - where 0 is the beginning and getLength() - 1 is the end. - */ - inline int64 getPosition() const { - return m_pos + m_alreadyRead; - } - - /** - Sets the position. Cannot set past length. - May throw a char* when seeking backwards more than 10 MB on a huge file. - */ - inline void setPosition(int64 p) { - debugAssertM(p <= m_length, "Read past end of file"); - m_pos = p - m_alreadyRead; - if ((m_pos < 0) || (m_pos > m_bufferLength)) { - loadIntoMemory(m_pos + m_alreadyRead); - } - } - - /** - Goes back to the beginning of the file. - */ - inline void reset() { - setPosition(0); - } - - inline int8 readInt8() { - prepareToRead(1); - return m_buffer[m_pos++]; - } - - inline bool readBool8() { - return (readInt8() != 0); - } - - inline uint8 readUInt8() { - prepareToRead(1); - return ((uint8*)m_buffer)[m_pos++]; - } - - uint16 inline readUInt16() { - prepareToRead(2); - - m_pos += 2; - if (m_swapBytes) { - uint8 out[2]; - out[0] = m_buffer[m_pos - 1]; - out[1] = m_buffer[m_pos - 2]; - return *(uint16*)out; - } else { - #ifdef G3D_ALLOW_UNALIGNED_WRITES - return *(uint16*)(&m_buffer[m_pos - 2]); - #else - uint8 out[2]; - out[0] = m_buffer[m_pos - 2]; - out[1] = m_buffer[m_pos - 1]; - return *(uint16*)out; - #endif - } - - } - - inline int16 readInt16() { - uint16 a = readUInt16(); - return *(int16*)&a; - } - - inline uint32 readUInt32() { - prepareToRead(4); - - m_pos += 4; - if (m_swapBytes) { - uint8 out[4]; - out[0] = m_buffer[m_pos - 1]; - out[1] = m_buffer[m_pos - 2]; - out[2] = m_buffer[m_pos - 3]; - out[3] = m_buffer[m_pos - 4]; - return *(uint32*)out; - } else { - #ifdef G3D_ALLOW_UNALIGNED_WRITES - return *(uint32*)(&m_buffer[m_pos - 4]); - #else - uint8 out[4]; - out[0] = m_buffer[m_pos - 4]; - out[1] = m_buffer[m_pos - 3]; - out[2] = m_buffer[m_pos - 2]; - out[3] = m_buffer[m_pos - 1]; - return *(uint32*)out; - #endif - } - } - - - inline int32 readInt32() { - uint32 a = readUInt32(); - return *(int32*)&a; - } - - uint64 readUInt64(); - - inline int64 readInt64() { - uint64 a = readUInt64(); - return *(int64*)&a; - } - - inline float32 readFloat32() { - union { - uint32 a; - float32 b; - }; - a = readUInt32(); - return b; - } - - inline float64 readFloat64() { - union { - uint64 a; - float64 b; - }; - a = readUInt64(); - return b; - } - - void readBytes(void* bytes, int64 n); - - /** - Reads an n character string. The string is not - required to end in NULL in the file but will - always be a proper std::string when returned. - */ - std::string readString(int64 n); - - /** - Reads until NULL or the end of the file is encountered. - */ - std::string readString(); - - /** - Reads until NULL or the end of the file is encountered. - If the string has odd length (including NULL), reads - another byte. - */ - std::string readStringEven(); - - - std::string readString32(); - - Vector4 readVector4(); - Vector3 readVector3(); - Vector2 readVector2(); - - Color4 readColor4(); - Color3 readColor3(); - - /** - Skips ahead n bytes. - */ - inline void skip(int64 n) { - setPosition(m_pos + m_alreadyRead + n); - } - - /** - Returns true if the position is not at the end of the file - */ - inline bool hasMore() const { - return m_pos + m_alreadyRead < m_length; - } - - /** Prepares for bit reading via readBits. Only readBits can be - called between beginBits and endBits without corrupting the - data stream. */ - void beginBits(); - - /** Can only be called between beginBits and endBits */ - uint32 readBits(int numBits); - - /** Ends bit-reading. */ - void endBits(); - -# define DECLARE_READER(ucase, lcase)\ - void read##ucase(lcase* out, int64 n);\ - void read##ucase(std::vector& out, int64 n);\ - void read##ucase(Array& out, int64 n); - - DECLARE_READER(Bool8, bool) - DECLARE_READER(UInt8, uint8) - DECLARE_READER(Int8, int8) - DECLARE_READER(UInt16, uint16) - DECLARE_READER(Int16, int16) - DECLARE_READER(UInt32, uint32) - DECLARE_READER(Int32, int32) - DECLARE_READER(UInt64, uint64) - DECLARE_READER(Int64, int64) - DECLARE_READER(Float32, float32) - DECLARE_READER(Float64, float64) -# undef DECLARE_READER -}; - - -} - -#ifdef _MSC_VER -# pragma warning(pop) -#endif - -#endif diff --git a/externals/g3dlite/G3D.lib/include/G3D/BinaryOutput.h b/externals/g3dlite/G3D.lib/include/G3D/BinaryOutput.h deleted file mode 100644 index d81ec56a67b..00000000000 --- a/externals/g3dlite/G3D.lib/include/G3D/BinaryOutput.h +++ /dev/null @@ -1,421 +0,0 @@ -/** - @file BinaryOutput.h - - @maintainer Morgan McGuire, graphics3d.com - - @created 2001-08-09 - @edited 2008-01-24 - - Copyright 2000-2006, Morgan McGuire. - All rights reserved. - */ - -#ifndef G3D_BINARYOUTPUT_H -#define G3D_BINARYOUTPUT_H - -#include "G3D/platform.h" -#include -#include -#include -#include -#include -#include "G3D/Color4.h" -#include "G3D/Color3.h" -#include "G3D/Vector4.h" -#include "G3D/Vector3.h" -#include "G3D/Vector2.h" -#include "G3D/g3dmath.h" -#include "G3D/debug.h" -#include "G3D/BinaryInput.h" -#include "G3D/System.h" - -#ifdef _MSC_VER -# pragma warning (push) -// Conditional is constant (wrong in inline) -# pragma warning (disable : 4127) -#endif -namespace G3D { - -/** - Sequential or random access byte-order independent binary file access. - - The compress() call can be used to compress with zlib. - - Any method call can trigger an out of memory error (thrown as char*) - when writing to "" instead of a file. - - Compressed writing and seeking backwards is not supported for huge files - (i.e., BinaryOutput may have to dump the contents to disk if they - exceed available RAM). - */ -class BinaryOutput { -private: - std::string m_filename; - - bool m_committed; - - /** 0 outside of beginBits...endBits, 1 inside */ - int m_beginEndBits; - - /** The current string of bits being built up by beginBits...endBits. - This string is treated semantically, as if the lowest bit was - on the left and the highest was on the right.*/ - int8 m_bitString; - - /** Position (from the lowest bit) currently used in bitString.*/ - int m_bitPos; - - // True if the file endianess does not match the machine endian - bool m_swapBytes; - - G3DEndian m_fileEndian; - - uint8* m_buffer; - - /** Size of the elements used */ - int m_bufferLen; - - /** Underlying size of memory allocaded */ - int m_maxBufferLen; - - /** Next byte in file */ - int m_pos; - - /** is this initialized? */ - bool m_init; - - /** Number of bytes already written to the file.*/ - size_t m_alreadyWritten; - - bool m_ok; - - void reserveBytesWhenOutOfMemory(size_t bytes); - - void reallocBuffer(size_t bytes, size_t oldBufferLen); - - /** - Make sure at least bytes can be written, resizing if - necessary. - */ - inline void reserveBytes(int bytes) { - debugAssert(bytes > 0); - size_t oldBufferLen = (size_t)m_bufferLen; - - m_bufferLen = iMax(m_bufferLen, (m_pos + bytes)); - if (m_bufferLen > m_maxBufferLen) { - reallocBuffer(bytes, oldBufferLen); - } - } - - // Not implemented on purpose, don't use - BinaryOutput(const BinaryOutput&); - BinaryOutput& operator=(const BinaryOutput&); - bool operator==(const BinaryOutput&); - -public: - - /** - You must call setEndian() if you use this (memory) constructor. - */ - BinaryOutput(); - - /** - Doesn't actually open the file; commit() does that. - Use "" as the filename if you're going to commit - to memory. - */ - BinaryOutput( - const std::string& filename, - G3DEndian fileEndian); - - ~BinaryOutput(); - - /** Compresses the data in the buffer in place, - preceeding it with a little-endian uint32 indicating - the uncompressed size. - - Call immediately before commit(). - - Cannot be used for huge files (ones where the data - was already written to disk)-- will throw char*. - */ - void compress(); - - /** True if no errors have been encountered.*/ - bool ok() const; - - /** - Returns a pointer to the internal memory buffer. - */ - inline const uint8* getCArray() const { - return m_buffer; - } - - void setEndian(G3DEndian fileEndian); - - G3DEndian endian() const { - return m_fileEndian; - } - - std::string getFilename() const { - return m_filename; - } - - /** - Write the bytes to disk. It is ok to call this - multiple times; it will just overwrite the previous file. - - Parent directories are created as needed if they do - not exist. - - Not called from the destructor; you must call - it yourself. - - @param flush If true (default) the file is ready for reading when the method returns, otherwise - the method returns immediately and writes the file in the background. - */ - void commit(bool flush = true); - - /** - Write the bytes to memory (which must be of - at least size() bytes). - */ - void commit(uint8*); - - /** - A memory BinaryOutput may be reset so that it can be written to again - without allocating new memory. The underlying array will not be deallocated, - but the reset structure will act like a newly intialized one. - */ - void reset(); - - - inline int length() const { - return (int)m_bufferLen + (int)m_alreadyWritten; - } - - inline int size() const { - return length(); - } - - /** - Sets the length of the file to n, padding - with 0's past the current end. Does not - change the position of the next byte to be - written unless n < size(). - - Throws char* when resetting a huge file to be shorter - than its current length. - */ - inline void setLength(int n) { - n = n - (int)m_alreadyWritten; - - if (n < 0) { - throw "Cannot resize huge files to be shorter."; - } - - if (n < m_bufferLen) { - m_pos = n; - } - if (n > m_bufferLen) { - reserveBytes(n - m_bufferLen); - } - } - - /** - Returns the current byte position in the file, - where 0 is the beginning and getLength() - 1 is the end. - */ - inline int64 position() const { - return (int64)m_pos + (int64)m_alreadyWritten; - } - - - /** - Sets the position. Can set past length, in which case - the file is padded with zeros up to one byte before the - next to be written. - - May throw a char* exception when seeking backwards on a huge file. - */ - inline void setPosition(int64 p) { - p = p - (int64)m_alreadyWritten; - - if (p > m_bufferLen) { - setLength((int)(p + (int64)m_alreadyWritten)); - } - - if (p < 0) { - throw "Cannot seek more than 10 MB backwards on huge files."; - } - - m_pos = (int)p; - } - - - void writeBytes( - const void* b, - int count) { - - reserveBytes(count); - debugAssert(m_pos >= 0); - debugAssert(m_bufferLen >= count); - System::memcpy(m_buffer + m_pos, b, count); - m_pos += count; - } - - /** - Writes a signed 8-bit integer to the current position. - */ - inline void writeInt8(int8 i) { - reserveBytes(1); - m_buffer[m_pos] = *(uint8*)&i; - m_pos++; - } - - inline void writeBool8(bool b) { - writeInt8(b ? 1 : 0); - } - - inline void writeUInt8(uint8 i) { - reserveBytes(1); - m_buffer[m_pos] = i; - m_pos++; - } - - void writeUInt16(uint16 u); - - inline void writeInt16(int16 i) { - writeUInt16(*(uint16*)&i); - } - - void writeUInt32(uint32 u); - - inline void writeInt32(int32 i) { - debugAssert(m_beginEndBits == 0); - writeUInt32(*(uint32*)&i); - } - - void writeUInt64(uint64 u); - - inline void writeInt64(int64 i) { - writeUInt64(*(uint64*)&i); - } - - inline void writeFloat32(float32 f) { - debugAssert(m_beginEndBits == 0); - union { - float32 a; - uint32 b; - }; - a = f; - writeUInt32(b); - } - - inline void writeFloat64(float64 f) { - union { - float64 a; - uint64 b; - }; - a = f; - writeUInt64(b); - } - - /** - Write a string with NULL termination. - */ - inline void writeString(const std::string& s) { - writeString(s.c_str()); - } - - void writeString(const char* s); - - /** - Write a string, ensuring that the total length - including NULL is even. - */ - void writeStringEven(const std::string& s) { - writeStringEven(s.c_str()); - } - - void writeStringEven(const char* s); - - - void writeString32(const char* s); - - /** - Write a string with a 32-bit length field in front - of it. - */ - void writeString32(const std::string& s) { - writeString32(s.c_str()); - } - - void writeVector4(const Vector4& v); - - void writeVector3(const Vector3& v); - - void writeVector2(const Vector2& v); - - void writeColor4(const Color4& v); - - void writeColor3(const Color3& v); - - /** - Skips ahead n bytes. - */ - inline void skip(int n) { - if (m_pos + n > m_bufferLen) { - setLength((int)m_pos + (int)m_alreadyWritten + n); - } - m_pos += n; - } - - /** Call before a series of BinaryOutput::writeBits calls. Only writeBits - can be called between beginBits and endBits without corrupting the stream.*/ - void beginBits(); - - /** Write numBits from bitString to the output stream. Bits are numbered from - low to high. - - Can only be - called between beginBits and endBits. Bits written are semantically - little-endian, regardless of the actual endian-ness of the system. That is, - writeBits(0xABCD, 16) writes 0xCD to the first byte and - 0xAB to the second byte. However, if used with BinaryInput::readBits, the ordering - is transparent to the caller. - */ - void writeBits(uint32 bitString, int numBits); - - /** Call after a series of BinaryOutput::writeBits calls. This will - finish out with zeros the last byte into which bits were written.*/ - void endBits(); - - -# define DECLARE_WRITER(ucase, lcase)\ - void write##ucase(const lcase* out, int n);\ - void write##ucase(const std::vector& out, int n);\ - void write##ucase(const Array& out, int n); - - DECLARE_WRITER(Bool8, bool) - DECLARE_WRITER(UInt8, uint8) - DECLARE_WRITER(Int8, int8) - DECLARE_WRITER(UInt16, uint16) - DECLARE_WRITER(Int16, int16) - DECLARE_WRITER(UInt32, uint32) - DECLARE_WRITER(Int32, int32) - DECLARE_WRITER(UInt64, uint64) - DECLARE_WRITER(Int64, int64) - DECLARE_WRITER(Float32, float32) - DECLARE_WRITER(Float64, float64) -# undef DECLARE_WRITER - -}; - -} - -#ifdef _MSC_VER -# pragma warning (pop) -#endif - -#endif diff --git a/externals/g3dlite/G3D.lib/include/G3D/BoundsTrait.h b/externals/g3dlite/G3D.lib/include/G3D/BoundsTrait.h deleted file mode 100644 index 31525dab73b..00000000000 --- a/externals/g3dlite/G3D.lib/include/G3D/BoundsTrait.h +++ /dev/null @@ -1,20 +0,0 @@ -/** - @file BoundsTrait.h - - @maintainer Morgan McGuire, morgan@cs.williams.edu - @created 2008-10-01 - @edited 2008-10-01 - Copyright 2000-2008, Morgan McGuire. - All rights reserved. - */ - -#ifndef G3D_BOUNDSTRAIT_H -#define G3D_BOUNDSTRAIT_H - -#include "G3D/platform.h" - -template -struct BoundsTrait{}; - -#endif - diff --git a/externals/g3dlite/G3D.lib/include/G3D/Box.h b/externals/g3dlite/G3D.lib/include/G3D/Box.h deleted file mode 100644 index 83e06a2f069..00000000000 --- a/externals/g3dlite/G3D.lib/include/G3D/Box.h +++ /dev/null @@ -1,193 +0,0 @@ -/** - @file Box.h - - Box class - - @maintainer Morgan McGuire, matrix@graphics3d.com - - @cite Portions based on Dave Eberly's Magic Software Library at http://www.magic-software.com - @created 2001-06-02 - @edited 2007-06-05 - - Copyright 2000-2006, Morgan McGuire. - All rights reserved. - */ - -#ifndef G3D_BOX_H -#define G3D_BOX_H - -#include "G3D/platform.h" -#include "G3D/Vector3.h" -#include "G3D/Array.h" -#include "G3D/Plane.h" - -namespace G3D { - -class CoordinateFrame; - -/** - An arbitrary 3D box, useful as a bounding box. - - - To construct a box from a coordinate frame, center and extent, use the idiom: - - Box box = cframe.toObjectSpace(Box(center - extent/2, center + extent/2)); - */ -class Box { -private: - - static int32 dummy; - - friend class CoordinateFrame; - - /** - 
-       3    2       7    6
-    
-       0    1       4    5
-
-       front    back (seen through front)
-
- */ - Vector3 _corner[8]; - - /** - Unit axes. - */ - Vector3 _axis[3]; - - Vector3 _center; - - /** - Extent along each axis. - */ - Vector3 _extent; - - float _area; - float _volume; - - void init( - const Vector3& min, - const Vector3& max); - -public: - - /** - Does not initialize the fields. - */ - Box(); - - /** - Constructs a box from two opposite corners. - */ - Box( - const Vector3& min, - const Vector3& max); - - static Box inf(); - - Box(class BinaryInput& b); - - Box(const class AABox& b); - - void serialize(class BinaryOutput& b) const; - void deserialize(class BinaryInput& b); - - /** - Returns the object to world transformation for - this box. localFrame().worldToObject(...) takes - objects into the space where the box axes are - (1,0,0), (0,1,0), (0,0,1). Note that there - is no scaling in this transformation. - */ - CoordinateFrame localFrame() const; - - void getLocalFrame(CoordinateFrame& frame) const; - - /** - Returns the centroid of the box. - */ - inline Vector3 center() const { - return _center; - } - - - inline Vector3 corner(int i) const { - debugAssert(i < 8); - return _corner[i]; - } - - /** - Unit length. - */ - inline Vector3 axis(int a) const { - debugAssert(a < 3); - return _axis[a]; - } - - /** - Distance from corner(0) to the next corner - along the box's local axis a. - */ - inline float extent(int a) const { - debugAssert(a < 3); - return (float)_extent[a]; - } - - inline Vector3 extent() const { - return _extent; - } - - /** - Returns the four corners of a face (0 <= f < 6). - The corners are returned to form a counter clockwise quad facing outwards. - */ - void getFaceCorners( - int f, - Vector3& v0, - Vector3& v1, - Vector3& v2, - Vector3& v3) const; - - - /** - See AABox::culledBy - */ - bool culledBy( - const Array& plane, - int32& cullingPlaneIndex, - const uint32 testMask, - uint32& childMask) const; - - /** - Conservative culling test that does not produce a mask for children. - */ - bool culledBy( - const Array& plane, - int32& cullingPlaneIndex = dummy, - const uint32 testMask = -1) const; - - bool contains( - const Vector3& point) const; - - float area() const; - - float volume() const; - - void getRandomSurfacePoint(Vector3& P, Vector3& N = Vector3::dummy) const; - - /** - Uniformly distributed on the interior (includes surface) - */ - Vector3 randomInteriorPoint() const; - - void getBounds(class AABox&) const; - - bool isFinite() const { - return G3D::isFinite(_volume); - } -}; - -} - -#endif diff --git a/externals/g3dlite/G3D.lib/include/G3D/Capsule.h b/externals/g3dlite/G3D.lib/include/G3D/Capsule.h deleted file mode 100644 index 237dcdab69d..00000000000 --- a/externals/g3dlite/G3D.lib/include/G3D/Capsule.h +++ /dev/null @@ -1,90 +0,0 @@ -/** - @file Capsule.h - - @maintainer Morgan McGuire, matrix@graphics3d.com - - @created 2003-02-07 - @edited 2005-08-20 - - Copyright 2000-2006, Morgan McGuire. - All rights reserved. - */ - -#ifndef G3D_CAPSULE_H -#define G3D_CAPSULE_H - -#include "G3D/platform.h" -#include "G3D/g3dmath.h" -#include "G3D/Vector3.h" - -namespace G3D { - -class Line; -class AABox; -/** - A shape formed by extruding a sphere along a line segment. - */ -class Capsule { -private: - Vector3 p1; - Vector3 p2; - - float _radius; -public: - - - /** Uninitialized */ - Capsule(); - Capsule(class BinaryInput& b); - Capsule(const Vector3& _p1, const Vector3& _p2, float _r); - void serialize(class BinaryOutput& b) const; - void deserialize(class BinaryInput& b); - - /** The line down the center of the capsule */ - Line axis() const; - - inline float radius() const { - return _radius; - } - - /** Argument may be 0 or 1 */ - inline Vector3 point(int i) const { - debugAssert(i == 0 || i == 1); - return (i == 0) ? p1 : p2; - } - - /** Distance between the sphere centers. The total extent of the cylinder is - 2r + h. */ - inline float height() const { - return (p1 - p2).magnitude(); - } - - inline Vector3 center() const { - return (p1 + p2) / 2.0; - } - - /** Get a reference frame in which the center of mass is the origin and Y is the axis of the capsule.*/ - void getReferenceFrame(class CoordinateFrame& cframe) const; - - /** - Returns true if the point is inside the capsule or on its surface. - */ - bool contains(const Vector3& p) const; - - float volume() const; - - float area() const; - - /** Get axis aligned bounding box */ - void getBounds(AABox& out) const; - - /** Random world space point with outward facing normal. */ - void getRandomSurfacePoint(Vector3& P, Vector3& N) const; - - /** Point selected uniformly at random over the volume. */ - Vector3 randomInteriorPoint() const; -}; - -} // namespace - -#endif diff --git a/externals/g3dlite/G3D.lib/include/G3D/CollisionDetection.h b/externals/g3dlite/G3D.lib/include/G3D/CollisionDetection.h deleted file mode 100644 index 62f92c18d33..00000000000 --- a/externals/g3dlite/G3D.lib/include/G3D/CollisionDetection.h +++ /dev/null @@ -1,1178 +0,0 @@ -/** - @file CollisionDetection.h - - - Moving collision detection for simple primitives. - - @author Morgan McGuire, matrix@graphics3d.com - @cite Spherical collision based on Paul Nettle's - ftp://ftp.3dmaileffects.com/pub/FluidStudios/CollisionDetection/Fluid_Studios_Generic_Collision_Detection_for_Games_Using_Ellipsoids.pdf - and comments by Max McGuire. Ray-sphere intersection by Eric Haines. - Box-Box intersection written by Kevin Egan. - Thanks to Max McGuire of Iron Lore for various bug fixes. - - @created 2001-11-19 - @edited 2006-01-10 - - Copyright 2000-2006, Morgan McGuire. - All rights reserved. - */ - -#ifndef G3D_COLLISIONDETECTION_H -#define G3D_COLLISIONDETECTION_H - -#include "G3D/platform.h" -#include "G3D/Vector3.h" -#include "G3D/Plane.h" -#include "G3D/Box.h" -#include "G3D/Triangle.h" -#include "G3D/Array.h" -#include "G3D/Ray.h" -#include "G3D/Line.h" - -namespace G3D { - - -/** - Collision detection primitives and tools for building - higher order collision detection schemes. - - These routines provide moving and static collision detection. - Moving collision detection allows the calculation of collisions that - occur during a period of time -- as opposed to the intersection of - two static bodies. - - Moving collision detection routines detect collisions between - only static primitives and moving spheres or points. Since the - reference frame can be user defined, these functions can be used to - detect the collision between two moving bodies by subtracting - the velocity vector of one object from the velocity vector of the - sphere or point the detection is to occur with. This unified - velocity vector will act as if both objects are moving simultaneously. - - Collisions are detected for single-sided objects only. That is, - no collision is detected when leaving a primitive or passing - through a plane or triangle opposite the normal... except for the - point-sphere calculation or when otherwise noted. - - For a sphere, the collision location returned is the point in world - space where the surface of the sphere and the fixed object meet. - It is not the position of the center of the sphere at - the time of the collision. - - The collision normal returned is the surface normal to the fixed - object at the collision location. - -

- Static Collision Detection: (Neither object is moving) - - - - - - - - - - - - - - -
Vector3LineSegmentRay *LinePlaneTriangleSphereCylinderCapsuleAABoxBox
Vector3Vector3::operator== Vector3::fuzzyEq G3D::distance
LineSegmentLineSegment::closestPoint LineSegment::distance CollisionDetection::closestPointOnLineSegment
Ray *Ray::closestPoint Ray::distance
LineLine::closestPoint Line::distanceCollisionDetection::closestPointsBetweenLineAndLine
Plane
Triangle
SphereSphere::contains
CylinderCylinder::contains
CapsuleCapsule::contains
AABoxAABox::contains
BoxBox::contains(treat as Ray)CollisionDetection::collisionTimeForMovingPointFixedBox(treat as Ray)CollisionDetection::penetrationDepthForFixedBoxFixedPlaneCollisionDetection::penetrationDepthForFixedBoxFixedPlaneCollisionDetection::penetrationDepthForFixedSphereFixedBoxNone (use OPCODE)CollisionDetection::movingSpherePassesThroughFixedBoxCollisionDetection::penetrationDepthForFixedBoxFixedBoxCollisionDetection::penetrationDepthForFixedBoxFixedBox
- -

- Moving Collision Detection: - - * Note: Moving collision detection against certain primitives is equivalent to static collision - detection against a bigger primitive. Ray, Line Segment == ``moving Point''; Capsule ==``moving Sphere''; Plane == ``moving Line'' - */ -class CollisionDetection { -private: - - /** - Default parameter if value passed to a function as reference is - not to be calculated. Must be explicitly supported by function. - */ - static Vector3 ignore; - - /** - Default parameter if value passed to a function as reference is - not to be calculated. Must be explicitly supported by function. - */ - static bool ignoreBool; - - /** - Default parameter if value passed to a function as reference is - not to be calculated. Must be explicitly supported by function. - */ - static Array ignoreArray; - - - // Static class! - CollisionDetection() {} - virtual ~CollisionDetection() {} - -public: - - /** - Converts an index [0, 15] to the corresponding separating axis. - Does not return normalized vector in the edge-edge case - (indices 6 through 15). - - @param separatingAxisIndex Separating axis. - @param box1 Box 1. - @param box2 Box 2. - - @return Axis that separates the two boxes. - */ - static Vector3 separatingAxisForSolidBoxSolidBox( - const int separatingAxisIndex, - const Box & box1, - const Box & box2); - - /** - Tests whether two boxes have axes that are parallel to - each other. If they are, axis1 and axis2 are set to be - the parallel axes for both box1 and box2 respectively. - - @param ca Dot products of each of the boxes axes - @param epsilon Fudge factor (small unit by which the dot - products may vary and still be considered - zero). - @param axis1 Parallel Axis 1. [Post Condition] - @param axis2 Parallel Axis 2. [Post Condition] - - @return true - If boxes have a parallel axis - @return false - otherwise. - */ - static bool parallelAxisForSolidBoxSolidBox( - const double* ca, - const double epsilon, - int & axis1, - int & axis2); - - /** - Calculates the projected distance between the two boxes along - the specified separating axis, negative distances correspond - to an overlap along that separating axis. The distance is not - divided by denominator dot(L, L), see - penetrationDepthForFixedSphereFixedBox() for more details - - @param separatingAxisIndex - @param a Box 1's bounding sphere vector - @param b Box 2's bounding sphere vector - @param D Vector between Box 1 and Box 2's center points - @param c Pointer to array of dot products of the axes of Box 1 - and Box 2. - @param ca Pointer to array of unsigned dot products of the axes - of Box 1 and Box 2. - @param ad Pointer to array of dot products of Box 1 axes and D. - @param bd Pointer to array of dot products of Box 2 axes and D. - - @return Projected distance between the two boxes along the - specified separating axis. - */ - static float projectedDistanceForSolidBoxSolidBox( - const int separatingAxisIndex, - const Vector3 & a, - const Vector3 & b, - const Vector3 & D, - const double* c, - const double* ca, - const double* ad, - const double* bd); - - - /** - Creates a set of standard information about two boxes in order to - solve for their collision. This information includes a vector to - the radius of the bounding sphere for each box, the vector between - each boxes' center and a series of dot products between differing - important vectors. These dot products include those between the axes - of both boxes (signed and unsigned values), and the dot products - between all the axes of box1 and the boxes' center vector and box2 - and the boxes' center vector. - - @pre The following space requirements must be met: - - c[] 9 elements - - ca[] 9 elements - - ad[] 3 elements - - bd[] 3 elements - - @cite dobted from David Eberly's papers, variables used in this function - correspond to variables used in pages 6 and 7 in the pdf - http://www.magic-software.com/Intersection.html - http://www.magic-software.com/Documentation/DynamicCollisionDetection.pdf - - @note Links are out-dated. (Kept to preserve origin and authorship) - - @param box1 Box 1 - @param box2 Box 2 - @param a Box 1's bounding sphere vector - @param b Box 2's bounding sphere vector - @param D Vector between Box 1 and Box 2's center points - @param c Pointer to array of dot products of the axes of Box 1 - and Box 2. - @param ca Pointer to array of unsigned dot products of the axes - of Box 1 and Box 2. - @param ad Pointer to array of dot products of Box 1 axes and D. - @param bd Pointer to array of dot products of Box 2 axes and D. - */ - static void fillSolidBoxSolidBoxInfo( - const Box & box1, - const Box & box2, - Vector3 & a, - Vector3 & b, - Vector3 & D, - double* c, - double* ca, - double* ad, - double* bd); - - /** - Performs a simple bounding sphere check between two boxes to determine - whether these boxes could possibly intersect. This is a very - cheap operation (three dot products, two sqrts and a few others). If - it returns true, an intersection is possible, but not necessarily - guaranteed. - - @param a Vector from box A's center to an outer vertex - @param b Vector from box B's center to an outer vertex - @param D Distance between the centers of the two boxes - - @return true - if possible intersection - @return false - otherwise (This does not guarantee an intersection) - */ - static bool conservativeBoxBoxTest( - const Vector3 & a, - const Vector3 & b, - const Vector3 & D); - - /** - Determines whether two fixed solid boxes intersect. - - @note To speed up collision detection, the lastSeparatingAxis from - the previous time step can be passed in and that plane can be - checked first. If the separating axis was not saved, or if the - two boxes intersected then lastSeparatingAxis should equal -1. - - @cite Adobted from David Eberly's papers, variables used in this function - correspond to variables used in pages 6 and 7 in the pdf - http://www.magic-software.com/Intersection.html - http://www.magic-software.com/Documentation/DynamicCollisionDetection.pdf - - @param box1 Box 1. - @param box2 Box 2. - @param lastSeparatingAxis Last separating axis. - (optimization - see note) - - @return true - Intersection. - @return false - otherwise. - */ - static bool fixedSolidBoxIntersectsFixedSolidBox( - const Box& box1, - const Box& box2, - const int lastSeparatingAxis = -1); - - /** - Calculates the closest points on two lines with each other. If the - lines are parallel then using the starting point, else calculate the - closest point on each line to the other. - - @note This is very similiar to calculating the intersection of two lines. - Logically then, the two points calculated would be identical if calculated - with inifinite precision, but with the finite precision of floating point - calculations, these values could (will) differ as the line slope approaches - zero or inifinity. - - @cite variables and algorithm based on derivation at the following website: - http://softsurfer.com/Archive/algorithm_0106/algorithm_0106.htm - - @param line1 Line 1. - @param line2 Line 2. - @param closest1 Closest point on line 1. - @param closest2 Closest point on line 2. - */ - static void closestPointsBetweenLineAndLine( - const Line & line1, - const Line & line2, - Vector3 & closest1, - Vector3 & closest2); - - /** - Calculates the depth of penetration between two fixed boxes. - Contact normal faces away from box1 and into box2. If there is - contact, only one contact point is returned. The minimally - violated separating plane is computed - - if the separating axis corresponds to a face - the contact point is half way between the deepest vertex - and the face - - if the separating axis corresponds to two edges - the contact point is the midpoint of the smallest line - segment between the two edge lines - - @note This is very similiar to calculating the intersection of two lines. - Logically then, the two points calculated would be identical if calculated - with inifinite precision, but with the finite precision of floating point - calculations, these values could (will) differ as the line slope approaches - zero or inifinity. - - @cite adobted from David Eberly's papers, variables used in this function - correspond to variables used in pages 6 and 7 in the pdf - http://www.magic-software.com/Intersection.html - http://www.magic-software.com/Documentation/DynamicCollisionDetection.pdf - - @param box1 Box 1 - @param box2 Box 2 - @param contactPoints Contact point between boxes. [Post Condition] - @param contactNormals Surface normal at contact point. [Post Condition] - @param lastSeparatingAxis Last separating axis. (Used for optimization) - - @return Depth of penetration between the two boxes. If there is no - intersection between the boxes, then a negative value is returned. - */ - static float penetrationDepthForFixedBoxFixedBox( - const Box& box1, - const Box& box2, - Array& contactPoints, - Array& contactNormals, - const int lastSeparatingAxis = -1); - - /** - Calculates the depth of penetration between two fixed spheres as well - as the deepest point of Sphere A that penetrates Sphere B. The normal - returned points away from the object A, although it may - represent a perpendicular to either the faces of object B or object A - depending on their relative orientations. - - @param sphereA Fixed Sphere A. - @param sphereB Fixed Sphere B. - @param contactPoints Sphere A's deepest point that penetrates Sphere B. - [Post Condition] - @param contactNormals Normal at penetration point. [Post Condition] - - @return Depth of penetration. If there is no intersection between the - objects then the depth will be a negative value. - */ - static float penetrationDepthForFixedSphereFixedSphere( - const class Sphere& sphereA, - const Sphere& sphereB, - Array& contactPoints, - Array& contactNormals = ignoreArray); - - /** - Calculates the depth of penetration between a fixed sphere and a fixed - box as well as the deepest point of the sphere that penetrates the box - and the normal at that intersection. - - @note There are three possible intersections between a sphere and box. - - Sphere completely contained in the box - - Sphere intersects one edge - - Sphere intersects one vertex - - The contact point and contact normal vary for each of these situations. - - Sphere contained in Box: - - Normal is based on side of least penetration (as is the depth calculation). - - Point is based on center of sphere - - Sphere intersects one edge - - Normal is based on vector from the box center to the point of depth. - - Point is closest point to the sphere on the line - - Sphere intersects one vertex - - Normal is based on vector from the box center to the vertex of penetration. - - Point is vertex of penetration. - - @cite Adapted from Jim Arvo's method in Graphics Gems - See also http://www.win.tue.nl/~gino/solid/gdc2001depth.pdf - - @param sphere Fixed Sphere. - @param box Fixed Box. - @param contactPoints Sphere point that penetrates the box. [Post Condition] - @param contactNormals Normal at the penetration point. [Post Condition] - - @return Depth of penetration. If there is no intersection between the - objects then the depth will be a negative value. - */ - static float penetrationDepthForFixedSphereFixedBox( - const Sphere& sphere, - const Box& box, - Array& contactPoints, - Array& contactNormals = ignoreArray); - - /** - Calculates the depth of penetration between a Fixed Sphere and a Fixed - Plane as well as the deepest point of the sphere that penetrates the plane - and the plane normal at that intersection. - - @param sphere Fixed Sphere. - @param plane Fixed Plane. - @param contactPoints Sphere point that penetrates the plane. - [Post Condition] - @param contactNormals Normal at penetration point. [Post Condition] - - @return Depth of penetration. If there is no intersection between the - objects then the depth will be a negative value. - */ - static float penetrationDepthForFixedSphereFixedPlane( - const Sphere& sphereA, - const class Plane& planeB, - Array& contactPoints, - Array& contactNormals = ignoreArray); - - /** - Calculates the depth of penetration between a fixed box and a fixed - plane as well as the vertexes of the box that penetrate the plane - and the plane normals at those intersections. - - @param box Fixed Box. - @param plane Fixed Plane. - @param contactPoints Box points that penetrate the plane. - [Post Condition] - @param contactNormals Normals at penetration points [Post Condition] - - @return Depth of penetration. If there is no intersection between the - objects then the depth will be a negative value. - */ - static float penetrationDepthForFixedBoxFixedPlane( - const Box& box, - const Plane& plane, - Array& contactPoints, - Array& contactNormals = ignoreArray); - - /** - Calculates time between the intersection of a moving point and a fixed - plane. - - @note This is only a one sided collision test. The side defined by - the plane's surface normal is the only one tested. For a two sided - collision, call the function once for each side's surface normal. - - @param point Moving point. - @param velocity Point's velocity. - @param plane Fixed plane. - @param location Location of collision. [Post Condition] - (Infinite vector on no collision) - @param outNormal Plane's surface normal. [Post Condition] - - @return Time til collision. If there is no collision then the return - value will be inf(). - */ - static float collisionTimeForMovingPointFixedPlane( - const Vector3& point, - const Vector3& velocity, - const class Plane& plane, - Vector3& outLocation, - Vector3& outNormal = ignore); - - /** - Calculates time between the intersection of a moving point and a fixed - triangle. - - @note This is only a one sided collision test. The side defined by - the triangle's surface normal is the only one tested. For a two sided - collision, call the function once for each side's surface normal. - - @param orig Moving point. - @param dir Point's velocity. - @param v0 Triangle vertex 1. - @param v1 Triangle vertex 2. - @param v2 Triangle vertex 3 - @param location Location of collision. [Post Condition] - (Infinite vector on no collision) - - @return Time til collision. If there is no collision then the return - value will be inf(). - */ - inline static float collisionTimeForMovingPointFixedTriangle( - const Vector3& orig, - const Vector3& dir, - const Vector3& v0, - const Vector3& v1, - const Vector3& v2) { - return Ray::fromOriginAndDirection(orig, dir).intersectionTime(v0, v1, v2); - } - - /** - Calculates time between the intersection of a moving point and a fixed - triangle. - - @note This is only a one sided collision test. The side defined by - the triangle's surface normal is the only one tested. For a two sided - collision, call the function once for each side's surface normal. - - @param orig Moving point. - @param dir Point's velocity. - @param v0 Triangle vertex 1. - @param v1 Triangle vertex 2. - @param v2 Triangle vertex 3 - @param location Location of collision. [Post Condition] - (Infinite vector on no collision) - - @return Time til collision. If there is no collision then the return - value will be inf(). - */ - inline static float collisionTimeForMovingPointFixedTriangle( - const Vector3& orig, - const Vector3& dir, - const Vector3& v0, - const Vector3& v1, - const Vector3& v2, - Vector3& location) { - float t = collisionTimeForMovingPointFixedTriangle(orig, dir, v0, v1, v2); - if (t < inf()) { - location = orig + dir * t; - } - return t; - } - - /** - Calculates time between the intersection of a moving point and a fixed - triangle. - - @note This is only a one sided collision test. The side defined by - the triangle's surface normal is the only one tested. For a two sided - collision, call the function once for each side's surface normal. - - @param orig Moving point. - @param dir Point's velocity. - @param tri Fixed triangle. - @param location Location of collision. [Post Condition] - (Infinite vector on no collision) - @param normal Triangle's surface normal. [Post Condition] - - @return Time til collision. If there is no collision then the return - value will be inf(). - */ - inline static float collisionTimeForMovingPointFixedTriangle( - const Vector3& orig, - const Vector3& dir, - const Triangle& tri, - Vector3& location = ignore, - Vector3& normal = ignore) { - - float t = collisionTimeForMovingPointFixedTriangle( - orig, dir, tri.vertex(0), tri.vertex(1), tri.vertex(2)); - - if ((t < inf()) && (&location != &ignore)) { - location = orig + dir * t; - normal = tri.normal(); - } - return t; - } - - /** - Calculates time between the intersection of a moving point and a fixed - triangle. - - @note This is only a one sided collision test. The side defined by - the triangle's surface normal is the only one tested. For a two sided - collision, call the function once for each side's surface normal. - - @param orig Moving point. - @param dir Point's velocity. - @param v0 Triangle vertex 1. - @param v1 Triangle vertex 2. - @param v2 Triangle vertex 3 - @param location Location of collision. [Post Condition] - (Infinite vector on no collision) - @param normal Triangle's surface normal. [Post Condition] - - @return Time til collision. If there is no collision then the return - value will be inf(). - */ - inline static float collisionTimeForMovingPointFixedTriangle( - const Vector3& orig, - const Vector3& dir, - const Vector3& v0, - const Vector3& v1, - const Vector3& v2, - Vector3& location, - Vector3& normal) { - float t = collisionTimeForMovingPointFixedTriangle(orig, dir, v0, v1, v2); - if (t < inf()) { - location = orig + dir * t; - normal = (v2 - v0).cross(v1 - v0).direction(); - } - return t; - } - - /** - Unlike other methods, does not support an output normal. - If the ray origin is inside the box, returns inf() but inside - is set to true. - Beta API - - @cite Andrew Woo, from "Graphics Gems", Academic Press, 1990 - @cite Optimized code by Pierre Terdiman, 2000 (~20-30% faster on my Celeron 500) - @cite Epsilon value added by Klaus Hartmann - @cite http://www.codercorner.com/RayAABB.cpp - */ - static float collisionTimeForMovingPointFixedAABox( - const Vector3& point, - const Vector3& velocity, - const class AABox& box, - Vector3& outLocation, - bool& inside = ignoreBool, - Vector3& outNormal = ignore); - - /** - Calculates time between the intersection of a moving point and a fixed - Axis-Aligned Box (AABox). - - @note Avoids the sqrt from collisionTimeForMovingPointFixedAABox. - - @param point Moving point. - @param velocity Sphere's velocity. - @param box Fixed AAbox. - @param location Location of collision. [Post Condition] - @param Inside Does the ray originate inside the box? [Post Condition] - @param normal Box's surface normal to collision [Post Condition] - - @return Time til collision. If there is no collision then the return - value will be inf(). - */ - static bool collisionLocationForMovingPointFixedAABox( - const Vector3& point, - const Vector3& velocity, - const class AABox& box, - Vector3& outLocation, - bool& inside = ignoreBool, - Vector3& normal = ignore); - - /** - Calculates time between the intersection of a moving point and a fixed - sphere. - - @note When ray is starts inside the rectangle, the exiting intersection - is detected. - - @param point Moving point. - @param velocity Point's velocity. - @param Sphere Fixed Sphere. - @param location Location of collision. [Post Condition] - @param outNormal Sphere's surface normal to collision [Post Condition] - - @return Time til collision. If there is no collision then the return - value will be inf(). - */ - static float collisionTimeForMovingPointFixedSphere( - const Vector3& point, - const Vector3& velocity, - const class Sphere& sphere, - Vector3& outLocation, - Vector3& outNormal = ignore); - - /** - Calculates time between the intersection of a moving point and a fixed - box. - - @note If the point is already inside the box, no collision: inf is returned. - - @param point Moving point. - @param velocity Sphere's velocity. - @param box Fixed box. - @param location Position of collision. [Post Condition] - @param outNormal Box's surface normal to collision [Post Condition] - - @return Time til collision. If there is no collision then the return - value will be inf(). - */ - static float collisionTimeForMovingPointFixedBox( - const Vector3& point, - const Vector3& velocity, - const class Box& box, - Vector3& outLocation, - Vector3& outNormal = ignore); - - /** - Calculates time between the intersection of a moving point and a fixed - rectangle defined by the points v0, v1, v2, & v3. - - @note This is only a one sided collision test. The side defined by - the rectangle's surface normal is the only one tested. For a two sided - collision, call the function once for each side's surface normal. - - @param point Moving point. - @param velocity Sphere's velocity. - @param v0 Rectangle vertex 1. - @param v1 Rectangle vertex 2. - @param v2 Rectangle vertex 3 - @param v3 Rectangle vertex 4. - @param location Location of collision [Post Condition] - @param outNormal Rectangle's surface normal. [Post Condition] - - @return Time til collision. If there is no collision then the return - value will be inf(). - */ - static float collisionTimeForMovingPointFixedRectangle( - const Vector3& point, - const Vector3& velocity, - const Vector3& v0, - const Vector3& v1, - const Vector3& v2, - const Vector3& v3, - Vector3& outLocation, - Vector3& outNormal = ignore); - - /** - Calculates time between the intersection of a moving point and a fixed - capsule. - - @param point Moving point. - @param velocity Point's velocity. - @param capsule Fixed capsule. - @param location Location of collision. [Post Condition] - @param outNormal Capsule's surface normal to collision [Post Condition] - - @return Time til collision. If there is no collision then the return - value will be inf(). - */ - static float collisionTimeForMovingPointFixedCapsule( - const Vector3& point, - const Vector3& velocity, - const class Capsule& capsule, - Vector3& outLocation, - Vector3& outNormal = ignore); - - /** - Calculates time between the intersection of a moving sphere and a fixed - triangle. - - @param sphere Moving sphere. - @param velocity Sphere's velocity. - @param plane Fixed Plane. - @param location Location of collision -- not center position of sphere - at the collision time. [Post Condition] - @param outNormal Box's surface normal to collision [Post Condition] - - @return Time til collision. If there is no collision then the return - value will be inf(). - */ - static float collisionTimeForMovingSphereFixedPlane( - const class Sphere& sphere, - const Vector3& velocity, - const class Plane& plane, - Vector3& outLocation, - Vector3& outNormal = ignore); - - /** - Calculates time between the intersection of a moving sphere and a fixed - triangle. - - @param sphere Moving sphere. - @param velocity Sphere's velocity. - @param triangle Fixed Triangle. (collisions can happen on the back side of the triangle) - @param outLocation Location of collision, if collision occurs -- not center position of sphere - at the collision time. If there is interpenetration at the start, this point may be inside - the sphere. - @param b Barycentric coordinates. These are not valid unless collision occurs. - - @return Time til collision. If there is no collision then the return - value will be inf(). - */ - static float collisionTimeForMovingSphereFixedTriangle( - const class Sphere& sphere, - const Vector3& velocity, - const Triangle& triangle, - Vector3& outLocation, - float b[3] = (float*)&ignore); - - /** - Calculates time between the intersection of a moving sphere and a fixed - rectangle defined by the points v0, v1, v2, & v3. - - @param sphere Moving sphere. - @param velocity Sphere's velocity. - @param v0 Rectangle vertex 1. - @param v1 Rectangle vertex 2. - @param v2 Rectangle vertex 3 - @param v3 Rectangle vertex 4. - @param location Location of collision -- not center position of sphere - at the collision time. [Post Condition] - @param outNormal Box's surface normal to collision [Post Condition] - - @return Time til collision. If there is no collision then the return - value will be inf(). - */ - static float collisionTimeForMovingSphereFixedRectangle( - const class Sphere& sphere, - const Vector3& velocity, - const Vector3& v0, - const Vector3& v1, - const Vector3& v2, - const Vector3& v3, - Vector3& outLocation, - Vector3& outNormal = ignore); - - /** - Calculates time between the intersection of a moving sphere and a fixed - box. - - @note This function will not detect an intersection between a moving object - that is already interpenetrating the fixed object. - - @param sphere Moving sphere. - @param velocity Sphere's velocity. - @param box Fixed box. - @param location Location of collision -- not center position of sphere - at the collision time. [Post Condition] - @param outNormal Box's surface normal to collision [Post Condition] - - @return Time til collision. If there is no collision then the return - value will be inf(). - */ - static float collisionTimeForMovingSphereFixedBox( - const class Sphere& sphere, - const Vector3& velocity, - const class Box& box, - Vector3& outLocation, - Vector3& outNormal = ignore); - - /** - Calculates time between the intersection of a moving sphere and a fixed - sphere. - - @note This won't detect a collision if the sphere is already interpenetrating - the fixed sphere. - - @param movingSphere Moving sphere. - @param velocity Sphere's velocity. - @param fixedSphere Fixed Sphere. - @param location Location of collision -- not center position of sphere - at the collision time. [Post Condition] - @param outNormal Sphere's surface normal to collision [Post Condition] - - @return Time til collision. If there is no collision then the return - value will be inf(). - */ - static float collisionTimeForMovingSphereFixedSphere( - const class Sphere& sphere, - const Vector3& velocity, - const class Sphere& fixedSphere, - Vector3& outLocation, - Vector3& outNormal = ignore); - - /** - Calculates time between the intersection of a moving sphere and a fixed - capsule. - - @note This won't detect a collision if the sphere is already - interpenetrating the capsule. - - @param sphere Moving sphere. - @param velocity Sphere's velocity. - @param capsule Fixed capsule. - @param location Location of collision -- not center position of sphere - at the collision time. [Post Condition] - @param outNormal Capsule's surface normal to the collision [Post Condition] - - @return Time til collision. If there is no collision then the return - value will be inf(). - */ - static float collisionTimeForMovingSphereFixedCapsule( - const class Sphere& sphere, - const Vector3& velocity, - const class Capsule& capsule, - Vector3& outLocation, - Vector3& outNormal = ignore); - - /** - Finds the direction of bounce that a sphere would have when it - intersects an object with the given time of collision, the - collision location and the collision normal. - - @note This function works like a pong style ball bounce. - - @param sphere Moving sphere. - @param velocity Sphere's velocity. - @param collisionTime Time of collision. - @param collisionLocation Collision location. - @param collisionNormal Surface collision normal. - - @return Direction of bounce. - */ - static Vector3 bounceDirection( - const class Sphere& sphere, - const Vector3& velocity, - const float collisionTime, - const Vector3& collisionLocation, - const Vector3& collisionNormal); - - /** - Finds the direction of slide given a moving sphere, its velocity, the - time of collision and the collision location. This function works as - if the sphere intersects the surface and continues to hug it. - - @note The result will work well for calculating the movement of a player - who collides with an object and continues moving along the object instead - of just bouncing off it. - - @param sphere Moving sphere. - @param velocity Sphere's velocity. - @param collisionTime Time of collision - @param collisionLocation Collision location. - - @return Direction of slide. - */ - static Vector3 slideDirection( - const class Sphere& sphere, - const Vector3& velocity, - const float collisionTime, - const Vector3& collisionLocation); - - /** - Finds the closest point on a line segment to a given point. - - @param v0 line vertex 1. - @param v1 line vertex 2. - @param point External point. - - @return Closests point to point on the line segment. - */ - static Vector3 closestPointOnLineSegment( - const Vector3& v0, - const Vector3& v1, - const Vector3& point); - - /** - Finds the closest point on a line segment to a given point. - - @note This is an optimization to closestPointOnLineSegment. Edge length - and direction can be used in this function if already pre-calculated. This - prevents doing the same work twice. - - @param v0 line vertex 0. - @param v1 line vertex 1. - @param edgeDirection The direction of the segment (unit length). - @param edgeLength The length of the segment. - @param point External point. - - @return Closests point to point on the line segment. - */ - static Vector3 closestPointOnLineSegment( - const Vector3& v0, - const Vector3& v1, - const Vector3& edgeDirection, - float edgeLength, - const Vector3& point); - - /** - Finds the closest point on the perimeter of the triangle to an external point; - given a triangle defined by three points v0, v1, & v2, and the external point. - - @param v0 Triangle vertex 0. - @param v1 Triangle vertex 1. - @param v2 Triangle vertex 2. - @param point External point. - - @return Closests point to point on the perimeter of the - triangle. - */ - static Vector3 closestPointOnTrianglePerimeter( - const Vector3& v0, - const Vector3& v1, - const Vector3& v2, - const Vector3& point); - - /** - Finds the closest point on the perimeter of the triangle to an external point; - given a triangle defined by the array of points v, its edge directions and - their lengths, as well as the external point. - - @note This is an optimization to closestPointToTrianglePerimeter. Edge length - and direction can be used in this function if already pre-calculated. This - prevents doing the same work twice. - - @param v0 Triangle vertex 0. - @param v1 Triangle vertex 1. - @param v2 Triangle vertex 2. - @param point External point. - @param edgeIndex The point lies on the edge between v[edgeIndex] and v[(edgeIndex + 1) % 3] - - @return Closests point to point on the perimeter of the - triangle. - */ - static Vector3 closestPointOnTrianglePerimeter( - const Vector3 v[3], - const Vector3 edgeDirection[3], - const float edgeLength[3], - const Vector3& point, - int& edgeIndex); - - /** - Tests whether a point is contained within the triangle defined by - v0, v1, and v2 and its plane's normal. - - @param v0 Triangle vertex 0. - @param v1 Triangle vertex 1. - @param v2 Triangle vertex 2. - @param normal Normal to triangle's plane. - @param point The point in question. - @param primaryAxis Primary axis of triangle. This will be detected - if not given. This parameter is provided as an optimization. - @param b Barycentric coordinates; b[i] is the weight on v[i] - - @return true - if point is inside the triangle. - @return false - otherwise - */ - static bool isPointInsideTriangle( - const Vector3& v0, - const Vector3& v1, - const Vector3& v2, - const Vector3& normal, - const Vector3& point, - float b[3], - Vector3::Axis primaryAxis = Vector3::DETECT_AXIS); - - inline static bool isPointInsideTriangle( - const Vector3& v0, - const Vector3& v1, - const Vector3& v2, - const Vector3& normal, - const Vector3& point, - Vector3::Axis primaryAxis = Vector3::DETECT_AXIS) { - - float b[3]; - return isPointInsideTriangle(v0, v1, v2, normal, point, b, primaryAxis); - } - - /** - Tests for the intersection of a moving sphere and a fixed box in a - given time limit. - - @note Returns true if any part of the sphere is inside the box - during the time period (inf means "ever"). Useful for - performing bounding-box collision detection. - - @param sphere Moving sphere. - @param velocity Velocity of moving sphere. - @param box Fixed box. - @param timeLimit Time limit for intersection test. - - @return true - if the two objects will touch. - @return false - if there is no intersection. - */ - static bool movingSpherePassesThroughFixedBox( - const Sphere& sphere, - const Vector3& velocity, - const Box& box, - double timeLimit = inf()); - - /** - Tests for the intersection of a moving sphere and a fixed sphere in a - given time limit. - - @note This function will not detect an intersection between a moving object - that is already interpenetrating the fixed object. - - @param sphere Moving sphere. - @param velocity Velocity of moving sphere. - @param fixedSphere Fixed sphere. - @param timeLimit Time limit for intersection test. - - @return true - if the two spheres will touch. - @return false - if there is no intersection. - */ - static bool movingSpherePassesThroughFixedSphere( - const Sphere& sphere, - const Vector3& velocity, - const Sphere& fixedSphere, - double timeLimit = inf()); - - /** - Tests for the intersection of two fixed spheres. - - @param sphere1 Fixed sphere 1. - @param sphere2 Fixed sphere 2. - - @return true - if the two spheres touch. - @return false - if there is no intersection. - */ - static bool fixedSolidSphereIntersectsFixedSolidSphere( - const Sphere& sphere1, - const Sphere& sphere2); - - /** - Tests for the intersection of a fixed sphere and a fixed box. - - @param sphere Fixed sphere. - @param box Fixed box. - - @return true - if the two objects touch. - @return false - if there is no intersection. - */ - static bool fixedSolidSphereIntersectsFixedSolidBox( - const Sphere& sphere, - const Box& box); - - static bool fixedSolidSphereIntersectsFixedTriangle( - const Sphere& sphere, - const Triangle& triangle); - - /** - Tests whether a point is inside a rectangle defined by the vertexes - v0, v1, v2, & v3, and the rectangle's plane normal. - - @param v0 Rectangle vertex 1. - @param v1 Rectangle vertex 2. - @param v2 Rectangle vertex 3. - @param v3 Rectangle vertex 4. - @param normal Normal to rectangle's plane. - @param point The point in question. - - @return true - if point is inside the rectangle. - @return false - otherwise - */ - static bool isPointInsideRectangle( - const Vector3& v0, - const Vector3& v1, - const Vector3& v2, - const Vector3& v3, - const Vector3& normal, - const Vector3& point); - - /** - Finds the closest point on the perimeter of the rectangle to an - external point; given a rectangle defined by four points v0, v1, - v2, & v3, and the external point. - - @param v0 Rectangle vertex 1. - @param v1 Rectangle vertex 2. - @param v2 Rectangle vertex 3. - @param v3 Rectangle vertex 4. - @param point External point. - - @return Closests point to point on the perimeter of the - rectangle. - */ - static Vector3 closestPointToRectanglePerimeter( - const Vector3& v0, - const Vector3& v1, - const Vector3& v2, - const Vector3& v3, - const Vector3& point); - - /** - Finds the closest point in the rectangle to an external point; Given - a rectangle defined by four points v0, v1, v2, & v3, and the external - point. - - @param v0 Rectangle vertex 1. - @param v1 Rectangle vertex 2. - @param v2 Rectangle vertex 3 - @param v3 Rectangle vertex 4. - @param point External point. - - @return Closet point in the rectangle to the external point. - */ - static Vector3 closestPointToRectangle( - const Vector3& v0, - const Vector3& v1, - const Vector3& v2, - const Vector3& v3, - const Vector3& point); -}; - -} // namespace - -#endif // G3D_COLLISIONDETECTION_H diff --git a/externals/g3dlite/G3D.lib/include/G3D/Color1.h b/externals/g3dlite/G3D.lib/include/G3D/Color1.h deleted file mode 100644 index 1958da2b6cd..00000000000 --- a/externals/g3dlite/G3D.lib/include/G3D/Color1.h +++ /dev/null @@ -1,129 +0,0 @@ -/** - @file Color1.h - - Monochrome Color class - - @maintainer Morgan McGuire, morgan@cs.williams.edu - @created 2007-01-31 - @edited 2008-10-02 - - Copyright 2000-2008, Morgan McGuire. - All rights reserved. - */ - -#ifndef G3D_COLOR1_H -#define G3D_COLOR1_H - -#include "G3D/platform.h" -#include "G3D/g3dmath.h" -#include "G3D/HashTrait.h" -#include - -namespace G3D { - -/** - Monochrome color. This is just a float, but it has nice semantics - because a scaling by 255 automatically occurs when switching between - fixed point (Color1uint8) and floating point (Color1) formats. - */ -class Color1 { -private: - // Hidden operators - bool operator<(const Color1&) const; - bool operator>(const Color1&) const; - bool operator<=(const Color1&) const; - bool operator>=(const Color1&) const; - -public: - float value; - - /** - Initializes to 0 - */ - inline Color1() : value(0) {} - - Color1(class BinaryInput& bi); - - inline explicit Color1(float v) : value(v) { - } - - Color1 (const class Color1uint8& other); - - void serialize(class BinaryOutput& bo) const; - void deserialize(class BinaryInput& bi); - - Color1 operator+ (const Color1& other) const { - return Color1(value + other.value); - } - - Color1 operator+ (const float other) const { - return Color1(value + other); - } - - Color1& operator+= (const Color1 other) { - value += other.value; - return *this; - } - - Color1& operator-= (const Color1 other) { - value -= other.value; - return *this; - } - - Color1 operator- (const Color1& other) const { - return Color1(value - other.value); - } - - Color1 operator- (const float other) const { - return Color1(value - other); - } - - Color1 operator- () const { - return Color1(-value); - } - - Color1 operator* (const Color1& other) const { - return Color1(value * other.value); - } - - Color1 operator* (const float other) const { - return Color1(value * other); - } - - Color1 operator/ (const Color1& other) const { - return Color1(value / other.value); - } - - Color1 operator/ (const float other) const { - return Color1(value / other); - } - - inline Color1 max(const Color1& other) const { - return Color1(G3D::max(value, other.value)); - } - - inline Color1 min(const Color1& other) const { - return Color1(G3D::min(value, other.value)); - } - - inline Color1 lerp(const Color1& other, float a) const { - return Color1(value + (other.value - value) * a); - - } - - inline size_t hashCode() const { - return (size_t)(value * 0xFFFFFF); - } -}; - -} - -template <> -struct HashTrait { - static size_t hashCode(const G3D::Color1& key) { - return key.hashCode(); - } -}; - - -#endif diff --git a/externals/g3dlite/G3D.lib/include/G3D/Color1uint8.h b/externals/g3dlite/G3D.lib/include/G3D/Color1uint8.h deleted file mode 100644 index ffaa2d43ac4..00000000000 --- a/externals/g3dlite/G3D.lib/include/G3D/Color1uint8.h +++ /dev/null @@ -1,107 +0,0 @@ -/** - @file Color1uint8.h - - @maintainer Morgan McGuire, graphics3d.com - - @created 2007-01-30 - @edited 2007-01-30 - - Copyright 2000-2007, Morgan McGuire. - All rights reserved. - */ - -#ifndef G3D_COLOR1UINT8_H -#define G3D_COLOR1UINT8_H - -#include "G3D/platform.h" -#include "G3D/g3dmath.h" - -namespace G3D { - -#if defined(G3D_WIN32) - // Switch to tight alignment - #pragma pack(push, 1) -#endif - - -/** - Represents a Color1 as a packed integer. Convenient - for creating unsigned int vertex arrays. - - WARNING: Integer color formats are different than - integer vertex formats. The color channels are automatically - scaled by 255 (because OpenGL automatically scales integer - colors back by this factor). So Color3(1,1,1) == Color3uint8(255,255,255) - but Vector3(1,1,1) == Vector3int16(1,1,1). - - Note: - Conversion of a float32 to uint8 is accomplished by min(iFloor(f * 256)) and - back to float32 by u / 255.0f. This gives equal size intervals. -Consider a number line from 0 to 1 and a corresponding one from 0 to 255. If we use iRound(x * 255), then the mapping for three critical intervals are: - -

-let s = 0.5/255
-  float             int       size
-[0, s)           -> 0          s
-[s, s * 3)       -> 1         2*s
-(1 - s, 1]       -> 255        s
-
- -If we use max(floor(x * 256), 255), then we get: - -
-let s = 1/256
-  float             int           size
-[0, s)           -> 0               s
-[s, 2 * s)       -> 1               s
-(1 - s, 1]       -> 255             s
-
-and the intervals are all the same size, thus giving equal precision to all values. - */ -class Color1uint8 { -private: - // Hidden operators - bool operator<(const Color1uint8&) const; - bool operator>(const Color1uint8&) const; - bool operator<=(const Color1uint8&) const; - bool operator>=(const Color1uint8&) const; - -public: - - uint8 value; - - Color1uint8() : value(0) {} - - explicit Color1uint8(const uint8 _v) : value(_v) {} - - Color1uint8(const class Color1& c); - - Color1uint8(class BinaryInput& bi); - - void serialize(class BinaryOutput& bo) const; - - void deserialize(class BinaryInput& bi); - - inline bool operator==(const Color1uint8& other) const { - return value == other.value; - } - - inline bool operator!=(const Color1uint8& other) const { - return value != other.value; - } - -} - -#if defined(G3D_LINUX) || defined(G3D_OSX) - __attribute((aligned(1))) -#endif - -; - -#ifdef G3D_WIN32 - #pragma pack(pop) -#endif - -} - -#endif diff --git a/externals/g3dlite/G3D.lib/include/G3D/Color3.h b/externals/g3dlite/G3D.lib/include/G3D/Color3.h deleted file mode 100644 index b8d0f94829a..00000000000 --- a/externals/g3dlite/G3D.lib/include/G3D/Color3.h +++ /dev/null @@ -1,390 +0,0 @@ -/** - @file Color3.h - - Color class - - @maintainer Morgan McGuire, matrix@graphics3d.com - @cite Portions based on Dave Eberly's Magic Software Library - at http://www.magic-software.com - - @created 2001-06-02 - @edited 2008-07-17 - - Copyright 2000-2008, Morgan McGuire. - All rights reserved. - */ - -#ifndef G3D_COLOR3_H -#define G3D_COLOR3_H - -#include "G3D/platform.h" -#include "G3D/g3dmath.h" -#include "G3D/HashTrait.h" -#include "G3D/Color1.h" -#include - -namespace G3D { - -/** - Do not subclass-- this implementation makes assumptions about the - memory layout. - */ -class Color3 { -private: - // Hidden operators - bool operator<(const Color3&) const; - bool operator>(const Color3&) const; - bool operator<=(const Color3&) const; - bool operator>=(const Color3&) const; - -public: - /** - Does not initialize fields. - */ - Color3(); - - explicit Color3(class BinaryInput& bi); - - Color3(float r, float g, float b); - Color3(float v) : r(v), g(v), b(v) {} - - explicit Color3(const class Vector3& v); - - explicit Color3(const float value[3]); - - /** - Initialize from another color. - */ - Color3 (const Color3& other); - - Color3 (const class Color3uint8& other); - - /** - Initialize from an HTML-style color (e.g. 0xFF0000 == RED) - */ - static Color3 fromARGB(uint32); - - /** Returns one of the color wheel colors (e.g. RED, GREEN, CYAN). - Does not include white, black, or gray. */ - static const Color3& wheelRandom(); - - /** - * Channel value. - */ - float r, g, b; - - void serialize(class BinaryOutput& bo) const; - void deserialize(class BinaryInput& bi); - - // access vector V as V[0] = V.r, V[1] = V.g, V[2] = V.b - // - // WARNING. These member functions rely on - // (1) Color3 not having virtual functions - // (2) the data packed in a 3*sizeof(float) memory block - const float& operator[] (int i) const; - float& operator[] (int i); - - // assignment and comparison - Color3& operator= (const Color3& rkVector); - bool operator== (const Color3& rkVector) const; - bool operator!= (const Color3& rkVector) const; - size_t hashCode() const; - - // arithmetic operations - Color3 operator+ (const Color3& rkVector) const; - Color3 operator- (const Color3& rkVector) const; - Color3 operator* (float fScalar) const; - Color3 operator* (const Color3& rkVector) const; - Color3 operator/ (float fScalar) const; - Color3 operator- () const; - - // arithmetic updates - Color3& operator+= (const Color3& rkVector); - Color3& operator-= (const Color3& rkVector); - Color3& operator*= (const Color3& rkVector); - Color3& operator*= (float fScalar); - Color3& operator/= (float fScalar); - - bool fuzzyEq(const Color3& other) const; - bool fuzzyNe(const Color3& other) const; - - inline operator float* () { - return (float*)this; - } - - operator const float* () const { - return (float*)this; - } - - // vector operations - float length () const; - Color3 direction() const; - float squaredLength () const; - float dot (const Color3& rkVector) const; - float unitize (float fTolerance = 1e-06); - Color3 cross (const Color3& rkVector) const; - Color3 unitCross (const Color3& rkVector) const; - - inline Color3 pow(const Color3& other) const { - return Color3(::pow(r, other.r), ::pow(g, other.g), ::pow(b, other.b)); - } - - inline Color3 pow(float other) const { - return Color3(::pow(r, other), ::pow(g, other), ::pow(b, other)); - } - - /**@return the largest component */ - inline float max() const { - return G3D::max(G3D::max(r, g), b); - } - - inline Color3 max(const Color3& other) const { - return Color3(G3D::max(r, other.r), G3D::max(g, other.g), G3D::max(b, other.b)); - } - - inline Color3 min(const Color3& other) const { - return Color3(G3D::min(r, other.r), G3D::min(g, other.g), G3D::min(b, other.b)); - } - - inline Color3 lerp(const Color3& other, float a) const { - return (*this) + (other - *this) * a; - - } - - inline float sum() const { - return r + g + b; - } - - inline float average() const { - return sum() / 3.0f; - } - - - /** - * Converts from HSV to RGB , note: toHSV(fromHSV(_hsv)) may not be _hsv, if it is at a grey point or black point. - * The components of _hsv should lie in the unit interval. - * @cite Alvy Ray Smith SIGGRAPH 1978 "Color Gamut Transform Pairs" - **/ - static Color3 fromHSV(const Vector3& _hsv); - static Vector3 toHSV(const Color3& _rgb); - - /** Duplicates the matlab jet colormap maps [0,1] --> (r,g,b) where blue is close to 0 and red is close to 1. */ - static Color3 jetColorMap(const float& val); - - /** Returns colors with maximum saturation and value @param hue [0, 1]*/ - static Color3 rainbowColorMap(float hue); - - std::string toString() const; - - /** Random unit vector */ - static Color3 random(); - - // Special values. - // Intentionally not inlined: see Matrix3::identity() for details. - static const Color3& red(); - static const Color3& green(); - static const Color3& blue(); - static const Color3& purple(); - static const Color3& cyan(); - static const Color3& yellow(); - static const Color3& brown(); - static const Color3& orange(); - static const Color3& black(); - static const Color3& gray(); - static const Color3& white(); - - static const Color3& zero(); - static const Color3& one(); - - inline Color3 bgr() const { - return Color3(b, g, r); - } -}; - -inline G3D::Color3 operator* (float s, const G3D::Color3& c) { - return c * s; -} - -inline G3D::Color3 operator* (G3D::Color1& s, const G3D::Color3& c) { - return c * s.value; -} - -inline G3D::Color3 operator* (const G3D::Color3& c, G3D::Color1& s) { - return c * s.value; -} - - -//---------------------------------------------------------------------------- -inline Color3::Color3 () { -} - -//---------------------------------------------------------------------------- - -inline Color3::Color3(float fX, float fY, float fZ) { - r = fX; - g = fY; - b = fZ; -} - -//---------------------------------------------------------------------------- -inline Color3::Color3(const float afCoordinate[3]) { - r = afCoordinate[0]; - g = afCoordinate[1]; - b = afCoordinate[2]; -} - -//---------------------------------------------------------------------------- -inline Color3::Color3 (const Color3& rkVector) { - r = rkVector.r; - g = rkVector.g; - b = rkVector.b; -} - -//---------------------------------------------------------------------------- -inline float& Color3::operator[] (int i) { - return ((float*)this)[i]; -} - -//---------------------------------------------------------------------------- - -inline const float& Color3::operator[] (int i) const { - return ((float*)this)[i]; -} - -//---------------------------------------------------------------------------- - -inline bool Color3::fuzzyEq(const Color3& other) const { - return G3D::fuzzyEq((*this - other).squaredLength(), 0); -} - -//---------------------------------------------------------------------------- - -inline bool Color3::fuzzyNe(const Color3& other) const { - return G3D::fuzzyNe((*this - other).squaredLength(), 0); -} - - -//---------------------------------------------------------------------------- -inline Color3& Color3::operator= (const Color3& rkVector) { - r = rkVector.r; - g = rkVector.g; - b = rkVector.b; - return *this; -} - -//---------------------------------------------------------------------------- -inline bool Color3::operator== (const Color3& rkVector) const { - return ( r == rkVector.r && g == rkVector.g && b == rkVector.b ); -} - -//---------------------------------------------------------------------------- -inline bool Color3::operator!= (const Color3& rkVector) const { - return ( r != rkVector.r || g != rkVector.g || b != rkVector.b ); -} - -//---------------------------------------------------------------------------- -inline Color3 Color3::operator+ (const Color3& rkVector) const { - return Color3(r + rkVector.r, g + rkVector.g, b + rkVector.b); -} - -//---------------------------------------------------------------------------- -inline Color3 Color3::operator- (const Color3& rkVector) const { - return Color3(r -rkVector.r, g - rkVector.g, b - rkVector.b); -} - -//---------------------------------------------------------------------------- -inline Color3 Color3::operator* (float fScalar) const { - return Color3(fScalar*r, fScalar*g, fScalar*b); -} - -//---------------------------------------------------------------------------- -inline Color3 Color3::operator* (const Color3& rkVector) const { - return Color3(r * rkVector.r, g * rkVector.g, b * rkVector.b); -} - -//---------------------------------------------------------------------------- -inline Color3 Color3::operator- () const { - return Color3( -r, -g, -b); -} - -//---------------------------------------------------------------------------- -inline Color3& Color3::operator+= (const Color3& rkVector) { - r += rkVector.r; - g += rkVector.g; - b += rkVector.b; - return *this; -} - -//---------------------------------------------------------------------------- -inline Color3& Color3::operator-= (const Color3& rkVector) { - r -= rkVector.r; - g -= rkVector.g; - b -= rkVector.b; - return *this; -} - -//---------------------------------------------------------------------------- -inline Color3& Color3::operator*= (float fScalar) { - r *= fScalar; - g *= fScalar; - b *= fScalar; - return *this; -} - -//---------------------------------------------------------------------------- -inline Color3& Color3::operator*= (const Color3& rkVector) { - r *= rkVector.r; - g *= rkVector.g; - b *= rkVector.b; - return *this; -} -//---------------------------------------------------------------------------- -inline float Color3::squaredLength () const { - return r*r + g*g + b*b; -} - -//---------------------------------------------------------------------------- -inline float Color3::length () const { - return sqrtf(r*r + g*g + b*b); -} - -//---------------------------------------------------------------------------- -inline Color3 Color3::direction () const { - float lenSquared = r * r + g * g + b * b; - - if (lenSquared != 1.0f) { - return *this / sqrtf(lenSquared); - } else { - return *this; - } -} - -//---------------------------------------------------------------------------- -inline float Color3::dot (const Color3& rkVector) const { - return r*rkVector.r + g*rkVector.g + b*rkVector.b; -} - -//---------------------------------------------------------------------------- -inline Color3 Color3::cross (const Color3& rkVector) const { - return Color3(g*rkVector.b - b*rkVector.g, b*rkVector.r - r*rkVector.b, - r*rkVector.g - g*rkVector.r); -} - -//---------------------------------------------------------------------------- -inline Color3 Color3::unitCross (const Color3& rkVector) const { - Color3 kCross(g*rkVector.b - b*rkVector.g, b*rkVector.r - r*rkVector.b, - r*rkVector.g - g*rkVector.r); - kCross.unitize(); - return kCross; -} -} // namespace - - -template <> struct HashTrait { - static size_t hashCode(const G3D::Color3& key) { - return key.hashCode(); - } -}; - - -#endif diff --git a/externals/g3dlite/G3D.lib/include/G3D/Color3uint8.h b/externals/g3dlite/G3D.lib/include/G3D/Color3uint8.h deleted file mode 100644 index 20e225a0734..00000000000 --- a/externals/g3dlite/G3D.lib/include/G3D/Color3uint8.h +++ /dev/null @@ -1,127 +0,0 @@ -/** - @file Color3uint8.h - - @maintainer Morgan McGuire, graphics3d.com - - @created 2003-04-07 - @edited 2006-06-24 - - Copyright 2000-2006, Morgan McGuire. - All rights reserved. - */ - -#ifndef G3D_COLOR3UINT8_H -#define G3D_COLOR3UINT8_H - -#include "G3D/platform.h" -#include "G3D/g3dmath.h" - -namespace G3D { - -/** - Represents a Color3 as a packed integer. Convenient - for creating unsigned int vertex arrays. Used by - G3D::GImage as the underlying format. - - WARNING: Integer color formats are different than - integer vertex formats. The color channels are automatically - scaled by 255 (because OpenGL automatically scales integer - colors back by this factor). So Color3(1,1,1) == Color3uint8(255,255,255) - but Vector3(1,1,1) == Vector3int16(1,1,1). - */ - -#if defined(G3D_WIN32) - // Switch to tight alignment - #pragma pack(push, 1) -#endif - -class Color3uint8 { -private: - // Hidden operators - bool operator<(const Color3uint8&) const; - bool operator>(const Color3uint8&) const; - bool operator<=(const Color3uint8&) const; - bool operator>=(const Color3uint8&) const; - -public: - uint8 r; - uint8 g; - uint8 b; - - Color3uint8() : r(0), g(0), b(0) {} - - Color3uint8(const uint8 _r, const uint8 _g, const uint8 _b) : r(_r), g(_g), b(_b) {} - - Color3uint8(const class Color3& c); - - Color3uint8(class BinaryInput& bi); - - inline static Color3uint8 fromARGB(uint32 i) { - Color3uint8 c; - c.r = (i >> 16) & 0xFF; - c.g = (i >> 8) & 0xFF; - c.b = i & 0xFF; - return c; - } - - inline Color3uint8 bgr() const { - return Color3uint8(b, g, r); - } - - /** - Returns the color packed into a uint32 - (the upper byte is 0xFF) - */ - inline uint32 asUInt32() const { - return (0xFF << 24) + ((uint32)r << 16) + ((uint32)g << 8) + b; - } - - void serialize(class BinaryOutput& bo) const; - - void deserialize(class BinaryInput& bi); - - // access vector V as V[0] = V.r, V[1] = V.g, V[2] = V.b - // - // WARNING. These member functions rely on - // (1) Color3 not having virtual functions - // (2) the data packed in a 3*sizeof(uint8) memory block - G3D::uint8& operator[] (int i) const; - operator G3D::uint8* (); - operator const G3D::uint8* () const; - - bool operator==(const Color3uint8& other) const { - return (other.r == r) && (other.g == g) && (other.b == b); - } - - bool operator!=(const Color3uint8& other) const { - return (other.r != r) && (other.g != g) && (other.b != b); - } -} - -#if defined(G3D_LINUX) || defined(G3D_OSX) - __attribute((aligned(1))) -#endif - -; - -#ifdef G3D_WIN32 - #pragma pack(pop) -#endif - - -inline G3D::uint8& Color3uint8::operator[] (int i) const { - debugAssert((unsigned int)i < 3); - return ((G3D::uint8*)this)[i]; -} - -//---------------------------------------------------------------------------- -inline Color3uint8::operator G3D::uint8* () { - return (G3D::uint8*)this; -} - -inline Color3uint8::operator const G3D::uint8* () const { - return (G3D::uint8*)this; -} -} - -#endif diff --git a/externals/g3dlite/G3D.lib/include/G3D/Color4.h b/externals/g3dlite/G3D.lib/include/G3D/Color4.h deleted file mode 100644 index 6b1b3b4c4bb..00000000000 --- a/externals/g3dlite/G3D.lib/include/G3D/Color4.h +++ /dev/null @@ -1,324 +0,0 @@ -/** - @file Color4.h - - Color class - - @maintainer Morgan McGuire, matrix@graphics3d.com - @cite Portions based on Dave Eberly's Magic Software Library - at http://www.magic-software.com - - @created 2002-06-25 - @edited 2008-07-16 - - Copyright 2000-2008, Morgan McGuire. - All rights reserved. - */ - -#ifndef G3D_COLOR4_H -#define G3D_COLOR4_H - -#include "G3D/platform.h" -#include "G3D/g3dmath.h" -#include "G3D/Color3.h" -#include - -namespace G3D { - -/** - Do not subclass-- this implementation makes assumptions about the - memory layout. - */ -class Color4 { -private: - // Hidden operators - bool operator<(const Color4&) const; - bool operator>(const Color4&) const; - bool operator<=(const Color4&) const; - bool operator>=(const Color4&) const; - -public: - - /** - * Does not initialize fields. - */ - Color4 (); - - Color4(const Color3& c3, float a = 1.0); - - Color4(const class Color4uint8& c); - - Color4(class BinaryInput& bi); - - Color4(const class Vector4& v); - - /** - * Initialize from G3D::Reals. - */ - Color4(float r, float g, float b, float a = 1.0); - - /** - * Initialize from array of G3D::Reals. - */ - Color4(float value[4]); - - /** - * Initialize from another color. - */ - Color4(const Color4& other); - - void serialize(class BinaryOutput& bo) const; - void deserialize(class BinaryInput& bi); - - /** - Initialize from an HTML-style color (e.g. 0xFFFF0000 == RED) - */ - static Color4 fromARGB(uint32); - - /** - * Channel values. - */ - float r, g, b, a; - - inline Color3 rgb() const { - return Color3(r, g, b); - } - - // access vector V as V[0] = V.r, V[1] = V.g, V[2] = V.b, v[3] = V.a - // - // WARNING. These member functions rely on - // (1) Color4 not having virtual functions - // (2) the data packed in a 3*sizeof(float) memory block - float& operator[] (int i) const; - operator float* (); - operator const float* () const; - - // assignment and comparison - Color4& operator= (const Color4& rkVector); - bool operator== (const Color4& rkVector) const; - bool operator!= (const Color4& rkVector) const; - size_t hashCode() const; - - // arithmetic operations - Color4 operator+ (const Color4& rkVector) const; - Color4 operator- (const Color4& rkVector) const; - Color4 operator* (float fScalar) const; - Color4 operator/ (float fScalar) const; - Color4 operator- () const; - friend Color4 operator* (double fScalar, const Color4& rkVector); - - // arithmetic updates - Color4& operator+= (const Color4& rkVector); - Color4& operator-= (const Color4& rkVector); - Color4& operator*= (float fScalar); - Color4& operator/= (float fScalar); - - bool fuzzyEq(const Color4& other) const; - bool fuzzyNe(const Color4& other) const; - - std::string toString() const; - - inline Color4 max(const Color4& other) const { - return Color4(G3D::max(r, other.r), G3D::max(g, other.g), G3D::max(b, other.b), G3D::max(a, other.a)); - } - - inline Color4 min(const Color4& other) const { - return Color4(G3D::min(r, other.r), G3D::min(g, other.g), G3D::min(b, other.b), G3D::min(a, other.a)); - } - - /** r + g + b + a */ - inline float sum() const { - return r + g + b + a; - } - - inline Color4 lerp(const Color4& other, float a) const { - return (*this) + (other - *this) * a; - - } - - // Special values. - // Intentionally not inlined: see Matrix3::identity() for details. - static const Color4& zero(); - static const Color4& clear(); - - static const Color4& inf(); - - inline Color3 bgr() const { - return Color3(b, g, r); - } -}; - -/** - Extends the c3 with alpha = 1.0 - */ -Color4 operator*(const Color3& c3, const Color4& c4); - - -inline Color4 operator*(const Color3& c3, const Color4& c4) { - return Color4(c3.r * c4.r, c3.g * c4.g, c3.b * c4.b, c4.a); -} - -//---------------------------------------------------------------------------- - -inline Color4::Color4 () { - // For efficiency in construction of large arrays of vectors, the - // default constructor does not initialize the vector. -} - -//---------------------------------------------------------------------------- - -inline Color4::Color4(const Color3& c3, float a) { - r = c3.r; - g = c3.g; - b = c3.b; - this->a = a; -} - -//---------------------------------------------------------------------------- - -inline Color4::Color4( - float r, - float g, - float b, - float a) : - r(r), g(g), b(b), a(a) { -} - -//---------------------------------------------------------------------------- -inline Color4::Color4 (float afCoordinate[4]) { - r = afCoordinate[0]; - g = afCoordinate[1]; - b = afCoordinate[2]; - a = afCoordinate[3]; -} - -//---------------------------------------------------------------------------- - -inline Color4::Color4( - const Color4& other) { - - r = other.r; - g = other.g; - b = other.b; - a = other.a; -} - -//---------------------------------------------------------------------------- - -inline float& Color4::operator[] (int i) const { - return ((float*)this)[i]; -} - -//---------------------------------------------------------------------------- -inline Color4::operator float* () { - return (float*)this; -} - -inline Color4::operator const float* () const { - return (float*)this; -} - -//---------------------------------------------------------------------------- - -inline bool Color4::fuzzyEq(const Color4& other) const { - Color4 dif = (*this - other); - return G3D::fuzzyEq(dif.r * dif.r + dif.g * dif.g + dif.b * dif.b + dif.a * dif.a, 0); -} - -//---------------------------------------------------------------------------- - -inline bool Color4::fuzzyNe(const Color4& other) const { - Color4 dif = (*this - other); - return G3D::fuzzyNe(dif.r * dif.r + dif.g * dif.g + dif.b * dif.b + dif.a * dif.a, 0); -} - - -//---------------------------------------------------------------------------- -inline Color4& Color4::operator= (const Color4& other) { - r = other.r; - g = other.g; - b = other.b; - a = other.a; - return *this; -} - -//---------------------------------------------------------------------------- - -inline bool Color4::operator== (const Color4& other) const { - return ( r == other.r && g == other.g && b == other.b && a == other.a); -} - -//---------------------------------------------------------------------------- - -inline bool Color4::operator!= (const Color4& other) const { - return ( r != other.r || g != other.g || b != other.b || a != other.a); -} - -//---------------------------------------------------------------------------- -inline Color4 Color4::operator+ (const Color4& other) const { - return Color4(r + other.r, g + other.g, b + other.b, a + other.a); -} - -//---------------------------------------------------------------------------- -inline Color4 Color4::operator- (const Color4& other) const { - return Color4(r - other.r, g - other.g, b - other.b, a - other.a); -} - -//---------------------------------------------------------------------------- - -inline Color4 Color4::operator* (float fScalar) const { - return Color4(fScalar * r, fScalar * g, fScalar * b, fScalar * a); -} - -//---------------------------------------------------------------------------- - -inline Color4 Color4::operator- () const { - return Color4(-r, -g, -b, -a); -} - -//---------------------------------------------------------------------------- - -inline Color4 operator* (float fScalar, const Color4& other) { - return Color4(fScalar * other.r, fScalar * other.g, - fScalar * other.b, fScalar * other.a); -} - -//---------------------------------------------------------------------------- - -inline Color4& Color4::operator+= (const Color4& other) { - r += other.r; - g += other.g; - b += other.b; - a += other.a; - return *this; -} - -//---------------------------------------------------------------------------- - -inline Color4& Color4::operator-= (const Color4& other) { - r -= other.r; - g -= other.g; - b -= other.b; - a -= other.a; - return *this; -} - -//---------------------------------------------------------------------------- - -inline Color4& Color4::operator*= (float fScalar) { - r *= fScalar; - g *= fScalar; - b *= fScalar; - a *= fScalar; - return *this; -} - -} // namespace - -template <> -struct HashTrait { - static size_t hashCode(const G3D::Color4& key) { - return key.hashCode(); - } -}; - -#endif diff --git a/externals/g3dlite/G3D.lib/include/G3D/Color4uint8.h b/externals/g3dlite/G3D.lib/include/G3D/Color4uint8.h deleted file mode 100644 index 7804a6e1e51..00000000000 --- a/externals/g3dlite/G3D.lib/include/G3D/Color4uint8.h +++ /dev/null @@ -1,133 +0,0 @@ -/** - @file Color4uint8.h - - @maintainer Morgan McGuire, graphics3d.com - - @created 2003-04-07 - @edited 2006-03-24 - - Copyright 2000-2006, Morgan McGuire. - All rights reserved. - */ - -#ifndef COLOR4UINT8_H -#define COLOR4UINT8_H - -#include "G3D/g3dmath.h" -#include "G3D/platform.h" -#include "G3D/Color3uint8.h" - -namespace G3D { - -/** - Represents a Color4 as a packed integer. Convenient - for creating unsigned int vertex arrays. Used by - G3D::GImage as the underlying format. - - WARNING: Integer color formats are different than - integer vertex formats. The color channels are automatically - scaled by 255 (because OpenGL automatically scales integer - colors back by this factor). So Color4(1,1,1) == Color4uint8(255,255,255) - but Vector3(1,1,1) == Vector3int16(1,1,1). - - */ - -#ifdef G3D_WIN32 - // Switch to tight alignment - #pragma pack(push, 1) -#endif - -class Color4uint8 { -private: - // Hidden operators - bool operator<(const Color4uint8&) const; - bool operator>(const Color4uint8&) const; - bool operator<=(const Color4uint8&) const; - bool operator>=(const Color4uint8&) const; - -public: - uint8 r; - uint8 g; - uint8 b; - uint8 a; - - Color4uint8() : r(0), g(0), b(0), a(0) {} - - Color4uint8(const class Color4& c); - - Color4uint8(const uint8 _r, const uint8 _g, const uint8 _b, const uint8 _a) : r(_r), g(_g), b(_b), a(_a) {} - - Color4uint8(const Color3uint8& c, const uint8 _a) : r(c.r), g(c.g), b(c.b), a(_a) {} - - Color4uint8(class BinaryInput& bi); - - inline static Color4uint8 fromARGB(uint32 i) { - Color4uint8 c; - c.a = (i >> 24) & 0xFF; - c.r = (i >> 16) & 0xFF; - c.g = (i >> 8) & 0xFF; - c.b = i & 0xFF; - return c; - } - - inline uint32 asUInt32() const { - return ((uint32)a << 24) + ((uint32)r << 16) + ((uint32)g << 8) + b; - } - - // access vector V as V[0] = V.r, V[1] = V.g, V[2] = V.b - // - // WARNING. These member functions rely on - // (1) Color4uint8 not having virtual functions - // (2) the data packed in a 3*sizeof(uint8) memory block - G3D::uint8& operator[] (int i) const; - operator G3D::uint8* (); - operator const G3D::uint8* () const; - - - inline Color3uint8 bgr() const { - return Color3uint8(b, g, r); - } - - void serialize(class BinaryOutput& bo) const; - - void deserialize(class BinaryInput& bi); - - inline Color3uint8 rgb() const { - return Color3uint8(r, g, b); - } - - bool operator==(const Color4uint8& other) const { - return *reinterpret_cast(this) == *reinterpret_cast(&other); - } - - bool operator!=(const Color4uint8& other) const { - return *reinterpret_cast(this) != *reinterpret_cast(&other); - } - -} -#if defined(G3D_LINUX) || defined(G3D_OSX) - __attribute((aligned(1))) -#endif -; - -#ifdef G3D_WIN32 - #pragma pack(pop) -#endif - - -inline G3D::uint8& Color4uint8::operator[] (int i) const { - return ((G3D::uint8*)this)[i]; -} - -//---------------------------------------------------------------------------- -inline Color4uint8::operator G3D::uint8* () { - return (G3D::uint8*)this; -} - -inline Color4uint8::operator const G3D::uint8* () const { - return (G3D::uint8*)this; -} - -} - -#endif diff --git a/externals/g3dlite/G3D.lib/include/G3D/Cone.h b/externals/g3dlite/G3D.lib/include/G3D/Cone.h deleted file mode 100644 index c09b9b6846c..00000000000 --- a/externals/g3dlite/G3D.lib/include/G3D/Cone.h +++ /dev/null @@ -1,68 +0,0 @@ -/** - @file Cone.h - - Cone class - - @maintainer Morgan McGuire, matrix@graphics3d.com - @cite Portions based on Dave Eberly's Magic Software Library at http://www.magic-software.com - - @created 2001-06-02 - @edited 2006-02-23 - - Copyright 2000-2006, Morgan McGuire. - All rights reserved. - */ - -#ifndef G3D_CONE_H -#define G3D_CONE_H - -#include "G3D/platform.h" -#include "G3D/g3dmath.h" -#include "G3D/Vector3.h" - -namespace G3D { - -/** - An infinite cone. - */ -class Cone { - -private: - Vector3 tip; - Vector3 direction; - - /** Angle from the center line to the edge. */ - float angle; - -public: - - /** - @param angle Angle from the center line to the edge, in radians - */ - Cone(const Vector3& tip, const Vector3& direction, float angle); - - /** - Forms the smallest cone that contains the box. Undefined if - the tip is inside or on the box. - */ - Cone(const Vector3& tip, const class Box& box); - - virtual ~Cone() {} - - /** - Returns true if the cone touches, intersects, or contains b. - - If c.intersects(s) and c.intersects(Sphere(s.center, s.radius * 2) - then the sphere s is entirely within cone c. - */ - bool intersects(const class Sphere& s) const; - - /** - True if v is a point inside the cone. - */ - bool contains(const class Vector3& v) const; -}; - -} // namespace - -#endif diff --git a/externals/g3dlite/G3D.lib/include/G3D/ConvexPolyhedron.h b/externals/g3dlite/G3D.lib/include/G3D/ConvexPolyhedron.h deleted file mode 100644 index 6ae9ba136ff..00000000000 --- a/externals/g3dlite/G3D.lib/include/G3D/ConvexPolyhedron.h +++ /dev/null @@ -1,179 +0,0 @@ -/** - @file ConvexPolyhedron.h - - @maintainer Morgan McGuire, matrix@graphics3d.com - - @created 2001-11-11 - @edited 2006-04-10 - - Copyright 2000-2006, Morgan McGuire. - All rights reserved. - */ - -#ifndef G3D_CONVEXPOLYHEDRON_H -#define G3D_CONVEXPOLYHEDRON_H - -#include "G3D/platform.h" -#include "G3D/Vector3.h" -#include "G3D/Vector2.h" -#include "G3D/CoordinateFrame.h" -#include "G3D/Plane.h" -#include "G3D/Line.h" -#include "G3D/Array.h" - -namespace G3D { - -class DirectedEdge { -public: - Vector3 start; - Vector3 stop; -}; - -class ConvexPolygon { -private: - - friend class ConvexPolyhedron; - - Array _vertex; - -public: - - ConvexPolygon() {} - ConvexPolygon(const Array& __vertex); - virtual ~ConvexPolygon() {} - - /** - Counter clockwise winding order. - */ - inline const Vector3& vertex(int i) const { - return _vertex[i]; - } - - inline void setVertex(int i, const Vector3& v) { - _vertex[i] = v; - } - - /** - Zero vertices indicates an empty polygon (zero area). - */ - inline int numVertices() const { - return _vertex.size(); - } - - inline void setNumVertices(int n) { - _vertex.resize(n); - } - - /** - O(n) in the number of edges - */ - bool isEmpty() const; - - /** - Cuts the polygon at the plane. If the polygon is entirely above or below - the plane, one of the returned polygons will be empty. - - @param above The part of the polygon above (on the side the - normal points to or in the plane) the plane - @param below The part of the polygon below the plane. - @param newEdge If a new edge was introduced, this is that edge (on the above portion; the below portion is the opposite winding. - */ - void cut(const Plane& plane, ConvexPolygon &above, ConvexPolygon &below, DirectedEdge& newEdge); - void cut(const Plane& plane, ConvexPolygon &above, ConvexPolygon &below); - - /** - When a cut plane grazes a vertex in the polygon, two near-identical vertices may be created. - The closeness of these two points can cause a number of problems, such as ConvexPolygon::normal() - returning an infinite vector. It should be noted, however, that not all applications are - sensitive to near-identical vertices. - - removeDuplicateVertices() detects and eliminates redundant vertices. - */ - void removeDuplicateVertices(); - - /** - O(n) in the number of edges - */ - float getArea() const; - - inline Vector3 normal() const { - debugAssert(_vertex.length() >= 3); - return (_vertex[1] - _vertex[0]).cross(_vertex[2] - _vertex[0]).direction(); - } - - /** - Returns the same polygon with inverse winding. - */ - ConvexPolygon inverse() const; -}; - - - -class ConvexPolyhedron { -public: - /** - Zero faces indicates an empty polyhedron - */ - Array face; - - ConvexPolyhedron() {} - ConvexPolyhedron(const Array& _face); - - /** - O(n) in the number of edges - */ - bool isEmpty() const; - - /** - O(n) in the number of edges - */ - float getVolume() const; - - /** - Cuts the polyhedron at the plane. If the polyhedron is entirely above or below - the plane, one of the returned polyhedra will be empty. - - @param above The part of the polyhedron above (on the side the - normal points to or in the plane) the plane - @param below The part of the polyhedron below the plane. - */ - void cut(const Plane& plane, ConvexPolyhedron &above, ConvexPolyhedron &below); -}; - -/** - - */ -class ConvexPolygon2D { -private: - - Array m_vertex; - -public: - - ConvexPolygon2D() {} - - /** - Points are counter-clockwise in a Y = down, X = right coordinate - system. - - @param reverse If true, the points are reversed (i.e. winding direction is changed) - before the polygon is created. - */ - ConvexPolygon2D(const Array& pts, bool reverse = false); - - inline int numVertices() const { - return m_vertex.size(); - } - - inline const Vector2& vertex(int index) const { - debugAssert((index >= 0) && (index <= m_vertex.size())); - return m_vertex[index]; - } - - /** @param reverseWinding If true, the winding direction of the polygon is reversed for this test.*/ - bool contains(const Vector2& p, bool reverseWinding = false) const; -}; - - -} // namespace -#endif diff --git a/externals/g3dlite/G3D.lib/include/G3D/CoordinateFrame.h b/externals/g3dlite/G3D.lib/include/G3D/CoordinateFrame.h deleted file mode 100644 index 705c6c93ae2..00000000000 --- a/externals/g3dlite/G3D.lib/include/G3D/CoordinateFrame.h +++ /dev/null @@ -1,315 +0,0 @@ -/** - @file CoordinateFrame.h - - @maintainer Morgan McGuire, morgan@cs.williams.edu - - @created 2001-03-04 - @edited 2008-07-14 - - Copyright 2000-2008, Morgan McGuire. - All rights reserved. -*/ - -#ifndef G3D_COORDINATEFRAME_H -#define G3D_COORDINATEFRAME_H - -#include "G3D/platform.h" -#include "G3D/Vector3.h" -#include "G3D/Vector4.h" -#include "G3D/Matrix3.h" -#include "G3D/Array.h" -#include -#include -#include -#include -#include - -namespace G3D { - -/** - A rigid body RT (rotation-translation) transformation. - -CoordinateFrame abstracts a 4x4 matrix that maps object space to world space: - - v_world = C * v_object - -CoordinateFrame::rotation is the upper 3x3 submatrix, CoordinateFrame::translation -is the right 3x1 column. The 4th row is always [0 0 0 1], so it isn't stored. -So you don't have to remember which way the multiplication and transformation work, -it provides explicit toWorldSpace and toObjectSpace methods. Also, points, vectors -(directions), and surface normals transform differently, so they have separate methods. - -Some helper functions transform whole primitives like boxes in and out of object space. - -Convert to Matrix4 using CoordinateFrame::toMatrix4. You can construct a CoordinateFrame -from a Matrix4 using Matrix4::approxCoordinateFrame, however, because a Matrix4 is more -general than a CoordinateFrame, some information may be lost. - -@sa G3D::UprightFrame, G3D::PhysicsFrame, G3D::Matrix4, G3D::Quat -*/ -class CoordinateFrame { -public: - - /** Takes object space points to world space. */ - Matrix3 rotation; - - /** Takes object space points to world space. */ - Vector3 translation; - - inline bool operator==(const CoordinateFrame& other) const { - return (translation == other.translation) && (rotation == other.rotation); - } - - inline bool operator!=(const CoordinateFrame& other) const { - return !(*this == other); - } - - bool fuzzyEq(const CoordinateFrame& other) const; - - bool fuzzyIsIdentity() const; - - bool isIdentity() const; - - /** - Initializes to the identity coordinate frame. - */ - inline CoordinateFrame() : - rotation(Matrix3::identity()), translation(Vector3::zero()) { - } - - CoordinateFrame(const Vector3& _translation) : - rotation(Matrix3::identity()), translation(_translation) { - } - - CoordinateFrame(const Matrix3 &rotation, const Vector3 &translation) : - rotation(rotation), translation(translation) { - } - - CoordinateFrame(const Matrix3 &rotation) : - rotation(rotation), translation(Vector3::zero()) { - } - - CoordinateFrame(const class UprightFrame& f); - - static CoordinateFrame fromXYZYPRRadians(float x, float y, float z, float yaw = 0.0f, float pitch = 0.0f, float roll = 0.0f); - - /** Construct a coordinate frame from translation = (x,y,z) and - rotations (in that order) about Y, object space X, object space - Z. Note that because object-space axes are used, these are not - equivalent to Euler angles; they are known as Tait-Bryan - rotations and are more convenient for intuitive positioning.*/ - static CoordinateFrame fromXYZYPRDegrees(float x, float y, float z, float yaw = 0.0f, float pitch = 0.0f, float roll = 0.0f); - - CoordinateFrame(class BinaryInput& b); - - void deserialize(class BinaryInput& b); - - void serialize(class BinaryOutput& b) const; - - CoordinateFrame(const CoordinateFrame &other) : - rotation(other.rotation), translation(other.translation) {} - - /** - Computes the inverse of this coordinate frame. - */ - inline CoordinateFrame inverse() const { - CoordinateFrame out; - out.rotation = rotation.transpose(); - out.translation = -out.rotation * translation; - return out; - } - - inline ~CoordinateFrame() {} - - /** See also Matrix4::approxCoordinateFrame */ - class Matrix4 toMatrix4() const; - - void getXYZYPRRadians(float& x, float& y, float& z, float& yaw, float& pitch, float& roll) const; - void getXYZYPRDegrees(float& x, float& y, float& z, float& yaw, float& pitch, float& roll) const; - - - /** - Produces an XML serialization of this coordinate frame. - @deprecated - */ - std::string toXML() const; - - /** - Returns the heading of the lookVector as an angle in radians relative to - the world -z axis. That is, a counter-clockwise heading where north (-z) - is 0 and west (-x) is PI/2. - - Note that the heading ignores the Y axis, so an inverted - object has an inverted heading. - */ - inline float getHeading() const { - Vector3 look = rotation.getColumn(2); - float angle = -(float) atan2(-look.x, look.z); - return angle; - } - - /** - Takes the coordinate frame into object space. - this->inverse() * c - */ - inline CoordinateFrame toObjectSpace(const CoordinateFrame& c) const { - return this->inverse() * c; - } - - inline Vector4 toObjectSpace(const Vector4& v) const { - return this->inverse().toWorldSpace(v); - } - - inline Vector4 toWorldSpace(const Vector4& v) const { - return Vector4(rotation * Vector3(v.x, v.y, v.z) + translation * v.w, v.w); - } - - /** - Transforms the point into world space. - */ - inline Vector3 pointToWorldSpace(const Vector3& v) const { - return Vector3( - rotation[0][0] * v[0] + rotation[0][1] * v[1] + rotation[0][2] * v[2] + translation[0], - rotation[1][0] * v[0] + rotation[1][1] * v[1] + rotation[1][2] * v[2] + translation[1], - rotation[2][0] * v[0] + rotation[2][1] * v[1] + rotation[2][2] * v[2] + translation[2]); - } - - /** - Transforms the point into object space. Assumes that the rotation matrix is orthonormal. - */ - inline Vector3 pointToObjectSpace(const Vector3& v) const { - float p[3]; - p[0] = v[0] - translation[0]; - p[1] = v[1] - translation[1]; - p[2] = v[2] - translation[2]; - debugAssert(G3D::fuzzyEq(rotation.determinant(), 1.0f)); - return Vector3( - rotation[0][0] * p[0] + rotation[1][0] * p[1] + rotation[2][0] * p[2], - rotation[0][1] * p[0] + rotation[1][1] * p[1] + rotation[2][1] * p[2], - rotation[0][2] * p[0] + rotation[1][2] * p[1] + rotation[2][2] * p[2]); - } - - /** - Transforms the vector into world space (no translation). - */ - inline Vector3 vectorToWorldSpace(const Vector3& v) const { - return rotation * v; - } - - inline Vector3 normalToWorldSpace(const Vector3& v) const { - return rotation * v; - } - - class Ray toObjectSpace(const Ray& r) const; - - Ray toWorldSpace(const Ray& r) const; - - /** - Transforms the vector into object space (no translation). - */ - inline Vector3 vectorToObjectSpace(const Vector3 &v) const { - // Multiply on the left (same as rotation.transpose() * v) - return v * rotation; - } - - inline Vector3 normalToObjectSpace(const Vector3 &v) const { - // Multiply on the left (same as rotation.transpose() * v) - return v * rotation; - } - - void pointToWorldSpace(const Array& v, Array& vout) const; - - void normalToWorldSpace(const Array& v, Array& vout) const; - - void vectorToWorldSpace(const Array& v, Array& vout) const; - - void pointToObjectSpace(const Array& v, Array& vout) const; - - void normalToObjectSpace(const Array& v, Array& vout) const; - - void vectorToObjectSpace(const Array& v, Array& vout) const; - - class Box toWorldSpace(const class AABox& b) const; - - class Box toWorldSpace(const class Box& b) const; - - class Cylinder toWorldSpace(const class Cylinder& b) const; - - class Capsule toWorldSpace(const class Capsule& b) const; - - class Plane toWorldSpace(const class Plane& p) const; - - class Sphere toWorldSpace(const class Sphere& b) const; - - class Triangle toWorldSpace(const class Triangle& t) const; - - class Box toObjectSpace(const AABox& b) const; - - class Box toObjectSpace(const Box& b) const; - - class Plane toObjectSpace(const Plane& p) const; - - class Sphere toObjectSpace(const Sphere& b) const; - - Triangle toObjectSpace(const Triangle& t) const; - - /** Compose: create the transformation that is other followed by this.*/ - CoordinateFrame operator*(const CoordinateFrame &other) const { - return CoordinateFrame(rotation * other.rotation, - pointToWorldSpace(other.translation)); - } - - CoordinateFrame operator+(const Vector3& v) const { - return CoordinateFrame(rotation, translation + v); - } - - CoordinateFrame operator-(const Vector3& v) const { - return CoordinateFrame(rotation, translation - v); - } - - void lookAt(const Vector3& target); - - void lookAt( - const Vector3& target, - Vector3 up); - - /** The direction this camera is looking (its negative z axis)*/ - inline Vector3 lookVector() const { - return -rotation.getColumn(2); - } - - /** Returns the ray starting at the camera origin travelling in direction CoordinateFrame::lookVector. */ - class Ray lookRay() const; - - /** Up direction for this camera (its y axis). */ - inline Vector3 upVector() const { - return rotation.getColumn(1); - } - - inline Vector3 rightVector() const { - return rotation.getColumn(0); - } - - /** - If a viewer looks along the look vector, this is the viewer's "left". - Useful for strafing motions and building alternative coordinate frames. - */ - inline Vector3 leftVector() const { - return -rotation.getColumn(0); - } - - /** - Linearly interpolates between two coordinate frames, using - Quat::slerp for the rotations. - */ - CoordinateFrame lerp( - const CoordinateFrame& other, - float alpha) const; - -}; - -typedef CoordinateFrame CFrame; - -} // namespace - -#endif diff --git a/externals/g3dlite/G3D.lib/include/G3D/Crypto.h b/externals/g3dlite/G3D.lib/include/G3D/Crypto.h deleted file mode 100644 index f8266b8721b..00000000000 --- a/externals/g3dlite/G3D.lib/include/G3D/Crypto.h +++ /dev/null @@ -1,96 +0,0 @@ -/** - @file Crypto.h - - @maintainer Morgan McGuire, matrix@graphics3d.com - - - @created 2006-03-29 - @edited 2006-04-06 - */ - -#ifndef G3D_CRYPTO_H -#define G3D_CRYPTO_H - -#include "G3D/platform.h" -#include "G3D/g3dmath.h" -#include - -namespace G3D { - -/** See G3D::Crypto::md5 */ -class MD5Hash { -private: - - uint8 value[16]; - -public: - - MD5Hash() { - for (int i = 0; i < 16; ++i) { - value[i] = 0; - } - } - - explicit MD5Hash(class BinaryInput& b); - - uint8& operator[](int i) { - return value[i]; - } - - const uint8& operator[](int i) const { - return value[i]; - } - - bool operator==(const MD5Hash& other) const { - bool match = true; - for (int i = 0; i < 16; ++i) { - match = match && (other.value[i] == value[i]); - } - return match; - } - - inline bool operator!=(const MD5Hash& other) const { - return !(*this == other); - } - - void deserialize(class BinaryInput& b); - - void serialize(class BinaryOutput& b) const; -}; - - -/** Cryptography and hashing helper functions */ -class Crypto { -public: - - /** - Computes the CRC32 value of a byte array. CRC32 is designed to be a hash - function that produces different values for similar strings. - - This implementation is compatible with PKZIP and GZIP. - - Based on http://www.gamedev.net/reference/programming/features/crc32/ - */ - static uint32 crc32(const void* bytes, size_t numBytes); - - /** - Computes the MD5 hash (message digest) of a byte stream, as defined by - http://www.ietf.org/rfc/rfc1321.txt. - - @cite Based on implementation by L. Peter Deutsch, ghost@aladdin.com - */ - MD5Hash md5(const void* bytes, size_t numBytes); - - /** - Returns the nth prime less than 2000 in constant time. The first prime has index - 0 and is the number 2. - */ - static int smallPrime(int n); - - /** Returns 1 + the largest value that can be passed to smallPrime. */ - static int numSmallPrimes(); -}; - -} - -#endif diff --git a/externals/g3dlite/G3D.lib/include/G3D/Cylinder.h b/externals/g3dlite/G3D.lib/include/G3D/Cylinder.h deleted file mode 100644 index c341d29a2b9..00000000000 --- a/externals/g3dlite/G3D.lib/include/G3D/Cylinder.h +++ /dev/null @@ -1,92 +0,0 @@ -/** - @file Cylinder.h - - @maintainer Morgan McGuire, matrix@graphics3d.com - - @created 2003-02-07 - @edited 2005-09-26 - - Copyright 2000-2005, Morgan McGuire. - All rights reserved. - */ - -#ifndef G3D_Cylinder_H -#define G3D_Cylinder_H - -#include "G3D/platform.h" -#include "G3D/g3dmath.h" -#include "G3D/Vector3.h" - -namespace G3D { - -class Line; -class AABox; -/** - Right cylinder - */ -class Cylinder { -private: - Vector3 p1; - Vector3 p2; - - float mRadius; - -public: - - /** Uninitialized */ - Cylinder(); - Cylinder(class BinaryInput& b); - Cylinder(const Vector3& _p1, const Vector3& _p2, float _r); - void serialize(class BinaryOutput& b) const; - void deserialize(class BinaryInput& b); - - /** The line down the center of the Cylinder */ - Line axis() const; - - /** - A reference frame in which the center of mass is at the origin and - the Y-axis is the cylinder's axis. If the cylinder is transformed, this reference frame - may freely rotate around its axis.*/ - void getReferenceFrame(class CoordinateFrame& cframe) const; - - /** Returns point 0 or 1 */ - inline const Vector3& point(int i) const { - debugAssert(i >= 0 && i <= 1); - return (i == 0) ? p1 : p2; - } - - /** - Returns true if the point is inside the Cylinder or on its surface. - */ - bool contains(const Vector3& p) const; - - float area() const; - - float volume() const; - - float radius() const; - - /** Center of mass */ - inline Vector3 center() const { - return (p1 + p2) / 2.0f; - } - - inline float height() const { - return (p1 - p2).magnitude(); - } - - /** - Get close axis aligned bounding box. - With vertical world orientation, the top and bottom might not be very tight. */ - void getBounds(AABox& out) const; - - /** Random world space point with outward facing normal. */ - void getRandomSurfacePoint(Vector3& P, Vector3& N) const; - - /** Point selected uniformly at random over the volume. */ - Vector3 randomInteriorPoint() const; -}; - -} // namespace - -#endif diff --git a/externals/g3dlite/G3D.lib/include/G3D/Discovery.h b/externals/g3dlite/G3D.lib/include/G3D/Discovery.h deleted file mode 100644 index acd1c2c01d0..00000000000 --- a/externals/g3dlite/G3D.lib/include/G3D/Discovery.h +++ /dev/null @@ -1,589 +0,0 @@ -/** - @file Discovery.h - -

Discovery

- Discovery is the process by which computers on a Local Area Network (LAN) find - one another. The Discovery API allows clients to make a list of servers running - the same application. The application typically presents this list to the user - so he can choose which server to connect to. -

- Features of the Discovery API: -

- Low network traffic -
- Broadcasts mainly occur only when a new machine enters/leaves the network -
Responsive -
- Servers appear immediately after launching -
- Servers disappear immedatiately after they shut down -
Extensible -
- Add your own game information (e.g. score, num players, map name) -
Versioned -
- Tracks incompatible servers so end-users know to upgrade their client/server - -

Using the Discovery API

- - Subclass DiscoveryAdvertisement to add fields describing a server running your - application. For a game, these might be the current map name and the number - of players. -

- On the client, create an instance of DiscoveryClient. - On the server, create an instance of DiscoveryServer and initialize it with an - instance of your advertisement subclass. From your main loop, call doNetwork() - on the client and server instances. When your server shuts down, invoke cleanup() - on it. - - @maintainer Morgan McGuire, matrix@graphics3d.com - - @created 2003-06-26 - @edited 2008-11-24 - */ - -#ifndef G3D_DISCOVERY_H -#define G3D_DISCOVERY_H - -#include "G3D/platform.h" -#include "G3D/G3DGameUnits.h" -#include "G3D/NetworkDevice.h" -#include "G3D/Log.h" -#include - -/** - Different versions of G3D discovery protocols can't communicate with each other. - */ -#define G3D_DISCOVERY_PROTOCOL_NAME "G3D DISC" -#define G3D_DISCOVERY_PROTOCOL_VERSION 1 - -namespace G3D { - -/** - If a machine is running two different programs using discovery they - must have different ports. However different programs can share the - same ports if they run on the same LAN with different servers. - - @deprecated See Discovery2::Settings - */ -class DiscoverySettings { -public: - - /** - Name of the program using discovery; used so that mutliple - programs can use the same discovery ports on the same network. - */ - const char* appProtocolName; - - /** - Version of the network protocol of the program using discovery. - Used so that discovery can identify incompatible versions of - the server. - */ - int appProtocolVersion; - - /** - Port on which the server broadcasts its identity. The client - and server must agree on this value. - */ - uint16 serverBroadcastPort; - - /** - Port on which the client broadcasts a server request. The client - and server must agree on this value. - */ - uint16 clientBroadcastPort; - - /** - Clients connect into this port using a reliable conduit - to receive the advertisement from a server. The client - doesn't look at this value; it uses whatever the server - sends it. - */ - uint16 serverAdvertisementPort; - - /** - You can use the default G3D discovery ports as long as no other - program with the same protocol name is using this port. You - can run two different G3D discovery programs on the same - two ports as long as they have different application protocol - strings. - */ - DiscoverySettings( - const char* _appProtocolName, - int _appProtocolVersion, - uint16 _serverBroadcast = 6173, - uint16 _clientBroadcast = 6174, - uint16 _serverAdvertisementPort = 6175) : - appProtocolName(_appProtocolName), - appProtocolVersion(_appProtocolVersion), - serverBroadcastPort(_serverBroadcast), - clientBroadcastPort(_clientBroadcast), - serverAdvertisementPort(_serverAdvertisementPort) {} -}; - -/** - Make your own subclass of this advertisement. Add fields - (e.g. numPlayers, currentScore) to increase the amount - of information advertised. - - Overrides must provide a default constructor. - @deprecated See Discovery2::Settings - */ -class DiscoveryAdvertisement { -public: - - /** - Address to connect to on the server for the actual game. - The IP portion is ignored (the client figures out the IP - address from the packet itself) but the port is essential. - Note that this port must not be the discovery port. - */ - NetAddress address; - - /** - (Only used on the client) - Time since this advertisement was updated. - */ - RealTime lastUpdateTime; - - /** - Overrides must call DiscoveryAdvertisement::serialize(b) first. - */ - virtual void serialize(BinaryOutput& b) const; - - /** - Overrides must call DiscoveryAdvertisement::deserialize(b) first. - */ - virtual void deserialize(BinaryInput& b); - - /** - An empty virtual destructor for virtual methods. - */ - virtual ~DiscoveryAdvertisement() {} -}; - - -/** - Sent by servers to describe their location. - */ -class DiscoveryServerAddressMessage { -public: - - /** - Not part of the message; these settings are used to determine - if the correct protocol is being used. - */ - const DiscoverySettings* settings; - - - /** - Set to true if this server is running the correct protocol. - */ - bool correctProtocol; - - /** - This is set during the serialize process from the server's settings. - If different from the client's settings the discovery system will - classify this server as incompatible. - */ - int serverProtocolVersion[2]; - - Array address; - - DiscoveryServerAddressMessage() {} - DiscoveryServerAddressMessage(const DiscoverySettings* s) : settings(s) {} - - void serialize(BinaryOutput& b) const; - - void deserialize(BinaryInput& b); -}; - - -/** - Base class for DiscoveryClient and DiscoveryServer. - */ -class Discovery { -public: - - const DiscoverySettings* settings; - - enum { - SERVER_SHUTDOWN_MESSAGE = 2, - SERVER_BROADCAST_MESSAGE = 3, - CLIENT_BROADCAST_MESSAGE = 4}; - - /** - Only called from subclasses. - */ - virtual void init( - const DiscoverySettings* _settings) { - settings = _settings; - } - - /** - An empty virtual destructor for virtual methods. - */ - virtual ~Discovery() {} -}; - -/** @deprecated See Discovery2::Server*/ -class DiscoveryServer : private Discovery { -private: - - class ShutdownMessage { - public: - void serialize(BinaryOutput& b) const { (void)b; } - - void deserialize(BinaryInput& b) { (void)b; } - }; - - /** - For broadcast. - */ - LightweightConduitRef net; - - /** - Listen for clients wanting to hear the advertisement over - a reliable connection. - */ - NetListenerRef listener; - - DiscoveryAdvertisement* advertisement; - - /** - Broadcast across the lightweight conduit. - */ - DiscoveryServerAddressMessage addressMessage; - - /** - Servers periodically broadcast (unsolicited) in case - anyone missed the previous message. - */ - RealTime lastBroadcast; - - void sendAnnouncement() const; - - void sendShutDown() const; - -public: - - /** - You may update the advertisement (synchronously with calling doNetwork) - after it has been passed in. This allows a server to change the advertised - number of players or score for a game, for example. - - You must set the port of the @a _advertisement G3D::DiscoveryAdvertisement::address - to the port which the G3D::NetListener for the actual program protocol (not discovery) - is running. That field how the client knows what address to connect to using - G3D::ReliableConduit or G3D::LightweightConduit to actually initiate communication. - */ - virtual void init( - const DiscoverySettings* _settings, - DiscoveryAdvertisement* _advertisement); - - /** Returns the broadcast address in use.*/ - NetAddress broadcastAddress() const; - - /** - Returns true if this discovery server has been initialized - and is functioning properly. - */ - bool ok() const; - - /** - Call periodically to let the server do its job. - */ - void doNetwork(); - - /** - Broadcast a shutdown message. - */ - void cleanup(); -}; - - -/** - Used by DiscoveryClient to report servers running a different version - of this application's protocol. - */ -class IncompatibleServerDescription { -public: - NetAddress address; - int protocolVersion[2]; - RealTime lastUpdateTime; - - std::string toString() const; -}; - - -/** - Only one DiscoveryClient can be active on a given port at a time on - a single computer. - - AdType must be a subclass of DiscoveryAdvertisement. - - @deprecated See Discovery2::Client - */ -template -class DiscoveryClient : private Discovery { -public: - - /** - List of servers. Do not access on a second thread while in - doNetwork. - */ - Array serverList; - - /** - List of servers running the same application but a different protocol. - It is useful to show these to users to help them recognize version - conflicts between client and server. - Do not access on a second thread while in doNetwork. - */ - Array incompatibleServerList; - -private: - - class BroadcastMessage { - public: - void serialize(BinaryOutput& b) const {} - - void deserialize(BinaryInput& b) {} - }; - - /** - The client periodically checks servers to make sure they are still up - and to update its information about them. - */ - RealTime lastServerCheck; - - LightweightConduitRef net; - - /** - Returns an index in serverList of the server with the given address. - Returns -1 if there is none. Only checks IP addresses. - */ - int findServerListIndex(const NetAddress& addr) const { - for (int i = 0; i < serverList.size(); ++i) { - if (addr.ip() == serverList[i].address.ip()) { - return i; - } - } - - return -1; - } - - /** - Returns true if this discovery client has been initialized - and is functioning properly. - */ - bool ok() const { - return net->ok(); - } - - /** - Adds a server to the incompatible list if it is not already there. - */ - void addToIncompatibleList(const NetAddress& addr, uint32 p0, uint32 p1) { - const RealTime now = System::time(); - - bool alreadyHere = false; - - // Incorrect protocol; add to the incompatible list - for (int i = 0; i < incompatibleServerList.size(); ++i) { - IncompatibleServerDescription& server = incompatibleServerList[i]; - - if (server.address == addr) { - server.lastUpdateTime = now; - alreadyHere = true; - break; - } - } - - if (! alreadyHere) { - IncompatibleServerDescription server; - - server.lastUpdateTime = now; - server.address = addr; - server.protocolVersion[0] = p0; - server.protocolVersion[1] = p1; - - incompatibleServerList.append(server); - } - } - - /** - Connects to the specified server, reads its advertisement, - and adds it to the active server list. Returns true if the server - can be reached. - */ - bool readAdvertisement(const NetAddress& address) { - std::string hostname = address.toString(); - - RealTime TIMEOUT = 2.0; - - ReliableConduitRef server = ReliableConduit::create(address); - - if (! server->ok()) { - return false; - } - - AdType advertisement; - - // Read the advertisement - RealTime stopWaiting = System::time() + TIMEOUT; - bool timedOut = false; - - while (! server->messageWaiting() && ! timedOut && server->ok()) { - System::sleep(0.1); - timedOut = (System::time() > stopWaiting); - } - - if (timedOut) { - Log::common()->printf("Discovery: Timed out while reading advertisment from %s\n", - hostname.c_str()); - return false; - } - - - if (! server->ok()) { - Log::common()->printf("Discovery: Server %s dropped connection\n", hostname.c_str()); - return false; - } - - // Read the advertisement - debugAssert(server->messageWaiting()); - if (! server->receive(advertisement)) { - Log::common()->printf("Discovery: Server %s failed to send advertisement\n", hostname.c_str()); - return false; - } - - // Update existing server info or create a new entry - int index = findServerListIndex(address); - if (index == -1) { - index = serverList.size(); - serverList.resize(index + 1); - } - - // Update element index - advertisement.address = address; - serverList[index] = advertisement; - - return true; - } - - /** - Remove this address from our list if we previously - had a server there. - */ - void removeServer(const NetAddress& address) { - int index = findServerListIndex(address); - if (index > -1) { - serverList.fastRemove(index); - } - } - - /** - Tries to connect to the server through the addresses in the array. - */ - void addToServerList(const Array& addressArray) { - // Try to connect to each address listed - for (int a = addressArray.size() - 1; a >= 0; --a) { - const NetAddress& address = addressArray[a]; - - if (readAdvertisement(address)) { - // We've connected to the server - break; - } else { - removeServer(address); - } - } - } - - void checkRandomServer() { - if (serverList.size() >= 1) { - int index = iRandom(0, serverList.size() - 1); - - Array address; - address.append(serverList[index].address); - - // Remove this server - serverList.fastRemove(index); - - // Add it back with new info (or leave it removed if no response) - addToServerList(address); - } - } - -public: - - void init( - const DiscoverySettings* _settings) { - - Discovery::init(_settings); - - lastServerCheck = System::time(); - - net = LightweightConduit::create(settings->serverBroadcastPort, true, true); - - // Send announcement - NetAddress broadcast(NetworkDevice::instance()->broadcastAddressArray()[0], - settings->clientBroadcastPort); - BroadcastMessage tmp; - net->send(broadcast, CLIENT_BROADCAST_MESSAGE, tmp); - } - - /** Shut down the discovery client. */ - void cleanup() { - net = NULL; - } - - /** - Call this regularly (several times per second) to - update the server list. Not threadsafe-- you must not touch - the server list while this is running. This will not block. - */ - void doNetwork() { - if (net->messageWaiting()) { - NetAddress sender; - - switch (net->waitingMessageType()) { - case SERVER_SHUTDOWN_MESSAGE: - // Remove the server - net->receive(sender); - removeServer(sender); - break; - - case SERVER_BROADCAST_MESSAGE: - // Check the G3D protocol and the network protocol, then read the ad - DiscoveryServerAddressMessage msg(settings); - net->receive(sender, msg); - - if (msg.correctProtocol && (msg.address.size() > 0)) { - // Add the actual return address as the first one to be tried. - msg.address.append(NetAddress(sender.ip(), msg.address[0].port())); - - addToServerList(msg.address); - - } else { - - addToIncompatibleList( - sender, - msg.serverProtocolVersion[0], - msg.serverProtocolVersion[1]); - } - break; - } - } - - // Periodically re-check servers in the list to see if they crashed - // (if they shut down, they should have broadcast a shut down message). - RealTime now = System::time(); - const RealTime UPDATE_TIME_INTERVAL = 30; - - if (now > lastServerCheck + UPDATE_TIME_INTERVAL) { - lastServerCheck = now; - checkRandomServer(); - } - } -}; - -} - -#endif diff --git a/externals/g3dlite/G3D.lib/include/G3D/EqualsTrait.h b/externals/g3dlite/G3D.lib/include/G3D/EqualsTrait.h deleted file mode 100644 index acf17615b45..00000000000 --- a/externals/g3dlite/G3D.lib/include/G3D/EqualsTrait.h +++ /dev/null @@ -1,26 +0,0 @@ -/** - @file EqualsTrait.h - - @maintainer Morgan McGuire, morgan@cs.williams.edu - @created 2008-10-01 - @edited 2008-10-01 - Copyright 2000-2008, Morgan McGuire. - All rights reserved. - */ - -#ifndef G3D_EQUALSTRAIT_H -#define G3D_EQUALSTRAIT_H - -#include "G3D/platform.h" - -/** Default implementation of EqualsTrait. - @see G3D::Table for specialization requirements. -*/ -template struct EqualsTrait { - static bool equals(const Key& a, const Key& b) { - return a == b; - } -}; - -#endif - diff --git a/externals/g3dlite/G3D.lib/include/G3D/G3D.h b/externals/g3dlite/G3D.lib/include/G3D/G3D.h deleted file mode 100644 index 42ab18e2c24..00000000000 --- a/externals/g3dlite/G3D.lib/include/G3D/G3D.h +++ /dev/null @@ -1,150 +0,0 @@ -/** - @file graphics3D.h - - This header includes all of the graphics3D libraries in - appropriate namespaces. - - @maintainer Morgan McGuire, matrix@graphics3d.com - - @created 2001-08-25 - @edited 2008-11-01 - - Copyright 2000-2008, Morgan McGuire. - All rights reserved. -*/ - -#ifndef G3D_GRAPHICS3D_H -#define G3D_GRAPHICS3D_H - -#define NOMINMAX 1 -#ifdef min - #undef min -#endif -#ifdef max - #undef max -#endif - -#include "G3D/platform.h" -#include "G3D/Array.h" -#include "G3D/Queue.h" -#include "G3D/Crypto.h" -#include "G3D/format.h" -#include "G3D/Vector2.h" -#include "G3D/Vector3.h" -#include "G3D/Vector4.h" -#include "G3D/Color1.h" -#include "G3D/Color3.h" -#include "G3D/Color4.h" -#include "G3D/Matrix2.h" -#include "G3D/Matrix3.h" -#include "G3D/Matrix4.h" -#include "G3D/CoordinateFrame.h" -#include "G3D/PhysicsFrame.h" -#include "G3D/Plane.h" -#include "G3D/Line.h" -#include "G3D/Ray.h" -#include "G3D/Sphere.h" -#include "G3D/Box.h" -#include "G3D/AABox.h" -#include "G3D/WrapMode.h" -#include "G3D/Cone.h" -#include "G3D/Quat.h" -#include "G3D/stringutils.h" -#include "G3D/prompt.h" -#include "G3D/Table.h" -#include "G3D/Set.h" -#include "G3D/GUniqueID.h" -#include "G3D/BinaryFormat.h" -#include "G3D/BinaryInput.h" -#include "G3D/BinaryOutput.h" -#include "G3D/debug.h" -#include "G3D/G3DGameUnits.h" -#include "G3D/g3dmath.h" -#include "G3D/uint128.h" -#include "G3D/fileutils.h" -#include "G3D/ReferenceCount.h" - -template struct HashTrait< G3D::ReferenceCountedPointer > { - static size_t hashCode(G3D::ReferenceCountedPointer key) { return reinterpret_cast( key.pointer() ); } -}; - -#include "G3D/GImage.h" -#include "G3D/CollisionDetection.h" -#include "G3D/Log.h" -#include "G3D/serialize.h" -#include "G3D/TextInput.h" -#include "G3D/NetAddress.h" -#include "G3D/NetworkDevice.h" -#include "G3D/System.h" -#include "G3D/splinefunc.h" -#include "G3D/Spline.h" -#include "G3D/UprightFrame.h" -#include "G3D/LineSegment.h" -#include "G3D/Capsule.h" -#include "G3D/Cylinder.h" -#include "G3D/Triangle.h" -#include "G3D/Color3uint8.h" -#include "G3D/Color4uint8.h" -#include "G3D/Vector2int16.h" -#include "G3D/Vector3int16.h" -#include "G3D/Vector3int32.h" -#include "G3D/Vector4int8.h" -#include "G3D/ConvexPolyhedron.h" -#include "G3D/Discovery.h" -#include "G3D/MeshAlg.h" -#include "G3D/vectorMath.h" -#include "G3D/Rect2D.h" -#include "G3D/GCamera.h" -#include "G3D/GLight.h" -#include "G3D/AABSPTree.h" -#include "G3D/PointAABSPTree.h" -#include "G3D/TextOutput.h" -#include "G3D/MeshBuilder.h" -#include "G3D/Stopwatch.h" -#include "G3D/AtomicInt32.h" -#include "G3D/GThread.h" -#include "G3D/ThreadSet.h" -#include "G3D/RegistryUtil.h" -#include "G3D/AnyVal.h" -#include "G3D/PointHashGrid.h" -#include "G3D/Map2D.h" -#include "G3D/Image1.h" -#include "G3D/Image1uint8.h" -#include "G3D/Image3.h" -#include "G3D/Image3uint8.h" -#include "G3D/Image4.h" -#include "G3D/Image4uint8.h" -#include "G3D/filter.h" -#include "G3D/WeakCache.h" -#include "G3D/Pointer.h" -#include "G3D/Matrix.h" -#include "G3D/ImageFormat.h" - -#ifdef _MSC_VER -# pragma comment(lib, "zlib") -# pragma comment(lib, "ws2_32") -# pragma comment(lib, "winmm") -# pragma comment(lib, "imagehlp") -# pragma comment(lib, "gdi32") -# pragma comment(lib, "user32") -# pragma comment(lib, "kernel32") -# pragma comment(lib, "version") -# pragma comment(lib, "advapi32") -# pragma comment(lib, "png") -# pragma comment(lib, "jpeg") -# pragma comment(lib, "zip") -# ifdef _DEBUG - // Don't link against G3D when building G3D itself. -# ifndef G3D_BUILDING_LIBRARY_DLL -# pragma comment(lib, "G3Dd.lib") -# endif -# else - // Don't link against G3D when building G3D itself. -# ifndef G3D_BUILDING_LIBRARY_DLL -# pragma comment(lib, "G3D.lib") -# endif -# endif -#endif - -#endif - diff --git a/externals/g3dlite/G3D.lib/include/G3D/G3DAll.h b/externals/g3dlite/G3D.lib/include/G3D/G3DAll.h deleted file mode 100644 index feba3d6d390..00000000000 --- a/externals/g3dlite/G3D.lib/include/G3D/G3DAll.h +++ /dev/null @@ -1,26 +0,0 @@ -/** - @file G3DAll.h - - Includes all G3D and GLG3D files and uses the G3D namespace. - - This requires OpenGL and SDL headers. If you don't want all of this, - #include separately. - - @maintainer Morgan McGuire, matrix@graphics3d.com - - @created 2002-01-01 - @edited 2006-08-13 - - Copyright 2000-2006, Morgan McGuire. - All rights reserved. - */ - -#ifndef G3D_G3DALL_H -#define G3D_G3DALL_H - -#include "G3D/G3D.h" -#include "GLG3D/GLG3D.h" - -using namespace G3D; - -#endif diff --git a/externals/g3dlite/G3D.lib/include/G3D/G3DGameUnits.h b/externals/g3dlite/G3D.lib/include/G3D/G3DGameUnits.h deleted file mode 100644 index bc4c873f290..00000000000 --- a/externals/g3dlite/G3D.lib/include/G3D/G3DGameUnits.h +++ /dev/null @@ -1,44 +0,0 @@ -/** - @file G3DGameUnits.h - - @maintainer Morgan McGuire, matrix@graphics3d.com - @created 2002-10-05 - @edited 2006-11-10 - */ - -#ifndef G3D_GAMEUNITS_H -#define G3D_GAMEUNITS_H - -#include "G3D/platform.h" - -namespace G3D { -/** - Time, in seconds. - */ -typedef double GameTime; -typedef double SimTime; - -/** - Actual wall clock time in seconds. - */ -typedef double RealTime; - -enum AMPM {AM, PM}; - -enum {SECOND=1, MINUTE=60, HOUR = 60*60, DAY=24*60*60, SUNRISE=24*60*60/4, SUNSET=24*60*60*3/4, MIDNIGHT=0, METER=1, KILOMETER=1000}; - -#define CENTIMETER (0.01) -#define DECIMETER (0.1) - -/** - Converts a 12 hour clock time into the number of seconds since - midnight. Note that 12:00 PM is noon and 12:00 AM is midnight. - - Example: toSeconds(10, 00, AM) - */ -SimTime toSeconds(int hour, int minute, double seconds, AMPM ap); -SimTime toSeconds(int hour, int minute, AMPM ap); - -} - -#endif diff --git a/externals/g3dlite/G3D.lib/include/G3D/GCamera.h b/externals/g3dlite/G3D.lib/include/G3D/GCamera.h deleted file mode 100644 index 4dfa500883b..00000000000 --- a/externals/g3dlite/G3D.lib/include/G3D/GCamera.h +++ /dev/null @@ -1,294 +0,0 @@ -/** - @file GCamera.h - - @maintainer Morgan McGuire, matrix@graphics3d.com - - @created 2005-07-20 - @edited 2007-07-24 -*/ - -#ifndef G3D_GCamera_H -#define G3D_GCamera_H - -#include "G3D/platform.h" -#include "G3D/CoordinateFrame.h" -#include "G3D/Vector3.h" -#include "G3D/Plane.h" -#include "G3D/debugAssert.h" - -namespace G3D { - -class Matrix4; -class Rect2D; - -/** - Abstraction of a pinhole camera. - - The area a camera sees is called a frustum. It is bounded by the near plane, the far plane, and the sides - of the view frame projected into the scene. It has the shape of a pyramid with the top cut off. - - Cameras can project points from 3D to 2D. The "unit" projection matches OpenGL. It maps the entire view frustum - to a cube of unit radius (i.e., edges of length 2) centered at the origin. The non-unit projection then maps - that cube to the specified pixel viewport in X and Y and the range [0, 1] in Z. The projection is reversable - as long as the projected Z value is known. - - All viewport arguments are the pixel bounds of the viewport-- e.g., - RenderDevice::viewport(). - */ -class GCamera { - -public: - /** - Stores the direction of the field of view - */ - enum FOVDirection {HORIZONTAL, VERTICAL}; - -private: - - - /** field of view (in radians) */ - float m_fieldOfView; - - /** Clipping plane, *not* imaging plane. Negative numbers. */ - float m_nearPlaneZ; - - /** Negative */ - float m_farPlaneZ; - - /** Stores the camera's location and orientation */ - CoordinateFrame m_cframe; - - /** Horizontal or Vertical */ - FOVDirection m_direction; - -public: - - class Frustum { - public: - class Face { - public: - /** Counter clockwise indices into vertexPos */ - int vertexIndex[4]; - - /** The plane containing the face. */ - Plane plane; - }; - - /** The vertices, in homogeneous space. If w == 0, - a vertex is at infinity. */ - Array vertexPos; - - /** The faces in the frustum. When the - far plane is at infinity, there are 5 faces, - otherwise there are 6. The faces are in the order - N,R,L,B,T,[F]. - */ - Array faceArray; - }; - - GCamera(); - - virtual ~GCamera(); - - /** Returns the current coordinate frame */ - const CoordinateFrame& coordinateFrame() const { - return m_cframe; - } - - /** Sets c to the camera's coordinate frame */ - void getCoordinateFrame(CoordinateFrame& c) const; - - /** Sets a new coordinate frame for the camera */ - void setCoordinateFrame(const CoordinateFrame& c); - - /** Sets P equal to the camera's projection matrix */ - void getProjectUnitMatrix(const Rect2D& viewport, Matrix4& P) const; - - /** Converts projected points from OpenGL standards - (-1, 1) to normal 3D coordinate standards (0, 1) */ - Vector3 convertFromUnitToNormal(const Vector3& in, const Rect2D& viewport) const; - - /** - Sets the vertical field of view, in radians. The - initial angle is toRadians(55). Must specify the direction of the angle - */ - void setFieldOfView(float angle, FOVDirection direction); - - /** Returns the current field of view angle and direction */ - inline void getFieldOfView(float& angle, FOVDirection& direction) const { - angle = m_fieldOfView; - direction = m_direction; - } - - /** - Projects a world space point onto a width x height screen. The - returned coordinate uses pixmap addressing: x = right and y = - down. The resulting z value is 0 at the near plane, 1 at the far plane, - and is a linear compression of unit cube projection. - - If the point is behind the camera, Vector3::inf() is returned. - */ - Vector3 project(const G3D::Vector3& point, - const class Rect2D& viewport) const; - - /** - Projects a world space point onto a unit cube. The resulting - x,y,z values range between -1 and 1, where z is -1 - at the near plane and 1 at the far plane and varies hyperbolically in between. - - If the point is behind the camera, Vector3::inf() is returned. - */ - Vector3 projectUnit(const G3D::Vector3& point, - const class Rect2D& viewport) const; - - /** - Gives the world-space coordinates of screen space point v, where - v.x is in pixels from the left, v.y is in pixels from - the top, and v.z is on the range 0 (near plane) to 1 (far plane). - */ - Vector3 unproject(const Vector3& v, const Rect2D& viewport) const; - - /** - Gives the world-space coordinates of unit cube point v, where - v varies from -1 to 1 on all axes. The unproject first - transforms the point into a pixel location for the viewport, then calls unproject - */ - Vector3 unprojectUnit(const Vector3& v, const Rect2D& viewport) const; - - /** - Returns the pixel area covered by a shape of the given - world space area at the given z value (z must be negative). - */ - float worldToScreenSpaceArea(float area, float z, const class Rect2D& viewport) const; - - /** - Returns the world space 3D viewport corners. These - are at the near clipping plane. The corners are constructed - from the nearPlaneZ, viewportWidth, and viewportHeight. - "left" and "right" are from the GCamera's perspective. - */ - void getNearViewportCorners(const class Rect2D& viewport, - Vector3& outUR, Vector3& outUL, - Vector3& outLL, Vector3& outLR) const; - - /** - Returns the world space 3D viewport corners. These - are at the Far clipping plane. The corners are constructed - from the nearPlaneZ, farPlaneZ, viewportWidth, and viewportHeight. - "left" and "right" are from the GCamera's perspective. - */ - void getFarViewportCorners(const class Rect2D& viewport, - Vector3& outUR, Vector3& outUL, - Vector3& outLL, Vector3& outLR) const; - - /** - Returns the image plane depth, assumes imagePlane - is the same as the near clipping plane. - returns a positive number. - */ - float imagePlaneDepth() const; - - /** - Returns the world space ray passing through the center of pixel - (x, y) on the image plane. The pixel x and y axes are opposite - the 3D object space axes: (0,0) is the upper left corner of the screen. - They are in viewport coordinates, not screen coordinates. - - The ray origin is at the origin. To start it at the image plane, - move it forward by imagePlaneDepth/ray.direction.z - - Integer (x, y) values correspond to - the upper left corners of pixels. If you want to cast rays - through pixel centers, add 0.5 to x and y. - */ - Ray worldRay( - float x, - float y, - const class Rect2D& viewport) const; - - /** - Returns a negative z-value. - */ - inline float nearPlaneZ() const { - return m_nearPlaneZ; - } - - /** - Returns a negative z-value. - */ - inline float farPlaneZ() const { - return m_farPlaneZ; - } - - /** - Sets a new value for the far clipping plane - Expects a negative value - */ - inline void setFarPlaneZ(float z) { - debugAssert(z < 0); - m_farPlaneZ = z; - } - - /** - Sets a new value for the near clipping plane - Expects a negative value - */ - inline void setNearPlaneZ(float z) { - debugAssert(z < 0); - m_nearPlaneZ = z; - } - - /** - Returns the camera space width of the viewport at the near plane. - */ - float viewportWidth(const class Rect2D& viewport) const; - - /** - Returns the camera space height of the viewport at the near plane. - */ - float viewportHeight(const class Rect2D& viewport) const; - - void setPosition(const Vector3& t); - - /** Rotate the camera in place to look at the target. Does not - persistently look at that location when the camera moves; - i.e., if you move the camera and still want it to look at the - old target, you must call lookAt again after moving the - camera.)*/ - void lookAt(const Vector3& position, const Vector3& up = Vector3::unitY()); - - /** - Returns the clipping planes of the frustum, in world space. - The planes have normals facing into the view frustum. - - The plane order is guaranteed to be: - Near, Right, Left, Top, Bottom, [Far] - - If the far plane is at infinity, the resulting array will have - 5 planes, otherwise there will be 6. - - The viewport is used only to determine the aspect ratio of the screen; the - absolute dimensions and xy values don't matter. - */ - void getClipPlanes - ( - const Rect2D& viewport, - Array& outClip) const; - - /** - Returns the world space view frustum, which is a truncated pyramid describing - the volume of space seen by this camera. - */ - void frustum(const Rect2D& viewport, GCamera::Frustum& f) const; - - GCamera::Frustum frustum(const Rect2D& viewport) const; - - /** Read and Write camera parameters */ - void serialize(class BinaryOutput& bo) const; - void deserialize(class BinaryInput& bi); - -}; - -} // namespace G3D - -#endif diff --git a/externals/g3dlite/G3D.lib/include/G3D/GImage.h b/externals/g3dlite/G3D.lib/include/G3D/GImage.h deleted file mode 100644 index 12003514d6a..00000000000 --- a/externals/g3dlite/G3D.lib/include/G3D/GImage.h +++ /dev/null @@ -1,550 +0,0 @@ -/** - @file GImage.h - - See G3D::GImage for details. - - @cite JPEG compress/decompressor is the IJG library, used in accordance with their license. - @cite JPG code by John Chisholm, using the IJG Library - @cite TGA code by Morgan McGuire - @cite BMP code by John Chisholm, based on code by Edward "CGameProgrammer" Resnick mailto:cgp@gdnmail.net at ftp://ftp.flipcode.com/cotd/LoadPicture.txt - @cite PCX format described in the ZSOFT PCX manual http://www.nist.fss.ru/hr/doc/spec/pcx.htm#2 - @cite PNG compress/decompressor is the libpng library, used in accordance with their license. - @cite PPM code by Morgan McGuire based on http://netpbm.sourceforge.net/doc/ppm.html - - @maintainer Morgan McGuire, morgan@graphics3d.com - @created 2002-05-27 - @edited 2007-01-31 - - Copyright 2000-2007, Morgan McGuire. - All rights reserved. - - */ - -#ifndef G3D_GIMAGE_H -#define G3D_GIMAGE_H - -#include "G3D/platform.h" -#include -#include "G3D/Array.h" -#include "G3D/g3dmath.h" -#include "G3D/stringutils.h" -#include "G3D/Color1uint8.h" -#include "G3D/Color3uint8.h" -#include "G3D/Color4uint8.h" - -namespace G3D { -class BinaryInput; -class BinaryOutput; -/** - Interface to image compression & file formats. - - Supported formats (decode and encode): Color JPEG, PNG, (Uncompressed)TGA 24, (Uncompressed)TGA 32, BMP 1, BMP 4, BMP 8, BMP 24, PPM (P6), and PPM ASCII (P1, P2, P3). - 8-bit paletted PCX, 24-bit PCX, and ICO are supported for decoding only. - - Sample usage: - - 

-    #include "graphics3D.h"
-
-    // Loading from disk:
-    G3D::GImage im1 = G3D::GImage("test.jpg");
-    
-    // Loading from memory:
-    G3D::GImage im2 = G3D::GImage(data, length);
-
-    // im.pixel is a pointer to RGB color data.  If you want
-    // an alpha channel, call RGBtoRGBA or RGBtoARGB for
-    // conversion.
-
-    // Saving to memory:
-    G3D::GImage im3 = G3D::GImage(width, height);
-    // (Set the pixels of im3...) 
-    uint8* data2;
-    int    len2;
-    im3.encode(G3D::GImage::JPEG, data2, len2);
-
-    // Saving to disk
-    im3.save("out.jpg");
-
- - The free Image Magick Magick Wand API - (http://www.imagemagick.org/www/api/magick_wand.html) provides a more powerful - API for image manipulation and wider set of image load/save formats. It is - recommended over GImage (we don't include it directly in G3D because their license - is more restrictive than the BSD one). - - */ -class GImage { -private: - uint8* _byte; - -public: - - class Error { - public: - Error( - const std::string& reason, - const std::string& filename = "") : - reason(reason), filename(filename) {} - - std::string reason; - std::string filename; - }; - - enum Format {JPEG, BMP, TGA, PCX, ICO, PNG, PPM_ASCII, PPM, AUTODETECT, UNKNOWN}; - - int width; - int height; - - /** - The number of channels; either 3 (RGB) or 4 (RGBA) - */ - int channels; - - inline const uint8* byte() const { - return _byte; - } - - /** Returns a pointer to the upper left pixel - as Color3uint8. - */ - inline const Color3uint8* pixel3() const { - debugAssertM(channels == 3, format("Tried to call GImage::pixel3 on an image with %d channels", channels)); - return (Color3uint8*)_byte; - } - - /** Returns a pointer to the upper left pixel - as Color4uint8. - */ - inline const Color4uint8* pixel4() const { - debugAssertM(channels == 4, format("Tried to call GImage::pixel4 on an image with %d channels", channels)); - return (Color4uint8*)_byte; - } - - inline const Color1uint8* pixel1() const { - debugAssertM(channels == 1, format("Tried to call GImage::pixel1 on an image with %d channels", channels)); - return (Color1uint8*)_byte; - } - - inline Color1uint8* pixel1() { - debugAssertM(channels == 1, format("Tried to call GImage::pixel1 on an image with %d channels", channels)); - return (Color1uint8*)_byte; - } - - /** Returns the pixel at (x, y), where (0,0) is the upper left. */ - inline const Color1uint8& pixel1(int x, int y) const { - debugAssert(x >= 0 && x < width); - debugAssert(y >= 0 && y < height); - return pixel1()[x + y * width]; - } - - /** Returns the pixel at (x, y), where (0,0) is the upper left. */ - inline Color1uint8& pixel1(int x, int y) { - debugAssert(x >= 0 && x < width); - debugAssert(y >= 0 && y < height); - return pixel1()[x + y * width]; - } - - /** Returns the pixel at (x, y), where (0,0) is the upper left. */ - inline const Color3uint8& pixel3(int x, int y) const { - debugAssert(x >= 0 && x < width); - debugAssert(y >= 0 && y < height); - return pixel3()[x + y * width]; - } - - inline Color3uint8& pixel3(int x, int y) { - debugAssert(x >= 0 && x < width); - debugAssert(y >= 0 && y < height); - return pixel3()[x + y * width]; - } - - /** Returns the pixel at (x, y), where (0,0) is the upper left. */ - inline const Color4uint8& pixel4(int x, int y) const { - debugAssert(x >= 0 && x < width); - debugAssert(y >= 0 && y < height); - return pixel4()[x + y * width]; - } - - inline Color4uint8& pixel4(int x, int y) { - debugAssert(x >= 0 && x < width); - debugAssert(y >= 0 && y < height); - return pixel4()[x + y * width]; - } - - inline uint8* byte() { - return _byte; - } - - inline Color3uint8* pixel3() { - debugAssert(channels == 3); - return (Color3uint8*)_byte; - } - - inline Color4uint8* pixel4() { - debugAssert(channels == 4); - return (Color4uint8*)_byte; - } - -private: - - void encodeBMP( - BinaryOutput& out) const; - - /** - The TGA file will be either 24- or 32-bit depending - on the number of channels. - */ - void encodeTGA( - BinaryOutput& out) const; - - /** - Converts this image into a JPEG - */ - void encodeJPEG( - BinaryOutput& out) const; - - /** - Converts this image into a JPEG - */ - void encodePNG( - BinaryOutput& out) const; - - void encodePPM( - BinaryOutput& out) const; - - void encodePPMASCII( - BinaryOutput& out) const; - - void decodeTGA( - BinaryInput& input); - - void decodeBMP( - BinaryInput& input); - - void decodeJPEG( - BinaryInput& input); - - void decodePCX( - BinaryInput& input); - - void decodeICO( - BinaryInput& input); - - void decodePNG( - BinaryInput& input); - - void decodePPM( - BinaryInput& input); - - void decodePPMASCII( - BinaryInput& input); - - /** - Given [maybe] a filename, memory buffer, and [maybe] a format, - returns the most likely format of this file. - */ - static Format resolveFormat( - const std::string& filename, - const uint8* data, - int dataLen, - Format maybeFormat); - - void _copy( - const GImage& other); - -public: - static Format resolveFormat(const std::string& filename); - - GImage() { - width = height = channels = 0; - _byte = NULL; - } - - /** - Load an encoded image from disk and decode it. - Throws GImage::Error if something goes wrong. - */ - GImage( - const std::string& filename, - Format format = AUTODETECT); - - /** - Decodes an image stored in a buffer. - */ - GImage( - const unsigned char*data, - int length, - Format format = AUTODETECT); - - /** - Create an empty image of the given size. - */ - GImage( - int width, - int height, - int channels = 3); - - GImage( - const GImage& other); - - GImage& operator=(const GImage& other); - - /** - Returns a new GImage that has 4 channels. RGB is - taken from this GImage and the alpha from the red - channel of the supplied image. The new GImage is passed - as a reference parameter for speed. - */ - void insertRedAsAlpha(const GImage& alpha, GImage& output) const; - - GImage G3D_DEPRECATED insertRedAsAlpha(const GImage& alpha) const; - - /** - Returns a new GImage with 3 channels, removing - the alpha channel if there is one. The new GImage - is passed as a reference parameter for speed. - */ - void stripAlpha(GImage& output) const; - - GImage G3D_DEPRECATED stripAlpha() const; - - /** - Loads an image from disk (clearing the old one first). - */ - void load( - const std::string& filename, - Format format = AUTODETECT); - - /** - Frees memory and resets to a 0x0 image. - */ - void clear(); - - /** - Deallocates the pixels. - */ - virtual ~GImage(); - - /** - Resizes the internal buffer to (width x height) with the - number of channels specified. All data is set to 0 (black). - */ - void resize(int width, int height, int channels); - - - /** - Copies src sub-image data into dest at a certain offset. - The dest variable must already contain an image that is large - enough to contain the src sub-image at the specified offset. - Returns true on success and false if the src sub-image cannot - completely fit within dest at the specified offset. Both - src and dest must have the same number of channels. - */ - static bool pasteSubImage(GImage & dest, const GImage & src, - int destX, int destY, int srcX, int srcY, int srcWidth, int srcHeight); - - /** - creates dest from src sub-image data. - Returns true on success and false if the src sub-image - is not within src. - */ - static bool copySubImage(GImage & dest, const GImage & src, - int srcX, int srcY, int srcWidth, int srcHeight); - - void convertToRGBA(); - - void convertToRGB(); - - /** Averages color channels if they exist */ - void convertToL8(); - - /** - Returns true if format is supported. Format - should be an extension string (e.g. "BMP"). - */ - static bool supportedFormat( - const std::string& format); - - /** - Converts a string to an enum, returns UNKNOWN if not recognized. - */ - static Format stringToFormat( - const std::string& format); - - /** - Encode and save to disk. - */ - void save( - const std::string& filename, - Format format = AUTODETECT) const; - - /** - The caller must delete the returned buffer. - */ - void encode( - Format format, - uint8*& outData, - int& outLength) const; - - /** - Does not commit the BinaryOutput when done. - */ - void encode( - Format format, - BinaryOutput& out) const; - - /** - Decodes the buffer into this image. - @format Must be the correct format. - */ - void decode( - BinaryInput& input, - Format format); - - /** Returns the size of this object in bytes */ - int sizeInMemory() const; - - - /** Ok for in == out */ - static void R8G8B8_to_Y8U8V8(int width, int height, const uint8* in, uint8* out); - - /** Ok for in == out */ - static void Y8U8V8_to_R8G8B8(int width, int height, const uint8* in, uint8* out); - - /** - @param in RGB buffer of numPixels * 3 bytes - @param out Buffer of numPixels * 4 bytes - @param numPixels Number of RGB pixels to convert - */ - static void RGBtoRGBA( - const uint8* in, - uint8* out, - int numPixels); - - static void RGBtoARGB( - const uint8* in, - uint8* out, - int numPixels); - - /** Safe for in == out */ - static void RGBtoBGR( - const uint8* in, - uint8* out, - int numPixels); - - /** - Win32 32-bit HDC format. - */ - static void RGBtoBGRA( - const uint8* in, - uint8* out, - int numPixels); - - static void RGBAtoRGB( - const uint8* in, - uint8* out, - int numPixels); - /** - Uses the red channel of the second image as an alpha channel. - */ - static void RGBxRGBtoRGBA( - const uint8* colorRGB, - const uint8* alphaRGB, - uint8* out, - int numPixels); - - /** - Flips the image along the vertical axis. - Safe for in == out. - */ - static void flipRGBVertical( - const uint8* in, - uint8* out, - int width, - int height); - - static void flipRGBAVertical( - const uint8* in, - uint8* out, - int width, - int height); - - /** - Given a tangent space bump map, computes a new image where the - RGB channels are a tangent space normal map and the alpha channel - is the original bump map. Assumes the input image is tileable. - - In the resulting image, x = red = tangent, y = green = binormal, and z = blue = normal. - - Particularly useful as part of the idiom: - 
- 	    GImage normal;
-	    computeNormalMap(GImage(filename), normal);
-	    return Texture::fromGImage(filename, normal);
-
- - @param lowPassBump If true, a 9x9 filter of 1's is used to low-pass filter the elevations, - which produces better results for parallax mapping. - - @param scaleHeightByNz After computing normals, scale the height by |N.z|, a trick that - reduces texture swim in steep areas for parallax mapping. - - @param whiteHeightInPixels How high should the brightest input value be considered for purposes - of normal computation, compared to the horizontal and vertical size of a pixel. - A value of 255 means that a 255 x 255 bump image with a full black-to-white gradient will - produce a 45-degree ramp (this also results in "cubic" voxels). - A special (default) value of -1 means scale the effective white height so that it is equal - to the larger spatial dimension. - */ - static void computeNormalMap( - const class GImage& bump, - class GImage& normal, - float whiteHeightInPixels = -1.0f, - bool lowPassBump = false, - bool scaleHeightByNz = false); - - static void computeNormalMap( - int width, - int height, - int channels, - const uint8* src, - GImage& normal, - float whiteHeightInPixels, - bool lowPassBump, - bool scaleHeightByNz); - - /** - Bayer demosaicing using the filter proposed in - - HIGH-QUALITY LINEAR INTERPOLATION FOR DEMOSAICING OF BAYER-PATTERNED COLOR IMAGES - Henrique S. Malvar, Li-wei He, and Ross Cutler - - The filter wraps at the image boundaries. - - Assumes in != out. - */ - static void BAYER_G8B8_R8G8_to_R8G8B8_MHC(int w, int h, const uint8* in, uint8* _out); - static void BAYER_G8R8_B8G8_to_R8G8B8_MHC(int w, int h, const uint8* in, uint8* _out); - static void BAYER_R8G8_G8B8_to_R8G8B8_MHC(int w, int h, const uint8* in, uint8* _out); - static void BAYER_B8G8_G8R8_to_R8G8B8_MHC(int w, int h, const uint8* in, uint8* _out); - - /** Fast conversion; the output has 1/2 the size of the input in each direction. Assumes in != out. - See G3D::BAYER_G8B8_R8G8_to_R8G8B8_MHC for a much better result. */ - static void BAYER_G8B8_R8G8_to_Quarter_R8G8B8(int inWidth, int inHeight, const uint8* in, uint8* out); - - /** Attempt to undo fast conversion of G3D::BAYER_G8B8_R8G8_to_Quarter_R8G8B8; - the green channel will lose data. Assumes in != out - The input should have size 3 * inWidth * inHeight. The output should have size - 2 * inWidth * 2 * inHeight. - */ - static void Quarter_R8G8B8_to_BAYER_G8B8_R8G8(int inWidth, int inHeight, const uint8* in, uint8* out); - - /** Overwrites every pixel with one of the two colors in a checkerboard pattern. - The fields used from the two colors depend on the current number of channels in @a im. - */ - static void makeCheckerboard(GImage& im, int checkerSize = 1, const Color4uint8& color1 = Color4uint8(255,255,255,255), const Color4uint8& color2 = Color4uint8(0,0,0,255)); -}; - -} - -#endif diff --git a/externals/g3dlite/G3D.lib/include/G3D/GLight.h b/externals/g3dlite/G3D.lib/include/G3D/GLight.h deleted file mode 100644 index b8fa7b54261..00000000000 --- a/externals/g3dlite/G3D.lib/include/G3D/GLight.h +++ /dev/null @@ -1,72 +0,0 @@ -/** - @file GLight.h - - @maintainer Morgan McGuire, matrix@graphics3d.com - - @created 2003-11-12 - @edited 2006-02-08 -*/ - -#ifndef G3D_GLIGHT_H -#define G3D_GLIGHT_H - -#include "G3D/platform.h" -#include "G3D/Vector4.h" -#include "G3D/Vector3.h" -#include "G3D/Color4.h" - -namespace G3D { - -/** - A light representation that closely follows the OpenGL light format. - */ -class GLight { -public: - /** World space position (for a directional light, w = 0 */ - Vector4 position; - - /** Direction in which the light faces, if a spot light. This is the "look vector" of the light source. */ - Vector3 spotDirection; - - /** In degrees. 180 = no cutoff (point/dir) >90 = spot light */ - float spotCutoff; - - /** Constant, linear, quadratic */ - float attenuation[3]; - - /** May be outside the range [0, 1] */ - Color3 color; - - /** If false, this light is ignored */ - bool enabled; - - /** If false, this light does not create specular highlights (useful when using negative lights). */ - bool specular; - - /** If false, this light does not create diffuse illumination (useful when rendering a specular-only pass). */ - bool diffuse; - - GLight(); - - /** @param toLight will be normalized */ - static GLight directional(const Vector3& toLight, const Color3& color, bool specular = true, bool diffuse = true); - - static GLight point(const Vector3& pos, const Color3& color, float constAtt = 1, float linAtt = 0, float quadAtt = 0.5f, bool specular = true, bool diffuse = true); - - /** @param pointDirection Will be normalized. Points in the direction that light propagates. - @param cutOffAngleDegrees Must be on the range [0, 90]. This is the angle from the point direction - to the edge of the light cone. - */ - static GLight spot(const Vector3& pos, const Vector3& pointDirection, float cutOffAngleDegrees, const Color3& color, float constAtt = 1, float linAtt = 0, float quadAtt = 0, bool specular = true, bool diffuse = true); - - /** Returns the sphere within which this light has some noticable effect. May be infinite. - @param cutoff The value at which the light intensity is considered negligible. */ - class Sphere effectSphere(float cutoff = 30.0f / 255) const; - - bool operator==(const GLight& other) const; - bool operator!=(const GLight& other) const; -}; - -} // namespace -#endif - diff --git a/externals/g3dlite/G3D.lib/include/G3D/GThread.h b/externals/g3dlite/G3D.lib/include/G3D/GThread.h deleted file mode 100644 index 63f1c235bda..00000000000 --- a/externals/g3dlite/G3D.lib/include/G3D/GThread.h +++ /dev/null @@ -1,169 +0,0 @@ -/** - @file GThread.h - - @created 2005-09-22 - @edited 2007-01-31 - - */ - -#ifndef G3D_GTHREAD_H -#define G3D_GTHREAD_H - -#include "G3D/platform.h" -#include "G3D/ReferenceCount.h" -#include - -#ifndef G3D_WIN32 -# include -# include -#endif - - -namespace G3D { - -typedef ReferenceCountedPointer GThreadRef; - -/** - Platform independent thread implementation. You can either subclass and - override GThread::threadMain or call the create method with a method. - - Beware of reference counting and threads. If circular references exist between - GThread subclasses then neither class will ever be deallocated. Also, - dropping all pointers (and causing deallocation) of a GThread does NOT - stop the underlying process. - - @sa G3D::GMutex, G3D::AtomicInt32 -*/ -class GThread : public ReferenceCountedObject { -private: - // "Status" is a reserved work on FreeBSD - enum GStatus {STATUS_CREATED, STATUS_STARTED, STATUS_RUNNING, STATUS_COMPLETED}; - - // Not implemented on purpose, don't use - GThread(const GThread &); - GThread& operator=(const GThread&); - bool operator==(const GThread&); - -#ifdef G3D_WIN32 - static DWORD WINAPI internalThreadProc(LPVOID param); -#else - static void* internalThreadProc(void* param); -#endif //G3D_WIN32 - - volatile GStatus m_status; - - // Thread handle to hold HANDLE and pthread_t -#ifdef G3D_WIN32 - HANDLE m_handle; - HANDLE m_event; -#else - pthread_t m_handle; -#endif //G3D_WIN32 - - std::string m_name; - -public: - - GThread(const std::string& name); - - virtual ~GThread(); - - /** Constructs a basic GThread without requiring a subclass. - - @param proc The global or static function for the threadMain() */ - static GThreadRef create(const std::string& name, void (*proc)(void*), void* param); - - /** @deprecated use overload that accepts void* param */ - static GThreadRef create(const std::string& name, void (*proc)()); - - /** Starts the thread and executes threadMain(). Returns false if - the thread failed to start (either because it was already started - or because the OS refused).*/ - bool start(); - - /** Terminates the thread without notifying or - waiting for a cancelation point. */ - void terminate(); - - /** - Returns true if threadMain is currently executing. This will - only be set when the thread is actually running and might not - be set when start() returns. */ - bool running() const; - - /** True after start() has been called, even through the thread - may have already completed(), or be currently running().*/ - bool started() const; - - /** Returns true if the thread has exited. */ - bool completed() const; - - /** Waits for the thread to finish executing. */ - void waitForCompletion(); - - /** Returns thread name */ - inline const std::string& name() { - return m_name; - } - - /** Overriden by the thread implementor */ - virtual void threadMain() = 0; -}; - - -/** - Mutual exclusion lock used for synchronization. - @sa G3D::GThread, G3D::AtomicInt32 -*/ -class GMutex { -private: -# ifdef G3D_WIN32 - CRITICAL_SECTION m_handle; -# else - pthread_mutex_t m_handle; -# endif - - // Not implemented on purpose, don't use - GMutex(const GMutex &mlock); - GMutex &operator=(const GMutex &); - bool operator==(const GMutex&); - -public: - GMutex(); - ~GMutex(); - - /** Locks the mutex or blocks until available. */ - void lock(); - - /** Unlocks the mutex. */ - void unlock(); -}; - - -/** - Automatically locks while in scope. -*/ -class GMutexLock { -private: - GMutex* m; - - // Not implemented on purpose, don't use - GMutexLock(const GMutexLock &mlock); - GMutexLock &operator=(const GMutexLock &); - bool operator==(const GMutexLock&); - -public: - GMutexLock(GMutex* mutex) { - m = mutex; - m->lock(); - } - - ~GMutexLock() { - m->unlock(); - } -}; - - -} // namespace G3D - -#endif //G3D_GTHREAD_H diff --git a/externals/g3dlite/G3D.lib/include/G3D/GUniqueID.h b/externals/g3dlite/G3D.lib/include/G3D/GUniqueID.h deleted file mode 100644 index 44ec6e03405..00000000000 --- a/externals/g3dlite/G3D.lib/include/G3D/GUniqueID.h +++ /dev/null @@ -1,69 +0,0 @@ -/** - @file GUniqueID.h - @author Morgan McGuire, morgan@cs.williams.edu - */ -#ifndef G3D_GUNIQUEID_H -#define G3D_GUNIQUEID_H - -#include "G3D/platform.h" -#include "G3D/g3dmath.h" -#include "G3D/Table.h" - -namespace G3D { - -/** Globally unique identifiers. The probability of two different - programs generating the same value from UniqueID::create is - vanishingly small. - - UniqueIDs optionally contain a 10-bit application specific tag - that distinguishes their type. -*/ -class GUniqueID { -private: - - uint64 id; - -public: - - GUniqueID() : id(0) {} - - bool uninitialized() const { - return id == 0; - } - - uint16 tag() const { - return id >> 54; - } - - operator uint64() const { - return id; - } - - bool operator==(const GUniqueID& other) const { - return id == other.id; - } - - bool operator!=(const GUniqueID& other) const { - return id != other.id; - } - - void serialize(class BinaryOutput& b) const; - - void deserialize(class BinaryInput& b); - - void serialize(class TextOutput& t) const; - - void deserialize(class TextInput& t); - - /** Create a new ID */ - static GUniqueID create(uint16 tag = 0); -}; - -} // G3D - -/** For Table and Set */ -template<> struct HashTrait { - static size_t hashCode(G3D::GUniqueID id) { return (size_t)(G3D::uint64)id; } -}; - -#endif diff --git a/externals/g3dlite/G3D.lib/include/G3D/HashTrait.h b/externals/g3dlite/G3D.lib/include/G3D/HashTrait.h deleted file mode 100644 index 702903ff09b..00000000000 --- a/externals/g3dlite/G3D.lib/include/G3D/HashTrait.h +++ /dev/null @@ -1,63 +0,0 @@ -/** - @file HashTrait.h - - @maintainer Morgan McGuire, morgan@cs.williams.edu - @created 2008-10-01 - @edited 2008-10-01 - Copyright 2000-2008, Morgan McGuire. - All rights reserved. - */ - -#ifndef G3D_HASHTRAIT_H -#define G3D_HASHTRAIT_H - -#include "G3D/platform.h" -#include "G3D/Crypto.h" -#include "G3D/g3dmath.h" -#include "G3D/uint128.h" - -/** Must be specialized for custom types. - @see G3D::Table for specialization requirements. -*/ -template struct HashTrait{}; - -template struct HashTrait { - static size_t hashCode(const void* k) { return reinterpret_cast(k); } -}; - -template <> struct HashTrait { - static size_t hashCode(int k) { return static_cast(k); } -}; - -template <> struct HashTrait { - static size_t hashCode(G3D::uint32 k) { return static_cast(k); } -}; - -template <> struct HashTrait { - static size_t hashCode(G3D::uint64 k) { return static_cast(k); } -}; - -template <> struct HashTrait { - static size_t hashCode(const std::string& k) { return static_cast(G3D::Crypto::crc32(k.c_str(), k.size())); } -}; - -template <> struct HashTrait { - // Use the FNV-1 hash (http://isthe.com/chongo/tech/comp/fnv/#FNV-1). - static size_t hashCode(G3D::uint128 key) { - static const G3D::uint128 FNV_PRIME_128(1 << 24, 0x159); - static const G3D::uint128 FNV_OFFSET_128(0xCF470AAC6CB293D2LL, 0xF52F88BF32307F8FLL); - - G3D::uint128 hash = FNV_OFFSET_128; - G3D::uint128 mask(0, 0xFF); - for (int i = 0; i < 16; ++i) { - hash *= FNV_PRIME_128; - hash ^= (mask & key); - key >>= 8; - } - - G3D::uint64 foldedHash = hash.hi ^ hash.lo; - return static_cast((foldedHash >> 32) ^ (foldedHash & 0xFFFFFFFF)); - } -}; - -#endif diff --git a/externals/g3dlite/G3D.lib/include/G3D/Image1.h b/externals/g3dlite/G3D.lib/include/G3D/Image1.h deleted file mode 100644 index f0850710d2c..00000000000 --- a/externals/g3dlite/G3D.lib/include/G3D/Image1.h +++ /dev/null @@ -1,79 +0,0 @@ -/** - @file Image1.h - - @maintainer Morgan McGuire, matrix@graphics3d.com - - @created 2007-01-31 - @edited 2007-01-31 -*/ - - -#ifndef G3D_IMAGE1_H -#define G3D_IMAGE1_H - -#include "G3D/platform.h" -#include "G3D/Map2D.h" -#include "G3D/Color1.h" -#include "G3D/GImage.h" - -namespace G3D { - -typedef ReferenceCountedPointer Image1Ref; - -/** - Luminance image with 32-bit floating point storage. - - See also G3D::Image1uint8, G3D::GImage. - */ -class Image1 : public Map2D { -public: - - typedef Image1 Type; - typedef Image1Ref Ref; - -protected: - - Image1(int w, int h, WrapMode wrap); - - void copyGImage(const class GImage& im); - void copyArray(const Color1* src, int w, int h); - void copyArray(const Color3* src, int w, int h); - void copyArray(const Color4* src, int w, int h); - void copyArray(const Color1uint8* src, int w, int h); - void copyArray(const Color3uint8* src, int w, int h); - void copyArray(const Color4uint8* src, int w, int h); - -public: - - const class ImageFormat* format() const; - - /** Creates an all-zero width x height image. */ - static Ref createEmpty(int width, int height, WrapMode wrap = WrapMode::ERROR); - - /** Creates a 0 x 0 image. */ - static Ref createEmpty(WrapMode wrap = WrapMode::ERROR); - - static Ref fromFile(const std::string& filename, WrapMode wrap = WrapMode::ERROR, GImage::Format fmt = GImage::AUTODETECT); - - static Ref fromArray(const class Color1uint8* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR); - static Ref fromArray(const class Color3uint8* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR); - static Ref fromArray(const class Color4uint8* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR); - static Ref fromArray(const class Color1* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR); - static Ref fromArray(const class Color3* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR); - static Ref fromArray(const class Color4* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR); - - static Ref fromImage1uint8(const ReferenceCountedPointer& im); - - static Ref fromGImage(const class GImage& im, WrapMode wrap = WrapMode::ERROR); - - /** Loads from any of the file formats supported by G3D::GImage. If there is an alpha channel on the input, - it is stripped. */ - void load(const std::string& filename, GImage::Format fmt = GImage::AUTODETECT); - - /** Saves in any of the formats supported by G3D::GImage. */ - void save(const std::string& filename, GImage::Format fmt = GImage::AUTODETECT); -}; - -} // G3D - -#endif diff --git a/externals/g3dlite/G3D.lib/include/G3D/Image1uint8.h b/externals/g3dlite/G3D.lib/include/G3D/Image1uint8.h deleted file mode 100644 index 7225ca35db8..00000000000 --- a/externals/g3dlite/G3D.lib/include/G3D/Image1uint8.h +++ /dev/null @@ -1,80 +0,0 @@ -/** - @file Image1uint8.h - - @maintainer Morgan McGuire, matrix@graphics3d.com - - @created 2007-01-31 - @edited 2007-01-31 -*/ - -#ifndef G3D_IMAGE1UINT8_H -#define G3D_IMAGE1UINT8_H - -#include "G3D/platform.h" -#include "G3D/Map2D.h" -#include "G3D/Color1uint8.h" -#include "G3D/Color1.h" -#include "G3D/GImage.h" - -namespace G3D { - -typedef ReferenceCountedPointer Image1uint8Ref; - -/** - Compact storage for luminance 8-bit images. - - See also G3D::Image3, G3D::GImage - */ -class Image1uint8 : public Map2D { -public: - - typedef Image1uint8 Type; - typedef Image1uint8Ref Ref; - -protected: - - Image1uint8(int w, int h, WrapMode wrap); - - void copyGImage(const class GImage& im); - void copyArray(const Color1* src, int w, int h); - void copyArray(const Color3* src, int w, int h); - void copyArray(const Color4* src, int w, int h); - void copyArray(const Color1uint8* src, int w, int h); - void copyArray(const Color3uint8* src, int w, int h); - void copyArray(const Color4uint8* src, int w, int h); - -public: - - const class ImageFormat* format() const; - - /** Creates an all-zero width x height image. */ - static Ref createEmpty(int width, int height, WrapMode wrap = WrapMode::ERROR); - - /** Creates a 0 x 0 image. */ - static Ref createEmpty(WrapMode wrap = WrapMode::ERROR); - - static Ref fromFile(const std::string& filename, WrapMode wrap = WrapMode::ERROR, GImage::Format fmt = GImage::AUTODETECT); - - static Ref fromGImage(const class GImage& im, WrapMode wrap = WrapMode::ERROR); - - static Ref fromArray(const class Color1uint8* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR); - static Ref fromArray(const class Color3uint8* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR); - static Ref fromArray(const class Color4uint8* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR); - static Ref fromArray(const class Color1* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR); - static Ref fromArray(const class Color3* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR); - static Ref fromArray(const class Color4* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR); - - static Ref fromImage1(const ReferenceCountedPointer& im); - static Ref fromImage3uint8(const ReferenceCountedPointer& im); - - /** Loads from any of the file formats supported by G3D::GImage. If there is an alpha channel on the input, - it is stripped. */ - void load(const std::string& filename, GImage::Format fmt = GImage::AUTODETECT); - - /** Saves in any of the formats supported by G3D::GImage. */ - void save(const std::string& filename, GImage::Format fmt = GImage::AUTODETECT); -}; - -} // G3D - -#endif diff --git a/externals/g3dlite/G3D.lib/include/G3D/Image3.h b/externals/g3dlite/G3D.lib/include/G3D/Image3.h deleted file mode 100644 index c67669c1c5e..00000000000 --- a/externals/g3dlite/G3D.lib/include/G3D/Image3.h +++ /dev/null @@ -1,79 +0,0 @@ -/** - @file Image3.h - - @maintainer Morgan McGuire, matrix@graphics3d.com - - @created 2007-01-31 - @edited 2007-01-31 -*/ - - -#ifndef G3D_IMAGE3_H -#define G3D_IMAGE3_H - -#include "G3D/platform.h" -#include "G3D/Map2D.h" -#include "G3D/Color3.h" -#include "G3D/GImage.h" - -namespace G3D { - -typedef ReferenceCountedPointer Image3Ref; - -/** - RGB image with 32-bit floating point storage for each channel. - - See also G3D::Image3uint8, G3D::GImage. - */ -class Image3 : public Map2D { -public: - - typedef Image3 Type; - typedef Image3Ref Ref; - -protected: - - Image3(int w, int h, WrapMode wrap); - - void copyGImage(const class GImage& im); - void copyArray(const Color1* src, int w, int h); - void copyArray(const Color3* src, int w, int h); - void copyArray(const Color4* src, int w, int h); - void copyArray(const Color1uint8* src, int w, int h); - void copyArray(const Color3uint8* src, int w, int h); - void copyArray(const Color4uint8* src, int w, int h); - -public: - - const class ImageFormat* format() const; - - /** Creates an all-zero width x height image. */ - static Ref createEmpty(int width, int height, WrapMode wrap = WrapMode::ERROR); - - /** Creates a 0 x 0 image. */ - static Ref createEmpty(WrapMode wrap = WrapMode::ERROR); - - static Ref fromFile(const std::string& filename, WrapMode wrap = WrapMode::ERROR, GImage::Format fmt = GImage::AUTODETECT); - - static Ref fromArray(const class Color1uint8* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR); - static Ref fromArray(const class Color3uint8* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR); - static Ref fromArray(const class Color4uint8* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR); - static Ref fromArray(const class Color1* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR); - static Ref fromArray(const class Color3* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR); - static Ref fromArray(const class Color4* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR); - - static Ref fromImage3uint8(const ReferenceCountedPointer& im); - - static Ref fromGImage(const class GImage& im, WrapMode wrap = WrapMode::ERROR); - - /** Loads from any of the file formats supported by G3D::GImage. If there is an alpha channel on the input, - it is stripped. */ - void load(const std::string& filename, GImage::Format fmt = GImage::AUTODETECT); - - /** Saves in any of the formats supported by G3D::GImage. */ - void save(const std::string& filename, GImage::Format fmt = GImage::AUTODETECT); -}; - -} // G3D - -#endif diff --git a/externals/g3dlite/G3D.lib/include/G3D/Image3uint8.h b/externals/g3dlite/G3D.lib/include/G3D/Image3uint8.h deleted file mode 100644 index 9ee1ef6678b..00000000000 --- a/externals/g3dlite/G3D.lib/include/G3D/Image3uint8.h +++ /dev/null @@ -1,85 +0,0 @@ -/** - @file Image3uint8.h - - @maintainer Morgan McGuire, matrix@graphics3d.com - - @created 2007-01-31 - @edited 2007-01-31 -*/ - -#ifndef G3D_IMAGE3UINT8_H -#define G3D_IMAGE3UINT8_H - -#include "G3D/platform.h" -#include "G3D/Map2D.h" -#include "G3D/Color3uint8.h" -#include "G3D/Color3.h" -#include "G3D/GImage.h" - -namespace G3D { - -typedef ReferenceCountedPointer Image3uint8Ref; - -/** - Compact storage for RGB 8-bit per channel images. - - See also G3D::Image3, G3D::GImage - */ -class Image3uint8 : public Map2D { -public: - - typedef Image3uint8 Type; - typedef Image3uint8Ref Ref; - -protected: - - Image3uint8(int w, int h, WrapMode wrap); - - void copyGImage(const class GImage& im); - void copyArray(const Color1* src, int w, int h); - void copyArray(const Color3* src, int w, int h); - void copyArray(const Color4* src, int w, int h); - void copyArray(const Color1uint8* src, int w, int h); - void copyArray(const Color3uint8* src, int w, int h); - void copyArray(const Color4uint8* src, int w, int h); - -public: - - const class ImageFormat* format() const; - - /** Creates an all-zero width x height image. */ - static Ref createEmpty(int width, int height, WrapMode wrap = WrapMode::ERROR); - - - /** Creates a 0 x 0 image. */ - static Ref createEmpty(WrapMode wrap = WrapMode::ERROR); - - - static Ref fromFile(const std::string& filename, WrapMode wrap = WrapMode::ERROR, GImage::Format fmt = GImage::AUTODETECT); - - static Ref fromGImage(const class GImage& im, WrapMode wrap = WrapMode::ERROR); - - static Ref fromArray(const class Color1uint8* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR); - static Ref fromArray(const class Color3uint8* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR); - static Ref fromArray(const class Color4uint8* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR); - static Ref fromArray(const class Color1* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR); - static Ref fromArray(const class Color3* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR); - static Ref fromArray(const class Color4* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR); - - static Ref fromImage3(const ReferenceCountedPointer& im); - static Ref fromImage1uint8(const ReferenceCountedPointer& im); - - /** Loads from any of the file formats supported by G3D::GImage. If there is an alpha channel on the input, - it is stripped. */ - void load(const std::string& filename, GImage::Format fmt = GImage::AUTODETECT); - - /** Saves in any of the formats supported by G3D::GImage. */ - void save(const std::string& filename, GImage::Format fmt = GImage::AUTODETECT); - - /** Extracts color channel 0 <= c <= 2 and returns it as a new monochrome image. */ - ReferenceCountedPointer getChannel(int c) const; -}; - -} // G3D - -#endif diff --git a/externals/g3dlite/G3D.lib/include/G3D/Image4.h b/externals/g3dlite/G3D.lib/include/G3D/Image4.h deleted file mode 100644 index 04df43f9527..00000000000 --- a/externals/g3dlite/G3D.lib/include/G3D/Image4.h +++ /dev/null @@ -1,80 +0,0 @@ -/** - @file Image4.h - - @maintainer Morgan McGuire, matrix@graphics3d.com - - @created 2007-01-31 - @edited 2007-01-31 -*/ - - -#ifndef G3D_IMAGE4_H -#define G3D_IMAGE4_H - -#include "G3D/platform.h" -#include "G3D/Map2D.h" -#include "G3D/Color4.h" -#include "G3D/GImage.h" - -namespace G3D { - -typedef ReferenceCountedPointer Image4Ref; - -/** - RGBA image with 32-bit floating point storage for each channel. - - Whenever a method needs to convert from RGB to ARGB, A=1 is assumed. - - See also G3D::Image4uint8, G3D::GImage. - */ -class Image4 : public Map2D { -public: - - typedef Image4 Type; - typedef Image4Ref Ref; - -protected: - - Image4(int w, int h, WrapMode wrap); - - void copyGImage(const class GImage& im); - void copyArray(const Color1* src, int w, int h); - void copyArray(const Color3* src, int w, int h); - void copyArray(const Color4* src, int w, int h); - void copyArray(const Color1uint8* src, int w, int h); - void copyArray(const Color3uint8* src, int w, int h); - void copyArray(const Color4uint8* src, int w, int h); - -public: - - const class ImageFormat* format() const; - - /** Creates an all-zero width x height image. */ - static Ref createEmpty(int width, int height, WrapMode wrap = WrapMode::ERROR); - - /** Creates a 0 x 0 image. */ - static Ref createEmpty(WrapMode wrap = WrapMode::ERROR); - - static Ref fromFile(const std::string& filename, WrapMode wrap = WrapMode::ERROR, GImage::Format fmt = GImage::AUTODETECT); - - static Ref fromArray(const class Color1uint8* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR); - static Ref fromArray(const class Color3uint8* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR); - static Ref fromArray(const class Color4uint8* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR); - static Ref fromArray(const class Color1* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR); - static Ref fromArray(const class Color3* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR); - static Ref fromArray(const class Color4* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR); - - static Ref fromImage4uint8(const ReferenceCountedPointer& im); - - static Ref fromGImage(const class GImage& im, WrapMode wrap = WrapMode::ERROR); - - /** Loads from any of the file formats supported by G3D::GImage. */ - void load(const std::string& filename, GImage::Format fmt = GImage::AUTODETECT); - - /** Saves in any of the formats supported by G3D::GImage. */ - void save(const std::string& filename, GImage::Format fmt = GImage::AUTODETECT); -}; - -} // G3D - -#endif diff --git a/externals/g3dlite/G3D.lib/include/G3D/Image4uint8.h b/externals/g3dlite/G3D.lib/include/G3D/Image4uint8.h deleted file mode 100644 index 11daf97c83c..00000000000 --- a/externals/g3dlite/G3D.lib/include/G3D/Image4uint8.h +++ /dev/null @@ -1,85 +0,0 @@ -/** - @file Image4uint8.h - - @maintainer Morgan McGuire, matrix@graphics3d.com - - @created 2007-01-31 - @edited 2007-01-31 -*/ - -#ifndef G3D_IMAGE4UINT8_H -#define G3D_IMAGE4UINT8_H - -#include "G3D/platform.h" -#include "G3D/Map2D.h" -#include "G3D/Color4uint8.h" -#include "G3D/Color4.h" -#include "G3D/GImage.h" -#include "G3D/Image1uint8.h" - -namespace G3D { - -typedef ReferenceCountedPointer Image4uint8Ref; - -/** - Compact storage for RGBA 8-bit per channel images. - - See also G3D::Image4, G3D::GImage - */ -class Image4uint8 : public Map2D { -public: - - typedef Image4uint8 Type; - typedef Image4uint8Ref Ref; - -protected: - - Image4uint8(int w, int h, WrapMode wrap); - - void copyGImage(const class GImage& im); - void copyArray(const Color1* src, int w, int h); - void copyArray(const Color3* src, int w, int h); - void copyArray(const Color4* src, int w, int h); - void copyArray(const Color1uint8* src, int w, int h); - void copyArray(const Color3uint8* src, int w, int h); - void copyArray(const Color4uint8* src, int w, int h); - -public: - - const class ImageFormat* format() const; - - /** Creates an all-zero width x height image. */ - static Ref createEmpty(int width, int height, WrapMode wrap = WrapMode::ERROR); - - - /** Creates a 0 x 0 image. */ - static Ref createEmpty(WrapMode wrap = WrapMode::ERROR); - - - static Ref fromFile(const std::string& filename, WrapMode wrap = WrapMode::ERROR, GImage::Format fmt = GImage::AUTODETECT); - - static Ref fromGImage(const class GImage& im, WrapMode wrap = WrapMode::ERROR); - - static Ref fromArray(const class Color1uint8* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR); - static Ref fromArray(const class Color3uint8* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR); - static Ref fromArray(const class Color4uint8* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR); - static Ref fromArray(const class Color1* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR); - static Ref fromArray(const class Color3* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR); - static Ref fromArray(const class Color4* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR); - - static Ref fromImage4(const ReferenceCountedPointer& im); - - /** Loads from any of the file formats supported by G3D::GImage. If there is an alpha channel on the input, - it is stripped. */ - void load(const std::string& filename, GImage::Format fmt = GImage::AUTODETECT); - - /** Saves in any of the formats supported by G3D::GImage. */ - void save(const std::string& filename, GImage::Format fmt = GImage::AUTODETECT); - - /** Extracts color channel 0 <= c <= 3 and returns it as a new monochrome image. */ - ReferenceCountedPointer getChannel(int c) const; -}; - -} // G3D - -#endif diff --git a/externals/g3dlite/G3D.lib/include/G3D/ImageFormat.h b/externals/g3dlite/G3D.lib/include/G3D/ImageFormat.h deleted file mode 100644 index a1334fb1a5a..00000000000 --- a/externals/g3dlite/G3D.lib/include/G3D/ImageFormat.h +++ /dev/null @@ -1,362 +0,0 @@ -/** - @file ImageFormat.h - - @maintainer Morgan McGuire, matrix@graphics3d.com - - @created 2003-05-23 - @edited 2008-07-17 -*/ - -#ifndef GLG3D_ImageFormat_H -#define GLG3D_ImageFormat_H - -#include "G3D/platform.h" -#include "G3D/Table.h" -#include "G3D/enumclass.h" - -namespace G3D { - -/** Information about common image formats. - Don't construct these; use the methods provided. - - For most formats, the number indicates the number of bits per channel and a suffix of "F" indicates - floating point. This does not hold for the YUV and DXT formats.*/ -class ImageFormat { -public: - - // Must update ImageFormat::name() when this enum changes. - enum Code { - CODE_NONE = -1, - CODE_L8, - CODE_L16, - CODE_L16F, - CODE_L32F, - - CODE_A8, - CODE_A16, - CODE_A16F, - CODE_A32F, - - CODE_LA4, - CODE_LA8, - CODE_LA16, - CODE_LA16F, - CODE_LA32F, - - CODE_RGB5, - CODE_RGB5A1, - CODE_RGB8, - CODE_RGB10, - CODE_RGB10A2, - CODE_RGB16, - CODE_RGB16F, - CODE_RGB32F, - - CODE_ARGB8, - CODE_BGR8, - - CODE_RGBA8, - CODE_RGBA16, - CODE_RGBA16F, - CODE_RGBA32F, - - CODE_BAYER_RGGB8, - CODE_BAYER_GRBG8, - CODE_BAYER_GBRG8, - CODE_BAYER_BGGR8, - CODE_BAYER_RGGB32F, - CODE_BAYER_GRBG32F, - CODE_BAYER_GBRG32F, - CODE_BAYER_BGGR32F, - - CODE_HSV8, - CODE_HSV32F, - - CODE_YUV420_PLANAR, - CODE_YUV422, - CODE_YUV444, - - CODE_RGB_DXT1, - CODE_RGBA_DXT1, - CODE_RGBA_DXT3, - CODE_RGBA_DXT5, - - CODE_DEPTH16, - CODE_DEPTH24, - CODE_DEPTH32, - CODE_DEPTH32F, - - CODE_STENCIL1, - CODE_STENCIL4, - CODE_STENCIL8, - CODE_STENCIL16, - - CODE_DEPTH24_STENCIL8, - - CODE_NUM - }; - - enum ColorSpace { - COLOR_SPACE_NONE, - COLOR_SPACE_RGB, - COLOR_SPACE_HSV, - COLOR_SPACE_YUV - }; - - enum BayerPattern { - BAYER_PATTERN_NONE, - BAYER_PATTERN_RGGB, - BAYER_PATTERN_GRBG, - BAYER_PATTERN_GBRG, - BAYER_PATTERN_BGGR - }; - - /** Number of channels (1 for a depth texture). */ - int numComponents; - bool compressed; - - /** Useful for serializing. */ - Code code; - - ColorSpace colorSpace; - - /** If this is a Bayer format, what is the pattern. */ - BayerPattern bayerPattern; - - /** The OpenGL format equivalent to this one, e.g, GL_RGB8 Zero if there is no equivalent. This is actually a GLenum */ - int openGLFormat; - - /** The OpenGL base format equivalent to this one (e.g., GL_RGB, GL_ALPHA). Zero if there is no equivalent. */ - int openGLBaseFormat; - - int luminanceBits; - - /** Number of bits per pixel storage for alpha values; Zero for compressed textures and non-RGB. */ - int alphaBits; - - /** Number of bits per pixel storage for red values; Zero for compressed textures and non-RGB. */ - int redBits; - - /** Number of bits per pixel storage for green values; Zero for compressed textures and non-RGB. */ - int greenBits; - - /** Number of bits per pixel storage for blue values; Zero for compressed textures and non-RGB. */ - int blueBits; - - /** Number of bits per pixel */ - int stencilBits; - - /** Number of depth bits (for depth textures; e.g. shadow maps) */ - int depthBits; - - /** Amount of CPU memory per pixel when packed into an array, discounting any end-of-row padding. */ - int cpuBitsPerPixel; - - /** Amount of CPU memory per pixel when packed into an array, discounting any end-of-row padding. @deprecated Use cpuBitsPerPixel*/ - int packedBitsPerTexel; - - /** - Amount of GPU memory per pixel on most graphics cards, for formats supported by OpenGL. This is - only an estimate--the actual amount of memory may be different on your actual card. - - This may be greater than the sum of the per-channel bits - because graphics cards need to pad to the nearest 1, 2, or - 4 bytes. - */ - int openGLBitsPerPixel; - - /** @deprecated Use openGLBitsPerPixel */ - int hardwareBitsPerTexel; - - /** The OpenGL bytes format of the data buffer used with this texture format, e.g., GL_UNSIGNED_BYTE */ - int openGLDataFormat; - - /** True if there is no alpha channel for this texture. */ - bool opaque; - - /** True if the bit depths specified are for float formats. */ - bool floatingPoint; - - /** Human readable name of this texture.*/ - std::string name() const; - -private: - - ImageFormat( - int numComponents, - bool compressed, - int glFormat, - int glBaseFormat, - int luminanceBits, - int alphaBits, - int redBits, - int greenBits, - int blueBits, - int depthBits, - int stencilBits, - int hardwareBitsPerTexel, - int packedBitsPerTexel, - int glDataFormat, - bool opaque, - bool floatingPoint, - Code code, - ColorSpace colorSpace, - BayerPattern bayerPattern = BAYER_PATTERN_NONE); - -public: - - static const ImageFormat* L8(); - - static const ImageFormat* L16(); - - static const ImageFormat* L16F(); - - static const ImageFormat* L32F(); - - static const ImageFormat* A8(); - - static const ImageFormat* A16(); - - static const ImageFormat* A16F(); - - static const ImageFormat* A32F(); - - static const ImageFormat* LA4(); - - static const ImageFormat* LA8(); - - static const ImageFormat* LA16(); - - static const ImageFormat* LA16F(); - - static const ImageFormat* LA32F(); - - static const ImageFormat* BGR8(); - - static const ImageFormat* RGB5(); - - static const ImageFormat* RGB5A1(); - - static const ImageFormat* RGB8(); - - static const ImageFormat* RGB10(); - - static const ImageFormat* RGB10A2(); - - static const ImageFormat* RGB16(); - - static const ImageFormat* RGB16F(); - - static const ImageFormat* RGB32F(); - - static const ImageFormat* RGBA8(); - - static const ImageFormat* RGBA16(); - - static const ImageFormat* RGBA16F(); - - static const ImageFormat* RGBA32F(); - - static const ImageFormat* RGB_DXT1(); - - static const ImageFormat* RGBA_DXT1(); - - static const ImageFormat* RGBA_DXT3(); - - static const ImageFormat* RGBA_DXT5(); - - static const ImageFormat* DEPTH16(); - - static const ImageFormat* DEPTH24(); - - static const ImageFormat* DEPTH32(); - - static const ImageFormat* DEPTH32F(); - - static const ImageFormat* STENCIL1(); - - static const ImageFormat* STENCIL4(); - - static const ImageFormat* STENCIL8(); - - static const ImageFormat* STENCIL16(); - - static const ImageFormat* DEPTH24_STENCIL8(); - - static const ImageFormat* YUV420_PLANAR(); - - static const ImageFormat* YUV422(); - - static const ImageFormat* YUV444(); - - /** - NULL pointer; indicates that the G3D::Texture class should choose - either RGBA8 or RGB8 depending on the presence of an alpha channel - in the input. - */ - static const ImageFormat* AUTO() { return NULL; } - - /** Returns DEPTH16, DEPTH24, or DEPTH32 according to the bits - specified. You can use "glGetInteger(GL_DEPTH_BITS)" to match - the screen's format.*/ - static const ImageFormat* depth(int depthBits = 24); - - /** Returns STENCIL1, STENCIL4, STENCIL8 or STENCIL16 according to the bits - specified. You can use "glGetInteger(GL_STENCIL_BITS)" to match - the screen's format.*/ - static const ImageFormat* stencil(int bits = 8); - - /** Returns the matching ImageFormat* identified by the Code. May return NULL - if this format's code is reserved but not yet implemented by G3D. */ - static const ImageFormat* fromCode(ImageFormat::Code code); - - - - /** For use with ImageFormat::convert. */ - class BayerAlgorithm { - public: - enum Value { - NEAREST, - BILINEAR, - mhc, - HIGH_QUALITY = mhc - }; - private: - - Value value; - - public: - - G3D_DECLARE_ENUM_CLASS_METHODS(BayerAlgorithm); - }; - - /** Converts between arbitrary formats on the CPU. Not all format conversions are supported or directly supported. - Formats without direct conversions will attempt to convert through RGBA first. - - A conversion routine might only support source or destination padding or y inversion or none. - If support is needed and not available in any of the direct conversion routines, then no conversion is done. - - YUV422 expects data in YUY2 format (Y, U, Y2, v). Most YUV formats require width and heights that are multiples of 2. - - Returns true if a conversion was available, false if none occurred. - */ - static bool convert(const Array& srcBytes, int srcWidth, int srcHeight, const ImageFormat* srcFormat, int srcRowPadBits, - const Array& dstBytes, const ImageFormat* dstFormat, int dstRowPadBits, - bool invertY = false, BayerAlgorithm bayerAlg = BayerAlgorithm::HIGH_QUALITY); - - /* Checks if a conversion between two formats is available. */ - static bool conversionAvailable(const ImageFormat* srcFormat, int srcRowPadBits, const ImageFormat* dstFormat, int dstRowPadBits, bool invertY = false); -}; - -typedef ImageFormat TextureFormat; - -} - -template <> -struct HashTrait { - static size_t hashCode(const G3D::ImageFormat* key) { return reinterpret_cast(key); } -}; - - - -#endif diff --git a/externals/g3dlite/G3D.lib/include/G3D/Line.h b/externals/g3dlite/G3D.lib/include/G3D/Line.h deleted file mode 100644 index ff6dc8d08e7..00000000000 --- a/externals/g3dlite/G3D.lib/include/G3D/Line.h +++ /dev/null @@ -1,105 +0,0 @@ -/** - @file Line.h - - Line class - - @maintainer Morgan McGuire, matrix@graphics3d.com - - @created 2001-06-02 - @edited 2006-02-28 - */ - -#ifndef G3D_LINE_H -#define G3D_LINE_H - -#include "G3D/platform.h" -#include "G3D/Vector3.h" - -namespace G3D { - -class Plane; - -/** - An infinite 3D line. - */ -class Line { -protected: - - Vector3 _point; - Vector3 _direction; - - Line(const Vector3& point, const Vector3& direction) { - _point = point; - _direction = direction.direction(); - } - -public: - - /** Undefined (provided for creating Array only) */ - inline Line() {} - - Line(class BinaryInput& b); - - void serialize(class BinaryOutput& b) const; - - void deserialize(class BinaryInput& b); - - virtual ~Line() {} - - /** - Constructs a line from two (not equal) points. - */ - static Line fromTwoPoints(const Vector3 &point1, const Vector3 &point2) { - return Line(point1, point2 - point1); - } - - /** - Creates a line from a point and a (nonzero) direction. - */ - static Line fromPointAndDirection(const Vector3& point, const Vector3& direction) { - return Line(point, direction); - } - - /** - Returns the closest point on the line to point. - */ - Vector3 closestPoint(const Vector3& pt) const; - - /** - Returns the distance between point and the line - */ - double distance(const Vector3& point) const { - return (closestPoint(point) - point).magnitude(); - } - - /** Returns a point on the line */ - Vector3 point() const; - - /** Returns the direction (or negative direction) of the line */ - Vector3 direction() const; - - /** - Returns the point where the line and plane intersect. If there - is no intersection, returns a point at infinity. - */ - Vector3 intersection(const Plane &plane) const; - - - /** Finds the closest point to the two lines. - - @param minDist Returns the minimum distance between the lines. - - @cite http://objectmix.com/graphics/133793-coordinates-closest-points-pair-skew-lines.html - */ - Vector3 closestPoint(const Line& B, float& minDist) const; - - inline Vector3 closestPoint(const Line& B) const { - float m; - return closestPoint(B, m); - } -}; - -};// namespace - - -#endif diff --git a/externals/g3dlite/G3D.lib/include/G3D/LineSegment.h b/externals/g3dlite/G3D.lib/include/G3D/LineSegment.h deleted file mode 100644 index 092b0c9ca6d..00000000000 --- a/externals/g3dlite/G3D.lib/include/G3D/LineSegment.h +++ /dev/null @@ -1,115 +0,0 @@ -/** - @file LineSegment.h - - @maintainer Morgan McGuire, matrix@graphics3d.com - - @created 2003-02-08 - @edited 2008-02-02 - */ - -#ifndef G3D_LINESEGMENT_H -#define G3D_LINESEGMENT_H - -#include "G3D/platform.h" -#include "G3D/Vector3.h" - -namespace G3D { - -/** - An finite segment of an infinite 3D line. - */ -class LineSegment { -protected: - - Vector3 _point; - - /** Not normalized */ - Vector3 direction; - - LineSegment(const Vector3& __point, const Vector3& _direction) : _point(__point), direction(_direction) { - } - -public: - - inline LineSegment() : _point(Vector3::zero()), direction(Vector3::zero()) {} - - LineSegment(class BinaryInput& b); - - void serialize(class BinaryOutput& b) const; - - void deserialize(class BinaryInput& b); - - virtual ~LineSegment() {} - - /** - * Constructs a line from two (not equal) points. - */ - static LineSegment fromTwoPoints(const Vector3 &point1, const Vector3 &point2) { - return LineSegment(point1, point2 - point1); - } - - /** Call with 0 or 1 */ - Vector3 point(int i) const; - - inline float length() const { - return direction.magnitude(); - } - - /** - * Returns the closest point on the line segment to point. - */ - Vector3 closestPoint(const Vector3 &point) const; - - /** - Returns the distance between point and the line - */ - double distance(const Vector3& p) const { - return (closestPoint(p) - p).magnitude(); - } - - double distanceSquared(const Vector3& p) const { - return (closestPoint(p) - p).squaredMagnitude(); - } - - /** Returns true if some part of this segment is inside the sphere */ - bool intersectsSolidSphere(const class Sphere& s) const; - - Vector3 randomPoint() const; - -}; - - -class LineSegment2D { -private: - - Vector2 m_origin; - - /** Not normalized */ - Vector2 m_direction; - - /** Length of m_direction */ - float m_length; - -public: - - LineSegment2D() {} - - static LineSegment2D fromTwoPoints(const Vector2& p0, const Vector2& p1); - - /** Returns the intersection of these segements (including - testing endpoints), or Vector2::inf() if they do not intersect. */ - Vector2 intersection(const LineSegment2D& other) const; - - Vector2 point(int i) const; - - Vector2 closestPoint(const Vector2& Q) const; - - float distance(const Vector2& p) const; - - float length() const; -}; - -} // namespace - - -#endif diff --git a/externals/g3dlite/G3D.lib/include/G3D/Log.h b/externals/g3dlite/G3D.lib/include/G3D/Log.h deleted file mode 100644 index 19b4b65c82d..00000000000 --- a/externals/g3dlite/G3D.lib/include/G3D/Log.h +++ /dev/null @@ -1,109 +0,0 @@ -/** - @file Log.h - - @maintainer Morgan McGuire, morgan@graphics3d.com - @cite Backtrace by Aaron Orenstein - @created 2001-08-04 - @edited 2005-11-04 - */ - -#ifndef G3D_LOG_H -#define G3D_LOG_H - -#include -#include -#include "G3D/platform.h" - -#ifndef G3D_WIN32 - #include -#endif - -namespace G3D { - -/** Prints to the common system log, log.txt, which is usually - in the working directory of the program. If your disk is - not writable or is slow, it will attempt to write to "c:/tmp/log.txt" or - "c:/temp/log.txt" on Windows systems instead. - - Unlike printf or debugPrintf, - this function guarantees that all output is committed before it returns. - This is very useful for debugging a crash, which might hide the last few - buffered print statements otherwise. - - Many G3D routines write useful warnings and debugging information to the - system log, which makes it a good first place to go when tracking down - a problem. - */ -void logPrintf(const char* fmt, ...); - -/** - System log for debugging purposes. The first log opened - is the "common log" and can be accessed with the static - method common(). If you access common() and a common log - does not yet exist, one is created for you. - */ -class Log { -private: - - /** - Log messages go here. - */ - FILE* logFile; - - std::string filename; - - static Log* commonLog; - - int stripFromStackBottom; - - /** - Prints the time & stack trace. - */ - void printHeader(); - -public: - - /** - @param stripFromStackBottom Number of call stacks to strip from the - bottom of the stack when printing a trace. Useful for hiding - routines like "main" and "WinMain". If the specified file cannot - be opened for some reason, tries to open "c:/tmp/log.txt" or - "c:/temp/log.txt" instead. - */ - Log(const std::string& filename = "log.txt", - int stripFromStackBottom = 0); - - virtual ~Log(); - - /** - Returns the handle to the file log. - */ - FILE* getFile() const; - - /** - Marks the beginning of a logfile section. - */ - void section(const std::string& s); - - /** - Given arguments like printf, writes characters to the debug text overlay. - */ - // We want G3D_CHECK_PRINTF_ARGS here, but that conflicts with the - // overload. - void __cdecl printf(const char* fmt, ...) G3D_CHECK_PRINTF_METHOD_ARGS; - - void __cdecl vprintf(const char*, va_list argPtr) G3D_CHECK_VPRINTF_METHOD_ARGS; - - static Log* common(); - - static std::string getCommonLogFilename(); - - void print(const std::string& s); - - - void println(const std::string& s); -}; - -} - -#endif diff --git a/externals/g3dlite/G3D.lib/include/G3D/Map2D.h b/externals/g3dlite/G3D.lib/include/G3D/Map2D.h deleted file mode 100644 index 48e2e957a5f..00000000000 --- a/externals/g3dlite/G3D.lib/include/G3D/Map2D.h +++ /dev/null @@ -1,665 +0,0 @@ -/** - @file Map2D.h - - More flexible support than provided by G3D::GImage. - - @maintainer Morgan McGuire, morgan@cs.brown.edu - @created 2004-10-10 - @edited 2007-07-18 - */ -#ifndef G3D_MAP2D_H -#define G3D_MAP2D_H - -#include "G3D/platform.h" -#include "G3D/g3dmath.h" -#include "G3D/Array.h" -#include "G3D/Vector2int16.h" -#include "G3D/ReferenceCount.h" -#include "G3D/AtomicInt32.h" -#include "G3D/GThread.h" -#include "G3D/Rect2D.h" -#include "G3D/WrapMode.h" - -#include - -namespace G3D { -namespace _internal { - -/** The default compute type for a type is the type itself. */ -template class _GetComputeType { -public: - typedef Storage Type; -}; - -} // _internal -} // G3D - -// This weird syntax is needed to support VC6, which doesn't -// properly implement template overloading. -#define DECLARE_COMPUTE_TYPE(StorageType, ComputeType) \ -namespace G3D { \ - namespace _internal { \ - template<> class _GetComputeType < StorageType > { \ - public: \ - typedef ComputeType Type; \ - }; \ - } \ -} - -DECLARE_COMPUTE_TYPE( float32, float64) -DECLARE_COMPUTE_TYPE( float64, float64) - -DECLARE_COMPUTE_TYPE( int8, float32) -DECLARE_COMPUTE_TYPE( int16, float32) -DECLARE_COMPUTE_TYPE( int32, float64) -DECLARE_COMPUTE_TYPE( int64, float64) - -DECLARE_COMPUTE_TYPE( uint8, float32) -DECLARE_COMPUTE_TYPE( uint16, float32) -DECLARE_COMPUTE_TYPE( uint32, float64) -DECLARE_COMPUTE_TYPE( uint64, float64) - -DECLARE_COMPUTE_TYPE( Vector2, Vector2) -DECLARE_COMPUTE_TYPE( Vector2int16, Vector2) - -DECLARE_COMPUTE_TYPE( Vector3, Vector3) -DECLARE_COMPUTE_TYPE( Vector3int16, Vector3) - -DECLARE_COMPUTE_TYPE( Vector4, Vector4) - -DECLARE_COMPUTE_TYPE( Color3, Color3) -DECLARE_COMPUTE_TYPE( Color3uint8, Color3) - -DECLARE_COMPUTE_TYPE( Color4, Color4) -DECLARE_COMPUTE_TYPE( Color4uint8, Color4) -#undef DECLARE_COMPUTE_TYPE - -namespace G3D { - -/** - Map of values across a discrete 2D plane. Can be thought of as a generic class for 2D images, - allowing flexibility as to pixel format and convenient methods. - In fact, the "pixels" can be any values - on a grid that can be sensibly interpolated--RGB colors, scalars, 4D vectors, and so on. - - Other "image" classes in G3D: - - G3D::GImage - Supports file formats, fast, Color3uint8 and Color4uint8 formats. No interpolation. - - G3D::Texture::Ref - Represents image on the graphics card (not directly readable on the CPU). Supports 2D, 3D, and a variety of interpolation methods, loads file formats. - - G3D::Image3 - A subclass of Map2D that supports image loading and saving and conversion to Texture. - - G3D::Image4 - A subclass of Map2D that supports image loading and saving and conversion to Texture. - - G3D::Image3uint8 - A subclass of Map2D that supports image loading and saving and conversion to Texture. - - G3D::Image4uint8 - A subclass of Map2D that supports image loading and saving and conversion to Texture. - - There are two type parameters-- the first (@ Storage) is the type - used to store the "pixel" values efficiently and - the second (@a Compute) is - the type operated on by computation. The Compute::Compute(Storage&) constructor - is used to convert between storage and computation types. - @a Storage is often an integer version of @a Compute, for example - Map2D. By default, the computation type is: - - 
-     Storage       Computation
-
-     uint8          float32
-     uint16         float32
-     uint32         float64
-     uint64         float64
-
-     int8           float32
-     int16          float32
-     int32          float64
-     int64          float64
-
-     float32        float64
-     float64        float64
-
-     Vector2        Vector2
-     Vector2int16   Vector2
-
-     Vector3        Vector3
-     Vector3int16   Vector3
-
-     Vector4        Vector4
-
-     Color3         Color3
-     Color3uint8    Color3
-
-     Color4         Color4
-     Color4uint8    Color4
-
- Any other storage type defaults to itself as the computation type. - - The computation type can be any that - supports lerp, +, -, *, /, and an empty constructor. - - Assign value: - - im->set(x, y, 7); or - im->get(x, y) = 7; - - Read value: - - int c = im(x, y); - - Can also sample with nearest neighbor, bilinear, and bicubic - interpolation. - - Sampling follows OpenGL conventions, where - pixel values represent grid points and (0.5, 0.5) is half-way - between two vertical and two horizontal grid points. - To draw an image of dimensions w x h with nearest neighbor - sampling, render pixels from [0, 0] to [w - 1, h - 1]. - - Under the WrapMode::CLAMP wrap mode, the value of bilinear interpolation - becomes constant outside [1, w - 2] horizontally. Nearest neighbor - interpolation is constant outside [0, w - 1] and bicubic outside - [3, w - 4]. The class does not offer quadratic interpolation because - the interpolation filter could not center over a pixel. - - @author Morgan McGuire, morgan@cs.williams.edu - */ -template< typename Storage, -typename Compute = typename G3D::_internal::_GetComputeType::Type> -class Map2D : public ReferenceCountedObject { - -// -// It doesn't make sense to automatically convert from Compute back to Storage -// because the rounding rule (and scaling) is application dependent. -// Thus the interpolation methods all return type Compute. -// - -public: - - typedef Storage StorageType; - typedef Compute ComputeType; - typedef Map2D Type; - typedef ReferenceCountedPointer Ref; - -protected: - - Storage ZERO; - - /** Width, in pixels. */ - uint32 w; - - /** Height, in pixels. */ - uint32 h; - - WrapMode _wrapMode; - - /** 0 if no mutating method has been invoked - since the last call to setChanged(); */ - AtomicInt32 m_changed; - - Array data; - - /** Handles the exceptional cases from get */ - const Storage& slowGet(int x, int y, WrapMode wrap) { - switch (wrap) { - case WrapMode::CLAMP: - return fastGet(iClamp(x, 0, w - 1), iClamp(y, 0, h - 1)); - - case WrapMode::TILE: - return fastGet(iWrap(x, w), iWrap(y, h)); - - case WrapMode::ZERO: - return ZERO; - - case WrapMode::ERROR: - alwaysAssertM(((uint32)x < w) && ((uint32)y < h), - format("Index out of bounds: (%d, %d), w = %d, h = %d", - x, y, w, h)); - - // intentionally fall through - case WrapMode::IGNORE: - // intentionally fall through - default: - { - static Storage temp; - return temp; - } - } - } - -public: - - /** Unsafe access to the underlying data structure with no wrapping support; requires that (x, y) is in bounds. */ - inline const Storage& fastGet(int x, int y) const { - debugAssert(((uint32)x < w) && ((uint32)y < h)); - return data[x + y * w]; - } - - /** Unsafe access to the underlying data structure with no wrapping support; requires that (x, y) is in bounds. */ - inline void fastSet(int x, int y, const Storage& v) { - debugAssert(((uint32)x < w) && ((uint32)y < h)); - data[x + y * w] = v; - } - -protected: - - /** Given four control points and a value on the range [0, 1) - evaluates the Catmull-rom spline between the times of the - middle two control points */ - Compute bicubic(const Compute* ctrl, double s) const { - - // f = B * S * ctrl' - - // B matrix: Catmull-Rom spline basis - static const double B[4][4] = { - { 0.0, -0.5, 1.0, -0.5}, - { 1.0, 0.0, -2.5, 1.5}, - { 0.0, 0.5, 2.0, -1.5}, - { 0.0, 0.0, -0.5, 0.5}}; - - // S: Powers of the fraction - double S[4]; - double s2 = s * s; - S[0] = 1.0; - S[1] = s; - S[2] = s2; - S[3] = s2 * s; - - Compute sum(ZERO); - - for (int c = 0; c < 4; ++c) { - double coeff = 0.0; - for (int power = 0; power < 4; ++power) { - coeff += B[c][power] * S[power]; - } - sum += ctrl[c] * coeff; - } - - return sum; - } - - - Map2D(int w, int h, WrapMode wrap) : w(0), h(0), _wrapMode(wrap), m_changed(1) { - ZERO = Storage(Compute(Storage()) * 0); - resize(w, h); - } - -public: - - /** - Although Map2D is not threadsafe (except for the setChanged() method), - you can use this mutex to create your own threadsafe access to a Map2D. - Not used by the default implementation. - */ - GMutex mutex; - - static Ref create(int w = 0, int h = 0, WrapMode wrap = WrapMode::ERROR) { - return new Map2D(w, h, wrap); - } - - /** Resizes without clearing, leaving garbage. - */ - void resize(uint32 newW, uint32 newH) { - if ((newW != w) || (newH != h)) { - w = newW; - h = newH; - data.resize(w * h); - setChanged(true); - } - } - - /** - Returns true if this map has been written to since the last call to setChanged(false). - This is useful if you are caching a texture map other value that must be recomputed - whenever this changes. - */ - bool changed() { - return m_changed.value() != 0; - } - - /** Set/unset the changed flag. */ - void setChanged(bool c) { - m_changed = c ? 1 : 0; - } - - /** Returns a pointer to the underlying row-major data. There is no padding at the end of the row. - Be careful--this will be reallocated during a resize. You should call setChanged(true) if you mutate the array.*/ - Storage* getCArray() { - return data.getCArray(); - } - - - const Storage* getCArray() const { - return data.getCArray(); - } - - - /** Row-major array. You should call setChanged(true) if you mutate the array. */ - Array& getArray() { - return data; - } - - - const Array& getArray() const { - return data; - } - - /** is (x, y) strictly within the image bounds, or will it trigger some kind of wrap mode */ - inline bool inBounds(int x, int y) const { - return (((uint32)x < w) && ((uint32)y < h)); - } - - /** is (x, y) strictly within the image bounds, or will it trigger some kind of wrap mode */ - inline bool inBounds(const Vector2int16& v) const { - return inBounds(v.x, v.y); - } - - /** Get the value at (x, y). - - Note that the type of image->get(x, y) is - the storage type, not the computation - type. If the constructor promoting Storage to Compute rescales values - (as, for example Color3(Color3uint8&) does), this will not match the value - returned by Map2D::nearest. - */ - inline const Storage& get(int x, int y, WrapMode wrap) const { - if (((uint32)x < w) && ((uint32)y < h)) { - return data[x + y * w]; - } else { - // Remove the const to allow a slowGet on this object - // (we're returning a const reference so this is ok) - return const_cast(this)->slowGet(x, y, wrap); - } -# ifndef G3D_WIN32 - // gcc gives a useless warning that the above code might reach the end of the function; - // we use this line to supress the warning. - return ZERO; -# endif - } - - inline const Storage& get(int x, int y) const { - return get(x, y, _wrapMode); - } - - inline const Storage& get(const Vector2int16& p) const { - return get(p.x, p.y, _wrapMode); - } - - inline const Storage& get(const Vector2int16& p, WrapMode wrap) const { - return get(p.x, p.y, wrap); - } - - inline Storage& get(int x, int y, WrapMode wrap) { - return const_cast(const_cast(this)->get(x, y, wrap)); -# ifndef G3D_WIN32 - // gcc gives a useless warning that the above code might reach the end of the function; - // we use this line to supress the warning. - return ZERO; -# endif - } - - inline Storage& get(int x, int y) { - return const_cast(const_cast(this)->get(x, y)); -# ifndef G3D_WIN32 - // gcc gives a useless warning that the above code might reach the end of the function; - // we use this line to supress the warning. - return ZERO; -# endif - } - - inline Storage& get(const Vector2int16& p) { - return get(p.x, p.y); - } - - /** Sets the changed flag to true */ - inline void set(const Vector2int16& p, const Storage& v) { - set(p.x, p.y, v); - } - - /** Sets the changed flag to true */ - void set(int x, int y, const Storage& v, WrapMode wrap) { - setChanged(true); - if (((uint32)x < w) && ((uint32)y < h)) { - // In bounds, wrapping isn't an issue. - data[x + y * w] = v; - } else { - const_cast(slowGet(x, y, wrap)) = v; - } - } - - void set(int x, int y, const Storage& v) { - set(x, y, v, _wrapMode); - } - - - void setAll(const Storage& v) { - for(int i = 0; i < data.size(); ++i) { - data[i] = v; - } - setChanged(true); - } - - /** flips if @a flip is true*/ - void maybeFlipVertical(bool flip) { - if (flip) { - flipVertical(); - } - } - - virtual void flipVertical() { - int halfHeight = h/2; - Storage* d = data.getCArray(); - for (int y = 0; y < halfHeight; ++y) { - int o1 = y * w; - int o2 = (h - y - 1) * w; - for (int x = 0; x < (int)w; ++x) { - int i1 = o1 + x; - int i2 = o2 + x; - Storage temp = d[i1]; - d[i1] = d[i2]; - d[i2] = temp; - } - } - setChanged(true); - } - - virtual void flipHorizontal() { - int halfWidth = w / 2; - Storage* d = data.getCArray(); - for (int x = 0; x < halfWidth; ++x) { - for (int y = 0; y < (int)h; ++y) { - int i1 = y * w + x; - int i2 = y * w + (w - x - 1); - Storage temp = d[i1]; - d[i1] = d[i2]; - d[i2] = temp; - } - } - setChanged(true); - } - - /** - Crops this map so that it only contains pixels between (x, y) and (x + w - 1, y + h - 1) inclusive. - */ - virtual void crop(int newX, int newY, int newW, int newH) { - alwaysAssertM(newX + newW <= (int)w, "Cannot grow when cropping"); - alwaysAssertM(newY + newH <= (int)h, "Cannot grow when cropping"); - alwaysAssertM(newX >= 0 && newY >= 0, "Origin out of bounds."); - - // Always safe to copy towards the upper left, provided - // that we're iterating towards the lower right. This lets us avoid - // reallocating the underlying array. - for (int y = 0; y < newH; ++y) { - for (int x = 0; x < newW; ++x) { - data[x + y * newW] = data[(x + newX) + (y + newY) * w]; - } - } - - resize(newW, newH); - } - - /** iRounds to the nearest x0 and y0. */ - virtual void crop(const Rect2D& rect) { - crop(iRound(rect.x0()), iRound(rect.y0()), iRound(rect.x1()) - iRound(rect.x0()), iRound(rect.y1()) - iRound(rect.y0())); - } - - /** Returns the nearest neighbor. Pixel values are considered - to be at the upper left corner, so image->nearest(x, y) == image(x, y) - */ - inline Compute nearest(float x, float y, WrapMode wrap) const { - return Compute(get(iRound(x), iRound(y), wrap)); - } - - inline Compute nearest(float x, float y) const { - return nearest(x, y, _wrapMode); - } - - inline Compute nearest(const Vector2& p) const { - return nearest(p.x, p.y); - } - - /** Returns the average value of all elements of the map */ - Compute average() const { - if ((w == 0) || (h == 0)) { - return ZERO; - } - - // To avoid overflows, compute the average of row averages - - Compute rowSum = ZERO; - for (unsigned int y = 0; y < h; ++y) { - Compute sum = ZERO; - int offset = y * w; - for (unsigned int x = 0; x < w; ++x) { - sum += Compute(data[offset + x]); - } - rowSum += sum * (1.0f / w); - } - - return rowSum * (1.0f / h); - } - - /** - Needs to access elements from (floor(x), floor(y)) - to (floor(x) + 1, floor(y) + 1) and will use - the wrap mode appropriately (possibly generating - out of bounds errors). - - Guaranteed to match nearest(x, y) at integers. */ - Compute bilinear(float x, float y, WrapMode wrap) const { - int i = iFloor(x); - int j = iFloor(y); - - float fX = x - i; - float fY = y - j; - - // Horizontal interpolation, first row - Compute t0(get(i, j, wrap)); - Compute t1(get(i + 1, j, wrap)); - Compute A = lerp(t0, t1, fX); - - // Horizontal interpolation, second row - Compute t2(get(i, j + 1, wrap)); - Compute t3(get(i + 1, j + 1, wrap)); - Compute B = lerp(t2, t3, fX); - - // Vertical interpolation - return lerp(A, B, fY); - } - - Compute bilinear(float x, float y) const { - return bilinear(x, y, _wrapMode); - } - - inline Compute bilinear(const Vector2& p) const { - return bilinear(p.x, p.y, _wrapMode); - } - - inline Compute bilinear(const Vector2& p, WrapMode wrap) const { - return bilinear(p.x, p.y, wrap); - } - - /** - Uses Catmull-Rom splines to interpolate between grid - values. Guaranteed to match nearest(x, y) at integers. - */ - Compute bicubic(float x, float y, WrapMode wrap) const { - int i = iFloor(x); - int j = iFloor(y); - float fX = x - i; - float fY = y - j; - - // 'static' prevents constructors from being called - // every time through this loop. - static Compute vsample[4]; - for (int v = 0; v < 4; ++v) { - - // Horizontal interpolation - static Compute hsample[4]; - for (int u = 0; u < 4; ++u) { - hsample[u] = Compute(get(i + u - 1, j + v - 1, wrap)); - } - - vsample[v] = bicubic(hsample, fX); - } - - // Vertical interpolation - return bicubic(vsample, fY); - } - - Compute bicubic(float x, float y) const { - return bicubic(x, y, _wrapMode); - } - - inline Compute bicubic(const Vector2& p, WrapMode wrap) const { - return bicubic(p.x, p.y, wrap); - } - - inline Compute bicubic(const Vector2& p) const { - return bicubic(p.x, p.y, _wrapMode); - } - - /** Pixel width */ - inline int32 width() const { - return (int32)w; - } - - - /** Pixel height */ - inline int32 height() const { - return (int32)h; - } - - - /** Dimensions in pixels */ - Vector2int16 size() const { - return Vector2int16(w, h); - } - - /** Rectangle from (0, 0) to (w, h) */ - Rect2D rect2DBounds() const { - return Rect2D::xywh(0, 0, w, h); - } - - /** Number of bytes occupied by the image data and this structure */ - size_t sizeInMemory() const { - return data.size() * sizeof(Storage) + sizeof(*this); - } - - - WrapMode wrapMode() const { - return _wrapMode; - } - - - void setWrapMode(WrapMode m) { - _wrapMode = m; - } -}; - - - -} - -#endif // G3D_IMAGE_H diff --git a/externals/g3dlite/G3D.lib/include/G3D/Matrix.h b/externals/g3dlite/G3D.lib/include/G3D/Matrix.h deleted file mode 100644 index 481af940324..00000000000 --- a/externals/g3dlite/G3D.lib/include/G3D/Matrix.h +++ /dev/null @@ -1,634 +0,0 @@ -/** - @file Matrix.h - @author Morgan McGuire, morgan@cs.williams.edu - - @created 2005-10-23 - @edited 2007-07-18 - */ - -#ifndef G3D_MATRIX_H -#define G3D_MATRIX_H - -#include "G3D/g3dmath.h" -#include "G3D/Vector3.h" -#include "G3D/Vector4.h" -#include "G3D/Matrix3.h" -#include "G3D/Matrix4.h" -#include "G3D/ReferenceCount.h" - -namespace G3D { - -/** - N x M matrix. - - The actual data is tracked internally by a reference counted pointer; - it is efficient to pass and assign Matrix objects because no data is actually copied. - This avoids the headache of pointers and allows natural math notation: - - 
-    Matrix A, B, C;
-    // ...
-
-    C = A * f(B);
-    C = C.inverse();
-
-    A = Matrix::identity(4);
-    C = A;
-    C.set(0, 0, 2.0); // Triggers a copy of the data so that A remains unchanged.
-
-    // etc.
-
-
- - The Matrix::debugNumCopyOps and Matrix::debugNumAllocOps counters - increment every time an operation forces the copy and allocation of matrices. You - can use these to detect slow operations when efficiency is a major concern. - - Some methods accept an output argument instead of returning a value. For example, - A = B.transpose() can also be invoked as B.transpose(A). - The latter may be more efficient, since Matrix may be able to re-use the storage of - A (if it has approximatly the right size and isn't currently shared with another matrix). - - @sa G3D::Matrix3, G3D::Matrix4, G3D::Vector2, G3D::Vector3, G3D::Vector4, G3D::CoordinateFrame - - @beta - */ -class Matrix { -public: - /** - Internal precision. Currently float, but this may become a templated class in the future - to allow operations like Matrix and Matrix. - - Not necessarily a plain-old-data type (e.g., could ComplexFloat), but must be something - with no constructor, that can be safely memcpyd, and that has a bit pattern of all zeros - when zero.*/ - typedef float T; - - /** Incremented every time the elements of a matrix are copied. Useful for profiling your - own code that uses Matrix to determine when it is slow due to copying.*/ - static int debugNumCopyOps; - - /** Incremented every time a new matrix object is allocated. Useful for profiling your - own code that uses Matrix to determine when it is slow due to allocation.*/ - static int debugNumAllocOps; - -private: -public: - - /** Used internally by Matrix. - - Does not throw exceptions-- assumes the caller has taken care of - argument checking. */ - class Impl : public ReferenceCountedObject { - public: - - static void* operator new(size_t size) { - return System::malloc(size); - } - - static void operator delete(void* p) { - System::free(p); - } - - ~Impl(); - - private: - friend class Matrix; - - /** elt[r][c] = the element. Pointers into data.*/ - T** elt; - - /** Row major data for the entire matrix. */ - T* data; - - /** The number of rows */ - int R; - - /** The number of columns */ - int C; - - int dataSize; - - /** If R*C is much larger or smaller than the current, deletes all previous data - and resets to random data. Otherwise re-uses existing memory and just resets - R, C, and the row pointers. */ - void setSize(int newRows, int newCols); - - inline Impl() : elt(NULL), data(NULL), R(0), C(0), dataSize(0) {} - - Impl(const Matrix3& M); - - Impl(const Matrix4& M); - - inline Impl(int r, int c) : elt(NULL), data(NULL), R(0), C(0), dataSize(0) { - setSize(r, c); - } - - Impl& operator=(const Impl& m); - - inline Impl(const Impl& B) : elt(NULL), data(NULL), R(0), C(0), dataSize(0) { - // Use the assignment operator - *this = B; - } - - void setZero(); - - inline void set(int r, int c, T v) { - debugAssert(r < R); - debugAssert(c < C); - elt[r][c] = v; - } - - inline const T& get(int r, int c) const { - debugAssert(r < R); - debugAssert(c < C); - return elt[r][c]; - } - - /** Multiplies this by B and puts the result in out. */ - void mul(const Impl& B, Impl& out) const; - - /** Ok if out == this or out == B */ - void add(const Impl& B, Impl& out) const; - - /** Ok if out == this or out == B */ - void add(T B, Impl& out) const; - - /** Ok if out == this or out == B */ - void sub(const Impl& B, Impl& out) const; - - /** Ok if out == this or out == B */ - void sub(T B, Impl& out) const; - - /** B - this */ - void lsub(T B, Impl& out) const; - - /** Ok if out == this or out == B */ - void arrayMul(const Impl& B, Impl& out) const; - - /** Ok if out == this or out == B */ - void mul(T B, Impl& out) const; - - /** Ok if out == this or out == B */ - void arrayDiv(const Impl& B, Impl& out) const; - - /** Ok if out == this or out == B */ - void div(T B, Impl& out) const; - - void negate(Impl& out) const; - - /** Slow way of computing an inverse; for reference */ - void inverseViaAdjoint(Impl& out) const; - - /** Use Gaussian elimination with pivots to solve for the inverse destructively in place. */ - void inverseInPlaceGaussJordan(); - - void adjoint(Impl& out) const; - - /** Matrix of all cofactors */ - void cofactor(Impl& out) const; - - /** - Cofactor [r][c] is defined as C[r][c] = -1 ^(r+c) * det(A[r][c]), - where A[r][c] is the (R-1)x(C-1) matrix formed by removing row r and - column c from the original matrix. - */ - T cofactor(int r, int c) const; - - /** Ok if out == this or out == B */ - void transpose(Impl& out) const; - - T determinant() const; - - /** Determinant computed without the given row and column */ - T determinant(int r, int c) const; - - void arrayLog(Impl& out) const; - - void arrayExp(Impl& out) const; - - void arraySqrt(Impl& out) const; - - void arrayCos(Impl& out) const; - - void arraySin(Impl& out) const; - - void swapRows(int r0, int r1); - - void swapAndNegateCols(int c0, int c1); - - void mulRow(int r, const T& v); - - void abs(Impl& out) const; - - /** Makes a (R-1)x(C-1) copy of this matrix */ - void withoutRowAndCol(int excludeRow, int excludeCol, Impl& out) const; - - bool anyNonZero() const; - - bool allNonZero() const; - - void setRow(int r, const T* vals); - - void setCol(int c, const T* vals); - }; -private: - - typedef ReferenceCountedPointer ImplRef; - - ImplRef impl; - - inline Matrix(ImplRef i) : impl(i) {} - inline Matrix(Impl* i) : impl(ImplRef(i)) {} - - /** Used by SVD */ - class SortRank { - public: - T value; - int col; - - inline bool operator>(const SortRank& x) const { - return x.value > value; - } - - inline bool operator<(const SortRank& x) const { - return x.value < value; - } - - inline bool operator>=(const SortRank& x) const { - return x.value >= value; - } - - inline bool operator<=(const SortRank& x) const { - return x.value <= value; - } - - inline bool operator==(const SortRank& x) const { - return x.value == value; - } - - inline bool operator!=(const SortRank& x) const { - return x.value != value; - } - }; - - Matrix vectorPseudoInverse() const; - Matrix partitionPseudoInverse() const; - Matrix colPartPseudoInverse() const; - Matrix rowPartPseudoInverse() const; - - Matrix col2PseudoInverse(const Matrix& B) const; - Matrix col3PseudoInverse(const Matrix& B) const; - Matrix col4PseudoInverse(const Matrix& B) const; - Matrix row2PseudoInverse(const Matrix& B) const; - Matrix row3PseudoInverse(const Matrix& B) const; - Matrix row4PseudoInverse(const Matrix& B) const; - -public: - - Matrix() : impl(new Impl(0, 0)) {} - - Matrix(const Matrix3& M) : impl(new Impl(M)) {} - - Matrix(const Matrix4& M) : impl(new Impl(M)) {} - - template - static Matrix fromDiagonal(const Array& d) { - Matrix D = zero(d.length(), d.length()); - for (int i = 0; i < d.length(); ++i) { - D.set(i, i, d[i]); - } - return D; - } - - static Matrix fromDiagonal(const Matrix& d); - - /** Returns a new matrix that is all zero. */ - Matrix(int R, int C) : impl(new Impl(R, C)) { - impl->setZero(); - } - - /** Returns a new matrix that is all zero. */ - static Matrix zero(int R, int C); - - /** Returns a new matrix that is all one. */ - static Matrix one(int R, int C); - - /** Returns a new identity matrix */ - static Matrix identity(int N); - - /** Uniformly distributed values between zero and one. */ - static Matrix random(int R, int C); - - /** The number of rows */ - inline int rows() const { - return impl->R; - } - - /** Number of columns */ - inline int cols() const { - return impl->C; - } - - /** Generally more efficient than A * B */ - Matrix& operator*=(const T& B); - - /** Generally more efficient than A / B */ - Matrix& operator/=(const T& B); - - /** Generally more efficient than A + B */ - Matrix& operator+=(const T& B); - - /** Generally more efficient than A - B */ - Matrix& operator-=(const T& B); - - /** No performance advantage over A * B because - matrix multiplication requires intermediate - storage. */ - Matrix& operator*=(const Matrix& B); - - /** Generally more efficient than A + B */ - Matrix& operator+=(const Matrix& B); - - /** Generally more efficient than A - B */ - Matrix& operator-=(const Matrix& B); - - /** Returns a new matrix that is a subset of this one, - from r1:r2 to c1:c2, inclusive.*/ - Matrix subMatrix(int r1, int r2, int c1, int c2) const; - - /** Matrix multiplication. To perform element-by-element multiplication, - see arrayMul. */ - inline Matrix operator*(const Matrix& B) const { - Matrix C(impl->R, B.impl->C); - impl->mul(*B.impl, *C.impl); - return C; - } - - /** See also A *= B, which is more efficient in many cases */ - inline Matrix operator*(const T& B) const { - Matrix C(impl->R, impl->C); - impl->mul(B, *C.impl); - return C; - } - - /** See also A += B, which is more efficient in many cases */ - inline Matrix operator+(const Matrix& B) const { - Matrix C(impl->R, impl->C); - impl->add(*B.impl, *C.impl); - return C; - } - - /** See also A -= B, which is more efficient in many cases */ - inline Matrix operator-(const Matrix& B) const { - Matrix C(impl->R, impl->C); - impl->sub(*B.impl, *C.impl); - return C; - } - - /** See also A += B, which is more efficient in many cases */ - inline Matrix operator+(const T& v) const { - Matrix C(impl->R, impl->C); - impl->add(v, *C.impl); - return C; - } - - /** See also A -= B, which is more efficient in many cases */ - inline Matrix operator-(const T& v) const { - Matrix C(impl->R, impl->C); - impl->sub(v, *C.impl); - return C; - } - - - Matrix operator>(const T& scalar) const; - - Matrix operator<(const T& scalar) const; - - Matrix operator>=(const T& scalar) const; - - Matrix operator<=(const T& scalar) const; - - Matrix operator==(const T& scalar) const; - - Matrix operator!=(const T& scalar) const; - - /** scalar B - this */ - inline Matrix lsub(const T& B) const { - Matrix C(impl->R, impl->C); - impl->lsub(B, *C.impl); - return C; - } - - inline Matrix arrayMul(const Matrix& B) const { - Matrix C(impl->R, impl->C); - impl->arrayMul(*B.impl, *C.impl); - return C; - } - - Matrix3 toMatrix3() const; - - Matrix4 toMatrix4() const; - - Vector2 toVector2() const; - - Vector3 toVector3() const; - - Vector4 toVector4() const; - - /** Mutates this */ - void arrayMulInPlace(const Matrix& B); - - /** Mutates this */ - void arrayDivInPlace(const Matrix& B); - - // Declares an array unary method and its explicit-argument counterpart -# define DECLARE_METHODS_1(method)\ - inline Matrix method() const {\ - Matrix C(impl->R, impl->C);\ - impl->method(*C.impl);\ - return C;\ - }\ - void method(Matrix& out) const; - - - DECLARE_METHODS_1(abs) - DECLARE_METHODS_1(arrayLog) - DECLARE_METHODS_1(arrayExp) - DECLARE_METHODS_1(arraySqrt) - DECLARE_METHODS_1(arrayCos) - DECLARE_METHODS_1(arraySin) - DECLARE_METHODS_1(negate) - -# undef DECLARE_METHODS_1 - - inline Matrix operator-() const { - return negate(); - } - - /** - A-1 computed using the Gauss-Jordan algorithm, - for square matrices. - Run time is O(R3), where R is the - number of rows. - */ - inline Matrix inverse() const { - Impl* A = new Impl(*impl); - A->inverseInPlaceGaussJordan(); - return Matrix(A); - } - - inline T determinant() const { - return impl->determinant(); - } - - /** - AT - */ - inline Matrix transpose() const { - Impl* A = new Impl(cols(), rows()); - impl->transpose(*A); - return Matrix(A); - } - - /** Transpose in place; more efficient than transpose */ - void transpose(Matrix& out) const; - - inline Matrix adjoint() const { - Impl* A = new Impl(cols(), rows()); - impl->adjoint(*A); - return Matrix(A); - } - - /** - (ATA)-1AT) computed - using SVD. - - @param tolerance Use -1 for automatic tolerance. - */ - Matrix pseudoInverse(float tolerance = -1) const; - - /** Called from pseudoInverse when the matrix has size > 4 along some dimension.*/ - Matrix svdPseudoInverse(float tolerance = -1) const; - - /** - (ATA)-1AT) computed - using Gauss-Jordan elimination. - */ - inline Matrix gaussJordanPseudoInverse() const { - Matrix trans = transpose(); - return (trans * (*this)).inverse() * trans; - } - - /** Singular value decomposition. Factors into three matrices - such that @a this = @a U * fromDiagonal(@a d) * @a V.transpose(). - - The matrix must have at least as many rows as columns. - - Run time is O(C2*R). - - @param sort If true (default), the singular values - are arranged so that D is sorted from largest to smallest. - */ - void svd(Matrix& U, Array& d, Matrix& V, bool sort = true) const; - - void set(int r, int c, T v); - - void setCol(int c, const Matrix& vec); - - void setRow(int r, const Matrix& vec); - - Matrix col(int c) const; - - Matrix row(int r) const; - - T get(int r, int c) const; - - Vector2int16 size() const { - return Vector2int16(rows(), cols()); - } - - int numElements() const { - return rows() * cols(); - } - - void swapRows(int r0, int r1); - - /** Swaps columns c0 and c1 and negates both */ - void swapAndNegateCols(int c0, int c1); - - void mulRow(int r, const T& v); - - /** Returns true if any element is non-zero */ - bool anyNonZero() const; - - /** Returns true if all elements are non-zero */ - bool allNonZero() const; - - inline bool allZero() const { - return !anyNonZero(); - } - - inline bool anyZero() const { - return !allNonZero(); - } - - /** Serializes in Matlab source format */ - void serialize(TextOutput& t) const; - - std::string toString(const std::string& name) const; - - std::string toString() const { - static const std::string name = ""; - return toString(name); - } - - /** 2-norm squared: sum(squares). (i.e., dot product with itself) */ - double normSquared() const; - - /** 2-norm (sqrt(sum(squares)) */ - double norm() const; - - /** - Low-level SVD functionality. Useful for applications that do not want - to construct a Matrix but need to perform the SVD operation. - - this = U * D * V' - - Assumes that rows >= cols - - @return NULL on success, a string describing the error on failure. - @param U rows x cols matrix to be decomposed, gets overwritten with U, a rows x cols matrix with orthogonal columns. - @param D vector of singular values of a (diagonal of the D matrix). Length cols. - @param V returns the right orthonormal transformation matrix, size cols x cols - - @cite Based on Dianne Cook's implementation, which is adapted from - svdecomp.c in XLISP-STAT 2.1, which is code from Numerical Recipes - adapted by Luke Tierney and David Betz. The Numerical Recipes code - is adapted from Forsythe et al, who based their code on Golub and - Reinsch's original implementation. - */ - static const char* svdCore(float** U, int rows, int cols, float* D, float** V); - -}; - -} - -inline G3D::Matrix operator-(const G3D::Matrix::T& v, const G3D::Matrix& M) { - return M.lsub(v); -} - -inline G3D::Matrix operator*(const G3D::Matrix::T& v, const G3D::Matrix& M) { - return M * v; -} - -inline G3D::Matrix operator+(const G3D::Matrix::T& v, const G3D::Matrix& M) { - return M + v; -} - -inline G3D::Matrix abs(const G3D::Matrix& M) { - return M.abs(); -} - -#endif - diff --git a/externals/g3dlite/G3D.lib/include/G3D/Matrix2.h b/externals/g3dlite/G3D.lib/include/G3D/Matrix2.h deleted file mode 100644 index eaf4aefa220..00000000000 --- a/externals/g3dlite/G3D.lib/include/G3D/Matrix2.h +++ /dev/null @@ -1,69 +0,0 @@ -#ifndef G3D_MATRIX2_H -#define G3D_MATRIX2_H - -#include "G3D/platform.h" -#include "G3D/Vector2.h" - -namespace G3D { - -/** @beta */ -class Matrix2 { -private: - - float data[2][2]; - -public: - - inline Matrix2() { - data[0][0] = 1.0f; data[0][1] = 0.0f; - data[1][0] = 0.0f; data[1][1] = 1.0f; - } - - inline Matrix2(float v00, float v01, float v10, float v11) { - data[0][0] = v00; data[0][1] = v01; - data[1][0] = v10; data[1][1] = v11; - } - - inline Vector2 operator*(const Vector2& v) const { - return Vector2(data[0][0] * v[0] + data[0][1] * v[1], - data[1][0] * v[0] + data[1][1] * v[1]); - } - - inline Matrix2 inverse() const { - return Matrix2(data[0][0], data[1][0], - data[0][1], data[1][1]) * (1.0f / determinant()); - } - - inline Matrix2 transpose() const { - return Matrix2(data[0][0], data[1][0], - data[0][1], data[1][1]); - } - - inline float determinant() const { - return data[0][0] * data[1][1] - data[0][1] * data[1][0]; - } - - inline Matrix2 operator*(float f) const { - return Matrix2(data[0][0] * f, data[0][1] * f, - data[1][0] * f, data[1][1] * f); - } - - inline Matrix2 operator/(float f) const { - return Matrix2(data[0][0] / f, data[0][1] / f, - data[1][0] / f, data[1][1] / f); - } - - inline float* operator[](int i) { - debugAssert(i >= 0 && i <= 2); - return data[i]; - } - - inline const float* operator[](int i) const { - debugAssert(i >= 0 && i <= 1); - return data[i]; - } -}; - -} - -#endif diff --git a/externals/g3dlite/G3D.lib/include/G3D/Matrix3.h b/externals/g3dlite/G3D.lib/include/G3D/Matrix3.h deleted file mode 100644 index ad09cd3860f..00000000000 --- a/externals/g3dlite/G3D.lib/include/G3D/Matrix3.h +++ /dev/null @@ -1,323 +0,0 @@ -/** - @file Matrix3.h - - 3x3 matrix class - - @maintainer Morgan McGuire, matrix@graphics3d.com - - @cite Portions based on Dave Eberly's Magic Software Library at http://www.magic-software.com - - @created 2001-06-02 - @edited 2006-04-05 - */ - -#ifndef G3D_MATRIX3_H -#define G3D_MATRIX3_H - -#include "G3D/platform.h" -#include "G3D/Vector3.h" -#include "G3D/Vector4.h" -#include "G3D/debugAssert.h" - -#include - -namespace G3D { - -/** - 3x3 matrix. Do not subclass. - */ -class Matrix3 { -private: - - float elt[3][3]; - - // Hidden operators - bool operator<(const Matrix3&) const; - bool operator>(const Matrix3&) const; - bool operator<=(const Matrix3&) const; - bool operator>=(const Matrix3&) const; - -public: - - /** Initial values are undefined for performance. See also - Matrix3::zero(), Matrix3::identity(), Matrix3::fromAxisAngle, etc.*/ - inline Matrix3() {} - - Matrix3 (class BinaryInput& b); - Matrix3 (const float aafEntry[3][3]); - Matrix3 (const Matrix3& rkMatrix); - Matrix3 (float fEntry00, float fEntry01, float fEntry02, - float fEntry10, float fEntry11, float fEntry12, - float fEntry20, float fEntry21, float fEntry22); - - bool fuzzyEq(const Matrix3& b) const; - - /** Constructs a matrix from a quaternion. - @cite Graphics Gems II, p. 351--354 - @cite Implementation from Watt and Watt, pg 362*/ - Matrix3(const class Quat& q); - - void serialize(class BinaryOutput& b) const; - void deserialize(class BinaryInput& b); - - /** - Sets all elements. - */ - void set(float fEntry00, float fEntry01, float fEntry02, - float fEntry10, float fEntry11, float fEntry12, - float fEntry20, float fEntry21, float fEntry22); - - /** - * member access, allows use of construct mat[r][c] - */ - inline float* operator[] (int iRow) { - debugAssert(iRow >= 0); - debugAssert(iRow < 3); - return (float*)&elt[iRow][0]; - } - - inline const float* operator[] (int iRow) const { - debugAssert(iRow >= 0); - debugAssert(iRow < 3); - return (const float*)&elt[iRow][0]; - } - - inline operator float* () { - return (float*)&elt[0][0]; - } - - inline operator const float* () const{ - return (const float*)&elt[0][0]; - } - - /** @deprecated */ - Vector3 getColumn (int iCol) const; - /** @deprecated */ - Vector3 getRow (int iRow) const; - - Vector3 column(int c) const; - const Vector3& row(int r) const; - - void setColumn(int iCol, const Vector3 &vector); - void setRow(int iRow, const Vector3 &vector); - - // assignment and comparison - inline Matrix3& operator= (const Matrix3& rkMatrix) { - memcpy(elt, rkMatrix.elt, 9 * sizeof(float)); - return *this; - } - - bool operator== (const Matrix3& rkMatrix) const; - bool operator!= (const Matrix3& rkMatrix) const; - - // arithmetic operations - Matrix3 operator+ (const Matrix3& rkMatrix) const; - Matrix3 operator- (const Matrix3& rkMatrix) const; - /** Matrix-matrix multiply */ - Matrix3 operator* (const Matrix3& rkMatrix) const; - Matrix3 operator- () const; - - Matrix3& operator+= (const Matrix3& rkMatrix); - Matrix3& operator-= (const Matrix3& rkMatrix); - Matrix3& operator*= (const Matrix3& rkMatrix); - - /** - * matrix * vector [3x3 * 3x1 = 3x1] - */ - inline Vector3 operator* (const Vector3& v) const { - Vector3 kProd; - - for (int r = 0; r < 3; ++r) { - kProd[r] = - elt[r][0] * v[0] + - elt[r][1] * v[1] + - elt[r][2] * v[2]; - } - - return kProd; - } - - - /** - * vector * matrix [1x3 * 3x3 = 1x3] - */ - friend Vector3 operator* (const Vector3& rkVector, - const Matrix3& rkMatrix); - - /** - * matrix * scalar - */ - Matrix3 operator* (float fScalar) const; - - /** scalar * matrix */ - friend Matrix3 operator* (double fScalar, const Matrix3& rkMatrix); - friend Matrix3 operator* (float fScalar, const Matrix3& rkMatrix); - friend Matrix3 operator* (int fScalar, const Matrix3& rkMatrix); - -private: - /** Multiplication where out != A and out != B */ - static void _mul(const Matrix3& A, const Matrix3& B, Matrix3& out); -public: - - /** Optimized implementation of out = A * B. It is safe (but slow) to call - with A, B, and out possibly pointer equal to one another.*/ - // This is a static method so that it is not ambiguous whether "this" - // is an input or output argument. - inline static void mul(const Matrix3& A, const Matrix3& B, Matrix3& out) { - if ((&out == &A) || (&out == &B)) { - // We need a temporary anyway, so revert to the stack method. - out = A * B; - } else { - // Optimized in-place multiplication. - _mul(A, B, out); - } - } - -private: - static void _transpose(const Matrix3& A, Matrix3& out); -public: - - /** Optimized implementation of out = A.transpose(). It is safe (but slow) to call - with A and out possibly pointer equal to one another. - - Note that A.transpose() * v can be computed - more efficiently as v * A. - */ - inline static void transpose(const Matrix3& A, Matrix3& out) { - if (&A == &out) { - out = A.transpose(); - } else { - _transpose(A, out); - } - } - - /** Returns true if the rows and column L2 norms are 1.0 and the rows are orthogonal. */ - bool isOrthonormal() const; - - Matrix3 transpose () const; - bool inverse (Matrix3& rkInverse, float fTolerance = 1e-06) const; - Matrix3 inverse (float fTolerance = 1e-06) const; - float determinant () const; - - /** singular value decomposition */ - void singularValueDecomposition (Matrix3& rkL, Vector3& rkS, - Matrix3& rkR) const; - /** singular value decomposition */ - void singularValueComposition (const Matrix3& rkL, - const Vector3& rkS, const Matrix3& rkR); - - /** Gram-Schmidt orthonormalization (applied to columns of rotation matrix) */ - void orthonormalize(); - - /** orthogonal Q, diagonal D, upper triangular U stored as (u01,u02,u12) */ - void qDUDecomposition (Matrix3& rkQ, Vector3& rkD, - Vector3& rkU) const; - - float spectralNorm () const; - - /** matrix must be orthonormal */ - void toAxisAngle(Vector3& rkAxis, float& rfRadians) const; - - static Matrix3 fromDiagonal(const Vector3& d) { - return Matrix3(d.x, 0, 0, - 0, d.y, 0, - 0, 0, d.z); - } - - static Matrix3 fromAxisAngle(const Vector3& rkAxis, float fRadians); - - /** - * The matrix must be orthonormal. The decomposition is yaw*pitch*roll - * where yaw is rotation about the Up vector, pitch is rotation about the - * right axis, and roll is rotation about the Direction axis. - */ - bool toEulerAnglesXYZ (float& rfYAngle, float& rfPAngle, - float& rfRAngle) const; - bool toEulerAnglesXZY (float& rfYAngle, float& rfPAngle, - float& rfRAngle) const; - bool toEulerAnglesYXZ (float& rfYAngle, float& rfPAngle, - float& rfRAngle) const; - bool toEulerAnglesYZX (float& rfYAngle, float& rfPAngle, - float& rfRAngle) const; - bool toEulerAnglesZXY (float& rfYAngle, float& rfPAngle, - float& rfRAngle) const; - bool toEulerAnglesZYX (float& rfYAngle, float& rfPAngle, - float& rfRAngle) const; - static Matrix3 fromEulerAnglesXYZ (float fYAngle, float fPAngle, float fRAngle); - static Matrix3 fromEulerAnglesXZY (float fYAngle, float fPAngle, float fRAngle); - static Matrix3 fromEulerAnglesYXZ (float fYAngle, float fPAngle, float fRAngle); - static Matrix3 fromEulerAnglesYZX (float fYAngle, float fPAngle, float fRAngle); - static Matrix3 fromEulerAnglesZXY (float fYAngle, float fPAngle, float fRAngle); - static Matrix3 fromEulerAnglesZYX (float fYAngle, float fPAngle, float fRAngle); - - /** eigensolver, matrix must be symmetric */ - void eigenSolveSymmetric (float afEigenvalue[3], - Vector3 akEigenvector[3]) const; - - static void tensorProduct (const Vector3& rkU, const Vector3& rkV, - Matrix3& rkProduct); - std::string toString() const; - - static const float EPSILON; - - // Special values. - // The unguaranteed order of initialization of static variables across - // translation units can be a source of annoying bugs, so now the static - // special values (like Vector3::ZERO, Color3::WHITE, ...) are wrapped - // inside static functions that return references to them. - // These functions are intentionally not inlined, because: - // "You might be tempted to write [...] them as inline functions - // inside their respective header files, but this is something you - // must definitely not do. An inline function can be duplicated - // in every file in which it appears œóõ½ and this duplication - // includes the static object definition. Because inline functions - // automatically default to internal linkage, this would result in - // having multiple static objects across the various translation - // units, which would certainly cause problems. So you must - // ensure that there is only one definition of each wrapping - // function, and this means not making the wrapping functions inline", - // according to Chapter 10 of "Thinking in C++, 2nd ed. Volume 1" by Bruce Eckel, - // http://www.mindview.net/ - static const Matrix3& zero(); - static const Matrix3& identity(); - -protected: - - // support for eigensolver - void tridiagonal (float afDiag[3], float afSubDiag[3]); - bool qLAlgorithm (float afDiag[3], float afSubDiag[3]); - - // support for singular value decomposition - static const float ms_fSvdEpsilon; - static const int ms_iSvdMaxIterations; - static void bidiagonalize (Matrix3& kA, Matrix3& kL, - Matrix3& kR); - static void golubKahanStep (Matrix3& kA, Matrix3& kL, - Matrix3& kR); - - // support for spectral norm - static float maxCubicRoot (float afCoeff[3]); - -}; - - -//---------------------------------------------------------------------------- -/** v * M == M.transpose() * v */ -inline Vector3 operator* (const Vector3& rkPoint, const Matrix3& rkMatrix) { - Vector3 kProd; - - for (int r = 0; r < 3; ++r) { - kProd[r] = - rkPoint[0] * rkMatrix.elt[0][r] + - rkPoint[1] * rkMatrix.elt[1][r] + - rkPoint[2] * rkMatrix.elt[2][r]; - } - - return kProd; -} - - -} // namespace - -#endif - diff --git a/externals/g3dlite/G3D.lib/include/G3D/Matrix4.h b/externals/g3dlite/G3D.lib/include/G3D/Matrix4.h deleted file mode 100644 index 5bb6cecfdf9..00000000000 --- a/externals/g3dlite/G3D.lib/include/G3D/Matrix4.h +++ /dev/null @@ -1,206 +0,0 @@ -/** - @file Matrix4.h - - 4x4 matrix class - - @maintainer Morgan McGuire, matrix@graphics3d.com - - @created 2003-10-02 - @edited 2007-04-05 - */ - -#ifndef G3D_MATRIX4_H -#define G3D_MATRIX4_H - -#ifdef _MSC_VER -// Disable conditional expression is constant, which occurs incorrectly on inlined functions -# pragma warning (push) -# pragma warning( disable : 4127 ) -#endif - -#include "G3D/platform.h" -#include "G3D/debugAssert.h" -#include "G3D/Matrix3.h" -#include "G3D/Vector3.h" - -namespace G3D { - -/** - A 4x4 matrix. - - See also G3D::CoordinateFrame, G3D::Matrix3, G3D::Quat - */ -class Matrix4 { -private: - - float elt[4][4]; - - /** - Computes the determinant of the 3x3 matrix that lacks excludeRow - and excludeCol. - */ - float subDeterminant(int excludeRow, int excludeCol) const; - - // Hidden operators - bool operator<(const Matrix4&) const; - bool operator>(const Matrix4&) const; - bool operator<=(const Matrix4&) const; - bool operator>=(const Matrix4&) const; - -public: - Matrix4( - float r1c1, float r1c2, float r1c3, float r1c4, - float r2c1, float r2c2, float r2c3, float r2c4, - float r3c1, float r3c2, float r3c3, float r3c4, - float r4c1, float r4c2, float r4c3, float r4c4); - - /** - init should be row major. - */ - Matrix4(const float* init); - - /** - a is the upper left 3x3 submatrix and b is the upper right 3x1 submatrix. The last row of the created matrix is (0,0,0,1). - */ - Matrix4(const class Matrix3& upper3x3, const class Vector3& lastCol = Vector3::zero()); - - Matrix4(const class CoordinateFrame& c); - - Matrix4(const double* init); - - Matrix4(); - - /** Produces an RT transformation that nearly matches this Matrix4. - Because a Matrix4 may not be precisely a rotation and translation, - this may introduce error. */ - class CoordinateFrame approxCoordinateFrame() const; - - // Special values. - // Intentionally not inlined: see Matrix3::identity() for details. - static const Matrix4& identity(); - static const Matrix4& zero(); - - inline float* operator[](int r) { - debugAssert(r >= 0); - debugAssert(r < 4); - return (float*)&elt[r]; - } - - inline const float* operator[](int r) const { - debugAssert(r >= 0); - debugAssert(r < 4); - return (const float*)&elt[r]; - } - - inline operator float* () { - return (float*)&elt[0][0]; - } - - inline operator const float* () const { - return (const float*)&elt[0][0]; - } - - Matrix4 operator*(const Matrix4& other) const; - - class Matrix3 upper3x3() const; - - /** Homogeneous multiplication. Let k = M * [v w]^T. result = k.xyz() / k.w */ - class Vector3 homoMul(const class Vector3& v, float w) const; - - /** - Constructs an orthogonal projection matrix from the given parameters. - Near and far are the NEGATIVE of the near and far plane Z values - (to follow OpenGL conventions). - */ - static Matrix4 orthogonalProjection( - float left, - float right, - float bottom, - float top, - float nearval, - float farval); - - static Matrix4 orthogonalProjection( - const class Rect2D& rect, - float nearval, - float farval); - - static Matrix4 perspectiveProjection( - float left, - float right, - float bottom, - float top, - float nearval, - float farval); - - void setRow(int r, const class Vector4& v); - void setColumn(int c, const Vector4& v); - - /** @deprecated */ - Vector4 getRow(int r) const; - /** @deprecated */ - Vector4 getColumn(int c) const; - - const Vector4& row(int r) const; - Vector4 column(int c) const; - - Matrix4 operator*(const float s) const; - Vector4 operator*(const Vector4& vector) const; - - Matrix4 transpose() const; - - bool operator!=(const Matrix4& other) const; - bool operator==(const Matrix4& other) const; - - float determinant() const; - Matrix4 inverse() const; - - /** - Transpose of the cofactor matrix (used in computing the inverse). - Note: This is in fact only one type of adjoint. More generally, - an adjoint of a matrix is any mapping of a matrix which possesses - certain properties. This returns the so-called adjugate - or classical adjoint. - */ - Matrix4 adjoint() const; - Matrix4 cofactor() const; - - /** Serializes row-major */ - void serialize(class BinaryOutput& b) const; - void deserialize(class BinaryInput& b); - - std::string toString() const; - - /** 3D scale matrix */ - inline static Matrix4 scale(const Vector3& v) { - return Matrix4(v.x, 0, 0, 0, - 0, v.y, 0, 0, - 0, 0, v.z, 0, - 0, 0, 0, 1); - } - - /** 3D scale matrix */ - inline static Matrix4 scale(float x, float y, float z) { - return scale(Vector3(x, y, z)); - } - - /** 3D scale matrix */ - inline static Matrix4 scale(float s) { - return scale(s,s,s); - } - - /** 3D translation matrix */ - inline static Matrix4 translation(const Vector3& v) { - return Matrix4(Matrix3::identity(), v); - } -}; - - - -} // namespace - -#ifdef _MSC_VER -# pragma warning (pop) -#endif - -#endif diff --git a/externals/g3dlite/G3D.lib/include/G3D/MeshAlg.h b/externals/g3dlite/G3D.lib/include/G3D/MeshAlg.h deleted file mode 100644 index be381eff117..00000000000 --- a/externals/g3dlite/G3D.lib/include/G3D/MeshAlg.h +++ /dev/null @@ -1,718 +0,0 @@ -/** - @file MeshAlg.h - - Indexed Mesh algorithms. - - @maintainer Morgan McGuire, matrix@graphics3d.com - - @created 2003-09-14 - @edited 2008-07-30 -*/ - -#ifndef G3D_MESHALG_H -#define G3D_MESHALG_H - -#include "G3D/platform.h" -#include "G3D/Array.h" -#include "G3D/Vector3.h" -#include "G3D/CoordinateFrame.h" - -namespace G3D { - -/** - Indexed mesh algorithms. You have to build your own mesh class. -

- No mesh class is provided with G3D because there isn't an "ideal" - mesh format-- one application needs keyframed animation, another - skeletal animation, a third texture coordinates, a fourth - cannot precompute information, etc. Instead of compromising, this - class implements the hard parts of mesh computation and you can write - your own ideal mesh class on top of it. - */ -class MeshAlg { -public: - - enum Primitive {LINES, LINE_STRIP, TRIANGLES, TRIANGLE_STRIP, - TRIANGLE_FAN, QUADS, QUAD_STRIP, POINTS}; - - - /** Adjacency information for a vertex. - Does not contain the vertex position or normal, - which are stored in the MeshAlg::Geometry object. - Vertexs must be stored in an array - parallel to (indexed in the same way as) - MeshAlg::Geometry::vertexArray. - */ - class Vertex { - public: - Vertex() {} - - /** - Array of edges adjacent to this vertex. - Let e = edgeIndex[i]. - edge[(e >= 0) ? e : ~e].vertexIndex[0] == this - vertex index. - - Edges may be listed multiple times if they are - degenerate. - */ - Array edgeIndex; - - /** - Returns true if e or ~e is in the edgeIndex list. - */ - inline bool inEdge(int e) const { - return edgeIndex.contains(~e) || edgeIndex.contains(e); - } - - /** - Array of faces containing this vertex. Faces - may be listed multiple times if they are degenerate. - */ - Array faceIndex; - - inline bool inFace(int f) const { - debugAssert(f >= 0); - return faceIndex.contains(f); - } - }; - - - /** - Oriented, indexed triangle. - */ - class Face { - public: - Face(); - - /** - Used by Edge::faceIndex to indicate a missing face. - This is a large negative value. - */ - static const int NONE; - - - /** - Vertices in the face in counter-clockwise order. - Degenerate faces may include the same vertex multiple times. - */ - int vertexIndex[3]; - - inline bool containsVertex(int v) const { - return contains(vertexIndex, 3, v); - } - - /** - Edge indices in counter-clockwise order. Edges are - undirected, so it is important to know which way - each edge is pointing in a face. This is encoded - using negative indices. - - If edgeIndex[i] >= 0 then this face - contains the directed edge - between vertex indices - edgeArray[face.edgeIndex[i]].vertexIndex[0] - and - edgeArray[face.edgeIndex[i]].vertexIndex[1]. - - If edgeIndex[i] < 0 then - ~edgeIndex[i] (i.e. the two's - complement of) is used and this face contains the directed - edge between vertex indices - edgeArray[~face.edgeIndex[i]].vertexIndex[0] - and - edgeArray[~face.edgeIndex[i]].vertexIndex[1]. - - Degenerate faces may include the same edge multiple times. - */ - // Temporarily takes on the value Face::NONE during adjacency - // computation to indicate an edge that has not yet been assigned. - int edgeIndex[3]; - - inline bool containsEdge(int e) const { - if (e < 0) { - e = ~e; - } - return contains(edgeIndex, 3, e) || contains(edgeIndex, 3, ~e); - } - - /** Contains the forward edge e if e >= 0 and the backward edge - ~e otherwise. */ - inline bool containsDirectedEdge(int e) const { - return contains(edgeIndex, 3, e); - } - }; - - - /** Oriented, indexed edge */ - class Edge { - public: - Edge(); - - /** Degenerate edges may include the same vertex times. */ - int vertexIndex[2]; - - inline bool containsVertex(int v) const { - return contains(vertexIndex, 2, v); - } - - /** - The edge is directed forward in face 0 - backward in face 1. Face index of MeshAlg::Face::NONE - indicates a boundary (a.k.a. crack, broken) edge. - */ - int faceIndex[2]; - - /** Returns true if f is contained in the faceIndex array in either slot. - To see if it is forward in that face, just check edge.faceIndex[0] == f.*/ - inline bool inFace(int f) const { - return contains(faceIndex, 2, f); - } - - /** - Returns true if either faceIndex is NONE. - */ - inline bool boundary() const { - return (faceIndex[0] == Face::NONE) || - (faceIndex[1] == Face::NONE); - } - - /** - Returns the reversed edge. - */ - inline Edge reverse() const { - Edge e; - e.vertexIndex[0] = vertexIndex[1]; - e.vertexIndex[1] = vertexIndex[0]; - e.faceIndex[0] = faceIndex[1]; - e.faceIndex[1] = faceIndex[0]; - return e; - } - }; - - - /** - Convenient for passing around the per-vertex data that changes under - animation. The faces and edges are needed to interpret - these values. - */ - class Geometry { - public: - /** Vertex positions */ - Array vertexArray; - - /** Vertex normals */ - Array normalArray; - - /** - Assignment is optimized using SSE. - */ - Geometry& operator=(const Geometry& src); - - void clear() { - vertexArray.clear(); - normalArray.clear(); - } - }; - - /** - Given a set of vertices and a set of indices for traversing them - to create triangles, computes other mesh properties. - - Colocated vertices are treated as separate. To have - colocated vertices collapsed (necessary for many algorithms, - like shadowing), weld the mesh before computing adjacency. - - Recent change: In version 6.00, colocated vertices were automatically - welded by this routine and degenerate faces and edges were removed. That - is no longer the case. - - Where two faces meet, there are two opposite directed edges. These - are collapsed into a single bidirectional edge in the edgeArray. - If four faces meet exactly at the same edge, that edge will appear - twice in the array, and so on. If an edge is a boundary of the mesh - (i.e. if the edge has only one adjacent face) it will appear in the - array with one face index set to MeshAlg::Face::NONE. - - @param vertexGeometry %Vertex positions to use when deciding colocation. - @param indexArray Order to traverse vertices to make triangles - @param faceArray Output - @param edgeArray Output. Sorted so that boundary edges are at the end of the array. - @param vertexArray Output - */ - static void computeAdjacency( - const Array& vertexGeometry, - const Array& indexArray, - Array& faceArray, - Array& edgeArray, - Array& vertexArray); - - /** - @deprecated Use the other version of computeAdjacency, which takes Array. - @param facesAdjacentToVertex Output adjacentFaceArray[v] is an array of - indices for faces touching vertex index v - */ - static void computeAdjacency( - const Array& vertexArray, - const Array& indexArray, - Array& faceArray, - Array& edgeArray, - Array< Array >& facesAdjacentToVertex); - - /** - Computes some basic mesh statistics including: min, max mean and median, - edge lengths; and min, mean, median, and max face area. - - @param vertexGeometry %Vertex positions to use when deciding colocation. - @param indexArray Order to traverse vertices to make triangles - @param minEdgeLength Minimum edge length - @param meanEdgeLength Mean edge length - @param medianEdgeLength Median edge length - @param maxEdgeLength Max edge length - @param minFaceArea Minimum face area - @param meanFaceArea Mean face area - @param medianFaceArea Median face area - @param maxFaceArea Max face area - */ - static void computeAreaStatistics( - const Array& vertexArray, - const Array& indexArray, - double& minEdgeLength, - double& meanEdgeLength, - double& medianEdgeLength, - double& maxEdgeLength, - double& minFaceArea, - double& meanFaceArea, - double& medianFaceArea, - double& maxFaceArea); - -private: - /** - Computes the tangent space basis vectors for - a counter-clockwise oriented face. - - @cite Max McGuire - */ - static void computeTangentVectors( - const Vector3& normal, - const Vector3 position[3], - const Vector2 texCoord[3], - Vector3& tangent, - Vector3& binormal); - - /** Helper for weldAdjacency */ - static void weldBoundaryEdges( - Array& faceArray, - Array& edgeArray, - Array& vertexArray); - -public: - - /** - Computes tangent and binormal vectors, - which provide a (mostly) consistent - parameterization over the surface for - effects like bump mapping. In the resulting coordinate frame, - T = x (varies with texture s coordinate), B = y (varies with negative texture t coordinate), - and N = z for a right-handed coordinate frame. If a billboard is vertical on the screen - in view of the camera, the tangent space matches the camera's coordinate frame. - - The vertex, texCoord, tangent, and binormal - arrays are parallel arrays. - - The resulting tangent and binormal might not be exactly - perpendicular to each other. They are guaranteed to - be perpendicular to the normal. - - @cite Max McGuire - */ - static void computeTangentSpaceBasis( - const Array& vertexArray, - const Array& texCoordArray, - const Array& vertexNormalArray, - const Array& faceArray, - Array& tangent, - Array& binormal); - - /** @deprecated */ - static void computeNormals( - const Array& vertexArray, - const Array& faceArray, - const Array< Array >& adjacentFaceArray, - Array& vertexNormalArray, - Array& faceNormalArray); - - /** - Vertex normals are weighted by the area of adjacent faces. - Nelson Max showed this is superior to uniform weighting for - general meshes in jgt. - - @param vertexNormalArray Output. Unit length - @param faceNormalArray Output. Degenerate faces produce zero magnitude normals. Unit length - @see weld - */ - static void computeNormals( - const Array& vertexGeometry, - const Array& faceArray, - const Array& vertexArray, - Array& vertexNormalArray, - Array& faceNormalArray); - - /** Computes unit length normals in place using the other computeNormals methods. - If you already have a face array use another method; it will be faster. - @see weld*/ - static void computeNormals( - Geometry& geometry, - const Array& indexArray); - - /** - Computes face normals only. Significantly faster (especially if - normalize is false) than computeNormals. - @see weld - */ - static void computeFaceNormals( - const Array& vertexArray, - const Array& faceArray, - Array& faceNormals, - bool normalize = true); - - /** - Classifies each face as a backface or a front face relative - to the observer point P (which is at infinity when P.w = 0). - A face with normal exactly perpendicular to the observer vector - may be classified as either a front or a back face arbitrarily. - */ - static void identifyBackfaces( - const Array& vertexArray, - const Array& faceArray, - const Vector4& P, - Array& backface); - - /** A faster version of identifyBackfaces for the case where - face normals have already been computed */ - static void identifyBackfaces( - const Array& vertexArray, - const Array& faceArray, - const Vector4& P, - Array& backface, - const Array& faceNormals); - - /** - Welds nearby and colocated elements of the oldVertexArray together so that - newVertexArray contains no vertices within radius of one another. - Every vertex in newVertexPositions also appears in oldVertexPositions. - This is useful for downsampling meshes and welding cracks created by artist errors - or numerical imprecision. - - The two integer arrays map indices back and forth between the arrays according to: - 

-     oldVertexArray[toOld[ni]] == newVertexArray[ni]
-     oldVertexArray[oi] == newVertexArray[toNew[ni]]
-
- - Note that newVertexPositions is never longer than oldVertexPositions - and is shorter when vertices are welded. - - Welding with a large radius will effectively compute a lower level of detail for - the mesh. - - The welding method runs in roughly linear time in the length of oldVertexArray-- - a uniform spatial grid is used to achieve nearly constant time vertex collapses - for uniformly distributed vertices. - - It is sometimes desirable to keep the original vertex ordering but - identify the unique vertices. The following code computes - array canonical s.t. canonical[v] = first occurance of - a vertex near oldVertexPositions[v] in oldVertexPositions. - - 
-        Array canonical(oldVertexPositions.size()), toNew, toOld;
-        computeWeld(oldVertexPositions, Array(), toNew, toOld, radius);
-        for (int v = 0; v < canonical.size(); ++v) {
-            canonical[v] = toOld[toNew[v]];
-        }
-
- - See also G3D::MeshAlg::weldAdjacency. - - @cite The method is that described as the 'Grouper' in Baum, Mann, Smith, and Winget, - Making Radiosity Usable: Automatic Preprocessing and Meshing Techniques for - the Generation of Accurate Radiosity Solutions, Computer Graphics vol 25, no 4, July 1991. - - @deprecated Use weld. - */ - static void computeWeld( - const Array& oldVertexPositions, - Array& newVertexPositions, - Array& toNew, - Array& toOld, - double radius = G3D::fuzzyEpsilon); - - /** - Modifies the face, edge, and vertex arrays in place so that - colocated (within radius) vertices are treated as identical. - Note that the vertexArray and corresponding geometry will - contain elements that are no longer used. In the vertexArray, - these elements are initialized to MeshAlg::Vertex() but not - removed (because removal would change the indexing). - - This is a good preprocessing step for algorithms that are only - concerned with the shape of a mesh (e.g. cartoon rendering, fur, shadows) - and not the indexing of the vertices. - - Use this method when you have already computed adjacency information - and want to collapse colocated vertices within that data without - disturbing the actual mesh vertices or indexing scheme. - - If you have not computed adjacency already, use MeshAlg::computeWeld - instead and compute adjacency information after welding. - - @deprecated Use weld. - - @param faceArray Mutated in place. Size is maintained (degenerate - faces are not removed). - @param edgeArray Mutated in place. May shrink if boundary edges - are welded together. - @param vertexArray Mutated in place. Size is maintained (duplicate - vertices contain no adjacency info). - */ - static void weldAdjacency( - const Array& originalGeometry, - Array& faceArray, - Array& edgeArray, - Array& vertexArray, - double radius = G3D::fuzzyEpsilon); - - - /** - Counts the number of edges (in an edge array returned from - MeshAlg::computeAdjacency) that have only one adjacent face. - */ - static int countBoundaryEdges(const Array& edgeArray); - - - /** - Generates an array of integers from start to start + n - 1 that have run numbers - in series then omit the next skip before the next run. Useful for turning - a triangle list into an indexed face set. - - Example: - 
-       createIndexArray(10, x);
-       // x = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] 
-
-       createIndexArray(5, x, 2);
-       // x = [2, 3, 4, 5, 6, 7] 
-
-       createIndexArray(6, x, 0, 2, 1);
-       // x = [0, 1, 3, 4, 6, 7]
-
- */ - static void createIndexArray( - int n, - Array& array, - int start = 0, - int run = 1, - int skip = 0); - - /** - Computes a conservative, near-optimal axis aligned bounding box and sphere. - - @cite The bounding sphere uses the method from J. Ritter. An effcient bounding sphere. In Andrew S. Glassner, editor, Graphics Gems. Academic Press, Boston, MA, 1990. - - */ - static void computeBounds(const Array& vertex, class Box& box, class Sphere& sphere); - - /** Computes bounds for a subset of the vertices. It is ok if vertices appear more than once in the index array. */ - static void computeBounds(const Array& vertex, const Array& index, class Box& box, class Sphere& sphere); - - /** - Mutates geometry, texCoord, and indexArray so that the output has collocated vertices collapsed (welded). - - @param vertices Input and output - @param textureCoords Input and output - @param normals Output only - @param indices Input and output. This is an array of trilist indices. - @param oldToNewIndex Output argument - @param normalSmoothingAngle Varies from 0 (flat shading) to toRadians(180) for extremely smooth shading. Default is toRadians(70) - */ - static void weld( - Array& vertices, - Array& textureCoords, - Array& normals, - Array*>& indices, - float normalSmoothingAngle = toRadians(70.0f), - float vertexWeldRadius = 0.0001f, - float textureWeldRadius = 0.0001f, - float normalWeldRadius = 0.01f); - - inline static void weld( - Array& vertices, - Array& textureCoords, - Array& normals, - Array& indices, - float normalSmoothingAngle = toRadians(70.0f), - float vertexWeldRadius = 0.0002f, - float textureWeldRadius = 0.00001f, - float normalWeldRadius = 0.00001f) { - - Array*> meta; - meta.append(&indices); - weld(vertices, textureCoords, normals, meta, normalSmoothingAngle, vertexWeldRadius, textureWeldRadius, normalWeldRadius); - } - - /** - In debug mode, asserts that the adjacency references between the - face, edge, and vertex array are consistent. - */ - static void debugCheckConsistency( - const Array& faceArray, - const Array& edgeArray, - const Array& vertexArray); - - /** - Generates a unit square in the X-Z plane composed of a grid of wCells x hCells - squares and then transforms it by xform. - - @param vertex Output vertices - @param texCoord Output texture coordinates - @param index Output triangle list indices - @param textureScale Lower-right texture coordinate - @param spaceCentered If true, the coordinates generated are centered at the origin before the transformation. - @param twoSided If true, matching top and bottom planes are generated. - */ - static void generateGrid( - Array& vertex, - Array& texCoord, - Array& index, - int wCells = 10, - int hCells = 10, - const Vector2& textureScale = Vector2(1,1), - bool spaceCentered = true, - bool twoSided = true, - const CoordinateFrame& xform = CoordinateFrame()); - - /** Converts quadlist (QUADS), - triangle fan (TRIANGLE_FAN), - tristrip(TRIANGLE_STRIP), and quadstrip (QUAD_STRIP) indices into - triangle list (TRIANGLES) indices and appends them to outIndices. */ - template - static void toIndexedTriList( - const Array& inIndices, - MeshAlg::Primitive inType, - Array& outIndices) { - - debugAssert( - inType == MeshAlg::TRIANGLE_STRIP || - inType == MeshAlg::TRIANGLE_FAN || - inType == MeshAlg::QUADS || - inType == MeshAlg::QUAD_STRIP); - - const int inSize = inIndices.size(); - - switch(inType) { - case MeshAlg::TRIANGLE_FAN: - { - debugAssert(inSize >= 3); - - int N = outIndices.size(); - outIndices.resize(N + (inSize - 2) * 3); - - for (IndexType i = 1, outIndex = N; i <= (inSize - 2); ++i, outIndex += 3) { - outIndices[outIndex] = inIndices[0]; - outIndices[outIndex + 1] = inIndices[i]; - outIndices[outIndex + 2] = inIndices[i + 1]; - } - - break; - } - - case MeshAlg::TRIANGLE_STRIP: - { - debugAssert(inSize >= 3); - - int N = outIndices.size(); - outIndices.resize(N + (inSize - 2) * 3); - - bool atEven = false; - for (IndexType i = 0, outIndex = N; i <= (inSize - 2); ++i, outIndex += 3) { - if (atEven) { - outIndices[outIndex] = inIndices[i + 1]; - outIndices[outIndex + 1] = inIndices[i]; - outIndices[outIndex + 2] = inIndices[i + 2]; - atEven = false; - } else { - outIndices[outIndex] = inIndices[i]; - outIndices[outIndex + 1] = inIndices[i + 1]; - outIndices[outIndex + 2] = inIndices[i + 2]; - atEven = true; - } - } - - break; - } - - case MeshAlg::QUADS: - { - debugAssert(inIndices.size() >= 4); - - int N = outIndices.size(); - outIndices.resize(N + (inSize / 4) * 3); - - for (IndexType i = 0, outIndex = N; i <= (inSize - 4); i += 4, outIndex += 6) { - outIndices[outIndex] = inIndices[i]; - outIndices[outIndex + 1] = inIndices[i + 1]; - outIndices[outIndex + 2] = inIndices[i + 3]; - outIndices[outIndex + 3] = inIndices[i + 1]; - outIndices[outIndex + 4] = inIndices[i + 2]; - outIndices[outIndex + 5] = inIndices[i + 3]; - } - - break; - } - - case MeshAlg::QUAD_STRIP: - { - debugAssert(inIndices.size() >= 4); - - int N = outIndices.size(); - outIndices.resize(N + (inSize - 2) * 3); - - for (IndexType i = 0, outIndex = N; i <= (inSize - 2); i += 2, outIndex += 6) { - outIndices[outIndex] = inIndices[i]; - outIndices[outIndex + 1] = inIndices[i + 1]; - outIndices[outIndex + 2] = inIndices[i + 2]; - outIndices[outIndex + 3] = inIndices[i + 2]; - outIndices[outIndex + 4] = inIndices[i + 1]; - outIndices[outIndex + 5] = inIndices[i + 3]; - } - break; - } - default: - alwaysAssertM(false, "Illegal argument"); - } - } - -protected: - - /** - Helper for computeAdjacency. If a directed edge with index e already - exists from i0 to i1 then e is returned. If a directed edge with index e - already exists from i1 to i0, ~e is returned (the complement) and - edgeArray[e] is set to f. Otherwise, a new edge is created from i0 to i1 - with first face index f and its index is returned. - - @param vertexArray Vertex positions to use when deciding colocation. - - @param area Area of face f. When multiple edges of the same direction - are found between the same vertices (usually because of degenerate edges) - the face with larger area is kept in the edge table. - */ - static int findEdgeIndex( - const Array& vertexArray, - Array& geometricEdgeArray, - int i0, int i1, int f, double area); -}; -} -#endif - diff --git a/externals/g3dlite/G3D.lib/include/G3D/MeshBuilder.h b/externals/g3dlite/G3D.lib/include/G3D/MeshBuilder.h deleted file mode 100644 index 3256c0de823..00000000000 --- a/externals/g3dlite/G3D.lib/include/G3D/MeshBuilder.h +++ /dev/null @@ -1,82 +0,0 @@ -/** - @file MeshBuilder.h - - @maintainer Morgan McGuire, matrix@graphics3d.com - - @created 2002-02-27 - @edited 2004-10-04 - */ -#ifndef G3D_MESHBUILDER_H -#define G3D_MESHBUILDER_H - -#include "G3D/platform.h" -#include "G3D/Array.h" -#include "G3D/Vector3.h" -#include "G3D/Triangle.h" - -namespace G3D { - -/** - Allows creation of optimized watertight meshes from unoptimized polygon soups. - See also G3D::MeshAlg for algorithms that operate on the output. - */ -class MeshBuilder { -public: - - /** - Set setWeldRadius to AUTO_WELD to weld vertices closer than 1/2 - the smallest edge length in a model. - */ - enum {AUTO_WELD = -100}; - -private: - /** Indices of vertices in or near a grid cell. */ - typedef Array List; - - std::string name; - - /** - All of the triangles, as a long triangle list. - */ - Array triList; - - void centerTriList(); - void computeBounds(Vector3& min, Vector3& max); - - bool _twoSided; - - /** Collapse radius */ - double close; - -public: - - inline MeshBuilder(bool twoSided = false) : _twoSided(twoSided), close(AUTO_WELD) {} - - /** Writes the model to the arrays, which can then be used with - G3D::IFSModel::save and G3D::MeshAlg */ - void commit(std::string& name, Array& indexArray, Array& vertexArray); - - /** - Adds a new triangle to the model. (Counter clockwise) - */ - void addTriangle(const Vector3& a, const Vector3& b, const Vector3& c); - - /** - Adds two new triangles to the model. (Counter clockwise) - */ - void addQuad(const Vector3& a, const Vector3& b, const Vector3& c, const Vector3& d); - - void addTriangle(const Triangle& t); - - void setName(const std::string& n); - - /** Vertices within this distance are considered identical. - Use AUTO_WELD (the default) to have the distance be a function of the model size.*/ - void setWeldRadius(double r) { - close = r; - } -}; - -} // namespace - -#endif diff --git a/externals/g3dlite/G3D.lib/include/G3D/NetAddress.h b/externals/g3dlite/G3D.lib/include/G3D/NetAddress.h deleted file mode 100644 index 8ed20a06690..00000000000 --- a/externals/g3dlite/G3D.lib/include/G3D/NetAddress.h +++ /dev/null @@ -1,132 +0,0 @@ -#ifndef G3D_NETADDRESS_H -#define G3D_NETADDRESS_H - -#include "G3D/platform.h" -#include "G3D/Table.h" - -/** These control the version of Winsock used by G3D. - Version 2.0 is standard for G3D 6.09 and later. - Version 1.1 is standard for G3D 6.08 and earlier. - */ -#define G3D_WINSOCK_MAJOR_VERSION 2 -#define G3D_WINSOCK_MINOR_VERSION 0 - -#ifdef G3D_WIN32 -# if (G3D_WINSOCK_MAJOR_VERSION == 2) -# include -# elif (G3D_WINSOCK_MAJOR_VERSION == 1) -# include -# endif -#else -# include -# include -# include -# ifndef SOCKADDR_IN -# define SOCKADDR_IN struct sockaddr_in -# endif -# ifndef SOCKET -# define SOCKET int -# endif -#endif - -#include "G3D/g3dmath.h" - -namespace G3D { - -class NetAddress { -private: - friend class NetworkDevice; - friend class LightweightConduit; - friend class ReliableConduit; - - /** Host byte order */ - void init(uint32 host, uint16 port); - void init(const std::string& hostname, uint16 port); - NetAddress(const SOCKADDR_IN& a); - NetAddress(const struct in_addr& addr, uint16 port = 0); - - SOCKADDR_IN addr; - -public: - /** - In host byte order - */ - NetAddress(uint32 host, uint16 port = 0); - - /** - @param port Specified in host byte order (i.e., don't worry about endian issues) - */ - NetAddress(const std::string& hostname, uint16 port); - - /** - @param hostnameAndPort in the form "hostname:port" or "ip:port" - */ - NetAddress(const std::string& hostnameAndPort); - - /** - @deprecated Use G3D::NetworkDevice::broadcastAddressArray() - - @brief Creates a UDP broadcast address for use with a - G3D::LightweightConduit. - - UDP broadcast allows one machine to send a packet to all machines - on the same local network. The IP portion of the address is - 0xFFFFFFFF, which indicates "broadcast" to the underlying socket - API. This feature is not available with the connection-based TCP - protocol abstracted by G3D::ReliableConduit; use multisend - instead. - */ - static NetAddress broadcastAddress(uint16 port); - - NetAddress(); - - void serialize(class BinaryOutput& b) const; - void deserialize(class BinaryInput& b); - - /** @brief Returns true if this is not an illegal address. */ - bool ok() const; - - /** @brief Returns a value in host format (i.e., don't worry about - endian issues) */ - inline uint32 ip() const { - return ntohl(addr.sin_addr.s_addr); - //return ntohl(addr.sin_addr.S_un.S_addr); - } - - inline uint16 port() const { - return ntohs(addr.sin_port); - } - - std::string ipString() const; - std::string toString() const; - -}; - -std::ostream& operator<<(std::ostream& os, const NetAddress&); - -} // namespace G3D - -template <> struct HashTrait { - static size_t hashCode(const G3D::NetAddress& key) { - return static_cast(key.ip() + (static_cast(key.port()) << 16)); - } -}; - -namespace G3D { - -/** - Two addresses may point to the same computer but be != because - they have different IP's. - */ -inline bool operator==(const NetAddress& a, const NetAddress& b) { - return (a.ip() == b.ip()) && (a.port() == b.port()); -} - - -inline bool operator!=(const NetAddress& a, const NetAddress& b) { - return !(a == b); -} - -} // namespace G3D - -#endif diff --git a/externals/g3dlite/G3D.lib/include/G3D/NetworkDevice.h b/externals/g3dlite/G3D.lib/include/G3D/NetworkDevice.h deleted file mode 100644 index faffa56d690..00000000000 --- a/externals/g3dlite/G3D.lib/include/G3D/NetworkDevice.h +++ /dev/null @@ -1,738 +0,0 @@ -/** - @file NetworkDevice.h - - These classes abstract networking from the socket level to a - serialized messaging style that is more appropriate for games. The - performance has been tuned for sending many small messages. The - message protocol contains a header that prevents them from being used - with raw UDP/TCP (e.g. connecting to an HTTP server). - - LightweightConduit and ReliableConduits have different interfaces - because they have different semantics. You would never want to - interchange them without rewriting the surrounding code. - - NetworkDevice creates conduits because they need access to a global - log pointer and because I don't want non-reference counted conduits - being created. - - Be careful with threads and reference counting. The reference - counters are not threadsafe, and are also not updated correctly if a - thread is explicitly killed. Since the conduits will be passed by - const XConduitRef& most of the time this doesn't appear as a major - problem. With non-blocking conduits, you should need few threads - anyway. - - LightweightConduits preceed each message with a 4-byte host order - unsigned integer that is the message type. This does not appear in - the message serialization/deserialization. - - ReliableConduits preceed each message with two 4-byte host order - unsigned integers. The first is the message type and the second - indicates the length of the rest of the data. The size does not - include the size of the header itself. The minimum message is 9 - bytes:a 4-byte type, a 4-byte header equal to "1", and one byte of data. - - @maintainer Morgan McGuire, morgan@graphics3d.com - @created 2002-11-22 - @edited 2006-11-25 - */ - -#ifndef G3D_NETWORKDEVICE_H -#define G3D_NETWORKDEVICE_H - -#include "G3D/platform.h" -#include "G3D/NetAddress.h" - -#include -#include -#include "G3D/g3dmath.h" - -#include "G3D/ReferenceCount.h" -#include "G3D/Array.h" -#include "G3D/BinaryOutput.h" - -namespace G3D { - -class TextOutput; - -class Conduit : public ReferenceCountedObject { -protected: - friend class NetworkDevice; - friend class NetListener; - - uint64 mSent; - uint64 mReceived; - uint64 bSent; - uint64 bReceived; - - SOCKET sock; - - /** - Used for serialization. One per socket - to make this threadsafe. - */ - BinaryOutput binaryOutput; - - Conduit(); - -public: - - virtual ~Conduit(); - uint64 bytesSent() const; - uint64 messagesSent() const; - uint64 bytesReceived() const; - uint64 messagesReceived() const; - - /** - If true, receive will return true. - */ - virtual bool messageWaiting(); - - /** - Returns the type of the waiting message (i.e. the type supplied - with send). The return value is zero when there is no message - waiting. - - One way to use this is to have a Table mapping message types to - pre-allocated subclasses so receiving looks like: - - 
-         // My base class for messages.
-         class Message {
-             virtual void serialize(BinaryOutput&) const;
-             virtual void deserialize(BinaryInput&);
-             virtual void process() = 0;
-         };
-
-         Message* m = table[conduit->waitingMessageType()];
-         conduit->receive(m);
-         m->process();
-
- - Another is to simply switch on the message type: - - 
-         switch (conduit->waitingMessageType()) {
-         case 0:
-            // No message
-            break;
-
-         case ENTITY_SPAWN_MSG:
-            {
-               EntitySpawnMsg m;
-               condiut->receive(m);
-               spawnEntity(m.id, m.position, m.modelID);
-            }
-            break;
-            ...
-         }
-
- */ - virtual uint32 waitingMessageType() = 0; - - /** Returns true if the connection is ok. */ - bool ok() const; -}; - -typedef ReferenceCountedPointer ReliableConduitRef; - -#ifdef __GNUC__ -// Workaround for a known bug in gcc 4.x where htonl produces -// a spurrious warning. -// http://gcc.gnu.org/ml/gcc-bugs/2005-10/msg03270.html -uint32 gcchtonl(uint32); -#endif - -// Messaging and stream APIs must be supported on a single class because -// sometimes an application will switch modes on a single socket. For -// example, when transferring 3D level geometry during handshaking with -// a game server. -/** - A conduit that guarantees messages will arrive, intact and in order. - Create on the client using NetworkDevice::createReliableConduit and - on the server using NetListener::waitForConnection. Set the reference - counted pointer to NULL to disconnect. - - To construct a ReliableConduit: -
    -
  1. Create a G3D::NetworkDevice (if you are using G3D::GApp, it creates - one for you) on the client and on the server. -
  2. On the server, create a G3D::NetListener using - G3D::NetworkDevice::createListener -
  3. On the server, invoke G3D::NetListener::waitForConnection. -
  4. On the client, call G3D::NetworkDevice::createReliableConduit. - You will need the server's G3D::NetAddress. Consider using - G3D::DiscoveryClient to find it via broadcasting. -
- - */ -class ReliableConduit : public Conduit { -private: - friend class NetworkDevice; - friend class NetListener; - - enum State {RECEIVING, HOLDING, NO_MESSAGE} state; - - NetAddress addr; - - /** - Type of the incoming message. - */ - uint32 messageType; - - /** - Total size of the incoming message (read from the header). - */ - uint32 messageSize; - - /** Shared buffer for receiving messages. */ - void* receiveBuffer; - - /** Total size of the receiveBuffer. */ - size_t receiveBufferTotalSize; - - /** Size occupied by the current message... so far. This will be - equal to messageSize when the whole message has arrived. - */ - size_t receiveBufferUsedSize; - - ReliableConduit(const NetAddress& addr); - - ReliableConduit(const SOCKET& sock, - const NetAddress& addr); - - template static void serializeMessage - (uint32 t, const T& m, BinaryOutput& b) { - - b.writeUInt32(t); - - // Reserve space for the 4 byte size header - b.writeUInt32(0); - - size_t L = b.length(); - m.serialize(b); - if ((size_t)b.length() == L) { - // No data was created by serialization. - // We need to send at least one byte because receive assumes that - // a zero length message is an error. - b.writeUInt8(0xFF); - } - - uint32 len = b.size() - 8; - - // We send the length first to tell recv how much data to read. - // Here we abuse BinaryOutput a bit and write directly into - // its buffer, violating the abstraction. - // Note that we write to the second set of 4 bytes, which is - // the size field. - uint32* lenPtr = ((uint32*)b.getCArray()) + 1; - #if defined(__GNUC__) - *lenPtr = gcchtonl(len); - #else - *lenPtr = htonl(len); - #endif - } - - - void sendBuffer(const BinaryOutput& b); - - /** Accumulates whatever part of the message (not the header) is - still waiting on the socket into the receiveBuffer during - state = RECEIVING mode. Closes the socket if anything goes - wrong. When receiveBufferUsedSize == messageSize, the entire - message has arrived. */ - void receiveIntoBuffer(); - - /** Receives the messageType and messageSize from the socket. */ - void receiveHeader(); - -public: - - /** - Client invokes this to connect to a server. The call blocks until the - conduit is opened. The conduit will not be ok() if it fails. - */ - static ReliableConduitRef create(const NetAddress& address); - - /** Closes the socket. */ - ~ReliableConduit(); - - - // The message is actually copied from the socket to an internal buffer during - // this call. Receive only deserializes. - virtual bool messageWaiting(); - - /** - Serializes the message and schedules it to be sent as soon as possible, - and then returns immediately. The message can be any class with - a serialize and deserialize method. On the receiving side, - use G3D::ReliableConduit::waitingMessageType() to detect the incoming - message and then invoke G3D::ReliableConduit::receive(msg) where msg - is of the same class as the message that was sent. - - The actual data sent across the network is preceeded by the - message type and the size of the serialized message as a 32-bit - integer. The size is sent because TCP is a stream protocol and - doesn't have a concept of discrete messages. - */ - template inline void send(uint32 type, const T& message) { - binaryOutput.reset(); - serializeMessage(type, message, binaryOutput); - sendBuffer(binaryOutput); - } - - /** Sends an empty message with the given type. Useful for sending - commands that have no parameters. */ - void send(uint32 type); - - /** Send the same message to a number of conduits. Useful for sending - data from a server to many clients (only serializes once). */ - template - inline static void multisend( - const Array& array, - uint32 type, - const T& m) { - - if (array.size() > 0) { - array[0]->binaryOutput.reset(); - serializeMessage(type, m, array[0]->binaryOutput); - - for (int i = 0; i < array.size(); ++i) { - array[i]->sendBuffer(array[0]->binaryOutput); - } - } - } - - virtual uint32 waitingMessageType(); - - /** - If a message is waiting, deserializes the waiting message into - message and returns true, otherwise returns false. You can - determine the type of the message (and therefore, the class - of message) using G3D::ReliableConduit::waitingMessageType(). - */ - template inline bool receive(T& message) { - if (! messageWaiting()) { - return false; - } - - debugAssert(state == HOLDING); - // Deserialize - BinaryInput b((uint8*)receiveBuffer, receiveBufferUsedSize, G3D_LITTLE_ENDIAN, BinaryInput::NO_COPY); - message.deserialize(b); - - // Don't let anyone read this message again. We leave the buffer - // allocated for the next caller, however. - receiveBufferUsedSize = 0; - state = NO_MESSAGE; - messageType = 0; - messageSize = 0; - - // Potentially read the next message. - messageWaiting(); - - return true; - } - - /** Removes the current message from the queue. */ - inline void receive() { - if (! messageWaiting()) { - return; - } - receiveBufferUsedSize = 0; - state = NO_MESSAGE; - messageType = 0; - messageSize = 0; - - // Potentially read the next message. - messageWaiting(); - } - - NetAddress address() const; -}; - - -typedef ReferenceCountedPointer LightweightConduitRef; - -/** - Provides fast but unreliable transfer of messages. On a LAN, - LightweightConduit will probably never drop messages but you - might get your messages out of order. On an internet - connection it might drop messages altogether. Messages are never - corrupted, however. LightweightConduit requires a little less setup - and overhead than ReliableConduit. ReliableConduit guarantees - message delivery and order but requires a persistent connection. - - To set up a LightweightConduit (assuming you have already made - subclasses of G3D::NetMessage based on your application's - pcommunication protocol): - -[Server Side] -
    -
  1. Call LightweightConduit::create(port, true, false), -where port is the port on which you will receive messages. - -
  2. Poll LightweightConduit::messageWaiting from your main loop. When -it is true (or, equivalently, when LightweightConduit::waitingMessageType -is non-zero) there is an incoming message. - -
  3. To read the incoming message, call LightweightConduit::receive with -the appropriate class type, which mist have a deserialize method. -LightweightConduit::waitingMessageType tells you what class is -needed (you make up your own message constants for your program; numbers -under 1000 are reserved for G3D's internal use). - -
  4. When done, simply set the G3D::LightweightConduitRef to NULL or let -it go out of scope and the conduit cleans itself up automatically. -
- -[Client Side] -
    -
  1. Call G3D::LightweightConduit::create(). If you will -broadcast to all servers on a LAN, set the third optional argument to -true (the default is false for no broadcast). You can also set up the -receive port as if it was a server to send and receive from a single -LightweightConduit. - -
  2. To send, call G3D::LightweightConduit::send with the target address -and a pointer to an instance of the message you want to send. - -
  3. When done, simply set the G3D::LightweightConduitRef to NULL or let -it go out of scope and the conduit cleans itself up automatically. - -
- */ -class LightweightConduit : public Conduit { -private: - friend class NetworkDevice; - - /** - True when waitingForMessageType has read the message - from the network into messageType/messageStream. - */ - bool alreadyReadMessage; - - /** - Origin of the received message. - */ - NetAddress messageSender; - - /** - The type of the last message received. - */ - uint32 messageType; - - /** - The message received (the type has already been read off). - */ - Array messageBuffer; - - LightweightConduit(uint16 receivePort, bool enableReceive, bool enableBroadcast); - - void sendBuffer(const NetAddress& a, BinaryOutput& b); - - /** Maximum transmission unit (packet size in bytes) for this socket. - May vary between sockets. */ - int MTU; - - - template - void serializeMessage( - uint32 type, - const T& m, - BinaryOutput& b) const { - - debugAssert(type != 0); - b.writeUInt32(type); - m.serialize(b); - b.writeUInt32(1); - - debugAssertM(b.size() < MTU, - format("This LightweightConduit is limited to messages of " - "%d bytes (Ethernet hardware limit; this is the " - "'UDP MTU')", maxMessageSize())); - - if (b.size() >= MTU) { - throw LightweightConduit::PacketSizeException( - format("This LightweightConduit is limited to messages of " - "%d bytes (Ethernet hardware limit; this is the " - "'UDP MTU')", maxMessageSize()), - b.size() - 4, // Don't count the type header - maxMessageSize()); - } - } - -public: - - static LightweightConduitRef create(uint16 receivePort, bool enableReceive, bool enableBroadcast); - - class PacketSizeException { - public: - std::string message; - int serializedPacketSize; - int maxMessageSize; - - inline PacketSizeException(const std::string& m, int s, int b) : - message(m), - serializedPacketSize(s), - maxMessageSize(b) {} - }; - - /** Closes the socket. */ - ~LightweightConduit(); - - /** The maximum length of a message that can be sent - (G3D places a small header at the front of each UDP packet; - this is already taken into account by the value returned). - */ - inline int maxMessageSize() const { - return MTU - 4; - } - - - template inline void send(const NetAddress& a, uint32 type, const T& msg) { - binaryOutput.reset(); - serializeMessage(type, msg, binaryOutput); - sendBuffer(a, binaryOutput); - } - - /** Send the same message to multiple addresses (only serializes once). - Useful when server needs to send to a known list of addresses - (unlike direct UDP broadcast to all addresses on the subnet) */ - template inline void send(const Array& a, uint32 type, const T& m) { - binaryOutput.reset(); - serializeMessage(type, m, binaryOutput); - - for (int i = 0; i < a.size(); ++i) { - sendBuffer(a[i], binaryOutput); - } - } - - bool receive(NetAddress& sender); - - template inline bool receive(NetAddress& sender, T& message) { - bool r = receive(sender); - if (r) { - BinaryInput b((messageBuffer.getCArray() + 4), - messageBuffer.size() - 4, - G3D_LITTLE_ENDIAN, BinaryInput::NO_COPY); - message.deserialize(b); - } - - return r; - } - - inline bool receive() { - static NetAddress ignore; - return receive(ignore); - } - - virtual uint32 waitingMessageType(); - - - virtual bool messageWaiting(); -}; - -/////////////////////////////////////////////////////////////////////////////// - -typedef ReferenceCountedPointer NetListenerRef; - -/** - Runs on the server listening for clients trying to make reliable connections. - */ -class NetListener : public ReferenceCountedObject { -private: - - friend class NetworkDevice; - - SOCKET sock; - - /** Port is in host byte order. */ - NetListener(uint16 port); - -public: - - static NetListenerRef create(const uint16 port); - - ~NetListener(); - - /** Block until a connection is received. Returns NULL if - something went wrong. */ - ReliableConduitRef waitForConnection(); - - /** True if a client is waiting (i.e. waitForConnection will - return immediately). */ - bool clientWaiting() const; - - bool ok() const; -}; - - -/////////////////////////////////////////////////////////////////////////////// - -/** - @brief Abstraction of network (socket) functionality. - - An abstraction over sockets that provides a message-based network - infrastructure optimized for sending many small (~500 bytes) messages. - All functions always return immediately. - - Create only one NetworkDevice per process (a WinSock restriction). - - NetworkDevice is technically not thread safe. However, as long as - you use different conduits on different threads (or lock conduits - before sending), you will encounter no problems sharing the single - NetworkDevice across multiple threads. That is, do not invoke the same - Conduit's send or receive method on two threads at once. - - This assumes that the underlying WinSock/BSD sockets implementation - is thread safe. That is not guaranteed, but in practice seems - to always be true (see - http://tangentsoft.net/wskfaq/intermediate.html#threadsafety) - -
- - IP networks use "network byte order" (big-endian) for - communicating integers. "Host byte order" is the endian-ness of - the local machine (typically little-endian; see - System::endian). The C functions htonl() and ntohl() convert 32-bit - values between these formats. G3D only ever exposes host byte order, - so programmers rarely need to be aware of the distinction. - - */ -class NetworkDevice { -public: - - /** @brief Description of an ethernet or wireless ethernet adapter.*/ - class EthernetAdapter { - public: - /** Reverse-DNS of the ip address.*/ - std::string hostname; - - /** Name of the adapter */ - std::string name; - - /** IP address in host byte order.*/ - uint32 ip; - - /** Subnet mask in host byte order.*/ - uint32 subnet; - - /** UDP broadcast address in host byte order.*/ - uint32 broadcast; - - /** MAC (hardware) address, if known */ - uint8 mac[6]; - - EthernetAdapter(); - - /** Produces a text description of this adapter */ - void describe(TextOutput& t) const; - }; - -private: - - friend class Conduit; - friend class LightweightConduit; - friend class ReliableConduit; - friend class NetListener; - - bool initialized; - - Array m_adapterArray; - - /** Broadcast addresses available on this machine, - extracted from m_adapterArray.*/ - Array m_broadcastAddresses; - - /** Utility method. */ - void closesocket(SOCKET& sock) const; - - /** Utility method. Returns true on success.*/ - bool bind(SOCKET sock, const NetAddress& addr) const; - - /** The global instance */ - static NetworkDevice* s_instance; - - NetworkDevice(); - - bool init(); - - void _cleanup(); - - /** Called from init to update m_adapterArray and - m_broadcastAddresses. */ - void addAdapter(const EthernetAdapter& a); - -public: - - /** Prints an IP address to a string. - @param ip In host byte order.*/ - static std::string formatIP(uint32 ip); - - /** Prints a MAC address to a string. */ - static std::string formatMAC(const uint8 mac[6]); - - ~NetworkDevice(); - - /** Returns the available ethernet adapters for the current - machine that are online. Does not include the loopback adapter - for localhost.*/ - inline const Array& adapterArray() const { - return m_adapterArray; - } - - /** Returns the (unique) IP addresses for UDP broadcasting - extracted from adapterArray(). All are in host byte order. */ - inline const Array& broadcastAddressArray() const { - return m_broadcastAddresses; - } - - /** - Returns NULL if there was a problem initializing the network. - */ - static NetworkDevice* instance(); - - /** - Shuts down the network device (destroying the global instance). - */ - static void cleanup(); - - /** - Prints a human-readable description of this machine - to the text output stream. - */ - void describeSystem( - TextOutput& t); - - void describeSystem( - std::string& s); - - /** Returns the name (or one of the names) of this computer */ - std::string localHostName() const; - - /** There is often more than one address for the local host. This - returns all of them. - @deprecated Use adapterArray() - */ - void localHostAddresses(Array& array) const; -}; - - -#ifdef __GNUC__ -inline uint32 gcchtonl(uint32 x) { - // This pragma fools gcc into surpressing all error messages, - // including the bogus one that it creates for htonl -# pragma GCC system_header - return htonl(x); -} -#endif - -} // G3D namespace - -#ifndef _WIN32 -#undef SOCKADDR_IN -#undef SOCKET -#endif - -#endif diff --git a/externals/g3dlite/G3D.lib/include/G3D/PhysicsFrame.h b/externals/g3dlite/G3D.lib/include/G3D/PhysicsFrame.h deleted file mode 100644 index 44eedb6846e..00000000000 --- a/externals/g3dlite/G3D.lib/include/G3D/PhysicsFrame.h +++ /dev/null @@ -1,74 +0,0 @@ -/** - @file PhysicsFrame.h - - @maintainer Morgan McGuire, matrix@graphics3d.com - - @created 2002-07-08 - @edited 2006-01-10 -*/ - -#ifndef G3D_PHYSICSFRAME_H -#define G3D_PHYSICSFRAME_H - -#include "G3D/platform.h" -#include "G3D/Vector3.h" -#include "G3D/Matrix3.h" -#include "G3D/Quat.h" -#include "G3D/CoordinateFrame.h" -#include -#include - - -namespace G3D { - -/** - An RT transformation using a quaternion; suitable for - physics integration. - - This interface is in "Beta" and will change in the next release. - */ -class PhysicsFrame { -public: - - Quat rotation; - - /** - Takes object space points to world space. - */ - Vector3 translation; - - /** - Initializes to the identity frame. - */ - PhysicsFrame(); - - /** - Purely translational force - */ - PhysicsFrame(const Vector3& translation) : translation(translation) {} - - PhysicsFrame(const CoordinateFrame& coordinateFrame); - - /** Compose: create the transformation that is other followed by this.*/ - PhysicsFrame operator*(const PhysicsFrame& other) const; - - virtual ~PhysicsFrame() {} - - CoordinateFrame toCoordinateFrame() const; - - /** - Linear interpolation (spherical linear for the rotations). - */ - PhysicsFrame lerp( - const PhysicsFrame& other, - float alpha) const; - - void deserialize(class BinaryInput& b); - - void serialize(class BinaryOutput& b) const; - -}; - -} // namespace - -#endif diff --git a/externals/g3dlite/G3D.lib/include/G3D/Plane.h b/externals/g3dlite/G3D.lib/include/G3D/Plane.h deleted file mode 100644 index 1f0b15e0fe4..00000000000 --- a/externals/g3dlite/G3D.lib/include/G3D/Plane.h +++ /dev/null @@ -1,161 +0,0 @@ -/** - @file Plane.h - - Plane class - - @maintainer Morgan McGuire, matrix@graphics3d.com - - @created 2001-06-02 - @edited 2004-07-18 -*/ - -#ifndef G3D_PLANE_H -#define G3D_PLANE_H - -#include "G3D/platform.h" -#include "G3D/Vector3.h" -#include "G3D/Vector4.h" -#include "G3D/debugAssert.h" - -namespace G3D { - -/** - An infinite 2D plane in 3D space. - */ -class Plane { -private: - - /** normal.Dot(x,y,z) = distance */ - Vector3 _normal; - float _distance; - - /** - Assumes the normal has unit length. - */ - Plane(const Vector3& n, float d) : _normal(n), _distance(d) { - } - -public: - - Plane() : _normal(Vector3::unitY()), _distance(0) { - } - - /** - Constructs a plane from three points. - */ - Plane( - const Vector3& point0, - const Vector3& point1, - const Vector3& point2); - - /** - Constructs a plane from three points, where at most two are - at infinity (w = 0, not xyz = inf). - */ - Plane( - Vector4 point0, - Vector4 point1, - Vector4 point2); - - /** - The normal will be unitized. - */ - Plane( - const Vector3& __normal, - const Vector3& point); - - static Plane fromEquation(float a, float b, float c, float d); - - Plane(class BinaryInput& b); - void serialize(class BinaryOutput& b) const; - void deserialize(class BinaryInput& b); - - virtual ~Plane() {} - - /** - Returns true if point is on the side the normal points to or - is in the plane. - */ - inline bool halfSpaceContains(Vector3 point) const { - // Clamp to a finite range for testing - point = point.clamp(Vector3::minFinite(), Vector3::maxFinite()); - - // We can get away with putting values *at* the limits of the float32 range into - // a dot product, since the dot product is carried out on float64. - return _normal.dot(point) >= _distance; - } - - /** - Returns true if point is on the side the normal points to or - is in the plane. - */ - inline bool halfSpaceContains(const Vector4& point) const { - if (point.w == 0) { - return _normal.dot(point.xyz()) > 0; - } else { - return halfSpaceContains(point.xyz() / point.w); - } - } - - /** - Returns true if point is on the side the normal points to or - is in the plane. Only call on finite points. Faster than halfSpaceContains. - */ - inline bool halfSpaceContainsFinite(const Vector3& point) const { - debugAssert(point.isFinite()); - return _normal.dot(point) >= _distance; - } - - /** - Returns true if the point is nearly in the plane. - */ - inline bool fuzzyContains(const Vector3 &point) const { - return fuzzyEq(point.dot(_normal), _distance); - } - - inline const Vector3& normal() const { - return _normal; - } - - /** - Returns distance from point to plane. Distance is negative if point is behind (not in plane in direction opposite normal) the plane. - */ - inline float distance(const Vector3& x) const { - return (_normal.dot(x) - _distance); - } - - inline Vector3 closestPoint(const Vector3& x) const { - return x + (_normal * (-distance(x))); - } - - /** Returns normal * distance from origin */ - Vector3 center() const { - return _normal * _distance; - } - - /** - Inverts the facing direction of the plane so the new normal - is the inverse of the old normal. - */ - void flip(); - - /** - Returns the equation in the form: - - normal.Dot(Vector3(x, y, z)) + d = 0 - */ - void getEquation(Vector3 &normal, double& d) const; - void getEquation(Vector3 &normal, float& d) const; - - /** - ax + by + cz + d = 0 - */ - void getEquation(double& a, double& b, double& c, double& d) const; - void getEquation(float& a, float& b, float& c, float& d) const; - - std::string toString() const; -}; - -} // namespace - -#endif diff --git a/externals/g3dlite/G3D.lib/include/G3D/PointAABSPTree.h b/externals/g3dlite/G3D.lib/include/G3D/PointAABSPTree.h deleted file mode 100644 index c8d527a45c2..00000000000 --- a/externals/g3dlite/G3D.lib/include/G3D/PointAABSPTree.h +++ /dev/null @@ -1,1207 +0,0 @@ -/** - @file PointAABSPTree.h - - @maintainer Morgan McGuire, matrix@graphics3d.com - - @created 2004-01-11 - @edited 2008-11-02 - - Copyright 2000-2008, Morgan McGuire. - All rights reserved. - - */ - -#ifndef X_PointKDTree_H -#define X_PointKDTree_H - -#include "G3D/platform.h" -#include "G3D/Array.h" -#include "G3D/Table.h" -#include "G3D/Vector2.h" -#include "G3D/Vector3.h" -#include "G3D/Vector4.h" -#include "G3D/AABox.h" -#include "G3D/Sphere.h" -#include "G3D/Box.h" -#include "G3D/BinaryInput.h" -#include "G3D/BinaryOutput.h" -#include "G3D/CollisionDetection.h" -#include "G3D/GCamera.h" -#include "G3D/PositionTrait.h" -#include - - -/////////////////////////////////////////////////////// - -/** @deprecated */ -inline void getPosition(const G3D::Vector3& v, G3D::Vector3& p) { - p = v; -} - -/** @deprecated */ -inline void getPosition(const G3D::Vector4& v, G3D::Vector3& p) { - p = v.xyz(); -} - -/** @deprecated */ -inline void getPosition(const G3D::Vector2& v, G3D::Vector3& p) { - p.x = v.x; - p.y = v.y; - p.z = 0; -} - -namespace G3D { - -/** - A set data structure that supports spatial queries using an axis-aligned - BSP tree for speed. - - PointKDTree allows you to quickly find points in 3D that lie within - a box or sphere. For large sets of objects it is much faster - than testing each object for a collision. See also G3D::KDTree; this class - is optimized for point sets, e.g.,for use in photon mapping and mesh processing. - - Template Parameters - -
- -
The template parameter T must be one for which - the following functions are overloaded: - - 
-      T::T(); (public constructor of no arguments)
-
-       template<> struct PositionTrait {
-         static void getPosition(const T& v, G3D::Vector3& p);};
-
-       template <> struct HashTrait {
-         static size_t hashCode(const T& key);};
-
-       template<> struct EqualsTrait {
-           static bool equals(const T& a, const T& b); };
-
- -

- - G3D provides these for the Vector2, Vector3, and Vector4 classes. - If you use a custom class, or a pointer to a custom class, you will need - to define those functions. - - Moving %Set Members -

It is important that objects do not move without updating the - PointKDTree. If the position of an object is about - to change, PointKDTree::remove it before they change and - PointKDTree::insert it again afterward. For objects - where the hashCode and == operator are invariant with respect - to the 3D position, - you can use the PointKDTree::update method as a shortcut to - insert/remove an object in one step after it has moved. - - - Note: Do not mutate any value once it has been inserted into PointKDTree. Values - are copied interally. All PointKDTree iterators convert to pointers to constant - values to reinforce this. - - If you want to mutate the objects you intend to store in a PointKDTree - simply insert pointers to your objects instead of the objects - themselves, and ensure that the above operations are defined. (And - actually, because values are copied, if your values are large you may - want to insert pointers anyway, to save space and make the balance - operation faster.) - - Dimensions - Although designed as a 3D-data structure, you can use the PointKDTree - for data distributed along 2 or 1 axes by simply returning bounds - that are always zero along one or more dimensions. - -*/ -template, - class HashFunc = HashTrait, - class EqualsFunc = EqualsTrait > -class PointKDTree { -protected: -#define TreeType PointKDTree - - // Unlike the KDTree, the PointKDTree assumes that T elements are - // small and keeps the handle and cached position together instead of - // placing them in separate bounds arrays. Also note that a copy of T - // is kept in the member table and that there is no indirection. - class Handle { - private: - Vector3 m_position; - - public: - T value; - - inline Handle() {} - inline Handle(const T& v) : value(v) { - PositionFunc::getPosition(v, m_position); - } - - /** Used by makeNode to create fake handles for partitioning. */ - void setPosition(const Vector3& v) { - m_position = v; - } - - inline const Vector3& position() const { - return m_position; - } - }; - - /** Returns the bounds of the sub array. Used by makeNode. */ - static AABox computeBounds( - const Array& point) { - - if (point.size() == 0) { - return AABox(Vector3::inf(), Vector3::inf()); - } - - AABox bounds(point[0].position()); - - for (int p = 0; p < point.size(); ++p) { - bounds.merge(point[p].position()); - } - - return bounds; - } - - class Node { - public: - - /** Spatial bounds on all values at this node and its children, based purely on - the parent's splitting planes. May be infinite */ - AABox splitBounds; - - Vector3::Axis splitAxis; - - /** Location along the specified axis */ - float splitLocation; - - /** child[0] contains all values strictly - smaller than splitLocation along splitAxis. - - child[1] contains all values strictly - larger. - - Both may be NULL if there are not enough - values to bother recursing. - */ - Node* child[2]; - - /** Values if this is a leaf node). */ - Array valueArray; - - /** Creates node with NULL children */ - Node() { - splitAxis = Vector3::X_AXIS; - splitLocation = 0; - splitBounds = AABox(-Vector3::inf(), Vector3::inf()); - for (int i = 0; i < 2; ++i) { - child[i] = NULL; - } - } - - /** - Doesn't clone children. - */ - Node(const Node& other) : valueArray(other.valueArray) { - splitAxis = other.splitAxis; - splitLocation = other.splitLocation; - splitBounds = other.splitBounds; - for (int i = 0; i < 2; ++i) { - child[i] = NULL; - } - } - - /** Copies the specified subarray of pt into point, NULLs the children. - Assumes a second pass will set splitBounds. */ - Node(const Array& pt) { - splitAxis = Vector3::X_AXIS; - splitLocation = 0; - for (int i = 0; i < 2; ++i) { - child[i] = NULL; - } - valueArray = pt; - } - - - /** Deletes the children (but not the values) */ - ~Node() { - for (int i = 0; i < 2; ++i) { - delete child[i]; - } - } - - - /** Returns true if this node is a leaf (no children) */ - inline bool isLeaf() const { - return (child[0] == NULL) && (child[1] == NULL); - } - - - /** - Recursively appends all handles and children's handles - to the array. - */ - void getHandles(Array& handleArray) const { - handleArray.append(valueArray); - for (int i = 0; i < 2; ++i) { - if (child[i] != NULL) { - child[i]->getHandles(handleArray); - } - } - } - - - void verifyNode(const Vector3& lo, const Vector3& hi) { - // debugPrintf("Verifying: split %d @ %f [%f, %f, %f], [%f, %f, %f]\n", - // splitAxis, splitLocation, lo.x, lo.y, lo.z, hi.x, hi.y, hi.z); - - debugAssert(lo == splitBounds.low()); - debugAssert(hi == splitBounds.high()); - - for (int i = 0; i < valueArray.length(); ++i) { - const Vector3& b = valueArray[i].position(); - debugAssert(splitBounds.contains(b)); - } - - if (child[0] || child[1]) { - debugAssert(lo[splitAxis] < splitLocation); - debugAssert(hi[splitAxis] > splitLocation); - } - - Vector3 newLo = lo; - newLo[splitAxis] = splitLocation; - Vector3 newHi = hi; - newHi[splitAxis] = splitLocation; - - if (child[0] != NULL) { - child[0]->verifyNode(lo, newHi); - } - - if (child[1] != NULL) { - child[1]->verifyNode(newLo, hi); - } - } - - - /** - Stores the locations of the splitting planes (the structure but not the content) - so that the tree can be quickly rebuilt from a previous configuration without - calling balance. - */ - static void serializeStructure(const Node* n, BinaryOutput& bo) { - if (n == NULL) { - bo.writeUInt8(0); - } else { - bo.writeUInt8(1); - n->splitBounds.serialize(bo); - serialize(n->splitAxis, bo); - bo.writeFloat32(n->splitLocation); - for (int c = 0; c < 2; ++c) { - serializeStructure(n->child[c], bo); - } - } - } - - /** Clears the member table */ - static Node* deserializeStructure(BinaryInput& bi) { - if (bi.readUInt8() == 0) { - return NULL; - } else { - Node* n = new Node(); - n->splitBounds.deserialize(bi); - deserialize(n->splitAxis, bi); - n->splitLocation = bi.readFloat32(); - for (int c = 0; c < 2; ++c) { - n->child[c] = deserializeStructure(bi); - } - } - } - - /** Returns the deepest node that completely contains bounds. */ - Node* findDeepestContainingNode(const Vector3& point) { - - // See which side of the splitting plane the bounds are on - if (point[splitAxis] < splitLocation) { - // Point is on the low side. Recurse into the child - // if it exists. - if (child[0] != NULL) { - return child[0]->findDeepestContainingNode(point); - } - } else if (point[splitAxis] > splitLocation) { - // Point is on the high side, recurse into the child - // if it exists. - if (child[1] != NULL) { - return child[1]->findDeepestContainingNode(point); - } - } - - // There was no containing child, so this node is the - // deepest containing node. - return this; - } - - /** Appends all members that intersect the box. - If useSphere is true, members are tested against the sphere instead. */ - void getIntersectingMembers( - const AABox& sphereBounds, - const Sphere& sphere, - Array& members) const { - - // Test all values at this node. Extract the - // underlying C array for speed - const int N = valueArray.size(); - const Handle* handleArray = valueArray.getCArray(); - - const float r2 = square(sphere.radius); - - // Copy the sphere center so that it is on the stack near the radius - const Vector3 center = sphere.center; - for (int v = 0; v < N; ++v) { - if ((center - handleArray[v].position()).squaredLength() <= r2) { - members.append(handleArray[v].value); - } - } - - // If the left child overlaps the box, recurse into it - if (child[0] && (sphereBounds.low()[splitAxis] < splitLocation)) { - child[0]->getIntersectingMembers(sphereBounds, sphere, members); - } - - // If the right child overlaps the box, recurse into it - if (child[1] && (sphereBounds.high()[splitAxis] > splitLocation)) { - child[1]->getIntersectingMembers(sphereBounds, sphere, members); - } - } - - /** Appends all members that intersect the box. - If useSphere is true, members are tested against the sphere instead. - - Implemented using both box and sphere tests to simplify the implementation - of a future beginSphereInteresection iterator using the same underlying - BoxIterator class. - */ - void getIntersectingMembers( - const AABox& box, - const Sphere& sphere, - Array& members, - bool useSphere) const { - - // Test all values at this node - for (int v = 0; v < valueArray.size(); ++v) { - if ((useSphere && sphere.contains(valueArray[v].position())) || - (! useSphere && box.contains(valueArray[v].position()))) { - members.append(valueArray[v].value); - } - } - - // If the left child overlaps the box, recurse into it - if ((child[0] != NULL) && (box.low()[splitAxis] < splitLocation)) { - child[0]->getIntersectingMembers(box, sphere, members, useSphere); - } - - // If the right child overlaps the box, recurse into it - if ((child[1] != NULL) && (box.high()[splitAxis] > splitLocation)) { - child[1]->getIntersectingMembers(box, sphere, members, useSphere); - } - } - - /** - Recurse through the tree, assigning splitBounds fields. - */ - void assignSplitBounds(const AABox& myBounds) { - splitBounds = myBounds; - -# ifdef G3D_DEBUG - if (child[0] || child[1]) { - debugAssert(splitBounds.high()[splitAxis] > splitLocation); - debugAssert(splitBounds.low()[splitAxis] < splitLocation); - } -# endif - - AABox childBounds[2]; - myBounds.split(splitAxis, splitLocation, childBounds[0], childBounds[1]); - - for (int c = 0; c < 2; ++c) { - if (child[c]) { - child[c]->assignSplitBounds(childBounds[c]); - } - } - } - }; - - class AxisComparator { - private: - Vector3::Axis sortAxis; - - public: - - AxisComparator(Vector3::Axis s) : sortAxis(s) {} - - inline int operator()(const Handle& A, const Handle& B) const { - if (A.position()[sortAxis] > B.position()[sortAxis]) { - return -1; - } else if (A.position()[sortAxis] < B.position()[sortAxis]) { - return 1; - } else { - return 0; - } - } - }; - - /** - Recursively subdivides the subarray. - - The source array will be cleared after it is used - - Call assignSplitBounds() on the root node after making a tree. - */ - Node* makeNode( - Array& source, - Array& temp, - int valuesPerNode, - int numMeanSplits) { - - Node* node = NULL; - - if (source.size() <= valuesPerNode) { - // Make a new leaf node - node = new Node(source); - - // Set the pointers in the memberTable - for (int i = 0; i < source.size(); ++i) { - memberTable.set(source[i].value, node); - } - - } else { - // Make a new internal node - node = new Node(); - - const AABox bounds = computeBounds(source); - const Vector3 extent = bounds.high() - bounds.low(); - - Vector3::Axis splitAxis = extent.primaryAxis(); - - float splitLocation; - - Array lt, gt; - - if (numMeanSplits <= 0) { - source.medianPartition(lt, node->valueArray, gt, temp, AxisComparator(splitAxis)); - splitLocation = node->valueArray[0].position()[splitAxis]; - - if ((node->valueArray.size() > source.size() / 2) && - (source.size() > 10)) { - // Our median split put an awful lot of points on the splitting plane. Try a mean - // split instead - numMeanSplits = 1; - } - } - - if (numMeanSplits > 0) { - // Compute the mean along the axis - - splitLocation = (bounds.high()[splitAxis] + - bounds.low()[splitAxis]) / 2.0; - - Handle splitHandle; - Vector3 v; - v[splitAxis] = splitLocation; - splitHandle.setPosition(v); - - source.partition(splitHandle, lt, node->valueArray, gt, AxisComparator(splitAxis)); - } - -# if defined(G3D_DEBUG) && defined(VERIFY_TREE) - for (int i = 0; i < lt.size(); ++i) { - const Vector3& v = lt[i].position(); - debugAssert(v[splitAxis] < splitLocation); - } - for (int i = 0; i < gt.size(); ++i) { - debugAssert(gt[i].position()[splitAxis] > splitLocation); - } - for (int i = 0; i < node->valueArray.size(); ++i) { - debugAssert(node->valueArray[i].position()[splitAxis] == splitLocation); - } -# endif - - node->splitAxis = splitAxis; - node->splitLocation = splitLocation; - - // Throw away the source array to save memory - source.fastClear(); - - if (lt.size() > 0) { - node->child[0] = makeNode(lt, temp, valuesPerNode, numMeanSplits - 1); - } - - if (gt.size() > 0) { - node->child[1] = makeNode(gt, temp, valuesPerNode, numMeanSplits - 1); - } - - // Add the values stored at this interior node to the member table - for(int i = 0; i < node->valueArray.size(); ++i) { - memberTable.set(node->valueArray[i].value, node); - } - - } - - return node; - } - - /** - Recursively clone the passed in node tree, setting - pointers for members in the memberTable as appropriate. - called by the assignment operator. - */ - Node* cloneTree(Node* src) { - Node* dst = new Node(*src); - - // Make back pointers - for (int i = 0; i < dst->valueArray.size(); ++i) { - memberTable.set(dst->valueArray[i].value, dst); - } - - // Clone children - for (int i = 0; i < 2; ++i) { - if (src->child[i] != NULL) { - dst->child[i] = cloneTree(src->child[i]); - } - } - - return dst; - } - - /** Maps members to the node containing them */ - typedef Table MemberTable; - MemberTable memberTable; - - Node* root; - -public: - - /** To construct a balanced tree, insert the elements and then call - PointKDTree::balance(). */ - PointKDTree() : root(NULL) {} - - - PointKDTree(const PointKDTree& src) : root(NULL) { - *this = src; - } - - - PointKDTree& operator=(const PointKDTree& src) { - delete root; - // Clone tree takes care of filling out the memberTable. - root = cloneTree(src.root); - return *this; - } - - - ~PointKDTree() { - clear(); - } - - /** - Throws out all elements of the set and erases the structure of the tree. - */ - void clear() { - memberTable.clear(); - delete root; - root = NULL; - } - - /** Removes all elements of the set while maintaining the structure of the tree */ - void clearData() { - memberTable.clear(); - Array stack; - stack.push(root); - while (stack.size() > 0) { - Node* node = stack.pop(); - node->valueArray.fastClear(); - - for (int i = 0; i < 2; ++i) { - if (node->child[i] != NULL) { - stack.push(node->child[i]); - } - } - } - } - - - int size() const { - return memberTable.size(); - } - - /** - Inserts an object into the set if it is not - already present. O(log n) time. Does not - cause the tree to be balanced. - */ - void insert(const T& value) { - if (contains(value)) { - // Already in the set - return; - } - - Handle h(value); - - if (root == NULL) { - // This is the first node; create a root node - root = new Node(); - } - - Node* node = root->findDeepestContainingNode(h.position()); - - // Insert into the node - node->valueArray.append(h); - - // Insert into the node table - memberTable.set(value, node); - } - - /** Inserts each elements in the array in turn. If the tree - begins empty (no structure and no elements), this is faster - than inserting each element in turn. You still need to balance - the tree at the end.*/ - void insert(const Array& valueArray) { - // Pre-size the member table to avoid multiple allocations - memberTable.setSizeHint(valueArray.size() + size()); - - if (root == NULL) { - // Optimized case for an empty tree; don't bother - // searching or reallocating the root node's valueArray - // as we incrementally insert. - root = new Node(); - root->valueArray.resize(valueArray.size()); - for (int i = 0; i < valueArray.size(); ++i) { - // Insert in opposite order so that we have the exact same - // data structure as if we inserted each (i.e., order is reversed - // from array). - root->valueArray[valueArray.size() - i - 1] = Handle(valueArray[i]); - memberTable.set(valueArray[i], root); - } - } else { - // Insert at appropriate tree depth. - for (int i = 0; i < valueArray.size(); ++i) { - insert(valueArray[i]); - } - } - } - - - /** - Returns true if this object is in the set, otherwise - returns false. O(1) time. - */ - bool contains(const T& value) { - return memberTable.containsKey(value); - } - - - /** - Removes an object from the set in O(1) time. - It is an error to remove members that are not already - present. May unbalance the tree. - - Removing an element never causes a node (split plane) to be removed... - nodes are only changed when the tree is rebalanced. This behavior - is desirable because it allows the split planes to be serialized, - and then deserialized into an empty tree which can be repopulated. - */ - void remove(const T& value) { - debugAssertM(contains(value), - "Tried to remove an element from a " - "PointKDTree that was not present"); - - Array& list = memberTable[value]->valueArray; - - // Find the element and remove it - for (int i = list.length() - 1; i >= 0; --i) { - if (list[i].value == value) { - list.fastRemove(i); - break; - } - } - memberTable.remove(value); - } - - - /** - If the element is in the set, it is removed. - The element is then inserted. - - This is useful when the == and hashCode methods - on T are independent of the bounds. In - that case, you may call update(v) to insert an - element for the first time and call update(v) - again every time it moves to keep the tree - up to date. - */ - void update(const T& value) { - if (contains(value)) { - remove(value); - } - insert(value); - } - - - /** - Rebalances the tree (slow). Call when objects - have moved substantially from their original positions - (which unbalances the tree and causes the spatial - queries to be slow). - - @param valuesPerNode Maximum number of elements to put at - a node. - - @param numMeanSplits numMeanSplits = 0 gives a - fully axis aligned BSP-tree, where the balance operation attempts to balance - the tree so that every splitting plane has an equal number of left - and right children (i.e. it is a median split along that axis). - This tends to maximize average performance; all querries will return in the same amount of time. - - You can override this behavior by - setting a number of mean (average) splits. numMeanSplits = MAX_INT - creates a full oct-tree, which tends to optimize peak performance (some areas of the scene will terminate after few recursive splits) at the expense of - peak performance. - */ - void balance(int valuesPerNode = 40, int numMeanSplits = 3) { - if (root == NULL) { - // Tree is empty - return; - } - - Array handleArray; - root->getHandles(handleArray); - - // Delete the old tree - clear(); - - Array temp; - root = makeNode(handleArray, temp, valuesPerNode, numMeanSplits); - temp.fastClear(); - - // Walk the tree, assigning splitBounds. We start with unbounded - // space. - root->assignSplitBounds(AABox::maxFinite()); - -# ifdef _DEBUG - root->verifyNode(Vector3::minFinite(), Vector3::maxFinite()); -# endif - } - -private: - - /** - Returns the elements - - @param parentMask The mask that this node returned from culledBy. - */ - static void getIntersectingMembers( - const Array& plane, - Array& members, - Node* node, - uint32 parentMask) { - - int dummy; - - if (parentMask == 0) { - // None of these planes can cull anything - for (int v = node->valueArray.size() - 1; v >= 0; --v) { - members.append(node->valueArray[v].value); - } - - // Iterate through child nodes - for (int c = 0; c < 2; ++c) { - if (node->child[c]) { - getIntersectingMembers(plane, members, node->child[c], 0); - } - } - } else { - - if (node->valueArray.size() > 0) { - // This is a leaf; check the points - debugAssertM(node->child[0] == NULL, "Malformed Point tree"); - debugAssertM(node->child[1] == NULL, "Malformed Point tree"); - - // Test values at this node against remaining planes - for (int p = 0; p < plane.size(); ++p) { - if ((parentMask >> p) & 1 != 0) { - // Test against this plane - const Plane& curPlane = plane[p]; - for (int v = node->valueArray.size() - 1; v >= 0; --v) { - if (curPlane.halfSpaceContains(node->valueArray[v].position())) { - members.append(node->valueArray[v].value); - } - } - } - } - } else { - - uint32 childMask = 0xFFFFFF; - - // Iterate through child nodes - for (int c = 0; c < 2; ++c) { - if (node->child[c] && - ! node->child[c]->splitBounds.culledBy(plane, dummy, parentMask, childMask)) { - // This node was not culled - getIntersectingMembers(plane, members, node->child[c], childMask); - } - } - } - } - } - -public: - - /** - Returns all members inside the set of planes. - @param members The results are appended to this array. - */ - void getIntersectingMembers(const Array& plane, Array& members) const { - if (root == NULL) { - return; - } - - getIntersectingMembers(plane, members, root, 0xFFFFFF); - } - - /** - Typically used to find all visible - objects inside the view frustum (see also GCamera::getClipPlanes)... i.e. all objects - not culled by frustum. - - Example: - 
-        Array  visible;
-        tree.getIntersectingMembers(camera.frustum(), visible);
-        // ... Draw all objects in the visible array.
-
- @param members The results are appended to this array. - */ - void getIntersectingMembers(const GCamera::Frustum& frustum, Array& members) const { - Array plane; - - for (int i = 0; i < frustum.faceArray.size(); ++i) { - plane.append(frustum.faceArray[i].plane); - } - - getIntersectingMembers(plane, members); - } - - /** - C++ STL style iterator variable. See beginBoxIntersection(). - The iterator overloads the -> (dereference) operator, so this - acts like a pointer to the current member. - */ - // This iterator turns Node::getIntersectingMembers into a - // coroutine. It first translates that method from recursive to - // stack based, then captures the system state (analogous to a Scheme - // continuation) after each element is appended to the member array, - // and allowing the computation to be restarted. - class BoxIntersectionIterator { - private: - friend class TreeType; - - /** True if this is the "end" iterator instance */ - bool isEnd; - - /** The box that we're testing against. */ - AABox box; - - /** Node that we're currently looking at. Undefined if isEnd - is true. */ - Node* node; - - /** Nodes waiting to be processed */ - // We could use backpointers within the tree and careful - // state management to avoid ever storing the stack-- but - // it is much easier this way and only inefficient if the - // caller uses post increment (which they shouldn't!). - Array stack; - - /** The next index of current->valueArray to return. - Undefined when isEnd is true.*/ - int nextValueArrayIndex; - - BoxIntersectionIterator() : isEnd(true) {} - - BoxIntersectionIterator(const AABox& b, const Node* root) : - isEnd(root == NULL), box(b), - node(const_cast(root)), nextValueArrayIndex(-1) { - - // We intentionally start at the "-1" index of the current - // node so we can use the preincrement operator to move - // ourselves to element 0 instead of repeating all of the - // code from the preincrement method. Note that this might - // cause us to become the "end" instance. - ++(*this); - } - - public: - - inline bool operator!=(const BoxIntersectionIterator& other) const { - return ! (*this == other); - } - - bool operator==(const BoxIntersectionIterator& other) const { - if (isEnd) { - return other.isEnd; - } else if (other.isEnd) { - return false; - } else { - // Two non-end iterators; see if they match. This is kind of - // silly; users shouldn't call == on iterators in general unless - // one of them is the end iterator. - if ((box != other.box) || (node != other.node) || - (nextValueArrayIndex != other.nextValueArrayIndex) || - (stack.length() != other.stack.length())) { - return false; - } - - // See if the stacks are the same - for (int i = 0; i < stack.length(); ++i) { - if (stack[i] != other.stack[i]) { - return false; - } - } - - // We failed to find a difference; they must be the same - return true; - } - } - - /** - Pre increment. - */ - BoxIntersectionIterator& operator++() { - ++nextValueArrayIndex; - - bool foundIntersection = false; - while (! isEnd && ! foundIntersection) { - - // Search for the next node if we've exhausted this one - while ((! isEnd) && (nextValueArrayIndex >= node->valueArray.length())) { - // If we entered this loop, then the iterator has exhausted the elements at - // node (possibly because it just switched to a child node with no members). - // This loop continues until it finds a node with members or reaches - // the end of the whole intersection search. - - // If the right child overlaps the box, push it onto the stack for - // processing. - if ((node->child[1] != NULL) && - (box.high()[node->splitAxis] > node->splitLocation)) { - stack.push(node->child[1]); - } - - // If the left child overlaps the box, push it onto the stack for - // processing. - if ((node->child[0] != NULL) && - (box.low()[node->splitAxis] < node->splitLocation)) { - stack.push(node->child[0]); - } - - if (stack.length() > 0) { - // Go on to the next node (which may be either one of the ones we - // just pushed, or one from farther back the tree). - node = stack.pop(); - nextValueArrayIndex = 0; - } else { - // That was the last node; we're done iterating - isEnd = true; - } - } - - // Search for the next intersection at this node until we run out of children - while (! isEnd && ! foundIntersection && (nextValueArrayIndex < node->valueArray.length())) { - if (box.intersects(node->valueArray[nextValueArrayIndex].bounds)) { - foundIntersection = true; - } else { - ++nextValueArrayIndex; - // If we exhaust this node, we'll loop around the master loop - // to find a new node. - } - } - } - - return *this; - } - - /** - Post increment (much slower than preincrement!). - */ - BoxIntersectionIterator operator++(int) { - BoxIntersectionIterator old = *this; - ++this; - return old; - } - - /** Overloaded dereference operator so the iterator can masquerade as a pointer - to a member */ - const T& operator*() const { - alwaysAssertM(! isEnd, "Can't dereference the end element of an iterator"); - return node->valueArray[nextValueArrayIndex].value; - } - - /** Overloaded dereference operator so the iterator can masquerade as a pointer - to a member */ - T const * operator->() const { - alwaysAssertM(! isEnd, "Can't dereference the end element of an iterator"); - return &(stack.last()->valueArray[nextValueArrayIndex].value); - } - - /** Overloaded cast operator so the iterator can masquerade as a pointer - to a member */ - operator T*() const { - alwaysAssertM(! isEnd, "Can't dereference the end element of an iterator"); - return &(stack.last()->valueArray[nextValueArrayIndex].value); - } - }; - - - /** - Iterates through the members that intersect the box - */ - BoxIntersectionIterator beginBoxIntersection(const AABox& box) const { - return BoxIntersectionIterator(box, root); - } - - BoxIntersectionIterator endBoxIntersection() const { - // The "end" iterator instance - return BoxIntersectionIterator(); - } - - /** - Appends all members whose bounds intersect the box. - See also PointKDTree::beginBoxIntersection. - */ - void getIntersectingMembers(const AABox& box, Array& members) const { - if (root == NULL) { - return; - } - root->getIntersectingMembers(box, Sphere(Vector3::zero(), 0), members, false); - } - - - /** - @param members The results are appended to this array. - */ - void getIntersectingMembers(const Sphere& sphere, Array& members) const { - if (root == NULL) { - return; - } - - AABox box; - sphere.getBounds(box); - root->getIntersectingMembers(box, sphere, members); - - } - - - /** - Stores the locations of the splitting planes (the structure but not the content) - so that the tree can be quickly rebuilt from a previous configuration without - calling balance. - */ - void serializeStructure(BinaryOutput& bo) const { - Node::serializeStructure(root, bo); - } - - /** Clears the member table */ - void deserializeStructure(BinaryInput& bi) { - clear(); - root = Node::deserializeStructure(bi); - } - - /** - Returns an array of all members of the set. See also PointKDTree::begin. - */ - void getMembers(Array& members) const { - memberTable.getKeys(members); - } - - - /** - C++ STL style iterator variable. See begin(). - Overloads the -> (dereference) operator, so this acts like a pointer - to the current member. - */ - class Iterator { - private: - friend class TreeType; - - // Note: this is a Table iterator, we are currently defining - // Set iterator - typename MemberTable::Iterator it; - - Iterator(const typename MemberTable::Iterator& it) : it(it) {} - - public: - inline bool operator!=(const Iterator& other) const { - return !(*this == other); - } - - bool operator==(const Iterator& other) const { - return it == other.it; - } - - /** - Pre increment. - */ - Iterator& operator++() { - ++it; - return *this; - } - - /** - Post increment (slower than preincrement). - */ - Iterator operator++(int) { - Iterator old = *this; - ++(*this); - return old; - } - - const T& operator*() const { - return it->key; - } - - T* operator->() const { - return &(it->key); - } - - operator T*() const { - return &(it->key); - } - }; - - - /** - C++ STL style iterator method. Returns the first member. - Use preincrement (++entry) to get to the next element (iteration - order is arbitrary). - Do not modify the set while iterating. - */ - Iterator begin() const { - return Iterator(memberTable.begin()); - } - - - /** - C++ STL style iterator method. Returns one after the last iterator - element. - */ - Iterator end() const { - return Iterator(memberTable.end()); - } -#undef TreeType -}; - -#define PointAABSPTree PointKDTree - -} - -#endif diff --git a/externals/g3dlite/G3D.lib/include/G3D/PointHashGrid.h b/externals/g3dlite/G3D.lib/include/G3D/PointHashGrid.h deleted file mode 100644 index 8e9726e82da..00000000000 --- a/externals/g3dlite/G3D.lib/include/G3D/PointHashGrid.h +++ /dev/null @@ -1,894 +0,0 @@ -/** - @file PointHashGrid.h - - @maintainer Morgan McGuire, morgan@cs.williams.edu - @created 2008-07-01 - @edited 2008-11-02 - - Copyright 2000-2008, Morgan McGuire. - All rights reserved. -*/ -#ifndef G3D_POINTHASHGRID_H -#define G3D_POINTHASHGRID_H - -#include "G3D/platform.h" -#include "G3D/EqualsTrait.h" -#include "G3D/HashTrait.h" -#include "G3D/Vector3.h" -#include "G3D/Vector3int32.h" -#include "G3D/Array.h" -#include "G3D/Table.h" -#include "G3D/AABox.h" -#include "G3D/Sphere.h" - -namespace G3D { - -/** - Storage of data in a sparse 3D grid of point-based data. The - space cost for n elements is O(n). For data with - approximately uniform density (with respect to the radius hint), - the time cost of searching for neighbors is O(1). - - Value must be supported by a G3D::PositionTrait, - G3D::EqualsTrait, and G3D::HashFunc. overrides are provided for - common G3D classes like G3D::Vector3. -*/ -template, - class EqualsFunc = EqualsTrait, - class HashFunc = HashTrait > -class PointHashGrid { -private: - -#define ThisType PointHashGrid - - /** A value annotated with precomputed position and hash code.*/ - class Entry { - public: - Vector3 position; - Value value; - }; - - /** One cell of the grid. */ - typedef Array Cell; - typedef Table CellTable; - - /** The cube of +/-1 along each dimension. Initialized by initOffsetArray.*/ - Vector3int32 m_offsetArray[3*3*3]; - - /** Incremented every time the data structure is mutated. - Used by the iterators to determine if the data structure - has changed since iteration began. */ - int m_epoch; - - /** Extent of a cell along one dimension. */ - float m_cellWidth; - - /** Conservative bounds; the actual data may be smaller. */ - AABox m_bounds; - - /** Number of elements. */ - int m_size; - - /** Non-empty cells indexed by grid position. Actual 3D position is - position * m_cellWidth*/ - CellTable m_data; - - - /** Intentionally unimplemented: prevent copy construction. */ - PointHashGrid(const ThisType&); - - - /** Intentionally unimplemented: prevent assignment. */ - PointHashGrid& operator=(const ThisType&); - - - /** Locate the cell and index within that cell containing v. Called by - remove() and contains(). */ - bool find( - const Value& v, - Vector3int32& foundCellCoord, - Cell*& foundCell, - int& index) { - - Vector3 pos; - PosFunc::getPosition(v, pos); - - Vector3int32 cellCoord; - getCellCoord(pos, cellCoord); - for (int i = 0; i < 27; ++i) { - Vector3int32 c = cellCoord + m_offsetArray[i]; - Cell* cell = m_data.getPointer(c); - if (cell != NULL) { - // The cell exists - for (int j = 0; j < cell->size(); ++j) { - if (EqualsFunc::equals((*cell)[j].value, v)) { - foundCell = cell; - index = j; - foundCellCoord = c; - return true; - } - } - } - } - - // Not found - return false; - } - - /** Given a real-space position, returns the cell coord - containing it.*/ - void getCellCoord(const Vector3& pos, Vector3int32& cellCoord) const { - for (int a = 0; a < 3; ++a) { - cellCoord[a] = iFloor(pos[a] / m_cellWidth); - } - } - - /** Initializes m_offsetArray. */ - void initOffsetArray() { - int i = 0; - Vector3int32 d; - for (d.x = -1; d.x <= +1; ++d.x) { - for (d.y = -1; d.y <= +1; ++d.y) { - for (d.z = -1; d.z <= +1; ++d.z) { - m_offsetArray[i] = d; - ++i; - } - } - } - - // Put (0, 0, 0) first, so that contains() is most likely to find - // the value quickly. - i = (1 * 3 + 1) * 3 + 1; - debugAssert(m_offsetArray[i] == Vector3int32(0,0,0)); - Vector3int32 temp = m_offsetArray[0]; - m_offsetArray[0] = m_offsetArray[i]; - m_offsetArray[i] = temp; - } - -public: - - /** - @param radiusHint the radius that will typically be used with - beginSphereIntersection and beginBoxIntersection. If two Values are equal, - their positions must be within this radius as well. - */ - PointHashGrid(float radiusHint) : m_size(0) { - initOffsetArray(); - - debugAssertM(radiusHint > 0, "Cell radius must be positive"); - m_cellWidth = radiusHint; - } - - /** - If radiusHint is negative, it is automatically chosen to put - about 5 values in each grid cell (which means about 27 * 5 - values for each beginIntersection call). - */ - PointHashGrid(const Array& init, float radiusHint = -1.0f) : m_size(0) { - initOffsetArray(); - - Vector3 lo(Vector3::inf()); - Vector3 hi(-lo); - - // Compute bounds - Array entry(init.size()); - for (int i = 0; i < entry.size(); ++i) { - const Value& value = init[i]; - Vector3 pos = m_posFunc(value); - - entry[i].value = value; - entry[i].hashCode = m_hashFunc(value); - entry[i].position = pos; - - lo = lo.min(pos); - hi = hi.max(pos); - } - - m_bounds = AABox(lo, hi); - - if (radiusHint <= 0) { - // Compute a good cell width based on the bounds. - // - // N numPerCell - // ----- = --------- - // volume r^3 - - float numPerCell = 5; - radiusHint = - (float)pow(numPerCell * m_bounds.volume() / init.size(), 1.0 / 3.0); - - if (radiusHint == 0) { - // Volume must have been zero because all points were colocated. - radiusHint = 0.1f; - } - } - - insert(init); - } - - /** Returns the number of elements. */ - inline int size() const { - return m_size; - } - - /** Returns a conservative bounding box around the contents. This is - conservative because it is not updated when elements are removed. */ - const AABox& conservativeBoxBounds() const { - return m_bounds; - } - - /** Insert @a v at position @a p given by getPosition(v, p). - Multiple elements that are equal may be inserted; all copies will be - in the data structure. */ - void insert(const Value& v) { - Vector3 pos; - PosFunc::getPosition(v, pos); - Vector3int32 cellCoord; - getCellCoord(pos, cellCoord); - - // See if the cell already exists - Cell* cell = m_data.getPointer(cellCoord); - - if (cell == NULL) { - // The cell did not exist; create it - m_data.set(cellCoord, Cell()); - cell = m_data.getPointer(cellCoord); - } - debugAssert(cell != NULL); - - Entry& entry = cell->next(); - entry.value = v; - entry.position = pos; - - // Update the bounds - if (size() == 0) { - m_bounds = AABox(pos); - } else { - m_bounds.merge(pos); - } - - ++m_size; - ++m_epoch; - } - - - /** Inserts all elements of the array. */ - void insert(const Array& v) { - for (int i = 0; i < v.size(); ++i) { - insert(v[i]); - } - } - - - /** If there are multiple copies of an element, you must - delete them multiple times. - - @param shrinkAsNeeded If true, deallocate underlying data - structures as they are emptied. False increases performace at - the cost of memory overhead for dynamic structures. - - @return true if the element was found. - */ - bool remove(const Value& v, bool shrinkIfNecessary = true) { - Cell* cell = NULL; - int index = 0; - Vector3int32 cellCoord; - - if (find(v, cellCoord, cell, index)) { - cell->fastRemove(index, shrinkIfNecessary); - --m_size; - ++m_epoch; - - if ((cell->size() == 0) && shrinkIfNecessary) { - // Remove the cell itself - - // Drop our pointer, which is about to dangle - cell = NULL; - bool success = m_data.remove(cellCoord); - debugAssertM(success, "Data structure corrupt: " - "tried to remove a cell that doesn't exist."); - } - - return true; - - } else { - return false; - } - } - - /** Removes all elements of @v. */ - void remove(const Array& v, bool shrink = true) { - for (int i = 0; i < v.size(); ++i) { - remove(v[i], shrink); - } - } - - /////////////////////////////////////////////////////////////////////////// - /////////////////////////////////////////////////////////////////////////// - - class Iterator { - private: - friend class ThisType; - - bool m_isEnd; - - const ThisType* m_grid; - - typename CellTable::Iterator m_tableIterator; - - /** Index within m_tableIterator->value of the current value. */ - int m_arrayIndex; - - const int m_epoch; - - /** End iterator. Note that the m_tableIterator is initialized to the end iterator - of a temporary value! This is ok because we'll never look at the value of the - m_tableIterator, since we're initializing the "end" Iterator.*/ - Iterator() : m_isEnd(true), m_grid(NULL), m_tableIterator(CellTable().end()), - m_arrayIndex(0), m_epoch(0) {} - - Iterator(const ThisType* grid) : - m_isEnd(false), - m_grid(grid), - m_tableIterator( grid->m_data.begin() ), - m_arrayIndex(0), - m_epoch(grid->m_epoch) { } - - private: - - const Value& value() const { - debugAssert(! m_isEnd); - debugAssertM(m_tableIterator->value.size() > m_arrayIndex, - "No more elements"); - return m_tableIterator->value[m_arrayIndex].value; - } - - public: - - inline bool operator!=(const Iterator& other) const { - if (other.m_isEnd && m_isEnd) { - return false; - } else { - return (m_isEnd != other.m_isEnd) || - (m_tableIterator != other.m_tableIterator) || - (m_arrayIndex != other.m_arrayIndex); - } - } - - bool operator==(const Iterator& other) const { - return !(*this != other); - } - - /** Preincrement */ - Iterator& operator++() { - debugAssert(! m_isEnd); - debugAssertM(m_epoch == m_grid->m_epoch, - "It is illegal to mutate the HashGrid " - "while iterating through it."); - - ++m_arrayIndex; - - if (m_arrayIndex >= m_tableIterator->value.size()) { - // Move on to the next cell - ++m_tableIterator; - m_arrayIndex = 0; - - // Check to see if we're at the end - m_isEnd = (m_tableIterator == m_grid->m_data.end()); - } - - return *this; - } - - /** Post increment (slower) */ - Iterator operator++(int) { - debugAssert(! m_isEnd); - Iterator old = *this; - ++(*this); - return old; - } - - const Value& operator*() const { return value(); } - const Value* operator->() const { return &value(); } - operator Value*() const { return &value(); } - }; // Iterator - - - /** Iterate through all members. It is an error to mutate the HashGrid - while iterating through it. Each member can be accessed by "dereferencing" - the iterator: - - 
-        for (Grid::Iterator i = grid.begin(); i != grid.end(), ++i) {
-        const Value& = *i;
-        ...
-        }
-
- */ - Iterator begin() const { - return Iterator(this); - } - - const Iterator& end() const { - static const Iterator it; - return it; - } - - /////////////////////////////////////////////////////////////////////////// - /////////////////////////////////////////////////////////////////////////// - - // Forward declaration required by older gcc versions for friend declaration in BoxIterator - class SphereIterator; - class BoxIterator { - private: - friend class ThisType; - friend class SphereIterator; - - bool m_isEnd; - - const ThisType* m_grid; - - /** Lower bound on the boxes covered, inclusive. */ - Vector3int32 m_lo; - - /** Upper bound on the boxes covered, inclusive.*/ - Vector3int32 m_hi; - - /** If true, test values against m_box before returning them.*/ - bool m_exact; - - /** The underlying box in 3D space */ - AABox m_box; - - /** The iterator winds through the 3D grid between m_lo and (m_lo + m_extent) in - Z,Y,X-major order. This is the index keeping track of how - far it has come */ - Vector3int32 m_current; - - /** The current cell. */ - Cell* m_cell; - - /** Index within m_cell of the current value */ - int m_arrayIndex; - - const int m_epoch; - - - /** Called from advance() */ - void advanceCell() { - do { - ++m_current.x; - if (m_current.x > m_hi.x) { - m_current.x = m_lo.x; - ++m_current.y; - if (m_current.y > m_hi.y) { - m_current.y = m_lo.y; - ++m_current.z; - if (m_current.z > m_hi.z) { - m_isEnd = true; - return; - } - } - } - - // Pick up the new cell - m_cell = m_grid->m_data.getPointer(m_current); - // Keep advancing if the cell does not exist - } while ((m_cell == NULL) || (m_cell->size() == 0)); - } - - /** Advance to the next value */ - void advance() { - debugAssert(! m_isEnd); - - do { - ++m_arrayIndex; - bool inConstructor = (m_cell == NULL); - if (inConstructor || m_arrayIndex >= m_cell->size()) { - advanceCell(); - m_arrayIndex = 0; - - if (m_isEnd) { - // Ran out of values - return; - } - debugAssert(m_cell != NULL); - } - - // Advance until we have a value that can be returned, either - // because we don't care about exactness or because it is - // guaranteed to be within the box. - } while (m_exact && ! m_box.contains(position())); - } - - - /** End iterator */ - BoxIterator() : m_isEnd(true), m_grid(NULL), m_exact(true), m_current(0,0,0), m_cell(NULL), m_arrayIndex(0), m_epoch(0) {} - - /** Begin iterator */ - BoxIterator(const ThisType* grid, bool exact, const AABox& box) : - m_isEnd(false), - m_grid(grid), - m_exact(exact), - m_box(box), - m_current(-1, 0 ,0), - m_cell(NULL), - m_arrayIndex(0), - m_epoch(grid->m_epoch) { - - m_grid->getCellCoord(box.low(), m_lo); - m_grid->getCellCoord(box.high(), m_hi); - - // Get to the first value - m_current = m_lo; - // Back up one so that advancing takes us to the first - --m_current.x; - advance(); - } - - const Value& value() const { - debugAssert(! m_isEnd); - return (*m_cell)[m_arrayIndex].value; - } - - /** Used by SphereIterator::advance() */ - const Vector3& position() const { - debugAssert(! m_isEnd); - return (*m_cell)[m_arrayIndex].position; - } - - public: - - inline bool operator!=(const BoxIterator& other) const { - if (other.m_isEnd && m_isEnd) { - return false; - } else { - return (m_isEnd != other.m_isEnd) || - (m_cell != other.m_cell) || - (m_arrayIndex != other.m_arrayIndex); - } - } - - bool operator==(const BoxIterator& other) const { - return !(*this != other); - } - - /** Preincrement */ - BoxIterator& operator++() { - debugAssert(! m_isEnd); - debugAssertM(m_epoch == m_grid->m_epoch, - "It is illegal to mutate the HashGrid " - "while iterating through it."); - - advance(); - - return *this; - } - - /** Post increment (slower) */ - BoxIterator operator++(int) { - Iterator old = *this; - ++(*this); - return old; - } - - const Value& operator*() const { return value(); } - const Value* operator->() const { return &value(); } - operator Value*() const { return &value(); } - - bool hasMore() const { - return ! m_isEnd; - } - }; // BoxIterator - - /** - Finds all values whose positions are within @a box. It is an error to - mutate the PointHashGrid while iterating through it. - - @param exact If false, the iterator will execute more quickly but will likely return some - values that lie outside the box. Set exact = false if you are going to test the - results against the yourself box anyway. - */ - BoxIterator beginBoxIntersection(const AABox& box, bool exact = true) const { - return BoxIterator(this, exact, box); - } - - const BoxIterator& endBoxIntersection() const { - static const BoxIterator it; - return it; - } - - /////////////////////////////////////////////////////////////////////////// - /////////////////////////////////////////////////////////////////////////// - - class SphereIterator { - private: - - friend class ThisType; - - bool m_isEnd; - Sphere m_sphere; - BoxIterator m_boxIterator; - - SphereIterator() : m_isEnd(true) {} - - void advance() { - if (! m_boxIterator.hasMore()) { - m_isEnd = true; - return; - } - - while (! m_sphere.contains(m_boxIterator.position())) { - ++m_boxIterator; - - if (! m_boxIterator.hasMore()) { - m_isEnd = true; - return; - } - } - } - - static AABox getBoundingBox(const Sphere& s) { - AABox box; - s.getBounds(box); - return box; - } - - SphereIterator(const ThisType* grid, const Sphere& sphere) : - m_isEnd(false), - m_sphere(sphere), - m_boxIterator(grid, false, getBoundingBox(sphere)) { - - // Find the first element that is actually in the sphere, - // not just the box. - advance(); - } - - const Value& value() const { - return *m_boxIterator; - } - - // TODO: if the sphere is very big compared to radius, check each - // cell's box to see if the cell itself is actually inside the sphere - // before iterating through it, since there may be many boxes outside the sphere. - - public: - - inline bool operator!=(const SphereIterator& other) const { - if (other.m_isEnd && m_isEnd) { - return false; - } else { - return - (m_isEnd != other.m_isEnd) || - (m_sphere != other.m_sphere) || - (m_boxIterator != other.m_boxIterator); - } - } - - bool operator==(const SphereIterator& other) const { - return !(*this != other); - } - - - - /** Preincrement */ - SphereIterator& operator++() { - debugAssert(! m_isEnd); - - ++m_boxIterator; - advance(); - - return *this; - } - - /** Post increment (slower) */ - SphereIterator operator++(int) { - Iterator old = *this; - ++(*this); - return old; - } - - const Value& operator*() const { return value(); } - const Value* operator->() const { return &value(); } - operator Value*() const { return &value(); } - - bool hasMore() const { - return ! m_isEnd; - } - }; // SphereIterator - - /** - Finds all values whose positions are within @a sphere. It is an error - to mutate the HashGrid while iterating through it. - */ - SphereIterator beginSphereIntersection(const Sphere& sphere) const { - return SphereIterator(this, sphere); - } - - const SphereIterator& endSphereIntersection() const { - static const SphereIterator it; - return it; - } - - /////////////////////////////////////////////////////////////////////////// - /////////////////////////////////////////////////////////////////////////// - - /** - Dereference to access the bounds() and size() [element count] of the underlying - cell objet. - - Example: - 
-       for(PointHashGrid::CellIterator iter = grid.beginCells(); iter != grid.endCells(); ++iter) {	
-       entriesFound += iter->size();
-       }
-    */
-    class CellIterator {
-    private:
-        friend class ThisType;
-
-        bool                                    m_isEnd;
-        const ThisType*                         m_grid;
-        typename CellTable::Iterator            m_tableIterator;
-        const int                               m_epoch;
-
-
-        Cell& cell() {
-            return m_tableIterator->value;
-        }
-
-    public:
-        
-        class CellObject {
-            friend class CellIterator;
-        private:
-            const CellIterator* m_parent;
-
-            CellObject() : m_parent(NULL) {}
-
-        public:
-
-            /** Returns the bounds on this cell */
-            AABox bounds() const {
-                const Vector3int32& k = m_parent->m_tableIterator->key;
-                return AABox(Vector3(k) * m_parent->m_cellWidth, 
-                             Vector3(k + Vector3int32(1, 1, 1)) * m_parent->m_cellWidth);
-            }
-
-            /** Number of elements inside this cell */
-            int size() const {
-                debugAssert(! m_parent->m_isEnd);
-                return m_parent->m_tableIterator->value.size();
-            }
-        };
-
-    private:
-        /** Used to make the indirection work.*/
-        CellObject m_indirection;
-
-        /** End iterator. Note that the m_tableIterator is initialized to the end iterator
-            of a temporary value!  This is ok because we'll never look at the value of the 
-            m_tableIterator, since we're initializing the "end" Iterator.*/
-        CellIterator() : 
-            m_isEnd(true),
-            m_grid(NULL),
-            m_tableIterator( CellTable().end() ),
-            m_epoch(0) {}
-        
-        CellIterator(const ThisType* grid) : 
-            m_isEnd(false),
-            m_grid(grid),
-            m_tableIterator( grid->m_data.begin()),
-            m_epoch(grid->m_epoch) {
-            m_indirection.m_parent = this;
-            m_isEnd = ! m_tableIterator.hasMore();
-        }
-        
-    public:
-
-        const CellObject& operator*()  const { return  m_indirection; }
-        const CellObject* operator->() const { return &m_indirection; }
-        operator CellObject*()         const { return &m_indirection; }
-
-        inline bool operator!=(const CellIterator& other) const {
-            // != is called more often than == during iteration
-            return !(
-                     (m_isEnd && other.m_isEnd) ||
-                     ((m_isEnd == other.m_isEnd) && 
-                      (m_tableIterator != other.m_tableIterator)));
-        }
-
-        bool operator==(const CellIterator& other) const {
-            return !(*this != other);
-        }
-
-        /** Preincrement */
-        CellIterator& operator++() {
-            debugAssertM(m_epoch == m_grid->m_epoch, 
-                         "It is illegal to mutate the HashGrid while "
-                         "iterating through it.");
-            ++m_tableIterator;
-            m_isEnd = ! m_tableIterator.hasMore();
-            return *this;
-        }
-
-        /** Post increment (slower) */
-        CellIterator operator++(int) {
-            Iterator old = *this;
-            ++(*this);
-            return old;
-        }
-
-        bool hasMore() const {
-            return ! m_isEnd;
-        }
-    }; // CellIterator
-
-    /** Iterates through the non-empty cells.  This is intended primarily for
-        debugging and visualizing the data structure.*/
-    CellIterator beginCells() const {
-        return CellIterator(this);
-    }
-
-    const CellIterator& endCells() const {
-        static const CellIterator it;
-        return it;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    ///////////////////////////////////////////////////////////////////////////
-
-    /** Returns true if there is a value that is exactly equal to @a. This will 
-        check all neighboring cells to avoid roundoff error at cell boundaries. 
-    */
-    bool contains(const Value& v) const {
-        Cell* cell = NULL;
-        int   index = 0;
-        Vector3int32 cellCoord;
-        return const_cast(this)->find(v, cellCoord, cell, index);
-    }
-
-    /** Calls delete on all of the values, which are assumed to be pointers. 
-        This is a helper to avoid requiring you to iterate through the data 
-        structure, removing and deleting each one. Clears the PointHashGrid at the
-        end.
-		
-        Using objects (instead of pointers) or reference counted pointers is 
-        recommended over using pointers and this deleteAll method.*/
-    void deleteAll() {
-        for (Iterator it = begin(); it.hasMore(); ++it) {
-            delete *it;
-        }
-        clear();
-    }
-
-    /** Removes all data. 
-        @param shrink If true, underlying structures are deallocated as
-        they are freed.*/
-    void clear(bool shrink = true) {
-        m_size = 0;
-        m_bounds = AABox();
-        if (! shrink) {
-            // Remove all data
-            for (CellIterator it = beginCells(); it.hasMore(); ++it) {
-                it.cell().clear(true);
-            }
-        } else {
-            m_data.clear();
-        }
-        ++m_epoch;
-    }
-
-    int debugGetDeepestBucketSize() const {
-        return m_data.debugGetDeepestBucketSize();
-    }
-
-    float debugGetAverageBucketSize() const {
-        return m_data.debugGetAverageBucketSize();
-    }
-#undef ThisType 
-};
-
-} // G3D
-#endif
diff --git a/externals/g3dlite/G3D.lib/include/G3D/Pointer.h b/externals/g3dlite/G3D.lib/include/G3D/Pointer.h
deleted file mode 100644
index 2b80187bae5..00000000000
--- a/externals/g3dlite/G3D.lib/include/G3D/Pointer.h
+++ /dev/null
@@ -1,275 +0,0 @@
-/** 
-  @file Pointer.h
- 
-  @maintainer Morgan McGuire, graphics3d.com
- 
-  @created 2007-05-16
-  @edited  2007-06-22
-
-  Copyright 2000-2007, Morgan McGuire.
-  All rights reserved.
- */
-#ifndef G3D_POINTER_H
-#define G3D_POINTER_H
-
-#include "G3D/debugAssert.h"
-#include "G3D/ReferenceCount.h"
-
-namespace G3D {
-
-/**
-   Acts like a pointer to a value of type ValueType (i.e.,
-   ValueType*), but can operate through accessor methods as well as on
-   a value in memory.  This is useful for implementing scripting
-   languages and other applications that need to connect existing APIs
-   by reference.
-
-   Because the accessors require values to be passed by value (instead of by reference)
-   this is primarily useful for objects whose memory size is small.
-
-   
-   class Foo {
-   public:
-      void setEnabled(bool b);
-      bool getEnabled() const;
-   };
-
-   Foo  f;
-   bool b;
-   
-   Pointer p1(&b);
-   Pointer p2(&f, &Foo::getEnabled, &Foo::setEnabled);
-
-   *p1 = true;
-   *p2 = false;
-   *p2 = *p1; \/\/ Value assignment
-   p2 = p1; \/\/ Pointer aliasing
-
-   \/\/ Or, equivalently:
-   p1.setValue(true);
-   p2.setValue(false);
-
-   p2.setValue(p1.getValue());
-   p2 = p1;
-   

-
-   Note: Because of the way that dereference is implemented, you cannot pass *p through a function
-   that takes varargs (...), e.g., printf("%d", *p) will produce a compile-time error.  Instead use
-   printf("%d",(bool)*p) or printf("%d", p.getValue()).
-   
- */
-template
-class Pointer {
-private:
-
-    class Interface {
-    public:
-        virtual ~Interface() {};
-        virtual void set(ValueType b) = 0;
-        virtual ValueType get() const = 0;
-        virtual Interface* clone() const = 0;
-    };
-
-    class Memory : public Interface {
-    private:
-
-        ValueType* value;
-
-    public:
-        
-        Memory(ValueType* value) : value(value) {
-            debugAssert(value != NULL);
-        }
-
-        virtual void set(ValueType v) {
-            *value = v;
-        }
-
-        virtual ValueType get() const {
-            return *value;
-        }
-
-        virtual Interface* clone() const {
-            return new Memory(value);
-        }
-    };
-
-    template
-    class Accessor : public Interface {
-    private:
-
-        T*          object;
-        GetMethod   getMethod;
-        SetMethod   setMethod;
-
-    public:
-        
-        Accessor(T* object, 
-                 GetMethod getMethod, 
-                 SetMethod setMethod) : object(object), getMethod(getMethod), setMethod(setMethod) {
-            debugAssert(object != NULL);
-        }
-
-        virtual void set(ValueType v) {
-            (object->*setMethod)(v);
-        }
-
-        virtual ValueType get() const {
-            return (object->*getMethod)();
-        }
-
-        virtual Interface* clone() const {
-            return new Accessor(object, getMethod, setMethod);
-        }
-    };
-
-
-    template
-    class RefAccessor : public Interface {
-    private:
-
-        ReferenceCountedPointer         object;
-        GetMethod   getMethod;
-        SetMethod   setMethod;
-
-    public:
-        
-        RefAccessor(
-            const ReferenceCountedPointer& object, 
-            GetMethod getMethod, 
-            SetMethod setMethod) : object(object), getMethod(getMethod), setMethod(setMethod) {
-
-            debugAssert(object != NULL);
-        }
-
-        virtual void set(ValueType v) {
-            (object.pointer()->*setMethod)(v);
-        }
-
-        virtual ValueType get() const {
-            return (object.pointer()->*getMethod)();
-        }
-
-        virtual Interface* clone() const {
-            return new RefAccessor(object, getMethod, setMethod);
-        }
-    };
-
-
-    Interface* interface;
-
-public:
-
-    Pointer() : interface(NULL) {};
-
-    /** Allows implicit cast from real pointer */
-    Pointer(ValueType* v) : interface(new Memory(v)) {}
-
-    // Assignment
-    inline Pointer& operator=(const Pointer& r) {
-        delete interface;
-        if (r.interface != NULL) {
-            interface = r.interface->clone();
-        } else {
-            interface = NULL;
-        }
-        return this[0];
-    }
-
-    Pointer(const Pointer& p) : interface(NULL) {
-        this[0] = p;
-    }
-
-    template
-    Pointer(const ReferenceCountedPointer& object,
-            ValueType (Class::*getMethod)() const,
-            void (Class::*setMethod)(ValueType)) : 
-        interface(new RefAccessor(object, getMethod, setMethod)) {}
-
-    template
-    Pointer(const ReferenceCountedPointer& object,
-            const ValueType& (Class::*getMethod)() const,
-            void (Class::*setMethod)(ValueType)) : 
-        interface(new RefAccessor(object, getMethod, setMethod)) {}
-
-    template
-    Pointer(const ReferenceCountedPointer& object,
-            ValueType (Class::*getMethod)() const,
-            void (Class::*setMethod)(const ValueType&)) : 
-        interface(new RefAccessor(object, getMethod, setMethod)) {}
-
-    template
-    Pointer(const ReferenceCountedPointer& object,
-            const ValueType& (Class::*getMethod)() const,
-            void (Class::*setMethod)(const ValueType&)) : 
-        interface(new RefAccessor(object, getMethod, setMethod)) {}
-
-    template
-    Pointer(Class* object,
-            const ValueType& (Class::*getMethod)() const,
-            void (Class::*setMethod)(const ValueType&)) : 
-        interface(new Accessor(object, getMethod, setMethod)) {}
-
-    template
-    Pointer(Class* object,
-            ValueType (Class::*getMethod)() const,
-            void (Class::*setMethod)(const ValueType&)) : 
-        interface(new Accessor(object, getMethod, setMethod)) {}
-
-    template
-    Pointer(Class* object,
-            const ValueType& (Class::*getMethod)() const,
-            void (Class::*setMethod)(ValueType)) : 
-        interface(new Accessor(object, getMethod, setMethod)) {}
-
-    template
-    Pointer(Class* object,
-            ValueType (Class::*getMethod)() const,
-            void (Class::*setMethod)(ValueType)) : 
-        interface(new Accessor(object, getMethod, setMethod)) {}
-
-    ~Pointer() {
-        delete interface;
-    }
-
-    inline const ValueType getValue() const {
-        debugAssert(interface != NULL);
-        return interface->get();
-    }
-
-    inline void setValue(const ValueType& v) {
-        debugAssert(interface != NULL);
-        interface->set(v);
-    }
-
-    class IndirectValue {
-    private:
-
-        friend class Pointer;
-        Pointer* pointer;
-        IndirectValue(Pointer* p) : pointer(p) {}
-
-    public:
-
-        void operator=(const ValueType& v) {
-            pointer->setValue(v);
-        }
-
-        operator ValueType() const {
-            return pointer->getValue();
-        }
-
-    };
-
-    inline IndirectValue operator*() {
-        return IndirectValue(this);
-    }
-
-    inline const ValueType operator*() const {
-        return getValue();
-    }
-};
-
-}
-
-#endif
diff --git a/externals/g3dlite/G3D.lib/include/G3D/PositionTrait.h b/externals/g3dlite/G3D.lib/include/G3D/PositionTrait.h
deleted file mode 100644
index 67a4f64138a..00000000000
--- a/externals/g3dlite/G3D.lib/include/G3D/PositionTrait.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef G3D_POSITIONTRAIT_H
-#define G3D_POSITIONTRAIT_H
-
-template
-struct PositionTrait{};
-
-#endif
diff --git a/externals/g3dlite/G3D.lib/include/G3D/Quat.h b/externals/g3dlite/G3D.lib/include/G3D/Quat.h
deleted file mode 100644
index d4b892623d8..00000000000
--- a/externals/g3dlite/G3D.lib/include/G3D/Quat.h
+++ /dev/null
@@ -1,725 +0,0 @@
-/**
-  @file Quat.h
- 
-  Quaternion
-  
-  @maintainer Morgan McGuire, matrix@graphics3d.com
-  
-  @created 2002-01-23
-  @edited  2006-05-10
- */
-
-#ifndef G3D_QUAT_H
-#define G3D_QUAT_H
-
-#include "G3D/platform.h"
-#include "G3D/g3dmath.h"
-#include "G3D/Vector3.h"
-#include "G3D/Matrix3.h"
-#include 
-
-namespace G3D {
-
-/**
-  Unit quaternions are used in computer graphics to represent
-  rotation about an axis.  Any 3x3 rotation matrix can
-  be stored as a quaternion.
-
-  A quaternion represents the sum of a real scalar and
-  an imaginary vector: ix + jy + kz + w.  A unit quaternion
-  representing a rotation by A about axis v has the form 
-  [sin(A/2)*v, cos(A/2)].  For a unit quaternion, q.conj() == q.inverse()
-  is a rotation by -A about v.  -q is the same rotation as q
-  (negate both the axis and angle).  
-  
-  A non-unit quaterion q represents the same rotation as
-  q.unitize() (Dam98 pg 28).
-
-  Although quaternion-vector operations (eg. Quat + Vector3) are
-  well defined, they are not supported by this class because
-  they typically are bugs when they appear in code.
-
-  Do not subclass.
-
-  BETA API -- subject to change
-  @cite Erik B. Dam, Martin Koch, Martin Lillholm, Quaternions, Interpolation and Animation.  Technical Report DIKU-TR-98/5, Department of Computer Science, University of Copenhagen, Denmark.  1998.
- */
-class Quat {
-private:
-    // Hidden operators
-    bool operator<(const Quat&) const;
-    bool operator>(const Quat&) const;
-    bool operator<=(const Quat&) const;
-    bool operator>=(const Quat&) const;
-
-public:
-
-    /**
-     q = [sin(angle / 2) * axis, cos(angle / 2)]
-    
-     In Watt & Watt's notation, s = w, v = (x, y, z)
-     In the Real-Time Rendering notation, u = (x, y, z), w = w 
-     */
-    float x, y, z, w;
-
-    /**
-     Initializes to a zero degree rotation.
-     */
-    inline Quat() : x(0), y(0), z(0), w(1) {}
-
-    Quat(
-        const Matrix3& rot);
-
-    inline Quat(float _x, float _y, float _z, float _w) :
-        x(_x), y(_y), z(_z), w(_w) {}
-
-    /** Defaults to a pure vector quaternion */
-    inline Quat(const Vector3& v, float _w = 0) : x(v.x), y(v.y), z(v.z), w(_w) {
-    }
-
-    /**
-     The real part of the quaternion.
-     */
-    inline const float& real() const {
-        return w;
-    }
-
-    inline float& real() {
-        return w;
-    }
-
-    /** Note: two quats can represent the Quat::sameRotation and not be equal. */
-    bool fuzzyEq(const Quat& q) {
-      return G3D::fuzzyEq(x, q.x) && G3D::fuzzyEq(y, q.y) && G3D::fuzzyEq(z, q.z) && G3D::fuzzyEq(w, q.w);
-    }
-    
-    /** True if these quaternions represent the same rotation (note that every rotation is 
-        represented by two values; q and -q).
-      */
-    bool sameRotation(const Quat& q) {
-        return fuzzyEq(q) || fuzzyEq(-q);
-    }
-
-	inline Quat operator-() const {
-		return Quat(-x, -y, -z, -w);
-	}
-
-    /**
-     Returns the imaginary part (x, y, z)
-     */
-    inline const Vector3& imag() const {
-        return *(reinterpret_cast(this));
-    }
-
-    inline Vector3& imag() {
-        return *(reinterpret_cast(this));
-    }
-
-    /** q = [sin(angle/2)*axis, cos(angle/2)] */
-    static Quat fromAxisAngleRotation(
-        const Vector3&      axis,
-        float               angle);
-
-    /** Returns the axis and angle of rotation represented
-        by this quaternion (i.e. q = [sin(angle/2)*axis, cos(angle/2)]) */
-    void toAxisAngleRotation(
-        Vector3&            axis,
-        double&             angle) const;
-
-    void toAxisAngleRotation(
-        Vector3&            axis,
-        float&              angle) const {
-		double d;
-		toAxisAngleRotation(axis, d);
-		angle = (float)d;
-	}
-
-    Matrix3 toRotationMatrix() const;
-
-    void toRotationMatrix(
-        Matrix3&            rot) const;
-    
-    /**
-     Spherical linear interpolation: linear interpolation along the 
-     shortest (3D) great-circle route between two quaternions.
-
-     Note: Correct rotations are expected between 0 and PI in the right order.
-
-     @cite Based on Game Physics -- David Eberly pg 538-540
-     @param threshold Critical angle between between rotations at which
-	        the algorithm switches to normalized lerp, which is more
-			numerically stable in those situations. 0.0 will always slerp. 
-     */
-    Quat slerp(
-        const Quat&         other,
-        float               alpha,
-        float               threshold = 0.05f) const;
-
-	/** Normalized linear interpolation of quaternion components. */
-	Quat nlerp(const Quat& other, float alpha) const;
-
-    /**
-     Negates the imaginary part.
-     */
-    inline Quat conj() const {
-        return Quat(-x, -y, -z, w);
-    }
-
-    inline float sum() const {
-        return x + y + z + w;
-    }
-
-    inline float average() const {
-        return sum() / 4.0f;
-    }
-
-    inline Quat operator*(float s) const {
-        return Quat(x * s, y * s, z * s, w * s);
-    }
-
-    inline Quat& operator*=(float s) {
-        x *= s;
-        y *= s;
-        z *= s;
-        w *= s;
-        return *this;
-    }
-
-	/** @cite Based on Watt & Watt, page 360 */
-    friend Quat operator* (float s, const Quat& q);
-
-    inline Quat operator/(float s) const {
-        return Quat(x / s, y / s, z / s, w / s);
-    }
-
-    inline float dot(const Quat& other) const {
-        return (x * other.x) + (y * other.y) + (z * other.z) + (w * other.w);
-    }
-
-    /** Note that q-1 = q.conj() for a unit quaternion. 
-        @cite Dam99 page 13 */
-    inline Quat inverse() const {
-        return conj() / dot(*this);
-    }
-
-    Quat operator-(const Quat& other) const;
-
-    Quat operator+(const Quat& other) const;
-
-    /**
-     Quaternion multiplication (composition of rotations).
-     Note that this does not commute.
-     */
-    Quat operator*(const Quat& other) const;
-
-    /* (*this) * other.inverse() */
-    Quat operator/(const Quat& other) const {
-        return (*this) * other.inverse();
-    }
-
-
-    /** Is the magnitude nearly 1.0? */
-    inline bool isUnit(float tolerance = 1e-5) const {
-        return abs(dot(*this) - 1.0f) < tolerance;
-    }
-    
-
-    inline float magnitude() const {
-        return sqrtf(dot(*this));
-    }
-
-    inline Quat log() const {
-        if ((x == 0) && (y == 0) && (z == 0)) {
-            if (w > 0) {
-                return Quat(0, 0, 0, ::logf(w));
-            } else if (w < 0) {
-                // Log of a negative number.  Multivalued, any number of the form
-                // (PI * v, ln(-q.w))
-                return Quat((float)pi(), 0, 0, ::logf(-w));
-            } else {
-                 // log of zero!
-                 return Quat((float)nan(), (float)nan(), (float)nan(), (float)nan());
-            }
-        } else {
-            // Partly imaginary.
-            float imagLen = sqrtf(x * x + y * y + z * z);
-            float len = sqrtf(imagLen * imagLen + w * w);
-            float theta = atan2f(imagLen, (float)w);
-            float t = theta / imagLen;
-            return Quat(t * x, t * y, t * z, ::logf(len));
-        }
-    }
-    /** log q = [Av, 0] where q = [sin(A) * v, cos(A)].
-        Only for unit quaternions 
-        debugAssertM(isUnit(), "Log only defined for unit quaternions");
-        // Solve for A in q = [sin(A)*v, cos(A)]
-        Vector3 u(x, y, z);
-        double len = u.magnitude();
-
-        if (len == 0.0) {
-            return 
-        }
-        double A = atan2((double)w, len);
-        Vector3 v = u / len;
-        
-        return Quat(v * A, 0);
-    }
-    */
-
-    /** exp q = [sin(A) * v, cos(A)] where q = [Av, 0].
-        Only defined for pure-vector quaternions */
-    inline Quat exp() const {
-        debugAssertM(w == 0, "exp only defined for vector quaternions");
-        Vector3 u(x, y, z);
-        float A = u.magnitude();
-        Vector3 v = u / A;
-        return Quat(sinf(A) * v, cosf(A));
-    }
-
-
-    /**
-     Raise this quaternion to a power.  For a rotation, this is
-     the effect of rotating x times as much as the original
-     quaterion.
-
-     Note that q.pow(a).pow(b) == q.pow(a + b)
-     @cite Dam98 pg 21
-     */
-    inline Quat pow(float x) const {
-        return (log() * x).exp();
-    }
-
-    inline void unitize() {
-        float mag2 = dot(*this);
-        if (! G3D::fuzzyEq(mag2, 1.0f)) {
-            *this *= rsq(mag2);
-        }
-    }
-
-    /**
-     Returns a unit quaterion obtained by dividing through by
-     the magnitude.
-     */
-    inline Quat toUnit() const {
-        Quat x = *this;
-        x.unitize();
-        return x;
-    }
-
-    /**
-     The linear algebra 2-norm, sqrt(q dot q).  This matches
-     the value used in Dam's 1998 tech report but differs from the
-     n(q) value used in Eberly's 1999 paper, which is the square of the
-     norm.
-     */
-    inline float norm() const {
-        return magnitude();
-    }
-
-    // access quaternion as q[0] = q.x, q[1] = q.y, q[2] = q.z, q[3] = q.w
-    //
-    // WARNING.  These member functions rely on
-    // (1) Quat not having virtual functions
-    // (2) the data packed in a 4*sizeof(float) memory block
-    const float& operator[] (int i) const;
-    float& operator[] (int i);
-
-    /** Generate uniform random unit quaternion (i.e. random "direction") 
-	@cite From "Uniform Random Rotations", Ken Shoemake, Graphics Gems III.
-   */
-    static Quat unitRandom();
-
-    void deserialize(class BinaryInput& b);
-    void serialize(class BinaryOutput& b) const;
-
-    // 2-char swizzles
-
-    Vector2 xx() const;
-    Vector2 yx() const;
-    Vector2 zx() const;
-    Vector2 wx() const;
-    Vector2 xy() const;
-    Vector2 yy() const;
-    Vector2 zy() const;
-    Vector2 wy() const;
-    Vector2 xz() const;
-    Vector2 yz() const;
-    Vector2 zz() const;
-    Vector2 wz() const;
-    Vector2 xw() const;
-    Vector2 yw() const;
-    Vector2 zw() const;
-    Vector2 ww() const;
-
-    // 3-char swizzles
-
-    Vector3 xxx() const;
-    Vector3 yxx() const;
-    Vector3 zxx() const;
-    Vector3 wxx() const;
-    Vector3 xyx() const;
-    Vector3 yyx() const;
-    Vector3 zyx() const;
-    Vector3 wyx() const;
-    Vector3 xzx() const;
-    Vector3 yzx() const;
-    Vector3 zzx() const;
-    Vector3 wzx() const;
-    Vector3 xwx() const;
-    Vector3 ywx() const;
-    Vector3 zwx() const;
-    Vector3 wwx() const;
-    Vector3 xxy() const;
-    Vector3 yxy() const;
-    Vector3 zxy() const;
-    Vector3 wxy() const;
-    Vector3 xyy() const;
-    Vector3 yyy() const;
-    Vector3 zyy() const;
-    Vector3 wyy() const;
-    Vector3 xzy() const;
-    Vector3 yzy() const;
-    Vector3 zzy() const;
-    Vector3 wzy() const;
-    Vector3 xwy() const;
-    Vector3 ywy() const;
-    Vector3 zwy() const;
-    Vector3 wwy() const;
-    Vector3 xxz() const;
-    Vector3 yxz() const;
-    Vector3 zxz() const;
-    Vector3 wxz() const;
-    Vector3 xyz() const;
-    Vector3 yyz() const;
-    Vector3 zyz() const;
-    Vector3 wyz() const;
-    Vector3 xzz() const;
-    Vector3 yzz() const;
-    Vector3 zzz() const;
-    Vector3 wzz() const;
-    Vector3 xwz() const;
-    Vector3 ywz() const;
-    Vector3 zwz() const;
-    Vector3 wwz() const;
-    Vector3 xxw() const;
-    Vector3 yxw() const;
-    Vector3 zxw() const;
-    Vector3 wxw() const;
-    Vector3 xyw() const;
-    Vector3 yyw() const;
-    Vector3 zyw() const;
-    Vector3 wyw() const;
-    Vector3 xzw() const;
-    Vector3 yzw() const;
-    Vector3 zzw() const;
-    Vector3 wzw() const;
-    Vector3 xww() const;
-    Vector3 yww() const;
-    Vector3 zww() const;
-    Vector3 www() const;
-
-    // 4-char swizzles
-
-    Vector4 xxxx() const;
-    Vector4 yxxx() const;
-    Vector4 zxxx() const;
-    Vector4 wxxx() const;
-    Vector4 xyxx() const;
-    Vector4 yyxx() const;
-    Vector4 zyxx() const;
-    Vector4 wyxx() const;
-    Vector4 xzxx() const;
-    Vector4 yzxx() const;
-    Vector4 zzxx() const;
-    Vector4 wzxx() const;
-    Vector4 xwxx() const;
-    Vector4 ywxx() const;
-    Vector4 zwxx() const;
-    Vector4 wwxx() const;
-    Vector4 xxyx() const;
-    Vector4 yxyx() const;
-    Vector4 zxyx() const;
-    Vector4 wxyx() const;
-    Vector4 xyyx() const;
-    Vector4 yyyx() const;
-    Vector4 zyyx() const;
-    Vector4 wyyx() const;
-    Vector4 xzyx() const;
-    Vector4 yzyx() const;
-    Vector4 zzyx() const;
-    Vector4 wzyx() const;
-    Vector4 xwyx() const;
-    Vector4 ywyx() const;
-    Vector4 zwyx() const;
-    Vector4 wwyx() const;
-    Vector4 xxzx() const;
-    Vector4 yxzx() const;
-    Vector4 zxzx() const;
-    Vector4 wxzx() const;
-    Vector4 xyzx() const;
-    Vector4 yyzx() const;
-    Vector4 zyzx() const;
-    Vector4 wyzx() const;
-    Vector4 xzzx() const;
-    Vector4 yzzx() const;
-    Vector4 zzzx() const;
-    Vector4 wzzx() const;
-    Vector4 xwzx() const;
-    Vector4 ywzx() const;
-    Vector4 zwzx() const;
-    Vector4 wwzx() const;
-    Vector4 xxwx() const;
-    Vector4 yxwx() const;
-    Vector4 zxwx() const;
-    Vector4 wxwx() const;
-    Vector4 xywx() const;
-    Vector4 yywx() const;
-    Vector4 zywx() const;
-    Vector4 wywx() const;
-    Vector4 xzwx() const;
-    Vector4 yzwx() const;
-    Vector4 zzwx() const;
-    Vector4 wzwx() const;
-    Vector4 xwwx() const;
-    Vector4 ywwx() const;
-    Vector4 zwwx() const;
-    Vector4 wwwx() const;
-    Vector4 xxxy() const;
-    Vector4 yxxy() const;
-    Vector4 zxxy() const;
-    Vector4 wxxy() const;
-    Vector4 xyxy() const;
-    Vector4 yyxy() const;
-    Vector4 zyxy() const;
-    Vector4 wyxy() const;
-    Vector4 xzxy() const;
-    Vector4 yzxy() const;
-    Vector4 zzxy() const;
-    Vector4 wzxy() const;
-    Vector4 xwxy() const;
-    Vector4 ywxy() const;
-    Vector4 zwxy() const;
-    Vector4 wwxy() const;
-    Vector4 xxyy() const;
-    Vector4 yxyy() const;
-    Vector4 zxyy() const;
-    Vector4 wxyy() const;
-    Vector4 xyyy() const;
-    Vector4 yyyy() const;
-    Vector4 zyyy() const;
-    Vector4 wyyy() const;
-    Vector4 xzyy() const;
-    Vector4 yzyy() const;
-    Vector4 zzyy() const;
-    Vector4 wzyy() const;
-    Vector4 xwyy() const;
-    Vector4 ywyy() const;
-    Vector4 zwyy() const;
-    Vector4 wwyy() const;
-    Vector4 xxzy() const;
-    Vector4 yxzy() const;
-    Vector4 zxzy() const;
-    Vector4 wxzy() const;
-    Vector4 xyzy() const;
-    Vector4 yyzy() const;
-    Vector4 zyzy() const;
-    Vector4 wyzy() const;
-    Vector4 xzzy() const;
-    Vector4 yzzy() const;
-    Vector4 zzzy() const;
-    Vector4 wzzy() const;
-    Vector4 xwzy() const;
-    Vector4 ywzy() const;
-    Vector4 zwzy() const;
-    Vector4 wwzy() const;
-    Vector4 xxwy() const;
-    Vector4 yxwy() const;
-    Vector4 zxwy() const;
-    Vector4 wxwy() const;
-    Vector4 xywy() const;
-    Vector4 yywy() const;
-    Vector4 zywy() const;
-    Vector4 wywy() const;
-    Vector4 xzwy() const;
-    Vector4 yzwy() const;
-    Vector4 zzwy() const;
-    Vector4 wzwy() const;
-    Vector4 xwwy() const;
-    Vector4 ywwy() const;
-    Vector4 zwwy() const;
-    Vector4 wwwy() const;
-    Vector4 xxxz() const;
-    Vector4 yxxz() const;
-    Vector4 zxxz() const;
-    Vector4 wxxz() const;
-    Vector4 xyxz() const;
-    Vector4 yyxz() const;
-    Vector4 zyxz() const;
-    Vector4 wyxz() const;
-    Vector4 xzxz() const;
-    Vector4 yzxz() const;
-    Vector4 zzxz() const;
-    Vector4 wzxz() const;
-    Vector4 xwxz() const;
-    Vector4 ywxz() const;
-    Vector4 zwxz() const;
-    Vector4 wwxz() const;
-    Vector4 xxyz() const;
-    Vector4 yxyz() const;
-    Vector4 zxyz() const;
-    Vector4 wxyz() const;
-    Vector4 xyyz() const;
-    Vector4 yyyz() const;
-    Vector4 zyyz() const;
-    Vector4 wyyz() const;
-    Vector4 xzyz() const;
-    Vector4 yzyz() const;
-    Vector4 zzyz() const;
-    Vector4 wzyz() const;
-    Vector4 xwyz() const;
-    Vector4 ywyz() const;
-    Vector4 zwyz() const;
-    Vector4 wwyz() const;
-    Vector4 xxzz() const;
-    Vector4 yxzz() const;
-    Vector4 zxzz() const;
-    Vector4 wxzz() const;
-    Vector4 xyzz() const;
-    Vector4 yyzz() const;
-    Vector4 zyzz() const;
-    Vector4 wyzz() const;
-    Vector4 xzzz() const;
-    Vector4 yzzz() const;
-    Vector4 zzzz() const;
-    Vector4 wzzz() const;
-    Vector4 xwzz() const;
-    Vector4 ywzz() const;
-    Vector4 zwzz() const;
-    Vector4 wwzz() const;
-    Vector4 xxwz() const;
-    Vector4 yxwz() const;
-    Vector4 zxwz() const;
-    Vector4 wxwz() const;
-    Vector4 xywz() const;
-    Vector4 yywz() const;
-    Vector4 zywz() const;
-    Vector4 wywz() const;
-    Vector4 xzwz() const;
-    Vector4 yzwz() const;
-    Vector4 zzwz() const;
-    Vector4 wzwz() const;
-    Vector4 xwwz() const;
-    Vector4 ywwz() const;
-    Vector4 zwwz() const;
-    Vector4 wwwz() const;
-    Vector4 xxxw() const;
-    Vector4 yxxw() const;
-    Vector4 zxxw() const;
-    Vector4 wxxw() const;
-    Vector4 xyxw() const;
-    Vector4 yyxw() const;
-    Vector4 zyxw() const;
-    Vector4 wyxw() const;
-    Vector4 xzxw() const;
-    Vector4 yzxw() const;
-    Vector4 zzxw() const;
-    Vector4 wzxw() const;
-    Vector4 xwxw() const;
-    Vector4 ywxw() const;
-    Vector4 zwxw() const;
-    Vector4 wwxw() const;
-    Vector4 xxyw() const;
-    Vector4 yxyw() const;
-    Vector4 zxyw() const;
-    Vector4 wxyw() const;
-    Vector4 xyyw() const;
-    Vector4 yyyw() const;
-    Vector4 zyyw() const;
-    Vector4 wyyw() const;
-    Vector4 xzyw() const;
-    Vector4 yzyw() const;
-    Vector4 zzyw() const;
-    Vector4 wzyw() const;
-    Vector4 xwyw() const;
-    Vector4 ywyw() const;
-    Vector4 zwyw() const;
-    Vector4 wwyw() const;
-    Vector4 xxzw() const;
-    Vector4 yxzw() const;
-    Vector4 zxzw() const;
-    Vector4 wxzw() const;
-    Vector4 xyzw() const;
-    Vector4 yyzw() const;
-    Vector4 zyzw() const;
-    Vector4 wyzw() const;
-    Vector4 xzzw() const;
-    Vector4 yzzw() const;
-    Vector4 zzzw() const;
-    Vector4 wzzw() const;
-    Vector4 xwzw() const;
-    Vector4 ywzw() const;
-    Vector4 zwzw() const;
-    Vector4 wwzw() const;
-    Vector4 xxww() const;
-    Vector4 yxww() const;
-    Vector4 zxww() const;
-    Vector4 wxww() const;
-    Vector4 xyww() const;
-    Vector4 yyww() const;
-    Vector4 zyww() const;
-    Vector4 wyww() const;
-    Vector4 xzww() const;
-    Vector4 yzww() const;
-    Vector4 zzww() const;
-    Vector4 wzww() const;
-    Vector4 xwww() const;
-    Vector4 ywww() const;
-    Vector4 zwww() const;
-    Vector4 wwww() const;
-};
-
-inline Quat exp(const Quat& q) {
-    return q.exp();
-}
-
-inline Quat log(const Quat& q) {
-    return q.log();
-}
-
-inline G3D::Quat operator*(double s, const G3D::Quat& q) {
-    return q * (float)s;
-}
-
-inline G3D::Quat operator*(float s, const G3D::Quat& q) {
-    return q * s;
-}
-
-inline float& Quat::operator[] (int i) {
-    debugAssert(i >= 0);
-    debugAssert(i < 4);
-    return ((float*)this)[i];
-}
-
-inline const float& Quat::operator[] (int i) const {
-    debugAssert(i >= 0);
-    debugAssert(i < 4);
-    return ((float*)this)[i];
-}
-
-inline Quat Quat::operator-(const Quat& other) const {
-    return Quat(x - other.x, y - other.y, z - other.z, w - other.w);
-}
-
-inline Quat Quat::operator+(const Quat& other) const {
-    return Quat(x + other.x, y + other.y, z + other.z, w + other.w);
-}
-
-} // Namespace G3D
-
-// Outside the namespace to avoid overloading confusion for C++
-inline G3D::Quat pow(const G3D::Quat& q, double x) {
-    return q.pow((float)x);
-}
-
-
-#endif
diff --git a/externals/g3dlite/G3D.lib/include/G3D/Queue.h b/externals/g3dlite/G3D.lib/include/G3D/Queue.h
deleted file mode 100644
index b64eced820a..00000000000
--- a/externals/g3dlite/G3D.lib/include/G3D/Queue.h
+++ /dev/null
@@ -1,355 +0,0 @@
-/** 
-  @file Queue.h
- 
-  @maintainer Morgan McGuire, graphics3d.com
- 
-  @created 2002-07-09
-  @edited  2005-08-20
- */
-
-#ifndef G3D_QUEUE_H
-#define G3D_QUEUE_H
-
-#include "G3D/platform.h"
-#include "G3D/System.h"
-#include "G3D/debug.h"
-
-namespace G3D {
-
-/**
- Locate the indices of the break between of the two 
- sections of the circular queue.  These are used to
- construct two for loops that iterate over the whole
- sequence without using the modulo operator.
-
-   [0 ... secondEnd)   [head .... firstEnd)
- */
-#define FIND_ENDS \
-    int firstEnd  = head + num;\
-    int secondEnd = 0;\
-    if (firstEnd > numAllocated) {\
-       secondEnd = firstEnd - numAllocated;\
-       firstEnd  = numAllocated;\
-    }
-
-
-/**
- Dynamic queue that uses a circular buffer for performance.
-
- Faster than std::deque for objects with constructors.
- */
-template 
-class Queue {
-private:
-    //                
-    //             |<----  num  ---->|
-    // [  |  |  |  |  |  |  |  |  |  |  |  |  |  ]
-    //              ^ 
-    //              |
-    //             head
-    //
-    //
-
-    /**
-     Only num elements are initialized.
-     */
-    T*                  data;
-
-    /**
-     Index of the next element to be dequeue-d in data.
-     */
-    int                 head;
-
-    /**
-     Number of elements (including head) that are visible and initialized.
-     */
-    int                 num;
-    
-    /**
-     Size of data array in elements.
-     */
-    int                 numAllocated;
-
-    /** If a clear was needed, assumes it already occured */
-    void _copy(const Queue& other) {
-        debugAssert(data == NULL);
-        data = (T*)System::malloc(sizeof(T) * other.numAllocated);
-        debugAssert(data);
-        head = other.head;
-        num = other.num;
-        numAllocated = other.numAllocated;
-
-        FIND_ENDS;
-
-        for (int i = head; i < firstEnd; ++i) {
-            new (data + i)T(other.data[i]);
-        }
-
-        for (int i = 0; i < secondEnd; ++i) {
-            new (data + i)T(other.data[i]);
-        }
-    }
-
-
-    /**
-     Computes a data array index from a queue position.  The queue position
-     may be negative.
-     */
-    inline int index(int i) const {
-        return (head + i + numAllocated) % numAllocated;
-    }
-
-    /**
-     Allocates newSize elements and repacks the array.
-     */
-    void repackAndRealloc(int newSize) {
-        // TODO: shrink queue
-        T* old = data;
-        data = (T*)System::malloc(newSize * sizeof(T));
-        debugAssert(data != NULL);
-
-        FIND_ENDS;
-
-        int j = 0;
-        for (int i = head; i < firstEnd; ++i, ++j) {
-            new (data + j)T(old[i]);
-            (old + i)->~T();
-        }
-
-        for (int i = 0; i < secondEnd; ++i, ++j) {
-            new (data + j)T(old[i]);
-            (old + i)->~T();
-        }
-
-        head = 0;
-        System::free(old);
-        numAllocated = newSize;
-    }
-
-    /**
-      Ensure that there is at least one element between
-      the tail and head, wrapping around in the circular
-      buffer.
-      */
-    inline void reserveSpace() {
-        if (num == numAllocated) {
-            repackAndRealloc(numAllocated * 3 + 20);
-        }
-    }
-
-public:
-
-    Queue() : 
-      data(NULL),
-      head(0),
-      num(0),
-      numAllocated(0) {
-    }
-
-
-    /**
-    Copy constructor
-    */
-    Queue(const Queue& other) : data(NULL) {
-       _copy(other);
-    }
-
-
-   /**
-    Destructor does not delete() the objects if T is a pointer type
-    (e.g. T = int*) instead, it deletes the pointers themselves and 
-    leaves the objects.  Call deleteAll if you want to dealocate
-    the objects referenced.
-    */
-    virtual ~Queue() {
-        clear();
-    }
-
-    /**
-     Insert a new element into the front of the queue
-     (a traditional queue only uses pushBack).
-     */
-    inline void pushFront(const T& e) {
-        reserveSpace();
-
-        // Get the index of head-1
-        int i = index(-1);
-
-        // Call the constructor on the newly exposed element.
-        new (data + i)T(e);
-
-        // Reassign the head to point to this index
-        head = i;
-        ++num;
-    }
-
-    /**
-     Insert a new element at the end of the queue.
-    */
-    inline void pushBack(const T& e) {
-        reserveSpace();
-
-        // Get the index of 1+tail
-        int i = index(num);
-
-        // Initialize that element
-        new (data + i)T(e);
-        ++num;
-    }
-
-    /**
-     pushBack
-     */
-    inline void enqueue(const T& e) {
-        pushBack(e);
-    }
-
-
-    /**
-     Remove the last element from the queue.  The queue will never
-     shrink in size.  (A typical queue only uses popFront).
-     */
-    inline T popBack() {
-        int tail = index(num - 1);
-        T result(data[tail]);
-
-        // Call the destructor
-        (data + tail)->~T();
-        --num;
-
-        return result;
-    }
-
-    /**
-    Remove the next element from the head of the queue.  The queue will never
-    shrink in size. */
-    inline T popFront() {
-        T result(data[head]);
-        // Call the destructor
-        (data + head)->~T();
-        head = (head + 1) % numAllocated;
-        --num;
-        return result;
-    }
-
-
-   /**
-    popFront
-    */
-   inline T dequeue() {
-       return popFront();
-   }
-
-   /**
-    Removes all elements (invoking their destructors).
-
-    @param freeStorage If false, the underlying array is not deallocated
-    (allowing fast push in the future), however, the size of the Queue
-    is reported as zero.
-    
-    */
-   void clear(bool freeStorage = true) {
-
-       FIND_ENDS;
-       
-       // Invoke the destructors on the elements
-       int i;
-       for (i = head; i < firstEnd; ++i) {
-           (data + i)->~T();
-       }
-
-       for (i = 0; i < secondEnd; ++i) {
-           (data + i)->~T();
-       }
-       
-       num = 0;
-       head = 0;
-       if (freeStorage) {
-           numAllocated = 0;
-           System::free(data);
-           data = NULL;
-       }
-   }
-
-   /** Clear without freeing the underlying array. */
-   void fastClear() {
-       clear(false);
-   }
-
-   /**
-    Assignment operator.
-    */
-   Queue& operator=(const Queue& other) {
-       clear();
-       _copy(other);
-       return *this;
-   }
-
-   /**
-    Number of elements in the queue.
-    */
-   inline int size() const {
-      return num;
-   }
-
-   /**
-    Number of elements in the queue.
-    */
-   inline int length() const {
-      return size();
-   }
-
-   /**
-    Performs bounds checks in debug mode
-    */
-   inline T& operator[](int n) {
-      debugAssert((n >= 0) && (n < num));
-      return data[index(n)];
-   }
-
-   /**
-    Performs bounds checks in debug mode
-    */
-    inline const T& operator[](int n) const {
-        debugAssert((n >= 0) && (n < num));
-        return data[index(n)];
-    }
-
-
-    /**
-     Returns true if the given element is in the queue.
-     */
-    bool contains(const T& e) const {
-        for (int i = 0; i < size(); ++i) {
-            if ((*this)[i] == e) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-   /**
-    Calls delete on all objects[0...size-1]
-    and sets the queue size to zero.
-    */
-    void deleteAll() {
-        FIND_ENDS;
-        
-        int i;
-    	for (i = 0; i < secondEnd; ++i) {
-            delete data[i];
-        }
-
-        for (i = head; i < firstEnd; ++i) {
-            delete data[i];
-        }
-        clear();
-    }
-};
-
-#undef FIND_ENDS
-
-}; // namespace
-
-#endif
diff --git a/externals/g3dlite/G3D.lib/include/G3D/Ray.h b/externals/g3dlite/G3D.lib/include/G3D/Ray.h
deleted file mode 100644
index ab43c82933a..00000000000
--- a/externals/g3dlite/G3D.lib/include/G3D/Ray.h
+++ /dev/null
@@ -1,329 +0,0 @@
-/**
- @file Ray.h
- 
- Ray class
- 
- @maintainer Morgan McGuire, matrix@graphics3d.com
- 
- @created 2002-07-12
- @edited  2006-02-21
- */
-
-#ifndef G3D_RAY_H
-#define G3D_RAY_H
-
-#include "G3D/platform.h"
-#include "G3D/Vector3.h"
-#include "G3D/Triangle.h"
-
-namespace G3D {
-
-/**
- A 3D Ray.
- */
-class Ray {
-private:
-    Ray(const Vector3& origin, const Vector3& direction) {
-        this->origin    = origin;
-        this->direction = direction;
-    }
-
-public:
-    Vector3         origin;
-
-    /**
-     Not unit length
-     */
-    Vector3         direction;
-
-    Ray() : origin(Vector3::zero()), direction(Vector3::zero()) {}
-
-	Ray(class BinaryInput& b);
-	void serialize(class BinaryOutput& b) const;
-	void deserialize(class BinaryInput& b);
-
-    /**
-     Creates a Ray from a origin and a (nonzero) direction.
-     */
-    static Ray fromOriginAndDirection(const Vector3& point, const Vector3& direction) {
-        return Ray(point, direction);
-    }
-
-    Ray unit() const {
-        return Ray(origin, direction.unit());
-    }
-
-    /**
-     Returns the closest point on the Ray to point.
-     */
-    Vector3 closestPoint(const Vector3& point) const {
-        float t = direction.dot(point - this->origin);
-        if (t < 0) {
-            return this->origin;
-        } else {
-            return this->origin + direction * t;
-        }
-    }
-
-    /**
-     Returns the closest distance between point and the Ray
-     */
-    float distance(const Vector3& point) const {
-        return (closestPoint(point) - point).magnitude();
-    }
-
-    /**
-     Returns the point where the Ray and plane intersect.  If there
-     is no intersection, returns a point at infinity.
-
-      Planes are considered one-sided, so the ray will not intersect
-      a plane where the normal faces in the traveling direction.
-    */
-    Vector3 intersection(const class Plane& plane) const;
-
-    /**
-     Returns the distance until intersection with the (solid) sphere.
-     Will be 0 if inside the sphere, inf if there is no intersection.
-
-     The ray direction is not normalized.  If the ray direction
-     has unit length, the distance from the origin to intersection
-     is equal to the time.  If the direction does not have unit length,
-     the distance = time * direction.length().
-
-     See also the G3D::CollisionDetection "movingPoint" methods,
-     which give more information about the intersection.
-     */
-    float intersectionTime(const class Sphere& sphere) const;
-
-    float intersectionTime(const class Plane& plane) const;
-
-    float intersectionTime(const class Box& box) const;
-
-    float intersectionTime(const class AABox& box) const;
-
-    /**
-     The three extra arguments are the weights of vertices 0, 1, and 2
-     at the intersection point; they are useful for texture mapping
-     and interpolated normals.
-     */
-    float intersectionTime(
-        const Vector3& v0, const Vector3& v1, const Vector3& v2,
-        const Vector3& edge01, const Vector3& edge02,
-        double& w0, double& w1, double& w2) const;
-
-     /**
-     Ray-triangle intersection for a 1-sided triangle.  Fastest version.
-       @cite http://www.acm.org/jgt/papers/MollerTrumbore97/
-       http://www.graphics.cornell.edu/pubs/1997/MT97.html
-     */
-    inline float intersectionTime(
-        const Vector3& vert0,
-        const Vector3& vert1,
-        const Vector3& vert2,
-        const Vector3& edge01,
-        const Vector3& edge02) const;
-
-
-    inline float intersectionTime(
-        const Vector3& vert0,
-        const Vector3& vert1,
-        const Vector3& vert2) const {
-
-        return intersectionTime(vert0, vert1, vert2, vert1 - vert0, vert2 - vert0);
-    }
-
-
-    inline float intersectionTime(
-        const Vector3&  vert0,
-        const Vector3&  vert1,
-        const Vector3&  vert2,
-        double&         w0,
-        double&         w1,
-        double&         w2) const {
-
-        return intersectionTime(vert0, vert1, vert2, vert1 - vert0, vert2 - vert0, w0, w1, w2);
-    }
-
-    /* One-sided triangle 
-       */
-    inline float intersectionTime(const Triangle& triangle) const {
-        return intersectionTime(
-            triangle.vertex(0), triangle.vertex(1), triangle.vertex(2),
-            triangle.edge01(), triangle.edge02());
-    }
-
-    inline float intersectionTime(
-        const Triangle& triangle,
-        double&         w0,
-        double&         w1,
-        double&         w2) const {
-        return intersectionTime(triangle.vertex(0), triangle.vertex(1), triangle.vertex(2),
-            triangle.edge01(), triangle.edge02(), w0, w1, w2);
-    }
-
-    /** Refracts about the normal
-        using G3D::Vector3::refractionDirection
-        and bumps the ray slightly from the newOrigin. */
-    Ray refract(
-        const Vector3&  newOrigin,
-        const Vector3&  normal,
-        float           iInside,
-        float           iOutside) const;
-
-    /** Reflects about the normal
-        using G3D::Vector3::reflectionDirection
-        and bumps the ray slightly from
-        the newOrigin. */
-    Ray reflect(
-        const Vector3&  newOrigin,
-        const Vector3&  normal) const;
-};
-
-
-#define EPSILON 0.000001
-#define CROSS(dest,v1,v2) \
-          dest[0]=v1[1]*v2[2]-v1[2]*v2[1]; \
-          dest[1]=v1[2]*v2[0]-v1[0]*v2[2]; \
-          dest[2]=v1[0]*v2[1]-v1[1]*v2[0];
-
-#define DOT(v1,v2) (v1[0]*v2[0]+v1[1]*v2[1]+v1[2]*v2[2])
-
-#define SUB(dest,v1,v2) \
-          dest[0]=v1[0]-v2[0]; \
-          dest[1]=v1[1]-v2[1]; \
-          dest[2]=v1[2]-v2[2]; 
-
-inline float Ray::intersectionTime(
-    const Vector3& vert0,
-    const Vector3& vert1,
-    const Vector3& vert2,
-    const Vector3& edge1,
-    const Vector3& edge2) const {
-
-    (void)vert1;
-    (void)vert2;
-
-    // Barycenteric coords
-    float u, v;
-
-    float tvec[3], pvec[3], qvec[3];
-    
-    // begin calculating determinant - also used to calculate U parameter
-    CROSS(pvec, direction, edge2);
-    
-    // if determinant is near zero, ray lies in plane of triangle
-    const float det = DOT(edge1, pvec);
-    
-    if (det < EPSILON) {
-        return (float)inf();
-    }
-    
-    // calculate distance from vert0 to ray origin
-    SUB(tvec, origin, vert0);
-    
-    // calculate U parameter and test bounds
-    u = DOT(tvec, pvec);
-    if ((u < 0.0f) || (u > det)) {
-        // Hit the plane outside the triangle
-        return (float)inf();
-    }
-    
-    // prepare to test V parameter
-    CROSS(qvec, tvec, edge1);
-    
-    // calculate V parameter and test bounds
-    v = DOT(direction, qvec);
-    if ((v < 0.0f) || (u + v > det)) {
-        // Hit the plane outside the triangle
-        return (float)inf();
-    }
-    
-
-    // Case where we don't need correct (u, v):
-    const float t = DOT(edge2, qvec);
-    
-    if (t >= 0.0f) {
-        // Note that det must be positive
-        return t / det;
-    } else {
-        // We had to travel backwards in time to intersect
-        return (float)inf();
-    }
-}
-
-
-inline float Ray::intersectionTime(
-    const Vector3&  vert0,
-    const Vector3&  vert1,
-    const Vector3&  vert2,
-    const Vector3&  edge1,
-    const Vector3&  edge2,
-    double&         w0,
-    double&         w1,
-    double&         w2) const {
-
-    (void)vert1;
-    (void)vert2;
-
-    // Barycenteric coords
-    float u, v;
-
-    float tvec[3], pvec[3], qvec[3];
-
-    // begin calculating determinant - also used to calculate U parameter
-    CROSS(pvec, direction, edge2);
-    
-    // if determinant is near zero, ray lies in plane of triangle
-    const float det = DOT(edge1, pvec);
-    
-    if (det < EPSILON) {
-        return (float)inf();
-    }
-    
-    // calculate distance from vert0 to ray origin
-    SUB(tvec, origin, vert0);
-    
-    // calculate U parameter and test bounds
-    u = DOT(tvec, pvec);
-    if ((u < 0.0f) || (u > det)) {
-        // Hit the plane outside the triangle
-        return (float)inf();
-    }
-    
-    // prepare to test V parameter
-    CROSS(qvec, tvec, edge1);
-    
-    // calculate V parameter and test bounds
-    v = DOT(direction, qvec);
-    if ((v < 0.0f) || (u + v > det)) {
-        // Hit the plane outside the triangle
-        return (float)inf();
-    }
-    
-    float t = DOT(edge2, qvec);
-    
-    if (t >= 0) {
-        const float inv_det = 1.0f / det;
-        t *= inv_det;
-        u *= inv_det;
-        v *= inv_det;
-
-        w0 = (1.0f - u - v);
-        w1 = u;
-        w2 = v;
-
-        return t;
-    } else {
-        // We had to travel backwards in time to intersect
-        return (float)inf();
-    }
-}
-
-#undef EPSILON
-#undef CROSS
-#undef DOT
-#undef SUB
-
-}// namespace
-
-#endif
diff --git a/externals/g3dlite/G3D.lib/include/G3D/Rect2D.h b/externals/g3dlite/G3D.lib/include/G3D/Rect2D.h
deleted file mode 100644
index a6c0b7cd0cb..00000000000
--- a/externals/g3dlite/G3D.lib/include/G3D/Rect2D.h
+++ /dev/null
@@ -1,391 +0,0 @@
-/**
-  @file Rect2D.h
- 
-  @maintainer Morgan McGuire, matrix@graphics3d.com
- 
-  @created 2003-11-13
-  @created 2008-11-16
-
-  Copyright 2000-2008, Morgan McGuire.
-  All rights reserved.
- */
-
-#ifndef G3D_RECT2D_H
-#define G3D_RECT2D_H
-
-// Linux defines this as a macro
-#ifdef border
-#undef border
-#endif
-
-#include "G3D/platform.h"
-#include "G3D/Array.h"
-#include "G3D/Vector2.h"
-
-namespace G3D {
-
-/**
- If you are using this class for pixel rectangles, keep in mind that the last
- pixel you can draw to is at x0() + width() - 1.
- */
-class Rect2D {
-private:
-    Vector2 min, max;
-
-    /**
-     Returns true if the whole polygon is clipped.
-     @param p Value of the point
-     @param axis Index [0 or 1] of the axis to clip along?
-     @param clipGreater Are we clipping greater than or less than the line?
-     @param inPoly Polygon being clipped
-     @param outPoly The clipped polygon
-     */
-    template
-    static bool clipSide2D(
-        const float p, bool clipGreater, int axis, 
-        const Array& inPoly, Array& outPoly) {
-
-        outPoly.clear();
-        int i0 = -1;
-
-        Vector2 pt1;
-        bool c1 = true;
-
-        float negate = clipGreater ? -1 : 1;
-
-        // Find a point that is not clipped
-        for (i0 = 0; (i0 < inPoly.length()) && c1; ++i0) {
-            pt1 = inPoly[i0];       
-            c1  = (negate * pt1[axis]) < (negate * p);
-        }
-
-        // We incremented i0 one time to many
-        --i0;
-
-        if (c1) {
-            // We could not find an unclipped point
-            return true;
-        }
-
-        outPoly.append(pt1);
-
-        // for each point in inPoly,
-        //     if the point is outside the side and the previous one was also outside, continue
-        //     if the point is outside the side and the previous one was inside, cut the line
-        //     if the point is inside the side and the previous one was also inside, append the points
-        //     if the point is inside the side and the previous one was outside, cut the line    
-        for (int i = 1; i <= inPoly.length(); ++i) {
-            T pt2 = inPoly[(i + i0) % inPoly.length()];
-            bool    c2  = (negate * pt2[axis]) < (negate * p);
-
-            if (c1 ^ c2) {
-
-                if (!c1 && c2 && (i > 1)) {
-                    // Unclipped to clipped trasition and not the first iteration
-                    outPoly.append(pt1);
-                }
-
-                // only one point is clipped, find where the line crosses the clipping plane
-
-
-                float alpha;
-                if (pt2[axis] == pt1[axis]) {
-                    alpha = 0;
-                } else {
-                    alpha = (p - pt1[axis]) / (pt2[axis] - pt1[axis]);
-                }
-                outPoly.append(pt1.lerp(pt2, alpha));
-            } else if (! (c1 || c2) && (i != 1)) {
-                // neither point is clipped (don't do this the first time 
-                // because we appended the first pt before the loop)
-                outPoly.append(pt1);
-            }
-        
-            pt1 = pt2;
-            c1 = c2;
-        }
-
-        return false;
-    }
-
-public:
-
-    inline Rect2D() : min(0, 0), max(0, 0) {}
-
-    /** Creates a rectangle at 0,0 with the given width and height*/
-    inline Rect2D(const Vector2& wh) : min(0, 0), max(wh.x, wh.y) {}
-
-    /** Computes a rectangle that contains both @a a and @a b.  
-        Note that even if @a or @b has zero area, its origin will be included.*/
-    inline Rect2D(const Rect2D& a, const Rect2D& b) {
-        min = a.min.min(b.min);
-        max = a.max.max(b.max);
-    }
-
-    /** @brief Uniformly random point on the interior */
-    inline Vector2 randomPoint() const {
-        return Vector2(uniformRandom(0, max.x - min.x) + min.x,
-                       uniformRandom(0, max.y - min.y) + min.y);
-    }
-
-    inline float width() const {
-        return max.x - min.x;
-    }
-
-    inline float height() const {
-        return max.y - min.y;
-    }
-
-    inline float x0() const {
-        return min.x;
-    }
-
-    inline float x1() const {
-        return max.x;
-    }
-
-    inline float y0() const {
-        return min.y;
-    }
-
-    inline float y1() const {
-        return max.y;
-    }
-
-    /** Min, min corner */
-    inline Vector2 x0y0() const {
-        return min;
-    }
-
-    inline Vector2 x1y0() const {
-        return Vector2(max.x, min.y);
-    }
-
-    inline Vector2 x0y1() const {
-        return Vector2(min.x, max.y);
-    }
-
-    /** Max,max corner */
-    inline Vector2 x1y1() const {
-        return max;
-    }
-
-    /** Width and height */
-    inline Vector2 wh() const {
-        return max - min;
-    }
-
-    inline Vector2 center() const {
-        return (max + min) * 0.5;
-    }
-
-    inline static Rect2D xyxy(float x0, float y0, float x1, float y1) {
-        Rect2D r;
-        
-        r.min.x = G3D::min(x0, x1);
-        r.min.y = G3D::min(y0, y1);
-        r.max.x = G3D::max(x0, x1);
-        r.max.y = G3D::max(y0, y1);
-
-        return r;
-    }
-
-    Rect2D lerp(const Rect2D& other, float alpha) const {
-        Rect2D out;
-        
-        out.min = min.lerp(other.min, alpha);
-        out.max = max.lerp(other.max, alpha);
-
-        return out;
-    }
-
-    inline static Rect2D xyxy(const Vector2& v0, const Vector2& v1) {
-        Rect2D r;
-
-        r.min = v0.min(v1);
-        r.max = v0.max(v1);
-
-        return r;
-    }
-
-    inline static Rect2D xywh(float x, float y, float w, float h) {
-        return xyxy(x, y, x + w, y + h);
-    }
-
-    inline static Rect2D xywh(const Vector2& v, const Vector2& w) {
-        return xyxy(v.x, v.y, v.x + w.x, v.y + w.y);
-    }
-
-    inline bool contains(const Vector2& v) const {
-        return (v.x >= min.x) && (v.y >= min.y) && (v.x <= max.x) && (v.y <= max.y);
-    }
-
-    inline bool contains(const Rect2D& r) const {
-        return (min.x <= r.min.x) && (min.y <= r.min.y) &&
-               (max.x >= r.max.x) && (max.y >= r.max.y);
-    }
-
-    /** True if there is non-zero area to the intersection between @a this and @a r.
-        Note that two rectangles that are adjacent do not intersect because there is
-        zero area to the overlap, even though one of them "contains" the corners of the other.*/
-    inline bool intersects(const Rect2D& r) const {
-        return (min.x < r.max.x) && (min.y < r.max.y) &&
-               (max.x > r.min.x) && (max.y > r.min.y);
-    }
-
-    /** Like intersection, but counts the adjacent case as touching. */
-    inline bool intersectsOrTouches(const Rect2D& r) const {
-        return (min.x <= r.max.x) && (min.y <= r.max.y) &&
-               (max.x >= r.min.x) && (max.y >= r.min.y);
-    }
-
-    inline Rect2D operator*(float s) const {
-        return xyxy(min.x * s, min.y * s, max.x * s, max.y * s);
-    }
-
-    inline Rect2D operator/(float s) const {
-        return xyxy(min / s, max / s);
-    }
-
-    inline Rect2D operator/(const Vector2& s) const {
-        return xyxy(min / s, max / s);
-    }
-
-    inline Rect2D operator+(const Vector2& v) const {
-        return xyxy(min + v, max + v);
-    }
-
-    inline Rect2D operator-(const Vector2& v) const {
-        return xyxy(min - v, max - v);
-    }
-
-    inline bool operator==(const Rect2D& other) const {
-        return (min == other.min) && (max == other.max);
-    }
-
-    inline bool operator!=(const Rect2D& other) const {
-        return (min != other.min) || (max != other.max);
-    }
-
-    /** Returns the corners in the order: (min,min), (max,min), (max,max), (min,max). */
-    inline Vector2 corner(int i) const {
-        debugAssert(i >= 0 && i < 4);
-        switch (i & 3) {
-        case 0:
-            return Vector2(min.x, min.y);
-        case 1:
-            return Vector2(max.x, min.y);
-        case 2:
-            return Vector2(max.x, max.y);
-        case 3:
-            return Vector2(min.x, max.y);
-        default:
-            // Should never get here
-            return Vector2(0, 0);
-        }
-    }
-
-
-    /** @deprecated  
-     @sa expand() */
-    inline Rect2D border(float delta) const {
-        return Rect2D::xywh(x0() + delta, 
-                     y0() + delta, 
-                     width() - 2.0f * delta, 
-                     height() - 2.0f * delta);
-    }
-
-    /** Returns a new Rect2D that is bigger/smaller by the specified amount 
-        (negative is shrink.) */
-    inline Rect2D expand(float delta) const {
-        float newX = x0() - delta;
-        float newY = y0() - delta;
-        float newW = width() + 2.0f * delta;
-        float newH = height() + 2.0f * delta;
-
-        if (newW < 0.0f) {
-            newX = (x0() + width()) / 2.0f;
-            newW = 0.0f;
-        }
-
-        if (newH < 0.0f) {
-            newY = (y0() + height()) / 2.0f;
-            newH = 0.0f;
-        }
-        return Rect2D::xywh(newX, newY, newW, newH);
-    }
-
-    /** 
-     Clips so that the rightmost point of the outPoly is at rect.x1 (e.g. a 800x600 window produces
-     rightmost point 799, not 800).  The results are suitable for pixel rendering if iRounded.
-     Templated so that it will work for Vector2,3,4 (the z and w components are interpolated linearly).
-     The template parameter must define T.lerp and contain x and y components.
-
-     If the entire polygon is clipped by a single side, the result will be empty.
-     The result might also have zero area but not be empty.
-     */
-    template
-    void clip(const Array& inPoly, Array& outPoly) const {
-
-        const bool greaterThan = true;
-        const bool lessThan    = false;
-        const int  X = 0;
-        const int  Y = 1;
-
-        Array temp;
-
-        bool entirelyClipped =
-          clipSide2D(x0(), lessThan,    X,    inPoly,  temp)    ||
-          clipSide2D(x1(), greaterThan, X,    temp,    outPoly) ||
-          clipSide2D(y0(), lessThan,    Y,    outPoly, temp)    || 
-          clipSide2D(y1(), greaterThan, Y,    temp,    outPoly);
-
-        if (entirelyClipped) {
-            outPoly.clear();
-        }
-    }
-
-
-    /** Returns the largest, centered Rect2D that can fit inside this
-        while maintaining the aspect ratio of x:y.  Convenient for
-        displaying images in odd-shaped windows.
-    */
-    Rect2D largestCenteredSubRect(float ww, float hh) const {
-        float textureAspect = hh / ww;
-        float viewAspect = height() / width();
-
-        if (viewAspect > textureAspect) {
-            // The view is too tall
-            float h = width() * textureAspect;
-            float y = (height() - h) / 2;
-            return Rect2D::xywh(0, y, width(), h) + corner(0);
-        } else {
-            // The view is too wide
-            float w = height() / textureAspect;
-            float x = (width() - w) / 2;
-            return Rect2D::xywh(x, 0, w, height()) + corner(0);
-        }
-    }
-
-    /**
-     Returns the overlap region between the two rectangles.  This may have zero area
-     if they do not intersect.  See the two-Rect2D constructor for a way to compute
-     a union-like rectangle.
-     */
-    Rect2D intersect(const Rect2D& other) const {
-        if (intersects(other)) {
-            return Rect2D::xyxy(min.max(other.min), max.min(other.max));
-        }else{
-            return Rect2D::xywh(0, 0, 0, 0);
-        }
-    }
-
-    float area() const {
-        return width() * height();
-    }
-};
-
-typedef Rect2D AABox2D;
-}
-
-#endif
diff --git a/externals/g3dlite/G3D.lib/include/G3D/ReferenceCount.h b/externals/g3dlite/G3D.lib/include/G3D/ReferenceCount.h
deleted file mode 100644
index f55a22be0e1..00000000000
--- a/externals/g3dlite/G3D.lib/include/G3D/ReferenceCount.h
+++ /dev/null
@@ -1,597 +0,0 @@
-/**
-  @file ReferenceCount.h
-
-  Reference Counting Garbage Collector for C++
-
-  @maintainer Morgan McGuire, matrix@graphics3d.com
-  @cite Adapted and extended from Justin Miller's "RGC" class that appeared in BYTE magazine.
-  @cite See also http://www.jelovic.com/articles/cpp_without_memory_errors_slides.htm
-
-  @created 2001-10-23
-  @edited  2008-09-25
-*/
-
-#ifndef G3D_RGC_H
-#define G3D_RGC_H
-
-#include "G3D/platform.h"
-#include "G3D/debug.h"
-#include "G3D/AtomicInt32.h"
-
-namespace G3D {
-
-/** Base class for WeakReferenceCountedPointer */
-class _WeakPtr {
-public:
-    inline virtual ~_WeakPtr() {}
-
-protected:
-    friend class ReferenceCountedObject;
-
-    /** Called by ReferenceCountedObject to tell a weak pointer that its underlying object was collected. */
-    virtual void objectCollected() = 0;
-};
-
-/** Used internally by ReferenceCountedObject */
-class _WeakPtrLinkedList {
-public:
-    _WeakPtr*                   weakPtr;
-    _WeakPtrLinkedList*         next;
-
-    inline _WeakPtrLinkedList() : weakPtr(NULL), next(NULL) {}
-
-    /** Inserts this node into the head of the list that previously had n as its head. */
-    inline _WeakPtrLinkedList(_WeakPtr* p, _WeakPtrLinkedList* n) : weakPtr(p), next(n) {}
-};
-
-/**
- Objects that are reference counted inherit from this.  Subclasses 
- must have a public destructor (the default destructor is fine)
- and publicly inherit ReferenceCountedObject.
-
- Multiple inheritance from a reference counted object is dangerous-- use 
- at your own risk.
-
- ReferenceCountedPointer and ReferenceCountedObject are threadsafe.
- You can create and drop references on multiple threads without
- violating integrity.  WeakReferenceCountedPointer is not
- threadsafe.  Introducing a weak pointer destroys all thread safety,
- even for strong pointers to the same object (this is inherent in the
- design of the class; we cannot fix it without slowing down the
- performance of reference counted objects.)
-
- Usage Example
-
-  
-
-class Foo : public G3D::ReferenceCountedObject {
-public:
-    int x;
-};
-
-class Bar : public Foo {};
-
-typedef G3D::ReferenceCountedPointer FooRef;
-typedef G3D::WeakReferenceCountedPointer WeakFooRef;
-typedef G3D::ReferenceCountedPointer BarRef;
-
-
-int main(int argc, char *argv[]) {
-
-    WeakFooRef x;
-
-    {
-        FooRef a = new Foo();
-
-        // Reference count == 1
-
-        x = a;
-        // Weak references do not increase count
-
-        {
-            FooRef b = a;
-            // Reference count == 2
-        }
-
-        // Reference count == 1
-    }
-    // No more strong references; object automatically deleted.
-    // x is set to NULL automatically.
-
-    // Example of using dynamic cast on reference counted objects
-    BarRef b = new Bar();
-
-    // No cast needed to go down the heirarchy.
-    FooRef f = b;
-
-    // We can't cast the reference object because it is a class.
-    // Instead we must extract the pointer and cast that:
-    b = dynamic_cast(&*f);
-
-    return 0;
-}
-

-
-@deprecated To be replaced by boost::shared_ptr in 7.0
- */
-class ReferenceCountedObject {
-public:
-
-    /**
-     The long name is to keep this from accidentally conflicting with
-     a subclass's variable name.  Do not use or explicitly manipulate
-     this value--its type may change in the future and is not part
-     of the supported API.
-     */
-    AtomicInt32                 ReferenceCountedObject_refCount;
- 
-    /**
-     Linked list of all weak pointers that reference this (some may be
-     on the stack!).  Do not use or explicitly manipulate this value.
-     */
-    _WeakPtrLinkedList*         ReferenceCountedObject_weakPointer;
-
-protected:
-
-    ReferenceCountedObject() : 
-        ReferenceCountedObject_refCount(0), 
-        ReferenceCountedObject_weakPointer(0) {
-
-        debugAssertM(isValidHeapPointer(this), 
-            "Reference counted objects must be allocated on the heap.");
-    }
-
-public:
-
-    /** Automatically called immediately before the object is deleted. 
-        This is not called from the destructor because it needs to be invoked
-        before the subclass destructor.
-      */
-    void ReferenceCountedObject_zeroWeakPointers() {
-        // Tell all of my weak pointers that I'm gone.
-        
-        _WeakPtrLinkedList* node = ReferenceCountedObject_weakPointer;
-
-        while (node != 0) {
-
-            // Notify the weak pointer that it is going away
-            node->weakPtr->objectCollected();
-
-            // Free the node and advance
-            _WeakPtrLinkedList* tmp = node;
-            node = node->next;
-            delete tmp;
-        }
-    }
-
-    virtual ~ReferenceCountedObject() {}
-
-
-    /**
-      Note: copies will initially start out with 0 
-      references and 0 weak references like any other object.
-     */
-    ReferenceCountedObject(const ReferenceCountedObject& notUsed) : 
-        ReferenceCountedObject_refCount(0),
-        ReferenceCountedObject_weakPointer(0) {
-        (void)notUsed;
-        debugAssertM(G3D::isValidHeapPointer(this), 
-            "Reference counted objects must be allocated on the heap.");
-    }
-
-    ReferenceCountedObject& operator=(const ReferenceCountedObject& other) {
-        (void)other;
-        // Nothing changes when I am assigned; the reference count on
-        // both objects is the same (although my super-class probably
-        // changes).
-        return *this;
-    }
-};
-
-
-
-/**
- Use ReferenceCountedPointer in place of T* in your program.
- T must subclass ReferenceCountedObject.
-@deprecated To be replaced by boost::shared_ptr in 7.0
- */
-template 
-class ReferenceCountedPointer {
-private:
-
-    T*           m_pointer;
-
-public:
-    typedef T element_type;
-
-    inline T* pointer() const {
-        return m_pointer;
-    }
-
-private:
-
-    /** Nulls out the pointer and drops a reference. If the reference
-        count hits zero. */
-    void zeroPointer() {
-        if (m_pointer != NULL) {
-
-            debugAssert(G3D::isValidHeapPointer(m_pointer));
-            debugAssertM(m_pointer->ReferenceCountedObject_refCount.value() > 0,
-                        "Dangling reference detected.");
-
-            // Only delete if this instance caused the count to hit
-            // exactly zero.  If there is a race condition, the value
-            // may be zero after decrement returns, but only one of
-            // the instances will get a zero return value.
-            if (m_pointer->ReferenceCountedObject_refCount.decrement() == 0) {
-                // We held the last reference, so delete the object.
-                // This test is threadsafe because there is no way for
-                // the reference count to increase after the last
-                // reference was dropped (assuming the application does
-                // not voilate the class abstraction).
-                //debugPrintf("  delete 0x%x\n", m_pointer);
-
-                // We must zero the weak pointers *before* deletion in case there
-                // are cycles of weak references.
-                // Note that since there are no strong references at this point,
-                // it is perfectly fair to zero the weak pointers anyway.
-                m_pointer->ReferenceCountedObject_zeroWeakPointers();
-                delete m_pointer;
-            }
-
-            m_pointer = NULL;
-        }
-    }
-
-    /** Non-atomic (except for the referencec increment).  Can only be
-        called in contexts like the copy constructor or initial
-        constructor where it is known that the reference count will
-        not hit zero on some other thread. */
-    void setPointer(T* x) {
-        if (x != m_pointer) {
-            zeroPointer();
-
-            if (x != NULL) {
-                debugAssert(G3D::isValidHeapPointer(x));
-
-		        m_pointer = x;
-
-                // Note that the ref count can be zero if this is the
-                // first pointer to it
-                debugAssertM(m_pointer->ReferenceCountedObject_refCount.value() >= 0, 
-                             "Negative reference count detected.");
-                m_pointer->ReferenceCountedObject_refCount.increment();
-            }
-        }
-    }
-
-public:      
-
-    inline ReferenceCountedPointer() : m_pointer(NULL) {}
-
-    /**
-      Allow silent cast to the base class.
-    
-      
-        SubRef  s = new Sub();
-        BaseRef b = s;
-      

-
-      i.e., compile-time subtyping rule 
-      RCP<T> <: RCP<S> if T <: S
-     */
-    template 
-    inline ReferenceCountedPointer(const ReferenceCountedPointer& p) : 
-        m_pointer(NULL) {
-        setPointer(p.pointer());
-    }
-
-#   if (! defined(MSC_VER) || (MSC_VER >= 1300))
-    /**
-      Explicit cast to a subclass.  Acts like dynamic cast; the result will be NULL if
-      the cast cannot succeed.  Not supported on VC6.
-      
-        SubRef  s = new Sub();
-        BaseRef b = s;
-        s = b.downcast();   // Note that the template argument is the object type, not the pointer type.
-      

-      */
-    template 
-    ReferenceCountedPointer downcast() {
-        return ReferenceCountedPointer(dynamic_cast(m_pointer));
-    }
-
-    template 
-    const ReferenceCountedPointer downcast() const {
-        return ReferenceCountedPointer(dynamic_cast(m_pointer));
-    }
-#   endif
-
-    // We need an explicit version of the copy constructor as well or 
-    // the default copy constructor will be used.
-    inline ReferenceCountedPointer(const ReferenceCountedPointer& p) : m_pointer(NULL) {
-        setPointer(p.m_pointer);
-    }
-
-    /** Allows construction from a raw pointer.  That object will thereafter be
-        reference counted -- do not call delete on it. */
-    inline ReferenceCountedPointer(T* p) : m_pointer(NULL) { 
-        setPointer(p); 
-    }
-    
-    inline ~ReferenceCountedPointer() {
-        zeroPointer();
-    }
-  
-    inline size_t hashCode() const {
-        return reinterpret_cast(m_pointer);;
-    }
-
-    inline const ReferenceCountedPointer& operator=(const ReferenceCountedPointer& p) {
-        setPointer(p.m_pointer);
-        return *this;
-    }
-
-    inline ReferenceCountedPointer& operator=(T* p) {
-        setPointer(p);
-        return *this;
-    }
-
-    inline bool operator==(const ReferenceCountedPointer& y) const { 
-        return (m_pointer == y.m_pointer); 
-    }
-
-    inline bool operator!=(const ReferenceCountedPointer& y) const { 
-        return (m_pointer != y.m_pointer); 
-    }
-
-    bool operator < (const ReferenceCountedPointer& y) const {
-        return (m_pointer < y.m_pointer); 
-    }
-    
-    bool operator > (const ReferenceCountedPointer& y) const {
-        return (m_pointer > y.m_pointer); 
-    }
-    
-    bool operator <= (const ReferenceCountedPointer& y) const {
-        return (m_pointer <= y.m_pointer); 
-    }
-    
-    bool operator >= (const ReferenceCountedPointer& y) const {
-        return (m_pointer >= y.m_pointer); 
-    }
-    
-    inline T& operator*() const {
-        debugAssertM(m_pointer != NULL, "Dereferenced a NULL ReferenceCountedPointer");
-        return (*m_pointer);
-    }
-
-    inline T* operator->() const {
-        debugAssertM(m_pointer != NULL, "Dereferenced a NULL ReferenceCountedPointer");
-        return m_pointer;
-    }
-
-    inline bool isNull() const {
-        return (m_pointer == NULL);
-    }
-
-    inline bool notNull() const {
-        return (m_pointer != NULL);
-    }
-
-    // TODO: distinguish between last strong and last any pointer
-    /**
-     Returns true if this is the last reference to an object.
-     Useful for flushing memoization caches-- a cache that holds the last
-     reference is unnecessarily keeping an object alive.
-
-     Not threadsafe.
-
-     @deprecated Use WeakReferenceCountedPointer for caches
-     */
-    inline int isLastReference() const {
-        return (m_pointer->ReferenceCountedObject_refCount.value() == 1);
-    }
-};
-
-
-/**
- A weak pointer allows the object it references to be garbage collected.
- Weak pointers are commonly used in caches, where it is important to hold
- a pointer to an object without keeping that object alive solely for the
- cache's benefit (i.e., the object can be collected as soon as all
- pointers to it outside the cache are gone).  They are also convenient
- for adding back-pointers in tree and list structures.
-
- Weak pointers may become NULL at any point (when their target is collected).
- Therefore the only way to reference the target is to convert to a strong
- pointer and then check that it is not NULL.
-
-@deprecated To be replaced by boost::weak_ptr in 7.0
- */
-template 
-class WeakReferenceCountedPointer : public _WeakPtr {
-private:
-
-    /** NULL if the object has been collected. */
-    T*          pointer;
-
-public:
-    /**
-      Creates a strong pointer, which prevents the object from being
-      garbage collected.  The strong pointer may be NULL, which means
-      that the underlying.
-      */
-    //  There is intentionally no way to check if the
-    //  WeakReferenceCountedPointer has a null reference without
-    //  creating a strong pointer since there is no safe way to use
-    //  that information-- the pointer could be collected by a
-    //  subsequent statement.
-    ReferenceCountedPointer createStrongPtr() const {
-        // TODO: What if the object's destructor is called while we
-        // are in this method?
-        return ReferenceCountedPointer(pointer);
-    }
-
-
-private:
-
-    /** 
-        Thread issues: safe because this is only called when another
-        object is guaranteed to keep p alive for the duration of this
-        call.
-     */
-    void setPointer(T* p) {
-        // TODO: must prevent the object from being collected while in
-        // this method
-
-        zeroPointer();
-        pointer = p;
-
-        if (pointer != 0) {
-            // TODO: threadsafe: must update the list atomically
-
-            // Add myself to the head of my target's list of weak pointers
-            _WeakPtrLinkedList* head = 
-                new _WeakPtrLinkedList
-                (this, 
-                 pointer->ReferenceCountedObject_weakPointer);
-
-            pointer->ReferenceCountedObject_weakPointer = head;
-        } else {
-
-        }
-    }
-
-
-    /** 
-        Removes this from its target's list of weak pointers.  Called
-        when the weak pointer goes out of scope.
-
-        Thread issues: depends on the thread safety of createStrongPtr.
-     */
-    void zeroPointer() {
-        // Grab a strong reference to prevent the object from being collected while we
-        // are traversing its list.
-        ReferenceCountedPointer strong = createStrongPtr();
-
-        // If the following test fails then the object was collected before we
-        // reached it.
-        if (strong.notNull()) {
-            debugAssertM(pointer->ReferenceCountedObject_weakPointer != NULL,
-                "Weak pointer exists without a backpointer from the object.");
-            
-            // Remove myself from my target's list of weak pointers
-            _WeakPtrLinkedList** node = &pointer->ReferenceCountedObject_weakPointer;
-            while ((*node)->weakPtr != this) {
-                node = &((*node)->next);
-                debugAssertM(*node != NULL, 
-                    "Weak pointer exists without a backpointer from the object (2).");
-            }
-
-            // Node must now point at the node for me.  Remove node and
-            // close the linked list behind it.
-            _WeakPtrLinkedList* temp = *node;
-            *node = temp->next;
-            
-            // Now delete the node corresponding to me
-            delete temp;
-        }
-
-        pointer = NULL;
-    }
-
-public:
-
-    WeakReferenceCountedPointer() : pointer(0) {}
-
-    /**
-      Allow compile time subtyping rule 
-      RCP<T> <: RCP<S> if T <: S
-     */
-    template 
-    inline WeakReferenceCountedPointer(const WeakReferenceCountedPointer& p) : pointer(0) {
-        // Threadsafe: the object cannot be collected while the other pointer exists.
-        setPointer(p.pointer);
-    }
-
-    template 
-    inline WeakReferenceCountedPointer(const ReferenceCountedPointer& p) : pointer(0) {
-        // Threadsafe: the object cannot be collected while the other
-        // pointer exists.
-        setPointer(p.pointer());
-    }
-
-    // Gets called a *lot* when weak pointers are on the stack
-    WeakReferenceCountedPointer(
-        const WeakReferenceCountedPointer& weakPtr) : pointer(0) {
-        setPointer(weakPtr.pointer);
-    }
-
-    WeakReferenceCountedPointer(
-        const ReferenceCountedPointer& strongPtr) : pointer(0) {
-        setPointer(strongPtr.pointer());
-    }
-
-    ~WeakReferenceCountedPointer() {
-        zeroPointer();
-    }
-
-    WeakReferenceCountedPointer& operator=(const WeakReferenceCountedPointer& other) {
-        // Threadsafe: the object cannot be collected while the other pointer exists.
-
-        // I now point at other's target
-        setPointer(other.pointer);
-
-        return *this;
-    }
-
-    WeakReferenceCountedPointer& operator=(const ReferenceCountedPointer& other) {
-
-        // Threadsafe: the object cannot be collected while the other pointer exists.
-
-        // I now point at other's target
-        setPointer(other.pointer());
-
-        return *this;
-    }
-
-    bool operator==(const WeakReferenceCountedPointer& other) const {
-        return pointer == other.pointer;
-    }
-
-    bool operator!=(const WeakReferenceCountedPointer& other) const {
-        return pointer != other.pointer;
-    }
-
-    bool operator < (const WeakReferenceCountedPointer& y) const {
-        return (pointer < y.pointer); 
-    }
-
-    bool operator > (const WeakReferenceCountedPointer& y) const {
-        return (pointer > y.pointer); 
-    }
-    
-    bool operator <= (const WeakReferenceCountedPointer& y) const {
-        return (pointer <= y.pointer); 
-    }
-    
-    bool operator >= (const ReferenceCountedPointer& y) const {
-        return (pointer >= y.pointer); 
-    }
-    
-protected:
-
-    /** Invoked by the destructor on ReferenceCountedPointer. */
-    virtual void objectCollected() {
-        debugAssertM(pointer != NULL,
-                     "Removed a weak pointer twice.");
-        pointer = NULL;
-    }
-
-};
-
-} // namespace
-
-#endif
-
diff --git a/externals/g3dlite/G3D.lib/include/G3D/RegistryUtil.h b/externals/g3dlite/G3D.lib/include/G3D/RegistryUtil.h
deleted file mode 100644
index 4b47be5f4bd..00000000000
--- a/externals/g3dlite/G3D.lib/include/G3D/RegistryUtil.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/**
- @file RegistryUtil.h
-
- @created 2006-04-06
- @edited  2006-04-06
-
- Copyright 2000-2006, Morgan McGuire.
- All rights reserved.
-*/
-
-#ifndef G3D_REGISTRYUTIL_H
-#define G3D_REGISTRYUTIL_H
-
-#include "G3D/platform.h"
-#include "G3D/g3dmath.h"
-
-// This file is only used on Windows
-#ifdef G3D_WIN32
-
-#include 
-
-namespace G3D {
-
-/** 
-    Provides generalized Windows registry querying.
-
-    All key names are one string in the format:
-        "[base key]\[sub-keys]"
-
-    A value must now be provided for every query.
-    An empty value string will use the (Default) value.
-
-    [base key] can be any of the following:
-        HKEY_CLASSES_ROOT
-        HKEY_CURRENT_CONFIG
-        HKEY_CURRENT_USER
-        HKEY_LOCAL_MACHINE
-        HKEY_PERFORMANCE_DATA
-        HKEY_PERFORMANCE_NLSTEXT
-        HKEY_PERFORMANCE_TEXT
-        HKEY_USERS
-
-    valueExists() should be used to validate a key+value before reading or writing
-    to ensure that a debug assert or false return is for a different error during 
-    reads and writes.
-
-    All read and write calls will assert when a key will not open for reasons other
-    that it does not exist. All read and write calls will assert when the value cannot
-    be read or written for any reason.
-*/
-class RegistryUtil {
-
-public:
-    /** returns true if the key exists and the current user has permission to read */
-    static bool keyExists(const std::string& key);
-
-    /** returns true if the key exists and the current user has permission to read */
-    static bool valueExists(const std::string& key, const std::string& value);
-
-    /** returns false if the key could not be read for any reason. */
-    static bool readInt32(const std::string& key, const std::string& value, int32& data);
-
-    /** 
-      Reads an arbitrary amount of data from a binary registry key.
-      returns false if the key could not be read for any reason.
-    
-      @beta
-      @param data pointer to the output buffer of sufficient size. Pass NULL as data in order to have available data size returned in dataSize.
-      @param dataSize size of the output buffer.  When NULL is passed for data, contains the size of available data on successful return.
-    */
-    static bool readBytes(const std::string& key, const std::string& value, uint8* data, uint32& dataSize);
-
-    /** returns false if the key could not be read for any reason. */
-    static bool readString(const std::string& key, const std::string& value, std::string& data);
-
-    /** returns false if the key could not be written for any reason. */
-    static bool writeInt32(const std::string& key, const std::string& value, int32 data);
-
-    /** 
-      Writes an arbitrary amount of data to a binary registry key.
-      returns false if the key could not be written for any reason.
-    
-      @param data pointer to the input buffer
-      @param dataSize size of the input buffer that should be written
-    */
-    static bool writeBytes(const std::string& key, const std::string& value, const uint8* data, uint32 dataSize);
-
-    /** returns false if the key could not be written for any reason. */
-    static bool writeString(const std::string& key, const std::string& value, const std::string& data);
-
-};
-
-} // namespace G3D
-
-#endif // G3D_WIN32
-
-#endif // G3D_REGISTRYTUIL_H
diff --git a/externals/g3dlite/G3D.lib/include/G3D/Set.h b/externals/g3dlite/G3D.lib/include/G3D/Set.h
deleted file mode 100644
index 629d802cdd4..00000000000
--- a/externals/g3dlite/G3D.lib/include/G3D/Set.h
+++ /dev/null
@@ -1,160 +0,0 @@
-/**
-  @file Set.h
-
-  Hash set
-
-  @maintainer Morgan McGuire, matrix@graphics3d.com
-
-  @created 2001-12-09
-  @edited  2006-02-20
- */
-
-#ifndef G3D_SET_H
-#define G3D_SET_H
-
-#include "G3D/platform.h"
-#include "G3D/Table.h"
-#include 
-#include 
-
-namespace G3D {
-
-/**
-  An unordered data structure that has at most one of each element.
-  Provides O(1) time insert, remove, and member test (contains).
-
-  Set uses G3D::Table internally, which means that the template type T 
-  must define a hashCode and operator== function.  See G3D::Table for 
-  a discussion of these functions.
- */
-// There is not copy constructor or assignment operator defined because
-// the default ones are correct for Set.
-template 
-class Set {
-
-    /**
-     If an object is a member, it is contained in
-     this table.
-     */
-    Table memberTable;
-
-public:
-
-    virtual ~Set() {}
-
-    int size() const {
-        return (int)memberTable.size();
-    }
-
-    bool contains(const T& member) const {
-        return memberTable.containsKey(member);
-    }
-
-    /**
-     Inserts into the table if not already present.
-     */
-    void insert(const T& member) {
-        memberTable.set(member, true);
-    }
-
-    /**
-     It is an error to remove members that are not already
-     present.
-     */
-    void remove(const T& member) {
-        memberTable.remove(member);  
-    }
-
-    Array getMembers() const {
-        return memberTable.getKeys();
-    }
-
-    void getMembers(Array& keyArray) const {
-        memberTable.getKeys(keyArray);
-    }
-
-    void clear() {
-        memberTable.clear();
-    }
-
-    void deleteAll()  {
-        getMembers().deleteAll();
-        clear();
-    }
-
-    /**
-     C++ STL style iterator variable.  See begin().
-     */
-    class Iterator {
-    private:
-        friend class Set;
-
-        // Note: this is a Table iterator, we are currently defining
-        // Set iterator
-        typename Table::Iterator it;
-
-        Iterator(const typename Table::Iterator& it) : it(it) {}
-
-    public:
-        inline bool operator!=(const Iterator& other) const {
-            return !(*this == other);
-        }
-
-        bool operator==(const Iterator& other) const {
-            return it == other.it;
-        }
-
-        /**
-         Pre increment.
-         */
-        Iterator& operator++() {
-            ++it;
-            return *this;
-        }
-
-        /**
-         Post increment (slower than preincrement).
-         */
-        Iterator operator++(int) {
-            Iterator old = *this;
-            ++(*this);
-            return old;
-        }
-
-        const T& operator*() const {
-            return it->key;
-        }
-
-        T* operator->() const {
-            return &(it->key);
-        }
-
-        operator T*() const {
-            return &(it->key);
-        }
-    };
-
-
-    /**
-     C++ STL style iterator method.  Returns the first member.  
-     Use preincrement (++entry) to get to the next element.  
-     Do not modify the set while iterating.
-     */
-    Iterator begin() const {
-        return Iterator(memberTable.begin());
-    }
-
-
-    /**
-     C++ STL style iterator method.  Returns one after the last iterator
-     element.
-     */
-    const Iterator end() const {
-        return Iterator(memberTable.end());
-    }
-};
-
-}
-
-#endif
-
diff --git a/externals/g3dlite/G3D.lib/include/G3D/Sphere.h b/externals/g3dlite/G3D.lib/include/G3D/Sphere.h
deleted file mode 100644
index 7d4c412185d..00000000000
--- a/externals/g3dlite/G3D.lib/include/G3D/Sphere.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/**
- @file Sphere.h
- 
- Sphere class
- 
- @maintainer Morgan McGuire, matrix@graphics3d.com
- 
- @created 2001-06-02
- @edited  2008-10-07
- */
-
-#ifndef G3D_SPHERE_H
-#define G3D_SPHERE_H
-
-#include "G3D/platform.h"
-#include "G3D/Vector3.h"
-#include "G3D/Array.h"
-#include "G3D/Sphere.h"
-
-namespace G3D {
-
-/**
- Sphere.
- */
-class Sphere {
-private:
-
-    static int32     dummy;
-
-public:
-    Vector3          center;
-    float            radius;
-
-    Sphere() {
-        center = Vector3::zero();
-        radius = 0;
-    }
-
-    Sphere(class BinaryInput& b);
-    void serialize(class BinaryOutput& b) const;
-    void deserialize(class BinaryInput& b);
-
-    Sphere(
-        const Vector3&  center,
-        float           radius) {
-
-        this->center = center;
-        this->radius = radius;
-    }
-
-    virtual ~Sphere() {}
-
-    bool operator==(const Sphere& other) const {
-        return (center == other.center) && (radius == other.radius);
-    }
-
-    bool operator!=(const Sphere& other) const {
-        return !((center == other.center) && (radius == other.radius));
-    }
-
-    /**
-     Returns true if point is less than or equal to radius away from
-     the center.
-     */
-    bool contains(const Vector3& point) const;
-
-    /**
-       @deprecated Use culledBy(Array&)
-     */
-    bool culledBy(
-                  const class Plane*  plane,
-                  int                 numPlanes,
-                  int32&	      cullingPlaneIndex,
-                  const uint32        testMask,
-                  uint32&             childMask) const;
-    
-    /**
-       @deprecated Use culledBy(Array&)
-     */
-    bool culledBy(
-                  const class Plane*  plane,
-                  int                 numPlanes,
-                  int32&              cullingPlaneIndex = dummy,
-                  const uint32        testMask = 0xFFFFFFFF) const;
-
-    /**
-       See AABox::culledBy
-    */
-    bool culledBy(
-                  const Array&		plane,
-                  int32&					cullingPlaneIndex,
-                  const uint32  			testMask,
-                  uint32&                 childMask) const;
-    
-    /**
-     Conservative culling test that does not produce a mask for children.
-     */
-    bool culledBy(
-                  const Array&		plane,
-                  int32&					cullingPlaneIndex = dummy,
-                  const uint32  			testMask		  = 0xFFFFFFFF) const;
-
-    virtual std::string toString() const;
-
-    float volume() const;
-
-    float area() const;
-
-    /**
-     Uniformly distributed on the surface.
-     */
-    Vector3 randomSurfacePoint() const;
-
-    /**
-     Uniformly distributed on the interior (includes surface)
-     */
-    Vector3 randomInteriorPoint() const;
-
-    void getBounds(class AABox& out) const;
-
-    bool intersects(const Sphere& other) const;
-
-    /** Translates the sphere */
-    Sphere operator+(const Vector3& v) const {
-        return Sphere(center + v, radius);
-    }
-
-    /** Translates the sphere */
-    Sphere operator-(const Vector3& v) const {
-        return Sphere(center - v, radius);
-    }
-};
-
-}
-
-template <> struct HashTrait {
-    static size_t hashCode(const G3D::Sphere& key) { 
-        return static_cast(key.center.hashCode() + (key.radius * 13));
-    }
-};
-
-
-#endif
diff --git a/externals/g3dlite/G3D.lib/include/G3D/Spline.h b/externals/g3dlite/G3D.lib/include/G3D/Spline.h
deleted file mode 100644
index af9b08230b8..00000000000
--- a/externals/g3dlite/G3D.lib/include/G3D/Spline.h
+++ /dev/null
@@ -1,367 +0,0 @@
-/**
- @file Spline.h
-
- @author Morgan McGuire, morgan@cs.williams.edu
- */
-
-#ifndef G3D_SPLINE_H
-#define G3D_SPLINE_H
-
-#include "G3D/platform.h"
-#include "G3D/Array.h"
-#include "G3D/g3dmath.h"
-#include "G3D/Matrix4.h"
-#include "G3D/Vector4.h"
-
-namespace G3D {
-
-/** Common implementation code for all G3D::Spline template parameters */
-class SplineBase {
-public:
-
-    /** Times at which control points occur.  Must have the same
-        number of elements as Spline::control. */
-    Array            time;
-
-    /** If cyclic, then the control points will be assumed to wrap around.
-        If not cyclic, then the tangents at the ends of the spline
-        point to the final control points.*/
-    bool                    cyclic;
-
-    /** For a cyclic spline, this is the time elapsed between the last
-        control point and the first. If less than or equal to zero this is
-        assumed to be:
-
-        (time[0] - time[1] + .
-         time[time.size() - 1] - time[time.size() - 2]) / 2.
-    */
-    float                   finalInterval;
-    
-    SplineBase() : cyclic(true), finalInterval(-1) {}
-
-    virtual ~SplineBase() {}
-    
-    /** See specification for Spline::finalInterval; this handles the
-      non-positive case.  Returns 0 if not cyclic. */
-    float getFinalInterval() const;
-
-    /** Returns the amount of time covered by this spline in one
-        period.  For a cyclic spline, this contains the final
-        interval.*/
-    float duration() const;
-
-    /** Computes the derivative spline basis from the control point version. */
-    static Matrix4 computeBasis();
-    
-protected:
-
-    /** Assumes that t0 <= s < tn.  called by computeIndex. */
-    void computeIndexInBounds(float s, int& i, float& u) const;
-
-public:
-    
-    /**
-       Given a time @a s, finds @a i and 0 <= @a u < 1 such that
-       @s = time[@a i] * @a u + time[@a i + 1] * (1 - @a u).  Note that
-       @i may be outside the bounds of the time and control arrays;
-       use getControl to handle wraparound and extrapolation issues.
-       
-       This function takes expected O(1) time for control points with
-       uniform time sampled control points or for uniformly
-       distributed random time samples, but may take O( log time.size() ) time
-       in the worst case.
-
-       Called from evaluate().
-    */
-    void computeIndex(float s, int& i, float& u) const;
-};
-
-
-/**
- Smooth parameteric curve implemented using a piecewise 3rd-order
- Catmull-Rom spline curve.  The spline is considered infinite and may
- either continue linearly from the specified control points or cycle
- through them.  Control points are spaced uniformly in time at unit
- intervals by default, but irregular spacing may be explicitly
- specified.
-
- The dimension of the spline can be set by varying the Control
- template parameter.  For a 1D function, use Spline.  For a
- curve in the plane, Spline.  Note that any template
- parameter that supports operator+(Control) and operator*(float) can
- be used; you can make splines out of G3D::Vector4, G3D::Matrix3, or
- your own classes.
-
- To provide shortest-path interpolation, subclass G3D::Spline and
- override ensureShortestPath().  To provide normalization of
- interpolated points (e.g., projecting Quats onto the unit
- hypersphere) override correct().
-
- See Real Time Rendering, 2nd edition, ch 12 for a general discussion
- of splines and their properties.
-
- @sa G3D::UprightSpline, G3D::QuatSpline
- */
-template
-class Spline : public SplineBase {
-protected:
-    /** The additive identity control point. */
-    Control                 zero;
-
-public:
-
-    /** Control points. Must have the same number of elements as
-        Spline::time.*/
-    Array          control;
-
-    Spline() {
-        static Control x;
-        // Hide the fact from C++ that we are using an
-        // uninitialized variable here by pointer arithmetic.
-        // This is ok because any type that is a legal control
-        // point also supports multiplication by float.
-        zero = *(&x) * 0.0f;
-    }
-
-    /** Appends a control point at a specific time that must be
-        greater than that of the previous point. */
-    void append(float t, const Control& c) {
-        debugAssertM((time.size() == 0) || (t > time.last()), 
-                     "Control points must have monotonically increasing times.");
-        time.append(t);
-        control.append(c);
-        debugAssert(control.size() == time.size());
-    }
-
-
-    /** Appends control point spaced in time based on the previous
-        control point, or spaced at unit intervals if this is the
-        first control point. */
-    void append(const Control& c) {
-        switch (time.size()) {
-        case 0:
-            append(0, c);
-            break;
-
-        case 1:
-            if (time[0] == 0) {
-                append(1, c);
-            } else {
-                append(time[0], c);
-            }
-            break;
-
-        default:
-            append(2 * time[time.size() - 1] - time[time.size() - 2], c);
-        }
-        debugAssert(control.size() == time.size());
-    }
-
-    /** Erases all control points and times, but retains the state of 
-        cyclic and finalInterval.
-     */
-    void clear() {
-        control.clear();
-        time.clear();
-    }
-
-
-    /** Number of control points */
-    int size() const {
-        debugAssert(time.size() == control.size());
-        return control.size();
-    }
-    
-
-    /** Returns the requested control point and time sample based on
-        array index.  If the array index is out of bounds, wraps (for
-        a cyclic spline) or linearly extrapolates (for a non-cyclic
-        spline), assuming time intervals follow the first or last
-        sample recorded.
-
-        Calls correct() on the control point if it was extrapolated.
-
-        Returns 0 if there are no control points.
-
-        @sa Spline::control and Spline::time for the underlying
-        control point array; Spline::computeIndex to find the index
-        given a time.
-    */
-    void getControl(int i, float& t, Control& c) const {
-        int N = control.size();
-        if (N == 0) {
-            c = zero;
-            t = 0;
-        } else if (cyclic) {
-            c = control[iWrap(i, N)];
-
-            if (i < 0) {
-                // Wrapped around bottom
-
-                // Number of times we wrapped around the cyclic array
-                int wraps = (N + 1 - i) / N;                    
-                int j = (i + wraps * N) % N;
-                t = time[j] - wraps * duration();
-
-            } else if (i < N) {
-
-                t = time[i];
-
-            } else {
-                // Wrapped around top
-
-                // Number of times we wrapped around the cyclic array
-                int wraps = i / N;                    
-                int j = i % N;
-                t = time[j] + wraps * duration();
-            }
-
-        } else if (i < 0) {
-            // Are there enough points to extrapolate?
-            if (N >= 2) {
-                // Step away from control point 0
-                float dt = time[1] - time[0];
-                
-                // Extrapolate (note; i is negative)
-                c = control[1] * float(i) + control[0] * float(1 - i);
-                correct(c);
-                t = dt * i + time[0];
-
-            } else {
-                // Just clamp
-                c = control[0];
-
-                // Only 1 time; assume 1s intervals
-                t = time[0] + i;
-            }
-
-        } else if (i >= N) {
-            if (N >= 2) {
-                float dt = time[N - 1] - time[N - 2];
-
-                // Extrapolate
-                c = control[N - 1] * float(i - N + 2) + control[N - 2] * -float(i - N + 1);
-                correct(c);
-                t = time[N - 1] + dt * (i - N + 1);
-
-            } else {
-                // Return the last, clamping
-                c = control.last();
-                // Only 1 time; assume 1s intervals
-                t = time[0] + i;
-            }
-        } else {
-            // In bounds
-            c = control[i];
-            t = time[i];
-        }
-    }
-
-protected:
-
-    /** Returns a series of N control points and times, fixing
-        boundary issues.  The indices may be assumed to be treated
-        cyclically. */
-    void getControls(int i, float* T, Control* A, int N) const {
-        for (int j = 0; j < N; ++j) {
-            getControl(i + j, T[j], A[j]);
-        }
-        ensureShortestPath(A, N);
-    }
-
-    /**
-       Mutates the array of N control points. It is useful to override this
-       method by one that wraps the values if they are angles or quaternions
-       for which "shortest path" interpolation is significant.
-     */
-    virtual void ensureShortestPath(Control* A, int N) const {}
-
-    /** Normalize or otherwise adjust this interpolated Control. */
-    virtual void correct(Control& A) const {}
-
-public:
-   
-
-    /**
-       Return the position at time s.  The spline is defined outside
-       of the time samples by extrapolation or cycling.
-     */
-    Control evaluate(float s) const {
-        debugAssertM(control.size() == time.size(), "Corrupt spline: wrong number of control points.");
-
-        /*
-        @cite http://www.gamedev.net/reference/articles/article1497.asp 
-        Derivation of basis matrix follows.
-        
-        Given control points with positions p[i] at times t[i], 0 <= i <= 3, find the position 
-        at time t[1] <= s <= t[2].
-
-        Let u = s - t[0]
-        Let U = [u^0 u^1 u^2 u^3] = [1 u u^2 u^3]
-        Let dt0 = t[0] - t[-1]
-        Let dt1 = t[1] - t[0]
-        Let dt2 = t[2] - t[1]
-         */
-
-        // Index of the first control point (i.e., the u = 0 point)
-        int i = 0;
-        // Fractional part of the time
-        float u = 0;
-
-        computeIndex(s, i, u);
-
-        Control p[4];
-        float   t[4];
-        getControls(i - 1, t, p, 4);
-        float dt0 = t[1] - t[0];
-        float dt1 = t[2] - t[1];
-        float dt2 = t[3] - t[2];
-
-        static const Matrix4 basis = computeBasis();
-
-        // Powers of u
-        Vector4 uvec((float)(u*u*u), (float)(u*u), (float)u, 1.0f);
-
-        // Compute the weights on each of the control points.
-        const Vector4& weights = uvec * basis;
-        
-        // Compute the weighted sum of the neighboring control points.
-        Control sum;
-
-        const Control& p0 = p[0];
-        const Control& p1 = p[1];
-        const Control& p2 = p[2];
-        const Control& p3 = p[3];
-
-        const Control& dp0 = p1 + (p0*-1.0f);
-        const Control& dp1 = p2 + (p1*-1.0f);
-        const Control& dp2 = p3 + (p2*-1.0f);
-
-        // The factor of 1/2 from averaging two time intervals is 
-        // already factored into the basis
-        
-        // tan1 = (dp0 / dt0 + dp1 / dt1) * ((dt0 + dt1) * 0.5);
-        // The last term normalizes for unequal time intervals
-        float x = (dt0 + dt1) * 0.5f;
-        float n0 = x / dt0;
-        float n1 = x / dt1;
-        float n2 = x / dt2;
-        const Control& dp1n1 = dp1 * n1;
-        const Control& tan1 = dp0 * n0 + dp1n1;
-        const Control& tan2 = dp1n1 + dp2 * n2;
-
-        sum = 
-            tan1 * weights[0]+
-             p1  * weights[1] +
-             p2  * weights[2] +
-            tan2 * weights[3]; 
-            
-
-        correct(sum);
-        return sum;
-    }
-};
-
-}
-
-#endif
diff --git a/externals/g3dlite/G3D.lib/include/G3D/Stopwatch.h b/externals/g3dlite/G3D.lib/include/G3D/Stopwatch.h
deleted file mode 100644
index aee3b0f69c9..00000000000
--- a/externals/g3dlite/G3D.lib/include/G3D/Stopwatch.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/**
- @file Stopwatch.h
- 
- @maintainer Morgan McGuire, matrix@graphics3d.com
-  
- @created 2005-10-05
- @edited  2005-10-05
-
- Copyright 2000-2003, Morgan McGuire.
- All rights reserved.
- */
-
-#ifndef G3D_STOPWATCH_H
-#define G3D_STOPWATCH_H
-
-#include "G3D/platform.h"
-#include "G3D/Queue.h"
-#include "G3D/G3DGameUnits.h"
-#include "G3D/g3dmath.h"
-
-namespace G3D {
-
-/**
- Utility class for profiling duration and frame rates.
- */
-class Stopwatch {
-private:
-    /** True between tick and tock */
-    bool                    inBetween;
-
-    /** The initial cycle count. */
-    uint64                  cycleStart;
-
-    /** The time at which tick was called. */
-    RealTime                timeStart;
-
-    /** The time at which the previous tock was called, -1 if never. */
-    RealTime                lastTockTime;
-
-    RealTime                lastDuration;
-    int64                   lastCycleCount;
-
-    /** Frames per second. */
-    double                  m_fps;
-
-    /** Weighted fps */
-    double                  emwaFPS;
-    double                  m_smoothFPS;
-
-    /** Weighted duration */
-    RealTime                emwaDuration;
-
-    /** The overhead for calling into the class. */
-    int64                   cycleOverhead;
-   
-    /** Called from the constructor. */
-    void computeOverhead();
-
-public:
-
-    Stopwatch();
-
-    /** Returns the number of times that tick was called per wall-clock second; 
-        e.g. frames-per-second. */
-    double FPS() const {
-        return m_fps;
-    }
-
-    /** Amount of time between the most recent tick and tock calls.  0 if tick has
-        never been called. */
-    RealTime elapsedTime() const {
-        return lastDuration;
-    }
-
-    /** Time-smoothed value that is stable to the nearest 1%.
-        This is useful if you are displaying elapsed time in real-time 
-        and want a stable number.*/
-    RealTime smoothElapsedTime() const {
-        return emwaDuration;
-    }
-
-    /** Time-smoothed value of fps that is stable to the nearest integer for fps > 10 and 
-      to the first decimal place for fps <= 10.
-      This is useful if you
-      are displaying the frame rate in real-time and want a stable (readable) number.*/
-    double smoothFPS() const {
-        return m_smoothFPS;
-    }
-
-    /** The elapsed cycle time between tick and tock.  An attempt is made to factor out all
-        tick/tock overhead, so that back-to-back calls should return zero.  
-        Unreliable on non-x86 platforms.*/
-    uint64 elapsedCycles() const {
-        return lastCycleCount;
-    }
-
-    /** Call at the beginning of the period that you want timed. */
-    void tick();
-
-    /** Call at the end of the period that you want timed. */
-    void tock();
-};
-
-
-}
-
-#endif
-
diff --git a/externals/g3dlite/G3D.lib/include/G3D/System.h b/externals/g3dlite/G3D.lib/include/G3D/System.h
deleted file mode 100644
index 3755dc5e36f..00000000000
--- a/externals/g3dlite/G3D.lib/include/G3D/System.h
+++ /dev/null
@@ -1,390 +0,0 @@
-/** 
-  @file System.h
- 
-  @maintainer Morgan McGuire, matrix@graphics3d.com
- 
-  @cite Rob Wyatt http://www.gamasutra.com/features/wyatts_world/19990709/processor_detection_01.htm
-  @cite Benjamin Jurke http://www.flipcode.com/cgi-bin/msg.cgi?showThread=COTD-ProcessorDetectionClass&forum=cotd&id=-1
-  @cite Michael Herf http://www.stereopsis.com/memcpy.html
-
-  @created 2003-01-25
-  @edited  2008-10-14
- */
-
-#ifndef G3D_SYSTEM_H
-#define G3D_SYSTEM_H
-
-#include "G3D/platform.h"
-#include "G3D/g3dmath.h"
-#include "G3D/G3DGameUnits.h"
-#include "G3D/BinaryFormat.h"
-#include 
-
-#ifdef G3D_OSX
-#	include 
-#endif
-
-namespace G3D {
-
-/**
- Routine used by the demos to find the data.  Searches in
- ../data, ../../data, etc. up to 5 levels back.  Checks
- common locations like c:\libraries\g3d-\data
- and some hard-coded paths on the Brown University file
- system.
- */
-std::string demoFindData(bool errorIfNotFound = true);
-
-/** G3D, SDL, and IJG libraries require license documentation
-    to be distributed with your program.  This generates the
-    string that must appear in your documentation. 
-    Your program can be commercial, closed-source under
-    any license you want.*/
-std::string license();
-
-/**
-The order in which the bytes of an integer are stored on a machine. Intel/AMD chips tend to be G3D_LITTLE_ENDIAN, Mac PPC's and Suns are G3D_BIG_ENDIAN. However, this is primarily used to specify the byte order of file formats, which are fixed.
-*/
-enum G3DEndian {
-	G3D_BIG_ENDIAN, G3D_LITTLE_ENDIAN
-};
-
-/**
- OS and processor abstraction.  The first time any method is called the processor
- will be analyzed.  Future calls are then fast.
-
- Timing function overview:
-    System::getCycleCount
-      - actual cycle count
-
-    System::getTick
-      - High-resolution time in seconds since program started
-
-    System::getLocalTime
-      - High-resolution time in seconds since Jan 1, 1970
-        (because it is stored in a double, this may be less
-         accurate than getTick)
-
- */
-class System {
-public:
-
-	/** Called automatically by the other System routines.*/
-	static void init();
-
-	/** */
-	static bool hasMMX();
-
-	/** */
-	static bool hasCPUID();
-	
-	/** */
-	static bool hasSSE();
-	
-	/** */
-	static bool hasSSE2();
-	
-	/** */
-	static bool hasSSE3();
-	
-	/** */
-	static bool has3DNow();
-
-	
-	/** */
-    static bool hasRDTSC();
-
-	static const std::string& cpuVendor();
-	
-	/** e.g. "Windows", "GNU/Linux" */
-    static const std::string& operatingSystem();
-
-	/** */
-    static const std::string& cpuArchitecture();
-
-    /**
-     Returns the endianness of this machine.
-     */
-    static G3DEndian machineEndian();
-
-    /**
-    Returns the current date as a string in the form YYYY-MM-DD
-    */
-    static std::string currentDateString();
-
-    /**
-     Guarantees that the start of the array is aligned to the 
-     specified number of bytes.
-     */
-    static void* alignedMalloc(size_t bytes, size_t alignment);
-
-    /**
-     Uses pooled storage to optimize small allocations (1 byte to 5 kilobytes).  
-     Can be 10x to 100x faster than calling ::malloc or new.
-
-     The result must be freed with free.
-
-     Threadsafe on Win32.
-
-     @sa calloc realloc OutOfMemoryCallback free
-     */
-    static void* malloc(size_t bytes);
-
-    static void* calloc(size_t n, size_t x);
-
-    /**
-     @param size Size of memory that the system was trying to allocate
-     @param recoverable If true, the system will attempt to allocate again
-            if the callback returns true.  If false, malloc is going to return 
-            NULL and this invocation is just to notify the application.
-     @return Return true to force malloc to attempt allocation again if the
-            error was recoverable.
-     */
-    typedef bool (*OutOfMemoryCallback)(size_t size, bool recoverable);
-
-    /**
-     When System::malloc fails to allocate memory because the system is
-     out of memory, it invokes this handler (if it is not NULL).
-     The argument to the callback is the amount of memory that malloc
-     was trying to allocate when it ran out.  If the callback returns
-     true, System::malloc will attempt to allocate the memory again.
-     If the callback returns false, then System::malloc will return NULL.
-
-     You can use outOfMemoryCallback to free data structures or to 
-     register the failure.
-     */
-    static OutOfMemoryCallback outOfMemoryCallback;
-
-    /**
-     Version of realloc that works with System::malloc.
-     */
-    static void* realloc(void* block, size_t bytes);
-
-    /** Returns a string describing how well System::malloc is using its internal pooled storage.
-        "heap" memory was slow to allocate; the other data sizes are comparatively fast.*/
-    static std::string mallocPerformance();
-    static void resetMallocPerformanceCounters();
-
-    /** 
-       Returns a string describing the current usage of the buffer pools used for
-       optimizing System::malloc.
-     */
-    static std::string mallocStatus();
-
-    /**
-     Free data allocated with System::malloc.
-
-     Threadsafe on Win32.
-     */
-    static void free(void* p);
-
-    /**
-     Frees memory allocated with alignedMalloc.
-     */
-    static void alignedFree(void* ptr);
-
-	/** An implementation of memcpy that may be up to 2x as fast as the C library
-	    one on some processors.  Guaranteed to have the same behavior as memcpy
-		in all cases. */
-	static void memcpy(void* dst, const void* src, size_t numBytes);
-
-	/** An implementation of memset that may be up to 2x as fast as the C library
-	    one on some processors.  Guaranteed to have the same behavior as memset
-		in all cases. */
-	static void memset(void* dst, uint8 value, size_t numBytes);
-
-    /**
-     Returns the fully qualified filename for the currently running executable.
-
-     This is more reliable than arg[0], which may be intentionally set
-     to an incorrect value by a calling program, relative to a now
-     non-current directory, or obfuscated by sym-links.
-
-     @cite Linux version written by Nicolai Haehnle , http://www.flipcode.com/cgi-bin/msg.cgi?showThread=COTD-getexename&forum=cotd&id=-1
-     */
-    static std::string currentProgramFilename();
-
-    /** Name of this program. Note that you can mutate this string to set your app name explicitly.*/
-    static std::string& appName();
-
-    /** G3D Version string */
-    static const std::string& version();
-
-    /** 
-      Either Debug or Release, depending on whether _DEBUG was defined at compile-time for the library.
-      */
-    static const std::string& build();
-
-    /**
-     Causes the current thread to yield for the specified duration
-     and consume almost no CPU.
-     The sleep will be extremely precise; it uses System::time() 
-     to calibrate the exact yeild time.
-     */
-    static void sleep(RealTime t);
-
-    /**
-     Clears the console.
-     Console programs only.
-     */
-    static void consoleClearScreen();
-
-    /**
-     Returns true if a key is waiting.
-     Console programs only.
-     */
-    static bool consoleKeyPressed();
-    
-    /**
-     Blocks until a key is read (use consoleKeyPressed to determine if
-     a key is waiting to be read) then returns the character code for
-     that key.
-     */
-    static int consoleReadKey();
-
-    /**
-     The actual time (measured in seconds since
-     Jan 1 1970 midnight).
-     
-     Adjusted for local timezone and daylight savings
-     time.   This is as accurate and fast as getCycleCount().
-    */
-    static RealTime time();
-
-    /**
-     To count the number of cycles a given operation takes:
-
-     
-     unsigned long count;
-     System::beginCycleCount(count);
-     ...
-     System::endCycleCount(count);
-     // count now contains the cycle count for the intervening operation.
-
-     */
-    static void beginCycleCount(uint64& cycleCount);
-    static void endCycleCount(uint64& cycleCount);
-
-    static uint64 getCycleCount();
-
-    /** Set an environment variable for the current process */
-    static void setEnv(const std::string& name, const std::string& value);
-	
-    /** Get an environment variable for the current process.  Returns NULL if the variable doesn't exist. */
-    static const char* getEnv(const std::string& name);
-
-    /**
-     Prints a human-readable description of this machine
-     to the text output stream.  Either argument may be NULL.
-     */
-    static void describeSystem(
-        class TextOutput& t);
-
-    static void describeSystem(
-        std::string&        s);
-
-    /** Returns the speed of processor 0 in MHz. 
-        Always returns 0 on linux.*/
-    static int cpuSpeedMHz();
-
-
-    /** On Win32, returns the clipboard text contents.  Does nothing on other
-       platforms (yet) */
-    static std::string getClipboardText();
-
-    /** Copies the text to the clipboard on Win32. */
-    static void setClipboardText(const std::string& s);
-
-    /**
-     Tries to locate the resource by looking in related directories.
-     If found, returns the full path to the resource, otherwise
-     returns the empty string.
-     */    
-    static std::string findDataFile(const std::string& full, bool errorIfNotFound = true);
-
-    /**
-        Sets the path that the application is using as its data directory.
-        Used by findDataDir as an initial search location.  GApp sets this
-        upon constrution.
-    */
-    static void setAppDataDir(const std::string& path);
-
-private:
-    /**
-	 (CKO) Note: Not sure why these are specifically needed
-	 for OS X. I made them private though.
-	*/
-#   ifdef G3D_OSX
-    static long m_OSXCPUSpeed; //In Cycles/Second
-    static double m_secondsPerNS;
-#   endif
-};
-
-
-#ifdef _MSC_VER
-    inline uint64 System::getCycleCount() {
-        uint32 timehi, timelo;
-
-        // Use the assembly instruction rdtsc, which gets the current
-        // cycle count (since the process started) and puts it in edx:eax.
-        __asm
-            {
-                rdtsc;
-                mov timehi, edx;
-                mov timelo, eax;
-            }
-
-        return ((uint64)timehi << 32) + (uint64)timelo;
-    }
-
-#elif defined(G3D_LINUX)
-
-    inline uint64 System::getCycleCount() {
-        uint32 timehi, timelo;
-
-        __asm__ __volatile__ (
-            "rdtsc            "
-            : "=a" (timelo),
-              "=d" (timehi)
-            : );
-
-        return ((uint64)timehi << 32) + (uint64)timelo;
-    }
-
-#elif defined(G3D_OSX)
-
-    inline uint64 System::getCycleCount() {
-		//Note:  To put off extra processing until the end, this does not 
-		//return the actual clock cycle count.  It is a bus cycle count.
-		//When endCycleCount() is called, it converts the two into a difference
-		//of clock cycles
-		
-        return (uint64) UnsignedWideToUInt64(UpTime());
-		//return (uint64) mach_absolute_time();
-    }
-
-#endif
-
-inline void System::beginCycleCount(uint64& cycleCount) {
-    cycleCount = getCycleCount();
-}
-
-
-inline void System::endCycleCount(uint64& cycleCount) {
-	#ifndef G3D_OSX
-		cycleCount = getCycleCount() - cycleCount;
-	#else
-		AbsoluteTime end = UpTime();
-		init();
-		Nanoseconds diffNS = 
-            AbsoluteDeltaToNanoseconds(end, UInt64ToUnsignedWide(cycleCount));
-		cycleCount = 
-            (uint64) ((double) (System::m_OSXCPUSpeed) * 
-                      (double) UnsignedWideToUInt64(diffNS) * m_secondsPerNS);
-	#endif
-}
-
-
-} // namespace
-
-#endif
diff --git a/externals/g3dlite/G3D.lib/include/G3D/Table.h b/externals/g3dlite/G3D.lib/include/G3D/Table.h
deleted file mode 100644
index 9ccd4f5c101..00000000000
--- a/externals/g3dlite/G3D.lib/include/G3D/Table.h
+++ /dev/null
@@ -1,770 +0,0 @@
-/**
-  @file Table.h
-
-  Templated hash table class.
-
-  @maintainer Morgan McGuire, morgan@cs.williams.edu
-  @created 2001-04-22
-  @edited  2008-07-01
-  Copyright 2000-2008, Morgan McGuire.
-  All rights reserved.
- */
-
-#ifndef G3D_TABLE_H
-#define G3D_TABLE_H
-
-#include 
-#include 
-
-#include "G3D/platform.h"
-#include "G3D/Array.h"
-#include "G3D/debug.h"
-#include "G3D/System.h"
-#include "G3D/g3dmath.h"
-#include "G3D/EqualsTrait.h"
-#include "G3D/HashTrait.h"
-
-#ifdef _MSC_VER
-#   pragma warning (push)
-    // Debug name too long warning
-#   pragma warning (disable : 4786)
-#endif
-
-namespace G3D {
-
-/**
- An unordered data structure mapping keys to values.
-
- Key must be a pointer, an int, a std::string or provide overloads for: 
-
-  
-    template<> struct HashTrait {
-        static size_t hashCode(const Key& key) { return reinterpret_cast( ... ); }
-    }; 
-  

-
-  and one of 
-
-  
-    template<> struct EqualsTrait{
-         static bool equals(const Key& a, const Key& b) { return ... ; }
-    };
-
-
-    bool operator==(const Key&, const Key&);
-  

-
- G3D pre-defines HashTrait specializations for common types (like int and std::string).
- If you use a Table with a different type you must write those functions yourself.  For example,
- an enum would use:
-
-  
-    template<> struct HashTrait {
-        static size_t equals(const MyEnum& key) const { return reinterpret_cast( key ); }
-    };
-  

-
-  And rely on the default enum operator==.
-
-
-  Periodically check that debugGetLoad() is low (> 0.1).  When it gets near
-  1.0 your hash function is badly designed and maps too many inputs to
-  the same output.
- */
-template, class EqualsFunc = EqualsTrait > 
-class Table {
-public:
-
-    /**
-     The pairs returned by iterator.
-     */
-    class Entry {
-    public:
-        Key    key;
-        Value  value;
-        Entry() {}
-        Entry(const Key& k, const Value& v) : key(k), value(v) {}
-    };
-
-private:
-
-    typedef Table ThisType;
-
-    /**
-     Linked list nodes used internally by HashTable.
-     */
-    class Node {
-    public:
-        Entry       entry;
-        size_t      hashCode;
-        Node*       next;
-        
-        /** Provide pooled allocation for speed. */
-        inline void* operator new (size_t size) {
-            return System::malloc(size);
-        }
-        
-        inline void operator delete (void* p) {
-            System::free(p);
-        }
-
-        Node(const Key& k, const Value& v, size_t h, Node* n) 
-            : entry(k, v), hashCode(h), next(n) {
-        }
-
-        /**
-        Clones a whole chain;
-        */
-        Node* clone() {
-           return new Node(this->entry.key, this->entry.value, hashCode, (next == NULL) ? NULL : next->clone());
-        }
-    };
-
-    void checkIntegrity() const {
-#       ifdef G3D_DEBUG
-           debugAssert(bucket == NULL || isValidHeapPointer(bucket));
-           for (size_t b = 0; b < numBuckets; ++b) {
-               Node* node = bucket[b];
-               debugAssert(node == NULL || isValidHeapPointer(node));
-               while (node != NULL) {
-                   debugAssert(node == NULL || isValidHeapPointer(node));
-                   node = node->next;
-               }
-           }
-#       endif
-    }
-
-    /**
-     Number of elements in the table.
-     */
-    size_t          _size;
-
-    /**
-     Array of Node*. 
-     We don't use Array because Table is lower level.
-     Some elements may be NULL.
-     */
-    Node**          bucket;
-    
-    /**
-     Length of the bucket array.
-     */
-    size_t          numBuckets;
-
-    /**
-     Re-hashes for a larger bucket size.
-     */
-    void resize(size_t newSize) {
-
-        // Hang onto the old bucket array
-        Node** oldBucket = bucket;
-
-        // Allocate a new bucket array with the new size
-        bucket = (Node**)System::calloc(sizeof(Node*), newSize);
-        debugAssertM(bucket != NULL, "System::calloc returned NULL. Out of memory.");
-        // Move each node to its new hash location
-        for (size_t b = 0; b < numBuckets; ++b) {
-            Node* node = oldBucket[b];
-         
-            // There is a linked list of nodes at this bucket
-            while (node != NULL) {
-                // Hang onto the old next pointer
-                Node* nextNode = node->next;
-        
-                // Insert at the head of the list for bucket[i]
-                size_t i = node->hashCode % newSize;
-                node->next = bucket[i];
-                bucket[i] = node;
-
-                // Move on to the next node
-                node = nextNode;
-            }
-
-            // Drop the old pointer for cleanliness when debugging
-            oldBucket[b] = NULL;
-        }
-
-        // Delete the old storage
-        System::free(oldBucket);
-        this->numBuckets = newSize;
-
-        checkIntegrity();
-    }
-
-
-    void copyFrom(const ThisType& h) {
-        if (&h == this) {
-            return;
-        }
-
-        debugAssert(bucket == NULL);
-        _size = h._size;
-        numBuckets = h.numBuckets;
-        bucket = (Node**)System::calloc(sizeof(Node*), numBuckets);
-
-        for (size_t b = 0; b < numBuckets; b++) {
-            if (h.bucket[b] != NULL) {
-                bucket[b] = h.bucket[b]->clone();
-            }
-        }
-
-        checkIntegrity();
-    }
-
-    /**
-     Frees the heap structures for the nodes.
-     */
-    void freeMemory() {
-        checkIntegrity();
-
-        for (size_t b = 0; b < numBuckets; b++) {
-            Node* node = bucket[b];
-            while (node != NULL) {
-                Node* next = node->next;
-                delete node;
-                node = next;
-            }
-            bucket[b] = NULL;
-        }
-        System::free(bucket);
-        bucket     = NULL;
-        numBuckets = 0;
-        _size      = 0;
-    }
-
-
-public:
-
-    /**
-     Creates an empty hash table.  This causes some heap allocation to occur.
-     */
-    Table() : bucket(NULL) {
-        numBuckets = 10;
-        _size      = 0;
-        bucket     = (Node**)System::calloc(sizeof(Node*), numBuckets);
-        checkIntegrity();
-    }
-
-    /** 
-        Recommends that the table resize to anticipate at least this number of elements.
-     */
-    void setSizeHint(size_t n) {
-        size_t s = n * 3;
-        if (s > numBuckets) {
-            resize(s);
-        }
-    }
-    
-    /**
-       Destroys all of the memory allocated by the table, but does not
-       call delete on keys or values if they are pointers.  If you want to
-       deallocate things that the table points at, use getKeys() and Array::deleteAll()
-       to delete them.
-    */
-    virtual ~Table() {
-        freeMemory();
-    }
-
-    Table(const ThisType& h) {
-        numBuckets = 0;
-        _size = 0;
-        bucket = NULL;
-        this->copyFrom(h);
-        checkIntegrity();
-    }
-
-
-    Table& operator=(const ThisType& h) {
-        // No need to copy if the argument is this
-        if (this != &h) {
-            // Free the existing nodes
-            freeMemory();
-            this->copyFrom(h);
-            checkIntegrity();
-        }
-        return *this;
-    }
-
-    /**
-     Returns the length of the deepest bucket.
-     */
-    size_t debugGetDeepestBucketSize() const {
-        size_t deepest = 0;
-
-        for (size_t b = 0; b < numBuckets; b++) {
-            size_t  count = 0;
-            Node*   node = bucket[b];
-            while (node != NULL) {
-                node = node->next;
-                ++count;
-            }
-
-            if (count > deepest) {
-                deepest = count;
-            }
-        }
-
-        return deepest;
-    }
-
-    /**
-       Returns the average size of non-empty buckets.
-    */
-    float debugGetAverageBucketSize() const {
-        size_t num = 0;
-        size_t count = 0;
-
-        for (size_t b = 0; b < numBuckets; b++) {
-            Node* node = bucket[b];
-            if (node != NULL) {
-                ++num;
-                while (node != NULL) {
-                    node = node->next;
-                    ++count;
-                }
-            }
-        }
-
-        return (float)((double)count / num);
-    }
-
-    /**
-     A small load (close to zero) means the hash table is acting very
-     efficiently most of the time.  A large load (close to 1) means 
-     the hash table is acting poorly-- all operations will be very slow.
-     A large load will result from a bad hash function that maps too
-     many keys to the same code.
-     */
-    double debugGetLoad() const {
-        return debugGetDeepestBucketSize() / (double)size();
-    }
-
-    /**
-     Returns the number of buckets.
-     */
-    size_t debugGetNumBuckets() const {
-        return numBuckets;
-    }
-
-    /**
-     C++ STL style iterator variable.  See begin().
-     */
-    class Iterator {
-    private:
-        friend class Table;
-
-        /**
-         Bucket index.
-         */
-        size_t              index;
-
-        /**
-         Linked list node.
-         */
-        Node*               node;
-        ThisType*           table;
-        size_t              numBuckets;
-        Node**              bucket;
-        bool                isDone;
-
-        /**
-         Creates the end iterator.
-         */
-        Iterator(const ThisType* table) : table(const_cast(table)) {
-            isDone = true;
-        }
-
-        Iterator(const ThisType* table, size_t numBuckets, Node** bucket) :
-            table(const_cast(table)),
-            numBuckets(numBuckets),
-            bucket(bucket) {
-            
-            if (numBuckets == 0) {
-                // Empty table
-                isDone = true;
-                return;
-            }
-
-            index = 0;
-            node = bucket[index];
-            isDone = false;
-            findNext();
-        }
-
-        /**
-         Finds the next element, setting isDone if one can't be found.
-         Looks at the current element first.
-         */
-        void findNext() {
-            while (node == NULL) {
-                index++;
-                if (index >= numBuckets) {
-                    isDone = true;
-                    break;
-                } else {
-                    node = bucket[index];
-                }
-            }
-        }
-
-    public:
-        inline bool operator!=(const Iterator& other) const {
-            return !(*this == other);
-        }
-
-        bool operator==(const Iterator& other) const {
-            if (other.isDone || isDone) {
-                // Common case; check against isDone.
-                return (isDone == other.isDone) && (other.table == table);
-            } else {
-                return
-                    (table == other.table) &&
-                    (node == other.node) && 
-                    (index == other.index);
-            }
-        }
-
-        /**
-         Pre increment.
-         */
-        Iterator& operator++() {
-            node = node->next;
-            findNext();
-            return *this;
-        }
-
-        /**
-         Post increment (slower than preincrement).
-         */
-        Iterator operator++(int) {
-            Iterator old = *this;
-            ++(*this);
-            return old;
-        }
-
-        const Entry& operator*() const {
-            return node->entry;
-        }
-
-        Entry* operator->() const {
-            return &(node->entry);
-        }
-
-        operator Entry*() const {
-            return &(node->entry);
-        }
-
-		bool hasMore() const {
-			return ! isDone;
-		}
-    };
-
-
-    /**
-     C++ STL style iterator method.  Returns the first Entry, which 
-     contains a key and value.  Use preincrement (++entry) to get to
-     the next element.  Do not modify the table while iterating.
-     */
-    Iterator begin() const {
-        return Iterator(this, numBuckets, bucket);
-    }
-
-    /**
-     C++ STL style iterator method.  Returns one after the last iterator
-     element.
-     */
-    const Iterator end() const {
-        return Iterator(this);
-    }
-
-    /**
-     Removes all elements
-     */
-    void clear() {
-        freeMemory();
-        numBuckets = 10;
-        _size = 0;
-        bucket = (Node**)System::calloc(sizeof(Node*), numBuckets);
-    }
-
-   
-    /**
-     Returns the number of keys.
-     */
-    size_t size() const {
-        return _size;
-    }
-
-
-    /**
-     If you insert a pointer into the key or value of a table, you are
-     responsible for deallocating the object eventually.  Inserting 
-     key into a table is O(1), but may cause a potentially slow rehashing.
-     */
-    void set(const Key& key, const Value& value) {
-        size_t code = HashFunc::hashCode(key);
-        size_t b = code % numBuckets;
-        
-        // Go to the bucket
-        Node* n = bucket[b];
-
-        // No bucket, so this must be the first
-        if (n == NULL) {
-            bucket[b] = new Node(key, value, code, NULL);
-            ++_size;
-            return;
-        }
-
-        size_t bucketLength = 1;
-
-        // Sometimes a bad hash code will cause all elements
-        // to collide.  Detect this case and don't rehash when 
-        // it occurs; nothing good will come from the rehashing.
-        bool allSameCode = true;
-
-        // Try to find the node
-        do {
-            allSameCode = allSameCode && (code == n->hashCode);
-
-            if ((code == n->hashCode) && EqualsFunc::equals(n->entry.key, key)) {
-               // Replace the existing node.
-               n->entry.value = value;
-               return;
-            }
-
-            n = n->next;
-            ++bucketLength;
-        } while (n != NULL);
-
-        const size_t maxBucketLength = 3;
-        // (Don't bother changing the size of the table if all entries
-        // have the same hashcode--they'll still collide)
-        if ((bucketLength > maxBucketLength) && 
-            ! allSameCode && 
-            (numBuckets < _size * 15)) {
-
-            // This bucket was really large; rehash if all elements
-            // don't have the same hashcode the number of buckets is
-            // reasonable.
-
-            // Back off the scale factor as the number of buckets gets 
-            // large
-            float f = 3.0f;
-            if (numBuckets > 1000000) {
-                f = 1.5f;
-            } else if (numBuckets > 100000) {
-                f = 2.0f;
-            }
-            int newSize = iMax((int)(numBuckets * f) + 1, (int)(_size * f));
-            resize(newSize);
-        }
-
-        // Not found; insert at the head.
-        b = code % numBuckets;
-        bucket[b] = new Node(key, value, code, bucket[b]);
-        ++_size;
-   }
-
-   /**
-    Removes an element from the table if it is present.  
-    @return true if the element was found and removed, otherwise  false
-    */
-   bool remove(const Key& key) {
-      
-       size_t code = HashFunc::hashCode(key);
-       size_t b = code % numBuckets;
-
-       // Go to the bucket
-       Node* n = bucket[b];
-
-       if (n == NULL) {
-           return false;
-       }
-
-       Node* previous = NULL;
-      
-       // Try to find the node
-       do {
-          if ((code == n->hashCode) && EqualsFunc::equals(n->entry.key, key)) {
-              // This is the node; remove it
-
-              // Replace the previous's next pointer
-              if (previous == NULL) {
-                  bucket[b] = n->next;
-              } else {
-                  previous->next = n->next;
-              }
-
-              // Delete the node
-              delete n;
-              --_size;
-              return true;
-          }
-
-          previous = n;
-          n = n->next;
-      } while (n != NULL);
-
-
-      return false;
-      //alwaysAssertM(false, "Tried to remove a key that was not in the table.");
-   }
-
-   /**
-    Returns the value associated with key.
-    @deprecated Use get(key, val) or getPointer(key) 
-    */
-   Value& get(const Key& key) const {
-
-       size_t  code = HashFunc::hashCode(key);
-        size_t b = code % numBuckets;
-
-        Node* node = bucket[b];
-
-        while (node != NULL) {
-            if ((node->hashCode == code) && EqualsFunc::equals(node->entry.key, key)) {
-                return node->entry.value;
-            }
-            node = node->next;
-        }
-
-        debugAssertM(false, "Key not found");
-        // The next line is here just to make
-        // a compiler warning go away.
-        return node->entry.value;
-   }
-
-
-   /** Returns a pointer to the element if it exists, or NULL if it does not.
-       Note that if your value type is a pointer, the return value is 
-       a pointer to a pointer.  Do not remove the element while holding this 
-       pointer.
-
-       It is easy to accidentally mis-use this method.  Consider making 
-       a Table and using get(key, val) instead, which makes you manage
-       the memory for the values yourself and is less likely to result in 
-       pointer errors.
-     */
-   Value* getPointer(const Key& key) const {
-       size_t code = HashFunc::hashCode(key);
-      size_t b = code % numBuckets;
-
-      Node* node = bucket[b];
-
-      while (node != NULL) {
-          if ((node->hashCode == code) && EqualsFunc::equals(node->entry.key, key)) {
-             // found key
-             return &(node->entry.value);
-          }
-          node = node->next;
-      }
-
-      // Failed to find key
-      return NULL;
-   }
-
-   /**
-    If the key is present in the table, val is set to the associated value and returns true.
-    If the key is not present, returns false.
-    */
-   bool get(const Key& key, Value& val) const {
-       Value* v = getPointer(key);
-       if (v != NULL) {
-           val = *v;
-           return true;
-       } else {
-           return false;
-       }
-   }
-
-   /**
-    Returns true if key is in the table.
-    */
-   bool containsKey(const Key& key) const {
-       size_t code = HashFunc::hashCode(key);
-       size_t b = code % numBuckets;
-
-       Node* node = bucket[b];
-
-       while (node != NULL) {
-           if ((node->hashCode == code) && EqualsFunc::equals(node->entry.key, key)) {
-              return true;
-           }
-           node = node->next;
-       } while (node != NULL);
-
-       return false;
-   }
-
-
-   /**
-    Short syntax for get.
-    */
-   inline Value& operator[](const Key &key) const {
-      return get(key);
-   }
-
-
-   /**
-    Returns an array of all of the keys in the table.
-    You can iterate over the keys to get the values.
-    @deprecated
-    */
-   Array getKeys() const {
-       Array keyArray;
-       getKeys(keyArray);
-       return keyArray;
-   }
-
-   void getKeys(Array& keyArray) const {
-       keyArray.resize(0, DONT_SHRINK_UNDERLYING_ARRAY);
-       for (size_t i = 0; i < numBuckets; i++) {
-           Node* node = bucket[i];
-           while (node != NULL) {
-               keyArray.append(node->entry.key);
-               node = node->next;
-           }
-       }
-   }
-
-   /**
-    Calls delete on all of the keys and then clears the table.
-    */
-   void deleteKeys() {
-       for (size_t i = 0; i < numBuckets; i++) {
-           Node* node = bucket[i];
-           while (node != NULL) {
-               delete node->entry.key;
-               node = node->next;
-           }
-       }
-       clear();
-   }
-
-   /**
-    Calls delete on all of the values.  This is unsafe--
-    do not call unless you know that each value appears
-    at most once.
-
-    Does not clear the table, so you are left with a table
-    of NULL pointers.
-    */
-   void deleteValues() {
-       for (size_t i = 0; i < numBuckets; ++i) {
-           Node* node = bucket[i];
-           while (node != NULL) {
-               delete node->entry.value;
-               node->entry.value = NULL;
-               node = node->next;
-           }
-       }
-   }
-};
-
-} // namespace
-
-#ifdef _MSC_VER
-#   pragma warning (pop)
-#endif
-
-#endif
diff --git a/externals/g3dlite/G3D.lib/include/G3D/TextInput.h b/externals/g3dlite/G3D.lib/include/G3D/TextInput.h
deleted file mode 100644
index b6dcad39b8b..00000000000
--- a/externals/g3dlite/G3D.lib/include/G3D/TextInput.h
+++ /dev/null
@@ -1,693 +0,0 @@
-/**
- @file TextInput.h
-
- Simple text lexer/tokenizer.
-
- @maintainer Morgan McGuire, morgan@graphics3d.com
-
- @cite Based on a lexer written by Aaron Orenstein. 
-
- @created 2002-11-27
- @edited  2006-10-24
-
- Copyright 2000-2007, Morgan McGuire.
- All rights reserved.
- */
-
-#ifndef G3D_TEXTINPUT_H
-#define G3D_TEXTINPUT_H
-
-#include "G3D/platform.h"
-#include "G3D/Array.h"
-#include "G3D/Set.h"
-#include 
-#include 
-#include 
-#include 
-
-namespace G3D {
-
-/**
- For use with TextInput.
- */
-class Token {
-public:
-
-    /**
-     More detailed type information than Type.
-     */
-    enum ExtendedType {
-      DOUBLE_QUOTED_TYPE, 
-      SINGLE_QUOTED_TYPE, 
-      SYMBOL_TYPE,
-      FLOATING_POINT_TYPE, 
-      INTEGER_TYPE,
-      BOOLEAN_TYPE,
-      END_TYPE
-    };
-
-    /**
-     Strings are enclosed in quotes, symbols are not.
-     */
-    enum Type {
-      STRING  = DOUBLE_QUOTED_TYPE, 
-      SYMBOL  = SYMBOL_TYPE, 
-      NUMBER  = FLOATING_POINT_TYPE, 
-      BOOLEAN = BOOLEAN_TYPE, 
-      END     = END_TYPE
-    };
-
-private:
-
-    friend class TextInput;
-
-    /** 
-      Holds the actual value, which might be any type.  If a number, it will be 
-      parsed at runtime.
-    */
-    std::string             _string;
-
-    bool                    _bool;
-    int                     _line;
-    int                     _character;
-    Type                    _type;
-    ExtendedType            _extendedType;
-
-public:
-
-    Token() :
-        _string(""),
-        _bool(false),
-        _line(0), 
-        _character(0), 
-        _type(END), 
-        _extendedType(END_TYPE) {}
-
-    Token(Type t, ExtendedType e, const std::string& s, int L, int c)
-        : _string(s), _bool(false), _line(L), _character(c), _type(t), _extendedType(e) {}
-
-    Token(Type t, ExtendedType e, const std::string& s, bool b, int L, int c)
-        : _string(s), _bool(b), _line(L), _character(c), _type(t), _extendedType(e) {}
-
-    Type type() const {
-        return _type;
-    }
-
-    ExtendedType extendedType() const {
-        return _extendedType;
-    }
-
-    /**
-     The value of a single or double quote string (not including the quotes),
-     the name of a symbol, or the exact textual representation of a number as
-     parsed from the input. 
-     */
-    const std::string& string() const {
-        return _string;
-    }
-
-    bool boolean() const {
-        return _bool;
-    }
-
-    /**
-     Starting line of the input from which this token was parsed.  Starts
-     at 1.
-     */
-    int line() const {
-        return _line;
-    }
-
-    /**
-     Starting character position in the input line from which this token was
-     parsed.  Starts at 1.
-     */
-    int character() const {
-        return _character;
-    }
-
-    /** Return the numeric value for a number type, or zero if this is
-        not a number type.
-    */
-    double number() const;
-};
-
-
-/**
- A simple style tokenizer for reading text files.  TextInput handles a
- superset of C++,Java, Matlab, and Bash code text including single
- line comments, block comments, quoted strings with escape sequences,
- and operators.  TextInput recognizes several categories of tokens,
- which are separated by white space, quotation marks, or the end of a
- recognized operator:
-
- 
    
-  
  • Token::SINGLE_QUOTED_TYPE string of characters surrounded by single quotes, e.g., 'x', '\0', 'foo'.
-  
  • Token::DOUBLE_QUOTED_TYPE string of characters surrounded by double quotes, e.g., "x", "abc\txyz", "b o b".
-  
  • Token::SYMBOL_TYPE legal C++ operators, keywords, and identifiers.  e.g., >=, Foo, _X, class, {
-  
  • Token::INTEGER_TYPE numbers without decimal places or exponential notation. e.g., 10, 0x17F, 32, 0, -155
-  
  • Token::FLOATING_POINT_TYPE numbers with decimal places or exponential notation. e.g., 1e3, -1.2, .4, 0.5
-  
  • Token::BOOLEAN_TYPE special symbols like "true" and "false"; the exact details can be configured in TextInput::Settings
- 

-
- 
The special ".." and "..." tokens are always recognized in
- addition to normal C++ operators. Additional tokens can be made
- available by changing the Settings.
-
- Negative numbers are handled specially because of the ambiguity between unary minus and negative numbers-- 
- see the note on TextInput::read.
-
-  TextInput does not have helper functions for types with non-obvious
-  formatting, or helpers that would be redundant.  Use the serialize
-  methods instead for parsing specific types like int, Vector3, and
-  Color3.
-
-  Inside quoted strings escape sequences are converted.  Thus the
-  string token for ["a\nb"] is 'a', followed by a newline, followed by
-  'b'.  Outside of quoted strings, escape sequences are not converted,
-  so the token sequence for [a\nb] is symbol 'a', symbol '\', symbol
-  'nb' (this matches what a C++ parser would do).  The exception is
-  that a specified TextInput::Settings::otherCommentCharacter preceeded
-  by a backslash is assumed to be an escaped comment character and is
-  returned as a symbol token instead of being parsed as a comment
-  (this is what a LaTex or VRML parser would do).
-
-  Examples
-
-  
-  TextInput ti(TextInput::FROM_STRING, "name = \"Max\", height = 6");
-
-  Token t;
-
-  t = ti.read(); 
-  debugAssert(t.type == Token::SYMBOL);
-  debugAssert(t.sval == "name");
-
-  ti.read();
-  debugAssert(t.type == Token::SYMBOL);
-  debugAssert(t.sval == "=");
-
-  std::string name = ti.read().sval;
-  ti.read();
-  

-
-  
-  TextInput ti(TextInput::FROM_STRING, "name = \"Max\", height = 6");
-  ti.readSymbols("name", "=");
-  std::string name = ti.readString();
-  ti.readSymbols(",", "height", "=");
-  double height = ti. readNumber();
-  

-
- Assumes that the file is not modified once opened.
- */
-class TextInput {
-public:
-
-    /** Tokenizer configuration options.  */
-    class Settings {
-    public:
-        /** If true, slash-star marks a multi-line comment.  Default
-            is true. */
-        bool                cComments;
-
-        /** If true, // begins a single line comment.  Default is true. */
-        bool                cppComments;
-
-        /** If true, \r, \n, \t, \0, \\ and other escape sequences inside
-            strings are converted to the equivalent C++ escaped character.
-            If false, backslashes are treated literally.  It is convenient to
-            set to false if reading Windows paths, for example, like
-            c:\foo\bar.
-
-            Default is true.
-         */
-        bool                escapeSequencesInStrings;
-
-        /** If non-NUL, specifies a character that begins single line
-            comments ('#' and '%' are popular choices).  This is independent
-            of the cppComments flag.  If the character appears in text with a
-            backslash in front of it, it is considered escaped and is not
-            treated as a comment character.
-
-            Default is '\0'.
-         */
-        char                otherCommentCharacter;
-
-        /** Another (optional) 1-comment character.  Useful for files that
-            support multiple comment syntaxes.  Default is '\0'.
-         */
-        char                otherCommentCharacter2;
-
-        /** If true, "-1" parses as the number -1 instead of the
-            symbol "-" followed by the number 1.  Default is true.*/
-        bool                signedNumbers;
-
-        /** If true, strings can be marked with single quotes (e.g.,
-            'aaa').  If false, the quote character is parsed as a
-            symbol. Default is true.  Backquote (`) is always parsed
-            as a symbol. */
-        bool                singleQuotedStrings;
-        
-        /** If set to a non-empty string, that string will be used in
-            place of the real file name (or in place of a pseudonym
-            constructed from the buffer if given FROM_STRING) in
-            tokens and exceptions.
-            
-            Default is empty.
-        */
-        std::string         sourceFileName;
-
-    
-        /** Added to the line number reported by peekLineNumber and in
-            exceptions.  Useful for concatenating files that are
-            parsed separately.  Default is zero. */
-        int                 startingLineNumberOffset;
-
-        /** 
-          Parse -1.#IND00 as the floating point number returned by
-          nan(), -1.#INF00 as -inf(), and 1.#INF00 as inf().  Note
-          that the C99 standard specifies that a variety of formats
-          like "NaN" and "nan" are to be used; these are easier to
-          parse yourself and not currently supported by readNumber.
-
-          An alternative to specifying msvcSpecials is to read numbers as:
-          
-            Token x = t.read();
-            Token y = t.peek();
-            if ((x.string() == "-1.") && 
-                (y.string() == "#INF00") && 
-                (y.character() == x.character() + 3) &&
-                (y.line() == x.line()) {
-                t.read();
-                return nan();
-            }
-            // ... similar cases for inf
-          

-
-          If the single-comment character was #, the floating point
-          special format overrides the comment and will be parsed
-          instead.
-
-          If signedNumbers is false msvcSpecials will not be parsed.
-
-          Default is true. */
-        bool                msvcSpecials;
-
-        /**
-         Parse the following set of useful proof symbols:
-         
-           =>
-           ::>
-           <::
-           :>
-           <:
-           |-
-           ::=
-           :=
-           <-
-
-           Default is false.
-        */
-        bool                proofSymbols;
-
-        /**
-         When parsing booleans and msvcSpecials, is case significant?
-         Default is {true}
-        */
-        bool                caseSensitive;
-
-        /** All symbols that will become the 'true' boolean token.  See also caseSensitive.
-            Clear this value to disable parsing of true booleans.
-
-            Default is {true}.
-         */
-        Set    trueSymbols;
-
-        /** See trueSymbols. Default is {false}*/
-        Set    falseSymbols;
-
-        Settings ();
-    };
-	
-private:
-
-    std::deque       stack;
-
-    /**
-     Characters to be tokenized.
-     */
-    Array             buffer;
-
-    /**
-     Offset of current character (the next character to consumed) in
-     input buffer.
-     */
-    unsigned int            currentCharOffset;
-
-    /**
-     Line number of next character to be consumed from the input buffer.  (1
-     indicates first line of input.)
-
-     Note that this is the line number of the @e next character to be
-     consumed from the input, not the line number of the @e last character
-     consumed!
-     */
-    unsigned int            lineNumber;
-
-    /**
-     Character number (within the line) of the next character to be consumed
-     from the input buffer.  (1 indicates first character of the line).
-
-     Note that this is the character number of the @e next character to be
-     consumed from the input, not the character number of the @e last
-     character consumed!
-     */
-    unsigned int            charNumber;
-
-    /** Configuration options.  This includes the file name that will be
-        reported in tokens and exceptions.  */
-    Settings                options;
-  
-    void init();
-
-    /**
-     Consumes the next character from the input buffer, and returns that
-     character.  Updates lineNumber and charNumber to reflect the location of
-     the next character in the input buffer.
-
-     Note: you shouldn't be using the return value of this function in most
-     cases.  In general, you should peekInputChar() to get the next
-     character, determine what to do with it, then consume it with this
-     function (or with eatAndPeekInputChar()).  Given that usage, in most
-     instances you already know what this function would return!
-     */
-    int eatInputChar();
-
-    /**
-     Returns the next character from the input buffer, without consuming any
-     characters.  Can also be used to look deeper into the input buffer.
-     Does not modify lineNumber or charNumber.
-
-     @param distance Index of the character in the input buffer to peek at,
-     relative to the next character.  Default is 0, for the next character in
-     the input buffer.
-     */
-    int peekInputChar(unsigned int distance = 0);
-
-    /**
-     Helper function to consume the next character in the input buffer and
-     peek at the one following (without consuming it).
-     */
-    inline int eatAndPeekInputChar() {
-        eatInputChar();
-        return peekInputChar(0);
-    }
-
-    /**
-     Read the next token, returning an END token if no more input is
-     available.
-     */
-    Token nextToken();
-
-	/**
-     Helper for nextToken.  Appends characters to t._string until the end
-     delimiter is reached.
-
-     When called, the next character in the input buffer should be first the
-     first character after the opening delimiter character.
-     */
-	void parseQuotedString(unsigned char delimiter, Token& t);
-
-public:
-
-    class TokenException {
-    public:
-        /** Name of file being parsed when exception occurred.  */
-        std::string     sourceFile;
-
-        /** Line number of start of token which caused the exception.  1 is
-            the first line of the file.  Note that you can use 
-            TextInput::Settings::startingLineNumberOffset to shift the effective line
-            number that is reported.
-         */
-        int             line;
-
-        /** Character number in the line of start of token which caused the
-            exception.  1 is the character in the line.
-         */
-        int             character;
-
-        /** Pre-formatted error message */
-        std::string     message;
-
-        virtual ~TokenException() {}
-
-    protected:
-        
-        TokenException(
-            const std::string&  src,
-            int                 ln,
-            int                 ch);
-
-    };
-
-    /** While parsing a number of the form 1.#IN?00, ? was 
-        not 'D' or 'F'. */
-    class BadMSVCSpecial : public TokenException {
-    public:
-
-        BadMSVCSpecial(
-            const std::string&  src,
-            int                 ln,
-            int                 ch);
-    };
-
-    /** Thrown by the read methods. */
-    class WrongTokenType : public TokenException {
-    public:
-        Token::Type     expected;
-        Token::Type     actual;
-
-        WrongTokenType(
-            const std::string&  src,
-            int                 ln,
-            int                 ch,
-            Token::Type         e,
-            Token::Type         a);
-    };
-
-    class WrongSymbol : public TokenException {
-    public:
-        std::string             expected;
-        std::string             actual;
-
-        WrongSymbol(
-            const std::string&  src,
-            int                 ln,
-            int                 ch,
-            const std::string&  e,
-            const std::string&  a);
-    };
-
-
-    /** String read from input did not match expected string.  */
-    class WrongString : public TokenException {
-    public:
-        std::string             expected;
-        std::string             actual;
-
-        WrongString(
-            const std::string&  src,
-            int                 ln,
-            int                 ch,
-            const std::string&  e,
-            const std::string&  a);
-    };
-
-    TextInput(const std::string& filename, const Settings& settings = Settings());
-
-    enum FS {FROM_STRING};
-    /** Creates input directly from a string.  The first argument must be
-        TextInput::FROM_STRING.
-    */
-    TextInput(FS fs, const std::string& str, const Settings& settings = Settings());
-
-    /** Returns true while there are tokens remaining. */
-    bool hasMore();
-
-    /** Read the next token (which will be the END token if ! hasMore()).
-    
-        Signed numbers can be handled in one of two modes.  If the option 
-        TextInput::Settings::signedNumbers is true,
-        A '+' or '-' immediately before a number is prepended onto that number and
-        if there is intervening whitespace, it is read as a separate symbol.
-
-        If TextInput::Settings::signedNumbers is false,
-        read() does not distinguish between a plus or minus symbol next
-        to a number and a positive/negative number itself.  For example, "x - 1" and "x -1"
-        will be parsed the same way by read().  
-        
-        In both cases, readNumber() will contract a leading "-" or "+" onto
-        a number.
-    */
-    Token read();
-
-
-    /** Read one token (or possibly two) as a number or throws
-        WrongTokenType, and returns the number.
-
-        If the first token in the input is a number, it is returned directly.
-
-        If TextInput::Settings::signedNumbers is false and the input stream
-        contains a '+' or '-' symbol token immediately followed by a number
-        token, both tokens will be consumed and a single token will be
-        returned by this method.
-
-        WrongTokenType will be thrown if one of the input conditions
-        described above is not satisfied.  When an exception is thrown, no
-        tokens are consumed.
-    */
-    double readNumber();
-
-    bool readBoolean();
-
-    /** Reads a string token or throws WrongTokenType, and returns the token.
-
-        Use this method (rather than readString) if you want the token's
-        location as well as its value.
-
-        WrongTokenType will be thrown if the next token in the input stream
-        is not a string.  When an exception is thrown, no tokens are
-        consumed.
-    */
-    Token readStringToken();
-
-    /** Like readStringToken, but returns the token's string.
-
-        Use this method (rather than readStringToken) if you want the token's
-        value but don't really care about its location in the input.  Use of
-        readStringToken is encouraged for better error reporting.
-    */
-    std::string readString();
-
-    /** Reads a specific string token or throws either WrongTokenType or
-        WrongString.  If the next token in the input is a string matching @p
-        s, it will be consumed.
-
-        Use this method if you want to match a specific string from the
-        input.  In that case, typically error reporting related to the token
-        is only going to occur because of a mismatch, so no location
-        information is needed by the caller.
-
-        WrongTokenType will be thrown if the next token in the input stream
-        is not a string.  WrongString will be thrown if the next token in the
-        input stream is a string but does not match the @p s parameter.  When
-        an exception is thrown, no tokens are consumed.
-      */
-    void readString(const std::string& s);
-
-
-    /** Reads a symbol token or throws WrongTokenType, and returns the token.
-
-        Use this method (rather than readSymbol) if you want the token's
-        location as well as its value.
-
-        WrongTokenType will be thrown if the next token in the input stream
-        is not a symbol.  When an exception is thrown, no tokens are
-        consumed.
-    */
-    Token readSymbolToken();
-
-    /** Like readSymbolToken, but returns the token's string.
-
-        Use this method (rather than readSymbolToken) if you want the token's
-        value but don't really care about its location in the input.  Use of
-        readSymbolToken is encouraged for better error reporting.
-    */
-    std::string readSymbol();
-
-    /** Reads a specific symbol token or throws either WrongTokenType or
-        WrongSymbol.  If the next token in the input is a symbol matching @p
-        symbol, it will be consumed.
-
-        Use this method if you want to match a specific symbol from the
-        input.  In that case, typically error reporting related to the token
-        is only going to occur because of a mismatch, so no location
-        information is needed by the caller.
-
-        WrongTokenType will be thrown if the next token in the input stream
-        is not a symbol.  WrongSymbol will be thrown if the next token in the
-        input stream is a symbol but does not match the @p symbol parameter.
-        When an exception is thrown, no tokens are consumed.
-    */
-    void readSymbol(const std::string& symbol);
-
-
-    /** Read a series of two specific symbols.  See readSymbol.  */
-    inline void readSymbols(const std::string& s1, const std::string& s2) {
-        readSymbol(s1);
-        readSymbol(s2);
-    }
-
-    /** Read a series of three specific symbols.  See readSymbol.  */
-    inline void readSymbols(
-        const std::string& s1, 
-        const std::string& s2, 
-        const std::string& s3) {
-        readSymbol(s1);
-        readSymbol(s2);
-        readSymbol(s3);
-    }
-
-    /** Read a series of four specific symbols.  See readSymbol.  */
-    inline void readSymbols(
-        const std::string& s1, 
-        const std::string& s2, 
-        const std::string& s3,     
-        const std::string& s4) {
-        readSymbol(s1);
-        readSymbol(s2);
-        readSymbol(s3);
-        readSymbol(s4);
-    }
-
-    /** Return a copy of the next token in the input stream, but don't remove
-        it from the input stream.
-    */
-    Token peek();
-
-    /** Returns the line number for the @e next token.  See also peek.  */
-    int peekLineNumber();
-
-    /** Returns the character number (relative to the line) for the @e next
-        token in the input stream.  See also peek.
-    */
-    int peekCharacterNumber();
-
-    /** Take a previously read token and push it back at the front of the
-        input stream.
-
-        Can be used in the case where more than one token of read-ahead is
-        needed (i.e., when peek doesn't suffice).
-    */
-    void push(const Token& t);
-
-    /** Returns the filename from which this input is drawn, or the first few
-        characters of the string if created from a string.
-        If options::filename is non-empty that will replace the
-        true filename.*/
-    const std::string& filename() const;
-};
-
-void deserialize(bool& b, TextInput& ti);
-void deserialize(int& b, TextInput& ti);
-void deserialize(uint8& b, TextInput& ti);
-void deserialize(double& b, TextInput& ti);
-void deserialize(float& b, TextInput& ti);
-void deserialize(std::string& b, TextInput& ti);
-
-} // namespace
-
-#endif
-
diff --git a/externals/g3dlite/G3D.lib/include/G3D/TextOutput.h b/externals/g3dlite/G3D.lib/include/G3D/TextOutput.h
deleted file mode 100644
index 6ae7d14fe00..00000000000
--- a/externals/g3dlite/G3D.lib/include/G3D/TextOutput.h
+++ /dev/null
@@ -1,249 +0,0 @@
-/**
-  @file TextOutput.h
-
-  @maintainer Morgan McGuire, morgan@graphics3d.com
-  @created 2004-06-21
-  @edited  2006-10-24
-
-  Copyright 2000-2007, Morgan McGuire.
-  All rights reserved.
- */
-
-#ifndef G3D_TEXTOUTPUT_H
-#define G3D_TEXTOUTPUT_H
-
-#include "G3D/platform.h"
-#include "G3D/Array.h"
-#include 
-
-namespace G3D {
-
-/**
-  Convenient formatting of ASCII text written to a file.
-  

-
-  The core writeString, writeNumber, and writeSymbol methods map to TextInput's
-  methods.  Number and Symbol each print an additional space that is used to 
-  separate adjacent tokens.
-  
-  TextOutput::printf allows arbitrary text to be conveniently dumped
-  en-masse.  Use [de]serialize(bool, TextOutput) and other overloads to read/write
-  primitive types in a standardized manner and 
-
-  

-  When a word-wrap line break occurs, all whitespace between words is replaced 
-  with a single newline (the newline may be two characters-- see 
-  G3D::TextOutput::Options::NewlineStyle).  Word wrapping occurs against
-  the number of columns specified by Options::numColumns, minus the current
-  indent level.
-
-  Indenting adds the specified number of spaces immediately after a newline.
-  If a newline was followed by spaces in the original string, these are added
-  to the indent spaces.  Indenting will indent blank lines and will leave
-  indents after the last newline of a file (if the indent level is non-zero at the end).
-
-  
Serialization/Marshalling
-  
Text serialization is accomplished using TextOutput by defining the pair of 
-  methods:
-
-  
-  void serialize(TextOutput& to) const;
-  void deserialize(TextInput& ti);
-  

-
-  See also G3D::TextInput.
-
-  

-  BETA API
-  
This API is subject to change in future versions.
- */
-class TextOutput {
-public:
-
-    class Settings {
-    public:
-        /** 
-          WRAP_NONE             Word wrapping is disabled
-          WRAP_WITHOUT_BREAKING Word-wrap, but don't break continuous lines that
-                                are longer than numColumns (default)
-          WRAP_ALWAYS           Wrap even if it means breaking a continuous line or
-                                a quoted string.
-
-          Word wrapping is only allowed at whitespaces ('\n', '\r', '\t', ' '); it
-          will not occur after commas, punctuation, minus signs, or any other characters
-        */
-        enum WordWrapMode {WRAP_NONE, WRAP_WITHOUT_BREAKING, WRAP_ALWAYS};
-
-        /** Defaults to WRAP_WITHOUT_BREAKING */
-        WordWrapMode        wordWrap;
-
-        /** Is word-wrapping allowed to insert newlines inside double quotes?
-            Default: false */
-        bool                allowWordWrapInsideDoubleQuotes;
-
-        /** Number of columns for word wrapping. Default: 8 */
-        int                 numColumns;
-
-        /** Number of spaces in each indent. Default: 4 */
-        int                 spacesPerIndent;
-
-        /** Style of newline used by word wrapping and by (optional) conversion.
-            default: Windows: NEWLINE_WINDOWS, Linux, OS X: NEWLINE_UNIX.
-          */
-        enum NewlineStyle {NEWLINE_WINDOWS, NEWLINE_UNIX};
-
-        NewlineStyle        newlineStyle;
-
-        /** If true, all newlines are converted to NewlineStyle regardless of 
-            how they start out. Default: true. */
-        bool                convertNewlines;
-
-        /** Used by writeBoolean */
-        std::string         trueSymbol;
-
-        /** Used by writeBoolean */
-        std::string         falseSymbol;
-
-        Settings() :
-            wordWrap(WRAP_WITHOUT_BREAKING),
-            allowWordWrapInsideDoubleQuotes(false),
-            numColumns(80),
-            spacesPerIndent(4),
-            convertNewlines(true),
-            trueSymbol("true"),
-            falseSymbol("false") {
-            #ifdef G3D_WIN32
-                newlineStyle = NEWLINE_WINDOWS;
-            #else
-                newlineStyle = NEWLINE_UNIX;
-            #endif
-        }
-    };
-
-private:
-
-    /** Used by indentAndAppend to tell when we are writing the
-        first character of a new line. 
-      
-        So that push/popIndent work correctly, we cannot indent
-        immediately after writing a newline.  Instead we must
-        indent on writing the first character after that 
-        newline.
-      */
-    bool                    startingNewLine;
-
-    /** Number of characters at the end of the buffer since the last newline */
-    int                     currentColumn;
-
-    /** True if we have seen an open " and no close ".*/
-    bool                    inDQuote;
-
-    /** Empty if there is none */
-    std::string             filename;
-
-    Array             data;
-
-    Settings                option;
-
-    /** Number of indents to prepend before each line.  Always set using setIndentLevel.*/
-    int                     indentLevel;
-
-    void setIndentLevel(int i);
-
-    /** Actual number of spaces to indent. */
-    int                     indentSpaces;
-
-    /** the newline character(s) */
-    std::string             newline;
-
-    void setOptions(const Settings& _opt);
-
-    /** Converts to the desired newlines.  Called from vprintf */
-    void convertNewlines(const std::string& in, std::string& out);
-
-    /** Called from vprintf */
-    void wordWrapIndentAppend(const std::string& str);
-
-    /** Appends the character to data, indenting whenever a newline is encountered.
-        Called from wordWrapIndentAppend */
-    void indentAppend(char c);
-
-public:
-
-    explicit TextOutput(const std::string& filename, const Settings& options = Settings());
-
-    /** Constructs a text output that can later be commited to a string instead of a file.*/
-    explicit TextOutput(const Settings& options = Settings());
-
-    /** Commit to the filename specified on the constructor. 
-         Not called from the destructor; you must call
-     it yourself.
-    @param flush If true (default) the file is ready for reading when the method returns, otherwise 
-     the method returns immediately and writes the file in the background.*/
-    void commit(bool flush = true);
-
-    /** Commits to this string */
-    void commitString(std::string& string);
-
-    /** Increase indent level by 1 */
-    void pushIndent();
-
-    void popIndent();
-
-    /** Produces a new string that contains the output */
-    std::string commitString();
-
-    /** Writes a quoted string. Special characters in the string (e.g., \, \t, \n) are escaped so that 
-        TextInput will produce the identical string on reading.*/
-    void writeString(const std::string& string);
-
-    void writeBoolean(bool b);
-
-    void writeNumber(double n);
-
-    void writeNumber(int n);
-
-    void writeNewline();
-    void writeNewlines(int numLines);
-
-    /** The symbol is written without quotes.  Symbols are required to begin with a
-        letter or underscore and contain only letters, underscores, and numbers 
-        or be a C++ symbol (e.g. "{", "(", "++", etc.)
-        so that they may be properly parsed by TextInput::readSymbol. Symbols are
-        printed with a trailing space.*/
-    void writeSymbol(const std::string& string);
-
-    /** Convenient idiom for writing multiple symbols in a row, e.g.
-        writeSymbols("name", "=");  The empty symbols are not written.
-        */
-    void writeSymbols(
-        const std::string& a,
-        const std::string& b = "",
-        const std::string& c = "",
-        const std::string& d = "",
-        const std::string& e = "",
-        const std::string& f = "");
-
-    /** Normal printf conventions.  Note that the output will be reformatted
-        for word-wrapping and newlines */
-    void __cdecl printf(const char* fmt, ...)
-        G3D_CHECK_PRINTF_METHOD_ARGS;
-
-    // Can't pass by reference because that confuses va_start
-    void __cdecl printf(const std::string fmt, ...);
-    void __cdecl vprintf(const char* fmt, va_list argPtr) 
-        G3D_CHECK_VPRINTF_METHOD_ARGS;
-};
-
-// Primitive serializers
-void serialize(const bool& b, TextOutput& to);
-void serialize(const int& b, TextOutput& to);
-void serialize(const uint8& b, TextOutput& to);
-void serialize(const double& b, TextOutput& to);
-void serialize(const float& b, TextOutput& to);
-void serialize(const std::string& b, TextOutput& to);
-void serialize(const char* b, TextOutput& to);
-
-}
-
-#endif
diff --git a/externals/g3dlite/G3D.lib/include/G3D/ThreadSet.h b/externals/g3dlite/G3D.lib/include/G3D/ThreadSet.h
deleted file mode 100644
index 59c57b062ae..00000000000
--- a/externals/g3dlite/G3D.lib/include/G3D/ThreadSet.h
+++ /dev/null
@@ -1,79 +0,0 @@
-#ifndef G3D_THREADSET_H
-#define G3D_THREADSET_H
-
-#include "G3D/platform.h"
-#include "G3D/Array.h"
-#include "G3D/ReferenceCount.h"
-#include "G3D/GThread.h"
-
-namespace G3D {
-
-/** Manages a set of threads. All methods are threadsafe except for
-    the iterator begin/end. 
-
-    @beta*/
-class ThreadSet : public ReferenceCountedObject {
-public:
-    /** Intended to allow future use with a template parameter.*/
-    typedef GThread                                        Thread;
-
-    typedef ReferenceCountedPointer                ThreadRef;
-    typedef ReferenceCountedPointer             Ref;
-    typedef Array::Iterator                     Iterator;
-    typedef Array::ConstIterator                ConstIterator;
-
-private:
-
-    /** Protects m_thread */
-    GMutex                m_lock;
-
-    /** Threads in the set */
-    Array      m_thread;
-
-public:
-    
-    /** Total number of threads (some of which may be completed). */
-    int size() const;
-
-    /** Number of threads that have been started */
-    int numStarted() const;
-
-    /** Start all threads that are not currently started */
-    void start() const;
-
-    /** Terminate all threads that are currently started */
-    void terminate() const;
-
-    /** Waits until all started threads have completed. */
-    void waitForCompletion() const;
-
-    /** Remove all (not stopping them) */
-    void clear();
-
-    /** Removes completed threads and returns the new size.*/
-    int removeCompleted();
-
-    /** Inserts a new thread, if it is not already present, and 
-        returns the new number of threads.*/
-    int insert(const ThreadRef& t);
-
-    /** Removes a thread. Returns true if the thread was present and
-        removed. */
-    bool remove(const ThreadRef& t);
-
-    bool contains(const ThreadRef& t) const;
-   
-    /** It is an error to mutate the ThreadSet while iterating through it. */
-    Iterator begin();
-
-    Iterator end();
-
-    ConstIterator begin() const;
-
-    ConstIterator end() const;
-};
-
-
-} // namespace G3D
-
-#endif
diff --git a/externals/g3dlite/G3D.lib/include/G3D/Triangle.h b/externals/g3dlite/G3D.lib/include/G3D/Triangle.h
deleted file mode 100644
index 8b67acf4624..00000000000
--- a/externals/g3dlite/G3D.lib/include/G3D/Triangle.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/**
- @file Triangle.h
-  
- @maintainer Morgan McGuire, matrix@graphics3d.com
- 
- @created 2003-04-05
- @edited  2008-10-06
-
- @cite Random point method by  Greg Turk, Generating random points in triangles.  In A. S. Glassner, ed., Graphics Gems, pp. 24-28. Academic Press, 1990
-
- Copyright 2000-2008, Morgan McGuire.
- All rights reserved.
- */
-
-#ifndef G3D_TRIANGLE_H
-#define G3D_TRIANGLE_H
-
-#include "G3D/platform.h"
-#include "G3D/g3dmath.h"
-#include "G3D/Vector3.h"
-#include "G3D/Plane.h"
-#include "G3D/BoundsTrait.h"
-#include "G3D/debugAssert.h"
-#include 
-
-namespace G3D {
-
-/**
-  A generic triangle representation.  This should not be used
-  as the underlying triangle for creating models; it is intended
-  for providing fast property queries but requires a lot of
-  storage and is mostly immutable.
-  */
-class Triangle {
-private:
-    friend class CollisionDetection;
-    friend class Ray;
-
-    Vector3                     _vertex[3];
-
-    /** edgeDirection[i] is the normalized vector v[i+1] - v[i] */
-    Vector3                     edgeDirection[3];
-    float                       edgeMagnitude[3];
-    Plane                       _plane;
-    Vector3::Axis               _primaryAxis;
-
-    /** vertex[1] - vertex[0] */
-    Vector3                     _edge01;
-
-    /** vertex[2] - vertex[0] */
-    Vector3                     _edge02;
-
-    float                       _area;
-
-    void init(const Vector3& v0, const Vector3& v1, const Vector3& v2);
-
-public:
-	
-    Triangle(class BinaryInput& b);
-	void serialize(class BinaryOutput& b);
-	void deserialize(class BinaryInput& b);
-
-    Triangle();
-    
-    Triangle(const Vector3& v0, const Vector3& v1, const Vector3& v2);
-    
-    ~Triangle();
-
-    /** 0, 1, or 2 */
-    inline const Vector3& vertex(int n) const {
-        debugAssert((n >= 0) && (n < 3));
-        return _vertex[n];
-    }
-
-    /** vertex[1] - vertex[0] */
-    inline const Vector3& edge01() const {
-        return _edge01;
-    }
-
-    /** vertex[2] - vertex[0] */
-    inline const Vector3& edge02() const {
-        return _edge02;
-    }
-
-    float area() const;
-
-    Vector3::Axis primaryAxis() const {
-        return _primaryAxis;
-    }
-
-    const Vector3& normal() const;
-
-    /** Barycenter */
-    Vector3 center() const;
-
-    const Plane& plane() const;
-
-    /** Returns a random point in the triangle. */
-    Vector3 randomPoint() const;
-
-    inline void getRandomSurfacePoint(Vector3& P, 
-                                       Vector3& N = Vector3::dummy) const {
-        P = randomPoint();
-        N = normal();
-    }
-    /**
-     For two triangles to be equal they must have
-     the same vertices in the same order.
-     That is, vertex[0] == vertex[0], etc.
-     */
-    inline bool operator==(const Triangle& other) const {
-        for (int i = 0; i < 3; ++i) {
-            if (_vertex[i] != other._vertex[i]) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    inline size_t hashCode() const {
-        return
-            _vertex[0].hashCode() +
-            (_vertex[1].hashCode() >> 2) +
-            (_vertex[2].hashCode() >> 3);
-    }
-
-    void getBounds(class AABox&) const;
-
-};
-
-} // namespace G3D
-
-template <> struct HashTrait {
-    static size_t hashCode(const G3D::Triangle& key) { return key.hashCode(); }
-};
-
-
-template<> struct BoundsTrait {
-    static void getBounds(const G3D::Triangle& t, G3D::AABox& out) { t.getBounds(out); }
-};
-
-#endif
diff --git a/externals/g3dlite/G3D.lib/include/G3D/UprightFrame.h b/externals/g3dlite/G3D.lib/include/G3D/UprightFrame.h
deleted file mode 100644
index 52db3080b80..00000000000
--- a/externals/g3dlite/G3D.lib/include/G3D/UprightFrame.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- @file UprightFrame.h
-
- @author Morgan McGuire, morgan@cs.williams.edu
- */
-
-#ifndef G3D_UPRIGHTFRAME_H
-#define G3D_UPRIGHTFRAME_H
-
-#include "G3D/platform.h"
-#include "G3D/Spline.h"
-#include "G3D/Vector3.h"
-#include "G3D/CoordinateFrame.h"
-
-namespace G3D {
-
-/**
- Coordinate frame expressed in Euler angles.
- Unlike a G3D::Quat, UprightFrame always keeps the reference frame from rolling about its own z axis.
- Particularly useful for cameras.
-
- @sa G3D::CoordinateFrame, G3D::Matrix4, G3D::PhysicsFrame, G3D::UprightSpline, G3D::UprightSplineManipulator
- */
-class UprightFrame {
-public:
-
-    Vector3         translation;
-
-    /** -pi/2 < pitch < pi/2 in radians about the X-axis */
-    float           pitch;
-
-    /** In radians about the Y-axis */
-    float           yaw;
-
-    inline UprightFrame(const Vector3& t = Vector3::zero(), float p = 0, float y = 0) 
-        : translation(t), pitch(p), yaw(y) {}
-
-    UprightFrame(const CoordinateFrame& cframe);
-    
-    CoordinateFrame toCoordinateFrame() const;
-
-    /** Supports implicit cast to CoordinateFrame */
-    inline operator CoordinateFrame() const {
-        return toCoordinateFrame();
-    }
-
-    /** Required for use with spline */
-    UprightFrame operator+(const UprightFrame& other) const;
-
-    /** Required for use with spline */
-    UprightFrame operator*(const float k) const;
-
-    /**
-       Unwraps the yaw values in the elements of the array such that
-       they still represent the same angles but strictly increase/decrease
-       without wrapping about zero.  For use with Spline
-     */
-    static void unwrapYaw(UprightFrame* a, int N);
-
-    void serialize(class BinaryOutput& b) const;
-    void deserialize(class BinaryInput& b);
-};
-
-/** Shortest-path linear velocity spline for camera positions.  Always keeps the camera from rolling.
-@sa G3D::UprightSplineManipulator, G3D::UprightFrame
-*/
-class UprightSpline : public Spline {
-protected:
-
-    virtual void ensureShortestPath(UprightFrame* A, int N) const {
-        UprightFrame::unwrapYaw(A, N);
-    }
-
-public:
-    
-    void serialize(class BinaryOutput& b) const;
-    void deserialize(class BinaryInput& b);
-
-};
-
-}
-
-#endif
diff --git a/externals/g3dlite/G3D.lib/include/G3D/Vector2.h b/externals/g3dlite/G3D.lib/include/G3D/Vector2.h
deleted file mode 100644
index b610a1a3500..00000000000
--- a/externals/g3dlite/G3D.lib/include/G3D/Vector2.h
+++ /dev/null
@@ -1,457 +0,0 @@
-/**
-  @file Vector2.h
- 
-  2D vector class
- 
-  @maintainer Morgan McGuire, morgan@cs.williams.edu
-  
-  @created 2001-06-02
-  @edited  2008-11-30
-
-  Copyright 2000-2008, Morgan McGuire.
-  All rights reserved.
-*/
-
-#ifndef G3D_VECTOR2_H
-#define G3D_VECTOR2_H
-
-#include 
-
-#include "G3D/platform.h"
-#include "G3D/g3dmath.h"
-#include "G3D/Table.h"
-#include "G3D/HashTrait.h"
-#include "G3D/Vector2int16.h"
-
-namespace G3D {
-
-class Vector2;    
-class Vector3;
-class Vector4;
-
-/**
- Do not subclass-- this implementation makes assumptions about the
- memory layout.
- */
-class Vector2 {
-private:
-    // Hidden operators
-    bool operator<(const Vector2&) const;
-    bool operator>(const Vector2&) const;
-    bool operator<=(const Vector2&) const;
-    bool operator>=(const Vector2&) const;
-
-public:
-    float x;
-    float y;
-
-    /** Creates the zero vector */
-    Vector2();
-    Vector2(class TextInput& t);
-    Vector2(class BinaryInput& b);
-    Vector2(float x, float y);
-    Vector2(float coordinate[2]);
-    Vector2(double coordinate[2]);
-    Vector2(const Vector2& other);
-    Vector2(const class Vector2int16& other); 
-
-    void serialize(class BinaryOutput& b) const;
-    void deserialize(class BinaryInput& b);
-
-    void serialize(class TextOutput& t) const;
-    void deserialize(class TextInput& t);
-
-    float& operator[](int i);
-    const float& operator[](int i) const;
-    operator float*();
-    operator const float*() const;
-
-    // assignment and comparison
-    Vector2& operator=(const Vector2& other);
-    bool operator==(const Vector2& other) const;
-    bool operator!=(const Vector2& other) const;
-    size_t hashCode() const;
-    bool fuzzyEq(const Vector2& other) const;
-    bool fuzzyNe(const Vector2& other) const;
-
-    /** Returns true if this vector has finite length */
-    bool isFinite() const;
-
-    /** Returns true if this vector has length == 0 */
-    bool isZero() const;
-
-    /** Returns true if this vector has length == 1 */
-    bool isUnit() const;
-
-    // arithmetic operations
-    Vector2 operator+(const Vector2& v) const;
-    Vector2 operator-(const Vector2& v) const;
-    Vector2 operator*(float s) const;
-
-    /** Array (pointwise) multiplication */
-    Vector2 operator*(const Vector2& v) const;
-
-    /** Array division */
-    Vector2 operator/(const Vector2& v) const;
-    Vector2 operator/(float s) const;
-
-    /** Unary minus */
-    Vector2 operator-() const;
-
-    /** x + y */
-    inline float sum() const {
-        return x + y;
-    }
-
-    /**
-     Linear interpolation
-     */
-    inline Vector2 lerp(const Vector2& v, float alpha) const {
-        return (*this) + (v - *this) * alpha; 
-    }
-
-    inline Vector2 clamp(const Vector2& low, const Vector2& high) const {
-        return Vector2(
-            G3D::clamp(x, low.x, high.x),
-            G3D::clamp(y, low.y, high.y));
-    }
-
-    inline Vector2 clamp(float low, float high) const {
-        return Vector2(
-            (float)G3D::clamp(x, low, high),
-            (float)G3D::clamp(y, low, high));
-    }
-
-    // arithmetic updates
-    Vector2& operator+=(const Vector2&);
-    Vector2& operator-=(const Vector2&);
-    Vector2& operator*=(float);
-    Vector2& operator/=(float);
-    Vector2& operator*=(const Vector2&);
-    Vector2& operator/=(const Vector2&);
-
-    // vector operations
-
-    /**  */
-    float length() const;
-    
-    /** Returns a unit-length vector */
-    Vector2 direction() const;
-
-    /**
-     Potentially less accurate but faster than direction().
-     Only works if System::hasSSE is true.
-     */
-    Vector2 fastDirection() const {
-        return direction();
-    }
-
-    float squaredLength() const;
-    float dot(const Vector2& s) const;
-
-    /**
-     Make this vector have unit length and return the old length.
-     If the vector length was less than tolerance, do not normalize.
-     */
-    float unitize(float fTolerance = 1e-06);
-
-    Vector2 min(const Vector2& v) const;
-    Vector2 max(const Vector2& v) const;
-
-    /** Uniformly distributed random vector on the unit sphere */
-    static Vector2 random();
-
-    // Special values.
-    // Intentionally not inlined: see Matrix3::identity() for details.
-    static const Vector2& zero();
-    inline static const Vector2& one() { static const Vector2 v(1, 1); return v; }
-    static const Vector2& unitX();
-    static const Vector2& unitY();
-    static const Vector2& inf(); 
-    static const Vector2& nan();
-    /** smallest (most negative) representable vector */
-    static const Vector2& minFinite(); 
-    /** Largest representable vector */
-    static const Vector2& maxFinite();
-
-    std::string toString() const;
-
-    // 2-char swizzles
-
-    Vector2 xx() const;
-    Vector2 yx() const;
-    Vector2 xy() const;
-    Vector2 yy() const;
-
-    // 3-char swizzles
-
-    Vector3 xxx() const;
-    Vector3 yxx() const;
-    Vector3 xyx() const;
-    Vector3 yyx() const;
-    Vector3 xxy() const;
-    Vector3 yxy() const;
-    Vector3 xyy() const;
-    Vector3 yyy() const;
-
-    // 4-char swizzles
-
-    Vector4 xxxx() const;
-    Vector4 yxxx() const;
-    Vector4 xyxx() const;
-    Vector4 yyxx() const;
-    Vector4 xxyx() const;
-    Vector4 yxyx() const;
-    Vector4 xyyx() const;
-    Vector4 yyyx() const;
-    Vector4 xxxy() const;
-    Vector4 yxxy() const;
-    Vector4 xyxy() const;
-    Vector4 yyxy() const;
-    Vector4 xxyy() const;
-    Vector4 yxyy() const;
-    Vector4 xyyy() const;
-    Vector4 yyyy() const;
-
-};
-
-inline Vector2 operator*(double s, const Vector2& v) {
-    return v * (float)s;
-}
-
-inline Vector2 operator*(float s, const Vector2& v) {
-    return v * s;
-}
-
-inline Vector2 operator*(int s, const Vector2& v) {
-    return v * (float)s;
-}
-
-
-inline Vector2::Vector2 () : x(0.0f), y(0.0f) {
-}
-
-
-inline Vector2::Vector2(float _x, float _y) : x(_x), y(_y) {
-}
-
-
-inline Vector2::Vector2 (float afCoordinate[2]) {
-    x = afCoordinate[0];
-    y = afCoordinate[1];
-}
-
-
-
-inline Vector2::Vector2 (double afCoordinate[2]) {
-    x = (float)afCoordinate[0];
-    y = (float)afCoordinate[1];
-}
-
-
-inline Vector2::Vector2 (const Vector2& rkVector) {
-    x = rkVector.x;
-    y = rkVector.y;
-}
-
-
-inline Vector2::Vector2 (const Vector2int16& v) : x(v.x), y(v.y) {
-}
-
-
-inline float& Vector2::operator[] (int i) {
-    return ((float*)this)[i];
-}
-
-
-inline const float& Vector2::operator[] (int i) const {
-    return ((float*)this)[i];
-}
-
-
-inline Vector2::operator float* () {
-    return (float*)this;
-}
-
-inline Vector2::operator const float* () const {
-    return (float*)this;
-}
-
-
-inline Vector2& Vector2::operator= (const Vector2& rkVector) {
-    x = rkVector.x;
-    y = rkVector.y;
-    return *this;
-}
-
-
-inline bool Vector2::operator== (const Vector2& rkVector) const {
-    return ( x == rkVector.x && y == rkVector.y);
-}
-
-
-inline bool Vector2::operator!= (const Vector2& rkVector) const {
-    return ( x != rkVector.x || y != rkVector.y);
-}
-
-
-inline Vector2 Vector2::operator+ (const Vector2& rkVector) const {
-    return Vector2(x + rkVector.x, y + rkVector.y);
-}
-
-
-inline Vector2 Vector2::operator- (const Vector2& rkVector) const {
-    return Vector2(x - rkVector.x, y - rkVector.y);
-}
-
-
-inline Vector2 Vector2::operator* (float fScalar) const {
-    return Vector2(fScalar*x, fScalar*y);
-}
-
-
-
-inline Vector2 Vector2::operator- () const {
-    return Vector2( -x, -y);
-}
-
-
-
-inline Vector2& Vector2::operator+= (const Vector2& rkVector) {
-    x += rkVector.x;
-    y += rkVector.y;
-    return *this;
-}
-
-
-
-inline Vector2& Vector2::operator-= (const Vector2& rkVector) {
-    x -= rkVector.x;
-    y -= rkVector.y;
-    return *this;
-}
-
-
-
-inline Vector2& Vector2::operator*= (float fScalar) {
-    x *= fScalar;
-    y *= fScalar;
-    return *this;
-}
-
-
-
-
-inline Vector2& Vector2::operator*= (const Vector2& rkVector) {
-    x *= rkVector.x;
-    y *= rkVector.y;
-    return *this;
-}
-
-
-
-inline Vector2& Vector2::operator/= (const Vector2& rkVector) {
-    x /= rkVector.x;
-    y /= rkVector.y;
-    return *this;
-}
-
-
-inline Vector2 Vector2::operator* (const Vector2& rkVector) const {
-    return Vector2(x * rkVector.x, y * rkVector.y);
-}
-
-
-
-inline Vector2 Vector2::operator/ (const Vector2& rkVector) const {
-    return Vector2(x / rkVector.x, y / rkVector.y);
-}
-
-
-inline float Vector2::squaredLength () const {
-    return x*x + y*y;
-}
-
-
-inline float Vector2::length () const {
-    return sqrtf(x*x + y*y);
-}
-
-
-inline Vector2 Vector2::direction () const {
-    float lenSquared = x * x + y * y;
-
-    if (lenSquared != 1.0f) {
-        return *this / sqrtf(lenSquared);
-    } else {
-        return *this;
-    }
-}
-
-
-
-inline float Vector2::dot (const Vector2& rkVector) const {
-    return x*rkVector.x + y*rkVector.y;
-}
-
-
-
-inline Vector2 Vector2::min(const Vector2 &v) const {
-    return Vector2(G3D::min(v.x, x), G3D::min(v.y, y));
-}
-
-
-
-inline Vector2 Vector2::max(const Vector2 &v) const {
-    return Vector2(G3D::max(v.x, x), G3D::max(v.y, y));
-}
-
-
-
-inline bool Vector2::fuzzyEq(const Vector2& other) const {
-    return G3D::fuzzyEq((*this - other).squaredLength(), 0);
-}
-
-
-
-inline bool Vector2::fuzzyNe(const Vector2& other) const {
-    return G3D::fuzzyNe((*this - other).squaredLength(), 0);
-}
-
-
-
-inline bool Vector2::isFinite() const {
-    return G3D::isFinite(x) && G3D::isFinite(y);
-}
-
-
-
-inline bool Vector2::isZero() const {
-    return (x == 0.0f) && (y == 0.0f);
-}
-
-
-
-inline bool Vector2::isUnit() const {
-    return squaredLength() == 1.0f;
-}
-
-} // namespace G3D
-
-template <>
-struct HashTrait {
-    static size_t hashCode(const G3D::Vector2& key) {
-        return key.hashCode();
-    }
-};
-
-
-// Intentionally outside namespace to avoid operator overloading confusion
-inline G3D::Vector2 operator*(double s, const G3D::Vector2& v) {
-    return v * (float)s;
-}
-inline G3D::Vector2 operator*(int s, const G3D::Vector2& v) {
-    return v * (float)s;
-}
-
-#endif
diff --git a/externals/g3dlite/G3D.lib/include/G3D/Vector2int16.h b/externals/g3dlite/G3D.lib/include/G3D/Vector2int16.h
deleted file mode 100644
index b7149ad6c90..00000000000
--- a/externals/g3dlite/G3D.lib/include/G3D/Vector2int16.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/**
-  @file Vector2int16.h
-  
-  @maintainer Morgan McGuire, matrix@brown.edu
-
-  @created 2003-08-09
-  @edited  2004-01-03
-
-  Copyright 2000-2006, Morgan McGuire.
-  All rights reserved.
- */
-
-#ifndef VECTOR2INT16_H
-#define VECTOR2INT16_H
-
-#include "G3D/platform.h"
-#include "G3D/g3dmath.h"
-#include "G3D/HashTrait.h"
-
-namespace G3D {
-
-/**
- A Vector2 that packs its fields into uint16s.
- */
-#ifdef G3D_WIN32
-    // Switch to tight alignment
-    #pragma pack(push, 2)
-#endif
-
-class Vector2int16 {
-private:
-    // Hidden operators
-    bool operator<(const Vector2int16&) const;
-    bool operator>(const Vector2int16&) const;
-    bool operator<=(const Vector2int16&) const;
-    bool operator>=(const Vector2int16&) const;
-
-public:
-    G3D::int16              x;
-    G3D::int16              y;
-
-    Vector2int16() : x(0), y(0) {}
-    Vector2int16(G3D::int16 _x, G3D::int16 _y) : x(_x), y(_y){}
-    Vector2int16(const class Vector2& v);
-    Vector2int16(class BinaryInput& bi);
-
-    inline G3D::int16& operator[] (int i) {
-        debugAssert(((unsigned int)i) <= 1);
-        return ((G3D::int16*)this)[i];
-    }
-
-    inline const G3D::int16& operator[] (int i) const {
-        debugAssert(((unsigned int)i) <= 1);
-        return ((G3D::int16*)this)[i];
-    }
-
-    inline Vector2int16 operator+(const Vector2int16& other) const {
-        return Vector2int16(x + other.x, y + other.y);
-    }
-
-    inline Vector2int16 operator-(const Vector2int16& other) const {
-        return Vector2int16(x - other.x, y - other.y);
-    }
-
-    inline Vector2int16 operator*(const Vector2int16& other) const {
-        return Vector2int16(x * other.x, y * other.y);
-    }
-
-    inline Vector2int16 operator*(const int s) const {
-        return Vector2int16(x * s, y * s);
-    }
-
-    inline Vector2int16& operator+=(const Vector2int16& other) {
-        x += other.x;
-        y += other.y;
-        return *this;
-    }
-
-    /** Shifts both x and y */
-    inline Vector2int16 operator>>(const int s) const {
-        return Vector2int16(x >> s, y >> s);
-    }
-
-    /** Shifts both x and y */
-    inline Vector2int16 operator<<(const int s) const {
-        return Vector2int16(x << s, y << s);
-    }
-
-    inline Vector2int16& operator-=(const Vector2int16& other) {
-        x -= other.x;
-        y -= other.y;
-        return *this;
-    }
-
-    inline Vector2int16& operator*=(const Vector2int16& other) {
-        x *= other.x;
-        y *= other.y;
-        return *this;
-    }
-
-    Vector2int16 clamp(const Vector2int16& lo, const Vector2int16& hi);
-
-    inline bool operator== (const Vector2int16& rkVector) const {
-        return ((int32*)this)[0] == ((int32*)&rkVector)[0];
-    }
-
-    inline bool operator!= (const Vector2int16& rkVector) const {
-        return ((int32*)this)[0] != ((int32*)&rkVector)[0];
-    }
-
-    Vector2int16 max(const Vector2int16& v) const {
-        return Vector2int16(iMax(x, v.x), iMax(y, v.y));
-    }
-
-    Vector2int16 min(const Vector2int16& v) const {
-        return Vector2int16(iMin(x, v.x), iMin(y, v.y));
-    }
-
-    void serialize(class BinaryOutput& bo) const;
-    void deserialize(class BinaryInput& bi);
-}
-#if defined(G3D_LINUX) || defined(G3D_OSX)
-    __attribute((aligned(1)))
-#endif
-;
-
-#ifdef G3D_WIN32
-    #pragma pack(pop)
-#endif
-
-}
-
-template<> struct HashTrait {
-    static size_t hashCode(const G3D::Vector2int16& key) { return static_cast(key.x + ((int)key.y << 16)); }
-};
-
-#endif
diff --git a/externals/g3dlite/G3D.lib/include/G3D/Vector3.h b/externals/g3dlite/G3D.lib/include/G3D/Vector3.h
deleted file mode 100644
index d37638a229d..00000000000
--- a/externals/g3dlite/G3D.lib/include/G3D/Vector3.h
+++ /dev/null
@@ -1,761 +0,0 @@
-/**
-  @file Vector3.h
- 
-  3D vector class
- 
-  @maintainer Morgan McGuire, morgan@cs.williams.edu
-
-  @created 2001-06-02
-  @edited  2008-11-01
-  Copyright 2000-2008, Morgan McGuire.
-  All rights reserved.
- */
-
-#ifndef G3D_VECTOR3_H
-#define G3D_VECTOR3_H
-
-#include "G3D/platform.h"
-#include "G3D/g3dmath.h"
-#include "G3D/Vector2.h"
-#include "G3D/Table.h"
-#include "G3D/HashTrait.h"
-#include "G3D/PositionTrait.h"
-#include "G3D/Vector2.h"
-#include 
-#include 
-
-//----------------------------------------------------------------------------
-#ifdef SSE
-	// If you receive an error on this line, it is because you do not have the file
-	// xmmintrin.h needed for MMX & SSE extensions.  Download and install
-    //
-    // http://download.microsoft.com/download/vstudio60ent/SP5/Wideband-Full/WIN98Me/EN-US/vs6sp5.exe
-	// and
-    // http://download.microsoft.com/download/vb60ent/Update/6/W9X2KXP/EN-US/vcpp5.exe
-    //
-    // to get this file.
-#   include 
-#endif
-
-namespace G3D {
-
-class Vector2;    
-class Vector3;
-class Vector4;
-class Vector4int8;
-
-/**
-  Swizzles
- Vector classes have swizzle operators, e.g. v.xy(), that
- allow selection of arbitrary sub-fields.  These cannot be used as write 
- masks.  Examples
-
-  
-Vector3 v(1, 2, 3);
-Vector3 j;
-Vector2 b;
-
-b = v.xz();
-j = b.xx();
-

-
-
-  Warning
-
- Do not subclass-- this implementation makes assumptions about the
- memory layout.
- */
-class Vector3 {
-private:
-    /**
-     Reflect this vector about the (not necessarily unit) normal.
-     Note that if used for a collision or ray reflection you
-     must negate the resulting vector to get a direction pointing
-     away from the collision.
-
-     
-       V'    N      V
-                 
-         r   ^   -,
-          \  |  /
-            \|/
-     

-
-     See also Vector3::reflectionDirection
-     */
-    Vector3 reflectAbout(const Vector3& normal) const;
-
-    // Hidden operators
-    bool operator<(const Vector3&) const;
-    bool operator>(const Vector3&) const;
-    bool operator<=(const Vector3&) const;
-    bool operator>=(const Vector3&) const;
-
-public:
-    // construction
-    Vector3();
-
-    /** Divides by 127 */
-    Vector3(const Vector4int8&);
-    explicit Vector3(class BinaryInput& b);
-    Vector3(float _x, float _y, float _z);
-    explicit Vector3(const class Vector2& v, float _z);
-    explicit Vector3(float coordinate[3]);
-    explicit Vector3(double coordinate[3]);
-    Vector3(const Vector3& rkVector);
-    Vector3(const class Vector3int16& v);
-	explicit Vector3(class TextInput& t);
-
-	/** Format is three float32's */
-    void serialize(class BinaryOutput& b) const;
-    void deserialize(class BinaryInput& b);
-
-	/** Format is "(%f, %f, %f)" */
-    void serialize(class TextOutput& t) const;
-    void deserialize(class TextInput& t);
-    
-    // coordinates
-    float x, y, z;
-
-    // access vector V as V[0] = V.x, V[1] = V.y, V[2] = V.z
-    //
-    // WARNING.  These member functions rely on
-    // (1) Vector3 not having virtual functions
-    // (2) the data packed in a 3*sizeof(float) memory block
-    const float& operator[] (int i) const;
-    float& operator[] (int i);
-
-    inline operator float* () {
-        return (float*)this;
-    }
-
-    operator const float* () const {
-        return (float*)this;
-    }
-
-    enum Axis {X_AXIS=0, Y_AXIS=1, Z_AXIS=2, DETECT_AXIS=-1};
-
-    /**
-     Returns the largest dimension.  Particularly convenient for determining
-     which plane to project a triangle onto for point-in-polygon tests.
-     */
-    Axis primaryAxis() const;
-
-    // assignment and comparison
-    Vector3& operator= (const Vector3& rkVector);
-    bool operator== (const Vector3& rkVector) const;
-    bool operator!= (const Vector3& rkVector) const;
-    size_t hashCode() const;
-    bool fuzzyEq(const Vector3& other) const;
-    bool fuzzyNe(const Vector3& other) const;
-
-    /** Returns true if this vector has finite length. */
-    bool isFinite() const;
-
-    /** Returns true if this vector has length ~= 0 */
-    bool isZero() const;
-
-    /** Returns true if this vector has length ~= 1 */
-    bool isUnit() const;
-    
-    // arithmetic operations
-    Vector3 operator+ (const Vector3& v) const;
-    Vector3 operator- (const Vector3& v) const;
-    Vector3 operator* (float s) const;
-    Vector3 operator/ (float s) const;
-    Vector3 operator* (const Vector3& v) const;
-    Vector3 operator/ (const Vector3& v) const;
-    Vector3 operator- () const;
-
-    // arithmetic updates
-    Vector3& operator+= (const Vector3& v);
-    Vector3& operator-= (const Vector3& v);
-    Vector3& operator*= (float s);
-    Vector3& operator/= (float s);
-    Vector3& operator*= (const Vector3& v);
-    Vector3& operator/= (const Vector3& v);
-
-    /** Same as magnitude */
-	float length() const;
-
-    float magnitude() const;
-    
-    /**
-     The result is a nan vector if the length is almost zero.
-     */
-    Vector3 direction() const;
-
-    /**
-     Potentially less accurate but faster than direction().
-     Only works if System::hasSSE is true.
-     */
-    Vector3 fastDirection() const;
-
-
-    /**
-      See also G3D::Ray::reflect.
-      The length is 1. 
-     
-       V'    N       V
-                 
-         r   ^    /
-          \  |  /
-            \|'-
-     

-     */
-    Vector3 reflectionDirection(const Vector3& normal) const;
-    
-
-    /**
-     Returns Vector3::zero() if the length is nearly zero, otherwise
-     returns a unit vector.
-     */
-    inline Vector3 directionOrZero() const {
-        float mag = magnitude();
-        if (G3D::fuzzyEq(mag, 0.0f)) {
-            return Vector3::zero();
-        } else if (G3D::fuzzyEq(mag, 1.0f)) {
-            return *this;
-        } else {
-            return *this * (1.0f / mag);
-        }
-    }
-
-    /**
-     Returns the direction of a refracted ray,
-     where iExit is the index of refraction for the
-     previous material and iEnter is the index of refraction
-     for the new material.  Like Vector3::reflectionDirection,
-     the result has length 1 and is 
-     pointed away from the intersection.
-
-     Returns Vector3::zero() in the case of total internal refraction.
-
-     @param iOutside The index of refraction (eta) outside
-     (on the positive normal side) of the surface.
-
-     @param iInside The index of refraction (eta) inside
-     (on the negative normal side) of the surface.
-
-     See also G3D::Ray::refract.
-     
-              N      V
-                  
-              ^    /
-              |  /
-              |'-
-          __--
-     V'<--
-     

-     */
-    Vector3 refractionDirection(
-        const Vector3&  normal,
-        float           iInside,
-        float           iOutside) const;
-
-    /** Synonym for direction */
-    inline Vector3 unit() const {
-        return direction();
-    }
-
-    /** Returns a normalized vector.  May be computed with lower
-        precision than unit */
-    inline Vector3 fastUnit() const {
-        return fastDirection();
-    }
-
-    /** Same as squaredMagnitude */
-    float squaredLength() const;
-
-    float squaredMagnitude () const;
-	
-    float dot(const Vector3& rkVector) const;
-    
-    float unitize(float tolerance = 1e-06);
-
-    /** Cross product.  Note that two cross products in a row
-        can be computed more cheaply: v1 x (v2 x v3) = (v1 dot v3) v2  - (v1 dot v2) v3.
-      */
-    Vector3 cross(const Vector3& rkVector) const;
-    Vector3 unitCross (const Vector3& rkVector) const;
-
-    /**
-     Returns a matrix such that v.cross() * w = v.cross(w).
-     
-     [ 0  -v.z  v.y ]
-     [ v.z  0  -v.x ]
-     [ -v.y v.x  0  ]
-     

-     */
-    class Matrix3 cross() const;
-
-    Vector3 min(const Vector3 &v) const;
-    Vector3 max(const Vector3 &v) const;
-
-    /** Smallest element */
-    inline float min() const {
-        return G3D::min(G3D::min(x, y), z);
-    }
-
-    /** Largest element */
-    inline float max() const {
-        return G3D::max(G3D::max(x, y), z);
-    }
-
-    std::string toString() const;
-
-    inline Vector3 clamp(const Vector3& low, const Vector3& high) const {
-        return Vector3(
-            G3D::clamp(x, low.x, high.x),
-            G3D::clamp(y, low.y, high.y),
-            G3D::clamp(z, low.z, high.z));
-    }
-
-    inline Vector3 clamp(float low, float high) const {
-        return Vector3(
-            G3D::clamp(x, low, high),
-            G3D::clamp(y, low, high),
-            G3D::clamp(z, low, high));
-    }
-
-    /**
-     Linear interpolation
-     */
-    inline Vector3 lerp(const Vector3& v, float alpha) const {
-        return (*this) + (v - *this) * alpha; 
-    }
-
-    /** Gram-Schmidt orthonormalization. */
-    static void orthonormalize (Vector3 akVector[3]);
-
-    /** Random unit vector, uniformly distributed */
-    static Vector3 random();
-
-    /** Random unit vector, distributed
-        so that the probability of V is proportional 
-        to max(V dot Normal, 0).
-
-        @cite Henrik Wann Jensen, Realistic Image Synthesis using Photon Mapping eqn 2.24
-    */
-    static Vector3 cosRandom(const Vector3& normal);
-
-
-    /**
-     Random vector distributed over the hemisphere about normal.
-     */
-    static Vector3 hemiRandom(const Vector3& normal);
-
-    // Input W must be initialize to a nonzero vector, output is {U,V,W}
-    // an orthonormal basis.  A hint is provided about whether or not W
-    // is already unit length.
-    static void generateOrthonormalBasis (Vector3& rkU, Vector3& rkV,
-                                          Vector3& rkW, bool bUnitLengthW = true);
-
-    inline float sum() const {
-        return x + y + z;
-    }
-
-    inline float average() const {
-        return sum() / 3.0f;
-    }
-
-    // Special values.
-    inline static const Vector3& zero()     { static Vector3 v(0, 0, 0); return v; }
-    inline static const Vector3& one()      { static Vector3 v(1, 1, 1); return v; }
-    inline static const Vector3& unitX()    { static Vector3 v(1, 0, 0); return v; }
-    inline static const Vector3& unitY()    { static Vector3 v(0, 1, 0); return v; }
-    inline static const Vector3& unitZ()    { static Vector3 v(0, 0, 1); return v; }
-    inline static const Vector3& inf()      { static Vector3 v((float)G3D::inf(), (float)G3D::inf(), (float)G3D::inf()); return v; }
-    inline static const Vector3& nan()      { static Vector3 v((float)G3D::nan(), (float)G3D::nan(), (float)G3D::nan()); return v; }
-    /** Smallest (most negative) representable vector */
-    inline static const Vector3& minFinite(){ static Vector3 v(-FLT_MAX, -FLT_MAX, -FLT_MAX); return v; }
-    /** Largest representable vector */
-    inline static const Vector3& maxFinite(){ static Vector3 v(FLT_MAX, FLT_MAX, FLT_MAX); return v; }
-
-    // 2-char swizzles
-
-    Vector2 xx() const;
-    Vector2 yx() const;
-    Vector2 zx() const;
-    Vector2 xy() const;
-    Vector2 yy() const;
-    Vector2 zy() const;
-    Vector2 xz() const;
-    Vector2 yz() const;
-    Vector2 zz() const;
-
-    // 3-char swizzles
-
-    Vector3 xxx() const;
-    Vector3 yxx() const;
-    Vector3 zxx() const;
-    Vector3 xyx() const;
-    Vector3 yyx() const;
-    Vector3 zyx() const;
-    Vector3 xzx() const;
-    Vector3 yzx() const;
-    Vector3 zzx() const;
-    Vector3 xxy() const;
-    Vector3 yxy() const;
-    Vector3 zxy() const;
-    Vector3 xyy() const;
-    Vector3 yyy() const;
-    Vector3 zyy() const;
-    Vector3 xzy() const;
-    Vector3 yzy() const;
-    Vector3 zzy() const;
-    Vector3 xxz() const;
-    Vector3 yxz() const;
-    Vector3 zxz() const;
-    Vector3 xyz() const;
-    Vector3 yyz() const;
-    Vector3 zyz() const;
-    Vector3 xzz() const;
-    Vector3 yzz() const;
-    Vector3 zzz() const;
-
-    // 4-char swizzles
-
-    Vector4 xxxx() const;
-    Vector4 yxxx() const;
-    Vector4 zxxx() const;
-    Vector4 xyxx() const;
-    Vector4 yyxx() const;
-    Vector4 zyxx() const;
-    Vector4 xzxx() const;
-    Vector4 yzxx() const;
-    Vector4 zzxx() const;
-    Vector4 xxyx() const;
-    Vector4 yxyx() const;
-    Vector4 zxyx() const;
-    Vector4 xyyx() const;
-    Vector4 yyyx() const;
-    Vector4 zyyx() const;
-    Vector4 xzyx() const;
-    Vector4 yzyx() const;
-    Vector4 zzyx() const;
-    Vector4 xxzx() const;
-    Vector4 yxzx() const;
-    Vector4 zxzx() const;
-    Vector4 xyzx() const;
-    Vector4 yyzx() const;
-    Vector4 zyzx() const;
-    Vector4 xzzx() const;
-    Vector4 yzzx() const;
-    Vector4 zzzx() const;
-    Vector4 xxxy() const;
-    Vector4 yxxy() const;
-    Vector4 zxxy() const;
-    Vector4 xyxy() const;
-    Vector4 yyxy() const;
-    Vector4 zyxy() const;
-    Vector4 xzxy() const;
-    Vector4 yzxy() const;
-    Vector4 zzxy() const;
-    Vector4 xxyy() const;
-    Vector4 yxyy() const;
-    Vector4 zxyy() const;
-    Vector4 xyyy() const;
-    Vector4 yyyy() const;
-    Vector4 zyyy() const;
-    Vector4 xzyy() const;
-    Vector4 yzyy() const;
-    Vector4 zzyy() const;
-    Vector4 xxzy() const;
-    Vector4 yxzy() const;
-    Vector4 zxzy() const;
-    Vector4 xyzy() const;
-    Vector4 yyzy() const;
-    Vector4 zyzy() const;
-    Vector4 xzzy() const;
-    Vector4 yzzy() const;
-    Vector4 zzzy() const;
-    Vector4 xxxz() const;
-    Vector4 yxxz() const;
-    Vector4 zxxz() const;
-    Vector4 xyxz() const;
-    Vector4 yyxz() const;
-    Vector4 zyxz() const;
-    Vector4 xzxz() const;
-    Vector4 yzxz() const;
-    Vector4 zzxz() const;
-    Vector4 xxyz() const;
-    Vector4 yxyz() const;
-    Vector4 zxyz() const;
-    Vector4 xyyz() const;
-    Vector4 yyyz() const;
-    Vector4 zyyz() const;
-    Vector4 xzyz() const;
-    Vector4 yzyz() const;
-    Vector4 zzyz() const;
-    Vector4 xxzz() const;
-    Vector4 yxzz() const;
-    Vector4 zxzz() const;
-    Vector4 xyzz() const;
-    Vector4 yyzz() const;
-    Vector4 zyzz() const;
-    Vector4 xzzz() const;
-    Vector4 yzzz() const;
-    Vector4 zzzz() const;
-
-    /** A value that can be passed to ignore a parameter.  Never look at the result of dummy. */
-    static Vector3 dummy;
-};
-
-inline G3D::Vector3 operator*(float s, const G3D::Vector3& v) {
-    return v * s;
-}
-
-inline G3D::Vector3 operator*(double s, const G3D::Vector3& v) {
-    return v * (float)s;
-}
-
-inline G3D::Vector3 operator*(int s, const G3D::Vector3& v) {
-    return v * (float)s;
-}
-
-std::ostream& operator<<(std::ostream& os, const Vector3&);
-
-
-void serialize(const Vector3::Axis& a, class BinaryOutput& bo);
-void deserialize(Vector3::Axis& a, class BinaryInput& bo);
-
-
-//----------------------------------------------------------------------------
-inline Vector3::Vector3() : x(0.0f), y(0.0f), z(0.0f) {
-}
-
-//----------------------------------------------------------------------------
-
-inline Vector3::Vector3 (float fX, float fY, float fZ) : x(fX), y(fY), z(fZ) {
-}
-
-//----------------------------------------------------------------------------
-inline Vector3::Vector3 (float V[3]) : x(V[0]), y(V[1]), z(V[2]){
-}
-//----------------------------------------------------------------------------
-inline Vector3::Vector3 (double V[3]) : x((float)V[0]), y((float)V[1]), z((float)V[2]){
-}
-
-//----------------------------------------------------------------------------
-inline Vector3::Vector3 (const Vector3& V) : x(V.x), y(V.y), z(V.z) {
-}
-
-//----------------------------------------------------------------------------
-
-//inline Vector3::Vector3 (const __m128& m) {
-    // Cast from SSE packed floats
-//    *this = *(Vector3*)&m;
-//}
-
-//----------------------------------------------------------------------------
-inline const float& Vector3::operator[] (int i) const {
-    return ((float*)this)[i];
-}
-
-inline float& Vector3::operator[] (int i) {
-    return ((float*)this)[i];
-}
-
-
-//----------------------------------------------------------------------------
-inline Vector3& Vector3::operator= (const Vector3& rkVector) {
-    x = rkVector.x;
-    y = rkVector.y;
-    z = rkVector.z;
-    return *this;
-}
-
-//----------------------------------------------------------------------------
-
-inline bool Vector3::fuzzyEq(const Vector3& other) const {
-    return G3D::fuzzyEq((*this - other).squaredMagnitude(), 0);
-}
-
-//----------------------------------------------------------------------------
-
-inline bool Vector3::fuzzyNe(const Vector3& other) const {
-    return G3D::fuzzyNe((*this - other).squaredMagnitude(), 0);
-}
-
-//----------------------------------------------------------------------------
-
-inline bool Vector3::isFinite() const {
-    return G3D::isFinite(x) && G3D::isFinite(y) && G3D::isFinite(z);
-}
-
-//----------------------------------------------------------------------------
-inline bool Vector3::operator== (const Vector3& rkVector) const {
-    return ( x == rkVector.x && y == rkVector.y && z == rkVector.z );
-}
-
-//----------------------------------------------------------------------------
-inline bool Vector3::operator!= (const Vector3& rkVector) const {
-    return ( x != rkVector.x || y != rkVector.y || z != rkVector.z );
-}
-
-//----------------------------------------------------------------------------
-inline Vector3 Vector3::operator+ (const Vector3& rkVector) const {
-    return Vector3(x + rkVector.x, y + rkVector.y, z + rkVector.z);
-}
-
-//----------------------------------------------------------------------------
-inline Vector3 Vector3::operator- (const Vector3& rkVector) const {
-    return Vector3(x - rkVector.x, y - rkVector.y, z - rkVector.z);
-}
-
-//----------------------------------------------------------------------------
-inline Vector3 Vector3::operator* (const Vector3& rkVector) const {
-    return Vector3(x * rkVector.x, y * rkVector.y, z * rkVector.z);
-}
-
-inline Vector3 Vector3::operator*(float f) const {
-    return Vector3(x * f, y * f, z * f);
-}
-
-//----------------------------------------------------------------------------
-inline Vector3 Vector3::operator/ (const Vector3& rkVector) const {
-    return Vector3(x / rkVector.x, y / rkVector.y, z / rkVector.z);
-}
-
-//----------------------------------------------------------------------------
-inline Vector3 Vector3::operator- () const {
-    return Vector3(-x, -y, -z);
-}
-
-//----------------------------------------------------------------------------
-inline Vector3& Vector3::operator+= (const Vector3& rkVector) {
-    x += rkVector.x;
-    y += rkVector.y;
-    z += rkVector.z;
-    return *this;
-}
-
-//----------------------------------------------------------------------------
-inline Vector3& Vector3::operator-= (const Vector3& rkVector) {
-    x -= rkVector.x;
-    y -= rkVector.y;
-    z -= rkVector.z;
-    return *this;
-}
-
-//----------------------------------------------------------------------------
-inline Vector3& Vector3::operator*= (float fScalar) {
-    x *= fScalar;
-    y *= fScalar;
-    z *= fScalar;
-    return *this;
-}
-
-//----------------------------------------------------------------------------
-inline Vector3& Vector3::operator*= (const Vector3& rkVector) {
-    x *= rkVector.x;
-    y *= rkVector.y;
-    z *= rkVector.z;
-    return *this;
-}
-
-//----------------------------------------------------------------------------
-inline Vector3& Vector3::operator/= (const Vector3& rkVector) {
-    x /= rkVector.x;
-    y /= rkVector.y;
-    z /= rkVector.z;
-    return *this;
-}
-
-//----------------------------------------------------------------------------
-inline float Vector3::squaredMagnitude () const {
-    return x*x + y*y + z*z;
-}
-
-//----------------------------------------------------------------------------
-inline float Vector3::squaredLength () const {
-    return squaredMagnitude();
-}
-
-//----------------------------------------------------------------------------
-inline float Vector3::magnitude() const {
-    return sqrtf(x*x + y*y + z*z);
-}
-
-//----------------------------------------------------------------------------
-inline float Vector3::length() const {
-    return magnitude();
-}
-
-//----------------------------------------------------------------------------
-inline Vector3 Vector3::direction () const {
-    float lenSquared = squaredMagnitude();
-    float invSqrt = 1.0f / sqrtf(lenSquared);
-    return Vector3(x * invSqrt, y * invSqrt, z * invSqrt);
-}
-
-//----------------------------------------------------------------------------
-
-inline Vector3 Vector3::fastDirection () const {
-    float lenSquared = x * x + y * y + z * z;
-    float invSqrt = rsq(lenSquared);
-    return Vector3(x * invSqrt, y * invSqrt, z * invSqrt);
-}
-
-//----------------------------------------------------------------------------
-inline float Vector3::dot (const Vector3& rkVector) const {
-    return x*rkVector.x + y*rkVector.y + z*rkVector.z;
-}
-
-//----------------------------------------------------------------------------
-inline Vector3 Vector3::cross (const Vector3& rkVector) const {
-    return Vector3(y*rkVector.z - z*rkVector.y, z*rkVector.x - x*rkVector.z,
-                   x*rkVector.y - y*rkVector.x);
-}
-
-//----------------------------------------------------------------------------
-inline Vector3 Vector3::unitCross (const Vector3& rkVector) const {
-    Vector3 kCross(y*rkVector.z - z*rkVector.y, z*rkVector.x - x*rkVector.z,
-                   x*rkVector.y - y*rkVector.x);
-    kCross.unitize();
-    return kCross;
-}
-
-//----------------------------------------------------------------------------
-inline Vector3 Vector3::min(const Vector3 &v) const {
-    return Vector3(G3D::min(v.x, x), G3D::min(v.y, y), G3D::min(v.z, z));
-}
-
-//----------------------------------------------------------------------------
-inline Vector3 Vector3::max(const Vector3 &v) const {
-    return Vector3(G3D::max(v.x, x), G3D::max(v.y, y), G3D::max(v.z, z));
-}
-
-//----------------------------------------------------------------------------
-inline bool Vector3::isZero() const {
-    return G3D::fuzzyEq(squaredMagnitude(), 0.0f);
-}
-
-//----------------------------------------------------------------------------
-
-inline bool Vector3::isUnit() const {
-    return G3D::fuzzyEq(squaredMagnitude(), 1.0f);
-}
-
-} // namespace G3D
-
-
-template <>
-struct HashTrait {
-    static size_t hashCode(const G3D::Vector3& key) {
-        return key.hashCode();
-    }
-};
-
-
-template<> struct PositionTrait {
-    static void getPosition(const G3D::Vector2& v, G3D::Vector3& p) { p = G3D::Vector3(v, 0); }
-};
-
-template<> struct PositionTrait {
-    static void getPosition(const G3D::Vector3& v, G3D::Vector3& p) { p = v; }
-};
-
-
-#endif
diff --git a/externals/g3dlite/G3D.lib/include/G3D/Vector3int16.h b/externals/g3dlite/G3D.lib/include/G3D/Vector3int16.h
deleted file mode 100644
index f3f30a5bab4..00000000000
--- a/externals/g3dlite/G3D.lib/include/G3D/Vector3int16.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/**
-  @file Vector3int16.h
-  
-  @maintainer Morgan McGuire, matrix@brown.edu
-
-  @created 2003-04-07
-  @edited  2003-06-24
-  Copyright 2000-2004, Morgan McGuire.
-  All rights reserved.
- */
-
-#ifndef VECTOR3INT16_H
-#define VECTOR3INT16_H
-
-#include "G3D/platform.h"
-#include "G3D/g3dmath.h"
-#include "G3D/HashTrait.h"
-
-namespace G3D {
-
-/**
- A Vector3 that packs its fields into uint16s.
- */
-#ifdef G3D_WIN32
-    // Switch to tight alignment
-    #pragma pack(push, 2)
-#endif
-
-class Vector3int16 {
-private:
-    // Hidden operators
-    bool operator<(const Vector3int16&) const;
-    bool operator>(const Vector3int16&) const;
-    bool operator<=(const Vector3int16&) const;
-    bool operator>=(const Vector3int16&) const;
-
-public:
-    G3D::int16              x;
-    G3D::int16              y;
-    G3D::int16              z;
-
-    Vector3int16() : x(0), y(0), z(0) {}
-    Vector3int16(G3D::int16 _x, G3D::int16 _y, G3D::int16 _z) : x(_x), y(_y), z(_z) {}
-    Vector3int16(const class Vector3& v);
-    Vector3int16(class BinaryInput& bi);
-
-    void serialize(class BinaryOutput& bo) const;
-    void deserialize(class BinaryInput& bi);
-
-    inline G3D::int16& operator[] (int i) {
-        debugAssert(i <= 2);
-        return ((G3D::int16*)this)[i];
-    }
-
-    inline const G3D::int16& operator[] (int i) const {
-        debugAssert(i <= 2);
-        return ((G3D::int16*)this)[i];
-    }
-
-    inline Vector3int16 operator+(const Vector3int16& other) const {
-        return Vector3int16(x + other.x, y + other.y, z + other.z);
-    }
-
-    inline Vector3int16 operator-(const Vector3int16& other) const {
-        return Vector3int16(x - other.x, y - other.y, z - other.z);
-    }
-
-    inline Vector3int16 operator*(const Vector3int16& other) const {
-        return Vector3int16(x * other.x, y * other.y, z * other.z);
-    }
-
-    inline Vector3int16 operator*(const int s) const {
-        return Vector3int16(x * s, y * s, z * s);
-    }
-
-    inline Vector3int16& operator+=(const Vector3int16& other) {
-        x += other.x;
-        y += other.y;
-        z += other.y;
-        return *this;
-    }
-
-    inline Vector3int16& operator-=(const Vector3int16& other) {
-        x -= other.x;
-        y -= other.y;
-        z -= other.z;
-        return *this;
-    }
-
-    inline Vector3int16& operator*=(const Vector3int16& other) {
-        x *= other.x;
-        y *= other.y;
-        z *= other.z;
-        return *this;
-    }
-
-    inline bool operator== (const Vector3int16& rkVector) const {
-        return ( x == rkVector.x && y == rkVector.y && z == rkVector.z );
-    }
-
-    inline bool operator!= (const Vector3int16& rkVector) const {
-        return ( x != rkVector.x || y != rkVector.y || z != rkVector.z );
-    }
-
-    Vector3int16 max(const Vector3int16& v) const {
-        return Vector3int16(iMax(x, v.x), iMax(y, v.y), iMax(z, v.z));
-    }
-
-    Vector3int16 min(const Vector3int16& v) const {
-        return Vector3int16(iMin(x, v.x), iMin(y, v.y), iMin(z, v.z));
-    }
-
-    std::string toString() const;
-}
-#if defined(G3D_LINUX) || defined(G3D_OSX)
-    __attribute((aligned(1)))
-#endif
-;
-
-#ifdef G3D_WIN32
-    #pragma pack(pop)
-#endif
-
-}
-
-template <> struct HashTrait {
-    static size_t hashCode(const G3D::Vector3int16& key) { return static_cast(key.x + ((int)key.y << 5) + ((int)key.z << 10)); }
-};
-
-#endif
diff --git a/externals/g3dlite/G3D.lib/include/G3D/Vector3int32.h b/externals/g3dlite/G3D.lib/include/G3D/Vector3int32.h
deleted file mode 100644
index 01c8581b47a..00000000000
--- a/externals/g3dlite/G3D.lib/include/G3D/Vector3int32.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/**
-  @file Vector3int32.h
-  
-  @maintainer Morgan McGuire, matrix@brown.edu
-
-  @created 2008-07-01
-  @edited  2008-07-01
-  Copyright 2000-2008, Morgan McGuire.
-  All rights reserved.
- */
-
-#ifndef VECTOR3INT32_H
-#define VECTOR3INT32_H
-
-#include "G3D/platform.h"
-#include "G3D/g3dmath.h"
-#include "G3D/HashTrait.h"
-
-namespace G3D {
-
-/**
- A Vector3 that packs its fields into uint32s.
- */
-#ifdef G3D_WIN32
-    // Switch to tight alignment
-    #pragma pack(push, 4)
-#endif
-
-class Vector3int32 {
-private:
-    // Hidden operators
-    bool operator<(const Vector3int32&) const;
-    bool operator>(const Vector3int32&) const;
-    bool operator<=(const Vector3int32&) const;
-    bool operator>=(const Vector3int32&) const;
-
-public:
-    G3D::int32              x;
-    G3D::int32              y;
-    G3D::int32              z;
-
-    Vector3int32() : x(0), y(0), z(0) {}
-    Vector3int32(int _x, int _y, int _z) : x(_x), y(_y), z(_z) {}
-    Vector3int32(const class Vector3int16& v);
-    Vector3int32(const class Vector3& v);
-    Vector3int32(class BinaryInput& bi);
-
-    void serialize(class BinaryOutput& bo) const;
-    void deserialize(class BinaryInput& bi);
-
-    inline G3D::int32& operator[] (int i) {
-        debugAssert(i <= 2);
-        return ((G3D::int32*)this)[i];
-    }
-
-    inline const G3D::int32& operator[] (int i) const {
-        debugAssert(i <= 2);
-        return ((G3D::int32*)this)[i];
-    }
-
-    inline Vector3int32 operator+(const Vector3int32& other) const {
-        return Vector3int32(x + other.x, y + other.y, z + other.z);
-    }
-
-    inline Vector3int32 operator-(const Vector3int32& other) const {
-        return Vector3int32(x - other.x, y - other.y, z - other.z);
-    }
-
-    inline Vector3int32 operator*(const Vector3int32& other) const {
-        return Vector3int32(x * other.x, y * other.y, z * other.z);
-    }
-
-    inline Vector3int32 operator*(const int s) const {
-        return Vector3int32(x * s, y * s, z * s);
-    }
-
-    inline Vector3int32& operator+=(const Vector3int32& other) {
-        x += other.x;
-        y += other.y;
-        z += other.y;
-        return *this;
-    }
-
-    inline Vector3int32& operator-=(const Vector3int32& other) {
-        x -= other.x;
-        y -= other.y;
-        z -= other.z;
-        return *this;
-    }
-
-    inline Vector3int32& operator*=(const Vector3int32& other) {
-        x *= other.x;
-        y *= other.y;
-        z *= other.z;
-        return *this;
-    }
-
-    inline bool operator== (const Vector3int32& rkVector) const {
-        return ( x == rkVector.x && y == rkVector.y && z == rkVector.z );
-    }
-
-    inline bool operator!= (const Vector3int32& rkVector) const {
-        return ( x != rkVector.x || y != rkVector.y || z != rkVector.z );
-    }
-
-    Vector3int32 max(const Vector3int32& v) const {
-        return Vector3int32(iMax(x, v.x), iMax(y, v.y), iMax(z, v.z));
-    }
-
-    Vector3int32 min(const Vector3int32& v) const {
-        return Vector3int32(iMin(x, v.x), iMin(y, v.y), iMin(z, v.z));
-    }
-
-    std::string toString() const;
-}
-#if defined(G3D_LINUX) || defined(G3D_OSX)
-    __attribute((aligned(1)))
-#endif
-;
-
-#ifdef G3D_WIN32
-    #pragma pack(pop)
-#endif
-
-}
-
-template <> struct HashTrait {
-    static size_t hashCode(const G3D::Vector3int32& key) {
-        // Mask for the top bit of a uint32
-        const G3D::uint32 top = (1 << 31);
-        // Mask for the bottom 10 bits of a uint32
-        const G3D::uint32 bot = 0x000003FF;
-        return static_cast(((key.x & top) | ((key.y & top) >> 1) | ((key.z & top) >> 2)) | 
-                                   (((key.x & bot) << 19) ^ ((key.y & bot) << 10) ^ (key.z & bot)));
-    }
-};
-
-#endif
diff --git a/externals/g3dlite/G3D.lib/include/G3D/Vector4.h b/externals/g3dlite/G3D.lib/include/G3D/Vector4.h
deleted file mode 100644
index d60ff76ea8b..00000000000
--- a/externals/g3dlite/G3D.lib/include/G3D/Vector4.h
+++ /dev/null
@@ -1,717 +0,0 @@
-/**
-  @file Vector4.h
- 
-  Homogeneous vector class.
- 
-  @maintainer Morgan McGuire, morgan@cs.williams.edu
- 
-  @created 2002-07-09
-  @edited  2008-11-01
-
-  Copyright 2000-2008, Morgan McGuire.
-  All rights reserved.
- */
-
-#ifndef G3D_VECTOR4_H
-#define G3D_VECTOR4_H
-
-#include "G3D/platform.h"
-#include "G3D/g3dmath.h"
-#include "G3D/Vector3.h"
-#include "G3D/Vector2.h"
-#include "G3D/Table.h"
-#include "G3D/HashTrait.h"
-#include "G3D/PositionTrait.h"
-#include 
-
-namespace G3D {
-
-class Vector2;    
-class Vector3;
-class Vector4;
-class Vector4int8;
-
-/**
- Do not subclass-- this implementation makes assumptions about the
- memory layout.
- */
-class Vector4 {
-private:
-    // Hidden operators
-    bool operator<(const Vector4&) const;
-    bool operator>(const Vector4&) const;
-    bool operator<=(const Vector4&) const;
-    bool operator>=(const Vector4&) const;
-
-public:
-    // construction
-    Vector4();
-    Vector4(float fX, float fY, float fZ, float fW);
-    Vector4(float afCoordinate[4]);
-    Vector4(const Vector4& rkVector);
-    Vector4(const class Color4& c);
-    Vector4(const Vector3& rkVector, float fW);
-    Vector4(const Vector2& v1, const Vector2& v2);
-    Vector4(const Vector2& v1, float fz, float fw);
-
-    /** Divides by 127 when converting */
-    Vector4(const Vector4int8&);
-
-    Vector4(class BinaryInput& b);
-    void serialize(class BinaryOutput& b) const;
-    void deserialize(class BinaryInput& b);
-
-    // coordinates
-    float x, y, z, w;
-
-    // access vector V as V[0] = V.x, V[1] = V.y, V[2] = V.z, etc.
-    //
-    // WARNING.  These member functions rely on
-    // (1) Vector4 not having virtual functions
-    // (2) the data packed in a 4*sizeof(float) memory block
-    float& operator[] (int i);
-    const float& operator[] (int i) const;
-    operator float* ();
-    operator const float* () const;
-
-    // assignment and comparison
-    Vector4& operator= (const Vector4& rkVector);
-    bool operator== (const Vector4& rkVector) const;
-    bool operator!= (const Vector4& rkVector) const;
-
-    inline void set(float _x, float _y, float _z, float _w) {
-        x = _x;
-        y = _y;
-        z = _z;
-        w = _w;
-    }
-
-    inline void set(const Vector3& v, float _w) {
-        x = v.x;
-        y = v.y;
-        z = v.z;
-        w = _w;
-    }
-
-    inline void set(const Vector2& v, float _z, float _w) {
-        x = v.x;
-        y = v.y;
-        z = _z;
-        w = _w;
-    }
-
-    size_t hashCode() const;
-    bool fuzzyEq(const Vector4& other) const;
-    bool fuzzyNe(const Vector4& other) const;
-
-    inline static const Vector4& inf()      { static Vector4 v((float)G3D::inf(), (float)G3D::inf(), (float)G3D::inf(), (float)G3D::inf()); return v; }
-    inline static const Vector4& nan()      { static Vector4 v((float)G3D::nan(), (float)G3D::nan(), (float)G3D::nan(), (float)G3D::nan()); return v; }
-
-    /** sqrt(this->dot(*this)) */
-    float length() const;
-    float squaredLength() const;
-
-    inline float sum() const {
-        return x + y + z + w;
-    }
-
-    /** Returns true if this vector has finite length */
-    bool isFinite() const;
-
-    /** Returns true if this vector has length == 0 */
-    bool isZero() const;
-
-    /** Returns true if this vector has length == 1 */
-    bool isUnit() const;
-
-    // arithmetic operations
-    Vector4 operator+ (const Vector4& rkVector) const;
-    Vector4 operator- (const Vector4& rkVector) const;
-    
-    inline Vector4 operator*(const Vector4& rkVector) const {
-        return Vector4(x * rkVector.x, y * rkVector.y, z * rkVector.z, w * rkVector.w);
-    }
-
-    inline Vector4 operator/(const Vector4& rkVector) const {
-        return Vector4(x / rkVector.x, y / rkVector.y, z / rkVector.z, w / rkVector.w);
-    }
-
-    Vector4 operator*(const class Matrix4& M) const;
-
-    Vector4 operator* (float fScalar) const;
-    Vector4 operator/ (float fScalar) const;
-    Vector4 operator- () const;
-    friend Vector4 operator* (float, const Vector4& rkVector);
-
-    // arithmetic updates
-    Vector4& operator+= (const Vector4& rkVector);
-    Vector4& operator-= (const Vector4& rkVector);
-    Vector4& operator*= (float fScalar);
-    Vector4& operator/= (float fScalar);
-
-    inline Vector4 clamp(const Vector4& low, const Vector4& high) const {
-        return Vector4(
-            G3D::clamp(x, low.x, high.x),
-            G3D::clamp(y, low.y, high.y),
-            G3D::clamp(z, low.z, high.z),
-            G3D::clamp(w, low.w, high.w));
-    }
-
-    inline Vector4 clamp(float low, float high) const {
-        return Vector4(
-            G3D::clamp(x, low, high),
-            G3D::clamp(y, low, high),
-            G3D::clamp(z, low, high),
-            G3D::clamp(w, low, high));
-    }
-
-    float dot (const Vector4& rkVector) const;
-
-    Vector4 min(const Vector4& v) const;
-    Vector4 max(const Vector4& v) const;
-
-    std::string toString() const;
-
-    /**
-     Linear interpolation
-     */
-    Vector4 lerp(const Vector4& v, float alpha) const;
-
-    // 2-char swizzles
-
-    Vector2 xx() const;
-    Vector2 yx() const;
-    Vector2 zx() const;
-    Vector2 wx() const;
-    Vector2 xy() const;
-    Vector2 yy() const;
-    Vector2 zy() const;
-    Vector2 wy() const;
-    Vector2 xz() const;
-    Vector2 yz() const;
-    Vector2 zz() const;
-    Vector2 wz() const;
-    Vector2 xw() const;
-    Vector2 yw() const;
-    Vector2 zw() const;
-    Vector2 ww() const;
-
-    // 3-char swizzles
-
-    Vector3 xxx() const;
-    Vector3 yxx() const;
-    Vector3 zxx() const;
-    Vector3 wxx() const;
-    Vector3 xyx() const;
-    Vector3 yyx() const;
-    Vector3 zyx() const;
-    Vector3 wyx() const;
-    Vector3 xzx() const;
-    Vector3 yzx() const;
-    Vector3 zzx() const;
-    Vector3 wzx() const;
-    Vector3 xwx() const;
-    Vector3 ywx() const;
-    Vector3 zwx() const;
-    Vector3 wwx() const;
-    Vector3 xxy() const;
-    Vector3 yxy() const;
-    Vector3 zxy() const;
-    Vector3 wxy() const;
-    Vector3 xyy() const;
-    Vector3 yyy() const;
-    Vector3 zyy() const;
-    Vector3 wyy() const;
-    Vector3 xzy() const;
-    Vector3 yzy() const;
-    Vector3 zzy() const;
-    Vector3 wzy() const;
-    Vector3 xwy() const;
-    Vector3 ywy() const;
-    Vector3 zwy() const;
-    Vector3 wwy() const;
-    Vector3 xxz() const;
-    Vector3 yxz() const;
-    Vector3 zxz() const;
-    Vector3 wxz() const;
-    Vector3 xyz() const;
-    Vector3 yyz() const;
-    Vector3 zyz() const;
-    Vector3 wyz() const;
-    Vector3 xzz() const;
-    Vector3 yzz() const;
-    Vector3 zzz() const;
-    Vector3 wzz() const;
-    Vector3 xwz() const;
-    Vector3 ywz() const;
-    Vector3 zwz() const;
-    Vector3 wwz() const;
-    Vector3 xxw() const;
-    Vector3 yxw() const;
-    Vector3 zxw() const;
-    Vector3 wxw() const;
-    Vector3 xyw() const;
-    Vector3 yyw() const;
-    Vector3 zyw() const;
-    Vector3 wyw() const;
-    Vector3 xzw() const;
-    Vector3 yzw() const;
-    Vector3 zzw() const;
-    Vector3 wzw() const;
-    Vector3 xww() const;
-    Vector3 yww() const;
-    Vector3 zww() const;
-    Vector3 www() const;
-
-    // 4-char swizzles
-
-    Vector4 xxxx() const;
-    Vector4 yxxx() const;
-    Vector4 zxxx() const;
-    Vector4 wxxx() const;
-    Vector4 xyxx() const;
-    Vector4 yyxx() const;
-    Vector4 zyxx() const;
-    Vector4 wyxx() const;
-    Vector4 xzxx() const;
-    Vector4 yzxx() const;
-    Vector4 zzxx() const;
-    Vector4 wzxx() const;
-    Vector4 xwxx() const;
-    Vector4 ywxx() const;
-    Vector4 zwxx() const;
-    Vector4 wwxx() const;
-    Vector4 xxyx() const;
-    Vector4 yxyx() const;
-    Vector4 zxyx() const;
-    Vector4 wxyx() const;
-    Vector4 xyyx() const;
-    Vector4 yyyx() const;
-    Vector4 zyyx() const;
-    Vector4 wyyx() const;
-    Vector4 xzyx() const;
-    Vector4 yzyx() const;
-    Vector4 zzyx() const;
-    Vector4 wzyx() const;
-    Vector4 xwyx() const;
-    Vector4 ywyx() const;
-    Vector4 zwyx() const;
-    Vector4 wwyx() const;
-    Vector4 xxzx() const;
-    Vector4 yxzx() const;
-    Vector4 zxzx() const;
-    Vector4 wxzx() const;
-    Vector4 xyzx() const;
-    Vector4 yyzx() const;
-    Vector4 zyzx() const;
-    Vector4 wyzx() const;
-    Vector4 xzzx() const;
-    Vector4 yzzx() const;
-    Vector4 zzzx() const;
-    Vector4 wzzx() const;
-    Vector4 xwzx() const;
-    Vector4 ywzx() const;
-    Vector4 zwzx() const;
-    Vector4 wwzx() const;
-    Vector4 xxwx() const;
-    Vector4 yxwx() const;
-    Vector4 zxwx() const;
-    Vector4 wxwx() const;
-    Vector4 xywx() const;
-    Vector4 yywx() const;
-    Vector4 zywx() const;
-    Vector4 wywx() const;
-    Vector4 xzwx() const;
-    Vector4 yzwx() const;
-    Vector4 zzwx() const;
-    Vector4 wzwx() const;
-    Vector4 xwwx() const;
-    Vector4 ywwx() const;
-    Vector4 zwwx() const;
-    Vector4 wwwx() const;
-    Vector4 xxxy() const;
-    Vector4 yxxy() const;
-    Vector4 zxxy() const;
-    Vector4 wxxy() const;
-    Vector4 xyxy() const;
-    Vector4 yyxy() const;
-    Vector4 zyxy() const;
-    Vector4 wyxy() const;
-    Vector4 xzxy() const;
-    Vector4 yzxy() const;
-    Vector4 zzxy() const;
-    Vector4 wzxy() const;
-    Vector4 xwxy() const;
-    Vector4 ywxy() const;
-    Vector4 zwxy() const;
-    Vector4 wwxy() const;
-    Vector4 xxyy() const;
-    Vector4 yxyy() const;
-    Vector4 zxyy() const;
-    Vector4 wxyy() const;
-    Vector4 xyyy() const;
-    Vector4 yyyy() const;
-    Vector4 zyyy() const;
-    Vector4 wyyy() const;
-    Vector4 xzyy() const;
-    Vector4 yzyy() const;
-    Vector4 zzyy() const;
-    Vector4 wzyy() const;
-    Vector4 xwyy() const;
-    Vector4 ywyy() const;
-    Vector4 zwyy() const;
-    Vector4 wwyy() const;
-    Vector4 xxzy() const;
-    Vector4 yxzy() const;
-    Vector4 zxzy() const;
-    Vector4 wxzy() const;
-    Vector4 xyzy() const;
-    Vector4 yyzy() const;
-    Vector4 zyzy() const;
-    Vector4 wyzy() const;
-    Vector4 xzzy() const;
-    Vector4 yzzy() const;
-    Vector4 zzzy() const;
-    Vector4 wzzy() const;
-    Vector4 xwzy() const;
-    Vector4 ywzy() const;
-    Vector4 zwzy() const;
-    Vector4 wwzy() const;
-    Vector4 xxwy() const;
-    Vector4 yxwy() const;
-    Vector4 zxwy() const;
-    Vector4 wxwy() const;
-    Vector4 xywy() const;
-    Vector4 yywy() const;
-    Vector4 zywy() const;
-    Vector4 wywy() const;
-    Vector4 xzwy() const;
-    Vector4 yzwy() const;
-    Vector4 zzwy() const;
-    Vector4 wzwy() const;
-    Vector4 xwwy() const;
-    Vector4 ywwy() const;
-    Vector4 zwwy() const;
-    Vector4 wwwy() const;
-    Vector4 xxxz() const;
-    Vector4 yxxz() const;
-    Vector4 zxxz() const;
-    Vector4 wxxz() const;
-    Vector4 xyxz() const;
-    Vector4 yyxz() const;
-    Vector4 zyxz() const;
-    Vector4 wyxz() const;
-    Vector4 xzxz() const;
-    Vector4 yzxz() const;
-    Vector4 zzxz() const;
-    Vector4 wzxz() const;
-    Vector4 xwxz() const;
-    Vector4 ywxz() const;
-    Vector4 zwxz() const;
-    Vector4 wwxz() const;
-    Vector4 xxyz() const;
-    Vector4 yxyz() const;
-    Vector4 zxyz() const;
-    Vector4 wxyz() const;
-    Vector4 xyyz() const;
-    Vector4 yyyz() const;
-    Vector4 zyyz() const;
-    Vector4 wyyz() const;
-    Vector4 xzyz() const;
-    Vector4 yzyz() const;
-    Vector4 zzyz() const;
-    Vector4 wzyz() const;
-    Vector4 xwyz() const;
-    Vector4 ywyz() const;
-    Vector4 zwyz() const;
-    Vector4 wwyz() const;
-    Vector4 xxzz() const;
-    Vector4 yxzz() const;
-    Vector4 zxzz() const;
-    Vector4 wxzz() const;
-    Vector4 xyzz() const;
-    Vector4 yyzz() const;
-    Vector4 zyzz() const;
-    Vector4 wyzz() const;
-    Vector4 xzzz() const;
-    Vector4 yzzz() const;
-    Vector4 zzzz() const;
-    Vector4 wzzz() const;
-    Vector4 xwzz() const;
-    Vector4 ywzz() const;
-    Vector4 zwzz() const;
-    Vector4 wwzz() const;
-    Vector4 xxwz() const;
-    Vector4 yxwz() const;
-    Vector4 zxwz() const;
-    Vector4 wxwz() const;
-    Vector4 xywz() const;
-    Vector4 yywz() const;
-    Vector4 zywz() const;
-    Vector4 wywz() const;
-    Vector4 xzwz() const;
-    Vector4 yzwz() const;
-    Vector4 zzwz() const;
-    Vector4 wzwz() const;
-    Vector4 xwwz() const;
-    Vector4 ywwz() const;
-    Vector4 zwwz() const;
-    Vector4 wwwz() const;
-    Vector4 xxxw() const;
-    Vector4 yxxw() const;
-    Vector4 zxxw() const;
-    Vector4 wxxw() const;
-    Vector4 xyxw() const;
-    Vector4 yyxw() const;
-    Vector4 zyxw() const;
-    Vector4 wyxw() const;
-    Vector4 xzxw() const;
-    Vector4 yzxw() const;
-    Vector4 zzxw() const;
-    Vector4 wzxw() const;
-    Vector4 xwxw() const;
-    Vector4 ywxw() const;
-    Vector4 zwxw() const;
-    Vector4 wwxw() const;
-    Vector4 xxyw() const;
-    Vector4 yxyw() const;
-    Vector4 zxyw() const;
-    Vector4 wxyw() const;
-    Vector4 xyyw() const;
-    Vector4 yyyw() const;
-    Vector4 zyyw() const;
-    Vector4 wyyw() const;
-    Vector4 xzyw() const;
-    Vector4 yzyw() const;
-    Vector4 zzyw() const;
-    Vector4 wzyw() const;
-    Vector4 xwyw() const;
-    Vector4 ywyw() const;
-    Vector4 zwyw() const;
-    Vector4 wwyw() const;
-    Vector4 xxzw() const;
-    Vector4 yxzw() const;
-    Vector4 zxzw() const;
-    Vector4 wxzw() const;
-    Vector4 xyzw() const;
-    Vector4 yyzw() const;
-    Vector4 zyzw() const;
-    Vector4 wyzw() const;
-    Vector4 xzzw() const;
-    Vector4 yzzw() const;
-    Vector4 zzzw() const;
-    Vector4 wzzw() const;
-    Vector4 xwzw() const;
-    Vector4 ywzw() const;
-    Vector4 zwzw() const;
-    Vector4 wwzw() const;
-    Vector4 xxww() const;
-    Vector4 yxww() const;
-    Vector4 zxww() const;
-    Vector4 wxww() const;
-    Vector4 xyww() const;
-    Vector4 yyww() const;
-    Vector4 zyww() const;
-    Vector4 wyww() const;
-    Vector4 xzww() const;
-    Vector4 yzww() const;
-    Vector4 zzww() const;
-    Vector4 wzww() const;
-    Vector4 xwww() const;
-    Vector4 ywww() const;
-    Vector4 zwww() const;
-    Vector4 wwww() const;
-
-};
-
-
-//----------------------------------------------------------------------------
-inline Vector4::Vector4() {
-    x = y = z = w = 0;
-}
-
-//----------------------------------------------------------------------------
-
-inline Vector4::Vector4 (float fX, float fY, float fZ, float fW) {
-    x = fX;
-    y = fY;
-    z = fZ;
-    w = fW;
-}
-
-//----------------------------------------------------------------------------
-inline Vector4::Vector4 (float afCoordinate[4]) {
-    x = afCoordinate[0];
-    y = afCoordinate[1];
-    z = afCoordinate[2];
-    w = afCoordinate[3];
-}
-
-//----------------------------------------------------------------------------
-inline Vector4::Vector4(const Vector4& rkVector) {
-    x = rkVector.x;
-    y = rkVector.y;
-    z = rkVector.z;
-    w = rkVector.w;
-}
-//----------------------------------------------------------------------------
-inline Vector4::Vector4(const Vector3& rkVector, float fW) {
-    x = rkVector.x;
-    y = rkVector.y;
-    z = rkVector.z;
-    w = fW;
-}
-
-//----------------------------------------------------------------------------
-inline float& Vector4::operator[] (int i) {
-    return ((float*)this)[i];
-}
-
-//----------------------------------------------------------------------------
-inline const float& Vector4::operator[] (int i) const {
-    return ((float*)this)[i];
-}
-
-//----------------------------------------------------------------------------
-inline Vector4::operator float* () {
-    return (float*)this;
-}
-
-inline Vector4::operator const float* () const {
-    return (float*)this;
-}
-
-//----------------------------------------------------------------------------
-inline Vector4& Vector4::operator= (const Vector4& rkVector) {
-    x = rkVector.x;
-    y = rkVector.y;
-    z = rkVector.z;
-    w = rkVector.w;
-    return *this;
-}
-
-//----------------------------------------------------------------------------
-inline bool Vector4::operator== (const Vector4& rkVector) const {
-    return ( (x == rkVector.x) && (y == rkVector.y) && (z == rkVector.z) && (w == rkVector.w));
-}
-
-//----------------------------------------------------------------------------
-inline bool Vector4::operator!= (const Vector4& rkVector) const {
-    return ( x != rkVector.x || y != rkVector.y || z != rkVector.z || w != rkVector.w);
-}
-
-//----------------------------------------------------------------------------
-inline Vector4 Vector4::operator+ (const Vector4& rkVector) const {
-    return Vector4(x + rkVector.x, y + rkVector.y, z + rkVector.z, w + rkVector.w);
-}
-
-//----------------------------------------------------------------------------
-inline Vector4 Vector4::operator- (const Vector4& rkVector) const {
-    return Vector4(x - rkVector.x, y - rkVector.y, z - rkVector.z, w - rkVector.w);
-}
-
-//----------------------------------------------------------------------------
-inline Vector4 Vector4::operator* (float fScalar) const {
-    return Vector4(fScalar*x, fScalar*y, fScalar*z, fScalar*w);
-}
-
-//----------------------------------------------------------------------------
-inline Vector4 Vector4::operator- () const {
-    return Vector4( -x, -y, -z, -w);
-}
-
-//----------------------------------------------------------------------------
-inline Vector4& Vector4::operator+= (const Vector4& rkVector) {
-    x += rkVector.x;
-    y += rkVector.y;
-    z += rkVector.z;
-    w += rkVector.w;
-    return *this;
-}
-
-//----------------------------------------------------------------------------
-inline Vector4& Vector4::operator-= (const Vector4& rkVector) {
-    x -= rkVector.x;
-    y -= rkVector.y;
-    z -= rkVector.z;
-    w -= rkVector.w;
-    return *this;
-}
-
-//----------------------------------------------------------------------------
-
-inline Vector4 Vector4::lerp(const Vector4& v, float alpha) const {
-    return (*this) + (v - *this) * alpha; 
-}
-
-
-//----------------------------------------------------------------------------
-inline Vector4& Vector4::operator*= (float fScalar) {
-    x *= fScalar;
-    y *= fScalar;
-    z *= fScalar;
-    w *= fScalar;
-    return *this;
-}
-
-
-//----------------------------------------------------------------------------
-inline float Vector4::dot(const Vector4& rkVector) const {
-    return x*rkVector.x + y*rkVector.y + z*rkVector.z + w*rkVector.w;
-}
-
-//----------------------------------------------------------------------------
-inline Vector4 Vector4::min(const Vector4 &v) const {
-    return Vector4(G3D::min(v.x, x), G3D::min(v.y, y), G3D::min(v.z, z), G3D::min(v.w, w));
-}
-
-//----------------------------------------------------------------------------
-inline Vector4 Vector4::max(const Vector4 &v) const {
-    return Vector4(G3D::max(v.x, x), G3D::max(v.y, y), G3D::max(v.z, z), G3D::max(v.w, w));
-}
-
-//----------------------------------------------------------------------------
-inline bool Vector4::isZero() const {
-    return (x == 0.0f) && (y == 0.0f) && (z == 0.0f) && (w == 0.0f);
-}
-
-//----------------------------------------------------------------------------
-
-inline bool Vector4::isFinite() const {
-    return G3D::isFinite(x) && G3D::isFinite(y) && G3D::isFinite(z) && G3D::isFinite(w);
-}
-
-//----------------------------------------------------------------------------
-
-inline bool Vector4::isUnit() const {
-    return squaredLength() == 1.0;
-}
-
-//----------------------------------------------------------------------------
-
-inline float Vector4::length() const {
-    return sqrtf(squaredLength());
-}
-
-//----------------------------------------------------------------------------
-
-inline float Vector4::squaredLength() const {
-    return x * x + y * y + z * z + w * w;
-}
-
-}
-
-template <> struct HashTrait {
-    static size_t hashCode(const G3D::Vector4& key) { return key.hashCode(); }
-};
-
-
-template<> struct PositionTrait {
-    static void getPosition(const G3D::Vector4& v, G3D::Vector3& p) { p = v.xyz(); }
-};
-
-inline G3D::Vector4 operator* (float s, const G3D::Vector4& v) {
-    return v * s;
-}
-
-#endif
diff --git a/externals/g3dlite/G3D.lib/include/G3D/Vector4int8.h b/externals/g3dlite/G3D.lib/include/G3D/Vector4int8.h
deleted file mode 100644
index 8476a2d008b..00000000000
--- a/externals/g3dlite/G3D.lib/include/G3D/Vector4int8.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/**
-  @file Vector4int8.h
- 
-  Homogeneous vector class.
-
-  @maintainer Morgan McGuire, matrix@graphics3d.com
- 
-  @created 2007-02-09
-  @edited  2007-02-09
-
-  Copyright 2000-2007, Morgan McGuire.
-  All rights reserved.
- */
-
-#ifndef G3D_VECTOR4INT8_H
-#define G3D_VECTOR4INT8_H
-
-#include "G3D/platform.h"
-#include "G3D/g3dmath.h"
-
-namespace G3D {
-
-class Vector3;
-class Vector4;
-
-/**
- Homogeneous vector stored efficiently in four signed int8s.
-
- */
-class Vector4int8 {
-private:
-    // Hidden operators
-    bool operator<(const Vector4int8&) const;
-    bool operator>(const Vector4int8&) const;
-    bool operator<=(const Vector4int8&) const;
-    bool operator>=(const Vector4int8&) const;
-
-  
-    /** For fast operations, treat this packed data structure as 
-      an int32 */
-    inline uint32& asInt32() {
-        return *reinterpret_cast(this);
-    }
-
-    inline const uint32& asInt32() const {
-        return *reinterpret_cast(this);
-    }
-
-public:
-    // construction
-    inline Vector4int8() : x(0), y(0), z(0), w(0) {}
-    
-    /** Multiplies the source by 127 and clamps to (-128, 127) when converting */
-    Vector4int8(const Vector4& source);
-
-    /** Multiplies the source by 127 and clamps to (-128, 127) when converting */
-    Vector4int8(const Vector3& source, int8 w);
-
-    inline Vector4int8(int8 x, int8 y, int8 z, int8 w) : x(x), y(y), z(z), w(w) {}
-
-    Vector4int8(class BinaryInput& b);
-    void serialize(class BinaryOutput& b) const;
-    void deserialize(class BinaryInput& b);
-
-    // coordinates
-    int8 x, y, z, w;
-
-    inline operator int8* () {
-        return reinterpret_cast(this);
-    }
-
-    inline operator const int8* () const {
-        return reinterpret_cast(this);
-    }
-
-    // access vector V as V[0] = V.x, V[1] = V.y, V[2] = V.z, etc.
-    //
-    // WARNING.  These member functions rely on
-    // (1) Vector4int8 not having virtual functions
-    // (2) the data packed in a 4*sizeof(int8) memory block
-    inline int8& operator[] (int i) {
-        debugAssert(i >= 0 && i <= 4);
-        return ((int8*)this)[i];
-    }
-
-    const int8& operator[] (int i) const {
-        debugAssert(i >= 0 && i <= 4);
-        return ((const int8*)this)[i];
-    }
-
-    // assignment and comparison
-    Vector4int8& operator= (const Vector4int8& other) {
-        asInt32() = other.asInt32();
-        return *this;
-    }
-
-    inline bool operator== (const Vector4int8& other) const {
-        return asInt32() == other.asInt32();
-    }
-
-    inline bool operator!= (const Vector4int8& other) const {
-        return ! (*this == other);
-    }
-
-    inline unsigned int hashCode() const {
-        return asInt32();
-    }
-};
-
-} // namespace G3D
-
-
-#endif
diff --git a/externals/g3dlite/G3D.lib/include/G3D/WeakCache.h b/externals/g3dlite/G3D.lib/include/G3D/WeakCache.h
deleted file mode 100644
index 87988aaf5cb..00000000000
--- a/externals/g3dlite/G3D.lib/include/G3D/WeakCache.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/** 
-  @file WeakCache.h
- 
-  @maintainer Morgan McGuire, graphics3d.com
- 
-  @created 2007-05-16
-  @edited  2007-05-16
-
-  Copyright 2000-2007, Morgan McGuire.
-  All rights reserved.
- */
-#ifndef G3D_WEAKCACHE_H
-#define G3D_WEAKCACHE_H
-
-#include "G3D/ReferenceCount.h"
-#include "G3D/Table.h"
-
-namespace G3D {
-
-/**
-   A cache that does not prevent its members from being garbage collected.
-   Useful to avoid loading or computing an expression twice.  Useful
-   for memoization and dynamic programming.
-
-   Maintains a table of weak pointers.  Weak pointers do not prevent
-   an object from being garbage collected.  If the object is garbage
-   collected, the cache removes its reference.
-
-   There are no "contains" or "iterate" methods because elements can be
-   flushed from the cache at any time if they are garbage collected.
-
-   Example:
-   
-      WeakCache textureCache;
-
-      TextureRef loadTexture(std::string s) {
-          TextureRef t = textureCache[s];
-
-          if (t.isNull()) {
-              t = Texture::fromFile(s);
-              textureCache.set(s, t);
-          }
-
-          return t;
-      }
-      
-      
-    

- */
-template
-class WeakCache {
-    typedef WeakReferenceCountedPointer ValueWeakRef;
-
-private:
-
-    Table table;
-
-public:
-    /**
-       Returns NULL if the object is not in the cache
-    */
-    ValueRef operator[](const Key& k) {
-        if (table.containsKey(k)) {
-            ValueWeakRef w = table[k];
-            ValueRef s = w.createStrongPtr();
-            if (s.isNull()) {
-                // This object has been collected; clean out its key
-                table.remove(k);
-            }
-            return s;
-        } else {
-            return NULL;
-        }
-    }
-
-    void set(const Key& k, ValueRef v) {
-        table.set(k, v);
-    }
-
-    /** Removes k from the cache or does nothing if it is not currently in the cache.*/
-    void remove(const Key& k) {
-        if (table.containsKey(k)) {
-            table.remove(k);
-        }
-    }
-};
-
-}
-#endif
-
diff --git a/externals/g3dlite/G3D.lib/include/G3D/WrapMode.h b/externals/g3dlite/G3D.lib/include/G3D/WrapMode.h
deleted file mode 100644
index f97e68d6910..00000000000
--- a/externals/g3dlite/G3D.lib/include/G3D/WrapMode.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/** 
-  @file WrapMode.h
- 
-  @maintainer Morgan McGuire, graphics3d.com
- 
-  @created 2007-04-17
-  @edited  2007-04-17
-
-  Copyright 2000-2007, Morgan McGuire.
-  All rights reserved.
- */
-
-#ifndef G3D_WRAPMODE_H
-#define G3D_WRAPMODE_H
-
-#include "G3D/platform.h"
-#include "G3D/enumclass.h"
-
-#ifdef IGNORE
-#   undef IGNORE
-#endif
-#ifdef ZERO
-#   undef ZERO
-#endif
-#ifdef ERROR
-#   undef ERROR
-#endif
-
-namespace G3D {
-
-/** 
-  Describes the behavior of G3D::Texture, G3D::Map2D, G3D::Image3, etc. when accessing an out-of-bounds
-  pixel.  Not all classes support all modes.
-
-  Refer to these as scoped enums, e.g., WrapMode m = WrapMode::CLAMP;.
-
-  WrapMode::IGNORE silently discards attempts to write to out 
-     of bounds locations and returns an undefined value for reading
-     from out of bounds locations.
-
-  WrapMode::ERROR generates an error when the 
-     pixel indices are out of bounds
-
-  WrapMode::CLAMP makes out of bounds pixels equal to the last in-range pixel along that dimension.
-
-  WrapMode::TILE computes out of bounds pixels modulo the dimension
-
-  WrapMode::ZERO treats out of bounds values as the zero value, which varies in definition
-  according to the class used.  For example, with a G3D::Texture, ZERO = Color4(0,0,0,0).
-
-  Uses the "Intelligent Enum" design pattern 
-  http://www.codeguru.com/cpp/cpp/cpp_mfc/article.php/c4001/
- */ 
-class WrapMode {
-public:
-    /** Don't use this enum; use WrapMode instances instead. */
-    enum Value {
-        CLAMP, 
-        TILE, 
-        ZERO,
-        IGNORE, 
-        ERROR
-    };
-
-private:
-    
-    Value value;
-
-public:
-
-    G3D_DECLARE_ENUM_CLASS_METHODS(WrapMode);
-
-};
-
-} // namespace G3D
-
-G3D_DECLARE_ENUM_CLASS_HASHCODE(G3D::WrapMode);
-
-#endif
diff --git a/externals/g3dlite/G3D.lib/include/G3D/debug.h b/externals/g3dlite/G3D.lib/include/G3D/debug.h
deleted file mode 100644
index a96babc6fa0..00000000000
--- a/externals/g3dlite/G3D.lib/include/G3D/debug.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- @file debug.h
-
- @maintainer Morgan McGuire, matrix@graphics3d.com
-
- @created 2001-08-26
- @edited  2006-02-16
-
-  Copyright 2000-2006, Morgan McGuire.
- All rights reserved.
-*/
-
-#ifndef G3D_DEBUG_H
-#define G3D_DEBUG_H
-
-#include "G3D/platform.h"
-#ifdef _MSC_VER
-    #include 
-#endif
-
-#include "G3D/debugPrintf.h"
-#include "G3D/debugAssert.h"
-
-namespace G3D {
-
-#ifdef _MSC_VER
-    // Turn off 64-bit warnings
-#   pragma warning(push)
-#   pragma warning( disable : 4312)
-#   pragma warning( disable : 4267)
-#   pragma warning( disable : 4311)
-#endif
-
-
-/**
- Useful for debugging purposes.
- */
-inline bool isValidHeapPointer(const void* x) {
-    #ifdef _MSC_VER
-        return 
-            (x != (void*)0xcccccccc) && (x != (void*)0xdeadbeef) && (x != (void*)0xfeeefeee);
-    #else
-        return x != NULL;
-    #endif
-}
-
-/**
- Returns true if the pointer is likely to be
- a valid pointer (instead of an arbitrary number). 
- Useful for debugging purposes.
- */
-inline bool isValidPointer(const void* x) {
-    #ifdef _MSC_VER
-        return x != ((void*)0xcccccccc) && (x != (void*)0xdeadbeef) && (x != (void*)0xfeeefeee);
-    #else
-        return x != NULL;
-    #endif
-}
-
-#ifdef _MSC_VER
-#   pragma warning(pop)
-#endif
-
-}
-
-#endif
diff --git a/externals/g3dlite/G3D.lib/include/G3D/debugAssert.h b/externals/g3dlite/G3D.lib/include/G3D/debugAssert.h
deleted file mode 100644
index f9b5bea4e9f..00000000000
--- a/externals/g3dlite/G3D.lib/include/G3D/debugAssert.h
+++ /dev/null
@@ -1,236 +0,0 @@
-/**
-  @file debugAssert.h
- 
-  debugAssert(expression);
-  debugAssertM(expression, message);
- 
-  @cite
-     John Robbins, Microsoft Systems Journal Bugslayer Column, Feb 1999.
-     
-     http://msdn.microsoft.com/library/periodic/period99/feb99_BUGSLAYE_BUGSLAYE.htm
- 
-  @cite 
-     Douglas Cox, An assert() Replacement, Code of The Day, flipcode, Sept 19, 2000
-     
-     http://www.flipcode.com/cgi-bin/msg.cgi?showThread=COTD-AssertReplace&forum=cotd&id=-1
- 
-  @maintainer Morgan McGuire, matrix@graphics3d.com
- 
-  @created 2001-08-26
-  @edited  2006-01-12
-
- Copyright 2000-2006, Morgan McGuire.
- All rights reserved.
- */
-
-#ifndef G3D_DEBUGASSERT_H
-#define G3D_DEBUGASSERT_H
-
-#include 
-#include "G3D/platform.h"
-
-#include 
-
-#ifdef _MSC_VER
-// conditional expression is constant
-#   pragma warning (disable : 4127)
-#endif
-
-#ifdef G3D_LINUX
-    // Needed so we can define a global display
-    // pointer for debugAssert.
-    #include 
-    #include 
-    #include 
-#endif
-
-#ifdef G3D_OSX
-    // Need this for DebugStr()
-    #import 
-#endif
-
-
-/**
- @def debugBreak()
- 
- Break at the current location (i.e. don't push a procedure stack frame
- before breaking).
- */
-
-/**
-  @def debugAssert(exp)
-  Breaks if the expression is false. If G3D_DEBUG_NOGUI is defined, prompts at
-  the console, otherwise pops up a dialog.  The user may then break (debug), 
-  ignore, ignore always, or halt the program.
- 
-  The assertion is also posted to the clipboard under Win32.
- */
-
-/**
-  @def debugAssertM(exp, msg)
-  Breaks if the expression is false and displays a message. If G3D_DEBUG_NOGUI 
-  is defined, prompts at the console, otherwise pops up a dialog.  The user may
-  then break (debug), ignore, ignore always, or halt the program.
- 
-  The assertion is also posted to the clipboard under Win32.
- */
-
-namespace G3D {
-typedef bool (*AssertionHook)(
-    const char* _expression,
-    const std::string& message,
-    const char* filename,
-    int lineNumber,
-    bool& ignoreAlways,
-    bool useGuiPrompt);
-
-/** 
-  Allows customization of the global function invoked when a debugAssert fails.
-  The initial value is G3D::_internal::_handleDebugAssert_.  G3D will invoke
-  rawBreak if the hook returns true.  If NULL, assertions are not handled.
-*/
-void setAssertionHook(AssertionHook hook);
-
-AssertionHook assertionHook();
-
-/**
- Called by alwaysAssertM in case of failure in release mode.  If returns
- true then the program exits with -1 (you can replace this with your own
- version that throws an exception or has other failure modes).
- */
-void setFailureHook(AssertionHook hook);
-AssertionHook failureHook();
-
-namespace _internal {
-    extern AssertionHook _debugHook;
-    extern AssertionHook _failureHook;
-} // internal
-} // G3D
-
-/**
- @def __debugPromptShowDialog__
- @internal
- */
-
-#ifdef G3D_DEBUG
-
-#    if defined(_MSC_VER) 
-#       define rawBreak()  ::DebugBreak();
-#    elif defined(__i386__)
-        // gcc on intel
-#       define rawBreak() __asm__ __volatile__ ( "int $3" ); 
-#    else
-        // some other gcc
-#      define rawBreak() ::abort()
-#   endif
-// old mac code:
-//#       define rawBreak() DebugStr((const unsigned char*)("\nG3D: Invoking breakpoint in debugger.")); /* XCode must be set to break on Debugger()/DebugStr() */
-
-
-#    define debugBreak() G3D::_internal::_releaseInputGrab_(); rawBreak(); G3D::_internal::_restoreInputGrab_();
-#    define debugAssert(exp) debugAssertM(exp, "Debug assertion failure")
-
-    #ifdef G3D_DEBUG_NOGUI
-        #define __debugPromptShowDialog__ false
-    #else
-        #define __debugPromptShowDialog__ true
-    #endif
-
-    #define debugAssertM(exp, message) do { \
-        static bool __debugAssertIgnoreAlways__ = false; \
-        if (!__debugAssertIgnoreAlways__ && !(exp)) { \
-            G3D::_internal::_releaseInputGrab_(); \
-            if ((G3D::_internal::_debugHook != NULL) && \
-                G3D::_internal::_debugHook((const char*)(#exp), message, __FILE__, __LINE__, __debugAssertIgnoreAlways__, __debugPromptShowDialog__)) { \
-                 rawBreak(); \
-            } \
-            G3D::_internal::_restoreInputGrab_(); \
-        } \
-    } while (0)
-
-    #define alwaysAssertM debugAssertM
-
-#else  // Release
-    #ifdef G3D_DEBUG_NOGUI
-        #define __debugPromptShowDialog__ false
-    #else
-        #define __debugPromptShowDialog__ true
-    #endif
-
-    // In the release build, just define away assertions.
-    #define rawBreak() do {} while (0)
-    #define debugAssert(exp) do {} while (0)
-    #define debugAssertM(exp, message) do {} while (0)
-    #define debugBreak() do {} while (0)
-
-    // But keep the 'always' assertions
-    #define alwaysAssertM(exp, message) { \
-        static bool __alwaysAssertIgnoreAlways__ = false; \
-        if (!__alwaysAssertIgnoreAlways__ && !(exp)) { \
-            G3D::_internal::_releaseInputGrab_(); \
-            if ((G3D::_internal::_failureHook != NULL) && \
-                G3D::_internal::_failureHook(#exp, message, __FILE__, __LINE__, __alwaysAssertIgnoreAlways__, __debugPromptShowDialog__)) { \
-                ::exit(-1);                                             \
-            } \
-            G3D::_internal::_restoreInputGrab_(); \
-         } \
-    }
-
-#endif  // if debug
-
-
-
-namespace G3D {  namespace _internal {
-
-#ifdef G3D_LINUX
-    /**
-     A pointer to the X11 display.  Initially NULL.  If set to a
-     non-null value (e.g. by SDLWindow), debugAssert attempts to use
-     this display to release the mouse/input grab when an assertion
-     fails.
-     */
-    extern Display*      x11Display;
-
-    /**
-     A pointer to the X11 window.  Initially NULL.  If set to a
-     non-null value (e.g. by SDLWindow), debugAssert attempts to use
-     this window to release the mouse/input grab when an assertion
-     fails.
-     */
-    extern Window        x11Window;
-#endif
-
-/**
- Pops up an assertion dialog or prints an assertion
-
- ignoreAlways      - return result of pressing the ignore button.
- useGuiPrompt      - if true, shows a dialog
- */
-bool _handleDebugAssert_(
-    const char* expression,
-    const std::string& message,
-    const char* filename,
-    int         lineNumber,
-    bool&       ignoreAlways,
-    bool        useGuiPrompt);
-
-bool _handleErrorCheck_(
-    const char* expression,
-    const std::string& message,
-    const char* filename,
-    int         lineNumber,
-    bool&       ignoreAlways,
-    bool        useGuiPrompt);
-
-/** Attempts to give the user back their mouse and keyboard if they 
-    were locked to the current window.  
-    @internal*/
-void _releaseInputGrab_();
-
-/** Attempts to restore the state before _releaseInputGrab_.  
-    @internal*/
-void _restoreInputGrab_();
-
-}; }; // namespace
-
-#endif
diff --git a/externals/g3dlite/G3D.lib/include/G3D/debugPrintf.h b/externals/g3dlite/G3D.lib/include/G3D/debugPrintf.h
deleted file mode 100644
index bc3315c8a6d..00000000000
--- a/externals/g3dlite/G3D.lib/include/G3D/debugPrintf.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- @file debugPrintf.h
- 
- @maintainer Morgan McGuire, matrix@graphics3d.com
- 
- @created 2001-08-26
- @edited  2007-07-20
-
- Copyright 2000-2007, Morgan McGuire.
- All rights reserved.
- */
-
-#ifndef G3D_DEBUGPRINTF_H
-#define G3D_DEBUGPRINTF_H
-
-#include "G3D/platform.h"
-#include 
-#include 
-#include "G3D/format.h"
-#include 
-
-namespace G3D {
-
-typedef void (*ConsolePrintHook)(const std::string&);
-
-namespace _internal {
-    extern ConsolePrintHook _consolePrintHook;
-}
-
-/** Called by consolePrintf after the log and terminal have been written to.
- Used by GConsole to intercept printing routines.*/
-void setConsolePrintHook(ConsolePrintHook h);
-
-ConsolePrintHook consolePrintHook();
-
-/**
-   Sends output to the log and to the last GConsole instantiated.
-
-   Guarantees that the output has been flushed by the time the routine
-   returns.
-   @sa G3D::logPrintf, G3D::screenPrintf
-   @return The string that was printed
- */
-std::string __cdecl consolePrintf(const char* fmt ...) G3D_CHECK_PRINTF_ARGS;
-std::string consolePrint(const std::string&);
-
-/**
-   Under visual studio, appears in the VS debug pane.
-   On unix-based operating systems the output is sent to stderr.
-
-   Also sends output to the console (G3D::consolePrintf) if there is a consolePrintHook,
-   and log (G3D::logPrintf), and flushes before returning.   
-
-   @return The string that was printed
-*/
-std::string __cdecl debugPrintf(const char* fmt ...) G3D_CHECK_PRINTF_ARGS;
-std::string debugPrint(const std::string&);
-
-} // namespace G3D
-
-#endif
-
diff --git a/externals/g3dlite/G3D.lib/include/G3D/enumclass.h b/externals/g3dlite/G3D.lib/include/G3D/enumclass.h
deleted file mode 100644
index 7e7bc3f6ac3..00000000000
--- a/externals/g3dlite/G3D.lib/include/G3D/enumclass.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/**
-  @file G3D/enumclass.h
-
-  @maintainer Morgan McGuire, morgan@graphics3d.com
-  @created 2007-01-27
-  @edited  2007-07-20
-*/
-#ifndef G3D_ENUMCLASS_H
-#define G3D_ENUMCLASS_H
-
-#include "G3D/Table.h"
-#include "G3D/BinaryInput.h"
-#include "G3D/BinaryOutput.h"
-
-/**
-  Creates a series of methods that turn a class into a scoped enumeration.
-  Uses the "Intelligent Enum" design pattern 
-  http://www.codeguru.com/cpp/cpp/cpp_mfc/article.php/c4001/
-
-  Enum classes are initialized to their zero value by default.
-
-  See GLG3D/GKey.h for an example.
- */
-#define G3D_DECLARE_ENUM_CLASS_METHODS(Classname)\
-    inline Classname(char v) : value((Value)v) {}\
-\
-    inline Classname() : value((Value)0) {}\
-\
-    inline Classname(const Value v) : value(v) {}\
-\
-    explicit inline Classname(int v) : value((Value)v) {}\
-\
-    /** Support cast back to the Value type, which is needed to allow implicit assignment inside unions. */\
-    /*inline operator Value() const {
-        return value;
-	}*/\
-\
-    inline operator int() const {\
-        return (int)value;\
-    }\
-\
-    inline bool operator== (const Classname other) const {\
-        return value == other.value;\
-    }\
-\
-    inline bool operator== (const Classname::Value other) const {\
-        return value == other;\
-    }\
-\
-    inline bool operator!= (const Classname other) const {\
-        return value != other.value;\
-    }\
-\
-    inline bool operator!= (const Classname::Value other) const {\
-        return value != other;\
-    }\
-\
-    inline bool operator< (const Classname other) const {\
-        return value < other.value;\
-    }\
-\
-    inline bool operator> (const Classname other) const {\
-        return value > other.value;\
-    }\
-\
-    inline bool operator>= (const Classname other) const {\
-        return value >= other.value;\
-    }\
-\
-    inline bool operator<= (const Classname other) const {\
-        return value <= other.value;\
-    }\
-\
-    inline bool operator< (const Value other) const {\
-        return value < other;\
-    }\
-\
-    inline bool operator> (const Value other) const {\
-        return value > other;\
-    }\
-\
-    inline bool operator<= (const Value other) const {\
-        return value <= other;\
-    }\
-\
-    inline bool operator>= (const Value other) const {\
-        return value >= other;\
-    }\
-\
-    inline Classname& operator-- () {\
-        value = (Value)((int)value - 1);\
-        return *this;\
-    }\
-\
-    inline Classname& operator++ () {\
-        value = (Value)((int)value + 1);\
-        return *this;\
-    }\
-\
-    inline Classname& operator+= (const int x) {\
-        value = (Value)((int)value + x);\
-        return *this;\
-    }\
-\
-    inline Classname& operator-= (const int x) {\
-        value = (Value)((int)value - x);\
-        return *this;\
-    }\
-\
-    inline Classname operator+ (const int x) const {\
-        return Classname((int)value + x);\
-    }\
-\
-    inline Classname operator- (const int x) const {\
-        return Classname((int)value - x);\
-    }\
-\
-    inline unsigned int hashCode() const {\
-        return (unsigned int)value;\
-    }\
-\
-    void serialize(BinaryOutput& b) const {\
-        b.writeInt32(value);\
-    }\
-\
-    void deserialize(BinaryInput& b) {\
-        value = (Value)b.readInt32();\
-    }
-
-#define G3D_DECLARE_ENUM_CLASS_HASHCODE(Classname)\
-template <> struct HashTrait                                              \
-{                                                                                           \
-    static size_t hashCode(Classname::Value key) { return static_cast(key); }       \
-};                                                                                          \
-                                                                                            \
-template <> struct HashTrait                                                     \
-{                                                                                           \
-    static size_t hashCode(Classname key) { return static_cast(key.hashCode()); }   \
-};
-
-#endif
diff --git a/externals/g3dlite/G3D.lib/include/G3D/fileutils.h b/externals/g3dlite/G3D.lib/include/G3D/fileutils.h
deleted file mode 100644
index ead20720870..00000000000
--- a/externals/g3dlite/G3D.lib/include/G3D/fileutils.h
+++ /dev/null
@@ -1,246 +0,0 @@
-/**
- @file fileutils.h
- 
- @maintainer Morgan McGuire, matrix@graphics3d.com
- 
- @author  2002-06-06
- @edited  2007-01-18
-
- Copyright 2000-2007, Morgan McGuire.
- All rights reserved.
- */
-
-#ifndef G3D_FILEUTILS_H
-#define G3D_FILEUTILS_H
-
-#include "G3D/platform.h"
-#include 
-#include 
-#include "G3D/Array.h"
-#include "G3D/Set.h"
-#include "G3D/g3dmath.h"
-
-#ifdef G3D_WIN32
-// For chdir, mkdir, etc.
-#   include 
-#endif
-
-namespace G3D {
-
-    namespace _internal {
-        extern Set currentFilesUsed;
-    }
-
-/** Returns all the files used by G3D and GLG3D during the current execution. */
-Array filesUsed();
-    
-std::string readWholeFile(
-    const std::string&          filename);
-
-
-/** Reads from a zip file and decompresses the desired contents
-	into memory.  Does not support recursive zip calls (i.e. a .zip
-	stored within another .zip)
-
-	@param file the path, of the format C:\...\something.zip\...\desiredfile.ext
-	@param data a pointer to the memory where the file will be stored
-	@param length the size of the file decompressed to memory */
-void zipRead(const std::string& file,
-			 void*& data,
-			 size_t& length);
-
-
-/** Closes the contents of a zip file that had been decompressed to
-	memory.  Must be called in tandem with zipRead() to avoid memory
-	leaks.
-
-	@param data the pointer to the decompressed file in memory */
-void zipClose(void* data);
-
-
-/**
- @param flush If true (default), the file is ready for reading as soon
- as the function returns.  If false, the function returns immediately and
- writes the file in the background.
- */
-void writeWholeFile(
-    const std::string& filename, 
-    const std::string& str, 
-    bool    flush = true);
-
-/**
- Creates the directory (which may optionally end in a /)
- and any parents needed to reach it.
- */
-void createDirectory(
-    const std::string&          dir);
-
-/**
- Fully qualifies a filename.  The filename may contain wildcards,
- in which case the wildcards will be preserved in the returned value.
- */
-std::string resolveFilename(const std::string& filename);
-
-/**
- Appends all files matching filespec to the files array.  The names
- will not contain paths unless includePath == true.  These may be
- relative to the current directory unless the filespec is fully qualified
- (can be done with resolveFilename).
- Wildcards can only appear to the right of the last slash in filespec.
- Works with .zip files used as paths, if filespec is passed in the form
- C:\...\something.zip\*  Does not work recursively with zipfiles (a
- .zip within a .zip will not work)
- */
-void getFiles(
-	const std::string&			filespec,
-	Array&			files,
-	bool						includePath    = false);
-
-/**
- Appends all directories matching filespec to the files array. The names
- will not contain paths unless includePath == true.  These may be
- relative to the current directory unless the filespec is fully qualified
- (can be done with resolveFilename).
- Does not append special directories "." or "..".
- Works with .zip files used as paths, if filespec is passed in the form
- C:\...\something.zip\*  Does not work recursively with zipfiles (a
- .zip within a .zip will not work)
- */
-void getDirs(
-	const std::string&			filespec,
-	Array&			files,
-	bool						includePath = false);
-
-
-/** Returns true if the specified path exists and is a directory */
-bool isDirectory(const std::string& filespec);
-
-
-/** Returns true if the specified filename exists and is a zipfile */
-bool isZipfile(const std::string& filename);
-
-
-/** Returns the length of the file.  If 
-	filename specifies a path that contains a zipfile, but the 
-	contents within are specified correctly, returns the 
-	uncompressed size of the requested file.  Returns -1 if
-	the file does not exist. 
-	
-	@param filename the path to test, may contain .zip
-*/
-int64 fileLength(const std::string& filename);
-
-/**
- Copies the file
- */
-void copyFile(
-    const std::string&          source,
-    const std::string&          dest);
-
-/** Returns a temporary file that is open for read/write access.  This
-    tries harder than the ANSI tmpfile, so it may succeed when that fails. */
-FILE* createTempFile();
-
-/**
- Returns true if the given file (or directory) exists.
-
- @param filename the path to test. must not end in a trailing slash.
- @param lookInZipfiles if the path does not exist, calls zipfileExists()
- */
-bool fileExists(
-    const std::string&          filename,
-	const bool					lookInZipfiles = true);
-
-/**
- Returns true if the given file (or directory) exists
- within a zipfile.  Called if fileExists initially
- returns false and the lookInZipfiles flag has been set.
- Must not end in a trailing slash.  Does not work for recursive
- zipfiles (.zips within another .zip)
-
- @param filename the path to test
- @param outZipfile the path to the .zip file
- @param outInternalFile the path (within the .zip) where the desired file is located, if valid
-
- */
-bool zipfileExists(
-	const std::string&          filename,
-	std::string&				outZipfile,
-	std::string&				outInternalFile
-	);
-
-bool zipfileExists(const std::string& filename);
-
-/**
-  Parses a filename into four useful pieces.
-
-  Examples:
-
-  c:\a\b\d.e   
-    root  = "c:\"
-    path  = "a" "b"
-    base  = "d"
-    ext   = "e"
- 
-  /a/b/d.e
-    root = "/"
-    path  = "a" "b"
-    base  = "d"
-    ext   = "e"
-
-  /a/b
-    root  = "/"
-    path  = "a"
-    base  = "b"
-    ext   = "e"
-
- */
-void parseFilename(
-    const std::string&  filename,
-    std::string&        drive,    
-    Array& path,
-    std::string&        base,
-    std::string&        ext);
-
-
-/**
- Returns the part of the filename that includes the base and ext from
- parseFilename (i.e. everything to the right of the path).
- */
-std::string filenameBaseExt(const std::string& filename);
-
-/**
- Returns the extension on a filename.
- */
-std::string filenameExt(const std::string& filename);
-
-
-/** Returns the portion of a filename to the left of the last period
-    and to the right of the last slash or colon.
- */
-std::string filenameBase(const std::string& filename);
-
-/** Creates a unique filename base in the current directory using the
-    specified prefix.*/
-std::string generateFilenameBase(const std::string& prefix = "");
-
-/** 
- Returns the drive (if Win32) and path from a filename, including 
- a slash if there was one.
- filenamePath(f) + filenameBaseExt(f) == f
- */
-std::string filenamePath(const std::string& filename);
-
-/** Returns true if '*' or '?' appears in the string */
-bool filenameContainsWildcards(const std::string& filename);
-
-/** Returns true if dst does not exist or src is newer than dst.  Works on both files and directories. */
-bool fileIsNewer(const std::string& src, const std::string& dst);
-
-/** Appends file onto dirname, ensuring a / if needed. */
-std::string pathConcat(const std::string& dirname, const std::string& file);
-
-} // namespace
-
-#endif
-
diff --git a/externals/g3dlite/G3D.lib/include/G3D/filter.h b/externals/g3dlite/G3D.lib/include/G3D/filter.h
deleted file mode 100644
index 74a32ad01ea..00000000000
--- a/externals/g3dlite/G3D.lib/include/G3D/filter.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
-  @file G3D/filter.h
-
-  @author Morgan McGuire, matrix@graphics3d.com
-  @created 2007-03-01
-  @edited  2007-03-01
-
-  Copyright 2000-2007, Morgan McGuire.
-  All rights reserved.
- */
-#ifndef G3D_FILTER_H
-#define G3D_FILTER_H
-
-#include "G3D/platform.h"
-#include "G3D/Array.h"
-#include "G3D/g3dmath.h"
-
-namespace G3D {
-/**
- Generates a set of 1D gaussian filter coefficients of size N.  The coefficients
- are centered on element (N-1)/2 and have standard deviation given by std.  The coefficients
- are normalized such that the sum across coeff is 1.0.
-
- Matches the results returned by Matlab fspecial('gaussian', [1, N], std)
- */ 
-void gaussian1D(Array& coeff, int N = 5, float std = 0.5f);
-}
-
-#endif
diff --git a/externals/g3dlite/G3D.lib/include/G3D/format.h b/externals/g3dlite/G3D.lib/include/G3D/format.h
deleted file mode 100644
index f993a74038f..00000000000
--- a/externals/g3dlite/G3D.lib/include/G3D/format.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- @file format.h
- 
- @maintainer Morgan McGuire, matrix@graphics3d.com
- 
- @author  2000-09-09
- @edited  2005-11-03
-
- Copyright 2000-2005, Morgan McGuire.
- All rights reserved.
- */
-
-#ifndef G3D_FORMAT_H
-#define G3D_FORMAT_H
-
-#include "G3D/platform.h"
-#include 
-#include 
-#include 
-
-namespace G3D {
-
-/**
-  Produces a string from arguments of the style of printf.  This avoids
-  problems with buffer overflows when using sprintf and makes it easy
-  to use the result functionally.  This function is fast when the resulting
-  string is under 160 characters (not including terminator) and slower
-  when the string is longer.
- */
-std::string   __cdecl format(
-    const char*                 fmt
-    ...) G3D_CHECK_PRINTF_ARGS;
-
-/**
-  Like format, but can be called with the argument list from a ... function.
- */
-std::string vformat(
-    const char*                 fmt,
-    va_list                     argPtr) G3D_CHECK_VPRINTF_ARGS;
-
-
-} // namespace
-
-#endif
diff --git a/externals/g3dlite/G3D.lib/include/G3D/g3dmath.h b/externals/g3dlite/G3D.lib/include/G3D/g3dmath.h
deleted file mode 100644
index 0a4f01f11c6..00000000000
--- a/externals/g3dlite/G3D.lib/include/G3D/g3dmath.h
+++ /dev/null
@@ -1,810 +0,0 @@
-/**
- @file g3dmath.h
- 
- Math util class.
- 
- @maintainer Morgan McGuire, matrix@graphics3d.com
- @cite highestBit by Jukka Liimatta
- 
- @created 2001-06-02
- @edited  2006-01-16
-
- Copyright 2000-2006, Morgan McGuire.
- All rights reserved.
- */
-
-#ifndef G3DMATH_H
-#define G3DMATH_H
-
-#ifdef _MSC_VER
-// Disable conditional expression is constant, which occurs incorrectly on inlined functions
-#   pragma warning (push)
-#   pragma warning (disable : 4127)
-// disable: "C++ exception handler used"
-#   pragma warning (disable : 4530)
-#endif
-
-#include "G3D/platform.h"
-#include 
-#include 
-#include 
-#include 
-
-#ifdef _MSC_VER
-    // Visual Studio is missing inttypes.h
-#   ifndef PRId64
-#       define PRId64 "I64d"
-#   endif
-#else
-#include 
-#endif
-
-/*These defines enable functionality introduced with the 1999 ISO C
-**standard. They must be defined before the inclusion of math.h to
-**engage them. If optimisation is enabled, these functions will be 
-**inlined. With optimisation switched off, you have to link in the
-**maths library using -lm.
-*/
-
-#define _ISOC9X_SOURCE1
-#define _ISOC99_SOURCE1
-#define __USE_ISOC9X1
-#define __USE_ISOC991
-
-#include 
-
-#include "G3D/debug.h"
-
-#undef min
-#undef max
-
-namespace G3D {
-
-#ifdef _MSC_VER
-
-/**
-   Win32 implementation of the C99 fast rounding routines.
-   
-   @cite routines are
-   Copyright (C) 2001 Erik de Castro Lopo 
-   
-   Permission to use, copy, modify, distribute, and sell this file for any 
-   purpose is hereby granted without fee, provided that the above copyright 
-   and this permission notice appear in all copies.  No representations are
-   made about the suitability of this software for any purpose.  It is 
-   provided "as is" without express or implied warranty.
-*/
-
-__inline long int lrint (double flt) {
-    int intgr;
-
-    _asm {
-        fld flt
-        fistp intgr
-    };
-
-    return intgr;
-}
-
-__inline long int lrintf(float flt) {
-    int intgr;
-
-    _asm {
-        fld flt
-        fistp intgr
-    };
-
-    return intgr;
-}
-#endif
-
-
-
-const double fuzzyEpsilon = 0.00001;
-
-/** Returns a reference to a static double.
-    This value should not be tested against directly, instead
-    G3D::isNan() and G3D::isFinite() will return reliable results. */
-inline const double& inf() {
-
-    // double is a standard type and should have infinity
-    static const double i = std::numeric_limits::infinity();
-	return i;
-}
-
-/** Returns a reference to a static double.
-    This value should not be tested against directly, instead
-    G3D::isNan() and G3D::isFinite() will return reliable results. */
-inline const double& nan() {
-
-    // double is a standard type and should have quiet NaN
-    static const double n = std::numeric_limits::quiet_NaN();
-    return n;
-}
-
-/** Returns a reference to a static double. Use instead of G3D_PI. */
-inline const double& pi() {
-    static const double p = 3.1415926535898;
-    return p;
-}
-
-/** Returns a reference to a static double. */
-inline const double& halfPi() {
-    static const double p = pi() / 2.0;
-    return p;
-}
-
-/** Returns a reference to a static double. */
-inline const double& twoPi() {
-    static const double p = pi() * 2.0;;
-    return p;
-}
-
-typedef signed char     int8;
-typedef unsigned char	uint8;
-typedef short           int16;
-typedef unsigned short  uint16;
-typedef int             int32;
-typedef unsigned int    uint32;
-
-#ifdef _MSC_EXTENSIONS
-    typedef __int64             int64;
-    typedef unsigned __int64    uint64;
-#elif ! defined(_MSC_VER)
-    typedef int64_t             int64;
-    typedef uint64_t            uint64;
-#else
-    typedef long long           int64;
-    typedef unsigned long long  uint64;
-#endif
-
-typedef float           float32;
-typedef double          float64;
-
-int iAbs(int iValue);
-int iCeil(double fValue);
-
-/**
- Clamps the value to the range [low, hi] (inclusive)
- */
-int iClamp(int val, int low, int hi);
-int16 iClamp(int16 val, int16 low, int16 hi);
-double clamp(double val, double low, double hi);
-float clamp(float val, float low, float hi);
-
-/**
- Returns a + (b - a) * f;
- */
-inline double lerp(double a, double b, double f) {
-    return a + (b - a) * f;
-}
-
-inline float lerp(float a, float b, float f) {
-    return a + (b - a) * f;
-}
-
-/**
- Wraps the value to the range [0, hi) (exclusive
- on the high end).  This is like the clock arithmetic
- produced by % (modulo) except the result is guaranteed
- to be positive.
- */
-int iWrap(int val, int hi);
-
-int iFloor(double fValue);
-
-int iSign(int iValue);
-int iSign(double fValue);
-
-inline int iSign(float f) {
-    return iSign((double)f);
-}
-
-
-/** 
-    Fast round to integer using the lrint routine.
-    Typically 6x faster than casting to integer.
- */
-inline int iRound(double fValue) {
-    return lrint(fValue);
-}
-
-/** 
-    Fast round to integer using the lrint routine.
-    Typically 6x faster than casting to integer.
- */
-inline int iRound(float f) {
-    return lrintf(f);
-}
-
-/**
- Returns a random number uniformly at random between low and hi
- (inclusive).
- */
-int iRandom(int low, int hi);
-
-double abs (double fValue);
-double aCos (double fValue);
-double aSin (double fValue);
-double aTan (double fValue);
-double aTan2 (double fY, double fX);
-double sign (double fValue);
-double square (double fValue);
-
-/**
- Returns true if the argument is a finite real number.
- */
-bool isFinite(double x);
-
-/**
- Returns true if the argument is NaN (not a number).
- You can't use x == nan to test this because all
- comparisons against nan return false.
- */
-bool isNaN(double x);
-
-/**
- Computes x % 3.
- */
-int iMod3(int x);
-
-/**
- Uniform random number between low and hi, inclusive. [low, hi]
- */
-float uniformRandom(float low = 0.0f, float hi = 1.0f);
-
-/**
- Normally distributed random number. 
- */
-float gaussRandom(float mean = 0.0f, float stdev = 1.0f);
-
-template 
-inline T min(const T& x, const T& y) {
-    return std::min(x, y);
-}
-
-template 
-inline T min(const T& x, const T& y, const T& z) {
-    return std::min(std::min(x, y), z);
-}
-
-template 
-inline T min(const T& x, const T& y, const T& z, const T& w) {
-    return std::min(std::min(x, y), std::min(z, w));
-}
-
-template 
-inline T max(const T& x, const T& y) {
-    return std::max(x, y);
-}
-
-template 
-inline T max(const T& x, const T& y, const T& z) {
-    return std::max(std::max(x, y), z);
-}
-
-template 
-inline T max(const T& x, const T& y, const T& z, const T& w) {
-    return std::max(std::max(x, y), std::max(z, w));
-}
-
-int iMin(int x, int y);
-int iMax(int x, int y);
-
-double square(double x);
-double sumSquares(double x, double y);
-double sumSquares(double x, double y, double z);
-double distance(double x, double y);
-double distance(double x, double y, double z);
-
-/**
-  Returnes the 0-based index of the highest 1 bit from
-  the left.  -1 means the number was 0.
-
-  @cite Based on code by jukka@liimatta.org
- */ 
-int highestBit(uint32 x);
-
-/**
- Note that fuzzyEq(a, b) && fuzzyEq(b, c) does not imply
- fuzzyEq(a, c), although that will be the case on some
- occasions.
- */
-bool fuzzyEq(double a, double b);
-
-/** True if a is definitely not equal to b.  
-    Guaranteed false if a == b. 
-    Possibly false when a != b.*/
-bool fuzzyNe(double a, double b);
-
-/** Is a strictly greater than b? (Guaranteed false if a <= b).
-    (Possibly false if a > b) */
-bool fuzzyGt(double a, double b);
-
-/** Is a near or greater than b? */
-bool fuzzyGe(double a, double b);
-
-/** Is a strictly less than b? (Guaranteed false if a >= b)*/
-bool fuzzyLt(double a, double b);
-
-/** Is a near or less than b? */
-bool fuzzyLe(double a, double b);
-
-/**
- Computes 1 / sqrt(x).
- */
-inline float rsq(float x) {
-    return 1.0f / sqrtf(x);
-}
-
-/**
- Uses SSE to implement rsq.
- @cite Nick nicolas@capens.net
- */
-inline float SSErsq(float x) {
-
-    #if defined(SSE) && defined(G3D_WIN32)
-        __asm {
-           movss xmm0, x
-           rsqrtss xmm0, xmm0
-           movss x, xmm0
-        }
-        return x;
-    #else
-        return 1.0f / sqrt(x);
-    #endif
-}
-
-/**
- Return the next power of 2 higher than the input
- If the input is already a power of 2, the output will be the same 
- as the input.
- */
-int ceilPow2(unsigned int in);
-
-/** Returns 2^x */
-inline int pow2(unsigned int x) {
-    return 1 << x;
-}
-
-
-/** Log base 2 */
-inline float log2(float x) {
-    return ::logf(x) / ::logf(2.0f);
-}
-
-/** Log base 2 */
-inline double log2(double x) {
-    return ::log(x) / ::log(2.0);
-}
-
-/** Log base 2 */
-inline double log2(int x) {
-    return log2((double)x);
-}
-
-
-/**
- * True if num is a power of two.
- */
-bool isPow2(int num);
-
-bool isOdd(int num);
-bool isEven(int num);
-
-double toRadians(double deg);
-double toDegrees(double rad);
-
-/**
- Returns true if x is not exactly equal to 0.0f.
- */
-inline bool any(float x) {
-    return x != 0;
-}
-
-/**
- Returns true if x is not exactly equal to 0.0f.
- */
-inline bool all(float x) {
-    return x != 0;
-}
-
-/**
- v / v (for DirectX/Cg support)
- */
-inline float normalize(float v) {
-    return v / v;
-}
-
-/**
- a * b (for DirectX/Cg support)
- */
-inline float dot(float a, float b) {
-    return a * b;
-}
-
-
-/**
- a * b (for DirectX/Cg support)
- */
-inline float mul(float a, float b) {
-    return a * b;
-}
-
-/**
- 2^x
- */
-inline double exp2(double x) {
-    return pow(2.0, x);
-}
-
-inline double rsqrt(double x) {
-    return 1.0 / sqrt(x);
-}
-
-
-/**
- sin(x)/x
- */
-inline double sinc(double x) {
-    double r = sin(x) / x;
-
-    if (isNaN(r)) {
-        return 1.0;
-    } else {
-        return r;
-    }
-}
-
-/**
- Computes a floating point modulo; the result is t wrapped to the range [lo, hi).
- */
-inline float wrap(float t, float lo, float hi) {
-    if ((t >= lo) && (t < hi)) {
-        return t;
-    }
-
-    debugAssert(hi > lo);
-
-    float interval = hi - lo;
-
-    return t - interval * iFloor((t - lo) / interval);
-}
-
-
-inline double wrap(double t, double lo, double hi) {
-    if ((t >= lo) && (t < hi)) {
-        return t;
-    }
-
-    debugAssert(hi > lo);
-
-    double interval = hi - lo;
-
-    return t - interval * iFloor((t - lo) / interval);
-}
-
-inline double wrap(double t, double hi) {
-    return wrap(t, 0.0, hi);
-}
-
-
-inline bool isNaN(double x) {
-    bool b1  = (x < 0.0);
-    bool b2  = (x >= 0.0);
-    bool b3  = !(b1 || b2);
-    return b3;
-}
-
-inline bool isFinite(double x) {
-    return ! isNaN(x) && (x < G3D::inf()) && (x > -G3D::inf());
-}
-
-//----------------------------------------------------------------------------
-inline int iAbs (int iValue) {
-    return ( iValue >= 0 ? iValue : -iValue );
-}
-
-//----------------------------------------------------------------------------
-inline int iCeil (double fValue) {
-    return int(::ceil(fValue));
-}
-
-//----------------------------------------------------------------------------
-
-inline int iClamp(int val, int low, int hi) {
-    debugAssert(low <= hi);
-	if (val <= low) {
-		return low;
-	} else if (val >= hi) {
-		return hi;
-	} else {
-		return val;
-	}
-}
-
-//----------------------------------------------------------------------------
-
-inline int16 iClamp(int16 val, int16 low, int16 hi) {
-    debugAssert(low <= hi);
-	if (val <= low) {
-		return low;
-	} else if (val >= hi) {
-		return hi;
-	} else {
-		return val;
-	}
-}
-
-//----------------------------------------------------------------------------
-
-inline double clamp(double val, double low, double hi) {
-    debugAssert(low <= hi);
-	if (val <= low) {
-		return low;
-	} else if (val >= hi) {
-		return hi;
-	} else {
-		return val;
-	}
-}
-
-inline float clamp(float val, float low, float hi) {
-    debugAssert(low <= hi);
-	if (val <= low) {
-		return low;
-	} else if (val >= hi) {
-		return hi;
-	} else {
-		return val;
-	}
-}
-//----------------------------------------------------------------------------
-
-inline int iWrap(int val, int hi) {
-	if (val < 0) {
-		return ((val % hi) + hi) % hi;
-	} else {
-		return val % hi;
-	}
-}
-
-//----------------------------------------------------------------------------
-inline int iFloor (double fValue) {
-    return int(::floor(fValue));
-}
-
-//----------------------------------------------------------------------------
-inline int iSign (int iValue) {
-    return ( iValue > 0 ? + 1 : ( iValue < 0 ? -1 : 0 ) );
-}
-
-inline int iSign (double fValue) {
-    return ( fValue > 0.0 ? + 1 : ( fValue < 0.0 ? -1 : 0 ) );
-}
-
-//----------------------------------------------------------------------------
-inline double abs (double fValue) {
-    return double(::fabs(fValue));
-}
-
-//----------------------------------------------------------------------------
-inline double aCos (double fValue) {
-    if ( -1.0 < fValue ) {
-        if ( fValue < 1.0 )
-            return double(::acos(fValue));
-        else
-            return 0.0;
-    } else {
-        return pi();
-    }
-}
-
-//----------------------------------------------------------------------------
-inline double aSin (double fValue) {
-    if ( -1.0 < fValue ) {
-        if ( fValue < 1.0 ) {
-            return double(::asin(fValue));
-        } else {
-            return -halfPi();
-        }
-    } else {
-        return halfPi();
-    }
-}
-
-//----------------------------------------------------------------------------
-inline double aTan (double fValue) {
-    return double(::atan(fValue));
-}
-
-//----------------------------------------------------------------------------
-inline double aTan2 (double fY, double fX) {
-    return double(::atan2(fY, fX));
-}
-
-//----------------------------------------------------------------------------
-inline double sign (double fValue) {
-    if (fValue > 0.0) {
-        return 1.0;
-	}
-
-    if (fValue < 0.0) {
-        return -1.0;
-	}
-
-    return 0.0;
-}
-
-inline float sign (float fValue) {
-    if (fValue > 0.0f) {
-        return 1.0f;
-	}
-
-    if (fValue < 0.0f) {
-        return -1.0f;
-	}
-
-    return 0.0f;
-}
-
-
-inline float uniformRandom(float low, float hi) {
-    return (hi - low) * float(::rand()) / float(RAND_MAX) + low;
-}
-
-//----------------------------------------------------------------------------
-inline double square(double x) {
-    return x * x;
-}
-
-//----------------------------------------------------------------------------
-inline double sumSquares(double x, double y) {
-    return x*x + y*y;
-}
-
-//----------------------------------------------------------------------------
-inline double sumSquares(double x, double y, double z) {
-    return x*x + y*y + z*z;
-}
-
-//----------------------------------------------------------------------------
-inline double distance(double x, double y) {
-    return sqrt(sumSquares(x, y));
-}
-
-//----------------------------------------------------------------------------
-inline double distance(double x, double y, double z) {
-    return sqrt(sumSquares(x, y, z));
-}
-
-//----------------------------------------------------------------------------
-
-/** @deprecated use G3D::min */
-inline int iMin(int x, int y) {
-    return (x >= y) ? y : x;
-}
-
-//----------------------------------------------------------------------------
-/** @deprecated use G3D::min */
-inline int iMax(int x, int y) {
-    return (x >= y) ? x : y;
-}
-
-//----------------------------------------------------------------------------
-inline int ceilPow2(unsigned int in) {
-    in -= 1;
-
-    in |= in >> 16;
-    in |= in >> 8;
-    in |= in >> 4;
-    in |= in >> 2;
-    in |= in >> 1;
-
-    return in + 1;
-}
-
-inline bool isPow2(int num) {
-    return ((num & -num) == num);
-}
-
-inline bool isOdd(int num) {
-    return (num & 1) == 1;
-}
-
-inline bool isEven(int num) {
-    return (num & 1) == 0;
-}
-
-inline double toRadians(double deg) {
-    return deg * pi() / 180.0;
-}
-
-inline double toDegrees(double rad) {
-    return rad * 180.0 / pi();
-}
-
-inline float toRadians(float deg) {
-    return deg * (float)pi() / 180.0f;
-}
-
-inline float toDegrees(float rad) {
-    return rad * 180.0f / (float)pi();
-}
-
-inline float toRadians(int deg) {
-    return deg * (float)pi() / 180.0f;
-}
-
-inline float toDegrees(int rad) {
-    return rad * 180.0f / (float)pi();
-}
-/**
- Computes an appropriate epsilon for comparing a and b.
- */
-inline double eps(double a, double b) {
-    // For a and b to be nearly equal, they must have nearly
-    // the same magnitude.  This means that we can ignore b
-    // since it either has the same magnitude or the comparison
-    // will fail anyway.
-    (void)b;
-    const double aa = abs(a) + 1;
-    if (aa == inf()) {
-        return fuzzyEpsilon;
-    } else {
-        return fuzzyEpsilon * aa;
-    }
-}
-
-inline bool fuzzyEq(double a, double b) {
-    return (a == b) || (abs(a - b) <= eps(a, b));
-}
-
-inline bool fuzzyNe(double a, double b) {
-    return ! fuzzyEq(a, b);
-}
-
-inline bool fuzzyGt(double a, double b) {
-    return a > b + eps(a, b);
-}
-
-inline bool fuzzyGe(double a, double b) {
-    return a > b - eps(a, b);
-}
-
-inline bool fuzzyLt(double a, double b) {
-    return a < b - eps(a, b);
-}
-
-inline bool fuzzyLe(double a, double b) {
-    return a < b + eps(a, b);
-}
-
-inline int iMod3(int x) {
-    return x % 3;
-}
-
-/**
- Given a 32-bit integer, returns the integer with the bytes in the opposite order.
- */
-inline uint32 flipEndian32(const uint32 x) {
-    return (x << 24) | ((x & 0xFF00) << 8) | 
-           ((x & 0xFF0000) >> 8) | ((x & 0xFF000000) >> 24);
-}
-
-/**
- Given a 16-bit integer, returns the integer with the bytes in the opposite order.
- */
-inline uint16 flipEndian16(const uint16 x) {
-    return (x << 8) | ((x & 0xFF00) >> 8);
-}
-
-
-} // namespace
-
-#ifdef _MSC_VER
-#   pragma warning (pop)
-#endif
-
-#endif
-
diff --git a/externals/g3dlite/G3D.lib/include/G3D/platform.h b/externals/g3dlite/G3D.lib/include/G3D/platform.h
deleted file mode 100644
index be9ec4d5123..00000000000
--- a/externals/g3dlite/G3D.lib/include/G3D/platform.h
+++ /dev/null
@@ -1,256 +0,0 @@
-/**
- @file platform.h
-
- #defines for platform specific issues.
-
- @maintainer Morgan McGuire, matrix@graphics3d.com
-
- @created 2003-06-09
- @edited  2007-07-30
- */
-
-#ifndef G3D_PLATFORM_H
-#define G3D_PLATFORM_H
-
-/**
- The version number of G3D in the form: MmmBB -> 
- version M.mm [beta BB]
- */
-#define G3D_VER 70100
-
-#if defined(G3D_RELEASEDEBUG)
-#   define G3D_DEBUGRELEASE
-#endif
-
-#if defined(G3D_DEBUGRELEASE) && defined(_DEBUG)
-#   undef _DEBUG
-#endif
-
-#if !defined(G3D_DEBUG) && (defined(_DEBUG) || defined(G3D_DEBUGRELEASE))
-#   define G3D_DEBUG
-#endif
-
-#ifdef _MSC_VER 
-    #define G3D_WIN32
-#elif  defined(__FreeBSD__) || defined(__OpenBSD__)
-    #define G3D_FREEBSD
-    #define G3D_LINUX
-#elif defined(__linux__)
-    #define G3D_LINUX
-#elif defined(__APPLE__)
-    #define G3D_OSX
-
-   // Prevent OS X fp.h header from being included; it defines
-   // pi as a constant, which creates a conflict with G3D
-#define __FP__
-#else
-    #error Unknown platform 
-#endif
-
-
-// Default to compiling with SSE, but if you want to compile 
-// without installing SP5.0 and the Processor Pack on Windows, compile with NO_SSE
-// defined (can be passed to the compiler command line with /D "NO_SSE")
-#if !defined(NO_SSE)
-   #define SSE
-#endif
-
-// On g++, recognize cases where the -msse2 flag was not specified
-#if defined(SSE) && defined(__GNUC__) && ! defined (__SSE__)
-#   undef SSE
-#endif
-
-
-// Verify that the supported compilers are being used and that this is a known
-// processor.
-
-#ifdef G3D_LINUX
-#   ifndef __GNUC__
-#       error G3D only supports the gcc compiler on Linux.
-#   endif
-#endif
-
-#ifdef G3D_OSX
-#    ifndef __GNUC__
-#        error G3D only supports the gcc compiler on OS X.
-#    endif
-	
-#    if defined(__i386__)
-#        define G3D_OSX_INTEL
-#    elif defined(__PPC__)
-#        define G3D_OSX_PPC
-#    else
-#        define G3D_OSX_UNKNOWN
-#    endif
-
-#endif
-
-
-#ifdef _MSC_VER
-// Microsoft Visual C++ 8.0 ("Express")       = 1400
-// Microsoft Visual C++ 7.1	("2003") _MSC_VER = 1310
-// Microsoft Visual C++ 7.0	("2002") _MSC_VER = 1300
-// Microsoft Visual C++ 6.0	_MSC_VER          = 1200
-// Microsoft Visual C++ 5.0	_MSC_VER          = 1100
-
-// Turn off warnings about deprecated C routines (TODO: revisit)
-#   pragma warning (disable : 4996)
-
-// Turn off "conditional expression is constant" warning; MSVC generates this
-// for debug assertions in inlined methods.
-#  pragma warning (disable : 4127)
-
-#  define G3D_DEPRECATED __declspec(deprecated)
-
-// Prevent Winsock conflicts by hiding the winsock API
-#   ifndef _WINSOCKAPI_
-#       define _G3D_INTERNAL_HIDE_WINSOCK_
-#       define _WINSOCKAPI_
-#   endif
-
-// Disable 'name too long for browse information' warning
-#   pragma warning (disable : 4786)
-// TODO: remove
-#   pragma warning (disable : 4244)
-
-#   define ZLIB_WINAPI
-
-#   define restrict
-
-#   define G3D_CHECK_PRINTF_ARGS 
-#   define G3D_CHECK_VPRINTF_ARGS
-#   define G3D_CHECK_PRINTF_METHOD_ARGS 
-#   define G3D_CHECK_VPRINTF_METHOD_ARGS
-
-    // On MSVC, we need to link against the multithreaded DLL version of
-    // the C++ runtime because that is what SDL and ZLIB are compiled
-    // against.  This is not the default for MSVC, so we set the following
-    // defines to force correct linking.  
-    //
-    // For documentation on compiler options, see:
-    //  http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/_core_.2f.md.2c_2f.ml.2c_2f.mt.2c_2f.ld.asp
-    //  http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore98/HTML/_core_Compiler_Reference.asp
-    //
-
-    // DLL runtime
-    #ifndef _DLL
-	    #define _DLL
-    #endif
-
-    // Multithreaded runtime
-    #ifndef _MT
-	    #define _MT 1
-    #endif
-
-    // Ensure that we aren't forced into the static lib
-    #ifdef _STATIC_CPPLIB
-	    #undef _STATIC_CPPLIB
-    #endif
-
-    #ifdef _DEBUG
-        #pragma comment (linker, "/NODEFAULTLIB:LIBCMTD.LIB")
-        #pragma comment (linker, "/NODEFAULTLIB:LIBCPMTD.LIB")
-        #pragma comment (linker, "/NODEFAULTLIB:LIBCPD.LIB")
-        #pragma comment (linker, "/DEFAULTLIB:MSVCPRTD.LIB")
-        #pragma comment(linker, "/NODEFAULTLIB:LIBCD.LIB")
-        #pragma comment(linker, "/DEFAULTLIB:MSVCRTD.LIB")
-    #else
-        #pragma comment(linker, "/NODEFAULTLIB:LIBC.LIB")
-        #pragma comment(linker, "/DEFAULTLIB:MSVCRT.LIB")
-        #pragma comment (linker, "/NODEFAULTLIB:LIBCMT.LIB")
-        #pragma comment (linker, "/NODEFAULTLIB:LIBCPMT.LIB")
-        #pragma comment(linker, "/NODEFAULTLIB:LIBCP.LIB")
-        #pragma comment (linker, "/DEFAULTLIB:MSVCPRT.LIB")
-    #endif
-
-    // Now set up external linking
-
-#    ifdef _DEBUG
-        // zlib was linked against the release MSVCRT; force
-        // the debug version.
-#        pragma comment(linker, "/NODEFAULTLIB:MSVCRT.LIB")
-#	 endif
-
-
-#    ifndef WIN32_LEAN_AND_MEAN
-#       define WIN32_LEAN_AND_MEAN 1
-#    endif
-
-
-#   define NOMINMAX 1
-#   ifndef _WIN32_WINNT
-#       define _WIN32_WINNT 0x0500
-#   endif
-#   include 
-#   undef WIN32_LEAN_AND_MEAN
-#   undef NOMINMAX
-
-#   ifdef _G3D_INTERNAL_HIDE_WINSOCK_
-#      undef _G3D_INTERNAL_HIDE_WINSOCK_
-#      undef _WINSOCKAPI_
-#   endif
-
-
-#   define G3D_START_AT_MAIN()\
-int WINAPI G3D_WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR szCmdLine, int sw);\
-int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR szCmdLine, int sw) {\
-    return G3D_WinMain(hInst, hPrev, szCmdLine, sw);\
-}
-
-#else
-
-#   define G3D_START_AT_MAIN()
-
-#endif  // win32
-
-#ifdef __GNUC__
-
-#    include 
-
-#   if __STDC_VERSION__ < 199901
-#        define restrict __restrict__
-#   endif
-
-#   define G3D_DEPRECATED __attribute__((__deprecated__))
-
-// setup function calling conventions
-#   if defined(__i386__) && ! defined(__x86_64__)
-
-#       ifndef __cdecl
-#           define __cdecl __attribute__((cdecl))
-#       endif
-
-#       ifndef __stdcall
-#           define __stdcall __attribute__((stdcall))
-#       endif
-
-#   elif defined(__x86_64__) || defined(__powerpc__)
-
-#       ifndef __cdecl
-#           define __cdecl
-#       endif
-
-#       ifndef __stdcall
-#           define __stdcall
-#       endif
-#   endif // calling conventions
-
-#   define G3D_CHECK_PRINTF_METHOD_ARGS   __attribute__((__format__(__printf__, 2, 3)))
-#   define G3D_CHECK_VPRINTF_METHOD_ARGS  __attribute__((__format__(__printf__, 2, 0)))
-#   define G3D_CHECK_PRINTF_ARGS          __attribute__((__format__(__printf__, 1, 2)))
-#   define G3D_CHECK_VPRINTF_ARGS         __attribute__((__format__(__printf__, 1, 0)))
-#endif
-
-
-/** 
-  @def STR(expression)
-
-  Creates a string from the expression.  Frequently used with G3D::Shader
-  to express shading programs inline.  
-
-  STR(this becomes a string)
 evaluates the same as "this becomes a string"
- */
-#define STR(x) #x
-
-// Header guard
-#endif
diff --git a/externals/g3dlite/G3D.lib/include/G3D/prompt.h b/externals/g3dlite/G3D.lib/include/G3D/prompt.h
deleted file mode 100644
index e25b955ab28..00000000000
--- a/externals/g3dlite/G3D.lib/include/G3D/prompt.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/** 
- @file prompt.h
- 
- @maintainer Morgan McGuire, matrix@graphics3d.com
- @cite   Windows GUI code by Max McGuire
-
- @created 2001-08-26
- @edited  2006-08-13
- */
-
-#ifndef G3D_PROMPT_H
-#define G3D_PROMPT_H
-
-#include "platform.h"
-#include 
-
-namespace G3D {
-
-/**
-  Prints a prompt to stdout and waits for user input.  The return value is
-  the number of the user's choice (the first is 0, if there are no
-  choices, returns 0). 
- 
-  @param useGui Under Win32, use a GUI, not stdout prompt.
-  @param windowTitle The title for the prompt window
-  @param promptx The text string to prompt the user with
-  @param choice  An array of strings that are the choices the user may make
-  @param numChoices The length of choice.
-
-  @cite Windows dialog interface by Max McGuire, mmcguire@ironlore.com
-  @cite Font setting code by Kurt Miller, kurt@flipcode.com
- */
-int prompt(
-    const char*     windowTitle,
-    const char*     promptx,
-    const char**    choice,
-    int             numChoices,
-    bool            useGui);
-
-/**
-  Prints a prompt and waits for user input.  The return value is
-  the number of the user's choice (the first is 0, if there are no
-  choices, returns 0).
-  
Uses GUI under Win32, stdout prompt otherwise.
- */
-inline int prompt(
-    const char*     windowTitle,
-    const char*     promptx,
-    const char**    choice,
-    int             numChoices) {
-
-    return prompt(windowTitle, promptx, choice, numChoices, true);
-}
-
-
-/**
- Displays a GUI prompt with "Ok" as the only choice.
- */
-void msgBox(
-    const std::string& message,
-    const std::string& title = "Message");
-
-
-}; // namespace
-
-#endif
-
diff --git a/externals/g3dlite/G3D.lib/include/G3D/serialize.h b/externals/g3dlite/G3D.lib/include/G3D/serialize.h
deleted file mode 100644
index 2382c0ee0fd..00000000000
--- a/externals/g3dlite/G3D.lib/include/G3D/serialize.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef G3D_SERIALIZE_H
-#define G3D_SERIALIZE_H
-
-#include "G3D/BinaryInput.h"
-#include "G3D/BinaryOutput.h"
-#include "G3D/Array.h"
-
-namespace G3D {
-
- 
-template 
-void serialize(const Array& array, BinaryOutput& b) { 
-    b.writeInt32(array.size()); 
-    for (int i = 0; i < array.size(); ++i) { 
-    serialize(array[i], b); 
-    } 
-}
-
-template 
-void deserialize(Array& array, BinaryInput& b) { 
-    int N = b.readInt32();
-    array.resize(N);
-    for (int i = 0; i < array.size(); ++i) { 
-        deserialize(array[i], b); 
-    }
-}
-
-}
-
-#endif
diff --git a/externals/g3dlite/G3D.lib/include/G3D/splinefunc.h b/externals/g3dlite/G3D.lib/include/G3D/splinefunc.h
deleted file mode 100644
index a9daad9b578..00000000000
--- a/externals/g3dlite/G3D.lib/include/G3D/splinefunc.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/**
- @file spline.h
- 
- @maintainer Morgan McGuire, matrix@graphics3d.com
- 
- @created 2004-07-25
- @edited  2007-05-05
- */
-
-#ifndef G3D_SPLINEFUNC_H
-#define G3D_SPLINEFUNC_H
-
-namespace G3D {
-
-#include "G3D/platform.h"
-#include "G3D/debug.h"
-#include "G3D/Array.h"
-#include "G3D/g3dmath.h"
-
-/**
- Interpolates a property according to a piecewise linear spline.  This provides
- C0 continuity but the derivatives are not smooth.  
- 

- Example:
- 
-    const double times[] = {MIDNIGHT,               SUNRISE - HOUR,         SUNRISE,              SUNRISE + sunRiseAndSetTime / 4, SUNRISE + sunRiseAndSetTime, SUNSET - sunRiseAndSetTime, SUNSET - sunRiseAndSetTime / 2, SUNSET,               SUNSET + HOUR/2,     DAY};
-    const Color3 color[] = {Color3(0, .0, .1),      Color3(0, .0, .1),      Color3::black(),        Color3::black(),                   Color3::white() * .25,         Color3::white() * .25,        Color3(.5, .2, .2),             Color3(.05, .05, .1),   Color3(0, .0, .1), Color3(0, .0, .1)};
-    ambient = linearSpline(time, times, color, 10);
- 
-
- See also G3D::Spline
-
-  @param x         The spline is a function of x; this is the sample to choose.
-  @param controlX  controlX[i], controlY[i] is a control points.  It is assumed
-                   that controlX are strictly increasing.  XType must support
-                   the "<" operator and a subtraction operator that returns
-                   a number.
-  @param controlY  YType must support multiplication and addition.
-  @param numControl The number of control points.
- */
-template
-YType linearSpline(double x, const XType* controlX, const YType* controlY, int numControl) {
-    debugAssert(numControl >= 1);
-
-    // Off the beginning
-    if ((numControl == 1) || (x < controlX[0])) {
-        return controlY[0];
-    }
-
-    for (int i = 1; i < numControl; ++i) {
-        if (x < controlX[i]) {
-            const double alpha = (double)(controlX[i] - x) / (controlX[i] - controlX[i - 1]);
-            return controlY[i] * (1 - alpha) + controlY[i - 1] * alpha;
-        }
-    }
-
-    // Off the end
-    return controlY[numControl - 1];
-}
-
- 
-    /** See also G3D::Spline*/
-template YType cyclicCatmullRomSpline(
-    double       t,
-    const YType* controlY,
-    int          numPoints) {
-
-    debugAssert(numPoints >= 3);
-
-    t = wrap(t, numPoints);
-
-    // Find the indices of adjacent control points    
-    int i = iFloor(t);
-    
-    // Compute the distance from the control point
-    t = t - i;
-
-    // Shift back one point for correct indexing
-    i += numPoints - 1;
-
-    // Pick up four control points
-    const YType& P0 = controlY[(i + 0) % numPoints];
-    const YType& P1 = controlY[(i + 1) % numPoints];
-    const YType& P2 = controlY[(i + 2) % numPoints];
-    const YType& P3 = controlY[(i + 3) % numPoints];
-
-    return 0.5 * ((2 * P1) + 
-                  (-P0 + P2) * t +
-                  (2*P0 - 5*P1 + 4*P2 - P3) * t*t +
-                  (-P0 + 3*P1- 3*P2 + P3) * t*t*t);
-}
-
-/**
- A cubic spline with regularly spaced 
- control points.  The spline interpolates
- the control points.  The spline
- will wrap from the last point back to the first.
-
- The t parameter is on the range [0, controlY.size()],
- where integers correspond to control points exactly.
-
- See also G3D::Spline
-
- @cite http://www.mvps.org/directx/articles/catmull/
-*/
-template YType cyclicCatmullRomSpline(
-    double       t,
-    const Array&  controlY) {
-
-    int numPoints = controlY.size();
-    return cyclicCatmullRomSpline(t, controlY.getCArray(), numPoints);
-}
-
-}
-
-#endif
-
-
diff --git a/externals/g3dlite/G3D.lib/include/G3D/stringutils.h b/externals/g3dlite/G3D.lib/include/G3D/stringutils.h
deleted file mode 100644
index 20a2ff6e795..00000000000
--- a/externals/g3dlite/G3D.lib/include/G3D/stringutils.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/**
- @file stringutils.h
- 
- @maintainer Morgan McGuire, matrix@graphics3d.com
- 
- @author  2000-09-09
- @edited  2008-08-05
- */
-
-#ifndef G3D_STRINGUTILS_H
-#define G3D_STRINGUTILS_H
-
-#include "G3D/platform.h"
-#include "G3D/Array.h"
-#include 
-
-namespace G3D {
-
-extern const char* NEWLINE;
-
-/**
- Returns true if the test string begins with the pattern string.
- */
-bool beginsWith(
-    const std::string&          test,
-    const std::string&          pattern);
-
-/**
- Returns true if the test string ends with the pattern string.
- */
-bool endsWith(
-    const std::string&          test,
-    const std::string&          pattern);
-
-/**
- Produces a new string that is the input string
- wrapped at a certain number of columns (where
- the line is broken at the latest space before the
- column limit.)  Platform specific NEWLINEs
- are inserted to wrap.
- */
-std::string wordWrap(
-    const std::string&          input,
-    int                         numCols);
-
-/**
- A comparison function for passing to Array::sort.
- */
-int stringCompare(
-    const std::string&          s1,
-    const std::string&          s2);
-
-int stringPtrCompare(
-    const std::string*          s1,
-    const std::string*          s2);
-
-/**
- Returns a new string that is an uppercase version of x.
- */
-std::string toUpper(
-    const std::string&          x);
-
-std::string toLower(
-    const std::string&          x);
-
-/**
- Splits x at each occurance of splitChar.
- */
-G3D::Array stringSplit(
-    const std::string&          x,
-    char                        splitChar);
-
-/**
- joinChar is not inserted at the beginning or end, just in between
- elements.
- */
-std::string stringJoin(
-    const G3D::Array&   a,
-    char                        joinChar);
-
-std::string stringJoin(
-    const G3D::Array&   a,
-    const std::string&               joinStr);
-
-/**
- Strips whitespace from both ends of the string.
- */
-std::string trimWhitespace(
-    const std::string&              s);
-
-/** These standard C functions are renamed for clarity/naming
-   conventions and to return bool, not int.
-   */
-inline bool isWhiteSpace(const unsigned char c) {
-    return isspace(c) != 0;
-}
-
-/** These standard C functions are renamed for clarity/naming
-   conventions and to return bool, not int.
-   */
-inline bool isNewline(const unsigned char c) {
-    return (c == '\n') || (c == '\r');
-}
-
-/** These standard C functions are renamed for clarity/naming
-   conventions and to return bool, not int.
-   */
-inline bool isDigit(const unsigned char c) {
-    return isdigit(c) != 0;
-}
-
-/** These standard C functions are renamed for clarity/naming
-   conventions and to return bool, not int.
-   */
-inline bool isLetter(const unsigned char c) {
-    return isalpha(c) != 0;
-}
-
-inline bool isSlash(const unsigned char c) {
-    return (c == '\\') || (c == '/');
-}
-
-inline bool isQuote(const unsigned char c) {
-    return (c == '\'') || (c == '\"');
-}
-
-}; // namespace
-
-#endif
-
diff --git a/externals/g3dlite/G3D.lib/include/G3D/uint128.h b/externals/g3dlite/G3D.lib/include/G3D/uint128.h
deleted file mode 100644
index 3e970cb2a7e..00000000000
--- a/externals/g3dlite/G3D.lib/include/G3D/uint128.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- @file uint128.h
- 
- @maintainer Morgan McGuire, matrix@graphics3d.com
- @author Kyle Whitson
- 
- @created 2008-07-17
- @edited  2008-07-17
- */
-
-#ifndef G3D_UINT128_H
-#define G3D_UINT128_H
-
-#include "G3D/g3dmath.h"
-
-namespace G3D {
-
-/** Limited functionality 128-bit unsigned integer. This is primarily to support FNV hashing and other
-    cryptography applications.  See the GMP library for high-precision C++ math support. */
-class uint128 {
-public:
-
-	G3D::uint64 hi;
-	G3D::uint64 lo;
-
-    uint128(const uint64& lo);
-
-	uint128(const uint64& hi, const uint64& lo);
-
-	uint128& operator+=(const uint128& x);
-
-	uint128& operator*=(const uint128& x);
-
-	uint128& operator^=(const uint128& x);
-
-	uint128& operator&=(const uint128& x);
-
-	uint128& operator|=(const uint128& x);
-
-	bool operator==(const uint128& x);
-
-    uint128& operator>>=(const int x);
-
-    uint128& operator<<=(const int x);
-
-    uint128 operator&(const uint128& x);
-
-};
-}
-
-#endif
diff --git a/externals/g3dlite/G3D.lib/include/G3D/vectorMath.h b/externals/g3dlite/G3D.lib/include/G3D/vectorMath.h
deleted file mode 100644
index aedc731e7f8..00000000000
--- a/externals/g3dlite/G3D.lib/include/G3D/vectorMath.h
+++ /dev/null
@@ -1,235 +0,0 @@
-/**
-  @file vectorMath.h
- 
-  Function aliases for popular vector methods.
- 
-  @maintainer Morgan McGuire, matrix@graphics3d.com
- 
-  @created: 2001-06-02
-  @edited:  2004-02-02
-  Copyright 2000-2004, Morgan McGuire.
-  All rights reserved.
- */
-
-#ifndef G3D_VECTORMATH_H
-#define G3D_VECTORMATH_H
-
-#include "G3D/platform.h"
-#include "G3D/g3dmath.h"
-#include "G3D/Vector2.h"
-#include "G3D/Vector3.h"
-#include "G3D/Vector4.h"
-#include "G3D/Matrix3.h"
-#include "G3D/Matrix4.h"
-#include "G3D/Color1.h"
-#include "G3D/Color3.h"
-#include "G3D/Color4.h"
-
-
-namespace G3D {
-
-
-inline Matrix4 mul(const Matrix4& a, const Matrix4& b) {
-    return a * b;
-}
-
-inline Vector4 mul(const Matrix4& m, const Vector4& v) {
-    return m * v;
-}
-
-inline Vector3 mul(const Matrix3& m, const Vector3& v) {
-    return m * v;
-}
-
-inline Matrix3 mul(const Matrix3& a, const Matrix3& b) {
-    return a * b;
-}
-
-inline float dot(const Vector2& a, const Vector2& b) {
-    return a.dot(b);
-}
-
-inline float dot(const Vector3& a, const Vector3& b) {
-    return a.dot(b);
-}
-
-inline float dot(const Vector4& a, const Vector4& b) {
-    return a.dot(b);
-}
-
-inline Vector2 normalize(const Vector2& v) {
-    return v / v.length();
-}
-
-inline Vector3 normalize(const Vector3& v) {
-    return v / v.magnitude();
-}
-
-inline Vector4 normalize(const Vector4& v) {
-    return v / v.length();
-}
-
-inline Vector2 abs(const Vector2& v) {
-    return Vector2(::fabsf(v.x), ::fabsf(v.y));
-}
-
-inline Vector3 abs(const Vector3& v) {
-    return Vector3(::fabsf(v.x), ::fabsf(v.y), ::fabsf(v.z));
-}
-
-inline Vector4 abs(const Vector4& v) {
-    return Vector4(::fabsf(v.x), ::fabsf(v.y), ::fabsf(v.z), ::fabsf(v.w));
-}
-
-inline bool all(const Vector2& v) {
-    return (v.x != 0) && (v.y != 0);
-}
-
-inline bool all(const Vector3& v) {
-    return (v.x != 0) && (v.y != 0) && (v.z != 0);
-}
-
-inline bool all(const Vector4& v) {
-    return (v.x != 0) && (v.y != 0) && (v.z != 0) && (v.w != 0);
-}
-
-inline bool any(const Vector2& v) {
-    return (v.x != 0) || (v.y != 0);
-}
-
-inline bool any(const Vector3& v) {
-    return (v.x != 0) || (v.y != 0) || (v.z != 0);
-}
-
-inline bool any(const Vector4& v) {
-    return (v.x != 0) || (v.y != 0) || (v.z != 0) || (v.w != 0);
-}
-
-inline Vector2 clamp(const Vector2& v, const Vector2& a, const Vector2& b) {
-    return v.clamp(a, b);
-}
-
-inline Vector3 clamp(const Vector3& v, const Vector3& a, const Vector3& b) {
-    return v.clamp(a, b);
-}
-
-inline Vector4 clamp(const Vector4& v, const Vector4& a, const Vector4& b) {
-    return v.clamp(a, b);
-}
-
-inline Vector2 lerp(const Vector2& v1, const Vector2& v2, float f) {
-    return v1.lerp(v2, f);
-}
-
-inline Vector3 lerp(const Vector3& v1, const Vector3& v2, float f) {
-    return v1.lerp(v2, f);
-}
-
-inline Vector4 lerp(const Vector4& v1, const Vector4& v2, float f) {
-    return v1.lerp(v2, f);
-}
-
-inline Color1 lerp(const Color1& v1, const Color1& v2, float f) {
-    return v1.lerp(v2, f);
-}
-
-inline Color3 lerp(const Color3& v1, const Color3& v2, float f) {
-    return v1.lerp(v2, f);
-}
-
-inline Color4 lerp(const Color4& v1, const Color4& v2, float f) {
-    return v1.lerp(v2, f);
-}
-
-inline Vector3 cross(const Vector3& v1, const Vector3& v2) {
-    return v1.cross(v2);
-}
-
-inline double determinant(const Matrix3& m) {
-    return m.determinant();
-}
-
-inline double determinant(const Matrix4& m) {
-    return m.determinant();
-}
-
-inline Vector2 min(const Vector2& v1, const Vector2& v2) {
-    return v1.min(v2);
-}
-
-inline Vector3 min(const Vector3& v1, const Vector3& v2) {
-    return v1.min(v2);
-}
-
-inline Vector4 min(const Vector4& v1, const Vector4& v2) {
-    return v1.min(v2);
-}
-
-inline Color3 min(const Color3& v1, const Color3& v2) {
-    return v1.min(v2);
-}
-
-inline Color4 min(const Color4& v1, const Color4& v2) {
-    return v1.min(v2);
-}
-
-inline Vector2 max(const Vector2& v1, const Vector2& v2) {
-    return v1.max(v2);
-}
-
-inline Vector3 max(const Vector3& v1, const Vector3& v2) {
-    return v1.max(v2);
-}
-
-inline Vector4 max(const Vector4& v1, const Vector4& v2) {
-    return v1.max(v2);
-}
-
-inline Color3 max(const Color3& v1, const Color3& v2) {
-    return v1.max(v2);
-}
-
-inline Color4 max(const Color4& v1, const Color4& v2) {
-    return v1.max(v2);
-}
-
-inline Vector2 sign(const Vector2& v) {
-    return Vector2((float)sign(v.x), (float)sign(v.y));
-}
-
-inline Vector3 sign(const Vector3& v) {
-    return Vector3((float)sign(v.x), (float)sign(v.y), (float)sign(v.z));
-}
-
-inline Vector4 sign(const Vector4& v) {
-    return Vector4((float)sign(v.x), (float)sign(v.y), (float)sign(v.z), (float)sign(v.w));
-}
-
-inline float length(float v) {
-    return ::fabsf(v);
-}
-
-inline float length(const Vector2& v) {
-    return v.length();
-}
-
-inline float length(const Vector3& v) {
-    return v.magnitude();
-}
-
-inline float length(const Vector4& v) {
-    return v.length();
-}
-
-/**
- Computes the log of each component.  Useful for
- inverting the monitor gamma function or simulating
- perceptual response.
- */
-inline Color3 log(const Color3& c) {
-    return Color3(::logf(c.r), ::logf(c.g), ::logf(c.b));
-}
-
-}
-
-#endif
diff --git a/externals/g3dlite/G3D.lib/source/AABox.cpp b/externals/g3dlite/G3D.lib/source/AABox.cpp
deleted file mode 100644
index 9e871aa8af7..00000000000
--- a/externals/g3dlite/G3D.lib/source/AABox.cpp
+++ /dev/null
@@ -1,342 +0,0 @@
-/**
-  @file AABox.cpp
-
-  @maintainer Morgan McGuire, matrix@graphics3d.com
-
-  @created 2004-01-10
-  @edited  2006-01-11
-*/
-
-#include "G3D/platform.h"
-#include "G3D/AABox.h"
-#include "G3D/Box.h"
-#include "G3D/Plane.h"
-#include "G3D/Sphere.h"
-#include "G3D/BinaryInput.h"
-#include "G3D/BinaryOutput.h"
-
-
-namespace G3D {
-
-
-void AABox::serialize(class BinaryOutput& b) const {
-    b.writeVector3(lo);
-    b.writeVector3(hi);
-}
-
-
-void AABox::deserialize(class BinaryInput& b) {
-    lo = b.readVector3();
-    hi = b.readVector3();
-}
-
-
-void AABox::split(const Vector3::Axis& axis, float location, AABox& low, AABox& high) const {
-    // Low, medium, and high along the chosen axis
-    float L = G3D::min(location, lo[axis]);
-    float M = G3D::min(G3D::max(location, lo[axis]), hi[axis]);
-    float H = G3D::max(location, hi[axis]);
-
-    // Copy over this box.
-    high = low = *this;
-
-    // Now move the split points along the special axis
-    low.lo[axis] = L;
-    low.hi[axis] = M;
-    high.lo[axis] = M;
-    high.hi[axis] = H;
-}
-
-
-Vector3 AABox::randomSurfacePoint() const {
-    Vector3 extent = hi - lo;
-    float aXY = extent.x * extent.y;
-    float aYZ = extent.y * extent.z;
-    float aZX = extent.z * extent.x;
-
-    float r = (float)uniformRandom(0.0f, aXY + aYZ + aZX);
-
-    // Choose evenly between positive and negative face planes
-    float d = ((float)uniformRandom(0, 1) < 0.5f) ? 0.0f : 1.0f;
-
-    // The probability of choosing a given face is proportional to
-    // its area.
-    if (r < aXY) {
-        return 
-            lo + 
-            Vector3(
-                (float)uniformRandom(0.0f, extent.x),
-                (float)uniformRandom(0.0f, extent.y),
-                d * extent.z);
-    } else if (r < aYZ) {
-        return 
-            lo + 
-            Vector3(
-                d * extent.x,
-                (float)uniformRandom(0, extent.y),
-                (float)uniformRandom(0, extent.z));
-    } else {
-        return 
-            lo + 
-            Vector3(
-                (float)uniformRandom(0, extent.x),
-                d * extent.y,
-                (float)uniformRandom(0, extent.z));
-    }
-}
-
-
-Vector3 AABox::randomInteriorPoint() const {
-    return Vector3(
-        (float)uniformRandom(lo.x, hi.x), 
-        (float)uniformRandom(lo.y, hi.y), 
-        (float)uniformRandom(lo.z, hi.z));
-}
-
-
-bool AABox::intersects(const AABox& other) const {
-    // Must be overlap along all three axes.
-    // Try to find a separating axis.
-
-    for (int a = 0; a < 3; ++a) {
-
-        //     |--------|
-        // |------|
-
-        if ((lo[a] > other.hi[a]) ||
-            (hi[a] < other.lo[a])) {
-            return false;
-        }
-    }
-
-    return true;
-}
-
-int AABox::dummy = 0;
-
-
-bool AABox::culledBy(
-    const Array&	plane,
-	int&				cullingPlane,
-	const uint32		_inMask,
-    uint32&             childMask) const {
-
-	uint32 inMask = _inMask;
-	assert(plane.size() < 31);
-
-    childMask = 0;
-
-    const bool finite = 
-        (abs(lo.x) < G3D::inf()) &&
-        (abs(hi.x) < G3D::inf()) &&
-        (abs(lo.y) < G3D::inf()) &&
-        (abs(hi.y) < G3D::inf()) &&
-        (abs(lo.z) < G3D::inf()) &&
-        (abs(hi.z) < G3D::inf());
-
-    // See if there is one plane for which all of the
-	// vertices are in the negative half space.
-    for (int p = 0; p < plane.size(); ++p) {
-
-		// Only test planes that are not masked
-		if ((inMask & 1) != 0) {
-		
-			Vector3 corner;
-
-            int numContained = 0;
-            int v = 0;
-
-            // We can early-out only if we have found one point on each
-            // side of the plane (i.e. if we are straddling).  That
-            // occurs when (numContained < v) && (numContained > 0)
-			for (v = 0; (v < 8) && ((numContained == v) || (numContained == 0)); ++v) {
-                // Unrolling these 3 if's into a switch decreases performance
-                // by about 2x
-				corner.x = (v & 1) ? hi.x : lo.x;
-				corner.y = (v & 2) ? hi.y : lo.y;
-				corner.z = (v & 4) ? hi.z : lo.z;
-        
-                if (finite) { // this branch is highly predictable
-                    if (plane[p].halfSpaceContainsFinite(corner)) {
-                        ++numContained;
-                    }
-                } else {
-                    if (plane[p].halfSpaceContains(corner)) {
-                        ++numContained;
-                    }
-                }
-			}
-
-			if (numContained == 0) {
-				// Plane p culled the box
-				cullingPlane = p;
-
-                // The caller should not recurse into the children,
-                // since the parent is culled.  If they do recurse,
-                // make them only test against this one plane, which
-                // will immediately cull the volume.
-                childMask = 1 << p;
-				return true;
-
-            } else if (numContained < v) {
-                // The bounding volume straddled the plane; we have
-                // to keep testing against this plane
-                childMask |= (1 << p);
-            }
-		}
-
-        // Move on to the next bit.
-		inMask = inMask >> 1;
-    }
-
-    // None of the planes could cull this box
-	cullingPlane = -1;
-    return false;
-}
-
-
-bool AABox::culledBy(
-    const Array& plane,
-	int&				cullingPlane,
-	const uint32		_inMask) const {
-
-	uint32 inMask = _inMask;
-	assert(plane.size() < 31);
-    
-    const bool finite = 
-        (abs(lo.x) < G3D::inf()) &&
-        (abs(hi.x) < G3D::inf()) &&
-        (abs(lo.y) < G3D::inf()) &&
-        (abs(hi.y) < G3D::inf()) &&
-        (abs(lo.z) < G3D::inf()) &&
-        (abs(hi.z) < G3D::inf());
-
-    // See if there is one plane for which all of the
-	// vertices are in the negative half space.
-    for (int p = 0; p < plane.size(); ++p) {
-
-		// Only test planes that are not masked
-		if ((inMask & 1) != 0) {
-		
-			bool culled = true;
-			Vector3 corner;
-
-            int v;
-
-			// Assume this plane culls all points.  See if there is a point
-			// not culled by the plane... early out when at least one point
-            // is in the positive half space.
-			for (v = 0; (v < 8) && culled; ++v) {
-
-                // Unrolling these 3 if's into a switch decreases performance
-                // by about 2x
-				corner.x = (v & 1) ? hi.x : lo.x;
-				corner.y = (v & 2) ? hi.y : lo.y;
-				corner.z = (v & 4) ? hi.z : lo.z;
-        
-                if (finite) { // this branch is highly predictable
-                    culled = ! plane[p].halfSpaceContainsFinite(corner);
-                } else {
-                    culled = ! plane[p].halfSpaceContains(corner);
-                }
-			}
-
-			if (culled) {
-				// Plane p culled the box
-				cullingPlane = p;
-
-				return true;
-            }
-		}
-
-        // Move on to the next bit.
-		inMask = inMask >> 1;
-    }
-
-    // None of the planes could cull this box
-	cullingPlane = -1;
-    return false;
-}
-
-
-bool AABox::intersects(const class Sphere& sphere) const {
-    double d = 0; 
-
-    //find the square of the distance
-    //from the sphere to the box
-    for (int i = 0; i < 3; ++i) {
-        if (sphere.center[i] < lo[i]) {
-            d += square(sphere.center[i] - lo[i]);
-        } else if (sphere.center[i] > hi[i]) {
-            d += square(sphere.center[i] - hi[i]);
-        }
-    }
-
-    return d <= square(sphere.radius);
-}
-
-Vector3 AABox::corner(int index) const {
-
-    // default constructor inits all components to 0
-    Vector3 v;
-
-    switch (index)
-    {
-    case 0:
-        v.x = lo.x;
-        v.y = lo.y;
-        v.z = hi.z;
-        break;
-
-    case 1:
-        v.x = hi.x;
-        v.y = lo.y;
-        v.z = hi.z;
-        break;
-
-    case 2:
-        v.x = hi.x;
-        v.y = hi.y;
-        v.z = hi.z;
-        break;
-
-    case 3:
-        v.x = lo.x;
-        v.y = hi.y;
-        v.z = hi.z;
-        break;
-
-    case 4:
-        v.x = lo.x;
-        v.y = lo.y;
-        v.z = lo.z;
-        break;
-
-    case 5:
-        v.x = hi.x;
-        v.y = lo.y;
-        v.z = lo.z;
-        break;
-
-    case 6:
-        v.x = hi.x;
-        v.y = hi.y;
-        v.z = lo.z;
-        break;
-
-    case 7:
-        v.x = lo.x;
-        v.y = hi.y;
-        v.z = lo.z;
-        break;
-
-    default:
-        debugAssertM(false, "Invalid corner index");
-        break;
-    }
-
-    return v;
-}
-
-
-}
diff --git a/externals/g3dlite/G3D.lib/source/AnyVal.cpp b/externals/g3dlite/G3D.lib/source/AnyVal.cpp
deleted file mode 100644
index 45fb41df534..00000000000
--- a/externals/g3dlite/G3D.lib/source/AnyVal.cpp
+++ /dev/null
@@ -1,1381 +0,0 @@
-/** 
- @file AnyVal.cpp
- @author Morgan McGuire
- @maintainer Morgan McGuire
- @created 2006-06-11
- @edited  2008-07-14
- */
-
-#include "G3D/AnyVal.h"
-#include "G3D/Array.h"
-#include "G3D/stringutils.h"
-#include "G3D/Table.h"
-#include "G3D/Vector2.h"
-#include "G3D/Vector3.h"
-#include "G3D/Vector4.h"
-#include "G3D/Color1.h"
-#include "G3D/Color3.h"
-#include "G3D/Color4.h"
-#include "G3D/Matrix2.h"
-#include "G3D/Matrix3.h"
-#include "G3D/Matrix4.h"
-#include "G3D/Rect2D.h"
-#include "G3D/AABox.h"
-#include "G3D/CoordinateFrame.h"
-#include "G3D/Quat.h"
-#include "G3D/TextInput.h"
-#include "G3D/TextOutput.h"
-#include "G3D/BinaryInput.h"
-#include "G3D/BinaryOutput.h"
-
-namespace G3D {
-
-AnyVal AnyVal::fromFile(const std::string& filename) {
-    TextInput t(filename);
-    return AnyVal(t);
-}
-
-
-void AnyVal::load(const std::string& filename) {
-    *this = fromFile(filename);
-}
-
-
-void AnyVal::save(const std::string& filename) const {
-    TextOutput t(filename);
-    serialize(t);
-    t.commit();
-}
-
-
-AnyVal::AnyVal() : m_type(NIL), m_value(NULL), m_referenceCount(NULL) {
-}
-
-
-AnyVal::AnyVal(bool b) : m_type(BOOLEAN), m_value(new bool(b)), m_referenceCount(NULL) {
-}
-
-
-AnyVal::AnyVal(G3D::TextInput& t) : m_type(NIL), m_value(NULL), m_referenceCount(NULL) {
-    deserialize(t);
-}
-
-
-/*AnyVal::AnyVal(G3D::BinaryInput& b) {
-    deserialize(b);
-}
-*/
-
-AnyVal::AnyVal(double v) : m_type(NUMBER), m_referenceCount(NULL) {
-    m_value = new double(v);
-}
-
-
-AnyVal::AnyVal(int v) : m_type(NUMBER), m_referenceCount(NULL) {
-    m_value = new double(v);
-}
-
-
-AnyVal::AnyVal(const Rect2D& v) : m_type(RECT2D), m_referenceCount(NULL) {
-    m_value = new Rect2D(v);
-}
-
-
-AnyVal::AnyVal(const AABox& v) : m_type(AABOX), m_referenceCount(NULL) {
-    m_value = new AABox(v);
-}
-
-
-AnyVal::AnyVal(const Vector2& v) : m_type(VECTOR2), m_referenceCount(NULL) {
-    m_value = new Vector2(v);
-}
-
-
-AnyVal::AnyVal(const Vector3& v) : m_type(VECTOR3), m_referenceCount(NULL) {
-    m_value = new Vector3(v);
-}
-
-
-AnyVal::AnyVal(const Vector4& v) : m_type(VECTOR4), m_referenceCount(NULL) {
-    m_value = new Vector4(v);
-}
-
-
-AnyVal::AnyVal(const Color1& v) : m_type(COLOR1), m_referenceCount(NULL) {
-    m_value = new Color1(v);
-}
-
-
-AnyVal::AnyVal(const Color3& v) : m_type(COLOR3), m_referenceCount(NULL) {
-    m_value = new Color3(v);
-}
-
-
-AnyVal::AnyVal(const Color4& v) : m_type(COLOR4), m_referenceCount(NULL) {
-    m_value = new Color4(v);
-}
-
-
-AnyVal::AnyVal(const std::string& v) : m_type(STRING), m_referenceCount(NULL) {
-    m_value = new std::string(v);
-}
-
-
-AnyVal::AnyVal(const char* v) : m_type(STRING), m_referenceCount(NULL) {
-    m_value = new std::string(v);
-}
-
-
-AnyVal::AnyVal(const Quat& v) : m_type(QUAT), m_referenceCount(NULL) {
-    m_value = new Quat(v);
-}
-
-
-AnyVal::AnyVal(const CoordinateFrame& v) : m_type(COORDINATEFRAME), m_referenceCount(NULL) {
-    m_value = new CoordinateFrame(v);
-}
-
-
-AnyVal::AnyVal(const Matrix2& v) : m_type(MATRIX2), m_referenceCount(NULL) {
-    m_value = new Matrix2(v);
-}
-
-AnyVal::AnyVal(const Matrix3& v) : m_type(MATRIX3), m_referenceCount(NULL) {
-    m_value = new Matrix3(v);
-}
-
-
-AnyVal::AnyVal(const Matrix4& v) : m_type(MATRIX4), m_referenceCount(NULL) {
-    m_value = new Matrix4(v);
-}
-
-
-AnyVal::AnyVal(const AnyVal& c) : m_type(NIL), m_value(NULL), m_referenceCount(NULL) {
-    *this = c;
-}
-
-
-AnyVal::AnyVal(Type arrayOrTable) : m_type(NIL), m_value(NULL), m_referenceCount(new int(1)) {
-    // TODO: make AnyVal::createArray()
-    switch (arrayOrTable) {
-    case ARRAY:
-        m_type = ARRAY;
-        m_value = new Array();
-        break;
-
-    case TABLE:
-        m_type = TABLE;
-        m_value = new Table();
-        break;
-
-    default:
-        debugAssertM(false, "Cannot construct AnyVal from constants except ARRAY or TABLE.");
-    }
-}
-
-
-AnyVal::~AnyVal() {
-    deleteValue();
-}
-
-
-void AnyVal::deleteValue() {
-    if (m_referenceCount) {
-        --(*m_referenceCount);
-        if (*m_referenceCount <= 0) {
-            delete m_referenceCount;
-            m_referenceCount = NULL;
-            // Pass through and delete the real object now
-        } else {
-            // Someone else is holding a reference, so we can't delete 
-            // the object.
-            m_referenceCount = NULL;
-            return;
-        }
-    }
-
-    switch (m_type) {
-    case NIL:
-        // Nothing to do
-        break;
-
-    case NUMBER:
-        delete (double*)m_value;
-        break;
-
-    case BOOLEAN:
-        delete (bool*)m_value;
-        break;
-
-    case STRING:
-        delete (std::string*)m_value;
-        break;
-        
-    case RECT2D:
-        delete (Rect2D*)m_value;
-        break;
-
-    case AABOX:
-        delete (AABox*)m_value;
-        break;
-
-    case VECTOR2:
-        delete (Vector2*)m_value;
-        break;
-
-    case VECTOR3:
-        delete (Vector3*)m_value;
-        break;
-
-    case VECTOR4:
-        delete (Vector4*)m_value;
-        break;
-
-    case MATRIX2:
-        delete (Matrix2*)m_value;
-        break;
-
-    case MATRIX3:
-        delete (Matrix3*)m_value;
-        break;
-
-    case MATRIX4:
-        delete (Matrix4*)m_value;
-        break;
-
-    case QUAT:
-        delete (Quat*)m_value;
-        break;
-
-    case COORDINATEFRAME:
-        delete (CoordinateFrame*)m_value;
-        break;
-
-    case COLOR1:
-        delete (Color1*)m_value;
-        break;
-
-    case COLOR3:
-        delete (Color3*)m_value;
-        break;
-
-    case COLOR4:
-        delete (Color4*)m_value;
-        break;
-
-    case ARRAY:
-        delete (Array*)m_value;
-        break;
-
-    case TABLE:
-        delete (Table*)m_value;
-        break;
-
-    default:
-        debugAssertM(false, "Internal error: no destructor for this type.");
-    } 
-   
-    m_value = NULL;
-}
-
-
-AnyVal& AnyVal::operator=(const AnyVal& v) {
-    deleteValue();
-
-    m_type = v.m_type;
-
-    m_referenceCount = v.m_referenceCount;
-    
-    if (isSharedType()) {
-        ++(*m_referenceCount);
-        m_value = v.m_value;
-    } else {
-        m_value = v.copyValue();
-    }
-
-    return *this;
-}
-
-
-void* AnyVal::copyValue() const {
-  switch (m_type) {
-    case NIL:
-        return NULL;
-
-    case NUMBER:
-        return new double(*(double*)m_value);
-
-    case BOOLEAN:
-        return new bool(*(bool*)m_value);
-
-    case STRING:
-        return new std::string(*(std::string*)m_value);
-        
-    case RECT2D:
-        return new Rect2D(*(Rect2D*)m_value);
-
-    case AABOX:
-        return new AABox(*(AABox*)m_value);
-
-    case VECTOR2:
-        return new Vector2(*(Vector2*)m_value);
-
-    case VECTOR3:
-        return new Vector3(*(Vector3*)m_value);
-
-    case VECTOR4:
-        return new Vector4(*(Vector4*)m_value);
-
-    case MATRIX2:
-        return new Matrix2(*(Matrix2*)m_value);
-
-    case MATRIX3:
-        return new Matrix3(*(Matrix3*)m_value);
-
-    case MATRIX4:
-        return new Matrix4(*(Matrix4*)m_value);
-
-    case QUAT:
-        return new Quat(*(Quat*)m_value);
-
-    case COORDINATEFRAME:
-        return new CoordinateFrame(*(CoordinateFrame*)m_value);
-
-    case COLOR1:
-        return new Color1(*(Color1*)m_value);
-
-    case COLOR3:
-        return new Color3(*(Color3*)m_value);
-
-    case COLOR4:
-        return new Color4(*(Color4*)m_value);
-
-    case ARRAY:
-        return new Array(*(Array*)m_value);
-
-    case TABLE:
-        return new Table(*(Table*)m_value);
-
-    default:
-        debugAssertM(false, "Internal error: no assignment operator for this type.");
-        return NULL;
-    }
-}
-
-AnyVal::Type AnyVal::type() const {
-    return m_type;
-}
-
-
-static bool legalIdentifier(const std::string& s) {
-    if (s.size() == 0) {
-        return false;
-    }
-
-    if (! isLetter(s[0]) || (s[0] == '_')) {
-        return false;
-    }
-
-    bool ok = true;    
-
-    for (unsigned int i = 1; i < s.size(); ++i) {
-        ok &= isDigit(s[i]) || isLetter(s[i]) || (s[i] == '_');
-    }
-   
-    return ok;
-}
-
-
-void AnyVal::serialize(G3D::TextOutput& t) const {
-    switch (m_type) {
-    case NIL:
-        t.writeSymbol("Nil");
-        break;
-
-    case NUMBER:
-        t.printf("%g", *(double*)m_value);
-        break;
-
-    case BOOLEAN:
-        t.writeBoolean(*(bool*)m_value);
-        break;
-
-    case STRING:
-        t.writeString(*(std::string*)m_value);
-        break;
-        
-    case RECT2D:
-        t.printf("R(%g, %g, %g, %g)", ((Rect2D*)m_value)->x0(), ((Rect2D*)m_value)->y0(),
-                 ((Rect2D*)m_value)->width(), ((Rect2D*)m_value)->height());
-        break;
-
-    case AABOX:
-        t.printf("AAB(V3(%g, %g, %g), V3(%g, %g, %g))", 
-                 aabox().low().x,
-                 aabox().low().y,
-                 aabox().low().z,
-                 aabox().high().x,
-                 aabox().high().y,
-                 aabox().high().z);
-        break;
-
-    case VECTOR2:
-        t.printf("V2(%g, %g)", ((Vector2*)m_value)->x, ((Vector2*)m_value)->y);
-        break;
-
-    case VECTOR3:
-        t.printf("V3(%g, %g, %g)", ((Vector3*)m_value)->x, ((Vector3*)m_value)->y, ((Vector3*)m_value)->z);
-        break;
-
-    case VECTOR4:
-        t.printf("V4(%g, %g, %g, %g)", ((Vector4*)m_value)->x, ((Vector4*)m_value)->y, ((Vector4*)m_value)->z, ((Vector4*)m_value)->w);
-        break;
-
-    case MATRIX2:
-        {
-            const Matrix2& m = *(Matrix2*)m_value;
-            t.printf("M2(\n");
-            t.pushIndent();
-            t.printf("%10.5f, %10.5f,\n%10.5f, %10.5f)",
-                     m[0][0], m[0][1],
-                     m[1][0], m[1][1]);
-            t.popIndent();
-        }
-        break;
-
-    case MATRIX3:
-        {
-            const Matrix3& m = *(Matrix3*)m_value;
-            t.printf("M3(\n");
-            t.pushIndent();
-            t.printf("%10.5f, %10.5f, %10.5f,\n%10.5f, %10.5f, %10.5f,\n%10.5f, %10.5f, %10.5f)",
-                m[0][0], m[0][1], m[0][2],
-                m[1][0], m[1][1], m[1][2],
-                m[2][0], m[2][1], m[2][2]);
-            t.popIndent();
-        }
-        break;
-
-    case MATRIX4:
-        {
-            const Matrix4& m = *(Matrix4*)m_value;
-            t.printf("M4(\n");
-            t.pushIndent();
-            t.printf(
-                "%10.5f, %10.5f, %10.5f, %10.5f,\n"
-                "%10.5f, %10.5f, %10.5f, %10.5f,\n"
-                "%10.5f, %10.5f, %10.5f, %10.5f,\n"
-                "%10.5f, %10.5f, %10.5f, %10.5f)",
-                m[0][0], m[0][1], m[0][2], m[0][3],
-                m[1][0], m[1][1], m[1][2], m[1][3],
-                m[2][0], m[2][1], m[2][2], m[2][3],
-                m[3][0], m[3][1], m[3][2], m[3][3]);
-            t.popIndent();
-        }
-        break;
-
-    case QUAT:
-        t.printf("Q(%g, %g, %g, %g)", ((Quat*)m_value)->x, ((Quat*)m_value)->y, ((Quat*)m_value)->z, ((Quat*)m_value)->w);
-        break;
-
-    case COORDINATEFRAME:
-        {
-            const CoordinateFrame& c = *(CoordinateFrame*)m_value;
-            float x,y,z,yaw,pitch,roll;
-            c.getXYZYPRDegrees(x,y,z,yaw,pitch,roll);
-            t.printf("CF(V3(%g,%g,%g), %g, %g, %g)", x, y, z, yaw, pitch, roll);
-            /*
-            t.pushIndent();
-            t.printf(
-                "CF(\n%10.5f, %10.5f, %10.5f,   %10.5f,\n"
-                "%10.5f, %10.5f, %10.5f,   %10.5f,\n"
-                "%10.5f, %10.5f, %10.5f,   %10.5f)",
-                c.rotation[0][0], c.rotation[0][1], c.rotation[0][2], c.translation.x,
-                c.rotation[1][0], c.rotation[1][1], c.rotation[1][2], c.translation.y,
-                c.rotation[2][0], c.rotation[2][1], c.rotation[2][2], c.translation.z);
-            t.popIndent();
-            */
-        }
-        break;
-
-    case COLOR1:
-        t.printf("C1(%g)", ((Color1*)m_value)->value);
-        break;
-
-    case COLOR3:
-        t.printf("C3(%g, %g, %g)", ((Color3*)m_value)->r, ((Color3*)m_value)->g, ((Color3*)m_value)->b);
-        break;
-
-    case COLOR4:
-        t.printf("C4(%g, %g, %g, %g)", ((Color4*)m_value)->r, ((Color4*)m_value)->g, ((Color4*)m_value)->b, ((Color4*)m_value)->a);
-        break;
-
-    case ARRAY:
-        {
-            const Array& a = *(Array*)m_value;
-            t.printf("[\n");
-            t.pushIndent();
-                for (int i = 0; i < a.size(); ++i) {
-                    a[i].serialize(t);
-                    if (i != a.size() - 1) {
-                        t.printf(", \n");
-                    }
-                }
-            t.printf("]");
-            t.popIndent();
-        }
-        break;
-
-    case TABLE:
-        {
-            const Table& a = *(Table*)m_value;
-            t.printf("{\n");
-            t.pushIndent();
-                Table::Iterator i = a.begin();
-                const Table::Iterator end = a.end();
-                while (i != end) {
-                    // Quote names that are not legal C++ identifiers
-                    if (! legalIdentifier(i->key)) {
-                        t.printf("'%s' ", i->key.c_str());
-                    } else {
-                        t.writeSymbol(i->key);
-                    }
-                    t.printf("= ");
-                    
-                    i->value.serialize(t);
-
-                    if (i != end) {
-                        t.printf("\n");
-                    }
-                    ++i;
-                }
-            t.popIndent();
-            t.printf("}");
-        }
-        break;
-
-    default:
-        debugAssertM(false, "Internal error: no serialize method for this type.");
-    }
-}
-
-
-std::string AnyVal::toString() const {
-    TextOutput t;
-    serialize(t);
-    std::string s;
-    t.commitString(s);
-    return s;
-}
-
-/*
-void AnyVal::serialize(G3D::BinaryOutput& t) const {
-    alwaysAssertM(false, "TODO");
-}
-*/
-
-void AnyVal::deserialize(G3D::TextInput& t) {
-    deleteValue();
-    m_type = NIL;
-    m_value = NULL;
-
-    if (! t.hasMore()) {
-        return;
-    }
-
-    switch (t.peek().type()) {
-    case Token::END:
-        // should never get here because of the hasMore check above
-        return;
-        break;
-
-    case Token::NUMBER:
-        m_type = NUMBER;
-        m_value = new double(t.readNumber());
-        break;
-
-    case Token::STRING:
-        m_type = STRING;
-        m_value = new std::string(t.readString());
-        break;
-
-    case Token::BOOLEAN:
-        m_type = BOOLEAN;
-        m_value = new bool(t.readBoolean());
-        break;
-
-    case Token::SYMBOL:
-        {
-            std::string s = t.readSymbol();
-            if (s == "NIL") {
-                break;
-
-            } else if (s == "true") {
-                
-                m_type = BOOLEAN;
-                m_value = new bool(true);
-
-            } else if (s == "false") {
-                
-                m_type = BOOLEAN;
-                m_value = new bool(false);
-
-            } else if (s == "R") {
-                
-                m_type = RECT2D;
-                t.readSymbol("(");
-                float x,y,w,h;
-                x = (float)t.readNumber();
-                t.readSymbol(",");
-                y = (float)t.readNumber();
-                t.readSymbol(",");
-                w = (float)t.readNumber();
-                t.readSymbol(",");
-                h = (float)t.readNumber();
-                t.readSymbol(")");
-                m_value = new Rect2D(Rect2D::xywh(x, y, w, h));
-
-            } else if (s == "AAB") {
-
-                m_type = AABOX;
-                Vector3 v[2];
-                t.readSymbol("(");
-                for (int i = 0; i < 2; ++i) {
-                    t.readSymbols("V3", "(");
-                    v[i].x = (float)t.readNumber();
-                    t.readSymbol(",");
-                    v[i].y = (float)t.readNumber();
-                    t.readSymbol(",");
-                    v[i].z = (float)t.readNumber();
-                    t.readSymbol(",");
-                    if (i == 0) {
-                        t.readSymbol(",");
-                    }
-                }
-                t.readSymbol(")");
-                m_value = new AABox(v[0], v[1]);
-
-            } else if (s == "V2") {
-
-                t.readSymbol("(");
-                Vector2 v; 
-                v.x = (float)t.readNumber();
-                t.readSymbol(",");
-                v.y = (float)t.readNumber();
-                t.readSymbol(")");
-                m_value = new Vector2(v);
-                m_type = VECTOR2;
-
-            } else if (s == "V3") {
-
-                t.readSymbol("(");
-                Vector3 v; 
-                v.x = (float)t.readNumber();
-                t.readSymbol(",");
-                v.y = (float)t.readNumber();
-                t.readSymbol(",");
-                v.z = (float)t.readNumber();
-                t.readSymbol(")");
-                m_value = new Vector3(v);
-                m_type = VECTOR3;
-
-            } else if (s == "V4") {
-
-                t.readSymbol("(");
-                Vector4 v; 
-                v.x = (float)t.readNumber();
-                t.readSymbol(",");
-                v.y = (float)t.readNumber();
-                t.readSymbol(",");
-                v.z = (float)t.readNumber();
-                t.readSymbol(",");
-                v.w = (float)t.readNumber();
-                t.readSymbol(")");
-                m_value = new Vector4(v);
-                m_type = VECTOR4;
-
-            } else if (s == "M2") {
-
-                t.readSymbol("(");
-                Matrix2 m;
-                for (int r = 0; r < 2; ++r) {
-                    for (int c = 0; c < 2; ++c) {
-                        m[r][c] = (float)t.readNumber();
-                        if ((c != 1) || (r != 1)) {
-                            t.readSymbol(",");
-                        }
-                    }
-                }
-                t.readSymbol(")");
-                m_value = new Matrix2(m);
-                m_type = MATRIX2;
-
-            } else if (s == "M3") {
-
-                t.readSymbol("(");
-                Matrix3 m;
-                for (int r = 0; r < 3; ++r) {
-                    for (int c = 0; c < 3; ++c) {
-                        m[r][c] = (float)t.readNumber();
-                        if ((c != 2) || (r != 2)) {
-                            t.readSymbol(",");
-                        }
-                    }
-                }
-                t.readSymbol(")");
-                m_value = new Matrix3(m);
-                m_type = MATRIX3;
-
-            } else if (s == "M4") {
-
-                t.readSymbol("(");
-                Matrix4 m;
-                for (int r = 0; r < 4; ++r) {
-                    for (int c = 0; c < 4; ++c) {
-                        m[r][c] = (float)t.readNumber();
-                        if ((c != 3) || (r != 3)) {
-                            t.readSymbol(",");
-                        }
-                    }
-                }
-                t.readSymbol(")");
-                m_value = new Matrix4(m);
-                m_type = MATRIX4;
-
-            } else if (s == "Q") {
-
-                t.readSymbol("(");
-                Quat q;
-                q.x = (float)t.readNumber();
-                t.readSymbol(",");
-                q.y = (float)t.readNumber();
-                t.readSymbol(",");
-                q.z = (float)t.readNumber();
-                t.readSymbol(",");
-                q.w = (float)t.readNumber();
-                t.readSymbol(")");
-                m_value = new Quat(q);
-                m_type = QUAT;
-
-            } else if (s == "CF") {
-
-                t.readSymbol("(");
-                CoordinateFrame m;
-                if (t.peek().type() == Token::SYMBOL) {
-                    // Angle format
-                    float x, y, z, yaw, roll, pitch;
-                    t.readSymbols("V3", "(");
-                    x = (float)t.readNumber();
-                    t.readSymbol(",");
-                    y = (float)t.readNumber();
-                    t.readSymbol(",");
-                    z = (float)t.readNumber();
-                    t.readSymbols(")", ",");
-                    yaw = (float)t.readNumber();
-                    t.readSymbol(",");
-                    pitch = (float)t.readNumber();
-                    roll = 0;
-                    if (t.peek().string() == ",") {
-                        t.readSymbol(",");
-                        roll = (float)t.readNumber();
-                    }                        
-                    m = CoordinateFrame::fromXYZYPRDegrees(x, y, z, yaw, pitch, roll);
-                } else {
-                    // Matrix format
-                    for (int r = 0; r < 3; ++r) {
-                        for (int c = 0; c < 3; ++c) {
-                            m.rotation[r][c] = (float)t.readNumber();
-                        }
-                        m.translation[r] = (float)t.readNumber();
-                        if (r != 2) {
-                            t.readSymbol(",");
-                        }
-                    }
-                }
-                t.readSymbol(")");
-                m_value = new CoordinateFrame(m);
-                m_type = COORDINATEFRAME;
-
-            } else if (s == "C1") {
-
-                t.readSymbol("(");
-                float v = (float)t.readNumber();
-                t.readSymbol(")");
-                m_value = new Color1(v);
-                m_type = COLOR1;
-
-            } else if (s == "C3") {
-
-                t.readSymbol("(");
-                Color3 c;
-                c.r = (float)t.readNumber();
-                t.readSymbol(",");
-                c.g = (float)t.readNumber();
-                t.readSymbol(",");
-                c.b = (float)t.readNumber();
-                t.readSymbol(")");
-                m_value = new Color3(c);
-                m_type = COLOR3;
-
-            } else if (s == "C4") {
-
-                t.readSymbol("(");
-                Color4 c;
-                c.r = (float)t.readNumber();
-                t.readSymbol(",");
-                c.g = (float)t.readNumber();
-                t.readSymbol(",");
-                c.b = (float)t.readNumber();
-                t.readSymbol(",");
-                c.a = (float)t.readNumber();
-                t.readSymbol(")");
-                m_value = new Color4(c);
-                m_type = COLOR4;
-
-            } else if (s == "[") {
-
-                // Array
-                m_type = ARRAY;
-                m_value = new Array();
-                m_referenceCount = new int(1);
-                Array& a = *(Array*)m_value;
-
-                Token peek = t.peek();
-                while ((peek.type() != Token::SYMBOL) || (peek.string() != "]")) {
-                    // Avoid copying large objects
-                    a.next().deserialize(t);
-
-                    peek = t.peek();
-                    if (peek.type() != Token::SYMBOL) {
-                        throw CorruptText("Expected ',' or ']'", peek);
-                    } else if (peek.string() == ",") {
-                        t.readSymbol(",");
-                    } else if (peek.string() != "]") {
-                        throw CorruptText("Missing ']'", peek);
-                    }
-                }
-                t.readSymbol("]");
-
-            } else if (s == "{") {
-
-                // Table
-                m_type = TABLE;
-                m_value = new Table();
-                m_referenceCount = new int(1);
-                Table& a = *(Table*)m_value;
-
-                Token peek = t.peek();
-                while ((peek.type() != Token::SYMBOL) || (peek.string() != "}")) {
-
-                    std::string key;
-                    // Get the name
-                    if (peek.type() == Token::SYMBOL) {
-                        key = t.readSymbol();
-                    } else if (peek.extendedType() == Token::SINGLE_QUOTED_TYPE) {
-                        key = t.readString();
-                    } else {
-                        throw CorruptText("Expected name inside table", peek);
-                    }
-
-                    t.readSymbol("=");
-
-                    // Avoid copying large values
-                    a.set(key, AnyVal());
-                    a[key].deserialize(t);
-
-                    peek = t.peek();
-                    if ((peek.type() != Token::SYMBOL) && (peek.extendedType() == Token::SINGLE_QUOTED_TYPE)) {
-                        throw CorruptText("Missing expected name or '}'", peek);
-                    }
-                }
-                t.readSymbol("}");
-
-            } else {
-                throw CorruptText("Invalid value type.", t.peek());
-            } // dispatch on symbol type
-        } // scope
-        break;
-    }
-}
-
-/*
-void AnyVal::deserialize(G3D::BinaryInput& t) {
-    alwaysAssertM(false, "TODO");
-}
-*/
-
-
-AnyVal& AnyVal::operator[](const char* key) {
-    return this->operator[]((std::string)key);
-}
-
-
-const AnyVal& AnyVal::operator[](const char* key) const {
-    return this->operator[]((std::string)key);
-}
-
-
-AnyVal& AnyVal::operator[](const std::string& key) {
-    if (m_type != TABLE) {
-        throw WrongType(TABLE, m_type);
-    }
-
-    makeMutable();
-
-    Table& t = *(Table*)m_value;
-
-    if (! t.containsKey(key)) {
-        t.set(key, AnyVal());
-    }
-
-    return t[key];
-}
-
-
-const AnyVal& AnyVal::operator[](const std::string& key) const {
-    if (m_type != TABLE) {
-        throw WrongType(TABLE, m_type);
-    }
-
-    const Table& t = *(const Table*)m_value;
-
-    if (! t.containsKey(key)) {
-        throw KeyNotFound(key);
-    }
-
-    return t[key];
-}
-
-
-void AnyVal::append(const AnyVal& v) {
-    if (m_type != ARRAY) {
-        throw WrongType(ARRAY, m_type);
-    }
-    makeMutable();
-
-    Array& a = *(Array*)m_value;
-    a.append(v);
-}
-
-
-void AnyVal::getKeys(Array& keys) const {
-    if (m_type != TABLE) {
-        throw WrongType(TABLE, m_type);
-    }
-
-    const Table& t = *(const Table*)m_value;
-    t.getKeys(keys);
-}
-
-
-int AnyVal::size() const {
-    switch (m_type) {
-    case TABLE:
-        {
-            const Table& t = *(const Table*)m_value;
-            return t.size();
-        }
-
-    case ARRAY:
-        {
-            const Array& a = *(Array*)m_value;
-            return a.size();
-        }
-
-    default:
-        throw WrongType(ARRAY, m_type);
-    }
-}
-
-
-AnyVal& AnyVal::operator[](int i) {
-    if (m_type != ARRAY) {
-        throw WrongType(ARRAY, m_type);
-    }
-    makeMutable();
-
-    Array& a = *(Array*)m_value;
-
-    if (i < 0) {
-        throw IndexOutOfBounds(i, a.size());
-    }
-
-    if (a.size() <= i) {
-        a.resize(i + 1);
-    }
-
-    return a[i];
-}
-
-
-const AnyVal& AnyVal::operator[](int i) const {
-    if (m_type != ARRAY) {
-        throw WrongType(ARRAY, m_type);
-    }
-
-    const Array& a = *(Array*)m_value;
-
-    if (a.size() <= i || i < 0) {
-        throw IndexOutOfBounds(i, a.size());
-    }
-
-    return a[i];
-}
-
-
-void AnyVal::makeMutable() {
-    if (*m_referenceCount > 1) {
-        // This is a shared instance
-        --(*m_referenceCount);
-        m_referenceCount = new int(1);
-        m_value = copyValue();
-    }
-}
-
-bool AnyVal::boolean() const {
-    if (m_type != BOOLEAN) {
-        throw WrongType(BOOLEAN, m_type);
-    }
-
-    return *(bool*)m_value;
-}
-
-
-bool AnyVal::boolean(bool defaultVal) const {
-    if (m_type != BOOLEAN) {
-        return defaultVal;
-    }
-
-    return *(bool*)m_value;
-}
-
-
-const std::string& AnyVal::string() const {
-    if (m_type != STRING) {
-        throw WrongType(STRING, m_type);
-    }
-
-    return *(std::string*)m_value;
-}
-
-
-const std::string& AnyVal::string(const std::string& defaultVal) const {
-    if (m_type != STRING) {
-        return defaultVal;
-    } else {
-        return *(std::string*)m_value;
-    }
-}
-
-
-double AnyVal::number() const {
-    if (m_type != NUMBER) {
-        throw WrongType(NUMBER, m_type);
-    }
-
-    return *(double*)m_value;
-}
-
-
-double AnyVal::number(double defaultVal) const {
-    if (m_type != NUMBER) {
-        return defaultVal;
-    } else {
-        return *(double*)m_value;
-    }
-}
-
-
-const Rect2D& AnyVal::rect2D() const {
-    if (m_type != RECT2D) {
-        throw WrongType(RECT2D, m_type);
-    }
-
-    return *(Rect2D*)m_value;
-}
-
-
-const Rect2D& AnyVal::rect2D(const Rect2D& defaultVal) const {
-    if (m_type != RECT2D) {
-        return defaultVal;
-    } else {
-        return *(Rect2D*)m_value;
-    }
-}
-
-
-const AABox& AnyVal::aabox() const {
-    if (m_type != AABOX) {
-        throw WrongType(AABOX, m_type);
-    }
-
-    return *(AABox*)m_value;
-}
-
-
-const AABox& AnyVal::aabox(const AABox& defaultVal) const {
-    if (m_type != AABOX) {
-        return defaultVal;
-    } else {
-        return *(AABox*)m_value;
-    }
-}
-
-
-const Color1& AnyVal::color1() const {
-    if (m_type != COLOR1) {
-        throw WrongType(COLOR1, m_type);
-    }
-
-    return *(Color1*)m_value;
-}
-
-
-const Color1& AnyVal::color1(const Color1& defaultVal) const {
-    if (m_type != COLOR1) {
-        return defaultVal;
-    } else {
-        return *(Color1*)m_value;
-    }
-}
-
-
-const Color3& AnyVal::color3() const {
-    if (m_type != COLOR3) {
-        throw WrongType(COLOR3, m_type);
-    }
-
-    return *(Color3*)m_value;
-}
-
-
-const Color3& AnyVal::color3(const Color3& defaultVal) const {
-    if (m_type != COLOR3) {
-        return defaultVal;
-    } else {
-        return *(Color3*)m_value;
-    }
-}
-
-
-const Color4& AnyVal::color4() const {
-    if (m_type != COLOR4) {
-        throw WrongType(COLOR4, m_type);
-    }
-
-    return *(Color4*)m_value;
-}
-
-
-const Color4& AnyVal::color4(const Color4& defaultVal) const {
-    if (m_type != COLOR4) {
-        return defaultVal;
-    } else {
-        return *(Color4*)m_value;
-    }
-}
-
-
-const Vector2& AnyVal::vector2() const {
-    if (m_type != VECTOR2) {
-        throw WrongType(VECTOR2, m_type);
-    }
-
-    return *(Vector2*)m_value;
-}
-
-
-const Vector2& AnyVal::vector2(const Vector2& defaultVal) const {
-    if (m_type != VECTOR2) {
-        return defaultVal;
-    } else {
-        return *(Vector2*)m_value;
-    }
-}
-
-
-const Vector3& AnyVal::vector3() const {
-    if (m_type != VECTOR3) {
-        throw WrongType(VECTOR3, m_type);
-    }
-
-    return *(Vector3*)m_value;
-}
-
-
-const Vector3& AnyVal::vector3(const Vector3& defaultVal) const {
-    if (m_type != VECTOR3) {
-        return defaultVal;
-    } else {
-        return *(Vector3*)m_value;
-    }
-}
-
-
-const Vector4& AnyVal::vector4() const {
-    if (m_type != VECTOR4) {
-        throw WrongType(VECTOR4, m_type);
-    }
-
-    return *(Vector4*)m_value;
-}
-
-
-const Vector4& AnyVal::vector4(const Vector4& defaultVal) const {
-    if (m_type != VECTOR4) {
-        return defaultVal;
-    } else {
-        return *(Vector4*)m_value;
-    }
-}
-
-
-const CoordinateFrame& AnyVal::coordinateFrame() const {
-    if (m_type != COORDINATEFRAME) {
-        throw WrongType(COORDINATEFRAME, m_type);
-    }
-
-    return *(CoordinateFrame*)m_value;
-}
-
-
-const CoordinateFrame& AnyVal::coordinateFrame(const CoordinateFrame& defaultVal) const {
-    if (m_type != COORDINATEFRAME) {
-        return defaultVal;
-    } else {
-        return *(CoordinateFrame*)m_value;
-    }
-}
-
-const Matrix2& AnyVal::matrix2(const Matrix2& defaultVal) const {
-    if (m_type != MATRIX2) {
-        return defaultVal;
-    } else {
-        return *(Matrix2*)m_value;
-    }
-}
-
-
-const Matrix2& AnyVal::matrix2() const {
-    if (m_type != MATRIX2) {
-        throw WrongType(MATRIX2, m_type);
-    }
-
-    return *(Matrix2*)m_value;
-}
-
-
-const Matrix3& AnyVal::matrix3(const Matrix3& defaultVal) const {
-    if (m_type != MATRIX3) {
-        return defaultVal;
-    } else {
-        return *(Matrix3*)m_value;
-    }
-}
-
-
-const Matrix3& AnyVal::matrix3() const {
-    if (m_type != MATRIX3) {
-        throw WrongType(MATRIX3, m_type);
-    }
-
-    return *(Matrix3*)m_value;
-}
-
-
-const Matrix4& AnyVal::matrix4(const Matrix4& defaultVal) const {
-    if (m_type != MATRIX4) {
-        return defaultVal;
-    } else {
-        return *(Matrix4*)m_value;
-    }
-}
-
-
-const Matrix4& AnyVal::matrix4() const {
-    if (m_type != MATRIX4) {
-        throw WrongType(MATRIX4, m_type);
-    }
-
-    return *(Matrix4*)m_value;
-}
-
-
-const Quat& AnyVal::quat(const Quat& defaultVal) const {
-    if (m_type != QUAT) {
-        return defaultVal;
-    } else {
-        return *(Quat*)m_value;
-    }
-}
-
-
-const Quat& AnyVal::quat() const {
-    if (m_type != QUAT) {
-        throw WrongType(QUAT, m_type);
-    }
-
-    return *(Quat*)m_value;
-}
-
-
-const AnyVal& AnyVal::get(const std::string& key, const AnyVal& defaultVal) const {
-    if (m_type != TABLE) {
-        return defaultVal;
-    }
-
-    const Table& t = *(const Table*)m_value;
-
-    if (t.containsKey(key)) {
-        return t[key];
-    } else {
-        return defaultVal;
-    }
-}
-
-
-const AnyVal& AnyVal::get(const std::string& key) const {
-    if (m_type != TABLE) {
-        throw WrongType(TABLE, m_type);
-    }
-
-    const Table& t = *(const Table*)m_value;
-
-    if (t.containsKey(key)) {
-        return t[key];
-    } else {
-        throw KeyNotFound(key);
-    }
-}
-
-
-const AnyVal& AnyVal::get(int i, const AnyVal& defaultVal) const {
-    if (m_type != ARRAY) {
-        return defaultVal;
-    }
-
-    const Array& a = *(const Array*)m_value;
-
-    if ((i >= 0) && (i < a.size())) {
-        return a[i];
-    } else {
-        return defaultVal;
-    }
-}
-
-
-const AnyVal& AnyVal::get(int i) const {
-    if (m_type != ARRAY) {
-        throw WrongType(ARRAY, m_type);
-    }
-
-    const Array& a = *(const Array*)m_value;
-
-    if ((i >= 0) && (i < a.size())) {
-        return a[i];
-    } else {
-        throw IndexOutOfBounds(i, a.size());
-    }
-}
-
-}
diff --git a/externals/g3dlite/G3D.lib/source/BinaryFormat.cpp b/externals/g3dlite/G3D.lib/source/BinaryFormat.cpp
deleted file mode 100644
index a30ec0644ea..00000000000
--- a/externals/g3dlite/G3D.lib/source/BinaryFormat.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- @file BinaryFormat.cpp
-  @maintainer Morgan McGuire, matrix@graphics3d.com
-
-  @created 2005-06-10
-  @edited  2005-06-10
- */
-
-#include "G3D/BinaryFormat.h"
-
-namespace G3D {
-
-int32 byteSize(BinaryFormat f) {
-    switch (f) {
-    case BOOL8_BINFMT:
-    case UINT8_BINFMT:
-    case INT8_BINFMT:
-        return 1;
-
-    case UINT16_BINFMT:
-    case INT16_BINFMT:
-        return 2;
-
-    case FLOAT16_BINFMT:
-        return 2;
-
-    case UINT32_BINFMT:
-    case INT32_BINFMT:
-    case FLOAT32_BINFMT:
-        return 4;
-
-    case FLOAT64_BINFMT:
-    case UINT64_BINFMT:
-    case INT64_BINFMT:
-        return 8;
-
-    case INT128_BINFMT:
-    case UINT128_BINFMT:
-        return 16;
-
-    case VECTOR2_BINFMT:
-        return 2 * 4;
-
-    case VECTOR2INT16_BINFMT:
-        return 2 * 2;
-
-    case VECTOR3_BINFMT:
-        return 3 * 4;
-
-    case VECTOR3INT16_BINFMT:
-        return 3 * 2;
-
-    case VECTOR4_BINFMT:
-        return 4 * 4;
-
-    case VECTOR4INT16_BINFMT:
-        return 4 * 4;
-
-    case COLOR3_BINFMT:
-        return 3 * 4;
-
-    case COLOR3UINT8_BINFMT:
-        return 3 * 1;
-
-    case COLOR3INT16_BINFMT:
-        return 3 * 2;
-
-    case COLOR4_BINFMT:
-        return 4 * 4;
-
-    case COLOR4UINT8_BINFMT:
-        return 4 * 1;
-
-    case COLOR4INT16_BINFMT:
-        return 4 * 2;
-
-    default:
-        return -1;
-    }
-}
-}
diff --git a/externals/g3dlite/G3D.lib/source/BinaryInput.cpp b/externals/g3dlite/G3D.lib/source/BinaryInput.cpp
deleted file mode 100644
index 65a9976fe04..00000000000
--- a/externals/g3dlite/G3D.lib/source/BinaryInput.cpp
+++ /dev/null
@@ -1,568 +0,0 @@
-/**
- @file BinaryInput.cpp
- 
- @author Morgan McGuire, graphics3d.com
- Copyright 2001-2007, Morgan McGuire.  All rights reserved.
- 
- @created 2001-08-09
- @edited  2005-02-24
-
-
-  
-    {    
-    BinaryOutput b("c:/tmp/test.b", BinaryOutput::LITTLE_ENDIAN);
-
-    float f = 3.1415926;
-    int i = 1027221;
-    std::string s = "Hello World!";
-
-    b.writeFloat32(f);
-    b.writeInt32(i);
-    b.writeString(s);
-    b.commit();
-    
-
-    BinaryInput in("c:/tmp/test.b", BinaryInput::LITTLE_ENDIAN);
-
-    debugAssert(f == in.readFloat32());
-    int ii = in.readInt32();
-    debugAssert(i == ii);
-    debugAssert(s == in.readString());
-    }
-  

- */
-
-#include "G3D/platform.h"
-#include "G3D/BinaryInput.h"
-#include "G3D/Array.h"
-#include "G3D/fileutils.h"
-#include "G3D/Log.h"
-#include 
-
-#include 
-
-namespace G3D {
-
-void BinaryInput::readBool8(std::vector& out, int64 n) {
-    out.resize((int)n);
-    // std::vector optimizes bool in a way that prevents fast reading
-    for (int64 i = 0; i < n ; ++i) {
-        out[i] = readBool8();
-    }
-}
-
-
-void BinaryInput::readBool8(Array& out, int64 n) {
-    out.resize(n);
-    readBool8(out.begin(), n);
-}
-
-
-#define IMPLEMENT_READER(ucase, lcase)\
-void BinaryInput::read##ucase(std::vector& out, int64 n) {\
-    out.resize(n);\
-    read##ucase(&out[0], n);\
-}\
-\
-\
-void BinaryInput::read##ucase(Array& out, int64 n) {\
-    out.resize(n);\
-    read##ucase(out.begin(), n);\
-}
-
-
-IMPLEMENT_READER(UInt8,   uint8)
-IMPLEMENT_READER(Int8,    int8)
-IMPLEMENT_READER(UInt16,  uint16)
-IMPLEMENT_READER(Int16,   int16)
-IMPLEMENT_READER(UInt32,  uint32)
-IMPLEMENT_READER(Int32,   int32)
-IMPLEMENT_READER(UInt64,  uint64)
-IMPLEMENT_READER(Int64,   int64)
-IMPLEMENT_READER(Float32, float32)
-IMPLEMENT_READER(Float64, float64)    
-
-#undef IMPLEMENT_READER
-
-// Data structures that are one byte per element can be 
-// directly copied, regardles of endian-ness.
-#define IMPLEMENT_READER(ucase, lcase)\
-void BinaryInput::read##ucase(lcase* out, int64 n) {\
-    if (sizeof(lcase) == 1) {\
-        readBytes(out, n);\
-    } else {\
-        for (int64 i = 0; i < n ; ++i) {\
-            out[i] = read##ucase();\
-        }\
-    }\
-}
-
-IMPLEMENT_READER(Bool8,   bool)
-IMPLEMENT_READER(UInt8,   uint8)
-IMPLEMENT_READER(Int8,    int8)
-
-#undef IMPLEMENT_READER
-
-
-#define IMPLEMENT_READER(ucase, lcase)\
-void BinaryInput::read##ucase(lcase* out, int64 n) {\
-    if (m_swapBytes) {\
-        for (int64 i = 0; i < n; ++i) {\
-            out[i] = read##ucase();\
-        }\
-    } else {\
-        readBytes(out, sizeof(lcase) * n);\
-    }\
-}
-
-
-IMPLEMENT_READER(UInt16,  uint16)
-IMPLEMENT_READER(Int16,   int16)
-IMPLEMENT_READER(UInt32,  uint32)
-IMPLEMENT_READER(Int32,   int32)
-IMPLEMENT_READER(UInt64,  uint64)
-IMPLEMENT_READER(Int64,   int64)
-IMPLEMENT_READER(Float32, float32)
-IMPLEMENT_READER(Float64, float64)    
-
-#undef IMPLEMENT_READER
-
-void BinaryInput::loadIntoMemory(int64 startPosition, int64 minLength) {
-    // Load the next section of the file
-    debugAssertM(m_filename != "", "Read past end of file.");
-
-    int64 absPos = m_alreadyRead + m_pos;
-
-    if (m_bufferLength < minLength) {
-        // The current buffer isn't big enough to hold the chunk we want to read.
-        // This happens if there was little memory available during the initial constructor
-        // read but more memory has since been freed.
-        m_bufferLength = minLength;
-        debugAssert(m_freeBuffer);
-        m_buffer = (uint8*)System::realloc(m_buffer, m_bufferLength);
-        if (m_buffer == NULL) {
-            throw "Tried to read a larger memory chunk than could fit in memory. (2)";
-        }
-    }
-
-    m_alreadyRead = startPosition;
-
-#   ifdef G3D_WIN32
-        FILE* file = fopen(m_filename.c_str(), "rb");
-        debugAssert(file);
-        int ret = fseek(file, (off_t)m_alreadyRead, SEEK_SET);
-        debugAssert(ret == 0);
-        size_t toRead = (size_t)G3D::min(m_bufferLength, m_length - m_alreadyRead);
-        ret = fread(m_buffer, 1, toRead, file);
-        debugAssert(ret == toRead);
-        fclose(file);
-        file = NULL;
-    
-#   else
-        FILE* file = fopen(m_filename.c_str(), "rb");
-        debugAssert(file);
-        int ret = fseeko(file, (off_t)m_alreadyRead, SEEK_SET);
-        debugAssert(ret == 0);
-        size_t toRead = (size_t)G3D::min(m_bufferLength, m_length - m_alreadyRead);
-        ret = fread(m_buffer, 1, toRead, file);
-        debugAssert((size_t)ret == (size_t)toRead);
-        fclose(file);
-        file = NULL;
-#   endif
-
-    m_pos = absPos - m_alreadyRead;
-    debugAssert(m_pos >= 0);
-}
-
-
-
-const bool BinaryInput::NO_COPY = false;
-    
-static bool needSwapBytes(G3DEndian fileEndian) {
-    return (fileEndian != System::machineEndian());
-}
-
-
-/** Helper used by the constructors for decompression */
-static uint32 readUInt32(const uint8* data, bool swapBytes) {
-    if (swapBytes) {
-        uint8 out[4];
-        out[0] = data[3];
-        out[1] = data[2];
-        out[2] = data[1];
-        out[3] = data[0];
-        return *((uint32*)out);
-    } else {
-        return *((uint32*)data);
-    }
-}
-
-
-void BinaryInput::setEndian(G3DEndian e) {
-    m_fileEndian = e;
-    m_swapBytes = needSwapBytes(m_fileEndian);
-}
-
-
-BinaryInput::BinaryInput(
-    const uint8*        data,
-    int64               dataLen,
-    G3DEndian           dataEndian,
-    bool                compressed,
-    bool                copyMemory) :
-    m_filename(""),
-    m_bitPos(0),
-    m_bitString(0),
-    m_beginEndBits(0),
-    m_alreadyRead(0),
-    m_bufferLength(0),
-    m_pos(0) {
-
-    m_freeBuffer = copyMemory || compressed;
-
-    setEndian(dataEndian);
-
-    if (compressed) {
-        // Read the decompressed size from the first 4 bytes
-        m_length = G3D::readUInt32(data, m_swapBytes);
-
-        debugAssert(m_freeBuffer);
-        m_buffer = (uint8*)System::alignedMalloc(m_length, 16);
-
-        unsigned long L = m_length;
-        // Decompress with zlib
-        int64 result = uncompress(m_buffer, (unsigned long*)&L, data + 4, dataLen - 4);
-        m_length = L;
-        m_bufferLength = L;
-        debugAssert(result == Z_OK); (void)result;
-
-    } else {
-    	m_length = dataLen;
-        m_bufferLength = m_length;
-        if (! copyMemory) {
- 	        debugAssert(!m_freeBuffer);
-            m_buffer = const_cast(data);
-        } else {
-	        debugAssert(m_freeBuffer);
-            m_buffer = (uint8*)System::alignedMalloc(m_length, 16);
-            System::memcpy(m_buffer, data, dataLen);
-        }
-    }
-}
-
-
-BinaryInput::BinaryInput(
-    const std::string&  filename,
-    G3DEndian           fileEndian,
-    bool                compressed) :
-    m_filename(filename),
-    m_bitPos(0),
-    m_bitString(0),
-    m_beginEndBits(0),
-    m_alreadyRead(0),
-    m_length(0),
-    m_bufferLength(0),
-    m_buffer(NULL),
-    m_pos(0),
-    m_freeBuffer(true) {
-
-    setEndian(fileEndian);
-
-    // Update global file tracker
-    _internal::currentFilesUsed.insert(m_filename);
-    
-
-    if (! fileExists(m_filename, false)) {
-        std::string zipfile;
-        std::string internalfile;
-        if (zipfileExists(m_filename, zipfile, internalfile)) {
-            // Load from zipfile
-            void* v;
-            size_t s;
-            zipRead(filename, v, s);
-            m_buffer = reinterpret_cast(v);
-            m_bufferLength = m_length = s;
-            if (compressed) {
-                decompress();
-            }
-            m_freeBuffer = true;
-        } else {
-            Log::common()->printf("Warning: File not found: %s\n", m_filename.c_str());
-        }
-        return;
-    }
-
-    // Figure out how big the file is and verify that it exists.
-    m_length = fileLength(m_filename);
-
-    // Read the file into memory
-    FILE* file = fopen(m_filename.c_str(), "rb");
-
-    if (! file || (m_length == -1)) {
-        throw format("File not found: \"%s\"", m_filename.c_str());
-        return;
-    }
-
-    if (! compressed && (m_length > INITIAL_BUFFER_LENGTH)) {
-        // Read only a subset of the file so we don't consume
-        // all available memory.
-        m_bufferLength = INITIAL_BUFFER_LENGTH;
-    } else {
-        // Either the length is fine or the file is compressed
-        // and requires us to read the whole thing for zlib.
-        m_bufferLength = m_length;
-    }
-
-    debugAssert(m_freeBuffer);
-    m_buffer = (uint8*)System::alignedMalloc(m_bufferLength, 16);
-    if (m_buffer == NULL) {
-        if (compressed) {
-            throw "Not enough memory to load compressed file. (1)";
-        }
-        
-        // Try to allocate a small array; not much memory is available.
-        // Give up if we can't allocate even 1k.
-        while ((m_buffer == NULL) && (m_bufferLength > 1024)) {
-            m_bufferLength /= 2;
-            m_buffer = (uint8*)System::alignedMalloc(m_bufferLength, 16);
-        }
-    }
-    debugAssert(m_buffer);
-    
-    fread(m_buffer, m_bufferLength, sizeof(int8), file);
-    fclose(file);
-    file = NULL;
-
-    if (compressed) {
-        if (m_bufferLength != m_length) {
-            throw "Not enough memory to load compressed file. (2)";
-        }
-
-        decompress();
-    }
-}
-
-void BinaryInput::decompress() {
-    // Decompress
-    // Use the existing buffer as the source, allocate
-    // a new buffer to use as the destination.
-    
-    int64 tempLength = m_length;
-    m_length = G3D::readUInt32(m_buffer, m_swapBytes);
-    
-    // The file couldn't have better than 500:1 compression
-    alwaysAssertM(m_length < m_bufferLength * 500, "Compressed file header is corrupted");
-    
-    uint8* tempBuffer = m_buffer;
-    m_buffer = (uint8*)System::alignedMalloc(m_length, 16);
-    
-    debugAssert(m_buffer);
-    debugAssert(isValidHeapPointer(tempBuffer));
-    debugAssert(isValidHeapPointer(m_buffer));
-    
-    unsigned long L = m_length;
-    int64 result = uncompress(m_buffer, &L, tempBuffer + 4, tempLength - 4);
-    m_length = L;
-    m_bufferLength = m_length;
-    
-    debugAssertM(result == Z_OK, "BinaryInput/zlib detected corruption in " + m_filename); 
-    (void)result;
-    
-    System::alignedFree(tempBuffer);
-}
-
-
-void BinaryInput::readBytes(void* bytes, int64 n) {
-    prepareToRead(n);
-    debugAssert(isValidPointer(bytes));
-
-    memcpy(bytes, m_buffer + m_pos, n);
-    m_pos += n;
-}
-
-
-BinaryInput::~BinaryInput() {
-
-    if (m_freeBuffer) {
-        System::alignedFree(m_buffer);
-    }
-    m_buffer = NULL;
-}
-
-
-uint64 BinaryInput::readUInt64() {
-    prepareToRead(8);
-    uint8 out[8];
-
-    if (m_swapBytes) {
-        out[0] = m_buffer[m_pos + 7];
-        out[1] = m_buffer[m_pos + 6];
-        out[2] = m_buffer[m_pos + 5];
-        out[3] = m_buffer[m_pos + 4];
-        out[4] = m_buffer[m_pos + 3];
-        out[5] = m_buffer[m_pos + 2];
-        out[6] = m_buffer[m_pos + 1];
-        out[7] = m_buffer[m_pos + 0];
-    } else {
-        *(uint64*)out = *(uint64*)(m_buffer + m_pos);
-    }
-
-    m_pos += 8;
-    return *(uint64*)out;
-}
-
-
-std::string BinaryInput::readString(int64 n) {
-    prepareToRead(n);
-    debugAssertM((m_pos + n) <= m_length, "Read past end of file");
-    
-    char *s = (char*)System::alignedMalloc(n + 1, 16);
-    assert(s != NULL);
-
-    memcpy(s, m_buffer + m_pos, n);
-    // There may not be a null, so make sure
-    // we add one.
-    s[n] = '\0';
-
-    std::string out = s;
-    System::alignedFree(s);
-    s = NULL;
-
-    m_pos += n;
-
-    return out;
-
-}
-
-
-std::string BinaryInput::readString() {
-    int64 n = 0;
-
-    if ((m_pos + m_alreadyRead + n) < (m_length - 1)) {
-        prepareToRead(1);
-    }
-
-    if ( ((m_pos + m_alreadyRead + n) < (m_length - 1)) &&
-         (m_buffer[m_pos + n] != '\0')) {
-
-        ++n;
-        while ( ((m_pos + m_alreadyRead + n) < (m_length - 1)) &&
-                (m_buffer[m_pos + n] != '\0')) {
-
-            prepareToRead(1);
-            ++n;
-        }
-    }
-
-    // Consume NULL
-    ++n;
-
-    return readString(n);
-}
-
-
-std::string BinaryInput::readStringEven() {
-    std::string x = readString();
-    if (hasMore() && (G3D::isOdd(x.length() + 1))) {
-        skip(1);
-    }
-    return x;
-}
-
-
-std::string BinaryInput::readString32() {
-    int len = readUInt32();
-    return readString(len);
-}
-
-
-Vector4 BinaryInput::readVector4() {
-    float x = readFloat32();
-    float y = readFloat32();
-    float z = readFloat32();
-    float w = readFloat32();
-    return Vector4(x, y, z, w);
-}
-
-
-Vector3 BinaryInput::readVector3() {
-    float x = readFloat32();
-    float y = readFloat32();
-    float z = readFloat32();
-    return Vector3(x, y, z);
-}
-
-
-Vector2 BinaryInput::readVector2() {
-    float x = readFloat32();
-    float y = readFloat32();
-    return Vector2(x, y);
-}
-
-
-Color4 BinaryInput::readColor4() {
-    float r = readFloat32();
-    float g = readFloat32();
-    float b = readFloat32();
-    float a = readFloat32();
-    return Color4(r, g, b, a);
-}
-
-
-Color3 BinaryInput::readColor3() {
-    float r = readFloat32();
-    float g = readFloat32();
-    float b = readFloat32();
-    return Color3(r, g, b);
-}
-
-
-void BinaryInput::beginBits() {
-    debugAssert(m_beginEndBits == 0);
-    m_beginEndBits = 1;
-    m_bitPos = 0;
-
-    debugAssertM(hasMore(), "Can't call beginBits when at the end of a file");
-    m_bitString = readUInt8();
-}
-
-
-uint32 BinaryInput::readBits(int numBits) {
-    debugAssert(m_beginEndBits == 1);
-
-    uint32 out = 0;
-
-    const int total = numBits;
-    while (numBits > 0) {
-        if (m_bitPos > 7) {
-            // Consume a new byte for reading.  We do this at the beginning
-            // of the loop so that we don't try to read past the end of the file.
-            m_bitPos = 0;
-            m_bitString = readUInt8();
-        }
-
-        // Slide the lowest bit of the bitString into
-        // the correct position.
-        out |= (m_bitString & 1) << (total - numBits);
-
-        // Shift over to the next bit
-        m_bitString = m_bitString >> 1;
-        ++m_bitPos;
-        --numBits;
-    }
-
-    return out;
-}
-
-
-void BinaryInput::endBits() {
-    debugAssert(m_beginEndBits == 1);
-    if (m_bitPos == 0) {
-        // Put back the last byte we read
-        --m_pos;
-    }
-    m_beginEndBits = 0;
-    m_bitPos = 0;
-}
-
-}
diff --git a/externals/g3dlite/G3D.lib/source/BinaryOutput.cpp b/externals/g3dlite/G3D.lib/source/BinaryOutput.cpp
deleted file mode 100644
index 8fcc30e548f..00000000000
--- a/externals/g3dlite/G3D.lib/source/BinaryOutput.cpp
+++ /dev/null
@@ -1,518 +0,0 @@
-/**
- @file BinaryOutput.cpp
- 
- @author Morgan McGuire, graphics3d.com
- Copyright 2002-2007, Morgan McGuire, All rights reserved.
- 
- @created 2002-02-20
- @edited  2008-01-07
- */
-
-#include "G3D/platform.h"
-#include "G3D/BinaryOutput.h"
-#include "G3D/fileutils.h"
-#include "G3D/stringutils.h"
-#include "G3D/Array.h"
-#include 
-
-#include 
-
-// Largest memory buffer that the system will use for writing to
-// disk.  After this (or if the system runs out of memory)
-// chunks of the file will be dumped to disk.
-//
-// Currently 400 MB
-#define MAX_BINARYOUTPUT_BUFFER_SIZE 400000000
-
-namespace G3D {
-
-void BinaryOutput::writeBool8(const std::vector& out, int n) {
-    for (int i = 0; i < n; ++i) {
-        writeBool8(out[i]);
-    }
-}
-
-
-void BinaryOutput::writeBool8(const Array& out, int n) {
-    writeBool8(out.getCArray(), n);
-}
-
-#define IMPLEMENT_WRITER(ucase, lcase)\
-void BinaryOutput::write##ucase(const std::vector& out, int n) {\
-    write##ucase(&out[0], n);\
-}\
-\
-\
-void BinaryOutput::write##ucase(const Array& out, int n) {\
-    write##ucase(out.getCArray(), n);\
-}
-
-
-IMPLEMENT_WRITER(UInt8,   uint8)
-IMPLEMENT_WRITER(Int8,    int8)
-IMPLEMENT_WRITER(UInt16,  uint16)
-IMPLEMENT_WRITER(Int16,   int16)
-IMPLEMENT_WRITER(UInt32,  uint32)
-IMPLEMENT_WRITER(Int32,   int32)
-IMPLEMENT_WRITER(UInt64,  uint64)
-IMPLEMENT_WRITER(Int64,   int64)
-IMPLEMENT_WRITER(Float32, float32)
-IMPLEMENT_WRITER(Float64, float64)    
-
-#undef IMPLEMENT_WRITER
-
-// Data structures that are one byte per element can be 
-// directly copied, regardles of endian-ness.
-#define IMPLEMENT_WRITER(ucase, lcase)\
-void BinaryOutput::write##ucase(const lcase* out, int n) {\
-    if (sizeof(lcase) == 1) {\
-        writeBytes((void*)out, n);\
-    } else {\
-        for (int i = 0; i < n ; ++i) {\
-            write##ucase(out[i]);\
-        }\
-    }\
-}
-
-IMPLEMENT_WRITER(Bool8,   bool)
-IMPLEMENT_WRITER(UInt8,   uint8)
-IMPLEMENT_WRITER(Int8,    int8)
-
-#undef IMPLEMENT_WRITER
-
-
-#define IMPLEMENT_WRITER(ucase, lcase)\
-void BinaryOutput::write##ucase(const lcase* out, int n) {\
-    if (m_swapBytes) {\
-        for (int i = 0; i < n; ++i) {\
-            write##ucase(out[i]);\
-        }\
-    } else {\
-        writeBytes((const void*)out, sizeof(lcase) * n);\
-    }\
-}
-
-
-IMPLEMENT_WRITER(UInt16,  uint16)
-IMPLEMENT_WRITER(Int16,   int16)
-IMPLEMENT_WRITER(UInt32,  uint32)
-IMPLEMENT_WRITER(Int32,   int32)
-IMPLEMENT_WRITER(UInt64,  uint64)
-IMPLEMENT_WRITER(Int64,   int64)
-IMPLEMENT_WRITER(Float32, float32)
-IMPLEMENT_WRITER(Float64, float64)    
-
-#undef IMPLEMENT_WRITER
-
-
-void BinaryOutput::reallocBuffer(size_t bytes, size_t oldBufferLen) {
-    //debugPrintf("reallocBuffer(%d, %d)\n", bytes, oldBufferLen);
-
-    size_t newBufferLen = (int)(m_bufferLen * 1.5) + 100;
-    uint8* newBuffer = NULL;
-
-    if ((m_filename == "") || (newBufferLen < MAX_BINARYOUTPUT_BUFFER_SIZE)) {
-        // We're either writing to memory (in which case we *have* to try and allocate)
-        // or we've been asked to allocate a reasonable size buffer.
-
-        //debugPrintf("  realloc(%d)\n", newBufferLen); 
-        newBuffer = (uint8*)System::realloc(m_buffer, newBufferLen);
-        if (newBuffer != NULL) {
-            m_maxBufferLen = newBufferLen;
-        }
-    }
-
-    if ((newBuffer == NULL) && (bytes > 0)) {
-        // Realloc failed; we're probably out of memory.  Back out
-        // the entire call and try to dump some data to disk.
-        m_bufferLen = oldBufferLen;
-        reserveBytesWhenOutOfMemory(bytes);
-    } else {
-        m_buffer = newBuffer;
-        debugAssert(isValidHeapPointer(m_buffer));
-    }
-}
-
-
-void BinaryOutput::reserveBytesWhenOutOfMemory(size_t bytes) {
-    if (m_filename == "") {
-        throw "Out of memory while writing to memory in BinaryOutput (no RAM left).";
-    } else if ((int)bytes > (int)m_maxBufferLen) {
-        throw "Out of memory while writing to disk in BinaryOutput (could not create a large enough buffer).";
-    } else {
-
-        // Dump the contents to disk.  In order to enable seeking backwards, 
-        // we keep the last 10 MB in memory.
-        int writeBytes = m_bufferLen - 10 * 1024 * 1024;
-
-        if (writeBytes < m_bufferLen / 3) {
-            // We're going to write less than 1/3 of the file;
-            // give up and just write the whole thing.
-            writeBytes = m_bufferLen;
-        }
-        debugAssert(writeBytes > 0);
-
-        //debugPrintf("Writing %d bytes to disk\n", writeBytes);
-
-        const char* mode = (m_alreadyWritten > 0) ? "ab" : "wb";
-        FILE* file = fopen(m_filename.c_str(), mode);
-        debugAssert(file);
-
-        size_t count = fwrite(m_buffer, 1, writeBytes, file);
-        debugAssert((int)count == writeBytes); (void)count;
-
-        fclose(file);
-        file = NULL;
-
-        // Record that we saved this data.
-        m_alreadyWritten += writeBytes;
-        m_bufferLen -= writeBytes;
-        m_pos -= writeBytes;
-
-        debugAssert(m_bufferLen < m_maxBufferLen);
-        debugAssert(m_bufferLen >= 0);
-        debugAssert(m_pos >= 0);
-        debugAssert(m_pos <= m_bufferLen);
-
-        // Shift the unwritten data back appropriately in the buffer.
-        debugAssert(isValidHeapPointer(m_buffer));
-        System::memcpy(m_buffer, m_buffer + writeBytes, m_bufferLen);
-        debugAssert(isValidHeapPointer(m_buffer));
-
-        // *now* we allocate bytes (there should presumably be enough 
-        // space in the buffer; if not, we'll come back through this 
-        // code and dump the last 10MB to disk as well.  Note that the 
-        // bytes > maxBufferLen case above would already have triggered
-        // if this call couldn't succeed. 
-        reserveBytes(bytes);
-    }
-}
-
-
-BinaryOutput::BinaryOutput() {
-    m_alreadyWritten = 0;
-    m_swapBytes = false;
-    m_pos       = 0;
-    m_filename  = "";
-    m_buffer = NULL;
-    m_bufferLen = 0;
-    m_maxBufferLen = 0;
-    m_beginEndBits = 0;
-    m_bitString = 0;
-    m_bitPos = 0;
-    m_ok = true;
-    m_committed = false;
-}
-
-
-BinaryOutput::BinaryOutput(
-    const std::string&  filename,
-    G3DEndian           fileEndian) {
-
-    m_pos = 0;
-    m_alreadyWritten = 0;
-    setEndian(fileEndian);
-    m_filename = filename;
-    m_buffer = NULL;
-    m_bufferLen = 0;
-    m_maxBufferLen = 0;
-    m_beginEndBits = 0;
-    m_bitString = 0;
-    m_bitPos = 0;
-    m_committed = false;
-
-    m_ok = true;    
-    /** Verify ability to write to disk */
-    commit(false);
-    m_committed = false;
-}
-
-
-void BinaryOutput::reset() {
-    debugAssert(m_beginEndBits == 0);
-    alwaysAssertM(m_filename == "", 
-        "Can only reset a BinaryOutput that writes to memory.");
-
-    // Do not reallocate, just clear the size of the buffer.
-    m_pos = 0;
-    m_alreadyWritten = 0;
-    m_bufferLen = 0;
-    m_beginEndBits = 0;
-    m_bitString = 0;
-    m_bitPos = 0;
-    m_committed = false;
-}
-
-
-BinaryOutput::~BinaryOutput() {
-    debugAssert((m_buffer == NULL) || isValidHeapPointer(m_buffer));
-    System::free(m_buffer);
-    m_buffer = NULL;
-    m_bufferLen = 0;
-    m_maxBufferLen = 0;
-}
-
-
-void BinaryOutput::setEndian(G3DEndian fileEndian) {
-    m_fileEndian = fileEndian;
-    m_swapBytes = (fileEndian != System::machineEndian());
-}
-
-
-bool BinaryOutput::ok() const {
-    return m_ok;
-}
-
-
-void BinaryOutput::compress() {
-    if (m_alreadyWritten > 0) {
-        throw "Cannot compress huge files (part of this file has already been written to disk).";
-    }
-
-    // Old buffer size
-    int L = m_bufferLen;
-    uint8* convert = (uint8*)&L;
-
-    // Zlib requires the output buffer to be this big
-    unsigned long newSize = iCeil(m_bufferLen * 1.01) + 12;
-    uint8* temp = (uint8*)System::malloc(newSize);
-    int result = compress2(temp, &newSize, m_buffer, m_bufferLen, 9); 
-
-    debugAssert(result == Z_OK); (void)result;
-
-    // Write the header
-    if (m_swapBytes) {
-        m_buffer[0] = convert[3];
-        m_buffer[1] = convert[2];
-        m_buffer[2] = convert[1];
-        m_buffer[3] = convert[0];
-    } else {
-        m_buffer[0] = convert[0];
-        m_buffer[1] = convert[1];
-        m_buffer[2] = convert[2];
-        m_buffer[3] = convert[3];
-    }
-
-    // Write the data
-    if ((int64)newSize + 4 > (int64)m_maxBufferLen) {
-        m_maxBufferLen = newSize + 4;
-        m_buffer = (uint8*)System::realloc(m_buffer, m_maxBufferLen);
-    }
-    m_bufferLen = newSize + 4;
-    System::memcpy(m_buffer + 4, temp, newSize);
-    m_pos = m_bufferLen;
-
-    System::free(temp);
-}
-
-
-void BinaryOutput::commit(bool flush) {
-    debugAssertM(! m_committed, "Cannot commit twice");
-    m_committed = true;
-    debugAssertM(m_beginEndBits == 0, "Missing endBits before commit");
-
-    // Make sure the directory exists.
-    std::string root, base, ext, path;
-    Array pathArray;
-    parseFilename(m_filename, root, pathArray, base, ext); 
-
-    path = root + stringJoin(pathArray, '/');
-    if (! fileExists(path, false)) {
-        createDirectory(path);
-    }
-
-    const char* mode = (m_alreadyWritten > 0) ? "ab" : "wb";
-
-    FILE* file = fopen(m_filename.c_str(), mode);
-
-    m_ok = (file != NULL) && m_ok;
-
-    if (m_ok) {
-        debugAssertM(file, std::string("Could not open '") + m_filename + "'");
-
-        m_alreadyWritten += m_bufferLen;
-
-        fwrite(m_buffer, m_bufferLen, 1, file);
-        if (flush) {
-            fflush(file);
-        }
-        fclose(file);
-        file = NULL;
-    }
-}
-
-
-void BinaryOutput::commit(
-    uint8*                  out) {
-    debugAssertM(! m_committed, "Cannot commit twice");
-    m_committed = true;
-
-    System::memcpy(out, m_buffer, m_bufferLen);
-}
-
-
-void BinaryOutput::writeUInt16(uint16 u) {
-    reserveBytes(2);
-
-    uint8* convert = (uint8*)&u;
-
-    if (m_swapBytes) {
-        m_buffer[m_pos]     = convert[1];
-        m_buffer[m_pos + 1] = convert[0];
-    } else {
-        *(uint16*)(m_buffer + m_pos) = u;
-    }
-
-    m_pos += 2;
-}
-
-
-void BinaryOutput::writeUInt32(uint32 u) {
-    reserveBytes(4);
-
-    uint8* convert = (uint8*)&u;
-
-    debugAssert(m_beginEndBits == 0);
-
-    if (m_swapBytes) {
-        m_buffer[m_pos]     = convert[3];
-        m_buffer[m_pos + 1] = convert[2];
-        m_buffer[m_pos + 2] = convert[1];
-        m_buffer[m_pos + 3] = convert[0];
-    } else {
-        *(uint32*)(m_buffer + m_pos) = u;
-    }
-
-    m_pos += 4;
-}
-
-
-void BinaryOutput::writeUInt64(uint64 u) {
-    reserveBytes(8);
-
-    uint8* convert = (uint8*)&u;
-
-    if (m_swapBytes) {
-        m_buffer[m_pos]     = convert[7];
-        m_buffer[m_pos + 1] = convert[6];
-        m_buffer[m_pos + 2] = convert[5];
-        m_buffer[m_pos + 3] = convert[4];
-        m_buffer[m_pos + 4] = convert[3];
-        m_buffer[m_pos + 5] = convert[2];
-        m_buffer[m_pos + 6] = convert[1];
-        m_buffer[m_pos + 7] = convert[0];
-    } else {
-        *(uint64*)(m_buffer + m_pos) = u;
-    }
-
-    m_pos += 8;
-}
-
-
-void BinaryOutput::writeString(const char* s) {
-    // +1 is because strlen doesn't count the null
-    int len = strlen(s) + 1;
-
-    debugAssert(m_beginEndBits == 0);
-    reserveBytes(len);
-    System::memcpy(m_buffer + m_pos, s, len);
-    m_pos += len;
-}
-
-
-void BinaryOutput::writeStringEven(const char* s) {
-    // +1 is because strlen doesn't count the null
-    int len = strlen(s) + 1;
-
-    reserveBytes(len);
-    System::memcpy(m_buffer + m_pos, s, len);
-    m_pos += len;
-
-    // Pad with another NULL
-    if ((len % 2) == 1) {
-        writeUInt8(0);
-    }
-}
-
-
-void BinaryOutput::writeString32(const char* s) {
-    writeUInt32(strlen(s) + 1);
-    writeString(s);
-}
-
-
-void BinaryOutput::writeVector4(const Vector4& v) {
-    writeFloat32(v.x);
-    writeFloat32(v.y);
-    writeFloat32(v.z);
-    writeFloat32(v.w);
-}
-
-
-void BinaryOutput::writeVector3(const Vector3& v) {
-    writeFloat32(v.x);
-    writeFloat32(v.y);
-    writeFloat32(v.z);
-}
-
-
-void BinaryOutput::writeVector2(const Vector2& v) {
-    writeFloat32(v.x);
-    writeFloat32(v.y);
-}
-
-
-void BinaryOutput::writeColor4(const Color4& v) {
-    writeFloat32(v.r);
-    writeFloat32(v.g);
-    writeFloat32(v.b);
-    writeFloat32(v.a);
-}
-
-
-void BinaryOutput::writeColor3(const Color3& v) {
-    writeFloat32(v.r);
-    writeFloat32(v.g);
-    writeFloat32(v.b);
-}
-
-
-void BinaryOutput::beginBits() {
-    debugAssertM(m_beginEndBits == 0, "Already in beginBits...endBits");
-    m_bitString = 0x00;
-    m_bitPos = 0;
-    m_beginEndBits = 1;
-}
-
-
-void BinaryOutput::writeBits(uint32 value, int numBits) {
-
-    while (numBits > 0) {
-        // Extract the current bit of value and
-        // insert it into the current byte
-        m_bitString |= (value & 1) << m_bitPos;
-        ++m_bitPos;
-        value = value >> 1;
-        --numBits;
-
-        if (m_bitPos > 7) {
-            // We've reached the end of this byte
-            writeUInt8(m_bitString);
-            m_bitString = 0x00;
-            m_bitPos = 0;
-        }
-    }
-}
-
-
-void BinaryOutput::endBits() {
-    debugAssertM(m_beginEndBits == 1, "Not in beginBits...endBits");
-    if (m_bitPos > 0) {
-        writeUInt8(m_bitString);
-    }
-    m_bitString = 0;
-    m_bitPos = 0;
-    m_beginEndBits = 0;
-}
-
-}
diff --git a/externals/g3dlite/G3D.lib/source/Box.cpp b/externals/g3dlite/G3D.lib/source/Box.cpp
deleted file mode 100644
index 4b6c56388ec..00000000000
--- a/externals/g3dlite/G3D.lib/source/Box.cpp
+++ /dev/null
@@ -1,393 +0,0 @@
-/**
-  @file Box.cpp
-  Box class
-
-  @maintainer Morgan McGuire, matrix@graphics3d.com
-
-  @created 2001-06-02
-  @edited  2006-02-05
-*/
-
-#include "G3D/Box.h"
-#include "G3D/debug.h"
-#include "G3D/Plane.h"
-#include "G3D/AABox.h"
-#include "G3D/CoordinateFrame.h"
-
-namespace G3D {
-
-/**
- Sets a field on four vertices.  Used by the constructor.
- */
-#define setMany(i0, i1, i2, i3, field, extreme) \
-    _corner[i0].field = _corner[i1].field = \
-    _corner[i2].field = _corner[i3].field = \
-    (extreme).field
-
-Box::Box() {
-}
-
-
-Box::Box(const AABox& b) {
-    init(b.low(), b.high());
-}
-
-Box::Box(class BinaryInput& b) {
-	deserialize(b);	
-}
-
-
-void Box::serialize(class BinaryOutput& b) const {
-	int i;
-	for (i = 0; i < 8; ++i) {
-		_corner[i].serialize(b);
-	}
-
-    // Other state can be reconstructed
-}
-
-
-void Box::deserialize(class BinaryInput& b) {
-	int i;
-
-    _center = Vector3::zero();
-    for (i = 0; i < 8; ++i) {
-		_corner[i].deserialize(b);
-        _center += _corner[i];
-	}
-
-    _center = _center / 8;
-    
-    // Reconstruct other state from the corners
-    _axis[0] = _corner[5] - _corner[4];
-    _axis[1] = _corner[7] - _corner[4];
-    _axis[2] = _corner[0] - _corner[4];
-
-    for (i = 0; i < 3; ++i) {
-        _extent[i] = _axis[i].magnitude();
-        _axis[i] /= _extent[i];
-    }
-
-    _volume = _extent.x * _extent.y * _extent.z;
-
-    _area = 2 * 
-        (_extent.x * _extent.y +
-         _extent.y * _extent.z +
-         _extent.z * _extent.x);
-}
-
-
-Box::Box(
-    const Vector3& min,
-    const Vector3& max) {
-
-    init(min.min(max), min.max(max));
-
-}
-
-void Box::init(
-    const Vector3& min,
-    const Vector3& max) {
-
-    debugAssert(
-        (min.x <= max.x) &&
-        (min.y <= max.y) &&
-        (min.z <= max.z));
-
-    setMany(0, 1, 2, 3, z, max);
-    setMany(4, 5, 6, 7, z, min);
-
-    setMany(1, 2, 5, 6, x, max);
-    setMany(0, 3, 4, 7, x, min);
-
-    setMany(3, 2, 6, 7, y, max);
-    setMany(0, 1, 5, 4, y, min);
-
-    _extent = max - min;
-
-    _axis[0] = Vector3::unitX();
-    _axis[1] = Vector3::unitY();
-    _axis[2] = Vector3::unitZ();
-
-    if (_extent.isFinite()) {
-        _volume = _extent.x * _extent.y * _extent.z;
-    } else {
-        _volume = G3D::inf();
-    }
-
-    debugAssert(! isNaN(_extent.x));
-
-    _area = 2 * 
-        (_extent.x * _extent.y +
-         _extent.y * _extent.z +
-         _extent.z * _extent.x);
-
-    _center = (max + min) / 2;
-
-    // If the extent is infinite along an axis, make the center zero to avoid NaNs
-    for (int i = 0; i < 3; ++i) {
-        if (! G3D::isFinite(_extent[i])) {
-            _center[i] = 0.0f;
-        }
-    }
-}
-
-
-float Box::volume() const {
-    return _volume;
-}
-
-
-float Box::area() const {
-    return _area;
-}
-
-
-void Box::getLocalFrame(CoordinateFrame& frame) const {
-
-    frame.rotation = Matrix3(
-        _axis[0][0], _axis[1][0], _axis[2][0],
-        _axis[0][1], _axis[1][1], _axis[2][1],
-        _axis[0][2], _axis[1][2], _axis[2][2]);
-
-    frame.translation = _center;
-}
-
-
-CoordinateFrame Box::localFrame() const {
-    CoordinateFrame out;
-    getLocalFrame(out);
-    return out;
-}
-
-
-void Box::getFaceCorners(int f, Vector3& v0, Vector3& v1, Vector3& v2, Vector3& v3) const {
-    switch (f) {
-    case 0:
-        v0 = _corner[0]; v1 = _corner[1]; v2 = _corner[2]; v3 = _corner[3];
-        break;
-
-    case 1:
-        v0 = _corner[1]; v1 = _corner[5]; v2 = _corner[6]; v3 = _corner[2];
-        break;
-
-    case 2:
-        v0 = _corner[7]; v1 = _corner[6]; v2 = _corner[5]; v3 = _corner[4];
-        break;
-
-    case 3:
-        v0 = _corner[2]; v1 = _corner[6]; v2 = _corner[7]; v3 = _corner[3];
-        break;
-
-    case 4:
-        v0 = _corner[3]; v1 = _corner[7]; v2 = _corner[4]; v3 = _corner[0];
-        break;
-
-    case 5:
-        v0 = _corner[1]; v1 = _corner[0]; v2 = _corner[4]; v3 = _corner[5];
-        break;
-
-    default:
-        debugAssert((f >= 0) && (f < 6));
-    }
-}
-
-
-
-int Box::dummy = 0;
-
-bool Box::culledBy(
-    const Array& plane,
-	int&				cullingPlane,
-	const uint32		_inMask,
-    uint32&             childMask) const {
-
-	uint32 inMask = _inMask;
-	assert(plane.size() < 31);
-
-    childMask = 0;
-
-    // See if there is one plane for which all of the
-	// vertices are in the negative half space.
-    for (int p = 0; p < plane.size(); ++p) {
-
-		// Only test planes that are not masked
-		if ((inMask & 1) != 0) {
-		
-			Vector3 corner;
-
-            int numContained = 0;
-            int v = 0;
-
-            // We can early-out only if we have found one point on each
-            // side of the plane (i.e. if we are straddling).  That
-            // occurs when (numContained < v) && (numContained > 0)
-			for (v = 0; (v < 8) && ((numContained == v) || (numContained == 0)); ++v) {
-                if (plane[p].halfSpaceContains(_corner[v])) {
-                    ++numContained;
-                }
-			}
-
-			if (numContained == 0) {
-				// Plane p culled the box
-				cullingPlane = p;
-
-                // The caller should not recurse into the children,
-                // since the parent is culled.  If they do recurse,
-                // make them only test against this one plane, which
-                // will immediately cull the volume.
-                childMask = 1 << p;
-				return true;
-
-            } else if (numContained < v) {
-                // The bounding volume straddled the plane; we have
-                // to keep testing against this plane
-                childMask |= (1 << p);
-            }
-		}
-
-        // Move on to the next bit.
-		inMask = inMask >> 1;
-    }
-
-    // None of the planes could cull this box
-	cullingPlane = -1;
-    return false;
-}
-
-
-bool Box::culledBy(
-    const Array& plane,
-	int&				cullingPlane,
-	const uint32		_inMask) const {
-
-	uint32 inMask = _inMask;
-	assert(plane.size() < 31);
-
-    // See if there is one plane for which all of the
-	// vertices are in the negative half space.
-    for (int p = 0; p < plane.size(); ++p) {
-
-		// Only test planes that are not masked
-		if ((inMask & 1) != 0) {
-		
-			bool culled = true;
-
-            int v;
-
-			// Assume this plane culls all points.  See if there is a point
-			// not culled by the plane... early out when at least one point
-            // is in the positive half space.
-			for (v = 0; (v < 8) && culled; ++v) {
-                culled = ! plane[p].halfSpaceContains(corner(v));
-			}
-
-			if (culled) {
-				// Plane p culled the box
-				cullingPlane = p;
-
-				return true;
-            }
-		}
-
-        // Move on to the next bit.
-		inMask = inMask >> 1;
-    }
-
-    // None of the planes could cull this box
-	cullingPlane = -1;
-    return false;
-}
-
-
-bool Box::contains(
-    const Vector3&      point) const {
-
-    // Form axes from three edges, transform the point into that
-    // space, and perform 3 interval tests
-
-    Vector3 u = _corner[4] - _corner[0];
-    Vector3 v = _corner[3] - _corner[0];
-    Vector3 w = _corner[1] - _corner[0];
-
-    Matrix3 M = Matrix3(u.x, v.x, w.x,
-                        u.y, v.y, w.y,
-                        u.z, v.z, w.z);
-
-    // M^-1 * (point - _corner[0]) = point in unit cube's object space
-    // compute the inverse of M
-    Vector3 osPoint = M.inverse() * (point - _corner[0]);
-
-    return
-        (osPoint.x >= 0) && 
-        (osPoint.y >= 0) &&
-        (osPoint.z >= 0) &&
-        (osPoint.x <= 1) &&
-        (osPoint.y <= 1) &&
-        (osPoint.z <= 1);
-}
-
-#undef setMany
-
-
-void Box::getRandomSurfacePoint(Vector3& P, Vector3& N) const {
-    float aXY = _extent.x * _extent.y;
-    float aYZ = _extent.y * _extent.z;
-    float aZX = _extent.z * _extent.x;
-
-    float r = (float)uniformRandom(0, aXY + aYZ + aZX);
-
-    // Choose evenly between positive and negative face planes
-    float d = (uniformRandom(0, 1) < 0.5f) ? -1.0f : 1.0f;
-
-    // The probability of choosing a given face is proportional to
-    // its area.
-    if (r < aXY) {
-        P = _axis[0] * (float)uniformRandom(-0.5, 0.5) * _extent.x +
-            _axis[1] * (float)uniformRandom(-0.5, 0.5) * _extent.y +
-            _center + _axis[2] * d * _extent.z * 0.5f;
-        N = _axis[2] * d;
-    } else if (r < aYZ) {
-        P = _axis[1] * (float)uniformRandom(-0.5, 0.5) * _extent.y +
-            _axis[2] * (float)uniformRandom(-0.5, 0.5) * _extent.z +
-            _center + _axis[0] * d * _extent.x * 0.5f;
-        N = _axis[0] * d;
-    } else {
-        P = _axis[2] * (float)uniformRandom(-0.5, 0.5) * _extent.z +
-            _axis[0] *(float) uniformRandom(-0.5, 0.5) * _extent.x +
-            _center + _axis[1] * d * _extent.y * 0.5f;
-        N = _axis[1] * d;
-    }
-}
-
-
-Vector3 Box::randomInteriorPoint() const {
-    Vector3 sum = _center;
-
-    for (int a = 0; a < 3; ++a) {
-        sum += _axis[a] * (float)uniformRandom(-0.5, 0.5) * _extent[a];
-    }
-
-    return sum;
-}
-
-Box Box::inf() {
-    return Box(-Vector3::inf(), Vector3::inf());
-}
-
-void Box::getBounds(class AABox& aabb) const {
-
-    Vector3 lo = _corner[0];
-    Vector3 hi = lo;
-
-    for (int v = 1; v < 8; ++v) {
-        const Vector3& C = _corner[v];
-        lo = lo.min(C);
-        hi = hi.max(C);
-    }
-
-    aabb = AABox(lo, hi);
-}
-
-
-} // namespace
diff --git a/externals/g3dlite/G3D.lib/source/Capsule.cpp b/externals/g3dlite/G3D.lib/source/Capsule.cpp
deleted file mode 100644
index fbcb56fe97b..00000000000
--- a/externals/g3dlite/G3D.lib/source/Capsule.cpp
+++ /dev/null
@@ -1,179 +0,0 @@
-/**
- @file Capsule.cpp
-  
- @maintainer Morgan McGuire, matrix@graphics3d.com
-
- @created 2003-02-07
- @edited  2005-08-18
-
- Copyright 2000-2005, Morgan McGuire.
- All rights reserved.
- */
-
-#include "G3D/Capsule.h"
-#include "G3D/BinaryInput.h"
-#include "G3D/BinaryOutput.h"
-#include "G3D/LineSegment.h"
-#include "G3D/Sphere.h"
-#include "G3D/CoordinateFrame.h"
-#include "G3D/Line.h"
-#include "G3D/AABox.h"
-
-namespace G3D {
-
-Capsule::Capsule(class BinaryInput& b) {
-	deserialize(b);
-}
-
-
-Capsule::Capsule() {
-}
-
-
-Capsule::Capsule(const Vector3& _p1, const Vector3& _p2, float _r) 
-	: p1(_p1), p2(_p2), _radius(_r) {
-}
-
-
-void Capsule::serialize(class BinaryOutput& b) const {
-	p1.serialize(b);
-	p2.serialize(b);
-	b.writeFloat64(_radius);
-}
-
-
-void Capsule::deserialize(class BinaryInput& b) {
-	p1.deserialize(b);
-	p2.deserialize(b);
-	_radius = b.readFloat64();
-}
-
-
-Line Capsule::axis() const {
-	return Line::fromTwoPoints(p1, p2);
-}
-
-
-float Capsule::volume() const {
-	return 
-		// Sphere volume
-		pow(_radius, 3) * pi() * 4 / 3 +
-
-		// Cylinder volume
-		pow(_radius, 2) * (p1 - p2).magnitude();
-}
-
-
-float Capsule::area() const {
-
-	return
-		// Sphere area
-		pow(_radius, 2) * 4 * pi() +
-
-		// Cylinder area
-		twoPi() * _radius * (p1 - p2).magnitude();
-}
-
-
-void Capsule::getBounds(AABox& out) const {
-    Vector3 min = p1.min(p2) - (Vector3(1, 1, 1) * _radius);
-    Vector3 max = p1.max(p2) + (Vector3(1, 1, 1) * _radius);
-
-    out = AABox(min, max);
-}
-
-
-bool Capsule::contains(const Vector3& p) const { 
-    return LineSegment::fromTwoPoints(p1, p2).distanceSquared(p) <= square(radius());
-}
-
-
-void Capsule::getRandomSurfacePoint(Vector3& p, Vector3& N) const {
-    float h = height();
-    float r = radius();
-
-    // Create a random point on a standard capsule and then rotate to the global frame.
-
-    // Relative areas
-    float capRelArea  = sqrt(r) / 2.0f;
-    float sideRelArea = r * h;
-
-    float r1 = uniformRandom(0, capRelArea * 2 + sideRelArea);
-
-    if (r1 < capRelArea * 2) {
-
-        // Select a point uniformly at random on a sphere
-        N = Sphere(Vector3::zero(), 1).randomSurfacePoint();
-        p = N * r;
-        p.y += sign(p.y) * h / 2.0f;
-    } else {
-        // Side
-        float a = uniformRandom(0, (float)twoPi());
-        N.x = cos(a);
-        N.y = 0;
-        N.z = sin(a);
-        p.x = N.x * r;
-        p.z = N.y * r;
-        p.y = uniformRandom(-h / 2.0f, h / 2.0f);
-    }
-
-    // Transform to world space
-    CoordinateFrame cframe;
-    getReferenceFrame(cframe);
-    
-    p = cframe.pointToWorldSpace(p);
-    N = cframe.normalToWorldSpace(N);
-}
-
-
-void Capsule::getReferenceFrame(CoordinateFrame& cframe) const {
-    cframe.translation = center();
-
-    Vector3 Y = (p1 - p2).direction();
-    Vector3 X = (abs(Y.dot(Vector3::unitX())) > 0.9) ? Vector3::unitY() : Vector3::unitX();
-    Vector3 Z = X.cross(Y).direction();
-    X = Y.cross(Z);        
-    cframe.rotation.setColumn(0, X);
-    cframe.rotation.setColumn(1, Y);
-    cframe.rotation.setColumn(2, Z);
-}
-
-
-Vector3 Capsule::randomInteriorPoint() const {
-    float h = height();
-    float r = radius();
-
-    // Create a random point in a standard capsule and then rotate to the global frame.
-
-    Vector3 p;
-
-    float hemiVolume = pi() * (r*r*r) * 4 / 6.0;
-    float cylVolume = pi() * square(r) * h;
-    
-    float r1 = uniformRandom(0, 2.0 * hemiVolume + cylVolume);
-
-    if (r1 < 2.0 * hemiVolume) {
-
-        p = Sphere(Vector3::zero(), r).randomInteriorPoint();
-
-        p.y += sign(p.y) * h / 2.0f;
-
-    } else {
-
-        // Select a point uniformly at random on a disk
-        float a = uniformRandom(0, (float)twoPi());
-        float r2 = sqrt(uniformRandom(0, 1)) * r;
-
-        p = Vector3(cos(a) * r2,
-                    uniformRandom(-h / 2.0f, h / 2.0f),
-                    sin(a) * r2);
-    }
-
-    // Transform to world space
-    CoordinateFrame cframe;
-    getReferenceFrame(cframe);
-    
-    return cframe.pointToWorldSpace(p);
-}
-
-} // namespace
diff --git a/externals/g3dlite/G3D.lib/source/CollisionDetection.cpp b/externals/g3dlite/G3D.lib/source/CollisionDetection.cpp
deleted file mode 100644
index 16650bc1a96..00000000000
--- a/externals/g3dlite/G3D.lib/source/CollisionDetection.cpp
+++ /dev/null
@@ -1,2152 +0,0 @@
-/**
-  @file CollisionDetection.cpp
-  
-  @maintainer Morgan McGuire, matrix@graphics3d.com
-
-  @cite Bounce direction based on Paul Nettle's ftp://ftp.3dmaileffects.com/pub/FluidStudios/CollisionDetection/Fluid_Studios_Generic_Collision_Detection_for_Games_Using_Ellipsoids.pdf and comments by Max McGuire.  Ray-sphere code by Eric Haines.
-
-  @created 2001-11-24
-  @edited  2008-10-10
- */
-
-#include "G3D/CoordinateFrame.h"
-#include "G3D/platform.h"
-#include "G3D/CollisionDetection.h"
-#include "G3D/debugAssert.h"
-#include "G3D/vectorMath.h"
-#include "G3D/Capsule.h"
-#include "G3D/Plane.h"
-#include "G3D/Line.h"
-#include "G3D/LineSegment.h"
-#include "G3D/Sphere.h"
-#include "G3D/Box.h"
-#include "G3D/Triangle.h"
-#include "G3D/Vector3.h"
-#include "G3D/AABox.h"
-
-namespace G3D {
-
-bool CollisionDetection::ignoreBool;
-Vector3	CollisionDetection::ignore;
-Array CollisionDetection::ignoreArray;
-
-
-
-Vector3 CollisionDetection::separatingAxisForSolidBoxSolidBox(
-        const int separatingAxisIndex,
-        const Box & box1,
-        const Box & box2) {
-    debugAssert(separatingAxisIndex >= 0);
-    debugAssert(separatingAxisIndex < 15);
-    Vector3 axis;
-    if (separatingAxisIndex < 3) {
-        axis = box1.axis(separatingAxisIndex);
-    } else if (separatingAxisIndex < 6) {
-        axis = box2.axis(separatingAxisIndex - 3);
-    } else {
-        int box1Index = (separatingAxisIndex - 6) / 3;
-        int box2Index = (separatingAxisIndex - 6) % 3;
-        axis = cross(box1.axis(box1Index), box2.axis(box2Index));
-    }
-    return axis;
-}
-
-#ifdef _MSC_VER
-#   pragma warning (push)
-#   pragma warning (disable : 4244)
-#endif
-
-float CollisionDetection::projectedDistanceForSolidBoxSolidBox(
-    const int           separatingAxisIndex,
-    const Vector3 &     a,
-    const Vector3 &     b,
-    const Vector3 &     D,
-    const double*       c,
-    const double*       ca,
-    const double*       ad,
-    const double*       bd)
-{
-    (void)D;
-
-    float R0 = 0.0f;
-    float R1 = 0.0f;
-    float R = 0.0f;
-    switch (separatingAxisIndex) {
-    case 0:
-        // A0
-        R0 = a[0];
-        R1 = b[0] * ca[0] + b[1] * ca[1] + b[2] * ca[2];
-        R = fabs(ad[0]);
-        break;
-    case 1:
-        // A1
-        R0 = a[1];
-        R1 = b[0] * ca[3] + b[1] * ca[4] + b[2] * ca[5];
-        R = fabs(ad[1]);
-        break;
-    case 2:
-        // A2
-        R0 = a[2];
-        R1 = b[0] * ca[6] + b[1] * ca[7] + b[2] * ca[8];
-        R = fabs(ad[2]);
-        break;
-    case 3:
-        // B0
-        R0 = a[0] * ca[0] + a[1] * ca[3] + a[2] * ca[6];
-        R1 = b[0];
-        R = fabs(bd[0]);
-        break;
-    case 4:
-        // B1
-        R0 = a[0] * ca[1] + a[1] * ca[4] + a[2] * ca[7];
-        R1 = b[1];
-        R = fabs(bd[1]);
-        break;
-    case 5:
-        // B2
-        R0 = a[0] * ca[2] + a[1] * ca[5] + a[2] * ca[8];
-        R1 = b[2];
-        R = fabs(bd[2]);
-        break;
-    case 6:
-        // A0 x B0
-        R0 = a[1] * ca[6] + a[2] * ca[3];
-        R1 = b[1] * ca[2] + b[2] * ca[1];
-        R = fabs(c[3] * ad[2] - c[6] * ad[1]);
-        break;
-    case 7:
-        // A0 x B1
-        R0 = a[1] * ca[7] + a[2] * ca[4];
-        R1 = b[0] * ca[2] + b[2] * ca[0];
-        R = fabs(c[4] * ad[2] - c[7] * ad[1]);
-        break;
-    case 8:
-        // A0 x B2
-        R0 = a[1] * ca[8] + a[2] * ca[5];
-        R1 = b[0] * ca[1] + b[1] * ca[0];
-        R = fabs(c[5] * ad[2] - c[8] * ad[1]);
-        break;
-    case 9:
-        // A1 x B0
-        R0 = a[0] * ca[6] + a[2] * ca[0];
-        R1 = b[1] * ca[5] + b[2] * ca[4];
-        R = fabs(c[6] * ad[0] - c[0] * ad[2]);
-        break;
-    case 10:
-        // A1 x B1
-        R0 = a[0] * ca[7] + a[2] * ca[1];
-        R1 = b[0] * ca[5] + b[2] * ca[3];
-        R = fabs(c[7] * ad[0] - c[1] * ad[2]);
-        break;
-    case 11:
-        // A1 x B2
-        R0 = a[0] * ca[8] + a[2] * ca[2];
-        R1 = b[0] * ca[4] + b[1] * ca[3];
-        R = fabs(c[8] * ad[0] - c[2] * ad[2]);
-        break;
-    case 12:
-        // A2 x B0
-        R0 = a[0] * ca[3] + a[1] * ca[0];
-        R1 = b[1] * ca[8] + b[2] * ca[7];
-        R = fabs(c[0] * ad[1] - c[3] * ad[0]);
-        break;
-    case 13:
-        // A2 x B1
-        R0 = a[0] * ca[4] + a[1] * ca[1];
-        R1 = b[0] * ca[8] + b[2] * ca[6];
-        R = fabs(c[1] * ad[1] - c[4] * ad[0]);
-        break;
-    case 14:
-        // A2 x B2
-        R0 = a[0] * ca[5] + a[1] * ca[2];
-        R1 = b[0] * ca[7] + b[1] * ca[6];
-        R = fabs(c[2] * ad[1] - c[5] * ad[0]);
-        break;
-    default:
-        debugAssertM(false, "fell through switch statement");
-    }
-
-    return (R - (R0 + R1));
-}
-
-
-bool CollisionDetection::parallelAxisForSolidBoxSolidBox(
-        const double* ca,
-        const double epsilon,
-        int & axis1,
-        int & axis2) {
-    const double parallelDot = 1.0 - epsilon;
-    for (int i = 0; i < 9; i++) {
-        if (ca[i] >= parallelDot) {
-            axis1 = i / 3;
-            axis2 = i % 3;
-            return true;
-        }
-    }
-    return false;
-}
-
-
-
-
-void CollisionDetection::fillSolidBoxSolidBoxInfo(
-        const Box & box1,
-        const Box & box2,
-        Vector3 & a,
-        Vector3 & b,
-        Vector3 & D,
-        double* c,
-        double* ca,
-        double* ad,
-        double* bd) {
-    // length between center and each side of box1 and box2
-    a = box1.extent() * 0.5;
-    b = box2.extent() * 0.5;
-
-    // difference between centers of box1 and box2
-    D = box2.center() - box1.center();
-
-    // store the value of all possible dot products between the
-    // axes of box1 and box2, c_{row, col} in the Eberly paper
-    // corresponds to c[row * 3 + col] for this 9 element array.
-    //
-    // c[] holds signed values, ca[] hold absolute values
-    for (int i = 0; i < 9; i++) {
-        c[i] = dot(box1.axis(i / 3), box2.axis(i % 3));
-        ca[i] = fabs(c[i]);
-    }
-
-    // store all possible dot products between the axes of box1 and D,
-    // as well as the axes of box2 and D
-    for (int i = 0; i < 3; i++) {
-        ad[i] = dot(box1.axis(i), D);
-        bd[i] = dot(box2.axis(i), D);
-    }
-}
-
-
-
-bool CollisionDetection::conservativeBoxBoxTest(
-        const Vector3 & a, const Vector3 & b, const Vector3 & D) {
-    // do a quick bounding sphere test because it is relatively
-    // cheap, (three dot products, two sqrts, and a few others)
-    double boxRadius1 = a.magnitude();
-    double boxRadius2 = b.magnitude();
-    return (D.squaredMagnitude() < square(boxRadius1 + boxRadius2));
-}
-
-
-
-
-bool CollisionDetection::fixedSolidBoxIntersectsFixedSolidBox(
-    const Box&      box1,
-    const Box&      box2,
-	const int		lastSeparatingAxis) {
-    // for explanations of the variable please refer to the
-    // paper and fillSolidBoxSolidBoxInfo()
-    Vector3 a;
-    Vector3 b;
-    Vector3 D;
-    double c[9];
-    double ca[9];
-    double ad[3];
-    double bd[3];
-
-    fillSolidBoxSolidBoxInfo(box1, box2, a, b, D, c, ca, ad, bd);
-
-    int dummy1, dummy2;
-    bool parallelAxes = parallelAxisForSolidBoxSolidBox(ca, 0.00001,
-            dummy1, dummy2);
-
-    // check the separating axis from the last time step
-    if (lastSeparatingAxis != -1 &&
-            (lastSeparatingAxis < 6 || !parallelAxes)) {
-        double projectedDistance = projectedDistanceForSolidBoxSolidBox(
-                lastSeparatingAxis, a, b, D, c, ca, ad, bd);
-
-        // the separating axis from the last time step is still
-        // valid, the boxes do not intersect
-        if (projectedDistance > 0.0) {
-            return false;
-        }
-    }
-
-    // test if the boxes can be separated by a plane normal to
-    // any of the three axes of box1, any of the three axes of box2,
-    // or any of the 9 possible cross products of axes from box1
-    // and box2
-    for (int i = 0; i < 15; i++) {
-        // do not need to check edge-edge cases if any two of
-        // the axes are parallel
-        if (parallelAxes && i == 6) {
-            return true;
-        }
-
-        double projectedDistance =
-            projectedDistanceForSolidBoxSolidBox(i, a, b, D, c, ca, ad, bd);
-
-        // found a separating axis, the boxes do not intersect
-        if (projectedDistance > 0.0) {
-            return false;
-        }
-    }
-
-    return true;
-}
-
-
-
-void CollisionDetection::closestPointsBetweenLineAndLine(
-        const Line & line1,
-        const Line & line2,
-        Vector3 & closest1,
-        Vector3 & closest2) {
-    // TODO make accessors for Line that don't make a copy of data
-    Vector3 P0 = line1.point();
-    Vector3 u = line1.direction();
-    Vector3 Q0 = line2.point();
-    Vector3 v = line2.direction();
-    Vector3 w0 = P0 - Q0;
-
-    // a = 1.0, c = 1.0
-    double  b = dot(u, v);
-    double  d = dot(u, w0);
-    double  e = dot(v, w0);
-    double  D = 1.0 - b * b;
-    double  sc, tc;
-
-    static const double epsilon = 0.00001;
-
-    if (D < epsilon) {
-        // lines are parallel, choose P0 as one point, find the point
-        // on line2 that is closest to P0
-        sc = 0.0;
-        tc = (b > 1.0) ? (d / b) : (e / 1.0);
-    } else {
-        // lines are not parallel
-        sc = (b * e - 1.0 * d) / D;
-        tc = (1.0 * e - b * d) / D;
-    }
-
-    closest1 = P0 + (sc * u);
-    closest2 = Q0 + (tc * v);
-}
-
-
-
-float CollisionDetection::penetrationDepthForFixedBoxFixedBox(
-    const Box&      box1,
-    const Box&      box2,
-    Array& contactPoints,
-    Array& contactNormals,
-    const int lastSeparatingAxis) {
-
-    contactPoints.resize(0, DONT_SHRINK_UNDERLYING_ARRAY);
-    contactNormals.resize(0, DONT_SHRINK_UNDERLYING_ARRAY);
-
-    Vector3 a;
-    Vector3 b;
-    Vector3 D;
-    double c[9];
-    double ca[9];
-    double ad[3];
-    double bd[3];
-
-    debugAssert(lastSeparatingAxis >= -1);
-    debugAssert(lastSeparatingAxis < 15);
-
-    fillSolidBoxSolidBoxInfo(box1, box2, a, b, D, c, ca, ad, bd);
-
-    int axis1, axis2;
-    bool parallelAxes = parallelAxisForSolidBoxSolidBox(ca, 0.00001,
-            axis1, axis2);
-
-
-    // check the separating axis from the last time step
-    if (lastSeparatingAxis != -1 &&
-            (lastSeparatingAxis < 6 || !parallelAxes)) {
-        float projectedDistance = projectedDistanceForSolidBoxSolidBox(
-                lastSeparatingAxis, a, b, D, c, ca, ad, bd);
-
-        // the separating axis from the last time step is still
-        // valid, the boxes do not intersect
-        if (projectedDistance > 0.0) {
-            return -projectedDistance;
-        }
-    }
-
-    // test if the boxes can be separated by a plane normal to
-    // any of the three axes of box1, any of the three axes of box2,
-    // (test 9 possible cross products later)
-	float penetration = -(float)G3D::inf();
-    int penetrationAxisIndex = -1;
-
-    for (int i = 0; i < 6; i++) {
-        float projectedDistance =
-            projectedDistanceForSolidBoxSolidBox(i, a, b, D, c, ca, ad, bd);
-
-        // found a separating axis, the boxes do not intersect
-        if (projectedDistance > 0.0) {
-            return -projectedDistance;
-        }
-
-        // keep track of the axis that is least violated
-        if (projectedDistance > penetration) {
-            penetration = projectedDistance;
-            penetrationAxisIndex = i;
-        }
-    }
-
-
-    // for each edge-edge case we have to adjust the magnitude of
-    // penetration since we did not include the dot(L, L) denominator
-    // that can be smaller than 1.0 for the edge-edge cases.
-	if (!parallelAxes) {
-	    double edgeDistances[9];
-
-		// run through edge-edge cases to see if we can find a separating axis
-		for (int i = 6; i < 15; i++) {
-			float projectedDistance =
-				projectedDistanceForSolidBoxSolidBox(i, a, b, D, c, ca, ad, bd);
-
-			// found a separating axis, the boxes do not intersect,
-			// correct magnitude and return projected distance
-			if (projectedDistance > 0.0) {
-				Vector3 L = separatingAxisForSolidBoxSolidBox(i, box1, box2);
-				projectedDistance /= dot(L, L);
-				return -projectedDistance;
-			}
-
-			edgeDistances[i - 6] = projectedDistance;
-		}
-
-		// no separating axis found, the boxes do intersect,
-		// correct the magnitudes of the projectedDistance values
-		for (int i = 6; i < 15; i++) {
-			// find the negative penetration value with the smallest magnitude,
-			// the adjustment done for the edge-edge cases only increases
-			// magnitude by dividing by a number smaller than 1 and greater than 0
-			float projectedDistance = (float)edgeDistances[i - 6];
-			if (projectedDistance > penetration) {
-				Vector3 L = separatingAxisForSolidBoxSolidBox(i, box1, box2);
-				projectedDistance /= dot(L, L);
-				if (projectedDistance > penetration) {
-					penetration = projectedDistance;
-					penetrationAxisIndex = i;
-				}
-			}
-		}
-	}
-
-	// get final separating axis vector
-    Vector3 L = separatingAxisForSolidBoxSolidBox(penetrationAxisIndex,
-            box1, box2);
-
-    // set L to be the normal that faces away from box1
-    if (dot(L, D) < 0) {
-        L = -L;
-    }
-
-    Vector3 contactPoint;
-
-    if (penetrationAxisIndex < 6) {
-        // vertex to face collision, find deepest colliding vertex
-        const Box* vertexBox;
-        const Box* faceBox;
-        Vector3 faceNormal = L;
-
-        // L will be the outward facing normal for the faceBox
-        if (penetrationAxisIndex < 3) {
-            faceBox = & box1;
-            vertexBox = & box2;
-            if (dot(L, D) < 0) {
-                faceNormal = -L;
-            }
-        } else {
-            faceBox = & box2;
-            vertexBox = & box1;
-            if (dot(L, D) > 0) {
-                faceNormal = -L;
-            }
-        }
-
-        // find the vertex that is farthest away in the direction
-        // face normal direction
-        int deepestPointIndex = 0;
-        float deepestPointDot = dot(faceNormal, vertexBox->corner(0));
-        for (int i = 1; i < 8; i++) {
-            float dotProduct = dot(faceNormal, vertexBox->corner(i));
-            if (dotProduct < deepestPointDot) {
-                deepestPointDot = dotProduct;
-                deepestPointIndex = i;
-            }
-        }
-        
-        // return the point half way between the deepest point and the
-        // contacting face
-        contactPoint = vertexBox->corner(deepestPointIndex) +
-            (-penetration * 0.5 * faceNormal);
-    } else {
-        // edge-edge case, find the two ege lines
-        int edge1 = (penetrationAxisIndex - 6) / 3;
-        int edge2 = (penetrationAxisIndex - 6) % 3;
-        Vector3 linePoint1 = box1.center();
-        Vector3 linePoint2 = box2.center();
-        Vector3 lineDir1;
-        Vector3 lineDir2;
-
-        // find edge line by finding the edge axis, and the
-        // other two axes that are closest to the other box
-        for (int i = 0; i < 3; i++ ) {
-            if (i == edge1) {
-                lineDir1 = box1.axis(i);
-            } else {
-                Vector3 axis = box1.axis(i);
-                if (dot(axis, L) < 0) {
-                    axis = -axis;
-                }
-                linePoint1 += axis * a[i];
-            }
-
-            if (i == edge2) {
-                lineDir2 = box2.axis(i);
-            } else {
-                Vector3 axis = box2.axis(i);
-                if (dot(axis, L) > 0) {
-                    axis = -axis;
-                }
-                linePoint2 += axis * b[i];
-            }
-        }
-
-        // make lines from the two closest edges, and find
-        // the points that on each line that are closest to the other
-        Line line1 = Line::fromPointAndDirection(linePoint1, lineDir1);
-        Line line2 = Line::fromPointAndDirection(linePoint2, lineDir2);
-        Vector3 closest1;
-        Vector3 closest2;
-
-        closestPointsBetweenLineAndLine(line1, line2, closest1, closest2);
-        
-        // take the average of the two closest edge points for the final
-        // contact point
-        contactPoint = (closest1 + closest2) * 0.5;
-    }
-
-    contactPoints.push(contactPoint);
-    contactNormals.push(L);
-
-    return -penetration;
-
-}
-
-
-
-
-float CollisionDetection::penetrationDepthForFixedSphereFixedBox(
-    const Sphere&   sphere,
-    const Box&      box,
-    Array& contactPoints,
-    Array& contactNormals) {
-
-    contactPoints.resize(0, DONT_SHRINK_UNDERLYING_ARRAY);
-    contactNormals.resize(0, DONT_SHRINK_UNDERLYING_ARRAY);
-
-    // In its local coordinate frame, the box measures
-    // 2 * halfExtent[a] along dimesion a.
-    Vector3 halfExtent(box.extent(0), box.extent(1), box.extent(2));
-    halfExtent *= 0.5f;
-
-    CoordinateFrame boxFrame;
-    box.getLocalFrame(boxFrame);
-
-    // Transform the sphere to the box's coordinate frame.
-    Vector3 center = boxFrame.pointToObjectSpace(sphere.center);
-
-    // Find the square of the distance from the sphere to the box
-
-
-    // Distance along each axis from the closest side of the box
-    // to the sphere center.  Negative values are *inside* the box.
-    Vector3 distOutsideBox;
-
-    // Divide space up into the 27 regions corresponding
-    // to {+|-|0}X, {+|-|0}Y, {+|-|0}Z and classify the
-    // sphere center into one of them.
-    Vector3 centerRegion;
-
-    // In the edge collision case, the edge is between vertices
-    // (constant + variable) and (constant - variable).
-    Vector3 constant, variable;
-
-    int numNonZero = 0;
-
-    // Iterate over axes
-    for (int a = 0; a < 3; ++a) { 
-        // For each (box side), see which direction the sphere
-        // is outside the box (positive or negative).  Add the
-        // square of that distance to the total distance from 
-        // the box.
-
-        float distanceFromLow  = -halfExtent[a] - center[a];
-        float distanceFromHigh = center[a] - halfExtent[a];
-
-        if (fabsf(distanceFromLow) < fabsf(distanceFromHigh)) {
-            distOutsideBox[a] = distanceFromLow;
-        } else {
-            distOutsideBox[a] = distanceFromHigh;
-        }
-
-        if (distanceFromLow < 0.0) {
-            if (distanceFromHigh < 0.0) {
-                // Inside the box
-                centerRegion[a] = 0.0;
-                variable[a]     = 1.0;
-            } else {
-                // Off the high side
-                centerRegion[a] = 1.0;
-                constant[a]     = halfExtent[a];
-                ++numNonZero;
-            }
-        } else if (distanceFromHigh < 0.0) {
-            // Off the low side
-            centerRegion[a] = -1.0;
-            constant[a]     = -halfExtent[a];
-            ++numNonZero;
-        } else {
-            debugAssertM(false, 
-                "distanceFromLow and distanceFromHigh cannot both be positive");
-        }
-    }
-
-    // Squared distance between the outside of the box and the
-    // sphere center.
-    float d2 = Vector3::zero().max(distOutsideBox).squaredMagnitude();
-
-    if (d2 > square(sphere.radius)) {
-        // There is no penetration because the distance is greater
-        // than the radius of the sphere.  This is the common case
-        // and we quickly exit.
-        return -1;
-    }
-
-    // We know there is some penetration but need to classify it.
-    //
-    // Examine the region that contains the center of the sphere. If
-    // there is exactly one non-zero axis, the collision is with a 
-    // plane.  If there are exactly two non-zero axes, the collision
-    // is with an edge.  If all three axes are non-zero, the collision is
-    // with a vertex.  If there are no non-zero axes, the center is inside
-    // the box.
-
-    double depth = -1;
-    switch (numNonZero) {
-    case 3: // Vertex collision
-        // The collision point is the vertex at constant, the normal
-        // is the vector from there to the sphere center.
-        contactNormals.append(boxFrame.normalToWorldSpace(constant - center));
-        contactPoints.append(boxFrame.pointToWorldSpace(constant));
-        depth = sphere.radius - sqrt(d2);
-        break;
-
-    case 2: // Edge collision
-        {
-            // TODO: unwrapping the edge constructor and closest point
-            // code will probably make it faster.
-
-            // Determine the edge
-            Line line = Line::fromPointAndDirection(constant, variable);
-
-            // Penetration depth:
-            depth = sphere.radius - sqrt(d2);
-
-            // The contact point is the closes point to the sphere on the line 
-            Vector3 X = line.closestPoint(center);
-            contactNormals.append(boxFrame.normalToWorldSpace(X - center).direction());
-            contactPoints.append(boxFrame.pointToWorldSpace(X));
-        }
-        break;
-
-    case 1: // Plane collision
-        {
-            // The plane normal is the centerRegion vector,
-            // so the sphere normal is the negative.  Take
-            // it to world space from box-space.
-
-            // Center region doesn't need to be normalized because
-            // it is known to contain only one non-zero value
-            // and that value is +/- 1.
-            Vector3 N = boxFrame.normalToWorldSpace(-centerRegion);
-            contactNormals.append(N);
-
-            // Penetration depth:
-            depth = sphere.radius - sqrtf(d2);
-
-            // Compute the contact point from the penetration depth
-            contactPoints.append(sphere.center + N * (sphere.radius - depth));
-        }
-        break;
-
-    case 0: // Volume collision
-
-        // The sphere center is inside the box.  This is an easy case
-        // to handle.  Note that all axes of distOutsideBox must
-        // be negative.  
-    
-        // Arbitratily choose the sphere center as a contact point
-        contactPoints.append(sphere.center);
-
-        // Find the least-negative penetration axis.
-        //
-        // We could have computed this during the loop over the axes,
-        // but since volume collisions are rare (they only occur with
-        // large time steps), this case will seldom be executed and
-        // should not be optimized at the expense of the others.
-        if (distOutsideBox.x > distOutsideBox.y) {
-            if (distOutsideBox.x > distOutsideBox.z) {
-                // Smallest penetration on x-axis
-                // Chose normal based on which side we're closest to.
-                // Keep in mind that this is a normal to the sphere,
-                // so it is the inverse of the box normal.
-                if (center.x > 0) {
-                    contactNormals.append(boxFrame.normalToWorldSpace(-Vector3::unitX()));
-                } else {
-                    contactNormals.append(boxFrame.normalToWorldSpace(Vector3::unitX()));
-                }
-                depth = -distOutsideBox.x;
-            } else {
-                // Smallest penetration on z-axis
-                goto ZAXIS;
-            }
-        } else if (distOutsideBox.y > distOutsideBox.z) {
-            // Smallest penetration on y-axis
-            // Chose normal based on which side we're closest to.
-            // Keep in mind that this is a normal to the sphere,
-            // so it is the inverse of the box normal.
-            if (center.y > 0) {
-                contactNormals.append(boxFrame.normalToWorldSpace(-Vector3::unitY()));
-            } else {
-                contactNormals.append(boxFrame.normalToWorldSpace(Vector3::unitY()));
-            }
-            depth = -distOutsideBox.y;
-        } else {
-            // Smallest on z-axis
-ZAXIS:
-            // Chose normal based on which side we're closest to.
-            // Keep in mind that this is a normal to the sphere,
-            // so it is the inverse of the box normal.
-            if (center.z > 0) {
-                contactNormals.append(boxFrame.normalToWorldSpace(-Vector3::unitZ()));
-            } else {
-                contactNormals.append(boxFrame.normalToWorldSpace(Vector3::unitZ()));
-            }
-            depth = -distOutsideBox.z;
-        }
-        break;
-
-    default:
-        debugAssertM(false, "Fell through switch");
-        break;
-    }
-
-    return depth;
-}
-
-
-float CollisionDetection::penetrationDepthForFixedSphereFixedSphere(
-    const Sphere&           sphereA,
-    const Sphere&           sphereB,
-    Array&         contactPoints,
-    Array&         contactNormals) {
-
-    Vector3 axis = sphereB.center - sphereA.center;
-    double radius = sphereA.radius + sphereB.radius;
-    double mag = axis.magnitude();
-    axis /= mag;
-    double depth = -(mag - radius);
-
-    contactPoints.resize(0, DONT_SHRINK_UNDERLYING_ARRAY);
-    contactNormals.resize(0, DONT_SHRINK_UNDERLYING_ARRAY);
-
-    if (depth >= 0) {
-        contactPoints.append(sphereA.center + axis * (sphereA.radius - depth / 2));
-        contactNormals.append(axis);
-    }
-
-    return depth;
-}
-
-
-float CollisionDetection::penetrationDepthForFixedSphereFixedPlane(
-    const Sphere&           sphereA,
-    const Plane&            planeB,
-    Array&         contactPoints,
-    Array&         contactNormals) {
-
-    Vector3 N;
-    double d;
-
-    planeB.getEquation(N, d);
-    
-    double depth = -(sphereA.center.dot(N) + d - sphereA.radius);
-
-    contactPoints.resize(0, DONT_SHRINK_UNDERLYING_ARRAY);
-    contactNormals.resize(0, DONT_SHRINK_UNDERLYING_ARRAY);
-
-    if (depth >= 0) {
-        contactPoints.append(N * (depth - sphereA.radius) + sphereA.center);
-        contactNormals.append(N);
-    }
-
-    return depth;
-}
-
-
-float CollisionDetection::penetrationDepthForFixedBoxFixedPlane(
-    const Box&          box,
-    const Plane&        plane,
-    Array&     contactPoints,
-    Array&     contactNormals) {
-
-    Vector3 N;
-    double d;
-    
-    plane.getEquation(N, d);
-
-    contactPoints.resize(0, DONT_SHRINK_UNDERLYING_ARRAY);
-    contactNormals.resize(0, DONT_SHRINK_UNDERLYING_ARRAY);
-
-    float lowest = (float)inf();
-    for (int i = 0; i < 8; ++i) {
-        const Vector3 vertex = box.corner(i);
-        
-        float x = vertex.dot(N) + (float)d;
-        
-        if (x <= 0) {
-            // All vertices below the plane should be contact points.
-            contactPoints.append(vertex);
-            contactNormals.append(-N);
-        }
-
-        lowest = min(lowest, x);
-    }
-
-    // Depth should be a positive number
-    return -lowest;
-}
-
-
-float CollisionDetection::collisionTimeForMovingPointFixedPlane(
-    const Vector3&  point,
-    const Vector3&  velocity,
-    const Plane&    plane,
-    Vector3&        location,
-    Vector3&        outNormal) {
-
-    // Solve for the time at which normal.dot(point + velocity) + d == 0.
-    double d;
-    Vector3 normal;
-    plane.getEquation(normal, d);
-    
-    float vdotN = velocity.dot(normal);
-    float pdotN = point.dot(normal);
-
-    if (fuzzyEq(pdotN + d, 0)) {
-        // The point is *in* the plane.
-        location = point;
-        outNormal = normal;
-        return 0;
-    }
-
-    if (vdotN >= 0) {
-        // no collision will occur
-        location = Vector3::inf();
-        return (float)inf();
-    }
-
-    float t = -(pdotN + d) / vdotN;
-    if (t < 0) {
-        location = Vector3::inf();
-        return (float)inf();
-    } else {
-        location = point + velocity * t;
-        outNormal = normal;
-        return t;
-    }
-}
-
-
-float CollisionDetection::collisionTimeForMovingPointFixedSphere(
-    const Vector3&  point,
-    const Vector3&  velocity,
-    const Sphere&   sphere,
-    Vector3&        location,
-    Vector3&        outNormal) {
-
-    double  speed     = velocity.magnitude();
-    Vector3 direction = velocity / speed;
-
-    Vector3 L = sphere.center - point;
-    double d = L.dot(direction);
-
-    double L2 = L.dot(L);
-    double R2 = sphere.radius * sphere.radius;
-    double D2 = d * d;
-
-    if ((d < 0) && (L2 > R2)) {
-        location = Vector3::inf();
-        return inf();
-    }
-
-    double M2 = L2 - D2;
-
-    if (M2 > R2) {
-        location = Vector3::inf();
-        return inf();
-    }
-
-    double q = sqrt(R2 - M2);
-    double time;
-
-    if (L2 > R2) {
-        time = d - q;
-    } else {
-        time = d + q;
-    }
-
-    time /= speed;
-
-    location  = point + velocity * time;
-    outNormal = (location - sphere.center).direction();
-
-    return time;
-}
-
-
-float CollisionDetection::collisionTimeForMovingSphereFixedSphere(
-    const Sphere&   movingSphere,
-    const Vector3&  velocity,
-    const Sphere&   fixedSphere,
-    Vector3&        location,
-    Vector3&        outNormal) {
-
-    double time = collisionTimeForMovingPointFixedSphere(movingSphere.center, velocity, Sphere(fixedSphere.center, fixedSphere.radius + movingSphere.radius), location, outNormal);
-
-    if (time < inf()) {
-        // Location is now the center of the moving sphere at the collision time.
-        // Adjust for the size of the moving sphere.  Two spheres always collide
-        // along a line between their centers.
-        location += (location - fixedSphere.center) * movingSphere.radius / fixedSphere.radius;
-    }
-
-    return time;
-}
-
-
-/*
-float CollisionDetection::collisionTimeForMovingPointFixedTriangle(
-    const Vector3&			point,
-    const Vector3&			velocity,
-    const Triangle&       triangle,
-    Vector3&				outLocation,
-    Vector3&                outNormal) {
-
-    double time = collisionTimeForMovingPointFixedPlane(point, velocity, triangle.plane(), outLocation, outNormal);
-
-    if (time == inf()) {
-        // No collision with the plane of the triangle.
-        return inf();
-    }
-
-    if (isPointInsideTriangle(triangle.vertex(0), triangle.vertex(1), triangle.vertex(2), triangle.normal(), outLocation, triangle.primaryAxis())) {
-        // Collision occured inside the triangle
-        return time;
-    } else {
-        // Missed the triangle
-        outLocation = Vector3::inf();
-        return inf();
-    }
-}*/
-
-/*
-float CollisionDetection::collisionTimeForMovingPointFixedTriangle(
-    const Vector3& orig,
-    const Vector3& dir,
-    const Vector3& vert0,
-    const Vector3& vert1,
-    const Vector3& vert2) {
-
-    // Barycenteric coords
-    double u, v;
-    #define EPSILON 0.000001
-    #define CROSS(dest,v1,v2) \
-              dest[0]=v1[1]*v2[2]-v1[2]*v2[1]; \
-              dest[1]=v1[2]*v2[0]-v1[0]*v2[2]; \
-              dest[2]=v1[0]*v2[1]-v1[1]*v2[0];
-
-    #define DOT(v1,v2) (v1[0]*v2[0]+v1[1]*v2[1]+v1[2]*v2[2])
-
-    #define SUB(dest,v1,v2) \
-              dest[0]=v1[0]-v2[0]; \
-              dest[1]=v1[1]-v2[1]; \
-              dest[2]=v1[2]-v2[2]; 
-
-    double edge1[3], edge2[3], tvec[3], pvec[3], qvec[3];
-    
-    // find vectors for two edges sharing vert0
-    SUB(edge1, vert1, vert0);
-    SUB(edge2, vert2, vert0);
-    
-    // begin calculating determinant - also used to calculate U parameter
-    CROSS(pvec, dir, edge2);
-    
-    // if determinant is near zero, ray lies in plane of triangle
-    const double det = DOT(edge1, pvec);
-    
-    if (det < EPSILON) {
-        return inf();
-    }
-    
-    // calculate distance from vert0 to ray origin
-    SUB(tvec, orig, vert0);
-    
-    // calculate U parameter and test bounds
-    u = DOT(tvec, pvec);
-    if ((u < 0.0) || (u > det)) {
-        // Hit the plane outside the triangle
-        return inf();
-    }
-    
-    // prepare to test V parameter
-    CROSS(qvec, tvec, edge1);
-    
-    // calculate V parameter and test bounds
-    v = DOT(dir, qvec);
-    if ((v < 0.0) || (u + v > det)) {
-        // Hit the plane outside the triangle
-        return inf();
-    }
-    
-    // calculate t, scale parameters, ray intersects triangle
-    // If we want u,v, we can compute this
-    // double t = DOT(edge2, qvec);
-    //const double inv_det = 1.0 / det;
-    //t *= inv_det;
-    //u *= inv_det;
-    //v *= inv_det;
-    // return t;
-
-    // Case where we don't need correct (u, v):
-
-    const double t = DOT(edge2, qvec);
-    
-    if (t >= 0) {
-        // Note that det must be positive
-        return t / det;
-    } else {
-        // We had to travel backwards in time to intersect
-        return inf();
-    }
-
-    #undef EPSILON
-    #undef CROSS
-    #undef DOT
-    #undef SUB
-}
-*/
-
-float CollisionDetection::collisionTimeForMovingPointFixedBox(
-    const Vector3&          point,
-    const Vector3&          velocity,
-    const Box&              box,
-    Vector3&                location,
-    Vector3&                outNormal) {
-
-    double    bestTime;
-
-    Vector3 normal;
-    Vector3 v[4];
-
-    // Prime the loop
-    int f = 0;
-    box.getFaceCorners(f, v[0], v[1], v[2], v[3]);
-    bestTime = collisionTimeForMovingPointFixedRectangle(point, velocity, v[0], v[1], v[2], v[3], location, normal);
-    outNormal = normal;
-
-    // Check other faces
-    for (f = 1; f < 6; ++f) {
-        Vector3 pos;
-        box.getFaceCorners(f, v[0], v[1], v[2], v[3]);
-        float time = collisionTimeForMovingPointFixedRectangle(point, velocity, v[0], v[1], v[2], v[3], pos, normal);
-        if (time < bestTime) {
-            bestTime = time;
-            outNormal = normal;
-            location = pos;
-        }
-    }
-
-    return bestTime;
-}
-
-
-float CollisionDetection::collisionTimeForMovingPointFixedAABox(
-    const Vector3&          origin,
-    const Vector3&          dir,
-    const AABox&            box,
-    Vector3&                location,
-    bool&                   Inside,
-    Vector3&                normal) {
-
-    if (collisionLocationForMovingPointFixedAABox(origin, dir, box, location, Inside, normal)) {
-        return (location - origin).magnitude();
-    } else {
-        return (float)inf();
-    }
-}
-
-
-bool CollisionDetection::collisionLocationForMovingPointFixedAABox(
-    const Vector3&          origin,
-    const Vector3&          dir,
-    const AABox&            box,
-    Vector3&                location,
-    bool&                   Inside,
-    Vector3&                normal) {
-
-    // Integer representation of a floating-point value.
-    #define IR(x)	((uint32&)x)
-
-    Inside = true;
-	const Vector3& MinB = box.low();
-	const Vector3& MaxB = box.high();
-	Vector3 MaxT(-1.0f, -1.0f, -1.0f);
-
-	// Find candidate planes.
-    for (int i = 0; i < 3; ++i) {
-		if (origin[i] < MinB[i]) {
-			location[i]	= MinB[i];
-			Inside      = false;
-
-			// Calculate T distances to candidate planes
-            if (IR(dir[i])) {
-                MaxT[i] = (MinB[i] - origin[i]) / dir[i];
-            }
-        } else if (origin[i] > MaxB[i]) {
-			location[i]	= MaxB[i];
-			Inside	    = false;
-
-			// Calculate T distances to candidate planes
-            if (IR(dir[i])) {
-                MaxT[i] = (MaxB[i] - origin[i]) / dir[i];
-            }
-		}
-	}
-
-	if (Inside) {
-    	// Ray origin inside bounding box
-        location = origin;
-		return false;
-	}
-
-	// Get largest of the maxT's for final choice of intersection
-	int WhichPlane = 0;
-    if (MaxT[1] > MaxT[WhichPlane])	{
-        WhichPlane = 1;
-    }
-
-    if (MaxT[2] > MaxT[WhichPlane])	{
-        WhichPlane = 2;
-    }
-
-	// Check final candidate actually inside box
-    if (IR(MaxT[WhichPlane]) & 0x80000000) {
-        // Miss the box
-        return false;
-    }
-
-	for (int i = 0; i < 3; ++i) {
-        if (i != WhichPlane) {
-			location[i] = origin[i] + MaxT[WhichPlane] * dir[i];
-            if ((location[i] < MinB[i]) ||
-                (location[i] > MaxB[i])) {
-                // On this plane we're outside the box extents, so
-                // we miss the box
-                return false;
-            }
-		}
-	}
-
-    // Choose the normal to be the plane normal facing into the ray
-    normal = Vector3::zero();
-    normal[WhichPlane] = (dir[WhichPlane] > 0) ? -1.0 : 1.0;
-
-	return true;
-
-    #undef IR
-}
-
-
-
-float CollisionDetection::collisionTimeForMovingPointFixedRectangle(
-    const Vector3&      point,
-    const Vector3&      velocity,
-    const Vector3&      v0,
-    const Vector3&      v1,
-    const Vector3&      v2,
-    const Vector3&      v3,
-    Vector3&            location,
-    Vector3&            outNormal) {
-
-    Plane plane = Plane(v0, v1, v2);
-
-    float time = collisionTimeForMovingPointFixedPlane(point, velocity, plane, location, outNormal);
-
-    if (time == inf()) {
-        // No collision is ever going to happen
-        return time;
-    }
-
-    if (isPointInsideRectangle(v0, v1, v2, v3, plane.normal(), location)) {
-        // The intersection point is inside the rectangle; that is the location where
-        // the point hits the rectangle.
-        return time;
-    } else {
-        return inf();
-    }
-}
-
-/** Used by findRayCapsuleIntersection.
-    @cite From magic software http://www.magic-software.com/Source/Intersection3D/MgcIntr3DLinCap.cpp */
-static int findRayCapsuleIntersectionAux(
-	const Vector3&		rkOrigin,
-	const Vector3&		rkDirection,
-    const Capsule&		rkCapsule,
-	double   			afT[2]) {
-
-	Vector3 capsuleDirection = rkCapsule.point(1) - rkCapsule.point(0);
-
-    // set up quadratic Q(t) = a*t^2 + 2*b*t + c
-    Vector3 kU, kV, kW = capsuleDirection;
-    float fWLength = kW.unitize();
-    Vector3::generateOrthonormalBasis(kU, kV, kW);
-    Vector3 kD(kU.dot(rkDirection), kV.dot(rkDirection), kW.dot(rkDirection));
-    float fDLength = kD.unitize();
-
-    float fEpsilon = 1e-6f;
-
-    float fInvDLength = 1.0f/fDLength;
-    Vector3 kDiff = rkOrigin - rkCapsule.point(0);
-    Vector3 kP(kU.dot(kDiff),kV.dot(kDiff),kW.dot(kDiff));
-    float fRadiusSqr = square(rkCapsule.radius());
-
-    float fInv, fA, fB, fC, fDiscr, fRoot, fT, fTmp;
-
-    // Is the velocity parallel to the capsule direction? (or zero)
-    if ((abs(kD.z) >= 1.0f - fEpsilon) || (fDLength < fEpsilon)) {
-
-        float fAxisDir = rkDirection.dot(capsuleDirection);
-
-        fDiscr = fRadiusSqr - kP.x*kP.x - kP.y*kP.y;
-        if ((fAxisDir < 0) && (fDiscr >= 0.0f)) {
-            // Velocity anti-parallel to the capsule direction
-            fRoot = sqrt(fDiscr);
-            afT[0] = (kP.z + fRoot)*fInvDLength;
-            afT[1] = -(fWLength - kP.z + fRoot)*fInvDLength;
-            return 2;
-        } else if ((fAxisDir > 0) && (fDiscr >= 0.0f)) {
-            // Velocity parallel to the capsule direction
-            fRoot = sqrt(fDiscr);
-            afT[0] = -(kP.z + fRoot)*fInvDLength;
-            afT[1] = (fWLength - kP.z + fRoot)*fInvDLength;
-            return 2;
-        } else {
-            // sphere heading wrong direction, or no velocity at all
-            return 0;
-        }   
-    }
-
-    // test intersection with infinite cylinder
-    fA = kD.x*kD.x + kD.y*kD.y;
-    fB = kP.x*kD.x + kP.y*kD.y;
-    fC = kP.x*kP.x + kP.y*kP.y - fRadiusSqr;
-    fDiscr = fB*fB - fA*fC;
-    if (fDiscr < 0.0f) {
-        // line does not intersect infinite cylinder
-        return 0;
-    }
-
-    int iQuantity = 0;
-
-    if (fDiscr > 0.0f) {
-        // line intersects infinite cylinder in two places
-        fRoot = sqrt(fDiscr);
-        fInv = 1.0f/fA;
-        fT = (-fB - fRoot)*fInv;
-        fTmp = kP.z + fT*kD.z;
-        if ((0.0f <= fTmp) && (fTmp <= fWLength)) {
-            afT[iQuantity] = fT * fInvDLength;
-            iQuantity++;
-		}
-
-        fT = (-fB + fRoot)*fInv;
-        fTmp = kP.z + fT*kD.z;
-        
-		if ((0.0f <= fTmp) && (fTmp <= fWLength)) {
-            afT[iQuantity++] = fT*fInvDLength;
-		}
-
-        if (iQuantity == 2) {
-            // line intersects capsule wall in two places
-            return 2;
-        }
-    } else {
-        // line is tangent to infinite cylinder
-        fT = -fB/fA;
-        fTmp = kP.z + fT*kD.z;
-        if ((0.0f <= fTmp) && (fTmp <= fWLength)) {
-            afT[0] = fT*fInvDLength;
-            return 1;
-        }
-    }
-
-    // test intersection with bottom hemisphere
-    // fA = 1
-    fB += kP.z*kD.z;
-    fC += kP.z*kP.z;
-    fDiscr = fB*fB - fC;
-    if (fDiscr > 0.0f) {
-        fRoot = sqrt(fDiscr);
-        fT = -fB - fRoot;
-        fTmp = kP.z + fT*kD.z;
-        if (fTmp <= 0.0f) {
-            afT[iQuantity++] = fT*fInvDLength;
-            if (iQuantity == 2) {
-                return 2;
-			}
-        }
-
-        fT = -fB + fRoot;
-        fTmp = kP.z + fT*kD.z;
-        if (fTmp <= 0.0f) {
-            afT[iQuantity++] = fT*fInvDLength;
-            if (iQuantity == 2) {
-                return 2;
-			}
-        }
-    } else if (fDiscr == 0.0f) {
-        fT = -fB;
-        fTmp = kP.z + fT*kD.z;
-        if (fTmp <= 0.0f) {
-            afT[iQuantity++] = fT*fInvDLength;
-            if (iQuantity == 2) {
-                return 2;
-			}
-        }
-    }
-
-    // test intersection with top hemisphere
-    // fA = 1
-    fB -= kD.z*fWLength;
-    fC += fWLength*(fWLength - 2.0f*kP.z);
-
-    fDiscr = fB*fB - fC;
-    if (fDiscr > 0.0f) {
-        fRoot = sqrt(fDiscr);
-        fT = -fB - fRoot;
-        fTmp = kP.z + fT*kD.z;
-        if (fTmp >= fWLength) {
-            afT[iQuantity++] = fT*fInvDLength;
-            if (iQuantity == 2) {
-                return 2;
-			}
-        }
-
-        fT = -fB + fRoot;
-        fTmp = kP.z + fT*kD.z;
-        if (fTmp >= fWLength) {
-            afT[iQuantity++] = fT*fInvDLength;
-            if (iQuantity == 2) {
-                return 2;
-			}
-        }
-    } else if (fDiscr == 0.0f) {
-        fT = -fB;
-        fTmp = kP.z + fT*kD.z;
-        if (fTmp >= fWLength) {
-            afT[iQuantity++] = fT*fInvDLength;
-            if (iQuantity == 2) {
-                return 2;
-			}
-        }
-    }
-
-    return iQuantity;
-}
-
-
-/** Used by collisionTimeForMovingPointFixedCapsule.
-    @cite From magic software http://www.magic-software.com/Source/Intersection3D/MgcIntr3DLinCap.cpp
-	
-	@param rkRay      The ray
-	@param rkCapsule  The capsule
-	@param riQuantity The number of intersections found
-	@param akPoint    The intersections found
-	@return           True if there is at least one intersection
-	*/
-static bool findRayCapsuleIntersection(
-	const Ray&			rkRay,
-	const Capsule&		rkCapsule,
-	int&				riQuantity,
-	Vector3				akPoint[2]) {
-
-    double afT[2];
-    riQuantity = findRayCapsuleIntersectionAux(rkRay.origin, rkRay.direction, rkCapsule, afT);
-
-    // Only return intersections that occur in the future
-    int iClipQuantity = 0;
-	int i;
-    for (i = 0; i < riQuantity; i++) {
-        if (afT[i] >= 0.0f) {
-            akPoint[iClipQuantity] = rkRay.origin + afT[i] * rkRay.direction;
-            iClipQuantity++;
-        }
-    }
-
-    riQuantity = iClipQuantity;
-    return (riQuantity > 0);
-}
-
-float CollisionDetection::collisionTimeForMovingPointFixedCapsule(
-	const Vector3&		_point,
-	const Vector3&		velocity,
-	const Capsule&		capsule,
-	Vector3&		    location,
-    Vector3&            outNormal) {
-
-	float timeScale = velocity.magnitude();
-
-    if (timeScale == 0.0f) {
-        timeScale = 1;
-    }
-
-	Vector3 direction = velocity / timeScale;
-	int numIntersections;
-	Vector3 intersection[2];
-	findRayCapsuleIntersection(Ray::fromOriginAndDirection(_point, direction), capsule, numIntersections, intersection);
-
-	if (numIntersections == 2) {
-		// A collision can only occur if there are two intersections.  If there is one
-		// intersection, that one is exiting the capsule.  
-
-		// Find the entering intersection (the first one that occurs).
-		float d0 = (intersection[0] - _point).squaredMagnitude();
-		float d1 = (intersection[1] - _point).squaredMagnitude();
-
-        // Compute the surface normal (if we aren't ignoring the result)
-        if (&outNormal != &ignore) {
-            Vector3 p2 = LineSegment::fromTwoPoints(capsule.point(0), capsule.point(1)).closestPoint(_point);
-            outNormal = (_point - p2).direction();
-        }
-
-        if (d0 > d1) {
-			location = intersection[1];
-			return sqrt(d1) / timeScale;
-		} else {
-			location = intersection[0];
-			return sqrt(d0) / timeScale;
-		}
-	} else {
-		// No entering intersection discovered; return no intersection.
-		location = Vector3::inf();
-		return inf();
-	}
-}
-
-
-float CollisionDetection::collisionTimeForMovingSphereFixedPlane(
-    const Sphere&		sphere,
-    const Vector3&		velocity,
-    const Plane&		plane,
-    Vector3&			location,
-    Vector3&            outNormal) {
-
-	if (sphere.radius == 0) {
-		// Optimization for zero radius sphere
-        return collisionTimeForMovingPointFixedPlane(sphere.center, velocity, plane, location, outNormal);
-	}
-
-    // The collision point on the sphere will be the point at
-    // center - (radius * normal).  Collisions only occur when
-    // the sphere is travelling into the plane.
-
-    double d;
-    plane.getEquation(outNormal, d);
-    
-    double vdotN = velocity.dot(outNormal);
-
-    if (fuzzyGt(vdotN, 0)) {
-        // No collision when the sphere is moving towards a backface.
-        location = Vector3::inf();
-        return (float)inf();
-    }
-
-    float cdotN = sphere.center.dot(outNormal);
-
-    // Distance from the center to the plane
-    float distance = cdotN + (float)d;
-
-    // Where is the collision on the sphere?
-    Vector3 point = sphere.center - (sphere.radius * outNormal);
-
-    if (fuzzyLe(G3D::abs(distance), sphere.radius)) {
-        // Already interpenetrating
-        location = sphere.center - distance * outNormal;
-        return 0;
-    } else {
-        return collisionTimeForMovingPointFixedPlane(point, velocity, plane, location, outNormal);
-    }
-
-}
-
-
-float CollisionDetection::collisionTimeForMovingSphereFixedTriangle(
-    const class Sphere&		sphere,
-    const Vector3&              velocity,
-    const Triangle&             triangle,
-    Vector3&                    outLocation,
-    float                       b[3]) {
-
-    Vector3 dummy;
-    float time = collisionTimeForMovingSphereFixedPlane(sphere, velocity, triangle.plane(), 
-                                                        outLocation, dummy);
-
-    if (time == inf()) {
-        // No collision is ever going to happen
-        return time;
-    }
-
-    // We will hit the plane of the triangle at *time*. See if
-    // the intersection point actually is within the triangle.
-
-    if (isPointInsideTriangle(triangle.vertex(0), triangle.vertex(1), triangle.vertex(2), triangle.normal(), 
-        outLocation, b, triangle.primaryAxis())) {
-
-        // The intersection point is inside the triangle; that is the location where
-        // the sphere hits the triangle.
-
-#       ifdef G3D_DEBUG
-        {
-            // Internal consistency checks
-            debugAssertM(b[0] >= 0.0 && b[0] <= 1.0f, "Intersection is outside triangle.");
-            debugAssertM(b[1] >= 0.0 && b[1] <= 1.0f, "Intersection is outside triangle.");
-            debugAssertM(b[2] >= 0.0 && b[2] <= 1.0f, "Intersection is outside triangle.");
-            Vector3 blend = 
-                b[0] * triangle.vertex(0) + 
-                b[1] * triangle.vertex(1) + 
-                b[2] * triangle.vertex(2);
-            debugAssertM(blend.fuzzyEq(outLocation), "Barycentric coords don't match intersection.");
-            // Call again so that we can debug the problem
-            // isPointInsideTriangle(triangle.vertex(0), triangle.vertex(1), triangle.vertex(2), triangle.normal(), 
-            // outLocation, b, triangle.primaryAxis());
-        }
-#       endif
-
-        return time;
-    }
-
-    // The collision (if it exists) is with a point on the triangle perimeter.
-    // Switch over to moving the triangle towards a fixed sphere and see at what time
-    // they will hit.
-
-    // Closest point on the triangle to the sphere intersection with the plane.
-    int edgeIndex;
-    const Vector3& point = closestPointOnTrianglePerimeter(triangle._vertex, triangle.edgeDirection,
-                                                           triangle.edgeMagnitude, outLocation, edgeIndex);
-
-    float t = 0;
-    if (! sphere.contains(point)) {
-        // The point is outside the sphere--see when it will hit
-        t = collisionTimeForMovingPointFixedSphere(point, -velocity, sphere, dummy, dummy);
-    }
-
-    if (t < inf()) {
-        outLocation = point;
-        // Compute Barycentric coords
-
-        // Index of the next vertex
-        static const int next[] = {1, 2, 0};
-
-        // Project along the edge in question.
-        // Avoid sqrt by taking advantage of the existing edgeDirection unit vector.
-        b[next[edgeIndex]] = (outLocation - triangle._vertex[edgeIndex]).dot
-            (triangle.edgeDirection[edgeIndex]) / triangle.edgeMagnitude[edgeIndex];
-
-        b[edgeIndex] = 1.0f - b[next[edgeIndex]];
-
-        b[next[next[edgeIndex]]] = 0.0f;
-
-#       ifdef G3D_DEBUG
-        {
-            // Internal consistency checks
-            for (int i = 0; i < 3; ++i) {
-                debugAssertM(fuzzyGe(b[i], 0.0f) && fuzzyLe(b[i], 1.0f), "Intersection is outside triangle.");
-            }
-            Vector3 blend = 
-                b[0] * triangle.vertex(0) + 
-                b[1] * triangle.vertex(1) + 
-                b[2] * triangle.vertex(2);
-            debugAssertM(blend.fuzzyEq(outLocation), 
-                format("Barycentric coords don't match intersection. %s != %s", 
-                    blend.toString().c_str(), 
-                    outLocation.toString().c_str()));    
-
-            // Call again so that we can debug the problem
-            collisionTimeForMovingPointFixedSphere(point, -velocity, sphere, dummy, dummy);
-        }
-#       endif
-
-        // Due to tiny roundoffs, these values might be slightly out of bounds.
-        // Ensure that they are legal.  Note that the above debugging code
-        // verifies that we are not clamping truly illegal values.
-        for (int i = 0; i < 3; ++i) {
-            b[i] = clamp(b[i], 0.0f, 1.0f);
-        }
-    }
-
-    // The collision occured at the point, if it occured.  The normal
-    // was the plane normal, computed above.
-
-    return t;
-}
-
-
-float CollisionDetection::collisionTimeForMovingSphereFixedRectangle(
-    const Sphere&       sphere,
-    const Vector3&      velocity,
-    const Vector3&      v0,
-    const Vector3&      v1,
-    const Vector3&      v2,
-    const Vector3&      v3,
-    Vector3&            location,
-    Vector3&            outNormal) {
-
-    Plane plane(v0, v1, v2);
-
-    float time = collisionTimeForMovingSphereFixedPlane(sphere, velocity, plane, location, outNormal);
-
-    if (time == inf()) {
-        // No collision is ever going to happen
-        return time;
-    }
-
-    if (isPointInsideRectangle(v0, v1, v2, v3, plane.normal(), location)) {
-        // The intersection point is inside the rectangle; that is the location where
-        // the sphere hits the rectangle.
-        return time;
-    }
-
-    // Switch over to moving the rectangle towards a fixed sphere and see at what time
-    // they will hit.
-
-    Vector3 point = closestPointToRectanglePerimeter(v0, v1, v2, v3, sphere.center);
-
-    Vector3 dummy;
-    double t = collisionTimeForMovingPointFixedSphere(point, -velocity, sphere, location, dummy);
-
-    // Normal is the plane normal, location is the original location of the point.
-    location = point;
-
-    return t;
-}
-
-
-float CollisionDetection::collisionTimeForMovingSphereFixedBox(
-    const Sphere&       sphere,
-    const Vector3&      velocity,
-    const Box&          box,
-    Vector3&            location,
-    Vector3&            outNormal) {
-
-    if (fixedSolidSphereIntersectsFixedSolidBox(sphere, box)) {
-        // TODO: Compute more useful location and normal?
-        location = sphere.center;
-        outNormal = Vector3::zero();
-        return 0;
-    }
-
-    float bestTime;
-
-    Vector3 v[4];
-    int f = 0;
-    box.getFaceCorners(f, v[0], v[1], v[2], v[3]);
-    bestTime = collisionTimeForMovingSphereFixedRectangle(sphere, velocity, v[0], v[1], v[2], v[3], location, outNormal);
-
-    for (f = 1; f < 6; ++f) {
-        Vector3 pos, normal;
-        box.getFaceCorners(f, v[0], v[1], v[2], v[3]);
-        float time = collisionTimeForMovingSphereFixedRectangle(sphere, velocity, v[0], v[1], v[2], v[3], pos, normal);
-        if (time < bestTime) {
-            bestTime  = time;
-            location  = pos;
-            outNormal = normal;
-        }
-    }
-
-    return bestTime;
-}
-
-
-float CollisionDetection::collisionTimeForMovingSphereFixedCapsule(
-	const Sphere&		sphere,
-	const Vector3&		velocity,
-	const Capsule&		capsule,
-	Vector3&		    location,
-    Vector3&            outNormal) {
-
-    (void)outNormal;
-
-	Capsule _capsule(capsule.point(0), capsule.point(1), capsule.radius() + sphere.radius);
-
-    Vector3 normal;
-	double time = collisionTimeForMovingPointFixedCapsule(sphere.center, velocity, _capsule, location, normal);
-    
-    if (time < inf()) {
-        // Location is now the position of the center of the sphere at the time of collision.
-        // We have to adjust the collision location for the size of the sphere.
-        location -= sphere.radius * normal;
-    }
-
-    return time;
-}
-
-
-Vector3 CollisionDetection::bounceDirection(
-    const Sphere&   sphere,
-    const Vector3&  velocity,
-    const float     collisionTime,
-    const Vector3&  collisionLocation,
-    const Vector3&  collisionNormal) {
-
-	// Location when the collision occurs
-    Vector3 sphereLocation  = sphere.center + velocity * collisionTime;
-
-    Vector3 normal          = (sphereLocation - collisionLocation);
-    if (fuzzyEq(normal.squaredMagnitude(), 0)) {
-        normal = collisionNormal;
-    } else {
-        normal.unitize();
-    }
-
-    Vector3 direction       = velocity.direction();
-
-    // Reflect direction about the normal
-    return direction - 2.0 * normal * normal.dot(direction);
-}
-
-
-Vector3 CollisionDetection::slideDirection(
-    const Sphere&   sphere,
-    const Vector3&  velocity,
-    const float     collisionTime,
-    const Vector3&  collisionLocation) {
-
-    Vector3 sphereLocation  = sphere.center + velocity * collisionTime;
-    Vector3 normal          = (sphereLocation - collisionLocation).direction();
-    Vector3 direction       = velocity.direction();
-
-    // subtract off the part in the direction away from the normal.
-    return direction - normal * normal.dot(direction);
-}
-
-
-Vector3 CollisionDetection::closestPointOnLineSegment(
-    const Vector3& v0,
-    const Vector3& v1,
-    const Vector3& point) {
-
-    const Vector3& edge       = (v1 - v0);
-    float          edgeLength = edge.magnitude();
-
-    if (edgeLength == 0) {
-        // The line segment is a point
-        return v0;
-    }
-
-    return closestPointOnLineSegment(v0, v1, edge / edgeLength, edgeLength, point);
-}
-
-
-Vector3 CollisionDetection::closestPointOnLineSegment(
-    const Vector3& v0,
-    const Vector3& v1,
-    const Vector3& edgeDirection,
-    const float    edgeLength,
-    const Vector3& point) {
-
-    debugAssert((v1 - v0).direction().fuzzyEq(edgeDirection));
-    debugAssert(fuzzyEq((v1 - v0).magnitude(), edgeLength));
-
-    // Vector towards the point
-    const Vector3& c = point - v0;
-
-    // Projected onto the edge itself
-    float t = edgeDirection.dot(c);
-
-    if (t <= 0) {
-        // Before the start
-        return v0;
-    } else if (t >= edgeLength) {
-        // After the end
-        return v1;
-    } else {
-        // At distance t along the edge
-        return v0 + edgeDirection * t;
-    }
-}
-
-
-Vector3 CollisionDetection::closestPointOnTrianglePerimeter(
-    const Vector3&			v0, 
-    const Vector3&			v1,
-    const Vector3&			v2,
-    const Vector3&			point) {
-    
-    Vector3 v[3] = {v0, v1, v2};
-    Vector3 edgeDirection[3] = {(v1 - v0), (v2 - v1), (v0 - v2)};
-    float   edgeLength[3];
-    
-    for (int i = 0; i < 3; ++i) {
-        edgeLength[i] = edgeDirection[i].magnitude();
-        edgeDirection[i] /= edgeLength[i];
-    }
-
-    int edgeIndex;
-    return closestPointOnTrianglePerimeter(v, edgeDirection, edgeLength, point, edgeIndex);
-}
-
-
-Vector3 CollisionDetection::closestPointOnTrianglePerimeter(
-    const Vector3   v[3],
-    const Vector3   edgeDirection[3],
-    const float     edgeLength[3],
-    const Vector3&  point,
-    int&            edgeIndex) {
-
-    // Closest point on segment from v[i] to v[i + 1]
-    Vector3 r[3];
-
-    // Distance squared from r[i] to point
-    float d[3];
-
-    // Index of the next point
-    static const int next[] = {1, 2, 0};
-
-    for (int i = 0; i < 3; ++i) {
-        r[i] = closestPointOnLineSegment(v[i], v[next[i]], edgeDirection[i], edgeLength[i], point);
-        d[i] = (r[i] - point).squaredMagnitude();
-    }
-
-    if (d[0] < d[1]) {
-        if (d[0] < d[2]) {
-            // Between v0 and v1
-            edgeIndex = 0;
-        } else {
-            // Between v2 and v0
-            edgeIndex = 2;
-        }
-    } else {
-        if (d[1] < d[2]) {
-            // Between v1 and v2
-            edgeIndex = 1;
-        } else {
-            // Between v2 and v0
-            edgeIndex = 2;
-        }
-    }
-
-#   ifdef G3D_DEBUG
-    {
-        Vector3 diff = r[edgeIndex] - v[edgeIndex];
-        debugAssertM(fuzzyEq(diff.direction().dot(edgeDirection[edgeIndex]), 1.0f) ||
-            diff.fuzzyEq(Vector3::zero()), "Point not on correct triangle edge");
-        float frac = diff.dot(edgeDirection[edgeIndex])/edgeLength[edgeIndex];
-        debugAssertM(frac >= -0.000001, "Point off low side of edge.");
-        debugAssertM(frac <= 1.000001, "Point off high side of edge.");
-    }
-#   endif
-
-    return r[edgeIndex];
-}
-
-
-bool CollisionDetection::isPointInsideTriangle(
-    const Vector3&			v0,
-    const Vector3&			v1,
-    const Vector3&			v2,
-    const Vector3&			normal,
-    const Vector3&			point,
-    float                   b[3],
-    Vector3::Axis           primaryAxis) {
-    
-    if (primaryAxis == Vector3::DETECT_AXIS) {
-        primaryAxis = normal.primaryAxis();
-    }
-
-    // Check that the point is within the triangle using a Barycentric
-    // coordinate test on a two dimensional plane.
-    int i, j;
-
-    switch (primaryAxis) {
-    case Vector3::X_AXIS:
-        i = Vector3::Y_AXIS;
-        j = Vector3::Z_AXIS;
-        break;
-
-    case Vector3::Y_AXIS:
-        i = Vector3::Z_AXIS;
-        j = Vector3::X_AXIS;
-        break;
-
-    case Vector3::Z_AXIS:
-        i = Vector3::X_AXIS;
-        j = Vector3::Y_AXIS;
-        break;
-
-    default:
-        // This case is here to supress a warning on Linux
-        i = j = 0;
-        debugAssertM(false, "Should not get here.");
-        break;
-    }
-
-    // See if all barycentric coordinates are non-negative
-
-    // 2D area via cross product
-#   define AREA2(d, e, f)  (((e)[i] - (d)[i]) * ((f)[j] - (d)[j]) - ((f)[i] - (d)[i]) * ((e)[j] - (d)[j]))
-
-    // Area of the polygon
-    float area = AREA2(v0, v1, v2);
-    if (area == 0) {
-        // This triangle has zero area, so the point must not
-        // be in it unless the triangle point is the test point.
-        return (v0 == point);
-    }
-
-    debugAssert(area != 0);
-
-    float invArea = 1.0f / area;
-
-    // (avoid normalization until absolutely necessary)
-    b[0] = AREA2(point, v1, v2) * invArea;
-
-    if ((b[0] < 0.0f) || (b[0] > 1.0f)) {
-        return false;
-    }
-
-    b[1] = AREA2(v0,  point, v2) * invArea;
-    if ((b[1] < 0.0f) || (b[1] > 1.0f)) {
-        return false;
-    }
-
-    b[2] = 1.0f - b[0] - b[1];
-
-#   undef AREA2
-
-    return (b[2] >= 0.0f) && (b[2] <= 1.0f);
-}
-
-
-bool CollisionDetection::isPointInsideRectangle(
-    const Vector3& v0,
-    const Vector3& v1,
-    const Vector3& v2,
-    const Vector3& v3,
-    const Vector3& normal,
-    const Vector3& point) {
-
-    return isPointInsideTriangle(v0, v1, v2, normal, point) ||
-           isPointInsideTriangle(v2, v3, v0, normal, point);  
-}
-
-
-Vector3 CollisionDetection::closestPointToRectanglePerimeter(
-    const Vector3& v0,
-    const Vector3& v1,
-    const Vector3& v2,
-    const Vector3& v3,
-    const Vector3& point) {
-
-    Vector3 r0 = closestPointOnLineSegment(v0, v1, point);
-    Vector3 r1 = closestPointOnLineSegment(v1, v2, point);
-    Vector3 r2 = closestPointOnLineSegment(v2, v3, point);
-    Vector3 r3 = closestPointOnLineSegment(v3, v0, point);
-
-    double d0 = (r0 - point).squaredMagnitude();
-    double d1 = (r1 - point).squaredMagnitude();
-    double d2 = (r2 - point).squaredMagnitude();
-    double d3 = (r3 - point).squaredMagnitude();
-
-    if (d0 < d1) {
-        if (d0 < d2) {
-            if (d0 < d3) {
-                return r0;
-            } else {
-                return r3;
-            }
-        } else {
-            if (d2 < d3) {
-                return r2;
-            } else {
-                return r3;
-            }
-        }
-    } else {
-        if (d1 < d2) {
-            if (d1 < d3) {
-                return r1;
-            } else {
-                return r3;
-            }
-        } else {
-            if (d2 < d3) {
-                return r2;
-            } else {
-                return r3;
-            }
-        }
-    }
-}
-
-
-Vector3 CollisionDetection::closestPointToRectangle(
-    const Vector3&      v0,
-    const Vector3&      v1,
-    const Vector3&      v2,
-    const Vector3&      v3,
-    const Vector3&      point) {
-
-    Plane plane(v0, v1, v2);
-
-    // Project the point into the plane
-    double a, b, c, d;
-    plane.getEquation(a, b, c, d);
-    
-    double distance = a*point.x + b*point.y + c*point.z + d;
-    Vector3 planePoint = point - distance * plane.normal();
-
-    if (isPointInsideRectangle(v0, v1, v2, v3, plane.normal(), planePoint)) {
-        return planePoint;
-    } else {
-        return closestPointToRectanglePerimeter(v0, v1, v2, v3, planePoint);
-    }
-}
-
-
-bool CollisionDetection::fixedSolidSphereIntersectsFixedSolidSphere(
-    const Sphere&           sphere1,
-    const Sphere&           sphere2) {
-    
-    return (sphere1.center - sphere2.center).squaredMagnitude() < square(sphere1.radius + sphere2.radius);
-}
-
-
-bool CollisionDetection::fixedSolidSphereIntersectsFixedSolidBox(
-    const Sphere&           sphere,
-    const Box&              box) {
-
-    // If the center of the sphere is within the box, the whole
-    // sphere is within the box.
-    if (box.contains(sphere.center)) {
-        return true;
-    }
-
-    float r2 = square(sphere.radius);
-
-    // Find the closest point on the surface of the box to the sphere.  If
-    // this point is within the sphere's radius, they intersect.
-    int f;
-    for (f = 0; f < 6; ++f) {
-        Vector3 v0, v1, v2, v3;
-        box.getFaceCorners(f, v0, v1, v2, v3);
-        if ((closestPointToRectangle(v0, v1, v2, v3, sphere.center) - sphere.center).squaredMagnitude() <= r2) {
-            return true;
-        }
-    }
-
-    return false;
-}
-
-
-bool CollisionDetection::movingSpherePassesThroughFixedBox(
-    const Sphere&           sphere,
-    const Vector3&          velocity,
-    const Box&              box,
-    double                  timeLimit) {
-
-    // If they intersect originally, they definitely pass through each other.
-    if (fixedSolidSphereIntersectsFixedSolidBox(sphere, box)) {
-        return true;
-    }
-
-    // See if the sphere hits the box during the time period.
-    Vector3 dummy1, dummy2;
-
-    return (collisionTimeForMovingSphereFixedBox(sphere, velocity, box, dummy1, dummy2) < timeLimit);
-}
-
-
-bool CollisionDetection::movingSpherePassesThroughFixedSphere(
-    const Sphere&           sphere,
-    const Vector3&          velocity,
-    const Sphere&           fixedSphere,
-    double                  timeLimit) {
-
-    if (fixedSolidSphereIntersectsFixedSolidSphere(sphere, fixedSphere)) {
-        return true;
-    }
-
-    // Extend the fixed sphere by the radius of the moving sphere
-    Sphere bigFixed(fixedSphere.center, fixedSphere.radius + sphere.radius);
-    Vector3 dummy1, dummy2;
-
-    // If the sphere collides with the other sphere during the time limit, it passes through
-    return (collisionTimeForMovingPointFixedSphere(sphere.center, velocity, bigFixed, dummy1, dummy2) < timeLimit);
-}
-
-
-
-bool CollisionDetection::fixedSolidSphereIntersectsFixedTriangle(
-    const Sphere&           sphere,
-    const Triangle&         triangle) {
-
-    // How far is the sphere from the plane of the triangle
-    const Plane& plane = triangle.plane();
-
-    // Does the closest point to the sphere center lie within the triangle?
-    Vector3 v = plane.closestPoint(sphere.center);
-
-    // Is the closest point to the plane within the sphere?
-    if ((v - sphere.center).squaredLength() <= square(sphere.radius)) {
-        // Is it also within the triangle?
-        float b[3];
-        if (isPointInsideTriangle(triangle.vertex(0), triangle.vertex(1), triangle.vertex(2), triangle.normal(), 
-                v, b, triangle.primaryAxis())){
-            // The closest point is inside the triangle
-            return true;
-        }
-    }
-
-    // ignored
-    int edgeIndex;
-
-    v = closestPointOnTrianglePerimeter(triangle._vertex, triangle.edgeDirection, triangle.edgeMagnitude, sphere.center, edgeIndex);
-
-    // Is the closest point within the sphere?
-    return ((v - sphere.center).squaredLength() <= square(sphere.radius));
-}
-
-
-} // namespace
-#ifdef _MSC_VER
-#pragma warning (pop)
-#endif
diff --git a/externals/g3dlite/G3D.lib/source/Color1.cpp b/externals/g3dlite/G3D.lib/source/Color1.cpp
deleted file mode 100644
index 7e058a27d1a..00000000000
--- a/externals/g3dlite/G3D.lib/source/Color1.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- @file Color1.cpp
-
- Color class.
-
- @author Morgan McGuire, matrix@graphics3d.com
-
- @created 2007-01-30
- @edited  2007-01-30
- */
-
-#include "G3D/platform.h"
-#include "G3D/Color1.h"
-#include "G3D/Color1uint8.h"
-#include "G3D/BinaryInput.h"
-#include "G3D/BinaryOutput.h"
-
-namespace G3D {
-
-Color1::Color1(BinaryInput& bi) {
-    deserialize(bi);
-}
-
-
-void Color1::deserialize(BinaryInput& bi) {
-    value = bi.readFloat32();
-}
-
-
-void Color1::serialize(BinaryOutput& bo) const {
-    bo.writeFloat32(value);
-}
-
-
-Color1::Color1(const class Color1uint8& other) {
-    value = other.value / 255.0f;
-}
-
-} // namespace G3D
-
diff --git a/externals/g3dlite/G3D.lib/source/Color1uint8.cpp b/externals/g3dlite/G3D.lib/source/Color1uint8.cpp
deleted file mode 100644
index 0fd00693d4c..00000000000
--- a/externals/g3dlite/G3D.lib/source/Color1uint8.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- @file Color1uint8.cpp
- 
- @author Morgan McGuire, matrix@graphics3d.com
-  
- @created 2007-01-30
- @edited  2007-01-30
- */
-
-#include "G3D/platform.h"
-#include "G3D/g3dmath.h"
-#include "G3D/Color1uint8.h"
-#include "G3D/Color1.h"
-#include "G3D/BinaryInput.h"
-#include "G3D/BinaryOutput.h"
-
-namespace G3D {
-
-Color1uint8::Color1uint8(const class Color1& c) : value(iClamp(iFloor(c.value * 256), 0, 255)) {
-}
-
-
-Color1uint8::Color1uint8(class BinaryInput& bi) {
-    deserialize(bi);
-}
-
-
-void Color1uint8::serialize(class BinaryOutput& bo) const {
-    bo.writeUInt8(value);
-}
-
-
-void Color1uint8::deserialize(class BinaryInput& bi) {
-    value = bi.readUInt8();
-}
-
-
-}
diff --git a/externals/g3dlite/G3D.lib/source/Color3.cpp b/externals/g3dlite/G3D.lib/source/Color3.cpp
deleted file mode 100644
index 8183d8a0f62..00000000000
--- a/externals/g3dlite/G3D.lib/source/Color3.cpp
+++ /dev/null
@@ -1,321 +0,0 @@
-/**
- @file Color3.cpp
-
- Color class.
-
- @author Morgan McGuire, matrix@graphics3d.com
- @cite Portions based on Dave Eberly's Magic Software Library at http://www.magic-software.com
-
-
- @created 2001-06-02
- @edited  2006-01-13
- */
-
-#include "G3D/platform.h"
-#include 
-#include "G3D/Color3.h"
-#include "G3D/Vector3.h"
-#include "G3D/format.h"
-#include "G3D/BinaryInput.h"
-#include "G3D/BinaryOutput.h"
-#include "G3D/Color3uint8.h"
-
-namespace G3D {
-
-const Color3& Color3::red() {
-    static Color3 c(1.0f, 0.0f, 0.0f);
-    return c;
-}
-
-
-const Color3& Color3::green() {
-    static Color3 c(0.0f, 1.0f, 0.0f);
-    return c;
-}
-
-
-const Color3& Color3::blue() {
-    static Color3 c(0.0f, 0.0f, 1.0f);
-    return c;
-}
-
-
-const Color3& Color3::purple() {
-    static Color3 c(0.7f, 0.0f, 1.0f);
-    return c;
-}
-
-
-const Color3& Color3::cyan() {
-    static Color3 c(0.0f, 0.7f, 1.0f);
-    return c;
-}
-
-
-const Color3& Color3::yellow() {
-    static Color3 c(1.0f, 1.0f, 0.0f);
-    return c;
-}
-
-
-const Color3& Color3::brown() {
-    static Color3 c(0.5f, 0.5f, 0.0f);
-    return c;
-}
-
-
-const Color3& Color3::orange() {
-    static Color3 c(1.0f, 0.5f, 0.0f);
-    return c;
-}
-
-
-const Color3& Color3::black() {
-    static Color3 c(0.0f, 0.0f, 0.0f);
-    return c;
-}
-
-const Color3& Color3::zero() {
-    static Color3 c(0.0f, 0.0f, 0.0f);
-    return c;
-}
-
-
-const Color3& Color3::one() {
-    static Color3 c(1.0f, 1.0f, 1.0f);
-    return c;
-}
-
-
-const Color3& Color3::gray() {
-    static Color3 c(0.7f, 0.7f, 0.7f);
-    return c;
-}
-
-
-const Color3& Color3::white() {
-    static Color3 c(1, 1, 1);
-    return c;
-}
-
-
-Color3::Color3(BinaryInput& bi) {
-    deserialize(bi);
-}
-
-
-void Color3::deserialize(BinaryInput& bi) {
-    r = bi.readFloat32();
-    g = bi.readFloat32();
-    b = bi.readFloat32();
-}
-
-
-void Color3::serialize(BinaryOutput& bo) const {
-    bo.writeFloat32(r);
-    bo.writeFloat32(g);
-    bo.writeFloat32(b);
-}
-
-
-const Color3& Color3::wheelRandom() {
-    static const Color3 colorArray[8] =
-    {Color3::blue(),   Color3::red(),    Color3::green(),
-     Color3::orange(), Color3::yellow(), 
-     Color3::cyan(),   Color3::purple(), Color3::brown()};
-
-    return colorArray[iRandom(0, 7)];
-}
-
-
-size_t Color3::hashCode() const {
-    unsigned int rhash = (*(int*)(void*)(&r));
-    unsigned int ghash = (*(int*)(void*)(&g));
-    unsigned int bhash = (*(int*)(void*)(&b));
-
-    return rhash + (ghash * 37) + (bhash * 101);
-}
-
-
-Color3::Color3(const Vector3& v) {
-    r = v.x;
-    g = v.y;
-    b = v.z;
-}
-
-
-Color3::Color3(const class Color3uint8& other) {
-    r = other.r / 255.0f;
-    g = other.g / 255.0f;
-    b = other.b / 255.0f;
-}
-
-
-Color3 Color3::fromARGB(uint32 x) {
-    return Color3((float)((x >> 16) & 0xFF), (float)((x >> 8) & 0xFF), (float)(x & 0xFF)) / 255.0f;
-}
-
-//----------------------------------------------------------------------------
-
-
-Color3 Color3::random() {
-    return Color3(uniformRandom(), 
-                  uniformRandom(),
-                  uniformRandom()).direction();
-}
-
-//----------------------------------------------------------------------------
-Color3 Color3::operator/ (float fScalar) const {
-    Color3 kQuot;
-
-    if (fScalar != 0.0f) {
-		float fInvScalar = 1.0f / fScalar;
-        kQuot.r = fInvScalar * r;
-        kQuot.g = fInvScalar * g;
-        kQuot.b = fInvScalar * b;
-        return kQuot;
-
-    } else {
-
-        return Color3((float)G3D::inf(), (float)G3D::inf(), (float)G3D::inf());
-    }
-}
-
-//----------------------------------------------------------------------------
-Color3& Color3::operator/= (float fScalar) {
-    if (fScalar != 0.0f) {
-		float fInvScalar = 1.0f / fScalar;
-        r *= fInvScalar;
-        g *= fInvScalar;
-        b *= fInvScalar;
-    } else {
-        r = (float)G3D::inf();
-        g = (float)G3D::inf();
-        b = (float)G3D::inf();
-    }
-
-    return *this;
-}
-
-//----------------------------------------------------------------------------
-float Color3::unitize (float fTolerance) {
-	float fLength = length();
-
-    if ( fLength > fTolerance ) {
-		float fInvLength = 1.0f / fLength;
-        r *= fInvLength;
-        g *= fInvLength;
-        b *= fInvLength;
-    } else {
-        fLength = 0.0f;
-    }
-
-    return fLength;
-}
-
-//----------------------------------------------------------------------------
-Color3 Color3::fromHSV(const Vector3& _hsv) {
-	debugAssertM((_hsv.x <= 1.0f && _hsv.x >= 0.0f)
-			&& (_hsv.y <= 1.0f && _hsv.y >= 0.0f) 
-			&& ( _hsv.z <= 1.0f && _hsv.z >= 0.0f), "H,S,V must be between [0,1]");
-	const int i = G3D::iFloor(6.0*_hsv.x);
-	const float f = 6.0f * _hsv.x - i;
-	const float m = _hsv.z * (1.0f - (_hsv.y));
-	const float n = _hsv.z * (1.0f - (_hsv.y * f));
-	const float k = _hsv.z * (1.0f - (_hsv.y * (1 - f)));
-	switch(i) {
-	case 0:
-		return Color3(_hsv.z, k, m);
-
-	case 1:
-		return Color3(n, _hsv.z, m);
-
-	case 2:
-		return Color3(m, _hsv.z, k);
-
-	case 3:
-		return Color3(m, n, _hsv.z);
-
-	case 4:
-		return Color3(k, m, _hsv.z);
-
-	case 5:
-		return Color3(_hsv.z, m, n);
-
-    default:
-		debugAssertM(false, "fell through switch..");
-	}
-	return Color3::black();
-}
-
-
-Vector3 Color3::toHSV(const Color3& _rgb) {
-	debugAssertM((_rgb.r <= 1.0f && _rgb.r >= 0.0f) 
-			&& (_rgb.g <= 1.0f && _rgb.g >= 0.0f)
-			&& (_rgb.b <= 1.0f && _rgb.b >= 0.0f), "R,G,B must be between [0,1]");
-	Vector3 hsv = Vector3::zero();
-	hsv.z = G3D::max(G3D::max(_rgb.r, _rgb.g), _rgb.b);
-	if (G3D::fuzzyEq(hsv.z, 0.0f)) {
-		return hsv;
-	}
-	
-    const float x =  G3D::min(G3D::min(_rgb.r, _rgb.g), _rgb.b);
-	hsv.y = (hsv.z - x) / hsv.z; 
-
-    if (G3D::fuzzyEq(hsv.y, 0.0f)) {
-		return hsv;
-	}
-
-	Vector3 rgbN;
-	rgbN.x = (hsv.z - _rgb.r) / (hsv.z - x);
-	rgbN.y = (hsv.z - _rgb.g) / (hsv.z - x);
-	rgbN.z = (hsv.z - _rgb.b) / (hsv.z - x);
-
-	if (_rgb.r == hsv.z) {  // note from the max we know that it exactly equals one of the three.
-		hsv.x = (_rgb.g == x)? 5.0f + rgbN.z : 1.0f - rgbN.y;
-	} else if (_rgb.g == hsv.z) {
-		hsv.x = (_rgb.b == x)? 1.0f + rgbN.x : 3.0f - rgbN.z;
-	} else {
-		hsv.x = (_rgb.r == x)? 3.0f + rgbN.y : 5.0f - rgbN.x;
-	}
-	
-    hsv.x /= 6.0f;
-
-	return hsv;
-}
-
-Color3 Color3::jetColorMap(const float& val) {
-	debugAssertM(val <= 1.0f && val >= 0.0f , "value should be in [0,1]");
-
-	//truncated triangles where sides have slope 4
-	Color3 jet;
-
-	jet.r = G3D::min(4.0f * val - 1.5f,-4.0f * val + 4.5f) ;
-	jet.g = G3D::min(4.0f * val - 0.5f,-4.0f * val + 3.5f) ;
-	jet.b = G3D::min(4.0f * val + 0.5f,-4.0f * val + 2.5f) ;
-
-
-	jet.r = G3D::clamp(jet.r, 0.0f, 1.0f);
-	jet.g = G3D::clamp(jet.g, 0.0f, 1.0f);
-	jet.b = G3D::clamp(jet.b, 0.0f, 1.0f);
-
-	return jet;
-}
-
-
-
-
-
-std::string Color3::toString() const {
-    return G3D::format("(%g, %g, %g)", r, g, b);
-}
-
-//----------------------------------------------------------------------------
-
-Color3 Color3::rainbowColorMap(float hue) {
-    return fromHSV(Vector3(hue, 1.0f, 1.0f));
-}
-
-
-}; // namespace
-
diff --git a/externals/g3dlite/G3D.lib/source/Color3uint8.cpp b/externals/g3dlite/G3D.lib/source/Color3uint8.cpp
deleted file mode 100644
index 837bf1b2c8b..00000000000
--- a/externals/g3dlite/G3D.lib/source/Color3uint8.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- @file Color3uint8.cpp
- 
- @author Morgan McGuire, matrix@graphics3d.com
-  
- @created 2003-04-07
- @edited  2006-01-07
- */
-
-#include "G3D/platform.h"
-#include "G3D/g3dmath.h"
-#include "G3D/Color3uint8.h"
-#include "G3D/Color3.h"
-#include "G3D/BinaryInput.h"
-#include "G3D/BinaryOutput.h"
-
-namespace G3D {
-
-Color3uint8::Color3uint8(const class Color3& c) {
-    r = iMin(255, iFloor(c.r * 256));
-    g = iMin(255, iFloor(c.g * 256));
-    b = iMin(255, iFloor(c.b * 256));
-}
-
-
-Color3uint8::Color3uint8(class BinaryInput& bi) {
-    deserialize(bi);
-}
-
-
-void Color3uint8::serialize(class BinaryOutput& bo) const {
-    bo.writeUInt8(r);
-    bo.writeUInt8(g);
-    bo.writeUInt8(b);
-}
-
-
-void Color3uint8::deserialize(class BinaryInput& bi) {
-    r = bi.readUInt8();
-    g = bi.readUInt8();
-    b = bi.readUInt8();
-}
-
-
-}
diff --git a/externals/g3dlite/G3D.lib/source/Color4.cpp b/externals/g3dlite/G3D.lib/source/Color4.cpp
deleted file mode 100644
index ed2e91291a1..00000000000
--- a/externals/g3dlite/G3D.lib/source/Color4.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-/**
- @file Color4.cpp
-
- Color class.
-
- @author Morgan McGuire, matrix@graphics3d.com
- @cite Portions by Laura Wollstadt, graphics3d.com
- @cite Portions based on Dave Eberly's Magic Software Library at http://www.magic-software.com
-
-
- @created 2002-06-25
- @edited  2006-01-10
- */
-
-#include 
-#include "G3D/Color4.h"
-#include "G3D/Color4uint8.h"
-#include "G3D/Vector4.h"
-#include "G3D/format.h"
-#include "G3D/BinaryInput.h"
-#include "G3D/BinaryOutput.h"
-
-namespace G3D {
-
-const Color4& Color4::zero() {
-    static Color4 c(0.0f, 0.0f, 0.0f, 0.0f);
-    return c;
-}
-
-
-const Color4& Color4::inf() {
-    static Color4 c((float)G3D::inf(), (float)G3D::inf(), (float)G3D::inf(), (float)G3D::inf());
-    return c;
-}
-
-
-const Color4& Color4::clear() {
-    return Color4::zero();
-}
-
-
-Color4::Color4(const Vector4& v) {
-    r = v.x;
-    g = v.y;
-    b = v.z;
-    a = v.w;
-}
-
-
-Color4::Color4(const Color4uint8& c) : r(c.r), g(c.g), b(c.b), a(c.a) {
-    *this /= 255.0f;
-}
-
-size_t Color4::hashCode() const {
-    unsigned int rhash = (*(int*)(void*)(&r));
-    unsigned int ghash = (*(int*)(void*)(&g));
-    unsigned int bhash = (*(int*)(void*)(&b));
-    unsigned int ahash = (*(int*)(void*)(&a));
-
-    return rhash + (ghash * 37) + (bhash * 101) + (ahash * 241);
-}
-
-Color4 Color4::fromARGB(uint32 x) {
-    return Color4(
-        (float)((x >> 16) & 0xFF), 
-        (float)((x >> 8) & 0xFF),
-        (float)(x & 0xFF), 
-        (float)((x >> 24) & 0xFF)) / 255.0;
-}
-
-
-Color4::Color4(BinaryInput& bi) {
-    deserialize(bi);
-}
-
-
-void Color4::deserialize(BinaryInput& bi) {
-    r = bi.readFloat32();
-    g = bi.readFloat32();
-    b = bi.readFloat32();
-    a = bi.readFloat32();
-}
-
-
-void Color4::serialize(BinaryOutput& bo) const {
-    bo.writeFloat32(r);
-    bo.writeFloat32(g);
-    bo.writeFloat32(b);
-    bo.writeFloat32(a);
-}
-
-
-//----------------------------------------------------------------------------
-
-Color4 Color4::operator/ (float fScalar) const {
-    Color4 kQuot;
-
-    if (fScalar != 0.0f) {
-		float fInvScalar = 1.0f / fScalar;
-        kQuot.r = fInvScalar * r;
-        kQuot.g = fInvScalar * g;
-        kQuot.b = fInvScalar * b;
-        kQuot.a = fInvScalar * a;
-        return kQuot;
-
-    } else {
-
-        return Color4::inf();
-    }
-}
-
-//----------------------------------------------------------------------------
-
-Color4& Color4::operator/= (float fScalar) {
-    if (fScalar != 0.0f) {
-		float fInvScalar = 1.0f / fScalar;
-        r *= fInvScalar;
-        g *= fInvScalar;
-        b *= fInvScalar;
-        a *= fInvScalar;
-    } else {
-        r = (float)G3D::inf();
-        g = (float)G3D::inf();
-        b = (float)G3D::inf();
-        a = (float)G3D::inf();
-    }
-
-    return *this;
-}
-
-//----------------------------------------------------------------------------
-
-std::string Color4::toString() const {
-    return G3D::format("(%g, %g, %g, %g)", r, g, b, a);
-}
-
-//----------------------------------------------------------------------------
-
-}; // namespace
-
diff --git a/externals/g3dlite/G3D.lib/source/Color4uint8.cpp b/externals/g3dlite/G3D.lib/source/Color4uint8.cpp
deleted file mode 100644
index 8c8636a742e..00000000000
--- a/externals/g3dlite/G3D.lib/source/Color4uint8.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- @file Color4uint8.cpp
- 
- @author Morgan McGuire, matrix@graphics3d.com
-  
- @created 2003-04-07
- @edited  2006-01-07
- */
-#include "G3D/platform.h"
-#include "G3D/g3dmath.h"
-#include "G3D/Color4uint8.h"
-#include "G3D/Color4.h"
-#include "G3D/BinaryInput.h"
-#include "G3D/BinaryOutput.h"
-
-namespace G3D {
-
-Color4uint8::Color4uint8(const class Color4& c) {
-    r = iMin(255, iFloor(c.r * 256));
-    g = iMin(255, iFloor(c.g * 256));
-    b = iMin(255, iFloor(c.b * 256));
-    a = iMin(255, iFloor(c.a * 256));
-}
-
-
-Color4uint8::Color4uint8(class BinaryInput& bi) {
-    deserialize(bi);
-}
-
-
-void Color4uint8::serialize(class BinaryOutput& bo) const {
-    bo.writeUInt8(r);
-    bo.writeUInt8(g);
-    bo.writeUInt8(b);
-    bo.writeUInt8(a);
-}
-
-
-void Color4uint8::deserialize(class BinaryInput& bi) {
-    r = bi.readUInt8();
-    g = bi.readUInt8();
-    b = bi.readUInt8();
-    a = bi.readUInt8();
-}
-
-
-}
diff --git a/externals/g3dlite/G3D.lib/source/Cone.cpp b/externals/g3dlite/G3D.lib/source/Cone.cpp
deleted file mode 100644
index 99b29b5b0af..00000000000
--- a/externals/g3dlite/G3D.lib/source/Cone.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- @file Cone.cpp
-
- Cone class
-
- @maintainer Morgan McGuire, matrix@graphics3d.com
-
- @created 2001-07-09
- @edited  2006-01-29
-*/
-
-#include "G3D/platform.h"
-#include "G3D/Cone.h"
-#include "G3D/Line.h"
-#include "G3D/Sphere.h"
-#include "G3D/Box.h"
-
-namespace G3D {
-
-Cone::Cone(const Vector3 &tip, const Vector3 &direction, float angle) {
-    this->tip = tip;
-    this->direction = direction.direction();
-    this->angle = angle;
-
-    debugAssert(angle >= 0);
-    debugAssert(angle <= pi());
-}
-
-/**
- Forms the smallest cone that contains the box.  Undefined if
- the tip is inside or on the box.
- */
-Cone::Cone(const Vector3& tip, const Box& box) {
-    this->tip = tip;
-    this->direction = (box.center() - tip).direction();
-
-    // Find the biggest angle
-    float smallestDotProduct = direction.dot((box.corner(0) - tip).direction());
-
-    for (int i = 1; i < 8; ++i) {
-        float dp = direction.dot((box.corner(i) - tip).direction());
-
-        debugAssert(dp > 0);
-
-        if (dp < smallestDotProduct) {
-            smallestDotProduct = dp;
-        }
-    }
-
-    angle = acosf(smallestDotProduct);
-}
-
-
-bool Cone::intersects(const Sphere& b) const {
-    // If the bounding sphere contains the tip, then
-    // they definitely touch.
-    if (b.contains(this->tip)) {
-        return true;
-    }
-
-    // Move the tip backwards, effectively making the cone bigger
-    // to account for the radius of the sphere.
-
-    Vector3 tip = this->tip - direction * b.radius / sinf(angle);
-
-    return Cone(tip, direction, angle).contains(b.center);
-}
-
-
-bool Cone::contains(const Vector3& v) const {
-
-    Vector3 d = (v - tip).direction();
-
-    float x = d.dot(direction);
-
-    return (x > 0) && (x >= cosf(angle));
-}
-
-}; // namespace
diff --git a/externals/g3dlite/G3D.lib/source/ConvexPolyhedron.cpp b/externals/g3dlite/G3D.lib/source/ConvexPolyhedron.cpp
deleted file mode 100644
index 76dbe21a7c4..00000000000
--- a/externals/g3dlite/G3D.lib/source/ConvexPolyhedron.cpp
+++ /dev/null
@@ -1,449 +0,0 @@
-/**
-  @file ConvexPolyhedron.cpp
-  
-  @author Morgan McGuire, morgan@graphics3d.com
-
-  @created 2001-11-11
-  @edited  2006-01-10
- 
-  Copyright 2000-2006, Morgan McGuire.
-  All rights reserved.
- */
-
-#include "G3D/platform.h"
-#include "G3D/ConvexPolyhedron.h"
-#include "G3D/debug.h"
-
-namespace G3D {
-
-ConvexPolygon::ConvexPolygon(const Array& __vertex) : _vertex(__vertex) {
-    // Intentionally empty
-}
-
-
-bool ConvexPolygon::isEmpty() const {
-    return (_vertex.length() == 0) || (getArea() <= fuzzyEpsilon);
-}
-
-
-float ConvexPolygon::getArea() const {
-
-    if (_vertex.length() < 3) {
-        return 0;
-    }
-
-    float sum = 0;
-
-    int length = _vertex.length();
-    // Split into triangle fan, compute individual area
-    for (int v = 2; v < length; v++) {
-        int i0 = 0;
-        int i1 = v - 1;
-        int i2 = v;
-
-        sum += (_vertex[i1] - _vertex[i0]).cross(_vertex[i2] - _vertex[i0]).magnitude() / 2; 
-    }
-
-    return sum;
-}
-
-void ConvexPolygon::cut(const Plane& plane, ConvexPolygon &above, ConvexPolygon &below) {
-    DirectedEdge edge;
-    cut(plane, above, below, edge);
-}
-
-void ConvexPolygon::cut(const Plane& plane, ConvexPolygon &above, ConvexPolygon &below, DirectedEdge &newEdge) {
-    above._vertex.resize(0);
-    below._vertex.resize(0);
-
-    if (isEmpty()) {
-        //debugPrintf("Empty\n");
-        return;
-    }
-
-    int v = 0;
-    int length = _vertex.length();
-
-
-    Vector3 polyNormal = normal();
-    Vector3 planeNormal= plane.normal();
-
-    // See if the polygon is *in* the plane.
-    if (planeNormal.fuzzyEq(polyNormal) || planeNormal.fuzzyEq(-polyNormal)) {
-        // Polygon is parallel to the plane.  It must be either above,
-        // below, or in the plane.
-
-        double a, b, c, d;
-        Vector3 pt = _vertex[0];
-
-        plane.getEquation(a,b,c,d);
-        float r = (float)(a * pt.x + b * pt.y + c * pt.z + d);
-
-        if (fuzzyGe(r, 0)) {
-            // The polygon is entirely in the plane.
-            //debugPrintf("Entirely above\n");
-            above = *this;
-            return;
-        } else {
-            //debugPrintf("Entirely below (1)\n");
-            below = *this;
-            return;
-        }
-    }
-
-
-    // Number of edges crossing the plane.  Used for 
-    // debug assertions.
-    int count = 0;
-
-    // True when the last _vertex we looked at was above the plane
-    bool lastAbove = plane.halfSpaceContains(_vertex[v]);
-
-    if (lastAbove) {
-        above._vertex.append(_vertex[v]);
-    } else {
-        below._vertex.append(_vertex[v]);
-    }
-
-    for (v = 1; v < length; v++) {
-        bool isAbove = plane.halfSpaceContains(_vertex[v]);
-    
-        if (lastAbove ^ isAbove) {
-            // Switched sides.
-            // Create an interpolated point that lies
-            // in the plane, between the two points.
-            Line line = Line::fromTwoPoints(_vertex[v - 1], _vertex[v]);
-            Vector3 interp = line.intersection(plane);
-            
-            if (! interp.isFinite()) {
-
-                // Since the polygon is not in the plane (we checked above), 
-                // it must be the case that this edge (and only this edge)
-                // is in the plane.  This only happens when the polygon is
-                // entirely below the plane except for one edge.  This edge
-                // forms a degenerate polygon, so just treat the whole polygon
-                // as below the plane.
-                below = *this;
-                above._vertex.resize(0);
-                //debugPrintf("Entirely below\n");
-                return;
-            }                
-
-            above._vertex.append(interp);
-            below._vertex.append(interp);
-            if (lastAbove) {
-                newEdge.stop = interp;
-            } else {
-                newEdge.start = interp;
-            }
-            count++;
-        }
-
-        lastAbove = isAbove;
-        if (lastAbove) {
-            above._vertex.append(_vertex[v]);
-        } else {
-            below._vertex.append(_vertex[v]);
-        }
-    }
-
-    // Loop back to the first point, seeing if an interpolated point is
-    // needed.
-    bool isAbove = plane.halfSpaceContains(_vertex[0]);
-    if (lastAbove ^ isAbove) {
-        Line line = Line::fromTwoPoints(_vertex[length - 1], _vertex[0]);
-        Vector3 interp = line.intersection(plane);
-        if (! interp.isFinite()) {
-            // Since the polygon is not in the plane (we checked above), 
-            // it must be the case that this edge (and only this edge)
-            // is in the plane.  This only happens when the polygon is
-            // entirely below the plane except for one edge.  This edge
-            // forms a degenerate polygon, so just treat the whole polygon
-            // as below the plane.
-            below = *this;
-            above._vertex.resize(0);
-            //debugPrintf("Entirely below\n");
-            return;
-        }                
-
-        above._vertex.append(interp);
-        below._vertex.append(interp);
-        debugAssertM(count < 2, "Convex polygons may only intersect planes at two edges.");
-        if (lastAbove) {
-            newEdge.stop = interp;
-        } else {
-            newEdge.start = interp;
-        }
-        count++;
-    }
-
-    debugAssertM((count == 2) || (count == 0), "Convex polygons may only intersect planes at two edges.");
-}
-
-ConvexPolygon ConvexPolygon::inverse() const {
-    ConvexPolygon result;
-    int length = _vertex.length();
-    result._vertex.resize(length);
-    
-    for (int v = 0; v < length; v++) {
-        result._vertex[v] = _vertex[length - v - 1];
-    }
-
-    return result;
-}
-
-void ConvexPolygon::removeDuplicateVertices(){
-	// Any valid polygon should have 3 or more vertices, but why take chances?
-	if(_vertex.size() >= 2){
-
-		// Remove duplicate vertices.
-		for(int i=0;i<_vertex.size()-1;++i){
-			if(_vertex[i].fuzzyEq(_vertex[i+1])){
-				_vertex.remove(i+1);
-				--i; // Don't move forward.
-			}
-		}
-		
-		// Check the last vertex against the first.
-		if(_vertex[_vertex.size()-1].fuzzyEq(_vertex[0])){
-			_vertex.pop();
-		}
-	}
-}
-
-//////////////////////////////////////////////////////////////////////////////
-
-ConvexPolyhedron::ConvexPolyhedron(const Array& _face) : face(_face) {
-    // Intentionally empty
-}
-
-float ConvexPolyhedron::getVolume() const {
-
-    if (face.length() < 4) {
-        return 0;
-    }
-
-    // The volume of any pyramid is 1/3 * h * base area.
-    // Discussion at: http://nrich.maths.org/mathsf/journalf/oct01/art1/
-
-    float sum = 0;
-
-    // Choose the first _vertex of the first face as the origin.
-    // This lets us skip one face, too, and avoids negative heights.
-    Vector3 v0 = face[0]._vertex[0];
-    for (int f = 1; f < face.length(); f++) {        
-        const ConvexPolygon& poly = face[f];
-        
-        float height = (poly._vertex[0] - v0).dot(poly.normal());
-        float base   = poly.getArea();
-
-        sum += height * base;
-    }
-
-    return sum / 3;
-}
-
-bool ConvexPolyhedron::isEmpty() const {
-    return (face.length() == 0) || (getVolume() <= fuzzyEpsilon);
-}
-
-void ConvexPolyhedron::cut(const Plane& plane, ConvexPolyhedron &above, ConvexPolyhedron &below) {
-    above.face.resize(0);
-    below.face.resize(0);
-
-    Array edge;
-
-    int f;
-    
-    // See if the plane cuts this polyhedron at all.  Detect when
-    // the polyhedron is entirely to one side or the other.
-    //{
-        int numAbove = 0, numIn = 0, numBelow = 0;
-        bool ruledOut = false;
-        double d;
-        Vector3 abc;
-        plane.getEquation(abc, d);
-
-        // This number has to be fairly large to prevent precision problems down
-        // the road.
-        const float eps = 0.005f;
-        for (f = face.length() - 1; (f >= 0) && (!ruledOut); f--) {
-            const ConvexPolygon& poly = face[f];
-            for (int v = poly._vertex.length() - 1; (v >= 0) && (!ruledOut); v--) { 
-                double r = abc.dot(poly._vertex[v]) + d;
-                if (r > eps) {
-                    numAbove++;
-                } else if (r < -eps) {
-                    numBelow++;
-                } else {
-                    numIn++;
-                }
-
-                ruledOut = (numAbove != 0) && (numBelow !=0);
-            }
-        }
-
-        if (numBelow == 0) {
-            above = *this;
-            return;
-        } else if (numAbove == 0) {
-            below = *this;
-            return;
-        }
-    //}
-
-    // Clip each polygon, collecting split edges.
-    for (f = face.length() - 1; f >= 0; f--) {
-        ConvexPolygon a, b;
-        DirectedEdge e;
-        face[f].cut(plane, a, b, e);
-
-        bool aEmpty = a.isEmpty();
-        bool bEmpty = b.isEmpty();
-
-        //debugPrintf("\n");
-        if (! aEmpty) {
-            //debugPrintf(" Above %f\n", a.getArea());
-            above.face.append(a);
-        }
-
-        if (! bEmpty) {
-            //debugPrintf(" Below %f\n", b.getArea());
-            below.face.append(b);
-        }
-
-        if (! aEmpty && ! bEmpty) {
-            //debugPrintf(" == Split\n");
-            edge.append(e);
-        } else {
-            // Might be the case that the polygon is entirely on 
-            // one side of the plane yet there is an edge we need
-            // because it touches the plane.
-            // 
-            // Extract the non-empty _vertex list and examine it.
-            // If we find exactly one edge in the plane, add that edge.
-            const Array& _vertex = (aEmpty ? b._vertex : a._vertex);
-            int L = _vertex.length();
-            int count = 0;
-            for (int v = 0; v < L; v++) {
-                if (plane.fuzzyContains(_vertex[v]) && plane.fuzzyContains(_vertex[(v + 1) % L])) {
-                    e.start = _vertex[v];
-                    e.stop = _vertex[(v + 1) % L];
-                    count++;
-                }
-            }
-
-            if (count == 1) {
-                edge.append(e);
-            }
-        }
-    }
-
-    if (above.face.length() == 1) {
-        // Only one face above means that this entire 
-        // polyhedron is below the plane.  Move that face over.
-        below.face.append(above.face[0]);
-        above.face.resize(0);
-    } else if (below.face.length() == 1) {
-        // This shouldn't happen, but it arises in practice
-        // from numerical imprecision.
-        above.face.append(below.face[0]);
-        below.face.resize(0);
-    }
-
-    if ((above.face.length() > 0) && (below.face.length() > 0)) {
-        // The polyhedron was actually cut; create a cap polygon
-        ConvexPolygon cap;
-
-        // Collect the final polgyon by sorting the edges
-        int numVertices = edge.length();
-/*debugPrintf("\n");
-for (int xx=0; xx < numVertices; xx++) {
-    std::string s1 = edge[xx].start.toString();
-    std::string s2 = edge[xx].stop.toString();
-    debugPrintf("%s -> %s\n", s1.c_str(), s2.c_str());
-}
-*/
-
-        // Need at least three points to make a polygon
-        debugAssert(numVertices >= 3);
-
-        Vector3 last_vertex = edge.last().stop;
-        cap._vertex.append(last_vertex);
-
-        // Search for the next _vertex.  Because of accumulating
-        // numerical error, we have to find the closest match, not 
-        // just the one we expect.
-        for (int v = numVertices - 1; v >= 0; v--) {
-            // matching edge index
-            int index = 0;
-            int num = edge.length();
-            double distance = (edge[index].start - last_vertex).squaredMagnitude();
-            for (int e = 1; e < num; e++) {
-                double d = (edge[e].start - last_vertex).squaredMagnitude();
-
-                if (d < distance) {
-                    // This is the new closest one
-                    index = e;
-                    distance = d;
-                }
-            }
-
-            // Don't tolerate ridiculous error.
-            debugAssertM(distance < 0.02, "Edge missing while closing polygon.");
-
-            last_vertex = edge[index].stop;
-            cap._vertex.append(last_vertex);
-        }
-        
-        //debugPrintf("\n");
-        //debugPrintf("Cap (both) %f\n", cap.getArea());
-        above.face.append(cap);
-        below.face.append(cap.inverse());
-    }
-
-    // Make sure we put enough faces on each polyhedra
-    debugAssert((above.face.length() == 0) || (above.face.length() >= 4));   
-    debugAssert((below.face.length() == 0) || (below.face.length() >= 4));
-}
-
-///////////////////////////////////////////////
-
-ConvexPolygon2D::ConvexPolygon2D(const Array& pts, bool reverse) : m_vertex(pts) {
-    if (reverse) {
-        m_vertex.reverse();
-    }
-}
-
-
-bool ConvexPolygon2D::contains(const Vector2& p, bool reverse) const {
-    // Compute the signed area of each polygon from p to an edge.  
-    // If the area is non-negative for all polygons then p is inside 
-    // the polygon.  (To adapt this algorithm for a concave polygon,
-    // the *sum* of the areas must be non-negative).
-
-    float r = reverse ? -1 : 1;
-
-    for (int i0 = 0; i0 < m_vertex.size(); ++i0) {
-        int i1 = (i0 + 1) % m_vertex.size();
-        const Vector2& v0 = m_vertex[i0];
-        const Vector2& v1 = m_vertex[i1];
-
-        Vector2 e0 = v0 - p;
-        Vector2 e1 = v1 - p;
-
-        // Area = (1/2) cross product, negated to be ccw in
-        // a 2D space; we neglect the 1/2
-        float area = -(e0.x * e1.y - e0.y * e1.x);
-
-        if (area * r < 0) {
-            return false;
-        }
-    }
-
-    return true;
-}
-
-
-}
-
diff --git a/externals/g3dlite/G3D.lib/source/CoordinateFrame.cpp b/externals/g3dlite/G3D.lib/source/CoordinateFrame.cpp
deleted file mode 100644
index b6e94fe5857..00000000000
--- a/externals/g3dlite/G3D.lib/source/CoordinateFrame.cpp
+++ /dev/null
@@ -1,381 +0,0 @@
-/**
- @file CoordinateFrame.cpp
-
- Coordinate frame class
-
- @maintainer Morgan McGuire, morgan@cs.williams.edu
-
- @created 2001-06-02
- @edited  2008-07-13
-*/
-
-#include "G3D/platform.h"
-#include "G3D/CoordinateFrame.h"
-#include "G3D/Quat.h"
-#include "G3D/Matrix4.h"
-#include "G3D/Box.h"
-#include "G3D/AABox.h"
-#include "G3D/Sphere.h"
-#include "G3D/Triangle.h"
-#include "G3D/Ray.h"
-#include "G3D/Capsule.h"
-#include "G3D/Cylinder.h"
-#include "G3D/UprightFrame.h"
-
-namespace G3D {
-
-CoordinateFrame::CoordinateFrame(const class UprightFrame& f) {
-    *this = f.toCoordinateFrame();
-}
-
-
-CoordinateFrame CoordinateFrame::fromXYZYPRRadians(float x, float y, float z, float yaw, 
-                                                   float pitch, float roll) {
-    Matrix3 rotation = Matrix3::fromAxisAngle(Vector3::unitY(), yaw);
-    
-    rotation = Matrix3::fromAxisAngle(rotation.column(0), pitch) * rotation;
-    rotation = Matrix3::fromAxisAngle(rotation.column(2), roll) * rotation;
-
-    const Vector3 translation(x, y, z);
-    
-    return CoordinateFrame(rotation, translation);
-}
-
-
-void CoordinateFrame::getXYZYPRRadians(float& x, float& y, float& z, 
-                                       float& yaw, float& pitch, float& roll) const {
-    x = translation.x;
-    y = translation.y;
-    z = translation.z;
-    
-    const Vector3& look = lookVector();
-
-    if (abs(look.y) > 0.99f) {
-        // Looking nearly straight up or down
-
-        yaw   = G3D::pi() + atan2(look.x, look.z);
-        pitch = asin(look.y);
-        roll  = 0.0f;
-        
-    } else {
-
-        // Yaw cannot be affected by others, so pull it first
-        yaw = G3D::pi() + atan2(look.x, look.z);
-        
-        // Pitch is the elevation of the yaw vector
-        pitch = asin(look.y);
-        
-        Vector3 actualRight = rightVector();
-        Vector3 expectedRight = look.cross(Vector3::unitY());
-
-        roll = 0;//acos(actualRight.dot(expectedRight));  TODO
-    }
-}
-
-
-void CoordinateFrame::getXYZYPRDegrees(float& x, float& y, float& z, 
-                                       float& yaw, float& pitch, float& roll) const {
-    getXYZYPRRadians(x, y, z, yaw, pitch, roll);
-    yaw   = toDegrees(yaw);
-    pitch = toDegrees(pitch);
-    roll  = toDegrees(roll);
-}
-    
-
-CoordinateFrame CoordinateFrame::fromXYZYPRDegrees(float x, float y, float z, 
-                                                   float yaw, float pitch, float roll) {
-    return fromXYZYPRRadians(x, y, z, toRadians(yaw), toRadians(pitch), toRadians(roll));
-}
-
-
-Ray CoordinateFrame::lookRay() const {
-    return Ray::fromOriginAndDirection(translation, lookVector());
-}
-
-
-bool CoordinateFrame::fuzzyEq(const CoordinateFrame& other) const {
-
-    for (int c = 0; c < 3; ++c) {
-        for (int r = 0; r < 3; ++r) {
-            if (! G3D::fuzzyEq(other.rotation[r][c], rotation[r][c])) {
-                return false;
-            }
-        }
-        if (! G3D::fuzzyEq(translation[c], other.translation[c])) {
-            return false;
-        }
-    }
-
-    return true;
-}
-
-
-bool CoordinateFrame::fuzzyIsIdentity() const {
-    const Matrix3& I = Matrix3::identity();
-
-    for (int c = 0; c < 3; ++c) {
-        for (int r = 0; r < 3; ++r) {
-            if (fuzzyNe(I[r][c], rotation[r][c])) {
-                return false;
-            }
-        }
-        if (fuzzyNe(translation[c], 0)) {
-            return false;
-        }
-    }
-
-    return true;
-}
-
-
-bool CoordinateFrame::isIdentity() const {
-    return 
-        (translation == Vector3::zero()) &&
-        (rotation == Matrix3::identity());
-}
-
-
-Matrix4 CoordinateFrame::toMatrix4() const {
-    return Matrix4(*this);
-}
-
-
-std::string CoordinateFrame::toXML() const {
-    return G3D::format(
-        "\n  %lf,%lf,%lf,%lf,\n  %lf,%lf,%lf,%lf,\n  %lf,%lf,%lf,%lf,\n  %lf,%lf,%lf,%lf\n\n",
-        rotation[0][0], rotation[0][1], rotation[0][2], translation.x,
-        rotation[1][0], rotation[1][1], rotation[1][2], translation.y,
-        rotation[2][0], rotation[2][1], rotation[2][2], translation.z,
-        0.0, 0.0, 0.0, 1.0);
-}
-
-
-Plane CoordinateFrame::toObjectSpace(const Plane& p) const {
-    Vector3 N, P;
-    double d;
-    p.getEquation(N, d);
-    P = N * (float)d;
-    P = pointToObjectSpace(P);
-    N = normalToObjectSpace(N);
-    return Plane(N, P);
-}
-
-
-Plane CoordinateFrame::toWorldSpace(const Plane& p) const {
-    Vector3 N, P;
-    double d;
-    p.getEquation(N, d);
-    P = N * (float)d;
-    P = pointToWorldSpace(P);
-    N = normalToWorldSpace(N);
-    return Plane(N, P);
-}
-
-
-Triangle CoordinateFrame::toObjectSpace(const Triangle& t) const {
-    return Triangle(pointToObjectSpace(t.vertex(0)),
-        pointToObjectSpace(t.vertex(1)),
-        pointToObjectSpace(t.vertex(2)));
-}
-
-
-Triangle CoordinateFrame::toWorldSpace(const Triangle& t) const {
-    return Triangle(pointToWorldSpace(t.vertex(0)),
-        pointToWorldSpace(t.vertex(1)),
-        pointToWorldSpace(t.vertex(2)));
-}
-
-
-Cylinder CoordinateFrame::toWorldSpace(const Cylinder& c) const {
-    return Cylinder(
-        pointToWorldSpace(c.point(0)), 
-        pointToWorldSpace(c.point(1)), 
-        c.radius());
-}
-
-
-Capsule CoordinateFrame::toWorldSpace(const Capsule& c) const {
-    return Capsule(
-        pointToWorldSpace(c.point(0)), 
-        pointToWorldSpace(c.point(1)), 
-        c.radius());
-}
-
-
-Box CoordinateFrame::toWorldSpace(const AABox& b) const {
-    return toWorldSpace(Box(b));
-}
-
-
-Box CoordinateFrame::toWorldSpace(const Box& b) const {
-    Box out(b);
-
-    for (int i = 0; i < 8; ++i) {
-        out._corner[i] = pointToWorldSpace(out._corner[i]);
-        debugAssert(! isNaN(out._corner[i].x));
-    }
-
-    for (int i = 0; i < 3; ++i) {
-        out._axis[i] = vectorToWorldSpace(out._axis[i]);
-    }
-
-    out._center = pointToWorldSpace(out._center);
-
-    return out;
-}
-
-
-Box CoordinateFrame::toObjectSpace(const Box &b) const {
-    return inverse().toWorldSpace(b);
-}
-
-
-Box CoordinateFrame::toObjectSpace(const AABox& b) const {
-    return toObjectSpace(Box(b));
-}
-
-
-CoordinateFrame::CoordinateFrame(class BinaryInput& b) : rotation(Matrix3::zero()) {
-    deserialize(b);
-}
-
-
-void CoordinateFrame::deserialize(class BinaryInput& b) {
-    rotation.deserialize(b);
-    translation.deserialize(b);
-}
-
-
-void CoordinateFrame::serialize(class BinaryOutput& b) const {
-    rotation.serialize(b);
-    translation.serialize(b);
-}
-
-
-Sphere CoordinateFrame::toWorldSpace(const Sphere &b) const {
-    return Sphere(pointToWorldSpace(b.center), b.radius);
-}
-
-
-Sphere CoordinateFrame::toObjectSpace(const Sphere &b) const {
-    return Sphere(pointToObjectSpace(b.center), b.radius);
-}
-
-
-Ray CoordinateFrame::toWorldSpace(const Ray& r) const {
-    return Ray::fromOriginAndDirection(pointToWorldSpace(r.origin), vectorToWorldSpace(r.direction));
-}
-
-
-Ray CoordinateFrame::toObjectSpace(const Ray& r) const {
-    return Ray::fromOriginAndDirection(pointToObjectSpace(r.origin), vectorToObjectSpace(r.direction));
-}
-
-
-void CoordinateFrame::lookAt(const Vector3 &target) {
-    lookAt(target, Vector3::unitY());
-}
-
-
-void CoordinateFrame::lookAt(
-    const Vector3&  target,
-    Vector3         up) {
-
-    up = up.direction();
-
-    Vector3 look = (target - translation).direction();
-    if (fabs(look.dot(up)) > .99f) {
-        up = Vector3::unitX();
-        if (fabs(look.dot(up)) > .99f) {
-            up = Vector3::unitY();
-        }
-    }
-
-    up -= look * look.dot(up);
-    up.unitize();
-
-    Vector3 z = -look;
-    Vector3 x = -z.cross(up);
-    x.unitize();
-
-    Vector3 y = z.cross(x);
-
-    rotation.setColumn(0, x);
-    rotation.setColumn(1, y);
-    rotation.setColumn(2, z);
-}
-
-
-CoordinateFrame CoordinateFrame::lerp(
-    const CoordinateFrame&  other,
-    float                   alpha) const {
-
-    if (alpha == 1.0f) {
-        return other;
-    } else if (alpha == 0.0f) {
-        return *this;
-    } else {
-        Quat q1 = Quat(this->rotation);
-        Quat q2 = Quat(other.rotation);
-
-        return CoordinateFrame(
-            q1.slerp(q2, alpha).toRotationMatrix(),
-            this->translation * (1 - alpha) + other.translation * alpha);
-    }
-} 
-
-
-void CoordinateFrame::pointToWorldSpace(const Array& v, Array& vout) const {
-    vout.resize(v.size());
-
-    for (int i = v.size() - 1; i >= 0; --i) {
-        vout[i] = pointToWorldSpace(v[i]);
-    }
-}
-
-
-void CoordinateFrame::normalToWorldSpace(const Array& v, Array& vout) const  {
-    vout.resize(v.size());
-
-    for (int i = v.size() - 1; i >= 0; --i) {
-        vout[i] = normalToWorldSpace(v[i]);
-    }
-}
-
-
-void CoordinateFrame::vectorToWorldSpace(const Array& v, Array& vout) const {
-    vout.resize(v.size());
-
-    for (int i = v.size() - 1; i >= 0; --i) {
-        vout[i] = vectorToWorldSpace(v[i]);
-    }
-}
-
-
-void CoordinateFrame::pointToObjectSpace(const Array& v, Array& vout) const {
-    vout.resize(v.size());
-
-    for (int i = v.size() - 1; i >= 0; --i) {
-        vout[i] = pointToObjectSpace(v[i]);
-    }
-}
-
-
-void CoordinateFrame::normalToObjectSpace(const Array& v, Array& vout) const {
-    vout.resize(v.size());
-
-    for (int i = v.size() - 1; i >= 0; --i) {
-        vout[i] = normalToObjectSpace(v[i]);
-    }
-}
-
-
-void CoordinateFrame::vectorToObjectSpace(const Array& v, Array& vout) const {
-    vout.resize(v.size());
-
-    for (int i = v.size() - 1; i >= 0; --i) {
-        vout[i] = vectorToObjectSpace(v[i]);
-    }
-}
-
-} // namespace
diff --git a/externals/g3dlite/G3D.lib/source/Crypto.cpp b/externals/g3dlite/G3D.lib/source/Crypto.cpp
deleted file mode 100644
index 09aee2c265d..00000000000
--- a/externals/g3dlite/G3D.lib/source/Crypto.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- @file Crypto.cpp
-
- @author Morgan McGuire, matrix@graphics3d.com
-
-
- @created 2006-03-28
- @edited  2006-04-06
- */
-
-#include "G3D/platform.h"
-#include "G3D/Crypto.h"
-#include "G3D/g3dmath.h"
-#include 
-
-namespace G3D {
-    
-
-int Crypto::smallPrime(int n) {
-    debugAssert(n < numSmallPrimes() && n >= 0);
-
-    // From:
-    // http://primes.utm.edu/lists/small/1000.txt
-
-    static const int table[] = {
-          2,      3,      5,      7,     11,     13,     17,     19,     23,     29, 
-         31,     37,     41,     43,     47,     53,     59,     61,     67,     71, 
-         73,     79,     83,     89,     97,    101,    103,    107,    109,    113, 
-        127,    131,    137,    139,    149,    151,    157,    163,    167,    173, 
-        179,    181,    191,    193,    197,    199,    211,    223,    227,    229, 
-        233,    239,    241,    251,    257,    263,    269,    271,    277,    281, 
-        283,    293,    307,    311,    313,    317,    331,    337,    347,    349, 
-        353,    359,    367,    373,    379,    383,    389,    397,    401,    409, 
-        419,    421,    431,    433,    439,    443,    449,    457,    461,    463, 
-        467,    479,    487,    491,    499,    503,    509,    521,    523,    541, 
-        547,    557,    563,    569,    571,    577,    587,    593,    599,    601, 
-        607,    613,    617,    619,    631,    641,    643,    647,    653,    659, 
-        661,    673,    677,    683,    691,    701,    709,    719,    727,    733, 
-        739,    743,    751,    757,    761,    769,    773,    787,    797,    809, 
-        811,    821,    823,    827,    829,    839,    853,    857,    859,    863, 
-        877,    881,    883,    887,    907,    911,    919,    929,    937,    941, 
-        947,    953,    967,    971,    977,    983,    991,    997,   1009,   1013, 
-       1019,   1021,   1031,   1033,   1039,   1049,   1051,   1061,   1063,   1069, 
-       1087,   1091,   1093,   1097,   1103,   1109,   1117,   1123,   1129,   1151, 
-       1153,   1163,   1171,   1181,   1187,   1193,   1201,   1213,   1217,   1223, 
-       1229,   1231,   1237,   1249,   1259,   1277,   1279,   1283,   1289,   1291, 
-       1297,   1301,   1303,   1307,   1319,   1321,   1327,   1361,   1367,   1373, 
-       1381,   1399,   1409,   1423,   1427,   1429,   1433,   1439,   1447,   1451, 
-       1453,   1459,   1471,   1481,   1483,   1487,   1489,   1493,   1499,   1511, 
-       1523,   1531,   1543,   1549,   1553,   1559,   1567,   1571,   1579,   1583, 
-       1597,   1601,   1607,   1609,   1613,   1619,   1621,   1627,   1637,   1657, 
-       1663,   1667,   1669,   1693,   1697,   1699,   1709,   1721,   1723,   1733, 
-       1741,   1747,   1753,   1759,   1777,   1783,   1787,   1789,   1801,   1811,
-       1823,   1831,   1847,   1861,   1867,   1871,   1873,   1877,   1879,   1889, 
-       1901,   1907,   1913,   1931,   1933,   1949,   1951,   1973,   1979,   1987, 
-       1993,   1997,   1999};
-
-    return table[n];
-}
-
-
-int Crypto::numSmallPrimes() {
-    return 303;
-}
-
-uint32 Crypto::crc32(const void* byte, size_t numBytes) {
-    return ::crc32(::crc32(0, Z_NULL, 0), static_cast(byte), numBytes);
-}
-
-} // G3D
diff --git a/externals/g3dlite/G3D.lib/source/Crypto_md5.cpp b/externals/g3dlite/G3D.lib/source/Crypto_md5.cpp
deleted file mode 100644
index 4aa24c39f9c..00000000000
--- a/externals/g3dlite/G3D.lib/source/Crypto_md5.cpp
+++ /dev/null
@@ -1,471 +0,0 @@
-/**
- @file Crypto_md5.cpp
-
- @author Morgan McGuire, matrix@graphics3d.com
- Copyright 2006-2007, Morgan McGuire.  All rights reserved.
-
- @created 2006-03-28
- @edited  2006-04-06
- */
-
-#include "G3D/platform.h"
-#include "G3D/Crypto.h"
-#include "G3D/BinaryInput.h"
-#include "G3D/BinaryOutput.h"
-
-#include 
-
-namespace G3D {
-
-
-MD5Hash::MD5Hash(class BinaryInput& b) {
-    deserialize(b);
-}
-
-
-void MD5Hash::deserialize(class BinaryInput& b) {
-    b.readBytes(value, 16);
-}
-
-
-void MD5Hash::serialize(class BinaryOutput& b) const {
-    b.writeBytes(value, 16);
-}
-
-
-typedef unsigned char md5_byte_t; /* 8-bit byte */
-typedef unsigned int md5_word_t; /* 32-bit word */
-
-/* Define the state of the MD5 Algorithm. */
-typedef struct md5_state_s {
-    md5_word_t count[2];	/* message length in bits, lsw first */
-    md5_word_t abcd[4];		/* digest buffer */
-    md5_byte_t buf[64];		/* accumulate block */
-} md5_state_t;
-
-#ifdef __cplusplus
-extern "C" 
-{
-#endif
-
-/* Initialize the algorithm. */
-static void md5_init(md5_state_t *pms);
-
-/* Append a string to the message. */
-static void md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes);
-
-/* Finish the message and return the digest. */
-void md5_finish(md5_state_t *pms, md5_byte_t digest[16]);
-#ifdef __cplusplus
-}    
-#endif
-
-
-
-MD5Hash Crypto::md5(const void* data, size_t n) {
-    md5_state_t state;
-    md5_init(&state);
-    md5_append(&state, (const uint8*)data, (int)n);
-
-    MD5Hash h;
-    md5_finish(&state, &(h[0]));
-    return h;
-}
-
-/*
-  Copyright (C) 1999, 2000, 2002 Aladdin Enterprises.  All rights reserved.
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  L. Peter Deutsch
-  ghost@aladdin.com
-
- */
-/*
-  Independent implementation of MD5 (RFC 1321).
-
-  This code implements the MD5 Algorithm defined in RFC 1321, whose
-  text is available at
-	http://www.ietf.org/rfc/rfc1321.txt
-  The code is derived from the text of the RFC, including the test suite
-  (section A.5) but excluding the rest of Appendix A.  It does not include
-  any code or documentation that is identified in the RFC as being
-  copyrighted.
-
-  The original and principal author of md5.c is L. Peter Deutsch
-  .  Other authors are noted in the change history
-  that follows (in reverse chronological order):
-
-  2002-04-13 lpd Clarified derivation from RFC 1321; now handles byte order
-	either statically or dynamically; added missing #include 
-	in library.
-  2002-03-11 lpd Corrected argument list for main(), and added int return
-	type, in test program and T value program.
-  2002-02-21 lpd Added missing #include  in test program.
-  2000-07-03 lpd Patched to eliminate warnings about "constant is
-	unsigned in ANSI C, signed in traditional"; made test program
-	self-checking.
-  1999-11-04 lpd Edited comments slightly for automatic TOC extraction.
-  1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5).
-  1999-05-03 lpd Original version.
- */
-
-/*
- * This package supports both compile-time and run-time determination of CPU
- * byte order.  If ARCH_IS_BIG_ENDIAN is defined as 0, the code will be
- * compiled to run only on little-endian CPUs; if ARCH_IS_BIG_ENDIAN is
- * defined as non-zero, the code will be compiled to run only on big-endian
- * CPUs; if ARCH_IS_BIG_ENDIAN is not defined, the code will be compiled to
- * run on either big- or little-endian CPUs, but will run slightly less
- * efficiently on either one than if ARCH_IS_BIG_ENDIAN is defined.
- */
-
-
-#if defined(G3D_LINUX) || defined(G3D_OSX)
-#   if defined(G3D_OSX_PPC)
-#     include 
-#   elif defined(G3D_OSX_INTEL)
-#     include 
-#   elif defined(__linux__)
-#     include 
-#   elif defined(__FreeBSD__)
-#     include 
-#   endif
-#else
-#   define BYTE_ORDER 0
-#endif
-
-#define T_MASK ((md5_word_t)~0)
-#define T1 /* 0xd76aa478 */ (T_MASK ^ 0x28955b87)
-#define T2 /* 0xe8c7b756 */ (T_MASK ^ 0x173848a9)
-#define T3    0x242070db
-#define T4 /* 0xc1bdceee */ (T_MASK ^ 0x3e423111)
-#define T5 /* 0xf57c0faf */ (T_MASK ^ 0x0a83f050)
-#define T6    0x4787c62a
-#define T7 /* 0xa8304613 */ (T_MASK ^ 0x57cfb9ec)
-#define T8 /* 0xfd469501 */ (T_MASK ^ 0x02b96afe)
-#define T9    0x698098d8
-#define T10 /* 0x8b44f7af */ (T_MASK ^ 0x74bb0850)
-#define T11 /* 0xffff5bb1 */ (T_MASK ^ 0x0000a44e)
-#define T12 /* 0x895cd7be */ (T_MASK ^ 0x76a32841)
-#define T13    0x6b901122
-#define T14 /* 0xfd987193 */ (T_MASK ^ 0x02678e6c)
-#define T15 /* 0xa679438e */ (T_MASK ^ 0x5986bc71)
-#define T16    0x49b40821
-#define T17 /* 0xf61e2562 */ (T_MASK ^ 0x09e1da9d)
-#define T18 /* 0xc040b340 */ (T_MASK ^ 0x3fbf4cbf)
-#define T19    0x265e5a51
-#define T20 /* 0xe9b6c7aa */ (T_MASK ^ 0x16493855)
-#define T21 /* 0xd62f105d */ (T_MASK ^ 0x29d0efa2)
-#define T22    0x02441453
-#define T23 /* 0xd8a1e681 */ (T_MASK ^ 0x275e197e)
-#define T24 /* 0xe7d3fbc8 */ (T_MASK ^ 0x182c0437)
-#define T25    0x21e1cde6
-#define T26 /* 0xc33707d6 */ (T_MASK ^ 0x3cc8f829)
-#define T27 /* 0xf4d50d87 */ (T_MASK ^ 0x0b2af278)
-#define T28    0x455a14ed
-#define T29 /* 0xa9e3e905 */ (T_MASK ^ 0x561c16fa)
-#define T30 /* 0xfcefa3f8 */ (T_MASK ^ 0x03105c07)
-#define T31    0x676f02d9
-#define T32 /* 0x8d2a4c8a */ (T_MASK ^ 0x72d5b375)
-#define T33 /* 0xfffa3942 */ (T_MASK ^ 0x0005c6bd)
-#define T34 /* 0x8771f681 */ (T_MASK ^ 0x788e097e)
-#define T35    0x6d9d6122
-#define T36 /* 0xfde5380c */ (T_MASK ^ 0x021ac7f3)
-#define T37 /* 0xa4beea44 */ (T_MASK ^ 0x5b4115bb)
-#define T38    0x4bdecfa9
-#define T39 /* 0xf6bb4b60 */ (T_MASK ^ 0x0944b49f)
-#define T40 /* 0xbebfbc70 */ (T_MASK ^ 0x4140438f)
-#define T41    0x289b7ec6
-#define T42 /* 0xeaa127fa */ (T_MASK ^ 0x155ed805)
-#define T43 /* 0xd4ef3085 */ (T_MASK ^ 0x2b10cf7a)
-#define T44    0x04881d05
-#define T45 /* 0xd9d4d039 */ (T_MASK ^ 0x262b2fc6)
-#define T46 /* 0xe6db99e5 */ (T_MASK ^ 0x1924661a)
-#define T47    0x1fa27cf8
-#define T48 /* 0xc4ac5665 */ (T_MASK ^ 0x3b53a99a)
-#define T49 /* 0xf4292244 */ (T_MASK ^ 0x0bd6ddbb)
-#define T50    0x432aff97
-#define T51 /* 0xab9423a7 */ (T_MASK ^ 0x546bdc58)
-#define T52 /* 0xfc93a039 */ (T_MASK ^ 0x036c5fc6)
-#define T53    0x655b59c3
-#define T54 /* 0x8f0ccc92 */ (T_MASK ^ 0x70f3336d)
-#define T55 /* 0xffeff47d */ (T_MASK ^ 0x00100b82)
-#define T56 /* 0x85845dd1 */ (T_MASK ^ 0x7a7ba22e)
-#define T57    0x6fa87e4f
-#define T58 /* 0xfe2ce6e0 */ (T_MASK ^ 0x01d3191f)
-#define T59 /* 0xa3014314 */ (T_MASK ^ 0x5cfebceb)
-#define T60    0x4e0811a1
-#define T61 /* 0xf7537e82 */ (T_MASK ^ 0x08ac817d)
-#define T62 /* 0xbd3af235 */ (T_MASK ^ 0x42c50dca)
-#define T63    0x2ad7d2bb
-#define T64 /* 0xeb86d391 */ (T_MASK ^ 0x14792c6e)
-
-
-static void
-md5_process(md5_state_t *pms, const md5_byte_t *data /*[64]*/)
-{
-    md5_word_t
-	a = pms->abcd[0], b = pms->abcd[1],
-	c = pms->abcd[2], d = pms->abcd[3];
-    md5_word_t t;
-#if BYTE_ORDER > 0
-    /* Define storage only for big-endian CPUs. */
-    md5_word_t X[16];
-#else
-    /* Define storage for little-endian or both types of CPUs. */
-    md5_word_t xbuf[16];
-    const md5_word_t *X;
-#endif
-
-    {
-#if BYTE_ORDER == 0
-	/*
-	 * Determine dynamically whether this is a big-endian or
-	 * little-endian machine, since we can use a more efficient
-	 * algorithm on the latter.
-	 */
-	static const int w = 1;
-
-	if (*((const md5_byte_t *)&w)) /* dynamic little-endian */
-#endif
-#if BYTE_ORDER <= 0		/* little-endian */
-	{
-	    /*
-	     * On little-endian machines, we can process properly aligned
-	     * data without copying it.
-	     */
-	    if (!((data - (const md5_byte_t *)0) & 3)) {
-		/* data are properly aligned */
-		X = (const md5_word_t *)data;
-	    } else {
-		/* not aligned */
-		memcpy(xbuf, data, 64);
-		X = xbuf;
-	    }
-	}
-#endif
-#if BYTE_ORDER == 0
-	else			/* dynamic big-endian */
-#endif
-#if BYTE_ORDER >= 0		/* big-endian */
-	{
-	    /*
-	     * On big-endian machines, we must arrange the bytes in the
-	     * right order.
-	     */
-	    const md5_byte_t *xp = data;
-	    int i;
-
-#  if BYTE_ORDER == 0
-	    X = xbuf;		/* (dynamic only) */
-#  else
-#    define xbuf X		/* (static only) */
-#  endif
-	    for (i = 0; i < 16; ++i, xp += 4)
-		xbuf[i] = xp[0] + (xp[1] << 8) + (xp[2] << 16) + (xp[3] << 24);
-	}
-#endif
-    }
-
-#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32 - (n))))
-
-    /* Round 1. */
-    /* Let [abcd k s i] denote the operation
-       a = b + ((a + F(b,c,d) + X[k] + T[i]) <<< s). */
-#define F(x, y, z) (((x) & (y)) | (~(x) & (z)))
-#define SET(a, b, c, d, k, s, Ti)\
-  t = a + F(b,c,d) + X[k] + Ti;\
-  a = ROTATE_LEFT(t, s) + b
-    /* Do the following 16 operations. */
-    SET(a, b, c, d,  0,  7,  T1);
-    SET(d, a, b, c,  1, 12,  T2);
-    SET(c, d, a, b,  2, 17,  T3);
-    SET(b, c, d, a,  3, 22,  T4);
-    SET(a, b, c, d,  4,  7,  T5);
-    SET(d, a, b, c,  5, 12,  T6);
-    SET(c, d, a, b,  6, 17,  T7);
-    SET(b, c, d, a,  7, 22,  T8);
-    SET(a, b, c, d,  8,  7,  T9);
-    SET(d, a, b, c,  9, 12, T10);
-    SET(c, d, a, b, 10, 17, T11);
-    SET(b, c, d, a, 11, 22, T12);
-    SET(a, b, c, d, 12,  7, T13);
-    SET(d, a, b, c, 13, 12, T14);
-    SET(c, d, a, b, 14, 17, T15);
-    SET(b, c, d, a, 15, 22, T16);
-#undef SET
-
-     /* Round 2. */
-     /* Let [abcd k s i] denote the operation
-          a = b + ((a + G(b,c,d) + X[k] + T[i]) <<< s). */
-#define G(x, y, z) (((x) & (z)) | ((y) & ~(z)))
-#define SET(a, b, c, d, k, s, Ti)\
-  t = a + G(b,c,d) + X[k] + Ti;\
-  a = ROTATE_LEFT(t, s) + b
-     /* Do the following 16 operations. */
-    SET(a, b, c, d,  1,  5, T17);
-    SET(d, a, b, c,  6,  9, T18);
-    SET(c, d, a, b, 11, 14, T19);
-    SET(b, c, d, a,  0, 20, T20);
-    SET(a, b, c, d,  5,  5, T21);
-    SET(d, a, b, c, 10,  9, T22);
-    SET(c, d, a, b, 15, 14, T23);
-    SET(b, c, d, a,  4, 20, T24);
-    SET(a, b, c, d,  9,  5, T25);
-    SET(d, a, b, c, 14,  9, T26);
-    SET(c, d, a, b,  3, 14, T27);
-    SET(b, c, d, a,  8, 20, T28);
-    SET(a, b, c, d, 13,  5, T29);
-    SET(d, a, b, c,  2,  9, T30);
-    SET(c, d, a, b,  7, 14, T31);
-    SET(b, c, d, a, 12, 20, T32);
-#undef SET
-
-     /* Round 3. */
-     /* Let [abcd k s t] denote the operation
-          a = b + ((a + H(b,c,d) + X[k] + T[i]) <<< s). */
-#define H(x, y, z) ((x) ^ (y) ^ (z))
-#define SET(a, b, c, d, k, s, Ti)\
-  t = a + H(b,c,d) + X[k] + Ti;\
-  a = ROTATE_LEFT(t, s) + b
-     /* Do the following 16 operations. */
-    SET(a, b, c, d,  5,  4, T33);
-    SET(d, a, b, c,  8, 11, T34);
-    SET(c, d, a, b, 11, 16, T35);
-    SET(b, c, d, a, 14, 23, T36);
-    SET(a, b, c, d,  1,  4, T37);
-    SET(d, a, b, c,  4, 11, T38);
-    SET(c, d, a, b,  7, 16, T39);
-    SET(b, c, d, a, 10, 23, T40);
-    SET(a, b, c, d, 13,  4, T41);
-    SET(d, a, b, c,  0, 11, T42);
-    SET(c, d, a, b,  3, 16, T43);
-    SET(b, c, d, a,  6, 23, T44);
-    SET(a, b, c, d,  9,  4, T45);
-    SET(d, a, b, c, 12, 11, T46);
-    SET(c, d, a, b, 15, 16, T47);
-    SET(b, c, d, a,  2, 23, T48);
-#undef SET
-
-     /* Round 4. */
-     /* Let [abcd k s t] denote the operation
-          a = b + ((a + I(b,c,d) + X[k] + T[i]) <<< s). */
-#define I(x, y, z) ((y) ^ ((x) | ~(z)))
-#define SET(a, b, c, d, k, s, Ti)\
-  t = a + I(b,c,d) + X[k] + Ti;\
-  a = ROTATE_LEFT(t, s) + b
-     /* Do the following 16 operations. */
-    SET(a, b, c, d,  0,  6, T49);
-    SET(d, a, b, c,  7, 10, T50);
-    SET(c, d, a, b, 14, 15, T51);
-    SET(b, c, d, a,  5, 21, T52);
-    SET(a, b, c, d, 12,  6, T53);
-    SET(d, a, b, c,  3, 10, T54);
-    SET(c, d, a, b, 10, 15, T55);
-    SET(b, c, d, a,  1, 21, T56);
-    SET(a, b, c, d,  8,  6, T57);
-    SET(d, a, b, c, 15, 10, T58);
-    SET(c, d, a, b,  6, 15, T59);
-    SET(b, c, d, a, 13, 21, T60);
-    SET(a, b, c, d,  4,  6, T61);
-    SET(d, a, b, c, 11, 10, T62);
-    SET(c, d, a, b,  2, 15, T63);
-    SET(b, c, d, a,  9, 21, T64);
-#undef SET
-
-     /* Then perform the following additions. (That is increment each
-        of the four registers by the value it had before this block
-        was started.) */
-    pms->abcd[0] += a;
-    pms->abcd[1] += b;
-    pms->abcd[2] += c;
-    pms->abcd[3] += d;
-}
-
-void
-md5_init(md5_state_t *pms)
-{
-    pms->count[0] = pms->count[1] = 0;
-    pms->abcd[0] = 0x67452301;
-    pms->abcd[1] = /*0xefcdab89*/ T_MASK ^ 0x10325476;
-    pms->abcd[2] = /*0x98badcfe*/ T_MASK ^ 0x67452301;
-    pms->abcd[3] = 0x10325476;
-}
-
-void
-md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes)
-{
-    const md5_byte_t *p = data;
-    int left = nbytes;
-    int offset = (pms->count[0] >> 3) & 63;
-    md5_word_t nbits = (md5_word_t)(nbytes << 3);
-
-    if (nbytes <= 0)
-	return;
-
-    /* Update the message length. */
-    pms->count[1] += nbytes >> 29;
-    pms->count[0] += nbits;
-    if (pms->count[0] < nbits)
-	pms->count[1]++;
-
-    /* Process an initial partial block. */
-    if (offset) {
-	int copy = (offset + nbytes > 64 ? 64 - offset : nbytes);
-
-	memcpy(pms->buf + offset, p, copy);
-	if (offset + copy < 64)
-	    return;
-	p += copy;
-	left -= copy;
-	md5_process(pms, pms->buf);
-    }
-
-    /* Process full blocks. */
-    for (; left >= 64; p += 64, left -= 64)
-	md5_process(pms, p);
-
-    /* Process a final partial block. */
-    if (left)
-	memcpy(pms->buf, p, left);
-}
-
-void
-md5_finish(md5_state_t *pms, md5_byte_t digest[16])
-{
-    static const md5_byte_t pad[64] = {
-	0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-    };
-    md5_byte_t data[8];
-    int i;
-
-    /* Save the length before padding. */
-    for (i = 0; i < 8; ++i)
-	data[i] = (md5_byte_t)(pms->count[i >> 2] >> ((i & 3) << 3));
-    /* Pad to 56 bytes mod 64. */
-    md5_append(pms, pad, ((55 - (pms->count[0] >> 3)) & 63) + 1);
-    /* Append the length. */
-    md5_append(pms, data, 8);
-    for (i = 0; i < 16; ++i)
-	digest[i] = (md5_byte_t)(pms->abcd[i >> 2] >> ((i & 3) << 3));
-}
-
-}
diff --git a/externals/g3dlite/G3D.lib/source/Cylinder.cpp b/externals/g3dlite/G3D.lib/source/Cylinder.cpp
deleted file mode 100644
index bdc7d56be23..00000000000
--- a/externals/g3dlite/G3D.lib/source/Cylinder.cpp
+++ /dev/null
@@ -1,176 +0,0 @@
-/**
- @file Cylinder.cpp
-  
- @maintainer Morgan McGuire, matrix@graphics3d.com
-
- @created 2003-02-07
- @edited  2006-02-18
-
- Copyright 2000-2006, Morgan McGuire.
- All rights reserved.
- */
-
-#include "G3D/platform.h"
-#include "G3D/Cylinder.h"
-#include "G3D/BinaryInput.h"
-#include "G3D/BinaryOutput.h"
-#include "G3D/LineSegment.h"
-#include "G3D/CoordinateFrame.h"
-#include "G3D/Line.h"
-#include "G3D/AABox.h"
-
-namespace G3D {
-
-Cylinder::Cylinder(class BinaryInput& b) {
-	deserialize(b);
-}
-
-
-Cylinder::Cylinder() {
-}
-
-
-Cylinder::Cylinder(const Vector3& _p1, const Vector3& _p2, float _r) 
-	: p1(_p1), p2(_p2), mRadius(_r) {
-}
-
-
-void Cylinder::serialize(class BinaryOutput& b) const {
-	p1.serialize(b);
-	p2.serialize(b);
-	b.writeFloat64(mRadius);
-}
-
-
-void Cylinder::deserialize(class BinaryInput& b) {
-	p1.deserialize(b);
-	p2.deserialize(b);
-	mRadius = b.readFloat64();
-}
-
-
-Line Cylinder::axis() const {
-	return Line::fromTwoPoints(p1, p2);
-}
-
-
-
-float Cylinder::radius() const {
-	return mRadius;
-}
-
-
-float Cylinder::volume() const {
-	return
-		(float)pi() * square(mRadius) * (p1 - p2).magnitude();
-}
-
-
-float Cylinder::area() const {
-	return
-        // Sides
-		(twoPi() * mRadius) * height() +
-
-         // Caps
-         twoPi() * square(mRadius);
-}
-
-void Cylinder::getBounds(AABox& out) const {
-    Vector3 min = p1.min(p2) - (Vector3(1, 1, 1) * mRadius);
-    Vector3 max = p1.max(p2) + (Vector3(1, 1, 1) * mRadius);
-    out = AABox(min, max);
-}
-
-bool Cylinder::contains(const Vector3& p) const { 
-    return LineSegment::fromTwoPoints(p1, p2).distanceSquared(p) <= square(mRadius);
-}
-
-
-void Cylinder::getReferenceFrame(CoordinateFrame& cframe) const {
-    cframe.translation = center();
-
-    Vector3 Y = (p1 - p2).direction();
-    Vector3 X = (abs(Y.dot(Vector3::unitX())) > 0.9) ? Vector3::unitY() : Vector3::unitX();
-    Vector3 Z = X.cross(Y).direction();
-    X = Y.cross(Z);        
-    cframe.rotation.setColumn(0, X);
-    cframe.rotation.setColumn(1, Y);
-    cframe.rotation.setColumn(2, Z);
-}
-
-
-void Cylinder::getRandomSurfacePoint(Vector3& p, Vector3& N) const {
-    float h = height();
-    float r = radius();
-
-    // Create a random point on a standard cylinder and then rotate to the global frame.
-
-    // Relative areas (factor of 2PI already taken out)
-    float capRelArea  = square(r) / 2.0f;
-    float sideRelArea = r * h;
-
-    float r1 = uniformRandom(0, capRelArea * 2 + sideRelArea);
-
-    if (r1 < capRelArea * 2) {
-
-        // Select a point uniformly at random on a disk
-        // @cite http://mathworld.wolfram.com/DiskPointPicking.html
-        float a = uniformRandom(0, (float)twoPi());
-        float r2 = sqrt(uniformRandom(0, 1)) * r;
-        p.x = cos(a) * r2;
-        p.z = sin(a) * r2;
-
-        N.x = 0;
-        N.z = 0;
-        if (r1 < capRelArea) {
-            // Top
-            p.y = h / 2.0f;
-            N.y = 1;
-        } else {
-            // Bottom
-            p.y = -h / 2.0f;
-            N.y = -1;
-        }
-    } else {
-        // Side
-        float a = uniformRandom(0, (float)twoPi());
-        N.x = cos(a);
-        N.y = 0;
-        N.z = sin(a);
-        p.x = N.x * r;
-        p.z = N.y * r;
-        p.y = uniformRandom(-h / 2.0f, h / 2.0f);
-    }
-
-    // Transform to world space
-    CoordinateFrame cframe;
-    getReferenceFrame(cframe);
-    
-    p = cframe.pointToWorldSpace(p);
-    N = cframe.normalToWorldSpace(N);
-}
-
-
-Vector3 Cylinder::randomInteriorPoint() const {
-    float h = height();
-    float r = radius();
-
-    // Create a random point in a standard cylinder and then rotate to the global frame.
-
-    // Select a point uniformly at random on a disk
-    // @cite http://mathworld.wolfram.com/DiskPointPicking.html
-    float a = uniformRandom(0, (float)twoPi());
-    float r2 = sqrt(uniformRandom(0, 1)) * r;
-
-    Vector3 p(  cos(a) * r2,
-                uniformRandom(-h / 2.0f, h / 2.0f),
-                sin(a) * r2);
-
-    // Transform to world space
-    CoordinateFrame cframe;
-    getReferenceFrame(cframe);
-    
-    return cframe.pointToWorldSpace(p);
-}
-
-} // namespace
diff --git a/externals/g3dlite/G3D.lib/source/Discovery.cpp b/externals/g3dlite/G3D.lib/source/Discovery.cpp
deleted file mode 100644
index 2c27c5bf2b9..00000000000
--- a/externals/g3dlite/G3D.lib/source/Discovery.cpp
+++ /dev/null
@@ -1,170 +0,0 @@
-/**
-  @file Discovery.cpp
-  
-  @maintainer Morgan McGuire, matrix@graphics3d.com
- 
-  @created 2003-06-26
-  @edited  2005-02-24
- */
-
-#include "G3D/Discovery.h"
-#include "G3D/BinaryInput.h"
-#include "G3D/BinaryOutput.h"
-
-#include 
-
-namespace G3D {
-
-///////////////////////////////////////////////////////////////////////////////////////////
-
-void DiscoveryAdvertisement::serialize(BinaryOutput& b) const {
-    address.serialize(b);
-}
-
-void DiscoveryAdvertisement::deserialize(BinaryInput& b) {
-    address.deserialize(b);
-    lastUpdateTime = System::time();
-}
-
-
-///////////////////////////////////////////////////////////////////////////////////////////
-
-void DiscoveryServerAddressMessage::serialize(BinaryOutput& b) const {
-    b.writeString(G3D_DISCOVERY_PROTOCOL_NAME);
-    b.writeInt32(G3D_DISCOVERY_PROTOCOL_VERSION);
-    b.writeString(settings->appProtocolName);
-    b.writeInt32(settings->appProtocolVersion);
-
-    // Send addresses
-    b.writeInt32(address.size());
-    for (int i = 0; i < address.size(); ++i) {
-        address[i].serialize(b);
-    }
-}
-
-
-void DiscoveryServerAddressMessage::deserialize(BinaryInput& b) {
-    address.clear();
-    correctProtocol = false;
-    serverProtocolVersion[0] = 0;
-    serverProtocolVersion[1] = 0;
-
-    // Verify that we are on the same protocol
-    if (b.readString(strlen(G3D_DISCOVERY_PROTOCOL_NAME) + 1) != G3D_DISCOVERY_PROTOCOL_NAME) {
-        return;
-    }
-
-    serverProtocolVersion[0] = b.readInt32();
-    if (serverProtocolVersion[0] != G3D_DISCOVERY_PROTOCOL_VERSION) {
-        return;
-    }
-
-    if (b.readString() != settings->appProtocolName) {
-        return;
-    }
-
-    serverProtocolVersion[1] = b.readInt32();
-    if (serverProtocolVersion[1] != settings->appProtocolVersion) {
-        return;
-    }
-
-    correctProtocol = true;
-
-    address.resize(b.readInt32());
-    for (int i = 0; i < address.size(); ++i) {
-        address[i].deserialize(b);
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////
-
-void DiscoveryServer::sendAnnouncement() const {
-    NetAddress broadcast(NetworkDevice::instance()->broadcastAddressArray()[0], settings->serverBroadcastPort);
-
-    net->send(broadcast, SERVER_BROADCAST_MESSAGE, addressMessage);
-
-    const_cast(this)->lastBroadcast = System::time();
-}
-
-
-void DiscoveryServer::sendShutDown() const {
-    NetAddress broadcast(NetworkDevice::instance()->broadcastAddressArray()[0], settings->serverBroadcastPort);
-    ShutdownMessage s;
-    net->send(broadcast, SERVER_SHUTDOWN_MESSAGE, s);
-}
-
-
-bool DiscoveryServer::ok() const {
-    return listener->ok() && net->ok();
-}
-
-
-void DiscoveryServer::init(
-    const DiscoverySettings* _settings,
-    DiscoveryAdvertisement*  _advertisement) {
-
-    Discovery::init(_settings);
-
-    advertisement = _advertisement;
-    addressMessage.settings = settings;
-    NetworkDevice::instance()->localHostAddresses(addressMessage.address);
-
-    // Set the port number
-    for (int i = 0; i < addressMessage.address.size(); ++i) {
-        addressMessage.address[i] =
-            NetAddress(addressMessage.address[i].ip(),
-                       settings->serverAdvertisementPort);
-    }
-
-    net = LightweightConduit::create(settings->clientBroadcastPort, true, true);
-
-    listener = NetListener::create(settings->serverAdvertisementPort);
-
-    // Send initial announcement
-    sendAnnouncement();
-}
-
-
-void DiscoveryServer::doNetwork() {
-    const RealTime UNSOLICITED_BROADCAST_PERIOD = 60;
-
-    // Check for client broadcast requests
-
-    if (net->messageWaiting()) {
-        // Some client broadcast that it is looking for servers.
-        // Respond by sending out our announcement to everyone
-        // (avoids having to figure out if the message return address
-        // is correct).
-        NetAddress dummy;
-        net->receive(dummy);
-        sendAnnouncement();
-    } else if (System::time() > lastBroadcast + UNSOLICITED_BROADCAST_PERIOD) {
-        sendAnnouncement();
-    }
-
-    // Handle incoming connections
-
-    if (listener->clientWaiting()) {
-        // Respond to this client
-        ReliableConduitRef client = listener->waitForConnection();
-        client->send(SERVER_BROADCAST_MESSAGE, *advertisement);
-    }
-}
-
-
-void DiscoveryServer::cleanup() {
-    sendShutDown();
-}
-
-//////////////////////////////////////////////////////////////////////////////////
-
-std::string IncompatibleServerDescription::toString() const {
-    return std::string("Incompatible server at ") + address.toString() +
-        format(", version %d.%d", protocolVersion[0], protocolVersion[1]);
-}
-
-//////////////////////////////////////////////////////////////////////////////////
-
-
-}
-
diff --git a/externals/g3dlite/G3D.lib/source/GCamera.cpp b/externals/g3dlite/G3D.lib/source/GCamera.cpp
deleted file mode 100644
index e70188377e6..00000000000
--- a/externals/g3dlite/G3D.lib/source/GCamera.cpp
+++ /dev/null
@@ -1,399 +0,0 @@
-/**
-  @file GCamera.cpp
-
-  @author Morgan McGuire, matrix@graphics3d.com
-  @author Jeff Marsceill, 08jcm@williams.edu
- 
-  @created 2005-07-20
-  @edited  2007-07-24
-*/
-#include "G3D/GCamera.h"
-#include "G3D/platform.h"
-#include "G3D/Rect2D.h"
-#include "G3D/BinaryInput.h"
-#include "G3D/BinaryOutput.h"
-#include "G3D/Ray.h"
-#include "G3D/Matrix4.h"
-
-namespace G3D {
-
-GCamera::GCamera() {
-    setNearPlaneZ(-0.1f);
-    setFarPlaneZ(-(float)inf());
-    setFieldOfView((float)toRadians(55.0f), VERTICAL);
-}
-
-
-GCamera::~GCamera() {
-}
-
-void GCamera::getCoordinateFrame(CoordinateFrame& c) const {
-    c = m_cframe;
-}
-
-void GCamera::setCoordinateFrame(const CoordinateFrame& c) {
-    m_cframe = c;
-}
-
-void GCamera::setFieldOfView(float angle, FOVDirection dir) {
-    debugAssert((angle < pi()) && (angle > 0));
-    
-    m_fieldOfView = angle;
-    m_direction = dir;
-}
- 
-float GCamera::imagePlaneDepth() const{
-    return -m_nearPlaneZ;
-}
-
-float GCamera::viewportWidth(const Rect2D& viewport) const {
-    // Compute the side of a square at the near plane based on our field of view
-    float s = 2.0f * -m_nearPlaneZ * tan(m_fieldOfView * 0.5f);
-
-    if (m_direction == VERTICAL) {
-        s *= viewport.width() / viewport.height();
-    }
-
-    return s;
-}
-
-float GCamera::viewportHeight(const Rect2D& viewport) const {
-    // Compute the side of a square at the near plane based on our field of view
-    float s = 2.0f * -m_nearPlaneZ * tan(m_fieldOfView * 0.5f);
-
-    if (m_direction == HORIZONTAL) {
-        s *= viewport.height() / viewport.width();
-    }
-
-    return s;
-}
-
-Ray GCamera::worldRay(float x, float y, const Rect2D& viewport) const {
-
-    int screenWidth  = iFloor(viewport.width());
-    int screenHeight = iFloor(viewport.height());
-
-    Ray out;
-    out.origin = m_cframe.translation;
-
-    float cx = screenWidth  / 2.0f;
-    float cy = screenHeight / 2.0f;
-
-    out.direction = Vector3( (x - cx) * viewportWidth(viewport)  / screenWidth,
-                            -(y - cy) * viewportHeight(viewport) / screenHeight,
-                             (m_nearPlaneZ) );
-
-    out.direction = m_cframe.vectorToWorldSpace(out.direction);
-
-    // Normalize the direction (we didn't do it before)
-    out.direction = out.direction.direction();
-
-    return out;
-}
-
-/** 
-This is the matrix that a RenderDevice (or OpenGL) uses as the projection matrix.
-@sa RenderDevice::setProjectionAndCameraMatrix, RenderDevice::setProjectionMatrix, Matrix4::perspectiveProjection
-*/
-void GCamera::getProjectUnitMatrix(const Rect2D& viewport, Matrix4& P) const{
-
-    float screenWidth  = viewport.width();
-    float screenHeight = viewport.height();
-
-    float r, l, t, b, n, f, x, y;
-
-    if(m_direction == VERTICAL){
-        y = -m_nearPlaneZ * tan(m_fieldOfView / 2);
-        x = y * (screenWidth / screenHeight);
-    }
-    else{ //m_direction == HORIZONTAL
-        x = -m_nearPlaneZ * tan(m_fieldOfView / 2);
-        y = x * (screenHeight / screenWidth);
-    }
-
-    n = -m_nearPlaneZ;
-    f = -m_farPlaneZ;
-    r = x;
-    l = -x;
-    t = y;
-    b = -y;
-
-    P = Matrix4::perspectiveProjection(l, r, b, t, n, f);
-}
-
-Vector3 GCamera::projectUnit(const Vector3& point, const Rect2D& viewport) const {
-    Matrix4 M;
-    getProjectUnitMatrix(viewport, M);
-
-    Vector4 cameraSpacePoint(coordinateFrame().pointToObjectSpace(point), 1.0f);
-    const Vector4& screenSpacePoint = M * cameraSpacePoint;
-
-    return Vector3(screenSpacePoint.xyz() / screenSpacePoint.w);
-}
-
-Vector3 GCamera::project(const Vector3& point,
-                          const Rect2D&  viewport) const {
-
-    // Find the point in the homogeneous cube
-    const Vector3& cube = projectUnit(point, viewport);
-
-    return convertFromUnitToNormal(cube, viewport);
-}
-
-Vector3 GCamera::unprojectUnit(const Vector3& v, const Rect2D& viewport) const {
-
-    const Vector3& projectedPoint = convertFromUnitToNormal(v, viewport);
-
-    return unproject(projectedPoint, viewport);
-}
-
-
-Vector3 GCamera::unproject(const Vector3& v, const Rect2D& viewport) const {
-    
-    const float n = m_nearPlaneZ;
-    const float f = m_farPlaneZ;
-
-    float z;
-
-    if (-f >= inf()) {
-        // Infinite far plane
-        z = 1.0f / (((-1.0f / n) * v.z) + 1.0f / n);
-    } else {
-        z = 1.0f / ((((1.0f / f) - (1.0f / n)) * v.z) + 1.0f / n);
-    }
-
-    const Ray& ray = worldRay(v.x, v.y, viewport);
-
-    // Find out where the ray reaches the specified depth.
-    const Vector3& out = ray.origin + ray.direction * -z / (ray.direction.dot(m_cframe.lookVector()));
-
-    return out;
-}
-
-float GCamera::worldToScreenSpaceArea(float area, float z, const Rect2D& viewport) const {
-    if (z >= 0) {
-        return (float)inf();
-    }
-    return area * (float)square(imagePlaneDepth() / z);
-}
-
-
-void GCamera::getClipPlanes(
-    const Rect2D&       viewport,
-    Array&       clip) const {
-
-    Frustum fr;
-    frustum(viewport, fr);
-    clip.resize(fr.faceArray.size(), DONT_SHRINK_UNDERLYING_ARRAY);
-    for (int f = 0; f < clip.size(); ++f) {
-        clip[f] = fr.faceArray[f].plane;
-    }
-}
- 
-GCamera::Frustum GCamera::frustum(const Rect2D& viewport) const {
-    Frustum f;
-    frustum(viewport, f);
-    return f;
-}
-
-void GCamera::frustum(const Rect2D& viewport, Frustum& fr) const {
-
-    // The volume is the convex hull of the vertices definining the view
-    // frustum and the light source point at infinity.
-
-    const float x               = viewportWidth(viewport) / 2;
-    const float y               = viewportHeight(viewport) / 2;
-    const float z               = m_nearPlaneZ;
-    const float w               = z / -m_farPlaneZ;
-    float fovx;
-
-    fovx = m_fieldOfView;
-    if (m_direction == VERTICAL) {
-        fovx *= x / y;
-    } 
-
-    // Near face (ccw from UR)
-    fr.vertexPos.append(
-        Vector4( x,  y, z, 1),
-        Vector4(-x,  y, z, 1),
-        Vector4(-x, -y, z, 1),
-        Vector4( x, -y, z, 1));
-
-    // Far face (ccw from UR, from origin)
-    fr.vertexPos.append(
-        Vector4( x,  y, z, w),
-        Vector4(-x,  y, z, w),
-        Vector4(-x, -y, z, w),
-        Vector4( x, -y, z, w));
-
-    Frustum::Face face;
-
-    // Near plane (wind backwards so normal faces into frustum)
-    // Recall that nearPlane, farPlane are positive numbers, so
-    // we need to negate them to produce actual z values.
-    face.plane = Plane(Vector3(0,0,-1), Vector3(0,0,m_nearPlaneZ));
-    face.vertexIndex[0] = 3;
-    face.vertexIndex[1] = 2;
-    face.vertexIndex[2] = 1;
-    face.vertexIndex[3] = 0;
-    fr.faceArray.append(face);
-
-    // Right plane
-    face.plane = Plane(Vector3(-cosf(fovx/2), 0, -sinf(fovx/2)), Vector3::zero());
-    face.vertexIndex[0] = 0;
-    face.vertexIndex[1] = 4;
-    face.vertexIndex[2] = 7;
-    face.vertexIndex[3] = 3;
-    fr.faceArray.append(face);
-
-    // Left plane
-    face.plane = Plane(Vector3(-fr.faceArray.last().plane.normal().x, 0, fr.faceArray.last().plane.normal().z), Vector3::zero());
-    face.vertexIndex[0] = 5;
-    face.vertexIndex[1] = 1;
-    face.vertexIndex[2] = 2;
-    face.vertexIndex[3] = 6;
-    fr.faceArray.append(face);
-
-    // Top plane
-    face.plane = Plane(Vector3(0, -cosf(m_fieldOfView/2.0f), -sinf(m_fieldOfView/2.0f)), Vector3::zero());
-    face.vertexIndex[0] = 1;
-    face.vertexIndex[1] = 5;
-    face.vertexIndex[2] = 4;
-    face.vertexIndex[3] = 0;
-    fr.faceArray.append(face);
-
-    // Bottom plane
-    face.plane = Plane(Vector3(0, -fr.faceArray.last().plane.normal().y, fr.faceArray.last().plane.normal().z), Vector3::zero());
-    face.vertexIndex[0] = 2;
-    face.vertexIndex[1] = 3;
-    face.vertexIndex[2] = 7;
-    face.vertexIndex[3] = 6;
-    fr.faceArray.append(face);
-
-    // Far plane
-    if (-m_farPlaneZ < inf()) {
-    	face.plane = Plane(Vector3(0, 0, 1), Vector3(0, 0, m_farPlaneZ));
-        face.vertexIndex[0] = 4;
-        face.vertexIndex[1] = 5;
-        face.vertexIndex[2] = 6;
-        face.vertexIndex[3] = 7;
-        fr.faceArray.append(face);
-    }
-
-    // Transform vertices to world space
-    for (int v = 0; v < fr.vertexPos.size(); ++v) {
-        fr.vertexPos[v] = m_cframe.toWorldSpace(fr.vertexPos[v]);
-    }
-
-    // Transform planes to world space
-    for (int p = 0; p < fr.faceArray.size(); ++p) {
-        // Since there is no scale factor, we don't have to 
-        // worry about the inverse transpose of the normal.
-        Vector3 normal;
-        float d;
-        
-        fr.faceArray[p].plane.getEquation(normal, d);
-        
-        Vector3 newNormal = m_cframe.rotation * normal;
-        
-        if (isFinite(d)) {
-            d = (newNormal * -d + m_cframe.translation).dot(newNormal);
-            fr.faceArray[p].plane = Plane(newNormal, newNormal * d);
-        } else {
-            // When d is infinite, we can't multiply 0's by it without
-            // generating NaNs.
-            fr.faceArray[p].plane = Plane::fromEquation(newNormal.x, newNormal.y, newNormal.z, d);
-        }
-    }
-}
-
-void GCamera::getNearViewportCorners(
-    const Rect2D& viewport,
-    Vector3& outUR,
-    Vector3& outUL,
-    Vector3& outLL,
-    Vector3& outLR) const {
-
-    // Must be kept in sync with getFrustum()
-    const float w  = viewportWidth(viewport) / 2.0f;
-    const float h  = viewportHeight(viewport) / 2.0f;
-    const float z  = nearPlaneZ();
-
-    // Compute the points
-    outUR = Vector3( w,  h, z);
-    outUL = Vector3(-w,  h, z);
-    outLL = Vector3(-w, -h, z);
-    outLR = Vector3( w, -h, z);
-
-    // Take to world space
-    outUR = m_cframe.pointToWorldSpace(outUR);
-    outUL = m_cframe.pointToWorldSpace(outUL);
-    outLR = m_cframe.pointToWorldSpace(outLR);
-    outLL = m_cframe.pointToWorldSpace(outLL);
-}
-
-void GCamera::getFarViewportCorners(
-    const Rect2D& viewport,
-    Vector3& outUR,
-    Vector3& outUL,
-    Vector3& outLL,
-    Vector3& outLR) const {
-
-    // Must be kept in sync with getFrustum()
-    const float w = viewportWidth(viewport) * m_farPlaneZ / m_nearPlaneZ;
-    const float h = viewportHeight(viewport) * m_farPlaneZ / m_nearPlaneZ;
-    const float z = m_farPlaneZ;
-    
-    // Compute the points
-    outUR = Vector3( w,  h, z);
-    outUL = Vector3(-w,  h, z);
-    outLL = Vector3(-w, -h, z);
-    outLR = Vector3( w, -h, z);
-
-    // Take to world space
-    outUR = m_cframe.pointToWorldSpace(outUR);
-    outUL = m_cframe.pointToWorldSpace(outUL);
-    outLR = m_cframe.pointToWorldSpace(outLR);
-    outLL = m_cframe.pointToWorldSpace(outLL);
-}
-
-
-
-void GCamera::setPosition(const Vector3& t) { 
-    m_cframe.translation = t;
-}
-
-
-void GCamera::lookAt(const Vector3& position, const Vector3& up) { 
-    m_cframe.lookAt(position, up);
-}
-
-
-void GCamera::serialize(BinaryOutput& bo) const {
-    bo.writeFloat32(m_fieldOfView);
-    bo.writeFloat32(imagePlaneDepth());
-    debugAssert(nearPlaneZ() < 0.0f);
-    bo.writeFloat32(nearPlaneZ());
-    debugAssert(farPlaneZ() < 0.0f);
-    bo.writeFloat32(farPlaneZ());
-    m_cframe.serialize(bo);
-    bo.writeInt8(m_direction);
-}
-
-
-void GCamera::deserialize(BinaryInput& bi) {
-    m_fieldOfView = bi.readFloat32();
-    m_nearPlaneZ = bi.readFloat32();
-    debugAssert(m_nearPlaneZ < 0.0f);
-    m_farPlaneZ = bi.readFloat32();
-    debugAssert(m_farPlaneZ < 0.0f);
-    m_cframe.deserialize(bi);
-    m_direction = (FOVDirection)bi.readInt8();
-}
-
-
-Vector3 GCamera::convertFromUnitToNormal(const Vector3& in, const Rect2D& viewport) const{
-    return (in + Vector3(1,1,1)) * 0.5 * Vector3(viewport.width(), -viewport.height(), 1) + 
-           Vector3(viewport.x0(), viewport.y1(), 0);
-}
-} // namespace
diff --git a/externals/g3dlite/G3D.lib/source/GImage.cpp b/externals/g3dlite/G3D.lib/source/GImage.cpp
deleted file mode 100644
index c7abf982553..00000000000
--- a/externals/g3dlite/G3D.lib/source/GImage.cpp
+++ /dev/null
@@ -1,1065 +0,0 @@
-/**
-  @file GImage.cpp
-  @author Morgan McGuire, morgan@graphics3d.com
-  Copyright 2002-2007, Morgan McGuire
-
-  @created 2002-05-27
-  @edited  2006-10-10
- */
-#include "G3D/platform.h"
-#include "G3D/GImage.h"
-#include "G3D/debug.h"
-#include "G3D/stringutils.h"
-#include "G3D/TextInput.h"
-#include "G3D/TextOutput.h"
-#include "G3D/BinaryInput.h"
-#include "G3D/BinaryOutput.h"
-#include "G3D/Log.h"
-#include 
-#include 
-#include 
-#include 
-
-//////////////////////////////////////////////////////////////////////////////////////////////
-
-namespace G3D {
-   
-void GImage::RGBtoRGBA(
-    const uint8*    in,
-    uint8*          out,
-    int             numPixels) {
-
-    for (int i = 0; i < numPixels; ++i) {
-        int i3 = i * 3;
-        int i4 = i3 + i;
-
-        out[i4 + 0] = in[i3 + 0]; 
-        out[i4 + 1] = in[i3 + 1]; 
-        out[i4 + 2] = in[i3 + 2]; 
-        out[i4 + 3] = 255; 
-    }
-}
-
-
-void GImage::RGBAtoRGB(
-    const uint8*    in,
-    uint8*          out,
-    int             numPixels) {
-
-    for (int i = 0; i < numPixels; ++i) {
-        int i3 = i * 3;
-        int i4 = i3 + i;
-
-        out[i3 + 0] = in[i4 + 0]; 
-        out[i3 + 1] = in[i4 + 1]; 
-        out[i3 + 2] = in[i4 + 2]; 
-    }
-}
-
-
-void GImage::RGBtoBGRA(
-    const uint8*    in,
-    uint8*          out,
-    int                     numPixels) {
-
-    for (int i = 0; i < numPixels; ++i) {
-        int i3 = i * 3;
-        int i4 = i3 + i;
-
-        out[i4 + 2] = in[i3 + 0]; 
-        out[i4 + 1] = in[i3 + 1]; 
-        out[i4 + 0] = in[i3 + 2]; 
-        out[i4 + 3] = 255; 
-    }
-}
-
-
-
-void GImage::RGBtoBGR(
-    const uint8*    in,
-    uint8*          out,
-    int             numPixels) {
-
-    for (int i = 0; i < numPixels; ++i) {
-        int i3 = i * 3;
-
-        int r = in[i3 + 0];
-        int g = in[i3 + 1];
-        int b = in[i3 + 2];
-
-        out[i3 + 2] = r; 
-        out[i3 + 1] = g; 
-        out[i3 + 0] = b;
-    }
-}
-
-
-void GImage::RGBxRGBtoRGBA(
-    const uint8*            colorRGB,
-    const uint8*            alphaRGB,
-    uint8*                  out,
-    int                     numPixels) {
-
-    for (int i = numPixels - 1; i >= 0; --i) {
-        int i3 = i * 3;
-        int i4 = i3 + i;
-
-        out[i4 + 0] = colorRGB[i3 + 0];
-        out[i4 + 1] = colorRGB[i3 + 1];
-        out[i4 + 2] = colorRGB[i3 + 2];
-        out[i4 + 3] = alphaRGB[i3 + 0];
-    }
-}
-
-
-void GImage::RGBtoARGB(
-    const uint8*            in,
-    uint8*                  out,
-    int                     numPixels) {
-
-    for (int i = 0; i < numPixels; ++i) {
-        int i3 = i * 3;
-        int i4 = i3 + i;
-
-        out[i4 + 0] = 255; 
-        out[i4 + 1] = in[i3 + 0]; 
-        out[i4 + 2] = in[i3 + 1]; 
-        out[i4 + 3] = in[i3 + 2];
-    }
-}
-
-
-void GImage::flipRGBVertical(
-    const uint8*            in,
-    uint8*                  out,
-    int                     width,
-    int                     height) {
-
-    
-    // Allocate a temp row so the operation
-    // is still safe if in == out
-    uint8* temp = (uint8*)System::malloc(width * 3);
-    alwaysAssertM(temp != NULL, "Out of memory"); 
-
-    int oneRow = width * 3;
-    int N = height / 2;
-
-    // if height is an odd value, don't swap odd middle row
-    for (int i = 0; i < N; ++i) {
-        int topOff = i * oneRow;
-        int botOff = (height - i - 1) * oneRow;
-        System::memcpy(temp,         in + topOff, oneRow);
-        System::memcpy(out + topOff, in + botOff, oneRow);
-        System::memcpy(out + botOff, temp,        oneRow);
-    }
-
-    System::free(temp);
-}
-
-
-void GImage::flipRGBAVertical(
-    const uint8*            in,
-    uint8*                  out,
-    int                     width,
-    int                     height) {
-
-    
-    // Allocate a temp row so the operation
-    // is still safe if in == out
-    uint8* temp = (uint8*)System::malloc(width * 4);
-    alwaysAssertM(temp != NULL, "Out of memory");
-
-    int oneRow = width * 4;
-
-    // if height is an odd value, don't swap odd middle row
-    for (int i = 0; i < height / 2; ++i) {
-        int topOff = i * oneRow;
-        int botOff = (height - i - 1) * oneRow;
-        System::memcpy(temp,         in + topOff, oneRow);
-        System::memcpy(out + topOff, in + botOff, oneRow);
-        System::memcpy(out + botOff, temp,        oneRow);
-    }
-
-    System::free(temp);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////
-
-void GImage::decode(
-    BinaryInput&        input,
-    Format              format) {
-
-    switch (format) {
-    case PPM_ASCII:
-        decodePPMASCII(input);
-        break;
-
-    case PPM:
-        decodePPM(input);
-        break;
-
-    case PNG:
-        decodePNG(input);
-        break;
-
-    case JPEG:
-        decodeJPEG(input);
-        break;
-
-    case TGA:
-        decodeTGA(input);
-        break;
-
-    case BMP:
-        decodeBMP(input);
-        break;
-
-    case ICO:
-        decodeICO(input);
-        break;
-
-    case PCX:
-        decodePCX(input);
-        break;
-
-    default:
-        debugAssert(false);
-    }
-
-    debugAssert(width >= 0);
-    debugAssert(height >= 0);
-    debugAssert(channels == 1 || channels == 3 || channels == 4);
-    debugAssert(_byte != NULL);
-}
-
-
-void GImage::decodePCX(
-    BinaryInput&                input) {
-
-    uint8  manufacturer = input.readUInt8();
-    uint8  version      = input.readUInt8();
-    uint8  encoding     = input.readUInt8();
-    uint8  bitsPerPixel = input.readUInt8();
-
-    uint16 xmin         = input.readUInt16();
-    uint16 ymin         = input.readUInt16();
-    uint16 xmax         = input.readUInt16();
-    uint16 ymax         = input.readUInt16();
-
-    uint16 horizDPI     = input.readUInt16();
-    uint16 vertDPI      = input.readUInt16();
-
-    Color3uint8 colorMap[16];
-    input.readBytes(colorMap, 48);
-
-    input.skip(1);
-
-    uint8  planes       = input.readUInt8();
-    uint16 bytesPerLine = input.readUInt16();
-    uint16 paletteType  = input.readUInt16();
-    input.skip(4 + 54);
-
-    (void)bytesPerLine;
-
-    width  = xmax - xmin + 1;
-    height = ymax - ymin + 1;
-    channels = 3;
-
-    if ((manufacturer != 0x0A) || (encoding != 0x01)) {
-        throw GImage::Error("PCX file is corrupted", input.getFilename());
-    }
-
-    (void)version;
-    (void)vertDPI;
-    (void)horizDPI;
-
-    if ((bitsPerPixel != 8) || ((planes != 1) && (planes != 3))) {
-        throw GImage::Error("Only 8-bit paletted and 24-bit PCX files supported.", input.getFilename());
-    }
-
-	// Prepare the pointer object for the pixel data
-    _byte = (uint8*)System::malloc(width * height * 3);
-
-    if ((paletteType == 1) && (planes == 3)) {
-
-        Color3uint8* pixel = pixel3();
-
-        // Iterate over each scan line
-        for (int row = 0; row < height; ++row) {
-            // Read each scan line once per plane
-            for (int plane = 0; plane < planes; ++plane) {
-                int p = row * width;
-                int p1 = p + width;
-                while (p < p1) {
-                    uint8 value = input.readUInt8();
-                    int length = 1;
-            
-                    if (value >= 192) {
-                        // This is the length, not the value.  Mask off
-                        // the two high bits and read the true index.
-                        length = value & 0x3F;
-                        value = input.readUInt8();
-                    }
-
-                    // Set the whole run
-                    for (int i = length - 1; i >= 0; --i, ++p) {
-                        debugAssert(p < width * height);
-                        pixel[p][plane] = value;
-                    }
-                }
-            }
-        }
-
-    } else if (planes == 1) {
-
-        Color3uint8 palette[256];
-
-        int imageBeginning   = input.getPosition();
-        int paletteBeginning = input.getLength() - 769;
-
-        input.setPosition(paletteBeginning);
-
-        uint8 dummy = input.readUInt8();
-
-        if (dummy != 12) {
-            Log::common()->println("\n*********************");
-            Log::common()->printf("Warning: Corrupted PCX file (palette marker byte was missing) \"%s\"\nLoading anyway\n\n", input.getFilename().c_str());
-        }
-
-        input.readBytes(palette, sizeof(palette));
-        input.setPosition(imageBeginning);
-        
-        Color3uint8* pixel = pixel3();
-        
-        // The palette indices are run length encoded.
-        int p = 0;
-        while (p < width * height) {
-            uint8 index  = input.readUInt8();
-            uint8 length = 1;
-
-            if (index >= 192) {
-                // This is the length, not the index.  Mask off
-                // the two high bits and read the true index.
-                length = index & 0x3F;
-                index  = input.readUInt8();
-            }
-
-            Color3uint8 color = palette[index];
-
-            // Set the whole run
-            for (int i = length - 1; i >= 0; --i, ++p) {
-                if (p > width * height) {
-                    break;
-                }
-                pixel[p] = color;
-            }
-
-        }
-
-    } else {
-        throw GImage::Error("Unsupported PCX file type.", input.getFilename());
-    }
-}
-
-
-GImage::Format GImage::resolveFormat(const std::string&  filename) {
-    BinaryInput b(filename, G3D_LITTLE_ENDIAN);
-    if (b.size() <= 0) {
-        throw Error("File not found.", filename);
-    }
-
-    return resolveFormat(filename, b.getCArray(), b.size(), AUTODETECT);
-}
-
-
-GImage::Format GImage::resolveFormat(
-    const std::string&  filename,
-    const uint8*        data,
-    int                 dataLen,
-    Format              maybeFormat) {
-
-    // Return the provided format if it is specified.
-    if (maybeFormat != AUTODETECT) {
-        return maybeFormat;
-    }
-
-    std::string extension;
-
-    // Try to detect from the filename's extension
-    if (filename.size() >= 5) {
-        int n = iMax(filename.size() - 1, 5);
-        // Search backwards for the "."
-        for (int i = 1; i <= n; ++i) {
-            if (filename[filename.size() - i] == '.') {
-                // Upper case
-                extension = toUpper(filename.substr(filename.size() - i + 1));
-                break;
-            }
-        }
-    }
-
-    if (extension == "PPM") {
-        // There are two PPM formats; we handle them differently
-        if (dataLen > 3) {
-            if (!memcmp(data, "P6", 2)) {
-                return PPM;
-            } else {
-                return PPM_ASCII;
-            }
-        }
-    }
-
-    Format tmp = stringToFormat(extension);
-    if ((tmp != AUTODETECT) && (tmp != UNKNOWN)) {
-        return tmp;
-    }
-
-    // Try and autodetect from the file itself by looking at the first
-    // character.
-
-    // We can't look at the character if it is null.
-    debugAssert(data != NULL);              
-
-    if ((dataLen > 3) && (!memcmp(data, "P3", 2) || !memcmp(data, "P2", 2) || !memcmp(data, "P1", 2))) {
-        return PPM_ASCII;
-    }
-
-    if ((dataLen > 3) && !memcmp(data, "P6", 2)) {
-        return PPM;
-    }
-
-    if (dataLen > 8) {
-        if (!png_sig_cmp((png_bytep)data, 0, 8))
-            return PNG;
-    }
-
-    if ((dataLen > 0) && (data[0] == 'B')) {
-        return BMP;
-    }
-
-    if (dataLen > 10) {
-        if ((dataLen > 11) && (data[0] == 0xFF) &&
-            (memcmp(&data[6], "JFIF", 4) == 0)) {
-            return JPEG;
-        }
-    }
-
-    if (dataLen > 40) {
-        if (memcmp(&data[dataLen - 18], "TRUEVISION-XFILE", 16) == 0) {
-            return TGA;
-        }
-    }
-
-    if ((dataLen > 4) && (data[0] == 0) && (data[1] == 0) && (data[2] == 0) && (data[3] == 1)) {
-        return ICO;
-    }
-
-    if ((dataLen > 0) && (data[0] == 10)) {
-        return PCX;
-    }
-
-    return UNKNOWN;
-}
-
-
-GImage::GImage(
-    const std::string&  filename,
-    Format              format) : 
-    _byte(NULL), 
-    width(0),
-    height(0), 
-    channels(0){
-    
-    load(filename, format);
-}
-
-
-void GImage::load(
-    const std::string&  filename,
-    Format              format) {
-
-    clear();
-
-    try {
-        BinaryInput b(filename, G3D_LITTLE_ENDIAN);
-        if (b.size() <= 0) {
-            throw Error("File not found.", filename);
-        }
-
-        alwaysAssertM(this != NULL, "Corrupt GImage");
-        decode(b, resolveFormat(filename, b.getCArray(), b.size(), format));
-    } catch (const std::string& error) {
-        throw Error(error, filename);
-    }
-}
-
-
-GImage::GImage(
-    const uint8*        data,
-    int                 length,
-    Format              format) {
-
-    BinaryInput b(data, length, G3D_LITTLE_ENDIAN);
-    // It is safe to cast away the const because we
-    // know we don't corrupt the data.
-
-    decode(b, resolveFormat("", data, length, format));
-}
-
-
-GImage::GImage(
-    int                 width,
-    int                 height,
-    int                 channels) {
-    
-    _byte = NULL;
-    resize(width, height, channels);
-}
-
-
-void GImage::resize(
-    int                 width,
-    int                 height,
-    int                 channels) {
-    debugAssert(width >= 0);
-    debugAssert(height >= 0);
-    debugAssert(channels >= 1);
-
-    clear();
-
-    this->width = width;
-    this->height = height;
-    this->channels = channels;
-    size_t sz = width * height * channels;
-
-    _byte = (uint8*)System::calloc(sz, sizeof(uint8));
-    debugAssert(isValidHeapPointer(_byte));
-}
-
-
-void GImage::_copy(
-    const GImage&       other) {
-
-    clear();
-
-    width  = other.width;
-    height = other.height;
-    channels = other.channels;
-    int s  = width * height * channels * sizeof(uint8);
-    _byte  = (uint8*)System::malloc(s);
-    debugAssert(isValidHeapPointer(_byte));
-    memcpy(_byte, other._byte, s);
-}
-
-
-GImage::GImage(
-    const GImage&        other) : _byte(NULL) {
-
-    _copy(other);
-}
-
-
-GImage::~GImage() {
-    clear();
-}
-
-
-void GImage::clear() {
-    width = 0;
-    height = 0;
-    System::free(_byte);
-    _byte = NULL;
-}
-
-
-GImage& GImage::operator=(const GImage& other) {
-    _copy(other);
-    return *this;
-}
-
-
-bool GImage::copySubImage(
-    GImage & dest, const GImage & src,
-    int srcX, int srcY, int srcWidth, int srcHeight) {
-    if ((src.width < srcX + srcWidth) ||
-        (src.height < srcY + srcHeight) ||
-        (srcY < 0) ||
-        (srcX < 0)) {
-
-        return false;
-    }
-
-    dest.resize(srcWidth, srcHeight, src.channels);
-    
-    bool ret;
-    ret = pasteSubImage(dest, src, 0, 0, srcX, srcY, srcWidth, srcHeight);
-    debugAssert(ret);
-
-    return true;
-}
-
-
-bool GImage::pasteSubImage(
-    GImage & dest, const GImage & src,
-    int destX, int destY,
-    int srcX, int srcY, int srcWidth, int srcHeight) {
-    if ((src.width < srcX + srcWidth) ||
-        (src.height < srcY + srcHeight) ||
-        (dest.width < destX + srcWidth) ||
-        (dest.height < destY + srcHeight) ||
-        (srcY < 0) ||
-        (srcX < 0) ||
-        (destY < 0) ||
-        (destX < 0) ||
-        (src.channels != dest.channels)) {
-
-        return false;
-    }
-
-    for (int i = 0; i < srcHeight; i++) {
-        const uint8* srcRow = src.byte() +
-            ((i + srcY) * src.width + srcX) * src.channels;
-        uint8* destRow = dest.byte() +
-            ((i + destY) * dest.width + destX) * dest.channels;
-        memcpy(destRow, srcRow, srcWidth * src.channels);
-    }
-
-    return true;
-}
-
-
-bool GImage::supportedFormat(
-    const std::string& format) {
-
-    return (stringToFormat(format) != UNKNOWN);
-}
-
-
-GImage::Format GImage::stringToFormat(
-    const std::string& format) {
-
-    std::string extension = toUpper(format);
-
-    if ((extension == "JPG") || (extension == "JPEG")) {
-        return JPEG;
-    } else if (extension == "TGA") {
-        return TGA;
-    } else if (extension == "BMP") {
-        return BMP;
-    } else if (extension == "PCX") {
-        return PCX;
-    } else if (extension == "ICO") {
-        return ICO;
-    } else if (extension == "PNG") {
-        return PNG;
-    } else if (extension == "PPM") {
-        return PPM;
-    } else {
-        return UNKNOWN;
-    }
-}
-
-
-void GImage::save(
-    const std::string& filename,
-    Format             format) const {
-
-    BinaryOutput b(filename, G3D_LITTLE_ENDIAN);
-    encode(resolveFormat(filename, NULL, 0, format), b);
-    b.commit(false);
-}
-
-
-void GImage::encode(
-    Format              format,
-    uint8*&             outData,
-    int&                outLength) const {
-
-    BinaryOutput out;
-
-    encode(format, out);
-
-    outData = (uint8*)System::malloc(out.size());
-    debugAssert(outData);
-    outLength = out.size();
-
-    out.commit(outData);
-}
-
-
-void GImage::encode(
-    Format              format,
-    BinaryOutput&       out) const {
-
-    switch (format) {
-    case PPM_ASCII:
-        encodePPMASCII(out);
-        break;
-
-    case PPM:
-        encodePPM(out);
-        break;
-
-    case PNG:
-        encodePNG(out);
-        break;
-
-    case JPEG:
-        encodeJPEG(out);
-        break;
-
-    case BMP:
-        encodeBMP(out);
-        break;
-
-    case TGA:
-        encodeTGA(out);
-        break;
-
-    default:
-        debugAssert(false);
-    }
-}
-
-void GImage::insertRedAsAlpha(const GImage& alpha, GImage& output) const {
-    debugAssert(alpha.width == width);
-    debugAssert(alpha.height == height);
-
-    // make sure output GImage is valid
-    if (output.width != width || output.height != height || output.channels != 4) {
-        output.resize(width, height, 4);
-    }
-
-    for (int i = 0; i < width * height; ++i) {
-        output.byte()[i * 4 + 0] = byte()[i * channels + 0];
-        output.byte()[i * 4 + 1] = byte()[i * channels + 1];
-        output.byte()[i * 4 + 2] = byte()[i * channels + 2];
-        output.byte()[i * 4 + 3] = alpha.byte()[i * alpha.channels];
-    }
-}
-
-GImage GImage::insertRedAsAlpha(const GImage& alpha) const {
-    debugAssert(alpha.width == width);
-    debugAssert(alpha.height == height);
-
-    GImage out(width, height, 4);
-
-    insertRedAsAlpha(alpha, out);
-
-    return out;
-}
-
-
-void GImage::stripAlpha(GImage& output) const {
-
-    if (output.width != width || output.height != height || output.channels != 3)
-    {
-        output.resize(width, height, 3);
-    }
-
-    for (int i = 0; i < width * height; ++i) {
-        output.byte()[i * 3 + 0] = byte()[i * channels + 0];
-        output.byte()[i * 3 + 1] = byte()[i * channels + 1];
-        output.byte()[i * 3 + 2] = byte()[i * channels + 2];
-    }
-}
-
-GImage GImage::stripAlpha() const {
-    GImage out(width, height, 3);
-
-    stripAlpha(out);
-
-    return out;
-}
-
-
-int GImage::sizeInMemory() const {
-    return sizeof(GImage) + width * height * channels;
-}
-
-
-void GImage::computeNormalMap(
-    const GImage&       bump,
-    GImage&             normal,
-    float               whiteHeightInPixels,
-    bool                lowPassBump,
-    bool                scaleHeightByNz) {
-    computeNormalMap(bump.width, bump.height, bump.channels, bump.byte(), normal, whiteHeightInPixels, lowPassBump, scaleHeightByNz);
-}
-
-void GImage::computeNormalMap(
-    int                 width,
-    int                 height,
-    int                 channels,
-    const uint8*        src,
-    GImage&             normal,
-    float               whiteHeightInPixels,
-    bool                lowPassBump,
-    bool                scaleHeightByNz) {
-
-    if (whiteHeightInPixels == -1.0f) {
-        // Default setting scales so that a gradient ramp
-        // over the whole image becomes a 45-degree angle
-        
-        // Account for potentially non-square aspect ratios
-        whiteHeightInPixels = max(width, height);
-    }
-
-    debugAssert(whiteHeightInPixels >= 0);
-
-    const int w = width;
-    const int h = height;
-    const int stride = channels;
-
-    normal.resize(w, h, 4);
-
-    const uint8* const B = src;
-    Color4uint8* const N = normal.pixel4();
-
-    for (int y = 0; y < h; ++y) {
-        for (int x = 0; x < w; ++x) {
-            // Index into normal map pixel
-            int i = x + y * w;
-
-            // Index into bump map *byte*
-            int j = stride * i;
-
-            Vector3 delta;
-
-            // Get a value from B (with wrapping lookup) relative to (x, y)
-            // and divide by 255
-            #define height(DX, DY)  ((int)B[(((DX + x + w) % w) + \
-                                            ((DY + y + h) % h) * w) * stride])
-
-
-            // Sobel filter to compute the normal.  
-            //
-            // Y Filter (X filter is the transpose)
-            //  [ -1 -2 -1 ]
-            //  [  0  0  0 ]
-            //  [  1  2  1 ]
-
-            // Write the Y value directly into the x-component so we don't have
-            // to explicitly compute a cross product at the end.
-            delta.y = -(height(-1, -1) *  1 + height( 0, -1) *  2 + height( 1, -1) *  1 +
-                        height(-1,  1) * -1 + height( 0,  1) * -2 + height( 1,  1) * -1);
-
-            delta.x = -(height(-1, -1) * -1 + height( 1, -1) * 1 + 
-                        height(-1,  0) * -2 + height( 1,  0) * 2 + 
-                        height(-1,  1) * -1 + height( 1,  1) * 1);
-
-            // The scale of each filter row is 4, the filter width is two pixels,
-            // and the "normal" range is 0-255.
-            delta.z = 4 * 2 * (whiteHeightInPixels / 255.0f);
-
-            // Delta is now scaled in pixels; normalize 
-            delta = delta.direction();
-
-            // Copy over the bump value into the alpha channel.
-            float H = B[j] / 255.0;
-
-            if (lowPassBump) {
-                H = (height(-1, -1) + height( 0, -1) + height(1, -1) +
-                        height(-1,  0) + height( 0,  0) + height(1,  0) +
-                        height(-1,  1) + height( 0,  1) + height(1,  1)) / (255.0f * 9.0f);
-            }
-            #undef height
-
-            if (scaleHeightByNz) {
-                // delta.z can't possibly be negative, so we avoid actually
-                // computing the absolute value.
-                H *= delta.z;
-            }
-
-            N[i].a = iRound(H * 255.0);
-
-            // Pack into byte range
-            delta = delta * 127.5 + Vector3(127.5, 127.5, 127.5);
-            N[i].r = iClamp(iRound(delta.x), 0, 255);
-            N[i].g = iClamp(iRound(delta.y), 0, 255);
-            N[i].b = iClamp(iRound(delta.z), 0, 255);
-        }
-    }
-}
-
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void GImage::convertToL8() {
-    switch(channels) {
-    case 1:
-        return;
-
-    case 3:
-        {            
-            // Average
-            Color3uint8* src = (Color3uint8*)_byte;
-            _byte = NULL;
-            resize(width, height, 1);
-            for (int i = width * height - 1; i >= 0; --i) {
-                const Color3uint8   s = src[i];
-                uint8&              d = _byte[i]; 
-                d = ((int)s.r + (int)s.g + (int)s.b) / 3;
-            }
-            System::free(src);
-        }
-        break;
-
-    case 4:
-        {            
-            // Average
-            Color4uint8* src = (Color4uint8*)_byte;
-            _byte = NULL;
-            resize(width, height, 1);
-            for (int i = width * height - 1; i >= 0; --i) {
-                const Color4uint8   s = src[i];
-                uint8&              d = _byte[i]; 
-                d = ((int)s.r + (int)s.g + (int)s.b) / 3;
-            }
-            System::free(src);
-        }
-        return;
-
-    default:
-        alwaysAssertM(false, "Bad number of channels in input image");
-    }
-}
-
-
-void GImage::convertToRGBA() {
-    switch(channels) {
-    case 1:
-        {            
-            // Spread
-            uint8* old = _byte;
-            _byte = NULL;
-            resize(width, height, 4);
-            for (int i = width * height - 1; i >= 0; --i) {
-                const uint8  s = old[i];
-                Color4uint8& d = ((Color4uint8*)_byte)[i]; 
-                d.r = d.g = d.b = s;
-                d.a = 255;
-            }
-            System::free(_byte);
-        }
-        break;
-
-    case 3:
-        {            
-            // Add alpha
-            Color3uint8* old = (Color3uint8*)_byte;
-            _byte = NULL;
-            resize(width, height, 4);
-            for (int i = width * height - 1; i >= 0; --i) {
-                const Color3uint8   s = old[i];
-                Color4uint8&        d = ((Color4uint8*)_byte)[i]; 
-                d.r = s.r;
-                d.g = s.g;
-                d.b = s.b;
-                d.a = 255;
-            }
-            System::free(old);
-        }
-        break;
-
-    case 4:
-        // Already RGBA
-        return;
-
-    default:
-        alwaysAssertM(false, "Bad number of channels in input image");
-    }
-}
-
-
-void GImage::convertToRGB() {
-    switch(channels) {
-    case 1:
-        {            
-            // Spread
-            uint8* old = _byte;
-            _byte = NULL;
-            resize(width, height, 3);
-            for (int i = width * height - 1; i >= 0; --i) {
-                const uint8  s = old[i];
-                Color3uint8& d = ((Color3uint8*)_byte)[i]; 
-                d.r = d.g = d.b = s;
-            }
-            System::free(old);
-        }
-        break;
-
-    case 3:
-		return;
-
-    case 4:
-		// Strip alpha
-        {            
-            Color4uint8* old = (Color4uint8*)_byte;
-            _byte = NULL;
-            resize(width, height, 3);
-            for (int i = width * height - 1; i >= 0; --i) {
-                const Color4uint8   s = old[i];
-                Color3uint8&        d = ((Color3uint8*)_byte)[i]; 
-                d.r = s.r;
-                d.g = s.g;
-                d.b = s.b;
-            }
-            System::free(old);
-        }
-        break;
-
-    default:
-        alwaysAssertM(false, "Bad number of channels in input image");
-    }
-}
-
-
-void GImage::R8G8B8_to_Y8U8V8(int width, int height, const uint8* _in, uint8* _out) {
-    const Color3uint8* in = reinterpret_cast(_in);
-    Color3uint8* out = reinterpret_cast(_out);
-
-    Color3uint8 p;
-    for (int i = width * height - 1; i >= 0; --i) {
-        p.r = iClamp(iRound(in->r *  0.229 + in->g *  0.587 + in->b *  0.114), 0, 255);
-        p.g = iClamp(iRound(in->r * -0.147 + in->g * -0.289 + in->b *  0.436) + 127, 0, 255);
-        p.b = iClamp(iRound(in->r *  0.615 + in->g * -0.515 + in->b * -0.100) + 127, 0, 255);
-        *out = p;
-        ++in;
-        ++out;
-    }
-}
-
-
-
-void GImage::Y8U8V8_to_R8G8B8(int width, int height, const uint8* _in, uint8* _out) {
-    const Color3uint8* in = reinterpret_cast(_in);
-    Color3uint8* out = reinterpret_cast(_out);
-
-    Color3uint8 p;
-    for (int i = width * height - 1; i >= 0; --i) {
-        p.r = iClamp(iRound(in->r *  1.0753 +                   (in->b - 127) *  1.2256), 0, 255);
-        p.g = iClamp(iRound(in->r *  1.0753 + (in->g - 127) * -0.3946 + (in->b - 127) * -0.4947), 0, 255);
-        p.b = iClamp(iRound(in->r *  1.0753 + (in->g - 127) *  2.0320 + (in->b - 127) *  0.0853), 0, 255);
-        *out = p;
-        ++in;
-        ++out;
-    }
-}
-
-
-void GImage::makeCheckerboard(GImage& im, int checkerSize, const Color4uint8& A, const Color4uint8& B) {
-    for (int y = 0; y < im.height; ++y) {
-        for (int x = 0; x < im.width; ++x) {
-            bool checker = isOdd((x / checkerSize) + (y / checkerSize));
-            const Color4uint8& color = checker ? A : B;
-            for (int c = 0; c < im.channels; ++c) {
-                uint8* v = im.byte() + (x + y * im.width) * im.channels + c;
-                *v = color[c];
-            }
-        }
-    }
-}
-
-}
-
diff --git a/externals/g3dlite/G3D.lib/source/GImage_bayer.cpp b/externals/g3dlite/G3D.lib/source/GImage_bayer.cpp
deleted file mode 100644
index 16499af15f6..00000000000
--- a/externals/g3dlite/G3D.lib/source/GImage_bayer.cpp
+++ /dev/null
@@ -1,298 +0,0 @@
-/**
-  @file GImage_bayer.cpp
-  @author Morgan McGuire, morgan@graphics3d.com
-  @created 2002-05-27
-  @edited  2006-05-10
- */
-#include "G3D/platform.h"
-#include "G3D/GImage.h"
-
-namespace G3D {
-
-void GImage::BAYER_G8B8_R8G8_to_Quarter_R8G8B8(int width, int height, const uint8* in, uint8* out) {
-    debugAssert(in != out);
-
-    int halfHeight = height / 2;
-    int halfWidth  = width / 2;
-
-    int dst_off = 0;
-    for (int y = 0; y < halfHeight; ++y) {
-        for (int x = 0; x < halfWidth; ++x) {
-            // GBRG
-            int src_off = x*2 + y*2*width;
-            out[dst_off] = in[src_off+width]; // red
-            out[dst_off+1] = ((int)in[src_off] + (int)in[src_off+width+1])/2; // green
-            out[dst_off+2] = in[src_off+1]; // blue            
-
-            dst_off = dst_off + 3;
-        }
-    }
-}
-
-
-void GImage::Quarter_R8G8B8_to_BAYER_G8B8_R8G8(int inWidth, int inHeight, const uint8* in, uint8* out) {
-    // Undo quarter-size Bayer as best we can.  This code isn't very efficient, but it
-    // also isn't used very frequently.
-
-    debugAssert(out != in);
-
-    int outWidth  = 2 * inWidth;
-    int outHeight = 2 * inHeight;
-
-    for (int y = 0; y < outHeight; ++y) {
-        for (int x = 0; x < outWidth; ++x) {
-            const Color3uint8* inp = ((const Color3uint8*)in) + ((x/2) + (y/2)* inWidth);
-            uint8* outp = out + x + y * outWidth;
-
-            if (isEven(y)) {
-                // GB row
-                if (isEven(x)) {
-                    // Green
-                    *outp = inp->g;
-                } else {
-                    // Blue
-                    *outp = inp->b;
-                }
-            } else {
-                // RG row
-                if (isEven(x)) {
-                    // Red
-                    *outp = inp->r;
-                } else {
-                    // Green
-                    *outp = inp->g;
-                }
-            }
-        }
-    }
-}
-
-
-/** Applies a 5x5 filter to monochrome image I (wrapping at the boundaries) */
-static uint8 applyFilter(
-    const uint8*    I,
-    int             x,
-    int             y,
-    int             w,
-    int             h,
-    const float     filter[5][5]) {
-
-    debugAssert(isEven(w));
-    debugAssert(isEven(h));
-
-    float sum = 0.0f;
-    float denom = 0.0f;
-
-    for (int dy = 0; dy < 5; ++dy) {
-        int offset = ((y + dy + h - 2) % h) * w;
-
-        for (int dx = 0; dx < 5; ++dx) {
-            float f = filter[dy][dx];
-            sum += f * I[((x + dx + w - 2) % w) + offset];
-            denom += f;
-        }
-    }
-
-    return (uint8)iClamp(iRound(sum / denom), 0, 255);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////
-//
-// Bayer conversions
-//
-
-// There are two kinds of rows (GR and BG).
-// In each row, there are two kinds of pixels (G/R, B/G).
-// We express the four kinds of INPUT pixels as:
-//    GRG, GRG, BGB, BGG
-//
-// There are three kinds of OUTPUT pixels: R, G, B.
-// Thus there are nominally 12 different I/O combinations, 
-// but several are impulses because needed output at that 
-// location *is* the input (e.g., G_GRG and G_BGG).
-//
-// The following 5x5 row-major filters are named as output_input.
-
-// Green
-static const float G_GRR[5][5] =
-{{     0.0f,      0.0f,     -1.0f,      0.0f,      0.0f},
-{     0.0f,      0.0f,      2.0f,      0.0f,      0.0f},
-{    -1.0f,      2.0f,      4.0f,      2.0f,     -1.0f},
-{     0.0f,      0.0f,      2.0f,      0.0f,      0.0f},
-{     0.0f,      0.0f,     -1.0f,      0.0f,      0.0f}};
-
-static const float G_BGB[5][5] =
-{{     0.0f,      0.0f,     -1.0f,      0.0f,      0.0f},
-{     0.0f,      0.0f,      2.0f,      0.0f,      0.0f},
-{    -1.0f,      2.0f,      4.0f,      2.0f,     -1.0f},
-{     0.0f,      0.0f,      2.0f,      0.0f,      0.0f},
-{     0.0f,      0.0f,     -1.0f,      0.0f,      0.0f}};
-
-// Red 
-//(the caption in the paper is wrong for this case:
-// "R row B column really means R row G column"
-static const float R_GRG[5][5] =
-{{     0.0f,      0.0f,      0.5f,      0.0f,      0.0f},
-{     0.0f,     -1.0f,      0.0f,     -1.0f,      0.0f},
-{    -1.0f,      4.0f,      5.0f,      4.0f,     -1.0f},
-{     0.0f,     -1.0f,      0.0f,     -1.0f,      0.0f},
-{     0.0f,      0.0f,      0.5f,      0.0f,      0.0f}};
-
-static const float R_BGG[5][5] =
-{{     0.0f,      0.0f,     -1.0f,      0.0f,      0.0f},
-{     0.0f,     -1.0f,      4.0f,     -1.0f,      0.0f},
-{     0.5f,      0.0f,      5.0f,      0.0f,      0.5f},
-{     0.0f,     -1.0f,      4.0f,     -1.0f,      0.0f},
-{     0.0f,      0.0f,     -1.0f,      0.0f,      0.0f}};
-
-static const float R_BGB[5][5] =
-{{     0.0f,      0.0f, -3.0f/2.0f,      0.0f,      0.0f},
-{     0.0f,      2.0f,      0.0f,      2.0f,      0.0f},
-{-3.0f/2.0f,      0.0f,      6.0f,      0.0f, -3.0f/2.0f},
-{     0.0f,      2.0f,      0.0f,      2.0f,      0.0f},
-{     0.0f,      0.0f, -3.0f/2.0f,      0.0f,      0.0f}};
-
-
-// Blue 
-//(the caption in the paper is wrong for this case:
-// "B row R column really means B row G column")
-#define B_BGG R_GRG
-#define B_GRG R_BGG
-#define B_GRR R_BGB
-
-
-void GImage::BAYER_R8G8_G8B8_to_R8G8B8_MHC(int w, int h, const uint8* in, uint8* _out) {
-    debugAssert(in != _out);
-
-    Color3uint8* out = (Color3uint8*)_out;
-
-    for (int y = 0; y < h; ++y) {
-
-        // Row beginning in the input array.
-        int offset = y * w;
-
-        // RG row
-        for (int x = 0; x < w; ++x, ++out) {
-            // R pixel
-            {
-                out->r = in[x + offset];
-                out->g = applyFilter(in, x, y, w, h, G_GRR);
-                out->b = applyFilter(in, x, y, w, h, B_GRR);
-            }
-            ++x; ++out;
-
-            // G pixel
-            {
-                out->r = applyFilter(in, x, y, w, h, R_GRG);
-                out->g = in[x + offset];
-                out->b = applyFilter(in, x, y, w, h, B_GRG);
-            }
-        }
-
-        ++y;
-        offset += w;
-
-        // GB row
-        for (int x = 0; x < w; ++x, ++out) {
-            // G pixel
-            {
-                out->r = applyFilter(in, x, y, w, h, R_BGG);
-                out->g = in[x + offset];
-                out->b = applyFilter(in, x, y, w, h, B_BGG);
-            }
-            ++x; ++out;
-
-            // B pixel
-            {
-                out->r = applyFilter(in, x, y, w, h, R_BGB);
-                out->g = applyFilter(in, x, y, w, h, G_BGB);
-                out->b = in[x + offset];
-            }
-        }
-    }
-}
-
-static void swapRedAndBlue(int N, Color3uint8* out) {
-    for (int i = N - 1; i >= 0; --i) {
-        uint8 tmp = out[i].r;
-        out[i].r = out[i].b;
-        out[i].b = tmp;
-    }
-}
-
-void GImage::BAYER_G8R8_B8G8_to_R8G8B8_MHC(int w, int h, const uint8* in, uint8* _out) {
-    // Run the equivalent function for red
-    BAYER_G8B8_R8G8_to_R8G8B8_MHC(w, h, in, _out);
-
-    // Now swap red and blue
-    swapRedAndBlue(w * h, (Color3uint8*)_out);
-}
-
-
-void GImage::BAYER_B8G8_G8R8_to_R8G8B8_MHC(int w, int h, const uint8* in, uint8* _out) {
-    // Run the equivalent function for red
-    BAYER_R8G8_G8B8_to_R8G8B8_MHC(w, h, in, _out);
-
-    // Now swap red and blue
-    swapRedAndBlue(w * h, (Color3uint8*)_out);
-}
-
-
-void GImage::BAYER_G8B8_R8G8_to_R8G8B8_MHC(int w, int h, const uint8* in, uint8* _out) {
-
-    debugAssert(in != _out);
-
-    Color3uint8* out = (Color3uint8*)_out;
-
-    for (int y = 0; y < h; ++y) {
-
-        // Row beginning in the input array.
-        int offset = y * w;
-
-        // GB row
-        for (int x = 0; x < w; ++x, ++out) {
-            // G pixel
-            {
-                out->r = applyFilter(in, x, y, w, h, R_BGG);
-                out->g = in[x + offset];
-                out->b = applyFilter(in, x, y, w, h, B_BGG);
-            }
-            ++x; ++out;
-
-            // B pixel
-            {
-                out->r = applyFilter(in, x, y, w, h, R_BGB);
-                out->g = applyFilter(in, x, y, w, h, G_BGB);
-                out->b = in[x + offset];
-            }
-        }
-
-        ++y;
-        offset += w;
-
-        // RG row
-        for (int x = 0; x < w; ++x, ++out) {
-            // R pixel
-            {
-                out->r = in[x + offset];
-                out->g = applyFilter(in, x, y, w, h, G_GRR);
-                out->b = applyFilter(in, x, y, w, h, B_GRR);
-            }
-            ++x; ++out;
-
-            // G pixel
-            {
-                out->r = applyFilter(in, x, y, w, h, R_GRG);
-                out->g = in[x + offset];
-                out->b = applyFilter(in, x, y, w, h, B_GRG);
-            }
-        }
-    }
-
-}
-
-#undef B_BGG
-#undef B_GRG
-#undef B_GRR
-
-}
diff --git a/externals/g3dlite/G3D.lib/source/GImage_bmp.cpp b/externals/g3dlite/G3D.lib/source/GImage_bmp.cpp
deleted file mode 100644
index 598ba730d0b..00000000000
--- a/externals/g3dlite/G3D.lib/source/GImage_bmp.cpp
+++ /dev/null
@@ -1,716 +0,0 @@
-/**
-  @file GImage_bmp.cpp
-  @author Morgan McGuire, morgan@graphics3d.com
-  @created 2002-05-27
-  @edited  2006-05-10
- */
-#include "G3D/platform.h"
-#include "G3D/GImage.h"
-#include "G3D/BinaryInput.h"
-#include "G3D/BinaryOutput.h"
-#include "G3D/Log.h"
-
-namespace G3D {
-
-#ifndef G3D_WIN32
-/**
- This is used by the Windows bitmap I/O.
- */
-static const int BI_RGB = 0;
-#endif
-
-void GImage::encodeBMP(
-    BinaryOutput&       out) const {
-
-    debugAssert(channels == 1 || channels == 3);
-    out.setEndian(G3D_LITTLE_ENDIAN);
-
-    uint8 red;
-    uint8 green;
-    uint8 blue;
-    int pixelBufferSize = width * height * 3;
-    int fileHeaderSize = 14;
-    int infoHeaderSize = 40;
-    int BMScanWidth;
-    int BMPadding;
-
-    // First write the BITMAPFILEHEADER
-    //
-    //  WORD    bfType; 
-    //  DWORD   bfSize; 
-    //  WORD    bfReserved1; 
-    //  WORD    bfReserved2; 
-    //  DWORD   bfOffBits; 
-
-    // Type
-    out.writeUInt8('B');
-    out.writeUInt8('M');
-
-    // File size
-    out.writeUInt32(fileHeaderSize + infoHeaderSize + pixelBufferSize);
-
-    // Two reserved fields set to zero
-    out.writeUInt16(0);
-    out.writeUInt16(0);
-
-	// The offset, in bytes, from the BITMAPFILEHEADER structure
-    // to the bitmap bits.
-    out.writeUInt32(infoHeaderSize + fileHeaderSize);
-
-    // Now the BITMAPINFOHEADER
-    //
-    //  DWORD  biSize; 
-    //  LONG   biWidth; 
-    //  LONG   biHeight; 
-    //  WORD   biPlanes; 
-    //  WORD   biBitCount 
-    //  DWORD  biCompression; 
-    //  DWORD  biSizeImage; 
-    //  LONG   biXPelsPerMeter; 
-    //  LONG   biYPelsPerMeter; 
-    //  DWORD  biClrUsed; 
-    //  DWORD  biClrImportant; 
-
-    // Size of the info header
-    out.writeUInt32(infoHeaderSize);
- 
-    // Width and height of the image
-	out.writeUInt32(width);
-    out.writeUInt32(height);
-
-    // Planes ("must be set to 1")
-    out.writeUInt16(1);
-
-    // BitCount and CompressionType
-    out.writeUInt16(24);
-    out.writeUInt32(BI_RGB);
-
-    // Image size ("may be zero for BI_RGB bitmaps")
-    out.writeUInt32(0);
-
-    // biXPelsPerMeter
-    out.writeUInt32(0);
-    // biYPelsPerMeter
-    out.writeUInt32(0);
-
-    // biClrUsed
-    out.writeUInt32(0); 
-
-    // biClrImportant
-    out.writeUInt32(0); 
-    
-    BMScanWidth = width * 3;
-
-    if (BMScanWidth & 3) {
-        BMPadding = 4 - (BMScanWidth & 3);
-    } else {
-        BMPadding = 0;
-    }
-
-    int hStart = height - 1;
-    int hEnd   = -1;
-    int hDir   = -1;
-    int dest;
-
-    // Write the pixel data
-    for (int h = hStart; h != hEnd; h += hDir) {
-        dest = channels * h * width;
-        for (int w = 0; w < width; ++w) {
-
-            if (channels == 3) {
-                red   = _byte[dest];
-                green = _byte[dest + 1];
-                blue  = _byte[dest + 2];
-            } else {
-                red   = _byte[dest];
-                green = _byte[dest];
-                blue  = _byte[dest];
-            }
-
-            out.writeUInt8(blue);
-            out.writeUInt8(green);
-            out.writeUInt8(red);
-
-            dest += channels;
-        }
-
-        if (BMPadding > 0) {
-            out.skip(BMPadding);
-        }
-    }
-}
-
-
-void GImage::decodeBMP(
-    BinaryInput&            input) {
-
-    // The BMP decoding uses these flags.
-    static const uint16 PICTURE_NONE               = 0x0000;
-    static const uint16 PICTURE_BITMAP             = 0x1000;
-
-    // Compression Flags
-    static const uint16 PICTURE_UNCOMPRESSED       = 0x0100;
-    static const uint16 PICTURE_MONOCHROME         = 0x0001;
-    static const uint16 PICTURE_4BIT               = 0x0002;
-    static const uint16 PICTURE_8BIT               = 0x0004;
-    static const uint16 PICTURE_16BIT              = 0x0008;
-    static const uint16 PICTURE_24BIT              = 0x0010;
-    static const uint16 PICTURE_32BIT              = 0x0020;
-
-    (void)PICTURE_16BIT;
-    (void)PICTURE_32BIT;
-
-    // This is a simple BMP loader that can handle uncompressed BMP files.
-    // Verify this is a BMP file by looking for the BM tag.
-    input.reset();
-    std::string tag = input.readString(2);
-    if (tag != "BM") {
-        throw Error("Not a BMP file", input.getFilename());
-    }
-
-    channels = 3;
-	// Skip to the BITMAPINFOHEADER's width and height
-	input.skip(16);
-
-    width  = input.readUInt32();
-    height = input.readUInt32();
-
-	// Skip to the bit count and compression type
-	input.skip(2);
-
-    uint16 bitCount        = input.readUInt16();
-    uint32 compressionType = input.readUInt32();
-
-    uint8 red;
-    uint8 green;
-    uint8 blue;
-    uint8 blank;
-
-	// Only uncompressed bitmaps are supported by this code
-    if ((int32)compressionType != BI_RGB) {
-        throw Error("BMP images must be uncompressed", input.getFilename());
-    }
-
-    uint8* palette = NULL;
-
-	// Create the palette if needed
-    if (bitCount <= 8) {
-
-        // Skip to the palette color count in the header
-        input.skip(12);
-
-        int numColors = input.readUInt32();
-
-        palette = (uint8*)System::malloc(numColors * 3);
-        debugAssert(palette);
-
-        // Skip past the end of the header to the palette info
-        input.skip(4);
-
-        int c;
-        for(c = 0; c < numColors * 3; c += 3) {
-            // Palette information in bitmaps is stored in BGR_ format.
-            // That means it's blue-green-red-blank, for each entry.
-            blue  = input.readUInt8();
-            green = input.readUInt8();
-            red   = input.readUInt8();
-            blank = input.readUInt8();
-
-            palette[c]     = red;
-            palette[c + 1] = green;
-            palette[c + 2] = blue;
-        }
-	}
-
-    int hStart = 0;
-    int hEnd   = 0;
-    int hDir   = 0;
-
-    if (height < 0) {
-        height = -height;
-        hStart = 0;
-        hEnd   = height;
-        hDir   = 1;
-    } else {
-        //height = height;
-        hStart = height - 1;
-        hEnd   = -1;
-        hDir   = -1;
-    }
-
-    _byte = (uint8*)System::malloc(width * height * 3);
-    debugAssert(_byte);
-
-    int BMScanWidth;
-    int BMPadding;
-    uint8 BMGroup;
-    uint8 BMPixel8;
-    int currPixel;
-    int dest;
-    int flags = PICTURE_NONE;
-
-    if (bitCount == 1) {
-        // Note that this file is not necessarily grayscale, since it's possible
-        // the palette is blue-and-white, or whatever. But of course most image
-        // programs only write 1-bit images if they're black-and-white.
-        flags = PICTURE_BITMAP | PICTURE_UNCOMPRESSED | PICTURE_MONOCHROME;
-
-        // For bitmaps, each scanline is dword-aligned.
-        BMScanWidth = (width + 7) >> 3;
-        if (BMScanWidth & 3) {
-            BMScanWidth += 4 - (BMScanWidth & 3);
-        }
-
-        // Powers of 2
-        int pow2[8] = {0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80};
-
-        for (int h = hStart; h != hEnd; h += hDir) {
-
-            currPixel = 0;
-            dest = 3 * h * width;
-
-            for (int w = 0; w < BMScanWidth; ++w) {
-
-                BMGroup = input.readUInt8();
-
-                // Now we read the pixels. Usually there are eight pixels per byte,
-                // since each pixel is represented by one bit, but if the width
-                // is not a multiple of eight, the last byte will have some bits
-                // set, with the others just being extra. Plus there's the
-                // dword-alignment padding. So we keep checking to see if we've
-                // already read "width" number of pixels.
-                for (int i = 7; i >= 0; --i) {
-                    if (currPixel < width) {
-                        int src  = 3 * ((BMGroup & pow2[i]) >> i);
-                    
-                        _byte[dest]     = palette[src];
-                        _byte[dest + 1] = palette[src + 1];
-                        _byte[dest + 2] = palette[src + 2];
-                    
-                        ++currPixel;
-                        dest += 3;
-                    }
-                }
-            }
-        }
-
-	} else if (bitCount == 4) {
-
-        flags = PICTURE_BITMAP | PICTURE_UNCOMPRESSED | PICTURE_4BIT;
-
-        // For bitmaps, each scanline is dword-aligned.
-        int BMScanWidth = (width+1) >> 1;
-        if (BMScanWidth & 3) {
-            BMScanWidth += 4 - (BMScanWidth & 3);
-        }
-
-        for (int h = hStart; h != hEnd; h += hDir) {
-
-            currPixel = 0;
-            dest = 3 * h * width;
-
-            for (int w = 0; w < BMScanWidth; w++) {
-
-                BMGroup = input.readUInt8();
-                int src[2];
-                src[0] = 3 * ((BMGroup & 0xF0) >> 4);
-                src[1] = 3 * (BMGroup & 0x0F);
-
-                // Now we read the pixels. Usually there are two pixels per byte,
-                // since each pixel is represented by four bits, but if the width
-                // is not a multiple of two, the last byte will have only four bits
-                // set, with the others just being extra. Plus there's the
-                // dword-alignment padding. So we keep checking to see if we've
-                // already read "Width" number of pixels.
-
-                for (int i = 0; i < 2; ++i) {
-                    if (currPixel < width) {
-                        int tsrc  = src[i];
-                    
-                        _byte[dest]     = palette[tsrc];
-                        _byte[dest + 1] = palette[tsrc + 1];
-                        _byte[dest + 2] = palette[tsrc + 2];
-
-                        ++currPixel;
-                        dest += 3;
-                    }
-                }
-            }
-        }
-
-	} else if (bitCount == 8) {
-        
-        flags = PICTURE_BITMAP | PICTURE_UNCOMPRESSED | PICTURE_8BIT;
-
-        // For bitmaps, each scanline is dword-aligned.
-        BMScanWidth = width;
-        if (BMScanWidth & 3) {
-            BMScanWidth += 4 - (BMScanWidth & 3);
-        }
-
-        for (int h = hStart; h != hEnd; h += hDir) {
-
-            currPixel = 0;
-
-            for (int w = 0; w < BMScanWidth; ++w) {
-
-                BMPixel8 = input.readUInt8();
-
-                if (currPixel < width) {
-                    dest = 3 * ((h * width) + currPixel);
-                    int src  = 3 * BMPixel8;
-                    
-                    _byte[dest]     = palette[src];
-                    _byte[dest + 1] = palette[src + 1];
-                    _byte[dest + 2] = palette[src + 2];
-                    
-                    ++currPixel;
-                }
-            }
-        }
-
-    } else if (bitCount == 16) {
-
-        System::free(_byte);
-        _byte = NULL;
-        System::free(palette); 
-        palette = NULL;
-    	throw Error("16-bit bitmaps not supported", input.getFilename());
-
-	} else if (bitCount == 24) {
-        input.skip(20);
-
-        flags = PICTURE_BITMAP | PICTURE_UNCOMPRESSED | PICTURE_24BIT;
-
-        // For bitmaps, each scanline is dword-aligned.
-        BMScanWidth = width * 3;
-
-        if (BMScanWidth & 3) {
-            BMPadding = 4 - (BMScanWidth & 3);
-        } else {
-            BMPadding = 0;
-        }
-
-        for (int h = hStart; h != hEnd; h += hDir) {
-            dest = 3 * h * width;
-            for (int w = 0; w < width; ++w) {
-
-                blue  = input.readUInt8();
-                green = input.readUInt8();
-                red   = input.readUInt8();
-
-                _byte[dest]     = red;
-                _byte[dest + 1] = green;
-                _byte[dest + 2] = blue;
-
-                dest += 3;
-            }
-
-            if (BMPadding) {
-                input.skip(2);
-            }
-        }
-
-	} else if (bitCount == 32) {
-
-        System::free(_byte);
-        _byte = NULL;
-        System::free(palette); 
-        palette = NULL;
-    	throw Error("32 bit bitmaps not supported", input.getFilename());
-    
-    } else {
-        // We support all possible bit depths, so if the
-        //     code gets here, it's not even a real bitmap.
-        System::free(_byte);
-        _byte = NULL;
-        throw Error("Not a bitmap!", input.getFilename());
-	}
-
-    System::free(palette); 
-    palette = NULL;
-}
-
-
-void GImage::decodeICO(
-    BinaryInput&            input) {
-
-	// Header
-	uint16 r = input.readUInt16();
-	debugAssert(r == 0);
-	r = input.readUInt16();
-	debugAssert(r == 1);
-
-	// Read the number of icons, although we'll only load the
-	// first one.
-	int count = input.readUInt16();
-
-	channels = 4;
-
-	debugAssert(count > 0);
-
-    const uint8* headerBuffer = input.getCArray() + input.getPosition();
-    int maxWidth = 0, maxHeight = 0;
-    int maxHeaderNum = 0;
-    for (int currentHeader = 0; currentHeader < count; ++currentHeader) {
-        
-        const uint8* curHeaderBuffer = headerBuffer + (currentHeader * 16);
-        int tmpWidth = curHeaderBuffer[0];
-        int tmpHeight = curHeaderBuffer[1];
-        // Just in case there is a non-square icon, checking area
-        if ((tmpWidth * tmpHeight) > (maxWidth * maxHeight)) {
-            maxWidth = tmpWidth;
-            maxHeight = tmpHeight;
-            maxHeaderNum = currentHeader;
-        }
-    }
-
-    input.skip(maxHeaderNum * 16);
-
-	width = input.readUInt8();
-	height = input.readUInt8();
-	int numColors = input.readUInt8();
-	
-    _byte = (uint8*)System::malloc(width * height * channels);
-    debugAssert(_byte);
-
-	// Bit mask for packed bits
-	int mask = 0;
-
-	int bitsPerPixel = 8;
-
-	switch (numColors) {
-	case 2:
-		mask      = 0x01;
-		bitsPerPixel = 1;
-		break;
-
-	case 16:
-		mask      = 0x0F;
-		bitsPerPixel = 4;
-		break;
-
-	case 0:
-		numColors = 256;
-		mask      = 0xFF;
-		bitsPerPixel = 8;
-		break;
-    default:
-    	throw Error("Unsupported ICO color count.", input.getFilename());
-	}
-
-	input.skip(5);
-	// Skip 'size' unused
-        input.skip(4);
-
-	int offset = input.readUInt32();
-
-	// Skip over any other icon descriptions
-    input.setPosition(offset);
-
-	// Skip over bitmap header; it is redundant
-	input.skip(40);
-
-	Array palette;
-    palette.resize(numColors, true);
-	for (int c = 0; c < numColors; ++c) {
-		palette[c].b = input.readUInt8();
-		palette[c].g = input.readUInt8();
-		palette[c].r = input.readUInt8();
-		palette[c].a = input.readUInt8();
-	}
-
-	// The actual image and mask follow
-
-	// The XOR Bitmap is stored as 1-bit, 4-bit or 8-bit uncompressed Bitmap 
-	// using the same encoding as BMP files. The AND Bitmap is stored in as 
-	// 1-bit uncompressed Bitmap.
-	// 
-	// Pixels are stored bottom-up, left-to-right. Pixel lines are padded 
-	// with zeros to end on a 32bit (4byte) boundary. Every line will have the 
-	// same number of bytes. Color indices are zero based, meaning a pixel color 
-	// of 0 represents the first color table entry, a pixel color of 255 (if there
-	// are that many) represents the 256th entry.
-/*
-	int bitsPerRow  = width * bitsPerPixel;
-	int bytesPerRow = iCeil((double)bitsPerRow / 8);
-	// Rows are padded to 32-bit boundaries
-	bytesPerRow += bytesPerRow % 4;
-
-	// Read the XOR values into the color channel
-	for (int y = height - 1; y >= 0; --y) {
-		int x = 0;
-		// Read the row
-		for (int i = 0; i < bytesPerRow; ++i) {
-			uint8 byte = input.readUInt8();
-			for (int j = 0; (j < 8) && (x < width); ++x, j += bitsPerPixel) {
-				int bit = ((byte << j) >> (8 - bitsPerPixel)) & mask;
-				pixel4(x, y) = colorTable[bit];
-			}
-		}
-	}
-*/
-    int hStart = 0;
-    int hEnd   = 0;
-    int hDir   = 0;
-
-    if (height < 0) {
-        height = -height;
-        hStart = 0;
-        hEnd   = height;
-        hDir   = 1;
-    } else {
-        //height = height;
-        hStart = height - 1;
-        hEnd   = -1;
-        hDir   = -1;
-    }
-
-    int BMScanWidth;
-    uint8 BMGroup;
-    uint8 BMPixel8;
-    int currPixel;
-    int dest;
-
-    if (bitsPerPixel == 1) {
-        // Note that this file is not necessarily grayscale, since it's possible
-        // the palette is blue-and-white, or whatever. But of course most image
-        // programs only write 1-bit images if they're black-and-white.
-
-        // For bitmaps, each scanline is dword-aligned.
-        BMScanWidth = (width + 7) >> 3;
-        if (BMScanWidth & 3) {
-            BMScanWidth += 4 - (BMScanWidth & 3);
-        }
-
-        // Powers of 2
-        int pow2[8] = {0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80};
-
-        for (int h = hStart; h != hEnd; h += hDir) {
-
-            currPixel = 0;
-            dest = 3 * h * width;
-
-            for (int w = 0; w < BMScanWidth; ++w) {
-
-                BMGroup = input.readUInt8();
-
-                // Now we read the pixels. Usually there are eight pixels per byte,
-                // since each pixel is represented by one bit, but if the width
-                // is not a multiple of eight, the last byte will have some bits
-                // set, with the others just being extra. Plus there's the
-                // dword-alignment padding. So we keep checking to see if we've
-                // already read "width" number of pixels.
-                for (int i = 7; i >= 0; --i) {
-                    if (currPixel < width) {
-                        int src  = ((BMGroup & pow2[i]) >> i);
-                    
-                        _byte[dest]     = palette[src].r;
-                        _byte[dest + 1] = palette[src].g;
-                        _byte[dest + 2] = palette[src].b;
-                    
-                        ++currPixel;
-                        dest += 4;
-                    }
-                }
-            }
-        }
-
-	} else if (bitsPerPixel == 4) {
-
-        // For bitmaps, each scanline is dword-aligned.
-        int BMScanWidth = (width+1) >> 1;
-        if (BMScanWidth & 3) {
-            BMScanWidth += 4 - (BMScanWidth & 3);
-        }
-
-        for (int h = hStart; h != hEnd; h += hDir) {
-
-            currPixel = 0;
-            dest = 4 * h * width;
-
-            for (int w = 0; w < BMScanWidth; w++) {
-
-                BMGroup = input.readUInt8();
-                int src[2];
-                src[0] = ((BMGroup & 0xF0) >> 4);
-                src[1] = (BMGroup & 0x0F);
-
-                // Now we read the pixels. Usually there are two pixels per byte,
-                // since each pixel is represented by four bits, but if the width
-                // is not a multiple of two, the last byte will have only four bits
-                // set, with the others just being extra. Plus there's the
-                // dword-alignment padding. So we keep checking to see if we've
-                // already read "Width" number of pixels.
-
-                for (int i = 0; i < 2; ++i) {
-                    if (currPixel < width) {
-                        int tsrc  = src[i];
-                    
-                        _byte[dest]     = palette[tsrc].r;
-                        _byte[dest + 1] = palette[tsrc].g;
-                        _byte[dest + 2] = palette[tsrc].b;
-
-                        ++currPixel;
-                        dest += 4;
-                    }
-                }
-            }
-        }
-
-	} else if (bitsPerPixel == 8) {
-        
-        // For bitmaps, each scanline is dword-aligned.
-        BMScanWidth = width;
-        if (BMScanWidth & 3) {
-            BMScanWidth += 4 - (BMScanWidth & 3);
-        }
-
-        for (int h = hStart; h != hEnd; h += hDir) {
-
-            currPixel = 0;
-
-            for (int w = 0; w < BMScanWidth; ++w) {
-
-                BMPixel8 = input.readUInt8();
-
-                if (currPixel < width) {
-                    dest = 4 * ((h * width) + currPixel);
-                    int src  = BMPixel8;
-                    
-                    _byte[dest]     = palette[src].r;
-                    _byte[dest + 1] = palette[src].g;
-                    _byte[dest + 2] = palette[src].b;
-                    
-                    ++currPixel;
-                }
-            }
-        }
-    }
-
-	// Read the mask into the alpha channel
-	int bitsPerRow  = width;
-	int bytesPerRow = iCeil((double)bitsPerRow / 8);
-
-    // For bitmaps, each scanline is dword-aligned.
-    //BMScanWidth = (width + 1) >> 1;
-    if (bytesPerRow & 3) {
-        bytesPerRow += 4 - (bytesPerRow & 3);
-    }
-    
-    for (int y = height - 1; y >= 0; --y) {
-		int x = 0;
-		// Read the row
-		for (int i = 0; i < bytesPerRow; ++i) {
-			uint8 byte = input.readUInt8();
-			for (int j = 0; (j < 8) && (x < width); ++x, ++j) {
-				int bit = (byte >> (7 - j)) & 0x01;
-				pixel4(x, y).a = (1 - bit) * 0xFF;
-			}
-		}
-	}
-
-}
-
-
-}
diff --git a/externals/g3dlite/G3D.lib/source/GImage_jpeg.cpp b/externals/g3dlite/G3D.lib/source/GImage_jpeg.cpp
deleted file mode 100644
index fe2812cf3b2..00000000000
--- a/externals/g3dlite/G3D.lib/source/GImage_jpeg.cpp
+++ /dev/null
@@ -1,445 +0,0 @@
-/**
-  @file GImage_jpeg.cpp
-  @author Morgan McGuire, morgan@graphics3d.com
-  @created 2002-05-27
-  @edited  2006-10-10
- */
-#include "G3D/platform.h"
-#include "G3D/GImage.h"
-#include "G3D/BinaryInput.h"
-#include "G3D/BinaryOutput.h"
-
-#include 
- 
-/**
- Pick up libjpeg headers locally on Windows, but from the system on all other platforms.
-*/
-extern "C" {
-#include 
-#include 
-}
-
-namespace G3D {
-
-
-const int jpegQuality = 96;
-
-/**
- The IJG library needs special setup for compress/decompressing
- from memory.  These classes provide them.  
- 
- The format of this class is defined by the IJG library; do not
- change it.
- */ 
-class memory_destination_mgr {
-public:
-	struct jpeg_destination_mgr pub;
-	JOCTET*                     buffer;
-	int                         size;
-	int                         count;
-};
-
-typedef memory_destination_mgr* mem_dest_ptr;
-
-/**
- Signature dictated by IJG.
- */
-static void init_destination (
-    j_compress_ptr              cinfo) {
-
-	mem_dest_ptr dest = (mem_dest_ptr) cinfo->dest;
-
-	dest->pub.next_output_byte = dest->buffer;
-	dest->pub.free_in_buffer = dest->size;
-	dest->count=0;
-}
-
-/**
- Signature dictated by IJG.
- */
-static boolean empty_output_buffer (
-    j_compress_ptr              cinfo) {
-
-	mem_dest_ptr dest = (mem_dest_ptr) cinfo->dest;
-
-	dest->pub.next_output_byte = dest->buffer;
-	dest->pub.free_in_buffer = dest->size;
-
-	return TRUE;
-}
-
-/**
- Signature dictated by IJG.
- */
-static void term_destination (
-    j_compress_ptr              cinfo) {
-
-	mem_dest_ptr dest = (mem_dest_ptr) cinfo->dest;
-	dest->count = dest->size - dest->pub.free_in_buffer;
-}
-
-/**
- Signature dictated by IJG.
- */
-static void jpeg_memory_dest (
-    j_compress_ptr              cinfo,
-    JOCTET*                     buffer,
-    int                         size) {
-
-	mem_dest_ptr dest;
-
-	if (cinfo->dest == NULL) {
-        // First time for this JPEG object; call the
-        // IJG allocator to get space.
-		cinfo->dest = (struct jpeg_destination_mgr*)
-			(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, 
-                                        JPOOL_PERMANENT,
-                       				    sizeof(memory_destination_mgr));
-	}
-
-	dest                            = (mem_dest_ptr) cinfo->dest;
-	dest->size                      = size;
-	dest->buffer                    = buffer;
-	dest->pub.init_destination      = init_destination;
-	dest->pub.empty_output_buffer   = empty_output_buffer;
-	dest->pub.term_destination      = term_destination;
-}
-  
-////////////////////////////////////////////////////////////////////////////////////////
-
-#define INPUT_BUF_SIZE  4096
-
-/**
- Structure dictated by IJG.
- */
-class memory_source_mgr {
-public:
-    struct jpeg_source_mgr  pub;
-	int                     source_size;
-	unsigned char*          source_data;
-	boolean                 start_of_data;
-	JOCTET*                 buffer;
-};
-
-
-typedef memory_source_mgr* mem_src_ptr;
-
-
-/**
- Signature dictated by IJG.
- */
-static void init_source(
-    j_decompress_ptr        cinfo) {
-
-    mem_src_ptr src = (mem_src_ptr) cinfo->src;
-
-    src->start_of_data = TRUE;
-}
-
-
-/**
- Signature dictated by IJG.
- */
-static boolean fill_input_buffer(
-    j_decompress_ptr        cinfo) {
-
-	mem_src_ptr src = (mem_src_ptr) cinfo->src;
-
-	size_t bytes_read = 0;
-
-	if (src->source_size > INPUT_BUF_SIZE)
-		bytes_read = INPUT_BUF_SIZE;
-	else
-		bytes_read = src->source_size;
-
-	memcpy (src->buffer, src->source_data, bytes_read);
-
-	src->source_data += bytes_read;
-	src->source_size -= bytes_read;
-
-	src->pub.next_input_byte = src->buffer;
-	src->pub.bytes_in_buffer = bytes_read;
-	src->start_of_data = FALSE;
-
-
-	return TRUE;
-}
-
-
-/**
- Signature dictated by IJG.
- */
-static void skip_input_data(
-    j_decompress_ptr        cinfo,
-    long                    num_bytes) {
-
-	mem_src_ptr src = (mem_src_ptr)cinfo->src;
-
-	if (num_bytes > 0) {
-		while (num_bytes > (long) src->pub.bytes_in_buffer) {
-			num_bytes -= (long) src->pub.bytes_in_buffer;
-			boolean s = fill_input_buffer(cinfo);
-            debugAssert(s); (void)s;
-		}
-
-		src->pub.next_input_byte += (size_t) num_bytes;
-		src->pub.bytes_in_buffer -= (size_t) num_bytes;
-	}
-}
-
-
-/**
- Signature dictated by IJG.
- */
-static void term_source (
-    j_decompress_ptr        cinfo) {
-    (void)cinfo;
-	// Intentionally empty
-}
-
-
-/**
- Signature dictated by IJG.
- */
-static void jpeg_memory_src (
-    j_decompress_ptr        cinfo,
-    JOCTET*                 buffer,
-    int                     size) {
-
-	mem_src_ptr src;
-
-	if (cinfo->src == NULL) {
-        // First time for this JPEG object
-		cinfo->src = (struct jpeg_source_mgr*)
-			(*cinfo->mem->alloc_small)(
-                (j_common_ptr) cinfo,
-                JPOOL_PERMANENT,
-				sizeof(memory_source_mgr));
-		
-        src = (mem_src_ptr)cinfo->src;
-		
-        src->buffer = (JOCTET*)
-			(*cinfo->mem->alloc_small)(
-                (j_common_ptr) cinfo,
-                JPOOL_PERMANENT,
-				INPUT_BUF_SIZE * sizeof(JOCTET));
-	}
-
-	src = (mem_src_ptr)cinfo->src;
-	src->pub.init_source        = init_source;
-	src->pub.fill_input_buffer  = fill_input_buffer;
-	src->pub.skip_input_data    = skip_input_data;
-
-    // use default method
-	src->pub.resync_to_restart  = jpeg_resync_to_restart;
-	src->pub.term_source        = term_source;
-	src->source_data            = buffer;
-	src->source_size            = size;
-
-    // forces fill_input_buffer on first read
-	src->pub.bytes_in_buffer    = 0;
-    
-    // until buffer loaded
-    src->pub.next_input_byte = NULL; 
-}
-
-
-void GImage::encodeJPEG(
-    BinaryOutput&           out) const {
-
-	if (channels != 3) {
-		// Convert to three channel
-		GImage tmp = *this;
-		tmp.convertToRGB();
-		tmp.encodeJPEG(out);
-		return;
-	}
-
-    debugAssert(channels == 3);
-    out.setEndian(G3D_LITTLE_ENDIAN);
-
-    // Allocate and initialize a compression object
-    jpeg_compress_struct    cinfo;
-    jpeg_error_mgr          jerr;
-
-	cinfo.err = jpeg_std_error(&jerr);
-	jpeg_create_compress(&cinfo);
-
-    // Specify the destination for the compressed data.
-    // (Overestimate the size)
-    int buffer_size = width * height * 3 + 200;
-    JOCTET* compressed_data = (JOCTET*)System::malloc(buffer_size);
-	jpeg_memory_dest(&cinfo, compressed_data, buffer_size);
-
-
-    cinfo.image_width       = width;
-    cinfo.image_height      = height;
-
-	// # of color components per pixel
-    cinfo.input_components  = 3;
-
-    // colorspace of input image
-    cinfo.in_color_space    = JCS_RGB; 
-    cinfo.input_gamma       = 1.0;
-    
-    // Set parameters for compression, including image size & colorspace
-    jpeg_set_defaults(&cinfo);
-    jpeg_set_quality(&cinfo, jpegQuality, false);
-    cinfo.smoothing_factor = 0;
-    cinfo.optimize_coding = TRUE;
-//    cinfo.dct_method = JDCT_FLOAT;
-    cinfo.dct_method = JDCT_ISLOW;
-    cinfo.jpeg_color_space = JCS_YCbCr;
-
-    // Initialize the compressor
-    jpeg_start_compress(&cinfo, TRUE);
-
-    // Iterate over all scanlines from top to bottom
-	// pointer to a single row
-    JSAMPROW row_pointer[1];
-    
-    // JSAMPLEs per row in image_buffer
-    int row_stride = cinfo.image_width * 3;
-    while (cinfo.next_scanline < cinfo.image_height) {
-	    row_pointer[0] = &(_byte[cinfo.next_scanline * row_stride]);
-	    jpeg_write_scanlines(&cinfo, row_pointer, 1);
-    }
-
-    // Shut down the compressor
-    jpeg_finish_compress(&cinfo);
-    
-    // Figure out how big the result was.
-    int outLength = ((mem_dest_ptr)cinfo.dest)->count;
-
-    //	Release the JPEG compression object
-    jpeg_destroy_compress(&cinfo);
-
-    // Copy into an appropriately sized output buffer.
-    out.writeBytes(compressed_data, outLength);
-
-    // Free the conservative buffer.
-    System::free(compressed_data);
-    compressed_data = NULL;
-}
-
-
-
-void GImage::decodeJPEG(
-    BinaryInput&                input) {
-
-	struct jpeg_decompress_struct   cinfo;
-	struct jpeg_error_mgr           jerr;
-    int                             loc = 0;
-
-    channels = 3;
-    // We have to set up the error handler, in case initialization fails.
-	cinfo.err = jpeg_std_error(&jerr);
-
-    // Initialize the JPEG decompression object.
-	jpeg_create_decompress(&cinfo);
-
-	// Specify data source (eg, a file, for us, memory)
-	jpeg_memory_src(&cinfo, const_cast(input.getCArray()), input.size());
-
-	// Read the parameters with jpeg_read_header()
-	jpeg_read_header(&cinfo, TRUE);
-
-	// Set parameters for decompression
-	// (We do nothing here since the defaults are fine)
-
-	// Start decompressor
-	jpeg_start_decompress(&cinfo);
-
-	// Get and set the values of interest to this object
-	this->width     = cinfo.output_width;
-	this->height    = cinfo.output_height;
-
-	// Prepare the pointer object for the pixel data
-    _byte = (uint8*)System::malloc(width * height * 3);
-
- 	// JSAMPLEs per row in output buffer
-    int bpp         = cinfo.output_components;
-    int row_stride  = cinfo.output_width * bpp;
-
-	// Make a one-row-high sample array that will go away when done with image
-    JSAMPARRAY temp = (*cinfo.mem->alloc_sarray)
-		((j_common_ptr) &cinfo, JPOOL_IMAGE, row_stride, 1);
-
-    // Read data on a scanline by scanline basis
-	while (cinfo.output_scanline < cinfo.output_height) {
-
-        // We may need to adjust the output based on the
-        // number of channels it has.
-        switch (bpp) {
-	    case 1:
-            // Grayscale; decompress to temp.
-    		jpeg_read_scanlines(&cinfo, temp, 1);
-
-            // Expand to three channels
-            {
-                uint8* scan     = &(_byte[loc * 3]);
-                uint8* endScan  = scan + (width * 3);
-                uint8* t        = *temp;
-
-                while (scan < endScan) {
-                    uint8 value = t[0];
-
-                    // Spread the value 3x.
-                    scan[0] = value;
-                    scan[1] = value;
-                    scan[2] = value;
-
-                    scan    += 3;
-                    t       += 1;
-                }
-            }
-		    break;
-
-	    case 3:
-            // Read directly into the array
-            {
-                // Need one extra level of indirection.
-                uint8*     scan = _byte + loc;
-                JSAMPARRAY ptr  = &scan;
-    		    jpeg_read_scanlines(&cinfo, ptr, 1);
-            }
-		    break;
-
-	    case 4:
-            // RGBA; decompress to temp.
-    		jpeg_read_scanlines(&cinfo, temp, 1);
-
-            // Drop the 3rd channel
-            {
-                uint8* scan     = &(_byte[loc * 3]);
-                uint8* endScan  = scan + width * 3;
-                uint8* t        = *temp;
-
-                while (scan < endScan) {
-                    scan[0] = t[0];
-                    scan[1] = t[1];
-                    scan[2] = t[2];
-                    
-                    scan    += 3;
-                    t       += 4;
-                }
-            }
-		    break;
-
-	    default:
-		    throw Error("Unexpected number of channels.", input.getFilename());
-	    }
-
-		loc += row_stride;
-	}
-
-	// Finish decompression
-	jpeg_finish_decompress(&cinfo);
-
-    alwaysAssertM(this, "Corrupt GImage");
-	// Release JPEG decompression object
-	jpeg_destroy_decompress(&cinfo);
-}
-
-
-}
diff --git a/externals/g3dlite/G3D.lib/source/GImage_png.cpp b/externals/g3dlite/G3D.lib/source/GImage_png.cpp
deleted file mode 100644
index 9fd6a743e8e..00000000000
--- a/externals/g3dlite/G3D.lib/source/GImage_png.cpp
+++ /dev/null
@@ -1,245 +0,0 @@
-/**
-  @file GImage_png.cpp
-  @author Morgan McGuire, morgan@graphics3d.com
-  @created 2002-05-27
-  @edited  2006-05-10
- */
-#include "G3D/platform.h"
-#include "G3D/GImage.h"
-#include "G3D/BinaryInput.h"
-#include "G3D/BinaryOutput.h"
-#include "G3D/Log.h"
-#include 
-
-namespace G3D {
-
-
-//libpng required function signature
-static void png_read_data(
-    png_structp png_ptr,
-    png_bytep data,
-    png_size_t length) {
-
-
-    debugAssert( png_ptr->io_ptr != NULL );
-    debugAssert( length >= 0 );
-    debugAssert( data != NULL );
-
-    ((BinaryInput*)png_ptr->io_ptr)->readBytes(data, length);
-}
-
-//libpng required function signature
-static void png_write_data(png_structp png_ptr,
-    png_bytep data,
-    png_size_t length) {
-
-    debugAssert( png_ptr->io_ptr != NULL );
-    debugAssert( data != NULL );
-
-    ((BinaryOutput*)png_ptr->io_ptr)->writeBytes(data, length);
-}
-
-//libpng required function signature
-static void png_flush_data(
-    png_structp png_ptr) {
-    (void)png_ptr;
-    //Do nothing.
-}
-
-//libpng required function signature
-static void png_error(
-    png_structp png_ptr,
-    png_const_charp error_msg) {
-    
-    (void)png_ptr;
-    debugAssert( error_msg != NULL );
-    throw GImage::Error(error_msg, "PNG"); 
-}
-
-//libpng required function signature
-void png_warning(
-    png_structp png_ptr,
-    png_const_charp warning_msg) {
-
-    (void)png_ptr;
-    debugAssert( warning_msg != NULL );
-    Log::common()->println(warning_msg);
-}
-
-void GImage::encodePNG(
-    BinaryOutput&           out) const {
-
-    debugAssert( channels == 1 || channels == 3 || channels == 4 );
-
-    if (this->height > (int)(PNG_UINT_32_MAX/png_sizeof(png_bytep)))
-        throw GImage::Error("Unsupported PNG height.", out.getFilename());
-
-    out.setEndian(G3D_LITTLE_ENDIAN);
-
-    png_structp png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, png_error, png_warning);
-    if (!png_ptr)
-        throw GImage::Error("Unable to initialize PNG encoder.", out.getFilename());
-
-    png_infop info_ptr = png_create_info_struct(png_ptr);
-    if (!info_ptr) {
-        png_destroy_write_struct(&png_ptr, &info_ptr);
-        throw GImage::Error("Unable to initialize PNG encoder.", out.getFilename());
-    }
-
-    //setup libpng write handler so can use BinaryOutput
-    png_set_write_fn(png_ptr, (void*)&out, png_write_data, png_flush_data);
-
-    if (channels == 3) {
-        png_set_IHDR(png_ptr, info_ptr, this->width, this->height, 8, PNG_COLOR_TYPE_RGB,
-            PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
-    }
-    else if (channels == 4) {
-        png_set_IHDR(png_ptr, info_ptr, this->width, this->height, 8, PNG_COLOR_TYPE_RGBA,
-            PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
-    }
-    else if (channels == 1) {
-        png_set_IHDR(png_ptr, info_ptr, this->width, this->height, 8, PNG_COLOR_TYPE_GRAY,
-            PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
-    }
-    else {
-        png_destroy_write_struct(&png_ptr, &info_ptr);
-        throw GImage::Error("Unsupported number of channels for PNG.", out.getFilename());
-    }
-
-    png_color_8_struct sig_bit;
-    sig_bit.red = 8;
-    sig_bit.green = 8;
-    sig_bit.blue = 8;
-    if (channels == 4)
-        sig_bit.alpha = 8;
-    else
-        sig_bit.alpha = 0;
-    png_set_sBIT(png_ptr, info_ptr, &sig_bit);
-
-    //write the png header
-    png_write_info(png_ptr, info_ptr);
-
-    png_bytepp row_pointers = new png_bytep[this->height];
-
-    for (int i=0; i < this->height; ++i) {
-        row_pointers[i] = (png_bytep)&this->_byte[(this->width * this->channels * i)];
-    }
-
-    png_write_image(png_ptr, row_pointers);
-
-    png_write_end(png_ptr, info_ptr);
-
-    delete[] row_pointers;
-
-    png_destroy_write_struct(&png_ptr, &info_ptr);
-}
-
-
-void GImage::decodePNG(
-    BinaryInput&        input) {
-
-    png_structp png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, png_error, png_warning);
-    if (!png_ptr)
-        throw GImage::Error("Unable to initialize PNG decoder.", input.getFilename());
-
-    png_infop info_ptr = png_create_info_struct(png_ptr);
-    if (!info_ptr) {
-        png_destroy_read_struct(&png_ptr, (png_infopp)NULL, (png_infopp)NULL);
-        throw GImage::Error("Unable to initialize PNG decoder.", input.getFilename());
-    }
-
-    png_infop end_info = png_create_info_struct(png_ptr);
-    if (!end_info) {
-        png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
-        throw GImage::Error("Unable to initialize PNG decoder.", input.getFilename());
-    }
-
-    //now that the libpng structures are setup, change the error handlers and read routines
-    //to use G3D functions so that BinaryInput can be used.
-
-    png_set_read_fn(png_ptr, (png_voidp)&input, png_read_data);
-    
-    //read in sequentially so that three copies of the file are not in memory at once
-    png_read_info(png_ptr, info_ptr);
-
-    png_uint_32 png_width, png_height;
-    int bit_depth, color_type, interlace_type;
-    //this will validate the data it extracts from info_ptr
-    png_get_IHDR(png_ptr, info_ptr, &png_width, &png_height, &bit_depth, &color_type,
-       &interlace_type, int_p_NULL, int_p_NULL);
-
-    if (color_type == PNG_COLOR_TYPE_GRAY_ALPHA) {
-        png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
-        throw GImage::Error("Unsupported PNG color type - PNG_COLOR_TYPE_GRAY_ALPHA.", input.getFilename());
-    }
-
-    this->width = static_cast(png_width);
-    this->height = static_cast(png_height);
-
-    //swap bytes of 16 bit files to least significant byte first
-    png_set_swap(png_ptr);
-
-    png_set_strip_16(png_ptr);
-
-    //Expand paletted colors into true RGB triplets
-    if (color_type == PNG_COLOR_TYPE_PALETTE) {
-        png_set_palette_to_rgb(png_ptr);
-    }
-
-    //Expand grayscale images to the full 8 bits from 1, 2, or 4 bits/pixel
-    if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) {
-        png_set_gray_1_2_4_to_8(png_ptr);
-    }
-
-    //Expand paletted or RGB images with transparency to full alpha channels
-    //so the data will be available as RGBA quartets.
-    if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) {
-        png_set_tRNS_to_alpha(png_ptr);
-    }
-
-    // Fix sub-8 bit_depth to 8bit
-    if (bit_depth < 8) {
-        png_set_packing(png_ptr);
-    }
-
-    if ((color_type == PNG_COLOR_TYPE_RGBA) ||
-        ((color_type == PNG_COLOR_TYPE_PALETTE) && (png_ptr->num_trans > 0)) ) {
-
-        this->channels = 4;
-        this->_byte = (uint8*)System::malloc(width * height * 4);
-
-    } else if ((color_type == PNG_COLOR_TYPE_RGB) || 
-               (color_type == PNG_COLOR_TYPE_PALETTE)) {
-
-        this->channels = 3;
-        this->_byte = (uint8*)System::malloc(width * height * 3);
-
-    } else if (color_type == PNG_COLOR_TYPE_GRAY) {
-
-        this->channels = 1;
-        this->_byte = (uint8*)System::malloc(width * height);
-
-    } else {
-        throw GImage::Error("Unsupported PNG bit-depth or type.", input.getFilename());
-    }
-
-    //since we are reading row by row, required to handle interlacing
-    uint32 number_passes = png_set_interlace_handling(png_ptr);
-
-    png_read_update_info(png_ptr, info_ptr);
-
-    for (uint32 pass = 0; pass < number_passes; ++pass) {
-        for (uint32 y = 0; y < (uint32)height; ++y) {
-            png_bytep rowPointer = &this->_byte[width * this->channels * y]; 
-            png_read_rows(png_ptr, &rowPointer, png_bytepp_NULL, 1);
-        }
-    }
-
-//    png_read_image(png_ptr, &_byte);
-    png_read_end(png_ptr, info_ptr);
-
-    png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
-}
-
-
-}
diff --git a/externals/g3dlite/G3D.lib/source/GImage_ppm.cpp b/externals/g3dlite/G3D.lib/source/GImage_ppm.cpp
deleted file mode 100644
index bfe5c8305e8..00000000000
--- a/externals/g3dlite/G3D.lib/source/GImage_ppm.cpp
+++ /dev/null
@@ -1,185 +0,0 @@
-/**
-  @file GImage_ppm.cpp
-  @author Morgan McGuire, morgan@graphics3d.com
-  @created 2002-05-27
-  @edited  2006-05-10
- */
-#include "G3D/platform.h"
-#include "G3D/GImage.h"
-#include "G3D/BinaryInput.h"
-#include "G3D/BinaryOutput.h"
-#include "G3D/TextInput.h"
-#include "G3D/TextOutput.h"
-#include "G3D/Log.h"
-
-namespace G3D {
-
-void GImage::encodePPMASCII(
-    BinaryOutput&       out) const {
-
-    debugAssert(channels == 3);
-
-    TextOutput::Settings ppmOptions;
-    ppmOptions.convertNewlines = false;
-    ppmOptions.numColumns = 70;
-    ppmOptions.wordWrap = TextOutput::Settings::WRAP_WITHOUT_BREAKING;
-    TextOutput ppm(ppmOptions);
-    // Always write out a full-color ppm
-    ppm.printf("P3\n%d %d\n255\n", width, height);
-    
-    const Color3uint8* c = this->pixel3();
-    for (uint32 i = 0; i < (uint32)(width * height); ++i) {
-        ppm.printf("%d %d %d%c", c[i].r, c[i].g, c[i].b, 
-            ((i % ((width * 3) - 1)) == 0) ?
-            '\n' : ' '); 
-    }
-
-    out.writeString(ppm.commitString());
-}
-
-
-void GImage::encodePPM(
-    BinaryOutput&       out) const {
-
-    // http://netpbm.sourceforge.net/doc/ppm.html
-    debugAssert(channels == 3);
-
-    std::string header = format("P6 %d %d 255 ", width, height);
-
-    out.writeBytes(header.c_str(), header.size());
-
-    out.writeBytes(this->pixel3(), width * height * 3);
-}
-
-void GImage::decodePPMASCII(
-    BinaryInput&        input) {
-
-    int ppmWidth;
-    int ppmHeight;
-
-    double maxColor;
-
-    // Create a TextInput object to parse ascii format
-    // Mixed binary/ascii formats will require more 
-
-    const std::string inputStr = input.readString();
-
-    TextInput::Settings ppmOptions;
-    ppmOptions.cppComments = false;
-    ppmOptions.otherCommentCharacter = '#';
-    ppmOptions.signedNumbers = true;
-    ppmOptions.singleQuotedStrings = false;
-
-    TextInput ppmInput(TextInput::FROM_STRING, inputStr, ppmOptions);
-
-    //Skip first line in header P#
-    std::string ppmType = ppmInput.readSymbol();
-
-    ppmWidth = (int)ppmInput.readNumber();
-    ppmHeight = (int)ppmInput.readNumber();
-
-    // Everything but a PBM will have a max color value
-    if (ppmType != "P2") {
-        maxColor = ppmInput.readNumber();
-    } else {
-        maxColor = 255;
-    }
-
-    if ((ppmWidth < 0) ||
-        (ppmHeight < 0) ||
-        (maxColor <= 0)) {
-        throw GImage::Error("Invalid PPM Header.", input.getFilename());
-    }
-
-    // I don't think it's proper to scale values less than 255
-    if (maxColor <= 255.0) {
-        maxColor = 255.0;
-    }
-
-    this->width = ppmWidth;
-    this->height = ppmHeight;
-    this->channels = 3;
-    // always scale down to 1 byte per channel
-    this->_byte = (uint8*)System::malloc(width * height * 3);
-
-    // Read in the image data.  I am not validating if the values match the maxColor
-    // requirements.  I only scale if needed to fit within the byte available.
-    for (uint32 i = 0; i < (uint32)(width * height); ++i) {
-        // read in color and scale to max pixel defined in header
-        // A max color less than 255 might need to be left alone and not scaled.
-        Color3uint8& curPixel = *(this->pixel3() + i);
-
-        if (ppmType == "P3") {
-            curPixel.r = (uint8)(ppmInput.readNumber() * (255.0 / maxColor));
-            curPixel.g = (uint8)(ppmInput.readNumber() * (255.0 / maxColor));
-            curPixel.b = (uint8)(ppmInput.readNumber() * (255.0 / maxColor));
-        } else if (ppmType == "P2") {
-            uint8 pixel = (uint8)(ppmInput.readNumber() * (255.0 / maxColor));
-            curPixel.r = pixel;
-            curPixel.g = pixel;
-            curPixel.b = pixel;
-        } else if (ppmType == "P1") {
-            int pixel = (uint8)(ppmInput.readNumber() * maxColor);
-            curPixel.r = pixel;
-            curPixel.g = pixel;
-            curPixel.b = pixel;
-        }
-    }
-}
-
-/** Consumes whitespace up to and including a number, but not the following character */
-static int scanUInt(BinaryInput& input) {
-    char c = input.readUInt8();
-    while (isWhiteSpace(c)) {
-        c = input.readUInt8();
-    }
-
-    std::string s;
-    s += c;
-    c = input.readUInt8();
-    while (!isWhiteSpace(c)) {
-        s += c;
-        c = input.readUInt8();
-    }
-
-    // Back up one to avoid consuming the last character
-    input.setPosition(input.getPosition() - 1);
-
-    int x;
-    sscanf(s.c_str(), "%d", &x);
-    return x;
-}
-
-void GImage::decodePPM(
-    BinaryInput&        input) {
-
-    char head[2];
-    int w, h;
-
-    input.readBytes(head, 2);
-    if (head[0] != 'P' || head[1] != '6') {
-        throw GImage::Error("Invalid PPM Header.", input.getFilename());
-    }
-
-    w = scanUInt(input);
-    h = scanUInt(input);
-
-    // Skip the max color specifier
-    scanUInt(input);
-
-    if ((w < 0) ||
-        (h < 0) ||
-        (w > 100000) ||
-        (h > 100000)) {
-        throw GImage::Error("Invalid PPM size in header.", input.getFilename());
-    }
-
-    // Trailing whitespace
-    input.readUInt8();
-
-    resize(w, h, 3);
-
-    input.readBytes(_byte, width * height * 3);
-}
-
-}
diff --git a/externals/g3dlite/G3D.lib/source/GImage_tga.cpp b/externals/g3dlite/G3D.lib/source/GImage_tga.cpp
deleted file mode 100644
index d84feedecc9..00000000000
--- a/externals/g3dlite/G3D.lib/source/GImage_tga.cpp
+++ /dev/null
@@ -1,179 +0,0 @@
-/**
-  @file GImage_tga.cpp
-  @author Morgan McGuire, morgan@graphics3d.com
-  @created 2002-05-27
-  @edited  2006-05-10
- */
-#include "G3D/platform.h"
-#include "G3D/GImage.h"
-#include "G3D/BinaryInput.h"
-#include "G3D/BinaryOutput.h"
-#include "G3D/Log.h"
-
-namespace G3D {
-
-void GImage::encodeTGA(
-    BinaryOutput&       out) const {
-
-    out.setEndian(G3D_LITTLE_ENDIAN);
-
-    // ID length
-    out.writeUInt8(0);
-
-    // Color map Type
-    out.writeUInt8(0);
-
-    // Type
-    out.writeUInt8(2);
-
-    // Color map
-    out.skip(5);
-
-    // x, y offsets
-    out.writeUInt16(0);
-    out.writeUInt16(0);
-
-    // Width & height
-    out.writeUInt16(width);
-    out.writeUInt16(height);
-
-    // Color depth
-    out.writeUInt8(8 * channels);
-
-    // Image descriptor
-    if (channels == 3) {
-        // 0 alpha bits
-        out.writeUInt8(0);
-    }
-    else {
-        // 8 alpha bits
-        out.writeUInt8(8);
-    }
-
-    // Image ID (zero length)
-
-    if (channels == 3) {
-        // Pixels are upside down in BGR format.
-        for (int y = height - 1; y >= 0; y--) {
-            for (int x = 0; x < width; x++) {
-                uint8* p = &(_byte[3 * (y * width + x)]);
-                out.writeUInt8(p[2]);
-                out.writeUInt8(p[1]);
-                out.writeUInt8(p[0]);
-            }
-        }
-    } else {
-        // Pixels are upside down in BGRA format.
-        for (int y = height - 1; y >= 0; y--) {
-            for (int x = 0; x < width; x++) {
-                uint8* p = &(_byte[4 * (y * width + x)]);
-                out.writeUInt8(p[2]);
-                out.writeUInt8(p[1]);
-                out.writeUInt8(p[0]);
-                out.writeUInt8(p[3]);
-            }
-        }
-    }
-
-    // Write "TRUEVISION-XFILE " 18 bytes from the end 
-    // (with null termination)
-    out.writeString("TRUEVISION-XFILE ");
-}
-
-
-void GImage::decodeTGA(
-    BinaryInput&        input) {
-
-    // This is a simple TGA loader that can handle uncompressed
-    // truecolor TGA files (TGA type 2). 
-    // Verify this is a TGA file by looking for the TRUEVISION tag.
-    int pos = input.getPosition();
-    input.setPosition(input.size() - 18);
-    std::string tag = input.readString(16);
-    if (tag != "TRUEVISION-XFILE") {
-        throw Error("Not a TGA file", input.getFilename());
-    }
-
-    input.setPosition(pos);
-
-    int IDLength     = input.readUInt8();
-    int colorMapType = input.readUInt8();
-    int imageType    = input.readUInt8();
-
-    (void)colorMapType;
-	
-    // 2 is the type supported by this routine.
-    if (imageType != 2) {
-        throw Error("TGA images must be type 2 (Uncompressed truecolor)", input.getFilename());
-    }
-	
-    // Color map specification
-    input.skip(5);
-
-    // Image specification
-
-    // Skip x and y offsets
-    input.skip(4); 
-
-    width = input.readInt16();
-    height = input.readInt16();
-
-    int colorDepth = input.readUInt8();
-
-    if ((colorDepth != 24) && (colorDepth != 32)) {
-        throw Error("TGA files must be 24 or 32 bit.", input.getFilename());
-    }
-
-    if (colorDepth == 32) {
-        channels = 4;
-    } else {
-        channels = 3;
-    }
-
-    // Image descriptor contains overlay data as well
-    // as data indicating where the origin is
-    int imageDescriptor = input.readUInt8();
-    (void)imageDescriptor;
-	
-    // Image ID
-    input.skip(IDLength);
-
-    _byte = (uint8*)System::malloc(width * height * channels);
-    debugAssert(_byte);
-	
-    // Pixel data
-    int x;
-    int y;
-
-    if (channels == 3) {
-        for (y = height - 1; y >= 0; y--) {
-          for (x = 0; x < width; x++) {
-            int b = input.readUInt8();
-            int g = input.readUInt8();
-            int r = input.readUInt8();
-		    
-            int i = (x + y * width) * 3;
-            _byte[i + 0] = r;
-            _byte[i + 1] = g;
-            _byte[i + 2] = b;
-          }
-        }
-    } else {
-        for (y = height - 1; y >= 0; y--) {
-          for (x = 0; x < width; x++) {
-            int b = input.readUInt8();
-            int g = input.readUInt8();
-            int r = input.readUInt8();
-            int a = input.readUInt8();
-		    
-            int i = (x + y * width) * 4;
-            _byte[i + 0] = r;
-            _byte[i + 1] = g;
-            _byte[i + 2] = b;
-            _byte[i + 3] = a;
-          }
-        }
-    }
-}
-
-}
diff --git a/externals/g3dlite/G3D.lib/source/GLight.cpp b/externals/g3dlite/G3D.lib/source/GLight.cpp
deleted file mode 100644
index 8acb066ef54..00000000000
--- a/externals/g3dlite/G3D.lib/source/GLight.cpp
+++ /dev/null
@@ -1,143 +0,0 @@
-/**
-  @file GLight.cpp
-
-  @maintainer Morgan McGuire, matrix@graphics3d.com
-
-  @created 2003-11-12
-  @edited  2007-10-22
-*/
-
-#include "G3D/GLight.h"
-#include "G3D/Sphere.h"
-
-namespace G3D {
-
-GLight::GLight() {
-    position        = Vector4(0, 0, 0, 0);
-    color           = Color3::white();
-    spotDirection   = Vector3(0, 0, -1);
-    spotCutoff      = 180;
-    enabled         = false;
-    attenuation[0]  = 1.0;
-    attenuation[1]  = 0.0;
-    attenuation[2]  = 0.0;
-    specular        = true;
-    diffuse         = true;
-}
-
-
-GLight GLight::directional(const Vector3& toLight, const Color3& color, bool s, bool d) {
-    GLight L;
-    L.position = Vector4(toLight.direction(), 0);
-    L.color    = color;
-    L.specular = s;
-    L.diffuse  = d;
-    return L;
-}
-
-
-GLight GLight::point(const Vector3& pos, const Color3& color, float constAtt, float linAtt, float quadAtt, bool s, bool d) {
-    GLight L;
-    L.position = Vector4(pos, 1);
-    L.color    = color;
-    L.attenuation[0] = constAtt;
-    L.attenuation[1] = linAtt;
-    L.attenuation[2] = quadAtt;
-    L.specular       = s;
-    L.diffuse        = d;
-    return L;
-}
-
-
-GLight GLight::spot(const Vector3& pos, const Vector3& pointDirection, float cutOffAngleDegrees, const Color3& color, float constAtt, float linAtt, float quadAtt, bool s, bool d) {
-    GLight L;
-    L.position       = Vector4(pos, 1.0f);
-    L.spotDirection  = pointDirection.direction();
-    debugAssert(cutOffAngleDegrees <= 90);
-    L.spotCutoff     = cutOffAngleDegrees;
-    L.color          = color;
-    L.attenuation[0] = constAtt;
-    L.attenuation[1] = linAtt;
-    L.attenuation[2] = quadAtt;
-    L.specular       = s;
-    L.diffuse        = d;
-    return L;
-}
-
-
-bool GLight::operator==(const GLight& other) const {
-    return (position == other.position) && 
-        (spotDirection == other.spotDirection) &&
-        (spotCutoff == other.spotCutoff) &&
-        (attenuation[0] == other.attenuation[0]) &&
-        (attenuation[1] == other.attenuation[1]) &&
-        (attenuation[2] == other.attenuation[2]) &&
-        (color == other.color) &&
-        (enabled == other.enabled) &&
-        (specular == other.specular) &&
-        (diffuse == other.diffuse);
-}
-
-bool GLight::operator!=(const GLight& other) const {
-    return !(*this == other);
-}
-
-
-Sphere GLight::effectSphere(float cutoff) const {
-    if (position.w == 0) {
-        // Directional light
-        return Sphere(Vector3::zero(), (float)inf());
-    } else {
-        // Avoid divide by zero
-        cutoff = max(cutoff, 0.0001f);
-        float maxIntensity = max(color.r, max(color.g, color.b));
-
-        float radius = (float)inf();
-            
-        if (attenuation[2] != 0) {
-
-            // Solve I / attenuation.dot(1, r, r^2) < cutoff for r
-            //
-            //  a[0] + a[1] r + a[2] r^2 > I/cutoff
-            //
-            
-            float a = attenuation[2];
-            float b = attenuation[1];
-            float c = attenuation[0] - maxIntensity / cutoff;
-            
-            float discrim = square(b) - 4 * a * c;
-            
-            if (discrim >= 0) {
-                discrim = sqrt(discrim);
-                
-                float r1 = (-b + discrim) / (2 * a);
-                float r2 = (-b - discrim) / (2 * a);
-
-                if (r1 < 0) {
-                    if (r2 > 0) {
-                        radius = r2;
-                    }
-                } else if (r2 > 0) {
-                    radius = min(r1, r2);
-                } else {
-                    radius = r1;
-                }
-            }
-                
-        } else if (attenuation[1] != 0) {
-            
-            // Solve I / attenuation.dot(1, r) < cutoff for r
-            //
-            // r * a[1] + a[0] = I / cutoff
-            // r = (I / cutoff - a[0]) / a[1]
-
-            float radius = (maxIntensity / cutoff - attenuation[0]) / attenuation[1];
-            radius = max(radius, 0.0f);
-        }
-
-        return Sphere(position.xyz(), radius);
-
-    }
-}
-
-}
diff --git a/externals/g3dlite/G3D.lib/source/GThread.cpp b/externals/g3dlite/G3D.lib/source/GThread.cpp
deleted file mode 100644
index 090370436c4..00000000000
--- a/externals/g3dlite/G3D.lib/source/GThread.cpp
+++ /dev/null
@@ -1,203 +0,0 @@
-/**
- @file GThread.cpp
-
- GThread class.
-
- @created 2005-09-24
- @edited  2005-10-22
- */
-
-#include "G3D/GThread.h"
-#include "G3D/System.h"
-#include "G3D/debugAssert.h"
-
-
-namespace G3D {
-
-namespace _internal {
-
-class BasicThread: public GThread {
-public:
-    BasicThread(const std::string& name, void (*proc)(void*), void* param):
-        GThread(name), m_wrapperProc(proc), m_param(param) { }
-protected:
-    virtual void threadMain() {
-        m_wrapperProc(m_param);
-    }
-
-private:
-    void (*m_wrapperProc)(void*);
-
-    void* m_param;
-};
-
-} // namespace _internal
-
-
-GThread::GThread(const std::string& name):
-    m_status(STATUS_CREATED),
-    m_name(name) {
-
-#ifdef G3D_WIN32
-    m_event = NULL;
-#endif
-
-    // system-independent clear of handle
-    System::memset(&m_handle, 0, sizeof(m_handle));
-}
-
-GThread::~GThread() {
-#ifdef _MSC_VER
-#   pragma warning( push )
-#   pragma warning( disable : 4127 )
-#endif
-    alwaysAssertM(m_status != STATUS_RUNNING, "Deleting thread while running.");
-#ifdef _MSC_VER
-#   pragma warning( pop )
-#endif
-
-#ifdef G3D_WIN32
-    if (m_event) {
-        ::CloseHandle(m_event);
-    }
-#endif
-}
-
-GThreadRef GThread::create(const std::string& name, void (*proc)(void*), void* param) {
-    return new _internal::BasicThread(name, proc, param);
-}
-
-
-bool GThread::started() const {
-    return m_status != STATUS_CREATED;
-}
-
-bool GThread::start() {
-    
-    debugAssertM(! started(), "Thread has already executed.");
-    if (started()) {
-        return false;
-    }
-
-    m_status = STATUS_STARTED;
-
-#   ifdef G3D_WIN32
-    DWORD threadId;
-
-    m_event = ::CreateEvent(NULL, TRUE, FALSE, NULL);
-    debugAssert(m_event);
-
-    m_handle = ::CreateThread(NULL, 0, &internalThreadProc, this, 0, &threadId);
-
-    if (m_handle == NULL) {
-        ::CloseHandle(m_event);
-        m_event = NULL;
-    }
-
-    return (m_handle != NULL);
-#   else
-    if (!pthread_create(&m_handle, NULL, &internalThreadProc, this)) {
-        return true;
-    } else {
-        // system-independent clear of handle
-        System::memset(&m_handle, 0, sizeof(m_handle));
-
-        return false;
-    }
-#   endif
-}
-
-void GThread::terminate() {
-    if (m_handle) {
-#       ifdef G3D_WIN32
-        ::TerminateThread(m_handle, 0);
-#       else
-        pthread_kill(m_handle, SIGSTOP);
-#       endif
-        // system-independent clear of handle
-        System::memset(&m_handle, 0, sizeof(m_handle));
-    }
-}
-
-bool GThread::running() const{
-    return (m_status == STATUS_RUNNING);
-}
-
-bool GThread::completed() const {
-    return (m_status == STATUS_COMPLETED);
-}
-
-void GThread::waitForCompletion() {
-#   ifdef G3D_WIN32
-    debugAssert(m_event);
-    ::WaitForSingleObject(m_event, INFINITE);
-#   else
-    debugAssert(m_handle);
-    pthread_join(m_handle, NULL);
-#   endif
-}
-
-#ifdef G3D_WIN32
-DWORD WINAPI GThread::internalThreadProc(LPVOID param) {
-    GThread* current = reinterpret_cast(param);
-    debugAssert(current->m_event);
-    current->m_status = STATUS_RUNNING;
-    current->threadMain();
-    current->m_status = STATUS_COMPLETED;
-    ::SetEvent(current->m_event);
-    return 0;
-}
-#else
-void* GThread::internalThreadProc(void* param) {
-    GThread* current = reinterpret_cast(param);
-    current->m_status = STATUS_RUNNING;
-    current->threadMain();
-    current->m_status = STATUS_COMPLETED;
-    return (void*)NULL;
-}
-#endif
-
-
-
-GMutex::GMutex() {
-#   ifdef G3D_WIN32
-    ::InitializeCriticalSection(&m_handle);
-#   else
-    pthread_mutex_init(&m_handle, NULL);
-#   endif
-}
-
-GMutex::~GMutex() {
-    //TODO: Debug check for locked
-#   ifdef G3D_WIN32
-    ::DeleteCriticalSection(&m_handle);
-#   else
-    pthread_mutex_destroy(&m_handle);
-#   endif
-}
-
-//bool GMutex::tryLock() {
-//#   ifdef G3D_WIN32
-//    return ::TryEnterCriticalSection(&m_handle);
-//#   else
-//    return pthread_mutex_trylock(&m_handle);
-//#   endif
-//}
-
-void GMutex::lock() {
-#   ifdef G3D_WIN32
-    ::EnterCriticalSection(&m_handle);
-#   else
-    pthread_mutex_lock(&m_handle);
-#   endif
-}
-
-void GMutex::unlock() {
-#   ifdef G3D_WIN32
-    ::LeaveCriticalSection(&m_handle);
-#   else
-    pthread_mutex_unlock(&m_handle);
-#   endif
-}
-
-} // namespace G3D
diff --git a/externals/g3dlite/G3D.lib/source/GUniqueID.cpp b/externals/g3dlite/G3D.lib/source/GUniqueID.cpp
deleted file mode 100644
index 25c757b70e4..00000000000
--- a/externals/g3dlite/G3D.lib/source/GUniqueID.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-/**
-  @file GUniqueID.cpp
-  @author Morgan McGuire, morgan@cs.williams.edu
- */
-#include "G3D/GUniqueID.h"
-#include "G3D/BinaryInput.h"
-#include "G3D/TextInput.h"
-#include "G3D/BinaryOutput.h"
-#include "G3D/TextOutput.h"
-#include "G3D/NetworkDevice.h"
-
-namespace G3D {
-
-void GUniqueID::serialize(BinaryOutput& b) const {
-    b.writeUInt64(id);
-}
-
-
-void GUniqueID::deserialize(BinaryInput& b) {
-    id = b.readUInt64();
-}
-
-void GUniqueID::serialize(TextOutput& t) const {
-    t.writeSymbol("(");
-    t.writeNumber((double)(id >> 32));
-    t.writeNumber((double)(id & 0xFFFFFFFF));
-    t.writeSymbol(")");
-}
-
-void GUniqueID::deserialize(TextInput& t) {
-    t.readSymbol("(");
-    id = (((uint64)t.readNumber()) << 32) + (uint64)t.readNumber();
-    t.readSymbol(")");
-}
-
-
-GUniqueID GUniqueID::create(uint16 tag) {
-    static uint64 counter = 0;
-    static uint64 systemID = 0;
-    
-    if (systemID == 0) {
-        // Create a unique ID for this machine/program instance
-        
-        // TODO: see ioctl(skfd, SIOCGIFHWADDR, &if_hwaddr)
-        Array addr;
-        NetworkDevice::instance()->localHostAddresses(addr);
-        if (addr.size() > 0) {
-            systemID |= addr[0].ip();
-        }
-        
-        union {
-            float64 ft;
-            uint64 ut;
-        };
-        ft = System::time();
-        systemID = ut << 22;
-        systemID ^= ((uint64)iRandom(0, 32768)) << 8;
-        
-        systemID &= ~((uint64)1023 << 54);
-
-        // Ensure that the systemID is non-zero (vanishingly small probability)
-        if (systemID == 0) {
-            systemID = 1;
-        }
-    }
-    
-    // No need for modulo; we'll all be dead before this counter
-    // overflows 54 bits
-    ++counter;
-    
-    GUniqueID i;
-    
-    i.id = (((uint64)(tag & 1023)) << 54) | (counter ^ systemID);
-    
-    return i;
-}
-
-} // G3D 
diff --git a/externals/g3dlite/G3D.lib/source/Image1.cpp b/externals/g3dlite/G3D.lib/source/Image1.cpp
deleted file mode 100644
index 30841d01c6b..00000000000
--- a/externals/g3dlite/G3D.lib/source/Image1.cpp
+++ /dev/null
@@ -1,224 +0,0 @@
-/**
-  @file Image1.cpp
-
-  @maintainer Morgan McGuire, matrix@graphics3d.com
-
-  @created 2007-01-31
-  @edited  2007-01-31
-*/
-
-
-#include "G3D/Image1.h"
-#include "G3D/Image1uint8.h"
-#include "G3D/GImage.h"
-#include "G3D/Color4.h"
-#include "G3D/Color4uint8.h"
-#include "G3D/Color1.h"
-#include "G3D/Color1uint8.h"
-#include "G3D/ImageFormat.h"
-
-namespace G3D {
-
-Image1::Image1(int w, int h, WrapMode wrap) : Map2D(w, h, wrap) {
-    setAll(Color1(0.0f));
-}
-
-
-Image1::Ref Image1::fromGImage(const GImage& im, WrapMode wrap) {
-    switch (im.channels) {
-    case 1:
-        return fromArray(im.pixel1(), im.width, im.height, wrap);
-
-    case 3:
-        return fromArray(im.pixel3(), im.width, im.height, wrap);
-
-    case 4:
-        return fromArray(im.pixel4(), im.width, im.height, wrap);
-
-    default:
-        debugAssertM(false, "Input GImage must have 1, 3, or 4 channels.");
-        return NULL;
-    }
-}
-
-
-Image1::Ref Image1::fromImage1uint8(const ReferenceCountedPointer& im) {
-    Ref out = createEmpty(static_cast(im->wrapMode()));
-    out->resize(im->width(), im->height());
-
-    int N = im->width() * im->height();
-    const Color1uint8* src = reinterpret_cast(im->getCArray());
-    for (int i = 0; i < N; ++i) {
-        out->data[i] = Color1(src[i]);
-    }
-
-    return out;
-}
-
-
-Image1::Ref Image1::createEmpty(int width, int height, WrapMode wrap) {
-    return new Type(width, height, wrap);
-}
-
-
-Image1::Ref Image1::createEmpty(WrapMode wrap) {
-    return createEmpty(0, 0, wrap);
-}
-
-
-Image1::Ref Image1::fromFile(const std::string& filename, WrapMode wrap, GImage::Format fmt) {
-    Ref out = createEmpty(wrap);
-    out->load(filename);
-    return out;
-}
-
-
-void Image1::load(const std::string& filename, GImage::Format fmt) {
-    copyGImage(GImage(filename, fmt));
-    setChanged(true);
-}
-
-
-Image1::Ref Image1::fromArray(const class Color3uint8* ptr, int w, int h, WrapMode wrap) {
-    Ref out = createEmpty(wrap);
-    out->copyArray(ptr, w, h);
-    return out;
-}
-
-
-Image1::Ref Image1::fromArray(const class Color1* ptr, int w, int h, WrapMode wrap) {
-    Ref out = createEmpty(wrap);
-    out->copyArray(ptr, w, h);
-    return out;
-}
-
-
-Image1::Ref Image1::fromArray(const class Color1uint8* ptr, int w, int h, WrapMode wrap) {
-    Ref out = createEmpty(wrap);
-    out->copyArray(ptr, w, h);
-    return out;
-}
-
-
-Image1::Ref Image1::fromArray(const class Color3* ptr, int w, int h, WrapMode wrap) {
-    Ref out = createEmpty(wrap);
-    out->copyArray(ptr, w, h);
-    return out;
-}
-
-
-Image1::Ref Image1::fromArray(const class Color4uint8* ptr, int w, int h, WrapMode wrap) {
-    Ref out = createEmpty(wrap);
-    out->copyArray(ptr, w, h);
-    return out;
-}
-
-
-Image1::Ref Image1::fromArray(const class Color4* ptr, int w, int h, WrapMode wrap) {
-    Ref out = createEmpty(wrap);
-    out->copyArray(ptr, w, h);
-    return out;
-}
-
-void Image1::copyGImage(const GImage& im) {
-    switch (im.channels) {
-    case 1:
-        copyArray(im.pixel1(), im.width, im.height);
-        break;
-
-    case 3:
-        copyArray(im.pixel3(), im.width, im.height);
-        break;
-
-    case 4:
-        copyArray(im.pixel4(), im.width, im.height);
-        break;
-    } 
-}
-
-
-void Image1::copyArray(const Color3uint8* src, int w, int h) {
-    resize(w, h);
-
-    int N = w * h;
-    Color1* dst = data.getCArray();
-    // Convert int8 -> float
-    for (int i = 0; i < N; ++i) {
-        dst[i] = Color1(Color3(src[i]).average());
-    }
-}
-
-
-void Image1::copyArray(const Color4uint8* src, int w, int h) {
-    resize(w, h);
-
-    int N = w * h;
-    Color1* dst = data.getCArray();
-    
-    // Strip alpha and convert
-    for (int i = 0; i < N; ++i) {
-        dst[i] = Color1(Color3(src[i].rgb()).average());
-    }
-}
-
-
-void Image1::copyArray(const Color1* src, int w, int h) {
-    resize(w, h);
-    System::memcpy(getCArray(), src, w * h * sizeof(Color1));
-}
-
-
-void Image1::copyArray(const Color4* src, int w, int h) {
-    resize(w, h);
-
-    int N = w * h;
-    Color1* dst = data.getCArray();
-    
-    // Strip alpha
-    for (int i = 0; i < N; ++i) {
-        dst[i] = Color1(src[i].rgb().average());
-    }
-}
-
-
-void Image1::copyArray(const Color1uint8* src, int w, int h) {
-    resize(w, h);
-    int N = w * h;
-
-    Color1* dst = getCArray();
-    for (int i = 0; i < N; ++i) {
-        dst[i]= Color1(src[i]);
-    }
-}
-
-
-void Image1::copyArray(const Color3* src, int w, int h) {
-    resize(w, h);
-    int N = w * h;
-
-    Color1* dst = getCArray();
-    for (int i = 0; i < N; ++i) {
-        dst[i] = Color1(src[i].average());
-    }
-}
-
-
-/** Saves in any of the formats supported by G3D::GImage. */
-void Image1::save(const std::string& filename, GImage::Format fmt) {
-    GImage im(width(), height(), 1);
-
-    int N = im.width * im.height;
-    Color1uint8* dst = im.pixel1();
-    for (int i = 0; i < N; ++i) {
-        dst[i] = Color1uint8(data[i]);
-    }
-    
-    im.save(filename, fmt);
-}
-
-
-const ImageFormat* Image1::format() const {
-    return ImageFormat::L32F();
-}
-
-} // G3D
diff --git a/externals/g3dlite/G3D.lib/source/Image1uint8.cpp b/externals/g3dlite/G3D.lib/source/Image1uint8.cpp
deleted file mode 100644
index c43e7194d7d..00000000000
--- a/externals/g3dlite/G3D.lib/source/Image1uint8.cpp
+++ /dev/null
@@ -1,212 +0,0 @@
-/**
-  @file Image1uint8.cpp
-
-  @maintainer Morgan McGuire, matrix@graphics3d.com
-
-  @created 2007-01-31
-  @edited  2008-01-13
-*/
-
-#include "G3D/Image1uint8.h"
-#include "G3D/Image3uint8.h"
-#include "G3D/Image1.h"
-#include "G3D/GImage.h"
-#include "G3D/Color1.h"
-#include "G3D/Color1uint8.h"
-#include "G3D/Color4.h"
-#include "G3D/Color4uint8.h"
-#include "G3D/ImageFormat.h"
-
-namespace G3D {
-
-Image1uint8::Image1uint8(int w, int h, WrapMode wrap) : Map2D(w, h, wrap) {
-    setAll(Color1uint8(0));
-}
-
-
-Image1uint8::Ref Image1uint8::fromImage3uint8(const ReferenceCountedPointer& im) {
-    return fromArray(im->getCArray(), im->width(), im->height(), im->wrapMode());
-}
-
-
-Image1uint8::Ref Image1uint8::fromGImage(const GImage& im, WrapMode wrap) {
-    switch (im.channels) {
-    case 1:
-        return fromArray(im.pixel1(), im.width, im.height, wrap);
-
-    case 3:
-        return fromArray(im.pixel3(), im.width, im.height, wrap);
-
-    case 4:
-        return fromArray(im.pixel4(), im.width, im.height, wrap);
-
-    default:
-        debugAssertM(false, "Input GImage must have 1, 3, or 4 channels.");
-        return NULL;
-    }
-}
-
-
-Image1uint8::Ref Image1uint8::fromImage1(const ReferenceCountedPointer& im) {
-    Ref out = createEmpty(static_cast(im->wrapMode()));
-    out->copyArray(im->getCArray(), im->width(), im->height());
-
-    return out;
-}
-
-
-Image1uint8::Ref Image1uint8::createEmpty(int width, int height, WrapMode wrap) {
-    return new Type(width, height, wrap);
-}
-
-
-Image1uint8::Ref Image1uint8::createEmpty(WrapMode wrap) {
-    return createEmpty(0, 0, wrap);
-}
-
-
-Image1uint8::Ref Image1uint8::fromFile(const std::string& filename, WrapMode wrap, GImage::Format fmt) {
-    Ref out = createEmpty(wrap);
-    out->load(filename);
-    return out;
-}
-
-
-Image1uint8::Ref Image1uint8::fromArray(const class Color3uint8* ptr, int w, int h, WrapMode wrap) {
-    Ref out = createEmpty(wrap);
-    out->copyArray(ptr, w, h);
-    return out;
-}
-
-
-Image1uint8::Ref Image1uint8::fromArray(const class Color1* ptr, int w, int h, WrapMode wrap) {
-    Ref out = createEmpty(wrap);
-    out->copyArray(ptr, w, h);
-    return out;
-}
-
-
-Image1uint8::Ref Image1uint8::fromArray(const class Color1uint8* ptr, int w, int h, WrapMode wrap) {
-    Ref out = createEmpty(wrap);
-    out->copyArray(ptr, w, h);
-    return out;
-}
-
-
-Image1uint8::Ref Image1uint8::fromArray(const class Color3* ptr, int w, int h, WrapMode wrap) {
-    Ref out = createEmpty(wrap);
-    out->copyArray(ptr, w, h);
-    return out;
-}
-
-
-Image1uint8::Ref Image1uint8::fromArray(const class Color4uint8* ptr, int w, int h, WrapMode wrap) {
-    Ref out = createEmpty(wrap);
-    out->copyArray(ptr, w, h);
-    return out;
-}
-
-
-Image1uint8::Ref Image1uint8::fromArray(const class Color4* ptr, int w, int h, WrapMode wrap) {
-    Ref out = createEmpty(wrap);
-    out->copyArray(ptr, w, h);
-    return out;
-}
-
-
-void Image1uint8::load(const std::string& filename, GImage::Format fmt) {
-    copyGImage(GImage(filename, fmt));
-    setChanged(true);
-}
-
-
-void Image1uint8::copyGImage(const GImage& im) {
-    switch (im.channels) {
-    case 1:
-        copyArray(im.pixel1(), im.width, im.height);
-        break;
-
-    case 3:
-        copyArray(im.pixel3(), im.width, im.height);
-        break;
-
-    case 4:
-        copyArray(im.pixel4(), im.width, im.height);
-        break;
-    } 
-}
-
-
-void Image1uint8::copyArray(const Color3uint8* src, int w, int h) {
-    resize(w, h);
-    int N = w * h;
-
-    Color1uint8* dst = getCArray();
-    for (int i = 0; i < N; ++i) {
-        dst[i].value = (src[i].r + src[i].g + src[i].b) / 3;
-    }
-}
-
-void Image1uint8::copyArray(const Color3* src, int w, int h) {
-    resize(w, h);
-    int N = w * h;
-
-    Color1uint8* dst = getCArray();
-    for (int i = 0; i < N; ++i) {
-        dst[i] = Color1uint8(Color1(src[i].average()));
-    }
-}
-
-
-void Image1uint8::copyArray(const Color1uint8* ptr, int w, int h) {
-    resize(w, h);
-    System::memcpy(getCArray(), ptr, w * h);
-}
-
-
-void Image1uint8::copyArray(const Color1* src, int w, int h) {
-    resize(w, h);
-    int N = w * h;
-
-    Color1uint8* dst = getCArray();
-    for (int i = 0; i < N; ++i) {
-        dst[i] = Color1uint8(src[i]);
-    }
-}
-
-
-void Image1uint8::copyArray(const Color4uint8* ptr, int w, int h) {
-    resize(w, h);
-    int N = w * h;
-
-    Color1uint8* dst = getCArray();
-    for (int i = 0; i < N; ++i) {
-        dst[i].value = (ptr[i].r + ptr[i].g + ptr[i].b) / 3;
-    }
-}
-
-
-void Image1uint8::copyArray(const Color4* src, int w, int h) {
-    resize(w, h);
-    int N = w * h;
-
-    Color1uint8* dst = getCArray();
-    for (int i = 0; i < N; ++i) {
-        dst[i] = Color1uint8(Color1(src[i].rgb().average()));
-    }
-}
-
-
-/** Saves in any of the formats supported by G3D::GImage. */
-void Image1uint8::save(const std::string& filename, GImage::Format fmt) {
-    GImage im(width(), height(), 1);
-    System::memcpy(im.byte(), getCArray(), width() * height());
-    im.save(filename, fmt);
-}
-
-
-const ImageFormat* Image1uint8::format() const {
-    return ImageFormat::L8();
-}
-
-} // G3D
diff --git a/externals/g3dlite/G3D.lib/source/Image3.cpp b/externals/g3dlite/G3D.lib/source/Image3.cpp
deleted file mode 100644
index aa2ac6098dc..00000000000
--- a/externals/g3dlite/G3D.lib/source/Image3.cpp
+++ /dev/null
@@ -1,224 +0,0 @@
-/**
-  @file Image3.cpp
-
-  @maintainer Morgan McGuire, matrix@graphics3d.com
-
-  @created 2007-01-31
-  @edited  2007-01-31
-*/
-
-
-#include "G3D/Image3.h"
-#include "G3D/Image3uint8.h"
-#include "G3D/GImage.h"
-#include "G3D/Color4.h"
-#include "G3D/Color4uint8.h"
-#include "G3D/Color1.h"
-#include "G3D/Color1uint8.h"
-#include "G3D/ImageFormat.h"
-
-namespace G3D {
-
-Image3::Image3(int w, int h, WrapMode wrap) : Map2D(w, h, wrap) {
-    setAll(Color3::black());
-}
-
-
-Image3::Ref Image3::fromGImage(const GImage& im, WrapMode wrap) {
-    switch (im.channels) {
-    case 1:
-        return fromArray(im.pixel1(), im.width, im.height, wrap);
-
-    case 3:
-        return fromArray(im.pixel3(), im.width, im.height, wrap);
-
-    case 4:
-        return fromArray(im.pixel4(), im.width, im.height, wrap);
-
-    default:
-        debugAssertM(false, "Input GImage must have 1, 3, or 4 channels.");
-        return NULL;
-    }
-}
-
-
-Image3::Ref Image3::fromImage3uint8(const ReferenceCountedPointer& im) {
-    Ref out = createEmpty(im->wrapMode());
-    out->resize(im->width(), im->height());
-
-    int N = im->width() * im->height();
-    const Color3uint8* src = reinterpret_cast(im->getCArray());
-    for (int i = 0; i < N; ++i) {
-        out->data[i] = Color3(src[i]);
-    }
-
-    return out;
-}
-
-
-Image3::Ref Image3::createEmpty(int width, int height, WrapMode wrap) {
-    return new Image3(width, height, wrap);
-}
-
-
-Image3::Ref Image3::createEmpty(WrapMode wrap) {
-    return createEmpty(0, 0, wrap);
-}
-
-
-Image3::Ref Image3::fromFile(const std::string& filename, WrapMode wrap, GImage::Format fmt) {
-    Ref out = createEmpty(wrap);
-    out->load(filename);
-    return out;
-}
-
-
-void Image3::load(const std::string& filename, GImage::Format fmt) {
-    copyGImage(GImage(filename, fmt));
-    setChanged(true);
-}
-
-
-Image3::Ref Image3::fromArray(const class Color3uint8* ptr, int w, int h, WrapMode wrap) {
-    Ref out = createEmpty(wrap);
-    out->copyArray(ptr, w, h);
-    return out;
-}
-
-
-Image3::Ref Image3::fromArray(const class Color1* ptr, int w, int h, WrapMode wrap) {
-    Ref out = createEmpty(wrap);
-    out->copyArray(ptr, w, h);
-    return out;
-}
-
-
-Image3::Ref Image3::fromArray(const class Color1uint8* ptr, int w, int h, WrapMode wrap) {
-    Ref out = createEmpty(wrap);
-    out->copyArray(ptr, w, h);
-    return out;
-}
-
-
-Image3::Ref Image3::fromArray(const class Color3* ptr, int w, int h, WrapMode wrap) {
-    Ref out = createEmpty(wrap);
-    out->copyArray(ptr, w, h);
-    return out;
-}
-
-
-Image3::Ref Image3::fromArray(const class Color4uint8* ptr, int w, int h, WrapMode wrap) {
-    Ref out = createEmpty(wrap);
-    out->copyArray(ptr, w, h);
-    return out;
-}
-
-
-Image3::Ref Image3::fromArray(const class Color4* ptr, int w, int h, WrapMode wrap) {
-    Ref out = createEmpty(wrap);
-    out->copyArray(ptr, w, h);
-    return out;
-}
-
-void Image3::copyGImage(const GImage& im) {
-    switch (im.channels) {
-    case 1:
-        copyArray(im.pixel1(), im.width, im.height);
-        break;
-
-    case 3:
-        copyArray(im.pixel3(), im.width, im.height);
-        break;
-
-    case 4:
-        copyArray(im.pixel4(), im.width, im.height);
-        break;
-    } 
-}
-
-
-void Image3::copyArray(const Color3uint8* src, int w, int h) {
-    resize(w, h);
-
-    int N = w * h;
-    Color3* dst = data.getCArray();
-    // Convert int8 -> float
-    for (int i = 0; i < N; ++i) {
-        dst[i] = Color3(src[i]);
-    }
-}
-
-
-void Image3::copyArray(const Color4uint8* src, int w, int h) {
-    resize(w, h);
-
-    int N = w * h;
-    Color3* dst = data.getCArray();
-    
-    // Strip alpha and convert
-    for (int i = 0; i < N; ++i) {
-        dst[i] = Color3(src[i].rgb());
-    }
-}
-
-
-void Image3::copyArray(const Color3* src, int w, int h) {
-    resize(w, h);
-    System::memcpy(getCArray(), src, w * h * sizeof(Color3));
-}
-
-
-void Image3::copyArray(const Color4* src, int w, int h) {
-    resize(w, h);
-
-    int N = w * h;
-    Color3* dst = data.getCArray();
-    
-    // Strip alpha
-    for (int i = 0; i < N; ++i) {
-        dst[i] = src[i].rgb();
-    }
-}
-
-
-void Image3::copyArray(const Color1uint8* src, int w, int h) {
-    resize(w, h);
-    int N = w * h;
-
-    Color3* dst = getCArray();
-    for (int i = 0; i < N; ++i) {
-        dst[i].r = dst[i].g = dst[i].b = Color1(src[i]).value;
-    }
-}
-
-
-void Image3::copyArray(const Color1* src, int w, int h) {
-    resize(w, h);
-    int N = w * h;
-
-    Color3* dst = getCArray();
-    for (int i = 0; i < N; ++i) {
-        dst[i].r = dst[i].g = dst[i].b = src[i].value;
-    }
-}
-
-
-/** Saves in any of the formats supported by G3D::GImage. */
-void Image3::save(const std::string& filename, GImage::Format fmt) {
-    GImage im(width(), height(), 3);
-
-    int N = im.width * im.height;
-    Color3uint8* dst = im.pixel3();
-    for (int i = 0; i < N; ++i) {
-        dst[i] = Color3uint8(data[i]);
-    }
-    
-    im.save(filename, fmt);
-}
-
-
-const ImageFormat* Image3::format() const {
-    return ImageFormat::RGB32F();
-}
-
-} // G3D
diff --git a/externals/g3dlite/G3D.lib/source/Image3uint8.cpp b/externals/g3dlite/G3D.lib/source/Image3uint8.cpp
deleted file mode 100644
index 2de32b6009e..00000000000
--- a/externals/g3dlite/G3D.lib/source/Image3uint8.cpp
+++ /dev/null
@@ -1,225 +0,0 @@
-/**
-  @file Image3uint8.cpp
-
-  @maintainer Morgan McGuire, matrix@graphics3d.com
-
-  @created 2007-01-31
-  @edited  2008-01-08
-*/
-
-#include "G3D/Image1uint8.h"
-#include "G3D/Image3uint8.h"
-#include "G3D/Image3.h"
-#include "G3D/GImage.h"
-#include "G3D/Color1.h"
-#include "G3D/Color1uint8.h"
-#include "G3D/Color4.h"
-#include "G3D/Color4uint8.h"
-#include "G3D/ImageFormat.h"
-
-namespace G3D {
-
-Image3uint8::Ref Image3uint8::fromImage1uint8(const ReferenceCountedPointer& im) {
-    return fromArray(im->getCArray(), im->width(), im->height(), im->wrapMode());
-}
-
-
-Image3uint8::Image3uint8(int w, int h, WrapMode wrap) : Map2D(w, h, wrap) {
-    setAll(Color3::black());
-}
-
-
-Image3uint8::Ref Image3uint8::fromGImage(const GImage& im, WrapMode wrap) {
-    switch (im.channels) {
-    case 1:
-        return fromArray(im.pixel1(), im.width, im.height, wrap);
-
-    case 3:
-        return fromArray(im.pixel3(), im.width, im.height, wrap);
-
-    case 4:
-        return fromArray(im.pixel4(), im.width, im.height, wrap);
-
-    default:
-        debugAssertM(false, "Input GImage must have 1, 3, or 4 channels.");
-        return NULL;
-    }
-}
-
-
-Image3uint8::Ref Image3uint8::fromImage3(const ReferenceCountedPointer& im) {
-    Ref out = createEmpty(static_cast(im->wrapMode()));
-    out->copyArray(im->getCArray(), im->width(), im->height());
-
-    return out;
-}
-
-
-Image3uint8::Ref Image3uint8::createEmpty(int width, int height, WrapMode wrap) {
-    return new Type(width, height, wrap);
-}
-
-
-Image3uint8::Ref Image3uint8::createEmpty(WrapMode wrap) {
-    return createEmpty(0, 0, wrap);
-}
-
-
-Image3uint8::Ref Image3uint8::fromFile(const std::string& filename, WrapMode wrap, GImage::Format fmt) {
-    Ref out = createEmpty(wrap);
-    out->load(filename);
-    return out;
-}
-
-
-Image3uint8::Ref Image3uint8::fromArray(const class Color3uint8* ptr, int w, int h, WrapMode wrap) {
-    Ref out = createEmpty(wrap);
-    out->copyArray(ptr, w, h);
-    return out;
-}
-
-
-Image3uint8::Ref Image3uint8::fromArray(const class Color1* ptr, int w, int h, WrapMode wrap) {
-    Ref out = createEmpty(wrap);
-    out->copyArray(ptr, w, h);
-    return out;
-}
-
-
-Image3uint8::Ref Image3uint8::fromArray(const class Color1uint8* ptr, int w, int h, WrapMode wrap) {
-    Ref out = createEmpty(wrap);
-    out->copyArray(ptr, w, h);
-    return out;
-}
-
-
-Image3uint8::Ref Image3uint8::fromArray(const class Color3* ptr, int w, int h, WrapMode wrap) {
-    Ref out = createEmpty(wrap);
-    out->copyArray(ptr, w, h);
-    return out;
-}
-
-
-Image3uint8::Ref Image3uint8::fromArray(const class Color4uint8* ptr, int w, int h, WrapMode wrap) {
-    Ref out = createEmpty(wrap);
-    out->copyArray(ptr, w, h);
-    return out;
-}
-
-
-Image3uint8::Ref Image3uint8::fromArray(const class Color4* ptr, int w, int h, WrapMode wrap) {
-    Ref out = createEmpty(wrap);
-    out->copyArray(ptr, w, h);
-    return out;
-}
-
-
-void Image3uint8::load(const std::string& filename, GImage::Format fmt) {
-    copyGImage(GImage(filename, fmt));
-    setChanged(true);
-}
-
-
-void Image3uint8::copyGImage(const GImage& im) {
-    switch (im.channels) {
-    case 1:
-        copyArray(im.pixel1(), im.width, im.height);
-        break;
-
-    case 3:
-        copyArray(im.pixel3(), im.width, im.height);
-        break;
-
-    case 4:
-        copyArray(im.pixel4(), im.width, im.height);
-        break;
-    } 
-}
-
-
-void Image3uint8::copyArray(const Color1uint8* src, int w, int h) {
-    resize(w, h);
-    int N = w * h;
-
-    Color3uint8* dst = getCArray();
-    for (int i = 0; i < N; ++i) {
-        dst[i].r = dst[i].g = dst[i].b = src[i].value;
-    }
-}
-
-void Image3uint8::copyArray(const Color1* src, int w, int h) {
-    resize(w, h);
-    int N = w * h;
-
-    Color3uint8* dst = getCArray();
-    for (int i = 0; i < N; ++i) {
-        dst[i].r = dst[i].g = dst[i].b = Color1uint8(src[i]).value;
-    }
-}
-
-
-void Image3uint8::copyArray(const Color3uint8* ptr, int w, int h) {
-    resize(w, h);
-    System::memcpy(getCArray(), ptr, w * h * 3);
-}
-
-
-void Image3uint8::copyArray(const Color3* src, int w, int h) {
-    resize(w, h);
-    int N = w * h;
-
-    Color3uint8* dst = getCArray();
-    for (int i = 0; i < N; ++i) {
-        dst[i] = Color3uint8(src[i]);
-    }
-}
-
-
-void Image3uint8::copyArray(const Color4uint8* ptr, int w, int h) {
-    resize(w, h);
-    
-    // Copy 3/4 bytes
-    GImage::RGBAtoRGB((const uint8*)ptr, (uint8*)getCArray(), w * h);
-}
-
-
-void Image3uint8::copyArray(const Color4* src, int w, int h) {
-    resize(w, h);
-    int N = w * h;
-
-    Color3uint8* dst = getCArray();
-    for (int i = 0; i < N; ++i) {
-        dst[i] = Color3uint8(src[i].rgb());
-    }
-}
-
-
-/** Saves in any of the formats supported by G3D::GImage. */
-void Image3uint8::save(const std::string& filename, GImage::Format fmt) {
-    GImage im(width(), height(), 3);
-    System::memcpy(im.byte(), getCArray(), width() * height() * 3);
-    im.save(filename, fmt);
-}
-
-
-ReferenceCountedPointer Image3uint8::getChannel(int c) const {
-    debugAssert(c >= 0 && c <= 2);
-
-    Image1uint8Ref dst = Image1uint8::createEmpty(width(), height(), wrapMode());
-    const Color3uint8* srcArray = getCArray();
-    Color1uint8* dstArray = dst->getCArray();
-
-    const int N = width() * height();
-    for (int i = 0; i < N; ++i) {
-        dstArray[i] = Color1uint8(srcArray[i][c]);
-    }
-
-    return dst;
-}
-
-
-const ImageFormat* Image3uint8::format() const {
-    return ImageFormat::RGB8();
-}
-
-} // G3D
diff --git a/externals/g3dlite/G3D.lib/source/Image4.cpp b/externals/g3dlite/G3D.lib/source/Image4.cpp
deleted file mode 100644
index 84a1cd650b6..00000000000
--- a/externals/g3dlite/G3D.lib/source/Image4.cpp
+++ /dev/null
@@ -1,226 +0,0 @@
-/**
-  @file Image4.cpp
-
-  @maintainer Morgan McGuire, matrix@graphics3d.com
-
-  @created 2007-01-31
-  @edited  2008-07-27
-*/
-
-
-#include "G3D/Image4.h"
-#include "G3D/Image4uint8.h"
-#include "G3D/GImage.h"
-#include "G3D/Color3.h"
-#include "G3D/Color3uint8.h"
-#include "G3D/Color1.h"
-#include "G3D/Color1uint8.h"
-#include "G3D/ImageFormat.h"
-
-namespace G3D {
-
-Image4::Image4(int w, int h, WrapMode wrap) : Map2D(w, h, wrap) {
-    setAll(Color4::zero());
-}
-
-
-Image4::Ref Image4::fromGImage(const GImage& im, WrapMode wrap) {
-    switch (im.channels) {
-    case 1:
-        return fromArray(im.pixel1(), im.width, im.height, wrap);
-
-    case 3:
-        return fromArray(im.pixel3(), im.width, im.height, wrap);
-
-    case 4:
-        return fromArray(im.pixel4(), im.width, im.height, wrap);
-
-    default:
-        debugAssertM(false, "Input GImage must have 1, 3, or 4 channels.");
-        return NULL;
-    }
-}
-
-
-Image4::Ref Image4::fromImage4uint8(const ReferenceCountedPointer& im) {
-    Ref out = createEmpty(static_cast(im->wrapMode()));
-    out->resize(im->width(), im->height());
-
-    int N = im->width() * im->height();
-    const Color4uint8* src = reinterpret_cast(im->getCArray());
-    for (int i = 0; i < N; ++i) {
-        out->data[i] = Color4(src[i]);
-    }
-
-    return out;
-}
-
-
-Image4::Ref Image4::createEmpty(int width, int height, WrapMode wrap) {
-    return new Type(width, height, WrapMode::ERROR);
-}
-
-
-Image4::Ref Image4::createEmpty(WrapMode wrap) {
-    return createEmpty(0, 0, wrap);
-}
-
-
-Image4::Ref Image4::fromFile(const std::string& filename, WrapMode wrap, GImage::Format fmt) {
-    Ref out = createEmpty(wrap);
-    out->load(filename);
-    return out;
-}
-
-
-void Image4::load(const std::string& filename, GImage::Format fmt) {
-    copyGImage(GImage(filename, fmt));
-    setChanged(true);
-}
-
-
-Image4::Ref Image4::fromArray(const class Color3uint8* ptr, int w, int h, WrapMode wrap) {
-    Ref out = createEmpty(wrap);
-    out->copyArray(ptr, w, h);
-    return out;
-}
-
-
-Image4::Ref Image4::fromArray(const class Color1* ptr, int w, int h, WrapMode wrap) {
-    Ref out = createEmpty(wrap);
-    out->copyArray(ptr, w, h);
-    return out;
-}
-
-
-Image4::Ref Image4::fromArray(const class Color1uint8* ptr, int w, int h, WrapMode wrap) {
-    Ref out = createEmpty(wrap);
-    out->copyArray(ptr, w, h);
-    return out;
-}
-
-
-Image4::Ref Image4::fromArray(const class Color3* ptr, int w, int h, WrapMode wrap) {
-    Ref out = createEmpty(wrap);
-    out->copyArray(ptr, w, h);
-    return out;
-}
-
-
-Image4::Ref Image4::fromArray(const class Color4uint8* ptr, int w, int h, WrapMode wrap) {
-    Ref out = createEmpty(wrap);
-    out->copyArray(ptr, w, h);
-    return out;
-}
-
-
-Image4::Ref Image4::fromArray(const class Color4* ptr, int w, int h, WrapMode wrap) {
-    Ref out = createEmpty(wrap);
-    out->copyArray(ptr, w, h);
-    return out;
-}
-
-
-void Image4::copyGImage(const GImage& im) {
-    switch (im.channels) {
-    case 1:
-        copyArray(im.pixel1(), im.width, im.height);
-        break;
-
-    case 3:
-        copyArray(im.pixel3(), im.width, im.height);
-        break;
-
-    case 4:
-        copyArray(im.pixel4(), im.width, im.height);
-        break;
-    } 
-}
-
-
-void Image4::copyArray(const Color4uint8* src, int w, int h) {
-    resize(w, h);
-
-    int N = w * h;
-    Color4* dst = data.getCArray();
-    // Convert int8 -> float
-    for (int i = 0; i < N; ++i) {
-        dst[i] = Color4(src[i]);
-    }
-}
-
-
-void Image4::copyArray(const Color3uint8* src, int w, int h) {
-    resize(w, h);
-
-    int N = w * h;
-    Color4* dst = data.getCArray();
-    
-    // Add alpha and convert
-    for (int i = 0; i < N; ++i) {
-        dst[i] = Color4(Color3(src[i]), 1.0f);
-    }
-}
-
-
-void Image4::copyArray(const Color4* src, int w, int h) {
-    resize(w, h);
-    System::memcpy(getCArray(), src, w * h * sizeof(Color4));
-}
-
-
-void Image4::copyArray(const Color3* src, int w, int h) {
-    resize(w, h);
-
-    int N = w * h;
-    Color4* dst = data.getCArray();
-    
-    // Add alpha
-    for (int i = 0; i < N; ++i) {
-        dst[i] = Color4(src[i], 1.0f);
-    }
-}
-
-
-void Image4::copyArray(const Color1uint8* src, int w, int h) {
-    resize(w, h);
-    int N = w * h;
-
-    Color4* dst = getCArray();
-    for (int i = 0; i < N; ++i) {
-        dst[i].r = dst[i].g = dst[i].b = Color1(src[i]).value;
-        dst[i].a = 1.0f;
-    }
-}
-
-
-void Image4::copyArray(const Color1* src, int w, int h) {
-    resize(w, h);
-    int N = w * h;
-
-    Color4* dst = getCArray();
-    for (int i = 0; i < N; ++i) {
-        dst[i].r = dst[i].g = dst[i].b = src[i].value;
-        dst[i].a = 1.0f;
-    }
-}
-
-
-/** Saves in any of the formats supported by G3D::GImage. */
-void Image4::save(const std::string& filename, GImage::Format fmt) {
-    GImage im(width(), height(), 4);
-
-    int N = im.width * im.height;
-    Color4uint8* dst = im.pixel4();
-    for (int i = 0; i < N; ++i) {
-        dst[i] = Color4uint8(data[i]);
-    }
-    
-    im.save(filename, fmt);
-}
-
-const ImageFormat* Image4::format() const {
-    return ImageFormat::RGBA32F();
-}
-
-} // G3D
diff --git a/externals/g3dlite/G3D.lib/source/Image4uint8.cpp b/externals/g3dlite/G3D.lib/source/Image4uint8.cpp
deleted file mode 100644
index dee1cba14ba..00000000000
--- a/externals/g3dlite/G3D.lib/source/Image4uint8.cpp
+++ /dev/null
@@ -1,222 +0,0 @@
-/**
-  @file Image4uint8.cpp
-
-  @maintainer Morgan McGuire, matrix@graphics3d.com
-
-  @created 2007-01-31
-  @edited  2008-07-31
-*/
-
-#include "G3D/Image4uint8.h"
-#include "G3D/Image4.h"
-#include "G3D/Image3uint8.h"
-#include "G3D/Image3.h"
-#include "G3D/GImage.h"
-#include "G3D/Color1.h"
-#include "G3D/Color1uint8.h"
-#include "G3D/Color4.h"
-#include "G3D/Color4uint8.h"
-#include "G3D/ImageFormat.h"
-
-namespace G3D {
-
-Image4uint8::Image4uint8(int w, int h, WrapMode wrap) : Map2D(w, h, wrap) {
-    setAll(Color4::zero());
-}
-
-
-Image4uint8::Ref Image4uint8::fromGImage(const GImage& im, WrapMode wrap) {
-    switch (im.channels) {
-    case 1:
-        return fromArray(im.pixel1(), im.width, im.height, wrap);
-
-    case 3:
-        return fromArray(im.pixel3(), im.width, im.height, wrap);
-
-    case 4:
-        return fromArray(im.pixel4(), im.width, im.height, wrap);
-
-    default:
-        debugAssertM(false, "Input GImage must have 1, 3, or 4 channels.");
-        return NULL;
-    }
-}
-
-
-Image4uint8::Ref Image4uint8::fromImage4(const ReferenceCountedPointer& im) {
-    Ref out = createEmpty(static_cast(im->wrapMode()));
-    out->copyArray(im->getCArray(), im->width(), im->height());
-
-    return out;
-}
-
-
-Image4uint8::Ref Image4uint8::createEmpty(int width, int height, WrapMode wrap) {
-    return new Type(width, height, wrap);
-}
-
-
-Image4uint8::Ref Image4uint8::createEmpty(WrapMode wrap) {
-    return createEmpty(0, 0, wrap);
-}
-
-
-Image4uint8::Ref Image4uint8::fromFile(const std::string& filename, WrapMode wrap, GImage::Format fmt) {
-    Ref out = createEmpty(wrap);
-    out->load(filename);
-    return out;
-}
-
-
-Image4uint8::Ref Image4uint8::fromArray(const class Color3uint8* ptr, int w, int h, WrapMode wrap) {
-    Ref out = createEmpty(wrap);
-    out->copyArray(ptr, w, h);
-    return out;
-}
-
-
-Image4uint8::Ref Image4uint8::fromArray(const class Color1* ptr, int w, int h, WrapMode wrap) {
-    Ref out = createEmpty(wrap);
-    out->copyArray(ptr, w, h);
-    return out;
-}
-
-
-Image4uint8::Ref Image4uint8::fromArray(const class Color1uint8* ptr, int w, int h, WrapMode wrap) {
-    Ref out = createEmpty(wrap);
-    out->copyArray(ptr, w, h);
-    return out;
-}
-
-
-Image4uint8::Ref Image4uint8::fromArray(const class Color3* ptr, int w, int h, WrapMode wrap) {
-    Ref out = createEmpty(wrap);
-    out->copyArray(ptr, w, h);
-    return out;
-}
-
-
-Image4uint8::Ref Image4uint8::fromArray(const class Color4uint8* ptr, int w, int h, WrapMode wrap) {
-    Ref out = createEmpty(wrap);
-    out->copyArray(ptr, w, h);
-    return out;
-}
-
-
-Image4uint8::Ref Image4uint8::fromArray(const class Color4* ptr, int w, int h, WrapMode wrap) {
-    Ref out = createEmpty(wrap);
-    out->copyArray(ptr, w, h);
-    return out;
-}
-
-
-void Image4uint8::load(const std::string& filename, GImage::Format fmt) {
-    copyGImage(GImage(filename, fmt));
-    setChanged(true);
-}
-
-
-void Image4uint8::copyGImage(const GImage& im) {
-    switch (im.channels) {
-    case 1:
-        copyArray(im.pixel1(), im.width, im.height);
-        break;
-
-    case 3:
-        copyArray(im.pixel3(), im.width, im.height);
-        break;
-
-    case 4:
-        copyArray(im.pixel4(), im.width, im.height);
-        break;
-    } 
-}
-
-
-void Image4uint8::copyArray(const Color1uint8* src, int w, int h) {
-    resize(w, h);
-    int N = w * h;
-
-    Color4uint8* dst = getCArray();
-    for (int i = 0; i < N; ++i) {
-        dst[i].r = dst[i].g = dst[i].b = src[i].value;
-        dst[i].a = 255;
-    }
-}
-
-void Image4uint8::copyArray(const Color1* src, int w, int h) {
-    resize(w, h);
-    int N = w * h;
-
-    Color4uint8* dst = getCArray();
-    for (int i = 0; i < N; ++i) {
-        dst[i].r = dst[i].g = dst[i].b = Color1uint8(src[i]).value;
-        dst[i].a = 255;
-    }
-}
-
-
-void Image4uint8::copyArray(const Color4uint8* ptr, int w, int h) {
-    resize(w, h);
-    System::memcpy(getCArray(), ptr, w * h * 4);
-}
-
-
-void Image4uint8::copyArray(const Color4* src, int w, int h) {
-    resize(w, h);
-    int N = w * h;
-
-    Color4uint8* dst = getCArray();
-    for (int i = 0; i < N; ++i) {
-        dst[i] = Color4uint8(src[i]);
-    }
-}
-
-
-void Image4uint8::copyArray(const Color3uint8* ptr, int w, int h) {
-    resize(w, h);
-    
-    GImage::RGBtoRGBA((const uint8*)ptr, (uint8*)getCArray(), w * h);
-}
-
-
-void Image4uint8::copyArray(const Color3* src, int w, int h) {
-    resize(w, h);
-    int N = w * h;
-
-    Color4uint8* dst = getCArray();
-    for (int i = 0; i < N; ++i) {
-        dst[i] = Color4uint8(Color4(src[i], 1.0f));
-    }
-}
-
-
-/** Saves in any of the formats supported by G3D::GImage. */
-void Image4uint8::save(const std::string& filename, GImage::Format fmt) {
-    GImage im(width(), height(), 4);
-    System::memcpy(im.byte(), getCArray(), width() * height() * 4);
-    im.save(filename, fmt);
-}
-
-
-ReferenceCountedPointer Image4uint8::getChannel(int c) const {
-    debugAssert(c >= 0 && c <= 3);
-
-    Image1uint8Ref dst = Image1uint8::createEmpty(width(), height(), wrapMode());
-    const Color4uint8* srcArray = getCArray();
-    Color1uint8* dstArray = dst->getCArray();
-
-    const int N = width() * height();
-    for (int i = 0; i < N; ++i) {
-        dstArray[i] = Color1uint8(srcArray[i][c]);
-    }
-
-    return dst;
-}
-
-
-const ImageFormat* Image4uint8::format() const {
-    return ImageFormat::RGBA8();
-}
-
-} // G3D
diff --git a/externals/g3dlite/G3D.lib/source/ImageFormat.cpp b/externals/g3dlite/G3D.lib/source/ImageFormat.cpp
deleted file mode 100644
index 3cbf6ad711e..00000000000
--- a/externals/g3dlite/G3D.lib/source/ImageFormat.cpp
+++ /dev/null
@@ -1,440 +0,0 @@
-/**
- @file ImageFormat.cpp
- 
- @maintainer Morgan McGuire, morgan@graphics3d.com
- 
- @created 2003-05-23
- @edited  2006-01-11
- */
-
-#include "../../GLG3D.lib/include/GLG3D/glheaders.h"
-#include "../../GLG3D.lib/include/GLG3D/glcalls.h"
-#include "G3D/ImageFormat.h"
-
-namespace G3D {
-
-ImageFormat::ImageFormat(
-    int             _numComponents,
-    bool            _compressed,
-    int             _glFormat,
-    int             _glBaseFormat,
-    int             _luminanceBits,
-    int             _alphaBits,
-    int             _redBits,
-    int             _greenBits,
-    int             _blueBits,
-    int             _depthBits,
-    int             _stencilBits,
-    int             _hardwareBitsPerTexel,
-    int             _packedBitsPerTexel,
-    int             glDataFormat,
-    bool            _opaque,
-    bool            _floatingPoint,
-    Code            _code,
-    ColorSpace      _colorSpace,
-    BayerPattern    _bayerPattern) : 
-
-    numComponents(_numComponents),
-    compressed(_compressed),
-    code(_code),
-    colorSpace(_colorSpace),
-    bayerPattern(_bayerPattern),
-    openGLFormat(_glFormat),
-    openGLBaseFormat(_glBaseFormat),
-    luminanceBits(_luminanceBits),
-    alphaBits(_alphaBits),
-    redBits(_redBits),
-    greenBits(_greenBits),
-    blueBits(_blueBits),
-    stencilBits(_stencilBits),
-    depthBits(_depthBits),
-    cpuBitsPerPixel(_packedBitsPerTexel),
-    packedBitsPerTexel(_packedBitsPerTexel),
-    openGLBitsPerPixel(_hardwareBitsPerTexel),
-    hardwareBitsPerTexel(_hardwareBitsPerTexel),
-    openGLDataFormat(glDataFormat),
-    opaque(_opaque),
-    floatingPoint(_floatingPoint) {
-
-	debugAssert(_packedBitsPerTexel <= _hardwareBitsPerTexel);
-}
-
-const ImageFormat* ImageFormat::depth(int depthBits) {
-
-    switch (depthBits) {
-    case 16:
-        return DEPTH16();
-
-    case 24:
-        return DEPTH24();
-
-    case 32:
-        return DEPTH32();
-
-    default:
-        debugAssertM(false, "Depth must be 16, 24, or 32.");
-        return DEPTH32();
-    }
-}
-
-
-const ImageFormat* ImageFormat::stencil(int bits) {
-    switch (bits) {
-    case 1:
-        return STENCIL1();
-
-    case 4:
-        return STENCIL4();
-
-    case 8:
-        return STENCIL8();
-
-    case 16:
-        return STENCIL16();
-
-    default:
-        debugAssertM(false, "Stencil must be 1, 4, 8 or 16.");
-        return STENCIL16();
-    }
-}
-
-
-std::string ImageFormat::name() const {
-    
-    static const std::string nameArray[] = 
-    {
-        "L8", 
-        "L16",
-        "L16F",
-        "L32F",
-
-        "A8",
-        "A16",
-        "A16F",
-        "A32F",
-
-        "LA4",
-        "LA8",
-        "LA16",
-        "LA16F",
-        "LA32F",
-
-        "RGB5",
-        "RGB5A1",
-        "RGB8",
-        "RGB10",
-        "RGB10A2",
-        "RGB16",
-        "RGB16F",
-        "RGB32F",
-
-        "ARGB8",
-        "BGR8",
-
-        "RGBA8",
-        "RGBA16",
-        "RGBA16F",
-        "RGBA32F",
-
-        "BAYER_RGGB8",
-        "BAYER_GRBG8",
-        "BAYER_GBRG8",
-        "BAYER_BGGR8",
-        "BAYER_RGGB32F",
-        "BAYER_GRBG32F",
-        "BAYER_GBRG32F",
-        "BAYER_BGGR32F",
-
-        "HSV8",
-        "HSV32F",
-
-        "YUV420_PLANAR",
-        "YUV422",
-        "YUV444",
-
-        "RGB_DXT1",
-        "RGBA_DXT1",
-        "RGBA_DXT3",
-        "RGBA_DXT5",
-
-        "DEPTH16",
-        "DEPTH24",
-        "DEPTH32",
-        "DEPTH32F",
-        
-        "STENCIL1",
-        "STENCIL4",
-        "STENCIL8",
-        "STENCIL16",
-
-        "DEPTH24_STENCIL8"
-    };
-
-    debugAssert(code < CODE_NUM);
-    return nameArray[code];
-}
-
-
-const ImageFormat* ImageFormat::fromCode(ImageFormat::Code code) {
-    switch (code) {
-    case ImageFormat::CODE_L8:
-        return ImageFormat::L8();
-        break;
-    case ImageFormat::CODE_L16:
-        return ImageFormat::L16();
-        break;
-    case ImageFormat::CODE_L16F:
-        return ImageFormat::L16F();
-        break;
-    case ImageFormat::CODE_L32F:
-        return ImageFormat::L32F();
-        break;
-
-    case ImageFormat::CODE_A8:
-        return ImageFormat::A8();
-        break;
-    case ImageFormat::CODE_A16:
-        return ImageFormat::A16();
-        break;
-    case ImageFormat::CODE_A16F:
-        return ImageFormat::A16F();
-        break;
-    case ImageFormat::CODE_A32F:
-        return ImageFormat::A32F();
-        break;
-
-    case ImageFormat::CODE_LA4:
-        return ImageFormat::LA4();
-        break;
-    case ImageFormat::CODE_LA8:
-        return ImageFormat::LA8();
-        break;
-    case ImageFormat::CODE_LA16:
-        return ImageFormat::LA16();
-        break;
-    case ImageFormat::CODE_LA16F:
-        return ImageFormat::LA16F();
-        break;
-    case ImageFormat::CODE_LA32F:
-        return ImageFormat::LA32F();
-        break;
-
-    case ImageFormat::CODE_RGB5:
-        return ImageFormat::RGB5();
-        break;
-    case ImageFormat::CODE_RGB5A1:
-        return ImageFormat::RGB5A1();
-        break;
-    case ImageFormat::CODE_RGB8:
-        return ImageFormat::RGB8();
-        break;
-    case ImageFormat::CODE_RGB10:
-        return ImageFormat::RGB10();
-        break;
-    case ImageFormat::CODE_RGB10A2:
-        return ImageFormat::RGB10A2();
-        break;
-    case ImageFormat::CODE_RGB16:
-        return ImageFormat::RGB16();
-        break;
-    case ImageFormat::CODE_RGB16F:
-        return ImageFormat::RGB16F();
-        break;
-    case ImageFormat::CODE_RGB32F:
-        return ImageFormat::RGB32F();
-        break;
-
-    case ImageFormat::CODE_ARGB8:
-        return NULL;
-
-    case ImageFormat::CODE_BGR8:
-        return NULL;
-
-    case ImageFormat::CODE_RGBA8:
-        return ImageFormat::RGBA8();
-        break;
-    case ImageFormat::CODE_RGBA16:
-        return ImageFormat::RGBA16();
-        break;
-    case ImageFormat::CODE_RGBA16F:
-        return ImageFormat::RGBA16F();
-        break;
-    case ImageFormat::CODE_RGBA32F:
-        return ImageFormat::RGBA32F();
-        break;
-
-    case ImageFormat::CODE_BAYER_RGGB8:
-    case ImageFormat::CODE_BAYER_GRBG8:
-    case ImageFormat::CODE_BAYER_GBRG8:
-    case ImageFormat::CODE_BAYER_BGGR8:
-    case ImageFormat::CODE_BAYER_RGGB32F:
-    case ImageFormat::CODE_BAYER_GRBG32F:
-    case ImageFormat::CODE_BAYER_GBRG32F:
-    case ImageFormat::CODE_BAYER_BGGR32F:
-
-    case ImageFormat::CODE_HSV8:
-    case ImageFormat::CODE_HSV32F:
-
-    case ImageFormat::CODE_RGB_DXT1:
-        return ImageFormat::RGB_DXT1();
-        break;
-    case ImageFormat::CODE_RGBA_DXT1:
-        return ImageFormat::RGBA_DXT1();
-        break;
-    case ImageFormat::CODE_RGBA_DXT3:
-        return ImageFormat::RGBA_DXT3();
-        break;
-    case ImageFormat::CODE_RGBA_DXT5:
-        return ImageFormat::RGBA_DXT5();
-        break;
-
-    case ImageFormat::CODE_DEPTH16:
-        return ImageFormat::DEPTH16();
-        break;
-    case ImageFormat::CODE_DEPTH24:
-        return ImageFormat::DEPTH24();
-        break;
-    case ImageFormat::CODE_DEPTH32:
-        return ImageFormat::DEPTH32();
-        break;
-    case ImageFormat::CODE_DEPTH32F:
-        return ImageFormat::DEPTH32F();
-        break;
-
-    case ImageFormat::CODE_STENCIL1:
-        return ImageFormat::STENCIL1();
-        break;
-    case ImageFormat::CODE_STENCIL4:
-        return ImageFormat::STENCIL4();
-        break;
-    case ImageFormat::CODE_STENCIL8:
-        return ImageFormat::STENCIL8();
-        break;
-    case ImageFormat::CODE_STENCIL16:
-        return ImageFormat::STENCIL16();
-        break;
-
-    case ImageFormat::CODE_DEPTH24_STENCIL8:
-        return ImageFormat::DEPTH24_STENCIL8();
-        break;
-
-    case ImageFormat::CODE_YUV420_PLANAR:
-        return ImageFormat::YUV420_PLANAR();
-        break;
-
-    case ImageFormat::CODE_YUV422:
-        return ImageFormat::YUV422();
-        break;
-
-    case ImageFormat::CODE_YUV444:
-        return ImageFormat::YUV444();
-        break;
-
-    default:
-        return NULL;
-    }
-}
-
-// Helper variables for defining texture formats
-
-// Is floating point format
-static const bool FLOAT_FORMAT  = true;
-static const bool INT_FORMAT    = false;
-
-// Is opaque format (no alpha)
-static const bool OPAQUE_FORMAT = true;
-static const bool CLEAR_FORMAT  = false;
-
-// Is compressed format (not raw component data)
-static const bool COMP_FORMAT   = true;
-static const bool UNCOMP_FORMAT = false;
-
-#define DEFINE_TEXTUREFORMAT_METHOD(name, cmpnts, cmprssd, glf, glbf, lb, rb, gb, bb, db, sb, hbpt, pbpt, gldf, opq, fp, code, cs, bp)                    \
-    const ImageFormat* ImageFormat::name() {                                                                                                  \
-    static const ImageFormat format(cmpnts, cmprssd, glf, glbf, lb, rb, gb, bb, db, sb, hbpt, pbpt, gldf, opq, fp, code, cs, bp);  \
-    return &format; }
-
-DEFINE_TEXTUREFORMAT_METHOD(L8,         1, UNCOMP_FORMAT,   GL_LUMINANCE8,      GL_LUMINANCE,   8, 0, 0, 0, 0, 0, 0, 8, 8,  GL_UNSIGNED_BYTE, OPAQUE_FORMAT, INT_FORMAT, CODE_L8, COLOR_SPACE_NONE);
-
-DEFINE_TEXTUREFORMAT_METHOD(L16,        1, UNCOMP_FORMAT,   GL_LUMINANCE16,     GL_LUMINANCE,  16, 0, 0, 0, 0, 0, 0, 16, 16,GL_UNSIGNED_SHORT, OPAQUE_FORMAT, INT_FORMAT, CODE_L16, COLOR_SPACE_NONE);
-
-DEFINE_TEXTUREFORMAT_METHOD(L16F,       1, UNCOMP_FORMAT,   GL_LUMINANCE16F_ARB,GL_LUMINANCE, 16, 0, 0, 0, 0, 0, 0, 16, 16, GL_FLOAT, OPAQUE_FORMAT, FLOAT_FORMAT, CODE_L16F, COLOR_SPACE_NONE);
-
-DEFINE_TEXTUREFORMAT_METHOD(L32F,       1, UNCOMP_FORMAT,   GL_LUMINANCE32F_ARB,GL_LUMINANCE, 32, 0, 0, 0, 0, 0, 0, 32, 32, GL_FLOAT, OPAQUE_FORMAT, FLOAT_FORMAT, CODE_L32F, COLOR_SPACE_NONE);
-
-DEFINE_TEXTUREFORMAT_METHOD(A8,         1, UNCOMP_FORMAT,   GL_ALPHA8,          GL_ALPHA,   0, 8, 0, 0, 0, 0, 0, 8, 8,      GL_UNSIGNED_BYTE, CLEAR_FORMAT, INT_FORMAT, CODE_A8, COLOR_SPACE_NONE);
-
-DEFINE_TEXTUREFORMAT_METHOD(A16,        1, UNCOMP_FORMAT,   GL_ALPHA16,         GL_ALPHA,   0, 16, 0, 0, 0, 0, 0, 16, 16,   GL_UNSIGNED_SHORT, CLEAR_FORMAT, INT_FORMAT, CODE_A16, COLOR_SPACE_NONE);
-
-DEFINE_TEXTUREFORMAT_METHOD(A16F,       1, UNCOMP_FORMAT,   GL_ALPHA16F_ARB,    GL_ALPHA,   0, 16, 0, 0, 0, 0, 0, 16, 16,   GL_FLOAT, CLEAR_FORMAT, FLOAT_FORMAT, CODE_A16F, COLOR_SPACE_NONE);
-
-DEFINE_TEXTUREFORMAT_METHOD(A32F,       1, UNCOMP_FORMAT,   GL_ALPHA32F_ARB,    GL_ALPHA,   0, 32, 0, 0, 0, 0, 0, 32, 32,   GL_FLOAT, CLEAR_FORMAT, FLOAT_FORMAT, CODE_A32F, COLOR_SPACE_NONE);
-
-DEFINE_TEXTUREFORMAT_METHOD(LA4,        2, UNCOMP_FORMAT,   GL_LUMINANCE4_ALPHA4,       GL_LUMINANCE_ALPHA, 4, 4, 0, 0, 0, 0, 0, 8, 8,              GL_UNSIGNED_BYTE, CLEAR_FORMAT, INT_FORMAT, CODE_LA4, COLOR_SPACE_NONE);
-
-DEFINE_TEXTUREFORMAT_METHOD(LA8,        2, UNCOMP_FORMAT,   GL_LUMINANCE8_ALPHA8,       GL_LUMINANCE_ALPHA, 8, 8, 0, 0, 0, 0, 0, 16, 16,            GL_UNSIGNED_BYTE, CLEAR_FORMAT, INT_FORMAT, CODE_LA8, COLOR_SPACE_NONE);
-
-DEFINE_TEXTUREFORMAT_METHOD(LA16,       2, UNCOMP_FORMAT,   GL_LUMINANCE16_ALPHA16,     GL_LUMINANCE_ALPHA, 16, 16, 0, 0, 0, 0, 0, 16*2, 16*2,      GL_UNSIGNED_SHORT, CLEAR_FORMAT, INT_FORMAT, CODE_LA16, COLOR_SPACE_NONE);
-
-DEFINE_TEXTUREFORMAT_METHOD(LA16F,      2, UNCOMP_FORMAT,   GL_LUMINANCE_ALPHA16F_ARB,  GL_LUMINANCE_ALPHA, 16, 16, 0, 0, 0, 0, 0, 16*2, 16*2,      GL_FLOAT, CLEAR_FORMAT, FLOAT_FORMAT, ImageFormat::CODE_LA16F, ImageFormat::COLOR_SPACE_NONE);
-
-DEFINE_TEXTUREFORMAT_METHOD(LA32F,      2, UNCOMP_FORMAT,   GL_LUMINANCE_ALPHA32F_ARB,  GL_LUMINANCE_ALPHA, 32, 32,  0,  0,  0,  0,  0, 32*2, 32*2, GL_FLOAT, CLEAR_FORMAT, FLOAT_FORMAT, ImageFormat::CODE_LA32F, ImageFormat::COLOR_SPACE_NONE);
-
-DEFINE_TEXTUREFORMAT_METHOD(BGR8,       3, UNCOMP_FORMAT,   GL_RGB8,            GL_BGR,     0,  0,  8,  8,  8,  0,  0, 32, 24,      GL_UNSIGNED_BYTE, OPAQUE_FORMAT, INT_FORMAT, ImageFormat::CODE_BGR8, ImageFormat::COLOR_SPACE_RGB);
-
-DEFINE_TEXTUREFORMAT_METHOD(RGB5,       3, UNCOMP_FORMAT,   GL_RGB5,            GL_RGBA,    0,  0,  5,  5,  5,  0,  0, 16, 16,      GL_UNSIGNED_BYTE, OPAQUE_FORMAT, INT_FORMAT, ImageFormat::CODE_RGB5, ImageFormat::COLOR_SPACE_RGB);
-
-DEFINE_TEXTUREFORMAT_METHOD(RGB5A1,     4, UNCOMP_FORMAT,   GL_RGB5_A1,         GL_RGBA,    0,  1,  5,  5,  5,  0,  0, 16, 16,      GL_UNSIGNED_BYTE, OPAQUE_FORMAT, INT_FORMAT, ImageFormat::CODE_RGB5A1, ImageFormat::COLOR_SPACE_RGB);
-
-DEFINE_TEXTUREFORMAT_METHOD(RGB8,       3, UNCOMP_FORMAT,   GL_RGB8,            GL_RGB,     0,  0,  8,  8,  8,  0,  0, 32, 24,      GL_UNSIGNED_BYTE, OPAQUE_FORMAT, INT_FORMAT, ImageFormat::CODE_RGB8, ImageFormat::COLOR_SPACE_RGB);
-
-DEFINE_TEXTUREFORMAT_METHOD(RGB10,      3, UNCOMP_FORMAT,   GL_RGB10,                           GL_RGB,     0,  0, 10, 10, 10,  0,  0, 32, 10*3,    GL_UNSIGNED_SHORT, OPAQUE_FORMAT, INT_FORMAT, ImageFormat::CODE_RGB10, ImageFormat::COLOR_SPACE_RGB);
-
-DEFINE_TEXTUREFORMAT_METHOD(RGB10A2,    4, UNCOMP_FORMAT,   GL_RGB10_A2,                        GL_RGBA,    0,  2, 10, 10, 10,  0,  0, 32, 32,      GL_UNSIGNED_INT_10_10_10_2, OPAQUE_FORMAT, INT_FORMAT, ImageFormat::CODE_RGB10A2, ImageFormat::COLOR_SPACE_RGB);
-
-DEFINE_TEXTUREFORMAT_METHOD(RGB16,      3, UNCOMP_FORMAT,   GL_RGB16,                           GL_RGB,     0,  0, 16, 16, 16,  0,  0, 16*3, 16*3,  GL_UNSIGNED_SHORT, OPAQUE_FORMAT, INT_FORMAT, ImageFormat::CODE_RGB16, ImageFormat::COLOR_SPACE_RGB);
-
-DEFINE_TEXTUREFORMAT_METHOD(RGB16F,     3, UNCOMP_FORMAT,   GL_RGB16F_ARB,                      GL_RGB,     0,  0, 16, 16, 16,  0,  0, 16*3, 16*3,  GL_FLOAT, OPAQUE_FORMAT, FLOAT_FORMAT, ImageFormat::CODE_RGB16F, ImageFormat::COLOR_SPACE_RGB);
-
-DEFINE_TEXTUREFORMAT_METHOD(RGB32F,     3, UNCOMP_FORMAT,   GL_RGB32F_ARB,                      GL_RGB,     0,  0, 32, 32, 32,  0,  0, 32*3, 32*3,  GL_FLOAT, OPAQUE_FORMAT, FLOAT_FORMAT, ImageFormat::CODE_RGB32F, ImageFormat::COLOR_SPACE_RGB);
-
-DEFINE_TEXTUREFORMAT_METHOD(RGBA8,      4, UNCOMP_FORMAT,   GL_RGBA8,                           GL_RGBA,    0,  8,  8,  8,  8,  0,  0, 32, 32,      GL_UNSIGNED_BYTE, CLEAR_FORMAT, INT_FORMAT, ImageFormat::CODE_RGBA8, ImageFormat::COLOR_SPACE_RGB);
-
-DEFINE_TEXTUREFORMAT_METHOD(RGBA16,     4, UNCOMP_FORMAT,   GL_RGBA16,                          GL_RGBA,    0, 16, 16, 16, 16, 0, 0, 16*4, 16*4,    GL_UNSIGNED_SHORT, CLEAR_FORMAT, INT_FORMAT, ImageFormat::CODE_RGBA16, ImageFormat::COLOR_SPACE_RGB);
-
-DEFINE_TEXTUREFORMAT_METHOD(RGBA16F,    4, UNCOMP_FORMAT,   GL_RGBA16F_ARB,                     GL_RGBA,    0, 16, 16, 16, 16, 0, 0, 16*4, 16*4,    GL_FLOAT, CLEAR_FORMAT, FLOAT_FORMAT, ImageFormat::CODE_RGB16F, ImageFormat::COLOR_SPACE_RGB);
-
-DEFINE_TEXTUREFORMAT_METHOD(RGBA32F,    4, UNCOMP_FORMAT,   GL_RGBA32F_ARB,                     GL_RGBA,    0, 32, 32, 32, 32, 0, 0, 32*4, 32*4,    GL_FLOAT, CLEAR_FORMAT, FLOAT_FORMAT, ImageFormat::CODE_RGBA32F, ImageFormat::COLOR_SPACE_RGB);
-
-DEFINE_TEXTUREFORMAT_METHOD(RGB_DXT1,   3, COMP_FORMAT,     GL_COMPRESSED_RGB_S3TC_DXT1_EXT,    GL_RGB,     0, 0, 0, 0, 0, 0, 0, 64, 64,    GL_UNSIGNED_BYTE, OPAQUE_FORMAT, INT_FORMAT, ImageFormat::CODE_RGB_DXT1, ImageFormat::COLOR_SPACE_RGB);
-
-DEFINE_TEXTUREFORMAT_METHOD(RGBA_DXT1,  4, COMP_FORMAT,     GL_COMPRESSED_RGBA_S3TC_DXT1_EXT,   GL_RGBA,    0, 0, 0, 0, 0, 0, 0, 64, 64,    GL_UNSIGNED_BYTE, CLEAR_FORMAT, INT_FORMAT, ImageFormat::CODE_RGBA_DXT1, ImageFormat::COLOR_SPACE_RGB);
-
-DEFINE_TEXTUREFORMAT_METHOD(RGBA_DXT3,  4, COMP_FORMAT,     GL_COMPRESSED_RGBA_S3TC_DXT3_EXT,   GL_RGBA,    0, 0, 0, 0, 0, 0, 0, 128, 128,  GL_UNSIGNED_BYTE, CLEAR_FORMAT, INT_FORMAT, ImageFormat::CODE_RGBA_DXT3, ImageFormat::COLOR_SPACE_RGB);
-
-DEFINE_TEXTUREFORMAT_METHOD(RGBA_DXT5,  4, COMP_FORMAT,     GL_COMPRESSED_RGBA_S3TC_DXT5_EXT,   GL_RGBA,    0, 0, 0, 0, 0, 0, 0, 128, 128,  GL_UNSIGNED_BYTE, CLEAR_FORMAT, INT_FORMAT, ImageFormat::CODE_RGBA_DXT5, ImageFormat::COLOR_SPACE_RGB);
-
-DEFINE_TEXTUREFORMAT_METHOD(DEPTH16,    1, UNCOMP_FORMAT,   GL_DEPTH_COMPONENT16_ARB,           GL_DEPTH_COMPONENT, 0, 0, 0, 0, 0, 0, 16, 16, 16,   GL_UNSIGNED_SHORT, CLEAR_FORMAT, INT_FORMAT, ImageFormat::CODE_DEPTH16, ImageFormat::COLOR_SPACE_NONE);
-
-DEFINE_TEXTUREFORMAT_METHOD(DEPTH24,    1, UNCOMP_FORMAT,   GL_DEPTH_COMPONENT24_ARB,           GL_DEPTH_COMPONENT, 0, 0, 0, 0, 0, 0, 24, 32, 24,   GL_UNSIGNED_INT, CLEAR_FORMAT, INT_FORMAT, ImageFormat::CODE_DEPTH24, ImageFormat::COLOR_SPACE_NONE);
-
-DEFINE_TEXTUREFORMAT_METHOD(DEPTH32,    1, UNCOMP_FORMAT,   GL_DEPTH_COMPONENT32_ARB,           GL_DEPTH_COMPONENT, 0, 0, 0, 0, 0, 0, 32, 32, 32,   GL_UNSIGNED_INT, CLEAR_FORMAT, INT_FORMAT, ImageFormat::CODE_DEPTH32, ImageFormat::COLOR_SPACE_NONE);
-
-DEFINE_TEXTUREFORMAT_METHOD(DEPTH32F,   1, UNCOMP_FORMAT,   GL_DEPTH_COMPONENT32_ARB,           GL_DEPTH_COMPONENT, 0, 0, 0, 0, 0, 0, 32, 32, 32,   GL_FLOAT, CLEAR_FORMAT, FLOAT_FORMAT, ImageFormat::CODE_DEPTH32F, ImageFormat::COLOR_SPACE_NONE);
-
-// These formats are for use with Renderbuffers only!
-DEFINE_TEXTUREFORMAT_METHOD(STENCIL1,   1, UNCOMP_FORMAT,   GL_STENCIL_INDEX1_EXT,              GL_STENCIL_INDEX_EXT,  0, 0, 0, 0, 0, 0, 1, 1, 1,      GL_UNSIGNED_BYTE, CLEAR_FORMAT, INT_FORMAT, ImageFormat::CODE_STENCIL1, ImageFormat::COLOR_SPACE_NONE);
-
-DEFINE_TEXTUREFORMAT_METHOD(STENCIL4,   1, UNCOMP_FORMAT,   GL_STENCIL_INDEX4_EXT,              GL_STENCIL_INDEX_EXT,  0, 0, 0, 0, 0, 0, 4, 4, 4,      GL_UNSIGNED_BYTE, CLEAR_FORMAT, INT_FORMAT, ImageFormat::CODE_STENCIL4, ImageFormat::COLOR_SPACE_NONE);
-
-DEFINE_TEXTUREFORMAT_METHOD(STENCIL8,   1, UNCOMP_FORMAT,   GL_STENCIL_INDEX8_EXT,              GL_STENCIL_INDEX_EXT,  0, 0, 0, 0, 0, 0, 8, 8, 8,      GL_UNSIGNED_BYTE, CLEAR_FORMAT, INT_FORMAT, ImageFormat::CODE_STENCIL8, ImageFormat::COLOR_SPACE_NONE);
-
-DEFINE_TEXTUREFORMAT_METHOD(STENCIL16,  1, UNCOMP_FORMAT,   GL_STENCIL_INDEX16_EXT,             GL_STENCIL_INDEX_EXT, 0, 0, 0, 0, 0, 0, 16, 16, 16,   GL_UNSIGNED_SHORT, CLEAR_FORMAT, INT_FORMAT, ImageFormat::CODE_STENCIL16, ImageFormat::COLOR_SPACE_NONE);
-
-DEFINE_TEXTUREFORMAT_METHOD(DEPTH24_STENCIL8,   2, UNCOMP_FORMAT,   GL_DEPTH24_STENCIL8_EXT,    GL_DEPTH_STENCIL_EXT,0, 0, 0, 0, 0, 24, 8, 32, 32,  GL_UNSIGNED_INT, CLEAR_FORMAT, INT_FORMAT, ImageFormat::CODE_DEPTH24_STENCIL8, ImageFormat::COLOR_SPACE_NONE);
-
-DEFINE_TEXTUREFORMAT_METHOD(YUV420_PLANAR,  3, UNCOMP_FORMAT,   GL_NONE,    GL_NONE, 0, 0, 0, 0, 0, 0, 0, 12, 12,  GL_UNSIGNED_BYTE, OPAQUE_FORMAT, INT_FORMAT, ImageFormat::CODE_YUV420_PLANAR, ImageFormat::COLOR_SPACE_YUV);
-DEFINE_TEXTUREFORMAT_METHOD(YUV422,         3, UNCOMP_FORMAT,   GL_NONE,    GL_NONE, 0, 0, 0, 0, 0, 0, 0, 16, 16,  GL_UNSIGNED_BYTE, OPAQUE_FORMAT, INT_FORMAT, ImageFormat::CODE_YUV422, ImageFormat::COLOR_SPACE_YUV);
-DEFINE_TEXTUREFORMAT_METHOD(YUV444,         3, UNCOMP_FORMAT,   GL_NONE,    GL_NONE, 0, 0, 0, 0, 0, 0, 0, 24, 24,  GL_UNSIGNED_BYTE, OPAQUE_FORMAT, INT_FORMAT, ImageFormat::CODE_YUV444, ImageFormat::COLOR_SPACE_YUV);
-
-}
diff --git a/externals/g3dlite/G3D.lib/source/ImageFormat_convert.cpp b/externals/g3dlite/G3D.lib/source/ImageFormat_convert.cpp
deleted file mode 100644
index 9cbc4edcb39..00000000000
--- a/externals/g3dlite/G3D.lib/source/ImageFormat_convert.cpp
+++ /dev/null
@@ -1,1305 +0,0 @@
-#include "G3D/ImageFormat.h"
-#include "G3D/Color1uint8.h"
-#include "G3D/Color3uint8.h"
-#include "G3D/Color4uint8.h"
-#include "G3D/Color1.h"
-#include "G3D/Color3.h"
-#include "G3D/Color4.h"
-
-
-namespace G3D {
-
-// this is the signature for all conversion routines (same parameters as ImageFormat::convert)
-typedef void (*ConvertFunc)(const Array& srcBytes, int srcWidth, int srcHeight, const ImageFormat* srcFormat, int srcRowPadBits, const Array& dstBytes, const ImageFormat* dstFormat, int dstRowPadBits, bool invertY, ImageFormat::BayerAlgorithm bayerAlg);
-
-// this defines the conversion routines for converting between compatible formats
-static const int NUM_CONVERT_IMAGE_FORMATS = 5;
-struct ConvertAttributes {
-    ConvertFunc         m_converter;
-    ImageFormat::Code   m_sourceFormats[NUM_CONVERT_IMAGE_FORMATS];
-    ImageFormat::Code   m_destFormats[NUM_CONVERT_IMAGE_FORMATS];
-    bool                m_handlesSourcePadding;
-    bool                m_handlesDestPadding;
-    bool                m_handleInvertY;
-};
-
-// forward declare the converters we can use them below
-#define DECLARE_CONVERT_FUNC(name) static void name(const Array& srcBytes, int srcWidth, int srcHeight, const ImageFormat* srcFormat, int srcRowPadBits, const Array& dstBytes, const ImageFormat* dstFormat, int dstRowPadBits, bool invertY, ImageFormat::BayerAlgorithm bayerAlg);
-
-DECLARE_CONVERT_FUNC(l8_to_rgb8);
-DECLARE_CONVERT_FUNC(l32f_to_rgb8);
-DECLARE_CONVERT_FUNC(rgb8_to_rgba8);
-DECLARE_CONVERT_FUNC(rgb8_to_bgr8);
-DECLARE_CONVERT_FUNC(rgb8_to_rgba32f);
-DECLARE_CONVERT_FUNC(bgr8_to_rgb8);
-DECLARE_CONVERT_FUNC(bgr8_to_rgba8);
-DECLARE_CONVERT_FUNC(bgr8_to_rgba32f);
-DECLARE_CONVERT_FUNC(rgba8_to_rgb8);
-DECLARE_CONVERT_FUNC(rgba8_to_bgr8);
-DECLARE_CONVERT_FUNC(rgba8_to_rgba32f);
-DECLARE_CONVERT_FUNC(rgb32f_to_rgba32f);
-DECLARE_CONVERT_FUNC(rgba32f_to_rgb8);
-DECLARE_CONVERT_FUNC(rgba32f_to_rgba8);
-DECLARE_CONVERT_FUNC(rgba32f_to_bgr8);
-DECLARE_CONVERT_FUNC(rgba32f_to_rgb32f);
-DECLARE_CONVERT_FUNC(rgba32f_to_bayer_rggb8);
-DECLARE_CONVERT_FUNC(rgba32f_to_bayer_gbrg8);
-DECLARE_CONVERT_FUNC(rgba32f_to_bayer_grbg8);
-DECLARE_CONVERT_FUNC(rgba32f_to_bayer_bggr8);
-DECLARE_CONVERT_FUNC(bayer_rggb8_to_rgba32f);
-DECLARE_CONVERT_FUNC(bayer_gbrg8_to_rgba32f);
-DECLARE_CONVERT_FUNC(bayer_grbg8_to_rgba32f);
-DECLARE_CONVERT_FUNC(bayer_bggr8_to_rgba32f);
-DECLARE_CONVERT_FUNC(rgb8_to_yuv420p);
-DECLARE_CONVERT_FUNC(rgb8_to_yuv422);
-DECLARE_CONVERT_FUNC(rgb8_to_yuv444);
-DECLARE_CONVERT_FUNC(yuv420p_to_rgb8);
-DECLARE_CONVERT_FUNC(yuv422_to_rgb8);
-DECLARE_CONVERT_FUNC(yuv444_to_rgb8);
-
-// this is the list of mappings between formats and the routines to perform them
-static const ConvertAttributes sConvertMappings[] = {
-
-    // RGB -> RGB color space
-    // L8 ->
-    {l8_to_rgb8,        {ImageFormat::CODE_L8, ImageFormat::CODE_NONE},         {ImageFormat::CODE_RGB8, ImageFormat::CODE_NONE}, false, false, true},
-
-    // L32F ->
-    {l32f_to_rgb8,      {ImageFormat::CODE_L32F, ImageFormat::CODE_NONE},       {ImageFormat::CODE_RGB8, ImageFormat::CODE_NONE}, false, false, true},
-
-    // RGB8 ->
-    {rgb8_to_rgba8,     {ImageFormat::CODE_RGB8, ImageFormat::CODE_NONE},       {ImageFormat::CODE_RGBA8, ImageFormat::CODE_NONE}, false, false, true},
-    {rgb8_to_bgr8,      {ImageFormat::CODE_RGB8, ImageFormat::CODE_NONE},       {ImageFormat::CODE_BGR8, ImageFormat::CODE_NONE}, false, false, true},
-    {rgb8_to_rgba32f,   {ImageFormat::CODE_RGB8, ImageFormat::CODE_NONE},       {ImageFormat::CODE_RGBA32F, ImageFormat::CODE_NONE}, true, false, true},
-
-    // BGR8 ->
-    {bgr8_to_rgb8,      {ImageFormat::CODE_BGR8, ImageFormat::CODE_NONE},       {ImageFormat::CODE_RGB8, ImageFormat::CODE_NONE}, false, false, true},
-    {bgr8_to_rgba8,     {ImageFormat::CODE_BGR8, ImageFormat::CODE_NONE},       {ImageFormat::CODE_RGBA8, ImageFormat::CODE_NONE}, false, false, true},
-    {bgr8_to_rgba32f,   {ImageFormat::CODE_BGR8, ImageFormat::CODE_NONE},       {ImageFormat::CODE_RGBA32F, ImageFormat::CODE_NONE}, true, false, true},
-
-    // RGBA8 ->
-    {rgba8_to_rgb8,     {ImageFormat::CODE_RGBA8, ImageFormat::CODE_NONE},      {ImageFormat::CODE_RGB8, ImageFormat::CODE_NONE}, false, false, true},
-    {rgba8_to_bgr8,     {ImageFormat::CODE_RGBA8, ImageFormat::CODE_NONE},      {ImageFormat::CODE_BGR8, ImageFormat::CODE_NONE}, false, false, true},
-    {rgba8_to_rgba32f,  {ImageFormat::CODE_RGBA8, ImageFormat::CODE_NONE},      {ImageFormat::CODE_RGBA32F, ImageFormat::CODE_NONE}, true, false, true},
-
-    // RGB32F ->
-    {rgb32f_to_rgba32f, {ImageFormat::CODE_RGB32F, ImageFormat::CODE_NONE},     {ImageFormat::CODE_RGBA32F, ImageFormat::CODE_NONE}, true, false, true},
-
-    // RGBA32F ->
-    {rgba32f_to_rgb8,   {ImageFormat::CODE_RGBA32F, ImageFormat::CODE_NONE},    {ImageFormat::CODE_RGB8, ImageFormat::CODE_NONE}, false, true, true},
-    {rgba32f_to_rgba8,  {ImageFormat::CODE_RGBA32F, ImageFormat::CODE_NONE},    {ImageFormat::CODE_RGBA8, ImageFormat::CODE_NONE}, false, true, true},
-    {rgba32f_to_bgr8,   {ImageFormat::CODE_RGBA32F, ImageFormat::CODE_NONE},    {ImageFormat::CODE_BGR8, ImageFormat::CODE_NONE}, false, true, true},
-    {rgba32f_to_rgb32f, {ImageFormat::CODE_RGBA32F, ImageFormat::CODE_NONE},    {ImageFormat::CODE_RGB32F, ImageFormat::CODE_NONE}, false, true, true},
-    
-    // RGB -> BAYER color space
-    {rgba32f_to_bayer_rggb8, {ImageFormat::CODE_RGBA32F, ImageFormat::CODE_NONE},       {ImageFormat::CODE_BAYER_RGGB8, ImageFormat::CODE_NONE}, false, true, true},
-    {rgba32f_to_bayer_gbrg8, {ImageFormat::CODE_RGBA32F, ImageFormat::CODE_NONE},       {ImageFormat::CODE_BAYER_GBRG8, ImageFormat::CODE_NONE}, false, true, true},
-    {rgba32f_to_bayer_grbg8, {ImageFormat::CODE_RGBA32F, ImageFormat::CODE_NONE},       {ImageFormat::CODE_BAYER_GRBG8, ImageFormat::CODE_NONE}, false, true, true},
-    {rgba32f_to_bayer_bggr8, {ImageFormat::CODE_RGBA32F, ImageFormat::CODE_NONE},       {ImageFormat::CODE_BAYER_BGGR8, ImageFormat::CODE_NONE}, false, true, true},
-
-    // BAYER -> RGB color space
-    {bayer_rggb8_to_rgba32f, {ImageFormat::CODE_BAYER_RGGB8, ImageFormat::CODE_NONE},   {ImageFormat::CODE_RGBA32F, ImageFormat::CODE_NONE}, false, false, true},
-    {bayer_gbrg8_to_rgba32f, {ImageFormat::CODE_BAYER_GBRG8, ImageFormat::CODE_NONE},   {ImageFormat::CODE_RGBA32F, ImageFormat::CODE_NONE}, false, false, true},
-    {bayer_grbg8_to_rgba32f, {ImageFormat::CODE_BAYER_GRBG8, ImageFormat::CODE_NONE},   {ImageFormat::CODE_RGBA32F, ImageFormat::CODE_NONE}, false, false, true},
-    {bayer_bggr8_to_rgba32f, {ImageFormat::CODE_BAYER_BGGR8, ImageFormat::CODE_NONE},   {ImageFormat::CODE_RGBA32F, ImageFormat::CODE_NONE}, false, false, true},
-
-    // RGB <-> YUV color space
-    {rgb8_to_yuv420p, {ImageFormat::CODE_RGB8, ImageFormat::CODE_NONE},     {ImageFormat::CODE_YUV420_PLANAR, ImageFormat::CODE_NONE}, false, false, false},
-    {rgb8_to_yuv422, {ImageFormat::CODE_RGB8, ImageFormat::CODE_NONE},      {ImageFormat::CODE_YUV422, ImageFormat::CODE_NONE}, false, false, false},
-    {rgb8_to_yuv444, {ImageFormat::CODE_RGB8, ImageFormat::CODE_NONE},      {ImageFormat::CODE_YUV444, ImageFormat::CODE_NONE}, false, false, false},
-    {yuv420p_to_rgb8, {ImageFormat::CODE_YUV420_PLANAR, ImageFormat::CODE_NONE},    {ImageFormat::CODE_RGB8, ImageFormat::CODE_NONE}, false, false, false},
-    {yuv422_to_rgb8, {ImageFormat::CODE_YUV422, ImageFormat::CODE_NONE},    {ImageFormat::CODE_RGB8, ImageFormat::CODE_NONE}, false, false, false},
-    {yuv444_to_rgb8, {ImageFormat::CODE_YUV444, ImageFormat::CODE_NONE},    {ImageFormat::CODE_RGB8, ImageFormat::CODE_NONE}, false, false, false},
-};
-
-static ConvertFunc findConverter(TextureFormat::Code sourceCode, TextureFormat::Code destCode, bool needsSourcePadding, bool needsDestPadding, bool needsInvertY) {
-    int numRoutines = sizeof(sConvertMappings) / sizeof(ConvertAttributes);
-    for (int routineIndex = 0; routineIndex < numRoutines; ++routineIndex) {
-        int sourceIndex = 0;
-        ConvertAttributes routine = sConvertMappings[routineIndex];
-
-        while (routine.m_sourceFormats[sourceIndex] != ImageFormat::CODE_NONE) {
-            // check for matching source
-            if (routine.m_sourceFormats[sourceIndex] == sourceCode) {
-                int destIndex = 0;
-
-                // now check for matching dest to see if the routine fits
-                while (routine.m_destFormats[destIndex] != ImageFormat::CODE_NONE) {
-
-                    // check if dest format matches and padding + invert rules match
-                    if ((routine.m_destFormats[destIndex] == destCode) &&
-                        (!needsSourcePadding || (routine.m_handlesSourcePadding == needsSourcePadding)) &&
-                        (!needsDestPadding || (routine.m_handlesDestPadding == needsDestPadding)) &&
-                        (!needsInvertY || (routine.m_handleInvertY == needsInvertY))) {
-
-                        // found compatible converter
-                        return routine.m_converter;
-                    }
-                    ++destIndex;
-                }
-            }
-            ++sourceIndex;
-        }
-    }
-
-    return NULL;
-}
-
-bool conversionAvailable(const ImageFormat* srcFormat, int srcRowPadBits, const ImageFormat* dstFormat, int dstRowPadBits, bool invertY = false) {
-    bool conversionAvailable = false;
-
-    // check if a conversion is available
-    if ( (srcFormat->code == dstFormat->code) && (srcRowPadBits == dstRowPadBits) && !invertY) {
-        conversionAvailable = true;
-    } else {
-        ConvertFunc directConverter = findConverter(srcFormat->code, dstFormat->code, srcRowPadBits > 0, dstRowPadBits > 0, invertY);
-
-        conversionAvailable = (directConverter != NULL);
-    }
-
-    return conversionAvailable;
-}
-
-bool ImageFormat::convert(const Array& srcBytes, int srcWidth, int srcHeight, const ImageFormat* srcFormat, int srcRowPadBits,
-                          const Array& dstBytes, const ImageFormat* dstFormat, int dstRowPadBits, 
-                          bool invertY, BayerAlgorithm bayerAlg) {
-
-    bool conversionAvailable = false;
-
-    // Handle direct copy of image to same format
-    if ( (srcFormat->code == dstFormat->code) && (srcRowPadBits == dstRowPadBits) && !invertY) {
-
-        System::memcpy(dstBytes[0], srcBytes[0], iCeil(((srcWidth * srcFormat->cpuBitsPerPixel + srcRowPadBits) * srcHeight) / 8.0f));
-        conversionAvailable = true;
-    } else {
-        // if no direct conversion routine exists,
-        // then look for conversion to intermediate
-        // and then from intermediate to dest.
-        // intermediate format is RGBA32F
-        ConvertFunc directConverter = findConverter(srcFormat->code, dstFormat->code, srcRowPadBits > 0, dstRowPadBits > 0, invertY);
-
-        // if we have a direct converter, use it, otherwise find intermdiate path
-        if (directConverter) {
-            directConverter(srcBytes, srcWidth, srcHeight, srcFormat, srcRowPadBits, dstBytes, dstFormat, dstRowPadBits, invertY, bayerAlg);
-            conversionAvailable = true;
-        } else {
-            ConvertFunc toInterConverter = findConverter(srcFormat->code, ImageFormat::CODE_RGBA32F, srcRowPadBits > 0, false, false);;
-            ConvertFunc fromInterConverter = findConverter(ImageFormat::CODE_RGBA32F, dstFormat->code, false, dstRowPadBits > 0, invertY);;
-
-            if (toInterConverter && fromInterConverter) {
-                Array tmp;
-                tmp.append(System::malloc(srcWidth * srcHeight * ImageFormat::RGBA32F()->cpuBitsPerPixel * 8));
-
-                toInterConverter(srcBytes, srcWidth, srcHeight, srcFormat, srcRowPadBits, tmp, ImageFormat::RGBA32F(), 0, false, bayerAlg);
-                fromInterConverter(reinterpret_cast&>(tmp), srcWidth, srcHeight, ImageFormat::RGBA32F(), 0, dstBytes, dstFormat, dstRowPadBits, invertY, bayerAlg);
-
-                System::free(tmp[0]);
-
-                conversionAvailable = true;
-            }
-        }
-    }
-
-    return conversionAvailable;
-}
-
-
-// *******************
-// RGB -> RGB color space conversions
-// *******************
-
-// L8 ->
-static void l8_to_rgb8(const Array& srcBytes, int srcWidth, int srcHeight, const ImageFormat* srcFormat, int srcRowPadBits, const Array& dstBytes, const ImageFormat* dstFormat, int dstRowPadBits, bool invertY, ImageFormat::BayerAlgorithm bayerAlg) {
-    uint8* dst = static_cast(dstBytes[0]);
-    const uint8* src = static_cast(srcBytes[0]);
-    for (int y = 0; y < srcHeight; ++y) {
-        for (int x = 0; x < srcWidth; ++x) {
-            int i = (invertY) ? ((srcHeight-1-y) * srcWidth +x) : (y * srcWidth + x);
-            int i3 = i * 3;
-
-            dst[i3 + 0] = src[i]; 
-            dst[i3 + 1] = src[i]; 
-            dst[i3 + 2] = src[i]; 
-        }
-    }
-}
-
-// L32F ->
-static void l32f_to_rgb8(const Array& srcBytes, int srcWidth, int srcHeight, const ImageFormat* srcFormat, int srcRowPadBits, const Array& dstBytes, const ImageFormat* dstFormat, int dstRowPadBits, bool invertY, ImageFormat::BayerAlgorithm bayerAlg) {
-    int srcIndex = 0;
-    int dstByteOffset = 0;
-    uint8* dst = static_cast(dstBytes[0]);
-    const float* src = static_cast(srcBytes[0]);
-
-    for (int y = 0; y < srcHeight; ++y) {
-        if (invertY) {
-            srcIndex = srcWidth * (srcHeight - y - 1);
-        }
-        
-        for (int x = 0; x < srcWidth; ++x, ++srcIndex, dstByteOffset += 3) {
-            Color3uint8&  d = *reinterpret_cast(dst + dstByteOffset);
-            float s = src[srcIndex];
-
-            uint8 c = iMin(255, iFloor(s * 256));
-            d = Color3uint8(c, c, c);
-        }
-    } 
-}
-
-// RGB8 ->
-static void rgb8_to_rgba8(const Array& srcBytes, int srcWidth, int srcHeight, const ImageFormat* srcFormat, int srcRowPadBits, const Array& dstBytes, const ImageFormat* dstFormat, int dstRowPadBits, bool invertY, ImageFormat::BayerAlgorithm bayerAlg) {
-    uint8* dst = static_cast(dstBytes[0]);
-    const uint8* src = static_cast(srcBytes[0]);
-    for (int y = 0; y < srcHeight; ++y) {
-        for (int x = 0; x < srcWidth; ++x) {
-            int i = (invertY) ? ((srcHeight-1-y) * srcWidth +x) : (y * srcWidth + x);
-            int i3 = i * 3;
-            int i4 = i3 + i; 
-
-            dst[i4 + 0] = src[i3 + 0]; 
-            dst[i4 + 1] = src[i3 + 1]; 
-            dst[i4 + 2] = src[i3 + 2]; 
-            dst[i4 + 3] = 255; 
-        }
-    }
-}
-
-static void rgb8_to_bgr8(const Array& srcBytes, int srcWidth, int srcHeight, const ImageFormat* srcFormat, int srcRowPadBits, const Array& dstBytes, const ImageFormat* dstFormat, int dstRowPadBits, bool invertY, ImageFormat::BayerAlgorithm bayerAlg) {
-    uint8* dst = static_cast(dstBytes[0]);
-    const uint8* src = static_cast(srcBytes[0]);
-    for (int y = 0; y < srcHeight; ++y) {
-        for (int x = 0; x < srcWidth; ++x) {
-            int i = (invertY) ? ((srcHeight-1-y) * srcWidth +x) : (y * srcWidth + x);
-            int i3 = i * 3;
-            dst[i3 + 0] = src[i3 + 2];
-            dst[i3 + 1] = src[i3 + 1];
-            dst[i3 + 2] = src[i3 + 0];
-        }
-    }
-}
-
-static void rgb8_to_rgba32f(const Array& srcBytes, int srcWidth, int srcHeight, const ImageFormat* srcFormat, int srcRowPadBits, const Array& dstBytes, const ImageFormat* dstFormat, int dstRowPadBits, bool invertY, ImageFormat::BayerAlgorithm bayerAlg) {
-    debugAssertM(srcRowPadBits % 8 == 0, "Source row padding must be a multiple of 8 bits for this format");
-
-    int dstIndex = 0;
-    int srcByteOffset = 0;
-    int srcRowPadBytes = srcRowPadBits / 8;
-    Color4* dst = static_cast(dstBytes[0]);
-    const uint8* src = static_cast(srcBytes[0]);
-
-    for (int y = 0; y < srcHeight; ++y) {
-        if (invertY) {
-            dstIndex = srcWidth * (srcHeight - 1 - y);
-        }
-        for (int x = 0; x < srcWidth; ++x, ++dstIndex, srcByteOffset += 3) {
-            const Color3uint8& s = *reinterpret_cast(src + srcByteOffset);
-            dst[dstIndex] = Color4(Color3(s), 1.0f);
-        }
-        srcByteOffset += srcRowPadBytes;
-    }
-}
-
-// BGR8 ->
-static void bgr8_to_rgb8(const Array& srcBytes, int srcWidth, int srcHeight, const ImageFormat* srcFormat, int srcRowPadBits, const Array& dstBytes, const ImageFormat* dstFormat, int dstRowPadBits, bool invertY, ImageFormat::BayerAlgorithm bayerAlg) {
-    uint8* dst = static_cast(dstBytes[0]);
-    const uint8* src = static_cast(srcBytes[0]);
-    for (int y = 0; y < srcHeight; ++y) {
-        for (int x = 0; x < srcWidth; ++x) {
-            int i = (invertY) ? ((srcHeight-1-y) * srcWidth +x) : (y * srcWidth + x);
-            int i3 = i * 3;
-            dst[i3 + 0] = src[i3 + 2];
-            dst[i3 + 1] = src[i3 + 1];
-            dst[i3 + 2] = src[i3 + 0];
-        }
-    }
-}
-
-static void bgr8_to_rgba8(const Array& srcBytes, int srcWidth, int srcHeight, const ImageFormat* srcFormat, int srcRowPadBits, const Array& dstBytes, const ImageFormat* dstFormat, int dstRowPadBits, bool invertY, ImageFormat::BayerAlgorithm bayerAlg) {
-    uint8* dst = static_cast(dstBytes[0]);
-    const uint8* src = static_cast(srcBytes[0]);
-    for (int y = 0; y < srcHeight; ++y) {
-        for (int x = 0; x < srcWidth; ++x) {
-            int i = (invertY) ? ((srcHeight-1-y) * srcWidth +x) : (y * srcWidth + x);
-            int i3 = i * 3;
-            int i4 = i3 + i; 
-
-            dst[i4 + 0] = src[i3 + 2]; 
-            dst[i4 + 1] = src[i3 + 1]; 
-            dst[i4 + 2] = src[i3 + 0]; 
-            dst[i4 + 3] = 255; 
-        }
-    }
-}
-
-static void bgr8_to_rgba32f(const Array& srcBytes, int srcWidth, int srcHeight, const ImageFormat* srcFormat, int srcRowPadBits, const Array& dstBytes, const ImageFormat* dstFormat, int dstRowPadBits, bool invertY, ImageFormat::BayerAlgorithm bayerAlg) {
-    debugAssertM(srcRowPadBits % 8 == 0, "Source row padding must be a multiple of 8 bits for this format");
-
-    int dstIndex = 0;
-    int srcByteOffset = 0;
-    int srcRowPadBytes = srcRowPadBits / 8;
-    Color4* dst = static_cast(dstBytes[0]);
-    const uint8* src = static_cast(srcBytes[0]);
-
-    for (int y = 0; y < srcHeight; ++y) {
-        if (invertY) {
-            dstIndex = srcWidth * (srcHeight - 1 - y);
-        }
-
-        for (int x = 0; x < srcWidth; ++x, ++dstIndex, srcByteOffset += 3) {
-            const Color3uint8& s = *reinterpret_cast(src + srcByteOffset);
-            dst[dstIndex] = Color4(Color3(s).bgr(), 1.0f);
-        }
-        srcByteOffset += srcRowPadBytes;
-    }
-}
-
-// RGBA8 ->
-static void rgba8_to_rgb8(const Array& srcBytes, int srcWidth, int srcHeight, const ImageFormat* srcFormat, int srcRowPadBits, const Array& dstBytes, const ImageFormat* dstFormat, int dstRowPadBits, bool invertY, ImageFormat::BayerAlgorithm bayerAlg) {
-    uint8* dst = static_cast(dstBytes[0]);
-    const uint8* src = static_cast(srcBytes[0]);
-    for (int y = 0; y < srcHeight; ++y) {
-        for (int x = 0; x < srcWidth; ++x) {
-            int i = (invertY) ? ((srcHeight-1-y) * srcWidth +x) : (y * srcWidth + x);
-            int i3 = i * 3;
-            int i4 = i3 + i;
-
-            dst[i3 + 0] = src[i4 + 0]; 
-            dst[i3 + 1] = src[i4 + 1]; 
-            dst[i3 + 2] = src[i4 + 2]; 
-        }
-    }
-}
-
-static void rgba8_to_bgr8(const Array& srcBytes, int srcWidth, int srcHeight, const ImageFormat* srcFormat, int srcRowPadBits, const Array& dstBytes, const ImageFormat* dstFormat, int dstRowPadBits, bool invertY, ImageFormat::BayerAlgorithm bayerAlg) {
-    uint8* dst = static_cast(dstBytes[0]);
-    const uint8* src = static_cast(srcBytes[0]);
-    for (int y = 0; y < srcHeight; ++y) {
-        for (int x = 0; x < srcWidth; ++x) {
-            int i = (invertY) ? ((srcHeight-1-y) * srcWidth +x) : (y * srcWidth + x);
-            int i3 = i * 3;
-            int i4 = i3 + i;
-
-            dst[i3 + 0] = src[i4 + 2]; 
-            dst[i3 + 1] = src[i4 + 1]; 
-            dst[i3 + 2] = src[i4 + 0]; 
-        }
-    }
-}
-
-static void rgba8_to_rgba32f(const Array& srcBytes, int srcWidth, int srcHeight, const ImageFormat* srcFormat, int srcRowPadBits, const Array& dstBytes, const ImageFormat* dstFormat, int dstRowPadBits, bool invertY, ImageFormat::BayerAlgorithm bayerAlg) {
-    debugAssertM(srcRowPadBits % 8 == 0, "Source row padding must be a multiple of 8 bits for this format");
-
-    int dstIndex = 0;
-    int srcByteOffset = 0;
-    int srcRowPadBytes = srcRowPadBits / 8;
-    Color4* dst = static_cast(dstBytes[0]);
-    const uint8* src = static_cast(srcBytes[0]);
-
-    for (int y = 0; y < srcHeight; ++y) {
-        if (invertY) {
-            dstIndex = srcWidth * (srcHeight - 1 - y);
-        }
-
-        for (int x = 0; x < srcWidth; ++x, ++dstIndex, srcByteOffset += 4) {
-            const Color4uint8& s = *reinterpret_cast(src + srcByteOffset);
-            dst[dstIndex] = Color4(s);
-        }
-        srcByteOffset += srcRowPadBytes;
-    }
-}
-
-// RGB32F ->
-static void rgb32f_to_rgba32f(const Array& srcBytes, int srcWidth, int srcHeight, const ImageFormat* srcFormat, int srcRowPadBits, const Array& dstBytes, const ImageFormat* dstFormat, int dstRowPadBits, bool invertY, ImageFormat::BayerAlgorithm bayerAlg) {
-    debugAssertM(srcRowPadBits % 8 == 0, "Source row padding must be a multiple of 8 bits for this format");
-
-    int dstIndex = 0;
-    int srcByteOffset = 0;
-    int srcRowPadBytes = srcRowPadBits / 8;
-    Color4* dst = static_cast(dstBytes[0]);
-    const uint8* src = static_cast(srcBytes[0]);
-
-    for (int y = 0; y < srcHeight; ++y) {
-        if (invertY) {
-            dstIndex = srcWidth * (srcHeight - 1 - y);
-        }
-
-        for (int x = 0; x < srcWidth; ++x, ++dstIndex, srcByteOffset += 3 * sizeof(float)) {
-            const Color3& s = *reinterpret_cast(src + srcByteOffset);
-            dst[dstIndex] = Color4(Color3(s), 1.0f);
-        }
-        srcByteOffset += srcRowPadBytes;
-    }
-}
-
-// RGBA32F ->
-static void rgba32f_to_rgb8(const Array& srcBytes, int srcWidth, int srcHeight, const ImageFormat* srcFormat, int srcRowPadBits, const Array& dstBytes, const ImageFormat* dstFormat, int dstRowPadBits, bool invertY, ImageFormat::BayerAlgorithm bayerAlg) {
-    debugAssertM(dstRowPadBits % 8 == 0, "Destination row padding must be a multiple of 8 bits for this format");
-
-    int srcIndex = 0;
-    int dstByteOffset = 0;
-    int dstRowPadBytes = dstRowPadBits / 8;
-    uint8* dst = static_cast(dstBytes[0]);
-    const Color4* src = static_cast(srcBytes[0]);
-
-    for (int y = 0; y < srcHeight; ++y) {
-        if (invertY) {
-            srcIndex = srcWidth * (srcHeight - y - 1);
-        }
-        
-        for (int x = 0; x < srcWidth; ++x, ++srcIndex, dstByteOffset += 3) {
-            Color3uint8&  d = *reinterpret_cast(dst + dstByteOffset);
-            const Color4& s = src[srcIndex];
-
-            d = Color3uint8(s.rgb());
-        }
-        dstByteOffset += dstRowPadBytes;
-    } 
-}
-
-static void rgba32f_to_rgba8(const Array& srcBytes, int srcWidth, int srcHeight, const ImageFormat* srcFormat, int srcRowPadBits, const Array& dstBytes, const ImageFormat* dstFormat, int dstRowPadBits, bool invertY, ImageFormat::BayerAlgorithm bayerAlg) {
-    debugAssertM(dstRowPadBits % 8 == 0, "Destination row padding must be a multiple of 8 bits for this format");
-
-    int srcIndex = 0;
-    int dstByteOffset = 0;
-    int dstRowPadBytes = dstRowPadBits / 8;
-    uint8* dst = static_cast(dstBytes[0]);
-    const Color4* src = static_cast(srcBytes[0]);
-
-    for (int y = 0; y < srcHeight; ++y) {
-        if (invertY) {
-            srcIndex = srcWidth * (srcHeight - 1 - y);
-        }
-        for (int x = 0; x < srcWidth; ++x, ++srcIndex, dstByteOffset += 4) {
-            Color4uint8&  d = *reinterpret_cast(dst + dstByteOffset);
-            const Color4& s = src[srcIndex];
-
-            d = Color4uint8(s);
-        }
-        dstByteOffset += dstRowPadBytes;
-    } 
-}
-
-static void rgba32f_to_bgr8(const Array& srcBytes, int srcWidth, int srcHeight, const ImageFormat* srcFormat, int srcRowPadBits, const Array& dstBytes, const ImageFormat* dstFormat, int dstRowPadBits, bool invertY, ImageFormat::BayerAlgorithm bayerAlg) {
-    debugAssertM(dstRowPadBits % 8 == 0, "Destination row padding must be a multiple of 8 bits for this format");
-
-    int srcIndex = 0;
-    int dstByteOffset = 0;
-    int dstRowPadBytes = dstRowPadBits / 8;
-    uint8* dst = static_cast(dstBytes[0]);
-    const Color4* src = static_cast(srcBytes[0]);
-
-    for (int y = 0; y < srcHeight; ++y) {
-        if (invertY) {
-            srcIndex = srcWidth * (srcHeight - y - 1);
-        }
-        
-        for (int x = 0; x < srcWidth; ++x, ++srcIndex, dstByteOffset += 3) {
-            Color3uint8&  d = *reinterpret_cast(dst + dstByteOffset);
-            const Color4& s = src[srcIndex];
-
-            d = Color3uint8(s.rgb()).bgr();
-        }
-        dstByteOffset += dstRowPadBytes;
-    } 
-}
-
-static void rgba32f_to_rgb32f(const Array& srcBytes, int srcWidth, int srcHeight, const ImageFormat* srcFormat, int srcRowPadBits, const Array& dstBytes, const ImageFormat* dstFormat, int dstRowPadBits, bool invertY, ImageFormat::BayerAlgorithm bayerAlg) {
-    debugAssertM(dstRowPadBits % 8 == 0, "Destination row padding must be a multiple of 8 bits for this format");
-
-    int srcIndex = 0;
-    int dstByteOffset = 0;
-    int dstRowPadBytes = dstRowPadBits / 8;
-    uint8* dst = static_cast(dstBytes[0]);
-    const Color4* src = static_cast(srcBytes[0]);
-
-    for (int y = 0; y < srcHeight; ++y) {
-        if (invertY) {
-            srcIndex = srcWidth * (srcHeight - 1 - y);
-        }
-        for (int x = 0; x < srcWidth; ++x, ++srcIndex, dstByteOffset += 3 * sizeof(float)) {
-            Color3& d = *reinterpret_cast(dst + dstByteOffset);
-            const Color4& s = src[srcIndex];	    
-            d = Color3(s);
-        }
-        dstByteOffset += dstRowPadBytes;
-    } 
-}
-
-// *******************
-// RGB <-> YUV color space conversions
-// *******************
-
-static uint32 blendPixels(uint32 pixel1, uint32 pixel2) {
-    static const uint32 rbMask = 0x00FF00FF;
-    static const uint32 agMask = 0xFF00FF00;
-
-    // Compute two color channels at a time.  Use >> 1 for fast division by two
-    // Using alternating color channels prevents overflow
-    const uint32 rb = ((pixel1 & rbMask) + (pixel2 & rbMask)) >> 1;
-
-    // Shift first to avoid overflow in alpha channel
-    const uint32 ag = (((pixel1 & agMask) >> 1) + ((pixel2 & agMask) >> 1));
-
-    return ((rb & rbMask) | (ag & agMask));
-}
-
-#define PIXEL_RGB8_TO_YUV_Y(r, g, b) static_cast(iClamp(((66 * r + 129 * g + 25 * b + 128) >> 8) + 16, 0, 255))
-#define PIXEL_RGB8_TO_YUV_U(r, g, b) static_cast(iClamp(((-38 * r - 74 * g + 112 * b + 128) >> 8) + 128, 0, 255))
-#define PIXEL_RGB8_TO_YUV_V(r, g, b) static_cast(iClamp(((112 * r - 94 * g - 18 * b + 128) >> 8) + 128, 0, 255))
-
-static void rgb8_to_yuv420p(const Array& srcBytes, int srcWidth, int srcHeight, const ImageFormat* srcFormat, int srcRowPadBits, const Array& dstBytes, const ImageFormat* dstFormat, int dstRowPadBits, bool invertY, ImageFormat::BayerAlgorithm bayerAlg) {
-    debugAssertM(srcRowPadBits == 0, "Source row padding must be 0 for this format");
-    debugAssertM((srcWidth % 2 == 0) && (srcHeight % 2 == 0), "Source width and height must be a multiple of two");
-
-    const Color3uint8* src = static_cast(srcBytes[0]);
-
-    uint8* dstY = static_cast(dstBytes[0]);
-    uint8* dstU = static_cast(dstBytes[1]);
-    uint8* dstV = static_cast(dstBytes[2]);
-
-    for (int y = 0; y < srcHeight; y += 2) {
-        for (int x = 0; x < srcWidth; x += 2) {
-
-            // convert 4-pixel block at a time
-            int srcPixelOffset0 = y * srcWidth + x;
-            int srcPixelOffset1 = srcPixelOffset0 + 1;
-            int srcPixelOffset2 = srcPixelOffset0 + srcWidth;
-            int srcPixelOffset3 = srcPixelOffset2 + 1;
-
-            int yIndex = y * srcWidth + x;
-
-            dstY[yIndex] =     PIXEL_RGB8_TO_YUV_Y(src[srcPixelOffset0].r, src[srcPixelOffset0].g, src[srcPixelOffset0].b);
-            dstY[yIndex + 1] = PIXEL_RGB8_TO_YUV_Y(src[srcPixelOffset1].r, src[srcPixelOffset1].g, src[srcPixelOffset1].b);
-
-            yIndex += srcWidth;
-            dstY[yIndex] =     PIXEL_RGB8_TO_YUV_Y(src[srcPixelOffset2].r, src[srcPixelOffset2].g, src[srcPixelOffset2].b);
-            dstY[yIndex + 1] = PIXEL_RGB8_TO_YUV_Y(src[srcPixelOffset3].r, src[srcPixelOffset3].g, src[srcPixelOffset3].b);
-
-            uint32 blendedPixel = blendPixels(src[srcPixelOffset0].asUInt32(), src[srcPixelOffset2].asUInt32());
-            Color3uint8 uvSrcColor = Color3uint8::fromARGB(blendedPixel);
-
-            int uvIndex = y / 2 * srcWidth / 2 + x / 2;
-            dstU[uvIndex] =    PIXEL_RGB8_TO_YUV_U(uvSrcColor.r, uvSrcColor.g, uvSrcColor.b);
-            dstV[uvIndex] =    PIXEL_RGB8_TO_YUV_V(uvSrcColor.r, uvSrcColor.g, uvSrcColor.b);
-        }
-    }
-}
-
-static void rgb8_to_yuv422(const Array& srcBytes, int srcWidth, int srcHeight, const ImageFormat* srcFormat, int srcRowPadBits, const Array& dstBytes, const ImageFormat* dstFormat, int dstRowPadBits, bool invertY, ImageFormat::BayerAlgorithm bayerAlg) {
-    debugAssertM(srcRowPadBits == 0, "Source row padding must be 0 for this format");
-    debugAssertM((srcWidth % 2 == 0), "Source width must be a multiple of two");
-
-    const Color3uint8* src = static_cast(srcBytes[0]);
-
-    uint8* dst = static_cast(dstBytes[0]);
-
-    for (int y = 0; y < srcHeight; ++y) {
-        for (int x = 0; x < srcWidth; x += 2) {
-
-            // convert 2-pixel horizontal block at a time
-            int srcIndex = y * srcWidth + x;
-            int dstIndex = srcIndex * 2;
-
-            uint32 blendedPixel = blendPixels(src[srcIndex].asUInt32(), src[srcIndex + 1].asUInt32());
-            Color3uint8 uvSrcColor = Color3uint8::fromARGB(blendedPixel);
-
-            dst[dstIndex]     = PIXEL_RGB8_TO_YUV_Y(src[srcIndex].r, src[srcIndex].g, src[srcIndex].b);
-
-            dst[dstIndex + 1] = PIXEL_RGB8_TO_YUV_U(uvSrcColor.r, uvSrcColor.g, uvSrcColor.b);
-
-            dst[dstIndex + 2] = PIXEL_RGB8_TO_YUV_Y(src[srcIndex + 1].r, src[srcIndex + 1].g, src[srcIndex + 1].b);
-
-            dst[dstIndex + 3] = PIXEL_RGB8_TO_YUV_V(uvSrcColor.r, uvSrcColor.g, uvSrcColor.b);
-
-        }
-    }
-}
-
-static void rgb8_to_yuv444(const Array& srcBytes, int srcWidth, int srcHeight, const ImageFormat* srcFormat, int srcRowPadBits, const Array& dstBytes, const ImageFormat* dstFormat, int dstRowPadBits, bool invertY, ImageFormat::BayerAlgorithm bayerAlg) {
-    debugAssertM(srcRowPadBits == 0, "Source row padding must be 0 for this format");
-
-    const Color3uint8* src = static_cast(srcBytes[0]);
-
-    Color3uint8* dst = static_cast(dstBytes[0]);
-
-    for (int y = 0; y < srcHeight; ++y) {
-        for (int x = 0; x < srcWidth; ++x) {
-
-            // convert 1-pixels at a time
-            int index = y * srcWidth + x;
-            uint8 y = PIXEL_RGB8_TO_YUV_Y(src[index].r, src[index].g, src[index].b);
-            uint8 u = PIXEL_RGB8_TO_YUV_U(src[index].r, src[index].g, src[index].b);
-            uint8 v = PIXEL_RGB8_TO_YUV_V(src[index].r, src[index].g, src[index].b);
-
-            dst[index].r = y;
-            dst[index].g = u;
-            dst[index].b = v;
-        }
-    }
-}
-
-
-#define PIXEL_YUV_TO_RGB8_R(y, u, v) static_cast(iClamp((298 * (y - 16) + 409 * (v - 128) + 128) >> 8, 0, 255))
-#define PIXEL_YUV_TO_RGB8_G(y, u, v) static_cast(iClamp((298 * (y - 16) - 100 * (u - 128) - 208 * (v - 128) + 128) >> 8, 0, 255))
-#define PIXEL_YUV_TO_RGB8_B(y, u, v) static_cast(iClamp((298 * (y - 16) + 516 * (u - 128) + 128) >> 8, 0, 255))
-
-static void yuv420p_to_rgb8(const Array& srcBytes, int srcWidth, int srcHeight, const ImageFormat* srcFormat, int srcRowPadBits, const Array& dstBytes, const ImageFormat* dstFormat, int dstRowPadBits, bool invertY, ImageFormat::BayerAlgorithm bayerAlg) {
-    debugAssertM(srcRowPadBits == 0, "Source row padding must be 0 for this format");
-    debugAssertM((srcWidth % 2 == 0) && (srcHeight % 2 == 0), "Source width and height must be a multiple of two");
-
-    const uint8* srcY = static_cast(srcBytes[0]);
-    const uint8* srcU = static_cast(srcBytes[1]);
-    const uint8* srcV = static_cast(srcBytes[2]);
-
-    Color3uint8* dst = static_cast(dstBytes[0]);
-
-    for (int y = 0; y < srcHeight; ++y) {
-        for (int x = 0; x < srcWidth; x += 2) {
-
-            // convert to two rgb pixels in a row
-            Color3uint8* rgb = &dst[y * srcWidth + x];
-
-            int yOffset = y * srcWidth + x;
-            int uvOffset = y / 2 * srcWidth / 2 + x / 2;
-
-            rgb->r = PIXEL_YUV_TO_RGB8_R(srcY[yOffset], srcU[uvOffset], srcV[uvOffset]);
-            rgb->g = PIXEL_YUV_TO_RGB8_G(srcY[yOffset], srcU[uvOffset], srcV[uvOffset]);
-            rgb->b = PIXEL_YUV_TO_RGB8_B(srcY[yOffset], srcU[uvOffset], srcV[uvOffset]);
-
-            rgb += 1;
-            rgb->r = PIXEL_YUV_TO_RGB8_R(srcY[yOffset + 1], srcU[uvOffset], srcV[uvOffset]);
-            rgb->g = PIXEL_YUV_TO_RGB8_G(srcY[yOffset + 1], srcU[uvOffset], srcV[uvOffset]);
-            rgb->b = PIXEL_YUV_TO_RGB8_B(srcY[yOffset + 1], srcU[uvOffset], srcV[uvOffset]);
-        }
-    }
-}
-
-static void yuv422_to_rgb8(const Array& srcBytes, int srcWidth, int srcHeight, const ImageFormat* srcFormat, int srcRowPadBits, const Array& dstBytes, const ImageFormat* dstFormat, int dstRowPadBits, bool invertY, ImageFormat::BayerAlgorithm bayerAlg) {
-    debugAssertM(srcRowPadBits == 0, "Source row padding must be 0 for this format");
-    debugAssertM((srcWidth % 2 == 0), "Source width must be a multiple of two");
-
-    const uint8* src = static_cast(srcBytes[0]);
-
-    Color3uint8* dst = static_cast(dstBytes[0]);
-
-    for (int y = 0; y < srcHeight; ++y) {
-        for (int x = 0; x < srcWidth; x += 2) {
-
-            // convert to two rgb pixels in a row
-            Color3uint8* rgb = &dst[y * srcWidth + x];
-            
-            int srcIndex = (y * srcWidth + x) * 2;
-            uint8 y  = src[srcIndex];
-            uint8 u  = src[srcIndex + 1];
-            uint8 y2 = src[srcIndex + 2];
-            uint8 v  = src[srcIndex + 3];
-
-            rgb->r = PIXEL_YUV_TO_RGB8_R(y, u, v);
-            rgb->g = PIXEL_YUV_TO_RGB8_G(y, u, v);
-            rgb->b = PIXEL_YUV_TO_RGB8_B(y, u, v);
-
-            rgb += 1;
-            rgb->r = PIXEL_YUV_TO_RGB8_R(y2, u, v);
-            rgb->g = PIXEL_YUV_TO_RGB8_G(y2, u, v);
-            rgb->b = PIXEL_YUV_TO_RGB8_B(y2, u, v);
-        }
-    }
-}
-
-static void yuv444_to_rgb8(const Array& srcBytes, int srcWidth, int srcHeight, const ImageFormat* srcFormat, int srcRowPadBits, const Array& dstBytes, const ImageFormat* dstFormat, int dstRowPadBits, bool invertY, ImageFormat::BayerAlgorithm bayerAlg) {
-    debugAssertM(srcRowPadBits == 0, "Source row padding must be 0 for this format");
-
-    const Color3uint8* src = static_cast(srcBytes[0]);
-
-    Color3uint8* dst = static_cast(dstBytes[0]);
-
-    for (int y = 0; y < srcHeight; ++y) {
-        for (int x = 0; x < srcWidth; ++x) {
-
-            // convert to one rgb pixels at a time
-            int index = y * srcWidth + x;
-            Color3uint8* rgb = &dst[index];
-            
-            rgb->r = PIXEL_YUV_TO_RGB8_R(src[index].r, src[index].g, src[index].b);
-            rgb->g = PIXEL_YUV_TO_RGB8_G(src[index].r, src[index].g, src[index].b);
-            rgb->b = PIXEL_YUV_TO_RGB8_B(src[index].r, src[index].g, src[index].b);
-        }
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////
-//
-// Bayer conversions
-//
-
-// There are two kinds of rows (GR and BG).
-// In each row, there are two kinds of pixels (G/R, B/G).
-// We express the four kinds of INPUT pixels as:
-//    GRG, GRG, BGB, BGG
-//
-// There are three kinds of OUTPUT pixels: R, G, B.
-// Thus there are nominally 12 different I/O combinations, 
-// but several are impulses because needed output at that 
-// location *is* the input (e.g., G_GRG and G_BGG).
-//
-// The following 5x5 row-major filters are named as output_input.
-
-// Green
-static const float G_GRR[5][5] =
-    {{     0.0f,      0.0f,     -1.0f,      0.0f,      0.0f},
-     {     0.0f,      0.0f,      2.0f,      0.0f,      0.0f},
-     {    -1.0f,      2.0f,      4.0f,      2.0f,     -1.0f},
-     {     0.0f,      0.0f,      2.0f,      0.0f,      0.0f},
-     {     0.0f,      0.0f,     -1.0f,      0.0f,      0.0f}};
-
-static const float G_BGB[5][5] =
-    {{     0.0f,      0.0f,     -1.0f,      0.0f,      0.0f},
-     {     0.0f,      0.0f,      2.0f,      0.0f,      0.0f},
-     {    -1.0f,      2.0f,      4.0f,      2.0f,     -1.0f},
-     {     0.0f,      0.0f,      2.0f,      0.0f,      0.0f},
-     {     0.0f,      0.0f,     -1.0f,      0.0f,      0.0f}};
-
-// Red 
-//(the caption in the paper is wrong for this case:
-// "R row B column really means R row G column"
-static const float R_GRG[5][5] =
-    {{     0.0f,      0.0f,      0.5f,      0.0f,      0.0f},
-     {     0.0f,     -1.0f,      0.0f,     -1.0f,      0.0f},
-     {    -1.0f,      4.0f,      5.0f,      4.0f,     -1.0f},
-     {     0.0f,     -1.0f,      0.0f,     -1.0f,      0.0f},
-     {     0.0f,      0.0f,      0.5f,      0.0f,      0.0f}};
-
-static const float R_BGG[5][5] =
-    {{     0.0f,      0.0f,     -1.0f,      0.0f,      0.0f},
-     {     0.0f,     -1.0f,      4.0f,     -1.0f,      0.0f},
-     {     0.5f,      0.0f,      5.0f,      0.0f,      0.5f},
-     {     0.0f,     -1.0f,      4.0f,     -1.0f,      0.0f},
-     {     0.0f,      0.0f,     -1.0f,      0.0f,      0.0f}};
-
-static const float R_BGB[5][5] =
-    {{     0.0f,      0.0f, -3.0f/2.0f,      0.0f,      0.0f},
-     {     0.0f,      2.0f,      0.0f,      2.0f,      0.0f},
-     {-3.0f/2.0f,      0.0f,      6.0f,      0.0f, -3.0f/2.0f},
-     {     0.0f,      2.0f,      0.0f,      2.0f,      0.0f},
-     {     0.0f,      0.0f, -3.0f/2.0f,      0.0f,      0.0f}};
-
-
-// Blue 
-//(the caption in the paper is wrong for this case:
-// "B row R column really means B row G column")
-#define B_BGG R_GRG
-#define B_GRG R_BGG
-#define B_GRR R_BGB
-
-// =====================================================================
-// Helper methods
-// =====================================================================
-
-
-/** Applies a 5x5 filter to monochrome image I (wrapping at the boundaries) */
-static uint8 applyFilter(const uint8*    I,
-			 int             x,
-			 int             y,
-			 int             w,
-			 int             h,
-			 const float     filter[5][5]) {
-    
-    debugAssert(isEven(w));
-    debugAssert(isEven(h));
-    
-    float sum = 0.0f;
-    float denom = 0.0f;
-    
-    for (int dy = 0; dy < 5; ++dy) {
-	int offset = ((y + dy + h - 2) % h) * w;
-    
-	for (int dx = 0; dx < 5; ++dx) {
-	    float f = filter[dy][dx];
-	    sum += f * I[((x + dx + w - 2) % w) + offset];
-	    denom += f;
-	}
-    }
-    
-    return (uint8)iClamp(iRound(sum / denom), 0, 255);
-}
-
-/** Helper method for Bayer grbg and bggr --> rgb8 */
-static void swapRedAndBlue(int N, Color3uint8* out) {
-    for (int i = N - 1; i >= 0; --i) {
-	uint8 tmp = out[i].r;
-	out[i].r = out[i].b;
-	out[i].b = tmp;
-    }
-}
-
-// RGB -> BAYER color space
-
-// =====================================================================
-// rgb8 --> bayer helpers
-// =====================================================================
-static void rgb8_to_bayer_rggb8(const int w, const int h, 
-				const uint8* src, uint8* dst) {
-    Color3uint8* srcColor = (Color3uint8*)src;
-    Color1uint8* dstColor = (Color1uint8*)dst;
-
-    // Top row pixels
-    for (int y = 0; y < h - 1; y += 2) {
-	int offset = y * w;
-
-	// Top left pixels
-	for(int x = 0; x < w - 1; x += 2) {
-	    dstColor[x + offset] = Color1(srcColor[x + offset].r);
-	}
-
-	// Top right pixels
-	for(int x = 1; x < w - 1; x += 2) {
-	    dstColor[x + offset] = Color1(srcColor[x + offset].g);
-	}
-    }
-
-    // Bottom row pixels
-    for (int y = 1; y < h - 1; y += 2) {
-	int offset = y * w;
-
-	// Bottom left pixels
-	for (int x = 0; x < w - 1; x += 2) {
-	    dstColor[x + offset] = Color1(srcColor[x + offset].g);
-	}
-
-	// Bottom right pixels
-	for (int x = 1; x < w - 1; x += 2) {
-	    dstColor[x + offset] = Color1(srcColor[x + offset].b);
-	}
-    }
-}
-
-
-static void rgb8_to_bayer_grbg8(const int w, const int h, 
-				const uint8* src, uint8* dst) {
-    Color3uint8* srcColor = (Color3uint8*)src;
-    Color1uint8* dstColor = (Color1uint8*)dst;
-
-    // Top row pixels
-    for (int y = 0; y < h - 1; y += 2) {
-	int offset = y * w;
-
-	// Top left pixels
-	for (int x = 0; x < w - 1; x += 2) {
-	    dstColor[x + offset] = Color1(srcColor[x + offset].g);
-	}
-
-	// Top right pixels
-	for (int x = 1; x < w - 1; x += 2) {
-	    dstColor[x + offset] = Color1(srcColor[x + offset].r);
-	}
-    }
-
-    // Bottom row pixels
-    for (int y = 1; y < h - 1; y += 2) {
-	int offset = y * w;
-
-	// Bottom left pixels
-	for (int x = 0; x < w - 1; x += 2) {
-	    dstColor[x + offset] = Color1(srcColor[x + offset].b);
-	}
-
-	// Bottom right pixels
-	for (int x = 1; x < w - 1; x += 2) {
-	    dstColor[x + offset] = Color1(srcColor[x + offset].g);
-	}
-    }
-}
-
-
-static void rgb8_to_bayer_bggr8(const int w, const int h, 
-				const uint8* src, uint8* dst) {
-    Color3uint8* srcColor = (Color3uint8*)src;
-    Color1uint8* dstColor = (Color1uint8*)dst;
-
-    // Top row pixels
-    for (int y = 0; y < h - 1; y += 2) {
-	int offset = y * w;
-
-	// Top left pixels
-	for (int x = 0; x < w - 1; x += 2) {
-	    dstColor[x + offset] = Color1(srcColor[x + offset].b);
-	}
-
-	// Top right pixels
-	for (int x = 1; x < w - 1; x += 2) {
-	    dstColor[x + offset] = Color1(srcColor[x + offset].g);
-	}
-    }
-
-    // Bottom row pixels
-    for (int y = 1; y < h - 1; y += 2) {
-	int offset = y * w;
-
-	// Bottom left pixels
-	for(int x = 0; x < w - 1; x += 2) {
-	    dstColor[x + offset] = Color1(srcColor[x + offset].g);
-	}
-
-	// Bottom right pixels
-	for(int x = 1; x < w - 1; x += 2) {
-	    dstColor[x + offset] = Color1(srcColor[x + offset].r);
-	}
-    }
-}
-
-
-static void rgb8_to_bayer_gbrg8(const int w, const int h, 
-				const uint8* src, uint8* dst) {
-    Color3uint8* srcColor = (Color3uint8*)src;
-    Color1uint8* dstColor = (Color1uint8*)dst;
-
-    // Top row pixels
-    for(int y = 0; y < h - 1; y += 2) {
-	int offset = y * w;
-
-	// Top left pixels
-	for(int x = 0; x < w - 1; x += 2) {
-	    dstColor[x + offset] = Color1(srcColor[x + offset].g);
-	}
-
-	// Top right pixels
-	for(int x = 1; x < w - 1; x += 2) {
-	    dstColor[x + offset] = Color1(srcColor[x + offset].b);
-	}
-    }
-
-    // Bottom row pixels
-    for(int y = 1; y < h - 1; y += 2) {
-	int offset = y * w;
-
-	// Bottom left pixels
-	for(int x = 0; x < w - 1; x += 2) {
-	    dstColor[x + offset] = Color1(srcColor[x + offset].r);
-	}
-
-	// Bottom right pixels
-	for(int x = 1; x < w - 1; x += 2) {
-	    dstColor[x + offset] = Color1(srcColor[x + offset].g);
-	}
-    }
-}
-
-// =====================================================================
-// rgba32f (-->rgb8) --> bayer converter implementations
-// =====================================================================
-static void rgba32f_to_bayer_rggb8(const Array& srcBytes, int srcWidth, int srcHeight, const ImageFormat* srcFormat, int srcRowPadBits, const Array& dstBytes, const ImageFormat* dstFormat, int dstRowPadBits, bool invertY, ImageFormat::BayerAlgorithm bayerAlg) {
-    Array tmp;
-    tmp.append(System::malloc(srcWidth * srcHeight * sizeof(Color3uint8)));
-
-    rgba32f_to_rgb8(srcBytes, srcWidth, srcHeight, ImageFormat::RGBA32F(), 0, tmp, ImageFormat::RGB8(), 0, invertY, bayerAlg);
-    rgb8_to_bayer_rggb8(srcWidth, srcHeight, static_cast(tmp[0]), static_cast(dstBytes[0]));
-
-    System::free(tmp[0]);
-}
-
-static void rgba32f_to_bayer_gbrg8(const Array& srcBytes, int srcWidth, int srcHeight, const ImageFormat* srcFormat, int srcRowPadBits, const Array& dstBytes, const ImageFormat* dstFormat, int dstRowPadBits, bool invertY, ImageFormat::BayerAlgorithm bayerAlg) {
-    Array tmp;
-    tmp.append(System::malloc(srcWidth * srcHeight * sizeof(Color3uint8)));
-
-    rgba32f_to_rgb8(srcBytes, srcWidth, srcHeight, ImageFormat::RGBA32F(), 0, tmp, ImageFormat::RGB8(), 0, invertY, bayerAlg);
-    rgb8_to_bayer_grbg8(srcWidth, srcHeight, static_cast(tmp[0]), static_cast(dstBytes[0]));
-
-    System::free(tmp[0]);
-}
-
-static void rgba32f_to_bayer_grbg8(const Array& srcBytes, int srcWidth, int srcHeight, const ImageFormat* srcFormat, int srcRowPadBits, const Array& dstBytes, const ImageFormat* dstFormat, int dstRowPadBits, bool invertY, ImageFormat::BayerAlgorithm bayerAlg) {
-    Array tmp;
-    tmp.append(System::malloc(srcWidth * srcHeight * sizeof(Color3uint8)));
-
-    rgba32f_to_rgb8(srcBytes, srcWidth, srcHeight, ImageFormat::RGBA32F(), 0, tmp, ImageFormat::RGB8(), 0, invertY, bayerAlg);
-    rgb8_to_bayer_gbrg8(srcWidth, srcHeight, static_cast(tmp[0]), static_cast(dstBytes[0]));
-
-    System::free(tmp[0]);
-}
-
-static void rgba32f_to_bayer_bggr8(const Array& srcBytes, int srcWidth, int srcHeight, const ImageFormat* srcFormat, int srcRowPadBits, const Array& dstBytes, const ImageFormat* dstFormat, int dstRowPadBits, bool invertY, ImageFormat::BayerAlgorithm bayerAlg) {
-    Array tmp;
-    tmp.append(System::malloc(srcWidth * srcHeight * sizeof(Color3uint8)));
-
-    rgba32f_to_rgb8(srcBytes, srcWidth, srcHeight, ImageFormat::RGBA32F(), 0, tmp, ImageFormat::RGB8(), 0, invertY, bayerAlg);
-    rgb8_to_bayer_bggr8(srcWidth, srcHeight, static_cast(tmp[0]), static_cast(dstBytes[0]));
-
-    System::free(tmp[0]);
-}
-
-// BAYER -> RGB color space
-
-// =====================================================================
-// bayer --> rgb8 helpers
-// =====================================================================
-static void bayer_rggb8_to_rgb8_mhc(int w, int h, 
-				    const uint8* in, uint8* _out) {
-    debugAssert(in != _out);
-
-    Color3uint8* out = (Color3uint8*)_out;
-
-    for (int y = 0; y < h; ++y) {
-
-	// Row beginning in the input array.
-	int offset = y * w;
-
-	// RG row
-	for (int x = 0; x < w; ++x, ++out) {
-	    // R pixel
-	    {
-		out->r = in[x + offset];
-		out->g = applyFilter(in, x, y, w, h, G_GRR);
-		out->b = applyFilter(in, x, y, w, h, B_GRR);
-	    }
-	    ++x; ++out;
-
-	    // G pixel
-	    {
-		out->r = applyFilter(in, x, y, w, h, R_GRG);
-		out->g = in[x + offset];
-		out->b = applyFilter(in, x, y, w, h, B_GRG);
-	    }
-	}
-
-	++y;
-	offset += w;
-
-	// GB row
-	for (int x = 0; x < w; ++x, ++out) {
-	    // G pixel
-	    {
-		out->r = applyFilter(in, x, y, w, h, R_BGG);
-		out->g = in[x + offset];
-		out->b = applyFilter(in, x, y, w, h, B_BGG);
-	    }
-	    ++x; ++out;
-
-	    // B pixel
-	    {
-		out->r = applyFilter(in, x, y, w, h, R_BGB);
-		out->g = applyFilter(in, x, y, w, h, G_BGB);
-		out->b = in[x + offset];
-	    }
-	}
-    }
-}
-
-
-
-static void bayer_gbrg8_to_rgb8_mhc(int w, int h, 
-				    const uint8* in, uint8* _out) {
-
-    debugAssert(in != _out);
-
-    Color3uint8* out = (Color3uint8*)_out;
-
-    for (int y = 0; y < h; ++y) {
-
-	// Row beginning in the input array.
-	int offset = y * w;
-
-	// GB row
-	for (int x = 0; x < w; ++x, ++out) {
-	    // G pixel
-	    {
-		out->r = applyFilter(in, x, y, w, h, R_BGG);
-		out->g = in[x + offset];
-		out->b = applyFilter(in, x, y, w, h, B_BGG);
-	    }
-	    ++x; ++out;
-
-	    // B pixel
-	    {
-		out->r = applyFilter(in, x, y, w, h, R_BGB);
-		out->g = applyFilter(in, x, y, w, h, G_BGB);
-		out->b = in[x + offset];
-	    }
-	}
-    }
-}
-
-
-static void bayer_grbg8_to_rgb8_mhc(int w, int h, 
-				    const uint8* in, uint8* _out) {
-    // Run the equivalent function for red
-    bayer_gbrg8_to_rgb8_mhc(w, h, in, _out);
-
-    // Now swap red and blue
-    swapRedAndBlue(w * h, (Color3uint8*)_out);
-}
-
-
-static void bayer_bggr8_to_rgb8_mhc(int w, int h, 
-				    const uint8* in, uint8* _out) {
-    // Run the equivalent function for red
-    bayer_rggb8_to_rgb8_mhc(w, h, in, _out);
-
-    // Now swap red and blue
-    swapRedAndBlue(w * h, (Color3uint8*)_out);
-}
-
-// =====================================================================
-// bayer (--> rgb8) --> rgba32f converter implementations
-// =====================================================================
-static void bayer_rggb8_to_rgba32f(const Array& srcBytes, int srcWidth, int srcHeight, const ImageFormat* srcFormat, int srcRowPadBits, const Array& dstBytes, const ImageFormat* dstFormat, int dstRowPadBits, bool invertY, ImageFormat::BayerAlgorithm bayerAlg) {
-    Array tmp;
-    tmp.append(System::malloc(srcWidth * srcHeight * sizeof(Color3uint8)));
-
-    bayer_rggb8_to_rgb8_mhc(srcWidth, srcHeight, static_cast(srcBytes[0]), static_cast(tmp[0]));
-    rgb8_to_rgba32f(reinterpret_cast&>(tmp), srcWidth, srcHeight, ImageFormat::RGB8(), 0, dstBytes, ImageFormat::RGBA32F(), 0, invertY, bayerAlg);
-
-    System::free(tmp[0]);
-}
-
-static void bayer_gbrg8_to_rgba32f(const Array& srcBytes, int srcWidth, int srcHeight, const ImageFormat* srcFormat, int srcRowPadBits, const Array& dstBytes, const ImageFormat* dstFormat, int dstRowPadBits, bool invertY, ImageFormat::BayerAlgorithm bayerAlg) {
-    Array tmp;
-    tmp.append(System::malloc(srcWidth * srcHeight * sizeof(Color3uint8)));
-
-    bayer_grbg8_to_rgb8_mhc(srcWidth, srcHeight, static_cast(srcBytes[0]), static_cast(tmp[0]));
-    rgb8_to_rgba32f(reinterpret_cast&>(tmp), srcWidth, srcHeight, ImageFormat::RGB8(), 0, dstBytes, ImageFormat::RGBA32F(), 0, invertY, bayerAlg);
-
-    System::free(tmp[0]);
-}
-
-static void bayer_grbg8_to_rgba32f(const Array& srcBytes, int srcWidth, int srcHeight, const ImageFormat* srcFormat, int srcRowPadBits, const Array& dstBytes, const ImageFormat* dstFormat, int dstRowPadBits, bool invertY, ImageFormat::BayerAlgorithm bayerAlg) {
-    Array tmp;
-    tmp.append(System::malloc(srcWidth * srcHeight * sizeof(Color3uint8)));
-
-    bayer_gbrg8_to_rgb8_mhc(srcWidth, srcHeight, static_cast(srcBytes[0]), static_cast(tmp[0]));
-    rgb8_to_rgba32f(reinterpret_cast&>(tmp), srcWidth, srcHeight, ImageFormat::RGB8(), 0, dstBytes, ImageFormat::RGBA32F(), 0, invertY, bayerAlg);
-
-    System::free(tmp[0]);
-}
-
-static void bayer_bggr8_to_rgba32f(const Array& srcBytes, int srcWidth, int srcHeight, const ImageFormat* srcFormat, int srcRowPadBits, const Array& dstBytes, const ImageFormat* dstFormat, int dstRowPadBits, bool invertY, ImageFormat::BayerAlgorithm bayerAlg) {
-    Array tmp;
-    tmp.append(System::malloc(srcWidth * srcHeight * sizeof(Color3uint8)));
-
-    bayer_bggr8_to_rgb8_mhc(srcWidth, srcHeight, static_cast(srcBytes[0]), static_cast(tmp[0]));
-    rgb8_to_rgba32f(reinterpret_cast&>(tmp), srcWidth, srcHeight, ImageFormat::RGB8(), 0, dstBytes, ImageFormat::RGBA32F(), 0, invertY, bayerAlg);
-
-    System::free(tmp[0]);
-}
-
-
-
-
-
-    // TODO: The following region is commented out because so far
-    // those conversions are not used anywhere else. Until it is
-    // decided that such conversions are not needed, this region
-    // remains commented out.
-
-
-// // =====================================================================
-// // bayer --> bgr8 
-// // =====================================================================
-
-// static void bayer_rggb8_to_bgr8_mhc(int w, int h, 
-// 				    const uint8* in, uint8* _out) {
-//     debugAssert(in != _out);
-
-//     Color3uint8* out = (Color3uint8*)_out;
-
-//     for (int y = 0; y < h; ++y) {
-
-// 	// Row beginning in the input array.
-// 	int offset = y * w;
-
-// 	// RG row
-// 	for (int x = 0; x < w; ++x, ++out) {
-// 	    // R pixel
-// 	    {
-// 		out->b = in[x + offset];
-// 		out->g = applyFilter(in, x, y, w, h, G_GRR);
-// 		out->r = applyFilter(in, x, y, w, h, B_GRR);
-// 	    }
-// 	    ++x; ++out;
-
-// 	    // G pixel
-// 	    {
-// 		out->b = applyFilter(in, x, y, w, h, R_GRG);
-// 		out->g = in[x + offset];
-// 		out->r = applyFilter(in, x, y, w, h, B_GRG);
-// 	    }
-// 	}
-
-// 	++y;
-// 	offset += w;
-
-// 	// GB row
-// 	for (int x = 0; x < w; ++x, ++out) {
-// 	    // G pixel
-// 	    {
-// 		out->b = applyFilter(in, x, y, w, h, R_BGG);
-// 		out->g = in[x + offset];
-// 		out->r = applyFilter(in, x, y, w, h, B_BGG);
-// 	    }
-// 	    ++x; ++out;
-
-// 	    // B pixel
-// 	    {
-// 		out->b = applyFilter(in, x, y, w, h, R_BGB);
-// 		out->g = applyFilter(in, x, y, w, h, G_BGB);
-// 		out->r = in[x + offset];
-// 	    }
-// 	}
-//     }
-// }
-
-
-// static void bayer_gbrg8_to_bgr8_mhc(int w, int h, 
-// 				    const uint8* in, uint8* _out) {
-
-//     debugAssert(in != _out);
-
-//     Color3uint8* out = (Color3uint8*)_out;
-
-//     for (int y = 0; y < h; ++y) {
-
-// 	// Row beginning in the input array.
-// 	int offset = y * w;
-
-// 	// GB row
-// 	for (int x = 0; x < srcWidth; ++x, ++out) {
-// 	    // G pixel
-// 	    {
-// 		out->b = applyFilter(in, x, y, w, h, R_BGG);
-// 		out->g = in[x + offset];
-// 		out->r = applyFilter(in, x, y, w, h, B_BGG);
-// 	    }
-// 	    ++x; ++out;
-
-// 	    // B pixel
-// 	    {
-// 		out->b = applyFilter(in, x, y, w, h, R_BGB);
-// 		out->g = applyFilter(in, x, y, w, h, G_BGB);
-// 		out->r = in[x + offset];
-// 	    }
-// 	}
-//     }
-// }
-
-// static void bayer_grbg8_to_bgr8_mhc(int w, int h, 
-// 				    const uint8* in, uint8* _out) {
-//     // Run the equivalent function for red
-//     bayer_gbrg8_to_bgr8_mhc(w, h, in, _out);
-
-//     // Now swap red and blue
-//     swapRedAndBlue(srcWidth * h, (Color3uint8*)_out);
-// }
-
-// static void bayer_bggr8_to_bgr8_mhc(int w, int h, 
-// 				    const uint8* in, uint8* _out) {
-//     // Run the equivalent function for red
-//     bayer_rggb8_to_bgr8_mhc(w, h, in, _out);
-
-//     // Now swap red and blue
-//     swapRedAndBlue(srcWidth * h, (Color3uint8*)_out);
-// }
-
-
-
-///////////////////////////////////////////////////
-
-} // namespace G3D
diff --git a/externals/g3dlite/G3D.lib/source/Line.cpp b/externals/g3dlite/G3D.lib/source/Line.cpp
deleted file mode 100644
index 195ae7197f2..00000000000
--- a/externals/g3dlite/G3D.lib/source/Line.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
-  @file Line.cpp
- 
-  Line class
- 
-  @maintainer Morgan McGuire, graphics3d.com
- 
-  @created 2001-06-02
-  @edited  2006-01-28
- */
-
-#include "G3D/Line.h"
-#include "G3D/Plane.h"
-
-namespace G3D {
-
-Vector3 Line::intersection(const Plane& plane) const {
-    float d;
-    Vector3 normal = plane.normal();
-    plane.getEquation(normal, d);
-    float rate = _direction.dot(normal);
-
-    if (rate == 0) {
-
-        return Vector3::inf();
-
-    } else {
-        float t = -(d + _point.dot(normal)) / rate;
-
-        return _point + _direction * t;
-    }
-}
-
-
-Line::Line(class BinaryInput& b) {
-	deserialize(b);
-}
-
-
-void Line::serialize(class BinaryOutput& b) const {
-	_point.serialize(b);
-	_direction.serialize(b);
-}
-
-
-void Line::deserialize(class BinaryInput& b) {
-	_point.deserialize(b);
-	_direction.deserialize(b);
-}
-
-
-Vector3 Line::closestPoint(const Vector3& pt) const {
-    float t = _direction.dot(pt - _point);
-    return _point + _direction * t;
-}
-
-
-Vector3 Line::point() const {
-    return _point;
-}
-
-
-Vector3 Line::direction() const {
-    return _direction;
-}
-
-
-Vector3 Line::closestPoint(const Line& B, float& minDist) const {
-    const Vector3& P1 = _point;
-    const Vector3& U1 = _direction;
-
-    Vector3 P2 = B.point();
-    Vector3 U2 = B.direction();
-    
-    const Vector3& P21 = P2 - P1;
-    const Vector3& M = U2.cross(U1);
-    float m2 = M.length();
-
-    Vector3 R = P21.cross(M) / m2;
-    
-    float t1 = R.dot(U2);
-    
-    minDist = abs(P21.dot(M)) / sqrt(m2);
-
-    return P1 + t1 * U1;
-}
-
-}
-
diff --git a/externals/g3dlite/G3D.lib/source/LineSegment.cpp b/externals/g3dlite/G3D.lib/source/LineSegment.cpp
deleted file mode 100644
index 44dfcb48bc1..00000000000
--- a/externals/g3dlite/G3D.lib/source/LineSegment.cpp
+++ /dev/null
@@ -1,236 +0,0 @@
-/**
- @file LineSegment.cpp
-  
- @maintainer Morgan McGuire, matrix@graphics3d.com
- 
- @created 2003-02-08
- @edited  2008-02-02
- */
-
-#include "G3D/platform.h"
-#include "G3D/LineSegment.h"
-#include "G3D/Sphere.h"
-#include "G3D/debug.h"
-
-namespace G3D {
-
-
-Vector3 LineSegment::closestPoint(const Vector3& p) const {
-
-    // The vector from the end of the capsule to the point in question.
-    Vector3 v(p - _point);
-
-    // Projection of v onto the line segment scaled by 
-    // the length of direction.
-    float t = direction.dot(v);
-
-    // Avoid some square roots.  Derivation:
-    //    t/direction.length() <= direction.length()
-    //      t <= direction.squaredLength()
-
-    if ((t >= 0) && (t <= direction.squaredMagnitude())) {
-    
-        // The point falls within the segment.  Normalize direction,
-        // divide t by the length of direction.
-        return _point + direction * t / direction.squaredMagnitude();
-    
-    } else {
-
-        // The point does not fall within the segment; see which end is closer.
-
-        // Distance from 0, squared
-        float d0Squared = v.squaredMagnitude();
-
-        // Distance from 1, squared
-        float d1Squared = (v - direction).squaredMagnitude();
-
-        if (d0Squared < d1Squared) {
-
-            // Point 0 is closer
-            return _point;
-
-        } else {
-
-            // Point 1 is closer
-            return _point + direction;
-        
-        }
-    }
-
-}
-
-Vector3 LineSegment::point(int i) const {
-    switch (i) {
-    case 0:
-        return _point;
-
-    case 1:
-        return _point + direction;
-
-    default:
-        debugAssertM(i == 0 || i == 1, "Argument to point must be 0 or 1");
-        return _point;
-    }
-}
-
-
-bool LineSegment::intersectsSolidSphere(const class Sphere& s) const {
-    return distanceSquared(s.center) <= square(s.radius);
-}
-
-
-LineSegment::LineSegment(class BinaryInput& b) {
-	deserialize(b);
-}
-
-
-void LineSegment::serialize(class BinaryOutput& b) const {
-	_point.serialize(b);
-	direction.serialize(b);
-}
-
-
-void LineSegment::deserialize(class BinaryInput& b) {
-	_point.deserialize(b);
-	direction.deserialize(b);
-}
-
-
-Vector3 LineSegment::randomPoint() const {
-    return _point + uniformRandom(0, 1) * direction;
-}
-
-
-/////////////////////////////////////////////////////////////////////////////////////
-
-LineSegment2D LineSegment2D::fromTwoPoints(const Vector2& p0, const Vector2& p1) {
-    LineSegment2D s;
-    s.m_origin      = p0;
-    s.m_direction   = p1 - p0;
-    s.m_length      = s.m_direction.length();
-    return s;
-}
-
-
-Vector2 LineSegment2D::point(int i) const {
-    debugAssert(i == 0 || i == 1);
-    if (i == 0) {
-        return m_origin;
-    } else {
-        return m_direction + m_origin;
-    }
-}
-
-
-Vector2 LineSegment2D::closestPoint(const Vector2& Q) const {
-    // Two constants that appear in the result
-    const Vector2 k1(m_origin - Q);
-    const Vector2& k2 = m_direction;
-    
-    if (fuzzyEq(m_length, 0)) {
-        // This line segment has no length
-        return m_origin;
-    }
-
-    // Time [0, 1] at which we hit the closest point travelling from p0 to p1.
-    // Derivation can be obtained by minimizing the expression
-    //     ||P0 + (P1 - P0)t - Q||.
-    const float t = -k1.dot(k2) / (m_length * m_length);
-
-    if (t < 0) {
-        // Clipped to low end point
-        return m_origin;
-    } else if (t > 1) {
-        // Clipped to high end point
-        return m_origin + m_direction;
-    } else {
-        // Subsitute into the line equation to find 
-        // the point on the segment.
-        return m_origin + k2 * t;
-    }
-}
-
-
-float LineSegment2D::distance(const Vector2& p) const {
-    Vector2 closest = closestPoint(p);
-    return (closest - p).length();
-}
-
-
-float LineSegment2D::length() const {
-    return m_length;
-}
-
-
-Vector2 LineSegment2D::intersection(const LineSegment2D& other) const {
-
-    if ((m_origin == other.m_origin) ||
-        (m_origin == other.m_origin + other.m_direction)) {
-        return m_origin;
-    }
-
-    if (m_origin + m_direction == other.m_origin) {
-        return other.m_origin;
-    }
-
-    // Note: Now that we've checked the endpoints, all other parallel lines can now be assumed
-    // to not intersect (within numerical precision)
-
-    Vector2 dir1    = m_direction;
-    Vector2 dir2    = other.m_direction;
-    Vector2 origin1 = m_origin;
-    Vector2 origin2 = other.m_origin;
-
-    if (dir1.x == 0) {
-        // Avoid an upcoming divide by zero
-        dir1 = dir1.yx();
-        dir2 = dir2.yx();
-        origin1 = origin1.yx();
-        origin2 = origin2.yx();
-    }
-
-    // t1 = ((other.m_origin.x - m_origin.x) + other.m_direction.x * t2) / m_direction.x
-    //
-    // ((other.m_origin.x - m_origin.x) + other.m_direction.x * t2) * m_direction.y / m_direction.x = 
-    //        (other.m_origin.y - m_origin.y) + other.m_direction.y * t2
-    //
-    // m = m_direction.y / m_direction.x
-    // d = other.m_origin - m_origin
-    //
-    // (d.x + other.m_direction.x * t2) * m = d.y + other.m_direction.y * t2
-    //
-    // d.x * m + other.m_direction.x * m * t2 = d.y + other.m_direction.y * t2
-    //
-    // d.x * m - d.y  = (other.m_direction.y - other.m_direction.x * m) * t2
-    //
-    // (d.x * m - d.y) / (other.m_direction.y - other.m_direction.x * m)  = t2
-    //
-
-    Vector2 d = origin2 - origin1;
-    float m = dir1.y / dir1.x;
-
-    float t2 = (d.x * m - d.y) / (dir2.y - dir2.x * m);
-    if (! isFinite(t2)) {
-        // Parallel lines: no intersection
-        return Vector2::inf();
-    }
-
-    if ((t2 < 0.0f) || (t2 > 1.0f)) {
-        // Intersection occurs past the end of the line segments
-        return Vector2::inf();
-    }
-
-    float t1 = (d.x + dir2.x * t2) / dir1.x;
-    if ((t1 < 0.0f) || (t1 > 1.0f)) {
-        // Intersection occurs past the end of the line segments
-        return Vector2::inf();
-    }
-
-    // Return the intersection point (computed from non-transposed 
-    // variables even if we flipped above)
-    return m_origin + m_direction * t1;
-    
-}
-
-}
-
diff --git a/externals/g3dlite/G3D.lib/source/Log.cpp b/externals/g3dlite/G3D.lib/source/Log.cpp
deleted file mode 100644
index 13cea7a31f0..00000000000
--- a/externals/g3dlite/G3D.lib/source/Log.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-/**
-  @file Log.cpp
-
-  @maintainer Morgan McGuire, morgan@graphics3d.com
-  @created 2001-08-04
-  @edited  2005-07-01
- */
-
-#include "G3D/platform.h"
-#include "G3D/Log.h"
-#include "G3D/format.h"
-#include "G3D/Array.h"
-#include "G3D/fileutils.h"
-#include 
-
-#ifdef G3D_WIN32
-    #include 
-#else
-    #include 
-#endif
-
-namespace G3D {
-
-void logPrintf(const char* fmt, ...) {
-	va_list arg_list;
-	va_start(arg_list, fmt);
-    Log::common()->vprintf(fmt, arg_list);
-    va_end(arg_list);
-}
-
-
-Log* Log::commonLog = NULL;
-
-Log::Log(const std::string& filename, int stripFromStackBottom) : 
-    stripFromStackBottom(stripFromStackBottom) {
-
-    this->filename = filename;
-
-    logFile = fopen(filename.c_str(), "w");
-
-    if (logFile == NULL) {
-        std::string drive, base, ext;
-        Array path;
-        parseFilename(filename, drive, path, base, ext);
-        std::string logName = base + ((ext != "") ? ("." + ext) : ""); 
-
-        // Write time is greater than 1ms.  This may be a network drive.... try another file.
-        #ifdef G3D_WIN32
-           logName = std::string(std::getenv("TEMP")) + logName;
-        #else
-            logName = std::string("/tmp/") + logName;
-        #endif
-
-        logFile = fopen(logName.c_str(), "w");
-    }
-
-    // Turn off buffering.
-    setvbuf(logFile, NULL, _IONBF, 0);
-
-    fprintf(logFile, "Application Log\n");
-    time_t t;
-    time(&t);
-    fprintf(logFile, "Start: %s\n", ctime(&t));
-    fflush(logFile);
-
-    if (commonLog == NULL) {
-        commonLog = this;
-    }
-}
-
-
-Log::~Log() {
-    section("Shutdown");
-    println("Closing log file");
-    
-    // Make sure we don't leave a dangling pointer
-    if (Log::commonLog == this) {
-        Log::commonLog = NULL;
-    }
-
-    fclose(logFile);
-}
-
-
-FILE* Log::getFile() const {
-    return logFile;
-}
-
-Log* Log::common() {
-    if (commonLog == NULL) {
-        commonLog = new Log();
-    }
-    return commonLog;
-}
-
-
-std::string Log::getCommonLogFilename() {
-    return common()->filename;
-}
-
-
-void Log::section(const std::string& s) {
-    fprintf(logFile, "_____________________________________________________\n");
-    fprintf(logFile, "\n    ###    %s    ###\n\n", s.c_str());
-}
-
-
-void __cdecl Log::printf(const char* fmt, ...) {
-    printHeader();
-
-	va_list arg_list;
-	va_start(arg_list, fmt);
-    print(vformat(fmt, arg_list));
-    va_end(arg_list);
-}
-
-
-void __cdecl Log::vprintf(const char* fmt, va_list argPtr) {
-    vfprintf(logFile, fmt, argPtr);
-}
-
-
-void Log::print(const std::string& s) {
-    printHeader();
-    fprintf(logFile, "%s", s.c_str());
-}
-
-
-void Log::println(const std::string& s) {
-    printHeader();
-    fprintf(logFile, "%s\n", s.c_str());
-}
-
-
-void Log::printHeader() {
-    time_t t;
-    if (time(&t) != ((time_t)-1)) {
-        /*
-        char buf[32];
-        strftime(buf, 32, "[%H:%M:%S]", localtime(&t));
-    
-         Removed because this doesn't work on SDL threads.
-
-        #ifdef _DEBUG
-            std::string bt = getBacktrace(15, 2, stripFromStackBottom);
-            fprintf(logFile, "\n %s %s\n\n", buf, bt.c_str());
-        #endif
-
-        fprintf(logFile, "\n %s \n", buf);
-        */
-
-    } else {
-        println("[Error getting time]");
-    }
-}
-
-}
diff --git a/externals/g3dlite/G3D.lib/source/Matrix.cpp b/externals/g3dlite/G3D.lib/source/Matrix.cpp
deleted file mode 100644
index 0c6db214543..00000000000
--- a/externals/g3dlite/G3D.lib/source/Matrix.cpp
+++ /dev/null
@@ -1,1801 +0,0 @@
-/**
- @file Matrix.cpp
- @author Morgan McGuire, matrix@graphics3d.com
- */
-#include "G3D/Matrix.h"
-#include "G3D/TextOutput.h"
-
-static inline G3D::Matrix::T negate(G3D::Matrix::T x) {
-    return -x;
-}
-
-namespace G3D {
-
-int Matrix::debugNumCopyOps  = 0;
-int Matrix::debugNumAllocOps = 0;
-
-void Matrix::serialize(TextOutput& t) const {
-    t.writeSymbol("%");
-    t.writeNumber(rows());
-    t.writeSymbol("x");
-    t.writeNumber(cols());
-    t.pushIndent();
-    t.writeNewline();
-
-    t.writeSymbol("[");
-    for (int r = 0; r < rows(); ++r) {
-        for (int c = 0; c < cols(); ++c) {
-            t.writeNumber(impl->get(r, c));
-            if (c < cols() - 1) {
-                t.writeSymbol(",");
-            } else {
-                if (r < rows() - 1) {
-                    t.writeSymbol(";");
-                    t.writeNewline();
-                }
-            }
-        }
-    }
-    t.writeSymbol("]");
-    t.popIndent();
-    t.writeNewline();
-}
-
-
-std::string Matrix::toString(const std::string& name) const {
-	std::string s;
-
-    if (name != "") {
-        s += format("%s = \n", name.c_str());
-    }
-
-	s += "[";
-    for (int r = 0; r < rows(); ++r) {
-        for (int c = 0; c < cols(); ++c) {
-            double v = impl->get(r, c);
-
-			if (::fabs(v) < 0.00001) {
-				// Don't print "negative zero"
-                s += format("% 10.04g", 0.0);
-			} else if (v == iRound(v)) {
-                // Print integers nicely
-                s += format("% 10.04g", v);
-            } else {
-                s += format("% 10.04f", v);
-            }
-
-            if (c < cols() - 1) {
-                s += ",";
-            } else if (r < rows() - 1) {
-                s += ";\n ";
-			} else {
-				s += "]\n";
-			}
-        }
-    }
-	return s;
-}
-
-
-#define INPLACE(OP)\
-    ImplRef A = impl;\
-\
-    if (! A.isLastReference()) {\
-        impl = new Impl(A->R, A->C);\
-    }\
-\
-    A->OP(B, *impl);
-
-Matrix& Matrix::operator*=(const T& B) {
-    INPLACE(mul)
-    return *this;
-}
-
-
-Matrix& Matrix::operator-=(const T& B) {
-    INPLACE(sub)
-    return *this;
-}
-
-
-Matrix& Matrix::operator+=(const T& B) {
-    INPLACE(add)
-    return *this;
-}
-
-
-Matrix& Matrix::operator/=(const T& B) {
-    INPLACE(div)
-    return *this;
-}
-
-
-Matrix& Matrix::operator*=(const Matrix& B) {
-    // We can't optimize this one
-    *this = *this * B;
-    return *this;
-}
-
-
-Matrix& Matrix::operator-=(const Matrix& _B) {
-    const Impl& B = *_B.impl;
-    INPLACE(sub)
-    return *this;
-}
-
-
-Matrix& Matrix::operator+=(const Matrix& _B) {
-    const Impl& B = *_B.impl;
-    INPLACE(add)
-    return *this;
-}
-
-
-void Matrix::arrayMulInPlace(const Matrix& _B) {
-    const Impl& B = *_B.impl;
-    INPLACE(arrayMul)
-}
-
-
-void Matrix::arrayDivInPlace(const Matrix& _B) {
-    const Impl& B = *_B.impl;
-    INPLACE(arrayDiv)
-}
-
-#undef INPLACE
-
-Matrix Matrix::fromDiagonal(const Matrix& d) {
-    debugAssert((d.rows() == 1) || (d.cols() == 1));
-
-    int n = d.numElements();
-    Matrix D = zero(n, n);
-    for (int i = 0; i < n; ++i) {
-        D.set(i, i, d.impl->data[i]);
-    }
-
-    return D;
-}
-
-void Matrix::set(int r, int c, T v) {
-    if (! impl.isLastReference()) {
-        // Copy the data before mutating; this object is shared
-        impl = new Impl(*impl);
-    }
-    impl->set(r, c, v);
-}
-
-
-void Matrix::setRow(int r, const Matrix& vec) {
-    debugAssertM(vec.cols() == cols(),
-        "A row must be set to a vector of the same size.");
-    debugAssertM(vec.rows() == 1,
-        "A row must be set to a row vector.");
-
-    debugAssert(r >= 0);
-    debugAssert(r < rows());
-
-    if (! impl.isLastReference()) {
-        // Copy the data before mutating; this object is shared
-        impl = new Impl(*impl);
-    }
-    impl->setRow(r, vec.impl->data);
-}
-
-
-void Matrix::setCol(int c, const Matrix& vec) {
-    debugAssertM(vec.rows() == rows(),
-        "A column must be set to a vector of the same size.");
-    debugAssertM(vec.cols() == 1,
-        "A column must be set to a column vector.");
-
-    debugAssert(c >= 0);
-
-    debugAssert(c < cols());
-
-    if (! impl.isLastReference()) {
-        // Copy the data before mutating; this object is shared
-        impl = new Impl(*impl);
-    }
-    impl->setCol(c, vec.impl->data);
-}
-
-
-Matrix::T Matrix::get(int r, int c) const {
-    return impl->get(r, c);
-}
-
-
-Matrix Matrix::row(int r) const {
-    debugAssert(r >= 0);
-    debugAssert(r < rows());
-    Matrix out(1, cols());
-    out.impl->setRow(1, impl->elt[r]);
-    return out;
-}
-
-
-Matrix Matrix::col(int c) const {
-    debugAssert(c >= 0);
-    debugAssert(c < cols());
-    Matrix out(rows(), 1);
-
-    T* outData = out.impl->data;
-    // Get a pointer to the first element in the column
-    const T* inElt = &(impl->elt[0][c]);
-    int R = rows();
-    int C = cols();
-    for (int r = 0; r < R; ++r) {
-        outData[r] = *inElt;
-        // Skip around to the next row
-        inElt += C;
-    }
-
-    return out;
-}
-
-
-Matrix Matrix::zero(int R, int C) {
-    Impl* A = new Impl(R, C);
-    A->setZero();
-    return Matrix(A);
-}
-
-
-Matrix Matrix::one(int R, int C) {
-    Impl* A = new Impl(R, C);
-    for (int i = R * C - 1; i >= 0; --i) {
-        A->data[i] = 1.0;
-    }
-    return Matrix(A);
-}
-
-
-Matrix Matrix::random(int R, int C) {
-    Impl* A = new Impl(R, C);
-    for (int i = R * C - 1; i >= 0; --i) {
-        A->data[i] = G3D::uniformRandom(0.0, 1.0);
-    }
-    return Matrix(A);
-}
-
-
-Matrix Matrix::identity(int N) {
-    Impl* m = new Impl(N, N);
-    m->setZero();
-    for (int i = 0; i < N; ++i) {
-        m->elt[i][i] = 1.0;
-    }
-    return Matrix(m);
-}
-
-
-// Implement an explicit-output unary method by trampolining to the impl
-#define TRAMPOLINE_EXPLICIT_1(method)\
-void Matrix::method(Matrix& out) const {\
-    if ((out.impl == impl) && impl.isLastReference()) {\
-        impl->method(*out.impl);\
-    } else {\
-        out = this->method();\
-    }\
-}
-
-TRAMPOLINE_EXPLICIT_1(abs)
-TRAMPOLINE_EXPLICIT_1(negate)
-TRAMPOLINE_EXPLICIT_1(arrayLog)
-TRAMPOLINE_EXPLICIT_1(arrayExp)
-TRAMPOLINE_EXPLICIT_1(arrayCos)
-TRAMPOLINE_EXPLICIT_1(arraySin)
-
-void Matrix::mulRow(int r, const T& v) {
-    debugAssert(r >= 0 && r < rows());
-
-    if (! impl.isLastReference()) {
-        impl = new Impl(*impl);
-    }
-
-    impl->mulRow(r, v);
-}
-
-
-void Matrix::transpose(Matrix& out) const {
-    if ((out.impl == impl) && impl.isLastReference() && (impl->R == impl->C)) {
-        // In place
-        impl->transpose(*out.impl);
-    } else {
-        out = this->transpose();
-    }
-}
-
-
-Matrix3 Matrix::toMatrix3() const {
-    debugAssert(impl->R == 3);
-    debugAssert(impl->C == 3);
-    return Matrix3(
-        impl->get(0,0), impl->get(0,1), impl->get(0,2),
-        impl->get(1,0), impl->get(1,1), impl->get(1,2),
-        impl->get(2,0), impl->get(2,1), impl->get(2,2));
-}
-
-
-Matrix4 Matrix::toMatrix4() const {
-    debugAssert(impl->R == 4);
-    debugAssert(impl->C == 4);
-    return Matrix4(
-        impl->get(0,0), impl->get(0,1), impl->get(0,2), impl->get(0,3),
-        impl->get(1,0), impl->get(1,1), impl->get(1,2), impl->get(1,3),
-        impl->get(2,0), impl->get(2,1), impl->get(2,2), impl->get(2,3),
-        impl->get(3,0), impl->get(3,1), impl->get(3,2), impl->get(3,3));
-}
-
-
-Vector2 Matrix::toVector2() const {
-    debugAssert(impl->R * impl->C == 2);
-    if (impl->R > impl->C) {
-        return Vector2(impl->get(0,0), impl->get(1,0));
-    } else {
-        return Vector2(impl->get(0,0), impl->get(0,1));
-    }
-}
-
-
-Vector3 Matrix::toVector3() const {
-    debugAssert(impl->R * impl->C == 3);
-    if (impl->R > impl->C) {
-        return Vector3(impl->get(0,0), impl->get(1,0), impl->get(2, 0));
-    } else {
-        return Vector3(impl->get(0,0), impl->get(0,1), impl->get(0, 2));
-    }
-}
-
-
-Vector4 Matrix::toVector4() const {
-    debugAssert(
-        ((impl->R == 4) && (impl->C == 1)) || 
-        ((impl->R == 1) && (impl->C == 4)));
-    
-    if (impl->R > impl->C) {
-        return Vector4(impl->get(0,0), impl->get(1,0), impl->get(2, 0), impl->get(3,0));
-    } else {
-        return Vector4(impl->get(0,0), impl->get(0,1), impl->get(0, 2), impl->get(0,3));
-    }
-}
-
-
-void Matrix::swapRows(int r0, int r1) {
-    debugAssert(r0 >= 0 && r0 < rows());
-    debugAssert(r1 >= 0 && r1 < rows());
-
-    if (r0 == r1) {
-        return;
-    }
-
-    if (! impl.isLastReference()) {
-        impl = new Impl(*impl);
-    }
-
-    impl->swapRows(r0, r1);
-}
-
-
-void Matrix::swapAndNegateCols(int c0, int c1) {
-    debugAssert(c0 >= 0 && c0 < cols());
-    debugAssert(c1 >= 0 && c1 < cols());
-
-    if (c0 == c1) {
-        return;
-    }
-
-    if (! impl.isLastReference()) {
-        impl = new Impl(*impl);
-    }
-
-    impl->swapAndNegateCols(c0, c1);
-}
-
-Matrix Matrix::subMatrix(int r1, int r2, int c1, int c2) const {
-    debugAssert(r2>=r1);
-    debugAssert(c2>=c1);
-    debugAssert(c2=0);
-    debugAssert(c1>=0);
-
-    Matrix X(r2 - r1 + 1, c2 - c1 + 1);
-
-    for (int r = 0; r < X.rows(); ++r) {
-        for (int c = 0; c < X.cols(); ++c) {
-            X.set(r, c, get(r + r1, c + c1));
-        }
-    }
-
-    return X;
-}
-
-
-bool Matrix::anyNonZero() const {
-    return impl->anyNonZero();
-}
-
-
-bool Matrix::allNonZero() const {
-    return impl->allNonZero();
-}
-
-
-void Matrix::svd(Matrix& U, Array& d, Matrix& V, bool sort) const {
-    debugAssert(rows() >= cols());
-    debugAssertM(&U != &V, "Arguments to SVD must be different matrices");
-    debugAssertM(&U != this, "Arguments to SVD must be different matrices");
-    debugAssertM(&V != this, "Arguments to SVD must be different matrices");
-
-    int R = rows();
-    int C = cols();
-
-    // Make sure we don't overwrite a shared matrix
-    if (! V.impl.isLastReference()) {
-        V = Matrix::zero(C, C);
-    } else {
-        V.impl->setSize(C, C);
-    }
-
-    if (&U != this || ! impl.isLastReference()) {
-        // Make a copy of this for in-place SVD
-        U.impl = new Impl(*impl);
-    }
-
-    d.resize(C);
-    const char* ret = svdCore(U.impl->elt, R, C, d.getCArray(), V.impl->elt);
-
-    debugAssertM(ret == NULL, ret);
-    (void)ret;
-
-    if (sort) {
-        // Sort the singular values from greatest to least
-
-        Array rank(C);
-        for (int c = 0; c < C; ++c) {
-            rank[c].col   = c;
-            rank[c].value = d[c];
-        }
-
-        rank.sort(SORT_INCREASING);
-
-        Matrix Uold = U;
-        Matrix Vold = V;
-
-        U = Matrix(U.rows(), U.cols());
-        V = Matrix(V.rows(), V.cols());
-
-        // Now permute U, d, and V appropriately
-        for (int c0 = 0; c0 < C; ++c0) {
-            const int c1 = rank[c0].col;
-
-            d[c0] = rank[c0].value;
-            U.setCol(c0, Uold.col(c1));
-            V.setCol(c0, Vold.col(c1));
-        }
-
-    }
-}
-
-
-#define COMPARE_SCALAR(OP)\
-Matrix Matrix::operator OP (const T& scalar) const {\
-    int R = rows();\
-    int C = cols();\
-    int N = R * C;\
-    Matrix out = Matrix::zero(R, C);\
-\
-    const T* raw = impl->data;\
-    T* outRaw = out.impl->data;\
-    for (int i = 0; i < N; ++i) {\
-        outRaw[i] = raw[i] OP scalar;\
-    }\
-\
-    return out;\
-}
-
-COMPARE_SCALAR(<)
-COMPARE_SCALAR(<=)
-COMPARE_SCALAR(>)
-COMPARE_SCALAR(>=)
-COMPARE_SCALAR(==)
-COMPARE_SCALAR(!=)
-
-#undef COMPARE_SCALAR
-
-double Matrix::normSquared() const {
-    int R = rows();
-    int C = cols();
-    int N = R * C;
-
-    double sum = 0.0;
-
-    const T* raw = impl->data;
-    for (int i = 0; i < N; ++i) {
-        sum += square(raw[i]);
-    }
-
-    return sum;
-}
-
-double Matrix::norm() const {
-    return sqrt(normSquared());
-}
-
-///////////////////////////////////////////////////////////
-
-Matrix::Impl::Impl(const Matrix3& M) : elt(NULL), data(NULL), R(0), C(0), dataSize(0){
-    setSize(3, 3);
-    for (int r = 0; r < 3; ++r) {
-        for (int c = 0; c < 3; ++c) {
-            set(r, c, M[r][c]);
-        }
-    }
-
-}
-
-
-Matrix::Impl::Impl(const Matrix4& M): elt(NULL), data(NULL), R(0), C(0), dataSize(0) {
-    setSize(4, 4);
-    for (int r = 0; r < 4; ++r) {
-        for (int c = 0; c < 4; ++c) {
-            set(r, c, M[r][c]);
-        }
-    }
-}
-
-
-void Matrix::Impl::setSize(int newRows, int newCols) {
-    if ((R == newRows) && (C == newCols)) {
-        // Nothing to do
-        return;
-    }
-
-    int newSize = newRows * newCols;
-
-    R = newRows; C = newCols;
-
-    // Only allocate if we need more space
-    // or the size difference is ridiculous
-    if ((newSize > dataSize) || (newSize < dataSize / 4)) {
-        System::alignedFree(data);
-        data = (float*)System::alignedMalloc(R * C * sizeof(T), 16);
-        ++Matrix::debugNumAllocOps;
-        dataSize = newSize;
-    }
-
-    // Construct the row pointers
-    //delete[] elt;
-    System::free(elt);
-    elt = (T**)System::malloc(R * sizeof(T*));// new T*[R];
-
-    for (int r = 0; r < R; ++ r) {
-        elt[r] = data + r * C;
-    }
-}
-
-
-Matrix::Impl::~Impl() {
-    //delete[] elt;
-    System::free(elt);
-    System::alignedFree(data);
-}
-
-
-Matrix::Impl& Matrix::Impl::operator=(const Impl& m) {
-    setSize(m.R, m.C);
-    System::memcpy(data, m.data, R * C * sizeof(T));
-    ++Matrix::debugNumCopyOps;
-    return *this;
-}
-
-
-void Matrix::Impl::setZero() {
-    System::memset(data, 0, R * C * sizeof(T));
-}
-
-
-void Matrix::Impl::swapRows(int r0, int r1) {
-    T* R0 = elt[r0];
-    T* R1 = elt[r1];
-
-    for (int c = 0; c < C; ++c) {
-        T temp = R0[c];
-        R0[c] = R1[c];
-        R1[c] = temp;
-    }
-}
-
-
-void Matrix::Impl::swapAndNegateCols(int c0, int c1) {
-    for (int r = 0; r < R; ++r) {
-        T* row = elt[r];
-
-        const T temp = -row[c0];
-        row[c0] = -row[c1];
-        row[c1] = temp;
-    }
-}
-
-
-void Matrix::Impl::mulRow(int r, const T& v) {
-    T* row = elt[r];
-
-    for (int c = 0; c < C; ++c) {
-        row[c] *= v;
-    }
-}
-
-
-void Matrix::Impl::mul(const Impl& B, Impl& out) const {
-    const Impl& A = *this;
-
-    debugAssertM(
-        (this != &out) && (&B != &out),
-        "Output argument to mul cannot be the same as an input argument.");
-
-    debugAssert(A.C == B.R);
-    debugAssert(A.R == out.R);
-    debugAssert(B.C == out.C);
-
-    for (int r = 0; r < out.R; ++r) {
-        for (int c = 0; c < out.C; ++c) {
-            T sum = 0.0;
-            for (int i = 0; i < A.C; ++i) {
-                sum += A.get(r, i) * B.get(i, c);
-            }
-            out.set(r, c, sum);
-        }
-    }
-}
-
-
-// We're about to define several similar methods,
-// so use a macro to share implementations.  This
-// must be a macro because the difference between
-// the macros is the operation in the inner loop.
-#define IMPLEMENT_ARRAY_2(method, OP)\
-void Matrix::Impl::method(const Impl& B, Impl& out) const {\
-    const Impl& A = *this;\
-                            \
-    debugAssert(A.C == B.C);\
-    debugAssert(A.R == B.R);\
-    debugAssert(A.C == out.C);\
-    debugAssert(A.R == out.R);\
-                            \
-    for (int i = R * C - 1; i >= 0; --i) {\
-        out.data[i] = A.data[i] OP B.data[i];\
-    }\
-}
-
-
-#define IMPLEMENT_ARRAY_1(method, f)\
-void Matrix::Impl::method(Impl& out) const {\
-    const Impl& A = *this;\
-                            \
-    debugAssert(A.C == out.C);\
-    debugAssert(A.R == out.R);\
-                            \
-    for (int i = R * C - 1; i >= 0; --i) {\
-        out.data[i] = f(A.data[i]);\
-    }\
-}
-
-
-#define IMPLEMENT_ARRAY_SCALAR(method, OP)\
-void Matrix::Impl::method(Matrix::T B, Impl& out) const {\
-    const Impl& A = *this;\
-                            \
-    debugAssert(A.C == out.C);\
-    debugAssert(A.R == out.R);\
-                            \
-    for (int i = R * C - 1; i >= 0; --i) {\
-        out.data[i] = A.data[i] OP B;\
-    }\
-}
-
-IMPLEMENT_ARRAY_2(add, +)
-IMPLEMENT_ARRAY_2(sub, -)
-IMPLEMENT_ARRAY_2(arrayMul, *)
-IMPLEMENT_ARRAY_2(arrayDiv, /)
-
-IMPLEMENT_ARRAY_SCALAR(add, +)
-IMPLEMENT_ARRAY_SCALAR(sub, -)
-IMPLEMENT_ARRAY_SCALAR(mul, *)
-IMPLEMENT_ARRAY_SCALAR(div, /)
-
-IMPLEMENT_ARRAY_1(abs,      ::fabs)
-IMPLEMENT_ARRAY_1(negate,   ::negate)
-IMPLEMENT_ARRAY_1(arrayLog, ::log)
-IMPLEMENT_ARRAY_1(arraySqrt, ::sqrt)
-IMPLEMENT_ARRAY_1(arrayExp, ::exp)
-IMPLEMENT_ARRAY_1(arrayCos, ::cos)
-IMPLEMENT_ARRAY_1(arraySin, ::sin)
-
-#undef IMPLEMENT_ARRAY_SCALAR
-#undef IMPLEMENT_ARRAY_1
-#undef IMPLEMENT_ARRAY_2
-
-// lsub is special because the argument order is reversed
-void Matrix::Impl::lsub(Matrix::T B, Impl& out) const {
-    const Impl& A = *this;
-
-    debugAssert(A.C == out.C);
-    debugAssert(A.R == out.R);
-
-    for (int i = R * C - 1; i >= 0; --i) {
-        out.data[i] = B - A.data[i];
-    }
-}
-
-
-void Matrix::Impl::inverseViaAdjoint(Impl& out) const {
-    debugAssert(&out != this);
-
-    // Inverse = adjoint / determinant
-
-    adjoint(out);
-
-    // Don't call the determinant method when we already have an
-    // adjoint matrix; there's a faster way of computing it: the dot
-    // product of the first row and the adjoint's first col.
-    double det = 0.0;
-    for (int r = R - 1; r >= 0; --r) {
-        det += elt[0][r] * out.elt[r][0];
-    }
-
-	out.div(Matrix::T(det), out);
-}
-
-
-void Matrix::Impl::transpose(Impl& out) const {
-    debugAssert(out.R == C);
-    debugAssert(out.C == R);
-
-    if (&out == this) {
-        // Square matrix in place
-        for (int r = 0; r < R; ++r) {
-            for (int c = r + 1; c < C; ++c) {
-                T temp = get(r, c);
-                out.set(r, c, get(c, r));
-                out.set(c, r, temp);
-            }
-        }
-    } else {
-        for (int r = 0; r < R; ++r) {
-            for (int c = 0; c < C; ++c) {
-                out.set(c, r, get(r, c)); 
-            }
-        }
-    }
-}
-
-
-void Matrix::Impl::adjoint(Impl& out) const {    
-    cofactor(out);
-    // Transpose is safe to perform in place
-    out.transpose(out);
-}
-
-
-void Matrix::Impl::cofactor(Impl& out) const {
-    debugAssert(&out != this);
-    for(int r = 0; r < R; ++r) {
-        for(int c = 0; c < C; ++c) {
-            out.set(r, c, cofactor(r, c));
-        }
-    } 
-}
-
-
-Matrix::T Matrix::Impl::cofactor(int r, int c) const {
-    // Strang p. 217
-    float s = isEven(r + c) ? 1.0f : -1.0f;
-
-    return s * determinant(r, c);
-}
-
-
-Matrix::T Matrix::Impl::determinant(int nr, int nc) const {
-    debugAssert(R > 0);
-    debugAssert(C > 0);
-    Impl A(R - 1, C - 1);
-    withoutRowAndCol(nr, nc, A);
-    return A.determinant();
-}
-
-
-void Matrix::Impl::setRow(int r, const T* vals) {
-    debugAssert(r >= 0);
-    System::memcpy(elt[r], vals, sizeof(T) * C);
-}
-
-
-void Matrix::Impl::setCol(int c, const T* vals) {
-    for (int r = 0; r < R; ++r) {
-        elt[r][c] = vals[r];
-    }
-}
-
-
-Matrix::T Matrix::Impl::determinant() const {
-
-    debugAssert(R == C);
-
-    // Compute using cofactors
-    switch(R) {
-    case 0:
-        return 0;
-
-    case 1:
-        // Determinant of a 1x1 is the element
-        return elt[0][0];
-
-    case 2:
-        // Determinant of a 2x2 is ad-bc
-        return elt[0][0] * elt[1][1] - elt[0][1] * elt[1][0];
-
-    case 3:
-        {
-          // Determinant of an nxn matrix is the dot product of the first
-          // row with the first row of cofactors.  The base cases of this
-          // method get called a lot, so we spell out the implementation
-          // for the 3x3 case.
-
-          double cofactor00 = elt[1][1] * elt[2][2] - elt[1][2] * elt[2][1];
-          double cofactor10 = elt[1][2] * elt[2][0] - elt[1][0] * elt[2][2];
-          double cofactor20 = elt[1][0] * elt[2][1] - elt[1][1] * elt[2][0];
-      
-		  return Matrix::T(
-            elt[0][0] * cofactor00 +
-            elt[0][1] * cofactor10 +
-            elt[0][2] * cofactor20);
-        }
-      
-    default:
-        {
-            // Determinant of an n x n matrix is the dot product of the first
-            // row with the first row of cofactors
-            T det = 0.0;
-
-            for (int c = 0; c < C; ++c) {
-                det += elt[0][c] * cofactor(0, c);
-            }
-
-            return det;
-        }
-    }
-}
-
-
-void Matrix::Impl::withoutRowAndCol(int excludeRow, int excludeCol, Impl& out) const {
-    debugAssert(out.R == R - 1);
-    debugAssert(out.C == C - 1);
-
-    for (int r = 0; r < out.R; ++r) {
-        for (int c = 0; c < out.C; ++c) {
-            out.elt[r][c] = elt[r + ((r >= excludeRow) ? 1 : 0)][c + ((c >= excludeCol) ? 1 : 0)];
-        }
-    }
-}
-
-
-Matrix Matrix::pseudoInverse(float tolerance) const {
-    if ((cols() == 1) || (rows() == 1)) {
-        return vectorPseudoInverse();
-    } else if ((cols() <= 4) || (rows() <= 4)) {
-        return partitionPseudoInverse();
-    } else {
-        return svdPseudoInverse(tolerance);
-    }
-}
-
-/*
-    Public function for testing purposes only. Use pseudoInverse(), as it contains optimizations for 
-    nonsingular matrices with at least one small (<5) dimension.
-*/
-Matrix Matrix::svdPseudoInverse(float tolerance) const {
-   	if (cols() > rows()) {
-		return transpose().svdPseudoInverse(tolerance).transpose();
-	}
-
-    // Matrices from SVD
-    Matrix U, V;
-
-    // Diagonal elements
-    Array d;
-
-	svd(U, d, V);
-
-    if (rows() == 1) {
-        d.resize(1, false);
-    }
-
-	if (tolerance < 0) {
-		// TODO: Should be eps(d[0]), which is the largest diagonal
-		tolerance = G3D::max(rows(), cols()) * 0.0001f;
-	}
-
-	Matrix X;
-
-	int r = 0;
-	for (int i = 0; i < d.size(); ++i) {
-		if (d[i] > tolerance) {
-			d[i] = Matrix::T(1) / d[i];
-			++r;
-		}
-	}
-
-	if (r == 0) {
-		// There were no non-zero elements
-		X = zero(cols(), rows());
-	} else {
-		// Use the first r columns
-        
-        // Test code (the rest is below)
-        /*
-        d.resize(r);
-        Matrix testU = U.subMatrix(0, U.rows() - 1, 0, r - 1);
-        Matrix testV = V.subMatrix(0, V.rows() - 1, 0, r - 1);
-        Matrix testX = testV * Matrix::fromDiagonal(d) * testU.transpose();
-        X = testX;
-        */
-        
-
-        // We want to do this:
-        //
-        //   d.resize(r);
-        //   U = U.subMatrix(0, U.rows() - 1, 0, r - 1);
-        //   X = V * Matrix::fromDiagonal(d) * U.transpose();
-        //
-        // but creating a large diagonal matrix and then
-        // multiplying by it is wasteful.  So we instead
-        // explicitly perform A = (D * U')' = U * D, and 
-        // then multiply X = V * A'.
-
-        Matrix A = Matrix(U.rows(), r);
-
-        const T* dPtr = d.getCArray();
-        for (int i = 0; i < A.rows(); ++i) {
-            const T* Urow = U.impl->elt[i];
-            T* Arow = A.impl->elt[i];
-            const int Acols = A.cols();
-            for (int j = 0; j < Acols; ++j) {
-                // A(i,j) = U(i,:) * D(:,j)
-                // This is non-zero only at j = i because D is diagonal
-                // A(i,j) = U(i,j) * D(j,j)
-                Arow[j] = Urow[j] * dPtr[j];
-            }
-        }
-
-        //
-        // Compute X = V.subMatrix(0, V.rows() - 1, 0, r - 1) * A.transpose()
-        // 
-        // Avoid the explicit subMatrix call, and by storing A' instead of A, avoid
-        // both the transpose and the memory incoherence of striding across memory
-        // in big steps.
-
-        alwaysAssertM(A.cols() == r, 
-            "Internal dimension mismatch during pseudoInverse()");
-        alwaysAssertM(V.cols() >= r, 
-            "Internal dimension mismatch during pseudoInverse()");
-
-        X = Matrix(V.rows(), A.rows());
-        T** Xelt = X.impl->elt;
-        for (int i = 0; i < X.rows(); ++i) {
-            const T* Vrow = V.impl->elt[i];
-            for (int j = 0; j < X.cols(); ++j) {
-                const T* Arow = A.impl->elt[j];
-                T sum = 0;
-                for (int k = 0; k < r; ++k) {
-                    sum += Vrow[k] * Arow[k];
-                }
-                Xelt[i][j] = sum;
-            }
-        }
-
-        /*
-        // Test that results are the same after optimizations:
-        Matrix diff = X - testX;
-        T n = diff.norm();
-        debugAssert(n < 0.0001);
-        */
-    }
-	return X;
-}
-
-// Computes pseudoinverse for a vector
-Matrix Matrix::vectorPseudoInverse() const {
-    // If vector A has nonzero elements: transpose A, then divide each elt. by the squared norm
-    // If A is zero vector: transpose A
-    double x = 0.0;
-
-    if (anyNonZero()) {
-        x = 1.0 / normSquared();
-    }
-
-    Matrix A(cols(), rows());
-    T** Aelt = A.impl->elt;
-    for (int r = 0; r < rows(); ++r) {
-        const T* MyRow = impl->elt[r];
-        for (int c = 0; c < cols(); ++c) {
-            Aelt[c][r] = T(MyRow[c] * x); 
-        }
-    }
-    return Matrix(A);
-}
-
-
-Matrix Matrix::rowPartPseudoInverse() const{
-    int m = rows();
-    int n = cols();
-    alwaysAssertM((m<=n),"Row-partitioned block matrix pseudoinverse requires Relt;
-    T** Belt = B.impl->elt;
-    for (int i = 0; i < m; ++i) {
-        const T* Arow = Aelt[i];
-        for (int j = 0; j < m; ++j) {
-            const T* Brow = Aelt[j];
-            T sum = 0;
-            for (int k = 0; k < n; ++k) {
-                sum += Arow[k] * Brow[k];
-            }
-            Belt[i][j] = sum;
-        }
-    }
-    
-    // B has size m x m
-    switch (m) {
-    case 2:
-        return row2PseudoInverse(B);
-
-    case 3:
-        return row3PseudoInverse(B);
-
-    case 4:
-        return row4PseudoInverse(B);
-
-    default:
-        alwaysAssertM(false, "G3D internal error: Should have used the vector or general case!");
-        return Matrix();
-    }
-}
-
-Matrix Matrix::colPartPseudoInverse() const{
-    int m = rows();
-    int n = cols();
-    alwaysAssertM((m>=n),"Column-partitioned block matrix pseudoinverse requires R>C");
-    // TODO: Put each of the individual cases in its own helper function
-    // TODO: Push the B computation down into the individual cases
-    // B = A' * A
-    Matrix A = *this;
-    Matrix B = Matrix(n, n);
-    T** Aelt = A.impl->elt;
-    T** Belt = B.impl->elt;
-    for (int i = 0; i < n; ++i) {
-        for (int j = 0; j < n; ++j) {
-            T sum = 0;
-            for (int k = 0; k < m; ++k) {
-                sum += Aelt[k][i] * Aelt[k][j];
-            }
-            Belt[i][j] = sum;
-        }
-    }
-
-    // B has size n x n
-    switch (n) {
-    case 2:
-        return col2PseudoInverse(B);
-
-    case 3:
-        return col3PseudoInverse(B);
-
-    case 4:
-        return col4PseudoInverse(B);
-
-    default:
-        alwaysAssertM(false, "G3D internal error: Should have used the vector or general case!");
-        return Matrix();
-    }
-}
-
-Matrix Matrix::col2PseudoInverse(const Matrix& B) const {
-
-    Matrix A = *this;
-    int m = rows();
-    int n = cols();
-    (void)n;
-
-    // Row-major 2x2 matrix
-    const float B2[2][2] = 
-       {{B.get(0,0), B.get(0,1)}, 
-        {B.get(1,0), B.get(1,1)}};
-
-    float det = (B2[0][0]*B2[1][1]) - (B2[0][1]*B2[1][0]);
-
-    if (fuzzyEq(det, T(0))) {
-        
-        // Matrix was singular; the block matrix pseudo-inverse can't
-        // handle that, so fall back to the old case
-        return svdPseudoInverse();
-
-    } else {
-        // invert using formula at http://www.netsoc.tcd.ie/~jgilbert/maths_site/applets/algebra/matrix_inversion.html
-
-        // Multiply by Binv * A'
-        Matrix X(cols(), rows());
-
-        T** Xelt = X.impl->elt;
-        T** Aelt = A.impl->elt;
-        float binv00 =  B2[1][1]/det, binv01 = -B2[1][0]/det;
-        float binv10 = -B2[0][1]/det, binv11 =  B2[0][0]/det;
-        for (int j = 0; j < m; ++j) {
-            const T* Arow = Aelt[j];
-            float a0 = Arow[0];
-            float a1 = Arow[1];
-            Xelt[0][j] = binv00 * a0 + binv01 * a1;
-            Xelt[1][j] = binv10 * a0 + binv11 * a1;
-        }
-        return X;
-    }
-}
-
-Matrix Matrix::col3PseudoInverse(const Matrix& B) const {
-    Matrix A = *this;
-    int m = rows();
-    int n = cols();
-
-    Matrix3 B3 = B.toMatrix3(); 
-    if (fuzzyEq(B3.determinant(), (T)0.0)) {
-
-        // Matrix was singular; the block matrix pseudo-inverse can't
-        // handle that, so fall back to the old case
-        return svdPseudoInverse();
-
-    } else {
-        Matrix3 B3inv = B3.inverse();
-
-        // Multiply by Binv * A'
-        Matrix X(cols(), rows());
-
-        T** Xelt = X.impl->elt;
-        T** Aelt = A.impl->elt;
-        for (int i = 0; i < n; ++i) {
-            T* Xrow = Xelt[i];
-            for (int j = 0; j < m; ++j) {
-                const T* Arow = Aelt[j];
-                T sum = 0;
-                const float* Binvrow = B3inv[i];
-                for (int k = 0; k < n; ++k) {
-                    sum += Binvrow[k] * Arow[k];
-                }
-                Xrow[j] = sum;
-            }
-        }
-        return X;
-    }
-}
-
-Matrix Matrix::col4PseudoInverse(const Matrix& B) const {
-    Matrix A = *this;
-    int m = rows();
-    int n = cols();
-
-    Matrix4 B4 = B.toMatrix4(); 
-    if (fuzzyEq(B4.determinant(), (T)0.0)) {
-
-        // Matrix was singular; the block matrix pseudo-inverse can't
-        // handle that, so fall back to the old case
-        return svdPseudoInverse();
-
-    } else {
-        Matrix4 B4inv = B4.inverse();
-
-        // Multiply by Binv * A'
-        Matrix X(cols(), rows());
-
-        T** Xelt = X.impl->elt;
-        T** Aelt = A.impl->elt;
-        for (int i = 0; i < n; ++i) {
-            T* Xrow = Xelt[i];
-            for (int j = 0; j < m; ++j) {
-                const T* Arow = Aelt[j];
-                T sum = 0;
-                const float* Binvrow = B4inv[i];
-                for (int k = 0; k < n; ++k) {
-                    sum += Binvrow[k] * Arow[k];
-                }
-                Xrow[j] = sum;
-            }
-        }
-        return X;
-    }
-}
-
-Matrix Matrix::row2PseudoInverse(const Matrix& B) const {
-
-    Matrix A = *this;
-    int m = rows();
-    int n = cols();
-    (void)m;
-
-    // Row-major 2x2 matrix
-    const float B2[2][2] = 
-       {{B.get(0,0), B.get(0,1)}, 
-        {B.get(1,0), B.get(1,1)}};
-
-    float det = (B2[0][0]*B2[1][1]) - (B2[0][1]*B2[1][0]);
-
-    if (fuzzyEq(det, T(0))) {
-        
-        // Matrix was singular; the block matrix pseudo-inverse can't
-        // handle that, so fall back to the old case
-        return svdPseudoInverse();
-
-    } else {
-        // invert using formula at http://www.netsoc.tcd.ie/~jgilbert/maths_site/applets/algebra/matrix_inversion.html
-
-        // Multiply by Binv * A'
-        Matrix X(cols(), rows());
-
-        T** Xelt = X.impl->elt;
-        T** Aelt = A.impl->elt;
-        float binv00 =  B2[1][1]/det, binv01 = -B2[1][0]/det;
-        float binv10 = -B2[0][1]/det, binv11 =  B2[0][0]/det;
-        for (int j = 0; j < n; ++j) {
-            Xelt[j][0] = Aelt[0][j] * binv00 + Aelt[1][j] * binv10;
-            Xelt[j][1] = Aelt[0][j] * binv01 + Aelt[1][j] * binv11;
-        }
-        return X;
-    }
-}
-
-Matrix Matrix::row3PseudoInverse(const Matrix& B) const {
-
-    Matrix A = *this;
-    int m = rows();
-    int n = cols();
-
-    Matrix3 B3 = B.toMatrix3(); 
-    if (fuzzyEq(B3.determinant(), (T)0.0)) {
-
-        // Matrix was singular; the block matrix pseudo-inverse can't
-        // handle that, so fall back to the old case
-        return svdPseudoInverse();
-
-    } else {
-        Matrix3 B3inv = B3.inverse();
-
-        // Multiply by Binv * A'
-        Matrix X(cols(), rows());
-
-        T** Xelt = X.impl->elt;
-        T** Aelt = A.impl->elt;
-        for (int i = 0; i < n; ++i) {
-            T* Xrow = Xelt[i];
-            for (int j = 0; j < m; ++j) {
-                T sum = 0;
-                for (int k = 0; k < m; ++k) {
-                    sum += Aelt[k][i] * B3inv[j][k];
-                }
-                Xrow[j] = sum;
-            }
-        }
-        return X;
-    }
-}
-
-Matrix Matrix::row4PseudoInverse(const Matrix& B) const {
-
-    Matrix A = *this;
-    int m = rows();
-    int n = cols();
-
-    Matrix4 B4 = B.toMatrix4(); 
-    if (fuzzyEq(B4.determinant(), (T)0.0)) {
-
-        // Matrix was singular; the block matrix pseudo-inverse can't
-        // handle that, so fall back to the old case
-        return svdPseudoInverse();
-
-    } else {
-        Matrix4 B4inv = B4.inverse();
-
-        // Multiply by Binv * A'
-        Matrix X(cols(), rows());
-
-        T** Xelt = X.impl->elt;
-        T** Aelt = A.impl->elt;
-        for (int i = 0; i < n; ++i) {
-            T* Xrow = Xelt[i];
-            for (int j = 0; j < m; ++j) {
-                T sum = 0;
-                for (int k = 0; k < m; ++k) {
-                    sum += Aelt[k][i] * B4inv[j][k];
-                }
-                Xrow[j] = sum;
-            }
-        }
-        return X;
-    }
-}
-
-// Uses the block matrix pseudoinverse to compute the pseudoinverse of a full-rank mxn matrix with m >= n
-// http://en.wikipedia.org/wiki/Block_matrix_pseudoinverse
-Matrix Matrix::partitionPseudoInverse() const {
-
-    // Logic:
-    // A^-1 = (A'A)^-1 A'
-    // A has few (n) columns, so A'A is small (n x n) and fast to invert
-    
-    int m = rows();
-    int n = cols();
-
-    if (m < n) {
-        // TODO: optimize by pushing through the transpose
-        //return transpose().partitionPseudoInverse().transpose();
-        return rowPartPseudoInverse();
-
-    } else {
-        return colPartPseudoInverse();
-    }
-}
-
-void Matrix::Impl::inverseInPlaceGaussJordan() {
-    debugAssertM(R == C, 
-        format(
-        "Cannot perform Gauss-Jordan inverse on a non-square matrix."
-        " (Argument was %dx%d)",
-        R, C));
-
-    // Exchange to float elements
-#   define SWAP(x, y) {float temp = x; x = y; y = temp;}
-
-    // The integer arrays pivot, rowIndex, and colIndex are
-    // used for bookkeeping on the pivoting
-    static Array colIndex, rowIndex, pivot;
-
-    int col = 0, row = 0;
-
-    colIndex.resize(R);
-    rowIndex.resize(R);
-    pivot.resize(R);
-
-    static const int NO_PIVOT = -1;
-
-    // Initialize the pivot array to default values.
-    for (int i = 0; i < R; ++i) {
-        pivot[i] = NO_PIVOT;
-    }
-
-    // This is the main loop over the columns to be reduced
-    // Loop over the columns.
-    for (int c = 0; c < R; ++c) {
-
-        // Find the largest element and use that as a pivot
-        float largestMagnitude = 0.0;
-
-        // This is the outer loop of the search for a pivot element
-        for (int r = 0; r < R; ++r) {
-
-            // Unless we've already found the pivot, keep going
-            if (pivot[r] != 0) {
-
-                // Find the largest pivot
-                for (int k = 0; k < R; ++k) {
-                    if (pivot[k] == NO_PIVOT) {
-                        const float mag = fabs(elt[r][k]);
-
-                        if (mag >= largestMagnitude) {
-                            largestMagnitude = mag;
-                            row = r; col = k;
-                        }
-                    }
-                }
-            }
-        }
-
-        pivot[col] += 1;
-
-        // Interchange columns so that the pivot element is on the diagonal (we'll have to undo this
-        // at the end)
-        if (row != col) {
-            for (int k = 0; k < R; ++k) {
-                SWAP(elt[row][k], elt[col][k])
-            }
-        }
-
-        // The pivot is now at [row, col]
-        rowIndex[c] = row; 
-        colIndex[c] = col;
-    
-        double piv = elt[col][col];
-
-        debugAssertM(piv != 0.0, "Matrix is singular");
-
-        // Divide everything by the pivot (avoid computing the division
-        // multiple times).
-        const double pivotInverse = 1.0 / piv;
-        elt[col][col] = 1.0;
-
-        for (int k = 0; k < R; ++k) {
-			elt[col][k] *= Matrix::T(pivotInverse);
-        }
-
-        // Reduce all rows
-        for (int r = 0; r < R; ++r) {
-            // Skip over the pivot row
-            if (r != col) {
-
-                double oldValue = elt[r][col];
-                elt[r][col] = 0.0;
-
-                for (int k = 0; k < R; ++k) {
-					elt[r][k] -= Matrix::T(elt[col][k] * oldValue);
-                }
-            }
-        }
-    }
-
-
-    // Put the columns back in the correct locations
-    for (int i = R - 1; i >= 0; --i) {
-        if (rowIndex[i] != colIndex[i]) {
-            for (int k = 0; k < R; ++k) {
-                SWAP(elt[k][rowIndex[i]], elt[k][colIndex[i]]);
-            }
-        }
-    } 
-    
-#   undef SWAP
-}
-
-
-bool Matrix::Impl::anyNonZero() const {
-    int N = R * C;
-    for (int i = 0; i < N; ++i) {
-        if (data[i] != 0.0) {
-            return true;
-        }
-    }
-    return false;
-}
-
-
-bool Matrix::Impl::allNonZero() const {
-    int N = R * C;
-    for (int i = 0; i < N; ++i) {
-        if (data[i] == 0.0) {
-            return false;
-        }
-    }
-    return true;
-}
-
-
-/** Helper for svdCore */ 
-static double pythag(double a, double b) {
-    
-    double at = fabs(a), bt = fabs(b), ct, result;
-
-    if (at > bt) { 
-        ct = bt / at; 
-        result = at * sqrt(1.0 + square(ct)); 
-    } else if (bt > 0.0) { 
-        ct = at / bt; 
-        result = bt * sqrt(1.0 + square(ct)); 
-    } else {
-        result = 0.0;
-    }
-
-    return result;
-}
-
-#define SIGN(a, b) ((b) >= 0.0 ? fabs(a) : -fabs(a))
-
-const char* Matrix::svdCore(float** U, int rows, int cols, float* D, float** V) {
-    const int MAX_ITERATIONS = 30;
-
-    int flag, i, its, j, jj, k, l = 0, nm = 0;
-    double c, f, h, s, x, y, z;
-    double anorm = 0.0, g = 0.0, scale = 0.0;
-
-    // Temp row vector
-    double* rv1;
-  
-    debugAssertM(rows >= cols, "Must have more rows than columns");
-  
-    rv1 = (double*)System::alignedMalloc(cols * sizeof(double), 16);
-    debugAssert(rv1);
-
-    // Householder reduction to bidiagonal form
-    for (i = 0; i < cols; ++i) {
-        
-        // Left-hand reduction
-        l = i + 1;
-        rv1[i] = scale * g;
-        g = s = scale = 0.0;
-        
-        if (i < rows) {
-
-            for (k = i; k < rows; ++k) {
-                scale += fabs((double)U[k][i]);
-            }
-
-            if (scale) {
-                for (k = i; k < rows; ++k) {
-                    U[k][i] = (float)((double)U[k][i]/scale);
-                    s += ((double)U[k][i] * (double)U[k][i]);
-                }
-
-                f = (double)U[i][i];
-
-                // TODO: what is this 2-arg sign function?
-                g = -SIGN(sqrt(s), f);
-                h = f * g - s;
-                U[i][i] = (float)(f - g);
-                
-                if (i != cols - 1) {
-                    for (j = l; j < cols; j++) {
-
-                        for (s = 0.0, k = i; k < rows; ++k) {
-                            s += ((double)U[k][i] * (double)U[k][j]);
-                        }
-
-                        f = s / h;
-                        for (k = i; k < rows; ++k) {
-                            U[k][j] += (float)(f * (double)U[k][i]);
-                        }
-                    }
-                }
-                for (k = i; k < rows; ++k) {
-                    U[k][i] = (float)((double)U[k][i]*scale);
-                }
-            }
-        }
-        D[i] = (float)(scale * g);
-    
-        // right-hand reduction
-        g = s = scale = 0.0;
-        if (i < rows && i != cols - 1) {
-            for (k = l; k < cols; ++k) {
-                scale += fabs((double)U[i][k]);
-            }
-
-            if (scale) {
-                for (k = l; k < cols; ++k) {
-                    U[i][k] = (float)((double)U[i][k]/scale);
-                    s += ((double)U[i][k] * (double)U[i][k]);
-                }
-
-                f = (double)U[i][l];
-                g = -SIGN(sqrt(s), f);
-                h = f * g - s;
-                U[i][l] = (float)(f - g);
-
-                for (k = l; k < cols; ++k) {
-                    rv1[k] = (double)U[i][k] / h;
-                }
-
-                if (i != rows - 1) {
-
-                    for (j = l; j < rows; ++j) {
-                        for (s = 0.0, k = l; k < cols; ++k) {
-                            s += ((double)U[j][k] * (double)U[i][k]);
-                        }
-
-                        for (k = l; k < cols; ++k) { 
-                            U[j][k] += (float)(s * rv1[k]);
-                        }
-                    }
-                }
-
-                for (k = l; k < cols; ++k) {
-                    U[i][k] = (float)((double)U[i][k]*scale);
-                }
-            }
-        }
-
-        anorm = max(anorm, fabs((double)D[i]) + fabs(rv1[i]));
-    }
-  
-    // accumulate the right-hand transformation
-    for (i = cols - 1; i >= 0; --i) {
-        if (i < cols - 1) {
-            if (g) {
-                for (j = l; j < cols; j++) {
-                    V[j][i] = (float)(((double)U[i][j] / (double)U[i][l]) / g);
-                }
-
-                // double division to avoid underflow 
-                for (j = l; j < cols; ++j) {
-                    for (s = 0.0, k = l; k < cols; k++) {
-                        s += ((double)U[i][k] * (double)V[k][j]);
-                    }
-
-                    for (k = l; k < cols; ++k) {
-                        V[k][j] += (float)(s * (double)V[k][i]);
-                    }
-                }
-            }
-
-            for (j = l; j < cols; ++j) {
-                V[i][j] = V[j][i] = 0.0;
-            }
-        }
-
-        V[i][i] = 1.0;
-        g = rv1[i];
-        l = i;
-    }
-  
-    // accumulate the left-hand transformation
-    for (i = cols - 1; i >= 0; --i) {
-        l = i + 1;
-        g = (double)D[i];
-        if (i < cols - 1) {
-            for (j = l; j < cols; ++j) {
-                U[i][j] = 0.0;
-            }
-        }
-
-        if (g) {
-            g = 1.0 / g;
-            if (i != cols - 1) {
-                for (j = l; j < cols; ++j) {
-                    for (s = 0.0, k = l; k < rows; ++k) {
-                        s += ((double)U[k][i] * (double)U[k][j]);
-                    }
-
-                    f = (s / (double)U[i][i]) * g;
-                    
-                    for (k = i; k < rows; ++k) {
-                        U[k][j] += (float)(f * (double)U[k][i]);
-                    }
-                }
-            }
-
-            for (j = i; j < rows; ++j) {
-                U[j][i] = (float)((double)U[j][i]*g);
-            }
-        
-        } else {
-            for (j = i; j < rows; ++j) {
-                U[j][i] = 0.0;
-            }
-        }
-        ++U[i][i];
-    }
-
-    // diagonalize the bidiagonal form
-    for (k = cols - 1; k >= 0; --k) {
-        // loop over singular values 
-        for (its = 0; its < MAX_ITERATIONS; ++its) {
-            // loop over allowed iterations
-            flag = 1;
-            
-            for (l = k; l >= 0; --l) {
-                // test for splitting 
-                nm = l - 1;
-                if (fabs(rv1[l]) + anorm == anorm) {
-                    flag = 0;
-                    break;
-                }
-
-                if (fabs((double)D[nm]) + anorm == anorm) {
-                    break;
-                }
-            }
-
-            if (flag) {
-                c = 0.0;
-                s = 1.0;
-                for (i = l; i <= k; ++i) {
-                    f = s * rv1[i];
-                    if (fabs(f) + anorm != anorm) {
-                        g = (double)D[i];
-                        h = pythag(f, g);
-                        D[i] = (float)h; 
-                        h = 1.0 / h;
-                        c = g * h;
-                        s = (- f * h);
-                        for (j = 0; j < rows; ++j) {
-                            y = (double)U[j][nm];
-                            z = (double)U[j][i];
-                            U[j][nm] = (float)(y * c + z * s);
-                            U[j][i] = (float)(z * c - y * s);
-                        }
-                    }
-                }
-            }
-
-            z = (double)D[k];
-            if (l == k) {
-                // convergence
-                if (z < 0.0) {
-                    // make singular value nonnegative 
-                    D[k] = (float)(-z);
-
-                    for (j = 0; j < cols; ++j) {
-                        V[j][k] = (-V[j][k]);
-                    }
-                }
-                break;
-            }
-
-            if (its >= MAX_ITERATIONS) {
-                free(rv1);
-                rv1 = NULL;
-                return "Failed to converge.";
-            }
-    
-            // shift from bottom 2 x 2 minor
-            x = (double)D[l];
-            nm = k - 1;
-            y = (double)D[nm];
-            g = rv1[nm];
-            h = rv1[k];
-            f = ((y - z) * (y + z) + (g - h) * (g + h)) / (2.0 * h * y);
-            g = pythag(f, 1.0);
-            f = ((x - z) * (x + z) + h * ((y / (f + SIGN(g, f))) - h)) / x;
-          
-            // next QR transformation 
-            c = s = 1.0;
-            for (j = l; j <= nm; ++j) {
-                i = j + 1;
-                g = rv1[i];
-                y = (double)D[i];
-                h = s * g;
-                g = c * g;
-                z = pythag(f, h);
-                rv1[j] = z;
-                c = f / z;
-                s = h / z;
-                f = x * c + g * s;
-                g = g * c - x * s;
-                h = y * s;
-                y = y * c;
-
-                for (jj = 0; jj < cols; ++jj) {
-                    x = (double)V[jj][j];
-                    z = (double)V[jj][i];
-                    V[jj][j] = (float)(x * c + z * s);
-                    V[jj][i] = (float)(z * c - x * s);
-                }
-                z = pythag(f, h);
-                D[j] = (float)z;
-                if (z) {
-                    z = 1.0 / z;
-                    c = f * z;
-                    s = h * z;
-                }
-                f = (c * g) + (s * y);
-                x = (c * y) - (s * g);
-                for (jj = 0; jj < rows; jj++) {
-                    y = (double)U[jj][j];
-                    z = (double)U[jj][i];
-                    U[jj][j] = (float)(y * c + z * s);
-                    U[jj][i] = (float)(z * c - y * s);
-                }
-            }
-            rv1[l] = 0.0;
-            rv1[k] = f;
-            D[k] = (float)x;
-        }
-    }
-
-    System::alignedFree(rv1);
-    rv1 = NULL;
-
-    return NULL;
-}
-
-#undef SIGN
-
-}
diff --git a/externals/g3dlite/G3D.lib/source/Matrix3.cpp b/externals/g3dlite/G3D.lib/source/Matrix3.cpp
deleted file mode 100644
index 7fb6648d3f7..00000000000
--- a/externals/g3dlite/G3D.lib/source/Matrix3.cpp
+++ /dev/null
@@ -1,1725 +0,0 @@
-/**
- @file Matrix3.cpp
-
- 3x3 matrix class
-
- @author Morgan McGuire, graphics3d.com
-
- @created 2001-06-02
- @edited  2006-04-06
-*/
-
-#include "G3D/platform.h"
-#include 
-#include 
-#include "G3D/Matrix3.h"
-#include "G3D/g3dmath.h"
-#include "G3D/BinaryInput.h"
-#include "G3D/BinaryOutput.h"
-#include "G3D/Quat.h"
-
-namespace G3D {
-
-const float Matrix3::EPSILON = 1e-06f;
-
-const Matrix3& Matrix3::zero() {
-    static Matrix3 m(0, 0, 0, 0, 0, 0, 0, 0, 0);
-    return m;
-}
-
-const Matrix3& Matrix3::identity() {
-    static Matrix3 m(1, 0, 0, 0, 1, 0, 0, 0, 1);
-    return m;
-}
-
-
-const float Matrix3::ms_fSvdEpsilon = 1e-04f;
-const int Matrix3::ms_iSvdMaxIterations = 32;
-
-Matrix3::Matrix3(BinaryInput& b) {
-    deserialize(b);
-}
-
-bool Matrix3::fuzzyEq(const Matrix3& b) const {
-    for (int r = 0; r < 3; ++r) {
-        for (int c = 0; c < 3; ++c) {
-            if (! G3D::fuzzyEq(elt[r][c], b[r][c])) {
-                return false;
-            }
-        }
-    }
-    return true;
-}
-
-
-bool Matrix3::isOrthonormal() const {
-    Vector3 X = column(0);
-    Vector3 Y = column(1);
-    Vector3 Z = column(2);
-
-    return 
-        (G3D::fuzzyEq(X.dot(Y), 0.0f) &&
-         G3D::fuzzyEq(Y.dot(Z), 0.0f) &&
-         G3D::fuzzyEq(X.dot(Z), 0.0f) &&
-         G3D::fuzzyEq(X.squaredMagnitude(), 1.0f) &&
-         G3D::fuzzyEq(Y.squaredMagnitude(), 1.0f) &&
-         G3D::fuzzyEq(Z.squaredMagnitude(), 1.0f));
-}
-
-//----------------------------------------------------------------------------
-Matrix3::Matrix3(const Quat& _q) {
-    // Implementation from Watt and Watt, pg 362
-	// See also http://www.flipcode.com/documents/matrfaq.html#Q54
-    Quat q = _q;
-    q.unitize();
-    float xx = 2.0f * q.x * q.x;
-    float xy = 2.0f * q.x * q.y;
-    float xz = 2.0f * q.x * q.z;
-    float xw = 2.0f * q.x * q.w;
-
-    float yy = 2.0f * q.y * q.y;
-    float yz = 2.0f * q.y * q.z;
-    float yw = 2.0f * q.y * q.w;
-
-    float zz = 2.0f * q.z * q.z;
-    float zw = 2.0f * q.z * q.w;
-
-    set(1.0f - yy - zz,    xy - zw,        xz + yw,
-        xy + zw,          1.0f - xx - zz,  yz - xw,
-        xz - yw,          yz + xw,        1.0f - xx - yy);
-}
-
-//----------------------------------------------------------------------------
-
-Matrix3::Matrix3 (const float aafEntry[3][3]) {
-    memcpy(elt, aafEntry, 9*sizeof(float));
-}
-
-//----------------------------------------------------------------------------
-Matrix3::Matrix3 (const Matrix3& rkMatrix) {
-    memcpy(elt, rkMatrix.elt, 9*sizeof(float));
-}
-
-//----------------------------------------------------------------------------
-Matrix3::Matrix3(
-          float fEntry00, float fEntry01, float fEntry02,
-          float fEntry10, float fEntry11, float fEntry12,
-          float fEntry20, float fEntry21, float fEntry22) {
-    set(fEntry00, fEntry01, fEntry02,
-        fEntry10, fEntry11, fEntry12,
-        fEntry20, fEntry21, fEntry22);
-}
-
-void Matrix3::set(
-          float fEntry00, float fEntry01, float fEntry02,
-          float fEntry10, float fEntry11, float fEntry12, 
-          float fEntry20, float fEntry21, float fEntry22) {
-
-    elt[0][0] = fEntry00;
-    elt[0][1] = fEntry01;
-    elt[0][2] = fEntry02;
-    elt[1][0] = fEntry10;
-    elt[1][1] = fEntry11;
-    elt[1][2] = fEntry12;
-    elt[2][0] = fEntry20;
-    elt[2][1] = fEntry21;
-    elt[2][2] = fEntry22;
-}
-
-
-void Matrix3::deserialize(BinaryInput& b) {
-    int r,c;
-    for (c = 0; c < 3; ++c) {
-        for (r = 0; r < 3; ++r) {
-            elt[r][c] = b.readFloat32();
-        }
-    }
-}
-
-
-void Matrix3::serialize(BinaryOutput& b) const {
-    int r,c;
-    for (c = 0; c < 3; ++c) {
-        for (r = 0; r < 3; ++r) {
-            b.writeFloat32(elt[r][c]);
-        }
-    }
-}
-
-
-//----------------------------------------------------------------------------
-Vector3 Matrix3::column (int iCol) const {
-    assert((0 <= iCol) && (iCol < 3));
-    return Vector3(elt[0][iCol], elt[1][iCol],
-                   elt[2][iCol]);
-}
-
-const Vector3& Matrix3::row (int iRow) const {
-    assert((0 <= iRow) && (iRow < 3));
-    return *reinterpret_cast(elt[iRow]);
-}
-
-
-Vector3 Matrix3::getColumn (int iCol) const {
-    assert((0 <= iCol) && (iCol < 3));
-    return Vector3(elt[0][iCol], elt[1][iCol],
-                   elt[2][iCol]);
-}
-
-Vector3 Matrix3::getRow (int iRow) const {
-    return Vector3(elt[iRow][0], elt[iRow][1], elt[iRow][2]);
-}
-
-void Matrix3::setColumn(int iCol, const Vector3 &vector) {
-    debugAssert((iCol >= 0) && (iCol < 3));
-    elt[0][iCol] = vector.x;
-    elt[1][iCol] = vector.y;
-    elt[2][iCol] = vector.z;
-}
-
-
-void Matrix3::setRow(int iRow, const Vector3 &vector) {
-    debugAssert((iRow >= 0) && (iRow < 3));
-    elt[iRow][0] = vector.x;
-    elt[iRow][1] = vector.y;
-    elt[iRow][2] = vector.z;
-}
-
-
-//----------------------------------------------------------------------------
-bool Matrix3::operator== (const Matrix3& rkMatrix) const {
-    for (int iRow = 0; iRow < 3; iRow++) {
-        for (int iCol = 0; iCol < 3; iCol++) {
-            if ( elt[iRow][iCol] != rkMatrix.elt[iRow][iCol] )
-                return false;
-        }
-    }
-
-    return true;
-}
-
-//----------------------------------------------------------------------------
-bool Matrix3::operator!= (const Matrix3& rkMatrix) const {
-    return !operator==(rkMatrix);
-}
-
-//----------------------------------------------------------------------------
-Matrix3 Matrix3::operator+ (const Matrix3& rkMatrix) const {
-    Matrix3 kSum;
-
-    for (int iRow = 0; iRow < 3; iRow++) {
-        for (int iCol = 0; iCol < 3; iCol++) {
-            kSum.elt[iRow][iCol] = elt[iRow][iCol] +
-                                          rkMatrix.elt[iRow][iCol];
-        }
-    }
-
-    return kSum;
-}
-
-//----------------------------------------------------------------------------
-Matrix3 Matrix3::operator- (const Matrix3& rkMatrix) const {
-    Matrix3 kDiff;
-
-    for (int iRow = 0; iRow < 3; iRow++) {
-        for (int iCol = 0; iCol < 3; iCol++) {
-            kDiff.elt[iRow][iCol] = elt[iRow][iCol] -
-                                           rkMatrix.elt[iRow][iCol];
-        }
-    }
-
-    return kDiff;
-}
-
-//----------------------------------------------------------------------------
-Matrix3 Matrix3::operator* (const Matrix3& rkMatrix) const {
-    Matrix3 kProd;
-
-    for (int iRow = 0; iRow < 3; iRow++) {
-        for (int iCol = 0; iCol < 3; iCol++) {
-            kProd.elt[iRow][iCol] =
-                elt[iRow][0] * rkMatrix.elt[0][iCol] +
-                elt[iRow][1] * rkMatrix.elt[1][iCol] +
-                elt[iRow][2] * rkMatrix.elt[2][iCol];
-        }
-    }
-
-    return kProd;
-}
-
-Matrix3& Matrix3::operator+= (const Matrix3& rkMatrix) {
-    for (int iRow = 0; iRow < 3; iRow++) {
-        for (int iCol = 0; iCol < 3; iCol++) {
-            elt[iRow][iCol] = elt[iRow][iCol] + rkMatrix.elt[iRow][iCol];
-        }
-    }
-
-    return *this;
-}
-
-Matrix3& Matrix3::operator-= (const Matrix3& rkMatrix) {
-    for (int iRow = 0; iRow < 3; iRow++) {
-        for (int iCol = 0; iCol < 3; iCol++) {
-            elt[iRow][iCol] = elt[iRow][iCol] - rkMatrix.elt[iRow][iCol];
-        }
-    }
-
-    return *this;
-}
-
-Matrix3& Matrix3::operator*= (const Matrix3& rkMatrix) {
-    Matrix3 mulMat;
-    for (int iRow = 0; iRow < 3; iRow++) {
-        for (int iCol = 0; iCol < 3; iCol++) {
-            mulMat.elt[iRow][iCol] =
-                elt[iRow][0] * rkMatrix.elt[0][iCol] +
-                elt[iRow][1] * rkMatrix.elt[1][iCol] +
-                elt[iRow][2] * rkMatrix.elt[2][iCol];
-        }
-    }
-
-    *this = mulMat;
-    return *this;
-}
-
-//----------------------------------------------------------------------------
-Matrix3 Matrix3::operator- () const {
-    Matrix3 kNeg;
-
-    for (int iRow = 0; iRow < 3; iRow++) {
-        for (int iCol = 0; iCol < 3; iCol++) {
-            kNeg[iRow][iCol] = -elt[iRow][iCol];
-        }
-    }
-
-    return kNeg;
-}
-
-//----------------------------------------------------------------------------
-Matrix3 Matrix3::operator* (float fScalar) const {
-    Matrix3 kProd;
-
-    for (int iRow = 0; iRow < 3; iRow++) {
-        for (int iCol = 0; iCol < 3; iCol++) {
-            kProd[iRow][iCol] = fScalar * elt[iRow][iCol];
-        }
-    }
-
-    return kProd;
-}
-
-//----------------------------------------------------------------------------
-Matrix3 operator* (double fScalar, const Matrix3& rkMatrix) {
-    Matrix3 kProd;
-
-    for (int iRow = 0; iRow < 3; iRow++) {
-        for (int iCol = 0; iCol < 3; iCol++) {
-            kProd[iRow][iCol] = fScalar * rkMatrix.elt[iRow][iCol];
-        }
-    }
-
-    return kProd;
-}
-
-Matrix3 operator* (float fScalar, const Matrix3& rkMatrix) {
-    return (double)fScalar * rkMatrix;
-}
-
-
-Matrix3 operator* (int fScalar, const Matrix3& rkMatrix) {
-    return (double)fScalar * rkMatrix;
-}
-//----------------------------------------------------------------------------
-Matrix3 Matrix3::transpose () const {
-    Matrix3 kTranspose;
-
-    for (int iRow = 0; iRow < 3; iRow++) {
-        for (int iCol = 0; iCol < 3; iCol++) {
-            kTranspose[iRow][iCol] = elt[iCol][iRow];
-        }
-    }
-
-    return kTranspose;
-}
-
-//----------------------------------------------------------------------------
-bool Matrix3::inverse (Matrix3& rkInverse, float fTolerance) const {
-    // Invert a 3x3 using cofactors.  This is about 8 times faster than
-    // the Numerical Recipes code which uses Gaussian elimination.
-
-    rkInverse[0][0] = elt[1][1] * elt[2][2] -
-                      elt[1][2] * elt[2][1];
-    rkInverse[0][1] = elt[0][2] * elt[2][1] -
-                      elt[0][1] * elt[2][2];
-    rkInverse[0][2] = elt[0][1] * elt[1][2] -
-                      elt[0][2] * elt[1][1];
-    rkInverse[1][0] = elt[1][2] * elt[2][0] -
-                      elt[1][0] * elt[2][2];
-    rkInverse[1][1] = elt[0][0] * elt[2][2] -
-                      elt[0][2] * elt[2][0];
-    rkInverse[1][2] = elt[0][2] * elt[1][0] -
-                      elt[0][0] * elt[1][2];
-    rkInverse[2][0] = elt[1][0] * elt[2][1] -
-                      elt[1][1] * elt[2][0];
-    rkInverse[2][1] = elt[0][1] * elt[2][0] -
-                      elt[0][0] * elt[2][1];
-    rkInverse[2][2] = elt[0][0] * elt[1][1] -
-                      elt[0][1] * elt[1][0];
-
-    float fDet =
-        elt[0][0] * rkInverse[0][0] +
-        elt[0][1] * rkInverse[1][0] +
-        elt[0][2] * rkInverse[2][0];
-
-    if ( G3D::abs(fDet) <= fTolerance )
-        return false;
-
-    float fInvDet = 1.0 / fDet;
-
-    for (int iRow = 0; iRow < 3; iRow++) {
-        for (int iCol = 0; iCol < 3; iCol++)
-            rkInverse[iRow][iCol] *= fInvDet;
-    }
-
-    return true;
-}
-
-//----------------------------------------------------------------------------
-Matrix3 Matrix3::inverse (float fTolerance) const {
-    Matrix3 kInverse = Matrix3::zero();
-    inverse(kInverse, fTolerance);
-    return kInverse;
-}
-
-//----------------------------------------------------------------------------
-float Matrix3::determinant () const {
-    float fCofactor00 = elt[1][1] * elt[2][2] -
-                       elt[1][2] * elt[2][1];
-    float fCofactor10 = elt[1][2] * elt[2][0] -
-                       elt[1][0] * elt[2][2];
-    float fCofactor20 = elt[1][0] * elt[2][1] -
-                       elt[1][1] * elt[2][0];
-
-    float fDet =
-        elt[0][0] * fCofactor00 +
-        elt[0][1] * fCofactor10 +
-        elt[0][2] * fCofactor20;
-
-    return fDet;
-}
-
-//----------------------------------------------------------------------------
-void Matrix3::bidiagonalize (Matrix3& kA, Matrix3& kL,
-                             Matrix3& kR) {
-    float afV[3], afW[3];
-    float fLength, fSign, fT1, fInvT1, fT2;
-    bool bIdentity;
-
-    // map first column to (*,0,0)
-    fLength = sqrt(kA[0][0] * kA[0][0] + kA[1][0] * kA[1][0] +
-                         kA[2][0] * kA[2][0]);
-
-    if ( fLength > 0.0 ) {
-        fSign = (kA[0][0] > 0.0 ? 1.0 : -1.0);
-        fT1 = kA[0][0] + fSign * fLength;
-        fInvT1 = 1.0 / fT1;
-        afV[1] = kA[1][0] * fInvT1;
-        afV[2] = kA[2][0] * fInvT1;
-
-        fT2 = -2.0 / (1.0 + afV[1] * afV[1] + afV[2] * afV[2]);
-        afW[0] = fT2 * (kA[0][0] + kA[1][0] * afV[1] + kA[2][0] * afV[2]);
-        afW[1] = fT2 * (kA[0][1] + kA[1][1] * afV[1] + kA[2][1] * afV[2]);
-        afW[2] = fT2 * (kA[0][2] + kA[1][2] * afV[1] + kA[2][2] * afV[2]);
-        kA[0][0] += afW[0];
-        kA[0][1] += afW[1];
-        kA[0][2] += afW[2];
-        kA[1][1] += afV[1] * afW[1];
-        kA[1][2] += afV[1] * afW[2];
-        kA[2][1] += afV[2] * afW[1];
-        kA[2][2] += afV[2] * afW[2];
-
-        kL[0][0] = 1.0 + fT2;
-        kL[0][1] = kL[1][0] = fT2 * afV[1];
-        kL[0][2] = kL[2][0] = fT2 * afV[2];
-        kL[1][1] = 1.0 + fT2 * afV[1] * afV[1];
-        kL[1][2] = kL[2][1] = fT2 * afV[1] * afV[2];
-        kL[2][2] = 1.0 + fT2 * afV[2] * afV[2];
-        bIdentity = false;
-    } else {
-        kL = Matrix3::identity();
-        bIdentity = true;
-    }
-
-    // map first row to (*,*,0)
-    fLength = sqrt(kA[0][1] * kA[0][1] + kA[0][2] * kA[0][2]);
-
-    if ( fLength > 0.0 ) {
-        fSign = (kA[0][1] > 0.0 ? 1.0 : -1.0);
-        fT1 = kA[0][1] + fSign * fLength;
-        afV[2] = kA[0][2] / fT1;
-
-        fT2 = -2.0 / (1.0 + afV[2] * afV[2]);
-        afW[0] = fT2 * (kA[0][1] + kA[0][2] * afV[2]);
-        afW[1] = fT2 * (kA[1][1] + kA[1][2] * afV[2]);
-        afW[2] = fT2 * (kA[2][1] + kA[2][2] * afV[2]);
-        kA[0][1] += afW[0];
-        kA[1][1] += afW[1];
-        kA[1][2] += afW[1] * afV[2];
-        kA[2][1] += afW[2];
-        kA[2][2] += afW[2] * afV[2];
-
-        kR[0][0] = 1.0;
-        kR[0][1] = kR[1][0] = 0.0;
-        kR[0][2] = kR[2][0] = 0.0;
-        kR[1][1] = 1.0 + fT2;
-        kR[1][2] = kR[2][1] = fT2 * afV[2];
-        kR[2][2] = 1.0 + fT2 * afV[2] * afV[2];
-    } else {
-        kR = Matrix3::identity();
-    }
-
-    // map second column to (*,*,0)
-    fLength = sqrt(kA[1][1] * kA[1][1] + kA[2][1] * kA[2][1]);
-
-    if ( fLength > 0.0 ) {
-        fSign = (kA[1][1] > 0.0 ? 1.0 : -1.0);
-        fT1 = kA[1][1] + fSign * fLength;
-        afV[2] = kA[2][1] / fT1;
-
-        fT2 = -2.0 / (1.0 + afV[2] * afV[2]);
-        afW[1] = fT2 * (kA[1][1] + kA[2][1] * afV[2]);
-        afW[2] = fT2 * (kA[1][2] + kA[2][2] * afV[2]);
-        kA[1][1] += afW[1];
-        kA[1][2] += afW[2];
-        kA[2][2] += afV[2] * afW[2];
-
-        float fA = 1.0 + fT2;
-        float fB = fT2 * afV[2];
-        float fC = 1.0 + fB * afV[2];
-
-        if ( bIdentity ) {
-            kL[0][0] = 1.0;
-            kL[0][1] = kL[1][0] = 0.0;
-            kL[0][2] = kL[2][0] = 0.0;
-            kL[1][1] = fA;
-            kL[1][2] = kL[2][1] = fB;
-            kL[2][2] = fC;
-        } else {
-            for (int iRow = 0; iRow < 3; iRow++) {
-                float fTmp0 = kL[iRow][1];
-                float fTmp1 = kL[iRow][2];
-                kL[iRow][1] = fA * fTmp0 + fB * fTmp1;
-                kL[iRow][2] = fB * fTmp0 + fC * fTmp1;
-            }
-        }
-    }
-}
-
-//----------------------------------------------------------------------------
-void Matrix3::golubKahanStep (Matrix3& kA, Matrix3& kL,
-                              Matrix3& kR) {
-    float fT11 = kA[0][1] * kA[0][1] + kA[1][1] * kA[1][1];
-    float fT22 = kA[1][2] * kA[1][2] + kA[2][2] * kA[2][2];
-    float fT12 = kA[1][1] * kA[1][2];
-    float fTrace = fT11 + fT22;
-    float fDiff = fT11 - fT22;
-    float fDiscr = sqrt(fDiff * fDiff + 4.0 * fT12 * fT12);
-    float fRoot1 = 0.5 * (fTrace + fDiscr);
-    float fRoot2 = 0.5 * (fTrace - fDiscr);
-
-    // adjust right
-    float fY = kA[0][0] - (G3D::abs(fRoot1 - fT22) <=
-                          G3D::abs(fRoot2 - fT22) ? fRoot1 : fRoot2);
-    float fZ = kA[0][1];
-    float fInvLength = 1.0 / sqrt(fY * fY + fZ * fZ);
-    float fSin = fZ * fInvLength;
-    float fCos = -fY * fInvLength;
-
-    float fTmp0 = kA[0][0];
-    float fTmp1 = kA[0][1];
-    kA[0][0] = fCos * fTmp0 - fSin * fTmp1;
-    kA[0][1] = fSin * fTmp0 + fCos * fTmp1;
-    kA[1][0] = -fSin * kA[1][1];
-    kA[1][1] *= fCos;
-
-    int iRow;
-
-    for (iRow = 0; iRow < 3; iRow++) {
-        fTmp0 = kR[0][iRow];
-        fTmp1 = kR[1][iRow];
-        kR[0][iRow] = fCos * fTmp0 - fSin * fTmp1;
-        kR[1][iRow] = fSin * fTmp0 + fCos * fTmp1;
-    }
-
-    // adjust left
-    fY = kA[0][0];
-
-    fZ = kA[1][0];
-
-    fInvLength = 1.0 / sqrt(fY * fY + fZ * fZ);
-
-    fSin = fZ * fInvLength;
-
-    fCos = -fY * fInvLength;
-
-    kA[0][0] = fCos * kA[0][0] - fSin * kA[1][0];
-
-    fTmp0 = kA[0][1];
-
-    fTmp1 = kA[1][1];
-
-    kA[0][1] = fCos * fTmp0 - fSin * fTmp1;
-
-    kA[1][1] = fSin * fTmp0 + fCos * fTmp1;
-
-    kA[0][2] = -fSin * kA[1][2];
-
-    kA[1][2] *= fCos;
-
-    int iCol;
-
-    for (iCol = 0; iCol < 3; iCol++) {
-        fTmp0 = kL[iCol][0];
-        fTmp1 = kL[iCol][1];
-        kL[iCol][0] = fCos * fTmp0 - fSin * fTmp1;
-        kL[iCol][1] = fSin * fTmp0 + fCos * fTmp1;
-    }
-
-    // adjust right
-    fY = kA[0][1];
-
-    fZ = kA[0][2];
-
-    fInvLength = 1.0 / sqrt(fY * fY + fZ * fZ);
-
-    fSin = fZ * fInvLength;
-
-    fCos = -fY * fInvLength;
-
-    kA[0][1] = fCos * kA[0][1] - fSin * kA[0][2];
-
-    fTmp0 = kA[1][1];
-
-    fTmp1 = kA[1][2];
-
-    kA[1][1] = fCos * fTmp0 - fSin * fTmp1;
-
-    kA[1][2] = fSin * fTmp0 + fCos * fTmp1;
-
-    kA[2][1] = -fSin * kA[2][2];
-
-    kA[2][2] *= fCos;
-
-    for (iRow = 0; iRow < 3; iRow++) {
-        fTmp0 = kR[1][iRow];
-        fTmp1 = kR[2][iRow];
-        kR[1][iRow] = fCos * fTmp0 - fSin * fTmp1;
-        kR[2][iRow] = fSin * fTmp0 + fCos * fTmp1;
-    }
-
-    // adjust left
-    fY = kA[1][1];
-
-    fZ = kA[2][1];
-
-    fInvLength = 1.0 / sqrt(fY * fY + fZ * fZ);
-
-    fSin = fZ * fInvLength;
-
-    fCos = -fY * fInvLength;
-
-    kA[1][1] = fCos * kA[1][1] - fSin * kA[2][1];
-
-    fTmp0 = kA[1][2];
-
-    fTmp1 = kA[2][2];
-
-    kA[1][2] = fCos * fTmp0 - fSin * fTmp1;
-
-    kA[2][2] = fSin * fTmp0 + fCos * fTmp1;
-
-    for (iCol = 0; iCol < 3; iCol++) {
-        fTmp0 = kL[iCol][1];
-        fTmp1 = kL[iCol][2];
-        kL[iCol][1] = fCos * fTmp0 - fSin * fTmp1;
-        kL[iCol][2] = fSin * fTmp0 + fCos * fTmp1;
-    }
-}
-
-//----------------------------------------------------------------------------
-void Matrix3::singularValueDecomposition (Matrix3& kL, Vector3& kS,
-        Matrix3& kR) const {
-    int iRow, iCol;
-
-    Matrix3 kA = *this;
-    bidiagonalize(kA, kL, kR);
-
-    for (int i = 0; i < ms_iSvdMaxIterations; i++) {
-        float fTmp, fTmp0, fTmp1;
-        float fSin0, fCos0, fTan0;
-        float fSin1, fCos1, fTan1;
-
-        bool bTest1 = (G3D::abs(kA[0][1]) <=
-                       ms_fSvdEpsilon * (G3D::abs(kA[0][0]) + G3D::abs(kA[1][1])));
-        bool bTest2 = (G3D::abs(kA[1][2]) <=
-                       ms_fSvdEpsilon * (G3D::abs(kA[1][1]) + G3D::abs(kA[2][2])));
-
-        if ( bTest1 ) {
-            if ( bTest2 ) {
-                kS[0] = kA[0][0];
-                kS[1] = kA[1][1];
-                kS[2] = kA[2][2];
-                break;
-            } else {
-                // 2x2 closed form factorization
-                fTmp = (kA[1][1] * kA[1][1] - kA[2][2] * kA[2][2] +
-                        kA[1][2] * kA[1][2]) / (kA[1][2] * kA[2][2]);
-                fTan0 = 0.5 * (fTmp + sqrt(fTmp * fTmp + 4.0));
-                fCos0 = 1.0 / sqrt(1.0 + fTan0 * fTan0);
-                fSin0 = fTan0 * fCos0;
-
-                for (iCol = 0; iCol < 3; iCol++) {
-                    fTmp0 = kL[iCol][1];
-                    fTmp1 = kL[iCol][2];
-                    kL[iCol][1] = fCos0 * fTmp0 - fSin0 * fTmp1;
-                    kL[iCol][2] = fSin0 * fTmp0 + fCos0 * fTmp1;
-                }
-
-                fTan1 = (kA[1][2] - kA[2][2] * fTan0) / kA[1][1];
-                fCos1 = 1.0 / sqrt(1.0 + fTan1 * fTan1);
-                fSin1 = -fTan1 * fCos1;
-
-                for (iRow = 0; iRow < 3; iRow++) {
-                    fTmp0 = kR[1][iRow];
-                    fTmp1 = kR[2][iRow];
-                    kR[1][iRow] = fCos1 * fTmp0 - fSin1 * fTmp1;
-                    kR[2][iRow] = fSin1 * fTmp0 + fCos1 * fTmp1;
-                }
-
-                kS[0] = kA[0][0];
-                kS[1] = fCos0 * fCos1 * kA[1][1] -
-                        fSin1 * (fCos0 * kA[1][2] - fSin0 * kA[2][2]);
-                kS[2] = fSin0 * fSin1 * kA[1][1] +
-                        fCos1 * (fSin0 * kA[1][2] + fCos0 * kA[2][2]);
-                break;
-            }
-        } else {
-            if ( bTest2 ) {
-                // 2x2 closed form factorization
-                fTmp = (kA[0][0] * kA[0][0] + kA[1][1] * kA[1][1] -
-                        kA[0][1] * kA[0][1]) / (kA[0][1] * kA[1][1]);
-                fTan0 = 0.5 * ( -fTmp + sqrt(fTmp * fTmp + 4.0));
-                fCos0 = 1.0 / sqrt(1.0 + fTan0 * fTan0);
-                fSin0 = fTan0 * fCos0;
-
-                for (iCol = 0; iCol < 3; iCol++) {
-                    fTmp0 = kL[iCol][0];
-                    fTmp1 = kL[iCol][1];
-                    kL[iCol][0] = fCos0 * fTmp0 - fSin0 * fTmp1;
-                    kL[iCol][1] = fSin0 * fTmp0 + fCos0 * fTmp1;
-                }
-
-                fTan1 = (kA[0][1] - kA[1][1] * fTan0) / kA[0][0];
-                fCos1 = 1.0 / sqrt(1.0 + fTan1 * fTan1);
-                fSin1 = -fTan1 * fCos1;
-
-                for (iRow = 0; iRow < 3; iRow++) {
-                    fTmp0 = kR[0][iRow];
-                    fTmp1 = kR[1][iRow];
-                    kR[0][iRow] = fCos1 * fTmp0 - fSin1 * fTmp1;
-                    kR[1][iRow] = fSin1 * fTmp0 + fCos1 * fTmp1;
-                }
-
-                kS[0] = fCos0 * fCos1 * kA[0][0] -
-                        fSin1 * (fCos0 * kA[0][1] - fSin0 * kA[1][1]);
-                kS[1] = fSin0 * fSin1 * kA[0][0] +
-                        fCos1 * (fSin0 * kA[0][1] + fCos0 * kA[1][1]);
-                kS[2] = kA[2][2];
-                break;
-            } else {
-                golubKahanStep(kA, kL, kR);
-            }
-        }
-    }
-
-    // positize diagonal
-    for (iRow = 0; iRow < 3; iRow++) {
-        if ( kS[iRow] < 0.0 ) {
-            kS[iRow] = -kS[iRow];
-
-            for (iCol = 0; iCol < 3; iCol++)
-                kR[iRow][iCol] = -kR[iRow][iCol];
-        }
-    }
-}
-
-//----------------------------------------------------------------------------
-void Matrix3::singularValueComposition (const Matrix3& kL,
-                                        const Vector3& kS, const Matrix3& kR) {
-    int iRow, iCol;
-    Matrix3 kTmp;
-
-    // product S*R
-    for (iRow = 0; iRow < 3; iRow++) {
-        for (iCol = 0; iCol < 3; iCol++)
-            kTmp[iRow][iCol] = kS[iRow] * kR[iRow][iCol];
-    }
-
-    // product L*S*R
-    for (iRow = 0; iRow < 3; iRow++) {
-        for (iCol = 0; iCol < 3; iCol++) {
-            elt[iRow][iCol] = 0.0;
-
-            for (int iMid = 0; iMid < 3; iMid++)
-                elt[iRow][iCol] += kL[iRow][iMid] * kTmp[iMid][iCol];
-        }
-    }
-}
-
-//----------------------------------------------------------------------------
-void Matrix3::orthonormalize () {
-    // Algorithm uses Gram-Schmidt orthogonalization.  If 'this' matrix is
-    // M = [m0|m1|m2], then orthonormal output matrix is Q = [q0|q1|q2],
-    //
-    //   q0 = m0/|m0|
-    //   q1 = (m1-(q0*m1)q0)/|m1-(q0*m1)q0|
-    //   q2 = (m2-(q0*m2)q0-(q1*m2)q1)/|m2-(q0*m2)q0-(q1*m2)q1|
-    //
-    // where |V| indicates length of vector V and A*B indicates dot
-    // product of vectors A and B.
-
-    // compute q0
-    float fInvLength = 1.0 / sqrt(elt[0][0] * elt[0][0]
-                                       + elt[1][0] * elt[1][0] +
-                                       elt[2][0] * elt[2][0]);
-
-    elt[0][0] *= fInvLength;
-    elt[1][0] *= fInvLength;
-    elt[2][0] *= fInvLength;
-
-    // compute q1
-    float fDot0 =
-        elt[0][0] * elt[0][1] +
-        elt[1][0] * elt[1][1] +
-        elt[2][0] * elt[2][1];
-
-    elt[0][1] -= fDot0 * elt[0][0];
-    elt[1][1] -= fDot0 * elt[1][0];
-    elt[2][1] -= fDot0 * elt[2][0];
-
-    fInvLength = 1.0 / sqrt(elt[0][1] * elt[0][1] +
-                                  elt[1][1] * elt[1][1] +
-                                  elt[2][1] * elt[2][1]);
-
-    elt[0][1] *= fInvLength;
-    elt[1][1] *= fInvLength;
-    elt[2][1] *= fInvLength;
-
-    // compute q2
-    float fDot1 =
-        elt[0][1] * elt[0][2] +
-        elt[1][1] * elt[1][2] +
-        elt[2][1] * elt[2][2];
-
-    fDot0 =
-        elt[0][0] * elt[0][2] +
-        elt[1][0] * elt[1][2] +
-        elt[2][0] * elt[2][2];
-
-    elt[0][2] -= fDot0 * elt[0][0] + fDot1 * elt[0][1];
-    elt[1][2] -= fDot0 * elt[1][0] + fDot1 * elt[1][1];
-    elt[2][2] -= fDot0 * elt[2][0] + fDot1 * elt[2][1];
-
-    fInvLength = 1.0 / sqrt(elt[0][2] * elt[0][2] +
-                                  elt[1][2] * elt[1][2] +
-                                  elt[2][2] * elt[2][2]);
-
-    elt[0][2] *= fInvLength;
-    elt[1][2] *= fInvLength;
-    elt[2][2] *= fInvLength;
-}
-
-//----------------------------------------------------------------------------
-void Matrix3::qDUDecomposition (Matrix3& kQ,
-                                Vector3& kD, Vector3& kU) const {
-    // Factor M = QR = QDU where Q is orthogonal, D is diagonal,
-    // and U is upper triangular with ones on its diagonal.  Algorithm uses
-    // Gram-Schmidt orthogonalization (the QR algorithm).
-    //
-    // If M = [ m0 | m1 | m2 ] and Q = [ q0 | q1 | q2 ], then
-    //
-    //   q0 = m0/|m0|
-    //   q1 = (m1-(q0*m1)q0)/|m1-(q0*m1)q0|
-    //   q2 = (m2-(q0*m2)q0-(q1*m2)q1)/|m2-(q0*m2)q0-(q1*m2)q1|
-    //
-    // where |V| indicates length of vector V and A*B indicates dot
-    // product of vectors A and B.  The matrix R has entries
-    //
-    //   r00 = q0*m0  r01 = q0*m1  r02 = q0*m2
-    //   r10 = 0      r11 = q1*m1  r12 = q1*m2
-    //   r20 = 0      r21 = 0      r22 = q2*m2
-    //
-    // so D = diag(r00,r11,r22) and U has entries u01 = r01/r00,
-    // u02 = r02/r00, and u12 = r12/r11.
-
-    // Q = rotation
-    // D = scaling
-    // U = shear
-
-    // D stores the three diagonal entries r00, r11, r22
-    // U stores the entries U[0] = u01, U[1] = u02, U[2] = u12
-
-    // build orthogonal matrix Q
-    float fInvLength = 1.0 / sqrt(elt[0][0] * elt[0][0]
-                                       + elt[1][0] * elt[1][0] +
-                                       elt[2][0] * elt[2][0]);
-    kQ[0][0] = elt[0][0] * fInvLength;
-    kQ[1][0] = elt[1][0] * fInvLength;
-    kQ[2][0] = elt[2][0] * fInvLength;
-
-    float fDot = kQ[0][0] * elt[0][1] + kQ[1][0] * elt[1][1] +
-                kQ[2][0] * elt[2][1];
-    kQ[0][1] = elt[0][1] - fDot * kQ[0][0];
-    kQ[1][1] = elt[1][1] - fDot * kQ[1][0];
-    kQ[2][1] = elt[2][1] - fDot * kQ[2][0];
-    fInvLength = 1.0 / sqrt(kQ[0][1] * kQ[0][1] + kQ[1][1] * kQ[1][1] +
-                                  kQ[2][1] * kQ[2][1]);
-    kQ[0][1] *= fInvLength;
-    kQ[1][1] *= fInvLength;
-    kQ[2][1] *= fInvLength;
-
-    fDot = kQ[0][0] * elt[0][2] + kQ[1][0] * elt[1][2] +
-           kQ[2][0] * elt[2][2];
-    kQ[0][2] = elt[0][2] - fDot * kQ[0][0];
-    kQ[1][2] = elt[1][2] - fDot * kQ[1][0];
-    kQ[2][2] = elt[2][2] - fDot * kQ[2][0];
-    fDot = kQ[0][1] * elt[0][2] + kQ[1][1] * elt[1][2] +
-           kQ[2][1] * elt[2][2];
-    kQ[0][2] -= fDot * kQ[0][1];
-    kQ[1][2] -= fDot * kQ[1][1];
-    kQ[2][2] -= fDot * kQ[2][1];
-    fInvLength = 1.0 / sqrt(kQ[0][2] * kQ[0][2] + kQ[1][2] * kQ[1][2] +
-                                  kQ[2][2] * kQ[2][2]);
-    kQ[0][2] *= fInvLength;
-    kQ[1][2] *= fInvLength;
-    kQ[2][2] *= fInvLength;
-
-    // guarantee that orthogonal matrix has determinant 1 (no reflections)
-    float fDet = kQ[0][0] * kQ[1][1] * kQ[2][2] + kQ[0][1] * kQ[1][2] * kQ[2][0] +
-                kQ[0][2] * kQ[1][0] * kQ[2][1] - kQ[0][2] * kQ[1][1] * kQ[2][0] -
-                kQ[0][1] * kQ[1][0] * kQ[2][2] - kQ[0][0] * kQ[1][2] * kQ[2][1];
-
-    if ( fDet < 0.0 ) {
-        for (int iRow = 0; iRow < 3; iRow++)
-            for (int iCol = 0; iCol < 3; iCol++)
-                kQ[iRow][iCol] = -kQ[iRow][iCol];
-    }
-
-    // build "right" matrix R
-    Matrix3 kR;
-
-    kR[0][0] = kQ[0][0] * elt[0][0] + kQ[1][0] * elt[1][0] +
-               kQ[2][0] * elt[2][0];
-
-    kR[0][1] = kQ[0][0] * elt[0][1] + kQ[1][0] * elt[1][1] +
-               kQ[2][0] * elt[2][1];
-
-    kR[1][1] = kQ[0][1] * elt[0][1] + kQ[1][1] * elt[1][1] +
-               kQ[2][1] * elt[2][1];
-
-    kR[0][2] = kQ[0][0] * elt[0][2] + kQ[1][0] * elt[1][2] +
-               kQ[2][0] * elt[2][2];
-
-    kR[1][2] = kQ[0][1] * elt[0][2] + kQ[1][1] * elt[1][2] +
-               kQ[2][1] * elt[2][2];
-
-    kR[2][2] = kQ[0][2] * elt[0][2] + kQ[1][2] * elt[1][2] +
-               kQ[2][2] * elt[2][2];
-
-    // the scaling component
-    kD[0] = kR[0][0];
-
-    kD[1] = kR[1][1];
-
-    kD[2] = kR[2][2];
-
-    // the shear component
-    float fInvD0 = 1.0 / kD[0];
-
-    kU[0] = kR[0][1] * fInvD0;
-
-    kU[1] = kR[0][2] * fInvD0;
-
-    kU[2] = kR[1][2] / kD[1];
-}
-
-//----------------------------------------------------------------------------
-float Matrix3::maxCubicRoot (float afCoeff[3]) {
-    // Spectral norm is for A^T*A, so characteristic polynomial
-    // P(x) = c[0]+c[1]*x+c[2]*x^2+x^3 has three positive float roots.
-    // This yields the assertions c[0] < 0 and c[2]*c[2] >= 3*c[1].
-
-    // quick out for uniform scale (triple root)
-    const float fOneThird = 1.0f / 3.0f;
-    const float fEpsilon = 1e-06f;
-    float fDiscr = afCoeff[2] * afCoeff[2] - 3.0f * afCoeff[1];
-
-    if ( fDiscr <= fEpsilon )
-        return -fOneThird*afCoeff[2];
-
-    // Compute an upper bound on roots of P(x).  This assumes that A^T*A
-    // has been scaled by its largest entry.
-    float fX = 1.0f;
-
-    float fPoly = afCoeff[0] + fX * (afCoeff[1] + fX * (afCoeff[2] + fX));
-
-    if ( fPoly < 0.0f ) {
-        // uses a matrix norm to find an upper bound on maximum root
-        fX = G3D::abs(afCoeff[0]);
-        float fTmp = 1.0 + G3D::abs(afCoeff[1]);
-
-        if ( fTmp > fX )
-            fX = fTmp;
-
-        fTmp = 1.0 + G3D::abs(afCoeff[2]);
-
-        if ( fTmp > fX )
-            fX = fTmp;
-    }
-
-    // Newton's method to find root
-    float fTwoC2 = 2.0f * afCoeff[2];
-
-    for (int i = 0; i < 16; i++) {
-        fPoly = afCoeff[0] + fX * (afCoeff[1] + fX * (afCoeff[2] + fX));
-
-        if ( G3D::abs(fPoly) <= fEpsilon )
-            return fX;
-
-        float fDeriv = afCoeff[1] + fX * (fTwoC2 + 3.0f * fX);
-
-        fX -= fPoly / fDeriv;
-    }
-
-    return fX;
-}
-
-//----------------------------------------------------------------------------
-float Matrix3::spectralNorm () const {
-    Matrix3 kP;
-    int iRow, iCol;
-    float fPmax = 0.0;
-
-    for (iRow = 0; iRow < 3; iRow++) {
-        for (iCol = 0; iCol < 3; iCol++) {
-            kP[iRow][iCol] = 0.0;
-
-            for (int iMid = 0; iMid < 3; iMid++) {
-                kP[iRow][iCol] +=
-                    elt[iMid][iRow] * elt[iMid][iCol];
-            }
-
-            if ( kP[iRow][iCol] > fPmax )
-                fPmax = kP[iRow][iCol];
-        }
-    }
-
-    float fInvPmax = 1.0 / fPmax;
-
-    for (iRow = 0; iRow < 3; iRow++) {
-        for (iCol = 0; iCol < 3; iCol++)
-            kP[iRow][iCol] *= fInvPmax;
-    }
-
-    float afCoeff[3];
-    afCoeff[0] = -(kP[0][0] * (kP[1][1] * kP[2][2] - kP[1][2] * kP[2][1]) +
-                   kP[0][1] * (kP[2][0] * kP[1][2] - kP[1][0] * kP[2][2]) +
-                   kP[0][2] * (kP[1][0] * kP[2][1] - kP[2][0] * kP[1][1]));
-    afCoeff[1] = kP[0][0] * kP[1][1] - kP[0][1] * kP[1][0] +
-                 kP[0][0] * kP[2][2] - kP[0][2] * kP[2][0] +
-                 kP[1][1] * kP[2][2] - kP[1][2] * kP[2][1];
-    afCoeff[2] = -(kP[0][0] + kP[1][1] + kP[2][2]);
-
-    float fRoot = maxCubicRoot(afCoeff);
-    float fNorm = sqrt(fPmax * fRoot);
-    return fNorm;
-}
-
-//----------------------------------------------------------------------------
-void Matrix3::toAxisAngle (Vector3& rkAxis, float& rfRadians) const {
-    // 
-    // Let (x,y,z) be the unit-length axis and let A be an angle of rotation.
-    // The rotation matrix is R = I + sin(A)*P + (1-cos(A))*P^2 (Rodrigues' formula) where
-    // I is the identity and
-    //
-    //       +-        -+
-    //   P = |  0 -z +y |
-    //       | +z  0 -x |
-    //       | -y +x  0 |
-    //       +-        -+
-    //
-    // If A > 0, R represents a counterclockwise rotation about the axis in
-    // the sense of looking from the tip of the axis vector towards the
-    // origin.  Some algebra will show that
-    //
-    //   cos(A) = (trace(R)-1)/2  and  R - R^t = 2*sin(A)*P
-    //
-    // In the event that A = pi, R-R^t = 0 which prevents us from extracting
-    // the axis through P.  Instead note that R = I+2*P^2 when A = pi, so
-    // P^2 = (R-I)/2.  The diagonal entries of P^2 are x^2-1, y^2-1, and
-    // z^2-1.  We can solve these for axis (x,y,z).  Because the angle is pi,
-    // it does not matter which sign you choose on the square roots.
-
-    float fTrace = elt[0][0] + elt[1][1] + elt[2][2];
-    float fCos = 0.5f * (fTrace - 1.0f);
-    rfRadians = G3D::aCos(fCos);  // in [0,PI]
-
-    if ( rfRadians > 0.0 ) {
-        if ( rfRadians < pi() ) {
-            rkAxis.x = elt[2][1] - elt[1][2];
-            rkAxis.y = elt[0][2] - elt[2][0];
-            rkAxis.z = elt[1][0] - elt[0][1];
-            rkAxis.unitize();
-        } else {
-            // angle is PI
-            float fHalfInverse;
-
-            if ( elt[0][0] >= elt[1][1] ) {
-                // r00 >= r11
-                if ( elt[0][0] >= elt[2][2] ) {
-                    // r00 is maximum diagonal term
-                    rkAxis.x = 0.5 * sqrt(elt[0][0] -
-                                                elt[1][1] - elt[2][2] + 1.0);
-                    fHalfInverse = 0.5 / rkAxis.x;
-                    rkAxis.y = fHalfInverse * elt[0][1];
-                    rkAxis.z = fHalfInverse * elt[0][2];
-                } else {
-                    // r22 is maximum diagonal term
-                    rkAxis.z = 0.5 * sqrt(elt[2][2] -
-                                                elt[0][0] - elt[1][1] + 1.0);
-                    fHalfInverse = 0.5 / rkAxis.z;
-                    rkAxis.x = fHalfInverse * elt[0][2];
-                    rkAxis.y = fHalfInverse * elt[1][2];
-                }
-            } else {
-                // r11 > r00
-                if ( elt[1][1] >= elt[2][2] ) {
-                    // r11 is maximum diagonal term
-                    rkAxis.y = 0.5 * sqrt(elt[1][1] -
-                                                elt[0][0] - elt[2][2] + 1.0);
-                    fHalfInverse = 0.5 / rkAxis.y;
-                    rkAxis.x = fHalfInverse * elt[0][1];
-                    rkAxis.z = fHalfInverse * elt[1][2];
-                } else {
-                    // r22 is maximum diagonal term
-                    rkAxis.z = 0.5 * sqrt(elt[2][2] -
-                                                elt[0][0] - elt[1][1] + 1.0);
-                    fHalfInverse = 0.5 / rkAxis.z;
-                    rkAxis.x = fHalfInverse * elt[0][2];
-                    rkAxis.y = fHalfInverse * elt[1][2];
-                }
-            }
-        }
-    } else {
-        // The angle is 0 and the matrix is the identity.  Any axis will
-        // work, so just use the x-axis.
-        rkAxis.x = 1.0;
-        rkAxis.y = 0.0;
-        rkAxis.z = 0.0;
-    }
-}
-
-//----------------------------------------------------------------------------
-Matrix3 Matrix3::fromAxisAngle (const Vector3& _axis, float fRadians) {
-    Vector3 axis = _axis.direction();
-
-    Matrix3 m;
-    float fCos  = cos(fRadians);
-    float fSin  = sin(fRadians);
-    float fOneMinusCos = 1.0 - fCos;
-    float fX2   = square(axis.x);
-    float fY2   = square(axis.y);
-    float fZ2   = square(axis.z);
-    float fXYM  = axis.x * axis.y * fOneMinusCos;
-    float fXZM  = axis.x * axis.z * fOneMinusCos;
-    float fYZM  = axis.y * axis.z * fOneMinusCos;
-    float fXSin = axis.x * fSin;
-    float fYSin = axis.y * fSin;
-    float fZSin = axis.z * fSin;
-
-    m.elt[0][0] = fX2 * fOneMinusCos + fCos;
-    m.elt[0][1] = fXYM - fZSin;
-    m.elt[0][2] = fXZM + fYSin;
-
-    m.elt[1][0] = fXYM + fZSin;
-    m.elt[1][1] = fY2 * fOneMinusCos + fCos;
-    m.elt[1][2] = fYZM - fXSin;
-
-    m.elt[2][0] = fXZM - fYSin;
-    m.elt[2][1] = fYZM + fXSin;
-    m.elt[2][2] = fZ2 * fOneMinusCos + fCos;
-
-    return m;
-}
-
-//----------------------------------------------------------------------------
-bool Matrix3::toEulerAnglesXYZ (float& rfXAngle, float& rfYAngle,
-                                float& rfZAngle) const {
-    // rot =  cy*cz          -cy*sz           sy
-    //        cz*sx*sy+cx*sz  cx*cz-sx*sy*sz -cy*sx
-    //       -cx*cz*sy+sx*sz  cz*sx+cx*sy*sz  cx*cy
-
-    if ( elt[0][2] < 1.0f ) {
-        if ( elt[0][2] > -1.0f ) {
-            rfXAngle = G3D::aTan2( -elt[1][2], elt[2][2]);
-            rfYAngle = (float) G3D::aSin(elt[0][2]);
-            rfZAngle = G3D::aTan2( -elt[0][1], elt[0][0]);
-            return true;
-        } else {
-            // WARNING.  Not unique.  XA - ZA = -atan2(r10,r11)
-            rfXAngle = -G3D::aTan2(elt[1][0], elt[1][1]);
-            rfYAngle = -(float)halfPi();
-            rfZAngle = 0.0f;
-            return false;
-        }
-    } else {
-        // WARNING.  Not unique.  XAngle + ZAngle = atan2(r10,r11)
-        rfXAngle = G3D::aTan2(elt[1][0], elt[1][1]);
-        rfYAngle = (float)halfPi();
-        rfZAngle = 0.0f;
-        return false;
-    }
-}
-
-//----------------------------------------------------------------------------
-bool Matrix3::toEulerAnglesXZY (float& rfXAngle, float& rfZAngle,
-                                float& rfYAngle) const {
-    // rot =  cy*cz          -sz              cz*sy
-    //        sx*sy+cx*cy*sz  cx*cz          -cy*sx+cx*sy*sz
-    //       -cx*sy+cy*sx*sz  cz*sx           cx*cy+sx*sy*sz
-
-    if ( elt[0][1] < 1.0f ) {
-        if ( elt[0][1] > -1.0f ) {
-            rfXAngle = G3D::aTan2(elt[2][1], elt[1][1]);
-            rfZAngle = (float) asin( -elt[0][1]);
-            rfYAngle = G3D::aTan2(elt[0][2], elt[0][0]);
-            return true;
-        } else {
-            // WARNING.  Not unique.  XA - YA = atan2(r20,r22)
-            rfXAngle = G3D::aTan2(elt[2][0], elt[2][2]);
-            rfZAngle = (float)halfPi();
-            rfYAngle = 0.0;
-            return false;
-        }
-    } else {
-        // WARNING.  Not unique.  XA + YA = atan2(-r20,r22)
-        rfXAngle = G3D::aTan2( -elt[2][0], elt[2][2]);
-        rfZAngle = -(float)halfPi();
-        rfYAngle = 0.0f;
-        return false;
-    }
-}
-
-//----------------------------------------------------------------------------
-bool Matrix3::toEulerAnglesYXZ (float& rfYAngle, float& rfXAngle,
-                                float& rfZAngle) const {
-    // rot =  cy*cz+sx*sy*sz  cz*sx*sy-cy*sz  cx*sy
-    //        cx*sz           cx*cz          -sx
-    //       -cz*sy+cy*sx*sz  cy*cz*sx+sy*sz  cx*cy
-
-    if ( elt[1][2] < 1.0 ) {
-        if ( elt[1][2] > -1.0 ) {
-            rfYAngle = G3D::aTan2(elt[0][2], elt[2][2]);
-            rfXAngle = (float) asin( -elt[1][2]);
-            rfZAngle = G3D::aTan2(elt[1][0], elt[1][1]);
-            return true;
-        } else {
-            // WARNING.  Not unique.  YA - ZA = atan2(r01,r00)
-            rfYAngle = G3D::aTan2(elt[0][1], elt[0][0]);
-            rfXAngle = (float)halfPi();
-            rfZAngle = 0.0;
-            return false;
-        }
-    } else {
-        // WARNING.  Not unique.  YA + ZA = atan2(-r01,r00)
-        rfYAngle = G3D::aTan2( -elt[0][1], elt[0][0]);
-        rfXAngle = -(float)halfPi();
-        rfZAngle = 0.0f;
-        return false;
-    }
-}
-
-//----------------------------------------------------------------------------
-bool Matrix3::toEulerAnglesYZX (float& rfYAngle, float& rfZAngle,
-                                float& rfXAngle) const {
-    // rot =  cy*cz           sx*sy-cx*cy*sz  cx*sy+cy*sx*sz
-    //        sz              cx*cz          -cz*sx
-    //       -cz*sy           cy*sx+cx*sy*sz  cx*cy-sx*sy*sz
-
-    if ( elt[1][0] < 1.0 ) {
-        if ( elt[1][0] > -1.0 ) {
-            rfYAngle = G3D::aTan2( -elt[2][0], elt[0][0]);
-            rfZAngle = (float) asin(elt[1][0]);
-            rfXAngle = G3D::aTan2( -elt[1][2], elt[1][1]);
-            return true;
-        } else {
-            // WARNING.  Not unique.  YA - XA = -atan2(r21,r22);
-            rfYAngle = -G3D::aTan2(elt[2][1], elt[2][2]);
-            rfZAngle = -(float)halfPi();
-            rfXAngle = 0.0;
-            return false;
-        }
-    } else {
-        // WARNING.  Not unique.  YA + XA = atan2(r21,r22)
-        rfYAngle = G3D::aTan2(elt[2][1], elt[2][2]);
-        rfZAngle = (float)halfPi();
-        rfXAngle = 0.0f;
-        return false;
-    }
-}
-
-//----------------------------------------------------------------------------
-bool Matrix3::toEulerAnglesZXY (float& rfZAngle, float& rfXAngle,
-                                float& rfYAngle) const {
-    // rot =  cy*cz-sx*sy*sz -cx*sz           cz*sy+cy*sx*sz
-    //        cz*sx*sy+cy*sz  cx*cz          -cy*cz*sx+sy*sz
-    //       -cx*sy           sx              cx*cy
-
-    if ( elt[2][1] < 1.0 ) {
-        if ( elt[2][1] > -1.0 ) {
-            rfZAngle = G3D::aTan2( -elt[0][1], elt[1][1]);
-            rfXAngle = (float) asin(elt[2][1]);
-            rfYAngle = G3D::aTan2( -elt[2][0], elt[2][2]);
-            return true;
-        } else {
-            // WARNING.  Not unique.  ZA - YA = -atan(r02,r00)
-            rfZAngle = -G3D::aTan2(elt[0][2], elt[0][0]);
-            rfXAngle = -(float)halfPi();
-            rfYAngle = 0.0f;
-            return false;
-        }
-    } else {
-        // WARNING.  Not unique.  ZA + YA = atan2(r02,r00)
-        rfZAngle = G3D::aTan2(elt[0][2], elt[0][0]);
-        rfXAngle = (float)halfPi();
-        rfYAngle = 0.0f;
-        return false;
-    }
-}
-
-//----------------------------------------------------------------------------
-bool Matrix3::toEulerAnglesZYX (float& rfZAngle, float& rfYAngle,
-                                float& rfXAngle) const {
-    // rot =  cy*cz           cz*sx*sy-cx*sz  cx*cz*sy+sx*sz
-    //        cy*sz           cx*cz+sx*sy*sz -cz*sx+cx*sy*sz
-    //       -sy              cy*sx           cx*cy
-
-    if ( elt[2][0] < 1.0 ) {
-        if ( elt[2][0] > -1.0 ) {
-            rfZAngle = atan2f(elt[1][0], elt[0][0]);
-            rfYAngle = asinf(-(double)elt[2][1]);
-            rfXAngle = atan2f(elt[2][1], elt[2][2]);
-            return true;
-        } else {
-            // WARNING.  Not unique.  ZA - XA = -atan2(r01,r02)
-            rfZAngle = -G3D::aTan2(elt[0][1], elt[0][2]);
-            rfYAngle = (float)halfPi();
-            rfXAngle = 0.0f;
-            return false;
-        }
-    } else {
-        // WARNING.  Not unique.  ZA + XA = atan2(-r01,-r02)
-        rfZAngle = G3D::aTan2( -elt[0][1], -elt[0][2]);
-        rfYAngle = -(float)halfPi();
-        rfXAngle = 0.0f;
-        return false;
-    }
-}
-
-//----------------------------------------------------------------------------
-Matrix3 Matrix3::fromEulerAnglesXYZ (float fYAngle, float fPAngle,
-                                  float fRAngle) {
-    float fCos, fSin;
-
-    fCos = cosf(fYAngle);
-    fSin = sinf(fYAngle);
-    Matrix3 kXMat(1.0f, 0.0f, 0.0f, 0.0f, fCos, -fSin, 0.0, fSin, fCos);
-
-    fCos = cosf(fPAngle);
-    fSin = sinf(fPAngle);
-    Matrix3 kYMat(fCos, 0.0f, fSin, 0.0f, 1.0f, 0.0f, -fSin, 0.0f, fCos);
-
-    fCos = cosf(fRAngle);
-    fSin = sinf(fRAngle);
-    Matrix3 kZMat(fCos, -fSin, 0.0f, fSin, fCos, 0.0f, 0.0f, 0.0f, 1.0f);
-
-    return kXMat * (kYMat * kZMat);
-}
-
-//----------------------------------------------------------------------------
-Matrix3 Matrix3::fromEulerAnglesXZY (float fYAngle, float fPAngle,
-                                  float fRAngle) {
-
-    float fCos, fSin;
-
-    fCos = cosf(fYAngle);
-    fSin = sinf(fYAngle);
-    Matrix3 kXMat(1.0, 0.0, 0.0, 0.0, fCos, -fSin, 0.0, fSin, fCos);
-
-    fCos = cosf(fPAngle);
-    fSin = sinf(fPAngle);
-    Matrix3 kZMat(fCos, -fSin, 0.0, fSin, fCos, 0.0, 0.0, 0.0, 1.0);
-
-    fCos = cosf(fRAngle);
-    fSin = sinf(fRAngle);
-    Matrix3 kYMat(fCos, 0.0, fSin, 0.0, 1.0, 0.0, -fSin, 0.0, fCos);
-
-    return kXMat * (kZMat * kYMat);
-}
-
-//----------------------------------------------------------------------------
-Matrix3 Matrix3::fromEulerAnglesYXZ(
-    float fYAngle, 
-    float fPAngle,
-    float fRAngle) {
-    
-    float fCos, fSin;
-
-    fCos = cos(fYAngle);
-    fSin = sin(fYAngle);
-    Matrix3 kYMat(fCos, 0.0f, fSin, 0.0f, 1.0f, 0.0f, -fSin, 0.0f, fCos);
-
-    fCos = cos(fPAngle);
-    fSin = sin(fPAngle);
-    Matrix3 kXMat(1.0f, 0.0f, 0.0f, 0.0f, fCos, -fSin, 0.0f, fSin, fCos);
-
-    fCos = cos(fRAngle);
-    fSin = sin(fRAngle);
-    Matrix3 kZMat(fCos, -fSin, 0.0f, fSin, fCos, 0.0f, 0.0f, 0.0f, 1.0f);
-
-    return kYMat * (kXMat * kZMat);
-}
-
-//----------------------------------------------------------------------------
-Matrix3 Matrix3::fromEulerAnglesYZX(
-    float fYAngle, 
-    float fPAngle,
-    float fRAngle) {
-
-    float fCos, fSin;
-
-    fCos = cos(fYAngle);
-    fSin = sin(fYAngle);
-    Matrix3 kYMat(fCos, 0.0f, fSin, 0.0f, 1.0f, 0.0f, -fSin, 0.0f, fCos);
-
-    fCos = cos(fPAngle);
-    fSin = sin(fPAngle);
-    Matrix3 kZMat(fCos, -fSin, 0.0f, fSin, fCos, 0.0f, 0.0f, 0.0f, 1.0f);
-
-    fCos = cos(fRAngle);
-    fSin = sin(fRAngle);
-    Matrix3 kXMat(1.0f, 0.0f, 0.0f, 0.0f, fCos, -fSin, 0.0f, fSin, fCos);
-
-    return kYMat * (kZMat * kXMat);
-}
-
-//----------------------------------------------------------------------------
-Matrix3 Matrix3::fromEulerAnglesZXY (float fYAngle, float fPAngle,
-                                  float fRAngle) {
-    float fCos, fSin;
-
-    fCos = cos(fYAngle);
-    fSin = sin(fYAngle);
-    Matrix3 kZMat(fCos, -fSin, 0.0, fSin, fCos, 0.0, 0.0, 0.0, 1.0);
-
-    fCos = cos(fPAngle);
-    fSin = sin(fPAngle);
-    Matrix3 kXMat(1.0, 0.0, 0.0, 0.0, fCos, -fSin, 0.0, fSin, fCos);
-
-    fCos = cos(fRAngle);
-    fSin = sin(fRAngle);
-    Matrix3 kYMat(fCos, 0.0, fSin, 0.0, 1.0, 0.0, -fSin, 0.0, fCos);
-
-    return kZMat * (kXMat * kYMat);
-}
-
-//----------------------------------------------------------------------------
-Matrix3 Matrix3::fromEulerAnglesZYX (float fYAngle, float fPAngle,
-                                  float fRAngle) {
-    float fCos, fSin;
-
-    fCos = cos(fYAngle);
-    fSin = sin(fYAngle);
-    Matrix3 kZMat(fCos, -fSin, 0.0, fSin, fCos, 0.0, 0.0, 0.0, 1.0);
-
-    fCos = cos(fPAngle);
-    fSin = sin(fPAngle);
-    Matrix3 kYMat(fCos, 0.0, fSin, 0.0, 1.0, 0.0, -fSin, 0.0, fCos);
-
-    fCos = cos(fRAngle);
-    fSin = sin(fRAngle);
-    Matrix3 kXMat(1.0, 0.0, 0.0, 0.0, fCos, -fSin, 0.0, fSin, fCos);
-
-    return kZMat * (kYMat * kXMat);
-}
-
-//----------------------------------------------------------------------------
-void Matrix3::tridiagonal (float afDiag[3], float afSubDiag[3]) {
-    // Householder reduction T = Q^t M Q
-    //   Input:
-    //     mat, symmetric 3x3 matrix M
-    //   Output:
-    //     mat, orthogonal matrix Q
-    //     diag, diagonal entries of T
-    //     subd, subdiagonal entries of T (T is symmetric)
-
-    float fA = elt[0][0];
-    float fB = elt[0][1];
-    float fC = elt[0][2];
-    float fD = elt[1][1];
-    float fE = elt[1][2];
-    float fF = elt[2][2];
-
-    afDiag[0] = fA;
-    afSubDiag[2] = 0.0;
-
-    if ( G3D::abs(fC) >= EPSILON ) {
-        float fLength = sqrt(fB * fB + fC * fC);
-        float fInvLength = 1.0 / fLength;
-        fB *= fInvLength;
-        fC *= fInvLength;
-        float fQ = 2.0 * fB * fE + fC * (fF - fD);
-        afDiag[1] = fD + fC * fQ;
-        afDiag[2] = fF - fC * fQ;
-        afSubDiag[0] = fLength;
-        afSubDiag[1] = fE - fB * fQ;
-        elt[0][0] = 1.0;
-        elt[0][1] = 0.0;
-        elt[0][2] = 0.0;
-        elt[1][0] = 0.0;
-        elt[1][1] = fB;
-        elt[1][2] = fC;
-        elt[2][0] = 0.0;
-        elt[2][1] = fC;
-        elt[2][2] = -fB;
-    } else {
-        afDiag[1] = fD;
-        afDiag[2] = fF;
-        afSubDiag[0] = fB;
-        afSubDiag[1] = fE;
-        elt[0][0] = 1.0;
-        elt[0][1] = 0.0;
-        elt[0][2] = 0.0;
-        elt[1][0] = 0.0;
-        elt[1][1] = 1.0;
-        elt[1][2] = 0.0;
-        elt[2][0] = 0.0;
-        elt[2][1] = 0.0;
-        elt[2][2] = 1.0;
-    }
-}
-
-//----------------------------------------------------------------------------
-bool Matrix3::qLAlgorithm (float afDiag[3], float afSubDiag[3]) {
-    // QL iteration with implicit shifting to reduce matrix from tridiagonal
-    // to diagonal
-
-    for (int i0 = 0; i0 < 3; i0++) {
-        const int iMaxIter = 32;
-        int iIter;
-
-        for (iIter = 0; iIter < iMaxIter; iIter++) {
-            int i1;
-
-            for (i1 = i0; i1 <= 1; i1++) {
-                float fSum = G3D::abs(afDiag[i1]) +
-                            G3D::abs(afDiag[i1 + 1]);
-
-                if ( G3D::abs(afSubDiag[i1]) + fSum == fSum )
-                    break;
-            }
-
-            if ( i1 == i0 )
-                break;
-
-            float fTmp0 = (afDiag[i0 + 1] - afDiag[i0]) / (2.0 * afSubDiag[i0]);
-
-            float fTmp1 = sqrt(fTmp0 * fTmp0 + 1.0);
-
-            if ( fTmp0 < 0.0 )
-                fTmp0 = afDiag[i1] - afDiag[i0] + afSubDiag[i0] / (fTmp0 - fTmp1);
-            else
-                fTmp0 = afDiag[i1] - afDiag[i0] + afSubDiag[i0] / (fTmp0 + fTmp1);
-
-            float fSin = 1.0;
-
-            float fCos = 1.0;
-
-            float fTmp2 = 0.0;
-
-            for (int i2 = i1 - 1; i2 >= i0; i2--) {
-                float fTmp3 = fSin * afSubDiag[i2];
-                float fTmp4 = fCos * afSubDiag[i2];
-
-                if (G3D::abs(fTmp3) >= G3D::abs(fTmp0)) {
-                    fCos = fTmp0 / fTmp3;
-                    fTmp1 = sqrt(fCos * fCos + 1.0);
-                    afSubDiag[i2 + 1] = fTmp3 * fTmp1;
-                    fSin = 1.0 / fTmp1;
-                    fCos *= fSin;
-                } else {
-                    fSin = fTmp3 / fTmp0;
-                    fTmp1 = sqrt(fSin * fSin + 1.0);
-                    afSubDiag[i2 + 1] = fTmp0 * fTmp1;
-                    fCos = 1.0 / fTmp1;
-                    fSin *= fCos;
-                }
-
-                fTmp0 = afDiag[i2 + 1] - fTmp2;
-                fTmp1 = (afDiag[i2] - fTmp0) * fSin + 2.0 * fTmp4 * fCos;
-                fTmp2 = fSin * fTmp1;
-                afDiag[i2 + 1] = fTmp0 + fTmp2;
-                fTmp0 = fCos * fTmp1 - fTmp4;
-
-                for (int iRow = 0; iRow < 3; iRow++) {
-                    fTmp3 = elt[iRow][i2 + 1];
-                    elt[iRow][i2 + 1] = fSin * elt[iRow][i2] +
-                                               fCos * fTmp3;
-                    elt[iRow][i2] = fCos * elt[iRow][i2] -
-                                           fSin * fTmp3;
-                }
-            }
-
-            afDiag[i0] -= fTmp2;
-            afSubDiag[i0] = fTmp0;
-            afSubDiag[i1] = 0.0;
-        }
-
-        if ( iIter == iMaxIter ) {
-            // should not get here under normal circumstances
-            return false;
-        }
-    }
-
-    return true;
-}
-
-//----------------------------------------------------------------------------
-void Matrix3::eigenSolveSymmetric (float afEigenvalue[3],
-                                   Vector3 akEigenvector[3]) const {
-    Matrix3 kMatrix = *this;
-    float afSubDiag[3];
-    kMatrix.tridiagonal(afEigenvalue, afSubDiag);
-    kMatrix.qLAlgorithm(afEigenvalue, afSubDiag);
-
-    for (int i = 0; i < 3; i++) {
-        akEigenvector[i][0] = kMatrix[0][i];
-        akEigenvector[i][1] = kMatrix[1][i];
-        akEigenvector[i][2] = kMatrix[2][i];
-    }
-
-    // make eigenvectors form a right--handed system
-    Vector3 kCross = akEigenvector[1].cross(akEigenvector[2]);
-
-    float fDet = akEigenvector[0].dot(kCross);
-
-    if ( fDet < 0.0 ) {
-        akEigenvector[2][0] = - akEigenvector[2][0];
-        akEigenvector[2][1] = - akEigenvector[2][1];
-        akEigenvector[2][2] = - akEigenvector[2][2];
-    }
-}
-
-//----------------------------------------------------------------------------
-void Matrix3::tensorProduct (const Vector3& rkU, const Vector3& rkV,
-                             Matrix3& rkProduct) {
-    for (int iRow = 0; iRow < 3; iRow++) {
-        for (int iCol = 0; iCol < 3; iCol++) {
-            rkProduct[iRow][iCol] = rkU[iRow] * rkV[iCol];
-        }
-    }
-}
-
-//----------------------------------------------------------------------------
-
-// Runs in 52 cycles on AMD, 76 cycles on Intel Centrino
-//
-// The loop unrolling is necessary for performance. 
-// I was unable to improve performance further by flattening the matrices
-// into float*'s instead of 2D arrays.  
-//
-// -morgan
-void Matrix3::_mul(const Matrix3& A, const Matrix3& B, Matrix3& out) {
-    const float* ARowPtr = A.elt[0];
-    float* outRowPtr     = out.elt[0];
-        outRowPtr[0] =
-            ARowPtr[0] * B.elt[0][0] +
-            ARowPtr[1] * B.elt[1][0] +
-            ARowPtr[2] * B.elt[2][0];
-        outRowPtr[1] =
-            ARowPtr[0] * B.elt[0][1] +
-            ARowPtr[1] * B.elt[1][1] +
-            ARowPtr[2] * B.elt[2][1];
-        outRowPtr[2] =
-            ARowPtr[0] * B.elt[0][2] +
-            ARowPtr[1] * B.elt[1][2] +
-            ARowPtr[2] * B.elt[2][2];
-
-    ARowPtr       = A.elt[1];
-    outRowPtr     = out.elt[1];
-
-        outRowPtr[0] =
-            ARowPtr[0] * B.elt[0][0] +
-            ARowPtr[1] * B.elt[1][0] +
-            ARowPtr[2] * B.elt[2][0];
-        outRowPtr[1] =
-            ARowPtr[0] * B.elt[0][1] +
-            ARowPtr[1] * B.elt[1][1] +
-            ARowPtr[2] * B.elt[2][1];
-        outRowPtr[2] =
-            ARowPtr[0] * B.elt[0][2] +
-            ARowPtr[1] * B.elt[1][2] +
-            ARowPtr[2] * B.elt[2][2];
-
-    ARowPtr       = A.elt[2];
-    outRowPtr     = out.elt[2];
-
-        outRowPtr[0] =
-            ARowPtr[0] * B.elt[0][0] +
-            ARowPtr[1] * B.elt[1][0] +
-            ARowPtr[2] * B.elt[2][0];
-        outRowPtr[1] =
-            ARowPtr[0] * B.elt[0][1] +
-            ARowPtr[1] * B.elt[1][1] +
-            ARowPtr[2] * B.elt[2][1];
-        outRowPtr[2] =
-            ARowPtr[0] * B.elt[0][2] +
-            ARowPtr[1] * B.elt[1][2] +
-            ARowPtr[2] * B.elt[2][2];
-}
-
-//----------------------------------------------------------------------------
-void Matrix3::_transpose(const Matrix3& A, Matrix3& out) {
-    out[0][0] = A.elt[0][0];
-    out[0][1] = A.elt[1][0];
-    out[0][2] = A.elt[2][0];
-    out[1][0] = A.elt[0][1];
-    out[1][1] = A.elt[1][1];
-    out[1][2] = A.elt[2][1];
-    out[2][0] = A.elt[0][2];
-    out[2][1] = A.elt[1][2];
-    out[2][2] = A.elt[2][2];
-}
-
-//-----------------------------------------------------------------------------
-std::string Matrix3::toString() const {
-    return G3D::format("[%g, %g, %g; %g, %g, %g; %g, %g, %g]", 
-			elt[0][0], elt[0][1], elt[0][2],
-			elt[1][0], elt[1][1], elt[1][2],
-			elt[2][0], elt[2][1], elt[2][2]);
-}
-
-
-
-} // namespace
-
diff --git a/externals/g3dlite/G3D.lib/source/Matrix4.cpp b/externals/g3dlite/G3D.lib/source/Matrix4.cpp
deleted file mode 100644
index 091af4a9bd5..00000000000
--- a/externals/g3dlite/G3D.lib/source/Matrix4.cpp
+++ /dev/null
@@ -1,433 +0,0 @@
-/**
-  @file Matrix4.cpp
- 
- 
-  @maintainer Morgan McGuire, matrix@graphics3d.com
-
-  @created 2003-10-02
-  @edited  2008-07-17
- */
-
-#include "G3D/platform.h"
-#include "G3D/Matrix4.h"
-#include "G3D/Matrix3.h"
-#include "G3D/Vector4.h"
-#include "G3D/Vector3.h"
-#include "G3D/BinaryInput.h"
-#include "G3D/BinaryOutput.h"
-#include "G3D/CoordinateFrame.h"
-#include "G3D/Rect2D.h"
-
-namespace G3D {
-
-const Matrix4& Matrix4::identity() {
-    static Matrix4 m(
-        1, 0, 0, 0,
-        0, 1, 0, 0,
-        0, 0, 1, 0,
-        0, 0, 0, 1);
-    return m;
-}
-
-
-const Matrix4& Matrix4::zero() {
-    static Matrix4 m(
-        0, 0, 0, 0,
-        0, 0, 0, 0,
-        0, 0, 0, 0,
-        0, 0, 0, 0);
-    return m;
-}
-
-
-Matrix4::Matrix4(const class CoordinateFrame& cframe) {
-    for (int r = 0; r < 3; ++r) {
-        for (int c = 0; c < 3; ++c) {
-            elt[r][c] = cframe.rotation[r][c];
-        }
-        elt[r][3] = cframe.translation[r];
-    }
-    elt[3][0] = 0.0f;
-    elt[3][1] = 0.0f;
-    elt[3][2] = 0.0f;
-    elt[3][3] = 1.0f;
-}
-
-Matrix4::Matrix4(const Matrix3& upper3x3, const Vector3& lastCol) {
-    for (int r = 0; r < 3; ++r) {
-        for (int c = 0; c < 3; ++c) {
-            elt[r][c] = upper3x3[r][c];
-        }
-        elt[r][3] = lastCol[r];
-    }
-    elt[3][0] = 0.0f;
-    elt[3][1] = 0.0f;
-    elt[3][2] = 0.0f;
-    elt[3][3] = 1.0f;
-}
-
-
-Matrix3 Matrix4::upper3x3() const {
-    return Matrix3(elt[0][0], elt[0][1], elt[0][2],
-                   elt[1][0], elt[1][1], elt[1][2],
-                   elt[2][0], elt[2][1], elt[2][2]);
-}
-
-
-Matrix4 Matrix4::orthogonalProjection(
-    const class Rect2D& rect,
-    float            nearval,
-    float            farval) {
-    return Matrix4::orthogonalProjection(rect.x0(), rect.x1(), rect.y1(), rect.y0(), nearval, farval);
-}
-
-
-Matrix4 Matrix4::orthogonalProjection(
-    float            left,
-    float            right,
-    float            bottom,
-    float            top,
-    float            nearval,
-    float            farval) {
-
-    // Adapted from Mesa.  Note that Microsoft (http://msdn.microsoft.com/library/default.asp?url=/library/en-us/opengl/glfunc03_8qnj.asp) 
-    // and Linux (http://www.xfree86.org/current/glOrtho.3.html) have different matrices shown in their documentation.
-
-    float x, y, z;
-    float tx,  ty, tz;
-
-    x = 2.0f / (right-left);
-    y = 2.0f / (top-bottom);
-    z = -2.0f / (farval-nearval);
-    tx = -(right+left) / (right-left);
-    ty = -(top+bottom) / (top-bottom);
-    tz = -(farval+nearval) / (farval-nearval);
-
-    return 
-        Matrix4( x , 0.0f, 0.0f,  tx,
-                0.0f,  y , 0.0f,  ty,
-                0.0f, 0.0f,  z ,  tz,
-                0.0f, 0.0f, 0.0f, 1.0f);
-}
-
-
-Matrix4 Matrix4::perspectiveProjection(
-    float left,    
-    float right,
-    float bottom,  
-    float top,
-    float nearval, 
-    float farval) {
-
-    float x, y, a, b, c, d;
-
-    x = (2.0f*nearval) / (right-left);
-    y = (2.0f*nearval) / (top-bottom);
-    a = (right+left) / (right-left);
-    b = (top+bottom) / (top-bottom);
-
-    if ((float)farval >= (float)inf()) {
-       // Infinite view frustum
-       c = -1.0f;
-       d = -2.0f * nearval;
-    } else {
-       c = -(farval+nearval) / (farval-nearval);
-       d = -(2.0f*farval*nearval) / (farval-nearval);
-    }
-
-    return Matrix4(
-        x,  0,  a,  0,
-        0,  y,  b,  0,
-        0,  0,  c,  d,
-        0,  0, -1,  0);
-}
-
-
-Matrix4::Matrix4(
-    float r1c1, float r1c2, float r1c3, float r1c4,
-    float r2c1, float r2c2, float r2c3, float r2c4,
-    float r3c1, float r3c2, float r3c3, float r3c4,
-    float r4c1, float r4c2, float r4c3, float r4c4) {
-    elt[0][0] = r1c1;  elt[0][1] = r1c2;  elt[0][2] = r1c3;  elt[0][3] = r1c4;
-    elt[1][0] = r2c1;  elt[1][1] = r2c2;  elt[1][2] = r2c3;  elt[1][3] = r2c4;
-    elt[2][0] = r3c1;  elt[2][1] = r3c2;  elt[2][2] = r3c3;  elt[2][3] = r3c4;
-    elt[3][0] = r4c1;  elt[3][1] = r4c2;  elt[3][2] = r4c3;  elt[3][3] = r4c4;
-}
-
-/**
- init should be row major.
- */
-Matrix4::Matrix4(const float* init) {
-    for (int r = 0; r < 4; ++r) {
-        for (int c = 0; c < 4; ++c) {
-            elt[r][c] = init[r * 4 + c];
-        }
-    }
-}
-
-
-Matrix4::Matrix4(const double* init) {
-    for (int r = 0; r < 4; ++r) {
-        for (int c = 0; c < 4; ++c) {
-            elt[r][c] = (float)init[r * 4 + c];
-        }
-    }
-}
-
-
-Matrix4::Matrix4() {
-    for (int r = 0; r < 4; ++r) {
-        for (int c = 0; c < 4; ++c) {
-            elt[r][c] = 0;
-        }
-    }
-}
-
-
-void Matrix4::setRow(int r, const Vector4& v) {
-    for (int c = 0; c < 4; ++c) {
-        elt[r][c] = v[c];
-    }
-}
-
-
-void Matrix4::setColumn(int c, const Vector4& v) {
-    for (int r = 0; r < 4; ++r) {
-        elt[r][c] = v[r];
-    }
-}
-
-
-Vector4 Matrix4::getRow(int r) const {
-    return row(r);
-}
-
-
-const Vector4& Matrix4::row(int r) const {
-    return reinterpret_cast(elt[r])[0];
-}
-
-
-Vector4 Matrix4::getColumn(int c) const {
-    return column(c);
-}
-
-Vector4 Matrix4::column(int c) const {
-    Vector4 v;
-    for (int r = 0; r < 4; ++r) {
-        v[r] = elt[r][c];
-    }
-    return v;
-}
-
-
-Matrix4 Matrix4::operator*(const Matrix4& other) const {
-    Matrix4 result;
-    for (int r = 0; r < 4; ++r) {
-        for (int c = 0; c < 4; ++c) {
-            for (int i = 0; i < 4; ++i) {
-                result.elt[r][c] += elt[r][i] * other.elt[i][c];
-            }
-        }
-    }
-
-    return result;
-}
-
-
-Matrix4 Matrix4::operator*(const float s) const {
-    Matrix4 result;
-    for (int r = 0; r < 4; ++r) {
-        for (int c = 0; c < 4; ++c) {
-            result.elt[r][c] = elt[r][c] * s;
-        }
-    }
-
-    return result;
-}
-
-
-Vector3 Matrix4::homoMul(const class Vector3& v, float w) const {
-    Vector4 r = (*this) * Vector4(v, w);
-    return r.xyz() * (1.0f / r.w);
-}
-
-
-Vector4 Matrix4::operator*(const Vector4& vector) const {
-    Vector4 result(0,0,0,0);
-    for (int r = 0; r < 4; ++r) {
-        for (int c = 0; c < 4; ++c) {
-            result[r] += elt[r][c] * vector[c];
-        }
-    }
-
-    return result;
-}
-
-
-Matrix4 Matrix4::transpose() const {
-    Matrix4 result;
-    for (int r = 0; r < 4; ++r) {
-        for (int c = 0; c < 4; ++c) {
-            result.elt[c][r] = elt[r][c];
-        }
-    }
-
-    return result;
-}
-
-
-bool Matrix4::operator!=(const Matrix4& other) const {
-    return ! (*this == other);
-}
-
-
-bool Matrix4::operator==(const Matrix4& other) const {
-
-    // If the bit patterns are identical, they must be
-    // the same matrix.  If not, they *might* still have
-    // equal elements due to floating point weirdness.
-    if (memcmp(this, &other, sizeof(Matrix4) == 0)) {
-        return true;
-    } 
-
-    for (int r = 0; r < 4; ++r) {
-        for (int c = 0; c < 4; ++c) {
-            if (elt[r][c] != other.elt[r][c]) {
-                return false;
-            }
-        }
-    }
-
-    return true;
-}
-
-
-float Matrix4::determinant() const {
-    // Determinant is the dot product of the first row and the first row
-    // of cofactors (i.e. the first col of the adjoint matrix)
-	return cofactor().getRow(0).dot(getRow(0));
-}
-
-
-Matrix4 Matrix4::adjoint() const {
-    return cofactor().transpose();
-}
-
-
-Matrix4 Matrix4::inverse() const {
-    // Inverse = adjoint / determinant
-
-    Matrix4 A = adjoint();
-
-    // Determinant is the dot product of the first row and the first row
-    // of cofactors (i.e. the first col of the adjoint matrix)
-	float det = A.getColumn(0).dot(getRow(0));
-
-	return A * (1.0f / det);
-}
-
-
-Matrix4 Matrix4::cofactor() const {
-	Matrix4 out;
-
-    // We'll use i to incrementally compute -1 ^ (r+c)
-    int i = 1;
-
-    for (int r = 0; r < 4; ++r) {
-        for (int c = 0; c < 4; ++c) {
-            // Compute the determinant of the 3x3 submatrix
-            float det = subDeterminant(r, c);
-            out.elt[r][c] = i * det;
-            i = -i;
-        }
-        i = -i;
-    }
-
-    return out;
-}
-
-
-float Matrix4::subDeterminant(int excludeRow, int excludeCol) const {
-    // Compute non-excluded row and column indices
-    int row[3];
-    int col[3];
-
-    for (int i = 0; i < 3; ++i) {
-        row[i] = i;
-        col[i] = i;
-
-        if (i >= excludeRow) {
-            ++row[i];
-        }
-        if (i >= excludeCol) {
-            ++col[i];
-        }
-    }
-
-    // Compute the first row of cofactors 
-    float cofactor00 = 
-      elt[row[1]][col[1]] * elt[row[2]][col[2]] -
-      elt[row[1]][col[2]] * elt[row[2]][col[1]];
-
-    float cofactor10 = 
-      elt[row[1]][col[2]] * elt[row[2]][col[0]] -
-      elt[row[1]][col[0]] * elt[row[2]][col[2]];
-
-    float cofactor20 = 
-      elt[row[1]][col[0]] * elt[row[2]][col[1]] -
-      elt[row[1]][col[1]] * elt[row[2]][col[0]];
-
-    // Product of the first row and the cofactors along the first row
-    return
-      elt[row[0]][col[0]] * cofactor00 +
-      elt[row[0]][col[1]] * cofactor10 +
-      elt[row[0]][col[2]] * cofactor20;
-}
-
-
-CoordinateFrame Matrix4::approxCoordinateFrame() const {
-	CoordinateFrame cframe;
-
-	for (int r = 0; r < 3; ++r) {
-		for (int c = 0; c < 3; ++c) {
-			cframe.rotation[r][c] = elt[r][c];
-		}
-		cframe.translation[r] = elt[r][3];
-	}
-
-	// Ensure that the rotation matrix is orthonormal
-	cframe.rotation.orthonormalize();
-
-	return cframe;
-}
-
-
-void Matrix4::serialize(class BinaryOutput& b) const {
-    for (int r = 0; r < 4; ++r) {
-        for (int c = 0; c < 4; ++c) {
-            b.writeFloat32(elt[r][c]);
-        }
-    }
-}
-
-
-void Matrix4::deserialize(class BinaryInput& b) {
-    for (int r = 0; r < 4; ++r) {
-        for (int c = 0; c < 4; ++c) {
-            elt[r][c] = b.readFloat32();
-        }
-    }
-}
-
-std::string Matrix4::toString() const {
-    return G3D::format("[%g, %g, %g, %g; %g, %g, %g, %g; %g, %g, %g, %g; %g, %g, %g, %g]", 
-			elt[0][0], elt[0][1], elt[0][2], elt[0][3],
-			elt[1][0], elt[1][1], elt[1][2], elt[1][3],
-			elt[2][0], elt[2][1], elt[2][2], elt[2][3],
-			elt[3][0], elt[3][1], elt[3][2], elt[3][3]);
-}
-
-} // namespace
-
-
diff --git a/externals/g3dlite/G3D.lib/source/MeshAlg.cpp b/externals/g3dlite/G3D.lib/source/MeshAlg.cpp
deleted file mode 100644
index 24b90ab5a92..00000000000
--- a/externals/g3dlite/G3D.lib/source/MeshAlg.cpp
+++ /dev/null
@@ -1,733 +0,0 @@
-/**
-  @file MeshAlg.cpp
-
-  @maintainer Morgan McGuire, matrix@graphics3d.com
-  @created 2003-09-14
-  @edited  2008-09-03
-
-  Copyright 2000-2008, Morgan McGuire.
-  All rights reserved.
-
- */
-
-#include "G3D/MeshAlg.h"
-#include "G3D/Table.h"
-#include "G3D/Set.h"
-#include "G3D/Box.h"
-#include "G3D/Sphere.h"
-#include "G3D/vectorMath.h"
-#include "G3D/AABox.h"
-
-#include 
-
-namespace G3D {
-
-const int MeshAlg::Face::NONE             = INT_MIN;
-
-void MeshAlg::generateGrid(
-    Array&     vertex,
-    Array&     texCoord,
-    Array&         index,
-    int                 wCells, 
-    int                 hCells,
-    const Vector2&      textureScale,
-    bool                spaceCentered,
-    bool                twoSided,
-    const CoordinateFrame& xform) {
-        
-    vertex.fastClear();
-    texCoord.fastClear();
-    index.fastClear();
-
-    // Generate vertices                  
-    for (int z = 0; z <= hCells; ++z) {
-        for (int x = 0; x <= wCells; ++x) {
-            Vector3 v(x / (float)wCells, 0, z / (float)hCells);
-
-            Vector2 t = v.xz() * textureScale;
-
-            texCoord.append(t);
-
-            if (spaceCentered) {
-                v -= Vector3(0.5f, 0, 0.5f);
-            }
-            v = xform.pointToWorldSpace(v);
-            vertex.append(v);
-        }
-    }
-
-    // Generate indices
-    for (int z = 0; z < hCells; ++z) {
-        for (int x = 0; x < wCells; ++x) {
-            int A = x + z * (wCells + 1);
-            int B = A + 1;
-            int C = A + (wCells + 1);
-            int D = C + 1;
-
-            //  A       B
-            //   *-----*
-            //   | \   |
-            //   |   \ |
-            //   *-----*
-            //  C       D
-
-            index.append(A, D, B);
-            index.append(A, C, D);
-        }
-    }
-
-    if (twoSided) {
-        // The index array needs to have reversed winding for the bottom
-        // and offset by the original number of vertices
-        Array ti = index;
-        ti.reverse();
-        for (int i = 0; i < ti.size(); ++i) {
-            ti[i] += vertex.size();
-        }
-        index.append(ti);
-
-        // Duplicate the arrays
-        vertex.append(Array(vertex));
-        texCoord.append(Array(texCoord));
-    }
-}
-
-MeshAlg::Face::Face() {
-    for (int i = 0; i < 3; ++i) {
-        edgeIndex[i]   = 0;
-        vertexIndex[i] = 0;
-    }
-}
-
-
-MeshAlg::Edge::Edge() {
-    for (int i = 0; i < 2; ++i) {
-        vertexIndex[i]   = 0;
-        // Negative face indices are faces that don't exist
-        faceIndex[i]     = -1;
-    }
-}
-
-
-MeshAlg::Geometry& MeshAlg::Geometry::operator=(const MeshAlg::Geometry& src) {
-    vertexArray.resize(src.vertexArray.size());
-    normalArray.resize(src.vertexArray.size());
-
-    System::memcpy(vertexArray.getCArray(), src.vertexArray.getCArray(), sizeof(Vector3)*vertexArray.size());
-    System::memcpy(normalArray.getCArray(), src.normalArray.getCArray(), sizeof(Vector3)*normalArray.size());
-
-    return *this;
-}
-
-
-void MeshAlg::computeNormals(
-    Geometry&               geometry,
-    const Array&       indexArray) {
-
-    Array faceArray;
-    Array vertexArray;
-    Array edgeArray;
-    Array faceNormalArray;
-
-    computeAdjacency(geometry.vertexArray, indexArray, faceArray, edgeArray, vertexArray);
-
-    computeNormals(geometry.vertexArray, faceArray, vertexArray, 
-                   geometry.normalArray, faceNormalArray);
-}
-
-
-void MeshAlg::computeNormals(
-    const Array&   vertexGeometry,
-    const Array&      faceArray,
-    const Array< Array >& adjacentFaceArray,
-    Array&         vertexNormalArray,
-    Array&         faceNormalArray) {
-
-    // Construct a fake vertex array for backwards compatibility
-    Array fakeVertexArray(adjacentFaceArray.size());
-
-    for (int v = 0; v < adjacentFaceArray.size(); ++v) {
-        fakeVertexArray[v].faceIndex = adjacentFaceArray[v];
-        // We leave out the edges because they aren't used to compute normals
-    }
-
-    computeNormals(vertexGeometry, faceArray, fakeVertexArray, 
-        vertexNormalArray, faceNormalArray);
-}
-
-    
-void MeshAlg::computeNormals(
-    const Array&   vertexGeometry,
-    const Array&      faceArray,
-    const Array&    vertexArray,
-    Array&         vertexNormalArray,
-    Array&         faceNormalArray) {
-
-    // Face normals (not unit length)
-    faceNormalArray.resize(faceArray.size());
-    for (int f = 0; f < faceArray.size(); ++f) {
-        const Face& face = faceArray[f];
-
-        Vector3 vertex[3];
-        for (int j = 0; j < 3; ++j) {
-            vertex[j] = vertexGeometry[face.vertexIndex[j]];
-            debugAssert(vertex[j].isFinite());
-        }
-
-        faceNormalArray[f] = (vertex[1] - vertex[0]).cross(vertex[2] - vertex[0]);
-#       ifdef G3D_DEBUG
-            const Vector3& N = faceNormalArray[f];
-            debugAssert(N.isFinite());
-#       endif
-    }
-
-    // Per-vertex normals, computed by averaging
-    vertexNormalArray.resize(vertexGeometry.size());
-    for (int v = 0; v < vertexNormalArray.size(); ++v) {
-        Vector3 sum = Vector3::zero();
-        for (int k = 0; k < vertexArray[v].faceIndex.size(); ++k) {
-            const int f = vertexArray[v].faceIndex[k];
-            sum += faceNormalArray[f];
-        }
-        vertexNormalArray[v] = sum.directionOrZero();
-#       ifdef G3D_DEBUG
-            const Vector3& N = vertexNormalArray[v];
-            debugAssert(N.isUnit() || N.isZero());
-#       endif
-    }
-
-
-    for (int f = 0; f < faceArray.size(); ++f) {
-        faceNormalArray[f] = faceNormalArray[f].directionOrZero();
-#       ifdef G3D_DEBUG
-            const Vector3& N = faceNormalArray[f];
-            debugAssert(N.isUnit() || N.isZero());
-#       endif
-    }
-
-}
-
-
-void MeshAlg::computeFaceNormals(
-    const Array&           vertexArray,
-    const Array&     faceArray,
-    Array&                 faceNormals,
-    bool                            normalize) {
-
-    faceNormals.resize(faceArray.size());
-
-    for (int f = 0; f < faceArray.size(); ++f) {
-        const MeshAlg::Face& face = faceArray[f];
-
-        const Vector3& v0 = vertexArray[face.vertexIndex[0]];
-        const Vector3& v1 = vertexArray[face.vertexIndex[1]];
-        const Vector3& v2 = vertexArray[face.vertexIndex[2]];
-        
-        faceNormals[f] = (v1 - v0).cross(v2 - v0);
-    }
-
-    if (normalize) {
-        for (int f = 0; f < faceArray.size(); ++f) {
-            faceNormals[f] = faceNormals[f].direction();
-        }
-    }
-}
-
-
-void MeshAlg::identifyBackfaces(
-    const Array&           vertexArray,
-    const Array&     faceArray,
-    const Vector4&                  HP,
-    Array&                    backface) {
-
-    Vector3 P = HP.xyz();
-
-    backface.resize(faceArray.size());
-
-    if (fuzzyEq(HP.w, 0.0)) {
-        // Infinite case
-        for (int f = faceArray.size() - 1; f >= 0; --f) {
-            const MeshAlg::Face& face = faceArray[f];
-
-            const Vector3& v0 = vertexArray[face.vertexIndex[0]];
-            const Vector3& v1 = vertexArray[face.vertexIndex[1]];
-            const Vector3& v2 = vertexArray[face.vertexIndex[2]];
-        
-            const Vector3 N = (v1 - v0).cross(v2 - v0);
-
-            backface[f] = N.dot(P) < 0;
-        }
-    } else {
-        // Finite case
-        for (int f = faceArray.size() - 1; f >= 0; --f) {
-            const MeshAlg::Face& face = faceArray[f];
-
-            const Vector3& v0 = vertexArray[face.vertexIndex[0]];
-            const Vector3& v1 = vertexArray[face.vertexIndex[1]];
-            const Vector3& v2 = vertexArray[face.vertexIndex[2]];
-        
-            const Vector3 N = (v1 - v0).cross(v2 - v0);
-
-            backface[f] = N.dot(P - v0) < 0;
-        }
-    }
-}
-
-
-void MeshAlg::identifyBackfaces(
-    const Array&           vertexArray,
-    const Array&     faceArray,
-    const Vector4&                  HP,
-    Array&                    backface,
-    const Array&           faceNormals) {
-
-    Vector3 P = HP.xyz();
-
-    backface.resize(faceArray.size());
-
-    if (fuzzyEq(HP.w, 0.0)) {
-        // Infinite case
-        for (int f = faceArray.size() - 1; f >= 0; --f) {
-            const Vector3& N = faceNormals[f];
-            backface[f] = N.dot(P) < 0;
-        }
-    } else {
-        // Finite case
-        for (int f = faceArray.size() - 1; f >= 0; --f) {
-            const MeshAlg::Face& face = faceArray[f];        
-            const Vector3& v0 = vertexArray[face.vertexIndex[0]];
-            const Vector3& N = faceNormals[f];
-
-            backface[f] = N.dot(P - v0) < 0;
-        }
-    }
-}
-
-
-void MeshAlg::createIndexArray(int n, Array& array, int start, int run, int skip) {
-    debugAssert(skip >= 0);
-    debugAssert(run >= 0);
-
-    array.resize(n);
-    if (skip == 0) {
-        for (int i = 0; i < n; ++i) {
-            array[i] = start + i;
-        }
-    } else {
-        int rcount = 0;
-        int j = start;
-        for (int i = 0; i < n; ++i) {
-            array[i] = j;
-
-            ++j;
-            ++rcount;
-
-            if (rcount == run) {
-                rcount = 0;
-                j += skip;
-            }
-        }
-    }
-}
-
-
-void MeshAlg::computeAreaStatistics(
-    const Array&   vertexArray,
-    const Array&       indexArray,
-    double&                 minEdgeLength,
-    double&                 meanEdgeLength,
-    double&                 medianEdgeLength,
-    double&                 maxEdgeLength,
-    double&                 minFaceArea,
-    double&                 meanFaceArea,
-    double&                 medianFaceArea,
-    double&                 maxFaceArea) {
-
-    debugAssert(indexArray.size() % 3 == 0);
-
-    Array area(indexArray.size() / 3);
-    Array magnitude(indexArray.size());
-
-    for (int i = 0; i < indexArray.size(); i += 3) {
-        const Vector3& v0 = vertexArray[indexArray[i]];
-        const Vector3& v1 = vertexArray[indexArray[i + 1]];
-        const Vector3& v2 = vertexArray[indexArray[i + 2]];
-
-        area[i / 3] = (v1 - v0).cross(v2 - v0).magnitude() / 2.0;
-        magnitude[i] = (v1 - v0).magnitude();
-        magnitude[i + 1] = (v2 - v1).magnitude();
-        magnitude[i + 2] = (v0 - v2).magnitude();
-    }
-
-    area.sort();
-    magnitude.sort();
-
-    minEdgeLength = max(0.0, magnitude[0]);
-    maxEdgeLength = max(0.0, magnitude.last());
-    medianEdgeLength = max(0.0, magnitude[magnitude.size() / 2]);
-    meanEdgeLength = 0;
-    for (int i = 0; i < magnitude.size(); ++i) {
-        meanEdgeLength += magnitude[i];
-    }
-    meanEdgeLength /= magnitude.size();
-
-    minFaceArea = max(0.0, area[0]);
-    maxFaceArea = max(0.0, area.last());
-    medianFaceArea = max(0.0, area[area.size() / 2]);
-    meanFaceArea = 0;
-    for (int i = 0; i < area.size(); ++i) {
-        meanFaceArea += area[i];
-    }
-    meanFaceArea /= area.size();
-
-
-    // Make sure round-off hasn't pushed values less than zero
-    meanFaceArea   = max(0.0, meanFaceArea);
-    meanEdgeLength = max(0.0, meanEdgeLength);
-}
-
-
-int MeshAlg::countBoundaryEdges(const Array& edgeArray) {
-    int b = 0;
-
-    for (int i = 0; i < edgeArray.size(); ++i) {
-        if ((edgeArray[i].faceIndex[0] == MeshAlg::Face::NONE) !=
-            (edgeArray[i].faceIndex[1] == MeshAlg::Face::NONE)) {
-            ++b;
-        }
-    }
-
-    return b;
-}
-
-void MeshAlg::computeBounds(
-    const Array&   vertexArray,
-    const Array&       indexArray,
-    Box&                    box, 
-    Sphere&                 sphere) {
-
-    Array newArray(indexArray.size());
-    for (int i = 0; i < indexArray.size(); ++i) {
-        newArray[i] = vertexArray[indexArray[i]];
-    }
-    computeBounds(newArray, box, sphere);
-}
-
-
-void MeshAlg::computeBounds(
-    const Array&   vertexArray,
-    Box&                    box, 
-    Sphere&                 sphere) {
-
-    Vector3 xmin, xmax, ymin, ymax, zmin, zmax;
-
-    // FIRST PASS: find 6 minima/maxima points
-    xmin.x = ymin.y = zmin.z = inf();
-    xmax.x = ymax.y = zmax.z = -inf();
-
-    for (int v = 0; v < vertexArray.size(); ++v) {
-        const Vector3& vertex = vertexArray[v];
-
-        if (vertex.x < xmin.x) {
-    		xmin = vertex;
-        }
-
-        if (vertex.x > xmax.x) {
-    		xmax = vertex;
-        }
-
-        if (vertex.y < ymin.y) {
-    		ymin = vertex;
-        }
-
-        if (vertex.y > ymax.y) {
-		    ymax = vertex;
-        }
-
-        if (vertex.z < zmin.z) {
-		    zmin = vertex;
-        }
-
-        if (vertex.z > zmax.z) {
-		    zmax = vertex;
-        }
-	}
-
-    // Set points dia1 & dia2 to the maximally separated pair
-    Vector3 dia1 = xmin; 
-    Vector3 dia2 = xmax;
-    {
-        // Set xspan = distance between the 2 points xmin & xmax (squared)
-        double xspan = (xmax - xmin).squaredMagnitude();
-
-        // Same for y & z spans
-        double yspan = (ymax - ymin).squaredMagnitude();
-        double zspan = (zmax - zmin).squaredMagnitude();
-    
-        double maxspan = xspan;
-
-        if (yspan > maxspan) {
-	        maxspan = yspan;
-	        dia1    = ymin;
-            dia2    = ymax;
-	    }
-
-        if (zspan > maxspan) {
-            maxspan = zspan;
-    	    dia1    = zmin;
-            dia2    = zmax;
-	    }
-    }
-
-
-    // dia1, dia2 is a diameter of initial sphere
-
-    // calc initial center
-    Vector3 center = (dia1 + dia2) / 2.0;
-
-    // calculate initial radius^2 and radius 
-    Vector3 d = dia2 - sphere.center;
-
-    double radSq = d.squaredMagnitude();
-    double rad  = sqrt(radSq);
-
-    // SECOND PASS: increment current sphere
-    double old_to_p, old_to_new;
-
-    for (int v = 0; v < vertexArray.size(); ++v) {
-        const Vector3& vertex = vertexArray[v];
-
-        d = vertex - center;
-
-        double old_to_p_sq = d.squaredMagnitude();
-
-    	// do r^2 test first 
-        if (old_to_p_sq > radSq) {
-		 	// this point is outside of current sphere
-    		old_to_p = sqrt(old_to_p_sq);
-
-    		// calc radius of new sphere
-		    rad = (rad + old_to_p) / 2.0;
-
-            // for next r^2 compare
-		    radSq = rad * rad; 	
-		    old_to_new = old_to_p - rad;
-
-		    // calc center of new sphere
-            center = (rad * center + old_to_new * vertex) / old_to_p;
-		}	
-	}
-
-	const Vector3 min(xmin.x, ymin.y, zmin.z);
-	const Vector3 max(xmax.x, ymax.y, zmax.z);
-
-    box = Box(min, max);
-
-	const double boxRadSq = (max - min).squaredMagnitude() * 0.25;
-
-	if (boxRadSq >= radSq){
-        if (isNaN(center.x) || ! isFinite(rad)) {
-            sphere = Sphere(Vector3::zero(), inf());
-        } else {
-    		sphere = Sphere(center, rad);
-        }
-	}else{
-		sphere = Sphere((max + min) * 0.5, sqrt(boxRadSq));
-	}
-}
-
-
-void MeshAlg::computeTangentVectors(
-    const Vector3&  normal,
-    const Vector3   position[3],
-    const Vector2   texCoord[3],
-    Vector3&        tangent, 
-    Vector3&        binormal) {
-
-    Vector3 v[3];
-    Vector2 t[3];
-
-    // TODO: don't need the copy
-    // Make a copy so that we can sort
-    for (int i = 0; i < 3; ++i) {
-        v[i] = position[i];
-        t[i] = texCoord[i];
-    }
-
-    /////////////////////////////////////////////////
-    // Begin by computing the tangent
-
-    // Bubble sort the vertices by decreasing texture coordinate y.
-    if (t[0].y < t[1].y) {
-        std::swap(v[0], v[1]);
-        std::swap(t[0], t[1]);
-    }
-
-    // t0 >= t1
-
-    if (t[0].y < t[2].y) {
-        std::swap(v[0], v[2]);
-        std::swap(t[0], t[2]);
-    }
-
-    // t0 >= t2, t0 >= t1
-
-    if (t[1].y < t[2].y) {
-        std::swap(v[1], v[2]);
-        std::swap(t[1], t[2]);
-    }
-
-    // t0 >= t1 >= t2
-
-    float amount;
-
-    // Compute the direction of constant y.
-    if (fuzzyEq(t[2].y, t[0].y)) {
-        // Degenerate case-- the texture coordinates do not vary across this 
-        // triangle.
-        amount = 1.0;
-    } else {
-        // Solve lerp(t[0].y, t[2].y, amount) = t[1].y for amount:
-        //
-        // t0 + (t2 - t0) * a = t1
-        // a = (t1 - t0) / (t2 - t0)
-
-        amount = (t[1].y - t[0].y) / (t[2].y - t[0].y);
-    }
-
-    tangent = lerp(v[0], v[2], amount) - v[1];
-
-    // Make sure the tangent points in the right direction and is 
-    // perpendicular to the normal.
-    if (lerp(t[0].x, t[2].x, amount) < t[1].x) {
-        tangent = -tangent;
-    }
-
-    // TODO: do we need this?  We take this component off
-    // at the end anyway
-    tangent -= tangent.dot(normal) * normal;
-
-    // Normalize the tangent so it contributes
-    // equally at the vertex (TODO: do we need this?)
-    if (fuzzyEq(tangent.magnitude(), 0.0)) {
-        tangent = Vector3::unitX();
-    } else {
-        tangent = tangent.direction();
-    }
-
-    //////////////////////////////////////////////////
-    // Now compute the binormal (same code, but in x)
-
-    // Sort the vertices by texture coordinate x.
-    if (t[0].x < t[1].x) {
-        std::swap(v[0], v[1]);
-        std::swap(t[0], t[1]);
-    }
-
-    if (t[0].x < t[2].x) {
-        std::swap(v[0], v[2]);
-        std::swap(t[0], t[2]);
-    }
-
-    if (t[1].x < t[2].x) {
-        std::swap(v[1], v[2]);
-        std::swap(t[1], t[2]);
-    }
-
-    // Compute the direction of constant x.
-    if (fuzzyEq(t[2].x, t[0].x)) {
-        amount = 1.0;
-    } else {
-        amount = (t[1].x - t[0].x) / (t[2].x - t[0].x);
-    }
-
-    binormal = lerp(v[0], v[2], amount) - v[1];
-
-    // Make sure the binormal points in the right direction and is 
-    // perpendicular to the normal.
-    if (lerp(t[0].y, t[2].y, amount) < t[1].y) {
-        binormal = -binormal;
-    }
-
-    binormal -= binormal.dot(normal) * normal;
-
-    // Normalize the binormal so that it contributes
-    // an equal amount to the per-vertex value (TODO: do we need this? 
-    // Nelson Max showed that we don't for computing per-vertex normals)
-    if (fuzzyEq(binormal.magnitude(), 0.0)) {
-        binormal = Vector3::unitZ();
-    } else {
-        binormal = binormal.direction();
-    }
-
-    // This computation gives the opposite convention of what we want.
-    binormal = -binormal;
-
-}
-
-
-void MeshAlg::computeTangentSpaceBasis(
-    const Array&       vertexArray,
-    const Array&       texCoordArray,
-    const Array&       vertexNormalArray,
-    const Array&          faceArray,
-    Array&             tangent,
-    Array&             binormal) {
-
-    debugAssertM(faceArray.size() != 0, "Unable to calculate valid tangent space without faces.");
-
-    // The three vertices and texCoords of each face
-    Vector3 position[3];
-    Vector2 texCoord[3];
-    Vector3 t, b;
-
-    tangent.resize(vertexArray.size());
-    binormal.resize(vertexArray.size());
-
-    // Zero the output arrays.
-    System::memset(tangent.getCArray(), 0, sizeof(Vector3) * tangent.size());
-    System::memset(binormal.getCArray(), 0, sizeof(Vector3) * binormal.size());
-
-    // Iterate over faces, computing the tangent vectors for each 
-    // vertex.  Accumulate those into the tangent and binormal arrays
-    // and then orthonormalize at the end.
-
-    for (int f = 0; f < faceArray.size(); ++f) {
-        const Face& face = faceArray[f];
-
-        for (int v = 0; v < 3; ++v) {
-            int i = face.vertexIndex[v];
-            position[v] = vertexArray[i];
-            texCoord[v] = texCoordArray[i];
-        }
-
-        const Vector3 faceNormal((position[1] - position[0]).cross(position[2] - position[0]).direction());
-        computeTangentVectors(faceNormal, position, texCoord, t, b);
-
-        for (int v = 0; v < 3; ++v) {
-            int i = face.vertexIndex[v];
-            tangent[i]  += t;
-            binormal[i] += b;
-        }
-    }
-
-    // Normalize the basis vectors
-    for (int v = 0; v < vertexArray.size(); ++v) {
-        // Remove the component parallel to the normal
-        const Vector3& N = vertexNormalArray[v];
-        debugAssertM(N.isUnit() || N.isZero(), "Input normals must have unit length");
-
-        tangent[v]  -= tangent[v].dot(N) * N;
-        binormal[v] -= binormal[v].dot(N) * N;
-
-        // Normalize
-        tangent[v]  = tangent[v].directionOrZero();
-        binormal[v] = binormal[v].directionOrZero();
-
-        // Note that the tangent and binormal might not be perpendicular anymore
-    }
-}
-
-
-
-} // G3D namespace
diff --git a/externals/g3dlite/G3D.lib/source/MeshAlgAdjacency.cpp b/externals/g3dlite/G3D.lib/source/MeshAlgAdjacency.cpp
deleted file mode 100644
index a8b35f32c86..00000000000
--- a/externals/g3dlite/G3D.lib/source/MeshAlgAdjacency.cpp
+++ /dev/null
@@ -1,729 +0,0 @@
-/**
-  @file MeshAlgAdjacency.cpp
-
-  @maintainer Morgan McGuire, matrix@graphics3d.com
-  @created 2003-09-14
-  @edited  2005-02-24
-
-  Copyright 2000-2003, Morgan McGuire.
-  All rights reserved.
-
- */
-
-#include "G3D/Table.h"
-#include "G3D/MeshAlg.h"
-#include "G3D/Set.h"
-
-
-namespace G3D {
-
-/**
- A half [i.e. directed] edge.
- */
-class MeshDirectedEdgeKey {
-public:
-
-    /** vertexIndex[0] <= vertexIndex[1] */
-    int     vertexIndex[2];
-
-    MeshDirectedEdgeKey() {}
-    
-    MeshDirectedEdgeKey(
-        const int        i0,
-        const int        i1) {
-
-        if (i0 <= i1) {
-            vertexIndex[0] = i0;
-            vertexIndex[1] = i1;
-        } else {
-            vertexIndex[0] = i1;
-            vertexIndex[1] = i0;
-        }
-    }
-
-
-    bool operator==(const MeshDirectedEdgeKey& e2) const {
-        for (int i = 0; i < 2; ++i) {
-            if (vertexIndex[i] != e2.vertexIndex[i]) {
-                return false;
-            }
-        }
-        return true;
-    }
-};
-
-}
-
-template<> struct HashTrait {
-    static size_t hashCode(const G3D::MeshDirectedEdgeKey& key) { 
-        return key.vertexIndex[0] + (key.vertexIndex[1] << 16);
-    }
-};
-
-namespace G3D {
-
-/**
- A hashtable mapping edges to lists of indices for
- faces.  This is used instead of Table because of the
- special logic in insert.
-
- Used only for MeshAlg::computeAdjacency.
-
- In the face lists, index f >= 0 indicates that
- f contains the edge as a forward edge.  Index f < 0 
- indicates that ~f contains the edge as a backward edge.
- */
-class MeshEdgeTable {
-public:
-    typedef Table > ET;
-
-private:
-    
-    ET                   table;
-
-public:
-    
-    /**
-     Clears the table.
-     */
-    void clear() {
-        table.clear();
-    }
-    
-    /**
-     Inserts the faceIndex into the edge's face list.
-     The index may be a negative number indicating a backface.
-     */
-    void insert(const MeshDirectedEdgeKey& edge, int faceIndex) {
-        
-        // debugAssertM((table.size() > 20) && (table.debugGetLoad() < 0.5 || table.debugGetNumBuckets() < 20),
-        //    "MeshEdgeTable is using a poor hash function.");
-
-        if (! table.containsKey(edge)) {
-            // First time
-            Array x(1);
-            x[0] = faceIndex;
-            table.set(edge, x);
-        } else {
-            table[edge].append(faceIndex);
-        }
-    }
-
-    /**
-     Returns the face list for a given edge
-     */
-    const Array& get(const MeshDirectedEdgeKey& edge) {
-        return table[edge];
-    }
-
-    ET::Iterator begin() {
-        return table.begin();
-    }
-
-    const ET::Iterator end() const {
-        return table.end();
-    }
-
-};
-
-
-/**
- edgeTable[edgeKey] is a list of faces containing
- 
- Used and cleared by MeshModel::computeAdjacency()
- */
-static MeshEdgeTable            edgeTable;
-
-/**
- Assigns the edge index into the next unassigned edge
- index.  The edge index may be negative, indicating
- a reverse edge.
- */
-static void assignEdgeIndex(MeshAlg::Face& face, int e) {
-    for (int i = 0; i < 3; ++i) {
-        if (face.edgeIndex[i] == MeshAlg::Face::NONE) {
-            face.edgeIndex[i] = e;
-            return;
-        }
-    }
-
-    debugAssertM(false, "Face has already been assigned 3 edges");
-}
-
-
-void MeshAlg::computeAdjacency(
-    const Array&   vertexGeometry,
-    const Array&       indexArray,
-    Array&            faceArray,
-    Array&            edgeArray,
-    Array< Array >&    adjacentFaceArray) {
-
-    Array vertexArray;
-
-    computeAdjacency(vertexGeometry, indexArray, faceArray, edgeArray, vertexArray);
-
-    // Convert the vertexArray into adjacentFaceArray
-    adjacentFaceArray.clear();
-    adjacentFaceArray.resize(vertexArray.size());
-    for (int v = 0; v < adjacentFaceArray.size(); ++v) {
-        adjacentFaceArray[v] = vertexArray[v].faceIndex;
-    }
-}
-
-
-void MeshAlg::computeAdjacency(
-    const Array&   vertexGeometry,
-    const Array&       indexArray,
-    Array&            faceArray,
-    Array&            edgeArray,
-    Array&          vertexArray) {
-    
-    edgeArray.clear();
-    vertexArray.clear();
-    faceArray.clear();
-    edgeTable.clear();
-    
-    // Face normals
-    Array faceNormal;
-
-    // This array has the same size as the vertex array
-    vertexArray.resize(vertexGeometry.size());
-
-    // Iterate through the triangle list
-    for (int q = 0; q < indexArray.size(); q += 3) {
-
-        Vector3 vertex[3];
-        int f = faceArray.size();
-        MeshAlg::Face& face = faceArray.next();
-
-        // Construct the face
-        for (int j = 0; j < 3; ++j) {
-            int v = indexArray[q + j];
-            face.vertexIndex[j] = v;
-            face.edgeIndex[j]   = Face::NONE;
-
-            // Store back pointers in the vertices
-            vertexArray[v].faceIndex.append(f);
-
-            // We'll need these vertices to find the face normal
-            vertex[j]           = vertexGeometry[v];
-        }
-
-        // Compute the face normal
-        Vector3 N = (vertex[1] - vertex[0]).cross(vertex[2] - vertex[0]);
-        faceNormal.append(N.directionOrZero());
-
-        static const int nextIndex[] = {1, 2, 0};
-
-        // Add each edge to the edge table.
-        for (int j = 0; j < 3; ++j) {
-            const int      i0 = indexArray[q + j];
-            const int      i1 = indexArray[q + nextIndex[j]];
-
-            const MeshDirectedEdgeKey edge(i0, i1);
-
-            if (i0 == edge.vertexIndex[0]) {
-                // The edge was directed in the same manner as in the face
-                edgeTable.insert(edge, f);
-            } else {
-                // The edge was directed in the opposite manner as in the face
-                edgeTable.insert(edge, ~f);
-            }
-        }
-    }
-    
-    // For each edge in the edge table, create an edge in the edge array.
-    // Collapse every 2 edges from adjacent faces.
-
-    MeshEdgeTable::ET::Iterator cur = edgeTable.begin();
-    MeshEdgeTable::ET::Iterator end = edgeTable.end();
-
-    Array tempEdgeArray;
-    while (cur != end) {
-        MeshDirectedEdgeKey&  edgeKey        = cur->key; 
-        Array&           faceIndexArray = cur->value;
-
-        // Process this edge
-        while (faceIndexArray.size() > 0) {
-
-            // Remove the last index
-            int f0 = faceIndexArray.pop();
-
-            // Find the normal to that face
-            const Vector3& n0 = faceNormal[(f0 >= 0) ? f0 : ~f0];
-
-            bool found = false;
-
-            // We try to find the matching face with the closest
-            // normal.  This ensures that we don't introduce a lot
-            // of artificial ridges into flat parts of a mesh.
-            double ndotn = -2;
-            int f1 = -1, i1 = -1;
-            
-            // Try to Find the face with the matching edge
-            for (int i = faceIndexArray.size() - 1; i >= 0; --i) {
-                int f = faceIndexArray[i];
-
-                if ((f >= 0) != (f0 >= 0)) {
-                    // This face contains the oppositely oriented edge
-                    // and has not been assigned too many edges
-
-                    const Vector3& n1 = faceNormal[(f >= 0) ? f : ~f];
-                    double d = n1.dot(n0);
-
-                    if (found) {
-                        // We previously found a good face; see if this
-                        // one is better.
-                        if (d > ndotn) {
-                            // This face is better.
-                            ndotn = d;
-                            f1    = f;
-                            i1    = i;
-                        }
-                    } else {
-                        // This is the first face we've found
-                        found = true;
-                        ndotn = d;
-                        f1    = f;
-                        i1    = i;
-                    }
-                }
-            }
-
-            // Create the new edge
-            int e = tempEdgeArray.size();
-            Edge& edge = tempEdgeArray.next();
-            
-            edge.vertexIndex[0] = edgeKey.vertexIndex[0];
-            edge.vertexIndex[1] = edgeKey.vertexIndex[1];
-
-            if (f0 >= 0) {
-                edge.faceIndex[0] = f0;
-                edge.faceIndex[1] = Face::NONE;
-                assignEdgeIndex(faceArray[f0], e); 
-            } else {
-                // The face indices above are two's complemented.
-                // this code restores them to regular indices.
-                debugAssert((~f0) >= 0);
-                edge.faceIndex[1] = ~f0;
-                edge.faceIndex[0] = Face::NONE;
-
-                // The edge index *does* need to be inverted, however.
-                assignEdgeIndex(faceArray[~f0], ~e); 
-            }
-
-            if (found) {
-                // We found a matching face; remove both
-                // faces from the active list.
-                faceIndexArray.fastRemove(i1);
-
-                if (f1 >= 0) {
-                    edge.faceIndex[0] = f1;
-                    assignEdgeIndex(faceArray[f1], e); 
-                } else {
-                    edge.faceIndex[1] = ~f1;
-                    assignEdgeIndex(faceArray[~f1], ~e); 
-                }
-            }
-        }
-
-        ++cur;
-    }
-
-    edgeTable.clear();
-
-    // Move boundary edges to the end of the list and then
-    // clean up the face references into them
-    {
-        // Map old edge indices to new edge indices
-        Array newIndex(tempEdgeArray.size());
-
-
-        // Index of the start and end of the edge array
-        int i = 0;
-        int j = tempEdgeArray.size() - 1;
-
-        edgeArray.resize(tempEdgeArray.size());
-        for (int e = 0; e < tempEdgeArray.size(); ++e) {
-            if (tempEdgeArray[e].boundary()) {
-                newIndex[e] = j;
-                --j;
-            } else {
-                newIndex[e] = i;
-                ++i;
-            }
-            edgeArray[newIndex[e]] = tempEdgeArray[e];
-        }
-
-        debugAssertM(i == j + 1, "Counting from front and back of array did not match");
-
-        // Fix the faces
-        for (int f = 0; f < faceArray.size(); ++f) {
-            Face& face = faceArray[f];
-            for (int q = 0; q < 3; ++q) {
-                int e = face.edgeIndex[q];
-                if (e < 0) {
-                    // Backwards edge; twiddle before and after conversion
-                    face.edgeIndex[q] = ~newIndex[~e];
-                } else {
-                    // Regular edge; remap the index
-                    face.edgeIndex[q] = newIndex[e];
-                }
-            }
-        }
-    }
-
-    // Now order the edge indices inside the faces correctly.
-    for (int f = 0; f < faceArray.size(); ++f) {
-        Face& face = faceArray[f];
-        int e0 = face.edgeIndex[0];
-        int e1 = face.edgeIndex[1];
-        int e2 = face.edgeIndex[2];
-
-        // e0 will always remain first.  The only 
-        // question is whether e1 and e2 should be swapped.
-    
-        // See if e1 begins at the vertex where e1 ends.
-        const int e0End = (e0 < 0) ? 
-            edgeArray[~e0].vertexIndex[0] :
-            edgeArray[e0].vertexIndex[1];
-
-        const int e1Begin = (e1 < 0) ? 
-            edgeArray[~e1].vertexIndex[1] :
-            edgeArray[e1].vertexIndex[0];
-
-        if (e0End != e1Begin) {
-            // We must swap e1 and e2
-            face.edgeIndex[1] = e2;
-            face.edgeIndex[2] = e1;
-        }
-    }
-
-    // Fill out the edge adjacency information in the vertex array
-    for (int e = 0; e < edgeArray.size(); ++e) {
-        const Edge& edge = edgeArray[e];
-        vertexArray[edge.vertexIndex[0]].edgeIndex.append(e);
-        vertexArray[edge.vertexIndex[1]].edgeIndex.append(~e);
-    }
-}
-
-
-void MeshAlg::weldBoundaryEdges(
-    Array&       faceArray,
-    Array&       edgeArray,
-    Array&     vertexArray) {
-
-    // Copy over the original edge array
-    Array oldEdgeArray = edgeArray;
-
-    // newEdgeIndex[e] is the new index of the old edge with index e
-    // Note that newEdgeIndex[e] might be negative, indicating that
-    // the edge switched direction between the arrays.
-    Array newEdgeIndex(edgeArray.size());
-    edgeArray.resize(0);
-
-    // boundaryEdgeIndices[v_low] is an array of the indices of 
-    // all boundary edges whose lower vertex is v_low.
-    Table > boundaryEdgeIndices;
-
-    // Copy over non-boundary edges to the new array
-    for (int e = 0; e < oldEdgeArray.size(); ++e) {
-        if (oldEdgeArray[e].boundary()) {
-
-            // Add to the boundary table
-            const int v_low = iMin(oldEdgeArray[e].vertexIndex[0], oldEdgeArray[e].vertexIndex[1]);
-            if (! boundaryEdgeIndices.containsKey(v_low)) {
-                boundaryEdgeIndices.set(v_low, Array());
-            }
-            boundaryEdgeIndices[v_low].append(e);
-
-            // We'll fill out newEdgeIndex[e] later, when we find pairs
-
-        } else {
-
-            // Copy the edge to the new array
-            newEdgeIndex[e] = edgeArray.size();
-            edgeArray.append(oldEdgeArray[e]);
-
-        }
-    }
-
-
-    // Remove all edges from the table that have pairs.
-    Table >::Iterator cur = boundaryEdgeIndices.begin();
-    Table >::Iterator end = boundaryEdgeIndices.end();
-    while (cur != end) {
-        Array&     boundaryEdge = cur->value;
-
-        for (int i = 0; i < boundaryEdge.size(); ++i) {
-            int ei = boundaryEdge[i];
-            const Edge& edgei = oldEdgeArray[ei];
-
-            for (int j = i + 1; j < boundaryEdge.size(); ++j) {
-                int ej = boundaryEdge[j];
-                const Edge& edgej = oldEdgeArray[ej];
-
-                // See if edge ei is the reverse (match) of edge ej.
-
-                // True if the edges match
-                bool match = false;
-
-                // True if edgej's vertex indices are reversed from
-                // edgei's (usually true).
-                bool reversej = false;
-                
-                int u = edgei.vertexIndex[0];
-                int v = edgei.vertexIndex[1];
-
-                if (edgei.faceIndex[0] != Face::NONE) {
-                    //        verts|faces
-                    // edgei = [u v A /]
-
-                    if (edgej.faceIndex[0] != Face::NONE) {
-                        if ((edgej.vertexIndex[0] == v) && (edgej.vertexIndex[1] == u)) {
-                            // This is the most common of the four cases
-
-                            // edgej = [v u B /]
-                            match = true;
-                            reversej = true;
-                        }
-                    } else {
-                        if ((edgej.vertexIndex[0] == u) && (edgej.vertexIndex[1] == v)) {
-                            // edgej = [u v / B]
-                            match = true;
-                        }
-                    }
-                } else {
-                    // edgei = [u v / A]
-                    if (edgej.faceIndex[0] != Face::NONE) {
-                        if ((edgej.vertexIndex[0] == u) && (edgej.vertexIndex[1] == v)) {
-                            // edgej = [u v B /]
-                            match = true;
-                        }
-                    } else {
-                        if ((edgej.vertexIndex[0] == v) && (edgej.vertexIndex[1] == u)) {
-                            // edgej = [v u / B]
-                            match = true;
-                            reversej = true;
-                        }
-                    }
-                }
-
-                if (match) {
-                    // ei and ej can be paired as a single edge
-                    int e = edgeArray.size();
-                    Edge& edge = edgeArray.next();
-
-                    // Follow the direction of edgei.
-                    edge = edgei;
-                    newEdgeIndex[ei] = e;
-
-                    // Insert the face index for edgej.
-                    int fj = edgej.faceIndex[0];
-                    if (fj == Face::NONE) {
-                        fj = edgej.faceIndex[1];
-                    }
-                    
-                    if (edge.faceIndex[0] == Face::NONE) {
-                        edge.faceIndex[0] = fj;
-                    } else {
-                        edge.faceIndex[1] = fj;
-                    }
-                    
-                    if (reversej) {
-                        // The new edge is backwards of the old edge for ej
-                        newEdgeIndex[ej] = ~e;
-                    } else {
-                        newEdgeIndex[ej] = e;
-                    }
-
-                    // Remove both ei and ej from being candidates for future pairing.
-                    // Remove ej first since it comes later in the list (removing
-                    // ei would decrease the index of ej to j - 1).
-                    boundaryEdge.fastRemove(j);
-                    boundaryEdge.fastRemove(i);
-
-                    // Re-process element i, which is now a new edge index
-                    --i;
-
-                    // Jump out of the j for-loop
-                    break;
-                }
-            }
-        }
-        ++cur;
-    }
-
-    // Anything remaining in the table is a real boundary edge; just copy it to
-    // the end of the array.
-    cur = boundaryEdgeIndices.begin();
-    end = boundaryEdgeIndices.end();
-    while (cur != end) {
-        Array&     boundaryEdge = cur->value;
-
-        for (int b = 0; b < boundaryEdge.size(); ++b) {
-            const int e = boundaryEdge[b];
-
-            newEdgeIndex[e] = edgeArray.size();
-            edgeArray.append(oldEdgeArray[e]);
-        }
-
-        ++cur;
-    }
-
-    // Finally, fix up edge indices in the face and vertex arrays
-    for (int f = 0; f < faceArray.size(); ++f) {
-        Face& face = faceArray[f];
-        for (int i = 0; i < 3; ++i) {
-            int e = face.edgeIndex[i];
-
-            if (e < 0) {
-                face.edgeIndex[i] = ~newEdgeIndex[~e];
-            } else {
-                face.edgeIndex[i] = newEdgeIndex[e];
-            }
-        }
-    }
-
-    for (int v = 0; v < vertexArray.size(); ++v) {
-        Vertex& vertex = vertexArray[v];
-        for (int i = 0; i < vertex.edgeIndex.size(); ++i) {
-            int e = vertex.edgeIndex[i];
-
-            if (e < 0) {
-                vertex.edgeIndex[i] = ~newEdgeIndex[~e];
-            } else {
-                vertex.edgeIndex[i] = newEdgeIndex[e];
-            }
-        }
-    }
-}
-
-
-void MeshAlg::weldAdjacency(
-    const Array& originalGeometry,
-    Array&          faceArray,
-    Array&          edgeArray,
-    Array&        vertexArray,
-    double                radius) {
-
-    // Num vertices
-    const int n = originalGeometry.size();
-
-    // canonical[v] = first occurance of any vertex near oldVertexArray[v]
-    Array canonical(n);
-
-    Array toNew, toOld;
-    // Throw away the new vertex array
-    Array dummy;
-    computeWeld(originalGeometry, dummy, toNew, toOld, radius);
-
-    for (int v = 0; v < canonical.size(); ++v) {
-        // Round-trip through the toNew/toOld process.  This will give
-        // us the original vertex.
-        canonical[v] = toOld[toNew[v]];
-    }
-
-    // Destroy vertexArray (we reconstruct it below)
-    vertexArray.clear();
-    vertexArray.resize(n);
-
-    bool hasBoundaryEdges = false;
-
-    // Fix edge vertex indices
-    for (int e = 0; e < edgeArray.size(); ++e) {
-        Edge& edge = edgeArray[e];
-
-        const int v0 = canonical[edge.vertexIndex[0]];
-        const int v1 = canonical[edge.vertexIndex[1]];
-
-        edge.vertexIndex[0] = v0;
-        edge.vertexIndex[1] = v1;
-
-        vertexArray[v0].edgeIndex.append(e);
-        vertexArray[v1].edgeIndex.append(~e);
-
-        hasBoundaryEdges = hasBoundaryEdges || edge.boundary();
-    }
-
-    // Fix face vertex indices
-    for (int f = 0; f < faceArray.size(); ++f) {
-        Face& face = faceArray[f];
-        for (int i = 0; i < 3; ++i) {
-            const int v = canonical[face.vertexIndex[i]];
-
-            face.vertexIndex[i] = v;
-
-            // Add the back pointer
-            vertexArray[v].faceIndex.append(f);
-        }
-    }
-
-    if (hasBoundaryEdges) {
-        // As a result of the welding, some of the boundary edges at
-        // the end of the array may now have mates and no longer be
-        // boundaries.  Try to pair these up.
-
-        weldBoundaryEdges(faceArray, edgeArray, vertexArray);
-    }
-}
-
-
-void MeshAlg::debugCheckConsistency(
-    const Array&      faceArray,
-    const Array&      edgeArray,
-    const Array&    vertexArray) {
-
-#ifdef _DEBUG
-    for (int v = 0; v < vertexArray.size(); ++v) {
-        const MeshAlg::Vertex& vertex = vertexArray[v];
-
-        for (int i = 0; i < vertex.edgeIndex.size(); ++i) {
-            const int e = vertex.edgeIndex[i];
-            debugAssert(edgeArray[(e >= 0) ? e : ~e].containsVertex(v));
-        }
-
-        for (int i = 0; i < vertex.faceIndex.size(); ++i) {
-            const int f = vertex.faceIndex[i];
-            debugAssert(faceArray[f].containsVertex(v));
-        }
-
-    }
-
-    for (int e = 0; e < edgeArray.size(); ++e) {
-        const MeshAlg::Edge& edge = edgeArray[e];
-
-        for (int i = 0; i < 2; ++i) {
-            debugAssert((edge.faceIndex[i] == MeshAlg::Face::NONE) ||
-                faceArray[edge.faceIndex[i]].containsEdge(e));
-
-            debugAssert(vertexArray[edge.vertexIndex[i]].inEdge(e));
-        }        
-    }
-
-    // Every face's edge must be on that face
-    for (int f = 0; f < faceArray.size(); ++f) {
-        const MeshAlg::Face& face = faceArray[f];
-        for (int i = 0; i < 3; ++i) {
-            int e = face.edgeIndex[i];
-            int ei = (e >= 0) ? e : ~e;
-            debugAssert(edgeArray[ei].inFace(f));
-
-            // Make sure the edge is oriented appropriately 
-            if (e >= 0) {
-                debugAssert(edgeArray[ei].faceIndex[0] == (int)f);
-            } else {
-                debugAssert(edgeArray[ei].faceIndex[1] == (int)f);
-            }
-
-            debugAssert(vertexArray[face.vertexIndex[i]].inFace(f));
-        }
-    }
-#else
-    (void)faceArray;
-    (void)edgeArray;
-    (void)vertexArray;
-#endif // _DEBUG
-}
-
-} // G3D namespace
diff --git a/externals/g3dlite/G3D.lib/source/MeshAlgWeld.cpp b/externals/g3dlite/G3D.lib/source/MeshAlgWeld.cpp
deleted file mode 100644
index cd4d1f9c7d5..00000000000
--- a/externals/g3dlite/G3D.lib/source/MeshAlgWeld.cpp
+++ /dev/null
@@ -1,213 +0,0 @@
-/**
-  @file MeshAlgWeld.cpp
-
-  The MeshAlg::computeWeld method.
-
-  @maintainer Morgan McGuire, matrix@graphics3d.com
-  @created 2003-10-22
-  @edited  2005-02-24
-
-  Copyright 2000-2003, Morgan McGuire.
-  All rights reserved.
-
- */
-
-#include "G3D/MeshAlg.h"
-#include "G3D/Table.h"
-#include "G3D/Set.h"
-
-namespace G3D {
-
-namespace _internal {
-
-class Welder {
-private:
-
-    // Intentionally illegal
-    Welder& operator=(const Welder& w);
-
-public:
-    /** Indices of newVertexArray elements in or near a grid cell. */
-    typedef Array List;
-
-    enum {GRID_RES = 32};
-
-    List grid[GRID_RES][GRID_RES][GRID_RES];
-
-    const Array& oldVertexArray;
-    Array&       newVertexArray;
-    Array&           toNew;
-    Array&           toOld;
-
-    /** Must be less than one grid cell, not checked */
-    const double          radius;
-
-    /** (oldVertexArray[i] - offset) * scale is on the range [0, 1] */
-    Vector3               offset;
-    Vector3               scale;
-
-    Welder(    
-        const Array& _oldVertexArray,
-        Array&       _newVertexArray,
-        Array&           _toNew,
-        Array&           _toOld,
-        double                _radius);
-        
-    /**
-     Computes the grid index from an ordinate.
-     */
-    void toGridCoords(Vector3 v, int& x, int& y, int& z) const;
-
-    /** Gets the index of a vertex, adding it to 
-        newVertexArray if necessary. */
-    int getIndex(const Vector3& vertex);
-    
-    void weld();
-};
-
-} // namespace _internal
-
-} // namespace G3D
-
-template<> struct HashTrait {
-    static size_t hashCode(const G3D::_internal::Welder::List* key) { return reinterpret_cast(key); }
-};
-
-namespace G3D {
-namespace _internal {
-
-Welder::Welder(    
-    const Array& _oldVertexArray,
-    Array&       _newVertexArray,
-    Array&           _toNew,
-    Array&           _toOld,
-    double                _radius) :
-    oldVertexArray(_oldVertexArray),
-    newVertexArray(_newVertexArray),
-    toNew(_toNew),
-    toOld(_toOld),
-    radius(_radius) {
-
-    // Compute a scale factor that moves the range
-    // of all ordinates to [0, 1]
-    Vector3 minBound = Vector3::inf();
-    Vector3 maxBound = -minBound;
-
-    for (int i = 0; i < oldVertexArray.size(); ++i) {
-        minBound = minBound.min(oldVertexArray[i]);
-        maxBound = maxBound.max(oldVertexArray[i]);
-    }
-
-    offset = minBound;
-    scale  = maxBound - minBound;
-    for (int i = 0; i < 3; ++i) {
-        // The model might have zero extent along some axis
-        if (fuzzyEq(scale[i], 0.0)) {
-            scale[i] = 1.0;
-        } else {
-            scale[i] = 1.0 / scale[i];
-        }
-    }
-}
-
-
-void Welder::toGridCoords(Vector3 v, int& x, int& y, int& z) const {
-    v = (v - offset) * scale;
-    x = iClamp(iFloor(v.x * GRID_RES), 0, GRID_RES - 1);
-    y = iClamp(iFloor(v.y * GRID_RES), 0, GRID_RES - 1);
-    z = iClamp(iFloor(v.z * GRID_RES), 0, GRID_RES - 1);
-}
-
-
-int Welder::getIndex(const Vector3& vertex) {
-
-    int closestIndex = -1;
-    double distanceSquared = inf();
-
-    int ix, iy, iz;
-    toGridCoords(vertex, ix, iy, iz);
-
-    // Check against all vertices within radius of this grid cube
-    const List& list = grid[ix][iy][iz];
-
-    for (int i = 0; i < list.size(); ++i) {
-        double d = (newVertexArray[list[i]] - vertex).squaredMagnitude();
-
-        if (d < distanceSquared) {
-            distanceSquared = d;
-            closestIndex = list[i];
-        }
-    }
-
-    if (distanceSquared <= radius * radius) {
-
-        return closestIndex;
-
-    } else {
-
-        // This is a new vertex
-        int newIndex = newVertexArray.size();
-        newVertexArray.append(vertex);
-
-        // Create a new vertex and store its index in the
-        // neighboring grid cells (usually, only 1 neighbor)
-
-        Set neighbors;
-
-        for (float dx = -1; dx <= +1; ++dx) {
-            for (float dy = -1; dy <= +1; ++dy) {
-                for (float dz = -1; dz <= +1; ++dz) {
-                    int ix, iy, iz;
-                    toGridCoords(vertex + Vector3(dx, dy, dz) * radius, ix, iy, iz);
-                    neighbors.insert(&(grid[ix][iy][iz]));
-                }
-            }
-        }
-
-        Set::Iterator neighbor(neighbors.begin());
-        Set::Iterator none(neighbors.end());
-
-        while (neighbor != none) {
-            (*neighbor)->append(newIndex);
-            ++neighbor;
-        }
-
-        return newIndex;
-    }
-}
-
-
-void Welder::weld() {
-    newVertexArray.resize(0);
-
-    // Prime the vertex positions
-    for (int i = 0; i < oldVertexArray.size(); ++i) {
-        getIndex(oldVertexArray[i]);
-    }
-
-    // Now create the official remapping by snapping to 
-    // nearby vertices.
-    toNew.resize(oldVertexArray.size());
-    toOld.resize(newVertexArray.size());
-
-    for (int oi = 0; oi < oldVertexArray.size(); ++oi) {
-        toNew[oi] = getIndex(oldVertexArray[oi]);
-        toOld[toNew[oi]] = oi;
-    }
-}
-
-} // internal namespace
-
-
-void MeshAlg::computeWeld(
-    const Array& oldVertexArray,
-    Array&       newVertexArray,
-    Array&           toNew,
-    Array&           toOld,
-    double                radius) {
-
-    _internal::Welder welder(oldVertexArray, newVertexArray, toNew, toOld, radius);
-    welder.weld();
-}
-
-} // G3D namespace
diff --git a/externals/g3dlite/G3D.lib/source/MeshAlgWeld2.cpp b/externals/g3dlite/G3D.lib/source/MeshAlgWeld2.cpp
deleted file mode 100644
index 13f731353a6..00000000000
--- a/externals/g3dlite/G3D.lib/source/MeshAlgWeld2.cpp
+++ /dev/null
@@ -1,377 +0,0 @@
-/**
- @file MeshAlgWeld2.cpp
-
- @author Morgan McGuire, Kyle Whitson, Corey Taylor
-
- @created 2008-07-30
- @edited  2008-11-10
- */
-
-#include "G3D/platform.h"
-#include "G3D/Vector2.h"
-#include "G3D/Vector3.h"
-#include "G3D/Sphere.h"
-#include "G3D/PointHashGrid.h"
-#include "G3D/MeshAlg.h"
-
-namespace G3D { namespace _internal{
-
-/** Used by WeldHelper2::smoothNormals. */
-class VN {
-public:
-    Vector3         vertex;
-    Vector3         normal;
-
-    VN() {}
-    VN(const Vector3& v, const Vector3& n) : vertex(v), normal(n) {}
-};
-
-/** Used by WeldHelper::getIndex to maintain a list of vertices by location. */
-class VNTi {
-public:
-    Vector3         vertex;
-    Vector3         normal;
-    Vector2         texCoord;
-    int             index;
-
-    VNTi() : index(0) {}
-
-    VNTi(const Vector3& v, const Vector3& n, const Vector2& t, int i) : 
-        vertex(v), normal(n), texCoord(t), index(i) {}
-};
-
-
-}} // G3D
-
-template <> struct HashTrait  {
-    static size_t hashCode(const G3D::_internal::VN& k) { return static_cast(k.vertex.hashCode()); }
-};
-template <> struct HashTrait  {
-    static size_t hashCode(const G3D::_internal::VNTi& k) { return static_cast(k.vertex.hashCode()); }
-};
-
-
-template<> struct EqualsTrait  {
-    static bool equals(const G3D::_internal::VN& a, const G3D::_internal::VN& b) { return a.vertex == b.vertex; }
-};
-template<> struct EqualsTrait  {
-    static bool equals(const G3D::_internal::VNTi& a, const G3D::_internal::VNTi& b) { return a.vertex == b.vertex; }
-};
-
-template<> struct PositionTrait {
-    static void getPosition(const G3D::_internal::VN& v, G3D::Vector3& p) { p = v.vertex; }
-};
-template<> struct PositionTrait {
-    static void getPosition(const G3D::_internal::VNTi& v, G3D::Vector3& p) { p = v.vertex; }
-};
-
-namespace G3D { namespace _internal {
-
-class WeldHelper {
-private:
-    /** Used by getIndex and updateTriLists */
-    PointHashGrid     weldGrid;
-
-    Array*         outputVertexArray;
-    Array*         outputNormalArray;
-    Array*         outputTexCoordArray;
-
-    float                   vertexWeldRadius;
-    /** Squared radius allowed for welding similar normals. */
-    float                   normalWeldRadius2;
-    float                   texCoordWeldRadius2;
-
-    float                   normalSmoothingAngle;
-
-    /**
-     Returns the index of the vertex in 
-     outputVertexArray/outputNormalArray/outputTexCoordArray
-     that is within the global tolerances of v,n,t. If there 
-     is no such vertex, adds it to the arrays and returns that index.
-
-     Called from updateTriLists().
-     */
-    int getIndex(const Vector3& v, const Vector3& n, const Vector2& t) {
-        PointHashGrid::SphereIterator it = 
-                weldGrid.beginSphereIntersection(Sphere(v, vertexWeldRadius));
-
-        if (n.isZero()) {
-            // Don't bother trying to match the surface normal, since this vertex has no surface normal.
-            while (it.hasMore()) {
-                if ((t - it->texCoord).squaredLength() <= texCoordWeldRadius2) {
-                    // This is the vertex
-                    return it->index;
-                }
-                ++it;
-            }
-        } else {
-            while (it.hasMore()) {
-                if (((n - it->normal).squaredLength() <= normalWeldRadius2) &&
-                    ((t - it->texCoord).squaredLength() <= texCoordWeldRadius2)) {
-                    // This is the vertex
-                    return it->index;
-                }
-                ++it;
-            }
-        }
-
-        // Note that a sliver triangle processed before its neighbors may reach here
-        // with a zero length normal.
-
-        // The vertex does not exist. Create it.
-        const int i = outputVertexArray->size();
-        outputVertexArray->append(v);
-        outputNormalArray->append(n);
-        outputTexCoordArray->append(t);
-
-        // Store in the grid so that it will be remembered.
-        weldGrid.insert(VNTi(v, n, t, i));
-
-        return i;
-    }
-
-
-    /**
-     Updates each indexArray to refer to vertices in the
-     outputVertexArray.
-
-     Called from process()
-     */
-    void updateTriLists(
-        Array*>&         indexArrayArray, 
-        const Array&       vertexArray,
-        const Array&       normalArray,
-        const Array&       texCoordArray) {
-        
-        // Compute a hash grid so that we can find neighbors quickly.
-        // It begins empty and is extended as the tri lists are iterated
-        // through.
-        weldGrid.clear();
-
-        // Process all triLists
-        int numTriLists = indexArrayArray.size();
-        int u = 0;
-        for (int t = 0; t < numTriLists; ++t) {
-            Array& triList = *(indexArrayArray[t]);
-
-            // For all vertices in this list
-            for (int v = 0; v < triList.size(); ++v) {
-                // This vertex mapped to u in the flatVertexArray
-                triList[v] = getIndex(vertexArray[u], normalArray[u], texCoordArray[u]);
-
-                /*
-#           ifdef G3D_DEBUG
-            {
-                int i = triList[v];
-                Vector3 N = normalArray[i];
-                debugAssertM(N.length() > 0.9f, "Produced non-unit normal");
-            }
-#           endif
-            */
-                ++u;
-            }
-        }
-    }
-
-    /** Expands the indexed triangle lists into a triangle list.
-
-        Called from process() */
-    void unroll(
-        const Array*>&   indexArrayArray, 
-        const Array&       vertexArray, 
-        const Array&       texCoordArray, 
-        Array&             unrolledVertexArray, 
-        Array&             unrolledTexCoordArray) {
-
-        int numTriLists = indexArrayArray.size();
-        for (int t = 0; t < numTriLists; ++t) {
-            const Array& triList = *(indexArrayArray[t]);
-            for (int v = 0; v < triList.size(); ++v) {
-                int i = triList[v];
-                unrolledVertexArray.append(vertexArray[i]);
-                unrolledTexCoordArray.append(texCoordArray[i]);
-            }
-        }
-    }
-
-    /** For every three vertices, compute the face normal and store it three times.
-        Sliver triangles have a zero surface normal, which we will later take to
-        match *any* surface normal. */
-    void computeFaceNormals(
-        const Array&  vertexArray, 
-        Array&        faceNormalArray) {
-
-        debugAssertM(vertexArray.size() % 3 == 0, "Input is not a triangle soup");
-        debugAssertM(faceNormalArray.size() == 0, "Output must start empty.");
-
-        for (int v = 0; v < vertexArray.size(); v += 3) {
-            const Vector3& e0 = vertexArray[v + 1] - vertexArray[v];
-            const Vector3& e1 = vertexArray[v + 2] - vertexArray[v];
-
-            // Note that the length may be zero in the case of sliver polygons, e.g.,
-            // those correcting a T-junction.
-            const Vector3& n  = e0.cross(e1).directionOrZero(); 
-
-            // Append the normal once per vertex.
-            faceNormalArray.append(n, n, n);
-        }
-    }
-
-
-    /**
-     Computes @a smoothNormalArray, whose elements are those of normalArray averaged
-     with neighbors within the angular cutoff.
-     */
-    void smoothNormals(
-        const Array& vertexArray, 
-        const Array& normalArray, 
-        Array&       smoothNormalArray) {
-        
-        const float cosThresholdAngle = (float)cos(normalSmoothingAngle);
-
-        debugAssert(vertexArray.size() == normalArray.size());
-        smoothNormalArray.resize(normalArray.size());
-
-        // Compute a hash grid so that we can find neighbors quickly.
-        PointHashGrid grid(vertexWeldRadius);
-        for (int v = 0; v < normalArray.size(); ++v) {
-            grid.insert(VN(vertexArray[v], normalArray[v]));
-        }
-
-        for (int v = 0; v < normalArray.size(); ++v) {            
-            // Compute the sum of all nearby normals within the cutoff angle.
-            // Search within the vertexWeldRadius, since those are the vertices
-            // that will collapse to the same point.
-            PointHashGrid::SphereIterator it = 
-                grid.beginSphereIntersection(Sphere(vertexArray[v], vertexWeldRadius));
-
-            Vector3 sum;
-
-            const Vector3& original = normalArray[v];
-            while (it.hasMore()) {
-                const Vector3& N = it->normal;
-                const float cosAngle = N.dot(original);
-
-                if (cosAngle > cosThresholdAngle) {
-                    // This normal is close enough to consider
-                    sum += N;
-                }
-                ++it;
-            }
-
-            const Vector3& average = sum.directionOrZero();
-
-            const bool indeterminate = average.isZero();
-            // Never "smooth" a normal so far that it points backwards
-            const bool backFacing    = original.dot(average) < 0;
-
-            if (indeterminate || backFacing) {
-                // Revert to the face normal
-                smoothNormalArray[v] = original;
-            } else {
-                // Average available normals
-                smoothNormalArray[v] = average;
-            }
-        }
-    }
-
-public:
-
-
-    /**
-    Algorithm:
-
-    1. Unroll the indexed triangle list into a triangle list, where
-       there are duplicated vertices.
-
-    2. Compute face normals for all triangles, and expand those into
-       the triangle vertices.
-
-    3. At each vertex, average all normals that are within normalSmoothingAngle.
-
-    4. Generate output indexArrayArray.  While doing so, merge all vertices where 
-       the distance between position, texCoord, and normal is within the thresholds.
-     */
-    void process(
-        Array&     vertexArray,
-        Array&     texCoordArray, 
-        Array&     normalArray,
-        Array*>& indexArrayArray,
-        float               normAngle,
-        float               texRadius,
-        float               normRadius) {
-
-        normalSmoothingAngle = normAngle;
-        normalWeldRadius2    = square(normRadius);
-        texCoordWeldRadius2  = square(texRadius);
-
-        const bool hasTexCoords = (texCoordArray.size() > 0);
-
-        if (hasTexCoords) {
-            debugAssertM(vertexArray.size() == texCoordArray.size(), 
-                "Input arrays are not parallel.");
-        }
-
-        Array unrolledVertexArray;
-        Array unrolledFaceNormalArray;
-        Array unrolledSmoothNormalArray;
-        Array unrolledTexCoordArray;
-
-        if (! hasTexCoords) {
-            // Generate all zero texture coordinates
-            texCoordArray.resize(vertexArray.size());
-        }
-
-        // Generate a flat (unrolled) triangle list with texture coordinates.
-        unroll(indexArrayArray, vertexArray, texCoordArray, 
-            unrolledVertexArray, unrolledTexCoordArray);
-
-        // Put the output back into the input slots. Clear immediately to reduce peak
-        // memory.
-        outputVertexArray   = &vertexArray;
-        outputNormalArray   = &normalArray;
-        outputTexCoordArray = &texCoordArray;
-        outputVertexArray->fastClear();
-        outputNormalArray->fastClear();
-        outputTexCoordArray->fastClear();
-
-        // For every three vertices, generate their face normal and store it at 
-        // each vertex. The output array has the same length as the input.
-        computeFaceNormals(unrolledVertexArray, unrolledFaceNormalArray);
-
-        // Compute smooth normals at vertices.
-        smoothNormals(unrolledVertexArray, unrolledFaceNormalArray, unrolledSmoothNormalArray);
-        unrolledFaceNormalArray.clear();
-
-        // Regenerate the triangle lists
-        updateTriLists(indexArrayArray, unrolledVertexArray, unrolledSmoothNormalArray, unrolledTexCoordArray);
-
-        if (! hasTexCoords) {
-            // Throw away the generated texCoords
-            texCoordArray.resize(0);
-        }
-    }
-
-    WeldHelper(float vertRadius) :
-        weldGrid(vertRadius),
-        vertexWeldRadius(vertRadius) {}
-
-};
-} // Internal
-
-void MeshAlg::weld(
-    Array&     vertexArray,
-    Array&     texCoordArray, 
-    Array&     normalArray,
-    Array*>& indexArrayArray,
-    float               normalSmoothingAngle,
-    float               vertexWeldRadius,
-    float               textureWeldRadius,
-    float               normalWeldRadius) {
-
-    _internal::WeldHelper(vertexWeldRadius).process(
-        vertexArray, texCoordArray, normalArray, indexArrayArray, 
-        normalSmoothingAngle, textureWeldRadius, normalWeldRadius);
-}
-
-} // G3D
diff --git a/externals/g3dlite/G3D.lib/source/MeshBuilder.cpp b/externals/g3dlite/G3D.lib/source/MeshBuilder.cpp
deleted file mode 100644
index 43ee6e50ac8..00000000000
--- a/externals/g3dlite/G3D.lib/source/MeshBuilder.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-/**
-  @file MeshBuilder.cpp
-
-  @maintainer Morgan McGuire, matrix@graphics3d.com
-
-  @created 2002-02-27
-  @edited  2005-02-24
- */
-
-#include "G3D/MeshBuilder.h"
-#include "G3D/MeshAlg.h"
-
-namespace G3D {
-
-void MeshBuilder::setName(const std::string& n) {
-    name = n;
-}
-
-
-void MeshBuilder::commit(std::string& n, Array& indexArray, Array& outvertexArray) {
-    n = name;
-
-    // Make the data fit in a unit cube
-    centerTriList();
-
-    Array toNew, toOld;
-
-    if (close == MeshBuilder::AUTO_WELD) {
-        Array index;
-        MeshAlg::createIndexArray(triList.size(), index);
-        double minEdgeLen, maxEdgeLen, meanEdgeLen, medianEdgeLen;
-        double minFaceArea, maxFaceArea, meanFaceArea, medianFaceArea;
-        MeshAlg::computeAreaStatistics(triList, index,
-            minEdgeLen, meanEdgeLen, medianEdgeLen, maxEdgeLen,
-            minFaceArea, meanFaceArea, medianFaceArea, maxFaceArea);
-        close = minEdgeLen * 0.1;
-    }
-
-    MeshAlg::computeWeld(triList, outvertexArray, toNew, toOld, close);
-
-    // Construct triangles
-    for (int t = 0; t < triList.size(); t += 3) {
-        int index[3];
-
-        for (int i = 0; i < 3; ++i) {
-           index[i] = toNew[t + i];
-        }
-
-        // Throw out zero size triangles
-        if ((index[0] != index[1]) &&
-            (index[1] != index[2]) &&
-            (index[2] != index[0])) {
-            indexArray.append(index[0], index[1], index[2]);
-        }
-    }
-}
-
-
-void MeshBuilder::centerTriList() {
-    // Compute the range of the vertices
-    Vector3 vmin, vmax;
-
-    computeBounds(vmin, vmax);
-
-    Vector3 diagonal = vmax - vmin;
-    double scale = max(max(diagonal.x, diagonal.y), diagonal.z) / 2;
-    debugAssert(scale > 0);
-
-    Vector3 translation = vmin + diagonal / 2;
-
-    // Center and scale all vertices in the input list
-    int v;
-
-    //Matrix3 rot90 = Matrix3::fromAxisAngle(Vector3::UNIT_Y, toRadians(180)) * Matrix3::fromAxisAngle(Vector3::UNIT_X, toRadians(90));
-    for (v = 0; v < triList.size(); ++v) {
-        triList[v] = (triList[v] - translation) / scale;
-        //triList[v] = rot90 * triList[v];
-    }
-}
-
-
-void MeshBuilder::computeBounds(Vector3& min, Vector3& max) {
-    min = Vector3::inf(); 
-    max = -min;
-
-    int v;
-    for (v = 0; v < triList.size(); ++v) {
-        min = min.min(triList[v]);
-        max = max.max(triList[v]);
-    }
-}
-
-
-void MeshBuilder::addTriangle(const Vector3& a, const Vector3& b, const Vector3& c) {
-    triList.append(a, b, c);
-
-	if (_twoSided) {
-	    triList.append(c, b, a);
-	}
-}
-
-
-void MeshBuilder::addQuad(const Vector3& a, const Vector3& b, const Vector3& c, const Vector3& d) {
-    addTriangle(a, b, c);
-    addTriangle(a, c, d);
-}
-
-
-void MeshBuilder::addTriangle(const Triangle& t) {
-	addTriangle(t.vertex(0), t.vertex(1), t.vertex(2));
-}
-
-} // namespace
diff --git a/externals/g3dlite/G3D.lib/source/NetAddress.cpp b/externals/g3dlite/G3D.lib/source/NetAddress.cpp
deleted file mode 100644
index 64d692d4763..00000000000
--- a/externals/g3dlite/G3D.lib/source/NetAddress.cpp
+++ /dev/null
@@ -1,164 +0,0 @@
-/**
- @file NetMessage.cpp
-
- @maintainer Morgan McGuire, morgan@cs.brown.edu
- @created 2005-02-06
- @edited  2005-02-06
- */
-#include "G3D/platform.h"
-#include "G3D/NetAddress.h"
-#include "G3D/BinaryInput.h"
-#include "G3D/BinaryOutput.h"
-#include "G3D/Array.h"
-#include "G3D/stringutils.h"
-#include "G3D/System.h"
-#include "G3D/NetworkDevice.h"
-
-#if defined(G3D_LINUX) || defined(G3D_OSX)
-    #include 
-    #include 
-    #include 
-    #include 
-    #include 
-    #include 
-    #include 
-    #define _alloca alloca
-
-#   ifndef SOCKADDR_IN
-#       define SOCKADDR_IN struct sockaddr_in
-#   endif
-#   ifndef SOCKET
-#       define SOCKET int
-#   endif
-
-// SOCKADDR_IN is supposed to be defined in NetAddress.h
-#ifndef SOCKADDR_IN
-#    error Network headers included in wrong order
-#endif
-#endif
-
-
-namespace G3D {
-
-NetAddress::NetAddress() {
-    System::memset(&addr, 0, sizeof(addr));
-}
-
-void NetAddress::init(uint32 host, uint16 port) {
-    if ((host != 0) || (port != 0)) {
-        addr.sin_family      = AF_INET;
-        addr.sin_port        = htons(port);
-        if (host == 0) {
-            host = INADDR_ANY;
-        }
-        addr.sin_addr.s_addr = htonl(host);
-    } else {
-        System::memset(&addr, 0, sizeof(addr));
-    }
-}
-
-
-NetAddress::NetAddress(
-    const std::string&          hostname,
-    uint16                      port) {
-    init(hostname, port);
-}
-
-
-void NetAddress::init(
-    const std::string&          hostname,
-    uint16                      port) {
-
-    uint32 addr;
-    
-    if (hostname == "") {
-        addr = INADDR_NONE;
-    } else {
-        addr = inet_addr(hostname.c_str());
-    }
-
-	// The address wasn't in numeric form, resolve it
-    if (addr == INADDR_NONE) {
-        // Get the IP address of the server and store it in host
-        struct hostent* host = gethostbyname(hostname.c_str());
-
-        if (host == NULL) {
-            init(0, 0);
-            return;
-        }
-
-        System::memcpy(&addr, host->h_addr_list[0], host->h_length);
-    }
-
-    if (addr != INADDR_NONE) {
-        addr = ntohl(addr);
-    }
-    init(addr, port);
-}
-
-
-NetAddress::NetAddress(uint32 hostip, uint16 port) {
-    init(hostip, port);
-}
-
-
-NetAddress NetAddress::broadcastAddress(uint16 port) {
-    return NetAddress(NetworkDevice::instance()->broadcastAddressArray()[0], port);
-}
-
-
-NetAddress::NetAddress(const std::string& hostnameAndPort) {
-
-    Array part = stringSplit(hostnameAndPort, ':');
-
-    debugAssert(part.length() == 2);
-    init(part[0], atoi(part[1].c_str()));
-}
-
-
-NetAddress::NetAddress(const SOCKADDR_IN& a) {
-    addr = a;
-}
-
-
-NetAddress::NetAddress(const struct in_addr& addr, uint16 port) {
-    #ifdef G3D_WIN32
-        init(ntohl(addr.S_un.S_addr), port);
-    #else
-        init(htonl(addr.s_addr), port);
-    #endif
-}
-
-
-void NetAddress::serialize(class BinaryOutput& b) const {
-    b.writeUInt32(ip());
-    b.writeUInt16(port());
-}
-
-
-void NetAddress::deserialize(class BinaryInput& b) {
-    uint32 i;
-    uint16 p;
-
-    i = b.readUInt32();
-    p = b.readUInt16();
-
-    init(i, p);
-}
-
-
-bool NetAddress::ok() const {
-    return addr.sin_family != 0;
-}
-
-
-std::string NetAddress::ipString() const {
-    return format("%s", inet_ntoa(*(in_addr*)&(addr.sin_addr)));
-}
-
-
-std::string NetAddress::toString() const {
-    return ipString() + format(":%d", ntohs(addr.sin_port));
-}
-
-}
diff --git a/externals/g3dlite/G3D.lib/source/NetworkDevice.cpp b/externals/g3dlite/G3D.lib/source/NetworkDevice.cpp
deleted file mode 100644
index 246c97d4dbf..00000000000
--- a/externals/g3dlite/G3D.lib/source/NetworkDevice.cpp
+++ /dev/null
@@ -1,1362 +0,0 @@
-/**
- @file NetworkDevice.cpp
-
- @maintainer Morgan McGuire, morgan@cs.brown.edu
- @created 2002-11-22
- @edited  2006-02-24
- */
-
-#include 
-#include 
-#include "G3D/platform.h"
-#include "G3D/TextOutput.h"
-#include "G3D/NetworkDevice.h"
-#include "G3D/NetAddress.h"
-#include "G3D/BinaryInput.h"
-#include "G3D/BinaryOutput.h"
-#include "G3D/Log.h"
-#include "G3D/G3DGameUnits.h"
-#include "G3D/stringutils.h"
-#include "G3D/debug.h"
-
-#include 
-
-#if defined(G3D_LINUX) || defined(G3D_OSX) || defined(G3D_FREEBSD)
-#   include 
-#   include 
-#   include 
-#   include 
-#   include 
-#   ifdef __linux__
-#       include 
-#       include 
-#       include 
-#       include 
-//    Match Linux to FreeBSD
-#       define AF_LINK AF_PACKET
-#   else
-#       include 
-#       include 
-#   endif
-
-    #include 
-    #include 
-    #include 
-    #include 
-    #include 
-    #include 
-    #include 
-    #include 
-    #include 
-    #include 
-    #include 
-
-    #include 
-
-    #define _alloca alloca
-
-    /** Define an error code for non-windows platforms. */
-    int WSAGetLastError() {
-        return -1;
-    }
-
-    #define SOCKET_ERROR -1
-
-    static std::string socketErrorCode(int code) {
-        return G3D::format("CODE %d: %s\n", code, strerror(code));
-    }
-
-    static std::string socketErrorCode() {
-        return socketErrorCode(errno);
-    }
-
-    static const int WSAEWOULDBLOCK = -100;
-
-    typedef int SOCKET;
-    typedef struct sockaddr_in SOCKADDR_IN;
-
-#else 
-
-    // Windows
-    static std::string socketErrorCode(int code) {
-        LPTSTR formatMsg = NULL;
-
-        FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
-                      FORMAT_MESSAGE_IGNORE_INSERTS |
-                      FORMAT_MESSAGE_FROM_SYSTEM,
-                        NULL,
-                        code,
-                        0,
-                        (LPTSTR)&formatMsg,
-                        0,
-                        NULL);
-
-        return G3D::format("CODE %d: %s\n", code, formatMsg);
-    }
-
-    static std::string socketErrorCode() {
-        return socketErrorCode(GetLastError());
-    }
-
-#endif
-
-
-#ifndef _SOCKLEN_T
-#   if defined(G3D_WIN32) || defined(G3D_OSX)
-        typedef int socklen_t;
-#   endif
-#endif
-
-namespace G3D {
-
-NetworkDevice* NetworkDevice::s_instance = NULL;
-
-std::ostream& operator<<(std::ostream& os, const NetAddress& a) {
-    return os << a.toString();
-}
-
-
-static void logSocketInfo(const SOCKET& sock) {
-    uint32 val;
-    socklen_t sz = 4;
-    int ret;
-
-    ret = getsockopt(sock, SOL_SOCKET, SO_RCVBUF, (char*)&val, (socklen_t*)&sz);
-    logPrintf("SOL_SOCKET/SO_RCVBUF = %d\n", val);
-
-    ret = getsockopt(sock, SOL_SOCKET, SO_SNDBUF, (char*)&val, (socklen_t*)&sz);
-    logPrintf("SOL_SOCKET/SO_SNDBUF = %d\n", val);
-
-    // Note: timeout = 0 means no timeout
-    ret = getsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, (char*)&val, (socklen_t*)&sz);
-    logPrintf("SOL_SOCKET/SO_RCVTIMEO = %d\n", val);
-
-    ret = getsockopt(sock, SOL_SOCKET, SO_SNDTIMEO, (char*)&val, (socklen_t*)&sz);
-    logPrintf("SOL_SOCKET/SO_SNDTIMEO = %d\n", val);
-}
-
-
-/////////////////////////////////////////////////////////////////////////////
-
-/** Invokes select on one socket.  Returns SOCKET_ERROR on error, 0 if
-    there is no read pending, sock if there a read pending. */
-static int selectOneReadSocket(const SOCKET& sock) {
-    // 0 time timeout is specified to poll and return immediately
-    struct timeval timeout;
-    timeout.tv_sec  = 0;
-    timeout.tv_usec = 0;
-
-    // Create a set that contains just this one socket
-    fd_set socketSet;
-    FD_ZERO(&socketSet); 
-    FD_SET(sock, &socketSet);
-
-    int ret = select(sock + 1, &socketSet, NULL, NULL, &timeout);
-
-    return ret;
-}
-
-
-/** Returns true if the socket has a read pending */
-static bool readWaiting(const SOCKET& sock) {
-    int ret = selectOneReadSocket(sock);
-
-    switch (ret) {
-    case SOCKET_ERROR:
-        logPrintf("ERROR: selectOneReadSocket returned "
-                  "SOCKET_ERROR in readWaiting(). %s", socketErrorCode().c_str());
-        // Return true so that we'll force an error on read and close
-        // the socket.
-        return true;
-
-    case 0:
-        return false;
-
-    default:
-        return true;
-    }
-}
-
-
-/** Invokes select on one socket.   */
-static int selectOneWriteSocket(const SOCKET& sock) {
-    // 0 time timeout is specified to poll and return immediately
-    struct timeval timeout;
-    timeout.tv_sec  = 0;
-    timeout.tv_usec = 0;
-
-    // Create a set that contains just this one socket
-    fd_set socketSet;
-    FD_ZERO(&socketSet); 
-    FD_SET(sock, &socketSet);
-
-    return select(sock + 1, NULL, &socketSet, NULL, &timeout);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-NetworkDevice* NetworkDevice::instance() {
-    if (s_instance == NULL) {
-        s_instance = new NetworkDevice();
-        if (! s_instance->init()) {
-            delete s_instance;
-            s_instance = NULL;
-        }
-    }
-    return s_instance;
-}
-
-
-void NetworkDevice::cleanup() {
-    if (s_instance) {
-        s_instance->_cleanup();
-        delete s_instance;
-        s_instance = NULL;
-    }
-}
-
-
-NetworkDevice::NetworkDevice() {
-    initialized  = false;
-}
-
-
-NetworkDevice::~NetworkDevice() {
-}
-
-
-std::string NetworkDevice::localHostName() const {   
-    char ac[128];
-    if (gethostname(ac, sizeof(ac)) == -1) {
-        Log::common()->printf("Error while getting local host name\n");
-        return "localhost";
-    }
-    return gethostbyname(ac)->h_name;
-}
-
-#ifndef G3D_WIN32
-const char* errnoToString() {
-    switch (errno) {
-    case EBADF:
-        return "file descriptor is invalid.";
-
-    case EINVAL: 
-        return "Request or argp is not valid.";
-        
-    case ENOTTY:
-        return 
-            "file descriptor is not associated with a character special device OR "
-            "The specified request does not apply to the "
-            "kind of object that the descriptor fildes references.";
-
-    case EADDRNOTAVAIL:
-        return "Address not available.";
-
-    default:
-        {
-            static char buffer[20];
-            sprintf(buffer, "Error %d", errno);
-            return buffer;
-        }
-    }
-}
-#endif
-
-
-NetworkDevice::EthernetAdapter::EthernetAdapter() {
-    name = "";
-    ip = 0;
-    hostname = "";
-    subnet = 0;
-    broadcast = 0;
-    for (int i = 0; i < 6; ++i) {
-        mac[i] = 0;
-    }
-}
-
-void NetworkDevice::EthernetAdapter::describe(TextOutput& t) const {
-    t.writeSymbol("{");
-    t.pushIndent();
-    t.writeNewline();
-    
-    t.writeSymbols("hostname", "=");
-    t.writeString(hostname);
-    t.writeNewline();
-
-    t.writeSymbols("name", "=");
-    t.writeString(name);
-    t.writeNewline();    
-
-    t.writeSymbols("ip", "=");
-    t.writeSymbol(formatIP(ip));
-    t.writeNewline();    
-
-    t.writeSymbols("subnet", "=");
-    t.writeSymbol(formatIP(subnet));
-    t.writeNewline();    
-
-    t.writeSymbols("broadcast", "=");
-    t.writeSymbol(formatIP(broadcast));
-    t.writeNewline();    
-
-    t.writeSymbols("mac", "=");
-    t.writeSymbol(formatMAC(mac));
-    t.writeNewline();    
-
-    t.popIndent();
-    t.writeSymbol("}");
-    t.writeNewline();
-}
-
-
-void NetworkDevice::addAdapter(const EthernetAdapter& a) {
-    m_adapterArray.append(a);
-    if (a.broadcast != 0) {
-        int i = m_broadcastAddresses.findIndex(a.broadcast);
-        if (i == -1) {
-            m_broadcastAddresses.append(a.broadcast);
-        }
-    }
-}
-
-
-std::string NetworkDevice::formatIP(uint32 addr) {
-    return format("%3d.%3d.%3d.%3d", (addr >> 24) & 0xFF, (addr >> 16) & 0xFF,
-           (addr >> 8) & 0xFF, addr & 0xFF);
-}
-
-
-std::string NetworkDevice::formatMAC(const uint8 MAC[6]) {
-    return format("%02x:%02x:%02x:%02x:%02x:%02x", MAC[0], MAC[1], MAC[2], MAC[3], MAC[4], MAC[5]);
-}
-
-
-#ifdef G3D_WIN32
-
-bool NetworkDevice::init() {
-    debugAssert(! initialized);
-
-    logPrintf("Network Startup");
-    logPrintf("Starting WinSock networking.\n");
-    WSADATA wsda;		    
-    WSAStartup(MAKEWORD(G3D_WINSOCK_MAJOR_VERSION, G3D_WINSOCK_MINOR_VERSION), &wsda);
-        
-    std::string hostname = "localhost";
-    {
-        char ac[128];
-        if (gethostname(ac, sizeof(ac)) == -1) {
-            logPrintf("Warning: Error while getting local host name\n");
-        } else {
-            hostname = gethostbyname(ac)->h_name;
-        }
-    }
-    
-    EthernetAdapter a;
-    a.hostname = hostname;
-    a.name = "";
-    a.ip = NetAddress(hostname, 0).ip();
-
-    // TODO: Find subnet on Win32
-    a.subnet = 0x0000FFFF;
-    
-    // TODO: Find broadcast on Win32
-    a.broadcast = 0xFFFFFFFF;
-
-    // TODO: find MAC on Win32
-    
-    addAdapter(a);
-    
-    std::string machine = localHostName();
-    std::string addr    = NetAddress(machine, 0).ipString();
-    logPrintf(
-              "Network:\n"
-              "  Status: %s\n"
-              "  Loaded winsock specification version %d (%d is "
-              "the highest available)\n"
-              "  %d sockets available\n"
-              "  Largest UDP datagram packet size is %d bytes\n\n",
-              wsda.szDescription,
-              wsda.szSystemStatus,
-              wsda.wVersion,
-              wsda.wHighVersion,
-              wsda.iMaxSockets,
-              wsda.iMaxUdpDg);
-    
-    // TODO: WSAIoctl for subnet and broadcast addresses
-    // http://msdn.microsoft.com/en-us/library/ms741621(VS.85).aspx
-    // 
-    // TODO: SIO_GET_INTERFACE_LIST 
-
-    initialized = true;
-
-    return true;
-}
-#endif
-
-
-#if defined(G3D_LINUX) || defined(G3D_OSX) || defined(G3D_FREEBSD)
-
-const sockaddr_in* castToIP4(const sockaddr* addr) {
-    if (addr == NULL) {
-        return NULL;
-    } else if (addr->sa_family == AF_INET) {
-        // An IPv4 address
-        return reinterpret_cast(addr);
-    } else {
-        // Not an IPv4 address
-        return NULL;
-    }
-}
-
-uint32 getIP(const sockaddr_in* addr) {
-    if (addr != NULL) {
-        return ntohl(addr->sin_addr.s_addr);
-    } else {
-        return 0;
-    }
-}
-
-
-bool NetworkDevice::init() {
-    debugAssert(! initialized);
-
-    // Used for combining the MAC and ip information
-    typedef Table AdapterTable;
-
-    AdapterTable table;
-
-    // Head of a linked list of network interfaces on this machine
-    ifaddrs* ifap = NULL;
-
-    int r = getifaddrs(&ifap);
-
-    if (r != 0) {
-        logPrintf("ERROR: getifaddrs returned %d\n", r);
-        return false;
-    }
-
-    ifaddrs* current = ifap;
-
-    if (current == NULL) {
-        logPrintf("WARNING: No network interfaces found\n");
-        EthernetAdapter a;
-        a.name = "fallback";
-        a.hostname = "localhost";
-        a.ip = (127 << 24) | 1;       
-        a.broadcast = 0xFFFFFFFF;
-        a.subnet    = 0x000000FF;
-        addAdapter(a);
-
-    } else {
-
-        while (current != NULL) {
-
-            bool up = (current->ifa_flags & IFF_UP); 
-            bool loopback = (current->ifa_flags & IFF_LOOPBACK);
-
-            if (! up || loopback) {
-                // Skip this adapter; it is offline or is a loopback
-                current = current->ifa_next;
-                continue;
-            }
-
-            if (! table.containsKey(current->ifa_name)) {
-                EthernetAdapter a;
-                a.name = current->ifa_name;
-                table.set(a.name, a);
-            }
-
-            // This adapter must exist because it was created above
-            EthernetAdapter& adapter = table[current->ifa_name];
-
-            const sockaddr_in* interfaceAddress = castToIP4(current->ifa_addr);
-            const sockaddr_in* broadcastAddress = castToIP4(current->ifa_dstaddr);
-            const sockaddr_in* subnetMask       = castToIP4(current->ifa_netmask);
-
-            uint32 ip = getIP(interfaceAddress);
-            uint32 ba = getIP(broadcastAddress);
-            uint32 sn = getIP(subnetMask);
-            
-            if (ip != 0) {
-                adapter.ip = ip;
-            }
-
-            if (ba != 0) {
-                adapter.broadcast = ba;
-            }
-
-            if (sn != 0) {
-                adapter.subnet = sn;
-            }
-
-            uint8_t* MAC = NULL;
-            // Extract MAC address
-            if ((current->ifa_addr != NULL) && (current->ifa_addr->sa_family == AF_LINK)) {
-#               ifdef __linux__
-                {
-                    // Linux
-                    struct ifreq ifr;
-                    
-                    int fd = socket(AF_INET, SOCK_DGRAM, 0);
-                    
-                    ifr.ifr_addr.sa_family = AF_INET;
-                    strcpy(ifr.ifr_name, current->ifa_name);
-                    ioctl(fd, SIOCGIFHWADDR, &ifr);
-                    close(fd);
-                    
-                    MAC = reinterpret_cast(ifr.ifr_hwaddr.sa_data);
-                }
-#               else
-                {
-                    // The MAC address and the interfaceAddress come in as
-                    // different interfaces with the same name.
-                    
-                    // Posix/FreeBSD/Mac OS
-                    sockaddr_dl* sdl = (struct sockaddr_dl *)current->ifa_addr;
-                    MAC = reinterpret_cast(LLADDR(sdl));
-                }
-#               endif
-                
-                // See if there was a MAC address
-                if (MAC != NULL) {
-                    bool anyNonZero = false;
-                    for (int i = 0; i < 6; ++i) {
-                        anyNonZero = anyNonZero || (MAC[i] != 0);
-                    }
-                    if (anyNonZero) {
-                        System::memcpy(adapter.mac, MAC, 6);
-                    }
-                }
-            }
-     
-            current = current->ifa_next;
-        }
-
-        freeifaddrs(ifap);
-        ifap = NULL;
-    }
-
-    // Extract all interesting adapters from the table
-    for (AdapterTable::Iterator it = table.begin(); it.hasMore(); ++it) {
-        const EthernetAdapter& adapter = it->value;
-        
-        // Only add adapters that have IP addresses
-        if (adapter.ip != 0) {
-            addAdapter(adapter);
-        } else {
-            logPrintf("NetworkDevice: Ignored adapter %s because ip = 0\n", adapter.name.c_str());
-        }
-    }
-
-    initialized = true;
-
-    return true;
-}
-
-#endif
-
-
-void NetworkDevice::_cleanup() {
-    debugAssert(initialized);
-
-    logPrintf("Network Cleanup");
-#   ifdef G3D_WIN32
-        WSACleanup();
-#   endif
-    logPrintf("Network cleaned up.");
-}
-
-bool NetworkDevice::bind(SOCKET sock, const NetAddress& addr) const {
-    Log::common()->printf("Binding socket %d on port %d ", 
-                     sock, htons(addr.addr.sin_port));
-    if (::bind(sock, (struct sockaddr*)&(addr.addr), sizeof(addr.addr)) == 
-        SOCKET_ERROR) {
-
-        Log::common()->println("FAIL");
-        Log::common()->println(socketErrorCode());
-        closesocket(sock);
-        return false;
-    }
-
-    Log::common()->println("Ok");
-    return true;
-}
-
-
-void NetworkDevice::closesocket(SOCKET& sock) const {
-    if (sock != 0) {
-        #ifdef G3D_WIN32
-            ::closesocket(sock);
-        #else
-            close(sock);
-        #endif
-
-        Log::common()->printf("Closed socket %d\n", sock);
-        sock = 0;
-    }
-}
-
-
-void NetworkDevice::localHostAddresses(Array& array) const {
-    array.resize(0);
-
-    char ac[128];
-
-    if (gethostname(ac, sizeof(ac)) == SOCKET_ERROR) {
-        Log::common()->printf("Error while getting local host name\n");
-        return;
-    }
-
-    struct hostent* phe = gethostbyname(ac);
-    if (phe == 0) {
-        Log::common()->printf("Error while getting local host address\n");
-        return;
-    }
-
-    for (int i = 0; (phe->h_addr_list[i] != 0); ++i) {
-        struct in_addr addr;
-        memcpy(&addr, phe->h_addr_list[i], sizeof(struct in_addr));
-        array.append(NetAddress(addr));
-    }    
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-Conduit::Conduit() : binaryOutput("", G3D_LITTLE_ENDIAN) {
-    sock                = 0;
-    mSent               = 0;
-    mReceived           = 0;
-    bSent               = 0;
-    bReceived           = 0;
-}
-
-
-Conduit::~Conduit() {
-    NetworkDevice::instance()->closesocket(sock);
-}
-
-
-uint64 Conduit::bytesSent() const {
-    return bSent;
-}
-
-
-uint64 Conduit::bytesReceived() const {
-    return bReceived;
-}
-
-
-uint64 Conduit::messagesSent() const {
-    return mSent;
-}
-
-
-uint64 Conduit::messagesReceived() const {
-    return mReceived;
-}
-
-
-bool Conduit::ok() const {
-    return (sock != 0) && (sock != SOCKET_ERROR);
-}
-
-
-bool Conduit::messageWaiting() {
-    return readWaiting(sock);
-}
-
-
-/**
- Increases the send and receive sizes of a socket to 2 MB from 8k
- */
-static void increaseBufferSize(SOCKET sock) {
-
-    // Increase the buffer size; the default (8192) is too easy to
-    // overflow when the network latency is high.
-    {
-        uint32 val = 1024 * 1024 * 2;
-        if (setsockopt(sock, SOL_SOCKET, SO_RCVBUF, 
-                       (char*)&val, sizeof(val)) == SOCKET_ERROR) {
-            Log::common()->printf("WARNING: Increasing socket "
-                                 "receive buffer to %d failed.\n", val);
-            Log::common()->println(socketErrorCode());
-        }
-
-        if (setsockopt(sock, SOL_SOCKET, SO_SNDBUF, 
-                       (char*)&val, sizeof(val)) == SOCKET_ERROR) {
-            Log::common()->printf("WARNING: Increasing socket "
-                                 "send buffer to %d failed.\n", val);
-            Log::common()->println(socketErrorCode());
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////////
-
-ReliableConduitRef ReliableConduit::create(const NetAddress& address) {
-    return new ReliableConduit(address);
-}
-
-
-ReliableConduit::ReliableConduit(
-    const NetAddress&   _addr) : state(NO_MESSAGE), receiveBuffer(NULL),
-    receiveBufferTotalSize(0), receiveBufferUsedSize(0) {
-
-    NetworkDevice* nd = NetworkDevice::instance();
-    
-    messageType         = 0;
-
-    addr = _addr;
-    Log::common()->print("Creating a TCP socket       ");
-    sock = socket(AF_INET, SOCK_STREAM, IPPROTO_IP);
-    
-    if (sock == SOCKET_ERROR) {
-        Log::common()->println("FAIL");
-        Log::common()->println(socketErrorCode());
-        nd->closesocket(sock);
-        return;
-    }
-
-    Log::common()->println("Ok");
-
-    // Setup socket options (both constructors should set the same options)
-
-    // Disable Nagle's algorithm (we send lots of small packets)
-    const int T = true;
-    if (setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, 
-                   (const char*)&T, sizeof(T)) == SOCKET_ERROR) {
-        
-        Log::common()->println("WARNING: Disabling Nagel's "
-                              "algorithm failed.");
-        Log::common()->println(socketErrorCode());
-    } else {
-        Log::common()->println("Disabled Nagel's algorithm.");
-    }
-
-    // Set the NO LINGER option so the socket doesn't hang around if
-    // there is unsent data in the queue when it closes.
-    struct linger ling;
-    ling.l_onoff  = 0;
-    ling.l_linger = 0;
-    if (setsockopt(sock, SOL_SOCKET, SO_LINGER, 
-                   (const char*)&ling, sizeof(ling)) == SOCKET_ERROR) {
-        
-        Log::common()->println("WARNING: Setting socket no linger failed.");
-        Log::common()->println(socketErrorCode());
-    } else {
-        Log::common()->println("Set socket option no_linger.");
-    }
-
-    // Set reuse address so that a new server can start up soon after
-    // an old one has closed.
-    if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, 
-                   (const char*)&T, sizeof(T)) == SOCKET_ERROR) {
-        
-        Log::common()->println("WARNING: Setting socket reuseaddr failed.");
-        Log::common()->println(socketErrorCode());
-    } else {
-        Log::common()->println("Set socket option reuseaddr.");
-    }
-
-    // Ideally, we'd like to specify IPTOS_LOWDELAY as well.
-
-    logSocketInfo(sock);
-
-    increaseBufferSize(sock);
-
-    Log::common()->printf("Created TCP socket %d\n", sock);
-
-    std::string x = addr.toString();
-    Log::common()->printf("Connecting to %s on TCP socket %d   ", x.c_str(), sock);
-
-    int ret = connect(sock, (struct sockaddr *) &(addr.addr), sizeof(addr.addr));
-
-    if (ret == WSAEWOULDBLOCK) {
-        RealTime t = System::time() + 5.0;
-        // Non-blocking; we must wait until select returns non-zero
-        while ((selectOneWriteSocket(sock) == 0) && (System::time() < t)) {
-            System::sleep(0.02);
-        }
-
-        // TODO: check for failure on the select call
-
-    } else if (ret != 0) {
-        sock = (SOCKET)SOCKET_ERROR;
-        Log::common()->println("FAIL");
-        Log::common()->println(socketErrorCode());
-        return;
-    }
-
-    Log::common()->println("Ok");
-}
-
-
-ReliableConduit::ReliableConduit(
-    const SOCKET&      _sock, 
-    const NetAddress&  _addr) : 
-    state(NO_MESSAGE), 
-    receiveBuffer(NULL), 
-    receiveBufferTotalSize(0), 
-    receiveBufferUsedSize(0) {
-    sock                = _sock;
-    addr                = _addr;
-
-    messageType         = 0;
-
-    // Setup socket options (both constructors should set the same options)
-
-    // Disable Nagle's algorithm (we send lots of small packets)
-    const int T = true;
-    if (setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, 
-                   (const char*)&T, sizeof(T)) == SOCKET_ERROR) {
-        
-        Log::common()->println("WARNING: Disabling Nagel's algorithm failed.");
-        Log::common()->println(socketErrorCode());
-    } else {
-        Log::common()->println("Disabled Nagel's algorithm.");
-    }
-
-    // Set the NO LINGER option so the socket doesn't hang around if
-    // there is unsent data in the queue when it closes.
-    struct linger ling;
-    ling.l_onoff  = 0;
-    ling.l_linger = 0;
-    if (setsockopt(sock, SOL_SOCKET, SO_LINGER, 
-                   (const char*)&ling, sizeof(ling)) == SOCKET_ERROR) {
-        
-        Log::common()->println("WARNING: Setting socket no linger failed.");
-        Log::common()->println(socketErrorCode());
-    } else {
-        Log::common()->println("Set socket option no_linger.");
-    }
-
-    // Set reuse address so that a new server can start up soon after
-    // an old one has closed.
-    if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, 
-                   (const char*)&T, sizeof(T)) == SOCKET_ERROR) {
-        
-        Log::common()->println("WARNING: Setting socket reuseaddr failed.");
-        Log::common()->println(socketErrorCode());
-    } else {
-        Log::common()->println("Set socket option reuseaddr.");
-    }
-
-    // Ideally, we'd like to specify IPTOS_LOWDELAY as well.
-
-    logSocketInfo(sock);
-}
-
-
-ReliableConduit::~ReliableConduit() {
-    free(receiveBuffer);
-    receiveBuffer = NULL;
-    receiveBufferTotalSize = 0;
-    receiveBufferUsedSize = 0;
-}
-
-
-bool ReliableConduit::messageWaiting() {
-    switch (state) {
-    case HOLDING:
-        // We've already read the message and are waiting
-        // for a receive call.
-        return true;
-
-    case RECEIVING:
-
-        if (! ok()) {
-            return false;
-        }
-        // We're currently receiving the message.  Read a little more.
-        receiveIntoBuffer();
-     
-        if (messageSize == receiveBufferUsedSize) {
-            // We've read the whole mesage.  Switch to holding state 
-            // and return true.
-            state = HOLDING;
-            return true;
-        } else {
-            // There are more bytes left to read.  We'll read them on
-            // the next call.  Because the *entire* message is not ready,
-            // return false.
-            return false;
-        }
-        break;
-
-    case NO_MESSAGE:
-        if (Conduit::messageWaiting()) {
-            // Message incoming.  Read the header.
-
-            state = RECEIVING;
-            receiveHeader();
-            
-            // Loop back around now that we're in the receive state; we
-            // may be able to read the whole message before returning 
-            // to the caller.
-            return messageWaiting();
-        } else {
-            // No message incoming.
-            return false;
-        }
-    }
-
-    debugAssertM(false, "Should not reach this point");
-    return false;
-}
-
-
-uint32 ReliableConduit::waitingMessageType() {
-    // The messageWaiting call is what actually receives the message.
-    if (messageWaiting()) {
-        return messageType;
-    } else {
-        return 0;
-    }
-}
-
-
-void ReliableConduit::sendBuffer(const BinaryOutput& b) {
-    NetworkDevice* nd = NetworkDevice::instance();
-    int ret = ::send(sock, (const char*)b.getCArray(), b.size(), 0);
-    
-    if (ret == SOCKET_ERROR) {
-        Log::common()->println("Error occured while sending message.");
-        Log::common()->println(socketErrorCode());
-        nd->closesocket(sock);
-        return;
-    }
-
-    ++mSent;
-    bSent += b.size();
-
-    // Verify the packet was actually sent
-    // Conversion to unsigned is safe because -1 is caught earlier
-    debugAssert(ret == b.size());
-}
-
-
-/** Null serializer.  Used by reliable conduit::send(type) */
-class Dummy {
-public:
-    void serialize(BinaryOutput& b) const { (void)b; }
-};
-
-
-void ReliableConduit::send(uint32 type) {
-    static Dummy dummy;
-    send(type, dummy);
-}
-
-
-
-NetAddress ReliableConduit::address() const {
-    return addr;
-}
-
-
-void ReliableConduit::receiveHeader() {
-    NetworkDevice* nd = NetworkDevice::instance();
-    debugAssert(state == RECEIVING);
-
-    // Read the type
-    uint32 tmp;
-    int ret = recv(sock, (char*)&tmp, sizeof(tmp), 0);
-
-    // The type is the first four bytes.  It is little endian.
-    if (System::machineEndian() == G3D_LITTLE_ENDIAN) {
-        messageType = tmp;
-    } else {
-        // Swap the byte order
-        for (int i = 0; i < 4; ++i) {
-            ((char*)&messageType)[i] = ((char*)&tmp)[3 - i];
-        }
-    }
-
-    if ((ret == SOCKET_ERROR) || (ret != sizeof(messageType))) {
-        Log::common()->printf("Call to recv failed.  ret = %d,"
-                             " sizeof(messageType) = %d\n", 
-                             (int)ret, (int)sizeof(messageType));
-        Log::common()->println(socketErrorCode());
-        nd->closesocket(sock);
-        messageType = 0;
-        return;
-    }
-
-    // Read the size
-    ret = recv(sock, (char*)&messageSize, sizeof(messageSize), 0);
-
-    if ((ret == SOCKET_ERROR) || (ret != sizeof(messageSize))) {
-        Log::common()->printf("Call to recv failed.  ret = %d,"
-                             " sizeof(len) = %d\n", (int)ret,
-                             (int)sizeof(messageSize));
-        Log::common()->println(socketErrorCode());
-        nd->closesocket(sock);
-        messageType = 0;
-        return;
-    }
-
-    messageSize = ntohl(messageSize);
-    debugAssert(messageSize < 6e7);
-
-    debugAssert(receiveBufferUsedSize == 0);
-
-    // Extend the size of the buffer.
-    if (messageSize > receiveBufferTotalSize) {
-        receiveBuffer = realloc(receiveBuffer, messageSize);
-        receiveBufferTotalSize = messageSize;
-    }
-
-    if (receiveBuffer == NULL) {
-        Log::common()->println("Could not allocate a memory buffer "
-                              "during receivePacket.");
-        nd->closesocket(sock);
-    }
-
-    bReceived += 4;
-}
-
-
-void ReliableConduit::receiveIntoBuffer() {
-    NetworkDevice* nd = NetworkDevice::instance();
-
-    debugAssert(state == RECEIVING);
-    debugAssert(messageType != 0);
-    debugAssertM(receiveBufferUsedSize < messageSize, "Message already received.");
-    debugAssertM(messageSize >= receiveBufferUsedSize, "Message size overflow.");
-
-    // Read the data itself
-    int ret = 0;
-    uint32 left = messageSize - receiveBufferUsedSize;
-    int count = 0;
-    while ((ret != SOCKET_ERROR) && (left > 0) && (count < 100)) {
-
-        ret = recv(sock, ((char*)receiveBuffer) + receiveBufferUsedSize, left, 0);
-
-        if (ret > 0) {
-            left -= ret;
-            receiveBufferUsedSize += ret;
-            bReceived += ret;
-
-            if (left > 0) {
-                // There's still more. Give the machine a chance to read
-                // more data, but don't wait forever.
-
-                ++count;
-                System::sleep(0.001);
-            }
-        } else {
-            // Something went wrong; our blocking read returned nothing.
-            break;
-        }
-    }
-
-    if ((ret == 0) || (ret == SOCKET_ERROR)) {
-
-        if (ret == SOCKET_ERROR) {
-            Log::common()->printf("Call to recv failed.  ret = %d,"
-                 " sizeof(messageSize) = %d\n", ret, messageSize);
-            Log::common()->println(socketErrorCode());
-        } else {
-            Log::common()->printf("recv returned 0\n");
-        }
-        nd->closesocket(sock);
-        return;
-    }
-
-    ++mReceived;
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-LightweightConduitRef LightweightConduit::create(
-    uint16                      receivePort,
-    bool                        enableReceive,
-    bool                        enableBroadcast) {
-    
-    return new LightweightConduit(receivePort, enableReceive, enableBroadcast);
-}
-
-LightweightConduit::LightweightConduit(
-    uint16 port,
-    bool enableReceive, 
-    bool enableBroadcast) {
-    NetworkDevice* nd = NetworkDevice::instance();
-
-    Log::common()->print("Creating a UDP socket        ");
-    sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
-    
-    if (sock == SOCKET_ERROR) {
-        sock = 0;
-        Log::common()->println("FAIL");
-        Log::common()->println(socketErrorCode());
-        return;
-    }
-    Log::common()->println("Ok");
-
-    if (enableReceive) {
-        debugAssert(port != 0);
-        if (! nd->bind(sock, NetAddress(0, port))) {
-            nd->closesocket(sock);
-            sock = (SOCKET)SOCKET_ERROR;
-        }
-    }
-
-    // Figuring out the MTU seems very complicated, so we just set it to 1000,
-    // which is likely to be safe.  See IP_MTU for more information.
-    MTU = 1000;
-
-    increaseBufferSize(sock);
-
-    if (enableBroadcast) {
-        int TR = true;
-        if (setsockopt(sock, SOL_SOCKET, SO_BROADCAST, 
-                       (const char*)&TR, sizeof(TR)) != 0) {
-            Log::common()->println("Call to setsockopt failed");
-            Log::common()->println(socketErrorCode());
-            nd->closesocket(sock);
-            sock = 0;
-            return;
-        }
-    }
-
-    Log::common()->printf("Done creating UDP socket %d\n", sock);
-
-    alreadyReadMessage = false;
-}
-
-
-LightweightConduit::~LightweightConduit() {
-}
-
-
-bool LightweightConduit::receive(NetAddress& sender) {
-    // This both checks to ensure that a message was waiting and
-    // actively consumes the message from the network stream if
-    // it has not been read yet.
-    uint32 t = waitingMessageType();
-    if (t == 0) {
-        return false;
-    }
-
-    sender = messageSender;
-    alreadyReadMessage = false;
-
-    if (messageBuffer.size() < 4) {
-        // Something went wrong
-        return false;
-    }
-
-    return true;
-}
-
-
-void LightweightConduit::sendBuffer(const NetAddress& a, BinaryOutput& b) {
-    NetworkDevice* nd = NetworkDevice::instance();
-    if (sendto(sock, (const char*)b.getCArray(), b.size(), 0,
-       (struct sockaddr *) &(a.addr), sizeof(a.addr)) == SOCKET_ERROR) {
-        Log::common()->printf("Error occured while sending packet "
-                             "to %s\n", inet_ntoa(a.addr.sin_addr));
-        Log::common()->println(socketErrorCode());
-        nd->closesocket(sock);
-    } else {
-        ++mSent;
-        bSent += b.size();
-    }
-}
-
-
-bool LightweightConduit::messageWaiting() {
-    // We may have already pulled the message off the network stream
-    return alreadyReadMessage || Conduit::messageWaiting();
-}
-
-
-uint32 LightweightConduit::waitingMessageType() {
-    NetworkDevice* nd = NetworkDevice::instance();
-    if (! messageWaiting()) {
-        return 0;
-    } 
-
-    if (! alreadyReadMessage) {
-        messageBuffer.resize(8192);
-
-        SOCKADDR_IN remote_addr;
-        int iRemoteAddrLen = sizeof(sockaddr);
-
-        int ret = recvfrom(sock, (char*)messageBuffer.getCArray(), 
-            messageBuffer.size(), 0, (struct sockaddr *) &remote_addr, 
-            (socklen_t*)&iRemoteAddrLen);
-
-        if (ret == SOCKET_ERROR) {
-            Log::common()->println("Error: recvfrom failed in "
-                    "LightweightConduit::waitingMessageType().");
-            Log::common()->println(socketErrorCode());
-            nd->closesocket(sock);
-            messageBuffer.resize(0);
-            messageSender = NetAddress();
-            messageType = 0;
-            return 0;
-        }
-
-        messageSender = NetAddress(remote_addr);
-
-        ++mReceived;
-        bReceived += ret;
-
-        messageBuffer.resize(ret, DONT_SHRINK_UNDERLYING_ARRAY);
-
-        // The type is the first four bytes.  It is little endian.
-        if (System::machineEndian() == G3D_LITTLE_ENDIAN) {
-            messageType = *((uint32*)messageBuffer.getCArray());
-        } else {
-            // Swap the byte order
-            for (int i = 0; i < 4; ++i) {
-                ((char*)&messageType)[i] = messageBuffer[3 - i];
-            }
-        }
-
-        alreadyReadMessage = true;
-    }
-
-    return messageType;
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-
-NetListenerRef NetListener::create(const uint16 port) {
-    return new NetListener(port);
-}
-
-
-NetListener::NetListener(uint16 port) {
-    NetworkDevice* nd = NetworkDevice::instance();
-
-    // Start the listener socket
-    Log::common()->print("Creating a listener            ");
-    sock = socket(AF_INET, SOCK_STREAM, IPPROTO_IP);
-    
-    if (sock == SOCKET_ERROR) {
-        Log::common()->printf("FAIL");
-        Log::common()->println(socketErrorCode());
-        return;
-    }
-    Log::common()->println("Ok");
-
-    const int T = true;
-
-    // Set reuse address so that a new server can start up soon after
-    // an old one has closed.
-    if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, 
-                   (const char*)&T, sizeof(T)) == SOCKET_ERROR) {
-        
-        Log::common()->println("WARNING: Setting socket reuseaddr failed.");
-        Log::common()->println(socketErrorCode());
-    } else {
-        Log::common()->println("Set socket option reuseaddr.");
-    }
-
-    
-    if (! nd->bind(sock, NetAddress(0, port))) {
-        Log::common()->printf("Unable to bind!\n");
-        nd->closesocket(sock);
-        sock = (SOCKET)SOCKET_ERROR;
-        return;
-    }
-
-    Log::common()->printf("Listening on port %5d        ", port);
-
-    // listen is supposed to return 0 when there is no error.
-    // The 2nd argument is the number of connections to allow pending
-    // at any time.
-    int L = listen(sock, 100);
-    if (L == SOCKET_ERROR) {
-        Log::common()->println("FAIL");
-        Log::common()->println(socketErrorCode());
-        nd->closesocket(sock);
-        sock = (SOCKET)SOCKET_ERROR;
-        return;
-    }
-    Log::common()->println("Ok");
-    Log::common()->printf("Now listening on socket %d.\n\n", sock);
-}
-
-
-NetListener::~NetListener() {
-    NetworkDevice* nd = NetworkDevice::instance();
-    nd->closesocket(sock);
-}
-
-
-ReliableConduitRef NetListener::waitForConnection() {
-    NetworkDevice* nd = NetworkDevice::instance();
-    // The address of the connecting host
-    SOCKADDR_IN    remote_addr;
-    int iAddrLen = sizeof(remote_addr);
-
-    Log::common()->println("Blocking in NetListener::waitForConnection().");
-
-    SOCKET sClient = accept(sock, (struct sockaddr*) &remote_addr, 
-                            (socklen_t*)&iAddrLen);
-
-    if (sClient == SOCKET_ERROR) {
-        Log::common()->println("Error in NetListener::acceptConnection.");
-        Log::common()->println(socketErrorCode());
-        nd->closesocket(sock);
-        return NULL;
-    }
-
-    Log::common()->printf("%s connected, transferred to socket %d.\n", 
-                         inet_ntoa(remote_addr.sin_addr), sClient);
-
-    #ifndef G3D_WIN32
-        return new ReliableConduit(sClient, 
-                     NetAddress(htonl(remote_addr.sin_addr.s_addr), 
-                                ntohs(remote_addr.sin_port)));
-    #else
-        return new ReliableConduit(sClient, 
-                    NetAddress(ntohl(remote_addr.sin_addr.S_un.S_addr), 
-                               ntohs(remote_addr.sin_port)));
-    #endif
-}
-
-
-bool NetListener::ok() const {
-    return (sock != 0) && (sock != SOCKET_ERROR);
-}
-
-
-bool NetListener::clientWaiting() const {
-    return readWaiting(sock);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////
-
-void NetworkDevice::describeSystem(
-    TextOutput& t) {
-
-    t.writeSymbols("Network", "{");
-    t.writeNewline();
-    t.pushIndent();
-    
-    for (int i = 0; i < m_adapterArray.size(); ++i) {
-        m_adapterArray[i].describe(t);
-    }
-
-
-    t.popIndent();
-    t.writeSymbols("}");
-    t.writeNewline();
-    t.writeNewline();
-}
-
-
-void NetworkDevice::describeSystem(
-    std::string&        s) {
-
-    TextOutput t;
-    describeSystem(t);
-    t.commitString(s);
-}
-
-} // namespace
diff --git a/externals/g3dlite/G3D.lib/source/PhysicsFrame.cpp b/externals/g3dlite/G3D.lib/source/PhysicsFrame.cpp
deleted file mode 100644
index 034e585d01f..00000000000
--- a/externals/g3dlite/G3D.lib/source/PhysicsFrame.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- @file PhysicsFrame.cpp
-
- @maintainer Morgan McGuire, matrix@graphics3d.com
- 
- @created 2002-07-09
- @edited  2006-01-25
-*/
-
-#include "G3D/platform.h"
-#include "G3D/PhysicsFrame.h"
-#include "G3D/BinaryInput.h"
-#include "G3D/BinaryOutput.h"
-
-namespace G3D {
-
-PhysicsFrame::PhysicsFrame() {
-    translation = Vector3::zero();
-    rotation    = Quat();
-}
-
-
-PhysicsFrame::PhysicsFrame(
-    const CoordinateFrame& coordinateFrame) {
-
-    translation = coordinateFrame.translation;
-    rotation    = Quat(coordinateFrame.rotation);
-}
-
-
-PhysicsFrame PhysicsFrame::operator*(const PhysicsFrame& other) const {
-    PhysicsFrame result;
-
-    result.rotation = rotation * other.rotation;
-    result.translation = translation + rotation.toRotationMatrix() * other.translation;
-
-    return result;
-}
-
-
-CoordinateFrame PhysicsFrame::toCoordinateFrame() const {
-    CoordinateFrame f;
-    
-    f.translation = translation;
-    f.rotation    = rotation.toRotationMatrix();
-
-    return f;
-}
-
-
-PhysicsFrame PhysicsFrame::lerp(
-    const PhysicsFrame&     other,
-    float                   alpha) const {
-
-    PhysicsFrame result;
-
-    result.translation = translation.lerp(other.translation, alpha);
-    result.rotation    = rotation.slerp(other.rotation, alpha);
-
-    return result;
-}
-
-
-void PhysicsFrame::deserialize(class BinaryInput& b) {
-    translation.deserialize(b);
-    rotation.deserialize(b);
-}
-
-
-void PhysicsFrame::serialize(class BinaryOutput& b) const {
-    translation.serialize(b);
-    rotation.serialize(b);
-}
-
-
-}; // namespace
-
diff --git a/externals/g3dlite/G3D.lib/source/Plane.cpp b/externals/g3dlite/G3D.lib/source/Plane.cpp
deleted file mode 100644
index bb8ed5c6033..00000000000
--- a/externals/g3dlite/G3D.lib/source/Plane.cpp
+++ /dev/null
@@ -1,149 +0,0 @@
-/**
- @file Plane.cpp
- 
- @maintainer Morgan McGuire, matrix@graphics3d.com
- 
- @created 2003-02-06
- @edited  2006-01-29
- */
-
-#include "G3D/platform.h"
-#include "G3D/Plane.h"
-#include "G3D/BinaryOutput.h"
-#include "G3D/BinaryInput.h"
-#include "G3D/stringutils.h"
-
-namespace G3D {
-
-Plane::Plane(class BinaryInput& b) {
-	deserialize(b);
-}
-
-
-void Plane::serialize(class BinaryOutput& b) const {
-	_normal.serialize(b);
-	b.writeFloat64(_distance);
-}
-
-
-void Plane::deserialize(class BinaryInput& b) {
-	_normal.deserialize(b);
-	_distance = (float)b.readFloat64();
-}
-
-
-Plane::Plane(
-    Vector4      point0,
-    Vector4      point1,
-    Vector4      point2) {
-
-    debugAssertM(
-        point0.w != 0 || 
-        point1.w != 0 || 
-        point2.w != 0,
-        "At least one point must be finite.");
-
-    // Rotate the points around so that the finite points come first.
-
-    while ((point0.w == 0) && 
-           ((point1.w == 0) || (point2.w != 0))) {
-        Vector4 temp = point0;
-        point0 = point1;
-        point1 = point2;
-        point2 = temp;
-    }
-
-    Vector3 dir1;
-    Vector3 dir2;
-
-    if (point1.w == 0) {
-        // 1 finite, 2 infinite points; the plane must contain
-        // the direction of the two direcitons
-        dir1 = point1.xyz();
-        dir2 = point2.xyz();
-    } else if (point2.w != 0) {
-        // 3 finite points, the plane must contain the directions
-        // betwseen the points.
-        dir1 = point1.xyz() - point0.xyz();
-        dir2 = point2.xyz() - point0.xyz();
-    } else {
-        // 2 finite, 1 infinite point; the plane must contain
-        // the direction between the first two points and the
-        // direction of the third point.
-        dir1 = point1.xyz() - point0.xyz();
-        dir2 = point2.xyz();
-    }
-
-    _normal   = dir1.cross(dir2).direction();
-    _distance = _normal.dot(point0.xyz());
-}
-
-
-Plane::Plane(
-    const Vector3&      point0,
-    const Vector3&      point1,
-    const Vector3&      point2) {
-
-    _normal   = (point1 - point0).cross(point2 - point0).direction();
-    _distance = _normal.dot(point0);
-}
-
-
-Plane::Plane(
-    const Vector3&      __normal,
-    const Vector3&      point) {
-
-    _normal    = __normal.direction();
-    _distance  = _normal.dot(point);
-}
-
-
-Plane Plane::fromEquation(float a, float b, float c, float d) {
-    Vector3 n(a, b, c);
-    float magnitude = n.magnitude();
-    d /= magnitude;
-    n /= magnitude;
-    return Plane(n, -d);
-}
-
-
-void Plane::flip() {
-    _normal   = -_normal;
-    _distance  = -_distance;
-}
-
-
-void Plane::getEquation(Vector3& n, float& d) const {
-    double _d;
-    getEquation(n, _d);
-    d = (float)_d;
-}
-
-void Plane::getEquation(Vector3& n, double& d) const {
-    n = _normal;
-    d = -_distance;
-}
-
-
-void Plane::getEquation(float& a, float& b, float& c, float& d) const {
-    double _a, _b, _c, _d;
-    getEquation(_a, _b, _c, _d);
-    a = (float)_a;
-    b = (float)_b;
-    c = (float)_c;
-    d = (float)_d;
-}
-
-void Plane::getEquation(double& a, double& b, double& c, double& d) const {
-    a = _normal.x;
-    b = _normal.y;
-    c = _normal.z;
-    d = -_distance;
-}
-
-
-std::string Plane::toString() const {
-    return format("Plane(%g, %g, %g, %g)", _normal.x, _normal.y, _normal.z, _distance);
-}
-
-}
diff --git a/externals/g3dlite/G3D.lib/source/Quat.cpp b/externals/g3dlite/G3D.lib/source/Quat.cpp
deleted file mode 100644
index 225c5b51acc..00000000000
--- a/externals/g3dlite/G3D.lib/source/Quat.cpp
+++ /dev/null
@@ -1,583 +0,0 @@
-/**
-  @file Quat.cpp
- 
-  Quaternion implementation based on Watt & Watt page 363
-  
-  @author Morgan McGuire, graphics3d.com
-  
-  @created 2002-01-23
-  @edited  2006-01-31
- */
-
-#include "G3D/Quat.h"
-#include "G3D/BinaryInput.h"
-#include "G3D/BinaryOutput.h"
-
-namespace G3D {
-
-Quat Quat::fromAxisAngleRotation(
-    const Vector3&      axis,
-    float               angle) {
-
-    Quat q;
-
-    q.w = cos(angle / 2.0f);
-    q.imag() = axis.direction() * sin(angle / 2.0f); 
-
-    return q;
-}
-
-
-Quat::Quat(
-    const Matrix3& rot) {
-
-    static const int plus1mod3[] = {1, 2, 0};
-
-    // Find the index of the largest diagonal component
-	// These ? operations hopefully compile to conditional
-	// move instructions instead of branches.
-    int i = (rot[1][1] > rot[0][0]) ? 1 : 0;
-    i = (rot[2][2] > rot[i][i]) ? 2 : i;
-
-	// Find the indices of the other elements
-    int j = plus1mod3[i];
-    int k = plus1mod3[j];
-
-	// Index the elements of the vector part of the quaternion as a float*
-    float* v = (float*)(this);
-
-	// If we attempted to pre-normalize and trusted the matrix to be
-	// perfectly orthonormal, the result would be:
-	//
-    //   double c = sqrt((rot[i][i] - (rot[j][j] + rot[k][k])) + 1.0)
-    //   v[i] = -c * 0.5
-    //   v[j] = -(rot[i][j] + rot[j][i]) * 0.5 / c
-    //   v[k] = -(rot[i][k] + rot[k][i]) * 0.5 / c
-    //   w    =  (rot[j][k] - rot[k][j]) * 0.5 / c
-	//
-	// Since we're going to pay the sqrt anyway, we perform a post normalization, which also
-	// fixes any poorly normalized input.  Multiply all elements by 2*c in the above, giving:
-
-	// nc2 = -c^2
-    double nc2 = ((rot[j][j] + rot[k][k]) - rot[i][i]) - 1.0;
-    v[i] =  nc2;
-    w    =  (rot[j][k] - rot[k][j]);
-    v[j] = -(rot[i][j] + rot[j][i]);
-    v[k] = -(rot[i][k] + rot[k][i]);
-
-	// We now have the correct result with the wrong magnitude, so normalize it:
-    float s = sqrt(x*x + y*y + z*z + w*w);
-    if (s > 0.00001f) {
-	    s = 1.0f / s;
-	    x *= s;
-	    y *= s;
-	    z *= s;
-	    w *= s;
-    } else {
-        // The quaternion is nearly zero.  Make it 0 0 0 1
-        x = 0.0f;
-        y = 0.0f;
-        z = 0.0f;
-        w = 1.0f;
-    }
-}
-
-
-void Quat::toAxisAngleRotation(
-    Vector3&            axis,
-    double&             angle) const {
-   
-    // Decompose the quaternion into an angle and an axis.
-    
-    axis = Vector3(x, y, z);
-    angle = 2 * acos(w);
-
-    float len = sqrt(1.0f - w * w);
-
-    if (fuzzyGt(abs(len), 0.0f)) {
-        axis /= len;
-    }
-
-    // Reduce the range of the angle.
-
-    if (angle < 0) {		
-		angle = -angle;
-		axis = -axis;
-    }
-
-	while (angle > twoPi()) {
-        angle -= twoPi();
-    }
-
-	if (abs(angle) > pi()) {
-		angle -= twoPi();
-    }
-
-    // Make the angle positive.
-
-	if (angle < 0.0f) {		
-		angle = -angle;
-        axis = -axis;
-	}
-}
-
-
-Matrix3 Quat::toRotationMatrix() const {
-    Matrix3 out = Matrix3::zero();
-
-    toRotationMatrix(out);
-
-    return out;
-}
-
-
-void Quat::toRotationMatrix(
-    Matrix3&            rot) const {
-
-    rot = Matrix3(*this);
-}
-
-    
-Quat Quat::slerp(
-    const Quat&         _quat1,
-    float               alpha,
-    float               threshold) const {
-
-    // From: Game Physics -- David Eberly pg 538-540
-    // Modified to include lerp for small angles, which
-	// is a common practice.
-
-	// See also:
-	// http://number-none.com/product/Understanding%20Slerp,%20Then%20Not%20Using%20It/index.html
-
-    const Quat& quat0 = *this;
-    Quat quat1 = _quat1;
-
-    // angle between quaternion rotations
-    float phi;
-    float cosphi = quat0.dot(quat1);
-
-
-    if (cosphi < 0) {
-        // Change the sign and fix the dot product; we need to
-        // loop the other way to get the shortest path
-        quat1 = -quat1;
-        cosphi = -cosphi;
-    }
-
-    // Using G3D::aCos will clamp the angle to 0 and pi
-    phi = static_cast(G3D::aCos(cosphi));
-    
-    if (phi >= threshold) {
-        // For large angles, slerp
-        float scale0, scale1;
-
-        scale0 = sin((1.0f - alpha) * phi);
-        scale1 = sin(alpha * phi);
-        
-        return ( (quat0 * scale0) + (quat1 * scale1) ) / sin(phi);
-    } else {
-        // For small angles, linear interpolate
-		return quat0.nlerp(quat1, alpha);
-    }
-}
-
-
-Quat Quat::nlerp(
-    const Quat&         quat1,
-    float               alpha) const {
-
-    Quat result = (*this) * (1.0f - alpha) + quat1 * alpha;
-	return result / result.magnitude();
-}
-
-
-Quat Quat::operator*(const Quat& other) const {
-
-    // Following Watt & Watt, page 360
-    const Vector3& v1 = imag();
-    const Vector3& v2 = other.imag();
-    float          s1 = w;
-    float          s2 = other.w;
-
-    return Quat(s1*v2 + s2*v1 + v1.cross(v2), s1*s2 - v1.dot(v2));
-}
-
-
-// From "Uniform Random Rotations", Ken Shoemake, Graphics Gems III.
-Quat Quat::unitRandom() {
-    float x0 = uniformRandom();
-    float r1 = sqrtf(1 - x0), 
-          r2 = sqrtf(x0);
-    float t1 = (float)G3D::twoPi() * uniformRandom();
-    float t2 = (float)G3D::twoPi() * uniformRandom();
-    float c1 = cosf(t1), 
-          s1 = sinf(t1);
-    float c2 = cosf(t2), 
-          s2 = sinf(t2);
-    return Quat(s1 * r1, c1 * r1, s2 * r2, c2 * r2);
-}
-
-
-void Quat::deserialize(class BinaryInput& b) {
-    x = b.readFloat32();
-    y = b.readFloat32();
-    z = b.readFloat32();
-    w = b.readFloat32();
-}
-
-
-void Quat::serialize(class BinaryOutput& b) const {
-    b.writeFloat32(x);
-    b.writeFloat32(y);
-    b.writeFloat32(z);
-    b.writeFloat32(w);
-}
-
-
-// 2-char swizzles
-
-Vector2 Quat::xx() const  { return Vector2       (x, x); }
-Vector2 Quat::yx() const  { return Vector2       (y, x); }
-Vector2 Quat::zx() const  { return Vector2       (z, x); }
-Vector2 Quat::wx() const  { return Vector2       (w, x); }
-Vector2 Quat::xy() const  { return Vector2       (x, y); }
-Vector2 Quat::yy() const  { return Vector2       (y, y); }
-Vector2 Quat::zy() const  { return Vector2       (z, y); }
-Vector2 Quat::wy() const  { return Vector2       (w, y); }
-Vector2 Quat::xz() const  { return Vector2       (x, z); }
-Vector2 Quat::yz() const  { return Vector2       (y, z); }
-Vector2 Quat::zz() const  { return Vector2       (z, z); }
-Vector2 Quat::wz() const  { return Vector2       (w, z); }
-Vector2 Quat::xw() const  { return Vector2       (x, w); }
-Vector2 Quat::yw() const  { return Vector2       (y, w); }
-Vector2 Quat::zw() const  { return Vector2       (z, w); }
-Vector2 Quat::ww() const  { return Vector2       (w, w); }
-
-// 3-char swizzles
-
-Vector3 Quat::xxx() const  { return Vector3       (x, x, x); }
-Vector3 Quat::yxx() const  { return Vector3       (y, x, x); }
-Vector3 Quat::zxx() const  { return Vector3       (z, x, x); }
-Vector3 Quat::wxx() const  { return Vector3       (w, x, x); }
-Vector3 Quat::xyx() const  { return Vector3       (x, y, x); }
-Vector3 Quat::yyx() const  { return Vector3       (y, y, x); }
-Vector3 Quat::zyx() const  { return Vector3       (z, y, x); }
-Vector3 Quat::wyx() const  { return Vector3       (w, y, x); }
-Vector3 Quat::xzx() const  { return Vector3       (x, z, x); }
-Vector3 Quat::yzx() const  { return Vector3       (y, z, x); }
-Vector3 Quat::zzx() const  { return Vector3       (z, z, x); }
-Vector3 Quat::wzx() const  { return Vector3       (w, z, x); }
-Vector3 Quat::xwx() const  { return Vector3       (x, w, x); }
-Vector3 Quat::ywx() const  { return Vector3       (y, w, x); }
-Vector3 Quat::zwx() const  { return Vector3       (z, w, x); }
-Vector3 Quat::wwx() const  { return Vector3       (w, w, x); }
-Vector3 Quat::xxy() const  { return Vector3       (x, x, y); }
-Vector3 Quat::yxy() const  { return Vector3       (y, x, y); }
-Vector3 Quat::zxy() const  { return Vector3       (z, x, y); }
-Vector3 Quat::wxy() const  { return Vector3       (w, x, y); }
-Vector3 Quat::xyy() const  { return Vector3       (x, y, y); }
-Vector3 Quat::yyy() const  { return Vector3       (y, y, y); }
-Vector3 Quat::zyy() const  { return Vector3       (z, y, y); }
-Vector3 Quat::wyy() const  { return Vector3       (w, y, y); }
-Vector3 Quat::xzy() const  { return Vector3       (x, z, y); }
-Vector3 Quat::yzy() const  { return Vector3       (y, z, y); }
-Vector3 Quat::zzy() const  { return Vector3       (z, z, y); }
-Vector3 Quat::wzy() const  { return Vector3       (w, z, y); }
-Vector3 Quat::xwy() const  { return Vector3       (x, w, y); }
-Vector3 Quat::ywy() const  { return Vector3       (y, w, y); }
-Vector3 Quat::zwy() const  { return Vector3       (z, w, y); }
-Vector3 Quat::wwy() const  { return Vector3       (w, w, y); }
-Vector3 Quat::xxz() const  { return Vector3       (x, x, z); }
-Vector3 Quat::yxz() const  { return Vector3       (y, x, z); }
-Vector3 Quat::zxz() const  { return Vector3       (z, x, z); }
-Vector3 Quat::wxz() const  { return Vector3       (w, x, z); }
-Vector3 Quat::xyz() const  { return Vector3       (x, y, z); }
-Vector3 Quat::yyz() const  { return Vector3       (y, y, z); }
-Vector3 Quat::zyz() const  { return Vector3       (z, y, z); }
-Vector3 Quat::wyz() const  { return Vector3       (w, y, z); }
-Vector3 Quat::xzz() const  { return Vector3       (x, z, z); }
-Vector3 Quat::yzz() const  { return Vector3       (y, z, z); }
-Vector3 Quat::zzz() const  { return Vector3       (z, z, z); }
-Vector3 Quat::wzz() const  { return Vector3       (w, z, z); }
-Vector3 Quat::xwz() const  { return Vector3       (x, w, z); }
-Vector3 Quat::ywz() const  { return Vector3       (y, w, z); }
-Vector3 Quat::zwz() const  { return Vector3       (z, w, z); }
-Vector3 Quat::wwz() const  { return Vector3       (w, w, z); }
-Vector3 Quat::xxw() const  { return Vector3       (x, x, w); }
-Vector3 Quat::yxw() const  { return Vector3       (y, x, w); }
-Vector3 Quat::zxw() const  { return Vector3       (z, x, w); }
-Vector3 Quat::wxw() const  { return Vector3       (w, x, w); }
-Vector3 Quat::xyw() const  { return Vector3       (x, y, w); }
-Vector3 Quat::yyw() const  { return Vector3       (y, y, w); }
-Vector3 Quat::zyw() const  { return Vector3       (z, y, w); }
-Vector3 Quat::wyw() const  { return Vector3       (w, y, w); }
-Vector3 Quat::xzw() const  { return Vector3       (x, z, w); }
-Vector3 Quat::yzw() const  { return Vector3       (y, z, w); }
-Vector3 Quat::zzw() const  { return Vector3       (z, z, w); }
-Vector3 Quat::wzw() const  { return Vector3       (w, z, w); }
-Vector3 Quat::xww() const  { return Vector3       (x, w, w); }
-Vector3 Quat::yww() const  { return Vector3       (y, w, w); }
-Vector3 Quat::zww() const  { return Vector3       (z, w, w); }
-Vector3 Quat::www() const  { return Vector3       (w, w, w); }
-
-// 4-char swizzles
-
-Vector4 Quat::xxxx() const  { return Vector4       (x, x, x, x); }
-Vector4 Quat::yxxx() const  { return Vector4       (y, x, x, x); }
-Vector4 Quat::zxxx() const  { return Vector4       (z, x, x, x); }
-Vector4 Quat::wxxx() const  { return Vector4       (w, x, x, x); }
-Vector4 Quat::xyxx() const  { return Vector4       (x, y, x, x); }
-Vector4 Quat::yyxx() const  { return Vector4       (y, y, x, x); }
-Vector4 Quat::zyxx() const  { return Vector4       (z, y, x, x); }
-Vector4 Quat::wyxx() const  { return Vector4       (w, y, x, x); }
-Vector4 Quat::xzxx() const  { return Vector4       (x, z, x, x); }
-Vector4 Quat::yzxx() const  { return Vector4       (y, z, x, x); }
-Vector4 Quat::zzxx() const  { return Vector4       (z, z, x, x); }
-Vector4 Quat::wzxx() const  { return Vector4       (w, z, x, x); }
-Vector4 Quat::xwxx() const  { return Vector4       (x, w, x, x); }
-Vector4 Quat::ywxx() const  { return Vector4       (y, w, x, x); }
-Vector4 Quat::zwxx() const  { return Vector4       (z, w, x, x); }
-Vector4 Quat::wwxx() const  { return Vector4       (w, w, x, x); }
-Vector4 Quat::xxyx() const  { return Vector4       (x, x, y, x); }
-Vector4 Quat::yxyx() const  { return Vector4       (y, x, y, x); }
-Vector4 Quat::zxyx() const  { return Vector4       (z, x, y, x); }
-Vector4 Quat::wxyx() const  { return Vector4       (w, x, y, x); }
-Vector4 Quat::xyyx() const  { return Vector4       (x, y, y, x); }
-Vector4 Quat::yyyx() const  { return Vector4       (y, y, y, x); }
-Vector4 Quat::zyyx() const  { return Vector4       (z, y, y, x); }
-Vector4 Quat::wyyx() const  { return Vector4       (w, y, y, x); }
-Vector4 Quat::xzyx() const  { return Vector4       (x, z, y, x); }
-Vector4 Quat::yzyx() const  { return Vector4       (y, z, y, x); }
-Vector4 Quat::zzyx() const  { return Vector4       (z, z, y, x); }
-Vector4 Quat::wzyx() const  { return Vector4       (w, z, y, x); }
-Vector4 Quat::xwyx() const  { return Vector4       (x, w, y, x); }
-Vector4 Quat::ywyx() const  { return Vector4       (y, w, y, x); }
-Vector4 Quat::zwyx() const  { return Vector4       (z, w, y, x); }
-Vector4 Quat::wwyx() const  { return Vector4       (w, w, y, x); }
-Vector4 Quat::xxzx() const  { return Vector4       (x, x, z, x); }
-Vector4 Quat::yxzx() const  { return Vector4       (y, x, z, x); }
-Vector4 Quat::zxzx() const  { return Vector4       (z, x, z, x); }
-Vector4 Quat::wxzx() const  { return Vector4       (w, x, z, x); }
-Vector4 Quat::xyzx() const  { return Vector4       (x, y, z, x); }
-Vector4 Quat::yyzx() const  { return Vector4       (y, y, z, x); }
-Vector4 Quat::zyzx() const  { return Vector4       (z, y, z, x); }
-Vector4 Quat::wyzx() const  { return Vector4       (w, y, z, x); }
-Vector4 Quat::xzzx() const  { return Vector4       (x, z, z, x); }
-Vector4 Quat::yzzx() const  { return Vector4       (y, z, z, x); }
-Vector4 Quat::zzzx() const  { return Vector4       (z, z, z, x); }
-Vector4 Quat::wzzx() const  { return Vector4       (w, z, z, x); }
-Vector4 Quat::xwzx() const  { return Vector4       (x, w, z, x); }
-Vector4 Quat::ywzx() const  { return Vector4       (y, w, z, x); }
-Vector4 Quat::zwzx() const  { return Vector4       (z, w, z, x); }
-Vector4 Quat::wwzx() const  { return Vector4       (w, w, z, x); }
-Vector4 Quat::xxwx() const  { return Vector4       (x, x, w, x); }
-Vector4 Quat::yxwx() const  { return Vector4       (y, x, w, x); }
-Vector4 Quat::zxwx() const  { return Vector4       (z, x, w, x); }
-Vector4 Quat::wxwx() const  { return Vector4       (w, x, w, x); }
-Vector4 Quat::xywx() const  { return Vector4       (x, y, w, x); }
-Vector4 Quat::yywx() const  { return Vector4       (y, y, w, x); }
-Vector4 Quat::zywx() const  { return Vector4       (z, y, w, x); }
-Vector4 Quat::wywx() const  { return Vector4       (w, y, w, x); }
-Vector4 Quat::xzwx() const  { return Vector4       (x, z, w, x); }
-Vector4 Quat::yzwx() const  { return Vector4       (y, z, w, x); }
-Vector4 Quat::zzwx() const  { return Vector4       (z, z, w, x); }
-Vector4 Quat::wzwx() const  { return Vector4       (w, z, w, x); }
-Vector4 Quat::xwwx() const  { return Vector4       (x, w, w, x); }
-Vector4 Quat::ywwx() const  { return Vector4       (y, w, w, x); }
-Vector4 Quat::zwwx() const  { return Vector4       (z, w, w, x); }
-Vector4 Quat::wwwx() const  { return Vector4       (w, w, w, x); }
-Vector4 Quat::xxxy() const  { return Vector4       (x, x, x, y); }
-Vector4 Quat::yxxy() const  { return Vector4       (y, x, x, y); }
-Vector4 Quat::zxxy() const  { return Vector4       (z, x, x, y); }
-Vector4 Quat::wxxy() const  { return Vector4       (w, x, x, y); }
-Vector4 Quat::xyxy() const  { return Vector4       (x, y, x, y); }
-Vector4 Quat::yyxy() const  { return Vector4       (y, y, x, y); }
-Vector4 Quat::zyxy() const  { return Vector4       (z, y, x, y); }
-Vector4 Quat::wyxy() const  { return Vector4       (w, y, x, y); }
-Vector4 Quat::xzxy() const  { return Vector4       (x, z, x, y); }
-Vector4 Quat::yzxy() const  { return Vector4       (y, z, x, y); }
-Vector4 Quat::zzxy() const  { return Vector4       (z, z, x, y); }
-Vector4 Quat::wzxy() const  { return Vector4       (w, z, x, y); }
-Vector4 Quat::xwxy() const  { return Vector4       (x, w, x, y); }
-Vector4 Quat::ywxy() const  { return Vector4       (y, w, x, y); }
-Vector4 Quat::zwxy() const  { return Vector4       (z, w, x, y); }
-Vector4 Quat::wwxy() const  { return Vector4       (w, w, x, y); }
-Vector4 Quat::xxyy() const  { return Vector4       (x, x, y, y); }
-Vector4 Quat::yxyy() const  { return Vector4       (y, x, y, y); }
-Vector4 Quat::zxyy() const  { return Vector4       (z, x, y, y); }
-Vector4 Quat::wxyy() const  { return Vector4       (w, x, y, y); }
-Vector4 Quat::xyyy() const  { return Vector4       (x, y, y, y); }
-Vector4 Quat::yyyy() const  { return Vector4       (y, y, y, y); }
-Vector4 Quat::zyyy() const  { return Vector4       (z, y, y, y); }
-Vector4 Quat::wyyy() const  { return Vector4       (w, y, y, y); }
-Vector4 Quat::xzyy() const  { return Vector4       (x, z, y, y); }
-Vector4 Quat::yzyy() const  { return Vector4       (y, z, y, y); }
-Vector4 Quat::zzyy() const  { return Vector4       (z, z, y, y); }
-Vector4 Quat::wzyy() const  { return Vector4       (w, z, y, y); }
-Vector4 Quat::xwyy() const  { return Vector4       (x, w, y, y); }
-Vector4 Quat::ywyy() const  { return Vector4       (y, w, y, y); }
-Vector4 Quat::zwyy() const  { return Vector4       (z, w, y, y); }
-Vector4 Quat::wwyy() const  { return Vector4       (w, w, y, y); }
-Vector4 Quat::xxzy() const  { return Vector4       (x, x, z, y); }
-Vector4 Quat::yxzy() const  { return Vector4       (y, x, z, y); }
-Vector4 Quat::zxzy() const  { return Vector4       (z, x, z, y); }
-Vector4 Quat::wxzy() const  { return Vector4       (w, x, z, y); }
-Vector4 Quat::xyzy() const  { return Vector4       (x, y, z, y); }
-Vector4 Quat::yyzy() const  { return Vector4       (y, y, z, y); }
-Vector4 Quat::zyzy() const  { return Vector4       (z, y, z, y); }
-Vector4 Quat::wyzy() const  { return Vector4       (w, y, z, y); }
-Vector4 Quat::xzzy() const  { return Vector4       (x, z, z, y); }
-Vector4 Quat::yzzy() const  { return Vector4       (y, z, z, y); }
-Vector4 Quat::zzzy() const  { return Vector4       (z, z, z, y); }
-Vector4 Quat::wzzy() const  { return Vector4       (w, z, z, y); }
-Vector4 Quat::xwzy() const  { return Vector4       (x, w, z, y); }
-Vector4 Quat::ywzy() const  { return Vector4       (y, w, z, y); }
-Vector4 Quat::zwzy() const  { return Vector4       (z, w, z, y); }
-Vector4 Quat::wwzy() const  { return Vector4       (w, w, z, y); }
-Vector4 Quat::xxwy() const  { return Vector4       (x, x, w, y); }
-Vector4 Quat::yxwy() const  { return Vector4       (y, x, w, y); }
-Vector4 Quat::zxwy() const  { return Vector4       (z, x, w, y); }
-Vector4 Quat::wxwy() const  { return Vector4       (w, x, w, y); }
-Vector4 Quat::xywy() const  { return Vector4       (x, y, w, y); }
-Vector4 Quat::yywy() const  { return Vector4       (y, y, w, y); }
-Vector4 Quat::zywy() const  { return Vector4       (z, y, w, y); }
-Vector4 Quat::wywy() const  { return Vector4       (w, y, w, y); }
-Vector4 Quat::xzwy() const  { return Vector4       (x, z, w, y); }
-Vector4 Quat::yzwy() const  { return Vector4       (y, z, w, y); }
-Vector4 Quat::zzwy() const  { return Vector4       (z, z, w, y); }
-Vector4 Quat::wzwy() const  { return Vector4       (w, z, w, y); }
-Vector4 Quat::xwwy() const  { return Vector4       (x, w, w, y); }
-Vector4 Quat::ywwy() const  { return Vector4       (y, w, w, y); }
-Vector4 Quat::zwwy() const  { return Vector4       (z, w, w, y); }
-Vector4 Quat::wwwy() const  { return Vector4       (w, w, w, y); }
-Vector4 Quat::xxxz() const  { return Vector4       (x, x, x, z); }
-Vector4 Quat::yxxz() const  { return Vector4       (y, x, x, z); }
-Vector4 Quat::zxxz() const  { return Vector4       (z, x, x, z); }
-Vector4 Quat::wxxz() const  { return Vector4       (w, x, x, z); }
-Vector4 Quat::xyxz() const  { return Vector4       (x, y, x, z); }
-Vector4 Quat::yyxz() const  { return Vector4       (y, y, x, z); }
-Vector4 Quat::zyxz() const  { return Vector4       (z, y, x, z); }
-Vector4 Quat::wyxz() const  { return Vector4       (w, y, x, z); }
-Vector4 Quat::xzxz() const  { return Vector4       (x, z, x, z); }
-Vector4 Quat::yzxz() const  { return Vector4       (y, z, x, z); }
-Vector4 Quat::zzxz() const  { return Vector4       (z, z, x, z); }
-Vector4 Quat::wzxz() const  { return Vector4       (w, z, x, z); }
-Vector4 Quat::xwxz() const  { return Vector4       (x, w, x, z); }
-Vector4 Quat::ywxz() const  { return Vector4       (y, w, x, z); }
-Vector4 Quat::zwxz() const  { return Vector4       (z, w, x, z); }
-Vector4 Quat::wwxz() const  { return Vector4       (w, w, x, z); }
-Vector4 Quat::xxyz() const  { return Vector4       (x, x, y, z); }
-Vector4 Quat::yxyz() const  { return Vector4       (y, x, y, z); }
-Vector4 Quat::zxyz() const  { return Vector4       (z, x, y, z); }
-Vector4 Quat::wxyz() const  { return Vector4       (w, x, y, z); }
-Vector4 Quat::xyyz() const  { return Vector4       (x, y, y, z); }
-Vector4 Quat::yyyz() const  { return Vector4       (y, y, y, z); }
-Vector4 Quat::zyyz() const  { return Vector4       (z, y, y, z); }
-Vector4 Quat::wyyz() const  { return Vector4       (w, y, y, z); }
-Vector4 Quat::xzyz() const  { return Vector4       (x, z, y, z); }
-Vector4 Quat::yzyz() const  { return Vector4       (y, z, y, z); }
-Vector4 Quat::zzyz() const  { return Vector4       (z, z, y, z); }
-Vector4 Quat::wzyz() const  { return Vector4       (w, z, y, z); }
-Vector4 Quat::xwyz() const  { return Vector4       (x, w, y, z); }
-Vector4 Quat::ywyz() const  { return Vector4       (y, w, y, z); }
-Vector4 Quat::zwyz() const  { return Vector4       (z, w, y, z); }
-Vector4 Quat::wwyz() const  { return Vector4       (w, w, y, z); }
-Vector4 Quat::xxzz() const  { return Vector4       (x, x, z, z); }
-Vector4 Quat::yxzz() const  { return Vector4       (y, x, z, z); }
-Vector4 Quat::zxzz() const  { return Vector4       (z, x, z, z); }
-Vector4 Quat::wxzz() const  { return Vector4       (w, x, z, z); }
-Vector4 Quat::xyzz() const  { return Vector4       (x, y, z, z); }
-Vector4 Quat::yyzz() const  { return Vector4       (y, y, z, z); }
-Vector4 Quat::zyzz() const  { return Vector4       (z, y, z, z); }
-Vector4 Quat::wyzz() const  { return Vector4       (w, y, z, z); }
-Vector4 Quat::xzzz() const  { return Vector4       (x, z, z, z); }
-Vector4 Quat::yzzz() const  { return Vector4       (y, z, z, z); }
-Vector4 Quat::zzzz() const  { return Vector4       (z, z, z, z); }
-Vector4 Quat::wzzz() const  { return Vector4       (w, z, z, z); }
-Vector4 Quat::xwzz() const  { return Vector4       (x, w, z, z); }
-Vector4 Quat::ywzz() const  { return Vector4       (y, w, z, z); }
-Vector4 Quat::zwzz() const  { return Vector4       (z, w, z, z); }
-Vector4 Quat::wwzz() const  { return Vector4       (w, w, z, z); }
-Vector4 Quat::xxwz() const  { return Vector4       (x, x, w, z); }
-Vector4 Quat::yxwz() const  { return Vector4       (y, x, w, z); }
-Vector4 Quat::zxwz() const  { return Vector4       (z, x, w, z); }
-Vector4 Quat::wxwz() const  { return Vector4       (w, x, w, z); }
-Vector4 Quat::xywz() const  { return Vector4       (x, y, w, z); }
-Vector4 Quat::yywz() const  { return Vector4       (y, y, w, z); }
-Vector4 Quat::zywz() const  { return Vector4       (z, y, w, z); }
-Vector4 Quat::wywz() const  { return Vector4       (w, y, w, z); }
-Vector4 Quat::xzwz() const  { return Vector4       (x, z, w, z); }
-Vector4 Quat::yzwz() const  { return Vector4       (y, z, w, z); }
-Vector4 Quat::zzwz() const  { return Vector4       (z, z, w, z); }
-Vector4 Quat::wzwz() const  { return Vector4       (w, z, w, z); }
-Vector4 Quat::xwwz() const  { return Vector4       (x, w, w, z); }
-Vector4 Quat::ywwz() const  { return Vector4       (y, w, w, z); }
-Vector4 Quat::zwwz() const  { return Vector4       (z, w, w, z); }
-Vector4 Quat::wwwz() const  { return Vector4       (w, w, w, z); }
-Vector4 Quat::xxxw() const  { return Vector4       (x, x, x, w); }
-Vector4 Quat::yxxw() const  { return Vector4       (y, x, x, w); }
-Vector4 Quat::zxxw() const  { return Vector4       (z, x, x, w); }
-Vector4 Quat::wxxw() const  { return Vector4       (w, x, x, w); }
-Vector4 Quat::xyxw() const  { return Vector4       (x, y, x, w); }
-Vector4 Quat::yyxw() const  { return Vector4       (y, y, x, w); }
-Vector4 Quat::zyxw() const  { return Vector4       (z, y, x, w); }
-Vector4 Quat::wyxw() const  { return Vector4       (w, y, x, w); }
-Vector4 Quat::xzxw() const  { return Vector4       (x, z, x, w); }
-Vector4 Quat::yzxw() const  { return Vector4       (y, z, x, w); }
-Vector4 Quat::zzxw() const  { return Vector4       (z, z, x, w); }
-Vector4 Quat::wzxw() const  { return Vector4       (w, z, x, w); }
-Vector4 Quat::xwxw() const  { return Vector4       (x, w, x, w); }
-Vector4 Quat::ywxw() const  { return Vector4       (y, w, x, w); }
-Vector4 Quat::zwxw() const  { return Vector4       (z, w, x, w); }
-Vector4 Quat::wwxw() const  { return Vector4       (w, w, x, w); }
-Vector4 Quat::xxyw() const  { return Vector4       (x, x, y, w); }
-Vector4 Quat::yxyw() const  { return Vector4       (y, x, y, w); }
-Vector4 Quat::zxyw() const  { return Vector4       (z, x, y, w); }
-Vector4 Quat::wxyw() const  { return Vector4       (w, x, y, w); }
-Vector4 Quat::xyyw() const  { return Vector4       (x, y, y, w); }
-Vector4 Quat::yyyw() const  { return Vector4       (y, y, y, w); }
-Vector4 Quat::zyyw() const  { return Vector4       (z, y, y, w); }
-Vector4 Quat::wyyw() const  { return Vector4       (w, y, y, w); }
-Vector4 Quat::xzyw() const  { return Vector4       (x, z, y, w); }
-Vector4 Quat::yzyw() const  { return Vector4       (y, z, y, w); }
-Vector4 Quat::zzyw() const  { return Vector4       (z, z, y, w); }
-Vector4 Quat::wzyw() const  { return Vector4       (w, z, y, w); }
-Vector4 Quat::xwyw() const  { return Vector4       (x, w, y, w); }
-Vector4 Quat::ywyw() const  { return Vector4       (y, w, y, w); }
-Vector4 Quat::zwyw() const  { return Vector4       (z, w, y, w); }
-Vector4 Quat::wwyw() const  { return Vector4       (w, w, y, w); }
-Vector4 Quat::xxzw() const  { return Vector4       (x, x, z, w); }
-Vector4 Quat::yxzw() const  { return Vector4       (y, x, z, w); }
-Vector4 Quat::zxzw() const  { return Vector4       (z, x, z, w); }
-Vector4 Quat::wxzw() const  { return Vector4       (w, x, z, w); }
-Vector4 Quat::xyzw() const  { return Vector4       (x, y, z, w); }
-Vector4 Quat::yyzw() const  { return Vector4       (y, y, z, w); }
-Vector4 Quat::zyzw() const  { return Vector4       (z, y, z, w); }
-Vector4 Quat::wyzw() const  { return Vector4       (w, y, z, w); }
-Vector4 Quat::xzzw() const  { return Vector4       (x, z, z, w); }
-Vector4 Quat::yzzw() const  { return Vector4       (y, z, z, w); }
-Vector4 Quat::zzzw() const  { return Vector4       (z, z, z, w); }
-Vector4 Quat::wzzw() const  { return Vector4       (w, z, z, w); }
-Vector4 Quat::xwzw() const  { return Vector4       (x, w, z, w); }
-Vector4 Quat::ywzw() const  { return Vector4       (y, w, z, w); }
-Vector4 Quat::zwzw() const  { return Vector4       (z, w, z, w); }
-Vector4 Quat::wwzw() const  { return Vector4       (w, w, z, w); }
-Vector4 Quat::xxww() const  { return Vector4       (x, x, w, w); }
-Vector4 Quat::yxww() const  { return Vector4       (y, x, w, w); }
-Vector4 Quat::zxww() const  { return Vector4       (z, x, w, w); }
-Vector4 Quat::wxww() const  { return Vector4       (w, x, w, w); }
-Vector4 Quat::xyww() const  { return Vector4       (x, y, w, w); }
-Vector4 Quat::yyww() const  { return Vector4       (y, y, w, w); }
-Vector4 Quat::zyww() const  { return Vector4       (z, y, w, w); }
-Vector4 Quat::wyww() const  { return Vector4       (w, y, w, w); }
-Vector4 Quat::xzww() const  { return Vector4       (x, z, w, w); }
-Vector4 Quat::yzww() const  { return Vector4       (y, z, w, w); }
-Vector4 Quat::zzww() const  { return Vector4       (z, z, w, w); }
-Vector4 Quat::wzww() const  { return Vector4       (w, z, w, w); }
-Vector4 Quat::xwww() const  { return Vector4       (x, w, w, w); }
-Vector4 Quat::ywww() const  { return Vector4       (y, w, w, w); }
-Vector4 Quat::zwww() const  { return Vector4       (z, w, w, w); }
-Vector4 Quat::wwww() const  { return Vector4       (w, w, w, w); }
-}
-
diff --git a/externals/g3dlite/G3D.lib/source/Ray.cpp b/externals/g3dlite/G3D.lib/source/Ray.cpp
deleted file mode 100644
index bf6aadc08d1..00000000000
--- a/externals/g3dlite/G3D.lib/source/Ray.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-/**
- @file Ray.cpp 
- 
- @maintainer Morgan McGuire, matrix@graphics3d.com
- 
- @created 2002-07-12
- @edited  2004-03-19
- */
-
-#include "G3D/platform.h"
-#include "G3D/Ray.h"
-#include "G3D/Plane.h"
-#include "G3D/Sphere.h"
-#include "G3D/CollisionDetection.h"
-
-namespace G3D {
-
-Ray::Ray(class BinaryInput& b) {
-	deserialize(b);
-}
-
-
-void Ray::serialize(class BinaryOutput& b) const {
-	origin.serialize(b);
-	direction.serialize(b);
-}
-
-
-void Ray::deserialize(class BinaryInput& b) {
-	origin.deserialize(b);
-	direction.deserialize(b);
-}
-
-
-Ray Ray::refract(
-    const Vector3&  newOrigin,
-    const Vector3&  normal,
-    float           iInside,
-    float           iOutside) const {
-
-    Vector3 D = direction.refractionDirection(normal, iInside, iOutside);
-    return Ray::fromOriginAndDirection(
-        newOrigin + (direction + normal * (float)sign(direction.dot(normal))) * 0.001f, D);
-}
-
-
-Ray Ray::reflect(
-    const Vector3&  newOrigin,
-    const Vector3&  normal) const {
-
-    Vector3 D = direction.reflectionDirection(normal);
-    return Ray::fromOriginAndDirection(newOrigin + (D + normal) * 0.001f, D);
-}
-
-
-Vector3 Ray::intersection(const Plane& plane) const {
-    float d;
-    Vector3 normal = plane.normal();
-    plane.getEquation(normal, d);
-    float rate = direction.dot(normal);
-
-    if (rate >= 0.0f) {
-        return Vector3::inf();
-    } else {
-        float t = -(d + origin.dot(normal)) / rate;
-
-        return origin + direction * t;
-    }
-}
-
-
-float Ray::intersectionTime(const class Sphere& sphere) const {
-    Vector3 dummy;
-    return CollisionDetection::collisionTimeForMovingPointFixedSphere(
-            origin, direction, sphere, dummy);
-}
-
-
-float Ray::intersectionTime(const class Plane& plane) const {
-    Vector3 dummy;
-    return CollisionDetection::collisionTimeForMovingPointFixedPlane(
-            origin, direction, plane, dummy);
-}
-
-
-float Ray::intersectionTime(const class Box& box) const {
-    Vector3 dummy;
-    float time = CollisionDetection::collisionTimeForMovingPointFixedBox(
-            origin, direction, box, dummy);
-
-    if ((time == inf()) && (box.contains(origin))) {
-        return 0.0f;
-    } else {
-        return time;
-    }
-}
-
-
-float Ray::intersectionTime(const class AABox& box) const {
-    Vector3 dummy;
-    bool inside;
-    float time = CollisionDetection::collisionTimeForMovingPointFixedAABox(
-            origin, direction, box, dummy, inside);
-
-    if ((time == inf()) && inside) {
-        return 0.0f;
-    } else {
-        return time;
-    }
-}
-
-}
diff --git a/externals/g3dlite/G3D.lib/source/RegistryUtil.cpp b/externals/g3dlite/G3D.lib/source/RegistryUtil.cpp
deleted file mode 100644
index 28ff6955d9b..00000000000
--- a/externals/g3dlite/G3D.lib/source/RegistryUtil.cpp
+++ /dev/null
@@ -1,290 +0,0 @@
-/**
- @file RegistryUtil.cpp
-
- @created 2006-04-06
- @edited  2006-04-24
-
- Copyright 2000-2006, Morgan McGuire.
- All rights reserved.
-*/
-
-#include "G3D/platform.h"
-
-// This file is only used on Windows
-#ifdef G3D_WIN32
-
-#include "G3D/RegistryUtil.h"
-#include "G3D/System.h"
-
-namespace G3D {
-
-// static helpers
-static HKEY getRootKeyFromString(const char* str, size_t length);
-
-
-bool RegistryUtil::keyExists(const std::string& key) {
-    size_t pos = key.find('\\', 0);
-    if (pos == std::string::npos) {
-        return false;
-    }
-
-    HKEY hkey = getRootKeyFromString(key.c_str(), pos);
-
-    if (hkey == NULL) {
-        return false;
-    }
-
-    HKEY openKey;
-    int32 result = RegOpenKeyExA(hkey, (key.c_str() + pos + 1), 0, KEY_READ, &openKey);
-
-    debugAssert(result == ERROR_SUCCESS || result == ERROR_FILE_NOT_FOUND);
-
-    if (result == ERROR_SUCCESS) {
-        RegCloseKey(openKey);
-        return true;
-    } else {
-        return false;
-    }
-}
-
-bool RegistryUtil::valueExists(const std::string& key, const std::string& value) {
-    size_t pos = key.find('\\', 0);
-    if (pos == std::string::npos) {
-        return false;
-    }
-
-    HKEY hkey = getRootKeyFromString(key.c_str(), pos);
-
-    if ( hkey == NULL ) {
-        return false;
-    }
-
-    HKEY openKey;
-    int32 result = RegOpenKeyExA(hkey, (key.c_str() + pos + 1), 0, KEY_READ, &openKey);
-    debugAssert(result == ERROR_SUCCESS || result == ERROR_FILE_NOT_FOUND);
-
-    if (result == ERROR_SUCCESS) {
-        uint32 dataSize = 0;
-        result = RegQueryValueExA(openKey, value.c_str(), NULL, NULL, NULL, reinterpret_cast(&dataSize));
-
-        debugAssert(result == ERROR_SUCCESS || result == ERROR_FILE_NOT_FOUND);
-        RegCloseKey(openKey);
-    }
-    return (result == ERROR_SUCCESS);
-}
-
-
-bool RegistryUtil::readInt32(const std::string& key, const std::string& value, int32& data) {
-    size_t pos = key.find('\\', 0);
-    if (pos == std::string::npos) {
-        return false;
-    }
-
-    HKEY hkey = getRootKeyFromString(key.c_str(), pos);
-
-    if ( hkey == NULL ) {
-        return false;
-    }
-
-    HKEY openKey;
-    int32 result = RegOpenKeyExA(hkey, (key.c_str() + pos + 1), 0, KEY_READ, &openKey);
-    debugAssert(result == ERROR_SUCCESS || result == ERROR_FILE_NOT_FOUND);
-
-    if (result == ERROR_SUCCESS) {
-        uint32 dataSize = sizeof(int32);
-        result = RegQueryValueExA(openKey, value.c_str(), NULL, NULL, reinterpret_cast(&data), reinterpret_cast(&dataSize));
-
-        debugAssertM(result == ERROR_SUCCESS, "Could not read registry key value.");
-
-        RegCloseKey(openKey);
-    }
-    return (result == ERROR_SUCCESS);
-}
-
-bool RegistryUtil::readBytes(const std::string& key, const std::string& value, uint8* data, uint32& dataSize) {
-    size_t pos = key.find('\\', 0);
-    if (pos == std::string::npos) {
-        return false;
-    }
-
-    HKEY hkey = getRootKeyFromString(key.c_str(), pos);
-
-    if (hkey == NULL) {
-        return false;
-    }
-
-    HKEY openKey;
-    int32 result = RegOpenKeyExA(hkey, (key.c_str() + pos + 1), 0, KEY_READ, &openKey);
-    debugAssert(result == ERROR_SUCCESS || result == ERROR_FILE_NOT_FOUND);
-
-    if (result == ERROR_SUCCESS) {
-        if (data == NULL) {
-            result = RegQueryValueExA(openKey, value.c_str(), NULL, NULL, NULL, reinterpret_cast(&dataSize));
-        } else {
-            result = RegQueryValueExA(openKey, value.c_str(), NULL, NULL, reinterpret_cast(&data), reinterpret_cast(&dataSize));
-        }
-
-        debugAssertM(result == ERROR_SUCCESS, "Could not read registry key value.");
-
-        RegCloseKey(openKey);
-    }
-    return (result == ERROR_SUCCESS);
-}
-
-bool RegistryUtil::readString(const std::string& key, const std::string& value, std::string& data) {
-    size_t pos = key.find('\\', 0);
-    if (pos == std::string::npos) {
-        return false;
-    }
-
-    HKEY hkey = getRootKeyFromString(key.c_str(), pos);
-
-    if (hkey == NULL) {
-        return false;
-    }
-
-    HKEY openKey;
-    int32 result = RegOpenKeyExA(hkey, (key.c_str() + pos + 1), 0, KEY_READ, &openKey);
-    debugAssert(result == ERROR_SUCCESS || result == ERROR_FILE_NOT_FOUND);
-
-    if (result == ERROR_SUCCESS) {
-        uint32 dataSize = 0;
-
-        result = RegQueryValueExA(openKey, value.c_str(), NULL, NULL, NULL, reinterpret_cast(&dataSize));
-        debugAssertM(result == ERROR_SUCCESS, "Could not read registry key value.");
-
-        // increment datasize to allow for non null-terminated strings in registry
-        dataSize += 1;
-
-        if (result == ERROR_SUCCESS) {
-            char* tmpStr = static_cast(System::malloc(dataSize));
-            System::memset(tmpStr, 0, dataSize);
-
-            result = RegQueryValueExA(openKey, value.c_str(), NULL, NULL, reinterpret_cast(tmpStr), reinterpret_cast(&dataSize));
-            debugAssertM(result == ERROR_SUCCESS, "Could not read registry key value.");
-                
-            if (result == ERROR_SUCCESS) {
-                data = tmpStr;
-            }
-
-            RegCloseKey(openKey);
-            System::free(tmpStr);
-        }
-    }
-    return (result == ERROR_SUCCESS);
-}
-
-bool RegistryUtil::writeInt32(const std::string& key, const std::string& value, int32 data) {
-    size_t pos = key.find('\\', 0);
-    if (pos == std::string::npos) {
-        return false;
-    }
-
-    HKEY hkey = getRootKeyFromString(key.c_str(), pos);
-
-    if (hkey == NULL) {
-        return false;
-    }
-
-    HKEY openKey;
-    int32 result = RegOpenKeyExA(hkey, (key.c_str() + pos + 1), 0, KEY_WRITE, &openKey);
-    debugAssert(result == ERROR_SUCCESS || result == ERROR_FILE_NOT_FOUND);
-
-    if (result == ERROR_SUCCESS) {
-        result = RegSetValueExA(openKey, value.c_str(), 0, REG_DWORD, reinterpret_cast(&data), sizeof(int32));
-
-        debugAssertM(result == ERROR_SUCCESS, "Could not write registry key value.");
-
-        RegCloseKey(openKey);
-    }
-    return (result == ERROR_SUCCESS);
-}
-
-bool RegistryUtil::writeBytes(const std::string& key, const std::string& value, const uint8* data, uint32 dataSize) {
-    debugAssert(data);
-
-    size_t pos = key.find('\\', 0);
-    if (pos == std::string::npos) {
-        return false;
-    }
-
-    HKEY hkey = getRootKeyFromString(key.c_str(), pos);
-
-    if (hkey == NULL) {
-        return false;
-    }
-
-    HKEY openKey;
-    int32 result = RegOpenKeyExA(hkey, (key.c_str() + pos + 1), 0, KEY_WRITE, &openKey);
-    debugAssert(result == ERROR_SUCCESS || result == ERROR_FILE_NOT_FOUND);
-
-    if (result == ERROR_SUCCESS) {
-        if (data) {
-            result = RegSetValueExA(openKey, value.c_str(), 0, REG_BINARY, reinterpret_cast(data), dataSize);
-        }
-
-        debugAssertM(result == ERROR_SUCCESS, "Could not write registry key value.");
-
-        RegCloseKey(openKey);
-    }
-    return (result == ERROR_SUCCESS);
-}
-
-bool RegistryUtil::writeString(const std::string& key, const std::string& value, const std::string& data) {
-    size_t pos = key.find('\\', 0);
-    if (pos == std::string::npos) {
-        return false;
-    }
-
-    HKEY hkey = getRootKeyFromString(key.c_str(), pos);
-
-    if (hkey == NULL) {
-        return false;
-    }
-
-    HKEY openKey;
-    int32 result = RegOpenKeyExA(hkey, (key.c_str() + pos + 1), 0, KEY_WRITE, &openKey);
-    debugAssert(result == ERROR_SUCCESS || result == ERROR_FILE_NOT_FOUND);
-
-    if (result == ERROR_SUCCESS) {
-        result = RegSetValueExA(openKey, value.c_str(), 0, REG_SZ, reinterpret_cast(data.c_str()), (data.size() + 1));                
-        debugAssertM(result == ERROR_SUCCESS, "Could not write registry key value.");
-
-        RegCloseKey(openKey);
-    }
-    return (result == ERROR_SUCCESS);
-}
-
-
-// static helpers
-static HKEY getRootKeyFromString(const char* str, uint32 length) {
-    debugAssert(str);
-
-    if (str) {
-        if ( strncmp(str, "HKEY_CLASSES_ROOT", length) == 0 ) {
-            return HKEY_CLASSES_ROOT;
-        } else if  ( strncmp(str, "HKEY_CURRENT_CONFIG", length) == 0 ) {
-            return HKEY_CURRENT_CONFIG;
-        } else if  ( strncmp(str, "HKEY_CURRENT_USER", length) == 0 ) {
-            return HKEY_CURRENT_USER;
-        } else if  ( strncmp(str, "HKEY_LOCAL_MACHINE", length) == 0 ) {
-            return HKEY_LOCAL_MACHINE;
-        } else if  ( strncmp(str, "HKEY_PERFORMANCE_DATA", length) == 0 ) {
-            return HKEY_PERFORMANCE_DATA;
-        } else if  ( strncmp(str, "HKEY_PERFORMANCE_NLSTEXT", length) == 0 ) {
-            return HKEY_PERFORMANCE_NLSTEXT;
-        } else if  ( strncmp(str, "HKEY_PERFORMANCE_TEXT", length) == 0 ) {
-            return HKEY_PERFORMANCE_TEXT;
-        } else if  ( strncmp(str, "HKEY_CLASSES_ROOT", length) == 0 ) {
-            return HKEY_CLASSES_ROOT;
-        } else {
-            return NULL;
-        }
-    } else {
-        return NULL;
-    }
-}
-
-} // namespace G3D
-
-#endif // G3D_WIN32
diff --git a/externals/g3dlite/G3D.lib/source/Sphere.cpp b/externals/g3dlite/G3D.lib/source/Sphere.cpp
deleted file mode 100644
index 935598d52dd..00000000000
--- a/externals/g3dlite/G3D.lib/source/Sphere.cpp
+++ /dev/null
@@ -1,196 +0,0 @@
-/**
- @file Sphere.cpp
- 
- Sphere class
- 
- @maintainer Morgan McGuire, matrix@graphics3d.com
- 
- @created 2001-04-17
- @edited  2006-02-05
- */
-
-#include "G3D/platform.h"
-#include "G3D/Sphere.h"
-#include "G3D/stringutils.h"
-#include "G3D/BinaryOutput.h"
-#include "G3D/BinaryInput.h"
-#include "G3D/AABox.h"
-#include "G3D/Plane.h"
-
-namespace G3D {
-
-int32 Sphere::dummy;
-
-Sphere::Sphere(class BinaryInput& b) {
-    deserialize(b);
-}
-
-
-void Sphere::serialize(class BinaryOutput& b) const {
-    center.serialize(b);
-    b.writeFloat64(radius);
-}
-
-
-void Sphere::deserialize(class BinaryInput& b) {
-    center.deserialize(b);
-    radius = (float)b.readFloat64();
-}
-
-
-std::string Sphere::toString() const {
-    return format("Sphere(<%g, %g, %g>, %g)", 
-                  center.x, center.y, center.z, radius);
-}
-
-
-bool Sphere::contains(const Vector3& point) const {
-    double distance = (center - point).squaredMagnitude();
-    return distance <= (radius * radius);
-}
-
-
-bool Sphere::intersects(const Sphere& other) const {
-    return (other.center - center).length() <= (radius + other.radius);
-}
-
-bool Sphere::culledBy(
-                      const Array&		plane,
-                      int&				    cullingPlaneIndex,
-                      const uint32			inMask,
-                      uint32&					outMask) const {
-    
-    return culledBy(plane.getCArray(), plane.size(), cullingPlaneIndex, inMask, outMask);
-}
-    
-
-bool Sphere::culledBy(
-                      const Array&		plane,
-                      int&				    cullingPlaneIndex,
-                      const uint32			inMask) const {
-    
-    return culledBy(plane.getCArray(), plane.size(), cullingPlaneIndex, inMask);
-}
-
-
-bool Sphere::culledBy(
-    const class Plane*  plane,
-    int                 numPlanes,
-    int&				cullingPlane,
-    const uint32		_inMask,
-    uint32&             childMask) const {
-
-    if (radius == inf()) {
-        // No plane can cull the infinite box
-        return false;
-    }
-
-	uint32 inMask = _inMask;
-	assert(numPlanes < 31);
-
-    childMask = 0;
-
-    // See if there is one plane for which all of the
-	// vertices are in the negative half space.
-    for (int p = 0; p < numPlanes; p++) {
-
-		// Only test planes that are not masked
-		if ((inMask & 1) != 0) {
-		
-            bool culledLow = ! plane[p].halfSpaceContainsFinite(center + plane[p].normal() * radius);
-            bool culledHigh = ! plane[p].halfSpaceContainsFinite(center - plane[p].normal() * radius);
-
-			if (culledLow) {
-				// Plane p culled the sphere
-				cullingPlane = p;
-
-                // The caller should not recurse into the children,
-                // since the parent is culled.  If they do recurse,
-                // make them only test against this one plane, which
-                // will immediately cull the volume.
-                childMask = 1 << p;
-				return true;
-
-            } else if (culledHigh) {
-                // The bounding volume straddled the plane; we have
-                // to keep testing against this plane
-                childMask |= (1 << p);
-            }
-		}
-
-        // Move on to the next bit.
-		inMask = inMask >> 1;
-    }
-
-    // None of the planes could cull this box
-	cullingPlane = -1;
-    return false;
-}
-
-
-bool Sphere::culledBy(
-    const class Plane*  plane,
-    int                 numPlanes,
-	int&				cullingPlane,
-	const uint32		_inMask) const {
-
-	uint32 inMask = _inMask;
-	assert(numPlanes < 31);
-
-    // See if there is one plane for which all of the
-	// vertices are in the negative half space.
-    for (int p = 0; p < numPlanes; p++) {
-
-		// Only test planes that are not masked
-		if ((inMask & 1) != 0) {
-			bool culled = ! plane[p].halfSpaceContains(center + plane[p].normal() * radius);
-			if (culled) {
-				// Plane p culled the sphere
-				cullingPlane = p;
-				return true;
-            }
-		}
-
-        // Move on to the next bit.
-		inMask = inMask >> 1;
-    }
-
-    // None of the planes could cull this box
-	cullingPlane = -1;
-    return false;
-}
-
-
-Vector3 Sphere::randomSurfacePoint() const {
-    return Vector3::random() * radius + center;
-}
-
-
-Vector3 Sphere::randomInteriorPoint() const {
-    Vector3 result;
-    do {
-        result = Vector3(uniformRandom(-1, 1), 
-                         uniformRandom(-1, 1), 
-                         uniformRandom(-1, 1));
-    } while (result.squaredMagnitude() >= 1.0f);
-
-    return result * radius + center;
-}
-
-
-float Sphere::volume() const {
-    return (float)pi() * (4.0f / 3.0f) * powf((float)radius, 3.0f);
-}
-
-
-float Sphere::area() const {
-    return (float)pi() * 4.0f * powf((float)radius, 2.0f);
-}
-
-
-void Sphere::getBounds(AABox& out) const {
-    Vector3 extent(radius, radius, radius);
-    out = AABox(center - extent, center + extent);
-}
-
-} // namespace
diff --git a/externals/g3dlite/G3D.lib/source/SplineBase.cpp b/externals/g3dlite/G3D.lib/source/SplineBase.cpp
deleted file mode 100644
index 41221624b06..00000000000
--- a/externals/g3dlite/G3D.lib/source/SplineBase.cpp
+++ /dev/null
@@ -1,162 +0,0 @@
-#include "G3D/platform.h"
-#include "G3D/Spline.h"
-
-namespace G3D {
-
-float SplineBase::getFinalInterval() const {
-    if (! cyclic) {
-        return 0;
-    } else if (finalInterval <= 0) {
-        int N = time.size();
-        if (N >= 2) {
-            return (time[1] - time[0] + time[N - 1] - time[N - 2]) * 0.5f;
-        } else {
-            return 1.0f;
-        }
-    } else {
-        return finalInterval;
-    }
-}
-
-
-Matrix4 SplineBase::computeBasis() {
-    // The standard Catmull-Rom spline basis (e.g., Watt & Watt p108)
-    // is for [u^3 u^2 u^1 u^0] * B * [p[0] p[1] p[2] p[3]]^T.
-    // We need a basis formed for:
-    //
-    //     U * C * [2*p'[1] p[1] p[2] 2*p'[2]]^T 
-    //
-    //     U * C * [p2-p0 p1 p2 p3-p1]^T 
-    //
-    // To make this transformation, compute the differences of columns in C:
-    // For [p0 p1 p2 p3]
-    Matrix4 basis =
-        Matrix4( -1,  3, -3,  1,
-                  2, -5,  4, -1,
-                 -1,  0,  1,  0,
-                  0,  2,  0,  0) * 0.5f;
-
-    // For [-p0 p1 p2 p3]^T 
-    basis.setColumn(0, -basis.column(0));
-
-    // For [-p0 p1 p2 p3-p1]^T 
-    basis.setColumn(1, basis.column(1) + basis.column(3));
-
-    // For [p2-p0 p1 p2 p3-p1]^T 
-    basis.setColumn(2, basis.column(2) - basis.column(0));
-
-    return basis;
-}
-
-
-float SplineBase::duration() const {
-    if (time.size() == 0) {
-        return 0;
-    } else {
-        return time.last() - time[0] + getFinalInterval();
-    }
-}
-    
-
-void SplineBase::computeIndexInBounds(float s, int& i, float& u) const {
-    int N = time.size();
-    float t0 = time[0];
-    float tn = time[N - 1];
-    
-    i = iFloor((N - 1) * (s - t0) / (tn - t0));
-    
-    // Inclusive bounds for binary search
-    int hi = N - 1;
-    int lo = 0;
-    
-    while ((time[i] > s) || (time[i + 1] <= s)) {
-        
-        if (time[i] > s) {
-            // too big
-            hi = i - 1;
-        } else if (time[i + 1] <= s) {
-            // too small
-            lo = i + 1;
-        }
-        
-        i = (hi + lo) / 2;
-    }
-    
-    // Having exited the above loop, i must be correct, so compute u.
-    u = (s - time[i]) / (time[i + 1] - time[i]);
-}
-
-
-void SplineBase::computeIndex(float s, int& i, float& u) const {
-    int N = time.size();
-    debugAssertM(N > 0, "No control points");
-    float t0 = time[0];
-    float tn = time[N - 1];
-    
-    if (N < 2) {
-        // No control points to work with
-        i = 0;
-        u = 0.0;
-    } else if (cyclic) {
-        float fi = getFinalInterval();
-        
-        // Cyclic spline
-        if ((s < t0) || (s >= tn + fi)) {
-            // Cyclic, off the bottom or top
-            
-            // Compute offset and reduce to the in-bounds case
-
-            float d = duration();
-            // Number of times we wrapped around the cyclic array
-            int wraps = iFloor((s - t0) / d);
-            
-            debugAssert(s - d * wraps >= t0);
-            debugAssert(s - d * wraps < tn + getFinalInterval());
-
-            computeIndex(s - d * wraps, i, u);
-            i += wraps * N;
-            
-        } else if (s >= tn) {
-            debugAssert(s < tn + fi);
-            // Cyclic, off the top but before the end of the last interval
-            i = N - 1;
-            u = (s - tn) / fi;
-            
-        } else {
-            // Cyclic, in bounds
-            computeIndexInBounds(s, i, u);
-        }
-        
-    } else {
-        // Non-cyclic
-        
-        if (s < t0) {
-            // Non-cyclic, off the bottom.  Assume points are spaced
-            // following the first time interval.
-            
-            float dt = time[1] - t0;
-            float x = (s - t0) / dt;
-            i = iFloor(x);
-            u = x - i;
-            
-        } else if (s >= tn) {
-            // Non-cyclic, off the top.  Assume points are spaced following
-            // the last time interval.
-            
-            float dt = tn - time[N - 2];
-            float x = N - 1 + (s - tn) / dt;
-            i = iFloor(x);
-            u = x - i;  
-            
-        } else {
-            // In bounds, non-cyclic.  Assume a regular
-            // distribution (which gives O(1) for uniform spacing)
-            // and then binary search to handle the general case
-            // efficiently.
-            computeIndexInBounds(s, i, u);
-            
-        } // if in bounds
-    } // if cyclic
-}
-
-}
diff --git a/externals/g3dlite/G3D.lib/source/Stopwatch.cpp b/externals/g3dlite/G3D.lib/source/Stopwatch.cpp
deleted file mode 100644
index e55f689a9e2..00000000000
--- a/externals/g3dlite/G3D.lib/source/Stopwatch.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-/**
- @file Stopwatch.cpp
- 
- @maintainer Morgan McGuire, matrix@graphics3d.com
-  
- @created 2005-10-05
- @edited  2005-10-05
-
- Copyright 2000-2003, Morgan McGuire.
- All rights reserved.
- */
-
-#include "G3D/Stopwatch.h"
-#include "G3D/System.h"
-
-namespace G3D {
-
-Stopwatch::Stopwatch() : inBetween(false), lastTockTime(-1), 
-    lastDuration(0), lastCycleCount(0), m_fps(0), emwaFPS(0),
-    m_smoothFPS(0), emwaDuration(0) {
-    computeOverhead();
-}
-
-
-void Stopwatch::computeOverhead() {
-    cycleOverhead = 0;
-    tick();
-    tock();
-    cycleOverhead = elapsedCycles();
-}
-
-
-void Stopwatch::tick() {
-    // This is 'alwaysAssert' instead of 'debugAssert'
-    // since people rarely profile in debug mode.
-    alwaysAssertM(! inBetween, "Stopwatch::tick() called twice in a row.");
-    inBetween = true;
-
-    // We read RDTSC twice here, but it is more abstract to implement this
-    // way and at least we're reading the cycle count last.
-    timeStart = System::time();
-    System::beginCycleCount(cycleStart);
-}
-
-
-void Stopwatch::tock() {
-    System::endCycleCount(cycleStart);
-    RealTime now = System::time();
-    lastDuration = now - timeStart;
-    if (abs(emwaDuration - lastDuration) > max(emwaDuration, lastDuration) * 0.50) {
-        // Off by more than 50%
-        emwaDuration = lastDuration;
-    } else {
-        emwaDuration = lastDuration * 0.05 + emwaDuration * 0.95;
-    }
-
-    lastCycleCount = cycleStart - cycleOverhead;
-    if (lastCycleCount < 0) {
-        lastCycleCount = 0;
-    }
-
-    if (lastTockTime != -1.0) {
-        m_fps = 1.0 / (now - lastTockTime);
-
-        // Time smooth the average
-        emwaFPS = m_fps * 0.01 + emwaFPS * 0.99;
-
-        if (abs(emwaFPS - m_fps) > max(emwaFPS, m_fps) * 0.08) {
-            // The difference between emwa and m_fps is way off
-            // update emwa directly.
-            emwaFPS = m_fps;
-        }
-        
-        // Update m_smoothFPS only when the value varies significantly
-        // We round so as to not mislead the user as to the accuracy of 
-        // the number.
-        if (m_smoothFPS == 0) {
-            m_smoothFPS = m_fps;
-        } else if (emwaFPS <= 10) {
-            if (::fabs(m_smoothFPS - emwaFPS) > .75) {
-                m_smoothFPS = floor(emwaFPS * 10.0 + 0.5) / 10.0;
-            }
-        } else {
-            if (::fabs(m_smoothFPS - emwaFPS) > 1.25) {
-                m_smoothFPS = floor(emwaFPS + 0.5);
-            }
-        }
-    }
-    lastTockTime = now;
-
-    alwaysAssertM(inBetween, "Stopwatch::tock() called without matching tick.");
-    inBetween = false;
-}
-
-}
-
diff --git a/externals/g3dlite/G3D.lib/source/System.cpp b/externals/g3dlite/G3D.lib/source/System.cpp
deleted file mode 100644
index 748e13257f1..00000000000
--- a/externals/g3dlite/G3D.lib/source/System.cpp
+++ /dev/null
@@ -1,1864 +0,0 @@
-/** 
-  @file System.cpp
- 
-  @maintainer Morgan McGuire, matrix@graphics3d.com
-
-  Note: every routine must call init() first.
-
-  There are two kinds of detection used in this file.  At compile
-  time, the _MSC_VER #define is used to determine whether x86 assembly
-  can be used at all.  At runtime, processor detection is used to
-  determine if we can safely call the routines that use that assembly.
-
-  @cite Rob Wyatt http://www.gamasutra.com/features/wyatts_world/19990709/processor_detection_01.htm
-  @cite Benjamin Jurke http://www.flipcode.com/cgi-bin/msg.cgi?showThread=COTD-ProcessorDetectionClass&forum=cotd&id=-1
-  @cite Michael Herf http://www.stereopsis.com/memcpy.html
-
-  @created 2003-01-25
-  @edited  2008-09-02
- */
-
-#include "G3D/platform.h"
-#include "G3D/System.h"
-#include "G3D/debug.h"
-#include "G3D/fileutils.h"
-#include "G3D/TextOutput.h"
-#include "G3D/G3DGameUnits.h"
-#include "G3D/Crypto.h"
-#include "G3D/prompt.h"
-#include "G3D/Log.h"
-#include 
-
-#include 
-#include 
-
-// Uncomment the following line to turn off G3D::System memory
-// allocation and use the operating system's malloc.
-//#define NO_BUFFERPOOL
-
-#if defined(__i386__) || defined(__x86_64__) || defined(G3D_WIN32)
-#    define G3D_NOT_OSX_PPC
-#endif
-
-#ifdef G3D_WIN32
-
-#   include 
-#   include 
-#   include "G3D/RegistryUtil.h"
-
-#elif defined(G3D_LINUX) 
-
-    #include 
-    #include 
-    #include 
-    #include 
-    #include 
-    #include 
-    #include 
-    #include 
-    #include 
-    #include 
-
-#elif defined(G3D_OSX)
-
-    #include 
-    #include 
-    #include 
-    #include 
-	#include 
-    #include 
-    #include 
-    #include 
-    #include 
-    #include 
-	#include 
-
-    #include 
-    #include 
-#endif
-
-#if defined(SSE)
-    #include 
-#endif
-
-namespace G3D {
-
-struct CpuInfo
-{
-public:
-    int     m_cpuSpeed;
-    bool    m_hasCPUID;
-    bool    m_hasRDTSC;
-    bool    m_hasMMX;
-    bool    m_hasSSE;
-    bool    m_hasSSE2;
-    bool    m_hasSSE3;
-    bool    m_has3DNOW;
-    char    m_cpuVendorStr[1024];
-};
-
-// helper macro to call cpuid functions and return all values
-#ifdef _MSC_VER
-
-    // VC on Intel
-#   define CALL_CPUID(func, areg, breg, creg, dreg) \
-	   __asm mov	eax, func   \
-	   __asm cpuid             \
-       __asm mov	areg, eax   \
-       __asm mov	breg, ebx   \
-	   __asm mov	creg, ecx   \
-	   __asm mov	dreg, edx
-
-#elif defined(__GNUC__) && defined(G3D_OSX_INTEL)
-    // GCC on OS X intel
-#    define CALL_CPUID(func, areg, breg, creg, dreg) \
-       areg = 0;   \
-       breg = 0;   \
-       creg = 0;   \
-       dreg = 0;
-#else
-    // Any other compiler/platform, likely GCC
-#   define CALL_CPUID(func, areg, breg, creg, dreg) \
-       __asm__ (           \
-       "cpuid \n":         \
-       "=a" (areg),        \
-       "=b" (breg),        \
-       "=c" (creg),        \
-       "=d" (dreg):        \
-       "a" (func)          \
-       );
-#endif
-
-// this holds the data directory set by the application (currently GApp) for use by findDataFile
-static char                                     g_appDataDir[FILENAME_MAX] = "";
-
-static CpuInfo                                  g_cpuInfo = {
-    0, false, false, false, false, false, false, false, {'U', 'n', 'k', 'n', 'o', 'w', 'n', '\0'}};
-
-static G3DEndian                                _machineEndian      = G3D_LITTLE_ENDIAN;
-static char                                     _cpuArchCstr[1024];
-static char                                     _operatingSystemCstr[1024];
-
-#ifdef G3D_WIN32
-/** Used by getTick() for timing */
-static LARGE_INTEGER                            _start;
-static LARGE_INTEGER                            _counterFrequency;
-#else
-static struct timeval                           _start;
-#endif
-
-static char                                     versionCstr[1024];
-System::OutOfMemoryCallback                     System::outOfMemoryCallback = NULL;
-
-#ifdef G3D_OSX
-long											System::m_OSXCPUSpeed;
-double											System::m_secondsPerNS;
-#endif
-
-/** The Real-World time of System::getTick() time 0.  Set by initTime */
-static RealTime             realWorldGetTickTime0;
-
-
-static unsigned int      maxSupportedCPUIDLevel = 0;
-static unsigned int      maxSupportedExtendedLevel = 0;
-
-/** Checks if the CPUID command is available on the processor (called from init) */
-static void checkForCPUID();
-
-/** ReadRead the standard processor extensions.  Called from init(). */
-static void getStandardProcessorExtensions();
-
-/** Called from init */
-static void initTime();
-
-
-std::string System::findDataFile
-(const std::string&  full,
- bool                errorIfNotFound) {
-
-    if (fileExists(full)) {
-        return full;
-    }
-
-    std::string initialAppDataDir(g_appDataDir);
-
-    std::string name = filenameBaseExt(full);
-    std::string originalPath = filenamePath(full);
-
-    // Search several paths
-    Array pathBase;
-
-    int backlen = 4;
-
-    // add what should be the current working directory
-    pathBase.append("");
-
-    // add application specified data directory to be searched first
-    pathBase.append(initialAppDataDir);
-
-    // try walking back along the directory tree
-    std::string prev = "";
-    for (int i = 0; i < backlen; ++i) {
-        pathBase.append(originalPath + prev);
-        prev = prev + "../";        
-    }
-
-    prev = "../";
-    for (int i = 0; i < backlen; ++i) {
-        pathBase.append(prev);
-        prev = prev + "../";        
-    }
-
-    // Hard-code in likely install directories
-    int ver = G3D_VER;
-    std::string lname = format("G3D-%d.%02d", ver / 10000, (ver / 100) % 100);
-
-    if (G3D_VER % 100 != 0) {
-        lname = lname + format("-b%02d/", ver % 100);
-    } else {
-        lname = lname + "/";
-    }
-
-    // Look in some other likely places
-#   ifdef G3D_WIN32
-        std::string lpath = "libraries/G3D/";
-        pathBase.append(std::string("c:/") + lpath);
-        pathBase.append(std::string("d:/") + lpath);
-        pathBase.append(std::string("e:/") + lpath);
-        pathBase.append(std::string("f:/") + lpath);
-        pathBase.append(std::string("g:/") + lpath);
-        pathBase.append(std::string("x:/") + lpath);
-#   endif
-#   if defined(G3D_LINUX)
-        pathBase.append("/usr/local/");
-        pathBase.append("/course/cs224/");
-        pathBase.append("/map/gfx0/common/games/");
-#   endif
-#   if defined(G3D_FREEBSD)
-        pathBase.append("/usr/local/");
-        pathBase.append("/usr/local/371/");
-        pathBase.append("/usr/cs-local/371/");
-#   endif
-#   if defined(G3D_OSX)
-        pathBase.append("/usr/local/" + lname);
-        pathBase.append("/Volumes/McGuire/Projects/");
-#   endif
-
-    // Add the library name to all variations
-    int N = pathBase.size();
-    for (int i = 0; i < N; ++i) {
-        pathBase.append(pathBase[i] + lname);
-        pathBase.append(pathBase[i] + "G3D/");
-    }
-
-    Array subDir;
-    subDir.append("", "font/", "sky/", "gui/");
-    subDir.append("image/", "quake2/", "quake2/players/");
-    subDir.append("quake3/", "SuperShader/", "ifs/", "3ds/");
-    subDir.append("quake2/speedway/");
-
-    Array path;
-    for (int p = 0; p < pathBase.size(); ++p) {
-        for (int s = 0; s < subDir.size(); ++s) {
-            path.append(pathBase[p] + subDir[s]);
-            path.append(pathBase[p] + "data/" + subDir[s]);
-            path.append(pathBase[p] + "data-files/" + subDir[s]);
-        }
-    }
-
-    for (int i = 0; i < path.length(); ++i) {
-        std::string filename = path[i] + name;
-        if (fileExists(filename)) {
-            logPrintf("\nWARNING: Could not find '%s' so '%s' "
-                      "was substituted.\n", full.c_str(), 
-                      filename.c_str());
-            return filename;
-        }
-    }
-
-    if (errorIfNotFound) {
-        // Generate an error message
-        std::string locations;
-        for (int i = 0; i < path.size(); ++i) {
-            locations += path[i] + name + "\n";
-        }
-        alwaysAssertM(false, "Could not find '" + full + "' in:\n" + locations);
-    }
-    // Not found
-    return "";
-}
-
-
-void System::setAppDataDir(const std::string& path) {
-    // just copy the path, it needs to be valid
-    strncpy(g_appDataDir, path.c_str(), sizeof(g_appDataDir));
-}
-
-
-std::string demoFindData(bool errorIfNotFound) {
-    // Directories that might contain the data
-    Array potential;
-
-    // Look back up the directory tree
-    std::string x = "../";
-    std::string f = "";
-    for (int i = 0; i < 6; ++i) {
-        potential.append(f);
-        f = f + x;
-    }
-    
-    // Hard-code in likely install directories
-    int ver = G3D_VER;
-    std::string lname = format("G3D-%d.%02d", ver / 10000, (ver / 100) % 100);
-
-    if (G3D_VER % 100 != 0) {
-        lname = lname + format("-b%02d/", ver % 100);
-    } else {
-        lname = lname + "/";
-    }
-
-    std::string lpath = "libraries/" + lname;
-    #ifdef G3D_WIN32
-        potential.append(std::string("c:/") + lpath);
-        potential.append(std::string("d:/") + lpath);
-        potential.append(std::string("e:/") + lpath);
-        potential.append(std::string("f:/") + lpath);
-        potential.append(std::string("g:/") + lpath);
-        potential.append(std::string("x:/") + lpath);
-    #elif defined(G3D_LINUX)
-        potential.append("/usr/local/" + lname);
-        potential.append("/course/cs224/");
-        potential.append("/map/gfx0/common/games/");
-    #elif defined(G3D_FREEBSD)
-        potential.append("/usr/local/" + lname);
-	potential.append("/usr/local/371/")
-	potential.append("/usr/cs-local/371/")
-    #elif defined(G3D_OSX)
-        potential.append("/usr/local/" + lname);
-        potential.append("/Volumes/McGuire/Projects/");
-        potential.append("/Volumes/McGuire/Projects/G3D/");
-    #endif
-
-    // Scan all potentials for the font directory
-    for (int p = 0; p < potential.size();  ++p) {
-        std::string path = potential[p];
-        //debugPrintf("Looking at: %sdata\n", path.c_str());
-        if (fileExists(path + "data") && fileExists(path + "data/font")) {
-            return path + "data/";
-        }
-        if (fileExists(path + "data-files") && fileExists(path + "data-files/font")) {
-            return path + "data-files/";
-        }
-    }
-
-    if (errorIfNotFound) {
-        const char* choice[] = {"Exit"};
-
-        prompt("Demo Error", "The demo could not locate the data directory.  "
-            "The data is required to run this demo.  If you have not downloaded "
-            "the data zipfile, get it from http://g3d-cpp.sf.net.  If you have "
-            "downloaded it, it needs to be no more than 4 directories above the "
-            "demo directory.", choice, 1, true);
-    }
-
-    return "";
-}
-
-bool System::hasCPUID() {
-    init();
-    return g_cpuInfo.m_hasCPUID;
-}
-
-bool System::hasRDTSC() {
-    init();
-    return g_cpuInfo.m_hasRDTSC;
-}
-
-
-bool System::hasSSE() {
-    init();
-    return g_cpuInfo.m_hasSSE;
-}
-
-
-bool System::hasSSE2() {
-    init();
-    return g_cpuInfo.m_hasSSE2;
-}
-
-bool System::hasSSE3() {
-	init();
-    return g_cpuInfo.m_hasSSE3;
-}
-
-bool System::hasMMX() {
-    init();
-    return g_cpuInfo.m_hasMMX;
-}
-
-
-bool System::has3DNow() {
-    init();
-    return g_cpuInfo.m_has3DNOW;
-}
-
-
-const std::string& System::cpuVendor() {
-    init();
-    static const std::string _cpuVendor = g_cpuInfo.m_cpuVendorStr;
-    return _cpuVendor;
-}
-
-
-G3DEndian System::machineEndian() {
-    init();
-    return _machineEndian;
-}
-
-const std::string& System::operatingSystem() {
-    init();
-    static const std::string _operatingSystem =_operatingSystemCstr;
-    return _operatingSystem;
-}
-        
-
-const std::string& System::cpuArchitecture() {
-    init();
-    static const std::string _cpuArch = _cpuArchCstr;
-    return _cpuArch;
-}
-
-const std::string& System::build() {
-    const static std::string b =
-#   ifdef _DEBUG
-        "Debug";
-#   else 
-        "Release";
-#   endif
-
-    return b;
-}
-
-const std::string& System::version() {
-    init();
-
-    static const std::string _version = versionCstr;
-    return _version;
-}
-
-
-void System::init() {
-    // Cannot use most G3D data structures or utility functions in here because
-    // they are not initialized.
-
-    static bool initialized = false;
-
-    if (initialized) {
-        return;
-    }
-
-    initialized = true;
-
-    if ((G3D_VER % 100) != 0) {
-        sprintf(versionCstr, "G3D %d.%02d beta %d",
-            G3D_VER / 10000,
-            (G3D_VER / 100) % 100,
-            G3D_VER % 100);
-    } else {
-        sprintf(versionCstr, "G3D %d.%02d",
-            G3D_VER / 10000,
-            (G3D_VER / 100) % 100);
-    }
-
-    // First of all we check if the CPUID command is available
-    checkForCPUID();
-
-    // Figure out if this machine is little or big endian.
-    {
-        int32 a = 1;
-        if (*(uint8*)&a == 1) {
-            _machineEndian = G3D_LITTLE_ENDIAN;
-        } else {
-            _machineEndian = G3D_BIG_ENDIAN;
-        }
-    }
-
-#   ifdef G3D_NOT_OSX_PPC
-    // Process the CPUID information
-    if (g_cpuInfo.m_hasCPUID) {
-        // We read the standard CPUID level 0x00000000 which should
-        // be available on every x86 processor.  This fills out
-        // a string with the processor vendor tag.
-        unsigned int eaxreg = 0, ebxreg = 0, ecxreg = 0, edxreg = 0;
-
-        CALL_CPUID(0x00, eaxreg, ebxreg, ecxreg, edxreg);
-
-        // Then we connect the single register values to the vendor string
-        *((unsigned int*) g_cpuInfo.m_cpuVendorStr)         = ebxreg;
-        *((unsigned int*) (g_cpuInfo.m_cpuVendorStr + 4))   = edxreg;
-        *((unsigned int*) (g_cpuInfo.m_cpuVendorStr + 8))   = ecxreg;
-        g_cpuInfo.m_cpuVendorStr[12] = '\0';
-
-        // We can also read the max. supported standard CPUID level
-        maxSupportedCPUIDLevel = eaxreg & 0xFFFF;
-
-        // Then we read the ext. CPUID level 0x80000000
-        CALL_CPUID(0x80000000, eaxreg, ebxreg, ecxreg, edxreg);
-
-        // ...to check the max. supported extended CPUID level
-        maxSupportedExtendedLevel = eaxreg;
-
-        // Then we switch to the specific processor vendors.
-        // Fill out _cpuArch based on this information.  It will
-        // be overwritten by the next block of code on Windows,
-        // but on Linux will stand.
-        switch (ebxreg) {
-        case 0x756E6547:        // GenuineIntel
-            strcpy(_cpuArchCstr, "Intel Processor");
-            break;
-            
-        case 0x68747541:        // AuthenticAMD
-            strcpy(_cpuArchCstr, "AMD Processor");
-            break;
-
-        case 0x69727943:        // CyrixInstead
-            strcpy(_cpuArchCstr, "Cyrix Processor");
-            break;
-
-        default:
-            strcpy(_cpuArchCstr, "Unknown Processor Vendor");
-            break;
-        }
-    }
-    #endif // G3D_NOT_OSX_PPC
-
-    #ifdef G3D_WIN32
-        bool success = RegistryUtil::readInt32
-            ("HKEY_LOCAL_MACHINE\\HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\0", "~MHz", g_cpuInfo.m_cpuSpeed);
-
-        SYSTEM_INFO systemInfo;
-        GetSystemInfo(&systemInfo);
-        char* arch;
-        switch (systemInfo.wProcessorArchitecture) {
-        case PROCESSOR_ARCHITECTURE_INTEL:
-            arch = "Intel";
-            break;
-    
-        case PROCESSOR_ARCHITECTURE_MIPS:
-            arch = "MIPS";
-            break;
-
-        case PROCESSOR_ARCHITECTURE_ALPHA:
-            arch = "Alpha";
-            break;
-
-        case PROCESSOR_ARCHITECTURE_PPC:
-            arch = "Power PC";
-            break;
-
-        default:
-            arch = "Unknown";
-        }
-
-        uint32 maxAddr = (uint32)systemInfo.lpMaximumApplicationAddress;
-        sprintf(_cpuArchCstr, "%d x %d-bit %s processor",
-                    systemInfo.dwNumberOfProcessors,
-                    (int)(::log((double)maxAddr) / ::log(2.0) + 2.0),
-                    arch);
-                   //                    _CPUSpeed / (1024.0 * 1024));
-
-        OSVERSIONINFO osVersionInfo;
-        osVersionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-        success = GetVersionEx(&osVersionInfo) != 0;
-
-        if (success) {
-            sprintf(_operatingSystemCstr, "Windows %d.%d build %d Platform %d %s",
-                osVersionInfo.dwMajorVersion, 
-                osVersionInfo.dwMinorVersion,
-                osVersionInfo.dwBuildNumber,
-                osVersionInfo.dwPlatformId,
-                osVersionInfo.szCSDVersion);
-        } else {
-            strcpy(_operatingSystemCstr, "Windows");
-        }
-    
-    #elif defined(G3D_LINUX)
-
-        {
-            // Shell out to the 'uname' command
-            FILE* f = popen("uname -a", "r");
-
-            int len = 100;
-            char* r = (char*)::malloc(len * sizeof(char));
-            fgets(r, len, f);
-            // Remove trailing newline
-            if (r[strlen(r) - 1] == '\n') {
-                r[strlen(r) - 1] = '\0';
-            }
-            fclose(f);
-
-            strcpy(_operatingSystemCstr, r);
-            ::free(r);
-        }
-
-    #elif defined(G3D_OSX)
-
-        // Operating System:
-        SInt32 macVersion;
-        Gestalt(gestaltSystemVersion, &macVersion);
-
-        int major = (macVersion >> 8) & 0xFF;
-        int minor = (macVersion >> 4) & 0xF;
-        int revision = macVersion & 0xF;
-
-        sprintf(_operatingSystemCstr, "OS X %x.%x.%x", major, minor, revision); 
-                 
-        // Clock Cycle Timing Information:
-        Gestalt('pclk', &System::m_OSXCPUSpeed);
-        g_cpuInfo.m_cpuSpeed = iRound((double)m_OSXCPUSpeed / (1024 * 1024));
-        m_secondsPerNS = 1.0 / 1.0e9;
-        
-        // System Architecture:
-	const NXArchInfo* pInfo = NXGetLocalArchInfo();
-		
-	if (pInfo) {
-	    strcpy(_cpuArchCstr, pInfo->description);
-			
-	    switch (pInfo->cputype) {
-	    case CPU_TYPE_POWERPC:
-	        switch(pInfo->cpusubtype){
-		case CPU_SUBTYPE_POWERPC_750:
-		case CPU_SUBTYPE_POWERPC_7400:
-		case CPU_SUBTYPE_POWERPC_7450:
-		    strcpy(g_cpuInfo.m_cpuVendorStr, "Motorola");
-		    break;
-		case CPU_SUBTYPE_POWERPC_970:
-		    strcpy(g_cpuInfo.m_cpuVendorStr, "IBM");
-		    break;
-		}
-		break;
-	    
-	        case CPU_TYPE_I386:
-		    strcpy(g_cpuInfo.m_cpuVendorStr, "Intel");
-		    break;
-	    }
-	}
-    #endif
-
-    initTime();
-
-    getStandardProcessorExtensions();
-}
-
-static void checkForCPUID() {
-    unsigned int bitChanged = 0;
-
-    // We've to check if we can toggle the flag register bit 21.
-    // If we can't the processor does not support the CPUID command.
-    
-#if defined(_MSC_VER)
-    __asm {
-        push eax
-        push ebx
-        pushfd
-        pushfd
-        pop   eax
-        mov   ebx, eax
-        xor   eax, 0x00200000 
-        push  eax
-        popfd
-        pushfd
-        pop   eax
-        popfd
-        xor   eax, ebx 
-        mov   bitChanged, eax
-        pop ebx
-        pop eax
-    }
-#elif defined(__GNUC__) && defined(i386) && !defined(G3D_OSX_INTEL)
-    // 32-bit g++
-    __asm__ (
-        "pushfl                      # Get original EFLAGS             \n"
-        "pushfl                                                        \n"
-        "popl    %%eax                                                 \n"
-        "movl    %%eax, %%ecx                                          \n"
-        "xorl    $0x200000, %%eax    # Flip ID bit in EFLAGS           \n"
-        "pushl   %%eax               # Save new EFLAGS value on stack  \n"
-        "popfl                       # Replace current EFLAGS value    \n"
-        "pushfl                      # Get new EFLAGS                  \n"
-        "popl    %%eax               # Store new EFLAGS in EAX         \n"
-        "popfl                                                         \n"
-        "xorl    %%ecx, %%eax        # Can not toggle ID bit,          \n"
-        "movl    %%eax, %0           # We have CPUID support           \n"
-        : "=m" (bitChanged)
-        : // No inputs
-        : "%eax", "%ecx"
-    );
-#elif defined(__GNUC__) && defined(__x86_64__) && !defined(G3D_OSX_INTEL)
-    // x86_64 has SSE and CPUID
-
-    bitChanged = 1;
-#else 
-    // Unknown architecture
-    bitChanged = 0;
-#endif
-
-    g_cpuInfo.m_hasCPUID = ((bitChanged == 0) ? false : true);
-}
-
-void getStandardProcessorExtensions() {
-#if !defined(G3D_OSX) || defined(G3D_OSX_INTEL)
-    if (! g_cpuInfo.m_hasCPUID) {
-        return;
-    }
-
-    unsigned int eaxreg = 0, ebxreg = 0, ecxreg = 0;
-    unsigned int features = 0;
-
-    // http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/25481.pdf
-    // call cpuid with function 0x01 in EAX
-
-    // Invoking CPUID with '1' in EAX fills out edx with a bit string.
-    // The bits of this value indicate the presence or absence of 
-    // useful processor features.
-    CALL_CPUID(0x01, eaxreg, ebxreg, ecxreg, features);
-
-    #define checkBit(var, bit)   ((var & (1 << bit)) ? true : false)
-
-    g_cpuInfo.m_hasRDTSC    = checkBit(features, 16);
-    g_cpuInfo.m_hasMMX      = checkBit(features, 23);
-    g_cpuInfo.m_hasSSE      = checkBit(features, 25);
-    g_cpuInfo.m_hasSSE2     = checkBit(features, 26);
-    g_cpuInfo.m_hasSSE3     = checkBit(ecxreg, 0);
-
-    if (maxSupportedExtendedLevel >= 0x80000001) {
-        // function 0x80000001 changes bit 31 of edx to 3dnow support flag
-        CALL_CPUID(0x80000001, eaxreg, ebxreg, ecxreg, features);
-        g_cpuInfo.m_has3DNOW = checkBit(features, 31);
-    } else {
-        g_cpuInfo.m_has3DNOW = false;
-    }
-
-    #undef checkBit
-#endif
-}
-
-#if defined(SSE)
-
-// Copy in 128 bytes chunks, where each chunk contains 8*float32x4 = 8 * 4 * 4 bytes = 128 bytes
-//
-//
-void memcpySSE2(void* dst, const void* src, int nbytes) {
-    int remainingBytes = nbytes;
-
-    if (nbytes > 128) {
-
-        // Number of chunks
-        int N = nbytes / 128;
-
-        float* restrict d = (float*)dst;
-        const float* restrict s = (const float*)src;
-    
-        // Finish when the destination pointer has moved 8N elements 
-        float* stop = d + (N * 8 * 4);
-
-        while (d < stop) {
-            // Inner loop unrolled 8 times
-            const __m128 r0 = _mm_loadu_ps(s);
-            const __m128 r1 = _mm_loadu_ps(s + 4);
-            const __m128 r2 = _mm_loadu_ps(s + 8);
-            const __m128 r3 = _mm_loadu_ps(s + 12);
-            const __m128 r4 = _mm_loadu_ps(s + 16);
-            const __m128 r5 = _mm_loadu_ps(s + 20);
-            const __m128 r6 = _mm_loadu_ps(s + 24);
-            const __m128 r7 = _mm_loadu_ps(s + 28);
-
-            _mm_storeu_ps(d, r0);
-            _mm_storeu_ps(d + 4, r1);
-            _mm_storeu_ps(d + 8, r2);
-            _mm_storeu_ps(d + 12, r3);
-            _mm_storeu_ps(d + 16, r4);
-            _mm_storeu_ps(d + 20, r5);
-            _mm_storeu_ps(d + 24, r6);
-            _mm_storeu_ps(d + 28, r7);
-
-            s += 32;
-            d += 32;
-        }
-
-        remainingBytes -= N * 8 * 4 * 4; 
-    }
-
-    if (remainingBytes > 0) {
-        // Memcpy the rest
-        memcpy((uint8*)dst + (nbytes - remainingBytes), (const uint8*)src + (nbytes - remainingBytes), remainingBytes); 
-    }
-}
-#else
-
-    // Fall back to memcpy
-    void memcpySSE2(void *dst, const void *src, int nbytes) {
-        memcpy(dst, src, nbytes);
-    }
-
-#endif
-
-#if defined(G3D_WIN32) && defined(SSE)
-/** Michael Herf's fast memcpy */
-void memcpyMMX(void* dst, const void* src, int nbytes) {
-    int remainingBytes = nbytes;
-
-    if (nbytes > 64) {
-            _asm {
-                    mov esi, src 
-                    mov edi, dst 
-                    mov ecx, nbytes 
-                    shr ecx, 6 // 64 bytes per iteration 
-
-    loop1: 
-                    movq mm1,  0[ESI] // Read in source data 
-                    movq mm2,  8[ESI]
-                    movq mm3, 16[ESI]
-                    movq mm4, 24[ESI] 
-                    movq mm5, 32[ESI]
-                    movq mm6, 40[ESI]
-                    movq mm7, 48[ESI]
-                    movq mm0, 56[ESI]
-
-                    movntq  0[EDI], mm1 // Non-temporal stores 
-                    movntq  8[EDI], mm2 
-                    movntq 16[EDI], mm3 
-                    movntq 24[EDI], mm4 
-                    movntq 32[EDI], mm5 
-                    movntq 40[EDI], mm6 
-                    movntq 48[EDI], mm7 
-                    movntq 56[EDI], mm0 
-
-                    add esi, 64 
-                    add edi, 64 
-                    dec ecx 
-                    jnz loop1 
-
-                    emms
-            }
-            remainingBytes -= ((nbytes >> 6) << 6); 
-    }
-
-    if (remainingBytes > 0) {
-        // Memcpy the rest
-        memcpy((uint8*)dst + (nbytes - remainingBytes), (const uint8*)src + (nbytes - remainingBytes), remainingBytes); 
-    }
-}
-
-#else
-    // Fall back to memcpy
-    void memcpyMMX(void *dst, const void *src, int nbytes) {
-        memcpy(dst, src, nbytes);
-    }
-
-#endif
-
-
-void System::memcpy(void* dst, const void* src, size_t numBytes) {
-    if (System::hasSSE2() && System::hasMMX()) {
-        G3D::memcpyMMX(dst, src, numBytes);
-    } else if (System::hasSSE() && System::hasMMX()) {
-        G3D::memcpyMMX(dst, src, numBytes);
-    } else {
-        ::memcpy(dst, src, numBytes);
-    }
-}
-
-
-/** Michael Herf's fastest memset. n32 must be filled with the same
-    character repeated. */
-#if defined(G3D_WIN32) && defined(SSE)
-
-// On x86 processors, use MMX
-void memfill(void *dst, int n32, unsigned long i) {
-
-    int originalSize = i;
-    int bytesRemaining = i;
-
-    if (i > 16) {
-        
-        bytesRemaining = i % 16;
-        i -= bytesRemaining;
-                __asm {
-                        movq mm0, n32
-                        punpckldq mm0, mm0
-                        mov edi, dst
-
-                loopwrite:
-
-                        movntq 0[edi], mm0
-                        movntq 8[edi], mm0
-
-                        add edi, 16
-                        sub i, 16
-                        jg loopwrite
-
-                        emms
-                }
-    }
-
-    if (bytesRemaining > 0) {
-        ::memset((uint8*)dst + (originalSize - bytesRemaining), n32, bytesRemaining); 
-    }
-}
-
-#else
-
-// For non x86 processors, we fall back to the standard memset
-void memfill(void *dst, int n32, unsigned long i) {
-    ::memset(dst, n32, i);
-}
-
-#endif
-
-
-void System::memset(void* dst, uint8 value, size_t numBytes) {
-    if (System::hasSSE() && System::hasMMX()) {
-        uint32 v = value;
-        v = v + (v << 8) + (v << 16) + (v << 24); 
-        G3D::memfill(dst, v, numBytes);
-    } else {
-        ::memset(dst, value, numBytes);
-    }
-}
-
-
-std::string& System::appName() {
-    static std::string n = filenameBase(currentProgramFilename());
-    return n;
-}
-
-
-std::string System::currentProgramFilename() {
-    char filename[2048];
-
-    #ifdef G3D_WIN32
-    {
-        GetModuleFileNameA(NULL, filename, sizeof(filename));
-    } 
-    #else
-    {
-            int ret = readlink("/proc/self/exe", filename, sizeof(filename));
-            
-            // In case of an error, leave the handling up to the caller
-        if (ret == -1) {
-                    return "";
-        }
-            
-        debugAssert((int)sizeof(filename) > ret);
-            
-            // Ensure proper NULL termination
-            filename[ret] = 0;      
-    }
-    #endif
-
-    return filename;
-}
-
-
-void System::sleep(RealTime t) {
-
-    // Overhead of calling this function.
-    static const RealTime OVERHEAD = .000006;
-
-    RealTime now = time();
-    RealTime wakeupTime = now + t - OVERHEAD;
-
-    RealTime remainingTime = wakeupTime - now;
-    RealTime sleepTime = 0;
-
-    while (remainingTime > 0) {
-        
-
-        if (remainingTime > 0.001) {
-            // Safe to use Sleep with a time... sleep for half the remaining time
-            sleepTime = max(remainingTime * .5, 0.0005);
-        } else if (remainingTime > 0.0001) {
-            // Safe to use Sleep with a zero time;
-            // causes the program to yield only
-            // the current time slice, and then return.
-            sleepTime = 0;
-        } else {
-            // Not safe to use Sleep; busy wait
-            sleepTime = -1;
-        }
-
-        if (sleepTime >= 0) {
-            #ifdef G3D_WIN32
-                // Translate to milliseconds
-                Sleep((int)(sleepTime * 1e3));
-            #else
-                // Translate to microseconds
-                usleep((int)(sleepTime * 1e6));
-            #endif
-        }
-
-        now = time();
-        remainingTime = wakeupTime - now;
-    }
-}
-
-
-void System::consoleClearScreen() {
-    #ifdef G3D_WIN32
-        system("cls");
-    #else
-        system("clear");
-    #endif
-}
-
-
-bool System::consoleKeyPressed() {
-    #ifdef G3D_WIN32
-    
-        return _kbhit() != 0;
-
-    #else
-    
-        static const int STDIN = 0;
-        static bool initialized = false;
-
-        if (! initialized) {
-            // Use termios to turn off line buffering
-            termios term;
-            tcgetattr(STDIN, &term);
-            term.c_lflag &= ~ICANON;
-            tcsetattr(STDIN, TCSANOW, &term);
-            setbuf(stdin, NULL);
-            initialized = true;
-        }
-
-        #ifdef G3D_LINUX
-
-            int bytesWaiting;
-            ioctl(STDIN, FIONREAD, &bytesWaiting);
-            return bytesWaiting;
-
-        #else
-
-            timeval timeout;
-            fd_set rdset;
-
-            FD_ZERO(&rdset);
-            FD_SET(STDIN, &rdset);
-            timeout.tv_sec  = 0;
-            timeout.tv_usec = 0;
-
-            return select(STDIN + 1, &rdset, NULL, NULL, &timeout);
-        #endif
-    #endif
-}
-
-
-int System::consoleReadKey() {
-    #ifdef G3D_WIN32
-        return _getch();
-    #else
-        char c;
-        read(0, &c, 1);
-        return c;
-    #endif
-}
-
-
-void initTime() {
-    #ifdef G3D_WIN32
-        if (QueryPerformanceFrequency(&_counterFrequency)) {
-            QueryPerformanceCounter(&_start);
-        }
-
-        struct _timeb t;
-        _ftime(&t);
-
-        realWorldGetTickTime0 = (RealTime)t.time - t.timezone * G3D::MINUTE + (t.dstflag ? G3D::HOUR : 0);
-
-    #else
-        gettimeofday(&_start, NULL);
-        // "sse" = "seconds since epoch".  The time
-        // function returns the seconds since the epoch
-        // GMT (perhaps more correctly called UTC). 
-        time_t gmt = time(NULL);
-        
-        // No call to free or delete is needed, but subsequent
-        // calls to asctime, ctime, mktime, etc. might overwrite
-        // local_time_vals. 
-        tm* localTimeVals = localtime(&gmt);
-    
-        time_t local = gmt;
-        
-        if (localTimeVals) {
-            // tm_gmtoff is already corrected for daylight savings.
-            local = local + localTimeVals->tm_gmtoff;
-        }
-        
-        realWorldGetTickTime0 = local;
-    #endif
-}
-
-
-RealTime System::time() { 
-    init();
-    #ifdef G3D_WIN32
-        LARGE_INTEGER now;
-        QueryPerformanceCounter(&now);
-
-        return ((RealTime)(now.QuadPart - _start.QuadPart) /
-                _counterFrequency.QuadPart) + realWorldGetTickTime0;
-    #else
-        // Linux resolution defaults to 100Hz.
-        // There is no need to do a separate RDTSC call as gettimeofday
-        // actually uses RDTSC when on systems that support it, otherwise
-        // it uses the system clock.
-        struct timeval now;
-        gettimeofday(&now, NULL);
-
-        return (now.tv_sec  - _start.tv_sec) +
-               (now.tv_usec - _start.tv_usec) / 1e6
-			    + realWorldGetTickTime0;
-    #endif
-}
-
-
-////////////////////////////////////////////////////////////////
-
-#define REALPTR_TO_USERPTR(x)   ((uint8*)(x) + sizeof (void *))
-#define USERPTR_TO_REALPTR(x)   ((uint8*)(x) - sizeof (void *))
-#define REALBLOCK_SIZE(x)       ((x) + sizeof (void *))
-
-class BufferPool {
-public:
-
-    /** Only store buffers up to these sizes (in bytes) in each pool->
-        Different pools have different management strategies.
-
-        A large block is preallocated for tiny buffers; they are used with
-        tremendous frequency.  Other buffers are allocated as demanded.
-        Tiny buffers are 128 bytes long because that seems to align well with
-        cache sizes on many machines.
-      */
-    enum {tinyBufferSize = 128, smallBufferSize = 1024, medBufferSize = 4096};
-
-    /** 
-       Most buffers we're allowed to store.
-       128000 * 128  = 16 MB (preallocated)
-         2048 * 1024 =  2 MB (allocated on demand)
-         1024 * 4096 =  4 MB (allocated on demand)
-     */
-    enum {maxTinyBuffers = 128000, maxSmallBuffers = 2048, maxMedBuffers = 1024};
-
-private:
-
-    class MemBlock {
-    public:
-        void*           ptr;
-        size_t          bytes;
-
-        inline MemBlock() : ptr(NULL), bytes(0) {}
-        inline MemBlock(void* p, size_t b) : ptr(p), bytes(b) {}
-    };
-
-    MemBlock smallPool[maxSmallBuffers];
-    int smallPoolSize;
-
-    MemBlock medPool[maxMedBuffers];
-    int medPoolSize;
-
-    /** The tiny pool is a single block of storage into which all tiny
-        objects are allocated.  This provides better locality for
-        small objects and avoids the search time, since all tiny
-        blocks are exactly the same size. */
-    void* tinyPool[maxTinyBuffers];
-    int tinyPoolSize;
-
-    /** Pointer to the data in the tiny pool */
-    void* tinyHeap;
-
-#   ifdef G3D_WIN32
-    CRITICAL_SECTION    mutex;
-#   else
-    pthread_mutex_t     mutex;
-#   endif
-
-    /** Provide synchronization between threads */
-    void lock() {
-#       ifdef G3D_WIN32
-            EnterCriticalSection(&mutex);
-#       else
-            pthread_mutex_lock(&mutex);
-#       endif
-    }
-
-    void unlock() {
-#       ifdef G3D_WIN32
-            LeaveCriticalSection(&mutex);
-#       else
-            pthread_mutex_unlock(&mutex);
-#       endif
-    }
-
-    /** 
-     Malloc out of the tiny heap. Returns NULL if allocation failed.
-     */
-    inline void* tinyMalloc(size_t bytes) {
-        // Note that we ignore the actual byte size
-        // and create a constant size block.
-        (void)bytes;
-        assert(tinyBufferSize >= bytes);
-
-        void* ptr = NULL;
-
-        if (tinyPoolSize > 0) {
-            --tinyPoolSize;
-
-            // Return the old last pointer from the freelist
-            ptr = tinyPool[tinyPoolSize];
-
-#           ifdef G3D_DEBUG
-                if (tinyPoolSize > 0) {
-                    assert(tinyPool[tinyPoolSize - 1] != ptr); 
-                     //   "System::malloc heap corruption detected: "
-                     //   "the last two pointers on the freelist are identical (during tinyMalloc).");
-                }
-#           endif
-
-            // NULL out the entry to help detect corruption
-            tinyPool[tinyPoolSize] = NULL;
-        }
-
-        return ptr;
-    }
-
-    /** Returns true if this is a pointer into the tiny heap. */
-    bool inTinyHeap(void* ptr) {
-        return 
-            (ptr >= tinyHeap) && 
-            (ptr < (uint8*)tinyHeap + maxTinyBuffers * tinyBufferSize);
-    }
-
-    void tinyFree(void* ptr) {
-        assert(ptr);
-        assert(tinyPoolSize < maxTinyBuffers);
- //           "Tried to free a tiny pool buffer when the tiny pool freelist is full.");
-
-#       ifdef G3D_DEBUG
-            if (tinyPoolSize > 0) {
-                void* prevOnHeap = tinyPool[tinyPoolSize - 1];
-                assert(prevOnHeap != ptr); 
-//                    "System::malloc heap corruption detected: "
-//                    "the last two pointers on the freelist are identical (during tinyFree).");
-            }
-#       endif
-
-        assert(tinyPool[tinyPoolSize] == NULL);
-
-        // Put the pointer back into the free list
-        tinyPool[tinyPoolSize] = ptr;
-        ++tinyPoolSize;
-
-    }
-
-    void flushPool(MemBlock* pool, int& poolSize) {
-        for (int i = 0; i < poolSize; ++i) {
-            ::free(pool[i].ptr);
-            pool[i].ptr = NULL;
-            pool[i].bytes = 0;
-        }
-        poolSize = 0;
-    }
-
-
-    /**  Allocate out of a specific pool->  Return NULL if no suitable 
-         memory was found. 
-    
-         */
-    void* malloc(MemBlock* pool, int& poolSize, size_t bytes) {
-
-        // OPT: find the smallest block that satisfies the request.
-
-        // See if there's something we can use in the buffer pool->
-        // Search backwards since usually we'll re-use the last one.
-        for (int i = (int)poolSize - 1; i >= 0; --i) {
-            if (pool[i].bytes >= bytes) {
-                // We found a suitable entry in the pool->
-
-                // No need to offset the pointer; it is already offset
-                void* ptr = pool[i].ptr;
-
-                // Remove this element from the pool
-                --poolSize;
-                pool[i] = pool[poolSize];
-
-                return ptr;
-            }
-        }
-
-        return NULL;
-    }
-
-public:
-
-    /** Count of memory allocations that have occurred. */
-    int totalMallocs;
-    int mallocsFromTinyPool;
-    int mallocsFromSmallPool;
-    int mallocsFromMedPool;
-
-    /** Amount of memory currently allocated (according to the application). 
-        This does not count the memory still remaining in the buffer pool,
-        but does count extra memory required for rounding off to the size
-        of a buffer.
-        Primarily useful for detecting leaks.*/
-    // TODO: make me an atomic int!
-    volatile int bytesAllocated;
-
-    BufferPool() {
-        totalMallocs         = 0;
-
-        mallocsFromTinyPool  = 0;
-        mallocsFromSmallPool = 0;
-        mallocsFromMedPool   = 0;
-
-        bytesAllocated       = true;
-
-        tinyPoolSize         = 0;
-        tinyHeap             = NULL;
-
-        smallPoolSize        = 0;
-
-        medPoolSize          = 0;
-
-
-        // Initialize the tiny heap as a bunch of pointers into one
-        // pre-allocated buffer.
-        tinyHeap = ::malloc(maxTinyBuffers * tinyBufferSize);
-        for (int i = 0; i < maxTinyBuffers; ++i) {
-            tinyPool[i] = (uint8*)tinyHeap + (tinyBufferSize * i);
-        }
-        tinyPoolSize = maxTinyBuffers;
-
-#       ifdef G3D_WIN32
-            InitializeCriticalSection(&mutex);
-#       else
-            pthread_mutex_init(&mutex, NULL);
-#       endif
-    }
-
-
-    ~BufferPool() {
-        ::free(tinyHeap);
-#       ifdef G3D_WIN32
-            DeleteCriticalSection(&mutex);
-#       else
-            // No destruction on pthreads
-#       endif
-    }
-
-    
-    void* realloc(void* ptr, size_t bytes) {
-        if (ptr == NULL) {
-            return malloc(bytes);
-        }
-
-        if (inTinyHeap(ptr)) {
-            if (bytes <= tinyBufferSize) {
-                // The old pointer actually had enough space.
-                return ptr;
-            } else {
-                // Free the old pointer and malloc
-                
-                void* newPtr = malloc(bytes);
-                System::memcpy(newPtr, ptr, tinyBufferSize);
-                tinyFree(ptr);
-                return newPtr;
-
-            }
-        } else {
-            // In one of our heaps.
-
-            // See how big the block really was
-            size_t realSize = *(uint32*)USERPTR_TO_REALPTR(ptr);
-            if (bytes <= realSize) {
-                // The old block was big enough.
-                return ptr;
-            }
-
-            // Need to reallocate
-            void* newPtr = malloc(bytes);
-            System::memcpy(newPtr, ptr, realSize);
-            free(ptr);
-            return newPtr;
-        }
-    }
-
-
-    void* malloc(size_t bytes) {
-        lock();
-        ++totalMallocs;
-
-        if (bytes <= tinyBufferSize) {
-
-            void* ptr = tinyMalloc(bytes);
-
-            if (ptr) {
-                ++mallocsFromTinyPool;
-                unlock();
-                return ptr;
-            }
-
-        } 
-        
-        // Failure to allocate a tiny buffer is allowed to flow
-        // through to a small buffer
-        if (bytes <= smallBufferSize) {
-            
-            void* ptr = malloc(smallPool, smallPoolSize, bytes);
-
-            if (ptr) {
-                ++mallocsFromSmallPool;
-                unlock();
-                return ptr;
-            }
-
-        } else if (bytes <= medBufferSize) {
-            // Note that a small allocation failure does *not* fall
-            // through into a medium allocation because that would
-            // waste the medium buffer's resources.
-
-            void* ptr = malloc(medPool, medPoolSize, bytes);
-
-            if (ptr) {
-                ++mallocsFromMedPool;
-                unlock();
-                debugAssertM(ptr != NULL, "BufferPool::malloc returned NULL");
-                return ptr;
-            }
-        }
-
-        bytesAllocated += REALBLOCK_SIZE(bytes);
-        unlock();
-
-        // Heap allocate
-
-        // Allocate 4 extra bytes for our size header (unfortunate,
-        // since malloc already added its own header).
-        void* ptr = ::malloc(REALBLOCK_SIZE(bytes));
-
-        if (ptr == NULL) {
-            // Flush memory pools to try and recover space
-            flushPool(smallPool, smallPoolSize);
-            flushPool(medPool, medPoolSize);
-            ptr = ::malloc(REALBLOCK_SIZE(bytes));
-        }
-
-        if (ptr == NULL) {
-            if ((System::outOfMemoryCallback != NULL) &&
-                (System::outOfMemoryCallback(REALBLOCK_SIZE(bytes), true) == true)) {
-                // Re-attempt the malloc
-                ptr = ::malloc(REALBLOCK_SIZE(bytes));
-            }
-        }
-
-        if (ptr == NULL) {
-            if (System::outOfMemoryCallback != NULL) {
-                // Notify the application
-                System::outOfMemoryCallback(REALBLOCK_SIZE(bytes), false);
-            }
-#           ifdef G3D_DEBUG
-                debugPrintf("::malloc(%d) returned NULL\n", REALBLOCK_SIZE(bytes));
-#           endif
-            debugAssertM(ptr != NULL, 
-                         "::malloc returned NULL. Either the "
-                         "operating system is out of memory or the "
-                         "heap is corrupt.");
-            return NULL;
-        }
-
-        *(uint32*)ptr = bytes;
-
-        return REALPTR_TO_USERPTR(ptr);
-    }
-
-
-    void free(void* ptr) {
-        if (ptr == NULL) {
-            // Free does nothing on null pointers
-            return;
-        }
-
-        assert(isValidPointer(ptr));
-
-        if (inTinyHeap(ptr)) {
-            lock();
-            tinyFree(ptr);
-            unlock();
-            return;
-        }
-
-        uint32 bytes = *(uint32*)USERPTR_TO_REALPTR(ptr);
-
-        lock();
-        if (bytes <= smallBufferSize) {
-            if (smallPoolSize < maxSmallBuffers) {
-                smallPool[smallPoolSize] = MemBlock(ptr, bytes);
-                ++smallPoolSize;
-                unlock();
-                return;
-            }
-        } else if (bytes <= medBufferSize) {
-            if (medPoolSize < maxMedBuffers) {
-                medPool[medPoolSize] = MemBlock(ptr, bytes);
-                ++medPoolSize;
-                unlock();
-                return;
-            }
-        }
-        bytesAllocated -= REALBLOCK_SIZE(bytes);
-        unlock();
-
-        // Free; the buffer pools are full or this is too big to store.
-        ::free(USERPTR_TO_REALPTR(ptr));
-    }
-
-    std::string performance() const {
-        if (totalMallocs > 0) {
-            int pooled = mallocsFromTinyPool +
-                         mallocsFromSmallPool + 
-                         mallocsFromMedPool;
-
-            int total = totalMallocs;
-
-            return format("malloc performance: %5.1f%% <= %db, %5.1f%% <= %db, "
-                          "%5.1f%% <= %db, %5.1f%% > %db",
-                          100.0 * mallocsFromTinyPool  / total,
-                          BufferPool::tinyBufferSize,
-                          100.0 * mallocsFromSmallPool / total,
-                          BufferPool::smallBufferSize,
-                          100.0 * mallocsFromMedPool   / total,
-                          BufferPool::medBufferSize,
-                          100.0 * (1.0 - (double)pooled / total),
-                          BufferPool::medBufferSize);
-        } else {
-            return "No System::malloc calls made yet.";
-        }
-    }
-
-    std::string status() const {
-        return format("preallocated shared buffers: %5d/%d x %db",
-            maxTinyBuffers - tinyPoolSize, maxTinyBuffers, tinyBufferSize);
-    }
-};
-
-// Dynamically allocated because we need to ensure that
-// the buffer pool is still around when the last global variable 
-// is deallocated.
-static BufferPool* bufferpool = NULL;
-
-std::string System::mallocPerformance() {    
-#ifndef NO_BUFFERPOOL
-    return bufferpool->performance();
-#else
-	return "NO_BUFFERPOOL";
-#endif
-}
-
-std::string System::mallocStatus() {    
-#ifndef NO_BUFFERPOOL
-    return bufferpool->status();
-#else
-	return "NO_BUFFERPOOL";
-#endif
-}
-
-
-void System::resetMallocPerformanceCounters() {
-#ifndef NO_BUFFERPOOL
-    bufferpool->totalMallocs         = 0;
-    bufferpool->mallocsFromMedPool   = 0;
-    bufferpool->mallocsFromSmallPool = 0;
-    bufferpool->mallocsFromTinyPool  = 0;
-#endif
-}
-
-
-#ifndef NO_BUFFERPOOL
-inline void initMem() {
-    // Putting the test here ensures that the system is always
-    // initialized, even when globals are being allocated.
-    static bool initialized = false;
-    if (! initialized) {
-        bufferpool = new BufferPool();
-        initialized = true;
-    }
-}
-#endif
-
-
-void* System::malloc(size_t bytes) {
-#ifndef NO_BUFFERPOOL
-    initMem();
-    return bufferpool->malloc(bytes);
-#else
-    return ::malloc(bytes);
-#endif
-}
-
-void* System::calloc(size_t n, size_t x) {
-#ifndef NO_BUFFERPOOL
-    void* b = System::malloc(n * x);
-    debugAssertM(b != NULL, "System::malloc returned NULL");
-    debugAssertM(isValidHeapPointer(b), "System::malloc returned an invalid pointer");
-    System::memset(b, 0, n * x);
-    return b;
-#else
-    return ::calloc(n, x);
-#endif
-}
-
-
-void* System::realloc(void* block, size_t bytes) {
-#ifndef NO_BUFFERPOOL
-    initMem();
-    return bufferpool->realloc(block, bytes);
-#else
-	return ::realloc(block, bytes);
-#endif
-}
-
-
-void System::free(void* p) {
-#ifndef NO_BUFFERPOOL
-    bufferpool->free(p);
-#else
-	return ::free(p);
-#endif
-}
-
-
-void* System::alignedMalloc(size_t bytes, size_t alignment) {
-
-    alwaysAssertM(isPow2(alignment), "alignment must be a power of 2");
-
-    // We must align to at least a word boundary.
-    alignment = iMax(alignment, sizeof(void *));
-
-    // Pad the allocation size with the alignment size and the
-    // size of the redirect pointer.
-    size_t totalBytes = bytes + alignment + sizeof(void*);
-
-    size_t truePtr = (size_t)System::malloc(totalBytes);
-
-    if (truePtr == 0) {
-        // malloc returned NULL
-        return NULL;
-    }
-
-    debugAssert(isValidHeapPointer((void*)truePtr));
-    #ifdef G3D_WIN32
-    // The blocks we return will not be valid Win32 debug heap
-    // pointers because they are offset 
-    //  debugAssert(_CrtIsValidPointer((void*)truePtr, totalBytes, TRUE) );
-    #endif
-
-    // The return pointer will be the next aligned location (we must at least
-    // leave space for the redirect pointer, however).
-    size_t  alignedPtr = truePtr + sizeof(void*);
-
-    // 2^n - 1 has the form 1111... in binary.
-    uint32 bitMask = (alignment - 1);
-
-    // Advance forward until we reach an aligned location.
-    while ((alignedPtr & bitMask) != 0) {
-        alignedPtr += sizeof(void*);
-    }
-
-    debugAssert(alignedPtr - truePtr + bytes <= totalBytes);
-
-    // Immediately before the aligned location, write the true array location
-    // so that we can free it correctly.
-    size_t* redirectPtr = (size_t *)(alignedPtr - sizeof(void *));
-    redirectPtr[0] = truePtr;
-
-    debugAssert(isValidHeapPointer((void*)truePtr));
-
-    #ifdef G3D_WIN32
-        debugAssert( _CrtIsValidPointer((void*)alignedPtr, bytes, TRUE) );
-    #endif
-    return (void *)alignedPtr;
-}
-
-
-void System::alignedFree(void* _ptr) {
-    if (_ptr == NULL) {
-        return;
-    }
-
-    size_t alignedPtr = (size_t)_ptr;
-
-    // Back up one word from the pointer the user passed in.
-    // We now have a pointer to a pointer to the true start
-    // of the memory block.
-    size_t* redirectPtr = (size_t*)(alignedPtr - sizeof(void *));
-
-    // Dereference that pointer so that ptr = true start
-    void* truePtr = (void*)redirectPtr[0];
-
-    debugAssert(isValidHeapPointer((void*)truePtr));
-    System::free(truePtr);
-}
-
-
-void System::setEnv(const std::string& name, const std::string& value) {
-    std::string cmd = name + "=" + value;
-#   ifdef G3D_WIN32
-        _putenv(cmd.c_str());
-#   else
-        // Many linux implementations of putenv expect char*
-        putenv(const_cast(cmd.c_str()));
-#   endif
-}
-
-const char* System::getEnv(const std::string& name) {
-    return getenv(name.c_str());
-}
-
-static void var(TextOutput& t, const std::string& name, const std::string& val) {
-    t.writeSymbols(name,"=");
-    t.writeString(val);
-    t.writeNewline();
-}
-
-
-static void var(TextOutput& t, const std::string& name, const bool val) {
-    t.writeSymbols(name, "=", val ? "Yes" : "No");
-    t.writeNewline();
-}
-
-
-static void var(TextOutput& t, const std::string& name, const int val) {
-    t.writeSymbols(name,"=");
-    t.writeNumber(val);
-    t.writeNewline();
-}
-
-void System::describeSystem(
-    std::string&        s) {
-
-    TextOutput t;
-    describeSystem(t);
-    t.commitString(s);
-}
-
-void System::describeSystem(
-    TextOutput& t) {
-
-    t.writeSymbols("App", "{");
-    t.writeNewline();
-    t.pushIndent();
-        var(t, "Name", System::currentProgramFilename());
-        char cwd[1024];
-        getcwd(cwd, 1024);
-        var(t, "cwd", std::string(cwd));
-    t.popIndent();
-    t.writeSymbols("}");
-    t.writeNewline();
-    t.writeNewline();
-
-    t.writeSymbols("OS", "{");
-    t.writeNewline();
-    t.pushIndent();
-        var(t, "Name", System::operatingSystem());
-    t.popIndent();
-    t.writeSymbols("}");
-    t.writeNewline();
-    t.writeNewline();
-
-    t.writeSymbols("CPU", "{");
-    t.writeNewline();
-    t.pushIndent();
-        var(t, "Vendor", System::cpuVendor());
-        var(t, "Architecture", System::cpuArchitecture());
-        var(t, "hasCPUID", System::hasCPUID());
-        var(t, "hasMMX", System::hasMMX());
-        var(t, "hasSSE", System::hasSSE());
-        var(t, "hasSSE2", System::hasSSE2());
-        var(t, "hasSSE3", System::hasSSE3());
-        var(t, "has3DNow", System::has3DNow());
-        var(t, "hasRDTSC", System::hasRDTSC());
-    t.popIndent();
-    t.writeSymbols("}");
-    t.writeNewline();
-    t.writeNewline();
-       
-    t.writeSymbols("G3D", "{");
-    t.writeNewline();
-    t.pushIndent();
-        var(t, "Link version", G3D_VER);
-        var(t, "Compile version", System::version());
-    t.popIndent();
-    t.writeSymbols("}");
-    t.writeNewline();
-    t.writeNewline();
-}
-
-
-int System::cpuSpeedMHz() {
-    return g_cpuInfo.m_cpuSpeed;
-}
-
-
-void System::setClipboardText(const std::string& s) {
-#   ifdef G3D_WIN32
-        if (OpenClipboard(NULL)) {
-            HGLOBAL hMem = GlobalAlloc(GHND | GMEM_DDESHARE, s.size() + 1);
-            if (hMem) {
-                char *pMem = (char*)GlobalLock(hMem);
-                strcpy(pMem, s.c_str());
-                GlobalUnlock(hMem);
-
-                EmptyClipboard();
-                SetClipboardData(CF_TEXT, hMem);
-            }
-
-            CloseClipboard();
-            GlobalFree(hMem);
-        }
-#   endif
-}
-
-
-std::string System::getClipboardText() {
-    std::string s;
-
-#   ifdef G3D_WIN32
-        if (OpenClipboard(NULL)) {
-            HANDLE h = GetClipboardData(CF_TEXT);
-
-            if (h) {
-                char* temp = (char*)GlobalLock(h);
-                if (temp) {
-    	            s = temp;
-                }
-                temp = NULL;
-                GlobalUnlock(h);
-            }
-            CloseClipboard();
-        }
-#   endif
-    return s;
-}
-
-
-std::string System::currentDateString() {
-    time_t t1;
-    ::time(&t1);
-    tm* t = localtime(&t1);
-    return format("%d-%02d-%02d", t->tm_year + 1900, t->tm_mon + 1, t->tm_mday); 
-}
-
-
-}  // namespace
diff --git a/externals/g3dlite/G3D.lib/source/TextInput.cpp b/externals/g3dlite/G3D.lib/source/TextInput.cpp
deleted file mode 100644
index d5dc14fb6a0..00000000000
--- a/externals/g3dlite/G3D.lib/source/TextInput.cpp
+++ /dev/null
@@ -1,988 +0,0 @@
-/**
- @file TextInput.cpp
-  
- @author Morgan McGuire, graphics3d.com
- 
- @cite Based on a lexer written by Aaron Orenstein. 
- 
- @created 2001-11-27
- @edited  2008-07-14
- */
-
-#include "G3D/fileutils.h"
-#include "G3D/TextInput.h"
-#include "G3D/BinaryInput.h"
-#include "G3D/stringutils.h"
-
-#ifdef _MSC_VER
-#   pragma warning (push)
-// conversion from 'int' to 'char', possible loss of data (TODO: fix underlying problems)
-#   pragma warning (disable: 4244)
-#endif
-
-namespace G3D {
-
-double Token::number() const {
-    if (_type == NUMBER) {
-        std::string s = toLower(_string);
-        if (s == "-1.#ind00") {
-            return nan();
-        }
-
-        if (s == "1.#inf00") {
-            return inf();
-        }
-
-        if (s == "-1.#inf00") {
-            return -inf();
-        }
-
-        double n;
-        if ((_string.length() > 2) &&
-            (_string[0] == '0') &&
-            (_string[1] == 'x')) {
-            // Hex
-            uint32 i;
-            sscanf(_string.c_str(), "%x", &i);
-            n = i;
-        } else {
-            sscanf(_string.c_str(), "%lg", &n);
-        }
-        return n;
-    } else {
-        return 0.0;
-    }
-}
-
-
-TextInput::Settings::Settings ()
-   : cComments(true), cppComments(true), escapeSequencesInStrings(true), 
-     otherCommentCharacter('\0'), otherCommentCharacter2('\0'),
-     signedNumbers(true), singleQuotedStrings(true), sourceFileName(),
-     startingLineNumberOffset(0), msvcSpecials(true), proofSymbols(false),
-     caseSensitive(true)
-{ 
-    trueSymbols.insert("true");
-    falseSymbols.insert("false");
-}
-
-
-Token TextInput::peek() {
-    if (stack.size() == 0) {
-        Token t = nextToken();
-        push(t);
-    }
-
-    return stack.front();
-}
-
-
-int TextInput::peekLineNumber() {
-    return peek().line();
-}
-
-
-int TextInput::peekCharacterNumber() {
-    return peek().character();
-}
-
-
-Token TextInput::read() {
-    if (stack.size() > 0) {
-        Token t = stack.front();
-        stack.pop_front();
-        return t;
-    } else {
-        return nextToken();
-    }
-}
-
-static void toUpper(Set& set) {
-    Array symbols;
-    set.getMembers(symbols);
-    set.clear();
-    for (int i = 0; i < symbols.size(); ++i) {
-        set.insert(toUpper(symbols[i]));
-    }
-}
-
-void TextInput::init() {
-    currentCharOffset = 0;
-    charNumber = 1;
-    lineNumber = 1 + options.startingLineNumberOffset;
-
-    if (! options.caseSensitive) {
-        // Convert true and false symbols to all uppercase for fast comparisons
-        toUpper(options.trueSymbols);
-        toUpper(options.falseSymbols);
-    }
-}
-
-
-void TextInput::push(const Token& t) {
-    stack.push_front(t);
-}
-
-
-bool TextInput::hasMore() {
-    return (peek()._type != Token::END);
-}
-
-
-int TextInput::eatInputChar() {
-    // Don't go off the end
-    if (currentCharOffset >= (unsigned int)buffer.length()) {
-        return EOF;
-    }
-
-    unsigned char c = buffer[currentCharOffset];
-    ++currentCharOffset;
-
-    // update lineNumber and charNumber to reflect the location of the *next*
-    // character which will be read.
-    //
-    // We update even for CR because the user is allowed to do arbitrarily
-    // stupid things, like put a bunch of literal CRs inside a quoted string.
-    //
-    // We eat all whitespace between tokens, so they should never see a
-    // lineNumber that points to a CR.  However, if they have some kind of
-    // syntax error in a token that appears *after* a quoted string
-    // containing CRs, they should get a correct character number.
-
-    // TODO: http://sourceforge.net/tracker/index.php?func=detail&aid=1341266&group_id=76879&atid=548565
-
-    if (c == '\n') {
-        ++lineNumber;
-        charNumber = 1;
-    } else {
-        ++charNumber;
-    }
-
-    return c;
-}
-
-int TextInput::peekInputChar(unsigned int distance) {
-    // Don't go off the end
-    if ((currentCharOffset + distance) >= (unsigned int)buffer.length()) {
-        return EOF;
-    }
-
-    unsigned char c = buffer[currentCharOffset + distance];
-    return c;
-}
-
-
-Token TextInput::nextToken() {
-    Token t;
-
-    t._line         = lineNumber;
-    t._character    = charNumber;
-    t._type         = Token::END;
-    t._extendedType = Token::END_TYPE;
-
-    int c = peekInputChar();
-    if (c == EOF) {
-        return t;
-    }
-
-    bool whitespaceDone = false;
-    while (! whitespaceDone) {
-        whitespaceDone = true;
-
-        // Consume whitespace
-        while (isWhiteSpace(c)) {
-            c = eatAndPeekInputChar();
-        }
-
-        int c2 = peekInputChar(1);
-        if ((options.cppComments && c == '/' && c2 == '/')
-            || (options.otherCommentCharacter != '\0'
-                && c == options.otherCommentCharacter)
-            || (options.otherCommentCharacter2 != '\0'
-                && c == options.otherCommentCharacter2)) {
-            
-            // Single line comment, consume to newline or EOF.
-
-            do {
-                c = eatAndPeekInputChar();
-            } while (! isNewline(c) && c != EOF);
-
-            // There is whitespace after the comment (in particular, the
-            // newline that terminates the comment).  There might also be
-            // whitespace at the start of the next line.
-            whitespaceDone = false;
-
-        } else if (options.cComments && (c == '/') && (c2 == '*')) {
-
-            // consume both start-comment chars, can't let the trailing one
-            // help close the comment.
-            eatInputChar();
-            eatInputChar();
-
-            // Multi-line comment, consume to end-marker or EOF.
-            c = peekInputChar();
-            c2 = peekInputChar(1);
-            while (! ((c == '*') && (c2 == '/')) && (c != EOF)) {
-                eatInputChar();
-                c = c2;
-                c2 = peekInputChar(1);
-            }
-            eatInputChar();      // eat closing '*'
-            eatInputChar();      // eat closing '/'
-
-            c = peekInputChar();
-
-            // May be whitespace after comment.
-            whitespaceDone = false;
-        }
-
-    }  // while (! whitespaceDone)
-
-    t._line      = lineNumber;
-    t._character = charNumber;
-
-    // handle EOF
-    if (c == EOF) {
-        return t;
-    }
-
-    // Extended ASCII parses as itself, except for EOF
-    if (c > 127 && c < 255) {
-        t._type = Token::SYMBOL;                                                
-        t._extendedType = Token::SYMBOL_TYPE;                                   
-        t._string = c;                                                          
-        c = eatAndPeekInputChar();                                              
-    }
-
-
-    // Perform appropriate setup for a symbol (including setting up the token
-    // string to start with c), eat the input character, and overwrite
-    // 'c' with the peeked next input character.
-#define SETUP_SYMBOL(c)                                                         \
-    {                                                                           \
-        t._type = Token::SYMBOL;                                                \
-        t._extendedType = Token::SYMBOL_TYPE;                                   \
-        t._string = c;                                                          \
-        c = eatAndPeekInputChar();                                              \
-    }
-
-    switch (c) {
-
-    case '@':                   // Simple symbols -> just themselves.
-    case '(': 
-    case ')':
-    case ',':
-    case ';':
-    case '{':
-    case '}':
-    case '[':
-    case ']':
-    case '#':
-    case '$':
-    case '?':
-    case '%':
-        SETUP_SYMBOL(c);
-        return t;
-
-    case '-':                   // negative number, -, --, -=, or ->
-        SETUP_SYMBOL(c);
-
-        switch (c) {
-        case '>':               // ->
-        case '-':               // --
-        case '=':               // -=
-            t._string += c;
-            eatInputChar();
-            return t;
-        }
-
-        if (options.signedNumbers
-            && (isDigit(c) || (c == '.' && isDigit(peekInputChar(1))))) {
-
-            // Negative number.  'c' is still the first digit, and is
-            // the next input char.
-
-            goto numLabel;
-        }
-
-        // plain -
-        return t;
-
-    case '+':                   // positive number, +, ++, or +=
-        SETUP_SYMBOL(c);
-
-        switch (c) {
-        case '+':               // ++
-        case '=':               // +=
-            t._string += c;
-            eatInputChar();
-            return t;
-        }
-
-        if (options.signedNumbers
-            && (isDigit(c) || (c == '.' && isDigit(peekInputChar(1))))) {
-
-            // Positive number.  'c' is still the first digit, and is
-            // the next input char.
-
-            goto numLabel;
-        }
-
-        return t;
-
-    case ':':                   // : or :: or ::> or ::= or := or :>
-        SETUP_SYMBOL(c);
-        
-        if (c == ':') {
-            t._string += c;
-            eatInputChar();
-
-            if (options.proofSymbols) {
-                c = peekInputChar(0);
-                
-                if ((c == '>') || (c == '=')) {
-                    t._string += c;
-                    eatInputChar();
-                }
-            }
-        }
-        else if (options.proofSymbols && (c == '=' || c == '>')) {
-            t._string += c;
-            eatInputChar();
-        }
-        return t;
-
-    case '=':                   // = or == or =>
-        SETUP_SYMBOL(c);
-
-        if (c == '=') {
-            t._string += c;
-            eatInputChar();
-            return t;
-        } else if (options.proofSymbols && (c == '>')) {
-            t._string += c;
-            eatInputChar();
-            return t;
-        }
-        return t;
-
-    case '*':                   // * or *=
-    case '/':                   // / or /=
-    case '!':                   // ! or !=
-    case '~':                   // ~ or ~=
-    case '^':                   // ^ or ^=
-        SETUP_SYMBOL(c);
-        
-        if (c == '=') {
-            t._string += c;
-            eatInputChar();
-            return t;
-        }
-        return t;
-
-    case '>':                   // >, >>,or >=
-    case '<':                   // <<, <<, or <= or <- or <:
-    case '|':                   // ||, ||, or |= or |-
-    case '&':                   // &, &&, or &=
-        {
-            int orig_c = c;
-            SETUP_SYMBOL(c);
-
-            if ((c == '=') || (orig_c == c)) {
-                t._string += c;
-                eatInputChar();
-                return t;
-            } else if (options.proofSymbols) {
-                if ((orig_c == '<') && (c == '-')) {
-                    t._string += c;
-                    eatInputChar();
-                } else if ((orig_c == '|') && (c == '-')) {
-                    t._string += c;
-                    eatInputChar();
-                } else if ((orig_c == '<') && (c == ':')) {
-                    t._string += c;
-
-                    c = eatAndPeekInputChar();
-
-                    if (c == ':') {
-                        t._string += c;
-                        eatInputChar();
-                    }
-                }
-            }
-        }
-        return t;
-            
-    case '\\':                // backslash or escaped comment char.
-        SETUP_SYMBOL(c);
-
-        if ((options.otherCommentCharacter != '\0'
-             && c == options.otherCommentCharacter)
-            || (options.otherCommentCharacter2 != '\0'
-                && c == options.otherCommentCharacter2)) {
-            
-            // escaped comment character.  Return the raw comment
-            // char (no backslash).
-
-            t._string = c;
-            eatInputChar();
-            return t;
-        }
-        return t;
-
-    case '.':                   // number, ., .., or ...
-        if (isDigit(peekInputChar(1))) {
-            // We're parsing a float that began without a leading zero
-            goto numLabel;
-        }
-
-        SETUP_SYMBOL(c);
-
-        if (c == '.') {         // .. or ...
-            t._string += c;
-            c = eatAndPeekInputChar();
-
-            if (c == '.') {     // ...
-                t._string += c;
-                eatInputChar();
-            }
-            return t;
-        }
-
-        return t;
-
-    } // switch (c)
-
-#undef SETUP_SYMBOL
-
-numLabel:
-    if (isDigit(c) || (c == '.')) {
-
-        // A number.  Note-- single dots have been
-        // parsed already, so a . indicates a number
-        // less than 1 in floating point form.
-    
-        // [0-9]*(\.[0-9]) or [0-9]+ or 0x[0-9,A-F]+
-
-        if (t._string != "-") {
-            // If we picked up a leading "-" sign above, keep it,
-            // otherwise drop the string parsed thus far
-            t._string = "";
-        }
-        t._type = Token::NUMBER;
-        if (c == '.') {
-            t._extendedType = Token::FLOATING_POINT_TYPE;
-        } else {
-            t._extendedType = Token::INTEGER_TYPE;
-        }
-        
-        if ((c == '0') && (peekInputChar(1) == 'x')) {
-            // Hex number
-            t._string += "0x";
-
-            // skip the 0x
-            eatInputChar();
-            eatInputChar();
-
-            c = peekInputChar();
-            while (isDigit(c) || ((c >= 'A') && (c <= 'F')) || ((c >= 'a') && (c <= 'f'))) {
-                t._string += c;
-                c = eatAndPeekInputChar();
-            }
-
-        } else {
-			// Non-hex number
-
-            // Read the part before the decimal.
-            while (isDigit(c)) {
-                t._string += c;
-                c = eatAndPeekInputChar();
-            }
-    
-            // True if we are reading a floating-point special type
-            bool isSpecial = false;
-
-            // Read the decimal, if one exists
-            if (c == '.') {
-                t._extendedType = Token::FLOATING_POINT_TYPE;
-
-                // The '.' character was a decimal point, not the start of a
-                // method or range operator
-                t._string += c;
-                c = eatAndPeekInputChar();
-
-                // Floating point specials (msvc format only)
-                if (options.msvcSpecials && (c == '#')) {
-                    isSpecial = true;
-                    // We are reading a floating point special value
-                    // of the form -1.#IND00, -1.#INF00, or 1.#INF00
-                    c = eatAndPeekInputChar();
-                    char test = c;
-                    if (! options.caseSensitive) {
-                        test = toupper(c);
-                    }
-                    if (test != 'I') {
-                        throw BadMSVCSpecial
-                            (
-                             "Incorrect floating-point special (inf or nan) "
-                             "format.",
-                            t.line(), charNumber);
-                    }
-                    c = eatAndPeekInputChar();
-                    test = c;
-                    if (! options.caseSensitive) {
-                        test = toupper(c);
-                    }
-                    if (test != 'N') {
-                        throw BadMSVCSpecial
-                            (
-                             "Incorrect floating-point special (inf or nan) "
-                             "format.",
-                            t.line(), charNumber);
-                    }
-                    t._string += "#IN";
-                    c = eatAndPeekInputChar();
-                    test = c;
-                    if (! options.caseSensitive) {
-                        test = toupper(c);
-                    }
-                    if ((test != 'F') && (test != 'D')) {
-                        throw BadMSVCSpecial
-                            (
-                             "Incorrect floating-point special (inf or nan) "
-                             "format.",
-                            t.line(), charNumber);
-                    }
-                    t._string += c;
-                    for (int j = 0; j < 2; ++j) {
-                        c = eatAndPeekInputChar();
-                        if (c != '0') {
-                            throw BadMSVCSpecial
-                                (
-                                 "Incorrect floating-point special (inf or"
-                                 "nan) format.",
-                                 t.line(), charNumber);
-                        }
-                        t._string += (char)c;
-                    }
-
-                } else {
-
-                    // Read the part after the decimal
-                    while (isDigit((char)c)) {
-                        t._string += (char)c;
-                        c = eatAndPeekInputChar();
-                    }
-                }
-            }
-
-            if (! isSpecial && ((c == 'e') || (c == 'E'))) {
-                // Read exponent
-                t._extendedType = Token::FLOATING_POINT_TYPE;
-                t._string += c;
-
-                c = eatAndPeekInputChar();
-                if ((c == '-') || (c == '+')) {
-                    t._string += c;
-                    c = eatAndPeekInputChar();                    
-                }
-
-                while (isDigit(c)) {
-                    t._string += c;
-                    c = eatAndPeekInputChar();
-                }
-            }
-        }
-        return t;
-
-    } else if (isLetter(c) || (c == '_')) {
-        // Identifier or keyword
-        // [A-Za-z_][A-Za-z_0-9]*
-
-        t._type = Token::SYMBOL;
-        t._extendedType = Token::SYMBOL_TYPE;
-        t._string = "";
-        do {
-            t._string += c;
-            c = eatAndPeekInputChar();
-        } while (isLetter(c) || isDigit(c) || (c == '_'));
-
-        // See if this symbol is actually a boolean
-        if ((options.trueSymbols.size() > 0) || (options.falseSymbols.size() > 0)) {
-            std::string str = t._string;
-            if (! options.caseSensitive) {
-                str = toUpper(str);
-            }
-            if (options.trueSymbols.contains(str)) {
-               t._type = Token::BOOLEAN;
-               t._extendedType = Token::BOOLEAN_TYPE;
-               t._bool = true;
-            } else if (options.falseSymbols.contains(str)) {
-               t._type = Token::BOOLEAN;
-               t._extendedType = Token::BOOLEAN_TYPE;
-               t._bool = false;
-            }
-        }
-
-        return t;
-
-    } else if (c == '\"') {
-
-        // Discard the double-quote.
-        eatInputChar();
-
-        // Double quoted string
-		parseQuotedString('\"', t);
-        return t;
-
-    } else if (c == '\'') {
-
-        // Discard the single-quote.
-        eatInputChar();
-
-		if (options.singleQuotedStrings) {
-			// Single quoted string
-			parseQuotedString('\'', t);
-		} else {
-			t._string = c;
-			t._type = Token::SYMBOL;
-			t._extendedType = Token::SYMBOL_TYPE;
-		}
-        return t;
-
-    } // end of special case tokens
-
-    if (c == EOF) {
-        t._type = Token::END;
-        t._extendedType = Token::END_TYPE;
-        t._string = "";
-        return t;
-    }
-
-    // Some unknown token
-    debugAssertM(false, 
-                 format("Unrecognized token type beginning with character '%c' (ASCII %d)", 
-                        c, c));
-    return t;
-}
-
-
-void TextInput::parseQuotedString(unsigned char delimiter, Token& t) {
-
-    t._type = Token::STRING;
-
-	if (delimiter == '\'') {
-		t._extendedType = Token::SINGLE_QUOTED_TYPE;
-	} else {
-		t._extendedType = Token::DOUBLE_QUOTED_TYPE;
-	}
-
-    while (true) {
-        // We're definitely going to consume the next input char, so we get
-        // it right now.  This makes the condition handling below a bit easier.
-        int c = eatInputChar();
-
-        if (c == EOF) {
-            // END inside a quoted string.  (We finish the string.)
-            break;
-        }
-
-        if (options.escapeSequencesInStrings && (c == '\\')) {
-            // An escaped character.  We're definitely going to consume it,
-            // so we get it (and consume it) now.
-
-            c = eatInputChar();
-
-            switch (c) {
-            case 'r':
-                t._string += '\r';
-                break;
-            case 'n':
-                t._string += '\n';
-                break;
-            case 't':
-                t._string += '\t';
-                break;
-            case '0':
-                t._string += '\0';
-                break;
-
-            case '\\':
-            case '\"':
-            case '\'':
-                t._string += (char)c;
-                break;
-
-            default:
-                if (((c == options.otherCommentCharacter) && 
-                     (options.otherCommentCharacter != '\0')) ||
-                    ((c == options.otherCommentCharacter2) && 
-                     (options.otherCommentCharacter2 != '\0'))) {
-                    t._string += c;
-                } 
-                // otherwise, some illegal escape sequence; skip it.
-                break;
-
-            } // switch
-
-        } else if (c == delimiter) {
-            // End of the string.  Already consumed the character.
-            break;
-        } else {
-            // All other chars, go on to the string.  Already consumed the
-            // character.
-            t._string += (char)c;
-        }
-
-    }
-}
-
-bool TextInput::readBoolean() {
-    Token t(read());
-
-    if (t._type == Token::BOOLEAN) {
-        return t.boolean();
-    }
-
-    // Push initial token back, and throw an error.  We intentionally
-    // indicate that the wrong type is the type of the initial token.
-    // Logically, the number started there.
-    push(t);
-    throw WrongTokenType(options.sourceFileName, t.line(), t.character(),
-                         Token::BOOLEAN, t._type); 
-}
-
-double TextInput::readNumber() {
-    Token t(read());
-
-    if (t._type == Token::NUMBER) {
-        return t.number();
-    }
-
-    // Even if signedNumbers is disabled, readNumber attempts to
-    // read a signed number, so we handle that case here.
-    if (! options.signedNumbers
-        && (t._type == Token::SYMBOL)
-        && ((t._string == "-") 
-             || (t._string == "+"))) {
-
-        Token t2(read());
-
-        if ((t2._type == Token::NUMBER)
-            && (t2._character == t._character + 1)) {
-
-            if (t._string == "-") {
-                return -t2.number();
-            } else {
-                return t2.number();
-            }
-        }
-
-        // push back the second token.
-        push(t2);
-    }
-
-    // Push initial token back, and throw an error.  We intentionally
-    // indicate that the wrong type is the type of the initial token.
-    // Logically, the number started there.
-    push(t);
-    throw WrongTokenType(options.sourceFileName, t.line(), t.character(),
-                         Token::NUMBER, t._type); 
-}
-
-
-Token TextInput::readStringToken() {
-    Token t(read());
-
-    if (t._type == Token::STRING) {               // fast path
-        return t;
-    }
-
-    push(t);
-    throw WrongTokenType(options.sourceFileName, t.line(), t.character(),
-                         Token::STRING, t._type);
-}
-
-std::string TextInput::readString() {
-    return readStringToken()._string;
-}
-
-void TextInput::readString(const std::string& s) {
-    Token t(readStringToken());
-
-    if (t._string == s) {                         // fast path
-        return;
-    }
-
-    push(t);
-    throw WrongString(options.sourceFileName, t.line(), t.character(),
-                      s, t._string);
-}
-
-
-Token TextInput::readSymbolToken() {
-    Token t(read());
-    
-    if (t._type == Token::SYMBOL) {               // fast path
-        return t;
-    }
-
-    push(t);
-    throw WrongTokenType(options.sourceFileName, t.line(), t.character(),
-                         Token::SYMBOL, t._type);
-}
-
-
-std::string TextInput::readSymbol() {
-    return readSymbolToken()._string;
-}
-
-void TextInput::readSymbol(const std::string& symbol) {
-    Token t(readSymbolToken());
-
-    if (t._string == symbol) {                    // fast path
-        return;
-    }
-
-    push(t);
-    throw WrongSymbol(options.sourceFileName, t.line(), t.character(),
-                      symbol, t._string);
-}
-
-
-TextInput::TextInput(const std::string& filename, const Settings& opt) : options(opt) {
-    init();
-    std::string input = readWholeFile(filename);
-
-    if (options.sourceFileName.empty()) {
-        options.sourceFileName = filename;
-    }
-    int n = input.size();
-    buffer.resize(n);
-    System::memcpy(buffer.getCArray(), input.c_str(), n);
-}
-
-
-TextInput::TextInput(FS fs, const std::string& str, const Settings& opt) : options(opt) {
-    (void)fs;
-    init();
-    if (options.sourceFileName.empty()) {
-        if (str.length() < 14) {
-            options.sourceFileName = std::string("\"") + str + "\"";
-        } else {
-            options.sourceFileName = std::string("\"") + str.substr(0, 10) + "...\"";
-        }
-    }
-    buffer.resize(str.length()); // we don't bother copying trailing NUL.
-    System::memcpy(buffer.getCArray(), str.c_str(), buffer.size());
-}
-
-
-const std::string& TextInput::filename() const {
-    return options.sourceFileName;
-}
-
-///////////////////////////////////////////////////////////////////////////////////
-
-TextInput::TokenException::TokenException(
-    const std::string&  src,
-    int                 ln,
-    int                 ch) : sourceFile(src), line(ln), character(ch) {
-
-    message = format("%s(%d) : ", sourceFile.c_str(), line);
-}
-
-///////////////////////////////////////////////////////////////////////////////////
-
-static const char* tokenTypeToString(Token::Type t) {
-    switch (t) {
-    case Token::SYMBOL:
-        return "Token::SYMBOL";
-    case Token::STRING:
-        return "Token::STRING";
-    case Token::NUMBER:
-        return "Token::NUMBER";
-    case Token::END:
-        return "Token::END";
-    default:
-        debugAssertM(false, "Fell through switch");
-        return "?";
-    }
-}
-
-TextInput::WrongTokenType::WrongTokenType(
-    const std::string&  src,
-    int                 ln,
-    int                 ch,
-    Token::Type         e,
-    Token::Type         a) :
-    TokenException(src, ln, ch), expected(e), actual(a) {
-         
-    message += format("Expected token of type %s, found type %s.",
-                      tokenTypeToString(e), tokenTypeToString(a));
-}
-
-
-TextInput::BadMSVCSpecial::BadMSVCSpecial(
-    const std::string&  src,
-    int                 ln,
-    int                 ch) :
-    TokenException(src, ln, ch) {
-}
-
-
-TextInput::WrongSymbol::WrongSymbol(
-    const std::string&  src,
-    int                 ln,
-    int                 ch,
-    const std::string&  e,
-    const std::string&  a) : 
-    TokenException(src, ln, ch), expected(e), actual(a) {
-
-    message += format("Expected symbol '%s', found symbol '%s'.",
-                      e.c_str(), a.c_str());
-}
-
-
-TextInput::WrongString::WrongString(
-    const std::string&  src,
-    int                 ln,
-    int                 ch,
-    const std::string&  e,
-    const std::string&  a) : 
-    TokenException(src, ln, ch), expected(e), actual(a) {
-
-    message += format("Expected string '%s', found string '%s'.",
-                      e.c_str(), a.c_str());
-}
-
-
-void deserialize(bool& b, TextInput& ti) {
-    b = ti.readSymbol() == "true";
-}
-
-
-void deserialize(int& b, TextInput& ti) {
-    b = iRound(ti.readNumber());
-}
-
-
-void deserialize(uint8& b, TextInput& ti) {
-    b = (uint8)iRound(ti.readNumber());
-}
-
-
-void deserialize(double& b, TextInput& ti) {
-    b = ti.readNumber();
-}
-
-
-void deserialize(float& b, TextInput& ti) {
-    b = (float)ti.readNumber();
-}
-
-} // namespace
-
-#ifdef _MSC_VER
-#   pragma warning (pop)
-#endif
diff --git a/externals/g3dlite/G3D.lib/source/TextOutput.cpp b/externals/g3dlite/G3D.lib/source/TextOutput.cpp
deleted file mode 100644
index f7a40d9798b..00000000000
--- a/externals/g3dlite/G3D.lib/source/TextOutput.cpp
+++ /dev/null
@@ -1,452 +0,0 @@
-/**
-  @file TextOutput.cpp
-
-  @maintainer Morgan McGuire, morgan@graphics3d.com
-  @created 2004-06-21
-  @edited  2006-08-14
-
-  Copyright 2000-2006, Morgan McGuire.
-  All rights reserved.
- */
-
-#include "G3D/TextOutput.h"
-#include "G3D/Log.h"
-#include "G3D/fileutils.h"
-
-namespace G3D {
-
-TextOutput::TextOutput(const TextOutput::Settings& opt) :
-	startingNewLine(true),
-    currentColumn(0),
-	inDQuote(false),
-	filename(""),
-	indentLevel(0)
-{
-    setOptions(opt);
-}
-
-
-TextOutput::TextOutput(const std::string& fil, const TextOutput::Settings& opt) :
-    startingNewLine(true),
-    currentColumn(0),
-	inDQuote(false),
-	filename(fil),
-	indentLevel(0) 
-{
-
-    setOptions(opt);
-}
-
-
-void TextOutput::setIndentLevel(int i) {
-    indentLevel = i;
-
-    // If there were more pops than pushes, don't let that take us below 0 indent.
-    // Don't ever indent more than the number of columns.
-    indentSpaces = 
-        iClamp(option.spacesPerIndent * indentLevel, 
-               0, 
-               option.numColumns - 1);
-}
-
-
-void TextOutput::setOptions(const Settings& _opt) {
-    option = _opt;
-
-    debugAssert(option.numColumns > 1);
-
-    setIndentLevel(indentLevel);
-
-    newline = (option.newlineStyle == Settings::NEWLINE_WINDOWS) ? "\r\n" : "\n";
-}
-
-
-void TextOutput::pushIndent() {
-    setIndentLevel(indentLevel + 1);
-}
-
-
-void TextOutput::popIndent() {
-    setIndentLevel(indentLevel - 1);
-}
-
-
-static std::string escape(const std::string& string) {
-    std::string result = "";
-
-    for (std::string::size_type i = 0; i < string.length(); ++i) {
-        char c = string.at(i);
-        switch (c) {
-        case '\0':
-            result += "\\0";
-            break;
-
-        case '\r':
-            result += "\\r";
-            break;
-
-        case '\n':
-            result += "\\n";
-            break;
-
-        case '\t':
-            result += "\\t";
-            break;
-
-        case '\\':
-            result += "\\\\";
-            break;
-
-        default:
-            result += c;
-        }
-    }
-
-    return result;
-}
-
-void TextOutput::writeString(const std::string& string) {
-    // Convert special characters to escape sequences
-    this->printf("\"%s\"", escape(string).c_str());
-}
-
-
-void TextOutput::writeBoolean(bool b) {
-    this->printf("%s ", b ? option.trueSymbol.c_str() : option.falseSymbol.c_str());
-}
-
-void TextOutput::writeNumber(double n) {
-    this->printf("%f ", n);
-}
-
-
-void TextOutput::writeNumber(int n) {
-    this->printf("%d ", n);
-}
-
-
-void TextOutput::writeSymbol(const std::string& string) {
-    if (string.size() > 0) {
-        // TODO: check for legal symbols?
-        this->printf("%s ", string.c_str());
-    }
-}
-
-void TextOutput::writeSymbols(
-    const std::string& a,
-    const std::string& b,
-    const std::string& c,
-    const std::string& d,
-    const std::string& e,
-    const std::string& f) {
-
-    writeSymbol(a);
-    writeSymbol(b);
-    writeSymbol(c);
-    writeSymbol(d);
-    writeSymbol(e);
-    writeSymbol(f);
-}
-
-
-void TextOutput::printf(const std::string formatString, ...) {
-    va_list argList;
-    va_start(argList, formatString);
-    this->vprintf(formatString.c_str(), argList);
-    va_end(argList);
-}
-
-
-void TextOutput::printf(const char* formatString, ...) {
-    va_list argList;
-    va_start(argList, formatString);
-    this->vprintf(formatString, argList);
-    va_end(argList);
-}
-
-
-void TextOutput::convertNewlines(const std::string& in, std::string& out) {
-    // TODO: can be significantly optimized in cases where
-    // single characters are copied in order by walking through
-    // the array and copying substrings as needed.
-
-    if (option.convertNewlines) {
-        out = "";
-        for (uint32 i = 0; i < in.size(); ++i) {
-            if (in[i] == '\n') {
-                // Unix newline
-                out += newline;
-            } else if ((in[i] == '\r') && (i + 1 < in.size()) && (in[i + 1] == '\n')) {
-                // Windows newline
-                out += newline;
-                ++i;
-            } else {
-                out += in[i];
-            }
-        }
-    } else {
-        out = in;
-    }
-}
-
-
-void TextOutput::writeNewline() {
-    for (uint32 i = 0; i < newline.size(); ++i) {
-        indentAppend(newline[i]);
-    }
-}
-
-
-void TextOutput::writeNewlines(int numLines) {
-    for (int i = 0; i < numLines; ++i) {
-        writeNewline();
-    }
-}
-
-
-void TextOutput::wordWrapIndentAppend(const std::string& str) {
-    // TODO: keep track of the last space character we saw so we don't
-    // have to always search.
-
-    if ((option.wordWrap == Settings::WRAP_NONE) ||
-        (currentColumn + (int)str.size() <= option.numColumns)) {
-        // No word-wrapping is needed
-
-        // Add one character at a time.
-        // TODO: optimize for strings without newlines to add multiple
-        // characters.
-        for (uint32 i = 0; i < str.size(); ++i) {
-            indentAppend(str[i]);
-        }
-        return;
-    }
-
-    // Number of columns to wrap against
-    int cols = option.numColumns - indentSpaces;
-    
-    // Copy forward until we exceed the column size, 
-    // and then back up and try to insert newlines as needed.
-    for (uint32 i = 0; i < str.size(); ++i) {
-
-        indentAppend(str[i]);
-        if ((str[i] == '\r') && (i + 1 < str.size()) && (str[i + 1] == '\n')) {
-            // \r\n, we need to hit the \n to enter word wrapping.
-            ++i;
-            indentAppend(str[i]);
-        }
-
-        if (currentColumn >= cols) {
-            debugAssertM(str[i] != '\n' && str[i] != '\r',
-                "Should never enter word-wrapping on a newline character");            
-
-            // True when we're allowed to treat a space as a space.
-            bool unquotedSpace = option.allowWordWrapInsideDoubleQuotes || ! inDQuote;
-
-            // Cases:
-            //
-            // 1. Currently in a series of spaces that ends with a newline
-            //     strip all spaces and let the newline
-            //     flow through.
-            //
-            // 2. Currently in a series of spaces that does not end with a newline
-            //     strip all spaces and replace them with single newline
-            //
-            // 3. Not in a series of spaces
-            //     search backwards for a space, then execute case 2.
-
-            // Index of most recent space
-            uint32 lastSpace = data.size() - 1;
-
-            // How far back we had to look for a space
-            uint32 k = 0;
-            uint32 maxLookBackward = currentColumn - indentSpaces;
-
-            // Search backwards (from current character), looking for a space.
-            while ((k < maxLookBackward) &&
-                (lastSpace > 0) &&
-                (! ((data[lastSpace] == ' ') && unquotedSpace))) {
-                --lastSpace;
-                ++k;
-
-                if ((data[lastSpace] == '\"') && !option.allowWordWrapInsideDoubleQuotes) {
-                    unquotedSpace = ! unquotedSpace;
-                }
-            }
-
-            if (k == maxLookBackward) {
-                // We couldn't find a series of spaces
-
-                if (option.wordWrap == Settings::WRAP_ALWAYS) {
-                    // Strip the last character we wrote, force a newline,
-                    // and replace the last character;
-                    data.pop();
-                    writeNewline();
-                    indentAppend(str[i]);
-                } else {
-                    // Must be Settings::WRAP_WITHOUT_BREAKING
-                    //
-                    // Don't write the newline; we'll come back to
-                    // the word wrap code after writing another character
-                }
-            } else {
-                // We found a series of spaces.  If they continue 
-                // to the new string, strip spaces off both.  Otherwise
-                // strip spaces from data only and insert a newline.                
-
-                // Find the start of the spaces.  firstSpace is the index of the
-                // first non-space, looking backwards from lastSpace.
-                uint32 firstSpace = lastSpace;
-                while ((k < maxLookBackward) &&
-                    (firstSpace > 0) &&
-                    (data[firstSpace] == ' ')) {
-                    --firstSpace;
-                    ++k;
-                }
-
-                if (k == maxLookBackward) {
-                    ++firstSpace;
-                }
-
-                if (lastSpace == (uint32)data.size() - 1) {
-                    // Spaces continued up to the new string
-                    data.resize(firstSpace + 1);
-                    writeNewline();
-
-                    // Delete the spaces from the new string
-                    while ((i < str.size() - 1) && (str[i + 1] == ' ')) {
-                        ++i;
-                    }
-                } else {
-                    // Spaces were somewhere in the middle of the old string.
-                    // replace them with a newline.
-
-                    // Copy over the characters that should be saved
-                    Array temp;
-                    for (uint32 j = lastSpace + 1; j < (uint32)data.size(); ++j) {
-                        char c = data[j];
-
-                        if (c == '\"') {
-                            // Undo changes to quoting (they will be re-done
-                            // when we paste these characters back on).
-                            inDQuote = !inDQuote;
-                        }
-                        temp.append(c);
-                    }
-
-                    // Remove those characters and replace with a newline.
-                    data.resize(firstSpace + 1);
-                    writeNewline();
-
-                    // Write them back
-                    for (uint32 j = 0; j < (uint32)temp.size(); ++j) {
-                        indentAppend(temp[j]);
-                    }
-
-                    // We are now free to continue adding from the
-                    // new string, which may or may not begin with spaces.
-
-                } // if spaces included new string
-            } // if hit indent
-        } // if line exceeded
-    } // iterate over str
-}
-
-
-void TextOutput::indentAppend(char c) {
-
-    if (startingNewLine) {
-        for (int j = 0; j < indentSpaces; ++j) {
-            data.push(' ');
-        }
-        startingNewLine = false;
-        currentColumn = indentSpaces;
-    }
-
-    data.push(c);
-
-    // Don't increment the column count on return character
-    // newline is taken care of below.
-    if (c != '\r') {
-        ++currentColumn;
-    }
-    
-    if (c == '\"') {
-        inDQuote = ! inDQuote;
-    }
-
-    startingNewLine = (c == '\n');
-    if (startingNewLine) {
-        currentColumn = 0;
-    }
-}
-
-
-void TextOutput::vprintf(const char* formatString, va_list argPtr) {
-    std::string str = vformat(formatString, argPtr);
-
-    std::string clean;
-    convertNewlines(str, clean);
-    wordWrapIndentAppend(clean);
-}
-
-
-void TextOutput::commit(bool flush) {
-    std::string p = filenamePath(filename);
-    if (! fileExists(p, false)) {
-        createDirectory(p);
-    }
-
-    FILE* f = fopen(filename.c_str(), "wb");
-    debugAssert(f);
-    fwrite(data.getCArray(), 1, data.size(), f);
-    if (flush) {
-        fflush(f);
-    }
-    fclose(f);
-}
-
-
-void TextOutput::commitString(std::string& out) {
-    // Null terminate
-    data.push('\0');
-    out = data.getCArray();
-    data.pop();
-}
-
-
-std::string TextOutput::commitString() {
-    std::string str;
-    commitString(str);
-    return str;
-}
-
-
-
-/////////////////////////////////////////////////////////////////////
-
-void serialize(const float& b, TextOutput& to) {
-    to.writeNumber(b);
-}
-
-
-void serialize(const bool& b, TextOutput& to) {
-    to.writeSymbol(b ? "true" : "false");
-}
-
-
-void serialize(const int& b, TextOutput& to) {
-    to.writeNumber(b);
-}
-
-
-void serialize(const uint8& b, TextOutput& to) {
-    to.writeNumber(b);
-}
-
-
-void serialize(const double& b, TextOutput& to) {
-    to.writeNumber(b);
-}
-
-
-}
diff --git a/externals/g3dlite/G3D.lib/source/ThreadSet.cpp b/externals/g3dlite/G3D.lib/source/ThreadSet.cpp
deleted file mode 100644
index 59060892247..00000000000
--- a/externals/g3dlite/G3D.lib/source/ThreadSet.cpp
+++ /dev/null
@@ -1,147 +0,0 @@
-#include "G3D/ThreadSet.h"
-
-namespace G3D {
-
-int ThreadSet::size() const {
-    ThreadSet* me = const_cast(this);
-    me->m_lock.lock();
-    int s = m_thread.size();
-    me->m_lock.unlock();
-    return s;
-}
-
-
-int ThreadSet::numStarted() const {
-    ThreadSet* me = const_cast(this);
-    me->m_lock.lock();
-    int count = 0;
-    for (int i = 0; i < m_thread.size(); ++i) {
-        if (m_thread[i]->started()) {
-            ++count;
-        }
-    }
-    me->m_lock.unlock();
-    return count;
-}
-    
-    
-void ThreadSet::start() const {
-    ThreadSet* me = const_cast(this);
-    me->m_lock.lock();
-    for (int i = 0; i < m_thread.size(); ++i) {
-        if (! m_thread[i]->started()) {
-            m_thread[i]->start();
-        }
-    }
-    me->m_lock.unlock();
-}
-    
-
-void ThreadSet::terminate() const {
-    ThreadSet* me = const_cast(this);
-    me->m_lock.lock();
-    for (int i = 0; i < m_thread.size(); ++i) {
-        if (m_thread[i]->started()) {
-            m_thread[i]->terminate();
-        }
-    }
-    me->m_lock.unlock();
-}
-    
-
-void ThreadSet::waitForCompletion() const {
-    ThreadSet* me = const_cast(this);
-    me->m_lock.lock();
-    for (int i = 0; i < m_thread.size(); ++i) {
-        if (m_thread[i]->started()) {
-            m_thread[i]->waitForCompletion();
-        }
-    }
-    me->m_lock.unlock();
-}
-    
-
-int ThreadSet::removeCompleted() {
-    m_lock.lock();
-    for (int i = 0; i < m_thread.size(); ++i) {
-        if (m_thread[i]->completed()) {
-            m_thread.fastRemove(i);
-            --i;
-        }
-    }
-    
-    int s = m_thread.size();
-    m_lock.unlock();
-    return s;
-}
-
-
-void ThreadSet::clear() {
-    m_lock.lock();
-    m_thread.clear();
-    m_lock.unlock();
-}
-    
-
-int ThreadSet::insert(const ThreadRef& t) {
-    m_lock.lock();
-    bool found = false;
-    for (int i = 0; i < m_thread.size() && ! found; ++i) {
-        found = (m_thread[i] == t);
-    }
-    if (! found) {
-        m_thread.append(t);
-    }
-    int s = m_thread.size();
-    m_lock.unlock();
-    return s;
-}
-    
-
-bool ThreadSet::remove(const ThreadRef& t) {
-    m_lock.lock();
-    bool found = false;
-    for (int i = 0; i < m_thread.size() && ! found; ++i) {
-        found = (m_thread[i] == t);
-        if (found) {
-            m_thread.fastRemove(i);
-        }
-    }
-    m_lock.unlock();
-    return found;
-}
-    
-
-bool ThreadSet::contains(const ThreadRef& t) const {
-    ThreadSet* me = const_cast(this);
-    me->m_lock.lock();
-    bool found = false;
-    for (int i = 0; i < m_thread.size() && ! found; ++i) {
-        found = (m_thread[i] == t);
-    }
-    me->m_lock.unlock();
-    return found;
-}
-
-   
-ThreadSet::Iterator ThreadSet::begin() {
-    return m_thread.begin();
-}
-    
-
-ThreadSet::Iterator ThreadSet::end() {
-    return m_thread.end();
-}
-    
-
-ThreadSet::ConstIterator ThreadSet::begin() const {
-    return m_thread.begin();
-}
-    
-    
-ThreadSet::ConstIterator ThreadSet::end() const {
-    return m_thread.end();
-}
-
-
-} // namespace G3D
diff --git a/externals/g3dlite/G3D.lib/source/Triangle.cpp b/externals/g3dlite/G3D.lib/source/Triangle.cpp
deleted file mode 100644
index ad264b1f72a..00000000000
--- a/externals/g3dlite/G3D.lib/source/Triangle.cpp
+++ /dev/null
@@ -1,135 +0,0 @@
-/**
- @file Triangle.cpp
- 
- @maintainer Morgan McGuire, graphics3d.com
- 
- @created 2001-04-06
- @edited  2006-01-20
-
- Copyright 2000-2006, Morgan McGuire.
- All rights reserved.
- */
-
-#include "G3D/platform.h"
-#include "G3D/Triangle.h"
-#include "G3D/Plane.h"
-#include "G3D/BinaryInput.h"
-#include "G3D/BinaryOutput.h"
-#include "G3D/debugAssert.h"
-#include "G3D/AABox.h"
-
-namespace G3D {
-
-    
-void Triangle::init(const Vector3& v0, const Vector3& v1, const Vector3& v2) {
-
-    _plane = Plane(v0, v1, v2);
-    _vertex[0] = v0;
-    _vertex[1] = v1;
-    _vertex[2] = v2;
-
-    static int next[] = {1,2,0};
-
-    for (int i = 0; i < 3; ++i) {
-        const Vector3& e  = _vertex[next[i]] - _vertex[i];
-        edgeMagnitude[i]  = e.magnitude();
-
-        if (edgeMagnitude[i] == 0) {
-            edgeDirection[i] = Vector3::zero();
-        } else {
-            edgeDirection[i] = e / (float)edgeMagnitude[i];
-        }
-    }
-
-    _edge01 = _vertex[1] - _vertex[0];
-    _edge02 = _vertex[2] - _vertex[0];
-
-    _primaryAxis = _plane.normal().primaryAxis();
-    _area = 0.5f * edgeDirection[0].cross(edgeDirection[2]).magnitude() * (edgeMagnitude[0] * edgeMagnitude[2]);
-        //0.5f * (_vertex[1] - _vertex[0]).cross(_vertex[2] - _vertex[0]).dot(_plane.normal());
-}
-
-
-Triangle::Triangle() {
-    init(Vector3::zero(), Vector3::zero(), Vector3::zero());
-}
-    
-
-Triangle::Triangle(const Vector3& v0, const Vector3& v1, const Vector3& v2) {
-    init(v0, v1, v2);
-}
-
-    
-Triangle::~Triangle() {
-}
-
-
-Triangle::Triangle(class BinaryInput& b) {
-    deserialize(b);
-}
-
-
-void Triangle::serialize(class BinaryOutput& b) {
-    _vertex[0].serialize(b);
-    _vertex[1].serialize(b);
-    _vertex[2].serialize(b);
-}
-
-
-void Triangle::deserialize(class BinaryInput& b) {
-    _vertex[0].deserialize(b);
-    _vertex[1].deserialize(b);
-    _vertex[2].deserialize(b);
-    init(_vertex[0], _vertex[1], _vertex[2]);
-}
-
-
-float Triangle::area() const {
-    return _area;
-}
-
-
-const Vector3& Triangle::normal() const {
-    return _plane.normal();
-}
-
-
-const Plane& Triangle::plane() const {
-    return _plane;
-}
-
-
-Vector3 Triangle::center() const {
-    return (_vertex[0] + _vertex[1] + _vertex[2]) / 3.0;
-}
-
-Vector3 Triangle::randomPoint() const {
-    // Choose a random point in the parallelogram
-
-    float s = uniformRandom();
-    float t = uniformRandom();
-
-    if (t > 1.0f - s) {
-        // Outside the triangle; reflect about the
-        // diagonal of the parallelogram
-        t = 1.0f - t;
-        s = 1.0f - s;
-    }
-
-    return _edge01 * s + _edge02 * t + _vertex[0];
-}
-
-
-void Triangle::getBounds(AABox& out) const {
-    Vector3 lo = _vertex[0];
-    Vector3 hi = lo;
-
-    for (int i = 1; i < 3; ++i) {
-        lo = lo.min(_vertex[i]);
-        hi = hi.max(_vertex[i]);
-    }
-
-    out = AABox(lo, hi);
-}
-
-} // G3D
diff --git a/externals/g3dlite/G3D.lib/source/UprightFrame.cpp b/externals/g3dlite/G3D.lib/source/UprightFrame.cpp
deleted file mode 100644
index 78b2c0bb0bb..00000000000
--- a/externals/g3dlite/G3D.lib/source/UprightFrame.cpp
+++ /dev/null
@@ -1,132 +0,0 @@
-/**
-  @file UprightFrame.cpp
-  Box class
-
-  @maintainer Morgan McGuire, matrix@graphics3d.com
-
-  @created 2007-05-02
-  @edited  2007-05-05
-*/
-
-#include "G3D/UprightFrame.h"
-#include "G3D/BinaryInput.h"
-#include "G3D/BinaryOutput.h"
-
-namespace G3D {
-
-UprightFrame::UprightFrame(const CoordinateFrame& cframe) {
-    Vector3 look = cframe.lookVector();
-
-    yaw = G3D::pi() + atan2(look.x, look.z);
-    pitch = asin(look.y);
-
-    translation = cframe.translation;
-}
-
-    
-CoordinateFrame UprightFrame::toCoordinateFrame() const {
-    CoordinateFrame cframe;
-
-    Matrix3 P(Matrix3::fromAxisAngle(Vector3::unitX(), pitch));
-    Matrix3 Y(Matrix3::fromAxisAngle(Vector3::unitY(), yaw));
-
-    cframe.rotation = Y * P;
-    cframe.translation = translation;
-
-    return cframe;
-}
-
-
-UprightFrame UprightFrame::operator+(const UprightFrame& other) const {
-    return UprightFrame(translation + other.translation, pitch + other.pitch, yaw + other.yaw);
-}
-
-
-UprightFrame UprightFrame::operator*(const float k) const {
-    return UprightFrame(translation * k, pitch * k, yaw * k);
-}
-
-
-void UprightFrame::unwrapYaw(UprightFrame* a, int N) {
-    // Use the first point to establish the wrapping convention
-    for (int i = 1; i < N; ++i) {
-        const float prev = a[i - 1].yaw;
-        float& cur = a[i].yaw;
-
-        // No two angles should be more than pi (i.e., 180-degrees) apart.  
-        if (abs(cur - prev) > G3D::pi()) {
-            // These angles must have wrapped at zero, causing them
-            // to be interpolated the long way.
-
-            // Find canonical [0, 2pi] versions of these numbers
-            float p = wrap(prev, twoPi());
-            float c = wrap(cur, twoPi());
-            
-            // Find the difference -pi < diff < pi between the current and previous values
-            float diff = c - p;
-            if (diff < -G3D::pi()) {
-                diff += twoPi();
-            } else if (diff > G3D::pi()) {
-                diff -= twoPi();
-            } 
-
-            // Offset the current from the previous by the difference
-            // between them.
-            cur = prev + diff;
-        }
-    }
-}
-
-
-void UprightFrame::serialize(class BinaryOutput& b) const {
-    translation.serialize(b);
-    b.writeFloat32(pitch);
-    b.writeFloat32(yaw);
-}
-
-
-void UprightFrame::deserialize(class BinaryInput& b) {
-    translation.deserialize(b);
-    pitch = b.readFloat32();
-    yaw = b.readFloat32();
-}
-
-
-void UprightSpline::serialize(class BinaryOutput& b) const {
-    b.writeBool8(cyclic);
-
-    b.writeInt32(control.size());
-    for (int i = 0; i < control.size(); ++i) {
-        control[i].serialize(b);
-    }
-    b.writeInt32(time.size());
-    for (int i = 0; i < time.size(); ++i) {
-        b.writeFloat32(time[i]);
-    }
-}
-
-
-void UprightSpline::deserialize(class BinaryInput& b) {
-    cyclic = b.readBool8();
-
-    control.resize(b.readInt32());
-    for (int i = 0; i < control.size(); ++i) {
-        control[i].deserialize(b);
-    }
-
-    if (b.hasMore()) {
-        time.resize(b.readInt32());
-        for (int i = 0; i < time.size(); ++i) {
-            time[i] = b.readFloat32();
-        }
-        debugAssert(time.size() == control.size());
-    } else {
-        // Import legacy path
-        time.resize(control.size());
-        for (int i = 0; i < time.size(); ++i) {
-            time[i] = i;
-        }
-    }
-}
-
-}
diff --git a/externals/g3dlite/G3D.lib/source/Vector2.cpp b/externals/g3dlite/G3D.lib/source/Vector2.cpp
deleted file mode 100644
index 6b7f96a764e..00000000000
--- a/externals/g3dlite/G3D.lib/source/Vector2.cpp
+++ /dev/null
@@ -1,211 +0,0 @@
-/**
- @file Vector2.cpp
- 
- 2D vector class, used for texture coordinates primarily.
- 
- @maintainer Morgan McGuire, matrix@graphics3d.com
- 
- @cite Portions based on Dave Eberly'x Magic Software Library
-  at http://www.magic-software.com
- 
- @created 2001-06-02
- @edited  2006-01-16
- */
-
-#include "G3D/platform.h"
-#include 
-#include "G3D/Vector2.h"
-#include "G3D/g3dmath.h"
-#include "G3D/format.h"
-#include "G3D/BinaryInput.h"
-#include "G3D/BinaryOutput.h"
-#include "G3D/TextInput.h"
-#include "G3D/TextOutput.h"
-
-namespace G3D {
-
-const Vector2& Vector2::zero() {
-    static Vector2 v(0, 0);
-    return v;
-}
-
-const Vector2& Vector2::unitX() {
-    static Vector2 v(1, 0);
-    return v;
-}
-
-const Vector2& Vector2::unitY() {
-    static Vector2 v(0, 1);
-    return v;
-}
-
-const Vector2& Vector2::inf() { 
-	static Vector2 v((float)G3D::inf(), (float)G3D::inf());
-	return v; 
-}
-
-
-const Vector2& Vector2::nan() { 
-	static Vector2 v((float)G3D::nan(), (float)G3D::nan()); 
-	return v; 
-}
-
-
-const Vector2& Vector2::minFinite() {
-	static Vector2 v(-FLT_MAX, -FLT_MAX); 
-	return v; 
-}
-
-
-const Vector2& Vector2::maxFinite() {
-	static Vector2 v(FLT_MAX, FLT_MAX); 
-	return v; 
-}
-
-
-size_t Vector2::hashCode() const {
-    unsigned int xhash = (*(int*)(void*)(&x));
-    unsigned int yhash = (*(int*)(void*)(&y));
-
-    return xhash + (yhash * 37);
-}
-
-
-Vector2::Vector2(BinaryInput& b) {
-    deserialize(b);
-}
-
-
-void Vector2::deserialize(BinaryInput& b) {
-    x = b.readFloat32();
-    y = b.readFloat32();
-}
-
-
-void Vector2::serialize(BinaryOutput& b) const {
-    b.writeFloat32(x);
-    b.writeFloat32(y);
-}
-
-
-void Vector2::deserialize(TextInput& t) {
-    t.readSymbol("(");
-    x = (float)t.readNumber();
-    t.readSymbol(",");
-    y = (float)t.readNumber();
-    t.readSymbol(")");
-}
-
-
-void Vector2::serialize(TextOutput& t) const {
-   t.writeSymbol("(");
-   t.writeNumber(x);
-   t.writeSymbol(",");
-   t.writeNumber(y);
-   t.writeSymbol(")");
-}
-
-//----------------------------------------------------------------------------
-
-Vector2 Vector2::random() {
-    Vector2 result;
-
-    do {
-        result = Vector2(uniformRandom(-1, 1), uniformRandom(-1, 1));
-
-    } while (result.squaredLength() >= 1.0f);
-
-    result.unitize();
-
-    return result;
-}
-
-//----------------------------------------------------------------------------
-Vector2 Vector2::operator/ (float fScalar) const {
-    Vector2 kQuot;
-
-    if ( fScalar != 0.0f ) {
-		float fInvScalar = 1.0f / fScalar;
-        kQuot.x = fInvScalar * x;
-        kQuot.y = fInvScalar * y;
-        return kQuot;
-    } else {
-        return Vector2::inf();
-    }
-}
-
-//----------------------------------------------------------------------------
-Vector2& Vector2::operator/= (float fScalar) {
-    if (fScalar != 0.0f) {
-		float fInvScalar = 1.0f / fScalar;
-        x *= fInvScalar;
-        y *= fInvScalar;
-    } else {
-        x = (float)G3D::inf();
-        y = (float)G3D::inf();
-    }
-
-    return *this;
-}
-
-//----------------------------------------------------------------------------
-float Vector2::unitize (float fTolerance) {
-	float fLength = length();
-
-    if (fLength > fTolerance) {
-		float fInvLength = 1.0f / fLength;
-        x *= fInvLength;
-        y *= fInvLength;
-    } else {
-        fLength = 0.0;
-    }
-
-    return fLength;
-}
-
-//----------------------------------------------------------------------------
-
-std::string Vector2::toString() const {
-    return G3D::format("(%g, %g)", x, y);
-}
-
-// 2-char swizzles
-
-Vector2 Vector2::xx() const  { return Vector2       (x, x); }
-Vector2 Vector2::yx() const  { return Vector2       (y, x); }
-Vector2 Vector2::xy() const  { return Vector2       (x, y); }
-Vector2 Vector2::yy() const  { return Vector2       (y, y); }
-
-// 3-char swizzles
-
-Vector3 Vector2::xxx() const  { return Vector3       (x, x, x); }
-Vector3 Vector2::yxx() const  { return Vector3       (y, x, x); }
-Vector3 Vector2::xyx() const  { return Vector3       (x, y, x); }
-Vector3 Vector2::yyx() const  { return Vector3       (y, y, x); }
-Vector3 Vector2::xxy() const  { return Vector3       (x, x, y); }
-Vector3 Vector2::yxy() const  { return Vector3       (y, x, y); }
-Vector3 Vector2::xyy() const  { return Vector3       (x, y, y); }
-Vector3 Vector2::yyy() const  { return Vector3       (y, y, y); }
-
-// 4-char swizzles
-
-Vector4 Vector2::xxxx() const  { return Vector4       (x, x, x, x); }
-Vector4 Vector2::yxxx() const  { return Vector4       (y, x, x, x); }
-Vector4 Vector2::xyxx() const  { return Vector4       (x, y, x, x); }
-Vector4 Vector2::yyxx() const  { return Vector4       (y, y, x, x); }
-Vector4 Vector2::xxyx() const  { return Vector4       (x, x, y, x); }
-Vector4 Vector2::yxyx() const  { return Vector4       (y, x, y, x); }
-Vector4 Vector2::xyyx() const  { return Vector4       (x, y, y, x); }
-Vector4 Vector2::yyyx() const  { return Vector4       (y, y, y, x); }
-Vector4 Vector2::xxxy() const  { return Vector4       (x, x, x, y); }
-Vector4 Vector2::yxxy() const  { return Vector4       (y, x, x, y); }
-Vector4 Vector2::xyxy() const  { return Vector4       (x, y, x, y); }
-Vector4 Vector2::yyxy() const  { return Vector4       (y, y, x, y); }
-Vector4 Vector2::xxyy() const  { return Vector4       (x, x, y, y); }
-Vector4 Vector2::yxyy() const  { return Vector4       (y, x, y, y); }
-Vector4 Vector2::xyyy() const  { return Vector4       (x, y, y, y); }
-Vector4 Vector2::yyyy() const  { return Vector4       (y, y, y, y); }
-
-
-
-} // namespace
diff --git a/externals/g3dlite/G3D.lib/source/Vector2int16.cpp b/externals/g3dlite/G3D.lib/source/Vector2int16.cpp
deleted file mode 100644
index 04efee2b4b7..00000000000
--- a/externals/g3dlite/G3D.lib/source/Vector2int16.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- @file Vector2int16.cpp
- 
- @author Morgan McGuire, matrix@graphics3d.com
-  
- @created 2003-08-09
- @edited  2006-01-29
- */
-
-#include "G3D/platform.h"
-#include "G3D/g3dmath.h"
-#include "G3D/Vector2int16.h"
-#include "G3D/Vector2.h"
-#include "G3D/BinaryInput.h"
-#include "G3D/BinaryOutput.h"
-
-namespace G3D {
-
-Vector2int16::Vector2int16(const class Vector2& v) {
-    x = (int16)iFloor(v.x + 0.5);
-    y = (int16)iFloor(v.y + 0.5);
-}
-
-
-Vector2int16::Vector2int16(class BinaryInput& bi) {
-    deserialize(bi);
-}
-
-
-void Vector2int16::serialize(class BinaryOutput& bo) const {
-    bo.writeInt16(x);
-    bo.writeInt16(y);
-}
-
-
-void Vector2int16::deserialize(class BinaryInput& bi) {
-    x = bi.readInt16();
-    y = bi.readInt16();
-}
-
-
-Vector2int16 Vector2int16::clamp(const Vector2int16& lo, const Vector2int16& hi) {
-    return Vector2int16(iClamp(x, lo.x, hi.x), iClamp(y, lo.y, hi.y));
-}
-
-
-}
diff --git a/externals/g3dlite/G3D.lib/source/Vector3.cpp b/externals/g3dlite/G3D.lib/source/Vector3.cpp
deleted file mode 100644
index bc52640d297..00000000000
--- a/externals/g3dlite/G3D.lib/source/Vector3.cpp
+++ /dev/null
@@ -1,493 +0,0 @@
-/**
- @file Vector3.cpp
- 
- 3D vector class
- 
- @maintainer Morgan McGuire, matrix@graphics3d.com
- 
- @cite Portions based on Dave Eberly's Magic Software Library at http://www.magic-software.com
- 
- @created 2001-06-02
- @edited  2006-01-30
- */
-
-#include 
-#include 
-#include "G3D/Vector3.h"
-#include "G3D/g3dmath.h"
-#include "G3D/stringutils.h"
-#include "G3D/BinaryInput.h"
-#include "G3D/BinaryOutput.h"
-#include "G3D/TextInput.h"
-#include "G3D/TextOutput.h"
-#include "G3D/Vector3int16.h"
-#include "G3D/Matrix3.h"
-#include "G3D/Vector2.h"
-#include "G3D/Vector4int8.h"
- 
-namespace G3D {
-
-Vector3 Vector3::dummy;
-
-
-Vector3::Vector3(const Vector4int8& v) : x(v.x / 127.0f), y(v.y / 127.0f), z(v.z / 127.0f) {}
-
-Vector3::Vector3(const class Vector2& v, float _z) : x(v.x), y(v.y), z(_z) {
-}
-
-
-Vector3::Axis Vector3::primaryAxis() const {
-    
-    Axis a = X_AXIS;
-
-    double nx = abs(x);
-    double ny = abs(y);
-    double nz = abs(z);
-
-    if (nx > ny) {
-        if (nx > nz) {
-            a = X_AXIS;
-        } else {
-            a = Z_AXIS;
-        }
-    } else {
-        if (ny > nz) {
-            a = Y_AXIS;
-        } else {
-            a = Z_AXIS;
-        }
-    }
-
-    return a;
-}
-
-
-size_t Vector3::hashCode() const {
-    unsigned int xhash = (*(int*)(void*)(&x));
-    unsigned int yhash = (*(int*)(void*)(&y));
-    unsigned int zhash = (*(int*)(void*)(&z));
-
-    return xhash + (yhash * 37) + (zhash * 101);
-}
-
-std::ostream& operator<<(std::ostream& os, const Vector3& v) {
-    return os << v.toString();
-}
-
-
-//----------------------------------------------------------------------------
-
-double frand() {
-    return rand() / (double) RAND_MAX;
-}
-
-Vector3::Vector3(TextInput& t) {
-	deserialize(t);
-}
-
-Vector3::Vector3(BinaryInput& b) {
-    deserialize(b);
-}
-
-
-Vector3::Vector3(const class Vector3int16& v) {
-    x = v.x;
-    y = v.y;
-    z = v.z;
-}
-
-
-void Vector3::deserialize(BinaryInput& b) {
-    x = b.readFloat32();
-    y = b.readFloat32();
-    z = b.readFloat32();
-}
-
-
-void Vector3::deserialize(TextInput& t) {
-    t.readSymbol("(");
-    x = (float)t.readNumber();
-    t.readSymbol(",");
-    y = (float)t.readNumber();
-    t.readSymbol(",");
-    z = (float)t.readNumber();
-    t.readSymbol(")");
-}
-
-
-void Vector3::serialize(TextOutput& t) const {
-   t.writeSymbol("(");
-   t.writeNumber(x);
-   t.writeSymbol(",");
-   t.writeNumber(y);
-   t.writeSymbol(",");
-   t.writeNumber(z);
-   t.writeSymbol(")");
-}
-
-
-void Vector3::serialize(BinaryOutput& b) const {
-    b.writeFloat32(x);
-    b.writeFloat32(y);
-    b.writeFloat32(z);
-}
-
-
-Vector3 Vector3::random() {
-    Vector3 result;
-
-    do {
-        result = Vector3(uniformRandom(-1.0, 1.0), 
-                         uniformRandom(-1.0, 1.0),
-                         uniformRandom(-1.0, 1.0));
-    } while (result.squaredMagnitude() >= 1.0f);
-
-    result.unitize();
-
-    return result;
-}
-
-//----------------------------------------------------------------------------
-Vector3 Vector3::operator/ (float fScalar) const {
-    Vector3 kQuot;
-
-    if ( fScalar != 0.0 ) {
-		float fInvScalar = 1.0f / fScalar;
-        kQuot.x = fInvScalar * x;
-        kQuot.y = fInvScalar * y;
-        kQuot.z = fInvScalar * z;
-        return kQuot;
-    } else {
-        return Vector3::inf();
-    }
-}
-
-//----------------------------------------------------------------------------
-Vector3& Vector3::operator/= (float fScalar) {
-    if (fScalar != 0.0) {
-		float fInvScalar = 1.0f / fScalar;
-        x *= fInvScalar;
-        y *= fInvScalar;
-        z *= fInvScalar;
-    } else {
-        x = (float)G3D::inf();
-        y = (float)G3D::inf();
-        z = (float)G3D::inf();
-    }
-
-    return *this;
-}
-
-//----------------------------------------------------------------------------
-float Vector3::unitize (float fTolerance) {
-	float fMagnitude = magnitude();
-
-    if (fMagnitude > fTolerance) {
-		float fInvMagnitude = 1.0f / fMagnitude;
-        x *= fInvMagnitude;
-        y *= fInvMagnitude;
-        z *= fInvMagnitude;
-    } else {
-        fMagnitude = 0.0f;
-    }
-
-    return fMagnitude;
-}
-
-//----------------------------------------------------------------------------
-
-Vector3 Vector3::reflectAbout(const Vector3& normal) const {
-
-    Vector3 out;
-
-    Vector3 N = normal.direction();
-
-    // 2 * normal.dot(this) * normal - this
-    return N * 2 * this->dot(N) - *this;
-}
-
-//----------------------------------------------------------------------------
-Vector3 Vector3::cosRandom(const Vector3& normal) {
-    double e1 = G3D::uniformRandom(0, 1);
-    double e2 = G3D::uniformRandom(0, 1);
-
-    // Angle from normal
-    double theta = acos(sqrt(e1));
-
-    // Angle about normal
-    double phi   = 2 * pi() * e2;
-
-    // Make a coordinate system
-    Vector3 U = normal.direction();
-    Vector3 V = Vector3::unitX();
-
-    if (abs(U.dot(V)) > .9) {
-        V = Vector3::unitY();
-    }
-
-    Vector3 W = U.cross(V).direction();
-    V = W.cross(U);
-
-    // Convert to rectangular form
-    return cos(theta) * U + sin(theta) * (cos(phi) * V + sin(phi) * W);
-}
-//----------------------------------------------------------------------------
-
-Vector3 Vector3::hemiRandom(const Vector3& normal) {
-    Vector3 V = Vector3::random();
-
-    if (V.dot(normal) < 0) {
-        return -V;
-    } else {
-        return V;
-    }
-}
-
-//----------------------------------------------------------------------------
-
-Vector3 Vector3::reflectionDirection(const Vector3& normal) const {
-    return -reflectAbout(normal).direction();
-}
-
-//----------------------------------------------------------------------------
-
-Vector3 Vector3::refractionDirection(
-    const Vector3&  normal,
-    float           iInside,
-    float           iOutside) const {
-
-    // From pg. 24 of Henrik Wann Jensen. Realistic Image Synthesis
-    // Using Photon Mapping.  AK Peters. ISBN: 1568811470. July 2001.
-
-    // Invert the directions from Wann Jensen's formulation
-    // and normalize the vectors.
-    const Vector3 W = -direction();
-    Vector3 N = normal.direction();
-
-    float h1 = iOutside;
-    float h2 = iInside;
-
-    if (normal.dot(*this) > 0.0f) {
-        h1 = iInside;
-        h2 = iOutside;
-        N  = -N;
-    }
-
-    const float hRatio = h1 / h2;
-    const float WdotN = W.dot(N);
-
-    float det = 1.0f - (float)square(hRatio) * (1.0f - (float)square(WdotN));
-
-    if (det < 0) {
-        // Total internal reflection
-        return Vector3::zero();
-    } else {
-        return -hRatio * (W - WdotN * N) - N * sqrt(det);
-    }
-}
-
-//----------------------------------------------------------------------------
-void Vector3::orthonormalize (Vector3 akVector[3]) {
-    // If the input vectors are v0, v1, and v2, then the Gram-Schmidt
-    // orthonormalization produces vectors u0, u1, and u2 as follows,
-    //
-    //   u0 = v0/|v0|
-    //   u1 = (v1-(u0*v1)u0)/|v1-(u0*v1)u0|
-    //   u2 = (v2-(u0*v2)u0-(u1*v2)u1)/|v2-(u0*v2)u0-(u1*v2)u1|
-    //
-    // where |A| indicates length of vector A and A*B indicates dot
-    // product of vectors A and B.
-
-    // compute u0
-    akVector[0].unitize();
-
-    // compute u1
-	float fDot0 = akVector[0].dot(akVector[1]);
-    akVector[1] -= akVector[0] * fDot0;
-    akVector[1].unitize();
-
-    // compute u2
-	float fDot1 = akVector[1].dot(akVector[2]);
-    fDot0 = akVector[0].dot(akVector[2]);
-    akVector[2] -= akVector[0] * fDot0 + akVector[1] * fDot1;
-    akVector[2].unitize();
-}
-
-//----------------------------------------------------------------------------
-void Vector3::generateOrthonormalBasis (Vector3& rkU, Vector3& rkV,
-                                        Vector3& rkW, bool bUnitLengthW) {
-    if ( !bUnitLengthW )
-        rkW.unitize();
-
-    if ( G3D::abs(rkW.x) >= G3D::abs(rkW.y)
-            && G3D::abs(rkW.x) >= G3D::abs(rkW.z) ) {
-        rkU.x = -rkW.y;
-        rkU.y = + rkW.x;
-        rkU.z = 0.0;
-    } else {
-        rkU.x = 0.0;
-        rkU.y = + rkW.z;
-        rkU.z = -rkW.y;
-    }
-
-    rkU.unitize();
-    rkV = rkW.cross(rkU);
-}
-
-//----------------------------------------------------------------------------
-
-std::string Vector3::toString() const {
-    return G3D::format("(%g, %g, %g)", x, y, z);
-}
-
-
-//----------------------------------------------------------------------------
-
-Matrix3 Vector3::cross() const {
-    return Matrix3( 0, -z,  y,
-                    z,  0, -x,
-                   -y,  x,  0);
-}
-
-
-void serialize(const Vector3::Axis& a, class BinaryOutput& bo) {
-    bo.writeUInt8((uint8)a);
-}
-
-void deserialize(Vector3::Axis& a, class BinaryInput& bi) {
-    a = (Vector3::Axis)bi.readUInt8();
-}
-
-//----------------------------------------------------------------------------
-// 2-char swizzles
-
-Vector2 Vector3::xx() const  { return Vector2       (x, x); }
-Vector2 Vector3::yx() const  { return Vector2       (y, x); }
-Vector2 Vector3::zx() const  { return Vector2       (z, x); }
-Vector2 Vector3::xy() const  { return Vector2       (x, y); }
-Vector2 Vector3::yy() const  { return Vector2       (y, y); }
-Vector2 Vector3::zy() const  { return Vector2       (z, y); }
-Vector2 Vector3::xz() const  { return Vector2       (x, z); }
-Vector2 Vector3::yz() const  { return Vector2       (y, z); }
-Vector2 Vector3::zz() const  { return Vector2       (z, z); }
-
-// 3-char swizzles
-
-Vector3 Vector3::xxx() const  { return Vector3       (x, x, x); }
-Vector3 Vector3::yxx() const  { return Vector3       (y, x, x); }
-Vector3 Vector3::zxx() const  { return Vector3       (z, x, x); }
-Vector3 Vector3::xyx() const  { return Vector3       (x, y, x); }
-Vector3 Vector3::yyx() const  { return Vector3       (y, y, x); }
-Vector3 Vector3::zyx() const  { return Vector3       (z, y, x); }
-Vector3 Vector3::xzx() const  { return Vector3       (x, z, x); }
-Vector3 Vector3::yzx() const  { return Vector3       (y, z, x); }
-Vector3 Vector3::zzx() const  { return Vector3       (z, z, x); }
-Vector3 Vector3::xxy() const  { return Vector3       (x, x, y); }
-Vector3 Vector3::yxy() const  { return Vector3       (y, x, y); }
-Vector3 Vector3::zxy() const  { return Vector3       (z, x, y); }
-Vector3 Vector3::xyy() const  { return Vector3       (x, y, y); }
-Vector3 Vector3::yyy() const  { return Vector3       (y, y, y); }
-Vector3 Vector3::zyy() const  { return Vector3       (z, y, y); }
-Vector3 Vector3::xzy() const  { return Vector3       (x, z, y); }
-Vector3 Vector3::yzy() const  { return Vector3       (y, z, y); }
-Vector3 Vector3::zzy() const  { return Vector3       (z, z, y); }
-Vector3 Vector3::xxz() const  { return Vector3       (x, x, z); }
-Vector3 Vector3::yxz() const  { return Vector3       (y, x, z); }
-Vector3 Vector3::zxz() const  { return Vector3       (z, x, z); }
-Vector3 Vector3::xyz() const  { return Vector3       (x, y, z); }
-Vector3 Vector3::yyz() const  { return Vector3       (y, y, z); }
-Vector3 Vector3::zyz() const  { return Vector3       (z, y, z); }
-Vector3 Vector3::xzz() const  { return Vector3       (x, z, z); }
-Vector3 Vector3::yzz() const  { return Vector3       (y, z, z); }
-Vector3 Vector3::zzz() const  { return Vector3       (z, z, z); }
-
-// 4-char swizzles
-
-Vector4 Vector3::xxxx() const  { return Vector4       (x, x, x, x); }
-Vector4 Vector3::yxxx() const  { return Vector4       (y, x, x, x); }
-Vector4 Vector3::zxxx() const  { return Vector4       (z, x, x, x); }
-Vector4 Vector3::xyxx() const  { return Vector4       (x, y, x, x); }
-Vector4 Vector3::yyxx() const  { return Vector4       (y, y, x, x); }
-Vector4 Vector3::zyxx() const  { return Vector4       (z, y, x, x); }
-Vector4 Vector3::xzxx() const  { return Vector4       (x, z, x, x); }
-Vector4 Vector3::yzxx() const  { return Vector4       (y, z, x, x); }
-Vector4 Vector3::zzxx() const  { return Vector4       (z, z, x, x); }
-Vector4 Vector3::xxyx() const  { return Vector4       (x, x, y, x); }
-Vector4 Vector3::yxyx() const  { return Vector4       (y, x, y, x); }
-Vector4 Vector3::zxyx() const  { return Vector4       (z, x, y, x); }
-Vector4 Vector3::xyyx() const  { return Vector4       (x, y, y, x); }
-Vector4 Vector3::yyyx() const  { return Vector4       (y, y, y, x); }
-Vector4 Vector3::zyyx() const  { return Vector4       (z, y, y, x); }
-Vector4 Vector3::xzyx() const  { return Vector4       (x, z, y, x); }
-Vector4 Vector3::yzyx() const  { return Vector4       (y, z, y, x); }
-Vector4 Vector3::zzyx() const  { return Vector4       (z, z, y, x); }
-Vector4 Vector3::xxzx() const  { return Vector4       (x, x, z, x); }
-Vector4 Vector3::yxzx() const  { return Vector4       (y, x, z, x); }
-Vector4 Vector3::zxzx() const  { return Vector4       (z, x, z, x); }
-Vector4 Vector3::xyzx() const  { return Vector4       (x, y, z, x); }
-Vector4 Vector3::yyzx() const  { return Vector4       (y, y, z, x); }
-Vector4 Vector3::zyzx() const  { return Vector4       (z, y, z, x); }
-Vector4 Vector3::xzzx() const  { return Vector4       (x, z, z, x); }
-Vector4 Vector3::yzzx() const  { return Vector4       (y, z, z, x); }
-Vector4 Vector3::zzzx() const  { return Vector4       (z, z, z, x); }
-Vector4 Vector3::xxxy() const  { return Vector4       (x, x, x, y); }
-Vector4 Vector3::yxxy() const  { return Vector4       (y, x, x, y); }
-Vector4 Vector3::zxxy() const  { return Vector4       (z, x, x, y); }
-Vector4 Vector3::xyxy() const  { return Vector4       (x, y, x, y); }
-Vector4 Vector3::yyxy() const  { return Vector4       (y, y, x, y); }
-Vector4 Vector3::zyxy() const  { return Vector4       (z, y, x, y); }
-Vector4 Vector3::xzxy() const  { return Vector4       (x, z, x, y); }
-Vector4 Vector3::yzxy() const  { return Vector4       (y, z, x, y); }
-Vector4 Vector3::zzxy() const  { return Vector4       (z, z, x, y); }
-Vector4 Vector3::xxyy() const  { return Vector4       (x, x, y, y); }
-Vector4 Vector3::yxyy() const  { return Vector4       (y, x, y, y); }
-Vector4 Vector3::zxyy() const  { return Vector4       (z, x, y, y); }
-Vector4 Vector3::xyyy() const  { return Vector4       (x, y, y, y); }
-Vector4 Vector3::yyyy() const  { return Vector4       (y, y, y, y); }
-Vector4 Vector3::zyyy() const  { return Vector4       (z, y, y, y); }
-Vector4 Vector3::xzyy() const  { return Vector4       (x, z, y, y); }
-Vector4 Vector3::yzyy() const  { return Vector4       (y, z, y, y); }
-Vector4 Vector3::zzyy() const  { return Vector4       (z, z, y, y); }
-Vector4 Vector3::xxzy() const  { return Vector4       (x, x, z, y); }
-Vector4 Vector3::yxzy() const  { return Vector4       (y, x, z, y); }
-Vector4 Vector3::zxzy() const  { return Vector4       (z, x, z, y); }
-Vector4 Vector3::xyzy() const  { return Vector4       (x, y, z, y); }
-Vector4 Vector3::yyzy() const  { return Vector4       (y, y, z, y); }
-Vector4 Vector3::zyzy() const  { return Vector4       (z, y, z, y); }
-Vector4 Vector3::xzzy() const  { return Vector4       (x, z, z, y); }
-Vector4 Vector3::yzzy() const  { return Vector4       (y, z, z, y); }
-Vector4 Vector3::zzzy() const  { return Vector4       (z, z, z, y); }
-Vector4 Vector3::xxxz() const  { return Vector4       (x, x, x, z); }
-Vector4 Vector3::yxxz() const  { return Vector4       (y, x, x, z); }
-Vector4 Vector3::zxxz() const  { return Vector4       (z, x, x, z); }
-Vector4 Vector3::xyxz() const  { return Vector4       (x, y, x, z); }
-Vector4 Vector3::yyxz() const  { return Vector4       (y, y, x, z); }
-Vector4 Vector3::zyxz() const  { return Vector4       (z, y, x, z); }
-Vector4 Vector3::xzxz() const  { return Vector4       (x, z, x, z); }
-Vector4 Vector3::yzxz() const  { return Vector4       (y, z, x, z); }
-Vector4 Vector3::zzxz() const  { return Vector4       (z, z, x, z); }
-Vector4 Vector3::xxyz() const  { return Vector4       (x, x, y, z); }
-Vector4 Vector3::yxyz() const  { return Vector4       (y, x, y, z); }
-Vector4 Vector3::zxyz() const  { return Vector4       (z, x, y, z); }
-Vector4 Vector3::xyyz() const  { return Vector4       (x, y, y, z); }
-Vector4 Vector3::yyyz() const  { return Vector4       (y, y, y, z); }
-Vector4 Vector3::zyyz() const  { return Vector4       (z, y, y, z); }
-Vector4 Vector3::xzyz() const  { return Vector4       (x, z, y, z); }
-Vector4 Vector3::yzyz() const  { return Vector4       (y, z, y, z); }
-Vector4 Vector3::zzyz() const  { return Vector4       (z, z, y, z); }
-Vector4 Vector3::xxzz() const  { return Vector4       (x, x, z, z); }
-Vector4 Vector3::yxzz() const  { return Vector4       (y, x, z, z); }
-Vector4 Vector3::zxzz() const  { return Vector4       (z, x, z, z); }
-Vector4 Vector3::xyzz() const  { return Vector4       (x, y, z, z); }
-Vector4 Vector3::yyzz() const  { return Vector4       (y, y, z, z); }
-Vector4 Vector3::zyzz() const  { return Vector4       (z, y, z, z); }
-Vector4 Vector3::xzzz() const  { return Vector4       (x, z, z, z); }
-Vector4 Vector3::yzzz() const  { return Vector4       (y, z, z, z); }
-Vector4 Vector3::zzzz() const  { return Vector4       (z, z, z, z); }
-
-
-
-
-
-
-} // namespace
diff --git a/externals/g3dlite/G3D.lib/source/Vector3int16.cpp b/externals/g3dlite/G3D.lib/source/Vector3int16.cpp
deleted file mode 100644
index 8d8bb00bbef..00000000000
--- a/externals/g3dlite/G3D.lib/source/Vector3int16.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- @file Vector3int16.cpp
- 
- @author Morgan McGuire, matrix@graphics3d.com
-  
- @created 2003-04-07
- @edited  2006-01-17
- */
-
-#include "G3D/platform.h"
-#include "G3D/g3dmath.h"
-#include "G3D/Vector3int16.h"
-#include "G3D/Vector3.h"
-#include "G3D/BinaryInput.h"
-#include "G3D/BinaryOutput.h"
-#include "G3D/format.h"
-
-namespace G3D {
-
-Vector3int16::Vector3int16(const class Vector3& v) {
-    x = (int16)iFloor(v.x + 0.5);
-    y = (int16)iFloor(v.y + 0.5);
-    z = (int16)iFloor(v.z + 0.5);
-}
-
-
-Vector3int16::Vector3int16(class BinaryInput& bi) {
-    deserialize(bi);
-}
-
-
-void Vector3int16::serialize(class BinaryOutput& bo) const {
-    bo.writeInt16(x);
-    bo.writeInt16(y);
-    bo.writeInt16(z);
-}
-
-
-void Vector3int16::deserialize(class BinaryInput& bi) {
-    x = bi.readInt16();
-    y = bi.readInt16();
-    z = bi.readInt16();
-}
-
-std::string Vector3int16::toString() const {
-    return G3D::format("(%d, %d, %d)", x, y, z);
-}
-
-}
diff --git a/externals/g3dlite/G3D.lib/source/Vector3int32.cpp b/externals/g3dlite/G3D.lib/source/Vector3int32.cpp
deleted file mode 100644
index 1328ba1aba5..00000000000
--- a/externals/g3dlite/G3D.lib/source/Vector3int32.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- @file Vector3int32.cpp
- 
- @author Morgan McGuire, matrix@graphics3d.com
-  
- @created 2008-07-01
- @edited  2008-07-01
- */
-
-#include "G3D/platform.h"
-#include "G3D/g3dmath.h"
-#include "G3D/Vector3int32.h"
-#include "G3D/Vector3int16.h"
-#include "G3D/Vector3.h"
-#include "G3D/BinaryInput.h"
-#include "G3D/BinaryOutput.h"
-#include "G3D/format.h"
-
-namespace G3D {
-
-Vector3int32::Vector3int32(const class Vector3& v) {
-    x = (int32)iFloor(v.x + 0.5);
-    y = (int32)iFloor(v.y + 0.5);
-    z = (int32)iFloor(v.z + 0.5);
-}
-
-
-Vector3int32::Vector3int32(const class Vector3int16& v) {
-    x = v.x;
-    y = v.y;
-    z = v.z;
-}
-
-
-Vector3int32::Vector3int32(class BinaryInput& bi) {
-    deserialize(bi);
-}
-
-
-void Vector3int32::serialize(class BinaryOutput& bo) const {
-    bo.writeInt32(x);
-    bo.writeInt32(y);
-    bo.writeInt32(z);
-}
-
-
-void Vector3int32::deserialize(class BinaryInput& bi) {
-    x = bi.readInt32();
-    y = bi.readInt32();
-    z = bi.readInt32();
-}
-
-std::string Vector3int32::toString() const {
-    return G3D::format("(%d, %d, %d)", x, y, z);
-}
-
-}
diff --git a/externals/g3dlite/G3D.lib/source/Vector4.cpp b/externals/g3dlite/G3D.lib/source/Vector4.cpp
deleted file mode 100644
index f562f2d6877..00000000000
--- a/externals/g3dlite/G3D.lib/source/Vector4.cpp
+++ /dev/null
@@ -1,475 +0,0 @@
-/**
- @file Vector4.cpp
- 
- @maintainer Morgan McGuire, matrix@graphics3d.com
-  
- @created 2001-07-09
- @edited  2007-02-29
- */
-
-#include 
-#include 
-#include "G3D/Vector4.h"
-#include "G3D/Color4.h"
-#include "G3D/g3dmath.h"
-#include "G3D/stringutils.h"
-#include "G3D/BinaryInput.h"
-#include "G3D/BinaryOutput.h"
-#include "G3D/Vector4int8.h"
-#include "G3D/Matrix4.h"
-
-namespace G3D {
-
-Vector4::Vector4(const Vector4int8& v) : x(v.x / 127.0f), y(v.y / 127.0f), z(v.z / 127.0f), w(v.w / 127.0f) {
-}
-
-size_t Vector4::hashCode() const {
-    unsigned int xhash = (*(int*)(void*)(&x));
-    unsigned int yhash = (*(int*)(void*)(&y));
-    unsigned int zhash = (*(int*)(void*)(&z));
-    unsigned int whash = (*(int*)(void*)(&w));
-
-    return xhash + (yhash * 37) + (zhash * 101) + (whash * 241);
-}
-
-
-Vector4::Vector4(const class Color4& c) {
-    x = c.r;
-    y = c.g;
-    z = c.b;
-    w = c.a;
-}
-
-
-Vector4::Vector4(const Vector2& v1, const Vector2& v2) {
-    x = v1.x;
-    y = v1.y;
-    z = v2.x;
-    w = v2.y;
-}
-
-
-Vector4::Vector4(const Vector2& v1, float fz, float fw) {
-    x = v1.x;
-    y = v1.y;
-    z = fz;
-    w = fw;
-}
-
-Vector4::Vector4(BinaryInput& b) {
-    deserialize(b);
-}
-
-
-void Vector4::deserialize(BinaryInput& b) {
-    x = b.readFloat32();
-    y = b.readFloat32();
-    z = b.readFloat32();
-    w = b.readFloat32();
-}
-
-
-void Vector4::serialize(BinaryOutput& b) const {
-    b.writeFloat32(x);
-    b.writeFloat32(y);
-    b.writeFloat32(z);
-    b.writeFloat32(w);
-}
-
-//----------------------------------------------------------------------------
-
-Vector4 Vector4::operator*(const Matrix4& M) const {
-    Vector4 result;
-    for (int i = 0; i < 4; ++i) {
-        result[i] = 0.0f;
-        for (int j = 0; j < 4; ++j) {
-            result[i] += (*this)[j] * M[j][i];
-        }
-    }
-    return result;
-}
-
-
-Vector4 Vector4::operator/ (float fScalar) const {
-    Vector4 kQuot;
-
-    if ( fScalar != 0.0 ) {
-		float fInvScalar = 1.0f / fScalar;
-        kQuot.x = fInvScalar * x;
-        kQuot.y = fInvScalar * y;
-        kQuot.z = fInvScalar * z;
-        kQuot.w = fInvScalar * w;
-        return kQuot;
-    } else {
-        return Vector4::inf();
-    }
-}
-
-//----------------------------------------------------------------------------
-Vector4& Vector4::operator/= (float fScalar) {
-    if (fScalar != 0.0f) {
-		float fInvScalar = 1.0f / fScalar;
-        x *= fInvScalar;
-        y *= fInvScalar;
-        z *= fInvScalar;
-        w *= fInvScalar;
-    } else {
-		*this = Vector4::inf();
-    }
-
-    return *this;
-}
-
-
-//----------------------------------------------------------------------------
-
-std::string Vector4::toString() const {
-    return G3D::format("(%g, %g, %g, %g)", x, y, z, w);
-}
-// 2-char swizzles
-
-Vector2 Vector4::xx() const  { return Vector2       (x, x); }
-Vector2 Vector4::yx() const  { return Vector2       (y, x); }
-Vector2 Vector4::zx() const  { return Vector2       (z, x); }
-Vector2 Vector4::wx() const  { return Vector2       (w, x); }
-Vector2 Vector4::xy() const  { return Vector2       (x, y); }
-Vector2 Vector4::yy() const  { return Vector2       (y, y); }
-Vector2 Vector4::zy() const  { return Vector2       (z, y); }
-Vector2 Vector4::wy() const  { return Vector2       (w, y); }
-Vector2 Vector4::xz() const  { return Vector2       (x, z); }
-Vector2 Vector4::yz() const  { return Vector2       (y, z); }
-Vector2 Vector4::zz() const  { return Vector2       (z, z); }
-Vector2 Vector4::wz() const  { return Vector2       (w, z); }
-Vector2 Vector4::xw() const  { return Vector2       (x, w); }
-Vector2 Vector4::yw() const  { return Vector2       (y, w); }
-Vector2 Vector4::zw() const  { return Vector2       (z, w); }
-Vector2 Vector4::ww() const  { return Vector2       (w, w); }
-
-// 3-char swizzles
-
-Vector3 Vector4::xxx() const  { return Vector3       (x, x, x); }
-Vector3 Vector4::yxx() const  { return Vector3       (y, x, x); }
-Vector3 Vector4::zxx() const  { return Vector3       (z, x, x); }
-Vector3 Vector4::wxx() const  { return Vector3       (w, x, x); }
-Vector3 Vector4::xyx() const  { return Vector3       (x, y, x); }
-Vector3 Vector4::yyx() const  { return Vector3       (y, y, x); }
-Vector3 Vector4::zyx() const  { return Vector3       (z, y, x); }
-Vector3 Vector4::wyx() const  { return Vector3       (w, y, x); }
-Vector3 Vector4::xzx() const  { return Vector3       (x, z, x); }
-Vector3 Vector4::yzx() const  { return Vector3       (y, z, x); }
-Vector3 Vector4::zzx() const  { return Vector3       (z, z, x); }
-Vector3 Vector4::wzx() const  { return Vector3       (w, z, x); }
-Vector3 Vector4::xwx() const  { return Vector3       (x, w, x); }
-Vector3 Vector4::ywx() const  { return Vector3       (y, w, x); }
-Vector3 Vector4::zwx() const  { return Vector3       (z, w, x); }
-Vector3 Vector4::wwx() const  { return Vector3       (w, w, x); }
-Vector3 Vector4::xxy() const  { return Vector3       (x, x, y); }
-Vector3 Vector4::yxy() const  { return Vector3       (y, x, y); }
-Vector3 Vector4::zxy() const  { return Vector3       (z, x, y); }
-Vector3 Vector4::wxy() const  { return Vector3       (w, x, y); }
-Vector3 Vector4::xyy() const  { return Vector3       (x, y, y); }
-Vector3 Vector4::yyy() const  { return Vector3       (y, y, y); }
-Vector3 Vector4::zyy() const  { return Vector3       (z, y, y); }
-Vector3 Vector4::wyy() const  { return Vector3       (w, y, y); }
-Vector3 Vector4::xzy() const  { return Vector3       (x, z, y); }
-Vector3 Vector4::yzy() const  { return Vector3       (y, z, y); }
-Vector3 Vector4::zzy() const  { return Vector3       (z, z, y); }
-Vector3 Vector4::wzy() const  { return Vector3       (w, z, y); }
-Vector3 Vector4::xwy() const  { return Vector3       (x, w, y); }
-Vector3 Vector4::ywy() const  { return Vector3       (y, w, y); }
-Vector3 Vector4::zwy() const  { return Vector3       (z, w, y); }
-Vector3 Vector4::wwy() const  { return Vector3       (w, w, y); }
-Vector3 Vector4::xxz() const  { return Vector3       (x, x, z); }
-Vector3 Vector4::yxz() const  { return Vector3       (y, x, z); }
-Vector3 Vector4::zxz() const  { return Vector3       (z, x, z); }
-Vector3 Vector4::wxz() const  { return Vector3       (w, x, z); }
-Vector3 Vector4::xyz() const  { return Vector3       (x, y, z); }
-Vector3 Vector4::yyz() const  { return Vector3       (y, y, z); }
-Vector3 Vector4::zyz() const  { return Vector3       (z, y, z); }
-Vector3 Vector4::wyz() const  { return Vector3       (w, y, z); }
-Vector3 Vector4::xzz() const  { return Vector3       (x, z, z); }
-Vector3 Vector4::yzz() const  { return Vector3       (y, z, z); }
-Vector3 Vector4::zzz() const  { return Vector3       (z, z, z); }
-Vector3 Vector4::wzz() const  { return Vector3       (w, z, z); }
-Vector3 Vector4::xwz() const  { return Vector3       (x, w, z); }
-Vector3 Vector4::ywz() const  { return Vector3       (y, w, z); }
-Vector3 Vector4::zwz() const  { return Vector3       (z, w, z); }
-Vector3 Vector4::wwz() const  { return Vector3       (w, w, z); }
-Vector3 Vector4::xxw() const  { return Vector3       (x, x, w); }
-Vector3 Vector4::yxw() const  { return Vector3       (y, x, w); }
-Vector3 Vector4::zxw() const  { return Vector3       (z, x, w); }
-Vector3 Vector4::wxw() const  { return Vector3       (w, x, w); }
-Vector3 Vector4::xyw() const  { return Vector3       (x, y, w); }
-Vector3 Vector4::yyw() const  { return Vector3       (y, y, w); }
-Vector3 Vector4::zyw() const  { return Vector3       (z, y, w); }
-Vector3 Vector4::wyw() const  { return Vector3       (w, y, w); }
-Vector3 Vector4::xzw() const  { return Vector3       (x, z, w); }
-Vector3 Vector4::yzw() const  { return Vector3       (y, z, w); }
-Vector3 Vector4::zzw() const  { return Vector3       (z, z, w); }
-Vector3 Vector4::wzw() const  { return Vector3       (w, z, w); }
-Vector3 Vector4::xww() const  { return Vector3       (x, w, w); }
-Vector3 Vector4::yww() const  { return Vector3       (y, w, w); }
-Vector3 Vector4::zww() const  { return Vector3       (z, w, w); }
-Vector3 Vector4::www() const  { return Vector3       (w, w, w); }
-
-// 4-char swizzles
-
-Vector4 Vector4::xxxx() const  { return Vector4       (x, x, x, x); }
-Vector4 Vector4::yxxx() const  { return Vector4       (y, x, x, x); }
-Vector4 Vector4::zxxx() const  { return Vector4       (z, x, x, x); }
-Vector4 Vector4::wxxx() const  { return Vector4       (w, x, x, x); }
-Vector4 Vector4::xyxx() const  { return Vector4       (x, y, x, x); }
-Vector4 Vector4::yyxx() const  { return Vector4       (y, y, x, x); }
-Vector4 Vector4::zyxx() const  { return Vector4       (z, y, x, x); }
-Vector4 Vector4::wyxx() const  { return Vector4       (w, y, x, x); }
-Vector4 Vector4::xzxx() const  { return Vector4       (x, z, x, x); }
-Vector4 Vector4::yzxx() const  { return Vector4       (y, z, x, x); }
-Vector4 Vector4::zzxx() const  { return Vector4       (z, z, x, x); }
-Vector4 Vector4::wzxx() const  { return Vector4       (w, z, x, x); }
-Vector4 Vector4::xwxx() const  { return Vector4       (x, w, x, x); }
-Vector4 Vector4::ywxx() const  { return Vector4       (y, w, x, x); }
-Vector4 Vector4::zwxx() const  { return Vector4       (z, w, x, x); }
-Vector4 Vector4::wwxx() const  { return Vector4       (w, w, x, x); }
-Vector4 Vector4::xxyx() const  { return Vector4       (x, x, y, x); }
-Vector4 Vector4::yxyx() const  { return Vector4       (y, x, y, x); }
-Vector4 Vector4::zxyx() const  { return Vector4       (z, x, y, x); }
-Vector4 Vector4::wxyx() const  { return Vector4       (w, x, y, x); }
-Vector4 Vector4::xyyx() const  { return Vector4       (x, y, y, x); }
-Vector4 Vector4::yyyx() const  { return Vector4       (y, y, y, x); }
-Vector4 Vector4::zyyx() const  { return Vector4       (z, y, y, x); }
-Vector4 Vector4::wyyx() const  { return Vector4       (w, y, y, x); }
-Vector4 Vector4::xzyx() const  { return Vector4       (x, z, y, x); }
-Vector4 Vector4::yzyx() const  { return Vector4       (y, z, y, x); }
-Vector4 Vector4::zzyx() const  { return Vector4       (z, z, y, x); }
-Vector4 Vector4::wzyx() const  { return Vector4       (w, z, y, x); }
-Vector4 Vector4::xwyx() const  { return Vector4       (x, w, y, x); }
-Vector4 Vector4::ywyx() const  { return Vector4       (y, w, y, x); }
-Vector4 Vector4::zwyx() const  { return Vector4       (z, w, y, x); }
-Vector4 Vector4::wwyx() const  { return Vector4       (w, w, y, x); }
-Vector4 Vector4::xxzx() const  { return Vector4       (x, x, z, x); }
-Vector4 Vector4::yxzx() const  { return Vector4       (y, x, z, x); }
-Vector4 Vector4::zxzx() const  { return Vector4       (z, x, z, x); }
-Vector4 Vector4::wxzx() const  { return Vector4       (w, x, z, x); }
-Vector4 Vector4::xyzx() const  { return Vector4       (x, y, z, x); }
-Vector4 Vector4::yyzx() const  { return Vector4       (y, y, z, x); }
-Vector4 Vector4::zyzx() const  { return Vector4       (z, y, z, x); }
-Vector4 Vector4::wyzx() const  { return Vector4       (w, y, z, x); }
-Vector4 Vector4::xzzx() const  { return Vector4       (x, z, z, x); }
-Vector4 Vector4::yzzx() const  { return Vector4       (y, z, z, x); }
-Vector4 Vector4::zzzx() const  { return Vector4       (z, z, z, x); }
-Vector4 Vector4::wzzx() const  { return Vector4       (w, z, z, x); }
-Vector4 Vector4::xwzx() const  { return Vector4       (x, w, z, x); }
-Vector4 Vector4::ywzx() const  { return Vector4       (y, w, z, x); }
-Vector4 Vector4::zwzx() const  { return Vector4       (z, w, z, x); }
-Vector4 Vector4::wwzx() const  { return Vector4       (w, w, z, x); }
-Vector4 Vector4::xxwx() const  { return Vector4       (x, x, w, x); }
-Vector4 Vector4::yxwx() const  { return Vector4       (y, x, w, x); }
-Vector4 Vector4::zxwx() const  { return Vector4       (z, x, w, x); }
-Vector4 Vector4::wxwx() const  { return Vector4       (w, x, w, x); }
-Vector4 Vector4::xywx() const  { return Vector4       (x, y, w, x); }
-Vector4 Vector4::yywx() const  { return Vector4       (y, y, w, x); }
-Vector4 Vector4::zywx() const  { return Vector4       (z, y, w, x); }
-Vector4 Vector4::wywx() const  { return Vector4       (w, y, w, x); }
-Vector4 Vector4::xzwx() const  { return Vector4       (x, z, w, x); }
-Vector4 Vector4::yzwx() const  { return Vector4       (y, z, w, x); }
-Vector4 Vector4::zzwx() const  { return Vector4       (z, z, w, x); }
-Vector4 Vector4::wzwx() const  { return Vector4       (w, z, w, x); }
-Vector4 Vector4::xwwx() const  { return Vector4       (x, w, w, x); }
-Vector4 Vector4::ywwx() const  { return Vector4       (y, w, w, x); }
-Vector4 Vector4::zwwx() const  { return Vector4       (z, w, w, x); }
-Vector4 Vector4::wwwx() const  { return Vector4       (w, w, w, x); }
-Vector4 Vector4::xxxy() const  { return Vector4       (x, x, x, y); }
-Vector4 Vector4::yxxy() const  { return Vector4       (y, x, x, y); }
-Vector4 Vector4::zxxy() const  { return Vector4       (z, x, x, y); }
-Vector4 Vector4::wxxy() const  { return Vector4       (w, x, x, y); }
-Vector4 Vector4::xyxy() const  { return Vector4       (x, y, x, y); }
-Vector4 Vector4::yyxy() const  { return Vector4       (y, y, x, y); }
-Vector4 Vector4::zyxy() const  { return Vector4       (z, y, x, y); }
-Vector4 Vector4::wyxy() const  { return Vector4       (w, y, x, y); }
-Vector4 Vector4::xzxy() const  { return Vector4       (x, z, x, y); }
-Vector4 Vector4::yzxy() const  { return Vector4       (y, z, x, y); }
-Vector4 Vector4::zzxy() const  { return Vector4       (z, z, x, y); }
-Vector4 Vector4::wzxy() const  { return Vector4       (w, z, x, y); }
-Vector4 Vector4::xwxy() const  { return Vector4       (x, w, x, y); }
-Vector4 Vector4::ywxy() const  { return Vector4       (y, w, x, y); }
-Vector4 Vector4::zwxy() const  { return Vector4       (z, w, x, y); }
-Vector4 Vector4::wwxy() const  { return Vector4       (w, w, x, y); }
-Vector4 Vector4::xxyy() const  { return Vector4       (x, x, y, y); }
-Vector4 Vector4::yxyy() const  { return Vector4       (y, x, y, y); }
-Vector4 Vector4::zxyy() const  { return Vector4       (z, x, y, y); }
-Vector4 Vector4::wxyy() const  { return Vector4       (w, x, y, y); }
-Vector4 Vector4::xyyy() const  { return Vector4       (x, y, y, y); }
-Vector4 Vector4::yyyy() const  { return Vector4       (y, y, y, y); }
-Vector4 Vector4::zyyy() const  { return Vector4       (z, y, y, y); }
-Vector4 Vector4::wyyy() const  { return Vector4       (w, y, y, y); }
-Vector4 Vector4::xzyy() const  { return Vector4       (x, z, y, y); }
-Vector4 Vector4::yzyy() const  { return Vector4       (y, z, y, y); }
-Vector4 Vector4::zzyy() const  { return Vector4       (z, z, y, y); }
-Vector4 Vector4::wzyy() const  { return Vector4       (w, z, y, y); }
-Vector4 Vector4::xwyy() const  { return Vector4       (x, w, y, y); }
-Vector4 Vector4::ywyy() const  { return Vector4       (y, w, y, y); }
-Vector4 Vector4::zwyy() const  { return Vector4       (z, w, y, y); }
-Vector4 Vector4::wwyy() const  { return Vector4       (w, w, y, y); }
-Vector4 Vector4::xxzy() const  { return Vector4       (x, x, z, y); }
-Vector4 Vector4::yxzy() const  { return Vector4       (y, x, z, y); }
-Vector4 Vector4::zxzy() const  { return Vector4       (z, x, z, y); }
-Vector4 Vector4::wxzy() const  { return Vector4       (w, x, z, y); }
-Vector4 Vector4::xyzy() const  { return Vector4       (x, y, z, y); }
-Vector4 Vector4::yyzy() const  { return Vector4       (y, y, z, y); }
-Vector4 Vector4::zyzy() const  { return Vector4       (z, y, z, y); }
-Vector4 Vector4::wyzy() const  { return Vector4       (w, y, z, y); }
-Vector4 Vector4::xzzy() const  { return Vector4       (x, z, z, y); }
-Vector4 Vector4::yzzy() const  { return Vector4       (y, z, z, y); }
-Vector4 Vector4::zzzy() const  { return Vector4       (z, z, z, y); }
-Vector4 Vector4::wzzy() const  { return Vector4       (w, z, z, y); }
-Vector4 Vector4::xwzy() const  { return Vector4       (x, w, z, y); }
-Vector4 Vector4::ywzy() const  { return Vector4       (y, w, z, y); }
-Vector4 Vector4::zwzy() const  { return Vector4       (z, w, z, y); }
-Vector4 Vector4::wwzy() const  { return Vector4       (w, w, z, y); }
-Vector4 Vector4::xxwy() const  { return Vector4       (x, x, w, y); }
-Vector4 Vector4::yxwy() const  { return Vector4       (y, x, w, y); }
-Vector4 Vector4::zxwy() const  { return Vector4       (z, x, w, y); }
-Vector4 Vector4::wxwy() const  { return Vector4       (w, x, w, y); }
-Vector4 Vector4::xywy() const  { return Vector4       (x, y, w, y); }
-Vector4 Vector4::yywy() const  { return Vector4       (y, y, w, y); }
-Vector4 Vector4::zywy() const  { return Vector4       (z, y, w, y); }
-Vector4 Vector4::wywy() const  { return Vector4       (w, y, w, y); }
-Vector4 Vector4::xzwy() const  { return Vector4       (x, z, w, y); }
-Vector4 Vector4::yzwy() const  { return Vector4       (y, z, w, y); }
-Vector4 Vector4::zzwy() const  { return Vector4       (z, z, w, y); }
-Vector4 Vector4::wzwy() const  { return Vector4       (w, z, w, y); }
-Vector4 Vector4::xwwy() const  { return Vector4       (x, w, w, y); }
-Vector4 Vector4::ywwy() const  { return Vector4       (y, w, w, y); }
-Vector4 Vector4::zwwy() const  { return Vector4       (z, w, w, y); }
-Vector4 Vector4::wwwy() const  { return Vector4       (w, w, w, y); }
-Vector4 Vector4::xxxz() const  { return Vector4       (x, x, x, z); }
-Vector4 Vector4::yxxz() const  { return Vector4       (y, x, x, z); }
-Vector4 Vector4::zxxz() const  { return Vector4       (z, x, x, z); }
-Vector4 Vector4::wxxz() const  { return Vector4       (w, x, x, z); }
-Vector4 Vector4::xyxz() const  { return Vector4       (x, y, x, z); }
-Vector4 Vector4::yyxz() const  { return Vector4       (y, y, x, z); }
-Vector4 Vector4::zyxz() const  { return Vector4       (z, y, x, z); }
-Vector4 Vector4::wyxz() const  { return Vector4       (w, y, x, z); }
-Vector4 Vector4::xzxz() const  { return Vector4       (x, z, x, z); }
-Vector4 Vector4::yzxz() const  { return Vector4       (y, z, x, z); }
-Vector4 Vector4::zzxz() const  { return Vector4       (z, z, x, z); }
-Vector4 Vector4::wzxz() const  { return Vector4       (w, z, x, z); }
-Vector4 Vector4::xwxz() const  { return Vector4       (x, w, x, z); }
-Vector4 Vector4::ywxz() const  { return Vector4       (y, w, x, z); }
-Vector4 Vector4::zwxz() const  { return Vector4       (z, w, x, z); }
-Vector4 Vector4::wwxz() const  { return Vector4       (w, w, x, z); }
-Vector4 Vector4::xxyz() const  { return Vector4       (x, x, y, z); }
-Vector4 Vector4::yxyz() const  { return Vector4       (y, x, y, z); }
-Vector4 Vector4::zxyz() const  { return Vector4       (z, x, y, z); }
-Vector4 Vector4::wxyz() const  { return Vector4       (w, x, y, z); }
-Vector4 Vector4::xyyz() const  { return Vector4       (x, y, y, z); }
-Vector4 Vector4::yyyz() const  { return Vector4       (y, y, y, z); }
-Vector4 Vector4::zyyz() const  { return Vector4       (z, y, y, z); }
-Vector4 Vector4::wyyz() const  { return Vector4       (w, y, y, z); }
-Vector4 Vector4::xzyz() const  { return Vector4       (x, z, y, z); }
-Vector4 Vector4::yzyz() const  { return Vector4       (y, z, y, z); }
-Vector4 Vector4::zzyz() const  { return Vector4       (z, z, y, z); }
-Vector4 Vector4::wzyz() const  { return Vector4       (w, z, y, z); }
-Vector4 Vector4::xwyz() const  { return Vector4       (x, w, y, z); }
-Vector4 Vector4::ywyz() const  { return Vector4       (y, w, y, z); }
-Vector4 Vector4::zwyz() const  { return Vector4       (z, w, y, z); }
-Vector4 Vector4::wwyz() const  { return Vector4       (w, w, y, z); }
-Vector4 Vector4::xxzz() const  { return Vector4       (x, x, z, z); }
-Vector4 Vector4::yxzz() const  { return Vector4       (y, x, z, z); }
-Vector4 Vector4::zxzz() const  { return Vector4       (z, x, z, z); }
-Vector4 Vector4::wxzz() const  { return Vector4       (w, x, z, z); }
-Vector4 Vector4::xyzz() const  { return Vector4       (x, y, z, z); }
-Vector4 Vector4::yyzz() const  { return Vector4       (y, y, z, z); }
-Vector4 Vector4::zyzz() const  { return Vector4       (z, y, z, z); }
-Vector4 Vector4::wyzz() const  { return Vector4       (w, y, z, z); }
-Vector4 Vector4::xzzz() const  { return Vector4       (x, z, z, z); }
-Vector4 Vector4::yzzz() const  { return Vector4       (y, z, z, z); }
-Vector4 Vector4::zzzz() const  { return Vector4       (z, z, z, z); }
-Vector4 Vector4::wzzz() const  { return Vector4       (w, z, z, z); }
-Vector4 Vector4::xwzz() const  { return Vector4       (x, w, z, z); }
-Vector4 Vector4::ywzz() const  { return Vector4       (y, w, z, z); }
-Vector4 Vector4::zwzz() const  { return Vector4       (z, w, z, z); }
-Vector4 Vector4::wwzz() const  { return Vector4       (w, w, z, z); }
-Vector4 Vector4::xxwz() const  { return Vector4       (x, x, w, z); }
-Vector4 Vector4::yxwz() const  { return Vector4       (y, x, w, z); }
-Vector4 Vector4::zxwz() const  { return Vector4       (z, x, w, z); }
-Vector4 Vector4::wxwz() const  { return Vector4       (w, x, w, z); }
-Vector4 Vector4::xywz() const  { return Vector4       (x, y, w, z); }
-Vector4 Vector4::yywz() const  { return Vector4       (y, y, w, z); }
-Vector4 Vector4::zywz() const  { return Vector4       (z, y, w, z); }
-Vector4 Vector4::wywz() const  { return Vector4       (w, y, w, z); }
-Vector4 Vector4::xzwz() const  { return Vector4       (x, z, w, z); }
-Vector4 Vector4::yzwz() const  { return Vector4       (y, z, w, z); }
-Vector4 Vector4::zzwz() const  { return Vector4       (z, z, w, z); }
-Vector4 Vector4::wzwz() const  { return Vector4       (w, z, w, z); }
-Vector4 Vector4::xwwz() const  { return Vector4       (x, w, w, z); }
-Vector4 Vector4::ywwz() const  { return Vector4       (y, w, w, z); }
-Vector4 Vector4::zwwz() const  { return Vector4       (z, w, w, z); }
-Vector4 Vector4::wwwz() const  { return Vector4       (w, w, w, z); }
-Vector4 Vector4::xxxw() const  { return Vector4       (x, x, x, w); }
-Vector4 Vector4::yxxw() const  { return Vector4       (y, x, x, w); }
-Vector4 Vector4::zxxw() const  { return Vector4       (z, x, x, w); }
-Vector4 Vector4::wxxw() const  { return Vector4       (w, x, x, w); }
-Vector4 Vector4::xyxw() const  { return Vector4       (x, y, x, w); }
-Vector4 Vector4::yyxw() const  { return Vector4       (y, y, x, w); }
-Vector4 Vector4::zyxw() const  { return Vector4       (z, y, x, w); }
-Vector4 Vector4::wyxw() const  { return Vector4       (w, y, x, w); }
-Vector4 Vector4::xzxw() const  { return Vector4       (x, z, x, w); }
-Vector4 Vector4::yzxw() const  { return Vector4       (y, z, x, w); }
-Vector4 Vector4::zzxw() const  { return Vector4       (z, z, x, w); }
-Vector4 Vector4::wzxw() const  { return Vector4       (w, z, x, w); }
-Vector4 Vector4::xwxw() const  { return Vector4       (x, w, x, w); }
-Vector4 Vector4::ywxw() const  { return Vector4       (y, w, x, w); }
-Vector4 Vector4::zwxw() const  { return Vector4       (z, w, x, w); }
-Vector4 Vector4::wwxw() const  { return Vector4       (w, w, x, w); }
-Vector4 Vector4::xxyw() const  { return Vector4       (x, x, y, w); }
-Vector4 Vector4::yxyw() const  { return Vector4       (y, x, y, w); }
-Vector4 Vector4::zxyw() const  { return Vector4       (z, x, y, w); }
-Vector4 Vector4::wxyw() const  { return Vector4       (w, x, y, w); }
-Vector4 Vector4::xyyw() const  { return Vector4       (x, y, y, w); }
-Vector4 Vector4::yyyw() const  { return Vector4       (y, y, y, w); }
-Vector4 Vector4::zyyw() const  { return Vector4       (z, y, y, w); }
-Vector4 Vector4::wyyw() const  { return Vector4       (w, y, y, w); }
-Vector4 Vector4::xzyw() const  { return Vector4       (x, z, y, w); }
-Vector4 Vector4::yzyw() const  { return Vector4       (y, z, y, w); }
-Vector4 Vector4::zzyw() const  { return Vector4       (z, z, y, w); }
-Vector4 Vector4::wzyw() const  { return Vector4       (w, z, y, w); }
-Vector4 Vector4::xwyw() const  { return Vector4       (x, w, y, w); }
-Vector4 Vector4::ywyw() const  { return Vector4       (y, w, y, w); }
-Vector4 Vector4::zwyw() const  { return Vector4       (z, w, y, w); }
-Vector4 Vector4::wwyw() const  { return Vector4       (w, w, y, w); }
-Vector4 Vector4::xxzw() const  { return Vector4       (x, x, z, w); }
-Vector4 Vector4::yxzw() const  { return Vector4       (y, x, z, w); }
-Vector4 Vector4::zxzw() const  { return Vector4       (z, x, z, w); }
-Vector4 Vector4::wxzw() const  { return Vector4       (w, x, z, w); }
-Vector4 Vector4::xyzw() const  { return Vector4       (x, y, z, w); }
-Vector4 Vector4::yyzw() const  { return Vector4       (y, y, z, w); }
-Vector4 Vector4::zyzw() const  { return Vector4       (z, y, z, w); }
-Vector4 Vector4::wyzw() const  { return Vector4       (w, y, z, w); }
-Vector4 Vector4::xzzw() const  { return Vector4       (x, z, z, w); }
-Vector4 Vector4::yzzw() const  { return Vector4       (y, z, z, w); }
-Vector4 Vector4::zzzw() const  { return Vector4       (z, z, z, w); }
-Vector4 Vector4::wzzw() const  { return Vector4       (w, z, z, w); }
-Vector4 Vector4::xwzw() const  { return Vector4       (x, w, z, w); }
-Vector4 Vector4::ywzw() const  { return Vector4       (y, w, z, w); }
-Vector4 Vector4::zwzw() const  { return Vector4       (z, w, z, w); }
-Vector4 Vector4::wwzw() const  { return Vector4       (w, w, z, w); }
-Vector4 Vector4::xxww() const  { return Vector4       (x, x, w, w); }
-Vector4 Vector4::yxww() const  { return Vector4       (y, x, w, w); }
-Vector4 Vector4::zxww() const  { return Vector4       (z, x, w, w); }
-Vector4 Vector4::wxww() const  { return Vector4       (w, x, w, w); }
-Vector4 Vector4::xyww() const  { return Vector4       (x, y, w, w); }
-Vector4 Vector4::yyww() const  { return Vector4       (y, y, w, w); }
-Vector4 Vector4::zyww() const  { return Vector4       (z, y, w, w); }
-Vector4 Vector4::wyww() const  { return Vector4       (w, y, w, w); }
-Vector4 Vector4::xzww() const  { return Vector4       (x, z, w, w); }
-Vector4 Vector4::yzww() const  { return Vector4       (y, z, w, w); }
-Vector4 Vector4::zzww() const  { return Vector4       (z, z, w, w); }
-Vector4 Vector4::wzww() const  { return Vector4       (w, z, w, w); }
-Vector4 Vector4::xwww() const  { return Vector4       (x, w, w, w); }
-Vector4 Vector4::ywww() const  { return Vector4       (y, w, w, w); }
-Vector4 Vector4::zwww() const  { return Vector4       (z, w, w, w); }
-Vector4 Vector4::wwww() const  { return Vector4       (w, w, w, w); }
-
-
-}; // namespace
diff --git a/externals/g3dlite/G3D.lib/source/Vector4int8.cpp b/externals/g3dlite/G3D.lib/source/Vector4int8.cpp
deleted file mode 100644
index 29ca0d678fc..00000000000
--- a/externals/g3dlite/G3D.lib/source/Vector4int8.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
-  @file Vector4int8.cpp
- 
-  Homogeneous vector class.
-
-  @maintainer Morgan McGuire, matrix@graphics3d.com
- 
-  @created 2007-02-09
-  @edited  2007-02-09
-
-  Copyright 2000-2007, Morgan McGuire.
-  All rights reserved.
- */
-
-#include "G3D/platform.h"
-#include "G3D/Vector4int8.h"
-#include "G3D/Vector3.h"
-#include "G3D/Vector4.h"
-#include "G3D/BinaryInput.h"
-#include "G3D/BinaryOutput.h"
-#include 
-
-namespace G3D {
-
-Vector4int8::Vector4int8(const Vector4& source) {
-    x = iClamp(iRound(source.x), -128, 127);
-    y = iClamp(iRound(source.y), -128, 127);
-    z = iClamp(iRound(source.z), -128, 127);
-    w = iClamp(iRound(source.w), -128, 127);
-}
-
-Vector4int8::Vector4int8(const Vector3& source, int8 w) : w(w) {
-    x = iClamp(iRound(source.x), -128, 127);
-    y = iClamp(iRound(source.y), -128, 127);
-    z = iClamp(iRound(source.z), -128, 127);
-}
-
-Vector4int8::Vector4int8(class BinaryInput& b) {
-    deserialize(b);
-}
-
-void Vector4int8::serialize(class BinaryOutput& b) const {
-    // Intentionally write individual bytes to avoid endian issues
-    b.writeInt8(x);
-    b.writeInt8(y);
-    b.writeInt8(z);
-    b.writeInt8(w);
-}
-
-void Vector4int8::deserialize(class BinaryInput& b) {
-    x = b.readInt8();
-    y = b.readInt8();
-    z = b.readInt8();
-    w = b.readInt8();
-}
-
-} // namespace G3D
-
diff --git a/externals/g3dlite/G3D.lib/source/WinMain.cpp b/externals/g3dlite/G3D.lib/source/WinMain.cpp
deleted file mode 100644
index 94653de4d43..00000000000
--- a/externals/g3dlite/G3D.lib/source/WinMain.cpp
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
-    Dervied from SDL_main.c, which was placed in the public domain by Sam Lantinga  4/13/98
-
-    The WinMain function -- calls your program's main() function
-*/
-
-#include "G3D/platform.h"
-
-#ifdef G3D_WIN32
-
-#include 
-#include 
-#include 
-
-#ifdef main
-#   ifndef _WIN32_WCE_EMULATION
-#       undef main
-#   endif /* _WIN32_WCE_EMULATION */
-#endif /* main */
-
-#if defined(_WIN32_WCE) && _WIN32_WCE < 300
-/* seems to be undefined in Win CE although in online help */
-#define isspace(a) (((CHAR)a == ' ') || ((CHAR)a == '\t'))
-#endif /* _WIN32_WCE < 300 */
-
-// Turn off the G3D for loop scoping for C++
-#ifdef for
-#  undef for
-#endif
-
-extern int main(int argc, const char** argv);
-
-/* Parse a command line buffer into arguments */
-static int ParseCommandLine(char *cmdline, char **argv) {
-    char *bufp;
-    int argc;
-
-    argc = 0;
-    for (bufp = cmdline; *bufp;) {
-        /* Skip leading whitespace */
-        while (isspace(*bufp)) {
-            ++bufp;
-        }
-        /* Skip over argument */
-        if (*bufp == '"') {
-            ++bufp;
-            if (*bufp) {
-                if (argv) {
-                    argv[argc] = bufp;
-                }
-                ++argc;
-            }
-            /* Skip over word */
-            while (*bufp && (*bufp != '"')) {
-                ++bufp;
-            }
-        } else {
-            if (*bufp) {
-                if (argv) {
-                    argv[argc] = bufp;
-                }
-                ++argc;
-            }
-            /* Skip over word */
-            while (*bufp && !isspace(*bufp)) {
-                ++bufp;
-            }
-        }
-        if (*bufp) {
-            if (argv) {
-                *bufp = '\0';
-            }
-            ++bufp;
-        }
-    }
-    if (argv) {
-        argv[argc] = NULL;
-    }
-    return (argc);
-}
-
-/* Show an error message */
-static void ShowError(const char *title, const char *message) {
-/* If USE_MESSAGEBOX is defined, you need to link with user32.lib */
-#ifdef USE_MESSAGEBOX
-    MessageBox(NULL, message, title, MB_ICONEXCLAMATION | MB_OK);
-#else
-    fprintf(stderr, "%s: %s\n", title, message);
-#endif
-}
-
-/* Pop up an out of memory message, returns to Windows */
-static BOOL OutOfMemory(void) {
-    ShowError("Fatal Error", "Out of memory - aborting");
-    return FALSE;
-}
-
-
-int WINAPI G3D_WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR szCmdLine, int sw) {
-    char **argv;
-    int argc;
-    int status;
-    char *cmdline;
-#   ifdef _WIN32_WCE
-        wchar_t *bufp;
-        int nLen;
-#   else
-        char *bufp;
-        size_t nLen;
-#   endif
-
-#ifdef _WIN32_WCE
-#error WinCE not supported
-    /*
-    nLen = wcslen(szCmdLine) + 128 + 1;
-    bufp = SDL_stack_alloc(wchar_t, nLen * 2);
-    wcscpy(bufp, TEXT("\""));
-    GetModuleFileName(NULL, bufp + 1, 128 - 3);
-    wcscpy(bufp + wcslen(bufp), TEXT("\" "));
-    wcsncpy(bufp + wcslen(bufp), szCmdLine, nLen - wcslen(bufp));
-    nLen = wcslen(bufp) + 1;
-    cmdline = SDL_stack_alloc(char, nLen);
-    if (cmdline == NULL) {
-        return OutOfMemory();
-    }
-    WideCharToMultiByte(CP_ACP, 0, bufp, -1, cmdline, nLen, NULL, NULL);
-    */
-#else
-    /* Grab the command line */
-    bufp = GetCommandLineA();
-    nLen = strlen(bufp) + 1;
-    cmdline = (char*)malloc(sizeof(char) * nLen);
-    if (cmdline == NULL) {
-        return OutOfMemory();
-    }
-    strncpy(cmdline, bufp, nLen);
-#endif
-
-    /* Parse it into argv and argc */
-    argc = ParseCommandLine(cmdline, NULL);
-    argv = (char**)malloc(sizeof(char*) * (argc + 1));
-    if (argv == NULL) {
-        return OutOfMemory();
-    }
-    ParseCommandLine(cmdline, argv);
-
-    /* Run the main program */
-    status = main(argc, (const char**)argv);
-    free(argv);
-    free(cmdline);
-
-    return status;
-}
-
-#endif // if Win32
diff --git a/externals/g3dlite/G3D.lib/source/debugAssert.cpp b/externals/g3dlite/G3D.lib/source/debugAssert.cpp
deleted file mode 100644
index 4b24546a661..00000000000
--- a/externals/g3dlite/G3D.lib/source/debugAssert.cpp
+++ /dev/null
@@ -1,392 +0,0 @@
-/**
- @file debugAssert.cpp
-
- Windows implementation of assertion routines.
-
- @maintainer Morgan McGuire, graphics3d.com
- 
- @created 2001-08-26
- @edited  2006-02-02
- */
-
-#include "G3D/debugAssert.h"
-#include "G3D/platform.h"
-#ifdef G3D_WIN32
-    #include 
-#endif
-#include "G3D/format.h"
-#include "G3D/prompt.h"
-#include 
-#include "G3D/debugPrintf.h"
-#include "G3D/Log.h"
-
-#include 
-
-#ifdef _MSC_VER
-    // disable: "C++ exception handler used"
-#   pragma warning (push)
-#   pragma warning (disable : 4530)
-#endif
-
-using namespace std;
-
-namespace G3D { namespace _internal {
-
-ConsolePrintHook _consolePrintHook;
-AssertionHook _debugHook = _handleDebugAssert_;
-AssertionHook _failureHook = _handleErrorCheck_;
-
-#ifdef G3D_LINUX
-    Display*      x11Display = NULL;
-    Window        x11Window  = 0;
-#endif
-
-
-#ifdef G3D_WIN32
-static void postToClipboard(const char *text) {
-    if (OpenClipboard(NULL)) {
-        HGLOBAL hMem = GlobalAlloc(GHND | GMEM_DDESHARE, strlen(text) + 1);
-        if (hMem) {
-            char *pMem = (char*)GlobalLock(hMem);
-            strcpy(pMem, text);
-            GlobalUnlock(hMem);
-
-            EmptyClipboard();
-            SetClipboardData(CF_TEXT, hMem);
-        }
-
-        CloseClipboard();
-        GlobalFree(hMem);
-    }
-}
-#endif
-
-/**
- outTitle should be set before the call
- */
-static void createErrorMessage(
-    const char*         expression,
-    const std::string&  message,
-    const char*         filename,
-    int                 lineNumber,
-    std::string&        outTitle,
-    std::string&        outMessage) {
-
-    std::string le = "";
-    const char* newline = "\n";
-
-    #ifdef G3D_WIN32
-        newline = "\r\n";
-
-        // The last error value.  (Which is preserved across the call).
-        DWORD lastErr = GetLastError();
-    
-        // The decoded message from FormatMessage
-        LPTSTR formatMsg = NULL;
-
-        if (NULL == formatMsg) {
-            FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
-                          FORMAT_MESSAGE_IGNORE_INSERTS |
-                          FORMAT_MESSAGE_FROM_SYSTEM,
-                            NULL,
-                            lastErr,
-                            0,
-                            (LPTSTR)&formatMsg,
-                            0,
-                            NULL);
-        }
-
-        // Make sure the message got translated into something.
-        LPTSTR realLastErr;
-        if (NULL != formatMsg) {
-            realLastErr = formatMsg;
-        } else {
-            realLastErr = _T("Last error code does not exist.");
-        }
-
-		if (lastErr != 0) {
-	        le = G3D::format("Last Error (0x%08X): %s\r\n\r\n", lastErr, (LPCSTR)realLastErr);
-		}
-
-        // Get rid of the allocated memory from FormatMessage.
-        if (NULL != formatMsg) {
-            LocalFree((LPVOID)formatMsg);
-        }
-
-        char modulePath[MAX_PATH];
-        GetModuleFileNameA(NULL, modulePath, MAX_PATH);
-
-        const char* moduleName = strrchr(modulePath, '\\');
-        outTitle = outTitle + string(" - ") + string(moduleName ? (moduleName + 1) : modulePath);
-
-    #endif
-
-    // Build the message.
-    outMessage =
-        G3D::format("%s%s%sExpression: %s%s%s:%d%s%s%s", 
-                 message.c_str(), newline, newline, expression, newline, 
-                 filename, lineNumber, newline, newline, le.c_str());
-}
-
-
-bool _handleDebugAssert_(
-    const char*         expression,
-    const std::string&  message,
-    const char*         filename,
-    int                 lineNumber,
-    bool&               ignoreAlways,
-    bool                useGuiPrompt) {
-
-    std::string dialogTitle = "Assertion Failure";
-    std::string dialogText = "";
-    createErrorMessage(expression, message, filename, lineNumber, dialogTitle, dialogText);
-
-    #ifdef G3D_WIN32
-        DWORD lastErr = GetLastError();
-        postToClipboard(dialogText.c_str());
-        debugPrintf("\n%s\n", dialogText.c_str());
-    #endif
-
-    const int cBreak        = 0;
-    const int cIgnore       = 1;
-    const int cIgnoreAlways = 2;
-    const int cAbort        = 3;
-
-    static const char* choices[] = {"Debug", "Ignore", "Ignore Always", "Exit"};
-
-    // Log the error
-    Log::common()->print(std::string("\n**************************\n\n") + dialogTitle + "\n" + dialogText);
-
-    int result = G3D::prompt(dialogTitle.c_str(), dialogText.c_str(), (const char**)choices, 4, useGuiPrompt);
-
-#    ifdef G3D_WIN32
-        // Put the incoming last error back.
-        SetLastError(lastErr);
-#    endif
-
-    switch (result) {
-    // -1 shouldn't actually occur because it means 
-    // that we're in release mode.
-    case -1:
-    case cBreak:
-        return true;
-        break;
-
-    case cIgnore:
-        return false;
-        break;
-   
-    case cIgnoreAlways:
-        ignoreAlways = true;
-        return false;
-        break;
-
-    case cAbort:
-        exit(-1);
-        break;
-    }
-
-    // Should never get here
-    return false;
-}
-
-
-bool _handleErrorCheck_(
-    const char*         expression,
-    const std::string&  message,
-    const char*         filename,
-    int                 lineNumber,
-    bool&               ignoreAlways,
-    bool                useGuiPrompt) {
-
-    (void)ignoreAlways;
-
-    std::string dialogTitle = "Critical Error";
-    std::string dialogText = "";
-
-    createErrorMessage(expression, message, filename, lineNumber, dialogTitle, dialogText);
-
-    // Log the error
-    Log::common()->print(std::string("\n**************************\n\n") + dialogTitle + "\n" + dialogText);
-    #ifdef G3D_WIN32
-        DWORD lastErr = GetLastError();
-        postToClipboard(dialogText.c_str());
-        debugPrintf("\n%s\n", dialogText.c_str());
-    #endif
-
-    static const char* choices[] = {"Ok"};
-
-    std::string m = 
-        std::string("An internal error has occured in your program and it will now close.  Details about the error have been reported in \"") +
-            Log::getCommonLogFilename() + "\".";
-
-    int result = G3D::prompt("Error", m.c_str(), (const char**)choices, 1, useGuiPrompt);
-    (void)result;
-
-    return true;
-}
-
-
-#ifdef G3D_WIN32
-static HCURSOR oldCursor;
-static RECT    oldCursorRect;
-static POINT   oldCursorPos;
-static int     oldShowCursorCount;
-#endif
-
-void _releaseInputGrab_() {
-    #ifdef G3D_WIN32
-
-        GetCursorPos(&oldCursorPos);
-
-        // Stop hiding the cursor if the application hid it.
-        oldShowCursorCount = ShowCursor(true) - 1;
-
-        if (oldShowCursorCount < -1) {
-            for (int c = oldShowCursorCount; c < -1; ++c) {
-                ShowCursor(true);
-            }
-        }
-
-        // Set the default cursor in case the application
-        // set the cursor to NULL.
-        oldCursor = GetCursor();
-        SetCursor(LoadCursor(NULL, IDC_ARROW));
-
-        // Allow the cursor full access to the screen
-        GetClipCursor(&oldCursorRect);
-        ClipCursor(NULL);
-        
-    #elif defined(G3D_LINUX)
-        if (x11Display != NULL) {
-            XUngrabPointer(x11Display, CurrentTime);
-            XUngrabKeyboard(x11Display, CurrentTime);
-            if (x11Window != 0) {
-                //XUndefineCursor(x11Display, x11Window);
-                // TODO: Note that we leak this cursor; it should be
-                // freed in the restore code.
-                Cursor c = XCreateFontCursor(x11Display, 68);
-                XDefineCursor(x11Display, x11Window, c);
-            }
-            XSync(x11Display, false);           
-            XAllowEvents(x11Display, AsyncPointer, CurrentTime);
-            XFlush(x11Display);
-        }
-    #elif defined(G3D_OSX)
-        // TODO: OS X
-    #endif
-}
-
-
-void _restoreInputGrab_() {
-    #ifdef G3D_WIN32
-
-        // Restore the old clipping region
-        ClipCursor(&oldCursorRect);
-
-        SetCursorPos(oldCursorPos.x, oldCursorPos.y);
-
-        // Restore the old cursor
-        SetCursor(oldCursor);
-
-        // Restore old visibility count
-        if (oldShowCursorCount < 0) {
-            for (int c = 0; c > oldShowCursorCount; --c) {
-                ShowCursor(false);
-            }
-        }
-        
-    #elif defined(G3D_LINUX)
-        // TODO: Linux
-    #elif defined(G3D_OSX)
-        // TODO: OS X
-    #endif
-}
-
-
-}; // internal namespace
- 
-void setAssertionHook(AssertionHook hook) {
-    G3D::_internal::_debugHook = hook;
-}
-
-AssertionHook assertionHook() {
-    return 	G3D::_internal::_debugHook;
-}
-
-void setFailureHook(AssertionHook hook) {
-    G3D::_internal::_failureHook = hook;
-}
-
-AssertionHook failureHook() {
-    return G3D::_internal::_failureHook;
-}
-
-
-void setConsolePrintHook(ConsolePrintHook h) {
-    G3D::_internal::_consolePrintHook = h;
-}
-
-ConsolePrintHook consolePrintHook() {
-    return G3D::_internal::_consolePrintHook;
-}
-
-
-std::string __cdecl debugPrint(const std::string& s) {
-#   ifdef G3D_WIN32
-        const int MAX_STRING_LEN = 1024;
-    
-        // Windows can't handle really long strings sent to
-        // the console, so we break the string.
-        if (s.size() < MAX_STRING_LEN) {
-            OutputDebugStringA(s.c_str());
-        } else {
-            for (unsigned int i = 0; i < s.size(); i += MAX_STRING_LEN) {
-                std::string sub = s.substr(i, MAX_STRING_LEN);
-                OutputDebugStringA(sub.c_str());
-            }
-        }
-#    else
-        fprintf(stderr, "%s", s.c_str());
-        fflush(stderr);
-#    endif
-
-     return s;
-}
-
-std::string __cdecl debugPrintf(const char* fmt ...) {
-    va_list argList;
-    va_start(argList, fmt);
-    std::string s = G3D::vformat(fmt, argList);
-    va_end(argList);
-
-    return debugPrint(consolePrint(s));
-}
-
-std::string consolePrint(const std::string& s) {
-    FILE* L = Log::common()->getFile();
-    fprintf(L, "%s", s.c_str());
-
-    if (consolePrintHook()) {
-        consolePrintHook()(s);
-    }
-
-    fflush(L);
-    return s;
-}
-
-
-std::string __cdecl consolePrintf(const char* fmt ...) {
-    va_list argList;
-    va_start(argList, fmt);
-    std::string s = G3D::vformat(fmt, argList);
-    va_end(argList);
-
-    return consolePrint(s);
-}
-
-} // namespace
-
-#ifdef _MSC_VER
-#   pragma warning (pop)
-#endif
diff --git a/externals/g3dlite/G3D.lib/source/fileutils.cpp b/externals/g3dlite/G3D.lib/source/fileutils.cpp
deleted file mode 100644
index 3a5e8c715c8..00000000000
--- a/externals/g3dlite/G3D.lib/source/fileutils.cpp
+++ /dev/null
@@ -1,1092 +0,0 @@
-/**
- @file fileutils.cpp
- 
- @author Morgan McGuire, graphics3d.com
- 
- @author  2002-06-06
- @edited  2008-01-20
- */
-
-#include "G3D/platform.h"
-#include "G3D/fileutils.h"
-#include "G3D/BinaryInput.h"
-#include "G3D/g3dmath.h"
-#include 
-#include 
-#include 
-#include 
-#include "G3D/stringutils.h"
-#include "G3D/Set.h"
-
-#include 
-
-#ifdef G3D_WIN32
-   // Needed for _getcwd
-   #include 
-   #include 
-#else
-   #include 
-   #include 
-   #include 
-   #define _getcwd getcwd
-#endif
-#include 
-#include "G3D/BinaryOutput.h"
-
-#ifdef G3D_WIN32
-    //for _mkdir and _stat
-#    include 
-#else
-#    define _stat stat
-#endif
-
-
-namespace G3D {
-    
-namespace _internal {
-    Set currentFilesUsed;
-}
-
-std::string pathConcat(const std::string& dirname, const std::string& file) {
-    // Ensure that the directory ends in a slash
-    if ((dirname.size() != 0) && 
-        (dirname[dirname.size() - 1] != '/') &&
-        (dirname[dirname.size() - 1] != '\\') &&
-        (dirname[dirname.size() - 1] != ':')) {
-        return dirname + '/' + file;
-    } else {
-        return dirname + file;
-    }
-}
-
-std::string resolveFilename(const std::string& filename) {
-    if (filename.size() >= 1) {
-        if ((filename[0] == '/') || (filename[0] == '\\')) {
-            // Already resolved
-            return filename;
-        } else {
-
-            #ifdef G3D_WIN32
-                if ((filename.size() >= 2) && (filename[1] == ':')) {
-                    // There is a drive spec on the front.
-                    if ((filename.size() >= 3) && ((filename[2] == '\\') || 
-                                                   (filename[2] == '/'))) {
-                        // Already fully qualified
-                        return filename;
-                    } else {
-                        // The drive spec is relative to the
-                        // working directory on that drive.
-                        debugAssertM(false, "Files of the form d:path are"
-                                     " not supported (use a fully qualified"
-                                     " name).");
-                        return filename;
-                    }
-                }
-            #endif
-        }
-    }
-
-    char buffer[1024];
-
-    // Prepend the working directory.
-    _getcwd(buffer, 1024);
-
-    return format("%s/%s", buffer, filename.c_str());
-}
-
-bool zipfileExists(const std::string& filename) {
-	std::string	outZipfile;
-	std::string	outInternalFile;
-    return zipfileExists(filename, outZipfile, outInternalFile);
-}
-
-std::string readWholeFile(
-    const std::string& filename) {
-
-    _internal::currentFilesUsed.insert(filename);
-
-    std::string s;
-
-    debugAssert(filename != "");
-    if (fileExists(filename, false)) {
-
-        int64 length = fileLength(filename);
-
-        char* buffer = (char*)System::alignedMalloc(length + 1, 16);
-        debugAssert(buffer);
-        FILE* f = fopen(filename.c_str(), "rb");
-        debugAssert(f);
-        int ret = fread(buffer, 1, length, f);
-	    debugAssert(ret == length);(void)ret;
-        fclose(f);
-
-        buffer[length] = '\0';    
-        s = std::string(buffer);
-
-        System::alignedFree(buffer);
-
-    } else if (zipfileExists(filename)) {
-
-        void* zipBuffer;
-        size_t length;
-        zipRead(filename, zipBuffer, length);
-
-        char* buffer = (char*)System::alignedMalloc(length + 1, 16);
-        System::memcpy(buffer,zipBuffer, length + 1);
-        zipClose(zipBuffer);
-
-        buffer[length] = '\0';
-        s = std::string(buffer);
-        System::alignedFree(buffer);
-    } else {
-        debugAssertM(false, filename + " not found");
-    }
-
-    return s;
-}
-
-
-void zipRead(const std::string& file,
-             void*& data,
-             size_t& length) {
-    std::string zip, desiredFile;
-    
-    if (zipfileExists(file, zip, desiredFile)) {
-        unzFile f = unzOpen(zip.c_str());
-        {
-            unzLocateFile(f, desiredFile.c_str(), 2);
-            unz_file_info info;
-            unzGetCurrentFileInfo(f, &info, NULL, 0, NULL, 0, NULL, 0);
-            length = info.uncompressed_size;
-            // sets machines up to use MMX, if they want
-            data = System::alignedMalloc(length, 16);
-            unzOpenCurrentFile(f);
-            {
-                int test = unzReadCurrentFile(f, data, length);
-                debugAssertM((size_t)test == length,
-                             desiredFile + " was corrupt because it unzipped to the wrong size.");
-                (void)test;
-            }
-            unzCloseCurrentFile(f);
-        }
-        unzClose(f);
-    } else {
-        data = NULL;
-    }
-}
-
-
-void zipClose(void* data) {
-	System::alignedFree(data);
-}
-
-
-int64 fileLength(const std::string& filename) {
-    struct _stat st;
-    int result = _stat(filename.c_str(), &st);
-    
-    if (result == -1) {
-		std::string zip, contents;
-		if(zipfileExists(filename, zip, contents)){
-			int64 requiredMem;
-
-			unzFile f = unzOpen(zip.c_str());
-			{
-				unzLocateFile(f, contents.c_str(), 2);
-				unz_file_info info;
-				unzGetCurrentFileInfo(f, &info, NULL, 0, NULL, 0, NULL, 0);
-				requiredMem = info.uncompressed_size;
-			}
-			unzClose(f);
-			return requiredMem;
-		} else {
-        return -1;
-		}
-    }
-
-    return st.st_size;
-}
-
-/** Used by robustTmpfile.  Returns nonzero if fread, fwrite, and fseek all
-succeed on the file.
-  @author Morgan McGuire, morgan@graphics3d.com  */
-static int isFileGood(FILE* f) {
-
-	int x, n, result;
-
-	/* Must be a valid file handle */
-	if (f == NULL) {
-		return 0;
-	}
-
-	/* Try to write */
-	x = 1234;
-	n = fwrite(&x, sizeof(int), 1, f);
-
-	if (n != 1) {
-		return 0;
-	}
-
-	/* Seek back to the beginning */
-	result = fseek(f, 0, SEEK_SET);
-	if (result != 0) {
-		return 0;
-	}
-
-	/* Read */
-	n =	fread(&x, sizeof(int), 1, f);
-	if (n != 1) {
-		return 0;
-	}
-
-	/* Seek back to the beginning again */
-	fseek(f, 0, SEEK_SET);
-
-	return 1;
-}
-
-FILE* createTempFile() {
-    FILE* t = NULL;
-
-//#   ifdef G3D_WIN32
-        t = tmpfile();
-//#   else
-//        // On Unix, tmpfile generates a warning for any code that links against it.
-//        const char* tempfilename = "/tmp/g3dtemp.XXXXXXXX";
-//        mktemp(tempfilename);
-//        t = fopen(tempfilename, "w");    
-//#   endif
-
-#	ifdef _WIN32
-		char* n = NULL;
-#	endif
-	char name[256];
-
-    if (isFileGood(t)) {
-        return t;
-    }
-
-#   ifdef G3D_WIN32
-    /* tmpfile failed; try the tmpnam routine */
-    t = fopen(tmpnam(NULL), "w+");
-    if (isFileGood(t)) {
-        return t;
-    }
-
-    n = _tempnam("c:/tmp/", "t");
-    /* Try to create something in C:\tmp */
-    t = fopen(n, "w+");
-    if (isFileGood(t)) {
-        return t;
-    }
-
-    /* Try c:\temp */
-    n = _tempnam("c:/temp/", "t");
-    t = fopen(n, "w+");
-    if (isFileGood(t)) {
-        return t;
-    }
-
-    /* try the current directory */
-    n = _tempnam("./", "t");
-    t = fopen(n, "w+");
-    if (isFileGood(t)) {
-        return t;
-    }
-
-    sprintf(name, "%s/tmp%d", "c:/temp", rand());
-    t = fopen(name, "w+");
-    if (isFileGood(t)) {
-        return t;
-    }
-
-    /* Try some hardcoded paths */
-    sprintf(name, "%s/tmp%d", "c:/tmp", rand());
-    t = fopen(name, "w+");
-    if (isFileGood(t)) {
-        return t;
-    }
-#   else
-    sprintf(name, "%s/tmp%d", "/tmp", rand());
-    t = fopen(name, "w+");
-    if (isFileGood(t)) {
-        return t;
-    }
-#endif
-
-    sprintf(name, "tmp%d", rand());
-    t = fopen(name, "w+");
-    if (isFileGood(t)) {
-        return t;
-    }
-
-    fprintf(stderr, "Unable to create a temporary file; robustTmpfile returning NULL\n");
-
-    return NULL;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-void writeWholeFile(
-    const std::string&          filename,
-    const std::string&          str,
-    bool                        flush) {
-
-    // Make sure the directory exists.
-    std::string root, base, ext, path;
-    Array pathArray;
-    parseFilename(filename, root, pathArray, base, ext); 
-
-    path = root + stringJoin(pathArray, '/');
-    if (! fileExists(path, false)) {
-        createDirectory(path);
-    }
-
-    FILE* file = fopen(filename.c_str(), "wb");
-
-    debugAssert(file);
-
-    fwrite(str.c_str(), str.size(), 1, file);
-
-    if (flush) {
-        fflush(file);
-    }
-    fclose(file);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-/**
- Creates the directory (which may optionally end in a /)
- and any parents needed to reach it.
- */
-void createDirectory(
-    const std::string&  dir) {
-    
-	if (dir == "") {
-		return;
-	}
-
-    std::string d;
-
-    // Add a trailing / if there isn't one.
-    switch (dir[dir.size() - 1]) {
-    case '/':
-    case '\\':
-        d = dir;
-        break;
-
-    default:
-        d = dir + "/";
-    }
-
-    // If it already exists, do nothing
-    if (fileExists(d.substr(0, d.size() - 1)), false) {
-        return;
-    }
-
-    // Parse the name apart
-    std::string root, base, ext;
-    Array path;
-
-    std::string lead;
-    parseFilename(d, root, path, base, ext);
-    debugAssert(base == "");
-    debugAssert(ext == "");
-
-    // Begin with an extra period so "c:\" becomes "c:\.\" after
-    // appending a path and "c:" becomes "c:.\", not root: "c:\"
-    std::string p = root + ".";
-
-    // Create any intermediate that doesn't exist
-    for (int i = 0; i < path.size(); ++i) {
-        p += "/" + path[i];
-        if (! fileExists(p, false)) {
-            // Windows only requires one argument to mkdir,
-            // where as unix also requires the permissions.
-#           ifndef G3D_WIN32
-                mkdir(p.c_str(), 0777);
-#	    else
-                _mkdir(p.c_str());
-#	    endif
-        }
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-bool fileExists(
-    const std::string&	filename,
-	const bool			lookInZipfiles) {
-
-	if (filename == "") {
-		return true;
-	}
-
-
-    // Useful for debugging
-    //char curdir[1024]; _getcwd(curdir, 1024); 
-
-    struct _stat st;
-    int ret = _stat(filename.c_str(), &st);
-
-    // _stat returns zero on success
-	bool exists = (ret == 0);
-
-	if (exists) {
-		// Exists
-		return true;
-	} else if (lookInZipfiles) {
-		// Does not exist standalone, but might exist in a zipfile
-
-		// These output arguments will be ignored
-		std::string zipDir, internalPath;
-		return zipfileExists(filename, zipDir, internalPath);
-	} else {
-		// Does not exist
-		return false;
-	}
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-/* Helper methods for zipfileExists()*/
-// Given a string (the drive) and an array (the path), computes the directory
-static void _zip_resolveDirectory(std::string& completeDir, const std::string& drive, const Array& path, const int length){
-	completeDir = drive;
-	int tempLength;
-	// if the given length is longer than the array, we correct it
-	if(length > path.length()){
-		tempLength = path.length();
-	} else{
-		tempLength = length;
-	}
-
-	for(int t = 0; t < tempLength; ++t){
-		if(t > 0){
-			completeDir += "/";
-		}
-		completeDir += path[t];
-	}
-}
-
-
-// assumes that zipDir references a .zip file
-static bool _zip_zipContains(const std::string& zipDir, const std::string& desiredFile){
-	unzFile f = unzOpen(zipDir.c_str());
-	//the last parameter, an int, determines case sensitivity:
-	//1 is sensitive, 2 is not, 0 is default
-	int test = unzLocateFile(f, desiredFile.c_str(), 2);
-	unzClose(f);
-	if(test == UNZ_END_OF_LIST_OF_FILE){
-		return false;
-	}
-	return true;
-}
-
-
-// If no zipfile exists, outZipfile and outInternalFile are unchanged
-bool zipfileExists(const std::string& filename, std::string& outZipfile,
-                   std::string& outInternalFile){
-    if (fileExists(filename, false)) {
-        // Not inside a zipfile if the file itself exists
-        return false;
-    } else {
-        Array path;
-        std::string drive, base, ext, zipfile, infile;
-        parseFilename(filename, drive, path, base, ext);
-        
-        // Put the filename back together
-        if ((base != "") && (ext != "")) {
-            infile = base + "." + ext;
-        } else {
-            infile = base + ext;
-        }
-        
-        // Remove "." from path
-        for (int i = 0; i < path.length(); ++i) {
-            if (path[i] == ".") {
-                path.remove(i);
-                --i;
-            }
-        }
-        
-        // Remove ".." from path
-        for (int i = 1; i < path.length(); ++i) {
-            if ((path[i] == "..") && (i > 0) && (path[i - 1] != "..")) {
-                // Remove both i and i - 1
-                path.remove(i - 1, 2);
-                i -= 2;
-            }
-        }
-        
-        // Walk the path backwards, accumulating pieces onto the infile until
-        // we find a zipfile that contains it
-        for (int t = 0; t < path.length(); ++t){
-            _zip_resolveDirectory(zipfile, drive, path,  path.length() - t);
-            if (t > 0) {
-                infile = path[path.length() - t] + "/" + infile;
-            }
-            
-            if (fileExists(zipfile, false)) {
-                // test if it actually is a zipfile
-                // if not, return false, a bad
-                // directory structure has been given,
-                // not a .zip
-                if (isZipfile(zipfile)){
-                    
-                    if (_zip_zipContains(zipfile, infile)){
-                        outZipfile = zipfile;
-                        outInternalFile = infile;
-                        return true;
-                    } else {
-                        return false;
-                    }
-                } else {
-                    // the directory structure was valid but did not point to a .zip
-                    return false;
-                }
-            }
-            
-        }
-    }
-    
-    // not a valid directory structure ever, 
-    // obviously no .zip was found within the path 
-    return false;
-}	
-
-///////////////////////////////////////////////////////////////////////////////
-
-std::string generateFilenameBase(const std::string& prefix) {
-    Array exist;
-
-    // Note "template" is a reserved word in C++
-    std::string templat = prefix + System::currentDateString();
-    getFiles(templat + "*", exist);
-    
-    // Remove extensions
-    for (int i = 0; i < exist.size(); ++i) {
-        exist[i] = filenameBase(exist[i]);
-    }
-
-    int num = 0;
-    std::string result;
-    templat += "_%03d";
-    do {
-        result = format(templat.c_str(), num);
-        ++num;
-    } while (exist.contains(result));
-
-    return result;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-void copyFile(
-    const std::string&          source,
-    const std::string&          dest) {
-
-    #ifdef G3D_WIN32
-        CopyFileA(source.c_str(), dest.c_str(), FALSE);
-    #else
-        // TODO: don't use BinaryInput and BinaryOutput
-        // Read it all in, then dump it out
-        BinaryInput  in(source, G3D_LITTLE_ENDIAN);
-        BinaryOutput out(dest, G3D_LITTLE_ENDIAN);
-        out.writeBytes(in.getCArray(), in.size());
-        out.commit(false);
-    #endif
-}
-
-//////////////////////////////////////////////////////////////////////////////
-
-void parseFilename(
-    const std::string&  filename,
-    std::string&        root,
-    Array& path,
-    std::string&        base,
-    std::string&        ext) {
-
-    std::string f = filename;
-
-    root = "";
-    path.clear();
-    base = "";
-    ext = "";
-
-    if (f == "") {
-        // Empty filename
-        return;
-    }
-
-    // See if there is a root/drive spec.
-    if ((f.size() >= 2) && (f[1] == ':')) {
-        
-        if ((f.size() > 2) && isSlash(f[2])) {
-        
-            // e.g.  c:\foo
-            root = f.substr(0, 3);
-            f = f.substr(3, f.size() - 3);
-        
-        } else {
-        
-            // e.g.  c:foo
-            root = f.substr(2);
-            f = f.substr(2, f.size() - 2);
-
-        }
-
-    } else if ((f.size() >= 2) & isSlash(f[0]) && isSlash(f[1])) {
-        
-        // e.g. //foo
-        root = f.substr(0, 2);
-        f = f.substr(2, f.size() - 2);
-
-    } else if (isSlash(f[0])) {
-        
-        root = f.substr(0, 1);
-        f = f.substr(1, f.size() - 1);
-
-    }
-
-    // Pull the extension off
-    {
-        // Find the period
-        size_t i = f.rfind('.');
-
-        if (i != std::string::npos) {
-            // Make sure it is after the last slash!
-            size_t j = iMax(f.rfind('/'), f.rfind('\\'));
-            if ((j == std::string::npos) || (i > j)) {
-                ext = f.substr(i + 1, f.size() - i - 1);
-                f = f.substr(0, i);
-            }
-        }
-    }
-
-    // Pull the basename off
-    {
-        // Find the last slash
-        size_t i = iMax(f.rfind('/'), f.rfind('\\'));
-        
-        if (i == std::string::npos) {
-            
-            // There is no slash; the basename is the whole thing
-            base = f;
-            f    = "";
-
-        } else if ((i != std::string::npos) && (i < f.size() - 1)) {
-            
-            base = f.substr(i + 1, f.size() - i - 1);
-            f    = f.substr(0, i);
-
-        }
-    }
-
-    // Parse what remains into path.
-    size_t prev, cur = 0;
-
-    while (cur < f.size()) {
-        prev = cur;
-        
-        // Allow either slash
-        size_t i = f.find('/', prev + 1);
-        size_t j = f.find('\\', prev + 1);
-        if (i == std::string::npos) {
-            i = f.size();
-        }
-
-        if (j == std::string::npos) {
-            j = f.size();
-        }
-
-        cur = iMin(i, j);
-
-        if (cur == std::string::npos) {
-            cur = f.size();
-        }
-
-        path.append(f.substr(prev, cur - prev));
-        ++cur;
-    }
-}
-
-
-/**
- Helper for getFileList and getDirectoryList.
-
- @param wantFiles       If false, returns the directories, otherwise
-                        returns the files.
- @param includePath     If true, the names include paths
- */
-static void getFileOrDirListNormal
-(
- const std::string&		filespec,
- Array&		files,
- bool				wantFiles,
- bool                           includePath) {
-    
-    bool test = wantFiles ? true : false;
-    
-    std::string path = "";
-
-    // Find the place where the path ends and the file-spec begins
-    size_t i = filespec.rfind('/');
-    size_t j = filespec.rfind('\\');
-    
-    // Drive letters on Windows can separate a path
-    size_t k = filespec.rfind(':');
-    
-    if (((j != std::string::npos) && (j > i)) ||
-        (i == std::string::npos)) {
-        i = j;
-    }
-    
-    if (((k != std::string::npos) && (k > i)) ||
-        (i == std::string::npos)) {
-        i = k;
-    }
-    
-    // If there is a path, pull it off
-    if (i != std::string::npos) {
-        path = filespec.substr(0, i + 1);
-    }
-   
-    std::string prefix = path;
-
-    if (path.size() > 0) {
-        // Strip the trailing character
-        path = path.substr(0, path.size() - 1);
-    }
-
-#   ifdef G3D_WIN32
-    {
-       struct _finddata_t fileinfo;
-
-        long handle = _findfirst(filespec.c_str(), &fileinfo);
-        int result = handle;
-
-        while (result != -1) {
-            if ((((fileinfo.attrib & _A_SUBDIR) == 0) == test) && 
-                strcmp(fileinfo.name, ".") &&
-                strcmp(fileinfo.name, "..")) {
-                
-                if (includePath) {
-                    files.append(prefix + fileinfo.name);
-                } else {
-                    files.append(fileinfo.name);
-                }
-            }
-            
-            result = _findnext(handle, &fileinfo);
-        }
-    }
-#   else
-    {
-        if (path == "") {
-            // Empty paths don't work on Unix
-            path = ".";
-        }
-
-        // Unix implementation
-        DIR* dir = opendir(path.c_str());
-
-        if (dir != NULL) {
-            struct dirent* entry = readdir(dir);
-
-            while (entry != NULL) {
-
-                // Exclude '.' and '..'
-                if ((strcmp(entry->d_name, ".") != 0) &&
-                    (strcmp(entry->d_name, "..") != 0)) {
-                    
-                    // Form a name with a path
-                    std::string filename = prefix + entry->d_name;
-                    // See if this is a file or a directory
-                    struct _stat st;
-                    bool exists = _stat(filename.c_str(), &st) != -1;
-
-                    if (exists &&
-
-                        // Make sure it has the correct type
-                        (((st.st_mode & S_IFDIR) == 0) == test) &&
-
-                        // Make sure it matches the wildcard
-                        (fnmatch(filespec.c_str(),
-                                 filename.c_str(),
-                                 FNM_PATHNAME) == 0)) {
-                        
-                        if (includePath) {
-                            files.append(filename);
-                        } else {
-                            files.append(entry->d_name);
-                        }
-                    }
-                }
-
-                entry = readdir(dir);
-            }
-            closedir(dir);
-        }
-    }
-#   endif
-}
-
-/**
- 
- c:/temp/foo.zip/plainsky\\*
-"    path       "
-                "prefix   "
-
- @param path   The zipfile name (no trailing slash)
- @param prefix Directory inside the zipfile. No leading slash, must have trailing slash if non-empty.
- @param file   Name inside the zipfile that we are testing to see if it matches prefix + "*"
- */
-static void _zip_addEntry(const std::string& path,
-                          const std::string& prefix,
-						  const std::string& file,
-						  Set& files,
-						  bool wantFiles,
-						  bool includePath) {
-
-    // Make certain we are within the desired parent folder (prefix)
-    if (beginsWith(file, prefix)) {
-        // validityTest was prefix/file
-        
-        // Extract everything to the right of the prefix
-        std::string s = file.substr(prefix.length());
-        
-        if (s == "") {
-            // This was the name of the prefix
-            return;
-        }
-        
-        // See if there are any slashes
-        size_t slashPos = s.find('/');
-        
-        bool add = false;
-        
-        if (slashPos == std::string::npos) {
-            // No slashes, so s must be a file
-            add = wantFiles;
-        } else if (! wantFiles) {
-            // Not all zipfiles list directories as explicit entries.
-            // Because of this, if we're looking for directories and see
-            // any path longer than prefix, we must add the subdirectory. 
-            // The Set will fix duplicates for us.
-            s = s.substr(0, slashPos);
-            add = true;
-        }
-        
-        if (add) {
-            if (includePath) {
-                files.insert(path + "/" + prefix + s);
-            } else {
-                files.insert(s);
-            }
-        }
-    }
-}
-
-
-static void getFileOrDirListZip(const std::string& path,
-                                const std::string& prefix,
-                                Array& files,
-                                bool wantFiles,
-                                bool includePath){
-    unzFile f = unzOpen(path.c_str());
-
-    enum {MAX_STRING_LENGTH=1024};
-    char filename[MAX_STRING_LENGTH];
-    Set fileSet;
-    
-    do {
-        
-        // prefix is valid, either "" or a subfolder
-        unzGetCurrentFileInfo(f, NULL, filename, MAX_STRING_LENGTH,	NULL, 0, NULL, 0);
-        _zip_addEntry(path, prefix, filename, fileSet, wantFiles, includePath);
-        
-    } while (unzGoToNextFile(f) != UNZ_END_OF_LIST_OF_FILE);
-    
-    unzClose(f);
-    
-    fileSet.getMembers(files);
-}
-
-
-static void determineFileOrDirList(
-	const std::string&			filespec,
-	Array&			files,
-	bool						wantFiles,
-	bool						includePath) {
-
-	// if it is a .zip, prefix will specify the folder within
-	// whose contents we want to see
-    std::string prefix = "";
-    std::string path = filenamePath(filespec);
-
-    if ((path.size() > 0) && isSlash(path[path.size() - 1])) {
-        // Strip the trailing slash
-        path = path.substr(0, path.length() -1);
-    }
-    
-    if (fileExists(path, false)) {
-        if (isZipfile(path)) {
-            // .zip should only work if * is specified as the Base + Ext
-            // Here, we have been asked for the root's contents
-            debugAssertM(filenameBaseExt(filespec) == "*", "Can only call getFiles/getDirs on zipfiles using '*' wildcard");
-            getFileOrDirListZip(path, prefix, files, wantFiles, includePath);
-        } else {
-            // It is a normal directory
-            getFileOrDirListNormal(filespec, files, wantFiles, includePath);
-        }
-    } else if (zipfileExists(filenamePath(filespec), path, prefix)) {
-        // .zip should only work if * is specified as the Base + Ext
-        // Here, we have been asked for the contents of a folder within the .zip
-        debugAssertM(filenameBaseExt(filespec) == "*", "Can only call getFiles/getDirs on zipfiles using '*' wildcard");
-        getFileOrDirListZip(path, prefix, files, wantFiles, includePath);
-    }
-}
-
-
-void getFiles(
-              const std::string&			filespec,
-              Array&			files,
-              bool					includePath) {
-    
-    determineFileOrDirList(filespec, files, true, includePath);
-}
-
-
-void getDirs(
-	const std::string&			filespec,
-	Array&			files,
-	bool						includePath) {
-
-	determineFileOrDirList(filespec, files, false, includePath);
-}
-
-
-std::string filenameBaseExt(const std::string& filename) {
-    int i = filename.rfind("/");
-    int j = filename.rfind("\\");
-
-    if ((j > i) && (j >= 0)) {
-        i = j;
-    }
-
-#   ifdef G3D_WIN32
-        j = filename.rfind(":");
-        if ((i == -1) && (j >= 0)) {
-            i = j;
-        }
-#   endif
-
-    if (i == -1) {
-        return filename;
-    } else {
-        return filename.substr(i + 1, filename.length() - i);
-    }
-}
-
-
-std::string filenameBase(const std::string& s) {
-    std::string drive;
-    std::string base;
-    std::string ext;
-    Array path;
-
-    parseFilename(s, drive, path, base, ext);
-    return base;
-}
-
-
-std::string filenameExt(const std::string& filename) {
-    int i = filename.rfind(".");
-    if (i >= 0) {
-        return filename.substr(i + 1, filename.length() - i);
-    } else {
-        return "";
-    }
-}
-
-
-std::string filenamePath(const std::string& filename) {
-    int i = filename.rfind("/");
-    int j = filename.rfind("\\");
-
-    if ((j > i) && (j >= 0)) {
-        i = j;
-    }
-
-#   ifdef G3D_WIN32
-        j = filename.rfind(":");
-        if ((i == -1) && (j >= 0)) {
-            i = j;
-        }
-#   endif
-
-    if (i == -1) {
-        return "";
-    } else {
-        return filename.substr(0, i+1);
-    }
-}
-
-
-bool isZipfile(const std::string& filename) {
-
-	FILE* f = fopen(filename.c_str(), "r");
-	if (f == NULL) {
-		return false;
-	}
-	uint8 header[4];
-	fread(header, 4, 1, f);
-	
-	const uint8 zipHeader[4] = {0x50, 0x4b, 0x03, 0x04};
-	for (int i = 0; i < 4; ++i) {
-		if (header[i] != zipHeader[i]) {
-			fclose(f);
-			return false;
-		}
-	}
-
-	fclose(f);
-	return true;
-}
-
-
-bool isDirectory(const std::string& filename) {
-    struct _stat st;
-    bool exists = _stat(filename.c_str(), &st) != -1;
-    return exists && ((st.st_mode & S_IFDIR) != 0);
-}
-
-
-bool filenameContainsWildcards(const std::string& filename) {
-    return (filename.find('*') != std::string::npos) || (filename.find('?') != std::string::npos);
-}
-
-
-bool fileIsNewer(const std::string& src, const std::string& dst) {
-    struct _stat sts;
-    bool sexists = _stat(src.c_str(), &sts) != -1;
-
-    struct _stat dts;
-    bool dexists = _stat(dst.c_str(), &dts) != -1;
-
-    return sexists && ((! dexists) || (sts.st_mtime > dts.st_mtime));
-}
-
-
-Array filesUsed() {
-    Array f;
-    _internal::currentFilesUsed.getMembers(f);
-    return f;
-}
-
-}
-
-#ifndef G3D_WIN32
-  #undef _stat
-#endif
diff --git a/externals/g3dlite/G3D.lib/source/filter.cpp b/externals/g3dlite/G3D.lib/source/filter.cpp
deleted file mode 100644
index f6c0467820f..00000000000
--- a/externals/g3dlite/G3D.lib/source/filter.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
-  @file filter.cpp
-
-  @author Morgan McGuire, matrix@graphics3d.com
-  @created 2007-03-01
-  @edited  2007-03-01
-
-  Copyright 2000-2007, Morgan McGuire.
-  All rights reserved.
- */
-#include "G3D/filter.h"
-
-namespace G3D {
-
-void gaussian1D(Array& coeff, int N, float std) {
-    coeff.resize(N);
-    float sum = 0.0f;
-    for (int i = 0; i < N; ++i) {
-        float x = i - (N - 1) / 2.0f;
-        float p = -square(x / std) / 2.0f;
-        float y = exp(p);
-        coeff[i] = y;
-        sum += y;
-    }
-
-    for (int i = 0; i < N; ++i) {
-        coeff[i] /= sum;
-    }   
-}
-
-
-} // namespace
diff --git a/externals/g3dlite/G3D.lib/source/format.cpp b/externals/g3dlite/G3D.lib/source/format.cpp
deleted file mode 100644
index d9d1b516393..00000000000
--- a/externals/g3dlite/G3D.lib/source/format.cpp
+++ /dev/null
@@ -1,164 +0,0 @@
-/**
- @file format.cpp
-
- @author Morgan McGuire, graphics3d.com
-
- @created 2000-09-09
- @edited  2006-08-14
-*/
-
-#include "G3D/format.h"
-#include "G3D/platform.h"
-#include "G3D/System.h"
-
-#ifdef _MSC_VER
-    // disable: "C++ exception handler used"
-#   pragma warning (push)
-#   pragma warning (disable : 4530)
-#endif // _MSC_VER
-
-// If your platform does not have vsnprintf, you can find a
-// implementation at http://www.ijs.si/software/snprintf/
-
-namespace G3D {
-
-std::string __cdecl format(const char* fmt,...) {
-    va_list argList;
-    va_start(argList,fmt);
-    std::string result = vformat(fmt, argList);
-    va_end(argList);
-
-    return result;
-}
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1300)
-// Both MSVC seems to use the non-standard vsnprintf
-// so we are using vscprintf to determine buffer size, however
-// only MSVC7 and up headers include vscprintf for some reason.
-std::string vformat(const char *fmt, va_list argPtr) {
-    // We draw the line at a 1MB string.
-    const int maxSize = 1000000;
-
-    // If the string is less than 161 characters,
-    // allocate it on the stack because this saves
-    // the malloc/free time.
-    const int bufSize = 161;
-	char stackBuffer[bufSize];
-
-    // MSVC does not support va_copy
-    int actualSize = _vscprintf(fmt, argPtr) + 1;
-
-    if (actualSize > bufSize) {
-
-        // Now use the heap.
-        char* heapBuffer = NULL;
-
-        if (actualSize < maxSize) {
-
-            heapBuffer = (char*)System::malloc(maxSize + 1);
-            _vsnprintf(heapBuffer, maxSize, fmt, argPtr);
-            heapBuffer[maxSize] = '\0';
-        } else {
-            heapBuffer = (char*)System::malloc(actualSize);
-            vsprintf(heapBuffer, fmt, argPtr);            
-        }
-
-        std::string formattedString(heapBuffer);
-        System::free(heapBuffer);
-        return formattedString;
-    } else {
-
-        vsprintf(stackBuffer, fmt, argPtr);
-        return std::string(stackBuffer);
-    }
-}
-
-#elif defined(_MSC_VER) && (_MSC_VER < 1300)
-
-std::string vformat(const char *fmt, va_list argPtr) {
-    // We draw the line at a 1MB string.
-    const int maxSize = 1000000;
-
-    // If the string is less than 161 characters,
-    // allocate it on the stack because this saves
-    // the malloc/free time.
-    const int bufSize = 161;
-	char stackBuffer[bufSize];
-
-	// MSVC6 doesn't support va_copy, however it also seems to compile
-	// correctly if we just pass our argument list along.  Note that 
-	// this whole code block is only compiled if we're on MSVC6 anyway
-	int actualWritten = _vsnprintf(stackBuffer, bufSize, fmt, argPtr);
-
-    // Not a big enough buffer, bufSize characters written
-    if (actualWritten == -1) {
-
-        int heapSize = 512;
-        double powSize = 1.0;
-        char* heapBuffer = (char*)System::malloc(heapSize);
-        
-        while ((_vsnprintf(heapBuffer, heapSize, fmt, argPtr) == -1) &&
-            (heapSize  < maxSize)) {
-
-            heapSize = iCeil(heapSize * ::pow((double)2.0, powSize++));
-            heapBuffer = (char*)System::realloc(heapBuffer, heapSize);
-        }
-
-        heapBuffer[heapSize-1] = '\0';
-
-        std::string heapString(heapBuffer);
-        System::free(heapBuffer);
-
-        return heapString;
-    } else {
-
-        return std::string(stackBuffer);
-    }
-}
-
-#else
-
-// glibc 2.1 has been updated to the C99 standard
-std::string vformat(const char* fmt, va_list argPtr) {
-    // If the string is less than 161 characters,
-    // allocate it on the stack because this saves
-    // the malloc/free time.  The number 161 is chosen
-    // to support two lines of text on an 80 character
-    // console (plus the null terminator).
-    const int bufSize = 161;
-    char stackBuffer[bufSize];
-
-    va_list argPtrCopy;
-    va_copy(argPtrCopy, argPtr);
-    int numChars = vsnprintf(stackBuffer, bufSize, fmt, argPtrCopy);
-    va_end(argPtrCopy);
-
-    if (numChars >= bufSize) {
-      // We didn't allocate a big enough string.
-      char* heapBuffer = (char*)System::malloc((numChars + 1) * sizeof(char));
-
-      debugAssert(heapBuffer);
-      int numChars2 = vsnprintf(heapBuffer, numChars + 1, fmt, argPtr);
-      debugAssert(numChars2 == numChars);
-      (void)numChars2;
-
-      std::string result(heapBuffer);
-      
-      System::free(heapBuffer);
-
-      return result;
-
-    } else {
-
-      return std::string(stackBuffer);
-
-    }
-}
-
-#endif
-
-} // namespace
-
-#ifdef _MSC_VER
-#   pragma warning (pop)
-#endif
diff --git a/externals/g3dlite/G3D.lib/source/g3dmath.cpp b/externals/g3dlite/G3D.lib/source/g3dmath.cpp
deleted file mode 100644
index 95c9e16cc24..00000000000
--- a/externals/g3dlite/G3D.lib/source/g3dmath.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- @file g3dmath.cpp
- 
- @author Morgan McGuire, graphics3d.com
-  
- @created 2001-06-02
- @edited  2004-02-24
- */
-
-#include "G3D/g3dmath.h"
-#include 
-
-namespace G3D {
-
-float gaussRandom(float mean, float stdev) {
-
-    // Using Box-Mueller method from http://www.taygeta.com/random/gaussian.html
-    // Modified to specify standard deviation and mean of distribution
-    float w, x1, x2;
-
-    // Loop until w is less than 1 so that log(w) is negative
-    do {
-        x1 = uniformRandom(-1.0, 1.0);
-        x2 = uniformRandom(-1.0, 1.0);
-
-        w = float(square(x1) + square(x2));
-    } while (w > 1.0f);
-
-    // Transform to gassian distribution
-    // Multiply by sigma (stdev ^ 2) and add mean.
-    return x2 * (float)square(stdev) * sqrtf((-2.0f * logf(w) ) / w) + mean; 
-}
-
-
-int highestBit(uint32 x) {
-    // Binary search.
-    int base = 0;
-
-	if (x & 0xffff0000)	{
-		base = 16;
-		x >>= 16;
-	}
-    if (x & 0x0000ff00) {
-		base += 8;
-		x >>= 8;
-	}
-    if (x & 0x000000f0) {
-		base += 4;
-		x >>= 4;
-	}
-
-	static const int lut[] = {-1,0,1,1,2,2,2,2,3,3,3,3,3,3,3,3};
-	return base + lut[x];
-}
-
-
-int iRandom(int low, int high) {
-	int r = iFloor(low + (high - low + 1) * (double)rand() / RAND_MAX);
-
-	// There is a *very small* chance of generating
-	// a number larger than high.
-	if (r > high) {
-		return high;
-	} else {
-		return r;
-	}
-}
-
-
-}
diff --git a/externals/g3dlite/G3D.lib/source/license.cpp b/externals/g3dlite/G3D.lib/source/license.cpp
deleted file mode 100644
index b362ad3f45f..00000000000
--- a/externals/g3dlite/G3D.lib/source/license.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- @file license.cpp
- 
- @author Morgan McGuire, graphics3d.com
- 
- @created 2004-04-15
- @edited  2004-04-15
-*/
-
-#include "G3D/format.h"
-#include 
-
-namespace G3D {
-
-std::string license() {
-    return format(
-
-"This software is based in part on the PNG Reference Library which is\n"
-"Copyright (c) 2004 Glenn Randers-Pehrson\n\n"
-"This software is based in part on the work of the Independent JPEG Group.\n\n"
-"This software is based on part on the FFmpeg libavformat and libavcodec libraries\n" 
-"(\"FFmpeg\", http://ffmpeg.mplayerhq.hu), which are included under the terms of the\n" 
-"GNU Lesser General Public License (LGPL), (http://www.gnu.org/copyleft/lesser.html).\n\n"
-"%s"
-"This program uses the G3D Library (http://g3d-cpp.sf.net), which\n"
-"is licensed under the \"BSD\" Open Source license.  The Graphics3D library\n"
-"source code is Copyright © 2000-2008, Morgan McGuire, All rights reserved.\n"
-"The BSD license requires the following statement regarding G3D:\n"
-"\n"
-"Redistribution and use in source and binary forms, with or without\n"
-"modification, are permitted provided that the following conditions\n"
-"are met:\n"
-"\n"
-"Redistributions of source code must retain the above copyright\n"
-"notice, this list of conditions and the following disclaimer.\n"
-"\n"
-"Redistributions in binary form must reproduce the above copyright\n"
-"notice, this list of conditions and the following disclaimer in the\n"
-"documentation and/or other materials provided with the distribution.\n" 
-"\n"
-"Neither the name of Morgan McGuire, Brown University, Williams College, nor the names\n"
-"of the G3D contributors may be used to endorse or promote products derived\n"
-"from this software without specific prior written permission.\n"
-"\n"
-"THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n"
-"\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n"
-"LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\n"
-"A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\n"
-"OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n"
-"SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\n"
-"LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\n"
-"DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\n"
-"THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n"
-"(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n"
-"OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
-"\n\n"
-"G3D VERSION %d\n", 
-
-#ifdef G3D_WIN32
-    "" // Win32 doesn't use SDL
-#else
-    "This software uses the Simple DirectMedia Layer library (\"SDL\",\n"
-    "http://www.libsdl.org), which is included under the terms of the\n"
-    "GNU Lesser General Public License, (http://www.gnu.org/copyleft/lesser.html).\n\n"
-#endif
-,
-G3D_VER);
-}
-
-}
diff --git a/externals/g3dlite/G3D.lib/source/prompt.cpp b/externals/g3dlite/G3D.lib/source/prompt.cpp
deleted file mode 100644
index 1fb3bd4cfee..00000000000
--- a/externals/g3dlite/G3D.lib/source/prompt.cpp
+++ /dev/null
@@ -1,716 +0,0 @@
-/**
- @file prompt.cpp
- 
- @author Morgan McGuire, morgan@graphics3d.com 
- @cite Windows dialog interface by Max McGuire, mmcguire@ironlore.com
- @cite Font setting code by Kurt Miller, kurt@flipcode.com
-
- @created 2000-08-26
- @edited  2005-01-14
- */
-
-#include "G3D/prompt.h"
-#include "G3D/platform.h"
-
-#include 
-
-#ifdef G3D_WIN32
-#    include 
-#    include 
-#else
-#    define _getch getchar
-#endif
-
-#ifdef G3D_OSX
-#    include 
-#endif
-
-namespace G3D {
-
-#ifdef G3D_WIN32
-
-namespace _internal {
-/**
- Generic Win32 dialog facility.
- @author Max McGuire
- */
-class DialogTemplate {
-public:
-
-    DialogTemplate(LPCSTR caption, DWORD style, 
-                 int x, int y, int w, int h,
-                 LPCSTR font = NULL, WORD fontSize = 8) {
-    
-      usedBufferLength = sizeof(DLGTEMPLATE);
-      totalBufferLength = usedBufferLength;
-
-      dialogTemplate = (DLGTEMPLATE*)malloc(totalBufferLength);
-
-      dialogTemplate->style = style;
-        
-      if (font != NULL) {
-        dialogTemplate->style |= DS_SETFONT;
-      }
-        
-      dialogTemplate->x     = (short)x;
-      dialogTemplate->y     = (short)y;
-      dialogTemplate->cx    = (short)w;
-      dialogTemplate->cy    = (short)h;
-      dialogTemplate->cdit  = 0;
-        
-      dialogTemplate->dwExtendedStyle = 0;
-
-      // The dialog box doesn't have a menu or a special class
-      AppendData("\0", 2);
-      AppendData("\0", 2);
-
-      // Add the dialog's caption to the template
-
-      AppendString(caption);
-
-      if (font != NULL) {
-          AppendData(&fontSize, sizeof(WORD));
-          AppendString(font);
-      }
-    }
-
-  void AddComponent(LPCSTR type, LPCSTR caption, DWORD style, DWORD exStyle, int x, int y, int w, int h, WORD id) {
-
-      DLGITEMTEMPLATE item;
-
-      item.style = style;
-      item.x     = (short)x;
-      item.y     = (short)y;
-      item.cx    = (short)w;
-      item.cy    = (short)h;
-      item.id    = id;
-
-      item.dwExtendedStyle = exStyle;
-
-      AppendData(&item, sizeof(DLGITEMTEMPLATE));
-        
-      AppendString(type);
-      AppendString(caption);
-
-      WORD creationDataLength = 0;
-      AppendData(&creationDataLength, sizeof(WORD));
-
-      // Increment the component count
-      dialogTemplate->cdit++;
-
-    }
-
-
-  void AddButton(LPCSTR caption, DWORD style, DWORD exStyle, int x, int y, int w, int h, WORD id) {
-
-      AddStandardComponent(0x0080, caption, style, exStyle, x, y, w, h, id);
-
-      WORD creationDataLength = 0;
-      AppendData(&creationDataLength, sizeof(WORD));
-
-    }
-
-
-  void AddEditBox(LPCSTR caption, DWORD style, DWORD exStyle, int x, int y, int w, int h, WORD id) {
-
-      AddStandardComponent(0x0081, caption, style, exStyle, x, y, w, h, id);
-    
-      WORD creationDataLength = 0;
-      AppendData(&creationDataLength, sizeof(WORD));
-    
-    }
-
-
-  void AddStatic(LPCSTR caption, DWORD style, DWORD exStyle, int x, int y, int w, int h, WORD id) {
-
-      AddStandardComponent(0x0082, caption, style, exStyle, x, y, w, h, id);
-    
-      WORD creationDataLength = 0;
-      AppendData(&creationDataLength, sizeof(WORD));
-    
-    }
-
-
-  void AddListBox(LPCSTR caption, DWORD style, DWORD exStyle, int x, int y, int w, int h, WORD id) {
-
-      AddStandardComponent(0x0083, caption, style, exStyle, x, y, w, h, id);
-    
-      WORD creationDataLength = sizeof(WORD) + 5 * sizeof(WCHAR);
-      AppendData(&creationDataLength, sizeof(WORD));
-
-      AppendString("TEST");
-    
-    }
-    
-
-  void AddScrollBar(LPCSTR caption, DWORD style, DWORD exStyle, int x, int y, int w, int h, WORD id) {
-
-      AddStandardComponent(0x0084, caption, style, exStyle, x, y, w, h, id);
-    
-      WORD creationDataLength = 0;
-      AppendData(&creationDataLength, sizeof(WORD));
-    
-    }
-
-
-  void AddComboBox(LPCSTR caption, DWORD style, DWORD exStyle, int x, int y, int w, int h, WORD id) {
-
-      AddStandardComponent(0x0085, caption, style, exStyle, x, y, w, h, id);
-    
-      WORD creationDataLength = 0;
-      AppendData(&creationDataLength, sizeof(WORD));
-
-    }
-
-
-  /**
-   *
-   * Returns a pointer to the Win32 dialog template which the object
-   * represents. This pointer may become invalid if additional components
-   * are added to the template.
-   *
-   */
-  operator const DLGTEMPLATE*() const {
-      return dialogTemplate;
-  }
-
-  virtual ~DialogTemplate() {
-      free(dialogTemplate);
-  }
-
-protected:
-
-  void AddStandardComponent(WORD type, LPCSTR caption, DWORD style, DWORD exStyle, 
-                            int x, int y, int w, int h, WORD id, LPSTR font = NULL, WORD fontSize = 8) {
-
-      DLGITEMTEMPLATE item;
-
-      // DWORD align the beginning of the component data
-        
-      AlignData(sizeof(DWORD));
-
-      item.style = style;
-      if (font != NULL) {
-          item.style |= DS_SETFONT;
-      }
-      item.x     = (short)x;
-      item.y     = (short)y;
-      item.cx    = (short)w;
-      item.cy    = (short)h;
-      item.id    = id;
-
-      item.dwExtendedStyle = exStyle;
-
-      AppendData(&item, sizeof(DLGITEMTEMPLATE));
-        
-      WORD preType = 0xFFFF;
-        
-      AppendData(&preType, sizeof(WORD));
-      AppendData(&type, sizeof(WORD));
-
-      AppendString(caption);
-
-      if (font != NULL) {
-          AppendData(&fontSize, sizeof(WORD));
-          AppendString(font);
-      }
-
-      // Increment the component count
-      dialogTemplate->cdit++;
-  }
-
-    
-  void AlignData(int size) {
-
-      int paddingSize = usedBufferLength % size;
-        
-      if (paddingSize != 0) {
-          EnsureSpace(paddingSize);
-          usedBufferLength += paddingSize;
-      }
-
-  }
-
-  void AppendString(LPCSTR string) {
-
-      int length = MultiByteToWideChar(CP_ACP, 0, string, -1, NULL, 0);
-
-      WCHAR* wideString = (WCHAR*)malloc(sizeof(WCHAR) * length);
-      MultiByteToWideChar(CP_ACP, 0, string, -1, wideString, length);
-
-      AppendData(wideString, length * sizeof(WCHAR));
-      free(wideString);
-
-  }
-
-  void AppendData(const void* data, int dataLength) {
-
-      EnsureSpace(dataLength);
-
-      memcpy((char*)dialogTemplate + usedBufferLength, data, dataLength);
-      usedBufferLength += dataLength;
-
-  }
-
-  void EnsureSpace(int length) {
-      if (length + usedBufferLength > totalBufferLength) {
-          totalBufferLength += length * 2;
-
-          void* newBuffer = malloc(totalBufferLength);
-          memcpy(newBuffer, dialogTemplate, usedBufferLength);
-            
-          free(dialogTemplate);
-          dialogTemplate = (DLGTEMPLATE*)newBuffer;
-      }
-  }
-
-private:
-
-  DLGTEMPLATE*      dialogTemplate;
-
-  int               totalBufferLength;
-  int               usedBufferLength;
-
-};
-
-
-struct PromptParams {
-    const char* message;
-    const char* title;
-};
-
-/**
- * Constants for controls.
- */
-#define IDC_MESSAGE     1000
-#define IDC_BUTTON0     2000
-
-INT_PTR CALLBACK PromptDlgProc(HWND hDlg, UINT msg,
-                               WPARAM wParam, LPARAM lParam) {
-  switch(msg) {
-    case WM_INITDIALOG:
-      {
-        PromptParams *params = (PromptParams*)lParam;
-        ::SetWindowTextA(::GetDlgItem(hDlg, IDC_MESSAGE), params->message);
-
-        ::SetFocus(::GetDlgItem(hDlg, IDC_BUTTON0));
-
-        SetWindowTextA(hDlg, params->title);
-
-        HFONT hfont =
-            CreateFontA(16, 0, 0, 0, FW_NORMAL,
-                       FALSE, FALSE, FALSE, 
-                       ANSI_CHARSET,OUT_DEFAULT_PRECIS,CLIP_DEFAULT_PRECIS,
-                        PROOF_QUALITY, FIXED_PITCH | FF_MODERN, "Courier New");
-                        
-        SendDlgItemMessage(hDlg, IDC_MESSAGE, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE,0));
-
-
-        break;
-      }
-    case WM_COMMAND:
-      {
-          int choiceNumber = LOWORD(wParam) - IDC_BUTTON0;
-          if ((choiceNumber >= 0) && (choiceNumber < 10)) {
-              EndDialog(hDlg, choiceNumber);
-              return TRUE;
-          }
-      }
-
-      break;
-
-    case WM_NCDESTROY:
-        // Under SDL 1.2.6 we get a NCDESTROY message for no reason and the
-        // window is immediately closed.  This is here to debug the problem.
-        (void)0;
-        break;
-
-    }
-
-    return FALSE;
-}
-
-}; // namespace _internal
-
-
-using namespace _internal;
-
-/**
- * Show a dialog prompt.
- */
-static int guiPrompt(
-    const char*         windowTitle,
-    const char*         prompt,
-    const char**        choice,
-    int                 numChoices) {
-
-    int width = 280;
-    int height = 128;
-
-    const int buttonSpacing = 2;
-    const int buttonWidth = 
-        (width - buttonSpacing * 2 - 
-          buttonSpacing * (numChoices - 1)) / numChoices;
-    const int buttonHeight = 13;
-
-
-    DialogTemplate dialogTemplate(
-        windowTitle,
-        WS_CAPTION | DS_CENTER | WS_SYSMENU,
-        10, 10, width, height,
-        "Tahoma");
-
-    dialogTemplate.AddEditBox(
-        "Edit", WS_VISIBLE | ES_READONLY | ES_OEMCONVERT | ES_MULTILINE | WS_TABSTOP, WS_EX_STATICEDGE,
-        2, 2, width - 4, height - buttonHeight - 7, IDC_MESSAGE);
-
-    int i;
-    for (i = 0; i < numChoices; i++) {
-
-        int x = buttonSpacing + i * (buttonWidth + buttonSpacing);
-        int y = height - buttonHeight - buttonSpacing;
-
-        dialogTemplate.AddButton(choice[i], WS_VISIBLE | WS_TABSTOP, 0,
-                           x, y, buttonWidth, buttonHeight, IDC_BUTTON0 + (WORD)i);
-        
-    }
-
-    // Convert all single \n characters to \r\n for proper printing
-    int strLen = 0;
-    const char* pStr = prompt;
-
-    while (*pStr != '\0') {
-        if ((*pStr == '\n') && (pStr != prompt)) {
-            if (*(pStr - 1) != '\r') {
-                ++strLen;
-            }
-        }
-        ++strLen;
-        ++pStr;
-    }
-
-    char* newStr = (char*)malloc(strLen + 1);
-    
-    const char* pStr2 = prompt;
-    char* pNew = newStr;
-
-    while (*pStr2 != '\0') {
-        if ((*pStr2 == '\n') && (pStr2 != prompt)) {
-            if (*(pStr2 - 1) != '\r') {
-                *pNew = '\r';
-                ++pNew;
-            }
-        }
-        *pNew = *pStr2;
-        ++pNew;
-        ++pStr2;
-    }
-
-    *pNew = '\0';
-
-    PromptParams params;
-    params.message  = newStr;;
-    params.title    = windowTitle;
-
-    HMODULE module = GetModuleHandle(0);
-    int ret = DialogBoxIndirectParam(module, dialogTemplate, NULL, (DLGPROC) PromptDlgProc, (DWORD)¶ms);
-
-    free(newStr);
-
-    /*
-     For debugging when DialogBoxIndirectParam fails:
-
-        // The last error value.  (Which is preserved across the call).
-        DWORD lastErr = GetLastError();
-    
-        // The decoded message from FormatMessage
-        LPTSTR formatMsg = NULL;
-
-        if (NULL == formatMsg) {
-            FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
-                          FORMAT_MESSAGE_IGNORE_INSERTS |
-                          FORMAT_MESSAGE_FROM_SYSTEM,
-                            NULL,
-                            lastErr,
-                            0,
-                            (LPTSTR)&formatMsg,
-                            0,
-                            NULL);
-        }
-
-        // Make sure the message got translated into something.
-        LPTSTR realLastErr;
-        if (NULL != formatMsg) {
-            realLastErr = formatMsg;
-        } else {
-            realLastErr = "Last error code does not exist.";
-        }
-
-        // Get rid of the allocated memory from FormatMessage.
-        if (NULL != formatMsg) {
-            LocalFree((LPVOID)formatMsg);
-        }
-        */
-
-    return ret;
-}
-
-#endif
-
-
-/**
- * Show a prompt on stdout 
- */
-static int textPrompt(
-    const char*         windowTitle,
-    const char*         prompt,
-    const char**        choice,
-    int                 numChoices) {
-
-    printf("\n___________________________________________________\n");
-    printf("%s\n", windowTitle);
-    printf("%s", prompt);
-
-    if (numChoices > 10) {
-        numChoices = 10;
-    }
-
-    int c = -1;
-    if (numChoices > 1) {
-        printf("\n");
-        printf("Choose an option by number:");
-
-        while ((c < 0) || (c >= numChoices)) { 
-            printf("\n");
-
-            for (int i = 0; i < numChoices; i++) {
-                if (numChoices <= 3) {
-                    printf("  (%d) %s ", i, choice[i]);
-                } else {
-                    printf("  (%d) %s\n", i, choice[i]);
-                }
-            }
-
-            printf("\n> ");
-            c = _getch() - '0';
-
-            if ((c < 0) || (c >= numChoices)) {
-                printf("'%d' is not a valid choice.", c);
-            } else {
-                printf("%d", c);
-            }
-        }
-    
-    } else if (numChoices == 1) {
-        
-        printf("\nPress any key for '%s'...", choice[0]);
-        _getch();
-        c = 0;
-
-    } else {
-
-        printf("\nPress any key...");
-        _getch();
-        c = 0;
-    }
-
-    printf("\n___________________________________________________\n");
-    return c;
-}
-
-#ifdef G3D_OSX
-
-// See http://developer.apple.com/documentation/Carbon/Reference/Carbon_Event_Manager_Ref/index.html
-
-#define CARBON_COMMANDID_START	128
-#define CARBON_BUTTON_SPACING	12
-#define CARBON_BUTTON_HEIGHT	20
-#define CARBON_BUTTON_MINWIDTH	69
-#define CARBON_WINDOW_PADDING	20
-
-struct CallbackData {
-    WindowRef	refWindow;
-
-    /** Index of this particular button */
-    int         myIndex;
-
-    /** Buttons store their index into here when pressed. */
-    int*        whichButton;
-};
-
-/**
- Assumes that userData is a pointer to a carbon_evt_data_t.
- 
- */
-static pascal OSStatus DoCommandEvent(EventHandlerCallRef handlerRef, EventRef event, void* userData) {
-    // See http://developer.apple.com/documentation/Carbon/Conceptual/HandlingWindowsControls/index.html
-
-    CallbackData& callbackData = *(CallbackData*)userData;
-
-#   pragma unused(handlerRef)
-	
-    callbackData.whichButton[0] = callbackData.myIndex;
-	
-    // If we get here we can close the window
-    QuitAppModalLoopForWindow(callbackData.refWindow);
-	
-    // Return noErr to indicate that we handled the event
-    return noErr;
-}
-
-static int guiPrompt
-(const char*         windowTitle,
- const char*         prompt,
- const char**        choice,
- int                 numChoices) {
-
-    WindowRef	 window;
-
-    int          iNumButtonRows	= 0;
-    int          iButtonWidth   = -1;
-    OSStatus	 err            = noErr;
-    
-    // Determine number of rows of buttons
-    while (iButtonWidth < CARBON_BUTTON_MINWIDTH) {
-        ++iNumButtonRows;
-        iButtonWidth = 
-            (550 - (CARBON_WINDOW_PADDING*2 + 
-                    (CARBON_BUTTON_SPACING*numChoices))) / 
-            (numChoices/iNumButtonRows);
-    }
-	
-    // Window Variables
-    Rect	rectWin = {0, 0, 200 + ((iNumButtonRows-1) * (CARBON_BUTTON_HEIGHT+CARBON_BUTTON_SPACING)), 550};			// top, left, bottom, right
-    CFStringRef	szWindowTitle = CFStringCreateWithCString(kCFAllocatorDefault, windowTitle, kCFStringEncodingUTF8);
-
-    window = NULL;
-
-    err = CreateNewWindow(kMovableAlertWindowClass, kWindowStandardHandlerAttribute|kWindowCompositingAttribute, &rectWin, &window);
-    err = SetWindowTitleWithCFString(window, szWindowTitle);
-    err = SetThemeWindowBackground(window, kThemeBrushAlertBackgroundActive, false);
-    assert(err == noErr);
-    
-    // Event Handler Variables
-    EventTypeSpec	buttonSpec[] = {{ kEventClassControl, kEventControlHit }, { kEventClassCommand, kEventCommandProcess }};
-    EventHandlerUPP	buttonHandler = NewEventHandlerUPP(DoCommandEvent);
-    
-    // Static Text Variables
-    Rect		rectStatic = {20, 20, 152, 530};
-    CFStringRef		szStaticText = CFStringCreateWithCString(kCFAllocatorDefault, prompt, kCFStringEncodingUTF8);
-    ControlRef		refStaticText = NULL;
-    err = CreateStaticTextControl(window, &rectStatic, szStaticText, NULL, &refStaticText);
-    
-    // Button Variables
-    Rect		bounds[numChoices];
-    CFStringRef		caption[numChoices];
-    ControlRef		button[numChoices];
-
-    int whichButton=-1;
-    CallbackData        callbackData[numChoices];
-	
-    // Create the Buttons and assign event handlers
-    for (int i = 0; i < numChoices; ++i) {
-        bounds[i].top	 = 160 + ((CARBON_BUTTON_HEIGHT+CARBON_BUTTON_SPACING)*(i%iNumButtonRows));
-        bounds[i].right	 = 530 - ((iButtonWidth+CARBON_BUTTON_SPACING)*(i/iNumButtonRows));
-        bounds[i].left	 = bounds[i].right - iButtonWidth;
-        bounds[i].bottom = bounds[i].top + CARBON_BUTTON_HEIGHT;
-        
-        // Convert the button captions to Apple strings
-        caption[i] = CFStringCreateWithCString(kCFAllocatorDefault, choice[i], kCFStringEncodingUTF8);
-    
-        err = CreatePushButtonControl(window, &bounds[i], caption[i], &button[i]);
-        assert(err == noErr);
-
-        err = SetControlCommandID(button[i], CARBON_COMMANDID_START + i);
-        assert(err == noErr);
-
-        callbackData[i].refWindow   = window;
-        callbackData[i].myIndex     = i;
-        callbackData[i].whichButton = &whichButton;
-
-        err = InstallControlEventHandler(button[i], buttonHandler, 
-                                         GetEventTypeCount(buttonSpec), buttonSpec,
-                                         &callbackData[i], NULL);
-        assert(err == noErr);
-    }
-    
-    // Show Dialog
-    err = RepositionWindow(window, NULL, kWindowCenterOnMainScreen);
-    ShowWindow(window);
-    BringToFront(window);
-    err = ActivateWindow(window, true);
-    
-    // Hack to get our window/process to the front...
-    ProcessSerialNumber psn = { 0, kCurrentProcess};    
-    TransformProcessType(&psn, kProcessTransformToForegroundApplication);
-    SetFrontProcess (&psn);
-    
-    // Run in Modal State
-    err = RunAppModalLoopForWindow(window);
-
-    // Dispose of Button Related Data
-    for (int i = 0; i < numChoices; ++i) {
-        // Dispose of controls
-        DisposeControl(button[i]);
-        
-        // Release CFStrings
-        CFRelease(caption[i]);
-    }
-    
-    // Dispose of Other Controls
-    DisposeControl(refStaticText);
-    
-    // Dispose of Event Handlers
-    DisposeEventHandlerUPP(buttonHandler);
-    
-    // Dispose of Window
-    DisposeWindow(window);
-    
-    // Release CFStrings
-    CFRelease(szWindowTitle);
-    CFRelease(szStaticText);
-    
-    // Return Selection
-    return whichButton;
-}
-
-#endif
-
-int prompt(
-    const char*      windowTitle,
-    const char*      prompt, 
-    const char**     choice,
-    int              numChoices,
-    bool             useGui) {
-
-    #ifdef G3D_WIN32
-        if (useGui) {
-            // Build the message box
-            return guiPrompt(windowTitle, prompt, choice, numChoices);
-        }
-    #endif
-    
-        #ifdef G3D_OSX
-                if (useGui){
-                        //Will default to text prompt if numChoices > 4
-                        return guiPrompt(windowTitle, prompt, choice, numChoices);
-                }
-        #endif
-    return textPrompt(windowTitle, prompt, choice, numChoices);
-}
-
-
-void msgBox(
-    const std::string& message,
-    const std::string& title) {
-
-    const char *choice[] = {"Ok"};
-    prompt(title.c_str(), message.c_str(), choice, 1, true); 
-}
-
-#ifndef G3D_WIN32
-    #undef _getch
-#endif
-
-};// namespace
-
diff --git a/externals/g3dlite/G3D.lib/source/stringutils.cpp b/externals/g3dlite/G3D.lib/source/stringutils.cpp
deleted file mode 100644
index a21fc1f377c..00000000000
--- a/externals/g3dlite/G3D.lib/source/stringutils.cpp
+++ /dev/null
@@ -1,231 +0,0 @@
-/**
- @file stringutils.cpp
-
- @maintainer Morgan McGuire, matrix@graphics3d.com
-
- @created 2000-09-09
- @edited  2008-01-10
-*/
-
-#include "G3D/platform.h"
-#include "G3D/stringutils.h"
-#include "G3D/BinaryInput.h"
-#include 
-
-namespace G3D {
-
-#ifdef _MSC_VER
-    // disable: "C++ exception handler used"
-#   pragma warning (push)
-#   pragma warning (disable : 4530)
-#endif
-#ifdef G3D_WIN32
-    const char* NEWLINE = "\r\n";
-#else
-    const char* NEWLINE = "\n";
-    static bool iswspace(int ch) { return (ch==' ' || ch=='\t' || ch=='\n'); }
-#endif
-
-bool beginsWith(
-    const std::string& test,
-    const std::string& pattern) {
-
-    if (test.size() >= pattern.size()) {
-        for (int i = 0; i < (int)pattern.size(); ++i) {
-            if (pattern[i] != test[i]) {
-                return false;
-            }
-        }
-        return true;
-    } else {
-        return false;
-    }
-}
-
-
-bool endsWith(
-    const std::string& test,
-    const std::string& pattern) {
-
-    if (test.size() >= pattern.size()) {
-        int te = test.size() - 1;
-        int pe = pattern.size() - 1;
-        for (int i = pattern.size() - 1; i >= 0; --i) {
-            if (pattern[pe - i] != test[te - i]) {
-                return false;
-            }
-        }
-        return true;
-    } else {
-        return false;
-    }
-}
-
-
-std::string wordWrap(
-    const std::string&      input,
-    int                     numCols) {
-
-    std::string output;
-    size_t      c = 0;
-    int         len;
-
-    // Don't make lines less than this length
-    int         minLength = numCols / 4;
-    size_t      inLen = input.size();
-
-    bool first = true;
-    while (c < inLen) {
-        if (first) {
-            first = false;
-        } else {
-            output += NEWLINE;
-        }
-
-        if ((int)inLen - (int)c - 1 < numCols) {
-            // The end
-            output += input.substr(c, inLen - c);
-            break;
-        }
-
-        len = numCols;
-
-        // Look at character c + numCols, see if it is a space.
-        while ((len > minLength) &&
-               (input[c + len] != ' ')) {
-            len--;
-        }
-
-        if (len == minLength) {
-            // Just crop
-            len = numCols;
-
-        }
-
-        output += input.substr(c, len);
-        c += len;
-        if (c < input.size()) {
-            // Collapse multiple spaces.
-            while ((input[c] == ' ') && (c < input.size())) {
-                c++;
-            }
-        }
-    }
-
-    return output;
-}
-
-
-int stringCompare(
-    const std::string&      s1,
-    const std::string&      s2) {
-
-    return stringPtrCompare(&s1, &s2);
-}
-
-
-int stringPtrCompare(
-    const std::string*      s1,
-    const std::string*      s2) {
-
-    return s1->compare(*s2);
-}
-
-
-std::string toUpper(const std::string& x) {
-    std::string result = x;
-    std::transform(result.begin(), result.end(), result.begin(), toupper);
-    return result;
-}
-
-
-std::string toLower(const std::string& x) {
-    std::string result = x;
-    std::transform(result.begin(), result.end(), result.begin(), tolower);
-    return result;
-}
-
-
-Array stringSplit(
-    const std::string&          x,
-    char                        splitChar) {
-
-    Array out;
-    
-    // Pointers to the beginning and end of the substring
-    const char* start = x.c_str();
-    const char* stop = start;
-    
-    while ((stop = strchr(start, splitChar))) {
-        out.append(std::string(start, stop - start));
-        start = stop + 1;
-    }
-
-    // Append the last one
-    out.append(std::string(start));
-    
-    return out;
-}
-
-
-std::string stringJoin(
-    const Array&   a,
-    char                        joinChar) {
-
-    std::string out;
-
-    for (int i = 0; i < (int)a.size() - 1; ++i) {
-        out += a[i] + joinChar;
-    }
-
-    if (a.size() > 0) {
-        return out + a.last();
-    } else {
-        return out;
-    }
-}
-
-
-std::string stringJoin(
-    const Array&   a,
-    const std::string&          joinStr) {
-
-    std::string out;
-
-    for (int i = 0; i < (int)a.size() - 1; ++i) {
-        out += a[i] + joinStr;
-    }
-
-    if (a.size() > 0) {
-        return out + a.last();
-    } else {
-        return out;
-    }
-}
-
-
-std::string trimWhitespace(
-    const std::string&              s) {
-
-    size_t left = 0;
-    
-    // Trim from left
-    while ((left < s.length()) && iswspace(s[left])) {
-        ++left;
-    }
-
-    int right = s.length() - 1;
-    // Trim from right
-    while ((right > (int)left) && iswspace(s[right])) {
-        --right;
-    }
-    
-    return s.substr(left, right - left + 1);
-}
-
-}; // namespace
-
-#undef NEWLINE
-#ifdef _MSC_VER
-#   pragma warning (pop)
-#endif
diff --git a/externals/g3dlite/G3D.lib/source/uint128.cpp b/externals/g3dlite/G3D.lib/source/uint128.cpp
deleted file mode 100644
index 450009a5cff..00000000000
--- a/externals/g3dlite/G3D.lib/source/uint128.cpp
+++ /dev/null
@@ -1,155 +0,0 @@
-/**
- @file uint128.cpp
- 
- @maintainer Morgan McGuire, matrix@graphics3d.com
- @author Kyle Whitson
- 
- @created 2008-07-17
- @edited  2008-07-17
- */
-
-#include "G3D/uint128.h"
-
-namespace G3D {
-
-/** Adds two 64-bit integers, placing the result and the overflow into 64-bit integers.*/
-static void addAndCarry(const uint64& _a, const uint64& _b, uint64& carry, uint64& result) {
-        
-    // Break each number into 4 32-bit chunks. Since we are using uints, right-shifting will fill with zeros.
-    // This eliminates the need to and with 0xFFFFFFFF.
-    uint32 a [2] = {_a & 0xFFFFFFFF, _a >> 32};
-    uint32 b [2] = {_b & 0xFFFFFFFF, _b >> 32};
-
-    uint64 tmp = uint64(a[0]) + b[0];
-
-    result = tmp & 0xFFFFFFFF;
-    uint32 c = tmp >> 32;
-
-    tmp = uint64(c) + a[1] + b[1];
-    result += tmp << 32;
-    carry = (tmp >> 32);
-}
-
-/** Multiplies two unsigned 64-bit integers, placing the result into one 64-bit int and the overflow into another.*/
-void multiplyAndCarry(const uint64& _a, const uint64& _b, uint64& carry, uint64& result) {
-
-    // Break each number into 4 32-bit chunks. Since we are using uints, right-shifting will fill with zeros.
-    // This eliminates the need to and with 0xFFFFFFFF.
-    uint32 a [2] = {_a & 0xFFFFFFFF, _a >> 32};
-    uint32 b [2] = {_b & 0xFFFFFFFF, _b >> 32};
-
-    uint64 prod [2][2];
-    for(int i = 0; i < 2; ++i) {
-        for(int j = 0; j < 2; ++j) {
-            prod[i][j] = uint64(a[i]) * b[j];
-        }
-    }
-
-    // The product of the low bits of a and b will always fit into the result
-    result = prod[0][0];
-
-    // The product of the high bits of a and b will never fit into the result
-    carry = prod[1][1];
-
-    // The high 32 bits of prod[0][1] and prod[1][0] will never fit into the result
-    carry += prod[0][1] >> 32;
-    carry += prod[1][0] >> 32;
-
-    uint64 tmp;
-    addAndCarry(result, (prod[0][1] << 32), tmp, result);
-    carry += tmp;
-    addAndCarry(result, (prod[1][0] << 32), tmp, result);
-    carry += tmp;
-}
-
-
-uint128::uint128(const uint64& hi, const uint64& lo) : hi(hi), lo(lo) {
-}
-
-uint128::uint128(const uint64& lo) : hi(0), lo(lo) {
-}
-
-uint128& uint128::operator+=(const uint128& x) {
-
-    G3D::uint64 carry;
-    addAndCarry(lo, x.lo, carry, lo);
-
-    // Adding the carry will change hi. Save the old hi bits in case this == x.
-    const uint64 xHi = x.hi;
-    hi += carry;
-    hi += xHi;
-    return *this;
-}
-
-uint128& uint128::operator*=(const uint128& x) {
-
-    // The low bits will get overwritten when doing the multiply, so back up both (in case &x == this)
-    const uint64 oldLo = lo;
-    const uint64 oldXLo = x.lo;
-
-    G3D::uint64 carry;
-    multiplyAndCarry(oldLo, oldXLo, carry, lo);
-
-    // Overflow doesn't matter here because the result is going into hi - any overflow will exceed the capacity of a 128-bit number
-    // Note: hi * x.hi will always overflow, since (x * 2^64) * (y * 2^64) = x*y*(2^128). The largest number expressable in 128 bits is
-    // 2^128 - 1.
-    hi = carry + (oldLo * x.hi) + (hi * oldXLo);
-
-    return *this;
-}
-
-uint128& uint128::operator^=(const uint128& x) {
-    hi ^= x.hi;
-    lo ^= x.lo;
-    return *this;
-}
-
-uint128& uint128::operator&=(const uint128& x) {
-    hi &= x.hi;
-    lo &= x.lo;
-    return *this;
-}
-
-uint128& uint128::operator|=(const uint128& x) {
-    hi |= x.hi;
-    lo |= x.lo;
-    return *this;
-}
-
-bool uint128::operator==(const uint128& x) {
-    return (hi == x.hi) && (lo == x.lo);
-}
-
-uint128& uint128::operator>>=(const int x) {
-
-    //Before shifting, mask out the bits that will be shifted out of hi.
-    //Put a 1 in the first bit that will not be lost in the shift, then subtract 1 to get the mask.
-    uint64 mask = ((uint64)1L << x) - 1;
-    uint64 tmp = hi & mask;
-    hi >>= x;
-
-    //Shift lo and add the bits shifted down from hi
-    lo = (lo >> x) + (tmp << (64 - x));
-    
-    return *this;
-}
-
-uint128& uint128::operator<<=(const int x) {
-
-    //Before shifting, mask out the bits that will be shifted out of lo.
-    //Put a 1 in the last bit that will be lost in the shift, then subtract 1 to get the logical inverse of the mask.
-    //A bitwise NOT will then produce the correct mask.
-    uint64 mask = ~((((uint64)1L) << (64 - x)) - 1);
-    uint64 tmp = lo & mask;
-    lo <<= x;
-
-    //Shift hi and add the bits shifted up from lo
-    hi = (hi << x) + (tmp >> (64 - x));
-    
-    return *this;
-}
-
-uint128 uint128::operator&(const uint128& x) {
-    return uint128(hi & x.hi, lo & x.lo);
-}
-}
diff --git a/externals/g3dlite/G3D/AABox.h b/externals/g3dlite/G3D/AABox.h
new file mode 100644
index 00000000000..2e8da1f6098
--- /dev/null
+++ b/externals/g3dlite/G3D/AABox.h
@@ -0,0 +1,272 @@
+/**
+  @file AABox.h
+ 
+  Axis-aligned box class
+ 
+  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+ 
+  @created 2004-01-10
+  @edited  2009-02-10
+
+  Copyright 2000-2009, Morgan McGuire.
+  All rights reserved.
+ */
+
+#ifndef G3D_AABOX_H
+#define G3D_AABOX_H
+
+#include "G3D/platform.h"
+#include "G3D/Vector3.h"
+#include "G3D/debug.h"
+#include "G3D/Array.h"
+#include "G3D/Plane.h"
+
+namespace G3D {
+
+/**
+ An axis-aligned box.
+ */
+class AABox {
+private:
+    friend class Intersect;
+
+    /** Optional argument placeholder */
+    static int dummy;
+
+    Vector3  lo;
+    Vector3  hi;
+
+public:
+
+    /** Does not initialize the fields */
+    inline AABox() {}
+
+    /**
+     Constructs a zero-area AABox at v.
+     */
+    inline explicit AABox(const Vector3& v) {
+        lo = hi = v;
+    }
+
+    /** Assumes that low is less than or equal to high along each dimension.
+        To have this automatically enforced, use
+        AABox(low.min(high), low.max(high));
+    */
+    inline AABox(const Vector3& low, const Vector3& high) {
+        set(low, high);
+    }
+
+    /** Assumes that low is less than or equal to high along each dimension.
+    */
+    inline void set(const Vector3& low, const Vector3& high) {
+        debugAssert(
+            (low.x <= high.x) &&
+            (low.y <= high.y) &&
+            (low.z <= high.z));
+        lo = low;
+        hi = high;
+    }
+
+    /**
+     Grows to include the bounds of a
+     */
+    inline void merge(const AABox& a) {
+        lo = lo.min(a.lo);
+        hi = hi.max(a.hi);
+    }
+
+    inline void merge(const Vector3& a) {
+        lo = lo.min(a);
+        hi = hi.max(a);
+    }
+
+    void serialize(class BinaryOutput& b) const;
+    
+    void deserialize(class BinaryInput& b);
+
+    inline bool isFinite() const {
+        return lo.isFinite() && hi.isFinite();
+    }
+
+    inline const Vector3& low() const {
+        return lo;
+    }
+
+    inline const Vector3& high() const {
+        return hi;
+    }
+
+    /**
+     The largest possible finite box.
+     */
+    static const AABox& maxFinite();
+
+    /** A large finite box. This is smaller than FLT_MAX
+        because it leaves room to add boxes together. */
+    static const AABox& large();
+
+    static const AABox& inf();
+
+    static const AABox& zero();
+
+    /**
+      Returns the centroid of the box.
+     */
+    inline Vector3 center() const {
+        return (lo + hi) * 0.5;
+    }
+
+    Vector3 corner(int index) const;
+
+    /**
+     Distance from corner(0) to the next corner along axis a.
+     */
+    inline float extent(int a) const {
+        debugAssert(a < 3);
+        return hi[a] - lo[a];
+    }
+
+
+    inline Vector3 extent() const {
+        return hi - lo;
+    }
+
+
+    /**
+     Splits the box into two AABoxes along the specified axis.  low contains
+     the part that was closer to negative infinity along axis, high contains
+     the other part.  Either may have zero volume.
+     */
+    void split(const Vector3::Axis& axis, float location, AABox& low, AABox& high) const;
+
+	/**
+	 Conservative culling test for up to 32 planes.	
+	 Returns true if there exists a plane[p] for
+     which the entire object is in the negative half space
+     (opposite the plane normal).
+
+	 testMask and childMask
+	 are used for optimizing bounding volume hierarchies.
+     The version of this method that produces childMask
+     is slower than the version without; it should only
+     be used for parent nodes.
+
+	 @param cullingPlaneIndex The index of the first plane for which
+	  the entire object is in the negative half-space.  The function
+	  exits early when one plane is found.  -1 when the function
+	  returns false (i.e. when no plane culls the whole object).
+
+	 @param testMask  If bit p is 0, the 
+	   bounding volume automatically passes the culling test for
+	   plane[p] (i.e. it is known that the volume
+	   is entirely within the positive half space).  The function
+       must return false if testMask is 0 and test all planes
+       when testMask is -1 (0xFFFFFFFF).
+
+     @param childMask Test mask for the children of this volume.
+       
+	 */
+	bool culledBy(
+		const Array&		plane,
+		int32&					cullingPlaneIndex,
+		const uint32  			testMask,
+        uint32&                 childMask) const;
+
+    /**
+     Conservative culling test that does not produce a mask for children.
+     */
+	bool culledBy(
+		const Array&		plane,
+		int32&					cullingPlaneIndex = dummy,
+		const uint32  			testMask		  = 0xFFFFFFFF) const;
+
+    /** less than or equal to containment */
+    inline bool contains(const AABox& other) const {
+        return 
+            (other.hi.x <= hi.x) &&
+            (other.hi.y <= hi.y) &&
+            (other.hi.z <= hi.z) &&
+            (other.lo.x >= lo.x) &&
+            (other.lo.y >= lo.y) &&
+            (other.lo.z >= lo.z);
+    }
+
+    inline bool contains(
+        const Vector3&      point) const {
+        return
+            (point.x >= lo.x) &&
+            (point.y >= lo.y) &&
+            (point.z >= lo.z) &&
+            (point.x <= hi.x) &&
+            (point.y <= hi.y) &&
+            (point.z <= hi.z);
+    }
+
+    inline float area() const {
+        Vector3 diag = hi - lo;
+        return 2.0f * (diag.x * diag.y + diag.y * diag.z + diag.x * diag.z);
+    }
+
+    inline float volume() const {
+        Vector3 diag = hi - lo;
+        return diag.x * diag.y * diag.z;
+    }
+
+    Vector3 randomInteriorPoint() const;
+
+    Vector3 randomSurfacePoint() const;
+
+    /** Returns true if there is any overlap */
+    bool intersects(const AABox& other) const;
+
+    /** Returns true if there is any overlap.
+        @cite Jim Arvo's algorithm from Graphics Gems II*/
+    bool intersects(const class Sphere& other) const;
+
+    /** Return the intersection of the two boxes */
+    AABox intersect(const AABox& other) const {
+        Vector3 H = hi.min(other.hi);
+        Vector3 L = lo.max(other.lo).min(H);
+        return AABox(L, H);
+    }
+
+    inline size_t hashCode() const {
+        return lo.hashCode() + hi.hashCode();
+    }
+
+    inline bool operator==(const AABox& b) const {
+        return (lo == b.lo) && (hi == b.hi);
+    }
+
+    inline bool operator!=(const AABox& b) const {
+        return !((lo == b.lo) && (hi == b.hi));
+    }
+
+    inline AABox operator+(const Vector3& v) const {
+        AABox out;
+        out.lo = lo + v;
+        out.hi = hi + v;
+        return out;
+    }
+
+    inline AABox operator-(const Vector3& v) const {
+        AABox out;
+        out.lo = lo - v;
+        out.hi = hi - v;
+        return out;
+    }
+
+    void getBounds(AABox& out) const {
+        out = *this;
+    }
+};
+
+}
+
+template <> struct HashTrait {
+    static size_t hashCode(const G3D::AABox& key) { return key.hashCode(); }
+};
+
+
+
+#endif
diff --git a/externals/g3dlite/G3D/Any.h b/externals/g3dlite/G3D/Any.h
new file mode 100644
index 00000000000..49701202ca9
--- /dev/null
+++ b/externals/g3dlite/G3D/Any.h
@@ -0,0 +1,570 @@
+/**
+ @file Any.h
+  
+ @author Morgan McGuire, Shawn Yarbrough, and Corey Taylor
+ @maintainer Morgan McGuire
+  
+ @created 2006-06-11
+ @edited  2009-12-16
+
+ Copyright 2000-2010, Morgan McGuire.
+ All rights reserved.
+ */
+
+#ifndef G3D_Any_h
+#define G3D_Any_h
+
+#include "G3D/platform.h"
+#include "G3D/Table.h"
+#include "G3D/Array.h"
+#include "G3D/AtomicInt32.h"
+#include 
+
+// needed for Token
+#include "G3D/TextInput.h"
+
+#ifdef verify
+#undef verify
+#endif
+
+namespace G3D {
+
+class TextOutput;
+
+/** 
+\brief Easy loading and saving of human-readable configuration files.
+
+Encodes typed, structured data and can serialize it to a human
+readable format that is very similar to the Python language's data
+syntax.  Well-suited for quickly creating human-readable file formats,
+especially since deserialization and serialization preserve comments and
+an Any can tell you what file and line it came from.
+
+The class is designed so that copying Anys generally is fast, even if
+it is a large array or table.  This is because data is shared between
+copies until it is mutated, at which point an actual copy occurs.
+
+\section Example
+Sample File:
+
+{
+   shape = "round",
+
+   # in meters
+   radius = 3.7,
+
+   position = Vector3(1.0, -1.0, 0.0),
+   texture = { format = "RGB8", size = (320, 200)}
+}
+

+
+Sample code using:
+
+Any x;
+x.load("ball.txt");
+if (x["shape"].string() == "round") {
+    x["density"] = 3;
+}
+x.save("ball.txt");
+

+
+The custom serialization format was chosen to be terse, easy for
+humans to read, and easy for machines to parse. It was specifically
+chosen over formats like XML, YAML, JSON, S-expressions, and Protocol
+Buffers, although there is no reason you could not write readers and
+writers for G3D::Any that support those.
+
+G3D::Any assumes that structures do not contain cycles; it is an 
+error to create a structure like:
+
+
+Any x(Any::ARRAY);
+x.array().append(x);    // don't do this!
+

+
+although no exception will be thrown at runtime during that append.
+
+
+\section Parsing
+
+The primary use of Any is to create your own text file formats.
+The Vector3 constructor is a good example of how to use the Any::verify 
+methods to provide good error checking while parsing such formats:
+
+
+Vector3::Vector3(const Any& any) {
+    any.verifyName("Vector3");
+    any.verifyType(Any::TABLE, Any::ARRAY);
+    any.verifySize(3);
+
+    if (any.type() == Any::ARRAY) {
+        x = any[0];
+        y = any[1];
+        z = any[2];
+    } else {
+        // Table
+        x = any["x"];
+        y = any["y"];
+        z = any["z"];
+    }
+}
+

+
+\section BNF
+Serialized format BNF:
+
+
+identifier  ::= (letter | "_") (letter | digit | "_")*
+identifier-op ::= "::" | "->" | "."
+
+identifier-exp ::= [identifier-op] identifier (identifier-op identifier)*
+
+comment     ::= "#"  "\n"
+separator   ::= "," | ";"
+
+number      ::= 
+string      ::= 
+boolean     ::= "True" | "False"
+none        ::= "None"
+array       ::= "(" [value ("," value)*] ")"
+pair        ::= (identifier | string) "=" value
+table       ::= "{" [pair (separator pair)*] "}"
+named-array ::= identifier-exp tuple
+named-table ::= identifier-exp dict
+
+value       ::= [comment] (none | number | boolean | string | array | table | named-array | named-table)
+

+
+Except for single-line comments, whitespace is not significant.  
+All parsing is case-insensitive.
+
+The deserializer allows the substitution of [] for () when writing
+tuples and ";" for ",".
+
+The serializer indents four spaces for each level of nesting. 
+Tables are written with the keys in alphabetic order.
+*/
+class Any {
+public:
+
+    enum Type {NONE, BOOLEAN, NUMBER, STRING, ARRAY, TABLE};
+
+    static std::string toString(Type t);
+
+    /** Where an Any came from in a file.  Useful for throwing parsing errors */
+    class Source {
+    public:
+        std::string                 filename;
+        int                         line;
+        int                         character;
+
+        Source() : line(0), character(0) {}
+
+        void set(const TextInput& ti, const Token& t) {
+            filename  = ti.filename();
+            line      = t.line();
+            character = t.character();
+        }
+    };
+
+    typedef Array AnyArray;
+    typedef Table AnyTable;
+
+private:
+
+    /** Called from deserialize() */
+    static void deserializeComment(TextInput& ti, Token& token, std::string& comment);
+
+    /** NONE, BOOLEAN, and NUMBER are stored directly in the Any */
+    union SimpleValue {
+        bool                        b;
+        double                      n;
+
+        inline SimpleValue() : n(0.0) {}
+        inline SimpleValue(bool x) : b(x) {}
+        inline SimpleValue(double x) : n(x) {}
+    };
+ 
+    class Data {
+    public:
+        /** ARRAY, TABLE, or STRING value only.  NULL otherwise. */
+        union Value {
+            std::string*             s;
+            Array*              a;
+            AnyTable*                t;
+            inline Value() : s(NULL) {}
+        };
+
+        // Needed so that the destructor knows what is in Value
+        // and can call its destructor. 
+        Type                         type;
+        
+        /** Always points to memory that is allocated with the Data, so
+           the destructor does not delete this. */
+        Value                        value;
+        
+        std::string                  comment;
+
+        std::string                  name;
+
+        /** For STRING, ARRAY and TABLE types, m_value is shared between
+            multiple instances.  Mutation is allowed only if the reference
+            count is exactly 1, otherwise the mutating instance must copy
+            the value.  This is not used for other types.
+        */
+        AtomicInt32                  referenceCount;
+
+        Source                       source;
+
+    private:
+
+        /** Called by create() */
+        inline Data(Type t) : type(t), referenceCount(1) {}
+
+        /** Called by destroy */
+        ~Data();
+
+    public:
+
+        /** Clones the argument */
+        static Data* create(const Data* d);
+        static Data* create(Type t);
+
+        /** Free d, invoking its destructor and freeing the memory for
+            the value. */
+        static void destroy(Data* d);
+
+    };
+
+    /** If not empty, this Any was created from operator[] on a table
+        and perhaps was not intended to exist.  The name is needed to
+        format the error message if it is read from before it is
+        written to.
+
+        The source of a placeholder object is that of the parent
+        object until it is written.
+    */
+    std::string         m_placeholderName;
+
+    Type                m_type;
+    SimpleValue         m_simpleValue;
+    mutable Data*       m_data;
+
+    /** Called before every read operation to ensure that this object
+        is not a placeholder.  */
+    void beforeRead() const;
+
+    /** Called before every write operation to wipe the placeholder
+        status. */
+    void beforeWrite();
+
+    /** Decrements the reference count (if there is one).  If the
+    reference count is zero after decrement, calls delete on @a m_data
+    and sets it to NULL.
+    */
+    void dropReference();
+
+    /** Allocate the Data object if it does not exist */
+    void ensureData();
+
+    /** If m_data is not NULL, ensure that it has a unique reference
+        and contains a valid m_data.  This has a race condition if two
+        threads are both trying to modify the same Any
+        simultaneously.*/    
+    void ensureMutable();
+
+    /** Read an unnamed a TABLE or ARRAY.  Token should be the open
+        paren token; it is the next token after the close on
+        return. Called from deserialize().*/
+    void deserializeBody(TextInput& ti, Token& token);
+
+    void deserialize(TextInput& ti, Token& token);
+
+    /** Read the name of a named Array or Table. */
+    static void deserializeName(TextInput& ti, Token& token, std::string& name);
+    
+    /** Read until a comma is consumed or a close paren is hit, and
+     return that token.  Considers the passed in token to be the first
+     value read. */
+    static void readUntilCommaOrClose(TextInput& ti, Token& token);
+
+    /** Construct an Any that is a proxy for a table fetch from \a data.
+     This proxy can be copied exactly once on return from operator[].*/
+    Any(const std::string& key, Data* data);
+
+    inline bool isPlaceholder() const {
+        return ! m_placeholderName.empty();
+    }
+
+public:
+
+    /** Base class for all Any exceptions.*/
+    class Exception {
+    public:
+        virtual ~Exception() {}
+    };
+
+    /** Thrown by operator[] when a key is not present in a const table. */
+    class KeyNotFound : public ParseError {
+    public:
+        std::string key;
+    };
+
+    /** Thrown by operator[] when an array index is not present. */
+    class IndexOutOfBounds : public Exception {
+    public:
+        int     index;
+        int     size;
+        inline IndexOutOfBounds() : index(0), size(0) {}
+        inline IndexOutOfBounds(int i, int s) : index(i), size(s) {}
+    };
+
+    /** NONE constructor */
+    Any();
+
+    /** Deserialize */
+    explicit Any(TextInput& t);
+
+    Any(const Any& x);
+
+    /** NUMBER constructor */
+    Any(double x);
+
+#ifdef G3D_32BIT
+    /** NUMBER constructor */
+    Any(int64 x);
+#endif    // G3D_32BIT
+
+#if 0
+    /** NUMBER constructor */
+    Any(int32 x);
+#endif    // 0
+
+    /** NUMBER constructor */
+    Any(long x);
+
+    /** NUMBER constructor */
+    Any(int x);
+
+    /** NUMBER constructor */
+    Any(short x);
+
+    /** BOOLEAN constructor */
+    Any(bool x);
+
+    /** STRING constructor */
+    Any(const std::string& x);
+
+    /** STRING constructor */
+    Any(const char* x);
+
+    /** \a t must be ARRAY or TABLE */
+    Any(Type t, const std::string& name = "");
+    
+    ~Any();
+
+    /** Removes the comment and name */
+    Any& operator=(const Any& x);
+
+    /** Removes the comment and name */
+    Any& operator=(double x);
+
+    /** Removes the comment and name */
+    Any& operator=(int x);
+
+    /** Removes the comment and name */
+    Any& operator=(bool x);
+
+    /** Removes the comment and name */
+    Any& operator=(const std::string& x);
+
+    /** Removes the comment and name */
+    Any& operator=(const char* x);
+
+    /** \a t must be ARRAY, TABLE, or NONE. Removes the comment and name */
+    Any& operator=(Type t);
+
+    Type type() const;
+
+    /** Same as deserialize or load, but operates on a string instead
+        of a stream or file.
+
+      \sa deserialize, load
+      */
+    void parse(const std::string& src);
+
+    std::string unparse() const;
+    
+    /** Comments appear before values when they are in serialized form.*/
+    const std::string& comment() const;
+    void setComment(const std::string& c);
+
+    /** True if this is the NONE value */
+    bool isNone() const;
+
+    /** Throws a ParseError exception if this is not a number */
+    double number() const;
+    const std::string& string() const;
+    bool boolean() const;
+
+    /** If this is named ARRAY or TABLE, returns the name. */
+    const std::string& name() const;
+
+    /** \brief Set the name used when serializing an ARRAY or TABLE.
+    
+       Only legal for ARRAY or TABLE.  The \a name must begin with a letter
+       and contain only letters, numbers, underscores and scope operators.
+
+        
+        a2z
+        hello
+        Foo::bar
+        color.red
+        this->that
+        __x
+        

+        
+                
+        The scope operators "::", "->", and
+        ".", may have spaces around them.  The name may not
+        contain parentheses.
+    */
+    void setName(const std::string& name);
+
+    /** Number of elements if this is an ARRAY or TABLE */
+    int size() const;
+    int length() const;
+
+    /** For an array, returns the ith element */
+    const Any& operator[](int i) const;
+    Any& operator[](int i);
+
+    /** Directly exposes the underlying data structure for an ARRAY. */
+    const Array& array() const;
+    void append(const Any& v0);
+    void append(const Any& v0, const Any& v1);
+    void append(const Any& v0, const Any& v1, const Any& v2);
+    void append(const Any& v0, const Any& v1, const Any& v2, const Any& v3);
+
+    /** Directly exposes the underlying data structure for table.*/
+    const Table& table() const;
+
+    /** For a table, returns the element for \a key. Throws KeyNotFound
+        exception if the element does not exist.
+       */ 
+    const Any& operator[](const std::string& key) const;
+
+    // Needed to prevent the operator[](int) overload from catching
+    // string literals
+    inline const Any& operator[](const char* key) const {
+        return operator[](std::string(key));
+    }
+
+    /** 
+        Fetch an element from a table.  This can be used as:
+
+        
+        a["key"] = value;  (create the key if it did not exist)
+        

+        
+        or
+
+        
+        value = a["key"];  (throw an error if the key did not exist)
+        

+
+        Note:
+        In order to cause elements to be correctly created in the
+        first case while still providing "key not found" errors in the
+        second case, the Any returned is a special object that delays
+        the actual fetch until the following assignment or method
+        call.  This means that in the event of an error, the exception
+        may be thrown from a line other than the actual fetch.  Use
+        the Any::get() or the const Any::operator[]() methods to avoid
+        this behavior and ensure error-checking at fetch time.
+     */
+    Any& operator[](const std::string& key);
+
+    /** \copydoc Any::operator[](const std::string&) */
+    inline Any& operator[](const char* key) {
+        return operator[](std::string(key));
+    }
+    
+    /** For a table, returns the element for key \a x and \a
+        defaultVal if it does not exist. */
+    const Any& get(const std::string& key, const Any& defaultVal) const;
+
+    /** Returns true if this key is in the TABLE.  Illegal to call on an object that is not a TABLE. */
+    bool containsKey(const std::string& key) const;
+    
+    /** For a table, assigns the element for key k. */
+    void set(const std::string& key, const Any& val);
+
+    /** for an ARRAY, resizes and returns the last element */
+    Any& next();
+
+
+    /** True if the Anys are exactly equal, ignoring comments.  Applies deeply on arrays and tables. */
+    bool operator==(const Any& x) const;
+    bool operator!=(const Any& x) const;
+
+    operator int() const;
+    operator float() const;
+    operator double() const;
+    operator bool() const;
+    operator std::string() const;
+
+    /** Resize to \a n elements, where new elements are NIL 
+       It is an error to call this method if this is not an Any::ARRAY */
+    void resize(int n);
+
+    /** 
+       Clears all entries.
+       This must be a TABLE or ARRAY */
+    void clear();
+
+    /** Parse from a file.
+     \sa deserialize, parse */
+    void load(const std::string& filename);
+
+    /** Uses the serialize method. */
+    void save(const std::string& filename) const;
+
+    void serialize(TextOutput& to) const;
+    /** Parse from a stream.
+     \sa load, parse */
+    void deserialize(TextInput& ti);
+
+    const Source& source() const;
+
+    /** Throws a ParseError if \a value is false.  Useful for quickly
+        creating parse rules in classes that deserialize from Any.
+    */
+    void verify(bool value, const std::string& message = "") const;
+
+    /** Verifies that the name begins with identifier \a n.  It may contain
+        identifier operators after this */
+    void verifyName(const std::string& n) const;
+
+    /** Verifies that the type is \a t. */
+    void verifyType(Type t) const;
+
+    /** Throws an exception if the type is not \a t0 or \a t1. */
+    void verifyType(Type t0, Type t1) const;
+
+    /** Verifies that the size is between \a low and \a high, inclusive */
+    void verifySize(int low, int high) const;
+
+    /** Verifies that the size is exactly \a s */
+    void verifySize(int s) const;
+
+private:
+
+    void deserializeTable(TextInput& ti);
+    void deserializeArray(TextInput& ti,const std::string& term);
+
+};    // class Any
+
+}    // namespace G3D
+
+#endif
diff --git a/externals/g3dlite/G3D/AnyVal.h b/externals/g3dlite/G3D/AnyVal.h
new file mode 100644
index 00000000000..8c1bc72f206
--- /dev/null
+++ b/externals/g3dlite/G3D/AnyVal.h
@@ -0,0 +1,512 @@
+/**
+ @file AnyVal.h
+ @author Morgan McGuire
+ @created 2006-06-11
+ @edited  2008-07-14
+ */
+
+#ifndef G3D_ANYVAL_H
+#define G3D_ANYVAL_H
+
+#include "G3D/platform.h"
+#include 
+#include "G3D/Array.h"
+#include "G3D/TextInput.h"
+
+namespace G3D {
+// Forward declarations for G3D types
+class Vector2;
+class Vector3;
+class Vector4;
+class Color1;
+class Color3;
+class Color4;
+class Quat;
+class Matrix2;
+class Matrix3;
+class Matrix4;
+class CoordinateFrame;
+class TextInput;
+class TextOutput;
+class BinaryInput;
+class BinaryOutput;
+class Rect2D;
+class AABox;
+
+/**
+ \deprecated
+ Use the G3D::Any class instead.  This is only provided for 
+   backwards compatibility to G3D 7.xx.
+
+ A generic value, useful for defining property trees that can
+ be loaded from and saved to disk.  The values are intentionally
+ restricted to a small set.  
+
+ When written to files, the syntax is as follows.  Note that you can
+ nest arrays and tables in order to create full tree (i.e., XML-like)
+ structures as configuration files:
+
+ 
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+  
+  
+  
NULLNil
doubleThe number in printf double format
booltrue or false
std::stringThe string in double-quotes (")
Rect2DR(x0,y0,x1,y1)
Color1C1(value)
Color3C3(r,g,b)
Color4C4(r,g,b,a)
Vector2V2(x,y)
Vector3V3(x,y,z)
Vector4V4(x,y,z,w)
QuatV(x,y,z,w)
AABoxAAB(low Vector3, high Vector3)
Matrix2M2(r0c0, r0c1,
+                             
   r1c0, r1c1)
Matrix3M3(r0c0, r0c1, r0c2,
+         
   r1c0, r1c1, r1c2,
+         
   r2c0, r2c1, r2c2)
Matrix4M4(r0c0, r0c1, r0c2, r0c3,
+         
   r1c0, r1c1, r1c2, r1c3,
+         
   r2c0, r2c1, r2c2, r2c3,
+         
   r3c0, r3c1, r3c2, r3c3)
CoordinateFrameCF(r0c0, r0c1, r0c2,   r0c3,
+         
   r1c0, r1c1, r1c2,   r1c3,
+         
   r2c0, r2c1, r2c2,   r2c3)
CoordinateFrameCF(V3(x, y, z), yaw deg, pitch deg, optional roll deg)
Array[element0, element1,  ... , elementn-1]
Table{symbol0 = value0
+                               
 symbol1 = value1  
+                               
 ...
+                               
 symboln-1 = valuen-1}

+
+ See also boost::any for a more general purpose but slightly harder to use
+ "any" for C++.
+
+ The semantics of operator[] and the get() methods are slightly different;
+ operator[] acts more like a scripting language that automatically extends
+ arrays and tables instead of generating errors.  get() has more strict semantics,
+ like a C++ class.
+
+ AnyVal uses copy-on-mutate, so that AnyVal a = b semantically copies b (like int a = b would), although in practice
+ it delays the copy until one is mutated so that it is still fast to "copy" large arrays and tables.
+
+ Reading example:
+ 
+    AnyVal property = AnyVal::fromFile("c:/tmp/test.txt"));
+
+    Vector3 vel = property["angular velocity"]
+
+    Using defaults to handle errors:
+       If there was no "enabled" value, this will return the default instead of failing
+    bool enabled = property["enabled"].boolean(true);
+
+ 

+
+ Writing to a file:
+ 
+    AnyVal dict(AnyVal::TABLE);
+
+    dict["enabled"] = AnyVal(true);
+    dict["weight"] = 100;
+    dict["angular velocity"] = Vector3(1, -3, 4.5);
+
+    TextOutput t("c:/tmp/test.txt");
+    dict.serialize(t);
+    t.commit();
+  

+
+  Example of a data file:
+  
+   {
+      heights = [1, 17, 32]
+      model = 
+        {
+           color = C3(1, 1, 1)
+           filename = "foo.md2"
+        }
+      position = V3(23, 14, 0)
+      name = "Elmer"
+   }
+  

+
+  

+  What's the difference from boost::any?
+  
I think that AnyVal will be easier for novice C++ users.  It addresses the problem that
+   even though G3D::TextInput makes reading configuration files extremely simple, many people
+   still don't use it.  So AnyVal makes it ridiculously simple to read and write a tree of G3D 
+   types to a file. 
+
+   AnyVal:
+
+{
+AnyVal tree(TextInput("config.txt"));
+
+bool enabled = tree.get("enabled", false);
+Vector3 direction = tree.get("direction", Vector3::zero());
+...
+}
+

+
+boost:
+
+{
+bool enabled = false;
+Vector3 direction;
+Table tree;
+
+ ...write lots of file parsing code...
+
+   if (tree.containsKey("enabled")) {
+      const boost::any& val = tree["enabled"];
+      try {
+        enabled = any_cast(val);
+      } catch(const boost::bad_any_cast &) {
+      }
+    }
+
+   if (tree.containsKey("direction")) {
+      const boost::any& val = tree["direction"];
+      try {
+        direction = any_cast(val);
+      } catch(const boost::bad_any_cast &) {
+      }
+    }
+   ...
+}
+

+
+\deprecated
+ */
+class AnyVal {
+public:
+
+    /** Array and table values are all Any.*/
+    enum Type {
+        NIL, 
+        NUMBER,
+        BOOLEAN, 
+        STRING, 
+        VECTOR2, 
+        VECTOR3, 
+        VECTOR4, 
+        MATRIX2,
+        MATRIX3, 
+        MATRIX4, 
+        QUAT, 
+        COORDINATEFRAME,
+        COORDINATEFRAME2D,
+        CFRAME = COORDINATEFRAME,
+        CFRAME2D = COORDINATEFRAME2D,
+        COLOR1,
+        COLOR3,
+        COLOR4,
+        RECT2D,
+        AABOX2D = RECT2D,
+        AABOX,
+        ARRAY, 
+        TABLE};
+
+    /** Base class for all AnyVal exceptions.*/
+    class Exception {
+    public:
+        virtual ~Exception() {}
+    };
+
+    /** Thrown when an inappropriate operation is performed (e.g., operator[] on a number) */
+    class WrongType : public Exception {
+    public:
+        Type        expected;
+        Type        actual;
+        WrongType() : expected(NIL), actual(NIL) {}
+        WrongType(Type e, Type a) : expected(e), actual(a) {}
+    };
+
+    /** Thrown by operator[] when a key is not present. */
+    class KeyNotFound : public Exception {
+    public:
+        std::string key;
+        KeyNotFound() {}
+        KeyNotFound(const std::string& k) : key(k) {}
+    };
+
+    class IndexOutOfBounds : public Exception {
+    public:
+        int     index;
+        int     size;
+        IndexOutOfBounds() : index(0), size(0) {}
+        IndexOutOfBounds(int i, int s) : index(i), size(s) {}
+    };
+
+    /** Thrown when deserialize() when the input is incorrectly formatted. */
+    class CorruptText : public Exception {
+    public:
+        std::string      message;
+
+        /** Token where the problem occurred.*/
+        G3D::Token       token;
+
+        CorruptText() {}
+        CorruptText(const std::string& s, const G3D::Token& t) : message(s), token(t) {}
+    };
+
+private:
+
+    Type        m_type;
+    void*       m_value;
+
+    /** For table and array types, *m_value is shared between multiple
+        instances.  Mutation is allowed only if the reference count is
+        exactly 1, otherwise the mutating instance must copy the
+        value.  This is not used for other types.
+        */
+    int*        m_referenceCount;
+
+    /** Decrements the reference count (if there is one).  If the
+    reference count is zero or does not exist.  Calls delete on @a
+    m_value and sets it to NULL.
+    */
+    void deleteValue();
+
+    /** Returns a copy of the value. */
+    void* copyValue() const;
+
+    /** Assumes isSharedType.  Ensures that this has a unique reference */
+    void makeMutable();
+
+    /** True if this is a shared value between multiple instances. */
+    inline bool isShared() const {
+        return m_referenceCount && (*m_referenceCount > 1);
+    }
+
+    /** True when m_value is a double pointer */
+    inline bool isSharedType() const {
+        return (m_type == TABLE) || (m_type == ARRAY);
+    }
+
+public:
+
+    AnyVal();
+
+    /** Deserialize */
+    explicit AnyVal(G3D::TextInput& t);
+
+    static AnyVal fromFile(const std::string& filename);
+
+    void load(const std::string& filename);
+
+    void save(const std::string& filename) const;
+
+    ///** Deserialize */
+    //explicit AnyVal(G3D::BinaryInput& t);
+
+    /** Construct a number */
+    AnyVal(double);
+    AnyVal(int);
+
+    // Explicit to avoid ambiguity with the 'double' constructor
+    // when an integer type is constructed
+    AnyVal(bool);
+    AnyVal(const G3D::Vector2&);
+    AnyVal(const G3D::Vector3&);
+    AnyVal(const G3D::Vector4&);
+
+    AnyVal(const G3D::Color1&);
+    AnyVal(const G3D::Color3&);
+    AnyVal(const G3D::Color4&);
+
+    AnyVal(const std::string&);
+    AnyVal(const char*);
+
+    AnyVal(const G3D::Quat&);
+
+    AnyVal(const G3D::Rect2D&);
+    AnyVal(const G3D::AABox&);
+
+    AnyVal(const G3D::CoordinateFrame&);
+    AnyVal(const G3D::Matrix2&);
+    AnyVal(const G3D::Matrix3&);
+    AnyVal(const G3D::Matrix4&);
+
+    AnyVal(const AnyVal&);
+
+    AnyVal(Type arrayOrTable);
+
+    AnyVal& operator=(const AnyVal&);
+
+    /** Frees the underlying storage */
+    ~AnyVal();
+
+    Type type() const;
+
+    bool isNil() const {
+        return type() == NIL;
+    }
+
+    void serialize(G3D::TextOutput& t) const;
+    //void serialize(G3D::BinaryOutput& t) const;
+    void deserialize(G3D::TextInput& t);
+    //void deserialize(G3D::BinaryInput& t);
+
+    /** Array dereference.  If the index is out of bounds, IndexOutOfBounds is thrown */
+    const AnyVal& operator[](int) const;
+
+    /** Extend this array by one element. */
+    void append(const AnyVal&);
+
+    /** If the index is out of bounds, the array is resized.  If the index is negative,
+        IndexOutOfBounds is thrown.*/
+    AnyVal& operator[](int);
+
+    /** If @a i is out of bounds or this is not an ARRAY, defaultVal is returned.*/
+    const AnyVal& get(int i, const AnyVal& defaultVal) const;
+
+    /** If out of bounds, IndexOutOfBounds is thrown. */
+    const AnyVal& get(int i) const;
+
+    /** Returns defaultVal if this is not a TABLE or the key is not found. */
+    const AnyVal& get(const std::string& key, const AnyVal& defaultVal) const;
+
+    /** Throws KeyNotFound exception if the key is not present.*/
+    const AnyVal& get(const std::string& key) const;
+
+    /** Table reference */
+    const AnyVal& operator[](const std::string&) const;
+
+    /** Table reference.  If the element does not exist, it is created. */
+    AnyVal& operator[](const std::string&);
+
+    /** Table reference */
+    const AnyVal& operator[](const char*) const;
+
+    /** Table reference.  If the element does not exist, it is created. */
+    AnyVal& operator[](const char*);
+
+    /** If this value is not a number throws a WrongType exception. */
+    double number() const;
+
+    /** If this value is not a number, returns defaultVal. */
+    double number(double defaultVal) const;
+
+    operator double () const {
+        return number();
+    }
+
+    operator float () const {
+        return (float)number();
+    }
+
+    bool boolean() const;
+    bool boolean(bool b) const;
+
+    operator bool() const {
+        return boolean();
+    }
+
+    const std::string& string() const;
+    const std::string& string(const std::string& defaultVal) const;
+
+    operator const std::string& () const {
+        return string();
+    }
+
+    const G3D::Rect2D& rect2D() const;
+    const G3D::Rect2D& rect2D(const G3D::Rect2D& defaultVal) const;
+
+    operator const Rect2D& () const {
+        return rect2D();
+    }
+
+    const G3D::AABox& aabox() const;
+    const G3D::AABox& aabox(const G3D::AABox& defaultVal) const;
+
+    operator const AABox& () const {
+        return aabox();
+    }
+
+    const G3D::Vector2& vector2() const;
+    const G3D::Vector2& vector2(const G3D::Vector2& defaultVal) const;
+
+    operator const Vector2& () const {
+        return vector2();
+    }
+
+    const G3D::Vector3& vector3() const;
+    const G3D::Vector3& vector3(const G3D::Vector3& defaultVal) const;
+    
+    operator const Vector3& () {
+        return vector3();
+    }
+
+    const G3D::Vector4& vector4() const;
+    const G3D::Vector4& vector4(const G3D::Vector4& defaultVal) const;
+
+    operator const Vector4& () const {
+        return vector4();
+    }
+
+    const G3D::Color1& color1() const;
+    const G3D::Color1& color1(const G3D::Color1& defaultVal) const;
+
+    const G3D::Color3& color3() const;
+    const G3D::Color3& color3(const G3D::Color3& defaultVal) const;
+
+    operator const Color3& () const {
+        return color3();
+    }
+
+    const G3D::Color4& color4() const;
+    const G3D::Color4& color4(const G3D::Color4& defaultVal) const;
+
+    operator const Color4& () const {
+        return color4();
+    }
+
+    const G3D::CoordinateFrame& coordinateFrame() const;
+    const G3D::CoordinateFrame& coordinateFrame(const G3D::CoordinateFrame& defaultVal) const;
+
+    operator const CoordinateFrame& () const {
+        return coordinateFrame();
+    }
+
+    const G3D::Matrix2& matrix2() const;
+    const G3D::Matrix2& matrix2(const G3D::Matrix2& defaultVal) const;
+
+    operator const Matrix2& () const {
+        return matrix2();
+    }
+
+    const G3D::Matrix3& matrix3() const;
+    const G3D::Matrix3& matrix3(const G3D::Matrix3& defaultVal) const;
+
+    operator const Matrix3& () const {
+        return matrix3();
+    }
+
+    const G3D::Matrix4& matrix4() const;
+    const G3D::Matrix4& matrix4(const G3D::Matrix4& defaultVal) const;
+
+    operator const Matrix4& () const {
+        return matrix4();
+    }
+
+    const G3D::Quat& quat() const;
+    const G3D::Quat& quat(const G3D::Quat& defaultVal) const;
+
+    operator const Quat& () const {
+        return quat();
+    }
+
+    std::string toString() const;
+
+    /** Number of elements for an array or table.*/
+    int size() const;
+
+    /** For a table, returns the keys. */
+    void getKeys(G3D::Array&) const;
+};
+
+}
+
+#endif
diff --git a/externals/g3dlite/G3D/AreaMemoryManager.h b/externals/g3dlite/G3D/AreaMemoryManager.h
new file mode 100644
index 00000000000..d8d8f710359
--- /dev/null
+++ b/externals/g3dlite/G3D/AreaMemoryManager.h
@@ -0,0 +1,93 @@
+/**
+ @file AreaMemoryManager.h
+  
+ @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+
+ @created 2009-01-20
+ @edited  2009-05-29
+
+ Copyright 2000-2009, Morgan McGuire.
+ All rights reserved.
+ */
+
+
+#ifndef G3D_AreaMemoryManager_h
+#define G3D_AreaMemoryManager_h
+
+#include "G3D/platform.h"
+#include "G3D/g3dmath.h"
+#include "G3D/Array.h"
+#include "G3D/MemoryManager.h"
+
+namespace G3D {
+
+/** 
+  \brief Allocates memory in large blocks and then frees it as an area.
+
+  Useful for ensuring cache coherence and for reducing the time cost of 
+  multiple allocations and deallocations.
+
+  Not threadsafe
+ */
+class AreaMemoryManager : public MemoryManager {
+private:
+
+    class Buffer {
+    private:
+        uint8*              m_first;
+        size_t              m_size;
+        size_t              m_used;
+
+    public:
+
+        Buffer(size_t size);
+
+        ~Buffer();
+
+        /** Returns NULL if out of space */
+        void* alloc(size_t s);
+    };
+    
+    size_t                  m_sizeHint;
+
+    /** The underlying array is stored in regular MemoryManager heap memory */
+    Array          m_bufferArray;
+
+    AreaMemoryManager(size_t sizeHint);
+
+public:
+
+    typedef ReferenceCountedPointer Ref;
+
+    /** 
+        \param sizeHint Total amount of memory expected to be allocated.
+        The allocator will allocate memory from the system in increments
+        of this size.
+    */
+    static AreaMemoryManager::Ref create(size_t sizeHint = 10 * 1024 * 1024);
+
+    /** Invokes deallocateAll. */
+    ~AreaMemoryManager();
+
+    size_t bytesAllocated() const;
+
+    /** Allocates memory out of the buffer pool. 
+        @param s must be no larger than sizeHint */
+    virtual void* alloc(size_t s);
+
+    /** Ignored. */
+    virtual void free(void* x);
+
+    virtual bool isThreadsafe() const;
+
+    /** Deletes all previously allocated memory. Because delete is not
+        invoked on objects in this memory, it is not safe to simply
+        free memory containing C++ objects that expect their destructors
+        to be called. */
+    void deallocateAll();
+};
+
+typedef AreaMemoryManager CoherentAllocator;
+}
+
+#endif
diff --git a/externals/g3dlite/G3D/Array.h b/externals/g3dlite/G3D/Array.h
new file mode 100644
index 00000000000..cc9e1d9dd01
--- /dev/null
+++ b/externals/g3dlite/G3D/Array.h
@@ -0,0 +1,1274 @@
+/** 
+  @file Array.h
+ 
+  @maintainer Morgan McGuire, graphics3d.com
+  @cite Portions written by Aaron Orenstein, a@orenstein.name
+ 
+  @created 2001-03-11
+  @edited  2009-05-29
+
+  Copyright 2000-2009, Morgan McGuire, http://graphics.cs.williams.edu
+  All rights reserved.
+ */
+
+#ifndef G3D_Array_h
+#define G3D_Array_h
+
+#include "G3D/platform.h"
+#include "G3D/debug.h"
+#include "G3D/System.h"
+#include "G3D/MemoryManager.h"
+#ifdef G3D_DEBUG
+//   For formatting error messages
+#    include "G3D/format.h"
+#endif
+#include 
+#include 
+
+#ifdef _MSC_VER
+#   include 
+    
+#   pragma warning (push)
+    // debug information too long
+#   pragma warning( disable : 4312)
+#   pragma warning( disable : 4786)
+#endif
+
+
+namespace G3D {
+
+/**
+ Constant for passing to Array::resize
+ */
+const bool DONT_SHRINK_UNDERLYING_ARRAY = false;
+
+/** Constant for Array::sort */
+const int SORT_INCREASING = 1;
+/** Constant for Array::sort */
+const int SORT_DECREASING = -1;
+
+/**
+ \brief Dynamic 1D array tuned for performance.
+
+ Objects must have a default constructor (constructor that
+ takes no arguments) in order to be used with this template.
+ You will get the error "no appropriate default constructor found"
+ if they do not.
+
+ Do not use with objects that overload placement operator new,
+ since the speed of Array is partly due to pooled allocation.
+
+ Array is highly optimized compared to std::vector.  
+ Array operations are less expensive than on std::vector and for large
+ amounts of data, Array consumes only 1.5x the total size of the 
+ data, while std::vector consumes 2.0x.  The default
+ array takes up zero heap space.  The first resize (or append)
+ operation grows it to a reasonable internal size so it is efficient
+ to append to small arrays. 
+ 
+ Then Array needs to copy
+ data internally on a resize operation it correctly invokes copy
+ constructors of the elements (the MSVC6 implementation of
+ std::vector uses realloc, which can create memory leaks for classes
+ containing references and pointers).  Array provides a guaranteed
+ safe way to access the underlying data as a flat C array --
+ Array::getCArray.  Although (T*)std::vector::begin() can be used for
+ this purpose, it is not guaranteed to succeed on all platforms.
+
+ To serialize an array, see G3D::serialize.
+
+ The template parameter MIN_ELEMENTS indicates the smallest number of 
+ elements that will be allocated.  The default of 10 is designed to avoid 
+ the overhead of repeatedly allocating the array as it grows from 1, to 2, and so on.
+ If you are creating a lot of small Arrays, however, you may want to set this smaller
+ to reduce the memory cost. Once the array has been allocated, it will never
+ deallocate the underlying array unless MIN_ELEMENTS is set to 0, MIN_BYTES is 0, and the array
+ is empty.
+
+ Do not subclass an Array.
+
+ \sa G3D::SmallArray
+ */
+template 
+class Array {
+private:
+    /** 0...num-1 are initialized elements, num...numAllocated-1 are not */
+    T*                  data;
+
+    int                 num;
+    int                 numAllocated;
+
+    MemoryManager::Ref  m_memoryManager;
+
+    /** \param n Number of elements
+    */
+    void init(int n, const MemoryManager::Ref& m) {
+        m_memoryManager = m;
+        debugAssert(n >= 0);
+        this->num = 0;
+        this->numAllocated = 0;
+        data = NULL;
+        if (n > 0) {
+            resize(n);
+        } else {
+            data = NULL;
+        }
+    }
+
+    void _copy(const Array &other) {
+        init(other.num, MemoryManager::create());
+        for (int i = 0; i < num; i++) {
+            data[i] = other.data[i];
+        }
+    }
+
+    /**
+     Returns true iff address points to an element of this array.
+     Used by append.
+     */
+    inline bool inArray(const T* address) {
+        return (address >= data) && (address < data + num);
+    }
+
+
+    /** Only compiled if you use the sort procedure. */
+    static bool __cdecl compareGT(const T& a, const T& b) {
+        return a > b;
+    }
+
+
+    /**
+     Allocates a new array of size numAllocated (not a parameter to the method) 
+     and then copies at most oldNum elements from the old array to it.  Destructors are
+     called for oldNum elements of the old array.
+     */
+    void realloc(int oldNum) {
+         T* oldData = data;
+         
+         // The allocation is separate from the constructor invocation because we don't want 
+         // to pay for the cost of constructors until the newly allocated
+         // elements are actually revealed to the application.  They 
+         // will be constructed in the resize() method.
+
+         data = (T*)m_memoryManager->alloc(sizeof(T) * numAllocated);
+         alwaysAssertM(data, "Memory manager returned NULL: out of memory?");
+
+         // Call the copy constructors
+         {const int N = G3D::min(oldNum, numAllocated);
+          const T* end = data + N;
+          T* oldPtr = oldData;
+          for (T* ptr = data; ptr < end; ++ptr, ++oldPtr) {
+
+             // Use placement new to invoke the constructor at the location
+             // that we determined.  Use the copy constructor to make the assignment.
+             const T* constructed = new (ptr) T(*oldPtr);
+
+             (void)constructed;
+             debugAssertM(constructed == ptr, 
+                 "new returned a different address than the one provided by Array.");
+         }}
+
+         // Call destructors on the old array (if there is no destructor, this will compile away)
+         {const T* end = oldData + oldNum;
+          for (T* ptr = oldData; ptr < end; ++ptr) {
+              ptr->~T();
+         }}
+
+         m_memoryManager->free(oldData);
+    }
+
+public:
+
+    /**
+     G3D C++ STL style iterator variable.  Call begin() to get 
+     the first iterator, pre-increment (++i) the iterator to get to
+     the next value.  Use dereference (*i) to access the element.
+     */
+    typedef T* Iterator;
+    /** G3D C++ STL style const iterator in same style as Iterator. */
+    typedef const T* ConstIterator;
+
+    /** stl porting compatibility helper */
+    typedef Iterator iterator;
+    /** stl porting compatibility helper */
+    typedef ConstIterator const_iterator;
+    /** stl porting compatibility helper */
+    typedef T value_type;
+    /** stl porting compatibility helper */
+    typedef int size_type;
+    /** stl porting compatibility helper */
+    typedef int difference_type;
+
+    /**
+     C++ STL style iterator method.  Returns the first iterator element.
+     Do not change the size of the array while iterating.
+     */
+    Iterator begin() {
+        return data;
+    }
+
+    ConstIterator begin() const {
+        return data;
+    }
+    /**
+     C++ STL style iterator method.  Returns one after the last iterator
+     element.
+     */
+    ConstIterator end() const {
+        return data + num;
+    }
+
+    Iterator end() {
+        return data + num;
+    }
+
+   /**
+    The array returned is only valid until the next append() or resize call, or 
+	the Array is deallocated.
+    */
+   T* getCArray() {
+       return data;
+   }
+
+   /**
+    The array returned is only valid until the next append() or resize call, or 
+	the Array is deallocated.
+    */
+   const T* getCArray() const {
+       return data;
+   }
+
+    /** Creates a zero length array (no heap allocation occurs until resize). */
+    Array() : num(0) {
+        init(0, MemoryManager::create());
+        debugAssert(num >= 0);
+    }
+    
+
+    /**  Creates an array containing v0. */
+    Array(const T& v0) {
+        init(1, MemoryManager::create());
+        (*this)[0] = v0;
+    }
+    
+    /**  Creates an array containing v0 and v1. */
+    Array(const T& v0, const T& v1) {
+        init(2, MemoryManager::create());
+        (*this)[0] = v0;
+        (*this)[1] = v1;
+    }
+    
+    /**  Creates an array containing v0...v2. */
+    Array(const T& v0, const T& v1, const T& v2) {
+       init(3, MemoryManager::create());
+       (*this)[0] = v0;
+       (*this)[1] = v1;
+       (*this)[2] = v2;
+    }
+
+    /** Creates an array containing v0...v3. */
+    Array(const T& v0, const T& v1, const T& v2, const T& v3) {
+       init(4, MemoryManager::create());
+       (*this)[0] = v0;
+       (*this)[1] = v1;
+       (*this)[2] = v2;
+       (*this)[3] = v3;
+    }
+
+    /** Creates an array containing v0...v4. */
+    Array(const T& v0, const T& v1, const T& v2, const T& v3, const T& v4) {
+       init(5, MemoryManager::create());
+       (*this)[0] = v0;
+       (*this)[1] = v1;
+       (*this)[2] = v2;
+       (*this)[3] = v3;
+       (*this)[4] = v4;
+    }
+
+
+   /**
+    Copy constructor
+    */
+    Array(const Array& other) : num(0) {
+       _copy(other);
+       debugAssert(num >= 0);
+   }
+
+   /**
+    Destructor does not delete() the objects if T is a pointer type
+    (e.g. T = int*) instead, it deletes the pointers themselves and 
+    leaves the objects.  Call deleteAll if you want to dealocate
+    the objects referenced.  Do not call deleteAll if T is not a pointer
+    type (e.g. do call Array::deleteAll, do not call Array::deleteAll).
+    */
+   ~Array() {
+       // Invoke the destructors on the elements
+       for (int i = 0; i < num; i++) {
+           (data + i)->~T();
+       }
+       
+       m_memoryManager->free(data);
+       // Set to 0 in case this Array is global and gets referenced during app exit
+       data = NULL;
+	   num = 0;
+       numAllocated = 0;
+   }
+
+   /**
+    Removes all elements.  Use resize(0, false) or fastClear if you want to 
+    remove all elements without deallocating the underlying array
+    so that future append() calls will be faster.
+    */
+   void clear(bool shrink = true) {
+       resize(0, shrink);
+   }
+
+   void clearAndSetMemoryManager(const MemoryManager::Ref& m) {
+       clear();
+       debugAssert(data == NULL);
+       m_memoryManager = m;
+   }
+
+   /** resize(0, false) 
+      @deprecated*/
+   void fastClear() {
+       clear(false);
+   }
+
+   /**
+    Assignment operator.
+    */
+   Array& operator=(const Array& other) {
+       debugAssert(num >= 0);
+       resize(other.num);       for (int i = 0; i < num; ++i) {
+           data[i] = other[i];
+       }
+       debugAssert(num >= 0);
+       return *this;
+   }
+
+   Array& operator=(const std::vector& other) {
+       resize((int)other.size());
+       for (int i = 0; i < num; ++i) {
+           data[i] = other[i];
+       }
+       return *this;
+   }
+
+   inline MemoryManager::Ref memoryManager() const {
+       return m_memoryManager;
+   }
+
+   /**
+    Number of elements in the array.
+    */
+   inline int size() const {
+      return num;
+   }
+
+   /**
+    Number of elements in the array.  (Same as size; this is just
+    here for convenience).
+    */
+   inline int length() const {
+      return size();
+   }
+
+   /**
+    Swaps element index with the last element in the array then
+    shrinks the array by one.
+    */
+   void fastRemove(int index, bool shrinkIfNecessary = false) {
+       debugAssert(index >= 0);
+       debugAssert(index < num);
+       data[index] = data[num - 1];
+       resize(size() - 1, shrinkIfNecessary);
+   }
+
+
+   /**
+    Inserts at the specified index and shifts all other elements up by one.
+    */
+   void insert(int n, const T& value) {
+       // Add space for the extra element
+       resize(num + 1, false);
+
+       for (int i = num - 1; i > n; --i) {
+           data[i] = data[i - 1];
+       }
+       data[n] = value;
+   }
+
+    /** @param shrinkIfNecessary if false, memory will never be
+      reallocated when the array shrinks.  This makes resizing much
+      faster but can waste memory. 
+    */
+    void resize(int n, bool shrinkIfNecessary = true) {
+        debugAssert(n >= 0);
+        if (num == n) {
+            return;
+        }
+
+        int oldNum = num;
+        num = n;
+
+        // Call the destructors on newly hidden elements if there are any
+        for (int i = num; i < oldNum; ++i) {
+            (data + i)->~T();
+        }
+        
+        // Once allocated, always maintain MIN_ELEMENTS elements or 32 bytes, whichever is higher.
+        const int minSize = std::max(MIN_ELEMENTS, (int)(MIN_BYTES / sizeof(T)));
+
+        if ((MIN_ELEMENTS == 0) && (MIN_BYTES == 0) && (n == 0) && shrinkIfNecessary) {
+            // Deallocate the array completely
+            numAllocated = 0;
+            m_memoryManager->free(data);
+            data = NULL;
+            return;
+        }
+        
+        if (num > numAllocated) {
+          // Grow the underlying array
+
+          if (numAllocated == 0) {
+              // First allocation; grow to exactly the size requested to avoid wasting space.
+              numAllocated = n;
+              debugAssert(oldNum == 0);
+              realloc(oldNum);
+          } else {
+         
+              if (num < minSize) {
+                  // Grow to at least the minimum size
+                  numAllocated = minSize;
+
+              } else {
+
+                  // Increase the underlying size of the array.  Grow aggressively
+                  // up to 64k, less aggressively up to 400k, and then grow relatively
+                  // slowly (1.5x per resize) to avoid excessive space consumption.
+                  //
+                  // These numbers are tweaked according to performance tests.
+
+                  float growFactor = 3.0;
+
+                  int oldSizeBytes = numAllocated * sizeof(T);
+                  if (oldSizeBytes > 400000) {
+                      // Avoid bloat
+                      growFactor = 1.5;
+                  } else if (oldSizeBytes > 64000) {
+                      // This is what std:: uses at all times
+                      growFactor = 2.0;
+                  }
+
+                  numAllocated = (num - numAllocated) + (int)(numAllocated * growFactor);
+
+                  if (numAllocated < minSize) {
+                      numAllocated = minSize;
+                  }
+              }
+
+              realloc(oldNum);
+          }
+
+      } else if ((num <= numAllocated / 3) && shrinkIfNecessary && (num > minSize)) {
+          // Shrink the underlying array
+
+          // Only copy over old elements that still remain after resizing
+          // (destructors were called for others if we're shrinking)
+          realloc(iMin(num, oldNum));
+
+      }
+
+      // Call the constructors on newly revealed elements.
+      // Do not use parens because we don't want the intializer
+      // invoked for POD types.
+      for (int i = oldNum; i < num; ++i) {
+          new (data + i) T;
+      }
+   }
+
+    /**
+     Add an element to the end of the array.  Will not shrink the underlying array
+     under any circumstances.  It is safe to append an element that is already
+     in the array.
+     */
+    inline void append(const T& value) {
+        
+        if (num < numAllocated) {
+            // This is a simple situation; just stick it in the next free slot using
+            // the copy constructor.
+            new (data + num) T(value);
+            ++num;
+        } else if (inArray(&value)) {
+            // The value was in the original array; resizing
+            // is dangerous because it may move the value
+            // we have a reference to.
+            T tmp = value;
+            append(tmp);
+        } else {
+            // Here we run the empty initializer where we don't have to, but
+            // this simplifies the computation.
+            resize(num + 1, DONT_SHRINK_UNDERLYING_ARRAY);
+            data[num - 1] = value;
+        }
+    }
+
+
+    inline void append(const T& v1, const T& v2) {
+        if (inArray(&v1) || inArray(&v2)) {
+            // Copy into temporaries so that the references won't break when
+            // the array resizes.
+            T t1 = v1;
+            T t2 = v2;
+            append(t1, t2);
+        } else if (num + 1 < numAllocated) {
+            // This is a simple situation; just stick it in the next free slot using
+            // the copy constructor.
+            new (data + num) T(v1);
+            new (data + num + 1) T(v2);
+            num += 2;
+        } else {
+            // Resize the array.  Note that neither value is already in the array.
+            resize(num + 2, DONT_SHRINK_UNDERLYING_ARRAY);
+            data[num - 2] = v1;
+            data[num - 1] = v2;
+        }
+    }
+
+
+    inline void append(const T& v1, const T& v2, const T& v3) {
+        if (inArray(&v1) || inArray(&v2) || inArray(&v3)) {
+            T t1 = v1;
+            T t2 = v2;
+            T t3 = v3;
+            append(t1, t2, t3);
+        } else if (num + 2 < numAllocated) {
+            // This is a simple situation; just stick it in the next free slot using
+            // the copy constructor.
+            new (data + num) T(v1);
+            new (data + num + 1) T(v2);
+            new (data + num + 2) T(v3);
+            num += 3;
+        } else {
+            resize(num + 3, DONT_SHRINK_UNDERLYING_ARRAY);
+            data[num - 3] = v1;
+            data[num - 2] = v2;
+            data[num - 1] = v3;
+        }
+    }
+
+
+    inline void append(const T& v1, const T& v2, const T& v3, const T& v4) {
+        if (inArray(&v1) || inArray(&v2) || inArray(&v3) || inArray(&v4)) {
+            T t1 = v1;
+            T t2 = v2;
+            T t3 = v3;
+            T t4 = v4;
+            append(t1, t2, t3, t4);
+        } else if (num + 3 < numAllocated) {
+            // This is a simple situation; just stick it in the next free slot using
+            // the copy constructor.
+            new (data + num) T(v1);
+            new (data + num + 1) T(v2);
+            new (data + num + 2) T(v3);
+            new (data + num + 3) T(v4);
+            num += 4;
+        } else {
+            resize(num + 4, DONT_SHRINK_UNDERLYING_ARRAY);
+            data[num - 4] = v1;
+            data[num - 3] = v2;
+            data[num - 2] = v3;
+            data[num - 1] = v4;
+        }
+    }
+
+    /**
+     Returns true if the given element is in the array.
+     */
+    bool contains(const T& e) const {
+        for (int i = 0; i < size(); ++i) {
+            if ((*this)[i] == e) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+   /**
+    Append the elements of array.  Cannot be called with this array
+    as an argument.
+    */
+   void append(const Array& array) {
+       debugAssert(this != &array);
+       int oldNum = num;
+       int arrayLength = array.length();
+
+       resize(num + arrayLength, false);
+
+       for (int i = 0; i < arrayLength; i++) {
+           data[oldNum + i] = array.data[i];
+       }
+   }
+
+   /**
+    Pushes a new element onto the end and returns its address.
+    This is the same as A.resize(A.size() + 1, false); A.last()
+    */
+   inline T& next() {
+       resize(num + 1, false);
+       return last();
+   }
+
+   /**
+    Pushes an element onto the end (appends)
+    */
+   inline void push(const T& value) {
+       append(value);
+   }
+
+   inline void push(const Array& array) {
+       append(array);
+   }
+
+   /** Alias to provide std::vector compatibility */
+   inline void push_back(const T& v) {
+       push(v);
+   }
+
+   /** "The member function removes the last element of the controlled sequence, which must be non-empty."
+        For compatibility with std::vector. */
+   inline void pop_back() {
+       pop();
+   }
+
+   /** 
+      "The member function returns the storage currently allocated to hold the controlled
+       sequence, a value at least as large as size()" 
+       For compatibility with std::vector.
+   */
+   int capacity() const {
+       return numAllocated;
+   }
+
+   /** 
+      "The member function returns a reference to the first element of the controlled sequence, 
+       which must be non-empty." 
+       For compatibility with std::vector.
+   */
+   T& front() {
+       return (*this)[0];
+   }
+
+   /** 
+      "The member function returns a reference to the first element of the controlled sequence, 
+       which must be non-empty." 
+       For compatibility with std::vector.
+   */
+   const T& front() const {
+       return (*this)[0];
+   }
+
+   /** 
+      "The member function returns a reference to the last element of the controlled sequence, 
+       which must be non-empty." 
+       For compatibility with std::vector.
+   */
+   T& back() {
+       return (*this)[size()-1];
+   }
+
+   /** 
+      "The member function returns a reference to the last element of the controlled sequence, 
+       which must be non-empty." 
+       For compatibility with std::vector.
+   */
+   const T& back() const {
+       return (*this)[size()-1];
+   }
+
+   /**
+    Removes the last element and returns it.  By default, shrinks the underlying array.
+    */
+   inline T pop(bool shrinkUnderlyingArrayIfNecessary = true) {
+       debugAssert(num > 0);
+       T temp = data[num - 1];
+       resize(num - 1, shrinkUnderlyingArrayIfNecessary);
+       return temp;
+   }
+
+   /** Pops the last element and discards it without returning anything.  Faster than pop.
+      By default, does not shrink the underlying array.*/
+   inline void popDiscard(bool shrinkUnderlyingArrayIfNecessary = false) {
+       debugAssert(num > 0);
+       resize(num - 1, shrinkUnderlyingArrayIfNecessary);
+   }
+
+
+   /**
+    "The member function swaps the controlled sequences between *this and str."
+    Note that this is slower than the optimal std implementation.
+
+    For compatibility with std::vector.
+    */
+   void swap(Array& str) {
+       Array temp = str;
+       str = *this;
+       *this = temp;
+   }
+
+
+   /**
+    Performs bounds checks in debug mode
+    */
+   inline T& operator[](int n) {
+        debugAssertM((n >= 0) && (n < num), format("Array index out of bounds. n = %d, size() = %d", n, num));
+        debugAssert(data!=NULL);
+        return data[n];
+   }
+
+   inline T& operator[](unsigned int n) {
+        debugAssertM(n < (unsigned int)num, format("Array index out of bounds. n = %d, size() = %d", n, num));
+        return data[n];
+   }
+
+   /**
+    Performs bounds checks in debug mode
+    */
+    inline const T& operator[](int n) const {
+        debugAssert((n >= 0) && (n < num));
+        debugAssert(data!=NULL);
+        return data[n];
+    }
+
+    inline const T& operator[](unsigned int n) const {
+        debugAssert((n < (unsigned int)num));
+        debugAssert(data!=NULL);
+        return data[n];
+    }
+
+    inline T& randomElement() {
+        debugAssert(num > 0);
+        debugAssert(data!=NULL);
+        return data[iRandom(0, num - 1)];
+    }
+
+    inline const T& randomElement() const {
+        debugAssert(num > 0);
+        debugAssert(data!=NULL);
+        return data[iRandom(0, num - 1)];
+    }
+
+    /**
+    Returns the last element, performing a check in
+    debug mode that there is at least one element.
+    */
+    inline const T& last() const {
+        debugAssert(num > 0);
+        debugAssert(data!=NULL);
+        return data[num - 1];
+    }
+
+    /** Returns element lastIndex() */
+    inline T& last() {
+        debugAssert(num > 0);
+        debugAssert(data!=NULL);
+        return data[num - 1];
+    }
+
+    /** Returns size() - 1 */
+    inline int lastIndex() const {
+        debugAssertM(num > 0, "Array is empty");
+        return num - 1;
+    }
+
+    inline int firstIndex() const {
+        debugAssertM(num > 0, "Array is empty");
+        return 0;
+    }
+
+    /** Returns element firstIndex(), performing a check in debug mode to ensure that there is at least one */
+    inline T& first() {
+        debugAssertM(num > 0, "Array is empty");
+        return data[0];
+    }
+
+    inline const T& first() const {
+        debugAssertM(num > 0, "Array is empty");
+        return data[0];
+    }
+
+    /** Returns iFloor(size() / 2), throws an assertion in debug mode if the array is empty */
+    inline int middleIndex() const {
+        debugAssertM(num > 0, "Array is empty");
+        return num >> 1;
+    }
+
+    /** Returns element middleIndex() */
+    inline const T& middle() const {
+        debugAssertM(num > 0, "Array is empty");
+        return data[num >> 1];   
+    }
+
+    /** Returns element middleIndex() */
+    inline T& middle() {
+        debugAssertM(num > 0, "Array is empty");
+        return data[num >> 1];   
+    }
+
+    /**
+    Calls delete on all objects[0...size-1]
+    and sets the size to zero.
+    */
+    void deleteAll() {
+        for (int i = 0; i < num; i++) {
+            delete data[i];
+        }
+        resize(0);
+    }
+
+    /**
+     Returns the index of (the first occurance of) an index or -1 if
+     not found.  Searches from the right.
+     */
+    int rfindIndex(const T& value) const {
+        for (int i = num -1 ; i >= 0; --i) {
+            if (data[i] == value) {
+                return i;
+            }
+        }
+        return -1;
+    }
+
+    /**
+     Returns the index of (the first occurance of) an index or -1 if
+     not found.
+     */
+    int findIndex(const T& value) const {
+        for (int i = 0; i < num; ++i) {
+            if (data[i] == value) {
+                return i;
+            }
+        }
+        return -1;
+    }
+
+    /**
+     Finds an element and returns the iterator to it.  If the element
+     isn't found then returns end().
+     */
+    Iterator find(const T& value) {
+        for (int i = 0; i < num; ++i) {
+            if (data[i] == value) {
+                return data + i;
+            }
+        }
+        return end();
+    }
+
+    ConstIterator find(const T& value) const {
+        for (int i = 0; i < num; ++i) {
+            if (data[i] == value) {
+                return data + i;
+            }
+        }
+        return end();
+    }
+
+    /**
+     Removes count elements from the array
+     referenced either by index or Iterator.
+     */
+    void remove(Iterator element, int count = 1) {
+        debugAssert((element >= begin()) && (element < end()));
+        debugAssert((count > 0) && (element + count) <= end());
+        Iterator last = end() - count;
+
+        while(element < last) {
+            element[0] = element[count];
+            ++element;
+        }
+        
+        resize(num - count);
+    }
+
+    void remove(int index, int count = 1) {
+        debugAssert((index >= 0) && (index < num));
+        debugAssert((count > 0) && (index + count <= num));
+        
+        remove(begin() + index, count);
+    }
+
+    /**
+     Reverse the elements of the array in place.
+     */
+    void reverse() {
+        T temp;
+        
+        int n2 = num / 2;
+        for (int i = 0; i < n2; ++i) {
+            temp = data[num - 1 - i];
+            data[num - 1 - i] = data[i];
+            data[i] = temp;
+        }
+    }
+
+    /**
+     Sort using a specific less-than function, e.g.:
+
+  
+    bool __cdecl myLT(const MyClass& elem1, const MyClass& elem2) {
+        return elem1.x < elem2.x;
+    }
+    

+
+  Note that for pointer arrays, the const must come 
+  after the class name, e.g., Array uses:
+
+  
+    bool __cdecl myLT(MyClass*const& elem1, MyClass*const& elem2) {
+        return elem1->x < elem2->x;
+    }
+    

+
+    or a functor, e.g.,
+    
+bool
+less_than_functor::operator()( const double& lhs, const double& rhs ) const
+{
+return( lhs < rhs? true : false );
+}
+

+     */
+    //    void sort(bool (__cdecl *lessThan)(const T& elem1, const T& elem2)) {
+    //    std::sort(data, data + num, lessThan);
+    //}
+    template
+    void sort(const LessThan& lessThan) {
+        // Using std::sort, which according to http://www.open-std.org/JTC1/SC22/WG21/docs/D_4.cpp
+        // was 2x faster than qsort for arrays around size 2000 on intel core2 with gcc
+        std::sort(data, data + num, lessThan);
+    }
+
+    /**
+     Sorts the array in increasing order using the > or < operator.  To 
+     invoke this method on Array, T must override those operator.
+     You can overide these operators as follows:
+     
+        bool T::operator>(const T& other) const {
+           return ...;
+        }
+        bool T::operator<(const T& other) const {
+           return ...;
+        }
+     
+     */
+    void sort(int direction = SORT_INCREASING) {
+        if (direction == SORT_INCREASING) {
+            std::sort(data, data + num);
+        } else {
+            std::sort(data, data + num, compareGT);
+        }
+    }
+
+    /**
+     Sorts elements beginIndex through and including endIndex.
+     */
+    void sortSubArray(int beginIndex, int endIndex, int direction = SORT_INCREASING) {
+        if (direction == SORT_INCREASING) {
+            std::sort(data + beginIndex, data + endIndex + 1);
+        } else {
+            std::sort(data + beginIndex, data + endIndex + 1, compareGT);
+        }
+    }
+
+    void sortSubArray(int beginIndex, int endIndex, bool (__cdecl *lessThan)(const T& elem1, const T& elem2)) {
+        std::sort(data + beginIndex, data + endIndex + 1, lessThan);
+    }
+
+    /**
+     The StrictWeakOrdering can be either a class that overloads the function call operator() or
+     a function pointer of the form bool (__cdecl *lessThan)(const T& elem1, const T& elem2)
+     */
+    template
+    void sortSubArray(int beginIndex, int endIndex, StrictWeakOrdering& lessThan) {
+        std::sort(data + beginIndex, data + endIndex + 1, lessThan);
+    }
+
+    /** Uses < and == to evaluate operator(); this is the default comparator for Array::partition. */
+    class DefaultComparator {
+    public:
+        inline int operator()(const T& A, const T& B) const {
+            if (A < B) {
+                return 1;
+            } else if (A == B) {
+                return 0;
+            } else {
+                return -1;
+            }
+        }
+    };
+
+    /** The output arrays are resized with fastClear() so that if they are already of the same size
+        as this array no memory is allocated during partitioning. 
+        
+        @param comparator A function, or class instance with an overloaded operator() that compares
+        two elements of type T and returns 0 if they are equal, -1 if the second is smaller,
+        and 1 if the first is smaller (i.e., following the conventions of std::string::compare).  For example:
+
+        
+        int compare(int A, int B) {
+            if (A < B) {
+                return 1;
+            } else if (A == B) {
+                return 0;
+            } else {
+                return -1;
+            }
+        }
+        

+        */
+    template
+    void partition(
+        const T& partitionElement, 
+        Array& ltArray,
+        Array& eqArray,
+        Array& gtArray,
+        const Comparator& comparator) const {
+
+        // Make sure all arrays are independent
+        debugAssert(<Array != this);
+        debugAssert(&eqArray != this);
+        debugAssert(>Array != this);
+        debugAssert(<Array != &eqArray);
+        debugAssert(<Array != >Array);
+        debugAssert(&eqArray != >Array);
+
+        // Clear the arrays
+        ltArray.fastClear();
+        eqArray.fastClear();
+        gtArray.fastClear();
+
+        // Form a table of buckets for lt, eq, and gt
+        Array* bucket[3] = {<Array, &eqArray, >Array};
+
+        for (int i = 0; i < num; ++i) {
+            int c = comparator(partitionElement, data[i]);
+            debugAssertM(c >= -1 && c <= 1, "Comparator returned an illegal value.");
+
+            // Insert into the correct bucket, 0, 1, or 2
+            bucket[c + 1]->append(data[i]);
+        }
+    }
+
+    /**
+      Uses < and == on elements to perform a partition.  See partition().
+     */
+    void partition(
+        const T& partitionElement, 
+        Array& ltArray,
+        Array& eqArray,
+        Array& gtArray) const {
+
+        partition(partitionElement, ltArray, eqArray, gtArray, typename Array::DefaultComparator());
+    }
+
+    /** 
+     Paritions the array into those below the median, those above the median, and those elements
+     equal to the median in expected O(n) time using quickselect.  If the array has an even
+     number of different elements, the median for partition purposes is the largest value
+     less than the median.
+
+     @param tempArray used for working scratch space
+     @param comparator see parition() for a discussion.*/
+    template
+    void medianPartition(
+        Array&           ltMedian, 
+        Array&           eqMedian, 
+        Array&           gtMedian,
+        Array&           tempArray,
+        const Comparator&   comparator) const {
+
+        ltMedian.fastClear();
+        eqMedian.fastClear();
+        gtMedian.fastClear();
+
+        // Handle trivial cases first
+        switch (size()) {
+        case 0:
+            // Array is empty; no parition is possible
+            return;
+
+        case 1:
+            // One element
+            eqMedian.append(first());
+            return;
+
+        case 2:
+            {
+                // Two element array; median is the smaller
+                int c = comparator(first(), last());
+                
+                switch (c) {
+                case -1:
+                    // first was bigger
+                    eqMedian.append(last());
+                    gtMedian.append(first());
+                    break;
+
+                case 0:
+                    // Both equal to the median
+                    eqMedian.append(first(), last());
+                    break;
+
+                case 1:
+                    // Last was bigger
+                    eqMedian.append(first());
+                    gtMedian.append(last());
+                    break;
+                }
+            }
+            return;
+        }
+
+        // All other cases use a recursive randomized median
+
+        // Number of values less than all in the current arrays        
+        int ltBoost = 0;
+
+        // Number of values greater than all in the current arrays        
+        int gtBoost = 0;
+
+        // For even length arrays, force the gt array to be one larger than the
+        // lt array:  
+        //  [1 2 3] size = 3, choose half = (s + 1) /2
+        //
+        int lowerHalfSize, upperHalfSize;
+        if (isEven(size())) {
+            lowerHalfSize = size() / 2;
+            upperHalfSize = lowerHalfSize + 1;
+        } else {
+            lowerHalfSize = upperHalfSize = (size() + 1) / 2;
+        }
+        const T* xPtr = NULL;
+
+        // Maintain pointers to the arrays; we'll switch these around during sorting
+        // to avoid copies.
+        const Array* source = this;
+        Array* lt     = <Median;
+        Array* eq     = &eqMedian;
+        Array* gt     = >Median;
+        Array* extra  = &tempArray;
+
+        while (true) {
+            // Choose a random element -- choose the middle element; this is theoretically
+            // suboptimal, but for loosly sorted array is actually the best strategy
+
+            xPtr = &(source->middle());
+            if (source->size() == 1) {
+                // Done; there's only one element left
+                break;
+            }
+            const T& x = *xPtr;
+
+            // Note: partition (fast) clears the arrays for us
+            source->partition(x, *lt, *eq, *gt, comparator);
+
+            int L = lt->size() + ltBoost + eq->size();
+            int U = gt->size() + gtBoost + eq->size();
+            if ((L >= lowerHalfSize) &&
+                (U >= upperHalfSize)) {
+
+                // x must be the partition median                    
+                break;
+
+            } else if (L < lowerHalfSize) {
+
+                // x must be smaller than the median.  Recurse into the 'gt' array.
+                ltBoost += lt->size() + eq->size();
+
+                // The new gt array will be the old source array, unless
+                // that was the this pointer (i.e., unless we are on the 
+                // first iteration)
+                Array* newGt = (source == this) ? extra : const_cast*>(source);
+                
+                // Now set up the gt array as the new source
+                source = gt;
+                gt = newGt;
+
+            } else {
+
+                // x must be bigger than the median.  Recurse into the 'lt' array.
+                gtBoost += gt->size() + eq->size();
+
+                // The new lt array will be the old source array, unless
+                // that was the this pointer (i.e., unless we are on the 
+                // first iteration)
+                Array* newLt = (source == this) ? extra : const_cast*>(source);
+                
+                // Now set up the lt array as the new source
+                source = lt;
+                lt = newLt;
+            }
+        }
+
+        // Now that we know the median, make a copy of it (since we're about to destroy the array that it
+        // points into).
+        T median = *xPtr;
+        xPtr = NULL;
+
+        // Partition the original array (note that this fast clears for us)
+        partition(median, ltMedian, eqMedian, gtMedian, comparator);
+    }
+
+    /**
+      Computes a median partition using the default comparator and a dynamically allocated temporary 
+      working array.  If the median is not in the array, it is chosen to be the largest value smaller
+      than the true median.
+     */
+    void medianPartition(
+        Array&           ltMedian, 
+        Array&           eqMedian, 
+        Array&           gtMedian) const {
+
+        Array temp;
+        medianPartition(ltMedian, eqMedian, gtMedian, temp, DefaultComparator());
+    }
+
+
+    /** Redistributes the elements so that the new order is statistically independent
+        of the original order. O(n) time.*/
+    void randomize() {
+        T temp;
+
+        for (int i = size() - 1; i >= 0; --i) {
+            int x = iRandom(0, i);
+
+            temp = data[i];
+            data[i] = data[x];
+            data[x] = temp;
+        }
+    }
+
+
+};
+
+
+/** Array::contains for C-arrays */
+template bool contains(const T* array, int len, const T& e) {
+    for (int i = len - 1; i >= 0; --i) {
+        if (array[i] == e) {
+            return true;
+        }
+    }
+    return false;
+}
+
+} // namespace
+
+#ifdef _MSC_VER
+#   pragma warning (pop)
+#endif
+
+#endif
diff --git a/externals/g3dlite/G3D/AtomicInt32.h b/externals/g3dlite/G3D/AtomicInt32.h
new file mode 100644
index 00000000000..2d63f998355
--- /dev/null
+++ b/externals/g3dlite/G3D/AtomicInt32.h
@@ -0,0 +1,164 @@
+/**
+ @file AtomicInt32.h
+
+ @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+
+ @created 2005-09-01
+ @edited  2006-06-21
+ */
+#ifndef G3D_ATOMICINT32_H
+#define G3D_ATOMICINT32_H
+
+#include "G3D/platform.h"
+#include "G3D/g3dmath.h"
+
+#if defined(G3D_OSX)
+#   include 
+#endif
+
+namespace G3D {
+
+/**
+ An integer that may safely be used on different threads without
+ external locking.
+
+ On Win32, Linux, FreeBSD, and Mac OS X this is implemented without locks.  
+
+ BETA API  This is unsupported and may change
+ */
+class AtomicInt32 {
+private:
+#   if defined(G3D_WIN32) 
+    volatile long           m_value;
+#   elif defined(G3D_OSX)
+    int32_t                 m_value;
+#   else
+    volatile int32          m_value;
+#   endif
+
+
+public:
+
+    /** Initial value is undefined. */
+    AtomicInt32() {}
+
+    /** Atomic set */
+    explicit AtomicInt32(const int32 x) {
+        m_value = x;
+    }
+
+    /** Atomic set */
+    AtomicInt32(const AtomicInt32& x) {
+        m_value = x.m_value;
+    }
+
+    /** Atomic set */
+    const AtomicInt32& operator=(const int32 x) {
+        m_value = x;
+        return *this;
+    }
+
+    /** Atomic set */
+    void operator=(const AtomicInt32& x) {
+        m_value = x.m_value;
+    }
+
+    /** Returns the current value */
+    int32 value() const {
+        return m_value;
+    }
+
+    /** Returns the old value, before the add. */
+    int32 add(const int32 x) {
+#       if defined(G3D_WIN32)
+
+            return InterlockedExchangeAdd(&m_value, x);
+
+#       elif defined(G3D_LINUX) || defined(G3D_FREEBSD)
+
+            int32 old;
+            asm volatile ("lock; xaddl %0,%1"
+                  : "=r"(old), "=m"(m_value) /* outputs */
+                  : "0"(x), "m"(m_value)   /* inputs */
+                  : "memory", "cc");
+            return old;
+            
+#       elif defined(G3D_OSX)
+
+            int32 old = m_value;
+            OSAtomicAdd32(x, &m_value);
+            return old;
+
+#       endif
+    }
+
+    /** Returns old value. */
+    int32 sub(const int32 x) {
+        return add(-x);
+    }
+
+    void increment() {
+#       if defined(G3D_WIN32)
+            // Note: returns the newly incremented value
+            InterlockedIncrement(&m_value);
+#       elif defined(G3D_LINUX) || defined(G3D_FREEBSD)
+            add(1);
+#       elif defined(G3D_OSX)
+            // Note: returns the newly incremented value
+            OSAtomicIncrement32(&m_value);
+#       endif
+    }
+
+    /** Returns zero if the result is zero after decrement, non-zero otherwise.*/
+    int32 decrement() {
+#       if defined(G3D_WIN32)
+            // Note: returns the newly decremented value
+            return InterlockedDecrement(&m_value);
+#       elif defined(G3D_LINUX)  || defined(G3D_FREEBSD)
+            unsigned char nz;
+
+            asm volatile ("lock; decl %1;\n\t"
+                          "setnz %%al"
+                          : "=a" (nz)
+                          : "m" (m_value)
+                          : "memory", "cc");
+            return nz;
+#       elif defined(G3D_OSX)
+            // Note: returns the newly decremented value
+            return OSAtomicDecrement32(&m_value);
+#       endif
+    }
+
+
+    /** Atomic test-and-set:  if *this == comperand then *this := exchange else do nothing.
+        In both cases, returns the old value of *this.
+    
+        Performs an atomic comparison of this with the Comperand value. 
+        If this is equal to the Comperand value, the Exchange value is stored in this.
+        Otherwise, no operation is performed.
+
+        Under VC6 the sign bit may be lost.
+     */ 
+    int32 compareAndSet(const int32 comperand, const int32 exchange) {
+#       if defined(G3D_WIN32)
+            return InterlockedCompareExchange(&m_value, exchange, comperand);
+#       elif defined(G3D_LINUX) || defined(G3D_FREEBSD) || defined(G3D_OSX)
+            // Based on Apache Portable Runtime
+            // http://koders.com/c/fid3B6631EE94542CDBAA03E822CA780CBA1B024822.aspx
+            int32 ret;
+            asm volatile ("lock; cmpxchgl %1, %2"
+                          : "=a" (ret)
+                          : "r" (exchange), "m" (m_value), "0"(comperand)
+                          : "memory", "cc");
+            return ret;
+
+            // Note that OSAtomicCompareAndSwap32 does not return a useful value for us
+            // so it can't satisfy the cmpxchgl contract.
+#       endif
+    }
+
+};
+
+} // namespace
+
+#endif
diff --git a/externals/g3dlite/G3D/BinaryFormat.h b/externals/g3dlite/G3D/BinaryFormat.h
new file mode 100644
index 00000000000..f6719a1c540
--- /dev/null
+++ b/externals/g3dlite/G3D/BinaryFormat.h
@@ -0,0 +1,140 @@
+/**
+ @file BinaryFormat.h
+ @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+ 
+ @author  2005-06-03
+ @edited  2005-06-03
+
+ Copyright 2000-2005, Morgan McGuire.
+ All rights reserved.
+ */
+
+#ifndef G3D_BINARYFORMAT_H
+#define G3D_BINARYFORMAT_H
+
+#include "G3D/platform.h"
+#include "G3D/g3dmath.h"
+
+namespace G3D {
+
+class Vector2;
+class Vector2int16;
+class Vector3;
+class Vector3int16;
+class Vector4;
+class Vector4int16;
+class Color3;
+class Color3uint8;
+class Color4;
+class Color4uint8;
+
+/**
+ Some values like float16 and int128 have no current CPU data structure that implements them but are useful
+ for file formats and for GPUs.
+
+ CHUNK_BINFMT data follows the protocol.
+ */
+// Must be packed int 16 bits for the chunk reader
+// We can't name these just "INT8" etc. because some libraries #define names like that
+enum BinaryFormat {
+    FIRST_BINFMT = 1000,
+
+    BOOL8_BINFMT,
+    UINT8_BINFMT, INT8_BINFMT, UINT16_BINFMT, INT16_BINFMT, UINT32_BINFMT, INT32_BINFMT, UINT64_BINFMT, INT64_BINFMT, UINT128_BINFMT, INT128_BINFMT,
+    FLOAT16_BINFMT, FLOAT32_BINFMT, FLOAT64_BINFMT,
+    VECTOR2_BINFMT, VECTOR2INT16_BINFMT,
+    VECTOR3_BINFMT, VECTOR3INT16_BINFMT,
+    VECTOR4_BINFMT, VECTOR4INT16_BINFMT,
+    COLOR3_BINFMT, COLOR3UINT8_BINFMT, COLOR3INT16_BINFMT,
+    COLOR4_BINFMT, COLOR4UINT8_BINFMT, COLOR4INT16_BINFMT,
+    STRING_BINFMT, STRINGEVEN_BINFMT, STRING8_BINFMT, STRING16_BINFMT, STRING32_BINFMT,
+
+    CHUNK_BINFMT,
+
+    CUSTOM_BINFMT,
+
+    LAST_BINFMT
+};
+
+}
+
+/** A macro that maps G3D types to format constants.
+    (e.g. binaryFormatOf(Vector3) == VECTOR3_BINFMT).
+*/
+// This implementation is designed to meet the following constraints:
+//   1. Work around the many MSVC++ partial template bugs
+//   2. Work for primitive types (e.g. int)
+#define binaryFormatOf(T) (G3D::_internal::_BinaryFormat::x())
+
+namespace G3D {
+namespace _internal {
+
+
+template class _BinaryFormat {
+public:
+    static BinaryFormat x() {
+        return CUSTOM_BINFMT;
+    }
+};
+}}
+
+
+/**
+ Macro to declare the underlying format (as will be returned by glFormatOf)
+ of a type.  For example,
+
+  
+    DECLARE_BINARYFORMATOF(Vector4, VECTOR4_BINFMT)
+  

+
+  Use this so you can make vertex arrays of your own classes and not just 
+  the standard ones.
+ */
+#define DECLARE_BINARYFORMATOF(CType, EnumType)      \
+namespace G3D {                                      \
+    namespace _internal {                            \
+        template<> class _BinaryFormat {      \
+        public:                                      \
+        static BinaryFormat x()  {                   \
+                return EnumType;                     \
+            }                                        \
+        };                                           \
+    }                                                \
+}
+
+DECLARE_BINARYFORMATOF( bool,          BOOL8_BINFMT )
+
+DECLARE_BINARYFORMATOF( uint8,         UINT8_BINFMT )
+DECLARE_BINARYFORMATOF( int8,          INT8_BINFMT )
+DECLARE_BINARYFORMATOF( uint16,        UINT16_BINFMT )
+DECLARE_BINARYFORMATOF( int16,         INT16_BINFMT )
+DECLARE_BINARYFORMATOF( uint32,        UINT32_BINFMT )
+DECLARE_BINARYFORMATOF( int32,         INT32_BINFMT )
+DECLARE_BINARYFORMATOF( uint64,        UINT64_BINFMT )
+DECLARE_BINARYFORMATOF( int64,         INT64_BINFMT )
+
+DECLARE_BINARYFORMATOF( float32,       FLOAT32_BINFMT )
+DECLARE_BINARYFORMATOF( float64,       FLOAT64_BINFMT )
+
+DECLARE_BINARYFORMATOF( Vector2,       VECTOR2_BINFMT )
+DECLARE_BINARYFORMATOF( Vector2int16,  VECTOR2INT16_BINFMT )
+DECLARE_BINARYFORMATOF( Vector3,       VECTOR3_BINFMT )
+DECLARE_BINARYFORMATOF( Vector3int16,  VECTOR3INT16_BINFMT )
+DECLARE_BINARYFORMATOF( Vector4,       VECTOR4_BINFMT )
+DECLARE_BINARYFORMATOF( Vector4int16,  VECTOR4INT16_BINFMT )
+
+DECLARE_BINARYFORMATOF( Color3,        COLOR3_BINFMT )
+DECLARE_BINARYFORMATOF( Color3uint8,   COLOR3UINT8_BINFMT )
+DECLARE_BINARYFORMATOF( Color4,        COLOR4_BINFMT )
+DECLARE_BINARYFORMATOF( Color4uint8,   COLOR4UINT8_BINFMT )
+
+namespace G3D {
+
+/** Returns -1 if the format is custom, otherwise the byte size
+    of a single element in this format.*/ 
+int32 byteSize(BinaryFormat f);
+
+
+} //G3D
+
+#endif 
diff --git a/externals/g3dlite/G3D/BinaryInput.h b/externals/g3dlite/G3D/BinaryInput.h
new file mode 100644
index 00000000000..1dac93ea55e
--- /dev/null
+++ b/externals/g3dlite/G3D/BinaryInput.h
@@ -0,0 +1,441 @@
+/**
+ @file BinaryInput.h
+ 
+ @maintainer Morgan McGuire, graphics3d.com
+ 
+ @created 2001-08-09
+ @edited  2006-07-19
+
+ Copyright 2000-2009, Morgan McGuire.
+ All rights reserved.
+ */
+
+#ifndef G3D_BinaryInput_h
+#define G3D_BinaryInput_h
+
+#ifdef _MSC_VER
+// Disable conditional expression is constant, which occurs incorrectly on inlined functions
+#   pragma  warning(push)
+#   pragma warning( disable : 4127 )
+#endif
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include "G3D/platform.h"
+#include "G3D/Array.h"
+#include "G3D/Color4.h"
+#include "G3D/Color3.h"
+#include "G3D/Vector4.h"
+#include "G3D/Vector3.h"
+#include "G3D/Vector2.h"
+#include "G3D/g3dmath.h"
+#include "G3D/debug.h"
+#include "G3D/System.h"
+
+
+namespace G3D {
+
+#if defined(G3D_WIN32) || defined(G3D_LINUX)
+    // Allow writing of integers to non-word aligned locations.
+    // This is legal on x86, but not on other platforms.
+    #define G3D_ALLOW_UNALIGNED_WRITES
+#endif
+
+/**
+ Sequential or random access byte-order independent binary file access.
+ Files compressed with zlib and beginning with an unsigned 32-bit int
+ size are transparently decompressed when the compressed = true flag is
+ specified to the constructor.
+
+ For every readX method there are also versions that operate on a whole
+ Array, std::vector, or C-array.  e.g. readFloat32(Array& array, n)
+ These methods resize the array or std::vector to the appropriate size
+ before reading.  For a C-array, they require the pointer to reference
+ a memory block at least large enough to hold n elements.
+
+ Most classes define serialize/deserialize methods that use BinaryInput,
+ BinaryOutput, TextInput, and TextOutput.  There are text serializer 
+ functions for primitive types (e.g. int, std::string, float, double) but not 
+ binary serializers-- you must call the BinaryInput::readInt32 or
+ other appropriate function.  This is because it would be very hard to 
+ debug the error sequence: serialize(1.0, bo); ... float f; deserialize(f, bi);
+ in which a double is serialized and then deserialized as a float. 
+ */
+class BinaryInput {
+private:
+
+    // The initial buffer will be no larger than this, but 
+    // may grow if a large memory read occurs.  50 MB
+    enum {INITIAL_BUFFER_LENGTH = 50000000};
+
+    /**
+     is the file big or little endian
+     */
+    G3DEndian       m_fileEndian;
+    std::string     m_filename;
+
+    bool            m_swapBytes;
+
+    /** Next position to read from in bitString during readBits. */
+    int             m_bitPos;
+
+    /** Bits currently being read by readBits.  
+        Contains at most 8 (low) bits.  Note that
+        beginBits/readBits actually consumes one extra byte, which
+        will be restored by writeBits.*/
+    uint32          m_bitString;
+
+    /** 1 when between beginBits and endBits, 0 otherwise. */
+    int             m_beginEndBits;
+
+    /** When operating on huge files, we cannot load the whole file into memory.
+        This is the file position to which buffer[0] corresponds.
+        */
+    int64           m_alreadyRead;
+
+    /**
+     Length of the entire file, in bytes.  
+     For the length of the buffer, see bufferLength
+     */
+    int64           m_length;
+
+    /** Length of the array referenced by buffer. May go past the end of the file!*/
+    int64           m_bufferLength;
+    uint8*          m_buffer;
+
+    /**
+     Next byte in file, relative to buffer.
+     */
+    int64           m_pos;
+
+    /**
+     When true, the buffer is freed in the destructor.
+     */
+    bool            m_freeBuffer;
+
+    /** Ensures that we are able to read at least minLength from startPosition (relative
+        to start of file). */
+    void loadIntoMemory(int64 startPosition, int64 minLength = 0);
+
+    /** Verifies that at least this number of bytes can be read.*/
+    inline void prepareToRead(int64 nbytes) {
+        debugAssertM(m_length > 0, m_filename + " not found or corrupt.");
+        debugAssertM(m_pos + nbytes + m_alreadyRead <= m_length, "Read past end of file.");
+
+        if (m_pos + nbytes > m_bufferLength) {
+            loadIntoMemory(m_pos + m_alreadyRead, nbytes);    
+        }
+    }
+
+    // Not implemented on purpose, don't use
+    BinaryInput(const BinaryInput&);
+    BinaryInput& operator=(const BinaryInput&);
+    bool operator==(const BinaryInput&);
+
+    /** Buffer is compressed; replace it with a decompressed version */
+    void decompress();
+public:
+
+    /** false, constant to use with the copyMemory option */
+    static const bool       NO_COPY;
+
+    /**
+       If the file cannot be opened, a zero length buffer is presented.
+       Automatically opens files that are inside zipfiles.
+
+       @param compressed Set to true if and only if the file was
+       compressed using BinaryOutput's zlib compression.  This has
+       nothing to do with whether the input is in a zipfile.
+    */
+    BinaryInput(
+        const std::string&  filename,
+        G3DEndian           fileEndian,
+        bool                compressed = false);
+
+    /**
+     Creates input stream from an in memory source.
+     Unless you specify copyMemory = false, the data is copied
+     from the pointer, so you may deallocate it as soon as the
+     object is constructed.  It is an error to specify copyMemory = false
+     and compressed = true.
+
+     To decompress part of a file, you can follow the following paradigm:
+
+     
+        BinaryInput master(...);
+
+        // read from master to point where compressed data exists.
+
+        BinaryInput subset(master.getCArray() + master.getPosition(), 
+                           master.length() - master.getPosition(),
+                           master.endian(), true, true);
+
+        // Now read from subset (it is ok for master to go out of scope)
+     

+     */
+    BinaryInput(
+        const uint8*        data,
+        int64               dataLen,
+        G3DEndian           dataEndian,
+        bool                compressed = false,
+        bool                copyMemory = true);
+
+    virtual ~BinaryInput();
+
+    /** Change the endian-ness of the file.  This only changes the
+        interpretation of the file for future read calls; the
+        underlying data is unmodified.*/
+    void setEndian(G3DEndian endian);
+
+    G3DEndian endian() const {
+        return m_fileEndian;
+    }
+
+    std::string getFilename() const {
+        return m_filename;
+    }
+
+    /**
+     Returns a pointer to the internal memory buffer.
+     May throw an exception for huge files.
+     */
+    const uint8* getCArray() const {
+        if (m_alreadyRead > 0) {
+            throw "Cannot getCArray for a huge file";
+        }
+        return m_buffer;
+    }
+
+    /**
+     Performs bounds checks in debug mode.  [] are relative to
+     the start of the file, not the current position.
+     Seeks to the new position before reading (and leaves 
+     that as the current position)
+     */
+    inline uint8 operator[](int64 n) {
+        setPosition(n);
+        return readUInt8();
+    }
+
+    /**
+     Returns the length of the file in bytes.
+     */
+    inline int64 getLength() const {
+        return m_length;
+    }
+
+    inline int64 size() const {
+        return getLength();
+    }
+
+    /**
+     Returns the current byte position in the file,
+     where 0 is the beginning and getLength() - 1 is the end.
+     */
+    inline int64 getPosition() const {
+        return m_pos + m_alreadyRead;
+    }
+
+    /**
+     Sets the position.  Cannot set past length.
+     May throw a char* when seeking backwards more than 10 MB on a huge file.
+     */
+    inline void setPosition(int64 p) {
+        debugAssertM(p <= m_length, "Read past end of file");
+        m_pos = p - m_alreadyRead;
+        if ((m_pos < 0) || (m_pos > m_bufferLength)) {
+            loadIntoMemory(m_pos + m_alreadyRead);
+        }
+    }
+
+    /**
+     Goes back to the beginning of the file.
+     */
+    inline void reset() {
+        setPosition(0);
+    }
+
+    inline int8 readInt8() {
+        prepareToRead(1);
+        return m_buffer[m_pos++];
+    }
+
+    inline bool readBool8() {
+        return (readInt8() != 0);
+    }
+
+    inline uint8 readUInt8() {
+        prepareToRead(1);
+        return ((uint8*)m_buffer)[m_pos++];
+    }
+
+    uint16 inline readUInt16() {
+        prepareToRead(2);
+
+        m_pos += 2;
+        if (m_swapBytes) {
+            uint8 out[2];
+            out[0] = m_buffer[m_pos - 1];
+            out[1] = m_buffer[m_pos - 2];
+            return *(uint16*)out;
+        } else {
+            #ifdef G3D_ALLOW_UNALIGNED_WRITES
+                return *(uint16*)(&m_buffer[m_pos - 2]);
+            #else
+                uint8 out[2];
+                out[0] = m_buffer[m_pos - 2];
+                out[1] = m_buffer[m_pos - 1];
+                return *(uint16*)out;
+            #endif
+        }
+
+    }
+
+    inline int16 readInt16() {
+        uint16 a = readUInt16();
+        return *(int16*)&a;
+    }
+
+    inline uint32 readUInt32() {
+        prepareToRead(4);
+
+        m_pos += 4;
+        if (m_swapBytes) {
+            uint8 out[4];
+            out[0] = m_buffer[m_pos - 1];
+            out[1] = m_buffer[m_pos - 2];
+            out[2] = m_buffer[m_pos - 3];
+            out[3] = m_buffer[m_pos - 4];
+            return *(uint32*)out;
+        } else {
+            #ifdef G3D_ALLOW_UNALIGNED_WRITES
+                return *(uint32*)(&m_buffer[m_pos - 4]);
+            #else
+                uint8 out[4];
+                out[0] = m_buffer[m_pos - 4];
+                out[1] = m_buffer[m_pos - 3];
+                out[2] = m_buffer[m_pos - 2];
+                out[3] = m_buffer[m_pos - 1];
+                return *(uint32*)out;
+            #endif
+        }
+    }
+
+
+    inline int32 readInt32() {
+        uint32 a = readUInt32();
+        return *(int32*)&a;
+    }
+
+    uint64 readUInt64();
+
+    inline int64 readInt64() {
+        uint64 a = readUInt64();
+        return *(int64*)&a;
+    }
+
+    inline float32 readFloat32() {
+        union {
+            uint32 a;
+            float32 b;
+        };
+        a = readUInt32();
+        return b;
+    }    
+
+    inline float64 readFloat64() {
+        union {
+            uint64 a;
+            float64 b;
+        };
+        a = readUInt64();
+        return b;
+    }
+
+    void readBytes(void* bytes, int64 n);
+
+    /**
+     Reads an n character string.  The string is not
+     required to end in NULL in the file but will
+     always be a proper std::string when returned.
+     */
+    std::string readString(int64 n);
+
+    /**
+     Reads until NULL or the end of the file is encountered.
+     */
+    std::string readString();
+
+    /**
+     Reads until NULL or the end of the file is encountered.
+     If the string has odd length (including NULL), reads 
+     another byte.
+     */
+    std::string readStringEven();
+
+
+    std::string readString32();
+
+    Vector4 readVector4();
+    Vector3 readVector3();
+    Vector2 readVector2();
+
+    Color4 readColor4();
+    Color3 readColor3();
+
+    /**
+     Skips ahead n bytes.
+     */
+    inline void skip(int64 n) {
+        setPosition(m_pos + m_alreadyRead + n);
+    }
+
+    /**
+      Returns true if the position is not at the end of the file
+    */
+    inline bool hasMore() const {
+	return m_pos + m_alreadyRead < m_length;
+    }
+
+    /** Prepares for bit reading via readBits.  Only readBits can be
+        called between beginBits and endBits without corrupting the
+        data stream. */
+    void beginBits();
+
+    /** Can only be called between beginBits and endBits */
+    uint32 readBits(int numBits);
+
+    /** Ends bit-reading. */
+    void endBits();
+
+#   define DECLARE_READER(ucase, lcase)\
+    void read##ucase(lcase* out, int64 n);\
+    void read##ucase(std::vector& out, int64 n);\
+    void read##ucase(Array& out, int64 n);
+
+    DECLARE_READER(Bool8,   bool)
+    DECLARE_READER(UInt8,   uint8)
+    DECLARE_READER(Int8,    int8)
+    DECLARE_READER(UInt16,  uint16)
+    DECLARE_READER(Int16,   int16)
+    DECLARE_READER(UInt32,  uint32)
+    DECLARE_READER(Int32,   int32)
+    DECLARE_READER(UInt64,  uint64)
+    DECLARE_READER(Int64,   int64)
+    DECLARE_READER(Float32, float32)
+    DECLARE_READER(Float64, float64)    
+#   undef DECLARE_READER
+};
+
+
+}
+
+#ifdef _MSC_VER
+#   pragma  warning(pop)
+#endif
+
+#endif
diff --git a/externals/g3dlite/G3D/BinaryOutput.h b/externals/g3dlite/G3D/BinaryOutput.h
new file mode 100644
index 00000000000..d81ec56a67b
--- /dev/null
+++ b/externals/g3dlite/G3D/BinaryOutput.h
@@ -0,0 +1,421 @@
+/**
+ @file BinaryOutput.h
+ 
+ @maintainer Morgan McGuire, graphics3d.com
+ 
+ @created 2001-08-09
+ @edited  2008-01-24
+
+ Copyright 2000-2006, Morgan McGuire.
+ All rights reserved.
+ */
+
+#ifndef G3D_BINARYOUTPUT_H
+#define G3D_BINARYOUTPUT_H
+
+#include "G3D/platform.h"
+#include 
+#include 
+#include 
+#include 
+#include 
+#include "G3D/Color4.h"
+#include "G3D/Color3.h"
+#include "G3D/Vector4.h"
+#include "G3D/Vector3.h"
+#include "G3D/Vector2.h"
+#include "G3D/g3dmath.h"
+#include "G3D/debug.h"
+#include "G3D/BinaryInput.h"
+#include "G3D/System.h"
+
+#ifdef _MSC_VER
+#   pragma warning (push)
+// Conditional is constant (wrong in inline)
+#   pragma warning (disable : 4127)
+#endif
+namespace G3D {
+
+/**
+ Sequential or random access byte-order independent binary file access.
+
+ The compress() call can be used to compress with zlib.
+
+ Any method call can trigger an out of memory error (thrown as char*) 
+ when writing to "" instead of a file.
+
+ Compressed writing and seeking backwards is not supported for huge files
+ (i.e., BinaryOutput may have to dump the contents to disk if they 
+ exceed available RAM).
+ */
+class BinaryOutput {
+private:
+    std::string     m_filename;
+
+    bool            m_committed;
+
+    /** 0 outside of beginBits...endBits, 1 inside */
+    int             m_beginEndBits;
+
+    /** The current string of bits being built up by beginBits...endBits.
+        This string is treated semantically, as if the lowest bit was
+        on the left and the highest was on the right.*/
+    int8            m_bitString;
+
+    /** Position (from the lowest bit) currently used in bitString.*/
+    int             m_bitPos;
+
+    // True if the file endianess does not match the machine endian
+    bool            m_swapBytes;
+
+    G3DEndian       m_fileEndian;
+
+    uint8*          m_buffer;
+    
+    /** Size of the elements used */
+    int             m_bufferLen;
+
+    /** Underlying size of memory allocaded */
+    int             m_maxBufferLen;
+
+    /** Next byte in file */
+    int             m_pos;
+
+    /** is this initialized? */
+    bool            m_init;
+
+    /** Number of bytes already written to the file.*/
+    size_t          m_alreadyWritten;             
+
+    bool            m_ok;
+
+    void reserveBytesWhenOutOfMemory(size_t bytes);
+
+    void reallocBuffer(size_t bytes, size_t oldBufferLen);
+
+    /**
+     Make sure at least bytes can be written, resizing if
+     necessary.
+     */
+    inline void reserveBytes(int bytes) {
+        debugAssert(bytes > 0);
+        size_t oldBufferLen = (size_t)m_bufferLen;
+
+        m_bufferLen = iMax(m_bufferLen, (m_pos + bytes));
+        if (m_bufferLen > m_maxBufferLen) {
+            reallocBuffer(bytes, oldBufferLen);
+        }
+    }
+
+    // Not implemented on purpose, don't use
+    BinaryOutput(const BinaryOutput&);
+    BinaryOutput& operator=(const BinaryOutput&);
+    bool operator==(const BinaryOutput&);
+
+public:
+
+    /**
+     You must call setEndian() if you use this (memory) constructor.
+     */
+    BinaryOutput();
+
+    /**
+     Doesn't actually open the file; commit() does that.
+     Use "" as the filename if you're going to commit
+     to memory.
+     */
+    BinaryOutput(
+        const std::string&  filename,
+        G3DEndian           fileEndian);
+
+    ~BinaryOutput();
+    
+    /** Compresses the data in the buffer in place, 
+        preceeding it with a little-endian uint32 indicating 
+        the uncompressed size.
+
+        Call immediately before commit().
+
+        Cannot be used for huge files (ones where the data
+        was already written to disk)-- will throw char*.
+     */
+    void compress();
+
+    /** True if no errors have been encountered.*/
+    bool ok() const;
+
+    /**
+     Returns a pointer to the internal memory buffer.
+     */
+    inline const uint8* getCArray() const {
+        return m_buffer;
+    }
+
+    void setEndian(G3DEndian fileEndian);
+
+    G3DEndian endian() const {
+        return m_fileEndian;
+    }
+
+    std::string getFilename() const {
+        return m_filename;
+    }
+
+    /**
+     Write the bytes to disk.  It is ok to call this 
+     multiple times; it will just overwrite the previous file.
+
+     Parent directories are created as needed if they do
+     not exist.
+
+     Not called from the destructor; you must call
+     it yourself.
+
+     @param flush If true (default) the file is ready for reading when the method returns, otherwise 
+      the method returns immediately and writes the file in the background.
+    */
+    void commit(bool flush = true);
+
+    /**
+     Write the bytes to memory (which must be of
+     at least size() bytes).
+     */
+    void commit(uint8*);
+
+    /**
+      A memory BinaryOutput may be reset so that it can be written to again
+      without allocating new memory.  The underlying array will not be deallocated,
+      but the reset structure will act like a newly intialized one.
+     */
+    void reset();
+
+
+    inline int length() const {
+        return (int)m_bufferLen + (int)m_alreadyWritten;
+    }
+
+    inline int size() const {
+        return length();
+    }
+
+    /**
+     Sets the length of the file to n, padding
+     with 0's past the current end.  Does not
+     change the position of the next byte to be
+     written unless n < size().
+
+     Throws char* when resetting a huge file to be shorter
+     than its current length.
+     */
+    inline void setLength(int n) {
+        n = n - (int)m_alreadyWritten;
+
+        if (n < 0) {
+            throw "Cannot resize huge files to be shorter.";
+        }
+
+        if (n < m_bufferLen) {
+            m_pos = n;
+        }
+        if (n > m_bufferLen) {
+            reserveBytes(n - m_bufferLen);
+        }
+    }
+
+    /**
+     Returns the current byte position in the file,
+     where 0 is the beginning and getLength() - 1 is the end.
+     */
+    inline int64 position() const {
+        return (int64)m_pos + (int64)m_alreadyWritten;
+    }
+
+
+    /**
+     Sets the position.  Can set past length, in which case
+     the file is padded with zeros up to one byte before the
+     next to be written.
+
+     May throw a char* exception when seeking backwards on a huge file.
+     */
+    inline void setPosition(int64 p) {
+        p = p - (int64)m_alreadyWritten;
+
+        if (p > m_bufferLen) {
+            setLength((int)(p + (int64)m_alreadyWritten));
+        }
+
+        if (p < 0) {
+            throw "Cannot seek more than 10 MB backwards on huge files.";
+        }
+
+        m_pos = (int)p;
+    }
+
+
+    void writeBytes(
+        const void*         b,
+        int                 count) {
+
+        reserveBytes(count);
+        debugAssert(m_pos >= 0);
+        debugAssert(m_bufferLen >= count);
+        System::memcpy(m_buffer + m_pos, b, count);
+        m_pos += count;
+    }
+
+    /**
+     Writes a signed 8-bit integer to the current position.
+     */
+    inline void writeInt8(int8 i) {
+        reserveBytes(1);
+        m_buffer[m_pos] = *(uint8*)&i;
+        m_pos++;
+    }
+
+    inline void writeBool8(bool b) {
+        writeInt8(b ? 1 : 0);
+    }
+
+    inline void writeUInt8(uint8 i) {
+        reserveBytes(1);
+        m_buffer[m_pos] = i;
+        m_pos++;
+    }
+
+    void writeUInt16(uint16 u);
+
+    inline void writeInt16(int16 i) {
+        writeUInt16(*(uint16*)&i);
+    }
+
+    void writeUInt32(uint32 u);
+
+    inline void writeInt32(int32 i) {
+        debugAssert(m_beginEndBits == 0);
+        writeUInt32(*(uint32*)&i);
+    }
+
+    void writeUInt64(uint64 u);
+
+    inline void writeInt64(int64 i) {
+        writeUInt64(*(uint64*)&i);
+    }
+
+    inline void writeFloat32(float32 f) {
+        debugAssert(m_beginEndBits == 0);
+        union {
+            float32 a;
+            uint32 b;
+        };
+        a = f;
+        writeUInt32(b);
+    }
+
+    inline void writeFloat64(float64 f) {
+        union {
+            float64 a;
+            uint64 b;
+        };
+        a = f;
+        writeUInt64(b);
+    }
+
+    /**
+     Write a string with NULL termination.
+     */
+    inline void writeString(const std::string& s) {
+        writeString(s.c_str());
+    }
+
+    void writeString(const char* s);
+
+    /**
+     Write a string, ensuring that the total length
+     including NULL is even.
+     */
+    void writeStringEven(const std::string& s) {
+        writeStringEven(s.c_str());
+    }
+
+    void writeStringEven(const char* s);
+
+
+    void writeString32(const char* s);
+
+    /**
+     Write a string with a 32-bit length field in front
+     of it.
+     */
+    void writeString32(const std::string& s) {
+        writeString32(s.c_str());
+    }
+
+    void writeVector4(const Vector4& v);
+
+    void writeVector3(const Vector3& v);
+
+    void writeVector2(const Vector2& v);
+
+    void writeColor4(const Color4& v);
+
+    void writeColor3(const Color3& v);
+
+    /**
+     Skips ahead n bytes.
+     */
+    inline void skip(int n) {
+        if (m_pos + n > m_bufferLen) {
+            setLength((int)m_pos + (int)m_alreadyWritten + n);
+        }
+        m_pos += n;
+    }
+
+    /** Call before a series of BinaryOutput::writeBits calls. Only writeBits 
+        can be called between beginBits and endBits without corrupting the stream.*/
+    void beginBits();
+
+    /** Write numBits from bitString to the output stream.  Bits are numbered from
+        low to high.
+    
+        Can only be 
+        called between beginBits and endBits.  Bits written are semantically
+        little-endian, regardless of the actual endian-ness of the system.  That is,
+        writeBits(0xABCD, 16) writes 0xCD to the first byte and 
+        0xAB to the second byte.  However, if used with BinaryInput::readBits, the ordering
+        is transparent to the caller.
+      */
+    void writeBits(uint32 bitString, int numBits);
+
+    /** Call after a series of BinaryOutput::writeBits calls. This will
+        finish out with zeros the last byte into which bits were written.*/
+    void endBits();
+
+
+#   define DECLARE_WRITER(ucase, lcase)\
+    void write##ucase(const lcase* out, int n);\
+    void write##ucase(const std::vector& out, int n);\
+    void write##ucase(const Array& out, int n);
+
+    DECLARE_WRITER(Bool8,   bool)
+    DECLARE_WRITER(UInt8,   uint8)
+    DECLARE_WRITER(Int8,    int8)
+    DECLARE_WRITER(UInt16,  uint16)
+    DECLARE_WRITER(Int16,   int16)
+    DECLARE_WRITER(UInt32,  uint32)
+    DECLARE_WRITER(Int32,   int32)
+    DECLARE_WRITER(UInt64,  uint64)
+    DECLARE_WRITER(Int64,   int64)
+    DECLARE_WRITER(Float32, float32)
+    DECLARE_WRITER(Float64, float64)    
+#   undef DECLARE_WRITER
+
+};
+
+}
+
+#ifdef _MSC_VER
+#   pragma warning (pop)
+#endif
+
+#endif
diff --git a/externals/g3dlite/G3D/BoundsTrait.h b/externals/g3dlite/G3D/BoundsTrait.h
new file mode 100644
index 00000000000..15e1418010c
--- /dev/null
+++ b/externals/g3dlite/G3D/BoundsTrait.h
@@ -0,0 +1,20 @@
+/**
+  @file BoundsTrait.h
+
+  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+  @created 2008-10-01
+  @edited  2008-10-01
+  Copyright 2000-2009, Morgan McGuire.
+  All rights reserved.
+ */
+
+#ifndef G3D_BOUNDSTRAIT_H
+#define G3D_BOUNDSTRAIT_H
+
+#include "G3D/platform.h"
+
+template
+struct BoundsTrait{};
+
+#endif
+
diff --git a/externals/g3dlite/G3D/Box.h b/externals/g3dlite/G3D/Box.h
new file mode 100644
index 00000000000..82af9125b05
--- /dev/null
+++ b/externals/g3dlite/G3D/Box.h
@@ -0,0 +1,195 @@
+/**
+  @file Box.h
+ 
+  Box class
+ 
+  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+ 
+  @cite Portions based on Dave Eberly's Magic Software Library at http://www.magic-software.com
+  @created 2001-06-02
+  @edited  2007-06-05
+
+  Copyright 2000-2006, Morgan McGuire.
+  All rights reserved.
+ */
+
+#ifndef G3D_BOX_H
+#define G3D_BOX_H
+
+#include "G3D/platform.h"
+#include "G3D/Vector3.h"
+#include "G3D/Array.h"
+#include "G3D/Plane.h"
+
+namespace G3D {
+
+class CoordinateFrame;
+
+/**
+ An arbitrary 3D box, useful as a bounding box. 
+
+
+  To construct a box from a coordinate frame, center and extent, use the idiom:
+
+ Box box = cframe.toObjectSpace(Box(center - extent/2, center + extent/2));
+ */
+class Box {
+private:
+
+    static int32 dummy;
+
+    friend class CoordinateFrame;
+
+    /**
+      
+       3    2       7    6
+    
+       0    1       4    5
+
+       front    back (seen through front)
+      

+     */
+    Vector3 _corner[8];
+
+    /**
+     Unit axes.
+     */
+    Vector3 _axis[3];
+   
+    Vector3 _center;
+
+    /**
+     Extent along each axis.
+     */
+    Vector3 _extent;
+
+    float  _area;
+    float  _volume;
+
+    void init(
+        const Vector3& min,
+        const Vector3& max);
+
+public:
+
+    /**
+     Does not initialize the fields.
+     */
+    Box();
+
+    /**
+      Constructs a box from two opposite corners.
+     */
+    Box(
+        const Vector3&      min,
+        const Vector3&      max);
+
+    static Box inf();
+
+	Box(class BinaryInput& b);
+
+    Box(const class AABox& b);
+
+	void serialize(class BinaryOutput& b) const;
+	void deserialize(class BinaryInput& b);
+
+    /**
+     Returns the object to world transformation for 
+     this box.  localFrame().worldToObject(...) takes
+     objects into the space where the box axes are
+     (1,0,0), (0,1,0), (0,0,1).  Note that there
+     is no scaling in this transformation.
+     */
+    CoordinateFrame localFrame() const;
+
+    void getLocalFrame(CoordinateFrame& frame) const;
+
+    /**
+      Returns the centroid of the box.
+     */
+    inline Vector3 center() const {
+        return _center;
+    }
+
+
+    inline Vector3 corner(int i) const {
+        debugAssert(i < 8);
+        return _corner[i];
+    }
+
+    /**
+     Unit length.
+     */
+    inline Vector3 axis(int a) const {
+        debugAssert(a < 3);
+        return _axis[a];
+    }
+
+    /**
+     Distance from corner(0) to the next corner
+     along the box's local axis a.
+     */
+    inline float extent(int a) const {
+        debugAssert(a < 3);
+        return (float)_extent[a];
+    }
+
+    inline Vector3 extent() const {
+        return _extent;
+    }
+
+    /**
+     Returns the four corners of a face (0 <= f < 6).
+     The corners are returned to form a counter clockwise quad facing outwards.
+     */
+    void getFaceCorners(
+        int                 f,
+        Vector3&            v0,
+        Vector3&            v1,
+        Vector3&            v2,
+        Vector3&            v3) const;
+
+
+	/**
+      See AABox::culledBy
+	 */
+    bool culledBy
+    (
+     const Array&		plane,
+     int32&                             cullingPlaneIndex,
+     const uint32  			testMask,
+     uint32&                            childMask) const;
+
+    /**
+     Conservative culling test that does not produce a mask for children.
+     */
+    bool culledBy
+    (
+     const Array&		plane,
+     int32&                             cullingPlaneIndex = dummy,
+     const uint32  			testMask	  = -1) const;
+
+    bool contains(
+        const Vector3&      point) const;
+
+    float area() const;
+
+    float volume() const;
+
+    void getRandomSurfacePoint(Vector3& P, Vector3& N = Vector3::ignore()) const;
+
+    /**
+     Uniformly distributed on the interior (includes surface)
+     */
+    Vector3 randomInteriorPoint() const;
+
+    void getBounds(class AABox&) const;
+
+    bool isFinite() const {
+        return G3D::isFinite(_volume);
+    }
+};
+
+}
+
+#endif
diff --git a/externals/g3dlite/G3D/Box2D.h b/externals/g3dlite/G3D/Box2D.h
new file mode 100644
index 00000000000..80accad89dd
--- /dev/null
+++ b/externals/g3dlite/G3D/Box2D.h
@@ -0,0 +1,121 @@
+/**
+  @file Box2D.h
+ 
+  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+ 
+  @created 2001-06-02
+  @edited  2008-12-27
+
+  Copyright 2000-2009, Morgan McGuire.
+  All rights reserved.
+ */
+
+#ifndef G3D_Box2D_h
+#define G3D_Box2D_h
+
+#include "G3D/platform.h"
+#include "G3D/Vector2.h"
+
+namespace G3D {
+
+class CoordinateFrame;
+typedef class CoordinateFrame CFrame;
+class Rect2D;
+typedef class Rect2D AABox2D;
+
+/**
+   2D oriented box
+   @cite http://www.flipcode.com/archives/2D_OBB_Intersection.shtml
+ */
+class Box2D {
+private:
+    /** Corners of the box, where 0 is the lower left. */
+    Vector2         m_corner[4];
+
+    /** Two edges of the box extended away from corner[0], with length
+        = 1 / extentSquared */
+    Vector2         m_axisin[2];
+
+    /** Two edges of the box extended away from corner[0], with unit length */
+    Vector2         m_axis[2];
+
+    /** Centroid of the box */
+    Vector2         m_center;
+
+    /** origin[a] = m_corner[0].dot(m_axisin[a]); */
+    float           origin[2];
+
+    /** Surface area */
+    float           m_area;
+
+    Vector2         m_extent;
+
+    /** Returns true if other overlaps one dimension of this. */
+    bool overlaps1Way(const Box2D& other) const;
+
+
+    /** Updates the axes after the m_corners move.  Assumes the
+        m_corners actually form a rectangle. */
+    void computeAxes();
+
+public:
+
+    /** 
+        @param center World-space center
+        @param w Width along object-space x-axis
+        @param h Height along object-space y-axis
+        @param angle Counter-clockwise angle from object-space x-axis in radians
+     */
+    Box2D(const Vector2& center = Vector2(0, 0), float w = 0, float h = 0, float angle = 0);
+
+    Box2D(const AABox2D& b);
+
+    Box2D(const Vector2& min, const Vector2& max);
+
+    /** Transform @a b by @a frame, discarding the Z components, and
+        compute the new box.*/
+    Box2D(const CFrame& frame, Box2D& b);
+    
+    inline bool contains(const Vector2& v) const {
+        // Take to object space:
+        const Vector2& p = v - m_center;
+        float x = p.dot(m_axisin[0]);
+        float y = p.dot(m_axisin[1]);
+
+        // Must be within extent/2 on both axes in object space
+        return (abs(x) <= 0.5f) && (abs(y) <= 0.5f);        
+    }
+
+    /** @brief Distance from corner(0) to the next corner along the box's local axis a. */
+    inline const Vector2& extent() const {
+        return m_extent;
+    }
+
+    /** @brief Unit length vector along axis @a a */
+    inline const Vector2& axis(int a) const {
+        debugAssert(a == 0 || a == 1);
+        return m_axis[a];
+    }
+
+    /** @brief Surface area */
+    inline float area() const {
+        return m_area;
+    }
+
+    inline const Vector2& corner(int i) const {
+        debugAssert(i >=0 && i <= 3);
+        return m_corner[i];
+    }
+
+    inline const Vector2& center() const {
+        return m_center;
+    }
+
+    /** Returns true if the intersection of the boxes is non-empty. */
+    inline bool overlaps(const Box2D& other) const {
+        return overlaps1Way(other) && other.overlaps1Way(*this);
+    }
+};
+
+} // G3D
+#endif
diff --git a/externals/g3dlite/G3D/BumpMapPreprocess.h b/externals/g3dlite/G3D/BumpMapPreprocess.h
new file mode 100644
index 00000000000..955f99e61b2
--- /dev/null
+++ b/externals/g3dlite/G3D/BumpMapPreprocess.h
@@ -0,0 +1,61 @@
+/**
+  \file BumpMapPreprocess.h
+
+  \maintainer Morgan McGuire, http://graphics.cs.williams.edu
+
+  \created 2010-01-28
+  \edited  2010-01-28
+
+  Copyright 2000-2010, Morgan McGuire.
+  All rights reserved.
+ */
+
+#ifndef G3D_BumpMapPreprocess_h
+#define G3D_BumpMapPreprocess_h
+
+#include "G3D/platform.h"
+
+namespace G3D {
+class Any;
+
+/** 
+Not in the BumpMap class to avoid a circular dependency between Texture and BumpMap.
+G3D::GImage::computeNormalMap().
+*/
+class BumpMapPreprocess {
+public:
+
+    /** If true, the elevations are box filtered after computing normals
+     and before uploading, which produces better results for parallax offset mapping
+     Defaults to false. */
+    bool            lowPassFilter;
+
+    /** Height of the maximum ("white") value, in pixels, for the purpose of computing normals.
+       A value of 255 means that a 255 x 255 bump image with a full black-to-white gradient
+         will produce a 45-degree ramp (this also results in "cubic" voxels).
+         A negative value means to set zExtentPixels to -zExtentPixels * max(width, height).
+         The default is -0.02.
+     */
+    float           zExtentPixels;
+
+    /** After computing normals, scale the height by |N.z|, a trick that reduces texture swim in steep areas for parallax offset 
+      mapping. Defaults to false.*/
+    bool            scaleZByNz;
+
+    BumpMapPreprocess() : lowPassFilter(false), zExtentPixels(-0.02f), scaleZByNz(false) {}
+
+    BumpMapPreprocess(const Any& any);
+
+    operator Any() const;
+
+    bool operator==(const BumpMapPreprocess& other) const {
+        return 
+            (lowPassFilter == other.lowPassFilter) &&
+            (zExtentPixels == other.zExtentPixels) &&
+            (scaleZByNz == other.scaleZByNz);
+    }
+};
+
+}
+
+#endif
diff --git a/externals/g3dlite/G3D/Capsule.h b/externals/g3dlite/G3D/Capsule.h
new file mode 100644
index 00000000000..baeea3aa82b
--- /dev/null
+++ b/externals/g3dlite/G3D/Capsule.h
@@ -0,0 +1,90 @@
+/**
+ @file Capsule.h
+  
+ @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+  
+ @created 2003-02-07
+ @edited  2005-08-20
+
+ Copyright 2000-2006, Morgan McGuire.
+ All rights reserved.
+ */
+
+#ifndef G3D_CAPSULE_H
+#define G3D_CAPSULE_H
+
+#include "G3D/platform.h"
+#include "G3D/g3dmath.h"
+#include "G3D/Vector3.h"
+
+namespace G3D {
+
+class Line;
+class AABox;
+/**
+ A shape formed by extruding a sphere along a line segment.
+ */
+class Capsule {
+private:
+	Vector3			p1;
+	Vector3			p2;
+
+	float			_radius;
+public:
+
+
+    /** Uninitialized */
+    Capsule();
+    Capsule(class BinaryInput& b);
+	Capsule(const Vector3& _p1, const Vector3& _p2, float _r);
+	void serialize(class BinaryOutput& b) const;
+	void deserialize(class BinaryInput& b);
+	
+	/** The line down the center of the capsule */
+	Line axis() const;
+
+	inline float radius() const {
+		return _radius;
+	}
+
+	/** Argument may be 0 or 1 */
+	inline Vector3 point(int i) const {
+		debugAssert(i == 0 || i == 1);
+		return (i == 0) ? p1 : p2;
+	}
+
+    /** Distance between the sphere centers.  The total extent of the cylinder is 
+        2r + h. */
+    inline float height() const {
+        return (p1 - p2).magnitude();
+    }
+
+    inline Vector3 center() const {
+        return (p1 + p2) / 2.0;
+    }
+
+    /** Get a reference frame in which the center of mass is the origin and Y is the axis of the capsule.*/
+    void getReferenceFrame(class CoordinateFrame& cframe) const;
+
+    /**
+     Returns true if the point is inside the capsule or on its surface.
+     */
+    bool contains(const Vector3& p) const;
+
+    float volume() const;
+
+    float area() const;
+
+    /** Get axis aligned bounding box */
+    void getBounds(AABox& out) const;
+
+    /** Random world space point with outward facing normal. */
+    void getRandomSurfacePoint(Vector3& P, Vector3& N) const;
+
+    /** Point selected uniformly at random over the volume. */
+    Vector3 randomInteriorPoint() const;
+};
+
+} // namespace
+
+#endif
diff --git a/externals/g3dlite/G3D/CollisionDetection.h b/externals/g3dlite/G3D/CollisionDetection.h
new file mode 100644
index 00000000000..c8fcf5534c2
--- /dev/null
+++ b/externals/g3dlite/G3D/CollisionDetection.h
@@ -0,0 +1,1205 @@
+/**
+  @file CollisionDetection.h
+
+
+  Moving collision detection for simple primitives.
+
+  @author Morgan McGuire, http://graphics.cs.williams.edu
+  @cite Spherical collision based on Paul Nettle's
+  ftp://ftp.3dmaileffects.com/pub/FluidStudios/CollisionDetection/Fluid_Studios_Generic_Collision_Detection_for_Games_Using_Ellipsoids.pdf
+  and comments by Max McGuire.  Ray-sphere intersection by Eric Haines.
+  Box-Box intersection written by Kevin Egan.
+  Thanks to Max McGuire of Iron Lore for various bug fixes.
+  Box-Triangle by Tomas Akenine-Moller
+
+  @created 2001-11-19
+  @edited  2008-12-19
+
+  Copyright 2000-2009, Morgan McGuire.
+  All rights reserved.
+ */
+
+#ifndef G3D_COLLISIONDETECTION_H
+#define G3D_COLLISIONDETECTION_H
+
+#include "G3D/platform.h"
+#include "G3D/Vector3.h"
+#include "G3D/Plane.h"
+#include "G3D/Box.h"
+#include "G3D/Triangle.h"
+#include "G3D/Array.h"
+#include "G3D/Ray.h"
+#include "G3D/Line.h"
+
+namespace G3D {
+
+
+/**
+  Collision detection primitives and tools for building
+  higher order collision detection schemes.
+
+  These routines provide moving and static collision detection.
+  Moving collision detection allows the calculation of collisions that
+  occur during a period of time -- as opposed to the intersection of 
+  two static bodies.
+  
+  Moving collision detection routines detect collisions between
+  only static primitives and moving spheres or points.  Since the 
+  reference frame can be user defined, these functions can be used to
+  detect the collision between two moving bodies by subtracting
+  the velocity vector of one object from the velocity vector of the 
+  sphere or point the detection is to occur with.  This unified 
+  velocity vector will act as if both objects are moving simultaneously.
+
+  Collisions are detected for single-sided objects only.  That is,
+  no collision is detected when leaving a primitive or passing
+  through a plane or triangle opposite the normal... except for the 
+  point-sphere calculation or when otherwise noted.
+
+  For a sphere, the collision location returned is the point in world
+  space where the surface of the sphere and the fixed object meet.
+  It is not the position of the center of the sphere at
+  the time of the collision.
+
+  The collision normal returned is the surface normal to the fixed
+  object at the collision location.
+
+  

+  Static Collision Detection: (Neither object is moving)
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
Vector3LineSegmentRay *LinePlaneTriangleSphereCylinderCapsuleAABoxBox
Vector3\link Vector3::operator== V3::==\endlink \link Vector3::fuzzyEq V3::fuzzy \endlink \link G3D::distance distance \endlink
LineSegment\link LineSegment::closestPoint LS::closestPoint\endlink \link LineSegment::distance LS::distance\endlink \link CollisionDetection::closestPointOnLineSegment CD\endlink
Ray *Ray::closestPoint Ray::distance
LineLine::closestPoint Line::distance\link CollisionDetection::closestPointsBetweenLineAndLine CD\endlink
Plane
Triangle
SphereSphere::contains\link CollisionDetection::collisionTimeForMovingPointFixedSphere CD \endlink, \link Ray::intersectionTime R::time\endlink
CylinderCylinder::contains
CapsuleCapsule::contains
AABoxAABox::contains\link CollisionDetection::fixedSolidBoxIntersectsFixedTriangle CD\endlink
BoxBox::contains(treat as Ray)\link CollisionDetection::collisionTimeForMovingPointFixedBox CD\endlink(treat as Ray)\link CollisionDetection::penetrationDepthForFixedBoxFixedPlane CD \endlink\link CollisionDetection::penetrationDepthForFixedBoxFixedPlane CD\endlink\link CollisionDetection::penetrationDepthForFixedSphereFixedBox CD\endlinkNone (use OPCODE)\link CollisionDetection::movingSpherePassesThroughFixedBox CD \endlink\link CollisionDetection::penetrationDepthForFixedBoxFixedBox CD\endlink\link CollisionDetection::penetrationDepthForFixedBoxFixedBox CD\endlink

+
+  

+  Moving Collision Detection:
+
+  * Note: Moving collision detection against certain primitives is equivalent to static collision
+   detection against a bigger primitive.  Ray, Line Segment == ``moving Point''; Capsule ==``moving Sphere''; Plane == ``moving Line''
+
+   @deprecated Routines moving to the G3D::Intersect class in G3D 8.0
+ */
+class CollisionDetection {
+private:
+
+	/**
+	 Default parameter if value passed to a function as reference is
+	 not to be calculated.  Must be explicitly supported by function.
+	 */
+	static Vector3 ignore;
+
+	/**
+	 Default parameter if value passed to a function as reference is
+	 not to be calculated.  Must be explicitly supported by function.
+	 */
+    static bool    ignoreBool;
+
+	/**
+	 Default parameter if value passed to a function as reference is
+	 not to be calculated.  Must be explicitly supported by function.
+	 */
+    static Array ignoreArray;
+
+
+    // Static class!
+    CollisionDetection() {}
+    virtual ~CollisionDetection() {}
+
+public:
+
+    /**
+      Converts an index [0, 15] to the corresponding separating axis.
+      Does not return normalized vector in the edge-edge case
+      (indices 6 through 15).
+
+	  @param separatingAxisIndex	Separating axis.
+	  @param box1					Box 1.
+	  @param box2					Box 2.
+
+ 	  @return Axis that separates the two boxes.
+  	 */
+    static Vector3 separatingAxisForSolidBoxSolidBox(
+            const int       separatingAxisIndex,
+            const Box &     box1,
+            const Box &     box2);
+
+    /**
+	  Tests whether two boxes have axes that are parallel to
+	  each other.  If they are, axis1 and axis2 are set to be
+	  the parallel axes for both box1 and box2 respectively.
+
+	  @param ca			Dot products of each of the boxes axes
+	  @param epsilon	Fudge factor (small unit by which the dot
+	  					products may vary and still be considered
+	  					zero).
+	  @param axis1		Parallel Axis 1. [Post Condition]
+	  @param axis2		Parallel Axis 2. [Post Condition]
+
+	  @return true  - If boxes have a parallel axis
+	  @return false - otherwise.
+ 	 */
+    static bool parallelAxisForSolidBoxSolidBox(
+            const double*   ca,
+            const double    epsilon,
+            int &           axis1,
+            int &           axis2);
+
+    /**
+      Calculates the projected distance between the two boxes along
+      the specified separating axis, negative distances correspond
+      to an overlap along that separating axis.  The distance is not
+      divided by denominator dot(L, L), see
+      penetrationDepthForFixedSphereFixedBox() for more details
+
+      @param separatingAxisIndex
+	  @param a Box 1's bounding sphere vector
+	  @param b Box 2's bounding sphere vector
+	  @param D Vector between Box 1 and Box 2's center points
+	  @param c Pointer to array of dot products of the axes of Box 1
+	           and Box 2.
+	  @param ca Pointer to array of unsigned dot products of the axes
+	            of Box 1 and Box 2.
+	  @param ad Pointer to array of dot products of Box 1 axes and D.
+	  @param bd Pointer to array of dot products of Box 2 axes and D.
+
+      @return Projected distance between the two boxes along the
+      specified separating axis.
+     */
+    static float projectedDistanceForSolidBoxSolidBox(
+            const int           separatingAxisIndex,
+            const Vector3 &     a,
+            const Vector3 &     b,
+            const Vector3 &     D,
+            const double*       c,
+            const double*       ca,
+            const double*       ad,
+            const double*       bd);
+
+
+	/**
+	  Creates a set of standard information about two boxes in order to
+	  solve for their collision.  This information includes a vector to
+	  the radius of the bounding sphere for each box, the vector between
+	  each boxes' center and a series of dot products between differing
+	  important vectors.  These dot products include those between the axes
+	  of both boxes (signed and unsigned values), and the dot products
+	  between all the axes of box1 and the boxes' center vector and box2
+	  and the boxes' center vector.
+
+	  @pre The following space requirements must be met:
+      		- c[]  9 elements
+      		- ca[] 9 elements
+      		- ad[] 3 elements
+      		- bd[] 3 elements
+
+	  @cite dobted from David Eberly's papers, variables used in this function
+      correspond to variables used in pages 6 and 7 in the pdf
+      http://www.magic-software.com/Intersection.html
+      http://www.magic-software.com/Documentation/DynamicCollisionDetection.pdf
+
+      @note Links are out-dated. (Kept to preserve origin and authorship)
+
+	  @param box1 Box 1
+	  @param box2 Box 2
+	  @param a Box 1's bounding sphere vector
+	  @param b Box 2's bounding sphere vector
+	  @param D Vector between Box 1 and Box 2's center points
+	  @param c Pointer to array of dot products of the axes of Box 1
+	           and Box 2.
+	  @param ca Pointer to array of unsigned dot products of the axes
+	            of Box 1 and Box 2.
+	  @param ad Pointer to array of dot products of Box 1 axes and D.
+	  @param bd Pointer to array of dot products of Box 2 axes and D.
+	 */
+    static void fillSolidBoxSolidBoxInfo(
+            const Box &     box1,
+            const Box &     box2,
+            Vector3 &       a,
+            Vector3 &       b,
+            Vector3 &       D,
+            double*         c,
+            double*         ca,
+            double*         ad,
+            double*         bd);
+
+	/**
+	  Performs a simple bounding sphere check between two boxes to determine
+	  whether these boxes could possibly intersect.  This is a very
+	  cheap operation (three dot products, two sqrts and a few others).  If
+	  it returns true, an intersection is possible, but not necessarily
+	  guaranteed.
+
+	  @param a Vector from box A's center to an outer vertex
+	  @param b Vector from box B's center to an outer vertex
+	  @param D Distance between the centers of the two boxes
+
+	  @return true - if possible intersection
+	  @return false - otherwise (This does not guarantee an intersection)
+	 */
+    static bool conservativeBoxBoxTest(
+            const Vector3 &     a,
+            const Vector3 &     b,
+            const Vector3 &     D);
+
+	/**
+ 	  Determines whether two fixed solid boxes intersect.
+
+      @note To speed up collision detection, the lastSeparatingAxis from
+      the previous time step can be passed in and that plane can be
+      checked first.  If the separating axis was not saved, or if the
+      two boxes intersected then lastSeparatingAxis should equal -1.
+
+	  @cite Adobted from David Eberly's papers, variables used in this function
+      correspond to variables used in pages 6 and 7 in the pdf
+      http://www.magic-software.com/Intersection.html
+      http://www.magic-software.com/Documentation/DynamicCollisionDetection.pdf
+
+ 	  @param box1				Box 1.
+ 	  @param box2				Box 2.
+ 	  @param lastSeparatingAxis	Last separating axis.
+ 	  							(optimization - see note)
+
+	  @return true  - Intersection.
+	  @return false - otherwise.
+	 */
+    static bool fixedSolidBoxIntersectsFixedSolidBox(
+        const Box&      box1,
+        const Box&      box2,
+        const int       lastSeparatingAxis = -1);
+
+    /**
+	  Calculates the closest points on two lines with each other.   If the
+	  lines are parallel then using the starting point, else calculate the
+	  closest point on each line to the other.
+
+	  @note This is very similiar to calculating the intersection of two lines.
+	  Logically then, the two points calculated would be identical if calculated
+	  with inifinite precision, but with the finite precision of floating point
+	  calculations, these values could (will) differ as the line slope approaches
+	  zero or inifinity.
+
+	  @cite variables and algorithm based on derivation at the following website:
+      	    http://softsurfer.com/Archive/algorithm_0106/algorithm_0106.htm
+
+	  @param line1		Line 1.
+	  @param line2		Line 2.
+	  @param closest1	Closest point on line 1.
+	  @param closest2	Closest point on line 2.
+ 	*/
+    static void closestPointsBetweenLineAndLine(
+            const Line &    line1,
+            const Line &    line2,
+            Vector3 &       closest1,
+            Vector3 &       closest2);
+
+    /**
+	  Calculates the depth of penetration between two fixed boxes.
+      Contact normal faces away from box1 and into box2.  If there is
+      contact, only one contact point is returned.  The minimally
+      violated separating plane is computed
+         - if the separating axis corresponds to a face
+              the contact point is half way between the deepest vertex
+              and the face
+         - if the separating axis corresponds to two edges
+              the contact point is the midpoint of the smallest line
+              segment between the two edge lines
+
+	  @note This is very similiar to calculating the intersection of two lines.
+	  Logically then, the two points calculated would be identical if calculated
+	  with inifinite precision, but with the finite precision of floating point
+	  calculations, these values could (will) differ as the line slope approaches
+	  zero or inifinity.
+
+	  @cite adobted from David Eberly's papers, variables used in this function
+      correspond to variables used in pages 6 and 7 in the pdf
+      http://www.magic-software.com/Intersection.html
+      http://www.magic-software.com/Documentation/DynamicCollisionDetection.pdf
+
+	  @param box1				Box 1
+	  @param box2				Box 2
+	  @param contactPoints		Contact point between boxes. [Post Condition]
+	  @param contactNormals		Surface normal at contact point. [Post Condition]
+	  @param lastSeparatingAxis	Last separating axis. (Used for optimization)
+
+	  @return Depth of penetration between the two boxes.  If there is no
+ 	   intersection between the boxes, then a negative value is returned.
+ 	*/
+    static float penetrationDepthForFixedBoxFixedBox(
+        const Box&          box1,
+        const Box&          box2,
+        Array&     contactPoints,
+        Array&     contactNormals,
+        const int           lastSeparatingAxis = -1);
+
+    /**
+	  Calculates the depth of penetration between two fixed spheres as well
+	  as the deepest point of Sphere A that penetrates Sphere B. The normal
+      returned points away from the object A, although it may
+      represent a perpendicular to either the faces of object B or object A
+      depending on their relative orientations.
+
+	  @param sphereA		Fixed Sphere A.
+	  @param sphereB		Fixed Sphere B.
+	  @param contactPoints	Sphere A's deepest point that penetrates Sphere B.
+	 						[Post Condition]
+	  @param contactNormals	Normal at penetration point. [Post Condition]
+
+	  @return Depth of penetration.  If there is no intersection between the
+	 		 objects then the depth will be a negative value.
+	 */
+    static float penetrationDepthForFixedSphereFixedSphere(
+        const class Sphere& sphereA,
+        const Sphere&       sphereB,
+        Array&     contactPoints,
+        Array&     contactNormals = ignoreArray);
+
+    /**
+	  Calculates the depth of penetration between a fixed sphere and a fixed
+	  box as well as the deepest point of the sphere that penetrates the box
+	  and the normal at that intersection.
+
+	  @note There are three possible intersections between a sphere and box.
+	  - Sphere completely contained in the box
+	  - Sphere intersects one edge
+	  - Sphere intersects one vertex
+
+	  The contact point and contact normal vary for each of these situations.
+	  - Sphere contained in Box:
+	 	- Normal is based on side of least penetration (as is the depth calculation).
+	 	- Point is based on center of sphere
+	  - Sphere intersects one edge
+	 	- Normal is based on vector from the box center to the point of depth.
+	 	- Point is closest point to the sphere on the line
+	  - Sphere intersects one vertex
+	 	- Normal is based on vector from the box center to the vertex of penetration.
+	 	- Point is vertex of penetration.
+
+      @cite Adapted from Jim Arvo's method in Graphics Gems
+      See also http://www.win.tue.nl/~gino/solid/gdc2001depth.pdf
+
+	  @param sphere			Fixed Sphere.
+	  @param box			Fixed Box.
+	  @param contactPoints	Sphere point that penetrates the box. [Post Condition]
+	  @param contactNormals	Normal at the penetration point. [Post Condition]
+
+	  @return Depth of penetration.  If there is no intersection between the
+	 		  objects then the depth will be a negative value.
+ 	 */
+    static float penetrationDepthForFixedSphereFixedBox(
+        const Sphere&       sphere,
+        const Box&          box,
+        Array&     contactPoints,
+        Array&     contactNormals = ignoreArray);
+
+	/**
+	  Calculates the depth of penetration between a Fixed Sphere and a Fixed
+	  Plane as well as the deepest point of the sphere that penetrates the plane
+	  and the plane normal at that intersection.
+
+	  @param sphereA        Fixed Sphere.
+	  @param planeB         Fixed Plane.
+	  @param contactPoints  Sphere point that penetrates the plane.
+	 						[Post Condition]
+	  @param contactNormals Normal at penetration point. [Post Condition]
+
+ 	  @return Depth of penetration.  If there is no intersection between the
+	  		 objects then the depth will be a negative value.
+ 	 */
+    static float penetrationDepthForFixedSphereFixedPlane(
+        const Sphere&       sphereA,
+        const class Plane&  planeB,
+        Array&     contactPoints,
+        Array&     contactNormals = ignoreArray);
+
+	/**
+	  Calculates the depth of penetration between a fixed box and a fixed
+	  plane as well as the vertexes of the box that penetrate the plane
+	  and the plane normals at those intersections.
+
+	  @param box			Fixed Box.
+	  @param plane			Fixed Plane.
+	  @param contactPoints	Box points that penetrate the plane.
+	 						[Post Condition]
+	  @param contactNormals	Normals at penetration points [Post Condition]
+
+	  @return Depth of penetration.  If there is no intersection between the
+	 		 objects then the depth will be a negative value.
+ 	*/
+    static float penetrationDepthForFixedBoxFixedPlane(
+        const Box&          box,
+        const Plane&        plane,
+        Array&     contactPoints,
+        Array&     contactNormals = ignoreArray);
+
+	/**
+ 	  Calculates time between the intersection of a moving point and a fixed
+ 	  plane.
+
+ 	  @note This is only a one sided collision test.   The side defined by
+ 	  the plane's surface normal is the only one tested.  For a two sided
+ 	  collision, call the function once for each side's surface normal.
+
+ 	  @param point		Moving point.
+ 	  @param velocity	Point's velocity.
+ 	  @param plane		Fixed plane.
+ 	  @param location	Location of collision. [Post Condition]
+ 	  					(Infinite vector on no collision)
+ 	  @param outNormal	Plane's surface normal. [Post Condition]
+
+ 	  @return Time til collision.  If there is no collision then the return
+ 	          value will be inf().
+ 	*/
+    static float collisionTimeForMovingPointFixedPlane(
+        const Vector3&			point,
+        const Vector3&			velocity,
+        const class Plane&		plane,
+        Vector3&				outLocation,
+        Vector3&                outNormal = ignore);
+
+	/**
+ 	  Calculates time between the intersection of a moving point and a fixed
+ 	  triangle.
+
+ 	  @note This is only a one sided collision test.   The side defined by
+ 	  the triangle's surface normal is the only one tested.  For a two sided
+ 	  collision, call the function once for each side's surface normal.
+
+ 	  @param orig		Moving point.
+ 	  @param dir		Point's velocity.
+	  @param v0 		Triangle vertex 1.
+	  @param v1 		Triangle vertex 2.
+	  @param v2 		Triangle vertex 3
+
+ 	  @return Time til collision.  If there is no collision then the return
+ 	          value will be inf().
+ 	*/
+    inline static float collisionTimeForMovingPointFixedTriangle(
+        const Vector3& orig,
+        const Vector3& dir,
+        const Vector3& v0,
+        const Vector3& v1,
+        const Vector3& v2) {
+        return Ray::fromOriginAndDirection(orig, dir).intersectionTime(v0, v1, v2);
+    }
+
+	/**
+ 	  Calculates time between the intersection of a moving point and a fixed
+ 	  triangle.
+
+ 	  @note This is only a one sided collision test.   The side defined by
+ 	  the triangle's surface normal is the only one tested.  For a two sided
+ 	  collision, call the function once for each side's surface normal.
+
+ 	  @param orig		Moving point.
+ 	  @param dir		Point's velocity.
+	  @param v0 		Triangle vertex 1.
+	  @param v1 		Triangle vertex 2.
+	  @param v2 		Triangle vertex 3
+ 	  @param location	Location of collision. [Post Condition]
+ 	  					(Infinite vector on no collision)
+
+ 	  @return Time til collision.  If there is no collision then the return
+ 	          value will be inf().
+ 	*/
+    inline static float collisionTimeForMovingPointFixedTriangle(
+        const Vector3& orig,
+        const Vector3& dir,
+        const Vector3& v0,
+        const Vector3& v1,
+        const Vector3& v2,
+        Vector3&       location) {
+        float t = collisionTimeForMovingPointFixedTriangle(orig, dir, v0, v1, v2);
+        if (t < finf()) {
+            location = orig + dir * t;
+        }
+        return t;
+    }
+
+	/**
+ 	  Calculates time between the intersection of a moving point and a fixed
+ 	  triangle.
+
+ 	  @note This is only a one sided collision test.   The side defined by
+ 	  the triangle's surface normal is the only one tested.  For a two sided
+ 	  collision, call the function once for each side's surface normal.
+
+ 	  @param orig		Moving point.
+ 	  @param dir		Point's velocity.
+ 	  @param tri		Fixed triangle.
+ 	  @param location	Location of collision. [Post Condition]
+ 	  					(Infinite vector on no collision)
+ 	  @param normal		Triangle's surface normal. [Post Condition]
+
+ 	  @return Time til collision.  If there is no collision then the return
+ 	          value will be inf().
+ 	*/
+    inline static float collisionTimeForMovingPointFixedTriangle(
+        const Vector3&  orig,
+        const Vector3&  dir,
+        const Triangle& tri,
+        Vector3&        location = ignore,
+        Vector3&        normal   = ignore) {
+
+        float t = collisionTimeForMovingPointFixedTriangle(
+            orig, dir, tri.vertex(0), tri.vertex(1), tri.vertex(2));
+        
+        if ((t < finf()) && (&location != &ignore)) {
+            location = orig + dir * t;
+            normal   = tri.normal();
+        }
+        return t;
+    }
+
+	/**
+ 	  Calculates time between the intersection of a moving point and a fixed
+ 	  triangle.
+
+ 	  @note This is only a one sided collision test.   The side defined by
+ 	  the triangle's surface normal is the only one tested.  For a two sided
+ 	  collision, call the function once for each side's surface normal.
+
+ 	  @param orig		Moving point.
+ 	  @param dir		Point's velocity.
+	  @param v0 		Triangle vertex 1.
+	  @param v1 		Triangle vertex 2.
+	  @param v2 		Triangle vertex 3
+ 	  @param location	Location of collision. [Post Condition]
+ 	  					(Infinite vector on no collision)
+ 	  @param normal		Triangle's surface normal. [Post Condition]
+
+ 	  @return Time til collision.  If there is no collision then the return
+ 	          value will be inf().
+ 	*/
+    inline static float collisionTimeForMovingPointFixedTriangle(
+        const Vector3& orig,
+        const Vector3& dir,
+        const Vector3& v0,
+        const Vector3& v1,
+        const Vector3& v2,
+        Vector3&       location,
+        Vector3&       normal) {
+        float t = collisionTimeForMovingPointFixedTriangle(orig, dir, v0, v1, v2);
+        if (t < finf()) {
+            location = orig + dir * t;
+            normal   = (v1 - v0).cross(v2 - v0).direction();
+        }
+        return t;
+    }
+
+    /**
+     If the ray origin is inside the box, returns inf() but inside
+     is set to true.
+     Beta API
+
+     @cite Andrew Woo, from "Graphics Gems", Academic Press, 1990
+  	 @cite Optimized code by Pierre Terdiman, 2000 (~20-30% faster on Celeron 500)
+     @cite Epsilon value added by Klaus Hartmann
+     @cite http://www.codercorner.com/RayAABB.cpp
+     */
+    static float collisionTimeForMovingPointFixedAABox(
+        const Vector3&			point,
+        const Vector3&			velocity,
+        const class AABox&      box,
+        Vector3&				outLocation,
+        bool&                   inside = ignoreBool,
+        Vector3&                outNormal = ignore);
+
+    /**
+	 Calculates time between the intersection of a moving point and a fixed
+	 Axis-Aligned Box (AABox).
+
+	 @note Avoids the sqrt from collisionTimeForMovingPointFixedAABox.
+
+	 @param point		Moving point.
+	 @param velocity	Sphere's velocity.
+	 @param box			Fixed AAbox.
+	 @param location	Location of collision. [Post Condition]
+	 @param Inside		Does the ray originate inside the box? [Post Condition]
+	 @param normal		Box's surface normal to collision [Post Condition]
+
+	 @return Time til collision.  If there is no collision then the return
+	         value will be inf().
+ 	*/
+    static bool collisionLocationForMovingPointFixedAABox(
+        const Vector3&			point,
+        const Vector3&			velocity,
+        const class AABox&      box,
+        Vector3&				outLocation,
+        bool&                   inside = ignoreBool,
+        Vector3&                normal = ignore);
+
+
+    /**
+     @brief Calculates intersection of a ray and a static
+     Axis-Aligned Box (AABox).
+
+     @note Avoids the sqrt from collisionTimeForMovingPointFixedAABox; 
+      early-out branches and operations optimized for Intel Core2 architecture.
+     
+     @param invDir      1/dir
+     @param location	Location of collision. [Post Condition]
+     @param inside		Does the ray originate inside the box? [Post Condition]
+
+     @return True if the ray hits the box
+    */
+    static bool __fastcall rayAABox(
+        const Ray&              ray,
+        const Vector3&          invDir,
+        const AABox&            box,
+        const Vector3&          boxCenter,
+        float                   boundingRadiusSquared,
+        Vector3&                location,
+        bool&                   inside);
+
+    /**
+	 Calculates time between the intersection of a moving point and a fixed
+	 sphere.
+
+	 @note When ray is starts inside the rectangle, the exiting intersection
+	 is detected.
+
+	 @param point		Moving point.
+	 @param velocity	Point's velocity.
+	 @param sphere		Fixed Sphere.
+	 @param outLocation	Location of collision. [Post Condition]
+	 @param outNormal	Sphere's surface normal to collision [Post Condition]
+     \param solid If true, rays inside the sphere immediately intersect (good for collision detection).  If false, they hit the opposite side of the sphere (good for ray tracing).
+
+	 @return Time until collision.  If there is no collision then the return
+	         value will be inf().
+ 	*/
+    static float collisionTimeForMovingPointFixedSphere(
+        const Vector3&			point,
+        const Vector3&			velocity,
+        const class Sphere&		sphere,
+        Vector3&				outLocation,
+        Vector3&                outNormal = ignore,
+        bool                    solid = false);
+
+    /**
+	 Calculates time between the intersection of a moving point and a fixed
+	 box.
+
+	 @note If the point is already inside the box, no collision: inf is returned.
+
+	 @param point		Moving point.
+	 @param velocity	Sphere's velocity.
+	 @param box			Fixed box.
+	 @param location	Position of collision. [Post Condition]
+	 @param outNormal	Box's surface normal to collision [Post Condition]
+
+	 @return Time til collision.  If there is no collision then the return
+	         value will be inf().
+ 	*/
+    static float collisionTimeForMovingPointFixedBox(
+        const Vector3&			point,
+        const Vector3&			velocity,
+        const class  Box&		box,
+        Vector3&				outLocation,
+        Vector3&                outNormal = ignore);
+
+	/**
+	 Calculates time between the intersection of a moving point and a fixed
+	 rectangle defined by the points v0, v1, v2, & v3.
+
+	 @note This is only a one sided collision test.   The side defined by
+	 the rectangle's surface normal is the only one tested.  For a two sided
+	 collision, call the function once for each side's surface normal.
+
+	 @param point		Moving point.
+	 @param velocity	Sphere's velocity.
+	 @param v0 			Rectangle vertex 1.
+	 @param v1 			Rectangle vertex 2.
+	 @param v2 			Rectangle vertex 3
+	 @param v3 			Rectangle vertex 4.
+	 @param location	Location of collision [Post Condition]
+	 @param outNormal	Rectangle's surface normal. [Post Condition]
+
+	 @return Time til collision.  If there is no collision then the return
+	         value will be inf().
+ 	*/
+    static float collisionTimeForMovingPointFixedRectangle(
+        const Vector3&			point,
+        const Vector3&			velocity,
+        const Vector3&			v0,
+        const Vector3&			v1,
+        const Vector3&			v2,
+        const Vector3&			v3,
+        Vector3&				outLocation,
+        Vector3&                outNormal = ignore);
+
+	/**
+	 Calculates time between the intersection of a moving point and a fixed
+	 capsule.
+
+	 @param point		Moving point.
+	 @param velocity	Point's velocity.
+	 @param capsule		Fixed capsule.
+	 @param outLocation	Location of collision. [Post Condition]
+	 @param outNormal	Capsule's surface normal to collision [Post Condition]
+
+	 @return Time til collision.  If there is no collision then the return
+	         value will be inf().
+ 	*/
+	static float collisionTimeForMovingPointFixedCapsule(
+		const Vector3&		    point,
+		const Vector3&		    velocity,
+		const class Capsule&	capsule,
+        Vector3&				outLocation,
+        Vector3&                outNormal = ignore);
+
+	/**
+	 Calculates time between the intersection of a moving sphere and a fixed
+	 triangle.
+
+	 @param sphere		Moving sphere.
+	 @param velocity	Sphere's velocity.
+	 @param plane		Fixed Plane.
+	 @param outLocation	Location of collision -- not center position of sphere
+	 					at the collision time. [Post Condition]
+	 @param outNormal	Box's surface normal to collision [Post Condition]
+
+	 @return Time til collision.  If there is no collision then the return
+	         value will be inf().
+	 */
+    static float collisionTimeForMovingSphereFixedPlane(
+        const class Sphere&		sphere,
+        const Vector3&	    	velocity,
+        const class Plane&		plane,
+        Vector3&				outLocation,
+        Vector3&                outNormal = ignore);
+
+	/**
+	 Calculates time between the intersection of a moving sphere and a fixed
+	 triangle.
+
+	 @param sphere		Moving sphere.
+	 @param velocity	Sphere's velocity.
+	 @param triangle	Fixed Triangle.  (collisions can happen on the back side of the triangle)
+	 @param outLocation	Location of collision, if collision occurs -- not center position of sphere
+	 					at the collision time. If there is interpenetration at the start, this point may be inside
+                        the sphere.
+     @param b           Barycentric coordinates. These are not valid unless collision occurs.
+
+	 @return Time til collision.  If there is no collision then the return
+	         value will be inf().
+	*/
+    static float collisionTimeForMovingSphereFixedTriangle(
+        const class Sphere&		sphere,
+        const Vector3&		    velocity,
+        const Triangle&         triangle,
+        Vector3&				outLocation,
+        float                   b[3] = (float*)&ignore);
+
+	/**
+	 Calculates time between the intersection of a moving sphere and a fixed
+	 rectangle defined by the points v0, v1, v2, & v3.
+
+	 @param sphere		Moving sphere.
+	 @param velocity	Sphere's velocity.
+	 @param v0 			Rectangle vertex 1.
+	 @param v1 			Rectangle vertex 2.
+	 @param v2 			Rectangle vertex 3
+	 @param v3 			Rectangle vertex 4.
+	 @param outLocation	Location of collision -- not center position of sphere
+	 					at the collision time. [Post Condition]
+	 @param outNormal	Box's surface normal to collision [Post Condition]
+
+	 @return Time til collision.  If there is no collision then the return
+	         value will be inf().
+ 	*/
+    static float collisionTimeForMovingSphereFixedRectangle(
+        const class Sphere&		sphere,
+        const Vector3&	    	velocity,
+        const Vector3&	    	v0,
+        const Vector3&	    	v1,
+        const Vector3&	    	v2,
+        const Vector3&	    	v3,
+        Vector3&				outLocation,
+        Vector3&                outNormal = ignore);
+
+	/**
+	 Calculates time between the intersection of a moving sphere and a fixed
+	 box.
+
+	 @note This function will not detect an intersection between a moving object
+	 that is already interpenetrating the fixed object.
+
+	 @param sphere		Moving sphere.
+	 @param velocity	Sphere's velocity.
+	 @param box			Fixed box.
+	 @param location	Location of collision -- not center position of sphere
+	 					at the collision time. [Post Condition]
+	 @param outNormal	Box's surface normal to collision [Post Condition]
+
+	 @return Time til collision.  If there is no collision then the return
+	         value will be inf().
+ 	*/
+    static float collisionTimeForMovingSphereFixedBox(
+        const class Sphere&		sphere,
+        const Vector3&		    velocity,
+        const class Box&		box,
+        Vector3&				outLocation,
+        Vector3&                outNormal = ignore);
+
+    /** Calculates time between the intersection of a moving sphere
+        and a fixed sphere. 
+
+        If they are already interpenetrating, returns 0 and @a
+        location is the closest point on the surface of the fixed sphere
+        to the center of the moving sphere.
+        
+        @param sphere	        Moving sphere.
+        @param velocity         Sphere's velocity.
+        @param fixedSphere	    Fixed Sphere.
+        @param outLocation	    Location of collision -- not center position of sphere
+        at the collision time. [Post Condition]
+        @param outNormal	    Moving sphere's surface normal to collision [Post Condition]
+        
+        @return Time until collision.  If there is no collision then the return
+        value will be inf().
+    */
+    static float collisionTimeForMovingSphereFixedSphere(
+        const Sphere&	    sphere,
+        const Vector3&		velocity,
+        const Sphere&	    fixedSphere,
+        Vector3&	        outLocation,
+        Vector3&            outNormal = ignore);
+
+    /**
+	 Calculates time between the intersection of a moving sphere and a fixed
+	 capsule.
+
+	 @note This won't detect a collision if the sphere is already
+	       interpenetrating the capsule.
+
+	 @param sphere		Moving sphere.
+	 @param velocity	Sphere's velocity.
+	 @param capsule		Fixed capsule.
+	 @param location	Location of collision -- not center position of sphere
+	 					at the collision time. [Post Condition]
+	 @param outNormal	Capsule's surface normal to the collision [Post Condition]
+
+	 @return Time til collision.  If there is no collision then the return
+	         value will be inf().
+ 	*/
+	static float collisionTimeForMovingSphereFixedCapsule(
+		const class Sphere&		sphere,
+		const Vector3&		    velocity,
+		const class Capsule&	capsule,
+        Vector3&				outLocation,
+        Vector3&                outNormal = ignore);
+
+    /**
+	 Finds the direction of bounce that a sphere would have when it 
+	 intersects an object with the  given time of collision, the 
+	 collision location and the collision normal.
+
+	 @note This function works like a pong style ball bounce.
+
+	 @param sphere				Moving sphere.
+	 @param velocity			Sphere's velocity.
+	 @param collisionTime		Time of collision.
+	 @param collisionLocation	Collision location.
+	 @param collisionNormal		Surface collision normal.
+
+	 @return Direction of bounce.
+ 	*/
+    static Vector3 bounceDirection(
+        const class Sphere&		sphere,
+        const Vector3&			velocity,
+        const float				collisionTime,
+        const Vector3&			collisionLocation,
+        const Vector3&          collisionNormal);
+
+    /**
+	 Finds the direction of slide given a moving sphere, its velocity, the
+	 time of collision and the collision location.  This function works as
+	 if the sphere intersects the surface and continues to hug it.
+
+	 @note The result will work well for calculating the movement of a player
+	 who collides with an object and continues moving along the object instead
+	 of just bouncing off it.
+
+	 @param sphere				Moving sphere.
+	 @param velocity			Sphere's velocity.
+	 @param collisionTime		Time of collision
+	 @param collisionLocation	Collision location.
+
+	 @return Direction of slide.
+ 	*/
+    static Vector3 slideDirection(
+        const class Sphere&		sphere,
+        const Vector3&			velocity,
+        const float				collisionTime,
+        const Vector3&			collisionLocation);
+
+	/**
+	 Finds the closest point on a line segment to a given point.
+
+	 @param v0 line vertex 1.
+	 @param v1 line vertex 2.
+	 @param point External point.
+
+	 @return Closests point to point on the line segment.
+ 	*/
+	static Vector3 closestPointOnLineSegment(
+        const Vector3&			v0,
+        const Vector3&			v1,
+        const Vector3&			point);
+
+    /**
+	 Finds the closest point on a line segment to a given point.
+
+	 @note This is an optimization to closestPointOnLineSegment.  Edge length
+	 and direction can be used in this function if already pre-calculated.  This
+	 prevents doing the same work twice.
+
+	 @param v0 line vertex 0.
+	 @param v1 line vertex 1.
+     @param edgeDirection The direction of the segment (unit length).
+     @param edgeLength The length of the segment.
+     @param point External point.
+
+	 @return Closests point to point on the line segment.
+ 	*/
+    static Vector3 closestPointOnLineSegment(
+        const Vector3&			v0,
+        const Vector3&			v1,
+        const Vector3&          edgeDirection,
+        float                   edgeLength,
+        const Vector3&			point);
+
+    /**
+	 Finds the closest point on the perimeter of the triangle to an external point;
+	 given a triangle defined by three points v0, v1, & v2, and the external point.
+
+	 @param v0 Triangle vertex 0.
+	 @param v1 Triangle vertex 1.
+	 @param v2 Triangle vertex 2.
+	 @param point External point.
+
+	 @return Closests point to point on the perimeter of the
+	 triangle.
+ 	*/
+    static Vector3 closestPointOnTrianglePerimeter(
+        const Vector3&			v0,
+        const Vector3&			v1,
+        const Vector3&			v2,
+        const Vector3&			point);
+
+	/**
+	 Finds the closest point on the perimeter of the triangle to an external point;
+	 given a triangle defined by the array of points v, its edge directions and
+	 their lengths, as well as the external point.
+
+	 @note This is an optimization to closestPointToTrianglePerimeter.  Edge length
+	 and direction can be used in this function if already pre-calculated.  This
+	 prevents doing the same work twice.
+
+	 @param v           Triangle vertices.
+	 @param point       External point.
+     @param edgeIndex   The point lies on the edge between v[edgeIndex] and v[(edgeIndex + 1) % 3]
+
+	 @return Closest point to point on the perimeter of the
+	 triangle.
+ 	*/
+    static Vector3 closestPointOnTrianglePerimeter(
+        const Vector3           v[3],
+        const Vector3           edgeDirection[3],
+        const float             edgeLength[3],
+        const Vector3&			point,
+        int&                    edgeIndex);
+
+    /**
+	 Tests whether a point is contained within the triangle defined by
+	 v0, v1, and v2 and its plane's normal.
+
+	 @param v0 Triangle vertex 0.
+	 @param v1 Triangle vertex 1.
+	 @param v2 Triangle vertex 2.
+	 @param normal Normal to triangle's plane.
+	 @param point The point in question.
+	 @param primaryAxis Primary axis of triangle.  This will be detected
+	        if not given. This parameter is provided as an optimization.
+     @param b Barycentric coordinates; b[i] is the weight on v[i]
+
+	 @return true  - if point is inside the triangle.
+	 @return false - otherwise
+ 	*/
+    static bool isPointInsideTriangle(
+        const Vector3&			v0,
+        const Vector3&			v1,
+        const Vector3&			v2,
+        const Vector3&			normal,
+        const Vector3&          point,
+        float                   b[3],
+        Vector3::Axis           primaryAxis = Vector3::DETECT_AXIS);
+
+    inline static bool isPointInsideTriangle(
+        const Vector3&			v0,
+        const Vector3&			v1,
+        const Vector3&			v2,
+        const Vector3&			normal,
+        const Vector3&			point,
+        Vector3::Axis           primaryAxis = Vector3::DETECT_AXIS) {
+
+        float b[3];
+        return isPointInsideTriangle(v0, v1, v2, normal, point, b, primaryAxis);
+    }
+
+     /**
+	  Tests for the intersection of a moving sphere and a fixed box in a
+	  given time limit.
+
+	  @note Returns true if any part of the sphere is inside the box
+     		during the time period (inf means "ever").  Useful for
+		    performing bounding-box collision detection.
+
+	  @param sphere 		Moving sphere.
+	  @param velocity 	Velocity of moving sphere.
+	  @param box 		Fixed box.
+	  @param timeLimit 	Time limit for intersection test.
+
+	  @return true  -  if the two objects will touch.
+	  @return false - if there is no intersection.
+ 	*/
+    static bool movingSpherePassesThroughFixedBox(
+        const Sphere&           sphere,
+        const Vector3&          velocity,
+        const Box&              box,
+        double                  timeLimit = inf());
+
+	/**
+	 Tests for the intersection of a moving sphere and a fixed sphere in a
+	 given time limit.
+
+	 @note This function will not detect an intersection between a moving object
+	 that is already interpenetrating the fixed object.
+
+	 @param sphere 		Moving sphere.
+	 @param velocity 	Velocity of moving sphere.
+	 @param fixedSphere Fixed sphere.
+	 @param timeLimit 	Time limit for intersection test.
+
+	 @return true  -  if the two spheres will touch.
+	 @return false - if there is no intersection.
+ 	*/
+    static bool movingSpherePassesThroughFixedSphere(
+        const Sphere&           sphere,
+        const Vector3&          velocity,
+        const Sphere&           fixedSphere,
+        double                  timeLimit = inf());
+
+	/**
+	 Tests for the intersection of two fixed spheres.
+
+	 @param sphere1 Fixed sphere 1.
+	 @param sphere2 Fixed sphere 2.
+
+	 @return true -  if the two spheres touch.
+	 @return false - if there is no intersection.
+ 	*/
+    static bool fixedSolidSphereIntersectsFixedSolidSphere(
+        const Sphere&           sphere1,
+        const Sphere&           sphere2);
+
+	/**
+	 Tests for the intersection of a fixed sphere and a fixed box.
+
+	 @param sphere Fixed sphere.
+	 @param box    Fixed box.
+
+	 @return true  -  if the two objects touch.
+	 @return false - if there is no intersection.
+ 	*/
+    static bool fixedSolidSphereIntersectsFixedSolidBox(
+        const Sphere&           sphere,
+        const Box&              box);
+
+    static bool fixedSolidSphereIntersectsFixedTriangle(
+        const Sphere&           sphere,
+        const Triangle&         triangle);
+
+    static bool fixedSolidBoxIntersectsFixedTriangle(
+        const AABox&            box, 
+        const Triangle&         triangle);
+
+    /**
+	 Tests whether a point is inside a rectangle defined by the vertexes
+	 v0, v1, v2, & v3, and the rectangle's plane normal.
+
+	 @param v0 Rectangle vertex 1.
+	 @param v1 Rectangle vertex 2.
+	 @param v2 Rectangle vertex 3.
+	 @param v3 Rectangle vertex 4.
+	 @param normal Normal to rectangle's plane.
+	 @param point The point in question.
+
+	 @return true  - if point is inside the rectangle.
+	 @return false - otherwise
+ 	*/
+    static bool isPointInsideRectangle(
+        const Vector3&			v0,
+        const Vector3&			v1,
+        const Vector3&			v2,
+        const Vector3&			v3,
+        const Vector3&			normal,
+        const Vector3&			point);
+
+    /**
+	 Finds the closest point on the perimeter of the rectangle to an
+	 external point; given a rectangle defined by four points v0, v1,
+	 v2, & v3, and the external point.
+
+	 @param v0 Rectangle vertex 1.
+	 @param v1 Rectangle vertex 2.
+	 @param v2 Rectangle vertex 3.
+	 @param v3 Rectangle vertex 4.
+	 @param point External point.
+
+	 @return Closests point to point on the perimeter of the
+ 	 rectangle.
+ 	 */
+    static Vector3 closestPointToRectanglePerimeter(
+        const Vector3&			v0,
+        const Vector3&			v1,
+        const Vector3&			v2,
+        const Vector3&			v3,
+        const Vector3&			point);
+
+     /**
+	  Finds the closest point in the rectangle to an external point; Given
+	  a rectangle defined by four points v0, v1, v2, & v3, and the external
+	  point.
+
+	  @param v0 Rectangle vertex 1.
+	  @param v1 Rectangle vertex 2.
+	  @param v2 Rectangle vertex 3
+	  @param v3 Rectangle vertex 4.
+	  @param point External point.
+
+      @return Closet point in the rectangle to the external point.
+	  */
+	 static Vector3 closestPointToRectangle(
+        const Vector3&			v0,
+        const Vector3&			v1,
+        const Vector3&			v2,
+        const Vector3&			v3,
+        const Vector3&			point);
+};
+
+} // namespace
+
+#endif // G3D_COLLISIONDETECTION_H
diff --git a/externals/g3dlite/G3D/Color1.h b/externals/g3dlite/G3D/Color1.h
new file mode 100644
index 00000000000..0f68c84b363
--- /dev/null
+++ b/externals/g3dlite/G3D/Color1.h
@@ -0,0 +1,144 @@
+/**
+ @file Color1.h
+ 
+ Monochrome Color class
+ 
+ @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+ @created 2007-01-31
+ @edited  2009-03-20
+
+ Copyright 2000-2009, Morgan McGuire.
+ All rights reserved.
+ */
+
+#ifndef G3D_COLOR1_H
+#define G3D_COLOR1_H
+
+#include "G3D/platform.h"
+#include "G3D/g3dmath.h"
+#include "G3D/HashTrait.h"
+#include 
+
+namespace G3D {
+
+/**
+ Monochrome color.  This is just a float, but it has nice semantics
+ because a scaling by 255 automatically occurs when switching between
+ fixed point (Color1uint8) and floating point (Color1) formats.
+ */
+class Color1 {
+private:
+    // Hidden operators
+    bool operator<(const Color1&) const;
+    bool operator>(const Color1&) const;
+    bool operator<=(const Color1&) const;
+    bool operator>=(const Color1&) const;
+
+public:
+    float value;
+
+    /**
+    Initializes to 0
+     */
+    inline Color1() : value(0) {}
+
+    Color1(class BinaryInput& bi);
+
+    inline explicit Color1(float v) : value(v) {
+    }
+
+    inline bool isZero() const {
+        return value == 0.0f;
+    }
+
+    inline bool isOne() const {
+        return value == 1.0f;
+    }
+
+    static const Color1& one();
+
+    static const Color1& zero();
+
+    /** Returns the value three times */
+    class Color3 rgb() const;
+
+    Color1 (const class Color1uint8& other);
+
+    void serialize(class BinaryOutput& bo) const;
+    void deserialize(class BinaryInput& bi);
+
+    Color1 operator+ (const Color1& other) const {
+        return Color1(value + other.value);
+    }
+
+    Color1 operator+ (const float other) const {
+        return Color1(value + other);
+    }
+
+    Color1& operator+= (const Color1 other) {
+        value += other.value;
+        return *this;
+    }
+
+    Color1& operator-= (const Color1 other) {
+        value -= other.value;
+        return *this;
+    }
+
+    Color1 operator- (const Color1& other) const {
+        return Color1(value - other.value);
+    }
+
+    Color1 operator- (const float other) const {
+        return Color1(value - other);
+    }
+
+    Color1 operator- () const {
+        return Color1(-value);
+    }
+
+    Color1 operator* (const Color1& other) const {
+        return Color1(value * other.value);
+    }
+
+    Color1 operator* (const float other) const {
+        return Color1(value * other);
+    }
+
+    Color1 operator/ (const Color1& other) const {
+        return Color1(value / other.value);
+    }
+
+    Color1 operator/ (const float other) const {
+        return Color1(value / other);
+    }
+
+    inline Color1 max(const Color1& other) const {
+        return Color1(G3D::max(value, other.value));
+    }
+
+    inline Color1 min(const Color1& other) const {
+        return Color1(G3D::min(value, other.value));
+    }
+
+    inline Color1 lerp(const Color1& other, float a) const {
+        return Color1(value + (other.value - value) * a); 
+
+    }
+
+    inline size_t hashCode() const {
+        return (size_t)(value * 0xFFFFFF);
+    }
+};
+
+}
+
+template <>
+struct HashTrait {
+    static size_t hashCode(const G3D::Color1& key) {
+        return key.hashCode();
+    }
+};
+
+
+#endif
diff --git a/externals/g3dlite/G3D/Color1uint8.h b/externals/g3dlite/G3D/Color1uint8.h
new file mode 100644
index 00000000000..092099d0d17
--- /dev/null
+++ b/externals/g3dlite/G3D/Color1uint8.h
@@ -0,0 +1,91 @@
+/** 
+  @file Color1uint8.h
+ 
+  @maintainer Morgan McGuire, graphics3d.com
+ 
+  @created 2007-01-30
+  @edited  2007-01-30
+
+  Copyright 2000-2007, Morgan McGuire.
+  All rights reserved.
+ */
+
+#ifndef G3D_COLOR1UINT8_H
+#define G3D_COLOR1UINT8_H
+
+#include "G3D/platform.h"
+#include "G3D/g3dmath.h"
+
+namespace G3D {
+
+/**
+ Represents a Color1 as a packed integer.  Convenient
+ for creating unsigned int vertex arrays. 
+
+ WARNING: Integer color formats are different than
+ integer vertex formats.  The color channels are automatically
+ scaled by 255 (because OpenGL automatically scales integer
+ colors back by this factor).  So Color3(1,1,1) == Color3uint8(255,255,255)
+ but Vector3(1,1,1) == Vector3int16(1,1,1).
+
+ Note:
+ Conversion of a float32 to uint8 is accomplished by min(iFloor(f * 256)) and 
+ back to float32 by u / 255.0f.  This gives equal size intervals.
+Consider a number line from 0 to 1 and a corresponding one from 0 to 255.  If we use iRound(x * 255), then the mapping for three critical intervals are:
+
+
+let s = 0.5/255
+  float             int       size
+[0, s)           -> 0          s
+[s, s * 3)       -> 1         2*s
+(1 - s, 1]       -> 255        s
+

+
+If we use max(floor(x * 256), 255), then we get:
+
+
+let s = 1/256
+  float             int           size
+[0, s)           -> 0               s
+[s, 2 * s)       -> 1               s
+(1 - s, 1]       -> 255             s
+

+and the intervals are all the same size, thus giving equal precision to all values.
+ */
+G3D_BEGIN_PACKED_CLASS(1)
+class Color1uint8 {
+private:
+    // Hidden operators
+    bool operator<(const Color1uint8&) const;
+    bool operator>(const Color1uint8&) const;
+    bool operator<=(const Color1uint8&) const;
+    bool operator>=(const Color1uint8&) const;
+
+public:
+
+    uint8       value;
+
+    Color1uint8() : value(0) {}
+
+    explicit Color1uint8(const uint8 _v) : value(_v) {}
+
+    Color1uint8(const class Color1& c);
+
+    Color1uint8(class BinaryInput& bi);
+
+    void serialize(class BinaryOutput& bo) const;
+
+    void deserialize(class BinaryInput& bi);
+
+    inline bool operator==(const Color1uint8& other) const {
+        return value == other.value;
+    }
+
+    inline bool operator!=(const Color1uint8& other) const {
+        return value != other.value;
+    }
+
+}
+G3D_END_PACKED_CLASS(1)
+}
+#endif
diff --git a/externals/g3dlite/G3D/Color3.h b/externals/g3dlite/G3D/Color3.h
new file mode 100644
index 00000000000..bffe434fc27
--- /dev/null
+++ b/externals/g3dlite/G3D/Color3.h
@@ -0,0 +1,432 @@
+/**
+ @file Color3.h
+ 
+ Color class
+ 
+ @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+ @cite Portions based on Dave Eberly's Magic Software Library
+      at http://www.magic-software.com
+ 
+ @created 2001-06-02
+ @edited  2009-04-28
+
+ Copyright 2000-2009, Morgan McGuire.
+ All rights reserved.
+ */
+
+#ifndef G3D_Color3_h
+#define G3D_Color3_h
+
+#include "G3D/platform.h"
+#include "G3D/g3dmath.h"
+#include "G3D/HashTrait.h"
+#include "G3D/Color1.h"
+#include 
+
+namespace G3D {
+class Any;
+
+/**
+ Do not subclass-- this implementation makes assumptions about the
+ memory layout.
+ */
+class Color3 {
+private:
+    // Hidden operators
+    bool operator<(const Color3&) const;
+    bool operator>(const Color3&) const;
+    bool operator<=(const Color3&) const;
+    bool operator>=(const Color3&) const;
+
+public:
+    /**
+     Does not initialize fields.
+     */
+    Color3();
+
+    /** \param any Must be in one of the following forms: 
+        - Color3(#, #, #)
+        - Color3::fromARGB(#)
+        - Color3{r = #, g = #, b = #)
+        - Color3::one()
+        - Color3::zero()
+        */
+    Color3(const Any& any);
+    
+    /** Converts the Color3 to an Any. */
+    operator Any() const;
+
+    explicit Color3(class BinaryInput& bi);
+
+    Color3(float r, float g, float b);
+    Color3(float v) : r(v), g(v), b(v) {}
+
+    explicit Color3(const class Vector3& v);
+    
+    explicit Color3(const float value[3]);
+
+    /** Returns this color */
+    const Color3& rgb() const {
+        return *this;
+    }
+
+    /**
+     Initialize from another color.
+     */
+    Color3 (const Color3& other);
+
+    Color3 (const class Color3uint8& other);
+
+    inline bool isZero() const {
+        return (r == 0.0f) && (g == 0.0f) && (b == 0.0f);
+    }
+
+    inline bool isOne() const {
+        return (r == 1.0f) && (g == 1.0f) && (b == 1.0f);
+    }
+
+    bool isFinite() const;
+
+    /**
+     Initialize from an HTML-style color (e.g. 0xFF0000 == RED)
+     */
+    static Color3 fromARGB(uint32);
+
+    /** Returns one of the color wheel colors (e.g. RED, GREEN, CYAN).
+        Does not include white, black, or gray. */
+    static const Color3& wheelRandom();
+
+    /** Generate colors according to the ANSI color set, mod 16.
+     \sa pastelMap */
+    static Color3 ansiMap(uint32 i);
+
+    /**
+       Generate colors using a hash such that adjacent values
+       are unlikely to have similar colors.
+
+       Useful for rendering with
+       stable but arbitrary colors, e.g., when debugging a mesh
+       algorithm. 
+
+       \sa ansiMap
+     */
+    static Color3 pastelMap(uint32 i);
+
+    /**
+     * Channel value.
+     */
+    float r, g, b;
+
+    void serialize(class BinaryOutput& bo) const;
+    void deserialize(class BinaryInput& bi);
+
+    // access vector V as V[0] = V.r, V[1] = V.g, V[2] = V.b
+    //
+    // WARNING.  These member functions rely on
+    // (1) Color3 not having virtual functions
+    // (2) the data packed in a 3*sizeof(float) memory block
+    const float& operator[] (int i) const;
+    float& operator[] (int i);
+
+    // assignment and comparison
+    Color3& operator= (const Color3& rkVector);
+    bool operator== (const Color3& rkVector) const;
+    bool operator!= (const Color3& rkVector) const;
+    size_t hashCode() const;
+
+    // arithmetic operations
+    Color3 operator+ (const Color3& rkVector) const;
+    Color3 operator- (const Color3& rkVector) const;
+    inline Color3 operator* (float s) const {
+        return Color3(r * s, g * s, b * s);
+    }
+    Color3 operator* (const Color3& rkVector) const;
+    inline Color3 operator/ (float fScalar) const {
+        return (*this) * (1.0f / fScalar);
+    }
+    Color3 operator- () const;
+
+    // arithmetic updates
+    Color3& operator+= (const Color3& rkVector);
+    Color3& operator-= (const Color3& rkVector);
+    Color3& operator*= (const Color3& rkVector);
+    Color3& operator*= (float fScalar);
+    Color3& operator/= (float fScalar);
+
+    bool fuzzyEq(const Color3& other) const;
+    bool fuzzyNe(const Color3& other) const;
+
+    // vector operations
+    float length () const;
+    Color3 direction() const;
+    float squaredLength () const;
+    float dot (const Color3& rkVector) const;
+    float unitize (float fTolerance = 1e-06);
+    Color3 cross (const Color3& rkVector) const;
+    Color3 unitCross (const Color3& rkVector) const;
+
+    inline Color3 pow(const Color3& other) const {
+        return Color3(::pow(r, other.r), ::pow(g, other.g), ::pow(b, other.b));
+    }
+    
+    inline Color3 pow(float other) const {
+        return Color3(::pow(r, other), ::pow(g, other), ::pow(b, other));
+    }
+
+    inline Color3 max(const Color3& other) const {
+        return Color3(G3D::max(r, other.r), G3D::max(g, other.g), G3D::max(b, other.b));
+    }
+
+    inline Color3 min(const Color3& other) const {
+        return Color3(G3D::min(r, other.r), G3D::min(g, other.g), G3D::min(b, other.b));
+    }
+
+    /** Smallest element */
+    inline float min() const {
+        return G3D::min(G3D::min(r, g), b);
+    }
+
+    /** Largest element */
+    inline float max() const {
+        return G3D::max(G3D::max(r, g), b);
+    }
+
+    inline Color3 lerp(const Color3& other, float a) const {
+        return (*this) + (other - *this) * a; 
+
+    }
+
+    inline float sum() const {
+        return r + g + b;
+    }
+
+    inline float average() const {
+        return sum() / 3.0f;
+    }
+
+
+    /**
+     *  Converts from HSV to RGB , note: toHSV(fromHSV(_hsv)) may not be _hsv, if it is at a grey point or black point.
+     *  The components of _hsv should lie in the unit interval. 
+     *  @cite Alvy Ray Smith SIGGRAPH 1978 "Color Gamut Transform Pairs"
+     **/
+    static Color3 fromHSV(const Vector3& _hsv);
+    static Vector3 toHSV(const Color3& _rgb);
+    
+    /** Duplicates the matlab jet colormap maps [0,1] --> (r,g,b) where blue is close to  0 and red is close to 1. */
+    static Color3 jetColorMap(const float& val);
+    
+    /** Returns colors with maximum saturation and value @param hue [0, 1]*/
+    static Color3 rainbowColorMap(float hue);
+
+    std::string toString() const;
+
+    /** Random unit vector */
+    static Color3 random();
+
+    // Special values.
+    // Intentionally not inlined: see Matrix3::identity() for details.
+    static const Color3& red();
+    static const Color3& green();
+    static const Color3& blue();
+    static const Color3& purple();
+    static const Color3& cyan();
+    static const Color3& yellow();
+    static const Color3& brown();
+    static const Color3& orange();
+    static const Color3& black();
+    static const Color3& gray();
+    static const Color3& white();
+
+    static const Color3& zero();
+    static const Color3& one();
+
+    inline Color3 bgr() const {
+        return Color3(b, g, r);
+    }
+};
+
+inline G3D::Color3 operator* (float s, const G3D::Color3& c) {
+    return c * s;
+}
+
+inline G3D::Color3 operator* (G3D::Color1& s, const G3D::Color3& c) {
+    return c * s.value;
+}
+
+inline G3D::Color3 operator* (const G3D::Color3& c, G3D::Color1& s) {
+    return c * s.value;
+}
+
+
+//----------------------------------------------------------------------------
+inline Color3::Color3 () {
+}
+
+//----------------------------------------------------------------------------
+
+inline Color3::Color3(float fX, float fY, float fZ) {
+    r = fX;
+    g = fY;
+    b = fZ;
+}
+
+//----------------------------------------------------------------------------
+inline Color3::Color3(const float afCoordinate[3]) {
+    r = afCoordinate[0];
+    g = afCoordinate[1];
+    b = afCoordinate[2];
+}
+
+//----------------------------------------------------------------------------
+inline Color3::Color3 (const Color3& rkVector) {
+    r = rkVector.r;
+    g = rkVector.g;
+    b = rkVector.b;
+}
+
+//----------------------------------------------------------------------------
+inline float& Color3::operator[] (int i) {
+    return ((float*)this)[i];
+}
+
+//----------------------------------------------------------------------------
+
+inline const float& Color3::operator[] (int i) const {
+    return ((float*)this)[i];
+}
+
+//----------------------------------------------------------------------------
+
+inline bool Color3::fuzzyEq(const Color3& other) const {
+    return G3D::fuzzyEq((*this - other).squaredLength(), 0);
+}
+
+//----------------------------------------------------------------------------
+
+inline bool Color3::fuzzyNe(const Color3& other) const {
+    return G3D::fuzzyNe((*this - other).squaredLength(), 0);
+}
+
+
+//----------------------------------------------------------------------------
+inline Color3& Color3::operator= (const Color3& rkVector) {
+    r = rkVector.r;
+    g = rkVector.g;
+    b = rkVector.b;
+    return *this;
+}
+
+//----------------------------------------------------------------------------
+inline bool Color3::operator== (const Color3& rkVector) const {
+    return ( r == rkVector.r && g == rkVector.g && b == rkVector.b );
+}
+
+//----------------------------------------------------------------------------
+inline bool Color3::operator!= (const Color3& rkVector) const {
+    return ( r != rkVector.r || g != rkVector.g || b != rkVector.b );
+}
+
+//----------------------------------------------------------------------------
+inline Color3 Color3::operator+ (const Color3& rkVector) const {
+    return Color3(r + rkVector.r, g + rkVector.g, b + rkVector.b);
+}
+
+//----------------------------------------------------------------------------
+inline Color3 Color3::operator- (const Color3& rkVector) const {
+    return Color3(r -rkVector.r, g - rkVector.g, b - rkVector.b);
+}
+
+//----------------------------------------------------------------------------
+inline Color3 Color3::operator* (const Color3& rkVector) const {
+    return Color3(r * rkVector.r, g  * rkVector.g, b * rkVector.b);
+}
+
+//----------------------------------------------------------------------------
+inline Color3 Color3::operator- () const {
+    return Color3( -r, -g, -b);
+}
+
+//----------------------------------------------------------------------------
+inline Color3& Color3::operator+= (const Color3& rkVector) {
+    r += rkVector.r;
+    g += rkVector.g;
+    b += rkVector.b;
+    return *this;
+}
+
+//----------------------------------------------------------------------------
+inline Color3& Color3::operator-= (const Color3& rkVector) {
+    r -= rkVector.r;
+    g -= rkVector.g;
+    b -= rkVector.b;
+    return *this;
+}
+
+//----------------------------------------------------------------------------
+inline Color3& Color3::operator*= (float fScalar) {
+    r *= fScalar;
+    g *= fScalar;
+    b *= fScalar;
+    return *this;
+}
+
+//----------------------------------------------------------------------------
+inline Color3& Color3::operator*= (const Color3& rkVector) {
+    r *= rkVector.r;
+    g *= rkVector.g;
+    b *= rkVector.b;
+    return *this;
+}
+//----------------------------------------------------------------------------
+inline float Color3::squaredLength () const {
+    return r*r + g*g + b*b;
+}
+
+//----------------------------------------------------------------------------
+inline float Color3::length () const {
+    return sqrtf(r*r + g*g + b*b);
+}
+
+//----------------------------------------------------------------------------
+inline Color3 Color3::direction () const {
+    float lenSquared = r * r + g * g + b * b;
+
+    if (lenSquared != 1.0f) {
+        return *this / sqrtf(lenSquared);
+    } else {
+        return *this;
+    }
+}
+
+//----------------------------------------------------------------------------
+inline float Color3::dot (const Color3& rkVector) const {
+    return r*rkVector.r + g*rkVector.g + b*rkVector.b;
+}
+
+//----------------------------------------------------------------------------
+inline Color3 Color3::cross (const Color3& rkVector) const {
+    return Color3(g*rkVector.b - b*rkVector.g, b*rkVector.r - r*rkVector.b,
+                  r*rkVector.g - g*rkVector.r);
+}
+
+//----------------------------------------------------------------------------
+inline Color3 Color3::unitCross (const Color3& rkVector) const {
+    Color3 kCross(g*rkVector.b - b*rkVector.g, b*rkVector.r - r*rkVector.b,
+                  r*rkVector.g - g*rkVector.r);
+    kCross.unitize();
+    return kCross;
+}
+
+
+} // namespace
+
+
+template <> struct HashTrait {
+    static size_t hashCode(const G3D::Color3& key) {
+        return key.hashCode();
+    }
+};
+
+
+#endif
diff --git a/externals/g3dlite/G3D/Color3uint8.h b/externals/g3dlite/G3D/Color3uint8.h
new file mode 100644
index 00000000000..bd4b00d7fd6
--- /dev/null
+++ b/externals/g3dlite/G3D/Color3uint8.h
@@ -0,0 +1,110 @@
+/** 
+  @file Color3uint8.h
+ 
+  @maintainer Morgan McGuire, graphics3d.com
+ 
+  @created 2003-04-07
+  @edited  2006-06-24
+
+  Copyright 2000-2006, Morgan McGuire.
+  All rights reserved.
+ */
+
+#ifndef G3D_COLOR3UINT8_H
+#define G3D_COLOR3UINT8_H
+
+#include "G3D/platform.h"
+#include "G3D/g3dmath.h"
+
+namespace G3D {
+
+/**
+ Represents a Color3 as a packed integer.  Convenient
+ for creating unsigned int vertex arrays.  Used by
+ G3D::GImage as the underlying format.
+
+ WARNING: Integer color formats are different than
+ integer vertex formats.  The color channels are automatically
+ scaled by 255 (because OpenGL automatically scales integer
+ colors back by this factor).  So Color3(1,1,1) == Color3uint8(255,255,255)
+ but Vector3(1,1,1) == Vector3int16(1,1,1).
+ */
+
+G3D_BEGIN_PACKED_CLASS(1)
+
+class Color3uint8 {
+private:
+    // Hidden operators
+    bool operator<(const Color3uint8&) const;
+    bool operator>(const Color3uint8&) const;
+    bool operator<=(const Color3uint8&) const;
+    bool operator>=(const Color3uint8&) const;
+
+public:
+    uint8       r;
+    uint8       g;
+    uint8       b;
+
+    Color3uint8() : r(0), g(0), b(0) {}
+
+    Color3uint8(const uint8 _r, const uint8 _g, const uint8 _b) : r(_r), g(_g), b(_b) {}
+
+    Color3uint8(const class Color3& c);
+
+    Color3uint8(class BinaryInput& bi);
+
+    inline static Color3uint8 fromARGB(uint32 i) {
+        Color3uint8 c;
+        c.r = (i >> 16) & 0xFF;
+        c.g = (i >> 8) & 0xFF;
+        c.b = i & 0xFF;
+        return c;
+    }
+
+    inline Color3uint8 bgr() const {
+        return Color3uint8(b, g, r);
+    }
+
+    /**
+     Returns the color packed into a uint32
+     (the upper byte is 0xFF)
+     */
+    inline uint32 asUInt32() const {
+        return (0xFF << 24) + ((uint32)r << 16) + ((uint32)g << 8) + b;
+    }
+
+    void serialize(class BinaryOutput& bo) const;
+
+    void deserialize(class BinaryInput& bi);
+
+    // access vector V as V[0] = V.r, V[1] = V.g, V[2] = V.b
+    //
+    // WARNING.  These member functions rely on
+    // (1) Color3 not having virtual functions
+    // (2) the data packed in a 3*sizeof(uint8) memory block
+    uint8& operator[] (int i) const {
+        debugAssert((unsigned int)i < 3);
+        return ((uint8*)this)[i];
+    }
+
+    operator uint8* () {
+        return (G3D::uint8*)this;
+    }
+
+    operator const uint8* () const {
+        return (uint8*)this;
+    }
+
+    bool operator==(const Color3uint8& other) const {
+        return (other.r == r) && (other.g == g) && (other.b == b);
+    }
+
+    bool operator!=(const Color3uint8& other) const {
+        return (other.r != r) && (other.g != g) && (other.b != b);
+    }
+}
+G3D_END_PACKED_CLASS(1)
+
+} // namespace G3D
+
+#endif
diff --git a/externals/g3dlite/G3D/Color4.h b/externals/g3dlite/G3D/Color4.h
new file mode 100644
index 00000000000..d8858abbce2
--- /dev/null
+++ b/externals/g3dlite/G3D/Color4.h
@@ -0,0 +1,338 @@
+/**
+ @file Color4.h
+ 
+ Color class
+ 
+ @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+ @cite Portions based on Dave Eberly's Magic Software Library
+      at http://www.magic-software.com
+ 
+ @created 2002-06-25
+ @edited  2009-11-15
+
+ Copyright 2000-2009, Morgan McGuire.
+ All rights reserved.
+ */
+
+#ifndef G3D_Color4_h
+#define G3D_Color4_h
+
+#include "G3D/platform.h"
+#include "G3D/g3dmath.h"
+#include "G3D/Color3.h"
+#include 
+
+namespace G3D {
+
+class Any;
+
+/**
+ Do not subclass-- this implementation makes assumptions about the
+ memory layout.
+ */
+class Color4 {
+private:
+    // Hidden operators
+    bool operator<(const Color4&) const;
+    bool operator>(const Color4&) const;
+    bool operator<=(const Color4&) const;
+    bool operator>=(const Color4&) const;
+
+public:
+
+    /** \param any Must be in one of the following forms: 
+        - Color4(#, #, #, #)
+        - Color4::fromARGB(#)
+        - Color4{r = #, g = #, b = #, a = #)
+        */
+    Color4(const Any& any);
+    
+    /** Converts the Color4 to an Any. */
+    operator Any() const;
+
+    /**
+     * Does not initialize fields.
+     */
+    Color4 ();
+
+    Color4(const Color3& c3, float a = 1.0);
+
+    Color4(const class Color4uint8& c);
+
+    Color4(class BinaryInput& bi);
+
+    Color4(const class Vector4& v);
+
+    Color4(float r, float g, float b, float a = 1.0);
+
+    static const Color4& one();
+ 
+    Color4(float value[4]);
+
+    /**
+     * Initialize from another color.
+     */
+    Color4(const Color4& other);
+
+
+    inline bool isZero() const {
+        return (r == 0.0f) && (g == 0.0f) && (b == 0.0f) && (a == 0.0f);
+    }
+
+    inline bool isOne() const {
+        return (r == 1.0f) && (g == 1.0f) && (b == 1.0f) && (a == 1.0f);
+    }
+
+    void serialize(class BinaryOutput& bo) const;
+    void deserialize(class BinaryInput& bi);
+
+    /**
+     Initialize from an HTML-style color (e.g. 0xFFFF0000 == RED)
+     */
+    static Color4 fromARGB(uint32);
+
+    /**
+     * Channel values.
+     */
+    float r, g, b, a;
+
+    inline Color3 rgb() const {
+        return Color3(r, g, b);
+    }
+
+    // access vector V as V[0] = V.r, V[1] = V.g, V[2] = V.b, v[3] = V.a
+    //
+    // WARNING.  These member functions rely on
+    // (1) Color4 not having virtual functions
+    // (2) the data packed in a 3*sizeof(float) memory block
+    float& operator[] (int i) const;
+
+    // assignment and comparison
+    Color4& operator= (const Color4& rkVector);
+    bool operator== (const Color4& rkVector) const;
+    bool operator!= (const Color4& rkVector) const;
+    size_t hashCode() const;
+
+    // arithmetic operations
+    Color4 operator+ (const Color4& rkVector) const;
+    Color4 operator- (const Color4& rkVector) const;
+    Color4 operator* (float fScalar) const;
+    inline Color4 operator* (const Color4& k) const {
+        return Color4(r*k.r, g*k.g, b*k.b, a * k.a); 
+    }
+    Color4 operator/ (float fScalar) const;
+    Color4 operator- () const;
+    friend Color4 operator* (double fScalar, const Color4& rkVector);
+
+    // arithmetic updates
+    Color4& operator+= (const Color4& rkVector);
+    Color4& operator-= (const Color4& rkVector);
+    Color4& operator*= (float fScalar);
+    Color4& operator/= (float fScalar);
+
+    bool fuzzyEq(const Color4& other) const;
+    bool fuzzyNe(const Color4& other) const;
+
+    std::string toString() const;
+
+    inline Color4 max(const Color4& other) const {
+        return Color4(G3D::max(r, other.r), G3D::max(g, other.g), G3D::max(b, other.b), G3D::max(a, other.a));
+    }
+
+    inline Color4 min(const Color4& other) const {
+        return Color4(G3D::min(r, other.r), G3D::min(g, other.g), G3D::min(b, other.b), G3D::min(a, other.a));
+    }
+
+    /** r + g + b + a */
+    inline float sum() const {
+        return r + g + b + a;
+    }
+
+    inline Color4 lerp(const Color4& other, float a) const {
+        return (*this) + (other - *this) * a; 
+
+    }
+
+    // Special values.
+    // Intentionally not inlined: see Matrix3::identity() for details.
+    static const Color4& zero();
+    static const Color4& clear();
+
+    static const Color4& inf();
+    static const Color4& nan();
+
+    inline bool isFinite() const {
+        return G3D::isFinite(r) && G3D::isFinite(g) && G3D::isFinite(b) && G3D::isFinite(a);
+    }
+
+    inline Color3 bgr() const {
+        return Color3(b, g, r);
+    }
+};
+
+/**
+ Extends the c3 with alpha = 1.0
+ */
+Color4 operator*(const Color3& c3, const Color4& c4);
+
+
+inline Color4 operator*(const Color3& c3, const Color4& c4) {
+    return Color4(c3.r * c4.r, c3.g * c4.g, c3.b * c4.b, c4.a);
+}
+
+//----------------------------------------------------------------------------
+
+inline Color4::Color4 () {
+    // For efficiency in construction of large arrays of vectors, the
+    // default constructor does not initialize the vector.
+}
+
+//----------------------------------------------------------------------------
+
+inline Color4::Color4(const Color3& c3, float a) {
+    r = c3.r;
+    g = c3.g;
+    b = c3.b;
+    this->a = a;
+}
+
+//----------------------------------------------------------------------------
+
+inline Color4::Color4(
+    float       r,
+    float       g,
+    float       b,
+    float       a) :
+    r(r), g(g), b(b), a(a) {
+}
+
+//----------------------------------------------------------------------------
+inline Color4::Color4 (float afCoordinate[4]) {
+    r = afCoordinate[0];
+    g = afCoordinate[1];
+    b = afCoordinate[2];
+    a = afCoordinate[3];
+}
+
+//----------------------------------------------------------------------------
+
+inline Color4::Color4(
+    const Color4&           other) {
+
+    r = other.r;
+    g = other.g;
+    b = other.b;
+    a = other.a;
+}
+
+//----------------------------------------------------------------------------
+
+inline float& Color4::operator[] (int i) const {
+    return ((float*)this)[i];
+}
+
+//----------------------------------------------------------------------------
+
+inline bool Color4::fuzzyEq(const Color4& other) const {
+    Color4 dif = (*this - other);
+    return G3D::fuzzyEq(dif.r * dif.r + dif.g * dif.g + dif.b * dif.b + dif.a * dif.a, 0);
+}
+
+//----------------------------------------------------------------------------
+
+inline bool Color4::fuzzyNe(const Color4& other) const {
+    Color4 dif = (*this - other);
+    return G3D::fuzzyNe(dif.r * dif.r + dif.g * dif.g + dif.b * dif.b + dif.a * dif.a, 0);
+}
+
+
+//----------------------------------------------------------------------------
+inline Color4& Color4::operator= (const Color4& other) {
+    r = other.r;
+    g = other.g;
+    b = other.b;
+    a = other.a;
+    return *this;
+}
+
+//----------------------------------------------------------------------------
+
+inline bool Color4::operator== (const Color4& other) const {
+    return ( r == other.r && g == other.g && b == other.b && a == other.a);
+}
+
+//----------------------------------------------------------------------------
+
+inline bool Color4::operator!= (const Color4& other) const {
+    return ( r != other.r || g != other.g || b != other.b || a != other.a);
+}
+
+//----------------------------------------------------------------------------
+inline Color4 Color4::operator+ (const Color4& other) const {
+    return Color4(r + other.r, g + other.g, b + other.b, a + other.a);
+}
+
+//----------------------------------------------------------------------------
+inline Color4 Color4::operator- (const Color4& other) const {
+    return Color4(r - other.r, g - other.g, b - other.b, a - other.a);
+}
+
+//----------------------------------------------------------------------------
+
+inline Color4 Color4::operator* (float fScalar) const {
+    return Color4(fScalar * r, fScalar * g, fScalar * b, fScalar * a);
+}
+
+//----------------------------------------------------------------------------
+
+inline Color4 Color4::operator- () const {
+    return Color4(-r, -g, -b, -a);
+}
+
+//----------------------------------------------------------------------------
+
+inline Color4 operator* (float fScalar, const Color4& other) {
+    return Color4(fScalar * other.r, fScalar * other.g,
+                  fScalar * other.b, fScalar * other.a);
+}
+
+//----------------------------------------------------------------------------
+
+inline Color4& Color4::operator+= (const Color4& other) {
+    r += other.r;
+    g += other.g;
+    b += other.b;
+    a += other.a;
+    return *this;
+}
+
+//----------------------------------------------------------------------------
+
+inline Color4& Color4::operator-= (const Color4& other) {
+    r -= other.r;
+    g -= other.g;
+    b -= other.b;
+    a -= other.a;
+    return *this;
+}
+
+//----------------------------------------------------------------------------
+
+inline Color4& Color4::operator*= (float fScalar) {
+    r *= fScalar;
+    g *= fScalar;
+    b *= fScalar;
+    a *= fScalar;
+    return *this;
+}
+
+} // namespace
+
+template <>
+struct HashTrait {
+    static size_t hashCode(const G3D::Color4& key) {
+        return key.hashCode();
+    }
+};
+
+#endif
diff --git a/externals/g3dlite/G3D/Color4uint8.h b/externals/g3dlite/G3D/Color4uint8.h
new file mode 100644
index 00000000000..ab8c0729276
--- /dev/null
+++ b/externals/g3dlite/G3D/Color4uint8.h
@@ -0,0 +1,115 @@
+/** 
+  @file Color4uint8.h
+ 
+  @maintainer Morgan McGuire, graphics3d.com
+ 
+  @created 2003-04-07
+  @edited  2006-03-24
+
+  Copyright 2000-2006, Morgan McGuire.
+  All rights reserved.
+ */
+
+#ifndef COLOR4UINT8_H
+#define COLOR4UINT8_H
+
+#include "G3D/g3dmath.h"
+#include "G3D/platform.h"
+#include "G3D/Color3uint8.h"
+
+namespace G3D {
+
+/**
+ Represents a Color4 as a packed integer.  Convenient
+ for creating unsigned int vertex arrays.  Used by
+ G3D::GImage as the underlying format.
+
+ WARNING: Integer color formats are different than
+ integer vertex formats.  The color channels are automatically
+ scaled by 255 (because OpenGL automatically scales integer
+ colors back by this factor).  So Color4(1,1,1) == Color4uint8(255,255,255)
+ but Vector3(1,1,1) == Vector3int16(1,1,1).
+
+ */
+G3D_BEGIN_PACKED_CLASS(1)
+class Color4uint8 {
+private:
+    // Hidden operators
+    bool operator<(const Color4uint8&) const;
+    bool operator>(const Color4uint8&) const;
+    bool operator<=(const Color4uint8&) const;
+    bool operator>=(const Color4uint8&) const;
+
+public:
+    uint8       r;
+    uint8       g;
+    uint8       b;
+    uint8       a;
+
+    Color4uint8() : r(0), g(0), b(0), a(0) {}
+
+    Color4uint8(const class Color4& c);
+
+    Color4uint8(const uint8 _r, const uint8 _g, const uint8 _b, const uint8 _a) : r(_r), g(_g), b(_b), a(_a) {}
+
+    Color4uint8(const Color3uint8& c, const uint8 _a) : r(c.r), g(c.g), b(c.b), a(_a) {}
+
+    Color4uint8(class BinaryInput& bi);
+
+    inline static Color4uint8 fromARGB(uint32 i) {
+        Color4uint8 c;
+        c.a = (i >> 24) & 0xFF;
+        c.r = (i >> 16) & 0xFF;
+        c.g = (i >> 8) & 0xFF;
+        c.b = i & 0xFF;
+        return c;
+    }
+
+    inline uint32 asUInt32() const {
+        return ((uint32)a << 24) + ((uint32)r << 16) + ((uint32)g << 8) + b;
+    }
+
+    // access vector V as V[0] = V.r, V[1] = V.g, V[2] = V.b
+    //
+    // WARNING.  These member functions rely on
+    // (1) Color4uint8 not having virtual functions
+    // (2) the data packed in a 3*sizeof(uint8) memory block
+    uint8& operator[] (int i) const {
+        return ((uint8*)this)[i];
+    }
+
+    operator uint8* () {
+        return (uint8*)this;
+    }
+
+    operator const uint8* () const {
+        return (uint8*)this;
+    }
+
+
+    inline Color3uint8 bgr() const {
+        return Color3uint8(b, g, r);
+    }
+
+    void serialize(class BinaryOutput& bo) const;
+
+    void deserialize(class BinaryInput& bi);
+
+    inline Color3uint8 rgb() const {
+        return Color3uint8(r, g, b);
+    }
+
+    bool operator==(const Color4uint8& other) const {
+        return *reinterpret_cast(this) == *reinterpret_cast(&other);
+    }
+
+    bool operator!=(const Color4uint8& other) const {
+        return *reinterpret_cast(this) != *reinterpret_cast(&other);
+    }
+
+}
+G3D_END_PACKED_CLASS(1)
+
+} // namespace G3D
+
+#endif
diff --git a/externals/g3dlite/G3D/Cone.h b/externals/g3dlite/G3D/Cone.h
new file mode 100644
index 00000000000..d801a9b348f
--- /dev/null
+++ b/externals/g3dlite/G3D/Cone.h
@@ -0,0 +1,68 @@
+/**
+ @file Cone.h
+ 
+ Cone class
+ 
+ @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+ @cite Portions based on Dave Eberly's Magic Software Library at http://www.magic-software.com
+  
+ @created 2001-06-02
+ @edited  2006-02-23
+
+ Copyright 2000-2006, Morgan McGuire.
+ All rights reserved.
+ */
+
+#ifndef G3D_CONE_H
+#define G3D_CONE_H
+
+#include "G3D/platform.h"
+#include "G3D/g3dmath.h"
+#include "G3D/Vector3.h"
+
+namespace G3D {
+
+/**
+ An infinite cone.
+ */
+class Cone {
+
+private:
+    Vector3         tip;
+    Vector3         direction;
+
+    /** Angle from the center line to the edge. */
+    float            angle;
+
+public:
+
+    /**
+     @param angle Angle from the center line to the edge, in radians
+     */
+    Cone(const Vector3& tip, const Vector3& direction, float angle);
+
+    /**
+     Forms the smallest cone that contains the box.  Undefined if
+     the tip is inside or on the box.
+     */
+    Cone(const Vector3& tip, const class Box& box);
+
+    virtual ~Cone() {}
+
+    /**
+     Returns true if the cone touches, intersects, or contains b.
+
+     If c.intersects(s) and c.intersects(Sphere(s.center, s.radius * 2)
+     then the sphere s is entirely within cone c.
+     */
+    bool intersects(const class Sphere& s) const;
+
+    /**
+     True if v is a point inside the cone.
+     */
+    bool contains(const class Vector3& v) const;
+};
+
+} // namespace
+
+#endif
diff --git a/externals/g3dlite/G3D/ConvexPolyhedron.h b/externals/g3dlite/G3D/ConvexPolyhedron.h
new file mode 100644
index 00000000000..a6fdd62cf90
--- /dev/null
+++ b/externals/g3dlite/G3D/ConvexPolyhedron.h
@@ -0,0 +1,180 @@
+/**
+  @file ConvexPolyhedron.h
+  
+  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+
+  @created 2001-11-11
+  @edited  2006-04-10
+ 
+  Copyright 2000-2006, Morgan McGuire.
+  All rights reserved.
+ */
+
+#ifndef G3D_CONVEXPOLYHEDRON_H
+#define G3D_CONVEXPOLYHEDRON_H
+
+#include "G3D/platform.h"
+#include "G3D/Vector3.h"
+#include "G3D/Vector2.h"
+#include "G3D/CoordinateFrame.h"
+#include "G3D/Plane.h"
+#include "G3D/Line.h"
+#include "G3D/Array.h"
+
+namespace G3D {
+
+class DirectedEdge {
+public:
+    Vector3 start;
+    Vector3 stop;
+};
+
+class ConvexPolygon {
+private:
+
+    friend class ConvexPolyhedron;
+
+    Array			_vertex;
+
+public:
+
+    ConvexPolygon() {}
+    ConvexPolygon(const Vector3& v0, const Vector3& v1, const Vector3& v2);
+    ConvexPolygon(const Array& __vertex);
+    virtual ~ConvexPolygon() {}
+
+    /**
+     Counter clockwise winding order.  
+     */
+    inline const Vector3& vertex(int i) const {
+        return _vertex[i];
+    }
+    
+    inline void setVertex(int i, const Vector3& v) {
+        _vertex[i] = v;
+    }
+    
+    /**
+       Zero vertices indicates an empty polygon (zero area).
+    */
+    inline int numVertices() const {
+        return _vertex.size();
+    }
+    
+    inline void setNumVertices(int n) {
+        _vertex.resize(n);
+    }
+    
+    /**
+       O(n) in the number of edges
+    */
+    bool isEmpty() const;
+
+    /**
+       Cuts the polygon at the plane. If the polygon is entirely above or below
+       the plane, one of the returned polygons will be empty.
+     
+       @param above The part of the polygon above (on the side the
+              normal points to or in the plane) the plane
+       @param below The part of the polygon below the plane.
+       @param newEdge  If a new edge was introduced, this is that edge (on the above portion; the below portion is the opposite winding.
+    */
+    void cut(const Plane& plane, ConvexPolygon &above, ConvexPolygon &below, DirectedEdge& newEdge);
+    void cut(const Plane& plane, ConvexPolygon &above, ConvexPolygon &below);
+
+    /**
+       When a cut plane grazes a vertex in the polygon, two near-identical vertices may be created.
+       The closeness of these two points can cause a number of problems, such as ConvexPolygon::normal() 
+       returning an infinite vector.  It should be noted, however, that not all applications are 
+       sensitive to near-identical vertices.
+       
+       removeDuplicateVertices() detects and eliminates redundant vertices.
+    */
+    void removeDuplicateVertices();
+    
+    /**
+     O(n) in the number of edges
+     */
+    float getArea() const;
+
+    inline Vector3 normal() const {
+        debugAssert(_vertex.length() >= 3);
+        return (_vertex[1] - _vertex[0]).cross(_vertex[2] - _vertex[0]).direction();
+    }
+
+    /**
+     Returns the same polygon with inverse winding.
+     */
+    ConvexPolygon inverse() const;
+};
+
+
+
+class ConvexPolyhedron {
+public:
+    /**
+     Zero faces indicates an empty polyhedron
+     */
+    Array face;
+    
+    ConvexPolyhedron() {}
+    ConvexPolyhedron(const Array& _face);
+
+    /**
+     O(n) in the number of edges
+     */
+    bool isEmpty() const;
+
+    /**
+     O(n) in the number of edges
+     */
+    float getVolume() const;
+
+    /**
+       Cuts the polyhedron at the plane. If the polyhedron is entirely above or below
+       the plane, one of the returned polyhedra will be empty.
+     
+       @param above The part of the polyhedron above (on the side the
+              normal points to or in the plane) the plane
+       @param below The part of the polyhedron below the plane.
+     */
+    void cut(const Plane& plane, ConvexPolyhedron &above, ConvexPolyhedron &below);
+};
+
+/**
+
+    */
+class ConvexPolygon2D {
+private:
+
+    Array          m_vertex;
+
+public:
+
+    ConvexPolygon2D() {}
+
+    /** 
+     Points are counter-clockwise in a Y = down, X = right coordinate
+     system.
+
+     @param reverse If true, the points are reversed (i.e. winding direction is changed)
+     before the polygon is created.
+     */
+    ConvexPolygon2D(const Array& pts, bool reverse = false);
+
+    inline int numVertices() const {
+        return m_vertex.size();
+    }
+
+    inline const Vector2& vertex(int index) const {
+        debugAssert((index >= 0) && (index <= m_vertex.size()));
+        return m_vertex[index];
+    }
+
+    /** @param reverseWinding If true, the winding direction of the polygon is reversed for this test.*/
+    bool contains(const Vector2& p, bool reverseWinding = false) const;
+};
+
+
+} // namespace
+#endif
diff --git a/externals/g3dlite/G3D/CoordinateFrame.h b/externals/g3dlite/G3D/CoordinateFrame.h
new file mode 100644
index 00000000000..7ed4d0acc65
--- /dev/null
+++ b/externals/g3dlite/G3D/CoordinateFrame.h
@@ -0,0 +1,331 @@
+/**
+ @file CoordinateFrame.h
+
+ @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+ 
+ @created 2001-03-04
+ @edited  2009-04-29
+
+ Copyright 2000-2009, Morgan McGuire.
+ All rights reserved.
+*/
+
+#ifndef G3D_CFrame_h
+#define G3D_CFrame_h
+
+#include "G3D/platform.h"
+#include "G3D/Vector3.h"
+#include "G3D/Vector4.h"
+#include "G3D/Matrix3.h"
+#include "G3D/Array.h"
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#ifdef _MSC_VER
+// Turn off "conditional expression is constant" warning; MSVC generates this
+// for debug assertions in inlined methods.
+#   pragma warning (disable : 4127)
+#endif
+
+
+namespace G3D {
+class Any;
+
+/**
+ A rigid body RT (rotation-translation) transformation.
+    
+CoordinateFrame abstracts a 4x4 matrix that maps object space to world space:
+  
+  v_world = C * v_object
+
+CoordinateFrame::rotation is the upper 3x3 submatrix, CoordinateFrame::translation
+is the right 3x1 column.  The 4th row is always [0 0 0 1], so it isn't stored.  
+So you don't have to remember which way the multiplication and transformation work,
+it provides explicit toWorldSpace and toObjectSpace methods.  Also, points, vectors 
+(directions), and surface normals transform differently, so they have separate methods.
+ 
+Some helper functions transform whole primitives like boxes in and out of object space.
+
+Convert to Matrix4 using CoordinateFrame::toMatrix4.  You can construct a CoordinateFrame
+from a Matrix4 using Matrix4::approxCoordinateFrame, however, because a Matrix4 is more 
+general than a CoordinateFrame, some information may be lost.
+
+@sa G3D::UprightFrame, G3D::PhysicsFrame, G3D::Matrix4, G3D::Quat
+*/
+class CoordinateFrame {
+public:
+
+    /**  Takes object space points to world space.  */
+    Matrix3							rotation;
+
+    /** Takes object space points to world space. */
+    Vector3							translation;
+
+    /** \param any Must be in one of the following forms: 
+        - CFrame((matrix3 expr), (vector3 expr))
+        - CFrame::fromXYZYPRDegrees(#, #, #, #, #, #)
+        - CFrame {  rotation = (matrix3 expr), translation = (vector3 expr) }
+        */
+    CoordinateFrame(const Any& any);
+    
+    /** Converts the CFrame to an Any. */
+    operator Any() const;
+
+    inline bool operator==(const CoordinateFrame& other) const {
+        return (translation == other.translation) && (rotation == other.rotation);
+    }
+
+    inline bool operator!=(const CoordinateFrame& other) const {
+        return !(*this == other);
+    }
+
+    bool fuzzyEq(const CoordinateFrame& other) const;
+
+    bool fuzzyIsIdentity() const;
+
+    bool isIdentity() const;
+
+    /**
+     Initializes to the identity coordinate frame.
+     */
+    CoordinateFrame();
+
+    CoordinateFrame(const Vector3& _translation) :
+        rotation(Matrix3::identity()), translation(_translation) {
+    }
+    
+    CoordinateFrame(const Matrix3 &rotation, const Vector3 &translation) :
+        rotation(rotation), translation(translation) {
+    }
+
+    CoordinateFrame(const Matrix3 &rotation) :
+        rotation(rotation), translation(Vector3::zero()) {
+    }
+
+    CoordinateFrame(const class UprightFrame& f);
+
+    static CoordinateFrame fromXYZYPRRadians(float x, float y, float z, float yaw = 0.0f, float pitch = 0.0f, float roll = 0.0f);
+
+    /** Construct a coordinate frame from translation = (x,y,z) and
+     rotations (in that order) about Y, object space X, object space
+     Z.  Note that because object-space axes are used, these are not
+     equivalent to Euler angles; they are known as Tait-Bryan
+     rotations and are more convenient for intuitive positioning.*/
+    static CoordinateFrame fromXYZYPRDegrees(float x, float y, float z, float yaw = 0.0f, float pitch = 0.0f, float roll = 0.0f);
+    
+    CoordinateFrame(class BinaryInput& b);
+
+    void deserialize(class BinaryInput& b);
+
+    void serialize(class BinaryOutput& b) const;
+
+    CoordinateFrame(const CoordinateFrame &other) :
+        rotation(other.rotation), translation(other.translation) {}
+
+    /**
+      Computes the inverse of this coordinate frame.
+     */
+    inline CoordinateFrame inverse() const {
+        CoordinateFrame out;
+        out.rotation = rotation.transpose();
+        out.translation = -out.rotation * translation;
+        return out;
+    }
+
+    inline ~CoordinateFrame() {}
+
+    /** See also Matrix4::approxCoordinateFrame */
+    class Matrix4 toMatrix4() const;
+
+    void getXYZYPRRadians(float& x, float& y, float& z, float& yaw, float& pitch, float& roll) const;
+    void getXYZYPRDegrees(float& x, float& y, float& z, float& yaw, float& pitch, float& roll) const;
+
+
+    /**
+     Produces an XML serialization of this coordinate frame.
+     @deprecated
+     */
+    std::string toXML() const;
+
+    /**
+     Returns the heading of the lookVector as an angle in radians relative to
+     the world -z axis.  That is, a counter-clockwise heading where north (-z) 
+     is 0 and west (-x) is PI/2.
+
+     Note that the heading ignores the Y axis, so an inverted
+     object has an inverted heading.
+     */
+    inline float getHeading() const {
+        Vector3 look = rotation.column(2);
+        float angle = -(float) atan2(-look.x, look.z);
+        return angle;
+    }
+
+    /**
+     Takes the coordinate frame into object space.
+     this->inverse() * c
+     */
+    inline CoordinateFrame toObjectSpace(const CoordinateFrame& c) const {
+        return this->inverse() * c;
+    }
+
+    inline Vector4 toObjectSpace(const Vector4& v) const {
+        return this->inverse().toWorldSpace(v);
+    }
+
+    inline Vector4 toWorldSpace(const Vector4& v) const {
+        return Vector4(rotation * Vector3(v.x, v.y, v.z) + translation * v.w, v.w);
+    }
+
+    /**
+     Transforms the point into world space.
+     */
+    inline Vector3 pointToWorldSpace(const Vector3& v) const {
+        return Vector3(
+			rotation[0][0] * v[0] + rotation[0][1] * v[1] + rotation[0][2] * v[2] + translation[0],
+			rotation[1][0] * v[0] + rotation[1][1] * v[1] + rotation[1][2] * v[2] + translation[1],
+			rotation[2][0] * v[0] + rotation[2][1] * v[1] + rotation[2][2] * v[2] + translation[2]);
+    }
+
+    /**
+     Transforms the point into object space.  Assumes that the rotation matrix is orthonormal.
+     */
+    inline Vector3 pointToObjectSpace(const Vector3& v) const {
+        float p[3];
+        p[0] = v[0] - translation[0];
+        p[1] = v[1] - translation[1];
+        p[2] = v[2] - translation[2];
+        debugAssert(G3D::fuzzyEq(rotation.determinant(), 1.0f));
+        return Vector3(
+                       rotation[0][0] * p[0] + rotation[1][0] * p[1] + rotation[2][0] * p[2],
+                       rotation[0][1] * p[0] + rotation[1][1] * p[1] + rotation[2][1] * p[2],
+                       rotation[0][2] * p[0] + rotation[1][2] * p[1] + rotation[2][2] * p[2]);
+    }
+
+    /**
+     Transforms the vector into world space (no translation).
+     */
+    inline Vector3 vectorToWorldSpace(const Vector3& v) const {
+        return rotation * v;
+    }
+
+    inline Vector3 normalToWorldSpace(const Vector3& v) const {
+        return rotation * v;
+    }
+
+    class Ray toObjectSpace(const Ray& r) const;
+
+    Ray toWorldSpace(const Ray& r) const;
+
+    /**
+     Transforms the vector into object space (no translation).
+     */
+    inline Vector3 vectorToObjectSpace(const Vector3 &v) const {
+        // Multiply on the left (same as rotation.transpose() * v)
+        return v * rotation;
+    }
+
+    inline Vector3 normalToObjectSpace(const Vector3 &v) const {
+        // Multiply on the left (same as rotation.transpose() * v)
+        return v * rotation;
+    }
+
+    void pointToWorldSpace(const Array& v, Array& vout) const;
+
+    void normalToWorldSpace(const Array& v, Array& vout) const;
+
+    void vectorToWorldSpace(const Array& v, Array& vout) const;
+
+    void pointToObjectSpace(const Array& v, Array& vout) const;
+
+    void normalToObjectSpace(const Array& v, Array& vout) const;
+
+    void vectorToObjectSpace(const Array& v, Array& vout) const;
+
+    class Box toWorldSpace(const class AABox& b) const;
+
+    class Box toWorldSpace(const class Box& b) const;
+
+    class Cylinder toWorldSpace(const class Cylinder& b) const;
+
+    class Capsule toWorldSpace(const class Capsule& b) const;
+
+    class Plane toWorldSpace(const class Plane& p) const;
+
+    class Sphere toWorldSpace(const class Sphere& b) const;
+
+    class Triangle toWorldSpace(const class Triangle& t) const;
+
+    class Box toObjectSpace(const AABox& b) const;
+
+    class Box toObjectSpace(const Box& b) const;
+
+    class Plane toObjectSpace(const Plane& p) const;
+ 
+    class Sphere toObjectSpace(const Sphere& b) const;
+
+    Triangle toObjectSpace(const Triangle& t) const;
+
+    /** Compose: create the transformation that is other followed by this.*/
+    CoordinateFrame operator*(const CoordinateFrame &other) const {
+        return CoordinateFrame(rotation * other.rotation,
+                               pointToWorldSpace(other.translation));
+    }
+
+    CoordinateFrame operator+(const Vector3& v) const {
+        return CoordinateFrame(rotation, translation + v);
+    }
+
+    CoordinateFrame operator-(const Vector3& v) const {
+        return CoordinateFrame(rotation, translation - v);
+    }
+
+    void lookAt(const Vector3& target);
+
+    void lookAt(
+        const Vector3&  target,
+        Vector3         up);
+
+    /** The direction this camera is looking (its negative z axis)*/
+	inline Vector3 lookVector() const {
+		return -rotation.column(2);
+	}
+
+    /** Returns the ray starting at the camera origin travelling in direction CoordinateFrame::lookVector. */
+    class Ray lookRay() const;
+
+    /** Up direction for this camera (its y axis). */
+    inline Vector3 upVector() const {
+        return rotation.column(1);
+    }
+
+    inline Vector3 rightVector() const {
+		return rotation.column(0);
+	}
+
+    /**
+     If a viewer looks along the look vector, this is the viewer's "left".
+     Useful for strafing motions and building alternative coordinate frames.
+     */
+    inline Vector3 leftVector() const {
+		return -rotation.column(0);
+    }
+
+    /**
+     Linearly interpolates between two coordinate frames, using
+     Quat::slerp for the rotations.
+     */
+    CoordinateFrame lerp(
+        const CoordinateFrame&  other,
+        float                   alpha) const;
+
+};
+
+typedef CoordinateFrame CFrame;
+
+} // namespace
+
+#endif
diff --git a/externals/g3dlite/G3D/Crypto.h b/externals/g3dlite/G3D/Crypto.h
new file mode 100644
index 00000000000..56c816a4977
--- /dev/null
+++ b/externals/g3dlite/G3D/Crypto.h
@@ -0,0 +1,96 @@
+/** 
+  @file Crypto.h
+ 
+  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+ 
+
+  @created 2006-03-29
+  @edited  2006-04-06
+ */
+
+#ifndef G3D_CRYPTO_H
+#define G3D_CRYPTO_H
+
+#include "G3D/platform.h"
+#include "G3D/g3dmath.h"
+#include 
+
+namespace G3D {
+
+/** See G3D::Crypto::md5 */
+class MD5Hash {
+private:
+
+    uint8   value[16];
+
+public:
+
+    MD5Hash() {
+        for (int i = 0; i < 16; ++i) {
+            value[i] = 0;
+        }
+    }
+
+    explicit MD5Hash(class BinaryInput& b);
+
+    uint8& operator[](int i) {
+        return value[i];
+    }
+
+    const uint8& operator[](int i) const {
+        return value[i];
+    }
+
+    bool operator==(const MD5Hash& other) const {
+        bool match = true;
+        for (int i = 0; i < 16; ++i) {
+            match = match && (other.value[i] == value[i]);
+        }
+        return match;
+    }
+
+    inline bool operator!=(const MD5Hash& other) const {
+        return !(*this == other);
+    }
+
+    void deserialize(class BinaryInput& b);
+
+    void serialize(class BinaryOutput& b) const;
+};
+
+
+/** Cryptography and hashing helper functions */
+class Crypto {
+public:
+
+    /**
+     Computes the CRC32 value of a byte array.  CRC32 is designed to be a hash
+     function that produces different values for similar strings.
+
+     This implementation is compatible with PKZIP and GZIP.
+
+     Based on http://www.gamedev.net/reference/programming/features/crc32/
+    */
+    static uint32 crc32(const void* bytes, size_t numBytes);
+
+    /**
+     Computes the MD5 hash (message digest) of a byte stream, as defined by
+     http://www.ietf.org/rfc/rfc1321.txt.
+
+     @cite Based on implementation by L. Peter Deutsch, ghost@aladdin.com
+     */
+    MD5Hash md5(const void* bytes, size_t numBytes);
+
+    /**
+     Returns the nth prime less than 2000 in constant time.  The first prime has index
+     0 and is the number 2.
+     */
+    static int smallPrime(int n);
+
+    /** Returns 1 + the largest value that can be passed to smallPrime. */
+    static int numSmallPrimes();
+};
+
+}
+
+#endif
diff --git a/externals/g3dlite/G3D/Cylinder.h b/externals/g3dlite/G3D/Cylinder.h
new file mode 100644
index 00000000000..85eba77b794
--- /dev/null
+++ b/externals/g3dlite/G3D/Cylinder.h
@@ -0,0 +1,92 @@
+/**
+ @file Cylinder.h
+  
+ @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+  
+ @created 2003-02-07
+ @edited  2005-09-26
+
+ Copyright 2000-2005, Morgan McGuire.
+ All rights reserved.
+ */
+
+#ifndef G3D_Cylinder_H
+#define G3D_Cylinder_H
+
+#include "G3D/platform.h"
+#include "G3D/g3dmath.h"
+#include "G3D/Vector3.h"
+
+namespace G3D {
+
+class Line;
+class AABox;
+/**
+ Right cylinder
+ */
+class Cylinder {
+private:
+	Vector3			p1;
+	Vector3			p2;
+
+	float           mRadius;
+
+public:
+
+    /** Uninitialized */
+    Cylinder();
+    Cylinder(class BinaryInput& b);
+	Cylinder(const Vector3& _p1, const Vector3& _p2, float _r);
+	void serialize(class BinaryOutput& b) const;
+	void deserialize(class BinaryInput& b);
+	
+	/** The line down the center of the Cylinder */
+	Line axis() const;
+
+    /** 
+      A reference frame in which the center of mass is at the origin and
+      the Y-axis is the cylinder's axis.  If the cylinder is transformed, this reference frame
+      may freely rotate around its axis.*/
+    void getReferenceFrame(class CoordinateFrame& cframe) const;
+
+    /** Returns point 0 or 1 */
+    inline const Vector3& point(int i) const {
+        debugAssert(i >= 0 && i <= 1);
+        return (i == 0) ? p1 : p2;
+    }
+
+    /**
+     Returns true if the point is inside the Cylinder or on its surface.
+     */
+    bool contains(const Vector3& p) const;
+
+    float area() const;
+
+    float volume() const;
+
+    float radius() const; 
+
+    /** Center of mass */
+    inline Vector3 center() const {
+        return (p1 + p2) / 2.0f;
+    }
+
+    inline float height() const {
+        return (p1 - p2).magnitude();
+    }
+
+    /**
+     Get close axis aligned bounding box.
+     With vertical world orientation, the top and bottom might not be very tight. */
+    void getBounds(AABox& out) const;
+
+    /** Random world space point with outward facing normal. */
+    void getRandomSurfacePoint(Vector3& P, Vector3& N) const;
+
+    /** Point selected uniformly at random over the volume. */
+    Vector3 randomInteriorPoint() const;
+};
+
+} // namespace
+
+#endif
diff --git a/externals/g3dlite/G3D/EqualsTrait.h b/externals/g3dlite/G3D/EqualsTrait.h
new file mode 100644
index 00000000000..349cb5088fb
--- /dev/null
+++ b/externals/g3dlite/G3D/EqualsTrait.h
@@ -0,0 +1,26 @@
+/**
+  @file EqualsTrait.h
+
+  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+  @created 2008-10-01
+  @edited  2008-10-01
+  Copyright 2000-2009, Morgan McGuire.
+  All rights reserved.
+ */
+
+#ifndef G3D_EQUALSTRAIT_H
+#define G3D_EQUALSTRAIT_H
+
+#include "G3D/platform.h"
+
+/** Default implementation of EqualsTrait.
+    @see G3D::Table for specialization requirements.
+*/
+template struct EqualsTrait {
+    static bool equals(const Key& a, const Key& b) {
+        return a == b;
+    }
+};
+
+#endif
+
diff --git a/externals/g3dlite/G3D/G3D.h b/externals/g3dlite/G3D/G3D.h
new file mode 100644
index 00000000000..5b56b9c71dc
--- /dev/null
+++ b/externals/g3dlite/G3D/G3D.h
@@ -0,0 +1,162 @@
+/**
+ @file G3D.h
+
+ This header includes all of the G3D libraries in
+ appropriate namespaces.
+
+ @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+
+ @created 2001-08-25
+ @edited  2010-01-30
+
+ Copyright 2000-2010, Morgan McGuire.
+ All rights reserved.
+*/
+
+#ifndef G3D_G3D_h
+#define G3D_G3D_h
+
+#define NOMINMAX 1
+#ifdef min
+    #undef min
+#endif
+#ifdef max
+    #undef max
+#endif
+
+#include "G3D/platform.h"
+#include "G3D/units.h"
+#include "G3D/ParseError.h"
+#include "G3D/Random.h"
+#include "G3D/Array.h"
+#include "G3D/SmallArray.h"
+#include "G3D/Queue.h"
+#include "G3D/Crypto.h"
+#include "G3D/format.h"
+#include "G3D/Vector2.h"
+#include "G3D/Vector3.h"
+#include "G3D/Vector4.h"
+#include "G3D/Color1.h"
+#include "G3D/Color3.h"
+#include "G3D/Color4.h"
+#include "G3D/Matrix2.h"
+#include "G3D/Matrix3.h"
+#include "G3D/Matrix4.h"
+#include "G3D/CoordinateFrame.h"
+#include "G3D/PhysicsFrame.h"
+#include "G3D/Plane.h"
+#include "G3D/Line.h"
+#include "G3D/Ray.h"
+#include "G3D/Sphere.h"
+#include "G3D/Box.h"
+#include "G3D/Box2D.h"
+#include "G3D/AABox.h"
+#include "G3D/WrapMode.h"
+#include "G3D/Cone.h"
+#include "G3D/Quat.h"
+#include "G3D/stringutils.h"
+#include "G3D/prompt.h"
+#include "G3D/Table.h"
+#include "G3D/Set.h"
+#include "G3D/GUniqueID.h"
+#include "G3D/BinaryFormat.h"
+#include "G3D/BinaryInput.h"
+#include "G3D/BinaryOutput.h"
+#include "G3D/debug.h"
+#include "G3D/g3dfnmatch.h"
+#include "G3D/G3DGameUnits.h"
+#include "G3D/g3dmath.h"
+#include "G3D/uint128.h"
+#include "G3D/fileutils.h"
+#include "G3D/ReferenceCount.h"
+#include "G3D/Welder.h"
+#include "G3D/GMutex.h"
+#include "G3D/PrecomputedRandom.h"
+#include "G3D/MemoryManager.h"
+#include "G3D/AreaMemoryManager.h"
+#include "G3D/BumpMapPreprocess.h"
+
+template struct HashTrait< G3D::ReferenceCountedPointer > {
+    static size_t hashCode(G3D::ReferenceCountedPointer key) { return reinterpret_cast( key.pointer() ); }
+};
+
+#include "G3D/GImage.h"
+#include "G3D/CollisionDetection.h"
+#include "G3D/Intersect.h"
+#include "G3D/Log.h"
+#include "G3D/serialize.h"
+#include "G3D/TextInput.h"
+#include "G3D/NetAddress.h"
+#include "G3D/NetworkDevice.h"
+#include "G3D/System.h"
+#include "G3D/splinefunc.h"
+#include "G3D/Spline.h"
+#include "G3D/UprightFrame.h"
+#include "G3D/LineSegment.h"
+#include "G3D/Capsule.h"
+#include "G3D/Cylinder.h"
+#include "G3D/Triangle.h"
+#include "G3D/Color3uint8.h"
+#include "G3D/Color4uint8.h"
+#include "G3D/Vector2int16.h"
+#include "G3D/Vector3int16.h"
+#include "G3D/Vector3int32.h"
+#include "G3D/Vector4int8.h"
+#include "G3D/ConvexPolyhedron.h"
+#include "G3D/MeshAlg.h"
+#include "G3D/vectorMath.h"
+#include "G3D/Rect2D.h"
+#include "G3D/GCamera.h"
+#include "G3D/GLight.h"
+#include "G3D/KDTree.h"
+#include "G3D/PointKDTree.h"
+#include "G3D/TextOutput.h"
+#include "G3D/MeshBuilder.h"
+#include "G3D/Stopwatch.h"
+#include "G3D/AtomicInt32.h"
+#include "G3D/GThread.h"
+#include "G3D/ThreadSet.h"
+#include "G3D/RegistryUtil.h"
+#include "G3D/Any.h"
+#include "G3D/PointHashGrid.h"
+#include "G3D/Map2D.h"
+#include "G3D/Image1.h"
+#include "G3D/Image1uint8.h"
+#include "G3D/Image3.h"
+#include "G3D/Image3uint8.h"
+#include "G3D/Image4.h"
+#include "G3D/Image4uint8.h"
+#include "G3D/filter.h"
+#include "G3D/WeakCache.h"
+#include "G3D/Pointer.h"
+#include "G3D/Matrix.h"
+#include "G3D/ImageFormat.h"
+
+#ifdef _MSC_VER
+#   pragma comment(lib, "zlib")
+#   pragma comment(lib, "ws2_32")
+#   pragma comment(lib, "winmm")
+#   pragma comment(lib, "imagehlp")
+#   pragma comment(lib, "gdi32")
+#   pragma comment(lib, "user32")
+#   pragma comment(lib, "kernel32")
+#   pragma comment(lib, "version")
+#   pragma comment(lib, "advapi32")
+#   pragma comment(lib, "png")
+#   pragma comment(lib, "jpeg")
+#   pragma comment(lib, "zip")
+#   ifdef _DEBUG
+        // Don't link against G3D when building G3D itself.
+#      ifndef G3D_BUILDING_LIBRARY_DLL
+#         pragma comment(lib, "G3Dd.lib")
+#      endif
+#   else
+        // Don't link against G3D when building G3D itself.
+#      ifndef G3D_BUILDING_LIBRARY_DLL
+#         pragma comment(lib, "G3D.lib")
+#      endif
+#   endif
+#endif
+
+#endif
+
diff --git a/externals/g3dlite/G3D/G3DAll.h b/externals/g3dlite/G3D/G3DAll.h
new file mode 100644
index 00000000000..1176fe742e7
--- /dev/null
+++ b/externals/g3dlite/G3D/G3DAll.h
@@ -0,0 +1,26 @@
+/** 
+  @file G3DAll.h
+ 
+  Includes all G3D and GLG3D files and uses the G3D namespace.
+  
+  This requires OpenGL and SDL headers.  If you don't want all of this,
+  \#include  separately.
+
+  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+ 
+  @created 2002-01-01
+  @edited  2006-08-13
+
+ Copyright 2000-2006, Morgan McGuire.
+ All rights reserved.
+ */
+
+#ifndef G3D_G3DALL_H
+#define G3D_G3DALL_H
+
+#include "G3D/G3D.h"
+#include "GLG3D/GLG3D.h"
+
+using namespace G3D;
+
+#endif
diff --git a/externals/g3dlite/G3D/G3DGameUnits.h b/externals/g3dlite/G3D/G3DGameUnits.h
new file mode 100644
index 00000000000..e2bc2c811e8
--- /dev/null
+++ b/externals/g3dlite/G3D/G3DGameUnits.h
@@ -0,0 +1,42 @@
+/**
+ @file G3DGameUnits.h
+
+ @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+ @created 2002-10-05
+ @edited  2006-11-10
+ */
+
+#ifndef G3D_GAMEUNITS_H
+#define G3D_GAMEUNITS_H
+
+#include "G3D/platform.h"
+
+namespace G3D {
+/**
+ Time, in seconds.
+ */
+typedef double GameTime;
+typedef double SimTime;
+
+/**
+ Actual wall clock time in seconds.
+ */
+typedef double RealTime;
+
+enum AMPM {AM, PM};
+
+/** \deprecated */
+enum {SECOND=1, MINUTE=60, HOUR = 60*60, DAY=24*60*60, SUNRISE=24*60*60/4, SUNSET=24*60*60*3/4, MIDNIGHT=0, METER=1, KILOMETER=1000};
+
+/**
+ Converts a 12 hour clock time into the number of seconds since 
+ midnight.  Note that 12:00 PM is noon and 12:00 AM is midnight.
+
+ Example: toSeconds(10, 00, AM)
+ */
+SimTime toSeconds(int hour, int minute, double seconds, AMPM ap);
+SimTime toSeconds(int hour, int minute, AMPM ap);
+
+}
+
+#endif
diff --git a/externals/g3dlite/G3D/GCamera.h b/externals/g3dlite/G3D/GCamera.h
new file mode 100644
index 00000000000..018fbc85d59
--- /dev/null
+++ b/externals/g3dlite/G3D/GCamera.h
@@ -0,0 +1,337 @@
+/**
+  @file GCamera.h
+
+  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+
+  @created 2005-07-20
+  @edited  2009-04-20
+*/
+
+#ifndef G3D_GCamera_H
+#define G3D_GCamera_H
+
+#include "G3D/platform.h"
+#include "G3D/CoordinateFrame.h"
+#include "G3D/Vector3.h"
+#include "G3D/Plane.h"
+#include "G3D/debugAssert.h"
+
+namespace G3D {
+
+class Matrix4;
+class Rect2D;
+class Any;
+
+/**
+  Abstraction of a pinhole camera.
+
+  The area a camera sees is called a frustum.  It is bounded by the
+  near plane, the far plane, and the sides of the view frame projected
+  into the scene.  It has the shape of a pyramid with the top cut off.
+
+  Cameras can project points from 3D to 2D.  The "unit" projection
+  matches OpenGL.  It maps the entire view frustum to a cube of unit
+  radius (i.e., edges of length 2) centered at the origin.  The
+  non-unit projection then maps that cube to the specified pixel
+  viewport in X and Y and the range [0, 1] in Z.  The projection is
+  reversable as long as the projected Z value is known.
+
+  All viewport arguments are the pixel bounds of the viewport-- e.g.,
+  RenderDevice::viewport().
+ */
+class GCamera  {
+
+public:
+    /**
+    Stores the direction of the field of view
+    */
+    enum FOVDirection {HORIZONTAL, VERTICAL};
+
+private:
+    
+    /** Full field of view (in radians) */
+    float                       m_fieldOfView;
+
+    /** Clipping plane, *not* imaging plane.  Negative numbers. */
+    float                       m_nearPlaneZ;
+
+    /** Negative */
+    float                       m_farPlaneZ;
+
+    /** Stores the camera's location and orientation */
+    CoordinateFrame             m_cframe;
+
+    /** Horizontal or Vertical */
+    FOVDirection                m_direction;
+
+public:
+
+    /** Must be of the format produced by the Any cast, e.g.,
+
+        
+        GCamera {
+            coordinateFrame = CFrame::fromXYZYPRDegrees(-13.3f, 8.0f, -1.9f, 246.6f, -3),
+            nearPlaneZ = -0.5,
+            farPlaneZ = -50,
+            fovDirection = "HORIZONTAL",
+            fovAngleDegrees = 90
+        }

+
+        Missing fields are filled from the default GCamera constructor.
+    */
+    GCamera(const Any& any);
+
+    operator Any() const;
+
+    class Frustum {
+    public:
+        class Face {
+        public:
+            /** Counter clockwise indices into vertexPos */
+            int             vertexIndex[4];
+
+            /** The plane containing the face. */
+            Plane           plane;
+        };
+        
+        /** The vertices, in homogeneous space.  If w == 0,
+            a vertex is at infinity. */
+        Array      vertexPos;
+
+        /** The faces in the frustum.  When the
+            far plane is at infinity, there are 5 faces,
+            otherwise there are 6.  The faces are in the order
+            N,R,L,B,T,[F].
+            */
+        Array         faceArray;
+    };
+
+    GCamera();
+
+    GCamera(const Matrix4& proj, const CFrame& frame);
+
+    virtual ~GCamera();
+
+    /** Returns the current coordinate frame */
+    const CoordinateFrame& coordinateFrame() const {
+        return m_cframe;
+    }
+
+    /** Sets c to the camera's coordinate frame */
+    void getCoordinateFrame(CoordinateFrame& c) const;
+
+    /** Sets a new coordinate frame for the camera */
+    void setCoordinateFrame(const CoordinateFrame& c);
+           
+    /** Sets \a P equal to the camera's projection matrix. This is the
+        matrix that maps points to the homogeneous clip cube that
+        varies from -1 to 1 on all axes.  The projection matrix does
+        not include the camera transform.
+
+        This is the matrix that a RenderDevice (or OpenGL) uses as the projection matrix.
+        @sa RenderDevice::setProjectionAndCameraMatrix, RenderDevice::setProjectionMatrix, Matrix4::perspectiveProjection
+    */
+    void getProjectUnitMatrix(const Rect2D& viewport, Matrix4& P) const;
+
+    /** Sets \a P equal to the matrix that transforms points to pixel
+        coordinates on the given viewport.  A point correspoinding to
+        the top-left corner of the viewport in camera space will
+        transform to viewport.x0y0() and the bottom-right to viewport.x1y1(). */
+    void getProjectPixelMatrix(const Rect2D& viewport, Matrix4& P) const;
+
+    /** Converts projected points from OpenGL standards
+        (-1, 1) to normal 3D coordinate standards (0, 1) 
+
+        \deprecated
+    */ // TODO: Remove
+    Vector3 convertFromUnitToNormal(const Vector3& in, const Rect2D& viewport) const;
+
+    /**
+       Sets the field of view, in radians.  The 
+       initial angle is toRadians(55).  Must specify
+       the direction of the angle.
+
+       This is the full angle, i.e., from the left side of the
+       viewport to the right side.
+    */
+    void setFieldOfView(float angle, FOVDirection direction);
+
+    /** Returns the current full field of view angle (from the left side of the
+       viewport to the right side) and direction */
+    inline void getFieldOfView(float& angle, FOVDirection& direction) const {
+        angle = m_fieldOfView;
+        direction = m_direction;
+    }
+
+    /**
+     Projects a world space point onto a width x height screen.  The
+     returned coordinate uses pixmap addressing: x = right and y =
+     down.  The resulting z value is 0 at the near plane, 1 at the far plane,
+     and is a linear compression of unit cube projection.
+
+     If the point is behind the camera, Vector3::inf() is returned.
+     */
+    Vector3 project(const G3D::Vector3& point,
+                    const class Rect2D& viewport) const;
+
+    /**
+     Projects a world space point onto a unit cube.  The resulting
+     x,y,z values range between -1 and 1, where z is -1
+     at the near plane and 1 at the far plane and varies hyperbolically in between.
+
+     If the point is behind the camera, Vector3::inf() is returned.
+     */
+    Vector3 projectUnit(const G3D::Vector3& point,
+                        const class Rect2D& viewport) const;
+
+    /**
+       Gives the world-space coordinates of screen space point v, where
+       v.x is in pixels from the left, v.y is in pixels from
+       the top, and v.z is on the range 0 (near plane) to 1 (far plane).
+     */
+    Vector3 unproject(const Vector3& v, const Rect2D& viewport) const;
+
+     /**
+       Gives the world-space coordinates of unit cube point v, where
+       v varies from -1 to 1 on all axes.  The unproject first
+       transforms the point into a pixel location for the viewport, then calls unproject
+     */
+    Vector3 unprojectUnit(const Vector3& v, const Rect2D& viewport) const;
+
+    /**
+     Returns the pixel area covered by a shape of the given
+     world space area at the given z value (z must be negative).
+     */
+    float worldToScreenSpaceArea(float area, float z, const class Rect2D& viewport) const;
+
+    /**
+     Returns the world space 3D viewport corners.  These
+     are at the near clipping plane.  The corners are constructed
+     from the nearPlaneZ, viewportWidth, and viewportHeight.
+     "left" and "right" are from the GCamera's perspective.
+     */
+    void getNearViewportCorners(const class Rect2D& viewport,
+                                Vector3& outUR, Vector3& outUL,
+                                Vector3& outLL, Vector3& outLR) const;
+
+    /**
+     Returns the world space 3D viewport corners.  These
+     are at the Far clipping plane.  The corners are constructed
+     from the nearPlaneZ, farPlaneZ, viewportWidth, and viewportHeight.
+     "left" and "right" are from the GCamera's perspective.
+     */
+    void getFarViewportCorners(const class Rect2D& viewport,
+                               Vector3& outUR, Vector3& outUL,
+                               Vector3& outLL, Vector3& outLR) const;
+
+    /**
+     Returns the image plane depth,  assumes imagePlane
+     is the same as the near clipping plane.
+     returns a positive number.
+     */
+    float imagePlaneDepth() const;
+
+    /**
+      Returns the world space ray passing through the center of pixel
+      (x, y) on the image plane.  The pixel x and y axes are opposite
+      the 3D object space axes: (0,0) is the upper left corner of the screen.
+      They are in viewport coordinates, not screen coordinates.
+
+      The ray origin is at the origin.  To start it at the image plane,
+      move it forward by imagePlaneDepth/ray.direction.z
+
+      Integer (x, y) values correspond to
+      the upper left corners of pixels.  If you want to cast rays
+      through pixel centers, add 0.5 to x and y.        
+      */
+    Ray worldRay(
+        float                                  x,
+        float                                  y,
+        const class Rect2D&                     viewport) const;
+
+    /**
+      Returns a negative z-value.
+     */
+    inline float nearPlaneZ() const {
+        return m_nearPlaneZ;
+    }
+
+    /**
+     Returns a negative z-value.
+     */
+    inline float farPlaneZ() const {
+        return m_farPlaneZ;
+    }
+
+    /**
+     Sets a new value for the far clipping plane
+     Expects a negative value
+     */
+    inline void setFarPlaneZ(float z) {
+        debugAssert(z < 0);
+        m_farPlaneZ = z;
+    }
+    
+    /**
+     Sets a new value for the near clipping plane
+     Expects a negative value
+     */
+    inline void setNearPlaneZ(float z) {
+        debugAssert(z < 0);
+        m_nearPlaneZ = z;
+    }
+
+    /**
+     Returns the camera space width of the viewport at the near plane.
+     */
+    float viewportWidth(const class Rect2D& viewport) const;
+
+    /**
+     Returns the camera space height of the viewport at the near plane.
+     */
+    float viewportHeight(const class Rect2D& viewport) const;
+
+    void setPosition(const Vector3& t);
+
+    /** Rotate the camera in place to look at the target.  Does not
+        persistently look at that location when the camera moves;
+        i.e., if you move the camera and still want it to look at the
+        old target, you must call lookAt again after moving the
+        camera.)*/
+    void lookAt(const Vector3& position, const Vector3& up = Vector3::unitY());
+
+    /**
+       Returns the clipping planes of the frustum, in world space.  
+       The planes have normals facing into the view frustum.
+       
+       The plane order is guaranteed to be:
+       Near, Right, Left, Top, Bottom, [Far]
+       
+       If the far plane is at infinity, the resulting array will have 
+       5 planes, otherwise there will be 6.
+       
+       The viewport is used only to determine the aspect ratio of the screen; the
+       absolute dimensions and xy values don't matter.
+    */
+    void getClipPlanes
+    (
+     const Rect2D& viewport,
+     Array& outClip) const;
+
+    /**
+      Returns the world space view frustum, which is a truncated pyramid describing
+      the volume of space seen by this camera.
+    */
+    void frustum(const Rect2D& viewport, GCamera::Frustum& f) const;
+
+    GCamera::Frustum frustum(const Rect2D& viewport) const;
+    
+    /** Read and Write camera parameters */
+    void serialize(class BinaryOutput& bo) const;
+    void deserialize(class BinaryInput& bi);
+   
+};
+
+} // namespace G3D
+
+#endif
diff --git a/externals/g3dlite/G3D/GImage.h b/externals/g3dlite/G3D/GImage.h
new file mode 100644
index 00000000000..8ae11134fc9
--- /dev/null
+++ b/externals/g3dlite/G3D/GImage.h
@@ -0,0 +1,607 @@
+/**
+  \file GImage.h
+
+  See G3D::GImage for details.
+
+  @cite JPEG compress/decompressor is the IJG library, used in accordance with their license.
+  @cite JPG code by John Chisholm, using the IJG Library
+  @cite TGA code by Morgan McGuire
+  @cite BMP code by John Chisholm, based on code by Edward "CGameProgrammer" Resnick mailto:cgp@gdnmail.net at ftp://ftp.flipcode.com/cotd/LoadPicture.txt
+  @cite PCX format described in the ZSOFT PCX manual http://www.nist.fss.ru/hr/doc/spec/pcx.htm#2
+  @cite PNG compress/decompressor is the libpng library, used in accordance with their license.
+  @cite PPM code by Morgan McGuire based on http://netpbm.sourceforge.net/doc/ppm.html
+
+  \maintainer Morgan McGuire, http://graphics.cs.williams.edu
+
+  \created 2002-05-27
+  \edited  2010-01-04
+
+  Copyright 2000-2010, Morgan McGuire.
+  All rights reserved.
+ */
+
+#ifndef G3D_GImage_h
+#define G3D_GImage_h
+
+#include "G3D/platform.h"
+#include 
+#include "G3D/Array.h"
+#include "G3D/g3dmath.h"
+#include "G3D/stringutils.h"
+#include "G3D/Color1uint8.h"
+#include "G3D/Color3uint8.h"
+#include "G3D/Color4uint8.h"
+#include "G3D/MemoryManager.h"
+#include "G3D/BumpMapPreprocess.h"
+
+namespace G3D {
+class BinaryInput;
+class BinaryOutput;
+
+
+/**
+  Interface to image compression & file formats. 
+ 
+  Supported formats (decode and encode): Color JPEG, PNG,
+  (Uncompressed)TGA 24, (Uncompressed)TGA 32, BMP 1, BMP 4, BMP 8, BMP
+  24, PPM (P6), and PPM ASCII (P1, P2, P3), which includes PPM, PGM,
+  and PBM.  8-bit paletted PCX, 24-bit PCX, and ICO are supported for
+  decoding only.
+
+  Sample usage:
+
+  \verbatim
+    // Loading from disk:
+    G3D::GImage im1("test.jpg");
+    
+    // Loading from memory:
+    G3D::GImage im2(data, length);
+
+    // im.pixel is a pointer to RGB color data.  If you want
+    // an alpha channel, call RGBtoRGBA or RGBtoARGB for
+    // conversion.
+
+    // Saving to memory:
+    G3D::GImage im3(width, height);
+    // (Set the pixels of im3...) 
+    uint8* data2;
+    int    len2;
+    im3.encode(G3D::GImage::JPEG, data2, len2);
+
+    // Saving to disk
+    im3.save("out.jpg");
+  \endverbatim
+
+  The free Image Magick Magick Wand API 
+  (http://www.imagemagick.org/www/api/magick_wand.html) provides a more powerful
+  API for image manipulation and wider set of image load/save formats.  It is 
+  recommended over GImage (we don't include it directly in G3D because their license
+  is more restrictive than the BSD one).
+
+  */
+class GImage {
+private:
+
+    /** Used exclusively for allocating m_byte; this may be an 
+     implementation that allocates directly on a GPU.*/
+    MemoryManager::Ref      m_memMan;
+    uint8*                  m_byte;
+
+    int                     m_channels;
+    int                     m_width;
+    int                     m_height;
+
+public:
+
+    class Error {
+    public:
+        Error(
+            const std::string& reason,
+            const std::string& filename = "") :
+        reason(reason), filename(filename) {}
+        
+        std::string reason;
+        std::string filename;
+    };
+
+    /** PGM, PPM, and PBM all come in two versions and are classified as PPM_* files */
+    enum Format {JPEG, BMP, TGA, PCX, ICO, PNG, 
+        PPM_BINARY, PGM_BINARY = PPM_BINARY,
+        PPM_ASCII, PGM_ASCII = PPM_ASCII,
+        AUTODETECT, UNKNOWN};
+
+
+    /**
+     The number of channels; either 3 (RGB) or 4 (RGBA)
+     */
+    inline int channels() const {
+        return m_channels;
+    }
+
+    inline int width() const {
+        return m_width;
+    }
+
+    inline int height() const {
+        return m_height;
+    }
+
+    inline const uint8* byte() const {
+        return m_byte;
+    }
+
+    /** Returns a pointer to the underlying data, which is stored
+        in row-major order without row padding.
+        e.g., uint8* ptr = image.rawData();
+    */
+    template
+    inline const Type* rawData() const {
+        return (Type*)m_byte;
+    }
+
+    /** \copybrief GImage::rawData() const */
+    template
+    inline Type* rawData() {
+        return (Type*)m_byte;
+    }
+
+    inline const Color1uint8* pixel1() const {
+        debugAssertM(m_channels == 1, format("Tried to call GImage::pixel1 on an image with %d channels", m_channels));            
+        return (Color1uint8*)m_byte;
+    }
+
+    inline Color1uint8* pixel1() {
+        debugAssertM(m_channels == 1, format("Tried to call GImage::pixel1 on an image with %d channels", m_channels));            
+        return (Color1uint8*)m_byte;
+    }
+
+    /** Returns a pointer to the upper left pixel
+        as Color4uint8.
+     */
+    inline const Color4uint8* pixel4() const {
+        debugAssertM(m_channels == 4, format("Tried to call GImage::pixel4 on an image with %d channels", m_channels));            
+        return (Color4uint8*)m_byte;
+    }
+
+    inline Color4uint8* pixel4() {
+        debugAssert(m_channels == 4);
+        return (Color4uint8*)m_byte;
+    }
+
+    /** Returns a pointer to the upper left pixel
+        as Color3uint8.
+     */
+    inline const Color3uint8* pixel3() const {
+         debugAssertM(m_channels == 3, format("Tried to call GImage::pixel3 on an image with %d channels", m_channels));            
+         return (Color3uint8*)m_byte;
+    }
+
+    inline Color3uint8* pixel3() {
+        debugAssert(m_channels == 3);
+        return (Color3uint8*)m_byte;
+    }
+
+    /** Returns the pixel at (x, y), where (0,0) is the upper left. */
+    inline const Color1uint8& pixel1(int x, int y) const {
+        debugAssert(x >= 0 && x < m_width);
+        debugAssert(y >= 0 && y < m_height);
+        return pixel1()[x + y * m_width];
+    }
+
+    /** Returns the pixel at (x, y), where (0,0) is the upper left. */
+    inline Color1uint8& pixel1(int x, int y) {
+        debugAssert(x >= 0 && x < m_width);
+        debugAssert(y >= 0 && y < m_height);
+        return pixel1()[x + y * m_width];
+    }
+
+    /** Returns the pixel at (x, y), where (0,0) is the upper left. */
+    inline const Color3uint8& pixel3(int x, int y) const {
+        debugAssert(x >= 0 && x < m_width);
+        debugAssert(y >= 0 && y < m_height);
+        return pixel3()[x + y * m_width];
+    }
+
+    inline Color3uint8& pixel3(int x, int y) {
+        debugAssert(x >= 0 && x < m_width);
+        debugAssert(y >= 0 && y < m_height);
+        return pixel3()[x + y * m_width];
+    }
+
+    /** Returns the pixel at (x, y), where (0,0) is the upper left. */
+    inline const Color4uint8& pixel4(int x, int y) const {
+        debugAssert(x >= 0 && x < m_width);
+        debugAssert(y >= 0 && y < m_height);
+        return pixel4()[x + y * m_width];
+    }
+
+    inline Color4uint8& pixel4(int x, int y) {
+        debugAssert(x >= 0 && x < m_width);
+        debugAssert(y >= 0 && y < m_height);
+        return pixel4()[x + y * m_width];
+    }
+
+    inline uint8* byte() {
+        return m_byte;
+    }
+
+private:
+
+    void encodeBMP(
+        BinaryOutput&       out) const;
+
+    /**
+     The TGA file will be either 24- or 32-bit depending
+     on the number of channels.
+     */
+    void encodeTGA(
+        BinaryOutput&       out) const;
+
+    /**
+     Converts this image into a JPEG
+     */
+    void encodeJPEG(
+        BinaryOutput&       out) const;
+
+    /**
+     Converts this image into a JPEG
+     */
+    void encodePNG(
+        BinaryOutput&       out) const;
+
+    void encodePPM(
+        BinaryOutput&       out) const;
+
+    void encodePPMASCII(
+        BinaryOutput&       out) const;
+
+    void decodeTGA(
+        BinaryInput&        input);
+
+    void decodeBMP(
+        BinaryInput&        input);
+
+    void decodeJPEG(
+        BinaryInput&        input);
+
+    void decodePCX(
+        BinaryInput&        input);
+
+    void decodeICO(
+        BinaryInput&        input);
+
+    void decodePNG(
+        BinaryInput&        input);
+
+    void decodePPM(
+        BinaryInput&        input);
+
+    void decodePPMASCII(
+        BinaryInput&        input);
+
+    /**
+     Given [maybe] a filename, memory buffer, and [maybe] a format, 
+     returns the most likely format of this file.
+     */
+    static Format resolveFormat(
+        const std::string&  filename,
+        const uint8*        data,
+        int                 dataLen,
+        Format              maybeFormat);
+
+    void _copy(
+        const GImage&       other);
+
+public:
+
+    /** Predicts the image file format of \a filename */
+    static Format resolveFormat(const std::string& filename);
+
+    void flipHorizontal();
+    void flipVertical();
+    void rotate90CW(int numTimes = 1);
+
+    /**
+     Create an empty image of the given size.
+     \sa load()
+     */
+    GImage(
+        int                 width = 0,
+        int                 height = 0,
+        int                 channels = 3,
+        const MemoryManager::Ref& m = MemoryManager::create());
+
+    /**
+     Load an encoded image from disk and decode it.
+     Throws GImage::Error if something goes wrong.
+     */
+    GImage(
+        const std::string&  filename,
+        Format              format = AUTODETECT,
+        const MemoryManager::Ref& m = MemoryManager::create());
+
+    /**
+     Decodes an image stored in a buffer.
+    */
+    GImage(
+        const unsigned char*data,
+        int                 length,
+        Format              format = AUTODETECT,
+        const MemoryManager::Ref& m = MemoryManager::create());
+
+    GImage(
+        const GImage&       other,
+        const MemoryManager::Ref& m = MemoryManager::create());
+
+    GImage& operator=(const GImage& other);
+
+    /**
+     Returns a new GImage that has 4 channels.  RGB is
+     taken from this GImage and the alpha from the red
+     channel of the supplied image. The new GImage is passed
+     as a reference parameter for speed.
+     */ 
+    void insertRedAsAlpha(const GImage& alpha, GImage& output) const;
+
+    /**
+     Returns a new GImage with 3 channels, removing
+     the alpha channel if there is one. The new GImage
+     is passed as a reference parameter for speed.
+     */
+    void stripAlpha(GImage& output) const;
+
+     /**
+      Loads an image from disk (clearing the old one first),
+      using the existing memory manager.
+      */
+    void load(
+        const std::string&  filename,
+        Format              format = AUTODETECT);
+
+    /**
+     Frees memory and resets to a 0x0 image.
+     */
+    void clear();
+        
+    /**
+     Deallocates the pixels.
+     */
+    virtual ~GImage();
+
+    /**
+     Resizes the internal buffer to (\a width x \a height) with the
+     number of \a channels specified.  
+     
+     \param zero If true, all data is set to 0 (black).
+     */
+    void resize(int width, int height, int channels, bool zero = true);
+
+    /**
+     Copies src sub-image data into dest at a certain offset.  
+     The dest variable must already contain an image that is large
+     enough to contain the src sub-image at the specified offset.
+     Returns true on success and false if the src sub-image cannot
+     completely fit within dest at the specified offset.  Both
+     src and dest must have the same number of channels.
+     */
+    static bool pasteSubImage(
+        GImage& dest, 
+        const GImage& src,
+        int destX, 
+        int destY, 
+        int srcX, 
+        int srcY, 
+        int srcWidth,
+        int srcHeight);
+
+    /**
+     creates dest from src sub-image data.  
+     Returns true on success and false if the src sub-image
+     is not within src.
+     */
+    static bool copySubImage(GImage & dest, const GImage & src,
+        int srcX, int srcY, int srcWidth, int srcHeight);
+
+    void convertToRGBA();
+
+    void convertToRGB();
+
+    /** Averages color channels if they exist */
+    void convertToL8();
+
+    /**
+      Returns true if format is supported.  Format
+      should be an extension string (e.g. "BMP").
+     */
+    static bool supportedFormat(
+        const std::string& format);
+
+    /**
+     Converts a string to an enum, returns UNKNOWN if not recognized.
+     */
+    static Format stringToFormat(
+        const std::string& format);
+
+    /**
+     Encode and save to disk.
+     */
+    void save(
+        const std::string& filename,
+        Format             format = AUTODETECT) const;
+   
+    /**
+     The caller must delete the returned buffer.
+     TODO: provide a memory manager
+     */
+    void encode(
+        Format              format,
+        uint8*&             outData,
+        int&                outLength) const;
+
+    /**
+     Does not commit the BinaryOutput when done.
+     */
+    void encode(
+        Format              format,
+        BinaryOutput&       out) const;
+
+    /**
+     Decodes the buffer into this image.
+     @param format Must be the correct format.
+     */
+    void decode(
+        BinaryInput&        input,
+        Format              format);
+
+    /** Returns the size of this object in bytes */
+    int sizeInMemory() const;
+
+    /** Ok for in == out */
+    static void R8G8B8_to_Y8U8V8(int width, int height, const uint8* in, uint8* out);
+
+    /** Ok for in == out */
+    static void Y8U8V8_to_R8G8B8(int width, int height, const uint8* in, uint8* out);
+
+    /**
+    @param in        RGB buffer of numPixels * 3 bytes
+    @param out       Buffer of numPixels * 4 bytes
+    @param numPixels Number of RGB pixels to convert
+    */
+    static void RGBtoRGBA(
+        const uint8*            in,
+        uint8*                  out,
+        int                     numPixels);
+
+    static void RGBtoARGB(
+        const uint8*            in,
+        uint8*                  out,
+        int                     numPixels);
+
+    static void LtoRGB
+    (const uint8*            in,
+     uint8*                  out,
+     int                     numPixels);
+
+    static void LtoRGBA
+    (const uint8*            in,
+     uint8*                  out,
+     int                     numPixels);
+    
+    /** Safe for in == out */
+    static void RGBtoBGR(
+        const uint8*            in,
+        uint8*                  out,
+        int                     numPixels);
+
+    /**
+    Win32 32-bit HDC format.
+    */
+    static void RGBtoBGRA(
+        const uint8*            in,
+        uint8*                  out,
+        int                     numPixels);
+
+    static void RGBAtoRGB(
+        const uint8*            in,
+        uint8*                  out,
+        int                     numPixels);
+    /**
+    Uses the red channel of the second image as an alpha channel.
+    */
+    static void RGBxRGBtoRGBA(
+        const uint8*            colorRGB,
+        const uint8*            alphaRGB,
+        uint8*                  out,
+        int                     numPixels);
+        
+    /**
+    Flips the image along the vertical axis.
+    Safe for in == out.
+    */
+    static void flipRGBVertical(
+        const uint8*            in,
+        uint8*                  out,
+        int                     width,
+        int                     height);
+
+    static void flipRGBAVertical(
+        const uint8*            in,
+        uint8*                  out,
+        int                     width,
+        int                     height);
+
+    /**
+    Given a tangent space bump map, computes a new image where the
+    RGB channels are a tangent space normal map and the alpha channel
+    is the original bump map.  Assumes the input image is tileable.
+
+    In the resulting image, x = red = tangent, y = green = binormal, and z = blue = normal. 
+
+    Particularly useful as part of the idiom:
+    
+ 	    GImage normal;
+	    computeNormalMap(GImage(filename), normal);
+	    return Texture::fromGImage(filename, normal);
+    

+
+      */
+    static void computeNormalMap(
+        const class GImage& bump, 
+        class GImage& normal,
+        const BumpMapPreprocess& preprocess = BumpMapPreprocess());
+
+    static void computeNormalMap
+       (int                 width,
+        int                 height,
+        int                 channels,
+        const uint8*        src,
+        GImage&             normal,
+        const BumpMapPreprocess& preprocess = BumpMapPreprocess());
+
+    /**
+    Bayer demosaicing using the filter proposed in 
+
+    HIGH-QUALITY LINEAR INTERPOLATION FOR DEMOSAICING OF BAYER-PATTERNED COLOR IMAGES
+    Henrique S. Malvar, Li-wei He, and Ross Cutler
+
+    The filter wraps at the image boundaries.
+
+    Assumes in != out.
+    */
+    static void BAYER_G8B8_R8G8_to_R8G8B8_MHC(int w, int h, const uint8* in, uint8* _out);
+    static void BAYER_G8R8_B8G8_to_R8G8B8_MHC(int w, int h, const uint8* in, uint8* _out);
+    static void BAYER_R8G8_G8B8_to_R8G8B8_MHC(int w, int h, const uint8* in, uint8* _out);
+    static void BAYER_B8G8_G8R8_to_R8G8B8_MHC(int w, int h, const uint8* in, uint8* _out);
+
+    /** Fast conversion; the output has 1/2 the size of the input in each direction. Assumes in != out.
+    See G3D::BAYER_G8B8_R8G8_to_R8G8B8_MHC for a much better result. */
+    static void BAYER_G8B8_R8G8_to_Quarter_R8G8B8
+       (int inWidth,
+        int inHeight, 
+        const uint8* in, 
+        uint8* out);
+
+    /** Attempt to undo fast conversion of G3D::BAYER_G8B8_R8G8_to_Quarter_R8G8B8; 
+        the green channel will lose data. Assumes in != out 
+        The input should have size 3 * inWidth * inHeight.  The output should have size
+        2 * inWidth * 2 * inHeight.
+    */
+    static void Quarter_R8G8B8_to_BAYER_G8B8_R8G8
+       (int inWidth, 
+        int inHeight, 
+        const uint8* in, 
+        uint8* out);
+
+    /** Overwrites every pixel with one of the two colors in a checkerboard pattern.
+        The fields used from the two colors depend on the current number of channels in @a im. 
+        */
+    static void makeCheckerboard
+       (GImage& im, 
+        int checkerSize = 1, 
+        const Color4uint8& color1 = Color4uint8(255,255,255,255), 
+        const Color4uint8& color2 = Color4uint8(0,0,0,255));
+};
+
+}
+
+#endif
diff --git a/externals/g3dlite/G3D/GLight.h b/externals/g3dlite/G3D/GLight.h
new file mode 100644
index 00000000000..3a95f1a8114
--- /dev/null
+++ b/externals/g3dlite/G3D/GLight.h
@@ -0,0 +1,106 @@
+/**
+  @file GLight.h
+
+  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+
+  @created 2003-11-12
+  @edited  2009-11-08
+*/
+
+#ifndef G3D_GLight_h
+#define G3D_GLight_h
+
+#include "G3D/platform.h"
+#include "G3D/Vector4.h"
+#include "G3D/Vector3.h"
+#include "G3D/Color4.h"
+
+namespace G3D {
+class Any;
+
+/**
+ A light representation that closely follows the OpenGL light format.
+ */
+class GLight  {
+public:
+    /** World space position (for a directional light, w = 0 */
+    Vector4             position;
+
+    /** For a spot or directional light, this is the "right vector" that will be used when constructing
+        a reference frame(). */
+    Vector3             rightDirection;
+
+    /** Direction in which the light faces, if a spot light.  This is the "look vector" of the light source. */
+    Vector3             spotDirection;
+
+    /** In degrees.  180 = no cutoff (point/dir).  Values less than 90 = spot light */
+    float               spotCutoff;
+
+    /** If true, G3D::SuperShader will render a cone of light large
+        enough to encompass the entire square that bounds the cutoff
+        angle. This produces a square prism instead of a cone of light
+        when used with a G3D::ShadowMap.  for an unshadowed light this
+        has no effect.*/
+    bool                spotSquare;
+
+    /** Constant, linear, quadratic */
+    float               attenuation[3];
+
+    /** May be outside the range [0, 1] */
+    Color3              color;
+
+    /** If false, this light is ignored */
+    bool                enabled;
+
+    /** If false, this light does not create specular highlights
+        (useful when using negative lights). */
+    bool                specular;
+
+    /** If false, this light does not create diffuse illumination
+        (useful when rendering a specular-only pass). */
+    bool                diffuse;
+
+    GLight();
+   
+    /** Accepted forms:
+        - GLight::directional( vector3, color3, [bool, [bool]])
+        - GLight::spot(vector3, vector3, #, color3, [#, [#, [#, [#, [bool, [bool]]]])
+        - GLight::point(vector3, color3, [#, [#, [#, [#, [bool, [bool]]]])
+        - GLight { [all fields] }
+    */
+    GLight(const Any& any);
+    
+    /** Converts the Color3 to an Any. */
+    operator Any() const;
+
+    /** @param toLight will be normalized */
+    static GLight directional(const Vector3& toLight, const Color3& color, bool specular = true, bool diffuse = true);
+
+    static GLight point(const Vector3& pos, const Color3& color, float constAtt = 1, float linAtt = 0, float quadAtt = 0.5f, bool specular = true, bool diffuse = true);
+
+    /** @param pointDirection Will be normalized.  Points in the
+        direction that light propagates.
+
+        @param cutOffAngleDegrees Must be on the range [0, 90]. This
+        is the angle from the point direction to the edge of the light
+        cone.  I.e., a value of 45 produces a light with a 90-degree 
+        cone of view.
+    */
+    static GLight spot(const Vector3& pos, const Vector3& pointDirection, float cutOffAngleDegrees, 
+                       const Color3& color, float constAtt = 1, float linAtt = 0, float quadAtt = 0,
+                       bool specular = true, bool diffuse = true);
+
+    /** Returns the sphere within which this light has some noticable effect.  May be infinite.
+        @param cutoff The value at which the light intensity is considered negligible. */
+    class Sphere effectSphere(float cutoff = 30.0f / 255) const;
+
+    /** Computes a reference frame (e.g., for use with G3D::ShadowMap */
+    class CoordinateFrame frame() const;
+
+    bool operator==(const GLight& other) const;
+    bool operator!=(const GLight& other) const;
+};
+
+} // namespace
+#endif
+
diff --git a/externals/g3dlite/G3D/GMutex.h b/externals/g3dlite/G3D/GMutex.h
new file mode 100644
index 00000000000..3469b812736
--- /dev/null
+++ b/externals/g3dlite/G3D/GMutex.h
@@ -0,0 +1,123 @@
+/** 
+  @file GMutex.h
+   
+  @created 2005-09-22
+  @edited  2009-03-25
+ */
+
+#ifndef G3D_GMutex_h
+#define G3D_GMutex_h
+
+#include "G3D/platform.h"
+#include "G3D/AtomicInt32.h"
+#include "G3D/debugAssert.h"
+#include 
+
+#ifndef G3D_WIN32
+#   include 
+#   include 
+#endif
+
+
+namespace G3D {
+
+/**
+   \brief A mutual exclusion lock that busy-waits when locking.
+
+   On a machine with one (significant) thread per processor core,
+   a spinlock may be substantially faster than a mutex.
+
+   \sa G3D::GThread, G3D::GMutex, G3D::AtomicInt32
+ */
+class Spinlock {
+private:
+
+    AtomicInt32   x;
+
+public:
+
+    inline Spinlock() : x(0) {}
+
+    /** Busy waits until the lock is unlocked, then locks it
+        exclusively.  Returns true if the lock succeeded on the first
+        try (indicating no contention). */
+    inline bool lock() {
+        bool first = true;
+        while (x.compareAndSet(0, 1) == 1) {
+            first = false;
+#           ifdef G3D_WIN32
+                Sleep(0);
+#           else
+                usleep(0);
+#           endif
+        }
+        return first;
+    }
+
+    inline void unlock() {
+        x.compareAndSet(1, 0);
+    }
+
+};
+
+/**
+ \brief Mutual exclusion lock used for synchronization.
+
+ @sa G3D::GThread, G3D::AtomicInt32, G3D::Spinlock
+*/
+class GMutex {
+private:
+#   ifdef G3D_WIN32
+    CRITICAL_SECTION                    m_handle;
+#   else
+    pthread_mutex_t                     m_handle;
+    pthread_mutexattr_t                 m_attr;
+#   endif
+
+    // Not implemented on purpose, don't use
+    GMutex(const GMutex &mlock);
+    GMutex &operator=(const GMutex &);
+    bool operator==(const GMutex&);
+
+public:
+    GMutex();
+    ~GMutex();
+
+    /** Locks the mutex or blocks until available. */
+    void lock();
+
+    /** Locks the mutex if it not already locked.
+        Returns true if lock successful, false otherwise. */
+    bool tryLock();
+
+    /** Unlocks the mutex. */
+    void unlock();
+};
+
+
+/**
+    Automatically locks while in scope.
+*/
+class GMutexLock {
+private:
+    GMutex* m;
+
+    // Not implemented on purpose, don't use
+    GMutexLock(const GMutexLock &mlock);
+    GMutexLock &operator=(const GMutexLock &);
+    bool operator==(const GMutexLock&);
+
+public:
+    GMutexLock(GMutex* mutex) {
+        m = mutex;
+        m->lock();
+    }
+
+    ~GMutexLock() {
+        m->unlock();
+    }
+};
+
+} // G3D
+
+#endif
diff --git a/externals/g3dlite/G3D/GThread.h b/externals/g3dlite/G3D/GThread.h
new file mode 100644
index 00000000000..58437efc3fb
--- /dev/null
+++ b/externals/g3dlite/G3D/GThread.h
@@ -0,0 +1,121 @@
+/** 
+  @file GThread.h
+ 
+  @created 2005-09-22
+  @edited  2007-01-31
+
+ */
+
+#ifndef G3D_GTHREAD_H
+#define G3D_GTHREAD_H
+
+#include "G3D/platform.h"
+#include "G3D/ReferenceCount.h"
+#include 
+
+#ifndef G3D_WIN32
+#   include 
+#   include 
+#endif
+
+
+namespace G3D {
+        
+typedef ReferenceCountedPointer GThreadRef;
+
+/**
+ Platform independent thread implementation.  You can either subclass and 
+ override GThread::threadMain or call the create method with a method.
+
+ Beware of reference counting and threads.  If circular references exist between
+ GThread subclasses then neither class will ever be deallocated.  Also, 
+ dropping all pointers (and causing deallocation) of a GThread does NOT 
+ stop the underlying process.
+
+ @sa G3D::GMutex, G3D::Spinlock, G3D::AtomicInt32
+*/
+class GThread : public ReferenceCountedObject {
+private:
+    // "Status" is a reserved work on FreeBSD
+    enum GStatus {STATUS_CREATED, STATUS_STARTED, STATUS_RUNNING, STATUS_COMPLETED};
+
+    // Not implemented on purpose, don't use
+    GThread(const GThread &);
+    GThread& operator=(const GThread&);
+    bool operator==(const GThread&);
+
+#ifdef G3D_WIN32
+    static DWORD WINAPI internalThreadProc(LPVOID param);
+#else
+    static void* internalThreadProc(void* param);
+#endif //G3D_WIN32
+
+    volatile GStatus     m_status;
+
+    // Thread handle to hold HANDLE and pthread_t
+#ifdef G3D_WIN32
+    HANDLE              m_handle;
+    HANDLE              m_event;
+#else
+    pthread_t           m_handle;
+#endif //G3D_WIN32
+
+    std::string         m_name;
+
+protected:
+
+    /** Overriden by the thread implementor */
+    virtual void threadMain() = 0;
+
+public:
+    typedef ReferenceCountedPointer Ref;
+    enum SpawnBehavior {USE_NEW_THREAD, USE_CURRENT_THREAD};
+
+    GThread(const std::string& name);
+
+    virtual ~GThread();
+
+    /** Constructs a basic GThread without requiring a subclass.
+
+        @param proc The global or static function for the threadMain() */
+    static GThreadRef create(const std::string& name, void (*proc)(void*), void* param = NULL);
+
+    /** Starts the thread and executes threadMain().  Returns false if
+       the thread failed to start (either because it was already started
+       or because the OS refused).
+       
+       @param behavior If USE_CURRENT_THREAD, rather than spawning a new thread, this routine
+       runs threadMain on the current thread.
+       */
+    bool start(SpawnBehavior behavior = USE_NEW_THREAD);
+
+    /** Terminates the thread without notifying or
+        waiting for a cancelation point. */
+    void terminate();
+
+    /**
+        Returns true if threadMain is currently executing.  This will
+        only be set when the thread is actually running and might not
+        be set when start() returns. */
+    bool running() const;
+
+    /** True after start() has been called, even through the thread
+        may have already completed(), or be currently running().*/
+    bool started() const;
+
+    /** Returns true if the thread has exited. */
+    bool completed() const;
+
+    /** Waits for the thread to finish executing. */
+    void waitForCompletion();
+
+    /** Returns thread name */
+    inline const std::string& name() {
+        return m_name;
+    }
+};
+
+
+} // namespace G3D
+
+#endif //G3D_GTHREAD_H
diff --git a/externals/g3dlite/G3D/GUniqueID.h b/externals/g3dlite/G3D/GUniqueID.h
new file mode 100644
index 00000000000..c8b775c2e66
--- /dev/null
+++ b/externals/g3dlite/G3D/GUniqueID.h
@@ -0,0 +1,69 @@
+/**
+  @file GUniqueID.h
+  @author Morgan McGuire, http://graphics.cs.williams.edu
+ */
+#ifndef G3D_GUNIQUEID_H
+#define G3D_GUNIQUEID_H
+
+#include "G3D/platform.h"
+#include "G3D/g3dmath.h"
+#include "G3D/Table.h"
+
+namespace G3D {
+
+/** Globally unique identifiers. The probability of two different
+    programs generating the same value from UniqueID::create is
+    vanishingly small.
+    
+    UniqueIDs optionally contain a 10-bit application specific tag
+    that distinguishes their type.
+*/
+class GUniqueID {
+private:
+
+    uint64 id;
+
+public:
+
+    GUniqueID() : id(0) {}
+
+    bool uninitialized() const {
+        return id == 0;
+    }
+
+    uint16 tag() const {
+        return id >> 54;
+    }
+
+    operator uint64() const {
+        return id;
+    }
+
+    bool operator==(const GUniqueID& other) const {
+        return id == other.id;
+    }
+
+    bool operator!=(const GUniqueID& other) const {
+        return id != other.id;
+    }
+
+    void serialize(class BinaryOutput& b) const;
+
+    void deserialize(class BinaryInput& b);
+
+    void serialize(class TextOutput& t) const;
+
+    void deserialize(class TextInput& t);
+
+    /** Create a new ID */
+    static GUniqueID create(uint16 tag = 0);
+};
+
+} // G3D 
+
+/** For Table and Set */
+template<> struct HashTrait {
+    static size_t hashCode(G3D::GUniqueID id) { return (size_t)(G3D::uint64)id; }
+};
+
+#endif
diff --git a/externals/g3dlite/G3D/HashTrait.h b/externals/g3dlite/G3D/HashTrait.h
new file mode 100644
index 00000000000..ca35da48643
--- /dev/null
+++ b/externals/g3dlite/G3D/HashTrait.h
@@ -0,0 +1,92 @@
+/**
+  @file HashTrait.h
+
+  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+  @created 2008-10-01
+  @edited  2009-11-01
+
+  Copyright 2000-2009, Morgan McGuire.
+  All rights reserved.
+ */
+
+#ifndef G3D_HashTrait_h
+#define G3D_HashTrait_h
+
+#include "G3D/platform.h"
+#include "G3D/Crypto.h"
+#include "G3D/g3dmath.h"
+#include "G3D/uint128.h"
+
+/** Must be specialized for custom types.
+    @see G3D::Table for specialization requirements.
+*/
+template  struct HashTrait{};
+
+template  struct HashTrait {
+    static size_t hashCode(const void* k) { return reinterpret_cast(k); }
+};
+
+#if 0
+template <> struct HashTrait  {
+    static size_t hashCode(int k) { return static_cast(k); }
+};
+#endif
+
+template <> struct HashTrait  {
+    static size_t hashCode(G3D::int16 k) { return static_cast(k); }
+};
+
+template <> struct HashTrait  {
+    static size_t hashCode(G3D::uint16 k) { return static_cast(k); }
+};
+
+//template <> struct HashTrait  {
+//    static size_t hashCode(int k) { return static_cast(k); }
+//};
+
+template <> struct HashTrait  {
+    static size_t hashCode(G3D::int32 k) { return static_cast(k); }
+};
+
+template <> struct HashTrait  {
+    static size_t hashCode(G3D::uint32 k) { return static_cast(k); }
+};
+
+#if 0
+template <> struct HashTrait  {
+    static size_t hashCode(G3D::uint32 k) { return static_cast(k); }
+};
+#endif
+
+template <> struct HashTrait  {
+    static size_t hashCode(G3D::int64 k) { return static_cast(k); }
+};
+
+template <> struct HashTrait  {
+    static size_t hashCode(G3D::uint64 k) { return static_cast(k); }
+};
+
+template <> struct HashTrait  {
+    static size_t hashCode(const std::string& k) { return static_cast(G3D::Crypto::crc32(k.c_str(), k.size())); }
+};
+
+template <> struct HashTrait {
+    // Use the FNV-1 hash (http://isthe.com/chongo/tech/comp/fnv/#FNV-1).
+    static size_t hashCode(G3D::uint128 key) {
+        static const G3D::uint128 FNV_PRIME_128(1 << 24, 0x159);
+        static const G3D::uint128 FNV_OFFSET_128(0xCF470AAC6CB293D2ULL, 0xF52F88BF32307F8FULL);
+
+        G3D::uint128 hash = FNV_OFFSET_128;
+        G3D::uint128 mask(0, 0xFF);
+        for (int i = 0; i < 16; ++i) {
+            hash *= FNV_PRIME_128;
+            hash ^= (mask & key);
+            key >>= 8;
+        }
+	
+        G3D::uint64 foldedHash = hash.hi ^ hash.lo;
+        return static_cast((foldedHash >> 32) ^ (foldedHash & 0xFFFFFFFF));
+    }
+};
+
+#endif
diff --git a/externals/g3dlite/G3D/Image1.h b/externals/g3dlite/G3D/Image1.h
new file mode 100644
index 00000000000..711e83f2079
--- /dev/null
+++ b/externals/g3dlite/G3D/Image1.h
@@ -0,0 +1,81 @@
+/**
+  @file Image1.h
+
+  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+
+  @created 2007-01-31
+  @edited  2007-01-31
+*/
+
+
+#ifndef G3D_IMAGE1_H
+#define G3D_IMAGE1_H
+
+#include "G3D/platform.h"
+#include "G3D/Map2D.h"
+#include "G3D/Color1.h"
+#include "G3D/GImage.h"
+
+namespace G3D {
+
+typedef ReferenceCountedPointer Image1Ref;
+
+/**
+ Luminance image with 32-bit floating point storage.
+
+ See also G3D::Image1uint8, G3D::GImage.
+ */
+class Image1 : public Map2D {
+public:
+
+    typedef Image1      Type;
+    typedef ReferenceCountedPointer   Ref;
+    typedef Color1      Storage;
+    typedef Color1      Compute;
+
+protected:
+
+    Image1(int w, int h, WrapMode wrap);
+
+    void copyGImage(const class GImage& im);
+    void copyArray(const Color1* src, int w, int h);
+    void copyArray(const Color3* src, int w, int h);
+    void copyArray(const Color4* src, int w, int h);
+    void copyArray(const Color1uint8* src, int w, int h);
+    void copyArray(const Color3uint8* src, int w, int h);
+    void copyArray(const Color4uint8* src, int w, int h);
+
+public:
+
+    const class ImageFormat* format() const;
+
+    /** Creates an all-zero width x height image. */
+    static Ref createEmpty(int width, int height, WrapMode wrap = WrapMode::ERROR);
+
+    /** Creates a 0 x 0 image. */
+    static Ref createEmpty(WrapMode wrap = WrapMode::ERROR);
+
+    static Ref fromFile(const std::string& filename, WrapMode wrap = WrapMode::ERROR, GImage::Format fmt = GImage::AUTODETECT);
+    
+    static Ref fromArray(const class Color1uint8* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR);
+    static Ref fromArray(const class Color3uint8* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR);
+    static Ref fromArray(const class Color4uint8* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR);
+    static Ref fromArray(const class Color1* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR);
+    static Ref fromArray(const class Color3* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR);
+    static Ref fromArray(const class Color4* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR);
+
+    static Ref fromImage1uint8(const ReferenceCountedPointer& im);
+
+    static Ref fromGImage(const class GImage& im, WrapMode wrap = WrapMode::ERROR);
+
+    /** Loads from any of the file formats supported by G3D::GImage.  If there is an alpha channel on the input,
+        it is stripped. */
+    void load(const std::string& filename, GImage::Format fmt = GImage::AUTODETECT);
+
+    /** Saves in any of the formats supported by G3D::GImage. */
+    void save(const std::string& filename, GImage::Format fmt = GImage::AUTODETECT);
+};
+
+} // G3D
+
+#endif
diff --git a/externals/g3dlite/G3D/Image1uint8.h b/externals/g3dlite/G3D/Image1uint8.h
new file mode 100644
index 00000000000..f32e022e92a
--- /dev/null
+++ b/externals/g3dlite/G3D/Image1uint8.h
@@ -0,0 +1,80 @@
+/**
+  @file Image1uint8.h
+
+  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+
+  @created 2007-01-31
+  @edited  2007-01-31
+*/
+
+#ifndef G3D_IMAGE1UINT8_H
+#define G3D_IMAGE1UINT8_H
+
+#include "G3D/platform.h"
+#include "G3D/Map2D.h"
+#include "G3D/Color1uint8.h"
+#include "G3D/Color1.h"
+#include "G3D/GImage.h"
+
+namespace G3D {
+
+typedef ReferenceCountedPointer Image1uint8Ref;
+
+/**
+ Compact storage for luminance 8-bit images.
+
+ See also G3D::Image3, G3D::GImage
+ */
+class Image1uint8 : public Map2D {
+public:
+
+    typedef Image1uint8      Type;
+    typedef Image1uint8Ref   Ref;
+
+protected:
+
+    Image1uint8(int w, int h, WrapMode wrap);
+
+    void copyGImage(const class GImage& im);
+    void copyArray(const Color1* src, int w, int h);
+    void copyArray(const Color3* src, int w, int h);
+    void copyArray(const Color4* src, int w, int h);
+    void copyArray(const Color1uint8* src, int w, int h);
+    void copyArray(const Color3uint8* src, int w, int h);
+    void copyArray(const Color4uint8* src, int w, int h);
+
+public:
+
+    const class ImageFormat* format() const;
+
+    /** Creates an all-zero width x height image. */
+    static Ref createEmpty(int width, int height, WrapMode wrap = WrapMode::ERROR);
+
+    /** Creates a 0 x 0 image. */
+    static Ref createEmpty(WrapMode wrap = WrapMode::ERROR);
+
+    static Ref fromFile(const std::string& filename, WrapMode wrap = WrapMode::ERROR, GImage::Format fmt = GImage::AUTODETECT);
+
+    static Ref fromGImage(const class GImage& im, WrapMode wrap = WrapMode::ERROR);
+
+    static Ref fromArray(const class Color1uint8* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR);
+    static Ref fromArray(const class Color3uint8* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR);
+    static Ref fromArray(const class Color4uint8* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR);
+    static Ref fromArray(const class Color1* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR);
+    static Ref fromArray(const class Color3* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR);
+    static Ref fromArray(const class Color4* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR);
+
+    static Ref fromImage1(const ReferenceCountedPointer& im);
+    static Ref fromImage3uint8(const ReferenceCountedPointer& im);
+
+    /** Loads from any of the file formats supported by G3D::GImage.  If there is an alpha channel on the input,
+        it is stripped. */
+    void load(const std::string& filename, GImage::Format fmt = GImage::AUTODETECT);
+
+    /** Saves in any of the formats supported by G3D::GImage. */
+    void save(const std::string& filename, GImage::Format fmt = GImage::AUTODETECT);
+};
+
+} // G3D
+
+#endif
diff --git a/externals/g3dlite/G3D/Image3.h b/externals/g3dlite/G3D/Image3.h
new file mode 100644
index 00000000000..13cb8fa7faf
--- /dev/null
+++ b/externals/g3dlite/G3D/Image3.h
@@ -0,0 +1,81 @@
+/**
+  @file Image3.h
+
+  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+
+  @created 2007-01-31
+  @edited  2007-01-31
+*/
+
+
+#ifndef G3D_IMAGE3_H
+#define G3D_IMAGE3_H
+
+#include "G3D/platform.h"
+#include "G3D/Map2D.h"
+#include "G3D/Color3.h"
+#include "G3D/GImage.h"
+
+namespace G3D {
+
+typedef ReferenceCountedPointer Image3Ref;
+
+/**
+ RGB image with 32-bit floating point storage for each channel.
+
+ See also G3D::Image3uint8, G3D::GImage.
+ */
+class Image3 : public Map2D {
+public:
+
+    typedef Image3      Type;
+    typedef ReferenceCountedPointer   Ref;
+    typedef Color3      Storage;
+    typedef Color3      Compute;
+
+protected:
+
+    Image3(int w, int h, WrapMode wrap);
+
+    void copyGImage(const class GImage& im);
+    void copyArray(const Color1* src, int w, int h);
+    void copyArray(const Color3* src, int w, int h);
+    void copyArray(const Color4* src, int w, int h);
+    void copyArray(const Color1uint8* src, int w, int h);
+    void copyArray(const Color3uint8* src, int w, int h);
+    void copyArray(const Color4uint8* src, int w, int h);
+
+public:
+
+    const class ImageFormat* format() const;
+
+    /** Creates an all-zero width x height image. */
+    static Ref createEmpty(int width, int height, WrapMode wrap = WrapMode::ERROR);
+
+    /** Creates a 0 x 0 image. */
+    static Ref createEmpty(WrapMode wrap = WrapMode::ERROR);
+
+    static Ref fromFile(const std::string& filename, WrapMode wrap = WrapMode::ERROR, GImage::Format fmt = GImage::AUTODETECT);
+    
+	static Ref fromArray(const class Color1uint8* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR);
+    static Ref fromArray(const class Color3uint8* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR);
+    static Ref fromArray(const class Color4uint8* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR);
+    static Ref fromArray(const class Color1* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR);
+    static Ref fromArray(const class Color3* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR);
+    static Ref fromArray(const class Color4* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR);
+
+    static Ref fromImage3uint8(const ReferenceCountedPointer& im);
+
+    static Ref fromGImage(const class GImage& im, WrapMode wrap = WrapMode::ERROR);
+
+    /** Loads from any of the file formats supported by G3D::GImage.  If there is an alpha channel on the input,
+        it is stripped. */
+    void load(const std::string& filename, GImage::Format fmt = GImage::AUTODETECT);
+
+    /** Saves in any of the formats supported by G3D::GImage. */
+    void save(const std::string& filename, GImage::Format fmt = GImage::AUTODETECT);
+};
+
+} // G3D
+
+#endif
diff --git a/externals/g3dlite/G3D/Image3uint8.h b/externals/g3dlite/G3D/Image3uint8.h
new file mode 100644
index 00000000000..d4fdbc169ca
--- /dev/null
+++ b/externals/g3dlite/G3D/Image3uint8.h
@@ -0,0 +1,85 @@
+/**
+  @file Image3uint8.h
+
+  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+
+  @created 2007-01-31
+  @edited  2007-01-31
+*/
+
+#ifndef G3D_IMAGE3UINT8_H
+#define G3D_IMAGE3UINT8_H
+
+#include "G3D/platform.h"
+#include "G3D/Map2D.h"
+#include "G3D/Color3uint8.h"
+#include "G3D/Color3.h"
+#include "G3D/GImage.h"
+
+namespace G3D {
+
+typedef ReferenceCountedPointer Image3uint8Ref;
+
+/**
+ Compact storage for RGB 8-bit per channel images.
+
+ See also G3D::Image3, G3D::GImage
+ */
+class Image3uint8 : public Map2D {
+public:
+
+    typedef Image3uint8      Type;
+    typedef Image3uint8Ref   Ref;
+
+protected:
+
+    Image3uint8(int w, int h, WrapMode wrap);
+
+    void copyGImage(const class GImage& im);
+    void copyArray(const Color1* src, int w, int h);
+    void copyArray(const Color3* src, int w, int h);
+    void copyArray(const Color4* src, int w, int h);
+    void copyArray(const Color1uint8* src, int w, int h);
+    void copyArray(const Color3uint8* src, int w, int h);
+    void copyArray(const Color4uint8* src, int w, int h);
+
+public:
+
+    const class ImageFormat* format() const;
+
+    /** Creates an all-zero width x height image. */
+    static Ref createEmpty(int width, int height, WrapMode wrap = WrapMode::ERROR);
+
+
+    /** Creates a 0 x 0 image. */
+    static Ref createEmpty(WrapMode wrap = WrapMode::ERROR);
+
+
+    static Ref fromFile(const std::string& filename, WrapMode wrap = WrapMode::ERROR, GImage::Format fmt = GImage::AUTODETECT);
+
+    static Ref fromGImage(const class GImage& im, WrapMode wrap = WrapMode::ERROR);
+
+    static Ref fromArray(const class Color1uint8* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR);
+    static Ref fromArray(const class Color3uint8* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR);
+    static Ref fromArray(const class Color4uint8* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR);
+    static Ref fromArray(const class Color1* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR);
+    static Ref fromArray(const class Color3* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR);
+    static Ref fromArray(const class Color4* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR);
+
+    static Ref fromImage3(const ReferenceCountedPointer& im);
+    static Ref fromImage1uint8(const ReferenceCountedPointer& im);
+
+    /** Loads from any of the file formats supported by G3D::GImage.  If there is an alpha channel on the input,
+        it is stripped. */
+    void load(const std::string& filename, GImage::Format fmt = GImage::AUTODETECT);
+
+    /** Saves in any of the formats supported by G3D::GImage. */
+    void save(const std::string& filename, GImage::Format fmt = GImage::AUTODETECT);
+
+    /** Extracts color channel 0 <= c <= 2 and returns it as a new monochrome image. */
+    ReferenceCountedPointer getChannel(int c) const;
+};
+
+} // G3D
+
+#endif
diff --git a/externals/g3dlite/G3D/Image4.h b/externals/g3dlite/G3D/Image4.h
new file mode 100644
index 00000000000..21d7f1e79b1
--- /dev/null
+++ b/externals/g3dlite/G3D/Image4.h
@@ -0,0 +1,86 @@
+/**
+  @file Image4.h
+
+  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+
+  @created 2007-01-31
+  @edited  2007-01-31
+*/
+
+
+#ifndef G3D_IMAGE4_H
+#define G3D_IMAGE4_H
+
+#include "G3D/platform.h"
+#include "G3D/Map2D.h"
+#include "G3D/Color4.h"
+#include "G3D/GImage.h"
+
+namespace G3D {
+
+typedef ReferenceCountedPointer Image4Ref;
+
+/**
+ RGBA image with 32-bit floating point storage for each channel.
+
+ Whenever a method needs to convert from RGB to RGBA, A=1 is assumed.
+
+ Bilinear interpolation on Image4 is about 8x faster than on
+ Image4uint8 due to the large cost of converting int->float on modern
+ machines.
+
+ @sa G3D::Image4uint8, G3D::GImage.
+ */
+class Image4 : public Map2D {
+public:
+
+    typedef Image4      Type;
+    typedef ReferenceCountedPointer   Ref;
+    typedef Color4      Storage;
+    typedef Color4      Compute;
+
+protected:
+
+    Image4(int w, int h, WrapMode wrap);
+
+    void copyGImage(const class GImage& im);
+    void copyArray(const Color1* src, int w, int h);
+    void copyArray(const Color3* src, int w, int h);
+    void copyArray(const Color4* src, int w, int h);
+    void copyArray(const Color1uint8* src, int w, int h);
+    void copyArray(const Color3uint8* src, int w, int h);
+    void copyArray(const Color4uint8* src, int w, int h);
+
+public:
+
+    const class ImageFormat* format() const;
+
+    /** Creates an all-zero width x height image. */
+    static Ref createEmpty(int width, int height, WrapMode wrap = WrapMode::ERROR);
+
+    /** Creates a 0 x 0 image. */
+    static Ref createEmpty(WrapMode wrap = WrapMode::ERROR);
+
+    static Ref fromFile(const std::string& filename, WrapMode wrap = WrapMode::ERROR, GImage::Format fmt = GImage::AUTODETECT);
+    
+    static Ref fromArray(const class Color1uint8* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR);
+    static Ref fromArray(const class Color3uint8* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR);
+    static Ref fromArray(const class Color4uint8* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR);
+    static Ref fromArray(const class Color1* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR);
+    static Ref fromArray(const class Color3* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR);
+    static Ref fromArray(const class Color4* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR);
+
+    static Ref fromImage4uint8(const ReferenceCountedPointer& im);
+
+    static Ref fromGImage(const class GImage& im, WrapMode wrap = WrapMode::ERROR);
+
+    /** Loads from any of the file formats supported by G3D::GImage. */
+    void load(const std::string& filename, GImage::Format fmt = GImage::AUTODETECT);
+
+    /** Saves in any of the formats supported by G3D::GImage. */
+    void save(const std::string& filename, GImage::Format fmt = GImage::AUTODETECT);
+};
+
+} // G3D
+
+#endif
diff --git a/externals/g3dlite/G3D/Image4uint8.h b/externals/g3dlite/G3D/Image4uint8.h
new file mode 100644
index 00000000000..46df6b490b4
--- /dev/null
+++ b/externals/g3dlite/G3D/Image4uint8.h
@@ -0,0 +1,85 @@
+/**
+  @file Image4uint8.h
+
+  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+
+  @created 2007-01-31
+  @edited  2007-01-31
+*/
+
+#ifndef G3D_IMAGE4UINT8_H
+#define G3D_IMAGE4UINT8_H
+
+#include "G3D/platform.h"
+#include "G3D/Map2D.h"
+#include "G3D/Color4uint8.h"
+#include "G3D/Color4.h"
+#include "G3D/GImage.h"
+#include "G3D/Image1uint8.h"
+
+namespace G3D {
+
+typedef ReferenceCountedPointer Image4uint8Ref;
+
+/**
+ Compact storage for RGBA 8-bit per channel images.
+
+ See also G3D::Image4, G3D::GImage
+ */
+class Image4uint8 : public Map2D {
+public:
+
+    typedef Image4uint8      Type;
+    typedef Image4uint8Ref   Ref;
+
+protected:
+
+    Image4uint8(int w, int h, WrapMode wrap);
+
+    void copyGImage(const class GImage& im);
+    void copyArray(const Color1* src, int w, int h);
+    void copyArray(const Color3* src, int w, int h);
+    void copyArray(const Color4* src, int w, int h);
+    void copyArray(const Color1uint8* src, int w, int h);
+    void copyArray(const Color3uint8* src, int w, int h);
+    void copyArray(const Color4uint8* src, int w, int h);
+
+public:
+
+    const class ImageFormat* format() const;
+
+    /** Creates an all-zero width x height image. */
+    static Ref createEmpty(int width, int height, WrapMode wrap = WrapMode::ERROR);
+
+
+    /** Creates a 0 x 0 image. */
+    static Ref createEmpty(WrapMode wrap = WrapMode::ERROR);
+
+
+    static Ref fromFile(const std::string& filename, WrapMode wrap = WrapMode::ERROR, GImage::Format fmt = GImage::AUTODETECT);
+
+    static Ref fromGImage(const class GImage& im, WrapMode wrap = WrapMode::ERROR);
+
+    static Ref fromArray(const class Color1uint8* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR);
+    static Ref fromArray(const class Color3uint8* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR);
+    static Ref fromArray(const class Color4uint8* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR);
+    static Ref fromArray(const class Color1* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR);
+    static Ref fromArray(const class Color3* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR);
+    static Ref fromArray(const class Color4* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR);
+
+    static Ref fromImage4(const ReferenceCountedPointer& im);
+
+    /** Loads from any of the file formats supported by G3D::GImage.  If there is an alpha channel on the input,
+        it is stripped. */
+    void load(const std::string& filename, GImage::Format fmt = GImage::AUTODETECT);
+
+    /** Saves in any of the formats supported by G3D::GImage. */
+    void save(const std::string& filename, GImage::Format fmt = GImage::AUTODETECT);
+
+    /** Extracts color channel 0 <= c <= 3 and returns it as a new monochrome image. */
+    ReferenceCountedPointer getChannel(int c) const;
+};
+
+} // G3D
+
+#endif
diff --git a/externals/g3dlite/G3D/ImageFormat.h b/externals/g3dlite/G3D/ImageFormat.h
new file mode 100644
index 00000000000..7f098322d26
--- /dev/null
+++ b/externals/g3dlite/G3D/ImageFormat.h
@@ -0,0 +1,419 @@
+/**
+  @file ImageFormat.h
+
+  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+
+  @created 2003-05-23
+  @edited  2010-01-01
+*/
+
+#ifndef GLG3D_ImageFormat_H
+#define GLG3D_ImageFormat_H
+
+#include "G3D/platform.h"
+#include "G3D/Table.h"
+#include "G3D/enumclass.h"
+
+namespace G3D {
+
+/** Information about common image formats.
+    Don't construct these; use the methods provided. 
+    
+    For most formats, the number indicates the number of bits per channel and a suffix of "F" indicates
+    floating point.  This does not hold for the YUV and DXT formats.*/
+class ImageFormat {
+public:
+
+    // Must update ImageFormat::name() when this enum changes.
+    enum Code {
+        CODE_NONE = -1,
+        CODE_L8,
+        CODE_L16,
+        CODE_L16F,
+        CODE_L32F,
+
+        CODE_A8,
+        CODE_A16,
+        CODE_A16F,
+        CODE_A32F,
+
+        CODE_LA4,
+        CODE_LA8,
+        CODE_LA16,
+        CODE_LA16F,
+        CODE_LA32F,
+
+        CODE_RGB5,
+        CODE_RGB5A1,
+        CODE_RGB8,
+        CODE_RGB10,
+        CODE_RGB10A2,
+        CODE_RGB16,
+        CODE_RGB16F,
+        CODE_RGB32F,
+        CODE_R11G11B10F,
+        CODE_RGB9E5F,
+
+        CODE_RGB8I,
+        CODE_RGB8UI,
+
+        CODE_ARGB8,
+        CODE_BGR8,
+
+        CODE_RG8,
+        CODE_RG8I,
+        CODE_RG8UI,
+
+        CODE_RGBA8,
+        CODE_RGBA16,
+        CODE_RGBA16F,
+        CODE_RGBA32F,
+
+        CODE_RGBA32UI,
+
+        CODE_BAYER_RGGB8,
+        CODE_BAYER_GRBG8,
+        CODE_BAYER_GBRG8,
+        CODE_BAYER_BGGR8,
+        CODE_BAYER_RGGB32F,
+        CODE_BAYER_GRBG32F,
+        CODE_BAYER_GBRG32F,
+        CODE_BAYER_BGGR32F,
+
+        CODE_HSV8,
+        CODE_HSV32F,
+
+        CODE_YUV420_PLANAR,
+        CODE_YUV422,
+        CODE_YUV444,
+
+        CODE_RGB_DXT1,
+        CODE_RGBA_DXT1,
+        CODE_RGBA_DXT3,
+        CODE_RGBA_DXT5,
+
+        CODE_SRGB8,
+        CODE_SRGBA8,
+
+        CODE_SL8,
+        CODE_SLA8,
+
+        CODE_SRGB_DXT1,
+        CODE_SRGBA_DXT1,
+        CODE_SRGBA_DXT3,
+        CODE_SRGBA_DXT5,
+
+        CODE_DEPTH16,
+        CODE_DEPTH24,
+        CODE_DEPTH32,
+        CODE_DEPTH32F,
+        
+        CODE_STENCIL1,
+        CODE_STENCIL4,
+        CODE_STENCIL8,
+        CODE_STENCIL16,
+
+        CODE_DEPTH24_STENCIL8,
+
+        CODE_NUM
+        };
+
+    enum ColorSpace {
+        COLOR_SPACE_NONE,
+        COLOR_SPACE_RGB,
+        COLOR_SPACE_HSV,
+        COLOR_SPACE_YUV,
+        COLOR_SPACE_SRGB
+    };
+
+    enum BayerPattern {
+        BAYER_PATTERN_NONE,
+        BAYER_PATTERN_RGGB,
+        BAYER_PATTERN_GRBG,
+        BAYER_PATTERN_GBRG,
+        BAYER_PATTERN_BGGR
+    };
+
+    /**  Number of channels (1 for a depth texture). */
+    int                 numComponents;
+    bool                compressed;
+
+    /** Useful for serializing. */
+    Code                code;
+
+    ColorSpace          colorSpace;
+
+    /** If this is a Bayer format, what is the pattern. */
+    BayerPattern        bayerPattern;
+
+    /** The OpenGL format equivalent to this one, e.g, GL_RGB8  Zero if there is no equivalent. This is actually a GLenum */
+    int                 openGLFormat;
+
+    /** The OpenGL base format equivalent to this one (e.g., GL_RGB, GL_ALPHA).  Zero if there is no equivalent.  */
+    int                 openGLBaseFormat;
+
+    int                 luminanceBits;
+
+    /** Number of bits per pixel storage for alpha values; Zero for compressed textures and non-RGB. */
+    int                 alphaBits;
+    
+    /** Number of bits per pixel storage for red values; Zero for compressed textures and non-RGB. */
+    int                 redBits;
+
+    /** Number of bits per pixel storage for green values; Zero for compressed textures and non-RGB. */
+    int                 greenBits;
+    
+    /** Number of bits per pixel storage for blue values; Zero for compressed textures  and non-RGB. */
+    int                 blueBits;
+
+    /** Number of bits per pixel */
+    int                 stencilBits;
+
+    /** Number of depth bits (for depth textures; e.g. shadow maps) */
+    int                 depthBits;
+
+    /** Amount of CPU memory per pixel when packed into an array, discounting any end-of-row padding. */
+    int                 cpuBitsPerPixel;
+
+    /** Amount of CPU memory per pixel when packed into an array, discounting any end-of-row padding. 
+     @deprecated Use cpuBitsPerPixel*/
+    int                 packedBitsPerTexel;
+    
+    /**
+      Amount of GPU memory per pixel on most graphics cards, for formats supported by OpenGL. This is
+      only an estimate--the actual amount of memory may be different on your actual card.
+
+     This may be greater than the sum of the per-channel bits
+     because graphics cards need to pad to the nearest 1, 2, or
+     4 bytes.
+     */
+    int                 openGLBitsPerPixel;
+
+    /** @deprecated Use openGLBitsPerPixel */
+    int                 hardwareBitsPerTexel;
+
+    /** The OpenGL bytes (type) format of the data buffer used with this texture format, e.g., GL_UNSIGNED_BYTE */
+    int                 openGLDataFormat;
+
+    /** True if there is no alpha channel for this texture. */
+    bool                opaque;
+
+    /** True if the bit depths specified are for float formats. */
+    bool                floatingPoint;
+
+    /** Human readable name of this format.*/
+    const std::string& name() const;
+
+    /** Takes the same values that name() returns */
+    static const ImageFormat* fromString(const std::string& s);
+
+private:
+
+    ImageFormat
+    (int             numComponents,
+     bool            compressed,
+     int             glFormat,
+     int             glBaseFormat,
+     int             luminanceBits,
+     int             alphaBits,
+     int             redBits,
+     int             greenBits,
+     int             blueBits,
+     int             depthBits,
+     int             stencilBits,
+     int             hardwareBitsPerTexel,
+     int             packedBitsPerTexel,
+     int             glDataFormat,
+     bool            opaque,
+     bool            floatingPoint,
+     Code            code,
+     ColorSpace      colorSpace,
+     BayerPattern    bayerPattern = BAYER_PATTERN_NONE);
+
+public:
+
+    static const ImageFormat* L8();
+
+    static const ImageFormat* L16();
+
+    static const ImageFormat* L16F();
+    
+    static const ImageFormat* L32F();
+
+    static const ImageFormat* A8();
+
+    static const ImageFormat* A16();
+
+    static const ImageFormat* A16F();
+    
+    static const ImageFormat* A32F();
+
+    static const ImageFormat* LA4();
+
+    static const ImageFormat* LA8();
+
+    static const ImageFormat* LA16();
+
+    static const ImageFormat* LA16F();
+    
+    static const ImageFormat* LA32F();
+
+    static const ImageFormat* BGR8();
+
+    static const ImageFormat* RG8();
+    static const ImageFormat* RG8I();
+    static const ImageFormat* RG8UI();
+
+    static const ImageFormat* RGB5();
+
+    static const ImageFormat* RGB5A1();
+
+    static const ImageFormat* RGB8();
+
+    static const ImageFormat* RGB10();
+
+    static const ImageFormat* RGB10A2();
+
+    static const ImageFormat* RGB16();
+
+    static const ImageFormat* RGB16F();
+
+    static const ImageFormat* RGB32F();
+
+    static const ImageFormat* RGBA8();
+
+    static const ImageFormat* RGBA16();
+
+    static const ImageFormat* RGBA16F();
+    
+    static const ImageFormat* RGBA32F();
+
+    static const ImageFormat* RGBA32UI();
+
+    static const ImageFormat* R11G11B10F();
+
+    static const ImageFormat* RGB9E5F();    
+
+    static const ImageFormat* RGB8I();    
+
+    static const ImageFormat* RGB8UI();    
+    
+    static const ImageFormat* RGB_DXT1();
+
+    static const ImageFormat* RGBA_DXT1();
+
+    static const ImageFormat* RGBA_DXT3();
+
+    static const ImageFormat* RGBA_DXT5();
+
+    static const ImageFormat* SRGB8();
+
+    static const ImageFormat* SRGBA8();
+
+    static const ImageFormat* SL8();
+
+    static const ImageFormat* SLA8();
+
+    static const ImageFormat* SRGB_DXT1();
+
+    static const ImageFormat* SRGBA_DXT1();
+
+    static const ImageFormat* SRGBA_DXT3();
+
+    static const ImageFormat* SRGBA_DXT5();
+
+    static const ImageFormat* DEPTH16();
+
+    static const ImageFormat* DEPTH24();
+
+    static const ImageFormat* DEPTH32();
+
+    static const ImageFormat* DEPTH32F();
+
+    static const ImageFormat* STENCIL1();
+
+    static const ImageFormat* STENCIL4();
+
+    static const ImageFormat* STENCIL8();
+
+    static const ImageFormat* STENCIL16();
+
+    static const ImageFormat* DEPTH24_STENCIL8();
+
+    static const ImageFormat* YUV420_PLANAR();
+
+    static const ImageFormat* YUV422();
+
+    static const ImageFormat* YUV444();
+
+	/**
+     NULL pointer; indicates that the G3D::Texture class should choose
+     either RGBA8 or RGB8 depending on the presence of an alpha channel
+     in the input.
+     */
+    static const ImageFormat* AUTO()  { return NULL; }
+
+    /** Returns DEPTH16, DEPTH24, or DEPTH32 according to the bits
+     specified. You can use "glGetInteger(GL_DEPTH_BITS)" to match 
+     the screen's format.*/
+    static const ImageFormat* depth(int depthBits = 24);
+
+    /** Returns STENCIL1, STENCIL4, STENCIL8 or STENCIL16 according to the bits
+      specified. You can use "glGetInteger(GL_STENCIL_BITS)" to match 
+     the screen's format.*/
+    static const ImageFormat* stencil(int bits = 8);
+
+    /** Returns the matching ImageFormat* identified by the Code.  May return NULL
+      if this format's code is reserved but not yet implemented by G3D. */
+    static const ImageFormat* fromCode(ImageFormat::Code code);
+
+
+
+    /** For use with ImageFormat::convert. */
+    class BayerAlgorithm {
+    public:
+        enum Value { 
+            NEAREST,
+            BILINEAR,
+            MHC,
+            HIGH_QUALITY = MHC
+        };
+    private:
+
+        Value value;
+
+    public:
+
+        G3D_DECLARE_ENUM_CLASS_METHODS(BayerAlgorithm);
+    };
+
+    /** Converts between arbitrary formats on the CPU.  Not all format conversions are supported or directly supported.
+        Formats without direct conversions will attempt to convert through RGBA first.
+
+        A conversion routine might only support source or destination padding or y inversion or none.
+        If support is needed and not available in any of the direct conversion routines, then no conversion is done.
+
+        YUV422 expects data in YUY2 format (Y, U, Y2, v).  Most YUV formats require width and heights that are multiples of 2.
+
+        Returns true if a conversion was available, false if none occurred.
+    */
+    static bool convert(const Array& srcBytes, int srcWidth, int srcHeight, const ImageFormat* srcFormat, int srcRowPadBits,
+	                    const Array& dstBytes, const ImageFormat* dstFormat, int dstRowPadBits,
+	                    bool invertY = false, BayerAlgorithm bayerAlg = BayerAlgorithm::HIGH_QUALITY);
+
+    /* Checks if a conversion between two formats is available. */
+    static bool conversionAvailable(const ImageFormat* srcFormat, int srcRowPadBits, const ImageFormat* dstFormat, int dstRowPadBits, bool invertY = false);
+};
+
+typedef ImageFormat TextureFormat;
+
+}
+
+template <>
+struct HashTrait {
+    static size_t hashCode(const G3D::ImageFormat* key) { return reinterpret_cast(key); }
+};
+
+
+
+#endif
diff --git a/externals/g3dlite/G3D/Intersect.h b/externals/g3dlite/G3D/Intersect.h
new file mode 100644
index 00000000000..4a3c8fb4540
--- /dev/null
+++ b/externals/g3dlite/G3D/Intersect.h
@@ -0,0 +1,55 @@
+/**
+ @file Intersect.h
+ 
+ @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+  
+ @created 2009-06-29
+ @edited  2009-06-29
+
+ Copyright 2000-2009, Morgan McGuire.
+ All rights reserved.
+
+ From the G3D Innovation Engine
+ http://g3d.sf.net
+ */
+#ifndef G3D_Intersect
+#define G3D_Intersect
+
+#include "G3D/platform.h"
+#include "G3D/Ray.h"
+#include "G3D/AABox.h"
+
+namespace G3D {
+
+/**
+ @beta
+ */
+class Intersect {
+public:
+
+	/** \brief Returns true if the intersection of the ray and the solid box is non-empty. 
+
+      \cite "Fast Ray / Axis-Aligned Bounding Box Overlap Tests using Ray Slopes" 
+      by Martin Eisemann, Thorsten Grosch, Stefan Müller and Marcus Magnor
+      Computer Graphics Lab, TU Braunschweig, Germany and
+      University of Koblenz-Landau, Germany
+    */
+	static bool __fastcall rayAABox(const Ray& ray, const AABox& box);
+
+	/** \brief Returns true if the intersection of the ray and the solid box is non-empty. 
+	 
+     \param time If there is an intersection, set to the time to that intersection. If the ray origin is inside the box,
+     this is a negative value indicating the distance backwards from the ray origin to the first intersection.
+     \a time is not set if there is no intersection.
+          
+     \cite Slope-Mul method from "Fast Ray / Axis-Aligned Bounding Box Overlap Tests using Ray Slopes" 
+      by Martin Eisemann, Thorsten Grosch, Stefan Müller and Marcus Magnor
+      Computer Graphics Lab, TU Braunschweig, Germany and
+      University of Koblenz-Landau, Germany
+      */
+ 	static bool __fastcall rayAABox(const Ray& ray, const AABox& box, float& time);
+};
+
+}
+
+#endif
diff --git a/externals/g3dlite/G3D/KDTree.h b/externals/g3dlite/G3D/KDTree.h
new file mode 100644
index 00000000000..4785ef2baea
--- /dev/null
+++ b/externals/g3dlite/G3D/KDTree.h
@@ -0,0 +1,1667 @@
+/**
+  @file KDTree.h
+  
+  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+ 
+  @created 2004-01-11
+  @edited  2009-12-28
+
+  Copyright 2000-2009, Morgan McGuire.
+  All rights reserved.  
+  */
+
+#ifndef G3D_KDTREE_H
+#define G3D_KDTREE_H
+
+#include "G3D/platform.h"
+#include "G3D/Array.h"
+#include "G3D/Table.h"
+#include "G3D/Vector2.h"
+#include "G3D/Vector3.h"
+#include "G3D/Vector4.h"
+#include "G3D/AABox.h"
+#include "G3D/Sphere.h"
+#include "G3D/Box.h"
+#include "G3D/Triangle.h"
+#include "G3D/Ray.h"
+#include "G3D/GCamera.h"
+#include "G3D/BinaryInput.h"
+#include "G3D/BinaryOutput.h"
+#include "G3D/CollisionDetection.h"
+#include "G3D/GCamera.h"
+#include "G3D/BoundsTrait.h"
+#include 
+
+// If defined, in debug mode the tree is checked for consistency
+// as a way of detecting corruption due to implementation bugs
+// #define VERIFY_TREE
+
+template<> struct BoundsTrait {
+    static void getBounds(const G3D::Vector2& v, G3D::AABox& out) { out = G3D::AABox(G3D::Vector3(v, 0)); }
+};
+
+template<> struct BoundsTrait {
+    static void getBounds(const G3D::Vector3& v, G3D::AABox& out) { out = G3D::AABox(v); }
+};
+
+template<> struct BoundsTrait {
+    static void getBounds(const G3D::Vector4& v, G3D::AABox& out) { out = G3D::AABox(v.xyz()); }
+};
+
+template<> struct BoundsTrait {
+    static void getBounds(const G3D::AABox& v, G3D::AABox& out) { out = v; }
+};
+
+template<> struct BoundsTrait {
+    static void getBounds(const G3D::Sphere& s, G3D::AABox& out) { s.getBounds(out); }
+};
+
+template<> struct BoundsTrait {
+    static void getBounds(const G3D::Box& b, G3D::AABox& out) { b.getBounds(out); }
+};
+
+template<> struct BoundsTrait {
+    static void getBounds(const G3D::Vector2*& v, G3D::AABox& out) { out = G3D::AABox(G3D::Vector3(*v, 0)); }
+};
+
+template<> struct BoundsTrait {
+    static void getBounds(const G3D::Vector3*& v, G3D::AABox& out) { out = G3D::AABox(*v); }
+};
+
+template<> struct BoundsTrait {
+    static void getBounds(const G3D::Vector4*& v, G3D::AABox& out) { out = G3D::AABox(v->xyz()); }
+};
+
+template<> struct BoundsTrait {
+    static void getBounds(const G3D::AABox*& v, G3D::AABox& out) { out = *v; }
+};
+
+template<> struct BoundsTrait {
+    static void getBounds(const G3D::Sphere*& s, G3D::AABox& out) { s->getBounds(out); }
+};
+
+template<> struct BoundsTrait {
+    static void getBounds(const G3D::Box*& b, G3D::AABox& out) { b->getBounds(out); }
+};
+
+
+template<> struct BoundsTrait {
+    static void getBounds(const G3D::Triangle*& t, G3D::AABox& out) { t->getBounds(out); }
+};
+
+namespace G3D {
+    namespace _internal {
+
+    /**
+     Wraps a pointer value so that it can be treated as the instance itself;
+     convenient for inserting pointers into a Table but using the 
+     object equality instead of pointer equality.
+    */
+    template
+    class Indirector {
+    public:
+        Type*         handle;
+
+        inline Indirector(Type* h) : handle(h) {}
+
+        inline Indirector() : handle(NULL) {}
+
+        /** Returns true iff the values referenced by the handles are equivalent. */
+        inline bool operator==(const Indirector& m) const {
+            return *handle == *(m.handle);
+        }
+
+        inline bool operator==(const Type& m) const {
+            return *handle == m;
+        }
+
+        inline size_t hashCode() const {
+            return handle->hashCode();
+        }
+    };
+ } // namespace internal
+} // namespace G3D
+
+template  struct HashTrait > {
+    static size_t hashCode(const G3D::_internal::Indirector& key) { return key.hashCode(); }
+};
+
+namespace G3D {
+
+/**
+ A set that supports spatial queries using a KD tree (axis-aligned
+ BSP tree) for speed.
+
+ KDTree allows you to quickly find objects in 3D that lie within
+ a box or along a ray. For large sets of objects it is much faster
+ than testing each object for a collision.
+
+ KDTree is as powerful as but more general than a Quad Tree, Oct
+ Tree, or regular KD tree that cycles through axes, but less general than an unconstrained BSP tree
+ (which is much slower to create).
+ 
+ Internally, objects
+ are arranged into a tree according to their 
+ axis-aligned bounds.  This increases the cost of insertion to
+ O(log n) but allows fast overlap queries.
+
+ Template Parameters
+ 
The template parameter T must be one for which
+ the following functions are all overloaded:
+
+ 
+  T::T(); // public constructor of no arguments
+  template <> struct HashTrait { static size_t hashCode(int key); };
+  template<> struct BoundsTrait { static void getBounds(const T& obj, G3D::AABox& out); };
+ 

+
+ G3D provides these for common classes like G3D::Vector3 and G3D::Sphere.
+ If you use a custom class, or a pointer to a custom class, you will need
+ to define those functions.
+
+ Moving %Set Members
+ 
It is important that objects do not move without updating the
+ KDTree.  If the axis-aligned bounds of an object are about
+ to change, KDTree::remove it before they change and 
+ KDTree::insert it again afterward.  For objects
+ where the hashCode and == operator are invariant with respect 
+ to the 3D position,
+ you can use the KDTree::update method as a shortcut to
+ insert/remove an object in one step after it has moved.
+ 
+
+ Note: Do not mutate any value once it has been inserted into KDTree. Values
+ are copied interally. All KDTree iterators convert to pointers to constant
+ values to reinforce this.
+
+ If you want to mutate the objects you intend to store in a KDTree
+ simply insert pointers to your objects instead of the objects
+ themselves, and ensure that the above operations are defined. (And
+ actually, because values are copied, if your values are large you may
+ want to insert pointers anyway, to save space and make the balance
+ operation faster.)
+
+ Dimensions
+ Although designed as a 3D-data structure, you can use the KDTree
+ for data distributed along 2 or 1 axes by simply returning bounds
+ that are always zero along one or more dimensions.
+
+*/
+template< class T, 
+          class BoundsFunc = BoundsTrait, 
+          class HashFunc   = HashTrait, 
+          class EqualsFunc = EqualsTrait > 
+class KDTree {
+protected:
+#define TreeType KDTree
+
+    /** Wrapper for a value that includes a cache of its bounds. 
+        Except for the test value used in a set-query operation, there
+        is only ever one instance of the handle associated with any 
+        value and the memberTable and Nodes maintain pointers to that
+        heap-allocated value.
+     */
+    class Handle {
+    public:
+        /** The bounds of each object are constrained to AABox::large */
+        AABox               bounds;
+
+        /** Center of bounds.  We cache this value to avoid recomputing it
+            during the median sort, and because MSVC 6 std::sort goes into
+            an infinite loop if we compute the midpoint on the fly (possibly
+            a floating point roundoff issue, where B& point, 
+        int                   beginIndex,
+        int                   endIndex) {
+    
+        Vector3 lo = Vector3::inf();
+        Vector3 hi = -lo;
+
+        debugAssertM(beginIndex <= endIndex, "No points");
+        for (int p = beginIndex; p <= endIndex; ++p) {
+            // This code is written with the vector min and max expanded
+            // because otherwise it compiles incorrectly with -O3 on
+            // gcc 3.4 
+
+            const Vector3& pLo = point[p]->bounds.low();
+            const Vector3& pHi = point[p]->bounds.high();
+            for (int a = 0; a < 3; ++a) {
+                lo[a] = G3D::min(lo[a], pLo[a]);
+                hi[a] = G3D::max(hi[a], pHi[a]);
+            }
+        }
+
+        return AABox(lo, hi);
+    }
+
+    /** Compares centers */
+    class CenterComparator {
+    public:
+	    Vector3::Axis sortAxis;
+
+	    CenterComparator(Vector3::Axis a) : sortAxis(a) {}
+
+	    inline int operator()(Handle* A, const Handle* B) const {
+            float a = A->center[sortAxis];
+            float b = B->center[sortAxis];
+
+            if (a < b) {
+                return 1;
+            } else if (a > b) {
+                return -1;
+            } else {
+                return 0;
+            }
+	    }
+    };
+
+
+    /** Compares bounds for strict >, <, or overlap*/
+    class BoundsComparator {
+    public:
+	    Vector3::Axis sortAxis;
+
+	    BoundsComparator(Vector3::Axis a) : sortAxis(a) {}
+
+	    inline int operator()(Handle* A, const Handle* B) const {
+            const AABox& a = A->bounds;
+            const AABox& b = B->bounds;
+
+            if (a.high()[sortAxis] < b.low()[sortAxis]) {
+                return 1;
+            } else if (a.low()[sortAxis] > b.high()[sortAxis]) {
+                return -1;
+            } else {
+                return 0;
+            }
+	    }
+    };
+
+
+    /** Compares bounds to the sort location */
+    class Comparator {
+    public:
+	    Vector3::Axis sortAxis;
+	    float sortLocation;
+
+	    Comparator(Vector3::Axis a, float l) : sortAxis(a), sortLocation(l) {}
+
+	    inline int operator()(Handle* ignore, const Handle* handle) const {
+            (void)ignore;
+            const AABox& box = handle->bounds;
+            debugAssert(ignore == NULL);
+
+		    if (box.high()[sortAxis] < sortLocation) {
+                // Box is strictly below the sort location
+                return -1;
+		    } else if (box.low()[sortAxis] > sortLocation) {
+                // Box is strictly above the sort location
+			    return 1;
+		    } else {
+                // Box overlaps the sort location
+			    return 0;
+		    }
+	    }
+    };
+
+    // Using System::malloc with this class provided no speed improvement.
+    class Node {
+    public:
+
+        /** Spatial bounds on all values at this node and its children, based purely on
+            the parent's splitting planes.  May be infinite. */
+        AABox               splitBounds;
+
+        Vector3::Axis       splitAxis;
+
+        /** Location along the specified axis */
+        float               splitLocation;
+ 
+        /** child[0] contains all values strictly 
+            smaller than splitLocation along splitAxis.
+
+            child[1] contains all values strictly
+            larger.
+
+            Both may be NULL if there are not enough
+            values to bother recursing.
+        */
+        Node*               child[2];
+
+        /** Array of values at this node (i.e., values
+            straddling the split plane + all values if
+            this is a leaf node). 
+
+            This is an array of pointers because that minimizes
+            data movement during tree building, which accounts 
+            for about 15% of the time cost of tree building.
+          */
+        Array      valueArray;
+
+        /** For each object in the value array, a copy of its bounds. 
+            Packing these into an array at the node level
+            instead putting them in the valueArray improves
+            cache coherence, which is about a 3x performance
+            increase when performing intersection computations.
+          */
+        Array        boundsArray;
+
+        /** Creates node with NULL children */
+        Node() {
+            splitAxis     = Vector3::X_AXIS;
+            splitLocation = 0;
+            splitBounds   = AABox(-Vector3::inf(), Vector3::inf());
+            for (int i = 0; i < 2; ++i) {
+                child[i] = NULL;
+            }
+        }
+
+        /**
+         Doesn't clone children.
+         */
+        Node(const Node& other) : valueArray(other.valueArray), boundsArray(other.boundsArray) {
+            splitAxis       = other.splitAxis;
+            splitLocation   = other.splitLocation;
+            splitBounds     = other.splitBounds;            
+            for (int i = 0; i < 2; ++i) {
+                child[i] = NULL;
+            }
+        }
+
+        /** Copies the specified subarray of pt into point, NULLs the children.
+            Assumes a second pass will set splitBounds. */
+        Node(const Array& pt) : valueArray(pt) {
+            splitAxis     = Vector3::X_AXIS;
+            splitLocation = 0;
+            for (int i = 0; i < 2; ++i) {
+                child[i] = NULL;
+            }
+
+            boundsArray.resize(valueArray.size());
+            for (int i = 0; i < valueArray.size(); ++i) {
+                boundsArray[i] = valueArray[i]->bounds;
+            }
+        }
+
+        /** Deletes the children (but not the values) */
+        ~Node() {
+            for (int i = 0; i < 2; ++i) {
+                delete child[i];
+            }
+        }
+
+        /** Returns true if this node is a leaf (no children) */
+        inline bool isLeaf() const {
+            return (child[0] == NULL) && (child[1] == NULL);
+        }
+
+
+        /**
+         Recursively appends all handles and children's handles
+         to the array.
+         */
+        void getHandles(Array& handleArray) const {
+            handleArray.append(valueArray);
+            for (int i = 0; i < 2; ++i) {
+                if (child[i] != NULL) {
+                    child[i]->getHandles(handleArray);
+                }
+            }
+        }
+
+        void verifyNode(const Vector3& lo, const Vector3& hi) {
+            //		debugPrintf("Verifying: split %d @ %f [%f, %f, %f], [%f, %f, %f]\n",
+            //			    splitAxis, splitLocation, lo.x, lo.y, lo.z, hi.x, hi.y, hi.z);
+            
+            debugAssertM(lo == splitBounds.low(),
+                         format("lo = %s, splitBounds.lo = %s",
+                                lo.toString().c_str(), splitBounds.low().toString().c_str()));
+            debugAssert(hi == splitBounds.high());
+            
+            for (int i = 0; i < valueArray.length(); ++i) {
+                const AABox& b = valueArray[i]->bounds;
+                debugAssert(b == boundsArray[i]);
+                
+                for(int axis = 0; axis < 3; ++axis) {
+                    debugAssert(b.low()[axis] <= b.high()[axis]);
+                    debugAssert(b.low()[axis] >= lo[axis]);
+                    debugAssert(b.high()[axis] <= hi[axis]);
+                }
+            }
+            
+            if (child[0] || child[1]) {
+                debugAssert(lo[splitAxis] < splitLocation);
+                debugAssert(hi[splitAxis] > splitLocation);
+            }
+            
+            Vector3 newLo = lo;
+            newLo[splitAxis] = splitLocation;
+            Vector3 newHi = hi;
+            newHi[splitAxis] = splitLocation;
+            
+            if (child[0] != NULL) {
+                child[0]->verifyNode(lo, newHi);
+            }
+            
+            if (child[1] != NULL) {
+                child[1]->verifyNode(newLo, hi);
+            }
+        }
+        
+
+        /**
+          Stores the locations of the splitting planes (the structure but not the content)
+          so that the tree can be quickly rebuilt from a previous configuration without 
+          calling balance.
+         */
+        static void serializeStructure(const Node* n, BinaryOutput& bo) {
+            if (n == NULL) {
+                bo.writeUInt8(0);
+            } else {
+                bo.writeUInt8(1);
+                n->splitBounds.serialize(bo);
+                serialize(n->splitAxis, bo);
+                bo.writeFloat32(n->splitLocation);
+                for (int c = 0; c < 2; ++c) {
+                    serializeStructure(n->child[c], bo);
+                }
+            }
+        }
+
+        /** Clears the member table */
+        static Node* deserializeStructure(BinaryInput& bi) {
+            if (bi.readUInt8() == 0) {
+                return NULL;
+            } else {
+                Node* n = new Node();
+                n->splitBounds.deserialize(bi);
+                deserialize(n->splitAxis, bi);
+                n->splitLocation = bi.readFloat32();
+                for (int c = 0; c < 2; ++c) {
+                    n->child[c] = deserializeStructure(bi);
+                }
+                return n;
+            }
+        }
+
+        /** Returns the deepest node that completely contains bounds. */
+        Node* findDeepestContainingNode(const AABox& bounds) {
+
+            // See which side of the splitting plane the bounds are on
+            if (bounds.high()[splitAxis] < splitLocation) {
+                // Bounds are on the low side.  Recurse into the child
+                // if it exists.
+                if (child[0] != NULL) {
+                    return child[0]->findDeepestContainingNode(bounds);
+                }
+            } else if (bounds.low()[splitAxis] > splitLocation) {
+                // Bounds are on the high side, recurse into the child
+                // if it exists.
+                if (child[1] != NULL) {
+                    return child[1]->findDeepestContainingNode(bounds);
+                }
+            }
+
+            // There was no containing child, so this node is the
+            // deepest containing node.
+            return this;
+        }
+
+
+        /** Appends all members that intersect the box. 
+            If useSphere is true, members that pass the box test
+            face a second test against the sphere. */
+        void getIntersectingMembers(
+            const AABox&        box,
+            const Sphere&       sphere,
+            Array&          members,
+            bool                useSphere) const {
+
+            // Test all values at this node
+            for (int v = 0; v < boundsArray.size(); ++v) {
+                const AABox& bounds = boundsArray[v];
+                if (bounds.intersects(box) &&
+                    (! useSphere || bounds.intersects(sphere))) {
+                    members.append(& (valueArray[v]->value));
+                }
+            }
+
+            // If the left child overlaps the box, recurse into it
+            if ((child[0] != NULL) && (box.low()[splitAxis] < splitLocation)) {
+                child[0]->getIntersectingMembers(box, sphere, members, useSphere);
+            }
+
+            // If the right child overlaps the box, recurse into it
+            if ((child[1] != NULL) && (box.high()[splitAxis] > splitLocation)) {
+                child[1]->getIntersectingMembers(box, sphere, members, useSphere);
+            }
+        }
+
+        /**
+         Recurse through the tree, assigning splitBounds fields.
+         */
+        void assignSplitBounds(const AABox& myBounds) {
+            splitBounds = myBounds;
+
+            AABox childBounds[2];
+            myBounds.split(splitAxis, splitLocation, childBounds[0], childBounds[1]);
+
+#           if defined(G3D_DEBUG) && defined(VERIFY_TREE)
+                // Verify the split
+                for (int v = 0; v < boundsArray.size(); ++v) {
+                    const AABox& bounds = boundsArray[v];
+                    debugAssert(myBounds.contains(bounds));
+                }
+#           endif
+
+            for (int c = 0; c < 2; ++c) {
+                if (child[c]) {
+                    child[c]->assignSplitBounds(childBounds[c]);
+                }
+            }
+        }
+
+        /** Returns true if the ray intersects this node */
+        bool intersects(const Ray& ray, float distance) const {
+            // See if the ray will ever hit this node or its children
+            Vector3 location;
+            bool alreadyInsideBounds = false;
+            bool rayWillHitBounds = 
+                CollisionDetection::collisionLocationForMovingPointFixedAABox(
+                    ray.origin(), ray.direction(), splitBounds, location, alreadyInsideBounds);
+           
+            bool canHitThisNode = (alreadyInsideBounds ||                
+                (rayWillHitBounds && ((location - ray.origin()).squaredLength() < square(distance))));
+
+            return canHitThisNode;
+        }
+
+        template
+        void intersectRay(
+            const Ray& ray, 
+            RayCallback& intersectCallback, 
+            float& distance,
+            bool intersectCallbackIsFast) const {
+            
+            if (! intersects(ray, distance)) {
+                // The ray doesn't hit this node, so it can't hit the children of the node.
+                return;
+            }
+
+            // Test for intersection against every object at this node.
+            for (int v = 0; v < valueArray.size(); ++v) {        
+                bool canHitThisObject = true;
+
+                if (! intersectCallbackIsFast) {
+                    // See if
+                    Vector3 location;
+                    const AABox& bounds = boundsArray[v];
+                    bool alreadyInsideBounds = false;
+                    bool rayWillHitBounds = 
+                        CollisionDetection::collisionLocationForMovingPointFixedAABox(
+                            ray.origin(), ray.direction(), bounds, location, alreadyInsideBounds);
+
+                    canHitThisObject = (alreadyInsideBounds ||                
+                        (rayWillHitBounds && ((location - ray.origin()).squaredLength() < square(distance))));
+                }
+
+                if (canHitThisObject) {
+                    // It is possible that this ray hits this object.  Look for the intersection using the
+                    // callback.
+                    const T& value = valueArray[v]->value;
+                    intersectCallback(ray, value, distance);
+                }
+            }
+
+            // There are three cases to consider next:
+            // 
+            //  1. the ray can start on one side of the splitting plane and never enter the other,
+            //  2. the ray can start on one side and enter the other, and
+            //  3. the ray can travel exactly down the splitting plane
+
+            enum {NONE = -1};
+            int firstChild = NONE;
+            int secondChild = NONE;
+
+            if (ray.origin()[splitAxis] < splitLocation) {
+                
+                // The ray starts on the small side
+                firstChild = 0;
+
+                if (ray.direction()[splitAxis] > 0) {
+                    // The ray will eventually reach the other side
+                    secondChild = 1;
+                }
+
+            } else if (ray.origin()[splitAxis] > splitLocation) {
+
+                // The ray starts on the large side
+                firstChild = 1;
+
+                if (ray.direction()[splitAxis] < 0) {
+                    secondChild = 0;
+                }
+            } else {
+                // The ray starts on the splitting plane
+                if (ray.direction()[splitAxis] < 0) {
+                    // ...and goes to the small side
+                    firstChild = 0;
+                } else if (ray.direction()[splitAxis] > 0) {
+                    // ...and goes to the large side
+                    firstChild = 1;
+                }
+            }
+
+            // Test on the side closer to the ray origin.
+            if ((firstChild != NONE) && child[firstChild]) {
+                child[firstChild]->intersectRay(ray, intersectCallback, distance, intersectCallbackIsFast);
+            }
+
+            if (ray.direction()[splitAxis] != 0) {
+                // See if there was an intersection before hitting the splitting plane.  
+                // If so, there is no need to look on the far side and recursion terminates.
+                float distanceToSplittingPlane = (splitLocation - ray.origin()[splitAxis]) / ray.direction()[splitAxis];
+                if (distanceToSplittingPlane > distance) {
+                    // We aren't going to hit anything else before hitting the splitting plane,
+                    // so don't bother looking on the far side of the splitting plane at the other
+                    // child.
+                    return;
+                }
+            }
+
+            // Test on the side farther from the ray origin.
+            if ((secondChild != NONE) && child[secondChild]) {
+                child[secondChild]->intersectRay(ray, intersectCallback, distance, intersectCallbackIsFast);
+            }
+
+        }
+    };
+
+
+    /**
+     Recursively subdivides the subarray.
+    
+     Clears the source array as soon as it is no longer needed.
+
+     Call assignSplitBounds() on the root node after making a tree.
+     */
+    Node* makeNode(
+        Array& source, 
+        int valuesPerNode, 
+        int numMeanSplits,
+        Array& temp)  {
+
+	    Node* node = NULL;
+	    
+	    if (source.size() <= valuesPerNode) {
+		    // Make a new leaf node
+		    node = new Node(source);
+		    
+		    // Set the pointers in the memberTable
+		    for (int i = 0; i < source.size(); ++i) {
+			    memberTable.set(Member(source[i]), node);
+		    }
+            source.clear();
+		    
+        } else {
+		    // Make a new internal node
+		    node = new Node();
+		    
+            const AABox& bounds = computeBounds(source, 0, source.size() - 1);
+		    const Vector3& extent = bounds.high() - bounds.low();
+		    
+		    Vector3::Axis splitAxis = extent.primaryAxis();
+		    
+            float splitLocation;
+
+            // Arrays for holding the children
+            Array lt, gt;
+                
+            if (numMeanSplits <= 0) {
+
+                source.medianPartition(lt, node->valueArray, gt, temp, CenterComparator(splitAxis));
+
+                // Choose the split location to be the center of whatever fell in the center
+                splitLocation = node->valueArray[0]->center[splitAxis];
+
+                // Some of the elements in the lt or gt array might really overlap the split location.
+                // Move them as needed.
+                for (int i = 0; i < lt.size(); ++i) {
+                    const AABox& bounds = lt[i]->bounds;
+                    if ((bounds.low()[splitAxis] <= splitLocation) && (bounds.high()[splitAxis] >= splitLocation)) {
+                        node->valueArray.append(lt[i]);
+                        // Remove this element and process the new one that
+                        // is swapped in in its place.
+                        lt.fastRemove(i); --i;
+                    }
+                }
+
+                for (int i = 0; i < gt.size(); ++i) {
+                    const AABox& bounds = gt[i]->bounds;
+                    if ((bounds.low()[splitAxis] <= splitLocation) && (bounds.high()[splitAxis] >= splitLocation)) {
+                        node->valueArray.append(gt[i]);
+                        // Remove this element and process the new one that
+                        // is swapped in in its place.
+                        gt.fastRemove(i); --i;
+                    }
+                }            
+
+                if ((node->valueArray.size() > (source.size() / 2)) &&
+                    (source.size() > 6)) {
+                    // This was a bad partition; we ended up putting the splitting plane right in the middle of most of the 
+                    // objects.  We could try to split on a different axis, or use a different partition (e.g., the extents mean, 
+                    // or geometric mean).  This implementation falls back on the extents mean, since that case is already handled 
+                    // below.
+                    numMeanSplits = 1;
+                }
+            }
+
+            // Note: numMeanSplits may have been increased by the code in the previous case above in order to
+            // force a re-partition.
+
+            if (numMeanSplits > 0) {
+                // Split along the mean
+                splitLocation = 
+                    bounds.high()[splitAxis] * 0.5f + 
+                    bounds.low()[splitAxis] * 0.5f;
+                
+                debugAssertM(isFinite(splitLocation),
+                            "Internal error: split location must be finite.");
+
+                source.partition(NULL, lt, node->valueArray, gt, Comparator(splitAxis, splitLocation));
+
+                // The Comparator ensures that elements are strictly on the correct side of the split
+            }
+
+
+#           if defined(G3D_DEBUG) && defined(VERIFY_TREE)
+                debugAssert(lt.size() + node->valueArray.size() + gt.size() == source.size());
+                // Verify that all objects ended up on the correct side of the split.
+                // (i.e., make sure that the Array partition was correct) 
+                for (int i = 0; i < lt.size(); ++i) {
+                    const AABox& bounds  = lt[i]->bounds;
+                    debugAssert(bounds.high()[splitAxis] < splitLocation);
+                }
+
+                for (int i = 0; i < gt.size(); ++i) {
+                    const AABox& bounds  = gt[i]->bounds;
+                    debugAssert(bounds.low()[splitAxis] > splitLocation);
+                }
+
+                for (int i = 0; i < node->valueArray.size(); ++i) {
+                    const AABox& bounds  = node->valueArray[i]->bounds;
+                    debugAssert(bounds.high()[splitAxis] >= splitLocation);
+                    debugAssert(bounds.low()[splitAxis] <= splitLocation);
+                }
+#           endif
+
+            // The source array is no longer needed
+            source.clear();
+
+            node->splitAxis = splitAxis;
+            node->splitLocation = splitLocation;
+
+            // Update the bounds array and member table
+            node->boundsArray.resize(node->valueArray.size());
+            for (int i = 0; i < node->valueArray.size(); ++i) {
+                Handle* v = node->valueArray[i];
+                node->boundsArray[i] = v->bounds;
+			    memberTable.set(Member(v), node);
+            }
+
+            if (lt.size() > 0) {		    
+			    node->child[0] = makeNode(lt, valuesPerNode, numMeanSplits - 1, temp);
+		    }
+		    
+		    if (gt.size() > 0) {
+			    node->child[1] = makeNode(gt, valuesPerNode, numMeanSplits - 1, temp);
+		    }
+		    
+	    }
+	    
+	    return node;
+    }
+
+    /**
+     Recursively clone the passed in node tree, setting
+     pointers for members in the memberTable as appropriate.
+     called by the assignment operator.
+     */
+    Node* cloneTree(Node* src) {
+        Node* dst = new Node(*src);
+
+        // Make back pointers
+        for (int i = 0; i < dst->valueArray.size(); ++i) {
+            memberTable.set(Member(dst->valueArray[i]), dst);
+        }
+
+        // Clone children
+        for (int i = 0; i < 2; ++i) {
+            if (src->child[i] != NULL) {
+                dst->child[i] = cloneTree(src->child[i]);
+            }
+        }
+
+        return dst;
+    }
+
+   /**
+    Wrapper for a Handle; used to create a memberTable that acts like Table but
+    stores only Handle* internally to avoid memory copies.
+    */
+    typedef _internal::Indirector Member;
+
+    typedef Table MemberTable;
+
+    /** Maps members to the node containing them */
+    MemberTable             memberTable;
+
+    Node*                   root;
+
+public:
+
+    /** To construct a balanced tree, insert the elements and then call
+      KDTree::balance(). */
+    KDTree() : root(NULL) {}
+
+
+    KDTree(const KDTree& src) : root(NULL) {
+        *this = src;
+    }
+
+
+    KDTree& operator=(const KDTree& src) {
+        delete root;
+        // Clone tree takes care of filling out the memberTable.
+        root = cloneTree(src.root);
+        return *this;
+    }
+
+
+    ~KDTree() {
+        clear();
+    }
+
+    /**
+     Throws out all elements of the set.
+     */
+    void clear() {
+        typedef typename Table<_internal::Indirector, Node*>::Iterator It;
+  
+        // Delete all handles stored in the member table
+        It cur = memberTable.begin();
+        It end = memberTable.end();
+        while (cur != end) {
+            delete cur->key.handle;
+            cur->key.handle = NULL;
+            ++cur;
+        }
+        memberTable.clear();
+
+        // Delete the tree structure itself
+        delete root;
+        root = NULL;
+    }
+
+    int size() const {
+        return memberTable.size();
+    }
+
+    /**
+     Inserts an object into the set if it is not
+     already present.  O(log n) time.  Does not
+     cause the tree to be balanced.
+     */
+    void insert(const T& value) {
+        if (contains(value)) {
+            // Already in the set
+            return;
+        }
+
+        Handle* h = new Handle(value);
+
+        if (root == NULL) {
+            // This is the first node; create a root node
+            root = new Node();
+        }
+
+        Node* node = root->findDeepestContainingNode(h->bounds);
+
+        // Insert into the node
+        node->valueArray.append(h);
+        node->boundsArray.append(h->bounds);
+        
+        // Insert into the node table
+        Member m(h);
+        memberTable.set(m, node);
+    }
+
+    /** Inserts each elements in the array in turn.  If the tree
+        begins empty (no structure and no elements), this is faster
+        than inserting each element in turn.  You still need to balance
+        the tree at the end.*/
+    void insert(const Array& valueArray) {
+        if (root == NULL) {
+            // Optimized case for an empty tree; don't bother
+            // searching or reallocating the root node's valueArray
+            // as we incrementally insert.
+            root = new Node();
+            root->valueArray.resize(valueArray.size());
+            root->boundsArray.resize(root->valueArray.size());
+            for (int i = 0; i < valueArray.size(); ++i) {
+                // Insert in opposite order so that we have the exact same
+                // data structure as if we inserted each (i.e., order is reversed
+                // from array).
+                Handle* h = new Handle(valueArray[i]);
+                int j = valueArray.size() - i - 1;
+                root->valueArray[j] = h;
+                root->boundsArray[j] = h->bounds;
+                memberTable.set(Member(h), root);
+            }
+
+        } else {
+            // Insert at appropriate tree depth.
+            for (int i = 0; i < valueArray.size(); ++i) {
+                insert(valueArray[i]);
+            }
+        }
+    }
+
+
+    /**
+     Returns true if this object is in the set, otherwise
+     returns false.  O(1) time.
+     */
+    bool contains(const T& value) {
+        // Temporarily create a handle and member
+        Handle h(value);
+        return memberTable.containsKey(Member(&h));
+    }
+
+
+    /**
+     Removes an object from the set in O(1) time.
+     It is an error to remove members that are not already
+     present.  May unbalance the tree.  
+     
+     Removing an element never causes a node (split plane) to be removed...
+     nodes are only changed when the tree is rebalanced.  This behavior
+     is desirable because it allows the split planes to be serialized,
+     and then deserialized into an empty tree which can be repopulated.
+    */
+    void remove(const T& value) {
+        debugAssertM(contains(value),
+            "Tried to remove an element from a "
+            "KDTree that was not present");
+
+        // Get the list of elements at the node
+        Handle h(value);
+        Member m(&h);
+
+        Array& list = memberTable[m]->valueArray;
+
+        Handle* ptr = NULL;
+
+        // Find the element and remove it
+        for (int i = list.length() - 1; i >= 0; --i) {
+            if (list[i]->value == value) {
+                // This was the element.  Grab the pointer so that
+                // we can delete it below
+                ptr = list[i];
+
+                // Remove the handle from the node
+                list.fastRemove(i);
+
+                // Remove the corresponding bounds
+                memberTable[m]->boundsArray.fastRemove(i);
+                break;
+            }
+        }
+
+        // Remove the member
+        memberTable.remove(m);
+
+        // Delete the handle data structure
+        delete ptr;
+        ptr = NULL;
+    }
+
+
+    /**
+     If the element is in the set, it is removed.
+     The element is then inserted.
+
+     This is useful when the == and hashCode methods
+     on T are independent of the bounds.  In
+     that case, you may call update(v) to insert an
+     element for the first time and call update(v)
+     again every time it moves to keep the tree 
+     up to date.
+     */
+    void update(const T& value) {
+        if (contains(value)) {
+            remove(value);
+        }
+        insert(value);
+    }
+
+
+    /**
+     Rebalances the tree (slow).  Call when objects
+     have moved substantially from their original positions
+     (which unbalances the tree and causes the spatial
+     queries to be slow).
+     
+     @param valuesPerNode Maximum number of elements to put at
+     a node.
+
+     @param numMeanSplits numMeanSplits = 0 gives a 
+     fully axis aligned BSP-tree, where the balance operation attempts to balance
+     the tree so that every splitting plane has an equal number of left
+     and right children (i.e. it is a median split along that axis).  
+     This tends to maximize average performance.  
+
+     You can override this behavior by
+     setting a number of mean (average) splits.  numMeanSplits = MAX_INT
+     creates a full oct-tree, which tends to optimize peak performance at the expense of
+     average performance.  It tends to have better clustering behavior when
+     members are not uniformly distributed.
+     */
+    void balance(int valuesPerNode = 5, int numMeanSplits = 3) {
+        if (root == NULL) {
+            // Tree is empty
+            return;
+        }
+
+        // Get all handles and delete the old tree structure
+        Node* oldRoot = root;
+        for (int c = 0; c < 2; ++c) {
+            if (root->child[c] != NULL) {
+                root->child[c]->getHandles(root->valueArray);
+
+                // Delete the child; this will delete all structure below it
+                delete root->child[c];
+                root->child[c] = NULL;
+            }
+        }
+
+        Array temp;
+        // Make a new root.  Work with a copy of the value array because 
+        // makeNode clears the source array as it progresses
+        Array copy(oldRoot->valueArray);
+        root = makeNode(copy, valuesPerNode, numMeanSplits, temp);
+
+        // Throw away the old root node
+        delete oldRoot;
+        oldRoot = NULL;
+
+        // Walk the tree, assigning splitBounds.  We start with unbounded
+        // space.  This will override the current member table.
+        const AABox& LARGE = AABox::large();
+        root->assignSplitBounds(LARGE);
+
+#       ifdef _DEBUG
+        {
+            // Ensure that the balanced tree is still correct
+            root->verifyNode(LARGE.low(), LARGE.high());
+        }
+#       endif
+    }
+
+
+    /** Clear, set the contents to the values in the array, and then balance */
+    void setContents(const Array& array, int valuesPerNode = 5, int numMeanSplits = 3) {
+        clear();
+        insert(array);
+        balance(valuesPerNode, numMeanSplits);
+    }
+
+
+protected:
+
+    /**
+     @param parentMask The mask that this node returned from culledBy.
+     */
+    static void getIntersectingMembers(
+        const Array&         plane,
+        Array&                  members,
+        Node*                       node,
+        uint32                      parentMask) {
+
+        int dummy;
+
+        if (parentMask == 0) {
+            // None of these planes can cull anything
+            for (int v = node->valueArray.size() - 1; v >= 0; --v) {
+                members.append(& (node->valueArray[v]->value));
+            }
+
+            // Iterate through child nodes
+            for (int c = 0; c < 2; ++c) {
+                if (node->child[c]) {
+                    getIntersectingMembers(plane, members, node->child[c], 0);
+                }
+            }
+        } else {
+
+            // Test values at this node against remaining planes
+            for (int v = node->boundsArray.size() - 1; v >= 0; --v) {
+                if (! node->boundsArray[v].culledBy(plane, dummy, parentMask)) {
+                    members.append(&(node->valueArray[v]->value));
+                }
+            }
+
+            uint32 childMask  = 0xFFFFFF;
+
+            // Iterate through child nodes
+            for (int c = 0; c < 2; ++c) {
+                if (node->child[c] &&
+                    ! node->child[c]->splitBounds.culledBy(plane, dummy, parentMask, childMask)) {
+                    // This node was not culled
+                    getIntersectingMembers(plane, members, node->child[c], childMask);
+                }
+            }
+        }
+    }
+
+public:
+
+    /**
+     Returns all members inside the set of planes.  
+      @param members The results are appended to this array.
+     */
+    void getIntersectingMembers(const Array& plane, Array& members) const {
+        if (root == NULL) {
+            return;
+        }
+
+        getIntersectingMembers(plane, members, root, 0xFFFFFF);
+    }
+
+    void getIntersectingMembers(const Array& plane, Array& members) const {
+        Array temp;
+        getIntersectingMembers(plane, temp, root, 0xFFFFFF);
+        for (int i = 0; i < temp.size(); ++i) {
+            members.append(*temp[i]);
+        }
+    }
+
+    /**
+     Typically used to find all visible
+     objects inside the view frustum (see also GCamera::getClipPlanes)... i.e. all objects
+     not culled by frustum.
+
+     Example:
+      
+        Array  visible;
+        tree.getIntersectingMembers(camera.frustum(), visible);
+        // ... Draw all objects in the visible array.
+      

+      @param members The results are appended to this array.
+      */
+    void getIntersectingMembers(const GCamera::Frustum& frustum, Array& members) const {
+        Array plane;
+        
+        for (int i = 0; i < frustum.faceArray.size(); ++i) {
+            plane.append(frustum.faceArray[i].plane);
+        }
+
+        getIntersectingMembers(plane, members);
+    }
+
+    void getIntersectingMembers(const GCamera::Frustum& frustum, Array& members) const {
+        Array temp;
+        getIntersectingMembers(frustum, temp);
+        for (int i = 0; i < temp.size(); ++i) {
+            members.append(*temp[i]);
+        }
+    }
+
+    /**
+     C++ STL style iterator variable.  See beginBoxIntersection().
+     The iterator overloads the -> (dereference) operator, so this
+     acts like a pointer to the current member.
+     */
+    // This iterator turns Node::getIntersectingMembers into a
+    // coroutine.  It first translates that method from recursive to
+    // stack based, then captures the system state (analogous to a Scheme
+    // continuation) after each element is appended to the member array,
+    // and allowing the computation to be restarted.
+    class BoxIntersectionIterator {
+    private:
+        friend class TreeType;
+
+        /** True if this is the "end" iterator instance */
+        bool            isEnd;
+
+        /** The box that we're testing against. */
+        AABox           box;
+
+        /** Node that we're currently looking at.  Undefined if isEnd
+            is true. */
+        Node*           node;
+
+        /** Nodes waiting to be processed */
+        // We could use backpointers within the tree and careful
+        // state management to avoid ever storing the stack-- but
+        // it is much easier this way and only inefficient if the
+        // caller uses post increment (which they shouldn't!).
+        Array    stack;
+
+        /** The next index of current->valueArray to return. 
+            Undefined when isEnd is true.*/
+        int             nextValueArrayIndex;
+
+        BoxIntersectionIterator() : isEnd(true) {}
+        
+        BoxIntersectionIterator(const AABox& b, const Node* root) : 
+           isEnd(root == NULL), box(b), 
+           node(const_cast(root)), nextValueArrayIndex(-1) {
+
+           // We intentionally start at the "-1" index of the current
+           // node so we can use the preincrement operator to move
+           // ourselves to element 0 instead of repeating all of the
+           // code from the preincrement method.  Note that this might
+           // cause us to become the "end" instance.
+           ++(*this);
+        }
+
+    public:
+
+        inline bool operator!=(const BoxIntersectionIterator& other) const {
+            return ! (*this == other);
+        }
+
+        bool operator==(const BoxIntersectionIterator& other) const {
+            if (isEnd) {
+                return other.isEnd;
+            } else if (other.isEnd) {
+                return false;
+            } else {
+                // Two non-end iterators; see if they match.  This is kind of 
+                // silly; users shouldn't call == on iterators in general unless
+                // one of them is the end iterator.
+                if ((box != other.box) || (node != other.node) || 
+                    (nextValueArrayIndex != other.nextValueArrayIndex) ||
+                    (stack.length() != other.stack.length())) {
+                    return false;
+                }
+
+                // See if the stacks are the same
+                for (int i = 0; i < stack.length(); ++i) {
+                    if (stack[i] != other.stack[i]) {
+                        return false;
+                    }
+                }
+
+                // We failed to find a difference; they must be the same
+                return true;
+            }
+        }
+
+        /**
+         Pre increment.
+         */
+        BoxIntersectionIterator& operator++() {
+            ++nextValueArrayIndex;
+
+            bool foundIntersection = false;
+            while (! isEnd && ! foundIntersection) {
+
+                // Search for the next node if we've exhausted this one
+                while ((! isEnd) &&  (nextValueArrayIndex >= node->valueArray.length())) {
+                    // If we entered this loop, then the iterator has exhausted the elements at 
+                    // node (possibly because it just switched to a child node with no members).
+                    // This loop continues until it finds a node with members or reaches
+                    // the end of the whole intersection search.
+                    
+                    // If the right child overlaps the box, push it onto the stack for
+                    // processing.
+                    if ((node->child[1] != NULL) &&
+                        (box.high()[node->splitAxis] > node->splitLocation)) {
+                        stack.push(node->child[1]);
+                    }
+                    
+                    // If the left child overlaps the box, push it onto the stack for
+                    // processing.
+                    if ((node->child[0] != NULL) &&
+                        (box.low()[node->splitAxis] < node->splitLocation)) {
+                        stack.push(node->child[0]);
+                    }
+                    
+                    if (stack.length() > 0) {
+                        // Go on to the next node (which may be either one of the ones we 
+                        // just pushed, or one from farther back the tree).
+                        node = stack.pop();
+                        nextValueArrayIndex = 0;
+                    } else {
+                        // That was the last node; we're done iterating
+                        isEnd = true;
+                    }
+                }
+                
+                // Search for the next intersection at this node until we run out of children
+                while (! isEnd && ! foundIntersection && (nextValueArrayIndex < node->valueArray.length())) {
+                    if (box.intersects(node->boundsArray[nextValueArrayIndex])) {
+                        foundIntersection = true;
+                    } else {
+                        ++nextValueArrayIndex;
+                        // If we exhaust this node, we'll loop around the master loop 
+                        // to find a new node.
+                    }
+                }
+            }
+
+            return *this;
+        }
+
+    private:
+        /**
+         Post increment (much slower than preincrement!).
+         Intentionally overloaded to preclude accidentally slow code.
+         */
+        BoxIntersectionIterator operator++(int);
+        /*{
+            BoxIntersectionIterator old = *this;
+            ++this;
+            return old;
+        }*/
+
+    public:
+
+        /** Overloaded dereference operator so the iterator can masquerade as a pointer
+            to a member */
+        const T& operator*() const {
+            alwaysAssertM(! isEnd, "Can't dereference the end element of an iterator");
+            return node->valueArray[nextValueArrayIndex]->value;
+        }
+
+        /** Overloaded dereference operator so the iterator can masquerade as a pointer
+            to a member */
+        T const * operator->() const {
+            alwaysAssertM(! isEnd, "Can't dereference the end element of an iterator");
+            return &(stack.last()->valueArray[nextValueArrayIndex]->value);
+        }
+
+        /** Overloaded cast operator so the iterator can masquerade as a pointer
+            to a member */
+        operator T*() const {
+            alwaysAssertM(! isEnd, "Can't dereference the end element of an iterator");
+            return &(stack.last()->valueArray[nextValueArrayIndex]->value);
+        }
+    };
+
+
+    /**
+     Iterates through the members that intersect the box
+     */
+    BoxIntersectionIterator beginBoxIntersection(const AABox& box) const {
+        return BoxIntersectionIterator(box, root);
+    }
+
+    BoxIntersectionIterator endBoxIntersection() const {
+        // The "end" iterator instance
+        return BoxIntersectionIterator();
+    }
+
+    /**
+     Appends all members whose bounds intersect the box.
+     See also KDTree::beginBoxIntersection.
+     */
+    void getIntersectingMembers(const AABox& box, Array& members) const {
+        if (root == NULL) {
+            return;
+        }
+        root->getIntersectingMembers(box, Sphere(Vector3::zero(), 0), members, false);
+    }
+
+    void getIntersectingMembers(const AABox& box, Array& members) const {
+        Array temp;
+        getIntersectingMembers(box, temp);
+        for (int i = 0; i < temp.size(); ++i) {
+            members.append(*temp[i]);
+        }
+    }
+
+
+    /**
+     Invoke a callback for every member along a ray until the closest intersection is found.
+
+     @param callback either a function or an instance of a class with an overloaded operator() of the form:
+             
+     void callback(const Ray& ray, const T& object, float& distance).  If the ray hits the object
+     before travelling distance distance, updates distance with the new distance to
+     the intersection, otherwise leaves it unmodified.  A common example is:
+
+     
+     class Entity {
+     public:
+
+                void intersect(const Ray& ray, float& maxDist, Vector3& outLocation, Vector3& outNormal) {
+                    float d = maxDist;
+
+                    // ... search for intersection distance d
+
+                    if ((d > 0) && (d < maxDist)) {
+                        // Intersection occured
+                        maxDist = d;
+                        outLocation = ...;
+                        outNormal = ...;
+                    }
+                }
+            };
+
+            // Finds the surface normal and location of the first intersection with the scene
+            class Intersection {
+            public:
+                Entity*     closestEntity;
+                Vector3     hitLocation;
+                Vector3     hitNormal;
+
+                void operator()(const Ray& ray, const Entity* entity, float& distance) {
+                    entity->intersect(ray, distance, hitLocation, hitNormal);
+                }
+            };
+
+            KDTree scene;
+
+            Intersection intersection;
+            float distance = finf();
+            scene.intersectRay(camera.worldRay(x, y), intersection, distance);
+          

+
+
+     @param distance When the method is invoked, this is the maximum
+     distance that the tree should search for an intersection.  On
+     return, this is set to the distance to the first intersection
+     encountered.
+
+     @param intersectCallbackIsFast If false, each object's bounds are
+      tested before the intersectCallback is invoked.  If the
+      intersect callback runs at the same speed or faster than
+      AABox-ray intersection, set this to true.
+     */
+    template
+    void intersectRay(
+        const Ray& ray, 
+        RayCallback& intersectCallback, 
+        float& distance,
+        bool intersectCallbackIsFast = false) const {
+        
+        root->intersectRay(ray, intersectCallback, distance, intersectCallbackIsFast);
+    }
+
+
+    /**
+      @brief Finds all members whose bounding boxes intersect the sphere.  The actual
+      elements may not intersect the sphere.
+
+      @param members The results are appended to this array.
+     */
+    void getIntersectingMembers(const Sphere& sphere, Array& members) const {
+        if (root == NULL) {
+            return;
+        }
+
+        AABox box;
+        sphere.getBounds(box);
+        root->getIntersectingMembers(box, sphere, members, true);
+    }
+
+    void getIntersectingMembers(const Sphere& sphere, Array& members) const {
+        Array temp;
+        getIntersectingMembers(sphere, temp);
+        for (int i = 0; i < temp.size(); ++i) {
+            members.append(*temp[i]);
+        }
+    }
+
+    /**
+      Stores the locations of the splitting planes (the structure but not the content)
+      so that the tree can be quickly rebuilt from a previous configuration without 
+      calling balance.
+     */
+    void serializeStructure(BinaryOutput& bo) const {
+        Node::serializeStructure(root, bo);
+    }
+
+    /** Clears the member table */
+    void deserializeStructure(BinaryInput& bi) {
+        clear();
+        root = Node::deserializeStructure(bi);
+    }
+
+    /**
+     Returns an array of all members of the set.  See also KDTree::begin.
+     */
+    void getMembers(Array& members) const {
+        Array temp;
+        memberTable.getKeys(temp);
+        for (int i = 0; i < temp.size(); ++i) {
+            members.append(*(temp.handle));
+        }
+    }
+
+
+    /** If a value that is EqualsFunc to @a value is present, returns a pointer to the 
+        version stored in the data structure, otherwise returns NULL.
+     */
+    const T* getPointer(const T& value) const {
+        // Temporarily create a handle and member
+        Handle h(value);
+        const Member* member = memberTable.getKeyPointer(Member(&h));
+        if (member == NULL) {
+            // Not found
+            return NULL;
+        } else {
+            return &(member->handle->value);
+        }
+    }
+
+
+    /**
+     C++ STL style iterator variable.  See begin().
+     Overloads the -> (dereference) operator, so this acts like a pointer
+     to the current member.
+    */
+    class Iterator {
+    private:
+        friend class TreeType;
+
+        // Note: this is a Table iterator, we are currently defining
+        // Set iterator
+        typename Table::Iterator it;
+
+        Iterator(const typename Table::Iterator& it) : it(it) {}
+
+    public:
+
+        inline bool operator!=(const Iterator& other) const {
+            return !(*this == other);
+        }
+
+        bool operator==(const Iterator& other) const {
+            return it == other.it;
+        }
+
+        /**
+         Pre increment.
+         */
+        Iterator& operator++() {
+            ++it;
+            return *this;
+        }
+
+    private:
+        /**
+         Post increment (slower than preincrement).  Intentionally unimplemented to prevent slow code.
+         */
+        Iterator operator++(int);/* {
+            Iterator old = *this;
+            ++(*this);
+            return old;
+        }*/
+    public:
+
+        const T& operator*() const {
+            return it->key.handle->value;
+        }
+
+        T* operator->() const {
+            return &(it->key.handle->value);
+        }
+
+        operator T*() const {
+            return &(it->key.handle->value);
+        }
+    };
+
+
+    /**
+     C++ STL style iterator method.  Returns the first member.  
+     Use preincrement (++entry) to get to the next element (iteration
+     order is arbitrary).  
+     Do not modify the set while iterating.
+     */
+    Iterator begin() const {
+        return Iterator(memberTable.begin());
+    }
+
+
+    /**
+     C++ STL style iterator method.  Returns one after the last iterator
+     element.
+     */
+    Iterator end() const {
+        return Iterator(memberTable.end());
+    }
+#undef TreeType
+};
+
+
+}
+
+#endif
diff --git a/externals/g3dlite/G3D/Line.h b/externals/g3dlite/G3D/Line.h
new file mode 100644
index 00000000000..3579a6becec
--- /dev/null
+++ b/externals/g3dlite/G3D/Line.h
@@ -0,0 +1,105 @@
+/**
+ @file Line.h
+ 
+ Line class
+ 
+ @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+ 
+ @created 2001-06-02
+ @edited  2006-02-28
+ */
+
+#ifndef G3D_LINE_H
+#define G3D_LINE_H
+
+#include "G3D/platform.h"
+#include "G3D/Vector3.h"
+
+namespace G3D {
+
+class Plane;
+
+/**
+ An infinite 3D line.
+ */
+class Line {
+protected:
+
+    Vector3 _point;
+    Vector3 _direction;
+
+    Line(const Vector3& point, const Vector3& direction) {
+        _point     = point;
+        _direction = direction.direction();
+    }
+
+public:
+
+    /** Undefined (provided for creating Array only) */
+    inline Line() {}
+
+	Line(class BinaryInput& b);
+
+	void serialize(class BinaryOutput& b) const;
+
+	void deserialize(class BinaryInput& b);
+
+    virtual ~Line() {}
+
+    /**
+      Constructs a line from two (not equal) points.
+     */
+    static Line fromTwoPoints(const Vector3 &point1, const Vector3 &point2) {
+        return Line(point1, point2 - point1);
+    }
+
+    /**
+      Creates a line from a point and a (nonzero) direction.
+     */
+    static Line fromPointAndDirection(const Vector3& point, const Vector3& direction) {
+        return Line(point, direction);
+    }
+
+    /**
+      Returns the closest point on the line to point.
+     */
+    Vector3 closestPoint(const Vector3& pt) const;
+
+    /**
+      Returns the distance between point and the line
+     */
+    double distance(const Vector3& point) const {
+        return (closestPoint(point) - point).magnitude();
+    }
+
+    /** Returns a point on the line */
+    Vector3 point() const;
+
+    /** Returns the direction (or negative direction) of the line */
+    Vector3 direction() const;
+
+    /**
+     Returns the point where the line and plane intersect.  If there
+     is no intersection, returns a point at infinity.
+     */
+    Vector3 intersection(const Plane &plane) const;
+
+
+    /** Finds the closest point to the two lines.
+        
+        @param minDist Returns the minimum distance between the lines.
+
+        @cite http://objectmix.com/graphics/133793-coordinates-closest-points-pair-skew-lines.html
+    */
+    Vector3 closestPoint(const Line& B, float& minDist) const;
+
+    inline Vector3 closestPoint(const Line& B) const {
+        float m;
+        return closestPoint(B, m);
+    }
+};
+
+};// namespace
+
+
+#endif
diff --git a/externals/g3dlite/G3D/LineSegment.h b/externals/g3dlite/G3D/LineSegment.h
new file mode 100644
index 00000000000..70210ec7e00
--- /dev/null
+++ b/externals/g3dlite/G3D/LineSegment.h
@@ -0,0 +1,115 @@
+/**
+ @file LineSegment.h
+  
+ @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+ 
+ @created 2003-02-08
+ @edited  2008-02-02
+ */
+
+#ifndef G3D_LINESEGMENT_H
+#define G3D_LINESEGMENT_H
+
+#include "G3D/platform.h"
+#include "G3D/Vector3.h"
+
+namespace G3D {
+
+/**
+ An finite segment of an infinite 3D line.
+ */
+class LineSegment {
+protected:
+
+    Vector3             _point;
+
+    /** Not normalized */
+    Vector3             direction;
+
+    LineSegment(const Vector3& __point, const Vector3& _direction) : _point(__point), direction(_direction) {
+    }
+
+public:
+
+    inline LineSegment() : _point(Vector3::zero()), direction(Vector3::zero()) {}
+
+	LineSegment(class BinaryInput& b);
+
+	void serialize(class BinaryOutput& b) const;
+
+	void deserialize(class BinaryInput& b);
+
+    virtual ~LineSegment() {}
+
+    /**
+     * Constructs a line from two (not equal) points.
+     */
+    static LineSegment fromTwoPoints(const Vector3 &point1, const Vector3 &point2) {
+        return LineSegment(point1, point2 - point1);
+    }
+
+	/** Call with 0 or 1 */
+    Vector3 point(int i) const;
+
+    inline float length() const {
+        return direction.magnitude();
+    }
+
+    /**
+     * Returns the closest point on the line segment to point.
+     */
+    Vector3 closestPoint(const Vector3 &point) const;
+
+    /**
+     Returns the distance between point and the line
+     */
+    double distance(const Vector3& p) const {
+        return (closestPoint(p) - p).magnitude();
+    }
+
+    double distanceSquared(const Vector3& p) const {
+        return (closestPoint(p) - p).squaredMagnitude();
+    }
+
+    /** Returns true if some part of this segment is inside the sphere */
+    bool intersectsSolidSphere(const class Sphere& s) const;
+
+    Vector3 randomPoint() const;
+
+};
+
+
+class LineSegment2D {
+private:
+
+    Vector2         m_origin;
+
+    /** Not normalized */
+    Vector2         m_direction;
+
+    /** Length of m_direction */
+    float           m_length;
+
+public:
+    
+    LineSegment2D() {}
+
+    static LineSegment2D fromTwoPoints(const Vector2& p0, const Vector2& p1);
+
+    /** Returns the intersection of these segements (including 
+       testing endpoints), or Vector2::inf() if they do not intersect. */
+    Vector2 intersection(const LineSegment2D& other) const;
+
+    Vector2 point(int i) const;
+
+    Vector2 closestPoint(const Vector2& Q) const;
+
+    float distance(const Vector2& p) const;
+
+    float length() const;
+};
+
+} // namespace
+
+
+#endif
diff --git a/externals/g3dlite/G3D/Log.h b/externals/g3dlite/G3D/Log.h
new file mode 100644
index 00000000000..d252d0c1a17
--- /dev/null
+++ b/externals/g3dlite/G3D/Log.h
@@ -0,0 +1,109 @@
+/**
+  @file Log.h
+
+  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+  @cite Backtrace by Aaron Orenstein
+  @created 2001-08-04
+  @edited  2005-11-04
+ */
+
+#ifndef G3D_LOG_H
+#define G3D_LOG_H
+
+#include 
+#include 
+#include "G3D/platform.h"
+
+#ifndef G3D_WIN32
+    #include 
+#endif
+
+namespace G3D {
+
+/** Prints to the common system log, log.txt, which is usually 
+    in the working directory of the program.  If your disk is 
+    not writable or is slow, it will attempt to write to "c:/tmp/log.txt" or
+     "c:/temp/log.txt" on Windows systems instead. 
+
+    Unlike printf or debugPrintf, 
+    this function guarantees that all output is committed before it returns.
+    This is very useful for debugging a crash, which might hide the last few
+    buffered print statements otherwise.
+
+    Many G3D routines write useful warnings and debugging information to the
+    system log, which makes it a good first place to go when tracking down
+    a problem.
+     */
+void logPrintf(const char* fmt, ...);
+
+/** Does not flush the buffer; follow up with a logPrintf to force the flush. */
+void logLazyPrintf(const char* fmt, ...);
+
+/**
+ System log for debugging purposes.  The first log opened
+ is the "common log" and can be accessed with the static
+ method common().  If you access common() and a common log
+ does not yet exist, one is created for you.
+ */
+class Log {
+private:
+
+    /**
+     Log messages go here.
+     */
+    FILE*                   logFile;
+
+    std::string             filename;
+
+    static Log*             commonLog;
+
+    int                     stripFromStackBottom;
+
+public:
+
+    /**
+     @param stripFromStackBottom Number of call stacks to strip from the
+     bottom of the stack when printing a trace.  Useful for hiding
+     routines like "main" and "WinMain".  If the specified file cannot
+     be opened for some reason, tries to open "c:/tmp/log.txt" or
+     "c:/temp/log.txt" instead.
+     */
+    Log(const std::string& filename = "log.txt",
+        int stripFromStackBottom    = 0);
+
+    virtual ~Log();
+
+    /**
+     Returns the handle to the file log.
+     */
+    FILE* getFile() const;
+
+    /**
+     Marks the beginning of a logfile section.
+     */
+    void section(const std::string& s);
+
+    /**
+     Given arguments like printf, writes characters to the debug text overlay.
+     */
+    // We want G3D_CHECK_PRINTF_ARGS here, but that conflicts with the
+    // overload.
+    void __cdecl printf(const char* fmt, ...) G3D_CHECK_PRINTF_METHOD_ARGS;
+
+    void __cdecl vprintf(const char*, va_list argPtr) G3D_CHECK_VPRINTF_METHOD_ARGS;
+    /** Does not flush */
+    void __cdecl lazyvprintf(const char*, va_list argPtr) G3D_CHECK_VPRINTF_METHOD_ARGS;
+
+    static Log* common();
+
+    static std::string getCommonLogFilename();
+
+    void print(const std::string& s);
+
+
+    void println(const std::string& s);
+};
+
+}
+
+#endif
diff --git a/externals/g3dlite/G3D/Map2D.h b/externals/g3dlite/G3D/Map2D.h
new file mode 100644
index 00000000000..9af9f7242c1
--- /dev/null
+++ b/externals/g3dlite/G3D/Map2D.h
@@ -0,0 +1,667 @@
+/**
+ @file Map2D.h
+
+ More flexible support than provided by G3D::GImage.
+
+ @maintainer Morgan McGuire, morgan@cs.brown.edu
+ @created 2004-10-10
+ @edited  2009-03-24
+ */
+#ifndef G3D_Map2D_h
+#define G3D_Map2D_h
+
+#include "G3D/platform.h"
+#include "G3D/g3dmath.h"
+#include "G3D/Array.h"
+#include "G3D/vectorMath.h"
+#include "G3D/Vector2int16.h"
+#include "G3D/ReferenceCount.h"
+#include "G3D/AtomicInt32.h"
+#include "G3D/GThread.h"
+#include "G3D/Rect2D.h"
+#include "G3D/WrapMode.h"
+
+#include 
+
+namespace G3D {
+namespace _internal {
+
+/** The default compute type for a type is the type itself. */
+template class _GetComputeType {
+public:
+    typedef Storage Type;
+};
+
+} // _internal
+} // G3D
+
+// This weird syntax is needed to support VC6, which doesn't
+// properly implement template overloading.
+#define DECLARE_COMPUTE_TYPE(StorageType, ComputeType)            \
+namespace G3D {                                                   \
+    namespace _internal {                                         \
+        template<> class _GetComputeType < StorageType > {        \
+        public:                                                   \
+            typedef ComputeType Type;                             \
+        };                                                        \
+    }                                                             \
+}
+
+DECLARE_COMPUTE_TYPE( float32,  float64)
+DECLARE_COMPUTE_TYPE( float64,  float64)
+
+DECLARE_COMPUTE_TYPE( int8,     float32)
+DECLARE_COMPUTE_TYPE( int16,    float32)
+DECLARE_COMPUTE_TYPE( int32,    float64)
+DECLARE_COMPUTE_TYPE( int64,    float64)
+
+DECLARE_COMPUTE_TYPE( uint8,     float32)
+DECLARE_COMPUTE_TYPE( uint16,    float32)
+DECLARE_COMPUTE_TYPE( uint32,    float64)
+DECLARE_COMPUTE_TYPE( uint64,    float64)
+
+DECLARE_COMPUTE_TYPE( Vector2,  Vector2)
+DECLARE_COMPUTE_TYPE( Vector2int16,  Vector2)
+
+DECLARE_COMPUTE_TYPE( Vector3,  Vector3)
+DECLARE_COMPUTE_TYPE( Vector3int16,  Vector3)
+
+DECLARE_COMPUTE_TYPE( Vector4,  Vector4)
+
+DECLARE_COMPUTE_TYPE( Color3,  Color3)
+DECLARE_COMPUTE_TYPE( Color3uint8,  Color3)
+
+DECLARE_COMPUTE_TYPE( Color4,  Color4)
+DECLARE_COMPUTE_TYPE( Color4uint8,  Color4)
+#undef DECLARE_COMPUTE_TYPE
+
+namespace G3D {
+
+/**
+  Map of values across a discrete 2D plane.  Can be thought of as a generic class for 2D images, 
+  allowing flexibility as to pixel format and convenient methods.
+  In fact, the "pixels" can be any values
+  on a grid that can be sensibly interpolated--RGB colors, scalars, 4D vectors, and so on.
+
+  Other "image" classes in G3D:
+
+  G3D::GImage - Supports file formats, fast, Color3uint8 and Color4uint8 formats.  No interpolation.
+
+  G3D::Texture::Ref - Represents image on the graphics card (not directly readable on the CPU).  Supports 2D, 3D, and a variety of interpolation methods, loads file formats.
+
+  G3D::Image3 - A subclass of Map2D that supports image loading and saving and conversion to Texture.
+
+  G3D::Image4 - A subclass of Map2D that supports image loading and saving and conversion to Texture.
+
+  G3D::Image3uint8 - A subclass of Map2D that supports image loading and saving and conversion to Texture.
+
+  G3D::Image4uint8 -  A subclass of Map2D that supports image loading and saving and conversion to Texture.
+
+  There are two type parameters-- the first (@ Storage) is the type 
+  used to store the "pixel" values efficiently and 
+  the second (@a Compute) is
+  the type operated on by computation.  The Compute::Compute(Storage&) constructor
+  is used to convert between storage and computation types.
+  @a Storage is often an integer version of @a Compute, for example 
+  Map2D.  By default, the computation type is:
+
+  
+     Storage       Computation
+
+     uint8          float32
+     uint16         float32
+     uint32         float64
+     uint64         float64
+
+     int8           float32
+     int16          float32
+     int32          float64
+     int64          float64
+
+     float32        float64
+     float64        float64
+
+     Vector2        Vector2
+     Vector2int16   Vector2
+
+     Vector3        Vector3
+     Vector3int16   Vector3
+
+     Vector4        Vector4
+
+     Color3         Color3
+     Color3uint8    Color3
+
+     Color4         Color4
+     Color4uint8    Color4
+    

+  Any other storage type defaults to itself as the computation type.
+
+  The computation type can be any that 
+  supports lerp, +, -, *, /, and an empty constructor.
+
+  Assign value:
+
+    im->set(x, y, 7); or 
+    im->get(x, y) = 7;
+
+  Read value:
+
+    int c = im(x, y);
+
+  Can also sample with nearest neighbor, bilinear, and bicubic
+  interpolation.  
+  
+  Sampling follows OpenGL conventions, where 
+  pixel values represent grid points and (0.5, 0.5) is half-way
+  between two vertical and two horizontal grid points.  
+  To draw an image of dimensions w x h with nearest neighbor
+  sampling, render pixels from [0, 0] to [w - 1, h - 1].
+
+  Under the WrapMode::CLAMP wrap mode, the value of bilinear interpolation
+  becomes constant outside [1, w - 2] horizontally.  Nearest neighbor
+  interpolation is constant outside [0, w - 1] and bicubic outside
+  [3, w - 4].  The class does not offer quadratic interpolation because
+  the interpolation filter could not center over a pixel.
+  
+  @author Morgan McGuire, http://graphics.cs.williams.edu
+ */
+template< typename Storage, 
+typename Compute = typename G3D::_internal::_GetComputeType::Type>
+class Map2D : public ReferenceCountedObject {
+
+//
+// It doesn't make sense to automatically convert from Compute back to Storage
+// because the rounding rule (and scaling) is application dependent.
+// Thus the interpolation methods all return type Compute.
+//
+
+public:
+
+    typedef Storage StorageType;
+    typedef Compute ComputeType;
+    typedef Map2D Type;
+    typedef ReferenceCountedPointer Ref;
+
+protected:
+    
+    Storage ZERO;
+
+    /** Width, in pixels. */
+    uint32              w;
+
+    /** Height, in pixels. */
+    uint32              h;
+
+    WrapMode            _wrapMode;
+
+    /** 0 if no mutating method has been invoked 
+        since the last call to setChanged(); */
+    AtomicInt32         m_changed;
+
+    Array      data;
+
+    /** Handles the exceptional cases from get */
+    const Storage& slowGet(int x, int y, WrapMode wrap) {
+        switch (wrap) {
+        case WrapMode::CLAMP:
+            return fastGet(iClamp(x, 0, w - 1), iClamp(y, 0, h - 1));
+
+        case WrapMode::TILE:
+            return fastGet(iWrap(x, w), iWrap(y, h));
+
+        case WrapMode::ZERO:
+            return ZERO;
+
+        case WrapMode::ERROR:
+            alwaysAssertM(((uint32)x < w) && ((uint32)y < h), 
+                format("Index out of bounds: (%d, %d), w = %d, h = %d",
+                x, y, w, h));
+
+            // intentionally fall through
+        case WrapMode::IGNORE:
+            // intentionally fall through
+        default:
+            {
+                static Storage temp;
+                return temp;
+            }
+        }
+    }
+
+public:
+
+    /** Unsafe access to the underlying data structure with no wrapping support; requires that (x, y) is in bounds. */
+    inline const Storage& fastGet(int x, int y) const {
+        debugAssert(((uint32)x < w) && ((uint32)y < h));
+        return data[x + y * w];
+    }
+
+    /** Unsafe access to the underlying data structure with no wrapping support; requires that (x, y) is in bounds. */
+    inline void fastSet(int x, int y, const Storage& v) {
+        debugAssert(((uint32)x < w) && ((uint32)y < h));
+        data[x + y * w] = v;
+    }
+
+protected:
+
+    /** Given four control points and a value on the range [0, 1)
+        evaluates the Catmull-rom spline between the times of the
+        middle two control points */
+    Compute bicubic(const Compute* ctrl, double s) const {
+
+        // f = B * S * ctrl'
+
+        // B matrix: Catmull-Rom spline basis
+        static const double B[4][4] = {
+            { 0.0, -0.5,  1.0, -0.5},
+            { 1.0,  0.0, -2.5,  1.5},
+            { 0.0,  0.5,  2.0, -1.5},
+            { 0.0,  0.0, -0.5,  0.5}}; 
+
+        // S: Powers of the fraction
+        double S[4];
+        double s2 = s * s;
+        S[0] = 1.0;
+        S[1] = s;
+        S[2] = s2;
+        S[3] = s2 * s;
+
+        Compute sum(ZERO);
+
+        for (int c = 0; c < 4; ++c) {
+            double coeff = 0.0;
+            for (int power = 0; power < 4; ++power) {
+                coeff += B[c][power] * S[power];
+            }
+            sum += ctrl[c] * coeff;
+        }
+
+        return sum;
+    }
+
+
+    Map2D(int w, int h, WrapMode wrap) : w(0), h(0), _wrapMode(wrap), m_changed(1) {
+        ZERO = Storage(Compute(Storage()) * 0);
+        resize(w, h);
+    }
+
+public:
+
+    /**
+     Although Map2D is not threadsafe (except for the setChanged() method),
+     you can use this mutex to create your own threadsafe access to a Map2D.
+     Not used by the default implementation.
+    */
+    GMutex mutex;
+
+    static Ref create(int w = 0, int h = 0, WrapMode wrap = WrapMode::ERROR) {
+        return new Map2D(w, h, wrap);
+    }
+
+    /** Resizes without clearing, leaving garbage.
+      */
+    void resize(uint32 newW, uint32 newH) {
+        if ((newW != w) || (newH != h)) {
+            w = newW;
+            h = newH;
+            data.resize(w * h);
+            setChanged(true);
+        }
+    }
+
+    /** 
+     Returns true if this map has been written to since the last call to setChanged(false).
+     This is useful if you are caching a texture map other value that must be recomputed
+     whenever this changes.
+     */
+    bool changed() {
+        return m_changed.value() != 0;
+    }
+
+    /** Set/unset the changed flag. */
+    void setChanged(bool c) {
+        m_changed = c ? 1 : 0;
+    }
+
+    /** Returns a pointer to the underlying row-major data. There is no padding at the end of the row.
+        Be careful--this will be reallocated during a resize.  You should call setChanged(true) if you mutate the array.*/
+    Storage* getCArray() {
+        return data.getCArray();
+    }
+
+
+    const Storage* getCArray() const {
+        return data.getCArray();
+    }
+
+
+    /** Row-major array.  You should call setChanged(true) if you mutate the array. */
+    Array& getArray() {
+        return data;
+    }
+
+
+    const Array& getArray() const {
+        return data;
+    }
+
+    /** is (x, y) strictly within the image bounds, or will it trigger some kind of wrap mode */
+    inline bool inBounds(int x, int y) const {
+        return (((uint32)x < w) && ((uint32)y < h));
+    }
+
+    /** is (x, y) strictly within the image bounds, or will it trigger some kind of wrap mode */
+    inline bool inBounds(const Vector2int16& v) const {
+        return inBounds(v.x, v.y);
+    }
+
+    /** Get the value at (x, y).
+    
+        Note that the type of image->get(x, y) is 
+        the storage type, not the computation
+        type.  If the constructor promoting Storage to Compute rescales values
+        (as, for example Color3(Color3uint8&) does), this will not match the value
+        returned by Map2D::nearest.
+      */
+    inline const Storage& get(int x, int y, WrapMode wrap) const {
+        if (((uint32)x < w) && ((uint32)y < h)) {
+            return data[x + y * w];
+        } else {
+            // Remove the const to allow a slowGet on this object
+            // (we're returning a const reference so this is ok)
+            return const_cast(this)->slowGet(x, y, wrap);
+        }
+#       ifndef G3D_WIN32
+            // gcc gives a useless warning that the above code might reach the end of the function;
+            // we use this line to supress the warning.
+            return ZERO;
+#       endif
+    }
+
+    inline const Storage& get(int x, int y) const {
+        return get(x, y, _wrapMode);
+    }
+
+    inline const Storage& get(const Vector2int16& p) const {
+        return get(p.x, p.y, _wrapMode);
+    }
+
+    inline const Storage& get(const Vector2int16& p, WrapMode wrap) const {
+        return get(p.x, p.y, wrap);
+    }
+
+    inline Storage& get(int x, int y, WrapMode wrap) {
+        return const_cast(const_cast(this)->get(x, y, wrap));
+#       ifndef G3D_WIN32
+            // gcc gives a useless warning that the above code might reach the end of the function;
+            // we use this line to supress the warning.
+            return ZERO;
+#       endif
+    }
+
+    inline Storage& get(int x, int y) {
+        return const_cast(const_cast(this)->get(x, y));
+#       ifndef G3D_WIN32
+            // gcc gives a useless warning that the above code might reach the end of the function;
+            // we use this line to supress the warning.
+            return ZERO;
+#       endif
+    }
+
+    inline Storage& get(const Vector2int16& p) {
+        return get(p.x, p.y);
+    }
+
+    /** Sets the changed flag to true */
+    inline void set(const Vector2int16& p, const Storage& v) {
+        set(p.x, p.y, v);
+    }
+
+    /** Sets the changed flag to true */
+    void set(int x, int y, const Storage& v, WrapMode wrap) {
+        setChanged(true);
+        if (((uint32)x < w) && ((uint32)y < h)) {
+            // In bounds, wrapping isn't an issue.
+            data[x + y * w] = v;
+        } else {
+            const_cast(slowGet(x, y, wrap)) = v;
+        }
+    }
+
+    void set(int x, int y, const Storage& v) {
+        set(x, y, v, _wrapMode);
+    }
+
+
+    void setAll(const Storage& v) {
+        for(int i = 0; i < data.size(); ++i) {
+            data[i] = v;
+        }
+        setChanged(true);
+    }
+
+    /** flips if @a flip is true*/
+    void maybeFlipVertical(bool flip) {
+        if (flip) {
+            flipVertical();
+        }
+    }
+
+	virtual void flipVertical() {
+		int halfHeight = h/2;
+		Storage* d = data.getCArray();
+		for (int y = 0; y < halfHeight; ++y) {
+			int o1 = y * w;
+			int o2 = (h - y - 1) * w;
+			for (int x = 0; x < (int)w; ++x) {
+				int i1 = o1 + x;
+				int i2 = o2 + x;
+				Storage temp = d[i1];
+				d[i1] = d[i2];
+				d[i2] = temp;
+			}
+		}
+        setChanged(true);
+	}
+
+	virtual void flipHorizontal() {
+		int halfWidth = w / 2;
+		Storage* d = data.getCArray();
+		for (int x = 0; x < halfWidth; ++x) {
+			for (int y = 0; y < (int)h; ++y) {
+				int i1 = y * w + x;
+				int i2 = y * w + (w - x - 1);
+				Storage temp = d[i1];
+				d[i1] = d[i2];
+				d[i2] = temp;
+			}
+		}
+        setChanged(true);
+	}
+
+    /**
+     Crops this map so that it only contains pixels between (x, y) and (x + w - 1, y + h - 1) inclusive.
+     */
+    virtual void crop(int newX, int newY, int newW, int newH) {
+        alwaysAssertM(newX + newW <= (int)w, "Cannot grow when cropping");
+        alwaysAssertM(newY + newH <= (int)h, "Cannot grow when cropping");
+        alwaysAssertM(newX >= 0 && newY >= 0, "Origin out of bounds.");
+
+        // Always safe to copy towards the upper left, provided 
+        // that we're iterating towards the lower right.  This lets us avoid
+        // reallocating the underlying array.
+        for (int y = 0; y < newH; ++y) {
+            for (int x = 0; x < newW; ++x) {
+                data[x + y * newW] = data[(x + newX) + (y + newY) * w];
+            }
+        }
+
+        resize(newW, newH);
+    }
+
+    /** iRounds to the nearest x0 and y0. */
+    virtual void crop(const Rect2D& rect) {
+        crop(iRound(rect.x0()), iRound(rect.y0()), iRound(rect.x1()) - iRound(rect.x0()), iRound(rect.y1()) - iRound(rect.y0()));
+    }
+
+    /** Returns the nearest neighbor.  Pixel values are considered
+        to be at the upper left corner, so image->nearest(x, y) == image(x, y)
+      */
+    inline Compute nearest(float x, float y, WrapMode wrap) const {
+        int ix = iRound(x);
+        int iy = iRound(y);
+        return Compute(get(ix, iy, wrap));
+    }
+
+    inline Compute nearest(float x, float y) const {
+        return nearest(x, y, _wrapMode);
+    }
+
+    inline Compute nearest(const Vector2& p) const {
+        return nearest(p.x, p.y);
+    }
+
+    /** Returns the average value of all elements of the map */
+    Compute average() const {
+        if ((w == 0) || (h == 0)) {
+            return ZERO;
+        }
+
+        // To avoid overflows, compute the average of row averages
+
+        Compute rowSum = ZERO;
+        for (unsigned int y = 0; y < h; ++y) {
+            Compute sum = ZERO;
+            int offset = y * w;
+            for (unsigned int x = 0; x < w; ++x) {
+                sum += Compute(data[offset + x]);
+            }
+            rowSum += sum * (1.0f / w);
+        }
+
+        return rowSum * (1.0f / h);
+    }
+
+    /** 
+      Needs to access elements from (floor(x), floor(y))
+      to (floor(x) + 1, floor(y) + 1) and will use
+      the wrap mode appropriately (possibly generating 
+      out of bounds errors).
+
+      Guaranteed to match nearest(x, y) at integers. */ 
+    Compute bilinear(float x, float y, WrapMode wrap) const {
+        const int i = iFloor(x);
+        const int j = iFloor(y);
+    
+        const float fX = x - i;
+        const float fY = y - j;
+
+        // Horizontal interpolation, first row
+        const Compute& t0 = get(i, j, wrap);
+        const Compute& t1 = get(i + 1, j, wrap);
+
+        // Horizontal interpolation, second row
+        const Compute& t2 = get(i, j + 1, wrap);
+        const Compute& t3 = get(i + 1, j + 1, wrap);
+
+        const Compute& A = lerp(t0, t1, fX);
+        const Compute& B = lerp(t2, t3, fX);
+
+        // Vertical interpolation
+        return lerp(A, B, fY);
+    }
+
+    Compute bilinear(float x, float y) const {
+        return bilinear(x, y, _wrapMode);
+    }
+
+    inline Compute bilinear(const Vector2& p) const {
+        return bilinear(p.x, p.y, _wrapMode);
+    }
+
+    inline Compute bilinear(const Vector2& p, WrapMode wrap) const {
+        return bilinear(p.x, p.y, wrap);
+    }
+
+    /**
+     Uses Catmull-Rom splines to interpolate between grid
+     values.  Guaranteed to match nearest(x, y) at integers.
+     */
+    Compute bicubic(float x, float y, WrapMode wrap) const {
+        int i = iFloor(x);
+        int j = iFloor(y);
+        float fX = x - i;
+        float fY = y - j;
+
+        Compute vsample[4];
+        for (int v = 0; v < 4; ++v) {
+
+            // Horizontal interpolation
+            Compute hsample[4];
+            for (int u = 0; u < 4; ++u) {
+                hsample[u] = Compute(get(i + u - 1, j + v - 1, wrap));
+            }
+    
+            vsample[v] = bicubic(hsample, fX);
+        }
+
+        //  Vertical interpolation
+        return bicubic(vsample, fY);
+    }
+
+    Compute bicubic(float x, float y) const {
+        return bicubic(x, y, _wrapMode);
+    }
+
+    inline Compute bicubic(const Vector2& p, WrapMode wrap) const {
+        return bicubic(p.x, p.y, wrap);
+    }
+
+    inline Compute bicubic(const Vector2& p) const {
+        return bicubic(p.x, p.y, _wrapMode);
+    }
+
+    /** Pixel width */
+    inline int32 width() const {
+        return (int32)w;
+    }
+
+
+    /** Pixel height */
+    inline int32 height() const {
+        return (int32)h;
+    }
+
+
+    /** Dimensions in pixels */
+    Vector2int16 size() const {
+        return Vector2int16(w, h);
+    }
+
+    /** Rectangle from (0, 0) to (w, h) */
+    Rect2D rect2DBounds() const {
+        return Rect2D::xywh(0, 0, w, h);
+    }
+
+    /** Number of bytes occupied by the image data and this structure */
+    size_t sizeInMemory() const {
+        return data.size() * sizeof(Storage) + sizeof(*this);
+    }
+
+
+    WrapMode wrapMode() const {
+        return _wrapMode;
+    }
+
+
+    void setWrapMode(WrapMode m) {
+        _wrapMode = m;
+    }
+};
+
+
+
+}
+
+#endif // G3D_IMAGE_H
diff --git a/externals/g3dlite/G3D/Matrix.h b/externals/g3dlite/G3D/Matrix.h
new file mode 100644
index 00000000000..3c5394d9a76
--- /dev/null
+++ b/externals/g3dlite/G3D/Matrix.h
@@ -0,0 +1,634 @@
+/**
+  @file Matrix.h
+  @author Morgan McGuire, http://graphics.cs.williams.edu
+
+  @created 2005-10-23
+  @edited  2007-07-18
+  */
+
+#ifndef G3D_MATRIX_H
+#define G3D_MATRIX_H
+
+#include "G3D/g3dmath.h"
+#include "G3D/Vector3.h"
+#include "G3D/Vector4.h"
+#include "G3D/Matrix3.h"
+#include "G3D/Matrix4.h"
+#include "G3D/ReferenceCount.h"
+
+namespace G3D {
+
+/** 
+ N x M matrix.  
+ 
+ The actual data is tracked internally by a reference counted pointer;
+ it is efficient to pass and assign Matrix objects because no data is actually copied.
+ This avoids the headache of pointers and allows natural math notation:
+
+  
+    Matrix A, B, C;
+    // ...
+
+    C = A * f(B);
+    C = C.inverse();
+
+    A = Matrix::identity(4);
+    C = A;
+    C.set(0, 0, 2.0); // Triggers a copy of the data so that A remains unchanged.
+
+    // etc.
+
+  

+
+  The Matrix::debugNumCopyOps and Matrix::debugNumAllocOps counters
+  increment every time an operation forces the copy and allocation of matrices.  You
+  can use these to detect slow operations when efficiency is a major concern.
+
+  Some methods accept an output argument instead of returning a value.  For example,
+  A = B.transpose() can also be invoked as B.transpose(A).
+  The latter may be more efficient, since Matrix may be able to re-use the storage of
+  A (if it has approximatly the right size and isn't currently shared with another matrix).  
+
+  @sa G3D::Matrix3, G3D::Matrix4, G3D::Vector2, G3D::Vector3, G3D::Vector4, G3D::CoordinateFrame
+
+  @beta
+ */
+class Matrix {
+public:
+    /** 
+      Internal precision.  Currently float, but this may become a templated class in the future
+      to allow operations like Matrix and Matrix.
+
+      Not necessarily a plain-old-data type (e.g., could ComplexFloat), but must be something 
+      with no constructor, that can be safely memcpyd, and that has a bit pattern of all zeros
+      when zero.*/
+    typedef float T;
+
+    /** Incremented every time the elements of a matrix are copied.  Useful for profiling your
+        own code that uses Matrix to determine when it is slow due to copying.*/
+    static int                     debugNumCopyOps;
+
+    /** Incremented every time a new matrix object is allocated.  Useful for profiling your
+        own code that uses Matrix to determine when it is slow due to allocation.*/
+    static int                     debugNumAllocOps;
+
+private:
+public:
+
+    /** Used internally by Matrix.
+    
+        Does not throw exceptions-- assumes the caller has taken care of 
+        argument checking. */
+    class Impl : public ReferenceCountedObject {
+    public:
+
+        static void* operator new(size_t size) {
+            return System::malloc(size);
+        }
+
+        static void operator delete(void* p) {
+            System::free(p);
+        }
+
+        ~Impl();
+
+    private:
+        friend class Matrix;
+
+        /** elt[r][c] = the element.  Pointers into data.*/
+        T**                 elt;
+
+        /** Row major data for the entire matrix. */
+        T*                  data;
+
+        /** The number of rows */
+        int                 R;
+
+        /** The number of columns */
+        int                 C;
+
+        int                 dataSize;
+
+        /** If R*C is much larger or smaller than the current, deletes all previous data
+            and resets to random data.  Otherwise re-uses existing memory and just resets
+            R, C, and the row pointers. */
+        void setSize(int newRows, int newCols);
+
+        inline Impl() : elt(NULL), data(NULL), R(0), C(0), dataSize(0) {}
+
+        Impl(const Matrix3& M);
+
+        Impl(const Matrix4& M);
+
+        inline Impl(int r, int c) : elt(NULL), data(NULL), R(0), C(0), dataSize(0) {
+            setSize(r, c);
+        }
+
+        Impl& operator=(const Impl& m);
+
+        inline Impl(const Impl& B) : elt(NULL), data(NULL), R(0), C(0), dataSize(0) {
+            // Use the assignment operator
+            *this = B;
+        }
+
+        void setZero();
+
+        inline void set(int r, int c, T v) {
+            debugAssert(r < R);
+            debugAssert(c < C);
+            elt[r][c] = v;
+        }
+
+        inline const T& get(int r, int c) const {
+            debugAssert(r < R);
+            debugAssert(c < C);
+            return elt[r][c];
+        }
+
+        /** Multiplies this by B and puts the result in out. */
+        void mul(const Impl& B, Impl& out) const;
+
+        /** Ok if out == this or out == B */
+        void add(const Impl& B, Impl& out) const;
+
+        /** Ok if out == this or out == B */
+        void add(T B, Impl& out) const;
+
+        /** Ok if out == this or out == B */
+        void sub(const Impl& B, Impl& out) const;
+
+        /** Ok if out == this or out == B */
+        void sub(T B, Impl& out) const;
+
+        /** B - this */
+        void lsub(T B, Impl& out) const;
+
+        /** Ok if out == this or out == B */
+        void arrayMul(const Impl& B, Impl& out) const;
+
+        /** Ok if out == this or out == B */
+        void mul(T B, Impl& out) const;
+
+        /** Ok if out == this or out == B */
+        void arrayDiv(const Impl& B, Impl& out) const;
+
+        /** Ok if out == this or out == B */
+        void div(T B, Impl& out) const;
+
+        void negate(Impl& out) const;
+
+        /** Slow way of computing an inverse; for reference */
+        void inverseViaAdjoint(Impl& out) const;
+
+        /** Use Gaussian elimination with pivots to solve for the inverse destructively in place. */
+        void inverseInPlaceGaussJordan();
+
+        void adjoint(Impl& out) const;
+
+        /** Matrix of all cofactors */
+        void cofactor(Impl& out) const;
+
+        /**
+         Cofactor [r][c] is defined as C[r][c] = -1 ^(r+c) * det(A[r][c]),
+         where A[r][c] is the (R-1)x(C-1) matrix formed by removing row r and
+         column c from the original matrix. 
+        */
+        T cofactor(int r, int c) const;
+
+        /** Ok if out == this or out == B */
+        void transpose(Impl& out) const;
+
+        T determinant() const;
+
+        /** Determinant computed without the given row and column */
+        T determinant(int r, int c) const;
+
+        void arrayLog(Impl& out) const;
+
+        void arrayExp(Impl& out) const;
+
+        void arraySqrt(Impl& out) const;
+
+        void arrayCos(Impl& out) const;
+
+        void arraySin(Impl& out) const;
+
+        void swapRows(int r0, int r1);
+
+        void swapAndNegateCols(int c0, int c1);
+
+        void mulRow(int r, const T& v);
+
+        void abs(Impl& out) const;
+
+        /** Makes a (R-1)x(C-1) copy of this matrix */
+        void withoutRowAndCol(int excludeRow, int excludeCol, Impl& out) const;
+
+        bool anyNonZero() const;
+
+        bool allNonZero() const;
+
+        void setRow(int r, const T* vals);
+
+        void setCol(int c, const T* vals);
+    };
+private:
+
+    typedef ReferenceCountedPointer ImplRef;
+
+    ImplRef       impl;
+
+    inline Matrix(ImplRef i) : impl(i) {}
+    inline Matrix(Impl* i) : impl(ImplRef(i)) {}
+
+    /** Used by SVD */
+    class SortRank {
+    public:
+        T           value;
+        int         col;
+
+        inline bool operator>(const SortRank& x) const {
+            return x.value > value;
+        }
+        
+        inline bool operator<(const SortRank& x) const {
+            return x.value < value;
+        }
+        
+        inline bool operator>=(const SortRank& x) const {
+            return x.value >= value;
+        }
+        
+        inline bool operator<=(const SortRank& x) const {
+            return x.value <= value;
+        }
+        
+        inline bool operator==(const SortRank& x) const {
+            return x.value == value;
+        }
+
+        inline bool operator!=(const SortRank& x) const {
+            return x.value != value;
+        }
+    };
+
+    Matrix vectorPseudoInverse() const;
+    Matrix partitionPseudoInverse() const;
+    Matrix colPartPseudoInverse() const;
+    Matrix rowPartPseudoInverse() const;
+
+    Matrix col2PseudoInverse(const Matrix& B) const;
+    Matrix col3PseudoInverse(const Matrix& B) const;
+    Matrix col4PseudoInverse(const Matrix& B) const;
+    Matrix row2PseudoInverse(const Matrix& B) const;
+    Matrix row3PseudoInverse(const Matrix& B) const;
+    Matrix row4PseudoInverse(const Matrix& B) const;
+
+public:
+
+    Matrix() : impl(new Impl(0, 0)) {}
+
+    Matrix(const Matrix3& M) : impl(new Impl(M)) {}
+
+    Matrix(const Matrix4& M) : impl(new Impl(M)) {}
+
+    template
+    static Matrix fromDiagonal(const Array& d) {
+        Matrix D = zero(d.length(), d.length());
+        for (int i = 0; i < d.length(); ++i) {
+            D.set(i, i, d[i]);
+        }
+        return D;
+    }
+
+    static Matrix fromDiagonal(const Matrix& d);
+
+    /** Returns a new matrix that is all zero. */
+    Matrix(int R, int C) : impl(new Impl(R, C)) {
+        impl->setZero();
+    }
+
+    /** Returns a new matrix that is all zero. */
+    static Matrix zero(int R, int C);
+
+    /** Returns a new matrix that is all one. */
+    static Matrix one(int R, int C);
+
+    /** Returns a new identity matrix */
+    static Matrix identity(int N);
+
+    /** Uniformly distributed values between zero and one. */
+    static Matrix random(int R, int C);
+
+    /** The number of rows */
+    inline int rows() const {
+        return impl->R;
+    }
+
+    /** Number of columns */
+    inline int cols() const {
+        return impl->C;
+    }
+
+    /** Generally more efficient than A * B */
+    Matrix& operator*=(const T& B);
+
+    /** Generally more efficient than A / B */
+    Matrix& operator/=(const T& B);
+
+    /** Generally more efficient than A + B */
+    Matrix& operator+=(const T& B);
+
+    /** Generally more efficient than A - B */
+    Matrix& operator-=(const T& B);
+
+    /** No performance advantage over A * B because
+        matrix multiplication requires intermediate
+        storage. */
+    Matrix& operator*=(const Matrix& B);
+
+    /** Generally more efficient than A + B */
+    Matrix& operator+=(const Matrix& B);
+
+    /** Generally more efficient than A - B */
+    Matrix& operator-=(const Matrix& B);
+
+    /** Returns a new matrix that is a subset of this one,
+        from r1:r2 to c1:c2, inclusive.*/
+    Matrix subMatrix(int r1, int r2, int c1, int c2) const;
+
+    /** Matrix multiplication.  To perform element-by-element multiplication, 
+        see arrayMul. */
+    inline Matrix operator*(const Matrix& B) const {
+        Matrix C(impl->R, B.impl->C);
+        impl->mul(*B.impl, *C.impl);
+        return C;
+    }
+
+    /** See also A *= B, which is more efficient in many cases */
+    inline Matrix operator*(const T& B) const {
+        Matrix C(impl->R, impl->C);
+        impl->mul(B, *C.impl);
+        return C;
+    }
+
+    /** See also A += B, which is more efficient in many cases */
+    inline Matrix operator+(const Matrix& B) const {
+        Matrix C(impl->R, impl->C);
+        impl->add(*B.impl, *C.impl);
+        return C;
+    }
+
+    /** See also A -= B, which is more efficient in many cases */
+    inline Matrix operator-(const Matrix& B) const {
+        Matrix C(impl->R, impl->C);
+        impl->sub(*B.impl, *C.impl);
+        return C;
+    }
+
+    /** See also A += B, which is more efficient in many cases */
+    inline Matrix operator+(const T& v) const {
+        Matrix C(impl->R, impl->C);
+        impl->add(v, *C.impl);
+        return C;
+    }
+
+    /** See also A -= B, which is more efficient in many cases */
+    inline Matrix operator-(const T& v) const {
+        Matrix C(impl->R, impl->C);
+        impl->sub(v, *C.impl);
+        return C;
+    }
+
+
+    Matrix operator>(const T& scalar) const;
+
+    Matrix operator<(const T& scalar) const;
+
+    Matrix operator>=(const T& scalar) const;
+
+    Matrix operator<=(const T& scalar) const;
+
+    Matrix operator==(const T& scalar) const;
+
+    Matrix operator!=(const T& scalar) const;
+
+    /** scalar B - this */
+    inline Matrix lsub(const T& B) const {
+        Matrix C(impl->R, impl->C);
+        impl->lsub(B, *C.impl);
+        return C;
+    }
+
+    inline Matrix arrayMul(const Matrix& B) const {
+        Matrix C(impl->R, impl->C);
+        impl->arrayMul(*B.impl, *C.impl);
+        return C;
+    }
+
+    Matrix3 toMatrix3() const;
+
+    Matrix4 toMatrix4() const;
+    
+    Vector2 toVector2() const;
+
+    Vector3 toVector3() const;
+
+    Vector4 toVector4() const;
+
+    /** Mutates this */
+    void arrayMulInPlace(const Matrix& B);
+
+    /** Mutates this */
+    void arrayDivInPlace(const Matrix& B);
+
+    // Declares an array unary method and its explicit-argument counterpart
+#   define DECLARE_METHODS_1(method)\
+    inline Matrix method() const {\
+        Matrix C(impl->R, impl->C);\
+        impl->method(*C.impl);\
+        return C;\
+    }\
+    void method(Matrix& out) const;
+
+
+    DECLARE_METHODS_1(abs)
+    DECLARE_METHODS_1(arrayLog)
+    DECLARE_METHODS_1(arrayExp)
+    DECLARE_METHODS_1(arraySqrt)
+    DECLARE_METHODS_1(arrayCos)
+    DECLARE_METHODS_1(arraySin)
+    DECLARE_METHODS_1(negate)
+
+#   undef DECLARE_METHODS_1
+
+    inline Matrix operator-() const {
+        return negate();
+    }
+
+    /**
+     A-1 computed using the Gauss-Jordan algorithm,
+     for square matrices.
+     Run time is O(R3), where R is the 
+     number of rows.
+     */
+    inline Matrix inverse() const {
+        Impl* A = new Impl(*impl);
+        A->inverseInPlaceGaussJordan();
+        return Matrix(A);
+    }
+
+    inline T determinant() const {
+        return impl->determinant();
+    }
+
+    /**
+     AT
+     */
+    inline Matrix transpose() const {
+        Impl* A = new Impl(cols(), rows());
+        impl->transpose(*A);
+        return Matrix(A);
+    }
+
+    /** Transpose in place; more efficient than transpose */
+    void transpose(Matrix& out) const;
+
+    inline Matrix adjoint() const {
+        Impl* A = new Impl(cols(), rows());
+        impl->adjoint(*A);
+        return Matrix(A);
+    }
+
+    /**     
+     (ATA)-1AT) computed 
+     using SVD.
+
+     @param tolerance Use -1 for automatic tolerance.
+     */
+    Matrix pseudoInverse(float tolerance = -1) const;
+
+    /** Called from pseudoInverse when the matrix has size > 4 along some dimension.*/
+    Matrix svdPseudoInverse(float tolerance = -1) const;
+
+    /**
+     (ATA)-1AT) computed
+     using Gauss-Jordan elimination.
+     */
+    inline Matrix gaussJordanPseudoInverse() const {
+        Matrix trans = transpose();
+        return (trans * (*this)).inverse() * trans;
+    }
+
+    /** Singular value decomposition.  Factors into three matrices 
+        such that @a this = @a U * fromDiagonal(@a d) * @a V.transpose().
+
+        The matrix must have at least as many rows as columns.
+        
+        Run time is O(C2*R).
+
+        @param sort If true (default), the singular values
+        are arranged so that D is sorted from largest to smallest.
+        */
+    void svd(Matrix& U, Array& d, Matrix& V, bool sort = true) const;
+
+    void set(int r, int c, T v);
+
+    void setCol(int c, const Matrix& vec);
+
+    void setRow(int r, const Matrix& vec);
+
+    Matrix col(int c) const;
+
+    Matrix row(int r) const;
+
+    T get(int r, int c) const;
+
+    Vector2int16 size() const {
+        return Vector2int16(rows(), cols());
+    }
+
+    int numElements() const {
+        return rows() * cols();
+    }
+
+    void swapRows(int r0, int r1);
+
+    /** Swaps columns c0 and c1 and negates both */
+    void swapAndNegateCols(int c0, int c1);
+
+    void mulRow(int r, const T& v);
+
+    /** Returns true if any element is non-zero */
+    bool anyNonZero() const;
+
+    /** Returns true if all elements are non-zero */
+    bool allNonZero() const;
+
+    inline bool allZero() const {
+        return !anyNonZero();
+    }
+
+    inline bool anyZero() const {
+        return !allNonZero();
+    }
+
+    /** Serializes in Matlab source format */
+    void serialize(TextOutput& t) const;
+
+	std::string toString(const std::string& name) const;
+
+    std::string toString() const {
+        static const std::string name = "";
+        return toString(name);
+    }
+
+    /** 2-norm squared: sum(squares). (i.e., dot product with itself) */
+    double normSquared() const;
+
+    /** 2-norm (sqrt(sum(squares)) */
+    double norm() const;
+
+    /**
+      Low-level SVD functionality.  Useful for applications that do not want
+      to construct a Matrix but need to perform the SVD operation.
+
+      this = U * D * V'
+
+      Assumes that rows >= cols
+
+      @return NULL on success, a string describing the error on failure.
+      @param U rows x cols matrix to be decomposed, gets overwritten with U, a rows x cols matrix with orthogonal columns.
+      @param D vector of singular values of a (diagonal of the D matrix).  Length cols.
+      @param V returns the right orthonormal transformation matrix, size cols x cols
+
+      @cite Based on Dianne Cook's implementation, which is adapted from 
+      svdecomp.c in XLISP-STAT 2.1, which is code from Numerical Recipes 
+      adapted by Luke Tierney and David Betz.  The Numerical Recipes code 
+      is adapted from Forsythe et al, who based their code on Golub and
+      Reinsch's original implementation.
+    */
+    static const char* svdCore(float** U, int rows, int cols, float* D, float** V);
+
+};
+
+}
+
+inline G3D::Matrix operator-(const G3D::Matrix::T& v, const G3D::Matrix& M) {
+    return M.lsub(v);
+}
+
+inline G3D::Matrix operator*(const G3D::Matrix::T& v, const G3D::Matrix& M) {
+    return M * v;
+}
+
+inline G3D::Matrix operator+(const G3D::Matrix::T& v, const G3D::Matrix& M) {
+    return M + v;
+}
+
+inline G3D::Matrix abs(const G3D::Matrix& M) {
+    return M.abs();
+}
+
+#endif
+
diff --git a/externals/g3dlite/G3D/Matrix2.h b/externals/g3dlite/G3D/Matrix2.h
new file mode 100644
index 00000000000..eaf4aefa220
--- /dev/null
+++ b/externals/g3dlite/G3D/Matrix2.h
@@ -0,0 +1,69 @@
+#ifndef G3D_MATRIX2_H
+#define G3D_MATRIX2_H
+
+#include "G3D/platform.h"
+#include "G3D/Vector2.h"
+
+namespace G3D {
+
+/** @beta */
+class Matrix2 {
+private:
+
+    float          data[2][2];
+
+public:
+
+    inline Matrix2() {
+        data[0][0] = 1.0f; data[0][1] = 0.0f;
+        data[1][0] = 0.0f; data[1][1] = 1.0f;
+    }
+
+    inline Matrix2(float v00, float v01, float v10, float v11) {
+        data[0][0] = v00; data[0][1] = v01;
+        data[1][0] = v10; data[1][1] = v11;
+    }
+
+    inline Vector2 operator*(const Vector2& v) const {
+        return Vector2(data[0][0] * v[0] + data[0][1] * v[1],
+                       data[1][0] * v[0] + data[1][1] * v[1]);
+    }
+    
+    inline Matrix2 inverse() const {
+        return Matrix2(data[0][0], data[1][0],
+                       data[0][1], data[1][1]) * (1.0f / determinant());
+    }
+
+    inline Matrix2 transpose() const {
+        return Matrix2(data[0][0], data[1][0],
+                       data[0][1], data[1][1]);
+    }
+
+    inline float determinant() const {
+        return data[0][0] * data[1][1] - data[0][1] * data[1][0];
+    }
+
+    inline Matrix2 operator*(float f) const {
+        return Matrix2(data[0][0] * f, data[0][1] * f,
+                       data[1][0] * f, data[1][1] * f);
+    }
+
+    inline Matrix2 operator/(float f) const {
+        return Matrix2(data[0][0] / f, data[0][1] / f,
+                       data[1][0] / f, data[1][1] / f);
+    }
+
+    inline float* operator[](int i) {
+        debugAssert(i >= 0 && i <= 2);
+        return data[i];
+    }
+
+    inline const float* operator[](int i) const {
+        debugAssert(i >= 0 && i <= 1);
+        return data[i];
+    }
+};
+
+}
+
+#endif
diff --git a/externals/g3dlite/G3D/Matrix3.h b/externals/g3dlite/G3D/Matrix3.h
new file mode 100644
index 00000000000..06ec7e67474
--- /dev/null
+++ b/externals/g3dlite/G3D/Matrix3.h
@@ -0,0 +1,366 @@
+/**
+  @file Matrix3.h
+ 
+  3x3 matrix class
+ 
+  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+ 
+  @cite Portions based on Dave Eberly's Magic Software Library at http://www.magic-software.com
+ 
+  @created 2001-06-02
+  @edited  2006-04-05
+ */
+
+#ifndef G3D_Matrix3_h
+#define G3D_Matrix3_h
+
+#include "G3D/platform.h"
+#include "G3D/Vector3.h"
+#include "G3D/Vector4.h"
+#include "G3D/debugAssert.h"
+
+#include 
+
+namespace G3D {
+
+#ifdef _MSC_VER
+// Turn off "conditional expression is constant" warning; MSVC generates this
+// for debug assertions in inlined methods.
+#   pragma warning (disable : 4127)
+#endif
+
+class Any;
+
+/**
+  3x3 matrix.  Do not subclass.
+ */
+class Matrix3 {
+private:
+
+    float elt[3][3];
+
+    // Hidden operators
+    bool operator<(const Matrix3&) const;
+    bool operator>(const Matrix3&) const;
+    bool operator<=(const Matrix3&) const;
+    bool operator>=(const Matrix3&) const;
+
+public:
+
+    Matrix3(const Any& any);
+
+    operator Any() const;
+
+    /** Initial values are undefined for performance.  See also 
+        Matrix3::zero(), Matrix3::identity(), Matrix3::fromAxisAngle, etc.*/
+    inline Matrix3() {}
+
+    Matrix3 (class BinaryInput& b);
+    Matrix3 (const float aafEntry[3][3]);
+    Matrix3 (const Matrix3& rkMatrix);
+    Matrix3 (float fEntry00, float fEntry01, float fEntry02,
+             float fEntry10, float fEntry11, float fEntry12,
+             float fEntry20, float fEntry21, float fEntry22);
+
+	bool fuzzyEq(const Matrix3& b) const;
+
+    /** Constructs a matrix from a quaternion.
+        @cite Graphics Gems II, p. 351--354
+ 	    @cite Implementation from Watt and Watt, pg 362*/
+    Matrix3(const class Quat& q);
+
+    void serialize(class BinaryOutput& b) const;
+    void deserialize(class BinaryInput& b);
+
+    /** Returns true if column(0).cross(column(1)).dot(column(2)) > 0. */
+    bool isRightHanded() const;
+
+    /**
+     Sets all elements.
+     */
+    void set(float fEntry00, float fEntry01, float fEntry02,
+             float fEntry10, float fEntry11, float fEntry12,
+             float fEntry20, float fEntry21, float fEntry22);
+
+    /**
+     * member access, allows use of construct mat[r][c]
+     */
+    inline float* operator[] (int iRow) {
+        debugAssert(iRow >= 0);
+        debugAssert(iRow < 3);
+        return (float*)&elt[iRow][0];
+    }
+
+    inline const float* operator[] (int iRow) const {
+        debugAssert(iRow >= 0);
+        debugAssert(iRow < 3);
+        return (const float*)&elt[iRow][0];
+    }
+
+    inline operator float* () {
+        return (float*)&elt[0][0];
+    }
+
+    inline operator const float* () const{
+        return (const float*)&elt[0][0];
+    }
+    
+    Vector3 column(int c) const;
+    const Vector3& row(int r) const;
+
+    void setColumn(int iCol, const Vector3 &vector);
+    void setRow(int iRow, const Vector3 &vector);
+
+    // assignment and comparison
+    inline Matrix3& operator= (const Matrix3& rkMatrix) {
+        memcpy(elt, rkMatrix.elt, 9 * sizeof(float));
+        return *this;
+    }
+
+    bool operator== (const Matrix3& rkMatrix) const;
+    bool operator!= (const Matrix3& rkMatrix) const;
+
+    // arithmetic operations
+    Matrix3 operator+ (const Matrix3& rkMatrix) const;
+    Matrix3 operator- (const Matrix3& rkMatrix) const;
+    /** Matrix-matrix multiply */
+    Matrix3 operator* (const Matrix3& rkMatrix) const;
+    Matrix3 operator- () const;
+
+    Matrix3& operator+= (const Matrix3& rkMatrix);
+    Matrix3& operator-= (const Matrix3& rkMatrix);
+    Matrix3& operator*= (const Matrix3& rkMatrix);
+
+    /**
+     * matrix * vector [3x3 * 3x1 = 3x1]
+     */
+    inline Vector3 operator* (const Vector3& v) const {
+        Vector3 kProd;
+
+        for (int r = 0; r < 3; ++r) {
+            kProd[r] =
+                elt[r][0] * v[0] +
+                elt[r][1] * v[1] +
+                elt[r][2] * v[2];
+        }
+
+        return kProd;
+    }
+
+
+    /**
+     * vector * matrix [1x3 * 3x3 = 1x3]
+     */
+    friend Vector3 operator* (const Vector3& rkVector,
+                              const Matrix3& rkMatrix);
+
+    /**
+     * matrix * scalar
+     */
+    Matrix3 operator* (float fScalar) const;
+
+    /** scalar * matrix */
+    friend Matrix3 operator* (double fScalar, const Matrix3& rkMatrix);
+    friend Matrix3 operator* (float fScalar, const Matrix3& rkMatrix);
+    friend Matrix3 operator* (int fScalar, const Matrix3& rkMatrix);
+
+    Matrix3& operator*= (float k);
+    Matrix3& operator/= (float k);
+
+
+private:
+    /** Multiplication where out != A and out != B */
+    static void _mul(const Matrix3& A, const Matrix3& B, Matrix3& out);
+public:
+
+    /** Optimized implementation of out = A * B.  It is safe (but slow) to call 
+        with A, B, and out possibly pointer equal to one another.*/
+    // This is a static method so that it is not ambiguous whether "this"
+    // is an input or output argument.
+    inline static void mul(const Matrix3& A, const Matrix3& B, Matrix3& out) {
+        if ((&out == &A) || (&out == &B)) {
+            // We need a temporary anyway, so revert to the stack method.
+            out = A * B;
+        } else {
+            // Optimized in-place multiplication.
+            _mul(A, B, out);
+        }
+    }
+
+private:
+    static void _transpose(const Matrix3& A, Matrix3& out);
+public:
+
+    /** Optimized implementation of out = A.transpose().  It is safe (but slow) to call 
+        with A and out possibly pointer equal to one another.
+    
+        Note that A.transpose() * v can be computed 
+        more efficiently as v * A.
+    */
+    inline static void transpose(const Matrix3& A, Matrix3& out) {
+        if (&A == &out) {
+            out = A.transpose();
+        } else {
+            _transpose(A, out);
+        }
+    }
+
+    /** Returns true if the rows and column L2 norms are 1.0 and the rows are orthogonal. */
+    bool isOrthonormal() const;
+
+    Matrix3 transpose () const;
+    bool inverse (Matrix3& rkInverse, float fTolerance = 1e-06) const;
+    Matrix3 inverse (float fTolerance = 1e-06) const;
+    float determinant () const;
+
+    /** singular value decomposition */
+    void singularValueDecomposition (Matrix3& rkL, Vector3& rkS,
+                                     Matrix3& rkR) const;
+    /** singular value decomposition */
+    void singularValueComposition (const Matrix3& rkL,
+                                   const Vector3& rkS, const Matrix3& rkR);
+
+    /** Gram-Schmidt orthonormalization (applied to columns of rotation matrix) */
+    void orthonormalize();
+
+    /** orthogonal Q, diagonal D, upper triangular U stored as (u01,u02,u12) */
+    void qDUDecomposition (Matrix3& rkQ, Vector3& rkD,
+                           Vector3& rkU) const;
+
+    /**
+       Polar decomposition of a matrix. Based on pseudocode from Nicholas J
+       Higham, "Computing the Polar Decomposition -- with Applications Siam
+       Journal of Science and Statistical Computing, Vol 7, No. 4, October
+       1986.
+
+       Decomposes A into R*S, where R is orthogonal and S is symmetric.
+
+       Ken Shoemake's "Matrix animation and polar decomposition"
+       in Proceedings of the conference on Graphics interface '92
+       seems to be better known in the world of graphics, but Higham's version
+       uses a scaling constant that can lead to faster convergence than
+       Shoemake's when the initial matrix is far from orthogonal.
+    */
+    void polarDecomposition(Matrix3 &R, Matrix3 &S) const;
+
+    /** 
+     *  Matrix norms.
+     */
+    float spectralNorm () const;
+
+    float squaredFrobeniusNorm() const;
+
+    float frobeniusNorm() const;
+
+    float l1Norm() const;
+
+    float lInfNorm() const;
+
+    float diffOneNorm(const Matrix3 &y) const;
+
+    /** matrix must be orthonormal */
+    void toAxisAngle(Vector3& rkAxis, float& rfRadians) const;
+
+    static Matrix3 fromDiagonal(const Vector3& d) {
+        return Matrix3(d.x, 0, 0, 
+                       0, d.y, 0,
+                       0, 0, d.z);
+    }
+
+    static Matrix3 fromAxisAngle(const Vector3& rkAxis, float fRadians);
+
+    /**
+     * The matrix must be orthonormal.  The decomposition is yaw*pitch*roll
+     * where yaw is rotation about the Up vector, pitch is rotation about the
+     * right axis, and roll is rotation about the Direction axis.
+     */
+    bool toEulerAnglesXYZ (float& rfYAngle, float& rfPAngle,
+                           float& rfRAngle) const;
+    bool toEulerAnglesXZY (float& rfYAngle, float& rfPAngle,
+                           float& rfRAngle) const;
+    bool toEulerAnglesYXZ (float& rfYAngle, float& rfPAngle,
+                           float& rfRAngle) const;
+    bool toEulerAnglesYZX (float& rfYAngle, float& rfPAngle,
+                           float& rfRAngle) const;
+    bool toEulerAnglesZXY (float& rfYAngle, float& rfPAngle,
+                           float& rfRAngle) const;
+    bool toEulerAnglesZYX (float& rfYAngle, float& rfPAngle,
+                           float& rfRAngle) const;
+    static Matrix3 fromEulerAnglesXYZ (float fYAngle, float fPAngle, float fRAngle);
+    static Matrix3 fromEulerAnglesXZY (float fYAngle, float fPAngle, float fRAngle);
+    static Matrix3 fromEulerAnglesYXZ (float fYAngle, float fPAngle, float fRAngle);
+    static Matrix3 fromEulerAnglesYZX (float fYAngle, float fPAngle, float fRAngle);
+    static Matrix3 fromEulerAnglesZXY (float fYAngle, float fPAngle, float fRAngle);
+    static Matrix3 fromEulerAnglesZYX (float fYAngle, float fPAngle, float fRAngle);
+
+    /** eigensolver, matrix must be symmetric */
+    void eigenSolveSymmetric (float afEigenvalue[3],
+                              Vector3 akEigenvector[3]) const;
+
+    static void tensorProduct (const Vector3& rkU, const Vector3& rkV,
+                               Matrix3& rkProduct);
+    std::string toString() const;
+
+    static const float EPSILON; 
+
+    // Special values.
+    // The unguaranteed order of initialization of static variables across 
+    // translation units can be a source of annoying bugs, so now the static
+    // special values (like Vector3::ZERO, Color3::WHITE, ...) are wrapped
+    // inside static functions that return references to them. 
+    // These functions are intentionally not inlined, because: 
+    // "You might be tempted to write [...] them as inline functions 
+    // inside their respective header files, but this is something you 
+    // must definitely not do. An inline function can be duplicated 
+    // in every file in which it appears œóõ½ and this duplication 
+    // includes the static object definition. Because inline functions 
+    // automatically default to internal linkage, this would result in 
+    // having multiple static objects across the various translation 
+    // units, which would certainly cause problems. So you must 
+    // ensure that there is only one definition of each wrapping 
+    // function, and this means not making the wrapping functions inline",
+    // according to Chapter 10 of "Thinking in C++, 2nd ed. Volume 1" by Bruce Eckel, 
+    // http://www.mindview.net/
+    static const Matrix3& zero();
+    static const Matrix3& identity(); 
+
+protected:
+
+    // support for eigensolver
+    void tridiagonal (float afDiag[3], float afSubDiag[3]);
+    bool qLAlgorithm (float afDiag[3], float afSubDiag[3]);
+
+    // support for singular value decomposition
+    static const float ms_fSvdEpsilon;
+    static const int ms_iSvdMaxIterations;
+    static void bidiagonalize (Matrix3& kA, Matrix3& kL,
+                               Matrix3& kR);
+    static void golubKahanStep (Matrix3& kA, Matrix3& kL,
+                                Matrix3& kR);
+
+    // support for spectral norm
+    static float maxCubicRoot (float afCoeff[3]);
+
+};
+
+
+//----------------------------------------------------------------------------
+/**  v * M == M.transpose() * v */
+inline Vector3 operator* (const Vector3& rkPoint, const Matrix3& rkMatrix) {
+    Vector3 kProd;
+
+    for (int r = 0; r < 3; ++r) {
+        kProd[r] =
+            rkPoint[0] * rkMatrix.elt[0][r] +
+            rkPoint[1] * rkMatrix.elt[1][r] +
+            rkPoint[2] * rkMatrix.elt[2][r];
+    }
+
+    return kProd;
+}
+
+
+} // namespace
+
+#endif
+
diff --git a/externals/g3dlite/G3D/Matrix4.h b/externals/g3dlite/G3D/Matrix4.h
new file mode 100644
index 00000000000..9ce87d875b8
--- /dev/null
+++ b/externals/g3dlite/G3D/Matrix4.h
@@ -0,0 +1,249 @@
+/**
+  @file Matrix4.h
+ 
+  4x4 matrix class
+ 
+  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+ 
+  @created 2003-10-02
+  @edited  2009-10-20
+ */
+
+#ifndef G3D_Matrix4_h
+#define G3D_Matrix4_h
+
+#ifdef _MSC_VER
+// Disable conditional expression is constant, which occurs incorrectly on inlined functions
+#   pragma warning (push)
+#   pragma warning( disable : 4127 )
+#endif
+
+#include "G3D/platform.h"
+#include "G3D/debugAssert.h"
+#include "G3D/Matrix3.h"
+#include "G3D/Vector3.h"
+
+namespace G3D {
+
+class Any;
+
+/**
+  A 4x4 matrix.
+
+  See also G3D::CoordinateFrame, G3D::Matrix3, G3D::Quat
+ */
+class Matrix4 {
+private:
+
+    float elt[4][4];
+
+    /**
+      Computes the determinant of the 3x3 matrix that lacks excludeRow
+      and excludeCol. 
+    */
+    float subDeterminant(int excludeRow, int excludeCol) const;
+
+    // Hidden operators
+    bool operator<(const Matrix4&) const;
+    bool operator>(const Matrix4&) const;
+    bool operator<=(const Matrix4&) const;
+    bool operator>=(const Matrix4&) const;
+
+public:
+    /** Must be of the form: Matrix4(#, #, # .... #)*/
+    Matrix4(const Any& any);
+
+    operator Any() const;
+
+    Matrix4(
+        float r1c1, float r1c2, float r1c3, float r1c4,
+        float r2c1, float r2c2, float r2c3, float r2c4,
+        float r3c1, float r3c2, float r3c3, float r3c4,
+        float r4c1, float r4c2, float r4c3, float r4c4);
+
+    /**
+     init should be row major.
+     */
+    Matrix4(const float* init);
+    
+	/**
+		a is the upper left 3x3 submatrix and b is the upper right 3x1 submatrix. The last row of the created matrix is (0,0,0,1).
+	*/
+    Matrix4(const class Matrix3& upper3x3, const class Vector3& lastCol = Vector3::zero());
+
+    Matrix4(const class CoordinateFrame& c);
+
+    Matrix4(const double* init);
+
+    Matrix4();
+
+    /** Produces an RT transformation that nearly matches this Matrix4.
+        Because a Matrix4 may not be precisely a rotation and translation,
+        this may introduce error. */
+    class CoordinateFrame approxCoordinateFrame() const;
+
+    // Special values.
+    // Intentionally not inlined: see Matrix3::identity() for details.
+    static const Matrix4& identity();
+    static const Matrix4& zero();
+
+    /** If this is a perspective projection matrix created by
+        Matrix4::perspectiveProjection, extract its parameters. */
+    void getPerspectiveProjectionParameters
+    (float& left,
+     float& right,
+     float& bottom,  
+     float& top,
+     float& nearval, 
+     float& farval,
+     float updirection = -1.0f) const;
+        
+    inline float* operator[](int r) {
+        debugAssert(r >= 0);
+        debugAssert(r < 4);
+        return (float*)&elt[r];
+    }
+
+    inline const float* operator[](int r) const {
+        debugAssert(r >= 0);
+        debugAssert(r < 4);
+        return (const float*)&elt[r];
+    } 
+
+    inline operator float* () {
+        return (float*)&elt[0][0];
+    }
+
+    inline operator const float* () const {
+        return (const float*)&elt[0][0];
+    }
+
+    Matrix4 operator*(const Matrix4& other) const;
+
+    class Matrix3 upper3x3() const;
+
+    /** Homogeneous multiplication. Let k = M * [v w]^T.  result = k.xyz() / k.w */
+    class Vector3 homoMul(const class Vector3& v, float w) const;
+
+    /**
+     Constructs an orthogonal projection matrix from the given parameters.
+     Near and far are the NEGATIVE of the near and far plane Z values
+     (to follow OpenGL conventions).
+
+    \param upDirection Use -1.0 for 2D Y increasing downwards (the G3D 8.x default convention), 
+    1.0 for 2D Y increasing upwards (the G3D 7.x default and OpenGL convention)
+     */
+    static Matrix4 orthogonalProjection(
+        float            left,
+        float            right,
+        float            bottom,
+        float            top,
+        float            nearval,
+        float            farval,
+        float            upDirection = -1.0f);
+
+
+    /** \param upDirection Use -1.0 for 2D Y increasing downwards (the G3D 8.x default convention), 
+    1.0 for 2D Y increasing upwards (the G3D 7.x default and OpenGL convention)
+      */
+    static Matrix4 orthogonalProjection(
+        const class Rect2D& rect,
+        float            nearval,
+        float            farval,
+        float            upDirection = -1.0f);
+
+    /** \param upDirection Use -1.0 for 2D Y increasing downwards (the G3D 8.x default convention), 
+    1.0 for 2D Y increasing upwards (the G3D 7.x default and OpenGL convention)
+      */
+    static Matrix4 perspectiveProjection(
+        float            left,
+        float            right,
+        float            bottom,
+        float            top,
+        float            nearval,
+        float            farval,
+        float            upDirection = -1.0f);
+
+    void setRow(int r, const class Vector4& v);
+    void setColumn(int c, const Vector4& v);
+
+    const Vector4& row(int r) const;
+    Vector4 column(int c) const;
+
+    Matrix4 operator*(const float s) const;
+    Vector4 operator*(const Vector4& vector) const;
+
+    Matrix4 transpose() const;
+
+    bool operator!=(const Matrix4& other) const;
+    bool operator==(const Matrix4& other) const;
+
+    float determinant() const;
+    Matrix4 inverse() const;
+
+    /** 
+     Transpose of the cofactor matrix (used in computing the inverse).
+     Note: This is in fact only one type of adjoint. More generally,
+     an adjoint of a matrix is any mapping of a matrix which possesses 
+     certain properties.  This returns the so-called adjugate
+     or classical adjoint.
+    */
+    Matrix4 adjoint() const;
+    Matrix4 cofactor() const;
+
+    /** Serializes row-major */
+    void serialize(class BinaryOutput& b) const;
+    void deserialize(class BinaryInput& b);
+
+    std::string toString() const;
+
+    /** 3D scale matrix */
+    inline static Matrix4 scale(const Vector3& v) {
+        return Matrix4(v.x, 0, 0, 0,
+                       0, v.y, 0, 0,
+                       0, 0, v.z, 0,
+                       0, 0, 0, 1);
+    }
+    
+    /** 3D scale matrix */
+    inline static Matrix4 scale(float x, float y, float z) {
+        return scale(Vector3(x, y, z));
+    }
+
+    /** 3D scale matrix */
+    inline static Matrix4 scale(float s) {
+        return scale(s,s,s);
+    }
+
+    /** 3D translation matrix */
+    inline static Matrix4 translation(const Vector3& v) {
+        return Matrix4(Matrix3::identity(), v);
+    }
+
+    inline static Matrix4 translation(float x, float y, float z) {
+        return Matrix4(Matrix3::identity(), Vector3(x, y, z));
+    }
+
+    /** Create a rotation matrix that rotates \a deg degrees around the Y axis */ 
+    inline static Matrix4 yawDegrees(float deg) {
+        return Matrix4(Matrix3::fromAxisAngle(Vector3::unitY(), toRadians(deg)));
+    }
+
+    inline static Matrix4 pitchDegrees(float deg) {
+        return Matrix4(Matrix3::fromAxisAngle(Vector3::unitX(), toRadians(deg)));
+    }
+
+    inline static Matrix4 rollDegrees(float deg) {
+        return Matrix4(Matrix3::fromAxisAngle(Vector3::unitZ(), toRadians(deg)));
+    }
+};
+
+
+
+} // namespace
+
+#ifdef _MSC_VER
+#   pragma warning (pop)
+#endif
+
+#endif
diff --git a/externals/g3dlite/G3D/MemoryManager.h b/externals/g3dlite/G3D/MemoryManager.h
new file mode 100644
index 00000000000..15bf6d8be43
--- /dev/null
+++ b/externals/g3dlite/G3D/MemoryManager.h
@@ -0,0 +1,93 @@
+/**
+  @file MemoryManager.h
+
+  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+  @created 2009-04-20
+  @edited  2009-04-20
+
+  Copyright 2000-2009, Morgan McGuire.
+  All rights reserved.
+ */
+#ifndef G3D_MemoryManager_h
+#define G3D_MemoryManager_h
+
+#include "G3D/platform.h"
+#include "G3D/ReferenceCount.h"
+
+namespace G3D {
+
+/** 
+   Abstraction of memory management.
+   Default implementation uses G3D::System::malloc and is threadsafe.
+
+   \sa CRTMemoryManager, AlignedMemoryManager, AreaMemoryManager */
+class MemoryManager : public ReferenceCountedObject {
+protected:
+
+    MemoryManager();
+
+public:
+
+    typedef ReferenceCountedPointer Ref;
+
+    /** Return a pointer to \a s bytes of memory that are unused by
+        the rest of the program.  The contents of the memory are
+        undefined */
+    virtual void* alloc(size_t s);
+
+    /** Invoke to declare that this memory will no longer be used by
+        the program.  The memory manager is not required to actually
+        reuse or release this memory. */
+    virtual void free(void* ptr);
+
+    /** Returns true if this memory manager is threadsafe (i.e., alloc
+        and free can be called asychronously) */
+    virtual bool isThreadsafe() const;
+
+    /** Return the instance. There's only one instance of the default
+        MemoryManager; it is cached after the first creation. */
+    static MemoryManager::Ref create();
+};
+
+/** 
+   Allocates memory on 16-byte boundaries.
+   \sa MemoryManager, CRTMemoryManager, AreaMemoryManager */
+class AlignedMemoryManager : public MemoryManager {
+protected:
+
+    AlignedMemoryManager();
+
+public:
+
+    typedef ReferenceCountedPointer Ref;
+
+    
+    virtual void* alloc(size_t s);
+
+    virtual void free(void* ptr);
+
+    virtual bool isThreadsafe() const;
+
+    static AlignedMemoryManager::Ref create();
+};
+
+
+/** MemoryManager implemented using the C runtime. */
+class CRTMemoryManager : public MemoryManager {
+protected:
+    CRTMemoryManager();
+
+public:
+    typedef ReferenceCountedPointer Ref;
+    virtual void* alloc(size_t s);
+    virtual void free(void* ptr);
+    virtual bool isThreadsafe() const;
+
+    /** There's only one instance of this memory manager; it is 
+        cached after the first creation. */
+    static CRTMemoryManager::Ref create();
+};
+
+}
+
+#endif
diff --git a/externals/g3dlite/G3D/MeshAlg.h b/externals/g3dlite/G3D/MeshAlg.h
new file mode 100644
index 00000000000..1decea10105
--- /dev/null
+++ b/externals/g3dlite/G3D/MeshAlg.h
@@ -0,0 +1,683 @@
+/**
+ @file MeshAlg.h
+
+ Indexed Mesh algorithms.
+
+ @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+
+ @created 2003-09-14
+ @edited  2010-01-18
+*/
+
+#ifndef G3D_MeshAlg_h
+#define G3D_MeshAlg_h
+
+#include "G3D/platform.h"
+#include "G3D/Array.h"
+#include "G3D/Vector3.h"
+#include "G3D/CoordinateFrame.h"
+#include "G3D/SmallArray.h"
+#include "G3D/constants.h"
+#include "G3D/Image1.h"
+
+#ifdef G3D_WIN32
+// Turn off "conditional expression is constant" warning; MSVC generates this
+// for debug assertions in inlined methods.
+#pragma warning (disable : 4127)
+#endif
+
+namespace G3D {
+
+/**
+  Indexed mesh algorithms.  You have to build your own mesh class.
+  

+  No mesh class is provided with G3D because there isn't an "ideal" 
+  mesh format-- one application needs keyframed animation, another
+  skeletal animation, a third texture coordinates, a fourth
+  cannot precompute information, etc.  Instead of compromising, this
+  class implements the hard parts of mesh computation and you can write
+  your own ideal mesh class on top of it.
+
+  \sa G3D::ArticulatedModel, G3D::IFSModel
+  */ 
+class MeshAlg {
+public:
+
+    /** \deprecated */
+    typedef PrimitiveType Primitive;
+
+    /** Adjacency information for a vertex.
+        Does not contain the vertex position or normal,
+        which are stored in the MeshAlg::Geometry object.
+        Vertexs must be stored in an array
+        parallel to (indexed in the same way as) 
+        MeshAlg::Geometry::vertexArray.
+        */
+    class Vertex {
+    public:
+        Vertex() {}
+
+        /**
+         Array of edges adjacent to this vertex.
+         Let e = edgeIndex[i].  
+         edge[(e >= 0) ? e : ~e].vertexIndex[0] == this
+         vertex index.
+         
+         Edges may be listed multiple times if they are
+         degenerate.
+         */
+        SmallArray          edgeIndex;
+
+        /**
+         Returns true if e or ~e is in the edgeIndex list.
+         */
+        inline bool inEdge(int e) const {
+            return edgeIndex.contains(~e) || edgeIndex.contains(e);
+        }
+
+        /**
+         Array of faces containing this vertex.  Faces
+         may be listed multiple times if they are degenerate.
+        */
+        SmallArray          faceIndex;
+
+        inline bool inFace(int f) const {
+            debugAssert(f >= 0);
+            return faceIndex.contains(f);
+        }
+    };
+
+
+    /**
+     Oriented, indexed triangle.
+     */
+    class Face {
+    public:
+        Face();
+
+        /**
+         Used by Edge::faceIndex to indicate a missing face.
+         This is a large negative value.
+         */
+        static const int        NONE;
+
+
+        /**
+         Vertices in the face in counter-clockwise order.
+         Degenerate faces may include the same vertex multiple times.
+         */
+        int                     vertexIndex[3];
+
+        inline bool containsVertex(int v) const {
+            return contains(vertexIndex, 3, v);
+        }
+
+        /**
+         Edge indices in counter-clockwise order.  Edges are
+         undirected, so it is important to know which way 
+         each edge is pointing in a face.  This is encoded
+         using negative indices.
+         
+         If edgeIndex[i] >= 0 then this face
+         contains the directed edge
+         between vertex indices  
+         edgeArray[face.edgeIndex[i]].vertexIndex[0]
+         and
+         edgeArray[face.edgeIndex[i]].vertexIndex[1].
+         
+         If edgeIndex[i] < 0 then 
+         ~edgeIndex[i] (i.e. the two's
+         complement of) is used and this face contains the directed
+         edge between vertex indices
+         edgeArray[~face.edgeIndex[i]].vertexIndex[0]
+         and
+         edgeArray[~face.edgeIndex[i]].vertexIndex[1].
+
+         Degenerate faces may include the same edge multiple times.
+         */
+        // Temporarily takes on the value Face::NONE during adjacency
+        // computation to indicate an edge that has not yet been assigned.
+        int                     edgeIndex[3];
+
+        inline bool containsEdge(int e) const {
+            if (e < 0) {
+                e = ~e;
+            }
+            return contains(edgeIndex, 3, e) || contains(edgeIndex, 3, ~e);
+        }
+
+        /** Contains the forward edge e if e >= 0 and the backward edge 
+            ~e otherwise. */
+        inline bool containsDirectedEdge(int e) const {
+            return contains(edgeIndex, 3, e);
+        }
+    };
+
+
+    /** Oriented, indexed edge */
+    class Edge {
+    public:
+        Edge();
+
+        /** Degenerate edges may include the same vertex times. */
+        int                     vertexIndex[2];
+        
+        inline bool containsVertex(int v) const {
+            return contains(vertexIndex, 2, v);
+        }
+
+        /**
+         The edge is directed forward in face 0
+         backward in face 1. Face index of MeshAlg::Face::NONE
+         indicates a boundary (a.k.a. crack, broken) edge.
+         */
+        int                     faceIndex[2];
+        
+        /** Returns true if f is contained in the faceIndex array in either slot.
+            To see if it is forward in that face, just check edge.faceIndex[0] == f.*/
+        inline bool inFace(int f) const {
+            return contains(faceIndex, 2, f);
+        }
+
+        /**
+         Returns true if either faceIndex is NONE.
+         */
+        inline bool boundary() const {
+            return (faceIndex[0] == Face::NONE) ||
+                   (faceIndex[1] == Face::NONE);
+        }
+
+        /**
+         Returns the reversed edge.
+         */
+        inline Edge reverse() const {
+            Edge e;
+            e.vertexIndex[0] = vertexIndex[1];
+            e.vertexIndex[1] = vertexIndex[0];
+            e.faceIndex[0]   = faceIndex[1];
+            e.faceIndex[1]   = faceIndex[0];
+            return e;
+        }
+    };
+    
+
+    /**
+     Convenient for passing around the per-vertex data that changes under
+     animation. The faces and edges are needed to interpret 
+     these values.
+     */
+    class Geometry {
+    public:        
+        /** Vertex positions */
+        Array          vertexArray;
+
+        /** Vertex normals */
+        Array          normalArray;
+
+        /**
+         Assignment is optimized using SSE.
+         */
+        Geometry& operator=(const Geometry& src);
+
+        void clear() {
+            vertexArray.clear();
+            normalArray.clear();
+        }
+    };
+
+    /**
+     Given a set of vertices and a set of indices for traversing them
+     to create triangles, computes other mesh properties.  
+
+     Colocated vertices are treated as separate.  To have
+     colocated vertices collapsed (necessary for many algorithms,
+     like shadowing), weld the mesh before computing adjacency.
+     
+     Recent change: In version 6.00, colocated vertices were automatically
+     welded by this routine and degenerate faces and edges were removed.  That
+     is no longer the case.
+
+     Where two faces meet, there are two opposite directed edges.  These
+     are collapsed into a single bidirectional edge in the edgeArray.
+     If four faces meet exactly at the same edge, that edge will appear
+     twice in the array, and so on.  If an edge is a boundary of the mesh 
+     (i.e. if the edge has only one adjacent face) it will appear in the 
+     array with one  face index set to MeshAlg::Face::NONE.
+
+     @param vertexGeometry  %Vertex positions to use when deciding colocation.
+     @param indexArray      Order to traverse vertices to make triangles
+     @param faceArray       Output
+     @param edgeArray       Output.  Sorted so that boundary edges are at the end of the array. 
+     @param vertexArray     Output 
+     */
+    static void computeAdjacency(
+        const Array&   vertexGeometry,
+        const Array&       indexArray,
+        Array&            faceArray,
+        Array&            edgeArray,
+        Array&          vertexArray);
+
+    /**
+     @deprecated Use the other version of computeAdjacency, which takes Array.
+     @param facesAdjacentToVertex Output adjacentFaceArray[v] is an array of
+                        indices for faces touching vertex index v
+     */
+    static void computeAdjacency(
+        const Array&   vertexArray,
+        const Array&       indexArray,
+        Array&            faceArray,
+        Array&            edgeArray,
+        Array< Array >&    facesAdjacentToVertex);
+
+    /**
+     Computes some basic mesh statistics including: min, max mean and median, 
+     edge lengths; and min, mean, median, and max face area.
+
+     @param vertexArray         %Vertex positions to use when deciding colocation.
+     @param indexArray          Order to traverse vertices to make triangles
+     @param minEdgeLength       Minimum edge length
+     @param meanEdgeLength      Mean edge length
+     @param medianEdgeLength    Median edge length
+     @param maxEdgeLength       Max edge length
+     @param minFaceArea         Minimum face area
+     @param meanFaceArea        Mean face area
+     @param medianFaceArea      Median face area
+     @param maxFaceArea         Max face area
+     */
+    static void computeAreaStatistics(
+        const Array&   vertexArray,
+        const Array&       indexArray,
+        double&                 minEdgeLength,
+        double&                 meanEdgeLength,
+        double&                 medianEdgeLength,
+        double&                 maxEdgeLength,
+        double&                 minFaceArea,
+        double&                 meanFaceArea,
+        double&                 medianFaceArea,
+        double&                 maxFaceArea);
+
+private:
+
+    /** Helper for weldAdjacency */
+    static void weldBoundaryEdges(
+        Array&       faceArray,
+        Array&       edgeArray,
+        Array&     vertexArray);
+
+public:
+
+    /**
+     Computes tangent and binormal vectors,
+     which provide a (mostly) consistent
+     parameterization over the surface for
+     effects like bump mapping.  In the resulting coordinate frame, 
+     T = x (varies with texture s coordinate), B = y (varies with negative texture t coordinate), 
+     and N = z for a right-handed coordinate frame.  If a billboard is vertical on the screen
+     in view of the camera, the tangent space matches the camera's coordinate frame.
+
+     The vertex, texCoord, tangent, and binormal
+     arrays are parallel arrays.
+
+     The resulting tangent and binormal might not be exactly
+     perpendicular to each other.  They are guaranteed to
+     be perpendicular to the normal.
+
+     @cite Max McGuire
+    */
+    static void computeTangentSpaceBasis(
+        const Array&       vertexArray,
+        const Array&       texCoordArray,
+        const Array&       vertexNormalArray,
+        const Array&          faceArray,
+        Array&             tangent,
+        Array&             binormal);
+
+    /** @deprecated */
+    static void computeNormals(
+        const Array&   vertexArray,
+        const Array&      faceArray,
+        const Array< Array >& adjacentFaceArray,
+        Array&         vertexNormalArray,
+        Array&         faceNormalArray);
+
+    /**
+     Vertex normals are weighted by the area of adjacent faces.
+     Nelson Max showed this is superior to uniform weighting for
+     general meshes in jgt.
+
+     @param vertexNormalArray Output. Unit length
+     @param faceNormalArray Output.   Degenerate faces produce zero magnitude normals. Unit length
+     @see weld
+    */
+    static void computeNormals(
+        const Array&   vertexGeometry,
+        const Array&      faceArray,
+        const Array&    vertexArray,
+        Array&         vertexNormalArray,
+        Array&         faceNormalArray);
+
+    /** Computes unit length normals in place using the other computeNormals methods.
+     If you already have a face array use another method; it will be faster. 
+         @see weld*/
+    static void computeNormals(
+        Geometry&               geometry,
+        const Array&       indexArray);
+
+    /**
+     Computes face normals only.  Significantly faster (especially if
+     normalize is false) than computeNormals.
+     @see weld
+     */
+    static void computeFaceNormals(
+        const Array&           vertexArray,
+        const Array&              faceArray,
+        Array&                 faceNormals,
+        bool                            normalize = true);
+
+    /**
+     Classifies each face as a backface or a front face relative
+     to the observer point P (which is at infinity when P.w = 0).
+     A face with normal exactly perpendicular to the observer vector
+     may be classified as either a front or a back face arbitrarily.
+     */
+    static void identifyBackfaces(
+        const Array&           vertexArray,
+        const Array&              faceArray,
+        const Vector4&                  P,
+        Array&                    backface);
+
+    /** A faster version of identifyBackfaces for the case where
+        face normals have already been computed */
+    static void identifyBackfaces(
+        const Array&           vertexArray,
+        const Array&              faceArray,
+        const Vector4&                  P,
+        Array&                    backface,
+        const Array&           faceNormals);
+
+    /**
+     Welds nearby and colocated elements of the oldVertexArray together so that
+     newVertexArray contains no vertices within radius of one another.
+     Every vertex in newVertexPositions also appears in oldVertexPositions.
+     This is useful for downsampling meshes and welding cracks created by artist errors
+     or numerical imprecision.  
+
+     The two integer arrays map indices back and forth between the arrays according to:
+     
+     oldVertexArray[toOld[ni]] == newVertexArray[ni]
+     oldVertexArray[oi] == newVertexArray[toNew[ni]]
+     

+
+     Note that newVertexPositions is never longer than oldVertexPositions
+     and is shorter when vertices are welded.
+
+     Welding with a large radius will effectively compute a lower level of detail for
+     the mesh.
+
+     The welding method runs in roughly linear time in the length of oldVertexArray--
+     a uniform spatial grid is used to achieve nearly constant time vertex collapses
+     for uniformly distributed vertices.
+
+     It is sometimes desirable to keep the original vertex ordering but 
+     identify the unique vertices.  The following code computes 
+     array canonical s.t. canonical[v] = first occurance of 
+     a vertex near oldVertexPositions[v] in oldVertexPositions.
+
+     
+        Array canonical(oldVertexPositions.size()), toNew, toOld;
+        computeWeld(oldVertexPositions, Array(), toNew, toOld, radius);
+        for (int v = 0; v < canonical.size(); ++v) {
+            canonical[v] = toOld[toNew[v]];
+        }
+     

+
+     See also G3D::MeshAlg::weldAdjacency.
+
+     @cite The method is that described as the 'Grouper' in Baum, Mann, Smith, and Winget, 
+     Making Radiosity Usable: Automatic Preprocessing and Meshing Techniques for
+     the Generation of Accurate Radiosity Solutions, Computer Graphics vol 25, no 4, July 1991.
+
+     @deprecated Use weld.
+     */
+    static void computeWeld(
+        const Array& oldVertexPositions,
+        Array&       newVertexPositions,
+        Array&           toNew,
+        Array&           toOld,
+        double                radius = fuzzyEpsilon);
+
+    /**
+     Modifies the face, edge, and vertex arrays in place so that
+     colocated (within radius) vertices are treated as identical.
+     Note that the vertexArray and corresponding geometry will
+     contain elements that are no longer used.  In the vertexArray,
+     these elements are initialized to MeshAlg::Vertex() but not 
+     removed (because removal would change the indexing).
+     
+     This is a good preprocessing step for algorithms that are only
+     concerned with the shape of a mesh (e.g. cartoon rendering, fur, shadows)
+     and not the indexing of the vertices.
+
+     Use this method when you have already computed adjacency information
+     and want to collapse colocated vertices within that data without
+     disturbing the actual mesh vertices or indexing scheme.  
+     
+     If you have not computed adjacency already, use MeshAlg::computeWeld
+     instead and compute adjacency information after welding.
+
+     @deprecated Use weld.
+
+     @param faceArray Mutated in place.  Size is maintained (degenerate
+            faces are not removed).
+     @param edgeArray Mutated in place.  May shrink if boundary edges
+            are welded together.
+     @param vertexArray Mutated in place.  Size is maintained (duplicate
+            vertices contain no adjacency info).
+    */
+    static void weldAdjacency(
+        const Array& originalGeometry,
+        Array&          faceArray,
+        Array&          edgeArray,
+        Array&        vertexArray,
+        double                radius = fuzzyEpsilon);
+
+
+    /**
+     Counts the number of edges (in an edge array returned from 
+     MeshAlg::computeAdjacency) that have only one adjacent face.
+     */
+    static int countBoundaryEdges(const Array& edgeArray);
+
+
+    /**
+     Generates an array of integers from start to start + n - 1 that have run numbers
+     in series then omit the next skip before the next run.  Useful for turning
+     a triangle list into an indexed face set.
+
+     Example: 
+     
+       createIndexArray(10, x);
+       // x = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] 
+
+       createIndexArray(5, x, 2);
+       // x = [2, 3, 4, 5, 6, 7] 
+
+       createIndexArray(6, x, 0, 2, 1);
+       // x = [0, 1, 3, 4, 6, 7]
+     

+     */
+    static void createIndexArray(
+        int                 n, 
+        Array&         array,
+        int                 start   = 0,
+        int                 run     = 1,
+        int                 skip    = 0);
+
+    /**
+     Computes a conservative, near-optimal axis aligned bounding box and sphere. 
+
+      @cite The bounding sphere uses the method from J. Ritter. An effcient bounding sphere. In Andrew S. Glassner, editor, Graphics Gems. Academic Press, Boston, MA, 1990.
+
+    */
+    static void computeBounds(const Array& vertex, class AABox& box, class Sphere& sphere);
+
+    /** Computes bounds for a subset of the vertices.  It is ok if vertices appear more than once in the index array. */
+    static void computeBounds(const Array& vertex, const Array& index, class AABox& box, class Sphere& sphere);
+    
+    /**
+     In debug mode, asserts that the adjacency references between the
+     face, edge, and vertex array are consistent.
+     */
+    static void debugCheckConsistency(
+        const Array&      faceArray,
+        const Array&      edgeArray,
+        const Array&    vertexArray);
+
+    /**
+     Generates a unit square in the X-Z plane composed of a grid of wCells x hCells
+     squares and then transforms it by xform.
+
+     @param vertex Output vertices
+     @param texCoord Output texture coordinates
+     @param index Output triangle list indices
+     @param textureScale Lower-right texture coordinate
+     @param spaceCentered If true, the coordinates generated are centered at the origin before the transformation.
+     @param twoSided If true, matching top and bottom planes are generated.
+     \param elevation If non-NULL, values from this image are used as elevations.  Apply an \a xform to adjust the scale
+     */
+    static void generateGrid(
+        Array&     vertex,
+        Array&     texCoord,
+        Array&         index,
+        int                 wCells = 10, 
+        int                 hCells = 10,
+        const Vector2&      textureScale = Vector2(1,1),
+        bool                spaceCentered = true,
+        bool                twoSided = true,
+        const CoordinateFrame& xform = CoordinateFrame(),
+        const Image1::Ref&  elevation = NULL);
+
+    /** Converts quadlist (QUADS), 
+        triangle fan (TRIANGLE_FAN),
+        tristrip(TRIANGLE_STRIP), and quadstrip (QUAD_STRIP) indices into
+        triangle list (TRIANGLES) indices and appends them to outIndices. */
+    template
+    static void toIndexedTriList(
+        const Array& inIndices, 
+        MeshAlg::Primitive      inType, 
+        Array&       outIndices) {
+
+        debugAssert(
+            inType == PrimitiveType::TRIANGLE_STRIP ||
+            inType == PrimitiveType::TRIANGLE_FAN ||
+            inType == PrimitiveType::QUADS ||
+            inType == PrimitiveType::QUAD_STRIP);
+
+        const int inSize = inIndices.size();
+
+        switch(inType) {
+        case PrimitiveType::TRIANGLE_FAN:
+            {
+            debugAssert(inSize >= 3);
+
+            int N = outIndices.size();
+            outIndices.resize(N + (inSize - 2) * 3);
+
+            for (IndexType i = 1, outIndex = N; i <= (inSize - 2); ++i, outIndex += 3) {
+                outIndices[outIndex] = inIndices[0];
+                outIndices[outIndex + 1] = inIndices[i];
+                outIndices[outIndex + 2] = inIndices[i + 1];
+            }
+
+            break;
+            }
+
+        case PrimitiveType::TRIANGLE_STRIP:
+            {
+            debugAssert(inSize >= 3);
+
+            int N = outIndices.size();
+            outIndices.resize(N + (inSize - 2) * 3);
+
+            bool atEven = false;
+            for (IndexType i = 0, outIndex = N; i <= (inSize - 2); ++i, outIndex += 3) {
+                if (atEven) {
+                    outIndices[outIndex] = inIndices[i + 1];
+                    outIndices[outIndex + 1] = inIndices[i];
+                    outIndices[outIndex + 2] = inIndices[i + 2];
+                    atEven = false;
+                } else {
+                    outIndices[outIndex] = inIndices[i];
+                    outIndices[outIndex + 1] = inIndices[i + 1];
+                    outIndices[outIndex + 2] = inIndices[i + 2];
+                    atEven = true;
+                }
+            }
+
+            break;
+            }
+
+        case PrimitiveType::QUADS:
+            {
+            debugAssert(inIndices.size() >= 4);
+
+            int N = outIndices.size();
+            outIndices.resize(N + (inSize / 4) * 3);
+
+            for (IndexType i = 0, outIndex = N; i <= (inSize - 4); i += 4, outIndex += 6) {
+                outIndices[outIndex] = inIndices[i];
+                outIndices[outIndex + 1] = inIndices[i + 1];
+                outIndices[outIndex + 2] = inIndices[i + 3];
+                outIndices[outIndex + 3] = inIndices[i + 1];
+                outIndices[outIndex + 4] = inIndices[i + 2];
+                outIndices[outIndex + 5] = inIndices[i + 3];
+            }
+
+            break;
+            }
+
+        case PrimitiveType::QUAD_STRIP:
+            {
+            debugAssert(inIndices.size() >= 4);
+
+            int N = outIndices.size();
+            outIndices.resize(N + (inSize - 2) * 3);
+
+            for (IndexType i = 0, outIndex = N; i <= (inSize - 2); i += 2, outIndex += 6) {
+                outIndices[outIndex] = inIndices[i];
+                outIndices[outIndex + 1] = inIndices[i + 1];
+                outIndices[outIndex + 2] = inIndices[i + 2];
+                outIndices[outIndex + 3] = inIndices[i + 2];
+                outIndices[outIndex + 4] = inIndices[i + 1];
+                outIndices[outIndex + 5] = inIndices[i + 3];
+            }
+            break;
+            }
+        default:
+            alwaysAssertM(false, "Illegal argument");
+        }
+    }
+
+protected:
+
+    /**
+     Helper for computeAdjacency.  If a directed edge with index e already
+     exists from i0 to i1 then e is returned.  If a directed edge with index e
+     already exists from i1 to i0, ~e is returned (the complement) and
+     edgeArray[e] is set to f.  Otherwise, a new edge is created from i0 to i1
+     with first face index f and its index is returned.
+    
+     @param vertexArray Vertex positions to use when deciding colocation.
+     
+     @param area Area of face f.  When multiple edges of the same direction 
+       are found between the same vertices (usually because of degenerate edges)
+       the face with larger area is kept in the edge table.
+     */
+    static int findEdgeIndex(
+        const Array&   vertexArray,
+        Array&            geometricEdgeArray,
+        int i0, int i1, int f, double area);
+};
+}
+#endif
+
diff --git a/externals/g3dlite/G3D/MeshBuilder.h b/externals/g3dlite/G3D/MeshBuilder.h
new file mode 100644
index 00000000000..9920d59d7d3
--- /dev/null
+++ b/externals/g3dlite/G3D/MeshBuilder.h
@@ -0,0 +1,82 @@
+/**
+  @file MeshBuilder.h
+
+  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+
+  @created 2002-02-27
+  @edited  2004-10-04
+ */ 
+#ifndef G3D_MESHBUILDER_H
+#define G3D_MESHBUILDER_H
+
+#include "G3D/platform.h"
+#include "G3D/Array.h"
+#include "G3D/Vector3.h"
+#include "G3D/Triangle.h"
+
+namespace G3D {
+
+/**
+ Allows creation of optimized watertight meshes from unoptimized polygon soups.
+ See also G3D::MeshAlg for algorithms that operate on the output.
+ */
+class MeshBuilder {
+public:
+
+    /**
+     Set setWeldRadius to AUTO_WELD to weld vertices closer than 1/2
+     the smallest edge length in a model.
+     */
+    enum {AUTO_WELD = -100};
+
+private:
+    /** Indices of vertices in or near  a grid cell. */
+    typedef Array List;
+   
+    std::string                 name;
+    
+    /**
+     All of the triangles, as a long triangle list.
+     */
+    Array              triList;
+
+    void centerTriList();
+    void computeBounds(Vector3& min, Vector3& max);
+
+	bool _twoSided;
+
+    /** Collapse radius */
+    double close;
+
+public:
+
+	inline MeshBuilder(bool twoSided = false) : _twoSided(twoSided), close(AUTO_WELD) {}
+
+    /** Writes the model to the arrays, which can then be used with
+        G3D::IFSModel::save and G3D::MeshAlg */
+    void commit(std::string& name, Array& indexArray, Array& vertexArray);
+
+    /**
+     Adds a new triangle to the model. (Counter clockwise)
+     */
+    void addTriangle(const Vector3& a, const Vector3& b, const Vector3& c);
+
+    /**
+     Adds two new triangles to the model. (Counter clockwise)
+     */
+    void addQuad(const Vector3& a, const Vector3& b, const Vector3& c, const Vector3& d);
+
+    void addTriangle(const Triangle& t);
+
+    void setName(const std::string& n);
+
+    /** Vertices within this distance are considered identical.  
+        Use AUTO_WELD (the default) to have the distance be a function of the model size.*/
+    void setWeldRadius(double r) {
+        close = r;
+    }
+};
+
+} // namespace
+
+#endif
diff --git a/externals/g3dlite/G3D/NetAddress.h b/externals/g3dlite/G3D/NetAddress.h
new file mode 100644
index 00000000000..8ed20a06690
--- /dev/null
+++ b/externals/g3dlite/G3D/NetAddress.h
@@ -0,0 +1,132 @@
+#ifndef G3D_NETADDRESS_H
+#define G3D_NETADDRESS_H
+
+#include "G3D/platform.h"
+#include "G3D/Table.h"
+
+/** These control the version of Winsock used by G3D.
+    Version 2.0 is standard for G3D 6.09 and later.
+    Version 1.1 is standard for G3D 6.08 and earlier.
+ */
+#define G3D_WINSOCK_MAJOR_VERSION 2
+#define G3D_WINSOCK_MINOR_VERSION 0
+
+#ifdef G3D_WIN32
+#   if (G3D_WINSOCK_MAJOR_VERSION == 2)
+#       include 
+#   elif (G3D_WINSOCK_MAJOR_VERSION == 1)
+#       include 
+#   endif
+#else
+#   include 
+#   include 
+#   include 
+#   ifndef SOCKADDR_IN
+#       define SOCKADDR_IN struct sockaddr_in
+#   endif
+#   ifndef SOCKET
+#       define SOCKET int
+#   endif
+#endif
+
+#include "G3D/g3dmath.h"
+
+namespace G3D {
+
+class NetAddress {
+private:
+    friend class NetworkDevice;
+    friend class LightweightConduit;
+    friend class ReliableConduit;
+
+    /** Host byte order */
+    void init(uint32 host, uint16 port);
+    void init(const std::string& hostname, uint16 port);
+    NetAddress(const SOCKADDR_IN& a);
+    NetAddress(const struct in_addr& addr, uint16 port = 0);
+
+    SOCKADDR_IN                 addr;
+
+public:
+    /**
+     In host byte order
+     */
+    NetAddress(uint32 host, uint16 port = 0);
+
+    /**
+     @param port Specified in host byte order (i.e., don't worry about endian issues)
+     */
+    NetAddress(const std::string& hostname, uint16 port);
+
+    /**
+       @param hostnameAndPort in the form "hostname:port" or "ip:port"
+     */
+    NetAddress(const std::string& hostnameAndPort);
+
+    /**
+       @deprecated Use G3D::NetworkDevice::broadcastAddressArray()
+
+     @brief Creates a UDP broadcast address for use with a
+     G3D::LightweightConduit.
+
+     UDP broadcast allows one machine to send a packet to all machines
+     on the same local network. The IP portion of the address is
+     0xFFFFFFFF, which indicates "broadcast" to the underlying socket
+     API.  This feature is not available with the connection-based TCP
+     protocol abstracted by G3D::ReliableConduit; use multisend
+     instead.
+     */
+    static NetAddress broadcastAddress(uint16 port);
+
+    NetAddress();
+
+    void serialize(class BinaryOutput& b) const;
+    void deserialize(class BinaryInput& b);
+
+    /** @brief Returns true if this is not an illegal address. */
+    bool ok() const;
+
+    /** @brief Returns a value in host format (i.e., don't worry about
+        endian issues) */
+    inline uint32 ip() const {
+        return ntohl(addr.sin_addr.s_addr);
+        //return ntohl(addr.sin_addr.S_un.S_addr);
+    }
+
+    inline uint16 port() const {
+        return ntohs(addr.sin_port);
+    }
+
+    std::string ipString() const;
+    std::string toString() const;
+
+};
+
+std::ostream& operator<<(std::ostream& os, const NetAddress&);
+
+} // namespace G3D
+
+template <> struct HashTrait {
+    static size_t hashCode(const G3D::NetAddress& key) { 
+        return static_cast(key.ip() + (static_cast(key.port()) << 16));
+    }
+};
+
+namespace G3D {
+
+/**
+ Two addresses may point to the same computer but be != because
+ they have different IP's.
+ */
+inline bool operator==(const NetAddress& a, const NetAddress& b) {
+	return (a.ip() == b.ip()) && (a.port() == b.port());
+}
+
+
+inline bool operator!=(const NetAddress& a, const NetAddress& b) {
+    return !(a == b);
+}
+
+} // namespace G3D
+
+#endif
diff --git a/externals/g3dlite/G3D/NetworkDevice.h b/externals/g3dlite/G3D/NetworkDevice.h
new file mode 100644
index 00000000000..ea3290cbc09
--- /dev/null
+++ b/externals/g3dlite/G3D/NetworkDevice.h
@@ -0,0 +1,738 @@
+/**
+ @file NetworkDevice.h
+
+ These classes abstract networking from the socket level to a
+ serialized messaging style that is more appropriate for games.  The
+ performance has been tuned for sending many small messages.  The
+ message protocol contains a header that prevents them from being used
+ with raw UDP/TCP (e.g. connecting to an HTTP server). 
+
+ LightweightConduit and ReliableConduits have different interfaces
+ because they have different semantics.  You would never want to
+ interchange them without rewriting the surrounding code.
+
+ NetworkDevice creates conduits because they need access to a global
+ log pointer and because I don't want non-reference counted conduits
+ being created.
+
+ Be careful with threads and reference counting.  The reference
+ counters are not threadsafe, and are also not updated correctly if a
+ thread is explicitly killed.  Since the conduits will be passed by
+ const XConduitRef& most of the time this doesn't appear as a major
+ problem.  With non-blocking conduits, you should need few threads
+ anyway.
+
+ LightweightConduits preceed each message with a 4-byte host order
+ unsigned integer that is the message type.  This does not appear in
+ the message serialization/deserialization.
+
+ ReliableConduits preceed each message with two 4-byte host order
+ unsigned integers.  The first is the message type and the second
+ indicates the length of the rest of the data.  The size does not
+ include the size of the header itself.  The minimum message is 9
+ bytes:a 4-byte type, a 4-byte header equal to "1", and one byte of data.
+
+ @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+ @created 2002-11-22
+ @edited  2006-11-25
+ */
+
+#ifndef G3D_NETWORKDEVICE_H
+#define G3D_NETWORKDEVICE_H
+
+#include "G3D/platform.h"
+#include "G3D/NetAddress.h"
+
+#include 
+#include 
+#include "G3D/g3dmath.h"
+
+#include "G3D/ReferenceCount.h"
+#include "G3D/Array.h"
+#include "G3D/BinaryOutput.h"
+
+namespace G3D {
+
+class TextOutput;
+
+class Conduit : public ReferenceCountedObject {
+protected:
+    friend class NetworkDevice;
+    friend class NetListener;
+
+    uint64                          mSent;
+    uint64                          mReceived;
+    uint64                          bSent;
+    uint64                          bReceived;
+
+    SOCKET                          sock;
+
+    /**
+     Used for serialization.  One per socket
+     to make this threadsafe.
+     */
+    BinaryOutput                    binaryOutput;
+
+    Conduit();
+
+public:
+
+    virtual ~Conduit();
+    uint64 bytesSent() const;
+    uint64 messagesSent() const;
+    uint64 bytesReceived() const;
+    uint64 messagesReceived() const;
+
+    /**
+     If true, receive will return true.
+     */
+    virtual bool messageWaiting();
+
+    /**
+     Returns the type of the waiting message (i.e. the type supplied
+     with send).  The return value is zero when there is no message
+     waiting.
+
+     One way to use this is to have a Table mapping message types to
+     pre-allocated subclasses so receiving looks like:
+
+     
+         // My base class for messages.
+         class Message {
+             virtual void serialize(BinaryOutput&) const;
+             virtual void deserialize(BinaryInput&);
+             virtual void process() = 0;
+         };
+
+         Message* m = table[conduit->waitingMessageType()];
+         conduit->receive(m);
+         m->process();
+     

+
+      Another is to simply switch on the message type:
+
+      
+         switch (conduit->waitingMessageType()) {
+         case 0:
+            // No message
+            break;
+
+         case ENTITY_SPAWN_MSG:
+            {
+               EntitySpawnMsg m;
+               condiut->receive(m);
+               spawnEntity(m.id, m.position, m.modelID);
+            }
+            break;
+            ...
+         }
+      

+     */
+    virtual uint32 waitingMessageType() = 0;
+
+    /** Returns true if the connection is ok. */
+    bool ok() const;
+};
+
+typedef ReferenceCountedPointer ReliableConduitRef;
+
+#ifdef __GNUC__
+// Workaround for a known bug in gcc 4.x where htonl produces 
+// a spurrious warning.
+// http://gcc.gnu.org/ml/gcc-bugs/2005-10/msg03270.html
+uint32 gcchtonl(uint32);
+#endif
+
+// Messaging and stream APIs must be supported on a single class because
+// sometimes an application will switch modes on a single socket.  For
+// example, when transferring 3D level geometry during handshaking with
+// a game server.
+/**
+ A conduit that guarantees messages will arrive, intact and in order.
+ Create on the client using NetworkDevice::createReliableConduit and
+ on the server using NetListener::waitForConnection.  Set the reference
+ counted pointer to NULL to disconnect.
+
+ To construct a ReliableConduit:
+ 
    
+   
  1.  Create a G3D::NetworkDevice (if you are using G3D::GApp, it creates 
+        one for you) on the client and on the server.
+   
  2.  On the server, create a G3D::NetListener using 
+        G3D::NetworkDevice::createListener
+   
  3.  On the server, invoke G3D::NetListener::waitForConnection.
+   
  4.  On the client, call G3D::NetworkDevice::createReliableConduit.  
+        You will need the server's G3D::NetAddress.  Consider using
+        G3D::Discovery::Client to find it via broadcasting.
+ 

+
+ */
+class ReliableConduit : public Conduit {
+private:
+    friend class NetworkDevice;
+    friend class NetListener;
+
+    enum State {RECEIVING, HOLDING, NO_MESSAGE} state;
+
+    NetAddress                      addr;
+    
+    /**
+     Type of the incoming message.
+     */
+    uint32                          messageType;
+
+    /** 
+     Total size of the incoming message (read from the header).
+     */
+    uint32                          messageSize;
+
+    /** Shared buffer for receiving messages. */
+    void*                           receiveBuffer;
+
+    /** Total size of the receiveBuffer. */
+    size_t                          receiveBufferTotalSize;
+
+    /** Size occupied by the current message... so far.  This will be
+        equal to messageSize when the whole message has arrived. 
+      */
+    size_t                          receiveBufferUsedSize;
+
+    ReliableConduit(const NetAddress& addr);
+
+    ReliableConduit(const SOCKET& sock, 
+                    const NetAddress& addr);
+
+    template static void serializeMessage
+              (uint32 t, const T& m, BinaryOutput& b) {
+
+        b.writeUInt32(t);
+
+        // Reserve space for the 4 byte size header
+        b.writeUInt32(0);
+
+        size_t L = b.length();
+        m.serialize(b);
+        if ((size_t)b.length() == L) {
+            // No data was created by serialization.
+            // We need to send at least one byte because receive assumes that
+            // a zero length message is an error.
+            b.writeUInt8(0xFF);
+        }
+    
+        uint32 len = b.size() - 8;
+    
+        // We send the length first to tell recv how much data to read.
+        // Here we abuse BinaryOutput a bit and write directly into
+        // its buffer, violating the abstraction.
+        // Note that we write to the second set of 4 bytes, which is
+        // the size field.
+        uint32* lenPtr = ((uint32*)b.getCArray()) + 1;
+        #if defined(__GNUC__)
+            *lenPtr = gcchtonl(len);
+        #else
+            *lenPtr = htonl(len);
+        #endif
+    }
+
+
+    void sendBuffer(const BinaryOutput& b);
+
+    /** Accumulates whatever part of the message (not the header) is
+        still waiting on the socket into the receiveBuffer during
+        state = RECEIVING mode.  Closes the socket if anything goes
+        wrong.  When receiveBufferUsedSize == messageSize, the entire
+        message has arrived. */
+    void receiveIntoBuffer();
+
+    /** Receives the messageType and messageSize from the socket. */
+    void receiveHeader();
+
+public:
+
+    /**
+     Client invokes this to connect to a server.  The call blocks until the 
+     conduit is opened.  The conduit will not be ok() if it fails.
+     */
+    static ReliableConduitRef create(const NetAddress& address);
+
+    /** Closes the socket. */
+    ~ReliableConduit();
+
+
+    // The message is actually copied from the socket to an internal buffer during
+    // this call.  Receive only deserializes.
+    virtual bool messageWaiting();
+
+    /**
+     Serializes the message and schedules it to be sent as soon as possible,
+     and then returns immediately.  The message can be any class with
+     a serialize and deserialize method.  On the receiving side,
+     use G3D::ReliableConduit::waitingMessageType() to detect the incoming
+     message and then invoke G3D::ReliableConduit::receive(msg) where msg
+     is of the same class as the message that was sent.
+
+     The actual data sent across the network is preceeded by the
+     message type and the size of the serialized message as a 32-bit
+     integer.  The size is sent because TCP is a stream protocol and
+     doesn't have a concept of discrete messages.
+     */
+    template inline void send(uint32 type, const T& message) {
+        binaryOutput.reset();
+        serializeMessage(type, message, binaryOutput);
+        sendBuffer(binaryOutput);
+    }
+    
+    /** Sends an empty message with the given type.  Useful for sending 
+        commands that have no parameters. */
+    void send(uint32 type);
+
+    /** Send the same message to a number of conduits.  Useful for sending
+        data from a server to many clients (only serializes once). */
+    template
+    inline static void multisend(
+        const Array& array, 
+        uint32                          type,
+        const T&                        m) {
+        
+        if (array.size() > 0) {
+            array[0]->binaryOutput.reset();
+            serializeMessage(type, m, array[0]->binaryOutput);
+
+            for (int i = 0; i < array.size(); ++i) {
+                array[i]->sendBuffer(array[0]->binaryOutput);
+            }
+        }
+    }
+
+    virtual uint32 waitingMessageType();
+
+    /** 
+        If a message is waiting, deserializes the waiting message into
+        message and returns true, otherwise returns false.  You can
+        determine the type of the message (and therefore, the class
+        of message) using G3D::ReliableConduit::waitingMessageType().
+     */
+    template inline bool receive(T& message) {
+        if (! messageWaiting()) {
+            return false;
+        }
+
+        debugAssert(state == HOLDING);
+        // Deserialize
+        BinaryInput b((uint8*)receiveBuffer, receiveBufferUsedSize, G3D_LITTLE_ENDIAN, BinaryInput::NO_COPY);
+        message.deserialize(b);
+        
+        // Don't let anyone read this message again.  We leave the buffer
+        // allocated for the next caller, however.
+        receiveBufferUsedSize = 0;
+        state = NO_MESSAGE;
+        messageType = 0;
+        messageSize = 0;
+
+        // Potentially read the next message.
+        messageWaiting();
+
+        return true;
+    }
+
+    /** Removes the current message from the queue. */
+    inline void receive() {
+        if (! messageWaiting()) {
+            return;
+        }
+        receiveBufferUsedSize = 0;
+        state = NO_MESSAGE;
+        messageType = 0;
+        messageSize = 0;
+
+        // Potentially read the next message.
+        messageWaiting();
+    }
+
+    NetAddress address() const;
+};
+
+
+typedef ReferenceCountedPointer LightweightConduitRef;
+
+/**
+ Provides fast but unreliable transfer of messages.  On a LAN,
+ LightweightConduit will probably never drop messages but you
+ might get your messages out of order.  On an internet
+ connection it might drop messages altogether.  Messages are never
+ corrupted, however.  LightweightConduit requires a little less setup
+ and overhead than ReliableConduit.  ReliableConduit guarantees
+ message delivery and order but requires a persistent connection.
+ 
+ To set up a LightweightConduit (assuming you have already made
+ subclasses of G3D::NetMessage based on your application's
+ pcommunication protocol):
+
+[Server Side]
+
    
+
  1.  Call LightweightConduit::create(port, true, false), 
+where port is the port on which you will receive messages.
+
+
  2.  Poll LightweightConduit::messageWaiting from your main loop.  When 
+it is true (or, equivalently, when LightweightConduit::waitingMessageType
+is non-zero) there is an incoming message.
+
+
  3.  To read the incoming message, call LightweightConduit::receive with 
+the appropriate class type, which mist have a deserialize method.
+LightweightConduit::waitingMessageType tells you what class is 
+needed (you make up your own message constants for your program; numbers 
+under 1000 are reserved for G3D's internal use).
+
+
  4.  When done, simply set the G3D::LightweightConduitRef to NULL or let 
+it go out of scope and the conduit cleans itself up automatically.
+

+
+[Client Side]
+
    
+
  1.  Call G3D::LightweightConduit::create().  If you will 
+broadcast to all servers on a LAN, set the third optional argument to 
+true (the default is false for no broadcast).  You can also set up the
+receive port as if it was a server to send and receive from a single 
+LightweightConduit.
+
+
  2.  To send, call G3D::LightweightConduit::send with the target address 
+and a pointer to an instance of the message you want to send.
+
+
  3.  When done, simply set the G3D::LightweightConduitRef to NULL or let 
+it go out of scope and the conduit cleans itself up automatically.
+
+

+ */
+class LightweightConduit : public Conduit {
+private:
+    friend class NetworkDevice;
+
+    /**
+     True when waitingForMessageType has read the message
+     from the network into messageType/messageStream.
+     */
+    bool                    alreadyReadMessage;
+
+    /**
+     Origin of the received message.
+     */
+    NetAddress              messageSender;
+
+    /**
+     The type of the last message received.
+     */
+    uint32                  messageType;
+
+    /**
+     The message received (the type has already been read off).
+     */
+    Array            messageBuffer;
+
+    LightweightConduit(uint16 receivePort, bool enableReceive, bool enableBroadcast);
+    
+    void sendBuffer(const NetAddress& a, BinaryOutput& b);
+
+    /** Maximum transmission unit (packet size in bytes) for this socket.
+        May vary between sockets. */
+    int                    MTU;
+
+
+    template 
+    void serializeMessage(
+        uint32 type, 
+        const T& m, 
+        BinaryOutput& b) const {
+
+        debugAssert(type != 0);
+        b.writeUInt32(type);
+        m.serialize(b);
+        b.writeUInt32(1);
+    
+        debugAssertM(b.size() < MTU, 
+                    format("This LightweightConduit is limited to messages of "
+                           "%d bytes (Ethernet hardware limit; this is the "
+                           "'UDP MTU')", maxMessageSize()));
+
+        if (b.size() >= MTU) {
+            throw LightweightConduit::PacketSizeException(
+                    format("This LightweightConduit is limited to messages of "
+                           "%d bytes (Ethernet hardware limit; this is the "
+                           "'UDP MTU')", maxMessageSize()),
+                           b.size() - 4, // Don't count the type header
+                           maxMessageSize());
+        }
+    }
+
+public:
+
+    static LightweightConduitRef create(uint16 receivePort, bool enableReceive, bool enableBroadcast);
+
+    class PacketSizeException {
+    public:
+        std::string            message;
+        int                    serializedPacketSize;
+        int                    maxMessageSize;
+
+        inline PacketSizeException(const std::string& m, int s, int b) :
+            message(m),
+            serializedPacketSize(s),
+            maxMessageSize(b) {}
+    };
+
+    /** Closes the socket. */
+    ~LightweightConduit();
+
+    /** The maximum length of a message that can be sent
+        (G3D places a small header at the front of each UDP packet;
+        this is already taken into account by the value returned).
+     */
+    inline int maxMessageSize() const {
+        return MTU - 4;
+    }
+
+
+    template inline void send(const NetAddress& a, uint32 type, const T& msg) {
+        binaryOutput.reset();
+        serializeMessage(type, msg, binaryOutput);
+        sendBuffer(a, binaryOutput);
+    }
+
+    /** Send the same message to multiple addresses (only serializes once).
+        Useful when server needs to send to a known list of addresses
+        (unlike direct UDP broadcast to all addresses on the subnet) */
+    template inline void send(const Array& a, uint32 type, const T& m) {
+        binaryOutput.reset();
+        serializeMessage(type, m, binaryOutput);
+
+        for (int i = 0; i < a.size(); ++i) {
+            sendBuffer(a[i], binaryOutput);
+        }
+    }
+
+    bool receive(NetAddress& sender);
+
+    template inline bool receive(NetAddress& sender, T& message) {
+		bool r = receive(sender);
+		if (r) {
+			BinaryInput b((messageBuffer.getCArray() + 4), 
+						  messageBuffer.size() - 4, 
+						  G3D_LITTLE_ENDIAN, BinaryInput::NO_COPY);
+			message.deserialize(b);
+		}
+
+        return r;
+    }
+
+    inline bool receive() {
+        static NetAddress ignore;
+        return receive(ignore);
+    }
+
+    virtual uint32 waitingMessageType();
+
+
+    virtual bool messageWaiting();
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+typedef ReferenceCountedPointer NetListenerRef;
+
+/**
+ Runs on the server listening for clients trying to make reliable connections.
+ */
+class NetListener : public ReferenceCountedObject {
+private:
+
+    friend class NetworkDevice;
+
+    SOCKET                          sock;
+
+    /** Port is in host byte order. */
+    NetListener(uint16 port);
+
+public:
+
+    static NetListenerRef create(const uint16 port);
+
+    ~NetListener();
+
+    /** Block until a connection is received.  Returns NULL if 
+        something went wrong. */
+    ReliableConduitRef waitForConnection();
+
+    /** True if a client is waiting (i.e. waitForConnection will
+        return immediately). */
+    bool clientWaiting() const;
+
+    bool ok() const;
+};
+
+
+///////////////////////////////////////////////////////////////////////////////
+
+/**
+   @brief Abstraction of network (socket) functionality.
+
+   An abstraction over sockets that provides a message-based network
+   infrastructure optimized for sending many small (~500 bytes) messages.
+   All functions always return immediately.
+   
+   Create only one NetworkDevice per process (a WinSock restriction).
+   
+   NetworkDevice is technically not thread safe.  However, as long as
+   you use different conduits on different threads (or lock conduits
+   before sending), you will encounter no problems sharing the single
+   NetworkDevice across multiple threads.  That is, do not invoke the same
+   Conduit's send or receive method on two threads at once.
+   
+   This assumes that the underlying WinSock/BSD sockets implementation
+   is thread safe.  That is not guaranteed, but in practice seems
+   to always be true (see
+   http://tangentsoft.net/wskfaq/intermediate.html#threadsafety)
+
+   
 
+
+   IP networks use "network byte order" (big-endian) for
+   communicating integers.  "Host byte order" is the endian-ness of
+   the local machine (typically little-endian; see
+   System::endian). The C functions htonl() and ntohl() convert 32-bit
+   values between these formats. G3D only ever exposes host byte order,
+   so programmers rarely need to be aware of the distinction.
+
+ */
+class NetworkDevice {
+public:
+
+    /** @brief Description of an ethernet or wireless ethernet adapter.*/
+    class EthernetAdapter {
+    public:
+        /** Reverse-DNS of the ip address.*/
+        std::string     hostname;
+
+        /** Name of the adapter */
+        std::string     name;
+
+        /** IP address in host byte order.*/
+        uint32          ip;
+
+        /** Subnet mask in host byte order.*/
+        uint32          subnet;
+
+        /** UDP broadcast address in host byte order.*/
+        uint32          broadcast;
+
+        /** MAC (hardware) address, if known */
+        uint8           mac[6];
+
+        EthernetAdapter();
+
+        /** Produces a text description of this adapter */
+        void describe(TextOutput& t) const;
+    };
+
+private:
+
+    friend class Conduit;
+    friend class LightweightConduit;
+    friend class ReliableConduit;
+    friend class NetListener;
+
+    bool                        initialized;
+
+    Array      m_adapterArray;
+
+    /** Broadcast addresses available on this machine,
+     extracted from m_adapterArray.*/
+    Array               m_broadcastAddresses;
+
+    /** Utility method. */
+    void closesocket(SOCKET& sock) const;
+
+    /** Utility method. Returns true on success.*/
+    bool bind(SOCKET sock, const NetAddress& addr) const;
+
+    /** The global instance */
+    static NetworkDevice* s_instance;
+
+    NetworkDevice();
+
+    bool init();
+
+    void _cleanup();
+
+    /** Called from init to update m_adapterArray and
+        m_broadcastAddresses. */
+    void addAdapter(const EthernetAdapter& a);
+
+public:
+
+    /** Prints an IP address to a string.
+        @param ip In host byte order.*/
+    static std::string formatIP(uint32 ip);
+
+    /** Prints a MAC address to a string. */
+    static std::string formatMAC(const uint8 mac[6]);
+
+    ~NetworkDevice();
+
+    /** Returns the available ethernet adapters for the current
+        machine that are online. Does not include the loopback adapter
+        for localhost.*/
+    inline const Array& adapterArray() const {
+        return m_adapterArray;
+    }
+
+    /** Returns the (unique) IP addresses for UDP broadcasting
+        extracted from adapterArray(). All are in host byte order. */
+    inline const Array& broadcastAddressArray() const {
+        return m_broadcastAddresses;
+    }
+
+    /**
+     Returns NULL if there was a problem initializing the network.
+     */
+    static NetworkDevice* instance();
+
+    /**
+     Shuts down the network device (destroying the global instance).
+     */
+    static void cleanup();
+
+    /**
+     Prints a human-readable description of this machine
+     to the text output stream.
+     */
+    void describeSystem(
+        TextOutput& t);
+
+    void describeSystem(
+        std::string&        s);
+
+    /** Returns the name (or one of the names) of this computer */
+    std::string localHostName() const;
+
+    /** There is often more than one address for the local host. This
+        returns all of them. 
+        @deprecated Use adapterArray()
+    */
+    void localHostAddresses(Array& array) const;
+};
+
+
+#ifdef __GNUC__
+inline uint32 gcchtonl(uint32 x) {
+    // This pragma fools gcc into surpressing all error messages,
+    // including the bogus one that it creates for htonl
+#   pragma GCC system_header
+    return htonl(x);
+}
+#endif
+
+} // G3D namespace
+
+#ifndef _WIN32
+#undef SOCKADDR_IN
+#undef SOCKET
+#endif
+
+#endif
diff --git a/externals/g3dlite/G3D/ParseError.h b/externals/g3dlite/G3D/ParseError.h
new file mode 100644
index 00000000000..f02948e3d29
--- /dev/null
+++ b/externals/g3dlite/G3D/ParseError.h
@@ -0,0 +1,59 @@
+/**
+ @file ParseError.h
+  
+ @maintainer Morgan McGuire
+  
+ @created 2009-11-15
+ @edited  2009-11-15
+
+ Copyright 2000-2009, Morgan McGuire.
+ All rights reserved.
+ */
+#ifndef G3D_ParseError_h
+#define G3D_ParseError_h
+
+#include "G3D/platform.h"
+#include "G3D/g3dmath.h"
+#include 
+
+namespace G3D {
+
+/** Thrown by TextInput, Any, and other parsers on unexpected input. */
+class ParseError {
+public:
+    enum {UNKNOWN = -1};
+    
+    /** Empty means unknown */
+    std::string     filename;
+    
+    /** For a binary file, the location of the parse error. -1 if unknown.*/
+    int64           byte;
+
+    /** For a text file, the line number is the line number of start of token which caused the exception.  1 is
+        the first line of the file.  -1 means unknown.  Note that you can use 
+        TextInput::Settings::startingLineNumberOffset to shift the effective line
+        number that is reported by that class.
+    */
+    int             line;
+
+    /** Character number (in the line) of the start of the token which caused the
+    exception.  1 is the character in the line. May be -1 if unknown.
+    */
+    int             character;
+
+    std::string     message;
+ 
+    ParseError() : byte(UNKNOWN), line(UNKNOWN), character(UNKNOWN) {}
+
+    virtual ~ParseError() {}
+
+    ParseError(const std::string& f, int l, int c, const std::string& m) :
+        filename (f),  byte(UNKNOWN), line(l), character(c), message(m) {}
+
+    ParseError(const std::string& f, int64 b, const std::string& m) :
+        filename (f),  byte(b), line(UNKNOWN), character(UNKNOWN), message(m) {}
+};
+
+}
+
+#endif
diff --git a/externals/g3dlite/G3D/PhysicsFrame.h b/externals/g3dlite/G3D/PhysicsFrame.h
new file mode 100644
index 00000000000..a5a9305b83e
--- /dev/null
+++ b/externals/g3dlite/G3D/PhysicsFrame.h
@@ -0,0 +1,74 @@
+/**
+ @file PhysicsFrame.h
+
+ @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+ 
+ @created 2002-07-08
+ @edited  2006-01-10
+*/
+
+#ifndef G3D_PHYSICSFRAME_H
+#define G3D_PHYSICSFRAME_H
+
+#include "G3D/platform.h"
+#include "G3D/Vector3.h"
+#include "G3D/Matrix3.h"
+#include "G3D/Quat.h"
+#include "G3D/CoordinateFrame.h"
+#include 
+#include 
+
+
+namespace G3D {
+
+/**
+  An RT transformation using a quaternion; suitable for
+  physics integration.
+
+  This interface is in "Beta" and will change in the next release.
+ */
+class PhysicsFrame {
+public:
+
+    Quat    rotation;
+
+    /**
+     Takes object space points to world space.
+     */
+    Vector3 translation;
+
+    /**
+     Initializes to the identity frame.
+     */
+    PhysicsFrame();
+
+    /**
+     Purely translational force
+     */
+    PhysicsFrame(const Vector3& translation) : translation(translation) {}
+
+    PhysicsFrame(const CoordinateFrame& coordinateFrame);
+
+    /** Compose: create the transformation that is other followed by this.*/
+    PhysicsFrame operator*(const PhysicsFrame& other) const;
+
+    virtual ~PhysicsFrame() {}
+
+    CoordinateFrame toCoordinateFrame() const;
+
+    /**
+     Linear interpolation (spherical linear for the rotations).
+     */
+    PhysicsFrame lerp(
+        const PhysicsFrame&     other,
+        float                   alpha) const;
+
+    void deserialize(class BinaryInput& b);
+
+    void serialize(class BinaryOutput& b) const;
+
+};
+
+} // namespace
+
+#endif
diff --git a/externals/g3dlite/G3D/Plane.h b/externals/g3dlite/G3D/Plane.h
new file mode 100644
index 00000000000..360bcd2bc75
--- /dev/null
+++ b/externals/g3dlite/G3D/Plane.h
@@ -0,0 +1,161 @@
+/**
+ @file Plane.h
+
+ Plane class
+
+ @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+
+ @created 2001-06-02
+ @edited  2004-07-18
+*/
+
+#ifndef G3D_PLANE_H
+#define G3D_PLANE_H
+
+#include "G3D/platform.h"
+#include "G3D/Vector3.h"
+#include "G3D/Vector4.h"
+#include "G3D/debugAssert.h"
+
+namespace G3D {
+
+/**
+ An infinite 2D plane in 3D space.
+ */
+class Plane {
+private:
+
+    /** normal.Dot(x,y,z) = distance */
+    Vector3						_normal;
+    float						_distance;
+
+    /**
+     Assumes the normal has unit length.
+     */
+    Plane(const Vector3& n, float d) : _normal(n), _distance(d) {
+    }
+
+public:
+
+    Plane() : _normal(Vector3::unitY()), _distance(0) {
+    }
+
+    /**
+     Constructs a plane from three points.
+     */
+    Plane(
+        const Vector3&      point0,
+        const Vector3&      point1,
+        const Vector3&      point2);
+
+    /**
+     Constructs a plane from three points, where at most two are
+     at infinity (w = 0, not xyz = inf).
+     */
+    Plane(
+        Vector4             point0,
+        Vector4             point1,
+        Vector4             point2);
+
+    /**
+     The normal will be unitized.
+     */
+    Plane(
+        const Vector3&      __normal,
+        const Vector3&      point);
+
+    static Plane fromEquation(float a, float b, float c, float d);
+
+	Plane(class BinaryInput& b);
+	void serialize(class BinaryOutput& b) const;
+	void deserialize(class BinaryInput& b);
+
+    virtual ~Plane() {}
+
+    /**
+     Returns true if point is on the side the normal points to or 
+     is in the plane.
+     */
+    inline bool halfSpaceContains(Vector3 point) const {
+        // Clamp to a finite range for testing
+        point = point.clamp(Vector3::minFinite(), Vector3::maxFinite());
+
+        // We can get away with putting values *at* the limits of the float32 range into
+        // a dot product, since the dot product is carried out on float64.
+        return _normal.dot(point) >= _distance;
+    }
+
+    /**
+     Returns true if point is on the side the normal points to or 
+     is in the plane.
+     */
+    inline bool halfSpaceContains(const Vector4& point) const {
+        if (point.w == 0) {
+            return _normal.dot(point.xyz()) > 0;
+        } else {
+            return halfSpaceContains(point.xyz() / point.w);
+        }
+    }
+
+    /**
+     Returns true if point is on the side the normal points to or 
+     is in the plane.  Only call on finite points.  Faster than halfSpaceContains.
+     */
+    inline bool halfSpaceContainsFinite(const Vector3& point) const {
+        debugAssert(point.isFinite());
+        return _normal.dot(point) >= _distance;
+    }
+
+    /**
+     Returns true if the point is nearly in the plane.
+     */
+    inline bool fuzzyContains(const Vector3 &point) const {
+        return fuzzyEq(point.dot(_normal), _distance);
+    }
+
+	inline const Vector3& normal() const {
+		return _normal;
+	}
+
+    /**
+      Returns distance from point to plane. Distance is negative if point is behind (not in plane in direction opposite normal) the plane.
+    */
+    inline float distance(const Vector3& x) const {
+        return (_normal.dot(x) - _distance);
+    }
+
+    inline Vector3 closestPoint(const Vector3& x) const {
+        return x + (_normal * (-distance(x)));
+    }
+
+    /** Returns normal * distance from origin */
+    Vector3 center() const {
+        return _normal * _distance;
+    }
+
+    /**
+     Inverts the facing direction of the plane so the new normal
+     is the inverse of the old normal.
+     */
+    void flip();
+
+    /**
+      Returns the equation in the form:
+
+      normal.Dot(Vector3(x, y, z)) + d = 0
+     */
+    void getEquation(Vector3 &normal, double& d) const;
+    void getEquation(Vector3 &normal, float& d) const;
+
+    /**
+      ax + by + cz + d = 0
+     */
+    void getEquation(double& a, double& b, double& c, double& d) const;
+    void getEquation(float& a, float& b, float& c, float& d) const;
+
+    std::string toString() const;
+};
+
+} // namespace
+
+#endif
diff --git a/externals/g3dlite/G3D/PointHashGrid.h b/externals/g3dlite/G3D/PointHashGrid.h
new file mode 100644
index 00000000000..0db9e677321
--- /dev/null
+++ b/externals/g3dlite/G3D/PointHashGrid.h
@@ -0,0 +1,917 @@
+/**
+   @file PointHashGrid.h
+
+   @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+   @created 2008-07-01
+   @edited  2009-05-28
+
+   Copyright 2000-2009, Morgan McGuire.
+   All rights reserved.
+*/
+#ifndef G3D_PointHashGrid_h
+#define G3D_PointHashGrid_h
+
+#include "G3D/platform.h"
+#include "G3D/EqualsTrait.h"
+#include "G3D/HashTrait.h"
+#include "G3D/Vector3.h"
+#include "G3D/Vector3int32.h"
+#include "G3D/Array.h"
+#include "G3D/Table.h"
+#include "G3D/AABox.h"
+#include "G3D/Sphere.h"
+#include "G3D/SmallArray.h"
+
+namespace G3D {
+
+/** 
+    Storage of data in a sparse 3D grid of point-based data.  The
+    space cost for n elements is O(n).  For data with
+    approximately uniform density (with respect to the radius hint),
+    the time cost of searching for neighbors is O(1).
+
+    Value must be supported by a G3D::PositionTrait,
+    G3D::EqualsTrait, and G3D::HashFunc.  overrides are provided for
+    common G3D classes like G3D::Vector3.
+*/
+template, 
+         class EqualsFunc = EqualsTrait, 
+         class HashFunc   = HashTrait >
+class PointHashGrid {
+private:
+
+#define ThisType PointHashGrid
+
+    /** A value annotated with precomputed position and hash code.*/
+    class Entry {
+    public:
+        Vector3			 position;
+        Value			 value;
+    };
+
+    /** One cell of the grid. */
+    typedef Array Cell;
+    typedef Table CellTable;
+
+    /** The cube of +/-1 along each dimension. Initialized by initOffsetArray.*/
+    Vector3int32        m_offsetArray[3*3*3];
+
+    /** Incremented every time the data structure is mutated. 
+        Used by the iterators to determine if the data structure
+        has changed since iteration began. */
+    int                 m_epoch;
+
+    /** Extent of a cell along one dimension. */
+    float               m_cellWidth;
+
+    /** 1.0 / cell width */
+    float               m_invCellWidth;
+
+    /** Conservative bounds; the actual data may be smaller. */
+    AABox               m_bounds;
+
+    /** Number of elements. */
+    int                 m_size;
+
+    /** Non-empty cells indexed by grid position. Actual 3D position is 
+        position * m_cellWidth*/
+    CellTable           m_data;
+
+    MemoryManager::Ref  m_memoryManager;
+
+    /** Intentionally unimplemented: prevent copy construction. */
+    PointHashGrid(const ThisType&);
+
+
+    /** Intentionally unimplemented: prevent assignment. */
+    PointHashGrid& operator=(const ThisType&);
+
+
+    /** Locate the cell and index within that cell containing v. Called by
+        remove() and contains(). */
+    bool find(const Value&    v, 
+              Vector3int32&   foundCellCoord, 
+              Cell*&          foundCell, 
+              int&            index) {
+        
+        Vector3 pos;
+        PosFunc::getPosition(v, pos);
+
+        Vector3int32 cellCoord;
+        getCellCoord(pos, cellCoord);
+        for (int i = 0; i < 27; ++i) {
+            Vector3int32 c = cellCoord + m_offsetArray[i];
+            Cell* cell = m_data.getPointer(c);
+            if (cell != NULL) {
+                // The cell exists
+                for (int j = 0; j < cell->size(); ++j) {
+                    if (EqualsFunc::equals((*cell)[j].value, v)) {
+                        foundCell = cell;
+                        index = j;
+                        foundCellCoord = c;
+                        return true;
+                    }
+                }
+            }            
+        }
+
+        // Not found
+        return false;        
+    }
+
+    /** Given a real-space position, returns the cell coord 
+        containing it.*/
+    inline void getCellCoord(const Vector3& pos, Vector3int32& cellCoord) const {
+        for (int a = 0; a < 3; ++a) {
+            cellCoord[a] = iFloor(pos[a] * m_invCellWidth);
+        }
+    }
+
+    /** Initializes m_offsetArray. */
+    void initOffsetArray() {
+        int i = 0;
+        Vector3int32 d;
+        for (d.x = -1; d.x <= +1; ++d.x) {
+            for (d.y = -1; d.y <= +1; ++d.y) {
+                for (d.z = -1; d.z <= +1; ++d.z) {
+                    m_offsetArray[i] = d;
+                    ++i;
+                }
+            }
+        }
+        
+        // Put (0, 0, 0) first, so that contains() is most likely to find
+        // the value quickly.
+        i = (1 * 3 + 1) * 3 + 1;
+        debugAssert(m_offsetArray[i] == Vector3int32(0,0,0));
+        Vector3int32 temp = m_offsetArray[0];
+        m_offsetArray[0] = m_offsetArray[i];
+        m_offsetArray[i] = temp;
+    }
+
+public:
+
+    /** 
+        @param radiusHint the radius that will typically be used with 
+        beginSphereIntersection and beginBoxIntersection. If two Values are equal,
+        their positions must be within this radius as well.
+    */
+    PointHashGrid(float radiusHint, const MemoryManager::Ref& m = MemoryManager::create()) : m_size(0), m_memoryManager(m) {
+        initOffsetArray();
+        m_data.clearAndSetMemoryManager(m_memoryManager);
+
+        debugAssertM(radiusHint > 0, "Cell radius must be positive");
+        m_cellWidth = radiusHint;
+        m_invCellWidth = 1.0f / m_cellWidth;
+    }
+
+    /**
+       If radiusHint is negative, it is automatically chosen to put 
+       about 5 values in each grid cell (which means about 27 * 5 
+       values for each beginIntersection call).
+    */
+    PointHashGrid(const Array& init, float radiusHint = -1.0f, const MemoryManager::Ref& m = MemoryManager::create()) : m_size(0), m_memoryManager(m) {		
+        initOffsetArray();
+        m_data.clearAndSetMemoryManager(m_memoryManager);
+
+        Vector3 lo(Vector3::inf());
+        Vector3 hi(-lo);
+
+        // Compute bounds
+        Array entry(init.size());
+        for (int i = 0; i < entry.size(); ++i) {
+            const Value& value = init[i];
+            Vector3 pos        = m_posFunc(value);
+
+            entry[i].value     = value;
+            entry[i].hashCode  = m_hashFunc(value);
+            entry[i].position  = pos;
+
+            lo = lo.min(pos);
+            hi = hi.max(pos);
+        }
+
+        m_bounds = AABox(lo, hi);
+
+        if (radiusHint <= 0) {
+            // Compute a good cell width based on the bounds.
+            //
+            //   N        numPerCell
+            // -----   =  ---------
+            // volume        r^3
+
+            float numPerCell = 5;
+            radiusHint = 
+                (float)pow(numPerCell * m_bounds.volume() / init.size(), 1.0 / 3.0);
+
+            if (radiusHint == 0) {
+                // Volume must have been zero because all points were colocated.
+                radiusHint = 0.1f;
+            }
+        }
+
+        insert(init);
+    }
+
+    /** Returns the number of elements. */
+    inline int size() const {
+        return m_size;
+    }
+
+    /** Returns a conservative bounding box around the contents. This is 
+        conservative because it is not updated when elements are removed. */
+    const AABox& conservativeBoxBounds() const {
+        return m_bounds;
+    }
+
+    /** Insert @a v at position @a p given by getPosition(v, p).  
+        Multiple elements that are equal may be inserted; all copies will be
+        in the data structure. */
+    void insert(const Value& v) {
+        Vector3 pos;
+        PosFunc::getPosition(v, pos);
+        Vector3int32 cellCoord;
+        getCellCoord(pos, cellCoord);
+
+        // See if the cell already exists
+        Cell& cell = m_data.getCreate(cellCoord);
+
+        if (cell.size() == 0) {
+            // Use the same memory manager as for the whole class
+            cell.clearAndSetMemoryManager(m_memoryManager);
+        }
+
+        Entry& entry    = cell.next();
+        entry.value     = v;
+        entry.position  = pos;
+
+        // Update the bounds
+        if (size() == 0) {
+            m_bounds = AABox(pos);
+        } else {
+            m_bounds.merge(pos);
+        }
+
+        ++m_size;
+        ++m_epoch;
+    }
+
+
+    /** Inserts all elements of the array. */
+    void insert(const Array& v) {
+        for (int i = 0; i < v.size(); ++i) {
+            insert(v[i]);
+        }
+    }
+
+
+    /** If there are multiple copies of an element, you must
+        delete them multiple times.
+
+        @param shrinkIfNecessary If true, deallocate underlying data 
+        structures as they are emptied.  False increases performace at 
+        the cost of memory overhead for dynamic structures.
+        
+        @return true if the element was found.
+    */
+    bool remove(const Value& v, bool shrinkIfNecessary = true) {
+        Cell* cell = NULL;
+        int   index = 0;
+        Vector3int32 cellCoord;
+
+        if (find(v, cellCoord, cell, index)) {
+            cell->fastRemove(index, shrinkIfNecessary);
+            --m_size;
+            ++m_epoch;
+
+            if ((cell->size() == 0) && shrinkIfNecessary) {
+                // Remove the cell itself
+
+                // Drop our pointer, which is about to dangle
+                cell = NULL;
+                bool success = m_data.remove(cellCoord);
+                debugAssertM(success, "Data structure corrupt: "
+                             "tried to remove a cell that doesn't exist.");
+            }
+
+            return true;
+
+        } else {
+            return false;
+        }
+    }
+
+    /** Removes all elements of @v. */
+    void remove(const Array& v, bool shrink = true) {
+        for (int i = 0; i < v.size(); ++i) {
+            remove(v[i], shrink);
+        }
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    ///////////////////////////////////////////////////////////////////////////
+
+    class Iterator {
+    private:
+        friend class ThisType;
+
+        bool                                    m_isEnd;
+
+        const ThisType*                         m_grid;
+        
+        typename CellTable::Iterator            m_tableIterator;
+
+        /** Index within m_tableIterator->value of the current value. */
+        int                                     m_arrayIndex;
+
+        const int                               m_epoch;
+
+        /** End iterator. Note that the m_tableIterator is initialized to the end iterator
+            of a temporary value!  This is ok because we'll never look at the value of the 
+            m_tableIterator, since we're initializing the "end" Iterator.*/
+        Iterator() : m_isEnd(true), m_grid(NULL), m_tableIterator(CellTable().end()), 
+                     m_arrayIndex(0), m_epoch(0) {}
+
+        Iterator(const ThisType* grid) : 
+            m_isEnd(false),
+            m_grid(grid),
+            m_tableIterator( grid->m_data.begin() ),
+            m_arrayIndex(0),
+            m_epoch(grid->m_epoch) { }
+
+    private:
+
+        const Value& value() const {
+            debugAssert(! m_isEnd);
+            debugAssertM(m_tableIterator->value.size() > m_arrayIndex, 
+                         "No more elements");
+            return m_tableIterator->value[m_arrayIndex].value;
+        }
+
+    public:
+
+        inline bool operator!=(const Iterator& other) const {
+            if (other.m_isEnd && m_isEnd) {
+                return false;
+            } else {
+                return (m_isEnd         != other.m_isEnd) ||
+                    (m_tableIterator != other.m_tableIterator) || 
+                    (m_arrayIndex    != other.m_arrayIndex);
+            }
+        }
+
+        bool operator==(const Iterator& other) const {
+            return !(*this != other);
+        }
+
+        /** Preincrement */
+        Iterator& operator++() {
+            debugAssert(! m_isEnd);
+            debugAssertM(m_epoch == m_grid->m_epoch, 
+                         "It is illegal to mutate the HashGrid "
+                         "while iterating through it.");
+
+            ++m_arrayIndex;
+
+            if (m_arrayIndex >= m_tableIterator->value.size()) {
+                // Move on to the next cell
+                ++m_tableIterator;
+                m_arrayIndex = 0;
+
+                // Check to see if we're at the end
+                m_isEnd = (m_tableIterator == m_grid->m_data.end());
+            }
+
+            return *this;
+        }
+
+        /** Post increment (slower) */
+        Iterator operator++(int) {
+            debugAssert(! m_isEnd);
+            Iterator old = *this;
+            ++(*this);
+            return old;
+        }
+
+        const Value& operator*()  const { return  value(); }
+        const Value* operator->() const { return &value(); }
+        operator Value*()         const { return &value(); }
+    }; // Iterator
+
+
+    /** Iterate through all members.  It is an error to mutate the HashGrid 
+        while iterating through it. Each member can be accessed by "dereferencing"
+        the iterator:
+        
+        
+        for (Grid::Iterator i = grid.begin(); i != grid.end(), ++i) {
+        const Value& = *i;
+        ...
+        }
+        

+    */
+    Iterator begin() const {
+        return Iterator(this);
+    }
+
+    const Iterator& end() const {
+        static const Iterator it;
+        return it;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    ///////////////////////////////////////////////////////////////////////////
+
+    // Forward declaration required by older gcc versions for friend declaration in BoxIterator
+    class SphereIterator;
+    class BoxIterator {
+    private:
+        friend class ThisType;
+        friend class SphereIterator;
+
+        bool                                    m_isEnd;
+
+        const ThisType*                         m_grid;
+
+        /** Lower bound on the boxes covered, inclusive. */
+        Vector3int32                            m_lo;
+
+        /** Upper bound on the boxes covered, inclusive.*/
+        Vector3int32                            m_hi;
+        
+        /** If true, test values against m_box before returning them.*/
+        bool                                    m_exact;
+
+        /** The underlying box in 3D space */
+        AABox                                   m_box;
+
+        /** The iterator winds through the 3D grid between m_lo and (m_lo + m_extent) in
+            Z,Y,X-major order.  This is the index keeping track of how
+            far it has come */
+        Vector3int32                            m_current;
+        
+        /** The current cell. */
+        Cell*                                   m_cell;
+
+        /** Index within m_cell of the current value */
+        int                                     m_arrayIndex;
+
+        const int                               m_epoch;
+      
+
+        /** Called from advance() */
+        void advanceCell() {
+            do {
+                ++m_current.x;
+                if (m_current.x > m_hi.x) {
+                    m_current.x = m_lo.x;
+                    ++m_current.y;
+                    if (m_current.y > m_hi.y) {
+                        m_current.y = m_lo.y;
+                        ++m_current.z;
+                        if (m_current.z > m_hi.z) {
+                            m_isEnd = true;
+                            return;
+                        }
+                    }
+                }
+
+                // Pick up the new cell
+                m_cell = m_grid->m_data.getPointer(m_current);
+                // Keep advancing if the cell does not exist
+            } while ((m_cell == NULL) || (m_cell->size() == 0));
+        }
+
+        /** Advance to the next value */
+        void advance() {
+            debugAssert(! m_isEnd);
+
+            do {
+                ++m_arrayIndex;
+                bool inConstructor = (m_cell == NULL);
+                if (inConstructor || m_arrayIndex >= m_cell->size()) {
+                    advanceCell();
+                    m_arrayIndex = 0;
+
+                    if (m_isEnd) {
+                        // Ran out of values
+                        return;
+                    }
+                    debugAssert(m_cell != NULL);
+                }
+
+                // Advance until we have a value that can be returned, either
+                // because we don't care about exactness or because it is 
+                // guaranteed to be within the box.
+            } while (m_exact && ! m_box.contains(position()));
+        }
+
+
+        /** End iterator */
+        BoxIterator() : m_isEnd(true), m_grid(NULL), m_exact(true), m_current(0,0,0), m_cell(NULL), m_arrayIndex(0), m_epoch(0) {}
+
+        /** Begin iterator */
+        BoxIterator(const ThisType* grid, bool exact, const AABox& box) : 
+            m_isEnd(false),
+            m_grid(grid),
+            m_exact(exact),
+            m_box(box),
+            m_current(-1, 0 ,0),
+            m_cell(NULL),
+            m_arrayIndex(0),
+            m_epoch(grid->m_epoch) { 
+
+            m_grid->getCellCoord(box.low(), m_lo);
+            m_grid->getCellCoord(box.high(), m_hi);
+            
+            // Get to the first value
+            m_current = m_lo;
+            // Back up one so that advancing takes us to the first
+            --m_current.x;
+            advance();
+        }
+
+        const Value& value() const {
+            debugAssert(! m_isEnd);
+            return (*m_cell)[m_arrayIndex].value;
+        }
+
+        /** Used by SphereIterator::advance() */
+        const Vector3& position() const {
+            debugAssert(! m_isEnd);
+            return (*m_cell)[m_arrayIndex].position;
+        }
+
+        // Intentionally unimplemented
+        BoxIterator& operator=(const BoxIterator&);
+
+    public:
+
+        inline bool operator!=(const BoxIterator& other) const {
+            if (other.m_isEnd && m_isEnd) {
+                return false;
+            } else {
+                return (m_isEnd         != other.m_isEnd) ||
+                    (m_cell          != other.m_cell) || 
+                    (m_arrayIndex    != other.m_arrayIndex);
+            }
+        }
+
+        bool operator==(const BoxIterator& other) const {
+            return !(*this != other);
+        }
+
+        /** Preincrement */
+        BoxIterator& operator++() {
+            debugAssert(! m_isEnd);
+            debugAssertM(m_epoch == m_grid->m_epoch, 
+                         "It is illegal to mutate the HashGrid "
+                         "while iterating through it.");
+
+            advance();
+
+            return *this;
+        }
+
+        /** Post increment (slower) */
+        BoxIterator operator++(int) {
+            Iterator old = *this;
+            ++(*this);
+            return old;
+        }
+
+        const Value& operator*()  const { return  value(); }
+        const Value* operator->() const { return &value(); }
+        operator Value*()         const { return &value(); }
+
+        bool hasMore() const {
+            return ! m_isEnd;
+        }
+    }; // BoxIterator
+
+    /** 
+        Finds all values whose positions are within @a box.  It is an error to 
+        mutate the PointHashGrid while iterating through it.
+
+        @param exact If false, the iterator will execute more quickly but will likely return some
+        values that lie outside the box. Set exact = false if you are going to test the 
+        results against the yourself box anyway.
+    */
+    BoxIterator beginBoxIntersection(const AABox& box, bool exact = true) const {
+        return BoxIterator(this, exact, box);
+    }
+
+    const BoxIterator& endBoxIntersection() const {
+        static const BoxIterator it;
+        return it;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    ///////////////////////////////////////////////////////////////////////////
+    
+    class SphereIterator {
+    private:
+
+        friend class ThisType;
+
+        bool                m_isEnd;
+        Sphere              m_sphere;
+        BoxIterator         m_boxIterator;
+
+        SphereIterator() : m_isEnd(true) {}
+
+        void advance() {
+            if (! m_boxIterator.hasMore()) {
+                m_isEnd = true;
+                return;
+            }
+
+            while (! m_sphere.contains(m_boxIterator.position())) {
+                ++m_boxIterator;
+                
+                if (! m_boxIterator.hasMore()) {
+                    m_isEnd = true;
+                    return;
+                }
+            } 
+        }
+
+        static AABox getBoundingBox(const Sphere& s) {
+            AABox box;
+            s.getBounds(box);
+            return box;
+        }
+
+        SphereIterator(const ThisType* grid, const Sphere& sphere) : 
+            m_isEnd(false),
+            m_sphere(sphere),
+            m_boxIterator(grid, false, getBoundingBox(sphere)) {
+			
+            // Find the first element that is actually in the sphere,
+            // not just the box.
+            advance();
+        }
+
+        const Value& value() const {			
+            return *m_boxIterator;
+        }
+
+        // TODO: if the sphere is very big compared to radius, check each
+        // cell's box to see if the cell itself is actually inside the sphere
+        // before iterating through it, since there may be many boxes outside the sphere.
+
+        // Intentionally unimplemented
+        SphereIterator& operator=(const SphereIterator&);
+    public:
+
+        inline bool operator!=(const SphereIterator& other) const {
+            if (other.m_isEnd && m_isEnd) {
+                return false;
+            } else {
+                return 
+                    (m_isEnd         != other.m_isEnd) ||
+                    (m_sphere        != other.m_sphere) ||
+                    (m_boxIterator   != other.m_boxIterator);
+            }
+        }
+
+        bool operator==(const SphereIterator& other) const {
+            return !(*this != other);
+        }
+
+	
+
+        /** Preincrement */
+        SphereIterator& operator++() {
+            debugAssert(! m_isEnd);
+
+            ++m_boxIterator;
+            advance();
+
+            return *this;
+        }
+
+        /** Post increment (slower) */
+        SphereIterator operator++(int) {
+            Iterator old = *this;
+            ++(*this);
+            return old;
+        }
+
+        const Value& operator*()  const { return  value(); }
+        const Value* operator->() const { return &value(); }
+        operator Value*()         const { return &value(); }
+
+        bool hasMore() const {
+            return ! m_isEnd;
+        }
+    }; // SphereIterator
+
+    /** 
+        Finds all values whose positions are within @a sphere.  It is an error
+        to mutate the HashGrid while iterating through it.
+    */
+    SphereIterator beginSphereIntersection(const Sphere& sphere) const {
+        return SphereIterator(this, sphere);
+    }
+
+    const SphereIterator& endSphereIntersection() const {
+        static const SphereIterator it;
+        return it;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    ///////////////////////////////////////////////////////////////////////////
+
+    /**
+       Dereference to access the bounds() and size() [element count] of the underlying
+       cell objet.
+
+       Example:
+       
+       for(PointHashGrid::CellIterator iter = grid.beginCells(); iter != grid.endCells(); ++iter) {	
+       entriesFound += iter->size();
+       }
+       

+    */
+    class CellIterator {
+    private:
+        friend class ThisType;
+
+        bool                                    m_isEnd;
+        const ThisType*                         m_grid;
+        typename CellTable::Iterator            m_tableIterator;
+        const int                               m_epoch;
+
+
+        Cell& cell() {
+            return m_tableIterator->value;
+        }
+
+    public:
+        
+        class CellObject {
+            friend class CellIterator;
+        private:
+            const CellIterator* m_parent;
+
+            CellObject() : m_parent(NULL) {}
+
+        public:
+
+            /** Returns the bounds on this cell */
+            AABox bounds() const {
+                const Vector3int32& k = m_parent->m_tableIterator->key;
+                return AABox(Vector3(k) * m_parent->m_cellWidth, 
+                             Vector3(k + Vector3int32(1, 1, 1)) * m_parent->m_cellWidth);
+            }
+
+            /** Number of elements inside this cell */
+            int size() const {
+                debugAssert(! m_parent->m_isEnd);
+                return m_parent->m_tableIterator->value.size();
+            }
+        };
+
+    private:
+        /** Used to make the indirection work.*/
+        CellObject m_indirection;
+
+        /** End iterator. Note that the m_tableIterator is initialized to the end iterator
+            of a temporary value!  This is ok because we'll never look at the value of the 
+            m_tableIterator, since we're initializing the "end" Iterator.*/
+        CellIterator() : 
+            m_isEnd(true),
+            m_grid(NULL),
+            m_tableIterator( CellTable().end() ),
+            m_epoch(0) {}
+        
+        CellIterator(const ThisType* grid) : 
+            m_isEnd(false),
+            m_grid(grid),
+            m_tableIterator( grid->m_data.begin()),
+            m_epoch(grid->m_epoch) {
+            m_indirection.m_parent = this;
+            m_isEnd = ! m_tableIterator.hasMore();
+        }
+        
+        // Intentionally unimplemented
+        CellIterator& operator=(const CellIterator&);
+
+    public:
+
+        const CellObject& operator*()  const { return  m_indirection; }
+        const CellObject* operator->() const { return &m_indirection; }
+        operator CellObject*()         const { return &m_indirection; }
+
+        inline bool operator!=(const CellIterator& other) const {
+            // != is called more often than == during iteration
+            return !(
+                     (m_isEnd && other.m_isEnd) ||
+                     ((m_isEnd == other.m_isEnd) && 
+                      (m_tableIterator != other.m_tableIterator)));
+        }
+
+        bool operator==(const CellIterator& other) const {
+            return !(*this != other);
+        }
+
+        /** Preincrement */
+        CellIterator& operator++() {
+            debugAssertM(m_epoch == m_grid->m_epoch, 
+                         "It is illegal to mutate the HashGrid while "
+                         "iterating through it.");
+            ++m_tableIterator;
+            m_isEnd = ! m_tableIterator.hasMore();
+            return *this;
+        }
+
+        /** Post increment (slower) */
+        CellIterator operator++(int) {
+            Iterator old = *this;
+            ++(*this);
+            return old;
+        }
+
+        bool hasMore() const {
+            return ! m_isEnd;
+        }
+    }; // CellIterator
+
+    /** Iterates through the non-empty cells.  This is intended primarily for
+        debugging and visualizing the data structure.*/
+    CellIterator beginCells() const {
+        return CellIterator(this);
+    }
+
+    const CellIterator& endCells() const {
+        static const CellIterator it;
+        return it;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    ///////////////////////////////////////////////////////////////////////////
+
+    /** Returns true if there is a value that is exactly equal to @a v. This will 
+        check all neighboring cells to avoid roundoff error at cell boundaries. 
+    */
+    bool contains(const Value& v) const {
+        Cell* cell = NULL;
+        int   index = 0;
+        Vector3int32 cellCoord;
+        return const_cast(this)->find(v, cellCoord, cell, index);
+    }
+
+    /** Calls delete on all of the values, which are assumed to be pointers. 
+        This is a helper to avoid requiring you to iterate through the data 
+        structure, removing and deleting each one. Clears the PointHashGrid at the
+        end.
+		
+        Using objects (instead of pointers) or reference counted pointers is 
+        recommended over using pointers and this deleteAll method.*/
+    void deleteAll() {
+        for (Iterator it = begin(); it.hasMore(); ++it) {
+            delete *it;
+        }
+        clear();
+    }
+
+    void clearAndSetMemoryManager(const MemoryManager::Ref& m) {
+        ++m_epoch;
+        m_size = 0;
+        m_bounds = AABox();
+
+        m_data.clearAndSetMemoryManager(m);
+        m_memoryManager = m;
+    }
+
+    /** Removes all data. 
+        @param shrink If true, underlying structures are deallocated as
+        they are freed.*/
+    void clear(bool shrink = true) {
+        m_size = 0;
+        m_bounds = AABox();
+        if (! shrink) {
+            // Remove all data
+            for (CellIterator it = beginCells(); it.hasMore(); ++it) {
+                it.cell().clear(true);
+            }
+        } else {
+            m_data.clear();
+        }
+        ++m_epoch;
+    }
+
+    int debugGetDeepestBucketSize() const {
+        return m_data.debugGetDeepestBucketSize();
+    }
+
+    float debugGetAverageBucketSize() const {
+        return m_data.debugGetAverageBucketSize();
+    }
+#undef ThisType 
+};
+
+} // G3D
+#endif
diff --git a/externals/g3dlite/G3D/PointKDTree.h b/externals/g3dlite/G3D/PointKDTree.h
new file mode 100644
index 00000000000..151cbd5f2f3
--- /dev/null
+++ b/externals/g3dlite/G3D/PointKDTree.h
@@ -0,0 +1,1185 @@
+/**
+  @file PointKDTree.h
+  
+  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+ 
+  @created 2004-01-11
+  @edited  2008-11-02
+
+  Copyright 2000-2009, Morgan McGuire.
+  All rights reserved.
+  
+  */
+
+#ifndef X_PointKDTree_H
+#define X_PointKDTree_H
+
+#include "G3D/platform.h"
+#include "G3D/Array.h"
+#include "G3D/Table.h"
+#include "G3D/Vector2.h"
+#include "G3D/Vector3.h"
+#include "G3D/Vector4.h"
+#include "G3D/AABox.h"
+#include "G3D/Sphere.h"
+#include "G3D/Box.h"
+#include "G3D/BinaryInput.h"
+#include "G3D/BinaryOutput.h"
+#include "G3D/CollisionDetection.h"
+#include "G3D/GCamera.h"
+#include "G3D/PositionTrait.h"
+#include 
+
+namespace G3D {
+
+/**
+ A set data structure that supports spatial queries using an axis-aligned
+ BSP tree for speed.
+
+ PointKDTree allows you to quickly find points in 3D that lie within
+ a box or sphere. For large sets of objects it is much faster
+ than testing each object for a collision.  See also G3D::KDTree; this class
+ is optimized for point sets, e.g.,for use in photon mapping and mesh processing.
+
+ Template Parameters
+
+ 

+
+ 
The template parameter T must be one for which
+ the following functions are overloaded:
+
+  
+      T::T(); (public constructor of no arguments)
+
+       template<> struct PositionTrait {
+         static void getPosition(const T& v, G3D::Vector3& p);};
+
+       template <> struct HashTrait {
+         static size_t hashCode(const T& key);};
+
+       template<> struct EqualsTrait {
+           static bool equals(const T& a, const T& b); };
+    

+
+ 

+
+ G3D provides these for the Vector2, Vector3, and Vector4 classes.
+ If you use a custom class, or a pointer to a custom class, you will need
+ to define those functions.
+
+ Moving %Set Members
+ 
It is important that objects do not move without updating the
+ PointKDTree.  If the position of an object is about
+ to change, PointKDTree::remove it before they change and 
+ PointKDTree::insert it again afterward.  For objects
+ where the hashCode and == operator are invariant with respect 
+ to the 3D position,
+ you can use the PointKDTree::update method as a shortcut to
+ insert/remove an object in one step after it has moved.
+ 
+
+ Note: Do not mutate any value once it has been inserted into PointKDTree. Values
+ are copied interally. All PointKDTree iterators convert to pointers to constant
+ values to reinforce this.
+
+ If you want to mutate the objects you intend to store in a PointKDTree
+ simply insert pointers to your objects instead of the objects
+ themselves, and ensure that the above operations are defined. (And
+ actually, because values are copied, if your values are large you may
+ want to insert pointers anyway, to save space and make the balance
+ operation faster.)
+
+ Dimensions
+ Although designed as a 3D-data structure, you can use the PointKDTree
+ for data distributed along 2 or 1 axes by simply returning bounds
+ that are always zero along one or more dimensions.
+
+*/
+template, 
+         class HashFunc     = HashTrait, 
+         class EqualsFunc   = EqualsTrait > 
+class PointKDTree {
+protected:
+#define TreeType PointKDTree
+
+    // Unlike the KDTree, the PointKDTree assumes that T elements are
+    // small and keeps the handle and cached position together instead of
+    // placing them in separate bounds arrays.  Also note that a copy of T
+    // is kept in the member table and that there is no indirection.
+    class Handle {
+    private:
+        Vector3             m_position;
+
+    public:
+        T                   value;
+
+        inline Handle() {}
+        inline Handle(const T& v) : value(v) {
+            PositionFunc::getPosition(v, m_position);
+        }
+
+        /** Used by makeNode to create fake handles for partitioning. */
+        void setPosition(const Vector3& v) {
+            m_position = v;
+        }
+
+        inline const Vector3& position() const {
+            return m_position;
+        }
+    };
+
+    /** Returns the bounds of the sub array. Used by makeNode. */
+    static AABox computeBounds(
+        const Array&  point) {
+    
+        if (point.size() == 0) {
+            return AABox(Vector3::inf(), Vector3::inf());
+        }
+
+        AABox bounds(point[0].position());
+
+        for (int p = 0; p < point.size(); ++p) {
+            bounds.merge(point[p].position());
+        }
+
+        return bounds;
+    }
+
+    class Node {
+    public:
+
+        /** Spatial bounds on all values at this node and its children, based purely on
+            the parent's splitting planes.  May be infinite */
+        AABox               splitBounds;
+
+        Vector3::Axis       splitAxis;
+
+        /** Location along the specified axis */
+        float               splitLocation;
+ 
+        /** child[0] contains all values strictly 
+            smaller than splitLocation along splitAxis.
+
+            child[1] contains all values strictly
+            larger.
+
+            Both may be NULL if there are not enough
+            values to bother recursing.
+        */
+        Node*               child[2];
+
+        /** Values if  this is a leaf node). */
+        Array       valueArray;
+
+        /** Creates node with NULL children */
+        Node() {
+            splitAxis     = Vector3::X_AXIS;
+            splitLocation = 0;
+            splitBounds   = AABox(-Vector3::inf(), Vector3::inf());
+            for (int i = 0; i < 2; ++i) {
+                child[i] = NULL;
+            }
+        }
+
+        /**
+         Doesn't clone children.
+         */
+        Node(const Node& other) : valueArray(other.valueArray) {
+            splitAxis       = other.splitAxis;
+            splitLocation   = other.splitLocation;
+            splitBounds     = other.splitBounds;            
+            for (int i = 0; i < 2; ++i) {
+                child[i] = NULL;
+            }
+        }
+
+        /** Copies the specified subarray of pt into point, NULLs the children.
+            Assumes a second pass will set splitBounds. */
+        Node(const Array& pt) {
+            splitAxis     = Vector3::X_AXIS;
+            splitLocation = 0;
+            for (int i = 0; i < 2; ++i) {
+                child[i] = NULL;
+            }
+            valueArray = pt;
+        }
+
+
+        /** Deletes the children (but not the values) */
+        ~Node() {
+            for (int i = 0; i < 2; ++i) {
+                delete child[i];
+            }
+        }
+
+
+        /** Returns true if this node is a leaf (no children) */
+        inline bool isLeaf() const {
+            return (child[0] == NULL) && (child[1] == NULL);
+        }
+
+
+        /**
+         Recursively appends all handles and children's handles
+         to the array.
+         */
+        void getHandles(Array& handleArray) const {
+            handleArray.append(valueArray);
+            for (int i = 0; i < 2; ++i) {
+                if (child[i] != NULL) {
+                    child[i]->getHandles(handleArray);
+                }
+            }
+        }
+
+
+	    void verifyNode(const Vector3& lo, const Vector3& hi) {
+            //		debugPrintf("Verifying: split %d @ %f [%f, %f, %f], [%f, %f, %f]\n",
+            //			    splitAxis, splitLocation, lo.x, lo.y, lo.z, hi.x, hi.y, hi.z);
+
+            debugAssert(lo == splitBounds.low());
+            debugAssert(hi == splitBounds.high());
+
+		    for (int i = 0; i < valueArray.length(); ++i) {
+			    const Vector3& b = valueArray[i].position();
+                debugAssert(splitBounds.contains(b));
+		    }
+
+		    if (child[0] || child[1]) {
+			    debugAssert(lo[splitAxis] < splitLocation);
+			    debugAssert(hi[splitAxis] > splitLocation);
+		    }
+
+		    Vector3 newLo = lo;
+		    newLo[splitAxis] = splitLocation;
+		    Vector3 newHi = hi;
+		    newHi[splitAxis] = splitLocation;
+
+		    if (child[0] != NULL) {
+			    child[0]->verifyNode(lo, newHi);
+		    }
+
+		    if (child[1] != NULL) {
+			    child[1]->verifyNode(newLo, hi);
+		    }
+	    }
+
+
+        /**
+          Stores the locations of the splitting planes (the structure but not the content)
+          so that the tree can be quickly rebuilt from a previous configuration without 
+          calling balance.
+         */
+        static void serializeStructure(const Node* n, BinaryOutput& bo) {
+            if (n == NULL) {
+                bo.writeUInt8(0);
+            } else {
+                bo.writeUInt8(1);
+                n->splitBounds.serialize(bo);
+                serialize(n->splitAxis, bo);
+                bo.writeFloat32(n->splitLocation);
+                for (int c = 0; c < 2; ++c) {
+                    serializeStructure(n->child[c], bo);
+                }
+            }
+        }
+
+        /** Clears the member table */
+        static Node* deserializeStructure(BinaryInput& bi) {
+            if (bi.readUInt8() == 0) {
+                return NULL;
+            } else {
+                Node* n = new Node();
+                n->splitBounds.deserialize(bi);
+                deserialize(n->splitAxis, bi);
+                n->splitLocation = bi.readFloat32();
+                for (int c = 0; c < 2; ++c) {
+                    n->child[c] = deserializeStructure(bi);
+                }
+            }
+        }
+
+        /** Returns the deepest node that completely contains bounds. */
+        Node* findDeepestContainingNode(const Vector3& point) {
+
+            // See which side of the splitting plane the bounds are on
+            if (point[splitAxis] < splitLocation) {
+                // Point is on the low side.  Recurse into the child
+                // if it exists.
+                if (child[0] != NULL) {
+                    return child[0]->findDeepestContainingNode(point);
+                }
+            } else if (point[splitAxis] > splitLocation) {
+                // Point is on the high side, recurse into the child
+                // if it exists.
+                if (child[1] != NULL) {
+                    return child[1]->findDeepestContainingNode(point);
+                }
+            }
+
+            // There was no containing child, so this node is the
+            // deepest containing node.
+            return this;
+        }
+
+        /** Appends all members that intersect the box. 
+            If useSphere is true, members are tested against the sphere instead. */
+        void getIntersectingMembers(
+            const AABox&        sphereBounds,
+            const Sphere&       sphere,
+            Array&           members) const {
+
+            // Test all values at this node.  Extract the
+            // underlying C array for speed
+            const int N = valueArray.size();
+            const Handle* handleArray = valueArray.getCArray();
+            
+            const float r2 = square(sphere.radius);
+
+            // Copy the sphere center so that it is on the stack near the radius
+            const Vector3 center = sphere.center; 
+            for (int v = 0; v < N; ++v) {
+                if ((center - handleArray[v].position()).squaredLength() <= r2) {
+                    members.append(handleArray[v].value);
+                }
+            }
+
+            // If the left child overlaps the box, recurse into it
+            if (child[0] && (sphereBounds.low()[splitAxis] < splitLocation)) {
+                child[0]->getIntersectingMembers(sphereBounds, sphere, members);
+            }
+
+            // If the right child overlaps the box, recurse into it
+            if (child[1] && (sphereBounds.high()[splitAxis] > splitLocation)) {
+                child[1]->getIntersectingMembers(sphereBounds, sphere, members);
+            }
+        }
+
+        /** Appends all members that intersect the box. 
+            If useSphere is true, members are tested against the sphere instead. 
+            
+            Implemented using both box and sphere tests to simplify the implementation
+            of a future beginSphereInteresection iterator using the same underlying
+            BoxIterator class.           
+            */
+        void getIntersectingMembers(
+            const AABox&        box, 
+            const Sphere&       sphere,
+            Array&           members,
+            bool                useSphere) const {
+
+            // Test all values at this node
+            for (int v = 0; v < valueArray.size(); ++v) {
+                if ((useSphere && sphere.contains(valueArray[v].position())) ||
+                    (! useSphere && box.contains(valueArray[v].position()))) {
+                    members.append(valueArray[v].value);
+                }
+            }
+
+            // If the left child overlaps the box, recurse into it
+            if ((child[0] != NULL) && (box.low()[splitAxis] < splitLocation)) {
+                child[0]->getIntersectingMembers(box, sphere, members, useSphere);
+            }
+
+            // If the right child overlaps the box, recurse into it
+            if ((child[1] != NULL) && (box.high()[splitAxis] > splitLocation)) {
+                child[1]->getIntersectingMembers(box, sphere, members, useSphere);
+            }
+        }
+
+        /**
+         Recurse through the tree, assigning splitBounds fields.
+         */
+        void assignSplitBounds(const AABox& myBounds) {
+            splitBounds = myBounds;
+
+#           ifdef G3D_DEBUG
+                if (child[0] || child[1]) {
+                    debugAssert(splitBounds.high()[splitAxis] > splitLocation);
+                    debugAssert(splitBounds.low()[splitAxis] < splitLocation);
+                }
+#           endif
+
+            AABox childBounds[2];
+            myBounds.split(splitAxis, splitLocation, childBounds[0], childBounds[1]);
+
+            for (int c = 0; c < 2; ++c) {
+                if (child[c]) {
+                    child[c]->assignSplitBounds(childBounds[c]);
+                }
+            }
+        }
+    };
+
+    class AxisComparator {
+    private:
+        Vector3::Axis sortAxis;
+
+    public:
+
+        AxisComparator(Vector3::Axis s) : sortAxis(s) {}
+
+        inline int operator()(const Handle& A, const Handle& B) const {
+            if (A.position()[sortAxis] > B.position()[sortAxis]) {
+                return -1;
+            } else if (A.position()[sortAxis] < B.position()[sortAxis]) {
+                return 1;
+            } else {
+                return 0;
+            }
+        }
+    };
+
+    /**
+     Recursively subdivides the subarray.
+
+     The source array will be cleared after it is used
+
+     Call assignSplitBounds() on the root node after making a tree.
+     */
+    Node* makeNode(
+        Array& source, 
+        Array& temp,
+        int valuesPerNode, 
+        int numMeanSplits)  {
+
+        Node* node = NULL;
+        
+        if (source.size() <= valuesPerNode) {
+            // Make a new leaf node
+            node = new Node(source);
+            
+            // Set the pointers in the memberTable
+            for (int i = 0; i < source.size(); ++i) {
+                memberTable.set(source[i].value, node);
+            }
+            
+        } else {
+            // Make a new internal node
+            node = new Node();
+            
+            const AABox bounds = computeBounds(source);
+            const Vector3 extent = bounds.high() - bounds.low();
+            
+            Vector3::Axis splitAxis = extent.primaryAxis();
+            
+            float splitLocation;
+            
+            Array lt, gt;
+
+            if (numMeanSplits <= 0) {
+                source.medianPartition(lt, node->valueArray, gt, temp, AxisComparator(splitAxis));
+                splitLocation = node->valueArray[0].position()[splitAxis];
+                
+                if ((node->valueArray.size() > source.size() / 2) &&
+                    (source.size() > 10)) {
+                    // Our median split put an awful lot of points on the splitting plane.  Try a mean
+                    // split instead
+                    numMeanSplits = 1;
+                }
+            }
+
+            if (numMeanSplits > 0) {
+                // Compute the mean along the axis
+
+                splitLocation = (bounds.high()[splitAxis] + 
+                                 bounds.low()[splitAxis]) / 2.0;
+
+                Handle splitHandle;
+                Vector3 v;
+                v[splitAxis] = splitLocation;
+                splitHandle.setPosition(v);
+
+                source.partition(splitHandle, lt, node->valueArray, gt, AxisComparator(splitAxis));
+            }
+
+#           if defined(G3D_DEBUG) && defined(VERIFY_TREE)
+                for (int i = 0; i < lt.size(); ++i) {
+                    const Vector3& v = lt[i].position(); 
+                    debugAssert(v[splitAxis] < splitLocation);
+                }
+                for (int i = 0; i < gt.size(); ++i) {
+                    debugAssert(gt[i].position()[splitAxis] > splitLocation);
+                }
+                for (int i = 0; i < node->valueArray.size(); ++i) {
+                    debugAssert(node->valueArray[i].position()[splitAxis] == splitLocation);
+                }
+#           endif
+
+            node->splitAxis = splitAxis;
+            node->splitLocation = splitLocation;
+
+            // Throw away the source array to save memory
+            source.fastClear();
+        
+            if (lt.size() > 0) {
+                node->child[0] = makeNode(lt, temp, valuesPerNode, numMeanSplits - 1);
+            }
+
+            if (gt.size() > 0) {
+                node->child[1] = makeNode(gt, temp, valuesPerNode, numMeanSplits - 1);
+            }
+
+            // Add the values stored at this interior node to the member table
+            for(int i = 0; i < node->valueArray.size(); ++i) {
+                memberTable.set(node->valueArray[i].value, node);
+            }
+		    
+	    }
+	    
+	    return node;
+    }
+
+    /**
+     Recursively clone the passed in node tree, setting
+     pointers for members in the memberTable as appropriate.
+     called by the assignment operator.
+     */
+    Node* cloneTree(Node* src) {
+        Node* dst = new Node(*src);
+
+        // Make back pointers
+        for (int i = 0; i < dst->valueArray.size(); ++i) {
+            memberTable.set(dst->valueArray[i].value, dst);
+        }
+
+        // Clone children
+        for (int i = 0; i < 2; ++i) {
+            if (src->child[i] != NULL) {
+                dst->child[i] = cloneTree(src->child[i]);
+            }
+        }
+
+        return dst;
+    }
+
+    /** Maps members to the node containing them */
+    typedef Table MemberTable;
+    MemberTable             memberTable;
+
+    Node*                   root;
+
+public:
+
+    /** To construct a balanced tree, insert the elements and then call
+      PointKDTree::balance(). */
+    PointKDTree() : root(NULL) {}
+
+
+    PointKDTree(const PointKDTree& src) : root(NULL) {
+        *this = src;
+    }
+
+
+    PointKDTree& operator=(const PointKDTree& src) {
+        delete root;
+        // Clone tree takes care of filling out the memberTable.
+        root = cloneTree(src.root);
+        return *this;
+    }
+
+
+    ~PointKDTree() {
+        clear();
+    }
+
+    /**
+     Throws out all elements of the set and erases the structure of the tree.
+     */
+    void clear() {
+        memberTable.clear();
+        delete root;
+        root = NULL;
+    }
+
+    /** Removes all elements of the set while maintaining the structure of the tree */
+    void clearData() {
+        memberTable.clear();
+        Array stack;
+        stack.push(root);
+        while (stack.size() > 0) {
+            Node* node = stack.pop();
+            node->valueArray.fastClear();
+
+            for (int i = 0; i < 2; ++i) {
+                if (node->child[i] != NULL) {
+                    stack.push(node->child[i]);
+                }
+            }
+        }
+    }
+
+
+    int size() const {
+        return memberTable.size();
+    }
+
+    /**
+     Inserts an object into the set if it is not
+     already present.  O(log n) time.  Does not
+     cause the tree to be balanced.
+     */
+    void insert(const T& value) {
+        if (contains(value)) {
+            // Already in the set
+            return;
+        }
+
+        Handle h(value);
+
+        if (root == NULL) {
+            // This is the first node; create a root node
+            root = new Node();
+        }
+
+        Node* node = root->findDeepestContainingNode(h.position());
+
+        // Insert into the node
+        node->valueArray.append(h);
+        
+        // Insert into the node table
+        memberTable.set(value, node);
+    }
+
+    /** Inserts each elements in the array in turn.  If the tree
+        begins empty (no structure and no elements), this is faster
+        than inserting each element in turn.  You still need to balance
+        the tree at the end.*/
+    void insert(const Array& valueArray) {
+        // Pre-size the member table to avoid multiple allocations
+        memberTable.setSizeHint(valueArray.size() + size());
+
+        if (root == NULL) {
+            // Optimized case for an empty tree; don't bother
+            // searching or reallocating the root node's valueArray
+            // as we incrementally insert.
+            root = new Node();
+            root->valueArray.resize(valueArray.size());
+            for (int i = 0; i < valueArray.size(); ++i) {
+                // Insert in opposite order so that we have the exact same
+                // data structure as if we inserted each (i.e., order is reversed
+                // from array).
+                root->valueArray[valueArray.size() - i - 1] = Handle(valueArray[i]);
+                memberTable.set(valueArray[i], root);
+            }
+        } else {
+            // Insert at appropriate tree depth.
+            for (int i = 0; i < valueArray.size(); ++i) {
+                insert(valueArray[i]);
+            }
+        }
+    }
+
+
+    /**
+     Returns true if this object is in the set, otherwise
+     returns false.  O(1) time.
+     */
+    bool contains(const T& value) {
+        return memberTable.containsKey(value);
+    }
+
+
+    /**
+     Removes an object from the set in O(1) time.
+     It is an error to remove members that are not already
+     present.  May unbalance the tree.  
+     
+     Removing an element never causes a node (split plane) to be removed...
+     nodes are only changed when the tree is rebalanced.  This behavior
+     is desirable because it allows the split planes to be serialized,
+     and then deserialized into an empty tree which can be repopulated.
+    */
+    void remove(const T& value) {
+        debugAssertM(contains(value),
+            "Tried to remove an element from a "
+            "PointKDTree that was not present");
+
+        Array& list = memberTable[value]->valueArray;
+
+        // Find the element and remove it
+        for (int i = list.length() - 1; i >= 0; --i) {
+            if (list[i].value == value) {
+                list.fastRemove(i);
+                break;
+            }
+        }
+        memberTable.remove(value);
+    }
+
+
+    /**
+     If the element is in the set, it is removed.
+     The element is then inserted.
+
+     This is useful when the == and hashCode methods
+     on T are independent of the bounds.  In
+     that case, you may call update(v) to insert an
+     element for the first time and call update(v)
+     again every time it moves to keep the tree 
+     up to date.
+     */
+    void update(const T& value) {
+        if (contains(value)) {
+            remove(value);
+        }
+        insert(value);
+    }
+
+
+    /**
+     Rebalances the tree (slow).  Call when objects
+     have moved substantially from their original positions
+     (which unbalances the tree and causes the spatial
+     queries to be slow).
+     
+     @param valuesPerNode Maximum number of elements to put at
+     a node. 
+
+     @param numMeanSplits numMeanSplits = 0 gives a 
+     fully axis aligned BSP-tree, where the balance operation attempts to balance
+     the tree so that every splitting plane has an equal number of left
+     and right children (i.e. it is a median split along that axis).  
+     This tends to maximize average performance; all querries will return in the same amount of time.
+
+     You can override this behavior by
+     setting a number of mean (average) splits.  numMeanSplits = MAX_INT
+     creates a full oct-tree, which tends to optimize peak performance (some areas of the scene will terminate after few recursive splits) at the expense of
+     peak performance. 
+     */
+    void balance(int valuesPerNode = 40, int numMeanSplits = 3) {
+        if (root == NULL) {
+            // Tree is empty
+            return;
+        }
+
+        Array handleArray;
+        root->getHandles(handleArray);
+
+        // Delete the old tree
+        clear();
+
+        Array temp;
+        root = makeNode(handleArray, temp, valuesPerNode, numMeanSplits);
+        temp.fastClear();
+
+        // Walk the tree, assigning splitBounds.  We start with unbounded
+        // space.
+        root->assignSplitBounds(AABox::maxFinite());
+
+#       ifdef _DEBUG
+            root->verifyNode(Vector3::minFinite(), Vector3::maxFinite());
+#       endif
+    }
+
+private:
+
+    /**
+     Returns the elements
+
+     @param parentMask The mask that this node returned from culledBy.
+     */
+    static void getIntersectingMembers(
+        const Array&         plane,
+        Array&                   members,
+        Node*                       node,
+        uint32                      parentMask) {
+
+        int dummy;
+
+        if (parentMask == 0) {
+            // None of these planes can cull anything
+            for (int v = node->valueArray.size() - 1; v >= 0; --v) {
+                members.append(node->valueArray[v].value);
+            }
+
+            // Iterate through child nodes
+            for (int c = 0; c < 2; ++c) {
+                if (node->child[c]) {
+                    getIntersectingMembers(plane, members, node->child[c], 0);
+                }
+            }
+        } else {
+
+            if (node->valueArray.size() >  0) {
+                // This is a leaf; check the points
+                debugAssertM(node->child[0] == NULL, "Malformed Point tree");
+                debugAssertM(node->child[1] == NULL, "Malformed Point tree");
+
+                // Test values at this node against remaining planes
+                for (int p = 0; p < plane.size(); ++p) {
+                    if ((parentMask >> p) & 1 != 0) {
+                        // Test against this plane
+                        const Plane& curPlane = plane[p];
+                        for (int v = node->valueArray.size() - 1; v >= 0; --v) {
+                            if (curPlane.halfSpaceContains(node->valueArray[v].position())) {
+                                members.append(node->valueArray[v].value);
+                            }
+                        }
+                    }
+                }
+            } else {
+
+                uint32 childMask  = 0xFFFFFF;
+
+                // Iterate through child nodes
+                for (int c = 0; c < 2; ++c) {
+                    if (node->child[c] &&
+                        ! node->child[c]->splitBounds.culledBy(plane, dummy, parentMask, childMask)) {
+                        // This node was not culled
+                        getIntersectingMembers(plane, members, node->child[c], childMask);
+                    }
+                }
+            }
+        }
+    }
+
+public:
+
+    /**
+     Returns all members inside the set of planes.  
+      @param members The results are appended to this array.
+     */
+    void getIntersectingMembers(const Array& plane, Array& members) const {
+        if (root == NULL) {
+            return;
+        }
+
+        getIntersectingMembers(plane, members, root, 0xFFFFFF);
+    }
+
+    /**
+     Typically used to find all visible
+     objects inside the view frustum (see also GCamera::getClipPlanes)... i.e. all objects
+     not culled by frustum.
+
+     Example:
+      
+        Array  visible;
+        tree.getIntersectingMembers(camera.frustum(), visible);
+        // ... Draw all objects in the visible array.
+      

+      @param members The results are appended to this array.
+      */
+    void getIntersectingMembers(const GCamera::Frustum& frustum, Array& members) const {
+        Array plane;
+        
+        for (int i = 0; i < frustum.faceArray.size(); ++i) {
+            plane.append(frustum.faceArray[i].plane);
+        }
+
+        getIntersectingMembers(plane, members);
+    }
+
+    /**
+     C++ STL style iterator variable.  See beginBoxIntersection().
+     The iterator overloads the -> (dereference) operator, so this
+     acts like a pointer to the current member.
+     */
+    // This iterator turns Node::getIntersectingMembers into a
+    // coroutine.  It first translates that method from recursive to
+    // stack based, then captures the system state (analogous to a Scheme
+    // continuation) after each element is appended to the member array,
+    // and allowing the computation to be restarted.
+    class BoxIntersectionIterator {
+    private:
+        friend class TreeType;
+
+        /** True if this is the "end" iterator instance */
+        bool            isEnd;
+
+        /** The box that we're testing against. */
+        AABox           box;
+
+        /** Node that we're currently looking at.  Undefined if isEnd
+            is true. */
+        Node*           node;
+
+        /** Nodes waiting to be processed */
+        // We could use backpointers within the tree and careful
+        // state management to avoid ever storing the stack-- but
+        // it is much easier this way and only inefficient if the
+        // caller uses post increment (which they shouldn't!).
+        Array    stack;
+
+        /** The next index of current->valueArray to return. 
+            Undefined when isEnd is true.*/
+        int             nextValueArrayIndex;
+
+        BoxIntersectionIterator() : isEnd(true) {}
+        
+        BoxIntersectionIterator(const AABox& b, const Node* root) : 
+           isEnd(root == NULL), box(b), 
+           node(const_cast(root)), nextValueArrayIndex(-1) {
+
+           // We intentionally start at the "-1" index of the current
+           // node so we can use the preincrement operator to move
+           // ourselves to element 0 instead of repeating all of the
+           // code from the preincrement method.  Note that this might
+           // cause us to become the "end" instance.
+           ++(*this);
+        }
+
+    public:
+
+        inline bool operator!=(const BoxIntersectionIterator& other) const {
+            return ! (*this == other);
+        }
+
+        bool operator==(const BoxIntersectionIterator& other) const {
+            if (isEnd) {
+                return other.isEnd;
+            } else if (other.isEnd) {
+                return false;
+            } else {
+                // Two non-end iterators; see if they match.  This is kind of 
+                // silly; users shouldn't call == on iterators in general unless
+                // one of them is the end iterator.
+                if ((box != other.box) || (node != other.node) || 
+                    (nextValueArrayIndex != other.nextValueArrayIndex) ||
+                    (stack.length() != other.stack.length())) {
+                    return false;
+                }
+
+                // See if the stacks are the same
+                for (int i = 0; i < stack.length(); ++i) {
+                    if (stack[i] != other.stack[i]) {
+                        return false;
+                    }
+                }
+
+                // We failed to find a difference; they must be the same
+                return true;
+            }
+        }
+
+        /**
+         Pre increment.
+         */
+        BoxIntersectionIterator& operator++() {
+            ++nextValueArrayIndex;
+
+			bool foundIntersection = false;
+            while (! isEnd && ! foundIntersection) {
+
+				// Search for the next node if we've exhausted this one
+                while ((! isEnd) &&  (nextValueArrayIndex >= node->valueArray.length())) {
+					// If we entered this loop, then the iterator has exhausted the elements at 
+					// node (possibly because it just switched to a child node with no members).
+					// This loop continues until it finds a node with members or reaches
+					// the end of the whole intersection search.
+
+					// If the right child overlaps the box, push it onto the stack for
+					// processing.
+					if ((node->child[1] != NULL) &&
+						(box.high()[node->splitAxis] > node->splitLocation)) {
+						stack.push(node->child[1]);
+					}
+                
+					// If the left child overlaps the box, push it onto the stack for
+					// processing.
+					if ((node->child[0] != NULL) &&
+						(box.low()[node->splitAxis] < node->splitLocation)) {
+						stack.push(node->child[0]);
+					}
+
+					if (stack.length() > 0) {
+						// Go on to the next node (which may be either one of the ones we 
+						// just pushed, or one from farther back the tree).
+						node = stack.pop();
+						nextValueArrayIndex = 0;
+					} else {
+						// That was the last node; we're done iterating
+						isEnd = true;
+					}
+				}
+
+				// Search for the next intersection at this node until we run out of children
+				while (! isEnd && ! foundIntersection && (nextValueArrayIndex < node->valueArray.length())) {
+					if (box.intersects(node->valueArray[nextValueArrayIndex].bounds)) {
+						foundIntersection = true;
+					} else {
+						++nextValueArrayIndex;
+						// If we exhaust this node, we'll loop around the master loop 
+						// to find a new node.
+					}
+				}
+            }
+
+            return *this;
+        }
+
+        /**
+         Post increment (much slower than preincrement!).
+         */
+        BoxIntersectionIterator operator++(int) {
+            BoxIntersectionIterator old = *this;
+            ++this;
+            return old;
+        }
+
+        /** Overloaded dereference operator so the iterator can masquerade as a pointer
+            to a member */
+        const T& operator*() const {
+            alwaysAssertM(! isEnd, "Can't dereference the end element of an iterator");
+            return node->valueArray[nextValueArrayIndex].value;
+        }
+
+        /** Overloaded dereference operator so the iterator can masquerade as a pointer
+            to a member */
+        T const * operator->() const {
+            alwaysAssertM(! isEnd, "Can't dereference the end element of an iterator");
+            return &(stack.last()->valueArray[nextValueArrayIndex].value);
+        }
+
+        /** Overloaded cast operator so the iterator can masquerade as a pointer
+            to a member */
+        operator T*() const {
+            alwaysAssertM(! isEnd, "Can't dereference the end element of an iterator");
+            return &(stack.last()->valueArray[nextValueArrayIndex].value);
+        }
+    };
+
+
+    /**
+     Iterates through the members that intersect the box
+     */
+    BoxIntersectionIterator beginBoxIntersection(const AABox& box) const {
+        return BoxIntersectionIterator(box, root);
+    }
+
+    BoxIntersectionIterator endBoxIntersection() const {
+        // The "end" iterator instance
+        return BoxIntersectionIterator();
+    }
+
+    /**
+     Appends all members whose bounds intersect the box.
+     See also PointKDTree::beginBoxIntersection.
+     */
+    void getIntersectingMembers(const AABox& box, Array& members) const {
+        if (root == NULL) {
+            return;
+        }
+        root->getIntersectingMembers(box, Sphere(Vector3::zero(), 0), members, false);
+    }
+
+
+    /**
+      @param members The results are appended to this array.
+     */
+    void getIntersectingMembers(const Sphere& sphere, Array& members) const {
+        if (root == NULL) {
+            return;
+        }
+
+        AABox box;
+        sphere.getBounds(box);
+        root->getIntersectingMembers(box, sphere, members);
+
+    }
+
+
+    /**
+      Stores the locations of the splitting planes (the structure but not the content)
+      so that the tree can be quickly rebuilt from a previous configuration without 
+      calling balance.
+     */
+    void serializeStructure(BinaryOutput& bo) const {
+        Node::serializeStructure(root, bo);
+    }
+
+    /** Clears the member table */
+    void deserializeStructure(BinaryInput& bi) {
+        clear();
+        root = Node::deserializeStructure(bi);
+    }
+
+    /**
+     Returns an array of all members of the set.  See also PointKDTree::begin.
+     */
+    void getMembers(Array& members) const {
+        memberTable.getKeys(members);
+    }
+
+
+    /**
+     C++ STL style iterator variable.  See begin().
+     Overloads the -> (dereference) operator, so this acts like a pointer
+     to the current member.
+    */
+    class Iterator {
+    private:
+        friend class TreeType;
+
+        // Note: this is a Table iterator, we are currently defining
+        // Set iterator
+        typename MemberTable::Iterator it;
+
+        Iterator(const typename MemberTable::Iterator& it) : it(it) {}
+
+    public:
+        inline bool operator!=(const Iterator& other) const {
+            return !(*this == other);
+        }
+
+        bool operator==(const Iterator& other) const {
+            return it == other.it;
+        }
+
+        /**
+         Pre increment.
+         */
+        Iterator& operator++() {
+            ++it;
+            return *this;
+        }
+
+        /**
+         Post increment (slower than preincrement).
+         */
+        Iterator operator++(int) {
+            Iterator old = *this;
+            ++(*this);
+            return old;
+        }
+
+        const T& operator*() const {
+            return it->key;
+        }
+
+        T* operator->() const {
+            return &(it->key);
+        }
+
+        operator T*() const {
+            return &(it->key);
+        }
+    };
+
+
+    /**
+     C++ STL style iterator method.  Returns the first member.  
+     Use preincrement (++entry) to get to the next element (iteration
+     order is arbitrary).  
+     Do not modify the set while iterating.
+     */
+    Iterator begin() const {
+        return Iterator(memberTable.begin());
+    }
+
+
+    /**
+     C++ STL style iterator method.  Returns one after the last iterator
+     element.
+     */
+    Iterator end() const {
+        return Iterator(memberTable.end());
+    }
+#undef TreeType
+};
+
+}
+
+#endif
diff --git a/externals/g3dlite/G3D/Pointer.h b/externals/g3dlite/G3D/Pointer.h
new file mode 100644
index 00000000000..6e35062a746
--- /dev/null
+++ b/externals/g3dlite/G3D/Pointer.h
@@ -0,0 +1,292 @@
+/** 
+  @file Pointer.h
+ 
+  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+ 
+  @created 2007-05-16
+  @edited  2009-03-26
+
+  Copyright 2000-2009, Morgan McGuire.
+  All rights reserved.
+ */
+#ifndef G3D_Pointer_h
+#define G3D_Pointer_h
+
+#include "G3D/debugAssert.h"
+#include "G3D/ReferenceCount.h"
+
+namespace G3D {
+
+/**
+   Acts like a pointer to a value of type ValueType (i.e.,
+   ValueType*), but can operate through accessor methods as well as on
+   a value in memory.  This is useful for implementing scripting
+   languages and other applications that need to connect existing APIs
+   by reference.
+
+   Because the accessors require values to be passed by value (instead of by reference)
+   this is primarily useful for objects whose memory size is small.
+
+   
+   class Foo {
+   public:
+      void setEnabled(bool b);
+      bool getEnabled() const;
+   };
+
+   Foo  f;
+   bool b;
+   
+   Pointer p1(&b);
+   Pointer p2(&f, &Foo::getEnabled, &Foo::setEnabled);
+
+   *p1 = true;
+   *p2 = false;
+   *p2 = *p1; \/\/ Value assignment
+   p2 = p1; \/\/ Pointer aliasing
+
+   \/\/ Or, equivalently:
+   p1.setValue(true);
+   p2.setValue(false);
+
+   p2.setValue(p1.getValue());
+   p2 = p1;
+   

+
+   Note: Because of the way that dereference is implemented, you cannot pass *p through a function
+   that takes varargs (...), e.g., printf("%d", *p) will produce a compile-time error.  Instead use
+   printf("%d",(bool)*p) or printf("%d", p.getValue()).
+   
+ */
+template
+class Pointer {
+private:
+
+    class Interface {
+    public:
+        virtual ~Interface() {};
+        virtual void set(ValueType b) = 0;
+        virtual ValueType get() const = 0;
+        virtual Interface* clone() const = 0;
+        virtual bool isNull() const = 0;
+    };
+
+    class Memory : public Interface {
+    private:
+
+        ValueType* value;
+
+    public:
+        
+        Memory(ValueType* value) : value(value) {
+            //debugAssert(value != NULL);
+        }
+
+        virtual void set(ValueType v) {
+            *value = v;
+        }
+
+        virtual ValueType get() const {
+            return *value;
+        }
+
+        virtual Interface* clone() const {
+            return new Memory(value);
+        }
+
+        virtual bool isNull() const {
+            return value == NULL;
+        }
+    };
+
+    template
+    class Accessor : public Interface {
+    private:
+
+        T*          object;
+        GetMethod   getMethod;
+        SetMethod   setMethod;
+
+    public:
+        
+        Accessor(T* object, 
+                 GetMethod getMethod, 
+                 SetMethod setMethod) : object(object), getMethod(getMethod), setMethod(setMethod) {
+            debugAssert(object != NULL);
+        }
+
+        virtual void set(ValueType v) {
+            (object->*setMethod)(v);
+        }
+
+        virtual ValueType get() const {
+            return (object->*getMethod)();
+        }
+
+        virtual Interface* clone() const {
+            return new Accessor(object, getMethod, setMethod);
+        }
+
+        virtual bool isNull() const {
+            return object == NULL;
+        }
+    };
+
+
+    template
+    class RefAccessor : public Interface {
+    private:
+
+        ReferenceCountedPointer         object;
+        GetMethod   getMethod;
+        SetMethod   setMethod;
+
+    public:
+        
+        RefAccessor(
+            const ReferenceCountedPointer& object, 
+            GetMethod getMethod, 
+            SetMethod setMethod) : object(object), getMethod(getMethod), setMethod(setMethod) {
+
+            debugAssert(object != NULL);
+        }
+
+        virtual void set(ValueType v) {
+            (object.pointer()->*setMethod)(v);
+        }
+
+        virtual ValueType get() const {
+            return (object.pointer()->*getMethod)();
+        }
+
+        virtual Interface* clone() const {
+            return new RefAccessor(object, getMethod, setMethod);
+        }
+
+        virtual bool isNull() const {
+            return object.isNull();
+        }
+    };
+
+
+    Interface* m_interface;
+
+public:
+
+    Pointer() : m_interface(NULL) {};
+
+    /** Allows implicit cast from real pointer */
+    Pointer(ValueType* v) : m_interface(new Memory(v)) {}
+
+    inline bool isNull() const {
+        return (m_interface == NULL) || m_interface->isNull();
+    }
+
+    // Assignment
+    inline Pointer& operator=(const Pointer& r) {
+        delete m_interface;
+        if (r.m_interface != NULL) {
+            m_interface = r.m_interface->clone();
+        } else {
+            m_interface = NULL;
+        }
+        return this[0];
+    }
+
+    Pointer(const Pointer& p) : m_interface(NULL) {
+        this[0] = p;
+    }
+
+    template
+    Pointer(const ReferenceCountedPointer& object,
+            ValueType (Class::*getMethod)() const,
+            void (Class::*setMethod)(ValueType)) : 
+        m_interface(new RefAccessor(object, getMethod, setMethod)) {}
+
+    template
+    Pointer(const ReferenceCountedPointer& object,
+            const ValueType& (Class::*getMethod)() const,
+            void (Class::*setMethod)(ValueType)) : 
+        m_interface(new RefAccessor(object, getMethod, setMethod)) {}
+
+    template
+    Pointer(const ReferenceCountedPointer& object,
+            ValueType (Class::*getMethod)() const,
+            void (Class::*setMethod)(const ValueType&)) : 
+        m_interface(new RefAccessor(object, getMethod, setMethod)) {}
+
+    template
+    Pointer(const ReferenceCountedPointer& object,
+            const ValueType& (Class::*getMethod)() const,
+            void (Class::*setMethod)(const ValueType&)) : 
+        m_interface(new RefAccessor(object, getMethod, setMethod)) {}
+
+    template
+    Pointer(Class* object,
+            const ValueType& (Class::*getMethod)() const,
+            void (Class::*setMethod)(const ValueType&)) : 
+        m_interface(new Accessor(object, getMethod, setMethod)) {}
+
+    template
+    Pointer(Class* object,
+            ValueType (Class::*getMethod)() const,
+            void (Class::*setMethod)(const ValueType&)) : 
+        m_interface(new Accessor(object, getMethod, setMethod)) {}
+
+    template
+    Pointer(Class* object,
+            const ValueType& (Class::*getMethod)() const,
+            void (Class::*setMethod)(ValueType)) : 
+        m_interface(new Accessor(object, getMethod, setMethod)) {}
+
+    template
+    Pointer(Class* object,
+            ValueType (Class::*getMethod)() const,
+            void (Class::*setMethod)(ValueType)) : 
+        m_interface(new Accessor(object, getMethod, setMethod)) {}
+
+    ~Pointer() {
+        delete m_interface;
+    }
+
+    inline const ValueType getValue() const {
+        debugAssert(m_interface != NULL);
+        return m_interface->get();
+    }
+
+    inline void setValue(const ValueType& v) {
+        debugAssert(m_interface != NULL);
+        m_interface->set(v);
+    }
+
+    class IndirectValue {
+    private:
+
+        friend class Pointer;
+        Pointer* pointer;
+        IndirectValue(Pointer* p) : pointer(p) {}
+
+    public:
+
+        void operator=(const ValueType& v) {
+            pointer->setValue(v);
+        }
+
+        operator ValueType() const {
+            return pointer->getValue();
+        }
+
+    };
+
+    inline IndirectValue operator*() {
+        return IndirectValue(this);
+    }
+
+    inline const ValueType operator*() const {
+        return getValue();
+    }
+};
+
+}
+
+#endif
diff --git a/externals/g3dlite/G3D/PositionTrait.h b/externals/g3dlite/G3D/PositionTrait.h
new file mode 100644
index 00000000000..67a4f64138a
--- /dev/null
+++ b/externals/g3dlite/G3D/PositionTrait.h
@@ -0,0 +1,7 @@
+#ifndef G3D_POSITIONTRAIT_H
+#define G3D_POSITIONTRAIT_H
+
+template
+struct PositionTrait{};
+
+#endif
diff --git a/externals/g3dlite/G3D/PrecomputedRandom.h b/externals/g3dlite/G3D/PrecomputedRandom.h
new file mode 100644
index 00000000000..411d128c582
--- /dev/null
+++ b/externals/g3dlite/G3D/PrecomputedRandom.h
@@ -0,0 +1,110 @@
+/**
+ @file PrecomputedRandom.h
+ 
+ @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+ 
+ @created 2009-03-31
+ @edited  2009-03-31
+
+ Copyright 2000-2009, Morgan McGuire.
+ All rights reserved.
+ */
+#ifndef G3D_PrecomputedRandom_h
+#define G3D_PrecomputedRandom_h
+
+#include "G3D/platform.h"
+#include "G3D/Random.h"
+
+namespace G3D {
+
+/** Fast random numbers using a precomputed data table. 
+
+    e.g., generates cosHemi about 13x faster than Random.
+    This is useful for quickly generating seeded random 
+    numbers for reproducibility.  G3D::Random takes a long
+    time to seed; this is instantaneous (providing the 
+    precomputed data is already available.)
+
+    Not threadsafe.*/
+class PrecomputedRandom : public Random {
+public:
+    /** Put the cosHemi and the uniform together so that when
+        alternating between them we stay in cache. This is also packed
+        into a good size for SIMD and GPU operations.*/
+    class HemiUniformData {
+    public:
+        float   cosHemiX;
+        float   cosHemiY;
+        float   cosHemiZ;
+        float   uniform;
+    };
+
+    class SphereBitsData {
+    public:
+        float   sphereX;
+        float   sphereY;
+        float   sphereZ;
+        uint32  bits;
+    };
+
+protected:
+
+    /** Array of 2^n elements. */
+    const HemiUniformData*      m_hemiUniform;
+    const SphereBitsData*       m_sphereBits;
+
+    /** 2^n - 1; the AND mask for computing a fast modulo */
+    int                         m_modMask;
+
+    int                         m_index;
+
+    /** If true, free m_hemiUniform and m_sphereBits in destructor */
+    bool                        m_freeData;
+
+public:
+
+    /*
+      \param dataSize Must be a power of 2
+      \param data Will NOT be deleted by the destructor.
+     */
+    PrecomputedRandom(const HemiUniformData* data1, const SphereBitsData* data2, int dataSize, uint32 seed = 0xF018A4D2);
+
+    /**
+      \param dataSize Number of random numbers that can be requested before periodicity.  Must be a power of 2.
+      */
+    PrecomputedRandom(int dataSize, uint32 seed = 0xF018A4D2);
+
+    ~PrecomputedRandom();
+
+    /** Each bit is random.  Subclasses can choose to override just 
+       this method and the other methods will all work automatically. */
+    virtual uint32 bits();
+
+    // integer is inherited
+
+    /** Uniform random float on the range [min, max] */
+    virtual float uniform(float low, float high);
+
+    /** Uniform random float on the range [0, 1] */
+    virtual float uniform();
+
+    // gaussian is inherited
+
+    /** Returns 3D unit vectors distributed according to 
+        a cosine distribution about the z axis. */
+    virtual void cosHemi(float& x, float& y, float& z);
+
+    /** Returns 3D unit vectors distributed according to a cosine
+        power distribution (\f$ \mbox{cos}^k \theta \f$) about
+        the z-axis. */
+    virtual void cosPowHemi(const float k, float& x, float& y, float& z);
+
+    // hemi is inherited
+
+    /** Returns 3D unit vectors uniformly distributed on the sphere */
+    virtual void sphere(float& x, float& y, float& z);
+};
+
+}
+
+#endif
diff --git a/externals/g3dlite/G3D/Quat.h b/externals/g3dlite/G3D/Quat.h
new file mode 100644
index 00000000000..9ef3d57b301
--- /dev/null
+++ b/externals/g3dlite/G3D/Quat.h
@@ -0,0 +1,725 @@
+/**
+  @file Quat.h
+ 
+  Quaternion
+  
+  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+  
+  @created 2002-01-23
+  @edited  2009-05-10
+ */
+
+#ifndef G3D_Quat_h
+#define G3D_Quat_h
+
+#include "G3D/platform.h"
+#include "G3D/g3dmath.h"
+#include "G3D/Vector3.h"
+#include "G3D/Matrix3.h"
+#include 
+
+namespace G3D {
+
+/**
+  Unit quaternions are used in computer graphics to represent
+  rotation about an axis.  Any 3x3 rotation matrix can
+  be stored as a quaternion.
+
+  A quaternion represents the sum of a real scalar and
+  an imaginary vector: ix + jy + kz + w.  A unit quaternion
+  representing a rotation by A about axis v has the form 
+  [sin(A/2)*v, cos(A/2)].  For a unit quaternion, q.conj() == q.inverse()
+  is a rotation by -A about v.  -q is the same rotation as q
+  (negate both the axis and angle).  
+  
+  A non-unit quaterion q represents the same rotation as
+  q.unitize() (Dam98 pg 28).
+
+  Although quaternion-vector operations (eg. Quat + Vector3) are
+  well defined, they are not supported by this class because
+  they typically are bugs when they appear in code.
+
+  Do not subclass.
+
+  BETA API -- subject to change
+  @cite Erik B. Dam, Martin Koch, Martin Lillholm, Quaternions, Interpolation and Animation.  Technical Report DIKU-TR-98/5, Department of Computer Science, University of Copenhagen, Denmark.  1998.
+ */
+class Quat {
+private:
+    // Hidden operators
+    bool operator<(const Quat&) const;
+    bool operator>(const Quat&) const;
+    bool operator<=(const Quat&) const;
+    bool operator>=(const Quat&) const;
+
+public:
+
+    /**
+     q = [sin(angle / 2) * axis, cos(angle / 2)]
+    
+     In Watt & Watt's notation, s = w, v = (x, y, z)
+     In the Real-Time Rendering notation, u = (x, y, z), w = w 
+     */
+    float x, y, z, w;
+
+    /**
+     Initializes to a zero degree rotation.
+     */
+    inline Quat() : x(0), y(0), z(0), w(1) {}
+
+    Quat(
+        const Matrix3& rot);
+
+    inline Quat(float _x, float _y, float _z, float _w) :
+        x(_x), y(_y), z(_z), w(_w) {}
+
+    /** Defaults to a pure vector quaternion */
+    inline Quat(const Vector3& v, float _w = 0) : x(v.x), y(v.y), z(v.z), w(_w) {
+    }
+
+    /**
+     The real part of the quaternion.
+     */
+    inline const float& real() const {
+        return w;
+    }
+
+    inline float& real() {
+        return w;
+    }
+
+    /** Note: two quats can represent the Quat::sameRotation and not be equal. */
+    bool fuzzyEq(const Quat& q) {
+      return G3D::fuzzyEq(x, q.x) && G3D::fuzzyEq(y, q.y) && G3D::fuzzyEq(z, q.z) && G3D::fuzzyEq(w, q.w);
+    }
+    
+    /** True if these quaternions represent the same rotation (note that every rotation is 
+        represented by two values; q and -q).
+      */
+    bool sameRotation(const Quat& q) {
+        return fuzzyEq(q) || fuzzyEq(-q);
+    }
+
+	inline Quat operator-() const {
+		return Quat(-x, -y, -z, -w);
+	}
+
+    /**
+     Returns the imaginary part (x, y, z)
+     */
+    inline const Vector3& imag() const {
+        return *(reinterpret_cast(this));
+    }
+
+    inline Vector3& imag() {
+        return *(reinterpret_cast(this));
+    }
+
+    /** q = [sin(angle/2)*axis, cos(angle/2)] */
+    static Quat fromAxisAngleRotation(
+        const Vector3&      axis,
+        float               angle);
+
+    /** Returns the axis and angle of rotation represented
+        by this quaternion (i.e. q = [sin(angle/2)*axis, cos(angle/2)]) */
+    void toAxisAngleRotation(
+        Vector3&            axis,
+        double&             angle) const;
+
+    void toAxisAngleRotation(
+        Vector3&            axis,
+        float&              angle) const {
+		double d;
+		toAxisAngleRotation(axis, d);
+		angle = (float)d;
+	}
+
+    Matrix3 toRotationMatrix() const;
+
+    void toRotationMatrix(
+        Matrix3&            rot) const;
+    
+    /**
+     Spherical linear interpolation: linear interpolation along the 
+     shortest (3D) great-circle route between two quaternions.
+
+     Note: Correct rotations are expected between 0 and PI in the right order.
+
+     @cite Based on Game Physics -- David Eberly pg 538-540
+     @param threshold Critical angle between between rotations at which
+	        the algorithm switches to normalized lerp, which is more
+			numerically stable in those situations. 0.0 will always slerp. 
+     */
+    Quat slerp(
+        const Quat&         other,
+        float               alpha,
+        float               threshold = 0.05f) const;
+
+	/** Normalized linear interpolation of quaternion components. */
+	Quat nlerp(const Quat& other, float alpha) const;
+
+    /**
+     Negates the imaginary part.
+     */
+    inline Quat conj() const {
+        return Quat(-x, -y, -z, w);
+    }
+
+    inline float sum() const {
+        return x + y + z + w;
+    }
+
+    inline float average() const {
+        return sum() / 4.0f;
+    }
+
+    inline Quat operator*(float s) const {
+        return Quat(x * s, y * s, z * s, w * s);
+    }
+
+    inline Quat& operator*=(float s) {
+        x *= s;
+        y *= s;
+        z *= s;
+        w *= s;
+        return *this;
+    }
+
+	/** @cite Based on Watt & Watt, page 360 */
+    friend Quat operator* (float s, const Quat& q);
+
+    inline Quat operator/(float s) const {
+        return Quat(x / s, y / s, z / s, w / s);
+    }
+
+    inline float dot(const Quat& other) const {
+        return (x * other.x) + (y * other.y) + (z * other.z) + (w * other.w);
+    }
+
+    /** Note that q-1 = q.conj() for a unit quaternion. 
+        @cite Dam99 page 13 */
+    inline Quat inverse() const {
+        return conj() / dot(*this);
+    }
+
+    Quat operator-(const Quat& other) const;
+
+    Quat operator+(const Quat& other) const;
+
+    /**
+     Quaternion multiplication (composition of rotations).
+     Note that this does not commute.
+     */
+    Quat operator*(const Quat& other) const;
+
+    /* (*this) * other.inverse() */
+    Quat operator/(const Quat& other) const {
+        return (*this) * other.inverse();
+    }
+
+
+    /** Is the magnitude nearly 1.0? */
+    inline bool isUnit(float tolerance = 1e-5) const {
+        return abs(dot(*this) - 1.0f) < tolerance;
+    }
+    
+
+    inline float magnitude() const {
+        return sqrtf(dot(*this));
+    }
+
+    inline Quat log() const {
+        if ((x == 0) && (y == 0) && (z == 0)) {
+            if (w > 0) {
+                return Quat(0, 0, 0, ::logf(w));
+            } else if (w < 0) {
+                // Log of a negative number.  Multivalued, any number of the form
+                // (PI * v, ln(-q.w))
+                return Quat((float)pi(), 0, 0, ::logf(-w));
+            } else {
+                 // log of zero!
+                 return Quat((float)nan(), (float)nan(), (float)nan(), (float)nan());
+            }
+        } else {
+            // Partly imaginary.
+            float imagLen = sqrtf(x * x + y * y + z * z);
+            float len = sqrtf(imagLen * imagLen + w * w);
+            float theta = atan2f(imagLen, (float)w);
+            float t = theta / imagLen;
+            return Quat(t * x, t * y, t * z, ::logf(len));
+        }
+    }
+    /** log q = [Av, 0] where q = [sin(A) * v, cos(A)].
+        Only for unit quaternions 
+        debugAssertM(isUnit(), "Log only defined for unit quaternions");
+        // Solve for A in q = [sin(A)*v, cos(A)]
+        Vector3 u(x, y, z);
+        double len = u.magnitude();
+
+        if (len == 0.0) {
+            return 
+        }
+        double A = atan2((double)w, len);
+        Vector3 v = u / len;
+        
+        return Quat(v * A, 0);
+    }
+    */
+
+    /** exp q = [sin(A) * v, cos(A)] where q = [Av, 0].
+        Only defined for pure-vector quaternions */
+    inline Quat exp() const {
+        debugAssertM(w == 0, "exp only defined for vector quaternions");
+        Vector3 u(x, y, z);
+        float A = u.magnitude();
+        Vector3 v = u / A;
+        return Quat(sinf(A) * v, cosf(A));
+    }
+
+
+    /**
+     Raise this quaternion to a power.  For a rotation, this is
+     the effect of rotating x times as much as the original
+     quaterion.
+
+     Note that q.pow(a).pow(b) == q.pow(a + b)
+     @cite Dam98 pg 21
+     */
+    inline Quat pow(float x) const {
+        return (log() * x).exp();
+    }
+
+    inline void unitize() {
+        float mag2 = dot(*this);
+        if (! G3D::fuzzyEq(mag2, 1.0f)) {
+            *this *= rsq(mag2);
+        }
+    }
+
+    /**
+     Returns a unit quaterion obtained by dividing through by
+     the magnitude.
+     */
+    inline Quat toUnit() const {
+        Quat x = *this;
+        x.unitize();
+        return x;
+    }
+
+    /**
+     The linear algebra 2-norm, sqrt(q dot q).  This matches
+     the value used in Dam's 1998 tech report but differs from the
+     n(q) value used in Eberly's 1999 paper, which is the square of the
+     norm.
+     */
+    inline float norm() const {
+        return magnitude();
+    }
+
+    // access quaternion as q[0] = q.x, q[1] = q.y, q[2] = q.z, q[3] = q.w
+    //
+    // WARNING.  These member functions rely on
+    // (1) Quat not having virtual functions
+    // (2) the data packed in a 4*sizeof(float) memory block
+    const float& operator[] (int i) const;
+    float& operator[] (int i);
+
+    /** Generate uniform random unit quaternion (i.e. random "direction") 
+	@cite From "Uniform Random Rotations", Ken Shoemake, Graphics Gems III.
+   */
+    static Quat unitRandom();
+
+    void deserialize(class BinaryInput& b);
+    void serialize(class BinaryOutput& b) const;
+
+    // 2-char swizzles
+
+    Vector2 xx() const;
+    Vector2 yx() const;
+    Vector2 zx() const;
+    Vector2 wx() const;
+    Vector2 xy() const;
+    Vector2 yy() const;
+    Vector2 zy() const;
+    Vector2 wy() const;
+    Vector2 xz() const;
+    Vector2 yz() const;
+    Vector2 zz() const;
+    Vector2 wz() const;
+    Vector2 xw() const;
+    Vector2 yw() const;
+    Vector2 zw() const;
+    Vector2 ww() const;
+
+    // 3-char swizzles
+
+    Vector3 xxx() const;
+    Vector3 yxx() const;
+    Vector3 zxx() const;
+    Vector3 wxx() const;
+    Vector3 xyx() const;
+    Vector3 yyx() const;
+    Vector3 zyx() const;
+    Vector3 wyx() const;
+    Vector3 xzx() const;
+    Vector3 yzx() const;
+    Vector3 zzx() const;
+    Vector3 wzx() const;
+    Vector3 xwx() const;
+    Vector3 ywx() const;
+    Vector3 zwx() const;
+    Vector3 wwx() const;
+    Vector3 xxy() const;
+    Vector3 yxy() const;
+    Vector3 zxy() const;
+    Vector3 wxy() const;
+    Vector3 xyy() const;
+    Vector3 yyy() const;
+    Vector3 zyy() const;
+    Vector3 wyy() const;
+    Vector3 xzy() const;
+    Vector3 yzy() const;
+    Vector3 zzy() const;
+    Vector3 wzy() const;
+    Vector3 xwy() const;
+    Vector3 ywy() const;
+    Vector3 zwy() const;
+    Vector3 wwy() const;
+    Vector3 xxz() const;
+    Vector3 yxz() const;
+    Vector3 zxz() const;
+    Vector3 wxz() const;
+    Vector3 xyz() const;
+    Vector3 yyz() const;
+    Vector3 zyz() const;
+    Vector3 wyz() const;
+    Vector3 xzz() const;
+    Vector3 yzz() const;
+    Vector3 zzz() const;
+    Vector3 wzz() const;
+    Vector3 xwz() const;
+    Vector3 ywz() const;
+    Vector3 zwz() const;
+    Vector3 wwz() const;
+    Vector3 xxw() const;
+    Vector3 yxw() const;
+    Vector3 zxw() const;
+    Vector3 wxw() const;
+    Vector3 xyw() const;
+    Vector3 yyw() const;
+    Vector3 zyw() const;
+    Vector3 wyw() const;
+    Vector3 xzw() const;
+    Vector3 yzw() const;
+    Vector3 zzw() const;
+    Vector3 wzw() const;
+    Vector3 xww() const;
+    Vector3 yww() const;
+    Vector3 zww() const;
+    Vector3 www() const;
+
+    // 4-char swizzles
+
+    Vector4 xxxx() const;
+    Vector4 yxxx() const;
+    Vector4 zxxx() const;
+    Vector4 wxxx() const;
+    Vector4 xyxx() const;
+    Vector4 yyxx() const;
+    Vector4 zyxx() const;
+    Vector4 wyxx() const;
+    Vector4 xzxx() const;
+    Vector4 yzxx() const;
+    Vector4 zzxx() const;
+    Vector4 wzxx() const;
+    Vector4 xwxx() const;
+    Vector4 ywxx() const;
+    Vector4 zwxx() const;
+    Vector4 wwxx() const;
+    Vector4 xxyx() const;
+    Vector4 yxyx() const;
+    Vector4 zxyx() const;
+    Vector4 wxyx() const;
+    Vector4 xyyx() const;
+    Vector4 yyyx() const;
+    Vector4 zyyx() const;
+    Vector4 wyyx() const;
+    Vector4 xzyx() const;
+    Vector4 yzyx() const;
+    Vector4 zzyx() const;
+    Vector4 wzyx() const;
+    Vector4 xwyx() const;
+    Vector4 ywyx() const;
+    Vector4 zwyx() const;
+    Vector4 wwyx() const;
+    Vector4 xxzx() const;
+    Vector4 yxzx() const;
+    Vector4 zxzx() const;
+    Vector4 wxzx() const;
+    Vector4 xyzx() const;
+    Vector4 yyzx() const;
+    Vector4 zyzx() const;
+    Vector4 wyzx() const;
+    Vector4 xzzx() const;
+    Vector4 yzzx() const;
+    Vector4 zzzx() const;
+    Vector4 wzzx() const;
+    Vector4 xwzx() const;
+    Vector4 ywzx() const;
+    Vector4 zwzx() const;
+    Vector4 wwzx() const;
+    Vector4 xxwx() const;
+    Vector4 yxwx() const;
+    Vector4 zxwx() const;
+    Vector4 wxwx() const;
+    Vector4 xywx() const;
+    Vector4 yywx() const;
+    Vector4 zywx() const;
+    Vector4 wywx() const;
+    Vector4 xzwx() const;
+    Vector4 yzwx() const;
+    Vector4 zzwx() const;
+    Vector4 wzwx() const;
+    Vector4 xwwx() const;
+    Vector4 ywwx() const;
+    Vector4 zwwx() const;
+    Vector4 wwwx() const;
+    Vector4 xxxy() const;
+    Vector4 yxxy() const;
+    Vector4 zxxy() const;
+    Vector4 wxxy() const;
+    Vector4 xyxy() const;
+    Vector4 yyxy() const;
+    Vector4 zyxy() const;
+    Vector4 wyxy() const;
+    Vector4 xzxy() const;
+    Vector4 yzxy() const;
+    Vector4 zzxy() const;
+    Vector4 wzxy() const;
+    Vector4 xwxy() const;
+    Vector4 ywxy() const;
+    Vector4 zwxy() const;
+    Vector4 wwxy() const;
+    Vector4 xxyy() const;
+    Vector4 yxyy() const;
+    Vector4 zxyy() const;
+    Vector4 wxyy() const;
+    Vector4 xyyy() const;
+    Vector4 yyyy() const;
+    Vector4 zyyy() const;
+    Vector4 wyyy() const;
+    Vector4 xzyy() const;
+    Vector4 yzyy() const;
+    Vector4 zzyy() const;
+    Vector4 wzyy() const;
+    Vector4 xwyy() const;
+    Vector4 ywyy() const;
+    Vector4 zwyy() const;
+    Vector4 wwyy() const;
+    Vector4 xxzy() const;
+    Vector4 yxzy() const;
+    Vector4 zxzy() const;
+    Vector4 wxzy() const;
+    Vector4 xyzy() const;
+    Vector4 yyzy() const;
+    Vector4 zyzy() const;
+    Vector4 wyzy() const;
+    Vector4 xzzy() const;
+    Vector4 yzzy() const;
+    Vector4 zzzy() const;
+    Vector4 wzzy() const;
+    Vector4 xwzy() const;
+    Vector4 ywzy() const;
+    Vector4 zwzy() const;
+    Vector4 wwzy() const;
+    Vector4 xxwy() const;
+    Vector4 yxwy() const;
+    Vector4 zxwy() const;
+    Vector4 wxwy() const;
+    Vector4 xywy() const;
+    Vector4 yywy() const;
+    Vector4 zywy() const;
+    Vector4 wywy() const;
+    Vector4 xzwy() const;
+    Vector4 yzwy() const;
+    Vector4 zzwy() const;
+    Vector4 wzwy() const;
+    Vector4 xwwy() const;
+    Vector4 ywwy() const;
+    Vector4 zwwy() const;
+    Vector4 wwwy() const;
+    Vector4 xxxz() const;
+    Vector4 yxxz() const;
+    Vector4 zxxz() const;
+    Vector4 wxxz() const;
+    Vector4 xyxz() const;
+    Vector4 yyxz() const;
+    Vector4 zyxz() const;
+    Vector4 wyxz() const;
+    Vector4 xzxz() const;
+    Vector4 yzxz() const;
+    Vector4 zzxz() const;
+    Vector4 wzxz() const;
+    Vector4 xwxz() const;
+    Vector4 ywxz() const;
+    Vector4 zwxz() const;
+    Vector4 wwxz() const;
+    Vector4 xxyz() const;
+    Vector4 yxyz() const;
+    Vector4 zxyz() const;
+    Vector4 wxyz() const;
+    Vector4 xyyz() const;
+    Vector4 yyyz() const;
+    Vector4 zyyz() const;
+    Vector4 wyyz() const;
+    Vector4 xzyz() const;
+    Vector4 yzyz() const;
+    Vector4 zzyz() const;
+    Vector4 wzyz() const;
+    Vector4 xwyz() const;
+    Vector4 ywyz() const;
+    Vector4 zwyz() const;
+    Vector4 wwyz() const;
+    Vector4 xxzz() const;
+    Vector4 yxzz() const;
+    Vector4 zxzz() const;
+    Vector4 wxzz() const;
+    Vector4 xyzz() const;
+    Vector4 yyzz() const;
+    Vector4 zyzz() const;
+    Vector4 wyzz() const;
+    Vector4 xzzz() const;
+    Vector4 yzzz() const;
+    Vector4 zzzz() const;
+    Vector4 wzzz() const;
+    Vector4 xwzz() const;
+    Vector4 ywzz() const;
+    Vector4 zwzz() const;
+    Vector4 wwzz() const;
+    Vector4 xxwz() const;
+    Vector4 yxwz() const;
+    Vector4 zxwz() const;
+    Vector4 wxwz() const;
+    Vector4 xywz() const;
+    Vector4 yywz() const;
+    Vector4 zywz() const;
+    Vector4 wywz() const;
+    Vector4 xzwz() const;
+    Vector4 yzwz() const;
+    Vector4 zzwz() const;
+    Vector4 wzwz() const;
+    Vector4 xwwz() const;
+    Vector4 ywwz() const;
+    Vector4 zwwz() const;
+    Vector4 wwwz() const;
+    Vector4 xxxw() const;
+    Vector4 yxxw() const;
+    Vector4 zxxw() const;
+    Vector4 wxxw() const;
+    Vector4 xyxw() const;
+    Vector4 yyxw() const;
+    Vector4 zyxw() const;
+    Vector4 wyxw() const;
+    Vector4 xzxw() const;
+    Vector4 yzxw() const;
+    Vector4 zzxw() const;
+    Vector4 wzxw() const;
+    Vector4 xwxw() const;
+    Vector4 ywxw() const;
+    Vector4 zwxw() const;
+    Vector4 wwxw() const;
+    Vector4 xxyw() const;
+    Vector4 yxyw() const;
+    Vector4 zxyw() const;
+    Vector4 wxyw() const;
+    Vector4 xyyw() const;
+    Vector4 yyyw() const;
+    Vector4 zyyw() const;
+    Vector4 wyyw() const;
+    Vector4 xzyw() const;
+    Vector4 yzyw() const;
+    Vector4 zzyw() const;
+    Vector4 wzyw() const;
+    Vector4 xwyw() const;
+    Vector4 ywyw() const;
+    Vector4 zwyw() const;
+    Vector4 wwyw() const;
+    Vector4 xxzw() const;
+    Vector4 yxzw() const;
+    Vector4 zxzw() const;
+    Vector4 wxzw() const;
+    Vector4 xyzw() const;
+    Vector4 yyzw() const;
+    Vector4 zyzw() const;
+    Vector4 wyzw() const;
+    Vector4 xzzw() const;
+    Vector4 yzzw() const;
+    Vector4 zzzw() const;
+    Vector4 wzzw() const;
+    Vector4 xwzw() const;
+    Vector4 ywzw() const;
+    Vector4 zwzw() const;
+    Vector4 wwzw() const;
+    Vector4 xxww() const;
+    Vector4 yxww() const;
+    Vector4 zxww() const;
+    Vector4 wxww() const;
+    Vector4 xyww() const;
+    Vector4 yyww() const;
+    Vector4 zyww() const;
+    Vector4 wyww() const;
+    Vector4 xzww() const;
+    Vector4 yzww() const;
+    Vector4 zzww() const;
+    Vector4 wzww() const;
+    Vector4 xwww() const;
+    Vector4 ywww() const;
+    Vector4 zwww() const;
+    Vector4 wwww() const;
+};
+
+inline Quat exp(const Quat& q) {
+    return q.exp();
+}
+
+inline Quat log(const Quat& q) {
+    return q.log();
+}
+
+inline G3D::Quat operator*(double s, const G3D::Quat& q) {
+    return q * (float)s;
+}
+
+inline G3D::Quat operator*(float s, const G3D::Quat& q) {
+    return q * s;
+}
+
+inline float& Quat::operator[] (int i) {
+    debugAssert(i >= 0);
+    debugAssert(i < 4);
+    return ((float*)this)[i];
+}
+
+inline const float& Quat::operator[] (int i) const {
+    debugAssert(i >= 0);
+    debugAssert(i < 4);
+    return ((float*)this)[i];
+}
+
+inline Quat Quat::operator-(const Quat& other) const {
+    return Quat(x - other.x, y - other.y, z - other.z, w - other.w);
+}
+
+inline Quat Quat::operator+(const Quat& other) const {
+    return Quat(x + other.x, y + other.y, z + other.z, w + other.w);
+}
+
+} // Namespace G3D
+
+// Outside the namespace to avoid overloading confusion for C++
+inline G3D::Quat pow(const G3D::Quat& q, double x) {
+    return q.pow((float)x);
+}
+
+
+#endif
diff --git a/externals/g3dlite/G3D/Quat.inl b/externals/g3dlite/G3D/Quat.inl
new file mode 100644
index 00000000000..9e4c861d93b
--- /dev/null
+++ b/externals/g3dlite/G3D/Quat.inl
@@ -0,0 +1,36 @@
+/**
+  Quat.inl
+
+  @cite Quaternion implementation based on Watt & Watt page 363.
+  Thanks to Max McGuire for slerp optimizations.
+
+  @maintainer Morgan McGuire, matrix@graphics3d.com
+
+  @created 2002-01-23
+  @edited  2004-03-04
+ */
+
+namespace G3D {
+
+inline float& Quat::operator[] (int i) {
+    debugAssert(i >= 0);
+    debugAssert(i < 4);
+    return ((float*)this)[i];
+}
+
+inline const float& Quat::operator[] (int i) const {
+    debugAssert(i >= 0);
+    debugAssert(i < 4);
+    return ((float*)this)[i];
+}
+
+inline Quat Quat::operator-(const Quat& other) const {
+    return Quat(x - other.x, y - other.y, z - other.z, w - other.w);
+}
+
+inline Quat Quat::operator+(const Quat& other) const {
+    return Quat(x + other.x, y + other.y, z + other.z, w + other.w);
+}
+
+}
+
diff --git a/externals/g3dlite/G3D/Queue.h b/externals/g3dlite/G3D/Queue.h
new file mode 100644
index 00000000000..36573265d1a
--- /dev/null
+++ b/externals/g3dlite/G3D/Queue.h
@@ -0,0 +1,364 @@
+/** 
+  @file Queue.h
+ 
+  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+ 
+  @created 2002-07-09
+  @edited  2008-12-20
+ */
+
+#ifndef G3D_QUEUE_H
+#define G3D_QUEUE_H
+
+#include "G3D/platform.h"
+#include "G3D/System.h"
+#include "G3D/debug.h"
+
+namespace G3D {
+
+/**
+ Locate the indices of the break between of the two 
+ sections of the circular queue.  These are used to
+ construct two for loops that iterate over the whole
+ sequence without using the modulo operator.
+
+   [0 ... secondEnd)   [head .... firstEnd)
+ */
+#define FIND_ENDS \
+    int firstEnd  = head + num;\
+    int secondEnd = 0;\
+    if (firstEnd > numAllocated) {\
+       secondEnd = firstEnd - numAllocated;\
+       firstEnd  = numAllocated;\
+    }
+
+
+/**
+ Dynamic queue that uses a circular buffer for performance.
+
+ Faster than std::deque for objects with constructors.
+ */
+template 
+class Queue {
+private:
+    //                
+    //             |<----  num  ---->|
+    // [  |  |  |  |  |  |  |  |  |  |  |  |  |  ]
+    //              ^ 
+    //              |
+    //             head
+    //
+    //
+
+    /**
+     Only num elements are initialized.
+     */
+    T*                  data;
+
+    /**
+     Index of the next element to be dequeue-d in data.
+     */
+    int                 head;
+
+    /**
+     Number of elements (including head) that are visible and initialized.
+     */
+    int                 num;
+    
+    /**
+     Size of data array in elements.
+     */
+    int                 numAllocated;
+
+    /** If a clear was needed, assumes it already occured */
+    void _copy(const Queue& other) {
+        debugAssert(data == NULL);
+        data = (T*)System::malloc(sizeof(T) * other.numAllocated);
+        debugAssert(data);
+        head = other.head;
+        num = other.num;
+        numAllocated = other.numAllocated;
+
+        FIND_ENDS;
+
+        for (int i = head; i < firstEnd; ++i) {
+            new (data + i)T(other.data[i]);
+        }
+
+        for (int i = 0; i < secondEnd; ++i) {
+            new (data + i)T(other.data[i]);
+        }
+    }
+
+
+    /**
+     Computes a data array index from a queue position.  The queue position
+     may be negative.
+     */
+    inline int index(int i) const {
+        return (head + i + numAllocated) % numAllocated;
+    }
+
+    /**
+     Allocates newSize elements and repacks the array.
+     */
+    void repackAndRealloc(int newSize) {
+        // TODO: shrink queue
+        T* old = data;
+        data = (T*)System::malloc(newSize * sizeof(T));
+        debugAssert(data != NULL);
+
+        FIND_ENDS;
+
+        int j = 0;
+        for (int i = head; i < firstEnd; ++i, ++j) {
+            new (data + j)T(old[i]);
+            (old + i)->~T();
+        }
+
+        for (int i = 0; i < secondEnd; ++i, ++j) {
+            new (data + j)T(old[i]);
+            (old + i)->~T();
+        }
+
+        head = 0;
+        System::free(old);
+        numAllocated = newSize;
+    }
+
+    /**
+      Ensure that there is at least one element between
+      the tail and head, wrapping around in the circular
+      buffer.
+      */
+    inline void reserveSpace() {
+        if (num == numAllocated) {
+            repackAndRealloc(numAllocated * 3 + 20);
+        }
+    }
+
+public:
+
+    Queue() : 
+      data(NULL),
+      head(0),
+      num(0),
+      numAllocated(0) {
+    }
+
+
+    /**
+    Copy constructor
+    */
+    Queue(const Queue& other) : data(NULL) {
+       _copy(other);
+    }
+
+
+   /**
+    Destructor does not delete() the objects if T is a pointer type
+    (e.g. T = int*) instead, it deletes the pointers themselves and 
+    leaves the objects.  Call deleteAll if you want to dealocate
+    the objects referenced.
+    */
+    virtual ~Queue() {
+        clear();
+    }
+
+    /**
+     Insert a new element into the front of the queue
+     (a traditional queue only uses pushBack).
+     */
+    inline void pushFront(const T& e) {
+        reserveSpace();
+
+        // Get the index of head-1
+        int i = index(-1);
+
+        // Call the constructor on the newly exposed element.
+        new (data + i)T(e);
+
+        // Reassign the head to point to this index
+        head = i;
+        ++num;
+    }
+
+    /**
+     Insert a new element at the end of the queue.
+    */
+    inline void pushBack(const T& e) {
+        reserveSpace();
+
+        // Get the index of 1+tail
+        int i = index(num);
+
+        // Initialize that element
+        new (data + i)T(e);
+        ++num;
+    }
+
+    /**
+     pushBack
+     */
+    inline void enqueue(const T& e) {
+        pushBack(e);
+    }
+
+
+    /**
+     Remove the last element from the queue.  The queue will never
+     shrink in size.  (A typical queue only uses popFront).
+     */
+    inline T popBack() {
+        int tail = index(num - 1);
+        T result(data[tail]);
+
+        // Call the destructor
+        (data + tail)->~T();
+        --num;
+
+        return result;
+    }
+
+    /**
+    Remove the next element from the head of the queue.  The queue will never
+    shrink in size. */
+    inline T popFront() {
+        T result(data[head]);
+        // Call the destructor
+        (data + head)->~T();
+        head = (head + 1) % numAllocated;
+        --num;
+        return result;
+    }
+
+
+   /**
+    popFront
+    */
+   inline T dequeue() {
+       return popFront();
+   }
+
+   /**
+    Removes all elements (invoking their destructors).
+
+    @param freeStorage If false, the underlying array is not deallocated
+    (allowing fast push in the future), however, the size of the Queue
+    is reported as zero.
+    
+    */
+   void clear(bool freeStorage = true) {
+
+       FIND_ENDS;
+       
+       // Invoke the destructors on the elements
+       int i;
+       for (i = head; i < firstEnd; ++i) {
+           (data + i)->~T();
+       }
+
+       for (i = 0; i < secondEnd; ++i) {
+           (data + i)->~T();
+       }
+       
+       num = 0;
+       head = 0;
+       if (freeStorage) {
+           numAllocated = 0;
+           System::free(data);
+           data = NULL;
+       }
+   }
+
+   /** Clear without freeing the underlying array. */
+   void fastClear() {
+       clear(false);
+   }
+
+   /**
+    Assignment operator.
+    */
+   Queue& operator=(const Queue& other) {
+       clear();
+       _copy(other);
+       return *this;
+   }
+
+   /**
+    Number of elements in the queue.
+    */
+   inline int size() const {
+      return num;
+   }
+
+   /**
+    Number of elements in the queue.
+    */
+   inline int length() const {
+      return size();
+   }
+
+   /**
+    Performs bounds checks in debug mode
+    */
+   inline T& operator[](int n) {
+      debugAssert((n >= 0) && (n < num));
+      return data[index(n)];
+   }
+
+   /**
+    Performs bounds checks in debug mode
+    */
+    inline const T& operator[](int n) const {
+        debugAssert((n >= 0) && (n < num));
+        return data[index(n)];
+    }
+
+
+    /** Returns the back element */
+    inline const T& last() const {
+        return (*this)[size() - 1];
+    }
+
+    inline T& last() {
+        return (*this)[size() - 1];
+    }
+
+    /**
+     Returns true if the given element is in the queue.
+     */
+    bool contains(const T& e) const {
+        for (int i = 0; i < size(); ++i) {
+            if ((*this)[i] == e) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+   /**
+    Calls delete on all objects[0...size-1]
+    and sets the queue size to zero.
+    */
+    void deleteAll() {
+        FIND_ENDS;
+        
+        int i;
+    	for (i = 0; i < secondEnd; ++i) {
+            delete data[i];
+        }
+
+        for (i = head; i < firstEnd; ++i) {
+            delete data[i];
+        }
+        clear();
+    }
+};
+
+#undef FIND_ENDS
+
+}; // namespace
+
+#endif
diff --git a/externals/g3dlite/G3D/Random.h b/externals/g3dlite/G3D/Random.h
new file mode 100644
index 00000000000..54491d06f1b
--- /dev/null
+++ b/externals/g3dlite/G3D/Random.h
@@ -0,0 +1,139 @@
+/**
+ @file Random.h
+ 
+ @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+ 
+ @created 2009-01-02
+ @edited  2009-03-20
+
+ Copyright 2000-2009, Morgan McGuire.
+ All rights reserved.
+ */
+#ifndef G3D_Random_h
+#define G3D_Random_h
+
+#include "G3D/platform.h"
+#include "G3D/g3dmath.h"
+#include "G3D/GMutex.h"
+
+namespace G3D {
+
+/** Random number generator.
+
+    Threadsafe.
+
+    Useful for generating consistent random numbers across platforms
+    and when multiple threads are involved.
+
+    Uses the Fast Mersenne Twister (FMT-19937) algorithm.
+
+    On average, uniform() runs about 2x-3x faster than rand().
+
+    @cite http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/index.html
+    
+    On OS X, Random is about 10x faster than drand48() (which is
+    threadsafe) and 4x faster than rand() (which is not threadsafe).
+ */
+class Random {
+protected:
+
+    /** Constants (important for the algorithm; do not modify) */
+    enum {
+        N = 624,
+        M = 397,
+        R = 31,
+        U = 11,
+        S = 7,
+        T = 15,
+        L = 18,
+        A = 0x9908B0DF,
+        B = 0x9D2C5680,
+        C = 0xEFC60000};
+
+    /** 
+        Prevents multiple overlapping calls to generate(). 
+     */
+    Spinlock     lock;
+
+    /** State vector (these are the next N values that will be returned) */
+    uint32*      state;
+
+    /** Index into state */
+    int          index;
+
+    bool         m_threadsafe;
+
+    /** Generate the next N ints, and store them for readback later.
+        Called from bits() */
+    virtual void generate();
+
+    /** For subclasses.  The void* parameter is just to distinguish this from the
+        public constructor.*/
+    Random(void*);
+
+public:
+
+    /** \param threadsafe Set to false if you know that this random
+        will only be used on a single thread.  This eliminates the
+        lock and improves performance on some platforms.
+     */
+    Random(uint32 seed = 0xF018A4D2, bool threadsafe = true);
+
+    virtual ~Random();
+
+    /** Each bit is random.  Subclasses can choose to override just 
+       this method and the other methods will all work automatically. */
+    virtual uint32 bits();
+
+    /** Uniform random integer on the range [min, max] */
+    virtual int integer(int min, int max);
+
+    /** Uniform random float on the range [min, max] */
+    virtual inline float uniform(float low, float high) {
+        // We could compute the ratio in double precision here for
+        // about 1.5x slower performance and slightly better
+        // precision.
+        return low + (high - low) * ((float)bits() / (float)0xFFFFFFFFUL);
+    }
+
+    /** Uniform random float on the range [0, 1] */
+    virtual inline float uniform() {
+        // We could compute the ratio in double precision here for
+        // about 1.5x slower performance and slightly better
+        // precision.
+        const float norm = 1.0f / (float)0xFFFFFFFFUL;
+        return (float)bits() * norm;
+    }
+
+    /** Normally distributed reals. */
+    virtual float gaussian(float mean, float stdev);
+
+    /** Returns 3D unit vectors distributed according to 
+        a cosine distribution about the z-axis. */
+    virtual void cosHemi(float& x, float& y, float& z);
+
+    /** Returns 3D unit vectors distributed according to a cosine
+        power distribution (\f$ \cos^k \theta \f$) about
+        the z-axis. */
+    virtual void cosPowHemi(const float k, float& x, float& y, float& z);
+
+    /** Returns 3D unit vectors uniformly distributed on the 
+        hemisphere about the z-axis. */
+    virtual void hemi(float& x, float& y, float& z);
+
+    /** Returns 3D unit vectors uniformly distributed on the sphere */
+    virtual void sphere(float& x, float& y, float& z);
+
+    /**
+       A shared instance for when the performance and features but not
+       consistency of the class are desired.  It is slightly (10%)
+       faster to use a distinct instance than to use the common one.
+       
+       Threadsafe.
+    */
+    static Random& common();
+};
+
+}
+
+#endif
diff --git a/externals/g3dlite/G3D/Ray.h b/externals/g3dlite/G3D/Ray.h
new file mode 100644
index 00000000000..80df5828aff
--- /dev/null
+++ b/externals/g3dlite/G3D/Ray.h
@@ -0,0 +1,371 @@
+/**
+ @file Ray.h
+ 
+ Ray class
+ 
+ @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+ 
+ @created 2002-07-12
+ @edited  2009-06-29
+ */
+
+#ifndef G3D_Ray_h
+#define G3D_Ray_h
+
+#include "G3D/platform.h"
+#include "G3D/Vector3.h"
+#include "G3D/Triangle.h"
+
+namespace G3D {
+
+/**
+ A 3D Ray.
+ */
+class Ray {
+private:
+    friend class Intersect;
+
+	Vector3			m_origin;
+
+	/** Unit length */
+	Vector3			m_direction;
+
+	/** 1.0 / direction */
+	Vector3         m_invDirection;
+
+
+	// The following are for the "ray slope" optimization from
+	//  "Fast Ray / Axis-Aligned Bounding Box Overlap Tests using Ray Slopes" 
+	//  by Martin Eisemann, Thorsten Grosch, Stefan Müller and Marcus Magnor
+	//  Computer Graphics Lab, TU Braunschweig, Germany and
+	//  University of Koblenz-Landau, Germany*/
+	enum Classification {MMM, MMP, MPM, MPP, PMM, PMP, PPM, PPP, POO, MOO, OPO, OMO, OOP, OOM, OMM, OMP, OPM, OPP, MOM, MOP, POM, POP, MMO, MPO, PMO, PPO};	Classification classification;
+	// ray slope
+	float ibyj, jbyi, kbyj, jbyk, ibyk, kbyi;
+	// Precomputed components
+	float c_xy, c_xz, c_yx, c_yz, c_zx, c_zy;
+
+public:
+
+	void set(const Vector3& origin, const Vector3& direction);
+
+	inline const Vector3& origin() const {
+		return m_origin;
+	}
+
+	/** Unit direction vector. */
+	inline const Vector3& direction() const {
+		return m_direction;
+	}
+
+	/** Component-wise inverse of direction vector.  May have inf() components */
+	inline const Vector3& invDirection() const {
+		return m_invDirection;
+	}
+
+	inline Ray() {
+		set(Vector3::zero(), Vector3::unitX());
+	}
+
+	inline Ray(const Vector3& origin, const Vector3& direction) {
+		set(origin, direction);
+	}
+
+	Ray(class BinaryInput& b);
+
+	void serialize(class BinaryOutput& b) const;
+	void deserialize(class BinaryInput& b);
+
+    /**
+     Creates a Ray from a origin and a (nonzero) unit direction.
+     */
+    static Ray fromOriginAndDirection(const Vector3& point, const Vector3& direction) {
+        return Ray(point, direction);
+    }
+
+	/** Advances the origin along the direction by @a distance */
+	inline Ray bump(float distance) const {
+		return Ray(m_origin + m_direction * distance, m_direction);
+	}
+
+	/** Advances the origin along the @a bumpDirection by @a distance and returns the new ray*/
+	inline Ray bump(float distance, const Vector3& bumpDirection) const {
+		return Ray(m_origin + bumpDirection * distance, m_direction);
+	}
+
+    /**
+     Returns the closest point on the Ray to point.
+     */
+    Vector3 closestPoint(const Vector3& point) const {
+        float t = m_direction.dot(point - m_origin);
+        if (t < 0) {
+            return m_origin;
+        } else {
+            return m_origin + m_direction * t;
+        }
+    }
+
+    /**
+     Returns the closest distance between point and the Ray
+     */
+    float distance(const Vector3& point) const {
+        return (closestPoint(point) - point).magnitude();
+    }
+
+    /**
+     Returns the point where the Ray and plane intersect.  If there
+     is no intersection, returns a point at infinity.
+
+      Planes are considered one-sided, so the ray will not intersect
+      a plane where the normal faces in the traveling direction.
+    */
+    Vector3 intersection(const class Plane& plane) const;
+
+    /**
+     Returns the distance until intersection with the sphere or the (solid) ball bounded by the sphere.
+     Will be 0 if inside the sphere, inf if there is no intersection.
+
+     The ray direction is not normalized.  If the ray direction
+     has unit length, the distance from the origin to intersection
+     is equal to the time.  If the direction does not have unit length,
+     the distance = time * direction.length().
+
+     See also the G3D::CollisionDetection "movingPoint" methods,
+     which give more information about the intersection.
+
+     \param solid If true, rays inside the sphere immediately intersect (good for collision detection).  If false, they hit the opposite side of the sphere (good for ray tracing).
+     */
+    float intersectionTime(const class Sphere& sphere, bool solid = false) const;
+
+    float intersectionTime(const class Plane& plane) const;
+
+    float intersectionTime(const class Box& box) const;
+
+    float intersectionTime(const class AABox& box) const;
+
+    /**
+     The three extra arguments are the weights of vertices 0, 1, and 2
+     at the intersection point; they are useful for texture mapping
+     and interpolated normals.
+     */
+    float intersectionTime(
+        const Vector3& v0, const Vector3& v1, const Vector3& v2,
+        const Vector3& edge01, const Vector3& edge02,
+        double& w0, double& w1, double& w2) const;
+
+     /**
+     Ray-triangle intersection for a 1-sided triangle.  Fastest version.
+       @cite http://www.acm.org/jgt/papers/MollerTrumbore97/
+       http://www.graphics.cornell.edu/pubs/1997/MT97.html
+     */
+    inline float intersectionTime(
+        const Vector3& vert0,
+        const Vector3& vert1,
+        const Vector3& vert2,
+        const Vector3& edge01,
+        const Vector3& edge02) const;
+
+
+    inline float intersectionTime(
+        const Vector3& vert0,
+        const Vector3& vert1,
+        const Vector3& vert2) const {
+
+        return intersectionTime(vert0, vert1, vert2, vert1 - vert0, vert2 - vert0);
+    }
+
+
+    inline float intersectionTime(
+        const Vector3&  vert0,
+        const Vector3&  vert1,
+        const Vector3&  vert2,
+        double&         w0,
+        double&         w1,
+        double&         w2) const {
+
+        return intersectionTime(vert0, vert1, vert2, vert1 - vert0, vert2 - vert0, w0, w1, w2);
+    }
+
+    /* One-sided triangle 
+       */
+    inline float intersectionTime(const Triangle& triangle) const {
+        return intersectionTime(
+            triangle.vertex(0), triangle.vertex(1), triangle.vertex(2),
+            triangle.edge01(), triangle.edge02());
+    }
+
+    inline float intersectionTime(
+        const Triangle& triangle,
+        double&         w0,
+        double&         w1,
+        double&         w2) const {
+        return intersectionTime(triangle.vertex(0), triangle.vertex(1), triangle.vertex(2),
+            triangle.edge01(), triangle.edge02(), w0, w1, w2);
+    }
+
+    /** Refracts about the normal
+        using G3D::Vector3::refractionDirection
+        and bumps the ray slightly from the newOrigin. */
+    Ray refract(
+        const Vector3&  newOrigin,
+        const Vector3&  normal,
+        float           iInside,
+        float           iOutside) const;
+
+    /** Reflects about the normal
+        using G3D::Vector3::reflectionDirection
+        and bumps the ray slightly from
+        the newOrigin. */
+    Ray reflect(
+        const Vector3&  newOrigin,
+        const Vector3&  normal) const;
+};
+
+
+#define EPSILON 0.000001
+#define CROSS(dest,v1,v2) \
+          dest[0]=v1[1]*v2[2]-v1[2]*v2[1]; \
+          dest[1]=v1[2]*v2[0]-v1[0]*v2[2]; \
+          dest[2]=v1[0]*v2[1]-v1[1]*v2[0];
+
+#define DOT(v1,v2) (v1[0]*v2[0]+v1[1]*v2[1]+v1[2]*v2[2])
+
+#define SUB(dest,v1,v2) \
+          dest[0]=v1[0]-v2[0]; \
+          dest[1]=v1[1]-v2[1]; \
+          dest[2]=v1[2]-v2[2]; 
+
+inline float Ray::intersectionTime(
+    const Vector3& vert0,
+    const Vector3& vert1,
+    const Vector3& vert2,
+    const Vector3& edge1,
+    const Vector3& edge2) const {
+
+    (void)vert1;
+    (void)vert2;
+
+    // Barycenteric coords
+    float u, v;
+
+    float tvec[3], pvec[3], qvec[3];
+    
+    // begin calculating determinant - also used to calculate U parameter
+    CROSS(pvec, m_direction, edge2);
+    
+    // if determinant is near zero, ray lies in plane of triangle
+    const float det = DOT(edge1, pvec);
+    
+    if (det < EPSILON) {
+        return finf();
+    }
+    
+    // calculate distance from vert0 to ray origin
+    SUB(tvec, m_origin, vert0);
+    
+    // calculate U parameter and test bounds
+    u = DOT(tvec, pvec);
+    if ((u < 0.0f) || (u > det)) {
+        // Hit the plane outside the triangle
+        return finf();
+    }
+    
+    // prepare to test V parameter
+    CROSS(qvec, tvec, edge1);
+    
+    // calculate V parameter and test bounds
+    v = DOT(m_direction, qvec);
+    if ((v < 0.0f) || (u + v > det)) {
+        // Hit the plane outside the triangle
+        return finf();
+    }
+    
+
+    // Case where we don't need correct (u, v):
+    const float t = DOT(edge2, qvec);
+    
+    if (t >= 0.0f) {
+        // Note that det must be positive
+        return t / det;
+    } else {
+        // We had to travel backwards in time to intersect
+        return finf();
+    }
+}
+
+
+inline float Ray::intersectionTime(
+    const Vector3&  vert0,
+    const Vector3&  vert1,
+    const Vector3&  vert2,
+    const Vector3&  edge1,
+    const Vector3&  edge2,
+    double&         w0,
+    double&         w1,
+    double&         w2) const {
+
+    (void)vert1;
+    (void)vert2;
+
+    // Barycenteric coords
+    float u, v;
+
+    float tvec[3], pvec[3], qvec[3];
+
+    // begin calculating determinant - also used to calculate U parameter
+    CROSS(pvec, m_direction, edge2);
+    
+    // if determinant is near zero, ray lies in plane of triangle
+    const float det = DOT(edge1, pvec);
+    
+    if (det < EPSILON) {
+        return finf();
+    }
+    
+    // calculate distance from vert0 to ray origin
+    SUB(tvec, m_origin, vert0);
+    
+    // calculate U parameter and test bounds
+    u = DOT(tvec, pvec);
+    if ((u < 0.0f) || (u > det)) {
+        // Hit the plane outside the triangle
+        return finf();
+    }
+    
+    // prepare to test V parameter
+    CROSS(qvec, tvec, edge1);
+    
+    // calculate V parameter and test bounds
+    v = DOT(m_direction, qvec);
+    if ((v < 0.0f) || (u + v > det)) {
+        // Hit the plane outside the triangle
+        return finf();
+    }
+    
+    float t = DOT(edge2, qvec);
+    
+    if (t >= 0) {
+        const float inv_det = 1.0f / det;
+        t *= inv_det;
+        u *= inv_det;
+        v *= inv_det;
+
+        w0 = (1.0f - u - v);
+        w1 = u;
+        w2 = v;
+
+        return t;
+    } else {
+        // We had to travel backwards in time to intersect
+        return finf();
+    }
+}
+
+#undef EPSILON
+#undef CROSS
+#undef DOT
+#undef SUB
+
+}// namespace
+
+#endif
diff --git a/externals/g3dlite/G3D/Rect2D.h b/externals/g3dlite/G3D/Rect2D.h
new file mode 100644
index 00000000000..2fb58c50465
--- /dev/null
+++ b/externals/g3dlite/G3D/Rect2D.h
@@ -0,0 +1,417 @@
+/**
+  @file Rect2D.h
+ 
+  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+ 
+  @created 2003-11-13
+  @created 2009-11-16
+
+  Copyright 2000-2009, Morgan McGuire.
+  All rights reserved.
+ */
+
+#ifndef G3D_Rect2D_h
+#define G3D_Rect2D_h
+
+// Linux defines this as a macro
+#ifdef border
+#undef border
+#endif
+
+#include "G3D/platform.h"
+#include "G3D/Array.h"
+#include "G3D/Vector2.h"
+
+#ifdef _MSC_VER
+// Turn off "conditional expression is constant" warning; MSVC generates this
+// for debug assertions in inlined methods.
+#   pragma warning (disable : 4127)
+#endif
+
+
+namespace G3D {
+
+class Any;
+
+/**
+ If you are using this class for pixel rectangles, keep in mind that the last
+ pixel you can draw to is at x0() + width() - 1.
+ */
+class Rect2D {
+private:
+    Vector2 min, max;
+
+    /**
+     Returns true if the whole polygon is clipped.
+     @param p Value of the point
+     @param axis Index [0 or 1] of the axis to clip along?
+     @param clipGreater Are we clipping greater than or less than the line?
+     @param inPoly Polygon being clipped
+     @param outPoly The clipped polygon
+     */
+    template
+    static bool clipSide2D(
+        const float p, bool clipGreater, int axis, 
+        const Array& inPoly, Array& outPoly) {
+
+        outPoly.clear();
+        int i0 = -1;
+
+        Vector2 pt1;
+        bool c1 = true;
+
+        float negate = clipGreater ? -1 : 1;
+
+        // Find a point that is not clipped
+        for (i0 = 0; (i0 < inPoly.length()) && c1; ++i0) {
+            pt1 = inPoly[i0];       
+            c1  = (negate * pt1[axis]) < (negate * p);
+        }
+
+        // We incremented i0 one time to many
+        --i0;
+
+        if (c1) {
+            // We could not find an unclipped point
+            return true;
+        }
+
+        outPoly.append(pt1);
+
+        // for each point in inPoly,
+        //     if the point is outside the side and the previous one was also outside, continue
+        //     if the point is outside the side and the previous one was inside, cut the line
+        //     if the point is inside the side and the previous one was also inside, append the points
+        //     if the point is inside the side and the previous one was outside, cut the line    
+        for (int i = 1; i <= inPoly.length(); ++i) {
+            T pt2 = inPoly[(i + i0) % inPoly.length()];
+            bool    c2  = (negate * pt2[axis]) < (negate * p);
+
+            if (c1 ^ c2) {
+
+                if (!c1 && c2 && (i > 1)) {
+                    // Unclipped to clipped trasition and not the first iteration
+                    outPoly.append(pt1);
+                }
+
+                // only one point is clipped, find where the line crosses the clipping plane
+
+
+                float alpha;
+                if (pt2[axis] == pt1[axis]) {
+                    alpha = 0;
+                } else {
+                    alpha = (p - pt1[axis]) / (pt2[axis] - pt1[axis]);
+                }
+                outPoly.append(pt1.lerp(pt2, alpha));
+            } else if (! (c1 || c2) && (i != 1)) {
+                // neither point is clipped (don't do this the first time 
+                // because we appended the first pt before the loop)
+                outPoly.append(pt1);
+            }
+        
+            pt1 = pt2;
+            c1 = c2;
+        }
+
+        return false;
+    }
+
+public:
+
+    /** \param any Must either Rect2D::xywh(#, #, #, #) or Rect2D::xyxy(#, #, #, #)*/
+    Rect2D(const Any& any);
+    
+    /** Converts the Rect2D to an Any. */
+    operator Any() const;
+
+    Rect2D() : min(0, 0), max(0, 0) {}
+
+    /** Creates a rectangle at 0,0 with the given width and height*/
+    Rect2D(const Vector2& wh) : min(0, 0), max(wh.x, wh.y) {}
+
+    /** Computes a rectangle that contains both @a a and @a b.  
+        Note that even if @a or @b has zero area, its origin will be included.*/
+    Rect2D(const Rect2D& a, const Rect2D& b) {
+        min = a.min.min(b.min);
+        max = a.max.max(b.max);
+    }
+
+    /** @brief Uniformly random point on the interior */
+    Vector2 randomPoint() const {
+        return Vector2(uniformRandom(0, max.x - min.x) + min.x,
+                       uniformRandom(0, max.y - min.y) + min.y);
+    }
+
+    float width() const {
+        return max.x - min.x;
+    }
+
+    float height() const {
+        return max.y - min.y;
+    }
+
+    float x0() const {
+        return min.x;
+    }
+
+    float x1() const {
+        return max.x;
+    }
+
+    float y0() const {
+        return min.y;
+    }
+
+    float y1() const {
+        return max.y;
+    }
+
+    /** Min, min corner */
+    Vector2 x0y0() const {
+        return min;
+    }
+
+    Vector2 x1y0() const {
+        return Vector2(max.x, min.y);
+    }
+
+    Vector2 x0y1() const {
+        return Vector2(min.x, max.y);
+    }
+
+    /** Max,max corner */
+    Vector2 x1y1() const {
+        return max;
+    }
+
+    /** Width and height */
+    Vector2 wh() const {
+        return max - min;
+    }
+
+    Vector2 center() const {
+        return (max + min) * 0.5;
+    }
+
+    float area() const {
+        return width() * height();
+    }
+
+    bool isFinite() const {
+        return (min.isFinite() && max.isFinite());
+    }
+
+    Rect2D lerp(const Rect2D& other, float alpha) const {
+        Rect2D out;
+        
+        out.min = min.lerp(other.min, alpha);
+        out.max = max.lerp(other.max, alpha);
+
+        return out;
+    }
+
+    static Rect2D xyxy(float x0, float y0, float x1, float y1) {
+        Rect2D r;
+        
+        r.min.x = G3D::min(x0, x1);
+        r.min.y = G3D::min(y0, y1);
+        r.max.x = G3D::max(x0, x1);
+        r.max.y = G3D::max(y0, y1);
+
+        return r;
+    }
+
+    static Rect2D xyxy(const Vector2& v0, const Vector2& v1) {
+        Rect2D r;
+
+        r.min = v0.min(v1);
+        r.max = v0.max(v1);
+
+        return r;
+    }
+
+    static Rect2D xywh(float x, float y, float w, float h) {
+        return xyxy(x, y, x + w, y + h);
+    }
+
+    static Rect2D xywh(const Vector2& v, const Vector2& w) {
+        return xyxy(v.x, v.y, v.x + w.x, v.y + w.y);
+    }
+
+    /** Constructs a Rect2D with infinite boundaries.
+        Use isFinite() to test either min or max.
+     */
+    static Rect2D inf() {
+        return xyxy(Vector2::inf(), Vector2::inf());
+    }
+
+    bool contains(const Vector2& v) const {
+        return (v.x >= min.x) && (v.y >= min.y) && (v.x <= max.x) && (v.y <= max.y);
+    }
+
+    bool contains(const Rect2D& r) const {
+        return (min.x <= r.min.x) && (min.y <= r.min.y) &&
+               (max.x >= r.max.x) && (max.y >= r.max.y);
+    }
+
+    /** True if there is non-zero area to the intersection between @a this and @a r.
+        Note that two rectangles that are adjacent do not intersect because there is
+        zero area to the overlap, even though one of them "contains" the corners of the other.*/
+    bool intersects(const Rect2D& r) const {
+        return (min.x < r.max.x) && (min.y < r.max.y) &&
+               (max.x > r.min.x) && (max.y > r.min.y);
+    }
+
+    /** Like intersection, but counts the adjacent case as touching. */
+    bool intersectsOrTouches(const Rect2D& r) const {
+        return (min.x <= r.max.x) && (min.y <= r.max.y) &&
+               (max.x >= r.min.x) && (max.y >= r.min.y);
+    }
+
+    Rect2D operator*(float s) const {
+        return xyxy(min.x * s, min.y * s, max.x * s, max.y * s);
+    }
+
+    Rect2D operator/(float s) const {
+        return xyxy(min / s, max / s);
+    }
+
+    Rect2D operator/(const Vector2& s) const {
+        return xyxy(min / s, max / s);
+    }
+
+    Rect2D operator+(const Vector2& v) const {
+        return xyxy(min + v, max + v);
+    }
+
+    Rect2D operator-(const Vector2& v) const {
+        return xyxy(min - v, max - v);
+    }
+
+    bool operator==(const Rect2D& other) const {
+        return (min == other.min) && (max == other.max);
+    }
+
+    bool operator!=(const Rect2D& other) const {
+        return (min != other.min) || (max != other.max);
+    }
+
+    /** Returns the corners in the order: (min,min), (max,min), (max,max), (min,max). */
+    Vector2 corner(int i) const {
+        debugAssert(i >= 0 && i < 4);
+        switch (i & 3) {
+        case 0:
+            return Vector2(min.x, min.y);
+        case 1:
+            return Vector2(max.x, min.y);
+        case 2:
+            return Vector2(max.x, max.y);
+        case 3:
+            return Vector2(min.x, max.y);
+        default:
+            // Should never get here
+            return Vector2(0, 0);
+        }
+    }
+
+
+    /** @deprecated  
+     @sa expand() */
+    Rect2D border(float delta) const {
+        return Rect2D::xywh(x0() + delta, 
+                     y0() + delta, 
+                     width() - 2.0f * delta, 
+                     height() - 2.0f * delta);
+    }
+
+    /** Returns a new Rect2D that is bigger/smaller by the specified amount 
+        (negative is shrink.) */
+    Rect2D expand(float delta) const {
+        float newX = x0() - delta;
+        float newY = y0() - delta;
+        float newW = width() + 2.0f * delta;
+        float newH = height() + 2.0f * delta;
+
+        if (newW < 0.0f) {
+            newX = (x0() + width()) / 2.0f;
+            newW = 0.0f;
+        }
+
+        if (newH < 0.0f) {
+            newY = (y0() + height()) / 2.0f;
+            newH = 0.0f;
+        }
+        return Rect2D::xywh(newX, newY, newW, newH);
+    }
+
+    /** 
+     Clips so that the rightmost point of the outPoly is at rect.x1 (e.g. a 800x600 window produces
+     rightmost point 799, not 800).  The results are suitable for pixel rendering if iRounded.
+     Templated so that it will work for Vector2,3,4 (the z and w components are interpolated linearly).
+     The template parameter must define T.lerp and contain x and y components.
+
+     If the entire polygon is clipped by a single side, the result will be empty.
+     The result might also have zero area but not be empty.
+     */
+    template
+    void clip(const Array& inPoly, Array& outPoly) const {
+
+        const bool greaterThan = true;
+        const bool lessThan    = false;
+        const int  X = 0;
+        const int  Y = 1;
+
+        Array temp;
+
+        bool entirelyClipped =
+          clipSide2D(x0(), lessThan,    X,    inPoly,  temp)    ||
+          clipSide2D(x1(), greaterThan, X,    temp,    outPoly) ||
+          clipSide2D(y0(), lessThan,    Y,    outPoly, temp)    || 
+          clipSide2D(y1(), greaterThan, Y,    temp,    outPoly);
+
+        if (entirelyClipped) {
+            outPoly.clear();
+        }
+    }
+
+
+    /** Returns the largest, centered Rect2D that can fit inside this
+        while maintaining the aspect ratio of x:y.  Convenient for
+        displaying images in odd-shaped windows.
+    */
+    Rect2D largestCenteredSubRect(float ww, float hh) const {
+        float textureAspect = hh / ww;
+        float viewAspect = height() / width();
+
+        if (viewAspect > textureAspect) {
+            // The view is too tall
+            float h = width() * textureAspect;
+            float y = (height() - h) / 2;
+            return Rect2D::xywh(0, y, width(), h) + corner(0);
+        } else {
+            // The view is too wide
+            float w = height() / textureAspect;
+            float x = (width() - w) / 2;
+            return Rect2D::xywh(x, 0, w, height()) + corner(0);
+        }
+    }
+
+    /**
+     Returns the overlap region between the two rectangles.  This may have zero area
+     if they do not intersect.  See the two-Rect2D constructor for a way to compute
+     a union-like rectangle.
+     */
+    Rect2D intersect(const Rect2D& other) const {
+        if (intersects(other)) {
+            return Rect2D::xyxy(min.max(other.min), max.min(other.max));
+        }else{
+            return Rect2D::xywh(0, 0, 0, 0);
+        }
+    }
+};
+
+typedef Rect2D AABox2D;
+}
+
+#endif
diff --git a/externals/g3dlite/G3D/ReferenceCount.h b/externals/g3dlite/G3D/ReferenceCount.h
new file mode 100644
index 00000000000..84591c6d8e5
--- /dev/null
+++ b/externals/g3dlite/G3D/ReferenceCount.h
@@ -0,0 +1,570 @@
+/**
+  @file ReferenceCount.h
+
+  Reference Counting Garbage Collector for C++
+
+  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+  @cite Adapted and extended from Justin Miller's "RGC" class that appeared in BYTE magazine.
+  @cite See also http://www.jelovic.com/articles/cpp_without_memory_errors_slides.htm
+
+  @created 2001-10-23
+  @edited  2009-04-25
+*/
+#ifndef G3D_ReferenceCount_h
+#define G3D_ReferenceCount_h
+
+#include "G3D/platform.h"
+#include "G3D/debug.h"
+#include "G3D/AtomicInt32.h"
+
+namespace G3D {
+
+#ifdef _MSC_VER
+// Turn off "conditional expression is constant" warning; MSVC generates this
+// for debug assertions in inlined methods.
+#   pragma warning (disable : 4127)
+#endif
+
+/** Base class for WeakReferenceCountedPointer */
+class _WeakPtr {
+public:
+    inline virtual ~_WeakPtr() {}
+
+protected:
+    friend class ReferenceCountedObject;
+
+    /** Called by ReferenceCountedObject to tell a weak pointer that its underlying object was collected. */
+    virtual void objectCollected() = 0;
+};
+
+/** Used internally by ReferenceCountedObject */
+class _WeakPtrLinkedList {
+public:
+    _WeakPtr*                   weakPtr;
+    _WeakPtrLinkedList*         next;
+
+    inline _WeakPtrLinkedList() : weakPtr(NULL), next(NULL) {}
+
+    /** Inserts this node into the head of the list that previously had n as its head. */
+    inline _WeakPtrLinkedList(_WeakPtr* p, _WeakPtrLinkedList* n) : weakPtr(p), next(n) {}
+};
+
+/**
+ Objects that are reference counted inherit from this.  Subclasses 
+ must have a public destructor (the default destructor is fine)
+ and publicly inherit ReferenceCountedObject.
+
+ Multiple inheritance from a reference counted object is dangerous-- use 
+ at your own risk.
+
+ ReferenceCountedPointer and ReferenceCountedObject are threadsafe.
+ You can create and drop references on multiple threads without
+ violating integrity.  WeakReferenceCountedPointer is not
+ threadsafe.  Introducing a weak pointer destroys all thread safety,
+ even for strong pointers to the same object (this is inherent in the
+ design of the class; we cannot fix it without slowing down the
+ performance of reference counted objects.)
+
+ Usage Example
+
+  
+
+class Foo : public G3D::ReferenceCountedObject {
+public:
+    int x;
+};
+
+class Bar : public Foo {};
+
+typedef G3D::ReferenceCountedPointer FooRef;
+typedef G3D::WeakReferenceCountedPointer WeakFooRef;
+typedef G3D::ReferenceCountedPointer BarRef;
+
+
+int main(int argc, char *argv[]) {
+
+    WeakFooRef x;
+
+    {
+        FooRef a = new Foo();
+
+        // Reference count == 1
+
+        x = a;
+        // Weak references do not increase count
+
+        {
+            FooRef b = a;
+            // Reference count == 2
+        }
+
+        // Reference count == 1
+    }
+    // No more strong references; object automatically deleted.
+    // x is set to NULL automatically.
+
+    // Example of using dynamic cast on reference counted objects
+    BarRef b = new Bar();
+
+    // No cast needed to go down the heirarchy.
+    FooRef f = b;
+
+    // We can't cast the reference object because it is a class.
+    // Instead we must extract the pointer and cast that:
+    b = dynamic_cast(&*f);
+
+    return 0;
+}
+

+ */
+class ReferenceCountedObject {
+public:
+
+    /**
+     The long name is to keep this from accidentally conflicting with
+     a subclass's variable name.  Do not use or explicitly manipulate
+     this value--its type may change in the future and is not part
+     of the supported API.
+     */
+    AtomicInt32                 ReferenceCountedObject_refCount;
+ 
+    /**
+     Linked list of all weak pointers that reference this (some may be
+     on the stack!).  Do not use or explicitly manipulate this value.
+     */
+    _WeakPtrLinkedList*         ReferenceCountedObject_weakPointer;
+
+protected:
+
+    ReferenceCountedObject();
+
+public:
+
+    /** Automatically called immediately before the object is deleted. 
+        This is not called from the destructor because it needs to be invoked
+        before the subclass destructor.
+      */
+    void ReferenceCountedObject_zeroWeakPointers();
+
+    virtual ~ReferenceCountedObject();
+
+
+    /**
+      Note: copies will initially start out with 0 
+      references and 0 weak references like any other object.
+     */
+    ReferenceCountedObject(const ReferenceCountedObject& notUsed);
+
+    ReferenceCountedObject& operator=(const ReferenceCountedObject& other);
+};
+
+
+
+/**
+ Use ReferenceCountedPointer in place of T* in your program.
+ T must subclass ReferenceCountedObject.
+@deprecated To be replaced by boost::shared_ptr in 7.0
+ */
+template 
+class ReferenceCountedPointer {
+private:
+
+    T*           m_pointer;
+
+public:
+    typedef T element_type;
+
+    inline T* pointer() const {
+        return m_pointer;
+    }
+
+private:
+
+    /** Nulls out the pointer and drops a reference. If the reference
+        count hits zero. */
+    void zeroPointer() {
+        if (m_pointer != NULL) {
+
+            ReferenceCountedObject* pointer = ((ReferenceCountedObject*)m_pointer);
+            debugAssert(G3D::isValidHeapPointer(m_pointer));
+            debugAssertM(pointer->ReferenceCountedObject_refCount.value() > 0,
+                        "Dangling reference detected.");
+
+            // Only delete if this instance caused the count to hit
+            // exactly zero.  If there is a race condition, the value
+            // may be zero after decrement returns, but only one of
+            // the instances will get a zero return value.
+            if (pointer->ReferenceCountedObject_refCount.decrement() == 0) {
+                // We held the last reference, so delete the object.
+                // This test is threadsafe because there is no way for
+                // the reference count to increase after the last
+                // reference was dropped (assuming the application does
+                // not voilate the class abstraction).
+                //debugPrintf("  delete 0x%x\n", m_pointer);
+
+                // We must zero the weak pointers *before* deletion in case there
+                // are cycles of weak references.
+                // Note that since there are no strong references at this point,
+                // it is perfectly fair to zero the weak pointers anyway.
+                pointer->ReferenceCountedObject_zeroWeakPointers();
+                delete pointer;
+            }
+
+            m_pointer = NULL;
+        }
+    }
+
+    /** Non-atomic (except for the referencec increment).  Can only be
+        called in contexts like the copy constructor or initial
+        constructor where it is known that the reference count will
+        not hit zero on some other thread. */
+    void setPointer(T* x) {
+        if (x != m_pointer) {
+            zeroPointer();
+
+            if (x != NULL) {
+                debugAssert(G3D::isValidHeapPointer(x));
+
+		        m_pointer = x;
+
+                // Note that the ref count can be zero if this is the
+                // first pointer to it
+                ReferenceCountedObject* pointer = (ReferenceCountedObject*)m_pointer;
+                debugAssertM(pointer->ReferenceCountedObject_refCount.value() >= 0, 
+                             "Negative reference count detected.");
+                pointer->ReferenceCountedObject_refCount.increment();
+            }
+        }
+    }
+
+public:      
+
+    inline ReferenceCountedPointer() : m_pointer(NULL) {}
+
+    /**
+      Allow silent cast to the base class.
+    
+      
+        SubRef  s = new Sub();
+        BaseRef b = s;
+      

+
+      i.e., compile-time subtyping rule 
+      RCP<T> <: RCP<S> if T <: S
+     */
+    template 
+    inline ReferenceCountedPointer(const ReferenceCountedPointer& p) : 
+        m_pointer(NULL) {
+        setPointer(p.pointer());
+    }
+
+#   if (! defined(MSC_VER) || (MSC_VER >= 1300))
+    /**
+      Explicit cast to a subclass.  Acts like dynamic cast; the result will be NULL if
+      the cast cannot succeed.  Not supported on VC6.
+      
+        SubRef  s = new Sub();
+        BaseRef b = s;
+        s = b.downcast();   // Note that the template argument is the object type, not the pointer type.
+      

+      */
+    template 
+    ReferenceCountedPointer downcast() {
+        return ReferenceCountedPointer(dynamic_cast(m_pointer));
+    }
+
+    template 
+    const ReferenceCountedPointer downcast() const {
+        return ReferenceCountedPointer(dynamic_cast(m_pointer));
+    }
+#   endif
+
+    // We need an explicit version of the copy constructor as well or 
+    // the default copy constructor will be used.
+    inline ReferenceCountedPointer(const ReferenceCountedPointer& p) : m_pointer(NULL) {
+        setPointer(p.m_pointer);
+    }
+
+    /** Allows construction from a raw pointer.  That object will thereafter be
+        reference counted -- do not call delete on it.
+
+        Use of const allows downcast on const references */
+    inline ReferenceCountedPointer(const T* p) : m_pointer(NULL) { 
+        // only const constructor is defined to remove ambiguity using NULL
+        setPointer(const_cast(p)); 
+    }
+
+    
+    inline ~ReferenceCountedPointer() {
+        zeroPointer();
+    }
+  
+    inline size_t hashCode() const {
+        return reinterpret_cast(m_pointer);;
+    }
+
+    inline const ReferenceCountedPointer& operator=(const ReferenceCountedPointer& p) {
+        setPointer(p.m_pointer);
+        return *this;
+    }
+
+    inline ReferenceCountedPointer& operator=(T* p) {
+        setPointer(p);
+        return *this;
+    }
+
+    inline bool operator==(const ReferenceCountedPointer& y) const { 
+        return (m_pointer == y.m_pointer); 
+    }
+
+    inline bool operator!=(const ReferenceCountedPointer& y) const { 
+        return (m_pointer != y.m_pointer); 
+    }
+
+    bool operator < (const ReferenceCountedPointer& y) const {
+        return (m_pointer < y.m_pointer); 
+    }
+    
+    bool operator > (const ReferenceCountedPointer& y) const {
+        return (m_pointer > y.m_pointer); 
+    }
+    
+    bool operator <= (const ReferenceCountedPointer& y) const {
+        return (m_pointer <= y.m_pointer); 
+    }
+    
+    bool operator >= (const ReferenceCountedPointer& y) const {
+        return (m_pointer >= y.m_pointer); 
+    }
+    
+    inline T& operator*() const {
+        debugAssertM(m_pointer != NULL, "Dereferenced a NULL ReferenceCountedPointer");
+        return (*m_pointer);
+    }
+
+    inline T* operator->() const {
+        debugAssertM(m_pointer != NULL, "Dereferenced a NULL ReferenceCountedPointer");
+        return m_pointer;
+    }
+
+    inline bool isNull() const {
+        return (m_pointer == NULL);
+    }
+
+    inline bool notNull() const {
+        return (m_pointer != NULL);
+    }
+
+    // TODO: distinguish between last strong and last any pointer
+    /**
+     Returns true if this is the last reference to an object.
+     Useful for flushing memoization caches-- a cache that holds the last
+     reference is unnecessarily keeping an object alive.
+
+     Not threadsafe.
+
+     @deprecated Use WeakReferenceCountedPointer for caches
+     */
+    inline int isLastReference() const {
+        return (m_pointer->ReferenceCountedObject_refCount.value() == 1);
+    }
+};
+
+
+/**
+ A weak pointer allows the object it references to be garbage collected.
+ Weak pointers are commonly used in caches, where it is important to hold
+ a pointer to an object without keeping that object alive solely for the
+ cache's benefit (i.e., the object can be collected as soon as all
+ pointers to it outside the cache are gone).  They are also convenient
+ for adding back-pointers in tree and list structures.
+
+ Weak pointers may become NULL at any point (when their target is collected).
+ Therefore the only way to reference the target is to convert to a strong
+ pointer and then check that it is not NULL.
+
+@deprecated To be replaced by boost::weak_ptr in 7.0
+ */
+template 
+class WeakReferenceCountedPointer : public _WeakPtr {
+private:
+
+    /** NULL if the object has been collected. */
+    T*          pointer;
+
+public:
+    /**
+      Creates a strong pointer, which prevents the object from being
+      garbage collected.  The strong pointer may be NULL, which means
+      that the underlying.
+      */
+    //  There is intentionally no way to check if the
+    //  WeakReferenceCountedPointer has a null reference without
+    //  creating a strong pointer since there is no safe way to use
+    //  that information-- the pointer could be collected by a
+    //  subsequent statement.
+    ReferenceCountedPointer createStrongPtr() const {
+        // TODO: What if the object's destructor is called while we
+        // are in this method?
+        return ReferenceCountedPointer(pointer);
+    }
+
+private:
+
+    /** Thread issues: safe because this is only called when another
+        object is guaranteed to keep p alive for the duration of this
+        call. */
+    void setPointer(T* p) {
+        // TODO: must prevent the object from being collected while in
+        // this method
+
+        zeroPointer();
+        pointer = p;
+
+        if (pointer != NULL) {
+            // TODO: threadsafe: must update the list atomically
+
+            // Add myself to the head of my target's list of weak pointers
+            _WeakPtrLinkedList* head = 
+                new _WeakPtrLinkedList
+                (this, 
+                 pointer->ReferenceCountedObject_weakPointer);
+
+            pointer->ReferenceCountedObject_weakPointer = head;
+        } else {
+
+        }
+    }
+
+
+    /** 
+        Removes this from its target's list of weak pointers.  Called
+        when the weak pointer goes out of scope.
+
+        Thread issues: depends on the thread safety of createStrongPtr.
+     */
+    void zeroPointer() {
+        // Grab a strong reference to prevent the object from being collected while we
+        // are traversing its list.
+        ReferenceCountedPointer strong = createStrongPtr();
+
+        // If the following test fails then the object was collected before we
+        // reached it.
+        if (strong.notNull()) {
+            debugAssertM(((ReferenceCountedObject*)pointer)->ReferenceCountedObject_weakPointer != NULL,
+                "Weak pointer exists without a backpointer from the object.");
+            
+            // Remove myself from my target's list of weak pointers
+            _WeakPtrLinkedList** node = &((ReferenceCountedObject*)pointer)->ReferenceCountedObject_weakPointer;
+            while ((*node)->weakPtr != this) {
+                node = &((*node)->next);
+                debugAssertM(*node != NULL, 
+                    "Weak pointer exists without a backpointer from the object (2).");
+            }
+
+            // Node must now point at the node for me.  Remove node and
+            // close the linked list behind it.
+            _WeakPtrLinkedList* temp = *node;
+            *node = temp->next;
+            
+            // Now delete the node corresponding to me
+            delete temp;
+        }
+
+        pointer = NULL;
+    }
+
+public:
+
+    WeakReferenceCountedPointer() : pointer(0) {}
+
+    /**
+      Allow compile time subtyping rule 
+      RCP<T> <: RCP<S> if T <: S
+     */
+    template 
+    inline WeakReferenceCountedPointer(const WeakReferenceCountedPointer& p) : pointer(0) {
+        // Threadsafe: the object cannot be collected while the other pointer exists.
+        setPointer(p.pointer);
+    }
+
+    template 
+    inline WeakReferenceCountedPointer(const ReferenceCountedPointer& p) : pointer(0) {
+        // Threadsafe: the object cannot be collected while the other
+        // pointer exists.
+        setPointer(p.pointer());
+    }
+
+    // Gets called a *lot* when weak pointers are on the stack
+    WeakReferenceCountedPointer(
+        const WeakReferenceCountedPointer& weakPtr) : pointer(0) {
+        setPointer(weakPtr.pointer);
+    }
+
+    WeakReferenceCountedPointer(
+        const ReferenceCountedPointer& strongPtr) : pointer(0) {
+        setPointer(strongPtr.pointer());
+    }
+
+    ~WeakReferenceCountedPointer() {
+        zeroPointer();
+    }
+
+    WeakReferenceCountedPointer& operator=(const WeakReferenceCountedPointer& other) {
+        // Threadsafe: the object cannot be collected while the other pointer exists.
+
+        // I now point at other's target
+        setPointer(other.pointer);
+
+        return *this;
+    }
+
+    WeakReferenceCountedPointer& operator=(const ReferenceCountedPointer& other) {
+
+        // Threadsafe: the object cannot be collected while the other pointer exists.
+
+        // I now point at other's target
+        setPointer(other.pointer());
+
+        return *this;
+    }
+
+    bool operator==(const WeakReferenceCountedPointer& other) const {
+        return pointer == other.pointer;
+    }
+
+    bool operator!=(const WeakReferenceCountedPointer& other) const {
+        return pointer != other.pointer;
+    }
+
+    bool operator < (const WeakReferenceCountedPointer& y) const {
+        return (pointer < y.pointer); 
+    }
+
+    bool operator > (const WeakReferenceCountedPointer& y) const {
+        return (pointer > y.pointer); 
+    }
+    
+    bool operator <= (const WeakReferenceCountedPointer& y) const {
+        return (pointer <= y.pointer); 
+    }
+    
+    bool operator >= (const ReferenceCountedPointer& y) const {
+        return (pointer >= y.pointer); 
+    }
+    
+protected:
+
+    /** Invoked by the destructor on ReferenceCountedPointer. */
+    void objectCollected() {
+        debugAssertM(pointer != NULL,
+                     "Removed a weak pointer twice.");
+        pointer = NULL;
+    }
+
+};
+
+} // namespace
+
+#endif
+
diff --git a/externals/g3dlite/G3D/RegistryUtil.h b/externals/g3dlite/G3D/RegistryUtil.h
new file mode 100644
index 00000000000..4b47be5f4bd
--- /dev/null
+++ b/externals/g3dlite/G3D/RegistryUtil.h
@@ -0,0 +1,97 @@
+/**
+ @file RegistryUtil.h
+
+ @created 2006-04-06
+ @edited  2006-04-06
+
+ Copyright 2000-2006, Morgan McGuire.
+ All rights reserved.
+*/
+
+#ifndef G3D_REGISTRYUTIL_H
+#define G3D_REGISTRYUTIL_H
+
+#include "G3D/platform.h"
+#include "G3D/g3dmath.h"
+
+// This file is only used on Windows
+#ifdef G3D_WIN32
+
+#include 
+
+namespace G3D {
+
+/** 
+    Provides generalized Windows registry querying.
+
+    All key names are one string in the format:
+        "[base key]\[sub-keys]"
+
+    A value must now be provided for every query.
+    An empty value string will use the (Default) value.
+
+    [base key] can be any of the following:
+        HKEY_CLASSES_ROOT
+        HKEY_CURRENT_CONFIG
+        HKEY_CURRENT_USER
+        HKEY_LOCAL_MACHINE
+        HKEY_PERFORMANCE_DATA
+        HKEY_PERFORMANCE_NLSTEXT
+        HKEY_PERFORMANCE_TEXT
+        HKEY_USERS
+
+    valueExists() should be used to validate a key+value before reading or writing
+    to ensure that a debug assert or false return is for a different error during 
+    reads and writes.
+
+    All read and write calls will assert when a key will not open for reasons other
+    that it does not exist. All read and write calls will assert when the value cannot
+    be read or written for any reason.
+*/
+class RegistryUtil {
+
+public:
+    /** returns true if the key exists and the current user has permission to read */
+    static bool keyExists(const std::string& key);
+
+    /** returns true if the key exists and the current user has permission to read */
+    static bool valueExists(const std::string& key, const std::string& value);
+
+    /** returns false if the key could not be read for any reason. */
+    static bool readInt32(const std::string& key, const std::string& value, int32& data);
+
+    /** 
+      Reads an arbitrary amount of data from a binary registry key.
+      returns false if the key could not be read for any reason.
+    
+      @beta
+      @param data pointer to the output buffer of sufficient size. Pass NULL as data in order to have available data size returned in dataSize.
+      @param dataSize size of the output buffer.  When NULL is passed for data, contains the size of available data on successful return.
+    */
+    static bool readBytes(const std::string& key, const std::string& value, uint8* data, uint32& dataSize);
+
+    /** returns false if the key could not be read for any reason. */
+    static bool readString(const std::string& key, const std::string& value, std::string& data);
+
+    /** returns false if the key could not be written for any reason. */
+    static bool writeInt32(const std::string& key, const std::string& value, int32 data);
+
+    /** 
+      Writes an arbitrary amount of data to a binary registry key.
+      returns false if the key could not be written for any reason.
+    
+      @param data pointer to the input buffer
+      @param dataSize size of the input buffer that should be written
+    */
+    static bool writeBytes(const std::string& key, const std::string& value, const uint8* data, uint32 dataSize);
+
+    /** returns false if the key could not be written for any reason. */
+    static bool writeString(const std::string& key, const std::string& value, const std::string& data);
+
+};
+
+} // namespace G3D
+
+#endif // G3D_WIN32
+
+#endif // G3D_REGISTRYTUIL_H
diff --git a/externals/g3dlite/G3D/Set.h b/externals/g3dlite/G3D/Set.h
new file mode 100644
index 00000000000..9a8e1b619bb
--- /dev/null
+++ b/externals/g3dlite/G3D/Set.h
@@ -0,0 +1,186 @@
+/**
+  @file Set.h
+
+  Hash set
+
+  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+
+  @created 2001-12-09
+  @edited  2009-06-10
+ */
+
+#ifndef G3D_Set_h
+#define G3D_Set_h
+
+#include "G3D/platform.h"
+#include "G3D/Table.h"
+#include "G3D/MemoryManager.h"
+#include 
+#include 
+
+namespace G3D {
+
+/**
+  An unordered data structure that has at most one of each element.
+  Provides O(1) time insert, remove, and member test (contains).
+
+  Set uses G3D::Table internally, which means that the template type T 
+  must define a hashCode and operator== function.  See G3D::Table for 
+  a discussion of these functions.
+ */
+// There is not copy constructor or assignment operator defined because
+// the default ones are correct for Set.
+template, class EqualsFunc = EqualsTrait > 
+class Set {
+
+    /**
+     If an object is a member, it is contained in
+     this table.
+     */
+    Table memberTable;
+
+public:
+
+    void clearAndSetMemoryManager(const MemoryManager::Ref& m) {
+        memberTable.clearAndSetMemoryManager(m);
+    }
+
+    virtual ~Set() {}
+
+    int size() const {
+        return (int)memberTable.size();
+    }
+
+    bool contains(const T& member) const {
+        return memberTable.containsKey(member);
+    }
+
+    /**
+     Inserts into the table if not already present.
+     */
+    void insert(const T& member) {
+        memberTable.set(member, true);
+    }
+
+    /**
+     Returns true if the element was present and removed.  Returns false
+     if the element was not present.
+     */
+    bool remove(const T& member) {
+        return memberTable.remove(member);  
+    }
+
+    /** If @a member is present, sets @a removed to the element
+        being removed and returns true.  Otherwise returns false
+        and does not write to @a removed. This is useful when building
+        efficient hashed data structures that wrap Set. 
+        */
+    bool getRemove(const T& member, T& removed) {
+        bool ignore;
+        return memberTable.getRemove(member, removed, ignore);
+    }
+
+    /** If a value that is EqualsFunc to @a member is present, returns a pointer to the 
+        version stored in the data structure, otherwise returns NULL.
+     */
+    const T* getPointer(const T& member) const {
+        return memberTable.getKeyPointer(member);
+    }
+
+    Array getMembers() const {
+        return memberTable.getKeys();
+    }
+
+    void getMembers(Array& keyArray) const {
+        memberTable.getKeys(keyArray);
+    }
+
+    void clear() {
+        memberTable.clear();
+    }
+
+    void deleteAll()  {
+        getMembers().deleteAll();
+        clear();
+    }
+
+    /**
+     C++ STL style iterator variable.  See begin().
+     */
+    class Iterator {
+    private:
+        friend class Set;
+
+        // Note: this is a Table iterator, we are currently defining
+        // Set iterator
+        typename Table::Iterator it;
+
+        Iterator(const typename Table::Iterator& it) : it(it) {}
+
+    public:
+        inline bool operator!=(const Iterator& other) const {
+            return !(*this == other);
+        }
+
+        bool hasMore() const {
+            return it.hasMore();
+        }
+        
+        bool operator==(const Iterator& other) const {
+            return it == other.it;
+        }
+
+        /**
+         Pre increment.
+         */
+        Iterator& operator++() {
+            ++it;
+            return *this;
+        }
+
+        /**
+         Post increment (slower than preincrement).
+         */
+        Iterator operator++(int) {
+            Iterator old = *this;
+            ++(*this);
+            return old;
+        }
+
+        const T& operator*() const {
+            return it->key;
+        }
+
+        T* operator->() const {
+            return &(it->key);
+        }
+
+        operator T*() const {
+            return &(it->key);
+        }
+    };
+
+
+    /**
+     C++ STL style iterator method.  Returns the first member.  
+     Use preincrement (++entry) to get to the next element.  
+     Do not modify the set while iterating.
+     */
+    Iterator begin() const {
+        return Iterator(memberTable.begin());
+    }
+
+
+    /**
+     C++ STL style iterator method.  Returns one after the last iterator
+     element.
+     */
+    const Iterator end() const {
+        return Iterator(memberTable.end());
+    }
+};
+
+}
+
+#endif
+
diff --git a/externals/g3dlite/G3D/SmallArray.h b/externals/g3dlite/G3D/SmallArray.h
new file mode 100644
index 00000000000..41f9959e264
--- /dev/null
+++ b/externals/g3dlite/G3D/SmallArray.h
@@ -0,0 +1,155 @@
+/** 
+  @file SmallArray.h
+  
+  @created 2009-04-26
+  @edited  2009-04-26
+
+  Copyright 2000-2009, Morgan McGuire, http://graphics.cs.williams.edu
+  All rights reserved.
+ */
+#ifndef G3D_SmallArray_h
+#define G3D_SmallArray_h
+
+#include "G3D/platform.h"
+#include "G3D/Array.h"
+
+namespace G3D {
+
+/** Embeds \a N elements to reduce allocation time and increase 
+    memory coherence when working with arrays of arrays.
+    Offers a limited subset of the functionality of G3D::Array.*/
+template
+class SmallArray {
+private:
+    int                 m_size;
+
+    /** First N elements */
+    T                   m_embedded[N];
+
+    /** Remaining elements */
+    Array            m_rest;
+
+public:
+
+    SmallArray() : m_size(0) {}
+
+    inline int size() const {
+        return m_size;
+    }
+
+    void resize(int n, bool shrinkIfNecessary = true) {
+        m_rest.resize(std::max(0, n - N), shrinkIfNecessary);
+        m_size = n;
+    }
+
+    void clear(bool shrinkIfNecessary = true) {
+        resize(0, shrinkIfNecessary);
+    }
+
+    inline T& operator[](int i) {
+        debugAssert(i < m_size && i >= 0);
+        if (i < N) {
+            return m_embedded[i];
+        } else {
+            return m_rest[i - N];
+        }
+    }
+
+    inline const T& operator[](int i) const {
+        debugAssert(i < m_size && i >= 0);
+        if (i < N) {
+            return m_embedded[i];
+        } else {
+            return m_rest[i - N];
+        }
+    }
+
+    inline void push(const T& v) {
+        ++m_size;
+        if (m_size <= N) {
+            m_embedded[m_size - 1] = v;
+        } else {
+            m_rest.append(v);
+        }
+    }
+
+    inline void append(const T& v) {
+        push(v);
+    }
+
+    void fastRemove(int i) {
+        debugAssert(i < m_size && i >= 0);
+        if (i < N) {
+            if (m_size <= N) {
+                // Exclusively embedded
+                m_embedded[i] = m_embedded[m_size - 1];
+            } else {
+                // Move one down from the rest array
+                m_embedded[i] = m_rest.pop();
+            }
+        } else {
+            // Removing from the rest array
+            m_rest.fastRemove(i - N);
+        }
+        --m_size;
+    }
+
+    T pop() {
+        debugAssert(m_size > 0);
+        if (m_size <= N) {
+            // Popping from embedded, don't need a temporary
+            --m_size;
+            return m_embedded[m_size];
+        } else {
+            // Popping from rest
+            --m_size;
+            return m_rest.pop();
+        }
+    }
+
+    inline void popDiscard() {
+        debugAssert(m_size > 0);
+        if (m_size > N) {
+            m_rest.popDiscard();
+        }
+        --m_size;
+    }
+
+    inline T& next() {
+        ++m_size;
+        if (m_size <= N) {
+            return m_embedded[m_size - 1];
+        } else {
+            return m_rest.next();
+        }
+    }
+
+    bool contains(const T& value) const {
+        for (int i = std::min(m_size, N) - 1; i >= 0; --i) {
+            if (m_embedded[i] == value) {
+                return true;
+            }
+        }
+        return m_rest.contains(value);
+    }
+
+    template
+    SmallArray& operator=(const Array& src) {
+        resize(src.size());
+        for (int i = 0; i < src.size(); ++i) {
+            (*this)[i] = src[i];
+        }
+        return *this;
+    }
+
+	inline const T& last() const {
+		return (*this)[size() - 1];
+	}
+
+	inline T& last() {
+		return (*this)[size() - 1];
+	}
+};
+
+}
+#endif
diff --git a/externals/g3dlite/G3D/Sphere.h b/externals/g3dlite/G3D/Sphere.h
new file mode 100644
index 00000000000..595b61c4bf1
--- /dev/null
+++ b/externals/g3dlite/G3D/Sphere.h
@@ -0,0 +1,148 @@
+/**
+ @file Sphere.h
+ 
+ Sphere class
+ 
+ @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+ 
+ @created 2001-06-02
+ @edited  2008-10-07
+ */
+
+#ifndef G3D_SPHERE_H
+#define G3D_SPHERE_H
+
+#include "G3D/platform.h"
+#include "G3D/Vector3.h"
+#include "G3D/Array.h"
+#include "G3D/Sphere.h"
+
+namespace G3D {
+
+/**
+ Sphere.
+ */
+class Sphere {
+private:
+
+    static int32     dummy;
+
+public:
+    Vector3          center;
+    float            radius;
+
+    Sphere() {
+        center = Vector3::zero();
+        radius = 0;
+    }
+
+    Sphere(class BinaryInput& b);
+    void serialize(class BinaryOutput& b) const;
+    void deserialize(class BinaryInput& b);
+
+    Sphere(
+        const Vector3&  center,
+        float           radius) {
+
+        this->center = center;
+        this->radius = radius;
+    }
+
+    virtual ~Sphere() {}
+
+    bool operator==(const Sphere& other) const {
+        return (center == other.center) && (radius == other.radius);
+    }
+
+    bool operator!=(const Sphere& other) const {
+        return !((center == other.center) && (radius == other.radius));
+    }
+
+    /**
+     Returns true if point is less than or equal to radius away from
+     the center.
+     */
+    bool contains(const Vector3& point) const;
+
+    bool contains(const Sphere& other) const;
+
+    /**
+       @deprecated Use culledBy(Array&)
+     */
+    bool culledBy(
+                  const class Plane*  plane,
+                  int                 numPlanes,
+                  int32&	          cullingPlaneIndex,
+                  const uint32        testMask,
+                  uint32&             childMask) const;
+    
+    /**
+       @deprecated Use culledBy(Array&)
+     */
+    bool culledBy(
+                  const class Plane*  plane,
+                  int                 numPlanes,
+                  int32&              cullingPlaneIndex = dummy,
+                  const uint32        testMask = 0xFFFFFFFF) const;
+
+    /**
+       See AABox::culledBy
+    */
+    bool culledBy(
+                  const Array&		plane,
+                  int32&					cullingPlaneIndex,
+                  const uint32  			testMask,
+                  uint32&                 childMask) const;
+    
+    /**
+     Conservative culling test that does not produce a mask for children.
+     */
+    bool culledBy(
+                  const Array&		plane,
+                  int32&					cullingPlaneIndex = dummy,
+                  const uint32  			testMask		  = 0xFFFFFFFF) const;
+
+    virtual std::string toString() const;
+
+    float volume() const;
+
+    float area() const;
+
+    /**
+     Uniformly distributed on the surface.
+     */
+    Vector3 randomSurfacePoint() const;
+
+    /**
+     Uniformly distributed on the interior (includes surface)
+     */
+    Vector3 randomInteriorPoint() const;
+
+    void getBounds(class AABox& out) const;
+
+    bool intersects(const Sphere& other) const;
+
+    /** Translates the sphere */
+    Sphere operator+(const Vector3& v) const {
+        return Sphere(center + v, radius);
+    }
+
+    /** Translates the sphere */
+    Sphere operator-(const Vector3& v) const {
+        return Sphere(center - v, radius);
+    }
+
+    /** Sets this to the smallest sphere that encapsulates both */
+    void merge(const Sphere& s);
+};
+
+}
+
+template <> struct HashTrait {
+    static size_t hashCode(const G3D::Sphere& key) { 
+        return static_cast(key.center.hashCode() + (key.radius * 13));
+    }
+};
+
+
+#endif
diff --git a/externals/g3dlite/G3D/Spline.h b/externals/g3dlite/G3D/Spline.h
new file mode 100644
index 00000000000..fdd29e69ce9
--- /dev/null
+++ b/externals/g3dlite/G3D/Spline.h
@@ -0,0 +1,367 @@
+/**
+ @file Spline.h
+
+ @author Morgan McGuire, http://graphics.cs.williams.edu
+ */
+
+#ifndef G3D_SPLINE_H
+#define G3D_SPLINE_H
+
+#include "G3D/platform.h"
+#include "G3D/Array.h"
+#include "G3D/g3dmath.h"
+#include "G3D/Matrix4.h"
+#include "G3D/Vector4.h"
+
+namespace G3D {
+
+/** Common implementation code for all G3D::Spline template parameters */
+class SplineBase {
+public:
+
+    /** Times at which control points occur.  Must have the same
+        number of elements as Spline::control. */
+    Array            time;
+
+    /** If cyclic, then the control points will be assumed to wrap around.
+        If not cyclic, then the tangents at the ends of the spline
+        point to the final control points.*/
+    bool                    cyclic;
+
+    /** For a cyclic spline, this is the time elapsed between the last
+        control point and the first. If less than or equal to zero this is
+        assumed to be:
+
+        (time[0] - time[1] + .
+         time[time.size() - 1] - time[time.size() - 2]) / 2.
+    */
+    float                   finalInterval;
+    
+    SplineBase() : cyclic(true), finalInterval(-1) {}
+
+    virtual ~SplineBase() {}
+    
+    /** See specification for Spline::finalInterval; this handles the
+      non-positive case.  Returns 0 if not cyclic. */
+    float getFinalInterval() const;
+
+    /** Returns the amount of time covered by this spline in one
+        period.  For a cyclic spline, this contains the final
+        interval.*/
+    float duration() const;
+
+    /** Computes the derivative spline basis from the control point version. */
+    static Matrix4 computeBasis();
+    
+protected:
+
+    /** Assumes that t0 <= s < tn.  called by computeIndex. */
+    void computeIndexInBounds(float s, int& i, float& u) const;
+
+public:
+    
+    /**
+       Given a time @a s, finds @a i and 0 <= @a u < 1 such that
+       @a s = time[@a i] * @a u + time[@a i + 1] * (1 - @a u).  Note that
+       @a i may be outside the bounds of the time and control arrays;
+       use getControl to handle wraparound and extrapolation issues.
+       
+       This function takes expected O(1) time for control points with
+       uniform time sampled control points or for uniformly
+       distributed random time samples, but may take O( log time.size() ) time
+       in the worst case.
+
+       Called from evaluate().
+    */
+    void computeIndex(float s, int& i, float& u) const;
+};
+
+
+/**
+ Smooth parameteric curve implemented using a piecewise 3rd-order
+ Catmull-Rom spline curve.  The spline is considered infinite and may
+ either continue linearly from the specified control points or cycle
+ through them.  Control points are spaced uniformly in time at unit
+ intervals by default, but irregular spacing may be explicitly
+ specified.
+
+ The dimension of the spline can be set by varying the Control
+ template parameter.  For a 1D function, use Spline.  For a
+ curve in the plane, Spline.  Note that any template
+ parameter that supports operator+(Control) and operator*(float) can
+ be used; you can make splines out of G3D::Vector4, G3D::Matrix3, or
+ your own classes.
+
+ To provide shortest-path interpolation, subclass G3D::Spline and
+ override ensureShortestPath().  To provide normalization of
+ interpolated points (e.g., projecting Quats onto the unit
+ hypersphere) override correct().
+
+ See Real Time Rendering, 2nd edition, ch 12 for a general discussion
+ of splines and their properties.
+
+ @sa G3D::UprightSpline, G3D::QuatSpline
+ */
+template
+class Spline : public SplineBase {
+protected:
+    /** The additive identity control point. */
+    Control                 zero;
+
+public:
+
+    /** Control points. Must have the same number of elements as
+        Spline::time.*/
+    Array          control;
+
+    Spline() {
+        static Control x;
+        // Hide the fact from C++ that we are using an
+        // uninitialized variable here by pointer arithmetic.
+        // This is ok because any type that is a legal control
+        // point also supports multiplication by float.
+        zero = *(&x) * 0.0f;
+    }
+
+    /** Appends a control point at a specific time that must be
+        greater than that of the previous point. */
+    void append(float t, const Control& c) {
+        debugAssertM((time.size() == 0) || (t > time.last()), 
+                     "Control points must have monotonically increasing times.");
+        time.append(t);
+        control.append(c);
+        debugAssert(control.size() == time.size());
+    }
+
+
+    /** Appends control point spaced in time based on the previous
+        control point, or spaced at unit intervals if this is the
+        first control point. */
+    void append(const Control& c) {
+        switch (time.size()) {
+        case 0:
+            append(0, c);
+            break;
+
+        case 1:
+            if (time[0] == 0) {
+                append(1, c);
+            } else {
+                append(time[0], c);
+            }
+            break;
+
+        default:
+            append(2 * time[time.size() - 1] - time[time.size() - 2], c);
+        }
+        debugAssert(control.size() == time.size());
+    }
+
+    /** Erases all control points and times, but retains the state of 
+        cyclic and finalInterval.
+     */
+    void clear() {
+        control.clear();
+        time.clear();
+    }
+
+
+    /** Number of control points */
+    int size() const {
+        debugAssert(time.size() == control.size());
+        return control.size();
+    }
+    
+
+    /** Returns the requested control point and time sample based on
+        array index.  If the array index is out of bounds, wraps (for
+        a cyclic spline) or linearly extrapolates (for a non-cyclic
+        spline), assuming time intervals follow the first or last
+        sample recorded.
+
+        Calls correct() on the control point if it was extrapolated.
+
+        Returns 0 if there are no control points.
+
+        @sa Spline::control and Spline::time for the underlying
+        control point array; Spline::computeIndex to find the index
+        given a time.
+    */
+    void getControl(int i, float& t, Control& c) const {
+        int N = control.size();
+        if (N == 0) {
+            c = zero;
+            t = 0;
+        } else if (cyclic) {
+            c = control[iWrap(i, N)];
+
+            if (i < 0) {
+                // Wrapped around bottom
+
+                // Number of times we wrapped around the cyclic array
+                int wraps = (N + 1 - i) / N;                    
+                int j = (i + wraps * N) % N;
+                t = time[j] - wraps * duration();
+
+            } else if (i < N) {
+
+                t = time[i];
+
+            } else {
+                // Wrapped around top
+
+                // Number of times we wrapped around the cyclic array
+                int wraps = i / N;                    
+                int j = i % N;
+                t = time[j] + wraps * duration();
+            }
+
+        } else if (i < 0) {
+            // Are there enough points to extrapolate?
+            if (N >= 2) {
+                // Step away from control point 0
+                float dt = time[1] - time[0];
+                
+                // Extrapolate (note; i is negative)
+                c = control[1] * float(i) + control[0] * float(1 - i);
+                correct(c);
+                t = dt * i + time[0];
+
+            } else {
+                // Just clamp
+                c = control[0];
+
+                // Only 1 time; assume 1s intervals
+                t = time[0] + i;
+            }
+
+        } else if (i >= N) {
+            if (N >= 2) {
+                float dt = time[N - 1] - time[N - 2];
+
+                // Extrapolate
+                c = control[N - 1] * float(i - N + 2) + control[N - 2] * -float(i - N + 1);
+                correct(c);
+                t = time[N - 1] + dt * (i - N + 1);
+
+            } else {
+                // Return the last, clamping
+                c = control.last();
+                // Only 1 time; assume 1s intervals
+                t = time[0] + i;
+            }
+        } else {
+            // In bounds
+            c = control[i];
+            t = time[i];
+        }
+    }
+
+protected:
+
+    /** Returns a series of N control points and times, fixing
+        boundary issues.  The indices may be assumed to be treated
+        cyclically. */
+    void getControls(int i, float* T, Control* A, int N) const {
+        for (int j = 0; j < N; ++j) {
+            getControl(i + j, T[j], A[j]);
+        }
+        ensureShortestPath(A, N);
+    }
+
+    /**
+       Mutates the array of N control points. It is useful to override this
+       method by one that wraps the values if they are angles or quaternions
+       for which "shortest path" interpolation is significant.
+     */
+    virtual void ensureShortestPath(Control* A, int N) const { (void)A; (void) N;}
+
+    /** Normalize or otherwise adjust this interpolated Control. */
+    virtual void correct(Control& A) const { (void)A; }
+
+public:
+   
+
+    /**
+       Return the position at time s.  The spline is defined outside
+       of the time samples by extrapolation or cycling.
+     */
+    Control evaluate(float s) const {
+        debugAssertM(control.size() == time.size(), "Corrupt spline: wrong number of control points.");
+
+        /*
+        @cite http://www.gamedev.net/reference/articles/article1497.asp 
+        Derivation of basis matrix follows.
+        
+        Given control points with positions p[i] at times t[i], 0 <= i <= 3, find the position 
+        at time t[1] <= s <= t[2].
+
+        Let u = s - t[0]
+        Let U = [u^0 u^1 u^2 u^3] = [1 u u^2 u^3]
+        Let dt0 = t[0] - t[-1]
+        Let dt1 = t[1] - t[0]
+        Let dt2 = t[2] - t[1]
+         */
+
+        // Index of the first control point (i.e., the u = 0 point)
+        int i = 0;
+        // Fractional part of the time
+        float u = 0;
+
+        computeIndex(s, i, u);
+
+        Control p[4];
+        float   t[4];
+        getControls(i - 1, t, p, 4);
+        float dt0 = t[1] - t[0];
+        float dt1 = t[2] - t[1];
+        float dt2 = t[3] - t[2];
+
+        static const Matrix4 basis = computeBasis();
+
+        // Powers of u
+        Vector4 uvec((float)(u*u*u), (float)(u*u), (float)u, 1.0f);
+
+        // Compute the weights on each of the control points.
+        const Vector4& weights = uvec * basis;
+        
+        // Compute the weighted sum of the neighboring control points.
+        Control sum;
+
+        const Control& p0 = p[0];
+        const Control& p1 = p[1];
+        const Control& p2 = p[2];
+        const Control& p3 = p[3];
+
+        const Control& dp0 = p1 + (p0*-1.0f);
+        const Control& dp1 = p2 + (p1*-1.0f);
+        const Control& dp2 = p3 + (p2*-1.0f);
+
+        // The factor of 1/2 from averaging two time intervals is 
+        // already factored into the basis
+        
+        // tan1 = (dp0 / dt0 + dp1 / dt1) * ((dt0 + dt1) * 0.5);
+        // The last term normalizes for unequal time intervals
+        float x = (dt0 + dt1) * 0.5f;
+        float n0 = x / dt0;
+        float n1 = x / dt1;
+        float n2 = x / dt2;
+        const Control& dp1n1 = dp1 * n1;
+        const Control& tan1 = dp0 * n0 + dp1n1;
+        const Control& tan2 = dp1n1 + dp2 * n2;
+
+        sum = 
+            tan1 * weights[0]+
+             p1  * weights[1] +
+             p2  * weights[2] +
+            tan2 * weights[3]; 
+            
+
+        correct(sum);
+        return sum;
+    }
+};
+
+}
+
+#endif
diff --git a/externals/g3dlite/G3D/Stopwatch.h b/externals/g3dlite/G3D/Stopwatch.h
new file mode 100644
index 00000000000..3f2aa9c8d86
--- /dev/null
+++ b/externals/g3dlite/G3D/Stopwatch.h
@@ -0,0 +1,144 @@
+/**
+ @file Stopwatch.h
+ 
+ @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+  
+ @created 2005-10-05
+ @edited  2009-05-10
+
+ Copyright 2000-2009, Morgan McGuire.
+ All rights reserved.
+ */
+
+#ifndef G3D_Stopwatch_h
+#define G3D_Stopwatch_h
+
+#include "G3D/platform.h"
+#include "G3D/Queue.h"
+#include "G3D/G3DGameUnits.h"
+#include "G3D/g3dmath.h"
+
+namespace G3D {
+
+/**
+  \brief Accurately measure durations and framerates.
+
+  Example 1: For profiling code in the context of a rendering loop:
+    
+      sw.tick();
+      ...timed code...
+      sw.tock();
+
+      screenPrintf("%f\n", sw.smoothFPS());
+    

+
+
+  Example 2: For profiling pieces of a sequence:
+   
+    Stopwatch sw;
+    slowOperation();
+    sw.after("slowOperation");
+    kdTree.balance();
+    sw.after("Balance tree");
+   

+ */
+class Stopwatch {
+private:
+
+    std::string             myName;
+    double                  startTime;
+    std::string             prevMark;
+    double                  prevTime;
+
+    /** True between tick and tock */
+    bool                    inBetween;
+
+    /** The initial cycle count. */
+    uint64                  cycleStart;
+
+    /** The time at which tick was called. */
+    RealTime                timeStart;
+
+    /** The time at which the previous tock was called, -1 if never. */
+    RealTime                lastTockTime;
+
+    RealTime                lastDuration;
+    int64                   lastCycleCount;
+
+    /** Frames per second. */
+    double                  m_fps;
+
+    /** Weighted fps */
+    double                  emwaFPS;
+    double                  m_smoothFPS;
+
+    /** Weighted duration */
+    RealTime                emwaDuration;
+
+    /** The overhead for calling into the class. */
+    int64                   cycleOverhead;
+   
+    /** Called from the constructor. */
+    void computeOverhead();
+
+public:
+
+    Stopwatch(const std::string& name = "Stopwatch");
+
+    /** Returns the number of times that tick was called per wall-clock second; 
+        e.g. frames-per-second. */
+    double FPS() const {
+        return m_fps;
+    }
+
+    /** Amount of time between the most recent tick and tock calls.  0 if tick has
+        never been called. */
+    RealTime elapsedTime() const {
+        return lastDuration;
+    }
+
+    /** Time-smoothed value that is stable to the nearest 1%.
+        This is useful if you are displaying elapsed time in real-time 
+        and want a stable number.*/
+    RealTime smoothElapsedTime() const {
+        return emwaDuration;
+    }
+
+    /** Time-smoothed value of fps that is stable to the nearest integer for fps > 10 and 
+      to the first decimal place for fps <= 10.
+      This is useful if you
+      are displaying the frame rate in real-time and want a stable (readable) number.*/
+    double smoothFPS() const {
+        return m_smoothFPS;
+    }
+
+    /** The elapsed cycle time between tick and tock.  An attempt is made to factor out all
+        tick/tock overhead, so that back-to-back calls should return zero.  
+        Unreliable on non-x86 platforms.*/
+    uint64 elapsedCycles() const {
+        return lastCycleCount;
+    }
+
+    /** Call at the beginning of the period that you want timed. */
+    void tick();
+
+    /** Call at the end of the period that you want timed. */
+    void tock();
+
+    
+    /** Reset the start time used by after() and the emwa value.*/
+    void reset();
+
+    /** Call after an operation has completed, with the name of the operation, to
+        print a debug message listing the time since the previous after() call. */
+    void after(const std::string& s = "");
+
+};
+
+/** Because it is hard to remember the proper capitalization. */
+typedef Stopwatch StopWatch;
+
+}
+
+#endif
+
diff --git a/externals/g3dlite/G3D/System.h b/externals/g3dlite/G3D/System.h
new file mode 100644
index 00000000000..56ef9c8e3dc
--- /dev/null
+++ b/externals/g3dlite/G3D/System.h
@@ -0,0 +1,507 @@
+/**
+  @file System.h
+
+  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+
+  @cite Rob Wyatt http://www.gamasutra.com/features/wyatts_world/19990709/processor_detection_01.htm
+  @cite Benjamin Jurke http://www.flipcode.com/cgi-bin/msg.cgi?showThread=COTD-ProcessorDetectionClass&forum=cotd&id=-1
+  @cite Michael Herf http://www.stereopsis.com/memcpy.html
+
+  @created 2003-01-25
+  @edited  2008-10-14
+ */
+
+#ifndef G3D_System_h
+#define G3D_System_h
+
+#include "G3D/platform.h"
+#include "G3D/g3dmath.h"
+#include "G3D/G3DGameUnits.h"
+#include "G3D/BinaryFormat.h"
+#include 
+
+#ifdef G3D_OSX
+#   include 
+#endif
+
+namespace G3D {
+
+/**
+ Routine used by the demos to find the data.  Searches in
+ ../data, ../../data, etc. up to 5 levels back.  Checks
+ common locations like \verbatim c:\libraries\g3d-\data \endverbatim
+ and some hard-coded paths on the Brown University file
+ system.
+
+ @deprecated
+ */
+std::string demoFindData(bool errorIfNotFound = true);
+
+/** G3D, SDL, and IJG libraries require license documentation
+    to be distributed with your program.  This generates the
+    string that must appear in your documentation.
+    Your program can be commercial, closed-source under
+    any license you want.
+    @deprecated Use System::license
+*/
+std::string license();
+
+/**
+@brief The order in which the bytes of an integer are stored on a
+machine.
+
+Intel/AMD chips tend to be G3D_LITTLE_ENDIAN, Mac PPC's and Suns are
+G3D_BIG_ENDIAN. However, this is primarily used to specify the byte
+order of file formats, which are fixed.
+*/
+enum G3DEndian {
+    G3D_BIG_ENDIAN,
+    G3D_LITTLE_ENDIAN
+};
+
+/**
+ @brief OS and processor abstraction.
+
+ The first time any method is called the processor will be analyzed.
+ Future calls are then fast.
+
+ Timing function overview:
+    System::getCycleCount
+      - actual cycle count
+
+    System::getTick
+      - High-resolution time in seconds since program started
+
+    System::getLocalTime
+      - High-resolution time in seconds since Jan 1, 1970
+        (because it is stored in a double, this may be less
+         accurate than getTick)
+ */
+class System {
+public:
+    /**
+       @param size Size of memory that the system was trying to allocate
+
+       @param recoverable If true, the system will attempt to allocate again
+       if the callback returns true.  If false, malloc is going to return
+       NULL and this invocation is just to notify the application.
+
+       @return Return true to force malloc to attempt allocation again if the
+       error was recoverable.
+     */
+    typedef bool (*OutOfMemoryCallback)(size_t size, bool recoverable);
+
+private:
+
+    bool           m_initialized;
+    int            m_cpuSpeed;
+    bool           m_hasCPUID;
+    bool           m_hasRDTSC;
+    bool           m_hasMMX;
+    bool           m_hasSSE;
+    bool           m_hasSSE2;
+    bool           m_hasSSE3;
+    bool           m_has3DNOW;
+    bool           m_has3DNOW2;
+    bool           m_hasAMDMMX;
+    std::string    m_cpuVendor;
+    int            m_numCores;
+
+    /** this holds the data directory set by the application (currently
+        GApp) for use by findDataFile */
+    std::string    m_appDataDir;
+
+    G3DEndian      m_machineEndian;
+    std::string    m_cpuArch;
+    std::string    m_operatingSystem;
+
+#   ifdef G3D_WIN32
+    /** Used by getTick() for timing */
+    LARGE_INTEGER  m_start;
+    LARGE_INTEGER  m_counterFrequency;
+#else
+    struct timeval m_start;
+#endif
+
+    std::string    m_version;
+    OutOfMemoryCallback m_outOfMemoryCallback;
+
+#ifdef G3D_OSX
+    /** In Cycles/Second */
+    SInt32         m_OSXCPUSpeed;
+    double         m_secondsPerNS;
+#endif
+
+    /** The Real-World time of System::getTick() time 0.  Set by initTime */
+    RealTime       m_realWorldGetTickTime0;
+
+    uint32         m_highestCPUIDFunction;
+
+    /** @brief Used for the singleton instance only. */
+    System();
+
+    /** @brief The singleton instance.
+
+        Used instead of a global variable to ensure that the order of
+        intialization is correct, which is critical because other
+        globals may allocate memory using System::malloc.
+     */
+    static System& instance();
+
+    enum CPUIDFunction {
+        CPUID_VENDOR_ID              = 0x00000000,
+        CPUID_PROCESSOR_FEATURES     = 0x00000001,
+        CPUID_NUM_CORES              = 0x00000004,
+        CPUID_GET_HIGHEST_FUNCTION   = 0x80000000,
+        CPUID_EXTENDED_FEATURES      = 0x80000001};
+
+    /** Helper macro to call cpuid functions and return all values
+
+       See http://software.intel.com/en-us/articles/intel-64-architecture-processor-topology-enumeration/
+       or  http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/25481.pdf
+
+       for description of the arguments.
+    */
+    static void cpuid(CPUIDFunction func, uint32& areg, uint32& breg, uint32& creg, uint32& dreg);
+
+    void init();
+
+    /** Called from init() */
+    void getStandardProcessorExtensions();
+
+    /** Called from init() */
+    void initTime();
+
+public:
+
+    /** Returns the speed of processor 0 in MHz.
+        Always returns 0 on linux.*/
+    inline static int cpuSpeedMHz() {
+        return instance().m_cpuSpeed;
+    }
+
+    /** Returns the number of logical processor cores (i.e., the
+        number of execution units for threads) */
+    inline static int numCores() {
+        return instance().m_numCores;
+    }
+
+    inline static bool hasCPUID() {
+        return instance().m_hasCPUID;
+    }
+
+    inline static bool hasRDTSC() {
+        return instance().m_hasRDTSC;
+    }
+
+    inline static bool hasSSE() {
+        return instance().m_hasSSE;
+    }
+
+    inline static bool hasSSE2() {
+        return instance().m_hasSSE2;
+    }
+
+    inline static bool hasSSE3() {
+        return instance().m_hasSSE3;
+    }
+
+    inline static bool hasMMX() {
+        return instance().m_hasMMX;
+    }
+
+    inline static bool has3DNow() {
+        return instance().m_has3DNOW;
+    }
+
+    inline static const std::string& cpuVendor() {
+        return instance().m_cpuVendor;
+    }
+
+    /**
+     Returns the endianness of this machine.
+    */
+    inline static G3DEndian machineEndian() {
+        return instance().m_machineEndian;
+    }
+
+    /** e.g., "Windows", "GNU/Linux" */
+    inline static const std::string& operatingSystem() {
+        return instance().m_operatingSystem;
+    }
+
+    /** e.g., 80686 */
+    inline static const std::string& cpuArchitecture() {
+        return instance().m_cpuArch;
+    }
+
+    /**
+       Returns the current date as a string in the form YYYY-MM-DD
+    */
+    static std::string currentDateString();
+
+    /**
+       Guarantees that the start of the array is aligned to the
+       specified number of bytes.
+    */
+    static void* alignedMalloc(size_t bytes, size_t alignment);
+
+    /**
+       Uses pooled storage to optimize small allocations (1 byte to 5
+       kilobytes).  Can be 10x to 100x faster than calling ::malloc or
+       new.
+
+       The result must be freed with free.
+
+       Threadsafe on Win32.
+
+       @sa calloc realloc OutOfMemoryCallback free
+    */
+    static void* malloc(size_t bytes);
+
+    static void* calloc(size_t n, size_t x);
+
+    /**
+     Version of realloc that works with System::malloc.
+     */
+    static void* realloc(void* block, size_t bytes);
+
+    /** Returns a string describing how well System::malloc is using
+        its internal pooled storage.  "heap" memory was slow to
+        allocate; the other data sizes are comparatively fast.*/
+    static std::string mallocPerformance();
+    static void resetMallocPerformanceCounters();
+
+    /**
+       Returns a string describing the current usage of the buffer pools used for
+       optimizing System::malloc.
+     */
+    static std::string mallocStatus();
+
+    /**
+     Free data allocated with System::malloc.
+
+     Threadsafe on Win32.
+     */
+    static void free(void* p);
+
+    /**
+     Frees memory allocated with alignedMalloc.
+     */
+    static void alignedFree(void* ptr);
+
+    /** An implementation of memcpy that may be up to 2x as fast as the C library
+        one on some processors.  Guaranteed to have the same behavior as memcpy
+        in all cases. */
+    static void memcpy(void* dst, const void* src, size_t numBytes);
+
+    /** An implementation of memset that may be up to 2x as fast as the C library
+        one on some processors.  Guaranteed to have the same behavior as memset
+        in all cases. */
+    static void memset(void* dst, uint8 value, size_t numBytes);
+
+    /**
+     Returns the fully qualified filename for the currently running executable.
+
+     This is more reliable than arg[0], which may be intentionally set
+     to an incorrect value by a calling program, relative to a now
+     non-current directory, or obfuscated by sym-links.
+
+     @cite Linux version written by Nicolai Haehnle , http://www.flipcode.com/cgi-bin/msg.cgi?showThread=COTD-getexename&forum=cotd&id=-1
+     */
+    static std::string currentProgramFilename();
+
+    /** Name of this program. Note that you can mutate this string to
+        set your app name explicitly.*/
+    static std::string& appName();
+
+    /** G3D Version string */
+    inline static const std::string& version() {
+        return instance().m_version;
+    }
+
+    /**
+       @brief The optimization status of the G3D library (not the program compiled against it)
+
+       Either "Debug" or "Release", depending on whether _DEBUG was
+       defined at compile-time for the library.
+      */
+    static const std::string& build();
+
+    /**
+     Causes the current thread to yield for the specified duration
+     and consume almost no CPU.
+     The sleep will be extremely precise; it uses System::time()
+     to calibrate the exact yeild time.
+     */
+    static void sleep(RealTime t);
+
+    /**
+     Clears the console.
+     Console programs only.
+     */
+    static void consoleClearScreen();
+
+    /**
+     Returns true if a key is waiting.
+     Console programs only.
+     */
+    static bool consoleKeyPressed();
+
+    /**
+     Blocks until a key is read (use consoleKeyPressed to determine if
+     a key is waiting to be read) then returns the character code for
+     that key.
+     */
+    static int consoleReadKey();
+
+    /**
+     The actual time (measured in seconds since
+     Jan 1 1970 midnight).
+
+     Adjusted for local timezone and daylight savings
+     time.   This is as accurate and fast as getCycleCount().
+    */
+    static RealTime time();
+
+    /**
+     To count the number of cycles a given operation takes:
+
+     
+     unsigned long count;
+     System::beginCycleCount(count);
+     ...
+     System::endCycleCount(count);
+     // count now contains the cycle count for the intervening operation.
+     

+     */
+    /* static void beginCycleCount(uint64& cycleCount);
+    static void endCycleCount(uint64& cycleCount);
+
+    static uint64 getCycleCount(); */
+
+    inline static void setOutOfMemoryCallback(OutOfMemoryCallback c) {
+        instance().m_outOfMemoryCallback = c;
+    }
+
+    /**
+     When System::malloc fails to allocate memory because the system is
+     out of memory, it invokes this handler (if it is not NULL).
+     The argument to the callback is the amount of memory that malloc
+     was trying to allocate when it ran out.  If the callback returns
+     true, System::malloc will attempt to allocate the memory again.
+     If the callback returns false, then System::malloc will return NULL.
+
+     You can use outOfMemoryCallback to free data structures or to
+     register the failure.
+     */
+    inline static OutOfMemoryCallback outOfMemoryCallback() {
+        return instance().m_outOfMemoryCallback;
+    }
+
+    /** Set an environment variable for the current process */
+    static void setEnv(const std::string& name, const std::string& value);
+
+    /** Get an environment variable for the current process.  Returns NULL if the variable doesn't exist. */
+    static const char* getEnv(const std::string& name);
+
+    /**
+     Prints a human-readable description of this machine
+     to the text output stream.  Either argument may be NULL.
+     */
+    static void describeSystem(
+        class TextOutput& t);
+
+    static void describeSystem(
+        std::string&        s);
+
+    /** On Win32, returns the clipboard text contents.  Does nothing on other
+       platforms (yet) */
+    static std::string getClipboardText();
+
+    /** Copies the text to the clipboard on Win32. */
+    static void setClipboardText(const std::string& s);
+
+    /**
+     Tries to locate the resource by looking in related directories.
+     If found, returns the full path to the resource, otherwise
+     returns the empty string.
+     */
+    static std::string findDataFile(const std::string& full, bool errorIfNotFound = true);
+
+    /**
+        Sets the path that the application is using as its data directory.
+        Used by findDataDir as an initial search location.  GApp sets this
+        upon constrution.
+    */
+    static void setAppDataDir(const std::string& path);
+
+};
+
+/* don't need that for MaNGOS, not portable to Win64...
+#ifdef _MSC_VER
+    inline uint64 System::getCycleCount() {
+        uint32 timehi, timelo;
+
+        // Use the assembly instruction rdtsc, which gets the current
+        // cycle count (since the process started) and puts it in edx:eax.
+        __asm
+            {
+                rdtsc;
+                mov timehi, edx;
+                mov timelo, eax;
+            }
+
+        return ((uint64)timehi << 32) + (uint64)timelo;
+    }
+
+#elif defined(G3D_LINUX)
+
+    inline uint64 System::getCycleCount() {
+        uint32 timehi, timelo;
+
+        __asm__ __volatile__ (
+            "rdtsc            "
+            : "=a" (timelo),
+              "=d" (timehi)
+            : );
+
+        return ((uint64)timehi << 32) + (uint64)timelo;
+    }
+
+#elif defined(G3D_OSX)
+
+    inline uint64 System::getCycleCount() {
+		//Note:  To put off extra processing until the end, this does not
+		//return the actual clock cycle count.  It is a bus cycle count.
+		//When endCycleCount() is called, it converts the two into a difference
+		//of clock cycles
+
+        return (uint64) UnsignedWideToUInt64(UpTime());
+		//return (uint64) mach_absolute_time();
+    }
+
+#endif
+
+inline void System::beginCycleCount(uint64& cycleCount) {
+    cycleCount = getCycleCount();
+}
+
+
+inline void System::endCycleCount(uint64& cycleCount) {
+#ifndef G3D_OSX
+    cycleCount = getCycleCount() - cycleCount;
+#else
+    AbsoluteTime end = UpTime();
+    Nanoseconds diffNS =
+        AbsoluteDeltaToNanoseconds(end, UInt64ToUnsignedWide(cycleCount));
+    cycleCount =
+        (uint64) ((double) (instance().m_OSXCPUSpeed) *
+                  (double) UnsignedWideToUInt64(diffNS) * instance().m_secondsPerNS);
+#endif
+}
+ */
+
+} // namespace
+
+#endif
diff --git a/externals/g3dlite/G3D/Table.h b/externals/g3dlite/G3D/Table.h
new file mode 100644
index 00000000000..287efa94d97
--- /dev/null
+++ b/externals/g3dlite/G3D/Table.h
@@ -0,0 +1,924 @@
+/**
+  @file Table.h
+
+  Templated hash table class.
+
+  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+  @created 2001-04-22
+  @edited  2010-01-28
+  Copyright 2000-2010, Morgan McGuire.
+  All rights reserved.
+ */
+
+#ifndef G3D_Table_h
+#define G3D_Table_h
+
+#include 
+#include 
+
+#include "G3D/platform.h"
+#include "G3D/Array.h"
+#include "G3D/debug.h"
+#include "G3D/System.h"
+#include "G3D/g3dmath.h"
+#include "G3D/EqualsTrait.h"
+#include "G3D/HashTrait.h"
+#include "G3D/MemoryManager.h"
+
+#ifdef _MSC_VER
+#   pragma warning (push)
+    // Debug name too long warning
+#   pragma warning (disable : 4786)
+#endif
+
+namespace G3D {
+
+/**
+ An unordered data structure mapping keys to values.
+
+ There are two ways of definining custom hash functions (G3D provides built-in ones for most classes):
+
+ 
+ class Foo {
+ public:
+     std::string     name;
+     int             index;
+     static size_t hashCode(const Foo& key) {
+          return HashTrait::hashCode(key.name) + key.index;
+     }
+  };
+
+  template<> struct HashTrait {
+       static size_t hashCode(const Foo& key) { return HashTrait::hashCode(key.name) + key.index; }
+  }; 
+
+
+  // Use Foo::hashCode
+  Table fooTable1;
+
+  // Use HashTrait
+  Table      fooTable2;
+  

+
+
+ Key must be a pointer, an int, a std::string or provide overloads for: 
+
+  
+    template<> struct HashTrait {
+        static size_t hashCode(const Key& key) { return reinterpret_cast( ... ); }
+    }; 
+  

+
+  and one of 
+
+  
+    template<> struct EqualsTrait{
+         static bool equals(const Key& a, const Key& b) { return ... ; }
+    };
+
+
+    bool operator==(const Key&, const Key&);
+  

+
+ G3D pre-defines HashTrait specializations for common types (like int and std::string).
+ If you use a Table with a different type you must write those functions yourself.  For example,
+ an enum would use:
+
+  
+    template<> struct HashTrait {
+        static size_t equals(const MyEnum& key) const { return reinterpret_cast( key ); }
+    };
+  

+
+  And rely on the default enum operator==.
+
+
+  Periodically check that debugGetLoad() is low (> 0.1).  When it gets near
+  1.0 your hash function is badly designed and maps too many inputs to
+  the same output.
+ */
+template, class EqualsFunc = EqualsTrait > 
+class Table {
+public:
+
+    /**
+     The pairs returned by iterator.
+     */
+    class Entry {
+    public:
+        Key    key;
+        Value  value;
+        Entry() {}
+        Entry(const Key& k) : key(k) {}
+        Entry(const Key& k, const Value& v) : key(k), value(v) {}
+        bool operator==(const Entry &peer) const { return (key == peer.key && value == peer.value); }
+        bool operator!=(const Entry &peer) const { return !operator==(peer); }
+    };
+
+private:
+
+    typedef Table ThisType;
+
+    /**
+     Linked list nodes used internally by HashTable.
+     */
+    class Node {
+    public:
+        Entry       entry;
+        size_t      hashCode;
+        Node*       next;
+
+    private:
+
+        // Private to require use of the allocator
+        Node(const Key& k, const Value& v, size_t h, Node* n) 
+            : entry(k, v), hashCode(h), next(n) {
+        }
+
+        Node(const Key& k, size_t h, Node* n) 
+            : entry(k), hashCode(h), next(n) {
+        }
+
+    public:
+
+        static Node* create(const Key& k, const Value& v, size_t h, Node* n, MemoryManager::Ref& mm) {
+            Node* node = (Node*)mm->alloc(sizeof(Node));
+            return new (node) Node(k, v, h, n);
+        }
+
+        static Node* create(const Key& k, size_t hashCode, Node* n, MemoryManager::Ref& mm) {
+            Node* node = (Node*)mm->alloc(sizeof(Node));
+            return new (node) Node(k, hashCode, n);
+        }
+
+        static void destroy(Node* n, MemoryManager::Ref& mm) {
+            n->~Node();
+            mm->free(n);
+        }
+
+        /**
+        Clones a whole chain;
+        */
+        Node* clone(MemoryManager::Ref& mm) {
+           return create(this->entry.key, this->entry.value, hashCode, (next == NULL) ? NULL : next->clone(mm), mm);
+        }
+    };
+
+    void checkIntegrity() const {
+#       ifdef G3D_DEBUG
+           debugAssert(m_bucket == NULL || isValidHeapPointer(m_bucket));
+           for (size_t b = 0; b < m_numBuckets; ++b) {
+               Node* node = m_bucket[b];
+               debugAssert(node == NULL || isValidHeapPointer(node));
+               while (node != NULL) {
+                   debugAssert(node == NULL || isValidHeapPointer(node));
+                   node = node->next;
+               }
+           }
+#       endif
+    }
+
+    /** Number of elements in the table.*/
+    size_t              m_size;
+
+    /**
+     Array of Node*. 
+
+     We don't use Array because Table is lower-level than Array.
+     Some elements may be NULL.
+     */
+    Node**              m_bucket;
+    
+    /**
+     Length of the m_bucket array.
+     */
+    size_t              m_numBuckets;
+
+    MemoryManager::Ref  m_memoryManager;
+
+    void* alloc(size_t s) const {
+        return m_memoryManager->alloc(s);
+    }
+
+    void free(void* p) const {
+        return m_memoryManager->free(p);
+    }
+
+    /**
+     Re-hashes for a larger m_bucket size.
+     */
+    void resize(size_t newSize) {
+
+        // Hang onto the old m_bucket array
+        Node** oldBucket = m_bucket;
+
+        // Allocate a new m_bucket array with the new size
+        m_bucket = (Node**)alloc(sizeof(Node*) * newSize);
+        // Set all pointers to NULL
+        System::memset(m_bucket, 0, newSize * sizeof(Node*));
+        debugAssertM(m_bucket != NULL, "MemoryManager::alloc returned NULL. Out of memory.");
+        // Move each node to its new hash location
+        for (size_t b = 0; b < m_numBuckets; ++b) {
+            Node* node = oldBucket[b];
+         
+            // There is a linked list of nodes at this m_bucket
+            while (node != NULL) {
+                // Hang onto the old next pointer
+                Node* nextNode = node->next;
+        
+                // Insert at the head of the list for m_bucket[i]
+                size_t i = node->hashCode % newSize;
+                node->next = m_bucket[i];
+                m_bucket[i] = node;
+
+                // Move on to the next node
+                node = nextNode;
+            }
+
+            // Drop the old pointer for cleanliness when debugging
+            oldBucket[b] = NULL;
+        }
+
+        // Delete the old storage
+        free(oldBucket);
+        this->m_numBuckets = newSize;
+
+        checkIntegrity();
+    }
+
+
+    void copyFrom(const ThisType& h) {
+        if (&h == this) {
+            return;
+        }
+
+        debugAssert(m_bucket == NULL);
+        m_size = h.m_size;
+        m_numBuckets = h.m_numBuckets;
+        m_bucket = (Node**)alloc(sizeof(Node*) * m_numBuckets);
+        // No need to NULL elements since we're about to overwrite them
+
+        for (size_t b = 0; b < m_numBuckets; ++b) {
+            if (h.m_bucket[b] != NULL) {
+                m_bucket[b] = h.m_bucket[b]->clone(m_memoryManager);
+            } else {
+                m_bucket[b] = NULL;
+            }
+        }
+
+        checkIntegrity();
+    }
+
+    /**
+     Frees the heap structures for the nodes.
+     */
+    void freeMemory() {
+        checkIntegrity();
+
+        for (size_t b = 0; b < m_numBuckets; b++) {
+            Node* node = m_bucket[b];
+            while (node != NULL) {
+                Node* next = node->next;
+                Node::destroy(node, m_memoryManager);
+                node = next;
+            }
+            m_bucket[b] = NULL;
+        }
+        free(m_bucket);
+        m_bucket     = NULL;
+        m_numBuckets = 0;
+        m_size       = 0;
+    }
+
+public:
+
+    /**
+     Creates an empty hash table using the default MemoryManager.
+     */
+    Table() : m_bucket(NULL) {
+        m_memoryManager = MemoryManager::create();
+        m_numBuckets = 0;
+        m_size       = 0;
+        m_bucket     = NULL;
+        checkIntegrity();
+    }
+
+    /** Changes the internal memory manager to m */
+    void clearAndSetMemoryManager(const MemoryManager::Ref& m) {
+        clear();
+        debugAssert(m_bucket == NULL);
+        m_memoryManager = m;
+    }
+
+    /** 
+        Recommends that the table resize to anticipate at least this number of elements.
+     */
+    void setSizeHint(size_t n) {
+        size_t s = n * 3;
+        if (s > m_numBuckets) {
+            resize(s);
+        }
+    }
+    
+    /**
+       Destroys all of the memory allocated by the table, but does not
+       call delete on keys or values if they are pointers.  If you want to
+       deallocate things that the table points at, use getKeys() and Array::deleteAll()
+       to delete them.
+    */
+    virtual ~Table() {
+        freeMemory();
+    }
+
+    /** Uses the default memory manager */
+    Table(const ThisType& h) {
+        m_memoryManager = MemoryManager::create();
+        m_numBuckets = 0;
+        m_size = 0;
+        m_bucket = NULL;
+        this->copyFrom(h);
+        checkIntegrity();
+    }
+
+
+    Table& operator=(const ThisType& h) {
+        // No need to copy if the argument is this
+        if (this != &h) {
+            // Free the existing nodes
+            freeMemory();
+            this->copyFrom(h);
+            checkIntegrity();
+        }
+        return *this;
+    }
+
+    /**
+     Returns the length of the deepest m_bucket.
+     */
+    size_t debugGetDeepestBucketSize() const {
+        size_t deepest = 0;
+
+        for (size_t b = 0; b < m_numBuckets; b++) {
+            size_t  count = 0;
+            Node*   node = m_bucket[b];
+            while (node != NULL) {
+                node = node->next;
+                ++count;
+            }
+
+            if (count > deepest) {
+                deepest = count;
+            }
+        }
+
+        return deepest;
+    }
+
+    /**
+       Returns the average size of non-empty buckets.
+    */
+    float debugGetAverageBucketSize() const {
+        size_t num = 0;
+        size_t count = 0;
+
+        for (size_t b = 0; b < m_numBuckets; b++) {
+            Node* node = m_bucket[b];
+            if (node != NULL) {
+                ++num;
+                while (node != NULL) {
+                    node = node->next;
+                    ++count;
+                }
+            }
+        }
+
+        return (float)((double)count / num);
+    }
+
+    /**
+     A small load (close to zero) means the hash table is acting very
+     efficiently most of the time.  A large load (close to 1) means 
+     the hash table is acting poorly-- all operations will be very slow.
+     A large load will result from a bad hash function that maps too
+     many keys to the same code.
+     */
+    double debugGetLoad() const {
+        return debugGetDeepestBucketSize() / (double)size();
+    }
+
+    /**
+     Returns the number of buckets.
+     */
+    size_t debugGetNumBuckets() const {
+        return m_numBuckets;
+    }
+
+    /**
+     C++ STL style iterator variable.  See begin().
+     */
+    class Iterator {
+    private:
+        friend class Table;
+
+        /**
+         Bucket index.
+         */
+        size_t              index;
+
+        /**
+         Linked list node.
+         */
+        Node*               node;
+        ThisType*           table;
+        size_t              m_numBuckets;
+        Node**              m_bucket;
+        bool                isDone;
+
+        /**
+         Creates the end iterator.
+         */
+        Iterator(const ThisType* table) : table(const_cast(table)) {
+            isDone = true;
+        }
+
+        Iterator(const ThisType* table, size_t m_numBuckets, Node** m_bucket) :
+            table(const_cast(table)),
+            m_numBuckets(m_numBuckets),
+            m_bucket(m_bucket) {
+            
+            if (m_numBuckets == 0) {
+                // Empty table
+                isDone = true;
+                return;
+            }
+
+            index = 0;
+            node = m_bucket[index];
+            isDone = false;
+            findNext();
+        }
+
+        /**
+         Finds the next element, setting isDone if one can't be found.
+         Looks at the current element first.
+         */
+        void findNext() {
+            while (node == NULL) {
+                index++;
+                if (index >= m_numBuckets) {
+                    isDone = true;
+                    break;
+                } else {
+                    node = m_bucket[index];
+                }
+            }
+        }
+
+    public:
+        inline bool operator!=(const Iterator& other) const {
+            return !(*this == other);
+        }
+
+        bool operator==(const Iterator& other) const {
+            if (other.isDone || isDone) {
+                // Common case; check against isDone.
+                return (isDone == other.isDone) && (other.table == table);
+            } else {
+                return
+                    (table == other.table) &&
+                    (node == other.node) && 
+                    (index == other.index);
+            }
+        }
+
+        /**
+         Pre increment.
+         */
+        Iterator& operator++() {
+            node = node->next;
+            findNext();
+            return *this;
+        }
+
+        /**
+         Post increment (slower than preincrement).
+         */
+        Iterator operator++(int) {
+            Iterator old = *this;
+            ++(*this);
+            return old;
+        }
+
+        const Entry& operator*() const {
+            return node->entry;
+        }
+
+        Entry* operator->() const {
+            return &(node->entry);
+        }
+
+        operator Entry*() const {
+            return &(node->entry);
+        }
+
+		bool hasMore() const {
+			return ! isDone;
+		}
+    };
+
+
+    /**
+     C++ STL style iterator method.  Returns the first Entry, which 
+     contains a key and value.  Use preincrement (++entry) to get to
+     the next element.  Do not modify the table while iterating.
+     */
+    Iterator begin() const {
+        return Iterator(this, m_numBuckets, m_bucket);
+    }
+
+    /**
+     C++ STL style iterator method.  Returns one after the last iterator
+     element.
+     */
+    const Iterator end() const {
+        return Iterator(this);
+    }
+
+    /**
+     Removes all elements
+     */
+    void clear() {
+        freeMemory();
+        m_numBuckets = 0;
+        m_size = 0;
+        m_bucket = NULL;
+    }
+
+   
+    /**
+     Returns the number of keys.
+     */
+    size_t size() const {
+        return m_size;
+    }
+
+
+    /**
+     If you insert a pointer into the key or value of a table, you are
+     responsible for deallocating the object eventually.  Inserting 
+     key into a table is O(1), but may cause a potentially slow rehashing.
+     */
+    void set(const Key& key, const Value& value) {
+        getCreateEntry(key).value = value;
+    }
+
+private:
+
+    /** Helper for remove() and getRemove() */
+    bool remove(const Key& key, Key& removedKey, Value& removedValue, bool updateRemoved) {
+        if (m_numBuckets == 0) {
+            return false;
+        }
+       size_t code = HashFunc::hashCode(key);
+       size_t b = code % m_numBuckets;
+
+       // Go to the m_bucket
+       Node* n = m_bucket[b];
+
+       if (n == NULL) {
+           return false;
+       }
+
+       Node* previous = NULL;
+      
+       // Try to find the node
+       do {
+          if ((code == n->hashCode) && EqualsFunc::equals(n->entry.key, key)) {
+              // This is the node; remove it
+
+              // Replace the previous's next pointer
+              if (previous == NULL) {
+                  m_bucket[b] = n->next;
+              } else {
+                  previous->next = n->next;
+              }
+
+              if (updateRemoved) {
+                  removedKey   = n->entry.key;
+                  removedValue = n->entry.value;
+              }
+              // Delete the node
+              Node::destroy(n, m_memoryManager);
+              --m_size;
+              return true;
+          }
+
+          previous = n;
+          n = n->next;
+      } while (n != NULL);
+
+      return false;
+      //alwaysAssertM(false, "Tried to remove a key that was not in the table.");
+   }
+
+public:
+
+   /** If @a member is present, sets @a removed to the element
+    being removed and returns true.  Otherwise returns false
+    and does not write to @a removed. */
+    bool getRemove(const Key& key, Key& removedKey, Value& removedValue) {
+       return remove(key, removedKey, removedValue, true);
+    }
+
+    /**
+    Removes an element from the table if it is present.  
+    @return true if the element was found and removed, otherwise  false
+    */
+   bool remove(const Key& key) {
+       Key x;
+       Value v;
+       return remove(key, x, v, false);
+   }
+
+private:
+
+   Entry* getEntryPointer(const Key& key) const {
+       if (m_numBuckets == 0) {
+           return NULL;
+       }
+
+       size_t  code = HashFunc::hashCode(key);
+       size_t b = code % m_numBuckets;
+
+       Node* node = m_bucket[b];
+
+       while (node != NULL) {
+           if ((node->hashCode == code) && EqualsFunc::equals(node->entry.key, key)) {
+               return &(node->entry);
+           }
+           node = node->next;
+       }
+
+        return NULL;
+   }
+
+public:
+   
+    /** If a value that is EqualsFunc to @a member is present, returns a pointer to the 
+        version stored in the data structure, otherwise returns NULL.
+     */
+   const Key* getKeyPointer(const Key& key) const {
+       const Entry* e = getEntryPointer(key);
+       if (e == NULL) {
+           return NULL;
+       } else {
+           return &(e->key);
+       }
+   }
+
+   /**
+    Returns the value associated with key.
+    @deprecated Use get(key, val) or getPointer(key) 
+    */
+   Value& get(const Key& key) const {
+       Entry* e = getEntryPointer(key);
+       debugAssertM(e != NULL, "Key not found");
+       return e->value;
+   }
+
+
+   /** Returns a pointer to the element if it exists, or NULL if it does not.
+       Note that if your value type is a pointer, the return value is 
+       a pointer to a pointer.  Do not remove the element while holding this 
+       pointer.
+
+       It is easy to accidentally mis-use this method.  Consider making 
+       a Table and using get(key, val) instead, which makes you manage
+       the memory for the values yourself and is less likely to result in 
+       pointer errors.
+     */
+   Value* getPointer(const Key& key) const {
+       if (m_numBuckets == 0) {
+           return NULL;
+       }
+
+       size_t code = HashFunc::hashCode(key);
+       size_t b = code % m_numBuckets;
+
+       Node* node = m_bucket[b];
+
+       while (node != NULL) {
+          if ((node->hashCode == code) && EqualsFunc::equals(node->entry.key, key)) {
+             // found key
+             return &(node->entry.value);
+          }
+          node = node->next;
+      }
+
+      // Failed to find key
+      return NULL;
+   }
+
+   /**
+    If the key is present in the table, val is set to the associated value and returns true.
+    If the key is not present, returns false.
+    */
+   bool get(const Key& key, Value& val) const {
+       Value* v = getPointer(key);
+       if (v != NULL) {
+           val = *v;
+           return true;
+       } else {
+           return false;
+       }
+   }
+
+
+
+    /** Called by getCreate() and set() 
+        
+        \param created Set to true if the entry was created by this method.
+    */  
+    Entry& getCreateEntry(const Key& key, bool& created) {
+        created = false;
+
+        if (m_numBuckets == 0) {
+            resize(10);
+        }
+
+        size_t code = HashFunc::hashCode(key);
+        size_t b = code % m_numBuckets;
+        
+        // Go to the m_bucket
+        Node* n = m_bucket[b];
+
+        // No m_bucket, so this must be the first
+        if (n == NULL) {
+            m_bucket[b] = Node::create(key, code, NULL, m_memoryManager);
+            ++m_size;
+            created = true;
+            return m_bucket[b]->entry;
+        }
+
+        size_t bucketLength = 1;
+
+        // Sometimes a bad hash code will cause all elements
+        // to collide.  Detect this case and don't rehash when 
+        // it occurs; nothing good will come from the rehashing.
+        bool allSameCode = true;
+
+        // Try to find the node
+        do {
+            allSameCode = allSameCode && (code == n->hashCode);
+
+            if ((code == n->hashCode) && EqualsFunc::equals(n->entry.key, key)) {
+               // This is the a pre-existing node
+               return n->entry;
+            }
+
+            n = n->next;
+            ++bucketLength;
+        } while (n != NULL);
+
+        const size_t maxBucketLength = 3;
+        // (Don't bother changing the size of the table if all entries
+        // have the same hashcode--they'll still collide)
+        if ((bucketLength > maxBucketLength) && 
+            ! allSameCode && 
+            (m_numBuckets < m_size * 15)) {
+
+            // This m_bucket was really large; rehash if all elements
+            // don't have the same hashcode the number of buckets is
+            // reasonable.
+
+            // Back off the scale factor as the number of buckets gets 
+            // large
+            float f = 3.0f;
+            if (m_numBuckets > 1000000) {
+                f = 1.5f;
+            } else if (m_numBuckets > 100000) {
+                f = 2.0f;
+            }
+            int newSize = iMax((int)(m_numBuckets * f) + 1, (int)(m_size * f));
+            resize(newSize);
+        }
+
+        // Not found; insert at the head.
+        b = code % m_numBuckets;
+        m_bucket[b] = Node::create(key, code, m_bucket[b], m_memoryManager);
+        ++m_size;
+        created = true;
+        return m_bucket[b]->entry;
+   }
+
+    Entry& getCreateEntry(const Key& key) {
+        bool ignore;
+        return getCreateEntry(key, ignore);
+    }
+    
+
+    /** Returns the current value that key maps to, creating it if necessary.*/
+    Value& getCreate(const Key& key) {
+        return getCreateEntry(key).value;
+    }
+
+    /** \param created True if the element was created. */
+    Value& getCreate(const Key& key, bool& created) {
+        return getCreateEntry(key, created).value;
+    }
+
+
+   /**
+    Returns true if key is in the table.
+    */
+   bool containsKey(const Key& key) const {
+       if (m_numBuckets == 0) {
+           return false;
+       }
+
+       size_t code = HashFunc::hashCode(key);
+       size_t b = code % m_numBuckets;
+
+       Node* node = m_bucket[b];
+
+       while (node != NULL) {
+           if ((node->hashCode == code) && EqualsFunc::equals(node->entry.key, key)) {
+              return true;
+           }
+           node = node->next;
+       } while (node != NULL);
+
+       return false;
+   }
+
+
+   /**
+    Short syntax for get.
+    */
+   inline Value& operator[](const Key &key) const {
+      return get(key);
+   }
+
+   /**
+    Returns an array of all of the keys in the table.
+    You can iterate over the keys to get the values.
+    @deprecated
+    */
+   Array getKeys() const {
+       Array keyArray;
+       getKeys(keyArray);
+       return keyArray;
+   }
+
+   void getKeys(Array& keyArray) const {
+       keyArray.resize(0, DONT_SHRINK_UNDERLYING_ARRAY);
+       for (size_t i = 0; i < m_numBuckets; i++) {
+           Node* node = m_bucket[i];
+           while (node != NULL) {
+               keyArray.append(node->entry.key);
+               node = node->next;
+           }
+       }
+   }
+
+   /**
+    Calls delete on all of the keys and then clears the table.
+    */
+   void deleteKeys() {
+       for (size_t i = 0; i < m_numBuckets; i++) {
+           Node* node = m_bucket[i];
+           while (node != NULL) {
+               delete node->entry.key;
+               node = node->next;
+           }
+       }
+       clear();
+   }
+
+   /**
+    Calls delete on all of the values.  This is unsafe--
+    do not call unless you know that each value appears
+    at most once.
+
+    Does not clear the table, so you are left with a table
+    of NULL pointers.
+    */
+   void deleteValues() {
+       for (size_t i = 0; i < m_numBuckets; ++i) {
+           Node* node = m_bucket[i];
+           while (node != NULL) {
+               delete node->entry.value;
+               node->entry.value = NULL;
+               node = node->next;
+           }
+       }
+   }
+};
+
+} // namespace
+
+#ifdef _MSC_VER
+#   pragma warning (pop)
+#endif
+
+#endif
diff --git a/externals/g3dlite/G3D/TextInput.h b/externals/g3dlite/G3D/TextInput.h
new file mode 100644
index 00000000000..33eb8c48e53
--- /dev/null
+++ b/externals/g3dlite/G3D/TextInput.h
@@ -0,0 +1,801 @@
+/**
+ @file TextInput.h
+
+ Simple text lexer/tokenizer.
+
+ @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+
+ @cite Based on a lexer written by Aaron Orenstein. 
+
+ @created 2002-11-27
+ @edited  2009-11-24
+
+ Copyright 2000-2009, Morgan McGuire.
+ All rights reserved.
+ */
+
+#ifndef G3D_TextInput_h
+#define G3D_TextInput_h
+
+#include "G3D/platform.h"
+#include "G3D/Array.h"
+#include "G3D/Set.h"
+#include "G3D/ParseError.h"
+#include 
+#include 
+#include 
+#include 
+
+namespace G3D {
+
+/**
+ For use with TextInput.
+ */
+class Token {
+public:
+
+    /**
+     More detailed type information than Type.
+     */
+    enum ExtendedType {
+      DOUBLE_QUOTED_TYPE, 
+      SINGLE_QUOTED_TYPE, 
+      SYMBOL_TYPE,
+      FLOATING_POINT_TYPE, 
+      INTEGER_TYPE,
+      BOOLEAN_TYPE,
+      LINE_COMMENT_TYPE,
+      BLOCK_COMMENT_TYPE,
+      NEWLINE_TYPE,
+      END_TYPE
+    };
+
+    /**
+     Strings are enclosed in quotes, symbols are not.
+     */
+    enum Type {
+      STRING  = DOUBLE_QUOTED_TYPE, 
+      SYMBOL  = SYMBOL_TYPE, 
+      NUMBER  = FLOATING_POINT_TYPE, 
+      BOOLEAN = BOOLEAN_TYPE,
+      COMMENT = LINE_COMMENT_TYPE,
+      NEWLINE = NEWLINE_TYPE,
+      END     = END_TYPE
+    };
+
+private:
+
+    friend class TextInput;
+
+    /** 
+      Holds the actual value, which might be any type.  If a number, it will be 
+      parsed at runtime.
+    */
+    std::string             _string;
+
+    bool                    _bool;
+    int                     _line;
+    int                     _character;
+    Type                    _type;
+    ExtendedType            _extendedType;
+
+public:
+
+    Token() :
+        _string(""),
+        _bool(false),
+        _line(0), 
+        _character(0), 
+        _type(END), 
+        _extendedType(END_TYPE) {}
+
+    Token(Type t, ExtendedType e, const std::string& s, int L, int c)
+        : _string(s), _bool(false), _line(L), _character(c), _type(t), _extendedType(e) {}
+
+    Token(Type t, ExtendedType e, const std::string& s, bool b, int L, int c)
+        : _string(s), _bool(b), _line(L), _character(c), _type(t), _extendedType(e) {}
+
+    Type type() const {
+        return _type;
+    }
+
+    ExtendedType extendedType() const {
+        return _extendedType;
+    }
+
+    /**
+     The value of a single or double quote string (not including the quotes),
+     the name of a symbol, or the exact textual representation of a number as
+     parsed from the input. 
+     */
+    const std::string& string() const {
+        return _string;
+    }
+
+    bool boolean() const {
+        return _bool;
+    }
+
+    /**
+     Starting line of the input from which this token was parsed.  Starts
+     at 1.
+     */
+    int line() const {
+        return _line;
+    }
+
+    /**
+     Starting character position in the input line from which this token was
+     parsed.  Starts at 1.
+     */
+    int character() const {
+        return _character;
+    }
+
+    /** Return the numeric value for a number type, or zero if this is
+        not a number type.
+    */
+    double number() const;
+};
+
+
+/**
+ A simple style tokenizer for reading text files.  TextInput handles a
+ superset of C++,Java, Matlab, and Bash code text including single
+ line comments, block comments, quoted strings with escape sequences,
+ and operators.  TextInput recognizes several categories of tokens,
+ which are separated by white space, quotation marks, or the end of a
+ recognized operator:
+
+ 
    
+  
  • Token::SINGLE_QUOTED_TYPE string of characters surrounded by single quotes, e.g., 'x', '\\0', 'foo'.
+  
  • Token::DOUBLE_QUOTED_TYPE string of characters surrounded by double quotes, e.g., "x", "abc\txyz", "b o b".
+  
  • Token::SYMBOL_TYPE legal C++ operators, keywords, and identifiers.  e.g., >=, Foo, _X, class, {
+  
  • Token::INTEGER_TYPE numbers without decimal places or exponential notation. e.g., 10, 0x17F, 32, 0, -155
+  
  • Token::FLOATING_POINT_TYPE numbers with decimal places or exponential notation. e.g., 1e3, -1.2, .4, 0.5
+  
  • Token::BOOLEAN_TYPE special symbols like "true" and "false"; the exact details can be configured in TextInput::Settings
+  
  • Token::LINE_COMMENT_TYPE (disabled by default); generated for line comments as specified by TextInput::Settings
+  
  • Token::BLOCK_COMMENT_TYPE (disabled by default); generated for c-style block comments as specified by TextInput::Settings
+  
  • Token::NEWLINE_TYPE (disabled by default); generated for any of "\\r", "\\n" or "\\r\\n"
+ 

+
+ 
The special ".." and "..." tokens are always recognized in
+ addition to normal C++ operators. Additional tokens can be made
+ available by changing the Settings.
+
+ Negative numbers are handled specially because of the ambiguity between unary minus and negative numbers-- 
+ see the note on TextInput::read.
+
+  TextInput does not have helper functions for types with non-obvious
+  formatting, or helpers that would be redundant.  Use the serialize
+  methods instead for parsing specific types like int, Vector3, and
+  Color3.
+
+  Inside quoted strings escape sequences are converted.  Thus the
+  string token for ["a\\nb"] is 'a', followed by a newline, followed by
+  'b'.  Outside of quoted strings, escape sequences are not converted,
+  so the token sequence for [a\\nb] is symbol 'a', symbol '\\', symbol
+  'nb' (this matches what a C++ parser would do).  The exception is
+  that a specified TextInput::Settings::otherCommentCharacter preceeded
+  by a backslash is assumed to be an escaped comment character and is
+  returned as a symbol token instead of being parsed as a comment
+  (this is what a LaTex or VRML parser would do).
+
+  Examples
+
+  
+  TextInput ti(TextInput::FROM_STRING, "name = \"Max\", height = 6");
+
+  Token t;
+
+  t = ti.read(); 
+  debugAssert(t.type == Token::SYMBOL);
+  debugAssert(t.sval == "name");
+
+  ti.read();
+  debugAssert(t.type == Token::SYMBOL);
+  debugAssert(t.sval == "=");
+
+  std::string name = ti.read().sval;
+  ti.read();
+  

+
+  
+  TextInput ti(TextInput::FROM_STRING, "name = \"Max\", height = 6");
+  ti.readSymbols("name", "=");
+  std::string name = ti.readString();
+  ti.readSymbols(",", "height", "=");
+  double height = ti. readNumber();
+  

+
+ Assumes that the file is not modified once opened.
+ */
+class TextInput {
+public:
+
+    /** Tokenizer configuration options.  */
+    class Settings {
+    public:
+        /** If true, C-style slash-star marks a multi-line comment.
+
+            See generateCommentTokens for rules on how this is applied.
+
+            Default is true.
+         */
+        bool                cppBlockComments;
+
+        /** If true, // begins a single line comment.
+
+            See generateCommentTokens for rules on how this is applied.
+
+            Default is true.
+         */
+        bool                cppLineComments;
+
+        /** If true, otherCommentCharacter and otherCommentCharacter2
+            are used to begin single line comments in the same way
+            cppLineComments is.
+
+            See generateCommentTokens for rules on how this is applied.
+
+            Default is true.
+         */
+        bool                otherLineComments;
+
+        /** If true, \\r, \\n, \\t, \\0, \\\\ and other escape sequences inside
+            strings are converted to the equivalent C++ escaped character.
+            If false, backslashes are treated literally.  It is convenient to
+            set to false if reading Windows paths, for example, like
+            c:\\foo\\bar.
+
+            Default is true.
+         */
+        bool                escapeSequencesInStrings;
+
+        /** If not '\\0', specifies a character that begins single line
+            comments ('#' and '%' are popular choices).  This is independent
+            of the cppLineComments flag.  If the character appears in text with
+            a backslash in front of it, it is considered escaped and is not
+            treated as a comment character.
+
+            Default is '\\0'.
+         */
+        char                otherCommentCharacter;
+
+        /** Another (optional) 1-comment character.  Useful for files that
+            support multiple comment syntaxes.  Default is '\\0'.
+         */
+        char                otherCommentCharacter2;
+
+        /** If true, comments enabled by cppBlockComments, cppLineComments
+            and otherLineComments will generate their respective tokens.
+            If false, the same settings will enable parsing and ignoring
+            comments
+
+            Default is false.
+         */
+        bool                generateCommentTokens;
+
+        /** If true, newlines will generate  tokens.
+            If false, newlines will be discarded as whitespace when parsed
+            outside of other tokens.
+
+            Default is false.
+         */
+        bool                generateNewlineTokens;
+
+        /** If true, "-1" parses as the number -1 instead of the
+            symbol "-" followed by the number 1.  Default is true.*/
+        bool                signedNumbers;
+
+        /** If true, strings can be marked with single quotes (e.g.,
+            'aaa').  If false, the quote character is parsed as a
+            symbol. Default is true.  Backquote (`) is always parsed
+            as a symbol. */
+        bool                singleQuotedStrings;
+
+        /** The character to use as a single quote.  Defaults to "'" (backquote),
+            occasionally useful to set to "`" (forward quote) or to "," (comma) for
+            reading CSV files. */
+        char                singleQuoteCharacter;
+        
+        /** If set to a non-empty string, that string will be used in
+            place of the real file name (or in place of a pseudonym
+            constructed from the buffer if given FROM_STRING) in
+            tokens and exceptions.
+            
+            Default is empty.
+        */
+        std::string         sourceFileName;
+
+    
+        /** Added to the line number reported by peekLineNumber and in
+            exceptions.  Useful for concatenating files that are
+            parsed separately.  Default is zero. */
+        int                 startingLineNumberOffset;
+
+        /** 
+          Parse -1.#IND00 as the floating point number returned by
+          nan(), -1.#INF00 as -inf(), and 1.#INF00 as inf().  Note
+          that the C99 standard specifies that a variety of formats
+          like "NaN" and "nan" are to be used; these are easier to
+          parse yourself and not currently supported by readNumber.
+
+          An alternative to specifying msvcSpecials is to read numbers as:
+          
+            Token x = t.read();
+            Token y = t.peek();
+            if ((x.string() == "-1.") && 
+                (y.string() == "#INF00") && 
+                (y.character() == x.character() + 3) &&
+                (y.line() == x.line()) {
+                t.read();
+                return nan();
+            }
+            // ... similar cases for inf
+          

+
+          If the single-comment character was #, the floating point
+          special format overrides the comment and will be parsed
+          instead.
+
+          If signedNumbers is false msvcSpecials will not be parsed.
+
+          Default is true. */
+        bool                msvcSpecials;
+
+        /**
+         Parse the following set of useful proof symbols:
+         
+           =>
+           ::>
+           <::
+           :>
+           <:
+           |-
+           ::=
+           :=
+           <-
+
+           Default is false.
+        */
+        bool                proofSymbols;
+
+        /**
+         When parsing booleans and msvcSpecials, is case significant?
+         Default is {true}
+        */
+        bool                caseSensitive;
+
+        /** All symbols that will become the 'true' boolean token.  See also caseSensitive.
+            Clear this value to disable parsing of true booleans.
+
+            Default is {true}.
+         */
+        Set    trueSymbols;
+
+        /** See trueSymbols. Default is {false}*/
+        Set    falseSymbols;
+
+        Settings();
+    };
+	
+private:
+
+    std::deque       stack;
+
+    /**
+     Characters to be tokenized.
+     */
+    Array             buffer;
+
+    /**
+     Offset of current character (the next character to consumed) in
+     input buffer.
+     */
+    int                     currentCharOffset;
+
+    /**
+     Line number of next character to be consumed from the input buffer.  (1
+     indicates first line of input.)
+
+     Note that this is the line number of the @e next character to be
+     consumed from the input, not the line number of the @e last character
+     consumed!
+     */
+    int                     lineNumber;
+
+    /**
+     Character number (within the line) of the next character to be consumed
+     from the input buffer.  (1 indicates first character of the line).
+
+     Note that this is the character number of the @e next character to be
+     consumed from the input, not the character number of the @e last
+     character consumed!
+     */
+    int                     charNumber;
+
+    /** Configuration options.  This includes the file name that will be
+        reported in tokens and exceptions.  */
+    Settings                options;
+  
+    void init();
+
+    /**
+     Consumes the next character from the input buffer, and returns that
+     character.  Updates lineNumber and charNumber to reflect the location of
+     the next character in the input buffer.
+
+     Note: you shouldn't be using the return value of this function in most
+     cases.  In general, you should peekInputChar() to get the next
+     character, determine what to do with it, then consume it with this
+     function (or with eatAndPeekInputChar()).  Given that usage, in most
+     instances you already know what this function would return!
+     */
+    int eatInputChar();
+
+    /**
+     Returns the next character from the input buffer, without consuming any
+     characters.  Can also be used to look deeper into the input buffer.
+     Does not modify lineNumber or charNumber.
+
+     @param distance Index of the character in the input buffer to peek at,
+     relative to the next character.  Default is 0, for the next character in
+     the input buffer.
+     */
+    int peekInputChar(int distance = 0);
+
+    /**
+     Helper function to consume the next character in the input buffer and
+     peek at the one following (without consuming it).
+     */
+    inline int eatAndPeekInputChar() {
+        eatInputChar();
+        return peekInputChar(0);
+    }
+
+    /**
+     Read the next token, returning an END token if no more input is
+     available.
+     */
+    Token nextToken();
+
+    /**
+       Helper for nextToken.  Appends characters to t._string until the end
+       delimiter is reached.
+       
+       When called, the next character in the input buffer should be first the
+       first character after the opening delimiter character.
+    */
+    void parseQuotedString(unsigned char delimiter, Token& t);
+
+public:
+
+    class TokenException : public ParseError {
+    public:
+        /** Name of file being parsed when exception occurred. 
+            \deprecated  Use filename
+         */
+        std::string     sourceFile;
+
+        virtual ~TokenException() {}
+
+    protected:
+        
+        TokenException(
+            const std::string&  src,
+            int                 ln,
+            int                 ch);
+
+    };
+
+    /** While parsing a number of the form 1.\#IN?00, ? was 
+        not 'D' or 'F'. */
+    class BadMSVCSpecial : public TokenException {
+    public:
+
+        BadMSVCSpecial(
+            const std::string&  src,
+            int                 ln,
+            int                 ch);
+    };
+
+    /** Thrown by the read methods. */
+    class WrongTokenType : public TokenException {
+    public:
+        Token::Type     expected;
+        Token::Type     actual;
+
+        WrongTokenType(
+            const std::string&  src,
+            int                 ln,
+            int                 ch,
+            Token::Type         e,
+            Token::Type         a);
+    };
+
+    class WrongSymbol : public TokenException {
+    public:
+        std::string             expected;
+        std::string             actual;
+
+        WrongSymbol(
+            const std::string&  src,
+            int                 ln,
+            int                 ch,
+            const std::string&  e,
+            const std::string&  a);
+    };
+
+
+    /** String read from input did not match expected string.  */
+    class WrongString : public TokenException {
+    public:
+        std::string             expected;
+        std::string             actual;
+
+        WrongString(
+            const std::string&  src,
+            int                 ln,
+            int                 ch,
+            const std::string&  e,
+            const std::string&  a);
+    };
+
+    TextInput(const std::string& filename, const Settings& settings = Settings());
+
+    enum FS {FROM_STRING};
+    /** Creates input directly from a string.  The first argument must be
+        TextInput::FROM_STRING.
+    */
+    TextInput(FS fs, const std::string& str, const Settings& settings = Settings());
+
+    /** Returns true while there are tokens remaining. */
+    bool hasMore();
+
+    /** Read the next token (which will be the END token if ! hasMore()).
+    
+        Signed numbers can be handled in one of two modes.  If the option 
+        TextInput::Settings::signedNumbers is true,
+        A '+' or '-' immediately before a number is prepended onto that number and
+        if there is intervening whitespace, it is read as a separate symbol.
+
+        If TextInput::Settings::signedNumbers is false,
+        read() does not distinguish between a plus or minus symbol next
+        to a number and a positive/negative number itself.  For example, "x - 1" and "x -1"
+        will be parsed the same way by read().  
+        
+        In both cases, readNumber() will contract a leading "-" or "+" onto
+        a number.
+    */
+    Token read();
+
+    /** Calls read() until the result is not a newline or comment */
+    Token readSignificant();
+
+    /** Read one token (or possibly two) as a number or throws
+        WrongTokenType, and returns the number.
+
+        If the first token in the input is a number, it is returned directly.
+
+        If TextInput::Settings::signedNumbers is false and the input stream
+        contains a '+' or '-' symbol token immediately followed by a number
+        token, both tokens will be consumed and a single token will be
+        returned by this method.
+
+        WrongTokenType will be thrown if one of the input conditions
+        described above is not satisfied.  When an exception is thrown, no
+        tokens are consumed.
+    */
+    double readNumber();
+
+    bool readBoolean();
+
+    /** Reads a string token or throws WrongTokenType, and returns the token.
+
+        Use this method (rather than readString) if you want the token's
+        location as well as its value.
+
+        WrongTokenType will be thrown if the next token in the input stream
+        is not a string.  When an exception is thrown, no tokens are
+        consumed.
+    */
+    Token readStringToken();
+
+    /** Like readStringToken, but returns the token's string.
+
+        Use this method (rather than readStringToken) if you want the token's
+        value but don't really care about its location in the input.  Use of
+        readStringToken is encouraged for better error reporting.
+    */
+    std::string readString();
+
+    /** Reads a specific string token or throws either WrongTokenType or
+        WrongString.  If the next token in the input is a string matching @p
+        s, it will be consumed.
+
+        Use this method if you want to match a specific string from the
+        input.  In that case, typically error reporting related to the token
+        is only going to occur because of a mismatch, so no location
+        information is needed by the caller.
+
+        WrongTokenType will be thrown if the next token in the input stream
+        is not a string.  WrongString will be thrown if the next token in the
+        input stream is a string but does not match the @p s parameter.  When
+        an exception is thrown, no tokens are consumed.
+      */
+    void readString(const std::string& s);
+
+    /** Reads a comment token or throws WrongTokenType, and returns the token.
+
+        Use this method (rather than readComment) if you want the token's
+        location as well as its value.
+
+        WrongTokenType will be thrown if the next token in the input stream
+        is not a comment.  When an exception is thrown, no tokens are
+        consumed.
+    */
+    Token readCommentToken();
+
+    /** Like readCommentToken, but returns the token's string.
+
+        Use this method (rather than readCommentToken) if you want the token's
+        value but don't really care about its location in the input.  Use of
+        readCommentToken is encouraged for better error reporting.
+    */
+    std::string readComment();
+
+    /** Reads a specific comment token or throws either WrongTokenType or
+        WrongString.  If the next token in the input is a comment matching @p
+        s, it will be consumed.
+
+        Use this method if you want to match a specific comment from the
+        input.  In that case, typically error reporting related to the token
+        is only going to occur because of a mismatch, so no location
+        information is needed by the caller.
+
+        WrongTokenType will be thrown if the next token in the input stream
+        is not a comment.  WrongString will be thrown if the next token in the
+        input stream is a comment but does not match the @p s parameter.  When
+        an exception is thrown, no tokens are consumed.
+      */
+     void readComment(const std::string& s);
+
+    /** Reads a newline token or throws WrongTokenType, and returns the token.
+
+        Use this method (rather than readNewline) if you want the token's
+        location as well as its value.
+
+        WrongTokenType will be thrown if the next token in the input stream
+        is not a newline.  When an exception is thrown, no tokens are
+        consumed.
+    */
+    Token readNewlineToken();
+
+    /** Like readNewlineToken, but returns the token's string.
+
+        Use this method (rather than readNewlineToken) if you want the token's
+        value but don't really care about its location in the input.  Use of
+        readNewlineToken is encouraged for better error reporting.
+    */
+    std::string readNewline();
+
+    /** Reads a specific newline token or throws either WrongTokenType or
+        WrongString.  If the next token in the input is a newline matching @p
+        s, it will be consumed.
+
+        Use this method if you want to match a specific newline from the
+        input.  In that case, typically error reporting related to the token
+        is only going to occur because of a mismatch, so no location
+        information is needed by the caller.
+
+        WrongTokenType will be thrown if the next token in the input stream
+        is not a newline.  WrongString will be thrown if the next token in the
+        input stream is a newlin but does not match the @p s parameter.  When
+        an exception is thrown, no tokens are consumed.
+      */
+     void readNewline(const std::string& s);
+
+    /** Reads a symbol token or throws WrongTokenType, and returns the token.
+
+        Use this method (rather than readSymbol) if you want the token's
+        location as well as its value.
+
+        WrongTokenType will be thrown if the next token in the input stream
+        is not a symbol.  When an exception is thrown, no tokens are
+        consumed.
+    */
+    Token readSymbolToken();
+
+    /** Like readSymbolToken, but returns the token's string.
+
+        Use this method (rather than readSymbolToken) if you want the token's
+        value but don't really care about its location in the input.  Use of
+        readSymbolToken is encouraged for better error reporting.
+    */
+    std::string readSymbol();
+
+    /** Reads a specific symbol token or throws either WrongTokenType or
+        WrongSymbol.  If the next token in the input is a symbol matching @p
+        symbol, it will be consumed.
+
+        Use this method if you want to match a specific symbol from the
+        input.  In that case, typically error reporting related to the token
+        is only going to occur because of a mismatch, so no location
+        information is needed by the caller.
+
+        WrongTokenType will be thrown if the next token in the input stream
+        is not a symbol.  WrongSymbol will be thrown if the next token in the
+        input stream is a symbol but does not match the @p symbol parameter.
+        When an exception is thrown, no tokens are consumed.
+    */
+    void readSymbol(const std::string& symbol);
+
+
+    /** Read a series of two specific symbols.  See readSymbol.  */
+    inline void readSymbols(const std::string& s1, const std::string& s2) {
+        readSymbol(s1);
+        readSymbol(s2);
+    }
+
+    /** Read a series of three specific symbols.  See readSymbol.  */
+    inline void readSymbols(
+        const std::string& s1, 
+        const std::string& s2, 
+        const std::string& s3) {
+        readSymbol(s1);
+        readSymbol(s2);
+        readSymbol(s3);
+    }
+
+    /** Read a series of four specific symbols.  See readSymbol.  */
+    inline void readSymbols(
+        const std::string& s1, 
+        const std::string& s2, 
+        const std::string& s3,     
+        const std::string& s4) {
+        readSymbol(s1);
+        readSymbol(s2);
+        readSymbol(s3);
+        readSymbol(s4);
+    }
+
+    /** Return a copy of the next token in the input stream, but don't remove
+        it from the input stream.
+    */
+    Token peek();
+
+    /** Returns the line number for the @e next token.  See also peek.  */
+    int peekLineNumber();
+
+    /** Returns the character number (relative to the line) for the @e next
+        token in the input stream.  See also peek.
+    */
+    int peekCharacterNumber();
+
+    /** Take a previously read token and push it back at the front of the
+        input stream.
+
+        Can be used in the case where more than one token of read-ahead is
+        needed (i.e., when peek doesn't suffice).
+    */
+    void push(const Token& t);
+
+    /** Returns the filename from which this input is drawn, or the first few
+        characters of the string if created from a string.
+        If settings::filename is non-empty that will replace the
+        true filename.*/
+    const std::string& filename() const;
+};
+
+void deserialize(bool& b, TextInput& ti);
+void deserialize(int& b, TextInput& ti);
+void deserialize(uint8& b, TextInput& ti);
+void deserialize(double& b, TextInput& ti);
+void deserialize(float& b, TextInput& ti);
+void deserialize(std::string& b, TextInput& ti);
+
+} // namespace
+
+#endif
+
diff --git a/externals/g3dlite/G3D/TextOutput.h b/externals/g3dlite/G3D/TextOutput.h
new file mode 100644
index 00000000000..4c22b7d5653
--- /dev/null
+++ b/externals/g3dlite/G3D/TextOutput.h
@@ -0,0 +1,249 @@
+/**
+  @file TextOutput.h
+
+  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+  @created 2004-06-21
+  @edited  2006-10-24
+
+  Copyright 2000-2007, Morgan McGuire.
+  All rights reserved.
+ */
+
+#ifndef G3D_TEXTOUTPUT_H
+#define G3D_TEXTOUTPUT_H
+
+#include "G3D/platform.h"
+#include "G3D/Array.h"
+#include 
+
+namespace G3D {
+
+/**
+  Convenient formatting of ASCII text written to a file.
+  

+
+  The core writeString, writeNumber, and writeSymbol methods map to TextInput's
+  methods.  Number and Symbol each print an additional space that is used to 
+  separate adjacent tokens.
+  
+  TextOutput::printf allows arbitrary text to be conveniently dumped
+  en-masse.  Use [de]serialize(bool, TextOutput) and other overloads to read/write
+  primitive types in a standardized manner and 
+
+  

+  When a word-wrap line break occurs, all whitespace between words is replaced 
+  with a single newline (the newline may be two characters-- see 
+  G3D::TextOutput::Options::NewlineStyle).  Word wrapping occurs against
+  the number of columns specified by Options::numColumns, minus the current
+  indent level.
+
+  Indenting adds the specified number of spaces immediately after a newline.
+  If a newline was followed by spaces in the original string, these are added
+  to the indent spaces.  Indenting will indent blank lines and will leave
+  indents after the last newline of a file (if the indent level is non-zero at the end).
+
+  
Serialization/Marshalling
+  
Text serialization is accomplished using TextOutput by defining the pair of 
+  methods:
+
+  
+  void serialize(TextOutput& to) const;
+  void deserialize(TextInput& ti);
+  

+
+  See also G3D::TextInput.
+
+  

+  BETA API
+  
This API is subject to change in future versions.
+ */
+class TextOutput {
+public:
+
+    class Settings {
+    public:
+        /** 
+          WRAP_NONE             Word wrapping is disabled
+          WRAP_WITHOUT_BREAKING Word-wrap, but don't break continuous lines that
+                                are longer than numColumns (default)
+          WRAP_ALWAYS           Wrap even if it means breaking a continuous line or
+                                a quoted string.
+
+          Word wrapping is only allowed at whitespaces ('\\n', '\\r', '\\t', ' '); it
+          will not occur after commas, punctuation, minus signs, or any other characters
+        */
+        enum WordWrapMode {WRAP_NONE, WRAP_WITHOUT_BREAKING, WRAP_ALWAYS};
+
+        /** Defaults to WRAP_WITHOUT_BREAKING */
+        WordWrapMode        wordWrap;
+
+        /** Is word-wrapping allowed to insert newlines inside double quotes?
+            Default: false */
+        bool                allowWordWrapInsideDoubleQuotes;
+
+        /** Number of columns for word wrapping. Default: 8 */
+        int                 numColumns;
+
+        /** Number of spaces in each indent. Default: 4 */
+        int                 spacesPerIndent;
+
+        /** Style of newline used by word wrapping and by (optional) conversion.
+            default: Windows: NEWLINE_WINDOWS, Linux, OS X: NEWLINE_UNIX.
+          */
+        enum NewlineStyle {NEWLINE_WINDOWS, NEWLINE_UNIX};
+
+        NewlineStyle        newlineStyle;
+
+        /** If true, all newlines are converted to NewlineStyle regardless of 
+            how they start out. Default: true. */
+        bool                convertNewlines;
+
+        /** Used by writeBoolean */
+        std::string         trueSymbol;
+
+        /** Used by writeBoolean */
+        std::string         falseSymbol;
+
+        Settings() :
+            wordWrap(WRAP_WITHOUT_BREAKING),
+            allowWordWrapInsideDoubleQuotes(false),
+            numColumns(80),
+            spacesPerIndent(4),
+            convertNewlines(true),
+            trueSymbol("true"),
+            falseSymbol("false") {
+            #ifdef G3D_WIN32
+                newlineStyle = NEWLINE_WINDOWS;
+            #else
+                newlineStyle = NEWLINE_UNIX;
+            #endif
+        }
+    };
+
+private:
+
+    /** Used by indentAndAppend to tell when we are writing the
+        first character of a new line. 
+      
+        So that push/popIndent work correctly, we cannot indent
+        immediately after writing a newline.  Instead we must
+        indent on writing the first character after that 
+        newline.
+      */
+    bool                    startingNewLine;
+
+    /** Number of characters at the end of the buffer since the last newline */
+    int                     currentColumn;
+
+    /** True if we have seen an open " and no close ".*/
+    bool                    inDQuote;
+
+    /** Empty if there is none */
+    std::string             filename;
+
+    Array             data;
+
+    Settings                option;
+
+    /** Number of indents to prepend before each line.  Always set using setIndentLevel.*/
+    int                     indentLevel;
+
+    void setIndentLevel(int i);
+
+    /** Actual number of spaces to indent. */
+    int                     indentSpaces;
+
+    /** the newline character(s) */
+    std::string             newline;
+
+    void setOptions(const Settings& _opt);
+
+    /** Converts to the desired newlines.  Called from vprintf */
+    void convertNewlines(const std::string& in, std::string& out);
+
+    /** Called from vprintf */
+    void wordWrapIndentAppend(const std::string& str);
+
+    /** Appends the character to data, indenting whenever a newline is encountered.
+        Called from wordWrapIndentAppend */
+    void indentAppend(char c);
+
+public:
+
+    explicit TextOutput(const std::string& filename, const Settings& options = Settings());
+
+    /** Constructs a text output that can later be commited to a string instead of a file.*/
+    explicit TextOutput(const Settings& options = Settings());
+
+    /** Commit to the filename specified on the constructor. 
+         Not called from the destructor; you must call
+     it yourself.
+    @param flush If true (default) the file is ready for reading when the method returns, otherwise 
+     the method returns immediately and writes the file in the background.*/
+    void commit(bool flush = true);
+
+    /** Commits to this string */
+    void commitString(std::string& string);
+
+    /** Increase indent level by 1 */
+    void pushIndent();
+
+    void popIndent();
+
+    /** Produces a new string that contains the output */
+    std::string commitString();
+
+    /** Writes a quoted string. Special characters in the string (e.g., \\, \\t, \\n) are escaped so that 
+        TextInput will produce the identical string on reading.*/
+    void writeString(const std::string& string);
+
+    void writeBoolean(bool b);
+
+    void writeNumber(double n);
+
+    void writeNumber(int n);
+
+    void writeNewline();
+    void writeNewlines(int numLines);
+
+    /** The symbol is written without quotes.  Symbols are required to begin with a
+        letter or underscore and contain only letters, underscores, and numbers 
+        or be a C++ symbol (e.g. "{", "(", "++", etc.)
+        so that they may be properly parsed by TextInput::readSymbol. Symbols are
+        printed with a trailing space.*/
+    void writeSymbol(const std::string& string);
+
+    /** Convenient idiom for writing multiple symbols in a row, e.g.
+        writeSymbols("name", "=");  The empty symbols are not written.
+        */
+    void writeSymbols(
+        const std::string& a,
+        const std::string& b = "",
+        const std::string& c = "",
+        const std::string& d = "",
+        const std::string& e = "",
+        const std::string& f = "");
+
+    /** Normal printf conventions.  Note that the output will be reformatted
+        for word-wrapping and newlines */
+    void __cdecl printf(const char* fmt, ...)
+        G3D_CHECK_PRINTF_METHOD_ARGS;
+
+    // Can't pass by reference because that confuses va_start
+    void __cdecl printf(const std::string fmt, ...);
+    void __cdecl vprintf(const char* fmt, va_list argPtr) 
+        G3D_CHECK_VPRINTF_METHOD_ARGS;
+};
+
+// Primitive serializers
+void serialize(const bool& b, TextOutput& to);
+void serialize(const int& b, TextOutput& to);
+void serialize(const uint8& b, TextOutput& to);
+void serialize(const double& b, TextOutput& to);
+void serialize(const float& b, TextOutput& to);
+void serialize(const std::string& b, TextOutput& to);
+void serialize(const char* b, TextOutput& to);
+
+}
+
+#endif
diff --git a/externals/g3dlite/G3D/ThreadSet.h b/externals/g3dlite/G3D/ThreadSet.h
new file mode 100644
index 00000000000..121f1415a1d
--- /dev/null
+++ b/externals/g3dlite/G3D/ThreadSet.h
@@ -0,0 +1,87 @@
+#ifndef G3D_THREADSET_H
+#define G3D_THREADSET_H
+
+#include "G3D/platform.h"
+#include "G3D/Array.h"
+#include "G3D/ReferenceCount.h"
+#include "G3D/GThread.h"
+#include "G3D/GMutex.h"
+
+namespace G3D {
+
+/** Manages a set of threads. All methods are threadsafe except for
+    the iterator begin/end. 
+
+    @beta*/
+class ThreadSet : public ReferenceCountedObject {
+public:
+    /** Intended to allow future use with a template parameter.*/
+    typedef GThread                                        Thread;
+
+    typedef ReferenceCountedPointer                ThreadRef;
+    typedef ReferenceCountedPointer             Ref;
+    typedef Array::Iterator                     Iterator;
+    typedef Array::ConstIterator                ConstIterator;
+
+private:
+
+    /** Protects m_thread */
+    GMutex                m_lock;
+
+    /** Threads in the set */
+    Array      m_thread;
+
+public:
+    
+    /** Total number of threads (some of which may be completed). */
+    int size() const;
+
+    /** Number of threads that have been started */
+    int numStarted() const;
+
+    /** Start all threads that are not currently started.
+
+        @param lastThreadBehavior If USE_CURRENT_THREAD, takes the last unstarted thread and executes it manually on
+        the current thread.  This helps to take full advantage of the machine when
+        running a large number of jobs and avoids the overhead of a thread start for single-thread groups.
+        Note that this forces start() to block until
+        that thread is complete.        
+      */
+    void start(GThread::SpawnBehavior lastThreadBehavior = GThread::USE_NEW_THREAD) const;
+
+    /** Terminate all threads that are currently started */
+    void terminate() const;
+
+    /** Waits until all started threads have completed. */
+    void waitForCompletion() const;
+
+    /** Remove all (not stopping them) */
+    void clear();
+
+    /** Removes completed threads and returns the new size.*/
+    int removeCompleted();
+
+    /** Inserts a new thread, if it is not already present, and 
+        returns the new number of threads.*/
+    int insert(const ThreadRef& t);
+
+    /** Removes a thread. Returns true if the thread was present and
+        removed. */
+    bool remove(const ThreadRef& t);
+
+    bool contains(const ThreadRef& t) const;
+   
+    /** It is an error to mutate the ThreadSet while iterating through it. */
+    Iterator begin();
+
+    Iterator end();
+
+    ConstIterator begin() const;
+
+    ConstIterator end() const;
+};
+
+
+} // namespace G3D
+
+#endif
diff --git a/externals/g3dlite/G3D/Triangle.h b/externals/g3dlite/G3D/Triangle.h
new file mode 100644
index 00000000000..590dbaad946
--- /dev/null
+++ b/externals/g3dlite/G3D/Triangle.h
@@ -0,0 +1,160 @@
+/**
+ @file Triangle.h
+  
+ @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+ 
+ @created 2003-04-05
+ @edited  2008-10-06
+
+ @cite Random point method by  Greg Turk, Generating random points in triangles.  In A. S. Glassner, ed., Graphics Gems, pp. 24-28. Academic Press, 1990
+
+ Copyright 2000-2009, Morgan McGuire.
+ All rights reserved.
+ */
+
+#ifndef G3D_TRIANGLE_H
+#define G3D_TRIANGLE_H
+
+#include "G3D/platform.h"
+#include "G3D/g3dmath.h"
+#include "G3D/Vector3.h"
+#include "G3D/Plane.h"
+#include "G3D/BoundsTrait.h"
+#include "G3D/debugAssert.h"
+#include 
+
+namespace G3D {
+
+/**
+  A generic triangle representation.  This should not be used
+  as the underlying triangle for creating models; it is intended
+  for providing fast property queries but requires a lot of
+  storage and is mostly immutable.
+  */
+class Triangle {
+private:
+    friend class CollisionDetection;
+    friend class Ray;
+
+    Vector3                     _vertex[3];
+
+    /** edgeDirection[i] is the normalized vector v[i+1] - v[i] */
+    Vector3                     edgeDirection[3];
+    float                       edgeMagnitude[3];
+    Plane                       _plane;
+    Vector3::Axis               _primaryAxis;
+
+    /** vertex[1] - vertex[0] */
+    Vector3                     _edge01;
+
+    /** vertex[2] - vertex[0] */
+    Vector3                     _edge02;
+
+    float                       _area;
+
+    void init(const Vector3& v0, const Vector3& v1, const Vector3& v2);
+
+public:
+	
+    Triangle(class BinaryInput& b);
+	void serialize(class BinaryOutput& b);
+	void deserialize(class BinaryInput& b);
+
+    Triangle();
+    
+    Triangle(const Vector3& v0, const Vector3& v1, const Vector3& v2);
+    
+    ~Triangle();
+
+    /** 0, 1, or 2 */
+    inline const Vector3& vertex(int n) const {
+        debugAssert((n >= 0) && (n < 3));
+        return _vertex[n];
+    }
+
+    /** vertex[1] - vertex[0] */
+    inline const Vector3& edge01() const {
+        return _edge01;
+    }
+
+    /** vertex[2] - vertex[0] */
+    inline const Vector3& edge02() const {
+        return _edge02;
+    }
+
+    float area() const;
+
+    Vector3::Axis primaryAxis() const {
+        return _primaryAxis;
+    }
+
+    const Vector3& normal() const;
+
+    /** Barycenter */
+    Vector3 center() const;
+
+    const Plane& plane() const;
+
+    /** Returns a random point in the triangle. */
+    Vector3 randomPoint() const;
+
+    inline void getRandomSurfacePoint
+    (Vector3& P, 
+     Vector3& N = Vector3::ignore()) const {
+        P = randomPoint();
+        N = normal();
+    }
+
+    /**
+     For two triangles to be equal they must have
+     the same vertices in the same order.
+     That is, vertex[0] == vertex[0], etc.
+     */
+    inline bool operator==(const Triangle& other) const {
+        for (int i = 0; i < 3; ++i) {
+            if (_vertex[i] != other._vertex[i]) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    inline size_t hashCode() const {
+        return
+            _vertex[0].hashCode() +
+            (_vertex[1].hashCode() >> 2) +
+            (_vertex[2].hashCode() >> 3);
+    }
+
+    void getBounds(class AABox&) const;
+
+    /**
+       @brief Intersect the ray at distance less than @a distance.
+
+       @param distance Set to the maximum distance (can be G3D::inf())
+       to search for an intersection.  On return, this is the smaller
+       of the distance to the intersection, if one exists, and the original
+       value.
+       
+       @param baryCoord  If a triangle is hit before @a distance, a
+       the barycentric coordinates of the hit location on the triangle.
+       Otherwise, unmodified.
+
+       @return True if there was an intersection before the original distance.
+     */
+    bool intersect(const class Ray& ray, float& distance, float baryCoord[3]) const;
+};
+
+} // namespace G3D
+
+template <> struct HashTrait {
+    static size_t hashCode(const G3D::Triangle& key) { return key.hashCode(); }
+};
+
+
+template<> struct BoundsTrait {
+    static void getBounds(const G3D::Triangle& t, G3D::AABox& out) { t.getBounds(out); }
+};
+
+#endif
diff --git a/externals/g3dlite/G3D/UprightFrame.h b/externals/g3dlite/G3D/UprightFrame.h
new file mode 100644
index 00000000000..ad5157cb14b
--- /dev/null
+++ b/externals/g3dlite/G3D/UprightFrame.h
@@ -0,0 +1,83 @@
+/**
+ @file UprightFrame.h
+
+ @author Morgan McGuire, http://graphics.cs.williams.edu
+ */
+
+#ifndef G3D_UPRIGHTFRAME_H
+#define G3D_UPRIGHTFRAME_H
+
+#include "G3D/platform.h"
+#include "G3D/Spline.h"
+#include "G3D/Vector3.h"
+#include "G3D/CoordinateFrame.h"
+
+namespace G3D {
+
+/**
+ Coordinate frame expressed in Euler angles.
+ Unlike a G3D::Quat, UprightFrame always keeps the reference frame from rolling about its own z axis.
+ Particularly useful for cameras.
+
+ @sa G3D::CoordinateFrame, G3D::Matrix4, G3D::PhysicsFrame, G3D::UprightSpline, G3D::UprightSplineManipulator
+ */
+class UprightFrame {
+public:
+
+    Vector3         translation;
+
+    /** -pi/2 < pitch < pi/2 in radians about the X-axis */
+    float           pitch;
+
+    /** In radians about the Y-axis */
+    float           yaw;
+
+    inline UprightFrame(const Vector3& t = Vector3::zero(), float p = 0, float y = 0) 
+        : translation(t), pitch(p), yaw(y) {}
+
+    UprightFrame(const CoordinateFrame& cframe);
+    
+    CoordinateFrame toCoordinateFrame() const;
+
+    /** Supports implicit cast to CoordinateFrame */
+    inline operator CoordinateFrame() const {
+        return toCoordinateFrame();
+    }
+
+    /** Required for use with spline */
+    UprightFrame operator+(const UprightFrame& other) const;
+
+    /** Required for use with spline */
+    UprightFrame operator*(const float k) const;
+
+    /**
+       Unwraps the yaw values in the elements of the array such that
+       they still represent the same angles but strictly increase/decrease
+       without wrapping about zero.  For use with Spline
+     */
+    static void unwrapYaw(UprightFrame* a, int N);
+
+    void serialize(class BinaryOutput& b) const;
+    void deserialize(class BinaryInput& b);
+};
+
+/** Shortest-path linear velocity spline for camera positions.  Always keeps the camera from rolling.
+@sa G3D::UprightSplineManipulator, G3D::UprightFrame
+*/
+class UprightSpline : public Spline {
+protected:
+
+    virtual void ensureShortestPath(UprightFrame* A, int N) const {
+        UprightFrame::unwrapYaw(A, N);
+    }
+
+public:
+    
+    void serialize(class BinaryOutput& b) const;
+    void deserialize(class BinaryInput& b);
+
+};
+
+}
+
+#endif
diff --git a/externals/g3dlite/G3D/Vector2.h b/externals/g3dlite/G3D/Vector2.h
new file mode 100644
index 00000000000..dba7353785e
--- /dev/null
+++ b/externals/g3dlite/G3D/Vector2.h
@@ -0,0 +1,454 @@
+/**
+  @file Vector2.h
+ 
+  2D vector class
+ 
+  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+  
+  @created 2001-06-02
+  @edited  2008-11-30
+
+  Copyright 2000-2009, Morgan McGuire.
+  All rights reserved.
+*/
+
+#ifndef G3D_VECTOR2_H
+#define G3D_VECTOR2_H
+
+#include 
+
+#include "G3D/platform.h"
+#include "G3D/g3dmath.h"
+#include "G3D/Table.h"
+#include "G3D/HashTrait.h"
+#include "G3D/Vector2int16.h"
+#include "G3D/Random.h"
+
+namespace G3D {
+
+class Vector2;    
+class Vector3;
+class Vector4;
+class Any;
+
+/**
+ Do not subclass-- this implementation makes assumptions about the
+ memory layout.
+ */
+class Vector2 {
+private:
+    // Hidden operators
+    bool operator<(const Vector2&) const;
+    bool operator>(const Vector2&) const;
+    bool operator<=(const Vector2&) const;
+    bool operator>=(const Vector2&) const;
+
+public:
+    float x;
+    float y;
+
+    /** \param any Must either Vector2(#, #) or Vector2 {x = #, y = #}*/
+    Vector2(const Any& any);
+    
+    /** Converts the Vector2 to an Any. */
+    operator Any() const;
+
+    /** Creates the zero vector */
+    Vector2();
+    Vector2(class TextInput& t);
+    Vector2(class BinaryInput& b);
+    Vector2(float x, float y);
+    Vector2(float coordinate[2]);
+    Vector2(double coordinate[2]);
+    Vector2(const Vector2& other);
+    Vector2(const Vector2int16& other); 
+
+    void serialize(class BinaryOutput& b) const;
+    void deserialize(class BinaryInput& b);
+
+    void serialize(class TextOutput& t) const;
+    void deserialize(class TextInput& t);
+
+    float& operator[](int i);
+    const float& operator[](int i) const;
+
+    // assignment and comparison
+    Vector2& operator=(const Vector2& other);
+    bool operator==(const Vector2& other) const;
+    bool operator!=(const Vector2& other) const;
+    size_t hashCode() const;
+    bool fuzzyEq(const Vector2& other) const;
+    bool fuzzyNe(const Vector2& other) const;
+
+    /** Returns true if this vector has finite length */
+    bool isFinite() const;
+
+    /** Returns true if this vector has length == 0 */
+    bool isZero() const;
+
+    /** Returns true if this vector has length == 1 */
+    bool isUnit() const;
+
+    // arithmetic operations
+    Vector2 operator+(const Vector2& v) const;
+    Vector2 operator-(const Vector2& v) const;
+    Vector2 operator*(float s) const;
+
+    /** Array (pointwise) multiplication */
+    Vector2 operator*(const Vector2& v) const;
+
+    /** Array division */
+    Vector2 operator/(const Vector2& v) const;
+    Vector2 operator/(float s) const;
+
+    /** Unary minus */
+    Vector2 operator-() const;
+
+    /** x + y */
+    inline float sum() const {
+        return x + y;
+    }
+
+    /**
+     Linear interpolation
+     */
+    inline Vector2 lerp(const Vector2& v, float alpha) const {
+        return (*this) + (v - *this) * alpha; 
+    }
+
+    inline Vector2 clamp(const Vector2& low, const Vector2& high) const {
+        return Vector2(
+            G3D::clamp(x, low.x, high.x),
+            G3D::clamp(y, low.y, high.y));
+    }
+
+    inline Vector2 clamp(float low, float high) const {
+        return Vector2(
+            (float)G3D::clamp(x, low, high),
+            (float)G3D::clamp(y, low, high));
+    }
+
+    // arithmetic updates
+    Vector2& operator+=(const Vector2&);
+    Vector2& operator-=(const Vector2&);
+    Vector2& operator*=(float);
+    Vector2& operator/=(float);
+    Vector2& operator*=(const Vector2&);
+    Vector2& operator/=(const Vector2&);
+
+    // vector operations
+
+    /**  */
+    float length() const;
+    
+    /** Returns a unit-length vector */
+    Vector2 direction() const;
+
+    /**
+     Potentially less accurate but faster than direction().
+     Only works if System::hasSSE is true.
+     */
+    Vector2 fastDirection() const {
+        return direction();
+    }
+
+    float squaredLength() const;
+    float dot(const Vector2& s) const;
+
+    /**
+     Make this vector have unit length and return the old length.
+     If the vector length was less than tolerance, do not normalize.
+     */
+    float unitize(float fTolerance = 1e-06);
+
+    Vector2 min(const Vector2& v) const;
+    Vector2 max(const Vector2& v) const;
+
+    /** Uniformly distributed random vector on the unit sphere */
+    static Vector2 random(Random& r = Random::common());
+
+    // Special values.
+    // Intentionally not inlined: see Matrix3::identity() for details.
+    static const Vector2& zero();
+    static const Vector2& one();
+    static const Vector2& unitX();
+    static const Vector2& unitY();
+    static const Vector2& inf(); 
+    static const Vector2& nan();
+    /** smallest (most negative) representable vector */
+    static const Vector2& minFinite(); 
+    /** Largest representable vector */
+    static const Vector2& maxFinite();
+
+    std::string toString() const;
+
+    // 2-char swizzles
+
+    Vector2 xx() const;
+    Vector2 yx() const;
+    Vector2 xy() const;
+    Vector2 yy() const;
+
+    // 3-char swizzles
+
+    Vector3 xxx() const;
+    Vector3 yxx() const;
+    Vector3 xyx() const;
+    Vector3 yyx() const;
+    Vector3 xxy() const;
+    Vector3 yxy() const;
+    Vector3 xyy() const;
+    Vector3 yyy() const;
+
+    // 4-char swizzles
+
+    Vector4 xxxx() const;
+    Vector4 yxxx() const;
+    Vector4 xyxx() const;
+    Vector4 yyxx() const;
+    Vector4 xxyx() const;
+    Vector4 yxyx() const;
+    Vector4 xyyx() const;
+    Vector4 yyyx() const;
+    Vector4 xxxy() const;
+    Vector4 yxxy() const;
+    Vector4 xyxy() const;
+    Vector4 yyxy() const;
+    Vector4 xxyy() const;
+    Vector4 yxyy() const;
+    Vector4 xyyy() const;
+    Vector4 yyyy() const;
+
+};
+
+inline Vector2 operator*(double s, const Vector2& v) {
+    return v * (float)s;
+}
+
+inline Vector2 operator*(float s, const Vector2& v) {
+    return v * s;
+}
+
+inline Vector2 operator*(int s, const Vector2& v) {
+    return v * (float)s;
+}
+
+
+inline Vector2::Vector2 () : x(0.0f), y(0.0f) {
+}
+
+
+inline Vector2::Vector2(float _x, float _y) : x(_x), y(_y) {
+}
+
+
+inline Vector2::Vector2 (float afCoordinate[2]) {
+    x = afCoordinate[0];
+    y = afCoordinate[1];
+}
+
+
+
+inline Vector2::Vector2 (double afCoordinate[2]) {
+    x = (float)afCoordinate[0];
+    y = (float)afCoordinate[1];
+}
+
+
+inline Vector2::Vector2 (const Vector2& rkVector) {
+    x = rkVector.x;
+    y = rkVector.y;
+}
+
+
+inline Vector2::Vector2 (const Vector2int16& v) : x(v.x), y(v.y) {
+}
+
+
+inline float& Vector2::operator[] (int i) {
+    return ((float*)this)[i];
+}
+
+
+inline const float& Vector2::operator[] (int i) const {
+    return ((float*)this)[i];
+}
+
+
+inline Vector2& Vector2::operator= (const Vector2& rkVector) {
+    x = rkVector.x;
+    y = rkVector.y;
+    return *this;
+}
+
+
+inline bool Vector2::operator== (const Vector2& rkVector) const {
+    return ( x == rkVector.x && y == rkVector.y);
+}
+
+
+inline bool Vector2::operator!= (const Vector2& rkVector) const {
+    return ( x != rkVector.x || y != rkVector.y);
+}
+
+
+inline Vector2 Vector2::operator+ (const Vector2& rkVector) const {
+    return Vector2(x + rkVector.x, y + rkVector.y);
+}
+
+
+inline Vector2 Vector2::operator- (const Vector2& rkVector) const {
+    return Vector2(x - rkVector.x, y - rkVector.y);
+}
+
+
+inline Vector2 Vector2::operator* (float fScalar) const {
+    return Vector2(fScalar*x, fScalar*y);
+}
+
+
+
+inline Vector2 Vector2::operator- () const {
+    return Vector2( -x, -y);
+}
+
+
+
+inline Vector2& Vector2::operator+= (const Vector2& rkVector) {
+    x += rkVector.x;
+    y += rkVector.y;
+    return *this;
+}
+
+
+
+inline Vector2& Vector2::operator-= (const Vector2& rkVector) {
+    x -= rkVector.x;
+    y -= rkVector.y;
+    return *this;
+}
+
+
+
+inline Vector2& Vector2::operator*= (float fScalar) {
+    x *= fScalar;
+    y *= fScalar;
+    return *this;
+}
+
+
+
+
+inline Vector2& Vector2::operator*= (const Vector2& rkVector) {
+    x *= rkVector.x;
+    y *= rkVector.y;
+    return *this;
+}
+
+
+
+inline Vector2& Vector2::operator/= (const Vector2& rkVector) {
+    x /= rkVector.x;
+    y /= rkVector.y;
+    return *this;
+}
+
+
+inline Vector2 Vector2::operator* (const Vector2& rkVector) const {
+    return Vector2(x * rkVector.x, y * rkVector.y);
+}
+
+
+
+inline Vector2 Vector2::operator/ (const Vector2& rkVector) const {
+    return Vector2(x / rkVector.x, y / rkVector.y);
+}
+
+
+inline float Vector2::squaredLength () const {
+    return x*x + y*y;
+}
+
+
+inline float Vector2::length () const {
+    return sqrtf(x*x + y*y);
+}
+
+
+inline Vector2 Vector2::direction () const {
+    float lenSquared = x * x + y * y;
+
+    if (lenSquared != 1.0f) {
+        return *this / sqrtf(lenSquared);
+    } else {
+        return *this;
+    }
+}
+
+
+
+inline float Vector2::dot (const Vector2& rkVector) const {
+    return x*rkVector.x + y*rkVector.y;
+}
+
+
+
+inline Vector2 Vector2::min(const Vector2 &v) const {
+    return Vector2(G3D::min(v.x, x), G3D::min(v.y, y));
+}
+
+
+
+inline Vector2 Vector2::max(const Vector2 &v) const {
+    return Vector2(G3D::max(v.x, x), G3D::max(v.y, y));
+}
+
+
+
+inline bool Vector2::fuzzyEq(const Vector2& other) const {
+    return G3D::fuzzyEq((*this - other).squaredLength(), 0);
+}
+
+
+
+inline bool Vector2::fuzzyNe(const Vector2& other) const {
+    return G3D::fuzzyNe((*this - other).squaredLength(), 0);
+}
+
+
+
+inline bool Vector2::isFinite() const {
+    return G3D::isFinite(x) && G3D::isFinite(y);
+}
+
+
+
+inline bool Vector2::isZero() const {
+    return (x == 0.0f) && (y == 0.0f);
+}
+
+
+
+inline bool Vector2::isUnit() const {
+    return squaredLength() == 1.0f;
+}
+
+} // namespace G3D
+
+template <>
+struct HashTrait {
+    static size_t hashCode(const G3D::Vector2& key) {
+        return key.hashCode();
+    }
+};
+
+
+// Intentionally outside namespace to avoid operator overloading confusion
+inline G3D::Vector2 operator*(double s, const G3D::Vector2& v) {
+    return v * (float)s;
+}
+inline G3D::Vector2 operator*(int s, const G3D::Vector2& v) {
+    return v * (float)s;
+}
+
+#endif
diff --git a/externals/g3dlite/G3D/Vector2.inl b/externals/g3dlite/G3D/Vector2.inl
new file mode 100644
index 00000000000..4f7c55a39cf
--- /dev/null
+++ b/externals/g3dlite/G3D/Vector2.inl
@@ -0,0 +1,18 @@
+/**
+ @file Vector2.inl
+
+ @maintainer Morgan McGuire, matrix@graphics3d.com
+ @cite Portions by Laura Wollstadt, graphics3d.com
+
+ @cite Portions based on Dave Eberly'x Magic Software Library
+ at http://www.magic-software.com
+
+ @created 2001-06-02
+ @edited  2006-01-14
+
+  Copyright 2000-2006, Morgan McGuire.
+  All rights reserved.
+ */
+
+}
+
diff --git a/externals/g3dlite/G3D/Vector2int16.h b/externals/g3dlite/G3D/Vector2int16.h
new file mode 100644
index 00000000000..ba72266d75a
--- /dev/null
+++ b/externals/g3dlite/G3D/Vector2int16.h
@@ -0,0 +1,127 @@
+/**
+  @file Vector2int16.h
+  
+  @maintainer Morgan McGuire, matrix@brown.edu
+
+  @created 2003-08-09
+  @edited  2004-01-03
+
+  Copyright 2000-2006, Morgan McGuire.
+  All rights reserved.
+ */
+
+#ifndef VECTOR2INT16_H
+#define VECTOR2INT16_H
+
+#include "G3D/platform.h"
+#include "G3D/g3dmath.h"
+#include "G3D/HashTrait.h"
+
+namespace G3D {
+
+/**
+ \class Vector2int16 
+ A Vector2 that packs its fields into uint16s.
+ */
+G3D_BEGIN_PACKED_CLASS(2)
+class Vector2int16 {
+private:
+    // Hidden operators
+    bool operator<(const Vector2int16&) const;
+    bool operator>(const Vector2int16&) const;
+    bool operator<=(const Vector2int16&) const;
+    bool operator>=(const Vector2int16&) const;
+
+public:
+    G3D::int16              x;
+    G3D::int16              y;
+
+    Vector2int16() : x(0), y(0) {}
+    Vector2int16(G3D::int16 _x, G3D::int16 _y) : x(_x), y(_y){}
+    Vector2int16(const class Vector2& v);
+    Vector2int16(class BinaryInput& bi);
+
+    inline G3D::int16& operator[] (int i) {
+        debugAssert(((unsigned int)i) <= 1);
+        return ((G3D::int16*)this)[i];
+    }
+
+    inline const G3D::int16& operator[] (int i) const {
+        debugAssert(((unsigned int)i) <= 1);
+        return ((G3D::int16*)this)[i];
+    }
+
+    inline Vector2int16 operator+(const Vector2int16& other) const {
+        return Vector2int16(x + other.x, y + other.y);
+    }
+
+    inline Vector2int16 operator-(const Vector2int16& other) const {
+        return Vector2int16(x - other.x, y - other.y);
+    }
+
+    inline Vector2int16 operator*(const Vector2int16& other) const {
+        return Vector2int16(x * other.x, y * other.y);
+    }
+
+    inline Vector2int16 operator*(const int s) const {
+        return Vector2int16(x * s, y * s);
+    }
+
+    inline Vector2int16& operator+=(const Vector2int16& other) {
+        x += other.x;
+        y += other.y;
+        return *this;
+    }
+
+    /** Shifts both x and y */
+    inline Vector2int16 operator>>(const int s) const {
+        return Vector2int16(x >> s, y >> s);
+    }
+
+    /** Shifts both x and y */
+    inline Vector2int16 operator<<(const int s) const {
+        return Vector2int16(x << s, y << s);
+    }
+
+    inline Vector2int16& operator-=(const Vector2int16& other) {
+        x -= other.x;
+        y -= other.y;
+        return *this;
+    }
+
+    inline Vector2int16& operator*=(const Vector2int16& other) {
+        x *= other.x;
+        y *= other.y;
+        return *this;
+    }
+
+    Vector2int16 clamp(const Vector2int16& lo, const Vector2int16& hi);
+
+    inline bool operator== (const Vector2int16& rkVector) const {
+        return ((int32*)this)[0] == ((int32*)&rkVector)[0];
+    }
+
+    inline bool operator!= (const Vector2int16& rkVector) const {
+        return ((int32*)this)[0] != ((int32*)&rkVector)[0];
+    }
+
+    Vector2int16 max(const Vector2int16& v) const {
+        return Vector2int16(iMax(x, v.x), iMax(y, v.y));
+    }
+
+    Vector2int16 min(const Vector2int16& v) const {
+        return Vector2int16(iMin(x, v.x), iMin(y, v.y));
+    }
+
+    void serialize(class BinaryOutput& bo) const;
+    void deserialize(class BinaryInput& bi);
+}
+G3D_END_PACKED_CLASS(2)
+
+}
+
+template<> struct HashTrait {
+    static size_t hashCode(const G3D::Vector2int16& key) { return static_cast(key.x + ((int)key.y << 16)); }
+};
+
+#endif
diff --git a/externals/g3dlite/G3D/Vector3.h b/externals/g3dlite/G3D/Vector3.h
new file mode 100644
index 00000000000..4825efb9985
--- /dev/null
+++ b/externals/g3dlite/G3D/Vector3.h
@@ -0,0 +1,798 @@
+/**
+  @file Vector3.h
+ 
+  3D vector class
+ 
+  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+
+  @created 2001-06-02
+  @edited  2009-11-01
+  Copyright 2000-2009, Morgan McGuire.
+  All rights reserved.
+ */
+
+#ifndef G3D_Vector3_h
+#define G3D_Vector3_h
+
+#include "G3D/platform.h"
+#include "G3D/g3dmath.h"
+#include "G3D/Random.h"
+#include "G3D/Vector2.h"
+#include "G3D/Table.h"
+#include "G3D/HashTrait.h"
+#include "G3D/PositionTrait.h"
+#include "G3D/Vector2.h"
+#include 
+#include 
+
+namespace G3D {
+
+class Vector2;
+class Vector4;
+class Vector4int8;
+class Vector3int32;
+class Any;
+
+/**
+  Swizzles
+ Vector classes have swizzle operators, e.g. v.xy(), that
+ allow selection of arbitrary sub-fields.  These cannot be used as write 
+ masks.  Examples
+
+  
+Vector3 v(1, 2, 3);
+Vector3 j;
+Vector2 b;
+
+b = v.xz();
+j = b.xx();
+

+
+
+  Warning
+
+ Do not subclass-- this implementation makes assumptions about the
+ memory layout.
+ */
+class Vector3 {
+public:
+
+    // coordinates
+    float x, y, z;
+
+private:
+
+    // Hidden operators
+    bool operator<(const Vector3&) const;
+    bool operator>(const Vector3&) const;
+    bool operator<=(const Vector3&) const;
+    bool operator>=(const Vector3&) const;
+
+public:
+    /** Initializes to zero */
+    Vector3();
+
+    /** \param any Must either Vector3(#, #, #) or Vector3 {x = #, y = #, z = #}*/
+    Vector3(const Any& any);
+    
+    /** Converts the Vector3 to an Any. */
+    operator Any() const;
+
+    /** Divides by 127 */
+    Vector3(const Vector4int8&);
+    Vector3(const class Vector3int32& v);
+    explicit Vector3(class BinaryInput& b);
+    Vector3(float _x, float _y, float _z);
+    explicit Vector3(const class Vector2& v, float _z);
+    explicit Vector3(float coordinate[3]);
+    explicit Vector3(double coordinate[3]);
+    Vector3(const class Vector3int16& v);
+	explicit Vector3(class TextInput& t);
+    explicit Vector3(const class Color3& c);
+
+	/** Format is three float32's */
+    void serialize(class BinaryOutput& b) const;
+    void deserialize(class BinaryInput& b);
+
+	/** Format is "(%f, %f, %f)" */
+    void serialize(class TextOutput& t) const;
+    void deserialize(class TextInput& t);
+
+    // access vector V as V[0] = V.x, V[1] = V.y, V[2] = V.z
+    //
+    // WARNING.  These member functions rely on
+    // (1) Vector3 not having virtual functions
+    // (2) the data packed in a 3*sizeof(float) memory block
+    const float& __fastcall operator[] (int i) const;
+    float& operator[] (int i);
+
+    enum Axis {X_AXIS=0, Y_AXIS=1, Z_AXIS=2, DETECT_AXIS=-1};
+
+    /**
+     Returns the largest dimension.  Particularly convenient for determining
+     which plane to project a triangle onto for point-in-polygon tests.
+     */
+    Axis primaryAxis() const;
+
+    // assignment and comparison
+    Vector3& __fastcall operator= (const Vector3& rkVector);
+    bool operator== (const Vector3& rkVector) const;
+    bool operator!= (const Vector3& rkVector) const;
+    size_t hashCode() const;
+    bool fuzzyEq(const Vector3& other) const;
+    bool fuzzyNe(const Vector3& other) const;
+
+    /** Returns true if this vector has finite length. */
+    bool isFinite() const;
+
+    /** Returns true if this vector has length ~= 0 */
+    bool isZero() const;
+
+    /** Returns true if this vector has length ~= 1 */
+    bool isUnit() const;
+    
+    // arithmetic operations
+    Vector3 __fastcall operator+ (const Vector3& v) const;
+    Vector3 __fastcall operator- (const Vector3& v) const;
+    Vector3 __fastcall operator* (float s) const;
+    inline Vector3 __fastcall operator/ (float s) const {
+        return *this * (1.0f / s);
+    }
+    Vector3 __fastcall operator* (const Vector3& v) const;
+    Vector3 __fastcall operator/ (const Vector3& v) const;
+    Vector3 __fastcall operator- () const;
+
+    // arithmetic updates
+    Vector3& __fastcall operator+= (const Vector3& v);
+    Vector3& __fastcall operator-= (const Vector3& v);
+    Vector3& __fastcall operator*= (float s);
+    inline Vector3& __fastcall operator/= (float s) {
+        return (*this *= (1.0f / s));
+    }
+    Vector3& __fastcall operator*= (const Vector3& v);
+    Vector3& __fastcall operator/= (const Vector3& v);
+
+    /** Same as magnitude */
+	float length() const;
+
+    float magnitude() const;
+    
+    /**
+     The result is a nan vector if the length is almost zero.
+     */
+    Vector3 direction() const;
+
+    /**
+     Potentially less accurate but faster than direction().
+     Only works if System::hasSSE is true.
+     */
+    Vector3 fastDirection() const;
+
+    /**
+     Reflect this vector about the (not necessarily unit) normal.
+     Assumes that both the before and after vectors point away from
+     the base of the normal.
+
+     Note that if used for a collision or ray reflection you
+     must negate the resulting vector to get a direction pointing
+     away from the collision.
+
+     
+       V'    N      V
+                 
+         r   ^   -,
+          \  |  /
+            \|/
+     

+
+     See also Vector3::reflectionDirection
+     */
+    Vector3 reflectAbout(const Vector3& normal) const;
+
+    /**
+      See also G3D::Ray::reflect.
+      The length is 1. 
+     
+       V'    N       V
+                 
+         r   ^    /
+          \  |  /
+            \|'-
+     

+     */
+    Vector3 reflectionDirection(const Vector3& normal) const;
+    
+
+    /**
+     Returns Vector3::zero() if the length is nearly zero, otherwise
+     returns a unit vector.
+     */
+    inline Vector3 directionOrZero() const {
+        float mag = magnitude();
+        if (G3D::fuzzyEq(mag, 0.0f)) {
+            return Vector3::zero();
+        } else if (G3D::fuzzyEq(mag, 1.0f)) {
+            return *this;
+        } else {
+            return *this * (1.0f / mag);
+        }
+    }
+
+    /**
+     Returns the direction of a refracted ray,
+     where iExit is the index of refraction for the
+     previous material and iEnter is the index of refraction
+     for the new material.  Like Vector3::reflectionDirection,
+     the result has length 1 and is 
+     pointed away from the intersection.
+
+     Returns Vector3::zero() in the case of total internal refraction.
+
+     @param iOutside The index of refraction (eta) outside
+     (on the positive normal side) of the surface.
+
+     @param iInside The index of refraction (eta) inside
+     (on the negative normal side) of the surface.
+
+     See also G3D::Ray::refract.
+     
+              N      V
+                  
+              ^    /
+              |  /
+              |'-
+          __--
+     V'<--
+     

+     */
+    Vector3 refractionDirection(
+        const Vector3&  normal,
+        float           iInside,
+        float           iOutside) const;
+
+    /** Synonym for direction */
+    inline Vector3 unit() const {
+        return direction();
+    }
+
+    /** Returns a normalized vector.  May be computed with lower
+        precision than unit */
+    inline Vector3 fastUnit() const {
+        return fastDirection();
+    }
+
+    /** Same as squaredMagnitude */
+    float squaredLength() const;
+
+    float squaredMagnitude () const;
+	
+    float __fastcall dot(const Vector3& rkVector) const;
+    
+    float unitize(float tolerance = 1e-06);
+
+    /** Cross product.  Note that two cross products in a row
+        can be computed more cheaply: v1 x (v2 x v3) = (v1 dot v3) v2  - (v1 dot v2) v3.
+      */
+    Vector3 __fastcall cross(const Vector3& rkVector) const;
+    Vector3 unitCross(const Vector3& rkVector) const;
+
+    /**
+     Returns a matrix such that v.cross() * w = v.cross(w).
+     
+     [ 0  -v.z  v.y ]
+     [ v.z  0  -v.x ]
+     [ -v.y v.x  0  ]
+     

+     */
+    class Matrix3 cross() const;
+
+    Vector3 __fastcall min(const Vector3 &v) const;
+    Vector3 __fastcall max(const Vector3 &v) const;
+
+    /** Smallest element */
+    inline float min() const {
+        return G3D::min(G3D::min(x, y), z);
+    }
+
+    /** Largest element */
+    inline float max() const {
+        return G3D::max(G3D::max(x, y), z);
+    }
+
+    std::string toString() const;
+
+    inline Vector3 clamp(const Vector3& low, const Vector3& high) const {
+        return Vector3(
+            G3D::clamp(x, low.x, high.x),
+            G3D::clamp(y, low.y, high.y),
+            G3D::clamp(z, low.z, high.z));
+    }
+
+    inline Vector3 clamp(float low, float high) const {
+        return Vector3(
+            G3D::clamp(x, low, high),
+            G3D::clamp(y, low, high),
+            G3D::clamp(z, low, high));
+    }
+
+    /**
+     Linear interpolation
+     */
+    inline Vector3 lerp(const Vector3& v, float alpha) const {
+        return (*this) + (v - *this) * alpha; 
+    }
+
+    /** Gram-Schmidt orthonormalization. */
+    static void orthonormalize (Vector3 akVector[3]);
+
+    /** \brief Random unit vector, uniformly distributed on the sphere. 
+    
+       Distribution rendered by G3D::DirectionHistogram:
+       \image html vector3-random.png
+      */
+    static Vector3 random(Random& r = Random::common());
+
+    /** \brief Random unit vector, distributed according to \f$\max(\cos \theta,0)\f$.
+
+        That is, so that the probability of \f$\vec{V}\f$ is proportional 
+        to \f$\max(\vec{v} \cdot \vec{n}, 0)\f$.  Useful in photon mapping for 
+        Lambertian scattering.
+
+        Distribution rendered by G3D::DirectionHistogram:
+        \image html vector3-coshemirandom.png
+
+        \param n Unit vector at the center of the distribution.
+
+        @cite Henrik Wann Jensen, Realistic Image Synthesis using Photon Mapping eqn 2.24
+    */
+    static Vector3 cosHemiRandom(const Vector3& n, Random& r = Random::common());
+
+    /** \brief Random unit vector, distributed according to \f$\max(\cos^k \theta,0)\f$.
+
+        That is, so that the probability of \f$\vec{V}\f$ is
+        proportional to \f$\max((\vec{v} \cdot \vec{n})^k, 0)\f$.
+        Useful in photon mapping for glossy scattering.
+
+        Distribution rendered by G3D::DirectionHistogram:
+        \image html vector3-cospowhemirandom.png
+
+        \param n Unit vector at the center of the distribution.
+
+        @cite Ashikhmin and Shirley, An anisotropic Phong BRDF model, Journal of Graphics Tools, 2002
+    */
+    static Vector3 cosPowHemiRandom(const Vector3& n, const float k, Random& r = Random::common());
+
+    /**
+     \brief Random vector distributed over the hemisphere about normal.
+
+     Distribution rendered by G3D::DirectionHistogram:
+      \image html vector3-hemirandom.png
+     */
+    static Vector3 hemiRandom(const Vector3& normal, Random& r = Random::common());
+
+    /** Input W must be initialize to a nonzero vector, output is {U,V,W}
+        an orthonormal basis.  A hint is provided about whether or not W
+        is already unit length. 
+        @deprecated Use getTangents
+    */
+    static void generateOrthonormalBasis (Vector3& rkU, Vector3& rkV,
+                                          Vector3& rkW, bool bUnitLengthW = true);
+
+    inline float sum() const {
+        return x + y + z;
+    }
+
+    inline float average() const {
+        return sum() / 3.0f;
+    }
+
+    // Special values.
+    static const Vector3& zero();
+    static const Vector3& one();
+    static const Vector3& unitX();
+    static const Vector3& unitY();
+    static const Vector3& unitZ();
+    static const Vector3& inf();
+    static const Vector3& nan();
+    
+    /** Smallest (most negative) representable vector */
+    static const Vector3& minFinite();
+
+    /** Largest representable vector */
+    static const Vector3& maxFinite();
+
+
+    /** Creates two orthonormal tangent vectors X and Y such that
+        if Z = this, X x Y = Z.*/
+    inline void getTangents(Vector3& X, Vector3& Y) const {
+        debugAssertM(G3D::fuzzyEq(length(), 1.0f), 
+                     "makeAxes requires Z to have unit length");
+        
+        // Choose another vector not perpendicular
+        X = (abs(x) < 0.9f) ? Vector3::unitX() : Vector3::unitY();
+        
+        // Remove the part that is parallel to Z
+        X -= *this * this->dot(X);
+        X /= X.length();
+    
+        Y = this->cross(X);
+    }
+
+
+    // 2-char swizzles
+
+    Vector2 xx() const;
+    Vector2 yx() const;
+    Vector2 zx() const;
+    Vector2 xy() const;
+    Vector2 yy() const;
+    Vector2 zy() const;
+    Vector2 xz() const;
+    Vector2 yz() const;
+    Vector2 zz() const;
+
+    // 3-char swizzles
+
+    Vector3 xxx() const;
+    Vector3 yxx() const;
+    Vector3 zxx() const;
+    Vector3 xyx() const;
+    Vector3 yyx() const;
+    Vector3 zyx() const;
+    Vector3 xzx() const;
+    Vector3 yzx() const;
+    Vector3 zzx() const;
+    Vector3 xxy() const;
+    Vector3 yxy() const;
+    Vector3 zxy() const;
+    Vector3 xyy() const;
+    Vector3 yyy() const;
+    Vector3 zyy() const;
+    Vector3 xzy() const;
+    Vector3 yzy() const;
+    Vector3 zzy() const;
+    Vector3 xxz() const;
+    Vector3 yxz() const;
+    Vector3 zxz() const;
+    Vector3 xyz() const;
+    Vector3 yyz() const;
+    Vector3 zyz() const;
+    Vector3 xzz() const;
+    Vector3 yzz() const;
+    Vector3 zzz() const;
+
+    // 4-char swizzles
+
+    Vector4 xxxx() const;
+    Vector4 yxxx() const;
+    Vector4 zxxx() const;
+    Vector4 xyxx() const;
+    Vector4 yyxx() const;
+    Vector4 zyxx() const;
+    Vector4 xzxx() const;
+    Vector4 yzxx() const;
+    Vector4 zzxx() const;
+    Vector4 xxyx() const;
+    Vector4 yxyx() const;
+    Vector4 zxyx() const;
+    Vector4 xyyx() const;
+    Vector4 yyyx() const;
+    Vector4 zyyx() const;
+    Vector4 xzyx() const;
+    Vector4 yzyx() const;
+    Vector4 zzyx() const;
+    Vector4 xxzx() const;
+    Vector4 yxzx() const;
+    Vector4 zxzx() const;
+    Vector4 xyzx() const;
+    Vector4 yyzx() const;
+    Vector4 zyzx() const;
+    Vector4 xzzx() const;
+    Vector4 yzzx() const;
+    Vector4 zzzx() const;
+    Vector4 xxxy() const;
+    Vector4 yxxy() const;
+    Vector4 zxxy() const;
+    Vector4 xyxy() const;
+    Vector4 yyxy() const;
+    Vector4 zyxy() const;
+    Vector4 xzxy() const;
+    Vector4 yzxy() const;
+    Vector4 zzxy() const;
+    Vector4 xxyy() const;
+    Vector4 yxyy() const;
+    Vector4 zxyy() const;
+    Vector4 xyyy() const;
+    Vector4 yyyy() const;
+    Vector4 zyyy() const;
+    Vector4 xzyy() const;
+    Vector4 yzyy() const;
+    Vector4 zzyy() const;
+    Vector4 xxzy() const;
+    Vector4 yxzy() const;
+    Vector4 zxzy() const;
+    Vector4 xyzy() const;
+    Vector4 yyzy() const;
+    Vector4 zyzy() const;
+    Vector4 xzzy() const;
+    Vector4 yzzy() const;
+    Vector4 zzzy() const;
+    Vector4 xxxz() const;
+    Vector4 yxxz() const;
+    Vector4 zxxz() const;
+    Vector4 xyxz() const;
+    Vector4 yyxz() const;
+    Vector4 zyxz() const;
+    Vector4 xzxz() const;
+    Vector4 yzxz() const;
+    Vector4 zzxz() const;
+    Vector4 xxyz() const;
+    Vector4 yxyz() const;
+    Vector4 zxyz() const;
+    Vector4 xyyz() const;
+    Vector4 yyyz() const;
+    Vector4 zyyz() const;
+    Vector4 xzyz() const;
+    Vector4 yzyz() const;
+    Vector4 zzyz() const;
+    Vector4 xxzz() const;
+    Vector4 yxzz() const;
+    Vector4 zxzz() const;
+    Vector4 xyzz() const;
+    Vector4 yyzz() const;
+    Vector4 zyzz() const;
+    Vector4 xzzz() const;
+    Vector4 yzzz() const;
+    Vector4 zzzz() const;
+
+    /** Can be passed to ignore a vector3 parameter */
+    static Vector3& ignore();
+};
+
+inline G3D::Vector3 operator*(float s, const G3D::Vector3& v) {
+    return v * s;
+}
+
+inline G3D::Vector3 operator*(double s, const G3D::Vector3& v) {
+    return v * (float)s;
+}
+
+inline G3D::Vector3 operator*(int s, const G3D::Vector3& v) {
+    return v * (float)s;
+}
+
+std::ostream& operator<<(std::ostream& os, const Vector3&);
+
+
+void serialize(const Vector3::Axis& a, class BinaryOutput& bo);
+void deserialize(Vector3::Axis& a, class BinaryInput& bo);
+
+
+//----------------------------------------------------------------------------
+inline Vector3::Vector3() : x(0.0f), y(0.0f), z(0.0f) {
+}
+
+//----------------------------------------------------------------------------
+
+inline Vector3::Vector3 (float fX, float fY, float fZ) : x(fX), y(fY), z(fZ) {
+}
+
+//----------------------------------------------------------------------------
+inline Vector3::Vector3 (float V[3]) : x(V[0]), y(V[1]), z(V[2]){
+}
+
+//----------------------------------------------------------------------------
+inline Vector3::Vector3 (double V[3]) : x((float)V[0]), y((float)V[1]), z((float)V[2]){
+}
+
+//----------------------------------------------------------------------------
+inline const float& Vector3::operator[] (int i) const {
+    return ((float*)this)[i];
+}
+
+inline float& Vector3::operator[] (int i) {
+    return ((float*)this)[i];
+}
+
+
+//----------------------------------------------------------------------------
+inline Vector3& Vector3::operator= (const Vector3& rkVector) {
+    x = rkVector.x;
+    y = rkVector.y;
+    z = rkVector.z;
+    return *this;
+}
+
+//----------------------------------------------------------------------------
+
+inline bool Vector3::fuzzyEq(const Vector3& other) const {
+    return G3D::fuzzyEq((*this - other).squaredMagnitude(), 0);
+}
+
+//----------------------------------------------------------------------------
+
+inline bool Vector3::fuzzyNe(const Vector3& other) const {
+    return G3D::fuzzyNe((*this - other).squaredMagnitude(), 0);
+}
+
+//----------------------------------------------------------------------------
+
+inline bool Vector3::isFinite() const {
+    return G3D::isFinite(x) && G3D::isFinite(y) && G3D::isFinite(z);
+}
+
+//----------------------------------------------------------------------------
+inline bool Vector3::operator== (const Vector3& rkVector) const {
+    return ( x == rkVector.x && y == rkVector.y && z == rkVector.z );
+}
+
+//----------------------------------------------------------------------------
+inline bool Vector3::operator!= (const Vector3& rkVector) const {
+    return ( x != rkVector.x || y != rkVector.y || z != rkVector.z );
+}
+
+//----------------------------------------------------------------------------
+inline Vector3 Vector3::operator+ (const Vector3& rkVector) const {
+    return Vector3(x + rkVector.x, y + rkVector.y, z + rkVector.z);
+}
+
+//----------------------------------------------------------------------------
+inline Vector3 Vector3::operator- (const Vector3& rkVector) const {
+    return Vector3(x - rkVector.x, y - rkVector.y, z - rkVector.z);
+}
+
+//----------------------------------------------------------------------------
+inline Vector3 Vector3::operator* (const Vector3& rkVector) const {
+    return Vector3(x * rkVector.x, y * rkVector.y, z * rkVector.z);
+}
+
+inline Vector3 Vector3::operator*(float f) const {
+    return Vector3(x * f, y * f, z * f);
+}
+
+//----------------------------------------------------------------------------
+inline Vector3 Vector3::operator/ (const Vector3& rkVector) const {
+    return Vector3(x / rkVector.x, y / rkVector.y, z / rkVector.z);
+}
+
+//----------------------------------------------------------------------------
+inline Vector3 Vector3::operator- () const {
+    return Vector3(-x, -y, -z);
+}
+
+//----------------------------------------------------------------------------
+inline Vector3& Vector3::operator+= (const Vector3& rkVector) {
+    x += rkVector.x;
+    y += rkVector.y;
+    z += rkVector.z;
+    return *this;
+}
+
+//----------------------------------------------------------------------------
+inline Vector3& Vector3::operator-= (const Vector3& rkVector) {
+    x -= rkVector.x;
+    y -= rkVector.y;
+    z -= rkVector.z;
+    return *this;
+}
+
+//----------------------------------------------------------------------------
+inline Vector3& Vector3::operator*= (float fScalar) {
+    x *= fScalar;
+    y *= fScalar;
+    z *= fScalar;
+    return *this;
+}
+
+//----------------------------------------------------------------------------
+inline Vector3& Vector3::operator*= (const Vector3& rkVector) {
+    x *= rkVector.x;
+    y *= rkVector.y;
+    z *= rkVector.z;
+    return *this;
+}
+
+//----------------------------------------------------------------------------
+inline Vector3& Vector3::operator/= (const Vector3& rkVector) {
+    x /= rkVector.x;
+    y /= rkVector.y;
+    z /= rkVector.z;
+    return *this;
+}
+
+//----------------------------------------------------------------------------
+inline float Vector3::squaredMagnitude () const {
+    return x*x + y*y + z*z;
+}
+
+//----------------------------------------------------------------------------
+inline float Vector3::squaredLength () const {
+    return squaredMagnitude();
+}
+
+//----------------------------------------------------------------------------
+inline float Vector3::magnitude() const {
+    return ::sqrtf(x*x + y*y + z*z);
+}
+
+//----------------------------------------------------------------------------
+inline float Vector3::length() const {
+    return magnitude();
+}
+
+//----------------------------------------------------------------------------
+inline Vector3 Vector3::direction () const {
+    const float lenSquared = squaredMagnitude();
+    const float invSqrt = 1.0f / sqrtf(lenSquared);
+    return Vector3(x * invSqrt, y * invSqrt, z * invSqrt);
+}
+
+//----------------------------------------------------------------------------
+
+inline Vector3 Vector3::fastDirection () const {
+    float lenSquared = x * x + y * y + z * z;
+    float invSqrt = rsq(lenSquared);
+    return Vector3(x * invSqrt, y * invSqrt, z * invSqrt);
+}
+
+//----------------------------------------------------------------------------
+inline float Vector3::dot (const Vector3& rkVector) const {
+    return x*rkVector.x + y*rkVector.y + z*rkVector.z;
+}
+
+//----------------------------------------------------------------------------
+inline Vector3 Vector3::cross (const Vector3& rkVector) const {
+    return Vector3(y*rkVector.z - z*rkVector.y, z*rkVector.x - x*rkVector.z,
+                   x*rkVector.y - y*rkVector.x);
+}
+
+//----------------------------------------------------------------------------
+inline Vector3 Vector3::unitCross (const Vector3& rkVector) const {
+    Vector3 kCross(y*rkVector.z - z*rkVector.y, z*rkVector.x - x*rkVector.z,
+                   x*rkVector.y - y*rkVector.x);
+    kCross.unitize();
+    return kCross;
+}
+
+//----------------------------------------------------------------------------
+inline Vector3 Vector3::min(const Vector3 &v) const {
+    return Vector3(G3D::min(v.x, x), G3D::min(v.y, y), G3D::min(v.z, z));
+}
+
+//----------------------------------------------------------------------------
+inline Vector3 Vector3::max(const Vector3 &v) const {
+    return Vector3(G3D::max(v.x, x), G3D::max(v.y, y), G3D::max(v.z, z));
+}
+
+//----------------------------------------------------------------------------
+inline bool Vector3::isZero() const {
+    return G3D::fuzzyEq(squaredMagnitude(), 0.0f);
+}
+
+//----------------------------------------------------------------------------
+
+inline bool Vector3::isUnit() const {
+    return G3D::fuzzyEq(squaredMagnitude(), 1.0f);
+}
+
+} // namespace G3D
+
+
+template <>
+struct HashTrait {
+    static size_t hashCode(const G3D::Vector3& key) {
+        return key.hashCode();
+    }
+};
+
+
+template<> struct PositionTrait {
+    static void getPosition(const G3D::Vector2& v, G3D::Vector3& p) { p = G3D::Vector3(v, 0); }
+};
+
+template<> struct PositionTrait {
+    static void getPosition(const G3D::Vector3& v, G3D::Vector3& p) { p = v; }
+};
+
+
+#endif
diff --git a/externals/g3dlite/G3D/Vector3.inl b/externals/g3dlite/G3D/Vector3.inl
new file mode 100644
index 00000000000..9211c2a70fd
--- /dev/null
+++ b/externals/g3dlite/G3D/Vector3.inl
@@ -0,0 +1,249 @@
+/**
+  @file Vector3.inl
+
+  @maintainer Morgan McGuire, matrix@graphics3d.com
+
+  @cite Portions based on Dave Eberly's Magic Software Library at http://www.magic-software.com
+
+  @created 2001-06-02
+  @edited  2004-05-21
+  Copyright 2000-2004, Morgan McGuire.
+  All rights reserved.
+ */
+
+//----------------------------------------------------------------------------
+#ifdef SSE
+    // If you receive an error on this line, it is because you do not have the file
+    // xmmintrin.h needed for MMX & SSE extensions.  Download and install
+    //
+    // http://download.microsoft.com/download/vstudio60ent/SP5/Wideband-Full/WIN98Me/EN-US/vs6sp5.exe
+    // and
+    // http://download.microsoft.com/download/vb60ent/Update/6/W9X2KXP/EN-US/vcpp5.exe
+    //
+    // to get this file.
+#   include 
+#endif
+
+inline unsigned int hashCode(const G3D::Vector3& v) {
+     return v.hashCode();
+}
+
+namespace G3D {
+
+//----------------------------------------------------------------------------
+inline Vector3::Vector3() : x(0.0f), y(0.0f), z(0.0f) {
+}
+
+//----------------------------------------------------------------------------
+
+inline Vector3::Vector3 (float fX, float fY, float fZ) : x(fX), y(fY), z(fZ) {
+}
+
+//----------------------------------------------------------------------------
+inline Vector3::Vector3 (float V[3]) : x(V[0]), y(V[1]), z(V[2]){
+}
+//----------------------------------------------------------------------------
+inline Vector3::Vector3 (double V[3]) : x((float)V[0]), y((float)V[1]), z((float)V[2]){
+}
+
+//----------------------------------------------------------------------------
+inline Vector3::Vector3 (const Vector3& V) : x(V.x), y(V.y), z(V.z) {
+}
+
+//----------------------------------------------------------------------------
+
+//inline Vector3::Vector3 (const __m128& m) {
+    // Cast from SSE packed floats
+//    *this = *(Vector3*)&m;
+//}
+
+//----------------------------------------------------------------------------
+inline const float& Vector3::operator[] (int i) const {
+    return ((float*)this)[i];
+}
+
+inline float& Vector3::operator[] (int i) {
+    return ((float*)this)[i];
+}
+
+//----------------------------------------------------------------------------
+inline Vector3& Vector3::operator= (const Vector3& rkVector) {
+    x = rkVector.x;
+    y = rkVector.y;
+    z = rkVector.z;
+    return *this;
+}
+
+//----------------------------------------------------------------------------
+
+inline bool Vector3::fuzzyEq(const Vector3& other) const {
+    return G3D::fuzzyEq((*this - other).squaredMagnitude(), 0);
+}
+
+//----------------------------------------------------------------------------
+
+inline bool Vector3::fuzzyNe(const Vector3& other) const {
+    return G3D::fuzzyNe((*this - other).squaredMagnitude(), 0);
+}
+
+//----------------------------------------------------------------------------
+
+inline bool Vector3::isFinite() const {
+    return G3D::isFinite(x) && G3D::isFinite(y) && G3D::isFinite(z);
+}
+
+//----------------------------------------------------------------------------
+inline bool Vector3::operator== (const Vector3& rkVector) const {
+    return ( x == rkVector.x && y == rkVector.y && z == rkVector.z );
+}
+
+//----------------------------------------------------------------------------
+inline bool Vector3::operator!= (const Vector3& rkVector) const {
+    return ( x != rkVector.x || y != rkVector.y || z != rkVector.z );
+}
+
+//----------------------------------------------------------------------------
+inline Vector3 Vector3::operator+ (const Vector3& rkVector) const {
+    return Vector3(x + rkVector.x, y + rkVector.y, z + rkVector.z);
+}
+
+//----------------------------------------------------------------------------
+inline Vector3 Vector3::operator- (const Vector3& rkVector) const {
+    return Vector3(x - rkVector.x, y - rkVector.y, z - rkVector.z);
+}
+
+//----------------------------------------------------------------------------
+inline Vector3 Vector3::operator* (const Vector3& rkVector) const {
+    return Vector3(x * rkVector.x, y * rkVector.y, z * rkVector.z);
+}
+
+inline Vector3 Vector3::operator*(float f) const {
+    return Vector3(x * f, y * f, z * f);
+}
+
+//----------------------------------------------------------------------------
+inline Vector3 Vector3::operator/ (const Vector3& rkVector) const {
+    return Vector3(x / rkVector.x, y / rkVector.y, z / rkVector.z);
+}
+
+//----------------------------------------------------------------------------
+inline Vector3 Vector3::operator- () const {
+    return Vector3(-x, -y, -z);
+}
+
+//----------------------------------------------------------------------------
+inline Vector3& Vector3::operator+= (const Vector3& rkVector) {
+    x += rkVector.x;
+    y += rkVector.y;
+    z += rkVector.z;
+    return *this;
+}
+
+//----------------------------------------------------------------------------
+inline Vector3& Vector3::operator-= (const Vector3& rkVector) {
+    x -= rkVector.x;
+    y -= rkVector.y;
+    z -= rkVector.z;
+    return *this;
+}
+
+//----------------------------------------------------------------------------
+inline Vector3& Vector3::operator*= (float fScalar) {
+    x *= fScalar;
+    y *= fScalar;
+    z *= fScalar;
+    return *this;
+}
+
+//----------------------------------------------------------------------------
+inline Vector3& Vector3::operator*= (const Vector3& rkVector) {
+    x *= rkVector.x;
+    y *= rkVector.y;
+    z *= rkVector.z;
+    return *this;
+}
+
+//----------------------------------------------------------------------------
+inline Vector3& Vector3::operator/= (const Vector3& rkVector) {
+    x /= rkVector.x;
+    y /= rkVector.y;
+    z /= rkVector.z;
+    return *this;
+}
+
+//----------------------------------------------------------------------------
+inline float Vector3::squaredMagnitude () const {
+    return x*x + y*y + z*z;
+}
+
+//----------------------------------------------------------------------------
+inline float Vector3::squaredLength () const {
+    return squaredMagnitude();
+}
+
+//----------------------------------------------------------------------------
+inline float Vector3::magnitude() const {
+    return sqrtf(x*x + y*y + z*z);
+}
+
+//----------------------------------------------------------------------------
+inline float Vector3::length() const {
+    return magnitude();
+}
+
+//----------------------------------------------------------------------------
+inline Vector3 Vector3::direction () const {
+    float lenSquared = squaredMagnitude();
+    float invSqrt = 1.0f / sqrtf(lenSquared);
+    return Vector3(x * invSqrt, y * invSqrt, z * invSqrt);
+}
+
+//----------------------------------------------------------------------------
+
+inline Vector3 Vector3::fastDirection () const {
+    float lenSquared = x * x + y * y + z * z;
+    float invSqrt = rsq(lenSquared);
+    return Vector3(x * invSqrt, y * invSqrt, z * invSqrt);
+}
+
+//----------------------------------------------------------------------------
+inline float Vector3::dot (const Vector3& rkVector) const {
+    return x*rkVector.x + y*rkVector.y + z*rkVector.z;
+}
+
+//----------------------------------------------------------------------------
+inline Vector3 Vector3::cross (const Vector3& rkVector) const {
+    return Vector3(y*rkVector.z - z*rkVector.y, z*rkVector.x - x*rkVector.z,
+                   x*rkVector.y - y*rkVector.x);
+}
+
+//----------------------------------------------------------------------------
+inline Vector3 Vector3::unitCross (const Vector3& rkVector) const {
+    Vector3 kCross(y*rkVector.z - z*rkVector.y, z*rkVector.x - x*rkVector.z,
+                   x*rkVector.y - y*rkVector.x);
+    kCross.unitize();
+    return kCross;
+}
+
+//----------------------------------------------------------------------------
+inline Vector3 Vector3::min(const Vector3 &v) const {
+    return Vector3(G3D::min(v.x, x), G3D::min(v.y, y), G3D::min(v.z, z));
+}
+
+//----------------------------------------------------------------------------
+inline Vector3 Vector3::max(const Vector3 &v) const {
+    return Vector3(G3D::max(v.x, x), G3D::max(v.y, y), G3D::max(v.z, z));
+}
+
+//----------------------------------------------------------------------------
+inline bool Vector3::isZero() const {
+    return G3D::fuzzyEq(squaredMagnitude(), 0.0f);
+}
+
+//----------------------------------------------------------------------------
+
+inline bool Vector3::isUnit() const {
+    return G3D::fuzzyEq(squaredMagnitude(), 1.0f);
+}
+
+} // namespace
diff --git a/externals/g3dlite/G3D/Vector3int16.h b/externals/g3dlite/G3D/Vector3int16.h
new file mode 100644
index 00000000000..3197ea49d1a
--- /dev/null
+++ b/externals/g3dlite/G3D/Vector3int16.h
@@ -0,0 +1,127 @@
+/**
+  @file Vector3int16.h
+  
+  @maintainer Morgan McGuire, matrix@brown.edu
+
+  @created 2003-04-07
+  @edited  2003-06-24
+  Copyright 2000-2004, Morgan McGuire.
+  All rights reserved.
+ */
+
+#ifndef VECTOR3INT16_H
+#define VECTOR3INT16_H
+
+#include "G3D/platform.h"
+#include "G3D/g3dmath.h"
+#include "G3D/HashTrait.h"
+
+#ifdef _MSC_VER
+// Turn off "conditional expression is constant" warning; MSVC generates this
+// for debug assertions in inlined methods.
+#pragma warning (disable : 4127)
+#endif
+
+
+namespace G3D {
+
+/**
+ \class Vector3int16
+ A Vector3 that packs its fields into uint16s.
+ */
+G3D_BEGIN_PACKED_CLASS(2)
+class Vector3int16 {
+private:
+    // Hidden operators
+    bool operator<(const Vector3int16&) const;
+    bool operator>(const Vector3int16&) const;
+    bool operator<=(const Vector3int16&) const;
+    bool operator>=(const Vector3int16&) const;
+
+public:
+    G3D::int16              x;
+    G3D::int16              y;
+    G3D::int16              z;
+
+    Vector3int16() : x(0), y(0), z(0) {}
+    Vector3int16(G3D::int16 _x, G3D::int16 _y, G3D::int16 _z) : x(_x), y(_y), z(_z) {}
+    Vector3int16(const class Vector3& v);
+    Vector3int16(class BinaryInput& bi);
+
+    void serialize(class BinaryOutput& bo) const;
+    void deserialize(class BinaryInput& bi);
+
+    inline G3D::int16& operator[] (int i) {
+        debugAssert(i <= 2);
+        return ((G3D::int16*)this)[i];
+    }
+
+    inline const G3D::int16& operator[] (int i) const {
+        debugAssert(i <= 2);
+        return ((G3D::int16*)this)[i];
+    }
+
+    inline Vector3int16 operator+(const Vector3int16& other) const {
+        return Vector3int16(x + other.x, y + other.y, z + other.z);
+    }
+
+    inline Vector3int16 operator-(const Vector3int16& other) const {
+        return Vector3int16(x - other.x, y - other.y, z - other.z);
+    }
+
+    inline Vector3int16 operator*(const Vector3int16& other) const {
+        return Vector3int16(x * other.x, y * other.y, z * other.z);
+    }
+
+    inline Vector3int16 operator*(const int s) const {
+        return Vector3int16(int16(x * s), int16(y * s), int16(z * s));
+    }
+
+    inline Vector3int16& operator+=(const Vector3int16& other) {
+        x += other.x;
+        y += other.y;
+        z += other.y;
+        return *this;
+    }
+
+    inline Vector3int16& operator-=(const Vector3int16& other) {
+        x -= other.x;
+        y -= other.y;
+        z -= other.z;
+        return *this;
+    }
+
+    inline Vector3int16& operator*=(const Vector3int16& other) {
+        x *= other.x;
+        y *= other.y;
+        z *= other.z;
+        return *this;
+    }
+
+    inline bool operator== (const Vector3int16& rkVector) const {
+        return ( x == rkVector.x && y == rkVector.y && z == rkVector.z );
+    }
+
+    inline bool operator!= (const Vector3int16& rkVector) const {
+        return ( x != rkVector.x || y != rkVector.y || z != rkVector.z );
+    }
+
+    Vector3int16 max(const Vector3int16& v) const {
+        return Vector3int16(std::max(x, v.x), std::max(y, v.y), std::max(z, v.z));
+    }
+
+    Vector3int16 min(const Vector3int16& v) const {
+        return Vector3int16(std::min(x, v.x), std::min(y, v.y), std::min(z, v.z));
+    }
+
+    std::string toString() const;
+}
+G3D_END_PACKED_CLASS(2)
+
+}
+
+template <> struct HashTrait {
+    static size_t hashCode(const G3D::Vector3int16& key) { return static_cast(key.x + ((int)key.y << 5) + ((int)key.z << 10)); }
+};
+
+#endif
diff --git a/externals/g3dlite/G3D/Vector3int32.h b/externals/g3dlite/G3D/Vector3int32.h
new file mode 100644
index 00000000000..2f256ea0300
--- /dev/null
+++ b/externals/g3dlite/G3D/Vector3int32.h
@@ -0,0 +1,128 @@
+/**
+  @file Vector3int32.h
+  
+  @maintainer Morgan McGuire, matrix@brown.edu
+
+  @created 2008-07-01
+  @edited  2008-07-01
+  Copyright 2000-2009, Morgan McGuire.
+  All rights reserved.
+ */
+
+#ifndef VECTOR3INT32_H
+#define VECTOR3INT32_H
+
+#include "G3D/platform.h"
+#include "G3D/g3dmath.h"
+#include "G3D/HashTrait.h"
+
+namespace G3D {
+
+/**
+ \ Vector3int32
+ A Vector3 that packs its fields into uint32s.
+ */
+G3D_BEGIN_PACKED_CLASS(4)
+class Vector3int32 {
+private:
+    // Hidden operators
+    bool operator<(const Vector3int32&) const;
+    bool operator>(const Vector3int32&) const;
+    bool operator<=(const Vector3int32&) const;
+    bool operator>=(const Vector3int32&) const;
+
+public:
+    G3D::int32              x;
+    G3D::int32              y;
+    G3D::int32              z;
+
+    Vector3int32() : x(0), y(0), z(0) {}
+    Vector3int32(int _x, int _y, int _z) : x(_x), y(_y), z(_z) {}
+    Vector3int32(const class Vector3int16& v);
+    Vector3int32(const class Vector3& v);
+    Vector3int32(class BinaryInput& bi);
+
+    void serialize(class BinaryOutput& bo) const;
+    void deserialize(class BinaryInput& bi);
+
+    inline G3D::int32& operator[] (int i) {
+        debugAssert(i <= 2);
+        return ((G3D::int32*)this)[i];
+    }
+
+    inline const G3D::int32& operator[] (int i) const {
+        debugAssert(i <= 2);
+        return ((G3D::int32*)this)[i];
+    }
+
+    inline Vector3int32 operator+(const Vector3int32& other) const {
+        return Vector3int32(x + other.x, y + other.y, z + other.z);
+    }
+
+    inline Vector3int32 operator-(const Vector3int32& other) const {
+        return Vector3int32(x - other.x, y - other.y, z - other.z);
+    }
+
+    inline Vector3int32 operator*(const Vector3int32& other) const {
+        return Vector3int32(x * other.x, y * other.y, z * other.z);
+    }
+
+    inline Vector3int32 operator*(const int s) const {
+        return Vector3int32(x * s, y * s, z * s);
+    }
+
+    inline Vector3int32& operator+=(const Vector3int32& other) {
+        x += other.x;
+        y += other.y;
+        z += other.y;
+        return *this;
+    }
+
+    inline Vector3int32& operator-=(const Vector3int32& other) {
+        x -= other.x;
+        y -= other.y;
+        z -= other.z;
+        return *this;
+    }
+
+    inline Vector3int32& operator*=(const Vector3int32& other) {
+        x *= other.x;
+        y *= other.y;
+        z *= other.z;
+        return *this;
+    }
+
+    inline bool operator== (const Vector3int32& rkVector) const {
+        return ( x == rkVector.x && y == rkVector.y && z == rkVector.z );
+    }
+
+    inline bool operator!= (const Vector3int32& rkVector) const {
+        return ( x != rkVector.x || y != rkVector.y || z != rkVector.z );
+    }
+
+    Vector3int32 max(const Vector3int32& v) const {
+        return Vector3int32(iMax(x, v.x), iMax(y, v.y), iMax(z, v.z));
+    }
+
+    Vector3int32 min(const Vector3int32& v) const {
+        return Vector3int32(iMin(x, v.x), iMin(y, v.y), iMin(z, v.z));
+    }
+
+    std::string toString() const;
+}
+G3D_END_PACKED_CLASS(4)
+
+}
+
+template <> struct HashTrait {
+    static size_t hashCode(const G3D::Vector3int32& key) {
+        // Mask for the top bit of a uint32
+        const G3D::uint32 top = (1UL << 31);
+        // Mask for the bottom 10 bits of a uint32
+        const G3D::uint32 bot = 0x000003FF;
+        return static_cast(((key.x & top) | ((key.y & top) >> 1) | ((key.z & top) >> 2)) | 
+                                   (((key.x & bot) << 19) ^ ((key.y & bot) << 10) ^ (key.z & bot)));
+    }
+};
+
+#endif
diff --git a/externals/g3dlite/G3D/Vector4.h b/externals/g3dlite/G3D/Vector4.h
new file mode 100644
index 00000000000..5e511451f86
--- /dev/null
+++ b/externals/g3dlite/G3D/Vector4.h
@@ -0,0 +1,716 @@
+/**
+  @file Vector4.h
+ 
+  Homogeneous vector class.
+ 
+  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+ 
+  @created 2002-07-09
+  @edited  2008-11-01
+
+  Copyright 2000-2009, Morgan McGuire.
+  All rights reserved.
+ */
+
+#ifndef G3D_Vector4_h
+#define G3D_Vector4_h
+
+#include "G3D/platform.h"
+#include "G3D/g3dmath.h"
+#include "G3D/Vector3.h"
+#include "G3D/Vector2.h"
+#include "G3D/Table.h"
+#include "G3D/HashTrait.h"
+#include "G3D/PositionTrait.h"
+#include 
+
+namespace G3D {
+
+class Vector2;    
+class Vector3;
+class Vector4;
+class Vector4int8;
+class Any;
+
+/**
+ Do not subclass-- this implementation makes assumptions about the
+ memory layout.
+ */
+class Vector4 {
+private:
+    // Hidden operators
+    bool operator<(const Vector4&) const;
+    bool operator>(const Vector4&) const;
+    bool operator<=(const Vector4&) const;
+    bool operator>=(const Vector4&) const;
+
+public:
+
+    /** \param any Must either Vector4(#, #, #, #) or Vector3 {x = #, y = #, z = #, w =#}*/
+    Vector4(const Any& any);
+    
+    /** Converts the Vector4 to an Any. */
+    operator Any() const;
+
+    // construction
+    Vector4();
+    Vector4(float fX, float fY, float fZ, float fW);
+    Vector4(float afCoordinate[4]);
+    Vector4(const Vector4& rkVector);
+    Vector4(const class Color4& c);
+    Vector4(const Vector3& rkVector, float fW);
+    Vector4(const Vector2& v1, const Vector2& v2);
+    Vector4(const Vector2& v1, float fz, float fw);
+
+    /** Divides by 127 when converting */
+    Vector4(const Vector4int8&);
+
+    Vector4(class BinaryInput& b);
+    void serialize(class BinaryOutput& b) const;
+    void deserialize(class BinaryInput& b);
+
+    // coordinates
+    float x, y, z, w;
+
+    // access vector V as V[0] = V.x, V[1] = V.y, V[2] = V.z, etc.
+    //
+    // WARNING.  These member functions rely on
+    // (1) Vector4 not having virtual functions
+    // (2) the data packed in a 4*sizeof(float) memory block
+    float& operator[] (int i);
+    const float& operator[] (int i) const;
+
+    // assignment and comparison
+    Vector4& operator= (const Vector4& rkVector);
+    bool operator== (const Vector4& rkVector) const;
+    bool operator!= (const Vector4& rkVector) const;
+
+    static const Vector4& zero();
+
+    inline void set(float _x, float _y, float _z, float _w) {
+        x = _x;
+        y = _y;
+        z = _z;
+        w = _w;
+    }
+
+    inline void set(const Vector3& v, float _w) {
+        x = v.x;
+        y = v.y;
+        z = v.z;
+        w = _w;
+    }
+
+    inline void set(const Vector2& v, float _z, float _w) {
+        x = v.x;
+        y = v.y;
+        z = _z;
+        w = _w;
+    }
+
+    size_t hashCode() const;
+    bool fuzzyEq(const Vector4& other) const;
+    bool fuzzyNe(const Vector4& other) const;
+
+    static const Vector4& inf();
+    static const Vector4& nan();
+
+    /** sqrt(this->dot(*this)) */
+    float length() const;
+    float squaredLength() const;
+
+    inline float sum() const {
+        return x + y + z + w;
+    }
+
+    /** Returns true if this vector has finite length */
+    bool isFinite() const;
+
+    /** Returns true if this vector has length == 0 */
+    bool isZero() const;
+
+    /** Returns true if this vector has length == 1 */
+    bool isUnit() const;
+
+    // arithmetic operations
+    Vector4 operator+ (const Vector4& rkVector) const;
+    Vector4 operator- (const Vector4& rkVector) const;
+    
+    inline Vector4 operator*(const Vector4& rkVector) const {
+        return Vector4(x * rkVector.x, y * rkVector.y, z * rkVector.z, w * rkVector.w);
+    }
+
+    inline Vector4 operator/(const Vector4& rkVector) const {
+        return Vector4(x / rkVector.x, y / rkVector.y, z / rkVector.z, w / rkVector.w);
+    }
+
+    Vector4 operator*(const class Matrix4& M) const;
+
+    Vector4 operator* (float fScalar) const;
+    Vector4 operator/ (float fScalar) const;
+    Vector4 operator- () const;
+    friend Vector4 operator* (float, const Vector4& rkVector);
+
+    // arithmetic updates
+    Vector4& operator+= (const Vector4& rkVector);
+    Vector4& operator-= (const Vector4& rkVector);
+    Vector4& operator*= (float fScalar);
+    Vector4& operator/= (float fScalar);
+
+    inline Vector4 clamp(const Vector4& low, const Vector4& high) const {
+        return Vector4(
+            G3D::clamp(x, low.x, high.x),
+            G3D::clamp(y, low.y, high.y),
+            G3D::clamp(z, low.z, high.z),
+            G3D::clamp(w, low.w, high.w));
+    }
+
+    inline Vector4 clamp(float low, float high) const {
+        return Vector4(
+            G3D::clamp(x, low, high),
+            G3D::clamp(y, low, high),
+            G3D::clamp(z, low, high),
+            G3D::clamp(w, low, high));
+    }
+
+    float dot (const Vector4& rkVector) const;
+
+    Vector4 min(const Vector4& v) const;
+    Vector4 max(const Vector4& v) const;
+
+    std::string toString() const;
+
+    /**
+     Linear interpolation
+     */
+    Vector4 lerp(const Vector4& v, float alpha) const;
+
+    // 2-char swizzles
+
+    Vector2 xx() const;
+    Vector2 yx() const;
+    Vector2 zx() const;
+    Vector2 wx() const;
+    Vector2 xy() const;
+    Vector2 yy() const;
+    Vector2 zy() const;
+    Vector2 wy() const;
+    Vector2 xz() const;
+    Vector2 yz() const;
+    Vector2 zz() const;
+    Vector2 wz() const;
+    Vector2 xw() const;
+    Vector2 yw() const;
+    Vector2 zw() const;
+    Vector2 ww() const;
+
+    // 3-char swizzles
+
+    Vector3 xxx() const;
+    Vector3 yxx() const;
+    Vector3 zxx() const;
+    Vector3 wxx() const;
+    Vector3 xyx() const;
+    Vector3 yyx() const;
+    Vector3 zyx() const;
+    Vector3 wyx() const;
+    Vector3 xzx() const;
+    Vector3 yzx() const;
+    Vector3 zzx() const;
+    Vector3 wzx() const;
+    Vector3 xwx() const;
+    Vector3 ywx() const;
+    Vector3 zwx() const;
+    Vector3 wwx() const;
+    Vector3 xxy() const;
+    Vector3 yxy() const;
+    Vector3 zxy() const;
+    Vector3 wxy() const;
+    Vector3 xyy() const;
+    Vector3 yyy() const;
+    Vector3 zyy() const;
+    Vector3 wyy() const;
+    Vector3 xzy() const;
+    Vector3 yzy() const;
+    Vector3 zzy() const;
+    Vector3 wzy() const;
+    Vector3 xwy() const;
+    Vector3 ywy() const;
+    Vector3 zwy() const;
+    Vector3 wwy() const;
+    Vector3 xxz() const;
+    Vector3 yxz() const;
+    Vector3 zxz() const;
+    Vector3 wxz() const;
+    Vector3 xyz() const;
+    Vector3 yyz() const;
+    Vector3 zyz() const;
+    Vector3 wyz() const;
+    Vector3 xzz() const;
+    Vector3 yzz() const;
+    Vector3 zzz() const;
+    Vector3 wzz() const;
+    Vector3 xwz() const;
+    Vector3 ywz() const;
+    Vector3 zwz() const;
+    Vector3 wwz() const;
+    Vector3 xxw() const;
+    Vector3 yxw() const;
+    Vector3 zxw() const;
+    Vector3 wxw() const;
+    Vector3 xyw() const;
+    Vector3 yyw() const;
+    Vector3 zyw() const;
+    Vector3 wyw() const;
+    Vector3 xzw() const;
+    Vector3 yzw() const;
+    Vector3 zzw() const;
+    Vector3 wzw() const;
+    Vector3 xww() const;
+    Vector3 yww() const;
+    Vector3 zww() const;
+    Vector3 www() const;
+
+    // 4-char swizzles
+
+    Vector4 xxxx() const;
+    Vector4 yxxx() const;
+    Vector4 zxxx() const;
+    Vector4 wxxx() const;
+    Vector4 xyxx() const;
+    Vector4 yyxx() const;
+    Vector4 zyxx() const;
+    Vector4 wyxx() const;
+    Vector4 xzxx() const;
+    Vector4 yzxx() const;
+    Vector4 zzxx() const;
+    Vector4 wzxx() const;
+    Vector4 xwxx() const;
+    Vector4 ywxx() const;
+    Vector4 zwxx() const;
+    Vector4 wwxx() const;
+    Vector4 xxyx() const;
+    Vector4 yxyx() const;
+    Vector4 zxyx() const;
+    Vector4 wxyx() const;
+    Vector4 xyyx() const;
+    Vector4 yyyx() const;
+    Vector4 zyyx() const;
+    Vector4 wyyx() const;
+    Vector4 xzyx() const;
+    Vector4 yzyx() const;
+    Vector4 zzyx() const;
+    Vector4 wzyx() const;
+    Vector4 xwyx() const;
+    Vector4 ywyx() const;
+    Vector4 zwyx() const;
+    Vector4 wwyx() const;
+    Vector4 xxzx() const;
+    Vector4 yxzx() const;
+    Vector4 zxzx() const;
+    Vector4 wxzx() const;
+    Vector4 xyzx() const;
+    Vector4 yyzx() const;
+    Vector4 zyzx() const;
+    Vector4 wyzx() const;
+    Vector4 xzzx() const;
+    Vector4 yzzx() const;
+    Vector4 zzzx() const;
+    Vector4 wzzx() const;
+    Vector4 xwzx() const;
+    Vector4 ywzx() const;
+    Vector4 zwzx() const;
+    Vector4 wwzx() const;
+    Vector4 xxwx() const;
+    Vector4 yxwx() const;
+    Vector4 zxwx() const;
+    Vector4 wxwx() const;
+    Vector4 xywx() const;
+    Vector4 yywx() const;
+    Vector4 zywx() const;
+    Vector4 wywx() const;
+    Vector4 xzwx() const;
+    Vector4 yzwx() const;
+    Vector4 zzwx() const;
+    Vector4 wzwx() const;
+    Vector4 xwwx() const;
+    Vector4 ywwx() const;
+    Vector4 zwwx() const;
+    Vector4 wwwx() const;
+    Vector4 xxxy() const;
+    Vector4 yxxy() const;
+    Vector4 zxxy() const;
+    Vector4 wxxy() const;
+    Vector4 xyxy() const;
+    Vector4 yyxy() const;
+    Vector4 zyxy() const;
+    Vector4 wyxy() const;
+    Vector4 xzxy() const;
+    Vector4 yzxy() const;
+    Vector4 zzxy() const;
+    Vector4 wzxy() const;
+    Vector4 xwxy() const;
+    Vector4 ywxy() const;
+    Vector4 zwxy() const;
+    Vector4 wwxy() const;
+    Vector4 xxyy() const;
+    Vector4 yxyy() const;
+    Vector4 zxyy() const;
+    Vector4 wxyy() const;
+    Vector4 xyyy() const;
+    Vector4 yyyy() const;
+    Vector4 zyyy() const;
+    Vector4 wyyy() const;
+    Vector4 xzyy() const;
+    Vector4 yzyy() const;
+    Vector4 zzyy() const;
+    Vector4 wzyy() const;
+    Vector4 xwyy() const;
+    Vector4 ywyy() const;
+    Vector4 zwyy() const;
+    Vector4 wwyy() const;
+    Vector4 xxzy() const;
+    Vector4 yxzy() const;
+    Vector4 zxzy() const;
+    Vector4 wxzy() const;
+    Vector4 xyzy() const;
+    Vector4 yyzy() const;
+    Vector4 zyzy() const;
+    Vector4 wyzy() const;
+    Vector4 xzzy() const;
+    Vector4 yzzy() const;
+    Vector4 zzzy() const;
+    Vector4 wzzy() const;
+    Vector4 xwzy() const;
+    Vector4 ywzy() const;
+    Vector4 zwzy() const;
+    Vector4 wwzy() const;
+    Vector4 xxwy() const;
+    Vector4 yxwy() const;
+    Vector4 zxwy() const;
+    Vector4 wxwy() const;
+    Vector4 xywy() const;
+    Vector4 yywy() const;
+    Vector4 zywy() const;
+    Vector4 wywy() const;
+    Vector4 xzwy() const;
+    Vector4 yzwy() const;
+    Vector4 zzwy() const;
+    Vector4 wzwy() const;
+    Vector4 xwwy() const;
+    Vector4 ywwy() const;
+    Vector4 zwwy() const;
+    Vector4 wwwy() const;
+    Vector4 xxxz() const;
+    Vector4 yxxz() const;
+    Vector4 zxxz() const;
+    Vector4 wxxz() const;
+    Vector4 xyxz() const;
+    Vector4 yyxz() const;
+    Vector4 zyxz() const;
+    Vector4 wyxz() const;
+    Vector4 xzxz() const;
+    Vector4 yzxz() const;
+    Vector4 zzxz() const;
+    Vector4 wzxz() const;
+    Vector4 xwxz() const;
+    Vector4 ywxz() const;
+    Vector4 zwxz() const;
+    Vector4 wwxz() const;
+    Vector4 xxyz() const;
+    Vector4 yxyz() const;
+    Vector4 zxyz() const;
+    Vector4 wxyz() const;
+    Vector4 xyyz() const;
+    Vector4 yyyz() const;
+    Vector4 zyyz() const;
+    Vector4 wyyz() const;
+    Vector4 xzyz() const;
+    Vector4 yzyz() const;
+    Vector4 zzyz() const;
+    Vector4 wzyz() const;
+    Vector4 xwyz() const;
+    Vector4 ywyz() const;
+    Vector4 zwyz() const;
+    Vector4 wwyz() const;
+    Vector4 xxzz() const;
+    Vector4 yxzz() const;
+    Vector4 zxzz() const;
+    Vector4 wxzz() const;
+    Vector4 xyzz() const;
+    Vector4 yyzz() const;
+    Vector4 zyzz() const;
+    Vector4 wyzz() const;
+    Vector4 xzzz() const;
+    Vector4 yzzz() const;
+    Vector4 zzzz() const;
+    Vector4 wzzz() const;
+    Vector4 xwzz() const;
+    Vector4 ywzz() const;
+    Vector4 zwzz() const;
+    Vector4 wwzz() const;
+    Vector4 xxwz() const;
+    Vector4 yxwz() const;
+    Vector4 zxwz() const;
+    Vector4 wxwz() const;
+    Vector4 xywz() const;
+    Vector4 yywz() const;
+    Vector4 zywz() const;
+    Vector4 wywz() const;
+    Vector4 xzwz() const;
+    Vector4 yzwz() const;
+    Vector4 zzwz() const;
+    Vector4 wzwz() const;
+    Vector4 xwwz() const;
+    Vector4 ywwz() const;
+    Vector4 zwwz() const;
+    Vector4 wwwz() const;
+    Vector4 xxxw() const;
+    Vector4 yxxw() const;
+    Vector4 zxxw() const;
+    Vector4 wxxw() const;
+    Vector4 xyxw() const;
+    Vector4 yyxw() const;
+    Vector4 zyxw() const;
+    Vector4 wyxw() const;
+    Vector4 xzxw() const;
+    Vector4 yzxw() const;
+    Vector4 zzxw() const;
+    Vector4 wzxw() const;
+    Vector4 xwxw() const;
+    Vector4 ywxw() const;
+    Vector4 zwxw() const;
+    Vector4 wwxw() const;
+    Vector4 xxyw() const;
+    Vector4 yxyw() const;
+    Vector4 zxyw() const;
+    Vector4 wxyw() const;
+    Vector4 xyyw() const;
+    Vector4 yyyw() const;
+    Vector4 zyyw() const;
+    Vector4 wyyw() const;
+    Vector4 xzyw() const;
+    Vector4 yzyw() const;
+    Vector4 zzyw() const;
+    Vector4 wzyw() const;
+    Vector4 xwyw() const;
+    Vector4 ywyw() const;
+    Vector4 zwyw() const;
+    Vector4 wwyw() const;
+    Vector4 xxzw() const;
+    Vector4 yxzw() const;
+    Vector4 zxzw() const;
+    Vector4 wxzw() const;
+    Vector4 xyzw() const;
+    Vector4 yyzw() const;
+    Vector4 zyzw() const;
+    Vector4 wyzw() const;
+    Vector4 xzzw() const;
+    Vector4 yzzw() const;
+    Vector4 zzzw() const;
+    Vector4 wzzw() const;
+    Vector4 xwzw() const;
+    Vector4 ywzw() const;
+    Vector4 zwzw() const;
+    Vector4 wwzw() const;
+    Vector4 xxww() const;
+    Vector4 yxww() const;
+    Vector4 zxww() const;
+    Vector4 wxww() const;
+    Vector4 xyww() const;
+    Vector4 yyww() const;
+    Vector4 zyww() const;
+    Vector4 wyww() const;
+    Vector4 xzww() const;
+    Vector4 yzww() const;
+    Vector4 zzww() const;
+    Vector4 wzww() const;
+    Vector4 xwww() const;
+    Vector4 ywww() const;
+    Vector4 zwww() const;
+    Vector4 wwww() const;
+
+};
+
+
+//----------------------------------------------------------------------------
+inline Vector4::Vector4() {
+    x = y = z = w = 0;
+}
+
+//----------------------------------------------------------------------------
+
+inline Vector4::Vector4 (float fX, float fY, float fZ, float fW) {
+    x = fX;
+    y = fY;
+    z = fZ;
+    w = fW;
+}
+
+//----------------------------------------------------------------------------
+inline Vector4::Vector4 (float afCoordinate[4]) {
+    x = afCoordinate[0];
+    y = afCoordinate[1];
+    z = afCoordinate[2];
+    w = afCoordinate[3];
+}
+
+//----------------------------------------------------------------------------
+inline Vector4::Vector4(const Vector4& rkVector) {
+    x = rkVector.x;
+    y = rkVector.y;
+    z = rkVector.z;
+    w = rkVector.w;
+}
+//----------------------------------------------------------------------------
+inline Vector4::Vector4(const Vector3& rkVector, float fW) {
+    x = rkVector.x;
+    y = rkVector.y;
+    z = rkVector.z;
+    w = fW;
+}
+
+//----------------------------------------------------------------------------
+inline float& Vector4::operator[] (int i) {
+    return ((float*)this)[i];
+}
+
+//----------------------------------------------------------------------------
+inline const float& Vector4::operator[] (int i) const {
+    return ((float*)this)[i];
+}
+
+//----------------------------------------------------------------------------
+inline Vector4& Vector4::operator= (const Vector4& rkVector) {
+    x = rkVector.x;
+    y = rkVector.y;
+    z = rkVector.z;
+    w = rkVector.w;
+    return *this;
+}
+
+//----------------------------------------------------------------------------
+inline bool Vector4::operator== (const Vector4& rkVector) const {
+    return ( (x == rkVector.x) && (y == rkVector.y) && (z == rkVector.z) && (w == rkVector.w));
+}
+
+//----------------------------------------------------------------------------
+inline bool Vector4::operator!= (const Vector4& rkVector) const {
+    return ( x != rkVector.x || y != rkVector.y || z != rkVector.z || w != rkVector.w);
+}
+
+//----------------------------------------------------------------------------
+inline Vector4 Vector4::operator+ (const Vector4& rkVector) const {
+    return Vector4(x + rkVector.x, y + rkVector.y, z + rkVector.z, w + rkVector.w);
+}
+
+//----------------------------------------------------------------------------
+inline Vector4 Vector4::operator- (const Vector4& rkVector) const {
+    return Vector4(x - rkVector.x, y - rkVector.y, z - rkVector.z, w - rkVector.w);
+}
+
+//----------------------------------------------------------------------------
+inline Vector4 Vector4::operator* (float fScalar) const {
+    return Vector4(fScalar*x, fScalar*y, fScalar*z, fScalar*w);
+}
+
+//----------------------------------------------------------------------------
+inline Vector4 Vector4::operator- () const {
+    return Vector4( -x, -y, -z, -w);
+}
+
+//----------------------------------------------------------------------------
+inline Vector4& Vector4::operator+= (const Vector4& rkVector) {
+    x += rkVector.x;
+    y += rkVector.y;
+    z += rkVector.z;
+    w += rkVector.w;
+    return *this;
+}
+
+//----------------------------------------------------------------------------
+inline Vector4& Vector4::operator-= (const Vector4& rkVector) {
+    x -= rkVector.x;
+    y -= rkVector.y;
+    z -= rkVector.z;
+    w -= rkVector.w;
+    return *this;
+}
+
+//----------------------------------------------------------------------------
+
+inline Vector4 Vector4::lerp(const Vector4& v, float alpha) const {
+    return (*this) + (v - *this) * alpha; 
+}
+
+
+//----------------------------------------------------------------------------
+inline Vector4& Vector4::operator*= (float fScalar) {
+    x *= fScalar;
+    y *= fScalar;
+    z *= fScalar;
+    w *= fScalar;
+    return *this;
+}
+
+
+//----------------------------------------------------------------------------
+inline float Vector4::dot(const Vector4& rkVector) const {
+    return x*rkVector.x + y*rkVector.y + z*rkVector.z + w*rkVector.w;
+}
+
+//----------------------------------------------------------------------------
+inline Vector4 Vector4::min(const Vector4 &v) const {
+    return Vector4(G3D::min(v.x, x), G3D::min(v.y, y), G3D::min(v.z, z), G3D::min(v.w, w));
+}
+
+//----------------------------------------------------------------------------
+inline Vector4 Vector4::max(const Vector4 &v) const {
+    return Vector4(G3D::max(v.x, x), G3D::max(v.y, y), G3D::max(v.z, z), G3D::max(v.w, w));
+}
+
+//----------------------------------------------------------------------------
+inline bool Vector4::isZero() const {
+    return (x == 0.0f) && (y == 0.0f) && (z == 0.0f) && (w == 0.0f);
+}
+
+//----------------------------------------------------------------------------
+
+inline bool Vector4::isFinite() const {
+    return G3D::isFinite(x) && G3D::isFinite(y) && G3D::isFinite(z) && G3D::isFinite(w);
+}
+
+//----------------------------------------------------------------------------
+
+inline bool Vector4::isUnit() const {
+    return squaredLength() == 1.0;
+}
+
+//----------------------------------------------------------------------------
+
+inline float Vector4::length() const {
+    return sqrtf(squaredLength());
+}
+
+//----------------------------------------------------------------------------
+
+inline float Vector4::squaredLength() const {
+    return x * x + y * y + z * z + w * w;
+}
+
+}
+
+template <> struct HashTrait {
+    static size_t hashCode(const G3D::Vector4& key) { return key.hashCode(); }
+};
+
+
+template<> struct PositionTrait {
+    static void getPosition(const G3D::Vector4& v, G3D::Vector3& p) { p = v.xyz(); }
+};
+
+inline G3D::Vector4 operator* (float s, const G3D::Vector4& v) {
+    return v * s;
+}
+
+#endif
diff --git a/externals/g3dlite/G3D/Vector4.inl b/externals/g3dlite/G3D/Vector4.inl
new file mode 100644
index 00000000000..576cca83b56
--- /dev/null
+++ b/externals/g3dlite/G3D/Vector4.inl
@@ -0,0 +1,191 @@
+/**
+  @file Vector4.inl
+
+  @maintainer Morgan McGuire, matrix@graphics3d.com
+
+  @created 2002-07-09
+  @edited  2003-02-10
+ */
+
+//----------------------------------------------------------------------------
+
+inline unsigned int hashCode(const G3D::Vector4& v) {
+     return v.hashCode();
+}
+
+namespace G3D {
+
+//----------------------------------------------------------------------------
+inline Vector4::Vector4() {
+    x = y = z = w = 0;
+}
+
+//----------------------------------------------------------------------------
+
+inline Vector4::Vector4 (float fX, float fY, float fZ, float fW) {
+    x = fX;
+    y = fY;
+    z = fZ;
+    w = fW;
+}
+
+//----------------------------------------------------------------------------
+inline Vector4::Vector4 (float afCoordinate[4]) {
+    x = afCoordinate[0];
+    y = afCoordinate[1];
+    z = afCoordinate[2];
+    w = afCoordinate[3];
+}
+
+//----------------------------------------------------------------------------
+inline Vector4::Vector4(const Vector4& rkVector) {
+    x = rkVector.x;
+    y = rkVector.y;
+    z = rkVector.z;
+    w = rkVector.w;
+}
+//----------------------------------------------------------------------------
+inline Vector4::Vector4(const Vector3& rkVector, float fW) {
+    x = rkVector.x;
+    y = rkVector.y;
+    z = rkVector.z;
+    w = fW;
+}
+
+//----------------------------------------------------------------------------
+inline float& Vector4::operator[] (int i) {
+    return ((float*)this)[i];
+}
+
+//----------------------------------------------------------------------------
+inline const float& Vector4::operator[] (int i) const {
+    return ((float*)this)[i];
+}
+
+//----------------------------------------------------------------------------
+inline Vector4::operator float* () {
+    return (float*)this;
+}
+
+inline Vector4::operator const float* () const {
+    return (float*)this;
+}
+
+//----------------------------------------------------------------------------
+inline Vector4& Vector4::operator= (const Vector4& rkVector) {
+    x = rkVector.x;
+    y = rkVector.y;
+    z = rkVector.z;
+    w = rkVector.w;
+    return *this;
+}
+
+//----------------------------------------------------------------------------
+inline bool Vector4::operator== (const Vector4& rkVector) const {
+    return ( (x == rkVector.x) && (y == rkVector.y) && (z == rkVector.z) && (w == rkVector.w));
+}
+
+//----------------------------------------------------------------------------
+inline bool Vector4::operator!= (const Vector4& rkVector) const {
+    return ( x != rkVector.x || y != rkVector.y || z != rkVector.z || w != rkVector.w);
+}
+
+//----------------------------------------------------------------------------
+inline Vector4 Vector4::operator+ (const Vector4& rkVector) const {
+    return Vector4(x + rkVector.x, y + rkVector.y, z + rkVector.z, w + rkVector.w);
+}
+
+//----------------------------------------------------------------------------
+inline Vector4 Vector4::operator- (const Vector4& rkVector) const {
+    return Vector4(x - rkVector.x, y - rkVector.y, z - rkVector.z, w - rkVector.w);
+}
+
+//----------------------------------------------------------------------------
+inline Vector4 Vector4::operator* (float fScalar) const {
+    return Vector4(fScalar*x, fScalar*y, fScalar*z, fScalar*w);
+}
+
+//----------------------------------------------------------------------------
+inline Vector4 Vector4::operator- () const {
+    return Vector4( -x, -y, -z, -w);
+}
+
+//----------------------------------------------------------------------------
+inline Vector4& Vector4::operator+= (const Vector4& rkVector) {
+    x += rkVector.x;
+    y += rkVector.y;
+    z += rkVector.z;
+    w += rkVector.w;
+    return *this;
+}
+
+//----------------------------------------------------------------------------
+inline Vector4& Vector4::operator-= (const Vector4& rkVector) {
+    x -= rkVector.x;
+    y -= rkVector.y;
+    z -= rkVector.z;
+    w -= rkVector.w;
+    return *this;
+}
+
+//----------------------------------------------------------------------------
+
+inline Vector4 Vector4::lerp(const Vector4& v, float alpha) const {
+    return (*this) + (v - *this) * alpha;
+}
+
+//----------------------------------------------------------------------------
+inline Vector4& Vector4::operator*= (float fScalar) {
+    x *= fScalar;
+    y *= fScalar;
+    z *= fScalar;
+    w *= fScalar;
+    return *this;
+}
+
+//----------------------------------------------------------------------------
+inline float Vector4::dot(const Vector4& rkVector) const {
+    return x*rkVector.x + y*rkVector.y + z*rkVector.z + w*rkVector.w;
+}
+
+//----------------------------------------------------------------------------
+inline Vector4 Vector4::min(const Vector4 &v) const {
+    return Vector4(G3D::min(v.x, x), G3D::min(v.y, y), G3D::min(v.z, z), G3D::min(v.w, w));
+}
+
+//----------------------------------------------------------------------------
+inline Vector4 Vector4::max(const Vector4 &v) const {
+    return Vector4(G3D::max(v.x, x), G3D::max(v.y, y), G3D::max(v.z, z), G3D::max(v.w, w));
+}
+
+//----------------------------------------------------------------------------
+inline bool Vector4::isZero() const {
+    return (x == 0.0f) && (y == 0.0f) && (z == 0.0f) && (w == 0.0f);
+}
+
+//----------------------------------------------------------------------------
+
+inline bool Vector4::isFinite() const {
+    return G3D::isFinite(x) && G3D::isFinite(y) && G3D::isFinite(z) && G3D::isFinite(w);
+}
+
+//----------------------------------------------------------------------------
+
+inline bool Vector4::isUnit() const {
+    return squaredLength() == 1.0;
+}
+
+//----------------------------------------------------------------------------
+
+inline float Vector4::length() const {
+    return sqrtf(squaredLength());
+}
+
+//----------------------------------------------------------------------------
+
+inline float Vector4::squaredLength() const {
+    return x * x + y * y + z * z + w * w;
+}
+
+}
+
diff --git a/externals/g3dlite/G3D/Vector4int8.h b/externals/g3dlite/G3D/Vector4int8.h
new file mode 100644
index 00000000000..544b693e8b3
--- /dev/null
+++ b/externals/g3dlite/G3D/Vector4int8.h
@@ -0,0 +1,113 @@
+/**
+  @file Vector4int8.h
+ 
+  Homogeneous vector class.
+
+  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+ 
+  @created 2007-02-09
+  @edited  2007-02-09
+
+  Copyright 2000-2007, Morgan McGuire.
+  All rights reserved.
+ */
+
+#ifndef G3D_VECTOR4INT8_H
+#define G3D_VECTOR4INT8_H
+
+#include "G3D/platform.h"
+#include "G3D/g3dmath.h"
+
+namespace G3D {
+
+class Vector3;
+class Vector4;
+
+/**
+ Homogeneous vector stored efficiently in four signed int8s.
+
+ */
+class Vector4int8 {
+private:
+    // Hidden operators
+    bool operator<(const Vector4int8&) const;
+    bool operator>(const Vector4int8&) const;
+    bool operator<=(const Vector4int8&) const;
+    bool operator>=(const Vector4int8&) const;
+
+  
+    /** For fast operations, treat this packed data structure as 
+      an int32 */
+    inline uint32& asInt32() {
+        return *reinterpret_cast(this);
+    }
+
+    inline const uint32& asInt32() const {
+        return *reinterpret_cast(this);
+    }
+
+public:
+    // construction
+    inline Vector4int8() : x(0), y(0), z(0), w(0) {}
+    
+    /** Multiplies the source by 127 and clamps to (-128, 127) when converting */
+    Vector4int8(const Vector4& source);
+
+    /** Multiplies the source by 127 and clamps to (-128, 127) when converting */
+    Vector4int8(const Vector3& source, int8 w);
+
+    inline Vector4int8(int8 x, int8 y, int8 z, int8 w) : x(x), y(y), z(z), w(w) {}
+
+    Vector4int8(class BinaryInput& b);
+    void serialize(class BinaryOutput& b) const;
+    void deserialize(class BinaryInput& b);
+
+    // coordinates
+    int8 x, y, z, w;
+
+    inline operator int8* () {
+        return reinterpret_cast(this);
+    }
+
+    inline operator const int8* () const {
+        return reinterpret_cast(this);
+    }
+
+    // access vector V as V[0] = V.x, V[1] = V.y, V[2] = V.z, etc.
+    //
+    // WARNING.  These member functions rely on
+    // (1) Vector4int8 not having virtual functions
+    // (2) the data packed in a 4*sizeof(int8) memory block
+    inline int8& operator[] (int i) {
+        debugAssert(i >= 0 && i <= 4);
+        return ((int8*)this)[i];
+    }
+
+    const int8& operator[] (int i) const {
+        debugAssert(i >= 0 && i <= 4);
+        return ((const int8*)this)[i];
+    }
+
+    // assignment and comparison
+    Vector4int8& operator= (const Vector4int8& other) {
+        asInt32() = other.asInt32();
+        return *this;
+    }
+
+    inline bool operator== (const Vector4int8& other) const {
+        return asInt32() == other.asInt32();
+    }
+
+    inline bool operator!= (const Vector4int8& other) const {
+        return ! (*this == other);
+    }
+
+    inline unsigned int hashCode() const {
+        return asInt32();
+    }
+};
+
+} // namespace G3D
+
+
+#endif
diff --git a/externals/g3dlite/G3D/WeakCache.h b/externals/g3dlite/G3D/WeakCache.h
new file mode 100644
index 00000000000..f9fdc4bbd5b
--- /dev/null
+++ b/externals/g3dlite/G3D/WeakCache.h
@@ -0,0 +1,122 @@
+/** 
+  @file WeakCache.h
+ 
+  @maintainer Morgan McGuire, graphics3d.com
+ 
+  @created 2007-05-16
+  @edited  2007-05-16
+
+  Copyright 2000-2007, Morgan McGuire.
+  All rights reserved.
+ */
+#ifndef G3D_WEAKCACHE_H
+#define G3D_WEAKCACHE_H
+
+#include "G3D/ReferenceCount.h"
+#include "G3D/Table.h"
+
+namespace G3D {
+
+/**
+   A cache that does not prevent its members from being garbage collected.
+   Useful to avoid loading or computing an expression twice.  Useful
+   for memoization and dynamic programming.
+
+   Maintains a table of weak pointers.  Weak pointers do not prevent
+   an object from being garbage collected.  If the object is garbage
+   collected, the cache removes its reference.
+
+   There are no "contains" or "iterate" methods because elements can be
+   flushed from the cache at any time if they are garbage collected.
+
+   Example:
+   
+      WeakCache textureCache;
+
+      TextureRef loadTexture(std::string s) {
+          TextureRef t = textureCache[s];
+
+          if (t.isNull()) {
+              t = Texture::fromFile(s);
+              textureCache.set(s, t);
+          }
+
+          return t;
+      }
+      
+      
+    

+ */
+template
+class WeakCache {
+    typedef WeakReferenceCountedPointer ValueWeakRef;
+
+private:
+
+    Table table;
+
+public:
+    /**
+       Returns NULL if the object is not in the cache
+    */
+    ValueRef operator[](const Key& k) {
+        if (table.containsKey(k)) {
+            ValueWeakRef w = table[k];
+            ValueRef s = w.createStrongPtr();
+            if (s.isNull()) {
+                // This object has been collected; clean out its key
+                table.remove(k);
+            }
+            return s;
+        } else {
+            return NULL;
+        }
+    }
+
+    void set(const Key& k, ValueRef v) {
+        table.set(k, v);
+    }
+
+    /** Removes k from the cache or does nothing if it is not currently in the cache.*/
+    void remove(const Key& k) {
+        if (table.containsKey(k)) {
+            table.remove(k);
+        }
+    }
+};
+
+#if 0 // To turn off all WeakCaching
+template
+class WeakCache {
+private:
+
+    Table table;
+
+public:
+    /**
+       Returns NULL if the object is not in the cache
+    */
+    ValueRef operator[](const Key& k) {
+        if (table.containsKey(k)) {
+            return table[k];
+        } else {
+            return NULL;
+        }
+    }
+
+    void set(const Key& k, ValueRef v) {
+        table.set(k, v);
+    }
+
+    /** Removes k from the cache or does nothing if it is not currently in the cache.*/
+    void remove(const Key& k) {
+        if (table.containsKey(k)) {
+            table.remove(k);
+        }
+    }
+};
+#endif
+
+}
+#endif
+
diff --git a/externals/g3dlite/G3D/Welder.h b/externals/g3dlite/G3D/Welder.h
new file mode 100644
index 00000000000..2c2554da7b6
--- /dev/null
+++ b/externals/g3dlite/G3D/Welder.h
@@ -0,0 +1,82 @@
+#ifndef G3D_Welder_h
+#define G3D_Welder_h
+
+#include "G3D/platform.h"
+#include "G3D/Array.h"
+#include "G3D/Vector3.h"
+#include "G3D/Vector2.h"
+
+namespace G3D {
+
+class Any;
+
+class Welder {
+private:
+
+    Welder() {}
+
+public:
+
+    class Settings {
+    public:
+        /** Surfaces with normals that are within this angle of each
+            other are considered to be curved.  Default value is toRadians(70.0f).*/
+        float   normalSmoothingAngle;
+        float  	vertexWeldRadius;
+        float  	textureWeldRadius;
+        float  	normalWeldRadius;
+
+        inline Settings(float normalSmoothAngle = toRadians(70.0f)) : 
+            normalSmoothingAngle(normalSmoothAngle),
+            vertexWeldRadius(0.0001f), 
+            textureWeldRadius(0.0001f), 
+            normalWeldRadius(0.01f) {}
+
+
+        Settings(const Any& any);
+        operator Any() const;
+    };
+
+/**
+     Mutates geometry, texCoord, and indexArray so that the output has collocated vertices collapsed (welded).
+
+     @param vertices Input and output
+     @param textureCoords Input and output
+     @param normals Output only
+     @param indices Input and output. This is an array of trilist indices. 
+     @param oldToNewIndex Output argument
+     @param normalSmoothingAngle Varies from 0 (flat shading) to toRadians(180) for extremely smooth shading. Default is toRadians(70)
+     */
+    static void weld(
+        Array&     vertices,
+        Array&     textureCoords, 
+        Array&     normals,
+        Array*>& indices,
+        const Settings&     settings);
+
+    /**
+     Mutates geometry, texCoord, and indexArray so that the output has collocated vertices collapsed (welded).
+
+     @param vertices Input and output
+     @param textureCoords Input and output
+     @param normals Output only
+     @param indices Input and output. This is an array of trilist indices. 
+     @param oldToNewIndex Output argument
+     @param normalSmoothingAngle Varies from 0 (flat shading) to toRadians(180) for extremely smooth shading. Default is toRadians(70)
+     */
+    inline static void weld(
+        Array&     vertices,
+        Array&     textureCoords, 
+        Array&     normals,
+        Array&         indices,        
+        const Settings&     settings) {
+
+        Array*> meta;
+        meta.append(&indices);
+        weld(vertices, textureCoords, normals, meta, settings);
+    }
+};
+
+}
+
+#endif
diff --git a/externals/g3dlite/G3D/WrapMode.h b/externals/g3dlite/G3D/WrapMode.h
new file mode 100644
index 00000000000..8ef38a77c23
--- /dev/null
+++ b/externals/g3dlite/G3D/WrapMode.h
@@ -0,0 +1,93 @@
+/** 
+  @file WrapMode.h
+ 
+  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+ 
+  @created 2007-04-17
+  @edited  2007-04-17
+
+  Copyright 2000-2010, Morgan McGuire.
+  All rights reserved.
+ */
+
+#ifndef G3D_WrapMode_h
+#define G3D_WrapMode_h
+
+#include "G3D/platform.h"
+#include "G3D/enumclass.h"
+
+#ifdef IGNORE
+#   undef IGNORE
+#endif
+#ifdef ZERO
+#   undef ZERO
+#endif
+#ifdef ERROR
+#   undef ERROR
+#endif
+
+namespace G3D {
+
+/** 
+  Describes the behavior of G3D::Texture, G3D::Map2D, G3D::Image3,
+  etc. when accessing an out-of-bounds pixel.  Not all classes support
+  all modes.
+
+  Refer to these as scoped enums, e.g., WrapMode m = WrapMode::CLAMP;.
+
+  WrapMode::IGNORE silently discards attempts to write to out 
+     of bounds locations and returns an undefined value for reading
+     from out of bounds locations.
+
+  WrapMode::ERROR generates an error when the 
+     pixel indices are out of bounds
+
+  WrapMode::CLAMP makes out of bounds pixels equal to the last in-range pixel along that dimension.
+
+  WrapMode::TILE computes out of bounds pixels modulo the dimension
+
+  WrapMode::ZERO treats out of bounds values as the zero value, which varies in definition
+  according to the class used.  For example, with a G3D::Texture, ZERO = Color4(0,0,0,0).
+
+  Uses the "Intelligent Enum" design pattern 
+  http://www.codeguru.com/cpp/cpp/cpp_mfc/article.php/c4001/
+ */ 
+class WrapMode {
+public:
+    /** Don't use this enum; use WrapMode instances instead. */
+    enum Value {
+        CLAMP, 
+        TILE, 
+        ZERO,
+        IGNORE, 
+        ERROR
+    };
+
+private:
+    
+    Value value;
+
+public:
+
+    G3D_DECLARE_ENUM_CLASS_METHODS(WrapMode);
+
+    inline const char* toString() const {
+        static const char* s[] = {"CLAMP", "TILE", "ZERO", "IGNORE", "ERROR"};
+        return s[value];
+    }
+
+    inline explicit WrapMode(const std::string& x) : value(ERROR) {
+        static const char* s[] = {"CLAMP", "TILE", "ZERO", "IGNORE", "ERROR"};
+        for (int i = 0; i < 5; ++i) {
+            if (x == s[i]) {
+                value = (Value)i;
+            }
+        }
+    }
+};
+
+} // namespace G3D
+
+G3D_DECLARE_ENUM_CLASS_HASHCODE(G3D::WrapMode);
+
+#endif
diff --git a/externals/g3dlite/G3D/constants.h b/externals/g3dlite/G3D/constants.h
new file mode 100644
index 00000000000..dd5cb3649e5
--- /dev/null
+++ b/externals/g3dlite/G3D/constants.h
@@ -0,0 +1,129 @@
+/**
+  @file G3D/constants.h
+
+  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+  @created 2009-05-20
+  @edited  2009-05-20
+*/
+#ifndef G3D_constants_h
+#define G3D_constants_h
+
+#include "G3D/platform.h"
+#include "G3D/enumclass.h"
+
+namespace G3D {
+
+/** These are defined to have the same value as the equivalent OpenGL
+    constant. */
+class PrimitiveType {
+public:
+    enum Value {
+        POINTS         = 0x0000,
+        LINES          = 0x0001,
+        LINE_STRIP     = 0x0003, 
+        TRIANGLES      = 0x0004, 
+        TRIANGLE_STRIP = 0x0005,
+        TRIANGLE_FAN   = 0x0006,
+        QUADS          = 0x0007, 
+        QUAD_STRIP     = 0x0008
+    };
+
+private:
+
+    Value value;
+
+public:
+
+    G3D_DECLARE_ENUM_CLASS_METHODS(PrimitiveType);
+};
+
+
+/** Values for SuperSurface::GPUGeom::refractionHint. */
+class RefractionQuality {
+public:
+    enum Value {
+        /** No refraction; a translucent object will appear as if it had the same index of refraction
+            as the surrounding medium and objects will be undistorted in the background. */
+        NONE = 0, 
+
+        /** Use a static environment map (cube or paraboloid) for computing transmissivity.*/
+        STATIC_ENV = 25, 
+
+        /** Use a dynamically rendered 2D environment map; distort the background.  This looks good for many scenes
+            but avoids the cost of rendering a cube map for DYNAMIC_ENV. */
+        DYNAMIC_FLAT = 50,
+
+        /** Use a dynamically rendered 2D environment map that is re-captured per transparent object.  This works well
+            for transparent objects that are separated by a significant camera space z distance but overlap in screen space.*/
+        DYNAMIC_FLAT_MULTILAYER = 55,
+
+        /** Render a dynamic environment map */
+        DYNAMIC_ENV = 75, 
+
+        /** Use the best method available, ideally true ray tracing. */
+        BEST = 100
+    };
+
+private:
+
+    /** Used for to/from string conversion.  Last is the emtpy string as a sentinel */
+    static const std::string    str[7];
+    static const Value          enm[6];
+    Value value;
+
+public:
+    G3D_DECLARE_ENUM_CLASS_METHODS(RefractionQuality);
+
+    RefractionQuality(const class Any&);
+    RefractionQuality& operator=(const Any&);
+    operator Any() const;
+    const std::string& toString() const;
+};
+
+
+/** Values for SuperSurface::GPUGeom::mirrorHint. */
+class MirrorQuality {
+public:
+
+    enum Value {
+        /** Reflections are black */
+        NONE = 0, 
+        
+        /** Use a static environment map.  This is what most games use */
+        STATIC_ENV = 25, 
+        
+        /** Planar reflection, typically for water or glass windows.  This assumes that the mirror is flat;
+        it is distinct from RefractionQuality::DYNAMIC_FLAT, which assumes the background is flat.*/
+        DYNAMIC_PLANAR = 50,
+
+        /** Render a dynamic environment map. */
+        DYNAMIC_ENV = 75, 
+        
+        /** Use the best method available, ideally true ray tracing. */
+        BEST = 100
+    };
+
+private:
+
+    /** Used for to/from string conversion.  Last is the emtpy string as a sentinel */
+    static const std::string    str[6];
+    static const Value          enm[5];
+
+    Value value;
+
+public:
+    G3D_DECLARE_ENUM_CLASS_METHODS(MirrorQuality);
+    MirrorQuality(const class Any&);
+    MirrorQuality& operator=(const Any&);
+    operator Any() const;
+    const std::string& toString() const;
+};
+
+} // namespace G3D
+
+G3D_DECLARE_ENUM_CLASS_HASHCODE(G3D::PrimitiveType)
+G3D_DECLARE_ENUM_CLASS_HASHCODE(G3D::RefractionQuality)
+G3D_DECLARE_ENUM_CLASS_HASHCODE(G3D::MirrorQuality)
+
+#endif
+
diff --git a/externals/g3dlite/G3D/debug.h b/externals/g3dlite/G3D/debug.h
new file mode 100644
index 00000000000..a7697fe9c01
--- /dev/null
+++ b/externals/g3dlite/G3D/debug.h
@@ -0,0 +1,66 @@
+/**
+ @file debug.h
+
+ @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+
+ @created 2001-08-26
+ @edited  2006-02-16
+
+  Copyright 2000-2006, Morgan McGuire.
+ All rights reserved.
+*/
+
+#ifndef G3D_DEBUG_H
+#define G3D_DEBUG_H
+
+#include "G3D/platform.h"
+#ifdef _MSC_VER
+    #include 
+#endif
+
+#include "G3D/debugPrintf.h"
+#include "G3D/debugAssert.h"
+
+namespace G3D {
+
+#ifdef _MSC_VER
+    // Turn off 64-bit warnings
+#   pragma warning(push)
+#   pragma warning( disable : 4312)
+#   pragma warning( disable : 4267)
+#   pragma warning( disable : 4311)
+#endif
+
+
+/**
+ Useful for debugging purposes.
+ */
+inline bool isValidHeapPointer(const void* x) {
+    #ifdef _MSC_VER
+        return 
+            (x != (void*)0xcccccccc) && (x != (void*)0xdeadbeef) && (x != (void*)0xfeeefeee);
+    #else
+        return x != NULL;
+    #endif
+}
+
+/**
+ Returns true if the pointer is likely to be
+ a valid pointer (instead of an arbitrary number). 
+ Useful for debugging purposes.
+ */
+inline bool isValidPointer(const void* x) {
+    #ifdef _MSC_VER
+        return x != ((void*)0xcccccccc) && (x != (void*)0xdeadbeef) && (x != (void*)0xfeeefeee);
+    #else
+        return x != NULL;
+    #endif
+}
+
+#ifdef _MSC_VER
+#   pragma warning(pop)
+#endif
+
+}
+
+#endif
diff --git a/externals/g3dlite/G3D/debugAssert.h b/externals/g3dlite/G3D/debugAssert.h
new file mode 100644
index 00000000000..432e97e679d
--- /dev/null
+++ b/externals/g3dlite/G3D/debugAssert.h
@@ -0,0 +1,233 @@
+/**
+  @file debugAssert.h
+ 
+  debugAssert(expression);
+  debugAssertM(expression, message);
+ 
+  @cite
+     John Robbins, Microsoft Systems Journal Bugslayer Column, Feb 1999.
+     
+     http://msdn.microsoft.com/library/periodic/period99/feb99_BUGSLAYE_BUGSLAYE.htm
+ 
+  @cite 
+     Douglas Cox, An assert() Replacement, Code of The Day, flipcode, Sept 19, 2000
+     
+     http://www.flipcode.com/cgi-bin/msg.cgi?showThread=COTD-AssertReplace&forum=cotd&id=-1
+ 
+  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+ 
+  @created 2001-08-26
+  @edited  2006-01-12
+
+ Copyright 2000-2006, Morgan McGuire.
+ All rights reserved.
+ */
+
+#ifndef G3D_DEBUGASSERT_H
+#define G3D_DEBUGASSERT_H
+
+#include 
+#include "G3D/platform.h"
+
+#include 
+
+#ifdef _MSC_VER
+// conditional expression is constant
+#   pragma warning (disable : 4127)
+#endif
+
+#ifdef G3D_LINUX
+    // Needed so we can define a global display
+    // pointer for debugAssert.
+#if SOMEONE_MADE_THIS_USEFUL
+    #include 
+    #include 
+    #include 
+#endif
+#endif
+
+
+/**
+ @def debugBreak()
+ 
+ Break at the current location (i.e. don't push a procedure stack frame
+ before breaking).
+ */
+
+/**
+  @def debugAssert(exp)
+  Breaks if the expression is false. If G3D_DEBUG_NOGUI is defined, prompts at
+  the console, otherwise pops up a dialog.  The user may then break (debug), 
+  ignore, or halt the program.
+ 
+  The assertion is also posted to the clipboard under Win32.
+ */
+
+/**
+  @def debugAssertM(exp, msg)
+  Breaks if the expression is false and displays a message. If G3D_DEBUG_NOGUI 
+  is defined, prompts at the console, otherwise pops up a dialog.  The user may
+  then break (debug), ignore, or halt the program.
+ 
+  The assertion is also posted to the clipboard under Win32.
+ */
+
+/**
+ @def alwaysAssertM(exp, msg)
+ Same as debugAssertM except that it asserts in release builds as well.
+ */
+
+namespace G3D {
+typedef bool (*AssertionHook)(
+    const char* _expression,
+    const std::string& message,
+    const char* filename,
+    int lineNumber,
+    bool useGuiPrompt);
+
+/** 
+  Allows customization of the global function invoked when a debugAssert fails.
+  The initial value is G3D::_internal::_handleDebugAssert_.  G3D will invoke
+  rawBreak if the hook returns true.  If NULL, assertions are not handled.
+*/
+void setAssertionHook(AssertionHook hook);
+
+AssertionHook assertionHook();
+
+/**
+ Called by alwaysAssertM in case of failure in release mode.  If returns
+ true then the program exits with -1 (you can replace this with your own
+ version that throws an exception or has other failure modes).
+ */
+void setFailureHook(AssertionHook hook);
+AssertionHook failureHook();
+
+namespace _internal {
+    extern AssertionHook _debugHook;
+    extern AssertionHook _failureHook;
+} // internal
+} // G3D
+
+/**
+ @def __debugPromptShowDialog__
+ @internal
+ */
+
+#ifdef G3D_DEBUG
+
+#    if defined(_MSC_VER) 
+#       define rawBreak()  ::DebugBreak();
+#    elif defined(__i386__)
+        // gcc on intel
+#       define rawBreak() __asm__ __volatile__ ( "int $3" ); 
+#    else
+        // some other gcc
+#      define rawBreak() ::abort()
+#   endif
+
+
+#    define debugBreak() G3D::_internal::_releaseInputGrab_(); rawBreak(); G3D::_internal::_restoreInputGrab_();
+#    define debugAssert(exp) debugAssertM(exp, "Debug assertion failure")
+
+    #ifdef G3D_DEBUG_NOGUI
+        #define __debugPromptShowDialog__ false
+    #else
+        #define __debugPromptShowDialog__ true
+    #endif
+
+    #define debugAssertM(exp, message) do { \
+        if (!(exp)) { \
+            G3D::_internal::_releaseInputGrab_(); \
+            if ((G3D::_internal::_debugHook != NULL) && \
+                G3D::_internal::_debugHook((const char*)(#exp), message, __FILE__, __LINE__, __debugPromptShowDialog__)) { \
+                 rawBreak(); \
+            } \
+            G3D::_internal::_restoreInputGrab_(); \
+        } \
+    } while (0)
+
+    #define alwaysAssertM debugAssertM
+
+#else  // Release
+    #ifdef G3D_DEBUG_NOGUI
+        #define __debugPromptShowDialog__ false
+    #else
+        #define __debugPromptShowDialog__ true
+    #endif
+
+    // In the release build, just define away assertions.
+    #define rawBreak() do {} while (0)
+    #define debugAssert(exp) do {} while (0)
+    #define debugAssertM(exp, message) do {} while (0)
+    #define debugBreak() do {} while (0)
+
+    // But keep the 'always' assertions
+    #define alwaysAssertM(exp, message) { \
+        if (!(exp)) { \
+            G3D::_internal::_releaseInputGrab_(); \
+            if ((G3D::_internal::_failureHook != NULL) && \
+                G3D::_internal::_failureHook(#exp, message, __FILE__, __LINE__, __debugPromptShowDialog__)) { \
+                ::exit(-1);                                             \
+            } \
+            G3D::_internal::_restoreInputGrab_(); \
+         } \
+    }
+
+#endif  // if debug
+
+
+
+namespace G3D {  namespace _internal {
+
+#ifdef G3D_LINUX
+#if SOMEONE_MADE_THIS_USEFUL
+    /**
+     A pointer to the X11 display.  Initially NULL.  If set to a
+     non-null value (e.g. by SDLWindow), debugAssert attempts to use
+     this display to release the mouse/input grab when an assertion
+     fails.
+     */
+    extern Display*      x11Display;
+
+    /**
+     A pointer to the X11 window.  Initially NULL.  If set to a
+     non-null value (e.g. by SDLWindow), debugAssert attempts to use
+     this window to release the mouse/input grab when an assertion
+     fails.
+     */
+    extern Window        x11Window;
+#endif
+#endif
+
+/**
+ Pops up an assertion dialog or prints an assertion
+
+ ignoreAlways      - return result of pressing the ignore button.
+ useGuiPrompt      - if true, shows a dialog
+ */
+bool _handleDebugAssert_(
+    const char* expression,
+    const std::string& message,
+    const char* filename,
+    int         lineNumber,
+    bool        useGuiPrompt);
+
+bool _handleErrorCheck_(
+    const char* expression,
+    const std::string& message,
+    const char* filename,
+    int         lineNumber,
+    bool        useGuiPrompt);
+
+/** Attempts to give the user back their mouse and keyboard if they 
+    were locked to the current window.  
+    @internal*/
+void _releaseInputGrab_();
+
+/** Attempts to restore the state before _releaseInputGrab_.  
+    @internal*/
+void _restoreInputGrab_();
+
+}; }; // namespace
+
+#endif
diff --git a/externals/g3dlite/G3D/debugPrintf.h b/externals/g3dlite/G3D/debugPrintf.h
new file mode 100644
index 00000000000..b42151cae9e
--- /dev/null
+++ b/externals/g3dlite/G3D/debugPrintf.h
@@ -0,0 +1,62 @@
+/**
+ @file debugPrintf.h
+ 
+ @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+ 
+ @created 2001-08-26
+ @edited  2007-07-20
+
+ Copyright 2000-2007, Morgan McGuire.
+ All rights reserved.
+ */
+
+#ifndef G3D_DEBUGPRINTF_H
+#define G3D_DEBUGPRINTF_H
+
+#include "G3D/platform.h"
+#include 
+#include 
+#include "G3D/format.h"
+#include 
+
+namespace G3D {
+
+typedef void (*ConsolePrintHook)(const std::string&);
+
+namespace _internal {
+    extern ConsolePrintHook _consolePrintHook;
+}
+
+/** Called by consolePrintf after the log and terminal have been written to.
+ Used by GConsole to intercept printing routines.*/
+void setConsolePrintHook(ConsolePrintHook h);
+
+ConsolePrintHook consolePrintHook();
+
+/**
+   Sends output to the log and to the last GConsole instantiated.
+
+   Guarantees that the output has been flushed by the time the routine
+   returns.
+   @sa G3D::logPrintf, G3D::screenPrintf
+   @return The string that was printed
+ */
+std::string __cdecl consolePrintf(const char* fmt ...) G3D_CHECK_PRINTF_ARGS;
+std::string consolePrint(const std::string&);
+
+/**
+   Under visual studio, appears in the VS debug pane.
+   On unix-based operating systems the output is sent to stderr.
+
+   Also sends output to the console (G3D::consolePrintf) if there is a consolePrintHook,
+   and log (G3D::logPrintf), and flushes before returning.   
+
+   @return The string that was printed
+*/
+std::string __cdecl debugPrintf(const char* fmt ...) G3D_CHECK_PRINTF_ARGS;
+std::string debugPrint(const std::string&);
+
+} // namespace G3D
+
+#endif
+
diff --git a/externals/g3dlite/G3D/enumclass.h b/externals/g3dlite/G3D/enumclass.h
new file mode 100644
index 00000000000..c7dfe45f14f
--- /dev/null
+++ b/externals/g3dlite/G3D/enumclass.h
@@ -0,0 +1,147 @@
+/**
+  @file G3D/enumclass.h
+
+  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+  @created 2007-01-27
+  @edited  2007-07-20
+*/
+#ifndef G3D_enumclass_h
+#define G3D_enumclass_h
+
+#include "G3D/HashTrait.h"
+#include "G3D/BinaryInput.h"
+#include "G3D/BinaryOutput.h"
+
+/**
+\def G3D_DECLARE_ENUM_CLASS_METHODS
+
+  \brief Creates a series of methods that turn a class into a scoped enumeration.
+
+  Uses the "Intelligent Enum" design pattern 
+  http://www.codeguru.com/cpp/cpp/cpp_mfc/article.php/c4001/
+
+  Enum classes are initialized to their zero value by default.
+
+  See GLG3D/GKey.h for an example.
+  \sa G3D_DECLARE_ENUM_CLASS_HASHCODE
+ */
+#define G3D_DECLARE_ENUM_CLASS_METHODS(Classname)\
+    inline Classname(char v) : value((Value)v) {}\
+\
+    inline Classname() : value((Value)0) {}\
+\
+    inline Classname(const Value v) : value(v) {}\
+\
+    explicit inline Classname(int v) : value((Value)v) {}\
+\
+    /** Support cast back to the Value type, which is needed to allow implicit assignment inside unions. */\
+    /*inline operator Value() const {
+        return value;
+	}*/\
+\
+    inline operator int() const {\
+        return (int)value;\
+    }\
+\
+    inline bool operator== (const Classname other) const {\
+        return value == other.value;\
+    }\
+\
+    inline bool operator== (const Classname::Value other) const {\
+        return value == other;\
+    }\
+\
+    inline bool operator!= (const Classname other) const {\
+        return value != other.value;\
+    }\
+\
+    inline bool operator!= (const Classname::Value other) const {\
+        return value != other;\
+    }\
+\
+    inline bool operator< (const Classname other) const {\
+        return value < other.value;\
+    }\
+\
+    inline bool operator> (const Classname other) const {\
+        return value > other.value;\
+    }\
+\
+    inline bool operator>= (const Classname other) const {\
+        return value >= other.value;\
+    }\
+\
+    inline bool operator<= (const Classname other) const {\
+        return value <= other.value;\
+    }\
+\
+    inline bool operator< (const Value other) const {\
+        return value < other;\
+    }\
+\
+    inline bool operator> (const Value other) const {\
+        return value > other;\
+    }\
+\
+    inline bool operator<= (const Value other) const {\
+        return value <= other;\
+    }\
+\
+    inline bool operator>= (const Value other) const {\
+        return value >= other;\
+    }\
+\
+    inline Classname& operator-- () {\
+        value = (Value)((int)value - 1);\
+        return *this;\
+    }\
+\
+    inline Classname& operator++ () {\
+        value = (Value)((int)value + 1);\
+        return *this;\
+    }\
+\
+    inline Classname& operator+= (const int x) {\
+        value = (Value)((int)value + x);\
+        return *this;\
+    }\
+\
+    inline Classname& operator-= (const int x) {\
+        value = (Value)((int)value - x);\
+        return *this;\
+    }\
+\
+    inline Classname operator+ (const int x) const {\
+        return Classname((int)value + x);\
+    }\
+\
+    inline Classname operator- (const int x) const {\
+        return Classname((int)value - x);\
+    }\
+\
+    inline unsigned int hashCode() const {\
+        return (unsigned int)value;\
+    }\
+\
+    inline void serialize(BinaryOutput& b) const {\
+        b.writeInt32(value);\
+    }\
+\
+    inline void deserialize(BinaryInput& b) {\
+        value = (Value)b.readInt32();\
+    }
+
+/** \def G3D_DECLARE_ENUM_CLASS_HASHCODE
+*/
+#define G3D_DECLARE_ENUM_CLASS_HASHCODE(Classname)\
+template <> struct HashTrait                                              \
+{                                                                                           \
+    static size_t hashCode(Classname::Value key) { return static_cast(key); }       \
+};                                                                                          \
+                                                                                            \
+template <> struct HashTrait                                                     \
+{                                                                                           \
+    static size_t hashCode(Classname key) { return static_cast(key.hashCode()); }   \
+};
+
+#endif
diff --git a/externals/g3dlite/G3D/fileutils.h b/externals/g3dlite/G3D/fileutils.h
new file mode 100644
index 00000000000..9e49777d93a
--- /dev/null
+++ b/externals/g3dlite/G3D/fileutils.h
@@ -0,0 +1,254 @@
+/**
+ @file fileutils.h
+ 
+ @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+ 
+ @author  2002-06-06
+ @edited  2010-02-06
+
+ Copyright 2000-2010, Morgan McGuire.
+ All rights reserved.
+ */
+
+#ifndef G3D_fileUtils_h
+#define G3D_fileUtils_h
+
+#include "G3D/platform.h"
+#include 
+#include 
+#include "G3D/Array.h"
+#include "G3D/Set.h"
+#include "G3D/g3dmath.h"
+
+#ifdef G3D_WIN32
+// For chdir, mkdir, etc.
+#   include 
+#endif
+
+namespace G3D {
+
+    namespace _internal {
+        extern Set currentFilesUsed;
+    }
+
+/** Returns all the files used by G3D and GLG3D during the current execution. */
+Array filesUsed();
+    
+std::string readWholeFile(
+    const std::string&          filename);
+
+
+/** Reads from a zip file and decompresses the desired contents
+	into memory.  Does not support recursive zip calls (i.e. a .zip
+	stored within another .zip)
+
+	@param file the path, of the format C:\\...\\something.zip\\...\\desiredfile.ext
+	@param data a pointer to the memory where the file will be stored
+	@param length the size of the file decompressed to memory */
+void zipRead(const std::string& file,
+			 void*& data,
+			 size_t& length);
+
+
+/** Closes the contents of a zip file that had been decompressed to
+	memory.  Must be called in tandem with zipRead() to avoid memory
+	leaks.
+
+	@param data the pointer to the decompressed file in memory */
+void zipClose(void* data);
+
+
+/**
+ @param flush If true (default), the file is ready for reading as soon
+ as the function returns.  If false, the function returns immediately and
+ writes the file in the background.
+ */
+void writeWholeFile(
+    const std::string& filename, 
+    const std::string& str, 
+    bool    flush = true);
+
+/**
+ Creates the directory (which may optionally end in a /)
+ and any parents needed to reach it.
+ */
+void createDirectory(
+    const std::string&          dir);
+
+/**
+ Fully qualifies a filename.  The filename may contain wildcards,
+ in which case the wildcards will be preserved in the returned value.
+ */
+std::string resolveFilename(const std::string& filename);
+
+/**
+ Appends all files matching filespec to the files array.  The names
+ will not contain paths unless includePath == true.  These may be
+ relative to the current directory unless the filespec is fully qualified
+ (can be done with resolveFilename).
+ Wildcards can only appear to the right of the last slash in filespec.
+ Works with .zip files used as paths, if filespec is passed in the form
+ C:\\...\\something.zip\\*  Does not work recursively with zipfiles (a
+ .zip within a .zip will not work)
+ */
+void getFiles(
+	const std::string&			filespec,
+	Array&			files,
+	bool						includePath    = false);
+
+/**
+ Appends all directories matching filespec to the files array. The names
+ will not contain paths unless includePath == true.  These may be
+ relative to the current directory unless the filespec is fully qualified
+ (can be done with resolveFilename).
+ Does not append special directories "." or "..".
+ Works with .zip files used as paths, if filespec is passed in the form
+ C:\\...\\something.zip\\*  Does not work recursively with zipfiles (a
+ .zip within a .zip will not work)
+ */
+void getDirs(
+	const std::string&			filespec,
+	Array&			files,
+	bool						includePath = false);
+
+
+/** Returns true if the specified path exists and is a directory */
+bool isDirectory(const std::string& filespec);
+
+
+/** Returns true if the specified filename exists and is a zipfile */
+bool isZipfile(const std::string& filename);
+
+
+/** Returns the length of the file.  If 
+	filename specifies a path that contains a zipfile, but the 
+	contents within are specified correctly, returns the 
+	uncompressed size of the requested file.  Returns -1 if
+	the file does not exist. 
+	
+	@param filename the path to test, may contain .zip
+*/
+int64 fileLength(const std::string& filename);
+
+/**
+ Copies the file
+ */
+void copyFile(
+    const std::string&          source,
+    const std::string&          dest);
+
+/** Returns a temporary file that is open for read/write access.  This
+    tries harder than the ANSI tmpfile, so it may succeed when that fails. */
+FILE* createTempFile();
+
+/**
+ Returns true if the given file (or directory) exists.
+
+ \param filename the path to test. must not end in a trailing slash.
+ \param lookInZipfiles if the path does not exist, calls zipfileExists()
+ \param trustCache If true and \a lookInZipfiles is true, cache directory and zipfile contents
+  so that subsequent calls to the same directory are fast.
+
+ \sa G3D::clearFileSystemCache, G3D::zipfileExists
+ */
+bool fileExists
+(const std::string&          filename,
+ bool	                     lookInZipfiles = true,
+ bool                        trustCache = true);
+
+
+/** Clears the cache used by fileExists */
+void clearFileSystemCache();
+
+/**
+ Returns true if the given file (or directory) exists
+ within a zipfile.  Called if fileExists initially
+ returns false and the lookInZipfiles flag has been set.
+ Must not end in a trailing slash.  Does not work for recursive
+ zipfiles (.zips within another .zip)
+
+ @param filename the path to test
+ @param outZipfile the path to the .zip file
+ @param outInternalFile the path (within the .zip) where the desired file is located, if valid
+
+ */
+bool zipfileExists
+(const std::string&          filename,
+ std::string&		     outZipfile,
+ std::string&		     outInternalFile);
+
+bool zipfileExists(const std::string& filename);
+
+/**
+  Parses a filename into four useful pieces.
+
+  Examples:
+
+  c:\\a\\b\\d.e   
+    root  = "c:\\"
+    path  = "a" "b"
+    base  = "d"
+    ext   = "e"
+ 
+  /a/b/d.e
+    root = "/"
+    path  = "a" "b"
+    base  = "d"
+    ext   = "e"
+
+  /a/b
+    root  = "/"
+    path  = "a"
+    base  = "b"
+    ext   = "e"
+
+ */
+void parseFilename(
+    const std::string&  filename,
+    std::string&        drive,    
+    Array& path,
+    std::string&        base,
+    std::string&        ext);
+
+
+/**
+ Returns the part of the filename that includes the base and ext from
+ parseFilename (i.e. everything to the right of the path).
+ */
+std::string filenameBaseExt(const std::string& filename);
+
+/**
+ Returns the extension on a filename.
+ */
+std::string filenameExt(const std::string& filename);
+
+
+/** Returns the portion of a filename to the left of the last period
+    and to the right of the last slash or colon.
+ */
+std::string filenameBase(const std::string& filename);
+
+/** Creates a unique filename base in the current directory using the
+    specified prefix and suffix.*/
+std::string generateFilenameBase(const std::string& prefix = "", const std::string& suffix = "");
+
+/** 
+ Returns the drive (if Win32) and path from a filename, including 
+ a slash if there was one.
+ filenamePath(f) + filenameBaseExt(f) == f
+ */
+std::string filenamePath(const std::string& filename);
+
+/** Returns true if '*' or '?' appears in the string */
+bool filenameContainsWildcards(const std::string& filename);
+
+/** Returns true if dst does not exist or src is newer than dst.  Works on both files and directories. */
+bool fileIsNewer(const std::string& src, const std::string& dst);
+
+/** Appends file onto dirname, ensuring a / if needed. */
+std::string pathConcat(const std::string& dirname, const std::string& file);
+
+} // namespace
+
+#endif
+
diff --git a/externals/g3dlite/G3D/filter.h b/externals/g3dlite/G3D/filter.h
new file mode 100644
index 00000000000..609477b79c9
--- /dev/null
+++ b/externals/g3dlite/G3D/filter.h
@@ -0,0 +1,29 @@
+/**
+  @file G3D/filter.h
+
+  @author Morgan McGuire, http://graphics.cs.williams.edu
+  @created 2007-03-01
+  @edited  2007-03-01
+
+  Copyright 2000-2007, Morgan McGuire.
+  All rights reserved.
+ */
+#ifndef G3D_FILTER_H
+#define G3D_FILTER_H
+
+#include "G3D/platform.h"
+#include "G3D/Array.h"
+#include "G3D/g3dmath.h"
+
+namespace G3D {
+/**
+ Generates a set of 1D gaussian filter coefficients of size N.  The coefficients
+ are centered on element (N-1)/2 and have standard deviation given by std.  The coefficients
+ are normalized such that the sum across coeff is 1.0.
+
+ Matches the results returned by Matlab fspecial('gaussian', [1, N], std)
+ */ 
+void gaussian1D(Array& coeff, int N = 5, float std = 0.5f);
+}
+
+#endif
diff --git a/externals/g3dlite/G3D/format.h b/externals/g3dlite/G3D/format.h
new file mode 100644
index 00000000000..3c7f0678876
--- /dev/null
+++ b/externals/g3dlite/G3D/format.h
@@ -0,0 +1,44 @@
+/**
+ @file format.h
+ 
+ @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+ 
+ @author  2000-09-09
+ @edited  2005-11-03
+
+ Copyright 2000-2005, Morgan McGuire.
+ All rights reserved.
+ */
+
+#ifndef G3D_FORMAT_H
+#define G3D_FORMAT_H
+
+#include "G3D/platform.h"
+#include 
+#include 
+#include 
+
+namespace G3D {
+
+/**
+  Produces a string from arguments of the style of printf.  This avoids
+  problems with buffer overflows when using sprintf and makes it easy
+  to use the result functionally.  This function is fast when the resulting
+  string is under 160 characters (not including terminator) and slower
+  when the string is longer.
+ */
+std::string   __cdecl format(
+    const char*                 fmt
+    ...) G3D_CHECK_PRINTF_ARGS;
+
+/**
+  Like format, but can be called with the argument list from a ... function.
+ */
+std::string vformat(
+    const char*                 fmt,
+    va_list                     argPtr) G3D_CHECK_VPRINTF_ARGS;
+
+
+} // namespace
+
+#endif
diff --git a/externals/g3dlite/G3D/g3dfnmatch.h b/externals/g3dlite/G3D/g3dfnmatch.h
new file mode 100644
index 00000000000..464b3927eee
--- /dev/null
+++ b/externals/g3dlite/G3D/g3dfnmatch.h
@@ -0,0 +1,83 @@
+/*-
+ * Copyright (c) 1992, 1993
+ *The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *This product includes software developed by the University of
+ *California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *@(#)fnmatch.h8.1 (Berkeley) 6/2/93
+ *
+ * From FreeBSD fnmatch.h 1.7
+ * $Id: g3dfnmatch.h,v 1.1 2010/02/06 06:51:28 morgan3d Exp $
+ */
+#ifndef G3D_g3dfnmatch_h
+#define G3D_g3dfnmatch_h
+
+#include "G3D/platform.h"
+
+namespace G3D {
+
+#if defined(G3D_WIN32) 
+
+#   if ! defined(FNM_NOMATCH)
+#       define FNM_NOMATCH        1      /* Match failed. */
+#       define FNM_NOESCAPE    0x01      /* Disable backslash escaping. */
+#       define FNM_PATHNAME    0x02      /* Slash must be matched by slash. */
+#       define FNM_PERIOD      0x04      /* Period must be matched by period. */
+#       define FNM_LEADING_DIR 0x08      /* Ignore / after Imatch. */
+#       define FNM_CASEFOLD    0x10      /* Case insensitive search. */
+#       define FNM_PREFIX_DIRS 0x20      /* Directory prefixes of pattern match too. */
+#    endif
+
+#else 
+
+    // On non-windows systems, include fnmatch directly
+#   include 
+#endif
+
+
+/**
+  Function fnmatch() as specified in POSIX 1003.2-1992, section B.6.
+  Compares a filename or pathname to a pattern.
+
+The fnmatch() function checks whether the string argument matches the pattern argument, which is a shell wildcard pattern.
+The flags argument modifies the behaviour; it is the bitwise OR of zero or more of the following flags:
+
+- FNM_NOESCAPE If this flag is set, treat backslash as an ordinary character, instead of an escape character.
+- FNM_PATHNAME If this flag is set, match a slash in string only with a slash in pattern and not by an asterisk (*) or a question mark (?) metacharacter, nor by a bracket expression ([]) containing a slash.
+- FNM_PERIOD If this flag is set, a leading period in string has to be matched exactly by a period in pattern. A period is considered to be leading if it is the first character in string, or if both FNM_PATHNAME is set and the period immediately follows a slash.
+- FNM_FILE_NAME This is a GNU synonym for FNM_PATHNAME.
+- FNM_LEADING_DIR If this flag (a GNU extension) is set, the pattern is considered to be matched if it matches an initial segment of string which is followed by a slash. This flag is mainly for the internal use of glibc and is only implemented in certain cases.
+- FNM_CASEFOLD If this flag (a GNU extension) is set, the pattern is matched case-insensitively.
+
+\return Zero if \a string matches \a pattern, FNM_NOMATCH if there is no match or another non-zero value if there is an error
+
+ */
+int g3dfnmatch(const char *pattern, const char *string, int flags);
+}
+#endif
diff --git a/externals/g3dlite/G3D/g3dmath.h b/externals/g3dlite/G3D/g3dmath.h
new file mode 100644
index 00000000000..d16214ebb37
--- /dev/null
+++ b/externals/g3dlite/G3D/g3dmath.h
@@ -0,0 +1,845 @@
+/**
+ @file g3dmath.h
+ 
+ Math util class.
+ 
+ @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+ @cite highestBit by Jukka Liimatta
+ 
+ @created 2001-06-02
+ @edited  2009-04-07
+
+ Copyright 2000-2006, Morgan McGuire.
+ All rights reserved.
+ */
+
+#ifndef G3D_g3dmath_h
+#define G3D_g3dmath_h
+
+#ifdef _MSC_VER
+// Disable conditional expression is constant, which occurs incorrectly on inlined functions
+#   pragma warning (push)
+#   pragma warning (disable : 4127)
+// disable: "C++ exception handler used"
+#   pragma warning (disable : 4530)
+#endif
+
+#include "G3D/platform.h"
+#include 
+#include 
+#include 
+#include 
+
+#ifdef _MSC_VER
+    // Visual Studio is missing inttypes.h
+#   ifndef PRId64
+#       define PRId64 "I64d"
+#   endif
+#else
+#include 
+#endif
+
+/*These defines enable functionality introduced with the 1999 ISO C
+**standard. They must be defined before the inclusion of math.h to
+**engage them. If optimisation is enabled, these functions will be 
+**inlined. With optimisation switched off, you have to link in the
+**maths library using -lm.
+*/
+
+#define _ISOC9X_SOURCE1
+#define _ISOC99_SOURCE1
+#define __USE_ISOC9X1
+#define __USE_ISOC991
+
+#include 
+
+#include "G3D/debug.h"
+
+#undef min
+#undef max
+
+namespace G3D {
+
+#ifdef _MSC_VER
+inline double __fastcall drand48() {
+    return ::rand() / double(RAND_MAX);
+}
+
+#if !defined(_WIN64)
+
+/**
+   Win32 implementation of the C99 fast rounding routines.
+   
+   @cite routines are
+   Copyright (C) 2001 Erik de Castro Lopo 
+   
+   Permission to use, copy, modify, distribute, and sell this file for any 
+   purpose is hereby granted without fee, provided that the above copyright 
+   and this permission notice appear in all copies.  No representations are
+   made about the suitability of this software for any purpose.  It is 
+   provided "as is" without express or implied warranty.
+*/
+
+__inline long int lrint (double flt) {
+    int intgr;
+
+    _asm {
+        fld flt
+        fistp intgr
+    };
+
+    return intgr;
+}
+
+__inline long int lrintf(float flt) {
+    int intgr;
+
+    _asm {
+        fld flt
+        fistp intgr
+    };
+
+    return intgr;
+}
+
+#else
+
+    __inline long int lrint (double flt) {
+        return (long int)floor(flt+0.5f);
+    }
+
+    __inline long int lrintf(float flt) {
+        return (long int)floorf(flt+0.5f);
+    }
+
+#endif
+
+#endif
+
+
+#define fuzzyEpsilon (0.00001f)
+/** 
+    This value should not be tested against directly, instead
+    G3D::isNan() and G3D::isFinite() will return reliable results. */
+double inf();
+
+/** This value should not be tested against directly, instead
+    G3D::isNan() and G3D::isFinite() will return reliable results. */
+double nan();
+
+float finf();
+
+float fnan();
+
+inline double pi() {
+    return 3.1415926535898;
+}
+
+inline double halfPi() {
+    return 1.57079633;
+}
+
+inline double twoPi() {
+    return 6.28318531;
+}
+
+typedef signed char     int8;
+typedef unsigned char	uint8;
+typedef short           int16;
+typedef unsigned short  uint16;
+typedef int             int32;
+typedef unsigned int    uint32;
+
+#ifdef _MSC_EXTENSIONS
+    typedef __int64             int64;
+    typedef unsigned __int64    uint64;
+#elif ! defined(_MSC_VER)
+    typedef int64_t             int64;
+    typedef uint64_t            uint64;
+#else
+    typedef long long           int64;
+    typedef unsigned long long  uint64;
+#endif
+
+typedef float           float32;
+typedef double          float64;
+
+int iAbs(int iValue);
+int iCeil(double fValue);
+
+/**
+ Clamps the value to the range [low, hi] (inclusive)
+ */
+int iClamp(int val, int low, int hi);
+int16 iClamp(int16 val, int16 low, int16 hi);
+double clamp(double val, double low, double hi);
+float clamp(float val, float low, float hi);
+
+/**
+ Returns a + (b - a) * f;
+ */
+inline double lerp(double a, double b, double f) {
+    return a + (b - a) * f;
+}
+
+inline float lerp(float a, float b, float f) {
+    return a + (b - a) * f;
+}
+
+/**
+ Wraps the value to the range [0, hi) (exclusive
+ on the high end).  This is like the clock arithmetic
+ produced by % (modulo) except the result is guaranteed
+ to be positive.
+ */
+int iWrap(int val, int hi);
+
+int iFloor(double fValue);
+
+int iSign(int iValue);
+int iSign(double fValue);
+
+inline int iSign(float f) {
+    return iSign((double)f);
+}
+
+
+/** 
+    Fast round to integer using the lrint routine.
+    Typically 6x faster than casting to integer.
+ */
+inline int iRound(double fValue) {
+    return lrint(fValue);
+}
+
+/** 
+    Fast round to integer using the lrint routine.
+    Typically 6x faster than casting to integer.
+ */
+inline int iRound(float f) {
+    return lrintf(f);
+}
+
+/**
+ Returns a random number uniformly at random between low and hi
+ (inclusive).
+ @deprecated Use Random::integer
+ */
+int iRandom(int low, int hi);
+
+double abs (double fValue);
+double aCos (double fValue);
+double aSin (double fValue);
+double aTan (double fValue);
+double aTan2 (double fY, double fX);
+double sign (double fValue);
+double square (double fValue);
+
+/**
+ Returns true if the argument is a finite real number.
+ */
+bool isFinite(double x);
+
+/**
+ Returns true if the argument is NaN (not a number).
+ You can't use x == nan to test this because all
+ comparisons against nan return false.
+ */
+bool isNaN(double x);
+bool isNaN(float x);
+inline bool isNaN(int x) {
+    (void)x;
+    return false;
+}
+
+/**
+ Computes x % 3.
+ */
+int iMod3(int x);
+
+/**
+ Uniform random number between low and hi, inclusive. [low, hi]
+ @deprecated 
+ @sa Random::uniform
+ */
+float uniformRandom(float low = 0.0f, float hi = 1.0f);
+
+/**
+ Normally distributed random number. 
+
+ @deprecated 
+ @sa Random::gaussian
+ */
+float gaussRandom(float mean = 0.0f, float stdev = 1.0f);
+
+
+/** Returns x5 */
+template 
+inline T pow5(T x) {
+    const T y = x * x;
+    return y * y * x;
+}
+
+
+template 
+inline T min(const T& x, const T& y) {
+    return std::min(x, y);
+}
+
+template 
+inline T min(const T& x, const T& y, const T& z) {
+    return std::min(std::min(x, y), z);
+}
+
+template 
+inline T min(const T& x, const T& y, const T& z, const T& w) {
+    return std::min(std::min(x, y), std::min(z, w));
+}
+
+template 
+inline T max(const T& x, const T& y) {
+    return std::max(x, y);
+}
+
+template 
+inline T max(const T& x, const T& y, const T& z) {
+    return std::max(std::max(x, y), z);
+}
+
+template 
+inline T max(const T& x, const T& y, const T& z, const T& w) {
+    return std::max(std::max(x, y), std::max(z, w));
+}
+
+int iMin(int x, int y);
+int iMax(int x, int y);
+
+double square(double x);
+double sumSquares(double x, double y);
+double sumSquares(double x, double y, double z);
+double distance(double x, double y);
+double distance(double x, double y, double z);
+
+/**
+  Returnes the 0-based index of the highest 1 bit from
+  the left.  -1 means the number was 0.
+
+  @cite Based on code by jukka@liimatta.org
+ */ 
+int highestBit(uint32 x);
+
+/**
+ Note that fuzzyEq(a, b) && fuzzyEq(b, c) does not imply
+ fuzzyEq(a, c), although that will be the case on some
+ occasions.
+ */
+bool fuzzyEq(double a, double b);
+
+/** True if a is definitely not equal to b.  
+    Guaranteed false if a == b. 
+    Possibly false when a != b.*/
+bool fuzzyNe(double a, double b);
+
+/** Is a strictly greater than b? (Guaranteed false if a <= b).
+    (Possibly false if a > b) */
+bool fuzzyGt(double a, double b);
+
+/** Is a near or greater than b? */
+bool fuzzyGe(double a, double b);
+
+/** Is a strictly less than b? (Guaranteed false if a >= b)*/
+bool fuzzyLt(double a, double b);
+
+/** Is a near or less than b? */
+bool fuzzyLe(double a, double b);
+
+/**
+ Computes 1 / sqrt(x).
+ */
+inline float rsq(float x) {
+    return 1.0f / sqrtf(x);
+}
+
+/**
+ Return the next power of 2 higher than the input
+ If the input is already a power of 2, the output will be the same 
+ as the input.
+ */
+int ceilPow2(unsigned int in);
+
+/** Returns 2^x */
+inline int pow2(unsigned int x) {
+    return 1 << x;
+}
+
+inline double log2(double x) {
+    return ::log(x) * 1.442695;
+}
+
+inline float log2(float x) {
+    return ::logf(x) * 1.442695f;
+}
+
+inline double log2(int x) {
+    return log2((double)x);
+}
+
+
+/**
+ * True if num is a power of two.
+ */
+bool isPow2(int num);
+
+bool isOdd(int num);
+bool isEven(int num);
+
+double toRadians(double deg);
+double toDegrees(double rad);
+
+/**
+ Returns true if x is not exactly equal to 0.0f.
+ */
+inline bool any(float x) {
+    return x != 0;
+}
+
+/**
+ Returns true if x is not exactly equal to 0.0f.
+ */
+inline bool all(float x) {
+    return x != 0;
+}
+
+/**
+ v / v (for DirectX/Cg support)
+ */
+inline float normalize(float v) {
+    return v / v;
+}
+
+/**
+ a * b (for DirectX/Cg support)
+ */
+inline float dot(float a, float b) {
+    return a * b;
+}
+
+
+/**
+ a * b (for DirectX/Cg support)
+ */
+inline float mul(float a, float b) {
+    return a * b;
+}
+
+/**
+ 2^x
+ */
+inline double exp2(double x) {
+    return pow(2.0, x);
+}
+
+inline float exp2(float x) {
+    return powf(2.0f, x);
+}
+
+/** @deprecated Use rsq */
+inline double rsqrt(double x) {
+    return 1.0 / sqrt(x);
+}
+
+/** @deprecated Use rsq */
+inline float rsqrt(float x) {
+    // TODO: default this to using the SSE2 instruction
+    return 1.0 / sqrtf(x);
+}
+
+/**
+ sin(x)/x
+ */
+inline double sinc(double x) {
+    double r = sin(x) / x;
+
+    if (isNaN(r)) {
+        return 1.0;
+    } else {
+        return r;
+    }
+}
+
+/**
+ Computes a floating point modulo; the result is t wrapped to the range [lo, hi).
+ */
+inline float wrap(float t, float lo, float hi) {
+    if ((t >= lo) && (t < hi)) {
+        return t;
+    }
+
+    debugAssert(hi > lo);
+
+    float interval = hi - lo;
+
+    return t - interval * iFloor((t - lo) / interval);
+}
+
+
+inline double wrap(double t, double lo, double hi) {
+    if ((t >= lo) && (t < hi)) {
+        return t;
+    }
+
+    debugAssert(hi > lo);
+
+    double interval = hi - lo;
+
+    return t - interval * iFloor((t - lo) / interval);
+}
+
+inline double wrap(double t, double hi) {
+    return wrap(t, 0.0, hi);
+}
+
+
+inline bool isFinite(double x) {
+    return ! isNaN(x) && (x < G3D::inf()) && (x > -G3D::inf());
+}
+
+inline bool isFinite(float x) {
+    return ! isNaN(x) && (x < G3D::finf()) && (x > -G3D::finf());
+}
+
+//----------------------------------------------------------------------------
+inline int iAbs (int iValue) {
+    return ( iValue >= 0 ? iValue : -iValue );
+}
+
+//----------------------------------------------------------------------------
+inline int iCeil (double fValue) {
+    return int(::ceil(fValue));
+}
+
+//----------------------------------------------------------------------------
+
+inline int iClamp(int val, int low, int hi) {
+    debugAssert(low <= hi);
+	if (val <= low) {
+		return low;
+	} else if (val >= hi) {
+		return hi;
+	} else {
+		return val;
+	}
+}
+
+//----------------------------------------------------------------------------
+
+inline int16 iClamp(int16 val, int16 low, int16 hi) {
+    debugAssert(low <= hi);
+	if (val <= low) {
+		return low;
+	} else if (val >= hi) {
+		return hi;
+	} else {
+		return val;
+	}
+}
+
+//----------------------------------------------------------------------------
+
+inline double clamp(double val, double low, double hi) {
+    debugAssert(low <= hi);
+	if (val <= low) {
+		return low;
+	} else if (val >= hi) {
+		return hi;
+	} else {
+		return val;
+	}
+}
+
+inline float clamp(float val, float low, float hi) {
+    debugAssert(low <= hi);
+	if (val <= low) {
+		return low;
+	} else if (val >= hi) {
+		return hi;
+	} else {
+		return val;
+	}
+}
+//----------------------------------------------------------------------------
+
+inline int iWrap(int val, int hi) {
+	if (val < 0) {
+		return ((val % hi) + hi) % hi;
+	} else {
+		return val % hi;
+	}
+}
+
+//----------------------------------------------------------------------------
+inline int iFloor (double fValue) {
+    return int(::floor(fValue));
+}
+
+//----------------------------------------------------------------------------
+inline int iSign (int iValue) {
+    return ( iValue > 0 ? + 1 : ( iValue < 0 ? -1 : 0 ) );
+}
+
+inline int iSign (double fValue) {
+    return ( fValue > 0.0 ? + 1 : ( fValue < 0.0 ? -1 : 0 ) );
+}
+
+//----------------------------------------------------------------------------
+inline double abs (double fValue) {
+    return double(::fabs(fValue));
+}
+
+//----------------------------------------------------------------------------
+inline double aCos (double fValue) {
+    if ( -1.0 < fValue ) {
+        if ( fValue < 1.0 )
+            return double(::acos(fValue));
+        else
+            return 0.0;
+    } else {
+        return pi();
+    }
+}
+
+//----------------------------------------------------------------------------
+inline double aSin (double fValue) {
+    if ( -1.0 < fValue ) {
+        if ( fValue < 1.0 ) {
+            return double(::asin(fValue));
+        } else {
+            return -halfPi();
+        }
+    } else {
+        return halfPi();
+    }
+}
+
+//----------------------------------------------------------------------------
+inline double aTan (double fValue) {
+    return double(::atan(fValue));
+}
+
+//----------------------------------------------------------------------------
+inline double aTan2 (double fY, double fX) {
+    return double(::atan2(fY, fX));
+}
+
+//----------------------------------------------------------------------------
+inline double sign (double fValue) {
+    if (fValue > 0.0) {
+        return 1.0;
+	}
+
+    if (fValue < 0.0) {
+        return -1.0;
+	}
+
+    return 0.0;
+}
+
+inline float sign (float fValue) {
+    if (fValue > 0.0f) {
+        return 1.0f;
+	}
+
+    if (fValue < 0.0f) {
+        return -1.0f;
+	}
+
+    return 0.0f;
+}
+
+
+inline float uniformRandom(float low, float hi) {
+    return (hi - low) * float(::rand()) / float(RAND_MAX) + low;
+}
+
+inline double square(double x) {
+    return x * x;
+}
+
+inline float square(float x) {
+    return x * x;
+}
+
+inline int square(int x) {
+    return x * x;
+}
+
+//----------------------------------------------------------------------------
+inline double sumSquares(double x, double y) {
+    return x*x + y*y;
+}
+
+//----------------------------------------------------------------------------
+inline float sumSquares(float x, float y) {
+    return x*x + y*y;
+}
+
+//----------------------------------------------------------------------------
+inline double sumSquares(double x, double y, double z) {
+    return x*x + y*y + z*z;
+}
+
+//----------------------------------------------------------------------------
+inline float sumSquares(float x, float y, float z) {
+    return x*x + y*y + z*z;
+}
+
+//----------------------------------------------------------------------------
+inline double distance(double x, double y) {
+    return sqrt(sumSquares(x, y));
+}
+
+//----------------------------------------------------------------------------
+inline float distance(float x, float y) {
+    return sqrt(sumSquares(x, y));
+}
+
+//----------------------------------------------------------------------------
+inline double distance(double x, double y, double z) {
+    return sqrt(sumSquares(x, y, z));
+}
+
+//----------------------------------------------------------------------------
+inline float distance(float x, float y, float z) {
+    return sqrt(sumSquares(x, y, z));
+}
+
+//----------------------------------------------------------------------------
+
+/** @deprecated use G3D::min */
+inline int iMin(int x, int y) {
+    return (x >= y) ? y : x;
+}
+
+//----------------------------------------------------------------------------
+/** @deprecated use G3D::min */
+inline int iMax(int x, int y) {
+    return (x >= y) ? x : y;
+}
+
+//----------------------------------------------------------------------------
+inline int ceilPow2(unsigned int in) {
+    in -= 1;
+
+    in |= in >> 16;
+    in |= in >> 8;
+    in |= in >> 4;
+    in |= in >> 2;
+    in |= in >> 1;
+
+    return in + 1;
+}
+
+inline bool isPow2(int num) {
+    return ((num & -num) == num);
+}
+
+inline bool isOdd(int num) {
+    return (num & 1) == 1;
+}
+
+inline bool isEven(int num) {
+    return (num & 1) == 0;
+}
+
+inline double toRadians(double deg) {
+    return deg * pi() / 180.0;
+}
+
+inline double toDegrees(double rad) {
+    return rad * 180.0 / pi();
+}
+
+inline float toRadians(float deg) {
+    return deg * (float)pi() / 180.0f;
+}
+
+inline float toDegrees(float rad) {
+    return rad * 180.0f / (float)pi();
+}
+
+inline float toRadians(int deg) {
+    return deg * (float)pi() / 180.0f;
+}
+
+inline float toDegrees(int rad) {
+    return rad * 180.0f / (float)pi();
+}
+/**
+ Computes an appropriate epsilon for comparing a and b.
+ */
+inline double eps(double a, double b) {
+    // For a and b to be nearly equal, they must have nearly
+    // the same magnitude.  This means that we can ignore b
+    // since it either has the same magnitude or the comparison
+    // will fail anyway.
+    (void)b;
+    const double aa = abs(a) + 1.0;
+    if (aa == inf()) {
+        return fuzzyEpsilon;
+    } else {
+        return fuzzyEpsilon * aa;
+    }
+}
+
+inline bool fuzzyEq(double a, double b) {
+    return (a == b) || (abs(a - b) <= eps(a, b));
+}
+
+inline bool fuzzyNe(double a, double b) {
+    return ! fuzzyEq(a, b);
+}
+
+inline bool fuzzyGt(double a, double b) {
+    return a > b + eps(a, b);
+}
+
+inline bool fuzzyGe(double a, double b) {
+    return a > b - eps(a, b);
+}
+
+inline bool fuzzyLt(double a, double b) {
+    return a < b - eps(a, b);
+}
+
+inline bool fuzzyLe(double a, double b) {
+    return a < b + eps(a, b);
+}
+
+inline int iMod3(int x) {
+    return x % 3;
+}
+
+/**
+ Given a 32-bit integer, returns the integer with the bytes in the opposite order.
+ */
+inline uint32 flipEndian32(const uint32 x) {
+    return (x << 24) | ((x & 0xFF00) << 8) | 
+           ((x & 0xFF0000) >> 8) | ((x & 0xFF000000) >> 24);
+}
+
+/**
+ Given a 16-bit integer, returns the integer with the bytes in the opposite order.
+ */
+inline uint16 flipEndian16(const uint16 x) {
+    return (x << 8) | ((x & 0xFF00) >> 8);
+}
+
+
+} // namespace
+
+#ifdef _MSC_VER
+#   pragma warning (pop)
+#endif
+
+#endif
+
diff --git a/externals/g3dlite/G3D/g3dmath.inl b/externals/g3dlite/G3D/g3dmath.inl
new file mode 100644
index 00000000000..9bf661a7ebc
--- /dev/null
+++ b/externals/g3dlite/G3D/g3dmath.inl
@@ -0,0 +1,288 @@
+/**
+ @file g3dmath.inl
+
+  @maintainer Morgan McGuire, matrix@graphics3d.com
+
+ @created 2001-06-02
+ @edited  2006-01-14
+ */
+
+#include 
+
+#ifdef _MSC_VER
+// Disable conditional expression is constant, which occurs incorrectly on inlined functions
+#   pragma warning (push)
+#   pragma warning( disable : 4127 )
+#endif
+
+namespace G3D {
+
+inline bool isNaN(double x) {
+    bool b1  = (x < 0.0);
+    bool b2  = (x >= 0.0);
+    bool b3  = !(b1 || b2);
+    return b3;
+}
+
+inline bool isFinite(double x) {
+    return ! isNaN(x) && (x < G3D::inf()) && (x > -G3D::inf());
+}
+
+//----------------------------------------------------------------------------
+inline int iAbs (int iValue) {
+    return ( iValue >= 0 ? iValue : -iValue );
+}
+
+//----------------------------------------------------------------------------
+inline int iCeil (double fValue) {
+    return int(::ceil(fValue));
+}
+
+//----------------------------------------------------------------------------
+
+inline int iClamp(int val, int low, int hi) {
+    debugAssert(low <= hi);
+    if (val <= low) {
+        return low;
+    } else if (val >= hi) {
+        return hi;
+    } else {
+        return val;
+    }
+}
+
+//----------------------------------------------------------------------------
+
+inline double clamp(double val, double low, double hi) {
+    debugAssert(low <= hi);
+    if (val <= low) {
+        return low;
+    } else if (val >= hi) {
+        return hi;
+    } else {
+        return val;
+    }
+}
+
+inline float clamp(float val, float low, float hi) {
+    debugAssert(low <= hi);
+    if (val <= low) {
+        return low;
+    } else if (val >= hi) {
+        return hi;
+    } else {
+        return val;
+    }
+}
+//----------------------------------------------------------------------------
+
+inline int iWrap(int val, int hi) {
+    if (val < 0) {
+        return ((val % hi) + hi) % hi;
+    } else {
+        return val % hi;
+    }
+}
+
+//----------------------------------------------------------------------------
+inline int iFloor (double fValue) {
+    return int(::floor(fValue));
+}
+
+//----------------------------------------------------------------------------
+inline int iSign (int iValue) {
+    return ( iValue > 0 ? + 1 : ( iValue < 0 ? -1 : 0 ) );
+}
+
+inline int iSign (double fValue) {
+    return ( fValue > 0.0 ? + 1 : ( fValue < 0.0 ? -1 : 0 ) );
+}
+
+//----------------------------------------------------------------------------
+inline double abs (double fValue) {
+    return double(::fabs(fValue));
+}
+
+//----------------------------------------------------------------------------
+inline double aCos (double fValue) {
+    if ( -1.0 < fValue ) {
+        if ( fValue < 1.0 )
+            return double(::acos(fValue));
+        else
+            return 0.0;
+    } else {
+        return G3D_PI;
+    }
+}
+
+//----------------------------------------------------------------------------
+inline double aSin (double fValue) {
+    if ( -1.0 < fValue ) {
+        if ( fValue < 1.0 ) {
+            return double(::asin(fValue));
+        } else {
+            return -G3D_HALF_PI;
+        }
+    } else {
+        return G3D_HALF_PI;
+    }
+}
+
+//----------------------------------------------------------------------------
+inline double aTan (double fValue) {
+    return double(::atan(fValue));
+}
+
+//----------------------------------------------------------------------------
+inline double aTan2 (double fY, double fX) {
+    return double(::atan2(fY, fX));
+}
+
+//----------------------------------------------------------------------------
+inline double sign (double fValue) {
+    if (fValue > 0.0) {
+        return 1.0;
+    }
+
+    if (fValue < 0.0) {
+        return -1.0;
+    }
+
+    return 0.0;
+}
+
+inline double G3D_DEPRECATED unitRandom () {
+    return double(::rand()) / double(RAND_MAX);
+}
+
+inline float uniformRandom(float low, float hi) {
+    return (hi - low) * float(::rand()) / float(RAND_MAX) + low;
+}
+
+//----------------------------------------------------------------------------
+inline double G3D_DEPRECATED symmetricRandom () {
+    return 2.0 * double(::rand()) / double(RAND_MAX) - 1.0;
+}
+
+//----------------------------------------------------------------------------
+inline double square(double x) {
+    return x * x;
+}
+
+//----------------------------------------------------------------------------
+inline double sumSquares(double x, double y) {
+    return x*x + y*y;
+}
+
+//----------------------------------------------------------------------------
+inline double sumSquares(double x, double y, double z) {
+    return x*x + y*y + z*z;
+}
+
+//----------------------------------------------------------------------------
+inline double distance(double x, double y) {
+    return sqrt(sumSquares(x, y));
+}
+
+//----------------------------------------------------------------------------
+inline double distance(double x, double y, double z) {
+    return sqrt(sumSquares(x, y, z));
+}
+
+//----------------------------------------------------------------------------
+
+/** @deprecated use G3D::min */
+inline int iMin(int x, int y) {
+    return (x >= y) ? y : x;
+}
+
+//----------------------------------------------------------------------------
+/** @deprecated use G3D::min */
+inline int iMax(int x, int y) {
+    return (x >= y) ? x : y;
+}
+
+//----------------------------------------------------------------------------
+inline int ceilPow2(unsigned int in) {
+    in -= 1;
+
+    in |= in >> 16;
+    in |= in >> 8;
+    in |= in >> 4;
+    in |= in >> 2;
+    in |= in >> 1;
+
+    return in + 1;
+}
+
+inline bool isPow2(int num) {
+    return ((num & -num) == num);
+}
+
+inline bool isOdd(int num) {
+    return (num & 1) == 1;
+}
+
+inline bool isEven(int num) {
+    return (num & 1) == 0;
+}
+
+inline double toRadians(double deg) {
+    return deg * G3D_PI / 180.0;
+}
+
+inline double toDegrees(double rad) {
+    return rad * 180.0 / G3D_PI;
+}
+
+/**
+ Computes an appropriate epsilon for comparing a and b.
+ */
+inline double eps(double a, double b) {
+    // For a and b to be nearly equal, they must have nearly
+    // the same magnitude.  This means that we can ignore b
+    // since it either has the same magnitude or the comparison
+    // will fail anyway.
+    (void)b;
+    const double aa = abs(a) + 1;
+    if (aa == inf()) {
+        return fuzzyEpsilon;
+    } else {
+        return fuzzyEpsilon * aa;
+    }
+}
+
+inline bool fuzzyEq(double a, double b) {
+    return (a == b) || (abs(a - b) <= eps(a, b));
+}
+
+inline bool fuzzyNe(double a, double b) {
+    return ! fuzzyEq(a, b);
+}
+
+inline bool fuzzyGt(double a, double b) {
+    return a > b + eps(a, b);
+}
+
+inline bool fuzzyGe(double a, double b) {
+    return a > b - eps(a, b);
+}
+
+inline bool fuzzyLt(double a, double b) {
+    return a < b - eps(a, b);
+}
+
+inline bool fuzzyLe(double a, double b) {
+    return a < b + eps(a, b);
+}
+
+inline int iMod3(int x) {
+    return x % 3;
+}
+
+} // namespace G3D
+
+#ifdef _MSC_VER
+// Disable conditional expression is constant, which occurs incorrectly on inlined functions
+#   pragma warning (pop)
+#endif
diff --git a/externals/g3dlite/G3D/platform.h b/externals/g3dlite/G3D/platform.h
new file mode 100644
index 00000000000..11ba0127a16
--- /dev/null
+++ b/externals/g3dlite/G3D/platform.h
@@ -0,0 +1,331 @@
+/**
+ @file platform.h
+
+ \#defines for platform specific issues.
+
+ @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+
+ @created 2003-06-09
+ @edited  2010-01-11
+ */
+
+#ifndef G3D_platform_h
+#define G3D_platform_h
+
+/**
+ The version number of G3D in the form: MmmBB ->
+ version M.mm [beta BB]
+ */
+#define G3D_VER 80004
+
+// fatal error for unsupported architectures
+#if defined(__powerpc__)
+#   error PowerPC is not supported by G3D!
+#endif
+
+#if defined(G3D_RELEASEDEBUG)
+#   define G3D_DEBUGRELEASE
+#endif
+
+#if defined(G3D_DEBUGRELEASE) && defined(_DEBUG)
+#   undef _DEBUG
+#endif
+
+/** @def G3D_DEBUG()
+    Defined if G3D is built in debug mode. */
+#if !defined(G3D_DEBUG) && (defined(_DEBUG) || defined(G3D_DEBUGRELEASE))
+#   define G3D_DEBUG
+#endif
+
+#ifndef _MSC_VER
+/// Fast call is a register-based optimized calling convention supported only by Visual C++
+#define __fastcall
+
+#endif
+
+#ifdef _MSC_VER
+    #define G3D_WIN32
+#elif  defined(__FreeBSD__) || defined(__OpenBSD__)
+    #define G3D_FREEBSD
+    #define G3D_LINUX
+#elif defined(__linux__)
+    #define G3D_LINUX
+#elif defined(__APPLE__)
+    #define G3D_OSX
+
+   // Prevent OS X fp.h header from being included; it defines
+   // pi as a constant, which creates a conflict with G3D
+#define __FP__
+#else
+    #error Unknown platform
+#endif
+
+// Detect 64-bit under various compilers
+#if (defined(_M_X64) || defined(_WIN64) || defined(__LP64__) || defined(_LP64))
+#    define G3D_64BIT
+	#if defined(WIN32)
+        #include 
+    #endif
+#else
+#    define G3D_32BIT
+#endif
+
+// Strongly encourage inlining on gcc
+#ifdef __GNUC__
+#define inline __inline__
+#endif
+
+
+// Verify that the supported compilers are being used and that this is a known
+// processor.
+
+#ifdef G3D_LINUX
+#   ifndef __GNUC__
+#       error G3D only supports the gcc compiler on Linux.
+#   endif
+#endif
+
+#ifdef G3D_OSX
+#    ifndef __GNUC__
+#        error G3D only supports the gcc compiler on OS X.
+#    endif
+
+#    if defined(__i386__)
+#        define G3D_OSX_INTEL
+#    elif defined(__PPC__)
+#        define G3D_OSX_PPC
+#    else
+#        define G3D_OSX_UNKNOWN
+#    endif
+
+#endif
+
+
+#ifdef _MSC_VER
+// Microsoft Visual C++ 8.0 ("Express")       = 1400
+// Microsoft Visual C++ 7.1	("2003") _MSC_VER = 1310
+// Microsoft Visual C++ 7.0	("2002") _MSC_VER = 1300
+// Microsoft Visual C++ 6.0	_MSC_VER          = 1200
+// Microsoft Visual C++ 5.0	_MSC_VER          = 1100
+
+// Turn off warnings about deprecated C routines
+#   pragma warning (disable : 4996)
+
+// Turn off "conditional expression is constant" warning; MSVC generates this
+// for debug assertions in inlined methods.
+#  pragma warning (disable : 4127)
+
+/** @def G3D_DEPRECATED()
+    Creates deprecated warning. */
+#  define G3D_DEPRECATED __declspec(deprecated)
+
+// Prevent Winsock conflicts by hiding the winsock API
+#   ifndef _WINSOCKAPI_
+#       define _G3D_INTERNAL_HIDE_WINSOCK_
+#       define _WINSOCKAPI_
+#   endif
+
+// Disable 'name too long for browse information' warning
+#   pragma warning (disable : 4786)
+// TODO: remove
+#   pragma warning (disable : 4244)
+
+#   define restrict
+
+/** @def G3D_CHECK_PRINTF_METHOD_ARGS()
+    Enables printf parameter validation on gcc. */
+#   define G3D_CHECK_PRINTF_ARGS
+
+/** @def G3D_CHECK_PRINTF_METHOD_ARGS()
+    Enables printf parameter validation on gcc. */
+#   define G3D_CHECK_VPRINTF_ARGS
+
+/** @def G3D_CHECK_PRINTF_METHOD_ARGS()
+    Enables printf parameter validation on gcc. */
+#   define G3D_CHECK_PRINTF_METHOD_ARGS
+
+/** @def G3D_CHECK_PRINTF_METHOD_ARGS()
+    Enables printf parameter validation on gcc. */
+#   define G3D_CHECK_VPRINTF_METHOD_ARGS
+
+    // On MSVC, we need to link against the multithreaded DLL version of
+    // the C++ runtime because that is what SDL and ZLIB are compiled
+    // against.  This is not the default for MSVC, so we set the following
+    // defines to force correct linking.
+    //
+    // For documentation on compiler options, see:
+    //  http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/_core_.2f.md.2c_2f.ml.2c_2f.mt.2c_2f.ld.asp
+    //  http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore98/HTML/_core_Compiler_Reference.asp
+    //
+
+    // DLL runtime
+    #ifndef _DLL
+	    #define _DLL
+    #endif
+
+    // Multithreaded runtime
+    #ifndef _MT
+	    #define _MT 1
+    #endif
+
+    // Ensure that we aren't forced into the static lib
+    #ifdef _STATIC_CPPLIB
+	    #undef _STATIC_CPPLIB
+    #endif
+
+    #ifdef _DEBUG
+        #pragma comment (linker, "/NODEFAULTLIB:LIBCMTD.LIB")
+        #pragma comment (linker, "/NODEFAULTLIB:LIBCPMTD.LIB")
+        #pragma comment (linker, "/NODEFAULTLIB:LIBCPD.LIB")
+        #pragma comment (linker, "/DEFAULTLIB:MSVCPRTD.LIB")
+        #pragma comment(linker, "/NODEFAULTLIB:LIBCD.LIB")
+        #pragma comment(linker, "/DEFAULTLIB:MSVCRTD.LIB")
+    #else
+        #pragma comment(linker, "/NODEFAULTLIB:LIBC.LIB")
+        #pragma comment(linker, "/DEFAULTLIB:MSVCRT.LIB")
+        #pragma comment (linker, "/NODEFAULTLIB:LIBCMT.LIB")
+        #pragma comment (linker, "/NODEFAULTLIB:LIBCPMT.LIB")
+        #pragma comment(linker, "/NODEFAULTLIB:LIBCP.LIB")
+        #pragma comment (linker, "/DEFAULTLIB:MSVCPRT.LIB")
+    #endif
+
+    // Now set up external linking
+
+#    ifdef _DEBUG
+        // zlib was linked against the release MSVCRT; force
+        // the debug version.
+#        pragma comment(linker, "/NODEFAULTLIB:MSVCRT.LIB")
+#	 endif
+
+
+#    ifndef WIN32_LEAN_AND_MEAN
+#       define WIN32_LEAN_AND_MEAN 1
+#    endif
+
+
+#   define NOMINMAX 1
+#   ifndef _WIN32_WINNT
+#       define _WIN32_WINNT 0x0500
+#   endif
+#   include 
+#   undef WIN32_LEAN_AND_MEAN
+#   undef NOMINMAX
+
+#   ifdef _G3D_INTERNAL_HIDE_WINSOCK_
+#      undef _G3D_INTERNAL_HIDE_WINSOCK_
+#      undef _WINSOCKAPI_
+#   endif
+
+
+/** @def G3D_START_AT_MAIN()
+    Defines necessary wrapper around WinMain on Windows to allow transfer of execution to main(). */
+#   define G3D_START_AT_MAIN()\
+int WINAPI G3D_WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR szCmdLine, int sw);\
+int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR szCmdLine, int sw) {\
+    return G3D_WinMain(hInst, hPrev, szCmdLine, sw);\
+}
+
+#else
+
+/** @def G3D_START_AT_MAIN()
+    Defines necessary wrapper around WinMain on Windows to allow transfer of execution to main(). */
+#   define G3D_START_AT_MAIN()
+
+#endif  // win32
+
+#ifdef __GNUC__
+
+#    include 
+
+#   if __STDC_VERSION__ < 199901
+#        define restrict __restrict__
+#   endif
+
+/** @def G3D_DEPRECATED()
+    Creates deprecated warning. */
+#   define G3D_DEPRECATED __attribute__((__deprecated__))
+
+// setup function calling conventions
+#   if defined(__i386__) && ! defined(__x86_64__)
+
+#       ifndef __cdecl
+#           define __cdecl __attribute__((cdecl))
+#       endif
+
+#       ifndef __stdcall
+#           define __stdcall __attribute__((stdcall))
+#       endif
+
+#   elif defined(__x86_64__)
+
+#       ifndef __cdecl
+#           define __cdecl
+#       endif
+
+#       ifndef __stdcall
+#           define __stdcall
+#       endif
+#   endif // calling conventions
+
+/** @def G3D_CHECK_PRINTF_METHOD_ARGS()
+    Enables printf parameter validation on gcc. */
+#   define G3D_CHECK_PRINTF_METHOD_ARGS   __attribute__((__format__(__printf__, 2, 3)))
+
+/** @def G3D_CHECK_PRINTF_METHOD_ARGS()
+    Enables printf parameter validation on gcc. */
+#   define G3D_CHECK_VPRINTF_METHOD_ARGS  __attribute__((__format__(__printf__, 2, 0)))
+
+/** @def G3D_CHECK_PRINTF_METHOD_ARGS()
+    Enables printf parameter validation on gcc. */
+#   define G3D_CHECK_PRINTF_ARGS          __attribute__((__format__(__printf__, 1, 2)))
+
+/** @def G3D_CHECK_PRINTF_METHOD_ARGS()
+    Enables printf parameter validation on gcc. */
+#   define G3D_CHECK_VPRINTF_ARGS         __attribute__((__format__(__printf__, 1, 0)))
+#endif
+
+
+/**
+  @def STR(expression)
+
+  Creates a string from the expression.  Frequently used with G3D::Shader
+  to express shading programs inline.
+
+  STR(this becomes a string)\verbatim
\endverbatim evaluates the same as \verbatim\endverbatim"this becomes a string"
+ */
+#define STR(x) #x
+
+/** @def PRAGMA(expression)
+    \#pragma may not appear inside a macro, so this uses the pragma operator
+    to create an equivalent statement.*/
+#ifdef _MSC_VER
+// Microsoft's version http://msdn.microsoft.com/en-us/library/d9x1s805.aspx
+#    define PRAGMA(x) __pragma(x)
+#else
+// C99 standard http://www.delorie.com/gnu/docs/gcc/cpp_45.html
+#    define PRAGMA(x) _Pragma(#x)
+#endif
+
+/** @def G3D_BEGIN_PACKED_CLASS(byteAlign)
+    Switch to tight alignment
+    See G3D::Color3uint8 for an example.*/
+#ifdef _MSC_VER
+#    define G3D_BEGIN_PACKED_CLASS(byteAlign)  PRAGMA( pack(push, byteAlign) )
+#else
+#    define G3D_BEGIN_PACKED_CLASS(byteAlign)
+#endif
+
+/** @def G3D_END_PACKED_CLASS(byteAlign)
+    End switch to tight alignment
+    See G3D::Color3uint8 for an example.*/
+#ifdef _MSC_VER
+#    define G3D_END_PACKED_CLASS(byteAlign)  ; PRAGMA( pack(pop) )
+#elif defined(__GNUC__)
+#    define G3D_END_PACKED_CLASS(byteAlign)  __attribute((aligned(byteAlign))) ;
+#else
+#    define G3D_END_PACKED_CLASS(byteAlign)  ;
+#endif
+
+
+// Header guard
+#endif
diff --git a/externals/g3dlite/G3D/prompt.h b/externals/g3dlite/G3D/prompt.h
new file mode 100644
index 00000000000..c6df628099e
--- /dev/null
+++ b/externals/g3dlite/G3D/prompt.h
@@ -0,0 +1,67 @@
+/** 
+ @file prompt.h
+ 
+ @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+ @cite   Windows GUI code by Max McGuire
+
+ @created 2001-08-26
+ @edited  2006-08-13
+ */
+
+#ifndef G3D_PROMPT_H
+#define G3D_PROMPT_H
+
+#include "platform.h"
+#include 
+
+namespace G3D {
+
+/**
+  Prints a prompt to stdout and waits for user input.  The return value is
+  the number of the user's choice (the first is 0, if there are no
+  choices, returns 0). 
+ 
+  @param useGui Under Win32, use a GUI, not stdout prompt.
+  @param windowTitle The title for the prompt window
+  @param promptx The text string to prompt the user with
+  @param choice  An array of strings that are the choices the user may make
+  @param numChoices The length of choice.
+
+  @cite Windows dialog interface by Max McGuire, mmcguire@ironlore.com
+  @cite Font setting code by Kurt Miller, kurt@flipcode.com
+ */
+int prompt(
+    const char*     windowTitle,
+    const char*     promptx,
+    const char**    choice,
+    int             numChoices,
+    bool            useGui);
+
+/**
+  Prints a prompt and waits for user input.  The return value is
+  the number of the user's choice (the first is 0, if there are no
+  choices, returns 0).
+  
Uses GUI under Win32, stdout prompt otherwise.
+ */
+inline int prompt(
+    const char*     windowTitle,
+    const char*     promptx,
+    const char**    choice,
+    int             numChoices) {
+
+    return prompt(windowTitle, promptx, choice, numChoices, true);
+}
+
+
+/**
+ Displays a GUI prompt with "Ok" as the only choice.
+ */
+void msgBox(
+    const std::string& message,
+    const std::string& title = "Message");
+
+
+}; // namespace
+
+#endif
+
diff --git a/externals/g3dlite/G3D/serialize.h b/externals/g3dlite/G3D/serialize.h
new file mode 100644
index 00000000000..2382c0ee0fd
--- /dev/null
+++ b/externals/g3dlite/G3D/serialize.h
@@ -0,0 +1,30 @@
+#ifndef G3D_SERIALIZE_H
+#define G3D_SERIALIZE_H
+
+#include "G3D/BinaryInput.h"
+#include "G3D/BinaryOutput.h"
+#include "G3D/Array.h"
+
+namespace G3D {
+
+ 
+template 
+void serialize(const Array& array, BinaryOutput& b) { 
+    b.writeInt32(array.size()); 
+    for (int i = 0; i < array.size(); ++i) { 
+    serialize(array[i], b); 
+    } 
+}
+
+template 
+void deserialize(Array& array, BinaryInput& b) { 
+    int N = b.readInt32();
+    array.resize(N);
+    for (int i = 0; i < array.size(); ++i) { 
+        deserialize(array[i], b); 
+    }
+}
+
+}
+
+#endif
diff --git a/externals/g3dlite/G3D/splinefunc.h b/externals/g3dlite/G3D/splinefunc.h
new file mode 100644
index 00000000000..3f3a018c292
--- /dev/null
+++ b/externals/g3dlite/G3D/splinefunc.h
@@ -0,0 +1,118 @@
+/**
+ @file spline.h
+ 
+ @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+ 
+ @created 2004-07-25
+ @edited  2007-05-05
+ */
+
+#ifndef G3D_SPLINEFUNC_H
+#define G3D_SPLINEFUNC_H
+
+#include "G3D/platform.h"
+#include "G3D/debug.h"
+#include "G3D/Array.h"
+#include "G3D/g3dmath.h"
+
+namespace G3D {
+
+/**
+ Interpolates a property according to a piecewise linear spline.  This provides
+ C0 continuity but the derivatives are not smooth.  
+ 

+ Example:
+ 
+    const double times[] = {MIDNIGHT,               SUNRISE - HOUR,         SUNRISE,              SUNRISE + sunRiseAndSetTime / 4, SUNRISE + sunRiseAndSetTime, SUNSET - sunRiseAndSetTime, SUNSET - sunRiseAndSetTime / 2, SUNSET,               SUNSET + HOUR/2,     DAY};
+    const Color3 color[] = {Color3(0, .0, .1),      Color3(0, .0, .1),      Color3::black(),        Color3::black(),                   Color3::white() * .25,         Color3::white() * .25,        Color3(.5, .2, .2),             Color3(.05, .05, .1),   Color3(0, .0, .1), Color3(0, .0, .1)};
+    ambient = linearSpline(time, times, color, 10);
+ 
+
+ See also G3D::Spline
+
+  @param x         The spline is a function of x; this is the sample to choose.
+  @param controlX  controlX[i], controlY[i] is a control points.  It is assumed
+                   that controlX are strictly increasing.  XType must support
+                   the "<" operator and a subtraction operator that returns
+                   a number.
+  @param controlY  YType must support multiplication and addition.
+  @param numControl The number of control points.
+ */
+template
+YType linearSpline(double x, const XType* controlX, const YType* controlY, int numControl) {
+    debugAssert(numControl >= 1);
+
+    // Off the beginning
+    if ((numControl == 1) || (x < controlX[0])) {
+        return controlY[0];
+    }
+
+    for (int i = 1; i < numControl; ++i) {
+        if (x < controlX[i]) {
+            const double alpha = (double)(controlX[i] - x) / (controlX[i] - controlX[i - 1]);
+            return controlY[i] * (1 - alpha) + controlY[i - 1] * alpha;
+        }
+    }
+
+    // Off the end
+    return controlY[numControl - 1];
+}
+
+ 
+    /** See also G3D::Spline*/
+template YType cyclicCatmullRomSpline(
+    double       t,
+    const YType* controlY,
+    int          numPoints) {
+
+    debugAssert(numPoints >= 3);
+
+    t = wrap(t, numPoints);
+
+    // Find the indices of adjacent control points    
+    int i = iFloor(t);
+    
+    // Compute the distance from the control point
+    t = t - i;
+
+    // Shift back one point for correct indexing
+    i += numPoints - 1;
+
+    // Pick up four control points
+    const YType& P0 = controlY[(i + 0) % numPoints];
+    const YType& P1 = controlY[(i + 1) % numPoints];
+    const YType& P2 = controlY[(i + 2) % numPoints];
+    const YType& P3 = controlY[(i + 3) % numPoints];
+
+    return 0.5 * ((2 * P1) + 
+                  (-P0 + P2) * t +
+                  (2*P0 - 5*P1 + 4*P2 - P3) * t*t +
+                  (-P0 + 3*P1- 3*P2 + P3) * t*t*t);
+}
+
+/**
+ A cubic spline with regularly spaced 
+ control points.  The spline interpolates
+ the control points.  The spline
+ will wrap from the last point back to the first.
+
+ The t parameter is on the range [0, controlY.size()],
+ where integers correspond to control points exactly.
+
+ See also G3D::Spline
+
+ @cite http://www.mvps.org/directx/articles/catmull/
+*/
+template YType cyclicCatmullRomSpline(
+    double       t,
+    const Array&  controlY) {
+
+    int numPoints = controlY.size();
+    return cyclicCatmullRomSpline(t, controlY.getCArray(), numPoints);
+}
+
+}
+
+#endif
+
+
diff --git a/externals/g3dlite/G3D/stringutils.h b/externals/g3dlite/G3D/stringutils.h
new file mode 100644
index 00000000000..e15a757a7a6
--- /dev/null
+++ b/externals/g3dlite/G3D/stringutils.h
@@ -0,0 +1,140 @@
+/**
+ @file stringutils.h
+ 
+ @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+ 
+ @author  2000-09-09
+ @edited  2008-08-05
+ */
+
+#ifndef G3D_STRINGUTILS_H
+#define G3D_STRINGUTILS_H
+
+#include "G3D/platform.h"
+#include "G3D/Array.h"
+#include 
+
+namespace G3D {
+
+extern const char* NEWLINE;
+
+/** Separates a comma-separated line, properly escaping commas within
+    double quotes (") and super quotes ("""). This matches Microsoft Excel's 
+    CSV output.
+
+    \param stripQuotes If true, strips leading and trailing " and """
+
+    \sa G3D::stringSplit, G3D::TextInput, G3D::readWholeFile
+*/
+void parseCommaSeparated(const std::string s, Array& array, bool stripQuotes = true);
+
+/**
+ Returns true if the test string begins with the pattern string.
+ */
+bool beginsWith(
+    const std::string&          test,
+    const std::string&          pattern);
+
+/**
+ Returns true if the test string ends with the pattern string.
+ */
+bool endsWith(
+    const std::string&          test,
+    const std::string&          pattern);
+
+/**
+ Produces a new string that is the input string
+ wrapped at a certain number of columns (where
+ the line is broken at the latest space before the
+ column limit.)  Platform specific NEWLINEs
+ are inserted to wrap.
+ */
+std::string wordWrap(
+    const std::string&          input,
+    int                         numCols);
+
+/**
+ A comparison function for passing to Array::sort.
+ */
+int stringCompare(
+    const std::string&          s1,
+    const std::string&          s2);
+
+int stringPtrCompare(
+    const std::string*          s1,
+    const std::string*          s2);
+
+/**
+ Returns a new string that is an uppercase version of x.
+ */
+std::string toUpper(
+    const std::string&          x);
+
+std::string toLower(
+    const std::string&          x);
+
+/**
+ Splits x at each occurance of splitChar.
+ */
+G3D::Array stringSplit(
+    const std::string&          x,
+    char                        splitChar);
+
+/**
+ joinChar is not inserted at the beginning or end, just in between
+ elements.
+ */
+std::string stringJoin(
+    const G3D::Array&   a,
+    char                        joinChar);
+
+std::string stringJoin(
+    const G3D::Array&   a,
+    const std::string&               joinStr);
+
+/**
+ Strips whitespace from both ends of the string.
+ */
+std::string trimWhitespace(
+    const std::string&              s);
+
+/** These standard C functions are renamed for clarity/naming
+   conventions and to return bool, not int.
+   */
+inline bool isWhiteSpace(const unsigned char c) {
+    return isspace(c) != 0;
+}
+
+/** These standard C functions are renamed for clarity/naming
+   conventions and to return bool, not int.
+   */
+inline bool isNewline(const unsigned char c) {
+    return (c == '\n') || (c == '\r');
+}
+
+/** These standard C functions are renamed for clarity/naming
+   conventions and to return bool, not int.
+   */
+inline bool isDigit(const unsigned char c) {
+    return isdigit(c) != 0;
+}
+
+/** These standard C functions are renamed for clarity/naming
+   conventions and to return bool, not int.
+   */
+inline bool isLetter(const unsigned char c) {
+    return isalpha(c) != 0;
+}
+
+inline bool isSlash(const unsigned char c) {
+    return (c == '\\') || (c == '/');
+}
+
+inline bool isQuote(const unsigned char c) {
+    return (c == '\'') || (c == '\"');
+}
+
+}; // namespace
+
+#endif
+
diff --git a/externals/g3dlite/G3D/uint128.h b/externals/g3dlite/G3D/uint128.h
new file mode 100644
index 00000000000..da1af3ec272
--- /dev/null
+++ b/externals/g3dlite/G3D/uint128.h
@@ -0,0 +1,51 @@
+/**
+ @file uint128.h
+ 
+ @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+ @author Kyle Whitson
+ 
+ @created 2008-07-17
+ @edited  2008-07-17
+ */
+
+#ifndef G3D_UINT128_H
+#define G3D_UINT128_H
+
+#include "G3D/g3dmath.h"
+
+namespace G3D {
+
+/** Limited functionality 128-bit unsigned integer. This is primarily to support FNV hashing and other
+    cryptography applications.  See the GMP library for high-precision C++ math support. */
+class uint128 {
+public:
+
+	G3D::uint64 hi;
+	G3D::uint64 lo;
+
+    uint128(const uint64& lo);
+
+	uint128(const uint64& hi, const uint64& lo);
+
+	uint128& operator+=(const uint128& x);
+
+	uint128& operator*=(const uint128& x);
+
+	uint128& operator^=(const uint128& x);
+
+	uint128& operator&=(const uint128& x);
+
+	uint128& operator|=(const uint128& x);
+
+	bool operator==(const uint128& x);
+
+    uint128& operator>>=(const int x);
+
+    uint128& operator<<=(const int x);
+
+    uint128 operator&(const uint128& x);
+
+};
+}
+
+#endif
diff --git a/externals/g3dlite/G3D/units.h b/externals/g3dlite/G3D/units.h
new file mode 100644
index 00000000000..2e30304dc62
--- /dev/null
+++ b/externals/g3dlite/G3D/units.h
@@ -0,0 +1,126 @@
+/**
+ @file units.h
+
+ @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+
+ @created 2009-08-21
+ @edited  2009-08-21
+ */
+#ifndef G3D_units_h
+#define G3D_units_h
+
+#include "G3D/platform.h"
+
+namespace G3D {
+/** Use using namespace G3D::units; to include all units
+ into your program.  The units system is specifically designed not to
+ be general but to support commonly used units efficiently and
+ clearly.  See http://en.wikipedia.org/wiki/SI_prefix for interesting facts
+ about SI/metric units and full definitions.*/
+namespace units {
+
+/** 1e-9 m */
+inline float nanometers() {
+    return 1e-9f;
+}
+
+/** 1e-6 m */
+inline float micrometers() {
+    return 1e-6f;
+}
+
+/** 0.001 m */
+inline float millimeters() {
+    return 0.001f;
+}
+
+/** 0.01 m */
+inline float centimeters() {
+    return 0.01f;
+}
+
+/** SI base unit of distance measure. */
+inline float meters() {
+    return 1.0f;
+}
+
+/** 1000 m */
+inline float kilometers() {
+    return 100.0f;
+}
+
+/** 0.0254 m */
+inline float inches() {
+    return 0.0254f;
+}
+
+/** 0.3048 m */
+inline float feet() {
+    return 0.3048f;
+}
+
+/** 0.9144 m */
+inline float yards() {
+    return 0.9144f;
+}
+
+/** 1609.344 m */
+inline float miles() {
+    return 1609.344f;
+}
+
+/////////////////////////////////////////////////////////////
+
+/** SI base unit of angular measure. */
+inline float radians() {
+    return 1.0f;
+}
+
+/** pi/180 */
+inline float degrees() {
+    return 0.0174532925f;
+}
+
+//////////////////////////////////////////////////////////////
+
+/** 1e-9 s */
+inline float nanoseconds() {
+    return 1e-9f;
+}
+
+/** 1e-3 s */
+inline float milliseconds() {
+    return 1e-3f;
+}
+
+/** Base unit of time */
+inline float seconds() {
+    return 1.0;
+}
+
+/** 60 s */
+inline float minutes() {
+    return 60.0f;
+}
+
+/** 3600 s */
+inline float hours() {
+    return 3600.0f;
+}
+
+/** 86400 s */
+inline float days() {
+    return 86400.0f;
+}
+
+/**  31556926 s */
+inline float years() {
+    return 31556926.0f;
+}
+
+///////////////////////////////////////////
+
+}
+}
+
+#endif
diff --git a/externals/g3dlite/G3D/vectorMath.h b/externals/g3dlite/G3D/vectorMath.h
new file mode 100644
index 00000000000..ac6d2b32e9d
--- /dev/null
+++ b/externals/g3dlite/G3D/vectorMath.h
@@ -0,0 +1,235 @@
+/**
+  @file vectorMath.h
+ 
+  Function aliases for popular vector methods.
+ 
+  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+ 
+  @created: 2001-06-02
+  @edited:  2004-02-02
+  Copyright 2000-2004, Morgan McGuire.
+  All rights reserved.
+ */
+
+#ifndef G3D_VECTORMATH_H
+#define G3D_VECTORMATH_H
+
+#include "G3D/platform.h"
+#include "G3D/g3dmath.h"
+#include "G3D/Vector2.h"
+#include "G3D/Vector3.h"
+#include "G3D/Vector4.h"
+#include "G3D/Matrix3.h"
+#include "G3D/Matrix4.h"
+#include "G3D/Color1.h"
+#include "G3D/Color3.h"
+#include "G3D/Color4.h"
+
+
+namespace G3D {
+
+
+inline Matrix4 mul(const Matrix4& a, const Matrix4& b) {
+    return a * b;
+}
+
+inline Vector4 mul(const Matrix4& m, const Vector4& v) {
+    return m * v;
+}
+
+inline Vector3 mul(const Matrix3& m, const Vector3& v) {
+    return m * v;
+}
+
+inline Matrix3 mul(const Matrix3& a, const Matrix3& b) {
+    return a * b;
+}
+
+inline float dot(const Vector2& a, const Vector2& b) {
+    return a.dot(b);
+}
+
+inline float dot(const Vector3& a, const Vector3& b) {
+    return a.dot(b);
+}
+
+inline float dot(const Vector4& a, const Vector4& b) {
+    return a.dot(b);
+}
+
+inline Vector2 normalize(const Vector2& v) {
+    return v / v.length();
+}
+
+inline Vector3 normalize(const Vector3& v) {
+    return v / v.magnitude();
+}
+
+inline Vector4 normalize(const Vector4& v) {
+    return v / v.length();
+}
+
+inline Vector2 abs(const Vector2& v) {
+    return Vector2(::fabsf(v.x), ::fabsf(v.y));
+}
+
+inline Vector3 abs(const Vector3& v) {
+    return Vector3(::fabsf(v.x), ::fabsf(v.y), ::fabsf(v.z));
+}
+
+inline Vector4 abs(const Vector4& v) {
+    return Vector4(::fabsf(v.x), ::fabsf(v.y), ::fabsf(v.z), ::fabsf(v.w));
+}
+
+inline bool all(const Vector2& v) {
+    return (v.x != 0) && (v.y != 0);
+}
+
+inline bool all(const Vector3& v) {
+    return (v.x != 0) && (v.y != 0) && (v.z != 0);
+}
+
+inline bool all(const Vector4& v) {
+    return (v.x != 0) && (v.y != 0) && (v.z != 0) && (v.w != 0);
+}
+
+inline bool any(const Vector2& v) {
+    return (v.x != 0) || (v.y != 0);
+}
+
+inline bool any(const Vector3& v) {
+    return (v.x != 0) || (v.y != 0) || (v.z != 0);
+}
+
+inline bool any(const Vector4& v) {
+    return (v.x != 0) || (v.y != 0) || (v.z != 0) || (v.w != 0);
+}
+
+inline Vector2 clamp(const Vector2& v, const Vector2& a, const Vector2& b) {
+    return v.clamp(a, b);
+}
+
+inline Vector3 clamp(const Vector3& v, const Vector3& a, const Vector3& b) {
+    return v.clamp(a, b);
+}
+
+inline Vector4 clamp(const Vector4& v, const Vector4& a, const Vector4& b) {
+    return v.clamp(a, b);
+}
+
+inline Vector2 lerp(const Vector2& v1, const Vector2& v2, float f) {
+    return v1.lerp(v2, f);
+}
+
+inline Vector3 lerp(const Vector3& v1, const Vector3& v2, float f) {
+    return v1.lerp(v2, f);
+}
+
+inline Vector4 lerp(const Vector4& v1, const Vector4& v2, float f) {
+    return v1.lerp(v2, f);
+}
+
+inline Color1 lerp(const Color1& v1, const Color1& v2, float f) {
+    return v1.lerp(v2, f);
+}
+
+inline Color3 lerp(const Color3& v1, const Color3& v2, float f) {
+    return v1.lerp(v2, f);
+}
+
+inline Color4 lerp(const Color4& v1, const Color4& v2, float f) {
+    return v1.lerp(v2, f);
+}
+
+inline Vector3 cross(const Vector3& v1, const Vector3& v2) {
+    return v1.cross(v2);
+}
+
+inline double determinant(const Matrix3& m) {
+    return m.determinant();
+}
+
+inline double determinant(const Matrix4& m) {
+    return m.determinant();
+}
+
+inline Vector2 min(const Vector2& v1, const Vector2& v2) {
+    return v1.min(v2);
+}
+
+inline Vector3 min(const Vector3& v1, const Vector3& v2) {
+    return v1.min(v2);
+}
+
+inline Vector4 min(const Vector4& v1, const Vector4& v2) {
+    return v1.min(v2);
+}
+
+inline Color3 min(const Color3& v1, const Color3& v2) {
+    return v1.min(v2);
+}
+
+inline Color4 min(const Color4& v1, const Color4& v2) {
+    return v1.min(v2);
+}
+
+inline Vector2 max(const Vector2& v1, const Vector2& v2) {
+    return v1.max(v2);
+}
+
+inline Vector3 max(const Vector3& v1, const Vector3& v2) {
+    return v1.max(v2);
+}
+
+inline Vector4 max(const Vector4& v1, const Vector4& v2) {
+    return v1.max(v2);
+}
+
+inline Color3 max(const Color3& v1, const Color3& v2) {
+    return v1.max(v2);
+}
+
+inline Color4 max(const Color4& v1, const Color4& v2) {
+    return v1.max(v2);
+}
+
+inline Vector2 sign(const Vector2& v) {
+    return Vector2((float)sign(v.x), (float)sign(v.y));
+}
+
+inline Vector3 sign(const Vector3& v) {
+    return Vector3((float)sign(v.x), (float)sign(v.y), (float)sign(v.z));
+}
+
+inline Vector4 sign(const Vector4& v) {
+    return Vector4((float)sign(v.x), (float)sign(v.y), (float)sign(v.z), (float)sign(v.w));
+}
+
+inline float length(float v) {
+    return ::fabsf(v);
+}
+
+inline float length(const Vector2& v) {
+    return v.length();
+}
+
+inline float length(const Vector3& v) {
+    return v.magnitude();
+}
+
+inline float length(const Vector4& v) {
+    return v.length();
+}
+
+/**
+ Computes the log of each component.  Useful for
+ inverting the monitor gamma function or simulating
+ perceptual response.
+ */
+inline Color3 log(const Color3& c) {
+    return Color3(::logf(c.r), ::logf(c.g), ::logf(c.b));
+}
+
+}
+
+#endif
diff --git a/externals/g3dlite/doc-files/changelog.dox b/externals/g3dlite/doc-files/changelog.dox
deleted file mode 100644
index fd52b99f271..00000000000
--- a/externals/g3dlite/doc-files/changelog.dox
+++ /dev/null
@@ -1,1872 +0,0 @@
-/**
- @page changelog Change Log
-
-

-
-   Major version numbers introduce API changes that are not backwards
-   compatible.  Minor versions are backwards compatible to the
-   previous major release, except for critical bug fixes.  Deprecated functionality
-   will be supported until (at least) the next major release.
-
-
-

-
-   

-   Changes in 7.01:
-   
    
-     
  •  Video file reading and writing via FFmpeg added
-     
  •  Added computeBounds method to ArticulatedModel::Part that calls computeBounds on each TriList. Changed updateAll to automatically call computeBounds [Kyle]
-     
  •  Added constructor to Matrix4 to construct a matrix from an upper-left 3x3 submatrix and an upper-right 3x1 submatrix [Kyle]
-     
  •  Incompatible change: RegistryUtil functions now require an explicit value parameter instead of extracting the value from the key string.
-     
  •  Incompatible change:GApp now calls the onLogic handler before the simulation handlers but after the user input and network handlers
-     
  •  Incompatible change: Changed GHashCode and other functors to traits.  See \link guidenewuser \endlink.  Added typedefs and adapters to make this mostly backwards compatible.
-     
  •  Added parallax occlusion mapping to G3D::SuperShader (specify Material::parallaxSteps > 1)
-     
  •  Added normal mapping to G3D::SuperShader (specify Material::parallaxSteps == 0)
-     
  •  G3D::Texture resizes textures that exceed the device maximum size
-     
  •  G3D::Array now allows control over MIN_ELEMENTS and MIN_BYTES using template parameters
-     
  •  Clarified G3D::Any file format in documentation
-     
  •  G3D::Texture::PreProcess::gammaAdjust
-     
  •  G3D::ShadowMap::lightProjection(), G3D::ShadowMap::lightFrame()
-     
  •  Added Barycentric coordinates to CollisionDetection::isPointInTriangle
-     
  •  G3D::RenderDevice::beginOpenGL, G3D::RenderDevice::endOpenGL
-     
  •  PointAABSPTree::clearData
-     
  •  AABSPTree -> KDTree
-     
  •  GApp now allows the MidgetManager to process events in onEvent before the GApp::onEvent executes
-     
  •  Added spotlight support to SuperShader
-     
  •  Switched SuperShader to use ph
-     
  •  Adjusted standard deviation used in G3D::GaussianBlur to provide smoother filtering
-     
  •  Put HashTrait and EqualsTrait in their own headers separate from Table.h
-     
  •  ArticulatedModel::facet
-     
  •  Renamed GWindow to G3D::OSWindow
-     
  •  ReferenceCountedPointer now asserts that the pointer is not NULL on method invocation
-     
  •  G3D::ShadowMap now computes appropriate matrices for spot lights
-     
  •  Added ImageFormat::convert [Danny and Kyle]
-     
  •  3- and 4- argument min and max
-     
  •  G3D::GaussianBlur now correctly sets the output viewport
-     
  •  G3D::Framebuffer::clear
-     
  •  IFSModel and ArticulatedModel now load Princeton Shape Benchmark OFF files.
-     
  •  G3D::Any CoordinateFrame now serialized using angles
-     
  •  CameraControlWindow now prints angles in degrees
-     
  •  ImageXXX classes now have a format() method
-     
  •  OSWindow::create
-     
  •  MeshAlg::toIndexedTriList now supports TRIANGLE_FAN input.
-     
  •  Tuned Table and hash functions for performance [Kyle & Morgan]
-     
  •  GEvent::toString
-     
  •  G3D::TextInput now treats characters with ASCII code greater than 127 as symbols
-     
  •  G3D::ThreadSet
-     
  •  G3D::Texture::white
-     
  •  G3D::Matrix4::upper3x3
-     
  •  G3D::Matrix4::homoMul
-     
  •  ArticulateModel::fromFile now takes a Matrix4 instead of a CoordinateFrame to allow arbitrary linear transformations.
-     
  •  ArticulatedModel::createCornellBox
-     
  •  Material::createDiffuse
-     
  •  ImageFormat::convert
-     
  •  G3D::filenameBase
-     
  •  Removed SDL_SysWMEvent, which was never supported by GEvent anyway
-     
  •  Removed TextureFormat::SAME_AS_SCREEN to break dependence on OpenGL
-     
  •  TextureFormat has been renamed to G3D::ImageFormat and moved into G3D.lib
-     
  •  Added variable time control points to G3D::Spline
-     
  •  Gui controls now have configureable GuiControl::setCaptionSize
-     
  •  Gui controls now default to no indent if the caption is "" (use " " for indent with no caption)
-     
  •  G3D::GuiContainer
-     
  •  G3D::GThread::started
-     
  •  buildg3d installation arguments changed--see 
-     
  •  G3D::Vector3int32
-     
  •  GuiButton now accepts an optional callback function/method
-     
  •  FileDialog now accepts an extra "note" argument
-     
  •  FileDialog::getFilename non-static to support subclassing
-     
  •  System::currentDateString
-     
  •  Expanded G3D::ArticulatedModel documentation
-     
  •  Build system now executes on multiple processors (about 1.8x speedup for dual-core)
-     
  •  Build system now caches dependencies (about 5x speedup for small incremental builds)
-     
  •  Patched LOAD_EXTENSION to work around gcc pointer-to-function cast issues
-     
  •  Tool buttons added to a G3D::GuiPane automatically align to the previous one.
-     
  •  Added invisible GuiPane style
-     
  •  G3D::uint128 [Kyle]
-     
  •  Increased BSPMap rendering by 10% by reducing state changes
-     
  •  Added prompt argument to FileDialog::getFilename
-     
  •  G3D::PosedModel::getBoxBounds on an array
-     
  •  G3D::PosedModel::getSphereBounds on an array
-     
  •  Changed RenderDevice::screenshot to save .png instead of .jpg files
-     
  •  G3D::SuperShader now supports a customMap and customConstant for experimenting with shaders.
-     
  •  G3D::SuperShader now does not ever light the "back" of a bump-mapped poly, even if the bumps should create a light-facing surface
-     
  •  G3D::Material promoted to its own class (was G3D::SuperShader::Material)
-     
  •  G3D::Matrix2
-     
  •  G3D::VertexAndPixelShader::ArgList::size
-     
  •  G3D::pathConcat
-     
  •  G3D::WidgetManager::moveWidgetToBack
-     
  •  SuperShader / NonShadowed.pix now uses arrays of lights instead of separate variables
-     
  •  Reduced cost of release-mode Shader argument validation
-     
  •  G3D::PosedModel::sortAndRender now performs view-frustum culling of objects
-     
  •  G3D::Draw::lighting for visualizing light sources
-     
  •  G3D::SuperShader::Pass::purgeCache
-     
  •  G3D::GuiSlider::setRange
-     
  •  G3D::GuiPane::addPane no longer takes a
-     
  •  G3D::VertexAndPixelShader::ArgList::remove
-     
  •  Optimized G3D::Matrix::pseudoInverse; now about 2x faster
-     
  •  G3D::GLight::effectSphere
-     
  •  G3D::GuiWindow::moveTo
-     
  •  G3D::GuiWindow::setEnabled, enabled
-     
  •  G3D::GuiButton now sizes to its caption
-     
  •  G3D::GuiSlider now fires events on change and drag
-     
  •  G3D::Shader arguments (in G3D::VertexAndPixelShader::ArgList) may now be "optional"
-     
  •  G3D::GLight::point now has quadratic attenuation by default.
-     
  •  G3D::ImageFormat::name
-     
  •  g3dmath.h now includes inttypes.h on gcc and simulates it on visual studio
-     
  •  G3D::RenderDevice::cullFace
-     
  •  G3D::LineSegment2D::intersection
-     
  •  G3D::BinaryInput::setEndian
-     
  •  G3D::GEvent::MOUSE_BUTTON_CLICK
-     
  •  Generalized ShadowMap to work with spotlights as well as directional lights
-     
  •  G3D::GLCaps::supportsTexture, G3D::GLCaps::supportsRenderBuffer
-     
  •  Opaque G3D::ArticulatedModels now support more than 2 non-shadow casting light sources
-     
  •  Added proof symbol parsing to TextInput [Corey Taylor]
-     
  •  Added G3D::AABox::corner() to match G3D::Box::corner() [Corey Taylor]
-     
  •  OS X: G3D::CarbonWindow [Casey]
-     
  •  OS X: iCompile now generates OS X application bundles and dmg files
-     
  •  OS X build no longer depends on X11
-     
  •  G3D::FileDialog
-     
  •  G3D::Table now allows overriding the default equality operator for keys
-     
  •  Incompatible change: GApp::onBeforeSimulation now allows mutation of the timesteps
-     
  •  Incompatible change: Merged GApp::simTime and idealSimTime (the sim time is now idealized)
-     
  •  cmake now generates project files for Xcode, MinGW, and all Visual Studio versions [Corey Taylor]
-     
  •  OS X: icompile and buildg3d now generate universal binaries on Intel machines
-     
  •  G3D::PosedModel::objectSpaceTangents
-     
  •  G3D::IFSModel::fromData
-     
  •  G3D::MeshAlg::generateGrid
-     
  •  G3D::BinaryOutput::ok()
-     
  •  G3D::generateFilenameBase
-     
  •  G3D::IFSModel::fromFile now defaults to not welding for improved performance
-     
  •  G3D::IFSModel members are now protected to allow subclassing
-     
  •  Removed G3D::uint in favor of G3D::uint32 [Corey Taylor]
-     
  •  Added G3D::GMaterial(TextureRef) constructor
-     
  •  Made G3D::GMaterial fields floats
-     
  •  G3D::GuiControl::setCaption, G3D::GuiWindow::setCaption
-     
  •  G3D::GuiControl can now be subclassed for custom user-defined controls
-     
  •  G3D::GuiTheme::renderCanvas
-     
  •  G3D::GuiTheme::pauseRendering, G3D::GuiTheme::resumeRendering
-     
  •  G3D::PosedModel::sortAndRender
-     
  •  G3D::Framebuffer can now attach cube map faces
-     
  •  System::describeSystem now prints current working directory and application name
-     
  •  Added /usr/local/-G3D dir- to system data file path [Kai Schroeder]
-     
  •  Various patches for detecting new CPUs in System.cpp [Corey Taylor]
-     
  •  g3d_Index macro now available in G3D::Shader GLSL code
-     
  •  G3D::BackgroundWidget
-     
  •  G3D::TriangleShape
-     
  •  Fix: incompatible change OSWindow::Settings::asynchronous is now spelled correclty, with two "n"s
-     
  •  Fix: Fixes for point-in-triangle and moving-sphere-fixed-tri; previous code projected onto the wrong axes, so barycentric coords were wrong for nearly vertical triangles.
-     
  •  Fix: Changed some doubles to floats in G3D::Triangle
-     
  •  Fix: Changed all of the isXXX(char) methods to take unsigned char arguments so that they can parse extended symbols
-     
  •  Fix: AABSPTree::deserializeStructure was missing a return statement [Derex]
-     
  •  Fix: Draw::plane was drawing the plane reflected through the origin [Macklin Chaffee]
-     
  •  Fix: Added template parameters to friends in AABSPTree and PointAABSPTree [expiring_frog]
-     
  •  Fix: System::findDataFile uses data directory set by GApp
-     
  •  Fix: AtomicInt32 decrement returns int32 instead of uint32
-     
  •  Fix: OS X function keys now work correctly under CarbonWindow
-     
  •  Fix: OS X modifier keys now work correctly under CarbonWindow
-     
  •  Fix: OS X arrow keys now work correctly under CarbonWindow
-     
  •  Fix: Rewrote buildg3d to fix many longstanding bugs, including mismatched 'bin' directories and confusion about the 'install' target
-     
  •  Fix: gfxmeter reports now format correctly regardless of monitor width
-     
  •  Fix: patch to initialize correctly on the Mesa library, which crashes when requesting DEPTH24_STENCIL8
-     
  •  Fix: stringSplit now works correctly for adjacent split characters [Akita Noek]
-     
  •  Fix: Draw::axes labels now obey current viewport
-     
  •  Fix: GuiWindow now loses focus when hidden
-     
  •  Fix: GFont::draw2D now computes correct horizontal bounds on text
-     
  •  Fix: GuiPane no longer renders when invisible
-     
  •  Fix: Clicking off of all GuiWindows makes none of them have focus
-     
  •  Fix: Win32Window now allows windows programmatically positioned anywhere on a multiple monitor screen
-     
  •  Fix: Win32Window now does not fail when dragging a GL context between multiple monitors
-     
  •  Fix: SuperShader now correctly lights bump-mapped surfaces in tangent space [Kyle Whitson]
-     
  •  Fix: GuiPane now renders its caption
-     
  •  Fix: Rect2D::border now grows the correct way (positive = grow)
-     
  •  Fix: Added % operator to TextInput
-     
  •  Fix: Added multi-line printing to GConsole
-     
  •  Fix: G3D::Texture can now create empty cube maps
-     
  •  Fix: G3D::Table iterator now correctly parameterized on hashfunction and equality function as well as key and value
-     
  •  Fix: G3D::Table now passes Values by reference when setting them, avoiding one copy
-     
  •  Fix: various Framebuffer/empty texture initialization bugs on ATI cards
-     
  •  Fix: uniform arrays for GLSL
-     
  •  Fix: All aliasing warnings have been fixed no longer needs -fno-strict-aliasing [Corey Taylor]
-     
  •  Fix: [ 1829704 ] debugAssert in Array::operator[](unsigned int n) wrong
-     
  •  Fix: GuiWindow::pack now recursively packs all child panes
-     
  •  Fix: patch to continue build when javac isn't found on both windows and linux [Corey Taylor]
-     
  •  Fix: [ 1599139 ] Fixes to make buildg3d work on non C:\ windows systems  [Patrick Burke]
-     
  •  Fix: Added faster overloads of GImage::stripAlpha() and GImage::insertRedAsAlpha() [Corey Taylor]
-     
  •  Fix: GImage::save() with odd-widths bmp files [Corey Taylor]
-     
  •  Fix: Draw::capule renders properly (capule was not visible) [Corey Taylor]
-     
  •  Fix: Patched ShadowMap to work around ATI and OS X driver shadow map bugs.  
-          Incompatible change:Required changing several interfaces to take ShadowMapRef arguments.
-     
  •  Fix: GCamera::Frustum was facing backwards
-     
  •  Fix: [ 1774479 ] texture glformats wrong (caused incorrect font rendering on Intel)
-     
  •  Fix: ArticulatedModel static methods do not force loading of shaders unless an ArticulatedModel has actually been loaded.
-     
  •  Fix: RenderDevice::setAlphaWrite/setColorWrite implemented correctly
-     
  •  Fix: Implemented ImageFormat::fromCode
-     
  •  Fix: [ 1766509 ] Texture doesn't handle 3D textures correctly
-     
  •  Fix: Separate bool, float, and int back ends for GLSL shaders
-   

-
-

-   

-   Changes in 7.00:
-   
         
-     
  •  Upgraded to iCompile 0.5.3.  Requires users to delete their old ice.txt and ~/.icompile files
-     
  •  Key to toggle the user camera is now F2 (was Tab)
-     
  •  Support for g++ 4.1 [Corey]
-     
  •  Patches for 64-bit compilation [Corey]
-     
  •  WinMain is now compiled as C++ code (fixed some "manifest" errors on certain VC8 installations)
-     
  •  G3D::ShadowMap
-     
  •  Cleaned up and documented G3D::GCamera project/unproject API [Jeff Marsceill]
-     
  •  Made G3D::MD2Model::Pose easier to use
-     
  •  G3D::Matrix
-     
  •  Added G3D::Texture methods for reading back color and depth textures
-     
  •  G3D::RenderDevice::getFixedFunctionLighting
-     
  •  G3D::debugPrintf -> G3D::consolePrintf
-     
  •  G3D::GApp::debugPrintf -> G3D::screenPrintf
-     
  •  Reduced ArticulatedModel and MD2Model push/popState calls
-     
  •  G3D::Shader now defines platform and graphics vendor macros     
-     
  •  User camera control requires right mouse click to move
-     
  •  G3D::AnyVal::fromFile, G3D::AnyVal::load, G3D::AnyVal::save
-     
  •  G3D::AnyVal now uses copy-on-mutate for fast Array/Table copies
-     
  •  G3D::AnyVal no longer separates table entries with ";"
-     
  •  G3D::AnyVal now provides casts to basic data types
-     
  •  G3D::AnyVal G3D::Rect2D and G3D::AABox types
-     
  •  G3D::NetListener, G3D::ReliableConduit, and G3D::LightweightConduit can now be created without an explicit NetworkDevice pointer
-     
  •  GApp::onGraphics now takes posed model arguments
-     
  •  G3D::RenderDevice::beginFrame no longer executes a pushState-- state will carry over between frames
-     
  •  G3D::GUniqueID
-     
  •  GApp::onPose
-     
  •  All classes that read from files can now read data inside zipfiles.
-     
  •  Changed G3D::hashCode(T) to ::GHashCode(T) [Corey]
-     
  •  Removed "G3D::" from the printed portion of the documentation index to make it easier to read.
-     
  •  OSWindow::fireEvent for inserting user events into the queue
-     
  •  G3D::logPrintf
-     
  •  System::findDataFile
-     
  •  On OS X, G3D::FirstPersonManipulator now treats ctrl-click as right click
-     
  •  Increased mouse sensitivity of G3D::FirstPersonManipulator on OS X
-     
  •  System::getClipboardText, System::setClipboardText
-     
  •  Widget::window() accessor
-     
  •  Replaced SDLEvent with G3D::GEvent
-     
  •  Increased GFont rendering performance, added GFont::send2DQuads for fast rendering of large amounts of text
-     
  •  G3D::GFont now supports fonts with 256 characters (.fnt file format version 2)
-     
  •  Upgraded to the OpenGL 2.0 glext/glxext/wglext headers
-     
  •  G3D::GuiTheme, G3D::GuiText
-     
  •  G3D::UprightFrame, G3D::UprightSpline
-     
  •  G3D::Spline
-     
  •  G3D::RenderDevice::clip2D
-     
  •  G3D::Win32Window now returns events for up to 5 mouse buttons
-     
  •  Significantly changed GEvent delivery and Widget mechanisms to incorporate notions of focus--see upgrade.html
-     
  •  Motion events (joystick/mouse) can no longer be cancelled by Widget::onEvent
-     
  •  Mouse motion events for all platforms
-     
  •  G3D::PosedModel::Ref::sendGeometry
-     
  •  G3D::RenderDevice::pushState(FramebufferRef)
-     
  •  G3D::Texture::PreProcess::computeNormalMap
-     
  •  direct.h is now included by fileutils.h on Win32 to ensure that chdir, mkdir, etc. are available
-     
  •  Changed distribution directories to place include, lib, and bin under a directory named after the platform
-          and all other files one directory up.
-     
  •  G3D::GCamera::unproject
-     
  •  Made G3D::Ray non-virtual for efficiency
-     
  •  RenderDevice::alphaWrite now defaults to true
-     
  •  Changed G3D install directory from g3d-7_00 to g3d-7.00
-     
  •  On a GL 2.0 or greater driver, G3D::GLCaps now assumes the presence of all GL2 extensions even if they are not explicitly listed by the card [Corey Taylor]
-     
  •  debugPrintf now flushes stderr on Unix systems
-     
  •  G3D::Lighting::fromSky
-     
  •  G3D::Texture::newGLTexture2D [Corey Taylor]
-     
  •  Added 10-bit cinema texture formats [Corey Taylor]
-     
  •  Added G3D::ArticulatedModel to the core (includes 3DS loading)
-     
  •  Added G3D::SuperShader to the core
-     
  •  Merged GApp and GApplet into GApp to make the common case easier to implement
-     
  •  Removed GApp::debugMode options, removed "debug" prefix from most fields.
-     
  •  G3D::zipfileExists for testing if a filename path contains a .zip to be opened [Eric]
-     
  •  G3D::isZipfile tests the header of a file to see if it is a .zip [Eric]
-     
  •  G3D::zipRead and G3D::zipClose to open and close .zip files [Eric]
-     
  •  G3D::fileExists supports filename paths that contain .zip [Eric]
-     
  •  G3D::fileLength supports filename paths that contain .zip [Eric]
-     
  •  G3D::getFiles and G3D::getDirs support filename paths that contain .zip [Eric]
-     
  •  Texture::isSupportedImage - static method, returns true if a filename exists and is compatible with Texture [Eric]
-     
  •  Viewer (tool) - Allows drag and drop viewing of many supported file formats [Eric]
-     
  •  GFXMeter (tool) - Updated for 7.00 compatibility: GApplet structure removed [Eric]
-     
  •  OSWindow::Settings has an allowMaximize field.  Win32Window will have an activated 'Maximize' button if true [Eric]
-     
  •  GApp2::debugCamera -> GApp2::defaultCamera
-     
  •  GApp2::debugController -> GApp2::defaultController
-     
  •  Made GApp2::debugText private
-     
  •  Added g3d_WorldLight0 to the G3D shader extensions
-     
  •  Added Shader support for GL_FLOAT_MAT3_ARB uniforms
-     
  •  Tab (command completion) no longer auto-repeats in GConsole
-     
  •  GConsole now limits the key repeat rate to the framerate
-     
  •  Removed GApp::Settings::useNetwork because it was no longer needed--Win32 does not trigger firewall checks anymore
-     
  •  Optimized AABSPTree balance and queries; now about 20% faster than 6.10, but requires 30 bytes more memory per member
-     
  •  G3D::Array::pop now shrinks the underlying array by default (Array::popRemove does not shrink the array and is faster)
-     
  •  Fast O(n), non-destructive G3D::Array::partition and G3D::Array::medianPartition
-     
  •  Increased ReliableConduit read attempts before timeout from 10 to 100 
-     
  •  G3D::GImage::pixel1 now returns G3D::Color1uint8*
-     
  •  G3D::Color1, G3D::Color1uint8
-     
  •  G3D::Image1,	G3D::Image1uint8
-     
  •  G3D::Image3,	G3D::Image3uint8
-     
  •  G3D::Image4,	G3D::Image4uint8
-     
  •  BinaryInput::flipEndian32, BinaryInput::flipEndian16
-     
  •  Texture::createEmpty now intializes invertY = true, which is usually desirable for Framebuffer rendering.
-     
  •  G3D::Map2D
-     
  •  G3D::Vector4int8
-     
  •  G3D::PointShape
-     
  •  G3D::GImage::RGBAtoRGB
-     
  •  Added GLEW compatibility [nico]
-     
  •  Added data-files directory to the locations searched for G3D demo data
-     
  •  On Win32, assertions now print ot the Output window as well as the dialog box.
-     
  •  On Win32, $TEMP is now used for the logfile location instead of c:\tmp
-     
  •  G3D::GKey replaces old SDL key enumeration
-     
  •  Decreased memory requirements and increased balance speed of G3D::AABSPTree by adding a level of indirection
-          between tree nodes and the data stored in them.
-     
  •  Added OSWindow::Settings::caption
-     
  •  Win32 programs must call the macro G3D_START_AT_MAIN(); at top-level if they do not define WinMain themselves.
-     
  •  Win32 switched from MBCS to UNICODE for the binaries (G3D sources compile under either, but UNICODE is the VC8 default)
-     
  •  Replaced SDL event types with G3D event types
-     
  •  Added support for GL_ARB_point_sprite
-     
  •  Win32 programs must call the macro G3D_START_AT_MAIN(); at top-level if they do not define WinMain themselves.
-     
  •  Win32 switched from MBCS to UNICODE for the binaries (G3D sources compile under either)
-     
  •  Changed G3D::GApp::main to return an int
-     
  •  Added header support for GL_EXT_geometry_shader4 ("Geometry shaders")
-     
  •  Changed IFSModel::create to IFSModel::fromFile 
-     
  •  G3D::BSPMap for loading Quake3 .bsp files
-     
  •  G3D::TextInput::Settings::caseSensitive
-     
  •  G3D::TextInput::readBoolean, G3D::TextInput::Settings::trueSymbols, G3D::TextInput::Settings::falseSymbols, G3D::TextOutput::Settings::trueSymbol, G3D::TextOutput::Settings::falseSymbol, G3D::TextOutput::writeBoolean, G3D::Token::BOOLEAN_TYPE
-     
  •  G3D::TextInput::Settings::msvcSpecials now defaults to true
-     
  •  Made the input to G3D::tessellateComplexPolygon a constant array reference
-     
  •  Removed SDL from Win32 build
-     
  •  Increased maximum ReliableConduit message size to 60 MB
-     
  •  Removed error macro
-     
  •  G3D::GConsole
-     
  •  Rect2D::lerp
-     
  •  Added GL_EXT_packed_depth_stencil
-     
  •  Added G3D::ImageFormat::DEPTH24_STENCIL8 packed stencil mode
-     
  •  getOpenGLState now includes GL_LIGHT_MODEL_TWO_SIDE value
-     
  •  Made ThirdPersonManipulator constructor protected (use ThirdPersonManipulator::create now)
-     
  •  G3D::ToneMap
-     
  •  Changed Renderbuffer::createEmpty argument order to match Texture::createEmpty
-     
  •  G3D::IFSModel can now remove degenerate faces on load
-     
  •  G3D::MD2Model::textureFromFile
-     
  •  Replaced AABSPTree::beginRayIntersection with simpler AABSPTree::intersectRay interface.
-     
  •  G3D::MD2Model now uses floating point texture coordinates, which makes it easier to 
-          write pixel shaders for MD2Models
-     
  •  G3D::GImage::computeNormalMap now accepts a scale factor indicating how steep the input bump map is
-     
  •  Added G3D::Shader support for the GLSL #version directive
-     
  •  Optimized G3D::GImage::computeNormalMap to use primarily integer math
-     
  •  G3D::AABox::contains(AABox)
-     
  •  Added large file (>2GB) support to BinaryInput [Peter]
-     
  •  Renamed graphics3d.h to G3D/G3D.h
-     
  •  Renamed GLG3D.h to GLG3D/GLG3D.h
-     
  •  Renamed G3DAll.h to G3D/G3DAll.h
-     
  •  G3D::Quat::unitize now normalizes in place
-     
  •  Added G3D::Quat::operator*=
-     
  •  Removed G3D::FirstPersonManipulator's constructor--use the static G3D::FirstPersonManipulator::create method now.
-     
  •  Changed BSPMap leaf bounds from Box to AABox--50% improvement in frustum culling speed
-	 
  •  Optimized BSPMap rendering performance
-     
  •  Removed all deprecated APIs
-	 
  •  All accessors of the form "getXXX" that take no arguments are now named just "xxx" 
-     
  •  G3D::Sky::create is now named G3D::Sky::fromFile and no longer accepts a G3D::RenderDevice. G3D::Sky::render now requires a RenderDevice.
-     
  •  G3D::GFont::fromFile no longer accepts a G3D::RenderDevice and G3D::GFont::draw2D now requires a RenderDevice.
-     
  •  Removed an assertion in BinaryInput requiring that compressed buffers be copied on construction [Nick Bray]
-     
  •  Removed CoordinateFrame::zLookDirection (use -1)
-     
  •  Removed Capsule::endPoint (use point)
-     
  •  Removed CoordinateFrame::getStrafeVector (use rightVector)
-     
  •  Removed static constants (use equivalent lower-case methods)
-     
  •  Removed Cylinder::getPoint1 (use point)
-     
  •  Fix: BSPMap::getStartingPosition now works correctly on all maps [Jeff]
-     
  •  Fix: Workaround for ATI drivers that do not support zero-area scissor region
-     
  •  Fix: GL_EXT_texture_3D -> GL_EXT_texture3D
-     
  •  Fix: ARB_texture_cube_map and EXT_texture_cube_map are now aliases on all cards
-     
  •  Fix: EXT_texture_edge_clamp and SGIS_texture_edge_clamp are now aliases on all cards
-     
  •  Fix: G3D::Sky now turns off lighting
-     
  •  Fix: Win32Window now returns mousebutton and motion events according to the GEvent spec
-     
  •  Fix: Win32Window now operates correctly in fullscreen mode
-     
  •  Fix: Fixed TGA decode to load from the middle of a binaryinput
-     
  •  Fix: Added texture coordinates to posed MD2Models
-     
  •  Fix: prompt/debugAssert now correctly responds to button presses on OS X
-     
  •  Fix: GConsole now filename completes after the first word 
-     
  •  Fix: RenderDevice::getDepthBufferValue now checks for the presence of a depth buffer.
-     
  •  Fix: G3D::AABSPTree now correctly handles members with infinite bounds on ray intersection tests
-     
  •  Fix: Removed use of tmpfile on Unix 
-     
  •  Fix: Java ReliableConduit now properly waits if the buffer is full when sending
-     
  •  Fix: [ 1607693 ] Triangles/Second display is now correct (rates were too low in 6.10)
-     
  •  Fix: NetworkDevice now does not perform a test broadcast during initialization
-     
  •  Fix: G3D::LightweightConduit::ok is now false if any error occurs during initialization
-     
  •  Fix: BSPMAP for cards without glMultiDrawElementsEXT
-     
  •  Fix: [ 1584335 ] ReliableConduit incorrectly assumes it's ok
-     
  •  Fix: RenderDevide::push2D no longer resets the frameBuffer.
-     
  •  Fix: Framebuffer logic for counting number of attachments was broken
-     
  •  Fix: [ 1581986 ] Matrix3::fromAxisAngle now normalizes the input vector
-     
  •  Fix: [1490643] Linux/FreeBSD/OS X binaries are now compiled with -fno-strict-aliasing, which fixes some
-          memory corruption problems that occurred with full optimizations.
-     
  •  Fix: Fixed all warnings on gcc-4.1 and VC8.
-     
  •  Fix: Matrix and CoordinateFrame serializers inside G3D::AnyVal dropped data
-     
  •  Fix: [ 1535759 ] valgrind finds initialization/deletion errors in TextOutput, Matrix [Chris Demetriou]
-     
  •  Fix: Patched MD2Model to automatically reduce animation times to less than 100000; large time were overflowing double->int conversion and causing animations to appear scrambled.
-     
  •  Fix: [ 1535292 ] global Table hashCode overloads broken [Chris Demetriou]
-     
  •  Fix: [ 1535736 ] Fixed System.cpp memory allocator to compile on 64-bit machines correctly [Chris Demetriou]
-   

-
-  

-   

-   Changes in 6.10:
-    
    
-     
  •  Optimized G3D::CoordinateFrame::pointToObjectSpace to be fully inlined via left-multiplication
-     
  •  G3D::Matrix4::orthogonalProjection from a G3D::Rect2D
-     
  •  G3D::RenderDevice::swapBuffers
-	 
  •  G3D::AnyVal
-     
  •  G3D::ThirdPersonManipulator
-     
  •  Added support for GL_SGIS_texture_lod in Texture.
-     
  •  Fix: [ 1490655 ] MeshAlg::Edge::containVertex goes off the end of the array
-     
  •  Fix: [ 1511729 ] NVIDIA rectangle generates errors in mipmap code
-     
  •  Fix: [ 1507296 ] RenderDevice must swapBuffer on resize
-    

-

-   

-   Changes in 6.09:
-   
    
-    
  •  glDepthBoundsEXT
-    
  •  G3D::Quat::sameRotation
-    
  •  Full loading of the GL_ATI_separate_stencil extension, support within RenderDevice
-    
  •  platform.h undefines WIN32_LEAN_AND_MEAN, NOMINMAX after it has defined them
-    
  •  G3D::Texture::Settings::maxMipMap
-    
  •  Renamed Texture::Parameters to Texture::Settings (backwards compatible typedef added)
-    
  •  Optimized IFSModel rendering by increasing internal VAR cache size and reducing the number of state changes.  
-        Can now render more than 1000 IFSModels at 30 fps on GeForce 7800.
-    
  •  G3D::System::mallocStatus
-    
  •  Range checking on Vector2int16::operator[]
-    
  •  GImage::BAYER_G8R8_B8G8_to_R8G8B8_MHC, GImage::BAYER_B8G8_G8R8_to_R8G8B8_MHC
-    
  •  IFSModel and MD2Model now allocated their posed models using System::malloc
-    
  •  Increased the memory maintained by G3D::System for buffer pools up to a total of 13 MB: 
-         8 MB tiny (preallocated), 1 MB small (on demand), 4 MB medium (on demand).  This was observed to 
-         dramatically increase performance (15x) in real programs that were 
-         performance limited by memory allocation time.
-    
  •  NetworkDevice now uses Winsock2.0 on Windows (controlled by the G3D_WINSOCK_MAJOR_VERSION/G3D_WINSOCK_MINOR_VERSION settings in NetAddress.h)
-    
  •  G3D::Manipulator
-    
  •  G3D::GApplet now runs installed G3D::GModules (except for graphics, which is left to the progrmamer)
-    
  •  G3D::GApp::addWidget, G3D::GApplet::addWidget, G3D::GApp::removeWidget, G3D::GApplet::removeWidget
-    
  •  G3D::Widget, G3D::WidgetManager
-    
  •  G3D::System::getEnv()
-    
  •  G3D::PosedModel2D
-    
  •  G3D::DXCaps
-    
  •  Increased precision of several Quat operations
-	
  •  G3D::Quat::fuzzyEq
-	
  •  G3D::Quat::operator-
-    
  •  G3D::LineSegment::length, G3D::LineSegment::point
-	
  •  Increased fuzzyEpsilon by a factor of 10 to take into account the new float32 focus of the APIs
-    
  •  G3D::RegistryUtil
-    
  •  G3D::LineSegment2D
-    
  •  G3D::ConvexPolygon2D
-    
  •  G3D::AxesShape
-    
  •  contrib/shaders/showDepth
-    
  •  G3D::Crypto with MD5 and CRC32 hashes
-    
  •  TextureManager::findTexture, TextureManager::cacheTexture [Erik]
-    
  •  Win32Window::_directInput created on-demand [Erik]
-    
  •  WeakReferenceCountedPointer has more comparison operators [Erik]
-    
  •  GImage::resolveFormat utility function [Erik]
-    
  •  GLCaps supports MESA
-    
  •  G3D::Win32Window and G3D::SDLWindow now release input capture and make the mouse visible on destruction
-    
  •  G3D::OSWindow::setInputCaptureCount, G3D::OSWindow::inputCaptureCount, G3D::OSWindow::incInputCaptureCount, G3D::OSWindow::decInputCaptureCount
-    
  •  GImage::makeCheckerboard
-    
  •  G3D::Vector3::one()
-    
  •  G3D::Shader now supports g3d_size(sampler2D) and g3d_invSize(sampler2D) extensions in GLSL shaders.
-    
  •  Renamed GAppSettings to G3D::GApp::Settings (old name is supported but deprecated)
-	
  •  Renamed GWindowSettings to G3D::OSWindow::Settings (old name is supported but deprecated)
-	
  •  Renamed TextInput::Options to G3D::TextInput::Options (old name is supported but deprecated)
-    
  •  G3D::FPManualController::setAutoActive for World of Warcraft style controller
-    
  •  G3D::isSlash, G3D::isQuote
-    
  •  G3D::GApplet::onEvent can now consume (i.e., prevent G3D::GApp from seeing) the event
-    
  •  G3D::CoordinateFrame::fuzzyIsIdentity, G3D::CoordinateFrame::isIdentity, G3D::CoordinateFrame::fuzzyEq
-    
  •  Matrix3::isOrthonormal
-    
  •  [1421201] Removed excess gl (NVIDIA) headers
-    
  •  Win32Window destructor now releases the mouse if it was captured and the current GL context is that window and the window was not created from an existing HDC/HWND
-    
  •  Fix: com.graphics3d.g3d.ReliableConduit now correctly selects on the waiting socket
-	
  •  Fix: [ 1166057 ]  AABSPTree::beginBoxIntersection
-    
  •  Fix: GLCaps::supports(ImageFormat) now returns correct results on all cards
-    
  •  Fix: Shadow map rendering of default PosedModels now enables lighting
-    
  •  Fix: G3D::UserInput now restores the mouse position after pureDeltaMouse is turned off
-    
  •  Fix: G3D::Win32Window now clips precisely to the client area during an input grab.
-	
  •  Fix: [ 1383042 ] free static variables on shutdown
-	
  •  Fix: [1449115 ] Texture loading for odd-byte rows
-    
  •  Fix: G3D::Win32Window now produces correct character and scan codes for key events
-    
  •  Fix: G3D::GApplet::onEvent calls GApplet::processEvent by default
-    
  •  Fix: [ 1444320 ] TextInput parsed ".1" as "1" instead of "0.1"
-    
  •  Fix: G3D::Shape::type is now const
-    
  •  Fix: 0 --> 0.0f FrameBuffer.h [Erik]
-    
  •  Fix: Fixed Texture read-back dimensions for cube-map
-    
  •  Fix: Missing #include in SkyParameters.h [Erik]
-    
  •  Fix: Quad triangle counts are now accurate (were off by factor of 4 in 6.08)
-    
  •  Fix: contrib/ArticulatedModel now correctly masks all components using the diffuse alpha in fixed function mode
-    
  •  Fix: G3D::CoordinateFrame::getHeading was flipped front-to-back
-    
  •  Fix: [ 1404487 ] Missing Alt key up/down events on Win32
-    
  •  Fix: [ 1484924 ] collisionTimeForMovingPointFixedBox normals
-   

-  
   
-

-   Changes in 6.08:
-    
          
-	  
  •  Moved Win32 linker statements out of platform.h for IncrediBuild compatibility.
-      
  •  G3D::Texture and G3D::Sky now accept a rescaling factor
-      
  •  Added GFont::fromMemory() [Corey]
-      
  •  Added optional argument to Quat::slerp() for slerp/lerp angle threshold. [Corey]
-      
  •  Across-the-board performance optimizations.  Most apps should render 10% faster.
-           Includes removal of Milestones when using VBO VAR [Nick Bray], GFont::draw2D and 
-           Draw::rect2D stripped down to raw OpenGL, consistent internal use of float,
-           increased RenderDevice state change optimization.
-	  
  •  Minimized header interdependencies (GLG3D headers no longer include all of G3D)
-      
  •  Added GThread and GMutex classes. [Corey]
-      
  •  Added ImageFormat::fromCode(). [Corey]
-      
  •  Added Plane::distance() and Plane::closestPoint() helper methods. [Corey] 
-      
  •  G3D::ImageFormat::code, G3D::ImageFormat::colorSpace
-      
  •  incompatible change G3D::MeshAlg::computeTangentSpace basis now computes a right-handed coordinate frame,
-           where the binormal direction is the negative of the direction it faced in G3D 6.07.
-      
  •  Exposed G3D::RenderDevice::beforePrimitive and G3D::RenderDevice::afterPrimitive to end-user code for
-           integrating raw OpenGL calls.
-      
  •  G3D::Framebuffer and G3D::Renderbuffer to implement the Framebuffer_object extension [Dan Hilferty]
-      
  •  G3D::Shader::hasArgument
-      
  •  G3D::Texture::getImage
-      
  •  Changed SECOND, MINUTE, DAY, HOUR, SUNRISE, SUNSET, MIDNIGHT, METER, KILOMETER to enum values instead of #defines
-      
  •  G3D::Texture::Parameters; deprecated most Texture constructors in favor of ones that use this class
-      
  •  Moved most image manipulation routines into GImage.
-      
  •  G3D::GImage now allocates the underlying buffer in multiples of bytes to allow slight overflor for MMX algorithms
-      
  •  G3D::GImage::BAYER_R8G8_G8R8_to_R8G8B8_MHC
-      
  •  G3D::GImage::R8G8B8_to_Y8U8V8
-      
  •  G3D::GImage::Y8U8V8_to_R8G8B8
-      
  •  G3D::GImage now supports PPM binary
-      
  •  Various Rect2D helpers [Nick Bray]
-      
  •  ConvexPolyhedron improved clipping [Nick Bray]
-      
  •  G3D::System::build
-      
  •  G3D::System::calloc
-      
  •  G3D::GImage::convertToRGBA
-      
  •  contrib/AVI can read most AVI files on Windows.
-      
  •  contrib/wxGWindow now uses wxWidgets 2.6.2
-      
  •  G3D_DEBUG now controls whether debug code is enabled; it defaults to the value of _DEBUG
-      
  •  zlib upgraded to 1.2.3 [Corey]
-      
  •  zlib now statically linked on Win32 (no longer requires zlib1.dll at runtime) [Corey]
-      
  •  G3D::MeshShape
-      
  •  Changed std::string hashCode to use CRC32 to reduce collisions
-      
  •  G3D::crc32
-      
  •  Added occlusion query #defines [Nick Bray]
-	  
  •  G3D::Win32Window now shares textures and vertex buffers across all GL contexts
-	  
  •  G3D::Win32Window now enforces single-threading among GL contexts
-	  
  •  G3D::GLCaps::slowVBO
-	  
  •  G3D::VARArea now uses main memory vertex buffers on cards with slow VBO implementations.
-	  
  •  G3D::Matrix3::toString [Peter]
-	  
  •  G3D::Matrix4::toString [Peter]
-	  
  •  G3D::Color3::fromHSV [Peter]
-	  
  •  G3D::Color3::toHSV   [Peter]
-	  
  •  G3D::Color3::jetColorMap [Peter]
-      
  •  Optimized G3D::iRound (now faster than casting!)
-      
  •  G3D::MD2Model::create now accepts a scale factor
-      
  •  #G3D_DEPRECATED macro
-      
  •  #G3D_CHECK_PRINTF_ARGS, #G3D_CHECK_VPRINTF_ARGS macros to allow
-           checking of printf argument strings under gcc at compile time with
-           -Wformat.
-      
  •  G3D::TextInput::filename
-      
  •  G3D::TextInput::Options::msvcSpecials
-      
  •  G3D::TextInput::Options::startingLineNumberOffset
-      
  •  G3D::TextInput::readSymbolToken [cgd]
-      
  •  G3D::TextInput::readStringToken [cgd]
-      
  •  G3D_DEPRECATED macro
-      
  •  Threadsafe G3D::ReferenceCountedPointer
-      
  •  G3D::AtomicInt32
-      
  •  G3D::GThread [Corey]
-      
  •  G3D::Array::popDiscard
-      
  •  Optimized multi-argument Array::append
-      
  •  G3D::GFont 2x faster than in G3D 6.07
-      
  •  G3D::RenderDevice::pushState 2x faster than in G3D 6.07
-      
  •  G3D::RenderDevice::pushState no longer stores GL texgen and fog information           
-      
  •  G3D::Draw::fastRect2D
-      
  •  G3D::System::outOfMemoryCallback
-      
  •  G3D::Queue::fastClear [Chris Demetriou]
-      
  •  G3D::Rect2D::x0y1 and x1y0
-      
  •  G3D::GLCaps bug tests now run in a separate GL context [Erik Cassel]
-      
  •  G3D::GApplet tracks real and simulation time.
-      
  •  contrib/Q3Map updated to correctly render instanced objects [Alex Rice]
-      
  •  G3D::OSWindow subclasses now required to invoke OSWindow::loadExtensions
-      
  •  G3D::Quat::log for non-unit quats and for real-only quats.
-      
  •  G3D::GApplet::doUserInput
-      
  •  G3D::GApp prints time for each component
-      
  •  G3D::Stopwatch
-      
  •  G3D::OSWindow::renderDevice()
-      
  •  G3D::OSWindow::current()
-      
  •  G3D::GLCaps::hasBug_redBlueMipmapSwap and workaround for G3D::Texture on Radeon 7500
-      
  •  Fix: CollisionDetection::penetrationDepthForFixedSphereFixedPlane() contact point and normal values. [Corey]
-      
  •  Fix: Quat::slerp has invalid shortest path [Corey]
-      
  •  Fix: G3D::drawFeatureEdges now uses correctly normalized face edges (and offers a crease angle)
-	  
  •  Fix: G3D::SDLWindow now releases the mouse on Linux during an assertion.
-      
  •  Fix: All keys are reset to up when Win32Window loses focus. [Corey]
-      
  •  Fix: gaussRandom is unit gaussian [Corey]
-      
  •  Fix: [ 1418276 ] 6.08: Unsupported format for depth texture
-      
  •  Fix: Ignoring extra/unused set Shader arguments. [Corey]
-      
  •  Fix: [ 1229205 ] uniform texture array (Could not set indexed array uniforms). [Corey]
-      
  •  Fix: incompatible change BinaryInput/BinaryOutput copy constructors and assignments were accessible. [Corey]
-      
  •  Fix: RenderDevice::screenshotPic would corrupt GImage's heap. [Corey]
-      
  •  Fix: Alt-Tab window switching caused an invalid Alt key state. [Corey]
-      
  •  Fix: Incorrect window size event in Win32Window sent to OpenGL. [Corey]
-      
  •  Fix: [ 1227915 ] Textures don't bind on ATI under GLSL.
-      
  •  Fix: [ 1358477 ] ray-plane intersection bug [Dan Keefe]
-      
  •  Fix: [ 1370665 ] hash_map moved to stdext in VC8 (2005)
-      
  •  Fix: ToneMap extended to use DIM_2D_NPOT instead of DIM_2D_RECT
-      
  •  Fix: Texture::copyFromScreen now works with DIM_2D_NPOT textures
-	  
  •  Fix: Wrapped debugAssertM in do {} while (0) to ensure correct compilation in single-line statements [ERik Cassel]
-      
  •  Fix: G3D::Draw::cylinder now renders the bottom correctly
-      
  •  Fix: Array::front now compiles under gcc
-      
  •  Fix: G3D::Ray::distance used to measure against the origin [David]
-      
  •  Fix: [ 1293151 ] ArticulatedModel clipping on Radeon -- disabled auto-mipmap generation on mobile radeon 9xxx
-      
  •  Fix: G3D::TextInput now parses ^=, character 255 correctly [cgd]
-      
  •  Fix: G3D::TextInput now reports line numbers correctly with raw newlines [cgd]
-      
  •  Fix: .ICO files with transparency loaded incorrectly [Corey]
-      
  •  Fix: G3D::Draw::rect2DBorder inner border was 1 pixel too thick.
-      
  •  Fix: [ 1326173 ] Win32Window::init should call makeCurrent.[Erik Cassel]
-      
  •  Fix: [ 1326423 ] G3D::Queue::_copy broken [Chris Demetriou]
-      
  •  Fix: [ 1313293 ] 6.08: TextInput gets symbol extendedType() wrong [Chris Demetriou]
-      
  •  Fix: IFSModel::save, for PLY2  forgot newlines [Peter]
-      
  •  Fix: Quat(Matrix3) now computes trace correctly (gave negative quats in some cases) 
-      
  •  Fix: Setting RenderDevice::polygonOffset now always produces a depth shift,
-                even for faces perpendicular to the view axis.
-      
  •  Fix: GImage now auto-resolves formats for files with 1 character base names
-      
  •  Fix: WeakReferenceCountedPointer cycle bug
-      
  •  Fix: Corrected lag encountered when using some ReliableConduit constructors [Dan Keefe]
-    

-
-  

-

-   Changes in 6.07:
-   
    
-    
  •  G3D::OSWindow::makeCurrent
-    
  •  Win32 release binaries now built with no debug information (used to have line numbers)
-    
  •  AABox::AABox enforces the constraint low <= high
-    
  •  Optimized G3D::Array, Table, Queue, and Set for performance.  Now significantly (up to 10x) faster
-         than their std::counterparts.
-    
  •  G3D::Vector3(Vector2, float) constructor
-    
  •  G3D::Vector2::fastDirection
-    
  •  G3D::TextInput::Options::cComments
-    
  •  G3D::TextInput::Options::escapeSequencesInStrings
-    
  •  G3D::TextInput::Options::otherCommentCharacter2
-    
  •  G3D::TextInput::WrongString
-    
  •  GLCaps::supports_GL_ATI_separate_stencil
-    
  •  GLCaps can now test a card/driver and detect specific bugs:
-        
    • G3D::GLCaps::hasBug_glMultiTexCoord3fvARB
-        
    •  G3D::GLCaps::hasBug_normalMapTexGen
-        
    
-    
  •  G3D::ReferenceCountedPointer::downcast for non VC6 compilers
-    
  •  Improved G3D::ReferenceCountedPointer documentation to make subclassing features clearer
-    
  •  Moved typedef for uint into G3D namespace and into g3d (was in glg3d)
-    
  •  G3D::Shape
-    
  •  G3D::Cylinder
-    
  •  G3D::System::malloc, G3D::System::realloc, G3D::System::free for fast allocation of small objects
-    
  •  G3D::Draw::plane
-    
  •  G3D::Draw::cylinder
-    
  •  G3D::gaussRandom
-    
  •  GCamera deserialize(BinaryInput) & serialize(BinaryOutput) functions [Peter]
-    
  •  G3D::GApp now writes a description of the whole system to the log to aid debugging.
-    
  •  [ 1217928 ] OpenGL occlusion query entry points are loaded on initialization
-    
  •  New texture interpolation modes: BILINEAR_MIPMAP, NEAREST_MIPMAP, NEAREST_NO_MIPMAP
-    
  •  New texture formats:
-      
      
-        
    •  G3D::ImageFormat::L16;
-        
    •  G3D::ImageFormat::L16F;
-        
    •  G3D::ImageFormat::L32F;
-        
    •  G3D::ImageFormat::A16;
-        
    •  G3D::ImageFormat::A16F;
-        
    •  G3D::ImageFormat::A32F;
-        
    •  G3D::ImageFormat::LA4;
-        
    •  G3D::ImageFormat::LA16;
-        
    •  G3D::ImageFormat::LA16F;
-        
    •  G3D::ImageFormat::LA32F;
-        
    •  G3D::ImageFormat::RGB16;
-        
    •  G3D::ImageFormat::RGB16F;
-        
    •  G3D::ImageFormat::RGB32F;
-        
    •  G3D::ImageFormat::RGBA16;
-        
    •  G3D::ImageFormat::RGBA16F;
-        
    •  G3D::ImageFormat::RGBA32F;
-      
    
-     
  •  isValidPointer and isValidHeapPointer no longer check the Win32 debug heap in order to support offset and padded memory blocks.
-     
  •  Restructured unit tests
-     
  •  G3D::CoordinateFrame::lookRay [David Baszucki]
-     
  •  G3D::System::describeSystem, G3D::NetworkDevice::describeSystem, G3D::RenderDevice::describeSystem
-     
  •  G3D::Array performance tuning for short arrays and arrays of small objects
-     
  •  Added glext.h entries for GL_ARB_draw_buffers, GL_ARB_texture_rectangle, 
-          GL_ARB_color_buffer_float, GL_ARB_half_float_pixel, GL_ARB_texture_float, 
-          and GL_ARB_pixel_buffer_object extensions
-     
  •  IFSModel::create  added weld option, defaults to true (to keep compatibility). [Peter]
-     
  •  G3D::RenderDevice::alphaTestReference, RenderDevice::alphaTest
-     
  •  G3D::VAR::set
-     
  •  G3D::Log::vprintf
-     
  •  G3D::WeakReferenceCountedPointer
-     
  •  GCC 4.0 build support added [Corey]
-     
  •  G3D::CoordinateFrame::lookAt now gives a valid output even when look == up
-     
  •  contrib/GChunk
-     
  •  GLCaps now loads GL_EXT_framebuffer_object functions
-     
  •  Added MSVC 6 support for C99 restrict keyword
-     
  •  G3D::Win32Window properly resizes viewport on window resize [Corey]
-     
  •  G3D::BinaryFormat, G3D::byteSize, G3D::binaryFormatOf
-     
  •  Removed dead ManualCameraControllerHelper code
-     
  •  Added consistent area and volume methods to geometric primitives, deprecated old methods.
-     
  •  Fast G3D::BinaryInput::read / G3D::BinaryOutput::write methods for arrays 
-     
  •  Enabled cube mapping on Radeon mobility cards and added a workaround to the known problems with texcoords on those cards.
-     
  •  Can now create G3D::Win32Window with existing HWND and HDC [Corey]
-     
  •  G3D::VertexAndPixelShader::ArgList::set(std::string, Array)-- [ 1192401 ] Shader support arrays
-     
  •  Fix: SDLWindow used std::string's instead of C strings in printf and format inside some exception handling code. [Peter]
-     
  •  G3D::X11Window (same as SDLWindow in this release)
-     
  •  Fix: [ 1277854 ] Win32Window fails on 24-bit modes
-     
  •  RFE: [ 1242466 ] Inline Matrix3 methods
-     
  •  Fix: [ 1226272 ] end caps of capsules in wrong position
-     
  •  Fix: G3D::ImageFormat::LA8 now has 8-bits per channel
-     
  •  Fix: [ 1124491 ] Remove GL_SAMPLER_2DRECT_ARB
-     
  •  Fix: [ 1257113 ] G3D::Queue problems comining pushFront and pushBack
-     
  •  Fix: MeshAlg::Weld now linear time (was O(n^2) due to a bug)
-     
  •  Fix: [ 1298873 ] fast & correct CoordinateFrame::lerp
-   

-
-  

-

-   Changes in 6.06:
-   
    
-    
  •  G3D::Lighting::emissiveScale
-    
  •  G3D::RenderDevice::drawBuffer
-    
  •  G3D::RenderDevice::debugNumMinorStateChanges, debugNumMinorOpenGLStateChanges, debugNumMajorStateChanges, debugNumMajorOpenGLStateChanges.
-    
  •  In stereo mode, Texture::copyFromScreen automatically chooses the left/right buffer to read based on the current glDrawBuffer
-    
  •  contrib/ArticulatedModel/ToneMap
-    
  •  Lazy state changes for shaders
-    
  •  50% performance improvement for G3D::BinaryInput, G3D::BinaryOutput when machine endian matches file endian
-    
  •  Textures load with default of maxAnisotroy = 2.0
-    
  •  maxAnisotropy argument to G3D::Texture constructors.
-    
  •  GLCaps now loads GL_ATI_fragment_shader extension
-    
  •  contrib/ArticulatedModel now supports rigid body hierarchies
-    
  •  Added TEX_SUBTRACT, TEX_ADD_SIGNED, TEX_DOT3, TEX_DOT3_RGBA modes for G3D::RenderDevice::setTextureCombineMode
-    
  •  G3D::RenderDevice now cleans up all static G3D::VARArea s when it shuts down
-    
  •  FIX: [ 1208157 ] GLSL slow on ATI
-    
  •  FIX: Off-by-one on viewport scale for 2D rendering
-    
  •  FIX: MeshAlg::computeTangentSpaceBasis now works correctly
-    
  •  FIX: 6.05 enabled all fixed function lights by default.  This caused major performance problems on some cards.
-    
  •  FIX: Extended cube map workaround to all Radeon Mobility cards
-    
  •  FIX: Added check for glBlendEq before calling in RenderDevice
-    
  •  FIX: Added a test for GL_EXT_texture_env_add in RenderDevice
-    
  •  FIX: [ 1191817 ] unsigned warnings in BinaryInput
-   

-
-

-   

-   Changes in 6.05:
-   
    
-     
  •  G3D::BAYER_G8B8_R8G8_to_R8G8B8_MHC
-     
  •  G3D::Quarter_R8G8B8_to_BAYER_G8B8_R8G8
-     
  •  G3D::BAYER_G8B8_R8G8_to_Quarter_R8G8B8
-     
  •  contrib/Matrix
-     
  •  contrib/Java
-     
  •  Texture::alphaOnlyVersion
-     
  •  Draw::sphere speed improved over 25% with single quad strip (improves Draw::capsule) [Corey]
-     
  •  Allow 1-channel GImage saving - BMP (expanded to RGB), PNG [Corey]
-     
  •  Allow 1-channel GImage loading - PNG [Corey]
-     
  •  Added shader and framebuffer extensions to glext.h 
-     
  •  All files used during current execution are available via G3D::getFiles() [Corey]
-     
  •  Implemented OSX version of glGetCurrentContext with CGL. [Corey + Derek]
-     
  •  ReferenceCountedObject is-in-heap checks were removed to allow better multiple and virtual inheritance for reference counted objects.  ReferenceCountedPointer still appropriately checks does an is-in-heap check on assignment. [Corey]
-     
  •  Added Dev C++ compatability
-     
  •  glGetAttribLocationARB
-     
  •  Changed GLight == operator to not use memcpy (was causing issues due to byte padding on some compilers)
-     
  •  Made CoordinateFrame destructor non-virtual (eliminates vtable)
-     
  •  Added new FAQ documentation
-     
  •  Added support to G3D::BinaryInput and G3D::BinaryOutput 
-          reading and writing huge (larger than available memory) files.
-          Files are still restricted to about 2 GB total, and compressed
-          files must fit entirely in memory.
-     
  •  Tweaked allocation strategy for small G3D::Array
-     
  •  G3D::Texture::rect2DBounds, G3D::Texture::vector2Bounds
-     
  •  G3D::Vector4 * G3D::Vector4, Vector4 / Vector4
-     
  •  G3D::Array::operator=(std::vector)
-     
  •  G3D::Sky::getEnvironmentMap now returns the top texture on machines
-          that don't support cube maps.
-     
  •  glDisableAllTextures()
-     
  •  G3D::setFailureHook
-     
  •  G3D::Shader::fromStrings now accepts optional names for the vertex and pixel shader
-     
  •  G3D::Shader no longer requires values for declared but unused uniform variables
-     
  •  G3D::RenderDevice now stores texture matrix at 32-bit precision (for faster push/popState)
-     
  •  G3D::RenderDevice::setTextureLODBias
-     
  •  G3D::Shader now supports shadow map arguments
-     
  •  G3D::Shader::ArgList checks to see if Texture arguments are null
-     
  •  G3D::RenderDevice::setAlphaWrite now defaults to true if the OSWindow has an alpha channel.
-     
  •  G3D::RenderDevice::screenshotPic now supports alpha
-     
  •  contrib/VideoSerializer
-     
  •  G3D::BinaryOutput::writeBits, G3d::BinaryInput::readBits
-     
  •  G3D::Sky can now be initialized with a NULL renderDevice, provided a non-null one
-          is used with the G3D::Sky::render method.
-     
  •  G3D::pi(), G3D::halfPi(), G3D::twoPi() added to replace defines [Corey]
-     
  •  contrib/Q3Map
-     
  •  Increased G3D::Draw::sphere performance using vertex arrays.
-     
  •  G3D::Array::fastClear
-     
  •  G3D::AABSPTree::insert(Array)
-     
  •  G3D::Texture::sizeOfAllTexturesInMemory
-     
  •  G3D::VARArea::sizeOfAllVARAreasInMemory
-     
  •  G3D::RenderDevice stores cameraToWorldMatrixInverse for faster coordinate system changes.
-     
  •  inlined G3D::Matrix3::operator= for performance
-     
  •  Created installer for Windows install [Corey]
-     
  •  Reorganized the documentation topic index based on abstraction level, added hyperlinks to demo/contrib code
-     
  •  G3D::ReliableConduit and G3D::LightweightConduit now send and receive
-          objects directly; no need to make a G3D::NetMessage.  G3D::NetMessage
-          and associated methods are now deprecated.
-     
  •  Win32 GUI G3D::prompt now auto-expands \\n to \\r\\n in prompt string [Corey]
-     
  •  G3D::Draw::frustum
-     
  •  Increased timeout and attempts for G3D::ReliableConduit to handle huge (1 MB) packets
-     
  •  G3D::BinaryOutput::reset (memory writing only; not supported for disk)
-     
  •  Reduced overhead for G3D::ReliableConduit and 
-          G3D::LightWeightConduit send routines
-     
  •  Added PPM/PGM/PBM ASCII encode/decode support to G3D::GImage [Corey]
-     
  •  New G3D::PosedModel rendering methods appropriate for shadow casting
-           (with efficient default implementations).
-     
  •  G3D::Lighting
-     
  •  Changed RenderDevice::TEX_INTERPOLATE to mean GL_DECAL and added TEX_BLEND for GL_BLEND
-     
  •  G3D::CoordinateFrame::upVector
-     
  •  G3D::GLight::diffuse
-     
  •  G3D::Rect2D::contains is now const
-     
  •  Rewrote G3D::BinaryOutput to not use G3D::Array
-     
  •  G3D::MD2Model::textureMatrix
-     
  •  G3D::MeshAlg::computeBounds(vertex, index, ...)
-     
  •  G3D::RenderDevice::colorWriteEnabled(), depthWriteEnabled, alphaWriteEnabled
-     
  •  G3D::RenderDevice::setSpecularCoefficient(Color3)
-     
  •  G3D::VAR::maxSize
-     
  •  G3D::RenderDevice::enableTwoSidedLighting
-     
  •  G3D::PosedModel::hasTransparency
-     
  •  G3D::PosedModel::sort
-     
  •  G3D::RenderDevice::renderMode
-     
  •  G3D::MeshAlg::computeNormals(geometry, indexArray);
-     
  •  contrib/ArticulatedModel (beta 3DS support)
-     
  •  G3D::RenderDevice::swapBuffersAutomatically allows caller to suppress page flip.
-     
  •  Added coordinate system documentation.
-     
  •  RenderDevice::enableClip2D, RenderDevice::disableClip2D (scissor region)
-     
  •  contrib/wxGWindow is stable and full featured-- use wxWidgets 2.5.3 with G3D!
-     
  •  G3D::fileIsNewer
-     
  •  G3D::isDirectory
-     
  •  G3D::filenameContainsWildcards
-     
  •  G3D::filenamePath
-     
  •  G3D::Draw::lineSegment now accepts a scale (allowing arrows and axes to thicken appropriately)
-     
  •  G3D::Rect2D::largestCenteredSubRect
-     
  •  G3D::Matrix4::serialize, G3D::Matrix4::deserialize
-     
  •  glTexImage3DEXT
-     
  •  Removed glut.lib and glut.dll from the win32-lib directory.
-     
  •  G3D::writeStringToFile, G3D::TextOutput, and G3D::BinaryOutput now flush by default (safe, not fast).
-     
  •  Shifted push2D by 0.375 pixels as recommended in the OpenGL guide to bias integer coords towards pixel centers
-     
  •  G3D::Draw::rect2DBorder
-     
  •  G3D::Rect2D::border
-     
  •  G3D::RenderDevice now creates a G3D::Win32Window on Windows instead of a G3D::SDLWindow.  SDLWindow is now
-          deprecated on Windows.
-     
  •  G3D::VARArea now updates allocation sizes instead of G3D::VAR internally.  Added
-          more accessor methods to VARArea to futher remove VAR from VARArea internals. [Corey]
-     
  •  VARSystem.cpp moved to VARArea.cpp - filename change only! [Corey]
-     
  •  Linux build system updated:
-          Builds only static libraries, Does not require libtool/libtoolize anymore,
-          Does not check for or require libraries that normally linked with the .so files,
-          Automatically builds Test project with iCompile during install. [Corey]
-     
  •  G3D::Quat::deserialize, G3D::Quat::serialize
-     
  •  G3D::PhysicsFrame::deserialize, G3D::PhysicsFrame::serialize
-     
  •  G3D::TextInput::Options::singleQuotedStrings (defaults to true, changing the behavior
-	      from previous versions).
-	 
  •  G3D::Token::extendedType returns information disambiguating characters and strings
-	      and floats and ints.
-     
  •  Added data/ah64-body and ah64-rotor
-     
  •  demos/Network_Demo now uses a helicopter model instead of a plane
-     
  •  G3D::VARArea::gl_vertexBufferObject and G3D::VARArea::gl_basePointer for breaking
-          the VARArea abstraction.
-     
  •  GLG3D.h no longer links against SDLMain.lib on Windows if _CONSOLE is defined
-          (since console programs have no WinMain).
-     
  •  SDL's redefinition of main is cleared when not linking sdlmain.lib [Corey]
-     
  •  Moved contrib/Win32Window to G3D::Win32Window
-     
  •  G3D::TextInput::readSymbols
-     
  •  contrib/Image [Morgan]
-     
  •  contrib/wxGWindow [Morgan]
-     
  •  Added support for full-screen antialiasing to contrib/Win32Window
-     
  •  Added joystick support to contrib/Win32Window [Corey]
-     
  •  Win32Window fully-implements OSWindow [Corey]
-     
  •  Texture now supports DDS(2D/CubeMap) and PNG files [Corey]
-     
  •  Added Win32 pbuffer routines (no G3D wrapper, though-- we're waiting for the new ARB API).
-     
  •  G3D::PosedModel::texCoords
-     
  •  G3D::IFSModel now loads IFS 1.1 [Peter]
-     
  •  G3D::IFSModel now loads and saves PLY2 files (plain text IFS format) [Peter]
-     
  •  Automatically switch to glCompressedTexImage2D in G3D::Texture::fromMemory [Corey]
-     
  •  Added G3D::Sky::fromCubeMap for preloaded CubeMap Texture::Ref's [Corey]
-     
  •  Added G3D::Sky::fromFile and deprecated Sky::create [Corey]
-     
  •  Demo and Test projects now build with iCompile, which is included [Corey]
-     
  •  Fix: TextOutput::writeString now escapes special characters
-     
  •  Fix: AABSPTree::serializeStructure
-     
  •  Fix: Properly handle gl_ uniforms on Radeon for Shader
-     
  •  Fix: [ 875467 ] OS X debugBreak (requires default XCode debug menu item 'Break on DebugStr()') [Corey + Derek]
-     
  •  Fix: Can make a G3D::Texture::fromGImage with one channel (defaults to L8 format)
-     
  •  Fix: [ 1149972 ] 6.05: Make Sky render correctly on low-end cards (no Cube mapping) [Corey]
-     
  •  Fix: [ 1032742 ] OS X _DEBUG not defined [Derek]
-     
  •  Fix: 16-bit integer reads in BinaryInput that always reversed endianness. (OSX file reading) [Corey + Derek]
-     
  •  Fix: Matrix4 operator[] was returning a matrix value cast to a pointer [Corey]
-     
  •  Fix: Matrix3 and Matrix4 had missing float* / const float* operators [Corey]
-     
  •  Fix: Rect2D::clip broken for types other than Vector2
-     
  •  Fix: RenderDevice::configureShadowMap result depends on objectToWorldMatrix
-     
  •  Fix: [ 1150650 ] DebugBreak() undefined
-     
  •  Fix: [ 1111534 ] Network Demo crashes starting 2nd server on same machine
-     
  •  Fix: [ 1102091 ] ReliableConduit::receive times out
-     
  •  Fix: Implemented MD2Model::objectSpaceBoundingX methods.
-     
  •  Fix: G3D::Triangle::area is now zero for zero-area triangles (was inf)
-     
  •  Fix: AABSPTree with extent on MSVC 6 no longer enters infinite loop in std::sort
-     
  •  Fix: [ 1105641 ] Does not build with g++ 3.4.x [Corey]
-     
  •  Fix: [ 1103619 ] RenderDevice::countPrimitive is wrong (changed to RenderDevice::countTriangles) [Corey]
-     
  •  Fix: AABSPTree::BoxIntersectionIterator doesn't compile
-     
  •  Fix: [ 1101680 ] copyfile won't overwrite (on Windows now overwrites) [Corey]
-     
  •  Fix: [ 1101646 ] GCamera::frustum incorrect for non-square viewport
-     
  •  Fix: Ultra bright lens flare at sunset [Nicholas Bray]
-     
  •  Fix: IP address strings were reversed by NetAddress(std::string) 
-     
  •  Fix: TextInput now returns end of file token for files without trailing whitespace
-     
  •  Fix: [ 1094166 ] 6.05: Release mouse stuck on x-axis [Corey + Morgan]
-     
  •  Fix: Recognize buggy ATI Radeon Mobility cube maps and work around
-     
  •  Fix: Textures now initialize without setting error bit on cards without GL_ARB_shadow
-     
  •  Fix: filenameBaseExt now operates correctly on strings with both \ and / slashes.
-     
  •  Fix: [ 1062659 ] BinaryInput::BinaryInput() memory leak
-     
  •  Fix: Removed RenderDevice::polygonCount, which was never used.
-     
  •  Fix: TextInput::readNumber no longer accepts double preceeding +/- on numbers when Options::signedNumbers is true
-     
  •  Fix: [ 1038733 ] OSWindow cannot set icon properly [Corey]
-     
  •  Fix: [ 939400 ] Linux mouse set position (Wild camera swinging on startup) [Corey]
-     
  •  Fix: [ 1042591 ] Software GL Causes Assertion [Corey]
-     
  •  Fix: [ 1036634 ] debugAssert doesn't work on MSVC 7 [Corey]
-     
  •  Fix: [ 1049024 ] Fix compile warnings from gcc/Linux build [Corey]
-     
  •  Fix: [ 1051272 ] Win32Window doesn't use GWindowSettings properly. [Corey]
-     
  •  Fix: Win32Window clips the proper cursor region during input capture. [Corey]
-     
  •  Fix: GWindows now center and maximize on the primary monitor for Windows.
-     
  •  Fix: [ 1052945 ] TextOutput wordWrap starts on newlines
-     
  •  Fix: [ 1050957 ] TextInput readNumber support for capital 'E' numbers.
-     
  •  Fix: [ 1049674 ] TextInput failes on X. numbers.
-     
  •  Fix: [ 1044028 ] Linux TextOutput Warning
-     
  •  Fix: [ 1032750 ] Grayscale JPG errors [Corey]
-     
  •  Fix: [ 1036225 ] Encode TGA support strips alpha channel [Corey]
-     
  •  Fix: [ 1038631 ] CoordinateFrame::slerp (Quat::slerp has fix) [Corey]
-     
  •  Fix: [ 1033686 ] GImage::GImage(filename) dies on certain (BMP) images [Corey]
-     
  •  Fix: Texture mapping modes for pre-OpenGL 1.3 cards [Dan & Morgan]
-   

-
-

-   

-   Changes in 6.04:
-   
    
-     
  •  G3D Manual! [ Morgan and Sascha ]
-     
  •  Initial MSVC7 build script.  MSVC7 is not an officially supported platform
-          however the release contains MSVC7 precompiled binaries and the build script
-          will automatically build on both 6 and 7.
-     
  •  Improved performance of G3D::writeStringToFile
-     
  •  G3D::ReferenceCountedPointer assignment now allows compile time subtyping
-     
  •  G3D::ReferenceCountedPointer != operator
-     
  •  G3D::ReferenceCountedPointer::notNull
-     
  •  G3D::GLight::directional now normalizes the light vector
-     
  •  G3D::setAssertionHook
-     
  •  [ 1029256 ] G3D::Shader / G3D::VertexAndPixelShader define g3d_ uniforms inside shaders
-     
  •  static G3D::IFSModel::save/load for writing/reading IFS files
-     
  •  G3D::TextInput allows ' inside quoted strings
-     
  •  G3D::TextInput allows \ as a symbol token
-     
  •  G3D::TextInput supports an arbitrary comment character (e.g. '#')
-     
  •  Precompiled binaries for VisualC++ 7 (.NET 2002/2003)
-     
  •  VisualC++ 7 (.NET 2002/2003) supported by build script
-	 
  •  Build now MOVEs binaries instead of COPYing them on Windows (allows
-	      two compilers to output to the same location)
-     
  •  G3D Guide overview documentation
-     
  •  Changelog and Error FAQ moved under Doxygen
-     
  •  Build scripts and documentation now under the 'doc' .dsp on Windows
-     
  •  Textures now support a DepthReadMode that can be used to perform hardware
-	     shadow map comparisions.  RenderDevice::configureShadowMap now requires 
-		 an appropriately configured texture-- in previous releases it would
-		 reconfigure the texture for you.
-     
  •  G3D::UserInput::keyReleased, G3D::UserInput::ReleasedKeys
-     
  •  G3D::Array::randomElement
-     
  •  G3D::Array::insert
-     
  •  G3D::RenderDevice::getObjectToWorldMatrix and getCameraToWorldMatrix now return 
-          const CoordinateFrame&
-	 
  •  Optimized G3D::Array::randomize
-     
  •  G3D::cyclicCatmullRomSpline
-     
  •  G3D::wrap
-     
  •  contrib/AudioDevice
-     
  •  G3D::System::time();
-	 
  •  More precise System::sleep
-     
  •  G3D::IFSModel::pose with no arguments
-     
  •  G3D::AABSPTree::serializeStructure, deserializeStructure,
-     
  •  serialize(Vector3::Axis, BinaryOutput), deserialize(Vector3::Axis, BinaryInput),
-     
  •  "glslc" GLSL compiler in the tools directory for getting compile-time errors from shaders 
-     
  •  GLCaps::init now takes optional debug log
-	 
  •  G3D::VertexAndPixelShader static constructors take optional 'debug' argument
-     
  •  GWindowSettings::visible; Win32Window can now start invisible
-     
  •  [ 991147 ] glBlendEquationEXT, RenderDevice::BlendEq, min, max, subtract, reverse subtract alpha blending
-     
  •  [ 989785 ] Draw::rect2D
-	 
  •  GLCaps::numTextureCoords, GLCaps::numTextureUnits, GLCaps::numTextures
-	 
  •  GLCaps::G3D_MAX_TEXTURE_UNITS
-     
  •  Rect2D::corner
-     
  •  GCamera::getFrustum, GCamera::frustum, GCamera::Frustum, GCamera::Frustum::Face
-     
  •  Plane constructor that accepts Vector4s (possibly at infinity)
-     
  •  AABox::inf, AABox::zero, AABox::maxFinite
-     
  •  AABox::intersects(Sphere)
-     
  •  Vector3::minFinite, Vector3::maxFinite
-	 
  •  Plane::halfSpaceContainsFinite
-	 
  •  Plane::halfSpaceContains(Vector4)
-     
  •  AABSPTree::getIntersectingMembers(Array) 
-	 
  •  AABSPTree::getIntersectingMembers(GCamera::Frustum) for view-frustum culling
-	 
  •  AABSPTree::getIntersectingMembers(Sphere)
-     
  •  AABox::split
-     
  •  Extended AABox::culledBy, Box::culledBy, and Sphere::culledBy with extra
-	        information for bounding volume hierarchies
-     
  •  G3D::computeNormalMap
-     
  •  Matrix3::fuzzyEq(Matrix3)
-     
  •  Removed System::sleep(0.02) from GLG3D demo to give more accurate performance measure
-     
  •  [ 965824 ] changed link library defaults
-     
  •  serialize/deserialize for int, bool, double, float, std::string
-     
  •  G3D::TextOutput
-     
  •  [ 976924 ] Texture::texelWidth
-     
  •  [ 973413 ] VertexAndPixelShader::ArgList::set can be called more than once per variable
-     
  •  OSWindow::setIcon(std::string filename)
-     
  •  Texture::fromMemory that takes a single image (instead of an array of images)
-     
  •  [972604] RenderDevice::setTextureMatrix(uint, Matrix4)
-     
  •  [972747] Rect2D::center
-     
  •  GImage and Texture now load ICO files
-	 
  •  GL_SAMPLER_1D_ARB, 2D, 3D, CUBE
-	 
  •  Win32Window mouse events
-	 
  •  Added normals to AABox collision results
-     
  •  Fix: [ 1026534 ]various cast bugs using Ref types.  
-          Removed G3D::ReferenceCountedPointer implicit cast to underlying pointer type
-          This is technically an incompatible change, however we found no occurance
-          in the library or demos using this that was not a bug! 
-     
  •  Fix: VAR constructor takes VARAreaRef instead of VARArea* Incompatible change
-     
  •  Fix: ManualCameraController is prevented from looking precisely along the Y-axis, which would cause 
-	           a singularity.
-	 
  •  Fix: Added '?' as a valid symbol Token
-	 
  •  Fix: [ 946235 ] GFont::align right w/ fixed_spacing
-	 
  •  Fix: [ 1001033 ] RenderDevice with 0 texture units
-	 
  •  Fix: GLCaps:: ARB stencil two side -> EXT stencil two side (stencilled shadows were broken)
-	 
  •  Fix: [ 993449 ] vsnprintf crashes MSVC 7
-	 
  •  Fix: [ 991320 ] Pointer truncation Warnings
-	 
  •  Fix: [ 981440 ] AUTO with Texture::fromMemory
-	 
  •  Fix: Plane::halfSpaceContains now works for infinite and semi-infinite points
-     
  •  Fix: [ 979032 ] Quat <-> Matrix3 roundtrip inverts
-	 
  •  Fix: [ 976743 ] document GLCaps functions
-	 
  •  Fix: [ 976746 ] #include GLCaps in g3dall
-	 
  •  Fix: [ 973550 ] sampler2DRect now supported in GLSL shaders (NVIDIA only; ATI drivers are broken)
-	 
  •  Fix: [ 973490 ] Win32Window width/height off by non-client amount
-     
  •  Fix: [ 961827 ] In debug mode, RenderDevice tries to access 
-	            GL_MAX_TEXTURE_IMAGE_UNITS_ARB and an assertion fails on cards that
-				don't support it.
-	 
  •  Fix: Texture binding for VertexAndPixelShader
-   

-

-   

-   Changes in 6.03:
-   
    
-     
  •  Matrix4::approxCoordinateFrame
-     
  •  Vector2(const Vector2int16&) [Giulio]
-     
  •  RenderDevice::setObjectShader
-     
  •  RenderDevice::setVertexAndPixelShader
-     
  •  G3D::RenderDevice supports "..._CURRENT" as an option for most settings
-     
  •  inf -> inf(), nan -> nan(), NAN -> NAN()
-	        This is an incompatible change-- it was needed to fix a bug with the order
-			   of initialization of globals
-     
  •  GImage::sizeInMemory
-     
  •  Defined std::ostream << NetAddress, std::ostream << Vector3 
-     
  •  'build doc' copies the contrib directory to the install directory
-     
  •  LightweightConduit::PacketSizeException
-     
  •  Quat::unitRandom() [Giulio]
-     
  •  Color3::wheelRandom
-     
  •  GImage::save and encode now const [Thanks Arni Mar Jonsson]
-     
  •  LightweightConduit::send that accepts multiple destinations
-	 
  •  ReliableConduit::multisend
-     
  •  Moved IFSBuilder from demos to contrib
-     
  •  LightweightConduit and ReliableConduit send/receive can now take references as well as pointers
-     
  •  RenderDevice::clear() that takes no arguments
-     
  •  RenderDevice::setShader
-     
  •  G3D::GApp now catches ShaderGroup::ArgumentError exceptions
-     
  •  System::operatingSystem() now includes a version number on Linux
-     
  •  SDLWindow no longer initializes the audio system; use SDL_InitSubsytem if you need audio.
-     
  •  Extended GLenumToString with GL_SHADER_OBJECTS_ARB types.
-     
  •  NVIDIA p-buffer: GLX_SAMPLE_BUFFERS_ARB, GLX_SAMPLES_ARB, GLX_FLOAT_COMPONENTS_NV,
-	      glXDestroyGLXPbufferSGIX, glXChooseFBConfigSGIX, glXCreateGLXPbufferSGIX, 
-	      glXCreateContextWithConfigSGIX, glXQueryGLXPbufferSGIX
-     
  •  NVIDIA swap lock: glXJoinSwapGroupNV, glXBindSwapBarrierNV, glXQuerySwapGroupNV, 
-          glXQueryMaxSwapGroupsNV, glXQueryFrameCountNV, glXResetFrameCountNV
-	 
  •  OSWindow::requiresMainLoop, OSWindow::runMainLoop (Beta)
-     
  •  OSWindow::pollEvent, SDLWindow::pollEvent
-     
  •  G3D::GApp accepts an optional OSWindow on construction
-     
  •  G3D::VertexAndPixelShader, G3D::ObjectShader (Beta)
-     
  •  Deprecated GPUProgram, VertexProgram, and PixelProgram (the OpenGL 1.5 shaders
-	      follow a different paradigm than the OpenGL 1.3 ones, so the G3D API must change
-		  to match it).
-     
  •  Support for GL_ARB_vertex_shader, GL_ARB_fragment_shader, and GL_ARB_shader_objects
-     
  •  G3D::drawFeatureEdges
-     
  •  const Array& G3D::MD2Model::PosedModel::objectSpaceFaceNormals();
-	 
  •  G3D::RenderDevice::sendSequentialIndices
-     
  •  Network_Demo
-     
  •  contrib/Win32Window
-	 
  •  contrib/pingtest
-     
  •  contrib/GlutWindow [Morgan and Dan Keefe]
-	 
  •  contrib/ObjModel [Corey Taylor]
-     
  •  G3D::GLCaps
-	 
  •  GAppSettings::logFilename
-	 
  •  Deprecated RenderDevice::suportsOpenGLExtension, RenderDevice::supportsImageFormat,
-	      other supports shortcuts (use GLCaps instead).
-	 
  •  DiscoveryClient::cleanup
-	 
  •  Optimized BinaryInput::readUInt32, readUInt16
-     
  •  Extended network documentation
-     
  •  'fastlib' build target for G3D library developers
-	 
  •  glGetVector2, glGetVector3, glGetVector4
-	 
  •  float * Quat (double * Quat already existed)
-	 
  •  GApp automatically generates g3d-license.txt at runtime ([RFE#856338] CREDIT.TXT)
-	 
  •  G3D::license
-	 
  •  Removed several large files (tag, ppt, exe) from the source zipfile, bringing it down to 3 MB
-     
  •  Improved CoordinateFrame:pointToObjectSpace() (RFE#715996) [Giulio]
-     
  •  [RFE#945935] Make static constants into functions [Giulio]
-     
  •  Fix: LightweightConduit::send verifies that the packet size is smaller than the UDP limit
-	 
  •  Fix: Multitexture on ATI and Wildcat cards
-	 
  •  Fix: Incorrect occlusion in GLG3D_Demo (was caused by global constant problem)
-     
  •  Fix: [BUG#949377] Checks for stencil extensions [Giulio]
-     
  •  Fix: [BUG#922725] Non-multitexture implementation for getTextureState() [Giulio]
-	 
  •  Fix: Restore ambient light color after RenderDevice::popState
-	 
  •  Fix: RenderDevice now initializes OpenGL extensions before testing for multitexture [Erik Cassel, Dan Keefe]
-	 
  •  Fix: Bottom clipping plane of GCamera frustum now correct (was slanted incorrectly, making frustum too big)
-     
  •  Fix: GFont::draw2D now returns correct y value (used to be too small)
-	 
  •  Fix: NetworkDevice now returns useful hostname on Linux (used to be "localhost")
-	 
  •  Fix: The conduit returned from NetworkDevice::createReliableConduit now has ok() == false when connect fails
-	 
  •  Fix: Tangent space computation of constant u, v now correct (was missing a factor of 2, leading to slight errors) [Max McGuire]
-	 
  •  Fix: [ 925456 ] select broken on Linux (Networking was broken on Linux)
-	 
  •  Fix: getDepthBufferValue off by 1 [Andi Fein]
-   

-
-

-   

-   Changes in 6.02:
-   
    
-     
  •  Default constructor for Line.
-     
  •  Various patches to make G3D work with the CAVE [Dan Keefe]
-     
  •  AABox::set
-     
  •  Made OSWindow::setPosition non-const
-     
  •  VARArea now tests for the presence of all VBO extensions, on the freak chance that
-	      a driver has only partial support (due to a bug)
-     
  •  Linux build statically links OpenGL 1.2.1 and loads extensions through OpenGL 1.5
-   	      to work around Wildcat Linux driver bug (Windows and Mac statically link OpenGL 1.1 
-		  and load extensions through OpenGL 1.5)
-     
  •  Triangle stores precomputed edge lengths
-     
  •  Ray-triangle with vertex weights
-     
  •  Highly optimized ray-triangle intersection test [Tomas Moller & Ben Trumbore]
-     
  •  Create a texture from 6 different cube-map filenames
-     
  •  Added contrib directory built as part of the 'doc' target
-	 
  •  contrib/CoreyGWindow: OSWindow implementations for various platforms
-     
  •  AABSPSet::beginRayIntersection [Pete Hopkins]
-     
  •  AABSPTree::beginBoxIntersection
-     
  •  CollisionDetection::intersectionTimeForMovingPointFixedAABox, Ray::intersectionTime(AABox)
-	 [Pierre Terdiman and Andrew Woo]
-     
  •  Triangle::center
-     
  •  Renamed KDTreeSet to AABSPTree, old name is #defined 
-     
  •  RenderDevice now works on cards without multitexture
-     
  •  void glTexCoord(const G3D::Vector4& t); [Dan Keefe]
-	 
  •  Overloaded float, double, and int * Matrix3
-     
  •  Fix: [ 923944 ] Matrix/Quat ambiguity
-     
  •  Fix: fuzzyEq(inf, inf) is true
-	 
  •  Fix: Triangle::randomPoint returns values outside the triangle
-     
  •  Fix: [ 913763 ] tokenTypeToString(Token::END)
-	 
  •  Fix: Compute number of texture coordinates before RenderDevice::setVideoMode [Dan Keefe]
-     
  •  Changed the default depth bits to '0' for wider compatibility
-	      (Fix: Unable to create OpenGL screen: Couldn't find matching GLX visual)
-     
  •  Fix: [912305] Table, Queue, and Set assignment operators do not free old values 
-     
  •  Fix: Separate specular and Multisample on Tablet PC w/ Trident [Dan Keefe]
-     
  •  Fix: Linux debug build now has line numbers
-     
  •  Upgraded to SDL 1.2.7
-	        Fix: [ 838030 ] SDL 1.2.6 blocks prompt
-			Fix: FSAA does not work under SDL
-			Fix: Default Win32 refresh rate
-     
  •  Draw::vertexVectors
-     
  •  New meshes from Brown University: hemisphere.ifs, curvy.ifs, head.ifs,
-	       closed-low-poly-teapot.ifs, bump.ifs
-     
  •  GLight::specular
-     
  •  SDLWindow::setWindowDimensions and setWindowPosition now work on Win32
-     
  •  GWindowSettings::x, GWindowSettings::y, GWindowSettings::center
-     
  •  System::setEnv
-     
  •  [ 909999 ] OSWindow Joystick interface
-     
  •  double * Quat ([ 909305 ] scalar * {quat, vector, matrix})
-	 
  •  Increased the precision of several Vector2 and Vector3 methods
-     
  •  MeshAlg::computeNormals now returns 0 instead of NaN for degenerate normals
-     
  •  Updated main-no-GApp.cpp for 6.02
-     
  •  RenderDevice::screenshotPic can copy from the back buffer
-     
  •  Improved VAR documentation.
-     
  •  If NO_SDL_MAIN is defined, G3D does not attempt to link against sdlmain.lib
-     
  •  UserInput::setPureDeltaMouse
-     
  •  UserInput::mouseXY, mouseX, mouseY
-	 
  •  UserInput::mouseDXY
-	 
  •  Deprecated UserInput keyMapping constructor argument
-     
  •  RenderDevice::setDrawBuffer [Dan Keefe]
-     
  •  GFont::draw3D [Dan Keefe]
-     
  •  GImage::pixel3(x, y) and GImage::pixel4(x, y)
-	 
  •  debugAssert, debugBreak, debugAssertM, etc. all release input grab 
-          when an assertion fails (Win32 and Linux) and restore it when the 
-          program continues (Win32).  This also fixes the DirectInput laggy 
-          cursor that occurs after a break.
-   

-
-

-   

-   Changes in 6.01:
-   
    
-     
  •  Default constructor for G3D::LineSegment
-     
  •  Rect2D::clipPoly (Pete & Morgan)
-	 
  •  Draw::poly2D, Draw::poly2DOutline (Pete & Morgan)
-	 
  •  Added instructions for rotated text to G3D::GFont::draw2D
-	 
  •  Fix: iRandom now compiles correctly under gcc.
-     
  •  Fix: [ 852076 ] Compute better/faster vertex normals in MeshAlg
-	      MeshAlg::computeNormals now weighs adjacent faces by their area
-     
  •  Fix: [ 896028 ] Textures broken on Trident TabletPC (Dan Keefe)
-	 
  •  Fix: [ 860800 ] ManualCameraController cursor jumps
-     
  •  Fix: G3D::UserInput no longer offsets the mouse position by 1/2 pixel
-     
  •  Fix: Alt-Tab no longer toggles the GApp camera before switching windows
-     
  •  Fix: [ 901248 ] Font bounds y-value incorrect
-	 
  •  Fix: G3D::PhysicsFrame::toCoordinateFrame() was rotated by 90 degrees
-     
  •  Fix: [ 895493 ] Radeon 7500 Cube Map
-	 
  •  Fix: G3D::MeshAlg::computeWeld produces linker errors on Linux
-     
  •  G3D::TextInput::peekLineNumber(), G3D::TextInput::peekCharacterNumber()
-     
  •  G3D::GAppSettings::dataDir
-     
  •  html/gettingstarted.html
-     
  •  G3D::MeshAlg::debugCheckConsistency
-     
  •  G3D::MD2Model and G3D::IFSModel now weld their adjacency information
-     
  •  Renamed/retyped G3D::PosedModel::adjacentFaces to G3D::PosedModel::vertices 
-	   (most programs can be fixed by changing the type from Array< Array > to
-	   Array and adjacentVertexArray[v] to vertexArray[v].faceIndex)
-	 
  •  Shadow volumes now use the welded adjacency information
-	 
  •  G3D::PosedModel now offers both welded and non-welded adjacency information
-     
  •  G3D::contains for C-Arrays
-     
  •  Generate .tag files in the build
-     
  •  G3D::MeshAlg::computeAdjacency does not merge colocated vertices
-     
  •  G3D::MeshAlg::computeAdjacency does not remove degenerate faces and edges
-     
  •  G3D::MeshAlg::Vertex
-     
  •  G3D::Vector3::directionOrZero
-     
  •  G3D::GMaterial
-     
  •  ManualCameraController renamed to G3D::FPCameraController
-     
  •  glGetCurrentContext (beta)
-     
  •  G3D::RenderDevice::supportsImageFormat
-     
  •  G3D::Vector3::magnitude
-     
  •  G3D::Vector3::cross() [returns Matrix3]
-     
  •  G3D::Quat changes (API is still in beta)
-	 
  •  G3D::Quat::norm now returns the 2-norm, not the function Dave Eberly uses.
-     
  •  Matrix3 default constructor
-     
  •  Switched UserInput to use SDLWindow internally
-	 
  •  Switched RenderDevice to use SDLWindow internally
-	 
  •  G3D::Window
-	 
  •  G3D::SDLWindow
-     
  •  Renamed G3D::RenderDeviceSettings to G3D::WindowSettings (with a typedef for the old name)
-     
  •  IFSModel now loads models with up to 10 million polygons (like the buddha).
-	 
  •  Internal G3D::KDTreeSet state now private.
-   

-
-

-   

-   Changes in 6.00:
-   
    
-     
  •  FIX: warning: passing `double' for argument 1 of `void G3D::Queue::repackAndRealloc(int)'
-     
  •  Optimized static Matrix3::transpose (36 cycle) and
-	      Matrix3::mul (52 cycle) variations.
-     
  •  Changed some lerp arguments from float to double
-	 
  •  MeshAlg::computeTangentSpaceBasis
-	 
  •  Draw::axes now uses scale to compute axis length
-     
  •  New ParallaxBump demo
-     
  •  Changed several Vector3 return values from float to double
-     
  •  Real-world stars, sun, and moon path (Nick Musurca)
-     
  •  Now compiles under MSVC++ 7.0 (David Baszucki)
-	 
  •  Now compiles under g++ OS/X (Ben Landon)
-     
  •  Changed the default RenderDeviceSettings::alphaBits to 0 in the hope that it
-	      will work with more graphics cards.
-     
  •  Matrix3::fromX methods became factory methods
-     
  •  G3D::sinc
-     
  •  Multi-platform lib directories
-     
  •  Vector3::average(), Color3::average(), Vector3::sum(), Color3::sum()
-     
  •  Ray::reflect, Ray::refract
-     
  •  Physically correct sky model
-     
  •  FIX: Older graphics cards can now initialize properly
-     
  •  Increased fuzzyEpsilon to 0.000001
-     
  •  Color3::max, Color3::min, Color4::max, Color4::min
-     
  •  Array::sortSubArray
-     
  •  GCamera::getClipPlanes now takes a G3D::Array
-     
  •  G3D::AABox
-     
  •  Box::randomInteriorPoint, Box::randomSurfacePoint
-     
  •  Vector3::cosRandom, Vector3::hemiRandom, Vector3::reflectAbout, Vector3::reflectionDirection, Vector3::refractionDirection
-     
  •  log(Color3)
-     
  •  Upgraded to zlib 1.2.1
-     
  •  VAR::valid (Peter)
-     
  •  System::getLocalTime, System::getTicks
-	 
  •  High-performance cycle count and time queries on Linux
-     
  •  UserInput::anyKeyPressed
-     
  •  G3D::Box now provides axes, center, and extent information
-	        (serialization is backwards compatible to 5.xx)
-     
  •  TextInput's exceptions now provide file, line, and character numbers
-	      as well as preformatted error messages in the style of MSVC++.
-     
  •  G3D::Texture::fromGImage
-     
  •  G3D::TextInput now parses hex numbers of the form 0x#####
-     
  •  G3D::CollisionDetection::penetrationDepthForFixedSphereFixedPlane
-	 
  •  G3D::CollisionDetection::penetrationDepthForFixedSphereFixedBox
-     
  •  G3D::beginMarkShadows, G3D::endMarkShadows, G3D::markShadows
-     
  •  GFont::draw2D now returns the string bounds
-     
  •  Sphere::surfaceArea, Sphere::volume, Box::surfaceArea, Box::volume
-     
  •  Two-sided stencil operations
-     
  •  Removed G3D::Real
-     
  •  FIX: [ 855947 ] Fonts are broken on Radeon
-     
  •  Switched vertex arrays to use the new ARB_vertex_buffer_object extension.
-	      Compared to 5.xx rendering speed: NVIDIA/Win32 is the same (fast),
-		  ATI and Linux rendering are about 10x faster.  The API has changed
-		  slightly-- most significant, the vertex, normal, color, etc. arrays
-		  must all come from the same VARArea now.
-     
  •  Disabled the "conditional is constant" level 4 warning on Windows
-	      that is triggered by the for-loop scoping fix.
-     
  •  G3D::SkyParameters::directionalLight
-     
  •  G3D::TextureManager (Peter S. & Morgan)
-     
  •  Flipped skybox X-axis to match OpenGL cube map coordinates
-     
  •  Texture now uses hardware MIP-map generation
-     
  •  Texture::copyFromScreen for cube map faces
-     
  •  RenderDevice::configureReflectionMap
-     
  •  RenderDevice::configureShadowMap
-     
  •  Renamed CFont to GFont
-     
  •  Renamed CImage to GImage
-	 
  •  G3D::Matrix3::getRow
-	 
  •  Added optional argument drawCelestialBodies to Sky::create.
-     
  •  RenderDevice::getTextureMatrix
-     
  •  Depth Textures
-	 
  •  Texture::createEmpty
-	 
  •  RenderDevice::setViewport has flipped the y-axis since version 5.00
-     
  •  ReferenceCountedPointer::isLastReference
-     
  •  Support for textures beyond the number of texture units (which occurs on NVIDIA cards)
-     
  •  G3D::PosedModel
-	 
  •  G3D::IFSModel
-     
  •  G3D::CoordinateFrame::normalToObjectSpace, G3D::CoordinateFrame::normalToWorldSpace
-     
  •  Simplified arguments on Texture::copyFromScreen
-     
  •  Moved Camera in GLG3D to GCamera in G3D
-     
  •  Moved setProjectionAndCameraMatrix from Camera to RenderDevice
-     
  •  Moved G3D::Rect2D to G3D from GLG3D, changed interface
-     
  •  G3D::setRenderMode
-     
  •  G3D::RenderDevice::setSpecularCoefficient, G3D::RenderDevice::setShininess
-     
  •  G3D::GLight
-	 
  •  Renamed G3D::RenderDevice::configureDirectionalLight, configurePointLight to G3D::RenderDevice::setLight
-     
  •  Changed G3D::Rect2D to use doubles
-     
  •  G3D::Camera::setPosition()
-     
  •  G3D::Camera::lookAt()
-	 
  •  G3D::ManualCameraController::setPosition()
-     
  •  G3D::System::getTick, G3D::System::getLocalTime
-     
  •  Fixed [ 839618 ] peak var only updated on reset()
-     
  •  G3D::Array::findIndex (thanks to David Baszucki for the suggestion)
-     
  •  Removed RenderDevice::setProjectionMatrix3D and RenderDevice::setProjectionMatrix2D
-     
  •  RenderDevice::project 
-     
  •  RenderDevice::push2D() now uses the current viewport instead of full screen by default
-     
  •  RenderDevice::getViewport
-     
  •  G3D::SimTime
-     
  •  Sky::render no longer needs a camera matrix (it gets it from the render device)
-     
  •  SkyRef, Sky::create()
-     
  •  Removed Sky::getName
-     
  •  Removed RenderDevice::setAmbientLightLevel (duplicated RenderDevice::setAmbientLightColor)
-     
  •  G3D::GApp, G3D::GApplet, G3D::GAppSettings
-     
  •  RenderDevice::getCardDescription
-     
  •  GPUProgram interface for setting program constants [Peter, Morgan & Dan]
-     
  •  RenderDevice::getModelViewMatrix
-     
  •  RenderDevice::getModelViewProjectionMatrix
-     
  •  RenderDevice::getProjectionMatrix
-     
  •  Documented some more common compiler errors.
-     
  •  Moved RenderDevice::debugDraw methods to the Draw class, changed rendering from
-	      cylinders to lines for wireframe (for performance)
-     
  •  Ray::direction no longer has unit length
-     
  •  Line::point, Line::direction
-	 
  •  LineSegment::endPoint
-     
  •  IFSBuilder loads Brown University Sketch Model (sm) format
-	 
  •  New IFS models: angel, distributor-cap, dragon2, duck, elephant, hippo, hub, mech-part, rotor, sandal, trumpet, venus-torso, woman
-     
  •  RenderDevices are now optionally resizable
-     
  •  MeshAlg::computeWeld
-     
  •  Array::randomize
-     
  •  Table now refuses to push the load factor above 19/20 and stops rehashing
-	 
  •  Table always keeps an odd number of buckets
-     
  •  Sphere::randomInteriorPoint, Sphere::randomSurfacePoint
-	 
  •  LineSegment::randomPoint
-	 
  •  Hardcoded some common paths into demoFindData
-     
  •  Deprecated old RenderDevice::init method.	      
-     
  •  Full screen anti-aliasing (FSAA)
-     
  •  G3D::RenderDeviceSettings
-     
  •  All 2, 3, and 4 character swizzles for Vector2, Vector3, Vector4 are defined.
-     
  •  G3D::rsqrt
-     
  •  Most vector methods are also defined as functions now
-	 
  •  sign(Vector2), sign(Vector3), sign(Vector4)
-	 
  •  G3D::Matrix4
-     
  •  Changed G3D_VER from double to integer
-     
  •  G3D::lerp
-     
  •  Changed G3D::PI, G3D::HALF_PI, and G3D::TWO_PI to #defines
-     
  •  Vector2::clamp, Vector3::clamp, Vector4::clamp
-     
  •  Changed order of arguments to all lerp methods to match DirectX/Cg
-	 
  •  Changed order of arguments to G3D::clamp and G3D::iClamp to match DirectX/Cg
-     
  •  G3D::ManualCameraController::ManualCameraController now requires a G3D::UserInput
-	 
  •  G3D::UserInput::appHasFocus
-     
  •  G3D::ManualCameraController now stops tracking the mouse when the app loses focus
-     
  •  G3D::ManualCameraController::setActive
-	 
  •  G3D::ManualCameraController now manages the mouse cursor instead of G3D::RenderDevice
-	 
  •  G3D::UserInput::getMouseXY, G3D::UserInput::getXY
-     
  •  RenderDevice::debugDrawVertexNormals
-     
  •  GPUProgram, VertexProgram, and PixelProgram now recognize the output of the
-	      Cg compiler and automatically bind constants.
-     
  •  RenderDevice now loads glActiveStencilFaceEXT
-     
  •  RenderDevice::numTextureCoords
-     
  •  Moved changelog to a separate page
-	 
  •  Reformatted overview to be smaller
-     
  •  Added model debugging info to the IFSBuilder display
-     
  •  Welded some broken vertices in the teapot.ifs file
-     
  •  Renamed Font.* to CFont.*
-     
  •  CFont::draw2DString renamed to CFont::draw2D (use a #define to port old code)
-     
  •  MeshAlg
-     
  •  RenderDevice now enables GL_COLOR_MATERIAL by default
-     
  •  msgBox
-     
  •  MD2 model gallery in documentation (Kevin)
-     
  •  MD2Documentor (Kevin)
-     
  •  debugAssertGLOk macro
-     
  •  VertexProgram now supports NVIDIA Vertex Program 2.0
-     
  •  RenderDevice now loads glGenProgramsNV, glDeleteProgramsNV, glBindProgramNV, glLoadProgramNV, glTrackMatrixNV, glProgramParameter4fvNV, glGetProgramParameterfvNV, glGetProgramParameterdvNV extensions	 
-     
  •  VertexProgram and PixelProgram static factory methods now return reference counted values.
-     
  •  Split the reference value from RenderDevice::setStencilTest into setStencilConstant
-     
  •  RenderDevice::STENCIL_INVERT, RenderDevice::STENCIL_REPLACE, RenderDevice::STENCIL_ZERO 
-     
  •  Added brighten argument to Texture::fromFile
-     
  •  Increased CImage JPEG save quality
-     
  •  RenderDevice::screenshot now returns the name of the file that was written
-     
  •  nextPowerOf2 renamed to ceilPow2
-     
  •  System::alignedMalloc, System::alignedFree
-     
  •  Carbon, Crackman, Edenmill, Futurist, Interplanetary,
-          Iomanoid, Starlight, Lesser, and Wild fonts by Ray Larabie.
-          Like all of our fonts, they are free, but please consider a
-          donation to him if you like them.  http://www.larabiefonts.com/
-     
  •  MD2Model_Demo
-     
  •  G3D::MD2Model
-     
  •  FIX: Fixed a bug in Array shrinking that could cause memory corruption
-     
  •  FIX: RenderDevice windows with an aspect ratio of less than 1 now allowed.
-     
  •  FIX: TextInput now parses '#', '~', '~=', '&', '&&', '|', '||' correctly
-     
  •  VARArea::reset() now waits for rendering calls using its vertex
-          arrays to complete before wiping the memory.
-     
  •  G3D::filenameBaseExt, G3D::filenameExt
-     
  •  VARArea::finish()
-     
  •  Milestone
-	 
  •  TextInput::Options::signedNumbers
-     
  •  RenderDevice now loads glFlushVertexArrayRangeNV
-     
  •  Vector2int16
-     
  •  RenderDevice::freeVARSize()
-     
  •  Array now allocates 16-byte aligned pointers.
-     
  •  Decreased the default camera movement rate by 50% for better resolution.
-     
  •  RenderDevice enables GL_NORMALIZE by default
-     
  •  Improved the performance of Array::append/Array::push/Array::next
-	 
  •  Fix: [ 875219 ] Array::sort must use std::sort
-     
  •  Array::next
-     
  •  Array::reverse
-     
  •  PCX file loading
-     
  •  Test images
-     
  •  Color3uint8 as uint8[] addressing
-     
  •  Color4uint8 as uint8[] addressing
-     
  •  Removed const from VAR::pointer
-     
  •  ReferenceCountedPointer::isNull
-     
  •  alwaysAssertM
-     
  •  Log::common, Log::getCommonLogFilename
-     
  •  Switched from static to dynamic linking of zlib
-     
  •  Upgraded to zlib 1.1.3
-     
  •  On Win32 the lib list is automatically updated through pragmas
-          (5.xx programs should revert to linking against default libraries)
-     
  •  Increased default sky quality to 1.00
-     
  •  G3D::CFontRef
-     
  •  RenderDevice now loads all register combiner extensions (NVIDIA only)
-     
  •  Sky::getEnvironmentMap
-     
  •  Sky implementation now uses a cube map (when one is available)
-     
  •  G3D::Sky constructor now takes a render device
-     
  •  Rotated Sky box 90 degrees to match environment maps
-     
  •  G3D::Sky now takes the environment filenames as "sky_*.jpg" instead of "sky_ft.jpg"
-     
  •  Added default filename for Sky constructor
-     
  •  Added caustics textures created with Kjell Andersson's generator http://www.lysator.liu.se/~kand/caustics/
-     
  •  #defined "for" under MSVC so that it obeys C99 scoping rules
-     
  •  System::consoleKeyPressed
-     
  •  System::consoleClearScreen
-     
  •  System::consoleReadKey
-     
  •  NetMessage::type()
-     
  •  Changed the Conduit message protocol to include a message type.
-          The API is backwards compatible to 5.01 even though the protocol is not.
-     
  •  Removed optional argument maxSize from LightweightConduit::receive.
-     
  •  NetAddress::serialize
-     
  •  NetAddress::deserialize
-     
  •  NetAddress == NetAddress
-     
  •  hashCode(NetAddress)
-     
  •  RenderDevice::init now prints ATI or NVIDIA driver version to the log under Windows
-     
  •  readme.html library build instructions now have downloads for required libraries
-     
  •  Library list has changed for Win32 (added version.lib)
-     
  •  System::cpuArchitecture
-     
  •  System::operatingSystem
-     
  •  double-precision Plane::getEquation
-     
  •  Vector2::lerp
-     
  •  Platform specific #defines G3D_WIN32, G3D_LINUX, G3D_OSX
-     
  •  G3D::Array::contains
-     
  •  G3D::Queue::contains
-     
  •  G3D::ImageFormat
-     
  •  G3D::Texture::DIM_CUBE_MAP
-     
  •  G3D::Texture resizes non-power of two textures
-     
  •  G3D::Texture constructors are completely changed from 5.01 (and hopefully easier to use)
-     
  •  G3D::CImage now supports images with alpha
-     
  •  Removed most of the width/height arguments from G3D::Camera methods
-     
  •  BinaryInput::readBytes and BinaryOutput::writeBytes now take void* as an argument to avoid casting
-     
  •  Plane::fromEquation
-     
  •  Removed Plane::getNormal (use Plane::normal instead)
-     
  •  Removed CDTriangle (use G3D::Triangle instead)
-     
  •  Removed Font (use G3D::CFont instead)
-     
  •  FIX: Camera::getClipPlanes now transforms infinite planes correctly.
-     
  •  FIX: The last reference of an RGC pointer assigned to itself no
-               longer tries to collect before re-assigning
-   

-
-

-   

-   Changes in 5.01
-   
    
-     
  •  G3D::tesselateComplexPolygon
-	 
  •  G3D::ConvexPolygon
-	 
  •  G3D::ConvexPolyhedron
-     
  •  G3D::iClamp, G3D::clamp
-	 
  •  G3D::iWrap
-	 
  •  G3D::iRandom, G3D::random
-     
  •  G3D::getFiles
-     
  •  G3D::getDirs
-     
  •  G3D::VAR::pointer
-     
  •  G3D::realWorldLocalTime
-     
  •  G3D::Texture::TRANSPARENT_BORDER
-     
  •  DECLARE_GLFORMATOF
-     
  •  G3D::System::machineEndian
-     
  •  G3D::VertexProgram, G3D::VertexProgramRef, G3D::RenderDevice::setVertexProgram
-     
  •  G3D::PixelProgram, G3D::PixelProgramRef, G3D::RenderDevice::setPixelProgram
-     
  •  G3D::GPUProgram, G3D::GPUProgramRef
-     
  •  G3D::sizeOfGLFormat
-     
  •  G3D::RenderDevice::setVertexAttrib
-     
  •  G3D::Vector2*=Vector2, /= Vector2, * Vector2, / Vector2
-     
  •  glFormatOf
-     
  •  G3D::Color4uint8
-     
  •  G3D::Color3uint8
-     
  •  G3D::Vector3int16
-     
  •  G3D::System::currentProgramFilename
-     
  •  CImage::insertRedAsAlpha
-     
  •  CImage::stripAlpha
-     
  •  Texture::hasAlpha
-     
  •  Added support for TGA with alpha channel
-     
  •  Re-implemented Texture to support a broader range of formats and cleaner implementation.
-     
  •  Fix: Improved Texture::LUMINANCE support
-     
  •  Added == and != overloads for Texture::Ref so that "a != NULL" is now legal and does not require a cast to Texture::Ref.
-     
  •  G3D::CFont is a typedef for G3D::Font to avoid name conflicts with X11 Font under Linux.  In future releases, the name Font will be deprecated.
-     
  •  RenderDevice::setPointSize
-	 
  •  Added a new teapot (teapot.ifs) that is closed, with a properly fitting top.  The classic teapot is now called "utah-teapot.ifs" (Sebastian Schuberth and Simon Winkelbach)
-     
  •  RenderDevice::init now loads glPointParameterfvARB, glPointParameterfARB,
-        glMultiDrawArraysEXT, and glMultiDrawElementsEXT functions.
-     
  •  GLenumToString(4) now returns "GL_TRIANGLES" instead of "GL_LINE_BIT" (both are correct)
-     
  •  Added TextInput::Options to optionally allow C++ comments to
-          be treated as two slashes instead of a comment
-     
  •  Added data/image/meter.jpg, a meter stick texture convenient for testing
-     
  •  Added sansserif, news, and terminal fonts based on Bitstream's free fonts
-     
  •  RenderDevice::numTextureUnits
-     
  •  Added stars to night Sky
-     
  •  Added classic GL dinosaur model as data/ifs/dinosaur.ifs
-     
  •  Documented G3D::glGetProcAddress
-     
  •  Fix: Texture now restored GL_ENABLE bits properly after creation
-     
  •  Fix: Texture::sizeInMemory now accounts for MIP-map levels
-     
  •  Fix: Fonts and skies now adjust their brightness for the screen gamma level
-     
  •  Fix: Strange compilation bug was causing Sky to be black for some programs
-     
  •  resolveFilename
-     
  •  GLProgram_Demo to show how to use vertex programs in G3D
-     
  •  Support for GL_ARB_vertex_program 
-     
  •  Modified ManualCameraController so that diagonal movement does not exceed
-          maximum rate.
-     
  •  Added support for non-GL_FLOAT vertex arrays to RenderDevice
-     
  •  Added support for Wavefront OBJ files to IFSBuilder
-     
  •  Removed duplicate copies of SDL.dll from the source tree
-     
  •  Renamed G3D::CDTriangle to G3D::Triangle
-     
  •  Added several G3D::Triangle methods
-     
  •  Moved CollisionDetection::primaryAxis to Vector3::primaryAxis
-     
  •  Fix: Texture::sizeInMemory now returns correct results for RGB8 textures.
-     
  •  Changed texture constructors in ways that slightly break backwards compatibility
-     
  •  Deprecated several arguments to the texture constructors.
-   

-
-

-   Changes in 5.00
-   
    
-     
  •  Color3::operator*=(const Color3&)
-     
  •  Color3::operator*(const Color3&)
-     
  •  Eliminated duplicate GL headers [James O'Sullivan]
-     
  •  Linux Makefiles [James O'Sullivan, Jordan Parker]
-     
  •  RenderDevice::getProjectionMatrixParams
-     
  •  RenderDevice::debugDrawCylinder
-     
  •  Added an option to not copy input memory for BinaryInput
-     
  •  Added data/ifs/sphere.ifs
-     
  •  Added data/ifs/spikeball.ifs
-     
  •  Added a new (imperfect) demo/tool that converts 3DS and MD2 to IFS.
-     
  •  Added RenderDevice to the Font constructor
-     
  •  Removed RenderDevice from Font::drawString
-     
  •  Included glut32.lib, .dll, and .h (Version 3.7.6) in the distribution. 
-          The windows glut port is by Nate Robbins and is from 
-          http://www.xmission.com/~nate/glut.html. 
-          glut was originally written by Mark Kilgard.
-     
  •  Modified OpenGL headers to work cross platform, with the latest NVIDIA extensions
-     
  •  Changed library name from graphics3D.lib to G3D.lib, same for
-          debug version.
-     
  •  Changed directory structure and added readme.html to explain
-          the new setup.
-     
  •  Changed BinaryInput::readBytes to allow reading onto the stack
-     
  •  Added Vector4::isFinite
-     
  •  G3D::CDTriangle (for 35% faster collision detection)
-     
  •  CollisionDetection::closestPointToRectangle
-     
  •  CollisionDetection::movingSpherePassesThroughFixedBox
-     
  •  CollisionDetection::movingSpherePassesThroughFixedSphere
-     
  •  Changed CollisionDetection::movingXFixedTriangle arguments
-     
  •  CollisionDetection::collisionTimeForMovingSphereFixedSphere
-     
  •  Changed CollisionDetection::distanceToX methods to closestPointToX
-     
  •  Vector3::NAN3
-     
  •  Made Vector3::isUnit fuzzy
-     
  •  Made Vector3::isZero fuzzy
-     
  •  Fix: Texture(std::string, std::string) constructor now works for alpha-only textures. 
-     
  •  FIX: Array now calls copy constructor when resizing
-     
  •  FIX: Triangle-sphere and rectangle-sphere collision detection
-              returned an incorrect collision location; now fixed.
-     
  •  FIX: changed VectorX::isFinite to call isFinite (used to give bad result for NaNs)
-     
  •  FIX: Used the normalized edge to compute intersection in
-            CollisionDetection::distanceToTrianglePerimeter
-     
  •  FIX: Changed the order of corners returned from Box::getFaceCorners so the
-	      face is ccw, facing out
-     
  •  FIX: ManualCameraController::lookAt now faces along the -z axis.
-     
  •  FIX: data/ifs/icosa.ifs model is now an icosahedron
-     
  •  Made Set::begin() and Set::end() const
-     
  •  Added ifdef _WIN32 all over for typedefing types from Windows to Linux and vice versa.
-     
  •  G3D::isNaN, G3D::isFinite
-     
  •  Added a single triangle triangle.ifs file
-     
  •  G3D::LineSegment
-     
  •  RenderDevice::debugDrawRay
-     
  •  CoordinateFrame::toObjectSpace(Ray&)
-     
  •  CoordinateFrame::toObjectSpace(Box&)
-     
  •  CoordinateFrame::toObjectSpace(Sphere&)
-     
  •  Changed CollisionDetection routines to return the surface normal of the
-          surface at the collision location.
-	 
  •  CollisionDetection::collisionTimeForMovingPointFixedCapsule
-	 
  •  CollisionDetection::collisionTimeForMovingSphereFixedCapsule
-     
  •  G3D::Capsule class
-     
  •  Removed e-mail addresses from contributor list to protect them from spammers
-     
  •  Linux port [Hari Khalsa & Chris Kern]
-     
  •  Added serialize and deserialize methods, deserializing constructor to
-	      Vector2, Vector3, Vector4, Color3, Color4, Matrix3, CoordinateFrame, Box,
-		  Sphere, Plane, Ray, Line, Capsule, LineSegment
-	 
  •  Moved parts of Plane.h into Plane.cpp
-     
  •  BinaryInput::readBool8 and BinaryOutput::writeBool8
-     
  •  G3D::System [based on Michael Herf, Rob Wyatt, and Benjamin
-           Jurke's work]
-     
  •  Networking infrastructure: G3D::NetworkDevice, G3D::NetAddress,
-          G3D::ReliableConduit, G3D::LightweightConduit, G3D::NetListener
-     
  •  G3D::Camera
-     
  •  Vector2::toString
-     
  •  G3D::createTempFile
-     
  •  G3D::fileLength
-     
  •  UserInput::setKeyMapping
-     
  •  UserInput::keyCodeToString, UserInput::stringToKeyCode
-     
  •  JPEG library uses createTempFile
-     
  •  JPEG library will allocate up to 6MB before resorting to temp 
-          files-- faster and more reliable
-     
  •  Moved SDL initialization to RenderDevice constructor from the init
-          method so extension can be used earlier
-     
  •  Support for up to 8 texture units, no longer crashes on machines 
-          that have more than 4 units
-     
  •  Made Arrays allocate at least 32 bytes when resized to improve
-          performance of small char stacks
-     
  •  Added UserInput key codes for mouse wheel buttons
-     
  •  UserInput::keyPressed, UserInput::pressedKeys()
-     
  •  UserInput::GKey
-     
  •  Renamed UserInput::poll() to UserInput::endEvents(), added 
-          UserInput::beginEvents()
-     
  •  Moved custom UserInput key codes into an enum so they are 
-          compile-time constants
-     
  •  Changed all  to  for cross-platform [Rob & Chris]
-     
  •  Moved LITTLE_ENDIAN and BIG_ENDIAN constants to an enum and renamed 
-          them to G3D_LITTLE_ENDIAN and G3D_BIG_ENDIAN for cross-platform 
-          [Rob & Chris]
-     
  •  Permanently fixed the precision of Real to be 32-bit float.
-     
  •  RenderDevice now loads the NVIDIA VAR fence extensions.
-     
  •  Renamed RenderDevice::begin to RenderDevice::beginPrimitive, same 
-     for end.
-     
  •  Redesigned the vertex array system; see VAR and VARArea.
-     
  •  Changed GLG3D demo to demonstrate the use of the new VAR and 
-        VARArea classes
-     
  •  CoordinateFrame(Vector3) constructor.
-     
  •  Improved the performance of zero-radius sphere [aka point] 
-          collision detection
-   

-
-

-   

-    Changes in 4.01
-   
    
-     
  •  trimWhitespace()
-     
  •  Pointwise multiplication and division for Vector3
-     
  •  Array::sort now uses > operator by default; two alternative sort methods allow qsort style sorting
-     
  •  Texture::copyFromScreen
-     
  •  Texture::invertY
-     
  •  BinaryInput/BinaryOutput compression (via zlib)
-     
  •  Alpha-only G3D::Texture mode
-     
  •  G3D::Font and fonts in data/font
-     
  •  Array::fastRemove
-     
  •  TextInput [Morgan & Aaron]
-     
  •  Color4::CLEAR
-     
  •  Table [] operator now returns a non-const reference
-     
  •  RenderDevice::getFrameRate, RenderDevice::getTriangleRate, RenderDevice::getTriangleCount
-     
  •  ManualCameraController::setMoveRate, ManualCameraController::setTurnRate
-     
  •  SkyParameters default constructor
-     
  •  Vector2, Vector3, Vector4 isZero(), isUnit(), isFinite()
-     
  •  Vector4::length(), Vector4::squaredLength()
-     
  •  isValidPointer now returns false for 0xFEEEFEEE
-     
  •  RenderDevice checks for texture compression extensions
-     
  •  Restructured the directories for the CPP sources (only affects people who build G3D)
-     
  •  Included NVIDIA and SGI OpenGL headers in the distribution, changed install notes
-     
  •  Fixed a bug that previously prevented textures from being garbage collected
-     
  •  Fixed Line::distance returning values too small
-     
  •  Fixed Plane(normal, point) constructor to compute point from normalized direction [Kevin]
-     
  •  LED font by Matthew Welch daffy-duck@worldnet.att.net
-     
  •  VenusRising font by Ray Larabie drowsy@cheerful.com
-     
  •  VideoFreak font by Jakob Fischer pizzadude@pizzadude.dk
-   

-
-

-   

-   Changes in 4.00
-   
    
-     
  •  Moved texture combine modes from Textures onto RenderDevice texture units
-     
  •  Documented RenderDevice::getHDC() (Windows only)
-     
  •  Renamed RenderDevice::swapBuffers() to RenderDevice::endFrame(), added corresponding RenderDevice::beginFrame()
-     
  •  Moved getNumJoySticks from RenderDevice to UserInput
-     
  •  Added TEX_ADD combine mode
-     
  •  Table::getKeys and Set::getMembers now have overloads that take an Array as input.
-     
  •  BinaryOutput::getCArray
-     
  •  RenderDevice::getObjectToWorldMatrix(), RenderDevice::getCameraToWorldMatrix()
-     
  •  RenderDevice::debugDrawAxes(), RenderDevice::debugDrawBox(), RenderDevice::debugDrawSphere()
-     
  •  Color3::Color3(const Vector3&) and Color4::Color4(const Vector4&)
-     
  •  Moved hashCode(const Vector3&) and hashCode(const Vector4&) to the global namespace [Kevin]
-     
  •  isValidPointer now returns false for 0xCCCCCCCC and 0xDEADBEEF
-     
  •  Fix: RenderDevice::setPolygonOffset now affects polygons rendered in line and point mode
-     
  •  Fix: Sun is now invisible after it goes below the horizon
-     
  •  Fix: BinaryInput now supports endian-ness correctly in memory read mode
-     
  •  Fix: Table.copyFrom and copy constructor now work
-   

-
-

-   

-   Changes in 3.02
-   
    
-     
  •  Built libraries using "Multithreaded DLL" [Kevin & Darius]
-     
  •  Added depth, color, and stencil bit depth preferences to G3D::RenderDevice
-     
  •  G3D::Sky (plus sky directory in the data distribution)
-     
  •  Sky cube data [Jauhn Dabz, jauhn@yahoo.com, http://nullpoint.fragland.net]
-     
  •  G3D::UserInput
-     
  •  G3D::ManualCameraController
-     
  •  G3D::SkyParameters
-     
  •  G3D::toSeconds, G3D::AMPM, G3D::GameTime, G3D::RealTime
-     
  •  G3D::RenderDevice::project
-     
  •  G3D::linearSpline
-     
  •  G3D::Color3::fromARGB and G3D::Color4::fromARGB
-     
  •  Added non-const G3D::Array::last() [Kevin]
-     
  •  Modified G3D::RenderDevice::configureDirectionalLight to operate in world space
-     
  •  Fix: Flipped the y-axis of G3D::RenderDevice::getDepthBufferValue so it matches the documentation.
-     
  •  Removed brief descriptions from documentation
-     
  •  Removed sqrt, sin, cos, etc. that conflict with standard library names
-     
  •  Removed TWO_PI constant
-     
  •  Removed G3D::Matrix3 virtual destructor
-     
  •  Removed G3D::Quat virtual destructor [Kevin]
-   

-
-  

-   Changes in 3.01
-   
    
-     
  •  Changed an assert() to debugAssert() in Queue.h
-     
  •  G3D::Table doesn't grow the number of buckets under bad hash codes [Morgan & Darius]
-     
  •  G3D::Table allocates only 10 initial buckets
-     
  •  G3D::Table::debugGetLoad()
-     
  •  G3D::CollisionDetection::collisionTimeForMovingPointFixedRectangle
-     
  •  G3D::CollisionDetection::collisionTimeForMovingPointFixedBox
-     
  •  G3D::Ray::intersectionTime, G3D::Ray::unit()
-     
  •  G3D::Log [Morgan & Aaron]
-     
  •  G3D::RenderDevice (OpenGL state abstraction.  VertexBuffer support is beta only)
-     
  •  G3D::Texture (includes texture compression, image loading, and texture rectangle)
-     
  •  Added a comment to the vector classes noting that they can't be sublcassed [Kevin Egan]
-   

-

-   Changes in 3.00
-   
    
-     
  •  G3D::NEWLINE
-     
  •  writeStringToFile
-     
  •  Fixed empty stringJoin bug
-     
  •  Fixed parseFilename with no path bug
-     
  •  Vector3::INF3, Vector3::ZERO3
-     
  •  G3D::PhysicsFrame (beta-- this interface is going to change in 4.00)
-     
  •  G3D::Vector4
-     
  •  G3D::Queue
-     
  •  Default constructor for G3D::CImage
-     
  •  G3D::isValidHeapPointer, G3D::isValidPointer
-     
  •  G3D::Ray
-     
  •  CImage copy constructor, CImage::load
-     
  •  Removed \#pragma once for gcc compatibility
-     
  •  Renamed several hashcode methods to hashCode
-     
  •  Fixed fuzzy math to work with infinite numbers
-     
  •  Fixed Table::remove(), Set::remove() bug [Darius Jazayeri]
-     
  •  G3D::CoordinateFrame.toObjectSpace(Vector4), G3D::CoordinateFrame.toWorldSpace(Vector4)
-     
  •  Added the data directory
-     
  •  G3D::CollisionDetection
-     
  •  G3D::Sphere::culledBy()
-     
  •  Added the GLG3D library [Morgan McGuire & Seth Block]
-     
  •  Changed SDL_GL_Demo to use GLG3D, rotate triangle, and use color blending
-     
  •  Fixed debugPrintf to handle long strings on Win32
-     
  •  Wrapped the MMX headers with \#ifdefs [Nate Miller]
-     
  •  Moved OpenGL code out of CoordinateFrame.h/cpp
-     
  •  Fixed BinaryInput readVector*, readColor* to read in correct order [Nate Miller]
-     
  •  BinaryInput::readVector4, BinaryInput::readColor4, BinaryOutput::writeVector4, BinaryOutput::writeColor4
-     
  •  IFS_Demo for loading IFS files, dealing with models in OpenGL [Nate Miller]
-   

-
-

-   

-   Changes in 2.00
-   
    
-     
  •  Vector2 members renamed to x,y from s,t
-     
  •  Added SDL_GL_Demo and Win32_Demo
-     
  •  Removed Group
-   

-
-

-   

-   Changes in 1.10
-   
    
-     
  •  CImage, color conversion routines [Morgan McGuire, John Chisholm, and Edward Resnick]
-     
  •  Array dereference for BinaryInput
-     
  •  BinaryInput from memory
-     
  •  BinaryOutput to memory
-     
  •  toUpper(std::string), toLower(std::string)
-     
  •  Group::clear()
-     
  •  inf, nan as global constants (double precision)
-     
  •  Can iterate over const Tables
-     
  •  Table::deleteValues()
-     
  •  Fixed an off-by-one bug in BinaryInput::readString()
-     
  •  beginsWith() and wordWrap() string utilities
-     
  •  prompt dialogs have fixed width font [Kurt Miller]
-     
  •  iMax(), iMin()
-     
  •  Array::sort()
-     
  •  stringCompare(), stringPtrCompare()
-     
  •  readFileAsString()
-     
  •  Fixed textPrompt() to wait for input
-     
  •  BinaryInput.getFilename(), BinaryOutput.getFilename()
-     
  •  ReferenceCount [Justin Miller]
-     
  •  endsWith()
-     
  •  stringSplit(), stringJoin()
-     
  •  Renamed format.* to stringutils.*
-     
  •  fileExists(), parseFilename(), createDirectory(), copyFile()
-     
  •  highestBit() [Jukka Liimatta]
-     
  •  flipRGBVertical()
-     
  •  Changed all header guards to use G3D_ prefix
-     
  •  ConvexPolyhedron
-     
  •  Virtual destructors on almost all objects.
-     
  •  RGBtoBGR()
-     
  •  Color4
-     
  •  Array::pop(bool shrinkArray=true)
-     
  •  Vector2::isFinite, Vector2::fuzzyEq, Vector::fuzzyNe
-   

-   

-
-

-   Changes in 1.09
-   
    
-     
  •  Removed pointer hash [Aaron Orenstein]
-     
  •  Changed some includes from quotes to pointy brackets [Aaron Orenstein]
-     
  •  Sphere::toString() 
-     
  •  Plane::toString()
-     
  •  Added a change log
-   

-
-   */
diff --git a/externals/g3dlite/doc-files/contributors.dox b/externals/g3dlite/doc-files/contributors.dox
deleted file mode 100644
index 3cd946a0bf1..00000000000
--- a/externals/g3dlite/doc-files/contributors.dox
+++ /dev/null
@@ -1,85 +0,0 @@
-/**
-@page contributors G3D Developer Credits
-
- Team Members
- 
7.01 Release Team
- 
Morgan McGuire [Williams College] - Project Manager
- 
Corey Taylor [EA] - Assistant Project Manager and Linux Lead
- 
Casey O'Donnell [RPI] - OS X Lead
- 
Dan Keefe [Brown University] - Developer
- 
Kyle Whitson [Williams College] - Developer
- 
Danny Yuxing Huang [Williams College] - Developer
-
- Previous Contributors and Cited Sources 
This library
- contains code and resources contributed by the following people, or
- based open code and articles by them.  Starred (*) developers are
- previous members of the %G3D team.
-
-   
David Baszucki
-   
Seth Block
-   
Nicholas Bray
-   
Nick Capens
-   
Erik Cassel
-   
John Chisholm*
-   
Jauhn Dabz
-   
Erik de Castro Lopo 
-   
Rich Deeson*
-   
Chris Demetriou
-   
L. Peter Deutsch
-   
Dmitri*
-   
Dave Eberly
-   
Kevin Egan*
-   
Cass Everitt
-   
Dan Fast*
-   
Andi Fein
-   
Jakob Fischer
-   
Dan Keefe*
-   
Harishabd Khalsa
-   
Nicolai Haehnle
-   
Michael Herf
-   
Daniel Hilferty*
-   
Pete Hopkins
-   
Danny Yuxing Huang
-   
Peter Hunt
-   
Robert Hunter
-   
Ed Johnson
-   
Benjamin Jurke
-   
Chris Kern
-   
Independent JPEG Group
-   
Darius Jazayeri
-   
Ben Landon*
-   
Thomas G. Lane
-   
Ray Larabie
-   
Jukka Liimatta
-   
Giulio Mainardi
-   
Jeff Marsceill
-   
Max McGuire
-   
Morgan McGuire
-   
Justin Miller
-   
Kurt Miller
-   
Nate Miller
-   
Tomas Moller
-   
Eric Muller*
-   
Nick Musurca
-   
Akita Noek
-   
James O'Sullivan*
-   
Aaron Orenstein
-   
Jordan Parker
-   
Edward Resnick
-   
Alex Rice
-   
Jack Ritter
-   
Nate Robbins
-   
Joshua Schpok*
-   
Sebastian Schubert
-   
SGI
-   
Ben Shine*
-   
Peter Sibley*
-    
Gabe Taubman*
-   
Corey Taylor*
-   
Pierre Terdiman
-   
Ben Trumbore
-   
Matthew Welch
-   
Simon Winkelbach
-   
Laura Wollstadt
-   
Andrew Woo
-*/
diff --git a/externals/g3dlite/doc-files/license.dox b/externals/g3dlite/doc-files/license.dox
deleted file mode 100644
index b4302651fbf..00000000000
--- a/externals/g3dlite/doc-files/license.dox
+++ /dev/null
@@ -1,120 +0,0 @@
-/** @page license License
-
-\htmlonly
-

-
-Introduction
-
-Installation 

-\endhtmlonly
-
-@section intent Intent of License
-   (This section is informal and not legally binding.)
-
-   
 This library is free code-- you can use it without charge and
-   it is minimally legally encumbered.  Unlike some other free libraries,
-   we do not require you to release
-   your source code or make your own program open source.
-
-   
 I intend the license (below) to protect me and the other
-   contributors from liability and allow you to use the source however
-   you want.  You can make your own closed or open-source programs,
-   sell them, give them away, whatever.
-
-   

-   You have an obligation to say "this software is based in part on
-   the work of the Independent JPEG Group" in your documentation or
-   application help if you use the G3D::GImage class because it is based on
-   the IJG library.  The OpenGL headers and ZLib headers included may
-   be freely distributed provided their copyright notices remain
-   intact. 
-
-   

-   For convenience, G3D::license is a function that returns the license
-   string you must put in your documentation.  G3D::GApp will automatically
-   write a file (g3d-license.txt) to disk with the contents of this
-   license unless you tell it not to.
-   
-   

-   Most of the data resources have either entered the public domain and have
-   been in several published papers or are data that I have explicitly 
-   received permission to distribute with G3D.  The G3D fonts are actually font
-   images, not TrueType font descriptions and may be freely
-   distributed.  As a rule of thumb, you can freely use and distribute
-   anything you find in the data directory but may need permission to use
-   it in a commercial product.  Check the various copyright.txt files
-   in the data directories for specific information.
-
-   
 
-
-   You are required by the BSD license to acknowledge G3D in your 
-   documentation.  This can be as minimal as a note buried in the
-   fine print at the end of a manual or a text file accompanying
-   your program.  I appreciate it if you acknowledged the library
-   more publicly but you aren't required to.
-
-   

-   
-   Likewise, you are encouraged but not required to submit patches to
-   improve the library for the benefit of all.  E-mail me with bugs,
-   patches, and questions.  

-
-   -Morgan McGuire
-   <matrix@graphics3d.com>
-    
-   

-
-  @section reallicense License
-
-   G3D is licensed under the BSD license, 
-   with portions controlled by the IJG license, 
-   PNG Reference Library license and 
-   GNU Lesser General Public License (LGPL).
-
-  
-   
-   
This product uses software from the G3D project (http://g3d-cpp.sf.net)
-   
Copyright © 2000-2008, Morgan McGuire
-   
All rights reserved.
-   

-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-   

-   Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-   

-   Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-   

-   Neither the name of Morgan McGuire, Williams College, Brown University, nor the names of
-   its contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-   

-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-   THE POSSIBILITY OF SUCH DAMAGE.
-  
-
-   

-      You must also agree to be bound by the terms of the Independent JPEG
-      Group license for the portions of this library that are based
-      on the work of the Independent JPEG Group, if you use those
-      portions.  Note: if you do not use the G3D::GImage class,
-      this clause does not apply to you because the linker will
-      strip that code from your project.  The IJG-README.TXT file contains the
-      Independent JPEG Group license.
-
-   
-
- */
\ No newline at end of file
diff --git a/externals/g3dlite/win/VC90/g3dlite.vcproj b/externals/g3dlite/win/VC90/g3dlite.vcproj
deleted file mode 100644
index e76d610ab69..00000000000
--- a/externals/g3dlite/win/VC90/g3dlite.vcproj
+++ /dev/null
@@ -1,463 +0,0 @@
-
-
-	
-		
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-	
-		
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-
diff --git a/externals/g3dlite/win/g3dlite.sln b/externals/g3dlite/win/g3dlite.sln
deleted file mode 100644
index 875374e3944..00000000000
--- a/externals/g3dlite/win/g3dlite.sln
+++ /dev/null
@@ -1,25 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g3dlite", "VC90\g3dlite.vcproj", "{8072769E-CF10-48BF-B9E1-12752A5DAC6E}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|Win32.Build.0 = Debug|Win32
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|x64.ActiveCfg = Debug|x64
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|x64.Build.0 = Debug|x64
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|Win32.ActiveCfg = Release|Win32
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|Win32.Build.0 = Release|Win32
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|x64.ActiveCfg = Release|x64
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/externals/g3dlite/zip.lib/include/zip/ioapi.h b/externals/g3dlite/zip.lib/include/zip/ioapi.h
deleted file mode 100644
index 7d457baab34..00000000000
--- a/externals/g3dlite/zip.lib/include/zip/ioapi.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* ioapi.h -- IO base function header for compress/uncompress .zip
-   files using zlib + zip or unzip API
-
-   Version 1.01e, February 12th, 2005
-
-   Copyright (C) 1998-2005 Gilles Vollant
-*/
-
-#ifndef _ZLIBIOAPI_H
-#define _ZLIBIOAPI_H
-
-
-#define ZLIB_FILEFUNC_SEEK_CUR (1)
-#define ZLIB_FILEFUNC_SEEK_END (2)
-#define ZLIB_FILEFUNC_SEEK_SET (0)
-
-#define ZLIB_FILEFUNC_MODE_READ      (1)
-#define ZLIB_FILEFUNC_MODE_WRITE     (2)
-#define ZLIB_FILEFUNC_MODE_READWRITEFILTER (3)
-
-#define ZLIB_FILEFUNC_MODE_EXISTING (4)
-#define ZLIB_FILEFUNC_MODE_CREATE   (8)
-
-
-#ifndef ZCALLBACK
-
-#if (defined(WIN32) || defined (WINDOWS) || defined (_WINDOWS)) && defined(CALLBACK) && defined (USEWINDOWS_CALLBACK)
-#define ZCALLBACK CALLBACK
-#else
-#define ZCALLBACK
-#endif
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, const char* filename, int mode));
-typedef uLong  (ZCALLBACK *read_file_func) OF((voidpf opaque, voidpf stream, void* buf, uLong size));
-typedef uLong  (ZCALLBACK *write_file_func) OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
-typedef long   (ZCALLBACK *tell_file_func) OF((voidpf opaque, voidpf stream));
-typedef long   (ZCALLBACK *seek_file_func) OF((voidpf opaque, voidpf stream, uLong offset, int origin));
-typedef int    (ZCALLBACK *close_file_func) OF((voidpf opaque, voidpf stream));
-typedef int    (ZCALLBACK *testerror_file_func) OF((voidpf opaque, voidpf stream));
-
-typedef struct zlib_filefunc_def_s
-{
-    open_file_func      zopen_file;
-    read_file_func      zread_file;
-    write_file_func     zwrite_file;
-    tell_file_func      ztell_file;
-    seek_file_func      zseek_file;
-    close_file_func     zclose_file;
-    testerror_file_func zerror_file;
-    voidpf              opaque;
-} zlib_filefunc_def;
-
-
-
-void fill_fopen_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def));
-
-#define ZREAD(filefunc,filestream,buf,size) ((*((filefunc).zread_file))((filefunc).opaque,filestream,buf,size))
-#define ZWRITE(filefunc,filestream,buf,size) ((*((filefunc).zwrite_file))((filefunc).opaque,filestream,buf,size))
-#define ZTELL(filefunc,filestream) ((*((filefunc).ztell_file))((filefunc).opaque,filestream))
-#define ZSEEK(filefunc,filestream,pos,mode) ((*((filefunc).zseek_file))((filefunc).opaque,filestream,pos,mode))
-#define ZCLOSE(filefunc,filestream) ((*((filefunc).zclose_file))((filefunc).opaque,filestream))
-#define ZERROR(filefunc,filestream) ((*((filefunc).zerror_file))((filefunc).opaque,filestream))
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
diff --git a/externals/g3dlite/zip.lib/include/zip/unzip.h b/externals/g3dlite/zip.lib/include/zip/unzip.h
deleted file mode 100644
index b247937c807..00000000000
--- a/externals/g3dlite/zip.lib/include/zip/unzip.h
+++ /dev/null
@@ -1,354 +0,0 @@
-/* unzip.h -- IO for uncompress .zip files using zlib
-   Version 1.01e, February 12th, 2005
-
-   Copyright (C) 1998-2005 Gilles Vollant
-
-   This unzip package allow extract file from .ZIP file, compatible with PKZip 2.04g
-     WinZip, InfoZip tools and compatible.
-
-   Multi volume ZipFile (span) are not supported.
-   Encryption compatible with pkzip 2.04g only supported
-   Old compressions used by old PKZip 1.x are not supported
-
-
-   I WAIT FEEDBACK at mail info@winimage.com
-   Visit also http://www.winimage.com/zLibDll/unzip.htm for evolution
-
-   Condition of use and distribution are the same than zlib :
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-
-*/
-
-/* for more info about .ZIP format, see
-      http://www.info-zip.org/pub/infozip/doc/appnote-981119-iz.zip
-      http://www.info-zip.org/pub/infozip/doc/
-   PkWare has also a specification at :
-      ftp://ftp.pkware.com/probdesc.zip
-*/
-
-#ifndef _unz_H
-#define _unz_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef _ZLIB_H
-#include "zlib.h"
-#endif
-
-#ifndef _ZLIBIOAPI_H
-#include "ioapi.h"
-#endif
-
-#if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
-/* like the STRICT of WIN32, we define a pointer that cannot be converted
-    from (void*) without cast */
-typedef struct TagunzFile__ { int unused; } unzFile__;
-typedef unzFile__ *unzFile;
-#else
-typedef voidp unzFile;
-#endif
-
-
-#define UNZ_OK                          (0)
-#define UNZ_END_OF_LIST_OF_FILE         (-100)
-#define UNZ_ERRNO                       (Z_ERRNO)
-#define UNZ_EOF                         (0)
-#define UNZ_PARAMERROR                  (-102)
-#define UNZ_BADZIPFILE                  (-103)
-#define UNZ_INTERNALERROR               (-104)
-#define UNZ_CRCERROR                    (-105)
-
-/* tm_unz contain date/time info */
-typedef struct tm_unz_s
-{
-    uInt tm_sec;            /* seconds after the minute - [0,59] */
-    uInt tm_min;            /* minutes after the hour - [0,59] */
-    uInt tm_hour;           /* hours since midnight - [0,23] */
-    uInt tm_mday;           /* day of the month - [1,31] */
-    uInt tm_mon;            /* months since January - [0,11] */
-    uInt tm_year;           /* years - [1980..2044] */
-} tm_unz;
-
-/* unz_global_info structure contain global data about the ZIPfile
-   These data comes from the end of central dir */
-typedef struct unz_global_info_s
-{
-    uLong number_entry;         /* total number of entries in
-                       the central dir on this disk */
-    uLong size_comment;         /* size of the global comment of the zipfile */
-} unz_global_info;
-
-
-/* unz_file_info contain information about a file in the zipfile */
-typedef struct unz_file_info_s
-{
-    uLong version;              /* version made by                 2 bytes */
-    uLong version_needed;       /* version needed to extract       2 bytes */
-    uLong flag;                 /* general purpose bit flag        2 bytes */
-    uLong compression_method;   /* compression method              2 bytes */
-    uLong dosDate;              /* last mod file date in Dos fmt   4 bytes */
-    uLong crc;                  /* crc-32                          4 bytes */
-    uLong compressed_size;      /* compressed size                 4 bytes */
-    uLong uncompressed_size;    /* uncompressed size               4 bytes */
-    uLong size_filename;        /* filename length                 2 bytes */
-    uLong size_file_extra;      /* extra field length              2 bytes */
-    uLong size_file_comment;    /* file comment length             2 bytes */
-
-    uLong disk_num_start;       /* disk number start               2 bytes */
-    uLong internal_fa;          /* internal file attributes        2 bytes */
-    uLong external_fa;          /* external file attributes        4 bytes */
-
-    tm_unz tmu_date;
-} unz_file_info;
-
-extern int ZEXPORT unzStringFileNameCompare OF ((const char* fileName1,
-                                                 const char* fileName2,
-                                                 int iCaseSensitivity));
-/*
-   Compare two filename (fileName1,fileName2).
-   If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
-   If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
-                                or strcasecmp)
-   If iCaseSenisivity = 0, case sensitivity is defaut of your operating system
-    (like 1 on Unix, 2 on Windows)
-*/
-
-
-extern unzFile ZEXPORT unzOpen OF((const char *path));
-/*
-  Open a Zip file. path contain the full pathname (by example,
-     on a Windows XP computer "c:\\zlib\\zlib113.zip" or on an Unix computer
-     "zlib/zlib113.zip".
-     If the zipfile cannot be opened (file don't exist or in not valid), the
-       return value is NULL.
-     Else, the return value is a unzFile Handle, usable with other function
-       of this unzip package.
-*/
-
-extern unzFile ZEXPORT unzOpen2 OF((const char *path,
-                                    zlib_filefunc_def* pzlib_filefunc_def));
-/*
-   Open a Zip file, like unzOpen, but provide a set of file low level API
-      for read/write the zip file (see ioapi.h)
-*/
-
-extern int ZEXPORT unzClose OF((unzFile file));
-/*
-  Close a ZipFile opened with unzipOpen.
-  If there is files inside the .Zip opened with unzOpenCurrentFile (see later),
-    these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
-  return UNZ_OK if there is no problem. */
-
-extern int ZEXPORT unzGetGlobalInfo OF((unzFile file,
-                                        unz_global_info *pglobal_info));
-/*
-  Write info about the ZipFile in the *pglobal_info structure.
-  No preparation of the structure is needed
-  return UNZ_OK if there is no problem. */
-
-
-extern int ZEXPORT unzGetGlobalComment OF((unzFile file,
-                                           char *szComment,
-                                           uLong uSizeBuf));
-/*
-  Get the global comment string of the ZipFile, in the szComment buffer.
-  uSizeBuf is the size of the szComment buffer.
-  return the number of byte copied or an error code <0
-*/
-
-
-/***************************************************************************/
-/* Unzip package allow you browse the directory of the zipfile */
-
-extern int ZEXPORT unzGoToFirstFile OF((unzFile file));
-/*
-  Set the current file of the zipfile to the first file.
-  return UNZ_OK if there is no problem
-*/
-
-extern int ZEXPORT unzGoToNextFile OF((unzFile file));
-/*
-  Set the current file of the zipfile to the next file.
-  return UNZ_OK if there is no problem
-  return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
-*/
-
-extern int ZEXPORT unzLocateFile OF((unzFile file,
-                     const char *szFileName,
-                     int iCaseSensitivity));
-/*
-  Try locate the file szFileName in the zipfile.
-  For the iCaseSensitivity signification, see unzStringFileNameCompare
-
-  return value :
-  UNZ_OK if the file is found. It becomes the current file.
-  UNZ_END_OF_LIST_OF_FILE if the file is not found
-*/
-
-
-/* ****************************************** */
-/* Ryan supplied functions */
-/* unz_file_info contain information about a file in the zipfile */
-typedef struct unz_file_pos_s
-{
-    uLong pos_in_zip_directory;   /* offset in zip file directory */
-    uLong num_of_file;            /* # of file */
-} unz_file_pos;
-
-extern int ZEXPORT unzGetFilePos(
-    unzFile file,
-    unz_file_pos* file_pos);
-
-extern int ZEXPORT unzGoToFilePos(
-    unzFile file,
-    unz_file_pos* file_pos);
-
-/* ****************************************** */
-
-extern int ZEXPORT unzGetCurrentFileInfo OF((unzFile file,
-                         unz_file_info *pfile_info,
-                         char *szFileName,
-                         uLong fileNameBufferSize,
-                         void *extraField,
-                         uLong extraFieldBufferSize,
-                         char *szComment,
-                         uLong commentBufferSize));
-/*
-  Get Info about the current file
-  if pfile_info!=NULL, the *pfile_info structure will contain somes info about
-        the current file
-  if szFileName!=NULL, the filemane string will be copied in szFileName
-            (fileNameBufferSize is the size of the buffer)
-  if extraField!=NULL, the extra field information will be copied in extraField
-            (extraFieldBufferSize is the size of the buffer).
-            This is the Central-header version of the extra field
-  if szComment!=NULL, the comment string of the file will be copied in szComment
-            (commentBufferSize is the size of the buffer)
-*/
-
-/***************************************************************************/
-/* for reading the content of the current zipfile, you can open it, read data
-   from it, and close it (you can close it before reading all the file)
-   */
-
-extern int ZEXPORT unzOpenCurrentFile OF((unzFile file));
-/*
-  Open for reading data the current file in the zipfile.
-  If there is no error, the return value is UNZ_OK.
-*/
-
-extern int ZEXPORT unzOpenCurrentFilePassword OF((unzFile file,
-                                                  const char* password));
-/*
-  Open for reading data the current file in the zipfile.
-  password is a crypting password
-  If there is no error, the return value is UNZ_OK.
-*/
-
-extern int ZEXPORT unzOpenCurrentFile2 OF((unzFile file,
-                                           int* method,
-                                           int* level,
-                                           int raw));
-/*
-  Same than unzOpenCurrentFile, but open for read raw the file (not uncompress)
-    if raw==1
-  *method will receive method of compression, *level will receive level of
-     compression
-  note : you can set level parameter as NULL (if you did not want known level,
-         but you CANNOT set method parameter as NULL
-*/
-
-extern int ZEXPORT unzOpenCurrentFile3 OF((unzFile file,
-                                           int* method,
-                                           int* level,
-                                           int raw,
-                                           const char* password));
-/*
-  Same than unzOpenCurrentFile, but open for read raw the file (not uncompress)
-    if raw==1
-  *method will receive method of compression, *level will receive level of
-     compression
-  note : you can set level parameter as NULL (if you did not want known level,
-         but you CANNOT set method parameter as NULL
-*/
-
-
-extern int ZEXPORT unzCloseCurrentFile OF((unzFile file));
-/*
-  Close the file in zip opened with unzOpenCurrentFile
-  Return UNZ_CRCERROR if all the file was read but the CRC is not good
-*/
-
-extern int ZEXPORT unzReadCurrentFile OF((unzFile file,
-                      voidp buf,
-                      unsigned len));
-/*
-  Read bytes from the current file (opened by unzOpenCurrentFile)
-  buf contain buffer where data must be copied
-  len the size of buf.
-
-  return the number of byte copied if somes bytes are copied
-  return 0 if the end of file was reached
-  return <0 with error code if there is an error
-    (UNZ_ERRNO for IO error, or zLib error for uncompress error)
-*/
-
-extern z_off_t ZEXPORT unztell OF((unzFile file));
-/*
-  Give the current position in uncompressed data
-*/
-
-extern int ZEXPORT unzeof OF((unzFile file));
-/*
-  return 1 if the end of file was reached, 0 elsewhere
-*/
-
-extern int ZEXPORT unzGetLocalExtrafield OF((unzFile file,
-                                             voidp buf,
-                                             unsigned len));
-/*
-  Read extra field from the current file (opened by unzOpenCurrentFile)
-  This is the local-header version of the extra field (sometimes, there is
-    more info in the local-header version than in the central-header)
-
-  if buf==NULL, it return the size of the local extra field
-
-  if buf!=NULL, len is the size of the buffer, the extra header is copied in
-    buf.
-  the return value is the number of bytes copied in buf, or (if <0)
-    the error code
-*/
-
-/***************************************************************************/
-
-/* Get the current file offset */
-extern uLong ZEXPORT unzGetOffset (unzFile file);
-
-/* Set the current file offset */
-extern int ZEXPORT unzSetOffset (unzFile file, uLong pos);
-
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _unz_H */
diff --git a/externals/g3dlite/zip.lib/include/zip/zip.h b/externals/g3dlite/zip.lib/include/zip/zip.h
deleted file mode 100644
index acacce83b9b..00000000000
--- a/externals/g3dlite/zip.lib/include/zip/zip.h
+++ /dev/null
@@ -1,235 +0,0 @@
-/* zip.h -- IO for compress .zip files using zlib
-   Version 1.01e, February 12th, 2005
-
-   Copyright (C) 1998-2005 Gilles Vollant
-
-   This unzip package allow creates .ZIP file, compatible with PKZip 2.04g
-     WinZip, InfoZip tools and compatible.
-   Multi volume ZipFile (span) are not supported.
-   Encryption compatible with pkzip 2.04g only supported
-   Old compressions used by old PKZip 1.x are not supported
-
-  For uncompress .zip file, look at unzip.h
-
-
-   I WAIT FEEDBACK at mail info@winimage.com
-   Visit also http://www.winimage.com/zLibDll/unzip.html for evolution
-
-   Condition of use and distribution are the same than zlib :
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-
-*/
-
-/* for more info about .ZIP format, see
-      http://www.info-zip.org/pub/infozip/doc/appnote-981119-iz.zip
-      http://www.info-zip.org/pub/infozip/doc/
-   PkWare has also a specification at :
-      ftp://ftp.pkware.com/probdesc.zip
-*/
-
-#ifndef _zip_H
-#define _zip_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef _ZLIB_H
-#include "zlib.h"
-#endif
-
-#ifndef _ZLIBIOAPI_H
-#include "ioapi.h"
-#endif
-
-#if defined(STRICTZIP) || defined(STRICTZIPUNZIP)
-/* like the STRICT of WIN32, we define a pointer that cannot be converted
-    from (void*) without cast */
-typedef struct TagzipFile__ { int unused; } zipFile__;
-typedef zipFile__ *zipFile;
-#else
-typedef voidp zipFile;
-#endif
-
-#define ZIP_OK                          (0)
-#define ZIP_EOF                         (0)
-#define ZIP_ERRNO                       (Z_ERRNO)
-#define ZIP_PARAMERROR                  (-102)
-#define ZIP_BADZIPFILE                  (-103)
-#define ZIP_INTERNALERROR               (-104)
-
-#ifndef DEF_MEM_LEVEL
-#  if MAX_MEM_LEVEL >= 8
-#    define DEF_MEM_LEVEL 8
-#  else
-#    define DEF_MEM_LEVEL  MAX_MEM_LEVEL
-#  endif
-#endif
-/* default memLevel */
-
-/* tm_zip contain date/time info */
-typedef struct tm_zip_s
-{
-    uInt tm_sec;            /* seconds after the minute - [0,59] */
-    uInt tm_min;            /* minutes after the hour - [0,59] */
-    uInt tm_hour;           /* hours since midnight - [0,23] */
-    uInt tm_mday;           /* day of the month - [1,31] */
-    uInt tm_mon;            /* months since January - [0,11] */
-    uInt tm_year;           /* years - [1980..2044] */
-} tm_zip;
-
-typedef struct
-{
-    tm_zip      tmz_date;       /* date in understandable format           */
-    uLong       dosDate;       /* if dos_date == 0, tmu_date is used      */
-/*    uLong       flag;        */   /* general purpose bit flag        2 bytes */
-
-    uLong       internal_fa;    /* internal file attributes        2 bytes */
-    uLong       external_fa;    /* external file attributes        4 bytes */
-} zip_fileinfo;
-
-typedef const char* zipcharpc;
-
-
-#define APPEND_STATUS_CREATE        (0)
-#define APPEND_STATUS_CREATEAFTER   (1)
-#define APPEND_STATUS_ADDINZIP      (2)
-
-extern zipFile ZEXPORT zipOpen OF((const char *pathname, int append));
-/*
-  Create a zipfile.
-     pathname contain on Windows XP a filename like "c:\\zlib\\zlib113.zip" or on
-       an Unix computer "zlib/zlib113.zip".
-     if the file pathname exist and append==APPEND_STATUS_CREATEAFTER, the zip
-       will be created at the end of the file.
-         (useful if the file contain a self extractor code)
-     if the file pathname exist and append==APPEND_STATUS_ADDINZIP, we will
-       add files in existing zip (be sure you don't add file that doesn't exist)
-     If the zipfile cannot be opened, the return value is NULL.
-     Else, the return value is a zipFile Handle, usable with other function
-       of this zip package.
-*/
-
-/* Note : there is no delete function into a zipfile.
-   If you want delete file into a zipfile, you must open a zipfile, and create another
-   Of couse, you can use RAW reading and writing to copy the file you did not want delte
-*/
-
-extern zipFile ZEXPORT zipOpen2 OF((const char *pathname,
-                                   int append,
-                                   zipcharpc* globalcomment,
-                                   zlib_filefunc_def* pzlib_filefunc_def));
-
-extern int ZEXPORT zipOpenNewFileInZip OF((zipFile file,
-                       const char* filename,
-                       const zip_fileinfo* zipfi,
-                       const void* extrafield_local,
-                       uInt size_extrafield_local,
-                       const void* extrafield_global,
-                       uInt size_extrafield_global,
-                       const char* comment,
-                       int method,
-                       int level));
-/*
-  Open a file in the ZIP for writing.
-  filename : the filename in zip (if NULL, '-' without quote will be used
-  *zipfi contain supplemental information
-  if extrafield_local!=NULL and size_extrafield_local>0, extrafield_local
-    contains the extrafield data the the local header
-  if extrafield_global!=NULL and size_extrafield_global>0, extrafield_global
-    contains the extrafield data the the local header
-  if comment != NULL, comment contain the comment string
-  method contain the compression method (0 for store, Z_DEFLATED for deflate)
-  level contain the level of compression (can be Z_DEFAULT_COMPRESSION)
-*/
-
-
-extern int ZEXPORT zipOpenNewFileInZip2 OF((zipFile file,
-                                            const char* filename,
-                                            const zip_fileinfo* zipfi,
-                                            const void* extrafield_local,
-                                            uInt size_extrafield_local,
-                                            const void* extrafield_global,
-                                            uInt size_extrafield_global,
-                                            const char* comment,
-                                            int method,
-                                            int level,
-                                            int raw));
-
-/*
-  Same than zipOpenNewFileInZip, except if raw=1, we write raw file
- */
-
-extern int ZEXPORT zipOpenNewFileInZip3 OF((zipFile file,
-                                            const char* filename,
-                                            const zip_fileinfo* zipfi,
-                                            const void* extrafield_local,
-                                            uInt size_extrafield_local,
-                                            const void* extrafield_global,
-                                            uInt size_extrafield_global,
-                                            const char* comment,
-                                            int method,
-                                            int level,
-                                            int raw,
-                                            int windowBits,
-                                            int memLevel,
-                                            int strategy,
-                                            const char* password,
-                                            uLong crcForCtypting));
-
-/*
-  Same than zipOpenNewFileInZip2, except
-    windowBits,memLevel,,strategy : see parameter strategy in deflateInit2
-    password : crypting password (NULL for no crypting)
-    crcForCtypting : crc of file to compress (needed for crypting)
- */
-
-
-extern int ZEXPORT zipWriteInFileInZip OF((zipFile file,
-                       const void* buf,
-                       unsigned len));
-/*
-  Write data in the zipfile
-*/
-
-extern int ZEXPORT zipCloseFileInZip OF((zipFile file));
-/*
-  Close the current file in the zipfile
-*/
-
-extern int ZEXPORT zipCloseFileInZipRaw OF((zipFile file,
-                                            uLong uncompressed_size,
-                                            uLong crc32));
-/*
-  Close the current file in the zipfile, for fiel opened with
-    parameter raw=1 in zipOpenNewFileInZip2
-  uncompressed_size and crc32 are value for the uncompressed size
-*/
-
-extern int ZEXPORT zipClose OF((zipFile file,
-                const char* global_comment));
-/*
-  Close the zipfile
-*/
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _zip_H */
diff --git a/externals/g3dlite/zip.lib/source/crypt.h b/externals/g3dlite/zip.lib/source/crypt.h
deleted file mode 100644
index 622f4bc2ec4..00000000000
--- a/externals/g3dlite/zip.lib/source/crypt.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/* crypt.h -- base code for crypt/uncrypt ZIPfile
-
-
-   Version 1.01e, February 12th, 2005
-
-   Copyright (C) 1998-2005 Gilles Vollant
-
-   This code is a modified version of crypting code in Infozip distribution
-
-   The encryption/decryption parts of this source code (as opposed to the
-   non-echoing password parts) were originally written in Europe.  The
-   whole source package can be freely distributed, including from the USA.
-   (Prior to January 2000, re-export from the US was a violation of US law.)
-
-   This encryption code is a direct transcription of the algorithm from
-   Roger Schlafly, described by Phil Katz in the file appnote.txt.  This
-   file (appnote.txt) is distributed with the PKZIP program (even in the
-   version without encryption capabilities).
-
-   If you don't need crypting in your application, just define symbols
-   NOCRYPT and NOUNCRYPT.
-
-   This code support the "Traditional PKWARE Encryption".
-
-   The new AES encryption added on Zip format by Winzip (see the page
-   http://www.winzip.com/aes_info.htm ) and PKWare PKZip 5.x Strong
-   Encryption is not supported.
-*/
-
-#define CRC32(c, b) ((*(pcrc_32_tab+(((int)(c) ^ (b)) & 0xff))) ^ ((c) >> 8))
-
-/***********************************************************************
- * Return the next byte in the pseudo-random sequence
- */
-static int decrypt_byte(unsigned long* pkeys, const unsigned long* pcrc_32_tab)
-{
-    unsigned temp;  /* POTENTIAL BUG:  temp*(temp^1) may overflow in an
-                     * unpredictable manner on 16-bit systems; not a problem
-                     * with any known compiler so far, though */
-
-    temp = ((unsigned)(*(pkeys+2)) & 0xffff) | 2;
-    return (int)(((temp * (temp ^ 1)) >> 8) & 0xff);
-}
-
-/***********************************************************************
- * Update the encryption keys with the next byte of plain text
- */
-static int update_keys(unsigned long* pkeys,const unsigned long* pcrc_32_tab,int c)
-{
-    (*(pkeys+0)) = CRC32((*(pkeys+0)), c);
-    (*(pkeys+1)) += (*(pkeys+0)) & 0xff;
-    (*(pkeys+1)) = (*(pkeys+1)) * 134775813L + 1;
-    {
-      register int keyshift = (int)((*(pkeys+1)) >> 24);
-      (*(pkeys+2)) = CRC32((*(pkeys+2)), keyshift);
-    }
-    return c;
-}
-
-
-/***********************************************************************
- * Initialize the encryption keys and the random header according to
- * the given password.
- */
-static void init_keys(const char* passwd,unsigned long* pkeys,const unsigned long* pcrc_32_tab)
-{
-    *(pkeys+0) = 305419896L;
-    *(pkeys+1) = 591751049L;
-    *(pkeys+2) = 878082192L;
-    while (*passwd != '\0') {
-        update_keys(pkeys,pcrc_32_tab,(int)*passwd);
-        passwd++;
-    }
-}
-
-#define zdecode(pkeys,pcrc_32_tab,c) \
-    (update_keys(pkeys,pcrc_32_tab,c ^= decrypt_byte(pkeys,pcrc_32_tab)))
-
-#define zencode(pkeys,pcrc_32_tab,c,t) \
-    (t=decrypt_byte(pkeys,pcrc_32_tab), update_keys(pkeys,pcrc_32_tab,c), t^(c))
-
-#ifdef INCLUDECRYPTINGCODE_IFCRYPTALLOWED
-
-#define RAND_HEAD_LEN  12
-   /* "last resort" source for second part of crypt seed pattern */
-#  ifndef ZCR_SEED2
-#    define ZCR_SEED2 3141592654UL     /* use PI as default pattern */
-#  endif
-
-static int crypthead(passwd, buf, bufSize, pkeys, pcrc_32_tab, crcForCrypting)
-    const char *passwd;         /* password string */
-    unsigned char *buf;         /* where to write header */
-    int bufSize;
-    unsigned long* pkeys;
-    const unsigned long* pcrc_32_tab;
-    unsigned long crcForCrypting;
-{
-    int n;                       /* index in random header */
-    int t;                       /* temporary */
-    int c;                       /* random byte */
-    unsigned char header[RAND_HEAD_LEN-2]; /* random header */
-    static unsigned calls = 0;   /* ensure different random header each time */
-
-    if (bufSize> 7) & 0xff;
-        header[n] = (unsigned char)zencode(pkeys, pcrc_32_tab, c, t);
-    }
-    /* Encrypt random header (last two bytes is high word of crc) */
-    init_keys(passwd, pkeys, pcrc_32_tab);
-    for (n = 0; n < RAND_HEAD_LEN-2; n++)
-    {
-        buf[n] = (unsigned char)zencode(pkeys, pcrc_32_tab, header[n], t);
-    }
-    buf[n++] = zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 16) & 0xff, t);
-    buf[n++] = zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 24) & 0xff, t);
-    return n;
-}
-
-#endif
diff --git a/externals/g3dlite/zip.lib/source/ioapi.c b/externals/g3dlite/zip.lib/source/ioapi.c
deleted file mode 100644
index f1bee23e64b..00000000000
--- a/externals/g3dlite/zip.lib/source/ioapi.c
+++ /dev/null
@@ -1,177 +0,0 @@
-/* ioapi.c -- IO base function header for compress/uncompress .zip
-   files using zlib + zip or unzip API
-
-   Version 1.01e, February 12th, 2005
-
-   Copyright (C) 1998-2005 Gilles Vollant
-*/
-
-#include 
-#include 
-#include 
-
-#include "zlib.h"
-#include "ioapi.h"
-
-
-
-/* I've found an old Unix (a SunOS 4.1.3_U1) without all SEEK_* defined.... */
-
-#ifndef SEEK_CUR
-#define SEEK_CUR    1
-#endif
-
-#ifndef SEEK_END
-#define SEEK_END    2
-#endif
-
-#ifndef SEEK_SET
-#define SEEK_SET    0
-#endif
-
-voidpf ZCALLBACK fopen_file_func OF((
-   voidpf opaque,
-   const char* filename,
-   int mode));
-
-uLong ZCALLBACK fread_file_func OF((
-   voidpf opaque,
-   voidpf stream,
-   void* buf,
-   uLong size));
-
-uLong ZCALLBACK fwrite_file_func OF((
-   voidpf opaque,
-   voidpf stream,
-   const void* buf,
-   uLong size));
-
-long ZCALLBACK ftell_file_func OF((
-   voidpf opaque,
-   voidpf stream));
-
-long ZCALLBACK fseek_file_func OF((
-   voidpf opaque,
-   voidpf stream,
-   uLong offset,
-   int origin));
-
-int ZCALLBACK fclose_file_func OF((
-   voidpf opaque,
-   voidpf stream));
-
-int ZCALLBACK ferror_file_func OF((
-   voidpf opaque,
-   voidpf stream));
-
-
-voidpf ZCALLBACK fopen_file_func (opaque, filename, mode)
-   voidpf opaque;
-   const char* filename;
-   int mode;
-{
-    FILE* file = NULL;
-    const char* mode_fopen = NULL;
-    if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)
-        mode_fopen = "rb";
-    else
-    if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
-        mode_fopen = "r+b";
-    else
-    if (mode & ZLIB_FILEFUNC_MODE_CREATE)
-        mode_fopen = "wb";
-
-    if ((filename!=NULL) && (mode_fopen != NULL))
-        file = fopen(filename, mode_fopen);
-    return file;
-}
-
-
-uLong ZCALLBACK fread_file_func (opaque, stream, buf, size)
-   voidpf opaque;
-   voidpf stream;
-   void* buf;
-   uLong size;
-{
-    uLong ret;
-    ret = (uLong)fread(buf, 1, (size_t)size, (FILE *)stream);
-    return ret;
-}
-
-
-uLong ZCALLBACK fwrite_file_func (opaque, stream, buf, size)
-   voidpf opaque;
-   voidpf stream;
-   const void* buf;
-   uLong size;
-{
-    uLong ret;
-    ret = (uLong)fwrite(buf, 1, (size_t)size, (FILE *)stream);
-    return ret;
-}
-
-long ZCALLBACK ftell_file_func (opaque, stream)
-   voidpf opaque;
-   voidpf stream;
-{
-    long ret;
-    ret = ftell((FILE *)stream);
-    return ret;
-}
-
-long ZCALLBACK fseek_file_func (opaque, stream, offset, origin)
-   voidpf opaque;
-   voidpf stream;
-   uLong offset;
-   int origin;
-{
-    int fseek_origin=0;
-    long ret;
-    switch (origin)
-    {
-    case ZLIB_FILEFUNC_SEEK_CUR :
-        fseek_origin = SEEK_CUR;
-        break;
-    case ZLIB_FILEFUNC_SEEK_END :
-        fseek_origin = SEEK_END;
-        break;
-    case ZLIB_FILEFUNC_SEEK_SET :
-        fseek_origin = SEEK_SET;
-        break;
-    default: return -1;
-    }
-    ret = 0;
-    fseek((FILE *)stream, offset, fseek_origin);
-    return ret;
-}
-
-int ZCALLBACK fclose_file_func (opaque, stream)
-   voidpf opaque;
-   voidpf stream;
-{
-    int ret;
-    ret = fclose((FILE *)stream);
-    return ret;
-}
-
-int ZCALLBACK ferror_file_func (opaque, stream)
-   voidpf opaque;
-   voidpf stream;
-{
-    int ret;
-    ret = ferror((FILE *)stream);
-    return ret;
-}
-
-void fill_fopen_filefunc (pzlib_filefunc_def)
-  zlib_filefunc_def* pzlib_filefunc_def;
-{
-    pzlib_filefunc_def->zopen_file = fopen_file_func;
-    pzlib_filefunc_def->zread_file = fread_file_func;
-    pzlib_filefunc_def->zwrite_file = fwrite_file_func;
-    pzlib_filefunc_def->ztell_file = ftell_file_func;
-    pzlib_filefunc_def->zseek_file = fseek_file_func;
-    pzlib_filefunc_def->zclose_file = fclose_file_func;
-    pzlib_filefunc_def->zerror_file = ferror_file_func;
-    pzlib_filefunc_def->opaque = NULL;
-}
diff --git a/externals/g3dlite/zip.lib/source/iowin32.c b/externals/g3dlite/zip.lib/source/iowin32.c
deleted file mode 100644
index ce911e3636e..00000000000
--- a/externals/g3dlite/zip.lib/source/iowin32.c
+++ /dev/null
@@ -1,272 +0,0 @@
-#ifdef _MSC_VER
-/* iowin32.c -- IO base function header for compress/uncompress .zip
-   files using zlib + zip or unzip API
-   This IO API version uses the Win32 API (for Microsoft Windows)
-
-   Version 1.01e, February 12th, 2005
-
-   Copyright (C) 1998-2005 Gilles Vollant
-*/
-
-#include 
-
-#include "zlib.h"
-#include "ioapi.h"
-#include "iowin32.h"
-
-#ifndef INVALID_HANDLE_VALUE
-#define INVALID_HANDLE_VALUE (0xFFFFFFFF)
-#endif
-
-#ifndef INVALID_SET_FILE_POINTER
-#define INVALID_SET_FILE_POINTER ((DWORD)-1)
-#endif
-
-voidpf ZCALLBACK win32_open_file_func OF((
-   voidpf opaque,
-   const char* filename,
-   int mode));
-
-uLong ZCALLBACK win32_read_file_func OF((
-   voidpf opaque,
-   voidpf stream,
-   void* buf,
-   uLong size));
-
-uLong ZCALLBACK win32_write_file_func OF((
-   voidpf opaque,
-   voidpf stream,
-   const void* buf,
-   uLong size));
-
-long ZCALLBACK win32_tell_file_func OF((
-   voidpf opaque,
-   voidpf stream));
-
-long ZCALLBACK win32_seek_file_func OF((
-   voidpf opaque,
-   voidpf stream,
-   uLong offset,
-   int origin));
-
-int ZCALLBACK win32_close_file_func OF((
-   voidpf opaque,
-   voidpf stream));
-
-int ZCALLBACK win32_error_file_func OF((
-   voidpf opaque,
-   voidpf stream));
-
-typedef struct
-{
-    HANDLE hf;
-    int error;
-} WIN32FILE_IOWIN;
-
-voidpf ZCALLBACK win32_open_file_func (opaque, filename, mode)
-   voidpf opaque;
-   const char* filename;
-   int mode;
-{
-    const char* mode_fopen = NULL;
-    DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ;
-    HANDLE hFile = 0;
-    voidpf ret=NULL;
-
-    dwDesiredAccess = dwShareMode = dwFlagsAndAttributes = 0;
-
-    if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)
-    {
-        dwDesiredAccess = GENERIC_READ;
-        dwCreationDisposition = OPEN_EXISTING;
-        dwShareMode = FILE_SHARE_READ;
-    }
-    else
-    if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
-    {
-        dwDesiredAccess = GENERIC_WRITE | GENERIC_READ;
-        dwCreationDisposition = OPEN_EXISTING;
-    }
-    else
-    if (mode & ZLIB_FILEFUNC_MODE_CREATE)
-    {
-        dwDesiredAccess = GENERIC_WRITE | GENERIC_READ;
-        dwCreationDisposition = CREATE_ALWAYS;
-    }
-
-    if ((filename!=NULL) && (dwDesiredAccess != 0))
-        hFile = CreateFile((LPCTSTR)filename, dwDesiredAccess, dwShareMode, NULL,
-                      dwCreationDisposition, dwFlagsAndAttributes, NULL);
-
-    if (hFile == INVALID_HANDLE_VALUE)
-        hFile = NULL;
-
-    if (hFile != NULL)
-    {
-        WIN32FILE_IOWIN w32fiow;
-        w32fiow.hf = hFile;
-        w32fiow.error = 0;
-        ret = malloc(sizeof(WIN32FILE_IOWIN));
-        if (ret==NULL)
-            CloseHandle(hFile);
-        else *((WIN32FILE_IOWIN*)ret) = w32fiow;
-    }
-    return ret;
-}
-
-
-uLong ZCALLBACK win32_read_file_func (opaque, stream, buf, size)
-   voidpf opaque;
-   voidpf stream;
-   void* buf;
-   uLong size;
-{
-    uLong ret=0;
-    HANDLE hFile = NULL;
-    if (stream!=NULL)
-        hFile = ((WIN32FILE_IOWIN*)stream) -> hf;
-    if (hFile != NULL)
-        if (!ReadFile(hFile, buf, size, &ret, NULL))
-        {
-            DWORD dwErr = GetLastError();
-            if (dwErr == ERROR_HANDLE_EOF)
-                dwErr = 0;
-            ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
-        }
-
-    return ret;
-}
-
-
-uLong ZCALLBACK win32_write_file_func (opaque, stream, buf, size)
-   voidpf opaque;
-   voidpf stream;
-   const void* buf;
-   uLong size;
-{
-    uLong ret=0;
-    HANDLE hFile = NULL;
-    if (stream!=NULL)
-        hFile = ((WIN32FILE_IOWIN*)stream) -> hf;
-
-    if (hFile !=NULL)
-        if (!WriteFile(hFile, buf, size, &ret, NULL))
-        {
-            DWORD dwErr = GetLastError();
-            if (dwErr == ERROR_HANDLE_EOF)
-                dwErr = 0;
-            ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
-        }
-
-    return ret;
-}
-
-long ZCALLBACK win32_tell_file_func (opaque, stream)
-   voidpf opaque;
-   voidpf stream;
-{
-    long ret=-1;
-    HANDLE hFile = NULL;
-    if (stream!=NULL)
-        hFile = ((WIN32FILE_IOWIN*)stream) -> hf;
-    if (hFile != NULL)
-    {
-        DWORD dwSet = SetFilePointer(hFile, 0, NULL, FILE_CURRENT);
-        if (dwSet == INVALID_SET_FILE_POINTER)
-        {
-            DWORD dwErr = GetLastError();
-            ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
-            ret = -1;
-        }
-        else
-            ret=(long)dwSet;
-    }
-    return ret;
-}
-
-long ZCALLBACK win32_seek_file_func (opaque, stream, offset, origin)
-   voidpf opaque;
-   voidpf stream;
-   uLong offset;
-   int origin;
-{
-    DWORD dwMoveMethod=0xFFFFFFFF;
-    HANDLE hFile = NULL;
-
-    long ret=-1;
-    if (stream!=NULL)
-        hFile = ((WIN32FILE_IOWIN*)stream) -> hf;
-    switch (origin)
-    {
-    case ZLIB_FILEFUNC_SEEK_CUR :
-        dwMoveMethod = FILE_CURRENT;
-        break;
-    case ZLIB_FILEFUNC_SEEK_END :
-        dwMoveMethod = FILE_END;
-        break;
-    case ZLIB_FILEFUNC_SEEK_SET :
-        dwMoveMethod = FILE_BEGIN;
-        break;
-    default: return -1;
-    }
-
-    if (hFile != NULL)
-    {
-        DWORD dwSet = SetFilePointer(hFile, offset, NULL, dwMoveMethod);
-        if (dwSet == INVALID_SET_FILE_POINTER)
-        {
-            DWORD dwErr = GetLastError();
-            ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
-            ret = -1;
-        }
-        else
-            ret=0;
-    }
-    return ret;
-}
-
-int ZCALLBACK win32_close_file_func (opaque, stream)
-   voidpf opaque;
-   voidpf stream;
-{
-    int ret=-1;
-
-    if (stream!=NULL)
-    {
-        HANDLE hFile;
-        hFile = ((WIN32FILE_IOWIN*)stream) -> hf;
-        if (hFile != NULL)
-        {
-            CloseHandle(hFile);
-            ret=0;
-        }
-        free(stream);
-    }
-    return ret;
-}
-
-int ZCALLBACK win32_error_file_func (opaque, stream)
-   voidpf opaque;
-   voidpf stream;
-{
-    int ret=-1;
-    if (stream!=NULL)
-    {
-        ret = ((WIN32FILE_IOWIN*)stream) -> error;
-    }
-    return ret;
-}
-
-void fill_win32_filefunc (pzlib_filefunc_def)
-  zlib_filefunc_def* pzlib_filefunc_def;
-{
-    pzlib_filefunc_def->zopen_file = win32_open_file_func;
-    pzlib_filefunc_def->zread_file = win32_read_file_func;
-    pzlib_filefunc_def->zwrite_file = win32_write_file_func;
-    pzlib_filefunc_def->ztell_file = win32_tell_file_func;
-    pzlib_filefunc_def->zseek_file = win32_seek_file_func;
-    pzlib_filefunc_def->zclose_file = win32_close_file_func;
-    pzlib_filefunc_def->zerror_file = win32_error_file_func;
-    pzlib_filefunc_def->opaque=NULL;
-}
-#endif
diff --git a/externals/g3dlite/zip.lib/source/iowin32.h b/externals/g3dlite/zip.lib/source/iowin32.h
deleted file mode 100644
index 1978f6152dd..00000000000
--- a/externals/g3dlite/zip.lib/source/iowin32.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifdef _MSC_VER
-/* iowin32.h -- IO base function header for compress/uncompress .zip
-   files using zlib + zip or unzip API
-   This IO API version uses the Win32 API (for Microsoft Windows)
-
-   Version 1.01e, February 12th, 2005
-
-   Copyright (C) 1998-2005 Gilles Vollant
-*/
-
-#include 
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void fill_win32_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def));
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/externals/g3dlite/zip.lib/source/unzip.c b/externals/g3dlite/zip.lib/source/unzip.c
deleted file mode 100644
index e80bc5bde7c..00000000000
--- a/externals/g3dlite/zip.lib/source/unzip.c
+++ /dev/null
@@ -1,1604 +0,0 @@
-/* unzip.c -- IO for uncompress .zip files using zlib
-   Version 1.01e, February 12th, 2005
-
-   Copyright (C) 1998-2005 Gilles Vollant
-
-   Read unzip.h for more info
-*/
-
-/* Decryption code comes from crypt.c by Info-ZIP but has been greatly reduced in terms of
-compatibility with older software. The following is from the original crypt.c. Code
-woven in by Terry Thorsen 1/2003.
-*/
-/*
-  Copyright (c) 1990-2000 Info-ZIP.  All rights reserved.
-
-  See the accompanying file LICENSE, version 2000-Apr-09 or later
-  (the contents of which are also included in zip.h) for terms of use.
-  If, for some reason, all these files are missing, the Info-ZIP license
-  also may be found at:  ftp://ftp.info-zip.org/pub/infozip/license.html
-*/
-/*
-  crypt.c (full version) by Info-ZIP.      Last revised:  [see crypt.h]
-
-  The encryption/decryption parts of this source code (as opposed to the
-  non-echoing password parts) were originally written in Europe.  The
-  whole source package can be freely distributed, including from the USA.
-  (Prior to January 2000, re-export from the US was a violation of US law.)
- */
-
-/*
-  This encryption code is a direct transcription of the algorithm from
-  Roger Schlafly, described by Phil Katz in the file appnote.txt.  This
-  file (appnote.txt) is distributed with the PKZIP program (even in the
-  version without encryption capabilities).
- */
-
-
-#include 
-#include 
-#include 
-#include "zlib.h"
-#include "unzip.h"
-
-#ifdef STDC
-#  include 
-#  include 
-#  include 
-#endif
-#ifdef NO_ERRNO_H
-    extern int errno;
-#else
-#   include 
-#endif
-
-
-#ifndef local
-#  define local static
-#endif
-/* compile with -Dlocal if your debugger can't find static symbols */
-
-
-#ifndef CASESENSITIVITYDEFAULT_NO
-#  if !defined(unix) && !defined(CASESENSITIVITYDEFAULT_YES)
-#    define CASESENSITIVITYDEFAULT_NO
-#  endif
-#endif
-
-
-#ifndef UNZ_BUFSIZE
-#define UNZ_BUFSIZE (16384)
-#endif
-
-#ifndef UNZ_MAXFILENAMEINZIP
-#define UNZ_MAXFILENAMEINZIP (256)
-#endif
-
-#ifndef ALLOC
-# define ALLOC(size) (malloc(size))
-#endif
-#ifndef TRYFREE
-# define TRYFREE(p) {if (p) free(p);}
-#endif
-
-#define SIZECENTRALDIRITEM (0x2e)
-#define SIZEZIPLOCALHEADER (0x1e)
-
-
-
-
-const char unz_copyright[] =
-   " unzip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll";
-
-/* unz_file_info_interntal contain internal info about a file in zipfile*/
-typedef struct unz_file_info_internal_s
-{
-    uLong offset_curfile;/* relative offset of local header 4 bytes */
-} unz_file_info_internal;
-
-
-/* file_in_zip_read_info_s contain internal information about a file in zipfile,
-    when reading and decompress it */
-typedef struct
-{
-    char  *read_buffer;         /* internal buffer for compressed data */
-    z_stream stream;            /* zLib stream structure for inflate */
-
-    uLong pos_in_zipfile;       /* position in byte on the zipfile, for fseek*/
-    uLong stream_initialised;   /* flag set if stream structure is initialised*/
-
-    uLong offset_local_extrafield;/* offset of the local extra field */
-    uInt  size_local_extrafield;/* size of the local extra field */
-    uLong pos_local_extrafield;   /* position in the local extra field in read*/
-
-    uLong crc32;                /* crc32 of all data uncompressed */
-    uLong crc32_wait;           /* crc32 we must obtain after decompress all */
-    uLong rest_read_compressed; /* number of byte to be decompressed */
-    uLong rest_read_uncompressed;/*number of byte to be obtained after decomp*/
-    zlib_filefunc_def z_filefunc;
-    voidpf filestream;        /* io structore of the zipfile */
-    uLong compression_method;   /* compression method (0==store) */
-    uLong byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
-    int   raw;
-} file_in_zip_read_info_s;
-
-
-/* unz_s contain internal information about the zipfile
-*/
-typedef struct
-{
-    zlib_filefunc_def z_filefunc;
-    voidpf filestream;        /* io structore of the zipfile */
-    unz_global_info gi;       /* public global information */
-    uLong byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
-    uLong num_file;             /* number of the current file in the zipfile*/
-    uLong pos_in_central_dir;   /* pos of the current file in the central dir*/
-    uLong current_file_ok;      /* flag about the usability of the current file*/
-    uLong central_pos;          /* position of the beginning of the central dir*/
-
-    uLong size_central_dir;     /* size of the central directory  */
-    uLong offset_central_dir;   /* offset of start of central directory with
-                                   respect to the starting disk number */
-
-    unz_file_info cur_file_info; /* public info about the current file in zip*/
-    unz_file_info_internal cur_file_info_internal; /* private info about it*/
-    file_in_zip_read_info_s* pfile_in_zip_read; /* structure about the current
-                                        file if we are decompressing it */
-    int encrypted;
-#    ifndef NOUNCRYPT
-    unsigned long keys[3];     /* keys defining the pseudo-random sequence */
-    const unsigned long* pcrc_32_tab;
-#    endif
-} unz_s;
-
-
-#ifndef NOUNCRYPT
-#include "crypt.h"
-#endif
-
-/* ===========================================================================
-     Read a byte from a gz_stream; update next_in and avail_in. Return EOF
-   for end of file.
-   IN assertion: the stream s has been sucessfully opened for reading.
-*/
-
-
-local int unzlocal_getByte OF((
-    const zlib_filefunc_def* pzlib_filefunc_def,
-    voidpf filestream,
-    int *pi));
-
-local int unzlocal_getByte(pzlib_filefunc_def,filestream,pi)
-    const zlib_filefunc_def* pzlib_filefunc_def;
-    voidpf filestream;
-    int *pi;
-{
-    unsigned char c;
-    int err = (int)ZREAD(*pzlib_filefunc_def,filestream,&c,1);
-    if (err==1)
-    {
-        *pi = (int)c;
-        return UNZ_OK;
-    }
-    else
-    {
-        if (ZERROR(*pzlib_filefunc_def,filestream))
-            return UNZ_ERRNO;
-        else
-            return UNZ_EOF;
-    }
-}
-
-
-/* ===========================================================================
-   Reads a long in LSB order from the given gz_stream. Sets
-*/
-local int unzlocal_getShort OF((
-    const zlib_filefunc_def* pzlib_filefunc_def,
-    voidpf filestream,
-    uLong *pX));
-
-local int unzlocal_getShort (pzlib_filefunc_def,filestream,pX)
-    const zlib_filefunc_def* pzlib_filefunc_def;
-    voidpf filestream;
-    uLong *pX;
-{
-    uLong x = 0;
-    int i = 0;
-    int err = 0;
-
-    err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
-    x = (uLong)i;
-
-    if (err==UNZ_OK)
-        err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
-    x += ((uLong)i)<<8;
-
-    if (err==UNZ_OK)
-        *pX = x;
-    else
-        *pX = 0;
-    return err;
-}
-
-local int unzlocal_getLong OF((
-    const zlib_filefunc_def* pzlib_filefunc_def,
-    voidpf filestream,
-    uLong *pX));
-
-local int unzlocal_getLong (pzlib_filefunc_def,filestream,pX)
-    const zlib_filefunc_def* pzlib_filefunc_def;
-    voidpf filestream;
-    uLong *pX;
-{
-    uLong x = 0;
-    int i = 0;
-    int err = 0;
-
-    err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
-    x = (uLong)i;
-
-    if (err==UNZ_OK)
-        err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
-    x += ((uLong)i)<<8;
-
-    if (err==UNZ_OK)
-        err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
-    x += ((uLong)i)<<16;
-
-    if (err==UNZ_OK)
-        err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
-    x += ((uLong)i)<<24;
-
-    if (err==UNZ_OK)
-        *pX = x;
-    else
-        *pX = 0;
-    return err;
-}
-
-
-/* My own strcmpi / strcasecmp */
-local int strcmpcasenosensitive_internal (fileName1,fileName2)
-    const char* fileName1;
-    const char* fileName2;
-{
-    for (;;)
-    {
-        char c1=*(fileName1++);
-        char c2=*(fileName2++);
-        if ((c1>='a') && (c1<='z'))
-            c1 -= 0x20;
-        if ((c2>='a') && (c2<='z'))
-            c2 -= 0x20;
-        if (c1=='\0')
-            return ((c2=='\0') ? 0 : -1);
-        if (c2=='\0')
-            return 1;
-        if (c1c2)
-            return 1;
-    }
-}
-
-
-#ifdef  CASESENSITIVITYDEFAULT_NO
-#define CASESENSITIVITYDEFAULTVALUE 2
-#else
-#define CASESENSITIVITYDEFAULTVALUE 1
-#endif
-
-#ifndef STRCMPCASENOSENTIVEFUNCTION
-#define STRCMPCASENOSENTIVEFUNCTION strcmpcasenosensitive_internal
-#endif
-
-/*
-   Compare two filename (fileName1,fileName2).
-   If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
-   If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
-                                                                or strcasecmp)
-   If iCaseSenisivity = 0, case sensitivity is defaut of your operating system
-        (like 1 on Unix, 2 on Windows)
-
-*/
-extern int ZEXPORT unzStringFileNameCompare (fileName1,fileName2,iCaseSensitivity)
-    const char* fileName1;
-    const char* fileName2;
-    int iCaseSensitivity;
-{
-    if (iCaseSensitivity==0)
-        iCaseSensitivity=CASESENSITIVITYDEFAULTVALUE;
-
-    if (iCaseSensitivity==1)
-        return strcmp(fileName1,fileName2);
-
-    return STRCMPCASENOSENTIVEFUNCTION(fileName1,fileName2);
-}
-
-#ifndef BUFREADCOMMENT
-#define BUFREADCOMMENT (0x400)
-#endif
-
-/*
-  Locate the Central directory of a zipfile (at the end, just before
-    the global comment)
-*/
-local uLong unzlocal_SearchCentralDir OF((
-    const zlib_filefunc_def* pzlib_filefunc_def,
-    voidpf filestream));
-
-local uLong unzlocal_SearchCentralDir(pzlib_filefunc_def,filestream)
-    const zlib_filefunc_def* pzlib_filefunc_def;
-    voidpf filestream;
-{
-    unsigned char* buf;
-    uLong uSizeFile;
-    uLong uBackRead;
-    uLong uMaxBack=0xffff; /* maximum size of global comment */
-    uLong uPosFound=0;
-
-    if (ZSEEK(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
-        return 0;
-
-
-    uSizeFile = ZTELL(*pzlib_filefunc_def,filestream);
-
-    if (uMaxBack>uSizeFile)
-        uMaxBack = uSizeFile;
-
-    buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
-    if (buf==NULL)
-        return 0;
-
-    uBackRead = 4;
-    while (uBackReaduMaxBack)
-            uBackRead = uMaxBack;
-        else
-            uBackRead+=BUFREADCOMMENT;
-        uReadPos = uSizeFile-uBackRead ;
-
-        uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
-                     (BUFREADCOMMENT+4) : (uSizeFile-uReadPos);
-        if (ZSEEK(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
-            break;
-
-        if (ZREAD(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
-            break;
-
-        for (i=(int)uReadSize-3; (i--)>0;)
-            if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&
-                ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06))
-            {
-                uPosFound = uReadPos+i;
-                break;
-            }
-
-        if (uPosFound!=0)
-            break;
-    }
-    TRYFREE(buf);
-    return uPosFound;
-}
-
-/*
-  Open a Zip file. path contain the full pathname (by example,
-     on a Windows NT computer "c:\\test\\zlib114.zip" or on an Unix computer
-     "zlib/zlib114.zip".
-     If the zipfile cannot be opened (file doesn't exist or in not valid), the
-       return value is NULL.
-     Else, the return value is a unzFile Handle, usable with other function
-       of this unzip package.
-*/
-extern unzFile ZEXPORT unzOpen2 (path, pzlib_filefunc_def)
-    const char *path;
-    zlib_filefunc_def* pzlib_filefunc_def;
-{
-    unz_s us;
-    unz_s *s;
-    uLong central_pos,uL;
-
-    uLong number_disk;          /* number of the current dist, used for
-                                   spaning ZIP, unsupported, always 0*/
-    uLong number_disk_with_CD;  /* number the the disk with central dir, used
-                                   for spaning ZIP, unsupported, always 0*/
-    uLong number_entry_CD;      /* total number of entries in
-                                   the central dir
-                                   (same than number_entry on nospan) */
-
-    int err=UNZ_OK;
-
-    if (unz_copyright[0]!=' ')
-        return NULL;
-
-    if (pzlib_filefunc_def==NULL)
-        fill_fopen_filefunc(&us.z_filefunc);
-    else
-        us.z_filefunc = *pzlib_filefunc_def;
-
-    us.filestream= (*(us.z_filefunc.zopen_file))(us.z_filefunc.opaque,
-                                                 path,
-                                                 ZLIB_FILEFUNC_MODE_READ |
-                                                 ZLIB_FILEFUNC_MODE_EXISTING);
-    if (us.filestream==NULL)
-        return NULL;
-
-    central_pos = unzlocal_SearchCentralDir(&us.z_filefunc,us.filestream);
-    if (central_pos==0)
-        err=UNZ_ERRNO;
-
-    if (ZSEEK(us.z_filefunc, us.filestream,
-                                      central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)
-        err=UNZ_ERRNO;
-
-    /* the signature, already checked */
-    if (unzlocal_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
-        err=UNZ_ERRNO;
-
-    /* number of this disk */
-    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&number_disk)!=UNZ_OK)
-        err=UNZ_ERRNO;
-
-    /* number of the disk with the start of the central directory */
-    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&number_disk_with_CD)!=UNZ_OK)
-        err=UNZ_ERRNO;
-
-    /* total number of entries in the central dir on this disk */
-    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&us.gi.number_entry)!=UNZ_OK)
-        err=UNZ_ERRNO;
-
-    /* total number of entries in the central dir */
-    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&number_entry_CD)!=UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if ((number_entry_CD!=us.gi.number_entry) ||
-        (number_disk_with_CD!=0) ||
-        (number_disk!=0))
-        err=UNZ_BADZIPFILE;
-
-    /* size of the central directory */
-    if (unzlocal_getLong(&us.z_filefunc, us.filestream,&us.size_central_dir)!=UNZ_OK)
-        err=UNZ_ERRNO;
-
-    /* offset of start of central directory with respect to the
-          starting disk number */
-    if (unzlocal_getLong(&us.z_filefunc, us.filestream,&us.offset_central_dir)!=UNZ_OK)
-        err=UNZ_ERRNO;
-
-    /* zipfile comment length */
-    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&us.gi.size_comment)!=UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if ((central_pospfile_in_zip_read!=NULL)
-        unzCloseCurrentFile(file);
-
-    ZCLOSE(s->z_filefunc, s->filestream);
-    TRYFREE(s);
-    return UNZ_OK;
-}
-
-
-/*
-  Write info about the ZipFile in the *pglobal_info structure.
-  No preparation of the structure is needed
-  return UNZ_OK if there is no problem. */
-extern int ZEXPORT unzGetGlobalInfo (file,pglobal_info)
-    unzFile file;
-    unz_global_info *pglobal_info;
-{
-    unz_s* s;
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-    *pglobal_info=s->gi;
-    return UNZ_OK;
-}
-
-
-/*
-   Translate date/time from Dos format to tm_unz (readable more easilty)
-*/
-local void unzlocal_DosDateToTmuDate (ulDosDate, ptm)
-    uLong ulDosDate;
-    tm_unz* ptm;
-{
-    uLong uDate;
-    uDate = (uLong)(ulDosDate>>16);
-    ptm->tm_mday = (uInt)(uDate&0x1f) ;
-    ptm->tm_mon =  (uInt)((((uDate)&0x1E0)/0x20)-1) ;
-    ptm->tm_year = (uInt)(((uDate&0x0FE00)/0x0200)+1980) ;
-
-    ptm->tm_hour = (uInt) ((ulDosDate &0xF800)/0x800);
-    ptm->tm_min =  (uInt) ((ulDosDate&0x7E0)/0x20) ;
-    ptm->tm_sec =  (uInt) (2*(ulDosDate&0x1f)) ;
-}
-
-/*
-  Get Info about the current file in the zipfile, with internal only info
-*/
-local int unzlocal_GetCurrentFileInfoInternal OF((unzFile file,
-                                                  unz_file_info *pfile_info,
-                                                  unz_file_info_internal
-                                                  *pfile_info_internal,
-                                                  char *szFileName,
-                                                  uLong fileNameBufferSize,
-                                                  void *extraField,
-                                                  uLong extraFieldBufferSize,
-                                                  char *szComment,
-                                                  uLong commentBufferSize));
-
-local int unzlocal_GetCurrentFileInfoInternal (file,
-                                              pfile_info,
-                                              pfile_info_internal,
-                                              szFileName, fileNameBufferSize,
-                                              extraField, extraFieldBufferSize,
-                                              szComment,  commentBufferSize)
-    unzFile file;
-    unz_file_info *pfile_info;
-    unz_file_info_internal *pfile_info_internal;
-    char *szFileName;
-    uLong fileNameBufferSize;
-    void *extraField;
-    uLong extraFieldBufferSize;
-    char *szComment;
-    uLong commentBufferSize;
-{
-    unz_s* s;
-    unz_file_info file_info;
-    unz_file_info_internal file_info_internal;
-    int err=UNZ_OK;
-    uLong uMagic;
-    long lSeek=0;
-
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-    if (ZSEEK(s->z_filefunc, s->filestream,
-              s->pos_in_central_dir+s->byte_before_the_zipfile,
-              ZLIB_FILEFUNC_SEEK_SET)!=0)
-        err=UNZ_ERRNO;
-
-
-    /* we check the magic */
-    if (err==UNZ_OK)
-    {
-        if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK)
-            err=UNZ_ERRNO;
-        else if (uMagic!=0x02014b50)
-            err=UNZ_BADZIPFILE;
-    }
-
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.version) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.version_needed) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.flag) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.compression_method) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.dosDate) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    unzlocal_DosDateToTmuDate(file_info.dosDate,&file_info.tmu_date);
-
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.crc) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.compressed_size) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.uncompressed_size) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_filename) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_extra) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_comment) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.disk_num_start) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.internal_fa) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.external_fa) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info_internal.offset_curfile) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    lSeek+=file_info.size_filename;
-    if ((err==UNZ_OK) && (szFileName!=NULL))
-    {
-        uLong uSizeRead ;
-        if (file_info.size_filename0) && (fileNameBufferSize>0))
-            if (ZREAD(s->z_filefunc, s->filestream,szFileName,uSizeRead)!=uSizeRead)
-                err=UNZ_ERRNO;
-        lSeek -= uSizeRead;
-    }
-
-
-    if ((err==UNZ_OK) && (extraField!=NULL))
-    {
-        uLong uSizeRead ;
-        if (file_info.size_file_extraz_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
-                lSeek=0;
-            else
-                err=UNZ_ERRNO;
-        }
-        if ((file_info.size_file_extra>0) && (extraFieldBufferSize>0))
-            if (ZREAD(s->z_filefunc, s->filestream,extraField,uSizeRead)!=uSizeRead)
-                err=UNZ_ERRNO;
-        lSeek += file_info.size_file_extra - uSizeRead;
-    }
-    else
-        lSeek+=file_info.size_file_extra;
-
-
-    if ((err==UNZ_OK) && (szComment!=NULL))
-    {
-        uLong uSizeRead ;
-        if (file_info.size_file_commentz_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
-                lSeek=0;
-            else
-                err=UNZ_ERRNO;
-        }
-        if ((file_info.size_file_comment>0) && (commentBufferSize>0))
-            if (ZREAD(s->z_filefunc, s->filestream,szComment,uSizeRead)!=uSizeRead)
-                err=UNZ_ERRNO;
-        lSeek+=file_info.size_file_comment - uSizeRead;
-    }
-    else
-        lSeek+=file_info.size_file_comment;
-
-    if ((err==UNZ_OK) && (pfile_info!=NULL))
-        *pfile_info=file_info;
-
-    if ((err==UNZ_OK) && (pfile_info_internal!=NULL))
-        *pfile_info_internal=file_info_internal;
-
-    return err;
-}
-
-
-
-/*
-  Write info about the ZipFile in the *pglobal_info structure.
-  No preparation of the structure is needed
-  return UNZ_OK if there is no problem.
-*/
-extern int ZEXPORT unzGetCurrentFileInfo (file,
-                                          pfile_info,
-                                          szFileName, fileNameBufferSize,
-                                          extraField, extraFieldBufferSize,
-                                          szComment,  commentBufferSize)
-    unzFile file;
-    unz_file_info *pfile_info;
-    char *szFileName;
-    uLong fileNameBufferSize;
-    void *extraField;
-    uLong extraFieldBufferSize;
-    char *szComment;
-    uLong commentBufferSize;
-{
-    return unzlocal_GetCurrentFileInfoInternal(file,pfile_info,NULL,
-                                                szFileName,fileNameBufferSize,
-                                                extraField,extraFieldBufferSize,
-                                                szComment,commentBufferSize);
-}
-
-/*
-  Set the current file of the zipfile to the first file.
-  return UNZ_OK if there is no problem
-*/
-extern int ZEXPORT unzGoToFirstFile (file)
-    unzFile file;
-{
-    int err=UNZ_OK;
-    unz_s* s;
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-    s->pos_in_central_dir=s->offset_central_dir;
-    s->num_file=0;
-    err=unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,
-                                             &s->cur_file_info_internal,
-                                             NULL,0,NULL,0,NULL,0);
-    s->current_file_ok = (err == UNZ_OK);
-    return err;
-}
-
-/*
-  Set the current file of the zipfile to the next file.
-  return UNZ_OK if there is no problem
-  return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
-*/
-extern int ZEXPORT unzGoToNextFile (file)
-    unzFile file;
-{
-    unz_s* s;
-    int err;
-
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-    if (!s->current_file_ok)
-        return UNZ_END_OF_LIST_OF_FILE;
-    if (s->gi.number_entry != 0xffff)    /* 2^16 files overflow hack */
-      if (s->num_file+1==s->gi.number_entry)
-        return UNZ_END_OF_LIST_OF_FILE;
-
-    s->pos_in_central_dir += SIZECENTRALDIRITEM + s->cur_file_info.size_filename +
-            s->cur_file_info.size_file_extra + s->cur_file_info.size_file_comment ;
-    s->num_file++;
-    err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,
-                                               &s->cur_file_info_internal,
-                                               NULL,0,NULL,0,NULL,0);
-    s->current_file_ok = (err == UNZ_OK);
-    return err;
-}
-
-
-/*
-  Try locate the file szFileName in the zipfile.
-  For the iCaseSensitivity signification, see unzipStringFileNameCompare
-
-  return value :
-  UNZ_OK if the file is found. It becomes the current file.
-  UNZ_END_OF_LIST_OF_FILE if the file is not found
-*/
-extern int ZEXPORT unzLocateFile (file, szFileName, iCaseSensitivity)
-    unzFile file;
-    const char *szFileName;
-    int iCaseSensitivity;
-{
-    unz_s* s;
-    int err;
-
-    /* We remember the 'current' position in the file so that we can jump
-     * back there if we fail.
-     */
-    unz_file_info cur_file_infoSaved;
-    unz_file_info_internal cur_file_info_internalSaved;
-    uLong num_fileSaved;
-    uLong pos_in_central_dirSaved;
-
-
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-
-    if (strlen(szFileName)>=UNZ_MAXFILENAMEINZIP)
-        return UNZ_PARAMERROR;
-
-    s=(unz_s*)file;
-    if (!s->current_file_ok)
-        return UNZ_END_OF_LIST_OF_FILE;
-
-    /* Save the current state */
-    num_fileSaved = s->num_file;
-    pos_in_central_dirSaved = s->pos_in_central_dir;
-    cur_file_infoSaved = s->cur_file_info;
-    cur_file_info_internalSaved = s->cur_file_info_internal;
-
-    err = unzGoToFirstFile(file);
-
-    while (err == UNZ_OK)
-    {
-        char szCurrentFileName[UNZ_MAXFILENAMEINZIP+1];
-        err = unzGetCurrentFileInfo(file,NULL,
-                                    szCurrentFileName,sizeof(szCurrentFileName)-1,
-                                    NULL,0,NULL,0);
-        if (err == UNZ_OK)
-        {
-            if (unzStringFileNameCompare(szCurrentFileName,
-                                            szFileName,iCaseSensitivity)==0)
-                return UNZ_OK;
-            err = unzGoToNextFile(file);
-        }
-    }
-
-    /* We failed, so restore the state of the 'current file' to where we
-     * were.
-     */
-    s->num_file = num_fileSaved ;
-    s->pos_in_central_dir = pos_in_central_dirSaved ;
-    s->cur_file_info = cur_file_infoSaved;
-    s->cur_file_info_internal = cur_file_info_internalSaved;
-    return err;
-}
-
-
-/*
-///////////////////////////////////////////
-// Contributed by Ryan Haksi (mailto://cryogen@infoserve.net)
-// I need random access
-//
-// Further optimization could be realized by adding an ability
-// to cache the directory in memory. The goal being a single
-// comprehensive file read to put the file I need in a memory.
-*/
-
-/*
-typedef struct unz_file_pos_s
-{
-    uLong pos_in_zip_directory;   // offset in file
-    uLong num_of_file;            // # of file
-} unz_file_pos;
-*/
-
-extern int ZEXPORT unzGetFilePos(file, file_pos)
-    unzFile file;
-    unz_file_pos* file_pos;
-{
-    unz_s* s;
-
-    if (file==NULL || file_pos==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-    if (!s->current_file_ok)
-        return UNZ_END_OF_LIST_OF_FILE;
-
-    file_pos->pos_in_zip_directory  = s->pos_in_central_dir;
-    file_pos->num_of_file           = s->num_file;
-
-    return UNZ_OK;
-}
-
-extern int ZEXPORT unzGoToFilePos(file, file_pos)
-    unzFile file;
-    unz_file_pos* file_pos;
-{
-    unz_s* s;
-    int err;
-
-    if (file==NULL || file_pos==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-
-    /* jump to the right spot */
-    s->pos_in_central_dir = file_pos->pos_in_zip_directory;
-    s->num_file           = file_pos->num_of_file;
-
-    /* set the current file */
-    err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,
-                                               &s->cur_file_info_internal,
-                                               NULL,0,NULL,0,NULL,0);
-    /* return results */
-    s->current_file_ok = (err == UNZ_OK);
-    return err;
-}
-
-/*
-// Unzip Helper Functions - should be here?
-///////////////////////////////////////////
-*/
-
-/*
-  Read the local header of the current zipfile
-  Check the coherency of the local header and info in the end of central
-        directory about this file
-  store in *piSizeVar the size of extra info in local header
-        (filename and size of extra field data)
-*/
-local int unzlocal_CheckCurrentFileCoherencyHeader (s,piSizeVar,
-                                                    poffset_local_extrafield,
-                                                    psize_local_extrafield)
-    unz_s* s;
-    uInt* piSizeVar;
-    uLong *poffset_local_extrafield;
-    uInt  *psize_local_extrafield;
-{
-    uLong uMagic,uData,uFlags;
-    uLong size_filename;
-    uLong size_extra_field;
-    int err=UNZ_OK;
-
-    *piSizeVar = 0;
-    *poffset_local_extrafield = 0;
-    *psize_local_extrafield = 0;
-
-    if (ZSEEK(s->z_filefunc, s->filestream,s->cur_file_info_internal.offset_curfile +
-                                s->byte_before_the_zipfile,ZLIB_FILEFUNC_SEEK_SET)!=0)
-        return UNZ_ERRNO;
-
-
-    if (err==UNZ_OK)
-    {
-        if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK)
-            err=UNZ_ERRNO;
-        else if (uMagic!=0x04034b50)
-            err=UNZ_BADZIPFILE;
-    }
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)
-        err=UNZ_ERRNO;
-/*
-    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.wVersion))
-        err=UNZ_BADZIPFILE;
-*/
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uFlags) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)
-        err=UNZ_ERRNO;
-    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compression_method))
-        err=UNZ_BADZIPFILE;
-
-    if ((err==UNZ_OK) && (s->cur_file_info.compression_method!=0) &&
-                         (s->cur_file_info.compression_method!=Z_DEFLATED))
-        err=UNZ_BADZIPFILE;
-
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* date/time */
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* crc */
-        err=UNZ_ERRNO;
-    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.crc) &&
-                              ((uFlags & 8)==0))
-        err=UNZ_BADZIPFILE;
-
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size compr */
-        err=UNZ_ERRNO;
-    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compressed_size) &&
-                              ((uFlags & 8)==0))
-        err=UNZ_BADZIPFILE;
-
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size uncompr */
-        err=UNZ_ERRNO;
-    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.uncompressed_size) &&
-                              ((uFlags & 8)==0))
-        err=UNZ_BADZIPFILE;
-
-
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&size_filename) != UNZ_OK)
-        err=UNZ_ERRNO;
-    else if ((err==UNZ_OK) && (size_filename!=s->cur_file_info.size_filename))
-        err=UNZ_BADZIPFILE;
-
-    *piSizeVar += (uInt)size_filename;
-
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&size_extra_field) != UNZ_OK)
-        err=UNZ_ERRNO;
-    *poffset_local_extrafield= s->cur_file_info_internal.offset_curfile +
-                                    SIZEZIPLOCALHEADER + size_filename;
-    *psize_local_extrafield = (uInt)size_extra_field;
-
-    *piSizeVar += (uInt)size_extra_field;
-
-    return err;
-}
-
-/*
-  Open for reading data the current file in the zipfile.
-  If there is no error and the file is opened, the return value is UNZ_OK.
-*/
-extern int ZEXPORT unzOpenCurrentFile3 (file, method, level, raw, password)
-    unzFile file;
-    int* method;
-    int* level;
-    int raw;
-    const char* password;
-{
-    int err=UNZ_OK;
-    uInt iSizeVar;
-    unz_s* s;
-    file_in_zip_read_info_s* pfile_in_zip_read_info;
-    uLong offset_local_extrafield;  /* offset of the local extra field */
-    uInt  size_local_extrafield;    /* size of the local extra field */
-#    ifndef NOUNCRYPT
-    char source[12];
-#    else
-    if (password != NULL)
-        return UNZ_PARAMERROR;
-#    endif
-
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-    if (!s->current_file_ok)
-        return UNZ_PARAMERROR;
-
-    if (s->pfile_in_zip_read != NULL)
-        unzCloseCurrentFile(file);
-
-    if (unzlocal_CheckCurrentFileCoherencyHeader(s,&iSizeVar,
-                &offset_local_extrafield,&size_local_extrafield)!=UNZ_OK)
-        return UNZ_BADZIPFILE;
-
-    pfile_in_zip_read_info = (file_in_zip_read_info_s*)
-                                        ALLOC(sizeof(file_in_zip_read_info_s));
-    if (pfile_in_zip_read_info==NULL)
-        return UNZ_INTERNALERROR;
-
-    pfile_in_zip_read_info->read_buffer=(char*)ALLOC(UNZ_BUFSIZE);
-    pfile_in_zip_read_info->offset_local_extrafield = offset_local_extrafield;
-    pfile_in_zip_read_info->size_local_extrafield = size_local_extrafield;
-    pfile_in_zip_read_info->pos_local_extrafield=0;
-    pfile_in_zip_read_info->raw=raw;
-
-    if (pfile_in_zip_read_info->read_buffer==NULL)
-    {
-        TRYFREE(pfile_in_zip_read_info);
-        return UNZ_INTERNALERROR;
-    }
-
-    pfile_in_zip_read_info->stream_initialised=0;
-
-    if (method!=NULL)
-        *method = (int)s->cur_file_info.compression_method;
-
-    if (level!=NULL)
-    {
-        *level = 6;
-        switch (s->cur_file_info.flag & 0x06)
-        {
-          case 6 : *level = 1; break;
-          case 4 : *level = 2; break;
-          case 2 : *level = 9; break;
-        }
-    }
-
-    if ((s->cur_file_info.compression_method!=0) &&
-        (s->cur_file_info.compression_method!=Z_DEFLATED))
-        err=UNZ_BADZIPFILE;
-
-    pfile_in_zip_read_info->crc32_wait=s->cur_file_info.crc;
-    pfile_in_zip_read_info->crc32=0;
-    pfile_in_zip_read_info->compression_method =
-            s->cur_file_info.compression_method;
-    pfile_in_zip_read_info->filestream=s->filestream;
-    pfile_in_zip_read_info->z_filefunc=s->z_filefunc;
-    pfile_in_zip_read_info->byte_before_the_zipfile=s->byte_before_the_zipfile;
-
-    pfile_in_zip_read_info->stream.total_out = 0;
-
-    if ((s->cur_file_info.compression_method==Z_DEFLATED) &&
-        (!raw))
-    {
-      pfile_in_zip_read_info->stream.zalloc = (alloc_func)0;
-      pfile_in_zip_read_info->stream.zfree = (free_func)0;
-      pfile_in_zip_read_info->stream.opaque = (voidpf)0;
-      pfile_in_zip_read_info->stream.next_in = (voidpf)0;
-      pfile_in_zip_read_info->stream.avail_in = 0;
-
-      err=inflateInit2(&pfile_in_zip_read_info->stream, -MAX_WBITS);
-      if (err == Z_OK)
-        pfile_in_zip_read_info->stream_initialised=1;
-      else
-      {
-        TRYFREE(pfile_in_zip_read_info);
-        return err;
-      }
-        /* windowBits is passed < 0 to tell that there is no zlib header.
-         * Note that in this case inflate *requires* an extra "dummy" byte
-         * after the compressed stream in order to complete decompression and
-         * return Z_STREAM_END.
-         * In unzip, i don't wait absolutely Z_STREAM_END because I known the
-         * size of both compressed and uncompressed data
-         */
-    }
-    pfile_in_zip_read_info->rest_read_compressed =
-            s->cur_file_info.compressed_size ;
-    pfile_in_zip_read_info->rest_read_uncompressed =
-            s->cur_file_info.uncompressed_size ;
-
-
-    pfile_in_zip_read_info->pos_in_zipfile =
-            s->cur_file_info_internal.offset_curfile + SIZEZIPLOCALHEADER +
-              iSizeVar;
-
-    pfile_in_zip_read_info->stream.avail_in = (uInt)0;
-
-    s->pfile_in_zip_read = pfile_in_zip_read_info;
-
-#    ifndef NOUNCRYPT
-    if (password != NULL)
-    {
-        int i;
-        s->pcrc_32_tab = get_crc_table();
-        init_keys(password,s->keys,s->pcrc_32_tab);
-        if (ZSEEK(s->z_filefunc, s->filestream,
-                  s->pfile_in_zip_read->pos_in_zipfile +
-                     s->pfile_in_zip_read->byte_before_the_zipfile,
-                  SEEK_SET)!=0)
-            return UNZ_INTERNALERROR;
-        if(ZREAD(s->z_filefunc, s->filestream,source, 12)<12)
-            return UNZ_INTERNALERROR;
-
-        for (i = 0; i<12; i++)
-            zdecode(s->keys,s->pcrc_32_tab,source[i]);
-
-        s->pfile_in_zip_read->pos_in_zipfile+=12;
-        s->encrypted=1;
-    }
-#    endif
-
-
-    return UNZ_OK;
-}
-
-extern int ZEXPORT unzOpenCurrentFile (file)
-    unzFile file;
-{
-    return unzOpenCurrentFile3(file, NULL, NULL, 0, NULL);
-}
-
-extern int ZEXPORT unzOpenCurrentFilePassword (file, password)
-    unzFile file;
-    const char* password;
-{
-    return unzOpenCurrentFile3(file, NULL, NULL, 0, password);
-}
-
-extern int ZEXPORT unzOpenCurrentFile2 (file,method,level,raw)
-    unzFile file;
-    int* method;
-    int* level;
-    int raw;
-{
-    return unzOpenCurrentFile3(file, method, level, raw, NULL);
-}
-
-/*
-  Read bytes from the current file.
-  buf contain buffer where data must be copied
-  len the size of buf.
-
-  return the number of byte copied if somes bytes are copied
-  return 0 if the end of file was reached
-  return <0 with error code if there is an error
-    (UNZ_ERRNO for IO error, or zLib error for uncompress error)
-*/
-extern int ZEXPORT unzReadCurrentFile  (file, buf, len)
-    unzFile file;
-    voidp buf;
-    unsigned len;
-{
-    int err=UNZ_OK;
-    uInt iRead = 0;
-    unz_s* s;
-    file_in_zip_read_info_s* pfile_in_zip_read_info;
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-    pfile_in_zip_read_info=s->pfile_in_zip_read;
-
-    if (pfile_in_zip_read_info==NULL)
-        return UNZ_PARAMERROR;
-
-
-    if ((pfile_in_zip_read_info->read_buffer == NULL))
-        return UNZ_END_OF_LIST_OF_FILE;
-    if (len==0)
-        return 0;
-
-    pfile_in_zip_read_info->stream.next_out = (Bytef*)buf;
-
-    pfile_in_zip_read_info->stream.avail_out = (uInt)len;
-
-    if ((len>pfile_in_zip_read_info->rest_read_uncompressed) &&
-        (!(pfile_in_zip_read_info->raw)))
-        pfile_in_zip_read_info->stream.avail_out =
-            (uInt)pfile_in_zip_read_info->rest_read_uncompressed;
-
-    if ((len>pfile_in_zip_read_info->rest_read_compressed+
-           pfile_in_zip_read_info->stream.avail_in) &&
-         (pfile_in_zip_read_info->raw))
-        pfile_in_zip_read_info->stream.avail_out =
-            (uInt)pfile_in_zip_read_info->rest_read_compressed+
-            pfile_in_zip_read_info->stream.avail_in;
-
-    while (pfile_in_zip_read_info->stream.avail_out>0)
-    {
-        if ((pfile_in_zip_read_info->stream.avail_in==0) &&
-            (pfile_in_zip_read_info->rest_read_compressed>0))
-        {
-            uInt uReadThis = UNZ_BUFSIZE;
-            if (pfile_in_zip_read_info->rest_read_compressedrest_read_compressed;
-            if (uReadThis == 0)
-                return UNZ_EOF;
-            if (ZSEEK(pfile_in_zip_read_info->z_filefunc,
-                      pfile_in_zip_read_info->filestream,
-                      pfile_in_zip_read_info->pos_in_zipfile +
-                         pfile_in_zip_read_info->byte_before_the_zipfile,
-                         ZLIB_FILEFUNC_SEEK_SET)!=0)
-                return UNZ_ERRNO;
-            if (ZREAD(pfile_in_zip_read_info->z_filefunc,
-                      pfile_in_zip_read_info->filestream,
-                      pfile_in_zip_read_info->read_buffer,
-                      uReadThis)!=uReadThis)
-                return UNZ_ERRNO;
-
-
-#            ifndef NOUNCRYPT
-            if(s->encrypted)
-            {
-                uInt i;
-                for(i=0;iread_buffer[i] =
-                      zdecode(s->keys,s->pcrc_32_tab,
-                              pfile_in_zip_read_info->read_buffer[i]);
-            }
-#            endif
-
-
-            pfile_in_zip_read_info->pos_in_zipfile += uReadThis;
-
-            pfile_in_zip_read_info->rest_read_compressed-=uReadThis;
-
-            pfile_in_zip_read_info->stream.next_in =
-                (Bytef*)pfile_in_zip_read_info->read_buffer;
-            pfile_in_zip_read_info->stream.avail_in = (uInt)uReadThis;
-        }
-
-        if ((pfile_in_zip_read_info->compression_method==0) || (pfile_in_zip_read_info->raw))
-        {
-            uInt uDoCopy,i ;
-
-            if ((pfile_in_zip_read_info->stream.avail_in == 0) &&
-                (pfile_in_zip_read_info->rest_read_compressed == 0))
-                return (iRead==0) ? UNZ_EOF : iRead;
-
-            if (pfile_in_zip_read_info->stream.avail_out <
-                            pfile_in_zip_read_info->stream.avail_in)
-                uDoCopy = pfile_in_zip_read_info->stream.avail_out ;
-            else
-                uDoCopy = pfile_in_zip_read_info->stream.avail_in ;
-
-            for (i=0;istream.next_out+i) =
-                        *(pfile_in_zip_read_info->stream.next_in+i);
-
-            pfile_in_zip_read_info->crc32 = crc32(pfile_in_zip_read_info->crc32,
-                                pfile_in_zip_read_info->stream.next_out,
-                                uDoCopy);
-            pfile_in_zip_read_info->rest_read_uncompressed-=uDoCopy;
-            pfile_in_zip_read_info->stream.avail_in -= uDoCopy;
-            pfile_in_zip_read_info->stream.avail_out -= uDoCopy;
-            pfile_in_zip_read_info->stream.next_out += uDoCopy;
-            pfile_in_zip_read_info->stream.next_in += uDoCopy;
-            pfile_in_zip_read_info->stream.total_out += uDoCopy;
-            iRead += uDoCopy;
-        }
-        else
-        {
-            uLong uTotalOutBefore,uTotalOutAfter;
-            const Bytef *bufBefore;
-            uLong uOutThis;
-            int flush=Z_SYNC_FLUSH;
-
-            uTotalOutBefore = pfile_in_zip_read_info->stream.total_out;
-            bufBefore = pfile_in_zip_read_info->stream.next_out;
-
-            /*
-            if ((pfile_in_zip_read_info->rest_read_uncompressed ==
-                     pfile_in_zip_read_info->stream.avail_out) &&
-                (pfile_in_zip_read_info->rest_read_compressed == 0))
-                flush = Z_FINISH;
-            */
-            err=inflate(&pfile_in_zip_read_info->stream,flush);
-
-            if ((err>=0) && (pfile_in_zip_read_info->stream.msg!=NULL))
-              err = Z_DATA_ERROR;
-
-            uTotalOutAfter = pfile_in_zip_read_info->stream.total_out;
-            uOutThis = uTotalOutAfter-uTotalOutBefore;
-
-            pfile_in_zip_read_info->crc32 =
-                crc32(pfile_in_zip_read_info->crc32,bufBefore,
-                        (uInt)(uOutThis));
-
-            pfile_in_zip_read_info->rest_read_uncompressed -=
-                uOutThis;
-
-            iRead += (uInt)(uTotalOutAfter - uTotalOutBefore);
-
-            if (err==Z_STREAM_END)
-                return (iRead==0) ? UNZ_EOF : iRead;
-            if (err!=Z_OK)
-                break;
-        }
-    }
-
-    if (err==Z_OK)
-        return iRead;
-    return err;
-}
-
-
-/*
-  Give the current position in uncompressed data
-*/
-extern z_off_t ZEXPORT unztell (file)
-    unzFile file;
-{
-    unz_s* s;
-    file_in_zip_read_info_s* pfile_in_zip_read_info;
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-    pfile_in_zip_read_info=s->pfile_in_zip_read;
-
-    if (pfile_in_zip_read_info==NULL)
-        return UNZ_PARAMERROR;
-
-    return (z_off_t)pfile_in_zip_read_info->stream.total_out;
-}
-
-
-/*
-  return 1 if the end of file was reached, 0 elsewhere
-*/
-extern int ZEXPORT unzeof (file)
-    unzFile file;
-{
-    unz_s* s;
-    file_in_zip_read_info_s* pfile_in_zip_read_info;
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-    pfile_in_zip_read_info=s->pfile_in_zip_read;
-
-    if (pfile_in_zip_read_info==NULL)
-        return UNZ_PARAMERROR;
-
-    if (pfile_in_zip_read_info->rest_read_uncompressed == 0)
-        return 1;
-    else
-        return 0;
-}
-
-
-
-/*
-  Read extra field from the current file (opened by unzOpenCurrentFile)
-  This is the local-header version of the extra field (sometimes, there is
-    more info in the local-header version than in the central-header)
-
-  if buf==NULL, it return the size of the local extra field that can be read
-
-  if buf!=NULL, len is the size of the buffer, the extra header is copied in
-    buf.
-  the return value is the number of bytes copied in buf, or (if <0)
-    the error code
-*/
-extern int ZEXPORT unzGetLocalExtrafield (file,buf,len)
-    unzFile file;
-    voidp buf;
-    unsigned len;
-{
-    unz_s* s;
-    file_in_zip_read_info_s* pfile_in_zip_read_info;
-    uInt read_now;
-    uLong size_to_read;
-
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-    pfile_in_zip_read_info=s->pfile_in_zip_read;
-
-    if (pfile_in_zip_read_info==NULL)
-        return UNZ_PARAMERROR;
-
-    size_to_read = (pfile_in_zip_read_info->size_local_extrafield -
-                pfile_in_zip_read_info->pos_local_extrafield);
-
-    if (buf==NULL)
-        return (int)size_to_read;
-
-    if (len>size_to_read)
-        read_now = (uInt)size_to_read;
-    else
-        read_now = (uInt)len ;
-
-    if (read_now==0)
-        return 0;
-
-    if (ZSEEK(pfile_in_zip_read_info->z_filefunc,
-              pfile_in_zip_read_info->filestream,
-              pfile_in_zip_read_info->offset_local_extrafield +
-              pfile_in_zip_read_info->pos_local_extrafield,
-              ZLIB_FILEFUNC_SEEK_SET)!=0)
-        return UNZ_ERRNO;
-
-    if (ZREAD(pfile_in_zip_read_info->z_filefunc,
-              pfile_in_zip_read_info->filestream,
-              buf,read_now)!=read_now)
-        return UNZ_ERRNO;
-
-    return (int)read_now;
-}
-
-/*
-  Close the file in zip opened with unzipOpenCurrentFile
-  Return UNZ_CRCERROR if all the file was read but the CRC is not good
-*/
-extern int ZEXPORT unzCloseCurrentFile (file)
-    unzFile file;
-{
-    int err=UNZ_OK;
-
-    unz_s* s;
-    file_in_zip_read_info_s* pfile_in_zip_read_info;
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-    pfile_in_zip_read_info=s->pfile_in_zip_read;
-
-    if (pfile_in_zip_read_info==NULL)
-        return UNZ_PARAMERROR;
-
-
-    if ((pfile_in_zip_read_info->rest_read_uncompressed == 0) &&
-        (!pfile_in_zip_read_info->raw))
-    {
-        if (pfile_in_zip_read_info->crc32 != pfile_in_zip_read_info->crc32_wait)
-            err=UNZ_CRCERROR;
-    }
-
-
-    TRYFREE(pfile_in_zip_read_info->read_buffer);
-    pfile_in_zip_read_info->read_buffer = NULL;
-    if (pfile_in_zip_read_info->stream_initialised)
-        inflateEnd(&pfile_in_zip_read_info->stream);
-
-    pfile_in_zip_read_info->stream_initialised = 0;
-    TRYFREE(pfile_in_zip_read_info);
-
-    s->pfile_in_zip_read=NULL;
-
-    return err;
-}
-
-
-/*
-  Get the global comment string of the ZipFile, in the szComment buffer.
-  uSizeBuf is the size of the szComment buffer.
-  return the number of byte copied or an error code <0
-*/
-extern int ZEXPORT unzGetGlobalComment (file, szComment, uSizeBuf)
-    unzFile file;
-    char *szComment;
-    uLong uSizeBuf;
-{
-    unz_s* s;
-    uLong uReadThis ;
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-
-    uReadThis = uSizeBuf;
-    if (uReadThis>s->gi.size_comment)
-        uReadThis = s->gi.size_comment;
-
-    if (ZSEEK(s->z_filefunc,s->filestream,s->central_pos+22,ZLIB_FILEFUNC_SEEK_SET)!=0)
-        return UNZ_ERRNO;
-
-    if (uReadThis>0)
-    {
-      *szComment='\0';
-      if (ZREAD(s->z_filefunc,s->filestream,szComment,uReadThis)!=uReadThis)
-        return UNZ_ERRNO;
-    }
-
-    if ((szComment != NULL) && (uSizeBuf > s->gi.size_comment))
-        *(szComment+s->gi.size_comment)='\0';
-    return (int)uReadThis;
-}
-
-/* Additions by RX '2004 */
-extern uLong ZEXPORT unzGetOffset (file)
-    unzFile file;
-{
-    unz_s* s;
-
-    if (file==NULL)
-          return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-    if (!s->current_file_ok)
-      return 0;
-    if (s->gi.number_entry != 0 && s->gi.number_entry != 0xffff)
-      if (s->num_file==s->gi.number_entry)
-         return 0;
-    return s->pos_in_central_dir;
-}
-
-extern int ZEXPORT unzSetOffset (file, pos)
-        unzFile file;
-        uLong pos;
-{
-    unz_s* s;
-    int err;
-
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-
-    s->pos_in_central_dir = pos;
-    s->num_file = s->gi.number_entry;      /* hack */
-    err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,
-                                              &s->cur_file_info_internal,
-                                              NULL,0,NULL,0,NULL,0);
-    s->current_file_ok = (err == UNZ_OK);
-    return err;
-}
diff --git a/externals/g3dlite/zip.lib/source/zip.c b/externals/g3dlite/zip.lib/source/zip.c
deleted file mode 100644
index d5f9fe53d26..00000000000
--- a/externals/g3dlite/zip.lib/source/zip.c
+++ /dev/null
@@ -1,1221 +0,0 @@
-/* zip.c -- IO on .zip files using zlib
-   Version 1.01e, February 12th, 2005
-
-   27 Dec 2004 Rolf Kalbermatter
-   Modification to zipOpen2 to support globalComment retrieval.
-
-   Copyright (C) 1998-2005 Gilles Vollant
-
-   Read zip.h for more info
-*/
-
-
-#include 
-#include 
-#include 
-#include 
-#include "zlib.h"
-#include "zip.h"
-
-#ifdef STDC
-#  include 
-#  include 
-#  include 
-#endif
-#ifdef NO_ERRNO_H
-    extern int errno;
-#else
-#   include 
-#endif
-
-
-#ifndef local
-#  define local static
-#endif
-/* compile with -Dlocal if your debugger can't find static symbols */
-
-#ifndef VERSIONMADEBY
-# define VERSIONMADEBY   (0x0) /* platform depedent */
-#endif
-
-#ifndef Z_BUFSIZE
-#define Z_BUFSIZE (16384)
-#endif
-
-#ifndef Z_MAXFILENAMEINZIP
-#define Z_MAXFILENAMEINZIP (256)
-#endif
-
-#ifndef ALLOC
-# define ALLOC(size) (malloc(size))
-#endif
-#ifndef TRYFREE
-# define TRYFREE(p) {if (p) free(p);}
-#endif
-
-/*
-#define SIZECENTRALDIRITEM (0x2e)
-#define SIZEZIPLOCALHEADER (0x1e)
-*/
-
-/* I've found an old Unix (a SunOS 4.1.3_U1) without all SEEK_* defined.... */
-
-#ifndef SEEK_CUR
-#define SEEK_CUR    1
-#endif
-
-#ifndef SEEK_END
-#define SEEK_END    2
-#endif
-
-#ifndef SEEK_SET
-#define SEEK_SET    0
-#endif
-
-#ifndef DEF_MEM_LEVEL
-#if MAX_MEM_LEVEL >= 8
-#  define DEF_MEM_LEVEL 8
-#else
-#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL
-#endif
-#endif
-const char zip_copyright[] =
-   " zip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll";
-
-
-#define SIZEDATA_INDATABLOCK (4096-(4*4))
-
-#define LOCALHEADERMAGIC    (0x04034b50)
-#define CENTRALHEADERMAGIC  (0x02014b50)
-#define ENDHEADERMAGIC      (0x06054b50)
-
-#define FLAG_LOCALHEADER_OFFSET (0x06)
-#define CRC_LOCALHEADER_OFFSET  (0x0e)
-
-#define SIZECENTRALHEADER (0x2e) /* 46 */
-
-typedef struct linkedlist_datablock_internal_s
-{
-  struct linkedlist_datablock_internal_s* next_datablock;
-  uLong  avail_in_this_block;
-  uLong  filled_in_this_block;
-  uLong  unused; /* for future use and alignement */
-  unsigned char data[SIZEDATA_INDATABLOCK];
-} linkedlist_datablock_internal;
-
-typedef struct linkedlist_data_s
-{
-    linkedlist_datablock_internal* first_block;
-    linkedlist_datablock_internal* last_block;
-} linkedlist_data;
-
-
-typedef struct
-{
-    z_stream stream;            /* zLib stream structure for inflate */
-    int  stream_initialised;    /* 1 is stream is initialised */
-    uInt pos_in_buffered_data;  /* last written byte in buffered_data */
-
-    uLong pos_local_header;     /* offset of the local header of the file
-                                     currenty writing */
-    char* central_header;       /* central header data for the current file */
-    uLong size_centralheader;   /* size of the central header for cur file */
-    uLong flag;                 /* flag of the file currently writing */
-
-    int  method;                /* compression method of file currenty wr.*/
-    int  raw;                   /* 1 for directly writing raw data */
-    Byte buffered_data[Z_BUFSIZE];/* buffer contain compressed data to be writ*/
-    uLong dosDate;
-    uLong crc32;
-    int  encrypt;
-#ifndef NOCRYPT
-    unsigned long keys[3];     /* keys defining the pseudo-random sequence */
-    const unsigned long* pcrc_32_tab;
-    int crypt_header_size;
-#endif
-} curfile_info;
-
-typedef struct
-{
-    zlib_filefunc_def z_filefunc;
-    voidpf filestream;        /* io structore of the zipfile */
-    linkedlist_data central_dir;/* datablock with central dir in construction*/
-    int  in_opened_file_inzip;  /* 1 if a file in the zip is currently writ.*/
-    curfile_info ci;            /* info on the file curretly writing */
-
-    uLong begin_pos;            /* position of the beginning of the zipfile */
-    uLong add_position_when_writting_offset;
-    uLong number_entry;
-#ifndef NO_ADDFILEINEXISTINGZIP
-    char *globalcomment;
-#endif
-} zip_internal;
-
-
-
-#ifndef NOCRYPT
-#define INCLUDECRYPTINGCODE_IFCRYPTALLOWED
-#include "crypt.h"
-#endif
-
-local linkedlist_datablock_internal* allocate_new_datablock()
-{
-    linkedlist_datablock_internal* ldi;
-    ldi = (linkedlist_datablock_internal*)
-                 ALLOC(sizeof(linkedlist_datablock_internal));
-    if (ldi!=NULL)
-    {
-        ldi->next_datablock = NULL ;
-        ldi->filled_in_this_block = 0 ;
-        ldi->avail_in_this_block = SIZEDATA_INDATABLOCK ;
-    }
-    return ldi;
-}
-
-local void free_datablock(ldi)
-    linkedlist_datablock_internal* ldi;
-{
-    while (ldi!=NULL)
-    {
-        linkedlist_datablock_internal* ldinext = ldi->next_datablock;
-        TRYFREE(ldi);
-        ldi = ldinext;
-    }
-}
-
-local void init_linkedlist(ll)
-    linkedlist_data* ll;
-{
-    ll->first_block = ll->last_block = NULL;
-}
-
-/*
-// Never used!
-local void free_linkedlist(ll)
-    linkedlist_data* ll;
-{
-    free_datablock(ll->first_block);
-    ll->first_block = ll->last_block = NULL;
-}
-*/
-
-local int add_data_in_datablock(ll,buf,len)
-    linkedlist_data* ll;
-    const void* buf;
-    uLong len;
-{
-    linkedlist_datablock_internal* ldi;
-    const unsigned char* from_copy;
-
-    if (ll==NULL)
-        return ZIP_INTERNALERROR;
-
-    if (ll->last_block == NULL)
-    {
-        ll->first_block = ll->last_block = allocate_new_datablock();
-        if (ll->first_block == NULL)
-            return ZIP_INTERNALERROR;
-    }
-
-    ldi = ll->last_block;
-    from_copy = (unsigned char*)buf;
-
-    while (len>0)
-    {
-        uInt copy_this;
-        uInt i;
-        unsigned char* to_copy;
-
-        if (ldi->avail_in_this_block==0)
-        {
-            ldi->next_datablock = allocate_new_datablock();
-            if (ldi->next_datablock == NULL)
-                return ZIP_INTERNALERROR;
-            ldi = ldi->next_datablock ;
-            ll->last_block = ldi;
-        }
-
-        if (ldi->avail_in_this_block < len)
-            copy_this = (uInt)ldi->avail_in_this_block;
-        else
-            copy_this = (uInt)len;
-
-        to_copy = &(ldi->data[ldi->filled_in_this_block]);
-
-        for (i=0;ifilled_in_this_block += copy_this;
-        ldi->avail_in_this_block -= copy_this;
-        from_copy += copy_this ;
-        len -= copy_this;
-    }
-    return ZIP_OK;
-}
-
-
-
-/****************************************************************************/
-
-#ifndef NO_ADDFILEINEXISTINGZIP
-/* ===========================================================================
-   Inputs a long in LSB order to the given file
-   nbByte == 1, 2 or 4 (byte, short or long)
-*/
-
-local int ziplocal_putValue OF((const zlib_filefunc_def* pzlib_filefunc_def,
-                                voidpf filestream, uLong x, int nbByte));
-local int ziplocal_putValue (pzlib_filefunc_def, filestream, x, nbByte)
-    const zlib_filefunc_def* pzlib_filefunc_def;
-    voidpf filestream;
-    uLong x;
-    int nbByte;
-{
-    unsigned char buf[4];
-    int n;
-    for (n = 0; n < nbByte; n++)
-    {
-        buf[n] = (unsigned char)(x & 0xff);
-        x >>= 8;
-    }
-    if (x != 0)
-      {     /* data overflow - hack for ZIP64 (X Roche) */
-      for (n = 0; n < nbByte; n++)
-        {
-          buf[n] = 0xff;
-        }
-      }
-
-    if (ZWRITE(*pzlib_filefunc_def,filestream,buf,nbByte)!=(uLong)nbByte)
-        return ZIP_ERRNO;
-    else
-        return ZIP_OK;
-}
-
-local void ziplocal_putValue_inmemory OF((void* dest, uLong x, int nbByte));
-local void ziplocal_putValue_inmemory (dest, x, nbByte)
-    void* dest;
-    uLong x;
-    int nbByte;
-{
-    unsigned char* buf=(unsigned char*)dest;
-    int n;
-    for (n = 0; n < nbByte; n++) {
-        buf[n] = (unsigned char)(x & 0xff);
-        x >>= 8;
-    }
-
-    if (x != 0)
-    {     /* data overflow - hack for ZIP64 */
-       for (n = 0; n < nbByte; n++)
-       {
-          buf[n] = 0xff;
-       }
-    }
-}
-
-/****************************************************************************/
-
-
-local uLong ziplocal_TmzDateToDosDate(ptm,dosDate)
-    const tm_zip* ptm;
-    uLong dosDate;
-{
-    uLong year = (uLong)ptm->tm_year;
-    if (year>1980)
-        year-=1980;
-    else if (year>80)
-        year-=80;
-    return
-      (uLong) (((ptm->tm_mday) + (32 * (ptm->tm_mon+1)) + (512 * year)) << 16) |
-        ((ptm->tm_sec/2) + (32* ptm->tm_min) + (2048 * (uLong)ptm->tm_hour));
-}
-
-
-/****************************************************************************/
-
-local int ziplocal_getByte OF((
-    const zlib_filefunc_def* pzlib_filefunc_def,
-    voidpf filestream,
-    int *pi));
-
-local int ziplocal_getByte(pzlib_filefunc_def,filestream,pi)
-    const zlib_filefunc_def* pzlib_filefunc_def;
-    voidpf filestream;
-    int *pi;
-{
-    unsigned char c;
-    int err = (int)ZREAD(*pzlib_filefunc_def,filestream,&c,1);
-    if (err==1)
-    {
-        *pi = (int)c;
-        return ZIP_OK;
-    }
-    else
-    {
-        if (ZERROR(*pzlib_filefunc_def,filestream))
-            return ZIP_ERRNO;
-        else
-            return ZIP_EOF;
-    }
-}
-
-
-/* ===========================================================================
-   Reads a long in LSB order from the given gz_stream. Sets
-*/
-local int ziplocal_getShort OF((
-    const zlib_filefunc_def* pzlib_filefunc_def,
-    voidpf filestream,
-    uLong *pX));
-
-local int ziplocal_getShort (pzlib_filefunc_def,filestream,pX)
-    const zlib_filefunc_def* pzlib_filefunc_def;
-    voidpf filestream;
-    uLong *pX;
-{
-    uLong x = 0;
-    int i = 0;
-    int err = 0;
-
-    err = ziplocal_getByte(pzlib_filefunc_def,filestream,&i);
-    x = (uLong)i;
-
-    if (err==ZIP_OK)
-        err = ziplocal_getByte(pzlib_filefunc_def,filestream,&i);
-    x += ((uLong)i)<<8;
-
-    if (err==ZIP_OK)
-        *pX = x;
-    else
-        *pX = 0;
-    return err;
-}
-
-local int ziplocal_getLong OF((
-    const zlib_filefunc_def* pzlib_filefunc_def,
-    voidpf filestream,
-    uLong *pX));
-
-local int ziplocal_getLong (pzlib_filefunc_def,filestream,pX)
-    const zlib_filefunc_def* pzlib_filefunc_def;
-    voidpf filestream;
-    uLong *pX;
-{
-    uLong x = 0;
-    int i = 0;
-    int err = 0;
-
-    err = ziplocal_getByte(pzlib_filefunc_def,filestream,&i);
-    x = (uLong)i;
-
-    if (err==ZIP_OK)
-        err = ziplocal_getByte(pzlib_filefunc_def,filestream,&i);
-    x += ((uLong)i)<<8;
-
-    if (err==ZIP_OK)
-        err = ziplocal_getByte(pzlib_filefunc_def,filestream,&i);
-    x += ((uLong)i)<<16;
-
-    if (err==ZIP_OK)
-        err = ziplocal_getByte(pzlib_filefunc_def,filestream,&i);
-    x += ((uLong)i)<<24;
-
-    if (err==ZIP_OK)
-        *pX = x;
-    else
-        *pX = 0;
-    return err;
-}
-
-#ifndef BUFREADCOMMENT
-#define BUFREADCOMMENT (0x400)
-#endif
-/*
-  Locate the Central directory of a zipfile (at the end, just before
-    the global comment)
-*/
-local uLong ziplocal_SearchCentralDir OF((
-    const zlib_filefunc_def* pzlib_filefunc_def,
-    voidpf filestream));
-
-local uLong ziplocal_SearchCentralDir(pzlib_filefunc_def,filestream)
-    const zlib_filefunc_def* pzlib_filefunc_def;
-    voidpf filestream;
-{
-    unsigned char* buf;
-    uLong uSizeFile;
-    uLong uBackRead;
-    uLong uMaxBack=0xffff; /* maximum size of global comment */
-    uLong uPosFound=0;
-
-    if (ZSEEK(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
-        return 0;
-
-
-    uSizeFile = ZTELL(*pzlib_filefunc_def,filestream);
-
-    if (uMaxBack>uSizeFile)
-        uMaxBack = uSizeFile;
-
-    buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
-    if (buf==NULL)
-        return 0;
-
-    uBackRead = 4;
-    while (uBackReaduMaxBack)
-            uBackRead = uMaxBack;
-        else
-            uBackRead+=BUFREADCOMMENT;
-        uReadPos = uSizeFile-uBackRead ;
-
-        uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
-                     (BUFREADCOMMENT+4) : (uSizeFile-uReadPos);
-        if (ZSEEK(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
-            break;
-
-        if (ZREAD(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
-            break;
-
-        for (i=(int)uReadSize-3; (i--)>0;)
-            if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&
-                ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06))
-            {
-                uPosFound = uReadPos+i;
-                break;
-            }
-
-        if (uPosFound!=0)
-            break;
-    }
-    TRYFREE(buf);
-    return uPosFound;
-}
-#endif /* !NO_ADDFILEINEXISTINGZIP*/
-
-/************************************************************/
-extern zipFile ZEXPORT zipOpen2 (pathname, append, globalcomment, pzlib_filefunc_def)
-    const char *pathname;
-    int append;
-    zipcharpc* globalcomment;
-    zlib_filefunc_def* pzlib_filefunc_def;
-{
-    zip_internal ziinit;
-    zip_internal* zi;
-    int err=ZIP_OK;
-
-
-    if (pzlib_filefunc_def==NULL)
-        fill_fopen_filefunc(&ziinit.z_filefunc);
-    else
-        ziinit.z_filefunc = *pzlib_filefunc_def;
-
-    ziinit.filestream = (*(ziinit.z_filefunc.zopen_file))
-                 (ziinit.z_filefunc.opaque,
-                  pathname,
-                  (append == APPEND_STATUS_CREATE) ?
-                  (ZLIB_FILEFUNC_MODE_READ | ZLIB_FILEFUNC_MODE_WRITE | ZLIB_FILEFUNC_MODE_CREATE) :
-                    (ZLIB_FILEFUNC_MODE_READ | ZLIB_FILEFUNC_MODE_WRITE | ZLIB_FILEFUNC_MODE_EXISTING));
-
-    if (ziinit.filestream == NULL)
-        return NULL;
-    ziinit.begin_pos = ZTELL(ziinit.z_filefunc,ziinit.filestream);
-    ziinit.in_opened_file_inzip = 0;
-    ziinit.ci.stream_initialised = 0;
-    ziinit.number_entry = 0;
-    ziinit.add_position_when_writting_offset = 0;
-    init_linkedlist(&(ziinit.central_dir));
-
-
-    zi = (zip_internal*)ALLOC(sizeof(zip_internal));
-    if (zi==NULL)
-    {
-        ZCLOSE(ziinit.z_filefunc,ziinit.filestream);
-        return NULL;
-    }
-
-    /* now we add file in a zipfile */
-#    ifndef NO_ADDFILEINEXISTINGZIP
-    ziinit.globalcomment = NULL;
-    if (append == APPEND_STATUS_ADDINZIP)
-    {
-        uLong byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
-
-        uLong size_central_dir;     /* size of the central directory  */
-        uLong offset_central_dir;   /* offset of start of central directory */
-        uLong central_pos,uL;
-
-        uLong number_disk;          /* number of the current dist, used for
-                                    spaning ZIP, unsupported, always 0*/
-        uLong number_disk_with_CD;  /* number the the disk with central dir, used
-                                    for spaning ZIP, unsupported, always 0*/
-        uLong number_entry;
-        uLong number_entry_CD;      /* total number of entries in
-                                    the central dir
-                                    (same than number_entry on nospan) */
-        uLong size_comment;
-
-        central_pos = ziplocal_SearchCentralDir(&ziinit.z_filefunc,ziinit.filestream);
-        if (central_pos==0)
-            err=ZIP_ERRNO;
-
-        if (ZSEEK(ziinit.z_filefunc, ziinit.filestream,
-                                        central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)
-            err=ZIP_ERRNO;
-
-        /* the signature, already checked */
-        if (ziplocal_getLong(&ziinit.z_filefunc, ziinit.filestream,&uL)!=ZIP_OK)
-            err=ZIP_ERRNO;
-
-        /* number of this disk */
-        if (ziplocal_getShort(&ziinit.z_filefunc, ziinit.filestream,&number_disk)!=ZIP_OK)
-            err=ZIP_ERRNO;
-
-        /* number of the disk with the start of the central directory */
-        if (ziplocal_getShort(&ziinit.z_filefunc, ziinit.filestream,&number_disk_with_CD)!=ZIP_OK)
-            err=ZIP_ERRNO;
-
-        /* total number of entries in the central dir on this disk */
-        if (ziplocal_getShort(&ziinit.z_filefunc, ziinit.filestream,&number_entry)!=ZIP_OK)
-            err=ZIP_ERRNO;
-
-        /* total number of entries in the central dir */
-        if (ziplocal_getShort(&ziinit.z_filefunc, ziinit.filestream,&number_entry_CD)!=ZIP_OK)
-            err=ZIP_ERRNO;
-
-        if ((number_entry_CD!=number_entry) ||
-            (number_disk_with_CD!=0) ||
-            (number_disk!=0))
-            err=ZIP_BADZIPFILE;
-
-        /* size of the central directory */
-        if (ziplocal_getLong(&ziinit.z_filefunc, ziinit.filestream,&size_central_dir)!=ZIP_OK)
-            err=ZIP_ERRNO;
-
-        /* offset of start of central directory with respect to the
-            starting disk number */
-        if (ziplocal_getLong(&ziinit.z_filefunc, ziinit.filestream,&offset_central_dir)!=ZIP_OK)
-            err=ZIP_ERRNO;
-
-        /* zipfile global comment length */
-        if (ziplocal_getShort(&ziinit.z_filefunc, ziinit.filestream,&size_comment)!=ZIP_OK)
-            err=ZIP_ERRNO;
-
-        if ((central_pos0)
-        {
-            ziinit.globalcomment = ALLOC(size_comment+1);
-            if (ziinit.globalcomment)
-            {
-               size_comment = ZREAD(ziinit.z_filefunc, ziinit.filestream,ziinit.globalcomment,size_comment);
-               ziinit.globalcomment[size_comment]=0;
-            }
-        }
-
-        byte_before_the_zipfile = central_pos -
-                                (offset_central_dir+size_central_dir);
-        ziinit.add_position_when_writting_offset = byte_before_the_zipfile;
-
-        {
-            uLong size_central_dir_to_read = size_central_dir;
-            size_t buf_size = SIZEDATA_INDATABLOCK;
-            void* buf_read = (void*)ALLOC(buf_size);
-            if (ZSEEK(ziinit.z_filefunc, ziinit.filestream,
-                  offset_central_dir + byte_before_the_zipfile,
-                  ZLIB_FILEFUNC_SEEK_SET) != 0)
-                  err=ZIP_ERRNO;
-
-            while ((size_central_dir_to_read>0) && (err==ZIP_OK))
-            {
-                uLong read_this = SIZEDATA_INDATABLOCK;
-                if (read_this > size_central_dir_to_read)
-                    read_this = size_central_dir_to_read;
-                if (ZREAD(ziinit.z_filefunc, ziinit.filestream,buf_read,read_this) != read_this)
-                    err=ZIP_ERRNO;
-
-                if (err==ZIP_OK)
-                    err = add_data_in_datablock(&ziinit.central_dir,buf_read,
-                                                (uLong)read_this);
-                size_central_dir_to_read-=read_this;
-            }
-            TRYFREE(buf_read);
-        }
-        ziinit.begin_pos = byte_before_the_zipfile;
-        ziinit.number_entry = number_entry_CD;
-
-        if (ZSEEK(ziinit.z_filefunc, ziinit.filestream,
-                  offset_central_dir+byte_before_the_zipfile,ZLIB_FILEFUNC_SEEK_SET)!=0)
-            err=ZIP_ERRNO;
-    }
-
-    if (globalcomment)
-    {
-      *globalcomment = ziinit.globalcomment;
-    }
-#    endif /* !NO_ADDFILEINEXISTINGZIP*/
-
-    if (err != ZIP_OK)
-    {
-#    ifndef NO_ADDFILEINEXISTINGZIP
-        TRYFREE(ziinit.globalcomment);
-#    endif /* !NO_ADDFILEINEXISTINGZIP*/
-        TRYFREE(zi);
-        return NULL;
-    }
-    else
-    {
-        *zi = ziinit;
-        return (zipFile)zi;
-    }
-}
-
-extern zipFile ZEXPORT zipOpen (pathname, append)
-    const char *pathname;
-    int append;
-{
-    return zipOpen2(pathname,append,NULL,NULL);
-}
-
-extern int ZEXPORT zipOpenNewFileInZip3 (file, filename, zipfi,
-                                         extrafield_local, size_extrafield_local,
-                                         extrafield_global, size_extrafield_global,
-                                         comment, method, level, raw,
-                                         windowBits, memLevel, strategy,
-                                         password, crcForCrypting)
-    zipFile file;
-    const char* filename;
-    const zip_fileinfo* zipfi;
-    const void* extrafield_local;
-    uInt size_extrafield_local;
-    const void* extrafield_global;
-    uInt size_extrafield_global;
-    const char* comment;
-    int method;
-    int level;
-    int raw;
-    int windowBits;
-    int memLevel;
-    int strategy;
-    const char* password;
-    uLong crcForCrypting;
-{
-    zip_internal* zi;
-    uInt size_filename;
-    uInt size_comment;
-    uInt i;
-    int err = ZIP_OK;
-
-#    ifdef NOCRYPT
-    if (password != NULL)
-        return ZIP_PARAMERROR;
-#    endif
-
-    if (file == NULL)
-        return ZIP_PARAMERROR;
-    if ((method!=0) && (method!=Z_DEFLATED))
-        return ZIP_PARAMERROR;
-
-    zi = (zip_internal*)file;
-
-    if (zi->in_opened_file_inzip == 1)
-    {
-        err = zipCloseFileInZip (file);
-        if (err != ZIP_OK)
-            return err;
-    }
-
-
-    if (filename==NULL)
-        filename="-";
-
-    if (comment==NULL)
-        size_comment = 0;
-    else
-        size_comment = (uInt)strlen(comment);
-
-    size_filename = (uInt)strlen(filename);
-
-    if (zipfi == NULL)
-        zi->ci.dosDate = 0;
-    else
-    {
-        if (zipfi->dosDate != 0)
-            zi->ci.dosDate = zipfi->dosDate;
-        else zi->ci.dosDate = ziplocal_TmzDateToDosDate(&zipfi->tmz_date,zipfi->dosDate);
-    }
-
-    zi->ci.flag = 0;
-    if ((level==8) || (level==9))
-      zi->ci.flag |= 2;
-    if ((level==2))
-      zi->ci.flag |= 4;
-    if ((level==1))
-      zi->ci.flag |= 6;
-    if (password != NULL)
-      zi->ci.flag |= 1;
-
-    zi->ci.crc32 = 0;
-    zi->ci.method = method;
-    zi->ci.encrypt = 0;
-    zi->ci.stream_initialised = 0;
-    zi->ci.pos_in_buffered_data = 0;
-    zi->ci.raw = raw;
-    zi->ci.pos_local_header = ZTELL(zi->z_filefunc,zi->filestream) ;
-    zi->ci.size_centralheader = SIZECENTRALHEADER + size_filename +
-                                      size_extrafield_global + size_comment;
-    zi->ci.central_header = (char*)ALLOC((uInt)zi->ci.size_centralheader);
-
-    ziplocal_putValue_inmemory(zi->ci.central_header,(uLong)CENTRALHEADERMAGIC,4);
-    /* version info */
-    ziplocal_putValue_inmemory(zi->ci.central_header+4,(uLong)VERSIONMADEBY,2);
-    ziplocal_putValue_inmemory(zi->ci.central_header+6,(uLong)20,2);
-    ziplocal_putValue_inmemory(zi->ci.central_header+8,(uLong)zi->ci.flag,2);
-    ziplocal_putValue_inmemory(zi->ci.central_header+10,(uLong)zi->ci.method,2);
-    ziplocal_putValue_inmemory(zi->ci.central_header+12,(uLong)zi->ci.dosDate,4);
-    ziplocal_putValue_inmemory(zi->ci.central_header+16,(uLong)0,4); /*crc*/
-    ziplocal_putValue_inmemory(zi->ci.central_header+20,(uLong)0,4); /*compr size*/
-    ziplocal_putValue_inmemory(zi->ci.central_header+24,(uLong)0,4); /*uncompr size*/
-    ziplocal_putValue_inmemory(zi->ci.central_header+28,(uLong)size_filename,2);
-    ziplocal_putValue_inmemory(zi->ci.central_header+30,(uLong)size_extrafield_global,2);
-    ziplocal_putValue_inmemory(zi->ci.central_header+32,(uLong)size_comment,2);
-    ziplocal_putValue_inmemory(zi->ci.central_header+34,(uLong)0,2); /*disk nm start*/
-
-    if (zipfi==NULL)
-        ziplocal_putValue_inmemory(zi->ci.central_header+36,(uLong)0,2);
-    else
-        ziplocal_putValue_inmemory(zi->ci.central_header+36,(uLong)zipfi->internal_fa,2);
-
-    if (zipfi==NULL)
-        ziplocal_putValue_inmemory(zi->ci.central_header+38,(uLong)0,4);
-    else
-        ziplocal_putValue_inmemory(zi->ci.central_header+38,(uLong)zipfi->external_fa,4);
-
-    ziplocal_putValue_inmemory(zi->ci.central_header+42,(uLong)zi->ci.pos_local_header- zi->add_position_when_writting_offset,4);
-
-    for (i=0;ici.central_header+SIZECENTRALHEADER+i) = *(filename+i);
-
-    for (i=0;ici.central_header+SIZECENTRALHEADER+size_filename+i) =
-              *(((const char*)extrafield_global)+i);
-
-    for (i=0;ici.central_header+SIZECENTRALHEADER+size_filename+
-              size_extrafield_global+i) = *(comment+i);
-    if (zi->ci.central_header == NULL)
-        return ZIP_INTERNALERROR;
-
-    /* write the local header */
-    err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)LOCALHEADERMAGIC,4);
-
-    if (err==ZIP_OK)
-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)20,2);/* version needed to extract */
-    if (err==ZIP_OK)
-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.flag,2);
-
-    if (err==ZIP_OK)
-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.method,2);
-
-    if (err==ZIP_OK)
-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.dosDate,4);
-
-    if (err==ZIP_OK)
-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* crc 32, unknown */
-    if (err==ZIP_OK)
-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* compressed size, unknown */
-    if (err==ZIP_OK)
-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* uncompressed size, unknown */
-
-    if (err==ZIP_OK)
-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_filename,2);
-
-    if (err==ZIP_OK)
-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_extrafield_local,2);
-
-    if ((err==ZIP_OK) && (size_filename>0))
-        if (ZWRITE(zi->z_filefunc,zi->filestream,filename,size_filename)!=size_filename)
-                err = ZIP_ERRNO;
-
-    if ((err==ZIP_OK) && (size_extrafield_local>0))
-        if (ZWRITE(zi->z_filefunc,zi->filestream,extrafield_local,size_extrafield_local)
-                                                                           !=size_extrafield_local)
-                err = ZIP_ERRNO;
-
-    zi->ci.stream.avail_in = (uInt)0;
-    zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
-    zi->ci.stream.next_out = zi->ci.buffered_data;
-    zi->ci.stream.total_in = 0;
-    zi->ci.stream.total_out = 0;
-
-    if ((err==ZIP_OK) && (zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
-    {
-        zi->ci.stream.zalloc = (alloc_func)0;
-        zi->ci.stream.zfree = (free_func)0;
-        zi->ci.stream.opaque = (voidpf)0;
-
-        if (windowBits>0)
-            windowBits = -windowBits;
-
-        err = deflateInit2(&zi->ci.stream, level,
-               Z_DEFLATED, windowBits, memLevel, strategy);
-
-        if (err==Z_OK)
-            zi->ci.stream_initialised = 1;
-    }
-#    ifndef NOCRYPT
-    zi->ci.crypt_header_size = 0;
-    if ((err==Z_OK) && (password != NULL))
-    {
-        unsigned char bufHead[RAND_HEAD_LEN];
-        unsigned int sizeHead;
-        zi->ci.encrypt = 1;
-        zi->ci.pcrc_32_tab = get_crc_table();
-        /*init_keys(password,zi->ci.keys,zi->ci.pcrc_32_tab);*/
-
-        sizeHead=crypthead(password,bufHead,RAND_HEAD_LEN,zi->ci.keys,zi->ci.pcrc_32_tab,crcForCrypting);
-        zi->ci.crypt_header_size = sizeHead;
-
-        if (ZWRITE(zi->z_filefunc,zi->filestream,bufHead,sizeHead) != sizeHead)
-                err = ZIP_ERRNO;
-    }
-#    endif
-
-    if (err==Z_OK)
-        zi->in_opened_file_inzip = 1;
-    return err;
-}
-
-extern int ZEXPORT zipOpenNewFileInZip2(file, filename, zipfi,
-                                        extrafield_local, size_extrafield_local,
-                                        extrafield_global, size_extrafield_global,
-                                        comment, method, level, raw)
-    zipFile file;
-    const char* filename;
-    const zip_fileinfo* zipfi;
-    const void* extrafield_local;
-    uInt size_extrafield_local;
-    const void* extrafield_global;
-    uInt size_extrafield_global;
-    const char* comment;
-    int method;
-    int level;
-    int raw;
-{
-    return zipOpenNewFileInZip3 (file, filename, zipfi,
-                                 extrafield_local, size_extrafield_local,
-                                 extrafield_global, size_extrafield_global,
-                                 comment, method, level, raw,
-                                 -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
-                                 NULL, 0);
-}
-
-extern int ZEXPORT zipOpenNewFileInZip (file, filename, zipfi,
-                                        extrafield_local, size_extrafield_local,
-                                        extrafield_global, size_extrafield_global,
-                                        comment, method, level)
-    zipFile file;
-    const char* filename;
-    const zip_fileinfo* zipfi;
-    const void* extrafield_local;
-    uInt size_extrafield_local;
-    const void* extrafield_global;
-    uInt size_extrafield_global;
-    const char* comment;
-    int method;
-    int level;
-{
-    return zipOpenNewFileInZip2 (file, filename, zipfi,
-                                 extrafield_local, size_extrafield_local,
-                                 extrafield_global, size_extrafield_global,
-                                 comment, method, level, 0);
-}
-
-local int zipFlushWriteBuffer(zi)
-  zip_internal* zi;
-{
-    int err=ZIP_OK;
-
-    if (zi->ci.encrypt != 0)
-    {
-#ifndef NOCRYPT
-        uInt i;
-        int t;
-        for (i=0;ici.pos_in_buffered_data;i++)
-            zi->ci.buffered_data[i] = zencode(zi->ci.keys, zi->ci.pcrc_32_tab,
-                                       zi->ci.buffered_data[i],t);
-#endif
-    }
-    if (ZWRITE(zi->z_filefunc,zi->filestream,zi->ci.buffered_data,zi->ci.pos_in_buffered_data)
-                                                                    !=zi->ci.pos_in_buffered_data)
-      err = ZIP_ERRNO;
-    zi->ci.pos_in_buffered_data = 0;
-    return err;
-}
-
-extern int ZEXPORT zipWriteInFileInZip (file, buf, len)
-    zipFile file;
-    const void* buf;
-    unsigned len;
-{
-    zip_internal* zi;
-    int err=ZIP_OK;
-
-    if (file == NULL)
-        return ZIP_PARAMERROR;
-    zi = (zip_internal*)file;
-
-    if (zi->in_opened_file_inzip == 0)
-        return ZIP_PARAMERROR;
-
-    zi->ci.stream.next_in = (void*)buf;
-    zi->ci.stream.avail_in = len;
-    zi->ci.crc32 = crc32(zi->ci.crc32,buf,len);
-
-    while ((err==ZIP_OK) && (zi->ci.stream.avail_in>0))
-    {
-        if (zi->ci.stream.avail_out == 0)
-        {
-            if (zipFlushWriteBuffer(zi) == ZIP_ERRNO)
-                err = ZIP_ERRNO;
-            zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
-            zi->ci.stream.next_out = zi->ci.buffered_data;
-        }
-
-
-        if(err != ZIP_OK)
-            break;
-
-        if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
-        {
-            uLong uTotalOutBefore = zi->ci.stream.total_out;
-            err=deflate(&zi->ci.stream,  Z_NO_FLUSH);
-            zi->ci.pos_in_buffered_data += (uInt)(zi->ci.stream.total_out - uTotalOutBefore) ;
-
-        }
-        else
-        {
-            uInt copy_this,i;
-            if (zi->ci.stream.avail_in < zi->ci.stream.avail_out)
-                copy_this = zi->ci.stream.avail_in;
-            else
-                copy_this = zi->ci.stream.avail_out;
-            for (i=0;ici.stream.next_out)+i) =
-                    *(((const char*)zi->ci.stream.next_in)+i);
-            {
-                zi->ci.stream.avail_in -= copy_this;
-                zi->ci.stream.avail_out-= copy_this;
-                zi->ci.stream.next_in+= copy_this;
-                zi->ci.stream.next_out+= copy_this;
-                zi->ci.stream.total_in+= copy_this;
-                zi->ci.stream.total_out+= copy_this;
-                zi->ci.pos_in_buffered_data += copy_this;
-            }
-        }
-    }
-
-    return err;
-}
-
-extern int ZEXPORT zipCloseFileInZipRaw (file, uncompressed_size, crc32)
-    zipFile file;
-    uLong uncompressed_size;
-    uLong crc32;
-{
-    zip_internal* zi;
-    uLong compressed_size;
-    int err=ZIP_OK;
-
-    if (file == NULL)
-        return ZIP_PARAMERROR;
-    zi = (zip_internal*)file;
-
-    if (zi->in_opened_file_inzip == 0)
-        return ZIP_PARAMERROR;
-    zi->ci.stream.avail_in = 0;
-
-    if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
-        while (err==ZIP_OK)
-    {
-        uLong uTotalOutBefore;
-        if (zi->ci.stream.avail_out == 0)
-        {
-            if (zipFlushWriteBuffer(zi) == ZIP_ERRNO)
-                err = ZIP_ERRNO;
-            zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
-            zi->ci.stream.next_out = zi->ci.buffered_data;
-        }
-        uTotalOutBefore = zi->ci.stream.total_out;
-        err=deflate(&zi->ci.stream,  Z_FINISH);
-        zi->ci.pos_in_buffered_data += (uInt)(zi->ci.stream.total_out - uTotalOutBefore) ;
-    }
-
-    if (err==Z_STREAM_END)
-        err=ZIP_OK; /* this is normal */
-
-    if ((zi->ci.pos_in_buffered_data>0) && (err==ZIP_OK))
-        if (zipFlushWriteBuffer(zi)==ZIP_ERRNO)
-            err = ZIP_ERRNO;
-
-    if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
-    {
-        err=deflateEnd(&zi->ci.stream);
-        zi->ci.stream_initialised = 0;
-    }
-
-    if (!zi->ci.raw)
-    {
-        crc32 = (uLong)zi->ci.crc32;
-        uncompressed_size = (uLong)zi->ci.stream.total_in;
-    }
-    compressed_size = (uLong)zi->ci.stream.total_out;
-#    ifndef NOCRYPT
-    compressed_size += zi->ci.crypt_header_size;
-#    endif
-
-    ziplocal_putValue_inmemory(zi->ci.central_header+16,crc32,4); /*crc*/
-    ziplocal_putValue_inmemory(zi->ci.central_header+20,
-                                compressed_size,4); /*compr size*/
-    if (zi->ci.stream.data_type == Z_ASCII)
-        ziplocal_putValue_inmemory(zi->ci.central_header+36,(uLong)Z_ASCII,2);
-    ziplocal_putValue_inmemory(zi->ci.central_header+24,
-                                uncompressed_size,4); /*uncompr size*/
-
-    if (err==ZIP_OK)
-        err = add_data_in_datablock(&zi->central_dir,zi->ci.central_header,
-                                       (uLong)zi->ci.size_centralheader);
-    free(zi->ci.central_header);
-
-    if (err==ZIP_OK)
-    {
-        long cur_pos_inzip = ZTELL(zi->z_filefunc,zi->filestream);
-        if (ZSEEK(zi->z_filefunc,zi->filestream,
-                  zi->ci.pos_local_header + 14,ZLIB_FILEFUNC_SEEK_SET)!=0)
-            err = ZIP_ERRNO;
-
-        if (err==ZIP_OK)
-            err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,crc32,4); /* crc 32, unknown */
-
-        if (err==ZIP_OK) /* compressed size, unknown */
-            err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,compressed_size,4);
-
-        if (err==ZIP_OK) /* uncompressed size, unknown */
-            err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,uncompressed_size,4);
-
-        if (ZSEEK(zi->z_filefunc,zi->filestream,
-                  cur_pos_inzip,ZLIB_FILEFUNC_SEEK_SET)!=0)
-            err = ZIP_ERRNO;
-    }
-
-    zi->number_entry ++;
-    zi->in_opened_file_inzip = 0;
-
-    return err;
-}
-
-extern int ZEXPORT zipCloseFileInZip (file)
-    zipFile file;
-{
-    return zipCloseFileInZipRaw (file,0,0);
-}
-
-extern int ZEXPORT zipClose (file, global_comment)
-    zipFile file;
-    const char* global_comment;
-{
-    zip_internal* zi;
-    int err = 0;
-    uLong size_centraldir = 0;
-    uLong centraldir_pos_inzip;
-    uInt size_global_comment;
-    if (file == NULL)
-        return ZIP_PARAMERROR;
-    zi = (zip_internal*)file;
-
-    if (zi->in_opened_file_inzip == 1)
-    {
-        err = zipCloseFileInZip (file);
-    }
-
-#ifndef NO_ADDFILEINEXISTINGZIP
-    if (global_comment==NULL)
-        global_comment = zi->globalcomment;
-#endif
-    if (global_comment==NULL)
-        size_global_comment = 0;
-    else
-        size_global_comment = (uInt)strlen(global_comment);
-
-    centraldir_pos_inzip = ZTELL(zi->z_filefunc,zi->filestream);
-    if (err==ZIP_OK)
-    {
-        linkedlist_datablock_internal* ldi = zi->central_dir.first_block ;
-        while (ldi!=NULL)
-        {
-            if ((err==ZIP_OK) && (ldi->filled_in_this_block>0))
-                if (ZWRITE(zi->z_filefunc,zi->filestream,
-                           ldi->data,ldi->filled_in_this_block)
-                              !=ldi->filled_in_this_block )
-                    err = ZIP_ERRNO;
-
-            size_centraldir += ldi->filled_in_this_block;
-            ldi = ldi->next_datablock;
-        }
-    }
-    free_datablock(zi->central_dir.first_block);
-
-    if (err==ZIP_OK) /* Magic End */
-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)ENDHEADERMAGIC,4);
-
-    if (err==ZIP_OK) /* number of this disk */
-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,2);
-
-    if (err==ZIP_OK) /* number of the disk with the start of the central directory */
-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,2);
-
-    if (err==ZIP_OK) /* total number of entries in the central dir on this disk */
-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->number_entry,2);
-
-    if (err==ZIP_OK) /* total number of entries in the central dir */
-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->number_entry,2);
-
-    if (err==ZIP_OK) /* size of the central directory */
-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_centraldir,4);
-
-    if (err==ZIP_OK) /* offset of start of central directory with respect to the
-                            starting disk number */
-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,
-                                (uLong)(centraldir_pos_inzip - zi->add_position_when_writting_offset),4);
-
-    if (err==ZIP_OK) /* zipfile comment length */
-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_global_comment,2);
-
-    if ((err==ZIP_OK) && (size_global_comment>0))
-        if (ZWRITE(zi->z_filefunc,zi->filestream,
-                   global_comment,size_global_comment) != size_global_comment)
-                err = ZIP_ERRNO;
-
-    if (ZCLOSE(zi->z_filefunc,zi->filestream) != 0)
-        if (err == ZIP_OK)
-            err = ZIP_ERRNO;
-
-#ifndef NO_ADDFILEINEXISTINGZIP
-    TRYFREE(zi->globalcomment);
-#endif
-    TRYFREE(zi);
-
-    return err;
-}
diff --git a/src/server/collision/BoundingIntervalHierarchy.h b/src/server/collision/BoundingIntervalHierarchy.h
index 2ee4e207c19..d4d41a66d30 100644
--- a/src/server/collision/BoundingIntervalHierarchy.h
+++ b/src/server/collision/BoundingIntervalHierarchy.h
@@ -19,11 +19,11 @@
 #ifndef _BIH_H
 #define _BIH_H
 
-#include "Vector3.h"
-#include "Ray.h"
-#include "AABox.h"
+#include "G3D/Vector3.h"
+#include "G3D/Ray.h"
+#include "G3D/AABox.h"
 
-#include 
+#include "Define.h"
 
 #include 
 #include 
diff --git a/src/server/collision/CMakeLists.txt b/src/server/collision/CMakeLists.txt
index a67cd8d660a..913ec7ecd01 100644
--- a/src/server/collision/CMakeLists.txt
+++ b/src/server/collision/CMakeLists.txt
@@ -24,13 +24,12 @@ SET(collision_STAT_SRCS
 include_directories(
   ${ACE_INCLUDE_DIR}
   ${CMAKE_SOURCE_DIR}/externals/g3dlite
-  ${CMAKE_SOURCE_DIR}/externals/g3dlite/G3D.lib
-  ${CMAKE_SOURCE_DIR}/externals/g3dlite/G3D.lib/include
-  ${CMAKE_SOURCE_DIR}/externals/g3dlite/G3D.lib/include/G3D
   ${CMAKE_SOURCE_DIR}/src/server/shared
   ${CMAKE_SOURCE_DIR}/src/server/shared/Dynamic
   ${CMAKE_SOURCE_DIR}/src/server/collision
+  ${CMAKE_SOURCE_DIR}/src/server/collision/Management
   ${CMAKE_SOURCE_DIR}/src/server/collision/Maps
+  ${CMAKE_SOURCE_DIR}/src/server/collision/Models
 )
 
 add_library(collision STATIC ${collision_STAT_SRCS})
diff --git a/src/server/collision/Management/VMapManager2.h b/src/server/collision/Management/VMapManager2.h
index 5f03b87b07f..953a8f11fa7 100644
--- a/src/server/collision/Management/VMapManager2.h
+++ b/src/server/collision/Management/VMapManager2.h
@@ -20,8 +20,8 @@
 #define _VMAPMANAGER2_H
 
 #include "IVMapManager.h"
-#include "Utilities/UnorderedMap.h"
-#include "Platform/Define.h"
+#include "Dynamic/UnorderedMap.h"
+#include "Define.h"
 #include 
 
 //===========================================================
diff --git a/src/server/collision/Maps/TileAssembler.cpp b/src/server/collision/Maps/TileAssembler.cpp
index d01b54a7564..0b9780130ed 100644
--- a/src/server/collision/Maps/TileAssembler.cpp
+++ b/src/server/collision/Maps/TileAssembler.cpp
@@ -19,7 +19,7 @@
 #include "WorldModel.h"
 #include "TileAssembler.h"
 #include "MapTree.h"
-#include "BIH.h"
+#include "BoundingIntervalHierarchy.h"
 #include "VMapDefinitions.h"
 
 #include 
-- 
cgit v1.2.3


From c08a7d6348a06d3b84d9a2c620a903d832199dd9 Mon Sep 17 00:00:00 2001
From: Brian 
Date: Mon, 7 Jun 2010 19:04:11 -0600
Subject: * Finally it compiles (thanks click for noticing the "typo"). *
 However, still need to get linking fixed.

--HG--
branch : trunk
---
 src/server/CMakeLists.txt                | 2 +-
 src/server/collision/Maps/MapTree.h      | 4 ++--
 src/server/collision/Models/WorldModel.h | 2 +-
 src/server/worldserver/CMakeLists.txt    | 2 --
 4 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
index ccf7b894eb4..1a6321c23e3 100644
--- a/src/server/CMakeLists.txt
+++ b/src/server/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_subdirectory(shared)
 add_subdirectory(game)
-#add_subdirectory(collision)
+add_subdirectory(collision)
 if (DO_SCRIPTS)
    add_subdirectory(scripts)
 endif (DO_SCRIPTS)
diff --git a/src/server/collision/Maps/MapTree.h b/src/server/collision/Maps/MapTree.h
index 282f34d42fd..7a7af43e949 100644
--- a/src/server/collision/Maps/MapTree.h
+++ b/src/server/collision/Maps/MapTree.h
@@ -20,8 +20,8 @@
 #define _MAPTREE_H
 
 #include "Define.h"
-#include "UnorderedMap.h"
-#include "BoundingIntervalHierarchy.cpp"
+#include "Dynamic/UnorderedMap.h"
+#include "BoundingIntervalHierarchy.h"
 
 namespace VMAP
 {
diff --git a/src/server/collision/Models/WorldModel.h b/src/server/collision/Models/WorldModel.h
index b23f4ae3f00..7d5c921ef6e 100644
--- a/src/server/collision/Models/WorldModel.h
+++ b/src/server/collision/Models/WorldModel.h
@@ -23,7 +23,7 @@
 #include 
 #include 
 #include 
-#include "BoundingIntervalHierarchy.cpp"
+#include "BoundingIntervalHierarchy.h"
 
 #include "Define.h"
 
diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt
index 0cedd5da0ca..c908e6617f2 100644
--- a/src/server/worldserver/CMakeLists.txt
+++ b/src/server/worldserver/CMakeLists.txt
@@ -137,8 +137,6 @@ trinitydatabase
 trinityauth
 trinityconfig
 collision
-g3dlite
-jmalloc
 ${SCRIPT_LIB}
 ${READLINE_LIBRARY}
 ${TERMCAP_LIBRARY}
-- 
cgit v1.2.3


From f867f6d7a8f728e163ba785f2da45ec97fa8ba53 Mon Sep 17 00:00:00 2001
From: click 
Date: Tue, 8 Jun 2010 08:04:26 +0200
Subject: Get g3dlib, zlib and jemalloc to build again

--HG--
branch : trunk
rename : opt/cleanup/tab2spaces.sh => contrib/cleanup/tab2spaces.sh
rename : opt/cleanup/whitespace.sh => contrib/cleanup/whitespace.sh
rename : opt/conf_merge/README => contrib/conf_merge/README
rename : opt/conf_merge/index.php => contrib/conf_merge/index.php
rename : opt/conf_merge/merge.php => contrib/conf_merge/merge.php
rename : doc/AuctionHouseBot.txt => docs/AuctionHouseBot.txt
rename : doc/DocStructure.dox => docs/DocStructure.dox
rename : doc/Doxyfile.in => docs/Doxyfile.in
rename : doc/EventAI.txt => docs/EventAI.txt
rename : doc/HowToScript.txt => docs/HowToScript.txt
rename : doc/TextTables.txt => docs/TextTables.txt
rename : doc/UnixInstall.txt => docs/UnixInstall.txt
rename : externals/jemalloc/include/internal/arena.h => externals/jemalloc/jemalloc/internal/arena.h
rename : externals/jemalloc/include/internal/base.h => externals/jemalloc/jemalloc/internal/base.h
rename : externals/jemalloc/include/internal/chunk.h => externals/jemalloc/jemalloc/internal/chunk.h
rename : externals/jemalloc/include/internal/chunk_dss.h => externals/jemalloc/jemalloc/internal/chunk_dss.h
rename : externals/jemalloc/include/internal/chunk_mmap.h => externals/jemalloc/jemalloc/internal/chunk_mmap.h
rename : externals/jemalloc/include/internal/chunk_swap.h => externals/jemalloc/jemalloc/internal/chunk_swap.h
rename : externals/jemalloc/include/internal/ckh.h => externals/jemalloc/jemalloc/internal/ckh.h
rename : externals/jemalloc/include/internal/ctl.h => externals/jemalloc/jemalloc/internal/ctl.h
rename : externals/jemalloc/include/internal/extent.h => externals/jemalloc/jemalloc/internal/extent.h
rename : externals/jemalloc/include/internal/hash.h => externals/jemalloc/jemalloc/internal/hash.h
rename : externals/jemalloc/include/internal/huge.h => externals/jemalloc/jemalloc/internal/huge.h
rename : externals/jemalloc/include/internal/jemalloc_internal.h => externals/jemalloc/jemalloc/internal/jemalloc_internal.h
rename : externals/jemalloc/include/internal/jemalloc_internal.h.in => externals/jemalloc/jemalloc/internal/jemalloc_internal.h.in
rename : externals/jemalloc/include/internal/mb.h => externals/jemalloc/jemalloc/internal/mb.h
rename : externals/jemalloc/include/internal/mutex.h => externals/jemalloc/jemalloc/internal/mutex.h
rename : externals/jemalloc/include/internal/prof.h => externals/jemalloc/jemalloc/internal/prof.h
rename : externals/jemalloc/include/internal/ql.h => externals/jemalloc/jemalloc/internal/ql.h
rename : externals/jemalloc/include/internal/qr.h => externals/jemalloc/jemalloc/internal/qr.h
rename : externals/jemalloc/include/internal/rb.h => externals/jemalloc/jemalloc/internal/rb.h
rename : externals/jemalloc/include/internal/stats.h => externals/jemalloc/jemalloc/internal/stats.h
rename : externals/jemalloc/include/internal/tcache.h => externals/jemalloc/jemalloc/internal/tcache.h
rename : externals/jemalloc/include/internal/totally_not_p_r_n.h => externals/jemalloc/jemalloc/internal/totally_not_p_r_n.h
rename : externals/jemalloc/include/jemalloc.h => externals/jemalloc/jemalloc/jemalloc.h
rename : externals/jemalloc/include/jemalloc.h.in => externals/jemalloc/jemalloc/jemalloc.h.in
rename : externals/jemalloc/include/jemalloc_defs.h => externals/jemalloc/jemalloc/jemalloc_defs.h
rename : externals/jemalloc/include/jemalloc_defs.h.in => externals/jemalloc/jemalloc/jemalloc_defs.h.in
---
 CMakeLists.txt                                     |  158 +-
 contrib/cleanup/tab2spaces.sh                      |    2 +
 contrib/cleanup/whitespace.sh                      |    2 +
 contrib/conf_merge/README                          |    6 +
 contrib/conf_merge/index.php                       |   40 +
 contrib/conf_merge/merge.php                       |  159 ++
 doc/AuctionHouseBot.txt                            |  236 --
 doc/DocStructure.dox                               |   31 -
 doc/Doxyfile.in                                    | 1314 -----------
 doc/EventAI.txt                                    |  868 -------
 doc/HowToScript.txt                                |   27 -
 doc/TextTables.txt                                 |   87 -
 doc/UnixInstall.txt                                |   61 -
 docs/AuctionHouseBot.txt                           |  236 ++
 docs/DocStructure.dox                              |   31 +
 docs/Doxyfile.in                                   | 1314 +++++++++++
 docs/EventAI.txt                                   |  868 +++++++
 docs/HowToScript.txt                               |   27 +
 docs/TextTables.txt                                |   87 +
 docs/UnixInstall.txt                               |   61 +
 externals/CMakeLists.txt                           |    7 +
 externals/PackageList.txt                          |   17 +-
 externals/bzip2/CHANGES                            |  319 ---
 externals/bzip2/CMakeLists.txt                     |   10 +
 externals/bzip2/LICENSE                            |   42 -
 externals/g3dlite/AABox.cpp                        |  366 +++
 externals/g3dlite/Any.cpp                          | 1237 ++++++++++
 externals/g3dlite/BinaryFormat.cpp                 |   81 +
 externals/g3dlite/BinaryInput.cpp                  |  568 +++++
 externals/g3dlite/BinaryOutput.cpp                 |  522 +++++
 externals/g3dlite/Box.cpp                          |  393 ++++
 externals/g3dlite/CMakeLists.txt                   |   11 +
 externals/g3dlite/Capsule.cpp                      |  179 ++
 externals/g3dlite/CollisionDetection.cpp           | 2455 ++++++++++++++++++++
 externals/g3dlite/CoordinateFrame.cpp              |  436 ++++
 externals/g3dlite/Crypto.cpp                       |   70 +
 externals/g3dlite/Cylinder.cpp                     |  176 ++
 externals/g3dlite/Line.cpp                         |   89 +
 externals/g3dlite/LineSegment.cpp                  |  236 ++
 externals/g3dlite/Log.cpp                          |  146 ++
 externals/g3dlite/Matrix3.cpp                      | 1927 +++++++++++++++
 externals/g3dlite/Matrix4.cpp                      |  523 +++++
 externals/g3dlite/MemoryManager.cpp                |   91 +
 externals/g3dlite/Plane.cpp                        |  149 ++
 externals/g3dlite/Quat.cpp                         |  583 +++++
 externals/g3dlite/Random.cpp                       |  212 ++
 externals/g3dlite/Ray.cpp                          |  218 ++
 externals/g3dlite/ReferenceCount.cpp               |   61 +
 externals/g3dlite/Sphere.cpp                       |  223 ++
 externals/g3dlite/System.cpp                       | 1746 ++++++++++++++
 externals/g3dlite/TextInput.cpp                    | 1136 +++++++++
 externals/g3dlite/TextOutput.cpp                   |  452 ++++
 externals/g3dlite/Triangle.cpp                     |  186 ++
 externals/g3dlite/UprightFrame.cpp                 |  132 ++
 externals/g3dlite/Vector2.cpp                      |  224 ++
 externals/g3dlite/Vector3.cpp                      |  507 ++++
 externals/g3dlite/Vector4.cpp                      |  520 +++++
 externals/g3dlite/debugAssert.cpp                  |  389 ++++
 externals/g3dlite/fileutils.cpp                    | 1165 ++++++++++
 externals/g3dlite/format.cpp                       |  164 ++
 externals/g3dlite/g3dfnmatch.cpp                   |  204 ++
 externals/g3dlite/g3dmath.cpp                      |  108 +
 externals/g3dlite/prompt.cpp                       |  729 ++++++
 externals/g3dlite/stringutils.cpp                  |  275 +++
 externals/jemalloc/CMakeLists.txt                  |   32 +-
 externals/jemalloc/include/internal/arena.h        |  537 -----
 externals/jemalloc/include/internal/base.h         |   24 -
 externals/jemalloc/include/internal/chunk.h        |   61 -
 externals/jemalloc/include/internal/chunk_dss.h    |   29 -
 externals/jemalloc/include/internal/chunk_mmap.h   |   20 -
 externals/jemalloc/include/internal/chunk_swap.h   |   33 -
 externals/jemalloc/include/internal/ckh.h          |   95 -
 externals/jemalloc/include/internal/ctl.h          |  117 -
 externals/jemalloc/include/internal/extent.h       |   49 -
 externals/jemalloc/include/internal/hash.h         |   70 -
 externals/jemalloc/include/internal/huge.h         |   38 -
 .../jemalloc/include/internal/jemalloc_internal.h  |  561 -----
 .../include/internal/jemalloc_internal.h.in        |  561 -----
 externals/jemalloc/include/internal/mb.h           |  108 -
 externals/jemalloc/include/internal/mutex.h        |   61 -
 externals/jemalloc/include/internal/prof.h         |  171 --
 externals/jemalloc/include/internal/ql.h           |   83 -
 externals/jemalloc/include/internal/qr.h           |   67 -
 externals/jemalloc/include/internal/rb.h           |  973 --------
 externals/jemalloc/include/internal/stats.h        |  174 --
 externals/jemalloc/include/internal/tcache.h       |  380 ---
 .../jemalloc/include/internal/totally_not_p_r_n.h  |   60 -
 externals/jemalloc/include/jemalloc.h              |   42 -
 externals/jemalloc/include/jemalloc.h.in           |   42 -
 externals/jemalloc/include/jemalloc_defs.h         |  102 -
 externals/jemalloc/include/jemalloc_defs.h.in      |  101 -
 externals/jemalloc/jemalloc/internal/arena.h       |  537 +++++
 externals/jemalloc/jemalloc/internal/base.h        |   24 +
 externals/jemalloc/jemalloc/internal/chunk.h       |   61 +
 externals/jemalloc/jemalloc/internal/chunk_dss.h   |   29 +
 externals/jemalloc/jemalloc/internal/chunk_mmap.h  |   20 +
 externals/jemalloc/jemalloc/internal/chunk_swap.h  |   33 +
 externals/jemalloc/jemalloc/internal/ckh.h         |   95 +
 externals/jemalloc/jemalloc/internal/ctl.h         |  117 +
 externals/jemalloc/jemalloc/internal/extent.h      |   49 +
 externals/jemalloc/jemalloc/internal/hash.h        |   70 +
 externals/jemalloc/jemalloc/internal/huge.h        |   38 +
 .../jemalloc/jemalloc/internal/jemalloc_internal.h |  561 +++++
 .../jemalloc/internal/jemalloc_internal.h.in       |  561 +++++
 externals/jemalloc/jemalloc/internal/mb.h          |  108 +
 externals/jemalloc/jemalloc/internal/mutex.h       |   61 +
 externals/jemalloc/jemalloc/internal/prof.h        |  171 ++
 externals/jemalloc/jemalloc/internal/ql.h          |   83 +
 externals/jemalloc/jemalloc/internal/qr.h          |   67 +
 externals/jemalloc/jemalloc/internal/rb.h          |  973 ++++++++
 externals/jemalloc/jemalloc/internal/stats.h       |  174 ++
 externals/jemalloc/jemalloc/internal/tcache.h      |  380 +++
 .../jemalloc/jemalloc/internal/totally_not_p_r_n.h |   60 +
 externals/jemalloc/jemalloc/jemalloc.h             |   42 +
 externals/jemalloc/jemalloc/jemalloc.h.in          |   42 +
 externals/jemalloc/jemalloc/jemalloc_defs.h        |  102 +
 externals/jemalloc/jemalloc/jemalloc_defs.h.in     |  101 +
 externals/mersennetwister/delme                    |    0
 externals/sockets/CMakeLists.txt                   |   24 +-
 externals/sockets/Makefile                         |  136 ++
 externals/zlib/CMakeLists.txt                      |   12 +
 externals/zlib/ChangeLog                           | 1208 ----------
 externals/zlib/README                              |  115 -
 opt/cleanup/tab2spaces.sh                          |    2 -
 opt/cleanup/whitespace.sh                          |    2 -
 opt/conf_merge/README                              |    6 -
 opt/conf_merge/index.php                           |   40 -
 opt/conf_merge/merge.php                           |  159 --
 src/server/collision/CMakeLists.txt                |   12 +-
 src/server/game/CMakeLists.txt                     |    4 +-
 src/server/worldserver/CMakeLists.txt              |    4 +
 131 files changed, 26568 insertions(+), 9205 deletions(-)
 create mode 100644 contrib/cleanup/tab2spaces.sh
 create mode 100644 contrib/cleanup/whitespace.sh
 create mode 100644 contrib/conf_merge/README
 create mode 100644 contrib/conf_merge/index.php
 create mode 100644 contrib/conf_merge/merge.php
 delete mode 100644 doc/AuctionHouseBot.txt
 delete mode 100644 doc/DocStructure.dox
 delete mode 100644 doc/Doxyfile.in
 delete mode 100644 doc/EventAI.txt
 delete mode 100644 doc/HowToScript.txt
 delete mode 100644 doc/TextTables.txt
 delete mode 100644 doc/UnixInstall.txt
 create mode 100644 docs/AuctionHouseBot.txt
 create mode 100644 docs/DocStructure.dox
 create mode 100644 docs/Doxyfile.in
 create mode 100644 docs/EventAI.txt
 create mode 100644 docs/HowToScript.txt
 create mode 100644 docs/TextTables.txt
 create mode 100644 docs/UnixInstall.txt
 create mode 100644 externals/CMakeLists.txt
 delete mode 100644 externals/bzip2/CHANGES
 create mode 100644 externals/bzip2/CMakeLists.txt
 delete mode 100644 externals/bzip2/LICENSE
 create mode 100644 externals/g3dlite/AABox.cpp
 create mode 100644 externals/g3dlite/Any.cpp
 create mode 100644 externals/g3dlite/BinaryFormat.cpp
 create mode 100644 externals/g3dlite/BinaryInput.cpp
 create mode 100644 externals/g3dlite/BinaryOutput.cpp
 create mode 100644 externals/g3dlite/Box.cpp
 create mode 100644 externals/g3dlite/CMakeLists.txt
 create mode 100644 externals/g3dlite/Capsule.cpp
 create mode 100644 externals/g3dlite/CollisionDetection.cpp
 create mode 100644 externals/g3dlite/CoordinateFrame.cpp
 create mode 100644 externals/g3dlite/Crypto.cpp
 create mode 100644 externals/g3dlite/Cylinder.cpp
 create mode 100644 externals/g3dlite/Line.cpp
 create mode 100644 externals/g3dlite/LineSegment.cpp
 create mode 100644 externals/g3dlite/Log.cpp
 create mode 100644 externals/g3dlite/Matrix3.cpp
 create mode 100644 externals/g3dlite/Matrix4.cpp
 create mode 100644 externals/g3dlite/MemoryManager.cpp
 create mode 100644 externals/g3dlite/Plane.cpp
 create mode 100644 externals/g3dlite/Quat.cpp
 create mode 100644 externals/g3dlite/Random.cpp
 create mode 100644 externals/g3dlite/Ray.cpp
 create mode 100644 externals/g3dlite/ReferenceCount.cpp
 create mode 100644 externals/g3dlite/Sphere.cpp
 create mode 100644 externals/g3dlite/System.cpp
 create mode 100644 externals/g3dlite/TextInput.cpp
 create mode 100644 externals/g3dlite/TextOutput.cpp
 create mode 100644 externals/g3dlite/Triangle.cpp
 create mode 100644 externals/g3dlite/UprightFrame.cpp
 create mode 100644 externals/g3dlite/Vector2.cpp
 create mode 100644 externals/g3dlite/Vector3.cpp
 create mode 100644 externals/g3dlite/Vector4.cpp
 create mode 100644 externals/g3dlite/debugAssert.cpp
 create mode 100644 externals/g3dlite/fileutils.cpp
 create mode 100644 externals/g3dlite/format.cpp
 create mode 100644 externals/g3dlite/g3dfnmatch.cpp
 create mode 100644 externals/g3dlite/g3dmath.cpp
 create mode 100644 externals/g3dlite/prompt.cpp
 create mode 100644 externals/g3dlite/stringutils.cpp
 delete mode 100644 externals/jemalloc/include/internal/arena.h
 delete mode 100644 externals/jemalloc/include/internal/base.h
 delete mode 100644 externals/jemalloc/include/internal/chunk.h
 delete mode 100644 externals/jemalloc/include/internal/chunk_dss.h
 delete mode 100644 externals/jemalloc/include/internal/chunk_mmap.h
 delete mode 100644 externals/jemalloc/include/internal/chunk_swap.h
 delete mode 100644 externals/jemalloc/include/internal/ckh.h
 delete mode 100644 externals/jemalloc/include/internal/ctl.h
 delete mode 100644 externals/jemalloc/include/internal/extent.h
 delete mode 100644 externals/jemalloc/include/internal/hash.h
 delete mode 100644 externals/jemalloc/include/internal/huge.h
 delete mode 100644 externals/jemalloc/include/internal/jemalloc_internal.h
 delete mode 100644 externals/jemalloc/include/internal/jemalloc_internal.h.in
 delete mode 100644 externals/jemalloc/include/internal/mb.h
 delete mode 100644 externals/jemalloc/include/internal/mutex.h
 delete mode 100644 externals/jemalloc/include/internal/prof.h
 delete mode 100644 externals/jemalloc/include/internal/ql.h
 delete mode 100644 externals/jemalloc/include/internal/qr.h
 delete mode 100644 externals/jemalloc/include/internal/rb.h
 delete mode 100644 externals/jemalloc/include/internal/stats.h
 delete mode 100644 externals/jemalloc/include/internal/tcache.h
 delete mode 100644 externals/jemalloc/include/internal/totally_not_p_r_n.h
 delete mode 100644 externals/jemalloc/include/jemalloc.h
 delete mode 100644 externals/jemalloc/include/jemalloc.h.in
 delete mode 100644 externals/jemalloc/include/jemalloc_defs.h
 delete mode 100644 externals/jemalloc/include/jemalloc_defs.h.in
 create mode 100644 externals/jemalloc/jemalloc/internal/arena.h
 create mode 100644 externals/jemalloc/jemalloc/internal/base.h
 create mode 100644 externals/jemalloc/jemalloc/internal/chunk.h
 create mode 100644 externals/jemalloc/jemalloc/internal/chunk_dss.h
 create mode 100644 externals/jemalloc/jemalloc/internal/chunk_mmap.h
 create mode 100644 externals/jemalloc/jemalloc/internal/chunk_swap.h
 create mode 100644 externals/jemalloc/jemalloc/internal/ckh.h
 create mode 100644 externals/jemalloc/jemalloc/internal/ctl.h
 create mode 100644 externals/jemalloc/jemalloc/internal/extent.h
 create mode 100644 externals/jemalloc/jemalloc/internal/hash.h
 create mode 100644 externals/jemalloc/jemalloc/internal/huge.h
 create mode 100644 externals/jemalloc/jemalloc/internal/jemalloc_internal.h
 create mode 100644 externals/jemalloc/jemalloc/internal/jemalloc_internal.h.in
 create mode 100644 externals/jemalloc/jemalloc/internal/mb.h
 create mode 100644 externals/jemalloc/jemalloc/internal/mutex.h
 create mode 100644 externals/jemalloc/jemalloc/internal/prof.h
 create mode 100644 externals/jemalloc/jemalloc/internal/ql.h
 create mode 100644 externals/jemalloc/jemalloc/internal/qr.h
 create mode 100644 externals/jemalloc/jemalloc/internal/rb.h
 create mode 100644 externals/jemalloc/jemalloc/internal/stats.h
 create mode 100644 externals/jemalloc/jemalloc/internal/tcache.h
 create mode 100644 externals/jemalloc/jemalloc/internal/totally_not_p_r_n.h
 create mode 100644 externals/jemalloc/jemalloc/jemalloc.h
 create mode 100644 externals/jemalloc/jemalloc/jemalloc.h.in
 create mode 100644 externals/jemalloc/jemalloc/jemalloc_defs.h
 create mode 100644 externals/jemalloc/jemalloc/jemalloc_defs.h.in
 delete mode 100644 externals/mersennetwister/delme
 create mode 100644 externals/sockets/Makefile
 create mode 100644 externals/zlib/CMakeLists.txt
 delete mode 100644 externals/zlib/ChangeLog
 delete mode 100644 externals/zlib/README
 delete mode 100644 opt/cleanup/tab2spaces.sh
 delete mode 100644 opt/cleanup/whitespace.sh
 delete mode 100644 opt/conf_merge/README
 delete mode 100644 opt/conf_merge/index.php
 delete mode 100644 opt/conf_merge/merge.php

(limited to 'src')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e33a04eaaf6..e7384b93cae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,19 +12,22 @@ include(cmake/PCH.cmake)
 # Force out-of-source build
 string(COMPARE EQUAL "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" BUILDING_IN_SOURCE)
 if(BUILDING_IN_SOURCE)
-    message(FATAL_ERROR "This project requires an out of source build. Remove the file 'CMakeCache.txt' found in this directory before continuing, and create a separate build directory and run 'cmake path_to_project [options]' from there.")    
+  message(FATAL_ERROR "This project requires an out of source build. Remove the file 'CMakeCache.txt' found in this directory before continuing, and create a separate build directory and run 'cmake path_to_project [options]' from there.")    
 endif(BUILDING_IN_SOURCE)
 
 # Select the Release build configuration by default.
 if(NOT CMAKE_BUILD_TYPE)
-    set(CMAKE_BUILD_TYPE "Release")
+  set(CMAKE_BUILD_TYPE "Release")
 endif(NOT CMAKE_BUILD_TYPE)
 
 CONFIGURE_FILE(
-    "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
-    "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
-    IMMEDIATE @ONLY)
-add_custom_target(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
+  "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
+  "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+  IMMEDIATE @ONLY)
+
+add_custom_target(uninstall
+  "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+)
 
 option(CENTOS "CENTOS" 0)
 option(DO_CLI "With CLI" 1)
@@ -38,49 +41,49 @@ option(DO_TOOLS "Compile tools" 0)
 option(DO_WARN "Enable all compile warnings" 0)
 
 set(GENREV_SRC
-src/genrevision/genrevision.cpp
+  src/genrevision/genrevision.cpp
 )
 
 if(DO_DEBUG)
-    add_executable(genrev
+  add_executable(genrev
     ${GENREV_SRC}
-    )
-    add_custom_target("revision.h" ALL
-        COMMAND "${CMAKE_BINARY_DIR}/genrev"
-        ${CMAKE_SOURCE_DIR}
-        WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/src/shared"
-        DEPENDS genrev
-    )
+  )
+  add_custom_target("revision.h" ALL
+    COMMAND "${CMAKE_BINARY_DIR}/genrev"
+    ${CMAKE_SOURCE_DIR}
+    WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/src/server/shared"
+    DEPENDS genrev
+  )
 else (DO_DEBUG)
-    add_executable(genrev
+  add_executable(genrev
     ${GENREV_SRC}
-    )
-    add_custom_target("revision.h" ALL
-        COMMAND "${CMAKE_BINARY_DIR}/genrev"
-        ${CMAKE_SOURCE_DIR}
-        WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/src/server/shared"
-        DEPENDS genrev
-    )
+  )
+  add_custom_target("revision.h" ALL
+    COMMAND "${CMAKE_BINARY_DIR}/genrev"
+    ${CMAKE_SOURCE_DIR}
+    WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/src/server/shared"
+    DEPENDS genrev
+  )
 endif(DO_DEBUG)
 
-
 execute_process(
-        COMMAND hg tip --template {rev}
-        WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
-        OUTPUT_VARIABLE HG_REVISION
+  COMMAND hg tip --template {rev}
+  WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
+  OUTPUT_VARIABLE HG_REVISION
 )
 
 message("* TrinityCore revision: ${HG_REVISION}")
 
 if(PREFIX)
-    set(CMAKE_INSTALL_PREFIX ${PREFIX})
+  set(CMAKE_INSTALL_PREFIX ${PREFIX})
 endif(PREFIX)
 
 if(CONF_DIR)
 
 else(CONF_DIR)
-    set(CONF_DIR ${PREFIX}/etc)
+  set(CONF_DIR ${PREFIX}/etc)
 endif(CONF_DIR)
+
 set(LIBSDIR ${CMAKE_INSTALL_PREFIX}/lib)
 
 message("* Will install to: ${CMAKE_INSTALL_PREFIX}")
@@ -91,98 +94,97 @@ find_library(SSLLIB NAMES ssl DOC "SSL library")
 find_library(ZLIB z "Zlib library")
 
 if(DO_MYSQL)
-    message("* With MySQL")
-    FIND_MYSQL()
-    ADD_DEFINITIONS(-DDO_MYSQL)
+  message("* With MySQL")
+  FIND_MYSQL()
+  ADD_DEFINITIONS(-DDO_MYSQL)
 endif(DO_MYSQL)
 
 if(DO_SCRIPTS)
-    message("* With Trinity Scripts")
-    ADD_DEFINITIONS(-DDO_SCRIPTS)
-    add_definitions(-D_TRINITY_SCRIPT_CONFIG='"${CONF_DIR}/trinitycore.conf"')
+  message("* With Trinity Scripts")
+  ADD_DEFINITIONS(-DDO_SCRIPTS)
+  add_definitions(-D_TRINITY_SCRIPT_CONFIG='"${CONF_DIR}/trinitycore.conf"')
 else (DO_SCRIPTS)
-    message("* Without Trinity Scripts")
+  message("* Without Trinity Scripts")
 endif(DO_SCRIPTS)
 
 message("-- Miscellaneus options:")
 
 if(DO_CLI)
-    message("* With CLI")
-    add_definitions(-DENABLE_CLI)
+  message("* With CLI")
+  add_definitions(-DENABLE_CLI)
 else (DO_CLI)
-    message(* Without CLI)
+  message(* Without CLI)
 endif(DO_CLI)
 
 if(DO_RA)
-    message("* With RA")
-    add_definitions(-DENABLE_RA)
+  message("* With RA")
+  add_definitions(-DENABLE_RA)
 else(DO_RA)
-    message("* Without RA")
+  message("* Without RA")
 endif(DO_RA)
 
 if(DO_DEBUG)
-    message("* Debug mode ON")
-    add_definitions(-g -DTRINITY_DEBUG)
+  message("* Debug mode ON")
+  add_definitions(-g -DTRINITY_DEBUG)
 endif(DO_DEBUG)
 
 if(DO_WARN)
-    message("* All warnings mode")
-    add_definitions(-Wall -Wfatal-errors -Wextra)
+  message("* All warnings mode")
+  add_definitions(-Wall -Wfatal-errors -Wextra)
 endif(DO_WARN)
 
 if(DO_SQL)
-    message("* Installing SQL files")
+  message("* Installing SQL files")
 else (DO_SQL)
-    message("* NOT installing SQL files")
+  message("* NOT installing SQL files")
 endif(DO_SQL)
 
 if(DO_PCH)
-    message("* Using precompiled headers")
+  message("* Using precompiled headers")
 else (DO_PCH)
-    message("* NOT using precompiled headers")
+  message("* NOT using precompiled headers")
 endif(DO_PCH)
 
 if(DO_TOOLS)
-    message("* With Tools")
+  message("* With Tools")
 else (DO_TOOLS)
-    message("* Without Tools")
+  message("* Without Tools")
 endif(DO_TOOLS)
 
-
 if(UNIX)
-    if(CENTOS)
-        add_definitions(-DCENTOS)
-        message("* Building with termcap")
-        FIND_TERMCAP()
-    else(CENTOS)
-        message("* Building with readline")
-        FIND_READLINE()
-    endif(CENTOS)
+  if(CENTOS)
+    add_definitions(-DCENTOS)
+    message("* Building with termcap")
+    FIND_TERMCAP()
+  else(CENTOS)
+    message("* Building with readline")
+    FIND_READLINE()
+  endif(CENTOS)
 endif(UNIX)
 
 FIND_ACE(ACE)
 if(ACE_FOUND)
-    message(STATUS "Found ACE library: ${ACE_LIBRARY}")
-    message(STATUS "Include dir is: ${ACE_INCLUDE_DIR}")
+  message(STATUS "Found ACE library: ${ACE_LIBRARY}")
+  message(STATUS "Include dir is: ${ACE_INCLUDE_DIR}")
 else(ACE_FOUND)
-    message(SEND_ERROR "** ACE library not found! Trinity Core cannot be compiled!")
-    message(SEND_ERROR "** Please build ACE from http://www.cs.wustl.edu/~schmidt/ACE.html")
-    #For now remove msg about install from repo, as ubuntu/debian don't have needed ver in repos.
-    #message(SEND_ERROR "** your distro may provide a binary for ACE e.g. for ubuntu try apt-get install libace-dev")
-    return()
-    #set(BUILD_ACE 1)
-    #set(ACE_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/dep/ACE_wrappers ${CMAKE_BINARY_DIR}/dep/ACE_wrappers")
-    #set(ACE_LIBRARY ACE)
-    #message(STATUS "I will try to build ACE from: ${ACE_INCLUDE_DIR}")
-    #message(STATUS "And link using: ${ACE_LIBRARY}")
+  message(SEND_ERROR "** ACE library not found! Trinity Core cannot be compiled!")
+  message(SEND_ERROR "** Please build ACE from http://www.cs.wustl.edu/~schmidt/ACE.html")
+  #For now remove msg about install from repo, as ubuntu/debian don't have needed ver in repos.
+  #message(SEND_ERROR "** your distro may provide a binary for ACE e.g. for ubuntu try apt-get install libace-dev")
+  return()
+  #set(BUILD_ACE 1)
+  #set(ACE_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/dep/ACE_wrappers ${CMAKE_BINARY_DIR}/dep/ACE_wrappers")
+  #set(ACE_LIBRARY ACE)
+  #message(STATUS "I will try to build ACE from: ${ACE_INCLUDE_DIR}")
+  #message(STATUS "And link using: ${ACE_LIBRARY}")
 endif(ACE_FOUND)
 
 #somehow line below don't work. so for now change it to if exist
 #check_include_files(${ACE_INCLUDE_DIR}/ace/Stack_Trace.h HAVE_ACE_STACK_TRACE_H)
 if(EXISTS ${ACE_INCLUDE_DIR}/ace/Stack_Trace.h)
-    set(HAVE_ACE_STACK_TRACE_H 1)
+  set(HAVE_ACE_STACK_TRACE_H 1)
 else(EXISTS ${ACE_INCLUDE_DIR}/ace/Stack_Trace.h)
-    message(STATUS "** Your libace is out of date. Please update your libace!")
+  message(STATUS "** Your libace is out of date. Please update your libace!")
 endif(EXISTS ${ACE_INCLUDE_DIR}/ace/Stack_Trace.h)
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
@@ -201,8 +203,10 @@ set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
 set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
 set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
+add_subdirectory(externals)
 add_subdirectory(src)
+
 if(DO_SQL)
-    message("* Copy SQL files ON")
-    add_subdirectory(sql)
+  message("* Copy SQL files ON")
+  add_subdirectory(sql)
 endif(DO_SQL)
diff --git a/contrib/cleanup/tab2spaces.sh b/contrib/cleanup/tab2spaces.sh
new file mode 100644
index 00000000000..1022be7905c
--- /dev/null
+++ b/contrib/cleanup/tab2spaces.sh
@@ -0,0 +1,2 @@
+# Be sure to specify files instead of * when running the script.
+perl -p -i -e "s/\t/    /g" *
diff --git a/contrib/cleanup/whitespace.sh b/contrib/cleanup/whitespace.sh
new file mode 100644
index 00000000000..a351e25359b
--- /dev/null
+++ b/contrib/cleanup/whitespace.sh
@@ -0,0 +1,2 @@
+# Be sure to specify files instead of * when running the script.
+perl -p -i -e "s/ +$//g" *
diff --git a/contrib/conf_merge/README b/contrib/conf_merge/README
new file mode 100644
index 00000000000..3d027b7ad42
--- /dev/null
+++ b/contrib/conf_merge/README
@@ -0,0 +1,6 @@
+This is a PHP script for merging a new .dist file with your existing .conf file (trinitycore and trinityrealm)
+It should also work with mangos dist/conf files as well.
+
+It uses sessions so it is multi user safe, it adds any options that are removed to the bottom of the file,
+commented out, just in case it removes something it shouldn't,
+and, if you add all of your custom patch configs below "# Custom" they will be copied exactly as they are.
diff --git a/contrib/conf_merge/index.php b/contrib/conf_merge/index.php
new file mode 100644
index 00000000000..537937caf64
--- /dev/null
+++ b/contrib/conf_merge/index.php
@@ -0,0 +1,40 @@
+
+
+

+Dist File
+

+
+

+Current Conf File
+

+
+

+Win32 -
+UNIX/Linux
+

+
+

+If you have any custom settings, such as from patches,
+

+make sure they are at the bottom of the file following
+

+this block (add it if it's not there)
+

+###############################################################################
+

+# Custom
+

+###############################################################################
+

+

+
+

diff --git a/contrib/conf_merge/merge.php b/contrib/conf_merge/merge.php
new file mode 100644
index 00000000000..6d8bedbaa08
--- /dev/null
+++ b/contrib/conf_merge/merge.php
@@ -0,0 +1,159 @@
+ $v)
+        {
+            if (array_key_exists($k, $array1))
+            {
+                $array1[$k] = $v;
+                unset($array2[$k]);
+            }
+        }
+        $in_file1 = fopen($upload1,r);
+        $line = trim(fgets($in_file1));
+        while (!feof($in_file1))
+        {
+            if (substr($line,0,1) != '#' && substr($line,0,1) != '')
+            {
+                $array = array();
+                while (substr($line,0,1) != '#' && substr($line,0,1) != '')
+                {
+                    list($key, $val) = explode("=",$line);
+                    $key = trim($key);
+                    $val = trim($val);
+                    $array[$key] = $val;
+                    $line = trim(fgets($in_file1));
+                }
+                foreach($array as $k => $v)
+                {
+                    if (array_key_exists($k, $array1))
+                        fwrite($out_file, $k."=".$array1[$k].$eol);
+                    else
+                        continue;
+                }
+                unset($array);
+                if (!feof($in_file1))
+                    fwrite($out_file, $line.$eol);
+            }
+            else
+                fwrite($out_file, $line.$eol);
+            $line = trim(fgets($in_file1));
+        }
+        if ($custom_found)
+        {
+            fwrite($out_file, $eol);
+            fwrite($out_file, "###############################################################################".$eol);
+            fwrite($out_file, "# Custom".$eol);
+            $line = trim(fgets($in_file2));
+            while (!feof($in_file2))
+            {
+                fwrite($out_file, $line.$eol);
+                $line = trim(fgets($in_file2));
+            }
+        }
+        $first = true;
+        foreach($array2 as $k => $v)
+        {
+            if ($first)
+            {
+                fwrite($out_file, $eol);
+                fwrite($out_file, "###############################################################################".$eol);
+                fwrite($out_file, "#      The Following values were removed from the config.".$eol);
+                $first = false;
+            }
+            fwrite($out_file, "#          ".$k."=".$v.$eol);
+        }
+        unset($array1);
+        unset($array2);
+        fclose($in_file1);
+        fclose($in_file2);
+        fclose($out_file);
+        unlink($upload1);
+        unlink($upload2);
+
+        echo "Process done";
+        echo "
Click here to retrieve your merged conf";
+    }
+}
+else
+{
+    echo "An error has occurred";
+}
+?>
diff --git a/doc/AuctionHouseBot.txt b/doc/AuctionHouseBot.txt
deleted file mode 100644
index cc15a084c9a..00000000000
--- a/doc/AuctionHouseBot.txt
+++ /dev/null
@@ -1,236 +0,0 @@
-Populates the auction houses with items. It can make the game feel a bit more
-like official on small servers. Items and prices are chosen randomly based on
-the parameters you define. If an auction expires, auctions are deleted quietly.
-AHBot will not buy it's own items, and will not receive mail from the AH
-or get returned mail.
-
-===============================================================================
-~~HOW TO CONFIGURE~~
-===============================================================================
-Step 1.) Create a character that you are going to use as the auction house bot
-         character. This character will be the auction's owner for all the
-         items created by the bot.
-Step 2.) Go into the realm database and note the account number for the
-         character.
-Step 3.) Go into the characters database and note the character's GUID.
-Step 4.) Log in at least once with this character.
-         (Do not change the configuration before this)
-Step 5.) Tune the configuration options in the configuration file and the
-         Database.
-
-#These are the settings in the configuration file:
-AuctionHouseBot.DEBUG = 0
-AuctionHouseBot.EnableSeller = 0
-AuctionHouseBot.EnableBuyer = 0
-AuctionHouseBot.UseBuyPriceForSeller = 0
-AuctionHouseBot.UseBuyPriceForBuyer = 0
-AuctionHouseBot.Account = 0
-AuctionHouseBot.GUID = 0
-AuctionHouseBot.ItemsPerCycle = 200
-
-AuctionHouseBot.DEBUG enables (1) or disables (0) Debug output
-AuctionHouseBot.EnableSeller enables (1) or disables (0) the Seller
-AuctionHouseBot.EnableBuyer enables (1) or disables (0) the Buyer
-AuctionHouseBot.UseBuyPriceForSeller Use SellPrice (0) or BuyPrice (1) for determining prices
-AuctionHouseBot.UseBuyPriceForBuyer Use SellPrice (0) or BuyPrice (1) for determining prices
-AuctionHouseBot.Account is the account number (in realmd->account table) of the player you want to run as the auction bot. Note: a value of 0 will disable the bot.
-AuctionHouseBot.GUID is the GUID (in characters->characters table) of the player you want to run as the auction bot. Note: a value of 0 will disable the bot.
-AuctionHouseBot.ItemsPerCycle determines how many items are added each time AHBot is run (once per minute, by default)
-
-#These are the Filters For filtering certain items/trade goods from the AH
-AuctionHouseBot.VendorItems = 0
-AuctionHouseBot.VendorTradeGoods = 0
-AuctionHouseBot.LootItems = 1
-AuctionHouseBot.LootTradeGoods = 1
-AuctionHouseBot.OtherItems = 0
-AuctionHouseBot.OtherTradeGoods = 0
-AuctionHouseBot.No_Bind = 1
-AuctionHouseBot.Bind_When_Picked_Up = 0
-AuctionHouseBot.Bind_When_Equipped = 1
-AuctionHouseBot.Bind_When_Use = 1
-AuctionHouseBot.Bind_Quest_Item = 0
-AuctionHouseBot.DisableBeta_PTR_Unused = 0
-AuctionHouseBot.DisablePermEnchant = 0
-AuctionHouseBot.DisableConjured = 0
-AuctionHouseBot.DisableGems = 0
-AuctionHouseBot.DisableMoney = 0
-AuctionHouseBot.DisableMoneyLoot = 0
-AuctionHouseBot.DisableLootable = 0
-AuctionHouseBot.DisableKeys = 0
-AuctionHouseBot.DisableDuration = 0
-AuctionHouseBot.DisableBOP_Or_Quest_NoReqLevel = 0
-
-AuctionHouseBot.VendorItems is a boolean value (0 or 1) that indicates whether to include Vendor only items
-AuctionHouseBot.VendorTradeGoods is a boolean value (0 or 1) that indicates whether to include Vendor only Trade Goods
-AuctionHouseBot.LootItems  is a boolean value (0 or 1) that indicates whether to include Loot/Fish/Skin/etc. only items
-AuctionHouseBot.LootTradeGoods  is a boolean value (0 or 1) that indicates whether to include Loot/Fish/Skin/etc. only Trade Goods
-AuctionHouseBot.OtherItems  is a boolean value (0 or 1) that indicates whether to include Other items not covered by the first 2
-AuctionHouseBot.OtherTradeGoods  is a boolean value (0 or 1) that indicates whether to include Other Trade Goods not covered by the first 2
-AuctionHouseBot.No_Bind is a boolean value (0 or 1) that indicates whether to include items with a bonding of 0
-AuctionHouseBot.Bind_When_Picked_Up = is a boolean value (0 or 1) that indicates whether to include items with a bonding of 1
-AuctionHouseBot.Bind_When_Equipped = is a boolean value (0 or 1) that indicates whether to include items with a bonding of 2
-AuctionHouseBot.Bind_When_Use = is a boolean value (0 or 1) that indicates whether to include items with a bonding of 3
-AuctionHouseBot.Bind_Quest_Item = is a boolean value (0 or 1) that indicates whether to include items with a bonding of 4
-AuctionHouseBot.DisableBeta_PTR_Unused is a boolean value (0 or 1) that will Disable certain items that are usually unavailable to Players
-AuctionHouseBot.DisablePermEnchant is a boolean value (0 or 1) that will Disable Items with a Permanent Enchantment
-AuctionHouseBot.DisableConjured is a boolean value (0 or 1) that will Disable Conjured Items
-AuctionHouseBot.DisableGems is a boolean value (0 or 1) that will Disable Gems
-AuctionHouseBot.DisableMoney is a boolean value (0 or 1) that will Disable Items that are used as money
-AuctionHouseBot.DisableMoneyLoot is a boolean value (0 or 1) that will Disable Items that have Money as a loot
-AuctionHouseBot.DisableLootable is a boolean value (0 or 1) that will Disable Items that have other items as loot
-AuctionHouseBot.DisableKeys is a boolean value (0 or 1) that will Disable Items that are keys
-AuctionHouseBot.DisableDuration is a boolean value (0 or 1) that will Disable Items with a duration
-AuctionHouseBot.DisableBOP_Or_Quest_NoReqLevel is a boolean value (0 or 1) that will Disable items that are BOP or Quest Item with a Required level that is less than the Item Level
-
-#These Filters are boolean (0 or 1) and will disable items that are
-#specifically meant for the Class named.
-#(UnusedClass is Class 10, which was skipped for some reason)
-AuctionHouseBot.DisableWarriorItems = 0
-AuctionHouseBot.DisablePaladinItems = 0
-AuctionHouseBot.DisableHunterItems = 0
-AuctionHouseBot.DisableRogueItems = 0
-AuctionHouseBot.DisablePriestItems = 0
-AuctionHouseBot.DisableDKItems = 0
-AuctionHouseBot.DisableShamanItems = 0
-AuctionHouseBot.DisableMageItems = 0
-AuctionHouseBot.DisableWarlockItems = 0
-AuctionHouseBot.DisableUnusedClassItems = 0
-AuctionHouseBot.DisableDruidItems = 0
-
-#These are the Filters For filtering certain items/trade goods from the AH
-AuctionHouseBot.DisableItemsBelowLevel = 0
-AuctionHouseBot.DisableItemsAboveLevel = 0
-AuctionHouseBot.DisableTGsBelowLevel = 0
-AuctionHouseBot.DisableTGsAboveLevel = 0
-AuctionHouseBot.DisableItemsBelowGUID = 0
-AuctionHouseBot.DisableItemsAboveGUID = 0
-AuctionHouseBot.DisableTGsBelowGUID = 0
-AuctionHouseBot.DisableTGsAboveGUID = 0
-AuctionHouseBot.DisableItemsBelowReqLevel = 0
-AuctionHouseBot.DisableItemsAboveReqLevel = 0
-AuctionHouseBot.DisableTGsBelowReqLevel = 0
-AuctionHouseBot.DisableTGsAboveReqLevel = 0
-AuctionHouseBot.DisableItemsBelowReqSkillRank = 0
-AuctionHouseBot.DisableItemsAboveReqSkillRank = 0
-AuctionHouseBot.DisableTGsBelowReqSkillRank = 0
-AuctionHouseBot.DisableTGsAboveReqSkillRank = 0
-
-#These are the settings in the Database:
-#Each Auctionhouse has it's own set of these
-
-MinItems = 0
-#The Minimum number of items you want to keep in the auction houses.
-#(default 0 - minimum will be the same as maximum).
-#If it is higher than the value of the corresponding maxItems setting,
-#it will be set down to match the maxItems setting.
-
-MaxItems = 0
-#The Maximum number of items you want to keep in the auction houses.
-
-#These must add up to 100 each one is the percentage
-#of the auction items that should be trade goods of
-#that quality. A value of 0 will disable.
-
-PercentGreyTradeGoods = 0
-PercentWhiteTradeGoods = 27
-PercentGreenTradeGoods = 12
-PercentBlueTradeGoods = 10
-PercentPurpleTradeGoods = 1
-PercentOrangeTradeGoods = 0
-PercentYellowTradeGoods = 0
-
-PercentGreyItems = 0
-PercentWhiteItems = 10
-PercentGreenItems = 30
-PercentBlueItems = 8
-PercentPurpleItems = 2
-PercentOrangeItems = 0
-PercentYellowItems = 0
-
-#MinPrice(Color)    is the minimum price adjustment for items. For example the default is 150, which means 150%. So if an item vendors for 1g it would go to auction for a minimum of 1.5g.
-#MaxPrice(Color)    is the maximum price adjustment for items.
-#MinBidPrice(Color) these two control the starting bid as a percent of the buyout price. For example, if MinBidPrice is 30 and MaxBidPrice is 80 the starting bid for the auction will randomly be between 30-80% of the randomly chosen buyout price.
-#MaxBidPrice(Color) these two control the starting bid as a percent of the buyout price. For example, if MinBidPrice is 30 and MaxBidPrice is 80 the starting bid for the auction will randomly be between 30-80% of the randomly chosen buyout price.
-#MaxStack(Color)    is maximum stack size to create for this quality type. A value of zero will disable the maximum stack size for this quality allowing the bot to create stacks (of random size) of items as big as the item type allows.
-
-MinPriceGrey = 100
-MaxPriceGrey = 150
-MinBidPriceGrey = 70
-MaxBidPriceGrey = 100
-MaxStackGrey = 0
-MinPriceWhite = 150
-MaxPriceWhite = 250
-MinBidPriceWhite = 70
-MaxBidPriceWhite = 100
-MaxStackWhite = 0
-MinPriceGreen = 800
-MaxPriceGreen = 1400
-MinBidPriceGreen = 80
-MaxBidPriceGreen = 100
-MaxStackGreen = 0
-MinPriceBlue = 1250
-MaxPriceBlue = 1750
-MinBidPriceBlue = 75
-MaxBidPriceBlue = 100
-MaxStackBlue = 0
-MinPricePurple = 2250
-MaxPricePurple = 4550
-MinBidPricePurple = 80
-MaxBidPricePurple = 100
-MaxStackPurple = 0
-MinPriceOrange = 4250
-MaxPriceOrange = 5550
-MinBidPriceOrange = 80
-MaxBidPriceOrange = 100
-MaxStackOrange = 0
-MinPriceYellow = 5250
-MaxPriceYellow = 6550
-MinBidPriceYellow = 80
-MaxBidPriceYellow = 100
-MaxStackYellow = 0
-
-#These are the multipliers that are applied to the vendor price for an item, that determines if AHBot will buy it or not.
-#1 means AHBot will pay the same as (or less than) a vendor would pay, 2 means up to twice as much, etc.
-
-BuyerPriceGrey = 1
-BuyerPriceWhite = 3
-BuyerPriceGreen = 5
-BuyerPriceBlue = 12
-BuyerPricePurple = 15
-BuyerPriceOrange = 20
-BuyerPriceYellow = 22
-
-#BuyerBiddingInterval is the time (in minutes) between bids.
-#BuyerBidsPerInterval is the number of bids the buyer will make in a cycle
-
-BuyerBiddingInterval = 1
-BuyerBidsPerInterval = 1
-
-
-
-How to use ahcommands from the console (CLI) or in game with GM level 3 players:
-ahbotoptions - will display usage instructions
-ahbotoptions help - will display the list of commands
-
-ahexpire - will expire all the auctions in the requested auction house that were created by AHBot.
-minitems - will set the minimum number of items in the AH before it starts being filled again.
-maxitems - will set the maximum number of items in the AH.
-percentages - will set the percentage of each quality in the AH
-minprice - will set the minimum price multiplier for auctions.
-maxprice - will set the maximum price multiplier for auctions.
-minbidprice - will set the minimum starting bid as a percent of the buyout price for auctions.
-maxbidprice - will set the maximum starting bid as a percent of the buyout price for auctions.
-maxstack - will set the maximum number of items in stacks for auctions. 0 will set the maximum to the maximum for that item type.
-buyerprice - will set the bid price multiplier for auctions.
-biddinginterval - will set the number of minutes between bids on auctions.
-bidsperinterval - will set the number of bids to enter per cycle.
-
-The auction house IDs are:
-2 - Alliance
-6 - Horde
-7 - Neutral
-
-
-AHBot Originally made by Chris K. Currently maintained by Paradox
-Much thanks to Chris K, grether and Dolomit6!
-AHBot Now includes AHBuyer created by Kerbe as a derivative of AHBot, and later modified by Paradox
diff --git a/doc/DocStructure.dox b/doc/DocStructure.dox
deleted file mode 100644
index dee8b5a0877..00000000000
--- a/doc/DocStructure.dox
+++ /dev/null
@@ -1,31 +0,0 @@
-/*! \mainpage
- *
- * \section intro_sec Introduction and links
- * This is the source documentation for the \b %MaNGOS (Massive Network Game %Object Server) project.\n
- * %MaNGOS is an object-oriented Massively Multiplayer Online Role-Playing Game Server (MMORPGS).\n
- * The project documentation and the bug tracker can be found on the %MaNGOS wiki.
- *
- * \section begin Where to begin?
- * If you are interested in understanding the source code of this project you can begin
- * - On the wiki to get an overview of the different modules of the server
- * - In this source doumentation, starting at the module hierarchy
- */
- 
-/*! \defgroup realmd Realm Daemon
- */
- 
-/*! \defgroup mangos Mangos Deamon
- */
-
-/*! \defgroup mangosd Daemon starter
-    \ingroup mangos
- */
- 
-/*! \defgroup u2w User Connections
-    \ingroup mangos
- */ 
-
-/*! \defgroup world The World
-    \ingroup mangos
- */ 
-
diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
deleted file mode 100644
index 9893593751c..00000000000
--- a/doc/Doxyfile.in
+++ /dev/null
@@ -1,1314 +0,0 @@
-# Doxyfile 1.5.3
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project
-#
-# All text after a hash (#) is considered a comment and will be ignored
-# The format is:
-#       TAG = value [value, ...]
-# For lists items can also be appended using:
-#       TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ")
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-
-# This tag specifies the encoding used for all characters in the config file that 
-# follow. The default is UTF-8 which is also the encoding used for all text before 
-# the first occurrence of this tag. Doxygen uses libiconv (or the iconv built into 
-# libc) for the transcoding. See http://www.gnu.org/software/libiconv for the list of 
-# possible encodings.
-
-DOXYFILE_ENCODING      = UTF-8
-
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
-# by quotes) that should identify the project.
-
-PROJECT_NAME           = @PACKAGE@
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number. 
-# This could be handy for archiving the generated documentation or 
-# if some version control system is used.
-
-PROJECT_NUMBER         = @VERSION@
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
-# base path where the generated documentation will be put. 
-# If a relative path is entered, it will be relative to the location 
-# where doxygen was started. If left blank the current directory will be used.
-
-OUTPUT_DIRECTORY       = ./
-
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
-# 4096 sub-directories (in 2 levels) under the output directory of each output 
-# format and will distribute the generated files over these directories. 
-# Enabling this option can be useful when feeding doxygen a huge amount of 
-# source files, where putting all generated files in the same directory would 
-# otherwise cause performance problems for the file system.
-
-CREATE_SUBDIRS         = NO
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all 
-# documentation generated by doxygen is written. Doxygen will use this 
-# information to generate all constant output in the proper language. 
-# The default language is English, other supported languages are: 
-# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, 
-# Croatian, Czech, Danish, Dutch, Finnish, French, German, Greek, Hungarian, 
-# Italian, Japanese, Japanese-en (Japanese with English messages), Korean, 
-# Korean-en, Lithuanian, Norwegian, Polish, Portuguese, Romanian, Russian, 
-# Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian.
-
-OUTPUT_LANGUAGE        = English
-
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
-# include brief member descriptions after the members that are listed in 
-# the file and class documentation (similar to JavaDoc). 
-# Set to NO to disable this.
-
-BRIEF_MEMBER_DESC      = YES
-
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend 
-# the brief description of a member or function before the detailed description. 
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the 
-# brief descriptions will be completely suppressed.
-
-REPEAT_BRIEF           = YES
-
-# This tag implements a quasi-intelligent brief description abbreviator 
-# that is used to form the text in various listings. Each string 
-# in this list, if found as the leading text of the brief description, will be 
-# stripped from the text and the result after processing the whole list, is 
-# used as the annotated text. Otherwise, the brief description is used as-is. 
-# If left blank, the following values are used ("$name" is automatically 
-# replaced with the name of the entity): "The $name class" "The $name widget" 
-# "The $name file" "is" "provides" "specifies" "contains" 
-# "represents" "a" "an" "the"
-
-ABBREVIATE_BRIEF       = 
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then 
-# Doxygen will generate a detailed section even if there is only a brief 
-# description.
-
-ALWAYS_DETAILED_SEC    = NO
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all 
-# inherited members of a class in the documentation of that class as if those 
-# members were ordinary class members. Constructors, destructors and assignment 
-# operators of the base classes will not be shown.
-
-INLINE_INHERITED_MEMB  = NO
-
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full 
-# path before files name in the file list and in the header files. If set 
-# to NO the shortest path that makes the file name unique will be used.
-
-FULL_PATH_NAMES        = NO
-
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
-# can be used to strip a user-defined part of the path. Stripping is 
-# only done if one of the specified strings matches the left-hand part of 
-# the path. The tag can be used to show relative paths in the file list. 
-# If left blank the directory from which doxygen is run is used as the 
-# path to strip.
-
-STRIP_FROM_PATH        = @top_srcdir@/
-
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
-# the path mentioned in the documentation of a class, which tells 
-# the reader which header file to include in order to use a class. 
-# If left blank only the name of the header file containing the class 
-# definition is used. Otherwise one should specify the include paths that 
-# are normally passed to the compiler using the -I flag.
-
-STRIP_FROM_INC_PATH    = 
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
-# (but less readable) file names. This can be useful is your file systems 
-# doesn't support long names like on DOS, Mac, or CD-ROM.
-
-SHORT_NAMES            = NO
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
-# will interpret the first line (until the first dot) of a JavaDoc-style 
-# comment as the brief description. If set to NO, the JavaDoc 
-# comments will behave just like regular Qt-style comments 
-# (thus requiring an explicit @brief command for a brief description.)
-
-JAVADOC_AUTOBRIEF      = YES
-
-# If the QT_AUTOBRIEF tag is set to YES then Doxygen will 
-# interpret the first line (until the first dot) of a Qt-style 
-# comment as the brief description. If set to NO, the comments 
-# will behave just like regular Qt-style comments (thus requiring 
-# an explicit \brief command for a brief description.)
-
-QT_AUTOBRIEF           = NO
-
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen 
-# treat a multi-line C++ special comment block (i.e. a block of //! or /// 
-# comments) as a brief description. This used to be the default behaviour. 
-# The new default is to treat a multi-line C++ comment block as a detailed 
-# description. Set this tag to YES if you prefer the old behaviour instead.
-
-MULTILINE_CPP_IS_BRIEF = NO
-
-# If the DETAILS_AT_TOP tag is set to YES then Doxygen 
-# will output the detailed description near the top, like JavaDoc.
-# If set to NO, the detailed description appears after the member 
-# documentation.
-
-DETAILS_AT_TOP         = NO
-
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
-# member inherits the documentation from any documented member that it 
-# re-implements.
-
-INHERIT_DOCS           = YES
-
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce 
-# a new page for each member. If set to NO, the documentation of a member will 
-# be part of the file/class/namespace that contains it.
-
-SEPARATE_MEMBER_PAGES  = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab. 
-# Doxygen uses this value to replace tabs by spaces in code fragments.
-
-TAB_SIZE               = 4
-
-# This tag can be used to specify a number of aliases that acts 
-# as commands in the documentation. An alias has the form "name=value". 
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to 
-# put the command \sideeffect (or @sideeffect) in the documentation, which 
-# will result in a user-defined paragraph with heading "Side Effects:". 
-# You can put \n's in the value part of an alias to insert newlines.
-
-ALIASES                = "memo=\par Note:\n " \
-                         "draft=\xrefitem draft \"Draft\" \"Draft List\"  This API may be changed in the future versions and was introduced in " \
-                         "stable=\xrefitem stable \"Stable\" \"Stable List\" " \
-                         "deprecated=\xrefitem deprecated \"Deprecated\" \"Deprecated List\" " \
-                         "obsolete=\xrefitem obsolete \"Obsolete\" \"Obsolete List\" " \
-                         "system=\xrefitem system \"System\" \"System List\" \n Do not use unless you know what you are doing. " \
-                         "internal=\xrefitem internal \"Internal\"  \"Internal List\"  Do not use. This API is for interal use only. "
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C 
-# sources only. Doxygen will then generate output that is more tailored for C. 
-# For instance, some of the names that are used will be different. The list 
-# of all members will be omitted, etc.
-
-OPTIMIZE_OUTPUT_FOR_C  = YES
-
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java 
-# sources only. Doxygen will then generate output that is more tailored for Java. 
-# For instance, namespaces will be presented as packages, qualified scopes 
-# will look different, etc.
-
-OPTIMIZE_OUTPUT_JAVA   = NO
-
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want to 
-# include (a tag file for) the STL sources as input, then you should 
-# set this tag to YES in order to let doxygen match functions declarations and 
-# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. 
-# func(std::string) {}). This also make the inheritance and collaboration 
-# diagrams that involve STL classes more complete and accurate.
-
-BUILTIN_STL_SUPPORT    = NO
-
-# If you use Microsoft's C++/CLI language, you should set this option to YES to
-# enable parsing support.
-
-CPP_CLI_SUPPORT        = NO
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
-# tag is set to YES, then doxygen will reuse the documentation of the first 
-# member in the group (if any) for the other members of the group. By default 
-# all members of a group must be documented explicitly.
-
-DISTRIBUTE_GROUP_DOC   = NO
-
-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of 
-# the same type (for instance a group of public functions) to be put as a 
-# subgroup of that type (e.g. under the Public Functions section). Set it to 
-# NO to prevent subgrouping. Alternatively, this can be done per class using 
-# the \nosubgrouping command.
-
-SUBGROUPING            = YES
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in 
-# documentation are documented, even if no documentation was available. 
-# Private class members and static file members will be hidden unless 
-# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
-
-EXTRACT_ALL            = NO
-
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class 
-# will be included in the documentation.
-
-EXTRACT_PRIVATE        = NO
-
-# If the EXTRACT_STATIC tag is set to YES all static members of a file 
-# will be included in the documentation.
-
-EXTRACT_STATIC         = NO
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 
-# defined locally in source files will be included in the documentation. 
-# If set to NO only classes defined in header files are included.
-
-EXTRACT_LOCAL_CLASSES  = YES
-
-# This flag is only useful for Objective-C code. When set to YES local 
-# methods, which are defined in the implementation section but not in 
-# the interface are included in the documentation. 
-# If set to NO (the default) only methods in the interface are included.
-
-EXTRACT_LOCAL_METHODS  = YES
-
-# If this flag is set to YES, the members of anonymous namespaces will be extracted 
-# and appear in the documentation as a namespace called 'anonymous_namespace{file}', 
-# where file will be replaced with the base name of the file that contains the anonymous 
-# namespace. By default anonymous namespace are hidden.
-
-EXTRACT_ANON_NSPACES   = NO
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
-# undocumented members of documented classes, files or namespaces. 
-# If set to NO (the default) these members will be included in the 
-# various overviews, but no documentation section is generated. 
-# This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_MEMBERS     = NO
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all 
-# undocumented classes that are normally visible in the class hierarchy. 
-# If set to NO (the default) these classes will be included in the various 
-# overviews. This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_CLASSES     = NO
-
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all 
-# friend (class|struct|union) declarations. 
-# If set to NO (the default) these declarations will be included in the 
-# documentation.
-
-HIDE_FRIEND_COMPOUNDS  = NO
-
-# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any 
-# documentation blocks found inside the body of a function. 
-# If set to NO (the default) these blocks will be appended to the 
-# function's detailed documentation block.
-
-HIDE_IN_BODY_DOCS      = NO
-
-# The INTERNAL_DOCS tag determines if documentation 
-# that is typed after a \internal command is included. If the tag is set 
-# to NO (the default) then the documentation will be excluded. 
-# Set it to YES to include the internal documentation.
-
-INTERNAL_DOCS          = YES
-
-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate 
-# file names in lower-case letters. If set to YES upper-case letters are also 
-# allowed. This is useful if you have classes or files whose names only differ 
-# in case and if your file system supports case sensitive file names. Windows 
-# and Mac users are advised to set this option to NO.
-
-CASE_SENSE_NAMES       = YES
-
-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen 
-# will show members with their full class and namespace scopes in the 
-# documentation. If set to YES the scope will be hidden.
-
-HIDE_SCOPE_NAMES       = NO
-
-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen 
-# will put a list of the files that are included by a file in the documentation 
-# of that file.
-
-SHOW_INCLUDE_FILES     = YES
-
-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] 
-# is inserted in the documentation for inline members.
-
-INLINE_INFO            = YES
-
-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen 
-# will sort the (detailed) documentation of file and class members 
-# alphabetically by member name. If set to NO the members will appear in 
-# declaration order.
-
-SORT_MEMBER_DOCS       = YES
-
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the 
-# brief documentation of file, namespace and class members alphabetically 
-# by member name. If set to NO (the default) the members will appear in 
-# declaration order.
-
-SORT_BRIEF_DOCS        = NO
-
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be 
-# sorted by fully-qualified names, including namespaces. If set to 
-# NO (the default), the class list will be sorted only by class name, 
-# not including the namespace part. 
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the 
-# alphabetical list.
-
-SORT_BY_SCOPE_NAME     = NO
-
-# The GENERATE_TODOLIST tag can be used to enable (YES) or 
-# disable (NO) the todo list. This list is created by putting \todo 
-# commands in the documentation.
-
-GENERATE_TODOLIST      = YES
-
-# The GENERATE_TESTLIST tag can be used to enable (YES) or 
-# disable (NO) the test list. This list is created by putting \test 
-# commands in the documentation.
-
-GENERATE_TESTLIST      = YES
-
-# The GENERATE_BUGLIST tag can be used to enable (YES) or 
-# disable (NO) the bug list. This list is created by putting \bug 
-# commands in the documentation.
-
-GENERATE_BUGLIST       = YES
-
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or 
-# disable (NO) the deprecated list. This list is created by putting 
-# \deprecated commands in the documentation.
-
-GENERATE_DEPRECATEDLIST= YES
-
-# The ENABLED_SECTIONS tag can be used to enable conditional 
-# documentation sections, marked by \if sectionname ... \endif.
-
-ENABLED_SECTIONS       = 
-
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines 
-# the initial value of a variable or define consists of for it to appear in 
-# the documentation. If the initializer consists of more lines than specified 
-# here it will be hidden. Use a value of 0 to hide initializers completely. 
-# The appearance of the initializer of individual variables and defines in the 
-# documentation can be controlled using \showinitializer or \hideinitializer 
-# command in the documentation regardless of this setting.
-
-MAX_INITIALIZER_LINES  = 30
-
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated 
-# at the bottom of the documentation of classes and structs. If set to YES the 
-# list will mention the files that were used to generate the documentation.
-
-SHOW_USED_FILES        = YES
-
-# If the sources in your project are distributed over multiple directories 
-# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy 
-# in the documentation. The default is NO.
-
-SHOW_DIRECTORIES       = NO
-
-# The FILE_VERSION_FILTER tag can be used to specify a program or script that 
-# doxygen should invoke to get the current version for each file (typically from the 
-# version control system). Doxygen will invoke the program by executing (via 
-# popen()) the command  , where  is the value of 
-# the FILE_VERSION_FILTER tag, and  is the name of an input file 
-# provided by doxygen. Whatever the program writes to standard output 
-# is used as the file version. See the manual for examples.
-
-FILE_VERSION_FILTER    = 
-
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-# The QUIET tag can be used to turn on/off the messages that are generated 
-# by doxygen. Possible values are YES and NO. If left blank NO is used.
-
-QUIET                  = NO
-
-# The WARNINGS tag can be used to turn on/off the warning messages that are 
-# generated by doxygen. Possible values are YES and NO. If left blank 
-# NO is used.
-
-WARNINGS               = YES
-
-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings 
-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will 
-# automatically be disabled.
-
-WARN_IF_UNDOCUMENTED   = YES
-
-# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for 
-# potential errors in the documentation, such as not documenting some 
-# parameters in a documented function, or documenting parameters that 
-# don't exist or using markup commands wrongly.
-
-WARN_IF_DOC_ERROR      = YES
-
-# This WARN_NO_PARAMDOC option can be abled to get warnings for 
-# functions that are documented, but have no documentation for their parameters 
-# or return value. If set to NO (the default) doxygen will only warn about 
-# wrong or incomplete parameter documentation, but not about the absence of 
-# documentation.
-
-WARN_NO_PARAMDOC       = NO
-
-# The WARN_FORMAT tag determines the format of the warning messages that 
-# doxygen can produce. The string should contain the $file, $line, and $text 
-# tags, which will be replaced by the file and line number from which the 
-# warning originated and the warning text. Optionally the format may contain 
-# $version, which will be replaced by the version of the file (if it could 
-# be obtained via FILE_VERSION_FILTER)
-
-WARN_FORMAT            = "$file:$line: $text "
-
-# The WARN_LOGFILE tag can be used to specify a file to which warning 
-# and error messages should be written. If left blank the output is written 
-# to stderr.
-
-WARN_LOGFILE           = 
-
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-
-# The INPUT tag can be used to specify the files and/or directories that contain 
-# documented source files. You may enter file names like "myfile.cpp" or 
-# directories like "/usr/src/myproject". Separate the files or directories 
-# with spaces.
-
-INPUT                  = @top_srcdir@/src/shared/ \
-                         @top_srcdir@/src/shared/Auth/ \
-                         @top_srcdir@/src/shared/Database/ \
-                         @top_srcdir@/src/game/ \
-                         @top_srcdir@/src/realmd/ \
-                         @top_srcdir@/src/mangosd/ \
-                         DocStructure.dox
-
-# This tag can be used to specify the character encoding of the source files that 
-# doxygen parses. Internally doxygen uses the UTF-8 encoding, which is also the default 
-# input encoding. Doxygen uses libiconv (or the iconv built into libc) for the transcoding. 
-# See http://www.gnu.org/software/libiconv for the list of possible encodings.
-
-INPUT_ENCODING         = UTF-8
-
-# If the value of the INPUT tag contains directories, you can use the 
-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
-# and *.h) to filter out the source-files in the directories. If left 
-# blank the following patterns are tested: 
-# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx 
-# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py
-
-FILE_PATTERNS          = *.cpp \
-                         *.h \
-                         *.hpp
-
-# The RECURSIVE tag can be used to turn specify whether or not subdirectories 
-# should be searched for input files as well. Possible values are YES and NO. 
-# If left blank NO is used.
-
-RECURSIVE              = NO
-
-# The EXCLUDE tag can be used to specify files and/or directories that should 
-# excluded from the INPUT source files. This way you can easily exclude a 
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
-
-EXCLUDE                = 
-
-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
-# directories that are symbolic links (a Unix filesystem feature) are excluded 
-# from the input.
-
-EXCLUDE_SYMLINKS       = NO
-
-# If the value of the INPUT tag contains directories, you can use the 
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 
-# certain files from those directories. Note that the wildcards are matched 
-# against the file with absolute path, so to exclude all test directories 
-# for example use the pattern */test/*
-
-EXCLUDE_PATTERNS       = config*.h
-
-# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names 
-# (namespaces, classes, functions, etc.) that should be excluded from the output. 
-# The symbol name can be a fully qualified name, a word, or if the wildcard * is used, 
-# a substring. Examples: ANamespace, AClass, AClass::ANamespace, ANamespace::*Test
-
-EXCLUDE_SYMBOLS        = 
-
-# The EXAMPLE_PATH tag can be used to specify one or more files or 
-# directories that contain example code fragments that are included (see 
-# the \include command).
-
-EXAMPLE_PATH           = 
-
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the 
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
-# and *.h) to filter out the source-files in the directories. If left 
-# blank all files are included.
-
-EXAMPLE_PATTERNS       = 
-
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be 
-# searched for input files to be used with the \include or \dontinclude 
-# commands irrespective of the value of the RECURSIVE tag. 
-# Possible values are YES and NO. If left blank NO is used.
-
-EXAMPLE_RECURSIVE      = NO
-
-# The IMAGE_PATH tag can be used to specify one or more files or 
-# directories that contain image that are included in the documentation (see 
-# the \image command).
-
-IMAGE_PATH             = 
-
-# The INPUT_FILTER tag can be used to specify a program that doxygen should 
-# invoke to filter for each input file. Doxygen will invoke the filter program 
-# by executing (via popen()) the command  , where  
-# is the value of the INPUT_FILTER tag, and  is the name of an 
-# input file. Doxygen will then use the output that the filter program writes 
-# to standard output.  If FILTER_PATTERNS is specified, this tag will be 
-# ignored.
-
-INPUT_FILTER           = 
-
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern 
-# basis.  Doxygen will compare the file name with each pattern and apply the 
-# filter if there is a match.  The filters are a list of the form: 
-# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further 
-# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER 
-# is applied to all files.
-
-FILTER_PATTERNS        = 
-
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using 
-# INPUT_FILTER) will be used to filter the input files when producing source 
-# files to browse (i.e. when SOURCE_BROWSER is set to YES).
-
-FILTER_SOURCE_FILES    = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will 
-# be generated. Documented entities will be cross-referenced with these sources. 
-# Note: To get rid of all source code in the generated output, make sure also 
-# VERBATIM_HEADERS is set to NO. If you have enabled CALL_GRAPH or CALLER_GRAPH 
-# then you must also enable this option. If you don't then doxygen will produce 
-# a warning and turn it on anyway
-
-SOURCE_BROWSER         = YES
-
-# Setting the INLINE_SOURCES tag to YES will include the body 
-# of functions and classes directly in the documentation.
-
-INLINE_SOURCES         = NO
-
-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct 
-# doxygen to hide any special comment blocks from generated source code 
-# fragments. Normal C and C++ comments will always remain visible.
-
-STRIP_CODE_COMMENTS    = YES
-
-# If the REFERENCED_BY_RELATION tag is set to YES (the default) 
-# then for each documented function all documented 
-# functions referencing it will be listed.
-
-REFERENCED_BY_RELATION = YES
-
-# If the REFERENCES_RELATION tag is set to YES (the default) 
-# then for each documented function all documented entities 
-# called/used by that function will be listed.
-
-REFERENCES_RELATION    = YES
-
-# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
-# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
-# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
-# link to the source code.  Otherwise they will link to the documentstion.
-
-REFERENCES_LINK_SOURCE = YES
-
-# If the USE_HTAGS tag is set to YES then the references to source code 
-# will point to the HTML generated by the htags(1) tool instead of doxygen 
-# built-in source browser. The htags tool is part of GNU's global source 
-# tagging system (see http://www.gnu.org/software/global/global.html). You 
-# will need version 4.8.6 or higher.
-
-USE_HTAGS              = NO
-
-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen 
-# will generate a verbatim copy of the header file for each class for 
-# which an include is specified. Set to NO to disable this.
-
-VERBATIM_HEADERS       = YES
-
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index 
-# of all compounds will be generated. Enable this if the project 
-# contains a lot of classes, structs, unions or interfaces.
-
-ALPHABETICAL_INDEX     = YES
-
-# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then 
-# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns 
-# in which this list will be split (can be a number in the range [1..20])
-
-COLS_IN_ALPHA_INDEX    = 5
-
-# In case all classes in a project start with a common prefix, all 
-# classes will be put under the same header in the alphabetical index. 
-# The IGNORE_PREFIX tag can be used to specify one or more prefixes that 
-# should be ignored while generating the index headers.
-
-IGNORE_PREFIX          = 
-
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will 
-# generate HTML output.
-
-GENERATE_HTML          = YES
-
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `html' will be used as the default path.
-
-HTML_OUTPUT            = html
-
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for 
-# each generated HTML page (for example: .htm,.php,.asp). If it is left blank 
-# doxygen will generate files with .html extension.
-
-HTML_FILE_EXTENSION    = .html
-
-# The HTML_HEADER tag can be used to specify a personal HTML header for 
-# each generated HTML page. If it is left blank doxygen will generate a 
-# standard header.
-
-HTML_HEADER            = 
-
-# The HTML_FOOTER tag can be used to specify a personal HTML footer for 
-# each generated HTML page. If it is left blank doxygen will generate a 
-# standard footer.
-
-HTML_FOOTER            = 
-
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
-# style sheet that is used by each HTML page. It can be used to 
-# fine-tune the look of the HTML output. If the tag is left blank doxygen 
-# will generate a default style sheet. Note that doxygen will try to copy 
-# the style sheet file to the HTML output directory, so don't put your own 
-# stylesheet in the HTML output directory as well, or it will be erased!
-
-HTML_STYLESHEET        = 
-
-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
-# files or namespaces will be aligned in HTML using tables. If set to 
-# NO a bullet list will be used.
-
-HTML_ALIGN_MEMBERS     = YES
-
-# If the GENERATE_HTMLHELP tag is set to YES, additional index files 
-# will be generated that can be used as input for tools like the 
-# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) 
-# of the generated HTML documentation.
-
-GENERATE_HTMLHELP      = NO
-
-# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML 
-# documentation will contain sections that can be hidden and shown after the 
-# page has loaded. For this to work a browser that supports 
-# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox 
-# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
-
-HTML_DYNAMIC_SECTIONS  = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can 
-# be used to specify the file name of the resulting .chm file. You 
-# can add a path in front of the file if the result should not be 
-# written to the html output directory.
-
-CHM_FILE               = 
-
-# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can 
-# be used to specify the location (absolute path including file name) of 
-# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run 
-# the HTML help compiler on the generated index.hhp.
-
-HHC_LOCATION           = 
-
-# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag 
-# controls if a separate .chi index file is generated (YES) or that 
-# it should be included in the master .chm file (NO).
-
-GENERATE_CHI           = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag 
-# controls whether a binary table of contents is generated (YES) or a 
-# normal table of contents (NO) in the .chm file.
-
-BINARY_TOC             = NO
-
-# The TOC_EXPAND flag can be set to YES to add extra items for group members 
-# to the contents of the HTML help documentation and to the tree view.
-
-TOC_EXPAND             = NO
-
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index at 
-# top of each HTML page. The value NO (the default) enables the index and 
-# the value YES disables it.
-
-DISABLE_INDEX          = NO
-
-# This tag can be used to set the number of enum values (range [1..20]) 
-# that doxygen will group on one line in the generated HTML documentation.
-
-ENUM_VALUES_PER_LINE   = 4
-
-# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
-# generated containing a tree-like index structure (just like the one that 
-# is generated for HTML Help). For this to work a browser that supports 
-# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, 
-# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are 
-# probably better off using the HTML help feature.
-
-GENERATE_TREEVIEW      = NO
-
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be 
-# used to set the initial width (in pixels) of the frame in which the tree 
-# is shown.
-
-TREEVIEW_WIDTH         = 250
-
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will 
-# generate Latex output.
-
-GENERATE_LATEX         = NO
-
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `latex' will be used as the default path.
-
-LATEX_OUTPUT           = latex
-
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be 
-# invoked. If left blank `latex' will be used as the default command name.
-
-LATEX_CMD_NAME         = latex
-
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to 
-# generate index for LaTeX. If left blank `makeindex' will be used as the 
-# default command name.
-
-MAKEINDEX_CMD_NAME     = makeindex
-
-# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact 
-# LaTeX documents. This may be useful for small projects and may help to 
-# save some trees in general.
-
-COMPACT_LATEX          = NO
-
-# The PAPER_TYPE tag can be used to set the paper type that is used 
-# by the printer. Possible values are: a4, a4wide, letter, legal and 
-# executive. If left blank a4wide will be used.
-
-PAPER_TYPE             = a4wide
-
-# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX 
-# packages that should be included in the LaTeX output.
-
-EXTRA_PACKAGES         = 
-
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for 
-# the generated latex document. The header should contain everything until 
-# the first chapter. If it is left blank doxygen will generate a 
-# standard header. Notice: only use this tag if you know what you are doing!
-
-LATEX_HEADER           = 
-
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated 
-# is prepared for conversion to pdf (using ps2pdf). The pdf file will 
-# contain links (just like the HTML output) instead of page references 
-# This makes the output suitable for online browsing using a pdf viewer.
-
-PDF_HYPERLINKS         = NO
-
-# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of 
-# plain latex in the generated Makefile. Set this option to YES to get a 
-# higher quality PDF documentation.
-
-USE_PDFLATEX           = NO
-
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. 
-# command to the generated LaTeX files. This will instruct LaTeX to keep 
-# running if errors occur, instead of asking the user for help. 
-# This option is also used when generating formulas in HTML.
-
-LATEX_BATCHMODE        = NO
-
-# If LATEX_HIDE_INDICES is set to YES then doxygen will not 
-# include the index chapters (such as File Index, Compound Index, etc.) 
-# in the output.
-
-LATEX_HIDE_INDICES     = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output 
-# The RTF output is optimized for Word 97 and may not look very pretty with 
-# other RTF readers or editors.
-
-GENERATE_RTF           = NO
-
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `rtf' will be used as the default path.
-
-RTF_OUTPUT             = rtf
-
-# If the COMPACT_RTF tag is set to YES Doxygen generates more compact 
-# RTF documents. This may be useful for small projects and may help to 
-# save some trees in general.
-
-COMPACT_RTF            = NO
-
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated 
-# will contain hyperlink fields. The RTF file will 
-# contain links (just like the HTML output) instead of page references. 
-# This makes the output suitable for online browsing using WORD or other 
-# programs which support those fields. 
-# Note: wordpad (write) and others do not support links.
-
-RTF_HYPERLINKS         = NO
-
-# Load stylesheet definitions from file. Syntax is similar to doxygen's 
-# config file, i.e. a series of assignments. You only have to provide 
-# replacements, missing definitions are set to their default value.
-
-RTF_STYLESHEET_FILE    = 
-
-# Set optional variables used in the generation of an rtf document. 
-# Syntax is similar to doxygen's config file.
-
-RTF_EXTENSIONS_FILE    = 
-
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_MAN tag is set to YES (the default) Doxygen will 
-# generate man pages
-
-GENERATE_MAN           = NO
-
-# The MAN_OUTPUT tag is used to specify where the man pages will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `man' will be used as the default path.
-
-MAN_OUTPUT             = man
-
-# The MAN_EXTENSION tag determines the extension that is added to 
-# the generated man pages (default is the subroutine's section .3)
-
-MAN_EXTENSION          = .3
-
-# If the MAN_LINKS tag is set to YES and Doxygen generates man output, 
-# then it will generate one additional man file for each entity 
-# documented in the real man page(s). These additional files 
-# only source the real man page, but without them the man command 
-# would be unable to find the correct page. The default is NO.
-
-MAN_LINKS              = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_XML tag is set to YES Doxygen will 
-# generate an XML file that captures the structure of 
-# the code including all documentation.
-
-GENERATE_XML           = NO
-
-# The XML_OUTPUT tag is used to specify where the XML pages will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `xml' will be used as the default path.
-
-XML_OUTPUT             = xml
-
-# The XML_SCHEMA tag can be used to specify an XML schema, 
-# which can be used by a validating XML parser to check the 
-# syntax of the XML files.
-
-XML_SCHEMA             = 
-
-# The XML_DTD tag can be used to specify an XML DTD, 
-# which can be used by a validating XML parser to check the 
-# syntax of the XML files.
-
-XML_DTD                = 
-
-# If the XML_PROGRAMLISTING tag is set to YES Doxygen will 
-# dump the program listings (including syntax highlighting 
-# and cross-referencing information) to the XML output. Note that 
-# enabling this will significantly increase the size of the XML output.
-
-XML_PROGRAMLISTING     = YES
-
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will 
-# generate an AutoGen Definitions (see autogen.sf.net) file 
-# that captures the structure of the code including all 
-# documentation. Note that this feature is still experimental 
-# and incomplete at the moment.
-
-GENERATE_AUTOGEN_DEF   = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_PERLMOD tag is set to YES Doxygen will 
-# generate a Perl module file that captures the structure of 
-# the code including all documentation. Note that this 
-# feature is still experimental and incomplete at the 
-# moment.
-
-GENERATE_PERLMOD       = NO
-
-# If the PERLMOD_LATEX tag is set to YES Doxygen will generate 
-# the necessary Makefile rules, Perl scripts and LaTeX code to be able 
-# to generate PDF and DVI output from the Perl module output.
-
-PERLMOD_LATEX          = YES
-
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be 
-# nicely formatted so it can be parsed by a human reader.  This is useful 
-# if you want to understand what is going on.  On the other hand, if this 
-# tag is set to NO the size of the Perl module output will be much smaller 
-# and Perl will parse it just the same.
-
-PERLMOD_PRETTY         = YES
-
-# The names of the make variables in the generated doxyrules.make file 
-# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. 
-# This is useful so different doxyrules.make files included by the same 
-# Makefile don't overwrite each other's variables.
-
-PERLMOD_MAKEVAR_PREFIX = 
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor   
-#---------------------------------------------------------------------------
-
-# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will 
-# evaluate all C-preprocessor directives found in the sources and include 
-# files.
-
-ENABLE_PREPROCESSING   = YES
-
-# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro 
-# names in the source code. If set to NO (the default) only conditional 
-# compilation will be performed. Macro expansion can be done in a controlled 
-# way by setting EXPAND_ONLY_PREDEF to YES.
-
-MACRO_EXPANSION        = YES
-
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 
-# then the macro expansion is limited to the macros specified with the 
-# PREDEFINED and EXPAND_AS_DEFINED tags.
-
-EXPAND_ONLY_PREDEF     = YES
-
-# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files 
-# in the INCLUDE_PATH (see below) will be search if a #include is found.
-
-SEARCH_INCLUDES        = YES
-
-# The INCLUDE_PATH tag can be used to specify one or more directories that 
-# contain include files that are not input files but should be processed by 
-# the preprocessor.
-
-INCLUDE_PATH           = 
-
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard 
-# patterns (like *.h and *.hpp) to filter out the header-files in the 
-# directories. If left blank, the patterns specified with FILE_PATTERNS will 
-# be used.
-
-INCLUDE_FILE_PATTERNS  = 
-
-# The PREDEFINED tag can be used to specify one or more macro names that 
-# are defined before the preprocessor is started (similar to the -D option of 
-# gcc). The argument of the tag is a list of macros of the form: name 
-# or name=definition (no spaces). If the definition and the = are 
-# omitted =1 is assumed. To prevent a macro definition from being 
-# undefined via #undef or recursively expanded use the := operator 
-# instead of the = operator.
-
-PREDEFINED             = U_EXPORT2 \
-                         U_STABLE \
-                         U_DRAFT \
-                         U_INTERNAL \
-                         U_SYSTEM \
-                         U_DEPRECATED \
-                         U_OBSOLETE
-
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
-# this tag can be used to specify a list of macro names that should be expanded. 
-# The macro definition that is found in the sources will be used. 
-# Use the PREDEFINED tag if you want to use a different macro definition.
-
-EXPAND_AS_DEFINED      = 
-
-# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 
-# doxygen's preprocessor will remove all function-like macros that are alone 
-# on a line, have an all uppercase name, and do not end with a semicolon. Such 
-# function macros are typically used for boiler-plate code, and will confuse 
-# the parser if not removed.
-
-SKIP_FUNCTION_MACROS   = YES
-
-#---------------------------------------------------------------------------
-# Configuration::additions related to external references   
-#---------------------------------------------------------------------------
-
-# The TAGFILES option can be used to specify one or more tagfiles. 
-# Optionally an initial location of the external documentation 
-# can be added for each tagfile. The format of a tag file without 
-# this location is as follows: 
-#   TAGFILES = file1 file2 ... 
-# Adding location for the tag files is done as follows: 
-#   TAGFILES = file1=loc1 "file2 = loc2" ... 
-# where "loc1" and "loc2" can be relative or absolute paths or 
-# URLs. If a location is present for each tag, the installdox tool 
-# does not have to be run to correct the links.
-# Note that each tag file must have a unique name
-# (where the name does NOT include the path)
-# If a tag file is not located in the directory in which doxygen 
-# is run, you must also specify the path to the tagfile here.
-
-TAGFILES               = 
-
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create 
-# a tag file that is based on the input files it reads.
-
-GENERATE_TAGFILE       = "@srcdir@/html/mangos-ng-docs.tag "
-
-# If the ALLEXTERNALS tag is set to YES all external classes will be listed 
-# in the class index. If set to NO only the inherited external classes 
-# will be listed.
-
-ALLEXTERNALS           = NO
-
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed 
-# in the modules index. If set to NO, only the current project's groups will 
-# be listed.
-
-EXTERNAL_GROUPS        = YES
-
-# The PERL_PATH should be the absolute path and name of the perl script 
-# interpreter (i.e. the result of `which perl').
-
-PERL_PATH              = /usr/bin/perl
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool   
-#---------------------------------------------------------------------------
-
-# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will 
-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base 
-# or super classes. Setting the tag to NO turns the diagrams off. Note that 
-# this option is superseded by the HAVE_DOT option below. This is only a 
-# fallback. It is recommended to install and use dot, since it yields more 
-# powerful graphs.
-
-CLASS_DIAGRAMS         = YES
-
-# You can define message sequence charts within doxygen comments using the \msc 
-# command. Doxygen will then run the mscgen tool (see http://www.mcternan.me.uk/mscgen/) to 
-# produce the chart and insert it in the documentation. The MSCGEN_PATH tag allows you to 
-# specify the directory where the mscgen tool resides. If left empty the tool is assumed to 
-# be found in the default search path.
-
-MSCGEN_PATH            = 
-
-# If set to YES, the inheritance and collaboration graphs will hide 
-# inheritance and usage relations if the target is undocumented 
-# or is not a class.
-
-HIDE_UNDOC_RELATIONS   = YES
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is 
-# available from the path. This tool is part of Graphviz, a graph visualization 
-# toolkit from AT&T and Lucent Bell Labs. The other options in this section 
-# have no effect if this option is set to NO (the default)
-
-HAVE_DOT               = NO
-
-# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
-# will generate a graph for each documented class showing the direct and 
-# indirect inheritance relations. Setting this tag to YES will force the 
-# the CLASS_DIAGRAMS tag to NO.
-
-CLASS_GRAPH            = YES
-
-# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen 
-# will generate a graph for each documented class showing the direct and 
-# indirect implementation dependencies (inheritance, containment, and 
-# class references variables) of the class with other documented classes.
-
-COLLABORATION_GRAPH    = YES
-
-# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen 
-# will generate a graph for groups, showing the direct groups dependencies
-
-GROUP_GRAPHS           = YES
-
-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and 
-# collaboration diagrams in a style similar to the OMG's Unified Modeling 
-# Language.
-
-UML_LOOK               = NO
-
-# If set to YES, the inheritance and collaboration graphs will show the 
-# relations between templates and their instances.
-
-TEMPLATE_RELATIONS     = NO
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT 
-# tags are set to YES then doxygen will generate a graph for each documented 
-# file showing the direct and indirect include dependencies of the file with 
-# other documented files.
-
-INCLUDE_GRAPH          = YES
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and 
-# HAVE_DOT tags are set to YES then doxygen will generate a graph for each 
-# documented header file showing the documented files that directly or 
-# indirectly include this file.
-
-INCLUDED_BY_GRAPH      = YES
-
-# If the CALL_GRAPH, SOURCE_BROWSER and HAVE_DOT tags are set to YES then doxygen will 
-# generate a call dependency graph for every global function or class method. 
-# Note that enabling this option will significantly increase the time of a run. 
-# So in most cases it will be better to enable call graphs for selected 
-# functions only using the \callgraph command.
-
-CALL_GRAPH             = NO
-
-# If the CALLER_GRAPH, SOURCE_BROWSER and HAVE_DOT tags are set to YES then doxygen will 
-# generate a caller dependency graph for every global function or class method. 
-# Note that enabling this option will significantly increase the time of a run. 
-# So in most cases it will be better to enable caller graphs for selected 
-# functions only using the \callergraph command.
-
-CALLER_GRAPH           = NO
-
-# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 
-# will graphical hierarchy of all classes instead of a textual one.
-
-GRAPHICAL_HIERARCHY    = YES
-
-# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES 
-# then doxygen will show the dependencies a directory has on other directories 
-# in a graphical way. The dependency relations are determined by the #include
-# relations between the files in the directories.
-
-DIRECTORY_GRAPH        = YES
-
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images 
-# generated by dot. Possible values are png, jpg, or gif
-# If left blank png will be used.
-
-DOT_IMAGE_FORMAT       = png
-
-# The tag DOT_PATH can be used to specify the path where the dot tool can be 
-# found. If left blank, it is assumed the dot tool can be found in the path.
-
-DOT_PATH               = 
-
-# The DOTFILE_DIRS tag can be used to specify one or more directories that 
-# contain dot files that are included in the documentation (see the 
-# \dotfile command).
-
-DOTFILE_DIRS           = 
-
-# The MAX_DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of 
-# nodes that will be shown in the graph. If the number of nodes in a graph 
-# becomes larger than this value, doxygen will truncate the graph, which is 
-# visualized by representing a node as a red box. Note that doxygen if the number 
-# of direct children of the root node in a graph is already larger than 
-# MAX_DOT_GRAPH_NOTES then the graph will not be shown at all. Also note 
-# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
-
-DOT_GRAPH_MAX_NODES    = 50
-
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the 
-# graphs generated by dot. A depth value of 3 means that only nodes reachable 
-# from the root by following a path via at most 3 edges will be shown. Nodes 
-# that lay further from the root node will be omitted. Note that setting this 
-# option to 1 or 2 may greatly reduce the computation time needed for large 
-# code bases. Also note that the size of a graph can be further restricted by 
-# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
-
-MAX_DOT_GRAPH_DEPTH    = 0
-
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent 
-# background. This is disabled by default, which results in a white background. 
-# Warning: Depending on the platform used, enabling this option may lead to 
-# badly anti-aliased labels on the edges of a graph (i.e. they become hard to 
-# read).
-
-DOT_TRANSPARENT        = NO
-
-# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output 
-# files in one run (i.e. multiple -o and -T options on the command line). This 
-# makes dot run faster, but since only newer versions of dot (>1.8.10) 
-# support this, this feature is disabled by default.
-
-DOT_MULTI_TARGETS      = NO
-
-# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will 
-# generate a legend page explaining the meaning of the various boxes and 
-# arrows in the dot generated graphs.
-
-GENERATE_LEGEND        = YES
-
-# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will 
-# remove the intermediate dot files that are used to generate 
-# the various graphs.
-
-DOT_CLEANUP            = YES
-
-#---------------------------------------------------------------------------
-# Configuration::additions related to the search engine   
-#---------------------------------------------------------------------------
-
-# The SEARCHENGINE tag specifies whether or not a search engine should be 
-# used. If set to NO the values of all tags below this one will be ignored.
-
-SEARCHENGINE           = YES
diff --git a/doc/EventAI.txt b/doc/EventAI.txt
deleted file mode 100644
index 7d0294da05f..00000000000
--- a/doc/EventAI.txt
+++ /dev/null
@@ -1,868 +0,0 @@
-=============================================
-EventAI documentation: (updated May 19, 2009)
-=============================================
-
-EventAI allows users to create new creature scripts entierly within the database.
-
-For the AI to be used, you must first make sure to set AIname for each creature that should use this AI.
-UPDATE creature_template SET AIName = 'EventAI' WHERE entry IN (...);
-
-
-=========================================
-Basic structure of EventAI
-=========================================
-
-EventAI follows a basic if (Event) then do (Action) format.
-Below is the list of current fields of the creature_ai_scripts table.
-
-(Field_Name)                (Description)
-id                          This value is merely an incrementing counter of the current Event number. Required for sql queries.
-creature_id                 Creature id which should trigger this event.
-
-event_type                  The type of event (see "Event types" below)
-event_inverse_phase_mask    Mask with phases this event should NOT trigger in*
-event_chance                Percentage chance of triggering the event (1 - 100)
-event_flags                 Event flags (repeatable, ... (see below))
-event_param1                Variables for the event (depends on event_type)
-event_param2
-event_param3
-event_param4
-
-action1_type                An action to take when the event occurs (see "Action types" below)
-action1_param1              Variables used by Action1 (depends on action_type)
-action1_param2
-action1_param3
-
-action2_type
-action2_param1
-action2_param2
-action2_param3
-
-action3_type
-action3_param1
-action3_param2
-action3_param3
-
-All params are signed 32-bit values (+/- 2147483647). Time values are always in milliseconds.
-In case of a percentage value, use value/100 (ie. param = 500 then that means 500%, -50 = -50%)
-
-[*] Phase mask is a bitmask of phases which shouldn't trigger this event. (ie. Phase mask of value 12 (binary 1100) results in triggering this event in phases 0, 1 and all others with exception for phases 2 and 3 (counting from 0).
-
-
-=========================================
-Event types
-=========================================
-
-A list of event types EventAI is able to handle.
-Each event type has its own specific interpretation of the params that accompany it.
-Params are always read in the ascending order (from Param1 to Param3).
-Events will not repeat until the creature exits combat or unless EFLAG_REPEATABLE is set.
-Some events such as EVENT_T_AGGRO, EVENT_T_DEATH, EVENT_T_SPAWNED, and EVENT_T_EVADE cannot repeat.
-
-#   Internal name                Param usage                                             Description
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-0    EVENT_T_TIMER               InitialMin, InitialMax, RepeatMin, RepeatMax            Expires at first between (Param1) and (Param2) and then between every (Param3) and (Param4),  but only in combat.
-1    EVENT_T_TIMER_OOC           InitialMin, InitialMax, RepeatMin, RepeatMax            Expires at first between (Param1) and (Param2) and then between every (Param3) and (Param4),  but only out of combat.
-2    EVENT_T_HP                  HPMax%, HPMin%, RepeatMin, RepeatMax                    Expires when HP is between (Param1) and (Param2). Will repeat every (Param3) and (Param4).
-3    EVENT_T_MANA                ManaMax%,ManaMin% RepeatMin, RepeatMax                  Expires once Mana% is between (Param1) and (Param2). Will repeat every (Param3) and (Param4).
-4    EVENT_T_AGGRO               NONE                                                    Expires upon initial aggro (does not repeat).
-5    EVENT_T_KILL                RepeatMin, RepeatMax                                    Expires upon killing a player. Will repeat between (Param1) and (Param2).
-6    EVENT_T_DEATH               NONE                                                    Expires upon creature death.
-7    EVENT_T_EVADE               NONE                                                    Expires upon creature EnterEvadeMode().
-8    EVENT_T_SPELLHIT            SpellID, Schoolmask, RepeatMin, RepeatMax               Expires upon a spell hit. When (param1) is set, it will be used as a trigger. With (param2) specified, the expiration is limited to specific spell schools (-1 for all). Will repeat every (Param3) and (Param4).
-9    EVENT_T_RANGE               MinDist, MaxDist, RepeatMin, RepeatMax                  Expires when the highest threat target distance is greater than (Param1) and less than (Param2). Will repeat every (Param3) and (Param4).
-10   EVENT_T_OOC_LOS             Hostile-or-Not, MaxAllowedRange, RepeatMin, RepeatMax   Expires when a unit moves within distance (MaxAllowedRange) of a creature. If (Param1) is zero it will expire only when unit is hostile, friendly otherwise (Param1 = 1), depends generally on faction. Will repeat every (Param3) and (Param4). Does not expire when the creature is in combat.
-11   EVENT_T_SPAWNED             NONE                                                    Expires on initial spawn and on creature respawn (useful for setting ranged movement type).
-12   EVENT_T_TARGET_HP           HPMax%, HPMin%, RepeatMin, RepeatMax                    Expires when current target's HP is between (Param1) and (Param2). Will repeat every (Param3) and (Param4).
-13   EVENT_T_TARGET_CASTING      RepeatMin, RepeatatMax                                  Expires when the current target is casting a spell. Will repeat every (Param1) and (Param2).
-14   EVENT_T_FRIENDLY_HP         HPDeficit, Radius, RepeatMin, RepeatMax                 Expires when a friendly unit in radius has at least (Param1) HP missing. Will repeat every (Param3) and (Param4).
-15   EVENT_T_FRIENDLY_IS_CC      DispelType, Radius, RepeatMin, RepeatMax                Expires when a friendly unit is crowd controlled within the given radius (Param2). Will repeat every (Param3) and (Param4).
-16   EVENT_T_MISSING_BUFF        SpellId, Radius, RepeatMin, RepeatMax                   Expires when a friendly unit is missing aura(s) given by a spell (Param1) within radius (Param2). Will repeat every (Param3) and (Param4).
-17   EVENT_T_SUMMONED_UNIT       CreatureId, RepeatMin, RepeatMax                        Expires after creature with entry = (Param1) is spawned (Param1 = 0 means all spawns). Will repeat every (Param2) and (Param3).
-18   EVENT_T_TARGET_MANA         ManaMax%, ManaMin%, RepeatMin, RepeatMax
-21   EVENT_T_REACHED_HOME        NONE                                                    Expires when a creature reach it's home(spawn) location after evade.
-22   EVENT_T_RECEIVE_EMOTE       EmoteId, Condition, CondValue1, CondValue2              Expires when a creature receives an emote with emote text id (enum TextEmotes) in (Param1). Conditions can be defined (Param2) with optional values (Param3,Param4), see enum ConditionType.
-23   EVENT_T_BUFFED              SpellID, AmmountInStack, RepeatMin, RepeatMax           Expires when a creature has spell (Param1) auras applied in a stack greater or equal to value provided in (Param2). Will repeat every (Param3) and (Param4).
-24   EVENT_T_TARGET_BUFFED       SpellID, AmmountInStack, RepeatMin, RepeatMax           Expires when a target unit has spell (Param1) auras applied in a stack greater or equal to value provided in (Param2). Will repeat every (Param3) and (Param4).
-35   EVENT_T_RESET               NONE                                                    Expires when creature leaves combat, spawns or respawns.
-
-=========================================
-Action Types
-=========================================
-
-A list of action types that EventAI can handle.
-Each event type has its own specific interpretation of it's params, like every event type.
-
-#    Internal name                     Param usage                     Description
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-0    ACTION_T_NONE                     No Action                       Does nothing.
-1    ACTION_T_TEXT                     -TextId1, -TextId2, -TextId3    Simply displays the specified -TextId. When -TextId2 and -TextId3 are specified, the selection will be randomized. Text types are defined, along with other options for the text, in a table below. All values needs to be negative.
-2    ACTION_T_SET_FACTION              FactionId                       Changes faction for a creature. When param1 is zero, creature will revert to it's default faction.
-3    ACTION_T_MORPH_TO_ENTRY_OR_MODEL  CreatureEntry, ModelId          Set either model from creature_template.entry (Param1) OR explicit modelId (Param2). If (Param1) AND (Param2) are both 0, demorph and revert to the default model.
-4    ACTION_T_SOUND                    SoundId                         Plays a sound
-5    ACTION_T_EMOTE                    EmoteId                         Does an emote
-6    ACTION_T_RANDOM_SAY                                               UNUSED
-7    ACTION_T_RANDOM_YELL                                              UNUSED
-8    ACTION_T_RANDOM_TEXTEMOTE                                         UNUSED
-9    ACTION_T_RANDOM_SOUND             SoundId1, SoundId2, SoundId3    Plays a random sound *
-10   ACTION_T_RANDOM_EMOTE             EmoteId1, EmoteId2, EmoteId3    Emotes a random emote
-11   ACTION_T_CAST                     SpellId, Target, CastFlags      Casts spell (Param1) on a target (Param2) using cast flags (specified below).
-12   ACTION_T_SUMMON                   CreatureID, Target, Duration    Summons a creature (Param1) for (Param3) duration and orders it to attach (Param2) target. Spawns on top of current creature.
-13   ACTION_T_THREAT_SINGLE_PCT        Threat%, Target                 Modifies a threat by (Param1) percent on a target (Param2).
-14   ACTION_T_THREAT_ALL_PCT           Threat%                         Modifies a threat by (Param1) on all targets in the threat list (using -100% here will result in full aggro dump).
-15   ACTION_T_QUEST_EVENT              QuestID, Target                 Calls AreaExploredOrEventHappens with (Param1) for a target in (Param2).
-16   ACTION_T_QUEST_CASTCREATUREGO     CreatureID, SpellId, Target     Sends CastCreatureOrGo for a creature specified by CreatureId (Param1) with provided spell id (Param2) for a target in (Param3).
-17   ACTION_T_SET_UNIT_FIELD           Field_Number, Value, Target     Sets a unit field (Param1) to provided value (Param2) on a target in (Param3).
-18   ACTION_T_SET_UNIT_FLAG            Flags, Target                   Sets flag (flags can be used together to modify multiple flags at once) on a target (Param2).
-19   ACTION_T_REMOVE_UNIT_FLAG         Flags, Target                   Removes flag on a target (Param2).
-20   ACTION_T_AUTO_ATTACK              AllowAutoAttack                 Stop melee attack when (Param1) is zero, otherwise continue attacking / allow melee attack.
-21   ACTION_T_COMBAT_MOVEMENT          AllowCombatMovement             Stop combat based movement when (Param1) is zero, otherwise continue/allow combat based movement (targeted movement generator).
-22   ACTION_T_SET_PHASE                Phase                           Sets the current phase to (Param1).
-23   ACTION_T_INC_PHASE                Value                           Increments the phase by (Param1). May be negative to decrement, but should not be zero.
-24   ACTION_T_EVADE                    No Params                       Forces the creature to evade, wiping all threat and dropping combat.
-25   ACTION_T_FLEE_FOR_ASSIST          No Params                       Causes the creature to flee for assistence (often at low health).
-26   ACTION_T_QUEST_EVENT_ALL          QuestId                         Calls GroupEventHappens with (Param1). Only used if it's _expected_ event should call quest completion for all players in a current party.
-27   ACTION_T_CASTCREATUREGO_ALL       QuestId, SpellId                Calls CastedCreatureOrGo for all players on the threat list with quest id specified in (Param1) and spell id in (Param2).
-28   ACTION_T_REMOVEAURASFROMSPELL     Target, Spellid                 Removes all auras on a target (Param1) caused by a spell (Param2).
-29   ACTION_T_RANGED_MOVEMENT          Distance, Angle                 Changes the movement generator to a ranged type. (note: default melee type can still be set by using 0 as angle and 0 as distance).
-30   ACTION_T_RANDOM_PHASE             PhaseId1, PhaseId2, PhaseId3    Sets a phase to a specified id(s)*
-31   ACTION_T_RANDOM_PHASE_RANGE       PhaseMin, PhaseMax              Sets a phase to a random id (Phase = PhaseMin + rnd % PhaseMin-PhaseMax). PhaseMax must be greater than PhaseMin.
-32   ACTION_T_SUMMON                   CreatureID, Target, SummonID    Summons a creature (Param1) to attack target (Param2) at location specified by EventAI_Summons (Param3).
-33   ACTION_T_KILLED_MONSTER           CreatureID, Target              Calls KilledMonster (Param1) for a target (Param2).
-34   ACTION_T_SET_INST_DATA            Field, Data                     Calls ScriptedInstance::SetData with field (Param1) and data (Param2).
-35   ACTION_T_SET_INST_DATA64          Field, Target                   Calls ScriptedInstance::SetData64 with field (Param1) and target's GUID (Param2).
-36   ACTION_T_UPDATE_TEMPLATE          TemplateId, Team                Changes a creature's template to (Param1) with team = Alliance or Horde when (Param2) is either false or true respectively.
-37   ACTION_T_DIE                      No Params                       Kills the creature
-38   ACTION_T_ZONE_COMBAT_PULSE        No Params                       Puts all players within an instance into combat with the creature. Only works when a creature is already in combat. Doesn't work outside instances.
-39   ACTION_T_CALL_FOR_HELP            Radius                          Call any friendly out-of-combat creatures in a radius (Param1) to attack current creature's target.
-40   ACTION_T_SET_SHEATH               Sheath                          Sets sheath state for a creature (0 = no weapon, 1 = melee weapon, 2 = ranged weapon).
-41   ACTION_T_FORCE_DESPAWN            No Params                       Despawns the creature
-42   ACTION_T_SET_INVINCIBILITY_HP_LEVEL hp_level, is_percent          Set min. health level for creature that can be set at damage as flat value or percent from max health
-
-* = Use -1 where the param is expected to do nothing. Random constant is generated for each event, so if you have a random yell and a random sound, they will be linked up with each other (ie. param2 with param2).
-
-
-=========================================
-Event Types
-=========================================
-Note:
-COMBAT ONLY - Means that this event will only trigger durring combat.
-OUT OF COMBAT ONLY - Means that this event will only trigger while out of combat.
-BOTH - This event can trigger both in and out of combat.
-
-Events that do not have lables on them are events that are directly involved with the in and out of combat state.
-
-------------------
-0 = EVENT_T_TIMER:
-------------------
-Parameter 1: InitialMin - Minumum Time used to calculate Random Initial Expire
-Parameter 2: InitialMax - Maximum Time used to calculate Random Initial Expire
-Parameter 3: RepeatMin - Minimum Time used to calculate Random Repeat Expire
-Parameter 4: RepeatMax - Maximum Time used to calculate Random Repeat Expire
-
-COMBAT ONLY! - Expires first between (Param1) and (Param2) and then between every (Param3) and (Param4) from then on.
-This is commonly used for spells that repeat cast during combat (Simulate Spell Cooldown).
-
-----------------------
-1 = EVENT_T_TIMER_OOC:
-----------------------
-Parameter 1: InitialMin - Minumum Time used to calculate Random Initial Expire
-Parameter 2: InitialMax - Maximum Time used to calculate Random Initial Expire
-Parameter 3: RepeatMin - Minimum Time used to calculate Random Repeat Expire
-Parameter 4: RepeatMax - Maximum Time used to calculate Random Repeat Expire
-
-OUT OF COMBAT ONLY! - Expires first between (Param1) and (Param2) and then between every (Param3) and (Param4) from then on.
-This is commonly used for events that occur and repeat outside of combat.
-
----------------
-2 = EVENT_T_HP:
----------------
-Parameter 1: HPMax% - Maximum HP% That this Event will Expire
-Parameter 2: HPMin% - Minimum HP% That this Event will Expire
-Parameter 3: RepeatMin - Minimum Time used to calculate Random Repeat Expire
-Parameter 4: RepeatMax - Maximum Time used to calculate Random Repeat Expire
-
-BOTH - Expires when HP is between (Param1) and (Param2). Will repeat every (Param3) and (Param4).
-This is commonly used for events that trigger at a specific HP% (Such as Heal/Enrage Spells or NPC's that Flee).
-
------------------
-3 = EVENT_T_MANA:
------------------
-Parameter 1: ManaMax% - Maximum Mana% That this Event will Expire
-Parameter 2: ManaMin% - Minimum Mana% That this Event will Expire
-Parameter 3: RepeatMin - Minimum Time used to calculate Random Repeat Expire
-Parameter 4: RepeatMax - Maximum Time used to calculate Random Repeat Expire
-
-BOTH - Expires once Mana% is between (Param1) and (Param2). Will repeat every (Param3) and (Param4).
-This is commonly used for events where an NPC low on Mana will do something (Such as stop casting spells and switch to melee).
-
-------------------
-4 = EVENT_T_AGGRO:
-------------------
-This Event Expires upon initial aggro (does not repeat).
-
------------------
-5 = EVENT_T_KILL:
------------------
-Parameter 1: RepeatMin - Minimum Time used to calculate Random Repeat Expire
-Parameter 2: RepeatMax - Maximum Time used to calculate Random Repeat Expire
-
-COMBAT ONLY! - Expires upon killing a player. Will repeat every (Param1) and (Param2).
-This Event Expires upon killing a player. It is commonly used for NPC's who yell or do something after killing a player.
-
-------------------
-6 = EVENT_T_DEATH:
-------------------
-This Event Expires upon Death of the Scripted NPC.
-This is commonly used for NPC's who have a yell on death or cast some kind if summon spell when they die.
-
-------------------
-7 = EVENT_T_EVADE:
-------------------
-This Event Expires upon the creature EnterEvadeMode().
-This is commonly used for NPC's who use phases, allows you to reset their phase to 0 upon evade to prevent possible strange behavior.
-
----------------------
-8 = EVENT_T_SPELLHIT:
----------------------
-Parameter 1: SpellID - The Spell ID that will trigger the event to occur (NOTE: If you use Spell School as the trigger set this value to 0)
-Parameter 2: School - Spell School to trigger the event (NOTE: If you use a SpellID then set this value to -1) - *See Below for Spell School Bitmask Values*
-Parameter 3: RepeatMin - Minimum Time used to calculate Random Repeat Expire
-Parameter 4: RepeatMax - Maximum Time used to calculate Random Repeat Expire
-
-BOTH - Expires upon Spell hit. If (param1) is set will only expire on that spell OR If (param2) is set it will only expire on spells of that school. Will repeat every (Param3) and (Param4).
-This Event is commonly used for NPC's who can do special things when you cast a spell (Or specific spell) on them.
-
-(name, school, schoolmask)
-SPELL_SCHOOL_NORMAL = 0, ==> 1
-SPELL_SCHOOL_HOLY   = 1, ==> 2
-SPELL_SCHOOL_FIRE   = 2, ==> 4
-SPELL_SCHOOL_NATURE = 3, ==> 8
-SPELL_SCHOOL_FROST  = 4, ==> 16
-SPELL_SCHOOL_SHADOW = 5, ==> 32
-SPELL_SCHOOL_ARCANE = 6, ==> 64
-Use These Values For Schoolmask (Param2) or Any Combinations Of These Schoolmasks for Multiple Schools.
-
-------------------
-9 = EVENT_T_RANGE:
-------------------
-Parameter 1: MinDist - This Distance is the Minimum Distance between the NPC and it's target to allow this Event to Expire
-Parameter 2: MaxDist - This Distance is the Maximum Distance between the NPC and it's target to allow this Event to Expire
-Parameter 3: RepeatMin - Minimum Time used to calculate Random Repeat Expire
-Parameter 4: RepeatMax - Maximum Time used to calculate Random Repeat Expire
-
-COMBAT ONLY! - Expires when the highest threat target distance is greater than (Param1) and less than (Param2). Will repeat every (Param3) and (Param4).
-This Event is commonly used for NPC's who have Ranged Combat and will Throw/Shoot between a certian distance.
-
----------------------
-10 = EVENT_T_OOC_LOS:
----------------------
-Parameter 1: Hostile-or-Not   - This will expire if Unit are hostile. If Param1=1 it will only expire if Unit are not Hostile(generally determined by faction)
-Parameter 2: MaxAllowedRange  - Expires when a Unit moves within this distance to creature
-Parameter 3: RepeatMin        - Minimum Time used to calculate Random Repeat Expire
-Parameter 4: RepeatMax        - Maximum Time used to calculate Random Repeat Expire
-
-OUT OF COMBAT!
-This Event is commonly used for NPC's who do something or say something to you when you walk past them Out of Combat.
-
----------------------
-11 = EVENT_T_SPAWNED:
----------------------
-Expires at initial spawn and at creature respawn.
-This Event is commonly used for setting ranged movement type or Summoning a Pet on Spawn
-Parameter 1: 0: works always, 1: works on map in Parameter 2, 2: works on zone/subzone in Parameter 2
-Parameter 2: depends on Parameter 1: for 1 it is map ID, for 2 it is area ID to check
-
------------------------
-12 = EVENT_T_TARGET_HP:
------------------------
-Parameter 1: HPMax% - Maximum HP% That this Event will Expire
-Parameter 2: HPMin% - Minimum HP% That this Event will Expire
-Parameter 3: RepeatMin - Minimum Time used to calculate Random Repeat Expire
-Parameter 4: RepeatMax - Maximum Time used to calculate Random Repeat Expire
-
-COMBAT ONLY! - Expires when Current NPC's Target's HP is between (Param1) and (Param2). Will repeat every (Param3) and (Param4).
-This Event is commonly used for NPC's who have a special ability (Like Execute) that only casts when a Player HP is low.
-
-----------------------------
-13 = EVENT_T_TARGET_CASTING:
-----------------------------
-Parameter 1: RepeatMin - Minimum Time used to calculate Random Repeat Expire
-Parameter 2: RepeatMax - Maximum Time used to calculate Random Repeat Expire
-
-COMBAT ONLY! - Expires when the current target is casting a spell. Will repeat every (Param1) and (Param2).
-This event is commonly used for NPC's who will cast a counter spell when their target starts to cast a spell.
-
--------------------------
-14 = EVENT_T_FRIENDLY_HP:
--------------------------
-Parameter 1: HPDeficit - This is the Amount of HP Missing from Full HP to trigger this event (You would need to calculate the amount of HP the event happens and subtract that from Full HP Value to get this number)
-Parameter 2: Radius - This is the Range in Yards the NPC will scan for nearby Friendlies (Faction is Friendly To) for the missing amount of HP in Param1.
-Parameter 3: RepeatMin - Minimum Time used to calculate Random Repeat Expire
-Parameter 4: RepeatMax - Maximum Time used to calculate Random Repeat Expire
-
-COMBAT ONLY! - Expires when a friendly unit in radius(param2) has at least (param1) hp missing. Will repeat every (Param3) and (Param4).
-This is commonly used when an NPC in Combat will heal a nearby Friendly NPC in Combat with a Heal/Renew Spell.
-
-----------------------------
-15 = EVENT_T_FRIENDLY_IS_CC:
-----------------------------
-Parameter 1: DispelType - Dispel Type to trigger the event - *See Below for Dispel Bitmask Values*
-Parameter 2: Radius - This is the Range in Yards the NPC will scan for nearby Friendlies being Crowd Controlled
-Parameter 3: RepeatMin - Minimum Time used to calculate Random Repeat Expire
-Parameter 4: RepeatMax - Maximum Time used to calculate Random Repeat Expire
-
-COMBAT ONLY! - Expires when a friendly unit is Crowd controlled within the given radius (param2). Will repeat every (Param3) and (Param4).
-This is commonly used for NPC's who can come to the resule of other Friendly NPC's if being Crowd Controlled
-
---------------------------
-16 = EVENT_T_MISSING_BUFF:
---------------------------
-Parameter 1: SpellId - This is the SpellID That the Aura Check will look for (If it is missing this Aura)
-Parameter 2: Radius - This is the Range in Yards the NPC will scan for nearby Friendlies (Faction is Friendly To) for the missing Aura.
-Parameter 3: RepeatMin - Minimum Time used to calculate Random Repeat Expire
-Parameter 4: RepeatMax - Maximum Time used to calculate Random Repeat Expire
-
-BOTH - Expires when a friendly unit is missing aura's given by spell (param1) within radius (param2). Will repeat every (Param3) and (Param4).
-This is commonly used for NPC's who watch friendly units for a debuff to end so they can recast it on them again.
-
----------------------------
-17 = EVENT_T_SUMMONED_UNIT:
----------------------------
-Parameter 1: CreatureId - The CreatureID that the NPC is watching to spawn to trigger this event
-Parameter 2: RepeatMin - Minimum Time used to calculate Random Repeat Expire
-Parameter 3: RepeatMax - Maximum Time used to calculate Random Repeat Expire
-
-BOTH - Expires after creature with entry(Param1) is spawned or for all spawns if param1 = 0. Will repeat every (Param2) and (Param3) .
-This is commonly used for NPC's who will do something special once another NPC is summoned. Usually used is Complex Scripts or Special Events.
-
----------------------------
-21 = EVENT_T_REACHED_HOME:
----------------------------
-Expires only when creature has returned to it's home location after Evade. Out of combat event.
-Most commonly used to cast spells that can not be casted in EVENT_T_EVADE and other effects that does not fit in while still running back to spawn/home location.
-
----------------------------
-22 = EVENT_T_RECEIVE_EMOTE:
----------------------------
-Expires only when creature receive emote from player. Valid text emote id's are in Mangos source (enum TextEmotes)
-Event does not require any conditions to process, however many are ecpected to have condition.
-
----------------------------
-23 = EVENT_T_BUFFED       :
----------------------------
-Parameter 1: SpellId - This is the SpellID That the Aura Check will look for
-Parameter 2: Amount -  This is the amount of SpellID's auras at creature required for event expire.
-Parameter 3: RepeatMin - Minimum Time used to calculate Random Repeat Expire
-Parameter 4: RepeatMax - Maximum Time used to calculate Random Repeat Expire
-
----------------------------
-24 = EVENT_T_TARGET_BUFFED:
----------------------------
-Parameter 1: SpellId - This is the SpellID That the Aura Check will look for
-Parameter 2: Amount -  This is the amount of SpellID's auras at target unit required for event expire.
-Parameter 3: RepeatMin - Minimum Time used to calculate Random Repeat Expire
-Parameter 4: RepeatMax - Maximum Time used to calculate Random Repeat Expire
-
-EventAI use conditions from available in Mangos (enum ConditionType)
-Current implemented conditions:
-CONDITION_NONE (0)            0            0
-CONDITION_AURA (1)            spell_id     effindex
-CONDITION_ITEM (2)            item_id      count
-CONDITION_ITEM_EQUIPPED (3)   item_id      count
-CONDITION_ZONEID (4)          zone_id      0
-CONDITION_REPUTATION_RANK (5) faction_id   min_rank
-CONDITION_TEAM (6)            player_team  0 (469-Alliance / 67-Horde)
-CONDITION_SKILL (7)           skill_id     min_skill_value
-CONDITION_QUESTREWARDED (8)   quest_id     0, if quest are rewarded
-CONDITION_QUESTTAKEN (9)      quest_id     0, while quest active(incomplete)
-CONDITION_ACTIVE_EVENT (12)   event_id     0, note this is id from dbc, also defined in Mangos source(enum HolidayIds) NOT id of game_event in database
-
-=========================================
-Action Types
-=========================================
-
------------------
-1 = ACTION_T_TEXT:
------------------
-Parameter 1: The entry of the text that the NPC should use from eventai_texts table. Optionally a entry from other tables can be used (such as custom_texts).
-             Entry are required to be negative and exist in a *_texts-table. The type text to be displayed are defined in the texts-table itself (Say, Yell, Whisper, Emote Text, Boss Whisper, Boss Emote)
-             Other options are also to be defined in the texts-table, such as a sound to be heard with the text and the language used in output (common, dwarvish, etc).
-             In case this entry has a localized version of the text, the localized text will be displayed in client that support this locale.
-
-Parameter 2: Optional. TextId can be defined in addition. The same apply to this as explained above, however eventAI will randomize between the two.
-Parameter 3: Optional, if Parameter 2 exist. In this case, eventAI will randomize between three.
-
-Read at bottom for documentation of creature_ai_texts-table.
-
-------------------
-2 = ACTION_T_SET_FACTION:
-------------------
-Parameter 1: FactionId from Faction.dbc OR 0. Changes faction for creature. If 0, creature will revert to it's default faction if previously changed.
-
------------------------
-3 = ACTION_T_MORPH_TO_ENTRY_OR_MODEL:
------------------------
-Parameter 1: Creature entry from creature_template. Action will then change to the model this creature are using.
-Parameter 2: If parameter 1 is 0, then this modelId will be used (in case parameter 1 exist, parameter 2 will not be used)
-
-If both parameter 1 and 2 is 0, the creature will DeMorph, and use it's default model.
-
--------------------
-4 = ACTION_T_SOUND:
--------------------
-Parameter 1: The Sound ID to be played. (Sound IDs are contained in the DBC files.)
-
-The creature will play the specified sound.
-This is commonly used for Bosses who Yell and then also have a Voice for the same thing.
-
--------------------
-5 = ACTION_T_EMOTE:
--------------------
-Parameter 1: The Emote ID that the creature should perform. (Emote IDs are also contained in the DBC but they can be found in the mangos source as well).
-
-The creature will perform a visual emote. Unlike a text emote, a visual emote is one where the creature will actually move or perform a gesture.
-This is commonly used for NPC's who may perform a special action (Salute, Roar, ect...). Not all player emotes work for creature models.
-
-------------------------
-6 = ACTION_T_RANDOM_SAY:
-------------------------
-UNUSED       Can be reused to create new action type
-
--------------------------
-7 = ACTION_T_RANDOM_YELL:
--------------------------
-UNUSED       Can be reused to create new action type
-
-------------------------------
-8 = ACTION_T_RANDOM_TEXTEMOTE:
-------------------------------
-UNUSED       Can be reused to create new action type
-
---------------------------
-9 = ACTION_T_RANDOM_SOUND:
---------------------------
-Parameter 1: The Sound ID to be played as Random Choice #1.
-Parameter 2: The Sound ID to be played as Random Choice #2.
-Parameter 3: The Sound ID to be played as Random Choice #3.
-
-Similar to the ACTION_T_SOUND action, it will choose at random a sound to play.
-
----------------------------
-10 = ACTION_T_RANDOM_EMOTE:
----------------------------
-Parameter 1: The Emote ID to be played as Random Choice #1.
-Parameter 2: The Emote ID to be played as Random Choice #2.
-Parameter 3: The Emote ID to be played as Random Choice #3.
-
-Similar to the ACTION_T_EMOTE action, it will choose at random an Emote to Visually Perform.
-
--------------------
-11 = ACTION_T_CAST:
--------------------
-Parameter 1: SpellId - The Spell ID to use for the NPC to cast. The value used in this field needs to be a valid Spell ID.
-Parameter 2: Target - The Target Type defining who the creature should cast the spell at. The value in this field needs to be a valid Target Type as specified in the reference tables below.
-Parameter 3: CastFlags - See Table Below for Cast Flag Bitmask Values. If you are unsure what to set this value at leave it at 0.
-
-The creature will cast a spell specified by a spell ID on a target specified by the target type.
-This is commonly used for NPC's who cast spells.
-
----------------------
-12 = ACTION_T_SUMMON:
----------------------
-Parameter 1: CreatureID - The Creature Template ID to be Summoned. The value here needs to be a valid Creature Template ID.
-Parameter 2: Target - The Target Type defining who the Summoned creature will attack once spawned. The value in this field needs to be a valid Target Type as specified in the reference tables below.
-Parameter 3: Duration - The duration until the summoned creature should be unsummoned AFTER Combat ends. The value in this field is in milliseconds or 0.
-
-The NPC will Summon another creature at the same spot as itself that will attack the specified target.
-NOTE: Almost all Creature Summons have proper Summon Spells that should be used when possible. This Action is a powerful last resort option only to be used if nothing else works.
-NOTE: Using Target Type 0 will cause the Summoned creature to not attack anyone.
-NOTE: If Duration is set at 0, then the summoned creature will not despawn until it has died.
-This is used as a manual way to force an NPC to Summon.
---------------------------------
-13 = ACTION_T_THREAT_SINGLE_PCT:
---------------------------------
-Parameter 1: Threat% - Threat percent that should be modified. The value in this field can range from -100 to +100. If it is negative, threat will be taken away and if positive, threat will be added.
-Parameter 2: Target - The Target Type defining on whom the threat change should occur. The value in this field needs to be a valid target type as specified in the reference tables below.
-
-This action will modify the threat of a target in the creature's threat list by the specified percent.
-This is commonly used to allow an NPC to adjust the Threat to a single player.
-
------------------------------
-14 = ACTION_T_THREAT_ALL_PCT:
------------------------------
-Parameter 1: Threat% - The percent that should be used in modifying everyone's threat in the creature's threat list. The value here can range from -100 to +100.
-
-This action will modify the threat for everyone in the creature's threat list by the specified percent.
-NOTE: Using -100 will cause the creature to reset everyone's threat to 0 so that everyone has the same amount of threat. It will NOT remove anyone from the threat list.
-This is commonly used to allow an NPC to drop threat for all players to zero.
-
---------------------------
-15 = ACTION_T_QUEST_EVENT:
---------------------------
-Parameter 1: QuestID - The Quest Template ID. The value here must be a valid quest template ID. Furthermore, the quest should have SpecialFlags | 2 as it would need to be completed by an external event which is the activation of this action.
-Parameter 2: Target - The Target Type defining whom the quest should be completed for. The value in this field needs to be a valid target type as specified in the reference tables below.
-
-This action will satisfy the external completion requirement for the quest for the specified target defined by the target type.
-NOTE: This action can only be used with player targets so it must be ensured that the target type will point to a player.
-This is commonly used for Quests where only ONE player will gain credit for the quest.
-
------------------------------
-16 = ACTION_T_CASTCREATUREGO:
------------------------------
-Parameter 1: CreatureID - The Creature Template ID to be Summoned. The value here needs to be a valid Creature Template ID.
-Parameter 2: SpellId - The Spell ID to use to simulate the cast. The value used in this field needs to be a valid Spell ID.
-Parameter 3: Target - The Target Type defining whom the quest credit should be given to. The value in this field needs to be a valid target type as specified in the reference tables below.
-
-This action will call CastedCreatureOrGO() function for the player. It can be used to give quest credit for casting a spell on the creature.
-This is commonly used for NPC's who have a special requirement to have a Spell cast on them to complete a quest.
-
------------------------------
-17 = ACTION_T_SET_UNIT_FIELD:
------------------------------
-Parameter 1: Field_Number - The index of the Field Number to be changed. Use (http://wiki.udbforums.org/index.php/Character_data) for a list of indeces and what they control. Creatures only contain the OBJECT_FIELD_* and UNIT_FIELD_* fields. They do not contain the PLAYER_FIELD_* fields.
-Parameter 2: Value - The new value to be put in the field.
-Parameter 3: Target - The Target Type defining for whom the unit field should be changed. The value in this field needs to be a valid target type as specified in the reference tables below.
-
-When activated, this action can change the target's unit field values. More information on the field value indeces can be found at (http://wiki.udbforums.org/index.php/Character_data)
-
-----------------------------
-18 = ACTION_T_SET_UNIT_FLAG:
-----------------------------
-Parameter 1: Flags - The flag(s) to be set. Multiple flags can be set by using bitwise-OR on them (adding them together).
-Parameter 2: Target - The Target Type defining for whom the flags should be changed. The value in this field needs to be a valid Target Type as specified in the reference tables below.
-
-When activated, this action changes the target's flags by adding (turning on) more flags. For example, this action can make the creature unattackable/unselectable if the right flags are used.
-
--------------------------------
-19 = ACTION_T_REMOVE_UNIT_FLAG:
--------------------------------
-Parameter 1: Flags - The flag(s) to be removed. Multiple flags can be set by using bitwise-OR on them (adding them together).
-Parameter 2: Target - The target type defining for whom the flags should be changed. The value in this field needs to be a valid Target Type as specified in the reference tables below.
-
-When activated, this action changes the target's flags by removing (turning off) flags. For example, this action can make the creature normal after it was unattackable/unselectable if the right flags are used.
-
---------------------------
-20 = ACTION_T_AUTO_ATTACK:
---------------------------
-Parameter 1: AllowAutoAttack - If zero, then the creature will stop its melee attacks. If non-zero, then the creature will either continue its melee attacks (the action would then have no effect) or it will start its melee attacks on the target with the top threat if its melee attacks were previously stopped.
-
-This action controls whether or not the creature should stop or start the auto melee attack.
-NOTE: The ACID Dev Team has conformed to using either 0 or 1 for the Param values (0 = Stop Melee, 1 = Start Melee).
-This is commonly used in combination with EVENT_T_RANGE and ACTION_T_COMBAT_MOVEMENT for Ranged Combat for Mages and Spell Casters.
-
-------------------------------
-21 = ACTION_T_COMBAT_MOVEMENT:
-------------------------------
-Parameter 1: If zero, then the creature will stop moving towards its victim (if its victim gets out of melee range) and will be stationary. If non-zero, then the creature will either continue to follow its victim (the action would have no effect) or it will start to follow the target with the top threat if its movement was disabled before.
-Parameter 2: If non-zero, then stop melee combat state (if param1=0) or start melee combat state (if param1!=0) and creature in combat with selected target.
-
-This action controls whether or not the creature will always move towards its target.
-NOTE: The ACID Dev Team has conformed to using either 0 or 1 for the Param values. (0 = Stop Movement, 1 = Start Movement)
-This is commonly used with EVENT_T_RANGE and ACTION_T_AUTO_ATTACK for NPC's who engage in Ranged Comabt (Either Spells or Ranged Attacks)
-Parameter 2 specialy used for ranged combat proper client side visual show ranged weapon in proper state.
-
-------------------------
-22 = ACTION_T_SET_PHASE:
-------------------------
-Parameter 1: The new phase to set the creature in. This number must be an integer between 0 and 31. Numbers outside of that range will result in an error.
-
-When activated, this action sets the creature's event to the specified value.
-NOTE: The creature's current Phase is NOT reset at creature evade. You must manually set the phase back to 0 at EVENT_T_RESET.
-NOTE: The value used for the Param is the actual Phase Number (Not The Event_Inverse_Phase_Mask)
-This is commonly used for complex scripts with several phases and you need to switch to a different phase.
-
-------------------------
-23 = ACTION_T_INC_PHASE:
-------------------------
-Parameter 1: Value - The number of phases to increase or decrease. Use negative values to decrease the current phase.
-
-When activated, this action will increase (or decrease) the current creature's phase.
-NOTE: After increasing or decreasing the phase by this action, the current phase must NOT be lower than 0 or exceed 31.
-This can be used instead of ACTION_T_SET_PHASE to change phases in scripts. Just a user friendly option for changing phases.
-
---------------------
-24 = ACTION_T_EVADE:
---------------------
-When activated, the creature will immediately exit out of combat, clear its threat list, and move back to its spawn point. Basically, this action will reset the whole encounter.
-NOTE: All Param Values Are 0 for this Action.
-
--------------------
-25 = ACTION_T_FLEE:
--------------------
-When activated, the creature will try to flee from combat. Currently this is done by it casting a fear-like spell on itself called "Run Away".
-A Better Flee system is in Development.
-NOTE: All Param Values Are 0 for this Action.
-
-------------------------------
-26 = ACTION_T_QUEST_EVENT_ALL:
-------------------------------
-Parameter 1: QuestId - The quest ID to finish for everyone.
-
-This action does the same thing as the ACTION_T_QUEST_EVENT does but it does it for all players in the creature's threat list.
-NOTE: If a player is not in the NPC's threat list for whatever reason, he/she won't get the quest completed.
-
----------------------------------
-27 = ACTION_T_CASTCREATUREGO_ALL:
----------------------------------
-Parameter 1: QuestId - The quest template ID.
-Parameter 2: SpellId - The spell ID used to simulate the cast.
-
-This action does the same thing as the ACTION_T_CASTCREATUREGO does but it does it for all players in the creature's threat list.
-NOTE: If a player is not in its threat list for whatever reason, he/she won't receive the cast emulation.
-
------------------------------------
-28 = ACTION_T_REMOVEAURASFROMSPELL:
------------------------------------
-Parameter 1: Target - The target type defining for whom the unit field should be changed. The value in this field needs to be a valid target type as specified in the reference tables below.
-Parameter 2: SpellId - The spell ID whose auras will be removed.
-
-This action will remove all auras from a specific spell from the target.
-This is commonly used for NPC's who have an OOC Aura that is removed at combat start or a similar idea (Like Stealth or Shape Shift)
-
-------------------------------
-29 = ACTION_T_RANGED_MOVEMENT:
-------------------------------
-Parameter 1: Distance - The distance the mob should keep between it and its target.
-Parameter 2: Angle - The angle the mob should use.
-
-This action changes the movement type generator to ranged type using the specified values for angle and distance.
-NOTE: Specifying zero angle and distance will make it just melee instead.
-This is commonly used for NPC's who always attack at range and you can specify the distance they will maintain from the target.
-
----------------------------
-30 = ACTION_T_RANDOM_PHASE:
----------------------------
-Parameter 1: PhaseId1 - A possible random phase choice.
-Parameter 2: PhaseId2 - A possible random phase choice.
-Parameter 3: PhaseId3 - A possible random phase choice.
-
-Randomly sets the phase to one from the three parameter choices.
-NOTE: Use -1 to specify that if this param is picked to do nothing. Random is constant between actions within an event. So if you have a random Yell and a random Sound they will match up (ex: param2 with param2)
-NOTE 2: PLEASE NOTE THAT EACH OF THE PARAM VALUES ARE ACTUAL PHASE NUMBERS NOT THE INVERSE PHASE MASK VALUE.
-This is commonly used for Spellcasting NPC's who on Aggro may select at random a school of spells to use for the fight. Use this if you have up to 3 phases used, otherwise use Action 31 for more then 3 phases.
-
----------------------------------
-31 = ACTION_T_RANDOM_PHASE_RANGE:
----------------------------------
-Parameter 1: PhaseMin - The minimum of the phase range.
-Parameter 2: PhaseMax - The maximum of the phase range. The number here must be greater than PhaseMin.
-
-Randomly sets the phase between a range of phases controlled by the parameters. Sets the phase to a random id (Phase = PhaseMin + rnd % PhaseMin-PhaseMax).
-NOTE: PhaseMax must be greater than PhaseMin.
-NOTE 2: PLEASE NOTE THAT EACH OF THE PARAM VALUES ARE ACTUAL PHASE NUMBERS NOT THE INVERSE PHASE MASK VALUE.
-This is commonly used for Spellcasting NPC's who on Aggro may select at random a school of spells to use for the fight. Use this if you have MORE then 3 phases used, otherwise use Action 30.
-
----------------------
-32 = ACTION_T_SUMMON:
----------------------
-Parameter 1: CreatureID - The creature template ID to be summoned. The value here needs to be a valid creature template ID.
-Parameter 2: Target - The target type defining who the summoned creature will attack. The value in this field needs to be a valid target type as specified in the reference tables below. NOTE: Using target type 0 will cause the summoned creature to not attack anyone.
-Parameter 3: SummonID - The summon ID from the creature_ai_summons table controlling the position (and spawntime) where the summoned mob should be spawned at.
-
-Summons creature (param1) to attack target (param2) at location specified by creature_ai_summons (param3).
-NOTE: Param3 Value is the ID Value used for the entry used in creature_ai_summons for this action. You MUST have an creature_ai_summons entry to use this action.
-This is commonly used for NPC's who need to Summon a creature at a specific location. (Normally used for complex events)
-
------------------------------
-33 = ACTION_T_KILLED_MONSTER:
------------------------------
-Parameter 1: CreatureID - The creature template ID. The value here must be a valid creature template ID.
-Parameter 2: Target - The target type defining whom the quest kill count should be given to. The value in this field needs to be a valid target type as specified in the reference tables below.
-
-When activated, this action will call KilledMonster() function for the player. It can be used to give creature credit for killing a creature. In general if the quest is set to be accompished on different creatures (e.g. "Credit" templates).
-NOTE: It can be ANY creature including certain quest specific triggers
-This is commonly used for giving the player Quest Credits for NPC kills (Many NPC's may use the same CreatureID for the Kill Credit)
-
-----------------------------
-34 = ACTION_T_SET_INST_DATA:
-----------------------------
-Parameter 1: Field - The field to change in the instance script. Again, this field needs to be a valid field that has been already defined in the instance's script.
-Parameter 2: Data - The value to put at that field index.
-
-Sets data for the instance. Note that this will only work when the creature is inside an instantiable zone that has a valid script (ScriptedInstance) assigned.
-This is commonly used to link an EventAI script with a existing Script Library C++ Script. You make make things happen like opening doors on specific events that happen.
-
-------------------------------
-35 = ACTION_T_SET_INST_DATA64:
-------------------------------
-Parameter 1: Field - The field to change in the instance script. Again, this field needs to be a valid field that has been already defined in the instance's script.
-Parameter 2: Target - The target type to use to get the GUID that will be stored at the field index. The value in this field needs to be a valid target type as specified in the reference tables below.
-
-Sets GUID (64 bits) data for the instance based on the target. Note that this will only work when the creature is inside an instantiable zone that has a valid script (ScriptedInstance) assigned.
-Calls ScriptedInstance::SetData64 with field (param1) and data (param2) target's GUID.
-
-------------------------------
-36 = ACTION_T_UPDATE_TEMPLATE:
-------------------------------
-Parameter 1: TemplateId - The creature template ID. The value here must be a valid creature template ID.
-Parameter 2: Team - Use model_id from team : Alliance(0) or Horde (1).
-
-This function temporarily changes creature entry to new entry, display is changed, loot is changed, but AI is not changed. At respawn creature will be reverted to original entry.
-Changes the creature to a new creature template of (param1) with team = Alliance if (param2) = false or Horde if (param2) = true
-
-------------------
-37 = ACTION_T_DIE:
-------------------
-Kills the creature
-This is commonly used if you need to Instakill the creature for one reason or another.
-
---------------------------------
-38 = ACTION_T_ZONE_COMBAT_PULSE:
---------------------------------
-Places all players within the instance into combat with the creature. Only works in combat and only works inside of instances.
-
-----------------------------
-39 = ACTION_T_CALL_FOR_HELP:
-----------------------------
-Parameter 1: Radius - All friendly (not only same faction) creatures will go to help
-
-Call any friendly creatures (if its not in combat/etc) in radius attack creature target.
-Mostly used when call to help more wide that normal aggro radius or auto-used call for assistance, and need apply at some event.
-
--------------------------
-40   ACTION_T_SET_SHEATH:
--------------------------
-Parameter 1: Sheath state
-0    SHEATH_STATE_UNARMED               not prepared weapon show (not used mostly by creatures)
-1    SHEATH_STATE_MELEE                 melee weapon prepared show
-2    SHEATH_STATE_RANGED                ranged weapon prepared show
-
-Let set sheath state for creature.
-Note: SHEATH_STATE_RANGED case work in combat state only if combat not start as melee commands.
-This possible setup by set ar event AI start (single used EVENT_T_TIMER_OOC set ACTION_T_COMBAT_MOVEMENT 0 for creature that prefered ranged attack)
-
--------------------------
-41   ACTION_T_FORCE_DESPAWN
--------------------------
-Despawns the creature (in or out of combat)
-No parameters
-
--------------------------
-42   ACTION_T_SET_INVINCIBILITY_HP_LEVEL
--------------------------
-Parameter 1: min. health level for creature that can be set at damage, 0 used as absent min. health value for apply damage.
-Parameter 2: format of paramater 1 value
-0    paramater 1 used as flat value
-1    paramater 1 used as percent (0..100) from creature max health
-
-=========================================
-Target Types
-=========================================
-Below is the list of current Target types that EventAI can handle.
-Target types are used by certain actions and may effect actions differently
-
-(#   Internal Name                      Discription)
-0    TARGET_T_SELF                      Self cast
-1    TARGET_T_HOSTILE                   Our current target (ie: highest aggro)
-2    TARGET_T_HOSTILE_SECOND_AGGRO      Second highest aggro (generaly used for cleaves and some special attacks)
-3    TARGET_T_HOSTILE_LAST_AGGRO        Dead last on aggro (no idea what this could be used for)
-4    TARGET_T_HOSTILE_RANDOM            Just any random target on our threat list
-5    TARGET_T_HOSTILE_RANDOM_NOT_TOP    Any random target except top threat
-6    TARGET_T_ACTION_INVOKER            Unit who caused this Event to occur (only works for EVENT_T_AGGRO, EVENT_T_KILL, EVENT_T_DEATH, EVENT_T_SPELLHIT, EVENT_T_OOC_LOS, EVENT_T_FRIENDLY_HP)
-
-=========================================
-Cast Flags
-=========================================
-Below is the list of current Cast Flags that EventAI's spell casting can handle.
-Cast flags are handled bitwise. Bit 0 is Interrupt Previous, bit 1 is triggered, etc.
-So for example the number "3" (11 in Binary, selecting first 2 options) would mean that this cast has both CAST_INTURRUPT_PREVIOUS and CAST_TRIGGERED.
-Another example: the number "5" (101 in Binary, selecting first and third options) would mean that this cast has CAST_INTURRUPT_PREVIOUS and CAST_FORCE_CAST.
-
-(bit#   Decimal     Internal Name                  Discription)
-0       1           CAST_INTURRUPT_PREVIOUS        Interrupts any previous spell casting (basicaly makes sure that this spell goes off)
-1       2           CAST_TRIGGERED                 Forces the spell to be instant cast and require no mana/reagents.
-2       4           CAST_FORCE_CAST                Forces spell to cast even if the target is possibly out of range or the creature is possibly out of mana
-3       8           CAST_NO_MELEE_IF_OOM           Prevents creature from entering melee if out of mana or out of range
-4       16          CAST_FORCE_TARGET_SELF         Forces the target to cast this spell on itself
-5       32          CAST_AURA_NOT_PRESENT          Only casts the spell on the target if the target does not have the aura from that spell on itself already.
-
-NOTE: You can add the numbers in the decimal column to combine flags.
- For example if you wanted to use CAST_NO_MELEE_IF_OOM(8) and CAST_TRIGGERED(2) you would simply use 10 in the cast flags field (8 + 2 = 10).
-
-=========================================
-Event Flags
-=========================================
-Below is the list of current Event Flags that EventAI can handle. Event flags are handled bitwise.
-
-(bit#   Decimal   Internal Name                  Discription)
-0       1         EFLAG_REPEATABLE               Event repeats (Does not repeat if this flag is not set)
-1       2         EFLAG_NORMAL                   Event occurs in Normal instance difficulty (will not occur in Normal if not set)
-2       4         EFLAG_HEROIC                   Event occurs in Heroic instance difficulty (will not occur in Heroic if not set)
-3       8
-4       16
-5       32
-6       64
-7       128        EFLAG_DEBUG_ONLY              Prevents events from occuring on Release builds. Useful for testing new features.
-
-NOTE: You can add the numbers in the decimal column to combine flags.
-
-
-=========================================
-Basic Structure of creature_ai_texts
-=========================================
-Below is a the list of current fields within the texts tables.
-
-Field_Name            Description
------------------------------------------------------------
-entry                 This value is mearly an NEGATIVE identifier of the current text number. Required for sql queries. Valid range are -1 to -999999
-content_default       This is the actual text presented in the default language (English).
-
-content_loc1          This is the actual text presented in the Localization #1 Clients (Korean)
-content_loc2          This is the actual text presented in the Localization #2 Clients (French)
-content_loc3          This is the actual text presented in the Localization #3 Clients (German)
-content_loc4          This is the actual text presented in the Localization #4 Clients (Chinese)
-content_loc5          This is the actual text presented in the Localization #5 Clients (Taiwanese)
-content_loc6          This is the actual text presented in the Localization #6 Clients (Spanish)
-content_loc7          This is the actual text presented in the Localization #7 Clients (Spanish Mexico)
-content_loc8          This is the actual text presented in the Localization #8 Clients (Russian)
-
-sound                 This value is the Sound ID that corresponds to the actual text used.
-type                  Variables used to define type of text (Say/Yell/Textemote/Whisper).
-language              This value is the Language that the text is native in.
-emote                 Value from enum Emote. Only source of text will play this emote (not target, if target are defined in DoScriptText)
-comment               This is a comment regarding the text entry
-
-Note: Fields `content_loc1` to `content_loc8` are NULL values by default and are normally handled by seperate localization projects.
-
-=========================================
-Text Types (type)
-=========================================
-Below is the list of current Text types that texts tables can handle. These were previously seperate Actions in ACID.
-
-#    Internal Name                 Description
------------------------------------------------------------
-0    CHAT_TYPE_SAY                 This type sets the text to be displayed as a Say (Speech Bubble).
-1    CHAT_TYPE_YELL                This type sets the text to be displayed as a Yell (Red Speech Bubble) and usually has a matching Sound ID.
-2    CHAT_TYPE_TEXT_EMOTE          This type sets the text to be displayed as a text emote in orange in the chat log.
-3    CHAT_TYPE_BOSS_EMOTE          This type sets the text to be displayed as a text emote in orange in the chat log (Used only for specific Bosses).
-4    CHAT_TYPE_WHISPER             This type sets the text to be displayed as a whisper to the player in the chat log.
-5    CHAT_TYPE_BOSS_WHISPER        This type sets the text to be displayed as a whisper to the player in the chat log (Used only for specific Bosses).
-6    CHAT_TYPE_ZONE_YELL           Same as CHAT_TYPE_YELL but will display to all players in current zone.
-
-=========================================
-Language Types (language)
-=========================================
-Below is the list of current Language types that are allowed.
-This is the Race Language that the text is native to (So it will display properly)
-
-#    Internal Name                Description
------------------------------------------------------------
-0    UNIVERSAL                    Text in this language is understood by ALL Races.
-1    ORCISH                       Text in this language is understood ONLY by Horde Races.
-2    DARNASSIAN                   Text in this language is understood ONLY by the Night Elf Race.
-3    TAURAHE                      Text in this language is understood ONLY by the Tauren Race.
-6    DWARVISH                     Text in this language is understood ONLY by the Dwarf Race.
-7    COMMON                       Text in this language is understood ONLY by Alliance Races.
-8    DEMONIC                      Text in this language is understood ONLY by the Demon Race (Not Implimented).
-9    TITAN                        This language was used by Sargeras to speak with other Titians (Not Implemented).
-10   THALASSIAN                   Text in this language is understood ONLY by the Blood Elf Race.
-11   DRACONIC                     Text in this language is understood ONLY by the Dragon Race.
-12   KALIMAG                      Text will display as Kalimag (not readable by players, language of all elementals)
-13   GNOMISH                      Text in this language is understood ONLY by the Gnome Race.
-14   TROLL                        Text in this language is understood ONLY by the Troll Race.
-33   GUTTERSPEAK                  Text in this language is understood ONLY by the Undead Race.
-35   DRAENEI                      Text in this language is understood ONLY by the Draenai Race.
-36   ZOMBIE                       (not currently used?)
-37   GNOMISH BINARY               Binary language used by Alliance when drinking Binary Brew
-38   GOBLIN BINARY                Binary language used by Horce when drinking Binary Brew
diff --git a/doc/HowToScript.txt b/doc/HowToScript.txt
deleted file mode 100644
index 73968a08b19..00000000000
--- a/doc/HowToScript.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-
-** HOW TO SCRIPT IN C++ **
-
-1 - create a file myscript.cpp in scripts folder.
-2 - copy the content of script_default.cpp, it as the structure on how the scripting fuctions are organized.
-		dont forget to change the name of fuctions, like GossipHello_default to GossipHello_myscript.
-
-3 - in fuction AddSC_default change to AddSC_myscript.
-4 - newscript->Name="default"; change the string to "myscript" this name is the one to be called from the db
-5 - dont forget to change the name in here to newscript->pGossipHello = &GossipHello_default; this is where the scripted fuctions are stored.
-6 - and last thing is in ScriptMgr.cpp
-
-add your AddSC_myscript in here
-
-// -- Scripts to be added --
-extern void AddSC_default();
-// -------------------
-
-and here
-
-// -- Inicialize the Scripts to be Added --
-	AddSC_default();
-// ----------------------------------------
-	
-now start using the player fuctions to script ;)
-
-hope it helps, any question use our forum.
\ No newline at end of file
diff --git a/doc/TextTables.txt b/doc/TextTables.txt
deleted file mode 100644
index eac63384785..00000000000
--- a/doc/TextTables.txt
+++ /dev/null
@@ -1,87 +0,0 @@
-=========================================
-Texts Documentation
-=========================================
-
-Scriptdev2 Revision 695 introduces a new format for using texts in EventAI and SD2 Scripts.
-This information relates to the *_texts tables located in the ScriptDev Database.
-
-Any script can at any time access and use text from any of the three text tables, as long as the entry does in fact exist.
-Custom scripters are adviced to store their text data in custom_texts.
-
-The different tables has ranges of entries allowed for that table.
-Reserved EventAI in Mangos     entry -1       -> -999999
-script_texts:  entry -1000000 -> -1999999
-custom_texts:  entry -2000000 -> -2999999
-Any entry out of range for that table will display a startup error.
-
-
-=========================================
-Basic Structure of script_texts and custom_texts
-=========================================
-Below is a the list of current fields within the texts tables.
-
-Field_Name            Description
------------------------------------------------------------
-entry                 This value is mearly an NEGATIVE identifier of the current text number. Required for sql queries.
-content_default       This is the actual text presented in the default language (English).
-
-content_loc1          This is the actual text presented in the Localization #1 Clients (Korean)
-content_loc2          This is the actual text presented in the Localization #2 Clients (French)
-content_loc3          This is the actual text presented in the Localization #3 Clients (German)
-content_loc4          This is the actual text presented in the Localization #4 Clients (Chinese)
-content_loc5          This is the actual text presented in the Localization #5 Clients (Taiwanese)
-content_loc6          This is the actual text presented in the Localization #6 Clients (Spanish)
-content_loc7          This is the actual text presented in the Localization #7 Clients (Spanish Mexico)
-content_loc8          This is the actual text presented in the Localization #8 Clients (Russian)
-
-sound                 This value is the Sound ID that corresponds to the actual text used (Defined in SoundEntries.dbc).
-type                  Variables used to define type of text (Say/Yell/Textemote/Whisper).
-language              This value is the Language that the text is native in (Defined in Languages.dbc).
-emote                 Value from enum Emote (defined in Emotes.dbc). Only source of text will play this emote (not target, if target are defined in DoScriptText)
-comment               This is a comment regarding the text entry (For ACID, accepted format is to use Creature ID of NPC using it).
-
-Note: Fields `content_loc1` to `content_loc8` are NULL values by default and are handled by seperate localization projects.
-
-
-=========================================
-Text Types (type)
-=========================================
-Below is the list of current Text types that texts tables can handle. These were previously seperate Actions in ACID.
-
-#    Internal Name                 Description
------------------------------------------------------------
-0    CHAT_TYPE_SAY                 This type sets the text to be displayed as a Say (Speech Bubble).
-1    CHAT_TYPE_YELL                This type sets the text to be displayed as a Yell (Red Speech Bubble) and usually has a matching Sound ID.
-2    CHAT_TYPE_TEXT_EMOTE          This type sets the text to be displayed as a text emote in orange in the chat log.
-3    CHAT_TYPE_BOSS_EMOTE          This type sets the text to be displayed as a text emote in orange in the chat log (Used only for specific Bosses).
-4    CHAT_TYPE_WHISPER             This type sets the text to be displayed as a whisper to the player in the chat log.
-5    CHAT_TYPE_BOSS_WHISPER        This type sets the text to be displayed as a whisper to the player in the chat log (Used only for specific Bosses).
-6    CHAT_TYPE_ZONE_YELL           Same as CHAT_TYPE_YELL but will display to all players in current zone.
-
-
-=========================================
-Language Types (language)
-=========================================
-Below is the list of current Language types that are allowed.
-This is the Race Language that the text is native to (So it will display properly)
-
-#    Internal Name                Description
------------------------------------------------------------
-0    UNIVERSAL                    Text in this language is understood by ALL Races.
-1    ORCISH                       Text in this language is understood ONLY by Horde Races.
-2    DARNASSIAN                   Text in this language is understood ONLY by the Night Elf Race.
-3    TAURAHE                      Text in this language is understood ONLY by the Tauren Race.
-6    DWARVISH                     Text in this language is understood ONLY by the Dwarf Race.
-7    COMMON                       Text in this language is understood ONLY by Alliance Races.
-8    DEMONIC                      Text in this language is understood ONLY by the Demon Race (Not Implimented).
-9    TITAN                        This language was used by Sargeras to speak with other Titians (Not Implemented).
-10   THALASSIAN                   Text in this language is understood ONLY by the Blood Elf Race.
-11   DRACONIC                     Text in this language is understood ONLY by the Dragon Race.
-12   KALIMAG                      Text will display as Kalimag (not readable by players, language of all elementals)
-13   GNOMISH                      Text in this language is understood ONLY by the Gnome Race.
-14   TROLL                        Text in this language is understood ONLY by the Troll Race.
-33   GUTTERSPEAK                  Text in this language is understood ONLY by the Undead Race.
-35   DRAENEI                      Text in this language is understood ONLY by the Draenai Race.
-36   ZOMBIE                       (not currently used?)
-37   GNOMISH BINARY               Binary language used by Alliance when drinking Binary Brew
-38   GOBLIN BINARY                Binary language used by Horce when drinking Binary Brew
\ No newline at end of file
diff --git a/doc/UnixInstall.txt b/doc/UnixInstall.txt
deleted file mode 100644
index a0bd7e07715..00000000000
--- a/doc/UnixInstall.txt
+++ /dev/null
@@ -1,61 +0,0 @@
-= TrinityCore -- Linux installation =
-
-Copyright (C) Trinity Core (http://www.trinitycore.org)
-
-CHECK http://www.trinitycore.info/w/Linux_Build_HOWTO FOR FURTHER HELP
-
-Installing Trinity Core is fairly simple on a Linux machine, assuming
-you have all required applications
-
-The most important ones are:
-
-	g++
-    gcc
-    make
-    cmake version 2.6.x or greater
-    libmysql++-dev
-    subversion (for checking out Trinity Database)
-    mercurial (for checking out the core)
-    openssl
-    libssl-dev
-    zlib1g-dev
-    libtool
-    libmysqlclient15-dev
-    patch
-    build-essential
-    mysql-client
-    
-Most of these are included on common Linux distros, others you may have to install by your self. 
-Please check your distro's repos.
-
-Make a directory to build in, you can call it anything you want like build or bin etc, then go into 
-the directory and cmake and make. E.G. you created a dir named build ad want to have your final
- compiled product installed in /home/trinity/server, an example sequence of commands can be : 
-
-    cmake ../ -DPREFIX=/home/trinity/server
-    make
-    make install
-    
-Thats just about all thats needed. You can however tweak more settings than where to install using flags built into our cmake files. Just open up CMakeLists.txt in the main folder and take a look at some of the flags like 
-
-    DO_MYSQL --mysql database support (enabled or disabled by a 1 or 0, enabled by default)
-    DO_SCRIPTS --enable or disable trinity script (enabled or disabled by a 1 or 0, enabled by default)
-    DO_RA --remote administration (enabled or disabled by a 1 or 0)
-    DO_DEBUG --enable debugging (enabled or disabled by a 1 or 0)
-    DO_CLI --enable command line support (enabled or disabled by a 1 or 0, enabled by default)
-    LARGE_CELL --enable large cells (enabled or disabled by a 1 or 0, disabled by default, enabling can cause CPU spikes)
-    SHORT_SLEEP --changes sleep time from 100ms to 50ms
-    PREFIX --prefix directory for install (see example for use)
-    CONF_DIR --location for your trinity config files
-    CMAKE_C_FLAGS --advanced users only
-    CMAKE_CXX_FLAGS --advanced users only
-
-
-Of course, replace the paths in prefix, conf_dir with the directories you wish to install 
-Trinity Core to. The datadir is where maps, DBCs, and SQLs are stored. The sysconfdir
-is where configuration files are stored.
-
-Once Trinity Core is installed you will need to
-apply database updates where necessary. Furthermore, you must
-configure your installation by editing the config files in the
-sysconfdir.
diff --git a/docs/AuctionHouseBot.txt b/docs/AuctionHouseBot.txt
new file mode 100644
index 00000000000..cc15a084c9a
--- /dev/null
+++ b/docs/AuctionHouseBot.txt
@@ -0,0 +1,236 @@
+Populates the auction houses with items. It can make the game feel a bit more
+like official on small servers. Items and prices are chosen randomly based on
+the parameters you define. If an auction expires, auctions are deleted quietly.
+AHBot will not buy it's own items, and will not receive mail from the AH
+or get returned mail.
+
+===============================================================================
+~~HOW TO CONFIGURE~~
+===============================================================================
+Step 1.) Create a character that you are going to use as the auction house bot
+         character. This character will be the auction's owner for all the
+         items created by the bot.
+Step 2.) Go into the realm database and note the account number for the
+         character.
+Step 3.) Go into the characters database and note the character's GUID.
+Step 4.) Log in at least once with this character.
+         (Do not change the configuration before this)
+Step 5.) Tune the configuration options in the configuration file and the
+         Database.
+
+#These are the settings in the configuration file:
+AuctionHouseBot.DEBUG = 0
+AuctionHouseBot.EnableSeller = 0
+AuctionHouseBot.EnableBuyer = 0
+AuctionHouseBot.UseBuyPriceForSeller = 0
+AuctionHouseBot.UseBuyPriceForBuyer = 0
+AuctionHouseBot.Account = 0
+AuctionHouseBot.GUID = 0
+AuctionHouseBot.ItemsPerCycle = 200
+
+AuctionHouseBot.DEBUG enables (1) or disables (0) Debug output
+AuctionHouseBot.EnableSeller enables (1) or disables (0) the Seller
+AuctionHouseBot.EnableBuyer enables (1) or disables (0) the Buyer
+AuctionHouseBot.UseBuyPriceForSeller Use SellPrice (0) or BuyPrice (1) for determining prices
+AuctionHouseBot.UseBuyPriceForBuyer Use SellPrice (0) or BuyPrice (1) for determining prices
+AuctionHouseBot.Account is the account number (in realmd->account table) of the player you want to run as the auction bot. Note: a value of 0 will disable the bot.
+AuctionHouseBot.GUID is the GUID (in characters->characters table) of the player you want to run as the auction bot. Note: a value of 0 will disable the bot.
+AuctionHouseBot.ItemsPerCycle determines how many items are added each time AHBot is run (once per minute, by default)
+
+#These are the Filters For filtering certain items/trade goods from the AH
+AuctionHouseBot.VendorItems = 0
+AuctionHouseBot.VendorTradeGoods = 0
+AuctionHouseBot.LootItems = 1
+AuctionHouseBot.LootTradeGoods = 1
+AuctionHouseBot.OtherItems = 0
+AuctionHouseBot.OtherTradeGoods = 0
+AuctionHouseBot.No_Bind = 1
+AuctionHouseBot.Bind_When_Picked_Up = 0
+AuctionHouseBot.Bind_When_Equipped = 1
+AuctionHouseBot.Bind_When_Use = 1
+AuctionHouseBot.Bind_Quest_Item = 0
+AuctionHouseBot.DisableBeta_PTR_Unused = 0
+AuctionHouseBot.DisablePermEnchant = 0
+AuctionHouseBot.DisableConjured = 0
+AuctionHouseBot.DisableGems = 0
+AuctionHouseBot.DisableMoney = 0
+AuctionHouseBot.DisableMoneyLoot = 0
+AuctionHouseBot.DisableLootable = 0
+AuctionHouseBot.DisableKeys = 0
+AuctionHouseBot.DisableDuration = 0
+AuctionHouseBot.DisableBOP_Or_Quest_NoReqLevel = 0
+
+AuctionHouseBot.VendorItems is a boolean value (0 or 1) that indicates whether to include Vendor only items
+AuctionHouseBot.VendorTradeGoods is a boolean value (0 or 1) that indicates whether to include Vendor only Trade Goods
+AuctionHouseBot.LootItems  is a boolean value (0 or 1) that indicates whether to include Loot/Fish/Skin/etc. only items
+AuctionHouseBot.LootTradeGoods  is a boolean value (0 or 1) that indicates whether to include Loot/Fish/Skin/etc. only Trade Goods
+AuctionHouseBot.OtherItems  is a boolean value (0 or 1) that indicates whether to include Other items not covered by the first 2
+AuctionHouseBot.OtherTradeGoods  is a boolean value (0 or 1) that indicates whether to include Other Trade Goods not covered by the first 2
+AuctionHouseBot.No_Bind is a boolean value (0 or 1) that indicates whether to include items with a bonding of 0
+AuctionHouseBot.Bind_When_Picked_Up = is a boolean value (0 or 1) that indicates whether to include items with a bonding of 1
+AuctionHouseBot.Bind_When_Equipped = is a boolean value (0 or 1) that indicates whether to include items with a bonding of 2
+AuctionHouseBot.Bind_When_Use = is a boolean value (0 or 1) that indicates whether to include items with a bonding of 3
+AuctionHouseBot.Bind_Quest_Item = is a boolean value (0 or 1) that indicates whether to include items with a bonding of 4
+AuctionHouseBot.DisableBeta_PTR_Unused is a boolean value (0 or 1) that will Disable certain items that are usually unavailable to Players
+AuctionHouseBot.DisablePermEnchant is a boolean value (0 or 1) that will Disable Items with a Permanent Enchantment
+AuctionHouseBot.DisableConjured is a boolean value (0 or 1) that will Disable Conjured Items
+AuctionHouseBot.DisableGems is a boolean value (0 or 1) that will Disable Gems
+AuctionHouseBot.DisableMoney is a boolean value (0 or 1) that will Disable Items that are used as money
+AuctionHouseBot.DisableMoneyLoot is a boolean value (0 or 1) that will Disable Items that have Money as a loot
+AuctionHouseBot.DisableLootable is a boolean value (0 or 1) that will Disable Items that have other items as loot
+AuctionHouseBot.DisableKeys is a boolean value (0 or 1) that will Disable Items that are keys
+AuctionHouseBot.DisableDuration is a boolean value (0 or 1) that will Disable Items with a duration
+AuctionHouseBot.DisableBOP_Or_Quest_NoReqLevel is a boolean value (0 or 1) that will Disable items that are BOP or Quest Item with a Required level that is less than the Item Level
+
+#These Filters are boolean (0 or 1) and will disable items that are
+#specifically meant for the Class named.
+#(UnusedClass is Class 10, which was skipped for some reason)
+AuctionHouseBot.DisableWarriorItems = 0
+AuctionHouseBot.DisablePaladinItems = 0
+AuctionHouseBot.DisableHunterItems = 0
+AuctionHouseBot.DisableRogueItems = 0
+AuctionHouseBot.DisablePriestItems = 0
+AuctionHouseBot.DisableDKItems = 0
+AuctionHouseBot.DisableShamanItems = 0
+AuctionHouseBot.DisableMageItems = 0
+AuctionHouseBot.DisableWarlockItems = 0
+AuctionHouseBot.DisableUnusedClassItems = 0
+AuctionHouseBot.DisableDruidItems = 0
+
+#These are the Filters For filtering certain items/trade goods from the AH
+AuctionHouseBot.DisableItemsBelowLevel = 0
+AuctionHouseBot.DisableItemsAboveLevel = 0
+AuctionHouseBot.DisableTGsBelowLevel = 0
+AuctionHouseBot.DisableTGsAboveLevel = 0
+AuctionHouseBot.DisableItemsBelowGUID = 0
+AuctionHouseBot.DisableItemsAboveGUID = 0
+AuctionHouseBot.DisableTGsBelowGUID = 0
+AuctionHouseBot.DisableTGsAboveGUID = 0
+AuctionHouseBot.DisableItemsBelowReqLevel = 0
+AuctionHouseBot.DisableItemsAboveReqLevel = 0
+AuctionHouseBot.DisableTGsBelowReqLevel = 0
+AuctionHouseBot.DisableTGsAboveReqLevel = 0
+AuctionHouseBot.DisableItemsBelowReqSkillRank = 0
+AuctionHouseBot.DisableItemsAboveReqSkillRank = 0
+AuctionHouseBot.DisableTGsBelowReqSkillRank = 0
+AuctionHouseBot.DisableTGsAboveReqSkillRank = 0
+
+#These are the settings in the Database:
+#Each Auctionhouse has it's own set of these
+
+MinItems = 0
+#The Minimum number of items you want to keep in the auction houses.
+#(default 0 - minimum will be the same as maximum).
+#If it is higher than the value of the corresponding maxItems setting,
+#it will be set down to match the maxItems setting.
+
+MaxItems = 0
+#The Maximum number of items you want to keep in the auction houses.
+
+#These must add up to 100 each one is the percentage
+#of the auction items that should be trade goods of
+#that quality. A value of 0 will disable.
+
+PercentGreyTradeGoods = 0
+PercentWhiteTradeGoods = 27
+PercentGreenTradeGoods = 12
+PercentBlueTradeGoods = 10
+PercentPurpleTradeGoods = 1
+PercentOrangeTradeGoods = 0
+PercentYellowTradeGoods = 0
+
+PercentGreyItems = 0
+PercentWhiteItems = 10
+PercentGreenItems = 30
+PercentBlueItems = 8
+PercentPurpleItems = 2
+PercentOrangeItems = 0
+PercentYellowItems = 0
+
+#MinPrice(Color)    is the minimum price adjustment for items. For example the default is 150, which means 150%. So if an item vendors for 1g it would go to auction for a minimum of 1.5g.
+#MaxPrice(Color)    is the maximum price adjustment for items.
+#MinBidPrice(Color) these two control the starting bid as a percent of the buyout price. For example, if MinBidPrice is 30 and MaxBidPrice is 80 the starting bid for the auction will randomly be between 30-80% of the randomly chosen buyout price.
+#MaxBidPrice(Color) these two control the starting bid as a percent of the buyout price. For example, if MinBidPrice is 30 and MaxBidPrice is 80 the starting bid for the auction will randomly be between 30-80% of the randomly chosen buyout price.
+#MaxStack(Color)    is maximum stack size to create for this quality type. A value of zero will disable the maximum stack size for this quality allowing the bot to create stacks (of random size) of items as big as the item type allows.
+
+MinPriceGrey = 100
+MaxPriceGrey = 150
+MinBidPriceGrey = 70
+MaxBidPriceGrey = 100
+MaxStackGrey = 0
+MinPriceWhite = 150
+MaxPriceWhite = 250
+MinBidPriceWhite = 70
+MaxBidPriceWhite = 100
+MaxStackWhite = 0
+MinPriceGreen = 800
+MaxPriceGreen = 1400
+MinBidPriceGreen = 80
+MaxBidPriceGreen = 100
+MaxStackGreen = 0
+MinPriceBlue = 1250
+MaxPriceBlue = 1750
+MinBidPriceBlue = 75
+MaxBidPriceBlue = 100
+MaxStackBlue = 0
+MinPricePurple = 2250
+MaxPricePurple = 4550
+MinBidPricePurple = 80
+MaxBidPricePurple = 100
+MaxStackPurple = 0
+MinPriceOrange = 4250
+MaxPriceOrange = 5550
+MinBidPriceOrange = 80
+MaxBidPriceOrange = 100
+MaxStackOrange = 0
+MinPriceYellow = 5250
+MaxPriceYellow = 6550
+MinBidPriceYellow = 80
+MaxBidPriceYellow = 100
+MaxStackYellow = 0
+
+#These are the multipliers that are applied to the vendor price for an item, that determines if AHBot will buy it or not.
+#1 means AHBot will pay the same as (or less than) a vendor would pay, 2 means up to twice as much, etc.
+
+BuyerPriceGrey = 1
+BuyerPriceWhite = 3
+BuyerPriceGreen = 5
+BuyerPriceBlue = 12
+BuyerPricePurple = 15
+BuyerPriceOrange = 20
+BuyerPriceYellow = 22
+
+#BuyerBiddingInterval is the time (in minutes) between bids.
+#BuyerBidsPerInterval is the number of bids the buyer will make in a cycle
+
+BuyerBiddingInterval = 1
+BuyerBidsPerInterval = 1
+
+
+
+How to use ahcommands from the console (CLI) or in game with GM level 3 players:
+ahbotoptions - will display usage instructions
+ahbotoptions help - will display the list of commands
+
+ahexpire - will expire all the auctions in the requested auction house that were created by AHBot.
+minitems - will set the minimum number of items in the AH before it starts being filled again.
+maxitems - will set the maximum number of items in the AH.
+percentages - will set the percentage of each quality in the AH
+minprice - will set the minimum price multiplier for auctions.
+maxprice - will set the maximum price multiplier for auctions.
+minbidprice - will set the minimum starting bid as a percent of the buyout price for auctions.
+maxbidprice - will set the maximum starting bid as a percent of the buyout price for auctions.
+maxstack - will set the maximum number of items in stacks for auctions. 0 will set the maximum to the maximum for that item type.
+buyerprice - will set the bid price multiplier for auctions.
+biddinginterval - will set the number of minutes between bids on auctions.
+bidsperinterval - will set the number of bids to enter per cycle.
+
+The auction house IDs are:
+2 - Alliance
+6 - Horde
+7 - Neutral
+
+
+AHBot Originally made by Chris K. Currently maintained by Paradox
+Much thanks to Chris K, grether and Dolomit6!
+AHBot Now includes AHBuyer created by Kerbe as a derivative of AHBot, and later modified by Paradox
diff --git a/docs/DocStructure.dox b/docs/DocStructure.dox
new file mode 100644
index 00000000000..dee8b5a0877
--- /dev/null
+++ b/docs/DocStructure.dox
@@ -0,0 +1,31 @@
+/*! \mainpage
+ *
+ * \section intro_sec Introduction and links
+ * This is the source documentation for the \b %MaNGOS (Massive Network Game %Object Server) project.\n
+ * %MaNGOS is an object-oriented Massively Multiplayer Online Role-Playing Game Server (MMORPGS).\n
+ * The project documentation and the bug tracker can be found on the %MaNGOS wiki.
+ *
+ * \section begin Where to begin?
+ * If you are interested in understanding the source code of this project you can begin
+ * - On the wiki to get an overview of the different modules of the server
+ * - In this source doumentation, starting at the module hierarchy
+ */
+ 
+/*! \defgroup realmd Realm Daemon
+ */
+ 
+/*! \defgroup mangos Mangos Deamon
+ */
+
+/*! \defgroup mangosd Daemon starter
+    \ingroup mangos
+ */
+ 
+/*! \defgroup u2w User Connections
+    \ingroup mangos
+ */ 
+
+/*! \defgroup world The World
+    \ingroup mangos
+ */ 
+
diff --git a/docs/Doxyfile.in b/docs/Doxyfile.in
new file mode 100644
index 00000000000..9893593751c
--- /dev/null
+++ b/docs/Doxyfile.in
@@ -0,0 +1,1314 @@
+# Doxyfile 1.5.3
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project
+#
+# All text after a hash (#) is considered a comment and will be ignored
+# The format is:
+#       TAG = value [value, ...]
+# For lists items can also be appended using:
+#       TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (" ")
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file that 
+# follow. The default is UTF-8 which is also the encoding used for all text before 
+# the first occurrence of this tag. Doxygen uses libiconv (or the iconv built into 
+# libc) for the transcoding. See http://www.gnu.org/software/libiconv for the list of 
+# possible encodings.
+
+DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
+# by quotes) that should identify the project.
+
+PROJECT_NAME           = @PACKAGE@
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. 
+# This could be handy for archiving the generated documentation or 
+# if some version control system is used.
+
+PROJECT_NUMBER         = @VERSION@
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
+# base path where the generated documentation will be put. 
+# If a relative path is entered, it will be relative to the location 
+# where doxygen was started. If left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = ./
+
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
+# 4096 sub-directories (in 2 levels) under the output directory of each output 
+# format and will distribute the generated files over these directories. 
+# Enabling this option can be useful when feeding doxygen a huge amount of 
+# source files, where putting all generated files in the same directory would 
+# otherwise cause performance problems for the file system.
+
+CREATE_SUBDIRS         = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all 
+# documentation generated by doxygen is written. Doxygen will use this 
+# information to generate all constant output in the proper language. 
+# The default language is English, other supported languages are: 
+# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, 
+# Croatian, Czech, Danish, Dutch, Finnish, French, German, Greek, Hungarian, 
+# Italian, Japanese, Japanese-en (Japanese with English messages), Korean, 
+# Korean-en, Lithuanian, Norwegian, Polish, Portuguese, Romanian, Russian, 
+# Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian.
+
+OUTPUT_LANGUAGE        = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
+# include brief member descriptions after the members that are listed in 
+# the file and class documentation (similar to JavaDoc). 
+# Set to NO to disable this.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend 
+# the brief description of a member or function before the detailed description. 
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the 
+# brief descriptions will be completely suppressed.
+
+REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator 
+# that is used to form the text in various listings. Each string 
+# in this list, if found as the leading text of the brief description, will be 
+# stripped from the text and the result after processing the whole list, is 
+# used as the annotated text. Otherwise, the brief description is used as-is. 
+# If left blank, the following values are used ("$name" is automatically 
+# replaced with the name of the entity): "The $name class" "The $name widget" 
+# "The $name file" "is" "provides" "specifies" "contains" 
+# "represents" "a" "an" "the"
+
+ABBREVIATE_BRIEF       = 
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then 
+# Doxygen will generate a detailed section even if there is only a brief 
+# description.
+
+ALWAYS_DETAILED_SEC    = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all 
+# inherited members of a class in the documentation of that class as if those 
+# members were ordinary class members. Constructors, destructors and assignment 
+# operators of the base classes will not be shown.
+
+INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full 
+# path before files name in the file list and in the header files. If set 
+# to NO the shortest path that makes the file name unique will be used.
+
+FULL_PATH_NAMES        = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
+# can be used to strip a user-defined part of the path. Stripping is 
+# only done if one of the specified strings matches the left-hand part of 
+# the path. The tag can be used to show relative paths in the file list. 
+# If left blank the directory from which doxygen is run is used as the 
+# path to strip.
+
+STRIP_FROM_PATH        = @top_srcdir@/
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
+# the path mentioned in the documentation of a class, which tells 
+# the reader which header file to include in order to use a class. 
+# If left blank only the name of the header file containing the class 
+# definition is used. Otherwise one should specify the include paths that 
+# are normally passed to the compiler using the -I flag.
+
+STRIP_FROM_INC_PATH    = 
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
+# (but less readable) file names. This can be useful is your file systems 
+# doesn't support long names like on DOS, Mac, or CD-ROM.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
+# will interpret the first line (until the first dot) of a JavaDoc-style 
+# comment as the brief description. If set to NO, the JavaDoc 
+# comments will behave just like regular Qt-style comments 
+# (thus requiring an explicit @brief command for a brief description.)
+
+JAVADOC_AUTOBRIEF      = YES
+
+# If the QT_AUTOBRIEF tag is set to YES then Doxygen will 
+# interpret the first line (until the first dot) of a Qt-style 
+# comment as the brief description. If set to NO, the comments 
+# will behave just like regular Qt-style comments (thus requiring 
+# an explicit \brief command for a brief description.)
+
+QT_AUTOBRIEF           = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen 
+# treat a multi-line C++ special comment block (i.e. a block of //! or /// 
+# comments) as a brief description. This used to be the default behaviour. 
+# The new default is to treat a multi-line C++ comment block as a detailed 
+# description. Set this tag to YES if you prefer the old behaviour instead.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the DETAILS_AT_TOP tag is set to YES then Doxygen 
+# will output the detailed description near the top, like JavaDoc.
+# If set to NO, the detailed description appears after the member 
+# documentation.
+
+DETAILS_AT_TOP         = NO
+
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
+# member inherits the documentation from any documented member that it 
+# re-implements.
+
+INHERIT_DOCS           = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce 
+# a new page for each member. If set to NO, the documentation of a member will 
+# be part of the file/class/namespace that contains it.
+
+SEPARATE_MEMBER_PAGES  = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. 
+# Doxygen uses this value to replace tabs by spaces in code fragments.
+
+TAB_SIZE               = 4
+
+# This tag can be used to specify a number of aliases that acts 
+# as commands in the documentation. An alias has the form "name=value". 
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to 
+# put the command \sideeffect (or @sideeffect) in the documentation, which 
+# will result in a user-defined paragraph with heading "Side Effects:". 
+# You can put \n's in the value part of an alias to insert newlines.
+
+ALIASES                = "memo=\par Note:\n " \
+                         "draft=\xrefitem draft \"Draft\" \"Draft List\"  This API may be changed in the future versions and was introduced in " \
+                         "stable=\xrefitem stable \"Stable\" \"Stable List\" " \
+                         "deprecated=\xrefitem deprecated \"Deprecated\" \"Deprecated List\" " \
+                         "obsolete=\xrefitem obsolete \"Obsolete\" \"Obsolete List\" " \
+                         "system=\xrefitem system \"System\" \"System List\" \n Do not use unless you know what you are doing. " \
+                         "internal=\xrefitem internal \"Internal\"  \"Internal List\"  Do not use. This API is for interal use only. "
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C 
+# sources only. Doxygen will then generate output that is more tailored for C. 
+# For instance, some of the names that are used will be different. The list 
+# of all members will be omitted, etc.
+
+OPTIMIZE_OUTPUT_FOR_C  = YES
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java 
+# sources only. Doxygen will then generate output that is more tailored for Java. 
+# For instance, namespaces will be presented as packages, qualified scopes 
+# will look different, etc.
+
+OPTIMIZE_OUTPUT_JAVA   = NO
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want to 
+# include (a tag file for) the STL sources as input, then you should 
+# set this tag to YES in order to let doxygen match functions declarations and 
+# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. 
+# func(std::string) {}). This also make the inheritance and collaboration 
+# diagrams that involve STL classes more complete and accurate.
+
+BUILTIN_STL_SUPPORT    = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+
+CPP_CLI_SUPPORT        = NO
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
+# tag is set to YES, then doxygen will reuse the documentation of the first 
+# member in the group (if any) for the other members of the group. By default 
+# all members of a group must be documented explicitly.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# Set the SUBGROUPING tag to YES (the default) to allow class member groups of 
+# the same type (for instance a group of public functions) to be put as a 
+# subgroup of that type (e.g. under the Public Functions section). Set it to 
+# NO to prevent subgrouping. Alternatively, this can be done per class using 
+# the \nosubgrouping command.
+
+SUBGROUPING            = YES
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in 
+# documentation are documented, even if no documentation was available. 
+# Private class members and static file members will be hidden unless 
+# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+
+EXTRACT_ALL            = NO
+
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class 
+# will be included in the documentation.
+
+EXTRACT_PRIVATE        = NO
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file 
+# will be included in the documentation.
+
+EXTRACT_STATIC         = NO
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 
+# defined locally in source files will be included in the documentation. 
+# If set to NO only classes defined in header files are included.
+
+EXTRACT_LOCAL_CLASSES  = YES
+
+# This flag is only useful for Objective-C code. When set to YES local 
+# methods, which are defined in the implementation section but not in 
+# the interface are included in the documentation. 
+# If set to NO (the default) only methods in the interface are included.
+
+EXTRACT_LOCAL_METHODS  = YES
+
+# If this flag is set to YES, the members of anonymous namespaces will be extracted 
+# and appear in the documentation as a namespace called 'anonymous_namespace{file}', 
+# where file will be replaced with the base name of the file that contains the anonymous 
+# namespace. By default anonymous namespace are hidden.
+
+EXTRACT_ANON_NSPACES   = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
+# undocumented members of documented classes, files or namespaces. 
+# If set to NO (the default) these members will be included in the 
+# various overviews, but no documentation section is generated. 
+# This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_MEMBERS     = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all 
+# undocumented classes that are normally visible in the class hierarchy. 
+# If set to NO (the default) these classes will be included in the various 
+# overviews. This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_CLASSES     = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all 
+# friend (class|struct|union) declarations. 
+# If set to NO (the default) these declarations will be included in the 
+# documentation.
+
+HIDE_FRIEND_COMPOUNDS  = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any 
+# documentation blocks found inside the body of a function. 
+# If set to NO (the default) these blocks will be appended to the 
+# function's detailed documentation block.
+
+HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation 
+# that is typed after a \internal command is included. If the tag is set 
+# to NO (the default) then the documentation will be excluded. 
+# Set it to YES to include the internal documentation.
+
+INTERNAL_DOCS          = YES
+
+# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate 
+# file names in lower-case letters. If set to YES upper-case letters are also 
+# allowed. This is useful if you have classes or files whose names only differ 
+# in case and if your file system supports case sensitive file names. Windows 
+# and Mac users are advised to set this option to NO.
+
+CASE_SENSE_NAMES       = YES
+
+# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen 
+# will show members with their full class and namespace scopes in the 
+# documentation. If set to YES the scope will be hidden.
+
+HIDE_SCOPE_NAMES       = NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen 
+# will put a list of the files that are included by a file in the documentation 
+# of that file.
+
+SHOW_INCLUDE_FILES     = YES
+
+# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] 
+# is inserted in the documentation for inline members.
+
+INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen 
+# will sort the (detailed) documentation of file and class members 
+# alphabetically by member name. If set to NO the members will appear in 
+# declaration order.
+
+SORT_MEMBER_DOCS       = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the 
+# brief documentation of file, namespace and class members alphabetically 
+# by member name. If set to NO (the default) the members will appear in 
+# declaration order.
+
+SORT_BRIEF_DOCS        = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be 
+# sorted by fully-qualified names, including namespaces. If set to 
+# NO (the default), the class list will be sorted only by class name, 
+# not including the namespace part. 
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the 
+# alphabetical list.
+
+SORT_BY_SCOPE_NAME     = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or 
+# disable (NO) the todo list. This list is created by putting \todo 
+# commands in the documentation.
+
+GENERATE_TODOLIST      = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or 
+# disable (NO) the test list. This list is created by putting \test 
+# commands in the documentation.
+
+GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or 
+# disable (NO) the bug list. This list is created by putting \bug 
+# commands in the documentation.
+
+GENERATE_BUGLIST       = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or 
+# disable (NO) the deprecated list. This list is created by putting 
+# \deprecated commands in the documentation.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional 
+# documentation sections, marked by \if sectionname ... \endif.
+
+ENABLED_SECTIONS       = 
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines 
+# the initial value of a variable or define consists of for it to appear in 
+# the documentation. If the initializer consists of more lines than specified 
+# here it will be hidden. Use a value of 0 to hide initializers completely. 
+# The appearance of the initializer of individual variables and defines in the 
+# documentation can be controlled using \showinitializer or \hideinitializer 
+# command in the documentation regardless of this setting.
+
+MAX_INITIALIZER_LINES  = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated 
+# at the bottom of the documentation of classes and structs. If set to YES the 
+# list will mention the files that were used to generate the documentation.
+
+SHOW_USED_FILES        = YES
+
+# If the sources in your project are distributed over multiple directories 
+# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy 
+# in the documentation. The default is NO.
+
+SHOW_DIRECTORIES       = NO
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that 
+# doxygen should invoke to get the current version for each file (typically from the 
+# version control system). Doxygen will invoke the program by executing (via 
+# popen()) the command  , where  is the value of 
+# the FILE_VERSION_FILTER tag, and  is the name of an input file 
+# provided by doxygen. Whatever the program writes to standard output 
+# is used as the file version. See the manual for examples.
+
+FILE_VERSION_FILTER    = 
+
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated 
+# by doxygen. Possible values are YES and NO. If left blank NO is used.
+
+QUIET                  = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are 
+# generated by doxygen. Possible values are YES and NO. If left blank 
+# NO is used.
+
+WARNINGS               = YES
+
+# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings 
+# for undocumented members. If EXTRACT_ALL is set to YES then this flag will 
+# automatically be disabled.
+
+WARN_IF_UNDOCUMENTED   = YES
+
+# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for 
+# potential errors in the documentation, such as not documenting some 
+# parameters in a documented function, or documenting parameters that 
+# don't exist or using markup commands wrongly.
+
+WARN_IF_DOC_ERROR      = YES
+
+# This WARN_NO_PARAMDOC option can be abled to get warnings for 
+# functions that are documented, but have no documentation for their parameters 
+# or return value. If set to NO (the default) doxygen will only warn about 
+# wrong or incomplete parameter documentation, but not about the absence of 
+# documentation.
+
+WARN_NO_PARAMDOC       = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that 
+# doxygen can produce. The string should contain the $file, $line, and $text 
+# tags, which will be replaced by the file and line number from which the 
+# warning originated and the warning text. Optionally the format may contain 
+# $version, which will be replaced by the version of the file (if it could 
+# be obtained via FILE_VERSION_FILTER)
+
+WARN_FORMAT            = "$file:$line: $text "
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning 
+# and error messages should be written. If left blank the output is written 
+# to stderr.
+
+WARN_LOGFILE           = 
+
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag can be used to specify the files and/or directories that contain 
+# documented source files. You may enter file names like "myfile.cpp" or 
+# directories like "/usr/src/myproject". Separate the files or directories 
+# with spaces.
+
+INPUT                  = @top_srcdir@/src/shared/ \
+                         @top_srcdir@/src/shared/Auth/ \
+                         @top_srcdir@/src/shared/Database/ \
+                         @top_srcdir@/src/game/ \
+                         @top_srcdir@/src/realmd/ \
+                         @top_srcdir@/src/mangosd/ \
+                         DocStructure.dox
+
+# This tag can be used to specify the character encoding of the source files that 
+# doxygen parses. Internally doxygen uses the UTF-8 encoding, which is also the default 
+# input encoding. Doxygen uses libiconv (or the iconv built into libc) for the transcoding. 
+# See http://www.gnu.org/software/libiconv for the list of possible encodings.
+
+INPUT_ENCODING         = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the 
+# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
+# and *.h) to filter out the source-files in the directories. If left 
+# blank the following patterns are tested: 
+# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx 
+# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py
+
+FILE_PATTERNS          = *.cpp \
+                         *.h \
+                         *.hpp
+
+# The RECURSIVE tag can be used to turn specify whether or not subdirectories 
+# should be searched for input files as well. Possible values are YES and NO. 
+# If left blank NO is used.
+
+RECURSIVE              = NO
+
+# The EXCLUDE tag can be used to specify files and/or directories that should 
+# excluded from the INPUT source files. This way you can easily exclude a 
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+
+EXCLUDE                = 
+
+# The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
+# directories that are symbolic links (a Unix filesystem feature) are excluded 
+# from the input.
+
+EXCLUDE_SYMLINKS       = NO
+
+# If the value of the INPUT tag contains directories, you can use the 
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 
+# certain files from those directories. Note that the wildcards are matched 
+# against the file with absolute path, so to exclude all test directories 
+# for example use the pattern */test/*
+
+EXCLUDE_PATTERNS       = config*.h
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names 
+# (namespaces, classes, functions, etc.) that should be excluded from the output. 
+# The symbol name can be a fully qualified name, a word, or if the wildcard * is used, 
+# a substring. Examples: ANamespace, AClass, AClass::ANamespace, ANamespace::*Test
+
+EXCLUDE_SYMBOLS        = 
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or 
+# directories that contain example code fragments that are included (see 
+# the \include command).
+
+EXAMPLE_PATH           = 
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the 
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
+# and *.h) to filter out the source-files in the directories. If left 
+# blank all files are included.
+
+EXAMPLE_PATTERNS       = 
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be 
+# searched for input files to be used with the \include or \dontinclude 
+# commands irrespective of the value of the RECURSIVE tag. 
+# Possible values are YES and NO. If left blank NO is used.
+
+EXAMPLE_RECURSIVE      = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or 
+# directories that contain image that are included in the documentation (see 
+# the \image command).
+
+IMAGE_PATH             = 
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should 
+# invoke to filter for each input file. Doxygen will invoke the filter program 
+# by executing (via popen()) the command  , where  
+# is the value of the INPUT_FILTER tag, and  is the name of an 
+# input file. Doxygen will then use the output that the filter program writes 
+# to standard output.  If FILTER_PATTERNS is specified, this tag will be 
+# ignored.
+
+INPUT_FILTER           = 
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern 
+# basis.  Doxygen will compare the file name with each pattern and apply the 
+# filter if there is a match.  The filters are a list of the form: 
+# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further 
+# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER 
+# is applied to all files.
+
+FILTER_PATTERNS        = 
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using 
+# INPUT_FILTER) will be used to filter the input files when producing source 
+# files to browse (i.e. when SOURCE_BROWSER is set to YES).
+
+FILTER_SOURCE_FILES    = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will 
+# be generated. Documented entities will be cross-referenced with these sources. 
+# Note: To get rid of all source code in the generated output, make sure also 
+# VERBATIM_HEADERS is set to NO. If you have enabled CALL_GRAPH or CALLER_GRAPH 
+# then you must also enable this option. If you don't then doxygen will produce 
+# a warning and turn it on anyway
+
+SOURCE_BROWSER         = YES
+
+# Setting the INLINE_SOURCES tag to YES will include the body 
+# of functions and classes directly in the documentation.
+
+INLINE_SOURCES         = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct 
+# doxygen to hide any special comment blocks from generated source code 
+# fragments. Normal C and C++ comments will always remain visible.
+
+STRIP_CODE_COMMENTS    = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES (the default) 
+# then for each documented function all documented 
+# functions referencing it will be listed.
+
+REFERENCED_BY_RELATION = YES
+
+# If the REFERENCES_RELATION tag is set to YES (the default) 
+# then for each documented function all documented entities 
+# called/used by that function will be listed.
+
+REFERENCES_RELATION    = YES
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
+# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
+# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
+# link to the source code.  Otherwise they will link to the documentstion.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code 
+# will point to the HTML generated by the htags(1) tool instead of doxygen 
+# built-in source browser. The htags tool is part of GNU's global source 
+# tagging system (see http://www.gnu.org/software/global/global.html). You 
+# will need version 4.8.6 or higher.
+
+USE_HTAGS              = NO
+
+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen 
+# will generate a verbatim copy of the header file for each class for 
+# which an include is specified. Set to NO to disable this.
+
+VERBATIM_HEADERS       = YES
+
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index 
+# of all compounds will be generated. Enable this if the project 
+# contains a lot of classes, structs, unions or interfaces.
+
+ALPHABETICAL_INDEX     = YES
+
+# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then 
+# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns 
+# in which this list will be split (can be a number in the range [1..20])
+
+COLS_IN_ALPHA_INDEX    = 5
+
+# In case all classes in a project start with a common prefix, all 
+# classes will be put under the same header in the alphabetical index. 
+# The IGNORE_PREFIX tag can be used to specify one or more prefixes that 
+# should be ignored while generating the index headers.
+
+IGNORE_PREFIX          = 
+
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES (the default) Doxygen will 
+# generate HTML output.
+
+GENERATE_HTML          = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `html' will be used as the default path.
+
+HTML_OUTPUT            = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for 
+# each generated HTML page (for example: .htm,.php,.asp). If it is left blank 
+# doxygen will generate files with .html extension.
+
+HTML_FILE_EXTENSION    = .html
+
+# The HTML_HEADER tag can be used to specify a personal HTML header for 
+# each generated HTML page. If it is left blank doxygen will generate a 
+# standard header.
+
+HTML_HEADER            = 
+
+# The HTML_FOOTER tag can be used to specify a personal HTML footer for 
+# each generated HTML page. If it is left blank doxygen will generate a 
+# standard footer.
+
+HTML_FOOTER            = 
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
+# style sheet that is used by each HTML page. It can be used to 
+# fine-tune the look of the HTML output. If the tag is left blank doxygen 
+# will generate a default style sheet. Note that doxygen will try to copy 
+# the style sheet file to the HTML output directory, so don't put your own 
+# stylesheet in the HTML output directory as well, or it will be erased!
+
+HTML_STYLESHEET        = 
+
+# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
+# files or namespaces will be aligned in HTML using tables. If set to 
+# NO a bullet list will be used.
+
+HTML_ALIGN_MEMBERS     = YES
+
+# If the GENERATE_HTMLHELP tag is set to YES, additional index files 
+# will be generated that can be used as input for tools like the 
+# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) 
+# of the generated HTML documentation.
+
+GENERATE_HTMLHELP      = NO
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML 
+# documentation will contain sections that can be hidden and shown after the 
+# page has loaded. For this to work a browser that supports 
+# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox 
+# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
+
+HTML_DYNAMIC_SECTIONS  = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can 
+# be used to specify the file name of the resulting .chm file. You 
+# can add a path in front of the file if the result should not be 
+# written to the html output directory.
+
+CHM_FILE               = 
+
+# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can 
+# be used to specify the location (absolute path including file name) of 
+# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run 
+# the HTML help compiler on the generated index.hhp.
+
+HHC_LOCATION           = 
+
+# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag 
+# controls if a separate .chi index file is generated (YES) or that 
+# it should be included in the master .chm file (NO).
+
+GENERATE_CHI           = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag 
+# controls whether a binary table of contents is generated (YES) or a 
+# normal table of contents (NO) in the .chm file.
+
+BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members 
+# to the contents of the HTML help documentation and to the tree view.
+
+TOC_EXPAND             = NO
+
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index at 
+# top of each HTML page. The value NO (the default) enables the index and 
+# the value YES disables it.
+
+DISABLE_INDEX          = NO
+
+# This tag can be used to set the number of enum values (range [1..20]) 
+# that doxygen will group on one line in the generated HTML documentation.
+
+ENUM_VALUES_PER_LINE   = 4
+
+# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
+# generated containing a tree-like index structure (just like the one that 
+# is generated for HTML Help). For this to work a browser that supports 
+# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, 
+# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are 
+# probably better off using the HTML help feature.
+
+GENERATE_TREEVIEW      = NO
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be 
+# used to set the initial width (in pixels) of the frame in which the tree 
+# is shown.
+
+TREEVIEW_WIDTH         = 250
+
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will 
+# generate Latex output.
+
+GENERATE_LATEX         = NO
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `latex' will be used as the default path.
+
+LATEX_OUTPUT           = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be 
+# invoked. If left blank `latex' will be used as the default command name.
+
+LATEX_CMD_NAME         = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to 
+# generate index for LaTeX. If left blank `makeindex' will be used as the 
+# default command name.
+
+MAKEINDEX_CMD_NAME     = makeindex
+
+# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact 
+# LaTeX documents. This may be useful for small projects and may help to 
+# save some trees in general.
+
+COMPACT_LATEX          = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used 
+# by the printer. Possible values are: a4, a4wide, letter, legal and 
+# executive. If left blank a4wide will be used.
+
+PAPER_TYPE             = a4wide
+
+# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX 
+# packages that should be included in the LaTeX output.
+
+EXTRA_PACKAGES         = 
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for 
+# the generated latex document. The header should contain everything until 
+# the first chapter. If it is left blank doxygen will generate a 
+# standard header. Notice: only use this tag if you know what you are doing!
+
+LATEX_HEADER           = 
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated 
+# is prepared for conversion to pdf (using ps2pdf). The pdf file will 
+# contain links (just like the HTML output) instead of page references 
+# This makes the output suitable for online browsing using a pdf viewer.
+
+PDF_HYPERLINKS         = NO
+
+# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of 
+# plain latex in the generated Makefile. Set this option to YES to get a 
+# higher quality PDF documentation.
+
+USE_PDFLATEX           = NO
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. 
+# command to the generated LaTeX files. This will instruct LaTeX to keep 
+# running if errors occur, instead of asking the user for help. 
+# This option is also used when generating formulas in HTML.
+
+LATEX_BATCHMODE        = NO
+
+# If LATEX_HIDE_INDICES is set to YES then doxygen will not 
+# include the index chapters (such as File Index, Compound Index, etc.) 
+# in the output.
+
+LATEX_HIDE_INDICES     = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output 
+# The RTF output is optimized for Word 97 and may not look very pretty with 
+# other RTF readers or editors.
+
+GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `rtf' will be used as the default path.
+
+RTF_OUTPUT             = rtf
+
+# If the COMPACT_RTF tag is set to YES Doxygen generates more compact 
+# RTF documents. This may be useful for small projects and may help to 
+# save some trees in general.
+
+COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated 
+# will contain hyperlink fields. The RTF file will 
+# contain links (just like the HTML output) instead of page references. 
+# This makes the output suitable for online browsing using WORD or other 
+# programs which support those fields. 
+# Note: wordpad (write) and others do not support links.
+
+RTF_HYPERLINKS         = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's 
+# config file, i.e. a series of assignments. You only have to provide 
+# replacements, missing definitions are set to their default value.
+
+RTF_STYLESHEET_FILE    = 
+
+# Set optional variables used in the generation of an rtf document. 
+# Syntax is similar to doxygen's config file.
+
+RTF_EXTENSIONS_FILE    = 
+
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES (the default) Doxygen will 
+# generate man pages
+
+GENERATE_MAN           = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `man' will be used as the default path.
+
+MAN_OUTPUT             = man
+
+# The MAN_EXTENSION tag determines the extension that is added to 
+# the generated man pages (default is the subroutine's section .3)
+
+MAN_EXTENSION          = .3
+
+# If the MAN_LINKS tag is set to YES and Doxygen generates man output, 
+# then it will generate one additional man file for each entity 
+# documented in the real man page(s). These additional files 
+# only source the real man page, but without them the man command 
+# would be unable to find the correct page. The default is NO.
+
+MAN_LINKS              = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES Doxygen will 
+# generate an XML file that captures the structure of 
+# the code including all documentation.
+
+GENERATE_XML           = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `xml' will be used as the default path.
+
+XML_OUTPUT             = xml
+
+# The XML_SCHEMA tag can be used to specify an XML schema, 
+# which can be used by a validating XML parser to check the 
+# syntax of the XML files.
+
+XML_SCHEMA             = 
+
+# The XML_DTD tag can be used to specify an XML DTD, 
+# which can be used by a validating XML parser to check the 
+# syntax of the XML files.
+
+XML_DTD                = 
+
+# If the XML_PROGRAMLISTING tag is set to YES Doxygen will 
+# dump the program listings (including syntax highlighting 
+# and cross-referencing information) to the XML output. Note that 
+# enabling this will significantly increase the size of the XML output.
+
+XML_PROGRAMLISTING     = YES
+
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will 
+# generate an AutoGen Definitions (see autogen.sf.net) file 
+# that captures the structure of the code including all 
+# documentation. Note that this feature is still experimental 
+# and incomplete at the moment.
+
+GENERATE_AUTOGEN_DEF   = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES Doxygen will 
+# generate a Perl module file that captures the structure of 
+# the code including all documentation. Note that this 
+# feature is still experimental and incomplete at the 
+# moment.
+
+GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES Doxygen will generate 
+# the necessary Makefile rules, Perl scripts and LaTeX code to be able 
+# to generate PDF and DVI output from the Perl module output.
+
+PERLMOD_LATEX          = YES
+
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be 
+# nicely formatted so it can be parsed by a human reader.  This is useful 
+# if you want to understand what is going on.  On the other hand, if this 
+# tag is set to NO the size of the Perl module output will be much smaller 
+# and Perl will parse it just the same.
+
+PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file 
+# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. 
+# This is useful so different doxyrules.make files included by the same 
+# Makefile don't overwrite each other's variables.
+
+PERLMOD_MAKEVAR_PREFIX = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor   
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will 
+# evaluate all C-preprocessor directives found in the sources and include 
+# files.
+
+ENABLE_PREPROCESSING   = YES
+
+# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro 
+# names in the source code. If set to NO (the default) only conditional 
+# compilation will be performed. Macro expansion can be done in a controlled 
+# way by setting EXPAND_ONLY_PREDEF to YES.
+
+MACRO_EXPANSION        = YES
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 
+# then the macro expansion is limited to the macros specified with the 
+# PREDEFINED and EXPAND_AS_DEFINED tags.
+
+EXPAND_ONLY_PREDEF     = YES
+
+# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files 
+# in the INCLUDE_PATH (see below) will be search if a #include is found.
+
+SEARCH_INCLUDES        = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that 
+# contain include files that are not input files but should be processed by 
+# the preprocessor.
+
+INCLUDE_PATH           = 
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard 
+# patterns (like *.h and *.hpp) to filter out the header-files in the 
+# directories. If left blank, the patterns specified with FILE_PATTERNS will 
+# be used.
+
+INCLUDE_FILE_PATTERNS  = 
+
+# The PREDEFINED tag can be used to specify one or more macro names that 
+# are defined before the preprocessor is started (similar to the -D option of 
+# gcc). The argument of the tag is a list of macros of the form: name 
+# or name=definition (no spaces). If the definition and the = are 
+# omitted =1 is assumed. To prevent a macro definition from being 
+# undefined via #undef or recursively expanded use the := operator 
+# instead of the = operator.
+
+PREDEFINED             = U_EXPORT2 \
+                         U_STABLE \
+                         U_DRAFT \
+                         U_INTERNAL \
+                         U_SYSTEM \
+                         U_DEPRECATED \
+                         U_OBSOLETE
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
+# this tag can be used to specify a list of macro names that should be expanded. 
+# The macro definition that is found in the sources will be used. 
+# Use the PREDEFINED tag if you want to use a different macro definition.
+
+EXPAND_AS_DEFINED      = 
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 
+# doxygen's preprocessor will remove all function-like macros that are alone 
+# on a line, have an all uppercase name, and do not end with a semicolon. Such 
+# function macros are typically used for boiler-plate code, and will confuse 
+# the parser if not removed.
+
+SKIP_FUNCTION_MACROS   = YES
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references   
+#---------------------------------------------------------------------------
+
+# The TAGFILES option can be used to specify one or more tagfiles. 
+# Optionally an initial location of the external documentation 
+# can be added for each tagfile. The format of a tag file without 
+# this location is as follows: 
+#   TAGFILES = file1 file2 ... 
+# Adding location for the tag files is done as follows: 
+#   TAGFILES = file1=loc1 "file2 = loc2" ... 
+# where "loc1" and "loc2" can be relative or absolute paths or 
+# URLs. If a location is present for each tag, the installdox tool 
+# does not have to be run to correct the links.
+# Note that each tag file must have a unique name
+# (where the name does NOT include the path)
+# If a tag file is not located in the directory in which doxygen 
+# is run, you must also specify the path to the tagfile here.
+
+TAGFILES               = 
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create 
+# a tag file that is based on the input files it reads.
+
+GENERATE_TAGFILE       = "@srcdir@/html/mangos-ng-docs.tag "
+
+# If the ALLEXTERNALS tag is set to YES all external classes will be listed 
+# in the class index. If set to NO only the inherited external classes 
+# will be listed.
+
+ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed 
+# in the modules index. If set to NO, only the current project's groups will 
+# be listed.
+
+EXTERNAL_GROUPS        = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script 
+# interpreter (i.e. the result of `which perl').
+
+PERL_PATH              = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool   
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will 
+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base 
+# or super classes. Setting the tag to NO turns the diagrams off. Note that 
+# this option is superseded by the HAVE_DOT option below. This is only a 
+# fallback. It is recommended to install and use dot, since it yields more 
+# powerful graphs.
+
+CLASS_DIAGRAMS         = YES
+
+# You can define message sequence charts within doxygen comments using the \msc 
+# command. Doxygen will then run the mscgen tool (see http://www.mcternan.me.uk/mscgen/) to 
+# produce the chart and insert it in the documentation. The MSCGEN_PATH tag allows you to 
+# specify the directory where the mscgen tool resides. If left empty the tool is assumed to 
+# be found in the default search path.
+
+MSCGEN_PATH            = 
+
+# If set to YES, the inheritance and collaboration graphs will hide 
+# inheritance and usage relations if the target is undocumented 
+# or is not a class.
+
+HIDE_UNDOC_RELATIONS   = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is 
+# available from the path. This tool is part of Graphviz, a graph visualization 
+# toolkit from AT&T and Lucent Bell Labs. The other options in this section 
+# have no effect if this option is set to NO (the default)
+
+HAVE_DOT               = NO
+
+# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for each documented class showing the direct and 
+# indirect inheritance relations. Setting this tag to YES will force the 
+# the CLASS_DIAGRAMS tag to NO.
+
+CLASS_GRAPH            = YES
+
+# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for each documented class showing the direct and 
+# indirect implementation dependencies (inheritance, containment, and 
+# class references variables) of the class with other documented classes.
+
+COLLABORATION_GRAPH    = YES
+
+# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for groups, showing the direct groups dependencies
+
+GROUP_GRAPHS           = YES
+
+# If the UML_LOOK tag is set to YES doxygen will generate inheritance and 
+# collaboration diagrams in a style similar to the OMG's Unified Modeling 
+# Language.
+
+UML_LOOK               = NO
+
+# If set to YES, the inheritance and collaboration graphs will show the 
+# relations between templates and their instances.
+
+TEMPLATE_RELATIONS     = NO
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT 
+# tags are set to YES then doxygen will generate a graph for each documented 
+# file showing the direct and indirect include dependencies of the file with 
+# other documented files.
+
+INCLUDE_GRAPH          = YES
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and 
+# HAVE_DOT tags are set to YES then doxygen will generate a graph for each 
+# documented header file showing the documented files that directly or 
+# indirectly include this file.
+
+INCLUDED_BY_GRAPH      = YES
+
+# If the CALL_GRAPH, SOURCE_BROWSER and HAVE_DOT tags are set to YES then doxygen will 
+# generate a call dependency graph for every global function or class method. 
+# Note that enabling this option will significantly increase the time of a run. 
+# So in most cases it will be better to enable call graphs for selected 
+# functions only using the \callgraph command.
+
+CALL_GRAPH             = NO
+
+# If the CALLER_GRAPH, SOURCE_BROWSER and HAVE_DOT tags are set to YES then doxygen will 
+# generate a caller dependency graph for every global function or class method. 
+# Note that enabling this option will significantly increase the time of a run. 
+# So in most cases it will be better to enable caller graphs for selected 
+# functions only using the \callergraph command.
+
+CALLER_GRAPH           = NO
+
+# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 
+# will graphical hierarchy of all classes instead of a textual one.
+
+GRAPHICAL_HIERARCHY    = YES
+
+# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES 
+# then doxygen will show the dependencies a directory has on other directories 
+# in a graphical way. The dependency relations are determined by the #include
+# relations between the files in the directories.
+
+DIRECTORY_GRAPH        = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images 
+# generated by dot. Possible values are png, jpg, or gif
+# If left blank png will be used.
+
+DOT_IMAGE_FORMAT       = png
+
+# The tag DOT_PATH can be used to specify the path where the dot tool can be 
+# found. If left blank, it is assumed the dot tool can be found in the path.
+
+DOT_PATH               = 
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that 
+# contain dot files that are included in the documentation (see the 
+# \dotfile command).
+
+DOTFILE_DIRS           = 
+
+# The MAX_DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of 
+# nodes that will be shown in the graph. If the number of nodes in a graph 
+# becomes larger than this value, doxygen will truncate the graph, which is 
+# visualized by representing a node as a red box. Note that doxygen if the number 
+# of direct children of the root node in a graph is already larger than 
+# MAX_DOT_GRAPH_NOTES then the graph will not be shown at all. Also note 
+# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+
+DOT_GRAPH_MAX_NODES    = 50
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the 
+# graphs generated by dot. A depth value of 3 means that only nodes reachable 
+# from the root by following a path via at most 3 edges will be shown. Nodes 
+# that lay further from the root node will be omitted. Note that setting this 
+# option to 1 or 2 may greatly reduce the computation time needed for large 
+# code bases. Also note that the size of a graph can be further restricted by 
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+
+MAX_DOT_GRAPH_DEPTH    = 0
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent 
+# background. This is disabled by default, which results in a white background. 
+# Warning: Depending on the platform used, enabling this option may lead to 
+# badly anti-aliased labels on the edges of a graph (i.e. they become hard to 
+# read).
+
+DOT_TRANSPARENT        = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output 
+# files in one run (i.e. multiple -o and -T options on the command line). This 
+# makes dot run faster, but since only newer versions of dot (>1.8.10) 
+# support this, this feature is disabled by default.
+
+DOT_MULTI_TARGETS      = NO
+
+# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will 
+# generate a legend page explaining the meaning of the various boxes and 
+# arrows in the dot generated graphs.
+
+GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will 
+# remove the intermediate dot files that are used to generate 
+# the various graphs.
+
+DOT_CLEANUP            = YES
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to the search engine   
+#---------------------------------------------------------------------------
+
+# The SEARCHENGINE tag specifies whether or not a search engine should be 
+# used. If set to NO the values of all tags below this one will be ignored.
+
+SEARCHENGINE           = YES
diff --git a/docs/EventAI.txt b/docs/EventAI.txt
new file mode 100644
index 00000000000..7d0294da05f
--- /dev/null
+++ b/docs/EventAI.txt
@@ -0,0 +1,868 @@
+=============================================
+EventAI documentation: (updated May 19, 2009)
+=============================================
+
+EventAI allows users to create new creature scripts entierly within the database.
+
+For the AI to be used, you must first make sure to set AIname for each creature that should use this AI.
+UPDATE creature_template SET AIName = 'EventAI' WHERE entry IN (...);
+
+
+=========================================
+Basic structure of EventAI
+=========================================
+
+EventAI follows a basic if (Event) then do (Action) format.
+Below is the list of current fields of the creature_ai_scripts table.
+
+(Field_Name)                (Description)
+id                          This value is merely an incrementing counter of the current Event number. Required for sql queries.
+creature_id                 Creature id which should trigger this event.
+
+event_type                  The type of event (see "Event types" below)
+event_inverse_phase_mask    Mask with phases this event should NOT trigger in*
+event_chance                Percentage chance of triggering the event (1 - 100)
+event_flags                 Event flags (repeatable, ... (see below))
+event_param1                Variables for the event (depends on event_type)
+event_param2
+event_param3
+event_param4
+
+action1_type                An action to take when the event occurs (see "Action types" below)
+action1_param1              Variables used by Action1 (depends on action_type)
+action1_param2
+action1_param3
+
+action2_type
+action2_param1
+action2_param2
+action2_param3
+
+action3_type
+action3_param1
+action3_param2
+action3_param3
+
+All params are signed 32-bit values (+/- 2147483647). Time values are always in milliseconds.
+In case of a percentage value, use value/100 (ie. param = 500 then that means 500%, -50 = -50%)
+
+[*] Phase mask is a bitmask of phases which shouldn't trigger this event. (ie. Phase mask of value 12 (binary 1100) results in triggering this event in phases 0, 1 and all others with exception for phases 2 and 3 (counting from 0).
+
+
+=========================================
+Event types
+=========================================
+
+A list of event types EventAI is able to handle.
+Each event type has its own specific interpretation of the params that accompany it.
+Params are always read in the ascending order (from Param1 to Param3).
+Events will not repeat until the creature exits combat or unless EFLAG_REPEATABLE is set.
+Some events such as EVENT_T_AGGRO, EVENT_T_DEATH, EVENT_T_SPAWNED, and EVENT_T_EVADE cannot repeat.
+
+#   Internal name                Param usage                                             Description
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+0    EVENT_T_TIMER               InitialMin, InitialMax, RepeatMin, RepeatMax            Expires at first between (Param1) and (Param2) and then between every (Param3) and (Param4),  but only in combat.
+1    EVENT_T_TIMER_OOC           InitialMin, InitialMax, RepeatMin, RepeatMax            Expires at first between (Param1) and (Param2) and then between every (Param3) and (Param4),  but only out of combat.
+2    EVENT_T_HP                  HPMax%, HPMin%, RepeatMin, RepeatMax                    Expires when HP is between (Param1) and (Param2). Will repeat every (Param3) and (Param4).
+3    EVENT_T_MANA                ManaMax%,ManaMin% RepeatMin, RepeatMax                  Expires once Mana% is between (Param1) and (Param2). Will repeat every (Param3) and (Param4).
+4    EVENT_T_AGGRO               NONE                                                    Expires upon initial aggro (does not repeat).
+5    EVENT_T_KILL                RepeatMin, RepeatMax                                    Expires upon killing a player. Will repeat between (Param1) and (Param2).
+6    EVENT_T_DEATH               NONE                                                    Expires upon creature death.
+7    EVENT_T_EVADE               NONE                                                    Expires upon creature EnterEvadeMode().
+8    EVENT_T_SPELLHIT            SpellID, Schoolmask, RepeatMin, RepeatMax               Expires upon a spell hit. When (param1) is set, it will be used as a trigger. With (param2) specified, the expiration is limited to specific spell schools (-1 for all). Will repeat every (Param3) and (Param4).
+9    EVENT_T_RANGE               MinDist, MaxDist, RepeatMin, RepeatMax                  Expires when the highest threat target distance is greater than (Param1) and less than (Param2). Will repeat every (Param3) and (Param4).
+10   EVENT_T_OOC_LOS             Hostile-or-Not, MaxAllowedRange, RepeatMin, RepeatMax   Expires when a unit moves within distance (MaxAllowedRange) of a creature. If (Param1) is zero it will expire only when unit is hostile, friendly otherwise (Param1 = 1), depends generally on faction. Will repeat every (Param3) and (Param4). Does not expire when the creature is in combat.
+11   EVENT_T_SPAWNED             NONE                                                    Expires on initial spawn and on creature respawn (useful for setting ranged movement type).
+12   EVENT_T_TARGET_HP           HPMax%, HPMin%, RepeatMin, RepeatMax                    Expires when current target's HP is between (Param1) and (Param2). Will repeat every (Param3) and (Param4).
+13   EVENT_T_TARGET_CASTING      RepeatMin, RepeatatMax                                  Expires when the current target is casting a spell. Will repeat every (Param1) and (Param2).
+14   EVENT_T_FRIENDLY_HP         HPDeficit, Radius, RepeatMin, RepeatMax                 Expires when a friendly unit in radius has at least (Param1) HP missing. Will repeat every (Param3) and (Param4).
+15   EVENT_T_FRIENDLY_IS_CC      DispelType, Radius, RepeatMin, RepeatMax                Expires when a friendly unit is crowd controlled within the given radius (Param2). Will repeat every (Param3) and (Param4).
+16   EVENT_T_MISSING_BUFF        SpellId, Radius, RepeatMin, RepeatMax                   Expires when a friendly unit is missing aura(s) given by a spell (Param1) within radius (Param2). Will repeat every (Param3) and (Param4).
+17   EVENT_T_SUMMONED_UNIT       CreatureId, RepeatMin, RepeatMax                        Expires after creature with entry = (Param1) is spawned (Param1 = 0 means all spawns). Will repeat every (Param2) and (Param3).
+18   EVENT_T_TARGET_MANA         ManaMax%, ManaMin%, RepeatMin, RepeatMax
+21   EVENT_T_REACHED_HOME        NONE                                                    Expires when a creature reach it's home(spawn) location after evade.
+22   EVENT_T_RECEIVE_EMOTE       EmoteId, Condition, CondValue1, CondValue2              Expires when a creature receives an emote with emote text id (enum TextEmotes) in (Param1). Conditions can be defined (Param2) with optional values (Param3,Param4), see enum ConditionType.
+23   EVENT_T_BUFFED              SpellID, AmmountInStack, RepeatMin, RepeatMax           Expires when a creature has spell (Param1) auras applied in a stack greater or equal to value provided in (Param2). Will repeat every (Param3) and (Param4).
+24   EVENT_T_TARGET_BUFFED       SpellID, AmmountInStack, RepeatMin, RepeatMax           Expires when a target unit has spell (Param1) auras applied in a stack greater or equal to value provided in (Param2). Will repeat every (Param3) and (Param4).
+35   EVENT_T_RESET               NONE                                                    Expires when creature leaves combat, spawns or respawns.
+
+=========================================
+Action Types
+=========================================
+
+A list of action types that EventAI can handle.
+Each event type has its own specific interpretation of it's params, like every event type.
+
+#    Internal name                     Param usage                     Description
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+0    ACTION_T_NONE                     No Action                       Does nothing.
+1    ACTION_T_TEXT                     -TextId1, -TextId2, -TextId3    Simply displays the specified -TextId. When -TextId2 and -TextId3 are specified, the selection will be randomized. Text types are defined, along with other options for the text, in a table below. All values needs to be negative.
+2    ACTION_T_SET_FACTION              FactionId                       Changes faction for a creature. When param1 is zero, creature will revert to it's default faction.
+3    ACTION_T_MORPH_TO_ENTRY_OR_MODEL  CreatureEntry, ModelId          Set either model from creature_template.entry (Param1) OR explicit modelId (Param2). If (Param1) AND (Param2) are both 0, demorph and revert to the default model.
+4    ACTION_T_SOUND                    SoundId                         Plays a sound
+5    ACTION_T_EMOTE                    EmoteId                         Does an emote
+6    ACTION_T_RANDOM_SAY                                               UNUSED
+7    ACTION_T_RANDOM_YELL                                              UNUSED
+8    ACTION_T_RANDOM_TEXTEMOTE                                         UNUSED
+9    ACTION_T_RANDOM_SOUND             SoundId1, SoundId2, SoundId3    Plays a random sound *
+10   ACTION_T_RANDOM_EMOTE             EmoteId1, EmoteId2, EmoteId3    Emotes a random emote
+11   ACTION_T_CAST                     SpellId, Target, CastFlags      Casts spell (Param1) on a target (Param2) using cast flags (specified below).
+12   ACTION_T_SUMMON                   CreatureID, Target, Duration    Summons a creature (Param1) for (Param3) duration and orders it to attach (Param2) target. Spawns on top of current creature.
+13   ACTION_T_THREAT_SINGLE_PCT        Threat%, Target                 Modifies a threat by (Param1) percent on a target (Param2).
+14   ACTION_T_THREAT_ALL_PCT           Threat%                         Modifies a threat by (Param1) on all targets in the threat list (using -100% here will result in full aggro dump).
+15   ACTION_T_QUEST_EVENT              QuestID, Target                 Calls AreaExploredOrEventHappens with (Param1) for a target in (Param2).
+16   ACTION_T_QUEST_CASTCREATUREGO     CreatureID, SpellId, Target     Sends CastCreatureOrGo for a creature specified by CreatureId (Param1) with provided spell id (Param2) for a target in (Param3).
+17   ACTION_T_SET_UNIT_FIELD           Field_Number, Value, Target     Sets a unit field (Param1) to provided value (Param2) on a target in (Param3).
+18   ACTION_T_SET_UNIT_FLAG            Flags, Target                   Sets flag (flags can be used together to modify multiple flags at once) on a target (Param2).
+19   ACTION_T_REMOVE_UNIT_FLAG         Flags, Target                   Removes flag on a target (Param2).
+20   ACTION_T_AUTO_ATTACK              AllowAutoAttack                 Stop melee attack when (Param1) is zero, otherwise continue attacking / allow melee attack.
+21   ACTION_T_COMBAT_MOVEMENT          AllowCombatMovement             Stop combat based movement when (Param1) is zero, otherwise continue/allow combat based movement (targeted movement generator).
+22   ACTION_T_SET_PHASE                Phase                           Sets the current phase to (Param1).
+23   ACTION_T_INC_PHASE                Value                           Increments the phase by (Param1). May be negative to decrement, but should not be zero.
+24   ACTION_T_EVADE                    No Params                       Forces the creature to evade, wiping all threat and dropping combat.
+25   ACTION_T_FLEE_FOR_ASSIST          No Params                       Causes the creature to flee for assistence (often at low health).
+26   ACTION_T_QUEST_EVENT_ALL          QuestId                         Calls GroupEventHappens with (Param1). Only used if it's _expected_ event should call quest completion for all players in a current party.
+27   ACTION_T_CASTCREATUREGO_ALL       QuestId, SpellId                Calls CastedCreatureOrGo for all players on the threat list with quest id specified in (Param1) and spell id in (Param2).
+28   ACTION_T_REMOVEAURASFROMSPELL     Target, Spellid                 Removes all auras on a target (Param1) caused by a spell (Param2).
+29   ACTION_T_RANGED_MOVEMENT          Distance, Angle                 Changes the movement generator to a ranged type. (note: default melee type can still be set by using 0 as angle and 0 as distance).
+30   ACTION_T_RANDOM_PHASE             PhaseId1, PhaseId2, PhaseId3    Sets a phase to a specified id(s)*
+31   ACTION_T_RANDOM_PHASE_RANGE       PhaseMin, PhaseMax              Sets a phase to a random id (Phase = PhaseMin + rnd % PhaseMin-PhaseMax). PhaseMax must be greater than PhaseMin.
+32   ACTION_T_SUMMON                   CreatureID, Target, SummonID    Summons a creature (Param1) to attack target (Param2) at location specified by EventAI_Summons (Param3).
+33   ACTION_T_KILLED_MONSTER           CreatureID, Target              Calls KilledMonster (Param1) for a target (Param2).
+34   ACTION_T_SET_INST_DATA            Field, Data                     Calls ScriptedInstance::SetData with field (Param1) and data (Param2).
+35   ACTION_T_SET_INST_DATA64          Field, Target                   Calls ScriptedInstance::SetData64 with field (Param1) and target's GUID (Param2).
+36   ACTION_T_UPDATE_TEMPLATE          TemplateId, Team                Changes a creature's template to (Param1) with team = Alliance or Horde when (Param2) is either false or true respectively.
+37   ACTION_T_DIE                      No Params                       Kills the creature
+38   ACTION_T_ZONE_COMBAT_PULSE        No Params                       Puts all players within an instance into combat with the creature. Only works when a creature is already in combat. Doesn't work outside instances.
+39   ACTION_T_CALL_FOR_HELP            Radius                          Call any friendly out-of-combat creatures in a radius (Param1) to attack current creature's target.
+40   ACTION_T_SET_SHEATH               Sheath                          Sets sheath state for a creature (0 = no weapon, 1 = melee weapon, 2 = ranged weapon).
+41   ACTION_T_FORCE_DESPAWN            No Params                       Despawns the creature
+42   ACTION_T_SET_INVINCIBILITY_HP_LEVEL hp_level, is_percent          Set min. health level for creature that can be set at damage as flat value or percent from max health
+
+* = Use -1 where the param is expected to do nothing. Random constant is generated for each event, so if you have a random yell and a random sound, they will be linked up with each other (ie. param2 with param2).
+
+
+=========================================
+Event Types
+=========================================
+Note:
+COMBAT ONLY - Means that this event will only trigger durring combat.
+OUT OF COMBAT ONLY - Means that this event will only trigger while out of combat.
+BOTH - This event can trigger both in and out of combat.
+
+Events that do not have lables on them are events that are directly involved with the in and out of combat state.
+
+------------------
+0 = EVENT_T_TIMER:
+------------------
+Parameter 1: InitialMin - Minumum Time used to calculate Random Initial Expire
+Parameter 2: InitialMax - Maximum Time used to calculate Random Initial Expire
+Parameter 3: RepeatMin - Minimum Time used to calculate Random Repeat Expire
+Parameter 4: RepeatMax - Maximum Time used to calculate Random Repeat Expire
+
+COMBAT ONLY! - Expires first between (Param1) and (Param2) and then between every (Param3) and (Param4) from then on.
+This is commonly used for spells that repeat cast during combat (Simulate Spell Cooldown).
+
+----------------------
+1 = EVENT_T_TIMER_OOC:
+----------------------
+Parameter 1: InitialMin - Minumum Time used to calculate Random Initial Expire
+Parameter 2: InitialMax - Maximum Time used to calculate Random Initial Expire
+Parameter 3: RepeatMin - Minimum Time used to calculate Random Repeat Expire
+Parameter 4: RepeatMax - Maximum Time used to calculate Random Repeat Expire
+
+OUT OF COMBAT ONLY! - Expires first between (Param1) and (Param2) and then between every (Param3) and (Param4) from then on.
+This is commonly used for events that occur and repeat outside of combat.
+
+---------------
+2 = EVENT_T_HP:
+---------------
+Parameter 1: HPMax% - Maximum HP% That this Event will Expire
+Parameter 2: HPMin% - Minimum HP% That this Event will Expire
+Parameter 3: RepeatMin - Minimum Time used to calculate Random Repeat Expire
+Parameter 4: RepeatMax - Maximum Time used to calculate Random Repeat Expire
+
+BOTH - Expires when HP is between (Param1) and (Param2). Will repeat every (Param3) and (Param4).
+This is commonly used for events that trigger at a specific HP% (Such as Heal/Enrage Spells or NPC's that Flee).
+
+-----------------
+3 = EVENT_T_MANA:
+-----------------
+Parameter 1: ManaMax% - Maximum Mana% That this Event will Expire
+Parameter 2: ManaMin% - Minimum Mana% That this Event will Expire
+Parameter 3: RepeatMin - Minimum Time used to calculate Random Repeat Expire
+Parameter 4: RepeatMax - Maximum Time used to calculate Random Repeat Expire
+
+BOTH - Expires once Mana% is between (Param1) and (Param2). Will repeat every (Param3) and (Param4).
+This is commonly used for events where an NPC low on Mana will do something (Such as stop casting spells and switch to melee).
+
+------------------
+4 = EVENT_T_AGGRO:
+------------------
+This Event Expires upon initial aggro (does not repeat).
+
+-----------------
+5 = EVENT_T_KILL:
+-----------------
+Parameter 1: RepeatMin - Minimum Time used to calculate Random Repeat Expire
+Parameter 2: RepeatMax - Maximum Time used to calculate Random Repeat Expire
+
+COMBAT ONLY! - Expires upon killing a player. Will repeat every (Param1) and (Param2).
+This Event Expires upon killing a player. It is commonly used for NPC's who yell or do something after killing a player.
+
+------------------
+6 = EVENT_T_DEATH:
+------------------
+This Event Expires upon Death of the Scripted NPC.
+This is commonly used for NPC's who have a yell on death or cast some kind if summon spell when they die.
+
+------------------
+7 = EVENT_T_EVADE:
+------------------
+This Event Expires upon the creature EnterEvadeMode().
+This is commonly used for NPC's who use phases, allows you to reset their phase to 0 upon evade to prevent possible strange behavior.
+
+---------------------
+8 = EVENT_T_SPELLHIT:
+---------------------
+Parameter 1: SpellID - The Spell ID that will trigger the event to occur (NOTE: If you use Spell School as the trigger set this value to 0)
+Parameter 2: School - Spell School to trigger the event (NOTE: If you use a SpellID then set this value to -1) - *See Below for Spell School Bitmask Values*
+Parameter 3: RepeatMin - Minimum Time used to calculate Random Repeat Expire
+Parameter 4: RepeatMax - Maximum Time used to calculate Random Repeat Expire
+
+BOTH - Expires upon Spell hit. If (param1) is set will only expire on that spell OR If (param2) is set it will only expire on spells of that school. Will repeat every (Param3) and (Param4).
+This Event is commonly used for NPC's who can do special things when you cast a spell (Or specific spell) on them.
+
+(name, school, schoolmask)
+SPELL_SCHOOL_NORMAL = 0, ==> 1
+SPELL_SCHOOL_HOLY   = 1, ==> 2
+SPELL_SCHOOL_FIRE   = 2, ==> 4
+SPELL_SCHOOL_NATURE = 3, ==> 8
+SPELL_SCHOOL_FROST  = 4, ==> 16
+SPELL_SCHOOL_SHADOW = 5, ==> 32
+SPELL_SCHOOL_ARCANE = 6, ==> 64
+Use These Values For Schoolmask (Param2) or Any Combinations Of These Schoolmasks for Multiple Schools.
+
+------------------
+9 = EVENT_T_RANGE:
+------------------
+Parameter 1: MinDist - This Distance is the Minimum Distance between the NPC and it's target to allow this Event to Expire
+Parameter 2: MaxDist - This Distance is the Maximum Distance between the NPC and it's target to allow this Event to Expire
+Parameter 3: RepeatMin - Minimum Time used to calculate Random Repeat Expire
+Parameter 4: RepeatMax - Maximum Time used to calculate Random Repeat Expire
+
+COMBAT ONLY! - Expires when the highest threat target distance is greater than (Param1) and less than (Param2). Will repeat every (Param3) and (Param4).
+This Event is commonly used for NPC's who have Ranged Combat and will Throw/Shoot between a certian distance.
+
+---------------------
+10 = EVENT_T_OOC_LOS:
+---------------------
+Parameter 1: Hostile-or-Not   - This will expire if Unit are hostile. If Param1=1 it will only expire if Unit are not Hostile(generally determined by faction)
+Parameter 2: MaxAllowedRange  - Expires when a Unit moves within this distance to creature
+Parameter 3: RepeatMin        - Minimum Time used to calculate Random Repeat Expire
+Parameter 4: RepeatMax        - Maximum Time used to calculate Random Repeat Expire
+
+OUT OF COMBAT!
+This Event is commonly used for NPC's who do something or say something to you when you walk past them Out of Combat.
+
+---------------------
+11 = EVENT_T_SPAWNED:
+---------------------
+Expires at initial spawn and at creature respawn.
+This Event is commonly used for setting ranged movement type or Summoning a Pet on Spawn
+Parameter 1: 0: works always, 1: works on map in Parameter 2, 2: works on zone/subzone in Parameter 2
+Parameter 2: depends on Parameter 1: for 1 it is map ID, for 2 it is area ID to check
+
+-----------------------
+12 = EVENT_T_TARGET_HP:
+-----------------------
+Parameter 1: HPMax% - Maximum HP% That this Event will Expire
+Parameter 2: HPMin% - Minimum HP% That this Event will Expire
+Parameter 3: RepeatMin - Minimum Time used to calculate Random Repeat Expire
+Parameter 4: RepeatMax - Maximum Time used to calculate Random Repeat Expire
+
+COMBAT ONLY! - Expires when Current NPC's Target's HP is between (Param1) and (Param2). Will repeat every (Param3) and (Param4).
+This Event is commonly used for NPC's who have a special ability (Like Execute) that only casts when a Player HP is low.
+
+----------------------------
+13 = EVENT_T_TARGET_CASTING:
+----------------------------
+Parameter 1: RepeatMin - Minimum Time used to calculate Random Repeat Expire
+Parameter 2: RepeatMax - Maximum Time used to calculate Random Repeat Expire
+
+COMBAT ONLY! - Expires when the current target is casting a spell. Will repeat every (Param1) and (Param2).
+This event is commonly used for NPC's who will cast a counter spell when their target starts to cast a spell.
+
+-------------------------
+14 = EVENT_T_FRIENDLY_HP:
+-------------------------
+Parameter 1: HPDeficit - This is the Amount of HP Missing from Full HP to trigger this event (You would need to calculate the amount of HP the event happens and subtract that from Full HP Value to get this number)
+Parameter 2: Radius - This is the Range in Yards the NPC will scan for nearby Friendlies (Faction is Friendly To) for the missing amount of HP in Param1.
+Parameter 3: RepeatMin - Minimum Time used to calculate Random Repeat Expire
+Parameter 4: RepeatMax - Maximum Time used to calculate Random Repeat Expire
+
+COMBAT ONLY! - Expires when a friendly unit in radius(param2) has at least (param1) hp missing. Will repeat every (Param3) and (Param4).
+This is commonly used when an NPC in Combat will heal a nearby Friendly NPC in Combat with a Heal/Renew Spell.
+
+----------------------------
+15 = EVENT_T_FRIENDLY_IS_CC:
+----------------------------
+Parameter 1: DispelType - Dispel Type to trigger the event - *See Below for Dispel Bitmask Values*
+Parameter 2: Radius - This is the Range in Yards the NPC will scan for nearby Friendlies being Crowd Controlled
+Parameter 3: RepeatMin - Minimum Time used to calculate Random Repeat Expire
+Parameter 4: RepeatMax - Maximum Time used to calculate Random Repeat Expire
+
+COMBAT ONLY! - Expires when a friendly unit is Crowd controlled within the given radius (param2). Will repeat every (Param3) and (Param4).
+This is commonly used for NPC's who can come to the resule of other Friendly NPC's if being Crowd Controlled
+
+--------------------------
+16 = EVENT_T_MISSING_BUFF:
+--------------------------
+Parameter 1: SpellId - This is the SpellID That the Aura Check will look for (If it is missing this Aura)
+Parameter 2: Radius - This is the Range in Yards the NPC will scan for nearby Friendlies (Faction is Friendly To) for the missing Aura.
+Parameter 3: RepeatMin - Minimum Time used to calculate Random Repeat Expire
+Parameter 4: RepeatMax - Maximum Time used to calculate Random Repeat Expire
+
+BOTH - Expires when a friendly unit is missing aura's given by spell (param1) within radius (param2). Will repeat every (Param3) and (Param4).
+This is commonly used for NPC's who watch friendly units for a debuff to end so they can recast it on them again.
+
+---------------------------
+17 = EVENT_T_SUMMONED_UNIT:
+---------------------------
+Parameter 1: CreatureId - The CreatureID that the NPC is watching to spawn to trigger this event
+Parameter 2: RepeatMin - Minimum Time used to calculate Random Repeat Expire
+Parameter 3: RepeatMax - Maximum Time used to calculate Random Repeat Expire
+
+BOTH - Expires after creature with entry(Param1) is spawned or for all spawns if param1 = 0. Will repeat every (Param2) and (Param3) .
+This is commonly used for NPC's who will do something special once another NPC is summoned. Usually used is Complex Scripts or Special Events.
+
+---------------------------
+21 = EVENT_T_REACHED_HOME:
+---------------------------
+Expires only when creature has returned to it's home location after Evade. Out of combat event.
+Most commonly used to cast spells that can not be casted in EVENT_T_EVADE and other effects that does not fit in while still running back to spawn/home location.
+
+---------------------------
+22 = EVENT_T_RECEIVE_EMOTE:
+---------------------------
+Expires only when creature receive emote from player. Valid text emote id's are in Mangos source (enum TextEmotes)
+Event does not require any conditions to process, however many are ecpected to have condition.
+
+---------------------------
+23 = EVENT_T_BUFFED       :
+---------------------------
+Parameter 1: SpellId - This is the SpellID That the Aura Check will look for
+Parameter 2: Amount -  This is the amount of SpellID's auras at creature required for event expire.
+Parameter 3: RepeatMin - Minimum Time used to calculate Random Repeat Expire
+Parameter 4: RepeatMax - Maximum Time used to calculate Random Repeat Expire
+
+---------------------------
+24 = EVENT_T_TARGET_BUFFED:
+---------------------------
+Parameter 1: SpellId - This is the SpellID That the Aura Check will look for
+Parameter 2: Amount -  This is the amount of SpellID's auras at target unit required for event expire.
+Parameter 3: RepeatMin - Minimum Time used to calculate Random Repeat Expire
+Parameter 4: RepeatMax - Maximum Time used to calculate Random Repeat Expire
+
+EventAI use conditions from available in Mangos (enum ConditionType)
+Current implemented conditions:
+CONDITION_NONE (0)            0            0
+CONDITION_AURA (1)            spell_id     effindex
+CONDITION_ITEM (2)            item_id      count
+CONDITION_ITEM_EQUIPPED (3)   item_id      count
+CONDITION_ZONEID (4)          zone_id      0
+CONDITION_REPUTATION_RANK (5) faction_id   min_rank
+CONDITION_TEAM (6)            player_team  0 (469-Alliance / 67-Horde)
+CONDITION_SKILL (7)           skill_id     min_skill_value
+CONDITION_QUESTREWARDED (8)   quest_id     0, if quest are rewarded
+CONDITION_QUESTTAKEN (9)      quest_id     0, while quest active(incomplete)
+CONDITION_ACTIVE_EVENT (12)   event_id     0, note this is id from dbc, also defined in Mangos source(enum HolidayIds) NOT id of game_event in database
+
+=========================================
+Action Types
+=========================================
+
+-----------------
+1 = ACTION_T_TEXT:
+-----------------
+Parameter 1: The entry of the text that the NPC should use from eventai_texts table. Optionally a entry from other tables can be used (such as custom_texts).
+             Entry are required to be negative and exist in a *_texts-table. The type text to be displayed are defined in the texts-table itself (Say, Yell, Whisper, Emote Text, Boss Whisper, Boss Emote)
+             Other options are also to be defined in the texts-table, such as a sound to be heard with the text and the language used in output (common, dwarvish, etc).
+             In case this entry has a localized version of the text, the localized text will be displayed in client that support this locale.
+
+Parameter 2: Optional. TextId can be defined in addition. The same apply to this as explained above, however eventAI will randomize between the two.
+Parameter 3: Optional, if Parameter 2 exist. In this case, eventAI will randomize between three.
+
+Read at bottom for documentation of creature_ai_texts-table.
+
+------------------
+2 = ACTION_T_SET_FACTION:
+------------------
+Parameter 1: FactionId from Faction.dbc OR 0. Changes faction for creature. If 0, creature will revert to it's default faction if previously changed.
+
+-----------------------
+3 = ACTION_T_MORPH_TO_ENTRY_OR_MODEL:
+-----------------------
+Parameter 1: Creature entry from creature_template. Action will then change to the model this creature are using.
+Parameter 2: If parameter 1 is 0, then this modelId will be used (in case parameter 1 exist, parameter 2 will not be used)
+
+If both parameter 1 and 2 is 0, the creature will DeMorph, and use it's default model.
+
+-------------------
+4 = ACTION_T_SOUND:
+-------------------
+Parameter 1: The Sound ID to be played. (Sound IDs are contained in the DBC files.)
+
+The creature will play the specified sound.
+This is commonly used for Bosses who Yell and then also have a Voice for the same thing.
+
+-------------------
+5 = ACTION_T_EMOTE:
+-------------------
+Parameter 1: The Emote ID that the creature should perform. (Emote IDs are also contained in the DBC but they can be found in the mangos source as well).
+
+The creature will perform a visual emote. Unlike a text emote, a visual emote is one where the creature will actually move or perform a gesture.
+This is commonly used for NPC's who may perform a special action (Salute, Roar, ect...). Not all player emotes work for creature models.
+
+------------------------
+6 = ACTION_T_RANDOM_SAY:
+------------------------
+UNUSED       Can be reused to create new action type
+
+-------------------------
+7 = ACTION_T_RANDOM_YELL:
+-------------------------
+UNUSED       Can be reused to create new action type
+
+------------------------------
+8 = ACTION_T_RANDOM_TEXTEMOTE:
+------------------------------
+UNUSED       Can be reused to create new action type
+
+--------------------------
+9 = ACTION_T_RANDOM_SOUND:
+--------------------------
+Parameter 1: The Sound ID to be played as Random Choice #1.
+Parameter 2: The Sound ID to be played as Random Choice #2.
+Parameter 3: The Sound ID to be played as Random Choice #3.
+
+Similar to the ACTION_T_SOUND action, it will choose at random a sound to play.
+
+---------------------------
+10 = ACTION_T_RANDOM_EMOTE:
+---------------------------
+Parameter 1: The Emote ID to be played as Random Choice #1.
+Parameter 2: The Emote ID to be played as Random Choice #2.
+Parameter 3: The Emote ID to be played as Random Choice #3.
+
+Similar to the ACTION_T_EMOTE action, it will choose at random an Emote to Visually Perform.
+
+-------------------
+11 = ACTION_T_CAST:
+-------------------
+Parameter 1: SpellId - The Spell ID to use for the NPC to cast. The value used in this field needs to be a valid Spell ID.
+Parameter 2: Target - The Target Type defining who the creature should cast the spell at. The value in this field needs to be a valid Target Type as specified in the reference tables below.
+Parameter 3: CastFlags - See Table Below for Cast Flag Bitmask Values. If you are unsure what to set this value at leave it at 0.
+
+The creature will cast a spell specified by a spell ID on a target specified by the target type.
+This is commonly used for NPC's who cast spells.
+
+---------------------
+12 = ACTION_T_SUMMON:
+---------------------
+Parameter 1: CreatureID - The Creature Template ID to be Summoned. The value here needs to be a valid Creature Template ID.
+Parameter 2: Target - The Target Type defining who the Summoned creature will attack once spawned. The value in this field needs to be a valid Target Type as specified in the reference tables below.
+Parameter 3: Duration - The duration until the summoned creature should be unsummoned AFTER Combat ends. The value in this field is in milliseconds or 0.
+
+The NPC will Summon another creature at the same spot as itself that will attack the specified target.
+NOTE: Almost all Creature Summons have proper Summon Spells that should be used when possible. This Action is a powerful last resort option only to be used if nothing else works.
+NOTE: Using Target Type 0 will cause the Summoned creature to not attack anyone.
+NOTE: If Duration is set at 0, then the summoned creature will not despawn until it has died.
+This is used as a manual way to force an NPC to Summon.
+--------------------------------
+13 = ACTION_T_THREAT_SINGLE_PCT:
+--------------------------------
+Parameter 1: Threat% - Threat percent that should be modified. The value in this field can range from -100 to +100. If it is negative, threat will be taken away and if positive, threat will be added.
+Parameter 2: Target - The Target Type defining on whom the threat change should occur. The value in this field needs to be a valid target type as specified in the reference tables below.
+
+This action will modify the threat of a target in the creature's threat list by the specified percent.
+This is commonly used to allow an NPC to adjust the Threat to a single player.
+
+-----------------------------
+14 = ACTION_T_THREAT_ALL_PCT:
+-----------------------------
+Parameter 1: Threat% - The percent that should be used in modifying everyone's threat in the creature's threat list. The value here can range from -100 to +100.
+
+This action will modify the threat for everyone in the creature's threat list by the specified percent.
+NOTE: Using -100 will cause the creature to reset everyone's threat to 0 so that everyone has the same amount of threat. It will NOT remove anyone from the threat list.
+This is commonly used to allow an NPC to drop threat for all players to zero.
+
+--------------------------
+15 = ACTION_T_QUEST_EVENT:
+--------------------------
+Parameter 1: QuestID - The Quest Template ID. The value here must be a valid quest template ID. Furthermore, the quest should have SpecialFlags | 2 as it would need to be completed by an external event which is the activation of this action.
+Parameter 2: Target - The Target Type defining whom the quest should be completed for. The value in this field needs to be a valid target type as specified in the reference tables below.
+
+This action will satisfy the external completion requirement for the quest for the specified target defined by the target type.
+NOTE: This action can only be used with player targets so it must be ensured that the target type will point to a player.
+This is commonly used for Quests where only ONE player will gain credit for the quest.
+
+-----------------------------
+16 = ACTION_T_CASTCREATUREGO:
+-----------------------------
+Parameter 1: CreatureID - The Creature Template ID to be Summoned. The value here needs to be a valid Creature Template ID.
+Parameter 2: SpellId - The Spell ID to use to simulate the cast. The value used in this field needs to be a valid Spell ID.
+Parameter 3: Target - The Target Type defining whom the quest credit should be given to. The value in this field needs to be a valid target type as specified in the reference tables below.
+
+This action will call CastedCreatureOrGO() function for the player. It can be used to give quest credit for casting a spell on the creature.
+This is commonly used for NPC's who have a special requirement to have a Spell cast on them to complete a quest.
+
+-----------------------------
+17 = ACTION_T_SET_UNIT_FIELD:
+-----------------------------
+Parameter 1: Field_Number - The index of the Field Number to be changed. Use (http://wiki.udbforums.org/index.php/Character_data) for a list of indeces and what they control. Creatures only contain the OBJECT_FIELD_* and UNIT_FIELD_* fields. They do not contain the PLAYER_FIELD_* fields.
+Parameter 2: Value - The new value to be put in the field.
+Parameter 3: Target - The Target Type defining for whom the unit field should be changed. The value in this field needs to be a valid target type as specified in the reference tables below.
+
+When activated, this action can change the target's unit field values. More information on the field value indeces can be found at (http://wiki.udbforums.org/index.php/Character_data)
+
+----------------------------
+18 = ACTION_T_SET_UNIT_FLAG:
+----------------------------
+Parameter 1: Flags - The flag(s) to be set. Multiple flags can be set by using bitwise-OR on them (adding them together).
+Parameter 2: Target - The Target Type defining for whom the flags should be changed. The value in this field needs to be a valid Target Type as specified in the reference tables below.
+
+When activated, this action changes the target's flags by adding (turning on) more flags. For example, this action can make the creature unattackable/unselectable if the right flags are used.
+
+-------------------------------
+19 = ACTION_T_REMOVE_UNIT_FLAG:
+-------------------------------
+Parameter 1: Flags - The flag(s) to be removed. Multiple flags can be set by using bitwise-OR on them (adding them together).
+Parameter 2: Target - The target type defining for whom the flags should be changed. The value in this field needs to be a valid Target Type as specified in the reference tables below.
+
+When activated, this action changes the target's flags by removing (turning off) flags. For example, this action can make the creature normal after it was unattackable/unselectable if the right flags are used.
+
+--------------------------
+20 = ACTION_T_AUTO_ATTACK:
+--------------------------
+Parameter 1: AllowAutoAttack - If zero, then the creature will stop its melee attacks. If non-zero, then the creature will either continue its melee attacks (the action would then have no effect) or it will start its melee attacks on the target with the top threat if its melee attacks were previously stopped.
+
+This action controls whether or not the creature should stop or start the auto melee attack.
+NOTE: The ACID Dev Team has conformed to using either 0 or 1 for the Param values (0 = Stop Melee, 1 = Start Melee).
+This is commonly used in combination with EVENT_T_RANGE and ACTION_T_COMBAT_MOVEMENT for Ranged Combat for Mages and Spell Casters.
+
+------------------------------
+21 = ACTION_T_COMBAT_MOVEMENT:
+------------------------------
+Parameter 1: If zero, then the creature will stop moving towards its victim (if its victim gets out of melee range) and will be stationary. If non-zero, then the creature will either continue to follow its victim (the action would have no effect) or it will start to follow the target with the top threat if its movement was disabled before.
+Parameter 2: If non-zero, then stop melee combat state (if param1=0) or start melee combat state (if param1!=0) and creature in combat with selected target.
+
+This action controls whether or not the creature will always move towards its target.
+NOTE: The ACID Dev Team has conformed to using either 0 or 1 for the Param values. (0 = Stop Movement, 1 = Start Movement)
+This is commonly used with EVENT_T_RANGE and ACTION_T_AUTO_ATTACK for NPC's who engage in Ranged Comabt (Either Spells or Ranged Attacks)
+Parameter 2 specialy used for ranged combat proper client side visual show ranged weapon in proper state.
+
+------------------------
+22 = ACTION_T_SET_PHASE:
+------------------------
+Parameter 1: The new phase to set the creature in. This number must be an integer between 0 and 31. Numbers outside of that range will result in an error.
+
+When activated, this action sets the creature's event to the specified value.
+NOTE: The creature's current Phase is NOT reset at creature evade. You must manually set the phase back to 0 at EVENT_T_RESET.
+NOTE: The value used for the Param is the actual Phase Number (Not The Event_Inverse_Phase_Mask)
+This is commonly used for complex scripts with several phases and you need to switch to a different phase.
+
+------------------------
+23 = ACTION_T_INC_PHASE:
+------------------------
+Parameter 1: Value - The number of phases to increase or decrease. Use negative values to decrease the current phase.
+
+When activated, this action will increase (or decrease) the current creature's phase.
+NOTE: After increasing or decreasing the phase by this action, the current phase must NOT be lower than 0 or exceed 31.
+This can be used instead of ACTION_T_SET_PHASE to change phases in scripts. Just a user friendly option for changing phases.
+
+--------------------
+24 = ACTION_T_EVADE:
+--------------------
+When activated, the creature will immediately exit out of combat, clear its threat list, and move back to its spawn point. Basically, this action will reset the whole encounter.
+NOTE: All Param Values Are 0 for this Action.
+
+-------------------
+25 = ACTION_T_FLEE:
+-------------------
+When activated, the creature will try to flee from combat. Currently this is done by it casting a fear-like spell on itself called "Run Away".
+A Better Flee system is in Development.
+NOTE: All Param Values Are 0 for this Action.
+
+------------------------------
+26 = ACTION_T_QUEST_EVENT_ALL:
+------------------------------
+Parameter 1: QuestId - The quest ID to finish for everyone.
+
+This action does the same thing as the ACTION_T_QUEST_EVENT does but it does it for all players in the creature's threat list.
+NOTE: If a player is not in the NPC's threat list for whatever reason, he/she won't get the quest completed.
+
+---------------------------------
+27 = ACTION_T_CASTCREATUREGO_ALL:
+---------------------------------
+Parameter 1: QuestId - The quest template ID.
+Parameter 2: SpellId - The spell ID used to simulate the cast.
+
+This action does the same thing as the ACTION_T_CASTCREATUREGO does but it does it for all players in the creature's threat list.
+NOTE: If a player is not in its threat list for whatever reason, he/she won't receive the cast emulation.
+
+-----------------------------------
+28 = ACTION_T_REMOVEAURASFROMSPELL:
+-----------------------------------
+Parameter 1: Target - The target type defining for whom the unit field should be changed. The value in this field needs to be a valid target type as specified in the reference tables below.
+Parameter 2: SpellId - The spell ID whose auras will be removed.
+
+This action will remove all auras from a specific spell from the target.
+This is commonly used for NPC's who have an OOC Aura that is removed at combat start or a similar idea (Like Stealth or Shape Shift)
+
+------------------------------
+29 = ACTION_T_RANGED_MOVEMENT:
+------------------------------
+Parameter 1: Distance - The distance the mob should keep between it and its target.
+Parameter 2: Angle - The angle the mob should use.
+
+This action changes the movement type generator to ranged type using the specified values for angle and distance.
+NOTE: Specifying zero angle and distance will make it just melee instead.
+This is commonly used for NPC's who always attack at range and you can specify the distance they will maintain from the target.
+
+---------------------------
+30 = ACTION_T_RANDOM_PHASE:
+---------------------------
+Parameter 1: PhaseId1 - A possible random phase choice.
+Parameter 2: PhaseId2 - A possible random phase choice.
+Parameter 3: PhaseId3 - A possible random phase choice.
+
+Randomly sets the phase to one from the three parameter choices.
+NOTE: Use -1 to specify that if this param is picked to do nothing. Random is constant between actions within an event. So if you have a random Yell and a random Sound they will match up (ex: param2 with param2)
+NOTE 2: PLEASE NOTE THAT EACH OF THE PARAM VALUES ARE ACTUAL PHASE NUMBERS NOT THE INVERSE PHASE MASK VALUE.
+This is commonly used for Spellcasting NPC's who on Aggro may select at random a school of spells to use for the fight. Use this if you have up to 3 phases used, otherwise use Action 31 for more then 3 phases.
+
+---------------------------------
+31 = ACTION_T_RANDOM_PHASE_RANGE:
+---------------------------------
+Parameter 1: PhaseMin - The minimum of the phase range.
+Parameter 2: PhaseMax - The maximum of the phase range. The number here must be greater than PhaseMin.
+
+Randomly sets the phase between a range of phases controlled by the parameters. Sets the phase to a random id (Phase = PhaseMin + rnd % PhaseMin-PhaseMax).
+NOTE: PhaseMax must be greater than PhaseMin.
+NOTE 2: PLEASE NOTE THAT EACH OF THE PARAM VALUES ARE ACTUAL PHASE NUMBERS NOT THE INVERSE PHASE MASK VALUE.
+This is commonly used for Spellcasting NPC's who on Aggro may select at random a school of spells to use for the fight. Use this if you have MORE then 3 phases used, otherwise use Action 30.
+
+---------------------
+32 = ACTION_T_SUMMON:
+---------------------
+Parameter 1: CreatureID - The creature template ID to be summoned. The value here needs to be a valid creature template ID.
+Parameter 2: Target - The target type defining who the summoned creature will attack. The value in this field needs to be a valid target type as specified in the reference tables below. NOTE: Using target type 0 will cause the summoned creature to not attack anyone.
+Parameter 3: SummonID - The summon ID from the creature_ai_summons table controlling the position (and spawntime) where the summoned mob should be spawned at.
+
+Summons creature (param1) to attack target (param2) at location specified by creature_ai_summons (param3).
+NOTE: Param3 Value is the ID Value used for the entry used in creature_ai_summons for this action. You MUST have an creature_ai_summons entry to use this action.
+This is commonly used for NPC's who need to Summon a creature at a specific location. (Normally used for complex events)
+
+-----------------------------
+33 = ACTION_T_KILLED_MONSTER:
+-----------------------------
+Parameter 1: CreatureID - The creature template ID. The value here must be a valid creature template ID.
+Parameter 2: Target - The target type defining whom the quest kill count should be given to. The value in this field needs to be a valid target type as specified in the reference tables below.
+
+When activated, this action will call KilledMonster() function for the player. It can be used to give creature credit for killing a creature. In general if the quest is set to be accompished on different creatures (e.g. "Credit" templates).
+NOTE: It can be ANY creature including certain quest specific triggers
+This is commonly used for giving the player Quest Credits for NPC kills (Many NPC's may use the same CreatureID for the Kill Credit)
+
+----------------------------
+34 = ACTION_T_SET_INST_DATA:
+----------------------------
+Parameter 1: Field - The field to change in the instance script. Again, this field needs to be a valid field that has been already defined in the instance's script.
+Parameter 2: Data - The value to put at that field index.
+
+Sets data for the instance. Note that this will only work when the creature is inside an instantiable zone that has a valid script (ScriptedInstance) assigned.
+This is commonly used to link an EventAI script with a existing Script Library C++ Script. You make make things happen like opening doors on specific events that happen.
+
+------------------------------
+35 = ACTION_T_SET_INST_DATA64:
+------------------------------
+Parameter 1: Field - The field to change in the instance script. Again, this field needs to be a valid field that has been already defined in the instance's script.
+Parameter 2: Target - The target type to use to get the GUID that will be stored at the field index. The value in this field needs to be a valid target type as specified in the reference tables below.
+
+Sets GUID (64 bits) data for the instance based on the target. Note that this will only work when the creature is inside an instantiable zone that has a valid script (ScriptedInstance) assigned.
+Calls ScriptedInstance::SetData64 with field (param1) and data (param2) target's GUID.
+
+------------------------------
+36 = ACTION_T_UPDATE_TEMPLATE:
+------------------------------
+Parameter 1: TemplateId - The creature template ID. The value here must be a valid creature template ID.
+Parameter 2: Team - Use model_id from team : Alliance(0) or Horde (1).
+
+This function temporarily changes creature entry to new entry, display is changed, loot is changed, but AI is not changed. At respawn creature will be reverted to original entry.
+Changes the creature to a new creature template of (param1) with team = Alliance if (param2) = false or Horde if (param2) = true
+
+------------------
+37 = ACTION_T_DIE:
+------------------
+Kills the creature
+This is commonly used if you need to Instakill the creature for one reason or another.
+
+--------------------------------
+38 = ACTION_T_ZONE_COMBAT_PULSE:
+--------------------------------
+Places all players within the instance into combat with the creature. Only works in combat and only works inside of instances.
+
+----------------------------
+39 = ACTION_T_CALL_FOR_HELP:
+----------------------------
+Parameter 1: Radius - All friendly (not only same faction) creatures will go to help
+
+Call any friendly creatures (if its not in combat/etc) in radius attack creature target.
+Mostly used when call to help more wide that normal aggro radius or auto-used call for assistance, and need apply at some event.
+
+-------------------------
+40   ACTION_T_SET_SHEATH:
+-------------------------
+Parameter 1: Sheath state
+0    SHEATH_STATE_UNARMED               not prepared weapon show (not used mostly by creatures)
+1    SHEATH_STATE_MELEE                 melee weapon prepared show
+2    SHEATH_STATE_RANGED                ranged weapon prepared show
+
+Let set sheath state for creature.
+Note: SHEATH_STATE_RANGED case work in combat state only if combat not start as melee commands.
+This possible setup by set ar event AI start (single used EVENT_T_TIMER_OOC set ACTION_T_COMBAT_MOVEMENT 0 for creature that prefered ranged attack)
+
+-------------------------
+41   ACTION_T_FORCE_DESPAWN
+-------------------------
+Despawns the creature (in or out of combat)
+No parameters
+
+-------------------------
+42   ACTION_T_SET_INVINCIBILITY_HP_LEVEL
+-------------------------
+Parameter 1: min. health level for creature that can be set at damage, 0 used as absent min. health value for apply damage.
+Parameter 2: format of paramater 1 value
+0    paramater 1 used as flat value
+1    paramater 1 used as percent (0..100) from creature max health
+
+=========================================
+Target Types
+=========================================
+Below is the list of current Target types that EventAI can handle.
+Target types are used by certain actions and may effect actions differently
+
+(#   Internal Name                      Discription)
+0    TARGET_T_SELF                      Self cast
+1    TARGET_T_HOSTILE                   Our current target (ie: highest aggro)
+2    TARGET_T_HOSTILE_SECOND_AGGRO      Second highest aggro (generaly used for cleaves and some special attacks)
+3    TARGET_T_HOSTILE_LAST_AGGRO        Dead last on aggro (no idea what this could be used for)
+4    TARGET_T_HOSTILE_RANDOM            Just any random target on our threat list
+5    TARGET_T_HOSTILE_RANDOM_NOT_TOP    Any random target except top threat
+6    TARGET_T_ACTION_INVOKER            Unit who caused this Event to occur (only works for EVENT_T_AGGRO, EVENT_T_KILL, EVENT_T_DEATH, EVENT_T_SPELLHIT, EVENT_T_OOC_LOS, EVENT_T_FRIENDLY_HP)
+
+=========================================
+Cast Flags
+=========================================
+Below is the list of current Cast Flags that EventAI's spell casting can handle.
+Cast flags are handled bitwise. Bit 0 is Interrupt Previous, bit 1 is triggered, etc.
+So for example the number "3" (11 in Binary, selecting first 2 options) would mean that this cast has both CAST_INTURRUPT_PREVIOUS and CAST_TRIGGERED.
+Another example: the number "5" (101 in Binary, selecting first and third options) would mean that this cast has CAST_INTURRUPT_PREVIOUS and CAST_FORCE_CAST.
+
+(bit#   Decimal     Internal Name                  Discription)
+0       1           CAST_INTURRUPT_PREVIOUS        Interrupts any previous spell casting (basicaly makes sure that this spell goes off)
+1       2           CAST_TRIGGERED                 Forces the spell to be instant cast and require no mana/reagents.
+2       4           CAST_FORCE_CAST                Forces spell to cast even if the target is possibly out of range or the creature is possibly out of mana
+3       8           CAST_NO_MELEE_IF_OOM           Prevents creature from entering melee if out of mana or out of range
+4       16          CAST_FORCE_TARGET_SELF         Forces the target to cast this spell on itself
+5       32          CAST_AURA_NOT_PRESENT          Only casts the spell on the target if the target does not have the aura from that spell on itself already.
+
+NOTE: You can add the numbers in the decimal column to combine flags.
+ For example if you wanted to use CAST_NO_MELEE_IF_OOM(8) and CAST_TRIGGERED(2) you would simply use 10 in the cast flags field (8 + 2 = 10).
+
+=========================================
+Event Flags
+=========================================
+Below is the list of current Event Flags that EventAI can handle. Event flags are handled bitwise.
+
+(bit#   Decimal   Internal Name                  Discription)
+0       1         EFLAG_REPEATABLE               Event repeats (Does not repeat if this flag is not set)
+1       2         EFLAG_NORMAL                   Event occurs in Normal instance difficulty (will not occur in Normal if not set)
+2       4         EFLAG_HEROIC                   Event occurs in Heroic instance difficulty (will not occur in Heroic if not set)
+3       8
+4       16
+5       32
+6       64
+7       128        EFLAG_DEBUG_ONLY              Prevents events from occuring on Release builds. Useful for testing new features.
+
+NOTE: You can add the numbers in the decimal column to combine flags.
+
+
+=========================================
+Basic Structure of creature_ai_texts
+=========================================
+Below is a the list of current fields within the texts tables.
+
+Field_Name            Description
+-----------------------------------------------------------
+entry                 This value is mearly an NEGATIVE identifier of the current text number. Required for sql queries. Valid range are -1 to -999999
+content_default       This is the actual text presented in the default language (English).
+
+content_loc1          This is the actual text presented in the Localization #1 Clients (Korean)
+content_loc2          This is the actual text presented in the Localization #2 Clients (French)
+content_loc3          This is the actual text presented in the Localization #3 Clients (German)
+content_loc4          This is the actual text presented in the Localization #4 Clients (Chinese)
+content_loc5          This is the actual text presented in the Localization #5 Clients (Taiwanese)
+content_loc6          This is the actual text presented in the Localization #6 Clients (Spanish)
+content_loc7          This is the actual text presented in the Localization #7 Clients (Spanish Mexico)
+content_loc8          This is the actual text presented in the Localization #8 Clients (Russian)
+
+sound                 This value is the Sound ID that corresponds to the actual text used.
+type                  Variables used to define type of text (Say/Yell/Textemote/Whisper).
+language              This value is the Language that the text is native in.
+emote                 Value from enum Emote. Only source of text will play this emote (not target, if target are defined in DoScriptText)
+comment               This is a comment regarding the text entry
+
+Note: Fields `content_loc1` to `content_loc8` are NULL values by default and are normally handled by seperate localization projects.
+
+=========================================
+Text Types (type)
+=========================================
+Below is the list of current Text types that texts tables can handle. These were previously seperate Actions in ACID.
+
+#    Internal Name                 Description
+-----------------------------------------------------------
+0    CHAT_TYPE_SAY                 This type sets the text to be displayed as a Say (Speech Bubble).
+1    CHAT_TYPE_YELL                This type sets the text to be displayed as a Yell (Red Speech Bubble) and usually has a matching Sound ID.
+2    CHAT_TYPE_TEXT_EMOTE          This type sets the text to be displayed as a text emote in orange in the chat log.
+3    CHAT_TYPE_BOSS_EMOTE          This type sets the text to be displayed as a text emote in orange in the chat log (Used only for specific Bosses).
+4    CHAT_TYPE_WHISPER             This type sets the text to be displayed as a whisper to the player in the chat log.
+5    CHAT_TYPE_BOSS_WHISPER        This type sets the text to be displayed as a whisper to the player in the chat log (Used only for specific Bosses).
+6    CHAT_TYPE_ZONE_YELL           Same as CHAT_TYPE_YELL but will display to all players in current zone.
+
+=========================================
+Language Types (language)
+=========================================
+Below is the list of current Language types that are allowed.
+This is the Race Language that the text is native to (So it will display properly)
+
+#    Internal Name                Description
+-----------------------------------------------------------
+0    UNIVERSAL                    Text in this language is understood by ALL Races.
+1    ORCISH                       Text in this language is understood ONLY by Horde Races.
+2    DARNASSIAN                   Text in this language is understood ONLY by the Night Elf Race.
+3    TAURAHE                      Text in this language is understood ONLY by the Tauren Race.
+6    DWARVISH                     Text in this language is understood ONLY by the Dwarf Race.
+7    COMMON                       Text in this language is understood ONLY by Alliance Races.
+8    DEMONIC                      Text in this language is understood ONLY by the Demon Race (Not Implimented).
+9    TITAN                        This language was used by Sargeras to speak with other Titians (Not Implemented).
+10   THALASSIAN                   Text in this language is understood ONLY by the Blood Elf Race.
+11   DRACONIC                     Text in this language is understood ONLY by the Dragon Race.
+12   KALIMAG                      Text will display as Kalimag (not readable by players, language of all elementals)
+13   GNOMISH                      Text in this language is understood ONLY by the Gnome Race.
+14   TROLL                        Text in this language is understood ONLY by the Troll Race.
+33   GUTTERSPEAK                  Text in this language is understood ONLY by the Undead Race.
+35   DRAENEI                      Text in this language is understood ONLY by the Draenai Race.
+36   ZOMBIE                       (not currently used?)
+37   GNOMISH BINARY               Binary language used by Alliance when drinking Binary Brew
+38   GOBLIN BINARY                Binary language used by Horce when drinking Binary Brew
diff --git a/docs/HowToScript.txt b/docs/HowToScript.txt
new file mode 100644
index 00000000000..73968a08b19
--- /dev/null
+++ b/docs/HowToScript.txt
@@ -0,0 +1,27 @@
+
+** HOW TO SCRIPT IN C++ **
+
+1 - create a file myscript.cpp in scripts folder.
+2 - copy the content of script_default.cpp, it as the structure on how the scripting fuctions are organized.
+		dont forget to change the name of fuctions, like GossipHello_default to GossipHello_myscript.
+
+3 - in fuction AddSC_default change to AddSC_myscript.
+4 - newscript->Name="default"; change the string to "myscript" this name is the one to be called from the db
+5 - dont forget to change the name in here to newscript->pGossipHello = &GossipHello_default; this is where the scripted fuctions are stored.
+6 - and last thing is in ScriptMgr.cpp
+
+add your AddSC_myscript in here
+
+// -- Scripts to be added --
+extern void AddSC_default();
+// -------------------
+
+and here
+
+// -- Inicialize the Scripts to be Added --
+	AddSC_default();
+// ----------------------------------------
+	
+now start using the player fuctions to script ;)
+
+hope it helps, any question use our forum.
\ No newline at end of file
diff --git a/docs/TextTables.txt b/docs/TextTables.txt
new file mode 100644
index 00000000000..eac63384785
--- /dev/null
+++ b/docs/TextTables.txt
@@ -0,0 +1,87 @@
+=========================================
+Texts Documentation
+=========================================
+
+Scriptdev2 Revision 695 introduces a new format for using texts in EventAI and SD2 Scripts.
+This information relates to the *_texts tables located in the ScriptDev Database.
+
+Any script can at any time access and use text from any of the three text tables, as long as the entry does in fact exist.
+Custom scripters are adviced to store their text data in custom_texts.
+
+The different tables has ranges of entries allowed for that table.
+Reserved EventAI in Mangos     entry -1       -> -999999
+script_texts:  entry -1000000 -> -1999999
+custom_texts:  entry -2000000 -> -2999999
+Any entry out of range for that table will display a startup error.
+
+
+=========================================
+Basic Structure of script_texts and custom_texts
+=========================================
+Below is a the list of current fields within the texts tables.
+
+Field_Name            Description
+-----------------------------------------------------------
+entry                 This value is mearly an NEGATIVE identifier of the current text number. Required for sql queries.
+content_default       This is the actual text presented in the default language (English).
+
+content_loc1          This is the actual text presented in the Localization #1 Clients (Korean)
+content_loc2          This is the actual text presented in the Localization #2 Clients (French)
+content_loc3          This is the actual text presented in the Localization #3 Clients (German)
+content_loc4          This is the actual text presented in the Localization #4 Clients (Chinese)
+content_loc5          This is the actual text presented in the Localization #5 Clients (Taiwanese)
+content_loc6          This is the actual text presented in the Localization #6 Clients (Spanish)
+content_loc7          This is the actual text presented in the Localization #7 Clients (Spanish Mexico)
+content_loc8          This is the actual text presented in the Localization #8 Clients (Russian)
+
+sound                 This value is the Sound ID that corresponds to the actual text used (Defined in SoundEntries.dbc).
+type                  Variables used to define type of text (Say/Yell/Textemote/Whisper).
+language              This value is the Language that the text is native in (Defined in Languages.dbc).
+emote                 Value from enum Emote (defined in Emotes.dbc). Only source of text will play this emote (not target, if target are defined in DoScriptText)
+comment               This is a comment regarding the text entry (For ACID, accepted format is to use Creature ID of NPC using it).
+
+Note: Fields `content_loc1` to `content_loc8` are NULL values by default and are handled by seperate localization projects.
+
+
+=========================================
+Text Types (type)
+=========================================
+Below is the list of current Text types that texts tables can handle. These were previously seperate Actions in ACID.
+
+#    Internal Name                 Description
+-----------------------------------------------------------
+0    CHAT_TYPE_SAY                 This type sets the text to be displayed as a Say (Speech Bubble).
+1    CHAT_TYPE_YELL                This type sets the text to be displayed as a Yell (Red Speech Bubble) and usually has a matching Sound ID.
+2    CHAT_TYPE_TEXT_EMOTE          This type sets the text to be displayed as a text emote in orange in the chat log.
+3    CHAT_TYPE_BOSS_EMOTE          This type sets the text to be displayed as a text emote in orange in the chat log (Used only for specific Bosses).
+4    CHAT_TYPE_WHISPER             This type sets the text to be displayed as a whisper to the player in the chat log.
+5    CHAT_TYPE_BOSS_WHISPER        This type sets the text to be displayed as a whisper to the player in the chat log (Used only for specific Bosses).
+6    CHAT_TYPE_ZONE_YELL           Same as CHAT_TYPE_YELL but will display to all players in current zone.
+
+
+=========================================
+Language Types (language)
+=========================================
+Below is the list of current Language types that are allowed.
+This is the Race Language that the text is native to (So it will display properly)
+
+#    Internal Name                Description
+-----------------------------------------------------------
+0    UNIVERSAL                    Text in this language is understood by ALL Races.
+1    ORCISH                       Text in this language is understood ONLY by Horde Races.
+2    DARNASSIAN                   Text in this language is understood ONLY by the Night Elf Race.
+3    TAURAHE                      Text in this language is understood ONLY by the Tauren Race.
+6    DWARVISH                     Text in this language is understood ONLY by the Dwarf Race.
+7    COMMON                       Text in this language is understood ONLY by Alliance Races.
+8    DEMONIC                      Text in this language is understood ONLY by the Demon Race (Not Implimented).
+9    TITAN                        This language was used by Sargeras to speak with other Titians (Not Implemented).
+10   THALASSIAN                   Text in this language is understood ONLY by the Blood Elf Race.
+11   DRACONIC                     Text in this language is understood ONLY by the Dragon Race.
+12   KALIMAG                      Text will display as Kalimag (not readable by players, language of all elementals)
+13   GNOMISH                      Text in this language is understood ONLY by the Gnome Race.
+14   TROLL                        Text in this language is understood ONLY by the Troll Race.
+33   GUTTERSPEAK                  Text in this language is understood ONLY by the Undead Race.
+35   DRAENEI                      Text in this language is understood ONLY by the Draenai Race.
+36   ZOMBIE                       (not currently used?)
+37   GNOMISH BINARY               Binary language used by Alliance when drinking Binary Brew
+38   GOBLIN BINARY                Binary language used by Horce when drinking Binary Brew
\ No newline at end of file
diff --git a/docs/UnixInstall.txt b/docs/UnixInstall.txt
new file mode 100644
index 00000000000..a0bd7e07715
--- /dev/null
+++ b/docs/UnixInstall.txt
@@ -0,0 +1,61 @@
+= TrinityCore -- Linux installation =
+
+Copyright (C) Trinity Core (http://www.trinitycore.org)
+
+CHECK http://www.trinitycore.info/w/Linux_Build_HOWTO FOR FURTHER HELP
+
+Installing Trinity Core is fairly simple on a Linux machine, assuming
+you have all required applications
+
+The most important ones are:
+
+	g++
+    gcc
+    make
+    cmake version 2.6.x or greater
+    libmysql++-dev
+    subversion (for checking out Trinity Database)
+    mercurial (for checking out the core)
+    openssl
+    libssl-dev
+    zlib1g-dev
+    libtool
+    libmysqlclient15-dev
+    patch
+    build-essential
+    mysql-client
+    
+Most of these are included on common Linux distros, others you may have to install by your self. 
+Please check your distro's repos.
+
+Make a directory to build in, you can call it anything you want like build or bin etc, then go into 
+the directory and cmake and make. E.G. you created a dir named build ad want to have your final
+ compiled product installed in /home/trinity/server, an example sequence of commands can be : 
+
+    cmake ../ -DPREFIX=/home/trinity/server
+    make
+    make install
+    
+Thats just about all thats needed. You can however tweak more settings than where to install using flags built into our cmake files. Just open up CMakeLists.txt in the main folder and take a look at some of the flags like 
+
+    DO_MYSQL --mysql database support (enabled or disabled by a 1 or 0, enabled by default)
+    DO_SCRIPTS --enable or disable trinity script (enabled or disabled by a 1 or 0, enabled by default)
+    DO_RA --remote administration (enabled or disabled by a 1 or 0)
+    DO_DEBUG --enable debugging (enabled or disabled by a 1 or 0)
+    DO_CLI --enable command line support (enabled or disabled by a 1 or 0, enabled by default)
+    LARGE_CELL --enable large cells (enabled or disabled by a 1 or 0, disabled by default, enabling can cause CPU spikes)
+    SHORT_SLEEP --changes sleep time from 100ms to 50ms
+    PREFIX --prefix directory for install (see example for use)
+    CONF_DIR --location for your trinity config files
+    CMAKE_C_FLAGS --advanced users only
+    CMAKE_CXX_FLAGS --advanced users only
+
+
+Of course, replace the paths in prefix, conf_dir with the directories you wish to install 
+Trinity Core to. The datadir is where maps, DBCs, and SQLs are stored. The sysconfdir
+is where configuration files are stored.
+
+Once Trinity Core is installed you will need to
+apply database updates where necessary. Furthermore, you must
+configure your installation by editing the config files in the
+sysconfdir.
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
new file mode 100644
index 00000000000..f74c476ac4c
--- /dev/null
+++ b/externals/CMakeLists.txt
@@ -0,0 +1,7 @@
+add_subdirectory(ace)
+#add_subdirectory(bzip2)
+add_subdirectory(g3dlite)
+add_subdirectory(jemalloc)
+#add_subdirectory(libmpq)
+add_subdirectory(sockets)
+add_subdirectory(zlib)
diff --git a/externals/PackageList.txt b/externals/PackageList.txt
index 168d0428983..5bb1c3a873a 100644
--- a/externals/PackageList.txt
+++ b/externals/PackageList.txt
@@ -2,39 +2,52 @@ TrinityCore uses (parts of or in whole) the following opensource software :
 
 ACE (ADAPTIVE Communication Environment)
   http://www.cs.wustl.edu/~schmidt/ACE.html
+  Version: UNKNOWN
 
 bzip2 (a freely available, patent free, high-quality data compressor)
   http://www.bzip.org/
+  Version: 1.0.5
 
-G3D 6.09 (a commercial-grade C++ 3D engine available as Open Source (BSD License)
+G3D (a commercial-grade C++ 3D engine available as Open Source (BSD License)
   http://g3d.sourceforge.net/
+  Version: 6.09
 
 jemalloc (a general-purpose scalable concurrent malloc-implementation)
   http://www.canonware.com/jemalloc/
-
+  Version: UNKNOWN
+  
 libMPQ (a library for reading MPQ files)
   https://libmpq.org/
+  Version: 1.0.4
 
 MersenneTwister (a very fast random number generator)
   http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/emt.html
+  Version: 0.4.2
 
 SFMT (SIMD-oriented Fast Mersenne Twister)
   http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/index.html
+  Version: 1.3.3
 
 MySQL (the world's most popular open source database software)
   http://www.mysql.com/about/
+  Version: UNKNOWN
 
 OpenSSL (an opensource toolkit implementing SSL v2/v3 and TLS v1 protocols)
   http://www.openssl.org/
+  Version: UNKNOWN
 
 sockets (a GPL licensed C++ class library wrapping the berkeley sockets C API)
   http://www.alhem.net/Sockets/
+  Version: UNKNOWN
 
 utf8-cpp (UTF-8 with C++ in a Portable Way)
   http://utfcpp.sourceforge.net/
+  Version: 2.3
 
 vld (a free open-source memory leak detection system for Visual C++)
   http://sites.google.com/site/dmoulding/vld
+  Version: 1.0
 
 zlib (A Massively Spiffy Yet Delicately Unobtrusive Compression Library)
   http://www.zlib.net/
+  Version: 1.2.5
diff --git a/externals/bzip2/CHANGES b/externals/bzip2/CHANGES
deleted file mode 100644
index 6e4f65e2e0a..00000000000
--- a/externals/bzip2/CHANGES
+++ /dev/null
@@ -1,319 +0,0 @@
- ------------------------------------------------------------------
- This file is part of bzip2/libbzip2, a program and library for
- lossless, block-sorting data compression.
-
- bzip2/libbzip2 version 1.0.5 of 10 December 2007
- Copyright (C) 1996-2007 Julian Seward 
-
- Please read the WARNING, DISCLAIMER and PATENTS sections in the 
- README file.
-
- This program is released under the terms of the license contained
- in the file LICENSE.
- ------------------------------------------------------------------
-
-
-0.9.0
-~~~~~
-First version.
-
-
-0.9.0a
-~~~~~~
-Removed 'ranlib' from Makefile, since most modern Unix-es 
-don't need it, or even know about it.
-
-
-0.9.0b
-~~~~~~
-Fixed a problem with error reporting in bzip2.c.  This does not effect
-the library in any way.  Problem is: versions 0.9.0 and 0.9.0a (of the
-program proper) compress and decompress correctly, but give misleading
-error messages (internal panics) when an I/O error occurs, instead of
-reporting the problem correctly.  This shouldn't give any data loss
-(as far as I can see), but is confusing.
-
-Made the inline declarations disappear for non-GCC compilers.
-
-
-0.9.0c
-~~~~~~
-Fixed some problems in the library pertaining to some boundary cases.
-This makes the library behave more correctly in those situations.  The
-fixes apply only to features (calls and parameters) not used by
-bzip2.c, so the non-fixedness of them in previous versions has no
-effect on reliability of bzip2.c.
-
-In bzlib.c:
-   * made zero-length BZ_FLUSH work correctly in bzCompress().
-   * fixed bzWrite/bzRead to ignore zero-length requests.
-   * fixed bzread to correctly handle read requests after EOF.
-   * wrong parameter order in call to bzDecompressInit in
-     bzBuffToBuffDecompress.  Fixed.
-
-In compress.c:
-   * changed setting of nGroups in sendMTFValues() so as to 
-     do a bit better on small files.  This _does_ effect
-     bzip2.c.
-
-
-0.9.5a
-~~~~~~
-Major change: add a fallback sorting algorithm (blocksort.c)
-to give reasonable behaviour even for very repetitive inputs.
-Nuked --repetitive-best and --repetitive-fast since they are
-no longer useful.
-
-Minor changes: mostly a whole bunch of small changes/
-bugfixes in the driver (bzip2.c).  Changes pertaining to the
-user interface are:
-
-   allow decompression of symlink'd files to stdout
-   decompress/test files even without .bz2 extension
-   give more accurate error messages for I/O errors
-   when compressing/decompressing to stdout, don't catch control-C
-   read flags from BZIP2 and BZIP environment variables
-   decline to break hard links to a file unless forced with -f
-   allow -c flag even with no filenames
-   preserve file ownerships as far as possible
-   make -s -1 give the expected block size (100k)
-   add a flag -q --quiet to suppress nonessential warnings
-   stop decoding flags after --, so files beginning in - can be handled
-   resolved inconsistent naming: bzcat or bz2cat ?
-   bzip2 --help now returns 0
-
-Programming-level changes are:
-
-   fixed syntax error in GET_LL4 for Borland C++ 5.02
-   let bzBuffToBuffDecompress return BZ_DATA_ERROR{_MAGIC}
-   fix overshoot of mode-string end in bzopen_or_bzdopen
-   wrapped bzlib.h in #ifdef __cplusplus ... extern "C" { ... }
-   close file handles under all error conditions
-   added minor mods so it compiles with DJGPP out of the box
-   fixed Makefile so it doesn't give problems with BSD make
-   fix uninitialised memory reads in dlltest.c
-
-0.9.5b
-~~~~~~
-Open stdin/stdout in binary mode for DJGPP.
-
-0.9.5c
-~~~~~~
-Changed BZ_N_OVERSHOOT to be ... + 2 instead of ... + 1.  The + 1
-version could cause the sorted order to be wrong in some extremely
-obscure cases.  Also changed setting of quadrant in blocksort.c.
-
-0.9.5d
-~~~~~~
-The only functional change is to make bzlibVersion() in the library
-return the correct string.  This has no effect whatsoever on the
-functioning of the bzip2 program or library.  Added a couple of casts
-so the library compiles without warnings at level 3 in MS Visual
-Studio 6.0.  Included a Y2K statement in the file Y2K_INFO.  All other
-changes are minor documentation changes.
-
-1.0
-~~~
-Several minor bugfixes and enhancements:
-
-* Large file support.  The library uses 64-bit counters to
-  count the volume of data passing through it.  bzip2.c 
-  is now compiled with -D_FILE_OFFSET_BITS=64 to get large
-  file support from the C library.  -v correctly prints out
-  file sizes greater than 4 gigabytes.  All these changes have
-  been made without assuming a 64-bit platform or a C compiler
-  which supports 64-bit ints, so, except for the C library
-  aspect, they are fully portable.
-
-* Decompression robustness.  The library/program should be
-  robust to any corruption of compressed data, detecting and
-  handling _all_ corruption, instead of merely relying on
-  the CRCs.  What this means is that the program should 
-  never crash, given corrupted data, and the library should
-  always return BZ_DATA_ERROR.
-
-* Fixed an obscure race-condition bug only ever observed on
-  Solaris, in which, if you were very unlucky and issued
-  control-C at exactly the wrong time, both input and output
-  files would be deleted.
-
-* Don't run out of file handles on test/decompression when
-  large numbers of files have invalid magic numbers.
-
-* Avoid library namespace pollution.  Prefix all exported 
-  symbols with BZ2_.
-
-* Minor sorting enhancements from my DCC2000 paper.
-
-* Advance the version number to 1.0, so as to counteract the
-  (false-in-this-case) impression some people have that programs 
-  with version numbers less than 1.0 are in some way, experimental,
-  pre-release versions.
-
-* Create an initial Makefile-libbz2_so to build a shared library.
-  Yes, I know I should really use libtool et al ...
-
-* Make the program exit with 2 instead of 0 when decompression
-  fails due to a bad magic number (ie, an invalid bzip2 header).
-  Also exit with 1 (as the manual claims :-) whenever a diagnostic
-  message would have been printed AND the corresponding operation 
-  is aborted, for example
-     bzip2: Output file xx already exists.
-  When a diagnostic message is printed but the operation is not 
-  aborted, for example
-     bzip2: Can't guess original name for wurble -- using wurble.out
-  then the exit value 0 is returned, unless some other problem is
-  also detected.
-
-  I think it corresponds more closely to what the manual claims now.
-
-
-1.0.1
-~~~~~
-* Modified dlltest.c so it uses the new BZ2_ naming scheme.
-* Modified makefile-msc to fix minor build probs on Win2k.
-* Updated README.COMPILATION.PROBLEMS.
-
-There are no functionality changes or bug fixes relative to version
-1.0.0.  This is just a documentation update + a fix for minor Win32
-build problems.  For almost everyone, upgrading from 1.0.0 to 1.0.1 is
-utterly pointless.  Don't bother.
-
-
-1.0.2
-~~~~~
-A bug fix release, addressing various minor issues which have appeared
-in the 18 or so months since 1.0.1 was released.  Most of the fixes
-are to do with file-handling or documentation bugs.  To the best of my
-knowledge, there have been no data-loss-causing bugs reported in the
-compression/decompression engine of 1.0.0 or 1.0.1.
-
-Note that this release does not improve the rather crude build system
-for Unix platforms.  The general plan here is to autoconfiscate/
-libtoolise 1.0.2 soon after release, and release the result as 1.1.0
-or perhaps 1.2.0.  That, however, is still just a plan at this point.
-
-Here are the changes in 1.0.2.  Bug-reporters and/or patch-senders in
-parentheses.
-
-* Fix an infinite segfault loop in 1.0.1 when a directory is
-  encountered in -f (force) mode.
-     (Trond Eivind Glomsrod, Nicholas Nethercote, Volker Schmidt)
-
-* Avoid double fclose() of output file on certain I/O error paths.
-     (Solar Designer)
-
-* Don't fail with internal error 1007 when fed a long stream (> 48MB)
-  of byte 251.  Also print useful message suggesting that 1007s may be
-  caused by bad memory.
-     (noticed by Juan Pedro Vallejo, fixed by me)
-
-* Fix uninitialised variable silly bug in demo prog dlltest.c.
-     (Jorj Bauer)
-
-* Remove 512-MB limitation on recovered file size for bzip2recover
-  on selected platforms which support 64-bit ints.  At the moment
-  all GCC supported platforms, and Win32.
-     (me, Alson van der Meulen)
-
-* Hard-code header byte values, to give correct operation on platforms
-  using EBCDIC as their native character set (IBM's OS/390).
-     (Leland Lucius)
-
-* Copy file access times correctly.
-     (Marty Leisner)
-
-* Add distclean and check targets to Makefile.
-     (Michael Carmack)
-
-* Parameterise use of ar and ranlib in Makefile.  Also add $(LDFLAGS).
-     (Rich Ireland, Bo Thorsen)
-
-* Pass -p (create parent dirs as needed) to mkdir during make install.
-     (Jeremy Fusco)
-
-* Dereference symlinks when copying file permissions in -f mode.
-     (Volker Schmidt)
-
-* Majorly simplify implementation of uInt64_qrm10.
-     (Bo Lindbergh)
-
-* Check the input file still exists before deleting the output one,
-  when aborting in cleanUpAndFail().
-     (Joerg Prante, Robert Linden, Matthias Krings)
-
-Also a bunch of patches courtesy of Philippe Troin, the Debian maintainer
-of bzip2:
-
-* Wrapper scripts (with manpages): bzdiff, bzgrep, bzmore.
-
-* Spelling changes and minor enhancements in bzip2.1.
-
-* Avoid race condition between creating the output file and setting its
-  interim permissions safely, by using fopen_output_safely().
-  No changes to bzip2recover since there is no issue with file
-  permissions there.
-
-* do not print senseless report with -v when compressing an empty
-  file.
-
-* bzcat -f works on non-bzip2 files.
-
-* do not try to escape shell meta-characters on unix (the shell takes
-  care of these).
-
-* added --fast and --best aliases for -1 -9 for gzip compatibility.
-
-
-1.0.3 (15 Feb 05)
-~~~~~~~~~~~~~~~~~
-Fixes some minor bugs since the last version, 1.0.2.
-
-* Further robustification against corrupted compressed data.
-  There are currently no known bitstreams which can cause the
-  decompressor to crash, loop or access memory which does not
-  belong to it.  If you are using bzip2 or the library to 
-  decompress bitstreams from untrusted sources, an upgrade
-  to 1.0.3 is recommended.  This fixes CAN-2005-1260.
-
-* The documentation has been converted to XML, from which html
-  and pdf can be derived.
-
-* Various minor bugs in the documentation have been fixed.
-
-* Fixes for various compilation warnings with newer versions of
-  gcc, and on 64-bit platforms.
-
-* The BZ_NO_STDIO cpp symbol was not properly observed in 1.0.2.
-  This has been fixed.
-
-
-1.0.4 (20 Dec 06)
-~~~~~~~~~~~~~~~~~
-Fixes some minor bugs since the last version, 1.0.3.
-
-* Fix file permissions race problem (CAN-2005-0953).
-
-* Avoid possible segfault in BZ2_bzclose.  From Coverity's NetBSD
-  scan.
-
-* 'const'/prototype cleanups in the C code.
-
-* Change default install location to /usr/local, and handle multiple
-  'make install's without error.
-
-* Sanitise file names more carefully in bzgrep.  Fixes CAN-2005-0758
-  to the extent that applies to bzgrep.
-
-* Use 'mktemp' rather than 'tempfile' in bzdiff.
-
-* Tighten up a couple of assertions in blocksort.c following automated
-  analysis.
-
-* Fix minor doc/comment bugs.
-
-
-1.0.5 (10 Dec 07)
-~~~~~~~~~~~~~~~~~
-Security fix only.  Fixes CERT-FI 20469 as it applies to bzip2.
-
diff --git a/externals/bzip2/CMakeLists.txt b/externals/bzip2/CMakeLists.txt
new file mode 100644
index 00000000000..d0d1ac04bcd
--- /dev/null
+++ b/externals/bzip2/CMakeLists.txt
@@ -0,0 +1,10 @@
+file(GLOB sources *.cpp)
+set(bzip2_STAT_SRCS
+  ${sources}
+)
+
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+add_library(bzip2 STATIC ${bzip2_STAT_SRCS})
diff --git a/externals/bzip2/LICENSE b/externals/bzip2/LICENSE
deleted file mode 100644
index f420cffb67d..00000000000
--- a/externals/bzip2/LICENSE
+++ /dev/null
@@ -1,42 +0,0 @@
-
---------------------------------------------------------------------------
-
-This program, "bzip2", the associated library "libbzip2", and all
-documentation, are copyright (C) 1996-2007 Julian R Seward.  All
-rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. The origin of this software must not be misrepresented; you must 
-   not claim that you wrote the original software.  If you use this 
-   software in a product, an acknowledgment in the product 
-   documentation would be appreciated but is not required.
-
-3. Altered source versions must be plainly marked as such, and must
-   not be misrepresented as being the original software.
-
-4. The name of the author may not be used to endorse or promote 
-   products derived from this software without specific prior written 
-   permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
-OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Julian Seward, jseward@bzip.org
-bzip2/libbzip2 version 1.0.5 of 10 December 2007
-
---------------------------------------------------------------------------
diff --git a/externals/g3dlite/AABox.cpp b/externals/g3dlite/AABox.cpp
new file mode 100644
index 00000000000..035497aa3c4
--- /dev/null
+++ b/externals/g3dlite/AABox.cpp
@@ -0,0 +1,366 @@
+/**
+  @file AABox.cpp
+
+  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+
+  @created 2004-01-10
+  @edited  2006-01-11
+*/
+
+#include "G3D/platform.h"
+#include "G3D/AABox.h"
+#include "G3D/Box.h"
+#include "G3D/Plane.h"
+#include "G3D/Sphere.h"
+#include "G3D/BinaryInput.h"
+#include "G3D/BinaryOutput.h"
+
+
+namespace G3D {
+
+const AABox& AABox::maxFinite() {
+    static const AABox b = AABox(Vector3::minFinite(), 
+                                 Vector3::maxFinite());
+    return b;
+}
+
+
+const AABox& AABox::large() {
+    static const AABox b = AABox(Vector3::minFinite() * 0.5f, 
+                                 Vector3::maxFinite() * 0.5f);
+    return b;
+}
+
+
+const AABox& AABox::inf() {
+    static const AABox b = AABox(-Vector3::inf(), Vector3::inf());
+    return b;
+}
+
+
+const AABox& AABox::zero() {
+    static const AABox b = AABox(Vector3::zero(), Vector3::zero());
+    return b;
+}
+
+
+void AABox::serialize(class BinaryOutput& b) const {
+    b.writeVector3(lo);
+    b.writeVector3(hi);
+}
+
+
+void AABox::deserialize(class BinaryInput& b) {
+    lo = b.readVector3();
+    hi = b.readVector3();
+}
+
+
+void AABox::split(const Vector3::Axis& axis, float location, AABox& low, AABox& high) const {
+    // Low, medium, and high along the chosen axis
+    float L = G3D::min(location, lo[axis]);
+    float M = G3D::min(G3D::max(location, lo[axis]), hi[axis]);
+    float H = G3D::max(location, hi[axis]);
+
+    // Copy over this box.
+    high = low = *this;
+
+    // Now move the split points along the special axis
+    low.lo[axis] = L;
+    low.hi[axis] = M;
+    high.lo[axis] = M;
+    high.hi[axis] = H;
+}
+
+
+Vector3 AABox::randomSurfacePoint() const {
+    Vector3 extent = hi - lo;
+    float aXY = extent.x * extent.y;
+    float aYZ = extent.y * extent.z;
+    float aZX = extent.z * extent.x;
+
+    float r = (float)uniformRandom(0.0f, aXY + aYZ + aZX);
+
+    // Choose evenly between positive and negative face planes
+    float d = ((float)uniformRandom(0, 1) < 0.5f) ? 0.0f : 1.0f;
+
+    // The probability of choosing a given face is proportional to
+    // its area.
+    if (r < aXY) {
+        return 
+            lo + 
+            Vector3(
+                (float)uniformRandom(0.0f, extent.x),
+                (float)uniformRandom(0.0f, extent.y),
+                d * extent.z);
+    } else if (r < aYZ) {
+        return 
+            lo + 
+            Vector3(
+                d * extent.x,
+                (float)uniformRandom(0, extent.y),
+                (float)uniformRandom(0, extent.z));
+    } else {
+        return 
+            lo + 
+            Vector3(
+                (float)uniformRandom(0, extent.x),
+                d * extent.y,
+                (float)uniformRandom(0, extent.z));
+    }
+}
+
+
+Vector3 AABox::randomInteriorPoint() const {
+    return Vector3(
+        (float)uniformRandom(lo.x, hi.x), 
+        (float)uniformRandom(lo.y, hi.y), 
+        (float)uniformRandom(lo.z, hi.z));
+}
+
+
+bool AABox::intersects(const AABox& other) const {
+    // Must be overlap along all three axes.
+    // Try to find a separating axis.
+
+    for (int a = 0; a < 3; ++a) {
+
+        //     |--------|
+        // |------|
+
+        if ((lo[a] > other.hi[a]) ||
+            (hi[a] < other.lo[a])) {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+int AABox::dummy = 0;
+
+bool AABox::culledBy(
+    const Array&	plane,
+    int&		cullingPlane,
+    const uint32	_inMask,
+    uint32&             childMask) const {
+
+    uint32 inMask = _inMask;
+    assert(plane.size() < 31);
+
+    childMask = 0;
+
+    const bool finite = 
+        (abs(lo.x) < G3D::finf()) &&
+        (abs(hi.x) < G3D::finf()) &&
+        (abs(lo.y) < G3D::finf()) &&
+        (abs(hi.y) < G3D::finf()) &&
+        (abs(lo.z) < G3D::finf()) &&
+        (abs(hi.z) < G3D::finf());
+
+    // See if there is one plane for which all of the
+	// vertices are in the negative half space.
+    for (int p = 0; p < plane.size(); ++p) {
+
+		// Only test planes that are not masked
+		if ((inMask & 1) != 0) {
+		
+			Vector3 corner;
+
+            int numContained = 0;
+            int v = 0;
+
+            // We can early-out only if we have found one point on each
+            // side of the plane (i.e. if we are straddling).  That
+            // occurs when (numContained < v) && (numContained > 0)
+			for (v = 0; (v < 8) && ((numContained == v) || (numContained == 0)); ++v) {
+                // Unrolling these 3 if's into a switch decreases performance
+                // by about 2x
+				corner.x = (v & 1) ? hi.x : lo.x;
+				corner.y = (v & 2) ? hi.y : lo.y;
+				corner.z = (v & 4) ? hi.z : lo.z;
+        
+                if (finite) { // this branch is highly predictable
+                    if (plane[p].halfSpaceContainsFinite(corner)) {
+                        ++numContained;
+                    }
+                } else {
+                    if (plane[p].halfSpaceContains(corner)) {
+                        ++numContained;
+                    }
+                }
+			}
+
+			if (numContained == 0) {
+				// Plane p culled the box
+				cullingPlane = p;
+
+                // The caller should not recurse into the children,
+                // since the parent is culled.  If they do recurse,
+                // make them only test against this one plane, which
+                // will immediately cull the volume.
+                childMask = 1 << p;
+				return true;
+
+            } else if (numContained < v) {
+                // The bounding volume straddled the plane; we have
+                // to keep testing against this plane
+                childMask |= (1 << p);
+            }
+		}
+
+        // Move on to the next bit.
+		inMask = inMask >> 1;
+    }
+
+    // None of the planes could cull this box
+	cullingPlane = -1;
+    return false;
+}
+
+
+bool AABox::culledBy(
+    const Array& plane,
+	int&				cullingPlane,
+	const uint32		_inMask) const {
+
+	uint32 inMask = _inMask;
+	assert(plane.size() < 31);
+    
+    const bool finite = 
+        (abs(lo.x) < G3D::finf()) &&
+        (abs(hi.x) < G3D::finf()) &&
+        (abs(lo.y) < G3D::finf()) &&
+        (abs(hi.y) < G3D::finf()) &&
+        (abs(lo.z) < G3D::finf()) &&
+        (abs(hi.z) < G3D::finf());
+
+    // See if there is one plane for which all of the
+	// vertices are in the negative half space.
+    for (int p = 0; p < plane.size(); ++p) {
+
+		// Only test planes that are not masked
+		if ((inMask & 1) != 0) {
+		
+			bool culled = true;
+			Vector3 corner;
+
+            int v;
+
+			// Assume this plane culls all points.  See if there is a point
+			// not culled by the plane... early out when at least one point
+            // is in the positive half space.
+			for (v = 0; (v < 8) && culled; ++v) {
+
+                // Unrolling these 3 if's into a switch decreases performance
+                // by about 2x
+				corner.x = (v & 1) ? hi.x : lo.x;
+				corner.y = (v & 2) ? hi.y : lo.y;
+				corner.z = (v & 4) ? hi.z : lo.z;
+        
+                if (finite) { // this branch is highly predictable
+                    culled = ! plane[p].halfSpaceContainsFinite(corner);
+                } else {
+                    culled = ! plane[p].halfSpaceContains(corner);
+                }
+			}
+
+			if (culled) {
+				// Plane p culled the box
+				cullingPlane = p;
+
+				return true;
+            }
+		}
+
+        // Move on to the next bit.
+		inMask = inMask >> 1;
+    }
+
+    // None of the planes could cull this box
+	cullingPlane = -1;
+    return false;
+}
+
+
+bool AABox::intersects(const class Sphere& sphere) const {
+    double d = 0; 
+
+    //find the square of the distance
+    //from the sphere to the box
+    for (int i = 0; i < 3; ++i) {
+        if (sphere.center[i] < lo[i]) {
+            d += square(sphere.center[i] - lo[i]);
+        } else if (sphere.center[i] > hi[i]) {
+            d += square(sphere.center[i] - hi[i]);
+        }
+    }
+
+    return d <= square(sphere.radius);
+}
+
+Vector3 AABox::corner(int index) const {
+
+    // default constructor inits all components to 0
+    Vector3 v;
+
+    switch (index)
+    {
+    case 0:
+        v.x = lo.x;
+        v.y = lo.y;
+        v.z = hi.z;
+        break;
+
+    case 1:
+        v.x = hi.x;
+        v.y = lo.y;
+        v.z = hi.z;
+        break;
+
+    case 2:
+        v.x = hi.x;
+        v.y = hi.y;
+        v.z = hi.z;
+        break;
+
+    case 3:
+        v.x = lo.x;
+        v.y = hi.y;
+        v.z = hi.z;
+        break;
+
+    case 4:
+        v.x = lo.x;
+        v.y = lo.y;
+        v.z = lo.z;
+        break;
+
+    case 5:
+        v.x = hi.x;
+        v.y = lo.y;
+        v.z = lo.z;
+        break;
+
+    case 6:
+        v.x = hi.x;
+        v.y = hi.y;
+        v.z = lo.z;
+        break;
+
+    case 7:
+        v.x = lo.x;
+        v.y = hi.y;
+        v.z = lo.z;
+        break;
+
+    default:
+        debugAssertM(false, "Invalid corner index");
+        break;
+    }
+
+    return v;
+}
+
+
+}
diff --git a/externals/g3dlite/Any.cpp b/externals/g3dlite/Any.cpp
new file mode 100644
index 00000000000..de4d32e83ea
--- /dev/null
+++ b/externals/g3dlite/Any.cpp
@@ -0,0 +1,1237 @@
+/**
+ @file Any.cpp
+
+ @author Morgan McGuire
+ @author Shawn Yarbrough
+  
+ @created 2006-06-11
+ @edited  2009-11-15
+
+ Copyright 2000-2009, Morgan McGuire.
+ All rights reserved.
+ */
+
+#include "G3D/Any.h"
+#include "G3D/TextOutput.h"
+#include "G3D/TextInput.h"
+#include "G3D/stringutils.h"
+#include 
+#include 
+
+namespace G3D {
+
+void Any::beforeRead() const {
+    if (isPlaceholder()) {
+        // Tried to read from a placeholder--throw an exception as if
+        // the original operator[] had failed.
+        KeyNotFound e;
+        alwaysAssertM(m_data, "Corrupt placeholder");
+
+        e.filename  = m_data->source.filename;
+        e.line      = m_data->source.line;
+        e.character = m_data->source.character;
+        e.key       = m_placeholderName;
+        e.message   = 
+            "This exception may have been thrown later than "
+            "the actual operator[] invocation.";
+
+        throw e;
+    } 
+}
+
+   
+Any::Data* Any::Data::create(const Data* d) {
+    Data* p = create(d->type);
+
+    p->comment = d->comment;
+    p->name = d->name;
+
+    switch (d->type) {
+    case NONE:
+    case BOOLEAN:
+    case NUMBER:
+        // No clone needed
+        break;
+
+    case STRING:
+        *(p->value.s) = *(d->value.s);
+        break;
+
+    case ARRAY:
+        *(p->value.a) = *(d->value.a);
+        break;
+
+    case TABLE:
+        *(p->value.t) = *(d->value.t);
+        // Note that placeholders may be copied; that is ok--they are still
+        // just placeholders.
+        break;
+    }
+
+    return p;
+}
+
+
+Any::Data* Any::Data::create(Any::Type t) {
+    size_t s = sizeof(Data);
+
+    switch (t) {
+    case NONE:
+    case BOOLEAN:
+    case NUMBER:
+        // No extra space needed
+        break;
+
+    case STRING:
+        s += sizeof(std::string);
+        break;
+
+    case ARRAY:
+        s += sizeof(AnyArray);
+        break;
+
+    case TABLE:
+        s += sizeof(AnyTable);
+        break;
+    }
+
+    // Allocate the data object
+    Data* p = new (MemoryManager::create()->alloc(s)) Data(t);
+
+    // Create the (empyt) value object at the end of the Data object
+    switch (t) {
+    case NONE:
+    case BOOLEAN:
+    case NUMBER:
+        // No value
+        break;
+
+    case STRING:
+        p->value.s = new (p + 1) std::string();
+        break;
+
+    case ARRAY:
+        p->value.a = new (p + 1) AnyArray();
+        break;
+
+    case TABLE:
+        p->value.t = new (p + 1) AnyTable();
+        break;
+    }    
+
+    return p;
+}
+
+
+void Any::Data::destroy(Data* d) {
+    if (d != NULL) {
+        d->~Data();
+        MemoryManager::create()->free(d);
+    }
+}
+
+
+Any::Data::~Data() {
+    debugAssertM(referenceCount.value() <= 0, "Deleted while still referenced.");
+
+    // Destruct but do not deallocate children
+    switch (type) {
+    case STRING:
+        debugAssert(value.s != NULL);
+        value.s->~basic_string();
+        break;
+
+    case ARRAY:
+        debugAssert(value.a != NULL);
+        value.a->~Array();
+        break;
+
+    case TABLE:
+        debugAssert(value.t != NULL);
+        value.t->~Table();
+        break;
+
+    default:
+        // All other types should have a NULL value pointer (i.e., they were used just for name and comment fields)
+        debugAssertM(value.s == NULL, "Corrupt Any::Data::Value");
+    }
+
+    value.s = NULL;
+}
+
+
+//////////////////////////////////////////////////////////////
+
+bool Any::containsKey(const std::string& x) const {
+    beforeRead();
+    verifyType(TABLE);
+
+    Any* a = m_data->value.t->getPointer(x);
+
+    // Don't return true for placeholder objects
+    return (a != NULL) && (! a->isPlaceholder());
+}
+
+
+void Any::dropReference() {
+    if (m_data && m_data->referenceCount.decrement() <= 0) {
+        // This was the last reference to the shared data
+        Data::destroy(m_data);
+    }
+    m_data = NULL;
+}
+
+
+void Any::ensureMutable() {
+    if (m_data && (m_data->referenceCount.value() >= 1)) {
+        // Copy the data.  We must do this before dropping the reference
+        // to avoid a race condition
+        Data* d = Data::create(m_data);
+        dropReference();
+        m_data = d;
+    }
+}
+
+
+Any::Any() : m_type(NONE), m_data(NULL) {
+}
+
+
+Any::Any(TextInput& t) : m_type(NONE), m_data(NULL) {
+    deserialize(t);
+}
+
+
+Any::Any(const Any& x) : m_type(NONE), m_data(NULL) {
+    x.beforeRead();
+    *this = x;
+}
+
+
+Any::Any(double x) : m_type(NUMBER), m_simpleValue(x), m_data(NULL) {
+}
+
+
+#ifdef G3D_32BIT
+Any::Any(int64 x) : m_type(NUMBER), m_simpleValue((double)x), m_data(NULL) {
+}
+#endif    // G3D_32BIT
+
+
+Any::Any(long x) : m_type(NUMBER), m_simpleValue((double)x), m_data(NULL) {
+}
+
+
+Any::Any(int x) : m_type(NUMBER), m_simpleValue((double)x), m_data(NULL) {
+}
+
+
+Any::Any(short x) : m_type(NUMBER), m_simpleValue((double)x), m_data(NULL) {
+}
+
+
+Any::Any(bool x) : m_type(BOOLEAN), m_simpleValue(x), m_data(NULL) {
+}
+
+
+Any::Any(const std::string& s) : m_type(STRING), m_data(Data::create(STRING)) {
+    *(m_data->value.s) = s;
+}
+
+
+Any::Any(const char* s) : m_type(STRING), m_data(NULL) {
+    if (s == NULL) {
+        m_type = NONE;
+    } else {
+        ensureData();
+        *(m_data->value.s) = s;
+    }
+}
+
+
+Any::Any(Type t, const std::string& name) : m_type(t), m_data(NULL) {
+    alwaysAssertM(t == ARRAY || t == TABLE, "Can only create ARRAY or TABLE from Type enum.");
+
+    ensureData();
+    if (name != "") {
+        m_data->name = name;
+    }
+}
+
+
+Any::~Any() {
+    dropReference();
+}
+
+
+void Any::beforeWrite() {
+    if (isPlaceholder()) {
+        // This is no longer a placeholder
+        m_placeholderName = "";
+    }
+}
+
+Any& Any::operator=(const Any& x) {
+    x.beforeRead();
+
+    if (this == &x) {
+        return *this;
+    }
+
+    beforeWrite();
+
+    dropReference();
+
+    m_type        = x.m_type;
+    m_simpleValue = x.m_simpleValue;
+
+    if (x.m_data != NULL) {
+        x.m_data->referenceCount.increment();
+        m_data = x.m_data;
+    }
+
+    return *this;
+}
+
+
+Any& Any::operator=(double x) {
+    *this = Any(x);
+    return *this;
+}
+
+
+Any& Any::operator=(int x) {
+    return (*this = Any(x));
+}
+
+
+Any& Any::operator=(bool x) {
+    *this = Any(x);
+    return *this;
+}
+
+
+Any& Any::operator=(const std::string& x) {
+    *this = Any(x);
+    return *this;
+}
+
+
+Any& Any::operator=(const char* x) {
+    *this = Any(x);
+    return *this;
+}
+
+
+Any& Any::operator=(Type t) {
+    switch (t) {
+    case NONE:  
+        *this = Any();
+        break;
+
+    case TABLE: 
+    case ARRAY: 
+        *this = Any(t);
+        break;
+
+    default:
+        alwaysAssertM(false, "Can only assign NONE, TABLE, or ARRAY Type enum.");
+    }
+
+    return *this;
+}
+
+
+Any::Type Any::type() const {
+    beforeRead();
+    return m_type;
+}
+
+
+const std::string& Any::comment() const {
+    beforeRead();
+
+    static const std::string blank;
+    if (m_data != NULL) {
+        return m_data->comment;
+    } else {
+        return blank;
+    }
+}
+
+
+void Any::setComment(const std::string& c) {
+    beforeRead();
+    ensureData();
+    m_data->comment = c;
+}
+
+
+bool Any::isNone() const {
+    beforeRead();
+    return (m_type == NONE);
+}
+
+
+double Any::number() const {
+    beforeRead();
+    verifyType(NUMBER);
+    return m_simpleValue.n;
+}
+
+
+const std::string& Any::string() const {
+    beforeRead();
+    verifyType(STRING);
+    return *(m_data->value.s);
+}
+
+
+bool Any::boolean() const {
+    beforeRead();
+    verifyType(BOOLEAN);
+    return m_simpleValue.b;
+}
+
+
+const std::string& Any::name() const {
+    beforeRead();
+    static const std::string blank;
+    if (m_data != NULL) {
+        return m_data->name;
+    } else {
+        return blank;
+    }
+}
+
+
+void Any::setName(const std::string& n) {
+    beforeRead();
+    ensureData();
+    m_data->name = n;
+}
+
+
+int Any::size() const {
+    beforeRead();
+    verifyType(ARRAY, TABLE);
+    switch (m_type) {
+    case TABLE:
+        return m_data->value.t->size();
+
+    case ARRAY:
+        return m_data->value.a->size();
+
+    default:;
+        return 0;
+    } // switch (m_type)
+}
+
+
+int Any::length() const {
+    beforeRead();
+    return size();
+}
+
+
+void Any::resize(int n) {
+    beforeRead();
+    alwaysAssertM(n >= 0, "Cannot resize less than 0.");
+    verifyType(ARRAY);
+    m_data->value.a->resize(n);
+}
+
+
+void Any::clear() {
+    beforeRead();
+    verifyType(ARRAY, TABLE);
+    switch (m_type) {
+    case ARRAY:
+        m_data->value.a->clear();
+        break;
+
+    case TABLE:
+        m_data->value.t->clear();
+        break;
+
+    default:;
+    }
+}
+
+
+const Any& Any::operator[](int i) const {
+    beforeRead();
+    verifyType(ARRAY);
+    debugAssert(m_data != NULL);
+    Array& array = *(m_data->value.a);
+    return array[i];
+}
+
+
+Any& Any::next() {
+    beforeRead();
+    verifyType(ARRAY);
+    int n = size();
+    resize(n + 1);
+    return (*this)[n];
+}
+
+
+Any& Any::operator[](int i) {
+    beforeRead();
+    verifyType(ARRAY);
+    debugAssert(m_data != NULL);
+    Array& array = *(m_data->value.a);
+    return array[i];
+}
+
+
+const Array& Any::array() const {
+    beforeRead();
+    verifyType(ARRAY);
+    debugAssert(m_data != NULL);
+    return *(m_data->value.a);
+}
+
+
+void Any::append(const Any& x0) {
+    beforeRead();
+    verifyType(ARRAY);
+    debugAssert(m_data != NULL);
+    m_data->value.a->append(x0);
+}
+
+
+void Any::append(const Any& x0, const Any& x1) {
+    beforeRead();
+    append(x0);
+    append(x1);
+}
+
+
+void Any::append(const Any& x0, const Any& x1, const Any& x2) {
+    beforeRead();
+    append(x0);
+    append(x1);
+    append(x2);
+}
+
+
+void Any::append(const Any& x0, const Any& x1, const Any& x2, const Any& x3) {
+    beforeRead();
+    append(x0);
+    append(x1);
+    append(x2);
+    append(x3);
+}
+
+
+const Table& Any::table() const {
+    beforeRead();
+    verifyType(TABLE);
+    debugAssert(m_data != NULL);
+    return *(m_data->value.t);
+}
+
+
+const Any& Any::operator[](const std::string& x) const {
+    beforeRead();
+    verifyType(TABLE);
+    debugAssert(m_data != NULL);
+    const Table& table = *(m_data->value.t);
+    Any* value = table.getPointer(x);
+    if (value == NULL) {
+        KeyNotFound e;
+        if (m_data) {
+            e.filename  = m_data->source.filename;
+            e.line      = m_data->source.line;
+            e.character = m_data->source.character;
+        }
+        e.key = x;
+        throw e;
+    }
+    return *value;
+}
+
+
+Any& Any::operator[](const std::string& key) {
+    beforeRead();
+    verifyType(TABLE);
+
+    bool created = false;
+    Any& value = m_data->value.t->getCreate(key, created);
+
+    if (created) {
+        // The entry was created by this method; do not allow it to be
+        // read before it is written.
+        value.m_placeholderName = key;
+
+        // Write source data for the value
+        value.ensureData();
+        value.m_data->source = source();
+    }
+
+    return value;
+}
+
+
+void Any::set(const std::string& k, const Any& v) {
+    beforeRead();
+    v.beforeRead();
+    verifyType(TABLE);
+    debugAssert(m_data != NULL);
+    Table& table = *(m_data->value.t);
+    table.set(k, v);
+}
+
+
+const Any& Any::get(const std::string& x, const Any& defaultVal) const {
+    beforeRead();
+    defaultVal.beforeRead();
+    try {
+        return operator[](x);
+    } catch(KeyNotFound) {
+        return defaultVal;
+    }
+}
+
+
+bool Any::operator==(const Any& x) const {
+    beforeRead();
+    x.beforeRead();
+    if (m_type != x.m_type) {
+        return false;
+    }
+
+    switch (m_type) {
+    case NONE:
+        return true;
+
+    case BOOLEAN:
+        return (m_simpleValue.b == x.m_simpleValue.b);
+
+    case NUMBER:
+        return (m_simpleValue.n == x.m_simpleValue.n);
+
+    case STRING:
+        debugAssert(m_data != NULL);
+        return (*(m_data->value.s) == *(x.m_data->value.s));
+
+    case TABLE: {
+        if (size() != x.size()) {
+            return false;
+        }
+        debugAssert(m_data != NULL);
+        if (m_data->name != x.m_data->name) {
+            return false;
+        }
+        Table& cmptable  = *(  m_data->value.t);
+        Table& xcmptable = *(x.m_data->value.t);
+        for (Table::Iterator it1 = cmptable.begin(), it2 = xcmptable.begin();
+             it1 != cmptable.end() && it2 != xcmptable.end();
+             ++it1, ++it2) {
+             if (*it1 != *it2) {
+                return false;
+             }
+        }
+        return true;
+    }
+
+    case ARRAY: {
+        if (size() != x.size()) {
+            return false;
+        }
+        debugAssert(m_data != NULL);
+        if (m_data->name != x.m_data->name) {
+            return false;
+        }
+
+        Array& cmparray  = *(  m_data->value.a);
+        Array& xcmparray = *(x.m_data->value.a);
+
+        for (int ii = 0; ii < size(); ++ii) {
+            if (cmparray[ii] != xcmparray[ii]) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    default:
+        alwaysAssertM(false, "Unknown type.");
+        return false;
+    }    // switch (m_type)
+
+}
+
+
+bool Any::operator!=(const Any& x) const {
+    beforeRead();
+    x.beforeRead();
+    return !operator==(x);
+}
+
+
+static void getDeserializeSettings(TextInput::Settings& settings) {
+    settings.cppBlockComments = true;
+    settings.cppLineComments = true;
+    settings.otherLineComments = true;
+    settings.otherCommentCharacter = '#';
+    settings.generateCommentTokens = true;
+    settings.singleQuotedStrings = false;
+    settings.msvcSpecials = false;
+    settings.caseSensitive = false;
+}
+
+
+std::string Any::unparse() const {
+    beforeRead();
+    TextOutput::Settings settings;
+    TextOutput to(settings);
+    serialize(to);
+    return to.commitString();
+}
+
+
+void Any::parse(const std::string& src) {
+    beforeRead();
+    TextInput::Settings settings;
+    getDeserializeSettings(settings);
+
+    TextInput ti(TextInput::FROM_STRING, src, settings);
+    deserialize(ti);
+}
+
+
+void Any::load(const std::string& filename) {
+    beforeRead();
+    TextInput::Settings settings;
+    getDeserializeSettings(settings);
+
+    TextInput ti(filename, settings);
+    deserialize(ti);
+}
+
+
+void Any::save(const std::string& filename) const {
+    beforeRead();
+    TextOutput::Settings settings;
+    settings.wordWrap = TextOutput::Settings::WRAP_NONE;
+
+    TextOutput to(filename,settings);
+    serialize(to);
+    to.commit();
+}
+
+
+static bool needsQuotes(const std::string& s) {
+    if (! isLetter(s[0]) && (s[0] != '_')) {
+        return true;
+    }
+
+    for (int i = 0; i < (int)s.length(); ++i) {
+        char c = s[i];
+        
+        // peek character
+        char p = (i == (int)s.length() - 1) ? '_' : s[i + 1];
+
+        // Identify separators
+        if ((c == '-' && p == '>') ||
+            (c == ':' && p == ':')) {            
+            // Skip over this symbol
+            ++i;
+            continue;
+        }
+
+        if (! isDigit(c) && ! isLetter(c) & (c != '.')) {
+            // This is an illegal character for an identifier, so we need quotes
+            return true;
+        }
+    }
+
+    return false;
+}
+
+
+// TODO: if the output will fit on one line, compress tables and arrays into a single line
+void Any::serialize(TextOutput& to) const {
+    beforeRead();
+    if (m_data && ! m_data->comment.empty()) {
+        to.printf("\n/* %s */\n", m_data->comment.c_str());
+    }
+
+    switch (m_type) {
+    case NONE:
+        to.writeSymbol("NONE");
+        break;
+
+    case BOOLEAN:
+        to.writeBoolean(m_simpleValue.b);
+        break;
+
+    case NUMBER:
+        to.writeNumber(m_simpleValue.n);
+        break;
+
+    case STRING:
+        debugAssert(m_data != NULL);
+        to.writeString(*(m_data->value.s));
+        break;
+
+    case TABLE: {
+        debugAssert(m_data != NULL);
+        if (! m_data->name.empty()) {
+            if (needsQuotes(m_data->name)) {
+                to.writeString(m_data->name);
+            } else {
+                to.writeSymbol(m_data->name);
+            }
+        }
+        to.writeSymbol("{");
+        to.writeNewline();
+        to.pushIndent();
+        AnyTable& table = *(m_data->value.t);
+        Array keys;
+        table.getKeys(keys);
+        keys.sort();
+
+        for (int i = 0; i < keys.size(); ++i) {
+
+            to.writeSymbol(keys[i]);
+            to.writeSymbol("=");
+            table[keys[i]].serialize(to);
+
+            if (i < keys.size() - 1) {
+                to.writeSymbol(",");
+            }
+            to.writeNewline();
+
+            // Skip a line between table entries
+            to.writeNewline();
+        }
+
+        to.popIndent();
+        to.writeSymbol("}");
+        break;
+    }
+
+    case ARRAY: {
+        debugAssert(m_data != NULL);
+        if (! m_data->name.empty()) {
+            // For arrays, leave no trailing space between the name and the paren
+            to.writeSymbol(format("%s(", m_data->name.c_str()));
+        } else {
+            to.writeSymbol("(");
+        }
+        to.writeNewline();
+        to.pushIndent();
+        Array& array = *(m_data->value.a);
+        for (int ii = 0; ii < size(); ++ii) {
+            array[ii].serialize(to);
+            if (ii < size() - 1) {
+                to.writeSymbol(",");
+                to.writeNewline();
+            }
+            
+            // Put the close paren on an array right behind the last element
+        }
+        to.popIndent();
+        to.writeSymbol(")");
+        break;
+    }
+    }
+}
+
+
+void Any::deserializeComment(TextInput& ti, Token& token, std::string& comment) {
+    // Parse comments
+    while (token.type() == Token::COMMENT) {
+        comment += trimWhitespace(token.string()) + "\n";
+
+        // Allow comments to contain newlines.
+        do {
+            token = ti.read();
+            comment += "\n";
+        } while (token.type() == Token::NEWLINE);
+    }
+
+    comment = trimWhitespace(comment);
+}
+
+/** True if \a c is an open paren of some form */
+static bool isOpen(const char c) {
+    return c == '(' || c == '[' || c == '{';
+}
+
+
+/** True if \a c is an open paren of some form */
+static bool isClose(const char c) {
+    return c == ')' || c == ']' || c == '}';
+}
+
+
+/** True if \a s is a C++ name operator */
+static bool isNameOperator(const std::string& s) {
+    return s == "." || s == "::" || s == "->";
+}
+
+
+void Any::deserializeName(TextInput& ti, Token& token, std::string& name) {
+    debugAssert(token.type() == Token::SYMBOL);
+    std::string s = token.string();
+    while (! isOpen(s[0])) {
+        name += s;
+
+        // Skip newlines and comments
+        token = ti.readSignificant();
+
+        if (token.type() != Token::SYMBOL) {
+            throw ParseError(ti.filename(), token.line(), token.character(), 
+                "Expected symbol while parsing Any");
+        }
+        s = token.string();
+    }
+}
+
+
+void Any::deserialize(TextInput& ti) {
+    beforeRead();
+    Token token = ti.read();
+    deserialize(ti, token);
+    // Restore the last token
+    ti.push(token);
+}
+
+
+void Any::deserialize(TextInput& ti, Token& token) {
+    // Deallocate old data
+    dropReference();
+    m_type = NONE;
+    m_simpleValue.b = false;
+
+    // Skip leading newlines
+    while (token.type() == Token::NEWLINE) {
+        token = ti.read();
+    } 
+
+    std::string comment;
+    if (token.type() == Token::COMMENT) {
+        deserializeComment(ti, token, comment);
+    }
+
+    if (token.type() == Token::END) {
+        // There should never be a comment without an Any following it; even
+        // if the file ends with some commented out stuff,
+        // that should not happen after a comma, so we'd never read that 
+        // far in a proper file.
+        throw ParseError(ti.filename(), token.line(), token.character(), 
+            "File ended without a properly formed Any");
+    }
+
+    switch (token.type()) {
+    case Token::STRING:
+        m_type = STRING;
+        ensureData();
+        *(m_data->value.s) = token.string();
+        m_data->source.set(ti, token);
+        break;
+
+    case Token::NUMBER:
+        m_type = NUMBER;
+        m_simpleValue.n = token.number();
+        ensureData();
+        m_data->source.set(ti, token);
+        break;
+
+    case Token::BOOLEAN:
+        m_type = BOOLEAN;
+        m_simpleValue.b = token.boolean();
+        ensureData();
+        m_data->source.set(ti, token);
+        break;
+
+    case Token::SYMBOL:
+        // Named Array, Named Table, Array, Table, or NONE
+        if (toUpper(token.string()) == "NONE") {
+            // Nothing left to do; we initialized to NONE originally
+            ensureData();
+            m_data->source.set(ti, token);
+        } else {
+            // Array or Table
+
+            // Parse the name
+
+            // s must have at least one element or this would not have
+            // been parsed as a symbol
+            std::string name;
+            deserializeName(ti, token, name);
+            if (token.type() != Token::SYMBOL) {
+                throw ParseError(ti.filename(), token.line(), token.character(), 
+                    "Malformed Any TABLE or ARRAY; must start with [, (, or {");
+            }
+
+            if (isOpen(token.string()[0])) {
+                // Array or table
+                deserializeBody(ti, token);
+            } else {
+                throw ParseError(ti.filename(), token.line(), token.character(), 
+                    "Malformed Any TABLE or ARRAY; must start with [, (, or {");
+            }
+
+            if (! name.empty()) {
+                ensureData();
+                m_data->name = name;
+            }
+        } // if NONE
+        break;
+
+    default:
+        throw ParseError(ti.filename(), token.line(), token.character(), 
+            "Unexpected token");
+
+    } // switch
+
+    if (! comment.empty()) {
+        ensureData();
+        m_data->comment = comment;
+    }
+
+    if (m_type != ARRAY && m_type != TABLE) {
+        // Array and table already consumed their last token
+        token = ti.read();
+    }
+}
+
+
+void Any::ensureData() {
+    if (m_data == NULL) {
+        m_data = Data::create(m_type);
+    }
+}
+
+
+static bool isSeparator(char c) {
+    return c == ',' || c == ';';
+}
+
+
+void Any::readUntilCommaOrClose(TextInput& ti, Token& token) {
+    while (! ((token.type() == Token::SYMBOL) && 
+              (isClose(token.string()[0])) || 
+               isSeparator(token.string()[0]))) {
+        switch (token.type()) {
+        case Token::NEWLINE:
+        case Token::COMMENT:
+            // Consume
+            token = ti.read();
+            break;
+
+        default:
+            throw ParseError(ti.filename(), token.line(), token.character(), 
+                "Expected a comma or close paren");
+        }
+    }
+}
+
+
+void Any::deserializeBody(TextInput& ti, Token& token) {
+    char closeSymbol = '}';
+    m_type = TABLE;
+    
+    const char c = token.string()[0];
+    
+    if (c != '{') {
+        m_type = ARRAY;
+        // Chose the appropriate close symbol
+        closeSymbol = (c == '(') ? ')' : ']';
+    }
+
+    // Allocate the underlying data structure
+    ensureData();
+    m_data->source.set(ti, token);
+
+    // Consume the open token
+    token = ti.read();
+
+    while (! ((token.type() == Token::SYMBOL) && (token.string()[0] == closeSymbol))) {
+
+        // Read any leading comment.  This must be done here (and not in the recursive deserialize
+        // call) in case the body contains only a comment.
+        std::string comment;
+        deserializeComment(ti, token, comment);
+
+        if ((token.type() == Token::SYMBOL) && (token.string()[0] == closeSymbol)) {
+            // We're done; this catches the case where the array is empty
+            break;
+        }
+
+        // Pointer the value being read
+        Any a = NULL;
+        std::string key;
+        
+        if (m_type == TABLE) {
+            // Read the key
+            if (token.type() != Token::SYMBOL && token.type() != Token::STRING) {
+                throw ParseError(ti.filename(), token.line(), token.character(), "Expected a name");
+            } 
+            
+            key = token.string();
+            // Consume everything up to the = sign
+            token = ti.readSignificant();
+
+            if ((token.type() != Token::SYMBOL) || (token.string() != "=")) {
+                throw ParseError(ti.filename(), token.line(), token.character(), "Expected =");
+            } else {
+                // Consume (don't consume comments--we want the value pointed to by a to get those).
+                token = ti.read();
+            }
+        }
+        a.deserialize(ti, token);
+
+        if (! comment.empty()) {
+            // Prepend the comment we read earlier
+            a.ensureData();
+            a.m_data->comment = trimWhitespace(comment + "\n" + a.m_data->comment);
+        }
+        
+        if (m_type == TABLE) {
+            set(key, a);
+        } else {
+            append(a);
+        }
+
+        // Read until the comma or close paren, discarding trailing comments and newlines
+        readUntilCommaOrClose(ti, token);
+
+        // Consume the comma
+        if (isSeparator(token.string()[0])) {
+            token = ti.read();
+        }
+    }
+
+    // Consume the close paren (to match other deserialize methods)
+    token = ti.read();
+}
+
+
+Any::operator int() const {
+    beforeRead();
+    return iRound(number());
+}
+
+
+Any::operator float() const {
+    beforeRead();
+    return float(number());
+}
+
+
+Any::operator double() const {
+    beforeRead();
+    return number();
+}
+
+
+Any::operator bool() const {
+    beforeRead();
+    return boolean();
+}
+
+
+Any::operator std::string() const {
+    beforeRead();
+    return string();
+}
+
+
+const Any::Source& Any::source() const {
+    static Source s;
+    if (m_data) {
+        return m_data->source;
+    } else {
+        return s;
+    }
+}
+
+
+void Any::verify(bool value, const std::string& message) const {
+    beforeRead();
+    if (! value) {
+        ParseError p;
+        if (m_data) {
+            p.filename  = m_data->source.filename;
+            p.line      = m_data->source.line;
+            p.character = m_data->source.character;
+        }
+
+        if (name().empty()) {
+            p.message = "Parse error";
+        } else {
+            p.message = "Parse error while reading the contents of " + name();
+        }
+
+        if (! message.empty()) {
+            p.message = p.message + ": " + message;
+        }
+
+        throw p;
+    }
+}
+
+
+void Any::verifyName(const std::string& n) const {
+    beforeRead();
+    verify(beginsWith(toUpper(name()), toUpper(n)), "Name must begin with " + n);
+}
+
+
+void Any::verifyType(Type t) const {
+    beforeRead();
+    if (type() != t) {
+        verify(false, "Must have type " + toString(t));
+    }
+}
+
+
+void Any::verifyType(Type t0, Type t1) const {
+    beforeRead();
+    if (type() != t0 && type() != t1) {
+        verify(false, "Must have type " + toString(t0) + " or " + toString(t1));
+    }
+}
+
+
+void Any::verifySize(int low, int high) const {
+    beforeRead();
+    verifyType(ARRAY, TABLE);
+    if (size() < low || size() > high) {
+        verify(false, format("Size must be between %d and %d", low, high));
+    }
+}
+
+
+void Any::verifySize(int s) const {
+    beforeRead();
+    verifyType(ARRAY, TABLE);
+    if (size() != s) {
+        verify(false, format("Size must be %d", s));
+    }
+}
+
+
+std::string Any::toString(Type t) {
+    switch(t) {
+    case NONE:    return "NONE";
+    case BOOLEAN: return "BOOLEAN";
+    case NUMBER:  return "NUMBER";
+    case STRING:  return "STRING";
+    case ARRAY:   return "ARRAY";
+    case TABLE:   return "TABLE";
+    default:
+        alwaysAssertM(false, "Illegal Any::Type");
+        return "";
+    }
+}
+
+}    // namespace G3D
+
diff --git a/externals/g3dlite/BinaryFormat.cpp b/externals/g3dlite/BinaryFormat.cpp
new file mode 100644
index 00000000000..d3991378f45
--- /dev/null
+++ b/externals/g3dlite/BinaryFormat.cpp
@@ -0,0 +1,81 @@
+/**
+ @file BinaryFormat.cpp
+  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+
+  @created 2005-06-10
+  @edited  2005-06-10
+ */
+
+#include "G3D/BinaryFormat.h"
+
+namespace G3D {
+
+int32 byteSize(BinaryFormat f) {
+    switch (f) {
+    case BOOL8_BINFMT:
+    case UINT8_BINFMT:
+    case INT8_BINFMT:
+        return 1;
+
+    case UINT16_BINFMT:
+    case INT16_BINFMT:
+        return 2;
+
+    case FLOAT16_BINFMT:
+        return 2;
+
+    case UINT32_BINFMT:
+    case INT32_BINFMT:
+    case FLOAT32_BINFMT:
+        return 4;
+
+    case FLOAT64_BINFMT:
+    case UINT64_BINFMT:
+    case INT64_BINFMT:
+        return 8;
+
+    case INT128_BINFMT:
+    case UINT128_BINFMT:
+        return 16;
+
+    case VECTOR2_BINFMT:
+        return 2 * 4;
+
+    case VECTOR2INT16_BINFMT:
+        return 2 * 2;
+
+    case VECTOR3_BINFMT:
+        return 3 * 4;
+
+    case VECTOR3INT16_BINFMT:
+        return 3 * 2;
+
+    case VECTOR4_BINFMT:
+        return 4 * 4;
+
+    case VECTOR4INT16_BINFMT:
+        return 4 * 4;
+
+    case COLOR3_BINFMT:
+        return 3 * 4;
+
+    case COLOR3UINT8_BINFMT:
+        return 3 * 1;
+
+    case COLOR3INT16_BINFMT:
+        return 3 * 2;
+
+    case COLOR4_BINFMT:
+        return 4 * 4;
+
+    case COLOR4UINT8_BINFMT:
+        return 4 * 1;
+
+    case COLOR4INT16_BINFMT:
+        return 4 * 2;
+
+    default:
+        return -1;
+    }
+}
+}
diff --git a/externals/g3dlite/BinaryInput.cpp b/externals/g3dlite/BinaryInput.cpp
new file mode 100644
index 00000000000..65a9976fe04
--- /dev/null
+++ b/externals/g3dlite/BinaryInput.cpp
@@ -0,0 +1,568 @@
+/**
+ @file BinaryInput.cpp
+ 
+ @author Morgan McGuire, graphics3d.com
+ Copyright 2001-2007, Morgan McGuire.  All rights reserved.
+ 
+ @created 2001-08-09
+ @edited  2005-02-24
+
+
+  
+    {    
+    BinaryOutput b("c:/tmp/test.b", BinaryOutput::LITTLE_ENDIAN);
+
+    float f = 3.1415926;
+    int i = 1027221;
+    std::string s = "Hello World!";
+
+    b.writeFloat32(f);
+    b.writeInt32(i);
+    b.writeString(s);
+    b.commit();
+    
+
+    BinaryInput in("c:/tmp/test.b", BinaryInput::LITTLE_ENDIAN);
+
+    debugAssert(f == in.readFloat32());
+    int ii = in.readInt32();
+    debugAssert(i == ii);
+    debugAssert(s == in.readString());
+    }
+  

+ */
+
+#include "G3D/platform.h"
+#include "G3D/BinaryInput.h"
+#include "G3D/Array.h"
+#include "G3D/fileutils.h"
+#include "G3D/Log.h"
+#include 
+
+#include 
+
+namespace G3D {
+
+void BinaryInput::readBool8(std::vector& out, int64 n) {
+    out.resize((int)n);
+    // std::vector optimizes bool in a way that prevents fast reading
+    for (int64 i = 0; i < n ; ++i) {
+        out[i] = readBool8();
+    }
+}
+
+
+void BinaryInput::readBool8(Array& out, int64 n) {
+    out.resize(n);
+    readBool8(out.begin(), n);
+}
+
+
+#define IMPLEMENT_READER(ucase, lcase)\
+void BinaryInput::read##ucase(std::vector& out, int64 n) {\
+    out.resize(n);\
+    read##ucase(&out[0], n);\
+}\
+\
+\
+void BinaryInput::read##ucase(Array& out, int64 n) {\
+    out.resize(n);\
+    read##ucase(out.begin(), n);\
+}
+
+
+IMPLEMENT_READER(UInt8,   uint8)
+IMPLEMENT_READER(Int8,    int8)
+IMPLEMENT_READER(UInt16,  uint16)
+IMPLEMENT_READER(Int16,   int16)
+IMPLEMENT_READER(UInt32,  uint32)
+IMPLEMENT_READER(Int32,   int32)
+IMPLEMENT_READER(UInt64,  uint64)
+IMPLEMENT_READER(Int64,   int64)
+IMPLEMENT_READER(Float32, float32)
+IMPLEMENT_READER(Float64, float64)    
+
+#undef IMPLEMENT_READER
+
+// Data structures that are one byte per element can be 
+// directly copied, regardles of endian-ness.
+#define IMPLEMENT_READER(ucase, lcase)\
+void BinaryInput::read##ucase(lcase* out, int64 n) {\
+    if (sizeof(lcase) == 1) {\
+        readBytes(out, n);\
+    } else {\
+        for (int64 i = 0; i < n ; ++i) {\
+            out[i] = read##ucase();\
+        }\
+    }\
+}
+
+IMPLEMENT_READER(Bool8,   bool)
+IMPLEMENT_READER(UInt8,   uint8)
+IMPLEMENT_READER(Int8,    int8)
+
+#undef IMPLEMENT_READER
+
+
+#define IMPLEMENT_READER(ucase, lcase)\
+void BinaryInput::read##ucase(lcase* out, int64 n) {\
+    if (m_swapBytes) {\
+        for (int64 i = 0; i < n; ++i) {\
+            out[i] = read##ucase();\
+        }\
+    } else {\
+        readBytes(out, sizeof(lcase) * n);\
+    }\
+}
+
+
+IMPLEMENT_READER(UInt16,  uint16)
+IMPLEMENT_READER(Int16,   int16)
+IMPLEMENT_READER(UInt32,  uint32)
+IMPLEMENT_READER(Int32,   int32)
+IMPLEMENT_READER(UInt64,  uint64)
+IMPLEMENT_READER(Int64,   int64)
+IMPLEMENT_READER(Float32, float32)
+IMPLEMENT_READER(Float64, float64)    
+
+#undef IMPLEMENT_READER
+
+void BinaryInput::loadIntoMemory(int64 startPosition, int64 minLength) {
+    // Load the next section of the file
+    debugAssertM(m_filename != "", "Read past end of file.");
+
+    int64 absPos = m_alreadyRead + m_pos;
+
+    if (m_bufferLength < minLength) {
+        // The current buffer isn't big enough to hold the chunk we want to read.
+        // This happens if there was little memory available during the initial constructor
+        // read but more memory has since been freed.
+        m_bufferLength = minLength;
+        debugAssert(m_freeBuffer);
+        m_buffer = (uint8*)System::realloc(m_buffer, m_bufferLength);
+        if (m_buffer == NULL) {
+            throw "Tried to read a larger memory chunk than could fit in memory. (2)";
+        }
+    }
+
+    m_alreadyRead = startPosition;
+
+#   ifdef G3D_WIN32
+        FILE* file = fopen(m_filename.c_str(), "rb");
+        debugAssert(file);
+        int ret = fseek(file, (off_t)m_alreadyRead, SEEK_SET);
+        debugAssert(ret == 0);
+        size_t toRead = (size_t)G3D::min(m_bufferLength, m_length - m_alreadyRead);
+        ret = fread(m_buffer, 1, toRead, file);
+        debugAssert(ret == toRead);
+        fclose(file);
+        file = NULL;
+    
+#   else
+        FILE* file = fopen(m_filename.c_str(), "rb");
+        debugAssert(file);
+        int ret = fseeko(file, (off_t)m_alreadyRead, SEEK_SET);
+        debugAssert(ret == 0);
+        size_t toRead = (size_t)G3D::min(m_bufferLength, m_length - m_alreadyRead);
+        ret = fread(m_buffer, 1, toRead, file);
+        debugAssert((size_t)ret == (size_t)toRead);
+        fclose(file);
+        file = NULL;
+#   endif
+
+    m_pos = absPos - m_alreadyRead;
+    debugAssert(m_pos >= 0);
+}
+
+
+
+const bool BinaryInput::NO_COPY = false;
+    
+static bool needSwapBytes(G3DEndian fileEndian) {
+    return (fileEndian != System::machineEndian());
+}
+
+
+/** Helper used by the constructors for decompression */
+static uint32 readUInt32(const uint8* data, bool swapBytes) {
+    if (swapBytes) {
+        uint8 out[4];
+        out[0] = data[3];
+        out[1] = data[2];
+        out[2] = data[1];
+        out[3] = data[0];
+        return *((uint32*)out);
+    } else {
+        return *((uint32*)data);
+    }
+}
+
+
+void BinaryInput::setEndian(G3DEndian e) {
+    m_fileEndian = e;
+    m_swapBytes = needSwapBytes(m_fileEndian);
+}
+
+
+BinaryInput::BinaryInput(
+    const uint8*        data,
+    int64               dataLen,
+    G3DEndian           dataEndian,
+    bool                compressed,
+    bool                copyMemory) :
+    m_filename(""),
+    m_bitPos(0),
+    m_bitString(0),
+    m_beginEndBits(0),
+    m_alreadyRead(0),
+    m_bufferLength(0),
+    m_pos(0) {
+
+    m_freeBuffer = copyMemory || compressed;
+
+    setEndian(dataEndian);
+
+    if (compressed) {
+        // Read the decompressed size from the first 4 bytes
+        m_length = G3D::readUInt32(data, m_swapBytes);
+
+        debugAssert(m_freeBuffer);
+        m_buffer = (uint8*)System::alignedMalloc(m_length, 16);
+
+        unsigned long L = m_length;
+        // Decompress with zlib
+        int64 result = uncompress(m_buffer, (unsigned long*)&L, data + 4, dataLen - 4);
+        m_length = L;
+        m_bufferLength = L;
+        debugAssert(result == Z_OK); (void)result;
+
+    } else {
+    	m_length = dataLen;
+        m_bufferLength = m_length;
+        if (! copyMemory) {
+ 	        debugAssert(!m_freeBuffer);
+            m_buffer = const_cast(data);
+        } else {
+	        debugAssert(m_freeBuffer);
+            m_buffer = (uint8*)System::alignedMalloc(m_length, 16);
+            System::memcpy(m_buffer, data, dataLen);
+        }
+    }
+}
+
+
+BinaryInput::BinaryInput(
+    const std::string&  filename,
+    G3DEndian           fileEndian,
+    bool                compressed) :
+    m_filename(filename),
+    m_bitPos(0),
+    m_bitString(0),
+    m_beginEndBits(0),
+    m_alreadyRead(0),
+    m_length(0),
+    m_bufferLength(0),
+    m_buffer(NULL),
+    m_pos(0),
+    m_freeBuffer(true) {
+
+    setEndian(fileEndian);
+
+    // Update global file tracker
+    _internal::currentFilesUsed.insert(m_filename);
+    
+
+    if (! fileExists(m_filename, false)) {
+        std::string zipfile;
+        std::string internalfile;
+        if (zipfileExists(m_filename, zipfile, internalfile)) {
+            // Load from zipfile
+            void* v;
+            size_t s;
+            zipRead(filename, v, s);
+            m_buffer = reinterpret_cast(v);
+            m_bufferLength = m_length = s;
+            if (compressed) {
+                decompress();
+            }
+            m_freeBuffer = true;
+        } else {
+            Log::common()->printf("Warning: File not found: %s\n", m_filename.c_str());
+        }
+        return;
+    }
+
+    // Figure out how big the file is and verify that it exists.
+    m_length = fileLength(m_filename);
+
+    // Read the file into memory
+    FILE* file = fopen(m_filename.c_str(), "rb");
+
+    if (! file || (m_length == -1)) {
+        throw format("File not found: \"%s\"", m_filename.c_str());
+        return;
+    }
+
+    if (! compressed && (m_length > INITIAL_BUFFER_LENGTH)) {
+        // Read only a subset of the file so we don't consume
+        // all available memory.
+        m_bufferLength = INITIAL_BUFFER_LENGTH;
+    } else {
+        // Either the length is fine or the file is compressed
+        // and requires us to read the whole thing for zlib.
+        m_bufferLength = m_length;
+    }
+
+    debugAssert(m_freeBuffer);
+    m_buffer = (uint8*)System::alignedMalloc(m_bufferLength, 16);
+    if (m_buffer == NULL) {
+        if (compressed) {
+            throw "Not enough memory to load compressed file. (1)";
+        }
+        
+        // Try to allocate a small array; not much memory is available.
+        // Give up if we can't allocate even 1k.
+        while ((m_buffer == NULL) && (m_bufferLength > 1024)) {
+            m_bufferLength /= 2;
+            m_buffer = (uint8*)System::alignedMalloc(m_bufferLength, 16);
+        }
+    }
+    debugAssert(m_buffer);
+    
+    fread(m_buffer, m_bufferLength, sizeof(int8), file);
+    fclose(file);
+    file = NULL;
+
+    if (compressed) {
+        if (m_bufferLength != m_length) {
+            throw "Not enough memory to load compressed file. (2)";
+        }
+
+        decompress();
+    }
+}
+
+void BinaryInput::decompress() {
+    // Decompress
+    // Use the existing buffer as the source, allocate
+    // a new buffer to use as the destination.
+    
+    int64 tempLength = m_length;
+    m_length = G3D::readUInt32(m_buffer, m_swapBytes);
+    
+    // The file couldn't have better than 500:1 compression
+    alwaysAssertM(m_length < m_bufferLength * 500, "Compressed file header is corrupted");
+    
+    uint8* tempBuffer = m_buffer;
+    m_buffer = (uint8*)System::alignedMalloc(m_length, 16);
+    
+    debugAssert(m_buffer);
+    debugAssert(isValidHeapPointer(tempBuffer));
+    debugAssert(isValidHeapPointer(m_buffer));
+    
+    unsigned long L = m_length;
+    int64 result = uncompress(m_buffer, &L, tempBuffer + 4, tempLength - 4);
+    m_length = L;
+    m_bufferLength = m_length;
+    
+    debugAssertM(result == Z_OK, "BinaryInput/zlib detected corruption in " + m_filename); 
+    (void)result;
+    
+    System::alignedFree(tempBuffer);
+}
+
+
+void BinaryInput::readBytes(void* bytes, int64 n) {
+    prepareToRead(n);
+    debugAssert(isValidPointer(bytes));
+
+    memcpy(bytes, m_buffer + m_pos, n);
+    m_pos += n;
+}
+
+
+BinaryInput::~BinaryInput() {
+
+    if (m_freeBuffer) {
+        System::alignedFree(m_buffer);
+    }
+    m_buffer = NULL;
+}
+
+
+uint64 BinaryInput::readUInt64() {
+    prepareToRead(8);
+    uint8 out[8];
+
+    if (m_swapBytes) {
+        out[0] = m_buffer[m_pos + 7];
+        out[1] = m_buffer[m_pos + 6];
+        out[2] = m_buffer[m_pos + 5];
+        out[3] = m_buffer[m_pos + 4];
+        out[4] = m_buffer[m_pos + 3];
+        out[5] = m_buffer[m_pos + 2];
+        out[6] = m_buffer[m_pos + 1];
+        out[7] = m_buffer[m_pos + 0];
+    } else {
+        *(uint64*)out = *(uint64*)(m_buffer + m_pos);
+    }
+
+    m_pos += 8;
+    return *(uint64*)out;
+}
+
+
+std::string BinaryInput::readString(int64 n) {
+    prepareToRead(n);
+    debugAssertM((m_pos + n) <= m_length, "Read past end of file");
+    
+    char *s = (char*)System::alignedMalloc(n + 1, 16);
+    assert(s != NULL);
+
+    memcpy(s, m_buffer + m_pos, n);
+    // There may not be a null, so make sure
+    // we add one.
+    s[n] = '\0';
+
+    std::string out = s;
+    System::alignedFree(s);
+    s = NULL;
+
+    m_pos += n;
+
+    return out;
+
+}
+
+
+std::string BinaryInput::readString() {
+    int64 n = 0;
+
+    if ((m_pos + m_alreadyRead + n) < (m_length - 1)) {
+        prepareToRead(1);
+    }
+
+    if ( ((m_pos + m_alreadyRead + n) < (m_length - 1)) &&
+         (m_buffer[m_pos + n] != '\0')) {
+
+        ++n;
+        while ( ((m_pos + m_alreadyRead + n) < (m_length - 1)) &&
+                (m_buffer[m_pos + n] != '\0')) {
+
+            prepareToRead(1);
+            ++n;
+        }
+    }
+
+    // Consume NULL
+    ++n;
+
+    return readString(n);
+}
+
+
+std::string BinaryInput::readStringEven() {
+    std::string x = readString();
+    if (hasMore() && (G3D::isOdd(x.length() + 1))) {
+        skip(1);
+    }
+    return x;
+}
+
+
+std::string BinaryInput::readString32() {
+    int len = readUInt32();
+    return readString(len);
+}
+
+
+Vector4 BinaryInput::readVector4() {
+    float x = readFloat32();
+    float y = readFloat32();
+    float z = readFloat32();
+    float w = readFloat32();
+    return Vector4(x, y, z, w);
+}
+
+
+Vector3 BinaryInput::readVector3() {
+    float x = readFloat32();
+    float y = readFloat32();
+    float z = readFloat32();
+    return Vector3(x, y, z);
+}
+
+
+Vector2 BinaryInput::readVector2() {
+    float x = readFloat32();
+    float y = readFloat32();
+    return Vector2(x, y);
+}
+
+
+Color4 BinaryInput::readColor4() {
+    float r = readFloat32();
+    float g = readFloat32();
+    float b = readFloat32();
+    float a = readFloat32();
+    return Color4(r, g, b, a);
+}
+
+
+Color3 BinaryInput::readColor3() {
+    float r = readFloat32();
+    float g = readFloat32();
+    float b = readFloat32();
+    return Color3(r, g, b);
+}
+
+
+void BinaryInput::beginBits() {
+    debugAssert(m_beginEndBits == 0);
+    m_beginEndBits = 1;
+    m_bitPos = 0;
+
+    debugAssertM(hasMore(), "Can't call beginBits when at the end of a file");
+    m_bitString = readUInt8();
+}
+
+
+uint32 BinaryInput::readBits(int numBits) {
+    debugAssert(m_beginEndBits == 1);
+
+    uint32 out = 0;
+
+    const int total = numBits;
+    while (numBits > 0) {
+        if (m_bitPos > 7) {
+            // Consume a new byte for reading.  We do this at the beginning
+            // of the loop so that we don't try to read past the end of the file.
+            m_bitPos = 0;
+            m_bitString = readUInt8();
+        }
+
+        // Slide the lowest bit of the bitString into
+        // the correct position.
+        out |= (m_bitString & 1) << (total - numBits);
+
+        // Shift over to the next bit
+        m_bitString = m_bitString >> 1;
+        ++m_bitPos;
+        --numBits;
+    }
+
+    return out;
+}
+
+
+void BinaryInput::endBits() {
+    debugAssert(m_beginEndBits == 1);
+    if (m_bitPos == 0) {
+        // Put back the last byte we read
+        --m_pos;
+    }
+    m_beginEndBits = 0;
+    m_bitPos = 0;
+}
+
+}
diff --git a/externals/g3dlite/BinaryOutput.cpp b/externals/g3dlite/BinaryOutput.cpp
new file mode 100644
index 00000000000..2de46c6d4bb
--- /dev/null
+++ b/externals/g3dlite/BinaryOutput.cpp
@@ -0,0 +1,522 @@
+/**
+ @file BinaryOutput.cpp
+ 
+ @author Morgan McGuire, graphics3d.com
+ Copyright 2002-2007, Morgan McGuire, All rights reserved.
+ 
+ @created 2002-02-20
+ @edited  2008-01-07
+ */
+
+#include "G3D/platform.h"
+#include "G3D/BinaryOutput.h"
+#include "G3D/fileutils.h"
+#include "G3D/stringutils.h"
+#include "G3D/Array.h"
+#include 
+
+#include 
+
+// Largest memory buffer that the system will use for writing to
+// disk.  After this (or if the system runs out of memory)
+// chunks of the file will be dumped to disk.
+//
+// Currently 400 MB
+#define MAX_BINARYOUTPUT_BUFFER_SIZE 400000000
+
+namespace G3D {
+
+void BinaryOutput::writeBool8(const std::vector& out, int n) {
+    for (int i = 0; i < n; ++i) {
+        writeBool8(out[i]);
+    }
+}
+
+
+void BinaryOutput::writeBool8(const Array& out, int n) {
+    writeBool8(out.getCArray(), n);
+}
+
+#define IMPLEMENT_WRITER(ucase, lcase)\
+void BinaryOutput::write##ucase(const std::vector& out, int n) {\
+    write##ucase(&out[0], n);\
+}\
+\
+\
+void BinaryOutput::write##ucase(const Array& out, int n) {\
+    write##ucase(out.getCArray(), n);\
+}
+
+
+IMPLEMENT_WRITER(UInt8,   uint8)
+IMPLEMENT_WRITER(Int8,    int8)
+IMPLEMENT_WRITER(UInt16,  uint16)
+IMPLEMENT_WRITER(Int16,   int16)
+IMPLEMENT_WRITER(UInt32,  uint32)
+IMPLEMENT_WRITER(Int32,   int32)
+IMPLEMENT_WRITER(UInt64,  uint64)
+IMPLEMENT_WRITER(Int64,   int64)
+IMPLEMENT_WRITER(Float32, float32)
+IMPLEMENT_WRITER(Float64, float64)    
+
+#undef IMPLEMENT_WRITER
+
+// Data structures that are one byte per element can be 
+// directly copied, regardles of endian-ness.
+#define IMPLEMENT_WRITER(ucase, lcase)\
+void BinaryOutput::write##ucase(const lcase* out, int n) {\
+    if (sizeof(lcase) == 1) {\
+        writeBytes((void*)out, n);\
+    } else {\
+        for (int i = 0; i < n ; ++i) {\
+            write##ucase(out[i]);\
+        }\
+    }\
+}
+
+IMPLEMENT_WRITER(Bool8,   bool)
+IMPLEMENT_WRITER(UInt8,   uint8)
+IMPLEMENT_WRITER(Int8,    int8)
+
+#undef IMPLEMENT_WRITER
+
+
+#define IMPLEMENT_WRITER(ucase, lcase)\
+void BinaryOutput::write##ucase(const lcase* out, int n) {\
+    if (m_swapBytes) {\
+        for (int i = 0; i < n; ++i) {\
+            write##ucase(out[i]);\
+        }\
+    } else {\
+        writeBytes((const void*)out, sizeof(lcase) * n);\
+    }\
+}
+
+
+IMPLEMENT_WRITER(UInt16,  uint16)
+IMPLEMENT_WRITER(Int16,   int16)
+IMPLEMENT_WRITER(UInt32,  uint32)
+IMPLEMENT_WRITER(Int32,   int32)
+IMPLEMENT_WRITER(UInt64,  uint64)
+IMPLEMENT_WRITER(Int64,   int64)
+IMPLEMENT_WRITER(Float32, float32)
+IMPLEMENT_WRITER(Float64, float64)    
+
+#undef IMPLEMENT_WRITER
+
+
+void BinaryOutput::reallocBuffer(size_t bytes, size_t oldBufferLen) {
+    //debugPrintf("reallocBuffer(%d, %d)\n", bytes, oldBufferLen);
+
+    size_t newBufferLen = (int)(m_bufferLen * 1.5) + 100;
+    uint8* newBuffer = NULL;
+
+    if ((m_filename == "") || (newBufferLen < MAX_BINARYOUTPUT_BUFFER_SIZE)) {
+        // We're either writing to memory (in which case we *have* to try and allocate)
+        // or we've been asked to allocate a reasonable size buffer.
+
+        //debugPrintf("  realloc(%d)\n", newBufferLen); 
+        newBuffer = (uint8*)System::realloc(m_buffer, newBufferLen);
+        if (newBuffer != NULL) {
+            m_maxBufferLen = newBufferLen;
+        }
+    }
+
+    if ((newBuffer == NULL) && (bytes > 0)) {
+        // Realloc failed; we're probably out of memory.  Back out
+        // the entire call and try to dump some data to disk.
+        m_bufferLen = oldBufferLen;
+        reserveBytesWhenOutOfMemory(bytes);
+    } else {
+        m_buffer = newBuffer;
+        debugAssert(isValidHeapPointer(m_buffer));
+    }
+}
+
+
+void BinaryOutput::reserveBytesWhenOutOfMemory(size_t bytes) {
+    if (m_filename == "") {
+        throw "Out of memory while writing to memory in BinaryOutput (no RAM left).";
+    } else if ((int)bytes > (int)m_maxBufferLen) {
+        throw "Out of memory while writing to disk in BinaryOutput (could not create a large enough buffer).";
+    } else {
+
+        // Dump the contents to disk.  In order to enable seeking backwards, 
+        // we keep the last 10 MB in memory.
+        int writeBytes = m_bufferLen - 10 * 1024 * 1024;
+
+        if (writeBytes < m_bufferLen / 3) {
+            // We're going to write less than 1/3 of the file;
+            // give up and just write the whole thing.
+            writeBytes = m_bufferLen;
+        }
+        debugAssert(writeBytes > 0);
+
+        //debugPrintf("Writing %d bytes to disk\n", writeBytes);
+
+        const char* mode = (m_alreadyWritten > 0) ? "ab" : "wb";
+        FILE* file = fopen(m_filename.c_str(), mode);
+        debugAssert(file);
+
+        size_t count = fwrite(m_buffer, 1, writeBytes, file);
+        debugAssert((int)count == writeBytes); (void)count;
+
+        fclose(file);
+        file = NULL;
+
+        // Record that we saved this data.
+        m_alreadyWritten += writeBytes;
+        m_bufferLen -= writeBytes;
+        m_pos -= writeBytes;
+
+        debugAssert(m_bufferLen < m_maxBufferLen);
+        debugAssert(m_bufferLen >= 0);
+        debugAssert(m_pos >= 0);
+        debugAssert(m_pos <= m_bufferLen);
+
+        // Shift the unwritten data back appropriately in the buffer.
+        debugAssert(isValidHeapPointer(m_buffer));
+        System::memcpy(m_buffer, m_buffer + writeBytes, m_bufferLen);
+        debugAssert(isValidHeapPointer(m_buffer));
+
+        // *now* we allocate bytes (there should presumably be enough 
+        // space in the buffer; if not, we'll come back through this 
+        // code and dump the last 10MB to disk as well.  Note that the 
+        // bytes > maxBufferLen case above would already have triggered
+        // if this call couldn't succeed. 
+        reserveBytes(bytes);
+    }
+}
+
+
+BinaryOutput::BinaryOutput() {
+    m_alreadyWritten = 0;
+    m_swapBytes = false;
+    m_pos       = 0;
+    m_filename  = "";
+    m_buffer = NULL;
+    m_bufferLen = 0;
+    m_maxBufferLen = 0;
+    m_beginEndBits = 0;
+    m_bitString = 0;
+    m_bitPos = 0;
+    m_ok = true;
+    m_committed = false;
+}
+
+
+BinaryOutput::BinaryOutput(
+    const std::string&  filename,
+    G3DEndian           fileEndian) {
+
+    m_pos = 0;
+    m_alreadyWritten = 0;
+    setEndian(fileEndian);
+    m_filename = filename;
+    m_buffer = NULL;
+    m_bufferLen = 0;
+    m_maxBufferLen = 0;
+    m_beginEndBits = 0;
+    m_bitString = 0;
+    m_bitPos = 0;
+    m_committed = false;
+
+    m_ok = true;    
+    /** Verify ability to write to disk */
+    commit(false);
+    m_committed = false;
+}
+
+
+void BinaryOutput::reset() {
+    debugAssert(m_beginEndBits == 0);
+    alwaysAssertM(m_filename == "", 
+        "Can only reset a BinaryOutput that writes to memory.");
+
+    // Do not reallocate, just clear the size of the buffer.
+    m_pos = 0;
+    m_alreadyWritten = 0;
+    m_bufferLen = 0;
+    m_beginEndBits = 0;
+    m_bitString = 0;
+    m_bitPos = 0;
+    m_committed = false;
+}
+
+
+BinaryOutput::~BinaryOutput() {
+    debugAssert((m_buffer == NULL) || isValidHeapPointer(m_buffer));
+    System::free(m_buffer);
+    m_buffer = NULL;
+    m_bufferLen = 0;
+    m_maxBufferLen = 0;
+}
+
+
+void BinaryOutput::setEndian(G3DEndian fileEndian) {
+    m_fileEndian = fileEndian;
+    m_swapBytes = (fileEndian != System::machineEndian());
+}
+
+
+bool BinaryOutput::ok() const {
+    return m_ok;
+}
+
+
+void BinaryOutput::compress() {
+    if (m_alreadyWritten > 0) {
+        throw "Cannot compress huge files (part of this file has already been written to disk).";
+    }
+
+    // Old buffer size
+    int L = m_bufferLen;
+    uint8* convert = (uint8*)&L;
+
+    // Zlib requires the output buffer to be this big
+    unsigned long newSize = iCeil(m_bufferLen * 1.01) + 12;
+    uint8* temp = (uint8*)System::malloc(newSize);
+    int result = compress2(temp, &newSize, m_buffer, m_bufferLen, 9); 
+
+    debugAssert(result == Z_OK); (void)result;
+
+    // Write the header
+    if (m_swapBytes) {
+        m_buffer[0] = convert[3];
+        m_buffer[1] = convert[2];
+        m_buffer[2] = convert[1];
+        m_buffer[3] = convert[0];
+    } else {
+        m_buffer[0] = convert[0];
+        m_buffer[1] = convert[1];
+        m_buffer[2] = convert[2];
+        m_buffer[3] = convert[3];
+    }
+
+    // Write the data
+    if ((int64)newSize + 4 > (int64)m_maxBufferLen) {
+        m_maxBufferLen = newSize + 4;
+        m_buffer = (uint8*)System::realloc(m_buffer, m_maxBufferLen);
+    }
+    m_bufferLen = newSize + 4;
+    System::memcpy(m_buffer + 4, temp, newSize);
+    m_pos = m_bufferLen;
+
+    System::free(temp);
+}
+
+
+void BinaryOutput::commit(bool flush) {
+    debugAssertM(! m_committed, "Cannot commit twice");
+    m_committed = true;
+    debugAssertM(m_beginEndBits == 0, "Missing endBits before commit");
+
+    // Make sure the directory exists.
+    std::string root, base, ext, path;
+    Array pathArray;
+    parseFilename(m_filename, root, pathArray, base, ext); 
+
+    path = root + stringJoin(pathArray, '/');
+    if (! fileExists(path, false)) {
+        createDirectory(path);
+    }
+
+    const char* mode = (m_alreadyWritten > 0) ? "ab" : "wb";
+
+    FILE* file = fopen(m_filename.c_str(), mode);
+
+    m_ok = (file != NULL) && m_ok;
+
+    if (m_ok) {
+        debugAssertM(file, std::string("Could not open '") + m_filename + "'");
+
+        if (m_buffer != NULL) {
+            m_alreadyWritten += m_bufferLen;
+
+            int success = fwrite(m_buffer, m_bufferLen, 1, file);
+            (void)success;
+            debugAssertM(success == 1, std::string("Could not write to '") + m_filename + "'");
+        }
+        if (flush) {
+            fflush(file);
+        }
+        fclose(file);
+        file = NULL;
+    }
+}
+
+
+void BinaryOutput::commit(
+    uint8*                  out) {
+    debugAssertM(! m_committed, "Cannot commit twice");
+    m_committed = true;
+
+    System::memcpy(out, m_buffer, m_bufferLen);
+}
+
+
+void BinaryOutput::writeUInt16(uint16 u) {
+    reserveBytes(2);
+
+    uint8* convert = (uint8*)&u;
+
+    if (m_swapBytes) {
+        m_buffer[m_pos]     = convert[1];
+        m_buffer[m_pos + 1] = convert[0];
+    } else {
+        *(uint16*)(m_buffer + m_pos) = u;
+    }
+
+    m_pos += 2;
+}
+
+
+void BinaryOutput::writeUInt32(uint32 u) {
+    reserveBytes(4);
+
+    uint8* convert = (uint8*)&u;
+
+    debugAssert(m_beginEndBits == 0);
+
+    if (m_swapBytes) {
+        m_buffer[m_pos]     = convert[3];
+        m_buffer[m_pos + 1] = convert[2];
+        m_buffer[m_pos + 2] = convert[1];
+        m_buffer[m_pos + 3] = convert[0];
+    } else {
+        *(uint32*)(m_buffer + m_pos) = u;
+    }
+
+    m_pos += 4;
+}
+
+
+void BinaryOutput::writeUInt64(uint64 u) {
+    reserveBytes(8);
+
+    uint8* convert = (uint8*)&u;
+
+    if (m_swapBytes) {
+        m_buffer[m_pos]     = convert[7];
+        m_buffer[m_pos + 1] = convert[6];
+        m_buffer[m_pos + 2] = convert[5];
+        m_buffer[m_pos + 3] = convert[4];
+        m_buffer[m_pos + 4] = convert[3];
+        m_buffer[m_pos + 5] = convert[2];
+        m_buffer[m_pos + 6] = convert[1];
+        m_buffer[m_pos + 7] = convert[0];
+    } else {
+        *(uint64*)(m_buffer + m_pos) = u;
+    }
+
+    m_pos += 8;
+}
+
+
+void BinaryOutput::writeString(const char* s) {
+    // +1 is because strlen doesn't count the null
+    int len = strlen(s) + 1;
+
+    debugAssert(m_beginEndBits == 0);
+    reserveBytes(len);
+    System::memcpy(m_buffer + m_pos, s, len);
+    m_pos += len;
+}
+
+
+void BinaryOutput::writeStringEven(const char* s) {
+    // +1 is because strlen doesn't count the null
+    int len = strlen(s) + 1;
+
+    reserveBytes(len);
+    System::memcpy(m_buffer + m_pos, s, len);
+    m_pos += len;
+
+    // Pad with another NULL
+    if ((len % 2) == 1) {
+        writeUInt8(0);
+    }
+}
+
+
+void BinaryOutput::writeString32(const char* s) {
+    writeUInt32(strlen(s) + 1);
+    writeString(s);
+}
+
+
+void BinaryOutput::writeVector4(const Vector4& v) {
+    writeFloat32(v.x);
+    writeFloat32(v.y);
+    writeFloat32(v.z);
+    writeFloat32(v.w);
+}
+
+
+void BinaryOutput::writeVector3(const Vector3& v) {
+    writeFloat32(v.x);
+    writeFloat32(v.y);
+    writeFloat32(v.z);
+}
+
+
+void BinaryOutput::writeVector2(const Vector2& v) {
+    writeFloat32(v.x);
+    writeFloat32(v.y);
+}
+
+
+void BinaryOutput::writeColor4(const Color4& v) {
+    writeFloat32(v.r);
+    writeFloat32(v.g);
+    writeFloat32(v.b);
+    writeFloat32(v.a);
+}
+
+
+void BinaryOutput::writeColor3(const Color3& v) {
+    writeFloat32(v.r);
+    writeFloat32(v.g);
+    writeFloat32(v.b);
+}
+
+
+void BinaryOutput::beginBits() {
+    debugAssertM(m_beginEndBits == 0, "Already in beginBits...endBits");
+    m_bitString = 0x00;
+    m_bitPos = 0;
+    m_beginEndBits = 1;
+}
+
+
+void BinaryOutput::writeBits(uint32 value, int numBits) {
+
+    while (numBits > 0) {
+        // Extract the current bit of value and
+        // insert it into the current byte
+        m_bitString |= (value & 1) << m_bitPos;
+        ++m_bitPos;
+        value = value >> 1;
+        --numBits;
+
+        if (m_bitPos > 7) {
+            // We've reached the end of this byte
+            writeUInt8(m_bitString);
+            m_bitString = 0x00;
+            m_bitPos = 0;
+        }
+    }
+}
+
+
+void BinaryOutput::endBits() {
+    debugAssertM(m_beginEndBits == 1, "Not in beginBits...endBits");
+    if (m_bitPos > 0) {
+        writeUInt8(m_bitString);
+    }
+    m_bitString = 0;
+    m_bitPos = 0;
+    m_beginEndBits = 0;
+}
+
+}
diff --git a/externals/g3dlite/Box.cpp b/externals/g3dlite/Box.cpp
new file mode 100644
index 00000000000..f7c112ae3a5
--- /dev/null
+++ b/externals/g3dlite/Box.cpp
@@ -0,0 +1,393 @@
+/**
+  @file Box.cpp
+  Box class
+
+  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+
+  @created 2001-06-02
+  @edited  2006-02-05
+*/
+
+#include "G3D/Box.h"
+#include "G3D/debug.h"
+#include "G3D/Plane.h"
+#include "G3D/AABox.h"
+#include "G3D/CoordinateFrame.h"
+
+namespace G3D {
+
+/**
+ Sets a field on four vertices.  Used by the constructor.
+ */
+#define setMany(i0, i1, i2, i3, field, extreme) \
+    _corner[i0].field = _corner[i1].field = \
+    _corner[i2].field = _corner[i3].field = \
+    (extreme).field
+
+Box::Box() {
+}
+
+
+Box::Box(const AABox& b) {
+    init(b.low(), b.high());
+}
+
+Box::Box(class BinaryInput& b) {
+	deserialize(b);	
+}
+
+
+void Box::serialize(class BinaryOutput& b) const {
+	int i;
+	for (i = 0; i < 8; ++i) {
+		_corner[i].serialize(b);
+	}
+
+    // Other state can be reconstructed
+}
+
+
+void Box::deserialize(class BinaryInput& b) {
+	int i;
+
+    _center = Vector3::zero();
+    for (i = 0; i < 8; ++i) {
+		_corner[i].deserialize(b);
+        _center += _corner[i];
+	}
+
+    _center = _center / 8;
+    
+    // Reconstruct other state from the corners
+    _axis[0] = _corner[5] - _corner[4];
+    _axis[1] = _corner[7] - _corner[4];
+    _axis[2] = _corner[0] - _corner[4];
+
+    for (i = 0; i < 3; ++i) {
+        _extent[i] = _axis[i].magnitude();
+        _axis[i] /= _extent[i];
+    }
+
+    _volume = _extent.x * _extent.y * _extent.z;
+
+    _area = 2 * 
+        (_extent.x * _extent.y +
+         _extent.y * _extent.z +
+         _extent.z * _extent.x);
+}
+
+
+Box::Box(
+    const Vector3& min,
+    const Vector3& max) {
+
+    init(min.min(max), min.max(max));
+
+}
+
+void Box::init(
+    const Vector3& min,
+    const Vector3& max) {
+
+    debugAssert(
+        (min.x <= max.x) &&
+        (min.y <= max.y) &&
+        (min.z <= max.z));
+
+    setMany(0, 1, 2, 3, z, max);
+    setMany(4, 5, 6, 7, z, min);
+
+    setMany(1, 2, 5, 6, x, max);
+    setMany(0, 3, 4, 7, x, min);
+
+    setMany(3, 2, 6, 7, y, max);
+    setMany(0, 1, 5, 4, y, min);
+
+    _extent = max - min;
+
+    _axis[0] = Vector3::unitX();
+    _axis[1] = Vector3::unitY();
+    _axis[2] = Vector3::unitZ();
+
+    if (_extent.isFinite()) {
+        _volume = _extent.x * _extent.y * _extent.z;
+    } else {
+        _volume = G3D::finf();
+    }
+
+    debugAssert(! isNaN(_extent.x));
+
+    _area = 2 * 
+        (_extent.x * _extent.y +
+         _extent.y * _extent.z +
+         _extent.z * _extent.x);
+
+    _center = (max + min) * 0.5f;
+
+    // If the extent is infinite along an axis, make the center zero to avoid NaNs
+    for (int i = 0; i < 3; ++i) {
+        if (! G3D::isFinite(_extent[i])) {
+            _center[i] = 0.0f;
+        }
+    }
+}
+
+
+float Box::volume() const {
+    return _volume;
+}
+
+
+float Box::area() const {
+    return _area;
+}
+
+
+void Box::getLocalFrame(CoordinateFrame& frame) const {
+
+    frame.rotation = Matrix3(
+        _axis[0][0], _axis[1][0], _axis[2][0],
+        _axis[0][1], _axis[1][1], _axis[2][1],
+        _axis[0][2], _axis[1][2], _axis[2][2]);
+
+    frame.translation = _center;
+}
+
+
+CoordinateFrame Box::localFrame() const {
+    CoordinateFrame out;
+    getLocalFrame(out);
+    return out;
+}
+
+
+void Box::getFaceCorners(int f, Vector3& v0, Vector3& v1, Vector3& v2, Vector3& v3) const {
+    switch (f) {
+    case 0:
+        v0 = _corner[0]; v1 = _corner[1]; v2 = _corner[2]; v3 = _corner[3];
+        break;
+
+    case 1:
+        v0 = _corner[1]; v1 = _corner[5]; v2 = _corner[6]; v3 = _corner[2];
+        break;
+
+    case 2:
+        v0 = _corner[7]; v1 = _corner[6]; v2 = _corner[5]; v3 = _corner[4];
+        break;
+
+    case 3:
+        v0 = _corner[2]; v1 = _corner[6]; v2 = _corner[7]; v3 = _corner[3];
+        break;
+
+    case 4:
+        v0 = _corner[3]; v1 = _corner[7]; v2 = _corner[4]; v3 = _corner[0];
+        break;
+
+    case 5:
+        v0 = _corner[1]; v1 = _corner[0]; v2 = _corner[4]; v3 = _corner[5];
+        break;
+
+    default:
+        debugAssert((f >= 0) && (f < 6));
+    }
+}
+
+
+
+int Box::dummy = 0;
+
+bool Box::culledBy(
+    const Array& plane,
+    int&                cullingPlane,
+    const uint32        _inMask,
+    uint32&             childMask) const {
+
+    uint32 inMask = _inMask;
+    assert(plane.size() < 31);
+
+    childMask = 0;
+
+    // See if there is one plane for which all of the
+	// vertices are in the negative half space.
+    for (int p = 0; p < plane.size(); ++p) {
+
+		// Only test planes that are not masked
+		if ((inMask & 1) != 0) {
+		
+			Vector3 corner;
+
+            int numContained = 0;
+            int v = 0;
+
+            // We can early-out only if we have found one point on each
+            // side of the plane (i.e. if we are straddling).  That
+            // occurs when (numContained < v) && (numContained > 0)
+			for (v = 0; (v < 8) && ((numContained == v) || (numContained == 0)); ++v) {
+                if (plane[p].halfSpaceContains(_corner[v])) {
+                    ++numContained;
+                }
+			}
+
+			if (numContained == 0) {
+				// Plane p culled the box
+				cullingPlane = p;
+
+                // The caller should not recurse into the children,
+                // since the parent is culled.  If they do recurse,
+                // make them only test against this one plane, which
+                // will immediately cull the volume.
+                childMask = 1 << p;
+				return true;
+
+            } else if (numContained < v) {
+                // The bounding volume straddled the plane; we have
+                // to keep testing against this plane
+                childMask |= (1 << p);
+            }
+		}
+
+        // Move on to the next bit.
+		inMask = inMask >> 1;
+    }
+
+    // None of the planes could cull this box
+	cullingPlane = -1;
+    return false;
+}
+
+
+bool Box::culledBy(
+    const Array& plane,
+	int&				cullingPlane,
+	const uint32		_inMask) const {
+
+	uint32 inMask = _inMask;
+	assert(plane.size() < 31);
+
+    // See if there is one plane for which all of the
+	// vertices are in the negative half space.
+    for (int p = 0; p < plane.size(); ++p) {
+
+		// Only test planes that are not masked
+		if ((inMask & 1) != 0) {
+		
+			bool culled = true;
+
+            int v;
+
+			// Assume this plane culls all points.  See if there is a point
+			// not culled by the plane... early out when at least one point
+            // is in the positive half space.
+			for (v = 0; (v < 8) && culled; ++v) {
+                culled = ! plane[p].halfSpaceContains(corner(v));
+			}
+
+			if (culled) {
+				// Plane p culled the box
+				cullingPlane = p;
+
+				return true;
+            }
+		}
+
+        // Move on to the next bit.
+		inMask = inMask >> 1;
+    }
+
+    // None of the planes could cull this box
+	cullingPlane = -1;
+    return false;
+}
+
+
+bool Box::contains(
+    const Vector3&      point) const {
+
+    // Form axes from three edges, transform the point into that
+    // space, and perform 3 interval tests
+
+    Vector3 u = _corner[4] - _corner[0];
+    Vector3 v = _corner[3] - _corner[0];
+    Vector3 w = _corner[1] - _corner[0];
+
+    Matrix3 M = Matrix3(u.x, v.x, w.x,
+                        u.y, v.y, w.y,
+                        u.z, v.z, w.z);
+
+    // M^-1 * (point - _corner[0]) = point in unit cube's object space
+    // compute the inverse of M
+    Vector3 osPoint = M.inverse() * (point - _corner[0]);
+
+    return
+        (osPoint.x >= 0) && 
+        (osPoint.y >= 0) &&
+        (osPoint.z >= 0) &&
+        (osPoint.x <= 1) &&
+        (osPoint.y <= 1) &&
+        (osPoint.z <= 1);
+}
+
+#undef setMany
+
+
+void Box::getRandomSurfacePoint(Vector3& P, Vector3& N) const {
+    float aXY = _extent.x * _extent.y;
+    float aYZ = _extent.y * _extent.z;
+    float aZX = _extent.z * _extent.x;
+
+    float r = (float)uniformRandom(0, aXY + aYZ + aZX);
+
+    // Choose evenly between positive and negative face planes
+    float d = (uniformRandom(0, 1) < 0.5f) ? -1.0f : 1.0f;
+
+    // The probability of choosing a given face is proportional to
+    // its area.
+    if (r < aXY) {
+        P = _axis[0] * (float)uniformRandom(-0.5, 0.5) * _extent.x +
+            _axis[1] * (float)uniformRandom(-0.5, 0.5) * _extent.y +
+            _center + _axis[2] * d * _extent.z * 0.5f;
+        N = _axis[2] * d;
+    } else if (r < aYZ) {
+        P = _axis[1] * (float)uniformRandom(-0.5, 0.5) * _extent.y +
+            _axis[2] * (float)uniformRandom(-0.5, 0.5) * _extent.z +
+            _center + _axis[0] * d * _extent.x * 0.5f;
+        N = _axis[0] * d;
+    } else {
+        P = _axis[2] * (float)uniformRandom(-0.5, 0.5) * _extent.z +
+            _axis[0] *(float) uniformRandom(-0.5, 0.5) * _extent.x +
+            _center + _axis[1] * d * _extent.y * 0.5f;
+        N = _axis[1] * d;
+    }
+}
+
+
+Vector3 Box::randomInteriorPoint() const {
+    Vector3 sum = _center;
+
+    for (int a = 0; a < 3; ++a) {
+        sum += _axis[a] * (float)uniformRandom(-0.5, 0.5) * _extent[a];
+    }
+
+    return sum;
+}
+
+Box Box::inf() {
+    return Box(-Vector3::inf(), Vector3::inf());
+}
+
+void Box::getBounds(class AABox& aabb) const {
+
+    Vector3 lo = _corner[0];
+    Vector3 hi = lo;
+
+    for (int v = 1; v < 8; ++v) {
+        const Vector3& C = _corner[v];
+        lo = lo.min(C);
+        hi = hi.max(C);
+    }
+
+    aabb = AABox(lo, hi);
+}
+
+
+} // namespace
diff --git a/externals/g3dlite/CMakeLists.txt b/externals/g3dlite/CMakeLists.txt
new file mode 100644
index 00000000000..fa80bb75445
--- /dev/null
+++ b/externals/g3dlite/CMakeLists.txt
@@ -0,0 +1,11 @@
+file(GLOB sources *.cpp)
+
+SET(g3dlib_STAT_SRCS
+  ${sources}
+  )
+
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  )
+
+add_library(g3dlib STATIC ${g3dlib_STAT_SRCS})
diff --git a/externals/g3dlite/Capsule.cpp b/externals/g3dlite/Capsule.cpp
new file mode 100644
index 00000000000..2ad3891c960
--- /dev/null
+++ b/externals/g3dlite/Capsule.cpp
@@ -0,0 +1,179 @@
+/**
+ @file Capsule.cpp
+  
+ @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+
+ @created 2003-02-07
+ @edited  2005-08-18
+
+ Copyright 2000-2009, Morgan McGuire.
+ All rights reserved.
+ */
+
+#include "G3D/Capsule.h"
+#include "G3D/BinaryInput.h"
+#include "G3D/BinaryOutput.h"
+#include "G3D/LineSegment.h"
+#include "G3D/Sphere.h"
+#include "G3D/CoordinateFrame.h"
+#include "G3D/Line.h"
+#include "G3D/AABox.h"
+
+namespace G3D {
+
+Capsule::Capsule(class BinaryInput& b) {
+	deserialize(b);
+}
+
+
+Capsule::Capsule() {
+}
+
+
+Capsule::Capsule(const Vector3& _p1, const Vector3& _p2, float _r) 
+	: p1(_p1), p2(_p2), _radius(_r) {
+}
+
+
+void Capsule::serialize(class BinaryOutput& b) const {
+	p1.serialize(b);
+	p2.serialize(b);
+	b.writeFloat64(_radius);
+}
+
+
+void Capsule::deserialize(class BinaryInput& b) {
+	p1.deserialize(b);
+	p2.deserialize(b);
+	_radius = b.readFloat64();
+}
+
+
+Line Capsule::axis() const {
+	return Line::fromTwoPoints(p1, p2);
+}
+
+
+float Capsule::volume() const {
+	return 
+		// Sphere volume
+		pow(_radius, 3) * pi() * 4 / 3 +
+
+		// Cylinder volume
+		pow(_radius, 2) * (p1 - p2).magnitude();
+}
+
+
+float Capsule::area() const {
+
+	return
+		// Sphere area
+		pow(_radius, 2) * 4 * pi() +
+
+		// Cylinder area
+		twoPi() * _radius * (p1 - p2).magnitude();
+}
+
+
+void Capsule::getBounds(AABox& out) const {
+    Vector3 min = p1.min(p2) - (Vector3(1, 1, 1) * _radius);
+    Vector3 max = p1.max(p2) + (Vector3(1, 1, 1) * _radius);
+
+    out = AABox(min, max);
+}
+
+
+bool Capsule::contains(const Vector3& p) const { 
+    return LineSegment::fromTwoPoints(p1, p2).distanceSquared(p) <= square(radius());
+}
+
+
+void Capsule::getRandomSurfacePoint(Vector3& p, Vector3& N) const {
+    float h = height();
+    float r = radius();
+
+    // Create a random point on a standard capsule and then rotate to the global frame.
+
+    // Relative areas
+    float capRelArea  = sqrt(r) / 2.0f;
+    float sideRelArea = r * h;
+
+    float r1 = uniformRandom(0, capRelArea * 2 + sideRelArea);
+
+    if (r1 < capRelArea * 2) {
+
+        // Select a point uniformly at random on a sphere
+        N = Sphere(Vector3::zero(), 1).randomSurfacePoint();
+        p = N * r;
+        p.y += sign(p.y) * h / 2.0f;
+    } else {
+        // Side
+        float a = uniformRandom(0, (float)twoPi());
+        N.x = cos(a);
+        N.y = 0;
+        N.z = sin(a);
+        p.x = N.x * r;
+        p.z = N.y * r;
+        p.y = uniformRandom(-h / 2.0f, h / 2.0f);
+    }
+
+    // Transform to world space
+    CoordinateFrame cframe;
+    getReferenceFrame(cframe);
+    
+    p = cframe.pointToWorldSpace(p);
+    N = cframe.normalToWorldSpace(N);
+}
+
+
+void Capsule::getReferenceFrame(CoordinateFrame& cframe) const {
+    cframe.translation = center();
+
+    Vector3 Y = (p1 - p2).direction();
+    Vector3 X = (abs(Y.dot(Vector3::unitX())) > 0.9) ? Vector3::unitY() : Vector3::unitX();
+    Vector3 Z = X.cross(Y).direction();
+    X = Y.cross(Z);        
+    cframe.rotation.setColumn(0, X);
+    cframe.rotation.setColumn(1, Y);
+    cframe.rotation.setColumn(2, Z);
+}
+
+
+Vector3 Capsule::randomInteriorPoint() const {
+    float h = height();
+    float r = radius();
+
+    // Create a random point in a standard capsule and then rotate to the global frame.
+
+    Vector3 p;
+
+    float hemiVolume = pi() * (r*r*r) * 4 / 6.0;
+    float cylVolume = pi() * square(r) * h;
+    
+    float r1 = uniformRandom(0, 2.0 * hemiVolume + cylVolume);
+
+    if (r1 < 2.0 * hemiVolume) {
+
+        p = Sphere(Vector3::zero(), r).randomInteriorPoint();
+
+        p.y += sign(p.y) * h / 2.0f;
+
+    } else {
+
+        // Select a point uniformly at random on a disk
+        float a = uniformRandom(0, (float)twoPi());
+        float r2 = sqrt(uniformRandom(0, 1)) * r;
+
+        p = Vector3(cos(a) * r2,
+                    uniformRandom(-h / 2.0f, h / 2.0f),
+                    sin(a) * r2);
+    }
+
+    // Transform to world space
+    CoordinateFrame cframe;
+    getReferenceFrame(cframe);
+    
+    return cframe.pointToWorldSpace(p);
+}
+
+} // namespace
diff --git a/externals/g3dlite/CollisionDetection.cpp b/externals/g3dlite/CollisionDetection.cpp
new file mode 100644
index 00000000000..77eef0a5500
--- /dev/null
+++ b/externals/g3dlite/CollisionDetection.cpp
@@ -0,0 +1,2455 @@
+/**
+  @file CollisionDetection.cpp
+  
+  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+
+  @cite Bounce direction based on Paul Nettle's ftp://ftp.3dmaileffects.com/pub/FluidStudios/CollisionDetection/Fluid_Studios_Generic_Collision_Detection_for_Games_Using_Ellipsoids.pdf and comments by Max McGuire.  Ray-sphere code by Eric Haines.
+
+  @created 2001-11-24
+  @edited  2008-12-29
+ */
+
+#include "G3D/CoordinateFrame.h"
+#include "G3D/platform.h"
+#include "G3D/CollisionDetection.h"
+#include "G3D/debugAssert.h"
+#include "G3D/vectorMath.h"
+#include "G3D/Capsule.h"
+#include "G3D/Plane.h"
+#include "G3D/Line.h"
+#include "G3D/LineSegment.h"
+#include "G3D/Sphere.h"
+#include "G3D/Box.h"
+#include "G3D/Triangle.h"
+#include "G3D/Vector3.h"
+#include "G3D/AABox.h"
+
+#ifdef _MSC_VER
+// Turn on fast floating-point optimizations
+#pragma float_control( push )
+#pragma fp_contract( on ) 
+#pragma fenv_access( off )
+#pragma float_control( except, off )
+#pragma float_control( precise, off )
+#endif
+
+
+namespace G3D {
+
+bool CollisionDetection::ignoreBool;
+Vector3	CollisionDetection::ignore;
+Array CollisionDetection::ignoreArray;
+
+
+
+Vector3 CollisionDetection::separatingAxisForSolidBoxSolidBox(
+        const int separatingAxisIndex,
+        const Box & box1,
+        const Box & box2) {
+    debugAssert(separatingAxisIndex >= 0);
+    debugAssert(separatingAxisIndex < 15);
+    Vector3 axis;
+    if (separatingAxisIndex < 3) {
+        axis = box1.axis(separatingAxisIndex);
+    } else if (separatingAxisIndex < 6) {
+        axis = box2.axis(separatingAxisIndex - 3);
+    } else {
+        int box1Index = (separatingAxisIndex - 6) / 3;
+        int box2Index = (separatingAxisIndex - 6) % 3;
+        axis = cross(box1.axis(box1Index), box2.axis(box2Index));
+    }
+    return axis;
+}
+
+#ifdef _MSC_VER
+#   pragma warning (push)
+#   pragma warning (disable : 4244)
+#endif
+
+float CollisionDetection::projectedDistanceForSolidBoxSolidBox(
+    const int           separatingAxisIndex,
+    const Vector3 &     a,
+    const Vector3 &     b,
+    const Vector3 &     D,
+    const double*       c,
+    const double*       ca,
+    const double*       ad,
+    const double*       bd)
+{
+    (void)D;
+
+    float R0 = 0.0f;
+    float R1 = 0.0f;
+    float R = 0.0f;
+    switch (separatingAxisIndex) {
+    case 0:
+        // A0
+        R0 = a[0];
+        R1 = b[0] * ca[0] + b[1] * ca[1] + b[2] * ca[2];
+        R = fabs(ad[0]);
+        break;
+    case 1:
+        // A1
+        R0 = a[1];
+        R1 = b[0] * ca[3] + b[1] * ca[4] + b[2] * ca[5];
+        R = fabs(ad[1]);
+        break;
+    case 2:
+        // A2
+        R0 = a[2];
+        R1 = b[0] * ca[6] + b[1] * ca[7] + b[2] * ca[8];
+        R = fabs(ad[2]);
+        break;
+    case 3:
+        // B0
+        R0 = a[0] * ca[0] + a[1] * ca[3] + a[2] * ca[6];
+        R1 = b[0];
+        R = fabs(bd[0]);
+        break;
+    case 4:
+        // B1
+        R0 = a[0] * ca[1] + a[1] * ca[4] + a[2] * ca[7];
+        R1 = b[1];
+        R = fabs(bd[1]);
+        break;
+    case 5:
+        // B2
+        R0 = a[0] * ca[2] + a[1] * ca[5] + a[2] * ca[8];
+        R1 = b[2];
+        R = fabs(bd[2]);
+        break;
+    case 6:
+        // A0 x B0
+        R0 = a[1] * ca[6] + a[2] * ca[3];
+        R1 = b[1] * ca[2] + b[2] * ca[1];
+        R = fabs(c[3] * ad[2] - c[6] * ad[1]);
+        break;
+    case 7:
+        // A0 x B1
+        R0 = a[1] * ca[7] + a[2] * ca[4];
+        R1 = b[0] * ca[2] + b[2] * ca[0];
+        R = fabs(c[4] * ad[2] - c[7] * ad[1]);
+        break;
+    case 8:
+        // A0 x B2
+        R0 = a[1] * ca[8] + a[2] * ca[5];
+        R1 = b[0] * ca[1] + b[1] * ca[0];
+        R = fabs(c[5] * ad[2] - c[8] * ad[1]);
+        break;
+    case 9:
+        // A1 x B0
+        R0 = a[0] * ca[6] + a[2] * ca[0];
+        R1 = b[1] * ca[5] + b[2] * ca[4];
+        R = fabs(c[6] * ad[0] - c[0] * ad[2]);
+        break;
+    case 10:
+        // A1 x B1
+        R0 = a[0] * ca[7] + a[2] * ca[1];
+        R1 = b[0] * ca[5] + b[2] * ca[3];
+        R = fabs(c[7] * ad[0] - c[1] * ad[2]);
+        break;
+    case 11:
+        // A1 x B2
+        R0 = a[0] * ca[8] + a[2] * ca[2];
+        R1 = b[0] * ca[4] + b[1] * ca[3];
+        R = fabs(c[8] * ad[0] - c[2] * ad[2]);
+        break;
+    case 12:
+        // A2 x B0
+        R0 = a[0] * ca[3] + a[1] * ca[0];
+        R1 = b[1] * ca[8] + b[2] * ca[7];
+        R = fabs(c[0] * ad[1] - c[3] * ad[0]);
+        break;
+    case 13:
+        // A2 x B1
+        R0 = a[0] * ca[4] + a[1] * ca[1];
+        R1 = b[0] * ca[8] + b[2] * ca[6];
+        R = fabs(c[1] * ad[1] - c[4] * ad[0]);
+        break;
+    case 14:
+        // A2 x B2
+        R0 = a[0] * ca[5] + a[1] * ca[2];
+        R1 = b[0] * ca[7] + b[1] * ca[6];
+        R = fabs(c[2] * ad[1] - c[5] * ad[0]);
+        break;
+    default:
+        debugAssertM(false, "fell through switch statement");
+    }
+
+    return (R - (R0 + R1));
+}
+
+
+bool CollisionDetection::parallelAxisForSolidBoxSolidBox(
+        const double* ca,
+        const double epsilon,
+        int & axis1,
+        int & axis2) {
+    const double parallelDot = 1.0 - epsilon;
+    for (int i = 0; i < 9; i++) {
+        if (ca[i] >= parallelDot) {
+            axis1 = i / 3;
+            axis2 = i % 3;
+            return true;
+        }
+    }
+    return false;
+}
+
+
+
+
+void CollisionDetection::fillSolidBoxSolidBoxInfo(
+        const Box & box1,
+        const Box & box2,
+        Vector3 & a,
+        Vector3 & b,
+        Vector3 & D,
+        double* c,
+        double* ca,
+        double* ad,
+        double* bd) {
+    // length between center and each side of box1 and box2
+    a = box1.extent() * 0.5;
+    b = box2.extent() * 0.5;
+
+    // difference between centers of box1 and box2
+    D = box2.center() - box1.center();
+
+    // store the value of all possible dot products between the
+    // axes of box1 and box2, c_{row, col} in the Eberly paper
+    // corresponds to c[row * 3 + col] for this 9 element array.
+    //
+    // c[] holds signed values, ca[] hold absolute values
+    for (int i = 0; i < 9; i++) {
+        c[i] = dot(box1.axis(i / 3), box2.axis(i % 3));
+        ca[i] = fabs(c[i]);
+    }
+
+    // store all possible dot products between the axes of box1 and D,
+    // as well as the axes of box2 and D
+    for (int i = 0; i < 3; i++) {
+        ad[i] = dot(box1.axis(i), D);
+        bd[i] = dot(box2.axis(i), D);
+    }
+}
+
+
+
+bool CollisionDetection::conservativeBoxBoxTest(
+        const Vector3 & a, const Vector3 & b, const Vector3 & D) {
+    // do a quick bounding sphere test because it is relatively
+    // cheap, (three dot products, two sqrts, and a few others)
+    double boxRadius1 = a.magnitude();
+    double boxRadius2 = b.magnitude();
+    return (D.squaredMagnitude() < square(boxRadius1 + boxRadius2));
+}
+
+
+
+
+bool CollisionDetection::fixedSolidBoxIntersectsFixedSolidBox(
+    const Box&      box1,
+    const Box&      box2,
+	const int		lastSeparatingAxis) {
+    // for explanations of the variable please refer to the
+    // paper and fillSolidBoxSolidBoxInfo()
+    Vector3 a;
+    Vector3 b;
+    Vector3 D;
+    double c[9];
+    double ca[9];
+    double ad[3];
+    double bd[3];
+
+    fillSolidBoxSolidBoxInfo(box1, box2, a, b, D, c, ca, ad, bd);
+
+    int dummy1, dummy2;
+    bool parallelAxes = parallelAxisForSolidBoxSolidBox(ca, 0.00001,
+            dummy1, dummy2);
+
+    // check the separating axis from the last time step
+    if (lastSeparatingAxis != -1 &&
+            (lastSeparatingAxis < 6 || !parallelAxes)) {
+        double projectedDistance = projectedDistanceForSolidBoxSolidBox(
+                lastSeparatingAxis, a, b, D, c, ca, ad, bd);
+
+        // the separating axis from the last time step is still
+        // valid, the boxes do not intersect
+        if (projectedDistance > 0.0) {
+            return false;
+        }
+    }
+
+    // test if the boxes can be separated by a plane normal to
+    // any of the three axes of box1, any of the three axes of box2,
+    // or any of the 9 possible cross products of axes from box1
+    // and box2
+    for (int i = 0; i < 15; i++) {
+        // do not need to check edge-edge cases if any two of
+        // the axes are parallel
+        if (parallelAxes && i == 6) {
+            return true;
+        }
+
+        double projectedDistance =
+            projectedDistanceForSolidBoxSolidBox(i, a, b, D, c, ca, ad, bd);
+
+        // found a separating axis, the boxes do not intersect
+        if (projectedDistance > 0.0) {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+
+
+void CollisionDetection::closestPointsBetweenLineAndLine(
+        const Line & line1,
+        const Line & line2,
+        Vector3 & closest1,
+        Vector3 & closest2) {
+    // TODO make accessors for Line that don't make a copy of data
+    Vector3 P0 = line1.point();
+    Vector3 u = line1.direction();
+    Vector3 Q0 = line2.point();
+    Vector3 v = line2.direction();
+    Vector3 w0 = P0 - Q0;
+
+    // a = 1.0, c = 1.0
+    double  b = dot(u, v);
+    double  d = dot(u, w0);
+    double  e = dot(v, w0);
+    double  D = 1.0 - b * b;
+    double  sc, tc;
+
+    static const double epsilon = 0.00001;
+
+    if (D < epsilon) {
+        // lines are parallel, choose P0 as one point, find the point
+        // on line2 that is closest to P0
+        sc = 0.0;
+        tc = (b > 1.0) ? (d / b) : (e / 1.0);
+    } else {
+        // lines are not parallel
+        sc = (b * e - 1.0 * d) / D;
+        tc = (1.0 * e - b * d) / D;
+    }
+
+    closest1 = P0 + (sc * u);
+    closest2 = Q0 + (tc * v);
+}
+
+
+
+float CollisionDetection::penetrationDepthForFixedBoxFixedBox(
+    const Box&      box1,
+    const Box&      box2,
+    Array& contactPoints,
+    Array& contactNormals,
+    const int lastSeparatingAxis) {
+
+    contactPoints.resize(0, DONT_SHRINK_UNDERLYING_ARRAY);
+    contactNormals.resize(0, DONT_SHRINK_UNDERLYING_ARRAY);
+
+    Vector3 a;
+    Vector3 b;
+    Vector3 D;
+    double c[9];
+    double ca[9];
+    double ad[3];
+    double bd[3];
+
+    debugAssert(lastSeparatingAxis >= -1);
+    debugAssert(lastSeparatingAxis < 15);
+
+    fillSolidBoxSolidBoxInfo(box1, box2, a, b, D, c, ca, ad, bd);
+
+    int axis1, axis2;
+    bool parallelAxes = parallelAxisForSolidBoxSolidBox(ca, 0.00001,
+            axis1, axis2);
+
+
+    // check the separating axis from the last time step
+    if (lastSeparatingAxis != -1 &&
+            (lastSeparatingAxis < 6 || !parallelAxes)) {
+        float projectedDistance = projectedDistanceForSolidBoxSolidBox(
+                lastSeparatingAxis, a, b, D, c, ca, ad, bd);
+
+        // the separating axis from the last time step is still
+        // valid, the boxes do not intersect
+        if (projectedDistance > 0.0) {
+            return -projectedDistance;
+        }
+    }
+
+    // test if the boxes can be separated by a plane normal to
+    // any of the three axes of box1, any of the three axes of box2,
+    // (test 9 possible cross products later)
+	float penetration = -finf();
+    int penetrationAxisIndex = -1;
+
+    for (int i = 0; i < 6; i++) {
+        float projectedDistance =
+            projectedDistanceForSolidBoxSolidBox(i, a, b, D, c, ca, ad, bd);
+
+        // found a separating axis, the boxes do not intersect
+        if (projectedDistance > 0.0) {
+            return -projectedDistance;
+        }
+
+        // keep track of the axis that is least violated
+        if (projectedDistance > penetration) {
+            penetration = projectedDistance;
+            penetrationAxisIndex = i;
+        }
+    }
+
+
+    // for each edge-edge case we have to adjust the magnitude of
+    // penetration since we did not include the dot(L, L) denominator
+    // that can be smaller than 1.0 for the edge-edge cases.
+	if (!parallelAxes) {
+	    double edgeDistances[9];
+
+		// run through edge-edge cases to see if we can find a separating axis
+		for (int i = 6; i < 15; i++) {
+			float projectedDistance =
+				projectedDistanceForSolidBoxSolidBox(i, a, b, D, c, ca, ad, bd);
+
+			// found a separating axis, the boxes do not intersect,
+			// correct magnitude and return projected distance
+			if (projectedDistance > 0.0) {
+				Vector3 L = separatingAxisForSolidBoxSolidBox(i, box1, box2);
+				projectedDistance /= dot(L, L);
+				return -projectedDistance;
+			}
+
+			edgeDistances[i - 6] = projectedDistance;
+		}
+
+		// no separating axis found, the boxes do intersect,
+		// correct the magnitudes of the projectedDistance values
+		for (int i = 6; i < 15; i++) {
+			// find the negative penetration value with the smallest magnitude,
+			// the adjustment done for the edge-edge cases only increases
+			// magnitude by dividing by a number smaller than 1 and greater than 0
+			float projectedDistance = (float)edgeDistances[i - 6];
+			if (projectedDistance > penetration) {
+				Vector3 L = separatingAxisForSolidBoxSolidBox(i, box1, box2);
+				projectedDistance /= dot(L, L);
+				if (projectedDistance > penetration) {
+					penetration = projectedDistance;
+					penetrationAxisIndex = i;
+				}
+			}
+		}
+	}
+
+	// get final separating axis vector
+    Vector3 L = separatingAxisForSolidBoxSolidBox(penetrationAxisIndex,
+            box1, box2);
+
+    // set L to be the normal that faces away from box1
+    if (dot(L, D) < 0) {
+        L = -L;
+    }
+
+    Vector3 contactPoint;
+
+    if (penetrationAxisIndex < 6) {
+        // vertex to face collision, find deepest colliding vertex
+        const Box* vertexBox;
+        const Box* faceBox;
+        Vector3 faceNormal = L;
+
+        // L will be the outward facing normal for the faceBox
+        if (penetrationAxisIndex < 3) {
+            faceBox = & box1;
+            vertexBox = & box2;
+            if (dot(L, D) < 0) {
+                faceNormal = -L;
+            }
+        } else {
+            faceBox = & box2;
+            vertexBox = & box1;
+            if (dot(L, D) > 0) {
+                faceNormal = -L;
+            }
+        }
+
+        // find the vertex that is farthest away in the direction
+        // face normal direction
+        int deepestPointIndex = 0;
+        float deepestPointDot = dot(faceNormal, vertexBox->corner(0));
+        for (int i = 1; i < 8; i++) {
+            float dotProduct = dot(faceNormal, vertexBox->corner(i));
+            if (dotProduct < deepestPointDot) {
+                deepestPointDot = dotProduct;
+                deepestPointIndex = i;
+            }
+        }
+        
+        // return the point half way between the deepest point and the
+        // contacting face
+        contactPoint = vertexBox->corner(deepestPointIndex) +
+            (-penetration * 0.5 * faceNormal);
+    } else {
+        // edge-edge case, find the two ege lines
+        int edge1 = (penetrationAxisIndex - 6) / 3;
+        int edge2 = (penetrationAxisIndex - 6) % 3;
+        Vector3 linePoint1 = box1.center();
+        Vector3 linePoint2 = box2.center();
+        Vector3 lineDir1;
+        Vector3 lineDir2;
+
+        // find edge line by finding the edge axis, and the
+        // other two axes that are closest to the other box
+        for (int i = 0; i < 3; i++ ) {
+            if (i == edge1) {
+                lineDir1 = box1.axis(i);
+            } else {
+                Vector3 axis = box1.axis(i);
+                if (dot(axis, L) < 0) {
+                    axis = -axis;
+                }
+                linePoint1 += axis * a[i];
+            }
+
+            if (i == edge2) {
+                lineDir2 = box2.axis(i);
+            } else {
+                Vector3 axis = box2.axis(i);
+                if (dot(axis, L) > 0) {
+                    axis = -axis;
+                }
+                linePoint2 += axis * b[i];
+            }
+        }
+
+        // make lines from the two closest edges, and find
+        // the points that on each line that are closest to the other
+        Line line1 = Line::fromPointAndDirection(linePoint1, lineDir1);
+        Line line2 = Line::fromPointAndDirection(linePoint2, lineDir2);
+        Vector3 closest1;
+        Vector3 closest2;
+
+        closestPointsBetweenLineAndLine(line1, line2, closest1, closest2);
+        
+        // take the average of the two closest edge points for the final
+        // contact point
+        contactPoint = (closest1 + closest2) * 0.5;
+    }
+
+    contactPoints.push(contactPoint);
+    contactNormals.push(L);
+
+    return -penetration;
+
+}
+
+
+
+
+float CollisionDetection::penetrationDepthForFixedSphereFixedBox(
+    const Sphere&   sphere,
+    const Box&      box,
+    Array& contactPoints,
+    Array& contactNormals) {
+
+    contactPoints.resize(0, DONT_SHRINK_UNDERLYING_ARRAY);
+    contactNormals.resize(0, DONT_SHRINK_UNDERLYING_ARRAY);
+
+    // In its local coordinate frame, the box measures
+    // 2 * halfExtent[a] along dimesion a.
+    Vector3 halfExtent(box.extent(0), box.extent(1), box.extent(2));
+    halfExtent *= 0.5f;
+
+    CoordinateFrame boxFrame;
+    box.getLocalFrame(boxFrame);
+
+    // Transform the sphere to the box's coordinate frame.
+    Vector3 center = boxFrame.pointToObjectSpace(sphere.center);
+
+    // Find the square of the distance from the sphere to the box
+
+
+    // Distance along each axis from the closest side of the box
+    // to the sphere center.  Negative values are *inside* the box.
+    Vector3 distOutsideBox;
+
+    // Divide space up into the 27 regions corresponding
+    // to {+|-|0}X, {+|-|0}Y, {+|-|0}Z and classify the
+    // sphere center into one of them.
+    Vector3 centerRegion;
+
+    // In the edge collision case, the edge is between vertices
+    // (constant + variable) and (constant - variable).
+    Vector3 constant, variable;
+
+    int numNonZero = 0;
+
+    // Iterate over axes
+    for (int a = 0; a < 3; ++a) { 
+        // For each (box side), see which direction the sphere
+        // is outside the box (positive or negative).  Add the
+        // square of that distance to the total distance from 
+        // the box.
+
+        float distanceFromLow  = -halfExtent[a] - center[a];
+        float distanceFromHigh = center[a] - halfExtent[a];
+
+        if (fabsf(distanceFromLow) < fabsf(distanceFromHigh)) {
+            distOutsideBox[a] = distanceFromLow;
+        } else {
+            distOutsideBox[a] = distanceFromHigh;
+        }
+
+        if (distanceFromLow < 0.0) {
+            if (distanceFromHigh < 0.0) {
+                // Inside the box
+                centerRegion[a] = 0.0;
+                variable[a]     = 1.0;
+            } else {
+                // Off the high side
+                centerRegion[a] = 1.0;
+                constant[a]     = halfExtent[a];
+                ++numNonZero;
+            }
+        } else if (distanceFromHigh < 0.0) {
+            // Off the low side
+            centerRegion[a] = -1.0;
+            constant[a]     = -halfExtent[a];
+            ++numNonZero;
+        } else {
+            debugAssertM(false, 
+                "distanceFromLow and distanceFromHigh cannot both be positive");
+        }
+    }
+
+    // Squared distance between the outside of the box and the
+    // sphere center.
+    float d2 = Vector3::zero().max(distOutsideBox).squaredMagnitude();
+
+    if (d2 > square(sphere.radius)) {
+        // There is no penetration because the distance is greater
+        // than the radius of the sphere.  This is the common case
+        // and we quickly exit.
+        return -1;
+    }
+
+    // We know there is some penetration but need to classify it.
+    //
+    // Examine the region that contains the center of the sphere. If
+    // there is exactly one non-zero axis, the collision is with a 
+    // plane.  If there are exactly two non-zero axes, the collision
+    // is with an edge.  If all three axes are non-zero, the collision is
+    // with a vertex.  If there are no non-zero axes, the center is inside
+    // the box.
+
+    double depth = -1;
+    switch (numNonZero) {
+    case 3: // Vertex collision
+        // The collision point is the vertex at constant, the normal
+        // is the vector from there to the sphere center.
+        contactNormals.append(boxFrame.normalToWorldSpace(constant - center));
+        contactPoints.append(boxFrame.pointToWorldSpace(constant));
+        depth = sphere.radius - sqrt(d2);
+        break;
+
+    case 2: // Edge collision
+        {
+            // TODO: unwrapping the edge constructor and closest point
+            // code will probably make it faster.
+
+            // Determine the edge
+            Line line = Line::fromPointAndDirection(constant, variable);
+
+            // Penetration depth:
+            depth = sphere.radius - sqrt(d2);
+
+            // The contact point is the closes point to the sphere on the line 
+            Vector3 X = line.closestPoint(center);
+            contactNormals.append(boxFrame.normalToWorldSpace(X - center).direction());
+            contactPoints.append(boxFrame.pointToWorldSpace(X));
+        }
+        break;
+
+    case 1: // Plane collision
+        {
+            // The plane normal is the centerRegion vector,
+            // so the sphere normal is the negative.  Take
+            // it to world space from box-space.
+
+            // Center region doesn't need to be normalized because
+            // it is known to contain only one non-zero value
+            // and that value is +/- 1.
+            Vector3 N = boxFrame.normalToWorldSpace(-centerRegion);
+            contactNormals.append(N);
+
+            // Penetration depth:
+            depth = sphere.radius - sqrtf(d2);
+
+            // Compute the contact point from the penetration depth
+            contactPoints.append(sphere.center + N * (sphere.radius - depth));
+        }
+        break;
+
+    case 0: // Volume collision
+
+        // The sphere center is inside the box.  This is an easy case
+        // to handle.  Note that all axes of distOutsideBox must
+        // be negative.  
+    
+        // Arbitratily choose the sphere center as a contact point
+        contactPoints.append(sphere.center);
+
+        // Find the least-negative penetration axis.
+        //
+        // We could have computed this during the loop over the axes,
+        // but since volume collisions are rare (they only occur with
+        // large time steps), this case will seldom be executed and
+        // should not be optimized at the expense of the others.
+        if (distOutsideBox.x > distOutsideBox.y) {
+            if (distOutsideBox.x > distOutsideBox.z) {
+                // Smallest penetration on x-axis
+                // Chose normal based on which side we're closest to.
+                // Keep in mind that this is a normal to the sphere,
+                // so it is the inverse of the box normal.
+                if (center.x > 0) {
+                    contactNormals.append(boxFrame.normalToWorldSpace(-Vector3::unitX()));
+                } else {
+                    contactNormals.append(boxFrame.normalToWorldSpace(Vector3::unitX()));
+                }
+                depth = -distOutsideBox.x;
+            } else {
+                // Smallest penetration on z-axis
+                goto ZAXIS;
+            }
+        } else if (distOutsideBox.y > distOutsideBox.z) {
+            // Smallest penetration on y-axis
+            // Chose normal based on which side we're closest to.
+            // Keep in mind that this is a normal to the sphere,
+            // so it is the inverse of the box normal.
+            if (center.y > 0) {
+                contactNormals.append(boxFrame.normalToWorldSpace(-Vector3::unitY()));
+            } else {
+                contactNormals.append(boxFrame.normalToWorldSpace(Vector3::unitY()));
+            }
+            depth = -distOutsideBox.y;
+        } else {
+            // Smallest on z-axis
+ZAXIS:
+            // Chose normal based on which side we're closest to.
+            // Keep in mind that this is a normal to the sphere,
+            // so it is the inverse of the box normal.
+            if (center.z > 0) {
+                contactNormals.append(boxFrame.normalToWorldSpace(-Vector3::unitZ()));
+            } else {
+                contactNormals.append(boxFrame.normalToWorldSpace(Vector3::unitZ()));
+            }
+            depth = -distOutsideBox.z;
+        }
+        break;
+
+    default:
+        debugAssertM(false, "Fell through switch");
+        break;
+    }
+
+    return depth;
+}
+
+
+float CollisionDetection::penetrationDepthForFixedSphereFixedSphere(
+    const Sphere&           sphereA,
+    const Sphere&           sphereB,
+    Array&         contactPoints,
+    Array&         contactNormals) {
+
+    Vector3 axis = sphereB.center - sphereA.center;
+    double radius = sphereA.radius + sphereB.radius;
+    double mag = axis.magnitude();
+    axis /= mag;
+    double depth = -(mag - radius);
+
+    contactPoints.resize(0, DONT_SHRINK_UNDERLYING_ARRAY);
+    contactNormals.resize(0, DONT_SHRINK_UNDERLYING_ARRAY);
+
+    if (depth >= 0) {
+        contactPoints.append(sphereA.center + axis * (sphereA.radius - depth / 2));
+        contactNormals.append(axis);
+    }
+
+    return depth;
+}
+
+
+float CollisionDetection::penetrationDepthForFixedSphereFixedPlane(
+    const Sphere&           sphereA,
+    const Plane&            planeB,
+    Array&         contactPoints,
+    Array&         contactNormals) {
+
+    Vector3 N;
+    double d;
+
+    planeB.getEquation(N, d);
+    
+    double depth = -(sphereA.center.dot(N) + d - sphereA.radius);
+
+    contactPoints.resize(0, DONT_SHRINK_UNDERLYING_ARRAY);
+    contactNormals.resize(0, DONT_SHRINK_UNDERLYING_ARRAY);
+
+    if (depth >= 0) {
+        contactPoints.append(N * (depth - sphereA.radius) + sphereA.center);
+        contactNormals.append(N);
+    }
+
+    return depth;
+}
+
+
+float CollisionDetection::penetrationDepthForFixedBoxFixedPlane(
+    const Box&          box,
+    const Plane&        plane,
+    Array&     contactPoints,
+    Array&     contactNormals) {
+
+    Vector3 N;
+    double d;
+    
+    plane.getEquation(N, d);
+
+    contactPoints.resize(0, DONT_SHRINK_UNDERLYING_ARRAY);
+    contactNormals.resize(0, DONT_SHRINK_UNDERLYING_ARRAY);
+
+    float lowest = finf();
+    for (int i = 0; i < 8; ++i) {
+        const Vector3 vertex = box.corner(i);
+        
+        float x = vertex.dot(N) + (float)d;
+        
+        if (x <= 0) {
+            // All vertices below the plane should be contact points.
+            contactPoints.append(vertex);
+            contactNormals.append(-N);
+        }
+
+        lowest = min(lowest, x);
+    }
+
+    // Depth should be a positive number
+    return -lowest;
+}
+
+
+float CollisionDetection::collisionTimeForMovingPointFixedPlane(
+    const Vector3&  point,
+    const Vector3&  velocity,
+    const Plane&    plane,
+    Vector3&        location,
+    Vector3&        outNormal) {
+
+    // Solve for the time at which normal.dot(point + velocity) + d == 0.
+    double d;
+    Vector3 normal;
+    plane.getEquation(normal, d);
+    
+    float vdotN = velocity.dot(normal);
+    float pdotN = point.dot(normal);
+
+    if (fuzzyEq(pdotN + d, 0)) {
+        // The point is *in* the plane.
+        location = point;
+        outNormal = normal;
+        return 0;
+    }
+
+    if (vdotN >= 0) {
+        // no collision will occur
+        location = Vector3::inf();
+        return finf();
+    }
+
+    float t = -(pdotN + d) / vdotN;
+    if (t < 0) {
+        location = Vector3::inf();
+        return finf();
+    } else {
+        location = point + velocity * t;
+        outNormal = normal;
+        return t;
+    }
+}
+
+bool __fastcall CollisionDetection::rayAABox(
+    const Ray&              ray,
+    const Vector3&          invDir,
+    const AABox&            box,
+    const Vector3&          boxCenter,
+    float                   boundingRadiusSquared,
+    Vector3&                location,
+    bool&                   inside) {
+
+    debugAssertM(fabs(ray.direction().squaredLength() - 1.0f) < 0.01f, format("Length = %f", ray.direction().length()));
+    {
+        // Pre-emptive partial bounding sphere test
+        const Vector3 L(boxCenter - ray.origin());
+        float d = L.dot(ray.direction());
+
+        float L2 = L.dot(L);
+        float D2 = square(d);
+        float M2 = L2 - D2;
+
+        if (((d < 0) && (L2 > boundingRadiusSquared)) || (M2 > boundingRadiusSquared)) {
+            inside = false;
+            return false;
+        }
+        // Passing here does not mean that the ray hits the bounding sphere;
+        // we would still have to perform more expensive tests to determine
+        // that.
+    }
+
+    inside = true;
+    const Vector3& MinB = box.low();
+    const Vector3& MaxB = box.high();
+    Vector3 MaxT(-1.0f, -1.0f, -1.0f);
+
+    // Find candidate planes.
+    for (int i = 0; i < 3; ++i) {
+        if (ray.origin()[i] < MinB[i]) {
+            location[i]	= MinB[i];
+            inside      = false;
+            
+            // Calculate T distances to candidate planes
+            if (ray.direction()[i] != 0) {
+                MaxT[i] = (MinB[i] - ray.origin()[i]) * invDir[i];
+            }
+        } else if (ray.origin()[i] > MaxB[i]) {
+            location[i]	= MaxB[i];
+            inside      = false;
+
+            // Calculate T distances to candidate planes
+            if (ray.direction()[i] != 0) {
+                MaxT[i] = (MaxB[i] - ray.origin()[i]) * invDir[i];
+            }
+        }
+    }
+
+    if (inside) {
+    	// Ray origin inside bounding box
+        location = ray.origin();
+        return true;
+    }
+    
+    // Get largest of the maxT's for final choice of intersection
+    int WhichPlane = 0;
+    if (MaxT[1] > MaxT[WhichPlane]) {
+        WhichPlane = 1;
+    }
+
+    if (MaxT[2] > MaxT[WhichPlane]) {
+        WhichPlane = 2;
+    }
+
+    // Check final candidate actually inside box
+    if (MaxT[WhichPlane] < 0.0f) {
+        // Miss the box
+        return false;
+    }
+
+    for (int i = 0; i < 3; ++i) {
+        if (i != WhichPlane) {
+            location[i] = ray.origin()[i] + MaxT[WhichPlane] * ray.direction()[i];
+            if ((location[i] < MinB[i]) ||
+                (location[i] > MaxB[i])) {
+                // On this plane we're outside the box extents, so
+                // we miss the box
+                return false;
+            }
+        }
+    }
+    
+    return true;
+}
+
+float CollisionDetection::collisionTimeForMovingPointFixedSphere(
+    const Vector3&  point,
+    const Vector3&  velocity,
+    const Sphere&   sphere,
+    Vector3&        location,
+    Vector3&        outNormal,
+    bool            solid) {
+
+    if (solid && sphere.contains(point)) {
+        location = point;
+        outNormal = (point - sphere.center).direction();
+        return 0.0f;
+    }
+
+    float          speed = velocity.magnitude();
+    const Vector3& direction = velocity / speed;
+
+    // length of the axis between the start and the sphere
+    const Vector3& L = sphere.center - point;
+    float          d = L.dot(direction);
+
+    float L2 = L.dot(L);
+    float R2 = square(sphere.radius);
+    float D2 = square(d);
+
+    if ((d < 0.0f) && (L2 > R2)) {
+        location = Vector3::inf();
+        return finf();
+    }
+
+    const float M2 = L2 - D2;
+
+    if (M2 > R2) {
+        location = Vector3::inf();
+        return finf();
+    }
+
+    float q = sqrt(R2 - M2);
+    float time;
+
+    if (L2 > R2) {
+        time = d - q;
+    } else {
+        time = d + q;
+    }
+
+    time /= speed;
+
+    location  = point + velocity * time;
+    outNormal = (location - sphere.center).direction();
+
+    return time;
+}
+
+
+float CollisionDetection::collisionTimeForMovingSphereFixedSphere(
+    const Sphere&   movingSphere,
+    const Vector3&  velocity,
+    const Sphere&   fixedSphere,
+    Vector3&        location,
+    Vector3&        outNormal) {
+
+    const Vector3& sep = (fixedSphere.center - movingSphere.center);
+    float sepLen = sep.squaredLength();
+    if (sepLen < square(movingSphere.radius + fixedSphere.radius)) {
+        // Interpenetrating
+        outNormal   = sep.directionOrZero();
+        location = fixedSphere.center - outNormal * fixedSphere.radius;
+        return 0;
+    }
+
+    float time = collisionTimeForMovingPointFixedSphere
+        (movingSphere.center, velocity, 
+         Sphere(fixedSphere.center, fixedSphere.radius + movingSphere.radius), 
+         location, outNormal);
+
+    if (time < finf()) {
+        // Location is now the center of the moving sphere at the collision time.
+        // Adjust for the size of the moving sphere.  Two spheres always collide
+        // along a line between their centers.
+        location += (location - fixedSphere.center) * movingSphere.radius / fixedSphere.radius;
+    }
+
+    return time;
+}
+
+
+/*
+float CollisionDetection::collisionTimeForMovingPointFixedTriangle(
+    const Vector3&			point,
+    const Vector3&			velocity,
+    const Triangle&       triangle,
+    Vector3&				outLocation,
+    Vector3&                outNormal) {
+
+    double time = collisionTimeForMovingPointFixedPlane(point, velocity, triangle.plane(), outLocation, outNormal);
+
+    if (time == finf()) {
+        // No collision with the plane of the triangle.
+        return finf();
+    }
+
+    if (isPointInsideTriangle(triangle.vertex(0), triangle.vertex(1), triangle.vertex(2), triangle.normal(), outLocation, triangle.primaryAxis())) {
+        // Collision occured inside the triangle
+        return time;
+    } else {
+        // Missed the triangle
+        outLocation = Vector3::inf();
+        return finf();
+    }
+}*/
+
+/*
+float CollisionDetection::collisionTimeForMovingPointFixedTriangle(
+    const Vector3& orig,
+    const Vector3& dir,
+    const Vector3& vert0,
+    const Vector3& vert1,
+    const Vector3& vert2) {
+
+    // Barycenteric coords
+    double u, v;
+    #define EPSILON 0.000001
+    #define CROSS(dest,v1,v2) \
+              dest[0]=v1[1]*v2[2]-v1[2]*v2[1]; \
+              dest[1]=v1[2]*v2[0]-v1[0]*v2[2]; \
+              dest[2]=v1[0]*v2[1]-v1[1]*v2[0];
+
+    #define DOT(v1,v2) (v1[0]*v2[0]+v1[1]*v2[1]+v1[2]*v2[2])
+
+    #define SUB(dest,v1,v2) \
+              dest[0]=v1[0]-v2[0]; \
+              dest[1]=v1[1]-v2[1]; \
+              dest[2]=v1[2]-v2[2]; 
+
+    double edge1[3], edge2[3], tvec[3], pvec[3], qvec[3];
+    
+    // find vectors for two edges sharing vert0
+    SUB(edge1, vert1, vert0);
+    SUB(edge2, vert2, vert0);
+    
+    // begin calculating determinant - also used to calculate U parameter
+    CROSS(pvec, dir, edge2);
+    
+    // if determinant is near zero, ray lies in plane of triangle
+    const double det = DOT(edge1, pvec);
+    
+    if (det < EPSILON) {
+        return finf();
+    }
+    
+    // calculate distance from vert0 to ray origin
+    SUB(tvec, orig, vert0);
+    
+    // calculate U parameter and test bounds
+    u = DOT(tvec, pvec);
+    if ((u < 0.0) || (u > det)) {
+        // Hit the plane outside the triangle
+        return finf();
+    }
+    
+    // prepare to test V parameter
+    CROSS(qvec, tvec, edge1);
+    
+    // calculate V parameter and test bounds
+    v = DOT(dir, qvec);
+    if ((v < 0.0) || (u + v > det)) {
+        // Hit the plane outside the triangle
+        return finf();
+    }
+    
+    // calculate t, scale parameters, ray intersects triangle
+    // If we want u,v, we can compute this
+    // double t = DOT(edge2, qvec);
+    //const double inv_det = 1.0 / det;
+    //t *= inv_det;
+    //u *= inv_det;
+    //v *= inv_det;
+    // return t;
+
+    // Case where we don't need correct (u, v):
+
+    const double t = DOT(edge2, qvec);
+    
+    if (t >= 0) {
+        // Note that det must be positive
+        return t / det;
+    } else {
+        // We had to travel backwards in time to intersect
+        return finf();
+    }
+
+    #undef EPSILON
+    #undef CROSS
+    #undef DOT
+    #undef SUB
+}
+*/
+
+float CollisionDetection::collisionTimeForMovingPointFixedBox(
+    const Vector3&          point,
+    const Vector3&          velocity,
+    const Box&              box,
+    Vector3&                location,
+    Vector3&                outNormal) {
+
+    double    bestTime;
+
+    Vector3 normal;
+    Vector3 v[4];
+
+    // Prime the loop
+    int f = 0;
+    box.getFaceCorners(f, v[0], v[1], v[2], v[3]);
+    bestTime = collisionTimeForMovingPointFixedRectangle(point, velocity, v[0], v[1], v[2], v[3], location, normal);
+    outNormal = normal;
+
+    // Check other faces
+    for (f = 1; f < 6; ++f) {
+        Vector3 pos;
+        box.getFaceCorners(f, v[0], v[1], v[2], v[3]);
+        float time = collisionTimeForMovingPointFixedRectangle(point, velocity, v[0], v[1], v[2], v[3], pos, normal);
+        if (time < bestTime) {
+            bestTime = time;
+            outNormal = normal;
+            location = pos;
+        }
+    }
+
+    return bestTime;
+}
+
+
+float CollisionDetection::collisionTimeForMovingPointFixedAABox(
+    const Vector3&          origin,
+    const Vector3&          dir,
+    const AABox&            box,
+    Vector3&                location,
+    bool&                   Inside,
+    Vector3&                normal) {
+
+    if (collisionLocationForMovingPointFixedAABox(origin, dir, box, location, Inside, normal)) {
+        return (location - origin).magnitude();
+    } else {
+        return (float)finf();
+    }
+}
+
+
+bool CollisionDetection::collisionLocationForMovingPointFixedAABox(
+    const Vector3&          origin,
+    const Vector3&          dir,
+    const AABox&            box,
+    Vector3&                location,
+    bool&                   Inside,
+    Vector3&                normal) {
+
+    // Integer representation of a floating-point value.
+    #define IR(x)	((uint32&)x)
+
+    Inside = true;
+	const Vector3& MinB = box.low();
+	const Vector3& MaxB = box.high();
+	Vector3 MaxT(-1.0f, -1.0f, -1.0f);
+
+	// Find candidate planes.
+    for (int i = 0; i < 3; ++i) {
+		if (origin[i] < MinB[i]) {
+			location[i]	= MinB[i];
+			Inside      = false;
+
+			// Calculate T distances to candidate planes
+            if (IR(dir[i])) {
+                MaxT[i] = (MinB[i] - origin[i]) / dir[i];
+            }
+        } else if (origin[i] > MaxB[i]) {
+			location[i]	= MaxB[i];
+			Inside	    = false;
+
+			// Calculate T distances to candidate planes
+            if (IR(dir[i])) {
+                MaxT[i] = (MaxB[i] - origin[i]) / dir[i];
+            }
+		}
+	}
+
+	if (Inside) {
+    	// Ray origin inside bounding box
+        location = origin;
+		return false;
+	}
+
+	// Get largest of the maxT's for final choice of intersection
+	int WhichPlane = 0;
+    if (MaxT[1] > MaxT[WhichPlane])	{
+        WhichPlane = 1;
+    }
+
+    if (MaxT[2] > MaxT[WhichPlane])	{
+        WhichPlane = 2;
+    }
+
+	// Check final candidate actually inside box
+    if (IR(MaxT[WhichPlane]) & 0x80000000) {
+        // Miss the box
+        return false;
+    }
+
+	for (int i = 0; i < 3; ++i) {
+        if (i != WhichPlane) {
+			location[i] = origin[i] + MaxT[WhichPlane] * dir[i];
+            if ((location[i] < MinB[i]) ||
+                (location[i] > MaxB[i])) {
+                // On this plane we're outside the box extents, so
+                // we miss the box
+                return false;
+            }
+		}
+	}
+
+    // Choose the normal to be the plane normal facing into the ray
+    normal = Vector3::zero();
+    normal[WhichPlane] = (dir[WhichPlane] > 0) ? -1.0 : 1.0;
+
+	return true;
+
+    #undef IR
+}
+
+
+
+float CollisionDetection::collisionTimeForMovingPointFixedRectangle(
+    const Vector3&      point,
+    const Vector3&      velocity,
+    const Vector3&      v0,
+    const Vector3&      v1,
+    const Vector3&      v2,
+    const Vector3&      v3,
+    Vector3&            location,
+    Vector3&            outNormal) {
+
+    Plane plane = Plane(v0, v1, v2);
+
+    float time = collisionTimeForMovingPointFixedPlane(point, velocity, plane, location, outNormal);
+
+    if (time == finf()) {
+        // No collision is ever going to happen
+        return time;
+    }
+
+    if (isPointInsideRectangle(v0, v1, v2, v3, plane.normal(), location)) {
+        // The intersection point is inside the rectangle; that is the location where
+        // the point hits the rectangle.
+        return time;
+    } else {
+        return finf();
+    }
+}
+
+/** Used by findRayCapsuleIntersection.
+    @cite From magic software http://www.magic-software.com/Source/Intersection3D/MgcIntr3DLinCap.cpp */
+static int findRayCapsuleIntersectionAux(
+	const Vector3&		rkOrigin,
+	const Vector3&		rkDirection,
+    const Capsule&		rkCapsule,
+	double   			afT[2]) {
+
+	Vector3 capsuleDirection = rkCapsule.point(1) - rkCapsule.point(0);
+
+    // set up quadratic Q(t) = a*t^2 + 2*b*t + c
+    Vector3 kU, kV, kW = capsuleDirection;
+    float fWLength = kW.unitize();
+    Vector3::generateOrthonormalBasis(kU, kV, kW);
+    Vector3 kD(kU.dot(rkDirection), kV.dot(rkDirection), kW.dot(rkDirection));
+    float fDLength = kD.unitize();
+
+    float fEpsilon = 1e-6f;
+
+    float fInvDLength = 1.0f/fDLength;
+    Vector3 kDiff = rkOrigin - rkCapsule.point(0);
+    Vector3 kP(kU.dot(kDiff),kV.dot(kDiff),kW.dot(kDiff));
+    float fRadiusSqr = square(rkCapsule.radius());
+
+    float fInv, fA, fB, fC, fDiscr, fRoot, fT, fTmp;
+
+    // Is the velocity parallel to the capsule direction? (or zero)
+    if ((abs(kD.z) >= 1.0f - fEpsilon) || (fDLength < fEpsilon)) {
+
+        float fAxisDir = rkDirection.dot(capsuleDirection);
+
+        fDiscr = fRadiusSqr - kP.x*kP.x - kP.y*kP.y;
+        if ((fAxisDir < 0) && (fDiscr >= 0.0f)) {
+            // Velocity anti-parallel to the capsule direction
+            fRoot = sqrt(fDiscr);
+            afT[0] = (kP.z + fRoot)*fInvDLength;
+            afT[1] = -(fWLength - kP.z + fRoot)*fInvDLength;
+            return 2;
+        } else if ((fAxisDir > 0) && (fDiscr >= 0.0f)) {
+            // Velocity parallel to the capsule direction
+            fRoot = sqrt(fDiscr);
+            afT[0] = -(kP.z + fRoot)*fInvDLength;
+            afT[1] = (fWLength - kP.z + fRoot)*fInvDLength;
+            return 2;
+        } else {
+            // sphere heading wrong direction, or no velocity at all
+            return 0;
+        }   
+    }
+
+    // test intersection with infinite cylinder
+    fA = kD.x*kD.x + kD.y*kD.y;
+    fB = kP.x*kD.x + kP.y*kD.y;
+    fC = kP.x*kP.x + kP.y*kP.y - fRadiusSqr;
+    fDiscr = fB*fB - fA*fC;
+    if (fDiscr < 0.0f) {
+        // line does not intersect infinite cylinder
+        return 0;
+    }
+
+    int iQuantity = 0;
+
+    if (fDiscr > 0.0f) {
+        // line intersects infinite cylinder in two places
+        fRoot = sqrt(fDiscr);
+        fInv = 1.0f/fA;
+        fT = (-fB - fRoot)*fInv;
+        fTmp = kP.z + fT*kD.z;
+        if ((0.0f <= fTmp) && (fTmp <= fWLength)) {
+            afT[iQuantity] = fT * fInvDLength;
+            iQuantity++;
+		}
+
+        fT = (-fB + fRoot)*fInv;
+        fTmp = kP.z + fT*kD.z;
+        
+		if ((0.0f <= fTmp) && (fTmp <= fWLength)) {
+            afT[iQuantity++] = fT*fInvDLength;
+		}
+
+        if (iQuantity == 2) {
+            // line intersects capsule wall in two places
+            return 2;
+        }
+    } else {
+        // line is tangent to infinite cylinder
+        fT = -fB/fA;
+        fTmp = kP.z + fT*kD.z;
+        if ((0.0f <= fTmp) && (fTmp <= fWLength)) {
+            afT[0] = fT*fInvDLength;
+            return 1;
+        }
+    }
+
+    // test intersection with bottom hemisphere
+    // fA = 1
+    fB += kP.z*kD.z;
+    fC += kP.z*kP.z;
+    fDiscr = fB*fB - fC;
+    if (fDiscr > 0.0f) {
+        fRoot = sqrt(fDiscr);
+        fT = -fB - fRoot;
+        fTmp = kP.z + fT*kD.z;
+        if (fTmp <= 0.0f) {
+            afT[iQuantity++] = fT*fInvDLength;
+            if (iQuantity == 2) {
+                return 2;
+			}
+        }
+
+        fT = -fB + fRoot;
+        fTmp = kP.z + fT*kD.z;
+        if (fTmp <= 0.0f) {
+            afT[iQuantity++] = fT*fInvDLength;
+            if (iQuantity == 2) {
+                return 2;
+			}
+        }
+    } else if (fDiscr == 0.0f) {
+        fT = -fB;
+        fTmp = kP.z + fT*kD.z;
+        if (fTmp <= 0.0f) {
+            afT[iQuantity++] = fT*fInvDLength;
+            if (iQuantity == 2) {
+                return 2;
+			}
+        }
+    }
+
+    // test intersection with top hemisphere
+    // fA = 1
+    fB -= kD.z*fWLength;
+    fC += fWLength*(fWLength - 2.0f*kP.z);
+
+    fDiscr = fB*fB - fC;
+    if (fDiscr > 0.0f) {
+        fRoot = sqrt(fDiscr);
+        fT = -fB - fRoot;
+        fTmp = kP.z + fT*kD.z;
+        if (fTmp >= fWLength) {
+            afT[iQuantity++] = fT*fInvDLength;
+            if (iQuantity == 2) {
+                return 2;
+			}
+        }
+
+        fT = -fB + fRoot;
+        fTmp = kP.z + fT*kD.z;
+        if (fTmp >= fWLength) {
+            afT[iQuantity++] = fT*fInvDLength;
+            if (iQuantity == 2) {
+                return 2;
+			}
+        }
+    } else if (fDiscr == 0.0f) {
+        fT = -fB;
+        fTmp = kP.z + fT*kD.z;
+        if (fTmp >= fWLength) {
+            afT[iQuantity++] = fT*fInvDLength;
+            if (iQuantity == 2) {
+                return 2;
+			}
+        }
+    }
+
+    return iQuantity;
+}
+
+
+/** Used by collisionTimeForMovingPointFixedCapsule.
+    @cite From magic software http://www.magic-software.com/Source/Intersection3D/MgcIntr3DLinCap.cpp
+	
+	@param rkRay      The ray
+	@param rkCapsule  The capsule
+	@param riQuantity The number of intersections found
+	@param akPoint    The intersections found
+	@return           True if there is at least one intersection
+	*/
+static bool findRayCapsuleIntersection(
+	const Ray&			rkRay,
+	const Capsule&		rkCapsule,
+	int&				riQuantity,
+	Vector3				akPoint[2]) {
+
+    double afT[2];
+    riQuantity = findRayCapsuleIntersectionAux(rkRay.origin(), rkRay.direction(), rkCapsule, afT);
+
+    // Only return intersections that occur in the future
+    int iClipQuantity = 0;
+	int i;
+    for (i = 0; i < riQuantity; ++i) {
+        if (afT[i] >= 0.0f) {
+            akPoint[iClipQuantity] = rkRay.origin() + afT[i] * rkRay.direction();
+            ++iClipQuantity;
+        }
+    }
+
+    riQuantity = iClipQuantity;
+    return (riQuantity > 0);
+}
+
+float CollisionDetection::collisionTimeForMovingPointFixedCapsule(
+	const Vector3&		_point,
+	const Vector3&		velocity,
+	const Capsule&		capsule,
+	Vector3&		    location,
+    Vector3&            outNormal) {
+
+	float timeScale = velocity.magnitude();
+
+    if (timeScale == 0.0f) {
+        timeScale = 1;
+    }
+
+	Vector3 direction = velocity / timeScale;
+	int numIntersections;
+	Vector3 intersection[2];
+	findRayCapsuleIntersection(Ray::fromOriginAndDirection(_point, direction), capsule, numIntersections, intersection);
+
+	if (numIntersections == 2) {
+		// A collision can only occur if there are two intersections.  If there is one
+		// intersection, that one is exiting the capsule.  
+
+		// Find the entering intersection (the first one that occurs).
+		float d0 = (intersection[0] - _point).squaredMagnitude();
+		float d1 = (intersection[1] - _point).squaredMagnitude();
+
+        // Compute the surface normal (if we aren't ignoring the result)
+        if (&outNormal != &ignore) {
+            Vector3 p2 = LineSegment::fromTwoPoints(capsule.point(0), capsule.point(1)).closestPoint(_point);
+            outNormal = (_point - p2).direction();
+        }
+
+        if (d0 > d1) {
+			location = intersection[1];
+			return sqrt(d1) / timeScale;
+		} else {
+			location = intersection[0];
+			return sqrt(d0) / timeScale;
+		}
+	} else {
+		// No entering intersection discovered; return no intersection.
+		location = Vector3::inf();
+		return finf();
+	}
+}
+
+
+float CollisionDetection::collisionTimeForMovingSphereFixedPlane(
+    const Sphere&		sphere,
+    const Vector3&		velocity,
+    const Plane&		plane,
+    Vector3&			location,
+    Vector3&            outNormal) {
+
+	if (sphere.radius == 0) {
+		// Optimization for zero radius sphere
+        return collisionTimeForMovingPointFixedPlane(sphere.center, velocity, plane, location, outNormal);
+	}
+
+    // The collision point on the sphere will be the point at
+    // center - (radius * normal).  Collisions only occur when
+    // the sphere is travelling into the plane.
+
+    double d;
+    plane.getEquation(outNormal, d);
+    
+    double vdotN = velocity.dot(outNormal);
+
+    if (fuzzyGt(vdotN, 0)) {
+        // No collision when the sphere is moving towards a backface.
+        location = Vector3::inf();
+        return (float)finf();
+    }
+
+    float cdotN = sphere.center.dot(outNormal);
+
+    // Distance from the center to the plane
+    float distance = cdotN + (float)d;
+
+    // Where is the collision on the sphere?
+    Vector3 point = sphere.center - (sphere.radius * outNormal);
+
+    if (fuzzyLe(G3D::abs(distance), sphere.radius)) {
+        // Already interpenetrating
+        location = sphere.center - distance * outNormal;
+        return 0;
+    } else {
+        return collisionTimeForMovingPointFixedPlane(point, velocity, plane, location, outNormal);
+    }
+
+}
+
+
+float CollisionDetection::collisionTimeForMovingSphereFixedTriangle(
+    const class Sphere&		sphere,
+    const Vector3&              velocity,
+    const Triangle&             triangle,
+    Vector3&                    outLocation,
+    float                       b[3]) {
+
+    Vector3 dummy;
+    float time = collisionTimeForMovingSphereFixedPlane(sphere, velocity, triangle.plane(), 
+                                                        outLocation, dummy);
+
+    if (time == finf()) {
+        // No collision is ever going to happen
+        return time;
+    }
+
+    // We will hit the plane of the triangle at *time*. See if
+    // the intersection point actually is within the triangle.
+
+    if (isPointInsideTriangle(triangle.vertex(0), triangle.vertex(1), triangle.vertex(2), triangle.normal(), 
+        outLocation, b, triangle.primaryAxis())) {
+
+        // The intersection point is inside the triangle; that is the location where
+        // the sphere hits the triangle.
+
+#       ifdef G3D_DEBUG
+        {
+            // Internal consistency checks
+            debugAssertM(b[0] >= 0.0 && b[0] <= 1.0f, "Intersection is outside triangle.");
+            debugAssertM(b[1] >= 0.0 && b[1] <= 1.0f, "Intersection is outside triangle.");
+            debugAssertM(b[2] >= 0.0 && b[2] <= 1.0f, "Intersection is outside triangle.");
+            Vector3 blend = 
+                b[0] * triangle.vertex(0) + 
+                b[1] * triangle.vertex(1) + 
+                b[2] * triangle.vertex(2);
+            debugAssertM(blend.fuzzyEq(outLocation), "Barycentric coords don't match intersection.");
+            // Call again so that we can debug the problem
+            // isPointInsideTriangle(triangle.vertex(0), triangle.vertex(1), triangle.vertex(2), triangle.normal(), 
+            // outLocation, b, triangle.primaryAxis());
+        }
+#       endif
+
+        return time;
+    }
+
+    // The collision (if it exists) is with a point on the triangle perimeter.
+    // Switch over to moving the triangle towards a fixed sphere and see at what time
+    // they will hit.
+
+    // Closest point on the triangle to the sphere intersection with the plane.
+    int edgeIndex;
+    const Vector3& point = closestPointOnTrianglePerimeter(triangle._vertex, triangle.edgeDirection,
+                                                           triangle.edgeMagnitude, outLocation, edgeIndex);
+
+    float t = 0;
+    if (! sphere.contains(point)) {
+        // The point is outside the sphere--see when it will hit
+        t = collisionTimeForMovingPointFixedSphere(point, -velocity, sphere, dummy, dummy);
+    }
+
+    if (t < finf()) {
+        outLocation = point;
+        // Compute Barycentric coords
+
+        // Index of the next vertex
+        static const int next[] = {1, 2, 0};
+
+        // Project along the edge in question.
+        // Avoid sqrt by taking advantage of the existing edgeDirection unit vector.
+        b[next[edgeIndex]] = (outLocation - triangle._vertex[edgeIndex]).dot
+            (triangle.edgeDirection[edgeIndex]) / triangle.edgeMagnitude[edgeIndex];
+
+        b[edgeIndex] = 1.0f - b[next[edgeIndex]];
+
+        b[next[next[edgeIndex]]] = 0.0f;
+
+#       ifdef G3D_DEBUG
+        {
+            // Internal consistency checks
+            for (int i = 0; i < 3; ++i) {
+                debugAssertM(fuzzyGe(b[i], 0.0f) && fuzzyLe(b[i], 1.0f), "Intersection is outside triangle.");
+            }
+            Vector3 blend = 
+                b[0] * triangle.vertex(0) + 
+                b[1] * triangle.vertex(1) + 
+                b[2] * triangle.vertex(2);
+            debugAssertM(blend.fuzzyEq(outLocation), 
+                format("Barycentric coords don't match intersection. %s != %s", 
+                    blend.toString().c_str(), 
+                    outLocation.toString().c_str()));    
+
+            // Call again so that we can debug the problem
+            collisionTimeForMovingPointFixedSphere(point, -velocity, sphere, dummy, dummy);
+        }
+#       endif
+
+        // Due to tiny roundoffs, these values might be slightly out of bounds.
+        // Ensure that they are legal.  Note that the above debugging code
+        // verifies that we are not clamping truly illegal values.
+        for (int i = 0; i < 3; ++i) {
+            b[i] = clamp(b[i], 0.0f, 1.0f);
+        }
+    }
+
+    // The collision occured at the point, if it occured.  The normal
+    // was the plane normal, computed above.
+
+    return t;
+}
+
+
+float CollisionDetection::collisionTimeForMovingSphereFixedRectangle(
+    const Sphere&       sphere,
+    const Vector3&      velocity,
+    const Vector3&      v0,
+    const Vector3&      v1,
+    const Vector3&      v2,
+    const Vector3&      v3,
+    Vector3&            location,
+    Vector3&            outNormal) {
+
+    Plane plane(v0, v1, v2);
+
+    float time = collisionTimeForMovingSphereFixedPlane(sphere, velocity, plane, location, outNormal);
+
+    if (time == finf()) {
+        // No collision is ever going to happen
+        return time;
+    }
+
+    if (isPointInsideRectangle(v0, v1, v2, v3, plane.normal(), location)) {
+        // The intersection point is inside the rectangle; that is the location where
+        // the sphere hits the rectangle.
+        return time;
+    }
+
+    // Switch over to moving the rectangle towards a fixed sphere and see at what time
+    // they will hit.
+
+    Vector3 point = closestPointToRectanglePerimeter(v0, v1, v2, v3, sphere.center);
+
+    Vector3 dummy;
+    double t = collisionTimeForMovingPointFixedSphere(point, -velocity, sphere, location, dummy);
+
+    // Normal is the plane normal, location is the original location of the point.
+    location = point;
+
+    return t;
+}
+
+
+float CollisionDetection::collisionTimeForMovingSphereFixedBox(
+    const Sphere&       sphere,
+    const Vector3&      velocity,
+    const Box&          box,
+    Vector3&            location,
+    Vector3&            outNormal) {
+
+    if (fixedSolidSphereIntersectsFixedSolidBox(sphere, box)) {
+        // TODO: Compute more useful location and normal?
+        location = sphere.center;
+        outNormal = Vector3::zero();
+        return 0;
+    }
+
+    float bestTime;
+
+    Vector3 v[4];
+    int f = 0;
+    box.getFaceCorners(f, v[0], v[1], v[2], v[3]);
+    bestTime = collisionTimeForMovingSphereFixedRectangle(sphere, velocity, v[0], v[1], v[2], v[3], location, outNormal);
+
+    for (f = 1; f < 6; ++f) {
+        Vector3 pos, normal;
+        box.getFaceCorners(f, v[0], v[1], v[2], v[3]);
+        float time = collisionTimeForMovingSphereFixedRectangle(sphere, velocity, v[0], v[1], v[2], v[3], pos, normal);
+        if (time < bestTime) {
+            bestTime  = time;
+            location  = pos;
+            outNormal = normal;
+        }
+    }
+
+    return bestTime;
+}
+
+
+float CollisionDetection::collisionTimeForMovingSphereFixedCapsule(
+	const Sphere&		sphere,
+	const Vector3&		velocity,
+	const Capsule&		capsule,
+	Vector3&		    location,
+    Vector3&            outNormal) {
+
+    (void)outNormal;
+
+	Capsule _capsule(capsule.point(0), capsule.point(1), capsule.radius() + sphere.radius);
+
+    Vector3 normal;
+	double time = collisionTimeForMovingPointFixedCapsule(sphere.center, velocity, _capsule, location, normal);
+    
+    if (time < finf()) {
+        // Location is now the position of the center of the sphere at the time of collision.
+        // We have to adjust the collision location for the size of the sphere.
+        location -= sphere.radius * normal;
+    }
+
+    return time;
+}
+
+
+Vector3 CollisionDetection::bounceDirection(
+    const Sphere&   sphere,
+    const Vector3&  velocity,
+    const float     collisionTime,
+    const Vector3&  collisionLocation,
+    const Vector3&  collisionNormal) {
+
+	// Location when the collision occurs
+    Vector3 sphereLocation  = sphere.center + velocity * collisionTime;
+
+    Vector3 normal          = (sphereLocation - collisionLocation);
+    if (fuzzyEq(normal.squaredMagnitude(), 0)) {
+        normal = collisionNormal;
+    } else {
+        normal.unitize();
+    }
+
+    Vector3 direction       = velocity.direction();
+
+    // Reflect direction about the normal
+    return direction - 2.0 * normal * normal.dot(direction);
+}
+
+
+Vector3 CollisionDetection::slideDirection(
+    const Sphere&   sphere,
+    const Vector3&  velocity,
+    const float     collisionTime,
+    const Vector3&  collisionLocation) {
+
+    Vector3 sphereLocation  = sphere.center + velocity * collisionTime;
+    Vector3 normal          = (sphereLocation - collisionLocation).direction();
+    Vector3 direction       = velocity.direction();
+
+    // subtract off the part in the direction away from the normal.
+    return direction - normal * normal.dot(direction);
+}
+
+
+Vector3 CollisionDetection::closestPointOnLineSegment(
+    const Vector3& v0,
+    const Vector3& v1,
+    const Vector3& point) {
+
+    const Vector3& edge       = (v1 - v0);
+    float          edgeLength = edge.magnitude();
+
+    if (edgeLength == 0) {
+        // The line segment is a point
+        return v0;
+    }
+
+    return closestPointOnLineSegment(v0, v1, edge / edgeLength, edgeLength, point);
+}
+
+
+Vector3 CollisionDetection::closestPointOnLineSegment(
+    const Vector3& v0,
+    const Vector3& v1,
+    const Vector3& edgeDirection,
+    const float    edgeLength,
+    const Vector3& point) {
+
+    debugAssert((v1 - v0).direction().fuzzyEq(edgeDirection));
+    debugAssert(fuzzyEq((v1 - v0).magnitude(), edgeLength));
+
+    // Vector towards the point
+    const Vector3& c = point - v0;
+
+    // Projected onto the edge itself
+    float t = edgeDirection.dot(c);
+
+    if (t <= 0) {
+        // Before the start
+        return v0;
+    } else if (t >= edgeLength) {
+        // After the end
+        return v1;
+    } else {
+        // At distance t along the edge
+        return v0 + edgeDirection * t;
+    }
+}
+
+
+Vector3 CollisionDetection::closestPointOnTrianglePerimeter(
+    const Vector3&			v0, 
+    const Vector3&			v1,
+    const Vector3&			v2,
+    const Vector3&			point) {
+    
+    Vector3 v[3] = {v0, v1, v2};
+    Vector3 edgeDirection[3] = {(v1 - v0), (v2 - v1), (v0 - v2)};
+    float   edgeLength[3];
+    
+    for (int i = 0; i < 3; ++i) {
+        edgeLength[i] = edgeDirection[i].magnitude();
+        edgeDirection[i] /= edgeLength[i];
+    }
+
+    int edgeIndex;
+    return closestPointOnTrianglePerimeter(v, edgeDirection, edgeLength, point, edgeIndex);
+}
+
+
+Vector3 CollisionDetection::closestPointOnTrianglePerimeter(
+    const Vector3   v[3],
+    const Vector3   edgeDirection[3],
+    const float     edgeLength[3],
+    const Vector3&  point,
+    int&            edgeIndex) {
+
+    // Closest point on segment from v[i] to v[i + 1]
+    Vector3 r[3];
+
+    // Distance squared from r[i] to point
+    float d[3];
+
+    // Index of the next point
+    static const int next[] = {1, 2, 0};
+
+    for (int i = 0; i < 3; ++i) {
+        r[i] = closestPointOnLineSegment(v[i], v[next[i]], edgeDirection[i], edgeLength[i], point);
+        d[i] = (r[i] - point).squaredMagnitude();
+    }
+
+    if (d[0] < d[1]) {
+        if (d[0] < d[2]) {
+            // Between v0 and v1
+            edgeIndex = 0;
+        } else {
+            // Between v2 and v0
+            edgeIndex = 2;
+        }
+    } else {
+        if (d[1] < d[2]) {
+            // Between v1 and v2
+            edgeIndex = 1;
+        } else {
+            // Between v2 and v0
+            edgeIndex = 2;
+        }
+    }
+
+#   ifdef G3D_DEBUG
+    {
+        Vector3 diff = r[edgeIndex] - v[edgeIndex];
+        debugAssertM(fuzzyEq(diff.direction().dot(edgeDirection[edgeIndex]), 1.0f) ||
+            diff.fuzzyEq(Vector3::zero()), "Point not on correct triangle edge");
+        float frac = diff.dot(edgeDirection[edgeIndex])/edgeLength[edgeIndex];
+        debugAssertM(frac >= -0.000001, "Point off low side of edge.");
+        debugAssertM(frac <= 1.000001, "Point off high side of edge.");
+    }
+#   endif
+
+    return r[edgeIndex];
+}
+
+
+bool CollisionDetection::isPointInsideTriangle(
+    const Vector3&			v0,
+    const Vector3&			v1,
+    const Vector3&			v2,
+    const Vector3&			normal,
+    const Vector3&			point,
+    float                   b[3],
+    Vector3::Axis           primaryAxis) {
+    
+    if (primaryAxis == Vector3::DETECT_AXIS) {
+        primaryAxis = normal.primaryAxis();
+    }
+
+    // Check that the point is within the triangle using a Barycentric
+    // coordinate test on a two dimensional plane.
+    int i, j;
+
+    switch (primaryAxis) {
+    case Vector3::X_AXIS:
+        i = Vector3::Y_AXIS;
+        j = Vector3::Z_AXIS;
+        break;
+
+    case Vector3::Y_AXIS:
+        i = Vector3::Z_AXIS;
+        j = Vector3::X_AXIS;
+        break;
+
+    case Vector3::Z_AXIS:
+        i = Vector3::X_AXIS;
+        j = Vector3::Y_AXIS;
+        break;
+
+    default:
+        // This case is here to supress a warning on Linux
+        i = j = 0;
+        debugAssertM(false, "Should not get here.");
+        break;
+    }
+
+    // See if all barycentric coordinates are non-negative
+
+    // 2D area via cross product
+#   define AREA2(d, e, f)  (((e)[i] - (d)[i]) * ((f)[j] - (d)[j]) - ((f)[i] - (d)[i]) * ((e)[j] - (d)[j]))
+
+    // Area of the polygon
+    float area = AREA2(v0, v1, v2);
+    if (area == 0) {
+        // This triangle has zero area, so the point must not
+        // be in it unless the triangle point is the test point.
+        return (v0 == point);
+    }
+
+    debugAssert(area != 0);
+
+    float invArea = 1.0f / area;
+
+    // (avoid normalization until absolutely necessary)
+    b[0] = AREA2(point, v1, v2) * invArea;
+
+    if ((b[0] < 0.0f) || (b[0] > 1.0f)) {
+        return false;
+    }
+
+    b[1] = AREA2(v0,  point, v2) * invArea;
+    if ((b[1] < 0.0f) || (b[1] > 1.0f)) {
+        return false;
+    }
+
+    b[2] = 1.0f - b[0] - b[1];
+
+#   undef AREA2
+
+    return (b[2] >= 0.0f) && (b[2] <= 1.0f);
+}
+
+
+bool CollisionDetection::isPointInsideRectangle(
+    const Vector3& v0,
+    const Vector3& v1,
+    const Vector3& v2,
+    const Vector3& v3,
+    const Vector3& normal,
+    const Vector3& point) {
+
+    return isPointInsideTriangle(v0, v1, v2, normal, point) ||
+           isPointInsideTriangle(v2, v3, v0, normal, point);  
+}
+
+
+Vector3 CollisionDetection::closestPointToRectanglePerimeter(
+    const Vector3& v0,
+    const Vector3& v1,
+    const Vector3& v2,
+    const Vector3& v3,
+    const Vector3& point) {
+
+    Vector3 r0 = closestPointOnLineSegment(v0, v1, point);
+    Vector3 r1 = closestPointOnLineSegment(v1, v2, point);
+    Vector3 r2 = closestPointOnLineSegment(v2, v3, point);
+    Vector3 r3 = closestPointOnLineSegment(v3, v0, point);
+
+    double d0 = (r0 - point).squaredMagnitude();
+    double d1 = (r1 - point).squaredMagnitude();
+    double d2 = (r2 - point).squaredMagnitude();
+    double d3 = (r3 - point).squaredMagnitude();
+
+    if (d0 < d1) {
+        if (d0 < d2) {
+            if (d0 < d3) {
+                return r0;
+            } else {
+                return r3;
+            }
+        } else {
+            if (d2 < d3) {
+                return r2;
+            } else {
+                return r3;
+            }
+        }
+    } else {
+        if (d1 < d2) {
+            if (d1 < d3) {
+                return r1;
+            } else {
+                return r3;
+            }
+        } else {
+            if (d2 < d3) {
+                return r2;
+            } else {
+                return r3;
+            }
+        }
+    }
+}
+
+
+Vector3 CollisionDetection::closestPointToRectangle(
+    const Vector3&      v0,
+    const Vector3&      v1,
+    const Vector3&      v2,
+    const Vector3&      v3,
+    const Vector3&      point) {
+
+    Plane plane(v0, v1, v2);
+
+    // Project the point into the plane
+    double a, b, c, d;
+    plane.getEquation(a, b, c, d);
+    
+    double distance = a*point.x + b*point.y + c*point.z + d;
+    Vector3 planePoint = point - distance * plane.normal();
+
+    if (isPointInsideRectangle(v0, v1, v2, v3, plane.normal(), planePoint)) {
+        return planePoint;
+    } else {
+        return closestPointToRectanglePerimeter(v0, v1, v2, v3, planePoint);
+    }
+}
+
+
+bool CollisionDetection::fixedSolidSphereIntersectsFixedSolidSphere(
+    const Sphere&           sphere1,
+    const Sphere&           sphere2) {
+    
+    return (sphere1.center - sphere2.center).squaredMagnitude() < square(sphere1.radius + sphere2.radius);
+}
+
+
+bool CollisionDetection::fixedSolidSphereIntersectsFixedSolidBox(
+    const Sphere&           sphere,
+    const Box&              box) {
+
+    // If the center of the sphere is within the box, the whole
+    // sphere is within the box.
+    if (box.contains(sphere.center)) {
+        return true;
+    }
+
+    float r2 = square(sphere.radius);
+
+    // Find the closest point on the surface of the box to the sphere.  If
+    // this point is within the sphere's radius, they intersect.
+    int f;
+    for (f = 0; f < 6; ++f) {
+        Vector3 v0, v1, v2, v3;
+        box.getFaceCorners(f, v0, v1, v2, v3);
+        if ((closestPointToRectangle(v0, v1, v2, v3, sphere.center) - sphere.center).squaredMagnitude() <= r2) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+
+bool CollisionDetection::movingSpherePassesThroughFixedBox(
+    const Sphere&           sphere,
+    const Vector3&          velocity,
+    const Box&              box,
+    double                  timeLimit) {
+
+    // If they intersect originally, they definitely pass through each other.
+    if (fixedSolidSphereIntersectsFixedSolidBox(sphere, box)) {
+        return true;
+    }
+
+    // See if the sphere hits the box during the time period.
+    Vector3 dummy1, dummy2;
+
+    return (collisionTimeForMovingSphereFixedBox(sphere, velocity, box, dummy1, dummy2) < timeLimit);
+}
+
+
+bool CollisionDetection::movingSpherePassesThroughFixedSphere(
+    const Sphere&           sphere,
+    const Vector3&          velocity,
+    const Sphere&           fixedSphere,
+    double                  timeLimit) {
+
+    if (fixedSolidSphereIntersectsFixedSolidSphere(sphere, fixedSphere)) {
+        return true;
+    }
+
+    // Extend the fixed sphere by the radius of the moving sphere
+    Sphere bigFixed(fixedSphere.center, fixedSphere.radius + sphere.radius);
+    Vector3 dummy1, dummy2;
+
+    // If the sphere collides with the other sphere during the time limit, it passes through
+    return (collisionTimeForMovingPointFixedSphere(sphere.center, velocity, bigFixed, dummy1, dummy2) < timeLimit);
+}
+
+
+
+bool CollisionDetection::fixedSolidSphereIntersectsFixedTriangle(
+    const Sphere&           sphere,
+    const Triangle&         triangle) {
+
+    // How far is the sphere from the plane of the triangle
+    const Plane& plane = triangle.plane();
+
+    // Does the closest point to the sphere center lie within the triangle?
+    Vector3 v = plane.closestPoint(sphere.center);
+
+    // Is the closest point to the plane within the sphere?
+    if ((v - sphere.center).squaredLength() <= square(sphere.radius)) {
+        // Is it also within the triangle?
+        float b[3];
+        if (isPointInsideTriangle(triangle.vertex(0), triangle.vertex(1), triangle.vertex(2), triangle.normal(), 
+                v, b, triangle.primaryAxis())){
+            // The closest point is inside the triangle
+            return true;
+        }
+    }
+
+    // ignored
+    int edgeIndex;
+
+    v = closestPointOnTrianglePerimeter(triangle._vertex, triangle.edgeDirection, triangle.edgeMagnitude, sphere.center, edgeIndex);
+
+    // Is the closest point within the sphere?
+    return ((v - sphere.center).squaredLength() <= square(sphere.radius));
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// AABB-triangle overlap test code based on Tomas Akenine-Möller's
+// http://www.cs.lth.se/home/Tomas_Akenine_Moller/code/tribox3.txt
+// Ported 2008-12-28
+
+#define X 0
+#define Y 1
+#define Z 2
+
+#define FINDMINMAX(x0, x1, x2, min, max) \
+    min = max = x0;   \
+    if(x1max) max=x1;\
+    if(x2max) max=x2;
+
+static bool planeBoxOverlap(const Vector3& normal, const Vector3& vert, const Vector3& maxbox)  {
+    Vector3 vmin, vmax;
+    float v;
+    
+    // for each axis
+    for(int a = 0; a < 3; ++a) {
+        v = vert[a];
+        
+        if (normal[a] > 0.0f) {
+            vmin[a] = -maxbox[a] - v;
+            vmax[a] =  maxbox[a] - v;
+        } else {
+            vmin[a] =  maxbox[a] - v;
+            vmax[a] = -maxbox[a] - v;
+        }
+    }
+    
+    if (normal.dot(vmin) > 0.0f) {
+        return false;
+    } else if (normal.dot(vmax) >= 0.0f) {
+        return true;
+    } else {
+        return false;
+    }
+}
+
+/*======================== X-tests ========================*/
+
+#define AXISTEST_X01(a, b, fa, fb)   \
+    p0 = a*v0[Y] - b*v0[Z];          \
+    p2 = a*v2[Y] - b*v2[Z];          \
+    if(p0rad || max<-rad) return false;
+
+
+#define AXISTEST_X2(a, b, fa, fb)    \
+    p0 = a*v0[Y] - b*v0[Z];          \
+    p1 = a*v1[Y] - b*v1[Z];          \
+    if(p0rad || max<-rad) return false;
+
+/*======================== Y-tests ========================*/
+
+#define AXISTEST_Y02(a, b, fa, fb)   \
+    p0 = -a*v0[X] + b*v0[Z];         \
+    p2 = -a*v2[X] + b*v2[Z];         \
+    if(p0rad || max<-rad) return false;
+
+#define AXISTEST_Y1(a, b, fa, fb)   \
+    p0 = -a*v0[X] + b*v0[Z];        \
+    p1 = -a*v1[X] + b*v1[Z];        \
+    if(p0rad || max<-rad) return false;
+
+/*======================== Z-tests ========================*/
+
+#define AXISTEST_Z12(a, b, fa, fb)   \
+    p1 = a*v1[X] - b*v1[Y];          \
+    p2 = a*v2[X] - b*v2[Y];          \
+    if(p2rad || max<-rad) return false;
+
+#define AXISTEST_Z0(a, b, fa, fb)   \
+    p0 = a*v0[X] - b*v0[Y];   \
+    p1 = a*v1[X] - b*v1[Y];           \
+    if(p0rad || max<-rad) return false;
+
+bool CollisionDetection::fixedSolidBoxIntersectsFixedTriangle(
+   const AABox& box, const Triangle& tri) {
+
+    //    use separating axis theorem to test overlap between triangle and box 
+    //    need to test for overlap in these directions: 
+    //    1) the {x,y,z}-directions (actually, since we use the AABB of the triangle 
+    //       we do not even need to test these) 
+    //    2) normal of the triangle 
+    //    3) crossproduct(edge from tri, {x,y,z}-direction) 
+    //       this gives 3x3=9 more tests 
+
+    // This is the fastest branch (on Sun).
+    // Move the triangle to the object space of the box
+    // Triangle vertices in box object space
+
+    const Vector3& boxcenter = box.center();
+    const Vector3& boxhalfsize = box.extent() * 0.5f;
+
+    const Vector3& v0 = tri.vertex(0) - boxcenter;
+    const Vector3& v1 = tri.vertex(1) - boxcenter;
+    const Vector3& v2 = tri.vertex(2) - boxcenter;
+
+    // Compute triangle edges in object space
+    const Vector3& e0 = v1 - v0;
+    const Vector3& e1 = v2 - v1;
+    const Vector3& e2 = v0 - v2;
+
+    // Bullet 3: 
+    //  test the 9 tests first (this was faster) 
+    float min,max,p0,p1,p2,rad;
+    Vector3 fe;
+
+    fe = abs(e0);
+    AXISTEST_X01(e0[Z], e0[Y], fe[Z], fe[Y]);
+    AXISTEST_Y02(e0[Z], e0[X], fe[Z], fe[X]);
+    AXISTEST_Z12(e0[Y], e0[X], fe[Y], fe[X]);
+    
+    fe = abs(e1);
+    AXISTEST_X01(e1[Z], e1[Y], fe[Z], fe[Y]);
+    AXISTEST_Y02(e1[Z], e1[X], fe[Z], fe[X]);
+    AXISTEST_Z0 (e1[Y], e1[X], fe[Y], fe[X]);
+
+    fe = abs(e2);
+    AXISTEST_X2 (e2[Z], e2[Y], fe[Z], fe[Y]);
+    AXISTEST_Y1 (e2[Z], e2[X], fe[Z], fe[X]);
+    AXISTEST_Z12(e2[Y], e2[X], fe[Y], fe[X]);
+
+    // Bullet 1: 
+    //  first test overlap in the {x,y,z}-directions 
+    //  find min, max of the triangle each direction, and test for overlap in 
+    //  that direction -- this is equivalent to testing a minimal AABB around
+    //  the triangle against the AABB 
+
+    // test in X-direction 
+    FINDMINMAX(v0[X],v1[X],v2[X],min,max);
+    if (min > boxhalfsize[X] || max < -boxhalfsize[X]) {
+        return false;
+    }
+
+    // test in Y-direction
+    FINDMINMAX(v0[Y],v1[Y],v2[Y],min,max);
+    if (min > boxhalfsize[Y] || max < -boxhalfsize[Y]) {
+        return false;
+    }
+
+    // test in Z-direction 
+    FINDMINMAX(v0[Z],v1[Z],v2[Z],min,max);
+    if (min > boxhalfsize[Z] || max < -boxhalfsize[Z]) {
+        return false;
+    }
+
+    // Bullet 2: 
+    //  test if the box intersects the plane of the triangle 
+    //  compute plane equation of triangle: normal*x+d=0 
+
+    if (! planeBoxOverlap(tri.normal(), v0, boxhalfsize)) {
+        return false;
+    }
+
+    // box and triangle overlap
+    return true;
+}
+#undef X
+#undef Y
+#undef Z
+
+////////////////////////////////////////////////////////////////////////////////
+
+
+} // namespace
+
+#ifdef _MSC_VER
+// Turn off fast floating-point optimizations
+#pragma float_control( pop )
+#pragma warning (pop)
+#endif
diff --git a/externals/g3dlite/CoordinateFrame.cpp b/externals/g3dlite/CoordinateFrame.cpp
new file mode 100644
index 00000000000..9b639b62082
--- /dev/null
+++ b/externals/g3dlite/CoordinateFrame.cpp
@@ -0,0 +1,436 @@
+/**
+ @file CoordinateFrame.cpp
+
+ Coordinate frame class
+
+ @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+
+ @created 2001-06-02
+ @edited  2009-11-13
+
+ Copyright 2000-2010, Morgan McGuire.
+ All rights reserved.
+*/
+
+#include "G3D/platform.h"
+#include "G3D/CoordinateFrame.h"
+#include "G3D/Quat.h"
+#include "G3D/Matrix4.h"
+#include "G3D/Box.h"
+#include "G3D/AABox.h"
+#include "G3D/Sphere.h"
+#include "G3D/Triangle.h"
+#include "G3D/Ray.h"
+#include "G3D/Capsule.h"
+#include "G3D/Cylinder.h"
+#include "G3D/UprightFrame.h"
+#include "G3D/Any.h"
+#include "G3D/stringutils.h"
+
+namespace G3D {
+
+CoordinateFrame::CoordinateFrame(const Any& any) {
+    any.verifyName("CFrame");
+    if (toUpper(any.name()) == "CFRAME") {
+        any.verifyType(Any::TABLE, Any::ARRAY);
+        if (any.type() == Any::TABLE) {
+            rotation    = any["rotation"];
+            translation = any["translation"];
+        } else {
+            any.verifySize(2);
+            rotation    = any[0];
+            translation = any[1];
+        }
+    } else {
+        any.verifyName("CFrame::fromXYZYPRDegrees");
+        any.verifyType(Any::ARRAY);
+        any.verifySize(3, 6);
+
+        int s = any.size();
+
+        *this = fromXYZYPRDegrees(any[0], any[1], any[2], 
+                                  (s > 3) ? any[3].number() : 0.0f,
+                                  (s > 4) ? any[4].number() : 0.0f,
+                                  (s > 5) ? any[5].number() : 0.0f);
+    }
+}
+
+
+CoordinateFrame::operator Any() const {
+    float x, y, z, yaw, pitch, roll;
+    getXYZYPRDegrees(x, y, z, yaw, pitch, roll); 
+    Any a(Any::ARRAY, "CFrame::fromXYZYPRDegrees");
+    a.append(x, y, z, yaw);
+    if ( ! G3D::fuzzyEq(yaw, 0.0f) || ! G3D::fuzzyEq(pitch, 0.0f) || ! G3D::fuzzyEq(roll, 0.0f)) {
+        a.append(yaw);
+        if (! G3D::fuzzyEq(pitch, 0.0f) || ! G3D::fuzzyEq(roll, 0.0f)) {
+            a.append(pitch);
+            if (! G3D::fuzzyEq(roll, 0.0f)) {
+                a.append(roll);
+            }
+        }
+    }
+    return a;
+}
+
+
+CoordinateFrame::CoordinateFrame(const class UprightFrame& f) {
+    *this = f.toCoordinateFrame();
+}
+
+
+CoordinateFrame::CoordinateFrame() : 
+    rotation(Matrix3::identity()), translation(Vector3::zero()) {
+}
+
+CoordinateFrame CoordinateFrame::fromXYZYPRRadians(float x, float y, float z, float yaw, 
+                                                   float pitch, float roll) {
+    Matrix3 rotation = Matrix3::fromAxisAngle(Vector3::unitY(), yaw);
+    
+    rotation = Matrix3::fromAxisAngle(rotation.column(0), pitch) * rotation;
+    rotation = Matrix3::fromAxisAngle(rotation.column(2), roll) * rotation;
+
+    const Vector3 translation(x, y, z);
+    
+    return CoordinateFrame(rotation, translation);
+}
+
+
+void CoordinateFrame::getXYZYPRRadians(float& x, float& y, float& z, 
+                                       float& yaw, float& pitch, float& roll) const {
+    x = translation.x;
+    y = translation.y;
+    z = translation.z;
+    
+    const Vector3& look = lookVector();
+
+    if (abs(look.y) > 0.99f) {
+        // Looking nearly straight up or down
+
+        yaw   = G3D::pi() + atan2(look.x, look.z);
+        pitch = asin(look.y);
+        roll  = 0.0f;
+        
+    } else {
+
+        // Yaw cannot be affected by others, so pull it first
+        yaw = G3D::pi() + atan2(look.x, look.z);
+        
+        // Pitch is the elevation of the yaw vector
+        pitch = asin(look.y);
+        
+        Vector3 actualRight = rightVector();
+        Vector3 expectedRight = look.cross(Vector3::unitY());
+
+        roll = 0;//acos(actualRight.dot(expectedRight));  TODO
+    }
+}
+
+
+void CoordinateFrame::getXYZYPRDegrees(float& x, float& y, float& z, 
+                                       float& yaw, float& pitch, float& roll) const {
+    getXYZYPRRadians(x, y, z, yaw, pitch, roll);
+    yaw   = toDegrees(yaw);
+    pitch = toDegrees(pitch);
+    roll  = toDegrees(roll);
+}
+    
+
+CoordinateFrame CoordinateFrame::fromXYZYPRDegrees(float x, float y, float z, 
+                                                   float yaw, float pitch, float roll) {
+    return fromXYZYPRRadians(x, y, z, toRadians(yaw), toRadians(pitch), toRadians(roll));
+}
+
+
+Ray CoordinateFrame::lookRay() const {
+    return Ray::fromOriginAndDirection(translation, lookVector());
+}
+
+
+bool CoordinateFrame::fuzzyEq(const CoordinateFrame& other) const {
+
+    for (int c = 0; c < 3; ++c) {
+        for (int r = 0; r < 3; ++r) {
+            if (! G3D::fuzzyEq(other.rotation[r][c], rotation[r][c])) {
+                return false;
+            }
+        }
+        if (! G3D::fuzzyEq(translation[c], other.translation[c])) {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+
+bool CoordinateFrame::fuzzyIsIdentity() const {
+    const Matrix3& I = Matrix3::identity();
+
+    for (int c = 0; c < 3; ++c) {
+        for (int r = 0; r < 3; ++r) {
+            if (fuzzyNe(I[r][c], rotation[r][c])) {
+                return false;
+            }
+        }
+        if (fuzzyNe(translation[c], 0)) {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+
+bool CoordinateFrame::isIdentity() const {
+    return 
+        (translation == Vector3::zero()) &&
+        (rotation == Matrix3::identity());
+}
+
+
+Matrix4 CoordinateFrame::toMatrix4() const {
+    return Matrix4(*this);
+}
+
+
+std::string CoordinateFrame::toXML() const {
+    return G3D::format(
+        "\n  %lf,%lf,%lf,%lf,\n  %lf,%lf,%lf,%lf,\n  %lf,%lf,%lf,%lf,\n  %lf,%lf,%lf,%lf\n\n",
+        rotation[0][0], rotation[0][1], rotation[0][2], translation.x,
+        rotation[1][0], rotation[1][1], rotation[1][2], translation.y,
+        rotation[2][0], rotation[2][1], rotation[2][2], translation.z,
+        0.0, 0.0, 0.0, 1.0);
+}
+
+
+Plane CoordinateFrame::toObjectSpace(const Plane& p) const {
+    Vector3 N, P;
+    double d;
+    p.getEquation(N, d);
+    P = N * (float)d;
+    P = pointToObjectSpace(P);
+    N = normalToObjectSpace(N);
+    return Plane(N, P);
+}
+
+
+Plane CoordinateFrame::toWorldSpace(const Plane& p) const {
+    Vector3 N, P;
+    double d;
+    p.getEquation(N, d);
+    P = N * (float)d;
+    P = pointToWorldSpace(P);
+    N = normalToWorldSpace(N);
+    return Plane(N, P);
+}
+
+
+Triangle CoordinateFrame::toObjectSpace(const Triangle& t) const {
+    return Triangle(pointToObjectSpace(t.vertex(0)),
+        pointToObjectSpace(t.vertex(1)),
+        pointToObjectSpace(t.vertex(2)));
+}
+
+
+Triangle CoordinateFrame::toWorldSpace(const Triangle& t) const {
+    return Triangle(pointToWorldSpace(t.vertex(0)),
+        pointToWorldSpace(t.vertex(1)),
+        pointToWorldSpace(t.vertex(2)));
+}
+
+
+Cylinder CoordinateFrame::toWorldSpace(const Cylinder& c) const {
+    return Cylinder(
+        pointToWorldSpace(c.point(0)), 
+        pointToWorldSpace(c.point(1)), 
+        c.radius());
+}
+
+
+Capsule CoordinateFrame::toWorldSpace(const Capsule& c) const {
+    return Capsule(
+        pointToWorldSpace(c.point(0)), 
+        pointToWorldSpace(c.point(1)), 
+        c.radius());
+}
+
+
+Box CoordinateFrame::toWorldSpace(const AABox& b) const {
+    Box b2(b);
+    return toWorldSpace(b2);
+}
+
+
+Box CoordinateFrame::toWorldSpace(const Box& b) const {
+    Box out(b);
+
+    for (int i = 0; i < 8; ++i) {
+        out._corner[i] = pointToWorldSpace(b._corner[i]);
+        debugAssert(! isNaN(out._corner[i].x));
+    }
+
+    for (int i = 0; i < 3; ++i) {
+        out._axis[i] = vectorToWorldSpace(b._axis[i]);
+    }
+
+    out._center = pointToWorldSpace(b._center);
+
+    return out;
+}
+
+
+Box CoordinateFrame::toObjectSpace(const Box &b) const {
+    return inverse().toWorldSpace(b);
+}
+
+
+Box CoordinateFrame::toObjectSpace(const AABox& b) const {
+    return toObjectSpace(Box(b));
+}
+
+
+CoordinateFrame::CoordinateFrame(class BinaryInput& b) : rotation(Matrix3::zero()) {
+    deserialize(b);
+}
+
+
+void CoordinateFrame::deserialize(class BinaryInput& b) {
+    rotation.deserialize(b);
+    translation.deserialize(b);
+}
+
+
+void CoordinateFrame::serialize(class BinaryOutput& b) const {
+    rotation.serialize(b);
+    translation.serialize(b);
+}
+
+
+Sphere CoordinateFrame::toWorldSpace(const Sphere &b) const {
+    return Sphere(pointToWorldSpace(b.center), b.radius);
+}
+
+
+Sphere CoordinateFrame::toObjectSpace(const Sphere &b) const {
+    return Sphere(pointToObjectSpace(b.center), b.radius);
+}
+
+
+Ray CoordinateFrame::toWorldSpace(const Ray& r) const {
+    return Ray::fromOriginAndDirection(pointToWorldSpace(r.origin()), vectorToWorldSpace(r.direction()));
+}
+
+
+Ray CoordinateFrame::toObjectSpace(const Ray& r) const {
+    return Ray::fromOriginAndDirection(pointToObjectSpace(r.origin()), vectorToObjectSpace(r.direction()));
+}
+
+
+void CoordinateFrame::lookAt(const Vector3 &target) {
+    lookAt(target, Vector3::unitY());
+}
+
+
+void CoordinateFrame::lookAt(
+    const Vector3&  target,
+    Vector3         up) {
+
+    up = up.direction();
+
+    Vector3 look = (target - translation).direction();
+    if (fabs(look.dot(up)) > .99f) {
+        up = Vector3::unitX();
+        if (fabs(look.dot(up)) > .99f) {
+            up = Vector3::unitY();
+        }
+    }
+
+    up -= look * look.dot(up);
+    up.unitize();
+
+    Vector3 z = -look;
+    Vector3 x = -z.cross(up);
+    x.unitize();
+
+    Vector3 y = z.cross(x);
+
+    rotation.setColumn(0, x);
+    rotation.setColumn(1, y);
+    rotation.setColumn(2, z);
+}
+
+
+CoordinateFrame CoordinateFrame::lerp(
+    const CoordinateFrame&  other,
+    float                   alpha) const {
+
+    if (alpha == 1.0f) {
+        return other;
+    } else if (alpha == 0.0f) {
+        return *this;
+    } else {
+        Quat q1 = Quat(this->rotation);
+        Quat q2 = Quat(other.rotation);
+
+        return CoordinateFrame(
+            q1.slerp(q2, alpha).toRotationMatrix(),
+            this->translation * (1 - alpha) + other.translation * alpha);
+    }
+} 
+
+
+void CoordinateFrame::pointToWorldSpace(const Array& v, Array& vout) const {
+    vout.resize(v.size());
+
+    for (int i = v.size() - 1; i >= 0; --i) {
+        vout[i] = pointToWorldSpace(v[i]);
+    }
+}
+
+
+void CoordinateFrame::normalToWorldSpace(const Array& v, Array& vout) const  {
+    vout.resize(v.size());
+
+    for (int i = v.size() - 1; i >= 0; --i) {
+        vout[i] = normalToWorldSpace(v[i]);
+    }
+}
+
+
+void CoordinateFrame::vectorToWorldSpace(const Array& v, Array& vout) const {
+    vout.resize(v.size());
+
+    for (int i = v.size() - 1; i >= 0; --i) {
+        vout[i] = vectorToWorldSpace(v[i]);
+    }
+}
+
+
+void CoordinateFrame::pointToObjectSpace(const Array& v, Array& vout) const {
+    vout.resize(v.size());
+
+    for (int i = v.size() - 1; i >= 0; --i) {
+        vout[i] = pointToObjectSpace(v[i]);
+    }
+}
+
+
+void CoordinateFrame::normalToObjectSpace(const Array& v, Array& vout) const {
+    vout.resize(v.size());
+
+    for (int i = v.size() - 1; i >= 0; --i) {
+        vout[i] = normalToObjectSpace(v[i]);
+    }
+}
+
+
+void CoordinateFrame::vectorToObjectSpace(const Array& v, Array& vout) const {
+    vout.resize(v.size());
+
+    for (int i = v.size() - 1; i >= 0; --i) {
+        vout[i] = vectorToObjectSpace(v[i]);
+    }
+}
+
+} // namespace
diff --git a/externals/g3dlite/Crypto.cpp b/externals/g3dlite/Crypto.cpp
new file mode 100644
index 00000000000..c69b23375ce
--- /dev/null
+++ b/externals/g3dlite/Crypto.cpp
@@ -0,0 +1,70 @@
+/**
+ @file Crypto.cpp
+
+ @author Morgan McGuire, http://graphics.cs.williams.edu
+
+
+ @created 2006-03-28
+ @edited  2006-04-06
+ */
+
+#include "G3D/platform.h"
+#include "G3D/Crypto.h"
+#include "G3D/g3dmath.h"
+#include 
+
+namespace G3D {
+    
+
+int Crypto::smallPrime(int n) {
+    debugAssert(n < numSmallPrimes() && n >= 0);
+
+    // From:
+    // http://primes.utm.edu/lists/small/1000.txt
+
+    static const int table[] = {
+          2,      3,      5,      7,     11,     13,     17,     19,     23,     29, 
+         31,     37,     41,     43,     47,     53,     59,     61,     67,     71, 
+         73,     79,     83,     89,     97,    101,    103,    107,    109,    113, 
+        127,    131,    137,    139,    149,    151,    157,    163,    167,    173, 
+        179,    181,    191,    193,    197,    199,    211,    223,    227,    229, 
+        233,    239,    241,    251,    257,    263,    269,    271,    277,    281, 
+        283,    293,    307,    311,    313,    317,    331,    337,    347,    349, 
+        353,    359,    367,    373,    379,    383,    389,    397,    401,    409, 
+        419,    421,    431,    433,    439,    443,    449,    457,    461,    463, 
+        467,    479,    487,    491,    499,    503,    509,    521,    523,    541, 
+        547,    557,    563,    569,    571,    577,    587,    593,    599,    601, 
+        607,    613,    617,    619,    631,    641,    643,    647,    653,    659, 
+        661,    673,    677,    683,    691,    701,    709,    719,    727,    733, 
+        739,    743,    751,    757,    761,    769,    773,    787,    797,    809, 
+        811,    821,    823,    827,    829,    839,    853,    857,    859,    863, 
+        877,    881,    883,    887,    907,    911,    919,    929,    937,    941, 
+        947,    953,    967,    971,    977,    983,    991,    997,   1009,   1013, 
+       1019,   1021,   1031,   1033,   1039,   1049,   1051,   1061,   1063,   1069, 
+       1087,   1091,   1093,   1097,   1103,   1109,   1117,   1123,   1129,   1151, 
+       1153,   1163,   1171,   1181,   1187,   1193,   1201,   1213,   1217,   1223, 
+       1229,   1231,   1237,   1249,   1259,   1277,   1279,   1283,   1289,   1291, 
+       1297,   1301,   1303,   1307,   1319,   1321,   1327,   1361,   1367,   1373, 
+       1381,   1399,   1409,   1423,   1427,   1429,   1433,   1439,   1447,   1451, 
+       1453,   1459,   1471,   1481,   1483,   1487,   1489,   1493,   1499,   1511, 
+       1523,   1531,   1543,   1549,   1553,   1559,   1567,   1571,   1579,   1583, 
+       1597,   1601,   1607,   1609,   1613,   1619,   1621,   1627,   1637,   1657, 
+       1663,   1667,   1669,   1693,   1697,   1699,   1709,   1721,   1723,   1733, 
+       1741,   1747,   1753,   1759,   1777,   1783,   1787,   1789,   1801,   1811,
+       1823,   1831,   1847,   1861,   1867,   1871,   1873,   1877,   1879,   1889, 
+       1901,   1907,   1913,   1931,   1933,   1949,   1951,   1973,   1979,   1987, 
+       1993,   1997,   1999};
+
+    return table[n];
+}
+
+
+int Crypto::numSmallPrimes() {
+    return 303;
+}
+
+uint32 Crypto::crc32(const void* byte, size_t numBytes) {
+    return ::crc32(::crc32(0, Z_NULL, 0), static_cast(byte), numBytes);
+}
+
+} // G3D
diff --git a/externals/g3dlite/Cylinder.cpp b/externals/g3dlite/Cylinder.cpp
new file mode 100644
index 00000000000..7a7b9f9440d
--- /dev/null
+++ b/externals/g3dlite/Cylinder.cpp
@@ -0,0 +1,176 @@
+/**
+ @file Cylinder.cpp
+  
+ @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+
+ @created 2003-02-07
+ @edited  2006-02-18
+
+ Copyright 2000-2006, Morgan McGuire.
+ All rights reserved.
+ */
+
+#include "G3D/platform.h"
+#include "G3D/Cylinder.h"
+#include "G3D/BinaryInput.h"
+#include "G3D/BinaryOutput.h"
+#include "G3D/LineSegment.h"
+#include "G3D/CoordinateFrame.h"
+#include "G3D/Line.h"
+#include "G3D/AABox.h"
+
+namespace G3D {
+
+Cylinder::Cylinder(class BinaryInput& b) {
+	deserialize(b);
+}
+
+
+Cylinder::Cylinder() {
+}
+
+
+Cylinder::Cylinder(const Vector3& _p1, const Vector3& _p2, float _r) 
+	: p1(_p1), p2(_p2), mRadius(_r) {
+}
+
+
+void Cylinder::serialize(class BinaryOutput& b) const {
+	p1.serialize(b);
+	p2.serialize(b);
+	b.writeFloat64(mRadius);
+}
+
+
+void Cylinder::deserialize(class BinaryInput& b) {
+	p1.deserialize(b);
+	p2.deserialize(b);
+	mRadius = b.readFloat64();
+}
+
+
+Line Cylinder::axis() const {
+	return Line::fromTwoPoints(p1, p2);
+}
+
+
+
+float Cylinder::radius() const {
+	return mRadius;
+}
+
+
+float Cylinder::volume() const {
+	return
+		(float)pi() * square(mRadius) * (p1 - p2).magnitude();
+}
+
+
+float Cylinder::area() const {
+	return
+        // Sides
+		(twoPi() * mRadius) * height() +
+
+         // Caps
+         twoPi() * square(mRadius);
+}
+
+void Cylinder::getBounds(AABox& out) const {
+    Vector3 min = p1.min(p2) - (Vector3(1, 1, 1) * mRadius);
+    Vector3 max = p1.max(p2) + (Vector3(1, 1, 1) * mRadius);
+    out = AABox(min, max);
+}
+
+bool Cylinder::contains(const Vector3& p) const { 
+    return LineSegment::fromTwoPoints(p1, p2).distanceSquared(p) <= square(mRadius);
+}
+
+
+void Cylinder::getReferenceFrame(CoordinateFrame& cframe) const {
+    cframe.translation = center();
+
+    Vector3 Y = (p1 - p2).direction();
+    Vector3 X = (abs(Y.dot(Vector3::unitX())) > 0.9) ? Vector3::unitY() : Vector3::unitX();
+    Vector3 Z = X.cross(Y).direction();
+    X = Y.cross(Z);        
+    cframe.rotation.setColumn(0, X);
+    cframe.rotation.setColumn(1, Y);
+    cframe.rotation.setColumn(2, Z);
+}
+
+
+void Cylinder::getRandomSurfacePoint(Vector3& p, Vector3& N) const {
+    float h = height();
+    float r = radius();
+
+    // Create a random point on a standard cylinder and then rotate to the global frame.
+
+    // Relative areas (factor of 2PI already taken out)
+    float capRelArea  = square(r) / 2.0f;
+    float sideRelArea = r * h;
+
+    float r1 = uniformRandom(0, capRelArea * 2 + sideRelArea);
+
+    if (r1 < capRelArea * 2) {
+
+        // Select a point uniformly at random on a disk
+        // @cite http://mathworld.wolfram.com/DiskPointPicking.html
+        float a = uniformRandom(0, (float)twoPi());
+        float r2 = sqrt(uniformRandom(0, 1)) * r;
+        p.x = cos(a) * r2;
+        p.z = sin(a) * r2;
+
+        N.x = 0;
+        N.z = 0;
+        if (r1 < capRelArea) {
+            // Top
+            p.y = h / 2.0f;
+            N.y = 1;
+        } else {
+            // Bottom
+            p.y = -h / 2.0f;
+            N.y = -1;
+        }
+    } else {
+        // Side
+        float a = uniformRandom(0, (float)twoPi());
+        N.x = cos(a);
+        N.y = 0;
+        N.z = sin(a);
+        p.x = N.x * r;
+        p.z = N.y * r;
+        p.y = uniformRandom(-h / 2.0f, h / 2.0f);
+    }
+
+    // Transform to world space
+    CoordinateFrame cframe;
+    getReferenceFrame(cframe);
+    
+    p = cframe.pointToWorldSpace(p);
+    N = cframe.normalToWorldSpace(N);
+}
+
+
+Vector3 Cylinder::randomInteriorPoint() const {
+    float h = height();
+    float r = radius();
+
+    // Create a random point in a standard cylinder and then rotate to the global frame.
+
+    // Select a point uniformly at random on a disk
+    // @cite http://mathworld.wolfram.com/DiskPointPicking.html
+    float a = uniformRandom(0, (float)twoPi());
+    float r2 = sqrt(uniformRandom(0, 1)) * r;
+
+    Vector3 p(  cos(a) * r2,
+                uniformRandom(-h / 2.0f, h / 2.0f),
+                sin(a) * r2);
+
+    // Transform to world space
+    CoordinateFrame cframe;
+    getReferenceFrame(cframe);
+    
+    return cframe.pointToWorldSpace(p);
+}
+
+} // namespace
diff --git a/externals/g3dlite/Line.cpp b/externals/g3dlite/Line.cpp
new file mode 100644
index 00000000000..195ae7197f2
--- /dev/null
+++ b/externals/g3dlite/Line.cpp
@@ -0,0 +1,89 @@
+/**
+  @file Line.cpp
+ 
+  Line class
+ 
+  @maintainer Morgan McGuire, graphics3d.com
+ 
+  @created 2001-06-02
+  @edited  2006-01-28
+ */
+
+#include "G3D/Line.h"
+#include "G3D/Plane.h"
+
+namespace G3D {
+
+Vector3 Line::intersection(const Plane& plane) const {
+    float d;
+    Vector3 normal = plane.normal();
+    plane.getEquation(normal, d);
+    float rate = _direction.dot(normal);
+
+    if (rate == 0) {
+
+        return Vector3::inf();
+
+    } else {
+        float t = -(d + _point.dot(normal)) / rate;
+
+        return _point + _direction * t;
+    }
+}
+
+
+Line::Line(class BinaryInput& b) {
+	deserialize(b);
+}
+
+
+void Line::serialize(class BinaryOutput& b) const {
+	_point.serialize(b);
+	_direction.serialize(b);
+}
+
+
+void Line::deserialize(class BinaryInput& b) {
+	_point.deserialize(b);
+	_direction.deserialize(b);
+}
+
+
+Vector3 Line::closestPoint(const Vector3& pt) const {
+    float t = _direction.dot(pt - _point);
+    return _point + _direction * t;
+}
+
+
+Vector3 Line::point() const {
+    return _point;
+}
+
+
+Vector3 Line::direction() const {
+    return _direction;
+}
+
+
+Vector3 Line::closestPoint(const Line& B, float& minDist) const {
+    const Vector3& P1 = _point;
+    const Vector3& U1 = _direction;
+
+    Vector3 P2 = B.point();
+    Vector3 U2 = B.direction();
+    
+    const Vector3& P21 = P2 - P1;
+    const Vector3& M = U2.cross(U1);
+    float m2 = M.length();
+
+    Vector3 R = P21.cross(M) / m2;
+    
+    float t1 = R.dot(U2);
+    
+    minDist = abs(P21.dot(M)) / sqrt(m2);
+
+    return P1 + t1 * U1;
+}
+
+}
+
diff --git a/externals/g3dlite/LineSegment.cpp b/externals/g3dlite/LineSegment.cpp
new file mode 100644
index 00000000000..754600ad554
--- /dev/null
+++ b/externals/g3dlite/LineSegment.cpp
@@ -0,0 +1,236 @@
+/**
+ @file LineSegment.cpp
+  
+ @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+ 
+ @created 2003-02-08
+ @edited  2008-02-02
+ */
+
+#include "G3D/platform.h"
+#include "G3D/LineSegment.h"
+#include "G3D/Sphere.h"
+#include "G3D/debug.h"
+
+namespace G3D {
+
+
+Vector3 LineSegment::closestPoint(const Vector3& p) const {
+
+    // The vector from the end of the capsule to the point in question.
+    Vector3 v(p - _point);
+
+    // Projection of v onto the line segment scaled by 
+    // the length of direction.
+    float t = direction.dot(v);
+
+    // Avoid some square roots.  Derivation:
+    //    t/direction.length() <= direction.length()
+    //      t <= direction.squaredLength()
+
+    if ((t >= 0) && (t <= direction.squaredMagnitude())) {
+    
+        // The point falls within the segment.  Normalize direction,
+        // divide t by the length of direction.
+        return _point + direction * t / direction.squaredMagnitude();
+    
+    } else {
+
+        // The point does not fall within the segment; see which end is closer.
+
+        // Distance from 0, squared
+        float d0Squared = v.squaredMagnitude();
+
+        // Distance from 1, squared
+        float d1Squared = (v - direction).squaredMagnitude();
+
+        if (d0Squared < d1Squared) {
+
+            // Point 0 is closer
+            return _point;
+
+        } else {
+
+            // Point 1 is closer
+            return _point + direction;
+        
+        }
+    }
+
+}
+
+Vector3 LineSegment::point(int i) const {
+    switch (i) {
+    case 0:
+        return _point;
+
+    case 1:
+        return _point + direction;
+
+    default:
+        debugAssertM(i == 0 || i == 1, "Argument to point must be 0 or 1");
+        return _point;
+    }
+}
+
+
+bool LineSegment::intersectsSolidSphere(const class Sphere& s) const {
+    return distanceSquared(s.center) <= square(s.radius);
+}
+
+
+LineSegment::LineSegment(class BinaryInput& b) {
+	deserialize(b);
+}
+
+
+void LineSegment::serialize(class BinaryOutput& b) const {
+	_point.serialize(b);
+	direction.serialize(b);
+}
+
+
+void LineSegment::deserialize(class BinaryInput& b) {
+	_point.deserialize(b);
+	direction.deserialize(b);
+}
+
+
+Vector3 LineSegment::randomPoint() const {
+    return _point + uniformRandom(0, 1) * direction;
+}
+
+
+/////////////////////////////////////////////////////////////////////////////////////
+
+LineSegment2D LineSegment2D::fromTwoPoints(const Vector2& p0, const Vector2& p1) {
+    LineSegment2D s;
+    s.m_origin      = p0;
+    s.m_direction   = p1 - p0;
+    s.m_length      = s.m_direction.length();
+    return s;
+}
+
+
+Vector2 LineSegment2D::point(int i) const {
+    debugAssert(i == 0 || i == 1);
+    if (i == 0) {
+        return m_origin;
+    } else {
+        return m_direction + m_origin;
+    }
+}
+
+
+Vector2 LineSegment2D::closestPoint(const Vector2& Q) const {
+    // Two constants that appear in the result
+    const Vector2 k1(m_origin - Q);
+    const Vector2& k2 = m_direction;
+    
+    if (fuzzyEq(m_length, 0)) {
+        // This line segment has no length
+        return m_origin;
+    }
+
+    // Time [0, 1] at which we hit the closest point travelling from p0 to p1.
+    // Derivation can be obtained by minimizing the expression
+    //     ||P0 + (P1 - P0)t - Q||.
+    const float t = -k1.dot(k2) / (m_length * m_length);
+
+    if (t < 0) {
+        // Clipped to low end point
+        return m_origin;
+    } else if (t > 1) {
+        // Clipped to high end point
+        return m_origin + m_direction;
+    } else {
+        // Subsitute into the line equation to find 
+        // the point on the segment.
+        return m_origin + k2 * t;
+    }
+}
+
+
+float LineSegment2D::distance(const Vector2& p) const {
+    Vector2 closest = closestPoint(p);
+    return (closest - p).length();
+}
+
+
+float LineSegment2D::length() const {
+    return m_length;
+}
+
+
+Vector2 LineSegment2D::intersection(const LineSegment2D& other) const {
+
+    if ((m_origin == other.m_origin) ||
+        (m_origin == other.m_origin + other.m_direction)) {
+        return m_origin;
+    }
+
+    if (m_origin + m_direction == other.m_origin) {
+        return other.m_origin;
+    }
+
+    // Note: Now that we've checked the endpoints, all other parallel lines can now be assumed
+    // to not intersect (within numerical precision)
+
+    Vector2 dir1    = m_direction;
+    Vector2 dir2    = other.m_direction;
+    Vector2 origin1 = m_origin;
+    Vector2 origin2 = other.m_origin;
+
+    if (dir1.x == 0) {
+        // Avoid an upcoming divide by zero
+        dir1 = dir1.yx();
+        dir2 = dir2.yx();
+        origin1 = origin1.yx();
+        origin2 = origin2.yx();
+    }
+
+    // t1 = ((other.m_origin.x - m_origin.x) + other.m_direction.x * t2) / m_direction.x
+    //
+    // ((other.m_origin.x - m_origin.x) + other.m_direction.x * t2) * m_direction.y / m_direction.x = 
+    //        (other.m_origin.y - m_origin.y) + other.m_direction.y * t2
+    //
+    // m = m_direction.y / m_direction.x
+    // d = other.m_origin - m_origin
+    //
+    // (d.x + other.m_direction.x * t2) * m = d.y + other.m_direction.y * t2
+    //
+    // d.x * m + other.m_direction.x * m * t2 = d.y + other.m_direction.y * t2
+    //
+    // d.x * m - d.y  = (other.m_direction.y - other.m_direction.x * m) * t2
+    //
+    // (d.x * m - d.y) / (other.m_direction.y - other.m_direction.x * m)  = t2
+    //
+
+    Vector2 d = origin2 - origin1;
+    float m = dir1.y / dir1.x;
+
+    float t2 = (d.x * m - d.y) / (dir2.y - dir2.x * m);
+    if (! isFinite(t2)) {
+        // Parallel lines: no intersection
+        return Vector2::inf();
+    }
+
+    if ((t2 < 0.0f) || (t2 > 1.0f)) {
+        // Intersection occurs past the end of the line segments
+        return Vector2::inf();
+    }
+
+    float t1 = (d.x + dir2.x * t2) / dir1.x;
+    if ((t1 < 0.0f) || (t1 > 1.0f)) {
+        // Intersection occurs past the end of the line segments
+        return Vector2::inf();
+    }
+
+    // Return the intersection point (computed from non-transposed 
+    // variables even if we flipped above)
+    return m_origin + m_direction * t1;
+    
+}
+
+}
+
diff --git a/externals/g3dlite/Log.cpp b/externals/g3dlite/Log.cpp
new file mode 100644
index 00000000000..07614fcf563
--- /dev/null
+++ b/externals/g3dlite/Log.cpp
@@ -0,0 +1,146 @@
+/**
+  @file Log.cpp
+
+  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+  @created 2001-08-04
+  @edited  2009-01-15
+ */
+
+#include "G3D/platform.h"
+#include "G3D/Log.h"
+#include "G3D/format.h"
+#include "G3D/Array.h"
+#include "G3D/fileutils.h"
+#include 
+
+#ifdef G3D_WIN32
+    #include 
+#else
+    #include 
+#endif
+
+namespace G3D {
+
+void logPrintf(const char* fmt, ...) {
+	va_list arg_list;
+	va_start(arg_list, fmt);
+    Log::common()->vprintf(fmt, arg_list);
+    va_end(arg_list);
+}
+
+
+void logLazyPrintf(const char* fmt, ...) {
+	va_list arg_list;
+	va_start(arg_list, fmt);
+    Log::common()->lazyvprintf(fmt, arg_list);
+    va_end(arg_list);
+}
+
+Log* Log::commonLog = NULL;
+
+Log::Log(const std::string& filename, int stripFromStackBottom) : 
+    stripFromStackBottom(stripFromStackBottom) {
+
+    this->filename = filename;
+
+    logFile = fopen(filename.c_str(), "w");
+
+    if (logFile == NULL) {
+        std::string drive, base, ext;
+        Array path;
+        parseFilename(filename, drive, path, base, ext);
+        std::string logName = base + ((ext != "") ? ("." + ext) : ""); 
+
+        // Write time is greater than 1ms.  This may be a network drive.... try another file.
+        #ifdef G3D_WIN32
+            logName = std::string(std::getenv("TEMP")) + logName;
+        #else
+            logName = std::string("/tmp/") + logName;
+        #endif
+
+        logFile = fopen(logName.c_str(), "w");
+    }
+
+    // Use a large buffer (although we flush in logPrintf)
+    setvbuf(logFile, NULL, _IOFBF, 2048);
+
+    fprintf(logFile, "Application Log\n");
+    time_t t;
+    time(&t);
+    fprintf(logFile, "Start: %s\n", ctime(&t));
+    fflush(logFile);
+
+    if (commonLog == NULL) {
+        commonLog = this;
+    }
+}
+
+
+Log::~Log() {
+    section("Shutdown");
+    println("Closing log file");
+    
+    // Make sure we don't leave a dangling pointer
+    if (Log::commonLog == this) {
+        Log::commonLog = NULL;
+    }
+
+    fclose(logFile);
+}
+
+
+FILE* Log::getFile() const {
+    return logFile;
+}
+
+
+Log* Log::common() {
+    if (commonLog == NULL) {
+        commonLog = new Log();
+    }
+    return commonLog;
+}
+
+
+std::string Log::getCommonLogFilename() {
+    return common()->filename;
+}
+
+
+void Log::section(const std::string& s) {
+    fprintf(logFile, "_____________________________________________________\n");
+    fprintf(logFile, "\n    ###    %s    ###\n\n", s.c_str());
+}
+
+
+void __cdecl Log::printf(const char* fmt, ...) {
+    va_list arg_list;
+    va_start(arg_list, fmt);
+    print(vformat(fmt, arg_list));
+    va_end(arg_list);
+}
+
+
+void __cdecl Log::vprintf(const char* fmt, va_list argPtr) {
+    vfprintf(logFile, fmt, argPtr);
+    fflush(logFile);
+}
+
+
+void __cdecl Log::lazyvprintf(const char* fmt, va_list argPtr) {
+    vfprintf(logFile, fmt, argPtr);
+}
+
+
+void Log::print(const std::string& s) {
+    fprintf(logFile, "%s", s.c_str());
+    fflush(logFile);
+}
+
+
+void Log::println(const std::string& s) {
+    fprintf(logFile, "%s\n", s.c_str());
+    fflush(logFile);
+}
+
+}
diff --git a/externals/g3dlite/Matrix3.cpp b/externals/g3dlite/Matrix3.cpp
new file mode 100644
index 00000000000..b32d938f0f9
--- /dev/null
+++ b/externals/g3dlite/Matrix3.cpp
@@ -0,0 +1,1927 @@
+/**
+ @file Matrix3.cpp
+
+ 3x3 matrix class
+
+ @author Morgan McGuire, graphics3d.com
+
+ @created 2001-06-02
+ @edited  2009-11-15
+
+  Copyright 2000-2009, Morgan McGuire.
+  All rights reserved.
+*/
+
+#include "G3D/platform.h"
+#include 
+#include 
+#include "G3D/Matrix3.h"
+#include "G3D/g3dmath.h"
+#include "G3D/BinaryInput.h"
+#include "G3D/BinaryOutput.h"
+#include "G3D/Quat.h"
+#include "G3D/Any.h"
+
+namespace G3D {
+
+const float Matrix3::EPSILON = 1e-06f;
+
+Matrix3::Matrix3(const Any& any) {
+    any.verifyName("Matrix3");
+    any.verifyType(Any::ARRAY);
+    any.verifySize(9);
+
+    for (int r = 0; r < 3; ++r) {
+        for (int c = 0; c < 3; ++c) {
+            elt[r][c] = any[r * 3 + c];
+        }
+    }
+}
+
+
+Matrix3::operator Any() const {
+    Any any(Any::ARRAY, "Matrix3");
+    any.resize(9);
+    for (int r = 0; r < 3; ++r) {
+        for (int c = 0; c < 3; ++c) {
+            any[r * 3 + c] = elt[r][c];
+        }
+    }
+
+    return any;
+}
+
+const Matrix3& Matrix3::zero() {
+    static Matrix3 m(0, 0, 0, 0, 0, 0, 0, 0, 0);
+    return m;
+}
+
+const Matrix3& Matrix3::identity() {
+    static Matrix3 m(1, 0, 0, 0, 1, 0, 0, 0, 1);
+    return m;
+}
+
+
+const float Matrix3::ms_fSvdEpsilon = 1e-04f;
+const int Matrix3::ms_iSvdMaxIterations = 32;
+
+Matrix3::Matrix3(BinaryInput& b) {
+    deserialize(b);
+}
+
+bool Matrix3::fuzzyEq(const Matrix3& b) const {
+    for (int r = 0; r < 3; ++r) {
+        for (int c = 0; c < 3; ++c) {
+            if (! G3D::fuzzyEq(elt[r][c], b[r][c])) {
+                return false;
+            }
+        }
+    }
+    return true;
+}
+
+
+bool Matrix3::isRightHanded() const{
+
+    const Vector3& X = column(0);
+    const Vector3& Y = column(1);
+    const Vector3& Z = column(2);
+
+    const Vector3& W = X.cross(Y);
+
+    return W.dot(Z) > 0.0f;
+}
+
+
+bool Matrix3::isOrthonormal() const {
+    const Vector3& X = column(0);
+    const Vector3& Y = column(1);
+    const Vector3& Z = column(2);
+
+    return 
+        (G3D::fuzzyEq(X.dot(Y), 0.0f) &&
+         G3D::fuzzyEq(Y.dot(Z), 0.0f) &&
+         G3D::fuzzyEq(X.dot(Z), 0.0f) &&
+         G3D::fuzzyEq(X.squaredMagnitude(), 1.0f) &&
+         G3D::fuzzyEq(Y.squaredMagnitude(), 1.0f) &&
+         G3D::fuzzyEq(Z.squaredMagnitude(), 1.0f));
+}
+
+//----------------------------------------------------------------------------
+Matrix3::Matrix3(const Quat& _q) {
+    // Implementation from Watt and Watt, pg 362
+	// See also http://www.flipcode.com/documents/matrfaq.html#Q54
+    Quat q = _q;
+    q.unitize();
+    float xx = 2.0f * q.x * q.x;
+    float xy = 2.0f * q.x * q.y;
+    float xz = 2.0f * q.x * q.z;
+    float xw = 2.0f * q.x * q.w;
+
+    float yy = 2.0f * q.y * q.y;
+    float yz = 2.0f * q.y * q.z;
+    float yw = 2.0f * q.y * q.w;
+
+    float zz = 2.0f * q.z * q.z;
+    float zw = 2.0f * q.z * q.w;
+
+    set(1.0f - yy - zz,    xy - zw,        xz + yw,
+        xy + zw,          1.0f - xx - zz,  yz - xw,
+        xz - yw,          yz + xw,        1.0f - xx - yy);
+}
+
+//----------------------------------------------------------------------------
+
+Matrix3::Matrix3 (const float aafEntry[3][3]) {
+    memcpy(elt, aafEntry, 9*sizeof(float));
+}
+
+//----------------------------------------------------------------------------
+Matrix3::Matrix3 (const Matrix3& rkMatrix) {
+    memcpy(elt, rkMatrix.elt, 9*sizeof(float));
+}
+
+//----------------------------------------------------------------------------
+Matrix3::Matrix3(
+          float fEntry00, float fEntry01, float fEntry02,
+          float fEntry10, float fEntry11, float fEntry12,
+          float fEntry20, float fEntry21, float fEntry22) {
+    set(fEntry00, fEntry01, fEntry02,
+        fEntry10, fEntry11, fEntry12,
+        fEntry20, fEntry21, fEntry22);
+}
+
+void Matrix3::set(
+          float fEntry00, float fEntry01, float fEntry02,
+          float fEntry10, float fEntry11, float fEntry12, 
+          float fEntry20, float fEntry21, float fEntry22) {
+
+    elt[0][0] = fEntry00;
+    elt[0][1] = fEntry01;
+    elt[0][2] = fEntry02;
+    elt[1][0] = fEntry10;
+    elt[1][1] = fEntry11;
+    elt[1][2] = fEntry12;
+    elt[2][0] = fEntry20;
+    elt[2][1] = fEntry21;
+    elt[2][2] = fEntry22;
+}
+
+
+void Matrix3::deserialize(BinaryInput& b) {
+    int r,c;
+    for (c = 0; c < 3; ++c) {
+        for (r = 0; r < 3; ++r) {
+            elt[r][c] = b.readFloat32();
+        }
+    }
+}
+
+
+void Matrix3::serialize(BinaryOutput& b) const {
+    int r,c;
+    for (c = 0; c < 3; ++c) {
+        for (r = 0; r < 3; ++r) {
+            b.writeFloat32(elt[r][c]);
+        }
+    }
+}
+
+
+//----------------------------------------------------------------------------
+Vector3 Matrix3::column (int iCol) const {
+    assert((0 <= iCol) && (iCol < 3));
+    return Vector3(elt[0][iCol], elt[1][iCol],
+                   elt[2][iCol]);
+}
+
+
+const Vector3& Matrix3::row (int iRow) const {
+    assert((0 <= iRow) && (iRow < 3));
+    return *reinterpret_cast(elt[iRow]);
+}
+
+
+void Matrix3::setColumn(int iCol, const Vector3 &vector) {
+    debugAssert((iCol >= 0) && (iCol < 3));
+    elt[0][iCol] = vector.x;
+    elt[1][iCol] = vector.y;
+    elt[2][iCol] = vector.z;
+}
+
+
+void Matrix3::setRow(int iRow, const Vector3 &vector) {
+    debugAssert((iRow >= 0) && (iRow < 3));
+    elt[iRow][0] = vector.x;
+    elt[iRow][1] = vector.y;
+    elt[iRow][2] = vector.z;
+}
+
+
+//----------------------------------------------------------------------------
+bool Matrix3::operator== (const Matrix3& rkMatrix) const {
+    for (int iRow = 0; iRow < 3; iRow++) {
+        for (int iCol = 0; iCol < 3; iCol++) {
+            if ( elt[iRow][iCol] != rkMatrix.elt[iRow][iCol] )
+                return false;
+        }
+    }
+
+    return true;
+}
+
+//----------------------------------------------------------------------------
+bool Matrix3::operator!= (const Matrix3& rkMatrix) const {
+    return !operator==(rkMatrix);
+}
+
+//----------------------------------------------------------------------------
+Matrix3 Matrix3::operator+ (const Matrix3& rkMatrix) const {
+    Matrix3 kSum;
+
+    for (int iRow = 0; iRow < 3; iRow++) {
+        for (int iCol = 0; iCol < 3; iCol++) {
+            kSum.elt[iRow][iCol] = elt[iRow][iCol] +
+                                          rkMatrix.elt[iRow][iCol];
+        }
+    }
+
+    return kSum;
+}
+
+//----------------------------------------------------------------------------
+Matrix3 Matrix3::operator- (const Matrix3& rkMatrix) const {
+    Matrix3 kDiff;
+
+    for (int iRow = 0; iRow < 3; iRow++) {
+        for (int iCol = 0; iCol < 3; iCol++) {
+            kDiff.elt[iRow][iCol] = elt[iRow][iCol] -
+                                           rkMatrix.elt[iRow][iCol];
+        }
+    }
+
+    return kDiff;
+}
+
+//----------------------------------------------------------------------------
+Matrix3 Matrix3::operator* (const Matrix3& rkMatrix) const {
+    Matrix3 kProd;
+
+    for (int iRow = 0; iRow < 3; iRow++) {
+        for (int iCol = 0; iCol < 3; iCol++) {
+            kProd.elt[iRow][iCol] =
+                elt[iRow][0] * rkMatrix.elt[0][iCol] +
+                elt[iRow][1] * rkMatrix.elt[1][iCol] +
+                elt[iRow][2] * rkMatrix.elt[2][iCol];
+        }
+    }
+
+    return kProd;
+}
+
+Matrix3& Matrix3::operator+= (const Matrix3& rkMatrix) {
+    for (int iRow = 0; iRow < 3; iRow++) {
+        for (int iCol = 0; iCol < 3; iCol++) {
+            elt[iRow][iCol] = elt[iRow][iCol] + rkMatrix.elt[iRow][iCol];
+        }
+    }
+
+    return *this;
+}
+
+Matrix3& Matrix3::operator-= (const Matrix3& rkMatrix) {
+    for (int iRow = 0; iRow < 3; iRow++) {
+        for (int iCol = 0; iCol < 3; iCol++) {
+            elt[iRow][iCol] = elt[iRow][iCol] - rkMatrix.elt[iRow][iCol];
+        }
+    }
+
+    return *this;
+}
+
+Matrix3& Matrix3::operator*= (const Matrix3& rkMatrix) {
+    Matrix3 mulMat;
+    for (int iRow = 0; iRow < 3; iRow++) {
+        for (int iCol = 0; iCol < 3; iCol++) {
+            mulMat.elt[iRow][iCol] =
+                elt[iRow][0] * rkMatrix.elt[0][iCol] +
+                elt[iRow][1] * rkMatrix.elt[1][iCol] +
+                elt[iRow][2] * rkMatrix.elt[2][iCol];
+        }
+    }
+
+    *this = mulMat;
+    return *this;
+}
+
+//----------------------------------------------------------------------------
+Matrix3 Matrix3::operator- () const {
+    Matrix3 kNeg;
+
+    for (int iRow = 0; iRow < 3; iRow++) {
+        for (int iCol = 0; iCol < 3; iCol++) {
+            kNeg[iRow][iCol] = -elt[iRow][iCol];
+        }
+    }
+
+    return kNeg;
+}
+
+//----------------------------------------------------------------------------
+Matrix3 Matrix3::operator* (float fScalar) const {
+    Matrix3 kProd;
+
+    for (int iRow = 0; iRow < 3; iRow++) {
+        for (int iCol = 0; iCol < 3; iCol++) {
+            kProd[iRow][iCol] = fScalar * elt[iRow][iCol];
+        }
+    }
+
+    return kProd;
+}
+
+Matrix3& Matrix3::operator/= (float fScalar) {
+    return *this *= (1.0f / fScalar);
+}
+
+Matrix3& Matrix3::operator*= (float fScalar) {
+
+    for (int iRow = 0; iRow < 3; iRow++) {
+        for (int iCol = 0; iCol < 3; iCol++) {
+            elt[iRow][iCol] *= fScalar;
+        }
+    }
+
+    return *this;
+}
+
+//----------------------------------------------------------------------------
+Matrix3 operator* (double fScalar, const Matrix3& rkMatrix) {
+    Matrix3 kProd;
+
+    for (int iRow = 0; iRow < 3; iRow++) {
+        for (int iCol = 0; iCol < 3; iCol++) {
+            kProd[iRow][iCol] = fScalar * rkMatrix.elt[iRow][iCol];
+        }
+    }
+
+    return kProd;
+}
+
+Matrix3 operator* (float fScalar, const Matrix3& rkMatrix) {
+    return (double)fScalar * rkMatrix;
+}
+
+
+Matrix3 operator* (int fScalar, const Matrix3& rkMatrix) {
+    return (double)fScalar * rkMatrix;
+}
+//----------------------------------------------------------------------------
+Matrix3 Matrix3::transpose () const {
+    Matrix3 kTranspose;
+
+    for (int iRow = 0; iRow < 3; iRow++) {
+        for (int iCol = 0; iCol < 3; iCol++) {
+            kTranspose[iRow][iCol] = elt[iCol][iRow];
+        }
+    }
+
+    return kTranspose;
+}
+
+//----------------------------------------------------------------------------
+bool Matrix3::inverse (Matrix3& rkInverse, float fTolerance) const {
+    // Invert a 3x3 using cofactors.  This is about 8 times faster than
+    // the Numerical Recipes code which uses Gaussian elimination.
+
+    rkInverse[0][0] = elt[1][1] * elt[2][2] -
+                      elt[1][2] * elt[2][1];
+    rkInverse[0][1] = elt[0][2] * elt[2][1] -
+                      elt[0][1] * elt[2][2];
+    rkInverse[0][2] = elt[0][1] * elt[1][2] -
+                      elt[0][2] * elt[1][1];
+    rkInverse[1][0] = elt[1][2] * elt[2][0] -
+                      elt[1][0] * elt[2][2];
+    rkInverse[1][1] = elt[0][0] * elt[2][2] -
+                      elt[0][2] * elt[2][0];
+    rkInverse[1][2] = elt[0][2] * elt[1][0] -
+                      elt[0][0] * elt[1][2];
+    rkInverse[2][0] = elt[1][0] * elt[2][1] -
+                      elt[1][1] * elt[2][0];
+    rkInverse[2][1] = elt[0][1] * elt[2][0] -
+                      elt[0][0] * elt[2][1];
+    rkInverse[2][2] = elt[0][0] * elt[1][1] -
+                      elt[0][1] * elt[1][0];
+
+    float fDet =
+        elt[0][0] * rkInverse[0][0] +
+        elt[0][1] * rkInverse[1][0] +
+        elt[0][2] * rkInverse[2][0];
+
+    if ( G3D::abs(fDet) <= fTolerance )
+        return false;
+
+    float fInvDet = 1.0 / fDet;
+
+    for (int iRow = 0; iRow < 3; iRow++) {
+        for (int iCol = 0; iCol < 3; iCol++)
+            rkInverse[iRow][iCol] *= fInvDet;
+    }
+
+    return true;
+}
+
+//----------------------------------------------------------------------------
+Matrix3 Matrix3::inverse (float fTolerance) const {
+    Matrix3 kInverse = Matrix3::zero();
+    inverse(kInverse, fTolerance);
+    return kInverse;
+}
+
+//----------------------------------------------------------------------------
+float Matrix3::determinant () const {
+    float fCofactor00 = elt[1][1] * elt[2][2] -
+                       elt[1][2] * elt[2][1];
+    float fCofactor10 = elt[1][2] * elt[2][0] -
+                       elt[1][0] * elt[2][2];
+    float fCofactor20 = elt[1][0] * elt[2][1] -
+                       elt[1][1] * elt[2][0];
+
+    float fDet =
+        elt[0][0] * fCofactor00 +
+        elt[0][1] * fCofactor10 +
+        elt[0][2] * fCofactor20;
+
+    return fDet;
+}
+
+//----------------------------------------------------------------------------
+void Matrix3::bidiagonalize (Matrix3& kA, Matrix3& kL,
+                             Matrix3& kR) {
+    float afV[3], afW[3];
+    float fLength, fSign, fT1, fInvT1, fT2;
+    bool bIdentity;
+
+    // map first column to (*,0,0)
+    fLength = sqrt(kA[0][0] * kA[0][0] + kA[1][0] * kA[1][0] +
+                         kA[2][0] * kA[2][0]);
+
+    if ( fLength > 0.0 ) {
+        fSign = (kA[0][0] > 0.0 ? 1.0 : -1.0);
+        fT1 = kA[0][0] + fSign * fLength;
+        fInvT1 = 1.0 / fT1;
+        afV[1] = kA[1][0] * fInvT1;
+        afV[2] = kA[2][0] * fInvT1;
+
+        fT2 = -2.0 / (1.0 + afV[1] * afV[1] + afV[2] * afV[2]);
+        afW[0] = fT2 * (kA[0][0] + kA[1][0] * afV[1] + kA[2][0] * afV[2]);
+        afW[1] = fT2 * (kA[0][1] + kA[1][1] * afV[1] + kA[2][1] * afV[2]);
+        afW[2] = fT2 * (kA[0][2] + kA[1][2] * afV[1] + kA[2][2] * afV[2]);
+        kA[0][0] += afW[0];
+        kA[0][1] += afW[1];
+        kA[0][2] += afW[2];
+        kA[1][1] += afV[1] * afW[1];
+        kA[1][2] += afV[1] * afW[2];
+        kA[2][1] += afV[2] * afW[1];
+        kA[2][2] += afV[2] * afW[2];
+
+        kL[0][0] = 1.0 + fT2;
+        kL[0][1] = kL[1][0] = fT2 * afV[1];
+        kL[0][2] = kL[2][0] = fT2 * afV[2];
+        kL[1][1] = 1.0 + fT2 * afV[1] * afV[1];
+        kL[1][2] = kL[2][1] = fT2 * afV[1] * afV[2];
+        kL[2][2] = 1.0 + fT2 * afV[2] * afV[2];
+        bIdentity = false;
+    } else {
+        kL = Matrix3::identity();
+        bIdentity = true;
+    }
+
+    // map first row to (*,*,0)
+    fLength = sqrt(kA[0][1] * kA[0][1] + kA[0][2] * kA[0][2]);
+
+    if ( fLength > 0.0 ) {
+        fSign = (kA[0][1] > 0.0 ? 1.0 : -1.0);
+        fT1 = kA[0][1] + fSign * fLength;
+        afV[2] = kA[0][2] / fT1;
+
+        fT2 = -2.0 / (1.0 + afV[2] * afV[2]);
+        afW[0] = fT2 * (kA[0][1] + kA[0][2] * afV[2]);
+        afW[1] = fT2 * (kA[1][1] + kA[1][2] * afV[2]);
+        afW[2] = fT2 * (kA[2][1] + kA[2][2] * afV[2]);
+        kA[0][1] += afW[0];
+        kA[1][1] += afW[1];
+        kA[1][2] += afW[1] * afV[2];
+        kA[2][1] += afW[2];
+        kA[2][2] += afW[2] * afV[2];
+
+        kR[0][0] = 1.0;
+        kR[0][1] = kR[1][0] = 0.0;
+        kR[0][2] = kR[2][0] = 0.0;
+        kR[1][1] = 1.0 + fT2;
+        kR[1][2] = kR[2][1] = fT2 * afV[2];
+        kR[2][2] = 1.0 + fT2 * afV[2] * afV[2];
+    } else {
+        kR = Matrix3::identity();
+    }
+
+    // map second column to (*,*,0)
+    fLength = sqrt(kA[1][1] * kA[1][1] + kA[2][1] * kA[2][1]);
+
+    if ( fLength > 0.0 ) {
+        fSign = (kA[1][1] > 0.0 ? 1.0 : -1.0);
+        fT1 = kA[1][1] + fSign * fLength;
+        afV[2] = kA[2][1] / fT1;
+
+        fT2 = -2.0 / (1.0 + afV[2] * afV[2]);
+        afW[1] = fT2 * (kA[1][1] + kA[2][1] * afV[2]);
+        afW[2] = fT2 * (kA[1][2] + kA[2][2] * afV[2]);
+        kA[1][1] += afW[1];
+        kA[1][2] += afW[2];
+        kA[2][2] += afV[2] * afW[2];
+
+        float fA = 1.0 + fT2;
+        float fB = fT2 * afV[2];
+        float fC = 1.0 + fB * afV[2];
+
+        if ( bIdentity ) {
+            kL[0][0] = 1.0;
+            kL[0][1] = kL[1][0] = 0.0;
+            kL[0][2] = kL[2][0] = 0.0;
+            kL[1][1] = fA;
+            kL[1][2] = kL[2][1] = fB;
+            kL[2][2] = fC;
+        } else {
+            for (int iRow = 0; iRow < 3; iRow++) {
+                float fTmp0 = kL[iRow][1];
+                float fTmp1 = kL[iRow][2];
+                kL[iRow][1] = fA * fTmp0 + fB * fTmp1;
+                kL[iRow][2] = fB * fTmp0 + fC * fTmp1;
+            }
+        }
+    }
+}
+
+//----------------------------------------------------------------------------
+void Matrix3::golubKahanStep (Matrix3& kA, Matrix3& kL,
+                              Matrix3& kR) {
+    float fT11 = kA[0][1] * kA[0][1] + kA[1][1] * kA[1][1];
+    float fT22 = kA[1][2] * kA[1][2] + kA[2][2] * kA[2][2];
+    float fT12 = kA[1][1] * kA[1][2];
+    float fTrace = fT11 + fT22;
+    float fDiff = fT11 - fT22;
+    float fDiscr = sqrt(fDiff * fDiff + 4.0 * fT12 * fT12);
+    float fRoot1 = 0.5 * (fTrace + fDiscr);
+    float fRoot2 = 0.5 * (fTrace - fDiscr);
+
+    // adjust right
+    float fY = kA[0][0] - (G3D::abs(fRoot1 - fT22) <=
+                          G3D::abs(fRoot2 - fT22) ? fRoot1 : fRoot2);
+    float fZ = kA[0][1];
+    float fInvLength = 1.0 / sqrt(fY * fY + fZ * fZ);
+    float fSin = fZ * fInvLength;
+    float fCos = -fY * fInvLength;
+
+    float fTmp0 = kA[0][0];
+    float fTmp1 = kA[0][1];
+    kA[0][0] = fCos * fTmp0 - fSin * fTmp1;
+    kA[0][1] = fSin * fTmp0 + fCos * fTmp1;
+    kA[1][0] = -fSin * kA[1][1];
+    kA[1][1] *= fCos;
+
+    int iRow;
+
+    for (iRow = 0; iRow < 3; iRow++) {
+        fTmp0 = kR[0][iRow];
+        fTmp1 = kR[1][iRow];
+        kR[0][iRow] = fCos * fTmp0 - fSin * fTmp1;
+        kR[1][iRow] = fSin * fTmp0 + fCos * fTmp1;
+    }
+
+    // adjust left
+    fY = kA[0][0];
+
+    fZ = kA[1][0];
+
+    fInvLength = 1.0 / sqrt(fY * fY + fZ * fZ);
+
+    fSin = fZ * fInvLength;
+
+    fCos = -fY * fInvLength;
+
+    kA[0][0] = fCos * kA[0][0] - fSin * kA[1][0];
+
+    fTmp0 = kA[0][1];
+
+    fTmp1 = kA[1][1];
+
+    kA[0][1] = fCos * fTmp0 - fSin * fTmp1;
+
+    kA[1][1] = fSin * fTmp0 + fCos * fTmp1;
+
+    kA[0][2] = -fSin * kA[1][2];
+
+    kA[1][2] *= fCos;
+
+    int iCol;
+
+    for (iCol = 0; iCol < 3; iCol++) {
+        fTmp0 = kL[iCol][0];
+        fTmp1 = kL[iCol][1];
+        kL[iCol][0] = fCos * fTmp0 - fSin * fTmp1;
+        kL[iCol][1] = fSin * fTmp0 + fCos * fTmp1;
+    }
+
+    // adjust right
+    fY = kA[0][1];
+
+    fZ = kA[0][2];
+
+    fInvLength = 1.0 / sqrt(fY * fY + fZ * fZ);
+
+    fSin = fZ * fInvLength;
+
+    fCos = -fY * fInvLength;
+
+    kA[0][1] = fCos * kA[0][1] - fSin * kA[0][2];
+
+    fTmp0 = kA[1][1];
+
+    fTmp1 = kA[1][2];
+
+    kA[1][1] = fCos * fTmp0 - fSin * fTmp1;
+
+    kA[1][2] = fSin * fTmp0 + fCos * fTmp1;
+
+    kA[2][1] = -fSin * kA[2][2];
+
+    kA[2][2] *= fCos;
+
+    for (iRow = 0; iRow < 3; iRow++) {
+        fTmp0 = kR[1][iRow];
+        fTmp1 = kR[2][iRow];
+        kR[1][iRow] = fCos * fTmp0 - fSin * fTmp1;
+        kR[2][iRow] = fSin * fTmp0 + fCos * fTmp1;
+    }
+
+    // adjust left
+    fY = kA[1][1];
+
+    fZ = kA[2][1];
+
+    fInvLength = 1.0 / sqrt(fY * fY + fZ * fZ);
+
+    fSin = fZ * fInvLength;
+
+    fCos = -fY * fInvLength;
+
+    kA[1][1] = fCos * kA[1][1] - fSin * kA[2][1];
+
+    fTmp0 = kA[1][2];
+
+    fTmp1 = kA[2][2];
+
+    kA[1][2] = fCos * fTmp0 - fSin * fTmp1;
+
+    kA[2][2] = fSin * fTmp0 + fCos * fTmp1;
+
+    for (iCol = 0; iCol < 3; iCol++) {
+        fTmp0 = kL[iCol][1];
+        fTmp1 = kL[iCol][2];
+        kL[iCol][1] = fCos * fTmp0 - fSin * fTmp1;
+        kL[iCol][2] = fSin * fTmp0 + fCos * fTmp1;
+    }
+}
+
+//----------------------------------------------------------------------------
+void Matrix3::singularValueDecomposition (Matrix3& kL, Vector3& kS,
+        Matrix3& kR) const {
+    int iRow, iCol;
+
+    Matrix3 kA = *this;
+    bidiagonalize(kA, kL, kR);
+
+    for (int i = 0; i < ms_iSvdMaxIterations; i++) {
+        float fTmp, fTmp0, fTmp1;
+        float fSin0, fCos0, fTan0;
+        float fSin1, fCos1, fTan1;
+
+        bool bTest1 = (G3D::abs(kA[0][1]) <=
+                       ms_fSvdEpsilon * (G3D::abs(kA[0][0]) + G3D::abs(kA[1][1])));
+        bool bTest2 = (G3D::abs(kA[1][2]) <=
+                       ms_fSvdEpsilon * (G3D::abs(kA[1][1]) + G3D::abs(kA[2][2])));
+
+        if ( bTest1 ) {
+            if ( bTest2 ) {
+                kS[0] = kA[0][0];
+                kS[1] = kA[1][1];
+                kS[2] = kA[2][2];
+                break;
+            } else {
+                // 2x2 closed form factorization
+                fTmp = (kA[1][1] * kA[1][1] - kA[2][2] * kA[2][2] +
+                        kA[1][2] * kA[1][2]) / (kA[1][2] * kA[2][2]);
+                fTan0 = 0.5 * (fTmp + sqrt(fTmp * fTmp + 4.0));
+                fCos0 = 1.0 / sqrt(1.0 + fTan0 * fTan0);
+                fSin0 = fTan0 * fCos0;
+
+                for (iCol = 0; iCol < 3; iCol++) {
+                    fTmp0 = kL[iCol][1];
+                    fTmp1 = kL[iCol][2];
+                    kL[iCol][1] = fCos0 * fTmp0 - fSin0 * fTmp1;
+                    kL[iCol][2] = fSin0 * fTmp0 + fCos0 * fTmp1;
+                }
+
+                fTan1 = (kA[1][2] - kA[2][2] * fTan0) / kA[1][1];
+                fCos1 = 1.0 / sqrt(1.0 + fTan1 * fTan1);
+                fSin1 = -fTan1 * fCos1;
+
+                for (iRow = 0; iRow < 3; iRow++) {
+                    fTmp0 = kR[1][iRow];
+                    fTmp1 = kR[2][iRow];
+                    kR[1][iRow] = fCos1 * fTmp0 - fSin1 * fTmp1;
+                    kR[2][iRow] = fSin1 * fTmp0 + fCos1 * fTmp1;
+                }
+
+                kS[0] = kA[0][0];
+                kS[1] = fCos0 * fCos1 * kA[1][1] -
+                        fSin1 * (fCos0 * kA[1][2] - fSin0 * kA[2][2]);
+                kS[2] = fSin0 * fSin1 * kA[1][1] +
+                        fCos1 * (fSin0 * kA[1][2] + fCos0 * kA[2][2]);
+                break;
+            }
+        } else {
+            if ( bTest2 ) {
+                // 2x2 closed form factorization
+                fTmp = (kA[0][0] * kA[0][0] + kA[1][1] * kA[1][1] -
+                        kA[0][1] * kA[0][1]) / (kA[0][1] * kA[1][1]);
+                fTan0 = 0.5 * ( -fTmp + sqrt(fTmp * fTmp + 4.0));
+                fCos0 = 1.0 / sqrt(1.0 + fTan0 * fTan0);
+                fSin0 = fTan0 * fCos0;
+
+                for (iCol = 0; iCol < 3; iCol++) {
+                    fTmp0 = kL[iCol][0];
+                    fTmp1 = kL[iCol][1];
+                    kL[iCol][0] = fCos0 * fTmp0 - fSin0 * fTmp1;
+                    kL[iCol][1] = fSin0 * fTmp0 + fCos0 * fTmp1;
+                }
+
+                fTan1 = (kA[0][1] - kA[1][1] * fTan0) / kA[0][0];
+                fCos1 = 1.0 / sqrt(1.0 + fTan1 * fTan1);
+                fSin1 = -fTan1 * fCos1;
+
+                for (iRow = 0; iRow < 3; iRow++) {
+                    fTmp0 = kR[0][iRow];
+                    fTmp1 = kR[1][iRow];
+                    kR[0][iRow] = fCos1 * fTmp0 - fSin1 * fTmp1;
+                    kR[1][iRow] = fSin1 * fTmp0 + fCos1 * fTmp1;
+                }
+
+                kS[0] = fCos0 * fCos1 * kA[0][0] -
+                        fSin1 * (fCos0 * kA[0][1] - fSin0 * kA[1][1]);
+                kS[1] = fSin0 * fSin1 * kA[0][0] +
+                        fCos1 * (fSin0 * kA[0][1] + fCos0 * kA[1][1]);
+                kS[2] = kA[2][2];
+                break;
+            } else {
+                golubKahanStep(kA, kL, kR);
+            }
+        }
+    }
+
+    // positize diagonal
+    for (iRow = 0; iRow < 3; iRow++) {
+        if ( kS[iRow] < 0.0 ) {
+            kS[iRow] = -kS[iRow];
+
+            for (iCol = 0; iCol < 3; iCol++)
+                kR[iRow][iCol] = -kR[iRow][iCol];
+        }
+    }
+}
+
+//----------------------------------------------------------------------------
+void Matrix3::singularValueComposition (const Matrix3& kL,
+                                        const Vector3& kS, const Matrix3& kR) {
+    int iRow, iCol;
+    Matrix3 kTmp;
+
+    // product S*R
+    for (iRow = 0; iRow < 3; iRow++) {
+        for (iCol = 0; iCol < 3; iCol++)
+            kTmp[iRow][iCol] = kS[iRow] * kR[iRow][iCol];
+    }
+
+    // product L*S*R
+    for (iRow = 0; iRow < 3; iRow++) {
+        for (iCol = 0; iCol < 3; iCol++) {
+            elt[iRow][iCol] = 0.0;
+
+            for (int iMid = 0; iMid < 3; iMid++)
+                elt[iRow][iCol] += kL[iRow][iMid] * kTmp[iMid][iCol];
+        }
+    }
+}
+
+//----------------------------------------------------------------------------
+void Matrix3::orthonormalize () {
+    // Algorithm uses Gram-Schmidt orthogonalization.  If 'this' matrix is
+    // M = [m0|m1|m2], then orthonormal output matrix is Q = [q0|q1|q2],
+    //
+    //   q0 = m0/|m0|
+    //   q1 = (m1-(q0*m1)q0)/|m1-(q0*m1)q0|
+    //   q2 = (m2-(q0*m2)q0-(q1*m2)q1)/|m2-(q0*m2)q0-(q1*m2)q1|
+    //
+    // where |V| indicates length of vector V and A*B indicates dot
+    // product of vectors A and B.
+
+    // compute q0
+    float fInvLength = 1.0 / sqrt(elt[0][0] * elt[0][0]
+                                       + elt[1][0] * elt[1][0] +
+                                       elt[2][0] * elt[2][0]);
+
+    elt[0][0] *= fInvLength;
+    elt[1][0] *= fInvLength;
+    elt[2][0] *= fInvLength;
+
+    // compute q1
+    float fDot0 =
+        elt[0][0] * elt[0][1] +
+        elt[1][0] * elt[1][1] +
+        elt[2][0] * elt[2][1];
+
+    elt[0][1] -= fDot0 * elt[0][0];
+    elt[1][1] -= fDot0 * elt[1][0];
+    elt[2][1] -= fDot0 * elt[2][0];
+
+    fInvLength = 1.0 / sqrt(elt[0][1] * elt[0][1] +
+                                  elt[1][1] * elt[1][1] +
+                                  elt[2][1] * elt[2][1]);
+
+    elt[0][1] *= fInvLength;
+    elt[1][1] *= fInvLength;
+    elt[2][1] *= fInvLength;
+
+    // compute q2
+    float fDot1 =
+        elt[0][1] * elt[0][2] +
+        elt[1][1] * elt[1][2] +
+        elt[2][1] * elt[2][2];
+
+    fDot0 =
+        elt[0][0] * elt[0][2] +
+        elt[1][0] * elt[1][2] +
+        elt[2][0] * elt[2][2];
+
+    elt[0][2] -= fDot0 * elt[0][0] + fDot1 * elt[0][1];
+    elt[1][2] -= fDot0 * elt[1][0] + fDot1 * elt[1][1];
+    elt[2][2] -= fDot0 * elt[2][0] + fDot1 * elt[2][1];
+
+    fInvLength = 1.0 / sqrt(elt[0][2] * elt[0][2] +
+                                  elt[1][2] * elt[1][2] +
+                                  elt[2][2] * elt[2][2]);
+
+    elt[0][2] *= fInvLength;
+    elt[1][2] *= fInvLength;
+    elt[2][2] *= fInvLength;
+}
+
+//----------------------------------------------------------------------------
+void Matrix3::qDUDecomposition (Matrix3& kQ,
+                                Vector3& kD, Vector3& kU) const {
+    // Factor M = QR = QDU where Q is orthogonal, D is diagonal,
+    // and U is upper triangular with ones on its diagonal.  Algorithm uses
+    // Gram-Schmidt orthogonalization (the QR algorithm).
+    //
+    // If M = [ m0 | m1 | m2 ] and Q = [ q0 | q1 | q2 ], then
+    //
+    //   q0 = m0/|m0|
+    //   q1 = (m1-(q0*m1)q0)/|m1-(q0*m1)q0|
+    //   q2 = (m2-(q0*m2)q0-(q1*m2)q1)/|m2-(q0*m2)q0-(q1*m2)q1|
+    //
+    // where |V| indicates length of vector V and A*B indicates dot
+    // product of vectors A and B.  The matrix R has entries
+    //
+    //   r00 = q0*m0  r01 = q0*m1  r02 = q0*m2
+    //   r10 = 0      r11 = q1*m1  r12 = q1*m2
+    //   r20 = 0      r21 = 0      r22 = q2*m2
+    //
+    // so D = diag(r00,r11,r22) and U has entries u01 = r01/r00,
+    // u02 = r02/r00, and u12 = r12/r11.
+
+    // Q = rotation
+    // D = scaling
+    // U = shear
+
+    // D stores the three diagonal entries r00, r11, r22
+    // U stores the entries U[0] = u01, U[1] = u02, U[2] = u12
+
+    // build orthogonal matrix Q
+    float fInvLength = 1.0 / sqrt(elt[0][0] * elt[0][0]
+                                       + elt[1][0] * elt[1][0] +
+                                       elt[2][0] * elt[2][0]);
+    kQ[0][0] = elt[0][0] * fInvLength;
+    kQ[1][0] = elt[1][0] * fInvLength;
+    kQ[2][0] = elt[2][0] * fInvLength;
+
+    float fDot = kQ[0][0] * elt[0][1] + kQ[1][0] * elt[1][1] +
+                kQ[2][0] * elt[2][1];
+    kQ[0][1] = elt[0][1] - fDot * kQ[0][0];
+    kQ[1][1] = elt[1][1] - fDot * kQ[1][0];
+    kQ[2][1] = elt[2][1] - fDot * kQ[2][0];
+    fInvLength = 1.0 / sqrt(kQ[0][1] * kQ[0][1] + kQ[1][1] * kQ[1][1] +
+                                  kQ[2][1] * kQ[2][1]);
+    kQ[0][1] *= fInvLength;
+    kQ[1][1] *= fInvLength;
+    kQ[2][1] *= fInvLength;
+
+    fDot = kQ[0][0] * elt[0][2] + kQ[1][0] * elt[1][2] +
+           kQ[2][0] * elt[2][2];
+    kQ[0][2] = elt[0][2] - fDot * kQ[0][0];
+    kQ[1][2] = elt[1][2] - fDot * kQ[1][0];
+    kQ[2][2] = elt[2][2] - fDot * kQ[2][0];
+    fDot = kQ[0][1] * elt[0][2] + kQ[1][1] * elt[1][2] +
+           kQ[2][1] * elt[2][2];
+    kQ[0][2] -= fDot * kQ[0][1];
+    kQ[1][2] -= fDot * kQ[1][1];
+    kQ[2][2] -= fDot * kQ[2][1];
+    fInvLength = 1.0 / sqrt(kQ[0][2] * kQ[0][2] + kQ[1][2] * kQ[1][2] +
+                                  kQ[2][2] * kQ[2][2]);
+    kQ[0][2] *= fInvLength;
+    kQ[1][2] *= fInvLength;
+    kQ[2][2] *= fInvLength;
+
+    // guarantee that orthogonal matrix has determinant 1 (no reflections)
+    float fDet = kQ[0][0] * kQ[1][1] * kQ[2][2] + kQ[0][1] * kQ[1][2] * kQ[2][0] +
+                kQ[0][2] * kQ[1][0] * kQ[2][1] - kQ[0][2] * kQ[1][1] * kQ[2][0] -
+                kQ[0][1] * kQ[1][0] * kQ[2][2] - kQ[0][0] * kQ[1][2] * kQ[2][1];
+
+    if ( fDet < 0.0 ) {
+        for (int iRow = 0; iRow < 3; iRow++)
+            for (int iCol = 0; iCol < 3; iCol++)
+                kQ[iRow][iCol] = -kQ[iRow][iCol];
+    }
+
+    // build "right" matrix R
+    Matrix3 kR;
+
+    kR[0][0] = kQ[0][0] * elt[0][0] + kQ[1][0] * elt[1][0] +
+               kQ[2][0] * elt[2][0];
+
+    kR[0][1] = kQ[0][0] * elt[0][1] + kQ[1][0] * elt[1][1] +
+               kQ[2][0] * elt[2][1];
+
+    kR[1][1] = kQ[0][1] * elt[0][1] + kQ[1][1] * elt[1][1] +
+               kQ[2][1] * elt[2][1];
+
+    kR[0][2] = kQ[0][0] * elt[0][2] + kQ[1][0] * elt[1][2] +
+               kQ[2][0] * elt[2][2];
+
+    kR[1][2] = kQ[0][1] * elt[0][2] + kQ[1][1] * elt[1][2] +
+               kQ[2][1] * elt[2][2];
+
+    kR[2][2] = kQ[0][2] * elt[0][2] + kQ[1][2] * elt[1][2] +
+               kQ[2][2] * elt[2][2];
+
+    // the scaling component
+    kD[0] = kR[0][0];
+
+    kD[1] = kR[1][1];
+
+    kD[2] = kR[2][2];
+
+    // the shear component
+    float fInvD0 = 1.0 / kD[0];
+
+    kU[0] = kR[0][1] * fInvD0;
+
+    kU[1] = kR[0][2] * fInvD0;
+
+    kU[2] = kR[1][2] / kD[1];
+}
+
+//----------------------------------------------------------------------------
+void Matrix3::polarDecomposition(Matrix3 &R, Matrix3 &S) const{
+    /*
+      Polar decomposition of a matrix. Based on pseudocode from
+      Nicholas J Higham, "Computing the Polar Decomposition -- with
+      Applications Siam Journal of Science and Statistical Computing, Vol 7, No. 4,
+      October 1986.
+
+      Decomposes A into R*S, where R is orthogonal and S is symmetric.
+
+      Ken Shoemake's "Matrix animation and polar decomposition"
+      in Proceedings of the conference on Graphics interface '92
+      seems to be better known in the world of graphics, but Higham's version
+      uses a scaling constant that can lead to faster convergence than
+      Shoemake's when the initial matrix is far from orthogonal.
+    */
+
+    Matrix3 X = *this;
+    Matrix3 tmp = X.inverse();
+    Matrix3 Xit = tmp.transpose();
+    int iter = 0;
+    
+    const int MAX_ITERS = 100;
+
+    const double eps = 50 * std::numeric_limits::epsilon();
+    const float BigEps = 50 * eps;
+
+    /* Higham suggests using OneNorm(Xit-X) < eps * OneNorm(X)
+     * as the convergence criterion, but OneNorm(X) should quickly
+     * settle down to something between 1 and 1.7, so just comparing
+     * with eps seems sufficient.
+     *--------------------------------------------------------------- */
+
+    double resid = X.diffOneNorm(Xit);
+    while (resid > eps && iter < MAX_ITERS) {
+
+      tmp = X.inverse();
+      Xit = tmp.transpose();
+      
+      if (resid < BigEps) {
+	// close enough use simple iteration
+	X += Xit;
+	X *= 0.5f;
+      }
+      else {
+	// not close to convergence, compute acceleration factor
+        float gamma = sqrt( sqrt(
+                  (Xit.l1Norm()* Xit.lInfNorm())/(X.l1Norm()*X.lInfNorm()) ) );
+
+	X *= 0.5f * gamma;
+	tmp = Xit;
+	tmp *= 0.5f / gamma;
+	X += tmp;
+      }
+      
+      resid = X.diffOneNorm(Xit);
+      iter++;
+    }
+
+    R = X;
+    tmp = R.transpose();
+
+    S = tmp * (*this);
+
+    // S := (S + S^t)/2 one more time to make sure it is symmetric
+    tmp = S.transpose();
+
+    S += tmp;
+    S *= 0.5f;
+
+#ifdef G3D_DEBUG
+    // Check iter limit
+    assert(iter < MAX_ITERS);
+
+    // Check A = R*S
+    tmp = R*S;
+    resid = tmp.diffOneNorm(*this);
+    assert(resid < eps);
+
+    // Check R is orthogonal
+    tmp = R*R.transpose();
+    resid = tmp.diffOneNorm(Matrix3::identity());
+    assert(resid < eps);
+
+    // Check that S is symmetric
+    tmp = S.transpose();
+    resid = tmp.diffOneNorm(S);
+    assert(resid < eps);
+#endif
+}
+
+//----------------------------------------------------------------------------
+float Matrix3::maxCubicRoot (float afCoeff[3]) {
+    // Spectral norm is for A^T*A, so characteristic polynomial
+    // P(x) = c[0]+c[1]*x+c[2]*x^2+x^3 has three positive float roots.
+    // This yields the assertions c[0] < 0 and c[2]*c[2] >= 3*c[1].
+
+    // quick out for uniform scale (triple root)
+    const float fOneThird = 1.0f / 3.0f;
+    const float fEpsilon = 1e-06f;
+    float fDiscr = afCoeff[2] * afCoeff[2] - 3.0f * afCoeff[1];
+
+    if ( fDiscr <= fEpsilon )
+        return -fOneThird*afCoeff[2];
+
+    // Compute an upper bound on roots of P(x).  This assumes that A^T*A
+    // has been scaled by its largest entry.
+    float fX = 1.0f;
+
+    float fPoly = afCoeff[0] + fX * (afCoeff[1] + fX * (afCoeff[2] + fX));
+
+    if ( fPoly < 0.0f ) {
+        // uses a matrix norm to find an upper bound on maximum root
+        fX = G3D::abs(afCoeff[0]);
+        float fTmp = 1.0 + G3D::abs(afCoeff[1]);
+
+        if ( fTmp > fX )
+            fX = fTmp;
+
+        fTmp = 1.0 + G3D::abs(afCoeff[2]);
+
+        if ( fTmp > fX )
+            fX = fTmp;
+    }
+
+    // Newton's method to find root
+    float fTwoC2 = 2.0f * afCoeff[2];
+
+    for (int i = 0; i < 16; i++) {
+        fPoly = afCoeff[0] + fX * (afCoeff[1] + fX * (afCoeff[2] + fX));
+
+        if ( G3D::abs(fPoly) <= fEpsilon )
+            return fX;
+
+        float fDeriv = afCoeff[1] + fX * (fTwoC2 + 3.0f * fX);
+
+        fX -= fPoly / fDeriv;
+    }
+
+    return fX;
+}
+
+//----------------------------------------------------------------------------
+float Matrix3::spectralNorm () const {
+    Matrix3 kP;
+    int iRow, iCol;
+    float fPmax = 0.0;
+
+    for (iRow = 0; iRow < 3; iRow++) {
+        for (iCol = 0; iCol < 3; iCol++) {
+            kP[iRow][iCol] = 0.0;
+
+            for (int iMid = 0; iMid < 3; iMid++) {
+                kP[iRow][iCol] +=
+                    elt[iMid][iRow] * elt[iMid][iCol];
+            }
+
+            if ( kP[iRow][iCol] > fPmax )
+                fPmax = kP[iRow][iCol];
+        }
+    }
+
+    float fInvPmax = 1.0 / fPmax;
+
+    for (iRow = 0; iRow < 3; iRow++) {
+        for (iCol = 0; iCol < 3; iCol++)
+            kP[iRow][iCol] *= fInvPmax;
+    }
+
+    float afCoeff[3];
+    afCoeff[0] = -(kP[0][0] * (kP[1][1] * kP[2][2] - kP[1][2] * kP[2][1]) +
+                   kP[0][1] * (kP[2][0] * kP[1][2] - kP[1][0] * kP[2][2]) +
+                   kP[0][2] * (kP[1][0] * kP[2][1] - kP[2][0] * kP[1][1]));
+    afCoeff[1] = kP[0][0] * kP[1][1] - kP[0][1] * kP[1][0] +
+                 kP[0][0] * kP[2][2] - kP[0][2] * kP[2][0] +
+                 kP[1][1] * kP[2][2] - kP[1][2] * kP[2][1];
+    afCoeff[2] = -(kP[0][0] + kP[1][1] + kP[2][2]);
+
+    float fRoot = maxCubicRoot(afCoeff);
+    float fNorm = sqrt(fPmax * fRoot);
+    return fNorm;
+}
+
+//----------------------------------------------------------------------------
+float Matrix3::squaredFrobeniusNorm() const {
+    float norm2 = 0;
+    const float* e = &elt[0][0];
+    
+    for (int i = 0; i < 9; ++i){
+      norm2 += (*e) * (*e);
+    }
+
+    return norm2;
+}
+
+//----------------------------------------------------------------------------
+float Matrix3::frobeniusNorm() const {
+    return sqrtf(squaredFrobeniusNorm());
+}
+
+//----------------------------------------------------------------------------
+float Matrix3::l1Norm() const {
+    // The one norm of a matrix is the max column sum in absolute value.
+    float oneNorm = 0;
+    for (int c = 0; c < 3; ++c) {
+      
+      float f = fabs(elt[0][c])+ fabs(elt[1][c]) + fabs(elt[2][c]);
+      
+      if (f > oneNorm) {
+	oneNorm = f;
+      }
+    }
+    return oneNorm;
+}
+
+//----------------------------------------------------------------------------
+float Matrix3::lInfNorm() const {
+    // The infinity norm of a matrix is the max row sum in absolute value.
+    float infNorm = 0;
+
+    for (int r = 0; r < 3; ++r) {
+      
+      float f = fabs(elt[r][0]) + fabs(elt[r][1])+ fabs(elt[r][2]);
+      
+      if (f > infNorm) {
+	infNorm = f;
+      }
+    }
+    return infNorm;
+}
+
+//----------------------------------------------------------------------------
+float Matrix3::diffOneNorm(const Matrix3 &y) const{
+    float oneNorm = 0;
+    
+    for (int c = 0; c < 3; ++c){
+    
+      float f = fabs(elt[0][c] - y[0][c]) + fabs(elt[1][c] - y[1][c])
+	+ fabs(elt[2][c] - y[2][c]);
+      
+      if (f > oneNorm) {
+	oneNorm = f;
+      }
+    }
+    return oneNorm;
+}
+
+//----------------------------------------------------------------------------
+void Matrix3::toAxisAngle (Vector3& rkAxis, float& rfRadians) const {
+    // 
+    // Let (x,y,z) be the unit-length axis and let A be an angle of rotation.
+    // The rotation matrix is R = I + sin(A)*P + (1-cos(A))*P^2 (Rodrigues' formula) where
+    // I is the identity and
+    //
+    //       +-        -+
+    //   P = |  0 -z +y |
+    //       | +z  0 -x |
+    //       | -y +x  0 |
+    //       +-        -+
+    //
+    // If A > 0, R represents a counterclockwise rotation about the axis in
+    // the sense of looking from the tip of the axis vector towards the
+    // origin.  Some algebra will show that
+    //
+    //   cos(A) = (trace(R)-1)/2  and  R - R^t = 2*sin(A)*P
+    //
+    // In the event that A = pi, R-R^t = 0 which prevents us from extracting
+    // the axis through P.  Instead note that R = I+2*P^2 when A = pi, so
+    // P^2 = (R-I)/2.  The diagonal entries of P^2 are x^2-1, y^2-1, and
+    // z^2-1.  We can solve these for axis (x,y,z).  Because the angle is pi,
+    // it does not matter which sign you choose on the square roots.
+
+    float fTrace = elt[0][0] + elt[1][1] + elt[2][2];
+    float fCos = 0.5f * (fTrace - 1.0f);
+    rfRadians = G3D::aCos(fCos);  // in [0,PI]
+
+    if ( rfRadians > 0.0 ) {
+        if ( rfRadians < pi() ) {
+            rkAxis.x = elt[2][1] - elt[1][2];
+            rkAxis.y = elt[0][2] - elt[2][0];
+            rkAxis.z = elt[1][0] - elt[0][1];
+            rkAxis.unitize();
+        } else {
+            // angle is PI
+            float fHalfInverse;
+
+            if ( elt[0][0] >= elt[1][1] ) {
+                // r00 >= r11
+                if ( elt[0][0] >= elt[2][2] ) {
+                    // r00 is maximum diagonal term
+                    rkAxis.x = 0.5 * sqrt(elt[0][0] -
+                                                elt[1][1] - elt[2][2] + 1.0);
+                    fHalfInverse = 0.5 / rkAxis.x;
+                    rkAxis.y = fHalfInverse * elt[0][1];
+                    rkAxis.z = fHalfInverse * elt[0][2];
+                } else {
+                    // r22 is maximum diagonal term
+                    rkAxis.z = 0.5 * sqrt(elt[2][2] -
+                                                elt[0][0] - elt[1][1] + 1.0);
+                    fHalfInverse = 0.5 / rkAxis.z;
+                    rkAxis.x = fHalfInverse * elt[0][2];
+                    rkAxis.y = fHalfInverse * elt[1][2];
+                }
+            } else {
+                // r11 > r00
+                if ( elt[1][1] >= elt[2][2] ) {
+                    // r11 is maximum diagonal term
+                    rkAxis.y = 0.5 * sqrt(elt[1][1] -
+                                                elt[0][0] - elt[2][2] + 1.0);
+                    fHalfInverse = 0.5 / rkAxis.y;
+                    rkAxis.x = fHalfInverse * elt[0][1];
+                    rkAxis.z = fHalfInverse * elt[1][2];
+                } else {
+                    // r22 is maximum diagonal term
+                    rkAxis.z = 0.5 * sqrt(elt[2][2] -
+                                                elt[0][0] - elt[1][1] + 1.0);
+                    fHalfInverse = 0.5 / rkAxis.z;
+                    rkAxis.x = fHalfInverse * elt[0][2];
+                    rkAxis.y = fHalfInverse * elt[1][2];
+                }
+            }
+        }
+    } else {
+        // The angle is 0 and the matrix is the identity.  Any axis will
+        // work, so just use the x-axis.
+        rkAxis.x = 1.0;
+        rkAxis.y = 0.0;
+        rkAxis.z = 0.0;
+    }
+}
+
+//----------------------------------------------------------------------------
+Matrix3 Matrix3::fromAxisAngle (const Vector3& _axis, float fRadians) {
+    Vector3 axis = _axis.direction();
+
+    Matrix3 m;
+    float fCos  = cos(fRadians);
+    float fSin  = sin(fRadians);
+    float fOneMinusCos = 1.0 - fCos;
+    float fX2   = square(axis.x);
+    float fY2   = square(axis.y);
+    float fZ2   = square(axis.z);
+    float fXYM  = axis.x * axis.y * fOneMinusCos;
+    float fXZM  = axis.x * axis.z * fOneMinusCos;
+    float fYZM  = axis.y * axis.z * fOneMinusCos;
+    float fXSin = axis.x * fSin;
+    float fYSin = axis.y * fSin;
+    float fZSin = axis.z * fSin;
+
+    m.elt[0][0] = fX2 * fOneMinusCos + fCos;
+    m.elt[0][1] = fXYM - fZSin;
+    m.elt[0][2] = fXZM + fYSin;
+
+    m.elt[1][0] = fXYM + fZSin;
+    m.elt[1][1] = fY2 * fOneMinusCos + fCos;
+    m.elt[1][2] = fYZM - fXSin;
+
+    m.elt[2][0] = fXZM - fYSin;
+    m.elt[2][1] = fYZM + fXSin;
+    m.elt[2][2] = fZ2 * fOneMinusCos + fCos;
+
+    return m;
+}
+
+//----------------------------------------------------------------------------
+bool Matrix3::toEulerAnglesXYZ (float& rfXAngle, float& rfYAngle,
+                                float& rfZAngle) const {
+    // rot =  cy*cz          -cy*sz           sy
+    //        cz*sx*sy+cx*sz  cx*cz-sx*sy*sz -cy*sx
+    //       -cx*cz*sy+sx*sz  cz*sx+cx*sy*sz  cx*cy
+
+    if ( elt[0][2] < 1.0f ) {
+        if ( elt[0][2] > -1.0f ) {
+            rfXAngle = G3D::aTan2( -elt[1][2], elt[2][2]);
+            rfYAngle = (float) G3D::aSin(elt[0][2]);
+            rfZAngle = G3D::aTan2( -elt[0][1], elt[0][0]);
+            return true;
+        } else {
+            // WARNING.  Not unique.  XA - ZA = -atan2(r10,r11)
+            rfXAngle = -G3D::aTan2(elt[1][0], elt[1][1]);
+            rfYAngle = -(float)halfPi();
+            rfZAngle = 0.0f;
+            return false;
+        }
+    } else {
+        // WARNING.  Not unique.  XAngle + ZAngle = atan2(r10,r11)
+        rfXAngle = G3D::aTan2(elt[1][0], elt[1][1]);
+        rfYAngle = (float)halfPi();
+        rfZAngle = 0.0f;
+        return false;
+    }
+}
+
+//----------------------------------------------------------------------------
+bool Matrix3::toEulerAnglesXZY (float& rfXAngle, float& rfZAngle,
+                                float& rfYAngle) const {
+    // rot =  cy*cz          -sz              cz*sy
+    //        sx*sy+cx*cy*sz  cx*cz          -cy*sx+cx*sy*sz
+    //       -cx*sy+cy*sx*sz  cz*sx           cx*cy+sx*sy*sz
+
+    if ( elt[0][1] < 1.0f ) {
+        if ( elt[0][1] > -1.0f ) {
+            rfXAngle = G3D::aTan2(elt[2][1], elt[1][1]);
+            rfZAngle = (float) asin( -elt[0][1]);
+            rfYAngle = G3D::aTan2(elt[0][2], elt[0][0]);
+            return true;
+        } else {
+            // WARNING.  Not unique.  XA - YA = atan2(r20,r22)
+            rfXAngle = G3D::aTan2(elt[2][0], elt[2][2]);
+            rfZAngle = (float)halfPi();
+            rfYAngle = 0.0;
+            return false;
+        }
+    } else {
+        // WARNING.  Not unique.  XA + YA = atan2(-r20,r22)
+        rfXAngle = G3D::aTan2( -elt[2][0], elt[2][2]);
+        rfZAngle = -(float)halfPi();
+        rfYAngle = 0.0f;
+        return false;
+    }
+}
+
+//----------------------------------------------------------------------------
+bool Matrix3::toEulerAnglesYXZ (float& rfYAngle, float& rfXAngle,
+                                float& rfZAngle) const {
+    // rot =  cy*cz+sx*sy*sz  cz*sx*sy-cy*sz  cx*sy
+    //        cx*sz           cx*cz          -sx
+    //       -cz*sy+cy*sx*sz  cy*cz*sx+sy*sz  cx*cy
+
+    if ( elt[1][2] < 1.0 ) {
+        if ( elt[1][2] > -1.0 ) {
+            rfYAngle = G3D::aTan2(elt[0][2], elt[2][2]);
+            rfXAngle = (float) asin( -elt[1][2]);
+            rfZAngle = G3D::aTan2(elt[1][0], elt[1][1]);
+            return true;
+        } else {
+            // WARNING.  Not unique.  YA - ZA = atan2(r01,r00)
+            rfYAngle = G3D::aTan2(elt[0][1], elt[0][0]);
+            rfXAngle = (float)halfPi();
+            rfZAngle = 0.0;
+            return false;
+        }
+    } else {
+        // WARNING.  Not unique.  YA + ZA = atan2(-r01,r00)
+        rfYAngle = G3D::aTan2( -elt[0][1], elt[0][0]);
+        rfXAngle = -(float)halfPi();
+        rfZAngle = 0.0f;
+        return false;
+    }
+}
+
+//----------------------------------------------------------------------------
+bool Matrix3::toEulerAnglesYZX (float& rfYAngle, float& rfZAngle,
+                                float& rfXAngle) const {
+    // rot =  cy*cz           sx*sy-cx*cy*sz  cx*sy+cy*sx*sz
+    //        sz              cx*cz          -cz*sx
+    //       -cz*sy           cy*sx+cx*sy*sz  cx*cy-sx*sy*sz
+
+    if ( elt[1][0] < 1.0 ) {
+        if ( elt[1][0] > -1.0 ) {
+            rfYAngle = G3D::aTan2( -elt[2][0], elt[0][0]);
+            rfZAngle = (float) asin(elt[1][0]);
+            rfXAngle = G3D::aTan2( -elt[1][2], elt[1][1]);
+            return true;
+        } else {
+            // WARNING.  Not unique.  YA - XA = -atan2(r21,r22);
+            rfYAngle = -G3D::aTan2(elt[2][1], elt[2][2]);
+            rfZAngle = -(float)halfPi();
+            rfXAngle = 0.0;
+            return false;
+        }
+    } else {
+        // WARNING.  Not unique.  YA + XA = atan2(r21,r22)
+        rfYAngle = G3D::aTan2(elt[2][1], elt[2][2]);
+        rfZAngle = (float)halfPi();
+        rfXAngle = 0.0f;
+        return false;
+    }
+}
+
+//----------------------------------------------------------------------------
+bool Matrix3::toEulerAnglesZXY (float& rfZAngle, float& rfXAngle,
+                                float& rfYAngle) const {
+    // rot =  cy*cz-sx*sy*sz -cx*sz           cz*sy+cy*sx*sz
+    //        cz*sx*sy+cy*sz  cx*cz          -cy*cz*sx+sy*sz
+    //       -cx*sy           sx              cx*cy
+
+    if ( elt[2][1] < 1.0 ) {
+        if ( elt[2][1] > -1.0 ) {
+            rfZAngle = G3D::aTan2( -elt[0][1], elt[1][1]);
+            rfXAngle = (float) asin(elt[2][1]);
+            rfYAngle = G3D::aTan2( -elt[2][0], elt[2][2]);
+            return true;
+        } else {
+            // WARNING.  Not unique.  ZA - YA = -atan(r02,r00)
+            rfZAngle = -G3D::aTan2(elt[0][2], elt[0][0]);
+            rfXAngle = -(float)halfPi();
+            rfYAngle = 0.0f;
+            return false;
+        }
+    } else {
+        // WARNING.  Not unique.  ZA + YA = atan2(r02,r00)
+        rfZAngle = G3D::aTan2(elt[0][2], elt[0][0]);
+        rfXAngle = (float)halfPi();
+        rfYAngle = 0.0f;
+        return false;
+    }
+}
+
+//----------------------------------------------------------------------------
+bool Matrix3::toEulerAnglesZYX (float& rfZAngle, float& rfYAngle,
+                                float& rfXAngle) const {
+    // rot =  cy*cz           cz*sx*sy-cx*sz  cx*cz*sy+sx*sz
+    //        cy*sz           cx*cz+sx*sy*sz -cz*sx+cx*sy*sz
+    //       -sy              cy*sx           cx*cy
+
+    if ( elt[2][0] < 1.0 ) {
+        if ( elt[2][0] > -1.0 ) {
+            rfZAngle = atan2f(elt[1][0], elt[0][0]);
+            rfYAngle = asinf(-(double)elt[2][1]);
+            rfXAngle = atan2f(elt[2][1], elt[2][2]);
+            return true;
+        } else {
+            // WARNING.  Not unique.  ZA - XA = -atan2(r01,r02)
+            rfZAngle = -G3D::aTan2(elt[0][1], elt[0][2]);
+            rfYAngle = (float)halfPi();
+            rfXAngle = 0.0f;
+            return false;
+        }
+    } else {
+        // WARNING.  Not unique.  ZA + XA = atan2(-r01,-r02)
+        rfZAngle = G3D::aTan2( -elt[0][1], -elt[0][2]);
+        rfYAngle = -(float)halfPi();
+        rfXAngle = 0.0f;
+        return false;
+    }
+}
+
+//----------------------------------------------------------------------------
+Matrix3 Matrix3::fromEulerAnglesXYZ (float fYAngle, float fPAngle,
+                                  float fRAngle) {
+    float fCos, fSin;
+
+    fCos = cosf(fYAngle);
+    fSin = sinf(fYAngle);
+    Matrix3 kXMat(1.0f, 0.0f, 0.0f, 0.0f, fCos, -fSin, 0.0, fSin, fCos);
+
+    fCos = cosf(fPAngle);
+    fSin = sinf(fPAngle);
+    Matrix3 kYMat(fCos, 0.0f, fSin, 0.0f, 1.0f, 0.0f, -fSin, 0.0f, fCos);
+
+    fCos = cosf(fRAngle);
+    fSin = sinf(fRAngle);
+    Matrix3 kZMat(fCos, -fSin, 0.0f, fSin, fCos, 0.0f, 0.0f, 0.0f, 1.0f);
+
+    return kXMat * (kYMat * kZMat);
+}
+
+//----------------------------------------------------------------------------
+Matrix3 Matrix3::fromEulerAnglesXZY (float fYAngle, float fPAngle,
+                                  float fRAngle) {
+
+    float fCos, fSin;
+
+    fCos = cosf(fYAngle);
+    fSin = sinf(fYAngle);
+    Matrix3 kXMat(1.0, 0.0, 0.0, 0.0, fCos, -fSin, 0.0, fSin, fCos);
+
+    fCos = cosf(fPAngle);
+    fSin = sinf(fPAngle);
+    Matrix3 kZMat(fCos, -fSin, 0.0, fSin, fCos, 0.0, 0.0, 0.0, 1.0);
+
+    fCos = cosf(fRAngle);
+    fSin = sinf(fRAngle);
+    Matrix3 kYMat(fCos, 0.0, fSin, 0.0, 1.0, 0.0, -fSin, 0.0, fCos);
+
+    return kXMat * (kZMat * kYMat);
+}
+
+//----------------------------------------------------------------------------
+Matrix3 Matrix3::fromEulerAnglesYXZ(
+    float fYAngle, 
+    float fPAngle,
+    float fRAngle) {
+    
+    float fCos, fSin;
+
+    fCos = cos(fYAngle);
+    fSin = sin(fYAngle);
+    Matrix3 kYMat(fCos, 0.0f, fSin, 0.0f, 1.0f, 0.0f, -fSin, 0.0f, fCos);
+
+    fCos = cos(fPAngle);
+    fSin = sin(fPAngle);
+    Matrix3 kXMat(1.0f, 0.0f, 0.0f, 0.0f, fCos, -fSin, 0.0f, fSin, fCos);
+
+    fCos = cos(fRAngle);
+    fSin = sin(fRAngle);
+    Matrix3 kZMat(fCos, -fSin, 0.0f, fSin, fCos, 0.0f, 0.0f, 0.0f, 1.0f);
+
+    return kYMat * (kXMat * kZMat);
+}
+
+//----------------------------------------------------------------------------
+Matrix3 Matrix3::fromEulerAnglesYZX(
+    float fYAngle, 
+    float fPAngle,
+    float fRAngle) {
+
+    float fCos, fSin;
+
+    fCos = cos(fYAngle);
+    fSin = sin(fYAngle);
+    Matrix3 kYMat(fCos, 0.0f, fSin, 0.0f, 1.0f, 0.0f, -fSin, 0.0f, fCos);
+
+    fCos = cos(fPAngle);
+    fSin = sin(fPAngle);
+    Matrix3 kZMat(fCos, -fSin, 0.0f, fSin, fCos, 0.0f, 0.0f, 0.0f, 1.0f);
+
+    fCos = cos(fRAngle);
+    fSin = sin(fRAngle);
+    Matrix3 kXMat(1.0f, 0.0f, 0.0f, 0.0f, fCos, -fSin, 0.0f, fSin, fCos);
+
+    return kYMat * (kZMat * kXMat);
+}
+
+//----------------------------------------------------------------------------
+Matrix3 Matrix3::fromEulerAnglesZXY (float fYAngle, float fPAngle,
+                                  float fRAngle) {
+    float fCos, fSin;
+
+    fCos = cos(fYAngle);
+    fSin = sin(fYAngle);
+    Matrix3 kZMat(fCos, -fSin, 0.0, fSin, fCos, 0.0, 0.0, 0.0, 1.0);
+
+    fCos = cos(fPAngle);
+    fSin = sin(fPAngle);
+    Matrix3 kXMat(1.0, 0.0, 0.0, 0.0, fCos, -fSin, 0.0, fSin, fCos);
+
+    fCos = cos(fRAngle);
+    fSin = sin(fRAngle);
+    Matrix3 kYMat(fCos, 0.0, fSin, 0.0, 1.0, 0.0, -fSin, 0.0, fCos);
+
+    return kZMat * (kXMat * kYMat);
+}
+
+//----------------------------------------------------------------------------
+Matrix3 Matrix3::fromEulerAnglesZYX (float fYAngle, float fPAngle,
+                                  float fRAngle) {
+    float fCos, fSin;
+
+    fCos = cos(fYAngle);
+    fSin = sin(fYAngle);
+    Matrix3 kZMat(fCos, -fSin, 0.0, fSin, fCos, 0.0, 0.0, 0.0, 1.0);
+
+    fCos = cos(fPAngle);
+    fSin = sin(fPAngle);
+    Matrix3 kYMat(fCos, 0.0, fSin, 0.0, 1.0, 0.0, -fSin, 0.0, fCos);
+
+    fCos = cos(fRAngle);
+    fSin = sin(fRAngle);
+    Matrix3 kXMat(1.0, 0.0, 0.0, 0.0, fCos, -fSin, 0.0, fSin, fCos);
+
+    return kZMat * (kYMat * kXMat);
+}
+
+//----------------------------------------------------------------------------
+void Matrix3::tridiagonal (float afDiag[3], float afSubDiag[3]) {
+    // Householder reduction T = Q^t M Q
+    //   Input:
+    //     mat, symmetric 3x3 matrix M
+    //   Output:
+    //     mat, orthogonal matrix Q
+    //     diag, diagonal entries of T
+    //     subd, subdiagonal entries of T (T is symmetric)
+
+    float fA = elt[0][0];
+    float fB = elt[0][1];
+    float fC = elt[0][2];
+    float fD = elt[1][1];
+    float fE = elt[1][2];
+    float fF = elt[2][2];
+
+    afDiag[0] = fA;
+    afSubDiag[2] = 0.0;
+
+    if ( G3D::abs(fC) >= EPSILON ) {
+        float fLength = sqrt(fB * fB + fC * fC);
+        float fInvLength = 1.0 / fLength;
+        fB *= fInvLength;
+        fC *= fInvLength;
+        float fQ = 2.0 * fB * fE + fC * (fF - fD);
+        afDiag[1] = fD + fC * fQ;
+        afDiag[2] = fF - fC * fQ;
+        afSubDiag[0] = fLength;
+        afSubDiag[1] = fE - fB * fQ;
+        elt[0][0] = 1.0;
+        elt[0][1] = 0.0;
+        elt[0][2] = 0.0;
+        elt[1][0] = 0.0;
+        elt[1][1] = fB;
+        elt[1][2] = fC;
+        elt[2][0] = 0.0;
+        elt[2][1] = fC;
+        elt[2][2] = -fB;
+    } else {
+        afDiag[1] = fD;
+        afDiag[2] = fF;
+        afSubDiag[0] = fB;
+        afSubDiag[1] = fE;
+        elt[0][0] = 1.0;
+        elt[0][1] = 0.0;
+        elt[0][2] = 0.0;
+        elt[1][0] = 0.0;
+        elt[1][1] = 1.0;
+        elt[1][2] = 0.0;
+        elt[2][0] = 0.0;
+        elt[2][1] = 0.0;
+        elt[2][2] = 1.0;
+    }
+}
+
+//----------------------------------------------------------------------------
+bool Matrix3::qLAlgorithm (float afDiag[3], float afSubDiag[3]) {
+    // QL iteration with implicit shifting to reduce matrix from tridiagonal
+    // to diagonal
+
+    for (int i0 = 0; i0 < 3; i0++) {
+        const int iMaxIter = 32;
+        int iIter;
+
+        for (iIter = 0; iIter < iMaxIter; iIter++) {
+            int i1;
+
+            for (i1 = i0; i1 <= 1; i1++) {
+                float fSum = G3D::abs(afDiag[i1]) +
+                            G3D::abs(afDiag[i1 + 1]);
+
+                if ( G3D::abs(afSubDiag[i1]) + fSum == fSum )
+                    break;
+            }
+
+            if ( i1 == i0 )
+                break;
+
+            float fTmp0 = (afDiag[i0 + 1] - afDiag[i0]) / (2.0 * afSubDiag[i0]);
+
+            float fTmp1 = sqrt(fTmp0 * fTmp0 + 1.0);
+
+            if ( fTmp0 < 0.0 )
+                fTmp0 = afDiag[i1] - afDiag[i0] + afSubDiag[i0] / (fTmp0 - fTmp1);
+            else
+                fTmp0 = afDiag[i1] - afDiag[i0] + afSubDiag[i0] / (fTmp0 + fTmp1);
+
+            float fSin = 1.0;
+
+            float fCos = 1.0;
+
+            float fTmp2 = 0.0;
+
+            for (int i2 = i1 - 1; i2 >= i0; i2--) {
+                float fTmp3 = fSin * afSubDiag[i2];
+                float fTmp4 = fCos * afSubDiag[i2];
+
+                if (G3D::abs(fTmp3) >= G3D::abs(fTmp0)) {
+                    fCos = fTmp0 / fTmp3;
+                    fTmp1 = sqrt(fCos * fCos + 1.0);
+                    afSubDiag[i2 + 1] = fTmp3 * fTmp1;
+                    fSin = 1.0 / fTmp1;
+                    fCos *= fSin;
+                } else {
+                    fSin = fTmp3 / fTmp0;
+                    fTmp1 = sqrt(fSin * fSin + 1.0);
+                    afSubDiag[i2 + 1] = fTmp0 * fTmp1;
+                    fCos = 1.0 / fTmp1;
+                    fSin *= fCos;
+                }
+
+                fTmp0 = afDiag[i2 + 1] - fTmp2;
+                fTmp1 = (afDiag[i2] - fTmp0) * fSin + 2.0 * fTmp4 * fCos;
+                fTmp2 = fSin * fTmp1;
+                afDiag[i2 + 1] = fTmp0 + fTmp2;
+                fTmp0 = fCos * fTmp1 - fTmp4;
+
+                for (int iRow = 0; iRow < 3; iRow++) {
+                    fTmp3 = elt[iRow][i2 + 1];
+                    elt[iRow][i2 + 1] = fSin * elt[iRow][i2] +
+                                               fCos * fTmp3;
+                    elt[iRow][i2] = fCos * elt[iRow][i2] -
+                                           fSin * fTmp3;
+                }
+            }
+
+            afDiag[i0] -= fTmp2;
+            afSubDiag[i0] = fTmp0;
+            afSubDiag[i1] = 0.0;
+        }
+
+        if ( iIter == iMaxIter ) {
+            // should not get here under normal circumstances
+            return false;
+        }
+    }
+
+    return true;
+}
+
+//----------------------------------------------------------------------------
+void Matrix3::eigenSolveSymmetric (float afEigenvalue[3],
+                                   Vector3 akEigenvector[3]) const {
+    Matrix3 kMatrix = *this;
+    float afSubDiag[3];
+    kMatrix.tridiagonal(afEigenvalue, afSubDiag);
+    kMatrix.qLAlgorithm(afEigenvalue, afSubDiag);
+
+    for (int i = 0; i < 3; i++) {
+        akEigenvector[i][0] = kMatrix[0][i];
+        akEigenvector[i][1] = kMatrix[1][i];
+        akEigenvector[i][2] = kMatrix[2][i];
+    }
+
+    // make eigenvectors form a right--handed system
+    Vector3 kCross = akEigenvector[1].cross(akEigenvector[2]);
+
+    float fDet = akEigenvector[0].dot(kCross);
+
+    if ( fDet < 0.0 ) {
+        akEigenvector[2][0] = - akEigenvector[2][0];
+        akEigenvector[2][1] = - akEigenvector[2][1];
+        akEigenvector[2][2] = - akEigenvector[2][2];
+    }
+}
+
+//----------------------------------------------------------------------------
+void Matrix3::tensorProduct (const Vector3& rkU, const Vector3& rkV,
+                             Matrix3& rkProduct) {
+    for (int iRow = 0; iRow < 3; iRow++) {
+        for (int iCol = 0; iCol < 3; iCol++) {
+            rkProduct[iRow][iCol] = rkU[iRow] * rkV[iCol];
+        }
+    }
+}
+
+//----------------------------------------------------------------------------
+
+// Runs in 52 cycles on AMD, 76 cycles on Intel Centrino
+//
+// The loop unrolling is necessary for performance. 
+// I was unable to improve performance further by flattening the matrices
+// into float*'s instead of 2D arrays.  
+//
+// -morgan
+void Matrix3::_mul(const Matrix3& A, const Matrix3& B, Matrix3& out) {
+    const float* ARowPtr = A.elt[0];
+    float* outRowPtr     = out.elt[0];
+        outRowPtr[0] =
+            ARowPtr[0] * B.elt[0][0] +
+            ARowPtr[1] * B.elt[1][0] +
+            ARowPtr[2] * B.elt[2][0];
+        outRowPtr[1] =
+            ARowPtr[0] * B.elt[0][1] +
+            ARowPtr[1] * B.elt[1][1] +
+            ARowPtr[2] * B.elt[2][1];
+        outRowPtr[2] =
+            ARowPtr[0] * B.elt[0][2] +
+            ARowPtr[1] * B.elt[1][2] +
+            ARowPtr[2] * B.elt[2][2];
+
+    ARowPtr       = A.elt[1];
+    outRowPtr     = out.elt[1];
+
+        outRowPtr[0] =
+            ARowPtr[0] * B.elt[0][0] +
+            ARowPtr[1] * B.elt[1][0] +
+            ARowPtr[2] * B.elt[2][0];
+        outRowPtr[1] =
+            ARowPtr[0] * B.elt[0][1] +
+            ARowPtr[1] * B.elt[1][1] +
+            ARowPtr[2] * B.elt[2][1];
+        outRowPtr[2] =
+            ARowPtr[0] * B.elt[0][2] +
+            ARowPtr[1] * B.elt[1][2] +
+            ARowPtr[2] * B.elt[2][2];
+
+    ARowPtr       = A.elt[2];
+    outRowPtr     = out.elt[2];
+
+        outRowPtr[0] =
+            ARowPtr[0] * B.elt[0][0] +
+            ARowPtr[1] * B.elt[1][0] +
+            ARowPtr[2] * B.elt[2][0];
+        outRowPtr[1] =
+            ARowPtr[0] * B.elt[0][1] +
+            ARowPtr[1] * B.elt[1][1] +
+            ARowPtr[2] * B.elt[2][1];
+        outRowPtr[2] =
+            ARowPtr[0] * B.elt[0][2] +
+            ARowPtr[1] * B.elt[1][2] +
+            ARowPtr[2] * B.elt[2][2];
+}
+
+//----------------------------------------------------------------------------
+void Matrix3::_transpose(const Matrix3& A, Matrix3& out) {
+    out[0][0] = A.elt[0][0];
+    out[0][1] = A.elt[1][0];
+    out[0][2] = A.elt[2][0];
+    out[1][0] = A.elt[0][1];
+    out[1][1] = A.elt[1][1];
+    out[1][2] = A.elt[2][1];
+    out[2][0] = A.elt[0][2];
+    out[2][1] = A.elt[1][2];
+    out[2][2] = A.elt[2][2];
+}
+
+//-----------------------------------------------------------------------------
+std::string Matrix3::toString() const {
+    return G3D::format("[%g, %g, %g; %g, %g, %g; %g, %g, %g]", 
+			elt[0][0], elt[0][1], elt[0][2],
+			elt[1][0], elt[1][1], elt[1][2],
+			elt[2][0], elt[2][1], elt[2][2]);
+}
+
+
+
+} // namespace
+
diff --git a/externals/g3dlite/Matrix4.cpp b/externals/g3dlite/Matrix4.cpp
new file mode 100644
index 00000000000..cd38a1a3602
--- /dev/null
+++ b/externals/g3dlite/Matrix4.cpp
@@ -0,0 +1,523 @@
+/**
+  @file Matrix4.cpp
+ 
+ 
+  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+
+  @created 2003-10-02
+  @edited  2010-01-29
+ */
+
+#include "G3D/platform.h"
+#include "G3D/Matrix4.h"
+#include "G3D/Matrix3.h"
+#include "G3D/Vector4.h"
+#include "G3D/Vector3.h"
+#include "G3D/BinaryInput.h"
+#include "G3D/BinaryOutput.h"
+#include "G3D/CoordinateFrame.h"
+#include "G3D/Rect2D.h"
+#include "G3D/Any.h"
+#include "G3D/stringutils.h"
+
+namespace G3D {
+
+    
+Matrix4::Matrix4(const Any& any) {
+    any.verifyName("Matrix4");
+    any.verifyType(Any::ARRAY);
+
+    const std::string& name = toLower(any.name());
+    if (name == "matrix4") {
+        any.verifySize(16);
+
+        for (int r = 0; r < 4; ++r) {
+            for (int c = 0; c < 4; ++c) {
+                elt[r][c] = any[r * 4 + c];
+            }
+        }
+    } else if (name == "matrix4::scale") {
+        if (any.size() == 1) {
+            *this = scale(any[0].number());
+        } else if (any.size() == 3) {
+            *this = scale(any[0], any[1], any[2]);
+        } else {
+            any.verify(false, "Matrix4::scale() takes either 1 or 3 arguments");
+        }
+    } else {
+        any.verify(false, "Expected Matrix4 constructor");
+    }
+}
+
+
+Matrix4::operator Any() const {
+    Any any(Any::ARRAY, "Matrix4");
+    any.resize(16);
+    for (int r = 0; r < 4; ++r) {
+        for (int c = 0; c < 4; ++c) {
+            any[r * 4 + c] = elt[r][c];
+        }
+    }
+
+    return any;
+}
+
+const Matrix4& Matrix4::identity() {
+    static Matrix4 m(
+        1, 0, 0, 0,
+        0, 1, 0, 0,
+        0, 0, 1, 0,
+        0, 0, 0, 1);
+    return m;
+}
+
+
+const Matrix4& Matrix4::zero() {
+    static Matrix4 m(
+        0, 0, 0, 0,
+        0, 0, 0, 0,
+        0, 0, 0, 0,
+        0, 0, 0, 0);
+    return m;
+}
+
+
+Matrix4::Matrix4(const class CoordinateFrame& cframe) {
+    for (int r = 0; r < 3; ++r) {
+        for (int c = 0; c < 3; ++c) {
+            elt[r][c] = cframe.rotation[r][c];
+        }
+        elt[r][3] = cframe.translation[r];
+    }
+    elt[3][0] = 0.0f;
+    elt[3][1] = 0.0f;
+    elt[3][2] = 0.0f;
+    elt[3][3] = 1.0f;
+}
+
+Matrix4::Matrix4(const Matrix3& upper3x3, const Vector3& lastCol) {
+    for (int r = 0; r < 3; ++r) {
+        for (int c = 0; c < 3; ++c) {
+            elt[r][c] = upper3x3[r][c];
+        }
+        elt[r][3] = lastCol[r];
+    }
+    elt[3][0] = 0.0f;
+    elt[3][1] = 0.0f;
+    elt[3][2] = 0.0f;
+    elt[3][3] = 1.0f;
+}
+
+
+Matrix3 Matrix4::upper3x3() const {
+    return Matrix3(elt[0][0], elt[0][1], elt[0][2],
+                   elt[1][0], elt[1][1], elt[1][2],
+                   elt[2][0], elt[2][1], elt[2][2]);
+}
+
+
+Matrix4 Matrix4::orthogonalProjection(
+    const class Rect2D& rect,
+    float            nearval,
+    float            farval,
+    float            upDirection) {
+    return Matrix4::orthogonalProjection(rect.x0(), rect.x1(), rect.y1(), rect.y0(), nearval, farval, upDirection);
+}
+
+
+Matrix4 Matrix4::orthogonalProjection(
+    float            left,
+    float            right,
+    float            bottom,
+    float            top,
+    float            nearval,
+    float            farval,
+    float            upDirection) {
+
+    // Adapted from Mesa.  Note that Microsoft (http://msdn.microsoft.com/library/default.asp?url=/library/en-us/opengl/glfunc03_8qnj.asp) 
+    // and Linux (http://www.xfree86.org/current/glOrtho.3.html) have different matrices shown in their documentation.
+
+    float x, y, z;
+    float tx,  ty, tz;
+
+    x = 2.0f / (right-left);
+    y = 2.0f / (top-bottom);
+    z = -2.0f / (farval-nearval);
+    tx = -(right+left) / (right-left);
+    ty = -(top+bottom) / (top-bottom);
+    tz = -(farval+nearval) / (farval-nearval);
+
+    y  *= upDirection;
+    ty *= upDirection;
+
+    return 
+        Matrix4( x , 0.0f, 0.0f,  tx,
+                0.0f,  y , 0.0f,  ty,
+                0.0f, 0.0f,  z ,  tz,
+                0.0f, 0.0f, 0.0f, 1.0f);
+}
+
+
+Matrix4 Matrix4::perspectiveProjection(
+    float left,    
+    float right,
+    float bottom,  
+    float top,
+    float nearval, 
+    float farval,
+    float upDirection) {
+
+    float x, y, a, b, c, d;
+
+    x = (2.0f*nearval) / (right-left);
+    y = (2.0f*nearval) / (top-bottom);
+    a = (right+left) / (right-left);
+    b = (top+bottom) / (top-bottom);
+
+    if (farval >= finf()) {
+       // Infinite view frustum
+       c = -1.0f;
+       d = -2.0f * nearval;
+    } else {
+       c = -(farval+nearval) / (farval-nearval);
+       d = -(2.0f*farval*nearval) / (farval-nearval);
+    }
+
+    debugAssertM(abs(upDirection) == 1.0f, "upDirection must be -1 or +1");
+    y *= upDirection;
+    b *= upDirection;
+
+    return Matrix4(
+        x,  0,  a,  0,
+        0,  y,  b,  0,
+        0,  0,  c,  d,
+        0,  0, -1,  0);
+}
+
+
+void Matrix4::getPerspectiveProjectionParameters(
+    float& left,    
+    float& right,
+    float& bottom,  
+    float& top,
+    float& nearval, 
+    float& farval,
+    float upDirection) const {
+
+    debugAssertM(abs(upDirection) == 1.0f, "upDirection must be -1 or +1");
+
+    float x = elt[0][0];
+    float y = elt[1][1] * upDirection;
+    float a = elt[0][2];
+    float b = elt[1][2] * upDirection;
+    float c = elt[2][2];
+    float d = elt[2][3];
+
+    // Verify that this really is a projection matrix
+    debugAssertM(elt[3][2] == -1, "Not a projection matrix");
+    debugAssertM(elt[0][1] == 0, "Not a projection matrix");
+    debugAssertM(elt[0][3] == 0, "Not a projection matrix");
+    debugAssertM(elt[1][3] == 0, "Not a projection matrix");
+    debugAssertM(elt[3][3] == 0, "Not a projection matrix");
+    debugAssertM(elt[1][0] == 0, "Not a projection matrix");
+    debugAssertM(elt[2][0] == 0, "Not a projection matrix");
+    debugAssertM(elt[2][1] == 0, "Not a projection matrix");
+    debugAssertM(elt[3][0] == 0, "Not a projection matrix");
+    debugAssertM(elt[3][1] == 0, "Not a projection matrix");
+
+    if (c == -1) {
+        farval = finf();
+        nearval = -d / 2.0f;
+    } else {
+        nearval = d * ((c - 1.0f) / (c + 1.0f) - 1.0f) / (-2.0f * (c - 1.0f) / (c + 1.0f));
+        farval = nearval * ((c - 1.0f) / (c + 1.0f));
+    }
+
+
+    left = (a - 1.0f) * nearval / x;
+    right = 2.0f * nearval / x + left;
+
+    bottom = (b - 1.0f) * nearval / y;
+    top = 2.0f * nearval / y + bottom;
+}
+
+
+Matrix4::Matrix4(
+    float r1c1, float r1c2, float r1c3, float r1c4,
+    float r2c1, float r2c2, float r2c3, float r2c4,
+    float r3c1, float r3c2, float r3c3, float r3c4,
+    float r4c1, float r4c2, float r4c3, float r4c4) {
+    elt[0][0] = r1c1;  elt[0][1] = r1c2;  elt[0][2] = r1c3;  elt[0][3] = r1c4;
+    elt[1][0] = r2c1;  elt[1][1] = r2c2;  elt[1][2] = r2c3;  elt[1][3] = r2c4;
+    elt[2][0] = r3c1;  elt[2][1] = r3c2;  elt[2][2] = r3c3;  elt[2][3] = r3c4;
+    elt[3][0] = r4c1;  elt[3][1] = r4c2;  elt[3][2] = r4c3;  elt[3][3] = r4c4;
+}
+
+/**
+ init should be row major.
+ */
+Matrix4::Matrix4(const float* init) {
+    for (int r = 0; r < 4; ++r) {
+        for (int c = 0; c < 4; ++c) {
+            elt[r][c] = init[r * 4 + c];
+        }
+    }
+}
+
+
+Matrix4::Matrix4(const double* init) {
+    for (int r = 0; r < 4; ++r) {
+        for (int c = 0; c < 4; ++c) {
+            elt[r][c] = (float)init[r * 4 + c];
+        }
+    }
+}
+
+
+Matrix4::Matrix4() {
+    for (int r = 0; r < 4; ++r) {
+        for (int c = 0; c < 4; ++c) {
+            elt[r][c] = 0;
+        }
+    }
+}
+
+
+void Matrix4::setRow(int r, const Vector4& v) {
+    for (int c = 0; c < 4; ++c) {
+        elt[r][c] = v[c];
+    }
+}
+
+
+void Matrix4::setColumn(int c, const Vector4& v) {
+    for (int r = 0; r < 4; ++r) {
+        elt[r][c] = v[r];
+    }
+}
+
+
+const Vector4& Matrix4::row(int r) const {
+    return reinterpret_cast(elt[r])[0];
+}
+
+
+Vector4 Matrix4::column(int c) const {
+    Vector4 v;
+    for (int r = 0; r < 4; ++r) {
+        v[r] = elt[r][c];
+    }
+    return v;
+}
+
+
+Matrix4 Matrix4::operator*(const Matrix4& other) const {
+    Matrix4 result;
+    for (int r = 0; r < 4; ++r) {
+        for (int c = 0; c < 4; ++c) {
+            for (int i = 0; i < 4; ++i) {
+                result.elt[r][c] += elt[r][i] * other.elt[i][c];
+            }
+        }
+    }
+
+    return result;
+}
+
+
+Matrix4 Matrix4::operator*(const float s) const {
+    Matrix4 result;
+    for (int r = 0; r < 4; ++r) {
+        for (int c = 0; c < 4; ++c) {
+            result.elt[r][c] = elt[r][c] * s;
+        }
+    }
+
+    return result;
+}
+
+
+Vector3 Matrix4::homoMul(const class Vector3& v, float w) const {
+    Vector4 r = (*this) * Vector4(v, w);
+    return r.xyz() * (1.0f / r.w);
+}
+
+
+Vector4 Matrix4::operator*(const Vector4& vector) const {
+    Vector4 result(0,0,0,0);
+    for (int r = 0; r < 4; ++r) {
+        for (int c = 0; c < 4; ++c) {
+            result[r] += elt[r][c] * vector[c];
+        }
+    }
+
+    return result;
+}
+
+
+Matrix4 Matrix4::transpose() const {
+    Matrix4 result;
+    for (int r = 0; r < 4; ++r) {
+        for (int c = 0; c < 4; ++c) {
+            result.elt[c][r] = elt[r][c];
+        }
+    }
+
+    return result;
+}
+
+
+bool Matrix4::operator!=(const Matrix4& other) const {
+    return ! (*this == other);
+}
+
+
+bool Matrix4::operator==(const Matrix4& other) const {
+
+    // If the bit patterns are identical, they must be
+    // the same matrix.  If not, they *might* still have
+    // equal elements due to floating point weirdness.
+    if (memcmp(this, &other, sizeof(Matrix4) == 0)) {
+        return true;
+    } 
+
+    for (int r = 0; r < 4; ++r) {
+        for (int c = 0; c < 4; ++c) {
+            if (elt[r][c] != other.elt[r][c]) {
+                return false;
+            }
+        }
+    }
+
+    return true;
+}
+
+
+float Matrix4::determinant() const {
+    // Determinant is the dot product of the first row and the first row
+    // of cofactors (i.e. the first col of the adjoint matrix)
+	return cofactor().row(0).dot(row(0));
+}
+
+
+Matrix4 Matrix4::adjoint() const {
+    return cofactor().transpose();
+}
+
+
+Matrix4 Matrix4::inverse() const {
+    // Inverse = adjoint / determinant
+
+    Matrix4 A = adjoint();
+
+    // Determinant is the dot product of the first row and the first row
+    // of cofactors (i.e. the first col of the adjoint matrix)
+	float det = A.column(0).dot(row(0));
+
+	return A * (1.0f / det);
+}
+
+
+Matrix4 Matrix4::cofactor() const {
+	Matrix4 out;
+
+    // We'll use i to incrementally compute -1 ^ (r+c)
+    int i = 1;
+
+    for (int r = 0; r < 4; ++r) {
+        for (int c = 0; c < 4; ++c) {
+            // Compute the determinant of the 3x3 submatrix
+            float det = subDeterminant(r, c);
+            out.elt[r][c] = i * det;
+            i = -i;
+        }
+        i = -i;
+    }
+
+    return out;
+}
+
+
+float Matrix4::subDeterminant(int excludeRow, int excludeCol) const {
+    // Compute non-excluded row and column indices
+    int row[3];
+    int col[3];
+
+    for (int i = 0; i < 3; ++i) {
+        row[i] = i;
+        col[i] = i;
+
+        if (i >= excludeRow) {
+            ++row[i];
+        }
+        if (i >= excludeCol) {
+            ++col[i];
+        }
+    }
+
+    // Compute the first row of cofactors 
+    float cofactor00 = 
+      elt[row[1]][col[1]] * elt[row[2]][col[2]] -
+      elt[row[1]][col[2]] * elt[row[2]][col[1]];
+
+    float cofactor10 = 
+      elt[row[1]][col[2]] * elt[row[2]][col[0]] -
+      elt[row[1]][col[0]] * elt[row[2]][col[2]];
+
+    float cofactor20 = 
+      elt[row[1]][col[0]] * elt[row[2]][col[1]] -
+      elt[row[1]][col[1]] * elt[row[2]][col[0]];
+
+    // Product of the first row and the cofactors along the first row
+    return
+      elt[row[0]][col[0]] * cofactor00 +
+      elt[row[0]][col[1]] * cofactor10 +
+      elt[row[0]][col[2]] * cofactor20;
+}
+
+
+CoordinateFrame Matrix4::approxCoordinateFrame() const {
+	CoordinateFrame cframe;
+
+	for (int r = 0; r < 3; ++r) {
+		for (int c = 0; c < 3; ++c) {
+			cframe.rotation[r][c] = elt[r][c];
+		}
+		cframe.translation[r] = elt[r][3];
+	}
+
+	// Ensure that the rotation matrix is orthonormal
+	cframe.rotation.orthonormalize();
+
+	return cframe;
+}
+
+
+void Matrix4::serialize(class BinaryOutput& b) const {
+    for (int r = 0; r < 4; ++r) {
+        for (int c = 0; c < 4; ++c) {
+            b.writeFloat32(elt[r][c]);
+        }
+    }
+}
+
+
+void Matrix4::deserialize(class BinaryInput& b) {
+    for (int r = 0; r < 4; ++r) {
+        for (int c = 0; c < 4; ++c) {
+            elt[r][c] = b.readFloat32();
+        }
+    }
+}
+
+std::string Matrix4::toString() const {
+    return G3D::format("[%g, %g, %g, %g; %g, %g, %g, %g; %g, %g, %g, %g; %g, %g, %g, %g]", 
+			elt[0][0], elt[0][1], elt[0][2], elt[0][3],
+			elt[1][0], elt[1][1], elt[1][2], elt[1][3],
+			elt[2][0], elt[2][1], elt[2][2], elt[2][3],
+			elt[3][0], elt[3][1], elt[3][2], elt[3][3]);
+}
+
+} // namespace
+
+
diff --git a/externals/g3dlite/MemoryManager.cpp b/externals/g3dlite/MemoryManager.cpp
new file mode 100644
index 00000000000..240188a1f0e
--- /dev/null
+++ b/externals/g3dlite/MemoryManager.cpp
@@ -0,0 +1,91 @@
+/**
+  @file MemoryManager.cpp
+
+  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+  @created 2009-04-20
+  @edited  2009-05-29
+
+  Copyright 2000-2009, Morgan McGuire.
+  All rights reserved.
+ */
+
+#include "G3D/MemoryManager.h"
+#include "G3D/System.h"
+
+namespace G3D {
+
+MemoryManager::MemoryManager() {}
+
+
+void* MemoryManager::alloc(size_t s) {
+    return System::malloc(s);
+}
+
+
+void MemoryManager::free(void* ptr) {
+    System::free(ptr);
+}
+
+
+bool MemoryManager::isThreadsafe() const {
+    return true;
+}
+
+
+MemoryManager::Ref MemoryManager::create() {
+    static MemoryManager::Ref m = new MemoryManager();
+    return m;
+}
+
+
+///////////////////////////////////////////////////
+
+AlignedMemoryManager::AlignedMemoryManager() {}
+
+
+void* AlignedMemoryManager::alloc(size_t s) {
+    return System::alignedMalloc(s, 16);
+}
+
+
+void AlignedMemoryManager::free(void* ptr) {
+    System::alignedFree(ptr);
+}
+
+
+bool AlignedMemoryManager::isThreadsafe() const {
+    return true;
+}
+
+
+AlignedMemoryManager::Ref AlignedMemoryManager::create() {
+    static AlignedMemoryManager::Ref m = new AlignedMemoryManager();
+    return m;
+}
+
+
+///////////////////////////////////////////////////
+
+CRTMemoryManager::CRTMemoryManager() {}
+
+
+void* CRTMemoryManager::alloc(size_t s) {
+    return ::malloc(s);
+}
+
+
+void CRTMemoryManager::free(void* ptr) {
+    return ::free(ptr);
+}
+
+
+bool CRTMemoryManager::isThreadsafe() const {
+    return true;
+}
+
+
+CRTMemoryManager::Ref CRTMemoryManager::create() {
+    static CRTMemoryManager::Ref m = new CRTMemoryManager();
+    return m;
+}
+}
diff --git a/externals/g3dlite/Plane.cpp b/externals/g3dlite/Plane.cpp
new file mode 100644
index 00000000000..9b7991c0333
--- /dev/null
+++ b/externals/g3dlite/Plane.cpp
@@ -0,0 +1,149 @@
+/**
+ @file Plane.cpp
+ 
+ @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+ 
+ @created 2003-02-06
+ @edited  2006-01-29
+ */
+
+#include "G3D/platform.h"
+#include "G3D/Plane.h"
+#include "G3D/BinaryOutput.h"
+#include "G3D/BinaryInput.h"
+#include "G3D/stringutils.h"
+
+namespace G3D {
+
+Plane::Plane(class BinaryInput& b) {
+	deserialize(b);
+}
+
+
+void Plane::serialize(class BinaryOutput& b) const {
+	_normal.serialize(b);
+	b.writeFloat64(_distance);
+}
+
+
+void Plane::deserialize(class BinaryInput& b) {
+	_normal.deserialize(b);
+	_distance = (float)b.readFloat64();
+}
+
+
+Plane::Plane(
+    Vector4      point0,
+    Vector4      point1,
+    Vector4      point2) {
+
+    debugAssertM(
+        point0.w != 0 || 
+        point1.w != 0 || 
+        point2.w != 0,
+        "At least one point must be finite.");
+
+    // Rotate the points around so that the finite points come first.
+
+    while ((point0.w == 0) && 
+           ((point1.w == 0) || (point2.w != 0))) {
+        Vector4 temp = point0;
+        point0 = point1;
+        point1 = point2;
+        point2 = temp;
+    }
+
+    Vector3 dir1;
+    Vector3 dir2;
+
+    if (point1.w == 0) {
+        // 1 finite, 2 infinite points; the plane must contain
+        // the direction of the two direcitons
+        dir1 = point1.xyz();
+        dir2 = point2.xyz();
+    } else if (point2.w != 0) {
+        // 3 finite points, the plane must contain the directions
+        // betwseen the points.
+        dir1 = point1.xyz() - point0.xyz();
+        dir2 = point2.xyz() - point0.xyz();
+    } else {
+        // 2 finite, 1 infinite point; the plane must contain
+        // the direction between the first two points and the
+        // direction of the third point.
+        dir1 = point1.xyz() - point0.xyz();
+        dir2 = point2.xyz();
+    }
+
+    _normal   = dir1.cross(dir2).direction();
+    _distance = _normal.dot(point0.xyz());
+}
+
+
+Plane::Plane(
+    const Vector3&      point0,
+    const Vector3&      point1,
+    const Vector3&      point2) {
+
+    _normal   = (point1 - point0).cross(point2 - point0).direction();
+    _distance = _normal.dot(point0);
+}
+
+
+Plane::Plane(
+    const Vector3&      __normal,
+    const Vector3&      point) {
+
+    _normal    = __normal.direction();
+    _distance  = _normal.dot(point);
+}
+
+
+Plane Plane::fromEquation(float a, float b, float c, float d) {
+    Vector3 n(a, b, c);
+    float magnitude = n.magnitude();
+    d /= magnitude;
+    n /= magnitude;
+    return Plane(n, -d);
+}
+
+
+void Plane::flip() {
+    _normal   = -_normal;
+    _distance  = -_distance;
+}
+
+
+void Plane::getEquation(Vector3& n, float& d) const {
+    double _d;
+    getEquation(n, _d);
+    d = (float)_d;
+}
+
+void Plane::getEquation(Vector3& n, double& d) const {
+    n = _normal;
+    d = -_distance;
+}
+
+
+void Plane::getEquation(float& a, float& b, float& c, float& d) const {
+    double _a, _b, _c, _d;
+    getEquation(_a, _b, _c, _d);
+    a = (float)_a;
+    b = (float)_b;
+    c = (float)_c;
+    d = (float)_d;
+}
+
+void Plane::getEquation(double& a, double& b, double& c, double& d) const {
+    a = _normal.x;
+    b = _normal.y;
+    c = _normal.z;
+    d = -_distance;
+}
+
+
+std::string Plane::toString() const {
+    return format("Plane(%g, %g, %g, %g)", _normal.x, _normal.y, _normal.z, _distance);
+}
+
+}
diff --git a/externals/g3dlite/Quat.cpp b/externals/g3dlite/Quat.cpp
new file mode 100644
index 00000000000..225c5b51acc
--- /dev/null
+++ b/externals/g3dlite/Quat.cpp
@@ -0,0 +1,583 @@
+/**
+  @file Quat.cpp
+ 
+  Quaternion implementation based on Watt & Watt page 363
+  
+  @author Morgan McGuire, graphics3d.com
+  
+  @created 2002-01-23
+  @edited  2006-01-31
+ */
+
+#include "G3D/Quat.h"
+#include "G3D/BinaryInput.h"
+#include "G3D/BinaryOutput.h"
+
+namespace G3D {
+
+Quat Quat::fromAxisAngleRotation(
+    const Vector3&      axis,
+    float               angle) {
+
+    Quat q;
+
+    q.w = cos(angle / 2.0f);
+    q.imag() = axis.direction() * sin(angle / 2.0f); 
+
+    return q;
+}
+
+
+Quat::Quat(
+    const Matrix3& rot) {
+
+    static const int plus1mod3[] = {1, 2, 0};
+
+    // Find the index of the largest diagonal component
+	// These ? operations hopefully compile to conditional
+	// move instructions instead of branches.
+    int i = (rot[1][1] > rot[0][0]) ? 1 : 0;
+    i = (rot[2][2] > rot[i][i]) ? 2 : i;
+
+	// Find the indices of the other elements
+    int j = plus1mod3[i];
+    int k = plus1mod3[j];
+
+	// Index the elements of the vector part of the quaternion as a float*
+    float* v = (float*)(this);
+
+	// If we attempted to pre-normalize and trusted the matrix to be
+	// perfectly orthonormal, the result would be:
+	//
+    //   double c = sqrt((rot[i][i] - (rot[j][j] + rot[k][k])) + 1.0)
+    //   v[i] = -c * 0.5
+    //   v[j] = -(rot[i][j] + rot[j][i]) * 0.5 / c
+    //   v[k] = -(rot[i][k] + rot[k][i]) * 0.5 / c
+    //   w    =  (rot[j][k] - rot[k][j]) * 0.5 / c
+	//
+	// Since we're going to pay the sqrt anyway, we perform a post normalization, which also
+	// fixes any poorly normalized input.  Multiply all elements by 2*c in the above, giving:
+
+	// nc2 = -c^2
+    double nc2 = ((rot[j][j] + rot[k][k]) - rot[i][i]) - 1.0;
+    v[i] =  nc2;
+    w    =  (rot[j][k] - rot[k][j]);
+    v[j] = -(rot[i][j] + rot[j][i]);
+    v[k] = -(rot[i][k] + rot[k][i]);
+
+	// We now have the correct result with the wrong magnitude, so normalize it:
+    float s = sqrt(x*x + y*y + z*z + w*w);
+    if (s > 0.00001f) {
+	    s = 1.0f / s;
+	    x *= s;
+	    y *= s;
+	    z *= s;
+	    w *= s;
+    } else {
+        // The quaternion is nearly zero.  Make it 0 0 0 1
+        x = 0.0f;
+        y = 0.0f;
+        z = 0.0f;
+        w = 1.0f;
+    }
+}
+
+
+void Quat::toAxisAngleRotation(
+    Vector3&            axis,
+    double&             angle) const {
+   
+    // Decompose the quaternion into an angle and an axis.
+    
+    axis = Vector3(x, y, z);
+    angle = 2 * acos(w);
+
+    float len = sqrt(1.0f - w * w);
+
+    if (fuzzyGt(abs(len), 0.0f)) {
+        axis /= len;
+    }
+
+    // Reduce the range of the angle.
+
+    if (angle < 0) {		
+		angle = -angle;
+		axis = -axis;
+    }
+
+	while (angle > twoPi()) {
+        angle -= twoPi();
+    }
+
+	if (abs(angle) > pi()) {
+		angle -= twoPi();
+    }
+
+    // Make the angle positive.
+
+	if (angle < 0.0f) {		
+		angle = -angle;
+        axis = -axis;
+	}
+}
+
+
+Matrix3 Quat::toRotationMatrix() const {
+    Matrix3 out = Matrix3::zero();
+
+    toRotationMatrix(out);
+
+    return out;
+}
+
+
+void Quat::toRotationMatrix(
+    Matrix3&            rot) const {
+
+    rot = Matrix3(*this);
+}
+
+    
+Quat Quat::slerp(
+    const Quat&         _quat1,
+    float               alpha,
+    float               threshold) const {
+
+    // From: Game Physics -- David Eberly pg 538-540
+    // Modified to include lerp for small angles, which
+	// is a common practice.
+
+	// See also:
+	// http://number-none.com/product/Understanding%20Slerp,%20Then%20Not%20Using%20It/index.html
+
+    const Quat& quat0 = *this;
+    Quat quat1 = _quat1;
+
+    // angle between quaternion rotations
+    float phi;
+    float cosphi = quat0.dot(quat1);
+
+
+    if (cosphi < 0) {
+        // Change the sign and fix the dot product; we need to
+        // loop the other way to get the shortest path
+        quat1 = -quat1;
+        cosphi = -cosphi;
+    }
+
+    // Using G3D::aCos will clamp the angle to 0 and pi
+    phi = static_cast(G3D::aCos(cosphi));
+    
+    if (phi >= threshold) {
+        // For large angles, slerp
+        float scale0, scale1;
+
+        scale0 = sin((1.0f - alpha) * phi);
+        scale1 = sin(alpha * phi);
+        
+        return ( (quat0 * scale0) + (quat1 * scale1) ) / sin(phi);
+    } else {
+        // For small angles, linear interpolate
+		return quat0.nlerp(quat1, alpha);
+    }
+}
+
+
+Quat Quat::nlerp(
+    const Quat&         quat1,
+    float               alpha) const {
+
+    Quat result = (*this) * (1.0f - alpha) + quat1 * alpha;
+	return result / result.magnitude();
+}
+
+
+Quat Quat::operator*(const Quat& other) const {
+
+    // Following Watt & Watt, page 360
+    const Vector3& v1 = imag();
+    const Vector3& v2 = other.imag();
+    float          s1 = w;
+    float          s2 = other.w;
+
+    return Quat(s1*v2 + s2*v1 + v1.cross(v2), s1*s2 - v1.dot(v2));
+}
+
+
+// From "Uniform Random Rotations", Ken Shoemake, Graphics Gems III.
+Quat Quat::unitRandom() {
+    float x0 = uniformRandom();
+    float r1 = sqrtf(1 - x0), 
+          r2 = sqrtf(x0);
+    float t1 = (float)G3D::twoPi() * uniformRandom();
+    float t2 = (float)G3D::twoPi() * uniformRandom();
+    float c1 = cosf(t1), 
+          s1 = sinf(t1);
+    float c2 = cosf(t2), 
+          s2 = sinf(t2);
+    return Quat(s1 * r1, c1 * r1, s2 * r2, c2 * r2);
+}
+
+
+void Quat::deserialize(class BinaryInput& b) {
+    x = b.readFloat32();
+    y = b.readFloat32();
+    z = b.readFloat32();
+    w = b.readFloat32();
+}
+
+
+void Quat::serialize(class BinaryOutput& b) const {
+    b.writeFloat32(x);
+    b.writeFloat32(y);
+    b.writeFloat32(z);
+    b.writeFloat32(w);
+}
+
+
+// 2-char swizzles
+
+Vector2 Quat::xx() const  { return Vector2       (x, x); }
+Vector2 Quat::yx() const  { return Vector2       (y, x); }
+Vector2 Quat::zx() const  { return Vector2       (z, x); }
+Vector2 Quat::wx() const  { return Vector2       (w, x); }
+Vector2 Quat::xy() const  { return Vector2       (x, y); }
+Vector2 Quat::yy() const  { return Vector2       (y, y); }
+Vector2 Quat::zy() const  { return Vector2       (z, y); }
+Vector2 Quat::wy() const  { return Vector2       (w, y); }
+Vector2 Quat::xz() const  { return Vector2       (x, z); }
+Vector2 Quat::yz() const  { return Vector2       (y, z); }
+Vector2 Quat::zz() const  { return Vector2       (z, z); }
+Vector2 Quat::wz() const  { return Vector2       (w, z); }
+Vector2 Quat::xw() const  { return Vector2       (x, w); }
+Vector2 Quat::yw() const  { return Vector2       (y, w); }
+Vector2 Quat::zw() const  { return Vector2       (z, w); }
+Vector2 Quat::ww() const  { return Vector2       (w, w); }
+
+// 3-char swizzles
+
+Vector3 Quat::xxx() const  { return Vector3       (x, x, x); }
+Vector3 Quat::yxx() const  { return Vector3       (y, x, x); }
+Vector3 Quat::zxx() const  { return Vector3       (z, x, x); }
+Vector3 Quat::wxx() const  { return Vector3       (w, x, x); }
+Vector3 Quat::xyx() const  { return Vector3       (x, y, x); }
+Vector3 Quat::yyx() const  { return Vector3       (y, y, x); }
+Vector3 Quat::zyx() const  { return Vector3       (z, y, x); }
+Vector3 Quat::wyx() const  { return Vector3       (w, y, x); }
+Vector3 Quat::xzx() const  { return Vector3       (x, z, x); }
+Vector3 Quat::yzx() const  { return Vector3       (y, z, x); }
+Vector3 Quat::zzx() const  { return Vector3       (z, z, x); }
+Vector3 Quat::wzx() const  { return Vector3       (w, z, x); }
+Vector3 Quat::xwx() const  { return Vector3       (x, w, x); }
+Vector3 Quat::ywx() const  { return Vector3       (y, w, x); }
+Vector3 Quat::zwx() const  { return Vector3       (z, w, x); }
+Vector3 Quat::wwx() const  { return Vector3       (w, w, x); }
+Vector3 Quat::xxy() const  { return Vector3       (x, x, y); }
+Vector3 Quat::yxy() const  { return Vector3       (y, x, y); }
+Vector3 Quat::zxy() const  { return Vector3       (z, x, y); }
+Vector3 Quat::wxy() const  { return Vector3       (w, x, y); }
+Vector3 Quat::xyy() const  { return Vector3       (x, y, y); }
+Vector3 Quat::yyy() const  { return Vector3       (y, y, y); }
+Vector3 Quat::zyy() const  { return Vector3       (z, y, y); }
+Vector3 Quat::wyy() const  { return Vector3       (w, y, y); }
+Vector3 Quat::xzy() const  { return Vector3       (x, z, y); }
+Vector3 Quat::yzy() const  { return Vector3       (y, z, y); }
+Vector3 Quat::zzy() const  { return Vector3       (z, z, y); }
+Vector3 Quat::wzy() const  { return Vector3       (w, z, y); }
+Vector3 Quat::xwy() const  { return Vector3       (x, w, y); }
+Vector3 Quat::ywy() const  { return Vector3       (y, w, y); }
+Vector3 Quat::zwy() const  { return Vector3       (z, w, y); }
+Vector3 Quat::wwy() const  { return Vector3       (w, w, y); }
+Vector3 Quat::xxz() const  { return Vector3       (x, x, z); }
+Vector3 Quat::yxz() const  { return Vector3       (y, x, z); }
+Vector3 Quat::zxz() const  { return Vector3       (z, x, z); }
+Vector3 Quat::wxz() const  { return Vector3       (w, x, z); }
+Vector3 Quat::xyz() const  { return Vector3       (x, y, z); }
+Vector3 Quat::yyz() const  { return Vector3       (y, y, z); }
+Vector3 Quat::zyz() const  { return Vector3       (z, y, z); }
+Vector3 Quat::wyz() const  { return Vector3       (w, y, z); }
+Vector3 Quat::xzz() const  { return Vector3       (x, z, z); }
+Vector3 Quat::yzz() const  { return Vector3       (y, z, z); }
+Vector3 Quat::zzz() const  { return Vector3       (z, z, z); }
+Vector3 Quat::wzz() const  { return Vector3       (w, z, z); }
+Vector3 Quat::xwz() const  { return Vector3       (x, w, z); }
+Vector3 Quat::ywz() const  { return Vector3       (y, w, z); }
+Vector3 Quat::zwz() const  { return Vector3       (z, w, z); }
+Vector3 Quat::wwz() const  { return Vector3       (w, w, z); }
+Vector3 Quat::xxw() const  { return Vector3       (x, x, w); }
+Vector3 Quat::yxw() const  { return Vector3       (y, x, w); }
+Vector3 Quat::zxw() const  { return Vector3       (z, x, w); }
+Vector3 Quat::wxw() const  { return Vector3       (w, x, w); }
+Vector3 Quat::xyw() const  { return Vector3       (x, y, w); }
+Vector3 Quat::yyw() const  { return Vector3       (y, y, w); }
+Vector3 Quat::zyw() const  { return Vector3       (z, y, w); }
+Vector3 Quat::wyw() const  { return Vector3       (w, y, w); }
+Vector3 Quat::xzw() const  { return Vector3       (x, z, w); }
+Vector3 Quat::yzw() const  { return Vector3       (y, z, w); }
+Vector3 Quat::zzw() const  { return Vector3       (z, z, w); }
+Vector3 Quat::wzw() const  { return Vector3       (w, z, w); }
+Vector3 Quat::xww() const  { return Vector3       (x, w, w); }
+Vector3 Quat::yww() const  { return Vector3       (y, w, w); }
+Vector3 Quat::zww() const  { return Vector3       (z, w, w); }
+Vector3 Quat::www() const  { return Vector3       (w, w, w); }
+
+// 4-char swizzles
+
+Vector4 Quat::xxxx() const  { return Vector4       (x, x, x, x); }
+Vector4 Quat::yxxx() const  { return Vector4       (y, x, x, x); }
+Vector4 Quat::zxxx() const  { return Vector4       (z, x, x, x); }
+Vector4 Quat::wxxx() const  { return Vector4       (w, x, x, x); }
+Vector4 Quat::xyxx() const  { return Vector4       (x, y, x, x); }
+Vector4 Quat::yyxx() const  { return Vector4       (y, y, x, x); }
+Vector4 Quat::zyxx() const  { return Vector4       (z, y, x, x); }
+Vector4 Quat::wyxx() const  { return Vector4       (w, y, x, x); }
+Vector4 Quat::xzxx() const  { return Vector4       (x, z, x, x); }
+Vector4 Quat::yzxx() const  { return Vector4       (y, z, x, x); }
+Vector4 Quat::zzxx() const  { return Vector4       (z, z, x, x); }
+Vector4 Quat::wzxx() const  { return Vector4       (w, z, x, x); }
+Vector4 Quat::xwxx() const  { return Vector4       (x, w, x, x); }
+Vector4 Quat::ywxx() const  { return Vector4       (y, w, x, x); }
+Vector4 Quat::zwxx() const  { return Vector4       (z, w, x, x); }
+Vector4 Quat::wwxx() const  { return Vector4       (w, w, x, x); }
+Vector4 Quat::xxyx() const  { return Vector4       (x, x, y, x); }
+Vector4 Quat::yxyx() const  { return Vector4       (y, x, y, x); }
+Vector4 Quat::zxyx() const  { return Vector4       (z, x, y, x); }
+Vector4 Quat::wxyx() const  { return Vector4       (w, x, y, x); }
+Vector4 Quat::xyyx() const  { return Vector4       (x, y, y, x); }
+Vector4 Quat::yyyx() const  { return Vector4       (y, y, y, x); }
+Vector4 Quat::zyyx() const  { return Vector4       (z, y, y, x); }
+Vector4 Quat::wyyx() const  { return Vector4       (w, y, y, x); }
+Vector4 Quat::xzyx() const  { return Vector4       (x, z, y, x); }
+Vector4 Quat::yzyx() const  { return Vector4       (y, z, y, x); }
+Vector4 Quat::zzyx() const  { return Vector4       (z, z, y, x); }
+Vector4 Quat::wzyx() const  { return Vector4       (w, z, y, x); }
+Vector4 Quat::xwyx() const  { return Vector4       (x, w, y, x); }
+Vector4 Quat::ywyx() const  { return Vector4       (y, w, y, x); }
+Vector4 Quat::zwyx() const  { return Vector4       (z, w, y, x); }
+Vector4 Quat::wwyx() const  { return Vector4       (w, w, y, x); }
+Vector4 Quat::xxzx() const  { return Vector4       (x, x, z, x); }
+Vector4 Quat::yxzx() const  { return Vector4       (y, x, z, x); }
+Vector4 Quat::zxzx() const  { return Vector4       (z, x, z, x); }
+Vector4 Quat::wxzx() const  { return Vector4       (w, x, z, x); }
+Vector4 Quat::xyzx() const  { return Vector4       (x, y, z, x); }
+Vector4 Quat::yyzx() const  { return Vector4       (y, y, z, x); }
+Vector4 Quat::zyzx() const  { return Vector4       (z, y, z, x); }
+Vector4 Quat::wyzx() const  { return Vector4       (w, y, z, x); }
+Vector4 Quat::xzzx() const  { return Vector4       (x, z, z, x); }
+Vector4 Quat::yzzx() const  { return Vector4       (y, z, z, x); }
+Vector4 Quat::zzzx() const  { return Vector4       (z, z, z, x); }
+Vector4 Quat::wzzx() const  { return Vector4       (w, z, z, x); }
+Vector4 Quat::xwzx() const  { return Vector4       (x, w, z, x); }
+Vector4 Quat::ywzx() const  { return Vector4       (y, w, z, x); }
+Vector4 Quat::zwzx() const  { return Vector4       (z, w, z, x); }
+Vector4 Quat::wwzx() const  { return Vector4       (w, w, z, x); }
+Vector4 Quat::xxwx() const  { return Vector4       (x, x, w, x); }
+Vector4 Quat::yxwx() const  { return Vector4       (y, x, w, x); }
+Vector4 Quat::zxwx() const  { return Vector4       (z, x, w, x); }
+Vector4 Quat::wxwx() const  { return Vector4       (w, x, w, x); }
+Vector4 Quat::xywx() const  { return Vector4       (x, y, w, x); }
+Vector4 Quat::yywx() const  { return Vector4       (y, y, w, x); }
+Vector4 Quat::zywx() const  { return Vector4       (z, y, w, x); }
+Vector4 Quat::wywx() const  { return Vector4       (w, y, w, x); }
+Vector4 Quat::xzwx() const  { return Vector4       (x, z, w, x); }
+Vector4 Quat::yzwx() const  { return Vector4       (y, z, w, x); }
+Vector4 Quat::zzwx() const  { return Vector4       (z, z, w, x); }
+Vector4 Quat::wzwx() const  { return Vector4       (w, z, w, x); }
+Vector4 Quat::xwwx() const  { return Vector4       (x, w, w, x); }
+Vector4 Quat::ywwx() const  { return Vector4       (y, w, w, x); }
+Vector4 Quat::zwwx() const  { return Vector4       (z, w, w, x); }
+Vector4 Quat::wwwx() const  { return Vector4       (w, w, w, x); }
+Vector4 Quat::xxxy() const  { return Vector4       (x, x, x, y); }
+Vector4 Quat::yxxy() const  { return Vector4       (y, x, x, y); }
+Vector4 Quat::zxxy() const  { return Vector4       (z, x, x, y); }
+Vector4 Quat::wxxy() const  { return Vector4       (w, x, x, y); }
+Vector4 Quat::xyxy() const  { return Vector4       (x, y, x, y); }
+Vector4 Quat::yyxy() const  { return Vector4       (y, y, x, y); }
+Vector4 Quat::zyxy() const  { return Vector4       (z, y, x, y); }
+Vector4 Quat::wyxy() const  { return Vector4       (w, y, x, y); }
+Vector4 Quat::xzxy() const  { return Vector4       (x, z, x, y); }
+Vector4 Quat::yzxy() const  { return Vector4       (y, z, x, y); }
+Vector4 Quat::zzxy() const  { return Vector4       (z, z, x, y); }
+Vector4 Quat::wzxy() const  { return Vector4       (w, z, x, y); }
+Vector4 Quat::xwxy() const  { return Vector4       (x, w, x, y); }
+Vector4 Quat::ywxy() const  { return Vector4       (y, w, x, y); }
+Vector4 Quat::zwxy() const  { return Vector4       (z, w, x, y); }
+Vector4 Quat::wwxy() const  { return Vector4       (w, w, x, y); }
+Vector4 Quat::xxyy() const  { return Vector4       (x, x, y, y); }
+Vector4 Quat::yxyy() const  { return Vector4       (y, x, y, y); }
+Vector4 Quat::zxyy() const  { return Vector4       (z, x, y, y); }
+Vector4 Quat::wxyy() const  { return Vector4       (w, x, y, y); }
+Vector4 Quat::xyyy() const  { return Vector4       (x, y, y, y); }
+Vector4 Quat::yyyy() const  { return Vector4       (y, y, y, y); }
+Vector4 Quat::zyyy() const  { return Vector4       (z, y, y, y); }
+Vector4 Quat::wyyy() const  { return Vector4       (w, y, y, y); }
+Vector4 Quat::xzyy() const  { return Vector4       (x, z, y, y); }
+Vector4 Quat::yzyy() const  { return Vector4       (y, z, y, y); }
+Vector4 Quat::zzyy() const  { return Vector4       (z, z, y, y); }
+Vector4 Quat::wzyy() const  { return Vector4       (w, z, y, y); }
+Vector4 Quat::xwyy() const  { return Vector4       (x, w, y, y); }
+Vector4 Quat::ywyy() const  { return Vector4       (y, w, y, y); }
+Vector4 Quat::zwyy() const  { return Vector4       (z, w, y, y); }
+Vector4 Quat::wwyy() const  { return Vector4       (w, w, y, y); }
+Vector4 Quat::xxzy() const  { return Vector4       (x, x, z, y); }
+Vector4 Quat::yxzy() const  { return Vector4       (y, x, z, y); }
+Vector4 Quat::zxzy() const  { return Vector4       (z, x, z, y); }
+Vector4 Quat::wxzy() const  { return Vector4       (w, x, z, y); }
+Vector4 Quat::xyzy() const  { return Vector4       (x, y, z, y); }
+Vector4 Quat::yyzy() const  { return Vector4       (y, y, z, y); }
+Vector4 Quat::zyzy() const  { return Vector4       (z, y, z, y); }
+Vector4 Quat::wyzy() const  { return Vector4       (w, y, z, y); }
+Vector4 Quat::xzzy() const  { return Vector4       (x, z, z, y); }
+Vector4 Quat::yzzy() const  { return Vector4       (y, z, z, y); }
+Vector4 Quat::zzzy() const  { return Vector4       (z, z, z, y); }
+Vector4 Quat::wzzy() const  { return Vector4       (w, z, z, y); }
+Vector4 Quat::xwzy() const  { return Vector4       (x, w, z, y); }
+Vector4 Quat::ywzy() const  { return Vector4       (y, w, z, y); }
+Vector4 Quat::zwzy() const  { return Vector4       (z, w, z, y); }
+Vector4 Quat::wwzy() const  { return Vector4       (w, w, z, y); }
+Vector4 Quat::xxwy() const  { return Vector4       (x, x, w, y); }
+Vector4 Quat::yxwy() const  { return Vector4       (y, x, w, y); }
+Vector4 Quat::zxwy() const  { return Vector4       (z, x, w, y); }
+Vector4 Quat::wxwy() const  { return Vector4       (w, x, w, y); }
+Vector4 Quat::xywy() const  { return Vector4       (x, y, w, y); }
+Vector4 Quat::yywy() const  { return Vector4       (y, y, w, y); }
+Vector4 Quat::zywy() const  { return Vector4       (z, y, w, y); }
+Vector4 Quat::wywy() const  { return Vector4       (w, y, w, y); }
+Vector4 Quat::xzwy() const  { return Vector4       (x, z, w, y); }
+Vector4 Quat::yzwy() const  { return Vector4       (y, z, w, y); }
+Vector4 Quat::zzwy() const  { return Vector4       (z, z, w, y); }
+Vector4 Quat::wzwy() const  { return Vector4       (w, z, w, y); }
+Vector4 Quat::xwwy() const  { return Vector4       (x, w, w, y); }
+Vector4 Quat::ywwy() const  { return Vector4       (y, w, w, y); }
+Vector4 Quat::zwwy() const  { return Vector4       (z, w, w, y); }
+Vector4 Quat::wwwy() const  { return Vector4       (w, w, w, y); }
+Vector4 Quat::xxxz() const  { return Vector4       (x, x, x, z); }
+Vector4 Quat::yxxz() const  { return Vector4       (y, x, x, z); }
+Vector4 Quat::zxxz() const  { return Vector4       (z, x, x, z); }
+Vector4 Quat::wxxz() const  { return Vector4       (w, x, x, z); }
+Vector4 Quat::xyxz() const  { return Vector4       (x, y, x, z); }
+Vector4 Quat::yyxz() const  { return Vector4       (y, y, x, z); }
+Vector4 Quat::zyxz() const  { return Vector4       (z, y, x, z); }
+Vector4 Quat::wyxz() const  { return Vector4       (w, y, x, z); }
+Vector4 Quat::xzxz() const  { return Vector4       (x, z, x, z); }
+Vector4 Quat::yzxz() const  { return Vector4       (y, z, x, z); }
+Vector4 Quat::zzxz() const  { return Vector4       (z, z, x, z); }
+Vector4 Quat::wzxz() const  { return Vector4       (w, z, x, z); }
+Vector4 Quat::xwxz() const  { return Vector4       (x, w, x, z); }
+Vector4 Quat::ywxz() const  { return Vector4       (y, w, x, z); }
+Vector4 Quat::zwxz() const  { return Vector4       (z, w, x, z); }
+Vector4 Quat::wwxz() const  { return Vector4       (w, w, x, z); }
+Vector4 Quat::xxyz() const  { return Vector4       (x, x, y, z); }
+Vector4 Quat::yxyz() const  { return Vector4       (y, x, y, z); }
+Vector4 Quat::zxyz() const  { return Vector4       (z, x, y, z); }
+Vector4 Quat::wxyz() const  { return Vector4       (w, x, y, z); }
+Vector4 Quat::xyyz() const  { return Vector4       (x, y, y, z); }
+Vector4 Quat::yyyz() const  { return Vector4       (y, y, y, z); }
+Vector4 Quat::zyyz() const  { return Vector4       (z, y, y, z); }
+Vector4 Quat::wyyz() const  { return Vector4       (w, y, y, z); }
+Vector4 Quat::xzyz() const  { return Vector4       (x, z, y, z); }
+Vector4 Quat::yzyz() const  { return Vector4       (y, z, y, z); }
+Vector4 Quat::zzyz() const  { return Vector4       (z, z, y, z); }
+Vector4 Quat::wzyz() const  { return Vector4       (w, z, y, z); }
+Vector4 Quat::xwyz() const  { return Vector4       (x, w, y, z); }
+Vector4 Quat::ywyz() const  { return Vector4       (y, w, y, z); }
+Vector4 Quat::zwyz() const  { return Vector4       (z, w, y, z); }
+Vector4 Quat::wwyz() const  { return Vector4       (w, w, y, z); }
+Vector4 Quat::xxzz() const  { return Vector4       (x, x, z, z); }
+Vector4 Quat::yxzz() const  { return Vector4       (y, x, z, z); }
+Vector4 Quat::zxzz() const  { return Vector4       (z, x, z, z); }
+Vector4 Quat::wxzz() const  { return Vector4       (w, x, z, z); }
+Vector4 Quat::xyzz() const  { return Vector4       (x, y, z, z); }
+Vector4 Quat::yyzz() const  { return Vector4       (y, y, z, z); }
+Vector4 Quat::zyzz() const  { return Vector4       (z, y, z, z); }
+Vector4 Quat::wyzz() const  { return Vector4       (w, y, z, z); }
+Vector4 Quat::xzzz() const  { return Vector4       (x, z, z, z); }
+Vector4 Quat::yzzz() const  { return Vector4       (y, z, z, z); }
+Vector4 Quat::zzzz() const  { return Vector4       (z, z, z, z); }
+Vector4 Quat::wzzz() const  { return Vector4       (w, z, z, z); }
+Vector4 Quat::xwzz() const  { return Vector4       (x, w, z, z); }
+Vector4 Quat::ywzz() const  { return Vector4       (y, w, z, z); }
+Vector4 Quat::zwzz() const  { return Vector4       (z, w, z, z); }
+Vector4 Quat::wwzz() const  { return Vector4       (w, w, z, z); }
+Vector4 Quat::xxwz() const  { return Vector4       (x, x, w, z); }
+Vector4 Quat::yxwz() const  { return Vector4       (y, x, w, z); }
+Vector4 Quat::zxwz() const  { return Vector4       (z, x, w, z); }
+Vector4 Quat::wxwz() const  { return Vector4       (w, x, w, z); }
+Vector4 Quat::xywz() const  { return Vector4       (x, y, w, z); }
+Vector4 Quat::yywz() const  { return Vector4       (y, y, w, z); }
+Vector4 Quat::zywz() const  { return Vector4       (z, y, w, z); }
+Vector4 Quat::wywz() const  { return Vector4       (w, y, w, z); }
+Vector4 Quat::xzwz() const  { return Vector4       (x, z, w, z); }
+Vector4 Quat::yzwz() const  { return Vector4       (y, z, w, z); }
+Vector4 Quat::zzwz() const  { return Vector4       (z, z, w, z); }
+Vector4 Quat::wzwz() const  { return Vector4       (w, z, w, z); }
+Vector4 Quat::xwwz() const  { return Vector4       (x, w, w, z); }
+Vector4 Quat::ywwz() const  { return Vector4       (y, w, w, z); }
+Vector4 Quat::zwwz() const  { return Vector4       (z, w, w, z); }
+Vector4 Quat::wwwz() const  { return Vector4       (w, w, w, z); }
+Vector4 Quat::xxxw() const  { return Vector4       (x, x, x, w); }
+Vector4 Quat::yxxw() const  { return Vector4       (y, x, x, w); }
+Vector4 Quat::zxxw() const  { return Vector4       (z, x, x, w); }
+Vector4 Quat::wxxw() const  { return Vector4       (w, x, x, w); }
+Vector4 Quat::xyxw() const  { return Vector4       (x, y, x, w); }
+Vector4 Quat::yyxw() const  { return Vector4       (y, y, x, w); }
+Vector4 Quat::zyxw() const  { return Vector4       (z, y, x, w); }
+Vector4 Quat::wyxw() const  { return Vector4       (w, y, x, w); }
+Vector4 Quat::xzxw() const  { return Vector4       (x, z, x, w); }
+Vector4 Quat::yzxw() const  { return Vector4       (y, z, x, w); }
+Vector4 Quat::zzxw() const  { return Vector4       (z, z, x, w); }
+Vector4 Quat::wzxw() const  { return Vector4       (w, z, x, w); }
+Vector4 Quat::xwxw() const  { return Vector4       (x, w, x, w); }
+Vector4 Quat::ywxw() const  { return Vector4       (y, w, x, w); }
+Vector4 Quat::zwxw() const  { return Vector4       (z, w, x, w); }
+Vector4 Quat::wwxw() const  { return Vector4       (w, w, x, w); }
+Vector4 Quat::xxyw() const  { return Vector4       (x, x, y, w); }
+Vector4 Quat::yxyw() const  { return Vector4       (y, x, y, w); }
+Vector4 Quat::zxyw() const  { return Vector4       (z, x, y, w); }
+Vector4 Quat::wxyw() const  { return Vector4       (w, x, y, w); }
+Vector4 Quat::xyyw() const  { return Vector4       (x, y, y, w); }
+Vector4 Quat::yyyw() const  { return Vector4       (y, y, y, w); }
+Vector4 Quat::zyyw() const  { return Vector4       (z, y, y, w); }
+Vector4 Quat::wyyw() const  { return Vector4       (w, y, y, w); }
+Vector4 Quat::xzyw() const  { return Vector4       (x, z, y, w); }
+Vector4 Quat::yzyw() const  { return Vector4       (y, z, y, w); }
+Vector4 Quat::zzyw() const  { return Vector4       (z, z, y, w); }
+Vector4 Quat::wzyw() const  { return Vector4       (w, z, y, w); }
+Vector4 Quat::xwyw() const  { return Vector4       (x, w, y, w); }
+Vector4 Quat::ywyw() const  { return Vector4       (y, w, y, w); }
+Vector4 Quat::zwyw() const  { return Vector4       (z, w, y, w); }
+Vector4 Quat::wwyw() const  { return Vector4       (w, w, y, w); }
+Vector4 Quat::xxzw() const  { return Vector4       (x, x, z, w); }
+Vector4 Quat::yxzw() const  { return Vector4       (y, x, z, w); }
+Vector4 Quat::zxzw() const  { return Vector4       (z, x, z, w); }
+Vector4 Quat::wxzw() const  { return Vector4       (w, x, z, w); }
+Vector4 Quat::xyzw() const  { return Vector4       (x, y, z, w); }
+Vector4 Quat::yyzw() const  { return Vector4       (y, y, z, w); }
+Vector4 Quat::zyzw() const  { return Vector4       (z, y, z, w); }
+Vector4 Quat::wyzw() const  { return Vector4       (w, y, z, w); }
+Vector4 Quat::xzzw() const  { return Vector4       (x, z, z, w); }
+Vector4 Quat::yzzw() const  { return Vector4       (y, z, z, w); }
+Vector4 Quat::zzzw() const  { return Vector4       (z, z, z, w); }
+Vector4 Quat::wzzw() const  { return Vector4       (w, z, z, w); }
+Vector4 Quat::xwzw() const  { return Vector4       (x, w, z, w); }
+Vector4 Quat::ywzw() const  { return Vector4       (y, w, z, w); }
+Vector4 Quat::zwzw() const  { return Vector4       (z, w, z, w); }
+Vector4 Quat::wwzw() const  { return Vector4       (w, w, z, w); }
+Vector4 Quat::xxww() const  { return Vector4       (x, x, w, w); }
+Vector4 Quat::yxww() const  { return Vector4       (y, x, w, w); }
+Vector4 Quat::zxww() const  { return Vector4       (z, x, w, w); }
+Vector4 Quat::wxww() const  { return Vector4       (w, x, w, w); }
+Vector4 Quat::xyww() const  { return Vector4       (x, y, w, w); }
+Vector4 Quat::yyww() const  { return Vector4       (y, y, w, w); }
+Vector4 Quat::zyww() const  { return Vector4       (z, y, w, w); }
+Vector4 Quat::wyww() const  { return Vector4       (w, y, w, w); }
+Vector4 Quat::xzww() const  { return Vector4       (x, z, w, w); }
+Vector4 Quat::yzww() const  { return Vector4       (y, z, w, w); }
+Vector4 Quat::zzww() const  { return Vector4       (z, z, w, w); }
+Vector4 Quat::wzww() const  { return Vector4       (w, z, w, w); }
+Vector4 Quat::xwww() const  { return Vector4       (x, w, w, w); }
+Vector4 Quat::ywww() const  { return Vector4       (y, w, w, w); }
+Vector4 Quat::zwww() const  { return Vector4       (z, w, w, w); }
+Vector4 Quat::wwww() const  { return Vector4       (w, w, w, w); }
+}
+
diff --git a/externals/g3dlite/Random.cpp b/externals/g3dlite/Random.cpp
new file mode 100644
index 00000000000..2dda744a1ac
--- /dev/null
+++ b/externals/g3dlite/Random.cpp
@@ -0,0 +1,212 @@
+/**
+ @file Random.cpp
+ 
+ @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+ 
+ @created 2009-01-02
+ @edited  2009-03-29
+
+ Copyright 2000-2009, Morgan McGuire.
+ All rights reserved.
+ */
+#include "G3D/Random.h"
+
+namespace G3D {
+
+Random& Random::common() {
+    static Random r;
+    return r;
+}
+
+Random::Random(void* x) : state(NULL), m_threadsafe(false) {
+    (void)x;
+}
+
+
+Random::Random(uint32 seed, bool threadsafe) : m_threadsafe(threadsafe) {
+    const uint32 X = 1812433253UL;
+
+    state = new uint32[N];
+    state[0] = seed;
+    for (index = 1; index < (int)N; ++index) {
+        state[index] = X * (state[index - 1] ^ (state[index - 1] >> 30)) + index;
+    }
+}
+
+
+Random::~Random() {
+    delete[] state;
+    state = NULL;
+}
+
+
+uint32 Random::bits() {
+    // See http://en.wikipedia.org/wiki/Mersenne_twister
+
+    // Make a local copy of the index variable to ensure that it
+    // is not out of bounds
+    int localIndex = index;
+
+    // Automatically checks for index < 0 if corrupted
+    // by unsynchronized threads.
+    if ((unsigned int)localIndex >= (unsigned int)N) {
+        generate();
+        localIndex = 0;
+    }
+    // Increment the global index.  It may go out of bounds on
+    // multiple threads, but the above check ensures that the
+    // array index actually used never goes out of bounds.
+    // It doesn't matter if we grab the same array index twice
+    // on two threads, since the distribution of random numbers
+    // will still be uniform.
+    ++index;
+    // Return the next random in the sequence
+    uint32 r = state[localIndex];
+
+    // Temper the result
+    r ^=  r >> U;
+    r ^= (r << S) & B;
+    r ^= (r << T) & C;
+    r ^=  r >> L;
+    
+    return r;    
+}
+
+
+/** Generate the next N ints, and store them for readback later */
+void Random::generate() {
+    // Lower R bits
+    static const uint32 LOWER_MASK = (1LU << R) - 1;
+
+    // Upper (32 - R) bits
+    static const uint32 UPPER_MASK = 0xFFFFFFFF << R;
+    static const uint32 mag01[2] = {0UL, (uint32)A};
+
+    if (m_threadsafe) {
+        bool contention = ! lock.lock();
+        if (contention)  {
+            // Another thread just generated a set of numbers; no need for
+            // this thread to do it too
+            lock.unlock();
+            return;
+        }
+    }
+
+    // First N - M
+    for (unsigned int i = 0; i < N - M; ++i) {    
+        uint32 x = (state[i] & UPPER_MASK) | (state[i + 1] & LOWER_MASK);
+        state[i] = state[i + M] ^ (x >> 1) ^ mag01[x & 1];
+    }
+
+    // Rest
+    for (unsigned int i = N - M + 1; i < N - 1; ++i) {    
+        uint32 x = (state[i] & UPPER_MASK) | (state[i + 1] & LOWER_MASK);
+        state[i] = state[i + (M - N)] ^ (x >> 1) ^ mag01[x & 1];
+    }
+        
+    uint32 y = (state[N - 1] & UPPER_MASK) | (state[0] & LOWER_MASK);
+    state[N - 1] = state[M - 1] ^ (y >> 1) ^ mag01[y & 1];
+    index = 0;
+
+    if (m_threadsafe) {
+        lock.unlock();
+    }
+}
+
+    
+int Random::integer(int low, int high) {
+    int r = iFloor(low + (high - low + 1) * (double)bits() / 0xFFFFFFFFUL);
+
+    // There is a *very small* chance of generating
+    // a number larger than high.
+    if (r > high) {
+        return high;
+    } else {
+        return r;
+    }
+}
+
+    
+float Random::gaussian(float mean, float stdev) {
+
+    // Using Box-Mueller method from http://www.taygeta.com/random/gaussian.html
+    // Modified to specify standard deviation and mean of distribution
+    float w, x1, x2;
+
+    // Loop until w is less than 1 so that log(w) is negative
+    do {
+        x1 = uniform(-1.0, 1.0);
+        x2 = uniform(-1.0, 1.0);
+
+        w = float(square(x1) + square(x2));
+    } while (w > 1.0f);
+
+    // Transform to gassian distribution
+    // Multiply by sigma (stdev ^ 2) and add mean.
+    return x2 * (float)square(stdev) * sqrtf((-2.0f * logf(w) ) / w) + mean; 
+}
+
+
+void Random::cosHemi(float& x, float& y, float& z) {
+    const float e1 = uniform();
+    const float e2 = uniform();
+
+    // Jensen's method 
+    const float sin_theta = sqrtf(1.0f - e1);
+    const float cos_theta = sqrtf(e1);
+    const float phi = 6.28318531f * e2;
+
+    x = cos(phi) * sin_theta;
+    y = sin(phi) * sin_theta;
+    z = cos_theta;
+
+    // We could also use Malley's method (pbrt p.657), since they are the same cost:
+    //
+    //  r = sqrt(e1);
+    //  t = 2*pi*e2;
+    //  x = cos(t)*r;
+    //  y = sin(t)*r;
+    //  z = sqrt(1.0 - x*x + y*y);
+}
+
+
+void Random::cosPowHemi(const float k, float& x, float& y, float& z) {
+    const float e1 = uniform();
+    const float e2 = uniform();
+
+    const float cos_theta = pow(e1, 1.0f / (k + 1.0f));
+    const float sin_theta = sqrtf(1.0f - square(cos_theta));
+    const float phi = 6.28318531f * e2;
+
+    x = cos(phi) * sin_theta;
+    y = sin(phi) * sin_theta;
+    z = cos_theta;
+}
+
+
+void Random::hemi(float& x, float& y, float& z) {
+    sphere(x, y, z);
+    z = fabsf(z);
+}
+
+
+void Random::sphere(float& x, float& y, float& z) {
+    // Squared magnitude
+    float m2;
+
+    // Rejection sample
+    do {
+        x = uniform() * 2.0f - 1.0f, 
+        y = uniform() * 2.0f - 1.0f,
+        z = uniform() * 2.0f - 1.0f;
+        m2 = x*x + y*y + z*z;
+    } while (m2 >= 1.0f);
+
+    // Divide by magnitude to produce a unit vector
+    float s = rsqrt(m2);
+    x *= s;
+    y *= s;
+    z *= s;
+}
+
+} // G3D
diff --git a/externals/g3dlite/Ray.cpp b/externals/g3dlite/Ray.cpp
new file mode 100644
index 00000000000..0436ef0b323
--- /dev/null
+++ b/externals/g3dlite/Ray.cpp
@@ -0,0 +1,218 @@
+/**
+ @file Ray.cpp 
+ 
+ @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+ 
+ @created 2002-07-12
+ @edited  2004-03-19
+ */
+
+#include "G3D/platform.h"
+#include "G3D/Ray.h"
+#include "G3D/Plane.h"
+#include "G3D/Sphere.h"
+#include "G3D/CollisionDetection.h"
+
+namespace G3D {
+
+void Ray::set(const Vector3& origin, const Vector3& direction) {
+	m_origin = origin;
+	m_direction = direction;
+	debugAssert(direction.isUnit());
+
+	m_invDirection = Vector3::one() / direction;
+
+	// ray slope
+	ibyj = m_direction.x * m_invDirection.y;
+	jbyi = m_direction.y * m_invDirection.x;
+	jbyk = m_direction.y * m_invDirection.z;
+	kbyj = m_direction.z * m_invDirection.y;
+	ibyk = m_direction.x * m_invDirection.z;
+	kbyi = m_direction.z * m_invDirection.x;
+
+	// precomputed terms
+	c_xy = m_origin.y - jbyi * m_origin.x;
+	c_xz = m_origin.z - kbyi * m_origin.x;
+	c_yx = m_origin.x - ibyj * m_origin.y;
+	c_yz = m_origin.z - kbyj * m_origin.y;
+	c_zx = m_origin.x - ibyk * m_origin.z;
+	c_zy = m_origin.y - jbyk * m_origin.z;	
+
+	//ray slope classification
+	if (m_direction.x < 0) {
+		if (m_direction.y < 0) {
+			if (m_direction.z < 0) {
+				classification = MMM;
+			} else if (m_direction.z > 0) {
+				classification = MMP;
+			} else { //(m_direction.z >= 0)
+				classification = MMO;
+			}
+		} else { //(m_direction.y >= 0)
+			if (m_direction.z < 0) {
+				if (m_direction.y == 0) {
+					classification = MOM;
+				} else {
+					classification = MPM;
+				}
+			} else { //(m_direction.z >= 0)
+				if ((m_direction.y == 0) && (m_direction.z == 0)) {
+					classification = MOO;
+				} else if (m_direction.z == 0) {
+					classification = MPO;
+				} else if (m_direction.y == 0) {
+					classification = MOP;
+				} else {
+					classification = MPP;
+				}
+			}
+		}
+	} else { //(m_direction.x >= 0)
+		if (m_direction.y < 0) {
+			if (m_direction.z < 0) {
+				if (m_direction.x == 0) {
+					classification = OMM;
+				} else {
+					classification = PMM;
+				}
+			} else { //(m_direction.z >= 0)
+				if ((m_direction.x == 0) && (m_direction.z == 0)) {
+					classification = OMO;
+				} else if (m_direction.z == 0) {
+					classification = PMO;
+				} else if (m_direction.x == 0) {
+					classification = OMP;
+				} else {
+					classification = PMP;
+				}
+			}
+		} else { //(m_direction.y >= 0)
+			if (m_direction.z < 0) {
+				if ((m_direction.x == 0) && (m_direction.y == 0)) {
+					classification = OOM;
+				} else if (m_direction.x == 0) {
+					classification = OPM;
+				} else if (m_direction.y == 0) {
+					classification = POM;
+				} else {
+					classification = PPM;
+				}
+			} else { //(m_direction.z > 0)
+				if (m_direction.x == 0) {
+					if (m_direction.y == 0) {
+						classification = OOP;
+					} else if (m_direction.z == 0) {
+						classification = OPO;
+					} else {
+						classification = OPP;
+					}
+				} else {
+					if ((m_direction.y == 0) && (m_direction.z == 0)) {
+						classification = POO;
+					} else if (m_direction.y == 0) {
+						classification = POP;
+					} else if (m_direction.z == 0) {
+						classification = PPO;
+					} else {
+						classification = PPP;
+					}
+				}
+			}			
+		}
+	}
+}
+
+Ray::Ray(class BinaryInput& b) {
+	deserialize(b);
+}
+
+
+void Ray::serialize(class BinaryOutput& b) const {
+	m_origin.serialize(b);
+	m_direction.serialize(b);
+}
+
+
+void Ray::deserialize(class BinaryInput& b) {
+	m_origin.deserialize(b);
+	m_direction.deserialize(b);
+	set(m_origin, m_direction);
+}
+
+
+Ray Ray::refract(
+    const Vector3&  newOrigin,
+    const Vector3&  normal,
+    float           iInside,
+    float           iOutside) const {
+
+    Vector3 D = m_direction.refractionDirection(normal, iInside, iOutside);
+    return Ray(newOrigin + (m_direction + normal * (float)sign(m_direction.dot(normal))) * 0.001f, D);
+}
+
+
+Ray Ray::reflect(
+    const Vector3&  newOrigin,
+    const Vector3&  normal) const {
+
+    Vector3 D = m_direction.reflectionDirection(normal);
+    return Ray(newOrigin + (D + normal) * 0.001f, D);
+}
+
+
+Vector3 Ray::intersection(const Plane& plane) const {
+    float d;
+    Vector3 normal = plane.normal();
+    plane.getEquation(normal, d);
+    float rate = m_direction.dot(normal);
+
+    if (rate >= 0.0f) {
+        return Vector3::inf();
+    } else {
+        float t = -(d + m_origin.dot(normal)) / rate;
+        return m_origin + m_direction * t;
+    }
+}
+
+
+float Ray::intersectionTime(const class Sphere& sphere, bool solid) const {
+    Vector3 dummy;
+    return CollisionDetection::collisionTimeForMovingPointFixedSphere(
+            m_origin, m_direction, sphere, dummy, dummy, solid);
+}
+
+
+float Ray::intersectionTime(const class Plane& plane) const {
+    Vector3 dummy;
+    return CollisionDetection::collisionTimeForMovingPointFixedPlane(
+            m_origin, m_direction, plane, dummy);
+}
+
+
+float Ray::intersectionTime(const class Box& box) const {
+    Vector3 dummy;
+    float time = CollisionDetection::collisionTimeForMovingPointFixedBox(
+            m_origin, m_direction, box, dummy);
+
+    if ((time == finf()) && (box.contains(m_origin))) {
+        return 0.0f;
+    } else {
+        return time;
+    }
+}
+
+
+float Ray::intersectionTime(const class AABox& box) const {
+    Vector3 dummy;
+    bool inside;
+    float time = CollisionDetection::collisionTimeForMovingPointFixedAABox(
+            m_origin, m_direction, box, dummy, inside);
+
+    if ((time == finf()) && inside) {
+        return 0.0f;
+    } else {
+        return time;
+    }
+}
+
+}
diff --git a/externals/g3dlite/ReferenceCount.cpp b/externals/g3dlite/ReferenceCount.cpp
new file mode 100644
index 00000000000..2e1f117e0d9
--- /dev/null
+++ b/externals/g3dlite/ReferenceCount.cpp
@@ -0,0 +1,61 @@
+/**
+  @file ReferenceCount.cpp
+
+  Reference Counting Garbage Collector for C++
+
+  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+  @cite Adapted and extended from Justin Miller's "RGC" class that appeared in BYTE magazine.
+  @cite See also http://www.jelovic.com/articles/cpp_without_memory_errors_slides.htm
+
+  @created 2001-10-23
+  @edited  2009-04-25
+*/
+#include "G3D/platform.h"
+#include "G3D/ReferenceCount.h"
+
+namespace G3D {
+
+ReferenceCountedObject::ReferenceCountedObject() : 
+    ReferenceCountedObject_refCount(0), 
+    ReferenceCountedObject_weakPointer(0) {
+
+    debugAssertM(isValidHeapPointer(this), 
+        "Reference counted objects must be allocated on the heap.");
+}
+
+void ReferenceCountedObject::ReferenceCountedObject_zeroWeakPointers() {
+    // Tell all of my weak pointers that I'm gone.
+    
+    _WeakPtrLinkedList* node = ReferenceCountedObject_weakPointer;
+
+    while (node != NULL) {
+        // Notify the weak pointer that it is going away
+        node->weakPtr->objectCollected();
+
+        // Free the node and advance
+        _WeakPtrLinkedList* tmp = node;
+        node = node->next;
+        delete tmp;
+    }
+}
+
+ReferenceCountedObject::~ReferenceCountedObject() {}
+
+
+ReferenceCountedObject::ReferenceCountedObject(const ReferenceCountedObject& notUsed) : 
+    ReferenceCountedObject_refCount(0),
+    ReferenceCountedObject_weakPointer(0) {
+    (void)notUsed;
+    debugAssertM(G3D::isValidHeapPointer(this), 
+        "Reference counted objects must be allocated on the heap.");
+}
+
+ReferenceCountedObject& ReferenceCountedObject::operator=(const ReferenceCountedObject& other) {
+    (void)other;
+    // Nothing changes when I am assigned; the reference count on
+    // both objects is the same (although my super-class probably
+    // changes).
+    return *this;
+}
+
+} // G3D
diff --git a/externals/g3dlite/Sphere.cpp b/externals/g3dlite/Sphere.cpp
new file mode 100644
index 00000000000..4ed0811cb29
--- /dev/null
+++ b/externals/g3dlite/Sphere.cpp
@@ -0,0 +1,223 @@
+/**
+ @file Sphere.cpp
+ 
+ Sphere class
+ 
+ @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+ 
+ @created 2001-04-17
+ @edited  2009-01-20
+ */
+
+#include "G3D/platform.h"
+#include "G3D/Sphere.h"
+#include "G3D/stringutils.h"
+#include "G3D/BinaryOutput.h"
+#include "G3D/BinaryInput.h"
+#include "G3D/AABox.h"
+#include "G3D/Plane.h"
+
+namespace G3D {
+
+int32 Sphere::dummy;
+
+Sphere::Sphere(class BinaryInput& b) {
+    deserialize(b);
+}
+
+
+void Sphere::serialize(class BinaryOutput& b) const {
+    center.serialize(b);
+    b.writeFloat64(radius);
+}
+
+
+void Sphere::deserialize(class BinaryInput& b) {
+    center.deserialize(b);
+    radius = (float)b.readFloat64();
+}
+
+
+std::string Sphere::toString() const {
+    return format("Sphere(<%g, %g, %g>, %g)", 
+                  center.x, center.y, center.z, radius);
+}
+
+
+bool Sphere::contains(const Vector3& point) const {
+    float distance = (center - point).squaredMagnitude();
+    return distance <= square(radius);
+}
+
+
+bool Sphere::contains(const Sphere& other) const {
+    float distance = (center - other.center).squaredMagnitude();
+    return (radius >= other.radius) && (distance <= square(radius - other.radius));
+}
+
+
+bool Sphere::intersects(const Sphere& other) const {
+    return (other.center - center).length() <= (radius + other.radius);
+}
+
+
+void Sphere::merge(const Sphere& other) {
+    if (other.contains(*this)) {
+        *this = other;
+    } else if (! contains(other)) {
+        // The farthest distance is along the axis between the centers, which
+        // must not be colocated since neither contains the other.
+        Vector3 toMe = center - other.center;
+        // Get a point on the axis from each
+        toMe = toMe.direction();
+        const Vector3& A = center + toMe * radius;
+        const Vector3& B = other.center - toMe * other.radius;
+
+        // Now just bound the A->B segment
+        center = (A + B) * 0.5f;
+        radius = (A - B).length();
+    }
+    // (if this contains other, we're done)
+}
+
+
+bool Sphere::culledBy(
+    const Array&		plane,
+    int&				    cullingPlaneIndex,
+    const uint32			inMask,
+    uint32&					outMask) const {
+    
+    return culledBy(plane.getCArray(), plane.size(), cullingPlaneIndex, inMask, outMask);
+}
+    
+
+bool Sphere::culledBy(
+                      const Array&		plane,
+                      int&				    cullingPlaneIndex,
+                      const uint32			inMask) const {
+    
+    return culledBy(plane.getCArray(), plane.size(), cullingPlaneIndex, inMask);
+}
+
+
+bool Sphere::culledBy(
+    const class Plane*  plane,
+    int                 numPlanes,
+    int&				cullingPlane,
+    const uint32		_inMask,
+    uint32&             childMask) const {
+
+    if (radius == finf()) {
+        // No plane can cull the infinite box
+        return false;
+    }
+
+	uint32 inMask = _inMask;
+	assert(numPlanes < 31);
+
+    childMask = 0;
+
+    // See if there is one plane for which all of the
+	// vertices are in the negative half space.
+    for (int p = 0; p < numPlanes; p++) {
+
+		// Only test planes that are not masked
+		if ((inMask & 1) != 0) {
+		
+            bool culledLow = ! plane[p].halfSpaceContainsFinite(center + plane[p].normal() * radius);
+            bool culledHigh = ! plane[p].halfSpaceContainsFinite(center - plane[p].normal() * radius);
+
+			if (culledLow) {
+				// Plane p culled the sphere
+				cullingPlane = p;
+
+                // The caller should not recurse into the children,
+                // since the parent is culled.  If they do recurse,
+                // make them only test against this one plane, which
+                // will immediately cull the volume.
+                childMask = 1 << p;
+				return true;
+
+            } else if (culledHigh) {
+                // The bounding volume straddled the plane; we have
+                // to keep testing against this plane
+                childMask |= (1 << p);
+            }
+		}
+
+        // Move on to the next bit.
+		inMask = inMask >> 1;
+    }
+
+    // None of the planes could cull this box
+	cullingPlane = -1;
+    return false;
+}
+
+
+bool Sphere::culledBy(
+    const class Plane*  plane,
+    int                 numPlanes,
+	int&				cullingPlane,
+	const uint32		_inMask) const {
+
+	uint32 inMask = _inMask;
+	assert(numPlanes < 31);
+
+    // See if there is one plane for which all of the
+	// vertices are in the negative half space.
+    for (int p = 0; p < numPlanes; p++) {
+
+		// Only test planes that are not masked
+		if ((inMask & 1) != 0) {
+			bool culled = ! plane[p].halfSpaceContains(center + plane[p].normal() * radius);
+			if (culled) {
+				// Plane p culled the sphere
+				cullingPlane = p;
+				return true;
+            }
+		}
+
+        // Move on to the next bit.
+		inMask = inMask >> 1;
+    }
+
+    // None of the planes could cull this box
+	cullingPlane = -1;
+    return false;
+}
+
+
+Vector3 Sphere::randomSurfacePoint() const {
+    return Vector3::random() * radius + center;
+}
+
+
+Vector3 Sphere::randomInteriorPoint() const {
+    Vector3 result;
+    do {
+        result = Vector3(uniformRandom(-1, 1), 
+                         uniformRandom(-1, 1), 
+                         uniformRandom(-1, 1));
+    } while (result.squaredMagnitude() >= 1.0f);
+
+    return result * radius + center;
+}
+
+
+float Sphere::volume() const {
+    return (float)pi() * (4.0f / 3.0f) * powf((float)radius, 3.0f);
+}
+
+
+float Sphere::area() const {
+    return (float)pi() * 4.0f * powf((float)radius, 2.0f);
+}
+
+
+void Sphere::getBounds(AABox& out) const {
+    Vector3 extent(radius, radius, radius);
+    out = AABox(center - extent, center + extent);
+}
+
+} // namespace
diff --git a/externals/g3dlite/System.cpp b/externals/g3dlite/System.cpp
new file mode 100644
index 00000000000..e03c4e8c6fa
--- /dev/null
+++ b/externals/g3dlite/System.cpp
@@ -0,0 +1,1746 @@
+/** 
+  @file System.cpp
+ 
+  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+
+  Note: every routine must call init() first.
+
+  There are two kinds of detection used in this file.  At compile
+  time, the _MSC_VER #define is used to determine whether x86 assembly
+  can be used at all.  At runtime, processor detection is used to
+  determine if we can safely call the routines that use that assembly.
+
+  @created 2003-01-25
+  @edited  2010-01-03
+ */
+
+#include "G3D/platform.h"
+#include "G3D/System.h"
+#include "G3D/debug.h"
+#include "G3D/fileutils.h"
+#include "G3D/TextOutput.h"
+#include "G3D/G3DGameUnits.h"
+#include "G3D/Crypto.h"
+#include "G3D/prompt.h"
+#include "G3D/stringutils.h"
+#include "G3D/Log.h"
+#include "G3D/Table.h"
+#include "G3D/GMutex.h"
+#include "G3D/units.h"
+#include 
+
+#include 
+#include 
+
+// Uncomment the following line to turn off G3D::System memory
+// allocation and use the operating system's malloc.
+//#define NO_BUFFERPOOL
+
+#if defined(__i386__) || defined(__x86_64__) || defined(G3D_WIN32)
+#    define G3D_NOT_OSX_PPC
+#endif
+
+#include 
+
+#ifdef G3D_WIN32
+
+#   include 
+#   include 
+#   include "G3D/RegistryUtil.h"
+
+#elif defined(G3D_LINUX) 
+
+#   include 
+#   include 
+#   include 
+#   include 
+#   include 
+#   include 
+#   include 
+#   include 
+#   include 
+#   include 
+
+#elif defined(G3D_OSX)
+
+    #include 
+    #include 
+    #include 
+    #include 
+    #include 
+    #include 
+    #include 
+    #include 
+    #include 
+    #include 
+    #include 
+
+    #include 
+    #include 
+#endif
+
+// SIMM include
+#ifdef __SSE__
+#include 
+#endif
+
+namespace G3D {
+
+
+/** Checks if the CPUID command is available on the processor (called from init) */
+static bool checkForCPUID();
+
+/** Called from init */
+static void getG3DVersion(std::string& s);
+
+/** Called from init */
+static G3DEndian checkEndian();
+
+
+System& System::instance() {
+    static System thesystem;
+    return thesystem;
+}
+
+
+System::System() :
+    m_initialized(false),
+    m_cpuSpeed(0),
+    m_hasCPUID(false),
+    m_hasRDTSC(false),
+    m_hasMMX(false),
+    m_hasSSE(false),
+    m_hasSSE2(false),
+    m_hasSSE3(false),
+    m_has3DNOW(false),
+    m_has3DNOW2(false),
+    m_hasAMDMMX(false),
+    m_cpuVendor("Uninitialized"),
+    m_numCores(1),
+    m_machineEndian(G3D_LITTLE_ENDIAN),
+    m_cpuArch("Uninitialized"),
+    m_operatingSystem("Uninitialized"),
+    m_version("Uninitialized"),
+    m_outOfMemoryCallback(NULL),
+    m_realWorldGetTickTime0(0),
+    m_highestCPUIDFunction(0) {
+
+    init();
+}
+
+
+void System::init() {
+    // NOTE: Cannot use most G3D data structures or utility functions
+    // in here because they are not initialized.
+
+    if (m_initialized) {
+        return;
+    } else {
+        m_initialized = true;
+    }
+
+    getG3DVersion(m_version);
+    
+    m_machineEndian = checkEndian();
+
+    m_hasCPUID = checkForCPUID();
+    // Process the CPUID information
+    if (m_hasCPUID) {
+        // We read the standard CPUID level 0x00000000 which should
+        // be available on every x86 processor.  This fills out
+        // a string with the processor vendor tag.
+        unsigned int eaxreg = 0, ebxreg = 0, ecxreg = 0, edxreg = 0;
+
+        cpuid(CPUID_VENDOR_ID, eaxreg, ebxreg, ecxreg, edxreg);
+
+        {
+            char c[100];
+            // Then we connect the single register values to the vendor string
+            *((unsigned int*) c)         = ebxreg;
+            *((unsigned int*) (c + 4))   = edxreg;
+            *((unsigned int*) (c + 8))   = ecxreg;
+            c[12] = '\0';
+            m_cpuVendor = c;
+        }
+
+        switch (ebxreg) {
+        case 0x756E6547:        // GenuineIntel
+            m_cpuArch = "Intel Processor";
+            break;
+            
+        case 0x68747541:        // AuthenticAMD
+            m_cpuArch = "AMD Processor";
+            break;
+
+        case 0x69727943:        // CyrixInstead
+            m_cpuArch = "Cyrix Processor";
+            break;
+
+        default:
+            m_cpuArch = "Unknown Processor Vendor";
+            break;
+        }
+
+
+        unsigned int highestFunction = eaxreg;
+        if (highestFunction >= CPUID_NUM_CORES) {
+            cpuid(CPUID_NUM_CORES, eaxreg, ebxreg, ecxreg, edxreg);
+            // Number of cores is in (eax>>26) + 1
+            m_numCores = (eaxreg >> 26) + 1;
+        }
+
+        cpuid(CPUID_GET_HIGHEST_FUNCTION, m_highestCPUIDFunction, ebxreg, ecxreg, edxreg);
+    }
+
+
+    // Get the operating system name (also happens to read some other information)
+#    ifdef G3D_WIN32
+        // Note that this overrides some of the values computed above
+        bool success = RegistryUtil::readInt32
+            ("HKEY_LOCAL_MACHINE\\HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\0", 
+             "~MHz", m_cpuSpeed);
+
+        SYSTEM_INFO systemInfo;
+        GetSystemInfo(&systemInfo);
+        const char* arch = NULL;
+        switch (systemInfo.wProcessorArchitecture) {
+        case PROCESSOR_ARCHITECTURE_INTEL:
+            arch = "Intel";
+            break;
+    
+        case PROCESSOR_ARCHITECTURE_MIPS:
+            arch = "MIPS";
+            break;
+
+        case PROCESSOR_ARCHITECTURE_ALPHA:
+            arch = "Alpha";
+            break;
+
+        case PROCESSOR_ARCHITECTURE_PPC:
+            arch = "Power PC";
+            break;
+
+        default:
+            arch = "Unknown";
+        }
+
+        m_numCores = systemInfo.dwNumberOfProcessors;
+        uint32 maxAddr = (uint32)systemInfo.lpMaximumApplicationAddress;
+        {
+            char c[1024];
+            sprintf(c, "%d x %d-bit %s processor",
+                    systemInfo.dwNumberOfProcessors,
+                    (int)(::log((double)maxAddr) / ::log(2.0) + 2.0),
+                    arch);
+            m_cpuArch = c;
+        }
+
+        OSVERSIONINFO osVersionInfo;
+        osVersionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+        success = GetVersionEx(&osVersionInfo) != 0;
+
+        if (success) {
+            char c[1000];
+            sprintf(c, "Windows %d.%d build %d Platform %d %s",
+                osVersionInfo.dwMajorVersion,
+                osVersionInfo.dwMinorVersion,
+                osVersionInfo.dwBuildNumber,
+                osVersionInfo.dwPlatformId,
+                osVersionInfo.szCSDVersion);
+            m_operatingSystem = c;
+        } else {
+            m_operatingSystem = "Windows";
+        }
+    
+#    elif defined(G3D_LINUX) || defined(G3D_FREEBSD)
+
+        {
+            // Find the operating system using the 'uname' command
+            FILE* f = popen("uname -a", "r");
+
+            int len = 100;
+            char* r = (char*)::malloc(len * sizeof(char));
+            fgets(r, len, f);
+            // Remove trailing newline
+            if (r[strlen(r) - 1] == '\n') {
+                r[strlen(r) - 1] = '\0';
+            }
+            fclose(f);
+
+            m_operatingSystem = r;
+            ::free(r);
+        }
+
+#   elif defined(G3D_OSX)
+
+        // Operating System:
+        SInt32 macVersion;
+        Gestalt(gestaltSystemVersion, &macVersion);
+
+        int major = (macVersion >> 8) & 0xFF;
+        int minor = (macVersion >> 4) & 0xF;
+        int revision = macVersion & 0xF;
+
+        {
+            char c[1000];
+            sprintf(c, "OS X %x.%x.%x", major, minor, revision); 
+            m_operatingSystem = c;
+        }
+                 
+        // Clock Cycle Timing Information:
+        Gestalt('pclk', &m_OSXCPUSpeed);
+        m_cpuSpeed = iRound((double)m_OSXCPUSpeed / (1024 * 1024));
+        m_secondsPerNS = 1.0 / 1.0e9;
+        
+        // System Architecture:
+	const NXArchInfo* pInfo = NXGetLocalArchInfo();
+		
+	if (pInfo) {
+	    m_cpuArch = pInfo->description;
+			
+	    switch (pInfo->cputype) {
+	    case CPU_TYPE_POWERPC:
+	        switch(pInfo->cpusubtype){
+		case CPU_SUBTYPE_POWERPC_750:
+		case CPU_SUBTYPE_POWERPC_7400:
+		case CPU_SUBTYPE_POWERPC_7450:
+		    m_cpuVendor = "Motorola";
+		    break;
+		case CPU_SUBTYPE_POWERPC_970:
+		    m_cpuVendor = "IBM";
+		    break;
+		}
+		break;
+	    
+            case CPU_TYPE_I386:
+                m_cpuVendor = "Intel";
+                break;
+	    }
+	}
+#   endif
+
+    initTime();
+
+    getStandardProcessorExtensions();
+}
+
+
+void getG3DVersion(std::string& s) {
+    char cstr[100];
+    if ((G3D_VER % 100) != 0) {
+        sprintf(cstr, "G3D %d.%02d beta %d",
+                G3D_VER / 10000,
+                (G3D_VER / 100) % 100,
+                G3D_VER % 100);
+    } else {
+        sprintf(cstr, "G3D %d.%02d",
+                G3D_VER / 10000,
+                (G3D_VER / 100) % 100);
+    }
+    s = cstr;
+}
+
+#if 0 // TODO: delete
+struct Directory {
+    std::string          path;
+    Array   contents;
+};
+
+static bool maybeAddDirectory(const std::string& newPath, Array& directoryArray, bool recurse = true) {
+    if (fileExists(newPath)) {
+        Directory& d = directoryArray.next();
+        d.path = newPath;
+        getFiles(pathConcat(newPath, "*"), d.contents);
+        Array dirs;
+        getDirs(pathConcat(newPath, "*"), dirs);
+        d.contents.append(dirs);
+
+        if (recurse) {
+            // Look for subdirectories
+            static const std::string subdirs[] = 
+            {"font", "gui", "SuperShader", "cubemap", "icon", "material", "image", "md2", "md3", "ifs", "3ds", "sky", ""};
+
+            for (int j = 0; j < dirs.size(); ++j) {
+                for (int i = 0; ! subdirs[i].empty(); ++i) {
+                    if (dirs[j] == subdirs[i]) {
+                        maybeAddDirectory(pathConcat(newPath, dirs[j]), directoryArray, false);
+                    }
+                }
+            }
+        }
+        return true;
+    } else {
+        return false;
+    }
+}
+#endif
+
+std::string System::findDataFile
+(const std::string&  full,
+ bool                errorIfNotFound) {
+
+    // Places where specific files were most recently found.  This is
+    // used to cache seeking of common files.
+    static Table lastFound;
+
+    // First check if the file exists as requested.  This will go
+    // through the FileSystemCache, so most calls do not touch disk.
+    if (fileExists(full)) {
+        return full;
+    }
+
+    // Now check where we previously found this file.
+    std::string* last = lastFound.getPointer(full);
+    if (last != NULL) {
+        if (fileExists(*last)) {
+            // Even if cwd has changed the file is still present.
+            // We won't notice if it has been deleted, however.
+            return *last;
+        } else {
+            // Remove this from the cache it is invalid
+            lastFound.remove(full);
+        }
+    }
+
+    // Places to look
+    static Array directoryArray;
+
+    if (directoryArray.size() == 0) {
+        // Initialize the directory array
+        RealTime t0 = System::time();
+
+        Array baseDirArray;
+
+        std::string initialAppDataDir(instance().m_appDataDir);
+        
+        baseDirArray.append("");
+        if (! initialAppDataDir.empty()) {
+            baseDirArray.append(initialAppDataDir);
+        }
+
+        const char* g3dPath = getenv("G3DDATA");
+
+        if (g3dPath && (initialAppDataDir != g3dPath)) {
+            baseDirArray.append(g3dPath);
+        }
+
+        static const std::string subdirs[] = 
+            {"font", "gui", "SuperShader", "cubemap", "icon", "material", "image", "md2", "md3", "ifs", "3ds", "sky", ""};
+        for (int j = 0; j < baseDirArray.size(); ++j) {
+            std::string d = baseDirArray[j];
+            if (fileExists(d)) {
+                directoryArray.append(d);
+                for (int i = 0; ! subdirs[i].empty(); ++i) {
+                    const std::string& p = pathConcat(d, subdirs[i]);
+                    if (fileExists(p)) {
+                        directoryArray.append(p);
+                    }
+                }
+            }
+        }
+
+        logLazyPrintf("Initializing System::findDataFile took %fs\n", System::time() - t0);
+    }
+
+    for (int i = 0; i < directoryArray.size(); ++i) {
+        const std::string& p = pathConcat(directoryArray[i], full);
+        if (fileExists(p)) {
+            lastFound.set(full, p);
+            return p;
+        }
+    }
+
+    if (errorIfNotFound) {
+        // Generate an error message
+        std::string locations;
+        for (int i = 0; i < directoryArray.size(); ++i) {
+            locations += pathConcat(directoryArray[i], full) + "\n";
+        }
+        alwaysAssertM(false, "Could not find '" + full + "' in:\n" + locations);
+    }
+
+    // Not found
+    return "";
+}
+
+
+void System::setAppDataDir(const std::string& path) {
+    instance().m_appDataDir = path;
+}
+
+
+std::string demoFindData(bool errorIfNotFound) {
+    static const char* g3dPath = getenv("G3DDATA");
+    if (g3dPath) {
+        return g3dPath;
+#   ifdef G3D_WIN32
+    } else if (fileExists("../data")) {
+        // G3D install on Windows
+        return "../data";
+    } else if (fileExists("../data-files")) {
+        // G3D source on Windows
+        return "../data-files";
+#   else
+    } else if (fileExists("../../../../data")) {
+        // G3D install on Unix
+        return "../../../../data";
+    } else if (fileExists("../../../../data-files")) {
+        // G3D source on Unix
+        return "../../../../data-files";
+#   endif
+    } else {
+        return "";
+    }
+}
+
+
+const std::string& System::build() {
+    const static std::string b =
+#   ifdef _DEBUG
+        "Debug";
+#   else 
+        "Release";
+#   endif
+
+    return b;
+}
+
+
+static G3DEndian checkEndian() {
+    int32 a = 1;
+    if (*(uint8*)&a == 1) {
+        return G3D_LITTLE_ENDIAN;
+    } else {
+        return G3D_BIG_ENDIAN;
+    }
+}
+
+
+static bool checkForCPUID() {
+    // all known supported architectures have cpuid
+    // add cases for incompatible architectures if they are added
+    // e.g., if we ever support __powerpc__ being defined again
+
+    return true;
+}
+
+
+void System::getStandardProcessorExtensions() {
+#if ! defined(G3D_OSX) || defined(G3D_OSX_INTEL)
+    if (! m_hasCPUID) {
+        return;
+    }
+
+    uint32 eaxreg = 0, ebxreg = 0, ecxreg = 0, features = 0;
+
+    cpuid(CPUID_PROCESSOR_FEATURES, eaxreg, ebxreg, ecxreg, features);
+
+#   define checkBit(var, bit)   ((var & (1 << bit)) ? true : false)
+
+    m_hasRDTSC    = checkBit(features, 4);
+    m_hasMMX      = checkBit(features, 23);
+    m_hasSSE      = checkBit(features, 25);
+    m_hasSSE2     = checkBit(features, 26);
+    // Bit 28 is HTT; not checked by G3D
+
+    m_hasSSE3     = checkBit(ecxreg, 0);
+
+    if (m_highestCPUIDFunction >= CPUID_EXTENDED_FEATURES) {
+        cpuid(CPUID_EXTENDED_FEATURES, eaxreg, ebxreg, ecxreg, features);
+        m_hasAMDMMX = checkBit(features, 22);  // Only on AMD
+        m_has3DNOW  = checkBit(features, 31);  // Only on AMD
+        m_has3DNOW2 = checkBit(features, 30);  // Only on AMD
+    } else {
+        m_hasAMDMMX = false;
+        m_has3DNOW  = false;
+        m_has3DNOW2 = false;
+    }
+
+#   undef checkBit
+#endif
+}
+
+#if defined(G3D_WIN32) && !defined(G3D_64BIT)
+    #pragma message("Port System::memcpy SIMD to all platforms")
+/** Michael Herf's fast memcpy */
+void memcpyMMX(void* dst, const void* src, int nbytes) {
+    int remainingBytes = nbytes;
+
+    if (nbytes > 64) {
+        _asm {
+            mov esi, src 
+            mov edi, dst 
+            mov ecx, nbytes 
+            shr ecx, 6 // 64 bytes per iteration 
+
+          loop1: 
+            movq mm1,  0[ESI] // Read in source data 
+            movq mm2,  8[ESI]
+            movq mm3, 16[ESI]
+            movq mm4, 24[ESI] 
+            movq mm5, 32[ESI]
+            movq mm6, 40[ESI]
+            movq mm7, 48[ESI]
+            movq mm0, 56[ESI]
+
+            movntq  0[EDI], mm1 // Non-temporal stores 
+            movntq  8[EDI], mm2 
+            movntq 16[EDI], mm3 
+            movntq 24[EDI], mm4 
+            movntq 32[EDI], mm5 
+            movntq 40[EDI], mm6 
+            movntq 48[EDI], mm7 
+            movntq 56[EDI], mm0 
+
+            add esi, 64 
+            add edi, 64 
+            dec ecx 
+            jnz loop1 
+
+            emms
+        }
+        remainingBytes -= ((nbytes >> 6) << 6); 
+    }
+
+    if (remainingBytes > 0) {
+        // Memcpy the rest
+        memcpy((uint8*)dst + (nbytes - remainingBytes),
+               (const uint8*)src + (nbytes - remainingBytes), remainingBytes); 
+    }
+}
+#endif
+
+void System::memcpy(void* dst, const void* src, size_t numBytes) {
+#if defined(G3D_WIN32) && !defined(G3D_64BIT)
+    memcpyMMX(dst, src, numBytes);
+#else
+    ::memcpy(dst, src, numBytes);
+#endif
+}
+
+
+/** Michael Herf's fastest memset. n32 must be filled with the same
+    character repeated. */
+#if defined(G3D_WIN32) && !defined(G3D_64BIT)
+    #pragma message("Port System::memfill SIMD to all platforms")
+
+// On x86 processors, use MMX
+void memfill(void *dst, int n32, unsigned long i) {
+
+    int originalSize = i;
+    int bytesRemaining = i;
+
+    if (i > 16) {
+        
+        bytesRemaining = i % 16;
+        i -= bytesRemaining;
+        __asm {
+            movq mm0, n32
+            punpckldq mm0, mm0
+            mov edi, dst
+                
+          loopwrite:
+
+            movntq 0[edi], mm0
+            movntq 8[edi], mm0
+
+            add edi, 16
+            sub i, 16
+            jg loopwrite
+
+            emms
+        }
+    }
+
+    if (bytesRemaining > 0) {
+        ::memset((uint8*)dst + (originalSize - bytesRemaining), n32, bytesRemaining); 
+    }
+}
+#endif
+
+
+void System::memset(void* dst, uint8 value, size_t numBytes) {
+#if defined(G3D_WIN32) && !defined(G3D_64BIT)
+    uint32 v = value;
+    v = v + (v << 8) + (v << 16) + (v << 24); 
+    G3D::memfill(dst, v, numBytes);
+#else
+    ::memset(dst, value, numBytes);
+#endif
+}
+
+
+/** Removes the 'd' that icompile / Morgan's VC convention appends. */
+static std::string computeAppName(const std::string& start) {
+    if (start.size() < 2) {
+        return start;
+    }
+
+    if (start[start.size() - 1] == 'd') {
+        // Maybe remove the 'd'; see if ../ or ../../ has the same name
+        char tmp[1024];
+        getcwd(tmp, sizeof(tmp));
+        std::string drive, base, ext;
+        Array path;
+        parseFilename(tmp, drive, path, base, ext);
+
+        std::string shortName = start.substr(0, start.size() - 1);
+
+        if ((path.size() > 1) && (toLower(path.last()) == toLower(shortName))) {
+            return shortName;
+        }
+
+        if ((path.size() > 2) && (toLower(path[path.size() - 2]) == toLower(shortName))) {
+            return shortName;
+        }
+    }
+
+    return start;
+}
+
+
+std::string& System::appName() {
+    static std::string n = computeAppName(filenameBase(currentProgramFilename()));
+    return n;
+}
+
+
+std::string System::currentProgramFilename() {
+    char filename[2048];
+
+#   ifdef G3D_WIN32
+    {
+        GetModuleFileNameA(NULL, filename, sizeof(filename));
+    } 
+#   elif defined(G3D_OSX)
+    {
+        // Run the 'ps' program to extract the program name
+        // from the process ID.
+        int pid;
+        FILE* fd;
+        char cmd[80];
+        pid = getpid();
+        sprintf(cmd, "ps -p %d -o comm=\"\"", pid);
+
+        fd = popen(cmd, "r");
+        int s = fread(filename, 1, sizeof(filename), fd);
+        // filename will contain a newline.  Overwrite it:
+        filename[s - 1] = '\0';
+    }
+#   else
+    {
+        int ret = readlink("/proc/self/exe", filename, sizeof(filename));
+            
+        // In case of an error, leave the handling up to the caller
+        if (ret == -1) {
+            return "";
+        }
+            
+        debugAssert((int)sizeof(filename) > ret);
+            
+        // Ensure proper NULL termination
+        filename[ret] = 0;      
+    }
+    #endif
+
+    return filename;
+}
+
+
+void System::sleep(RealTime t) {
+
+    // Overhead of calling this function, measured from a previous run.
+    static const RealTime OVERHEAD = 0.00006f;
+
+    RealTime now = time();
+    RealTime wakeupTime = now + t - OVERHEAD;
+
+    RealTime remainingTime = wakeupTime - now;
+    RealTime sleepTime = 0;
+
+    // On Windows, a "time slice" is measured in quanta of 3-5 ms (http://support.microsoft.com/kb/259025)
+    // Sleep(0) yields the remainder of the time slice, which could be a long time.
+    // A 1 ms minimum time experimentally kept the "Empty GApp" at nearly no CPU load at 100 fps,
+    // yet nailed the frame timing perfectly.
+    static RealTime minRealSleepTime = 3 * units::milliseconds();
+
+    while (remainingTime > 0) {
+
+        if (remainingTime > minRealSleepTime * 2.5) {
+            // Safe to use Sleep with a time... sleep for half the remaining time
+            sleepTime = max(remainingTime * 0.5, 0.0005);
+        } else if (remainingTime > minRealSleepTime) {
+            // Safe to use Sleep with a zero time;
+            // causes the program to yield only
+            // the current time slice, and then return.
+            sleepTime = 0;
+        } else {
+            // Not safe to use Sleep; busy wait
+            sleepTime = -1;
+        }
+
+        if (sleepTime >= 0) {
+            #ifdef G3D_WIN32
+                // Translate to milliseconds
+                Sleep((int)(sleepTime * 1e3));
+            #else
+                // Translate to microseconds
+                usleep((int)(sleepTime * 1e6));
+            #endif
+        }
+
+        now = time();
+        remainingTime = wakeupTime - now;
+    }
+}
+
+
+void System::consoleClearScreen() {
+#   ifdef G3D_WIN32
+        system("cls");
+#   else
+        system("clear");
+#   endif
+}
+
+
+bool System::consoleKeyPressed() {
+    #ifdef G3D_WIN32
+    
+        return _kbhit() != 0;
+
+    #else
+    
+        static const int STDIN = 0;
+        static bool initialized = false;
+
+        if (! initialized) {
+            // Use termios to turn off line buffering
+            termios term;
+            tcgetattr(STDIN, &term);
+            term.c_lflag &= ~ICANON;
+            tcsetattr(STDIN, TCSANOW, &term);
+            setbuf(stdin, NULL);
+            initialized = true;
+        }
+
+        #ifdef G3D_LINUX
+
+            int bytesWaiting;
+            ioctl(STDIN, FIONREAD, &bytesWaiting);
+            return bytesWaiting;
+
+        #else
+
+            timeval timeout;
+            fd_set rdset;
+
+            FD_ZERO(&rdset);
+            FD_SET(STDIN, &rdset);
+            timeout.tv_sec  = 0;
+            timeout.tv_usec = 0;
+
+            return select(STDIN + 1, &rdset, NULL, NULL, &timeout);
+        #endif
+    #endif
+}
+
+
+int System::consoleReadKey() {
+#   ifdef G3D_WIN32
+        return _getch();
+#   else
+        char c;
+        read(0, &c, 1);
+        return c;
+#   endif
+}
+
+
+void System::initTime() {
+    #ifdef G3D_WIN32
+        if (QueryPerformanceFrequency(&m_counterFrequency)) {
+            QueryPerformanceCounter(&m_start);
+        }
+
+        struct _timeb t;
+        _ftime(&t);
+        
+        m_realWorldGetTickTime0 = (RealTime)t.time - t.timezone * G3D::MINUTE + (t.dstflag ? G3D::HOUR : 0);
+
+    #else
+        gettimeofday(&m_start, NULL);
+        // "sse" = "seconds since epoch".  The time
+        // function returns the seconds since the epoch
+        // GMT (perhaps more correctly called UTC). 
+        time_t gmt = ::time(NULL);
+        
+        // No call to free or delete is needed, but subsequent
+        // calls to asctime, ctime, mktime, etc. might overwrite
+        // local_time_vals. 
+        tm* localTimeVals = localtime(&gmt);
+    
+        time_t local = gmt;
+        
+        if (localTimeVals) {
+            // tm_gmtoff is already corrected for daylight savings.
+            local = local + localTimeVals->tm_gmtoff;
+        }
+        
+        m_realWorldGetTickTime0 = local;
+    #endif
+}
+
+
+RealTime System::time() { 
+#   ifdef G3D_WIN32
+        LARGE_INTEGER now;
+        QueryPerformanceCounter(&now);
+
+        return ((RealTime)(now.QuadPart - instance().m_start.QuadPart) /
+                instance().m_counterFrequency.QuadPart) + instance().m_realWorldGetTickTime0;
+#   else
+        // Linux resolution defaults to 100Hz.
+        // There is no need to do a separate RDTSC call as gettimeofday
+        // actually uses RDTSC when on systems that support it, otherwise
+        // it uses the system clock.
+        struct timeval now;
+        gettimeofday(&now, NULL);
+
+        return (now.tv_sec  - instance().m_start.tv_sec) +
+            (now.tv_usec - instance().m_start.tv_usec) / 1e6
+            + instance().m_realWorldGetTickTime0;
+#   endif
+}
+
+
+////////////////////////////////////////////////////////////////
+
+#define REALPTR_TO_USERPTR(x)   ((uint8*)(x) + sizeof (void *))
+#define USERPTR_TO_REALPTR(x)   ((uint8*)(x) - sizeof (void *))
+#define REALBLOCK_SIZE(x)       ((x) + sizeof (void *))
+
+class BufferPool {
+public:
+
+    /** Only store buffers up to these sizes (in bytes) in each pool->
+        Different pools have different management strategies.
+
+        A large block is preallocated for tiny buffers; they are used with
+        tremendous frequency.  Other buffers are allocated as demanded.
+        Tiny buffers are 128 bytes long because that seems to align well with
+        cache sizes on many machines.
+      */
+    enum {tinyBufferSize = 128, smallBufferSize = 1024, medBufferSize = 4096};
+
+    /** 
+       Most buffers we're allowed to store.
+       250000 * 128  = 32 MB (preallocated)
+        10000 * 1024 = 10 MB (allocated on demand)
+         1024 * 4096 =  4 MB (allocated on demand)
+     */
+    enum {maxTinyBuffers = 250000, maxSmallBuffers = 10000, maxMedBuffers = 1024};
+
+private:
+
+    class MemBlock {
+    public:
+        void*           ptr;
+        size_t          bytes;
+
+        inline MemBlock() : ptr(NULL), bytes(0) {}
+        inline MemBlock(void* p, size_t b) : ptr(p), bytes(b) {}
+    };
+
+    MemBlock smallPool[maxSmallBuffers];
+    int smallPoolSize;
+
+    MemBlock medPool[maxMedBuffers];
+    int medPoolSize;
+
+    /** The tiny pool is a single block of storage into which all tiny
+        objects are allocated.  This provides better locality for
+        small objects and avoids the search time, since all tiny
+        blocks are exactly the same size. */
+    void* tinyPool[maxTinyBuffers];
+    int tinyPoolSize;
+
+    /** Pointer to the data in the tiny pool */
+    void* tinyHeap;
+
+    Spinlock            m_lock;
+
+    void lock() {
+        m_lock.lock();
+    }
+
+    void unlock() {
+        m_lock.unlock();
+    }
+
+#if 0 //-----------------------------------------------old mutex
+#   ifdef G3D_WIN32
+    CRITICAL_SECTION    mutex;
+#   else
+    pthread_mutex_t     mutex;
+#   endif
+
+    /** Provide synchronization between threads */
+    void lock() {
+#       ifdef G3D_WIN32
+            EnterCriticalSection(&mutex);
+#       else
+            pthread_mutex_lock(&mutex);
+#       endif
+    }
+
+    void unlock() {
+#       ifdef G3D_WIN32
+            LeaveCriticalSection(&mutex);
+#       else
+            pthread_mutex_unlock(&mutex);
+#       endif
+    }
+#endif //-------------------------------------------old mutex
+
+    /** 
+     Malloc out of the tiny heap. Returns NULL if allocation failed.
+     */
+    inline void* tinyMalloc(size_t bytes) {
+        // Note that we ignore the actual byte size
+        // and create a constant size block.
+        (void)bytes;
+        assert(tinyBufferSize >= bytes);
+
+        void* ptr = NULL;
+
+        if (tinyPoolSize > 0) {
+            --tinyPoolSize;
+
+            // Return the old last pointer from the freelist
+            ptr = tinyPool[tinyPoolSize];
+
+#           ifdef G3D_DEBUG
+                if (tinyPoolSize > 0) {
+                    assert(tinyPool[tinyPoolSize - 1] != ptr); 
+                     //   "System::malloc heap corruption detected: "
+                     //   "the last two pointers on the freelist are identical (during tinyMalloc).");
+                }
+#           endif
+
+            // NULL out the entry to help detect corruption
+            tinyPool[tinyPoolSize] = NULL;
+        }
+
+        return ptr;
+    }
+
+    /** Returns true if this is a pointer into the tiny heap. */
+    bool inTinyHeap(void* ptr) {
+        return 
+            (ptr >= tinyHeap) && 
+            (ptr < (uint8*)tinyHeap + maxTinyBuffers * tinyBufferSize);
+    }
+
+    void tinyFree(void* ptr) {
+        assert(ptr);
+        assert(tinyPoolSize < maxTinyBuffers);
+ //           "Tried to free a tiny pool buffer when the tiny pool freelist is full.");
+
+#       ifdef G3D_DEBUG
+            if (tinyPoolSize > 0) {
+                void* prevOnHeap = tinyPool[tinyPoolSize - 1];
+                assert(prevOnHeap != ptr); 
+//                    "System::malloc heap corruption detected: "
+//                    "the last two pointers on the freelist are identical (during tinyFree).");
+            }
+#       endif
+
+        assert(tinyPool[tinyPoolSize] == NULL);
+
+        // Put the pointer back into the free list
+        tinyPool[tinyPoolSize] = ptr;
+        ++tinyPoolSize;
+
+    }
+
+    void flushPool(MemBlock* pool, int& poolSize) {
+        for (int i = 0; i < poolSize; ++i) {
+            ::free(pool[i].ptr);
+            pool[i].ptr = NULL;
+            pool[i].bytes = 0;
+        }
+        poolSize = 0;
+    }
+
+
+    /**  Allocate out of a specific pool->  Return NULL if no suitable 
+         memory was found. 
+    
+         */
+    void* malloc(MemBlock* pool, int& poolSize, size_t bytes) {
+
+        // OPT: find the smallest block that satisfies the request.
+
+        // See if there's something we can use in the buffer pool->
+        // Search backwards since usually we'll re-use the last one.
+        for (int i = (int)poolSize - 1; i >= 0; --i) {
+            if (pool[i].bytes >= bytes) {
+                // We found a suitable entry in the pool->
+
+                // No need to offset the pointer; it is already offset
+                void* ptr = pool[i].ptr;
+
+                // Remove this element from the pool
+                --poolSize;
+                pool[i] = pool[poolSize];
+
+                return ptr;
+            }
+        }
+
+        return NULL;
+    }
+
+public:
+
+    /** Count of memory allocations that have occurred. */
+    int totalMallocs;
+    int mallocsFromTinyPool;
+    int mallocsFromSmallPool;
+    int mallocsFromMedPool;
+
+    /** Amount of memory currently allocated (according to the application). 
+        This does not count the memory still remaining in the buffer pool,
+        but does count extra memory required for rounding off to the size
+        of a buffer.
+        Primarily useful for detecting leaks.*/
+    // TODO: make me an atomic int!
+    volatile int bytesAllocated;
+
+    BufferPool() {
+        totalMallocs         = 0;
+
+        mallocsFromTinyPool  = 0;
+        mallocsFromSmallPool = 0;
+        mallocsFromMedPool   = 0;
+
+        bytesAllocated       = true;
+
+        tinyPoolSize         = 0;
+        tinyHeap             = NULL;
+
+        smallPoolSize        = 0;
+
+        medPoolSize          = 0;
+
+
+        // Initialize the tiny heap as a bunch of pointers into one
+        // pre-allocated buffer.
+        tinyHeap = ::malloc(maxTinyBuffers * tinyBufferSize);
+        for (int i = 0; i < maxTinyBuffers; ++i) {
+            tinyPool[i] = (uint8*)tinyHeap + (tinyBufferSize * i);
+        }
+        tinyPoolSize = maxTinyBuffers;
+
+#if 0        ///---------------------------------- old mutex
+#       ifdef G3D_WIN32
+            InitializeCriticalSection(&mutex);
+#       else
+            pthread_mutex_init(&mutex, NULL);
+#       endif
+#endif        ///---------------------------------- old mutex
+    }
+
+
+    ~BufferPool() {
+        ::free(tinyHeap);
+#if 0 //-------------------------------- old mutex
+#       ifdef G3D_WIN32
+            DeleteCriticalSection(&mutex);
+#       else
+            // No destruction on pthreads
+#       endif
+#endif //--------------------------------old mutex
+    }
+
+    
+    void* realloc(void* ptr, size_t bytes) {
+        if (ptr == NULL) {
+            return malloc(bytes);
+        }
+
+        if (inTinyHeap(ptr)) {
+            if (bytes <= tinyBufferSize) {
+                // The old pointer actually had enough space.
+                return ptr;
+            } else {
+                // Free the old pointer and malloc
+                
+                void* newPtr = malloc(bytes);
+                System::memcpy(newPtr, ptr, tinyBufferSize);
+                tinyFree(ptr);
+                return newPtr;
+
+            }
+        } else {
+            // In one of our heaps.
+
+            // See how big the block really was
+            size_t realSize = *(uint32*)USERPTR_TO_REALPTR(ptr);
+            if (bytes <= realSize) {
+                // The old block was big enough.
+                return ptr;
+            }
+
+            // Need to reallocate
+            void* newPtr = malloc(bytes);
+            System::memcpy(newPtr, ptr, realSize);
+            free(ptr);
+            return newPtr;
+        }
+    }
+
+
+    void* malloc(size_t bytes) {
+        lock();
+        ++totalMallocs;
+
+        if (bytes <= tinyBufferSize) {
+
+            void* ptr = tinyMalloc(bytes);
+
+            if (ptr) {
+                ++mallocsFromTinyPool;
+                unlock();
+                return ptr;
+            }
+
+        } 
+        
+        // Failure to allocate a tiny buffer is allowed to flow
+        // through to a small buffer
+        if (bytes <= smallBufferSize) {
+            
+            void* ptr = malloc(smallPool, smallPoolSize, bytes);
+
+            if (ptr) {
+                ++mallocsFromSmallPool;
+                unlock();
+                return ptr;
+            }
+
+        } else if (bytes <= medBufferSize) {
+            // Note that a small allocation failure does *not* fall
+            // through into a medium allocation because that would
+            // waste the medium buffer's resources.
+
+            void* ptr = malloc(medPool, medPoolSize, bytes);
+
+            if (ptr) {
+                ++mallocsFromMedPool;
+                unlock();
+                debugAssertM(ptr != NULL, "BufferPool::malloc returned NULL");
+                return ptr;
+            }
+        }
+
+        bytesAllocated += REALBLOCK_SIZE(bytes);
+        unlock();
+
+        // Heap allocate
+
+        // Allocate 4 extra bytes for our size header (unfortunate,
+        // since malloc already added its own header).
+        void* ptr = ::malloc(REALBLOCK_SIZE(bytes));
+
+        if (ptr == NULL) {
+            // Flush memory pools to try and recover space
+            flushPool(smallPool, smallPoolSize);
+            flushPool(medPool, medPoolSize);
+            ptr = ::malloc(REALBLOCK_SIZE(bytes));
+        }
+
+        if (ptr == NULL) {
+            if ((System::outOfMemoryCallback() != NULL) &&
+                (System::outOfMemoryCallback()(REALBLOCK_SIZE(bytes), true) == true)) {
+                // Re-attempt the malloc
+                ptr = ::malloc(REALBLOCK_SIZE(bytes));
+            }
+        }
+
+        if (ptr == NULL) {
+            if (System::outOfMemoryCallback() != NULL) {
+                // Notify the application
+                System::outOfMemoryCallback()(REALBLOCK_SIZE(bytes), false);
+            }
+#           ifdef G3D_DEBUG
+            debugPrintf("::malloc(%d) returned NULL\n", (int)REALBLOCK_SIZE(bytes));
+#           endif
+            debugAssertM(ptr != NULL, 
+                         "::malloc returned NULL. Either the "
+                         "operating system is out of memory or the "
+                         "heap is corrupt.");
+            return NULL;
+        }
+
+        *(uint32*)ptr = bytes;
+
+        return REALPTR_TO_USERPTR(ptr);
+    }
+
+
+    void free(void* ptr) {
+        if (ptr == NULL) {
+            // Free does nothing on null pointers
+            return;
+        }
+
+        assert(isValidPointer(ptr));
+
+        if (inTinyHeap(ptr)) {
+            lock();
+            tinyFree(ptr);
+            unlock();
+            return;
+        }
+
+        uint32 bytes = *(uint32*)USERPTR_TO_REALPTR(ptr);
+
+        lock();
+        if (bytes <= smallBufferSize) {
+            if (smallPoolSize < maxSmallBuffers) {
+                smallPool[smallPoolSize] = MemBlock(ptr, bytes);
+                ++smallPoolSize;
+                unlock();
+                return;
+            }
+        } else if (bytes <= medBufferSize) {
+            if (medPoolSize < maxMedBuffers) {
+                medPool[medPoolSize] = MemBlock(ptr, bytes);
+                ++medPoolSize;
+                unlock();
+                return;
+            }
+        }
+        bytesAllocated -= REALBLOCK_SIZE(bytes);
+        unlock();
+
+        // Free; the buffer pools are full or this is too big to store.
+        ::free(USERPTR_TO_REALPTR(ptr));
+    }
+
+    std::string performance() const {
+        if (totalMallocs > 0) {
+            int pooled = mallocsFromTinyPool +
+                         mallocsFromSmallPool + 
+                         mallocsFromMedPool;
+
+            int total = totalMallocs;
+
+            return format("malloc performance: %5.1f%% <= %db, %5.1f%% <= %db, "
+                          "%5.1f%% <= %db, %5.1f%% > %db",
+                          100.0 * mallocsFromTinyPool  / total,
+                          BufferPool::tinyBufferSize,
+                          100.0 * mallocsFromSmallPool / total,
+                          BufferPool::smallBufferSize,
+                          100.0 * mallocsFromMedPool   / total,
+                          BufferPool::medBufferSize,
+                          100.0 * (1.0 - (double)pooled / total),
+                          BufferPool::medBufferSize);
+        } else {
+            return "No System::malloc calls made yet.";
+        }
+    }
+
+    std::string status() const {
+        return format("preallocated shared buffers: %5d/%d x %db",
+            maxTinyBuffers - tinyPoolSize, maxTinyBuffers, tinyBufferSize);
+    }
+};
+
+// Dynamically allocated because we need to ensure that
+// the buffer pool is still around when the last global variable 
+// is deallocated.
+static BufferPool* bufferpool = NULL;
+
+std::string System::mallocPerformance() {    
+#ifndef NO_BUFFERPOOL
+    return bufferpool->performance();
+#else
+    return "NO_BUFFERPOOL";
+#endif
+}
+
+std::string System::mallocStatus() {    
+#ifndef NO_BUFFERPOOL
+    return bufferpool->status();
+#else
+    return "NO_BUFFERPOOL";
+#endif
+}
+
+
+void System::resetMallocPerformanceCounters() {
+#ifndef NO_BUFFERPOOL
+    bufferpool->totalMallocs         = 0;
+    bufferpool->mallocsFromMedPool   = 0;
+    bufferpool->mallocsFromSmallPool = 0;
+    bufferpool->mallocsFromTinyPool  = 0;
+#endif
+}
+
+
+#ifndef NO_BUFFERPOOL
+inline void initMem() {
+    // Putting the test here ensures that the system is always
+    // initialized, even when globals are being allocated.
+    static bool initialized = false;
+    if (! initialized) {
+        bufferpool = new BufferPool();
+        initialized = true;
+    }
+}
+#endif
+
+
+void* System::malloc(size_t bytes) {
+#ifndef NO_BUFFERPOOL
+    initMem();
+    return bufferpool->malloc(bytes);
+#else
+    return ::malloc(bytes);
+#endif
+}
+
+void* System::calloc(size_t n, size_t x) {
+#ifndef NO_BUFFERPOOL
+    void* b = System::malloc(n * x);
+    debugAssertM(b != NULL, "System::malloc returned NULL");
+    debugAssertM(isValidHeapPointer(b), "System::malloc returned an invalid pointer");
+    System::memset(b, 0, n * x);
+    return b;
+#else
+    return ::calloc(n, x);
+#endif
+}
+
+
+void* System::realloc(void* block, size_t bytes) {
+#ifndef NO_BUFFERPOOL
+    initMem();
+    return bufferpool->realloc(block, bytes);
+#else
+    return ::realloc(block, bytes);
+#endif
+}
+
+
+void System::free(void* p) {
+#ifndef NO_BUFFERPOOL
+    bufferpool->free(p);
+#else
+    return ::free(p);
+#endif
+}
+
+
+void* System::alignedMalloc(size_t bytes, size_t alignment) {
+
+    alwaysAssertM(isPow2(alignment), "alignment must be a power of 2");
+
+    // We must align to at least a word boundary.
+    alignment = iMax(alignment, sizeof(void *));
+
+    // Pad the allocation size with the alignment size and the
+    // size of the redirect pointer.
+    size_t totalBytes = bytes + alignment + sizeof(void*);
+
+    size_t truePtr = (size_t)System::malloc(totalBytes);
+
+    if (truePtr == 0) {
+        // malloc returned NULL
+        return NULL;
+    }
+
+    debugAssert(isValidHeapPointer((void*)truePtr));
+    #ifdef G3D_WIN32
+    // The blocks we return will not be valid Win32 debug heap
+    // pointers because they are offset 
+    //  debugAssert(_CrtIsValidPointer((void*)truePtr, totalBytes, TRUE) );
+    #endif
+
+    // The return pointer will be the next aligned location (we must at least
+    // leave space for the redirect pointer, however).
+    size_t  alignedPtr = truePtr + sizeof(void*);
+
+    // 2^n - 1 has the form 1111... in binary.
+    uint32 bitMask = (alignment - 1);
+
+    // Advance forward until we reach an aligned location.
+    while ((alignedPtr & bitMask) != 0) {
+        alignedPtr += sizeof(void*);
+    }
+
+    debugAssert(alignedPtr - truePtr + bytes <= totalBytes);
+
+    // Immediately before the aligned location, write the true array location
+    // so that we can free it correctly.
+    size_t* redirectPtr = (size_t *)(alignedPtr - sizeof(void *));
+    redirectPtr[0] = truePtr;
+
+    debugAssert(isValidHeapPointer((void*)truePtr));
+
+    #ifdef G3D_WIN32
+        debugAssert( _CrtIsValidPointer((void*)alignedPtr, bytes, TRUE) );
+    #endif
+    return (void *)alignedPtr;
+}
+
+
+void System::alignedFree(void* _ptr) {
+    if (_ptr == NULL) {
+        return;
+    }
+
+    size_t alignedPtr = (size_t)_ptr;
+
+    // Back up one word from the pointer the user passed in.
+    // We now have a pointer to a pointer to the true start
+    // of the memory block.
+    size_t* redirectPtr = (size_t*)(alignedPtr - sizeof(void *));
+
+    // Dereference that pointer so that ptr = true start
+    void* truePtr = (void*)redirectPtr[0];
+
+    debugAssert(isValidHeapPointer((void*)truePtr));
+    System::free(truePtr);
+}
+
+
+void System::setEnv(const std::string& name, const std::string& value) {
+    std::string cmd = name + "=" + value;
+#   ifdef G3D_WIN32
+        _putenv(cmd.c_str());
+#   else
+        // Many linux implementations of putenv expect char*
+        putenv(const_cast(cmd.c_str()));
+#   endif
+}
+
+
+const char* System::getEnv(const std::string& name) {
+    return getenv(name.c_str());
+}
+
+
+static void var(TextOutput& t, const std::string& name, const std::string& val) {
+    t.writeSymbols(name,"=");
+    t.writeString(val);
+    t.writeNewline();
+}
+
+
+static void var(TextOutput& t, const std::string& name, const bool val) {
+    t.writeSymbols(name, "=", val ? "Yes" : "No");
+    t.writeNewline();
+}
+
+
+static void var(TextOutput& t, const std::string& name, const int val) {
+    t.writeSymbols(name,"=");
+    t.writeNumber(val);
+    t.writeNewline();
+}
+
+
+void System::describeSystem(
+    std::string&        s) {
+
+    TextOutput t;
+    describeSystem(t);
+    t.commitString(s);
+}
+
+void System::describeSystem(
+    TextOutput& t) {
+
+    t.writeSymbols("App", "{");
+    t.writeNewline();
+    t.pushIndent();
+    {
+        var(t, "Name", System::currentProgramFilename());
+        char cwd[1024];
+        getcwd(cwd, 1024);
+        var(t, "cwd", std::string(cwd));
+    }
+    t.popIndent();
+    t.writeSymbols("}");
+    t.writeNewline();
+    t.writeNewline();
+
+    t.writeSymbols("OS", "{");
+    t.writeNewline();
+    t.pushIndent();
+    {
+        var(t, "Name", System::operatingSystem());
+    }
+    t.popIndent();
+    t.writeSymbols("}");
+    t.writeNewline();
+    t.writeNewline();
+
+    t.writeSymbols("CPU", "{");
+    t.writeNewline();
+    t.pushIndent();
+    {
+        var(t, "Vendor", System::cpuVendor());
+        var(t, "Architecture", System::cpuArchitecture());
+        var(t, "hasCPUID", System::hasCPUID());
+        var(t, "hasMMX", System::hasMMX());
+        var(t, "hasSSE", System::hasSSE());
+        var(t, "hasSSE2", System::hasSSE2());
+        var(t, "hasSSE3", System::hasSSE3());
+        var(t, "has3DNow", System::has3DNow());
+        var(t, "hasRDTSC", System::hasRDTSC());
+        var(t, "numCores", System::numCores());
+    }
+    t.popIndent();
+    t.writeSymbols("}");
+    t.writeNewline();
+    t.writeNewline();
+       
+    t.writeSymbols("G3D", "{");
+    t.writeNewline();
+    t.pushIndent();
+    {
+        var(t, "Link version", G3D_VER);
+        var(t, "Compile version", System::version());
+    }
+    t.popIndent();
+    t.writeSymbols("}");
+    t.writeNewline();
+    t.writeNewline();
+}
+
+
+void System::setClipboardText(const std::string& s) {
+#   ifdef G3D_WIN32
+        if (OpenClipboard(NULL)) {
+            HGLOBAL hMem = GlobalAlloc(GHND | GMEM_DDESHARE, s.size() + 1);
+            if (hMem) {
+                char *pMem = (char*)GlobalLock(hMem);
+                strcpy(pMem, s.c_str());
+                GlobalUnlock(hMem);
+
+                EmptyClipboard();
+                SetClipboardData(CF_TEXT, hMem);
+            }
+
+            CloseClipboard();
+            GlobalFree(hMem);
+        }
+#   endif
+}
+
+
+std::string System::getClipboardText() {
+    std::string s;
+
+#   ifdef G3D_WIN32
+        if (OpenClipboard(NULL)) {
+            HANDLE h = GetClipboardData(CF_TEXT);
+
+            if (h) {
+                char* temp = (char*)GlobalLock(h);
+                if (temp) {
+    	            s = temp;
+                }
+                temp = NULL;
+                GlobalUnlock(h);
+            }
+            CloseClipboard();
+        }
+#   endif
+    return s;
+}
+
+
+std::string System::currentDateString() {
+    time_t t1;
+    ::time(&t1);
+    tm* t = localtime(&t1);
+    return format("%d-%02d-%02d", t->tm_year + 1900, t->tm_mon + 1, t->tm_mday); 
+}
+
+#ifdef _MSC_VER
+
+// VC on Intel
+void System::cpuid(CPUIDFunction func, uint32& areg, uint32& breg, uint32& creg, uint32& dreg) {
+#if !defined(G3D_64BIT)
+    // Can't copy from assembler direct to a function argument (which is on the stack) in VC.
+    uint32 a,b,c,d;
+
+    // Intel assembler syntax
+    __asm {
+        mov	  eax, func      //  eax <- func
+        mov   ecx, 0
+        cpuid              
+        mov   a, eax   
+        mov   b, ebx   
+        mov   c, ecx   
+        mov   d, edx
+    }
+    areg = a;
+    breg = b; 
+    creg = c;
+    dreg = d;
+#else
+    int CPUInfo[4];
+    __cpuid(CPUInfo, func);
+    memcpy(&areg, &CPUInfo[0], 4);
+    memcpy(&breg, &CPUInfo[1], 4);
+    memcpy(&creg, &CPUInfo[2], 4);
+    memcpy(&dreg, &CPUInfo[3], 4);
+#endif
+}
+
+#elif defined(G3D_OSX) && ! defined(G3D_OSX_INTEL)
+
+// non-intel OS X; no CPUID
+void System::cpuid(CPUIDFunction func, uint32& eax, uint32& ebx, uint32& ecx, uint32& edx) {
+    eax = 0;
+    ebx = 0;
+    ecx = 0;
+    edx = 0;
+}
+
+#else
+
+// See http://sam.zoy.org/blog/2007-04-13-shlib-with-non-pic-code-have-inline-assembly-and-pic-mix-well
+// for a discussion of why the second version saves ebx; it allows 32-bit code to compile with the -fPIC option.
+// On 64-bit x86, PIC code has a dedicated rip register for PIC so there is no ebx conflict.
+void System::cpuid(CPUIDFunction func, uint32& eax, uint32& ebx, uint32& ecx, uint32& edx) {
+#if ! defined(__PIC__) || defined(__x86_64__)
+    // AT&T assembler syntax
+    asm volatile(
+                 "movl $0, %%ecx   \n\n" /* Wipe ecx */
+                 "cpuid            \n\t"
+                 : "=a"(eax), "=b"(ebx), "=c"(ecx), "=d"(edx)
+                 : "a"(func));
+#else
+    // AT&T assembler syntax
+    asm volatile(
+                 "pushl %%ebx      \n\t" /* save ebx */
+                 "movl $0, %%ecx   \n\n" /* Wipe ecx */
+                 "cpuid            \n\t"
+                 "movl %%ebx, %1   \n\t" /* save what cpuid just put in %ebx */
+                 "popl %%ebx       \n\t" /* restore the old ebx */
+                 : "=a"(eax), "=r"(ebx), "=c"(ecx), "=d"(edx)
+                 : "a"(func));
+#endif
+}
+
+#endif
+
+}  // namespace
diff --git a/externals/g3dlite/TextInput.cpp b/externals/g3dlite/TextInput.cpp
new file mode 100644
index 00000000000..7276d8c66b2
--- /dev/null
+++ b/externals/g3dlite/TextInput.cpp
@@ -0,0 +1,1136 @@
+/**
+ @file TextInput.cpp
+  
+ @author Morgan McGuire, graphics3d.com
+ 
+ @cite Based on a lexer written by Aaron Orenstein. 
+ 
+ @created 2001-11-27
+ @edited  2008-07-14
+ */
+
+#include "G3D/fileutils.h"
+#include "G3D/TextInput.h"
+#include "G3D/BinaryInput.h"
+#include "G3D/stringutils.h"
+
+#ifdef _MSC_VER
+#   pragma warning (push)
+// conversion from 'int' to 'char', possible loss of data (TODO: fix underlying problems)
+#   pragma warning (disable: 4244)
+#endif
+
+namespace G3D {
+
+Token TextInput::readSignificant() {
+    Token t;
+    do { 
+        t = read();
+    } while ((t.type() == Token::COMMENT) || (t.type() == Token::NEWLINE));
+    return t;
+}
+
+
+double Token::number() const {
+    if (_type == NUMBER) {
+        std::string s = toLower(_string);
+        if (s == "-1.#ind00") {
+            return nan();
+        }
+
+        if (s == "1.#inf00") {
+            return inf();
+        }
+
+        if (s == "-1.#inf00") {
+            return -inf();
+        }
+
+        double n;
+        if ((_string.length() > 2) &&
+            (_string[0] == '0') &&
+            (_string[1] == 'x')) {
+            // Hex
+            uint32 i;
+            sscanf(_string.c_str(), "%x", &i);
+            n = i;
+        } else {
+            sscanf(_string.c_str(), "%lg", &n);
+        }
+        return n;
+    } else {
+        return 0.0;
+    }
+}
+
+
+TextInput::Settings::Settings () :
+    cppBlockComments(true),
+    cppLineComments(true),
+    otherLineComments(true),
+    escapeSequencesInStrings(true), 
+    otherCommentCharacter('\0'),
+    otherCommentCharacter2('\0'),
+    generateCommentTokens(false),
+    generateNewlineTokens(false),
+    signedNumbers(true),
+    singleQuotedStrings(true),
+    singleQuoteCharacter('\''),
+    sourceFileName(),
+    startingLineNumberOffset(0),
+    msvcSpecials(true),
+    proofSymbols(false),
+    caseSensitive(true)
+{ 
+    trueSymbols.insert("true");
+    falseSymbols.insert("false");
+}
+
+
+Token TextInput::peek() {
+    if (stack.size() == 0) {
+        Token t = nextToken();
+        push(t);
+    }
+
+    return stack.front();
+}
+
+
+int TextInput::peekLineNumber() {
+    return peek().line();
+}
+
+
+int TextInput::peekCharacterNumber() {
+    return peek().character();
+}
+
+
+Token TextInput::read() {
+    if (stack.size() > 0) {
+        Token t = stack.front();
+        stack.pop_front();
+        return t;
+    } else {
+        return nextToken();
+    }
+}
+
+static void toUpper(Set& set) {
+    Array symbols;
+    set.getMembers(symbols);
+    set.clear();
+    for (int i = 0; i < symbols.size(); ++i) {
+        set.insert(toUpper(symbols[i]));
+    }
+}
+
+void TextInput::init() {
+    currentCharOffset = 0;
+    charNumber = 1;
+    lineNumber = 1 + options.startingLineNumberOffset;
+
+    if (! options.caseSensitive) {
+        // Convert true and false symbols to all uppercase for fast comparisons
+        toUpper(options.trueSymbols);
+        toUpper(options.falseSymbols);
+    }
+}
+
+
+void TextInput::push(const Token& t) {
+    stack.push_front(t);
+}
+
+
+bool TextInput::hasMore() {
+    return (peek()._type != Token::END);
+}
+
+
+int TextInput::eatInputChar() {
+    // Don't go off the end
+    if (currentCharOffset >= buffer.length()) {
+        return EOF;
+    }
+
+    unsigned char c = buffer[currentCharOffset];
+    ++currentCharOffset;
+
+    // update lineNumber and charNumber to reflect the location of the *next*
+    // character which will be read.
+
+    // increment line number for \r, \n and \r\n which matches Token::NEWLINE parsing
+    if (c == '\r') {
+        ++lineNumber;
+        charNumber = 1;
+
+        // check for \r\n
+        if (currentCharOffset < buffer.length()) {
+            unsigned char c2 = buffer[currentCharOffset];
+            if (c2 == '\n') {
+                c = c2;
+                ++currentCharOffset;
+            }
+        }
+    } else if (c == '\n') {
+        ++lineNumber;
+        charNumber = 1;
+    } else {
+        ++charNumber;
+    }
+
+    return c;
+}
+
+int TextInput::peekInputChar(int distance) {
+    // Don't go off the end
+    if ((currentCharOffset + distance) >= buffer.length()) {
+        return EOF;
+    }
+
+    unsigned char c = buffer[currentCharOffset + distance];
+    return c;
+}
+
+
+Token TextInput::nextToken() {
+    Token t;
+
+    t._line         = lineNumber;
+    t._character    = charNumber;
+    t._type         = Token::END;
+    t._extendedType = Token::END_TYPE;
+
+    int c = peekInputChar();
+    if (c == EOF) {
+        return t;
+    }
+
+    // loop through white space, newlines and comments
+    // found before other tokens
+    bool whitespaceDone = false;
+    while (! whitespaceDone) {
+        whitespaceDone = true;
+
+        // generate newlines tokens for '\n' and '\r' and '\r\n'
+        if (options.generateNewlineTokens && isNewline(c)) {
+            t._type         = Token::NEWLINE;
+            t._extendedType = Token::NEWLINE_TYPE;
+            t._string       = c;
+
+            int c2 = peekInputChar(1);
+            if (c == '\r' && c2 == '\n') {
+                t._string  += c2;
+            }
+
+            eatInputChar();
+            return t;
+        } else {
+            // Consume whitespace
+            while (isWhiteSpace(c)) {
+                c = eatAndPeekInputChar();
+            }
+        }
+
+        // update line and character number to include discarded whitespace
+        t._line         = lineNumber;
+        t._character    = charNumber;
+
+        int c2 = peekInputChar(1);
+
+        // parse comments and generate tokens if enabled
+        std::string commentString;
+
+        // check for line comments first
+        bool isLineComment = false;
+        if (options.cppLineComments && (c == '/' && c2 == '/')) {
+            // set start of line comment and eat markers
+            isLineComment = true;
+            eatInputChar();
+            eatInputChar();
+        } else if ( options.otherCommentCharacter && 
+                   (options.otherCommentCharacter != '\0' && c == options.otherCommentCharacter) ) {
+            // set start of line comment and eat markers
+            isLineComment = true;
+            eatInputChar();
+        } else if ( options.otherCommentCharacter && 
+                   (options.otherCommentCharacter2 != '\0' && c == options.otherCommentCharacter2) ) {
+            // set start of line comment and eat markers
+            isLineComment = true;
+            eatInputChar();
+        }
+
+        if (isLineComment) {
+
+            // consume line comment to newline or EOF
+            c = peekInputChar();
+            while (! isNewline(c) && c != EOF) {
+                // build comment string for token
+                commentString += c;
+
+                c = eatAndPeekInputChar();
+            }
+
+            if (options.generateCommentTokens) {
+                t._type         = Token::COMMENT;
+                t._extendedType = Token::LINE_COMMENT_TYPE;
+                t._string       = commentString;
+                return t;
+            } else {
+                // There is whitespace after the comment (in particular, the
+                // newline that terminates the comment).  There might also be
+                // whitespace at the start of the next line.
+                whitespaceDone = false;
+            }
+
+        } else if (options.cppBlockComments && (c == '/' && c2 == '*')) {
+            // consume block comment to end-marker or EOF
+
+            // consume both start-comment chars, can't let the trailing one
+            // help close the comment.
+            eatInputChar();
+            eatInputChar();
+
+            c = peekInputChar();
+            c2 = peekInputChar(1);
+            while (! ((c == '*') && (c2 == '/')) && (c != EOF)) {
+                commentString += c;
+
+                eatInputChar();
+                c = c2;
+                c2 = peekInputChar(1);
+            }
+            eatInputChar();      // eat closing '*'
+            eatInputChar();      // eat closing '/'
+
+            c = peekInputChar();
+
+            if (options.generateCommentTokens) {
+                t._type         = Token::COMMENT;
+                t._extendedType = Token::BLOCK_COMMENT_TYPE;
+                t._string       = commentString;
+                return t;
+            } else {
+                // There is whitespace after the comment (in particular, the
+                // newline that terminates the comment).  There might also be
+                // whitespace at the start of the next line.
+                whitespaceDone = false;
+            }
+        }
+
+    }  // while (! whitespaceDone)
+
+    t._line      = lineNumber;
+    t._character = charNumber;
+
+    // handle EOF
+    if (c == EOF) {
+        return t;
+    }
+
+    // Extended ASCII parses as itself, except for EOF
+    if (c > 127 && c < 255) {
+        t._type = Token::SYMBOL;                                                
+        t._extendedType = Token::SYMBOL_TYPE;                                   
+        t._string = c;                                                          
+        c = eatAndPeekInputChar();                                              
+    }
+
+
+    // Perform appropriate setup for a symbol (including setting up the token
+    // string to start with c), eat the input character, and overwrite
+    // 'c' with the peeked next input character.
+#define SETUP_SYMBOL(c)                                                         \
+    {                                                                           \
+        t._type = Token::SYMBOL;                                                \
+        t._extendedType = Token::SYMBOL_TYPE;                                   \
+        t._string = c;                                                          \
+        c = eatAndPeekInputChar();                                              \
+    }
+
+    switch (c) {
+
+    case '@':                   // Simple symbols -> just themselves.
+    case '(': 
+    case ')':
+    case ',':
+    case ';':
+    case '{':
+    case '}':
+    case '[':
+    case ']':
+    case '#':
+    case '$':
+    case '?':
+    case '%':
+        SETUP_SYMBOL(c);
+        return t;
+
+    case '-':                   // negative number, -, --, -=, or ->
+        SETUP_SYMBOL(c);
+
+        switch (c) {
+        case '>':               // ->
+        case '-':               // --
+        case '=':               // -=
+            t._string += c;
+            eatInputChar();
+            return t;
+        }
+
+        if (options.signedNumbers
+            && (isDigit(c) || (c == '.' && isDigit(peekInputChar(1))))) {
+
+            // Negative number.  'c' is still the first digit, and is
+            // the next input char.
+
+            goto numLabel;
+        }
+
+        // plain -
+        return t;
+
+    case '+':                   // positive number, +, ++, or +=
+        SETUP_SYMBOL(c);
+
+        switch (c) {
+        case '+':               // ++
+        case '=':               // +=
+            t._string += c;
+            eatInputChar();
+            return t;
+        }
+
+        if (options.signedNumbers
+            && (isDigit(c) || (c == '.' && isDigit(peekInputChar(1))))) {
+
+            // Positive number.  'c' is still the first digit, and is
+            // the next input char.
+
+            goto numLabel;
+        }
+
+        return t;
+
+    case ':':                   // : or :: or ::> or ::= or := or :>
+        SETUP_SYMBOL(c);
+        
+        if (c == ':') {
+            t._string += c;
+            eatInputChar();
+
+            if (options.proofSymbols) {
+                c = peekInputChar(0);
+                
+                if ((c == '>') || (c == '=')) {
+                    t._string += c;
+                    eatInputChar();
+                }
+            }
+        }
+        else if (options.proofSymbols && (c == '=' || c == '>')) {
+            t._string += c;
+            eatInputChar();
+        }
+        return t;
+
+    case '=':                   // = or == or =>
+        SETUP_SYMBOL(c);
+
+        if (c == '=') {
+            t._string += c;
+            eatInputChar();
+            return t;
+        } else if (options.proofSymbols && (c == '>')) {
+            t._string += c;
+            eatInputChar();
+            return t;
+        }
+        return t;
+
+    case '*':                   // * or *=
+    case '/':                   // / or /=
+    case '!':                   // ! or !=
+    case '~':                   // ~ or ~=
+    case '^':                   // ^ or ^=
+        SETUP_SYMBOL(c);
+        
+        if (c == '=') {
+            t._string += c;
+            eatInputChar();
+            return t;
+        }
+        return t;
+
+    case '>':                   // >, >>,or >=
+    case '<':                   // <<, <<, or <= or <- or <:
+    case '|':                   // ||, ||, or |= or |-
+    case '&':                   // &, &&, or &=
+        {
+            int orig_c = c;
+            SETUP_SYMBOL(c);
+
+            if ((c == '=') || (orig_c == c)) {
+                t._string += c;
+                eatInputChar();
+                return t;
+            } else if (options.proofSymbols) {
+                if ((orig_c == '<') && (c == '-')) {
+                    t._string += c;
+                    eatInputChar();
+                } else if ((orig_c == '|') && (c == '-')) {
+                    t._string += c;
+                    eatInputChar();
+                } else if ((orig_c == '<') && (c == ':')) {
+                    t._string += c;
+
+                    c = eatAndPeekInputChar();
+
+                    if (c == ':') {
+                        t._string += c;
+                        eatInputChar();
+                    }
+                }
+            }
+        }
+        return t;
+            
+    case '\\':                // backslash or escaped comment char.
+        SETUP_SYMBOL(c);
+
+        if ((options.otherCommentCharacter != '\0'
+             && c == options.otherCommentCharacter)
+            || (options.otherCommentCharacter2 != '\0'
+                && c == options.otherCommentCharacter2)) {
+            
+            // escaped comment character.  Return the raw comment
+            // char (no backslash).
+
+            t._string = c;
+            eatInputChar();
+            return t;
+        }
+        return t;
+
+    case '.':                   // number, ., .., or ...
+        if (isDigit(peekInputChar(1))) {
+            // We're parsing a float that began without a leading zero
+            goto numLabel;
+        }
+
+        SETUP_SYMBOL(c);
+
+        if (c == '.') {         // .. or ...
+            t._string += c;
+            c = eatAndPeekInputChar();
+
+            if (c == '.') {     // ...
+                t._string += c;
+                eatInputChar();
+            }
+            return t;
+        }
+
+        return t;
+
+    } // switch (c)
+
+#undef SETUP_SYMBOL
+
+numLabel:
+    if (isDigit(c) || (c == '.')) {
+
+        // A number.  Note-- single dots have been
+        // parsed already, so a . indicates a number
+        // less than 1 in floating point form.
+    
+        // [0-9]*(\.[0-9][f]) or [0-9]+ or 0x[0-9,A-F]+
+
+        if (t._string != "-") {
+            // If we picked up a leading "-" sign above, keep it,
+            // otherwise drop the string parsed thus far
+            t._string = "";
+        }
+        t._type = Token::NUMBER;
+        if (c == '.') {
+            t._extendedType = Token::FLOATING_POINT_TYPE;
+        } else {
+            t._extendedType = Token::INTEGER_TYPE;
+        }
+        
+        if ((c == '0') && (peekInputChar(1) == 'x')) {
+            // Hex number
+            t._string += "0x";
+
+            // skip the 0x
+            eatInputChar();
+            eatInputChar();
+
+            c = peekInputChar();
+            while (isDigit(c) || ((c >= 'A') && (c <= 'F')) || ((c >= 'a') && (c <= 'f'))) {
+                t._string += c;
+                c = eatAndPeekInputChar();
+            }
+
+        } else {
+			// Non-hex number
+
+            // Read the part before the decimal.
+            while (isDigit(c)) {
+                t._string += c;
+                c = eatAndPeekInputChar();
+            }
+    
+            // True if we are reading a floating-point special type
+            bool isSpecial = false;
+
+            // Read the decimal, if one exists
+            if (c == '.') {
+                t._extendedType = Token::FLOATING_POINT_TYPE;
+
+                // The '.' character was a decimal point, not the start of a
+                // method or range operator
+                t._string += c;
+                c = eatAndPeekInputChar();
+
+                // Floating point specials (msvc format only)
+                if (options.msvcSpecials && (c == '#')) {
+                    isSpecial = true;
+                    // We are reading a floating point special value
+                    // of the form -1.#IND00, -1.#INF00, or 1.#INF00
+                    c = eatAndPeekInputChar();
+                    char test = c;
+                    if (! options.caseSensitive) {
+                        test = toupper(c);
+                    }
+                    if (test != 'I') {
+                        throw BadMSVCSpecial
+                            (
+                             "Incorrect floating-point special (inf or nan) "
+                             "format.",
+                            t.line(), charNumber);
+                    }
+                    c = eatAndPeekInputChar();
+                    test = c;
+                    if (! options.caseSensitive) {
+                        test = toupper(c);
+                    }
+                    if (test != 'N') {
+                        throw BadMSVCSpecial
+                            (
+                             "Incorrect floating-point special (inf or nan) "
+                             "format.",
+                            t.line(), charNumber);
+                    }
+                    t._string += "#IN";
+                    c = eatAndPeekInputChar();
+                    test = c;
+                    if (! options.caseSensitive) {
+                        test = toupper(c);
+                    }
+                    if ((test != 'F') && (test != 'D')) {
+                        throw BadMSVCSpecial
+                            (
+                             "Incorrect floating-point special (inf or nan) "
+                             "format.",
+                            t.line(), charNumber);
+                    }
+                    t._string += c;
+                    for (int j = 0; j < 2; ++j) {
+                        c = eatAndPeekInputChar();
+                        if (c != '0') {
+                            throw BadMSVCSpecial
+                                (
+                                 "Incorrect floating-point special (inf or"
+                                 "nan) format.",
+                                 t.line(), charNumber);
+                        }
+                        t._string += (char)c;
+                    }
+
+                } else {
+
+                    // Read the part after the decimal
+                    while (isDigit((char)c)) {
+                        t._string += (char)c;
+                        c = eatAndPeekInputChar();
+                    }
+                }
+            }
+
+            if (! isSpecial && ((c == 'e') || (c == 'E'))) {
+                // Read exponent
+                t._extendedType = Token::FLOATING_POINT_TYPE;
+                t._string += c;
+
+                c = eatAndPeekInputChar();
+                if ((c == '-') || (c == '+')) {
+                    t._string += c;
+                    c = eatAndPeekInputChar();                    
+                }
+
+                while (isDigit(c)) {
+                    t._string += c;
+                    c = eatAndPeekInputChar();
+                }
+            }
+
+            if (! isSpecial && (t._extendedType == Token::FLOATING_POINT_TYPE) && (c == 'f')) {
+                // Trailing f on a float
+                t._string += c;
+                c = eatAndPeekInputChar();
+            }
+        }
+        return t;
+
+    } else if (isLetter(c) || (c == '_')) {
+        // Identifier or keyword
+        // [A-Za-z_][A-Za-z_0-9]*
+
+        t._type = Token::SYMBOL;
+        t._extendedType = Token::SYMBOL_TYPE;
+        t._string = "";
+        do {
+            t._string += c;
+            c = eatAndPeekInputChar();
+        } while (isLetter(c) || isDigit(c) || (c == '_'));
+
+        // See if this symbol is actually a boolean
+        if ((options.trueSymbols.size() > 0) || (options.falseSymbols.size() > 0)) {
+            std::string str = t._string;
+            if (! options.caseSensitive) {
+                str = toUpper(str);
+            }
+            if (options.trueSymbols.contains(str)) {
+               t._type = Token::BOOLEAN;
+               t._extendedType = Token::BOOLEAN_TYPE;
+               t._bool = true;
+            } else if (options.falseSymbols.contains(str)) {
+               t._type = Token::BOOLEAN;
+               t._extendedType = Token::BOOLEAN_TYPE;
+               t._bool = false;
+            }
+        }
+
+        return t;
+
+    } else if (c == '\"') {
+
+        // Discard the double-quote.
+        eatInputChar();
+
+        // Double quoted string
+        parseQuotedString('\"', t);
+        return t;
+
+    } else if (c == options.singleQuoteCharacter) {
+
+        // Discard the single-quote.
+        eatInputChar();
+
+        if (options.singleQuotedStrings) {
+            // Single quoted string
+            parseQuotedString(options.singleQuoteCharacter, t);
+        } else {
+            t._string = c;
+            t._type = Token::SYMBOL;
+            t._extendedType = Token::SYMBOL_TYPE;
+        }
+        return t;
+
+    } // end of special case tokens
+
+    if (c == EOF) {
+        t._type = Token::END;
+        t._extendedType = Token::END_TYPE;
+        t._string = "";
+        return t;
+    }
+
+    // Some unknown token
+    debugAssertM(false, 
+                 format("Unrecognized token type beginning with character '%c' (ASCII %d)", 
+                        c, c));
+    return t;
+}
+
+
+void TextInput::parseQuotedString(unsigned char delimiter, Token& t) {
+
+    t._type = Token::STRING;
+
+    if (delimiter == options.singleQuoteCharacter) {
+        t._extendedType = Token::SINGLE_QUOTED_TYPE;
+    } else {
+        t._extendedType = Token::DOUBLE_QUOTED_TYPE;
+    }
+
+    while (true) {
+        // We're definitely going to consume the next input char, so we get
+        // it right now.  This makes the condition handling below a bit easier.
+        int c = eatInputChar();
+
+        if (c == EOF) {
+            // END inside a quoted string.  (We finish the string.)
+            break;
+        }
+
+        if (options.escapeSequencesInStrings && (c == '\\')) {
+            // An escaped character.  We're definitely going to consume it,
+            // so we get it (and consume it) now.
+
+            c = eatInputChar();
+
+            switch (c) {
+            case 'r':
+                t._string += '\r';
+                break;
+            case 'n':
+                t._string += '\n';
+                break;
+            case 't':
+                t._string += '\t';
+                break;
+            case '0':
+                t._string += '\0';
+                break;
+
+            case '\\':
+            case '\"':
+                t._string += (char)c;
+                break;
+
+            default:
+                if (c ==  options.singleQuoteCharacter) {
+                    t._string += (char)c;
+                    break;
+                }
+
+                if (((c == options.otherCommentCharacter) && 
+                     (options.otherCommentCharacter != '\0')) ||
+                    ((c == options.otherCommentCharacter2) && 
+                     (options.otherCommentCharacter2 != '\0'))) {
+                    t._string += c;
+                } 
+                // otherwise, some illegal escape sequence; skip it.
+                break;
+
+            } // switch
+
+        } else if (c == delimiter) {
+            // End of the string.  Already consumed the character.
+            break;
+        } else {
+            // All other chars, go on to the string.  Already consumed the
+            // character.
+            t._string += (char)c;
+        }
+
+    }
+}
+
+bool TextInput::readBoolean() {
+    Token t(read());
+
+    if (t._type == Token::BOOLEAN) {
+        return t.boolean();
+    }
+
+    // Push initial token back, and throw an error.  We intentionally
+    // indicate that the wrong type is the type of the initial token.
+    // Logically, the number started there.
+    push(t);
+    throw WrongTokenType(options.sourceFileName, t.line(), t.character(),
+                         Token::BOOLEAN, t._type); 
+}
+
+double TextInput::readNumber() {
+    Token t(read());
+
+    if (t._type == Token::NUMBER) {
+        return t.number();
+    }
+
+    // Even if signedNumbers is disabled, readNumber attempts to
+    // read a signed number, so we handle that case here.
+    if (! options.signedNumbers
+        && (t._type == Token::SYMBOL)
+        && ((t._string == "-") 
+             || (t._string == "+"))) {
+
+        Token t2(read());
+
+        if ((t2._type == Token::NUMBER)
+            && (t2._character == t._character + 1)) {
+
+            if (t._string == "-") {
+                return -t2.number();
+            } else {
+                return t2.number();
+            }
+        }
+
+        // push back the second token.
+        push(t2);
+    }
+
+    // Push initial token back, and throw an error.  We intentionally
+    // indicate that the wrong type is the type of the initial token.
+    // Logically, the number started there.
+    push(t);
+    throw WrongTokenType(options.sourceFileName, t.line(), t.character(),
+                         Token::NUMBER, t._type); 
+}
+
+
+Token TextInput::readStringToken() {
+    Token t(read());
+
+    if (t._type == Token::STRING) {               // fast path
+        return t;
+    }
+
+    push(t);
+    throw WrongTokenType(options.sourceFileName, t.line(), t.character(),
+                         Token::STRING, t._type);
+}
+
+std::string TextInput::readString() {
+    return readStringToken()._string;
+}
+
+void TextInput::readString(const std::string& s) {
+    Token t(readStringToken());
+
+    if (t._string == s) {                         // fast path
+        return;
+    }
+
+    push(t);
+    throw WrongString(options.sourceFileName, t.line(), t.character(),
+                      s, t._string);
+}
+
+Token TextInput::readCommentToken() {
+    Token t(read());
+
+    if (t._type == Token::COMMENT) {               // fast path
+        return t;
+    }
+
+    push(t);
+    throw WrongTokenType(options.sourceFileName, t.line(), t.character(),
+                         Token::COMMENT, t._type);
+}
+
+std::string TextInput::readComment() {
+    return readCommentToken()._string;
+}
+
+void TextInput::readComment(const std::string& s) {
+    Token t(readCommentToken());
+
+    if (t._string == s) {                         // fast path
+        return;
+    }
+
+    push(t);
+    throw WrongString(options.sourceFileName, t.line(), t.character(),
+                      s, t._string);
+}
+
+Token TextInput::readNewlineToken() {
+    Token t(read());
+
+    if (t._type == Token::NEWLINE) {               // fast path
+        return t;
+    }
+
+    push(t);
+    throw WrongTokenType(options.sourceFileName, t.line(), t.character(),
+                         Token::NEWLINE, t._type);
+}
+
+std::string TextInput::readNewline() {
+    return readNewlineToken()._string;
+}
+
+void TextInput::readNewline(const std::string& s) {
+    Token t(readNewlineToken());
+
+    if (t._string == s) {                         // fast path
+        return;
+    }
+
+    push(t);
+    throw WrongString(options.sourceFileName, t.line(), t.character(),
+                      s, t._string);
+}
+
+Token TextInput::readSymbolToken() {
+    Token t(read());
+    
+    if (t._type == Token::SYMBOL) {               // fast path
+        return t;
+    }
+
+    push(t);
+    throw WrongTokenType(options.sourceFileName, t.line(), t.character(),
+                         Token::SYMBOL, t._type);
+}
+
+
+std::string TextInput::readSymbol() {
+    return readSymbolToken()._string;
+}
+
+void TextInput::readSymbol(const std::string& symbol) {
+    Token t(readSymbolToken());
+
+    if (t._string == symbol) {                    // fast path
+        return;
+    }
+
+    push(t);
+    throw WrongSymbol(options.sourceFileName, t.line(), t.character(),
+                      symbol, t._string);
+}
+
+
+TextInput::TextInput(const std::string& filename, const Settings& opt) : options(opt) {
+    init();
+    std::string input = readWholeFile(filename);
+
+    if (options.sourceFileName.empty()) {
+        options.sourceFileName = filename;
+    }
+    int n = input.size();
+    buffer.resize(n);
+    System::memcpy(buffer.getCArray(), input.c_str(), n);
+}
+
+
+TextInput::TextInput(FS fs, const std::string& str, const Settings& opt) : options(opt) {
+    (void)fs;
+    init();
+    if (options.sourceFileName.empty()) {
+        if (str.length() < 14) {
+            options.sourceFileName = std::string("\"") + str + "\"";
+        } else {
+            options.sourceFileName = std::string("\"") + str.substr(0, 10) + "...\"";
+        }
+    }
+    buffer.resize(str.length()); // we don't bother copying trailing NUL.
+    System::memcpy(buffer.getCArray(), str.c_str(), buffer.size());
+}
+
+
+const std::string& TextInput::filename() const {
+    return options.sourceFileName;
+}
+
+///////////////////////////////////////////////////////////////////////////////////
+
+TextInput::TokenException::TokenException(
+    const std::string&  src,
+    int                 ln,
+    int                 ch) : ParseError(src, ln, ch, format("%s(%d) : ", src.c_str(), ln)),
+                              sourceFile(src) {
+}
+
+///////////////////////////////////////////////////////////////////////////////////
+
+static const char* tokenTypeToString(Token::Type t) {
+    switch (t) {
+    case Token::SYMBOL:
+        return "Token::SYMBOL";
+    case Token::STRING:
+        return "Token::STRING";
+    case Token::NUMBER:
+        return "Token::NUMBER";
+    case Token::END:
+        return "Token::END";
+    default:
+        debugAssertM(false, "Fell through switch");
+        return "?";
+    }
+}
+
+TextInput::WrongTokenType::WrongTokenType(
+    const std::string&  src,
+    int                 ln,
+    int                 ch,
+    Token::Type         e,
+    Token::Type         a) :
+    TokenException(src, ln, ch), expected(e), actual(a) {
+         
+    message += format("Expected token of type %s, found type %s.",
+                      tokenTypeToString(e), tokenTypeToString(a));
+}
+
+
+TextInput::BadMSVCSpecial::BadMSVCSpecial(
+    const std::string&  src,
+    int                 ln,
+    int                 ch) :
+    TokenException(src, ln, ch) {
+}
+
+
+TextInput::WrongSymbol::WrongSymbol(
+    const std::string&  src,
+    int                 ln,
+    int                 ch,
+    const std::string&  e,
+    const std::string&  a) : 
+    TokenException(src, ln, ch), expected(e), actual(a) {
+
+    message += format("Expected symbol '%s', found symbol '%s'.",
+                      e.c_str(), a.c_str());
+}
+
+
+TextInput::WrongString::WrongString(
+    const std::string&  src,
+    int                 ln,
+    int                 ch,
+    const std::string&  e,
+    const std::string&  a) : 
+    TokenException(src, ln, ch), expected(e), actual(a) {
+
+    message += format("Expected string '%s', found string '%s'.",
+                      e.c_str(), a.c_str());
+}
+
+
+void deserialize(bool& b, TextInput& ti) {
+    b = ti.readSymbol() == "true";
+}
+
+
+void deserialize(int& b, TextInput& ti) {
+    b = iRound(ti.readNumber());
+}
+
+
+void deserialize(uint8& b, TextInput& ti) {
+    b = (uint8)iRound(ti.readNumber());
+}
+
+
+void deserialize(double& b, TextInput& ti) {
+    b = ti.readNumber();
+}
+
+
+void deserialize(float& b, TextInput& ti) {
+    b = (float)ti.readNumber();
+}
+
+} // namespace
+
+#ifdef _MSC_VER
+#   pragma warning (pop)
+#endif
diff --git a/externals/g3dlite/TextOutput.cpp b/externals/g3dlite/TextOutput.cpp
new file mode 100644
index 00000000000..11347252eba
--- /dev/null
+++ b/externals/g3dlite/TextOutput.cpp
@@ -0,0 +1,452 @@
+/**
+  @file TextOutput.cpp
+
+  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+  @created 2004-06-21
+  @edited  2006-08-14
+
+  Copyright 2000-2006, Morgan McGuire.
+  All rights reserved.
+ */
+
+#include "G3D/TextOutput.h"
+#include "G3D/Log.h"
+#include "G3D/fileutils.h"
+
+namespace G3D {
+
+TextOutput::TextOutput(const TextOutput::Settings& opt) :
+	startingNewLine(true),
+    currentColumn(0),
+	inDQuote(false),
+	filename(""),
+	indentLevel(0)
+{
+    setOptions(opt);
+}
+
+
+TextOutput::TextOutput(const std::string& fil, const TextOutput::Settings& opt) :
+    startingNewLine(true),
+    currentColumn(0),
+	inDQuote(false),
+	filename(fil),
+	indentLevel(0) 
+{
+
+    setOptions(opt);
+}
+
+
+void TextOutput::setIndentLevel(int i) {
+    indentLevel = i;
+
+    // If there were more pops than pushes, don't let that take us below 0 indent.
+    // Don't ever indent more than the number of columns.
+    indentSpaces = 
+        iClamp(option.spacesPerIndent * indentLevel, 
+               0, 
+               option.numColumns - 1);
+}
+
+
+void TextOutput::setOptions(const Settings& _opt) {
+    option = _opt;
+
+    debugAssert(option.numColumns > 1);
+
+    setIndentLevel(indentLevel);
+
+    newline = (option.newlineStyle == Settings::NEWLINE_WINDOWS) ? "\r\n" : "\n";
+}
+
+
+void TextOutput::pushIndent() {
+    setIndentLevel(indentLevel + 1);
+}
+
+
+void TextOutput::popIndent() {
+    setIndentLevel(indentLevel - 1);
+}
+
+
+static std::string escape(const std::string& string) {
+    std::string result = "";
+
+    for (std::string::size_type i = 0; i < string.length(); ++i) {
+        char c = string.at(i);
+        switch (c) {
+        case '\0':
+            result += "\\0";
+            break;
+
+        case '\r':
+            result += "\\r";
+            break;
+
+        case '\n':
+            result += "\\n";
+            break;
+
+        case '\t':
+            result += "\\t";
+            break;
+
+        case '\\':
+            result += "\\\\";
+            break;
+
+        default:
+            result += c;
+        }
+    }
+
+    return result;
+}
+
+void TextOutput::writeString(const std::string& string) {
+    // Convert special characters to escape sequences
+    this->printf("\"%s\"", escape(string).c_str());
+}
+
+
+void TextOutput::writeBoolean(bool b) {
+    this->printf("%s ", b ? option.trueSymbol.c_str() : option.falseSymbol.c_str());
+}
+
+void TextOutput::writeNumber(double n) {
+    this->printf("%f ", n);
+}
+
+
+void TextOutput::writeNumber(int n) {
+    this->printf("%d ", n);
+}
+
+
+void TextOutput::writeSymbol(const std::string& string) {
+    if (string.size() > 0) {
+        // TODO: check for legal symbols?
+        this->printf("%s ", string.c_str());
+    }
+}
+
+void TextOutput::writeSymbols(
+    const std::string& a,
+    const std::string& b,
+    const std::string& c,
+    const std::string& d,
+    const std::string& e,
+    const std::string& f) {
+
+    writeSymbol(a);
+    writeSymbol(b);
+    writeSymbol(c);
+    writeSymbol(d);
+    writeSymbol(e);
+    writeSymbol(f);
+}
+
+
+void TextOutput::printf(const std::string formatString, ...) {
+    va_list argList;
+    va_start(argList, formatString);
+    this->vprintf(formatString.c_str(), argList);
+    va_end(argList);
+}
+
+
+void TextOutput::printf(const char* formatString, ...) {
+    va_list argList;
+    va_start(argList, formatString);
+    this->vprintf(formatString, argList);
+    va_end(argList);
+}
+
+
+void TextOutput::convertNewlines(const std::string& in, std::string& out) {
+    // TODO: can be significantly optimized in cases where
+    // single characters are copied in order by walking through
+    // the array and copying substrings as needed.
+
+    if (option.convertNewlines) {
+        out = "";
+        for (uint32 i = 0; i < in.size(); ++i) {
+            if (in[i] == '\n') {
+                // Unix newline
+                out += newline;
+            } else if ((in[i] == '\r') && (i + 1 < in.size()) && (in[i + 1] == '\n')) {
+                // Windows newline
+                out += newline;
+                ++i;
+            } else {
+                out += in[i];
+            }
+        }
+    } else {
+        out = in;
+    }
+}
+
+
+void TextOutput::writeNewline() {
+    for (uint32 i = 0; i < newline.size(); ++i) {
+        indentAppend(newline[i]);
+    }
+}
+
+
+void TextOutput::writeNewlines(int numLines) {
+    for (int i = 0; i < numLines; ++i) {
+        writeNewline();
+    }
+}
+
+
+void TextOutput::wordWrapIndentAppend(const std::string& str) {
+    // TODO: keep track of the last space character we saw so we don't
+    // have to always search.
+
+    if ((option.wordWrap == Settings::WRAP_NONE) ||
+        (currentColumn + (int)str.size() <= option.numColumns)) {
+        // No word-wrapping is needed
+
+        // Add one character at a time.
+        // TODO: optimize for strings without newlines to add multiple
+        // characters.
+        for (uint32 i = 0; i < str.size(); ++i) {
+            indentAppend(str[i]);
+        }
+        return;
+    }
+
+    // Number of columns to wrap against
+    int cols = option.numColumns - indentSpaces;
+    
+    // Copy forward until we exceed the column size, 
+    // and then back up and try to insert newlines as needed.
+    for (uint32 i = 0; i < str.size(); ++i) {
+
+        indentAppend(str[i]);
+        if ((str[i] == '\r') && (i + 1 < str.size()) && (str[i + 1] == '\n')) {
+            // \r\n, we need to hit the \n to enter word wrapping.
+            ++i;
+            indentAppend(str[i]);
+        }
+
+        if (currentColumn >= cols) {
+            debugAssertM(str[i] != '\n' && str[i] != '\r',
+                "Should never enter word-wrapping on a newline character");            
+
+            // True when we're allowed to treat a space as a space.
+            bool unquotedSpace = option.allowWordWrapInsideDoubleQuotes || ! inDQuote;
+
+            // Cases:
+            //
+            // 1. Currently in a series of spaces that ends with a newline
+            //     strip all spaces and let the newline
+            //     flow through.
+            //
+            // 2. Currently in a series of spaces that does not end with a newline
+            //     strip all spaces and replace them with single newline
+            //
+            // 3. Not in a series of spaces
+            //     search backwards for a space, then execute case 2.
+
+            // Index of most recent space
+            uint32 lastSpace = data.size() - 1;
+
+            // How far back we had to look for a space
+            uint32 k = 0;
+            uint32 maxLookBackward = currentColumn - indentSpaces;
+
+            // Search backwards (from current character), looking for a space.
+            while ((k < maxLookBackward) &&
+                (lastSpace > 0) &&
+                (! ((data[lastSpace] == ' ') && unquotedSpace))) {
+                --lastSpace;
+                ++k;
+
+                if ((data[lastSpace] == '\"') && !option.allowWordWrapInsideDoubleQuotes) {
+                    unquotedSpace = ! unquotedSpace;
+                }
+            }
+
+            if (k == maxLookBackward) {
+                // We couldn't find a series of spaces
+
+                if (option.wordWrap == Settings::WRAP_ALWAYS) {
+                    // Strip the last character we wrote, force a newline,
+                    // and replace the last character;
+                    data.pop();
+                    writeNewline();
+                    indentAppend(str[i]);
+                } else {
+                    // Must be Settings::WRAP_WITHOUT_BREAKING
+                    //
+                    // Don't write the newline; we'll come back to
+                    // the word wrap code after writing another character
+                }
+            } else {
+                // We found a series of spaces.  If they continue 
+                // to the new string, strip spaces off both.  Otherwise
+                // strip spaces from data only and insert a newline.                
+
+                // Find the start of the spaces.  firstSpace is the index of the
+                // first non-space, looking backwards from lastSpace.
+                uint32 firstSpace = lastSpace;
+                while ((k < maxLookBackward) &&
+                    (firstSpace > 0) &&
+                    (data[firstSpace] == ' ')) {
+                    --firstSpace;
+                    ++k;
+                }
+
+                if (k == maxLookBackward) {
+                    ++firstSpace;
+                }
+
+                if (lastSpace == (uint32)data.size() - 1) {
+                    // Spaces continued up to the new string
+                    data.resize(firstSpace + 1);
+                    writeNewline();
+
+                    // Delete the spaces from the new string
+                    while ((i < str.size() - 1) && (str[i + 1] == ' ')) {
+                        ++i;
+                    }
+                } else {
+                    // Spaces were somewhere in the middle of the old string.
+                    // replace them with a newline.
+
+                    // Copy over the characters that should be saved
+                    Array temp;
+                    for (uint32 j = lastSpace + 1; j < (uint32)data.size(); ++j) {
+                        char c = data[j];
+
+                        if (c == '\"') {
+                            // Undo changes to quoting (they will be re-done
+                            // when we paste these characters back on).
+                            inDQuote = !inDQuote;
+                        }
+                        temp.append(c);
+                    }
+
+                    // Remove those characters and replace with a newline.
+                    data.resize(firstSpace + 1);
+                    writeNewline();
+
+                    // Write them back
+                    for (uint32 j = 0; j < (uint32)temp.size(); ++j) {
+                        indentAppend(temp[j]);
+                    }
+
+                    // We are now free to continue adding from the
+                    // new string, which may or may not begin with spaces.
+
+                } // if spaces included new string
+            } // if hit indent
+        } // if line exceeded
+    } // iterate over str
+}
+
+
+void TextOutput::indentAppend(char c) {
+
+    if (startingNewLine) {
+        for (int j = 0; j < indentSpaces; ++j) {
+            data.push(' ');
+        }
+        startingNewLine = false;
+        currentColumn = indentSpaces;
+    }
+
+    data.push(c);
+
+    // Don't increment the column count on return character
+    // newline is taken care of below.
+    if (c != '\r') {
+        ++currentColumn;
+    }
+    
+    if (c == '\"') {
+        inDQuote = ! inDQuote;
+    }
+
+    startingNewLine = (c == '\n');
+    if (startingNewLine) {
+        currentColumn = 0;
+    }
+}
+
+
+void TextOutput::vprintf(const char* formatString, va_list argPtr) {
+    std::string str = vformat(formatString, argPtr);
+
+    std::string clean;
+    convertNewlines(str, clean);
+    wordWrapIndentAppend(clean);
+}
+
+
+void TextOutput::commit(bool flush) {
+    std::string p = filenamePath(filename);
+    if (! fileExists(p, false)) {
+        createDirectory(p);
+    }
+
+    FILE* f = fopen(filename.c_str(), "wb");
+    debugAssertM(f, "Could not open \"" + filename + "\"");
+    fwrite(data.getCArray(), 1, data.size(), f);
+    if (flush) {
+        fflush(f);
+    }
+    fclose(f);
+}
+
+
+void TextOutput::commitString(std::string& out) {
+    // Null terminate
+    data.push('\0');
+    out = data.getCArray();
+    data.pop();
+}
+
+
+std::string TextOutput::commitString() {
+    std::string str;
+    commitString(str);
+    return str;
+}
+
+
+
+/////////////////////////////////////////////////////////////////////
+
+void serialize(const float& b, TextOutput& to) {
+    to.writeNumber(b);
+}
+
+
+void serialize(const bool& b, TextOutput& to) {
+    to.writeSymbol(b ? "true" : "false");
+}
+
+
+void serialize(const int& b, TextOutput& to) {
+    to.writeNumber(b);
+}
+
+
+void serialize(const uint8& b, TextOutput& to) {
+    to.writeNumber(b);
+}
+
+
+void serialize(const double& b, TextOutput& to) {
+    to.writeNumber(b);
+}
+
+
+}
diff --git a/externals/g3dlite/Triangle.cpp b/externals/g3dlite/Triangle.cpp
new file mode 100644
index 00000000000..253438ad5fb
--- /dev/null
+++ b/externals/g3dlite/Triangle.cpp
@@ -0,0 +1,186 @@
+/**
+ @file Triangle.cpp
+ 
+ @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+ 
+ @created 2001-04-06
+ @edited  2008-12-28
+
+ Copyright 2000-2009, Morgan McGuire.
+ All rights reserved.
+ */
+
+#include "G3D/platform.h"
+#include "G3D/Triangle.h"
+#include "G3D/Plane.h"
+#include "G3D/BinaryInput.h"
+#include "G3D/BinaryOutput.h"
+#include "G3D/debugAssert.h"
+#include "G3D/AABox.h"
+#include "G3D/Ray.h"
+
+namespace G3D {
+
+    
+void Triangle::init(const Vector3& v0, const Vector3& v1, const Vector3& v2) {
+
+    _plane = Plane(v0, v1, v2);
+    _vertex[0] = v0;
+    _vertex[1] = v1;
+    _vertex[2] = v2;
+
+    static int next[] = {1,2,0};
+
+    for (int i = 0; i < 3; ++i) {
+        const Vector3& e  = _vertex[next[i]] - _vertex[i];
+        edgeMagnitude[i]  = e.magnitude();
+
+        if (edgeMagnitude[i] == 0) {
+            edgeDirection[i] = Vector3::zero();
+        } else {
+            edgeDirection[i] = e / (float)edgeMagnitude[i];
+        }
+    }
+
+    _edge01 = _vertex[1] - _vertex[0];
+    _edge02 = _vertex[2] - _vertex[0];
+
+    _primaryAxis = _plane.normal().primaryAxis();
+    _area = 0.5f * edgeDirection[0].cross(edgeDirection[2]).magnitude() * (edgeMagnitude[0] * edgeMagnitude[2]);
+        //0.5f * (_vertex[1] - _vertex[0]).cross(_vertex[2] - _vertex[0]).dot(_plane.normal());
+}
+
+
+Triangle::Triangle() {
+    init(Vector3::zero(), Vector3::zero(), Vector3::zero());
+}
+    
+
+Triangle::Triangle(const Vector3& v0, const Vector3& v1, const Vector3& v2) {
+    init(v0, v1, v2);
+}
+
+    
+Triangle::~Triangle() {
+}
+
+
+Triangle::Triangle(class BinaryInput& b) {
+    deserialize(b);
+}
+
+
+void Triangle::serialize(class BinaryOutput& b) {
+    _vertex[0].serialize(b);
+    _vertex[1].serialize(b);
+    _vertex[2].serialize(b);
+}
+
+
+void Triangle::deserialize(class BinaryInput& b) {
+    _vertex[0].deserialize(b);
+    _vertex[1].deserialize(b);
+    _vertex[2].deserialize(b);
+    init(_vertex[0], _vertex[1], _vertex[2]);
+}
+
+
+float Triangle::area() const {
+    return _area;
+}
+
+
+const Vector3& Triangle::normal() const {
+    return _plane.normal();
+}
+
+
+const Plane& Triangle::plane() const {
+    return _plane;
+}
+
+
+Vector3 Triangle::center() const {
+    return (_vertex[0] + _vertex[1] + _vertex[2]) / 3.0;
+}
+
+Vector3 Triangle::randomPoint() const {
+    // Choose a random point in the parallelogram
+
+    float s = uniformRandom();
+    float t = uniformRandom();
+
+    if (t > 1.0f - s) {
+        // Outside the triangle; reflect about the
+        // diagonal of the parallelogram
+        t = 1.0f - t;
+        s = 1.0f - s;
+    }
+
+    return _edge01 * s + _edge02 * t + _vertex[0];
+}
+
+
+void Triangle::getBounds(AABox& out) const {
+    Vector3 lo = _vertex[0];
+    Vector3 hi = lo;
+
+    for (int i = 1; i < 3; ++i) {
+        lo = lo.min(_vertex[i]);
+        hi = hi.max(_vertex[i]);
+    }
+
+    out = AABox(lo, hi);
+}
+
+
+bool Triangle::intersect(const Ray& ray, float& distance, float baryCoord[3]) const {
+    static const float EPS = 1e-5f;
+
+    // See RTR2 ch. 13.7 for the algorithm.
+
+    const Vector3& e1 = edge01();
+    const Vector3& e2 = edge02();
+    const Vector3 p(ray.direction().cross(e2));
+    const float a = e1.dot(p);
+
+    if (abs(a) < EPS) {
+        // Determinant is ill-conditioned; abort early
+        return false;
+    }
+
+    const float f = 1.0f / a;
+    const Vector3 s(ray.origin() - vertex(0));
+    const float u = f * s.dot(p);
+
+    if ((u < 0.0f) || (u > 1.0f)) {
+        // We hit the plane of the m_geometry, but outside the m_geometry
+        return false;
+    }
+
+    const Vector3 q(s.cross(e1));
+    const float v = f * ray.direction().dot(q);
+
+    if ((v < 0.0f) || ((u + v) > 1.0f)) {
+        // We hit the plane of the triangle, but outside the triangle
+        return false;
+    }
+
+    const float t = f * e2.dot(q);
+
+    if ((t > 0.0f) && (t < distance)) {
+        // This is a new hit, closer than the previous one
+        distance = t;
+
+        baryCoord[0] = 1.0 - u - v;
+        baryCoord[1] = u;
+        baryCoord[2] = v;
+
+        return true;
+    } else {
+        // This hit is after the previous hit, so ignore it
+        return false;
+    }
+}
+
+} // G3D
diff --git a/externals/g3dlite/UprightFrame.cpp b/externals/g3dlite/UprightFrame.cpp
new file mode 100644
index 00000000000..c80264bf4e8
--- /dev/null
+++ b/externals/g3dlite/UprightFrame.cpp
@@ -0,0 +1,132 @@
+/**
+  @file UprightFrame.cpp
+  Box class
+
+  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+
+  @created 2007-05-02
+  @edited  2007-05-05
+*/
+
+#include "G3D/UprightFrame.h"
+#include "G3D/BinaryInput.h"
+#include "G3D/BinaryOutput.h"
+
+namespace G3D {
+
+UprightFrame::UprightFrame(const CoordinateFrame& cframe) {
+    Vector3 look = cframe.lookVector();
+
+    yaw = G3D::pi() + atan2(look.x, look.z);
+    pitch = asin(look.y);
+
+    translation = cframe.translation;
+}
+
+    
+CoordinateFrame UprightFrame::toCoordinateFrame() const {
+    CoordinateFrame cframe;
+
+    Matrix3 P(Matrix3::fromAxisAngle(Vector3::unitX(), pitch));
+    Matrix3 Y(Matrix3::fromAxisAngle(Vector3::unitY(), yaw));
+
+    cframe.rotation = Y * P;
+    cframe.translation = translation;
+
+    return cframe;
+}
+
+
+UprightFrame UprightFrame::operator+(const UprightFrame& other) const {
+    return UprightFrame(translation + other.translation, pitch + other.pitch, yaw + other.yaw);
+}
+
+
+UprightFrame UprightFrame::operator*(const float k) const {
+    return UprightFrame(translation * k, pitch * k, yaw * k);
+}
+
+
+void UprightFrame::unwrapYaw(UprightFrame* a, int N) {
+    // Use the first point to establish the wrapping convention
+    for (int i = 1; i < N; ++i) {
+        const float prev = a[i - 1].yaw;
+        float& cur = a[i].yaw;
+
+        // No two angles should be more than pi (i.e., 180-degrees) apart.  
+        if (abs(cur - prev) > G3D::pi()) {
+            // These angles must have wrapped at zero, causing them
+            // to be interpolated the long way.
+
+            // Find canonical [0, 2pi] versions of these numbers
+            float p = wrap(prev, twoPi());
+            float c = wrap(cur, twoPi());
+            
+            // Find the difference -pi < diff < pi between the current and previous values
+            float diff = c - p;
+            if (diff < -G3D::pi()) {
+                diff += twoPi();
+            } else if (diff > G3D::pi()) {
+                diff -= twoPi();
+            } 
+
+            // Offset the current from the previous by the difference
+            // between them.
+            cur = prev + diff;
+        }
+    }
+}
+
+
+void UprightFrame::serialize(class BinaryOutput& b) const {
+    translation.serialize(b);
+    b.writeFloat32(pitch);
+    b.writeFloat32(yaw);
+}
+
+
+void UprightFrame::deserialize(class BinaryInput& b) {
+    translation.deserialize(b);
+    pitch = b.readFloat32();
+    yaw = b.readFloat32();
+}
+
+
+void UprightSpline::serialize(class BinaryOutput& b) const {
+    b.writeBool8(cyclic);
+
+    b.writeInt32(control.size());
+    for (int i = 0; i < control.size(); ++i) {
+        control[i].serialize(b);
+    }
+    b.writeInt32(time.size());
+    for (int i = 0; i < time.size(); ++i) {
+        b.writeFloat32(time[i]);
+    }
+}
+
+
+void UprightSpline::deserialize(class BinaryInput& b) {
+    cyclic = b.readBool8();
+
+    control.resize(b.readInt32());
+    for (int i = 0; i < control.size(); ++i) {
+        control[i].deserialize(b);
+    }
+
+    if (b.hasMore()) {
+        time.resize(b.readInt32());
+        for (int i = 0; i < time.size(); ++i) {
+            time[i] = b.readFloat32();
+        }
+        debugAssert(time.size() == control.size());
+    } else {
+        // Import legacy path
+        time.resize(control.size());
+        for (int i = 0; i < time.size(); ++i) {
+            time[i] = i;
+        }
+    }
+}
+
+}
diff --git a/externals/g3dlite/Vector2.cpp b/externals/g3dlite/Vector2.cpp
new file mode 100644
index 00000000000..ec0737c3755
--- /dev/null
+++ b/externals/g3dlite/Vector2.cpp
@@ -0,0 +1,224 @@
+/**
+ @file Vector2.cpp
+ 
+ 2D vector class, used for texture coordinates primarily.
+ 
+ @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+ 
+ @cite Portions based on Dave Eberly'x Magic Software Library
+  at http://www.magic-software.com
+ 
+ @created 2001-06-02
+ @edited  2009-11-16
+ */
+
+#include "G3D/platform.h"
+#include 
+#include "G3D/Vector2.h"
+#include "G3D/g3dmath.h"
+#include "G3D/format.h"
+#include "G3D/BinaryInput.h"
+#include "G3D/BinaryOutput.h"
+#include "G3D/TextInput.h"
+#include "G3D/TextOutput.h"
+#include "G3D/Any.h"
+
+namespace G3D {
+
+
+Vector2::Vector2(const Any& any) {
+    any.verifyName("Vector2");
+    any.verifyType(Any::TABLE, Any::ARRAY);
+    any.verifySize(2);
+
+    if (any.type() == Any::ARRAY) {
+        x = any[0];
+        y = any[1];
+    } else {
+        // Table
+        x = any["x"];
+        y = any["y"];
+    }
+}
+
+
+Vector2::operator Any() const {
+    Any any(Any::ARRAY, "Vector2");
+    any.append(x, y);
+    return any;
+}
+
+
+const Vector2& Vector2::one() { 
+    static const Vector2 v(1, 1); return v; 
+}
+
+
+const Vector2& Vector2::zero() {
+    static Vector2 v(0, 0);
+    return v;
+}
+
+const Vector2& Vector2::unitX() {
+    static Vector2 v(1, 0);
+    return v;
+}
+
+const Vector2& Vector2::unitY() {
+    static Vector2 v(0, 1);
+    return v;
+}
+
+const Vector2& Vector2::inf() { 
+	static Vector2 v((float)G3D::finf(), (float)G3D::finf());
+	return v; 
+}
+
+
+const Vector2& Vector2::nan() { 
+	static Vector2 v((float)G3D::fnan(), (float)G3D::fnan()); 
+	return v; 
+}
+
+
+const Vector2& Vector2::minFinite() {
+	static Vector2 v(-FLT_MAX, -FLT_MAX); 
+	return v; 
+}
+
+
+const Vector2& Vector2::maxFinite() {
+	static Vector2 v(FLT_MAX, FLT_MAX); 
+	return v; 
+}
+
+
+size_t Vector2::hashCode() const {
+    unsigned int xhash = (*(int*)(void*)(&x));
+    unsigned int yhash = (*(int*)(void*)(&y));
+
+    return xhash + (yhash * 37);
+}
+
+
+Vector2::Vector2(BinaryInput& b) {
+    deserialize(b);
+}
+
+
+void Vector2::deserialize(BinaryInput& b) {
+    x = b.readFloat32();
+    y = b.readFloat32();
+}
+
+
+void Vector2::serialize(BinaryOutput& b) const {
+    b.writeFloat32(x);
+    b.writeFloat32(y);
+}
+
+
+void Vector2::deserialize(TextInput& t) {
+    t.readSymbol("(");
+    x = (float)t.readNumber();
+    t.readSymbol(",");
+    y = (float)t.readNumber();
+    t.readSymbol(")");
+}
+
+
+void Vector2::serialize(TextOutput& t) const {
+   t.writeSymbol("(");
+   t.writeNumber(x);
+   t.writeSymbol(",");
+   t.writeNumber(y);
+   t.writeSymbol(")");
+}
+
+//----------------------------------------------------------------------------
+
+Vector2 Vector2::random(G3D::Random& r) {
+    Vector2 result;
+
+    do {
+        result = Vector2(r.uniform(-1, 1), r.uniform(-1, 1));
+
+    } while (result.squaredLength() >= 1.0f);
+
+    result.unitize();
+
+    return result;
+}
+
+
+Vector2 Vector2::operator/ (float k) const {
+    return *this * (1.0f / k);
+}
+
+Vector2& Vector2::operator/= (float k) {
+    this->x /= k;
+    this->y /= k;
+    return *this;
+}
+
+//----------------------------------------------------------------------------
+float Vector2::unitize (float fTolerance) {
+	float fLength = length();
+
+    if (fLength > fTolerance) {
+		float fInvLength = 1.0f / fLength;
+        x *= fInvLength;
+        y *= fInvLength;
+    } else {
+        fLength = 0.0;
+    }
+
+    return fLength;
+}
+
+//----------------------------------------------------------------------------
+
+std::string Vector2::toString() const {
+    return G3D::format("(%g, %g)", x, y);
+}
+
+// 2-char swizzles
+
+Vector2 Vector2::xx() const  { return Vector2       (x, x); }
+Vector2 Vector2::yx() const  { return Vector2       (y, x); }
+Vector2 Vector2::xy() const  { return Vector2       (x, y); }
+Vector2 Vector2::yy() const  { return Vector2       (y, y); }
+
+// 3-char swizzles
+
+Vector3 Vector2::xxx() const  { return Vector3       (x, x, x); }
+Vector3 Vector2::yxx() const  { return Vector3       (y, x, x); }
+Vector3 Vector2::xyx() const  { return Vector3       (x, y, x); }
+Vector3 Vector2::yyx() const  { return Vector3       (y, y, x); }
+Vector3 Vector2::xxy() const  { return Vector3       (x, x, y); }
+Vector3 Vector2::yxy() const  { return Vector3       (y, x, y); }
+Vector3 Vector2::xyy() const  { return Vector3       (x, y, y); }
+Vector3 Vector2::yyy() const  { return Vector3       (y, y, y); }
+
+// 4-char swizzles
+
+Vector4 Vector2::xxxx() const  { return Vector4       (x, x, x, x); }
+Vector4 Vector2::yxxx() const  { return Vector4       (y, x, x, x); }
+Vector4 Vector2::xyxx() const  { return Vector4       (x, y, x, x); }
+Vector4 Vector2::yyxx() const  { return Vector4       (y, y, x, x); }
+Vector4 Vector2::xxyx() const  { return Vector4       (x, x, y, x); }
+Vector4 Vector2::yxyx() const  { return Vector4       (y, x, y, x); }
+Vector4 Vector2::xyyx() const  { return Vector4       (x, y, y, x); }
+Vector4 Vector2::yyyx() const  { return Vector4       (y, y, y, x); }
+Vector4 Vector2::xxxy() const  { return Vector4       (x, x, x, y); }
+Vector4 Vector2::yxxy() const  { return Vector4       (y, x, x, y); }
+Vector4 Vector2::xyxy() const  { return Vector4       (x, y, x, y); }
+Vector4 Vector2::yyxy() const  { return Vector4       (y, y, x, y); }
+Vector4 Vector2::xxyy() const  { return Vector4       (x, x, y, y); }
+Vector4 Vector2::yxyy() const  { return Vector4       (y, x, y, y); }
+Vector4 Vector2::xyyy() const  { return Vector4       (x, y, y, y); }
+Vector4 Vector2::yyyy() const  { return Vector4       (y, y, y, y); }
+
+
+
+} // namespace
diff --git a/externals/g3dlite/Vector3.cpp b/externals/g3dlite/Vector3.cpp
new file mode 100644
index 00000000000..a53fa8269b7
--- /dev/null
+++ b/externals/g3dlite/Vector3.cpp
@@ -0,0 +1,507 @@
+/**
+ @file Vector3.cpp
+ 
+ 3D vector class
+ 
+ @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+ 
+ @cite Portions based on Dave Eberly's Magic Software Library at http://www.magic-software.com
+ 
+ @created 2001-06-02
+ @edited  2009-11-27
+ */
+
+#include 
+#include 
+#include "G3D/Vector3.h"
+#include "G3D/g3dmath.h"
+#include "G3D/stringutils.h"
+#include "G3D/BinaryInput.h"
+#include "G3D/BinaryOutput.h"
+#include "G3D/TextInput.h"
+#include "G3D/TextOutput.h"
+#include "G3D/Vector3int16.h"
+#include "G3D/Matrix3.h"
+#include "G3D/Vector2.h"
+#include "G3D/Color3.h"
+#include "G3D/Vector4int8.h"
+#include "G3D/Vector3int32.h"
+#include "G3D/Any.h"
+ 
+namespace G3D {
+
+Vector3::Vector3(const Any& any) {
+    any.verifyName("Vector3");
+    any.verifyType(Any::TABLE, Any::ARRAY);
+    any.verifySize(3);
+
+    if (any.type() == Any::ARRAY) {
+        x = any[0];
+        y = any[1];
+        z = any[2];
+    } else {
+        // Table
+        x = any["x"];
+        y = any["y"];
+        z = any["z"];
+    }
+}
+
+Vector3::operator Any() const {
+    Any any(Any::ARRAY, "Vector3");
+    any.append(x, y, z);
+    return any;
+}
+
+Vector3::Vector3(const class Color3& v) : x(v.r), y(v.g), z(v.b) {}
+
+Vector3::Vector3(const class Vector3int32& v) : x((float)v.x), y((float)v.y), z((float)v.z) {}
+
+Vector3::Vector3(const Vector4int8& v) : x(v.x / 127.0f), y(v.y / 127.0f), z(v.z / 127.0f) {}
+
+Vector3::Vector3(const class Vector2& v, float _z) : x(v.x), y(v.y), z(_z) {
+}
+
+Vector3& Vector3::ignore() {
+    static Vector3 v;
+    return v;
+}
+
+const Vector3& Vector3::zero() { static const Vector3 v(0, 0, 0); return v; }
+const Vector3& Vector3::one()      { static const Vector3 v(1, 1, 1); return v; }
+const Vector3& Vector3::unitX()    { static const Vector3 v(1, 0, 0); return v; }
+const Vector3& Vector3::unitY()    { static const Vector3 v(0, 1, 0); return v; }
+const Vector3& Vector3::unitZ()    { static const Vector3 v(0, 0, 1); return v; }
+const Vector3& Vector3::inf()      { static const Vector3 v((float)G3D::finf(), (float)G3D::finf(), (float)G3D::finf()); return v; }
+const Vector3& Vector3::nan()      { static const Vector3 v((float)G3D::fnan(), (float)G3D::fnan(), (float)G3D::fnan()); return v; }
+const Vector3& Vector3::minFinite(){ static const Vector3 v(-FLT_MAX, -FLT_MAX, -FLT_MAX); return v; }
+const Vector3& Vector3::maxFinite(){ static const Vector3 v(FLT_MAX, FLT_MAX, FLT_MAX); return v; }
+
+Vector3::Axis Vector3::primaryAxis() const {
+    
+    Axis a = X_AXIS;
+
+    double nx = abs(x);
+    double ny = abs(y);
+    double nz = abs(z);
+
+    if (nx > ny) {
+        if (nx > nz) {
+            a = X_AXIS;
+        } else {
+            a = Z_AXIS;
+        }
+    } else {
+        if (ny > nz) {
+            a = Y_AXIS;
+        } else {
+            a = Z_AXIS;
+        }
+    }
+
+    return a;
+}
+
+
+size_t Vector3::hashCode() const {
+    unsigned int xhash = (*(int*)(void*)(&x));
+    unsigned int yhash = (*(int*)(void*)(&y));
+    unsigned int zhash = (*(int*)(void*)(&z));
+
+    return xhash + (yhash * 37) + (zhash * 101);
+}
+
+std::ostream& operator<<(std::ostream& os, const Vector3& v) {
+    return os << v.toString();
+}
+
+
+//----------------------------------------------------------------------------
+
+double frand() {
+    return rand() / (double) RAND_MAX;
+}
+
+Vector3::Vector3(TextInput& t) {
+	deserialize(t);
+}
+
+Vector3::Vector3(BinaryInput& b) {
+    deserialize(b);
+}
+
+
+Vector3::Vector3(const class Vector3int16& v) {
+    x = v.x;
+    y = v.y;
+    z = v.z;
+}
+
+
+void Vector3::deserialize(BinaryInput& b) {
+    x = b.readFloat32();
+    y = b.readFloat32();
+    z = b.readFloat32();
+}
+
+
+void Vector3::deserialize(TextInput& t) {
+    t.readSymbol("(");
+    x = (float)t.readNumber();
+    t.readSymbol(",");
+    y = (float)t.readNumber();
+    t.readSymbol(",");
+    z = (float)t.readNumber();
+    t.readSymbol(")");
+}
+
+
+void Vector3::serialize(TextOutput& t) const {
+   t.writeSymbol("(");
+   t.writeNumber(x);
+   t.writeSymbol(",");
+   t.writeNumber(y);
+   t.writeSymbol(",");
+   t.writeNumber(z);
+   t.writeSymbol(")");
+}
+
+
+void Vector3::serialize(BinaryOutput& b) const {
+    b.writeFloat32(x);
+    b.writeFloat32(y);
+    b.writeFloat32(z);
+}
+
+
+Vector3 Vector3::random(Random& r) {
+    Vector3 result;
+    r.sphere(result.x, result.y, result.z);
+    return result;
+}
+
+
+float Vector3::unitize(float fTolerance) {
+    float fMagnitude = magnitude();
+
+    if (fMagnitude > fTolerance) {
+        float fInvMagnitude = 1.0f / fMagnitude;
+        x *= fInvMagnitude;
+        y *= fInvMagnitude;
+        z *= fInvMagnitude;
+    } else {
+        fMagnitude = 0.0f;
+    }
+
+    return fMagnitude;
+}
+
+
+Vector3 Vector3::reflectAbout(const Vector3& normal) const {
+    Vector3 out;
+
+    Vector3 N = normal.direction();
+
+    // 2 * normal.dot(this) * normal - this
+    return N * 2 * this->dot(N) - *this;
+}
+
+
+Vector3 Vector3::cosHemiRandom(const Vector3& normal, Random& r) {
+    debugAssertM(G3D::fuzzyEq(normal.length(), 1.0f), 
+                 "cosHemiRandom requires its argument to have unit length");
+
+    float x, y, z;
+    r.cosHemi(x, y, z);
+
+    // Make a coordinate system
+    const Vector3& Z = normal;
+
+    Vector3 X, Y;
+    normal.getTangents(X, Y);
+
+    return 
+        x * X +
+        y * Y +
+        z * Z;
+}
+
+
+Vector3 Vector3::cosPowHemiRandom(const Vector3& normal, const float k, Random& r) {
+    debugAssertM(G3D::fuzzyEq(normal.length(), 1.0f), 
+                 "cosPowHemiRandom requires its argument to have unit length");
+
+    float x, y, z;
+    r.cosPowHemi(k, x, y, z);
+
+    // Make a coordinate system
+    const Vector3& Z = normal;
+
+    Vector3 X, Y;
+    normal.getTangents(X, Y);
+
+    return 
+        x * X +
+        y * Y +
+        z * Z;
+}
+
+
+Vector3 Vector3::hemiRandom(const Vector3& normal, Random& r) {
+    const Vector3& V = Vector3::random(r);
+
+    if (V.dot(normal) < 0) {
+        return -V;
+    } else {
+        return V;
+    }
+}
+
+//----------------------------------------------------------------------------
+
+Vector3 Vector3::reflectionDirection(const Vector3& normal) const {
+    return -reflectAbout(normal).direction();
+}
+
+//----------------------------------------------------------------------------
+
+Vector3 Vector3::refractionDirection(
+    const Vector3&  normal,
+    float           iInside,
+    float           iOutside) const {
+
+    // From pg. 24 of Henrik Wann Jensen. Realistic Image Synthesis
+    // Using Photon Mapping.  AK Peters. ISBN: 1568811470. July 2001.
+
+    // Invert the directions from Wann Jensen's formulation
+    // and normalize the vectors.
+    const Vector3 W = -direction();
+    Vector3 N = normal.direction();
+
+    float h1 = iOutside;
+    float h2 = iInside;
+
+    if (normal.dot(*this) > 0.0f) {
+        h1 = iInside;
+        h2 = iOutside;
+        N  = -N;
+    }
+
+    const float hRatio = h1 / h2;
+    const float WdotN = W.dot(N);
+
+    float det = 1.0f - (float)square(hRatio) * (1.0f - (float)square(WdotN));
+
+    if (det < 0) {
+        // Total internal reflection
+        return Vector3::zero();
+    } else {
+        return -hRatio * (W - WdotN * N) - N * sqrt(det);
+    }
+}
+
+//----------------------------------------------------------------------------
+void Vector3::orthonormalize (Vector3 akVector[3]) {
+    // If the input vectors are v0, v1, and v2, then the Gram-Schmidt
+    // orthonormalization produces vectors u0, u1, and u2 as follows,
+    //
+    //   u0 = v0/|v0|
+    //   u1 = (v1-(u0*v1)u0)/|v1-(u0*v1)u0|
+    //   u2 = (v2-(u0*v2)u0-(u1*v2)u1)/|v2-(u0*v2)u0-(u1*v2)u1|
+    //
+    // where |A| indicates length of vector A and A*B indicates dot
+    // product of vectors A and B.
+
+    // compute u0
+    akVector[0].unitize();
+
+    // compute u1
+	float fDot0 = akVector[0].dot(akVector[1]);
+    akVector[1] -= akVector[0] * fDot0;
+    akVector[1].unitize();
+
+    // compute u2
+	float fDot1 = akVector[1].dot(akVector[2]);
+    fDot0 = akVector[0].dot(akVector[2]);
+    akVector[2] -= akVector[0] * fDot0 + akVector[1] * fDot1;
+    akVector[2].unitize();
+}
+
+//----------------------------------------------------------------------------
+void Vector3::generateOrthonormalBasis (Vector3& rkU, Vector3& rkV,
+                                        Vector3& rkW, bool bUnitLengthW) {
+    if ( !bUnitLengthW )
+        rkW.unitize();
+
+    if ( G3D::abs(rkW.x) >= G3D::abs(rkW.y)
+            && G3D::abs(rkW.x) >= G3D::abs(rkW.z) ) {
+        rkU.x = -rkW.y;
+        rkU.y = + rkW.x;
+        rkU.z = 0.0;
+    } else {
+        rkU.x = 0.0;
+        rkU.y = + rkW.z;
+        rkU.z = -rkW.y;
+    }
+
+    rkU.unitize();
+    rkV = rkW.cross(rkU);
+}
+
+//----------------------------------------------------------------------------
+
+std::string Vector3::toString() const {
+    return G3D::format("(%g, %g, %g)", x, y, z);
+}
+
+
+//----------------------------------------------------------------------------
+
+Matrix3 Vector3::cross() const {
+    return Matrix3( 0, -z,  y,
+                    z,  0, -x,
+                   -y,  x,  0);
+}
+
+
+void serialize(const Vector3::Axis& a, class BinaryOutput& bo) {
+    bo.writeUInt8((uint8)a);
+}
+
+void deserialize(Vector3::Axis& a, class BinaryInput& bi) {
+    a = (Vector3::Axis)bi.readUInt8();
+}
+
+//----------------------------------------------------------------------------
+// 2-char swizzles
+
+Vector2 Vector3::xx() const  { return Vector2       (x, x); }
+Vector2 Vector3::yx() const  { return Vector2       (y, x); }
+Vector2 Vector3::zx() const  { return Vector2       (z, x); }
+Vector2 Vector3::xy() const  { return Vector2       (x, y); }
+Vector2 Vector3::yy() const  { return Vector2       (y, y); }
+Vector2 Vector3::zy() const  { return Vector2       (z, y); }
+Vector2 Vector3::xz() const  { return Vector2       (x, z); }
+Vector2 Vector3::yz() const  { return Vector2       (y, z); }
+Vector2 Vector3::zz() const  { return Vector2       (z, z); }
+
+// 3-char swizzles
+
+Vector3 Vector3::xxx() const  { return Vector3       (x, x, x); }
+Vector3 Vector3::yxx() const  { return Vector3       (y, x, x); }
+Vector3 Vector3::zxx() const  { return Vector3       (z, x, x); }
+Vector3 Vector3::xyx() const  { return Vector3       (x, y, x); }
+Vector3 Vector3::yyx() const  { return Vector3       (y, y, x); }
+Vector3 Vector3::zyx() const  { return Vector3       (z, y, x); }
+Vector3 Vector3::xzx() const  { return Vector3       (x, z, x); }
+Vector3 Vector3::yzx() const  { return Vector3       (y, z, x); }
+Vector3 Vector3::zzx() const  { return Vector3       (z, z, x); }
+Vector3 Vector3::xxy() const  { return Vector3       (x, x, y); }
+Vector3 Vector3::yxy() const  { return Vector3       (y, x, y); }
+Vector3 Vector3::zxy() const  { return Vector3       (z, x, y); }
+Vector3 Vector3::xyy() const  { return Vector3       (x, y, y); }
+Vector3 Vector3::yyy() const  { return Vector3       (y, y, y); }
+Vector3 Vector3::zyy() const  { return Vector3       (z, y, y); }
+Vector3 Vector3::xzy() const  { return Vector3       (x, z, y); }
+Vector3 Vector3::yzy() const  { return Vector3       (y, z, y); }
+Vector3 Vector3::zzy() const  { return Vector3       (z, z, y); }
+Vector3 Vector3::xxz() const  { return Vector3       (x, x, z); }
+Vector3 Vector3::yxz() const  { return Vector3       (y, x, z); }
+Vector3 Vector3::zxz() const  { return Vector3       (z, x, z); }
+Vector3 Vector3::xyz() const  { return Vector3       (x, y, z); }
+Vector3 Vector3::yyz() const  { return Vector3       (y, y, z); }
+Vector3 Vector3::zyz() const  { return Vector3       (z, y, z); }
+Vector3 Vector3::xzz() const  { return Vector3       (x, z, z); }
+Vector3 Vector3::yzz() const  { return Vector3       (y, z, z); }
+Vector3 Vector3::zzz() const  { return Vector3       (z, z, z); }
+
+// 4-char swizzles
+
+Vector4 Vector3::xxxx() const  { return Vector4       (x, x, x, x); }
+Vector4 Vector3::yxxx() const  { return Vector4       (y, x, x, x); }
+Vector4 Vector3::zxxx() const  { return Vector4       (z, x, x, x); }
+Vector4 Vector3::xyxx() const  { return Vector4       (x, y, x, x); }
+Vector4 Vector3::yyxx() const  { return Vector4       (y, y, x, x); }
+Vector4 Vector3::zyxx() const  { return Vector4       (z, y, x, x); }
+Vector4 Vector3::xzxx() const  { return Vector4       (x, z, x, x); }
+Vector4 Vector3::yzxx() const  { return Vector4       (y, z, x, x); }
+Vector4 Vector3::zzxx() const  { return Vector4       (z, z, x, x); }
+Vector4 Vector3::xxyx() const  { return Vector4       (x, x, y, x); }
+Vector4 Vector3::yxyx() const  { return Vector4       (y, x, y, x); }
+Vector4 Vector3::zxyx() const  { return Vector4       (z, x, y, x); }
+Vector4 Vector3::xyyx() const  { return Vector4       (x, y, y, x); }
+Vector4 Vector3::yyyx() const  { return Vector4       (y, y, y, x); }
+Vector4 Vector3::zyyx() const  { return Vector4       (z, y, y, x); }
+Vector4 Vector3::xzyx() const  { return Vector4       (x, z, y, x); }
+Vector4 Vector3::yzyx() const  { return Vector4       (y, z, y, x); }
+Vector4 Vector3::zzyx() const  { return Vector4       (z, z, y, x); }
+Vector4 Vector3::xxzx() const  { return Vector4       (x, x, z, x); }
+Vector4 Vector3::yxzx() const  { return Vector4       (y, x, z, x); }
+Vector4 Vector3::zxzx() const  { return Vector4       (z, x, z, x); }
+Vector4 Vector3::xyzx() const  { return Vector4       (x, y, z, x); }
+Vector4 Vector3::yyzx() const  { return Vector4       (y, y, z, x); }
+Vector4 Vector3::zyzx() const  { return Vector4       (z, y, z, x); }
+Vector4 Vector3::xzzx() const  { return Vector4       (x, z, z, x); }
+Vector4 Vector3::yzzx() const  { return Vector4       (y, z, z, x); }
+Vector4 Vector3::zzzx() const  { return Vector4       (z, z, z, x); }
+Vector4 Vector3::xxxy() const  { return Vector4       (x, x, x, y); }
+Vector4 Vector3::yxxy() const  { return Vector4       (y, x, x, y); }
+Vector4 Vector3::zxxy() const  { return Vector4       (z, x, x, y); }
+Vector4 Vector3::xyxy() const  { return Vector4       (x, y, x, y); }
+Vector4 Vector3::yyxy() const  { return Vector4       (y, y, x, y); }
+Vector4 Vector3::zyxy() const  { return Vector4       (z, y, x, y); }
+Vector4 Vector3::xzxy() const  { return Vector4       (x, z, x, y); }
+Vector4 Vector3::yzxy() const  { return Vector4       (y, z, x, y); }
+Vector4 Vector3::zzxy() const  { return Vector4       (z, z, x, y); }
+Vector4 Vector3::xxyy() const  { return Vector4       (x, x, y, y); }
+Vector4 Vector3::yxyy() const  { return Vector4       (y, x, y, y); }
+Vector4 Vector3::zxyy() const  { return Vector4       (z, x, y, y); }
+Vector4 Vector3::xyyy() const  { return Vector4       (x, y, y, y); }
+Vector4 Vector3::yyyy() const  { return Vector4       (y, y, y, y); }
+Vector4 Vector3::zyyy() const  { return Vector4       (z, y, y, y); }
+Vector4 Vector3::xzyy() const  { return Vector4       (x, z, y, y); }
+Vector4 Vector3::yzyy() const  { return Vector4       (y, z, y, y); }
+Vector4 Vector3::zzyy() const  { return Vector4       (z, z, y, y); }
+Vector4 Vector3::xxzy() const  { return Vector4       (x, x, z, y); }
+Vector4 Vector3::yxzy() const  { return Vector4       (y, x, z, y); }
+Vector4 Vector3::zxzy() const  { return Vector4       (z, x, z, y); }
+Vector4 Vector3::xyzy() const  { return Vector4       (x, y, z, y); }
+Vector4 Vector3::yyzy() const  { return Vector4       (y, y, z, y); }
+Vector4 Vector3::zyzy() const  { return Vector4       (z, y, z, y); }
+Vector4 Vector3::xzzy() const  { return Vector4       (x, z, z, y); }
+Vector4 Vector3::yzzy() const  { return Vector4       (y, z, z, y); }
+Vector4 Vector3::zzzy() const  { return Vector4       (z, z, z, y); }
+Vector4 Vector3::xxxz() const  { return Vector4       (x, x, x, z); }
+Vector4 Vector3::yxxz() const  { return Vector4       (y, x, x, z); }
+Vector4 Vector3::zxxz() const  { return Vector4       (z, x, x, z); }
+Vector4 Vector3::xyxz() const  { return Vector4       (x, y, x, z); }
+Vector4 Vector3::yyxz() const  { return Vector4       (y, y, x, z); }
+Vector4 Vector3::zyxz() const  { return Vector4       (z, y, x, z); }
+Vector4 Vector3::xzxz() const  { return Vector4       (x, z, x, z); }
+Vector4 Vector3::yzxz() const  { return Vector4       (y, z, x, z); }
+Vector4 Vector3::zzxz() const  { return Vector4       (z, z, x, z); }
+Vector4 Vector3::xxyz() const  { return Vector4       (x, x, y, z); }
+Vector4 Vector3::yxyz() const  { return Vector4       (y, x, y, z); }
+Vector4 Vector3::zxyz() const  { return Vector4       (z, x, y, z); }
+Vector4 Vector3::xyyz() const  { return Vector4       (x, y, y, z); }
+Vector4 Vector3::yyyz() const  { return Vector4       (y, y, y, z); }
+Vector4 Vector3::zyyz() const  { return Vector4       (z, y, y, z); }
+Vector4 Vector3::xzyz() const  { return Vector4       (x, z, y, z); }
+Vector4 Vector3::yzyz() const  { return Vector4       (y, z, y, z); }
+Vector4 Vector3::zzyz() const  { return Vector4       (z, z, y, z); }
+Vector4 Vector3::xxzz() const  { return Vector4       (x, x, z, z); }
+Vector4 Vector3::yxzz() const  { return Vector4       (y, x, z, z); }
+Vector4 Vector3::zxzz() const  { return Vector4       (z, x, z, z); }
+Vector4 Vector3::xyzz() const  { return Vector4       (x, y, z, z); }
+Vector4 Vector3::yyzz() const  { return Vector4       (y, y, z, z); }
+Vector4 Vector3::zyzz() const  { return Vector4       (z, y, z, z); }
+Vector4 Vector3::xzzz() const  { return Vector4       (x, z, z, z); }
+Vector4 Vector3::yzzz() const  { return Vector4       (y, z, z, z); }
+Vector4 Vector3::zzzz() const  { return Vector4       (z, z, z, z); }
+
+
+
+
+
+
+} // namespace
diff --git a/externals/g3dlite/Vector4.cpp b/externals/g3dlite/Vector4.cpp
new file mode 100644
index 00000000000..f6abc1a6e0c
--- /dev/null
+++ b/externals/g3dlite/Vector4.cpp
@@ -0,0 +1,520 @@
+/**
+ @file Vector4.cpp
+ 
+ @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+  
+ @created 2001-07-09
+ @edited  2009-11-29
+ */
+
+#include 
+#include 
+#include "G3D/Vector4.h"
+#include "G3D/Color4.h"
+#include "G3D/g3dmath.h"
+#include "G3D/stringutils.h"
+#include "G3D/BinaryInput.h"
+#include "G3D/BinaryOutput.h"
+#include "G3D/Vector4int8.h"
+#include "G3D/Matrix4.h"
+#include "G3D/Any.h"
+
+namespace G3D {
+
+Vector4::Vector4(const Any& any) {
+    any.verifyName("Vector4");
+    any.verifyType(Any::TABLE, Any::ARRAY);
+    any.verifySize(4);
+
+    if (any.type() == Any::ARRAY) {
+        x = any[0];
+        y = any[1];
+        z = any[2];
+        w = any[3];
+    } else {
+        // Table
+        x = any["x"];
+        y = any["y"];
+        z = any["z"];
+        w = any["w"];
+    }
+}
+
+Vector4::operator Any() const {
+    Any any(Any::ARRAY, "Vector4");
+    any.append(x, y, z, w);
+    return any;
+}
+
+
+Vector4::Vector4(const Vector4int8& v) : x(v.x / 127.0f), y(v.y / 127.0f), z(v.z / 127.0f), w(v.w / 127.0f) {
+}
+
+
+const Vector4& Vector4::inf() { 
+    static const Vector4 v((float)G3D::finf(), (float)G3D::finf(), (float)G3D::finf(), (float)G3D::finf()); 
+    return v; 
+}
+
+
+const Vector4& Vector4::zero() { 
+    static const Vector4 v(0,0,0,0); 
+    return v;
+}
+
+const Vector4& Vector4::nan() { 
+    static Vector4 v((float)G3D::fnan(), (float)G3D::fnan(), (float)G3D::fnan(), (float)G3D::fnan()); 
+    return v; 
+}
+
+
+size_t Vector4::hashCode() const {
+    unsigned int xhash = (*(int*)(void*)(&x));
+    unsigned int yhash = (*(int*)(void*)(&y));
+    unsigned int zhash = (*(int*)(void*)(&z));
+    unsigned int whash = (*(int*)(void*)(&w));
+
+    return xhash + (yhash * 37) + (zhash * 101) + (whash * 241);
+}
+
+
+Vector4::Vector4(const class Color4& c) {
+    x = c.r;
+    y = c.g;
+    z = c.b;
+    w = c.a;
+}
+
+
+Vector4::Vector4(const Vector2& v1, const Vector2& v2) {
+    x = v1.x;
+    y = v1.y;
+    z = v2.x;
+    w = v2.y;
+}
+
+
+Vector4::Vector4(const Vector2& v1, float fz, float fw) {
+    x = v1.x;
+    y = v1.y;
+    z = fz;
+    w = fw;
+}
+
+Vector4::Vector4(BinaryInput& b) {
+    deserialize(b);
+}
+
+
+void Vector4::deserialize(BinaryInput& b) {
+    x = b.readFloat32();
+    y = b.readFloat32();
+    z = b.readFloat32();
+    w = b.readFloat32();
+}
+
+
+void Vector4::serialize(BinaryOutput& b) const {
+    b.writeFloat32(x);
+    b.writeFloat32(y);
+    b.writeFloat32(z);
+    b.writeFloat32(w);
+}
+
+//----------------------------------------------------------------------------
+
+Vector4 Vector4::operator*(const Matrix4& M) const {
+    Vector4 result;
+    for (int i = 0; i < 4; ++i) {
+        result[i] = 0.0f;
+        for (int j = 0; j < 4; ++j) {
+            result[i] += (*this)[j] * M[j][i];
+        }
+    }
+    return result;
+}
+
+
+Vector4 Vector4::operator/ (float fScalar) const {
+    Vector4 kQuot;
+
+    if ( fScalar != 0.0 ) {
+		float fInvScalar = 1.0f / fScalar;
+        kQuot.x = fInvScalar * x;
+        kQuot.y = fInvScalar * y;
+        kQuot.z = fInvScalar * z;
+        kQuot.w = fInvScalar * w;
+        return kQuot;
+    } else {
+        return Vector4::inf();
+    }
+}
+
+//----------------------------------------------------------------------------
+Vector4& Vector4::operator/= (float fScalar) {
+    if (fScalar != 0.0f) {
+		float fInvScalar = 1.0f / fScalar;
+        x *= fInvScalar;
+        y *= fInvScalar;
+        z *= fInvScalar;
+        w *= fInvScalar;
+    } else {
+		*this = Vector4::inf();
+    }
+
+    return *this;
+}
+
+
+//----------------------------------------------------------------------------
+
+std::string Vector4::toString() const {
+    return G3D::format("(%g, %g, %g, %g)", x, y, z, w);
+}
+// 2-char swizzles
+
+Vector2 Vector4::xx() const  { return Vector2       (x, x); }
+Vector2 Vector4::yx() const  { return Vector2       (y, x); }
+Vector2 Vector4::zx() const  { return Vector2       (z, x); }
+Vector2 Vector4::wx() const  { return Vector2       (w, x); }
+Vector2 Vector4::xy() const  { return Vector2       (x, y); }
+Vector2 Vector4::yy() const  { return Vector2       (y, y); }
+Vector2 Vector4::zy() const  { return Vector2       (z, y); }
+Vector2 Vector4::wy() const  { return Vector2       (w, y); }
+Vector2 Vector4::xz() const  { return Vector2       (x, z); }
+Vector2 Vector4::yz() const  { return Vector2       (y, z); }
+Vector2 Vector4::zz() const  { return Vector2       (z, z); }
+Vector2 Vector4::wz() const  { return Vector2       (w, z); }
+Vector2 Vector4::xw() const  { return Vector2       (x, w); }
+Vector2 Vector4::yw() const  { return Vector2       (y, w); }
+Vector2 Vector4::zw() const  { return Vector2       (z, w); }
+Vector2 Vector4::ww() const  { return Vector2       (w, w); }
+
+// 3-char swizzles
+
+Vector3 Vector4::xxx() const  { return Vector3       (x, x, x); }
+Vector3 Vector4::yxx() const  { return Vector3       (y, x, x); }
+Vector3 Vector4::zxx() const  { return Vector3       (z, x, x); }
+Vector3 Vector4::wxx() const  { return Vector3       (w, x, x); }
+Vector3 Vector4::xyx() const  { return Vector3       (x, y, x); }
+Vector3 Vector4::yyx() const  { return Vector3       (y, y, x); }
+Vector3 Vector4::zyx() const  { return Vector3       (z, y, x); }
+Vector3 Vector4::wyx() const  { return Vector3       (w, y, x); }
+Vector3 Vector4::xzx() const  { return Vector3       (x, z, x); }
+Vector3 Vector4::yzx() const  { return Vector3       (y, z, x); }
+Vector3 Vector4::zzx() const  { return Vector3       (z, z, x); }
+Vector3 Vector4::wzx() const  { return Vector3       (w, z, x); }
+Vector3 Vector4::xwx() const  { return Vector3       (x, w, x); }
+Vector3 Vector4::ywx() const  { return Vector3       (y, w, x); }
+Vector3 Vector4::zwx() const  { return Vector3       (z, w, x); }
+Vector3 Vector4::wwx() const  { return Vector3       (w, w, x); }
+Vector3 Vector4::xxy() const  { return Vector3       (x, x, y); }
+Vector3 Vector4::yxy() const  { return Vector3       (y, x, y); }
+Vector3 Vector4::zxy() const  { return Vector3       (z, x, y); }
+Vector3 Vector4::wxy() const  { return Vector3       (w, x, y); }
+Vector3 Vector4::xyy() const  { return Vector3       (x, y, y); }
+Vector3 Vector4::yyy() const  { return Vector3       (y, y, y); }
+Vector3 Vector4::zyy() const  { return Vector3       (z, y, y); }
+Vector3 Vector4::wyy() const  { return Vector3       (w, y, y); }
+Vector3 Vector4::xzy() const  { return Vector3       (x, z, y); }
+Vector3 Vector4::yzy() const  { return Vector3       (y, z, y); }
+Vector3 Vector4::zzy() const  { return Vector3       (z, z, y); }
+Vector3 Vector4::wzy() const  { return Vector3       (w, z, y); }
+Vector3 Vector4::xwy() const  { return Vector3       (x, w, y); }
+Vector3 Vector4::ywy() const  { return Vector3       (y, w, y); }
+Vector3 Vector4::zwy() const  { return Vector3       (z, w, y); }
+Vector3 Vector4::wwy() const  { return Vector3       (w, w, y); }
+Vector3 Vector4::xxz() const  { return Vector3       (x, x, z); }
+Vector3 Vector4::yxz() const  { return Vector3       (y, x, z); }
+Vector3 Vector4::zxz() const  { return Vector3       (z, x, z); }
+Vector3 Vector4::wxz() const  { return Vector3       (w, x, z); }
+Vector3 Vector4::xyz() const  { return Vector3       (x, y, z); }
+Vector3 Vector4::yyz() const  { return Vector3       (y, y, z); }
+Vector3 Vector4::zyz() const  { return Vector3       (z, y, z); }
+Vector3 Vector4::wyz() const  { return Vector3       (w, y, z); }
+Vector3 Vector4::xzz() const  { return Vector3       (x, z, z); }
+Vector3 Vector4::yzz() const  { return Vector3       (y, z, z); }
+Vector3 Vector4::zzz() const  { return Vector3       (z, z, z); }
+Vector3 Vector4::wzz() const  { return Vector3       (w, z, z); }
+Vector3 Vector4::xwz() const  { return Vector3       (x, w, z); }
+Vector3 Vector4::ywz() const  { return Vector3       (y, w, z); }
+Vector3 Vector4::zwz() const  { return Vector3       (z, w, z); }
+Vector3 Vector4::wwz() const  { return Vector3       (w, w, z); }
+Vector3 Vector4::xxw() const  { return Vector3       (x, x, w); }
+Vector3 Vector4::yxw() const  { return Vector3       (y, x, w); }
+Vector3 Vector4::zxw() const  { return Vector3       (z, x, w); }
+Vector3 Vector4::wxw() const  { return Vector3       (w, x, w); }
+Vector3 Vector4::xyw() const  { return Vector3       (x, y, w); }
+Vector3 Vector4::yyw() const  { return Vector3       (y, y, w); }
+Vector3 Vector4::zyw() const  { return Vector3       (z, y, w); }
+Vector3 Vector4::wyw() const  { return Vector3       (w, y, w); }
+Vector3 Vector4::xzw() const  { return Vector3       (x, z, w); }
+Vector3 Vector4::yzw() const  { return Vector3       (y, z, w); }
+Vector3 Vector4::zzw() const  { return Vector3       (z, z, w); }
+Vector3 Vector4::wzw() const  { return Vector3       (w, z, w); }
+Vector3 Vector4::xww() const  { return Vector3       (x, w, w); }
+Vector3 Vector4::yww() const  { return Vector3       (y, w, w); }
+Vector3 Vector4::zww() const  { return Vector3       (z, w, w); }
+Vector3 Vector4::www() const  { return Vector3       (w, w, w); }
+
+// 4-char swizzles
+
+Vector4 Vector4::xxxx() const  { return Vector4       (x, x, x, x); }
+Vector4 Vector4::yxxx() const  { return Vector4       (y, x, x, x); }
+Vector4 Vector4::zxxx() const  { return Vector4       (z, x, x, x); }
+Vector4 Vector4::wxxx() const  { return Vector4       (w, x, x, x); }
+Vector4 Vector4::xyxx() const  { return Vector4       (x, y, x, x); }
+Vector4 Vector4::yyxx() const  { return Vector4       (y, y, x, x); }
+Vector4 Vector4::zyxx() const  { return Vector4       (z, y, x, x); }
+Vector4 Vector4::wyxx() const  { return Vector4       (w, y, x, x); }
+Vector4 Vector4::xzxx() const  { return Vector4       (x, z, x, x); }
+Vector4 Vector4::yzxx() const  { return Vector4       (y, z, x, x); }
+Vector4 Vector4::zzxx() const  { return Vector4       (z, z, x, x); }
+Vector4 Vector4::wzxx() const  { return Vector4       (w, z, x, x); }
+Vector4 Vector4::xwxx() const  { return Vector4       (x, w, x, x); }
+Vector4 Vector4::ywxx() const  { return Vector4       (y, w, x, x); }
+Vector4 Vector4::zwxx() const  { return Vector4       (z, w, x, x); }
+Vector4 Vector4::wwxx() const  { return Vector4       (w, w, x, x); }
+Vector4 Vector4::xxyx() const  { return Vector4       (x, x, y, x); }
+Vector4 Vector4::yxyx() const  { return Vector4       (y, x, y, x); }
+Vector4 Vector4::zxyx() const  { return Vector4       (z, x, y, x); }
+Vector4 Vector4::wxyx() const  { return Vector4       (w, x, y, x); }
+Vector4 Vector4::xyyx() const  { return Vector4       (x, y, y, x); }
+Vector4 Vector4::yyyx() const  { return Vector4       (y, y, y, x); }
+Vector4 Vector4::zyyx() const  { return Vector4       (z, y, y, x); }
+Vector4 Vector4::wyyx() const  { return Vector4       (w, y, y, x); }
+Vector4 Vector4::xzyx() const  { return Vector4       (x, z, y, x); }
+Vector4 Vector4::yzyx() const  { return Vector4       (y, z, y, x); }
+Vector4 Vector4::zzyx() const  { return Vector4       (z, z, y, x); }
+Vector4 Vector4::wzyx() const  { return Vector4       (w, z, y, x); }
+Vector4 Vector4::xwyx() const  { return Vector4       (x, w, y, x); }
+Vector4 Vector4::ywyx() const  { return Vector4       (y, w, y, x); }
+Vector4 Vector4::zwyx() const  { return Vector4       (z, w, y, x); }
+Vector4 Vector4::wwyx() const  { return Vector4       (w, w, y, x); }
+Vector4 Vector4::xxzx() const  { return Vector4       (x, x, z, x); }
+Vector4 Vector4::yxzx() const  { return Vector4       (y, x, z, x); }
+Vector4 Vector4::zxzx() const  { return Vector4       (z, x, z, x); }
+Vector4 Vector4::wxzx() const  { return Vector4       (w, x, z, x); }
+Vector4 Vector4::xyzx() const  { return Vector4       (x, y, z, x); }
+Vector4 Vector4::yyzx() const  { return Vector4       (y, y, z, x); }
+Vector4 Vector4::zyzx() const  { return Vector4       (z, y, z, x); }
+Vector4 Vector4::wyzx() const  { return Vector4       (w, y, z, x); }
+Vector4 Vector4::xzzx() const  { return Vector4       (x, z, z, x); }
+Vector4 Vector4::yzzx() const  { return Vector4       (y, z, z, x); }
+Vector4 Vector4::zzzx() const  { return Vector4       (z, z, z, x); }
+Vector4 Vector4::wzzx() const  { return Vector4       (w, z, z, x); }
+Vector4 Vector4::xwzx() const  { return Vector4       (x, w, z, x); }
+Vector4 Vector4::ywzx() const  { return Vector4       (y, w, z, x); }
+Vector4 Vector4::zwzx() const  { return Vector4       (z, w, z, x); }
+Vector4 Vector4::wwzx() const  { return Vector4       (w, w, z, x); }
+Vector4 Vector4::xxwx() const  { return Vector4       (x, x, w, x); }
+Vector4 Vector4::yxwx() const  { return Vector4       (y, x, w, x); }
+Vector4 Vector4::zxwx() const  { return Vector4       (z, x, w, x); }
+Vector4 Vector4::wxwx() const  { return Vector4       (w, x, w, x); }
+Vector4 Vector4::xywx() const  { return Vector4       (x, y, w, x); }
+Vector4 Vector4::yywx() const  { return Vector4       (y, y, w, x); }
+Vector4 Vector4::zywx() const  { return Vector4       (z, y, w, x); }
+Vector4 Vector4::wywx() const  { return Vector4       (w, y, w, x); }
+Vector4 Vector4::xzwx() const  { return Vector4       (x, z, w, x); }
+Vector4 Vector4::yzwx() const  { return Vector4       (y, z, w, x); }
+Vector4 Vector4::zzwx() const  { return Vector4       (z, z, w, x); }
+Vector4 Vector4::wzwx() const  { return Vector4       (w, z, w, x); }
+Vector4 Vector4::xwwx() const  { return Vector4       (x, w, w, x); }
+Vector4 Vector4::ywwx() const  { return Vector4       (y, w, w, x); }
+Vector4 Vector4::zwwx() const  { return Vector4       (z, w, w, x); }
+Vector4 Vector4::wwwx() const  { return Vector4       (w, w, w, x); }
+Vector4 Vector4::xxxy() const  { return Vector4       (x, x, x, y); }
+Vector4 Vector4::yxxy() const  { return Vector4       (y, x, x, y); }
+Vector4 Vector4::zxxy() const  { return Vector4       (z, x, x, y); }
+Vector4 Vector4::wxxy() const  { return Vector4       (w, x, x, y); }
+Vector4 Vector4::xyxy() const  { return Vector4       (x, y, x, y); }
+Vector4 Vector4::yyxy() const  { return Vector4       (y, y, x, y); }
+Vector4 Vector4::zyxy() const  { return Vector4       (z, y, x, y); }
+Vector4 Vector4::wyxy() const  { return Vector4       (w, y, x, y); }
+Vector4 Vector4::xzxy() const  { return Vector4       (x, z, x, y); }
+Vector4 Vector4::yzxy() const  { return Vector4       (y, z, x, y); }
+Vector4 Vector4::zzxy() const  { return Vector4       (z, z, x, y); }
+Vector4 Vector4::wzxy() const  { return Vector4       (w, z, x, y); }
+Vector4 Vector4::xwxy() const  { return Vector4       (x, w, x, y); }
+Vector4 Vector4::ywxy() const  { return Vector4       (y, w, x, y); }
+Vector4 Vector4::zwxy() const  { return Vector4       (z, w, x, y); }
+Vector4 Vector4::wwxy() const  { return Vector4       (w, w, x, y); }
+Vector4 Vector4::xxyy() const  { return Vector4       (x, x, y, y); }
+Vector4 Vector4::yxyy() const  { return Vector4       (y, x, y, y); }
+Vector4 Vector4::zxyy() const  { return Vector4       (z, x, y, y); }
+Vector4 Vector4::wxyy() const  { return Vector4       (w, x, y, y); }
+Vector4 Vector4::xyyy() const  { return Vector4       (x, y, y, y); }
+Vector4 Vector4::yyyy() const  { return Vector4       (y, y, y, y); }
+Vector4 Vector4::zyyy() const  { return Vector4       (z, y, y, y); }
+Vector4 Vector4::wyyy() const  { return Vector4       (w, y, y, y); }
+Vector4 Vector4::xzyy() const  { return Vector4       (x, z, y, y); }
+Vector4 Vector4::yzyy() const  { return Vector4       (y, z, y, y); }
+Vector4 Vector4::zzyy() const  { return Vector4       (z, z, y, y); }
+Vector4 Vector4::wzyy() const  { return Vector4       (w, z, y, y); }
+Vector4 Vector4::xwyy() const  { return Vector4       (x, w, y, y); }
+Vector4 Vector4::ywyy() const  { return Vector4       (y, w, y, y); }
+Vector4 Vector4::zwyy() const  { return Vector4       (z, w, y, y); }
+Vector4 Vector4::wwyy() const  { return Vector4       (w, w, y, y); }
+Vector4 Vector4::xxzy() const  { return Vector4       (x, x, z, y); }
+Vector4 Vector4::yxzy() const  { return Vector4       (y, x, z, y); }
+Vector4 Vector4::zxzy() const  { return Vector4       (z, x, z, y); }
+Vector4 Vector4::wxzy() const  { return Vector4       (w, x, z, y); }
+Vector4 Vector4::xyzy() const  { return Vector4       (x, y, z, y); }
+Vector4 Vector4::yyzy() const  { return Vector4       (y, y, z, y); }
+Vector4 Vector4::zyzy() const  { return Vector4       (z, y, z, y); }
+Vector4 Vector4::wyzy() const  { return Vector4       (w, y, z, y); }
+Vector4 Vector4::xzzy() const  { return Vector4       (x, z, z, y); }
+Vector4 Vector4::yzzy() const  { return Vector4       (y, z, z, y); }
+Vector4 Vector4::zzzy() const  { return Vector4       (z, z, z, y); }
+Vector4 Vector4::wzzy() const  { return Vector4       (w, z, z, y); }
+Vector4 Vector4::xwzy() const  { return Vector4       (x, w, z, y); }
+Vector4 Vector4::ywzy() const  { return Vector4       (y, w, z, y); }
+Vector4 Vector4::zwzy() const  { return Vector4       (z, w, z, y); }
+Vector4 Vector4::wwzy() const  { return Vector4       (w, w, z, y); }
+Vector4 Vector4::xxwy() const  { return Vector4       (x, x, w, y); }
+Vector4 Vector4::yxwy() const  { return Vector4       (y, x, w, y); }
+Vector4 Vector4::zxwy() const  { return Vector4       (z, x, w, y); }
+Vector4 Vector4::wxwy() const  { return Vector4       (w, x, w, y); }
+Vector4 Vector4::xywy() const  { return Vector4       (x, y, w, y); }
+Vector4 Vector4::yywy() const  { return Vector4       (y, y, w, y); }
+Vector4 Vector4::zywy() const  { return Vector4       (z, y, w, y); }
+Vector4 Vector4::wywy() const  { return Vector4       (w, y, w, y); }
+Vector4 Vector4::xzwy() const  { return Vector4       (x, z, w, y); }
+Vector4 Vector4::yzwy() const  { return Vector4       (y, z, w, y); }
+Vector4 Vector4::zzwy() const  { return Vector4       (z, z, w, y); }
+Vector4 Vector4::wzwy() const  { return Vector4       (w, z, w, y); }
+Vector4 Vector4::xwwy() const  { return Vector4       (x, w, w, y); }
+Vector4 Vector4::ywwy() const  { return Vector4       (y, w, w, y); }
+Vector4 Vector4::zwwy() const  { return Vector4       (z, w, w, y); }
+Vector4 Vector4::wwwy() const  { return Vector4       (w, w, w, y); }
+Vector4 Vector4::xxxz() const  { return Vector4       (x, x, x, z); }
+Vector4 Vector4::yxxz() const  { return Vector4       (y, x, x, z); }
+Vector4 Vector4::zxxz() const  { return Vector4       (z, x, x, z); }
+Vector4 Vector4::wxxz() const  { return Vector4       (w, x, x, z); }
+Vector4 Vector4::xyxz() const  { return Vector4       (x, y, x, z); }
+Vector4 Vector4::yyxz() const  { return Vector4       (y, y, x, z); }
+Vector4 Vector4::zyxz() const  { return Vector4       (z, y, x, z); }
+Vector4 Vector4::wyxz() const  { return Vector4       (w, y, x, z); }
+Vector4 Vector4::xzxz() const  { return Vector4       (x, z, x, z); }
+Vector4 Vector4::yzxz() const  { return Vector4       (y, z, x, z); }
+Vector4 Vector4::zzxz() const  { return Vector4       (z, z, x, z); }
+Vector4 Vector4::wzxz() const  { return Vector4       (w, z, x, z); }
+Vector4 Vector4::xwxz() const  { return Vector4       (x, w, x, z); }
+Vector4 Vector4::ywxz() const  { return Vector4       (y, w, x, z); }
+Vector4 Vector4::zwxz() const  { return Vector4       (z, w, x, z); }
+Vector4 Vector4::wwxz() const  { return Vector4       (w, w, x, z); }
+Vector4 Vector4::xxyz() const  { return Vector4       (x, x, y, z); }
+Vector4 Vector4::yxyz() const  { return Vector4       (y, x, y, z); }
+Vector4 Vector4::zxyz() const  { return Vector4       (z, x, y, z); }
+Vector4 Vector4::wxyz() const  { return Vector4       (w, x, y, z); }
+Vector4 Vector4::xyyz() const  { return Vector4       (x, y, y, z); }
+Vector4 Vector4::yyyz() const  { return Vector4       (y, y, y, z); }
+Vector4 Vector4::zyyz() const  { return Vector4       (z, y, y, z); }
+Vector4 Vector4::wyyz() const  { return Vector4       (w, y, y, z); }
+Vector4 Vector4::xzyz() const  { return Vector4       (x, z, y, z); }
+Vector4 Vector4::yzyz() const  { return Vector4       (y, z, y, z); }
+Vector4 Vector4::zzyz() const  { return Vector4       (z, z, y, z); }
+Vector4 Vector4::wzyz() const  { return Vector4       (w, z, y, z); }
+Vector4 Vector4::xwyz() const  { return Vector4       (x, w, y, z); }
+Vector4 Vector4::ywyz() const  { return Vector4       (y, w, y, z); }
+Vector4 Vector4::zwyz() const  { return Vector4       (z, w, y, z); }
+Vector4 Vector4::wwyz() const  { return Vector4       (w, w, y, z); }
+Vector4 Vector4::xxzz() const  { return Vector4       (x, x, z, z); }
+Vector4 Vector4::yxzz() const  { return Vector4       (y, x, z, z); }
+Vector4 Vector4::zxzz() const  { return Vector4       (z, x, z, z); }
+Vector4 Vector4::wxzz() const  { return Vector4       (w, x, z, z); }
+Vector4 Vector4::xyzz() const  { return Vector4       (x, y, z, z); }
+Vector4 Vector4::yyzz() const  { return Vector4       (y, y, z, z); }
+Vector4 Vector4::zyzz() const  { return Vector4       (z, y, z, z); }
+Vector4 Vector4::wyzz() const  { return Vector4       (w, y, z, z); }
+Vector4 Vector4::xzzz() const  { return Vector4       (x, z, z, z); }
+Vector4 Vector4::yzzz() const  { return Vector4       (y, z, z, z); }
+Vector4 Vector4::zzzz() const  { return Vector4       (z, z, z, z); }
+Vector4 Vector4::wzzz() const  { return Vector4       (w, z, z, z); }
+Vector4 Vector4::xwzz() const  { return Vector4       (x, w, z, z); }
+Vector4 Vector4::ywzz() const  { return Vector4       (y, w, z, z); }
+Vector4 Vector4::zwzz() const  { return Vector4       (z, w, z, z); }
+Vector4 Vector4::wwzz() const  { return Vector4       (w, w, z, z); }
+Vector4 Vector4::xxwz() const  { return Vector4       (x, x, w, z); }
+Vector4 Vector4::yxwz() const  { return Vector4       (y, x, w, z); }
+Vector4 Vector4::zxwz() const  { return Vector4       (z, x, w, z); }
+Vector4 Vector4::wxwz() const  { return Vector4       (w, x, w, z); }
+Vector4 Vector4::xywz() const  { return Vector4       (x, y, w, z); }
+Vector4 Vector4::yywz() const  { return Vector4       (y, y, w, z); }
+Vector4 Vector4::zywz() const  { return Vector4       (z, y, w, z); }
+Vector4 Vector4::wywz() const  { return Vector4       (w, y, w, z); }
+Vector4 Vector4::xzwz() const  { return Vector4       (x, z, w, z); }
+Vector4 Vector4::yzwz() const  { return Vector4       (y, z, w, z); }
+Vector4 Vector4::zzwz() const  { return Vector4       (z, z, w, z); }
+Vector4 Vector4::wzwz() const  { return Vector4       (w, z, w, z); }
+Vector4 Vector4::xwwz() const  { return Vector4       (x, w, w, z); }
+Vector4 Vector4::ywwz() const  { return Vector4       (y, w, w, z); }
+Vector4 Vector4::zwwz() const  { return Vector4       (z, w, w, z); }
+Vector4 Vector4::wwwz() const  { return Vector4       (w, w, w, z); }
+Vector4 Vector4::xxxw() const  { return Vector4       (x, x, x, w); }
+Vector4 Vector4::yxxw() const  { return Vector4       (y, x, x, w); }
+Vector4 Vector4::zxxw() const  { return Vector4       (z, x, x, w); }
+Vector4 Vector4::wxxw() const  { return Vector4       (w, x, x, w); }
+Vector4 Vector4::xyxw() const  { return Vector4       (x, y, x, w); }
+Vector4 Vector4::yyxw() const  { return Vector4       (y, y, x, w); }
+Vector4 Vector4::zyxw() const  { return Vector4       (z, y, x, w); }
+Vector4 Vector4::wyxw() const  { return Vector4       (w, y, x, w); }
+Vector4 Vector4::xzxw() const  { return Vector4       (x, z, x, w); }
+Vector4 Vector4::yzxw() const  { return Vector4       (y, z, x, w); }
+Vector4 Vector4::zzxw() const  { return Vector4       (z, z, x, w); }
+Vector4 Vector4::wzxw() const  { return Vector4       (w, z, x, w); }
+Vector4 Vector4::xwxw() const  { return Vector4       (x, w, x, w); }
+Vector4 Vector4::ywxw() const  { return Vector4       (y, w, x, w); }
+Vector4 Vector4::zwxw() const  { return Vector4       (z, w, x, w); }
+Vector4 Vector4::wwxw() const  { return Vector4       (w, w, x, w); }
+Vector4 Vector4::xxyw() const  { return Vector4       (x, x, y, w); }
+Vector4 Vector4::yxyw() const  { return Vector4       (y, x, y, w); }
+Vector4 Vector4::zxyw() const  { return Vector4       (z, x, y, w); }
+Vector4 Vector4::wxyw() const  { return Vector4       (w, x, y, w); }
+Vector4 Vector4::xyyw() const  { return Vector4       (x, y, y, w); }
+Vector4 Vector4::yyyw() const  { return Vector4       (y, y, y, w); }
+Vector4 Vector4::zyyw() const  { return Vector4       (z, y, y, w); }
+Vector4 Vector4::wyyw() const  { return Vector4       (w, y, y, w); }
+Vector4 Vector4::xzyw() const  { return Vector4       (x, z, y, w); }
+Vector4 Vector4::yzyw() const  { return Vector4       (y, z, y, w); }
+Vector4 Vector4::zzyw() const  { return Vector4       (z, z, y, w); }
+Vector4 Vector4::wzyw() const  { return Vector4       (w, z, y, w); }
+Vector4 Vector4::xwyw() const  { return Vector4       (x, w, y, w); }
+Vector4 Vector4::ywyw() const  { return Vector4       (y, w, y, w); }
+Vector4 Vector4::zwyw() const  { return Vector4       (z, w, y, w); }
+Vector4 Vector4::wwyw() const  { return Vector4       (w, w, y, w); }
+Vector4 Vector4::xxzw() const  { return Vector4       (x, x, z, w); }
+Vector4 Vector4::yxzw() const  { return Vector4       (y, x, z, w); }
+Vector4 Vector4::zxzw() const  { return Vector4       (z, x, z, w); }
+Vector4 Vector4::wxzw() const  { return Vector4       (w, x, z, w); }
+Vector4 Vector4::xyzw() const  { return Vector4       (x, y, z, w); }
+Vector4 Vector4::yyzw() const  { return Vector4       (y, y, z, w); }
+Vector4 Vector4::zyzw() const  { return Vector4       (z, y, z, w); }
+Vector4 Vector4::wyzw() const  { return Vector4       (w, y, z, w); }
+Vector4 Vector4::xzzw() const  { return Vector4       (x, z, z, w); }
+Vector4 Vector4::yzzw() const  { return Vector4       (y, z, z, w); }
+Vector4 Vector4::zzzw() const  { return Vector4       (z, z, z, w); }
+Vector4 Vector4::wzzw() const  { return Vector4       (w, z, z, w); }
+Vector4 Vector4::xwzw() const  { return Vector4       (x, w, z, w); }
+Vector4 Vector4::ywzw() const  { return Vector4       (y, w, z, w); }
+Vector4 Vector4::zwzw() const  { return Vector4       (z, w, z, w); }
+Vector4 Vector4::wwzw() const  { return Vector4       (w, w, z, w); }
+Vector4 Vector4::xxww() const  { return Vector4       (x, x, w, w); }
+Vector4 Vector4::yxww() const  { return Vector4       (y, x, w, w); }
+Vector4 Vector4::zxww() const  { return Vector4       (z, x, w, w); }
+Vector4 Vector4::wxww() const  { return Vector4       (w, x, w, w); }
+Vector4 Vector4::xyww() const  { return Vector4       (x, y, w, w); }
+Vector4 Vector4::yyww() const  { return Vector4       (y, y, w, w); }
+Vector4 Vector4::zyww() const  { return Vector4       (z, y, w, w); }
+Vector4 Vector4::wyww() const  { return Vector4       (w, y, w, w); }
+Vector4 Vector4::xzww() const  { return Vector4       (x, z, w, w); }
+Vector4 Vector4::yzww() const  { return Vector4       (y, z, w, w); }
+Vector4 Vector4::zzww() const  { return Vector4       (z, z, w, w); }
+Vector4 Vector4::wzww() const  { return Vector4       (w, z, w, w); }
+Vector4 Vector4::xwww() const  { return Vector4       (x, w, w, w); }
+Vector4 Vector4::ywww() const  { return Vector4       (y, w, w, w); }
+Vector4 Vector4::zwww() const  { return Vector4       (z, w, w, w); }
+Vector4 Vector4::wwww() const  { return Vector4       (w, w, w, w); }
+
+
+}; // namespace
diff --git a/externals/g3dlite/debugAssert.cpp b/externals/g3dlite/debugAssert.cpp
new file mode 100644
index 00000000000..a87161b261f
--- /dev/null
+++ b/externals/g3dlite/debugAssert.cpp
@@ -0,0 +1,389 @@
+/**
+ @file debugAssert.cpp
+
+ Windows implementation of assertion routines.
+
+ @maintainer Morgan McGuire, graphics3d.com
+ 
+ @created 2001-08-26
+ @edited  2009-06-02
+ */
+
+#include "G3D/debugAssert.h"
+#include "G3D/platform.h"
+#ifdef G3D_WIN32
+    #include 
+#endif
+#include "G3D/format.h"
+#include "G3D/prompt.h"
+#include 
+#include "G3D/debugPrintf.h"
+#include "G3D/Log.h"
+
+#include 
+
+#ifdef _MSC_VER
+    // disable: "C++ exception handler used"
+#   pragma warning (push)
+#   pragma warning (disable : 4530)
+#endif
+
+using namespace std;
+
+namespace G3D { namespace _internal {
+
+ConsolePrintHook _consolePrintHook;
+AssertionHook _debugHook = _handleDebugAssert_;
+AssertionHook _failureHook = _handleErrorCheck_;
+
+#ifdef G3D_LINUX
+#if SOMEONE_MADE_THIS_USEFUL
+    Display*      x11Display = NULL;
+    Window        x11Window  = 0;
+#endif
+#endif
+
+
+#ifdef G3D_WIN32
+static void postToClipboard(const char *text) {
+    if (OpenClipboard(NULL)) {
+        HGLOBAL hMem = GlobalAlloc(GHND | GMEM_DDESHARE, strlen(text) + 1);
+        if (hMem) {
+            char *pMem = (char*)GlobalLock(hMem);
+            strcpy(pMem, text);
+            GlobalUnlock(hMem);
+
+            EmptyClipboard();
+            SetClipboardData(CF_TEXT, hMem);
+        }
+
+        CloseClipboard();
+        GlobalFree(hMem);
+    }
+}
+#endif
+
+/**
+ outTitle should be set before the call
+ */
+static void createErrorMessage(
+    const char*         expression,
+    const std::string&  message,
+    const char*         filename,
+    int                 lineNumber,
+    std::string&        outTitle,
+    std::string&        outMessage) {
+
+    std::string le = "";
+    const char* newline = "\n";
+
+    #ifdef G3D_WIN32
+        newline = "\r\n";
+
+        // The last error value.  (Which is preserved across the call).
+        DWORD lastErr = GetLastError();
+    
+        // The decoded message from FormatMessage
+        LPTSTR formatMsg = NULL;
+
+        if (NULL == formatMsg) {
+            FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
+                          FORMAT_MESSAGE_IGNORE_INSERTS |
+                          FORMAT_MESSAGE_FROM_SYSTEM,
+                            NULL,
+                            lastErr,
+                            0,
+                            (LPTSTR)&formatMsg,
+                            0,
+                            NULL);
+        }
+
+        // Make sure the message got translated into something.
+        LPTSTR realLastErr;
+        if (NULL != formatMsg) {
+            realLastErr = formatMsg;
+        } else {
+            realLastErr = _T("Last error code does not exist.");
+        }
+
+		if (lastErr != 0) {
+	        le = G3D::format("Last Error (0x%08X): %s\r\n\r\n", lastErr, (LPCSTR)realLastErr);
+		}
+
+        // Get rid of the allocated memory from FormatMessage.
+        if (NULL != formatMsg) {
+            LocalFree((LPVOID)formatMsg);
+        }
+
+        char modulePath[MAX_PATH];
+        GetModuleFileNameA(NULL, modulePath, MAX_PATH);
+
+        const char* moduleName = strrchr(modulePath, '\\');
+        outTitle = outTitle + string(" - ") + string(moduleName ? (moduleName + 1) : modulePath);
+
+    #endif
+
+    // Build the message.
+    outMessage =
+        G3D::format("%s%s%sExpression: %s%s%s:%d%s%s%s", 
+                 message.c_str(), newline, newline, expression, newline, 
+                 filename, lineNumber, newline, newline, le.c_str());
+}
+
+
+bool _handleDebugAssert_(
+    const char*         expression,
+    const std::string&  message,
+    const char*         filename,
+    int                 lineNumber,
+    bool                useGuiPrompt) {
+
+    std::string dialogTitle = "Assertion Failure";
+    std::string dialogText = "";
+    createErrorMessage(expression, message, filename, lineNumber, dialogTitle, dialogText);
+
+    #ifdef G3D_WIN32
+        DWORD lastErr = GetLastError();
+        postToClipboard(dialogText.c_str());
+        debugPrintf("\n%s\n", dialogText.c_str());
+    #endif
+
+    const int cBreak        = 0;
+    const int cIgnore       = 1;
+    const int cAbort        = 2;
+
+    static const char* choices[] = {"Debug", "Ignore", "Exit"};
+
+    // Log the error
+    Log::common()->print(std::string("\n**************************\n\n") + dialogTitle + "\n" + dialogText);
+
+    int result = G3D::prompt(dialogTitle.c_str(), dialogText.c_str(), (const char**)choices, 3, useGuiPrompt);
+
+#    ifdef G3D_WIN32
+        // Put the incoming last error back.
+        SetLastError(lastErr);
+#    endif
+
+    switch (result) {
+    // -1 shouldn't actually occur because it means 
+    // that we're in release mode.
+    case -1:
+    case cBreak:
+        return true;
+        break;
+
+    case cIgnore:
+        return false;
+        break;
+   
+    case cAbort:
+        exit(-1);
+        break;
+    }
+
+    // Should never get here
+    return false;
+}
+
+
+bool _handleErrorCheck_(
+    const char*         expression,
+    const std::string&  message,
+    const char*         filename,
+    int                 lineNumber,
+    bool                useGuiPrompt) {
+
+    std::string dialogTitle = "Critical Error";
+    std::string dialogText = "";
+
+    createErrorMessage(expression, message, filename, lineNumber, dialogTitle, dialogText);
+
+    // Log the error
+    Log::common()->print(std::string("\n**************************\n\n") + dialogTitle + "\n" + dialogText);
+    #ifdef G3D_WIN32
+        DWORD lastErr = GetLastError();
+        (void)lastErr;
+        postToClipboard(dialogText.c_str());
+        debugPrintf("\n%s\n", dialogText.c_str());
+    #endif
+
+    static const char* choices[] = {"Ok"};
+
+    const std::string& m = 
+        std::string("An internal error has occured in this program and it will now close.  "
+        "The specific error is below. More information has been saved in \"") +
+            Log::getCommonLogFilename() + "\".\n" + dialogText;
+
+    int result = G3D::prompt("Error", m.c_str(), (const char**)choices, 1, useGuiPrompt);
+    (void)result;
+
+    return true;
+}
+
+
+#ifdef G3D_WIN32
+static HCURSOR oldCursor;
+static RECT    oldCursorRect;
+static POINT   oldCursorPos;
+static int     oldShowCursorCount;
+#endif
+
+void _releaseInputGrab_() {
+    #ifdef G3D_WIN32
+
+        GetCursorPos(&oldCursorPos);
+
+        // Stop hiding the cursor if the application hid it.
+        oldShowCursorCount = ShowCursor(true) - 1;
+
+        if (oldShowCursorCount < -1) {
+            for (int c = oldShowCursorCount; c < -1; ++c) {
+                ShowCursor(true);
+            }
+        }
+
+        // Set the default cursor in case the application
+        // set the cursor to NULL.
+        oldCursor = GetCursor();
+        SetCursor(LoadCursor(NULL, IDC_ARROW));
+
+        // Allow the cursor full access to the screen
+        GetClipCursor(&oldCursorRect);
+        ClipCursor(NULL);
+        
+    #elif defined(G3D_LINUX)
+#if SOMEONE_MADE_THIS_USEFUL
+        if (x11Display != NULL) {
+            XUngrabPointer(x11Display, CurrentTime);
+            XUngrabKeyboard(x11Display, CurrentTime);
+            if (x11Window != 0) {
+                //XUndefineCursor(x11Display, x11Window);
+                // TODO: Note that we leak this cursor; it should be
+                // freed in the restore code.
+                Cursor c = XCreateFontCursor(x11Display, 68);
+                XDefineCursor(x11Display, x11Window, c);
+            }
+            XSync(x11Display, false);           
+            XAllowEvents(x11Display, AsyncPointer, CurrentTime);
+            XFlush(x11Display);
+        }
+#endif
+    #elif defined(G3D_OSX)
+        // TODO: OS X
+    #endif
+}
+
+
+void _restoreInputGrab_() {
+    #ifdef G3D_WIN32
+
+        // Restore the old clipping region
+        ClipCursor(&oldCursorRect);
+
+        SetCursorPos(oldCursorPos.x, oldCursorPos.y);
+
+        // Restore the old cursor
+        SetCursor(oldCursor);
+
+        // Restore old visibility count
+        if (oldShowCursorCount < 0) {
+            for (int c = 0; c > oldShowCursorCount; --c) {
+                ShowCursor(false);
+            }
+        }
+        
+    #elif defined(G3D_LINUX)
+        // TODO: Linux
+    #elif defined(G3D_OSX)
+        // TODO: OS X
+    #endif
+}
+
+
+}; // internal namespace
+ 
+void setAssertionHook(AssertionHook hook) {
+    G3D::_internal::_debugHook = hook;
+}
+
+AssertionHook assertionHook() {
+    return 	G3D::_internal::_debugHook;
+}
+
+void setFailureHook(AssertionHook hook) {
+    G3D::_internal::_failureHook = hook;
+}
+
+AssertionHook failureHook() {
+    return G3D::_internal::_failureHook;
+}
+
+
+void setConsolePrintHook(ConsolePrintHook h) {
+    G3D::_internal::_consolePrintHook = h;
+}
+
+ConsolePrintHook consolePrintHook() {
+    return G3D::_internal::_consolePrintHook;
+}
+
+
+std::string __cdecl debugPrint(const std::string& s) {
+#   ifdef G3D_WIN32
+        const int MAX_STRING_LEN = 1024;
+    
+        // Windows can't handle really long strings sent to
+        // the console, so we break the string.
+        if (s.size() < MAX_STRING_LEN) {
+            OutputDebugStringA(s.c_str());
+        } else {
+            for (unsigned int i = 0; i < s.size(); i += MAX_STRING_LEN) {
+                std::string sub = s.substr(i, MAX_STRING_LEN);
+                OutputDebugStringA(sub.c_str());
+            }
+        }
+#    else
+        fprintf(stderr, "%s", s.c_str());
+        fflush(stderr);
+#    endif
+
+     return s;
+}
+
+std::string __cdecl debugPrintf(const char* fmt ...) {
+    va_list argList;
+    va_start(argList, fmt);
+    std::string s = G3D::vformat(fmt, argList);
+    va_end(argList);
+
+    return debugPrint(s);
+//    return debugPrint(consolePrint(s));
+}
+
+std::string consolePrint(const std::string& s) {
+    FILE* L = Log::common()->getFile();
+    fprintf(L, "%s", s.c_str());
+
+    if (consolePrintHook()) {
+        consolePrintHook()(s);
+    }
+
+    fflush(L);
+    return s;
+}
+
+
+std::string __cdecl consolePrintf(const char* fmt ...) {
+    va_list argList;
+    va_start(argList, fmt);
+    std::string s = G3D::vformat(fmt, argList);
+    va_end(argList);
+
+    return consolePrint(s);
+}
+
+} // namespace
+
+#ifdef _MSC_VER
+#   pragma warning (pop)
+#endif
diff --git a/externals/g3dlite/fileutils.cpp b/externals/g3dlite/fileutils.cpp
new file mode 100644
index 00000000000..3f5eb579ba9
--- /dev/null
+++ b/externals/g3dlite/fileutils.cpp
@@ -0,0 +1,1165 @@
+/**
+ @file fileutils.cpp
+ 
+ @author Morgan McGuire, graphics3d.com
+ 
+ @author  2002-06-06
+ @edited  2010-02-05
+ */
+
+#include 
+#include 
+#include "G3D/platform.h"
+#include "G3D/fileutils.h"
+#include "G3D/BinaryInput.h"
+#include "G3D/BinaryOutput.h"
+#include "G3D/g3dmath.h"
+#include "G3D/stringutils.h"
+#include "G3D/Set.h"
+#include "G3D/g3dfnmatch.h"
+
+#include 
+#include 
+#if _HAVE_ZIP
+    #include "zip.h"
+#endif
+
+#ifdef G3D_WIN32
+   // Needed for _getcwd
+   #include 
+   #include 
+#else
+    #include 
+    #include 
+    #include 
+    #define _getcwd getcwd
+    #define _stat stat
+#endif
+
+
+namespace G3D {
+    
+namespace _internal {
+    Set currentFilesUsed;
+}
+
+std::string pathConcat(const std::string& dirname, const std::string& file) {
+    // Ensure that the directory ends in a slash
+    if ((dirname.size() != 0) && 
+        (dirname[dirname.size() - 1] != '/') &&
+        (dirname[dirname.size() - 1] != '\\') &&
+        (dirname[dirname.size() - 1] != ':')) {
+        return dirname + '/' + file;
+    } else {
+        return dirname + file;
+    }
+}
+
+std::string resolveFilename(const std::string& filename) {
+    if (filename.size() >= 1) {
+        if ((filename[0] == '/') || (filename[0] == '\\')) {
+            // Already resolved
+            return filename;
+        } else {
+
+            #ifdef G3D_WIN32
+                if ((filename.size() >= 2) && (filename[1] == ':')) {
+                    // There is a drive spec on the front.
+                    if ((filename.size() >= 3) && ((filename[2] == '\\') || 
+                                                   (filename[2] == '/'))) {
+                        // Already fully qualified
+                        return filename;
+                    } else {
+                        // The drive spec is relative to the
+                        // working directory on that drive.
+                        debugAssertM(false, "Files of the form d:path are"
+                                     " not supported (use a fully qualified"
+                                     " name).");
+                        return filename;
+                    }
+                }
+            #endif
+        }
+    }
+
+    char buffer[1024];
+
+    // Prepend the working directory.
+    _getcwd(buffer, 1024);
+
+    return format("%s/%s", buffer, filename.c_str());
+}
+
+bool zipfileExists(const std::string& filename) {
+	std::string	outZipfile;
+	std::string	outInternalFile;
+    return zipfileExists(filename, outZipfile, outInternalFile);
+}
+
+std::string readWholeFile(
+    const std::string& filename) {
+
+    _internal::currentFilesUsed.insert(filename);
+
+    std::string s;
+
+    debugAssert(filename != "");
+    if (fileExists(filename, false)) {
+
+        int64 length = fileLength(filename);
+
+        char* buffer = (char*)System::alignedMalloc(length + 1, 16);
+        debugAssert(buffer);
+        FILE* f = fopen(filename.c_str(), "rb");
+        debugAssert(f);
+        int ret = fread(buffer, 1, length, f);
+	    debugAssert(ret == length);(void)ret;
+        fclose(f);
+
+        buffer[length] = '\0';    
+        s = std::string(buffer);
+
+        System::alignedFree(buffer);
+
+    } else if (zipfileExists(filename)) {
+
+        void* zipBuffer;
+        size_t length;
+        zipRead(filename, zipBuffer, length);
+
+        char* buffer = (char*)System::alignedMalloc(length + 1, 16);
+        System::memcpy(buffer,zipBuffer, length + 1);
+        zipClose(zipBuffer);
+
+        buffer[length] = '\0';
+        s = std::string(buffer);
+        System::alignedFree(buffer);
+    } else {
+        debugAssertM(false, filename + " not found");
+    }
+
+    return s;
+}
+
+
+void zipRead(const std::string& file,
+             void*& data,
+             size_t& length) {
+    std::string zip, desiredFile;
+#if _HAVE_ZIP    
+    if (zipfileExists(file, zip, desiredFile)) {
+        struct zip *z = zip_open( zip.c_str(), ZIP_CHECKCONS, NULL );
+        {
+            struct zip_stat info;
+            zip_stat_init( &info );    // TODO: Docs unclear if zip_stat_init is required.
+            zip_stat( z, desiredFile.c_str(), ZIP_FL_NOCASE, &info );
+            length = info.size;
+            // sets machines up to use MMX, if they want
+            data = System::alignedMalloc(length, 16);
+            struct zip_file *zf = zip_fopen( z, desiredFile.c_str(), ZIP_FL_NOCASE );
+            {
+                int test = zip_fread( zf, data, length );
+                debugAssertM((size_t)test == length,
+                             desiredFile + " was corrupt because it unzipped to the wrong size.");
+                (void)test;
+            }
+            zip_fclose( zf );
+        }
+        zip_close( z );
+    } else {
+        data = NULL;
+    }
+#else
+    data = NULL;
+#endif
+}
+
+
+void zipClose(void* data) {
+	System::alignedFree(data);
+}
+
+
+int64 fileLength(const std::string& filename) {
+    struct _stat st;
+    int result = _stat(filename.c_str(), &st);
+    
+    if (result == -1) {
+#if _HAVE_ZIP
+		std::string zip, contents;
+		if(zipfileExists(filename, zip, contents)){
+			int64 requiredMem;
+
+                        struct zip *z = zip_open( zip.c_str(), ZIP_CHECKCONS, NULL );
+                        debugAssertM(z != NULL, zip + ": zip open failed.");
+			{
+                                struct zip_stat info;
+                                zip_stat_init( &info );    // TODO: Docs unclear if zip_stat_init is required.
+                                int success = zip_stat( z, contents.c_str(), ZIP_FL_NOCASE, &info );
+                                debugAssertM(success == 0, zip + ": " + contents + ": zip stat failed.");
+                                requiredMem = info.size;
+			}
+                        zip_close( z );
+			return requiredMem;
+		} else {
+        return -1;
+		}
+#else
+        return -1;
+#endif
+    }
+
+    return st.st_size;
+}
+
+/** Used by robustTmpfile.  Returns nonzero if fread, fwrite, and fseek all
+succeed on the file.
+  @author Morgan McGuire, http://graphics.cs.williams.edu  */
+static int isFileGood(FILE* f) {
+
+	int x, n, result;
+
+	/* Must be a valid file handle */
+	if (f == NULL) {
+		return 0;
+	}
+
+	/* Try to write */
+	x = 1234;
+	n = fwrite(&x, sizeof(int), 1, f);
+
+	if (n != 1) {
+		return 0;
+	}
+
+	/* Seek back to the beginning */
+	result = fseek(f, 0, SEEK_SET);
+	if (result != 0) {
+		return 0;
+	}
+
+	/* Read */
+	n =	fread(&x, sizeof(int), 1, f);
+	if (n != 1) {
+		return 0;
+	}
+
+	/* Seek back to the beginning again */
+	fseek(f, 0, SEEK_SET);
+
+	return 1;
+}
+
+FILE* createTempFile() {
+    FILE* t = NULL;
+
+//#   ifdef G3D_WIN32
+        t = tmpfile();
+//#   else
+//        // On Unix, tmpfile generates a warning for any code that links against it.
+//        const char* tempfilename = "/tmp/g3dtemp.XXXXXXXX";
+//        mktemp(tempfilename);
+//        t = fopen(tempfilename, "w");    
+//#   endif
+
+#	ifdef _WIN32
+		char* n = NULL;
+#	endif
+	char name[256];
+
+    if (isFileGood(t)) {
+        return t;
+    }
+
+#   ifdef G3D_WIN32
+    /* tmpfile failed; try the tmpnam routine */
+    t = fopen(tmpnam(NULL), "w+");
+    if (isFileGood(t)) {
+        return t;
+    }
+
+    n = _tempnam("c:/tmp/", "t");
+    /* Try to create something in C:\tmp */
+    t = fopen(n, "w+");
+    if (isFileGood(t)) {
+        return t;
+    }
+
+    /* Try c:\temp */
+    n = _tempnam("c:/temp/", "t");
+    t = fopen(n, "w+");
+    if (isFileGood(t)) {
+        return t;
+    }
+
+    /* try the current directory */
+    n = _tempnam("./", "t");
+    t = fopen(n, "w+");
+    if (isFileGood(t)) {
+        return t;
+    }
+
+    sprintf(name, "%s/tmp%d", "c:/temp", rand());
+    t = fopen(name, "w+");
+    if (isFileGood(t)) {
+        return t;
+    }
+
+    /* Try some hardcoded paths */
+    sprintf(name, "%s/tmp%d", "c:/tmp", rand());
+    t = fopen(name, "w+");
+    if (isFileGood(t)) {
+        return t;
+    }
+#   else
+    sprintf(name, "%s/tmp%d", "/tmp", rand());
+    t = fopen(name, "w+");
+    if (isFileGood(t)) {
+        return t;
+    }
+#endif
+
+    sprintf(name, "tmp%d", rand());
+    t = fopen(name, "w+");
+    if (isFileGood(t)) {
+        return t;
+    }
+
+    fprintf(stderr, "Unable to create a temporary file; robustTmpfile returning NULL\n");
+
+    return NULL;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+void writeWholeFile(
+    const std::string&          filename,
+    const std::string&          str,
+    bool                        flush) {
+
+    // Make sure the directory exists.
+    std::string root, base, ext, path;
+    Array pathArray;
+    parseFilename(filename, root, pathArray, base, ext); 
+
+    path = root + stringJoin(pathArray, '/');
+    if (! fileExists(path, false)) {
+        createDirectory(path);
+    }
+
+    FILE* file = fopen(filename.c_str(), "wb");
+
+    debugAssert(file);
+
+    fwrite(str.c_str(), str.size(), 1, file);
+
+    if (flush) {
+        fflush(file);
+    }
+    fclose(file);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+/**
+ Creates the directory (which may optionally end in a /)
+ and any parents needed to reach it.
+ */
+void createDirectory(
+    const std::string&  dir) {
+    
+	if (dir == "") {
+		return;
+	}
+
+    std::string d;
+
+    // Add a trailing / if there isn't one.
+    switch (dir[dir.size() - 1]) {
+    case '/':
+    case '\\':
+        d = dir;
+        break;
+
+    default:
+        d = dir + "/";
+    }
+
+    // If it already exists, do nothing
+    if (fileExists(d.substr(0, d.size() - 1)), false) {
+        return;
+    }
+
+    // Parse the name apart
+    std::string root, base, ext;
+    Array path;
+
+    std::string lead;
+    parseFilename(d, root, path, base, ext);
+    debugAssert(base == "");
+    debugAssert(ext == "");
+
+    // Begin with an extra period so "c:\" becomes "c:\.\" after
+    // appending a path and "c:" becomes "c:.\", not root: "c:\"
+    std::string p = root + ".";
+
+    // Create any intermediate that doesn't exist
+    for (int i = 0; i < path.size(); ++i) {
+        p += "/" + path[i];
+        if (! fileExists(p, false)) {
+            // Windows only requires one argument to mkdir,
+            // where as unix also requires the permissions.
+#           ifndef G3D_WIN32
+                mkdir(p.c_str(), 0777);
+#	    else
+                _mkdir(p.c_str());
+#	    endif
+        }
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+class FileSystemCache {
+private:
+
+    Table > m_files;
+
+public:
+
+    bool fileExists(const std::string& filename) {
+        const std::string& path = resolveFilename(filenamePath(filename));
+        const std::string& name = filenameBaseExt(filename);
+        
+        bool neverBeforeSeen = false;
+        Array& fileList = m_files.getCreate(path, neverBeforeSeen);
+        if (neverBeforeSeen) {
+            if (! G3D::fileExists(path, true, false)) {
+                // The path itself doesn't exist... back out our insertion (which makes fileList& invalid) 
+                m_files.remove(path);
+                return false;
+            }
+
+            std::string spec = pathConcat(path, "*");
+
+            // Will automatically recurse into zipfiles
+            getFiles(spec, fileList);
+            getDirs(spec, fileList);
+
+#           ifdef G3D_WIN32 
+            {
+                // Case insensitive
+                for (int i = 0; i < fileList.size(); ++i) {
+                    fileList[i] = toLower(fileList[i]);
+                }
+            }
+#           endif
+        }
+
+        if (filenameContainsWildcards(name)) {
+            // See if anything matches
+            for (int i = 0; i < fileList.size(); ++i) {
+                if (g3dfnmatch(name.c_str(), fileList[i].c_str(), 0) == 0) {
+                    return true;
+                }
+            }
+            return false;
+        } else {
+            // On windows, this is a lower-lower comparison, so it is case insensitive
+            return fileList.contains(name);
+        }
+    }
+
+    void clear() {
+        m_files.clear();
+    }
+
+    static FileSystemCache& instance() {
+        static FileSystemCache i;
+        return i;
+    }
+};
+
+
+void clearFileSystemCache() {
+    FileSystemCache::instance().clear();
+}
+
+bool fileExists
+(const std::string&	_filename,
+ bool                   lookInZipfiles,
+ bool                   trustCache) {
+    
+    if (_filename.empty()) {
+        return false;
+    }
+
+    // Remove trailing slash from directories
+    const std::string& filename = (endsWith(_filename, "/") || endsWith(_filename, "\\")) ? _filename.substr(0, _filename.length() - 1) : _filename;
+
+    if (trustCache && lookInZipfiles) {
+#       ifdef G3D_WIN32
+            // Case insensitive
+            return FileSystemCache::instance().fileExists(toLower(filename));
+#       else
+            return FileSystemCache::instance().fileExists(filename);
+#       endif
+    }
+
+    // Useful for debugging
+    //char curdir[1024]; _getcwd(curdir, 1024); 
+
+    struct _stat st;
+    int ret = _stat(filename.c_str(), &st);
+
+    // _stat returns zero on success
+    bool exists = (ret == 0);
+
+    if (! exists && lookInZipfiles) {
+		// Does not exist standalone, but might exist in a zipfile
+
+		// These output arguments will be ignored
+		std::string zipDir, internalPath;
+		return zipfileExists(filename, zipDir, internalPath);
+    } else {
+    	return exists;
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+#if _HAVE_ZIP
+/* Helper methods for zipfileExists()*/
+// Given a string (the drive) and an array (the path), computes the directory
+static void _zip_resolveDirectory(std::string& completeDir, const std::string& drive, const Array& path, const int length){
+	completeDir = drive;
+	int tempLength;
+	// if the given length is longer than the array, we correct it
+	if(length > path.length()){
+		tempLength = path.length();
+	} else{
+		tempLength = length;
+	}
+
+	for(int t = 0; t < tempLength; ++t){
+		if(t > 0){
+			completeDir += "/";
+		}
+		completeDir += path[t];
+	}
+}
+
+
+// assumes that zipDir references a .zip file
+static bool _zip_zipContains(const std::string& zipDir, const std::string& desiredFile){
+        struct zip *z = zip_open( zipDir.c_str(), ZIP_CHECKCONS, NULL );
+	//the last parameter, an int, determines case sensitivity:
+	//1 is sensitive, 2 is not, 0 is default
+        int test = zip_name_locate( z, desiredFile.c_str(), ZIP_FL_NOCASE );
+        zip_close( z );
+	if(test == -1){
+		return false;
+	}
+	return true;
+}
+#endif
+
+// If no zipfile exists, outZipfile and outInternalFile are unchanged
+bool zipfileExists(const std::string& filename, std::string& outZipfile,
+                   std::string& outInternalFile){
+#if _HAVE_ZIP
+    Array path;
+    std::string drive, base, ext, zipfile, infile;
+    parseFilename(filename, drive, path, base, ext);
+    
+    // Put the filename back together
+    if ((base != "") && (ext != "")) {
+        infile = base + "." + ext;
+    } else {
+        infile = base + ext;
+    }
+    
+    // Remove "." from path
+    for (int i = 0; i < path.length(); ++i) {
+        if (path[i] == ".") {
+            path.remove(i);
+            --i;
+        }
+    }
+    
+    // Remove ".." from path
+    for (int i = 1; i < path.length(); ++i) {
+        if ((path[i] == "..") && (i > 0) && (path[i - 1] != "..")) {
+            // Remove both i and i - 1
+            path.remove(i - 1, 2);
+            i -= 2;
+        }
+    }
+    
+    // Walk the path backwards, accumulating pieces onto the infile until
+    // we find a zipfile that contains it
+    for (int t = 0; t < path.length(); ++t){
+        _zip_resolveDirectory(zipfile, drive, path,  path.length() - t);
+        if (t > 0) {
+            infile = path[path.length() - t] + "/" + infile;
+        }
+
+        if (endsWith(zipfile, "..")) {
+            return false;
+        }
+        
+        if (fileExists(zipfile, false)) {
+            // test if it actually is a zipfile
+            // if not, return false, a bad
+            // directory structure has been given,
+            // not a .zip
+            if (isZipfile(zipfile)){
+                
+                if (_zip_zipContains(zipfile, infile)){
+                    outZipfile = zipfile;
+                    outInternalFile = infile;
+                    return true;
+                } else {
+                    return false;
+                }
+            } else {
+                // the directory structure was valid but did not point to a .zip
+                return false;
+            }
+        }
+        
+    }
+#endif
+    // not a valid directory structure ever, 
+    // obviously no .zip was found within the path 
+    return false;
+}	
+
+///////////////////////////////////////////////////////////////////////////////
+
+std::string generateFilenameBase(const std::string& prefix, const std::string& suffix) {
+    Array exist;
+
+    // Note "template" is a reserved word in C++
+    std::string templat = prefix + System::currentDateString() + "_";
+    getFiles(templat + "*", exist);
+    
+    // Remove extensions
+    for (int i = 0; i < exist.size(); ++i) {
+        exist[i] = filenameBase(exist[i]);
+    }
+
+    int num = 0;
+    std::string result;
+    templat += "%03d" + suffix;
+    do {
+        result = format(templat.c_str(), num);
+        ++num;
+    } while (exist.contains(result));
+
+    return result;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+void copyFile(
+    const std::string&          source,
+    const std::string&          dest) {
+
+    #ifdef G3D_WIN32
+        CopyFileA(source.c_str(), dest.c_str(), FALSE);
+    #else
+        // TODO: don't use BinaryInput and BinaryOutput
+        // Read it all in, then dump it out
+        BinaryInput  in(source, G3D_LITTLE_ENDIAN);
+        BinaryOutput out(dest, G3D_LITTLE_ENDIAN);
+        out.writeBytes(in.getCArray(), in.size());
+        out.commit(false);
+    #endif
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+void parseFilename(
+    const std::string&  filename,
+    std::string&        root,
+    Array& path,
+    std::string&        base,
+    std::string&        ext) {
+
+    std::string f = filename;
+
+    root = "";
+    path.clear();
+    base = "";
+    ext = "";
+
+    if (f == "") {
+        // Empty filename
+        return;
+    }
+
+    // See if there is a root/drive spec.
+    if ((f.size() >= 2) && (f[1] == ':')) {
+        
+        if ((f.size() > 2) && isSlash(f[2])) {
+        
+            // e.g.  c:\foo
+            root = f.substr(0, 3);
+            f = f.substr(3, f.size() - 3);
+        
+        } else {
+        
+            // e.g.  c:foo
+            root = f.substr(2);
+            f = f.substr(2, f.size() - 2);
+
+        }
+
+    } else if ((f.size() >= 2) & isSlash(f[0]) && isSlash(f[1])) {
+        
+        // e.g. //foo
+        root = f.substr(0, 2);
+        f = f.substr(2, f.size() - 2);
+
+    } else if (isSlash(f[0])) {
+        
+        root = f.substr(0, 1);
+        f = f.substr(1, f.size() - 1);
+
+    }
+
+    // Pull the extension off
+    {
+        // Find the period
+        size_t i = f.rfind('.');
+
+        if (i != std::string::npos) {
+            // Make sure it is after the last slash!
+            size_t j = iMax(f.rfind('/'), f.rfind('\\'));
+            if ((j == std::string::npos) || (i > j)) {
+                ext = f.substr(i + 1, f.size() - i - 1);
+                f = f.substr(0, i);
+            }
+        }
+    }
+
+    // Pull the basename off
+    {
+        // Find the last slash
+        size_t i = iMax(f.rfind('/'), f.rfind('\\'));
+        
+        if (i == std::string::npos) {
+            
+            // There is no slash; the basename is the whole thing
+            base = f;
+            f    = "";
+
+        } else if ((i != std::string::npos) && (i < f.size() - 1)) {
+            
+            base = f.substr(i + 1, f.size() - i - 1);
+            f    = f.substr(0, i);
+
+        }
+    }
+
+    // Parse what remains into path.
+    size_t prev, cur = 0;
+
+    while (cur < f.size()) {
+        prev = cur;
+        
+        // Allow either slash
+        size_t i = f.find('/', prev + 1);
+        size_t j = f.find('\\', prev + 1);
+        if (i == std::string::npos) {
+            i = f.size();
+        }
+
+        if (j == std::string::npos) {
+            j = f.size();
+        }
+
+        cur = iMin(i, j);
+
+        if (cur == std::string::npos) {
+            cur = f.size();
+        }
+
+        path.append(f.substr(prev, cur - prev));
+        ++cur;
+    }
+}
+
+
+/**
+ Helper for getFileList and getDirectoryList.
+
+ @param wantFiles       If false, returns the directories, otherwise
+                        returns the files.
+ @param includePath     If true, the names include paths
+ */
+static void getFileOrDirListNormal
+(const std::string&	filespec,
+ Array&	files,
+ bool			wantFiles,
+ bool                   includePath) {
+    
+    bool test = wantFiles ? true : false;
+    
+    std::string path = "";
+
+    // Find the place where the path ends and the file-spec begins
+    size_t i = filespec.rfind('/');
+    size_t j = filespec.rfind('\\');
+    
+    // Drive letters on Windows can separate a path
+    size_t k = filespec.rfind(':');
+    
+    if (((j != std::string::npos) && (j > i)) ||
+        (i == std::string::npos)) {
+        i = j;
+    }
+    
+    if (((k != std::string::npos) && (k > i)) ||
+        (i == std::string::npos)) {
+        i = k;
+    }
+    
+    // If there is a path, pull it off
+    if (i != std::string::npos) {
+        path = filespec.substr(0, i + 1);
+    }
+   
+    std::string prefix = path;
+
+    if (path.size() > 0) {
+        // Strip the trailing character
+        path = path.substr(0, path.size() - 1);
+    }
+
+#   ifdef G3D_WIN32
+    {
+       struct _finddata_t fileinfo;
+
+        long handle = _findfirst(filespec.c_str(), &fileinfo);
+        int result = handle;
+
+        while (result != -1) {
+            if ((((fileinfo.attrib & _A_SUBDIR) == 0) == test) && 
+                strcmp(fileinfo.name, ".") &&
+                strcmp(fileinfo.name, "..")) {
+                
+                if (includePath) {
+                    files.append(prefix + fileinfo.name);
+                } else {
+                    files.append(fileinfo.name);
+                }
+            }
+            
+            result = _findnext(handle, &fileinfo);
+        }
+    }
+#   else
+    {
+        if (path == "") {
+            // Empty paths don't work on Unix
+            path = ".";
+        }
+
+        // Unix implementation
+        DIR* dir = opendir(path.c_str());
+
+        if (dir != NULL) {
+            struct dirent* entry = readdir(dir);
+
+            while (entry != NULL) {
+
+                // Exclude '.' and '..'
+                if ((strcmp(entry->d_name, ".") != 0) &&
+                    (strcmp(entry->d_name, "..") != 0)) {
+                    
+                    // Form a name with a path
+                    std::string filename = prefix + entry->d_name;
+                    // See if this is a file or a directory
+                    struct _stat st;
+                    bool exists = _stat(filename.c_str(), &st) != -1;
+
+                    if (exists &&
+
+                        // Make sure it has the correct type
+                        (((st.st_mode & S_IFDIR) == 0) == test) &&
+
+                        // Make sure it matches the wildcard
+                        (fnmatch(filespec.c_str(),
+                                 filename.c_str(),
+                                 FNM_PATHNAME) == 0)) {
+                        
+                        if (includePath) {
+                            files.append(filename);
+                        } else {
+                            files.append(entry->d_name);
+                        }
+                    }
+                }
+
+                entry = readdir(dir);
+            }
+            closedir(dir);
+        }
+    }
+#   endif
+}
+
+#if _HAVE_ZIP
+/**
+ @param path   The zipfile name (no trailing slash)
+ @param prefix Directory inside the zipfile. No leading slash, must have trailing slash if non-empty.
+ @param file   Name inside the zipfile that we are testing to see if it matches prefix + "*"
+ */
+static void _zip_addEntry(const std::string& path,
+                          const std::string& prefix,
+						  const std::string& file,
+						  Set& files,
+						  bool wantFiles,
+						  bool includePath) {
+
+    // Make certain we are within the desired parent folder (prefix)
+    if (beginsWith(file, prefix)) {
+        // validityTest was prefix/file
+        
+        // Extract everything to the right of the prefix
+        std::string s = file.substr(prefix.length());
+        
+        if (s == "") {
+            // This was the name of the prefix
+            return;
+        }
+        
+        // See if there are any slashes
+        size_t slashPos = s.find('/');
+        
+        bool add = false;
+        
+        if (slashPos == std::string::npos) {
+            // No slashes, so s must be a file
+            add = wantFiles;
+        } else if (! wantFiles) {
+            // Not all zipfiles list directories as explicit entries.
+            // Because of this, if we're looking for directories and see
+            // any path longer than prefix, we must add the subdirectory. 
+            // The Set will fix duplicates for us.
+            s = s.substr(0, slashPos);
+            add = true;
+        }
+        
+        if (add) {
+            if (includePath) {
+                files.insert(path + "/" + prefix + s);
+            } else {
+                files.insert(s);
+            }
+        }
+    }
+}
+#endif
+
+static void getFileOrDirListZip(const std::string& path,
+                                const std::string& prefix,
+                                Array& files,
+                                bool wantFiles,
+                                bool includePath){
+#if _HAVE_ZIP
+    struct zip *z = zip_open( path.c_str(), ZIP_CHECKCONS, NULL );
+
+    Set fileSet;
+
+    int count = zip_get_num_files( z );
+    for( int i = 0; i < count; ++i ) {
+        struct zip_stat info;
+        zip_stat_init( &info );    // TODO: Docs unclear if zip_stat_init is required.
+        zip_stat_index( z, i, ZIP_FL_NOCASE, &info );
+        _zip_addEntry(path, prefix, info.name, fileSet, wantFiles, includePath);
+    }
+    
+    zip_close( z );
+    
+    fileSet.getMembers(files);
+#endif
+}
+
+
+static void determineFileOrDirList(
+	const std::string&			filespec,
+	Array&			files,
+	bool						wantFiles,
+	bool						includePath) {
+
+	// if it is a .zip, prefix will specify the folder within
+	// whose contents we want to see
+    std::string prefix = "";
+    std::string path = filenamePath(filespec);
+
+    if ((path.size() > 0) && isSlash(path[path.size() - 1])) {
+        // Strip the trailing slash
+        path = path.substr(0, path.length() -1);
+    }
+    
+    if ((path == "") || fileExists(path, false)) {
+        if ((path != "") && isZipfile(path)) {
+            // .zip should only work if * is specified as the Base + Ext
+            // Here, we have been asked for the root's contents
+            debugAssertM(filenameBaseExt(filespec) == "*", "Can only call getFiles/getDirs on zipfiles using '*' wildcard");
+            getFileOrDirListZip(path, prefix, files, wantFiles, includePath);
+        } else {
+            // It is a normal directory
+            getFileOrDirListNormal(filespec, files, wantFiles, includePath);
+        }
+    } else if (zipfileExists(filenamePath(filespec), path, prefix)) {
+        // .zip should only work if * is specified as the Base + Ext
+        // Here, we have been asked for the contents of a folder within the .zip
+        debugAssertM(filenameBaseExt(filespec) == "*", "Can only call getFiles/getDirs on zipfiles using '*' wildcard");
+        getFileOrDirListZip(path, prefix, files, wantFiles, includePath);
+    }
+}
+
+
+void getFiles(const std::string&			filespec,
+              Array&			files,
+              bool					includePath) {
+    
+    determineFileOrDirList(filespec, files, true, includePath);
+}
+
+
+void getDirs(
+	const std::string&			filespec,
+	Array&			files,
+	bool						includePath) {
+
+	determineFileOrDirList(filespec, files, false, includePath);
+}
+
+
+std::string filenameBaseExt(const std::string& filename) {
+    int i = filename.rfind("/");
+    int j = filename.rfind("\\");
+
+    if ((j > i) && (j >= 0)) {
+        i = j;
+    }
+
+#   ifdef G3D_WIN32
+        j = filename.rfind(":");
+        if ((i == -1) && (j >= 0)) {
+            i = j;
+        }
+#   endif
+
+    if (i == -1) {
+        return filename;
+    } else {
+        return filename.substr(i + 1, filename.length() - i);
+    }
+}
+
+
+std::string filenameBase(const std::string& s) {
+    std::string drive;
+    std::string base;
+    std::string ext;
+    Array path;
+
+    parseFilename(s, drive, path, base, ext);
+    return base;
+}
+
+
+std::string filenameExt(const std::string& filename) {
+    int i = filename.rfind(".");
+    if (i >= 0) {
+        return filename.substr(i + 1, filename.length() - i);
+    } else {
+        return "";
+    }
+}
+
+
+std::string filenamePath(const std::string& filename) {
+    int i = filename.rfind("/");
+    int j = filename.rfind("\\");
+
+    if ((j > i) && (j >= 0)) {
+        i = j;
+    }
+
+#   ifdef G3D_WIN32
+        j = filename.rfind(":");
+        if ((i == -1) && (j >= 0)) {
+            i = j;
+        }
+#   endif
+
+    if (i == -1) {
+        return "";
+    } else {
+        return filename.substr(0, i+1);
+    }
+}
+
+
+bool isZipfile(const std::string& filename) {
+
+	FILE* f = fopen(filename.c_str(), "r");
+	if (f == NULL) {
+		return false;
+	}
+	uint8 header[4];
+	fread(header, 4, 1, f);
+	
+	const uint8 zipHeader[4] = {0x50, 0x4b, 0x03, 0x04};
+	for (int i = 0; i < 4; ++i) {
+		if (header[i] != zipHeader[i]) {
+			fclose(f);
+			return false;
+		}
+	}
+
+	fclose(f);
+	return true;
+}
+
+
+bool isDirectory(const std::string& filename) {
+    struct _stat st;
+    bool exists = _stat(filename.c_str(), &st) != -1;
+    return exists && ((st.st_mode & S_IFDIR) != 0);
+}
+
+
+bool filenameContainsWildcards(const std::string& filename) {
+    return (filename.find('*') != std::string::npos) || (filename.find('?') != std::string::npos);
+}
+
+
+bool fileIsNewer(const std::string& src, const std::string& dst) {
+    struct _stat sts;
+    bool sexists = _stat(src.c_str(), &sts) != -1;
+
+    struct _stat dts;
+    bool dexists = _stat(dst.c_str(), &dts) != -1;
+
+    return sexists && ((! dexists) || (sts.st_mtime > dts.st_mtime));
+}
+
+
+Array filesUsed() {
+    Array f;
+    _internal::currentFilesUsed.getMembers(f);
+    return f;
+}
+
+}
+
+#ifndef G3D_WIN32
+  #undef _stat
+#endif
diff --git a/externals/g3dlite/format.cpp b/externals/g3dlite/format.cpp
new file mode 100644
index 00000000000..d9d1b516393
--- /dev/null
+++ b/externals/g3dlite/format.cpp
@@ -0,0 +1,164 @@
+/**
+ @file format.cpp
+
+ @author Morgan McGuire, graphics3d.com
+
+ @created 2000-09-09
+ @edited  2006-08-14
+*/
+
+#include "G3D/format.h"
+#include "G3D/platform.h"
+#include "G3D/System.h"
+
+#ifdef _MSC_VER
+    // disable: "C++ exception handler used"
+#   pragma warning (push)
+#   pragma warning (disable : 4530)
+#endif // _MSC_VER
+
+// If your platform does not have vsnprintf, you can find a
+// implementation at http://www.ijs.si/software/snprintf/
+
+namespace G3D {
+
+std::string __cdecl format(const char* fmt,...) {
+    va_list argList;
+    va_start(argList,fmt);
+    std::string result = vformat(fmt, argList);
+    va_end(argList);
+
+    return result;
+}
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1300)
+// Both MSVC seems to use the non-standard vsnprintf
+// so we are using vscprintf to determine buffer size, however
+// only MSVC7 and up headers include vscprintf for some reason.
+std::string vformat(const char *fmt, va_list argPtr) {
+    // We draw the line at a 1MB string.
+    const int maxSize = 1000000;
+
+    // If the string is less than 161 characters,
+    // allocate it on the stack because this saves
+    // the malloc/free time.
+    const int bufSize = 161;
+	char stackBuffer[bufSize];
+
+    // MSVC does not support va_copy
+    int actualSize = _vscprintf(fmt, argPtr) + 1;
+
+    if (actualSize > bufSize) {
+
+        // Now use the heap.
+        char* heapBuffer = NULL;
+
+        if (actualSize < maxSize) {
+
+            heapBuffer = (char*)System::malloc(maxSize + 1);
+            _vsnprintf(heapBuffer, maxSize, fmt, argPtr);
+            heapBuffer[maxSize] = '\0';
+        } else {
+            heapBuffer = (char*)System::malloc(actualSize);
+            vsprintf(heapBuffer, fmt, argPtr);            
+        }
+
+        std::string formattedString(heapBuffer);
+        System::free(heapBuffer);
+        return formattedString;
+    } else {
+
+        vsprintf(stackBuffer, fmt, argPtr);
+        return std::string(stackBuffer);
+    }
+}
+
+#elif defined(_MSC_VER) && (_MSC_VER < 1300)
+
+std::string vformat(const char *fmt, va_list argPtr) {
+    // We draw the line at a 1MB string.
+    const int maxSize = 1000000;
+
+    // If the string is less than 161 characters,
+    // allocate it on the stack because this saves
+    // the malloc/free time.
+    const int bufSize = 161;
+	char stackBuffer[bufSize];
+
+	// MSVC6 doesn't support va_copy, however it also seems to compile
+	// correctly if we just pass our argument list along.  Note that 
+	// this whole code block is only compiled if we're on MSVC6 anyway
+	int actualWritten = _vsnprintf(stackBuffer, bufSize, fmt, argPtr);
+
+    // Not a big enough buffer, bufSize characters written
+    if (actualWritten == -1) {
+
+        int heapSize = 512;
+        double powSize = 1.0;
+        char* heapBuffer = (char*)System::malloc(heapSize);
+        
+        while ((_vsnprintf(heapBuffer, heapSize, fmt, argPtr) == -1) &&
+            (heapSize  < maxSize)) {
+
+            heapSize = iCeil(heapSize * ::pow((double)2.0, powSize++));
+            heapBuffer = (char*)System::realloc(heapBuffer, heapSize);
+        }
+
+        heapBuffer[heapSize-1] = '\0';
+
+        std::string heapString(heapBuffer);
+        System::free(heapBuffer);
+
+        return heapString;
+    } else {
+
+        return std::string(stackBuffer);
+    }
+}
+
+#else
+
+// glibc 2.1 has been updated to the C99 standard
+std::string vformat(const char* fmt, va_list argPtr) {
+    // If the string is less than 161 characters,
+    // allocate it on the stack because this saves
+    // the malloc/free time.  The number 161 is chosen
+    // to support two lines of text on an 80 character
+    // console (plus the null terminator).
+    const int bufSize = 161;
+    char stackBuffer[bufSize];
+
+    va_list argPtrCopy;
+    va_copy(argPtrCopy, argPtr);
+    int numChars = vsnprintf(stackBuffer, bufSize, fmt, argPtrCopy);
+    va_end(argPtrCopy);
+
+    if (numChars >= bufSize) {
+      // We didn't allocate a big enough string.
+      char* heapBuffer = (char*)System::malloc((numChars + 1) * sizeof(char));
+
+      debugAssert(heapBuffer);
+      int numChars2 = vsnprintf(heapBuffer, numChars + 1, fmt, argPtr);
+      debugAssert(numChars2 == numChars);
+      (void)numChars2;
+
+      std::string result(heapBuffer);
+      
+      System::free(heapBuffer);
+
+      return result;
+
+    } else {
+
+      return std::string(stackBuffer);
+
+    }
+}
+
+#endif
+
+} // namespace
+
+#ifdef _MSC_VER
+#   pragma warning (pop)
+#endif
diff --git a/externals/g3dlite/g3dfnmatch.cpp b/externals/g3dlite/g3dfnmatch.cpp
new file mode 100644
index 00000000000..39ef7b31914
--- /dev/null
+++ b/externals/g3dlite/g3dfnmatch.cpp
@@ -0,0 +1,204 @@
+/*-
+* Copyright (c) 1992, 1993
+*The Regents of the University of California.  All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions
+* are met:
+* 1. Redistributions of source code must retain the above copyright
+*    notice, this list of conditions and the following disclaimer.
+* 2. Redistributions in binary form must reproduce the above copyright
+*    notice, this list of conditions and the following disclaimer in the
+*    documentation and/or other materials provided with the distribution.
+* 3. All advertising materials mentioning features or use of this software
+*    must display the following acknowledgement:
+*This product includes software developed by the University of
+*California, Berkeley and its contributors.
+* 4. Neither the name of the University nor the names of its contributors
+*    may be used to endorse or promote products derived from this software
+*    without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+* ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+* SUCH DAMAGE.
+*
+*@(#)fnmatch.h8.1 (Berkeley) 6/2/93
+*
+* From FreeBSD fnmatch.h 1.7
+* $Id: g3dfnmatch.cpp,v 1.2 2010/02/06 10:03:24 corey_taylor Exp $
+*/
+#include "G3D/g3dfnmatch.h"
+
+#ifdef G3D_WIN32
+
+#include 
+#include 
+#include 
+
+namespace G3D {
+
+#define EOS '\0'
+
+static const char *rangematch(const char *, char, int);
+
+int g3dfnmatch(const char *pattern, const char *string, int flags)
+{
+    const char *stringstart;
+    char c, test;
+
+    for (stringstart = string;;)
+        switch (c = *pattern++) {
+        case EOS:
+            if ((flags & FNM_LEADING_DIR) && *string == '/')
+                return (0);
+            return (*string == EOS ? 0 : FNM_NOMATCH);
+        case '?':
+            if (*string == EOS)
+                return (FNM_NOMATCH);
+            if (*string == '/' && (flags & FNM_PATHNAME))
+                return (FNM_NOMATCH);
+            if (*string == '.' && (flags & FNM_PERIOD) &&
+                (string == stringstart ||
+                 ((flags & FNM_PATHNAME) && *(string - 1) == '/')))
+                return (FNM_NOMATCH);
+            ++string;
+            break;
+        case '*':
+            c = *pattern;
+            /* Collapse multiple stars. */
+            while (c == '*')
+                c = *++pattern;
+
+            if (*string == '.' && (flags & FNM_PERIOD) &&
+                (string == stringstart ||
+                 ((flags & FNM_PATHNAME) && *(string - 1) == '/')))
+                return (FNM_NOMATCH);
+
+            /* Optimize for pattern with * at end or before /. */
+            if (c == EOS)
+                if (flags & FNM_PATHNAME)
+                    return ((flags & FNM_LEADING_DIR) ||
+                            strchr(string, '/') == NULL ?
+                            0 : FNM_NOMATCH);
+                else
+                    return (0);
+            else if (c == '/' && flags & FNM_PATHNAME) {
+                if ((string = strchr(string, '/')) == NULL)
+                    return (FNM_NOMATCH);
+                break;
+            }
+
+            /* General case, use recursion. */
+            while ((test = *string) != EOS) {
+                if (!rangematch(pattern, *string, flags & ~FNM_PERIOD))
+                    return (0);
+                if (test == '/' && flags & FNM_PATHNAME)
+                    break;
+                ++string;
+            }
+            return (FNM_NOMATCH);
+        case '[':
+            if (*string == EOS)
+                return (FNM_NOMATCH);
+            if (*string == '/' && flags & FNM_PATHNAME)
+                return (FNM_NOMATCH);
+            if ((pattern =
+                 rangematch(pattern, *string, flags)) == NULL)
+                return (FNM_NOMATCH);
+            ++string;
+            break;
+        case '\\':
+            if (!(flags & FNM_NOESCAPE)) {
+                if ((c = *pattern++) == EOS) {
+                    c = '\\';
+                    --pattern;
+                }
+            }
+            /* FALLTHROUGH */
+        default:
+            if (c == *string)
+                ;
+            else if ((flags & FNM_CASEFOLD) &&
+                     (tolower((unsigned char)c) ==
+                      tolower((unsigned char)*string)))
+                ;
+            else if ((flags & FNM_PREFIX_DIRS) && *string == EOS &&
+                     ((c == '/' && string != stringstart) ||
+                      (string == stringstart+1 && *stringstart == '/')))
+                return (0);
+            else
+                return (FNM_NOMATCH);
+            string++;
+            break;
+        }
+    /* NOTREACHED */
+}
+
+static const char *
+rangematch(const char *pattern, char test, int flags)
+{
+    int negate, ok;
+    char c, c2;
+
+    /*
+     * A bracket expression starting with an unquoted circumflex
+     * character produces unspecified results (IEEE 1003.2-1992,
+     * 3.13.2).  This implementation treats it like '!', for
+     * consistency with the regular expression syntax.
+     * J.T. Conklin (conklin@ngai.kaleida.com)
+     */
+    if ( (negate = (*pattern == '!' || *pattern == '^')) )
+        ++pattern;
+
+    if (flags & FNM_CASEFOLD)
+        test = tolower((unsigned char)test);
+
+    for (ok = 0; (c = *pattern++) != ']';) {
+        if (c == '\\' && !(flags & FNM_NOESCAPE))
+            c = *pattern++;
+        if (c == EOS)
+            return (NULL);
+
+        if (flags & FNM_CASEFOLD)
+            c = tolower((unsigned char)c);
+
+        if (*pattern == '-'
+            && (c2 = *(pattern+1)) != EOS && c2 != ']') {
+            pattern += 2;
+            if (c2 == '\\' && !(flags & FNM_NOESCAPE))
+                c2 = *pattern++;
+            if (c2 == EOS)
+                return (NULL);
+
+            if (flags & FNM_CASEFOLD)
+                c2 = tolower((unsigned char)c2);
+
+            if ((unsigned char)c <= (unsigned char)test &&
+                (unsigned char)test <= (unsigned char)c2)
+                ok = 1;
+        } else if (c == test)
+            ok = 1;
+    }
+    return (ok == negate ? NULL : pattern);
+}
+
+}
+
+#else
+
+namespace G3D {
+int g3dfnmatch(const char * a, const char *b, int c) {
+    return fnmatch(a, b, c);
+}
+}
+
+#endif
+
diff --git a/externals/g3dlite/g3dmath.cpp b/externals/g3dlite/g3dmath.cpp
new file mode 100644
index 00000000000..ad85e9efb9b
--- /dev/null
+++ b/externals/g3dlite/g3dmath.cpp
@@ -0,0 +1,108 @@
+/**
+ @file g3dmath.cpp
+ 
+ @author Morgan McGuire, graphics3d.com
+  
+ @created 2001-06-02
+ @edited  2004-02-24
+ */
+
+#include "G3D/g3dmath.h"
+#include 
+#include 
+
+namespace G3D {
+
+float gaussRandom(float mean, float stdev) {
+
+    // Using Box-Mueller method from http://www.taygeta.com/random/gaussian.html
+    // Modified to specify standard deviation and mean of distribution
+    float w, x1, x2;
+
+    // Loop until w is less than 1 so that log(w) is negative
+    do {
+        x1 = uniformRandom(-1.0, 1.0);
+        x2 = uniformRandom(-1.0, 1.0);
+
+        w = float(square(x1) + square(x2));
+    } while (w > 1.0f);
+
+    // Transform to gassian distribution
+    // Multiply by sigma (stdev ^ 2) and add mean.
+    return x2 * (float)square(stdev) * sqrtf((-2.0f * logf(w) ) / w) + mean; 
+}
+
+/** 
+    This value should not be tested against directly, instead
+    G3D::isNan() and G3D::isFinite() will return reliable results. */
+double inf() {
+    return std::numeric_limits::infinity();
+}
+
+bool isNaN(float x) {
+    static const float n = nan();
+    return memcmp(&x, &n, sizeof(float)) == 0;
+}
+
+bool isNaN(double x) {
+    static const double n = nan();
+    return memcmp(&x, &n, sizeof(double)) == 0;
+}
+
+
+/** 
+    This value should not be tested against directly, instead
+    G3D::isNan() and G3D::isFinite() will return reliable results. */
+float finf() {
+    return std::numeric_limits::infinity();
+}
+
+/** This value should not be tested against directly, instead
+    G3D::isNan() and G3D::isFinite() will return reliable results. */
+double nan() {
+    // double is a standard type and should have quiet NaN
+    return std::numeric_limits::quiet_NaN();
+}
+
+float fnan() {
+    // double is a standard type and should have quiet NaN
+    return std::numeric_limits::quiet_NaN();
+}
+
+
+int highestBit(uint32 x) {
+    // Binary search.
+    int base = 0;
+
+    if (x & 0xffff0000)	{
+        base = 16;
+        x >>= 16;
+    }
+    if (x & 0x0000ff00) {
+        base += 8;
+        x >>= 8;
+    }
+    if (x & 0x000000f0) {
+        base += 4;
+        x >>= 4;
+    }
+    
+    static const int lut[] = {-1,0,1,1,2,2,2,2,3,3,3,3,3,3,3,3};
+    return base + lut[x];
+}
+
+
+int iRandom(int low, int high) {
+    int r = iFloor(low + (high - low + 1) * (double)rand() / RAND_MAX);
+    
+    // There is a *very small* chance of generating
+    // a number larger than high.
+    if (r > high) {
+        return high;
+    } else {
+        return r;
+    }
+}
+
+
+}
diff --git a/externals/g3dlite/prompt.cpp b/externals/g3dlite/prompt.cpp
new file mode 100644
index 00000000000..6a28e6462b4
--- /dev/null
+++ b/externals/g3dlite/prompt.cpp
@@ -0,0 +1,729 @@
+/**
+ @file prompt.cpp
+ 
+ @author Morgan McGuire, http://graphics.cs.williams.edu 
+ @cite Windows dialog interface by Max McGuire, mmcguire@ironlore.com
+ @cite Font setting code by Kurt Miller, kurt@flipcode.com
+
+ @created 2000-08-26
+ @edited  2005-01-14
+ */
+
+#include "G3D/prompt.h"
+#include "G3D/platform.h"
+
+#include 
+
+#ifdef G3D_WIN32
+#    include 
+#    include 
+#else
+#    define _getch getchar
+#endif
+
+#ifdef G3D_OSX
+
+/*#ifdef __LP64__
+#    undef __LP64__
+#endif
+*/
+
+#    include 
+
+/*
+#ifdef G3D_64BIT
+#    define __LP64__
+#endif
+*/
+
+#endif
+
+namespace G3D {
+
+#ifdef G3D_WIN32
+
+namespace _internal {
+/**
+ Generic Win32 dialog facility.
+ @author Max McGuire
+ */
+class DialogTemplate {
+public:
+
+    DialogTemplate(LPCSTR caption, DWORD style, 
+                 int x, int y, int w, int h,
+                 LPCSTR font = NULL, WORD fontSize = 8) {
+    
+      usedBufferLength = sizeof(DLGTEMPLATE);
+      totalBufferLength = usedBufferLength;
+
+      dialogTemplate = (DLGTEMPLATE*)malloc(totalBufferLength);
+
+      dialogTemplate->style = style;
+        
+      if (font != NULL) {
+        dialogTemplate->style |= DS_SETFONT;
+      }
+        
+      dialogTemplate->x     = (short)x;
+      dialogTemplate->y     = (short)y;
+      dialogTemplate->cx    = (short)w;
+      dialogTemplate->cy    = (short)h;
+      dialogTemplate->cdit  = 0;
+        
+      dialogTemplate->dwExtendedStyle = 0;
+
+      // The dialog box doesn't have a menu or a special class
+      AppendData("\0", 2);
+      AppendData("\0", 2);
+
+      // Add the dialog's caption to the template
+
+      AppendString(caption);
+
+      if (font != NULL) {
+          AppendData(&fontSize, sizeof(WORD));
+          AppendString(font);
+      }
+    }
+
+  void AddComponent(LPCSTR type, LPCSTR caption, DWORD style, DWORD exStyle, int x, int y, int w, int h, WORD id) {
+
+      DLGITEMTEMPLATE item;
+
+      item.style = style;
+      item.x     = (short)x;
+      item.y     = (short)y;
+      item.cx    = (short)w;
+      item.cy    = (short)h;
+      item.id    = id;
+
+      item.dwExtendedStyle = exStyle;
+
+      AppendData(&item, sizeof(DLGITEMTEMPLATE));
+        
+      AppendString(type);
+      AppendString(caption);
+
+      WORD creationDataLength = 0;
+      AppendData(&creationDataLength, sizeof(WORD));
+
+      // Increment the component count
+      dialogTemplate->cdit++;
+
+    }
+
+
+  void AddButton(LPCSTR caption, DWORD style, DWORD exStyle, int x, int y, int w, int h, WORD id) {
+
+      AddStandardComponent(0x0080, caption, style, exStyle, x, y, w, h, id);
+
+      WORD creationDataLength = 0;
+      AppendData(&creationDataLength, sizeof(WORD));
+
+    }
+
+
+  void AddEditBox(LPCSTR caption, DWORD style, DWORD exStyle, int x, int y, int w, int h, WORD id) {
+
+      AddStandardComponent(0x0081, caption, style, exStyle, x, y, w, h, id);
+    
+      WORD creationDataLength = 0;
+      AppendData(&creationDataLength, sizeof(WORD));
+    
+    }
+
+
+  void AddStatic(LPCSTR caption, DWORD style, DWORD exStyle, int x, int y, int w, int h, WORD id) {
+
+      AddStandardComponent(0x0082, caption, style, exStyle, x, y, w, h, id);
+    
+      WORD creationDataLength = 0;
+      AppendData(&creationDataLength, sizeof(WORD));
+    
+    }
+
+
+  void AddListBox(LPCSTR caption, DWORD style, DWORD exStyle, int x, int y, int w, int h, WORD id) {
+
+      AddStandardComponent(0x0083, caption, style, exStyle, x, y, w, h, id);
+    
+      WORD creationDataLength = sizeof(WORD) + 5 * sizeof(WCHAR);
+      AppendData(&creationDataLength, sizeof(WORD));
+
+      AppendString("TEST");
+    
+    }
+    
+
+  void AddScrollBar(LPCSTR caption, DWORD style, DWORD exStyle, int x, int y, int w, int h, WORD id) {
+
+      AddStandardComponent(0x0084, caption, style, exStyle, x, y, w, h, id);
+    
+      WORD creationDataLength = 0;
+      AppendData(&creationDataLength, sizeof(WORD));
+    
+    }
+
+
+  void AddComboBox(LPCSTR caption, DWORD style, DWORD exStyle, int x, int y, int w, int h, WORD id) {
+
+      AddStandardComponent(0x0085, caption, style, exStyle, x, y, w, h, id);
+    
+      WORD creationDataLength = 0;
+      AppendData(&creationDataLength, sizeof(WORD));
+
+    }
+
+
+  /**
+   *
+   * Returns a pointer to the Win32 dialog template which the object
+   * represents. This pointer may become invalid if additional components
+   * are added to the template.
+   *
+   */
+  operator const DLGTEMPLATE*() const {
+      return dialogTemplate;
+  }
+
+  virtual ~DialogTemplate() {
+      free(dialogTemplate);
+  }
+
+protected:
+
+  void AddStandardComponent(WORD type, LPCSTR caption, DWORD style, DWORD exStyle, 
+                            int x, int y, int w, int h, WORD id, LPSTR font = NULL, WORD fontSize = 8) {
+
+      DLGITEMTEMPLATE item;
+
+      // DWORD align the beginning of the component data
+        
+      AlignData(sizeof(DWORD));
+
+      item.style = style;
+      if (font != NULL) {
+          item.style |= DS_SETFONT;
+      }
+      item.x     = (short)x;
+      item.y     = (short)y;
+      item.cx    = (short)w;
+      item.cy    = (short)h;
+      item.id    = id;
+
+      item.dwExtendedStyle = exStyle;
+
+      AppendData(&item, sizeof(DLGITEMTEMPLATE));
+        
+      WORD preType = 0xFFFF;
+        
+      AppendData(&preType, sizeof(WORD));
+      AppendData(&type, sizeof(WORD));
+
+      AppendString(caption);
+
+      if (font != NULL) {
+          AppendData(&fontSize, sizeof(WORD));
+          AppendString(font);
+      }
+
+      // Increment the component count
+      dialogTemplate->cdit++;
+  }
+
+    
+  void AlignData(int size) {
+
+      int paddingSize = usedBufferLength % size;
+        
+      if (paddingSize != 0) {
+          EnsureSpace(paddingSize);
+          usedBufferLength += paddingSize;
+      }
+
+  }
+
+  void AppendString(LPCSTR string) {
+
+      int length = MultiByteToWideChar(CP_ACP, 0, string, -1, NULL, 0);
+
+      WCHAR* wideString = (WCHAR*)malloc(sizeof(WCHAR) * length);
+      MultiByteToWideChar(CP_ACP, 0, string, -1, wideString, length);
+
+      AppendData(wideString, length * sizeof(WCHAR));
+      free(wideString);
+
+  }
+
+  void AppendData(const void* data, int dataLength) {
+
+      EnsureSpace(dataLength);
+
+      memcpy((char*)dialogTemplate + usedBufferLength, data, dataLength);
+      usedBufferLength += dataLength;
+
+  }
+
+  void EnsureSpace(int length) {
+      if (length + usedBufferLength > totalBufferLength) {
+          totalBufferLength += length * 2;
+
+          void* newBuffer = malloc(totalBufferLength);
+          memcpy(newBuffer, dialogTemplate, usedBufferLength);
+            
+          free(dialogTemplate);
+          dialogTemplate = (DLGTEMPLATE*)newBuffer;
+      }
+  }
+
+private:
+
+  DLGTEMPLATE*      dialogTemplate;
+
+  int               totalBufferLength;
+  int               usedBufferLength;
+
+};
+
+
+struct PromptParams {
+    const char* message;
+    const char* title;
+};
+
+/**
+ * Constants for controls.
+ */
+#define IDC_MESSAGE     1000
+#define IDC_BUTTON0     2000
+
+INT_PTR CALLBACK PromptDlgProc(HWND hDlg, UINT msg,
+                               WPARAM wParam, LPARAM lParam) {
+  switch(msg) {
+    case WM_INITDIALOG:
+      {
+        PromptParams *params = (PromptParams*)lParam;
+        ::SetWindowTextA(::GetDlgItem(hDlg, IDC_MESSAGE), params->message);
+
+        ::SetFocus(::GetDlgItem(hDlg, IDC_BUTTON0));
+
+        SetWindowTextA(hDlg, params->title);
+
+        HFONT hfont =
+            CreateFontA(16, 0, 0, 0, FW_NORMAL,
+                       FALSE, FALSE, FALSE, 
+                       ANSI_CHARSET,OUT_DEFAULT_PRECIS,CLIP_DEFAULT_PRECIS,
+                        PROOF_QUALITY, FIXED_PITCH | FF_MODERN, "Courier New");
+                        
+        SendDlgItemMessage(hDlg, IDC_MESSAGE, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE,0));
+
+
+        break;
+      }
+    case WM_COMMAND:
+      {
+          int choiceNumber = LOWORD(wParam) - IDC_BUTTON0;
+          if ((choiceNumber >= 0) && (choiceNumber < 10)) {
+              EndDialog(hDlg, choiceNumber);
+              return TRUE;
+          }
+      }
+
+      break;
+
+    case WM_NCDESTROY:
+        // Under SDL 1.2.6 we get a NCDESTROY message for no reason and the
+        // window is immediately closed.  This is here to debug the problem.
+        (void)0;
+        break;
+
+    }
+
+    return FALSE;
+}
+
+}; // namespace _internal
+
+
+using namespace _internal;
+
+/**
+ * Show a dialog prompt.
+ */
+static int guiPrompt(
+    const char*         windowTitle,
+    const char*         prompt,
+    const char**        choice,
+    int                 numChoices) {
+
+    int width = 280;
+    int height = 128;
+
+    const int buttonSpacing = 2;
+    const int buttonWidth = 
+        (width - buttonSpacing * 2 - 
+          buttonSpacing * (numChoices - 1)) / numChoices;
+    const int buttonHeight = 13;
+
+
+    DialogTemplate dialogTemplate(
+        windowTitle,
+        WS_CAPTION | DS_CENTER | WS_SYSMENU,
+        10, 10, width, height,
+        "Tahoma");
+
+    dialogTemplate.AddEditBox(
+        "Edit", WS_VISIBLE | ES_READONLY | ES_OEMCONVERT | ES_MULTILINE | WS_TABSTOP, WS_EX_STATICEDGE,
+        2, 2, width - 4, height - buttonHeight - 7, IDC_MESSAGE);
+
+    int i;
+    for (i = 0; i < numChoices; i++) {
+
+        int x = buttonSpacing + i * (buttonWidth + buttonSpacing);
+        int y = height - buttonHeight - buttonSpacing;
+
+        dialogTemplate.AddButton(choice[i], WS_VISIBLE | WS_TABSTOP, 0,
+                           x, y, buttonWidth, buttonHeight, IDC_BUTTON0 + (WORD)i);
+        
+    }
+
+    // Convert all single \n characters to \r\n for proper printing
+    int strLen = 0;
+    const char* pStr = prompt;
+
+    while (*pStr != '\0') {
+        if ((*pStr == '\n') && (pStr != prompt)) {
+            if (*(pStr - 1) != '\r') {
+                ++strLen;
+            }
+        }
+        ++strLen;
+        ++pStr;
+    }
+
+    char* newStr = (char*)malloc(strLen + 1);
+    
+    const char* pStr2 = prompt;
+    char* pNew = newStr;
+
+    while (*pStr2 != '\0') {
+        if ((*pStr2 == '\n') && (pStr2 != prompt)) {
+            if (*(pStr2 - 1) != '\r') {
+                *pNew = '\r';
+                ++pNew;
+            }
+        }
+        *pNew = *pStr2;
+        ++pNew;
+        ++pStr2;
+    }
+
+    *pNew = '\0';
+
+    PromptParams params;
+    params.message  = newStr;;
+    params.title    = windowTitle;
+
+    HMODULE module = GetModuleHandle(0);
+    int ret = DialogBoxIndirectParam(module, dialogTemplate, NULL, (DLGPROC) PromptDlgProc, (DWORD)¶ms);
+
+    free(newStr);
+
+    /*
+     For debugging when DialogBoxIndirectParam fails:
+
+        // The last error value.  (Which is preserved across the call).
+        DWORD lastErr = GetLastError();
+    
+        // The decoded message from FormatMessage
+        LPTSTR formatMsg = NULL;
+
+        if (NULL == formatMsg) {
+            FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
+                          FORMAT_MESSAGE_IGNORE_INSERTS |
+                          FORMAT_MESSAGE_FROM_SYSTEM,
+                            NULL,
+                            lastErr,
+                            0,
+                            (LPTSTR)&formatMsg,
+                            0,
+                            NULL);
+        }
+
+        // Make sure the message got translated into something.
+        LPTSTR realLastErr;
+        if (NULL != formatMsg) {
+            realLastErr = formatMsg;
+        } else {
+            realLastErr = "Last error code does not exist.";
+        }
+
+        // Get rid of the allocated memory from FormatMessage.
+        if (NULL != formatMsg) {
+            LocalFree((LPVOID)formatMsg);
+        }
+        */
+
+    return ret;
+}
+
+#endif
+
+
+/**
+ * Show a prompt on stdout 
+ */
+static int textPrompt(
+    const char*         windowTitle,
+    const char*         prompt,
+    const char**        choice,
+    int                 numChoices) {
+
+    printf("\n___________________________________________________\n");
+    printf("%s\n", windowTitle);
+    printf("%s", prompt);
+
+    if (numChoices > 10) {
+        numChoices = 10;
+    }
+
+    int c = -1;
+    if (numChoices > 1) {
+        printf("\n");
+        printf("Choose an option by number:");
+
+        while ((c < 0) || (c >= numChoices)) { 
+            printf("\n");
+
+            for (int i = 0; i < numChoices; i++) {
+                if (numChoices <= 3) {
+                    printf("  (%d) %s ", i, choice[i]);
+                } else {
+                    printf("  (%d) %s\n", i, choice[i]);
+                }
+            }
+
+            printf("\n> ");
+            c = _getch() - '0';
+
+            if ((c < 0) || (c >= numChoices)) {
+                printf("'%d' is not a valid choice.", c);
+            } else {
+                printf("%d", c);
+            }
+        }
+    
+    } else if (numChoices == 1) {
+        
+        printf("\nPress any key for '%s'...", choice[0]);
+        _getch();
+        c = 0;
+
+    } else {
+
+        printf("\nPress any key...");
+        _getch();
+        c = 0;
+    }
+
+    printf("\n___________________________________________________\n");
+    return c;
+}
+
+#ifdef G3D_OSX
+
+// See http://developer.apple.com/documentation/Carbon/Reference/Carbon_Event_Manager_Ref/index.html
+
+#define CARBON_COMMANDID_START	128
+#define CARBON_BUTTON_SPACING	12
+#define CARBON_BUTTON_HEIGHT	20
+#define CARBON_BUTTON_MINWIDTH	69
+#define CARBON_WINDOW_PADDING	20
+
+struct CallbackData {
+    WindowRef	refWindow;
+
+    /** Index of this particular button */
+    int         myIndex;
+
+    /** Buttons store their index into here when pressed. */
+    int*        whichButton;
+};
+
+/**
+ Assumes that userData is a pointer to a carbon_evt_data_t.
+ 
+ */
+static pascal OSStatus DoCommandEvent(EventHandlerCallRef handlerRef, EventRef event, void* userData) {
+    // See http://developer.apple.com/documentation/Carbon/Conceptual/HandlingWindowsControls/index.html
+
+    CallbackData& callbackData = *(CallbackData*)userData;
+
+#   pragma unused(handlerRef)
+	
+    callbackData.whichButton[0] = callbackData.myIndex;
+	
+    // If we get here we can close the window
+    ::QuitAppModalLoopForWindow(callbackData.refWindow);
+	
+    // Return noErr to indicate that we handled the event
+    return noErr;
+}
+
+static int guiPrompt
+(const char*         windowTitle,
+ const char*         prompt,
+ const char**        choice,
+ int                 numChoices) {
+
+    WindowRef	 window;
+
+    int          iNumButtonRows	= 0;
+    int          iButtonWidth   = -1;
+    OSStatus	 err            = noErr;
+    
+    // Determine number of rows of buttons
+    while (iButtonWidth < CARBON_BUTTON_MINWIDTH) {
+        ++iNumButtonRows;
+        iButtonWidth = 
+            (550 - (CARBON_WINDOW_PADDING*2 + 
+                    (CARBON_BUTTON_SPACING*numChoices))) / 
+            (numChoices/iNumButtonRows);
+    }
+	
+    // Window Variables
+    Rect	rectWin = {0, 0, 200 + ((iNumButtonRows-1) * (CARBON_BUTTON_HEIGHT+CARBON_BUTTON_SPACING)), 550};			// top, left, bottom, right
+    CFStringRef	szWindowTitle = CFStringCreateWithCString(kCFAllocatorDefault, windowTitle, kCFStringEncodingUTF8);
+
+    window = NULL;
+
+    err = CreateNewWindow(kMovableAlertWindowClass, kWindowStandardHandlerAttribute|kWindowCompositingAttribute, &rectWin, &window);
+    err = SetWindowTitleWithCFString(window, szWindowTitle);
+    err = SetThemeWindowBackground(window, kThemeBrushAlertBackgroundActive, false);
+    assert(err == noErr);
+    
+    // Event Handler Variables
+    EventTypeSpec	buttonSpec[] = {{ kEventClassControl, kEventControlHit }, { kEventClassCommand, kEventCommandProcess }};
+    EventHandlerUPP	buttonHandler = NewEventHandlerUPP(DoCommandEvent);
+    
+    // Static Text Variables
+    Rect		rectStatic = {20, 20, 152, 530};
+    CFStringRef		szStaticText = CFStringCreateWithCString(kCFAllocatorDefault, prompt, kCFStringEncodingUTF8);
+    ControlRef		refStaticText = NULL;
+    err = CreateStaticTextControl(window, &rectStatic, szStaticText, NULL, &refStaticText);
+    
+    // Button Variables
+    Rect		bounds[numChoices];
+    CFStringRef		caption[numChoices];
+    ControlRef		button[numChoices];
+
+    int whichButton=-1;
+    CallbackData        callbackData[numChoices];
+	
+    // Create the Buttons and assign event handlers
+    for (int i = 0; i < numChoices; ++i) {
+        bounds[i].top	 = 160 + ((CARBON_BUTTON_HEIGHT+CARBON_BUTTON_SPACING)*(i%iNumButtonRows));
+        bounds[i].right	 = 530 - ((iButtonWidth+CARBON_BUTTON_SPACING)*(i/iNumButtonRows));
+        bounds[i].left	 = bounds[i].right - iButtonWidth;
+        bounds[i].bottom = bounds[i].top + CARBON_BUTTON_HEIGHT;
+        
+        // Convert the button captions to Apple strings
+        caption[i] = CFStringCreateWithCString(kCFAllocatorDefault, choice[i], kCFStringEncodingUTF8);
+    
+        err = CreatePushButtonControl(window, &bounds[i], caption[i], &button[i]);
+        assert(err == noErr);
+
+        err = SetControlCommandID(button[i], CARBON_COMMANDID_START + i);
+        assert(err == noErr);
+
+        callbackData[i].refWindow   = window;
+        callbackData[i].myIndex     = i;
+        callbackData[i].whichButton = &whichButton;
+
+        err = InstallControlEventHandler(button[i], buttonHandler, 
+                                         GetEventTypeCount(buttonSpec), buttonSpec,
+                                         &callbackData[i], NULL);
+        assert(err == noErr);
+    }
+    
+    // Show Dialog
+    err = RepositionWindow(window, NULL, kWindowCenterOnMainScreen);
+    ShowWindow(window);
+    BringToFront(window);
+    err = ActivateWindow(window, true);
+    
+    // Hack to get our window/process to the front...
+    ProcessSerialNumber psn = { 0, kCurrentProcess};    
+    TransformProcessType(&psn, kProcessTransformToForegroundApplication);
+    SetFrontProcess (&psn);
+    
+    // Run in Modal State
+    err = RunAppModalLoopForWindow(window);
+
+    // Dispose of Button Related Data
+    for (int i = 0; i < numChoices; ++i) {
+        // Dispose of controls
+        DisposeControl(button[i]);
+        
+        // Release CFStrings
+        CFRelease(caption[i]);
+    }
+    
+    // Dispose of Other Controls
+    DisposeControl(refStaticText);
+    
+    // Dispose of Event Handlers
+    DisposeEventHandlerUPP(buttonHandler);
+    
+    // Dispose of Window
+    DisposeWindow(window);
+    
+    // Release CFStrings
+    CFRelease(szWindowTitle);
+    CFRelease(szStaticText);
+    
+    // Return Selection
+    return whichButton;
+}
+
+#endif
+
+int prompt(
+    const char*      windowTitle,
+    const char*      prompt, 
+    const char**     choice,
+    int              numChoices,
+    bool             useGui) {
+
+    #ifdef G3D_WIN32
+        if (useGui) {
+            // Build the message box
+            return guiPrompt(windowTitle, prompt, choice, numChoices);
+        }
+    #endif
+    
+        #ifdef G3D_OSX
+                if (useGui){
+                        //Will default to text prompt if numChoices > 4
+                        return guiPrompt(windowTitle, prompt, choice, numChoices);
+                }
+        #endif
+    return textPrompt(windowTitle, prompt, choice, numChoices);
+}
+
+
+void msgBox(
+    const std::string& message,
+    const std::string& title) {
+
+    const char *choice[] = {"Ok"};
+    prompt(title.c_str(), message.c_str(), choice, 1, true); 
+}
+
+#ifndef G3D_WIN32
+    #undef _getch
+#endif
+
+};// namespace
+
diff --git a/externals/g3dlite/stringutils.cpp b/externals/g3dlite/stringutils.cpp
new file mode 100644
index 00000000000..c3876ebb6a4
--- /dev/null
+++ b/externals/g3dlite/stringutils.cpp
@@ -0,0 +1,275 @@
+/**
+ @file stringutils.cpp
+
+ @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+
+ @created 2000-09-09
+ @edited  2008-01-10
+*/
+
+#include "G3D/platform.h"
+#include "G3D/stringutils.h"
+#include "G3D/BinaryInput.h"
+#include 
+
+namespace G3D {
+
+#ifdef _MSC_VER
+    // disable: "C++ exception handler used"
+#   pragma warning (push)
+#   pragma warning (disable : 4530)
+#endif
+#ifdef G3D_WIN32
+    const char* NEWLINE = "\r\n";
+#else
+    const char* NEWLINE = "\n";
+    static bool iswspace(int ch) { return (ch==' ' || ch=='\t' || ch=='\n' || ch=='\r'); }
+#endif
+
+void parseCommaSeparated(const std::string s, Array& array, bool stripQuotes) {
+    array.fastClear();
+    if (s == "") {
+        return;
+    }
+
+    size_t begin = 0;
+    const char delimiter = ',';
+    const char quote = '\"';
+    do {
+        size_t end = begin;
+        // Find the next comma, or the end of the string
+        bool inQuotes = false;
+        while ((end < s.length()) && (inQuotes || (s[end] != delimiter))) {
+            if (s[end] == quote) {
+                if ((end < s.length() - 2) && (s[end + 1] == quote) && (s[end + 2]) == quote) {
+                    // Skip over the superquote
+                    end += 2;
+                }
+                inQuotes = ! inQuotes;
+            }
+            ++end;
+        }
+        array.append(s.substr(begin, end - begin));
+        begin = end + 1;
+    } while (begin < s.length());
+
+    if (stripQuotes) {
+        for (int i = 0; i < array.length(); ++i) {
+            std::string& t = array[i];
+            int L = t.length();
+            if ((L > 1) && (t[0] == quote) && (t[L - 1] == quote)) {
+                if ((L > 6)  && (t[1] == quote) && (t[2] == quote) && (t[L - 3] == quote) && (t[L - 2] == quote)) {
+                    // Triple-quote
+                    t = t.substr(3, L - 6);
+                } else {
+                    // Double-quote
+                    t = t.substr(1, L - 2);
+                }
+            }
+        }
+    }
+}
+
+bool beginsWith(
+    const std::string& test,
+    const std::string& pattern) {
+
+    if (test.size() >= pattern.size()) {
+        for (int i = 0; i < (int)pattern.size(); ++i) {
+            if (pattern[i] != test[i]) {
+                return false;
+            }
+        }
+        return true;
+    } else {
+        return false;
+    }
+}
+
+
+bool endsWith(
+    const std::string& test,
+    const std::string& pattern) {
+
+    if (test.size() >= pattern.size()) {
+        int te = test.size() - 1;
+        int pe = pattern.size() - 1;
+        for (int i = pattern.size() - 1; i >= 0; --i) {
+            if (pattern[pe - i] != test[te - i]) {
+                return false;
+            }
+        }
+        return true;
+    } else {
+        return false;
+    }
+}
+
+
+std::string wordWrap(
+    const std::string&      input,
+    int                     numCols) {
+
+    std::string output;
+    size_t      c = 0;
+    int         len;
+
+    // Don't make lines less than this length
+    int         minLength = numCols / 4;
+    size_t      inLen = input.size();
+
+    bool first = true;
+    while (c < inLen) {
+        if (first) {
+            first = false;
+        } else {
+            output += NEWLINE;
+        }
+
+        if ((int)inLen - (int)c - 1 < numCols) {
+            // The end
+            output += input.substr(c, inLen - c);
+            break;
+        }
+
+        len = numCols;
+
+        // Look at character c + numCols, see if it is a space.
+        while ((len > minLength) &&
+               (input[c + len] != ' ')) {
+            len--;
+        }
+
+        if (len == minLength) {
+            // Just crop
+            len = numCols;
+
+        }
+
+        output += input.substr(c, len);
+        c += len;
+        if (c < input.size()) {
+            // Collapse multiple spaces.
+            while ((input[c] == ' ') && (c < input.size())) {
+                c++;
+            }
+        }
+    }
+
+    return output;
+}
+
+
+int stringCompare(
+    const std::string&      s1,
+    const std::string&      s2) {
+
+    return stringPtrCompare(&s1, &s2);
+}
+
+
+int stringPtrCompare(
+    const std::string*      s1,
+    const std::string*      s2) {
+
+    return s1->compare(*s2);
+}
+
+
+std::string toUpper(const std::string& x) {
+    std::string result = x;
+    std::transform(result.begin(), result.end(), result.begin(), toupper);
+    return result;
+}
+
+
+std::string toLower(const std::string& x) {
+    std::string result = x;
+    std::transform(result.begin(), result.end(), result.begin(), tolower);
+    return result;
+}
+
+
+Array stringSplit(
+    const std::string&          x,
+    char                        splitChar) {
+
+    Array out;
+    
+    // Pointers to the beginning and end of the substring
+    const char* start = x.c_str();
+    const char* stop = start;
+    
+    while ((stop = strchr(start, splitChar))) {
+        out.append(std::string(start, stop - start));
+        start = stop + 1;
+    }
+
+    // Append the last one
+    out.append(std::string(start));
+    
+    return out;
+}
+
+
+std::string stringJoin(
+    const Array&   a,
+    char                        joinChar) {
+
+    std::string out;
+
+    for (int i = 0; i < (int)a.size() - 1; ++i) {
+        out += a[i] + joinChar;
+    }
+
+    if (a.size() > 0) {
+        return out + a.last();
+    } else {
+        return out;
+    }
+}
+
+
+std::string stringJoin(
+    const Array&   a,
+    const std::string&          joinStr) {
+
+    std::string out;
+
+    for (int i = 0; i < (int)a.size() - 1; ++i) {
+        out += a[i] + joinStr;
+    }
+
+    if (a.size() > 0) {
+        return out + a.last();
+    } else {
+        return out;
+    }
+}
+
+
+std::string trimWhitespace(
+    const std::string&              s) {
+
+    size_t left = 0;
+    
+    // Trim from left
+    while ((left < s.length()) && iswspace(s[left])) {
+        ++left;
+    }
+
+    int right = s.length() - 1;
+    // Trim from right
+    while ((right > (int)left) && iswspace(s[right])) {
+        --right;
+    }
+    
+    return s.substr(left, right - left + 1);
+}
+
+}; // namespace
+
+#undef NEWLINE
+#ifdef _MSC_VER
+#   pragma warning (pop)
+#endif
diff --git a/externals/jemalloc/CMakeLists.txt b/externals/jemalloc/CMakeLists.txt
index c3e4e81782c..1e32407b456 100644
--- a/externals/jemalloc/CMakeLists.txt
+++ b/externals/jemalloc/CMakeLists.txt
@@ -1,27 +1,15 @@
-SET(jmalloc_STAT_SRC
-  arena.c  
-  chunk.c      
-  chunk_mmap.c  
-  ckh.c  
-  extent.c  
-  huge.c      
-  mb.c     
-  prof.c   
-  tcache.c
-  base.c   
-  chunk_dss.c  
-  chunk_swap.c 
-  ctl.c  
-  hash.c    
-  jemalloc.c  
-  mutex.c  
-  stats.c
-  )
+
+file(GLOB sources *.c)
+set(jemalloc_STAT_SRC
+  ${sources}
+)
 
 include_directories(
-  ${CMAKE_SOURCE_DIR}/dep/include
-  )
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}/include
+  ${CMAKE_CURRENT_SOURCE_DIR}/include/internal
+)
 
 add_definitions(-D_GNU_SOURCE -D_REENTRANT)
 
-add_library(jmalloc STATIC ${jmalloc_STAT_SRC})
\ No newline at end of file
+add_library(jemalloc STATIC ${sources})
diff --git a/externals/jemalloc/include/internal/arena.h b/externals/jemalloc/include/internal/arena.h
deleted file mode 100644
index bb4ce2a54f7..00000000000
--- a/externals/jemalloc/include/internal/arena.h
+++ /dev/null
@@ -1,537 +0,0 @@
-/******************************************************************************/
-#ifdef JEMALLOC_H_TYPES
-
-/*
- * Subpages are an artificially designated partitioning of pages.  Their only
- * purpose is to support subpage-spaced size classes.
- *
- * There must be at least 4 subpages per page, due to the way size classes are
- * handled.
- */
-#define	LG_SUBPAGE		8
-#define	SUBPAGE			((size_t)(1U << LG_SUBPAGE))
-#define	SUBPAGE_MASK		(SUBPAGE - 1)
-
-/* Return the smallest subpage multiple that is >= s. */
-#define	SUBPAGE_CEILING(s)						\
-	(((s) + SUBPAGE_MASK) & ~SUBPAGE_MASK)
-
-#ifdef JEMALLOC_TINY
-   /* Smallest size class to support. */
-#  define LG_TINY_MIN		LG_SIZEOF_PTR
-#endif
-
-/*
- * Maximum size class that is a multiple of the quantum, but not (necessarily)
- * a power of 2.  Above this size, allocations are rounded up to the nearest
- * power of 2.
- */
-#define	LG_QSPACE_MAX_DEFAULT	7
-
-/*
- * Maximum size class that is a multiple of the cacheline, but not (necessarily)
- * a power of 2.  Above this size, allocations are rounded up to the nearest
- * power of 2.
- */
-#define	LG_CSPACE_MAX_DEFAULT	9
-
-/*
- * RUN_MAX_OVRHD indicates maximum desired run header overhead.  Runs are sized
- * as small as possible such that this setting is still honored, without
- * violating other constraints.  The goal is to make runs as small as possible
- * without exceeding a per run external fragmentation threshold.
- *
- * We use binary fixed point math for overhead computations, where the binary
- * point is implicitly RUN_BFP bits to the left.
- *
- * Note that it is possible to set RUN_MAX_OVRHD low enough that it cannot be
- * honored for some/all object sizes, since there is one bit of header overhead
- * per object (plus a constant).  This constraint is relaxed (ignored) for runs
- * that are so small that the per-region overhead is greater than:
- *
- *   (RUN_MAX_OVRHD / (reg_size << (3+RUN_BFP))
- */
-#define	RUN_BFP			12
-/*                                    \/   Implicit binary fixed point. */
-#define	RUN_MAX_OVRHD		0x0000003dU
-#define	RUN_MAX_OVRHD_RELAX	0x00001800U
-
-/*
- * The minimum ratio of active:dirty pages per arena is computed as:
- *
- *   (nactive >> opt_lg_dirty_mult) >= ndirty
- *
- * So, supposing that opt_lg_dirty_mult is 5, there can be no less than 32
- * times as many active pages as dirty pages.
- */
-#define	LG_DIRTY_MULT_DEFAULT	5
-
-typedef struct arena_chunk_map_s arena_chunk_map_t;
-typedef struct arena_chunk_s arena_chunk_t;
-typedef struct arena_run_s arena_run_t;
-typedef struct arena_bin_s arena_bin_t;
-typedef struct arena_s arena_t;
-
-#endif /* JEMALLOC_H_TYPES */
-/******************************************************************************/
-#ifdef JEMALLOC_H_STRUCTS
-
-/* Each element of the chunk map corresponds to one page within the chunk. */
-struct arena_chunk_map_s {
-	union {
-		/*
-		 * Linkage for run trees.  There are two disjoint uses:
-		 *
-		 * 1) arena_t's runs_avail_{clean,dirty} trees.
-		 * 2) arena_run_t conceptually uses this linkage for in-use
-		 *    non-full runs, rather than directly embedding linkage.
-		 */
-		rb_node(arena_chunk_map_t)	rb_link;
-		/*
-		 * List of runs currently in purgatory.  arena_chunk_purge()
-		 * temporarily allocates runs that contain dirty pages while
-		 * purging, so that other threads cannot use the runs while the
-		 * purging thread is operating without the arena lock held.
-		 */
-		ql_elm(arena_chunk_map_t)	ql_link;
-	}				u;
-
-#ifdef JEMALLOC_PROF
-	/* Profile counters, used for large object runs. */
-	prof_thr_cnt_t			*prof_cnt;
-#endif
-
-	/*
-	 * Run address (or size) and various flags are stored together.  The bit
-	 * layout looks like (assuming 32-bit system):
-	 *
-	 *   ???????? ???????? ????---- ----dzla
-	 *
-	 * ? : Unallocated: Run address for first/last pages, unset for internal
-	 *                  pages.
-	 *     Small: Run page offset.
-	 *     Large: Run size for first page, unset for trailing pages.
-	 * - : Unused.
-	 * d : dirty?
-	 * z : zeroed?
-	 * l : large?
-	 * a : allocated?
-	 *
-	 * Following are example bit patterns for the three types of runs.
-	 *
-	 * p : run page offset
-	 * s : run size
-	 * c : size class (used only if prof_promote is true)
-	 * x : don't care
-	 * - : 0
-	 * + : 1
-	 * [DZLA] : bit set
-	 * [dzla] : bit unset
-	 *
-	 *   Unallocated (clean):
-	 *     ssssssss ssssssss ssss---- ----dz--
-	 *     xxxxxxxx xxxxxxxx xxxx---- -----Zxx
-	 *     ssssssss ssssssss ssss---- ----dZ--
-	 *
-	 *   Unallocated (dirty):
-	 *     ssssssss ssssssss ssss---- ----D---
-	 *     xxxxxxxx xxxxxxxx xxxx---- ----xxxx
-	 *     ssssssss ssssssss ssss---- ----D---
-	 *
-	 *   Small:
-	 *     pppppppp pppppppp pppp---- ----d--a
-	 *     pppppppp pppppppp pppp---- -------a
-	 *     pppppppp pppppppp pppp---- ----d--a
-	 *
-	 *   Large:
-	 *     ssssssss ssssssss ssss++++ ++++D-la
-	 *     xxxxxxxx xxxxxxxx xxxx---- ----xxxx
-	 *     -------- -------- -------- ----D-la
-	 *
-	 *   Large (sampled, size <= PAGE_SIZE):
-	 *     ssssssss ssssssss sssscccc ccccD-la
-	 *
-	 *   Large (not sampled, size == PAGE_SIZE):
-	 *     ssssssss ssssssss ssss++++ ++++D-la
-	 */
-	size_t				bits;
-#ifdef JEMALLOC_PROF
-#define	CHUNK_MAP_CLASS_SHIFT	4
-#define	CHUNK_MAP_CLASS_MASK	((size_t)0xff0U)
-#endif
-#define	CHUNK_MAP_FLAGS_MASK	((size_t)0xfU)
-#define	CHUNK_MAP_DIRTY		((size_t)0x8U)
-#define	CHUNK_MAP_ZEROED	((size_t)0x4U)
-#define	CHUNK_MAP_LARGE		((size_t)0x2U)
-#define	CHUNK_MAP_ALLOCATED	((size_t)0x1U)
-#define	CHUNK_MAP_KEY		CHUNK_MAP_ALLOCATED
-};
-typedef rb_tree(arena_chunk_map_t) arena_avail_tree_t;
-typedef rb_tree(arena_chunk_map_t) arena_run_tree_t;
-
-/* Arena chunk header. */
-struct arena_chunk_s {
-	/* Arena that owns the chunk. */
-	arena_t		*arena;
-
-	/* Linkage for the arena's chunks_dirty list. */
-	ql_elm(arena_chunk_t) link_dirty;
-
-	/*
-	 * True if the chunk is currently in the chunks_dirty list, due to
-	 * having at some point contained one or more dirty pages.  Removal
-	 * from chunks_dirty is lazy, so (dirtied && ndirty == 0) is possible.
-	 */
-	bool		dirtied;
-
-	/* Number of dirty pages. */
-	size_t		ndirty;
-
-	/* Map of pages within chunk that keeps track of free/large/small. */
-	arena_chunk_map_t map[1]; /* Dynamically sized. */
-};
-typedef rb_tree(arena_chunk_t) arena_chunk_tree_t;
-
-struct arena_run_s {
-#ifdef JEMALLOC_DEBUG
-	uint32_t	magic;
-#  define ARENA_RUN_MAGIC 0x384adf93
-#endif
-
-	/* Bin this run is associated with. */
-	arena_bin_t	*bin;
-
-	/* Stack of available freed regions, or NULL. */
-	void		*avail;
-
-	/* Next region that has never been allocated, or run boundary. */
-	void		*next;
-
-	/* Number of free regions in run. */
-	unsigned	nfree;
-};
-
-struct arena_bin_s {
-	/*
-	 * All operations on runcur, runs, and stats require that lock be
-	 * locked.  Run allocation/deallocation are protected by the arena lock,
-	 * which may be acquired while holding one or more bin locks, but not
-	 * vise versa.
-	 */
-	malloc_mutex_t	lock;
-
-	/*
-	 * Current run being used to service allocations of this bin's size
-	 * class.
-	 */
-	arena_run_t	*runcur;
-
-	/*
-	 * Tree of non-full runs.  This tree is used when looking for an
-	 * existing run when runcur is no longer usable.  We choose the
-	 * non-full run that is lowest in memory; this policy tends to keep
-	 * objects packed well, and it can also help reduce the number of
-	 * almost-empty chunks.
-	 */
-	arena_run_tree_t runs;
-
-	/* Size of regions in a run for this bin's size class. */
-	size_t		reg_size;
-
-	/* Total size of a run for this bin's size class. */
-	size_t		run_size;
-
-	/* Total number of regions in a run for this bin's size class. */
-	uint32_t	nregs;
-
-#ifdef JEMALLOC_PROF
-	/*
-	 * Offset of first (prof_cnt_t *) in a run header for this bin's size
-	 * class, or 0 if (opt_prof == false).
-	 */
-	uint32_t	cnt0_offset;
-#endif
-
-	/* Offset of first region in a run for this bin's size class. */
-	uint32_t	reg0_offset;
-
-#ifdef JEMALLOC_STATS
-	/* Bin statistics. */
-	malloc_bin_stats_t stats;
-#endif
-};
-
-struct arena_s {
-#ifdef JEMALLOC_DEBUG
-	uint32_t		magic;
-#  define ARENA_MAGIC 0x947d3d24
-#endif
-
-	/* This arena's index within the arenas array. */
-	unsigned		ind;
-
-	/*
-	 * All non-bin-related operations on this arena require that lock be
-	 * locked.
-	 */
-	malloc_mutex_t		lock;
-
-#ifdef JEMALLOC_STATS
-	arena_stats_t		stats;
-#  ifdef JEMALLOC_TCACHE
-	/*
-	 * List of tcaches for extant threads associated with this arena.
-	 * Stats from these are merged incrementally, and at exit.
-	 */
-	ql_head(tcache_t)	tcache_ql;
-#  endif
-#endif
-
-#ifdef JEMALLOC_PROF
-	uint64_t		prof_accumbytes;
-#endif
-
-	/* List of dirty-page-containing chunks this arena manages. */
-	ql_head(arena_chunk_t)	chunks_dirty;
-
-	/*
-	 * In order to avoid rapid chunk allocation/deallocation when an arena
-	 * oscillates right on the cusp of needing a new chunk, cache the most
-	 * recently freed chunk.  The spare is left in the arena's chunk trees
-	 * until it is deleted.
-	 *
-	 * There is one spare chunk per arena, rather than one spare total, in
-	 * order to avoid interactions between multiple threads that could make
-	 * a single spare inadequate.
-	 */
-	arena_chunk_t		*spare;
-
-	/* Number of pages in active runs. */
-	size_t			nactive;
-
-	/*
-	 * Current count of pages within unused runs that are potentially
-	 * dirty, and for which madvise(... MADV_DONTNEED) has not been called.
-	 * By tracking this, we can institute a limit on how much dirty unused
-	 * memory is mapped for each arena.
-	 */
-	size_t			ndirty;
-
-	/*
-	 * Approximate number of pages being purged.  It is possible for
-	 * multiple threads to purge dirty pages concurrently, and they use
-	 * npurgatory to indicate the total number of pages all threads are
-	 * attempting to purge.
-	 */
-	size_t			npurgatory;
-
-	/*
-	 * Size/address-ordered trees of this arena's available runs.  The trees
-	 * are used for first-best-fit run allocation.  The dirty tree contains
-	 * runs with dirty pages (i.e. very likely to have been touched and
-	 * therefore have associated physical pages), whereas the clean tree
-	 * contains runs with pages that either have no associated physical
-	 * pages, or have pages that the kernel may recycle at any time due to
-	 * previous madvise(2) calls.  The dirty tree is used in preference to
-	 * the clean tree for allocations, because using dirty pages reduces
-	 * the amount of dirty purging necessary to keep the active:dirty page
-	 * ratio below the purge threshold.
-	 */
-	arena_avail_tree_t	runs_avail_clean;
-	arena_avail_tree_t	runs_avail_dirty;
-
-	/*
-	 * bins is used to store trees of free regions of the following sizes,
-	 * assuming a 16-byte quantum, 4 KiB page size, and default
-	 * JEMALLOC_OPTIONS.
-	 *
-	 *   bins[i] |   size |
-	 *   --------+--------+
-	 *        0  |      2 |
-	 *        1  |      4 |
-	 *        2  |      8 |
-	 *   --------+--------+
-	 *        3  |     16 |
-	 *        4  |     32 |
-	 *        5  |     48 |
-	 *           :        :
-	 *        8  |     96 |
-	 *        9  |    112 |
-	 *       10  |    128 |
-	 *   --------+--------+
-	 *       11  |    192 |
-	 *       12  |    256 |
-	 *       13  |    320 |
-	 *       14  |    384 |
-	 *       15  |    448 |
-	 *       16  |    512 |
-	 *   --------+--------+
-	 *       17  |    768 |
-	 *       18  |   1024 |
-	 *       19  |   1280 |
-	 *           :        :
-	 *       27  |   3328 |
-	 *       28  |   3584 |
-	 *       29  |   3840 |
-	 *   --------+--------+
-	 *       30  |  4 KiB |
-	 *       31  |  6 KiB |
-	 *       33  |  8 KiB |
-	 *           :        :
-	 *       43  | 28 KiB |
-	 *       44  | 30 KiB |
-	 *       45  | 32 KiB |
-	 *   --------+--------+
-	 */
-	arena_bin_t		bins[1]; /* Dynamically sized. */
-};
-
-#endif /* JEMALLOC_H_STRUCTS */
-/******************************************************************************/
-#ifdef JEMALLOC_H_EXTERNS
-
-extern size_t	opt_lg_qspace_max;
-extern size_t	opt_lg_cspace_max;
-extern ssize_t		opt_lg_dirty_mult;
-extern uint8_t const	*small_size2bin;
-
-/* Various bin-related settings. */
-#ifdef JEMALLOC_TINY		/* Number of (2^n)-spaced tiny bins. */
-#  define		ntbins	((unsigned)(LG_QUANTUM - LG_TINY_MIN))
-#else
-#  define		ntbins	0
-#endif
-extern unsigned		nqbins; /* Number of quantum-spaced bins. */
-extern unsigned		ncbins; /* Number of cacheline-spaced bins. */
-extern unsigned		nsbins; /* Number of subpage-spaced bins. */
-extern unsigned		nbins;
-#ifdef JEMALLOC_TINY
-#  define		tspace_max	((size_t)(QUANTUM >> 1))
-#endif
-#define			qspace_min	QUANTUM
-extern size_t		qspace_max;
-extern size_t		cspace_min;
-extern size_t		cspace_max;
-extern size_t		sspace_min;
-extern size_t		sspace_max;
-#define			small_maxclass	sspace_max
-
-#define			nlclasses (chunk_npages - arena_chunk_header_npages)
-
-#ifdef JEMALLOC_TCACHE
-void	arena_tcache_fill_small(arena_t *arena, tcache_bin_t *tbin,
-    size_t binind
-#  ifdef JEMALLOC_PROF
-    , uint64_t prof_accumbytes
-#  endif
-    );
-#endif
-#ifdef JEMALLOC_PROF
-void	arena_prof_accum(arena_t *arena, uint64_t accumbytes);
-#endif
-void	*arena_malloc_small(arena_t *arena, size_t size, bool zero);
-void	*arena_malloc_large(arena_t *arena, size_t size, bool zero);
-void	*arena_malloc(size_t size, bool zero);
-void	*arena_palloc(arena_t *arena, size_t alignment, size_t size,
-    size_t alloc_size);
-size_t	arena_salloc(const void *ptr);
-#ifdef JEMALLOC_PROF
-void	arena_prof_promoted(const void *ptr, size_t size);
-size_t	arena_salloc_demote(const void *ptr);
-prof_thr_cnt_t	*arena_prof_cnt_get(const void *ptr);
-void	arena_prof_cnt_set(const void *ptr, prof_thr_cnt_t *cnt);
-#endif
-void	arena_dalloc_bin(arena_t *arena, arena_chunk_t *chunk, void *ptr,
-    arena_chunk_map_t *mapelm);
-void	arena_dalloc_large(arena_t *arena, arena_chunk_t *chunk, void *ptr);
-#ifdef JEMALLOC_STATS
-void	arena_stats_merge(arena_t *arena, size_t *nactive, size_t *ndirty,
-    arena_stats_t *astats, malloc_bin_stats_t *bstats,
-    malloc_large_stats_t *lstats);
-#endif
-void	*arena_ralloc(void *ptr, size_t size, size_t oldsize);
-bool	arena_new(arena_t *arena, unsigned ind);
-bool	arena_boot(void);
-
-#endif /* JEMALLOC_H_EXTERNS */
-/******************************************************************************/
-#ifdef JEMALLOC_H_INLINES
-
-#ifndef JEMALLOC_ENABLE_INLINE
-void	arena_dalloc(arena_t *arena, arena_chunk_t *chunk, void *ptr);
-#endif
-
-#if (defined(JEMALLOC_ENABLE_INLINE) || defined(JEMALLOC_ARENA_C_))
-JEMALLOC_INLINE void
-arena_dalloc(arena_t *arena, arena_chunk_t *chunk, void *ptr)
-{
-	size_t pageind;
-	arena_chunk_map_t *mapelm;
-
-	assert(arena != NULL);
-	assert(arena->magic == ARENA_MAGIC);
-	assert(chunk->arena == arena);
-	assert(ptr != NULL);
-	assert(CHUNK_ADDR2BASE(ptr) != ptr);
-
-	pageind = (((uintptr_t)ptr - (uintptr_t)chunk) >> PAGE_SHIFT);
-	mapelm = &chunk->map[pageind];
-	assert((mapelm->bits & CHUNK_MAP_ALLOCATED) != 0);
-	if ((mapelm->bits & CHUNK_MAP_LARGE) == 0) {
-		/* Small allocation. */
-#ifdef JEMALLOC_TCACHE
-		tcache_t *tcache;
-
-		if ((tcache = tcache_get()) != NULL)
-			tcache_dalloc_small(tcache, ptr);
-		else {
-#endif
-			arena_run_t *run;
-			arena_bin_t *bin;
-
-			run = (arena_run_t *)((uintptr_t)chunk +
-			    (uintptr_t)((pageind - (mapelm->bits >>
-			    PAGE_SHIFT)) << PAGE_SHIFT));
-			assert(run->magic == ARENA_RUN_MAGIC);
-			assert(((uintptr_t)ptr - ((uintptr_t)run +
-			    (uintptr_t)run->bin->reg0_offset)) %
-			    run->bin->reg_size == 0);
-			bin = run->bin;
-			malloc_mutex_lock(&bin->lock);
-			arena_dalloc_bin(arena, chunk, ptr, mapelm);
-			malloc_mutex_unlock(&bin->lock);
-#ifdef JEMALLOC_TCACHE
-		}
-#endif
-	} else {
-#ifdef JEMALLOC_TCACHE
-		size_t size = mapelm->bits & ~PAGE_MASK;
-
-		assert(((uintptr_t)ptr & PAGE_MASK) == 0);
-		if (size <= tcache_maxclass) {
-			tcache_t *tcache;
-
-			if ((tcache = tcache_get()) != NULL)
-				tcache_dalloc_large(tcache, ptr, size);
-			else {
-				malloc_mutex_lock(&arena->lock);
-				arena_dalloc_large(arena, chunk, ptr);
-				malloc_mutex_unlock(&arena->lock);
-			}
-		} else {
-			malloc_mutex_lock(&arena->lock);
-			arena_dalloc_large(arena, chunk, ptr);
-			malloc_mutex_unlock(&arena->lock);
-		}
-#else
-		assert(((uintptr_t)ptr & PAGE_MASK) == 0);
-		malloc_mutex_lock(&arena->lock);
-		arena_dalloc_large(arena, chunk, ptr);
-		malloc_mutex_unlock(&arena->lock);
-#endif
-	}
-}
-#endif
-
-#endif /* JEMALLOC_H_INLINES */
-/******************************************************************************/
diff --git a/externals/jemalloc/include/internal/base.h b/externals/jemalloc/include/internal/base.h
deleted file mode 100644
index e353f309bd2..00000000000
--- a/externals/jemalloc/include/internal/base.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/******************************************************************************/
-#ifdef JEMALLOC_H_TYPES
-
-#endif /* JEMALLOC_H_TYPES */
-/******************************************************************************/
-#ifdef JEMALLOC_H_STRUCTS
-
-#endif /* JEMALLOC_H_STRUCTS */
-/******************************************************************************/
-#ifdef JEMALLOC_H_EXTERNS
-
-extern malloc_mutex_t	base_mtx;
-
-void	*base_alloc(size_t size);
-extent_node_t *base_node_alloc(void);
-void	base_node_dealloc(extent_node_t *node);
-bool	base_boot(void);
-
-#endif /* JEMALLOC_H_EXTERNS */
-/******************************************************************************/
-#ifdef JEMALLOC_H_INLINES
-
-#endif /* JEMALLOC_H_INLINES */
-/******************************************************************************/
diff --git a/externals/jemalloc/include/internal/chunk.h b/externals/jemalloc/include/internal/chunk.h
deleted file mode 100644
index 1f6abf782f1..00000000000
--- a/externals/jemalloc/include/internal/chunk.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/******************************************************************************/
-#ifdef JEMALLOC_H_TYPES
-
-/*
- * Size and alignment of memory chunks that are allocated by the OS's virtual
- * memory system.
- */
-#define	LG_CHUNK_DEFAULT	22
-
-/* Return the chunk address for allocation address a. */
-#define	CHUNK_ADDR2BASE(a)						\
-	((void *)((uintptr_t)(a) & ~chunksize_mask))
-
-/* Return the chunk offset of address a. */
-#define	CHUNK_ADDR2OFFSET(a)						\
-	((size_t)((uintptr_t)(a) & chunksize_mask))
-
-/* Return the smallest chunk multiple that is >= s. */
-#define	CHUNK_CEILING(s)						\
-	(((s) + chunksize_mask) & ~chunksize_mask)
-
-#endif /* JEMALLOC_H_TYPES */
-/******************************************************************************/
-#ifdef JEMALLOC_H_STRUCTS
-
-#endif /* JEMALLOC_H_STRUCTS */
-/******************************************************************************/
-#ifdef JEMALLOC_H_EXTERNS
-
-extern size_t		opt_lg_chunk;
-#ifdef JEMALLOC_SWAP
-extern bool		opt_overcommit;
-#endif
-
-#if (defined(JEMALLOC_STATS) || defined(JEMALLOC_PROF))
-/* Protects stats_chunks; currently not used for any other purpose. */
-extern malloc_mutex_t	chunks_mtx;
-/* Chunk statistics. */
-extern chunk_stats_t	stats_chunks;
-#endif
-
-extern size_t		chunksize;
-extern size_t		chunksize_mask; /* (chunksize - 1). */
-extern size_t		chunk_npages;
-extern size_t		arena_chunk_header_npages;
-extern size_t		arena_maxclass; /* Max size class for arenas. */
-
-void	*chunk_alloc(size_t size, bool *zero);
-void	chunk_dealloc(void *chunk, size_t size);
-bool	chunk_boot(void);
-
-#endif /* JEMALLOC_H_EXTERNS */
-/******************************************************************************/
-#ifdef JEMALLOC_H_INLINES
-
-#endif /* JEMALLOC_H_INLINES */
-/******************************************************************************/
-
-#include "jemalloc/internal/chunk_swap.h"
-#include "jemalloc/internal/chunk_dss.h"
-#include "jemalloc/internal/chunk_mmap.h"
diff --git a/externals/jemalloc/include/internal/chunk_dss.h b/externals/jemalloc/include/internal/chunk_dss.h
deleted file mode 100644
index 6be4ad1f212..00000000000
--- a/externals/jemalloc/include/internal/chunk_dss.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifdef JEMALLOC_DSS
-/******************************************************************************/
-#ifdef JEMALLOC_H_TYPES
-
-#endif /* JEMALLOC_H_TYPES */
-/******************************************************************************/
-#ifdef JEMALLOC_H_STRUCTS
-
-#endif /* JEMALLOC_H_STRUCTS */
-/******************************************************************************/
-#ifdef JEMALLOC_H_EXTERNS
-
-/*
- * Protects sbrk() calls.  This avoids malloc races among threads, though it
- * does not protect against races with threads that call sbrk() directly.
- */
-extern malloc_mutex_t	dss_mtx;
-
-void	*chunk_alloc_dss(size_t size, bool *zero);
-bool	chunk_dealloc_dss(void *chunk, size_t size);
-bool	chunk_dss_boot(void);
-
-#endif /* JEMALLOC_H_EXTERNS */
-/******************************************************************************/
-#ifdef JEMALLOC_H_INLINES
-
-#endif /* JEMALLOC_H_INLINES */
-/******************************************************************************/
-#endif /* JEMALLOC_DSS */
diff --git a/externals/jemalloc/include/internal/chunk_mmap.h b/externals/jemalloc/include/internal/chunk_mmap.h
deleted file mode 100644
index 8fb90b77c9b..00000000000
--- a/externals/jemalloc/include/internal/chunk_mmap.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/******************************************************************************/
-#ifdef JEMALLOC_H_TYPES
-
-#endif /* JEMALLOC_H_TYPES */
-/******************************************************************************/
-#ifdef JEMALLOC_H_STRUCTS
-
-#endif /* JEMALLOC_H_STRUCTS */
-/******************************************************************************/
-#ifdef JEMALLOC_H_EXTERNS
-
-void	*chunk_alloc_mmap(size_t size);
-void	chunk_dealloc_mmap(void *chunk, size_t size);
-
-#endif /* JEMALLOC_H_EXTERNS */
-/******************************************************************************/
-#ifdef JEMALLOC_H_INLINES
-
-#endif /* JEMALLOC_H_INLINES */
-/******************************************************************************/
diff --git a/externals/jemalloc/include/internal/chunk_swap.h b/externals/jemalloc/include/internal/chunk_swap.h
deleted file mode 100644
index d50cb197449..00000000000
--- a/externals/jemalloc/include/internal/chunk_swap.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifdef JEMALLOC_SWAP
-/******************************************************************************/
-#ifdef JEMALLOC_H_TYPES
-
-#endif /* JEMALLOC_H_TYPES */
-/******************************************************************************/
-#ifdef JEMALLOC_H_STRUCTS
-
-#endif /* JEMALLOC_H_STRUCTS */
-/******************************************************************************/
-#ifdef JEMALLOC_H_EXTERNS
-
-extern malloc_mutex_t	swap_mtx;
-extern bool		swap_enabled;
-extern bool		swap_prezeroed;
-extern size_t		swap_nfds;
-extern int		*swap_fds;
-#ifdef JEMALLOC_STATS
-extern size_t		swap_avail;
-#endif
-
-void	*chunk_alloc_swap(size_t size, bool *zero);
-bool	chunk_dealloc_swap(void *chunk, size_t size);
-bool	chunk_swap_enable(const int *fds, unsigned nfds, bool prezeroed);
-bool	chunk_swap_boot(void);
-
-#endif /* JEMALLOC_H_EXTERNS */
-/******************************************************************************/
-#ifdef JEMALLOC_H_INLINES
-
-#endif /* JEMALLOC_H_INLINES */
-/******************************************************************************/
-#endif /* JEMALLOC_SWAP */
diff --git a/externals/jemalloc/include/internal/ckh.h b/externals/jemalloc/include/internal/ckh.h
deleted file mode 100644
index c39ea5c75ef..00000000000
--- a/externals/jemalloc/include/internal/ckh.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/******************************************************************************/
-#ifdef JEMALLOC_H_TYPES
-
-typedef struct ckh_s ckh_t;
-typedef struct ckhc_s ckhc_t;
-
-/* Typedefs to allow easy function pointer passing. */
-typedef void ckh_hash_t (const void *, unsigned, size_t *, size_t *);
-typedef bool ckh_keycomp_t (const void *, const void *);
-
-/* Maintain counters used to get an idea of performance. */
-/* #define	CKH_COUNT */
-/* Print counter values in ckh_delete() (requires CKH_COUNT). */
-/* #define	CKH_VERBOSE */
-
-/*
- * There are 2^LG_CKH_BUCKET_CELLS cells in each hash table bucket.  Try to fit
- * one bucket per L1 cache line.
- */
-#define LG_CKH_BUCKET_CELLS (LG_CACHELINE - LG_SIZEOF_PTR - 1)
-
-#endif /* JEMALLOC_H_TYPES */
-/******************************************************************************/
-#ifdef JEMALLOC_H_STRUCTS
-
-/* Hash table cell. */
-struct ckhc_s {
-	const void	*key;
-	const void	*data;
-};
-
-struct ckh_s {
-#ifdef JEMALLOC_DEBUG
-#define	CKH_MAGIG	0x3af2489d
-	uint32_t	magic;
-#endif
-
-#ifdef CKH_COUNT
-	/* Counters used to get an idea of performance. */
-	uint64_t	ngrows;
-	uint64_t	nshrinks;
-	uint64_t	nshrinkfails;
-	uint64_t	ninserts;
-	uint64_t	nrelocs;
-#endif
-
-	/* Used for pseudo-random number generation. */
-#define	CKH_A		12345
-#define	CKH_C		12347
-	uint32_t	prn_state;
-
-	/* Total number of items. */
-	size_t		count;
-
-	/*
-	 * Minimum and current number of hash table buckets.  There are
-	 * 2^LG_CKH_BUCKET_CELLS cells per bucket.
-	 */
-	unsigned	lg_minbuckets;
-	unsigned	lg_curbuckets;
-
-	/* Hash and comparison functions. */
-	ckh_hash_t	*hash;
-	ckh_keycomp_t	*keycomp;
-
-	/* Hash table with 2^lg_curbuckets buckets. */
-	ckhc_t		*tab;
-};
-
-#endif /* JEMALLOC_H_STRUCTS */
-/******************************************************************************/
-#ifdef JEMALLOC_H_EXTERNS
-
-bool	ckh_new(ckh_t *ckh, size_t minitems, ckh_hash_t *hash,
-    ckh_keycomp_t *keycomp);
-void	ckh_delete(ckh_t *ckh);
-size_t	ckh_count(ckh_t *ckh);
-bool	ckh_iter(ckh_t *ckh, size_t *tabind, void **key, void **data);
-bool	ckh_insert(ckh_t *ckh, const void *key, const void *data);
-bool	ckh_remove(ckh_t *ckh, const void *searchkey, void **key,
-    void **data);
-bool	ckh_search(ckh_t *ckh, const void *seachkey, void **key, void **data);
-void	ckh_string_hash(const void *key, unsigned minbits, size_t *hash1,
-    size_t *hash2);
-bool	ckh_string_keycomp(const void *k1, const void *k2);
-void	ckh_pointer_hash(const void *key, unsigned minbits, size_t *hash1,
-    size_t *hash2);
-bool	ckh_pointer_keycomp(const void *k1, const void *k2);
-
-#endif /* JEMALLOC_H_EXTERNS */
-/******************************************************************************/
-#ifdef JEMALLOC_H_INLINES
-
-#endif /* JEMALLOC_H_INLINES */
-/******************************************************************************/
diff --git a/externals/jemalloc/include/internal/ctl.h b/externals/jemalloc/include/internal/ctl.h
deleted file mode 100644
index 7bbf21e0e85..00000000000
--- a/externals/jemalloc/include/internal/ctl.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/******************************************************************************/
-#ifdef JEMALLOC_H_TYPES
-
-typedef struct ctl_node_s ctl_node_t;
-typedef struct ctl_arena_stats_s ctl_arena_stats_t;
-typedef struct ctl_stats_s ctl_stats_t;
-
-#endif /* JEMALLOC_H_TYPES */
-/******************************************************************************/
-#ifdef JEMALLOC_H_STRUCTS
-
-struct ctl_node_s {
-	bool			named;
-	union {
-		struct {
-			const char	*name;
-			/* If (nchildren == 0), this is a terminal node. */
-			unsigned	nchildren;
-			const	ctl_node_t *children;
-		} named;
-		struct {
-			const ctl_node_t *(*index)(const size_t *, size_t,
-			    size_t);
-		} indexed;
-	} u;
-	int	(*ctl)(const size_t *, size_t, void *, size_t *, void *,
-	    size_t);
-};
-
-struct ctl_arena_stats_s {
-	bool			initialized;
-	size_t			pactive;
-	size_t			pdirty;
-#ifdef JEMALLOC_STATS
-	arena_stats_t		astats;
-
-	/* Aggregate stats for small size classes, based on bin stats. */
-	size_t			allocated_small;
-	uint64_t		nmalloc_small;
-	uint64_t		ndalloc_small;
-	uint64_t		nrequests_small;
-
-	malloc_bin_stats_t	*bstats;	/* nbins elements. */
-	malloc_large_stats_t	*lstats;	/* nlclasses elements. */
-#endif
-};
-
-struct ctl_stats_s {
-#ifdef JEMALLOC_STATS
-	size_t			allocated;
-	size_t			active;
-	size_t			mapped;
-	struct {
-		size_t		current;	/* stats_chunks.curchunks */
-		uint64_t	total;		/* stats_chunks.nchunks */
-		size_t		high;		/* stats_chunks.highchunks */
-	} chunks;
-	struct {
-		size_t		allocated;	/* huge_allocated */
-		uint64_t	nmalloc;	/* huge_nmalloc */
-		uint64_t	ndalloc;	/* huge_ndalloc */
-	} huge;
-#endif
-	ctl_arena_stats_t	*arenas;	/* (narenas + 1) elements. */
-#ifdef JEMALLOC_SWAP
-	size_t			swap_avail;
-#endif
-};
-
-#endif /* JEMALLOC_H_STRUCTS */
-/******************************************************************************/
-#ifdef JEMALLOC_H_EXTERNS
-
-int	ctl_byname(const char *name, void *oldp, size_t *oldlenp, void *newp,
-    size_t newlen);
-int	ctl_nametomib(const char *name, size_t *mibp, size_t *miblenp);
-
-int	ctl_bymib(const size_t *mib, size_t miblen, void *oldp, size_t *oldlenp,
-    void *newp, size_t newlen);
-bool	ctl_boot(void);
-
-#define	xmallctl(name, oldp, oldlenp, newp, newlen) do {		\
-	if (JEMALLOC_P(mallctl)(name, oldp, oldlenp, newp, newlen)	\
-	    != 0) {							\
-		malloc_write(": Invalid xmallctl(\"");	\
-		malloc_write(name);					\
-		malloc_write("\", ...) call\n");			\
-		abort();						\
-	}								\
-} while (0)
-
-#define	xmallctlnametomib(name, mibp, miblenp) do {			\
-	if (JEMALLOC_P(mallctlnametomib)(name, mibp, miblenp) != 0) {	\
-		malloc_write(						\
-		    ": Invalid xmallctlnametomib(\"");	\
-		malloc_write(name);					\
-		malloc_write("\", ...) call\n");			\
-		abort();						\
-	}								\
-} while (0)
-
-#define	xmallctlbymib(mib, miblen, oldp, oldlenp, newp, newlen) do {	\
-	if (JEMALLOC_P(mallctlbymib)(mib, miblen, oldp, oldlenp, newp,	\
-	    newlen) != 0) {						\
-		malloc_write(						\
-		    ": Invalid xmallctlbymib() call\n");	\
-		abort();						\
-	}								\
-} while (0)
-
-#endif /* JEMALLOC_H_EXTERNS */
-/******************************************************************************/
-#ifdef JEMALLOC_H_INLINES
-
-#endif /* JEMALLOC_H_INLINES */
-/******************************************************************************/
-
diff --git a/externals/jemalloc/include/internal/extent.h b/externals/jemalloc/include/internal/extent.h
deleted file mode 100644
index 33a4e9a3852..00000000000
--- a/externals/jemalloc/include/internal/extent.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/******************************************************************************/
-#ifdef JEMALLOC_H_TYPES
-
-typedef struct extent_node_s extent_node_t;
-
-#endif /* JEMALLOC_H_TYPES */
-/******************************************************************************/
-#ifdef JEMALLOC_H_STRUCTS
-
-/* Tree of extents. */
-struct extent_node_s {
-#if (defined(JEMALLOC_SWAP) || defined(JEMALLOC_DSS))
-	/* Linkage for the size/address-ordered tree. */
-	rb_node(extent_node_t)	link_szad;
-#endif
-
-	/* Linkage for the address-ordered tree. */
-	rb_node(extent_node_t)	link_ad;
-
-#ifdef JEMALLOC_PROF
-	/* Profile counters, used for huge objects. */
-	prof_thr_cnt_t		*prof_cnt;
-#endif
-
-	/* Pointer to the extent that this tree node is responsible for. */
-	void			*addr;
-
-	/* Total region size. */
-	size_t			size;
-};
-typedef rb_tree(extent_node_t) extent_tree_t;
-
-#endif /* JEMALLOC_H_STRUCTS */
-/******************************************************************************/
-#ifdef JEMALLOC_H_EXTERNS
-
-#if (defined(JEMALLOC_SWAP) || defined(JEMALLOC_DSS))
-rb_proto(, extent_tree_szad_, extent_tree_t, extent_node_t)
-#endif
-
-rb_proto(, extent_tree_ad_, extent_tree_t, extent_node_t)
-
-#endif /* JEMALLOC_H_EXTERNS */
-/******************************************************************************/
-#ifdef JEMALLOC_H_INLINES
-
-#endif /* JEMALLOC_H_INLINES */
-/******************************************************************************/
-
diff --git a/externals/jemalloc/include/internal/hash.h b/externals/jemalloc/include/internal/hash.h
deleted file mode 100644
index d12cdb8359f..00000000000
--- a/externals/jemalloc/include/internal/hash.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/******************************************************************************/
-#ifdef JEMALLOC_H_TYPES
-
-#endif /* JEMALLOC_H_TYPES */
-/******************************************************************************/
-#ifdef JEMALLOC_H_STRUCTS
-
-#endif /* JEMALLOC_H_STRUCTS */
-/******************************************************************************/
-#ifdef JEMALLOC_H_EXTERNS
-
-#endif /* JEMALLOC_H_EXTERNS */
-/******************************************************************************/
-#ifdef JEMALLOC_H_INLINES
-
-#ifndef JEMALLOC_ENABLE_INLINE
-uint64_t	hash(const void *key, size_t len, uint64_t seed);
-#endif
-
-#if (defined(JEMALLOC_ENABLE_INLINE) || defined(HASH_C_))
-/*
- * The following hash function is based on MurmurHash64A(), placed into the
- * public domain by Austin Appleby.  See http://murmurhash.googlepages.com/ for
- * details.
- */
-JEMALLOC_INLINE uint64_t
-hash(const void *key, size_t len, uint64_t seed)
-{
-	const uint64_t m = 0xc6a4a7935bd1e995;
-	const int r = 47;
-	uint64_t h = seed ^ (len * m);
-	const uint64_t *data = (const uint64_t *)key;
-	const uint64_t *end = data + (len/8);
-	const unsigned char *data2;
-
-	assert(((uintptr_t)key & 0x7) == 0);
-
-	while(data != end) {
-		uint64_t k = *data++;
-
-		k *= m;
-		k ^= k >> r;
-		k *= m;
-
-		h ^= k;
-		h *= m;
-	}
-
-	data2 = (const unsigned char *)data;
-	switch(len & 7) {
-		case 7: h ^= ((uint64_t)(data2[6])) << 48;
-		case 6: h ^= ((uint64_t)(data2[5])) << 40;
-		case 5: h ^= ((uint64_t)(data2[4])) << 32;
-		case 4: h ^= ((uint64_t)(data2[3])) << 24;
-		case 3: h ^= ((uint64_t)(data2[2])) << 16;
-		case 2: h ^= ((uint64_t)(data2[1])) << 8;
-		case 1: h ^= ((uint64_t)(data2[0]));
-			h *= m;
-	}
-
-	h ^= h >> r;
-	h *= m;
-	h ^= h >> r;
-
-	return h;
-}
-#endif
-
-#endif /* JEMALLOC_H_INLINES */
-/******************************************************************************/
diff --git a/externals/jemalloc/include/internal/huge.h b/externals/jemalloc/include/internal/huge.h
deleted file mode 100644
index 3cf32f7506d..00000000000
--- a/externals/jemalloc/include/internal/huge.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/******************************************************************************/
-#ifdef JEMALLOC_H_TYPES
-
-#endif /* JEMALLOC_H_TYPES */
-/******************************************************************************/
-#ifdef JEMALLOC_H_STRUCTS
-
-#endif /* JEMALLOC_H_STRUCTS */
-/******************************************************************************/
-#ifdef JEMALLOC_H_EXTERNS
-
-#ifdef JEMALLOC_STATS
-/* Huge allocation statistics. */
-extern uint64_t		huge_nmalloc;
-extern uint64_t		huge_ndalloc;
-extern size_t		huge_allocated;
-#endif
-
-/* Protects chunk-related data structures. */
-extern malloc_mutex_t	huge_mtx;
-
-void	*huge_malloc(size_t size, bool zero);
-void	*huge_palloc(size_t alignment, size_t size);
-void	*huge_ralloc(void *ptr, size_t size, size_t oldsize);
-void	huge_dalloc(void *ptr);
-size_t	huge_salloc(const void *ptr);
-#ifdef JEMALLOC_PROF
-prof_thr_cnt_t	*huge_prof_cnt_get(const void *ptr);
-void	huge_prof_cnt_set(const void *ptr, prof_thr_cnt_t *cnt);
-#endif
-bool	huge_boot(void);
-
-#endif /* JEMALLOC_H_EXTERNS */
-/******************************************************************************/
-#ifdef JEMALLOC_H_INLINES
-
-#endif /* JEMALLOC_H_INLINES */
-/******************************************************************************/
diff --git a/externals/jemalloc/include/internal/jemalloc_internal.h b/externals/jemalloc/include/internal/jemalloc_internal.h
deleted file mode 100644
index 03782dd6690..00000000000
--- a/externals/jemalloc/include/internal/jemalloc_internal.h
+++ /dev/null
@@ -1,561 +0,0 @@
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include 
-#include 
-#ifndef SIZE_T_MAX
-#  define SIZE_T_MAX	SIZE_MAX
-#endif
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#define	JEMALLOC_MANGLE
-#include "../jemalloc.h"
-
-#ifdef JEMALLOC_LAZY_LOCK
-#include 
-#endif
-
-#define	RB_COMPACT
-#include "jemalloc/internal/rb.h"
-#include "jemalloc/internal/qr.h"
-#include "jemalloc/internal/ql.h"
-
-extern void	(*JEMALLOC_P(malloc_message))(void *wcbopaque, const char *s);
-
-/*
- * Define a custom assert() in order to reduce the chances of deadlock during
- * assertion failure.
- */
-#ifdef JEMALLOC_DEBUG
-#  define assert(e) do {						\
-	if (!(e)) {							\
-		char line_buf[UMAX2S_BUFSIZE];				\
-		malloc_write(": ");				\
-		malloc_write(__FILE__);					\
-		malloc_write(":");					\
-		malloc_write(umax2s(__LINE__, 10, line_buf));		\
-		malloc_write(": Failed assertion: ");			\
-		malloc_write("\"");					\
-		malloc_write(#e);					\
-		malloc_write("\"\n");					\
-		abort();						\
-	}								\
-} while (0)
-#else
-#define assert(e)
-#endif
-
-/*
- * jemalloc can conceptually be broken into components (arena, tcache, etc.),
- * but there are circular dependencies that cannot be broken without
- * substantial performance degradation.  In order to reduce the effect on
- * visual code flow, read the header files in multiple passes, with one of the
- * following cpp variables defined during each pass:
- *
- *   JEMALLOC_H_TYPES   : Preprocessor-defined constants and psuedo-opaque data
- *                        types.
- *   JEMALLOC_H_STRUCTS : Data structures.
- *   JEMALLOC_H_EXTERNS : Extern data declarations and function prototypes.
- *   JEMALLOC_H_INLINES : Inline functions.
- */
-/******************************************************************************/
-#define JEMALLOC_H_TYPES
-
-#define	ZU(z)	((size_t)z)
-
-#ifndef __DECONST
-#  define	__DECONST(type, var)	((type)(uintptr_t)(const void *)(var))
-#endif
-
-#ifdef JEMALLOC_DEBUG
-   /* Disable inlining to make debugging easier. */
-#  define JEMALLOC_INLINE
-#  define inline
-#else
-#  define JEMALLOC_ENABLE_INLINE
-#  define JEMALLOC_INLINE static inline
-#endif
-
-/* Size of stack-allocated buffer passed to strerror_r(). */
-#define	STRERROR_BUF		64
-
-/* Minimum alignment of allocations is 2^LG_QUANTUM bytes. */
-#ifdef __i386__
-#  define LG_QUANTUM		4
-#endif
-#ifdef __ia64__
-#  define LG_QUANTUM		4
-#endif
-#ifdef __alpha__
-#  define LG_QUANTUM		4
-#endif
-#ifdef __sparc64__
-#  define LG_QUANTUM		4
-#endif
-#if (defined(__amd64__) || defined(__x86_64__))
-#  define LG_QUANTUM		4
-#endif
-#ifdef __arm__
-#  define LG_QUANTUM		3
-#endif
-#ifdef __mips__
-#  define LG_QUANTUM		3
-#endif
-#ifdef __powerpc__
-#  define LG_QUANTUM		4
-#endif
-#ifdef __s390x__
-#  define LG_QUANTUM		4
-#endif
-
-#define	QUANTUM			((size_t)(1U << LG_QUANTUM))
-#define	QUANTUM_MASK		(QUANTUM - 1)
-
-/* Return the smallest quantum multiple that is >= a. */
-#define	QUANTUM_CEILING(a)						\
-	(((a) + QUANTUM_MASK) & ~QUANTUM_MASK)
-
-#define	SIZEOF_PTR		(1U << LG_SIZEOF_PTR)
-
-/* We can't use TLS in non-PIC programs, since TLS relies on loader magic. */
-#if (!defined(PIC) && !defined(NO_TLS))
-#  define NO_TLS
-#endif
-
-/*
- * Maximum size of L1 cache line.  This is used to avoid cache line aliasing.
- * In addition, this controls the spacing of cacheline-spaced size classes.
- */
-#define	LG_CACHELINE		6
-#define	CACHELINE		((size_t)(1U << LG_CACHELINE))
-#define	CACHELINE_MASK		(CACHELINE - 1)
-
-/* Return the smallest cacheline multiple that is >= s. */
-#define	CACHELINE_CEILING(s)						\
-	(((s) + CACHELINE_MASK) & ~CACHELINE_MASK)
-
-/*
- * Page size.  STATIC_PAGE_SHIFT is determined by the configure script.  If
- * DYNAMIC_PAGE_SHIFT is enabled, only use the STATIC_PAGE_* macros where
- * compile-time values are required for the purposes of defining data
- * structures.
- */
-#define	STATIC_PAGE_SIZE ((size_t)(1U << STATIC_PAGE_SHIFT))
-#define	STATIC_PAGE_MASK ((size_t)(STATIC_PAGE_SIZE - 1))
-
-#ifdef DYNAMIC_PAGE_SHIFT
-#  define PAGE_SHIFT	lg_pagesize
-#  define PAGE_SIZE	pagesize
-#  define PAGE_MASK	pagesize_mask
-#else
-#  define PAGE_SHIFT	STATIC_PAGE_SHIFT
-#  define PAGE_SIZE	STATIC_PAGE_SIZE
-#  define PAGE_MASK	STATIC_PAGE_MASK
-#endif
-
-/* Return the smallest pagesize multiple that is >= s. */
-#define	PAGE_CEILING(s)							\
-	(((s) + PAGE_MASK) & ~PAGE_MASK)
-
-#include "jemalloc/internal/totally_not_p_r_n.h"
-#include "jemalloc/internal/ckh.h"
-#include "jemalloc/internal/stats.h"
-#include "jemalloc/internal/ctl.h"
-#include "jemalloc/internal/mutex.h"
-#include "jemalloc/internal/mb.h"
-#include "jemalloc/internal/extent.h"
-#include "jemalloc/internal/arena.h"
-#include "jemalloc/internal/base.h"
-#include "jemalloc/internal/chunk.h"
-#include "jemalloc/internal/huge.h"
-#include "jemalloc/internal/tcache.h"
-#include "jemalloc/internal/hash.h"
-#include "jemalloc/internal/prof.h"
-
-#undef JEMALLOC_H_TYPES
-/******************************************************************************/
-#define JEMALLOC_H_STRUCTS
-
-#include "jemalloc/internal/totally_not_p_r_n.h"
-#include "jemalloc/internal/ckh.h"
-#include "jemalloc/internal/stats.h"
-#include "jemalloc/internal/ctl.h"
-#include "jemalloc/internal/mutex.h"
-#include "jemalloc/internal/mb.h"
-#include "jemalloc/internal/extent.h"
-#include "jemalloc/internal/arena.h"
-#include "jemalloc/internal/base.h"
-#include "jemalloc/internal/chunk.h"
-#include "jemalloc/internal/huge.h"
-#include "jemalloc/internal/tcache.h"
-#include "jemalloc/internal/hash.h"
-#include "jemalloc/internal/prof.h"
-
-#undef JEMALLOC_H_STRUCTS
-/******************************************************************************/
-#define JEMALLOC_H_EXTERNS
-
-extern bool	opt_abort;
-#ifdef JEMALLOC_FILL
-extern bool	opt_junk;
-#endif
-#ifdef JEMALLOC_SYSV
-extern bool	opt_sysv;
-#endif
-#ifdef JEMALLOC_XMALLOC
-extern bool	opt_xmalloc;
-#endif
-#ifdef JEMALLOC_FILL
-extern bool	opt_zero;
-#endif
-
-#ifdef DYNAMIC_PAGE_SHIFT
-extern size_t		pagesize;
-extern size_t		pagesize_mask;
-extern size_t		lg_pagesize;
-#endif
-
-/* Number of CPUs. */
-extern unsigned		ncpus;
-
-extern malloc_mutex_t	arenas_lock; /* Protects arenas initialization. */
-#ifndef NO_TLS
-/*
- * Map of pthread_self() --> arenas[???], used for selecting an arena to use
- * for allocations.
- */
-extern __thread arena_t	*arenas_map JEMALLOC_ATTR(tls_model("initial-exec"));
-#endif
-/*
- * Arenas that are used to service external requests.  Not all elements of the
- * arenas array are necessarily used; arenas are created lazily as needed.
- */
-extern arena_t		**arenas;
-extern unsigned		narenas;
-
-arena_t	*arenas_extend(unsigned ind);
-#ifndef NO_TLS
-arena_t	*choose_arena_hard(void);
-#endif
-
-#include "jemalloc/internal/totally_not_p_r_n.h"
-#include "jemalloc/internal/ckh.h"
-#include "jemalloc/internal/stats.h"
-#include "jemalloc/internal/ctl.h"
-#include "jemalloc/internal/mutex.h"
-#include "jemalloc/internal/mb.h"
-#include "jemalloc/internal/extent.h"
-#include "jemalloc/internal/arena.h"
-#include "jemalloc/internal/base.h"
-#include "jemalloc/internal/chunk.h"
-#include "jemalloc/internal/huge.h"
-#include "jemalloc/internal/tcache.h"
-#include "jemalloc/internal/hash.h"
-#include "jemalloc/internal/prof.h"
-
-#undef JEMALLOC_H_EXTERNS
-/******************************************************************************/
-#define JEMALLOC_H_INLINES
-
-#include "jemalloc/internal/totally_not_p_r_n.h"
-#include "jemalloc/internal/ckh.h"
-#include "jemalloc/internal/stats.h"
-#include "jemalloc/internal/ctl.h"
-#include "jemalloc/internal/mutex.h"
-#include "jemalloc/internal/mb.h"
-#include "jemalloc/internal/extent.h"
-#include "jemalloc/internal/base.h"
-#include "jemalloc/internal/chunk.h"
-#include "jemalloc/internal/huge.h"
-
-#ifndef JEMALLOC_ENABLE_INLINE
-void	malloc_write(const char *s);
-arena_t	*choose_arena(void);
-#endif
-
-#if (defined(JEMALLOC_ENABLE_INLINE) || defined(JEMALLOC_C_))
-/*
- * Wrapper around malloc_message() that avoids the need for
- * JEMALLOC_P(malloc_message)(...) throughout the code.
- */
-JEMALLOC_INLINE void
-malloc_write(const char *s)
-{
-
-	JEMALLOC_P(malloc_message)(NULL, s);
-}
-
-/*
- * Choose an arena based on a per-thread value (fast-path code, calls slow-path
- * code if necessary).
- */
-JEMALLOC_INLINE arena_t *
-choose_arena(void)
-{
-	arena_t *ret;
-
-	/*
-	 * We can only use TLS if this is a PIC library, since for the static
-	 * library version, libc's malloc is used by TLS allocation, which
-	 * introduces a bootstrapping issue.
-	 */
-#ifndef NO_TLS
-	ret = arenas_map;
-	if (ret == NULL) {
-		ret = choose_arena_hard();
-		assert(ret != NULL);
-	}
-#else
-	if (isthreaded && narenas > 1) {
-		unsigned long ind;
-
-		/*
-		 * Hash pthread_self() to one of the arenas.  There is a prime
-		 * number of arenas, so this has a reasonable chance of
-		 * working.  Even so, the hashing can be easily thwarted by
-		 * inconvenient pthread_self() values.  Without specific
-		 * knowledge of how pthread_self() calculates values, we can't
-		 * easily do much better than this.
-		 */
-		ind = (unsigned long) pthread_self() % narenas;
-
-		/*
-		 * Optimistially assume that arenas[ind] has been initialized.
-		 * At worst, we find out that some other thread has already
-		 * done so, after acquiring the lock in preparation.  Note that
-		 * this lazy locking also has the effect of lazily forcing
-		 * cache coherency; without the lock acquisition, there's no
-		 * guarantee that modification of arenas[ind] by another thread
-		 * would be seen on this CPU for an arbitrary amount of time.
-		 *
-		 * In general, this approach to modifying a synchronized value
-		 * isn't a good idea, but in this case we only ever modify the
-		 * value once, so things work out well.
-		 */
-		ret = arenas[ind];
-		if (ret == NULL) {
-			/*
-			 * Avoid races with another thread that may have already
-			 * initialized arenas[ind].
-			 */
-			malloc_mutex_lock(&arenas_lock);
-			if (arenas[ind] == NULL)
-				ret = arenas_extend((unsigned)ind);
-			else
-				ret = arenas[ind];
-			malloc_mutex_unlock(&arenas_lock);
-		}
-	} else
-		ret = arenas[0];
-#endif
-
-	assert(ret != NULL);
-	return (ret);
-}
-#endif
-
-#include "jemalloc/internal/tcache.h"
-#include "jemalloc/internal/arena.h"
-#include "jemalloc/internal/hash.h"
-#include "jemalloc/internal/prof.h"
-
-#ifndef JEMALLOC_ENABLE_INLINE
-void	*imalloc(size_t size);
-void	*icalloc(size_t size);
-void	*ipalloc(size_t alignment, size_t size);
-size_t	isalloc(const void *ptr);
-void	*iralloc(void *ptr, size_t size);
-void	idalloc(void *ptr);
-#endif
-
-#if (defined(JEMALLOC_ENABLE_INLINE) || defined(JEMALLOC_C_))
-JEMALLOC_INLINE void *
-imalloc(size_t size)
-{
-
-	assert(size != 0);
-
-	if (size <= arena_maxclass)
-		return (arena_malloc(size, false));
-	else
-		return (huge_malloc(size, false));
-}
-
-JEMALLOC_INLINE void *
-icalloc(size_t size)
-{
-
-	if (size <= arena_maxclass)
-		return (arena_malloc(size, true));
-	else
-		return (huge_malloc(size, true));
-}
-
-JEMALLOC_INLINE void *
-ipalloc(size_t alignment, size_t size)
-{
-	void *ret;
-	size_t ceil_size;
-
-	/*
-	 * Round size up to the nearest multiple of alignment.
-	 *
-	 * This done, we can take advantage of the fact that for each small
-	 * size class, every object is aligned at the smallest power of two
-	 * that is non-zero in the base two representation of the size.  For
-	 * example:
-	 *
-	 *   Size |   Base 2 | Minimum alignment
-	 *   -----+----------+------------------
-	 *     96 |  1100000 |  32
-	 *    144 | 10100000 |  32
-	 *    192 | 11000000 |  64
-	 *
-	 * Depending on runtime settings, it is possible that arena_malloc()
-	 * will further round up to a power of two, but that never causes
-	 * correctness issues.
-	 */
-	ceil_size = (size + (alignment - 1)) & (-alignment);
-	/*
-	 * (ceil_size < size) protects against the combination of maximal
-	 * alignment and size greater than maximal alignment.
-	 */
-	if (ceil_size < size) {
-		/* size_t overflow. */
-		return (NULL);
-	}
-
-	if (ceil_size <= PAGE_SIZE || (alignment <= PAGE_SIZE
-	    && ceil_size <= arena_maxclass))
-		ret = arena_malloc(ceil_size, false);
-	else {
-		size_t run_size;
-
-		/*
-		 * We can't achieve subpage alignment, so round up alignment
-		 * permanently; it makes later calculations simpler.
-		 */
-		alignment = PAGE_CEILING(alignment);
-		ceil_size = PAGE_CEILING(size);
-		/*
-		 * (ceil_size < size) protects against very large sizes within
-		 * PAGE_SIZE of SIZE_T_MAX.
-		 *
-		 * (ceil_size + alignment < ceil_size) protects against the
-		 * combination of maximal alignment and ceil_size large enough
-		 * to cause overflow.  This is similar to the first overflow
-		 * check above, but it needs to be repeated due to the new
-		 * ceil_size value, which may now be *equal* to maximal
-		 * alignment, whereas before we only detected overflow if the
-		 * original size was *greater* than maximal alignment.
-		 */
-		if (ceil_size < size || ceil_size + alignment < ceil_size) {
-			/* size_t overflow. */
-			return (NULL);
-		}
-
-		/*
-		 * Calculate the size of the over-size run that arena_palloc()
-		 * would need to allocate in order to guarantee the alignment.
-		 */
-		if (ceil_size >= alignment)
-			run_size = ceil_size + alignment - PAGE_SIZE;
-		else {
-			/*
-			 * It is possible that (alignment << 1) will cause
-			 * overflow, but it doesn't matter because we also
-			 * subtract PAGE_SIZE, which in the case of overflow
-			 * leaves us with a very large run_size.  That causes
-			 * the first conditional below to fail, which means
-			 * that the bogus run_size value never gets used for
-			 * anything important.
-			 */
-			run_size = (alignment << 1) - PAGE_SIZE;
-		}
-
-		if (run_size <= arena_maxclass) {
-			ret = arena_palloc(choose_arena(), alignment, ceil_size,
-			    run_size);
-		} else if (alignment <= chunksize)
-			ret = huge_malloc(ceil_size, false);
-		else
-			ret = huge_palloc(alignment, ceil_size);
-	}
-
-	assert(((uintptr_t)ret & (alignment - 1)) == 0);
-	return (ret);
-}
-
-JEMALLOC_INLINE size_t
-isalloc(const void *ptr)
-{
-	size_t ret;
-	arena_chunk_t *chunk;
-
-	assert(ptr != NULL);
-
-	chunk = (arena_chunk_t *)CHUNK_ADDR2BASE(ptr);
-	if (chunk != ptr) {
-		/* Region. */
-		assert(chunk->arena->magic == ARENA_MAGIC);
-
-#ifdef JEMALLOC_PROF
-		ret = arena_salloc_demote(ptr);
-#else
-		ret = arena_salloc(ptr);
-#endif
-	} else
-		ret = huge_salloc(ptr);
-
-	return (ret);
-}
-
-JEMALLOC_INLINE void *
-iralloc(void *ptr, size_t size)
-{
-	size_t oldsize;
-
-	assert(ptr != NULL);
-	assert(size != 0);
-
-	oldsize = isalloc(ptr);
-
-	if (size <= arena_maxclass)
-		return (arena_ralloc(ptr, size, oldsize));
-	else
-		return (huge_ralloc(ptr, size, oldsize));
-}
-
-JEMALLOC_INLINE void
-idalloc(void *ptr)
-{
-	arena_chunk_t *chunk;
-
-	assert(ptr != NULL);
-
-	chunk = (arena_chunk_t *)CHUNK_ADDR2BASE(ptr);
-	if (chunk != ptr)
-		arena_dalloc(chunk->arena, chunk, ptr);
-	else
-		huge_dalloc(ptr);
-}
-#endif
-
-#undef JEMALLOC_H_INLINES
-/******************************************************************************/
diff --git a/externals/jemalloc/include/internal/jemalloc_internal.h.in b/externals/jemalloc/include/internal/jemalloc_internal.h.in
deleted file mode 100644
index 2c3f32f126d..00000000000
--- a/externals/jemalloc/include/internal/jemalloc_internal.h.in
+++ /dev/null
@@ -1,561 +0,0 @@
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include 
-#include 
-#ifndef SIZE_T_MAX
-#  define SIZE_T_MAX	SIZE_MAX
-#endif
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#define	JEMALLOC_MANGLE
-#include "../jemalloc@install_suffix@.h"
-
-#ifdef JEMALLOC_LAZY_LOCK
-#include 
-#endif
-
-#define	RB_COMPACT
-#include "jemalloc/internal/rb.h"
-#include "jemalloc/internal/qr.h"
-#include "jemalloc/internal/ql.h"
-
-extern void	(*JEMALLOC_P(malloc_message))(void *wcbopaque, const char *s);
-
-/*
- * Define a custom assert() in order to reduce the chances of deadlock during
- * assertion failure.
- */
-#ifdef JEMALLOC_DEBUG
-#  define assert(e) do {						\
-	if (!(e)) {							\
-		char line_buf[UMAX2S_BUFSIZE];				\
-		malloc_write(": ");				\
-		malloc_write(__FILE__);					\
-		malloc_write(":");					\
-		malloc_write(umax2s(__LINE__, 10, line_buf));		\
-		malloc_write(": Failed assertion: ");			\
-		malloc_write("\"");					\
-		malloc_write(#e);					\
-		malloc_write("\"\n");					\
-		abort();						\
-	}								\
-} while (0)
-#else
-#define assert(e)
-#endif
-
-/*
- * jemalloc can conceptually be broken into components (arena, tcache, etc.),
- * but there are circular dependencies that cannot be broken without
- * substantial performance degradation.  In order to reduce the effect on
- * visual code flow, read the header files in multiple passes, with one of the
- * following cpp variables defined during each pass:
- *
- *   JEMALLOC_H_TYPES   : Preprocessor-defined constants and psuedo-opaque data
- *                        types.
- *   JEMALLOC_H_STRUCTS : Data structures.
- *   JEMALLOC_H_EXTERNS : Extern data declarations and function prototypes.
- *   JEMALLOC_H_INLINES : Inline functions.
- */
-/******************************************************************************/
-#define JEMALLOC_H_TYPES
-
-#define	ZU(z)	((size_t)z)
-
-#ifndef __DECONST
-#  define	__DECONST(type, var)	((type)(uintptr_t)(const void *)(var))
-#endif
-
-#ifdef JEMALLOC_DEBUG
-   /* Disable inlining to make debugging easier. */
-#  define JEMALLOC_INLINE
-#  define inline
-#else
-#  define JEMALLOC_ENABLE_INLINE
-#  define JEMALLOC_INLINE static inline
-#endif
-
-/* Size of stack-allocated buffer passed to strerror_r(). */
-#define	STRERROR_BUF		64
-
-/* Minimum alignment of allocations is 2^LG_QUANTUM bytes. */
-#ifdef __i386__
-#  define LG_QUANTUM		4
-#endif
-#ifdef __ia64__
-#  define LG_QUANTUM		4
-#endif
-#ifdef __alpha__
-#  define LG_QUANTUM		4
-#endif
-#ifdef __sparc64__
-#  define LG_QUANTUM		4
-#endif
-#if (defined(__amd64__) || defined(__x86_64__))
-#  define LG_QUANTUM		4
-#endif
-#ifdef __arm__
-#  define LG_QUANTUM		3
-#endif
-#ifdef __mips__
-#  define LG_QUANTUM		3
-#endif
-#ifdef __powerpc__
-#  define LG_QUANTUM		4
-#endif
-#ifdef __s390x__
-#  define LG_QUANTUM		4
-#endif
-
-#define	QUANTUM			((size_t)(1U << LG_QUANTUM))
-#define	QUANTUM_MASK		(QUANTUM - 1)
-
-/* Return the smallest quantum multiple that is >= a. */
-#define	QUANTUM_CEILING(a)						\
-	(((a) + QUANTUM_MASK) & ~QUANTUM_MASK)
-
-#define	SIZEOF_PTR		(1U << LG_SIZEOF_PTR)
-
-/* We can't use TLS in non-PIC programs, since TLS relies on loader magic. */
-#if (!defined(PIC) && !defined(NO_TLS))
-#  define NO_TLS
-#endif
-
-/*
- * Maximum size of L1 cache line.  This is used to avoid cache line aliasing.
- * In addition, this controls the spacing of cacheline-spaced size classes.
- */
-#define	LG_CACHELINE		6
-#define	CACHELINE		((size_t)(1U << LG_CACHELINE))
-#define	CACHELINE_MASK		(CACHELINE - 1)
-
-/* Return the smallest cacheline multiple that is >= s. */
-#define	CACHELINE_CEILING(s)						\
-	(((s) + CACHELINE_MASK) & ~CACHELINE_MASK)
-
-/*
- * Page size.  STATIC_PAGE_SHIFT is determined by the configure script.  If
- * DYNAMIC_PAGE_SHIFT is enabled, only use the STATIC_PAGE_* macros where
- * compile-time values are required for the purposes of defining data
- * structures.
- */
-#define	STATIC_PAGE_SIZE ((size_t)(1U << STATIC_PAGE_SHIFT))
-#define	STATIC_PAGE_MASK ((size_t)(STATIC_PAGE_SIZE - 1))
-
-#ifdef DYNAMIC_PAGE_SHIFT
-#  define PAGE_SHIFT	lg_pagesize
-#  define PAGE_SIZE	pagesize
-#  define PAGE_MASK	pagesize_mask
-#else
-#  define PAGE_SHIFT	STATIC_PAGE_SHIFT
-#  define PAGE_SIZE	STATIC_PAGE_SIZE
-#  define PAGE_MASK	STATIC_PAGE_MASK
-#endif
-
-/* Return the smallest pagesize multiple that is >= s. */
-#define	PAGE_CEILING(s)							\
-	(((s) + PAGE_MASK) & ~PAGE_MASK)
-
-#include "jemalloc/internal/prn.h"
-#include "jemalloc/internal/ckh.h"
-#include "jemalloc/internal/stats.h"
-#include "jemalloc/internal/ctl.h"
-#include "jemalloc/internal/mutex.h"
-#include "jemalloc/internal/mb.h"
-#include "jemalloc/internal/extent.h"
-#include "jemalloc/internal/arena.h"
-#include "jemalloc/internal/base.h"
-#include "jemalloc/internal/chunk.h"
-#include "jemalloc/internal/huge.h"
-#include "jemalloc/internal/tcache.h"
-#include "jemalloc/internal/hash.h"
-#include "jemalloc/internal/prof.h"
-
-#undef JEMALLOC_H_TYPES
-/******************************************************************************/
-#define JEMALLOC_H_STRUCTS
-
-#include "jemalloc/internal/prn.h"
-#include "jemalloc/internal/ckh.h"
-#include "jemalloc/internal/stats.h"
-#include "jemalloc/internal/ctl.h"
-#include "jemalloc/internal/mutex.h"
-#include "jemalloc/internal/mb.h"
-#include "jemalloc/internal/extent.h"
-#include "jemalloc/internal/arena.h"
-#include "jemalloc/internal/base.h"
-#include "jemalloc/internal/chunk.h"
-#include "jemalloc/internal/huge.h"
-#include "jemalloc/internal/tcache.h"
-#include "jemalloc/internal/hash.h"
-#include "jemalloc/internal/prof.h"
-
-#undef JEMALLOC_H_STRUCTS
-/******************************************************************************/
-#define JEMALLOC_H_EXTERNS
-
-extern bool	opt_abort;
-#ifdef JEMALLOC_FILL
-extern bool	opt_junk;
-#endif
-#ifdef JEMALLOC_SYSV
-extern bool	opt_sysv;
-#endif
-#ifdef JEMALLOC_XMALLOC
-extern bool	opt_xmalloc;
-#endif
-#ifdef JEMALLOC_FILL
-extern bool	opt_zero;
-#endif
-
-#ifdef DYNAMIC_PAGE_SHIFT
-extern size_t		pagesize;
-extern size_t		pagesize_mask;
-extern size_t		lg_pagesize;
-#endif
-
-/* Number of CPUs. */
-extern unsigned		ncpus;
-
-extern malloc_mutex_t	arenas_lock; /* Protects arenas initialization. */
-#ifndef NO_TLS
-/*
- * Map of pthread_self() --> arenas[???], used for selecting an arena to use
- * for allocations.
- */
-extern __thread arena_t	*arenas_map JEMALLOC_ATTR(tls_model("initial-exec"));
-#endif
-/*
- * Arenas that are used to service external requests.  Not all elements of the
- * arenas array are necessarily used; arenas are created lazily as needed.
- */
-extern arena_t		**arenas;
-extern unsigned		narenas;
-
-arena_t	*arenas_extend(unsigned ind);
-#ifndef NO_TLS
-arena_t	*choose_arena_hard(void);
-#endif
-
-#include "jemalloc/internal/prn.h"
-#include "jemalloc/internal/ckh.h"
-#include "jemalloc/internal/stats.h"
-#include "jemalloc/internal/ctl.h"
-#include "jemalloc/internal/mutex.h"
-#include "jemalloc/internal/mb.h"
-#include "jemalloc/internal/extent.h"
-#include "jemalloc/internal/arena.h"
-#include "jemalloc/internal/base.h"
-#include "jemalloc/internal/chunk.h"
-#include "jemalloc/internal/huge.h"
-#include "jemalloc/internal/tcache.h"
-#include "jemalloc/internal/hash.h"
-#include "jemalloc/internal/prof.h"
-
-#undef JEMALLOC_H_EXTERNS
-/******************************************************************************/
-#define JEMALLOC_H_INLINES
-
-#include "jemalloc/internal/prn.h"
-#include "jemalloc/internal/ckh.h"
-#include "jemalloc/internal/stats.h"
-#include "jemalloc/internal/ctl.h"
-#include "jemalloc/internal/mutex.h"
-#include "jemalloc/internal/mb.h"
-#include "jemalloc/internal/extent.h"
-#include "jemalloc/internal/base.h"
-#include "jemalloc/internal/chunk.h"
-#include "jemalloc/internal/huge.h"
-
-#ifndef JEMALLOC_ENABLE_INLINE
-void	malloc_write(const char *s);
-arena_t	*choose_arena(void);
-#endif
-
-#if (defined(JEMALLOC_ENABLE_INLINE) || defined(JEMALLOC_C_))
-/*
- * Wrapper around malloc_message() that avoids the need for
- * JEMALLOC_P(malloc_message)(...) throughout the code.
- */
-JEMALLOC_INLINE void
-malloc_write(const char *s)
-{
-
-	JEMALLOC_P(malloc_message)(NULL, s);
-}
-
-/*
- * Choose an arena based on a per-thread value (fast-path code, calls slow-path
- * code if necessary).
- */
-JEMALLOC_INLINE arena_t *
-choose_arena(void)
-{
-	arena_t *ret;
-
-	/*
-	 * We can only use TLS if this is a PIC library, since for the static
-	 * library version, libc's malloc is used by TLS allocation, which
-	 * introduces a bootstrapping issue.
-	 */
-#ifndef NO_TLS
-	ret = arenas_map;
-	if (ret == NULL) {
-		ret = choose_arena_hard();
-		assert(ret != NULL);
-	}
-#else
-	if (isthreaded && narenas > 1) {
-		unsigned long ind;
-
-		/*
-		 * Hash pthread_self() to one of the arenas.  There is a prime
-		 * number of arenas, so this has a reasonable chance of
-		 * working.  Even so, the hashing can be easily thwarted by
-		 * inconvenient pthread_self() values.  Without specific
-		 * knowledge of how pthread_self() calculates values, we can't
-		 * easily do much better than this.
-		 */
-		ind = (unsigned long) pthread_self() % narenas;
-
-		/*
-		 * Optimistially assume that arenas[ind] has been initialized.
-		 * At worst, we find out that some other thread has already
-		 * done so, after acquiring the lock in preparation.  Note that
-		 * this lazy locking also has the effect of lazily forcing
-		 * cache coherency; without the lock acquisition, there's no
-		 * guarantee that modification of arenas[ind] by another thread
-		 * would be seen on this CPU for an arbitrary amount of time.
-		 *
-		 * In general, this approach to modifying a synchronized value
-		 * isn't a good idea, but in this case we only ever modify the
-		 * value once, so things work out well.
-		 */
-		ret = arenas[ind];
-		if (ret == NULL) {
-			/*
-			 * Avoid races with another thread that may have already
-			 * initialized arenas[ind].
-			 */
-			malloc_mutex_lock(&arenas_lock);
-			if (arenas[ind] == NULL)
-				ret = arenas_extend((unsigned)ind);
-			else
-				ret = arenas[ind];
-			malloc_mutex_unlock(&arenas_lock);
-		}
-	} else
-		ret = arenas[0];
-#endif
-
-	assert(ret != NULL);
-	return (ret);
-}
-#endif
-
-#include "jemalloc/internal/tcache.h"
-#include "jemalloc/internal/arena.h"
-#include "jemalloc/internal/hash.h"
-#include "jemalloc/internal/prof.h"
-
-#ifndef JEMALLOC_ENABLE_INLINE
-void	*imalloc(size_t size);
-void	*icalloc(size_t size);
-void	*ipalloc(size_t alignment, size_t size);
-size_t	isalloc(const void *ptr);
-void	*iralloc(void *ptr, size_t size);
-void	idalloc(void *ptr);
-#endif
-
-#if (defined(JEMALLOC_ENABLE_INLINE) || defined(JEMALLOC_C_))
-JEMALLOC_INLINE void *
-imalloc(size_t size)
-{
-
-	assert(size != 0);
-
-	if (size <= arena_maxclass)
-		return (arena_malloc(size, false));
-	else
-		return (huge_malloc(size, false));
-}
-
-JEMALLOC_INLINE void *
-icalloc(size_t size)
-{
-
-	if (size <= arena_maxclass)
-		return (arena_malloc(size, true));
-	else
-		return (huge_malloc(size, true));
-}
-
-JEMALLOC_INLINE void *
-ipalloc(size_t alignment, size_t size)
-{
-	void *ret;
-	size_t ceil_size;
-
-	/*
-	 * Round size up to the nearest multiple of alignment.
-	 *
-	 * This done, we can take advantage of the fact that for each small
-	 * size class, every object is aligned at the smallest power of two
-	 * that is non-zero in the base two representation of the size.  For
-	 * example:
-	 *
-	 *   Size |   Base 2 | Minimum alignment
-	 *   -----+----------+------------------
-	 *     96 |  1100000 |  32
-	 *    144 | 10100000 |  32
-	 *    192 | 11000000 |  64
-	 *
-	 * Depending on runtime settings, it is possible that arena_malloc()
-	 * will further round up to a power of two, but that never causes
-	 * correctness issues.
-	 */
-	ceil_size = (size + (alignment - 1)) & (-alignment);
-	/*
-	 * (ceil_size < size) protects against the combination of maximal
-	 * alignment and size greater than maximal alignment.
-	 */
-	if (ceil_size < size) {
-		/* size_t overflow. */
-		return (NULL);
-	}
-
-	if (ceil_size <= PAGE_SIZE || (alignment <= PAGE_SIZE
-	    && ceil_size <= arena_maxclass))
-		ret = arena_malloc(ceil_size, false);
-	else {
-		size_t run_size;
-
-		/*
-		 * We can't achieve subpage alignment, so round up alignment
-		 * permanently; it makes later calculations simpler.
-		 */
-		alignment = PAGE_CEILING(alignment);
-		ceil_size = PAGE_CEILING(size);
-		/*
-		 * (ceil_size < size) protects against very large sizes within
-		 * PAGE_SIZE of SIZE_T_MAX.
-		 *
-		 * (ceil_size + alignment < ceil_size) protects against the
-		 * combination of maximal alignment and ceil_size large enough
-		 * to cause overflow.  This is similar to the first overflow
-		 * check above, but it needs to be repeated due to the new
-		 * ceil_size value, which may now be *equal* to maximal
-		 * alignment, whereas before we only detected overflow if the
-		 * original size was *greater* than maximal alignment.
-		 */
-		if (ceil_size < size || ceil_size + alignment < ceil_size) {
-			/* size_t overflow. */
-			return (NULL);
-		}
-
-		/*
-		 * Calculate the size of the over-size run that arena_palloc()
-		 * would need to allocate in order to guarantee the alignment.
-		 */
-		if (ceil_size >= alignment)
-			run_size = ceil_size + alignment - PAGE_SIZE;
-		else {
-			/*
-			 * It is possible that (alignment << 1) will cause
-			 * overflow, but it doesn't matter because we also
-			 * subtract PAGE_SIZE, which in the case of overflow
-			 * leaves us with a very large run_size.  That causes
-			 * the first conditional below to fail, which means
-			 * that the bogus run_size value never gets used for
-			 * anything important.
-			 */
-			run_size = (alignment << 1) - PAGE_SIZE;
-		}
-
-		if (run_size <= arena_maxclass) {
-			ret = arena_palloc(choose_arena(), alignment, ceil_size,
-			    run_size);
-		} else if (alignment <= chunksize)
-			ret = huge_malloc(ceil_size, false);
-		else
-			ret = huge_palloc(alignment, ceil_size);
-	}
-
-	assert(((uintptr_t)ret & (alignment - 1)) == 0);
-	return (ret);
-}
-
-JEMALLOC_INLINE size_t
-isalloc(const void *ptr)
-{
-	size_t ret;
-	arena_chunk_t *chunk;
-
-	assert(ptr != NULL);
-
-	chunk = (arena_chunk_t *)CHUNK_ADDR2BASE(ptr);
-	if (chunk != ptr) {
-		/* Region. */
-		assert(chunk->arena->magic == ARENA_MAGIC);
-
-#ifdef JEMALLOC_PROF
-		ret = arena_salloc_demote(ptr);
-#else
-		ret = arena_salloc(ptr);
-#endif
-	} else
-		ret = huge_salloc(ptr);
-
-	return (ret);
-}
-
-JEMALLOC_INLINE void *
-iralloc(void *ptr, size_t size)
-{
-	size_t oldsize;
-
-	assert(ptr != NULL);
-	assert(size != 0);
-
-	oldsize = isalloc(ptr);
-
-	if (size <= arena_maxclass)
-		return (arena_ralloc(ptr, size, oldsize));
-	else
-		return (huge_ralloc(ptr, size, oldsize));
-}
-
-JEMALLOC_INLINE void
-idalloc(void *ptr)
-{
-	arena_chunk_t *chunk;
-
-	assert(ptr != NULL);
-
-	chunk = (arena_chunk_t *)CHUNK_ADDR2BASE(ptr);
-	if (chunk != ptr)
-		arena_dalloc(chunk->arena, chunk, ptr);
-	else
-		huge_dalloc(ptr);
-}
-#endif
-
-#undef JEMALLOC_H_INLINES
-/******************************************************************************/
diff --git a/externals/jemalloc/include/internal/mb.h b/externals/jemalloc/include/internal/mb.h
deleted file mode 100644
index 1707aa91d68..00000000000
--- a/externals/jemalloc/include/internal/mb.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/******************************************************************************/
-#ifdef JEMALLOC_H_TYPES
-
-#endif /* JEMALLOC_H_TYPES */
-/******************************************************************************/
-#ifdef JEMALLOC_H_STRUCTS
-
-#endif /* JEMALLOC_H_STRUCTS */
-/******************************************************************************/
-#ifdef JEMALLOC_H_EXTERNS
-
-#endif /* JEMALLOC_H_EXTERNS */
-/******************************************************************************/
-#ifdef JEMALLOC_H_INLINES
-
-#ifndef JEMALLOC_ENABLE_INLINE
-void	mb_write(void);
-#endif
-
-#if (defined(JEMALLOC_ENABLE_INLINE) || defined(MB_C_))
-#ifdef __i386__
-/*
- * According to the Intel Architecture Software Developer's Manual, current
- * processors execute instructions in order from the perspective of other
- * processors in a multiprocessor system, but 1) Intel reserves the right to
- * change that, and 2) the compiler's optimizer could re-order instructions if
- * there weren't some form of barrier.  Therefore, even if running on an
- * architecture that does not need memory barriers (everything through at least
- * i686), an "optimizer barrier" is necessary.
- */
-JEMALLOC_INLINE void
-mb_write(void)
-{
-
-#  if 0
-	/* This is a true memory barrier. */
-	asm volatile ("pusha;"
-	    "xor  %%eax,%%eax;"
-	    "cpuid;"
-	    "popa;"
-	    : /* Outputs. */
-	    : /* Inputs. */
-	    : "memory" /* Clobbers. */
-	    );
-#else
-	/*
-	 * This is hopefully enough to keep the compiler from reordering
-	 * instructions around this one.
-	 */
-	asm volatile ("nop;"
-	    : /* Outputs. */
-	    : /* Inputs. */
-	    : "memory" /* Clobbers. */
-	    );
-#endif
-}
-#elif (defined(__amd64_) || defined(__x86_64__))
-JEMALLOC_INLINE void
-mb_write(void)
-{
-
-	asm volatile ("sfence"
-	    : /* Outputs. */
-	    : /* Inputs. */
-	    : "memory" /* Clobbers. */
-	    );
-}
-#elif defined(__powerpc__)
-JEMALLOC_INLINE void
-mb_write(void)
-{
-
-	asm volatile ("eieio"
-	    : /* Outputs. */
-	    : /* Inputs. */
-	    : "memory" /* Clobbers. */
-	    );
-}
-#elif defined(__sparc64__)
-JEMALLOC_INLINE void
-mb_write(void)
-{
-
-	asm volatile ("membar #StoreStore"
-	    : /* Outputs. */
-	    : /* Inputs. */
-	    : "memory" /* Clobbers. */
-	    );
-}
-#else
-/*
- * This is much slower than a simple memory barrier, but the semantics of mutex
- * unlock make this work.
- */
-JEMALLOC_INLINE void
-mb_write(void)
-{
-	malloc_mutex_t mtx;
-
-	malloc_mutex_init(&mtx);
-	malloc_mutex_lock(&mtx);
-	malloc_mutex_unlock(&mtx);
-}
-#endif
-#endif
-
-#endif /* JEMALLOC_H_INLINES */
-/******************************************************************************/
diff --git a/externals/jemalloc/include/internal/mutex.h b/externals/jemalloc/include/internal/mutex.h
deleted file mode 100644
index 108bfa8abfd..00000000000
--- a/externals/jemalloc/include/internal/mutex.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/******************************************************************************/
-#ifdef JEMALLOC_H_TYPES
-
-typedef pthread_mutex_t malloc_mutex_t;
-
-#endif /* JEMALLOC_H_TYPES */
-/******************************************************************************/
-#ifdef JEMALLOC_H_STRUCTS
-
-#endif /* JEMALLOC_H_STRUCTS */
-/******************************************************************************/
-#ifdef JEMALLOC_H_EXTERNS
-
-#ifdef JEMALLOC_LAZY_LOCK
-extern bool isthreaded;
-#else
-#  define isthreaded true
-#endif
-
-bool	malloc_mutex_init(malloc_mutex_t *mutex);
-
-#endif /* JEMALLOC_H_EXTERNS */
-/******************************************************************************/
-#ifdef JEMALLOC_H_INLINES
-
-#ifndef JEMALLOC_ENABLE_INLINE
-void	malloc_mutex_lock(malloc_mutex_t *mutex);
-bool	malloc_mutex_trylock(malloc_mutex_t *mutex);
-void	malloc_mutex_unlock(malloc_mutex_t *mutex);
-#endif
-
-#if (defined(JEMALLOC_ENABLE_INLINE) || defined(JEMALLOC_MUTEX_C_))
-JEMALLOC_INLINE void
-malloc_mutex_lock(malloc_mutex_t *mutex)
-{
-
-	if (isthreaded)
-		pthread_mutex_lock(mutex);
-}
-
-JEMALLOC_INLINE bool
-malloc_mutex_trylock(malloc_mutex_t *mutex)
-{
-
-	if (isthreaded)
-		return (pthread_mutex_trylock(mutex) != 0);
-	else
-		return (false);
-}
-
-JEMALLOC_INLINE void
-malloc_mutex_unlock(malloc_mutex_t *mutex)
-{
-
-	if (isthreaded)
-		pthread_mutex_unlock(mutex);
-}
-#endif
-
-#endif /* JEMALLOC_H_INLINES */
-/******************************************************************************/
diff --git a/externals/jemalloc/include/internal/prof.h b/externals/jemalloc/include/internal/prof.h
deleted file mode 100644
index 6e71552d85e..00000000000
--- a/externals/jemalloc/include/internal/prof.h
+++ /dev/null
@@ -1,171 +0,0 @@
-#ifdef JEMALLOC_PROF
-/******************************************************************************/
-#ifdef JEMALLOC_H_TYPES
-
-typedef struct prof_bt_s prof_bt_t;
-typedef struct prof_cnt_s prof_cnt_t;
-typedef struct prof_thr_cnt_s prof_thr_cnt_t;
-typedef struct prof_ctx_s prof_ctx_t;
-typedef struct prof_s prof_t;
-
-/* Option defaults. */
-#define	LG_PROF_BT_MAX_DEFAULT		2
-#define	LG_PROF_SAMPLE_DEFAULT		0
-#define	LG_PROF_INTERVAL_DEFAULT	30
-
-/*
- * Hard limit on stack backtrace depth.  Note that the version of
- * prof_backtrace() that is based on __builtin_return_address() necessarily has
- * a hard-coded number of backtrace frame handlers, so increasing
- * LG_PROF_BT_MAX requires changing prof_backtrace().
- */
-#define	LG_PROF_BT_MAX		7 /* >= LG_PROF_BT_MAX_DEFAULT */
-#define	PROF_BT_MAX		(1U << LG_PROF_BT_MAX)
-
-/* Initial hash table size. */
-#define	PROF_CKH_MINITEMS	64
-
-/* Size of memory buffer to use when writing dump files. */
-#define	PROF_DUMP_BUF_SIZE	65536
-
-#endif /* JEMALLOC_H_TYPES */
-/******************************************************************************/
-#ifdef JEMALLOC_H_STRUCTS
-
-struct prof_bt_s {
-	/* Backtrace, stored as len program counters. */
-	void			**vec;
-	unsigned		len;
-};
-
-#ifdef JEMALLOC_PROF_LIBGCC
-/* Data structure passed to libgcc _Unwind_Backtrace() callback functions. */
-typedef struct {
-	prof_bt_t *bt;
-	unsigned nignore;
-	unsigned max;
-} prof_unwind_data_t;
-#endif
-
-struct prof_cnt_s {
-	/*
-	 * Profiling counters.  An allocation/deallocation pair can operate on
-	 * different prof_thr_cnt_t objects that are linked into the same
-	 * prof_ctx_t sets_ql, so it is possible for the cur* counters to go
-	 * negative.  In principle it is possible for the *bytes counters to
-	 * overflow/underflow, but a general solution would require some form
-	 * of 128-bit counter solution; this implementation doesn't bother to
-	 * solve that problem.
-	 */
-	int64_t		curobjs;
-	int64_t		curbytes;
-	uint64_t	accumobjs;
-	uint64_t	accumbytes;
-};
-
-struct prof_thr_cnt_s {
-	/* Linkage into prof_ctx_t's sets_ql. */
-	ql_elm(prof_thr_cnt_t)	link;
-
-	/*
-	 * Associated context.  If a thread frees an object that it did not
-	 * allocate, it is possible that the context is not cached in the
-	 * thread's hash table, in which case it must be able to look up the
-	 * context, insert a new prof_thr_cnt_t into the thread's hash table,
-	 * and link it into the prof_ctx_t's sets_ql.
-	 */
-	prof_ctx_t		*ctx;
-
-	/*
-	 * Threads use memory barriers to update the counters.  Since there is
-	 * only ever one writer, the only challenge is for the reader to get a
-	 * consistent read of the counters.
-	 *
-	 * The writer uses this series of operations:
-	 *
-	 * 1) Increment epoch to an odd number.
-	 * 2) Update counters.
-	 * 3) Increment epoch to an even number.
-	 *
-	 * The reader must assure 1) that the epoch is even while it reads the
-	 * counters, and 2) that the epoch doesn't change between the time it
-	 * starts and finishes reading the counters.
-	 */
-	unsigned		epoch;
-
-	/* Profiling counters. */
-	prof_cnt_t		cnts;
-};
-
-struct prof_ctx_s {
-	/* Protects cnt_merged and sets_ql. */
-	malloc_mutex_t		lock;
-
-	/* Temporary storage for aggregation during dump. */
-	prof_cnt_t		cnt_dump;
-
-	/* When threads exit, they merge their stats into cnt_merged. */
-	prof_cnt_t		cnt_merged;
-
-	/*
-	 * List of profile counters, one for each thread that has allocated in
-	 * this context.
-	 */
-	ql_head(prof_thr_cnt_t)	cnts_ql;
-};
-
-#endif /* JEMALLOC_H_STRUCTS */
-/******************************************************************************/
-#ifdef JEMALLOC_H_EXTERNS
-
-extern bool	opt_prof;
-/*
- * Even if opt_prof is true, sampling can be temporarily disabled by setting
- * opt_prof_active to false.  No locking is used when updating opt_prof_active,
- * so there are no guarantees regarding how long it will take for all threads
- * to notice state changes.
- */
-extern bool	opt_prof_active;
-extern size_t	opt_lg_prof_bt_max; /* Maximum backtrace depth. */
-extern size_t	opt_lg_prof_sample; /* Mean bytes between samples. */
-extern ssize_t	opt_lg_prof_interval; /* lg(prof_interval). */
-extern bool	opt_prof_udump; /* High-water memory dumping. */
-extern bool	opt_prof_leak; /* Dump leak summary at exit. */
-
-/*
- * Profile dump interval, measured in bytes allocated.  Each arena triggers a
- * profile dump when it reaches this threshold.  The effect is that the
- * interval between profile dumps averages prof_interval, though the actual
- * interval between dumps will tend to be sporadic, and the interval will be a
- * maximum of approximately (prof_interval * narenas).
- */
-extern uint64_t	prof_interval;
-
-/*
- * If true, promote small sampled objects to large objects, since small run
- * headers do not have embedded profile context pointers.
- */
-extern bool	prof_promote;
-
-bool	prof_init(prof_t *prof, bool master);
-void	prof_destroy(prof_t *prof);
-
-prof_thr_cnt_t	*prof_alloc_prep(size_t size);
-prof_thr_cnt_t	*prof_cnt_get(const void *ptr);
-void	prof_malloc(const void *ptr, prof_thr_cnt_t *cnt);
-void	prof_realloc(const void *ptr, prof_thr_cnt_t *cnt, const void *old_ptr,
-    size_t old_size, prof_thr_cnt_t *old_cnt);
-void	prof_free(const void *ptr);
-void	prof_idump(void);
-bool	prof_mdump(const char *filename);
-void	prof_udump(void);
-void	prof_boot0(void);
-bool	prof_boot1(void);
-
-#endif /* JEMALLOC_H_EXTERNS */
-/******************************************************************************/
-#ifdef JEMALLOC_H_INLINES
-
-#endif /* JEMALLOC_H_INLINES */
-/******************************************************************************/
-#endif /* JEMALLOC_PROF */
diff --git a/externals/jemalloc/include/internal/ql.h b/externals/jemalloc/include/internal/ql.h
deleted file mode 100644
index a9ed2393f0c..00000000000
--- a/externals/jemalloc/include/internal/ql.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * List definitions.
- */
-#define ql_head(a_type)							\
-struct {								\
-	a_type *qlh_first;						\
-}
-
-#define ql_head_initializer(a_head) {NULL}
-
-#define ql_elm(a_type)	qr(a_type)
-
-/* List functions. */
-#define ql_new(a_head) do {						\
-	(a_head)->qlh_first = NULL;					\
-} while (0)
-
-#define ql_elm_new(a_elm, a_field) qr_new((a_elm), a_field)
-
-#define ql_first(a_head) ((a_head)->qlh_first)
-
-#define ql_last(a_head, a_field)					\
-	((ql_first(a_head) != NULL)					\
-	    ? qr_prev(ql_first(a_head), a_field) : NULL)
-
-#define ql_next(a_head, a_elm, a_field)					\
-	((ql_last(a_head, a_field) != (a_elm))				\
-	    ? qr_next((a_elm), a_field)	: NULL)
-
-#define ql_prev(a_head, a_elm, a_field)					\
-	((ql_first(a_head) != (a_elm)) ? qr_prev((a_elm), a_field)	\
-				       : NULL)
-
-#define ql_before_insert(a_head, a_qlelm, a_elm, a_field) do {		\
-	qr_before_insert((a_qlelm), (a_elm), a_field);			\
-	if (ql_first(a_head) == (a_qlelm)) {				\
-		ql_first(a_head) = (a_elm);				\
-	}								\
-} while (0)
-
-#define ql_after_insert(a_qlelm, a_elm, a_field)			\
-	qr_after_insert((a_qlelm), (a_elm), a_field)
-
-#define ql_head_insert(a_head, a_elm, a_field) do {			\
-	if (ql_first(a_head) != NULL) {					\
-		qr_before_insert(ql_first(a_head), (a_elm), a_field);	\
-	}								\
-	ql_first(a_head) = (a_elm);					\
-} while (0)
-
-#define ql_tail_insert(a_head, a_elm, a_field) do {			\
-	if (ql_first(a_head) != NULL) {					\
-		qr_before_insert(ql_first(a_head), (a_elm), a_field);	\
-	}								\
-	ql_first(a_head) = qr_next((a_elm), a_field);			\
-} while (0)
-
-#define ql_remove(a_head, a_elm, a_field) do {				\
-	if (ql_first(a_head) == (a_elm)) {				\
-		ql_first(a_head) = qr_next(ql_first(a_head), a_field);	\
-	}								\
-	if (ql_first(a_head) != (a_elm)) {				\
-		qr_remove((a_elm), a_field);				\
-	} else {							\
-		ql_first(a_head) = NULL;				\
-	}								\
-} while (0)
-
-#define ql_head_remove(a_head, a_type, a_field) do {			\
-	a_type *t = ql_first(a_head);					\
-	ql_remove((a_head), t, a_field);				\
-} while (0)
-
-#define ql_tail_remove(a_head, a_type, a_field) do {			\
-	a_type *t = ql_last(a_head, a_field);				\
-	ql_remove((a_head), t, a_field);				\
-} while (0)
-
-#define ql_foreach(a_var, a_head, a_field)				\
-	qr_foreach((a_var), ql_first(a_head), a_field)
-
-#define ql_reverse_foreach(a_var, a_head, a_field)			\
-	qr_reverse_foreach((a_var), ql_first(a_head), a_field)
diff --git a/externals/jemalloc/include/internal/qr.h b/externals/jemalloc/include/internal/qr.h
deleted file mode 100644
index fe22352fedd..00000000000
--- a/externals/jemalloc/include/internal/qr.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Ring definitions. */
-#define qr(a_type)							\
-struct {								\
-	a_type	*qre_next;						\
-	a_type	*qre_prev;						\
-}
-
-/* Ring functions. */
-#define qr_new(a_qr, a_field) do {					\
-	(a_qr)->a_field.qre_next = (a_qr);				\
-	(a_qr)->a_field.qre_prev = (a_qr);				\
-} while (0)
-
-#define qr_next(a_qr, a_field) ((a_qr)->a_field.qre_next)
-
-#define qr_prev(a_qr, a_field) ((a_qr)->a_field.qre_prev)
-
-#define qr_before_insert(a_qrelm, a_qr, a_field) do {			\
-	(a_qr)->a_field.qre_prev = (a_qrelm)->a_field.qre_prev;		\
-	(a_qr)->a_field.qre_next = (a_qrelm);				\
-	(a_qr)->a_field.qre_prev->a_field.qre_next = (a_qr);		\
-	(a_qrelm)->a_field.qre_prev = (a_qr);				\
-} while (0)
-
-#define qr_after_insert(a_qrelm, a_qr, a_field)				\
-    do									\
-    {									\
-	(a_qr)->a_field.qre_next = (a_qrelm)->a_field.qre_next;		\
-	(a_qr)->a_field.qre_prev = (a_qrelm);				\
-	(a_qr)->a_field.qre_next->a_field.qre_prev = (a_qr);		\
-	(a_qrelm)->a_field.qre_next = (a_qr);				\
-    } while (0)
-
-#define qr_meld(a_qr_a, a_qr_b, a_field) do {				\
-	void *t;							\
-	(a_qr_a)->a_field.qre_prev->a_field.qre_next = (a_qr_b);	\
-	(a_qr_b)->a_field.qre_prev->a_field.qre_next = (a_qr_a);	\
-	t = (a_qr_a)->a_field.qre_prev;					\
-	(a_qr_a)->a_field.qre_prev = (a_qr_b)->a_field.qre_prev;	\
-	(a_qr_b)->a_field.qre_prev = t;					\
-} while (0)
-
-/* qr_meld() and qr_split() are functionally equivalent, so there's no need to
- * have two copies of the code. */
-#define qr_split(a_qr_a, a_qr_b, a_field)				\
-	qr_meld((a_qr_a), (a_qr_b), a_field)
-
-#define qr_remove(a_qr, a_field) do {					\
-	(a_qr)->a_field.qre_prev->a_field.qre_next			\
-	    = (a_qr)->a_field.qre_next;					\
-	(a_qr)->a_field.qre_next->a_field.qre_prev			\
-	    = (a_qr)->a_field.qre_prev;					\
-	(a_qr)->a_field.qre_next = (a_qr);				\
-	(a_qr)->a_field.qre_prev = (a_qr);				\
-} while (0)
-
-#define qr_foreach(var, a_qr, a_field)					\
-	for ((var) = (a_qr);						\
-	    (var) != NULL;						\
-	    (var) = (((var)->a_field.qre_next != (a_qr))		\
-	    ? (var)->a_field.qre_next : NULL))
-
-#define qr_reverse_foreach(var, a_qr, a_field)				\
-	for ((var) = ((a_qr) != NULL) ? qr_prev(a_qr, a_field) : NULL;	\
-	    (var) != NULL;						\
-	    (var) = (((var) != (a_qr))					\
-	    ? (var)->a_field.qre_prev : NULL))
diff --git a/externals/jemalloc/include/internal/rb.h b/externals/jemalloc/include/internal/rb.h
deleted file mode 100644
index ee9b009d235..00000000000
--- a/externals/jemalloc/include/internal/rb.h
+++ /dev/null
@@ -1,973 +0,0 @@
-/*-
- *******************************************************************************
- *
- * cpp macro implementation of left-leaning 2-3 red-black trees.  Parent
- * pointers are not used, and color bits are stored in the least significant
- * bit of right-child pointers (if RB_COMPACT is defined), thus making node
- * linkage as compact as is possible for red-black trees.
- *
- * Usage:
- *
- *   #include 
- *   #include 
- *   #define NDEBUG // (Optional, see assert(3).)
- *   #include 
- *   #define RB_COMPACT // (Optional, embed color bits in right-child pointers.)
- *   #include 
- *   ...
- *
- *******************************************************************************
- */
-
-#ifndef RB_H_
-#define	RB_H_
-
-#if 0
-__FBSDID("$FreeBSD: head/lib/libc/stdlib/rb.h 204493 2010-02-28 22:57:13Z jasone $");
-#endif
-
-#ifdef RB_COMPACT
-/* Node structure. */
-#define	rb_node(a_type)							\
-struct {								\
-    a_type *rbn_left;							\
-    a_type *rbn_right_red;						\
-}
-#else
-#define	rb_node(a_type)							\
-struct {								\
-    a_type *rbn_left;							\
-    a_type *rbn_right;							\
-    bool rbn_red;							\
-}
-#endif
-
-/* Root structure. */
-#define	rb_tree(a_type)							\
-struct {								\
-    a_type *rbt_root;							\
-    a_type rbt_nil;							\
-}
-
-/* Left accessors. */
-#define	rbtn_left_get(a_type, a_field, a_node)				\
-    ((a_node)->a_field.rbn_left)
-#define	rbtn_left_set(a_type, a_field, a_node, a_left) do {		\
-    (a_node)->a_field.rbn_left = a_left;				\
-} while (0)
-
-#ifdef RB_COMPACT
-/* Right accessors. */
-#define	rbtn_right_get(a_type, a_field, a_node)				\
-    ((a_type *) (((intptr_t) (a_node)->a_field.rbn_right_red)		\
-      & ((ssize_t)-2)))
-#define	rbtn_right_set(a_type, a_field, a_node, a_right) do {		\
-    (a_node)->a_field.rbn_right_red = (a_type *) (((uintptr_t) a_right)	\
-      | (((uintptr_t) (a_node)->a_field.rbn_right_red) & ((size_t)1)));	\
-} while (0)
-
-/* Color accessors. */
-#define	rbtn_red_get(a_type, a_field, a_node)				\
-    ((bool) (((uintptr_t) (a_node)->a_field.rbn_right_red)		\
-      & ((size_t)1)))
-#define	rbtn_color_set(a_type, a_field, a_node, a_red) do {		\
-    (a_node)->a_field.rbn_right_red = (a_type *) ((((intptr_t)		\
-      (a_node)->a_field.rbn_right_red) & ((ssize_t)-2))			\
-      | ((ssize_t)a_red));						\
-} while (0)
-#define	rbtn_red_set(a_type, a_field, a_node) do {			\
-    (a_node)->a_field.rbn_right_red = (a_type *) (((uintptr_t)		\
-      (a_node)->a_field.rbn_right_red) | ((size_t)1));			\
-} while (0)
-#define	rbtn_black_set(a_type, a_field, a_node) do {			\
-    (a_node)->a_field.rbn_right_red = (a_type *) (((intptr_t)		\
-      (a_node)->a_field.rbn_right_red) & ((ssize_t)-2));		\
-} while (0)
-#else
-/* Right accessors. */
-#define	rbtn_right_get(a_type, a_field, a_node)				\
-    ((a_node)->a_field.rbn_right)
-#define	rbtn_right_set(a_type, a_field, a_node, a_right) do {		\
-    (a_node)->a_field.rbn_right = a_right;				\
-} while (0)
-
-/* Color accessors. */
-#define	rbtn_red_get(a_type, a_field, a_node)				\
-    ((a_node)->a_field.rbn_red)
-#define	rbtn_color_set(a_type, a_field, a_node, a_red) do {		\
-    (a_node)->a_field.rbn_red = (a_red);				\
-} while (0)
-#define	rbtn_red_set(a_type, a_field, a_node) do {			\
-    (a_node)->a_field.rbn_red = true;					\
-} while (0)
-#define	rbtn_black_set(a_type, a_field, a_node) do {			\
-    (a_node)->a_field.rbn_red = false;					\
-} while (0)
-#endif
-
-/* Node initializer. */
-#define	rbt_node_new(a_type, a_field, a_rbt, a_node) do {		\
-    rbtn_left_set(a_type, a_field, (a_node), &(a_rbt)->rbt_nil);	\
-    rbtn_right_set(a_type, a_field, (a_node), &(a_rbt)->rbt_nil);	\
-    rbtn_red_set(a_type, a_field, (a_node));				\
-} while (0)
-
-/* Tree initializer. */
-#define	rb_new(a_type, a_field, a_rbt) do {				\
-    (a_rbt)->rbt_root = &(a_rbt)->rbt_nil;				\
-    rbt_node_new(a_type, a_field, a_rbt, &(a_rbt)->rbt_nil);		\
-    rbtn_black_set(a_type, a_field, &(a_rbt)->rbt_nil);			\
-} while (0)
-
-/* Internal utility macros. */
-#define	rbtn_first(a_type, a_field, a_rbt, a_root, r_node) do {		\
-    (r_node) = (a_root);						\
-    if ((r_node) != &(a_rbt)->rbt_nil) {				\
-	for (;								\
-	  rbtn_left_get(a_type, a_field, (r_node)) != &(a_rbt)->rbt_nil;\
-	  (r_node) = rbtn_left_get(a_type, a_field, (r_node))) {	\
-	}								\
-    }									\
-} while (0)
-
-#define	rbtn_last(a_type, a_field, a_rbt, a_root, r_node) do {		\
-    (r_node) = (a_root);						\
-    if ((r_node) != &(a_rbt)->rbt_nil) {				\
-	for (; rbtn_right_get(a_type, a_field, (r_node)) !=		\
-	  &(a_rbt)->rbt_nil; (r_node) = rbtn_right_get(a_type, a_field,	\
-	  (r_node))) {							\
-	}								\
-    }									\
-} while (0)
-
-#define	rbtn_rotate_left(a_type, a_field, a_node, r_node) do {		\
-    (r_node) = rbtn_right_get(a_type, a_field, (a_node));		\
-    rbtn_right_set(a_type, a_field, (a_node),				\
-      rbtn_left_get(a_type, a_field, (r_node)));			\
-    rbtn_left_set(a_type, a_field, (r_node), (a_node));			\
-} while (0)
-
-#define	rbtn_rotate_right(a_type, a_field, a_node, r_node) do {		\
-    (r_node) = rbtn_left_get(a_type, a_field, (a_node));		\
-    rbtn_left_set(a_type, a_field, (a_node),				\
-      rbtn_right_get(a_type, a_field, (r_node)));			\
-    rbtn_right_set(a_type, a_field, (r_node), (a_node));		\
-} while (0)
-
-/*
- * The rb_proto() macro generates function prototypes that correspond to the
- * functions generated by an equivalently parameterized call to rb_gen().
- */
-
-#define	rb_proto(a_attr, a_prefix, a_rbt_type, a_type)			\
-a_attr void								\
-a_prefix##new(a_rbt_type *rbtree);					\
-a_attr a_type *								\
-a_prefix##first(a_rbt_type *rbtree);					\
-a_attr a_type *								\
-a_prefix##last(a_rbt_type *rbtree);					\
-a_attr a_type *								\
-a_prefix##next(a_rbt_type *rbtree, a_type *node);			\
-a_attr a_type *								\
-a_prefix##prev(a_rbt_type *rbtree, a_type *node);			\
-a_attr a_type *								\
-a_prefix##search(a_rbt_type *rbtree, a_type *key);			\
-a_attr a_type *								\
-a_prefix##nsearch(a_rbt_type *rbtree, a_type *key);			\
-a_attr a_type *								\
-a_prefix##psearch(a_rbt_type *rbtree, a_type *key);			\
-a_attr void								\
-a_prefix##insert(a_rbt_type *rbtree, a_type *node);			\
-a_attr void								\
-a_prefix##remove(a_rbt_type *rbtree, a_type *node);			\
-a_attr a_type *								\
-a_prefix##iter(a_rbt_type *rbtree, a_type *start, a_type *(*cb)(	\
-  a_rbt_type *, a_type *, void *), void *arg);				\
-a_attr a_type *								\
-a_prefix##reverse_iter(a_rbt_type *rbtree, a_type *start,		\
-  a_type *(*cb)(a_rbt_type *, a_type *, void *), void *arg);
-
-/*
- * The rb_gen() macro generates a type-specific red-black tree implementation,
- * based on the above cpp macros.
- *
- * Arguments:
- *
- *   a_attr    : Function attribute for generated functions (ex: static).
- *   a_prefix  : Prefix for generated functions (ex: ex_).
- *   a_rb_type : Type for red-black tree data structure (ex: ex_t).
- *   a_type    : Type for red-black tree node data structure (ex: ex_node_t).
- *   a_field   : Name of red-black tree node linkage (ex: ex_link).
- *   a_cmp     : Node comparison function name, with the following prototype:
- *                 int (a_cmp *)(a_type *a_node, a_type *a_other);
- *                                       ^^^^^^
- *                                    or a_key
- *               Interpretation of comparision function return values:
- *                 -1 : a_node <  a_other
- *                  0 : a_node == a_other
- *                  1 : a_node >  a_other
- *               In all cases, the a_node or a_key macro argument is the first
- *               argument to the comparison function, which makes it possible
- *               to write comparison functions that treat the first argument
- *               specially.
- *
- * Assuming the following setup:
- *
- *   typedef struct ex_node_s ex_node_t;
- *   struct ex_node_s {
- *       rb_node(ex_node_t) ex_link;
- *   };
- *   typedef rb_tree(ex_node_t) ex_t;
- *   rb_gen(static, ex_, ex_t, ex_node_t, ex_link, ex_cmp)
- *
- * The following API is generated:
- *
- *   static void
- *   ex_new(ex_t *extree);
- *       Description: Initialize a red-black tree structure.
- *       Args:
- *         extree: Pointer to an uninitialized red-black tree object.
- *
- *   static ex_node_t *
- *   ex_first(ex_t *extree);
- *   static ex_node_t *
- *   ex_last(ex_t *extree);
- *       Description: Get the first/last node in extree.
- *       Args:
- *         extree: Pointer to an initialized red-black tree object.
- *       Ret: First/last node in extree, or NULL if extree is empty.
- *
- *   static ex_node_t *
- *   ex_next(ex_t *extree, ex_node_t *node);
- *   static ex_node_t *
- *   ex_prev(ex_t *extree, ex_node_t *node);
- *       Description: Get node's successor/predecessor.
- *       Args:
- *         extree: Pointer to an initialized red-black tree object.
- *         node : A node in extree.
- *       Ret: node's successor/predecessor in extree, or NULL if node is
- *            last/first.
- *
- *   static ex_node_t *
- *   ex_search(ex_t *extree, ex_node_t *key);
- *       Description: Search for node that matches key.
- *       Args:
- *         extree: Pointer to an initialized red-black tree object.
- *         key  : Search key.
- *       Ret: Node in extree that matches key, or NULL if no match.
- *
- *   static ex_node_t *
- *   ex_nsearch(ex_t *extree, ex_node_t *key);
- *   static ex_node_t *
- *   ex_psearch(ex_t *extree, ex_node_t *key);
- *       Description: Search for node that matches key.  If no match is found,
- *                    return what would be key's successor/predecessor, were
- *                    key in extree.
- *       Args:
- *         extree: Pointer to an initialized red-black tree object.
- *         key   : Search key.
- *       Ret: Node in extree that matches key, or if no match, hypothetical
- *            node's successor/predecessor (NULL if no successor/predecessor).
- *
- *   static void
- *   ex_insert(ex_t *extree, ex_node_t *node);
- *       Description: Insert node into extree.
- *       Args:
- *         extree: Pointer to an initialized red-black tree object.
- *         node  : Node to be inserted into extree.
- *
- *   static void
- *   ex_remove(ex_t *extree, ex_node_t *node);
- *       Description: Remove node from extree.
- *       Args:
- *         extree: Pointer to an initialized red-black tree object.
- *         node  : Node in extree to be removed.
- *
- *   static ex_node_t *
- *   ex_iter(ex_t *extree, ex_node_t *start, ex_node_t *(*cb)(ex_t *,
- *     ex_node_t *, void *), void *arg);
- *   static ex_node_t *
- *   ex_reverse_iter(ex_t *extree, ex_node_t *start, ex_node *(*cb)(ex_t *,
- *     ex_node_t *, void *), void *arg);
- *       Description: Iterate forward/backward over extree, starting at node.
- *                    If extree is modified, iteration must be immediately
- *                    terminated by the callback function that causes the
- *                    modification.
- *       Args:
- *         extree: Pointer to an initialized red-black tree object.
- *         start : Node at which to start iteration, or NULL to start at
- *                 first/last node.
- *         cb    : Callback function, which is called for each node during
- *                 iteration.  Under normal circumstances the callback function
- *                 should return NULL, which causes iteration to continue.  If a
- *                 callback function returns non-NULL, iteration is immediately
- *                 terminated and the non-NULL return value is returned by the
- *                 iterator.  This is useful for re-starting iteration after
- *                 modifying extree.
- *         arg   : Opaque pointer passed to cb().
- *       Ret: NULL if iteration completed, or the non-NULL callback return value
- *            that caused termination of the iteration.
- */
-#define	rb_gen(a_attr, a_prefix, a_rbt_type, a_type, a_field, a_cmp)	\
-a_attr void								\
-a_prefix##new(a_rbt_type *rbtree) {					\
-    rb_new(a_type, a_field, rbtree);					\
-}									\
-a_attr a_type *								\
-a_prefix##first(a_rbt_type *rbtree) {					\
-    a_type *ret;							\
-    rbtn_first(a_type, a_field, rbtree, rbtree->rbt_root, ret);		\
-    if (ret == &rbtree->rbt_nil) {					\
-	ret = NULL;							\
-    }									\
-    return (ret);							\
-}									\
-a_attr a_type *								\
-a_prefix##last(a_rbt_type *rbtree) {					\
-    a_type *ret;							\
-    rbtn_last(a_type, a_field, rbtree, rbtree->rbt_root, ret);		\
-    if (ret == &rbtree->rbt_nil) {					\
-	ret = NULL;							\
-    }									\
-    return (ret);							\
-}									\
-a_attr a_type *								\
-a_prefix##next(a_rbt_type *rbtree, a_type *node) {			\
-    a_type *ret;							\
-    if (rbtn_right_get(a_type, a_field, node) != &rbtree->rbt_nil) {	\
-	rbtn_first(a_type, a_field, rbtree, rbtn_right_get(a_type,	\
-	  a_field, node), ret);						\
-    } else {								\
-	a_type *tnode = rbtree->rbt_root;				\
-	assert(tnode != &rbtree->rbt_nil);				\
-	ret = &rbtree->rbt_nil;						\
-	while (true) {							\
-	    int cmp = (a_cmp)(node, tnode);				\
-	    if (cmp < 0) {						\
-		ret = tnode;						\
-		tnode = rbtn_left_get(a_type, a_field, tnode);		\
-	    } else if (cmp > 0) {					\
-		tnode = rbtn_right_get(a_type, a_field, tnode);		\
-	    } else {							\
-		break;							\
-	    }								\
-	    assert(tnode != &rbtree->rbt_nil);				\
-	}								\
-    }									\
-    if (ret == &rbtree->rbt_nil) {					\
-	ret = (NULL);							\
-    }									\
-    return (ret);							\
-}									\
-a_attr a_type *								\
-a_prefix##prev(a_rbt_type *rbtree, a_type *node) {			\
-    a_type *ret;							\
-    if (rbtn_left_get(a_type, a_field, node) != &rbtree->rbt_nil) {	\
-	rbtn_last(a_type, a_field, rbtree, rbtn_left_get(a_type,	\
-	  a_field, node), ret);						\
-    } else {								\
-	a_type *tnode = rbtree->rbt_root;				\
-	assert(tnode != &rbtree->rbt_nil);				\
-	ret = &rbtree->rbt_nil;						\
-	while (true) {							\
-	    int cmp = (a_cmp)(node, tnode);				\
-	    if (cmp < 0) {						\
-		tnode = rbtn_left_get(a_type, a_field, tnode);		\
-	    } else if (cmp > 0) {					\
-		ret = tnode;						\
-		tnode = rbtn_right_get(a_type, a_field, tnode);		\
-	    } else {							\
-		break;							\
-	    }								\
-	    assert(tnode != &rbtree->rbt_nil);				\
-	}								\
-    }									\
-    if (ret == &rbtree->rbt_nil) {					\
-	ret = (NULL);							\
-    }									\
-    return (ret);							\
-}									\
-a_attr a_type *								\
-a_prefix##search(a_rbt_type *rbtree, a_type *key) {			\
-    a_type *ret;							\
-    int cmp;								\
-    ret = rbtree->rbt_root;						\
-    while (ret != &rbtree->rbt_nil					\
-      && (cmp = (a_cmp)(key, ret)) != 0) {				\
-	if (cmp < 0) {							\
-	    ret = rbtn_left_get(a_type, a_field, ret);			\
-	} else {							\
-	    ret = rbtn_right_get(a_type, a_field, ret);			\
-	}								\
-    }									\
-    if (ret == &rbtree->rbt_nil) {					\
-	ret = (NULL);							\
-    }									\
-    return (ret);							\
-}									\
-a_attr a_type *								\
-a_prefix##nsearch(a_rbt_type *rbtree, a_type *key) {			\
-    a_type *ret;							\
-    a_type *tnode = rbtree->rbt_root;					\
-    ret = &rbtree->rbt_nil;						\
-    while (tnode != &rbtree->rbt_nil) {					\
-	int cmp = (a_cmp)(key, tnode);					\
-	if (cmp < 0) {							\
-	    ret = tnode;						\
-	    tnode = rbtn_left_get(a_type, a_field, tnode);		\
-	} else if (cmp > 0) {						\
-	    tnode = rbtn_right_get(a_type, a_field, tnode);		\
-	} else {							\
-	    ret = tnode;						\
-	    break;							\
-	}								\
-    }									\
-    if (ret == &rbtree->rbt_nil) {					\
-	ret = (NULL);							\
-    }									\
-    return (ret);							\
-}									\
-a_attr a_type *								\
-a_prefix##psearch(a_rbt_type *rbtree, a_type *key) {			\
-    a_type *ret;							\
-    a_type *tnode = rbtree->rbt_root;					\
-    ret = &rbtree->rbt_nil;						\
-    while (tnode != &rbtree->rbt_nil) {					\
-	int cmp = (a_cmp)(key, tnode);					\
-	if (cmp < 0) {							\
-	    tnode = rbtn_left_get(a_type, a_field, tnode);		\
-	} else if (cmp > 0) {						\
-	    ret = tnode;						\
-	    tnode = rbtn_right_get(a_type, a_field, tnode);		\
-	} else {							\
-	    ret = tnode;						\
-	    break;							\
-	}								\
-    }									\
-    if (ret == &rbtree->rbt_nil) {					\
-	ret = (NULL);							\
-    }									\
-    return (ret);							\
-}									\
-a_attr void								\
-a_prefix##insert(a_rbt_type *rbtree, a_type *node) {			\
-    struct {								\
-	a_type *node;							\
-	int cmp;							\
-    } path[sizeof(void *) << 4], *pathp;				\
-    rbt_node_new(a_type, a_field, rbtree, node);			\
-    /* Wind. */								\
-    path->node = rbtree->rbt_root;					\
-    for (pathp = path; pathp->node != &rbtree->rbt_nil; pathp++) {	\
-	int cmp = pathp->cmp = a_cmp(node, pathp->node);		\
-	assert(cmp != 0);						\
-	if (cmp < 0) {							\
-	    pathp[1].node = rbtn_left_get(a_type, a_field,		\
-	      pathp->node);						\
-	} else {							\
-	    pathp[1].node = rbtn_right_get(a_type, a_field,		\
-	      pathp->node);						\
-	}								\
-    }									\
-    pathp->node = node;							\
-    /* Unwind. */							\
-    for (pathp--; (uintptr_t)pathp >= (uintptr_t)path; pathp--) {	\
-	a_type *cnode = pathp->node;					\
-	if (pathp->cmp < 0) {						\
-	    a_type *left = pathp[1].node;				\
-	    rbtn_left_set(a_type, a_field, cnode, left);		\
-	    if (rbtn_red_get(a_type, a_field, left)) {			\
-		a_type *leftleft = rbtn_left_get(a_type, a_field, left);\
-		if (rbtn_red_get(a_type, a_field, leftleft)) {		\
-		    /* Fix up 4-node. */				\
-		    a_type *tnode;					\
-		    rbtn_black_set(a_type, a_field, leftleft);		\
-		    rbtn_rotate_right(a_type, a_field, cnode, tnode);	\
-		    cnode = tnode;					\
-		}							\
-	    } else {							\
-		return;							\
-	    }								\
-	} else {							\
-	    a_type *right = pathp[1].node;				\
-	    rbtn_right_set(a_type, a_field, cnode, right);		\
-	    if (rbtn_red_get(a_type, a_field, right)) {			\
-		a_type *left = rbtn_left_get(a_type, a_field, cnode);	\
-		if (rbtn_red_get(a_type, a_field, left)) {		\
-		    /* Split 4-node. */					\
-		    rbtn_black_set(a_type, a_field, left);		\
-		    rbtn_black_set(a_type, a_field, right);		\
-		    rbtn_red_set(a_type, a_field, cnode);		\
-		} else {						\
-		    /* Lean left. */					\
-		    a_type *tnode;					\
-		    bool tred = rbtn_red_get(a_type, a_field, cnode);	\
-		    rbtn_rotate_left(a_type, a_field, cnode, tnode);	\
-		    rbtn_color_set(a_type, a_field, tnode, tred);	\
-		    rbtn_red_set(a_type, a_field, cnode);		\
-		    cnode = tnode;					\
-		}							\
-	    } else {							\
-		return;							\
-	    }								\
-	}								\
-	pathp->node = cnode;						\
-    }									\
-    /* Set root, and make it black. */					\
-    rbtree->rbt_root = path->node;					\
-    rbtn_black_set(a_type, a_field, rbtree->rbt_root);			\
-}									\
-a_attr void								\
-a_prefix##remove(a_rbt_type *rbtree, a_type *node) {			\
-    struct {								\
-	a_type *node;							\
-	int cmp;							\
-    } *pathp, *nodep, path[sizeof(void *) << 4];			\
-    /* Wind. */								\
-    nodep = NULL; /* Silence compiler warning. */			\
-    path->node = rbtree->rbt_root;					\
-    for (pathp = path; pathp->node != &rbtree->rbt_nil; pathp++) {	\
-	int cmp = pathp->cmp = a_cmp(node, pathp->node);		\
-	if (cmp < 0) {							\
-	    pathp[1].node = rbtn_left_get(a_type, a_field,		\
-	      pathp->node);						\
-	} else {							\
-	    pathp[1].node = rbtn_right_get(a_type, a_field,		\
-	      pathp->node);						\
-	    if (cmp == 0) {						\
-	        /* Find node's successor, in preparation for swap. */	\
-		pathp->cmp = 1;						\
-		nodep = pathp;						\
-		for (pathp++; pathp->node != &rbtree->rbt_nil;		\
-		  pathp++) {						\
-		    pathp->cmp = -1;					\
-		    pathp[1].node = rbtn_left_get(a_type, a_field,	\
-		      pathp->node);					\
-		}							\
-		break;							\
-	    }								\
-	}								\
-    }									\
-    assert(nodep->node == node);					\
-    pathp--;								\
-    if (pathp->node != node) {						\
-	/* Swap node with its successor. */				\
-	bool tred = rbtn_red_get(a_type, a_field, pathp->node);		\
-	rbtn_color_set(a_type, a_field, pathp->node,			\
-	  rbtn_red_get(a_type, a_field, node));				\
-	rbtn_left_set(a_type, a_field, pathp->node,			\
-	  rbtn_left_get(a_type, a_field, node));			\
-	/* If node's successor is its right child, the following code */\
-	/* will do the wrong thing for the right child pointer.       */\
-	/* However, it doesn't matter, because the pointer will be    */\
-	/* properly set when the successor is pruned.                 */\
-	rbtn_right_set(a_type, a_field, pathp->node,			\
-	  rbtn_right_get(a_type, a_field, node));			\
-	rbtn_color_set(a_type, a_field, node, tred);			\
-	/* The pruned leaf node's child pointers are never accessed   */\
-	/* again, so don't bother setting them to nil.                */\
-	nodep->node = pathp->node;					\
-	pathp->node = node;						\
-	if (nodep == path) {						\
-	    rbtree->rbt_root = nodep->node;				\
-	} else {							\
-	    if (nodep[-1].cmp < 0) {					\
-		rbtn_left_set(a_type, a_field, nodep[-1].node,		\
-		  nodep->node);						\
-	    } else {							\
-		rbtn_right_set(a_type, a_field, nodep[-1].node,		\
-		  nodep->node);						\
-	    }								\
-	}								\
-    } else {								\
-	a_type *left = rbtn_left_get(a_type, a_field, node);		\
-	if (left != &rbtree->rbt_nil) {					\
-	    /* node has no successor, but it has a left child.        */\
-	    /* Splice node out, without losing the left child.        */\
-	    assert(rbtn_red_get(a_type, a_field, node) == false);	\
-	    assert(rbtn_red_get(a_type, a_field, left));		\
-	    rbtn_black_set(a_type, a_field, left);			\
-	    if (pathp == path) {					\
-		rbtree->rbt_root = left;				\
-	    } else {							\
-		if (pathp[-1].cmp < 0) {				\
-		    rbtn_left_set(a_type, a_field, pathp[-1].node,	\
-		      left);						\
-		} else {						\
-		    rbtn_right_set(a_type, a_field, pathp[-1].node,	\
-		      left);						\
-		}							\
-	    }								\
-	    return;							\
-	} else if (pathp == path) {					\
-	    /* The tree only contained one node. */			\
-	    rbtree->rbt_root = &rbtree->rbt_nil;			\
-	    return;							\
-	}								\
-    }									\
-    if (rbtn_red_get(a_type, a_field, pathp->node)) {			\
-	/* Prune red node, which requires no fixup. */			\
-	assert(pathp[-1].cmp < 0);					\
-	rbtn_left_set(a_type, a_field, pathp[-1].node,			\
-	  &rbtree->rbt_nil);						\
-	return;								\
-    }									\
-    /* The node to be pruned is black, so unwind until balance is     */\
-    /* restored.                                                      */\
-    pathp->node = &rbtree->rbt_nil;					\
-    for (pathp--; (uintptr_t)pathp >= (uintptr_t)path; pathp--) {	\
-	assert(pathp->cmp != 0);					\
-	if (pathp->cmp < 0) {						\
-	    rbtn_left_set(a_type, a_field, pathp->node,			\
-	      pathp[1].node);						\
-	    assert(rbtn_red_get(a_type, a_field, pathp[1].node)		\
-	      == false);						\
-	    if (rbtn_red_get(a_type, a_field, pathp->node)) {		\
-		a_type *right = rbtn_right_get(a_type, a_field,		\
-		  pathp->node);						\
-		a_type *rightleft = rbtn_left_get(a_type, a_field,	\
-		  right);						\
-		a_type *tnode;						\
-		if (rbtn_red_get(a_type, a_field, rightleft)) {		\
-		    /* In the following diagrams, ||, //, and \\      */\
-		    /* indicate the path to the removed node.         */\
-		    /*                                                */\
-		    /*      ||                                        */\
-		    /*    pathp(r)                                    */\
-		    /*  //        \                                   */\
-		    /* (b)        (b)                                 */\
-		    /*           /                                    */\
-		    /*          (r)                                   */\
-		    /*                                                */\
-		    rbtn_black_set(a_type, a_field, pathp->node);	\
-		    rbtn_rotate_right(a_type, a_field, right, tnode);	\
-		    rbtn_right_set(a_type, a_field, pathp->node, tnode);\
-		    rbtn_rotate_left(a_type, a_field, pathp->node,	\
-		      tnode);						\
-		} else {						\
-		    /*      ||                                        */\
-		    /*    pathp(r)                                    */\
-		    /*  //        \                                   */\
-		    /* (b)        (b)                                 */\
-		    /*           /                                    */\
-		    /*          (b)                                   */\
-		    /*                                                */\
-		    rbtn_rotate_left(a_type, a_field, pathp->node,	\
-		      tnode);						\
-		}							\
-		/* Balance restored, but rotation modified subtree    */\
-		/* root.                                              */\
-		assert((uintptr_t)pathp > (uintptr_t)path);		\
-		if (pathp[-1].cmp < 0) {				\
-		    rbtn_left_set(a_type, a_field, pathp[-1].node,	\
-		      tnode);						\
-		} else {						\
-		    rbtn_right_set(a_type, a_field, pathp[-1].node,	\
-		      tnode);						\
-		}							\
-		return;							\
-	    } else {							\
-		a_type *right = rbtn_right_get(a_type, a_field,		\
-		  pathp->node);						\
-		a_type *rightleft = rbtn_left_get(a_type, a_field,	\
-		  right);						\
-		if (rbtn_red_get(a_type, a_field, rightleft)) {		\
-		    /*      ||                                        */\
-		    /*    pathp(b)                                    */\
-		    /*  //        \                                   */\
-		    /* (b)        (b)                                 */\
-		    /*           /                                    */\
-		    /*          (r)                                   */\
-		    a_type *tnode;					\
-		    rbtn_black_set(a_type, a_field, rightleft);		\
-		    rbtn_rotate_right(a_type, a_field, right, tnode);	\
-		    rbtn_right_set(a_type, a_field, pathp->node, tnode);\
-		    rbtn_rotate_left(a_type, a_field, pathp->node,	\
-		      tnode);						\
-		    /* Balance restored, but rotation modified        */\
-		    /* subree root, which may actually be the tree    */\
-		    /* root.                                          */\
-		    if (pathp == path) {				\
-			/* Set root. */					\
-			rbtree->rbt_root = tnode;			\
-		    } else {						\
-			if (pathp[-1].cmp < 0) {			\
-			    rbtn_left_set(a_type, a_field,		\
-			      pathp[-1].node, tnode);			\
-			} else {					\
-			    rbtn_right_set(a_type, a_field,		\
-			      pathp[-1].node, tnode);			\
-			}						\
-		    }							\
-		    return;						\
-		} else {						\
-		    /*      ||                                        */\
-		    /*    pathp(b)                                    */\
-		    /*  //        \                                   */\
-		    /* (b)        (b)                                 */\
-		    /*           /                                    */\
-		    /*          (b)                                   */\
-		    a_type *tnode;					\
-		    rbtn_red_set(a_type, a_field, pathp->node);		\
-		    rbtn_rotate_left(a_type, a_field, pathp->node,	\
-		      tnode);						\
-		    pathp->node = tnode;				\
-		}							\
-	    }								\
-	} else {							\
-	    a_type *left;						\
-	    rbtn_right_set(a_type, a_field, pathp->node,		\
-	      pathp[1].node);						\
-	    left = rbtn_left_get(a_type, a_field, pathp->node);		\
-	    if (rbtn_red_get(a_type, a_field, left)) {			\
-		a_type *tnode;						\
-		a_type *leftright = rbtn_right_get(a_type, a_field,	\
-		  left);						\
-		a_type *leftrightleft = rbtn_left_get(a_type, a_field,	\
-		  leftright);						\
-		if (rbtn_red_get(a_type, a_field, leftrightleft)) {	\
-		    /*      ||                                        */\
-		    /*    pathp(b)                                    */\
-		    /*   /        \\                                  */\
-		    /* (r)        (b)                                 */\
-		    /*   \                                            */\
-		    /*   (b)                                          */\
-		    /*   /                                            */\
-		    /* (r)                                            */\
-		    a_type *unode;					\
-		    rbtn_black_set(a_type, a_field, leftrightleft);	\
-		    rbtn_rotate_right(a_type, a_field, pathp->node,	\
-		      unode);						\
-		    rbtn_rotate_right(a_type, a_field, pathp->node,	\
-		      tnode);						\
-		    rbtn_right_set(a_type, a_field, unode, tnode);	\
-		    rbtn_rotate_left(a_type, a_field, unode, tnode);	\
-		} else {						\
-		    /*      ||                                        */\
-		    /*    pathp(b)                                    */\
-		    /*   /        \\                                  */\
-		    /* (r)        (b)                                 */\
-		    /*   \                                            */\
-		    /*   (b)                                          */\
-		    /*   /                                            */\
-		    /* (b)                                            */\
-		    assert(leftright != &rbtree->rbt_nil);		\
-		    rbtn_red_set(a_type, a_field, leftright);		\
-		    rbtn_rotate_right(a_type, a_field, pathp->node,	\
-		      tnode);						\
-		    rbtn_black_set(a_type, a_field, tnode);		\
-		}							\
-		/* Balance restored, but rotation modified subtree    */\
-		/* root, which may actually be the tree root.         */\
-		if (pathp == path) {					\
-		    /* Set root. */					\
-		    rbtree->rbt_root = tnode;				\
-		} else {						\
-		    if (pathp[-1].cmp < 0) {				\
-			rbtn_left_set(a_type, a_field, pathp[-1].node,	\
-			  tnode);					\
-		    } else {						\
-			rbtn_right_set(a_type, a_field, pathp[-1].node,	\
-			  tnode);					\
-		    }							\
-		}							\
-		return;							\
-	    } else if (rbtn_red_get(a_type, a_field, pathp->node)) {	\
-		a_type *leftleft = rbtn_left_get(a_type, a_field, left);\
-		if (rbtn_red_get(a_type, a_field, leftleft)) {		\
-		    /*        ||                                      */\
-		    /*      pathp(r)                                  */\
-		    /*     /        \\                                */\
-		    /*   (b)        (b)                               */\
-		    /*   /                                            */\
-		    /* (r)                                            */\
-		    a_type *tnode;					\
-		    rbtn_black_set(a_type, a_field, pathp->node);	\
-		    rbtn_red_set(a_type, a_field, left);		\
-		    rbtn_black_set(a_type, a_field, leftleft);		\
-		    rbtn_rotate_right(a_type, a_field, pathp->node,	\
-		      tnode);						\
-		    /* Balance restored, but rotation modified        */\
-		    /* subtree root.                                  */\
-		    assert((uintptr_t)pathp > (uintptr_t)path);		\
-		    if (pathp[-1].cmp < 0) {				\
-			rbtn_left_set(a_type, a_field, pathp[-1].node,	\
-			  tnode);					\
-		    } else {						\
-			rbtn_right_set(a_type, a_field, pathp[-1].node,	\
-			  tnode);					\
-		    }							\
-		    return;						\
-		} else {						\
-		    /*        ||                                      */\
-		    /*      pathp(r)                                  */\
-		    /*     /        \\                                */\
-		    /*   (b)        (b)                               */\
-		    /*   /                                            */\
-		    /* (b)                                            */\
-		    rbtn_red_set(a_type, a_field, left);		\
-		    rbtn_black_set(a_type, a_field, pathp->node);	\
-		    /* Balance restored. */				\
-		    return;						\
-		}							\
-	    } else {							\
-		a_type *leftleft = rbtn_left_get(a_type, a_field, left);\
-		if (rbtn_red_get(a_type, a_field, leftleft)) {		\
-		    /*               ||                               */\
-		    /*             pathp(b)                           */\
-		    /*            /        \\                         */\
-		    /*          (b)        (b)                        */\
-		    /*          /                                     */\
-		    /*        (r)                                     */\
-		    a_type *tnode;					\
-		    rbtn_black_set(a_type, a_field, leftleft);		\
-		    rbtn_rotate_right(a_type, a_field, pathp->node,	\
-		      tnode);						\
-		    /* Balance restored, but rotation modified        */\
-		    /* subtree root, which may actually be the tree   */\
-		    /* root.                                          */\
-		    if (pathp == path) {				\
-			/* Set root. */					\
-			rbtree->rbt_root = tnode;			\
-		    } else {						\
-			if (pathp[-1].cmp < 0) {			\
-			    rbtn_left_set(a_type, a_field,		\
-			      pathp[-1].node, tnode);			\
-			} else {					\
-			    rbtn_right_set(a_type, a_field,		\
-			      pathp[-1].node, tnode);			\
-			}						\
-		    }							\
-		    return;						\
-		} else {						\
-		    /*               ||                               */\
-		    /*             pathp(b)                           */\
-		    /*            /        \\                         */\
-		    /*          (b)        (b)                        */\
-		    /*          /                                     */\
-		    /*        (b)                                     */\
-		    rbtn_red_set(a_type, a_field, left);		\
-		}							\
-	    }								\
-	}								\
-    }									\
-    /* Set root. */							\
-    rbtree->rbt_root = path->node;					\
-    assert(rbtn_red_get(a_type, a_field, rbtree->rbt_root) == false);	\
-}									\
-a_attr a_type *								\
-a_prefix##iter_recurse(a_rbt_type *rbtree, a_type *node,		\
-  a_type *(*cb)(a_rbt_type *, a_type *, void *), void *arg) {		\
-    if (node == &rbtree->rbt_nil) {					\
-	return (&rbtree->rbt_nil);					\
-    } else {								\
-	a_type *ret;							\
-	if ((ret = a_prefix##iter_recurse(rbtree, rbtn_left_get(a_type,	\
-	  a_field, node), cb, arg)) != &rbtree->rbt_nil			\
-	  || (ret = cb(rbtree, node, arg)) != NULL) {			\
-	    return (ret);						\
-	}								\
-	return (a_prefix##iter_recurse(rbtree, rbtn_right_get(a_type,	\
-	  a_field, node), cb, arg));					\
-    }									\
-}									\
-a_attr a_type *								\
-a_prefix##iter_start(a_rbt_type *rbtree, a_type *start, a_type *node,	\
-  a_type *(*cb)(a_rbt_type *, a_type *, void *), void *arg) {		\
-    int cmp = a_cmp(start, node);					\
-    if (cmp < 0) {							\
-	a_type *ret;							\
-	if ((ret = a_prefix##iter_start(rbtree, start,			\
-	  rbtn_left_get(a_type, a_field, node), cb, arg)) !=		\
-	  &rbtree->rbt_nil || (ret = cb(rbtree, node, arg)) != NULL) {	\
-	    return (ret);						\
-	}								\
-	return (a_prefix##iter_recurse(rbtree, rbtn_right_get(a_type,	\
-	  a_field, node), cb, arg));					\
-    } else if (cmp > 0) {						\
-	return (a_prefix##iter_start(rbtree, start,			\
-	  rbtn_right_get(a_type, a_field, node), cb, arg));		\
-    } else {								\
-	a_type *ret;							\
-	if ((ret = cb(rbtree, node, arg)) != NULL) {			\
-	    return (ret);						\
-	}								\
-	return (a_prefix##iter_recurse(rbtree, rbtn_right_get(a_type,	\
-	  a_field, node), cb, arg));					\
-    }									\
-}									\
-a_attr a_type *								\
-a_prefix##iter(a_rbt_type *rbtree, a_type *start, a_type *(*cb)(	\
-  a_rbt_type *, a_type *, void *), void *arg) {				\
-    a_type *ret;							\
-    if (start != NULL) {						\
-	ret = a_prefix##iter_start(rbtree, start, rbtree->rbt_root,	\
-	  cb, arg);							\
-    } else {								\
-	ret = a_prefix##iter_recurse(rbtree, rbtree->rbt_root, cb, arg);\
-    }									\
-    if (ret == &rbtree->rbt_nil) {					\
-	ret = NULL;							\
-    }									\
-    return (ret);							\
-}									\
-a_attr a_type *								\
-a_prefix##reverse_iter_recurse(a_rbt_type *rbtree, a_type *node,	\
-  a_type *(*cb)(a_rbt_type *, a_type *, void *), void *arg) {		\
-    if (node == &rbtree->rbt_nil) {					\
-	return (&rbtree->rbt_nil);					\
-    } else {								\
-	a_type *ret;							\
-	if ((ret = a_prefix##reverse_iter_recurse(rbtree,		\
-	  rbtn_right_get(a_type, a_field, node), cb, arg)) !=		\
-	  &rbtree->rbt_nil || (ret = cb(rbtree, node, arg)) != NULL) {	\
-	    return (ret);						\
-	}								\
-	return (a_prefix##reverse_iter_recurse(rbtree,			\
-	  rbtn_left_get(a_type, a_field, node), cb, arg));		\
-    }									\
-}									\
-a_attr a_type *								\
-a_prefix##reverse_iter_start(a_rbt_type *rbtree, a_type *start,		\
-  a_type *node, a_type *(*cb)(a_rbt_type *, a_type *, void *),		\
-  void *arg) {								\
-    int cmp = a_cmp(start, node);					\
-    if (cmp > 0) {							\
-	a_type *ret;							\
-	if ((ret = a_prefix##reverse_iter_start(rbtree, start,		\
-	  rbtn_right_get(a_type, a_field, node), cb, arg)) !=		\
-	  &rbtree->rbt_nil || (ret = cb(rbtree, node, arg)) != NULL) {	\
-	    return (ret);						\
-	}								\
-	return (a_prefix##reverse_iter_recurse(rbtree,			\
-	  rbtn_left_get(a_type, a_field, node), cb, arg));		\
-    } else if (cmp < 0) {						\
-	return (a_prefix##reverse_iter_start(rbtree, start,		\
-	  rbtn_left_get(a_type, a_field, node), cb, arg));		\
-    } else {								\
-	a_type *ret;							\
-	if ((ret = cb(rbtree, node, arg)) != NULL) {			\
-	    return (ret);						\
-	}								\
-	return (a_prefix##reverse_iter_recurse(rbtree,			\
-	  rbtn_left_get(a_type, a_field, node), cb, arg));		\
-    }									\
-}									\
-a_attr a_type *								\
-a_prefix##reverse_iter(a_rbt_type *rbtree, a_type *start,		\
-  a_type *(*cb)(a_rbt_type *, a_type *, void *), void *arg) {		\
-    a_type *ret;							\
-    if (start != NULL) {						\
-	ret = a_prefix##reverse_iter_start(rbtree, start,		\
-	  rbtree->rbt_root, cb, arg);					\
-    } else {								\
-	ret = a_prefix##reverse_iter_recurse(rbtree, rbtree->rbt_root,	\
-	  cb, arg);							\
-    }									\
-    if (ret == &rbtree->rbt_nil) {					\
-	ret = NULL;							\
-    }									\
-    return (ret);							\
-}
-
-#endif /* RB_H_ */
diff --git a/externals/jemalloc/include/internal/stats.h b/externals/jemalloc/include/internal/stats.h
deleted file mode 100644
index cbf035ff2b9..00000000000
--- a/externals/jemalloc/include/internal/stats.h
+++ /dev/null
@@ -1,174 +0,0 @@
-/******************************************************************************/
-#ifdef JEMALLOC_H_TYPES
-
-#define	UMAX2S_BUFSIZE	65
-
-#ifdef JEMALLOC_STATS
-typedef struct tcache_bin_stats_s tcache_bin_stats_t;
-typedef struct malloc_bin_stats_s malloc_bin_stats_t;
-typedef struct malloc_large_stats_s malloc_large_stats_t;
-typedef struct arena_stats_s arena_stats_t;
-#endif
-#if (defined(JEMALLOC_STATS) || defined(JEMALLOC_PROF))
-typedef struct chunk_stats_s chunk_stats_t;
-#endif
-
-#endif /* JEMALLOC_H_TYPES */
-/******************************************************************************/
-#ifdef JEMALLOC_H_STRUCTS
-
-#ifdef JEMALLOC_STATS
-
-#ifdef JEMALLOC_TCACHE
-struct tcache_bin_stats_s {
-	/*
-	 * Number of allocation requests that corresponded to the size of this
-	 * bin.
-	 */
-	uint64_t	nrequests;
-};
-#endif
-
-struct malloc_bin_stats_s {
-	/*
-	 * Current number of bytes allocated, including objects currently
-	 * cached by tcache.
-	 */
-	size_t		allocated;
-
-	/*
-	 * Total number of allocation/deallocation requests served directly by
-	 * the bin.  Note that tcache may allocate an object, then recycle it
-	 * many times, resulting many increments to nrequests, but only one
-	 * each to nmalloc and ndalloc.
-	 */
-	uint64_t	nmalloc;
-	uint64_t	ndalloc;
-
-	/*
-	 * Number of allocation requests that correspond to the size of this
-	 * bin.  This includes requests served by tcache, though tcache only
-	 * periodically merges into this counter.
-	 */
-	uint64_t	nrequests;
-
-#ifdef JEMALLOC_TCACHE
-	/* Number of tcache fills from this bin. */
-	uint64_t	nfills;
-
-	/* Number of tcache flushes to this bin. */
-	uint64_t	nflushes;
-#endif
-
-	/* Total number of runs created for this bin's size class. */
-	uint64_t	nruns;
-
-	/*
-	 * Total number of runs reused by extracting them from the runs tree for
-	 * this bin's size class.
-	 */
-	uint64_t	reruns;
-
-	/* High-water mark for this bin. */
-	size_t		highruns;
-
-	/* Current number of runs in this bin. */
-	size_t		curruns;
-};
-
-struct malloc_large_stats_s {
-	/*
-	 * Total number of allocation/deallocation requests served directly by
-	 * the arena.  Note that tcache may allocate an object, then recycle it
-	 * many times, resulting many increments to nrequests, but only one
-	 * each to nmalloc and ndalloc.
-	 */
-	uint64_t	nmalloc;
-	uint64_t	ndalloc;
-
-	/*
-	 * Number of allocation requests that correspond to this size class.
-	 * This includes requests served by tcache, though tcache only
-	 * periodically merges into this counter.
-	 */
-	uint64_t	nrequests;
-
-	/* High-water mark for this size class. */
-	size_t		highruns;
-
-	/* Current number of runs of this size class. */
-	size_t		curruns;
-};
-
-struct arena_stats_s {
-	/* Number of bytes currently mapped. */
-	size_t		mapped;
-
-	/*
-	 * Total number of purge sweeps, total number of madvise calls made,
-	 * and total pages purged in order to keep dirty unused memory under
-	 * control.
-	 */
-	uint64_t	npurge;
-	uint64_t	nmadvise;
-	uint64_t	purged;
-
-	/* Per-size-category statistics. */
-	size_t		allocated_large;
-	uint64_t	nmalloc_large;
-	uint64_t	ndalloc_large;
-	uint64_t	nrequests_large;
-
-	/*
-	 * One element for each possible size class, including sizes that
-	 * overlap with bin size classes.  This is necessary because ipalloc()
-	 * sometimes has to use such large objects in order to assure proper
-	 * alignment.
-	 */
-	malloc_large_stats_t	*lstats;
-};
-#endif /* JEMALLOC_STATS */
-
-#if (defined(JEMALLOC_STATS) || defined(JEMALLOC_PROF))
-struct chunk_stats_s {
-#  ifdef JEMALLOC_STATS
-	/* Number of chunks that were allocated. */
-	uint64_t	nchunks;
-#  endif
-
-	/* High-water mark for number of chunks allocated. */
-	size_t		highchunks;
-
-	/*
-	 * Current number of chunks allocated.  This value isn't maintained for
-	 * any other purpose, so keep track of it in order to be able to set
-	 * highchunks.
-	 */
-	size_t		curchunks;
-};
-#endif /* JEMALLOC_STATS */
-
-#endif /* JEMALLOC_H_STRUCTS */
-/******************************************************************************/
-#ifdef JEMALLOC_H_EXTERNS
-
-extern bool	opt_stats_print;
-
-char	*umax2s(uintmax_t x, unsigned base, char *s);
-#ifdef JEMALLOC_STATS
-void malloc_cprintf(void (*write)(void *, const char *), void *cbopaque,
-    const char *format, ...) JEMALLOC_ATTR(format(printf, 3, 4));
-void	malloc_printf(const char *format, ...)
-    JEMALLOC_ATTR(format(printf, 1, 2));
-#endif
-void	stats_print(void (*write)(void *, const char *), void *cbopaque,
-    const char *opts);
-
-#endif /* JEMALLOC_H_EXTERNS */
-/******************************************************************************/
-#ifdef JEMALLOC_STATS
-#ifdef JEMALLOC_H_INLINES
-
-#endif /* JEMALLOC_H_INLINES */
-#endif /* JEMALLOC_STATS */
-/******************************************************************************/
diff --git a/externals/jemalloc/include/internal/tcache.h b/externals/jemalloc/include/internal/tcache.h
deleted file mode 100644
index c76597fafab..00000000000
--- a/externals/jemalloc/include/internal/tcache.h
+++ /dev/null
@@ -1,380 +0,0 @@
-#ifdef JEMALLOC_TCACHE
-/******************************************************************************/
-#ifdef JEMALLOC_H_TYPES
-
-typedef struct tcache_bin_s tcache_bin_t;
-typedef struct tcache_s tcache_t;
-
-/*
- * Absolute maximum number of cache slots for each small bin in the thread
- * cache.  This is an additional constraint beyond that imposed as: twice the
- * number of regions per run for this size class.
- *
- * This constant must be an even number.
- */
-#define	TCACHE_NSLOTS_SMALL_MAX		200
-
-/* Number of cache slots for large size classes. */
-#define	TCACHE_NSLOTS_LARGE		20
-
-/* (1U << opt_lg_tcache_maxclass) is used to compute tcache_maxclass. */
-#define	LG_TCACHE_MAXCLASS_DEFAULT	15
-
-/*
- * (1U << opt_lg_tcache_gc_sweep) is the approximate number of allocation
- * events between full GC sweeps (-1: disabled).  Integer rounding may cause
- * the actual number to be slightly higher, since GC is performed
- * incrementally.
- */
-#define	LG_TCACHE_GC_SWEEP_DEFAULT	13
-
-#endif /* JEMALLOC_H_TYPES */
-/******************************************************************************/
-#ifdef JEMALLOC_H_STRUCTS
-
-struct tcache_bin_s {
-#  ifdef JEMALLOC_STATS
-	tcache_bin_stats_t tstats;
-#  endif
-	unsigned	low_water;	/* Min # cached since last GC. */
-	unsigned	high_water;	/* Max # cached since last GC. */
-	unsigned	ncached;	/* # of cached objects. */
-	unsigned	ncached_max;	/* Upper limit on ncached. */
-	void		*avail;		/* Chain of available objects. */
-};
-
-struct tcache_s {
-#  ifdef JEMALLOC_STATS
-	ql_elm(tcache_t) link;		/* Used for aggregating stats. */
-#  endif
-#  ifdef JEMALLOC_PROF
-	uint64_t	prof_accumbytes;/* Cleared after arena_prof_accum() */
-#  endif
-	arena_t		*arena;		/* This thread's arena. */
-	unsigned	ev_cnt;		/* Event count since incremental GC. */
-	unsigned	next_gc_bin;	/* Next bin to GC. */
-	tcache_bin_t	tbins[1];	/* Dynamically sized. */
-};
-
-#endif /* JEMALLOC_H_STRUCTS */
-/******************************************************************************/
-#ifdef JEMALLOC_H_EXTERNS
-
-extern bool	opt_tcache;
-extern ssize_t	opt_lg_tcache_maxclass;
-extern ssize_t	opt_lg_tcache_gc_sweep;
-
-/* Map of thread-specific caches. */
-extern __thread tcache_t	*tcache_tls
-    JEMALLOC_ATTR(tls_model("initial-exec"));
-
-/*
- * Number of tcache bins.  There are nbins small-object bins, plus 0 or more
- * large-object bins.
- */
-extern size_t			nhbins;
-
-/* Maximum cached size class. */
-extern size_t			tcache_maxclass;
-
-/* Number of tcache allocation/deallocation events between incremental GCs. */
-extern unsigned			tcache_gc_incr;
-
-void	tcache_bin_flush_small(tcache_bin_t *tbin, size_t binind, unsigned rem
-#if (defined(JEMALLOC_STATS) || defined(JEMALLOC_PROF))
-    , tcache_t *tcache
-#endif
-    );
-void	tcache_bin_flush_large(tcache_bin_t *tbin, size_t binind, unsigned rem
-#if (defined(JEMALLOC_STATS) || defined(JEMALLOC_PROF))
-    , tcache_t *tcache
-#endif
-    );
-tcache_t *tcache_create(arena_t *arena);
-void	*tcache_alloc_small_hard(tcache_t *tcache, tcache_bin_t *tbin,
-    size_t binind);
-void	tcache_destroy(tcache_t *tcache);
-#ifdef JEMALLOC_STATS
-void	tcache_stats_merge(tcache_t *tcache, arena_t *arena);
-#endif
-void	tcache_boot(void);
-
-#endif /* JEMALLOC_H_EXTERNS */
-/******************************************************************************/
-#ifdef JEMALLOC_H_INLINES
-
-#ifndef JEMALLOC_ENABLE_INLINE
-void	tcache_event(tcache_t *tcache);
-tcache_t *tcache_get(void);
-void	*tcache_alloc_easy(tcache_bin_t *tbin);
-void	*tcache_alloc_small(tcache_t *tcache, size_t size, bool zero);
-void	*tcache_alloc_large(tcache_t *tcache, size_t size, bool zero);
-void	tcache_dalloc_small(tcache_t *tcache, void *ptr);
-void	tcache_dalloc_large(tcache_t *tcache, void *ptr, size_t size);
-#endif
-
-#if (defined(JEMALLOC_ENABLE_INLINE) || defined(JEMALLOC_TCACHE_C_))
-JEMALLOC_INLINE tcache_t *
-tcache_get(void)
-{
-	tcache_t *tcache;
-
-	if ((isthreaded & opt_tcache) == false)
-		return (NULL);
-
-	tcache = tcache_tls;
-	if ((uintptr_t)tcache <= (uintptr_t)1) {
-		if (tcache == NULL) {
-			tcache = tcache_create(choose_arena());
-			if (tcache == NULL)
-				return (NULL);
-		} else
-			return (NULL);
-	}
-
-	return (tcache);
-}
-
-JEMALLOC_INLINE void
-tcache_event(tcache_t *tcache)
-{
-
-	if (tcache_gc_incr == 0)
-		return;
-
-	tcache->ev_cnt++;
-	assert(tcache->ev_cnt <= tcache_gc_incr);
-	if (tcache->ev_cnt == tcache_gc_incr) {
-		size_t binind = tcache->next_gc_bin;
-		tcache_bin_t *tbin = &tcache->tbins[binind];
-
-		if (tbin->low_water > 0) {
-			/*
-			 * Flush (ceiling) 3/4 of the objects below the low
-			 * water mark.
-			 */
-			if (binind < nbins) {
-				tcache_bin_flush_small(tbin, binind,
-				    tbin->ncached - tbin->low_water +
-				    (tbin->low_water >> 2)
-#if (defined(JEMALLOC_STATS) || defined(JEMALLOC_PROF))
-				    , tcache
-#endif
-				    );
-			} else {
-				tcache_bin_flush_large(tbin, binind,
-				    tbin->ncached - tbin->low_water +
-				    (tbin->low_water >> 2)
-#if (defined(JEMALLOC_STATS) || defined(JEMALLOC_PROF))
-				    , tcache
-#endif
-				    );
-			}
-		}
-		tbin->low_water = tbin->ncached;
-		tbin->high_water = tbin->ncached;
-
-		tcache->next_gc_bin++;
-		if (tcache->next_gc_bin == nhbins)
-			tcache->next_gc_bin = 0;
-		tcache->ev_cnt = 0;
-	}
-}
-
-JEMALLOC_INLINE void *
-tcache_alloc_easy(tcache_bin_t *tbin)
-{
-	void *ret;
-
-	if (tbin->ncached == 0)
-		return (NULL);
-	tbin->ncached--;
-	if (tbin->ncached < tbin->low_water)
-		tbin->low_water = tbin->ncached;
-	ret = tbin->avail;
-	tbin->avail = *(void **)ret;
-	return (ret);
-}
-
-JEMALLOC_INLINE void *
-tcache_alloc_small(tcache_t *tcache, size_t size, bool zero)
-{
-	void *ret;
-	size_t binind;
-	tcache_bin_t *tbin;
-
-	binind = small_size2bin[size];
-	assert(binind < nbins);
-	tbin = &tcache->tbins[binind];
-	ret = tcache_alloc_easy(tbin);
-	if (ret == NULL) {
-		ret = tcache_alloc_small_hard(tcache, tbin, binind);
-		if (ret == NULL)
-			return (NULL);
-	}
-	assert(arena_salloc(ret) == tcache->arena->bins[binind].reg_size);
-
-	if (zero == false) {
-#ifdef JEMALLOC_FILL
-		if (opt_junk)
-			memset(ret, 0xa5, size);
-		else if (opt_zero)
-			memset(ret, 0, size);
-#endif
-	} else
-		memset(ret, 0, size);
-
-#ifdef JEMALLOC_STATS
-	tbin->tstats.nrequests++;
-#endif
-#ifdef JEMALLOC_PROF
-	tcache->prof_accumbytes += tcache->arena->bins[binind].reg_size;
-#endif
-	tcache_event(tcache);
-	return (ret);
-}
-
-JEMALLOC_INLINE void *
-tcache_alloc_large(tcache_t *tcache, size_t size, bool zero)
-{
-	void *ret;
-	size_t binind;
-	tcache_bin_t *tbin;
-
-	size = PAGE_CEILING(size);
-	assert(size <= tcache_maxclass);
-	binind = nbins + (size >> PAGE_SHIFT) - 1;
-	assert(binind < nhbins);
-	tbin = &tcache->tbins[binind];
-	ret = tcache_alloc_easy(tbin);
-	if (ret == NULL) {
-		/*
-		 * Only allocate one large object at a time, because it's quite
-		 * expensive to create one and not use it.
-		 */
-		ret = arena_malloc_large(tcache->arena, size, zero);
-		if (ret == NULL)
-			return (NULL);
-	} else {
-#ifdef JEMALLOC_PROF
-		arena_chunk_t *chunk = (arena_chunk_t *)CHUNK_ADDR2BASE(ret);
-		size_t pageind = (unsigned)(((uintptr_t)ret - (uintptr_t)chunk)
-		    >> PAGE_SHIFT);
-		chunk->map[pageind].bits |= CHUNK_MAP_CLASS_MASK;
-#endif
-		if (zero == false) {
-#ifdef JEMALLOC_FILL
-			if (opt_junk)
-				memset(ret, 0xa5, size);
-			else if (opt_zero)
-				memset(ret, 0, size);
-#endif
-		} else
-			memset(ret, 0, size);
-
-#ifdef JEMALLOC_STATS
-		tbin->tstats.nrequests++;
-#endif
-#ifdef JEMALLOC_PROF
-		tcache->prof_accumbytes += size;
-#endif
-	}
-
-	tcache_event(tcache);
-	return (ret);
-}
-
-JEMALLOC_INLINE void
-tcache_dalloc_small(tcache_t *tcache, void *ptr)
-{
-	arena_t *arena;
-	arena_chunk_t *chunk;
-	arena_run_t *run;
-	arena_bin_t *bin;
-	tcache_bin_t *tbin;
-	size_t pageind, binind;
-	arena_chunk_map_t *mapelm;
-
-	assert(arena_salloc(ptr) <= small_maxclass);
-
-	chunk = (arena_chunk_t *)CHUNK_ADDR2BASE(ptr);
-	arena = chunk->arena;
-	pageind = (((uintptr_t)ptr - (uintptr_t)chunk) >> PAGE_SHIFT);
-	mapelm = &chunk->map[pageind];
-	run = (arena_run_t *)((uintptr_t)chunk + (uintptr_t)((pageind -
-	    (mapelm->bits >> PAGE_SHIFT)) << PAGE_SHIFT));
-	assert(run->magic == ARENA_RUN_MAGIC);
-	bin = run->bin;
-	binind = ((uintptr_t)bin - (uintptr_t)&arena->bins) /
-	    sizeof(arena_bin_t);
-	assert(binind < nbins);
-
-#ifdef JEMALLOC_FILL
-	if (opt_junk)
-		memset(ptr, 0x5a, bin->reg_size);
-#endif
-
-	tbin = &tcache->tbins[binind];
-	if (tbin->ncached == tbin->ncached_max) {
-		tcache_bin_flush_small(tbin, binind, (tbin->ncached_max >> 1)
-#if (defined(JEMALLOC_STATS) || defined(JEMALLOC_PROF))
-		    , tcache
-#endif
-		    );
-	}
-	assert(tbin->ncached < tbin->ncached_max);
-	*(void **)ptr = tbin->avail;
-	tbin->avail = ptr;
-	tbin->ncached++;
-	if (tbin->ncached > tbin->high_water)
-		tbin->high_water = tbin->ncached;
-
-	tcache_event(tcache);
-}
-
-JEMALLOC_INLINE void
-tcache_dalloc_large(tcache_t *tcache, void *ptr, size_t size)
-{
-	arena_t *arena;
-	arena_chunk_t *chunk;
-	size_t pageind, binind;
-	tcache_bin_t *tbin;
-	arena_chunk_map_t *mapelm;
-
-	assert((size & PAGE_MASK) == 0);
-	assert(arena_salloc(ptr) > small_maxclass);
-	assert(arena_salloc(ptr) <= tcache_maxclass);
-
-	chunk = (arena_chunk_t *)CHUNK_ADDR2BASE(ptr);
-	arena = chunk->arena;
-	pageind = (((uintptr_t)ptr - (uintptr_t)chunk) >> PAGE_SHIFT);
-	mapelm = &chunk->map[pageind];
-	binind = nbins + (size >> PAGE_SHIFT) - 1;
-
-#ifdef JEMALLOC_FILL
-	if (opt_junk)
-		memset(ptr, 0x5a, bin->reg_size);
-#endif
-
-	tbin = &tcache->tbins[binind];
-	if (tbin->ncached == tbin->ncached_max) {
-		tcache_bin_flush_large(tbin, binind, (tbin->ncached_max >> 1)
-#if (defined(JEMALLOC_STATS) || defined(JEMALLOC_PROF))
-		    , tcache
-#endif
-		    );
-	}
-	assert(tbin->ncached < tbin->ncached_max);
-	*(void **)ptr = tbin->avail;
-	tbin->avail = ptr;
-	tbin->ncached++;
-	if (tbin->ncached > tbin->high_water)
-		tbin->high_water = tbin->ncached;
-
-	tcache_event(tcache);
-}
-#endif
-
-#endif /* JEMALLOC_H_INLINES */
-/******************************************************************************/
-#endif /* JEMALLOC_TCACHE */
diff --git a/externals/jemalloc/include/internal/totally_not_p_r_n.h b/externals/jemalloc/include/internal/totally_not_p_r_n.h
deleted file mode 100644
index 0709d708012..00000000000
--- a/externals/jemalloc/include/internal/totally_not_p_r_n.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/******************************************************************************/
-#ifdef JEMALLOC_H_TYPES
-
-/*
- * Simple linear congruential pseudo-random number generator:
- *
- *   prn(y) = (a*x + c) % m
- *
- * where the following constants ensure maximal period:
- *
- *   a == Odd number (relatively prime to 2^n), and (a-1) is a multiple of 4.
- *   c == Odd number (relatively prime to 2^n).
- *   m == 2^32
- *
- * See Knuth's TAOCP 3rd Ed., Vol. 2, pg. 17 for details on these constraints.
- *
- * This choice of m has the disadvantage that the quality of the bits is
- * proportional to bit position.  For example. the lowest bit has a cycle of 2,
- * the next has a cycle of 4, etc.  For this reason, we prefer to use the upper
- * bits.
- *
- * Macro parameters:
- *   uint32_t r          : Result.
- *   unsigned lg_range   : (0..32], number of least significant bits to return.
- *   uint32_t state      : Seed value.
- *   const uint32_t a, c : See above discussion.
- */
-#define prn32(r, lg_range, state, a, c) do {				\
-	assert(lg_range > 0);						\
-	assert(lg_range <= 32);						\
-									\
-	r = (state * (a)) + (c);					\
-	state = r;							\
-	r >>= (32 - lg_range);						\
-} while (false)
-
-/* Same as prn32(), but 64 bits of pseudo-randomness, using uint64_t. */
-#define prn64(r, lg_range, state, a, c) do {				\
-	assert(lg_range > 0);						\
-	assert(lg_range <= 64);						\
-									\
-	r = (state * (a)) + (c);					\
-	state = r;							\
-	r >>= (64 - lg_range);						\
-} while (false)
-
-#endif /* JEMALLOC_H_TYPES */
-/******************************************************************************/
-#ifdef JEMALLOC_H_STRUCTS
-
-#endif /* JEMALLOC_H_STRUCTS */
-/******************************************************************************/
-#ifdef JEMALLOC_H_EXTERNS
-
-#endif /* JEMALLOC_H_EXTERNS */
-/******************************************************************************/
-#ifdef JEMALLOC_H_INLINES
-
-#endif /* JEMALLOC_H_INLINES */
-/******************************************************************************/
diff --git a/externals/jemalloc/include/jemalloc.h b/externals/jemalloc/include/jemalloc.h
deleted file mode 100644
index d9bafbfff55..00000000000
--- a/externals/jemalloc/include/jemalloc.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef JEMALLOC_H_
-#define	JEMALLOC_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define	JEMALLOC_VERSION "1.0.0-0-g5523399"
-#define	JEMALLOC_VERSION_MAJOR 1
-#define	JEMALLOC_VERSION_MINOR 0
-#define	JEMALLOC_VERSION_BUGFIX 0
-#define	JEMALLOC_VERSION_NREV 0
-#define	JEMALLOC_VERSION_GID "5523399"
-
-#include "jemalloc_defs.h"
-#ifndef JEMALLOC_P
-#  define JEMALLOC_P(s) s
-#endif
-
-extern const char	*JEMALLOC_P(malloc_options);
-extern void		(*JEMALLOC_P(malloc_message))(void *, const char *);
-
-void	*JEMALLOC_P(malloc)(size_t size) JEMALLOC_ATTR(malloc);
-void	*JEMALLOC_P(calloc)(size_t num, size_t size) JEMALLOC_ATTR(malloc);
-int	JEMALLOC_P(posix_memalign)(void **memptr, size_t alignment, size_t size)
-    JEMALLOC_ATTR(nonnull(1));
-void	*JEMALLOC_P(realloc)(void *ptr, size_t size);
-void	JEMALLOC_P(free)(void *ptr);
-
-size_t	JEMALLOC_P(malloc_usable_size)(const void *ptr);
-void	JEMALLOC_P(malloc_stats_print)(void (*write_cb)(void *, const char *),
-    void *cbopaque, const char *opts);
-int	JEMALLOC_P(mallctl)(const char *name, void *oldp, size_t *oldlenp,
-    void *newp, size_t newlen);
-int	JEMALLOC_P(mallctlnametomib)(const char *name, size_t *mibp,
-    size_t *miblenp);
-int	JEMALLOC_P(mallctlbymib)(const size_t *mib, size_t miblen, void *oldp,
-    size_t *oldlenp, void *newp, size_t newlen);
-
-#ifdef __cplusplus
-};
-#endif
-#endif /* JEMALLOC_H_ */
diff --git a/externals/jemalloc/include/jemalloc.h.in b/externals/jemalloc/include/jemalloc.h.in
deleted file mode 100644
index 8ef8183686e..00000000000
--- a/externals/jemalloc/include/jemalloc.h.in
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef JEMALLOC_H_
-#define	JEMALLOC_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define	JEMALLOC_VERSION "@jemalloc_version@"
-#define	JEMALLOC_VERSION_MAJOR @jemalloc_version_major@
-#define	JEMALLOC_VERSION_MINOR @jemalloc_version_minor@
-#define	JEMALLOC_VERSION_BUGFIX @jemalloc_version_bugfix@
-#define	JEMALLOC_VERSION_NREV @jemalloc_version_nrev@
-#define	JEMALLOC_VERSION_GID "@jemalloc_version_gid@"
-
-#include "jemalloc_defs@install_suffix@.h"
-#ifndef JEMALLOC_P
-#  define JEMALLOC_P(s) s
-#endif
-
-extern const char	*JEMALLOC_P(malloc_options);
-extern void		(*JEMALLOC_P(malloc_message))(void *, const char *);
-
-void	*JEMALLOC_P(malloc)(size_t size) JEMALLOC_ATTR(malloc);
-void	*JEMALLOC_P(calloc)(size_t num, size_t size) JEMALLOC_ATTR(malloc);
-int	JEMALLOC_P(posix_memalign)(void **memptr, size_t alignment, size_t size)
-    JEMALLOC_ATTR(nonnull(1));
-void	*JEMALLOC_P(realloc)(void *ptr, size_t size);
-void	JEMALLOC_P(free)(void *ptr);
-
-size_t	JEMALLOC_P(malloc_usable_size)(const void *ptr);
-void	JEMALLOC_P(malloc_stats_print)(void (*write_cb)(void *, const char *),
-    void *cbopaque, const char *opts);
-int	JEMALLOC_P(mallctl)(const char *name, void *oldp, size_t *oldlenp,
-    void *newp, size_t newlen);
-int	JEMALLOC_P(mallctlnametomib)(const char *name, size_t *mibp,
-    size_t *miblenp);
-int	JEMALLOC_P(mallctlbymib)(const size_t *mib, size_t miblen, void *oldp,
-    size_t *oldlenp, void *newp, size_t newlen);
-
-#ifdef __cplusplus
-};
-#endif
-#endif /* JEMALLOC_H_ */
diff --git a/externals/jemalloc/include/jemalloc_defs.h b/externals/jemalloc/include/jemalloc_defs.h
deleted file mode 100644
index e8acaed3abd..00000000000
--- a/externals/jemalloc/include/jemalloc_defs.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/* include/jemalloc/jemalloc_defs.h.  Generated from jemalloc_defs.h.in by configure.  */
-#ifndef JEMALLOC_DEFS_H_
-#define	JEMALLOC_DEFS_H_
-
-/*
- * If JEMALLOC_PREFIX is defined, it will cause all public APIs to be prefixed.
- * This makes it possible, with some care, to use multiple allocators
- * simultaneously.
- *
- * In many cases it is more convenient to manually prefix allocator function
- * calls than to let macros do it automatically, particularly when using
- * multiple allocators simultaneously.  Define JEMALLOC_MANGLE before
- * #include'ing jemalloc.h in order to cause name mangling that corresponds to
- * the API prefixing.
- */
-/* #undef JEMALLOC_PREFIX */
-#if (defined(JEMALLOC_PREFIX) && defined(JEMALLOC_MANGLE))
-/* #undef JEMALLOC_P */
-#endif
-
-/*
- * Hyper-threaded CPUs may need a special instruction inside spin loops in
- * order to yield to another virtual CPU.
- */
-#define CPU_SPINWAIT __asm__ volatile("pause")
-
-/* Defined if __attribute__((...)) syntax is supported. */
-#define JEMALLOC_HAVE_ATTR 
-#ifdef JEMALLOC_HAVE_ATTR
-#  define JEMALLOC_ATTR(s) __attribute__((s))
-#else
-#  define JEMALLOC_ATTR(s)
-#endif
-
-/*
- * JEMALLOC_DEBUG enables assertions and other sanity checks, and disables
- * inline functions.
- */
-/* #undef JEMALLOC_DEBUG */
-
-/* JEMALLOC_STATS enables statistics calculation. */
-/* #undef JEMALLOC_STATS */
-
-/* JEMALLOC_PROF enables allocation profiling. */
-/* #undef JEMALLOC_PROF */
-
-/* Use libunwind for profile backtracing if defined. */
-/* #undef JEMALLOC_PROF_LIBUNWIND */
-
-/* Use libgcc for profile backtracing if defined. */
-/* #undef JEMALLOC_PROF_LIBGCC */
-
-/*
- * JEMALLOC_TINY enables support for tiny objects, which are smaller than one
- * quantum.
- */
-#define JEMALLOC_TINY 
-
-/*
- * JEMALLOC_TCACHE enables a thread-specific caching layer for small objects.
- * This makes it possible to allocate/deallocate objects without any locking
- * when the cache is in the steady state.
- */
-#define JEMALLOC_TCACHE 
-
-/*
- * JEMALLOC_DSS enables use of sbrk(2) to allocate chunks from the data storage
- * segment (DSS).
- */
-/* #undef JEMALLOC_DSS */
-
-/* JEMALLOC_SWAP enables mmap()ed swap file support. */
-/* #undef JEMALLOC_SWAP */
-
-/* Support memory filling (junk/zero). */
-/* #undef JEMALLOC_FILL */
-
-/* Support optional abort() on OOM. */
-/* #undef JEMALLOC_XMALLOC */
-
-/* Support SYSV semantics. */
-/* #undef JEMALLOC_SYSV */
-
-/* Support lazy locking (avoid locking unless a second thread is launched). */
-#define JEMALLOC_LAZY_LOCK 
-
-/* Determine page size at run time if defined. */
-/* #undef DYNAMIC_PAGE_SHIFT */
-
-/* One page is 2^STATIC_PAGE_SHIFT bytes. */
-#define STATIC_PAGE_SHIFT 12
-
-/* TLS is used to map arenas and magazine caches to threads. */
-/* #undef NO_TLS */
-
-/* sizeof(void *) == 2^LG_SIZEOF_PTR. */
-#define LG_SIZEOF_PTR 3
-
-/* sizeof(int) == 2^LG_SIZEOF_INT. */
-#define LG_SIZEOF_INT 2
-
-#endif /* JEMALLOC_DEFS_H_ */
diff --git a/externals/jemalloc/include/jemalloc_defs.h.in b/externals/jemalloc/include/jemalloc_defs.h.in
deleted file mode 100644
index 8b98d670acc..00000000000
--- a/externals/jemalloc/include/jemalloc_defs.h.in
+++ /dev/null
@@ -1,101 +0,0 @@
-#ifndef JEMALLOC_DEFS_H_
-#define	JEMALLOC_DEFS_H_
-
-/*
- * If JEMALLOC_PREFIX is defined, it will cause all public APIs to be prefixed.
- * This makes it possible, with some care, to use multiple allocators
- * simultaneously.
- *
- * In many cases it is more convenient to manually prefix allocator function
- * calls than to let macros do it automatically, particularly when using
- * multiple allocators simultaneously.  Define JEMALLOC_MANGLE before
- * #include'ing jemalloc.h in order to cause name mangling that corresponds to
- * the API prefixing.
- */
-#undef JEMALLOC_PREFIX
-#if (defined(JEMALLOC_PREFIX) && defined(JEMALLOC_MANGLE))
-#undef JEMALLOC_P
-#endif
-
-/*
- * Hyper-threaded CPUs may need a special instruction inside spin loops in
- * order to yield to another virtual CPU.
- */
-#undef CPU_SPINWAIT
-
-/* Defined if __attribute__((...)) syntax is supported. */
-#undef JEMALLOC_HAVE_ATTR
-#ifdef JEMALLOC_HAVE_ATTR
-#  define JEMALLOC_ATTR(s) __attribute__((s))
-#else
-#  define JEMALLOC_ATTR(s)
-#endif
-
-/*
- * JEMALLOC_DEBUG enables assertions and other sanity checks, and disables
- * inline functions.
- */
-#undef JEMALLOC_DEBUG
-
-/* JEMALLOC_STATS enables statistics calculation. */
-#undef JEMALLOC_STATS
-
-/* JEMALLOC_PROF enables allocation profiling. */
-#undef JEMALLOC_PROF
-
-/* Use libunwind for profile backtracing if defined. */
-#undef JEMALLOC_PROF_LIBUNWIND
-
-/* Use libgcc for profile backtracing if defined. */
-#undef JEMALLOC_PROF_LIBGCC
-
-/*
- * JEMALLOC_TINY enables support for tiny objects, which are smaller than one
- * quantum.
- */
-#undef JEMALLOC_TINY
-
-/*
- * JEMALLOC_TCACHE enables a thread-specific caching layer for small objects.
- * This makes it possible to allocate/deallocate objects without any locking
- * when the cache is in the steady state.
- */
-#undef JEMALLOC_TCACHE
-
-/*
- * JEMALLOC_DSS enables use of sbrk(2) to allocate chunks from the data storage
- * segment (DSS).
- */
-#undef JEMALLOC_DSS
-
-/* JEMALLOC_SWAP enables mmap()ed swap file support. */
-#undef JEMALLOC_SWAP
-
-/* Support memory filling (junk/zero). */
-#undef JEMALLOC_FILL
-
-/* Support optional abort() on OOM. */
-#undef JEMALLOC_XMALLOC
-
-/* Support SYSV semantics. */
-#undef JEMALLOC_SYSV
-
-/* Support lazy locking (avoid locking unless a second thread is launched). */
-#undef JEMALLOC_LAZY_LOCK
-
-/* Determine page size at run time if defined. */
-#undef DYNAMIC_PAGE_SHIFT
-
-/* One page is 2^STATIC_PAGE_SHIFT bytes. */
-#undef STATIC_PAGE_SHIFT
-
-/* TLS is used to map arenas and magazine caches to threads. */
-#undef NO_TLS
-
-/* sizeof(void *) == 2^LG_SIZEOF_PTR. */
-#undef LG_SIZEOF_PTR
-
-/* sizeof(int) == 2^LG_SIZEOF_INT. */
-#undef LG_SIZEOF_INT
-
-#endif /* JEMALLOC_DEFS_H_ */
diff --git a/externals/jemalloc/jemalloc/internal/arena.h b/externals/jemalloc/jemalloc/internal/arena.h
new file mode 100644
index 00000000000..bb4ce2a54f7
--- /dev/null
+++ b/externals/jemalloc/jemalloc/internal/arena.h
@@ -0,0 +1,537 @@
+/******************************************************************************/
+#ifdef JEMALLOC_H_TYPES
+
+/*
+ * Subpages are an artificially designated partitioning of pages.  Their only
+ * purpose is to support subpage-spaced size classes.
+ *
+ * There must be at least 4 subpages per page, due to the way size classes are
+ * handled.
+ */
+#define	LG_SUBPAGE		8
+#define	SUBPAGE			((size_t)(1U << LG_SUBPAGE))
+#define	SUBPAGE_MASK		(SUBPAGE - 1)
+
+/* Return the smallest subpage multiple that is >= s. */
+#define	SUBPAGE_CEILING(s)						\
+	(((s) + SUBPAGE_MASK) & ~SUBPAGE_MASK)
+
+#ifdef JEMALLOC_TINY
+   /* Smallest size class to support. */
+#  define LG_TINY_MIN		LG_SIZEOF_PTR
+#endif
+
+/*
+ * Maximum size class that is a multiple of the quantum, but not (necessarily)
+ * a power of 2.  Above this size, allocations are rounded up to the nearest
+ * power of 2.
+ */
+#define	LG_QSPACE_MAX_DEFAULT	7
+
+/*
+ * Maximum size class that is a multiple of the cacheline, but not (necessarily)
+ * a power of 2.  Above this size, allocations are rounded up to the nearest
+ * power of 2.
+ */
+#define	LG_CSPACE_MAX_DEFAULT	9
+
+/*
+ * RUN_MAX_OVRHD indicates maximum desired run header overhead.  Runs are sized
+ * as small as possible such that this setting is still honored, without
+ * violating other constraints.  The goal is to make runs as small as possible
+ * without exceeding a per run external fragmentation threshold.
+ *
+ * We use binary fixed point math for overhead computations, where the binary
+ * point is implicitly RUN_BFP bits to the left.
+ *
+ * Note that it is possible to set RUN_MAX_OVRHD low enough that it cannot be
+ * honored for some/all object sizes, since there is one bit of header overhead
+ * per object (plus a constant).  This constraint is relaxed (ignored) for runs
+ * that are so small that the per-region overhead is greater than:
+ *
+ *   (RUN_MAX_OVRHD / (reg_size << (3+RUN_BFP))
+ */
+#define	RUN_BFP			12
+/*                                    \/   Implicit binary fixed point. */
+#define	RUN_MAX_OVRHD		0x0000003dU
+#define	RUN_MAX_OVRHD_RELAX	0x00001800U
+
+/*
+ * The minimum ratio of active:dirty pages per arena is computed as:
+ *
+ *   (nactive >> opt_lg_dirty_mult) >= ndirty
+ *
+ * So, supposing that opt_lg_dirty_mult is 5, there can be no less than 32
+ * times as many active pages as dirty pages.
+ */
+#define	LG_DIRTY_MULT_DEFAULT	5
+
+typedef struct arena_chunk_map_s arena_chunk_map_t;
+typedef struct arena_chunk_s arena_chunk_t;
+typedef struct arena_run_s arena_run_t;
+typedef struct arena_bin_s arena_bin_t;
+typedef struct arena_s arena_t;
+
+#endif /* JEMALLOC_H_TYPES */
+/******************************************************************************/
+#ifdef JEMALLOC_H_STRUCTS
+
+/* Each element of the chunk map corresponds to one page within the chunk. */
+struct arena_chunk_map_s {
+	union {
+		/*
+		 * Linkage for run trees.  There are two disjoint uses:
+		 *
+		 * 1) arena_t's runs_avail_{clean,dirty} trees.
+		 * 2) arena_run_t conceptually uses this linkage for in-use
+		 *    non-full runs, rather than directly embedding linkage.
+		 */
+		rb_node(arena_chunk_map_t)	rb_link;
+		/*
+		 * List of runs currently in purgatory.  arena_chunk_purge()
+		 * temporarily allocates runs that contain dirty pages while
+		 * purging, so that other threads cannot use the runs while the
+		 * purging thread is operating without the arena lock held.
+		 */
+		ql_elm(arena_chunk_map_t)	ql_link;
+	}				u;
+
+#ifdef JEMALLOC_PROF
+	/* Profile counters, used for large object runs. */
+	prof_thr_cnt_t			*prof_cnt;
+#endif
+
+	/*
+	 * Run address (or size) and various flags are stored together.  The bit
+	 * layout looks like (assuming 32-bit system):
+	 *
+	 *   ???????? ???????? ????---- ----dzla
+	 *
+	 * ? : Unallocated: Run address for first/last pages, unset for internal
+	 *                  pages.
+	 *     Small: Run page offset.
+	 *     Large: Run size for first page, unset for trailing pages.
+	 * - : Unused.
+	 * d : dirty?
+	 * z : zeroed?
+	 * l : large?
+	 * a : allocated?
+	 *
+	 * Following are example bit patterns for the three types of runs.
+	 *
+	 * p : run page offset
+	 * s : run size
+	 * c : size class (used only if prof_promote is true)
+	 * x : don't care
+	 * - : 0
+	 * + : 1
+	 * [DZLA] : bit set
+	 * [dzla] : bit unset
+	 *
+	 *   Unallocated (clean):
+	 *     ssssssss ssssssss ssss---- ----dz--
+	 *     xxxxxxxx xxxxxxxx xxxx---- -----Zxx
+	 *     ssssssss ssssssss ssss---- ----dZ--
+	 *
+	 *   Unallocated (dirty):
+	 *     ssssssss ssssssss ssss---- ----D---
+	 *     xxxxxxxx xxxxxxxx xxxx---- ----xxxx
+	 *     ssssssss ssssssss ssss---- ----D---
+	 *
+	 *   Small:
+	 *     pppppppp pppppppp pppp---- ----d--a
+	 *     pppppppp pppppppp pppp---- -------a
+	 *     pppppppp pppppppp pppp---- ----d--a
+	 *
+	 *   Large:
+	 *     ssssssss ssssssss ssss++++ ++++D-la
+	 *     xxxxxxxx xxxxxxxx xxxx---- ----xxxx
+	 *     -------- -------- -------- ----D-la
+	 *
+	 *   Large (sampled, size <= PAGE_SIZE):
+	 *     ssssssss ssssssss sssscccc ccccD-la
+	 *
+	 *   Large (not sampled, size == PAGE_SIZE):
+	 *     ssssssss ssssssss ssss++++ ++++D-la
+	 */
+	size_t				bits;
+#ifdef JEMALLOC_PROF
+#define	CHUNK_MAP_CLASS_SHIFT	4
+#define	CHUNK_MAP_CLASS_MASK	((size_t)0xff0U)
+#endif
+#define	CHUNK_MAP_FLAGS_MASK	((size_t)0xfU)
+#define	CHUNK_MAP_DIRTY		((size_t)0x8U)
+#define	CHUNK_MAP_ZEROED	((size_t)0x4U)
+#define	CHUNK_MAP_LARGE		((size_t)0x2U)
+#define	CHUNK_MAP_ALLOCATED	((size_t)0x1U)
+#define	CHUNK_MAP_KEY		CHUNK_MAP_ALLOCATED
+};
+typedef rb_tree(arena_chunk_map_t) arena_avail_tree_t;
+typedef rb_tree(arena_chunk_map_t) arena_run_tree_t;
+
+/* Arena chunk header. */
+struct arena_chunk_s {
+	/* Arena that owns the chunk. */
+	arena_t		*arena;
+
+	/* Linkage for the arena's chunks_dirty list. */
+	ql_elm(arena_chunk_t) link_dirty;
+
+	/*
+	 * True if the chunk is currently in the chunks_dirty list, due to
+	 * having at some point contained one or more dirty pages.  Removal
+	 * from chunks_dirty is lazy, so (dirtied && ndirty == 0) is possible.
+	 */
+	bool		dirtied;
+
+	/* Number of dirty pages. */
+	size_t		ndirty;
+
+	/* Map of pages within chunk that keeps track of free/large/small. */
+	arena_chunk_map_t map[1]; /* Dynamically sized. */
+};
+typedef rb_tree(arena_chunk_t) arena_chunk_tree_t;
+
+struct arena_run_s {
+#ifdef JEMALLOC_DEBUG
+	uint32_t	magic;
+#  define ARENA_RUN_MAGIC 0x384adf93
+#endif
+
+	/* Bin this run is associated with. */
+	arena_bin_t	*bin;
+
+	/* Stack of available freed regions, or NULL. */
+	void		*avail;
+
+	/* Next region that has never been allocated, or run boundary. */
+	void		*next;
+
+	/* Number of free regions in run. */
+	unsigned	nfree;
+};
+
+struct arena_bin_s {
+	/*
+	 * All operations on runcur, runs, and stats require that lock be
+	 * locked.  Run allocation/deallocation are protected by the arena lock,
+	 * which may be acquired while holding one or more bin locks, but not
+	 * vise versa.
+	 */
+	malloc_mutex_t	lock;
+
+	/*
+	 * Current run being used to service allocations of this bin's size
+	 * class.
+	 */
+	arena_run_t	*runcur;
+
+	/*
+	 * Tree of non-full runs.  This tree is used when looking for an
+	 * existing run when runcur is no longer usable.  We choose the
+	 * non-full run that is lowest in memory; this policy tends to keep
+	 * objects packed well, and it can also help reduce the number of
+	 * almost-empty chunks.
+	 */
+	arena_run_tree_t runs;
+
+	/* Size of regions in a run for this bin's size class. */
+	size_t		reg_size;
+
+	/* Total size of a run for this bin's size class. */
+	size_t		run_size;
+
+	/* Total number of regions in a run for this bin's size class. */
+	uint32_t	nregs;
+
+#ifdef JEMALLOC_PROF
+	/*
+	 * Offset of first (prof_cnt_t *) in a run header for this bin's size
+	 * class, or 0 if (opt_prof == false).
+	 */
+	uint32_t	cnt0_offset;
+#endif
+
+	/* Offset of first region in a run for this bin's size class. */
+	uint32_t	reg0_offset;
+
+#ifdef JEMALLOC_STATS
+	/* Bin statistics. */
+	malloc_bin_stats_t stats;
+#endif
+};
+
+struct arena_s {
+#ifdef JEMALLOC_DEBUG
+	uint32_t		magic;
+#  define ARENA_MAGIC 0x947d3d24
+#endif
+
+	/* This arena's index within the arenas array. */
+	unsigned		ind;
+
+	/*
+	 * All non-bin-related operations on this arena require that lock be
+	 * locked.
+	 */
+	malloc_mutex_t		lock;
+
+#ifdef JEMALLOC_STATS
+	arena_stats_t		stats;
+#  ifdef JEMALLOC_TCACHE
+	/*
+	 * List of tcaches for extant threads associated with this arena.
+	 * Stats from these are merged incrementally, and at exit.
+	 */
+	ql_head(tcache_t)	tcache_ql;
+#  endif
+#endif
+
+#ifdef JEMALLOC_PROF
+	uint64_t		prof_accumbytes;
+#endif
+
+	/* List of dirty-page-containing chunks this arena manages. */
+	ql_head(arena_chunk_t)	chunks_dirty;
+
+	/*
+	 * In order to avoid rapid chunk allocation/deallocation when an arena
+	 * oscillates right on the cusp of needing a new chunk, cache the most
+	 * recently freed chunk.  The spare is left in the arena's chunk trees
+	 * until it is deleted.
+	 *
+	 * There is one spare chunk per arena, rather than one spare total, in
+	 * order to avoid interactions between multiple threads that could make
+	 * a single spare inadequate.
+	 */
+	arena_chunk_t		*spare;
+
+	/* Number of pages in active runs. */
+	size_t			nactive;
+
+	/*
+	 * Current count of pages within unused runs that are potentially
+	 * dirty, and for which madvise(... MADV_DONTNEED) has not been called.
+	 * By tracking this, we can institute a limit on how much dirty unused
+	 * memory is mapped for each arena.
+	 */
+	size_t			ndirty;
+
+	/*
+	 * Approximate number of pages being purged.  It is possible for
+	 * multiple threads to purge dirty pages concurrently, and they use
+	 * npurgatory to indicate the total number of pages all threads are
+	 * attempting to purge.
+	 */
+	size_t			npurgatory;
+
+	/*
+	 * Size/address-ordered trees of this arena's available runs.  The trees
+	 * are used for first-best-fit run allocation.  The dirty tree contains
+	 * runs with dirty pages (i.e. very likely to have been touched and
+	 * therefore have associated physical pages), whereas the clean tree
+	 * contains runs with pages that either have no associated physical
+	 * pages, or have pages that the kernel may recycle at any time due to
+	 * previous madvise(2) calls.  The dirty tree is used in preference to
+	 * the clean tree for allocations, because using dirty pages reduces
+	 * the amount of dirty purging necessary to keep the active:dirty page
+	 * ratio below the purge threshold.
+	 */
+	arena_avail_tree_t	runs_avail_clean;
+	arena_avail_tree_t	runs_avail_dirty;
+
+	/*
+	 * bins is used to store trees of free regions of the following sizes,
+	 * assuming a 16-byte quantum, 4 KiB page size, and default
+	 * JEMALLOC_OPTIONS.
+	 *
+	 *   bins[i] |   size |
+	 *   --------+--------+
+	 *        0  |      2 |
+	 *        1  |      4 |
+	 *        2  |      8 |
+	 *   --------+--------+
+	 *        3  |     16 |
+	 *        4  |     32 |
+	 *        5  |     48 |
+	 *           :        :
+	 *        8  |     96 |
+	 *        9  |    112 |
+	 *       10  |    128 |
+	 *   --------+--------+
+	 *       11  |    192 |
+	 *       12  |    256 |
+	 *       13  |    320 |
+	 *       14  |    384 |
+	 *       15  |    448 |
+	 *       16  |    512 |
+	 *   --------+--------+
+	 *       17  |    768 |
+	 *       18  |   1024 |
+	 *       19  |   1280 |
+	 *           :        :
+	 *       27  |   3328 |
+	 *       28  |   3584 |
+	 *       29  |   3840 |
+	 *   --------+--------+
+	 *       30  |  4 KiB |
+	 *       31  |  6 KiB |
+	 *       33  |  8 KiB |
+	 *           :        :
+	 *       43  | 28 KiB |
+	 *       44  | 30 KiB |
+	 *       45  | 32 KiB |
+	 *   --------+--------+
+	 */
+	arena_bin_t		bins[1]; /* Dynamically sized. */
+};
+
+#endif /* JEMALLOC_H_STRUCTS */
+/******************************************************************************/
+#ifdef JEMALLOC_H_EXTERNS
+
+extern size_t	opt_lg_qspace_max;
+extern size_t	opt_lg_cspace_max;
+extern ssize_t		opt_lg_dirty_mult;
+extern uint8_t const	*small_size2bin;
+
+/* Various bin-related settings. */
+#ifdef JEMALLOC_TINY		/* Number of (2^n)-spaced tiny bins. */
+#  define		ntbins	((unsigned)(LG_QUANTUM - LG_TINY_MIN))
+#else
+#  define		ntbins	0
+#endif
+extern unsigned		nqbins; /* Number of quantum-spaced bins. */
+extern unsigned		ncbins; /* Number of cacheline-spaced bins. */
+extern unsigned		nsbins; /* Number of subpage-spaced bins. */
+extern unsigned		nbins;
+#ifdef JEMALLOC_TINY
+#  define		tspace_max	((size_t)(QUANTUM >> 1))
+#endif
+#define			qspace_min	QUANTUM
+extern size_t		qspace_max;
+extern size_t		cspace_min;
+extern size_t		cspace_max;
+extern size_t		sspace_min;
+extern size_t		sspace_max;
+#define			small_maxclass	sspace_max
+
+#define			nlclasses (chunk_npages - arena_chunk_header_npages)
+
+#ifdef JEMALLOC_TCACHE
+void	arena_tcache_fill_small(arena_t *arena, tcache_bin_t *tbin,
+    size_t binind
+#  ifdef JEMALLOC_PROF
+    , uint64_t prof_accumbytes
+#  endif
+    );
+#endif
+#ifdef JEMALLOC_PROF
+void	arena_prof_accum(arena_t *arena, uint64_t accumbytes);
+#endif
+void	*arena_malloc_small(arena_t *arena, size_t size, bool zero);
+void	*arena_malloc_large(arena_t *arena, size_t size, bool zero);
+void	*arena_malloc(size_t size, bool zero);
+void	*arena_palloc(arena_t *arena, size_t alignment, size_t size,
+    size_t alloc_size);
+size_t	arena_salloc(const void *ptr);
+#ifdef JEMALLOC_PROF
+void	arena_prof_promoted(const void *ptr, size_t size);
+size_t	arena_salloc_demote(const void *ptr);
+prof_thr_cnt_t	*arena_prof_cnt_get(const void *ptr);
+void	arena_prof_cnt_set(const void *ptr, prof_thr_cnt_t *cnt);
+#endif
+void	arena_dalloc_bin(arena_t *arena, arena_chunk_t *chunk, void *ptr,
+    arena_chunk_map_t *mapelm);
+void	arena_dalloc_large(arena_t *arena, arena_chunk_t *chunk, void *ptr);
+#ifdef JEMALLOC_STATS
+void	arena_stats_merge(arena_t *arena, size_t *nactive, size_t *ndirty,
+    arena_stats_t *astats, malloc_bin_stats_t *bstats,
+    malloc_large_stats_t *lstats);
+#endif
+void	*arena_ralloc(void *ptr, size_t size, size_t oldsize);
+bool	arena_new(arena_t *arena, unsigned ind);
+bool	arena_boot(void);
+
+#endif /* JEMALLOC_H_EXTERNS */
+/******************************************************************************/
+#ifdef JEMALLOC_H_INLINES
+
+#ifndef JEMALLOC_ENABLE_INLINE
+void	arena_dalloc(arena_t *arena, arena_chunk_t *chunk, void *ptr);
+#endif
+
+#if (defined(JEMALLOC_ENABLE_INLINE) || defined(JEMALLOC_ARENA_C_))
+JEMALLOC_INLINE void
+arena_dalloc(arena_t *arena, arena_chunk_t *chunk, void *ptr)
+{
+	size_t pageind;
+	arena_chunk_map_t *mapelm;
+
+	assert(arena != NULL);
+	assert(arena->magic == ARENA_MAGIC);
+	assert(chunk->arena == arena);
+	assert(ptr != NULL);
+	assert(CHUNK_ADDR2BASE(ptr) != ptr);
+
+	pageind = (((uintptr_t)ptr - (uintptr_t)chunk) >> PAGE_SHIFT);
+	mapelm = &chunk->map[pageind];
+	assert((mapelm->bits & CHUNK_MAP_ALLOCATED) != 0);
+	if ((mapelm->bits & CHUNK_MAP_LARGE) == 0) {
+		/* Small allocation. */
+#ifdef JEMALLOC_TCACHE
+		tcache_t *tcache;
+
+		if ((tcache = tcache_get()) != NULL)
+			tcache_dalloc_small(tcache, ptr);
+		else {
+#endif
+			arena_run_t *run;
+			arena_bin_t *bin;
+
+			run = (arena_run_t *)((uintptr_t)chunk +
+			    (uintptr_t)((pageind - (mapelm->bits >>
+			    PAGE_SHIFT)) << PAGE_SHIFT));
+			assert(run->magic == ARENA_RUN_MAGIC);
+			assert(((uintptr_t)ptr - ((uintptr_t)run +
+			    (uintptr_t)run->bin->reg0_offset)) %
+			    run->bin->reg_size == 0);
+			bin = run->bin;
+			malloc_mutex_lock(&bin->lock);
+			arena_dalloc_bin(arena, chunk, ptr, mapelm);
+			malloc_mutex_unlock(&bin->lock);
+#ifdef JEMALLOC_TCACHE
+		}
+#endif
+	} else {
+#ifdef JEMALLOC_TCACHE
+		size_t size = mapelm->bits & ~PAGE_MASK;
+
+		assert(((uintptr_t)ptr & PAGE_MASK) == 0);
+		if (size <= tcache_maxclass) {
+			tcache_t *tcache;
+
+			if ((tcache = tcache_get()) != NULL)
+				tcache_dalloc_large(tcache, ptr, size);
+			else {
+				malloc_mutex_lock(&arena->lock);
+				arena_dalloc_large(arena, chunk, ptr);
+				malloc_mutex_unlock(&arena->lock);
+			}
+		} else {
+			malloc_mutex_lock(&arena->lock);
+			arena_dalloc_large(arena, chunk, ptr);
+			malloc_mutex_unlock(&arena->lock);
+		}
+#else
+		assert(((uintptr_t)ptr & PAGE_MASK) == 0);
+		malloc_mutex_lock(&arena->lock);
+		arena_dalloc_large(arena, chunk, ptr);
+		malloc_mutex_unlock(&arena->lock);
+#endif
+	}
+}
+#endif
+
+#endif /* JEMALLOC_H_INLINES */
+/******************************************************************************/
diff --git a/externals/jemalloc/jemalloc/internal/base.h b/externals/jemalloc/jemalloc/internal/base.h
new file mode 100644
index 00000000000..e353f309bd2
--- /dev/null
+++ b/externals/jemalloc/jemalloc/internal/base.h
@@ -0,0 +1,24 @@
+/******************************************************************************/
+#ifdef JEMALLOC_H_TYPES
+
+#endif /* JEMALLOC_H_TYPES */
+/******************************************************************************/
+#ifdef JEMALLOC_H_STRUCTS
+
+#endif /* JEMALLOC_H_STRUCTS */
+/******************************************************************************/
+#ifdef JEMALLOC_H_EXTERNS
+
+extern malloc_mutex_t	base_mtx;
+
+void	*base_alloc(size_t size);
+extent_node_t *base_node_alloc(void);
+void	base_node_dealloc(extent_node_t *node);
+bool	base_boot(void);
+
+#endif /* JEMALLOC_H_EXTERNS */
+/******************************************************************************/
+#ifdef JEMALLOC_H_INLINES
+
+#endif /* JEMALLOC_H_INLINES */
+/******************************************************************************/
diff --git a/externals/jemalloc/jemalloc/internal/chunk.h b/externals/jemalloc/jemalloc/internal/chunk.h
new file mode 100644
index 00000000000..1f6abf782f1
--- /dev/null
+++ b/externals/jemalloc/jemalloc/internal/chunk.h
@@ -0,0 +1,61 @@
+/******************************************************************************/
+#ifdef JEMALLOC_H_TYPES
+
+/*
+ * Size and alignment of memory chunks that are allocated by the OS's virtual
+ * memory system.
+ */
+#define	LG_CHUNK_DEFAULT	22
+
+/* Return the chunk address for allocation address a. */
+#define	CHUNK_ADDR2BASE(a)						\
+	((void *)((uintptr_t)(a) & ~chunksize_mask))
+
+/* Return the chunk offset of address a. */
+#define	CHUNK_ADDR2OFFSET(a)						\
+	((size_t)((uintptr_t)(a) & chunksize_mask))
+
+/* Return the smallest chunk multiple that is >= s. */
+#define	CHUNK_CEILING(s)						\
+	(((s) + chunksize_mask) & ~chunksize_mask)
+
+#endif /* JEMALLOC_H_TYPES */
+/******************************************************************************/
+#ifdef JEMALLOC_H_STRUCTS
+
+#endif /* JEMALLOC_H_STRUCTS */
+/******************************************************************************/
+#ifdef JEMALLOC_H_EXTERNS
+
+extern size_t		opt_lg_chunk;
+#ifdef JEMALLOC_SWAP
+extern bool		opt_overcommit;
+#endif
+
+#if (defined(JEMALLOC_STATS) || defined(JEMALLOC_PROF))
+/* Protects stats_chunks; currently not used for any other purpose. */
+extern malloc_mutex_t	chunks_mtx;
+/* Chunk statistics. */
+extern chunk_stats_t	stats_chunks;
+#endif
+
+extern size_t		chunksize;
+extern size_t		chunksize_mask; /* (chunksize - 1). */
+extern size_t		chunk_npages;
+extern size_t		arena_chunk_header_npages;
+extern size_t		arena_maxclass; /* Max size class for arenas. */
+
+void	*chunk_alloc(size_t size, bool *zero);
+void	chunk_dealloc(void *chunk, size_t size);
+bool	chunk_boot(void);
+
+#endif /* JEMALLOC_H_EXTERNS */
+/******************************************************************************/
+#ifdef JEMALLOC_H_INLINES
+
+#endif /* JEMALLOC_H_INLINES */
+/******************************************************************************/
+
+#include "jemalloc/internal/chunk_swap.h"
+#include "jemalloc/internal/chunk_dss.h"
+#include "jemalloc/internal/chunk_mmap.h"
diff --git a/externals/jemalloc/jemalloc/internal/chunk_dss.h b/externals/jemalloc/jemalloc/internal/chunk_dss.h
new file mode 100644
index 00000000000..6be4ad1f212
--- /dev/null
+++ b/externals/jemalloc/jemalloc/internal/chunk_dss.h
@@ -0,0 +1,29 @@
+#ifdef JEMALLOC_DSS
+/******************************************************************************/
+#ifdef JEMALLOC_H_TYPES
+
+#endif /* JEMALLOC_H_TYPES */
+/******************************************************************************/
+#ifdef JEMALLOC_H_STRUCTS
+
+#endif /* JEMALLOC_H_STRUCTS */
+/******************************************************************************/
+#ifdef JEMALLOC_H_EXTERNS
+
+/*
+ * Protects sbrk() calls.  This avoids malloc races among threads, though it
+ * does not protect against races with threads that call sbrk() directly.
+ */
+extern malloc_mutex_t	dss_mtx;
+
+void	*chunk_alloc_dss(size_t size, bool *zero);
+bool	chunk_dealloc_dss(void *chunk, size_t size);
+bool	chunk_dss_boot(void);
+
+#endif /* JEMALLOC_H_EXTERNS */
+/******************************************************************************/
+#ifdef JEMALLOC_H_INLINES
+
+#endif /* JEMALLOC_H_INLINES */
+/******************************************************************************/
+#endif /* JEMALLOC_DSS */
diff --git a/externals/jemalloc/jemalloc/internal/chunk_mmap.h b/externals/jemalloc/jemalloc/internal/chunk_mmap.h
new file mode 100644
index 00000000000..8fb90b77c9b
--- /dev/null
+++ b/externals/jemalloc/jemalloc/internal/chunk_mmap.h
@@ -0,0 +1,20 @@
+/******************************************************************************/
+#ifdef JEMALLOC_H_TYPES
+
+#endif /* JEMALLOC_H_TYPES */
+/******************************************************************************/
+#ifdef JEMALLOC_H_STRUCTS
+
+#endif /* JEMALLOC_H_STRUCTS */
+/******************************************************************************/
+#ifdef JEMALLOC_H_EXTERNS
+
+void	*chunk_alloc_mmap(size_t size);
+void	chunk_dealloc_mmap(void *chunk, size_t size);
+
+#endif /* JEMALLOC_H_EXTERNS */
+/******************************************************************************/
+#ifdef JEMALLOC_H_INLINES
+
+#endif /* JEMALLOC_H_INLINES */
+/******************************************************************************/
diff --git a/externals/jemalloc/jemalloc/internal/chunk_swap.h b/externals/jemalloc/jemalloc/internal/chunk_swap.h
new file mode 100644
index 00000000000..d50cb197449
--- /dev/null
+++ b/externals/jemalloc/jemalloc/internal/chunk_swap.h
@@ -0,0 +1,33 @@
+#ifdef JEMALLOC_SWAP
+/******************************************************************************/
+#ifdef JEMALLOC_H_TYPES
+
+#endif /* JEMALLOC_H_TYPES */
+/******************************************************************************/
+#ifdef JEMALLOC_H_STRUCTS
+
+#endif /* JEMALLOC_H_STRUCTS */
+/******************************************************************************/
+#ifdef JEMALLOC_H_EXTERNS
+
+extern malloc_mutex_t	swap_mtx;
+extern bool		swap_enabled;
+extern bool		swap_prezeroed;
+extern size_t		swap_nfds;
+extern int		*swap_fds;
+#ifdef JEMALLOC_STATS
+extern size_t		swap_avail;
+#endif
+
+void	*chunk_alloc_swap(size_t size, bool *zero);
+bool	chunk_dealloc_swap(void *chunk, size_t size);
+bool	chunk_swap_enable(const int *fds, unsigned nfds, bool prezeroed);
+bool	chunk_swap_boot(void);
+
+#endif /* JEMALLOC_H_EXTERNS */
+/******************************************************************************/
+#ifdef JEMALLOC_H_INLINES
+
+#endif /* JEMALLOC_H_INLINES */
+/******************************************************************************/
+#endif /* JEMALLOC_SWAP */
diff --git a/externals/jemalloc/jemalloc/internal/ckh.h b/externals/jemalloc/jemalloc/internal/ckh.h
new file mode 100644
index 00000000000..c39ea5c75ef
--- /dev/null
+++ b/externals/jemalloc/jemalloc/internal/ckh.h
@@ -0,0 +1,95 @@
+/******************************************************************************/
+#ifdef JEMALLOC_H_TYPES
+
+typedef struct ckh_s ckh_t;
+typedef struct ckhc_s ckhc_t;
+
+/* Typedefs to allow easy function pointer passing. */
+typedef void ckh_hash_t (const void *, unsigned, size_t *, size_t *);
+typedef bool ckh_keycomp_t (const void *, const void *);
+
+/* Maintain counters used to get an idea of performance. */
+/* #define	CKH_COUNT */
+/* Print counter values in ckh_delete() (requires CKH_COUNT). */
+/* #define	CKH_VERBOSE */
+
+/*
+ * There are 2^LG_CKH_BUCKET_CELLS cells in each hash table bucket.  Try to fit
+ * one bucket per L1 cache line.
+ */
+#define LG_CKH_BUCKET_CELLS (LG_CACHELINE - LG_SIZEOF_PTR - 1)
+
+#endif /* JEMALLOC_H_TYPES */
+/******************************************************************************/
+#ifdef JEMALLOC_H_STRUCTS
+
+/* Hash table cell. */
+struct ckhc_s {
+	const void	*key;
+	const void	*data;
+};
+
+struct ckh_s {
+#ifdef JEMALLOC_DEBUG
+#define	CKH_MAGIG	0x3af2489d
+	uint32_t	magic;
+#endif
+
+#ifdef CKH_COUNT
+	/* Counters used to get an idea of performance. */
+	uint64_t	ngrows;
+	uint64_t	nshrinks;
+	uint64_t	nshrinkfails;
+	uint64_t	ninserts;
+	uint64_t	nrelocs;
+#endif
+
+	/* Used for pseudo-random number generation. */
+#define	CKH_A		12345
+#define	CKH_C		12347
+	uint32_t	prn_state;
+
+	/* Total number of items. */
+	size_t		count;
+
+	/*
+	 * Minimum and current number of hash table buckets.  There are
+	 * 2^LG_CKH_BUCKET_CELLS cells per bucket.
+	 */
+	unsigned	lg_minbuckets;
+	unsigned	lg_curbuckets;
+
+	/* Hash and comparison functions. */
+	ckh_hash_t	*hash;
+	ckh_keycomp_t	*keycomp;
+
+	/* Hash table with 2^lg_curbuckets buckets. */
+	ckhc_t		*tab;
+};
+
+#endif /* JEMALLOC_H_STRUCTS */
+/******************************************************************************/
+#ifdef JEMALLOC_H_EXTERNS
+
+bool	ckh_new(ckh_t *ckh, size_t minitems, ckh_hash_t *hash,
+    ckh_keycomp_t *keycomp);
+void	ckh_delete(ckh_t *ckh);
+size_t	ckh_count(ckh_t *ckh);
+bool	ckh_iter(ckh_t *ckh, size_t *tabind, void **key, void **data);
+bool	ckh_insert(ckh_t *ckh, const void *key, const void *data);
+bool	ckh_remove(ckh_t *ckh, const void *searchkey, void **key,
+    void **data);
+bool	ckh_search(ckh_t *ckh, const void *seachkey, void **key, void **data);
+void	ckh_string_hash(const void *key, unsigned minbits, size_t *hash1,
+    size_t *hash2);
+bool	ckh_string_keycomp(const void *k1, const void *k2);
+void	ckh_pointer_hash(const void *key, unsigned minbits, size_t *hash1,
+    size_t *hash2);
+bool	ckh_pointer_keycomp(const void *k1, const void *k2);
+
+#endif /* JEMALLOC_H_EXTERNS */
+/******************************************************************************/
+#ifdef JEMALLOC_H_INLINES
+
+#endif /* JEMALLOC_H_INLINES */
+/******************************************************************************/
diff --git a/externals/jemalloc/jemalloc/internal/ctl.h b/externals/jemalloc/jemalloc/internal/ctl.h
new file mode 100644
index 00000000000..7bbf21e0e85
--- /dev/null
+++ b/externals/jemalloc/jemalloc/internal/ctl.h
@@ -0,0 +1,117 @@
+/******************************************************************************/
+#ifdef JEMALLOC_H_TYPES
+
+typedef struct ctl_node_s ctl_node_t;
+typedef struct ctl_arena_stats_s ctl_arena_stats_t;
+typedef struct ctl_stats_s ctl_stats_t;
+
+#endif /* JEMALLOC_H_TYPES */
+/******************************************************************************/
+#ifdef JEMALLOC_H_STRUCTS
+
+struct ctl_node_s {
+	bool			named;
+	union {
+		struct {
+			const char	*name;
+			/* If (nchildren == 0), this is a terminal node. */
+			unsigned	nchildren;
+			const	ctl_node_t *children;
+		} named;
+		struct {
+			const ctl_node_t *(*index)(const size_t *, size_t,
+			    size_t);
+		} indexed;
+	} u;
+	int	(*ctl)(const size_t *, size_t, void *, size_t *, void *,
+	    size_t);
+};
+
+struct ctl_arena_stats_s {
+	bool			initialized;
+	size_t			pactive;
+	size_t			pdirty;
+#ifdef JEMALLOC_STATS
+	arena_stats_t		astats;
+
+	/* Aggregate stats for small size classes, based on bin stats. */
+	size_t			allocated_small;
+	uint64_t		nmalloc_small;
+	uint64_t		ndalloc_small;
+	uint64_t		nrequests_small;
+
+	malloc_bin_stats_t	*bstats;	/* nbins elements. */
+	malloc_large_stats_t	*lstats;	/* nlclasses elements. */
+#endif
+};
+
+struct ctl_stats_s {
+#ifdef JEMALLOC_STATS
+	size_t			allocated;
+	size_t			active;
+	size_t			mapped;
+	struct {
+		size_t		current;	/* stats_chunks.curchunks */
+		uint64_t	total;		/* stats_chunks.nchunks */
+		size_t		high;		/* stats_chunks.highchunks */
+	} chunks;
+	struct {
+		size_t		allocated;	/* huge_allocated */
+		uint64_t	nmalloc;	/* huge_nmalloc */
+		uint64_t	ndalloc;	/* huge_ndalloc */
+	} huge;
+#endif
+	ctl_arena_stats_t	*arenas;	/* (narenas + 1) elements. */
+#ifdef JEMALLOC_SWAP
+	size_t			swap_avail;
+#endif
+};
+
+#endif /* JEMALLOC_H_STRUCTS */
+/******************************************************************************/
+#ifdef JEMALLOC_H_EXTERNS
+
+int	ctl_byname(const char *name, void *oldp, size_t *oldlenp, void *newp,
+    size_t newlen);
+int	ctl_nametomib(const char *name, size_t *mibp, size_t *miblenp);
+
+int	ctl_bymib(const size_t *mib, size_t miblen, void *oldp, size_t *oldlenp,
+    void *newp, size_t newlen);
+bool	ctl_boot(void);
+
+#define	xmallctl(name, oldp, oldlenp, newp, newlen) do {		\
+	if (JEMALLOC_P(mallctl)(name, oldp, oldlenp, newp, newlen)	\
+	    != 0) {							\
+		malloc_write(": Invalid xmallctl(\"");	\
+		malloc_write(name);					\
+		malloc_write("\", ...) call\n");			\
+		abort();						\
+	}								\
+} while (0)
+
+#define	xmallctlnametomib(name, mibp, miblenp) do {			\
+	if (JEMALLOC_P(mallctlnametomib)(name, mibp, miblenp) != 0) {	\
+		malloc_write(						\
+		    ": Invalid xmallctlnametomib(\"");	\
+		malloc_write(name);					\
+		malloc_write("\", ...) call\n");			\
+		abort();						\
+	}								\
+} while (0)
+
+#define	xmallctlbymib(mib, miblen, oldp, oldlenp, newp, newlen) do {	\
+	if (JEMALLOC_P(mallctlbymib)(mib, miblen, oldp, oldlenp, newp,	\
+	    newlen) != 0) {						\
+		malloc_write(						\
+		    ": Invalid xmallctlbymib() call\n");	\
+		abort();						\
+	}								\
+} while (0)
+
+#endif /* JEMALLOC_H_EXTERNS */
+/******************************************************************************/
+#ifdef JEMALLOC_H_INLINES
+
+#endif /* JEMALLOC_H_INLINES */
+/******************************************************************************/
+
diff --git a/externals/jemalloc/jemalloc/internal/extent.h b/externals/jemalloc/jemalloc/internal/extent.h
new file mode 100644
index 00000000000..33a4e9a3852
--- /dev/null
+++ b/externals/jemalloc/jemalloc/internal/extent.h
@@ -0,0 +1,49 @@
+/******************************************************************************/
+#ifdef JEMALLOC_H_TYPES
+
+typedef struct extent_node_s extent_node_t;
+
+#endif /* JEMALLOC_H_TYPES */
+/******************************************************************************/
+#ifdef JEMALLOC_H_STRUCTS
+
+/* Tree of extents. */
+struct extent_node_s {
+#if (defined(JEMALLOC_SWAP) || defined(JEMALLOC_DSS))
+	/* Linkage for the size/address-ordered tree. */
+	rb_node(extent_node_t)	link_szad;
+#endif
+
+	/* Linkage for the address-ordered tree. */
+	rb_node(extent_node_t)	link_ad;
+
+#ifdef JEMALLOC_PROF
+	/* Profile counters, used for huge objects. */
+	prof_thr_cnt_t		*prof_cnt;
+#endif
+
+	/* Pointer to the extent that this tree node is responsible for. */
+	void			*addr;
+
+	/* Total region size. */
+	size_t			size;
+};
+typedef rb_tree(extent_node_t) extent_tree_t;
+
+#endif /* JEMALLOC_H_STRUCTS */
+/******************************************************************************/
+#ifdef JEMALLOC_H_EXTERNS
+
+#if (defined(JEMALLOC_SWAP) || defined(JEMALLOC_DSS))
+rb_proto(, extent_tree_szad_, extent_tree_t, extent_node_t)
+#endif
+
+rb_proto(, extent_tree_ad_, extent_tree_t, extent_node_t)
+
+#endif /* JEMALLOC_H_EXTERNS */
+/******************************************************************************/
+#ifdef JEMALLOC_H_INLINES
+
+#endif /* JEMALLOC_H_INLINES */
+/******************************************************************************/
+
diff --git a/externals/jemalloc/jemalloc/internal/hash.h b/externals/jemalloc/jemalloc/internal/hash.h
new file mode 100644
index 00000000000..d12cdb8359f
--- /dev/null
+++ b/externals/jemalloc/jemalloc/internal/hash.h
@@ -0,0 +1,70 @@
+/******************************************************************************/
+#ifdef JEMALLOC_H_TYPES
+
+#endif /* JEMALLOC_H_TYPES */
+/******************************************************************************/
+#ifdef JEMALLOC_H_STRUCTS
+
+#endif /* JEMALLOC_H_STRUCTS */
+/******************************************************************************/
+#ifdef JEMALLOC_H_EXTERNS
+
+#endif /* JEMALLOC_H_EXTERNS */
+/******************************************************************************/
+#ifdef JEMALLOC_H_INLINES
+
+#ifndef JEMALLOC_ENABLE_INLINE
+uint64_t	hash(const void *key, size_t len, uint64_t seed);
+#endif
+
+#if (defined(JEMALLOC_ENABLE_INLINE) || defined(HASH_C_))
+/*
+ * The following hash function is based on MurmurHash64A(), placed into the
+ * public domain by Austin Appleby.  See http://murmurhash.googlepages.com/ for
+ * details.
+ */
+JEMALLOC_INLINE uint64_t
+hash(const void *key, size_t len, uint64_t seed)
+{
+	const uint64_t m = 0xc6a4a7935bd1e995;
+	const int r = 47;
+	uint64_t h = seed ^ (len * m);
+	const uint64_t *data = (const uint64_t *)key;
+	const uint64_t *end = data + (len/8);
+	const unsigned char *data2;
+
+	assert(((uintptr_t)key & 0x7) == 0);
+
+	while(data != end) {
+		uint64_t k = *data++;
+
+		k *= m;
+		k ^= k >> r;
+		k *= m;
+
+		h ^= k;
+		h *= m;
+	}
+
+	data2 = (const unsigned char *)data;
+	switch(len & 7) {
+		case 7: h ^= ((uint64_t)(data2[6])) << 48;
+		case 6: h ^= ((uint64_t)(data2[5])) << 40;
+		case 5: h ^= ((uint64_t)(data2[4])) << 32;
+		case 4: h ^= ((uint64_t)(data2[3])) << 24;
+		case 3: h ^= ((uint64_t)(data2[2])) << 16;
+		case 2: h ^= ((uint64_t)(data2[1])) << 8;
+		case 1: h ^= ((uint64_t)(data2[0]));
+			h *= m;
+	}
+
+	h ^= h >> r;
+	h *= m;
+	h ^= h >> r;
+
+	return h;
+}
+#endif
+
+#endif /* JEMALLOC_H_INLINES */
+/******************************************************************************/
diff --git a/externals/jemalloc/jemalloc/internal/huge.h b/externals/jemalloc/jemalloc/internal/huge.h
new file mode 100644
index 00000000000..3cf32f7506d
--- /dev/null
+++ b/externals/jemalloc/jemalloc/internal/huge.h
@@ -0,0 +1,38 @@
+/******************************************************************************/
+#ifdef JEMALLOC_H_TYPES
+
+#endif /* JEMALLOC_H_TYPES */
+/******************************************************************************/
+#ifdef JEMALLOC_H_STRUCTS
+
+#endif /* JEMALLOC_H_STRUCTS */
+/******************************************************************************/
+#ifdef JEMALLOC_H_EXTERNS
+
+#ifdef JEMALLOC_STATS
+/* Huge allocation statistics. */
+extern uint64_t		huge_nmalloc;
+extern uint64_t		huge_ndalloc;
+extern size_t		huge_allocated;
+#endif
+
+/* Protects chunk-related data structures. */
+extern malloc_mutex_t	huge_mtx;
+
+void	*huge_malloc(size_t size, bool zero);
+void	*huge_palloc(size_t alignment, size_t size);
+void	*huge_ralloc(void *ptr, size_t size, size_t oldsize);
+void	huge_dalloc(void *ptr);
+size_t	huge_salloc(const void *ptr);
+#ifdef JEMALLOC_PROF
+prof_thr_cnt_t	*huge_prof_cnt_get(const void *ptr);
+void	huge_prof_cnt_set(const void *ptr, prof_thr_cnt_t *cnt);
+#endif
+bool	huge_boot(void);
+
+#endif /* JEMALLOC_H_EXTERNS */
+/******************************************************************************/
+#ifdef JEMALLOC_H_INLINES
+
+#endif /* JEMALLOC_H_INLINES */
+/******************************************************************************/
diff --git a/externals/jemalloc/jemalloc/internal/jemalloc_internal.h b/externals/jemalloc/jemalloc/internal/jemalloc_internal.h
new file mode 100644
index 00000000000..03782dd6690
--- /dev/null
+++ b/externals/jemalloc/jemalloc/internal/jemalloc_internal.h
@@ -0,0 +1,561 @@
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#ifndef SIZE_T_MAX
+#  define SIZE_T_MAX	SIZE_MAX
+#endif
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#define	JEMALLOC_MANGLE
+#include "../jemalloc.h"
+
+#ifdef JEMALLOC_LAZY_LOCK
+#include 
+#endif
+
+#define	RB_COMPACT
+#include "jemalloc/internal/rb.h"
+#include "jemalloc/internal/qr.h"
+#include "jemalloc/internal/ql.h"
+
+extern void	(*JEMALLOC_P(malloc_message))(void *wcbopaque, const char *s);
+
+/*
+ * Define a custom assert() in order to reduce the chances of deadlock during
+ * assertion failure.
+ */
+#ifdef JEMALLOC_DEBUG
+#  define assert(e) do {						\
+	if (!(e)) {							\
+		char line_buf[UMAX2S_BUFSIZE];				\
+		malloc_write(": ");				\
+		malloc_write(__FILE__);					\
+		malloc_write(":");					\
+		malloc_write(umax2s(__LINE__, 10, line_buf));		\
+		malloc_write(": Failed assertion: ");			\
+		malloc_write("\"");					\
+		malloc_write(#e);					\
+		malloc_write("\"\n");					\
+		abort();						\
+	}								\
+} while (0)
+#else
+#define assert(e)
+#endif
+
+/*
+ * jemalloc can conceptually be broken into components (arena, tcache, etc.),
+ * but there are circular dependencies that cannot be broken without
+ * substantial performance degradation.  In order to reduce the effect on
+ * visual code flow, read the header files in multiple passes, with one of the
+ * following cpp variables defined during each pass:
+ *
+ *   JEMALLOC_H_TYPES   : Preprocessor-defined constants and psuedo-opaque data
+ *                        types.
+ *   JEMALLOC_H_STRUCTS : Data structures.
+ *   JEMALLOC_H_EXTERNS : Extern data declarations and function prototypes.
+ *   JEMALLOC_H_INLINES : Inline functions.
+ */
+/******************************************************************************/
+#define JEMALLOC_H_TYPES
+
+#define	ZU(z)	((size_t)z)
+
+#ifndef __DECONST
+#  define	__DECONST(type, var)	((type)(uintptr_t)(const void *)(var))
+#endif
+
+#ifdef JEMALLOC_DEBUG
+   /* Disable inlining to make debugging easier. */
+#  define JEMALLOC_INLINE
+#  define inline
+#else
+#  define JEMALLOC_ENABLE_INLINE
+#  define JEMALLOC_INLINE static inline
+#endif
+
+/* Size of stack-allocated buffer passed to strerror_r(). */
+#define	STRERROR_BUF		64
+
+/* Minimum alignment of allocations is 2^LG_QUANTUM bytes. */
+#ifdef __i386__
+#  define LG_QUANTUM		4
+#endif
+#ifdef __ia64__
+#  define LG_QUANTUM		4
+#endif
+#ifdef __alpha__
+#  define LG_QUANTUM		4
+#endif
+#ifdef __sparc64__
+#  define LG_QUANTUM		4
+#endif
+#if (defined(__amd64__) || defined(__x86_64__))
+#  define LG_QUANTUM		4
+#endif
+#ifdef __arm__
+#  define LG_QUANTUM		3
+#endif
+#ifdef __mips__
+#  define LG_QUANTUM		3
+#endif
+#ifdef __powerpc__
+#  define LG_QUANTUM		4
+#endif
+#ifdef __s390x__
+#  define LG_QUANTUM		4
+#endif
+
+#define	QUANTUM			((size_t)(1U << LG_QUANTUM))
+#define	QUANTUM_MASK		(QUANTUM - 1)
+
+/* Return the smallest quantum multiple that is >= a. */
+#define	QUANTUM_CEILING(a)						\
+	(((a) + QUANTUM_MASK) & ~QUANTUM_MASK)
+
+#define	SIZEOF_PTR		(1U << LG_SIZEOF_PTR)
+
+/* We can't use TLS in non-PIC programs, since TLS relies on loader magic. */
+#if (!defined(PIC) && !defined(NO_TLS))
+#  define NO_TLS
+#endif
+
+/*
+ * Maximum size of L1 cache line.  This is used to avoid cache line aliasing.
+ * In addition, this controls the spacing of cacheline-spaced size classes.
+ */
+#define	LG_CACHELINE		6
+#define	CACHELINE		((size_t)(1U << LG_CACHELINE))
+#define	CACHELINE_MASK		(CACHELINE - 1)
+
+/* Return the smallest cacheline multiple that is >= s. */
+#define	CACHELINE_CEILING(s)						\
+	(((s) + CACHELINE_MASK) & ~CACHELINE_MASK)
+
+/*
+ * Page size.  STATIC_PAGE_SHIFT is determined by the configure script.  If
+ * DYNAMIC_PAGE_SHIFT is enabled, only use the STATIC_PAGE_* macros where
+ * compile-time values are required for the purposes of defining data
+ * structures.
+ */
+#define	STATIC_PAGE_SIZE ((size_t)(1U << STATIC_PAGE_SHIFT))
+#define	STATIC_PAGE_MASK ((size_t)(STATIC_PAGE_SIZE - 1))
+
+#ifdef DYNAMIC_PAGE_SHIFT
+#  define PAGE_SHIFT	lg_pagesize
+#  define PAGE_SIZE	pagesize
+#  define PAGE_MASK	pagesize_mask
+#else
+#  define PAGE_SHIFT	STATIC_PAGE_SHIFT
+#  define PAGE_SIZE	STATIC_PAGE_SIZE
+#  define PAGE_MASK	STATIC_PAGE_MASK
+#endif
+
+/* Return the smallest pagesize multiple that is >= s. */
+#define	PAGE_CEILING(s)							\
+	(((s) + PAGE_MASK) & ~PAGE_MASK)
+
+#include "jemalloc/internal/totally_not_p_r_n.h"
+#include "jemalloc/internal/ckh.h"
+#include "jemalloc/internal/stats.h"
+#include "jemalloc/internal/ctl.h"
+#include "jemalloc/internal/mutex.h"
+#include "jemalloc/internal/mb.h"
+#include "jemalloc/internal/extent.h"
+#include "jemalloc/internal/arena.h"
+#include "jemalloc/internal/base.h"
+#include "jemalloc/internal/chunk.h"
+#include "jemalloc/internal/huge.h"
+#include "jemalloc/internal/tcache.h"
+#include "jemalloc/internal/hash.h"
+#include "jemalloc/internal/prof.h"
+
+#undef JEMALLOC_H_TYPES
+/******************************************************************************/
+#define JEMALLOC_H_STRUCTS
+
+#include "jemalloc/internal/totally_not_p_r_n.h"
+#include "jemalloc/internal/ckh.h"
+#include "jemalloc/internal/stats.h"
+#include "jemalloc/internal/ctl.h"
+#include "jemalloc/internal/mutex.h"
+#include "jemalloc/internal/mb.h"
+#include "jemalloc/internal/extent.h"
+#include "jemalloc/internal/arena.h"
+#include "jemalloc/internal/base.h"
+#include "jemalloc/internal/chunk.h"
+#include "jemalloc/internal/huge.h"
+#include "jemalloc/internal/tcache.h"
+#include "jemalloc/internal/hash.h"
+#include "jemalloc/internal/prof.h"
+
+#undef JEMALLOC_H_STRUCTS
+/******************************************************************************/
+#define JEMALLOC_H_EXTERNS
+
+extern bool	opt_abort;
+#ifdef JEMALLOC_FILL
+extern bool	opt_junk;
+#endif
+#ifdef JEMALLOC_SYSV
+extern bool	opt_sysv;
+#endif
+#ifdef JEMALLOC_XMALLOC
+extern bool	opt_xmalloc;
+#endif
+#ifdef JEMALLOC_FILL
+extern bool	opt_zero;
+#endif
+
+#ifdef DYNAMIC_PAGE_SHIFT
+extern size_t		pagesize;
+extern size_t		pagesize_mask;
+extern size_t		lg_pagesize;
+#endif
+
+/* Number of CPUs. */
+extern unsigned		ncpus;
+
+extern malloc_mutex_t	arenas_lock; /* Protects arenas initialization. */
+#ifndef NO_TLS
+/*
+ * Map of pthread_self() --> arenas[???], used for selecting an arena to use
+ * for allocations.
+ */
+extern __thread arena_t	*arenas_map JEMALLOC_ATTR(tls_model("initial-exec"));
+#endif
+/*
+ * Arenas that are used to service external requests.  Not all elements of the
+ * arenas array are necessarily used; arenas are created lazily as needed.
+ */
+extern arena_t		**arenas;
+extern unsigned		narenas;
+
+arena_t	*arenas_extend(unsigned ind);
+#ifndef NO_TLS
+arena_t	*choose_arena_hard(void);
+#endif
+
+#include "jemalloc/internal/totally_not_p_r_n.h"
+#include "jemalloc/internal/ckh.h"
+#include "jemalloc/internal/stats.h"
+#include "jemalloc/internal/ctl.h"
+#include "jemalloc/internal/mutex.h"
+#include "jemalloc/internal/mb.h"
+#include "jemalloc/internal/extent.h"
+#include "jemalloc/internal/arena.h"
+#include "jemalloc/internal/base.h"
+#include "jemalloc/internal/chunk.h"
+#include "jemalloc/internal/huge.h"
+#include "jemalloc/internal/tcache.h"
+#include "jemalloc/internal/hash.h"
+#include "jemalloc/internal/prof.h"
+
+#undef JEMALLOC_H_EXTERNS
+/******************************************************************************/
+#define JEMALLOC_H_INLINES
+
+#include "jemalloc/internal/totally_not_p_r_n.h"
+#include "jemalloc/internal/ckh.h"
+#include "jemalloc/internal/stats.h"
+#include "jemalloc/internal/ctl.h"
+#include "jemalloc/internal/mutex.h"
+#include "jemalloc/internal/mb.h"
+#include "jemalloc/internal/extent.h"
+#include "jemalloc/internal/base.h"
+#include "jemalloc/internal/chunk.h"
+#include "jemalloc/internal/huge.h"
+
+#ifndef JEMALLOC_ENABLE_INLINE
+void	malloc_write(const char *s);
+arena_t	*choose_arena(void);
+#endif
+
+#if (defined(JEMALLOC_ENABLE_INLINE) || defined(JEMALLOC_C_))
+/*
+ * Wrapper around malloc_message() that avoids the need for
+ * JEMALLOC_P(malloc_message)(...) throughout the code.
+ */
+JEMALLOC_INLINE void
+malloc_write(const char *s)
+{
+
+	JEMALLOC_P(malloc_message)(NULL, s);
+}
+
+/*
+ * Choose an arena based on a per-thread value (fast-path code, calls slow-path
+ * code if necessary).
+ */
+JEMALLOC_INLINE arena_t *
+choose_arena(void)
+{
+	arena_t *ret;
+
+	/*
+	 * We can only use TLS if this is a PIC library, since for the static
+	 * library version, libc's malloc is used by TLS allocation, which
+	 * introduces a bootstrapping issue.
+	 */
+#ifndef NO_TLS
+	ret = arenas_map;
+	if (ret == NULL) {
+		ret = choose_arena_hard();
+		assert(ret != NULL);
+	}
+#else
+	if (isthreaded && narenas > 1) {
+		unsigned long ind;
+
+		/*
+		 * Hash pthread_self() to one of the arenas.  There is a prime
+		 * number of arenas, so this has a reasonable chance of
+		 * working.  Even so, the hashing can be easily thwarted by
+		 * inconvenient pthread_self() values.  Without specific
+		 * knowledge of how pthread_self() calculates values, we can't
+		 * easily do much better than this.
+		 */
+		ind = (unsigned long) pthread_self() % narenas;
+
+		/*
+		 * Optimistially assume that arenas[ind] has been initialized.
+		 * At worst, we find out that some other thread has already
+		 * done so, after acquiring the lock in preparation.  Note that
+		 * this lazy locking also has the effect of lazily forcing
+		 * cache coherency; without the lock acquisition, there's no
+		 * guarantee that modification of arenas[ind] by another thread
+		 * would be seen on this CPU for an arbitrary amount of time.
+		 *
+		 * In general, this approach to modifying a synchronized value
+		 * isn't a good idea, but in this case we only ever modify the
+		 * value once, so things work out well.
+		 */
+		ret = arenas[ind];
+		if (ret == NULL) {
+			/*
+			 * Avoid races with another thread that may have already
+			 * initialized arenas[ind].
+			 */
+			malloc_mutex_lock(&arenas_lock);
+			if (arenas[ind] == NULL)
+				ret = arenas_extend((unsigned)ind);
+			else
+				ret = arenas[ind];
+			malloc_mutex_unlock(&arenas_lock);
+		}
+	} else
+		ret = arenas[0];
+#endif
+
+	assert(ret != NULL);
+	return (ret);
+}
+#endif
+
+#include "jemalloc/internal/tcache.h"
+#include "jemalloc/internal/arena.h"
+#include "jemalloc/internal/hash.h"
+#include "jemalloc/internal/prof.h"
+
+#ifndef JEMALLOC_ENABLE_INLINE
+void	*imalloc(size_t size);
+void	*icalloc(size_t size);
+void	*ipalloc(size_t alignment, size_t size);
+size_t	isalloc(const void *ptr);
+void	*iralloc(void *ptr, size_t size);
+void	idalloc(void *ptr);
+#endif
+
+#if (defined(JEMALLOC_ENABLE_INLINE) || defined(JEMALLOC_C_))
+JEMALLOC_INLINE void *
+imalloc(size_t size)
+{
+
+	assert(size != 0);
+
+	if (size <= arena_maxclass)
+		return (arena_malloc(size, false));
+	else
+		return (huge_malloc(size, false));
+}
+
+JEMALLOC_INLINE void *
+icalloc(size_t size)
+{
+
+	if (size <= arena_maxclass)
+		return (arena_malloc(size, true));
+	else
+		return (huge_malloc(size, true));
+}
+
+JEMALLOC_INLINE void *
+ipalloc(size_t alignment, size_t size)
+{
+	void *ret;
+	size_t ceil_size;
+
+	/*
+	 * Round size up to the nearest multiple of alignment.
+	 *
+	 * This done, we can take advantage of the fact that for each small
+	 * size class, every object is aligned at the smallest power of two
+	 * that is non-zero in the base two representation of the size.  For
+	 * example:
+	 *
+	 *   Size |   Base 2 | Minimum alignment
+	 *   -----+----------+------------------
+	 *     96 |  1100000 |  32
+	 *    144 | 10100000 |  32
+	 *    192 | 11000000 |  64
+	 *
+	 * Depending on runtime settings, it is possible that arena_malloc()
+	 * will further round up to a power of two, but that never causes
+	 * correctness issues.
+	 */
+	ceil_size = (size + (alignment - 1)) & (-alignment);
+	/*
+	 * (ceil_size < size) protects against the combination of maximal
+	 * alignment and size greater than maximal alignment.
+	 */
+	if (ceil_size < size) {
+		/* size_t overflow. */
+		return (NULL);
+	}
+
+	if (ceil_size <= PAGE_SIZE || (alignment <= PAGE_SIZE
+	    && ceil_size <= arena_maxclass))
+		ret = arena_malloc(ceil_size, false);
+	else {
+		size_t run_size;
+
+		/*
+		 * We can't achieve subpage alignment, so round up alignment
+		 * permanently; it makes later calculations simpler.
+		 */
+		alignment = PAGE_CEILING(alignment);
+		ceil_size = PAGE_CEILING(size);
+		/*
+		 * (ceil_size < size) protects against very large sizes within
+		 * PAGE_SIZE of SIZE_T_MAX.
+		 *
+		 * (ceil_size + alignment < ceil_size) protects against the
+		 * combination of maximal alignment and ceil_size large enough
+		 * to cause overflow.  This is similar to the first overflow
+		 * check above, but it needs to be repeated due to the new
+		 * ceil_size value, which may now be *equal* to maximal
+		 * alignment, whereas before we only detected overflow if the
+		 * original size was *greater* than maximal alignment.
+		 */
+		if (ceil_size < size || ceil_size + alignment < ceil_size) {
+			/* size_t overflow. */
+			return (NULL);
+		}
+
+		/*
+		 * Calculate the size of the over-size run that arena_palloc()
+		 * would need to allocate in order to guarantee the alignment.
+		 */
+		if (ceil_size >= alignment)
+			run_size = ceil_size + alignment - PAGE_SIZE;
+		else {
+			/*
+			 * It is possible that (alignment << 1) will cause
+			 * overflow, but it doesn't matter because we also
+			 * subtract PAGE_SIZE, which in the case of overflow
+			 * leaves us with a very large run_size.  That causes
+			 * the first conditional below to fail, which means
+			 * that the bogus run_size value never gets used for
+			 * anything important.
+			 */
+			run_size = (alignment << 1) - PAGE_SIZE;
+		}
+
+		if (run_size <= arena_maxclass) {
+			ret = arena_palloc(choose_arena(), alignment, ceil_size,
+			    run_size);
+		} else if (alignment <= chunksize)
+			ret = huge_malloc(ceil_size, false);
+		else
+			ret = huge_palloc(alignment, ceil_size);
+	}
+
+	assert(((uintptr_t)ret & (alignment - 1)) == 0);
+	return (ret);
+}
+
+JEMALLOC_INLINE size_t
+isalloc(const void *ptr)
+{
+	size_t ret;
+	arena_chunk_t *chunk;
+
+	assert(ptr != NULL);
+
+	chunk = (arena_chunk_t *)CHUNK_ADDR2BASE(ptr);
+	if (chunk != ptr) {
+		/* Region. */
+		assert(chunk->arena->magic == ARENA_MAGIC);
+
+#ifdef JEMALLOC_PROF
+		ret = arena_salloc_demote(ptr);
+#else
+		ret = arena_salloc(ptr);
+#endif
+	} else
+		ret = huge_salloc(ptr);
+
+	return (ret);
+}
+
+JEMALLOC_INLINE void *
+iralloc(void *ptr, size_t size)
+{
+	size_t oldsize;
+
+	assert(ptr != NULL);
+	assert(size != 0);
+
+	oldsize = isalloc(ptr);
+
+	if (size <= arena_maxclass)
+		return (arena_ralloc(ptr, size, oldsize));
+	else
+		return (huge_ralloc(ptr, size, oldsize));
+}
+
+JEMALLOC_INLINE void
+idalloc(void *ptr)
+{
+	arena_chunk_t *chunk;
+
+	assert(ptr != NULL);
+
+	chunk = (arena_chunk_t *)CHUNK_ADDR2BASE(ptr);
+	if (chunk != ptr)
+		arena_dalloc(chunk->arena, chunk, ptr);
+	else
+		huge_dalloc(ptr);
+}
+#endif
+
+#undef JEMALLOC_H_INLINES
+/******************************************************************************/
diff --git a/externals/jemalloc/jemalloc/internal/jemalloc_internal.h.in b/externals/jemalloc/jemalloc/internal/jemalloc_internal.h.in
new file mode 100644
index 00000000000..2c3f32f126d
--- /dev/null
+++ b/externals/jemalloc/jemalloc/internal/jemalloc_internal.h.in
@@ -0,0 +1,561 @@
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#ifndef SIZE_T_MAX
+#  define SIZE_T_MAX	SIZE_MAX
+#endif
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#define	JEMALLOC_MANGLE
+#include "../jemalloc@install_suffix@.h"
+
+#ifdef JEMALLOC_LAZY_LOCK
+#include 
+#endif
+
+#define	RB_COMPACT
+#include "jemalloc/internal/rb.h"
+#include "jemalloc/internal/qr.h"
+#include "jemalloc/internal/ql.h"
+
+extern void	(*JEMALLOC_P(malloc_message))(void *wcbopaque, const char *s);
+
+/*
+ * Define a custom assert() in order to reduce the chances of deadlock during
+ * assertion failure.
+ */
+#ifdef JEMALLOC_DEBUG
+#  define assert(e) do {						\
+	if (!(e)) {							\
+		char line_buf[UMAX2S_BUFSIZE];				\
+		malloc_write(": ");				\
+		malloc_write(__FILE__);					\
+		malloc_write(":");					\
+		malloc_write(umax2s(__LINE__, 10, line_buf));		\
+		malloc_write(": Failed assertion: ");			\
+		malloc_write("\"");					\
+		malloc_write(#e);					\
+		malloc_write("\"\n");					\
+		abort();						\
+	}								\
+} while (0)
+#else
+#define assert(e)
+#endif
+
+/*
+ * jemalloc can conceptually be broken into components (arena, tcache, etc.),
+ * but there are circular dependencies that cannot be broken without
+ * substantial performance degradation.  In order to reduce the effect on
+ * visual code flow, read the header files in multiple passes, with one of the
+ * following cpp variables defined during each pass:
+ *
+ *   JEMALLOC_H_TYPES   : Preprocessor-defined constants and psuedo-opaque data
+ *                        types.
+ *   JEMALLOC_H_STRUCTS : Data structures.
+ *   JEMALLOC_H_EXTERNS : Extern data declarations and function prototypes.
+ *   JEMALLOC_H_INLINES : Inline functions.
+ */
+/******************************************************************************/
+#define JEMALLOC_H_TYPES
+
+#define	ZU(z)	((size_t)z)
+
+#ifndef __DECONST
+#  define	__DECONST(type, var)	((type)(uintptr_t)(const void *)(var))
+#endif
+
+#ifdef JEMALLOC_DEBUG
+   /* Disable inlining to make debugging easier. */
+#  define JEMALLOC_INLINE
+#  define inline
+#else
+#  define JEMALLOC_ENABLE_INLINE
+#  define JEMALLOC_INLINE static inline
+#endif
+
+/* Size of stack-allocated buffer passed to strerror_r(). */
+#define	STRERROR_BUF		64
+
+/* Minimum alignment of allocations is 2^LG_QUANTUM bytes. */
+#ifdef __i386__
+#  define LG_QUANTUM		4
+#endif
+#ifdef __ia64__
+#  define LG_QUANTUM		4
+#endif
+#ifdef __alpha__
+#  define LG_QUANTUM		4
+#endif
+#ifdef __sparc64__
+#  define LG_QUANTUM		4
+#endif
+#if (defined(__amd64__) || defined(__x86_64__))
+#  define LG_QUANTUM		4
+#endif
+#ifdef __arm__
+#  define LG_QUANTUM		3
+#endif
+#ifdef __mips__
+#  define LG_QUANTUM		3
+#endif
+#ifdef __powerpc__
+#  define LG_QUANTUM		4
+#endif
+#ifdef __s390x__
+#  define LG_QUANTUM		4
+#endif
+
+#define	QUANTUM			((size_t)(1U << LG_QUANTUM))
+#define	QUANTUM_MASK		(QUANTUM - 1)
+
+/* Return the smallest quantum multiple that is >= a. */
+#define	QUANTUM_CEILING(a)						\
+	(((a) + QUANTUM_MASK) & ~QUANTUM_MASK)
+
+#define	SIZEOF_PTR		(1U << LG_SIZEOF_PTR)
+
+/* We can't use TLS in non-PIC programs, since TLS relies on loader magic. */
+#if (!defined(PIC) && !defined(NO_TLS))
+#  define NO_TLS
+#endif
+
+/*
+ * Maximum size of L1 cache line.  This is used to avoid cache line aliasing.
+ * In addition, this controls the spacing of cacheline-spaced size classes.
+ */
+#define	LG_CACHELINE		6
+#define	CACHELINE		((size_t)(1U << LG_CACHELINE))
+#define	CACHELINE_MASK		(CACHELINE - 1)
+
+/* Return the smallest cacheline multiple that is >= s. */
+#define	CACHELINE_CEILING(s)						\
+	(((s) + CACHELINE_MASK) & ~CACHELINE_MASK)
+
+/*
+ * Page size.  STATIC_PAGE_SHIFT is determined by the configure script.  If
+ * DYNAMIC_PAGE_SHIFT is enabled, only use the STATIC_PAGE_* macros where
+ * compile-time values are required for the purposes of defining data
+ * structures.
+ */
+#define	STATIC_PAGE_SIZE ((size_t)(1U << STATIC_PAGE_SHIFT))
+#define	STATIC_PAGE_MASK ((size_t)(STATIC_PAGE_SIZE - 1))
+
+#ifdef DYNAMIC_PAGE_SHIFT
+#  define PAGE_SHIFT	lg_pagesize
+#  define PAGE_SIZE	pagesize
+#  define PAGE_MASK	pagesize_mask
+#else
+#  define PAGE_SHIFT	STATIC_PAGE_SHIFT
+#  define PAGE_SIZE	STATIC_PAGE_SIZE
+#  define PAGE_MASK	STATIC_PAGE_MASK
+#endif
+
+/* Return the smallest pagesize multiple that is >= s. */
+#define	PAGE_CEILING(s)							\
+	(((s) + PAGE_MASK) & ~PAGE_MASK)
+
+#include "jemalloc/internal/prn.h"
+#include "jemalloc/internal/ckh.h"
+#include "jemalloc/internal/stats.h"
+#include "jemalloc/internal/ctl.h"
+#include "jemalloc/internal/mutex.h"
+#include "jemalloc/internal/mb.h"
+#include "jemalloc/internal/extent.h"
+#include "jemalloc/internal/arena.h"
+#include "jemalloc/internal/base.h"
+#include "jemalloc/internal/chunk.h"
+#include "jemalloc/internal/huge.h"
+#include "jemalloc/internal/tcache.h"
+#include "jemalloc/internal/hash.h"
+#include "jemalloc/internal/prof.h"
+
+#undef JEMALLOC_H_TYPES
+/******************************************************************************/
+#define JEMALLOC_H_STRUCTS
+
+#include "jemalloc/internal/prn.h"
+#include "jemalloc/internal/ckh.h"
+#include "jemalloc/internal/stats.h"
+#include "jemalloc/internal/ctl.h"
+#include "jemalloc/internal/mutex.h"
+#include "jemalloc/internal/mb.h"
+#include "jemalloc/internal/extent.h"
+#include "jemalloc/internal/arena.h"
+#include "jemalloc/internal/base.h"
+#include "jemalloc/internal/chunk.h"
+#include "jemalloc/internal/huge.h"
+#include "jemalloc/internal/tcache.h"
+#include "jemalloc/internal/hash.h"
+#include "jemalloc/internal/prof.h"
+
+#undef JEMALLOC_H_STRUCTS
+/******************************************************************************/
+#define JEMALLOC_H_EXTERNS
+
+extern bool	opt_abort;
+#ifdef JEMALLOC_FILL
+extern bool	opt_junk;
+#endif
+#ifdef JEMALLOC_SYSV
+extern bool	opt_sysv;
+#endif
+#ifdef JEMALLOC_XMALLOC
+extern bool	opt_xmalloc;
+#endif
+#ifdef JEMALLOC_FILL
+extern bool	opt_zero;
+#endif
+
+#ifdef DYNAMIC_PAGE_SHIFT
+extern size_t		pagesize;
+extern size_t		pagesize_mask;
+extern size_t		lg_pagesize;
+#endif
+
+/* Number of CPUs. */
+extern unsigned		ncpus;
+
+extern malloc_mutex_t	arenas_lock; /* Protects arenas initialization. */
+#ifndef NO_TLS
+/*
+ * Map of pthread_self() --> arenas[???], used for selecting an arena to use
+ * for allocations.
+ */
+extern __thread arena_t	*arenas_map JEMALLOC_ATTR(tls_model("initial-exec"));
+#endif
+/*
+ * Arenas that are used to service external requests.  Not all elements of the
+ * arenas array are necessarily used; arenas are created lazily as needed.
+ */
+extern arena_t		**arenas;
+extern unsigned		narenas;
+
+arena_t	*arenas_extend(unsigned ind);
+#ifndef NO_TLS
+arena_t	*choose_arena_hard(void);
+#endif
+
+#include "jemalloc/internal/prn.h"
+#include "jemalloc/internal/ckh.h"
+#include "jemalloc/internal/stats.h"
+#include "jemalloc/internal/ctl.h"
+#include "jemalloc/internal/mutex.h"
+#include "jemalloc/internal/mb.h"
+#include "jemalloc/internal/extent.h"
+#include "jemalloc/internal/arena.h"
+#include "jemalloc/internal/base.h"
+#include "jemalloc/internal/chunk.h"
+#include "jemalloc/internal/huge.h"
+#include "jemalloc/internal/tcache.h"
+#include "jemalloc/internal/hash.h"
+#include "jemalloc/internal/prof.h"
+
+#undef JEMALLOC_H_EXTERNS
+/******************************************************************************/
+#define JEMALLOC_H_INLINES
+
+#include "jemalloc/internal/prn.h"
+#include "jemalloc/internal/ckh.h"
+#include "jemalloc/internal/stats.h"
+#include "jemalloc/internal/ctl.h"
+#include "jemalloc/internal/mutex.h"
+#include "jemalloc/internal/mb.h"
+#include "jemalloc/internal/extent.h"
+#include "jemalloc/internal/base.h"
+#include "jemalloc/internal/chunk.h"
+#include "jemalloc/internal/huge.h"
+
+#ifndef JEMALLOC_ENABLE_INLINE
+void	malloc_write(const char *s);
+arena_t	*choose_arena(void);
+#endif
+
+#if (defined(JEMALLOC_ENABLE_INLINE) || defined(JEMALLOC_C_))
+/*
+ * Wrapper around malloc_message() that avoids the need for
+ * JEMALLOC_P(malloc_message)(...) throughout the code.
+ */
+JEMALLOC_INLINE void
+malloc_write(const char *s)
+{
+
+	JEMALLOC_P(malloc_message)(NULL, s);
+}
+
+/*
+ * Choose an arena based on a per-thread value (fast-path code, calls slow-path
+ * code if necessary).
+ */
+JEMALLOC_INLINE arena_t *
+choose_arena(void)
+{
+	arena_t *ret;
+
+	/*
+	 * We can only use TLS if this is a PIC library, since for the static
+	 * library version, libc's malloc is used by TLS allocation, which
+	 * introduces a bootstrapping issue.
+	 */
+#ifndef NO_TLS
+	ret = arenas_map;
+	if (ret == NULL) {
+		ret = choose_arena_hard();
+		assert(ret != NULL);
+	}
+#else
+	if (isthreaded && narenas > 1) {
+		unsigned long ind;
+
+		/*
+		 * Hash pthread_self() to one of the arenas.  There is a prime
+		 * number of arenas, so this has a reasonable chance of
+		 * working.  Even so, the hashing can be easily thwarted by
+		 * inconvenient pthread_self() values.  Without specific
+		 * knowledge of how pthread_self() calculates values, we can't
+		 * easily do much better than this.
+		 */
+		ind = (unsigned long) pthread_self() % narenas;
+
+		/*
+		 * Optimistially assume that arenas[ind] has been initialized.
+		 * At worst, we find out that some other thread has already
+		 * done so, after acquiring the lock in preparation.  Note that
+		 * this lazy locking also has the effect of lazily forcing
+		 * cache coherency; without the lock acquisition, there's no
+		 * guarantee that modification of arenas[ind] by another thread
+		 * would be seen on this CPU for an arbitrary amount of time.
+		 *
+		 * In general, this approach to modifying a synchronized value
+		 * isn't a good idea, but in this case we only ever modify the
+		 * value once, so things work out well.
+		 */
+		ret = arenas[ind];
+		if (ret == NULL) {
+			/*
+			 * Avoid races with another thread that may have already
+			 * initialized arenas[ind].
+			 */
+			malloc_mutex_lock(&arenas_lock);
+			if (arenas[ind] == NULL)
+				ret = arenas_extend((unsigned)ind);
+			else
+				ret = arenas[ind];
+			malloc_mutex_unlock(&arenas_lock);
+		}
+	} else
+		ret = arenas[0];
+#endif
+
+	assert(ret != NULL);
+	return (ret);
+}
+#endif
+
+#include "jemalloc/internal/tcache.h"
+#include "jemalloc/internal/arena.h"
+#include "jemalloc/internal/hash.h"
+#include "jemalloc/internal/prof.h"
+
+#ifndef JEMALLOC_ENABLE_INLINE
+void	*imalloc(size_t size);
+void	*icalloc(size_t size);
+void	*ipalloc(size_t alignment, size_t size);
+size_t	isalloc(const void *ptr);
+void	*iralloc(void *ptr, size_t size);
+void	idalloc(void *ptr);
+#endif
+
+#if (defined(JEMALLOC_ENABLE_INLINE) || defined(JEMALLOC_C_))
+JEMALLOC_INLINE void *
+imalloc(size_t size)
+{
+
+	assert(size != 0);
+
+	if (size <= arena_maxclass)
+		return (arena_malloc(size, false));
+	else
+		return (huge_malloc(size, false));
+}
+
+JEMALLOC_INLINE void *
+icalloc(size_t size)
+{
+
+	if (size <= arena_maxclass)
+		return (arena_malloc(size, true));
+	else
+		return (huge_malloc(size, true));
+}
+
+JEMALLOC_INLINE void *
+ipalloc(size_t alignment, size_t size)
+{
+	void *ret;
+	size_t ceil_size;
+
+	/*
+	 * Round size up to the nearest multiple of alignment.
+	 *
+	 * This done, we can take advantage of the fact that for each small
+	 * size class, every object is aligned at the smallest power of two
+	 * that is non-zero in the base two representation of the size.  For
+	 * example:
+	 *
+	 *   Size |   Base 2 | Minimum alignment
+	 *   -----+----------+------------------
+	 *     96 |  1100000 |  32
+	 *    144 | 10100000 |  32
+	 *    192 | 11000000 |  64
+	 *
+	 * Depending on runtime settings, it is possible that arena_malloc()
+	 * will further round up to a power of two, but that never causes
+	 * correctness issues.
+	 */
+	ceil_size = (size + (alignment - 1)) & (-alignment);
+	/*
+	 * (ceil_size < size) protects against the combination of maximal
+	 * alignment and size greater than maximal alignment.
+	 */
+	if (ceil_size < size) {
+		/* size_t overflow. */
+		return (NULL);
+	}
+
+	if (ceil_size <= PAGE_SIZE || (alignment <= PAGE_SIZE
+	    && ceil_size <= arena_maxclass))
+		ret = arena_malloc(ceil_size, false);
+	else {
+		size_t run_size;
+
+		/*
+		 * We can't achieve subpage alignment, so round up alignment
+		 * permanently; it makes later calculations simpler.
+		 */
+		alignment = PAGE_CEILING(alignment);
+		ceil_size = PAGE_CEILING(size);
+		/*
+		 * (ceil_size < size) protects against very large sizes within
+		 * PAGE_SIZE of SIZE_T_MAX.
+		 *
+		 * (ceil_size + alignment < ceil_size) protects against the
+		 * combination of maximal alignment and ceil_size large enough
+		 * to cause overflow.  This is similar to the first overflow
+		 * check above, but it needs to be repeated due to the new
+		 * ceil_size value, which may now be *equal* to maximal
+		 * alignment, whereas before we only detected overflow if the
+		 * original size was *greater* than maximal alignment.
+		 */
+		if (ceil_size < size || ceil_size + alignment < ceil_size) {
+			/* size_t overflow. */
+			return (NULL);
+		}
+
+		/*
+		 * Calculate the size of the over-size run that arena_palloc()
+		 * would need to allocate in order to guarantee the alignment.
+		 */
+		if (ceil_size >= alignment)
+			run_size = ceil_size + alignment - PAGE_SIZE;
+		else {
+			/*
+			 * It is possible that (alignment << 1) will cause
+			 * overflow, but it doesn't matter because we also
+			 * subtract PAGE_SIZE, which in the case of overflow
+			 * leaves us with a very large run_size.  That causes
+			 * the first conditional below to fail, which means
+			 * that the bogus run_size value never gets used for
+			 * anything important.
+			 */
+			run_size = (alignment << 1) - PAGE_SIZE;
+		}
+
+		if (run_size <= arena_maxclass) {
+			ret = arena_palloc(choose_arena(), alignment, ceil_size,
+			    run_size);
+		} else if (alignment <= chunksize)
+			ret = huge_malloc(ceil_size, false);
+		else
+			ret = huge_palloc(alignment, ceil_size);
+	}
+
+	assert(((uintptr_t)ret & (alignment - 1)) == 0);
+	return (ret);
+}
+
+JEMALLOC_INLINE size_t
+isalloc(const void *ptr)
+{
+	size_t ret;
+	arena_chunk_t *chunk;
+
+	assert(ptr != NULL);
+
+	chunk = (arena_chunk_t *)CHUNK_ADDR2BASE(ptr);
+	if (chunk != ptr) {
+		/* Region. */
+		assert(chunk->arena->magic == ARENA_MAGIC);
+
+#ifdef JEMALLOC_PROF
+		ret = arena_salloc_demote(ptr);
+#else
+		ret = arena_salloc(ptr);
+#endif
+	} else
+		ret = huge_salloc(ptr);
+
+	return (ret);
+}
+
+JEMALLOC_INLINE void *
+iralloc(void *ptr, size_t size)
+{
+	size_t oldsize;
+
+	assert(ptr != NULL);
+	assert(size != 0);
+
+	oldsize = isalloc(ptr);
+
+	if (size <= arena_maxclass)
+		return (arena_ralloc(ptr, size, oldsize));
+	else
+		return (huge_ralloc(ptr, size, oldsize));
+}
+
+JEMALLOC_INLINE void
+idalloc(void *ptr)
+{
+	arena_chunk_t *chunk;
+
+	assert(ptr != NULL);
+
+	chunk = (arena_chunk_t *)CHUNK_ADDR2BASE(ptr);
+	if (chunk != ptr)
+		arena_dalloc(chunk->arena, chunk, ptr);
+	else
+		huge_dalloc(ptr);
+}
+#endif
+
+#undef JEMALLOC_H_INLINES
+/******************************************************************************/
diff --git a/externals/jemalloc/jemalloc/internal/mb.h b/externals/jemalloc/jemalloc/internal/mb.h
new file mode 100644
index 00000000000..1707aa91d68
--- /dev/null
+++ b/externals/jemalloc/jemalloc/internal/mb.h
@@ -0,0 +1,108 @@
+/******************************************************************************/
+#ifdef JEMALLOC_H_TYPES
+
+#endif /* JEMALLOC_H_TYPES */
+/******************************************************************************/
+#ifdef JEMALLOC_H_STRUCTS
+
+#endif /* JEMALLOC_H_STRUCTS */
+/******************************************************************************/
+#ifdef JEMALLOC_H_EXTERNS
+
+#endif /* JEMALLOC_H_EXTERNS */
+/******************************************************************************/
+#ifdef JEMALLOC_H_INLINES
+
+#ifndef JEMALLOC_ENABLE_INLINE
+void	mb_write(void);
+#endif
+
+#if (defined(JEMALLOC_ENABLE_INLINE) || defined(MB_C_))
+#ifdef __i386__
+/*
+ * According to the Intel Architecture Software Developer's Manual, current
+ * processors execute instructions in order from the perspective of other
+ * processors in a multiprocessor system, but 1) Intel reserves the right to
+ * change that, and 2) the compiler's optimizer could re-order instructions if
+ * there weren't some form of barrier.  Therefore, even if running on an
+ * architecture that does not need memory barriers (everything through at least
+ * i686), an "optimizer barrier" is necessary.
+ */
+JEMALLOC_INLINE void
+mb_write(void)
+{
+
+#  if 0
+	/* This is a true memory barrier. */
+	asm volatile ("pusha;"
+	    "xor  %%eax,%%eax;"
+	    "cpuid;"
+	    "popa;"
+	    : /* Outputs. */
+	    : /* Inputs. */
+	    : "memory" /* Clobbers. */
+	    );
+#else
+	/*
+	 * This is hopefully enough to keep the compiler from reordering
+	 * instructions around this one.
+	 */
+	asm volatile ("nop;"
+	    : /* Outputs. */
+	    : /* Inputs. */
+	    : "memory" /* Clobbers. */
+	    );
+#endif
+}
+#elif (defined(__amd64_) || defined(__x86_64__))
+JEMALLOC_INLINE void
+mb_write(void)
+{
+
+	asm volatile ("sfence"
+	    : /* Outputs. */
+	    : /* Inputs. */
+	    : "memory" /* Clobbers. */
+	    );
+}
+#elif defined(__powerpc__)
+JEMALLOC_INLINE void
+mb_write(void)
+{
+
+	asm volatile ("eieio"
+	    : /* Outputs. */
+	    : /* Inputs. */
+	    : "memory" /* Clobbers. */
+	    );
+}
+#elif defined(__sparc64__)
+JEMALLOC_INLINE void
+mb_write(void)
+{
+
+	asm volatile ("membar #StoreStore"
+	    : /* Outputs. */
+	    : /* Inputs. */
+	    : "memory" /* Clobbers. */
+	    );
+}
+#else
+/*
+ * This is much slower than a simple memory barrier, but the semantics of mutex
+ * unlock make this work.
+ */
+JEMALLOC_INLINE void
+mb_write(void)
+{
+	malloc_mutex_t mtx;
+
+	malloc_mutex_init(&mtx);
+	malloc_mutex_lock(&mtx);
+	malloc_mutex_unlock(&mtx);
+}
+#endif
+#endif
+
+#endif /* JEMALLOC_H_INLINES */
+/******************************************************************************/
diff --git a/externals/jemalloc/jemalloc/internal/mutex.h b/externals/jemalloc/jemalloc/internal/mutex.h
new file mode 100644
index 00000000000..108bfa8abfd
--- /dev/null
+++ b/externals/jemalloc/jemalloc/internal/mutex.h
@@ -0,0 +1,61 @@
+/******************************************************************************/
+#ifdef JEMALLOC_H_TYPES
+
+typedef pthread_mutex_t malloc_mutex_t;
+
+#endif /* JEMALLOC_H_TYPES */
+/******************************************************************************/
+#ifdef JEMALLOC_H_STRUCTS
+
+#endif /* JEMALLOC_H_STRUCTS */
+/******************************************************************************/
+#ifdef JEMALLOC_H_EXTERNS
+
+#ifdef JEMALLOC_LAZY_LOCK
+extern bool isthreaded;
+#else
+#  define isthreaded true
+#endif
+
+bool	malloc_mutex_init(malloc_mutex_t *mutex);
+
+#endif /* JEMALLOC_H_EXTERNS */
+/******************************************************************************/
+#ifdef JEMALLOC_H_INLINES
+
+#ifndef JEMALLOC_ENABLE_INLINE
+void	malloc_mutex_lock(malloc_mutex_t *mutex);
+bool	malloc_mutex_trylock(malloc_mutex_t *mutex);
+void	malloc_mutex_unlock(malloc_mutex_t *mutex);
+#endif
+
+#if (defined(JEMALLOC_ENABLE_INLINE) || defined(JEMALLOC_MUTEX_C_))
+JEMALLOC_INLINE void
+malloc_mutex_lock(malloc_mutex_t *mutex)
+{
+
+	if (isthreaded)
+		pthread_mutex_lock(mutex);
+}
+
+JEMALLOC_INLINE bool
+malloc_mutex_trylock(malloc_mutex_t *mutex)
+{
+
+	if (isthreaded)
+		return (pthread_mutex_trylock(mutex) != 0);
+	else
+		return (false);
+}
+
+JEMALLOC_INLINE void
+malloc_mutex_unlock(malloc_mutex_t *mutex)
+{
+
+	if (isthreaded)
+		pthread_mutex_unlock(mutex);
+}
+#endif
+
+#endif /* JEMALLOC_H_INLINES */
+/******************************************************************************/
diff --git a/externals/jemalloc/jemalloc/internal/prof.h b/externals/jemalloc/jemalloc/internal/prof.h
new file mode 100644
index 00000000000..6e71552d85e
--- /dev/null
+++ b/externals/jemalloc/jemalloc/internal/prof.h
@@ -0,0 +1,171 @@
+#ifdef JEMALLOC_PROF
+/******************************************************************************/
+#ifdef JEMALLOC_H_TYPES
+
+typedef struct prof_bt_s prof_bt_t;
+typedef struct prof_cnt_s prof_cnt_t;
+typedef struct prof_thr_cnt_s prof_thr_cnt_t;
+typedef struct prof_ctx_s prof_ctx_t;
+typedef struct prof_s prof_t;
+
+/* Option defaults. */
+#define	LG_PROF_BT_MAX_DEFAULT		2
+#define	LG_PROF_SAMPLE_DEFAULT		0
+#define	LG_PROF_INTERVAL_DEFAULT	30
+
+/*
+ * Hard limit on stack backtrace depth.  Note that the version of
+ * prof_backtrace() that is based on __builtin_return_address() necessarily has
+ * a hard-coded number of backtrace frame handlers, so increasing
+ * LG_PROF_BT_MAX requires changing prof_backtrace().
+ */
+#define	LG_PROF_BT_MAX		7 /* >= LG_PROF_BT_MAX_DEFAULT */
+#define	PROF_BT_MAX		(1U << LG_PROF_BT_MAX)
+
+/* Initial hash table size. */
+#define	PROF_CKH_MINITEMS	64
+
+/* Size of memory buffer to use when writing dump files. */
+#define	PROF_DUMP_BUF_SIZE	65536
+
+#endif /* JEMALLOC_H_TYPES */
+/******************************************************************************/
+#ifdef JEMALLOC_H_STRUCTS
+
+struct prof_bt_s {
+	/* Backtrace, stored as len program counters. */
+	void			**vec;
+	unsigned		len;
+};
+
+#ifdef JEMALLOC_PROF_LIBGCC
+/* Data structure passed to libgcc _Unwind_Backtrace() callback functions. */
+typedef struct {
+	prof_bt_t *bt;
+	unsigned nignore;
+	unsigned max;
+} prof_unwind_data_t;
+#endif
+
+struct prof_cnt_s {
+	/*
+	 * Profiling counters.  An allocation/deallocation pair can operate on
+	 * different prof_thr_cnt_t objects that are linked into the same
+	 * prof_ctx_t sets_ql, so it is possible for the cur* counters to go
+	 * negative.  In principle it is possible for the *bytes counters to
+	 * overflow/underflow, but a general solution would require some form
+	 * of 128-bit counter solution; this implementation doesn't bother to
+	 * solve that problem.
+	 */
+	int64_t		curobjs;
+	int64_t		curbytes;
+	uint64_t	accumobjs;
+	uint64_t	accumbytes;
+};
+
+struct prof_thr_cnt_s {
+	/* Linkage into prof_ctx_t's sets_ql. */
+	ql_elm(prof_thr_cnt_t)	link;
+
+	/*
+	 * Associated context.  If a thread frees an object that it did not
+	 * allocate, it is possible that the context is not cached in the
+	 * thread's hash table, in which case it must be able to look up the
+	 * context, insert a new prof_thr_cnt_t into the thread's hash table,
+	 * and link it into the prof_ctx_t's sets_ql.
+	 */
+	prof_ctx_t		*ctx;
+
+	/*
+	 * Threads use memory barriers to update the counters.  Since there is
+	 * only ever one writer, the only challenge is for the reader to get a
+	 * consistent read of the counters.
+	 *
+	 * The writer uses this series of operations:
+	 *
+	 * 1) Increment epoch to an odd number.
+	 * 2) Update counters.
+	 * 3) Increment epoch to an even number.
+	 *
+	 * The reader must assure 1) that the epoch is even while it reads the
+	 * counters, and 2) that the epoch doesn't change between the time it
+	 * starts and finishes reading the counters.
+	 */
+	unsigned		epoch;
+
+	/* Profiling counters. */
+	prof_cnt_t		cnts;
+};
+
+struct prof_ctx_s {
+	/* Protects cnt_merged and sets_ql. */
+	malloc_mutex_t		lock;
+
+	/* Temporary storage for aggregation during dump. */
+	prof_cnt_t		cnt_dump;
+
+	/* When threads exit, they merge their stats into cnt_merged. */
+	prof_cnt_t		cnt_merged;
+
+	/*
+	 * List of profile counters, one for each thread that has allocated in
+	 * this context.
+	 */
+	ql_head(prof_thr_cnt_t)	cnts_ql;
+};
+
+#endif /* JEMALLOC_H_STRUCTS */
+/******************************************************************************/
+#ifdef JEMALLOC_H_EXTERNS
+
+extern bool	opt_prof;
+/*
+ * Even if opt_prof is true, sampling can be temporarily disabled by setting
+ * opt_prof_active to false.  No locking is used when updating opt_prof_active,
+ * so there are no guarantees regarding how long it will take for all threads
+ * to notice state changes.
+ */
+extern bool	opt_prof_active;
+extern size_t	opt_lg_prof_bt_max; /* Maximum backtrace depth. */
+extern size_t	opt_lg_prof_sample; /* Mean bytes between samples. */
+extern ssize_t	opt_lg_prof_interval; /* lg(prof_interval). */
+extern bool	opt_prof_udump; /* High-water memory dumping. */
+extern bool	opt_prof_leak; /* Dump leak summary at exit. */
+
+/*
+ * Profile dump interval, measured in bytes allocated.  Each arena triggers a
+ * profile dump when it reaches this threshold.  The effect is that the
+ * interval between profile dumps averages prof_interval, though the actual
+ * interval between dumps will tend to be sporadic, and the interval will be a
+ * maximum of approximately (prof_interval * narenas).
+ */
+extern uint64_t	prof_interval;
+
+/*
+ * If true, promote small sampled objects to large objects, since small run
+ * headers do not have embedded profile context pointers.
+ */
+extern bool	prof_promote;
+
+bool	prof_init(prof_t *prof, bool master);
+void	prof_destroy(prof_t *prof);
+
+prof_thr_cnt_t	*prof_alloc_prep(size_t size);
+prof_thr_cnt_t	*prof_cnt_get(const void *ptr);
+void	prof_malloc(const void *ptr, prof_thr_cnt_t *cnt);
+void	prof_realloc(const void *ptr, prof_thr_cnt_t *cnt, const void *old_ptr,
+    size_t old_size, prof_thr_cnt_t *old_cnt);
+void	prof_free(const void *ptr);
+void	prof_idump(void);
+bool	prof_mdump(const char *filename);
+void	prof_udump(void);
+void	prof_boot0(void);
+bool	prof_boot1(void);
+
+#endif /* JEMALLOC_H_EXTERNS */
+/******************************************************************************/
+#ifdef JEMALLOC_H_INLINES
+
+#endif /* JEMALLOC_H_INLINES */
+/******************************************************************************/
+#endif /* JEMALLOC_PROF */
diff --git a/externals/jemalloc/jemalloc/internal/ql.h b/externals/jemalloc/jemalloc/internal/ql.h
new file mode 100644
index 00000000000..a9ed2393f0c
--- /dev/null
+++ b/externals/jemalloc/jemalloc/internal/ql.h
@@ -0,0 +1,83 @@
+/*
+ * List definitions.
+ */
+#define ql_head(a_type)							\
+struct {								\
+	a_type *qlh_first;						\
+}
+
+#define ql_head_initializer(a_head) {NULL}
+
+#define ql_elm(a_type)	qr(a_type)
+
+/* List functions. */
+#define ql_new(a_head) do {						\
+	(a_head)->qlh_first = NULL;					\
+} while (0)
+
+#define ql_elm_new(a_elm, a_field) qr_new((a_elm), a_field)
+
+#define ql_first(a_head) ((a_head)->qlh_first)
+
+#define ql_last(a_head, a_field)					\
+	((ql_first(a_head) != NULL)					\
+	    ? qr_prev(ql_first(a_head), a_field) : NULL)
+
+#define ql_next(a_head, a_elm, a_field)					\
+	((ql_last(a_head, a_field) != (a_elm))				\
+	    ? qr_next((a_elm), a_field)	: NULL)
+
+#define ql_prev(a_head, a_elm, a_field)					\
+	((ql_first(a_head) != (a_elm)) ? qr_prev((a_elm), a_field)	\
+				       : NULL)
+
+#define ql_before_insert(a_head, a_qlelm, a_elm, a_field) do {		\
+	qr_before_insert((a_qlelm), (a_elm), a_field);			\
+	if (ql_first(a_head) == (a_qlelm)) {				\
+		ql_first(a_head) = (a_elm);				\
+	}								\
+} while (0)
+
+#define ql_after_insert(a_qlelm, a_elm, a_field)			\
+	qr_after_insert((a_qlelm), (a_elm), a_field)
+
+#define ql_head_insert(a_head, a_elm, a_field) do {			\
+	if (ql_first(a_head) != NULL) {					\
+		qr_before_insert(ql_first(a_head), (a_elm), a_field);	\
+	}								\
+	ql_first(a_head) = (a_elm);					\
+} while (0)
+
+#define ql_tail_insert(a_head, a_elm, a_field) do {			\
+	if (ql_first(a_head) != NULL) {					\
+		qr_before_insert(ql_first(a_head), (a_elm), a_field);	\
+	}								\
+	ql_first(a_head) = qr_next((a_elm), a_field);			\
+} while (0)
+
+#define ql_remove(a_head, a_elm, a_field) do {				\
+	if (ql_first(a_head) == (a_elm)) {				\
+		ql_first(a_head) = qr_next(ql_first(a_head), a_field);	\
+	}								\
+	if (ql_first(a_head) != (a_elm)) {				\
+		qr_remove((a_elm), a_field);				\
+	} else {							\
+		ql_first(a_head) = NULL;				\
+	}								\
+} while (0)
+
+#define ql_head_remove(a_head, a_type, a_field) do {			\
+	a_type *t = ql_first(a_head);					\
+	ql_remove((a_head), t, a_field);				\
+} while (0)
+
+#define ql_tail_remove(a_head, a_type, a_field) do {			\
+	a_type *t = ql_last(a_head, a_field);				\
+	ql_remove((a_head), t, a_field);				\
+} while (0)
+
+#define ql_foreach(a_var, a_head, a_field)				\
+	qr_foreach((a_var), ql_first(a_head), a_field)
+
+#define ql_reverse_foreach(a_var, a_head, a_field)			\
+	qr_reverse_foreach((a_var), ql_first(a_head), a_field)
diff --git a/externals/jemalloc/jemalloc/internal/qr.h b/externals/jemalloc/jemalloc/internal/qr.h
new file mode 100644
index 00000000000..fe22352fedd
--- /dev/null
+++ b/externals/jemalloc/jemalloc/internal/qr.h
@@ -0,0 +1,67 @@
+/* Ring definitions. */
+#define qr(a_type)							\
+struct {								\
+	a_type	*qre_next;						\
+	a_type	*qre_prev;						\
+}
+
+/* Ring functions. */
+#define qr_new(a_qr, a_field) do {					\
+	(a_qr)->a_field.qre_next = (a_qr);				\
+	(a_qr)->a_field.qre_prev = (a_qr);				\
+} while (0)
+
+#define qr_next(a_qr, a_field) ((a_qr)->a_field.qre_next)
+
+#define qr_prev(a_qr, a_field) ((a_qr)->a_field.qre_prev)
+
+#define qr_before_insert(a_qrelm, a_qr, a_field) do {			\
+	(a_qr)->a_field.qre_prev = (a_qrelm)->a_field.qre_prev;		\
+	(a_qr)->a_field.qre_next = (a_qrelm);				\
+	(a_qr)->a_field.qre_prev->a_field.qre_next = (a_qr);		\
+	(a_qrelm)->a_field.qre_prev = (a_qr);				\
+} while (0)
+
+#define qr_after_insert(a_qrelm, a_qr, a_field)				\
+    do									\
+    {									\
+	(a_qr)->a_field.qre_next = (a_qrelm)->a_field.qre_next;		\
+	(a_qr)->a_field.qre_prev = (a_qrelm);				\
+	(a_qr)->a_field.qre_next->a_field.qre_prev = (a_qr);		\
+	(a_qrelm)->a_field.qre_next = (a_qr);				\
+    } while (0)
+
+#define qr_meld(a_qr_a, a_qr_b, a_field) do {				\
+	void *t;							\
+	(a_qr_a)->a_field.qre_prev->a_field.qre_next = (a_qr_b);	\
+	(a_qr_b)->a_field.qre_prev->a_field.qre_next = (a_qr_a);	\
+	t = (a_qr_a)->a_field.qre_prev;					\
+	(a_qr_a)->a_field.qre_prev = (a_qr_b)->a_field.qre_prev;	\
+	(a_qr_b)->a_field.qre_prev = t;					\
+} while (0)
+
+/* qr_meld() and qr_split() are functionally equivalent, so there's no need to
+ * have two copies of the code. */
+#define qr_split(a_qr_a, a_qr_b, a_field)				\
+	qr_meld((a_qr_a), (a_qr_b), a_field)
+
+#define qr_remove(a_qr, a_field) do {					\
+	(a_qr)->a_field.qre_prev->a_field.qre_next			\
+	    = (a_qr)->a_field.qre_next;					\
+	(a_qr)->a_field.qre_next->a_field.qre_prev			\
+	    = (a_qr)->a_field.qre_prev;					\
+	(a_qr)->a_field.qre_next = (a_qr);				\
+	(a_qr)->a_field.qre_prev = (a_qr);				\
+} while (0)
+
+#define qr_foreach(var, a_qr, a_field)					\
+	for ((var) = (a_qr);						\
+	    (var) != NULL;						\
+	    (var) = (((var)->a_field.qre_next != (a_qr))		\
+	    ? (var)->a_field.qre_next : NULL))
+
+#define qr_reverse_foreach(var, a_qr, a_field)				\
+	for ((var) = ((a_qr) != NULL) ? qr_prev(a_qr, a_field) : NULL;	\
+	    (var) != NULL;						\
+	    (var) = (((var) != (a_qr))					\
+	    ? (var)->a_field.qre_prev : NULL))
diff --git a/externals/jemalloc/jemalloc/internal/rb.h b/externals/jemalloc/jemalloc/internal/rb.h
new file mode 100644
index 00000000000..ee9b009d235
--- /dev/null
+++ b/externals/jemalloc/jemalloc/internal/rb.h
@@ -0,0 +1,973 @@
+/*-
+ *******************************************************************************
+ *
+ * cpp macro implementation of left-leaning 2-3 red-black trees.  Parent
+ * pointers are not used, and color bits are stored in the least significant
+ * bit of right-child pointers (if RB_COMPACT is defined), thus making node
+ * linkage as compact as is possible for red-black trees.
+ *
+ * Usage:
+ *
+ *   #include 
+ *   #include 
+ *   #define NDEBUG // (Optional, see assert(3).)
+ *   #include 
+ *   #define RB_COMPACT // (Optional, embed color bits in right-child pointers.)
+ *   #include 
+ *   ...
+ *
+ *******************************************************************************
+ */
+
+#ifndef RB_H_
+#define	RB_H_
+
+#if 0
+__FBSDID("$FreeBSD: head/lib/libc/stdlib/rb.h 204493 2010-02-28 22:57:13Z jasone $");
+#endif
+
+#ifdef RB_COMPACT
+/* Node structure. */
+#define	rb_node(a_type)							\
+struct {								\
+    a_type *rbn_left;							\
+    a_type *rbn_right_red;						\
+}
+#else
+#define	rb_node(a_type)							\
+struct {								\
+    a_type *rbn_left;							\
+    a_type *rbn_right;							\
+    bool rbn_red;							\
+}
+#endif
+
+/* Root structure. */
+#define	rb_tree(a_type)							\
+struct {								\
+    a_type *rbt_root;							\
+    a_type rbt_nil;							\
+}
+
+/* Left accessors. */
+#define	rbtn_left_get(a_type, a_field, a_node)				\
+    ((a_node)->a_field.rbn_left)
+#define	rbtn_left_set(a_type, a_field, a_node, a_left) do {		\
+    (a_node)->a_field.rbn_left = a_left;				\
+} while (0)
+
+#ifdef RB_COMPACT
+/* Right accessors. */
+#define	rbtn_right_get(a_type, a_field, a_node)				\
+    ((a_type *) (((intptr_t) (a_node)->a_field.rbn_right_red)		\
+      & ((ssize_t)-2)))
+#define	rbtn_right_set(a_type, a_field, a_node, a_right) do {		\
+    (a_node)->a_field.rbn_right_red = (a_type *) (((uintptr_t) a_right)	\
+      | (((uintptr_t) (a_node)->a_field.rbn_right_red) & ((size_t)1)));	\
+} while (0)
+
+/* Color accessors. */
+#define	rbtn_red_get(a_type, a_field, a_node)				\
+    ((bool) (((uintptr_t) (a_node)->a_field.rbn_right_red)		\
+      & ((size_t)1)))
+#define	rbtn_color_set(a_type, a_field, a_node, a_red) do {		\
+    (a_node)->a_field.rbn_right_red = (a_type *) ((((intptr_t)		\
+      (a_node)->a_field.rbn_right_red) & ((ssize_t)-2))			\
+      | ((ssize_t)a_red));						\
+} while (0)
+#define	rbtn_red_set(a_type, a_field, a_node) do {			\
+    (a_node)->a_field.rbn_right_red = (a_type *) (((uintptr_t)		\
+      (a_node)->a_field.rbn_right_red) | ((size_t)1));			\
+} while (0)
+#define	rbtn_black_set(a_type, a_field, a_node) do {			\
+    (a_node)->a_field.rbn_right_red = (a_type *) (((intptr_t)		\
+      (a_node)->a_field.rbn_right_red) & ((ssize_t)-2));		\
+} while (0)
+#else
+/* Right accessors. */
+#define	rbtn_right_get(a_type, a_field, a_node)				\
+    ((a_node)->a_field.rbn_right)
+#define	rbtn_right_set(a_type, a_field, a_node, a_right) do {		\
+    (a_node)->a_field.rbn_right = a_right;				\
+} while (0)
+
+/* Color accessors. */
+#define	rbtn_red_get(a_type, a_field, a_node)				\
+    ((a_node)->a_field.rbn_red)
+#define	rbtn_color_set(a_type, a_field, a_node, a_red) do {		\
+    (a_node)->a_field.rbn_red = (a_red);				\
+} while (0)
+#define	rbtn_red_set(a_type, a_field, a_node) do {			\
+    (a_node)->a_field.rbn_red = true;					\
+} while (0)
+#define	rbtn_black_set(a_type, a_field, a_node) do {			\
+    (a_node)->a_field.rbn_red = false;					\
+} while (0)
+#endif
+
+/* Node initializer. */
+#define	rbt_node_new(a_type, a_field, a_rbt, a_node) do {		\
+    rbtn_left_set(a_type, a_field, (a_node), &(a_rbt)->rbt_nil);	\
+    rbtn_right_set(a_type, a_field, (a_node), &(a_rbt)->rbt_nil);	\
+    rbtn_red_set(a_type, a_field, (a_node));				\
+} while (0)
+
+/* Tree initializer. */
+#define	rb_new(a_type, a_field, a_rbt) do {				\
+    (a_rbt)->rbt_root = &(a_rbt)->rbt_nil;				\
+    rbt_node_new(a_type, a_field, a_rbt, &(a_rbt)->rbt_nil);		\
+    rbtn_black_set(a_type, a_field, &(a_rbt)->rbt_nil);			\
+} while (0)
+
+/* Internal utility macros. */
+#define	rbtn_first(a_type, a_field, a_rbt, a_root, r_node) do {		\
+    (r_node) = (a_root);						\
+    if ((r_node) != &(a_rbt)->rbt_nil) {				\
+	for (;								\
+	  rbtn_left_get(a_type, a_field, (r_node)) != &(a_rbt)->rbt_nil;\
+	  (r_node) = rbtn_left_get(a_type, a_field, (r_node))) {	\
+	}								\
+    }									\
+} while (0)
+
+#define	rbtn_last(a_type, a_field, a_rbt, a_root, r_node) do {		\
+    (r_node) = (a_root);						\
+    if ((r_node) != &(a_rbt)->rbt_nil) {				\
+	for (; rbtn_right_get(a_type, a_field, (r_node)) !=		\
+	  &(a_rbt)->rbt_nil; (r_node) = rbtn_right_get(a_type, a_field,	\
+	  (r_node))) {							\
+	}								\
+    }									\
+} while (0)
+
+#define	rbtn_rotate_left(a_type, a_field, a_node, r_node) do {		\
+    (r_node) = rbtn_right_get(a_type, a_field, (a_node));		\
+    rbtn_right_set(a_type, a_field, (a_node),				\
+      rbtn_left_get(a_type, a_field, (r_node)));			\
+    rbtn_left_set(a_type, a_field, (r_node), (a_node));			\
+} while (0)
+
+#define	rbtn_rotate_right(a_type, a_field, a_node, r_node) do {		\
+    (r_node) = rbtn_left_get(a_type, a_field, (a_node));		\
+    rbtn_left_set(a_type, a_field, (a_node),				\
+      rbtn_right_get(a_type, a_field, (r_node)));			\
+    rbtn_right_set(a_type, a_field, (r_node), (a_node));		\
+} while (0)
+
+/*
+ * The rb_proto() macro generates function prototypes that correspond to the
+ * functions generated by an equivalently parameterized call to rb_gen().
+ */
+
+#define	rb_proto(a_attr, a_prefix, a_rbt_type, a_type)			\
+a_attr void								\
+a_prefix##new(a_rbt_type *rbtree);					\
+a_attr a_type *								\
+a_prefix##first(a_rbt_type *rbtree);					\
+a_attr a_type *								\
+a_prefix##last(a_rbt_type *rbtree);					\
+a_attr a_type *								\
+a_prefix##next(a_rbt_type *rbtree, a_type *node);			\
+a_attr a_type *								\
+a_prefix##prev(a_rbt_type *rbtree, a_type *node);			\
+a_attr a_type *								\
+a_prefix##search(a_rbt_type *rbtree, a_type *key);			\
+a_attr a_type *								\
+a_prefix##nsearch(a_rbt_type *rbtree, a_type *key);			\
+a_attr a_type *								\
+a_prefix##psearch(a_rbt_type *rbtree, a_type *key);			\
+a_attr void								\
+a_prefix##insert(a_rbt_type *rbtree, a_type *node);			\
+a_attr void								\
+a_prefix##remove(a_rbt_type *rbtree, a_type *node);			\
+a_attr a_type *								\
+a_prefix##iter(a_rbt_type *rbtree, a_type *start, a_type *(*cb)(	\
+  a_rbt_type *, a_type *, void *), void *arg);				\
+a_attr a_type *								\
+a_prefix##reverse_iter(a_rbt_type *rbtree, a_type *start,		\
+  a_type *(*cb)(a_rbt_type *, a_type *, void *), void *arg);
+
+/*
+ * The rb_gen() macro generates a type-specific red-black tree implementation,
+ * based on the above cpp macros.
+ *
+ * Arguments:
+ *
+ *   a_attr    : Function attribute for generated functions (ex: static).
+ *   a_prefix  : Prefix for generated functions (ex: ex_).
+ *   a_rb_type : Type for red-black tree data structure (ex: ex_t).
+ *   a_type    : Type for red-black tree node data structure (ex: ex_node_t).
+ *   a_field   : Name of red-black tree node linkage (ex: ex_link).
+ *   a_cmp     : Node comparison function name, with the following prototype:
+ *                 int (a_cmp *)(a_type *a_node, a_type *a_other);
+ *                                       ^^^^^^
+ *                                    or a_key
+ *               Interpretation of comparision function return values:
+ *                 -1 : a_node <  a_other
+ *                  0 : a_node == a_other
+ *                  1 : a_node >  a_other
+ *               In all cases, the a_node or a_key macro argument is the first
+ *               argument to the comparison function, which makes it possible
+ *               to write comparison functions that treat the first argument
+ *               specially.
+ *
+ * Assuming the following setup:
+ *
+ *   typedef struct ex_node_s ex_node_t;
+ *   struct ex_node_s {
+ *       rb_node(ex_node_t) ex_link;
+ *   };
+ *   typedef rb_tree(ex_node_t) ex_t;
+ *   rb_gen(static, ex_, ex_t, ex_node_t, ex_link, ex_cmp)
+ *
+ * The following API is generated:
+ *
+ *   static void
+ *   ex_new(ex_t *extree);
+ *       Description: Initialize a red-black tree structure.
+ *       Args:
+ *         extree: Pointer to an uninitialized red-black tree object.
+ *
+ *   static ex_node_t *
+ *   ex_first(ex_t *extree);
+ *   static ex_node_t *
+ *   ex_last(ex_t *extree);
+ *       Description: Get the first/last node in extree.
+ *       Args:
+ *         extree: Pointer to an initialized red-black tree object.
+ *       Ret: First/last node in extree, or NULL if extree is empty.
+ *
+ *   static ex_node_t *
+ *   ex_next(ex_t *extree, ex_node_t *node);
+ *   static ex_node_t *
+ *   ex_prev(ex_t *extree, ex_node_t *node);
+ *       Description: Get node's successor/predecessor.
+ *       Args:
+ *         extree: Pointer to an initialized red-black tree object.
+ *         node : A node in extree.
+ *       Ret: node's successor/predecessor in extree, or NULL if node is
+ *            last/first.
+ *
+ *   static ex_node_t *
+ *   ex_search(ex_t *extree, ex_node_t *key);
+ *       Description: Search for node that matches key.
+ *       Args:
+ *         extree: Pointer to an initialized red-black tree object.
+ *         key  : Search key.
+ *       Ret: Node in extree that matches key, or NULL if no match.
+ *
+ *   static ex_node_t *
+ *   ex_nsearch(ex_t *extree, ex_node_t *key);
+ *   static ex_node_t *
+ *   ex_psearch(ex_t *extree, ex_node_t *key);
+ *       Description: Search for node that matches key.  If no match is found,
+ *                    return what would be key's successor/predecessor, were
+ *                    key in extree.
+ *       Args:
+ *         extree: Pointer to an initialized red-black tree object.
+ *         key   : Search key.
+ *       Ret: Node in extree that matches key, or if no match, hypothetical
+ *            node's successor/predecessor (NULL if no successor/predecessor).
+ *
+ *   static void
+ *   ex_insert(ex_t *extree, ex_node_t *node);
+ *       Description: Insert node into extree.
+ *       Args:
+ *         extree: Pointer to an initialized red-black tree object.
+ *         node  : Node to be inserted into extree.
+ *
+ *   static void
+ *   ex_remove(ex_t *extree, ex_node_t *node);
+ *       Description: Remove node from extree.
+ *       Args:
+ *         extree: Pointer to an initialized red-black tree object.
+ *         node  : Node in extree to be removed.
+ *
+ *   static ex_node_t *
+ *   ex_iter(ex_t *extree, ex_node_t *start, ex_node_t *(*cb)(ex_t *,
+ *     ex_node_t *, void *), void *arg);
+ *   static ex_node_t *
+ *   ex_reverse_iter(ex_t *extree, ex_node_t *start, ex_node *(*cb)(ex_t *,
+ *     ex_node_t *, void *), void *arg);
+ *       Description: Iterate forward/backward over extree, starting at node.
+ *                    If extree is modified, iteration must be immediately
+ *                    terminated by the callback function that causes the
+ *                    modification.
+ *       Args:
+ *         extree: Pointer to an initialized red-black tree object.
+ *         start : Node at which to start iteration, or NULL to start at
+ *                 first/last node.
+ *         cb    : Callback function, which is called for each node during
+ *                 iteration.  Under normal circumstances the callback function
+ *                 should return NULL, which causes iteration to continue.  If a
+ *                 callback function returns non-NULL, iteration is immediately
+ *                 terminated and the non-NULL return value is returned by the
+ *                 iterator.  This is useful for re-starting iteration after
+ *                 modifying extree.
+ *         arg   : Opaque pointer passed to cb().
+ *       Ret: NULL if iteration completed, or the non-NULL callback return value
+ *            that caused termination of the iteration.
+ */
+#define	rb_gen(a_attr, a_prefix, a_rbt_type, a_type, a_field, a_cmp)	\
+a_attr void								\
+a_prefix##new(a_rbt_type *rbtree) {					\
+    rb_new(a_type, a_field, rbtree);					\
+}									\
+a_attr a_type *								\
+a_prefix##first(a_rbt_type *rbtree) {					\
+    a_type *ret;							\
+    rbtn_first(a_type, a_field, rbtree, rbtree->rbt_root, ret);		\
+    if (ret == &rbtree->rbt_nil) {					\
+	ret = NULL;							\
+    }									\
+    return (ret);							\
+}									\
+a_attr a_type *								\
+a_prefix##last(a_rbt_type *rbtree) {					\
+    a_type *ret;							\
+    rbtn_last(a_type, a_field, rbtree, rbtree->rbt_root, ret);		\
+    if (ret == &rbtree->rbt_nil) {					\
+	ret = NULL;							\
+    }									\
+    return (ret);							\
+}									\
+a_attr a_type *								\
+a_prefix##next(a_rbt_type *rbtree, a_type *node) {			\
+    a_type *ret;							\
+    if (rbtn_right_get(a_type, a_field, node) != &rbtree->rbt_nil) {	\
+	rbtn_first(a_type, a_field, rbtree, rbtn_right_get(a_type,	\
+	  a_field, node), ret);						\
+    } else {								\
+	a_type *tnode = rbtree->rbt_root;				\
+	assert(tnode != &rbtree->rbt_nil);				\
+	ret = &rbtree->rbt_nil;						\
+	while (true) {							\
+	    int cmp = (a_cmp)(node, tnode);				\
+	    if (cmp < 0) {						\
+		ret = tnode;						\
+		tnode = rbtn_left_get(a_type, a_field, tnode);		\
+	    } else if (cmp > 0) {					\
+		tnode = rbtn_right_get(a_type, a_field, tnode);		\
+	    } else {							\
+		break;							\
+	    }								\
+	    assert(tnode != &rbtree->rbt_nil);				\
+	}								\
+    }									\
+    if (ret == &rbtree->rbt_nil) {					\
+	ret = (NULL);							\
+    }									\
+    return (ret);							\
+}									\
+a_attr a_type *								\
+a_prefix##prev(a_rbt_type *rbtree, a_type *node) {			\
+    a_type *ret;							\
+    if (rbtn_left_get(a_type, a_field, node) != &rbtree->rbt_nil) {	\
+	rbtn_last(a_type, a_field, rbtree, rbtn_left_get(a_type,	\
+	  a_field, node), ret);						\
+    } else {								\
+	a_type *tnode = rbtree->rbt_root;				\
+	assert(tnode != &rbtree->rbt_nil);				\
+	ret = &rbtree->rbt_nil;						\
+	while (true) {							\
+	    int cmp = (a_cmp)(node, tnode);				\
+	    if (cmp < 0) {						\
+		tnode = rbtn_left_get(a_type, a_field, tnode);		\
+	    } else if (cmp > 0) {					\
+		ret = tnode;						\
+		tnode = rbtn_right_get(a_type, a_field, tnode);		\
+	    } else {							\
+		break;							\
+	    }								\
+	    assert(tnode != &rbtree->rbt_nil);				\
+	}								\
+    }									\
+    if (ret == &rbtree->rbt_nil) {					\
+	ret = (NULL);							\
+    }									\
+    return (ret);							\
+}									\
+a_attr a_type *								\
+a_prefix##search(a_rbt_type *rbtree, a_type *key) {			\
+    a_type *ret;							\
+    int cmp;								\
+    ret = rbtree->rbt_root;						\
+    while (ret != &rbtree->rbt_nil					\
+      && (cmp = (a_cmp)(key, ret)) != 0) {				\
+	if (cmp < 0) {							\
+	    ret = rbtn_left_get(a_type, a_field, ret);			\
+	} else {							\
+	    ret = rbtn_right_get(a_type, a_field, ret);			\
+	}								\
+    }									\
+    if (ret == &rbtree->rbt_nil) {					\
+	ret = (NULL);							\
+    }									\
+    return (ret);							\
+}									\
+a_attr a_type *								\
+a_prefix##nsearch(a_rbt_type *rbtree, a_type *key) {			\
+    a_type *ret;							\
+    a_type *tnode = rbtree->rbt_root;					\
+    ret = &rbtree->rbt_nil;						\
+    while (tnode != &rbtree->rbt_nil) {					\
+	int cmp = (a_cmp)(key, tnode);					\
+	if (cmp < 0) {							\
+	    ret = tnode;						\
+	    tnode = rbtn_left_get(a_type, a_field, tnode);		\
+	} else if (cmp > 0) {						\
+	    tnode = rbtn_right_get(a_type, a_field, tnode);		\
+	} else {							\
+	    ret = tnode;						\
+	    break;							\
+	}								\
+    }									\
+    if (ret == &rbtree->rbt_nil) {					\
+	ret = (NULL);							\
+    }									\
+    return (ret);							\
+}									\
+a_attr a_type *								\
+a_prefix##psearch(a_rbt_type *rbtree, a_type *key) {			\
+    a_type *ret;							\
+    a_type *tnode = rbtree->rbt_root;					\
+    ret = &rbtree->rbt_nil;						\
+    while (tnode != &rbtree->rbt_nil) {					\
+	int cmp = (a_cmp)(key, tnode);					\
+	if (cmp < 0) {							\
+	    tnode = rbtn_left_get(a_type, a_field, tnode);		\
+	} else if (cmp > 0) {						\
+	    ret = tnode;						\
+	    tnode = rbtn_right_get(a_type, a_field, tnode);		\
+	} else {							\
+	    ret = tnode;						\
+	    break;							\
+	}								\
+    }									\
+    if (ret == &rbtree->rbt_nil) {					\
+	ret = (NULL);							\
+    }									\
+    return (ret);							\
+}									\
+a_attr void								\
+a_prefix##insert(a_rbt_type *rbtree, a_type *node) {			\
+    struct {								\
+	a_type *node;							\
+	int cmp;							\
+    } path[sizeof(void *) << 4], *pathp;				\
+    rbt_node_new(a_type, a_field, rbtree, node);			\
+    /* Wind. */								\
+    path->node = rbtree->rbt_root;					\
+    for (pathp = path; pathp->node != &rbtree->rbt_nil; pathp++) {	\
+	int cmp = pathp->cmp = a_cmp(node, pathp->node);		\
+	assert(cmp != 0);						\
+	if (cmp < 0) {							\
+	    pathp[1].node = rbtn_left_get(a_type, a_field,		\
+	      pathp->node);						\
+	} else {							\
+	    pathp[1].node = rbtn_right_get(a_type, a_field,		\
+	      pathp->node);						\
+	}								\
+    }									\
+    pathp->node = node;							\
+    /* Unwind. */							\
+    for (pathp--; (uintptr_t)pathp >= (uintptr_t)path; pathp--) {	\
+	a_type *cnode = pathp->node;					\
+	if (pathp->cmp < 0) {						\
+	    a_type *left = pathp[1].node;				\
+	    rbtn_left_set(a_type, a_field, cnode, left);		\
+	    if (rbtn_red_get(a_type, a_field, left)) {			\
+		a_type *leftleft = rbtn_left_get(a_type, a_field, left);\
+		if (rbtn_red_get(a_type, a_field, leftleft)) {		\
+		    /* Fix up 4-node. */				\
+		    a_type *tnode;					\
+		    rbtn_black_set(a_type, a_field, leftleft);		\
+		    rbtn_rotate_right(a_type, a_field, cnode, tnode);	\
+		    cnode = tnode;					\
+		}							\
+	    } else {							\
+		return;							\
+	    }								\
+	} else {							\
+	    a_type *right = pathp[1].node;				\
+	    rbtn_right_set(a_type, a_field, cnode, right);		\
+	    if (rbtn_red_get(a_type, a_field, right)) {			\
+		a_type *left = rbtn_left_get(a_type, a_field, cnode);	\
+		if (rbtn_red_get(a_type, a_field, left)) {		\
+		    /* Split 4-node. */					\
+		    rbtn_black_set(a_type, a_field, left);		\
+		    rbtn_black_set(a_type, a_field, right);		\
+		    rbtn_red_set(a_type, a_field, cnode);		\
+		} else {						\
+		    /* Lean left. */					\
+		    a_type *tnode;					\
+		    bool tred = rbtn_red_get(a_type, a_field, cnode);	\
+		    rbtn_rotate_left(a_type, a_field, cnode, tnode);	\
+		    rbtn_color_set(a_type, a_field, tnode, tred);	\
+		    rbtn_red_set(a_type, a_field, cnode);		\
+		    cnode = tnode;					\
+		}							\
+	    } else {							\
+		return;							\
+	    }								\
+	}								\
+	pathp->node = cnode;						\
+    }									\
+    /* Set root, and make it black. */					\
+    rbtree->rbt_root = path->node;					\
+    rbtn_black_set(a_type, a_field, rbtree->rbt_root);			\
+}									\
+a_attr void								\
+a_prefix##remove(a_rbt_type *rbtree, a_type *node) {			\
+    struct {								\
+	a_type *node;							\
+	int cmp;							\
+    } *pathp, *nodep, path[sizeof(void *) << 4];			\
+    /* Wind. */								\
+    nodep = NULL; /* Silence compiler warning. */			\
+    path->node = rbtree->rbt_root;					\
+    for (pathp = path; pathp->node != &rbtree->rbt_nil; pathp++) {	\
+	int cmp = pathp->cmp = a_cmp(node, pathp->node);		\
+	if (cmp < 0) {							\
+	    pathp[1].node = rbtn_left_get(a_type, a_field,		\
+	      pathp->node);						\
+	} else {							\
+	    pathp[1].node = rbtn_right_get(a_type, a_field,		\
+	      pathp->node);						\
+	    if (cmp == 0) {						\
+	        /* Find node's successor, in preparation for swap. */	\
+		pathp->cmp = 1;						\
+		nodep = pathp;						\
+		for (pathp++; pathp->node != &rbtree->rbt_nil;		\
+		  pathp++) {						\
+		    pathp->cmp = -1;					\
+		    pathp[1].node = rbtn_left_get(a_type, a_field,	\
+		      pathp->node);					\
+		}							\
+		break;							\
+	    }								\
+	}								\
+    }									\
+    assert(nodep->node == node);					\
+    pathp--;								\
+    if (pathp->node != node) {						\
+	/* Swap node with its successor. */				\
+	bool tred = rbtn_red_get(a_type, a_field, pathp->node);		\
+	rbtn_color_set(a_type, a_field, pathp->node,			\
+	  rbtn_red_get(a_type, a_field, node));				\
+	rbtn_left_set(a_type, a_field, pathp->node,			\
+	  rbtn_left_get(a_type, a_field, node));			\
+	/* If node's successor is its right child, the following code */\
+	/* will do the wrong thing for the right child pointer.       */\
+	/* However, it doesn't matter, because the pointer will be    */\
+	/* properly set when the successor is pruned.                 */\
+	rbtn_right_set(a_type, a_field, pathp->node,			\
+	  rbtn_right_get(a_type, a_field, node));			\
+	rbtn_color_set(a_type, a_field, node, tred);			\
+	/* The pruned leaf node's child pointers are never accessed   */\
+	/* again, so don't bother setting them to nil.                */\
+	nodep->node = pathp->node;					\
+	pathp->node = node;						\
+	if (nodep == path) {						\
+	    rbtree->rbt_root = nodep->node;				\
+	} else {							\
+	    if (nodep[-1].cmp < 0) {					\
+		rbtn_left_set(a_type, a_field, nodep[-1].node,		\
+		  nodep->node);						\
+	    } else {							\
+		rbtn_right_set(a_type, a_field, nodep[-1].node,		\
+		  nodep->node);						\
+	    }								\
+	}								\
+    } else {								\
+	a_type *left = rbtn_left_get(a_type, a_field, node);		\
+	if (left != &rbtree->rbt_nil) {					\
+	    /* node has no successor, but it has a left child.        */\
+	    /* Splice node out, without losing the left child.        */\
+	    assert(rbtn_red_get(a_type, a_field, node) == false);	\
+	    assert(rbtn_red_get(a_type, a_field, left));		\
+	    rbtn_black_set(a_type, a_field, left);			\
+	    if (pathp == path) {					\
+		rbtree->rbt_root = left;				\
+	    } else {							\
+		if (pathp[-1].cmp < 0) {				\
+		    rbtn_left_set(a_type, a_field, pathp[-1].node,	\
+		      left);						\
+		} else {						\
+		    rbtn_right_set(a_type, a_field, pathp[-1].node,	\
+		      left);						\
+		}							\
+	    }								\
+	    return;							\
+	} else if (pathp == path) {					\
+	    /* The tree only contained one node. */			\
+	    rbtree->rbt_root = &rbtree->rbt_nil;			\
+	    return;							\
+	}								\
+    }									\
+    if (rbtn_red_get(a_type, a_field, pathp->node)) {			\
+	/* Prune red node, which requires no fixup. */			\
+	assert(pathp[-1].cmp < 0);					\
+	rbtn_left_set(a_type, a_field, pathp[-1].node,			\
+	  &rbtree->rbt_nil);						\
+	return;								\
+    }									\
+    /* The node to be pruned is black, so unwind until balance is     */\
+    /* restored.                                                      */\
+    pathp->node = &rbtree->rbt_nil;					\
+    for (pathp--; (uintptr_t)pathp >= (uintptr_t)path; pathp--) {	\
+	assert(pathp->cmp != 0);					\
+	if (pathp->cmp < 0) {						\
+	    rbtn_left_set(a_type, a_field, pathp->node,			\
+	      pathp[1].node);						\
+	    assert(rbtn_red_get(a_type, a_field, pathp[1].node)		\
+	      == false);						\
+	    if (rbtn_red_get(a_type, a_field, pathp->node)) {		\
+		a_type *right = rbtn_right_get(a_type, a_field,		\
+		  pathp->node);						\
+		a_type *rightleft = rbtn_left_get(a_type, a_field,	\
+		  right);						\
+		a_type *tnode;						\
+		if (rbtn_red_get(a_type, a_field, rightleft)) {		\
+		    /* In the following diagrams, ||, //, and \\      */\
+		    /* indicate the path to the removed node.         */\
+		    /*                                                */\
+		    /*      ||                                        */\
+		    /*    pathp(r)                                    */\
+		    /*  //        \                                   */\
+		    /* (b)        (b)                                 */\
+		    /*           /                                    */\
+		    /*          (r)                                   */\
+		    /*                                                */\
+		    rbtn_black_set(a_type, a_field, pathp->node);	\
+		    rbtn_rotate_right(a_type, a_field, right, tnode);	\
+		    rbtn_right_set(a_type, a_field, pathp->node, tnode);\
+		    rbtn_rotate_left(a_type, a_field, pathp->node,	\
+		      tnode);						\
+		} else {						\
+		    /*      ||                                        */\
+		    /*    pathp(r)                                    */\
+		    /*  //        \                                   */\
+		    /* (b)        (b)                                 */\
+		    /*           /                                    */\
+		    /*          (b)                                   */\
+		    /*                                                */\
+		    rbtn_rotate_left(a_type, a_field, pathp->node,	\
+		      tnode);						\
+		}							\
+		/* Balance restored, but rotation modified subtree    */\
+		/* root.                                              */\
+		assert((uintptr_t)pathp > (uintptr_t)path);		\
+		if (pathp[-1].cmp < 0) {				\
+		    rbtn_left_set(a_type, a_field, pathp[-1].node,	\
+		      tnode);						\
+		} else {						\
+		    rbtn_right_set(a_type, a_field, pathp[-1].node,	\
+		      tnode);						\
+		}							\
+		return;							\
+	    } else {							\
+		a_type *right = rbtn_right_get(a_type, a_field,		\
+		  pathp->node);						\
+		a_type *rightleft = rbtn_left_get(a_type, a_field,	\
+		  right);						\
+		if (rbtn_red_get(a_type, a_field, rightleft)) {		\
+		    /*      ||                                        */\
+		    /*    pathp(b)                                    */\
+		    /*  //        \                                   */\
+		    /* (b)        (b)                                 */\
+		    /*           /                                    */\
+		    /*          (r)                                   */\
+		    a_type *tnode;					\
+		    rbtn_black_set(a_type, a_field, rightleft);		\
+		    rbtn_rotate_right(a_type, a_field, right, tnode);	\
+		    rbtn_right_set(a_type, a_field, pathp->node, tnode);\
+		    rbtn_rotate_left(a_type, a_field, pathp->node,	\
+		      tnode);						\
+		    /* Balance restored, but rotation modified        */\
+		    /* subree root, which may actually be the tree    */\
+		    /* root.                                          */\
+		    if (pathp == path) {				\
+			/* Set root. */					\
+			rbtree->rbt_root = tnode;			\
+		    } else {						\
+			if (pathp[-1].cmp < 0) {			\
+			    rbtn_left_set(a_type, a_field,		\
+			      pathp[-1].node, tnode);			\
+			} else {					\
+			    rbtn_right_set(a_type, a_field,		\
+			      pathp[-1].node, tnode);			\
+			}						\
+		    }							\
+		    return;						\
+		} else {						\
+		    /*      ||                                        */\
+		    /*    pathp(b)                                    */\
+		    /*  //        \                                   */\
+		    /* (b)        (b)                                 */\
+		    /*           /                                    */\
+		    /*          (b)                                   */\
+		    a_type *tnode;					\
+		    rbtn_red_set(a_type, a_field, pathp->node);		\
+		    rbtn_rotate_left(a_type, a_field, pathp->node,	\
+		      tnode);						\
+		    pathp->node = tnode;				\
+		}							\
+	    }								\
+	} else {							\
+	    a_type *left;						\
+	    rbtn_right_set(a_type, a_field, pathp->node,		\
+	      pathp[1].node);						\
+	    left = rbtn_left_get(a_type, a_field, pathp->node);		\
+	    if (rbtn_red_get(a_type, a_field, left)) {			\
+		a_type *tnode;						\
+		a_type *leftright = rbtn_right_get(a_type, a_field,	\
+		  left);						\
+		a_type *leftrightleft = rbtn_left_get(a_type, a_field,	\
+		  leftright);						\
+		if (rbtn_red_get(a_type, a_field, leftrightleft)) {	\
+		    /*      ||                                        */\
+		    /*    pathp(b)                                    */\
+		    /*   /        \\                                  */\
+		    /* (r)        (b)                                 */\
+		    /*   \                                            */\
+		    /*   (b)                                          */\
+		    /*   /                                            */\
+		    /* (r)                                            */\
+		    a_type *unode;					\
+		    rbtn_black_set(a_type, a_field, leftrightleft);	\
+		    rbtn_rotate_right(a_type, a_field, pathp->node,	\
+		      unode);						\
+		    rbtn_rotate_right(a_type, a_field, pathp->node,	\
+		      tnode);						\
+		    rbtn_right_set(a_type, a_field, unode, tnode);	\
+		    rbtn_rotate_left(a_type, a_field, unode, tnode);	\
+		} else {						\
+		    /*      ||                                        */\
+		    /*    pathp(b)                                    */\
+		    /*   /        \\                                  */\
+		    /* (r)        (b)                                 */\
+		    /*   \                                            */\
+		    /*   (b)                                          */\
+		    /*   /                                            */\
+		    /* (b)                                            */\
+		    assert(leftright != &rbtree->rbt_nil);		\
+		    rbtn_red_set(a_type, a_field, leftright);		\
+		    rbtn_rotate_right(a_type, a_field, pathp->node,	\
+		      tnode);						\
+		    rbtn_black_set(a_type, a_field, tnode);		\
+		}							\
+		/* Balance restored, but rotation modified subtree    */\
+		/* root, which may actually be the tree root.         */\
+		if (pathp == path) {					\
+		    /* Set root. */					\
+		    rbtree->rbt_root = tnode;				\
+		} else {						\
+		    if (pathp[-1].cmp < 0) {				\
+			rbtn_left_set(a_type, a_field, pathp[-1].node,	\
+			  tnode);					\
+		    } else {						\
+			rbtn_right_set(a_type, a_field, pathp[-1].node,	\
+			  tnode);					\
+		    }							\
+		}							\
+		return;							\
+	    } else if (rbtn_red_get(a_type, a_field, pathp->node)) {	\
+		a_type *leftleft = rbtn_left_get(a_type, a_field, left);\
+		if (rbtn_red_get(a_type, a_field, leftleft)) {		\
+		    /*        ||                                      */\
+		    /*      pathp(r)                                  */\
+		    /*     /        \\                                */\
+		    /*   (b)        (b)                               */\
+		    /*   /                                            */\
+		    /* (r)                                            */\
+		    a_type *tnode;					\
+		    rbtn_black_set(a_type, a_field, pathp->node);	\
+		    rbtn_red_set(a_type, a_field, left);		\
+		    rbtn_black_set(a_type, a_field, leftleft);		\
+		    rbtn_rotate_right(a_type, a_field, pathp->node,	\
+		      tnode);						\
+		    /* Balance restored, but rotation modified        */\
+		    /* subtree root.                                  */\
+		    assert((uintptr_t)pathp > (uintptr_t)path);		\
+		    if (pathp[-1].cmp < 0) {				\
+			rbtn_left_set(a_type, a_field, pathp[-1].node,	\
+			  tnode);					\
+		    } else {						\
+			rbtn_right_set(a_type, a_field, pathp[-1].node,	\
+			  tnode);					\
+		    }							\
+		    return;						\
+		} else {						\
+		    /*        ||                                      */\
+		    /*      pathp(r)                                  */\
+		    /*     /        \\                                */\
+		    /*   (b)        (b)                               */\
+		    /*   /                                            */\
+		    /* (b)                                            */\
+		    rbtn_red_set(a_type, a_field, left);		\
+		    rbtn_black_set(a_type, a_field, pathp->node);	\
+		    /* Balance restored. */				\
+		    return;						\
+		}							\
+	    } else {							\
+		a_type *leftleft = rbtn_left_get(a_type, a_field, left);\
+		if (rbtn_red_get(a_type, a_field, leftleft)) {		\
+		    /*               ||                               */\
+		    /*             pathp(b)                           */\
+		    /*            /        \\                         */\
+		    /*          (b)        (b)                        */\
+		    /*          /                                     */\
+		    /*        (r)                                     */\
+		    a_type *tnode;					\
+		    rbtn_black_set(a_type, a_field, leftleft);		\
+		    rbtn_rotate_right(a_type, a_field, pathp->node,	\
+		      tnode);						\
+		    /* Balance restored, but rotation modified        */\
+		    /* subtree root, which may actually be the tree   */\
+		    /* root.                                          */\
+		    if (pathp == path) {				\
+			/* Set root. */					\
+			rbtree->rbt_root = tnode;			\
+		    } else {						\
+			if (pathp[-1].cmp < 0) {			\
+			    rbtn_left_set(a_type, a_field,		\
+			      pathp[-1].node, tnode);			\
+			} else {					\
+			    rbtn_right_set(a_type, a_field,		\
+			      pathp[-1].node, tnode);			\
+			}						\
+		    }							\
+		    return;						\
+		} else {						\
+		    /*               ||                               */\
+		    /*             pathp(b)                           */\
+		    /*            /        \\                         */\
+		    /*          (b)        (b)                        */\
+		    /*          /                                     */\
+		    /*        (b)                                     */\
+		    rbtn_red_set(a_type, a_field, left);		\
+		}							\
+	    }								\
+	}								\
+    }									\
+    /* Set root. */							\
+    rbtree->rbt_root = path->node;					\
+    assert(rbtn_red_get(a_type, a_field, rbtree->rbt_root) == false);	\
+}									\
+a_attr a_type *								\
+a_prefix##iter_recurse(a_rbt_type *rbtree, a_type *node,		\
+  a_type *(*cb)(a_rbt_type *, a_type *, void *), void *arg) {		\
+    if (node == &rbtree->rbt_nil) {					\
+	return (&rbtree->rbt_nil);					\
+    } else {								\
+	a_type *ret;							\
+	if ((ret = a_prefix##iter_recurse(rbtree, rbtn_left_get(a_type,	\
+	  a_field, node), cb, arg)) != &rbtree->rbt_nil			\
+	  || (ret = cb(rbtree, node, arg)) != NULL) {			\
+	    return (ret);						\
+	}								\
+	return (a_prefix##iter_recurse(rbtree, rbtn_right_get(a_type,	\
+	  a_field, node), cb, arg));					\
+    }									\
+}									\
+a_attr a_type *								\
+a_prefix##iter_start(a_rbt_type *rbtree, a_type *start, a_type *node,	\
+  a_type *(*cb)(a_rbt_type *, a_type *, void *), void *arg) {		\
+    int cmp = a_cmp(start, node);					\
+    if (cmp < 0) {							\
+	a_type *ret;							\
+	if ((ret = a_prefix##iter_start(rbtree, start,			\
+	  rbtn_left_get(a_type, a_field, node), cb, arg)) !=		\
+	  &rbtree->rbt_nil || (ret = cb(rbtree, node, arg)) != NULL) {	\
+	    return (ret);						\
+	}								\
+	return (a_prefix##iter_recurse(rbtree, rbtn_right_get(a_type,	\
+	  a_field, node), cb, arg));					\
+    } else if (cmp > 0) {						\
+	return (a_prefix##iter_start(rbtree, start,			\
+	  rbtn_right_get(a_type, a_field, node), cb, arg));		\
+    } else {								\
+	a_type *ret;							\
+	if ((ret = cb(rbtree, node, arg)) != NULL) {			\
+	    return (ret);						\
+	}								\
+	return (a_prefix##iter_recurse(rbtree, rbtn_right_get(a_type,	\
+	  a_field, node), cb, arg));					\
+    }									\
+}									\
+a_attr a_type *								\
+a_prefix##iter(a_rbt_type *rbtree, a_type *start, a_type *(*cb)(	\
+  a_rbt_type *, a_type *, void *), void *arg) {				\
+    a_type *ret;							\
+    if (start != NULL) {						\
+	ret = a_prefix##iter_start(rbtree, start, rbtree->rbt_root,	\
+	  cb, arg);							\
+    } else {								\
+	ret = a_prefix##iter_recurse(rbtree, rbtree->rbt_root, cb, arg);\
+    }									\
+    if (ret == &rbtree->rbt_nil) {					\
+	ret = NULL;							\
+    }									\
+    return (ret);							\
+}									\
+a_attr a_type *								\
+a_prefix##reverse_iter_recurse(a_rbt_type *rbtree, a_type *node,	\
+  a_type *(*cb)(a_rbt_type *, a_type *, void *), void *arg) {		\
+    if (node == &rbtree->rbt_nil) {					\
+	return (&rbtree->rbt_nil);					\
+    } else {								\
+	a_type *ret;							\
+	if ((ret = a_prefix##reverse_iter_recurse(rbtree,		\
+	  rbtn_right_get(a_type, a_field, node), cb, arg)) !=		\
+	  &rbtree->rbt_nil || (ret = cb(rbtree, node, arg)) != NULL) {	\
+	    return (ret);						\
+	}								\
+	return (a_prefix##reverse_iter_recurse(rbtree,			\
+	  rbtn_left_get(a_type, a_field, node), cb, arg));		\
+    }									\
+}									\
+a_attr a_type *								\
+a_prefix##reverse_iter_start(a_rbt_type *rbtree, a_type *start,		\
+  a_type *node, a_type *(*cb)(a_rbt_type *, a_type *, void *),		\
+  void *arg) {								\
+    int cmp = a_cmp(start, node);					\
+    if (cmp > 0) {							\
+	a_type *ret;							\
+	if ((ret = a_prefix##reverse_iter_start(rbtree, start,		\
+	  rbtn_right_get(a_type, a_field, node), cb, arg)) !=		\
+	  &rbtree->rbt_nil || (ret = cb(rbtree, node, arg)) != NULL) {	\
+	    return (ret);						\
+	}								\
+	return (a_prefix##reverse_iter_recurse(rbtree,			\
+	  rbtn_left_get(a_type, a_field, node), cb, arg));		\
+    } else if (cmp < 0) {						\
+	return (a_prefix##reverse_iter_start(rbtree, start,		\
+	  rbtn_left_get(a_type, a_field, node), cb, arg));		\
+    } else {								\
+	a_type *ret;							\
+	if ((ret = cb(rbtree, node, arg)) != NULL) {			\
+	    return (ret);						\
+	}								\
+	return (a_prefix##reverse_iter_recurse(rbtree,			\
+	  rbtn_left_get(a_type, a_field, node), cb, arg));		\
+    }									\
+}									\
+a_attr a_type *								\
+a_prefix##reverse_iter(a_rbt_type *rbtree, a_type *start,		\
+  a_type *(*cb)(a_rbt_type *, a_type *, void *), void *arg) {		\
+    a_type *ret;							\
+    if (start != NULL) {						\
+	ret = a_prefix##reverse_iter_start(rbtree, start,		\
+	  rbtree->rbt_root, cb, arg);					\
+    } else {								\
+	ret = a_prefix##reverse_iter_recurse(rbtree, rbtree->rbt_root,	\
+	  cb, arg);							\
+    }									\
+    if (ret == &rbtree->rbt_nil) {					\
+	ret = NULL;							\
+    }									\
+    return (ret);							\
+}
+
+#endif /* RB_H_ */
diff --git a/externals/jemalloc/jemalloc/internal/stats.h b/externals/jemalloc/jemalloc/internal/stats.h
new file mode 100644
index 00000000000..cbf035ff2b9
--- /dev/null
+++ b/externals/jemalloc/jemalloc/internal/stats.h
@@ -0,0 +1,174 @@
+/******************************************************************************/
+#ifdef JEMALLOC_H_TYPES
+
+#define	UMAX2S_BUFSIZE	65
+
+#ifdef JEMALLOC_STATS
+typedef struct tcache_bin_stats_s tcache_bin_stats_t;
+typedef struct malloc_bin_stats_s malloc_bin_stats_t;
+typedef struct malloc_large_stats_s malloc_large_stats_t;
+typedef struct arena_stats_s arena_stats_t;
+#endif
+#if (defined(JEMALLOC_STATS) || defined(JEMALLOC_PROF))
+typedef struct chunk_stats_s chunk_stats_t;
+#endif
+
+#endif /* JEMALLOC_H_TYPES */
+/******************************************************************************/
+#ifdef JEMALLOC_H_STRUCTS
+
+#ifdef JEMALLOC_STATS
+
+#ifdef JEMALLOC_TCACHE
+struct tcache_bin_stats_s {
+	/*
+	 * Number of allocation requests that corresponded to the size of this
+	 * bin.
+	 */
+	uint64_t	nrequests;
+};
+#endif
+
+struct malloc_bin_stats_s {
+	/*
+	 * Current number of bytes allocated, including objects currently
+	 * cached by tcache.
+	 */
+	size_t		allocated;
+
+	/*
+	 * Total number of allocation/deallocation requests served directly by
+	 * the bin.  Note that tcache may allocate an object, then recycle it
+	 * many times, resulting many increments to nrequests, but only one
+	 * each to nmalloc and ndalloc.
+	 */
+	uint64_t	nmalloc;
+	uint64_t	ndalloc;
+
+	/*
+	 * Number of allocation requests that correspond to the size of this
+	 * bin.  This includes requests served by tcache, though tcache only
+	 * periodically merges into this counter.
+	 */
+	uint64_t	nrequests;
+
+#ifdef JEMALLOC_TCACHE
+	/* Number of tcache fills from this bin. */
+	uint64_t	nfills;
+
+	/* Number of tcache flushes to this bin. */
+	uint64_t	nflushes;
+#endif
+
+	/* Total number of runs created for this bin's size class. */
+	uint64_t	nruns;
+
+	/*
+	 * Total number of runs reused by extracting them from the runs tree for
+	 * this bin's size class.
+	 */
+	uint64_t	reruns;
+
+	/* High-water mark for this bin. */
+	size_t		highruns;
+
+	/* Current number of runs in this bin. */
+	size_t		curruns;
+};
+
+struct malloc_large_stats_s {
+	/*
+	 * Total number of allocation/deallocation requests served directly by
+	 * the arena.  Note that tcache may allocate an object, then recycle it
+	 * many times, resulting many increments to nrequests, but only one
+	 * each to nmalloc and ndalloc.
+	 */
+	uint64_t	nmalloc;
+	uint64_t	ndalloc;
+
+	/*
+	 * Number of allocation requests that correspond to this size class.
+	 * This includes requests served by tcache, though tcache only
+	 * periodically merges into this counter.
+	 */
+	uint64_t	nrequests;
+
+	/* High-water mark for this size class. */
+	size_t		highruns;
+
+	/* Current number of runs of this size class. */
+	size_t		curruns;
+};
+
+struct arena_stats_s {
+	/* Number of bytes currently mapped. */
+	size_t		mapped;
+
+	/*
+	 * Total number of purge sweeps, total number of madvise calls made,
+	 * and total pages purged in order to keep dirty unused memory under
+	 * control.
+	 */
+	uint64_t	npurge;
+	uint64_t	nmadvise;
+	uint64_t	purged;
+
+	/* Per-size-category statistics. */
+	size_t		allocated_large;
+	uint64_t	nmalloc_large;
+	uint64_t	ndalloc_large;
+	uint64_t	nrequests_large;
+
+	/*
+	 * One element for each possible size class, including sizes that
+	 * overlap with bin size classes.  This is necessary because ipalloc()
+	 * sometimes has to use such large objects in order to assure proper
+	 * alignment.
+	 */
+	malloc_large_stats_t	*lstats;
+};
+#endif /* JEMALLOC_STATS */
+
+#if (defined(JEMALLOC_STATS) || defined(JEMALLOC_PROF))
+struct chunk_stats_s {
+#  ifdef JEMALLOC_STATS
+	/* Number of chunks that were allocated. */
+	uint64_t	nchunks;
+#  endif
+
+	/* High-water mark for number of chunks allocated. */
+	size_t		highchunks;
+
+	/*
+	 * Current number of chunks allocated.  This value isn't maintained for
+	 * any other purpose, so keep track of it in order to be able to set
+	 * highchunks.
+	 */
+	size_t		curchunks;
+};
+#endif /* JEMALLOC_STATS */
+
+#endif /* JEMALLOC_H_STRUCTS */
+/******************************************************************************/
+#ifdef JEMALLOC_H_EXTERNS
+
+extern bool	opt_stats_print;
+
+char	*umax2s(uintmax_t x, unsigned base, char *s);
+#ifdef JEMALLOC_STATS
+void malloc_cprintf(void (*write)(void *, const char *), void *cbopaque,
+    const char *format, ...) JEMALLOC_ATTR(format(printf, 3, 4));
+void	malloc_printf(const char *format, ...)
+    JEMALLOC_ATTR(format(printf, 1, 2));
+#endif
+void	stats_print(void (*write)(void *, const char *), void *cbopaque,
+    const char *opts);
+
+#endif /* JEMALLOC_H_EXTERNS */
+/******************************************************************************/
+#ifdef JEMALLOC_STATS
+#ifdef JEMALLOC_H_INLINES
+
+#endif /* JEMALLOC_H_INLINES */
+#endif /* JEMALLOC_STATS */
+/******************************************************************************/
diff --git a/externals/jemalloc/jemalloc/internal/tcache.h b/externals/jemalloc/jemalloc/internal/tcache.h
new file mode 100644
index 00000000000..c76597fafab
--- /dev/null
+++ b/externals/jemalloc/jemalloc/internal/tcache.h
@@ -0,0 +1,380 @@
+#ifdef JEMALLOC_TCACHE
+/******************************************************************************/
+#ifdef JEMALLOC_H_TYPES
+
+typedef struct tcache_bin_s tcache_bin_t;
+typedef struct tcache_s tcache_t;
+
+/*
+ * Absolute maximum number of cache slots for each small bin in the thread
+ * cache.  This is an additional constraint beyond that imposed as: twice the
+ * number of regions per run for this size class.
+ *
+ * This constant must be an even number.
+ */
+#define	TCACHE_NSLOTS_SMALL_MAX		200
+
+/* Number of cache slots for large size classes. */
+#define	TCACHE_NSLOTS_LARGE		20
+
+/* (1U << opt_lg_tcache_maxclass) is used to compute tcache_maxclass. */
+#define	LG_TCACHE_MAXCLASS_DEFAULT	15
+
+/*
+ * (1U << opt_lg_tcache_gc_sweep) is the approximate number of allocation
+ * events between full GC sweeps (-1: disabled).  Integer rounding may cause
+ * the actual number to be slightly higher, since GC is performed
+ * incrementally.
+ */
+#define	LG_TCACHE_GC_SWEEP_DEFAULT	13
+
+#endif /* JEMALLOC_H_TYPES */
+/******************************************************************************/
+#ifdef JEMALLOC_H_STRUCTS
+
+struct tcache_bin_s {
+#  ifdef JEMALLOC_STATS
+	tcache_bin_stats_t tstats;
+#  endif
+	unsigned	low_water;	/* Min # cached since last GC. */
+	unsigned	high_water;	/* Max # cached since last GC. */
+	unsigned	ncached;	/* # of cached objects. */
+	unsigned	ncached_max;	/* Upper limit on ncached. */
+	void		*avail;		/* Chain of available objects. */
+};
+
+struct tcache_s {
+#  ifdef JEMALLOC_STATS
+	ql_elm(tcache_t) link;		/* Used for aggregating stats. */
+#  endif
+#  ifdef JEMALLOC_PROF
+	uint64_t	prof_accumbytes;/* Cleared after arena_prof_accum() */
+#  endif
+	arena_t		*arena;		/* This thread's arena. */
+	unsigned	ev_cnt;		/* Event count since incremental GC. */
+	unsigned	next_gc_bin;	/* Next bin to GC. */
+	tcache_bin_t	tbins[1];	/* Dynamically sized. */
+};
+
+#endif /* JEMALLOC_H_STRUCTS */
+/******************************************************************************/
+#ifdef JEMALLOC_H_EXTERNS
+
+extern bool	opt_tcache;
+extern ssize_t	opt_lg_tcache_maxclass;
+extern ssize_t	opt_lg_tcache_gc_sweep;
+
+/* Map of thread-specific caches. */
+extern __thread tcache_t	*tcache_tls
+    JEMALLOC_ATTR(tls_model("initial-exec"));
+
+/*
+ * Number of tcache bins.  There are nbins small-object bins, plus 0 or more
+ * large-object bins.
+ */
+extern size_t			nhbins;
+
+/* Maximum cached size class. */
+extern size_t			tcache_maxclass;
+
+/* Number of tcache allocation/deallocation events between incremental GCs. */
+extern unsigned			tcache_gc_incr;
+
+void	tcache_bin_flush_small(tcache_bin_t *tbin, size_t binind, unsigned rem
+#if (defined(JEMALLOC_STATS) || defined(JEMALLOC_PROF))
+    , tcache_t *tcache
+#endif
+    );
+void	tcache_bin_flush_large(tcache_bin_t *tbin, size_t binind, unsigned rem
+#if (defined(JEMALLOC_STATS) || defined(JEMALLOC_PROF))
+    , tcache_t *tcache
+#endif
+    );
+tcache_t *tcache_create(arena_t *arena);
+void	*tcache_alloc_small_hard(tcache_t *tcache, tcache_bin_t *tbin,
+    size_t binind);
+void	tcache_destroy(tcache_t *tcache);
+#ifdef JEMALLOC_STATS
+void	tcache_stats_merge(tcache_t *tcache, arena_t *arena);
+#endif
+void	tcache_boot(void);
+
+#endif /* JEMALLOC_H_EXTERNS */
+/******************************************************************************/
+#ifdef JEMALLOC_H_INLINES
+
+#ifndef JEMALLOC_ENABLE_INLINE
+void	tcache_event(tcache_t *tcache);
+tcache_t *tcache_get(void);
+void	*tcache_alloc_easy(tcache_bin_t *tbin);
+void	*tcache_alloc_small(tcache_t *tcache, size_t size, bool zero);
+void	*tcache_alloc_large(tcache_t *tcache, size_t size, bool zero);
+void	tcache_dalloc_small(tcache_t *tcache, void *ptr);
+void	tcache_dalloc_large(tcache_t *tcache, void *ptr, size_t size);
+#endif
+
+#if (defined(JEMALLOC_ENABLE_INLINE) || defined(JEMALLOC_TCACHE_C_))
+JEMALLOC_INLINE tcache_t *
+tcache_get(void)
+{
+	tcache_t *tcache;
+
+	if ((isthreaded & opt_tcache) == false)
+		return (NULL);
+
+	tcache = tcache_tls;
+	if ((uintptr_t)tcache <= (uintptr_t)1) {
+		if (tcache == NULL) {
+			tcache = tcache_create(choose_arena());
+			if (tcache == NULL)
+				return (NULL);
+		} else
+			return (NULL);
+	}
+
+	return (tcache);
+}
+
+JEMALLOC_INLINE void
+tcache_event(tcache_t *tcache)
+{
+
+	if (tcache_gc_incr == 0)
+		return;
+
+	tcache->ev_cnt++;
+	assert(tcache->ev_cnt <= tcache_gc_incr);
+	if (tcache->ev_cnt == tcache_gc_incr) {
+		size_t binind = tcache->next_gc_bin;
+		tcache_bin_t *tbin = &tcache->tbins[binind];
+
+		if (tbin->low_water > 0) {
+			/*
+			 * Flush (ceiling) 3/4 of the objects below the low
+			 * water mark.
+			 */
+			if (binind < nbins) {
+				tcache_bin_flush_small(tbin, binind,
+				    tbin->ncached - tbin->low_water +
+				    (tbin->low_water >> 2)
+#if (defined(JEMALLOC_STATS) || defined(JEMALLOC_PROF))
+				    , tcache
+#endif
+				    );
+			} else {
+				tcache_bin_flush_large(tbin, binind,
+				    tbin->ncached - tbin->low_water +
+				    (tbin->low_water >> 2)
+#if (defined(JEMALLOC_STATS) || defined(JEMALLOC_PROF))
+				    , tcache
+#endif
+				    );
+			}
+		}
+		tbin->low_water = tbin->ncached;
+		tbin->high_water = tbin->ncached;
+
+		tcache->next_gc_bin++;
+		if (tcache->next_gc_bin == nhbins)
+			tcache->next_gc_bin = 0;
+		tcache->ev_cnt = 0;
+	}
+}
+
+JEMALLOC_INLINE void *
+tcache_alloc_easy(tcache_bin_t *tbin)
+{
+	void *ret;
+
+	if (tbin->ncached == 0)
+		return (NULL);
+	tbin->ncached--;
+	if (tbin->ncached < tbin->low_water)
+		tbin->low_water = tbin->ncached;
+	ret = tbin->avail;
+	tbin->avail = *(void **)ret;
+	return (ret);
+}
+
+JEMALLOC_INLINE void *
+tcache_alloc_small(tcache_t *tcache, size_t size, bool zero)
+{
+	void *ret;
+	size_t binind;
+	tcache_bin_t *tbin;
+
+	binind = small_size2bin[size];
+	assert(binind < nbins);
+	tbin = &tcache->tbins[binind];
+	ret = tcache_alloc_easy(tbin);
+	if (ret == NULL) {
+		ret = tcache_alloc_small_hard(tcache, tbin, binind);
+		if (ret == NULL)
+			return (NULL);
+	}
+	assert(arena_salloc(ret) == tcache->arena->bins[binind].reg_size);
+
+	if (zero == false) {
+#ifdef JEMALLOC_FILL
+		if (opt_junk)
+			memset(ret, 0xa5, size);
+		else if (opt_zero)
+			memset(ret, 0, size);
+#endif
+	} else
+		memset(ret, 0, size);
+
+#ifdef JEMALLOC_STATS
+	tbin->tstats.nrequests++;
+#endif
+#ifdef JEMALLOC_PROF
+	tcache->prof_accumbytes += tcache->arena->bins[binind].reg_size;
+#endif
+	tcache_event(tcache);
+	return (ret);
+}
+
+JEMALLOC_INLINE void *
+tcache_alloc_large(tcache_t *tcache, size_t size, bool zero)
+{
+	void *ret;
+	size_t binind;
+	tcache_bin_t *tbin;
+
+	size = PAGE_CEILING(size);
+	assert(size <= tcache_maxclass);
+	binind = nbins + (size >> PAGE_SHIFT) - 1;
+	assert(binind < nhbins);
+	tbin = &tcache->tbins[binind];
+	ret = tcache_alloc_easy(tbin);
+	if (ret == NULL) {
+		/*
+		 * Only allocate one large object at a time, because it's quite
+		 * expensive to create one and not use it.
+		 */
+		ret = arena_malloc_large(tcache->arena, size, zero);
+		if (ret == NULL)
+			return (NULL);
+	} else {
+#ifdef JEMALLOC_PROF
+		arena_chunk_t *chunk = (arena_chunk_t *)CHUNK_ADDR2BASE(ret);
+		size_t pageind = (unsigned)(((uintptr_t)ret - (uintptr_t)chunk)
+		    >> PAGE_SHIFT);
+		chunk->map[pageind].bits |= CHUNK_MAP_CLASS_MASK;
+#endif
+		if (zero == false) {
+#ifdef JEMALLOC_FILL
+			if (opt_junk)
+				memset(ret, 0xa5, size);
+			else if (opt_zero)
+				memset(ret, 0, size);
+#endif
+		} else
+			memset(ret, 0, size);
+
+#ifdef JEMALLOC_STATS
+		tbin->tstats.nrequests++;
+#endif
+#ifdef JEMALLOC_PROF
+		tcache->prof_accumbytes += size;
+#endif
+	}
+
+	tcache_event(tcache);
+	return (ret);
+}
+
+JEMALLOC_INLINE void
+tcache_dalloc_small(tcache_t *tcache, void *ptr)
+{
+	arena_t *arena;
+	arena_chunk_t *chunk;
+	arena_run_t *run;
+	arena_bin_t *bin;
+	tcache_bin_t *tbin;
+	size_t pageind, binind;
+	arena_chunk_map_t *mapelm;
+
+	assert(arena_salloc(ptr) <= small_maxclass);
+
+	chunk = (arena_chunk_t *)CHUNK_ADDR2BASE(ptr);
+	arena = chunk->arena;
+	pageind = (((uintptr_t)ptr - (uintptr_t)chunk) >> PAGE_SHIFT);
+	mapelm = &chunk->map[pageind];
+	run = (arena_run_t *)((uintptr_t)chunk + (uintptr_t)((pageind -
+	    (mapelm->bits >> PAGE_SHIFT)) << PAGE_SHIFT));
+	assert(run->magic == ARENA_RUN_MAGIC);
+	bin = run->bin;
+	binind = ((uintptr_t)bin - (uintptr_t)&arena->bins) /
+	    sizeof(arena_bin_t);
+	assert(binind < nbins);
+
+#ifdef JEMALLOC_FILL
+	if (opt_junk)
+		memset(ptr, 0x5a, bin->reg_size);
+#endif
+
+	tbin = &tcache->tbins[binind];
+	if (tbin->ncached == tbin->ncached_max) {
+		tcache_bin_flush_small(tbin, binind, (tbin->ncached_max >> 1)
+#if (defined(JEMALLOC_STATS) || defined(JEMALLOC_PROF))
+		    , tcache
+#endif
+		    );
+	}
+	assert(tbin->ncached < tbin->ncached_max);
+	*(void **)ptr = tbin->avail;
+	tbin->avail = ptr;
+	tbin->ncached++;
+	if (tbin->ncached > tbin->high_water)
+		tbin->high_water = tbin->ncached;
+
+	tcache_event(tcache);
+}
+
+JEMALLOC_INLINE void
+tcache_dalloc_large(tcache_t *tcache, void *ptr, size_t size)
+{
+	arena_t *arena;
+	arena_chunk_t *chunk;
+	size_t pageind, binind;
+	tcache_bin_t *tbin;
+	arena_chunk_map_t *mapelm;
+
+	assert((size & PAGE_MASK) == 0);
+	assert(arena_salloc(ptr) > small_maxclass);
+	assert(arena_salloc(ptr) <= tcache_maxclass);
+
+	chunk = (arena_chunk_t *)CHUNK_ADDR2BASE(ptr);
+	arena = chunk->arena;
+	pageind = (((uintptr_t)ptr - (uintptr_t)chunk) >> PAGE_SHIFT);
+	mapelm = &chunk->map[pageind];
+	binind = nbins + (size >> PAGE_SHIFT) - 1;
+
+#ifdef JEMALLOC_FILL
+	if (opt_junk)
+		memset(ptr, 0x5a, bin->reg_size);
+#endif
+
+	tbin = &tcache->tbins[binind];
+	if (tbin->ncached == tbin->ncached_max) {
+		tcache_bin_flush_large(tbin, binind, (tbin->ncached_max >> 1)
+#if (defined(JEMALLOC_STATS) || defined(JEMALLOC_PROF))
+		    , tcache
+#endif
+		    );
+	}
+	assert(tbin->ncached < tbin->ncached_max);
+	*(void **)ptr = tbin->avail;
+	tbin->avail = ptr;
+	tbin->ncached++;
+	if (tbin->ncached > tbin->high_water)
+		tbin->high_water = tbin->ncached;
+
+	tcache_event(tcache);
+}
+#endif
+
+#endif /* JEMALLOC_H_INLINES */
+/******************************************************************************/
+#endif /* JEMALLOC_TCACHE */
diff --git a/externals/jemalloc/jemalloc/internal/totally_not_p_r_n.h b/externals/jemalloc/jemalloc/internal/totally_not_p_r_n.h
new file mode 100644
index 00000000000..0709d708012
--- /dev/null
+++ b/externals/jemalloc/jemalloc/internal/totally_not_p_r_n.h
@@ -0,0 +1,60 @@
+/******************************************************************************/
+#ifdef JEMALLOC_H_TYPES
+
+/*
+ * Simple linear congruential pseudo-random number generator:
+ *
+ *   prn(y) = (a*x + c) % m
+ *
+ * where the following constants ensure maximal period:
+ *
+ *   a == Odd number (relatively prime to 2^n), and (a-1) is a multiple of 4.
+ *   c == Odd number (relatively prime to 2^n).
+ *   m == 2^32
+ *
+ * See Knuth's TAOCP 3rd Ed., Vol. 2, pg. 17 for details on these constraints.
+ *
+ * This choice of m has the disadvantage that the quality of the bits is
+ * proportional to bit position.  For example. the lowest bit has a cycle of 2,
+ * the next has a cycle of 4, etc.  For this reason, we prefer to use the upper
+ * bits.
+ *
+ * Macro parameters:
+ *   uint32_t r          : Result.
+ *   unsigned lg_range   : (0..32], number of least significant bits to return.
+ *   uint32_t state      : Seed value.
+ *   const uint32_t a, c : See above discussion.
+ */
+#define prn32(r, lg_range, state, a, c) do {				\
+	assert(lg_range > 0);						\
+	assert(lg_range <= 32);						\
+									\
+	r = (state * (a)) + (c);					\
+	state = r;							\
+	r >>= (32 - lg_range);						\
+} while (false)
+
+/* Same as prn32(), but 64 bits of pseudo-randomness, using uint64_t. */
+#define prn64(r, lg_range, state, a, c) do {				\
+	assert(lg_range > 0);						\
+	assert(lg_range <= 64);						\
+									\
+	r = (state * (a)) + (c);					\
+	state = r;							\
+	r >>= (64 - lg_range);						\
+} while (false)
+
+#endif /* JEMALLOC_H_TYPES */
+/******************************************************************************/
+#ifdef JEMALLOC_H_STRUCTS
+
+#endif /* JEMALLOC_H_STRUCTS */
+/******************************************************************************/
+#ifdef JEMALLOC_H_EXTERNS
+
+#endif /* JEMALLOC_H_EXTERNS */
+/******************************************************************************/
+#ifdef JEMALLOC_H_INLINES
+
+#endif /* JEMALLOC_H_INLINES */
+/******************************************************************************/
diff --git a/externals/jemalloc/jemalloc/jemalloc.h b/externals/jemalloc/jemalloc/jemalloc.h
new file mode 100644
index 00000000000..d9bafbfff55
--- /dev/null
+++ b/externals/jemalloc/jemalloc/jemalloc.h
@@ -0,0 +1,42 @@
+#ifndef JEMALLOC_H_
+#define	JEMALLOC_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define	JEMALLOC_VERSION "1.0.0-0-g5523399"
+#define	JEMALLOC_VERSION_MAJOR 1
+#define	JEMALLOC_VERSION_MINOR 0
+#define	JEMALLOC_VERSION_BUGFIX 0
+#define	JEMALLOC_VERSION_NREV 0
+#define	JEMALLOC_VERSION_GID "5523399"
+
+#include "jemalloc_defs.h"
+#ifndef JEMALLOC_P
+#  define JEMALLOC_P(s) s
+#endif
+
+extern const char	*JEMALLOC_P(malloc_options);
+extern void		(*JEMALLOC_P(malloc_message))(void *, const char *);
+
+void	*JEMALLOC_P(malloc)(size_t size) JEMALLOC_ATTR(malloc);
+void	*JEMALLOC_P(calloc)(size_t num, size_t size) JEMALLOC_ATTR(malloc);
+int	JEMALLOC_P(posix_memalign)(void **memptr, size_t alignment, size_t size)
+    JEMALLOC_ATTR(nonnull(1));
+void	*JEMALLOC_P(realloc)(void *ptr, size_t size);
+void	JEMALLOC_P(free)(void *ptr);
+
+size_t	JEMALLOC_P(malloc_usable_size)(const void *ptr);
+void	JEMALLOC_P(malloc_stats_print)(void (*write_cb)(void *, const char *),
+    void *cbopaque, const char *opts);
+int	JEMALLOC_P(mallctl)(const char *name, void *oldp, size_t *oldlenp,
+    void *newp, size_t newlen);
+int	JEMALLOC_P(mallctlnametomib)(const char *name, size_t *mibp,
+    size_t *miblenp);
+int	JEMALLOC_P(mallctlbymib)(const size_t *mib, size_t miblen, void *oldp,
+    size_t *oldlenp, void *newp, size_t newlen);
+
+#ifdef __cplusplus
+};
+#endif
+#endif /* JEMALLOC_H_ */
diff --git a/externals/jemalloc/jemalloc/jemalloc.h.in b/externals/jemalloc/jemalloc/jemalloc.h.in
new file mode 100644
index 00000000000..8ef8183686e
--- /dev/null
+++ b/externals/jemalloc/jemalloc/jemalloc.h.in
@@ -0,0 +1,42 @@
+#ifndef JEMALLOC_H_
+#define	JEMALLOC_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define	JEMALLOC_VERSION "@jemalloc_version@"
+#define	JEMALLOC_VERSION_MAJOR @jemalloc_version_major@
+#define	JEMALLOC_VERSION_MINOR @jemalloc_version_minor@
+#define	JEMALLOC_VERSION_BUGFIX @jemalloc_version_bugfix@
+#define	JEMALLOC_VERSION_NREV @jemalloc_version_nrev@
+#define	JEMALLOC_VERSION_GID "@jemalloc_version_gid@"
+
+#include "jemalloc_defs@install_suffix@.h"
+#ifndef JEMALLOC_P
+#  define JEMALLOC_P(s) s
+#endif
+
+extern const char	*JEMALLOC_P(malloc_options);
+extern void		(*JEMALLOC_P(malloc_message))(void *, const char *);
+
+void	*JEMALLOC_P(malloc)(size_t size) JEMALLOC_ATTR(malloc);
+void	*JEMALLOC_P(calloc)(size_t num, size_t size) JEMALLOC_ATTR(malloc);
+int	JEMALLOC_P(posix_memalign)(void **memptr, size_t alignment, size_t size)
+    JEMALLOC_ATTR(nonnull(1));
+void	*JEMALLOC_P(realloc)(void *ptr, size_t size);
+void	JEMALLOC_P(free)(void *ptr);
+
+size_t	JEMALLOC_P(malloc_usable_size)(const void *ptr);
+void	JEMALLOC_P(malloc_stats_print)(void (*write_cb)(void *, const char *),
+    void *cbopaque, const char *opts);
+int	JEMALLOC_P(mallctl)(const char *name, void *oldp, size_t *oldlenp,
+    void *newp, size_t newlen);
+int	JEMALLOC_P(mallctlnametomib)(const char *name, size_t *mibp,
+    size_t *miblenp);
+int	JEMALLOC_P(mallctlbymib)(const size_t *mib, size_t miblen, void *oldp,
+    size_t *oldlenp, void *newp, size_t newlen);
+
+#ifdef __cplusplus
+};
+#endif
+#endif /* JEMALLOC_H_ */
diff --git a/externals/jemalloc/jemalloc/jemalloc_defs.h b/externals/jemalloc/jemalloc/jemalloc_defs.h
new file mode 100644
index 00000000000..e8acaed3abd
--- /dev/null
+++ b/externals/jemalloc/jemalloc/jemalloc_defs.h
@@ -0,0 +1,102 @@
+/* include/jemalloc/jemalloc_defs.h.  Generated from jemalloc_defs.h.in by configure.  */
+#ifndef JEMALLOC_DEFS_H_
+#define	JEMALLOC_DEFS_H_
+
+/*
+ * If JEMALLOC_PREFIX is defined, it will cause all public APIs to be prefixed.
+ * This makes it possible, with some care, to use multiple allocators
+ * simultaneously.
+ *
+ * In many cases it is more convenient to manually prefix allocator function
+ * calls than to let macros do it automatically, particularly when using
+ * multiple allocators simultaneously.  Define JEMALLOC_MANGLE before
+ * #include'ing jemalloc.h in order to cause name mangling that corresponds to
+ * the API prefixing.
+ */
+/* #undef JEMALLOC_PREFIX */
+#if (defined(JEMALLOC_PREFIX) && defined(JEMALLOC_MANGLE))
+/* #undef JEMALLOC_P */
+#endif
+
+/*
+ * Hyper-threaded CPUs may need a special instruction inside spin loops in
+ * order to yield to another virtual CPU.
+ */
+#define CPU_SPINWAIT __asm__ volatile("pause")
+
+/* Defined if __attribute__((...)) syntax is supported. */
+#define JEMALLOC_HAVE_ATTR 
+#ifdef JEMALLOC_HAVE_ATTR
+#  define JEMALLOC_ATTR(s) __attribute__((s))
+#else
+#  define JEMALLOC_ATTR(s)
+#endif
+
+/*
+ * JEMALLOC_DEBUG enables assertions and other sanity checks, and disables
+ * inline functions.
+ */
+/* #undef JEMALLOC_DEBUG */
+
+/* JEMALLOC_STATS enables statistics calculation. */
+/* #undef JEMALLOC_STATS */
+
+/* JEMALLOC_PROF enables allocation profiling. */
+/* #undef JEMALLOC_PROF */
+
+/* Use libunwind for profile backtracing if defined. */
+/* #undef JEMALLOC_PROF_LIBUNWIND */
+
+/* Use libgcc for profile backtracing if defined. */
+/* #undef JEMALLOC_PROF_LIBGCC */
+
+/*
+ * JEMALLOC_TINY enables support for tiny objects, which are smaller than one
+ * quantum.
+ */
+#define JEMALLOC_TINY 
+
+/*
+ * JEMALLOC_TCACHE enables a thread-specific caching layer for small objects.
+ * This makes it possible to allocate/deallocate objects without any locking
+ * when the cache is in the steady state.
+ */
+#define JEMALLOC_TCACHE 
+
+/*
+ * JEMALLOC_DSS enables use of sbrk(2) to allocate chunks from the data storage
+ * segment (DSS).
+ */
+/* #undef JEMALLOC_DSS */
+
+/* JEMALLOC_SWAP enables mmap()ed swap file support. */
+/* #undef JEMALLOC_SWAP */
+
+/* Support memory filling (junk/zero). */
+/* #undef JEMALLOC_FILL */
+
+/* Support optional abort() on OOM. */
+/* #undef JEMALLOC_XMALLOC */
+
+/* Support SYSV semantics. */
+/* #undef JEMALLOC_SYSV */
+
+/* Support lazy locking (avoid locking unless a second thread is launched). */
+#define JEMALLOC_LAZY_LOCK 
+
+/* Determine page size at run time if defined. */
+/* #undef DYNAMIC_PAGE_SHIFT */
+
+/* One page is 2^STATIC_PAGE_SHIFT bytes. */
+#define STATIC_PAGE_SHIFT 12
+
+/* TLS is used to map arenas and magazine caches to threads. */
+/* #undef NO_TLS */
+
+/* sizeof(void *) == 2^LG_SIZEOF_PTR. */
+#define LG_SIZEOF_PTR 3
+
+/* sizeof(int) == 2^LG_SIZEOF_INT. */
+#define LG_SIZEOF_INT 2
+
+#endif /* JEMALLOC_DEFS_H_ */
diff --git a/externals/jemalloc/jemalloc/jemalloc_defs.h.in b/externals/jemalloc/jemalloc/jemalloc_defs.h.in
new file mode 100644
index 00000000000..8b98d670acc
--- /dev/null
+++ b/externals/jemalloc/jemalloc/jemalloc_defs.h.in
@@ -0,0 +1,101 @@
+#ifndef JEMALLOC_DEFS_H_
+#define	JEMALLOC_DEFS_H_
+
+/*
+ * If JEMALLOC_PREFIX is defined, it will cause all public APIs to be prefixed.
+ * This makes it possible, with some care, to use multiple allocators
+ * simultaneously.
+ *
+ * In many cases it is more convenient to manually prefix allocator function
+ * calls than to let macros do it automatically, particularly when using
+ * multiple allocators simultaneously.  Define JEMALLOC_MANGLE before
+ * #include'ing jemalloc.h in order to cause name mangling that corresponds to
+ * the API prefixing.
+ */
+#undef JEMALLOC_PREFIX
+#if (defined(JEMALLOC_PREFIX) && defined(JEMALLOC_MANGLE))
+#undef JEMALLOC_P
+#endif
+
+/*
+ * Hyper-threaded CPUs may need a special instruction inside spin loops in
+ * order to yield to another virtual CPU.
+ */
+#undef CPU_SPINWAIT
+
+/* Defined if __attribute__((...)) syntax is supported. */
+#undef JEMALLOC_HAVE_ATTR
+#ifdef JEMALLOC_HAVE_ATTR
+#  define JEMALLOC_ATTR(s) __attribute__((s))
+#else
+#  define JEMALLOC_ATTR(s)
+#endif
+
+/*
+ * JEMALLOC_DEBUG enables assertions and other sanity checks, and disables
+ * inline functions.
+ */
+#undef JEMALLOC_DEBUG
+
+/* JEMALLOC_STATS enables statistics calculation. */
+#undef JEMALLOC_STATS
+
+/* JEMALLOC_PROF enables allocation profiling. */
+#undef JEMALLOC_PROF
+
+/* Use libunwind for profile backtracing if defined. */
+#undef JEMALLOC_PROF_LIBUNWIND
+
+/* Use libgcc for profile backtracing if defined. */
+#undef JEMALLOC_PROF_LIBGCC
+
+/*
+ * JEMALLOC_TINY enables support for tiny objects, which are smaller than one
+ * quantum.
+ */
+#undef JEMALLOC_TINY
+
+/*
+ * JEMALLOC_TCACHE enables a thread-specific caching layer for small objects.
+ * This makes it possible to allocate/deallocate objects without any locking
+ * when the cache is in the steady state.
+ */
+#undef JEMALLOC_TCACHE
+
+/*
+ * JEMALLOC_DSS enables use of sbrk(2) to allocate chunks from the data storage
+ * segment (DSS).
+ */
+#undef JEMALLOC_DSS
+
+/* JEMALLOC_SWAP enables mmap()ed swap file support. */
+#undef JEMALLOC_SWAP
+
+/* Support memory filling (junk/zero). */
+#undef JEMALLOC_FILL
+
+/* Support optional abort() on OOM. */
+#undef JEMALLOC_XMALLOC
+
+/* Support SYSV semantics. */
+#undef JEMALLOC_SYSV
+
+/* Support lazy locking (avoid locking unless a second thread is launched). */
+#undef JEMALLOC_LAZY_LOCK
+
+/* Determine page size at run time if defined. */
+#undef DYNAMIC_PAGE_SHIFT
+
+/* One page is 2^STATIC_PAGE_SHIFT bytes. */
+#undef STATIC_PAGE_SHIFT
+
+/* TLS is used to map arenas and magazine caches to threads. */
+#undef NO_TLS
+
+/* sizeof(void *) == 2^LG_SIZEOF_PTR. */
+#undef LG_SIZEOF_PTR
+
+/* sizeof(int) == 2^LG_SIZEOF_INT. */
+#undef LG_SIZEOF_INT
+
+#endif /* JEMALLOC_DEFS_H_ */
diff --git a/externals/mersennetwister/delme b/externals/mersennetwister/delme
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/externals/sockets/CMakeLists.txt b/externals/sockets/CMakeLists.txt
index a47c8dee75f..716da975ca9 100644
--- a/externals/sockets/CMakeLists.txt
+++ b/externals/sockets/CMakeLists.txt
@@ -1,26 +1,10 @@
-SET(trinitysockets_STAT_SRCS
-   Base64.cpp
-   Exception.cpp
-   Ipv4Address.cpp
-   Ipv6Address.cpp
-   Lock.cpp
-   Mutex.cpp
-   Parse.cpp
-   ResolvServer.cpp
-   ResolvSocket.cpp
-   Socket.cpp
-   SocketHandler.cpp
-   StdoutLog.cpp
-   StreamSocket.cpp
-   TcpSocket.cpp
-   Thread.cpp
-   UdpSocket.cpp
-   Utility.cpp
-   socket_include.cpp
+file(GLOB sources *.cpp)
+set(trinitysockets_STAT_SRCS
+  ${sources}
 )
 
 include_directories(
-  ${CMAKE_SOURCE_DIR}/dep/include/sockets
+  ${CMAKE_CURRENT_SOURCE_DIR}/include
 )
 
 add_library(trinitysockets STATIC ${trinitysockets_STAT_SRCS})
diff --git a/externals/sockets/Makefile b/externals/sockets/Makefile
new file mode 100644
index 00000000000..80faf67aed9
--- /dev/null
+++ b/externals/sockets/Makefile
@@ -0,0 +1,136 @@
+# CMAKE generated file: DO NOT EDIT!
+# Generated by "Unix Makefiles" Generator, CMake Version 2.6
+
+# Default target executed when no arguments are given to make.
+default_target: all
+.PHONY : default_target
+
+#=============================================================================
+# Special targets provided by cmake.
+
+# Disable implicit rules so canoncical targets will work.
+.SUFFIXES:
+
+# Remove some rules from gmake that .SUFFIXES does not remove.
+SUFFIXES =
+
+.SUFFIXES: .hpux_make_needs_suffix_list
+
+# Suppress display of executed commands.
+$(VERBOSE).SILENT:
+
+# A target that is always out of date.
+cmake_force:
+.PHONY : cmake_force
+
+#=============================================================================
+# Set environment variables for the build.
+
+# The shell in which to execute make rules.
+SHELL = /bin/sh
+
+# The CMake executable.
+CMAKE_COMMAND = /usr/bin/cmake
+
+# The command to remove a file.
+RM = /usr/bin/cmake -E remove -f
+
+# The program to use to edit the cache.
+CMAKE_EDIT_COMMAND = /usr/bin/ccmake
+
+# The top-level source directory on which CMake was run.
+CMAKE_SOURCE_DIR = /home/trinity/dev/trinitycore/externals/sockets
+
+# The top-level build directory on which CMake was run.
+CMAKE_BINARY_DIR = /home/trinity/dev/trinitycore/externals/sockets
+
+#=============================================================================
+# Targets provided globally by CMake.
+
+# Special rule for the target edit_cache
+edit_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
+	/usr/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : edit_cache
+
+# Special rule for the target edit_cache
+edit_cache/fast: edit_cache
+.PHONY : edit_cache/fast
+
+# Special rule for the target rebuild_cache
+rebuild_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+	/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : rebuild_cache
+
+# Special rule for the target rebuild_cache
+rebuild_cache/fast: rebuild_cache
+.PHONY : rebuild_cache/fast
+
+# The main all target
+all: cmake_check_build_system
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/trinity/dev/trinitycore/externals/sockets/CMakeFiles /home/trinity/dev/trinitycore/externals/sockets/CMakeFiles/progress.make
+	$(MAKE) -f CMakeFiles/Makefile2 all
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/trinity/dev/trinitycore/externals/sockets/CMakeFiles 0
+.PHONY : all
+
+# The main clean target
+clean:
+	$(MAKE) -f CMakeFiles/Makefile2 clean
+.PHONY : clean
+
+# The main clean target
+clean/fast: clean
+.PHONY : clean/fast
+
+# Prepare targets for installation.
+preinstall: all
+	$(MAKE) -f CMakeFiles/Makefile2 preinstall
+.PHONY : preinstall
+
+# Prepare targets for installation.
+preinstall/fast:
+	$(MAKE) -f CMakeFiles/Makefile2 preinstall
+.PHONY : preinstall/fast
+
+# clear depends
+depend:
+	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+.PHONY : depend
+
+#=============================================================================
+# Target rules for targets named trinitysockets
+
+# Build rule for target.
+trinitysockets: cmake_check_build_system
+	$(MAKE) -f CMakeFiles/Makefile2 trinitysockets
+.PHONY : trinitysockets
+
+# fast build rule for target.
+trinitysockets/fast:
+	$(MAKE) -f CMakeFiles/trinitysockets.dir/build.make CMakeFiles/trinitysockets.dir/build
+.PHONY : trinitysockets/fast
+
+# Help Target
+help:
+	@echo "The following are some of the valid targets for this Makefile:"
+	@echo "... all (the default if no target is provided)"
+	@echo "... clean"
+	@echo "... depend"
+	@echo "... edit_cache"
+	@echo "... rebuild_cache"
+	@echo "... trinitysockets"
+.PHONY : help
+
+
+
+#=============================================================================
+# Special targets to cleanup operation of make.
+
+# Special rule to run CMake to check the build system integrity.
+# No rule that depends on this can have commands that come from listfiles
+# because they might be regenerated.
+cmake_check_build_system:
+	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+.PHONY : cmake_check_build_system
+
diff --git a/externals/zlib/CMakeLists.txt b/externals/zlib/CMakeLists.txt
new file mode 100644
index 00000000000..1887110020c
--- /dev/null
+++ b/externals/zlib/CMakeLists.txt
@@ -0,0 +1,12 @@
+file(GLOB sources *.c)
+file(GLOB headers *.h)
+
+SET(zlib_STAT_SRCS
+  ${sources}
+  )
+
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  )
+
+add_library(zlib STATIC ${zlib_STAT_SRCS})
diff --git a/externals/zlib/ChangeLog b/externals/zlib/ChangeLog
deleted file mode 100644
index f310bb0fcdb..00000000000
--- a/externals/zlib/ChangeLog
+++ /dev/null
@@ -1,1208 +0,0 @@
-
-                ChangeLog file for zlib
-
-Changes in 1.2.5 (19 Apr 2010)
-- Disable visibility attribute in win32/Makefile.gcc [Bar-Lev]
-- Default to libdir as sharedlibdir in configure [Nieder]
-- Update copyright dates on modified source files
-- Update trees.c to be able to generate modified trees.h
-- Exit configure for MinGW, suggesting win32/Makefile.gcc
-
-Changes in 1.2.4.5 (18 Apr 2010)
-- Set sharedlibdir in configure [Torok]
-- Set LDFLAGS in Makefile.in [Bar-Lev]
-- Avoid mkdir objs race condition in Makefile.in [Bowler]
-- Add ZLIB_INTERNAL in front of internal inter-module functions and arrays
-- Define ZLIB_INTERNAL to hide internal functions and arrays for GNU C
-- Don't use hidden attribute when it is a warning generator (e.g. Solaris)
-
-Changes in 1.2.4.4 (18 Apr 2010)
-- Fix CROSS_PREFIX executable testing, CHOST extract, mingw* [Torok]
-- Undefine _LARGEFILE64_SOURCE in zconf.h if it is zero, but not if empty
-- Try to use bash or ksh regardless of functionality of /bin/sh
-- Fix configure incompatibility with NetBSD sh
-- Remove attempt to run under bash or ksh since have better NetBSD fix
-- Fix win32/Makefile.gcc for MinGW [Bar-Lev]
-- Add diagnostic messages when using CROSS_PREFIX in configure
-- Added --sharedlibdir option to configure [Weigelt]
-- Use hidden visibility attribute when available [Frysinger]
-
-Changes in 1.2.4.3 (10 Apr 2010)
-- Only use CROSS_PREFIX in configure for ar and ranlib if they exist
-- Use CROSS_PREFIX for nm [Bar-Lev]
-- Assume _LARGEFILE64_SOURCE defined is equivalent to true
-- Avoid use of undefined symbols in #if with && and ||
-- Make *64 prototypes in gzguts.h consistent with functions
-- Add -shared load option for MinGW in configure [Bowler]
-- Move z_off64_t to public interface, use instead of off64_t
-- Remove ! from shell test in configure (not portable to Solaris)
-- Change +0 macro tests to -0 for possibly increased portability
-
-Changes in 1.2.4.2 (9 Apr 2010)
-- Add consistent carriage returns to readme.txt's in masmx86 and masmx64
-- Really provide prototypes for *64 functions when building without LFS
-- Only define unlink() in minigzip.c if unistd.h not included
-- Update README to point to contrib/vstudio project files
-- Move projects/vc6 to old/ and remove projects/
-- Include stdlib.h in minigzip.c for setmode() definition under WinCE
-- Clean up assembler builds in win32/Makefile.msc [Rowe]
-- Include sys/types.h for Microsoft for off_t definition
-- Fix memory leak on error in gz_open()
-- Symbolize nm as $NM in configure [Weigelt]
-- Use TEST_LDSHARED instead of LDSHARED to link test programs [Weigelt]
-- Add +0 to _FILE_OFFSET_BITS and _LFS64_LARGEFILE in case not defined
-- Fix bug in gzeof() to take into account unused input data
-- Avoid initialization of structures with variables in puff.c
-- Updated win32/README-WIN32.txt [Rowe]
-
-Changes in 1.2.4.1 (28 Mar 2010)
-- Remove the use of [a-z] constructs for sed in configure [gentoo 310225]
-- Remove $(SHAREDLIB) from LIBS in Makefile.in [Creech]
-- Restore "for debugging" comment on sprintf() in gzlib.c
-- Remove fdopen for MVS from gzguts.h
-- Put new README-WIN32.txt in win32 [Rowe]
-- Add check for shell to configure and invoke another shell if needed
-- Fix big fat stinking bug in gzseek() on uncompressed files
-- Remove vestigial F_OPEN64 define in zutil.h
-- Set and check the value of _LARGEFILE_SOURCE and _LARGEFILE64_SOURCE
-- Avoid errors on non-LFS systems when applications define LFS macros
-- Set EXE to ".exe" in configure for MINGW [Kahle]
-- Match crc32() in crc32.c exactly to the prototype in zlib.h [Sherrill]
-- Add prefix for cross-compilation in win32/makefile.gcc [Bar-Lev]
-- Add DLL install in win32/makefile.gcc [Bar-Lev]
-- Allow Linux* or linux* from uname in configure [Bar-Lev]
-- Allow ldconfig to be redefined in configure and Makefile.in [Bar-Lev]
-- Add cross-compilation prefixes to configure [Bar-Lev]
-- Match type exactly in gz_load() invocation in gzread.c
-- Match type exactly of zcalloc() in zutil.c to zlib.h alloc_func
-- Provide prototypes for *64 functions when building zlib without LFS
-- Don't use -lc when linking shared library on MinGW
-- Remove errno.h check in configure and vestigial errno code in zutil.h
-
-Changes in 1.2.4 (14 Mar 2010)
-- Fix VER3 extraction in configure for no fourth subversion
-- Update zlib.3, add docs to Makefile.in to make .pdf out of it
-- Add zlib.3.pdf to distribution
-- Don't set error code in gzerror() if passed pointer is NULL
-- Apply destination directory fixes to CMakeLists.txt [Lowman]
-- Move #cmakedefine's to a new zconf.in.cmakein
-- Restore zconf.h for builds that don't use configure or cmake
-- Add distclean to dummy Makefile for convenience
-- Update and improve INDEX, README, and FAQ
-- Update CMakeLists.txt for the return of zconf.h [Lowman]
-- Update contrib/vstudio/vc9 and vc10 [Vollant]
-- Change libz.dll.a back to libzdll.a in win32/Makefile.gcc
-- Apply license and readme changes to contrib/asm686 [Raiter]
-- Check file name lengths and add -c option in minigzip.c [Li]
-- Update contrib/amd64 and contrib/masmx86/ [Vollant]
-- Avoid use of "eof" parameter in trees.c to not shadow library variable
-- Update make_vms.com for removal of zlibdefs.h [Zinser]
-- Update assembler code and vstudio projects in contrib [Vollant]
-- Remove outdated assembler code contrib/masm686 and contrib/asm586
-- Remove old vc7 and vc8 from contrib/vstudio
-- Update win32/Makefile.msc, add ZLIB_VER_SUBREVISION [Rowe]
-- Fix memory leaks in gzclose_r() and gzclose_w(), file leak in gz_open()
-- Add contrib/gcc_gvmat64 for longest_match and inflate_fast [Vollant]
-- Remove *64 functions from win32/zlib.def (they're not 64-bit yet)
-- Fix bug in void-returning vsprintf() case in gzwrite.c
-- Fix name change from inflate.h in contrib/inflate86/inffas86.c
-- Check if temporary file exists before removing in make_vms.com [Zinser]
-- Fix make install and uninstall for --static option
-- Fix usage of _MSC_VER in gzguts.h and zutil.h [Truta]
-- Update readme.txt in contrib/masmx64 and masmx86 to assemble
-
-Changes in 1.2.3.9 (21 Feb 2010)
-- Expunge gzio.c
-- Move as400 build information to old
-- Fix updates in contrib/minizip and contrib/vstudio
-- Add const to vsnprintf test in configure to avoid warnings [Weigelt]
-- Delete zconf.h (made by configure) [Weigelt]
-- Change zconf.in.h to zconf.h.in per convention [Weigelt]
-- Check for NULL buf in gzgets()
-- Return empty string for gzgets() with len == 1 (like fgets())
-- Fix description of gzgets() in zlib.h for end-of-file, NULL return
-- Update minizip to 1.1 [Vollant]
-- Avoid MSVC loss of data warnings in gzread.c, gzwrite.c
-- Note in zlib.h that gzerror() should be used to distinguish from EOF
-- Remove use of snprintf() from gzlib.c
-- Fix bug in gzseek()
-- Update contrib/vstudio, adding vc9 and vc10 [Kuno, Vollant]
-- Fix zconf.h generation in CMakeLists.txt [Lowman]
-- Improve comments in zconf.h where modified by configure
-
-Changes in 1.2.3.8 (13 Feb 2010)
-- Clean up text files (tabs, trailing whitespace, etc.) [Oberhumer]
-- Use z_off64_t in gz_zero() and gz_skip() to match state->skip
-- Avoid comparison problem when sizeof(int) == sizeof(z_off64_t)
-- Revert to Makefile.in from 1.2.3.6 (live with the clutter)
-- Fix missing error return in gzflush(), add zlib.h note
-- Add *64 functions to zlib.map [Levin]
-- Fix signed/unsigned comparison in gz_comp()
-- Use SFLAGS when testing shared linking in configure
-- Add --64 option to ./configure to use -m64 with gcc
-- Fix ./configure --help to correctly name options
-- Have make fail if a test fails [Levin]
-- Avoid buffer overrun in contrib/masmx64/gvmat64.asm [Simpson]
-- Remove assembler object files from contrib
-
-Changes in 1.2.3.7 (24 Jan 2010)
-- Always gzopen() with O_LARGEFILE if available
-- Fix gzdirect() to work immediately after gzopen() or gzdopen()
-- Make gzdirect() more precise when the state changes while reading
-- Improve zlib.h documentation in many places
-- Catch memory allocation failure in gz_open()
-- Complete close operation if seek forward in gzclose_w() fails
-- Return Z_ERRNO from gzclose_r() if close() fails
-- Return Z_STREAM_ERROR instead of EOF for gzclose() being passed NULL
-- Return zero for gzwrite() errors to match zlib.h description
-- Return -1 on gzputs() error to match zlib.h description
-- Add zconf.in.h to allow recovery from configure modification [Weigelt]
-- Fix static library permissions in Makefile.in [Weigelt]
-- Avoid warnings in configure tests that hide functionality [Weigelt]
-- Add *BSD and DragonFly to Linux case in configure [gentoo 123571]
-- Change libzdll.a to libz.dll.a in win32/Makefile.gcc [gentoo 288212]
-- Avoid access of uninitialized data for first inflateReset2 call [Gomes]
-- Keep object files in subdirectories to reduce the clutter somewhat
-- Remove default Makefile and zlibdefs.h, add dummy Makefile
-- Add new external functions to Z_PREFIX, remove duplicates, z_z_ -> z_
-- Remove zlibdefs.h completely -- modify zconf.h instead
-
-Changes in 1.2.3.6 (17 Jan 2010)
-- Avoid void * arithmetic in gzread.c and gzwrite.c
-- Make compilers happier with const char * for gz_error message
-- Avoid unused parameter warning in inflate.c
-- Avoid signed-unsigned comparison warning in inflate.c
-- Indent #pragma's for traditional C
-- Fix usage of strwinerror() in glib.c, change to gz_strwinerror()
-- Correct email address in configure for system options
-- Update make_vms.com and add make_vms.com to contrib/minizip [Zinser]
-- Update zlib.map [Brown]
-- Fix Makefile.in for Solaris 10 make of example64 and minizip64 [Torok]
-- Apply various fixes to CMakeLists.txt [Lowman]
-- Add checks on len in gzread() and gzwrite()
-- Add error message for no more room for gzungetc()
-- Remove zlib version check in gzwrite()
-- Defer compression of gzprintf() result until need to
-- Use snprintf() in gzdopen() if available
-- Remove USE_MMAP configuration determination (only used by minigzip)
-- Remove examples/pigz.c (available separately)
-- Update examples/gun.c to 1.6
-
-Changes in 1.2.3.5 (8 Jan 2010)
-- Add space after #if in zutil.h for some compilers
-- Fix relatively harmless bug in deflate_fast() [Exarevsky]
-- Fix same problem in deflate_slow()
-- Add $(SHAREDLIBV) to LIBS in Makefile.in [Brown]
-- Add deflate_rle() for faster Z_RLE strategy run-length encoding
-- Add deflate_huff() for faster Z_HUFFMAN_ONLY encoding
-- Change name of "write" variable in inffast.c to avoid library collisions
-- Fix premature EOF from gzread() in gzio.c [Brown]
-- Use zlib header window size if windowBits is 0 in inflateInit2()
-- Remove compressBound() call in deflate.c to avoid linking compress.o
-- Replace use of errno in gz* with functions, support WinCE [Alves]
-- Provide alternative to perror() in minigzip.c for WinCE [Alves]
-- Don't use _vsnprintf on later versions of MSVC [Lowman]
-- Add CMake build script and input file [Lowman]
-- Update contrib/minizip to 1.1 [Svensson, Vollant]
-- Moved nintendods directory from contrib to .
-- Replace gzio.c with a new set of routines with the same functionality
-- Add gzbuffer(), gzoffset(), gzclose_r(), gzclose_w() as part of above
-- Update contrib/minizip to 1.1b
-- Change gzeof() to return 0 on error instead of -1 to agree with zlib.h
-
-Changes in 1.2.3.4 (21 Dec 2009)
-- Use old school .SUFFIXES in Makefile.in for FreeBSD compatibility
-- Update comments in configure and Makefile.in for default --shared
-- Fix test -z's in configure [Marquess]
-- Build examplesh and minigzipsh when not testing
-- Change NULL's to Z_NULL's in deflate.c and in comments in zlib.h
-- Import LDFLAGS from the environment in configure
-- Fix configure to populate SFLAGS with discovered CFLAGS options
-- Adapt make_vms.com to the new Makefile.in [Zinser]
-- Add zlib2ansi script for C++ compilation [Marquess]
-- Add _FILE_OFFSET_BITS=64 test to make test (when applicable)
-- Add AMD64 assembler code for longest match to contrib [Teterin]
-- Include options from $SFLAGS when doing $LDSHARED
-- Simplify 64-bit file support by introducing z_off64_t type
-- Make shared object files in objs directory to work around old Sun cc
-- Use only three-part version number for Darwin shared compiles
-- Add rc option to ar in Makefile.in for when ./configure not run
-- Add -WI,-rpath,. to LDFLAGS for OSF 1 V4*
-- Set LD_LIBRARYN32_PATH for SGI IRIX shared compile
-- Protect against _FILE_OFFSET_BITS being defined when compiling zlib
-- Rename Makefile.in targets allstatic to static and allshared to shared
-- Fix static and shared Makefile.in targets to be independent
-- Correct error return bug in gz_open() by setting state [Brown]
-- Put spaces before ;;'s in configure for better sh compatibility
-- Add pigz.c (parallel implementation of gzip) to examples/
-- Correct constant in crc32.c to UL [Leventhal]
-- Reject negative lengths in crc32_combine()
-- Add inflateReset2() function to work like inflateEnd()/inflateInit2()
-- Include sys/types.h for _LARGEFILE64_SOURCE [Brown]
-- Correct typo in doc/algorithm.txt [Janik]
-- Fix bug in adler32_combine() [Zhu]
-- Catch missing-end-of-block-code error in all inflates and in puff
-    Assures that random input to inflate eventually results in an error
-- Added enough.c (calculation of ENOUGH for inftrees.h) to examples/
-- Update ENOUGH and its usage to reflect discovered bounds
-- Fix gzerror() error report on empty input file [Brown]
-- Add ush casts in trees.c to avoid pedantic runtime errors
-- Fix typo in zlib.h uncompress() description [Reiss]
-- Correct inflate() comments with regard to automatic header detection
-- Remove deprecation comment on Z_PARTIAL_FLUSH (it stays)
-- Put new version of gzlog (2.0) in examples with interruption recovery
-- Add puff compile option to permit invalid distance-too-far streams
-- Add puff TEST command options, ability to read piped input
-- Prototype the *64 functions in zlib.h when _FILE_OFFSET_BITS == 64, but
-  _LARGEFILE64_SOURCE not defined
-- Fix Z_FULL_FLUSH to truly erase the past by resetting s->strstart
-- Fix deflateSetDictionary() to use all 32K for output consistency
-- Remove extraneous #define MIN_LOOKAHEAD in deflate.c (in deflate.h)
-- Clear bytes after deflate lookahead to avoid use of uninitialized data
-- Change a limit in inftrees.c to be more transparent to Coverity Prevent
-- Update win32/zlib.def with exported symbols from zlib.h
-- Correct spelling error in zlib.h [Willem]
-- Allow Z_BLOCK for deflate() to force a new block
-- Allow negative bits in inflatePrime() to delete existing bit buffer
-- Add Z_TREES flush option to inflate() to return at end of trees
-- Add inflateMark() to return current state information for random access
-- Add Makefile for NintendoDS to contrib [Costa]
-- Add -w in configure compile tests to avoid spurious warnings [Beucler]
-- Fix typos in zlib.h comments for deflateSetDictionary()
-- Fix EOF detection in transparent gzread() [Maier]
-
-Changes in 1.2.3.3 (2 October 2006)
-- Make --shared the default for configure, add a --static option
-- Add compile option to permit invalid distance-too-far streams
-- Add inflateUndermine() function which is required to enable above
-- Remove use of "this" variable name for C++ compatibility [Marquess]
-- Add testing of shared library in make test, if shared library built
-- Use ftello() and fseeko() if available instead of ftell() and fseek()
-- Provide two versions of all functions that use the z_off_t type for
-  binary compatibility -- a normal version and a 64-bit offset version,
-  per the Large File Support Extension when _LARGEFILE64_SOURCE is
-  defined; use the 64-bit versions by default when _FILE_OFFSET_BITS
-  is defined to be 64
-- Add a --uname= option to configure to perhaps help with cross-compiling
-
-Changes in 1.2.3.2 (3 September 2006)
-- Turn off silly Borland warnings [Hay]
-- Use off64_t and define _LARGEFILE64_SOURCE when present
-- Fix missing dependency on inffixed.h in Makefile.in
-- Rig configure --shared to build both shared and static [Teredesai, Truta]
-- Remove zconf.in.h and instead create a new zlibdefs.h file
-- Fix contrib/minizip/unzip.c non-encrypted after encrypted [Vollant]
-- Add treebuild.xml (see http://treebuild.metux.de/) [Weigelt]
-
-Changes in 1.2.3.1 (16 August 2006)
-- Add watcom directory with OpenWatcom make files [Daniel]
-- Remove #undef of FAR in zconf.in.h for MVS [Fedtke]
-- Update make_vms.com [Zinser]
-- Use -fPIC for shared build in configure [Teredesai, Nicholson]
-- Use only major version number for libz.so on IRIX and OSF1 [Reinholdtsen]
-- Use fdopen() (not _fdopen()) for Interix in zutil.h [BŠck]
-- Add some FAQ entries about the contrib directory
-- Update the MVS question in the FAQ
-- Avoid extraneous reads after EOF in gzio.c [Brown]
-- Correct spelling of "successfully" in gzio.c [Randers-Pehrson]
-- Add comments to zlib.h about gzerror() usage [Brown]
-- Set extra flags in gzip header in gzopen() like deflate() does
-- Make configure options more compatible with double-dash conventions
-  [Weigelt]
-- Clean up compilation under Solaris SunStudio cc [Rowe, Reinholdtsen]
-- Fix uninstall target in Makefile.in [Truta]
-- Add pkgconfig support [Weigelt]
-- Use $(DESTDIR) macro in Makefile.in [Reinholdtsen, Weigelt]
-- Replace set_data_type() with a more accurate detect_data_type() in
-  trees.c, according to the txtvsbin.txt document [Truta]
-- Swap the order of #include  and #include "zlib.h" in
-  gzio.c, example.c and minigzip.c [Truta]
-- Shut up annoying VS2005 warnings about standard C deprecation [Rowe,
-  Truta] (where?)
-- Fix target "clean" from win32/Makefile.bor [Truta]
-- Create .pdb and .manifest files in win32/makefile.msc [Ziegler, Rowe]
-- Update zlib www home address in win32/DLL_FAQ.txt [Truta]
-- Update contrib/masmx86/inffas32.asm for VS2005 [Vollant, Van Wassenhove]
-- Enable browse info in the "Debug" and "ASM Debug" configurations in
-  the Visual C++ 6 project, and set (non-ASM) "Debug" as default [Truta]
-- Add pkgconfig support [Weigelt]
-- Add ZLIB_VER_MAJOR, ZLIB_VER_MINOR and ZLIB_VER_REVISION in zlib.h,
-  for use in win32/zlib1.rc [Polushin, Rowe, Truta]
-- Add a document that explains the new text detection scheme to
-  doc/txtvsbin.txt [Truta]
-- Add rfc1950.txt, rfc1951.txt and rfc1952.txt to doc/ [Truta]
-- Move algorithm.txt into doc/ [Truta]
-- Synchronize FAQ with website
-- Fix compressBound(), was low for some pathological cases [Fearnley]
-- Take into account wrapper variations in deflateBound()
-- Set examples/zpipe.c input and output to binary mode for Windows
-- Update examples/zlib_how.html with new zpipe.c (also web site)
-- Fix some warnings in examples/gzlog.c and examples/zran.c (it seems
-  that gcc became pickier in 4.0)
-- Add zlib.map for Linux: "All symbols from zlib-1.1.4 remain
-  un-versioned, the patch adds versioning only for symbols introduced in
-  zlib-1.2.0 or later.  It also declares as local those symbols which are
-  not designed to be exported." [Levin]
-- Update Z_PREFIX list in zconf.in.h, add --zprefix option to configure
-- Do not initialize global static by default in trees.c, add a response
-  NO_INIT_GLOBAL_POINTERS to initialize them if needed [Marquess]
-- Don't use strerror() in gzio.c under WinCE [Yakimov]
-- Don't use errno.h in zutil.h under WinCE [Yakimov]
-- Move arguments for AR to its usage to allow replacing ar [Marot]
-- Add HAVE_VISIBILITY_PRAGMA in zconf.in.h for Mozilla [Randers-Pehrson]
-- Improve inflateInit() and inflateInit2() documentation
-- Fix structure size comment in inflate.h
-- Change configure help option from --h* to --help [Santos]
-
-Changes in 1.2.3 (18 July 2005)
-- Apply security vulnerability fixes to contrib/infback9 as well
-- Clean up some text files (carriage returns, trailing space)
-- Update testzlib, vstudio, masmx64, and masmx86 in contrib [Vollant]
-
-Changes in 1.2.2.4 (11 July 2005)
-- Add inflatePrime() function for starting inflation at bit boundary
-- Avoid some Visual C warnings in deflate.c
-- Avoid more silly Visual C warnings in inflate.c and inftrees.c for 64-bit
-  compile
-- Fix some spelling errors in comments [Betts]
-- Correct inflateInit2() error return documentation in zlib.h
-- Add zran.c example of compressed data random access to examples
-  directory, shows use of inflatePrime()
-- Fix cast for assignments to strm->state in inflate.c and infback.c
-- Fix zlibCompileFlags() in zutil.c to use 1L for long shifts [Oberhumer]
-- Move declarations of gf2 functions to right place in crc32.c [Oberhumer]
-- Add cast in trees.c t avoid a warning [Oberhumer]
-- Avoid some warnings in fitblk.c, gun.c, gzjoin.c in examples [Oberhumer]
-- Update make_vms.com [Zinser]
-- Initialize state->write in inflateReset() since copied in inflate_fast()
-- Be more strict on incomplete code sets in inflate_table() and increase
-  ENOUGH and MAXD -- this repairs a possible security vulnerability for
-  invalid inflate input.  Thanks to Tavis Ormandy and Markus Oberhumer for
-  discovering the vulnerability and providing test cases.
-- Add ia64 support to configure for HP-UX [Smith]
-- Add error return to gzread() for format or i/o error [Levin]
-- Use malloc.h for OS/2 [Necasek]
-
-Changes in 1.2.2.3 (27 May 2005)
-- Replace 1U constants in inflate.c and inftrees.c for 64-bit compile
-- Typecast fread() return values in gzio.c [Vollant]
-- Remove trailing space in minigzip.c outmode (VC++ can't deal with it)
-- Fix crc check bug in gzread() after gzungetc() [Heiner]
-- Add the deflateTune() function to adjust internal compression parameters
-- Add a fast gzip decompressor, gun.c, to examples (use of inflateBack)
-- Remove an incorrect assertion in examples/zpipe.c
-- Add C++ wrapper in infback9.h [Donais]
-- Fix bug in inflateCopy() when decoding fixed codes
-- Note in zlib.h how much deflateSetDictionary() actually uses
-- Remove USE_DICT_HEAD in deflate.c (would mess up inflate if used)
-- Add _WIN32_WCE to define WIN32 in zconf.in.h [Spencer]
-- Don't include stderr.h or errno.h for _WIN32_WCE in zutil.h [Spencer]
-- Add gzdirect() function to indicate transparent reads
-- Update contrib/minizip [Vollant]
-- Fix compilation of deflate.c when both ASMV and FASTEST [Oberhumer]
-- Add casts in crc32.c to avoid warnings [Oberhumer]
-- Add contrib/masmx64 [Vollant]
-- Update contrib/asm586, asm686, masmx86, testzlib, vstudio [Vollant]
-
-Changes in 1.2.2.2 (30 December 2004)
-- Replace structure assignments in deflate.c and inflate.c with zmemcpy to
-  avoid implicit memcpy calls (portability for no-library compilation)
-- Increase sprintf() buffer size in gzdopen() to allow for large numbers
-- Add INFLATE_STRICT to check distances against zlib header
-- Improve WinCE errno handling and comments [Chang]
-- Remove comment about no gzip header processing in FAQ
-- Add Z_FIXED strategy option to deflateInit2() to force fixed trees
-- Add updated make_vms.com [Coghlan], update README
-- Create a new "examples" directory, move gzappend.c there, add zpipe.c,
-  fitblk.c, gzlog.[ch], gzjoin.c, and zlib_how.html.
-- Add FAQ entry and comments in deflate.c on uninitialized memory access
-- Add Solaris 9 make options in configure [Gilbert]
-- Allow strerror() usage in gzio.c for STDC
-- Fix DecompressBuf in contrib/delphi/ZLib.pas [ManChesTer]
-- Update contrib/masmx86/inffas32.asm and gvmat32.asm [Vollant]
-- Use z_off_t for adler32_combine() and crc32_combine() lengths
-- Make adler32() much faster for small len
-- Use OS_CODE in deflate() default gzip header
-
-Changes in 1.2.2.1 (31 October 2004)
-- Allow inflateSetDictionary() call for raw inflate
-- Fix inflate header crc check bug for file names and comments
-- Add deflateSetHeader() and gz_header structure for custom gzip headers
-- Add inflateGetheader() to retrieve gzip headers
-- Add crc32_combine() and adler32_combine() functions
-- Add alloc_func, free_func, in_func, out_func to Z_PREFIX list
-- Use zstreamp consistently in zlib.h (inflate_back functions)
-- Remove GUNZIP condition from definition of inflate_mode in inflate.h
-  and in contrib/inflate86/inffast.S [Truta, Anderson]
-- Add support for AMD64 in contrib/inflate86/inffas86.c [Anderson]
-- Update projects/README.projects and projects/visualc6 [Truta]
-- Update win32/DLL_FAQ.txt [Truta]
-- Avoid warning under NO_GZCOMPRESS in gzio.c; fix typo [Truta]
-- Deprecate Z_ASCII; use Z_TEXT instead [Truta]
-- Use a new algorithm for setting strm->data_type in trees.c [Truta]
-- Do not define an exit() prototype in zutil.c unless DEBUG defined
-- Remove prototype of exit() from zutil.c, example.c, minigzip.c [Truta]
-- Add comment in zlib.h for Z_NO_FLUSH parameter to deflate()
-- Fix Darwin build version identification [Peterson]
-
-Changes in 1.2.2 (3 October 2004)
-- Update zlib.h comments on gzip in-memory processing
-- Set adler to 1 in inflateReset() to support Java test suite [Walles]
-- Add contrib/dotzlib [Ravn]
-- Update win32/DLL_FAQ.txt [Truta]
-- Update contrib/minizip [Vollant]
-- Move contrib/visual-basic.txt to old/ [Truta]
-- Fix assembler builds in projects/visualc6/ [Truta]
-
-Changes in 1.2.1.2 (9 September 2004)
-- Update INDEX file
-- Fix trees.c to update strm->data_type (no one ever noticed!)
-- Fix bug in error case in inflate.c, infback.c, and infback9.c [Brown]
-- Add "volatile" to crc table flag declaration (for DYNAMIC_CRC_TABLE)
-- Add limited multitasking protection to DYNAMIC_CRC_TABLE
-- Add NO_vsnprintf for VMS in zutil.h [Mozilla]
-- Don't declare strerror() under VMS [Mozilla]
-- Add comment to DYNAMIC_CRC_TABLE to use get_crc_table() to initialize
-- Update contrib/ada [Anisimkov]
-- Update contrib/minizip [Vollant]
-- Fix configure to not hardcode directories for Darwin [Peterson]
-- Fix gzio.c to not return error on empty files [Brown]
-- Fix indentation; update version in contrib/delphi/ZLib.pas and
-  contrib/pascal/zlibpas.pas [Truta]
-- Update mkasm.bat in contrib/masmx86 [Truta]
-- Update contrib/untgz [Truta]
-- Add projects/README.projects [Truta]
-- Add project for MS Visual C++ 6.0 in projects/visualc6 [Cadieux, Truta]
-- Update win32/DLL_FAQ.txt [Truta]
-- Update list of Z_PREFIX symbols in zconf.h [Randers-Pehrson, Truta]
-- Remove an unnecessary assignment to curr in inftrees.c [Truta]
-- Add OS/2 to exe builds in configure [Poltorak]
-- Remove err dummy parameter in zlib.h [Kientzle]
-
-Changes in 1.2.1.1 (9 January 2004)
-- Update email address in README
-- Several FAQ updates
-- Fix a big fat bug in inftrees.c that prevented decoding valid
-  dynamic blocks with only literals and no distance codes --
-  Thanks to "Hot Emu" for the bug report and sample file
-- Add a note to puff.c on no distance codes case.
-
-Changes in 1.2.1 (17 November 2003)
-- Remove a tab in contrib/gzappend/gzappend.c
-- Update some interfaces in contrib for new zlib functions
-- Update zlib version number in some contrib entries
-- Add Windows CE definition for ptrdiff_t in zutil.h [Mai, Truta]
-- Support shared libraries on Hurd and KFreeBSD [Brown]
-- Fix error in NO_DIVIDE option of adler32.c
-
-Changes in 1.2.0.8 (4 November 2003)
-- Update version in contrib/delphi/ZLib.pas and contrib/pascal/zlibpas.pas
-- Add experimental NO_DIVIDE #define in adler32.c
-    - Possibly faster on some processors (let me know if it is)
-- Correct Z_BLOCK to not return on first inflate call if no wrap
-- Fix strm->data_type on inflate() return to correctly indicate EOB
-- Add deflatePrime() function for appending in the middle of a byte
-- Add contrib/gzappend for an example of appending to a stream
-- Update win32/DLL_FAQ.txt [Truta]
-- Delete Turbo C comment in README [Truta]
-- Improve some indentation in zconf.h [Truta]
-- Fix infinite loop on bad input in configure script [Church]
-- Fix gzeof() for concatenated gzip files [Johnson]
-- Add example to contrib/visual-basic.txt [Michael B.]
-- Add -p to mkdir's in Makefile.in [vda]
-- Fix configure to properly detect presence or lack of printf functions
-- Add AS400 support [Monnerat]
-- Add a little Cygwin support [Wilson]
-
-Changes in 1.2.0.7 (21 September 2003)
-- Correct some debug formats in contrib/infback9
-- Cast a type in a debug statement in trees.c
-- Change search and replace delimiter in configure from % to # [Beebe]
-- Update contrib/untgz to 0.2 with various fixes [Truta]
-- Add build support for Amiga [Nikl]
-- Remove some directories in old that have been updated to 1.2
-- Add dylib building for Mac OS X in configure and Makefile.in
-- Remove old distribution stuff from Makefile
-- Update README to point to DLL_FAQ.txt, and add comment on Mac OS X
-- Update links in README
-
-Changes in 1.2.0.6 (13 September 2003)
-- Minor FAQ updates
-- Update contrib/minizip to 1.00 [Vollant]
-- Remove test of gz functions in example.c when GZ_COMPRESS defined [Truta]
-- Update POSTINC comment for 68060 [Nikl]
-- Add contrib/infback9 with deflate64 decoding (unsupported)
-- For MVS define NO_vsnprintf and undefine FAR [van Burik]
-- Add pragma for fdopen on MVS [van Burik]
-
-Changes in 1.2.0.5 (8 September 2003)
-- Add OF to inflateBackEnd() declaration in zlib.h
-- Remember start when using gzdopen in the middle of a file
-- Use internal off_t counters in gz* functions to properly handle seeks
-- Perform more rigorous check for distance-too-far in inffast.c
-- Add Z_BLOCK flush option to return from inflate at block boundary
-- Set strm->data_type on return from inflate
-    - Indicate bits unused, if at block boundary, and if in last block
-- Replace size_t with ptrdiff_t in crc32.c, and check for correct size
-- Add condition so old NO_DEFLATE define still works for compatibility
-- FAQ update regarding the Windows DLL [Truta]
-- INDEX update: add qnx entry, remove aix entry [Truta]
-- Install zlib.3 into mandir [Wilson]
-- Move contrib/zlib_dll_FAQ.txt to win32/DLL_FAQ.txt; update [Truta]
-- Adapt the zlib interface to the new DLL convention guidelines [Truta]
-- Introduce ZLIB_WINAPI macro to allow the export of functions using
-  the WINAPI calling convention, for Visual Basic [Vollant, Truta]
-- Update msdos and win32 scripts and makefiles [Truta]
-- Export symbols by name, not by ordinal, in win32/zlib.def [Truta]
-- Add contrib/ada [Anisimkov]
-- Move asm files from contrib/vstudio/vc70_32 to contrib/asm386 [Truta]
-- Rename contrib/asm386 to contrib/masmx86 [Truta, Vollant]
-- Add contrib/masm686 [Truta]
-- Fix offsets in contrib/inflate86 and contrib/masmx86/inffas32.asm
-  [Truta, Vollant]
-- Update contrib/delphi; rename to contrib/pascal; add example [Truta]
-- Remove contrib/delphi2; add a new contrib/delphi [Truta]
-- Avoid inclusion of the nonstandard  in contrib/iostream,
-  and fix some method prototypes [Truta]
-- Fix the ZCR_SEED2 constant to avoid warnings in contrib/minizip
-  [Truta]
-- Avoid the use of backslash (\) in contrib/minizip [Vollant]
-- Fix file time handling in contrib/untgz; update makefiles [Truta]
-- Update contrib/vstudio/vc70_32 to comply with the new DLL guidelines
-  [Vollant]
-- Remove contrib/vstudio/vc15_16 [Vollant]
-- Rename contrib/vstudio/vc70_32 to contrib/vstudio/vc7 [Truta]
-- Update README.contrib [Truta]
-- Invert the assignment order of match_head and s->prev[...] in
-  INSERT_STRING [Truta]
-- Compare TOO_FAR with 32767 instead of 32768, to avoid 16-bit warnings
-  [Truta]
-- Compare function pointers with 0, not with NULL or Z_NULL [Truta]
-- Fix prototype of syncsearch in inflate.c [Truta]
-- Introduce ASMINF macro to be enabled when using an ASM implementation
-  of inflate_fast [Truta]
-- Change NO_DEFLATE to NO_GZCOMPRESS [Truta]
-- Modify test_gzio in example.c to take a single file name as a
-  parameter [Truta]
-- Exit the example.c program if gzopen fails [Truta]
-- Add type casts around strlen in example.c [Truta]
-- Remove casting to sizeof in minigzip.c; give a proper type
-  to the variable compared with SUFFIX_LEN [Truta]
-- Update definitions of STDC and STDC99 in zconf.h [Truta]
-- Synchronize zconf.h with the new Windows DLL interface [Truta]
-- Use SYS16BIT instead of __32BIT__ to distinguish between
-  16- and 32-bit platforms [Truta]
-- Use far memory allocators in small 16-bit memory models for
-  Turbo C [Truta]
-- Add info about the use of ASMV, ASMINF and ZLIB_WINAPI in
-  zlibCompileFlags [Truta]
-- Cygwin has vsnprintf [Wilson]
-- In Windows16, OS_CODE is 0, as in MSDOS [Truta]
-- In Cygwin, OS_CODE is 3 (Unix), not 11 (Windows32) [Wilson]
-
-Changes in 1.2.0.4 (10 August 2003)
-- Minor FAQ updates
-- Be more strict when checking inflateInit2's windowBits parameter
-- Change NO_GUNZIP compile option to NO_GZIP to cover deflate as well
-- Add gzip wrapper option to deflateInit2 using windowBits
-- Add updated QNX rule in configure and qnx directory [Bonnefoy]
-- Make inflate distance-too-far checks more rigorous
-- Clean up FAR usage in inflate
-- Add casting to sizeof() in gzio.c and minigzip.c
-
-Changes in 1.2.0.3 (19 July 2003)
-- Fix silly error in gzungetc() implementation [Vollant]
-- Update contrib/minizip and contrib/vstudio [Vollant]
-- Fix printf format in example.c
-- Correct cdecl support in zconf.in.h [Anisimkov]
-- Minor FAQ updates
-
-Changes in 1.2.0.2 (13 July 2003)
-- Add ZLIB_VERNUM in zlib.h for numerical preprocessor comparisons
-- Attempt to avoid warnings in crc32.c for pointer-int conversion
-- Add AIX to configure, remove aix directory [Bakker]
-- Add some casts to minigzip.c
-- Improve checking after insecure sprintf() or vsprintf() calls
-- Remove #elif's from crc32.c
-- Change leave label to inf_leave in inflate.c and infback.c to avoid
-  library conflicts
-- Remove inflate gzip decoding by default--only enable gzip decoding by
-  special request for stricter backward compatibility
-- Add zlibCompileFlags() function to return compilation information
-- More typecasting in deflate.c to avoid warnings
-- Remove leading underscore from _Capital #defines [Truta]
-- Fix configure to link shared library when testing
-- Add some Windows CE target adjustments [Mai]
-- Remove #define ZLIB_DLL in zconf.h [Vollant]
-- Add zlib.3 [Rodgers]
-- Update RFC URL in deflate.c and algorithm.txt [Mai]
-- Add zlib_dll_FAQ.txt to contrib [Truta]
-- Add UL to some constants [Truta]
-- Update minizip and vstudio [Vollant]
-- Remove vestigial NEED_DUMMY_RETURN from zconf.in.h
-- Expand use of NO_DUMMY_DECL to avoid all dummy structures
-- Added iostream3 to contrib [Schwardt]
-- Replace rewind() with fseek() for WinCE [Truta]
-- Improve setting of zlib format compression level flags
-    - Report 0 for huffman and rle strategies and for level == 0 or 1
-    - Report 2 only for level == 6
-- Only deal with 64K limit when necessary at compile time [Truta]
-- Allow TOO_FAR check to be turned off at compile time [Truta]
-- Add gzclearerr() function [Souza]
-- Add gzungetc() function
-
-Changes in 1.2.0.1 (17 March 2003)
-- Add Z_RLE strategy for run-length encoding [Truta]
-    - When Z_RLE requested, restrict matches to distance one
-    - Update zlib.h, minigzip.c, gzopen(), gzdopen() for Z_RLE
-- Correct FASTEST compilation to allow level == 0
-- Clean up what gets compiled for FASTEST
-- Incorporate changes to zconf.in.h [Vollant]
-    - Refine detection of Turbo C need for dummy returns
-    - Refine ZLIB_DLL compilation
-    - Include additional header file on VMS for off_t typedef
-- Try to use _vsnprintf where it supplants vsprintf [Vollant]
-- Add some casts in inffast.c
-- Enchance comments in zlib.h on what happens if gzprintf() tries to
-  write more than 4095 bytes before compression
-- Remove unused state from inflateBackEnd()
-- Remove exit(0) from minigzip.c, example.c
-- Get rid of all those darn tabs
-- Add "check" target to Makefile.in that does the same thing as "test"
-- Add "mostlyclean" and "maintainer-clean" targets to Makefile.in
-- Update contrib/inflate86 [Anderson]
-- Update contrib/testzlib, contrib/vstudio, contrib/minizip [Vollant]
-- Add msdos and win32 directories with makefiles [Truta]
-- More additions and improvements to the FAQ
-
-Changes in 1.2.0 (9 March 2003)
-- New and improved inflate code
-    - About 20% faster
-    - Does not allocate 32K window unless and until needed
-    - Automatically detects and decompresses gzip streams
-    - Raw inflate no longer needs an extra dummy byte at end
-    - Added inflateBack functions using a callback interface--even faster
-      than inflate, useful for file utilities (gzip, zip)
-    - Added inflateCopy() function to record state for random access on
-      externally generated deflate streams (e.g. in gzip files)
-    - More readable code (I hope)
-- New and improved crc32()
-    - About 50% faster, thanks to suggestions from Rodney Brown
-- Add deflateBound() and compressBound() functions
-- Fix memory leak in deflateInit2()
-- Permit setting dictionary for raw deflate (for parallel deflate)
-- Fix const declaration for gzwrite()
-- Check for some malloc() failures in gzio.c
-- Fix bug in gzopen() on single-byte file 0x1f
-- Fix bug in gzread() on concatenated file with 0x1f at end of buffer
-  and next buffer doesn't start with 0x8b
-- Fix uncompress() to return Z_DATA_ERROR on truncated input
-- Free memory at end of example.c
-- Remove MAX #define in trees.c (conflicted with some libraries)
-- Fix static const's in deflate.c, gzio.c, and zutil.[ch]
-- Declare malloc() and free() in gzio.c if STDC not defined
-- Use malloc() instead of calloc() in zutil.c if int big enough
-- Define STDC for AIX
-- Add aix/ with approach for compiling shared library on AIX
-- Add HP-UX support for shared libraries in configure
-- Add OpenUNIX support for shared libraries in configure
-- Use $cc instead of gcc to build shared library
-- Make prefix directory if needed when installing
-- Correct Macintosh avoidance of typedef Byte in zconf.h
-- Correct Turbo C memory allocation when under Linux
-- Use libz.a instead of -lz in Makefile (assure use of compiled library)
-- Update configure to check for snprintf or vsnprintf functions and their
-  return value, warn during make if using an insecure function
-- Fix configure problem with compile-time knowledge of HAVE_UNISTD_H that
-  is lost when library is used--resolution is to build new zconf.h
-- Documentation improvements (in zlib.h):
-    - Document raw deflate and inflate
-    - Update RFCs URL
-    - Point out that zlib and gzip formats are different
-    - Note that Z_BUF_ERROR is not fatal
-    - Document string limit for gzprintf() and possible buffer overflow
-    - Note requirement on avail_out when flushing
-    - Note permitted values of flush parameter of inflate()
-- Add some FAQs (and even answers) to the FAQ
-- Add contrib/inflate86/ for x86 faster inflate
-- Add contrib/blast/ for PKWare Data Compression Library decompression
-- Add contrib/puff/ simple inflate for deflate format description
-
-Changes in 1.1.4 (11 March 2002)
-- ZFREE was repeated on same allocation on some error conditions.
-  This creates a security problem described in
-  http://www.zlib.org/advisory-2002-03-11.txt
-- Returned incorrect error (Z_MEM_ERROR) on some invalid data
-- Avoid accesses before window for invalid distances with inflate window
-  less than 32K.
-- force windowBits > 8 to avoid a bug in the encoder for a window size
-  of 256 bytes. (A complete fix will be available in 1.1.5).
-
-Changes in 1.1.3 (9 July 1998)
-- fix "an inflate input buffer bug that shows up on rare but persistent
-  occasions" (Mark)
-- fix gzread and gztell for concatenated .gz files (Didier Le Botlan)
-- fix gzseek(..., SEEK_SET) in write mode
-- fix crc check after a gzeek (Frank Faubert)
-- fix miniunzip when the last entry in a zip file is itself a zip file
-  (J Lillge)
-- add contrib/asm586 and contrib/asm686 (Brian Raiter)
-  See http://www.muppetlabs.com/~breadbox/software/assembly.html
-- add support for Delphi 3 in contrib/delphi (Bob Dellaca)
-- add support for C++Builder 3 and Delphi 3 in contrib/delphi2 (Davide Moretti)
-- do not exit prematurely in untgz if 0 at start of block (Magnus Holmgren)
-- use macro EXTERN instead of extern to support DLL for BeOS (Sander Stoks)
-- added a FAQ file
-
-- Support gzdopen on Mac with Metrowerks (Jason Linhart)
-- Do not redefine Byte on Mac (Brad Pettit & Jason Linhart)
-- define SEEK_END too if SEEK_SET is not defined (Albert Chin-A-Young)
-- avoid some warnings with Borland C (Tom Tanner)
-- fix a problem in contrib/minizip/zip.c for 16-bit MSDOS (Gilles Vollant)
-- emulate utime() for WIN32 in contrib/untgz  (Gilles Vollant)
-- allow several arguments to configure (Tim Mooney, Frodo Looijaard)
-- use libdir and includedir in Makefile.in (Tim Mooney)
-- support shared libraries on OSF1 V4 (Tim Mooney)
-- remove so_locations in "make clean"  (Tim Mooney)
-- fix maketree.c compilation error (Glenn, Mark)
-- Python interface to zlib now in Python 1.5 (Jeremy Hylton)
-- new Makefile.riscos (Rich Walker)
-- initialize static descriptors in trees.c for embedded targets (Nick Smith)
-- use "foo-gz" in example.c for RISCOS and VMS (Nick Smith)
-- add the OS/2 files in Makefile.in too (Andrew Zabolotny)
-- fix fdopen and halloc macros for Microsoft C 6.0 (Tom Lane)
-- fix maketree.c to allow clean compilation of inffixed.h (Mark)
-- fix parameter check in deflateCopy (Gunther Nikl)
-- cleanup trees.c, use compressed_len only in debug mode (Christian Spieler)
-- Many portability patches by Christian Spieler:
-  . zutil.c, zutil.h: added "const" for zmem*
-  . Make_vms.com: fixed some typos
-  . Make_vms.com: msdos/Makefile.*: removed zutil.h from some dependency lists
-  . msdos/Makefile.msc: remove "default rtl link library" info from obj files
-  . msdos/Makefile.*: use model-dependent name for the built zlib library
-  . msdos/Makefile.emx, nt/Makefile.emx, nt/Makefile.gcc:
-     new makefiles, for emx (DOS/OS2), emx&rsxnt and mingw32 (Windows 9x / NT)
-- use define instead of typedef for Bytef also for MSC small/medium (Tom Lane)
-- replace __far with _far for better portability (Christian Spieler, Tom Lane)
-- fix test for errno.h in configure (Tim Newsham)
-
-Changes in 1.1.2 (19 March 98)
-- added contrib/minzip, mini zip and unzip based on zlib (Gilles Vollant)
-  See http://www.winimage.com/zLibDll/unzip.html
-- preinitialize the inflate tables for fixed codes, to make the code
-  completely thread safe (Mark)
-- some simplifications and slight speed-up to the inflate code (Mark)
-- fix gzeof on non-compressed files (Allan Schrum)
-- add -std1 option in configure for OSF1 to fix gzprintf (Martin Mokrejs)
-- use default value of 4K for Z_BUFSIZE for 16-bit MSDOS (Tim Wegner + Glenn)
-- added os2/Makefile.def and os2/zlib.def (Andrew Zabolotny)
-- add shared lib support for UNIX_SV4.2MP (MATSUURA Takanori)
-- do not wrap extern "C" around system includes (Tom Lane)
-- mention zlib binding for TCL in README (Andreas Kupries)
-- added amiga/Makefile.pup for Amiga powerUP SAS/C PPC (Andreas Kleinert)
-- allow "make install prefix=..." even after configure (Glenn Randers-Pehrson)
-- allow "configure --prefix $HOME" (Tim Mooney)
-- remove warnings in example.c and gzio.c (Glenn Randers-Pehrson)
-- move Makefile.sas to amiga/Makefile.sas
-
-Changes in 1.1.1 (27 Feb 98)
-- fix macros _tr_tally_* in deflate.h for debug mode  (Glenn Randers-Pehrson)
-- remove block truncation heuristic which had very marginal effect for zlib
-  (smaller lit_bufsize than in gzip 1.2.4) and degraded a little the
-  compression ratio on some files. This also allows inlining _tr_tally for
-  matches in deflate_slow.
-- added msdos/Makefile.w32 for WIN32 Microsoft Visual C++ (Bob Frazier)
-
-Changes in 1.1.0 (24 Feb 98)
-- do not return STREAM_END prematurely in inflate (John Bowler)
-- revert to the zlib 1.0.8 inflate to avoid the gcc 2.8.0 bug (Jeremy Buhler)
-- compile with -DFASTEST to get compression code optimized for speed only
-- in minigzip, try mmap'ing the input file first (Miguel Albrecht)
-- increase size of I/O buffers in minigzip.c and gzio.c (not a big gain
-  on Sun but significant on HP)
-
-- add a pointer to experimental unzip library in README (Gilles Vollant)
-- initialize variable gcc in configure (Chris Herborth)
-
-Changes in 1.0.9 (17 Feb 1998)
-- added gzputs and gzgets functions
-- do not clear eof flag in gzseek (Mark Diekhans)
-- fix gzseek for files in transparent mode (Mark Diekhans)
-- do not assume that vsprintf returns the number of bytes written (Jens Krinke)
-- replace EXPORT with ZEXPORT to avoid conflict with other programs
-- added compress2 in zconf.h, zlib.def, zlib.dnt
-- new asm code from Gilles Vollant in contrib/asm386
-- simplify the inflate code (Mark):
- . Replace ZALLOC's in huft_build() with single ZALLOC in inflate_blocks_new()
- . ZALLOC the length list in inflate_trees_fixed() instead of using stack
- . ZALLOC the value area for huft_build() instead of using stack
- . Simplify Z_FINISH check in inflate()
-
-- Avoid gcc 2.8.0 comparison bug a little differently than zlib 1.0.8
-- in inftrees.c, avoid cc -O bug on HP (Farshid Elahi)
-- in zconf.h move the ZLIB_DLL stuff earlier to avoid problems with
-  the declaration of FAR (Gilles VOllant)
-- install libz.so* with mode 755 (executable) instead of 644 (Marc Lehmann)
-- read_buf buf parameter of type Bytef* instead of charf*
-- zmemcpy parameters are of type Bytef*, not charf* (Joseph Strout)
-- do not redeclare unlink in minigzip.c for WIN32 (John Bowler)
-- fix check for presence of directories in "make install" (Ian Willis)
-
-Changes in 1.0.8 (27 Jan 1998)
-- fixed offsets in contrib/asm386/gvmat32.asm (Gilles Vollant)
-- fix gzgetc and gzputc for big endian systems (Markus Oberhumer)
-- added compress2() to allow setting the compression level
-- include sys/types.h to get off_t on some systems (Marc Lehmann & QingLong)
-- use constant arrays for the static trees in trees.c instead of computing
-  them at run time (thanks to Ken Raeburn for this suggestion). To create
-  trees.h, compile with GEN_TREES_H and run "make test".
-- check return code of example in "make test" and display result
-- pass minigzip command line options to file_compress
-- simplifying code of inflateSync to avoid gcc 2.8 bug
-
-- support CC="gcc -Wall" in configure -s (QingLong)
-- avoid a flush caused by ftell in gzopen for write mode (Ken Raeburn)
-- fix test for shared library support to avoid compiler warnings
-- zlib.lib -> zlib.dll in msdos/zlib.rc (Gilles Vollant)
-- check for TARGET_OS_MAC in addition to MACOS (Brad Pettit)
-- do not use fdopen for Metrowerks on Mac (Brad Pettit))
-- add checks for gzputc and gzputc in example.c
-- avoid warnings in gzio.c and deflate.c (Andreas Kleinert)
-- use const for the CRC table (Ken Raeburn)
-- fixed "make uninstall" for shared libraries
-- use Tracev instead of Trace in infblock.c
-- in example.c use correct compressed length for test_sync
-- suppress +vnocompatwarnings in configure for HPUX (not always supported)
-
-Changes in 1.0.7 (20 Jan 1998)
-- fix gzseek which was broken in write mode
-- return error for gzseek to negative absolute position
-- fix configure for Linux (Chun-Chung Chen)
-- increase stack space for MSC (Tim Wegner)
-- get_crc_table and inflateSyncPoint are EXPORTed (Gilles Vollant)
-- define EXPORTVA for gzprintf (Gilles Vollant)
-- added man page zlib.3 (Rick Rodgers)
-- for contrib/untgz, fix makedir() and improve Makefile
-
-- check gzseek in write mode in example.c
-- allocate extra buffer for seeks only if gzseek is actually called
-- avoid signed/unsigned comparisons (Tim Wegner, Gilles Vollant)
-- add inflateSyncPoint in zconf.h
-- fix list of exported functions in nt/zlib.dnt and mdsos/zlib.def
-
-Changes in 1.0.6 (19 Jan 1998)
-- add functions gzprintf, gzputc, gzgetc, gztell, gzeof, gzseek, gzrewind and
-  gzsetparams (thanks to Roland Giersig and Kevin Ruland for some of this code)
-- Fix a deflate bug occurring only with compression level 0 (thanks to
-  Andy Buckler for finding this one).
-- In minigzip, pass transparently also the first byte for .Z files.
-- return Z_BUF_ERROR instead of Z_OK if output buffer full in uncompress()
-- check Z_FINISH in inflate (thanks to Marc Schluper)
-- Implement deflateCopy (thanks to Adam Costello)
-- make static libraries by default in configure, add --shared option.
-- move MSDOS or Windows specific files to directory msdos
-- suppress the notion of partial flush to simplify the interface
-  (but the symbol Z_PARTIAL_FLUSH is kept for compatibility with 1.0.4)
-- suppress history buffer provided by application to simplify the interface
-  (this feature was not implemented anyway in 1.0.4)
-- next_in and avail_in must be initialized before calling inflateInit or
-  inflateInit2
-- add EXPORT in all exported functions (for Windows DLL)
-- added Makefile.nt (thanks to Stephen Williams)
-- added the unsupported "contrib" directory:
-   contrib/asm386/ by Gilles Vollant 
-        386 asm code replacing longest_match().
-   contrib/iostream/ by Kevin Ruland 
-        A C++ I/O streams interface to the zlib gz* functions
-   contrib/iostream2/  by Tyge Løvset 
-        Another C++ I/O streams interface
-   contrib/untgz/  by "Pedro A. Aranda Guti\irrez" 
-        A very simple tar.gz file extractor using zlib
-   contrib/visual-basic.txt by Carlos Rios 
-        How to use compress(), uncompress() and the gz* functions from VB.
-- pass params -f (filtered data), -h (huffman only), -1 to -9 (compression
-  level) in minigzip (thanks to Tom Lane)
-
-- use const for rommable constants in deflate
-- added test for gzseek and gztell in example.c
-- add undocumented function inflateSyncPoint() (hack for Paul Mackerras)
-- add undocumented function zError to convert error code to string
-  (for Tim Smithers)
-- Allow compilation of gzio with -DNO_DEFLATE to avoid the compression code.
-- Use default memcpy for Symantec MSDOS compiler.
-- Add EXPORT keyword for check_func (needed for Windows DLL)
-- add current directory to LD_LIBRARY_PATH for "make test"
-- create also a link for libz.so.1
-- added support for FUJITSU UXP/DS (thanks to Toshiaki Nomura)
-- use $(SHAREDLIB) instead of libz.so in Makefile.in (for HPUX)
-- added -soname for Linux in configure (Chun-Chung Chen,
-- assign numbers to the exported functions in zlib.def (for Windows DLL)
-- add advice in zlib.h for best usage of deflateSetDictionary
-- work around compiler bug on Atari (cast Z_NULL in call of s->checkfn)
-- allow compilation with ANSI keywords only enabled for TurboC in large model
-- avoid "versionString"[0] (Borland bug)
-- add NEED_DUMMY_RETURN for Borland
-- use variable z_verbose for tracing in debug mode (L. Peter Deutsch).
-- allow compilation with CC
-- defined STDC for OS/2 (David Charlap)
-- limit external names to 8 chars for MVS (Thomas Lund)
-- in minigzip.c, use static buffers only for 16-bit systems
-- fix suffix check for "minigzip -d foo.gz"
-- do not return an error for the 2nd of two consecutive gzflush() (Felix Lee)
-- use _fdopen instead of fdopen for MSC >= 6.0 (Thomas Fanslau)
-- added makelcc.bat for lcc-win32 (Tom St Denis)
-- in Makefile.dj2, use copy and del instead of install and rm (Frank Donahoe)
-- Avoid expanded $Id$. Use "rcs -kb" or "cvs admin -kb" to avoid Id expansion.
-- check for unistd.h in configure (for off_t)
-- remove useless check parameter in inflate_blocks_free
-- avoid useless assignment of s->check to itself in inflate_blocks_new
-- do not flush twice in gzclose (thanks to Ken Raeburn)
-- rename FOPEN as F_OPEN to avoid clash with /usr/include/sys/file.h
-- use NO_ERRNO_H instead of enumeration of operating systems with errno.h
-- work around buggy fclose on pipes for HP/UX
-- support zlib DLL with BORLAND C++ 5.0 (thanks to Glenn Randers-Pehrson)
-- fix configure if CC is already equal to gcc
-
-Changes in 1.0.5 (3 Jan 98)
-- Fix inflate to terminate gracefully when fed corrupted or invalid data
-- Use const for rommable constants in inflate
-- Eliminate memory leaks on error conditions in inflate
-- Removed some vestigial code in inflate
-- Update web address in README
-
-Changes in 1.0.4 (24 Jul 96)
-- In very rare conditions, deflate(s, Z_FINISH) could fail to produce an EOF
-  bit, so the decompressor could decompress all the correct data but went
-  on to attempt decompressing extra garbage data. This affected minigzip too.
-- zlibVersion and gzerror return const char* (needed for DLL)
-- port to RISCOS (no fdopen, no multiple dots, no unlink, no fileno)
-- use z_error only for DEBUG (avoid problem with DLLs)
-
-Changes in 1.0.3 (2 Jul 96)
-- use z_streamp instead of z_stream *, which is now a far pointer in MSDOS
-  small and medium models; this makes the library incompatible with previous
-  versions for these models. (No effect in large model or on other systems.)
-- return OK instead of BUF_ERROR if previous deflate call returned with
-  avail_out as zero but there is nothing to do
-- added memcmp for non STDC compilers
-- define NO_DUMMY_DECL for more Mac compilers (.h files merged incorrectly)
-- define __32BIT__ if __386__ or i386 is defined (pb. with Watcom and SCO)
-- better check for 16-bit mode MSC (avoids problem with Symantec)
-
-Changes in 1.0.2 (23 May 96)
-- added Windows DLL support
-- added a function zlibVersion (for the DLL support)
-- fixed declarations using Bytef in infutil.c (pb with MSDOS medium model)
-- Bytef is define's instead of typedef'd only for Borland C
-- avoid reading uninitialized memory in example.c
-- mention in README that the zlib format is now RFC1950
-- updated Makefile.dj2
-- added algorithm.doc
-
-Changes in 1.0.1 (20 May 96) [1.0 skipped to avoid confusion]
-- fix array overlay in deflate.c which sometimes caused bad compressed data
-- fix inflate bug with empty stored block
-- fix MSDOS medium model which was broken in 0.99
-- fix deflateParams() which could generated bad compressed data.
-- Bytef is define'd instead of typedef'ed (work around Borland bug)
-- added an INDEX file
-- new makefiles for DJGPP (Makefile.dj2), 32-bit Borland (Makefile.b32),
-  Watcom (Makefile.wat), Amiga SAS/C (Makefile.sas)
-- speed up adler32 for modern machines without auto-increment
-- added -ansi for IRIX in configure
-- static_init_done in trees.c is an int
-- define unlink as delete for VMS
-- fix configure for QNX
-- add configure branch for SCO and HPUX
-- avoid many warnings (unused variables, dead assignments, etc...)
-- no fdopen for BeOS
-- fix the Watcom fix for 32 bit mode (define FAR as empty)
-- removed redefinition of Byte for MKWERKS
-- work around an MWKERKS bug (incorrect merge of all .h files)
-
-Changes in 0.99 (27 Jan 96)
-- allow preset dictionary shared between compressor and decompressor
-- allow compression level 0 (no compression)
-- add deflateParams in zlib.h: allow dynamic change of compression level
-  and compression strategy.
-- test large buffers and deflateParams in example.c
-- add optional "configure" to build zlib as a shared library
-- suppress Makefile.qnx, use configure instead
-- fixed deflate for 64-bit systems (detected on Cray)
-- fixed inflate_blocks for 64-bit systems (detected on Alpha)
-- declare Z_DEFLATED in zlib.h (possible parameter for deflateInit2)
-- always return Z_BUF_ERROR when deflate() has nothing to do
-- deflateInit and inflateInit are now macros to allow version checking
-- prefix all global functions and types with z_ with -DZ_PREFIX
-- make falloc completely reentrant (inftrees.c)
-- fixed very unlikely race condition in ct_static_init
-- free in reverse order of allocation to help memory manager
-- use zlib-1.0/* instead of zlib/* inside the tar.gz
-- make zlib warning-free with "gcc -O3 -Wall -Wwrite-strings -Wpointer-arith
-  -Wconversion -Wstrict-prototypes -Wmissing-prototypes"
-- allow gzread on concatenated .gz files
-- deflateEnd now returns Z_DATA_ERROR if it was premature
-- deflate is finally (?) fully deterministic (no matches beyond end of input)
-- Document Z_SYNC_FLUSH
-- add uninstall in Makefile
-- Check for __cpluplus in zlib.h
-- Better test in ct_align for partial flush
-- avoid harmless warnings for Borland C++
-- initialize hash_head in deflate.c
-- avoid warning on fdopen (gzio.c) for HP cc -Aa
-- include stdlib.h for STDC compilers
-- include errno.h for Cray
-- ignore error if ranlib doesn't exist
-- call ranlib twice for NeXTSTEP
-- use exec_prefix instead of prefix for libz.a
-- renamed ct_* as _tr_* to avoid conflict with applications
-- clear z->msg in inflateInit2 before any error return
-- initialize opaque in example.c, gzio.c, deflate.c and inflate.c
-- fixed typo in zconf.h (_GNUC__ => __GNUC__)
-- check for WIN32 in zconf.h and zutil.c (avoid farmalloc in 32-bit mode)
-- fix typo in Make_vms.com (f$trnlnm -> f$getsyi)
-- in fcalloc, normalize pointer if size > 65520 bytes
-- don't use special fcalloc for 32 bit Borland C++
-- use STDC instead of __GO32__ to avoid redeclaring exit, calloc, etc...
-- use Z_BINARY instead of BINARY
-- document that gzclose after gzdopen will close the file
-- allow "a" as mode in gzopen.
-- fix error checking in gzread
-- allow skipping .gz extra-field on pipes
-- added reference to Perl interface in README
-- put the crc table in FAR data (I dislike more and more the medium model :)
-- added get_crc_table
-- added a dimension to all arrays (Borland C can't count).
-- workaround Borland C bug in declaration of inflate_codes_new & inflate_fast
-- guard against multiple inclusion of *.h (for precompiled header on Mac)
-- Watcom C pretends to be Microsoft C small model even in 32 bit mode.
-- don't use unsized arrays to avoid silly warnings by Visual C++:
-     warning C4746: 'inflate_mask' : unsized array treated as  '__far'
-     (what's wrong with far data in far model?).
-- define enum out of inflate_blocks_state to allow compilation with C++
-
-Changes in 0.95 (16 Aug 95)
-- fix MSDOS small and medium model (now easier to adapt to any compiler)
-- inlined send_bits
-- fix the final (:-) bug for deflate with flush (output was correct but
-  not completely flushed in rare occasions).
-- default window size is same for compression and decompression
-  (it's now sufficient to set MAX_WBITS in zconf.h).
-- voidp -> voidpf and voidnp -> voidp (for consistency with other
-  typedefs and because voidnp was not near in large model).
-
-Changes in 0.94 (13 Aug 95)
-- support MSDOS medium model
-- fix deflate with flush (could sometimes generate bad output)
-- fix deflateReset (zlib header was incorrectly suppressed)
-- added support for VMS
-- allow a compression level in gzopen()
-- gzflush now calls fflush
-- For deflate with flush, flush even if no more input is provided.
-- rename libgz.a as libz.a
-- avoid complex expression in infcodes.c triggering Turbo C bug
-- work around a problem with gcc on Alpha (in INSERT_STRING)
-- don't use inline functions (problem with some gcc versions)
-- allow renaming of Byte, uInt, etc... with #define.
-- avoid warning about (unused) pointer before start of array in deflate.c
-- avoid various warnings in gzio.c, example.c, infblock.c, adler32.c, zutil.c
-- avoid reserved word 'new' in trees.c
-
-Changes in 0.93 (25 June 95)
-- temporarily disable inline functions
-- make deflate deterministic
-- give enough lookahead for PARTIAL_FLUSH
-- Set binary mode for stdin/stdout in minigzip.c for OS/2
-- don't even use signed char in inflate (not portable enough)
-- fix inflate memory leak for segmented architectures
-
-Changes in 0.92 (3 May 95)
-- don't assume that char is signed (problem on SGI)
-- Clear bit buffer when starting a stored block
-- no memcpy on Pyramid
-- suppressed inftest.c
-- optimized fill_window, put longest_match inline for gcc
-- optimized inflate on stored blocks.
-- untabify all sources to simplify patches
-
-Changes in 0.91 (2 May 95)
-- Default MEM_LEVEL is 8 (not 9 for Unix) as documented in zlib.h
-- Document the memory requirements in zconf.h
-- added "make install"
-- fix sync search logic in inflateSync
-- deflate(Z_FULL_FLUSH) now works even if output buffer too short
-- after inflateSync, don't scare people with just "lo world"
-- added support for DJGPP
-
-Changes in 0.9 (1 May 95)
-- don't assume that zalloc clears the allocated memory (the TurboC bug
-  was Mark's bug after all :)
-- let again gzread copy uncompressed data unchanged (was working in 0.71)
-- deflate(Z_FULL_FLUSH), inflateReset and inflateSync are now fully implemented
-- added a test of inflateSync in example.c
-- moved MAX_WBITS to zconf.h because users might want to change that.
-- document explicitly that zalloc(64K) on MSDOS must return a normalized
-  pointer (zero offset)
-- added Makefiles for Microsoft C, Turbo C, Borland C++
-- faster crc32()
-
-Changes in 0.8 (29 April 95)
-- added fast inflate (inffast.c)
-- deflate(Z_FINISH) now returns Z_STREAM_END when done. Warning: this
-  is incompatible with previous versions of zlib which returned Z_OK.
-- work around a TurboC compiler bug (bad code for b << 0, see infutil.h)
-  (actually that was not a compiler bug, see 0.81 above)
-- gzread no longer reads one extra byte in certain cases
-- In gzio destroy(), don't reference a freed structure
-- avoid many warnings for MSDOS
-- avoid the ERROR symbol which is used by MS Windows
-
-Changes in 0.71 (14 April 95)
-- Fixed more MSDOS compilation problems :( There is still a bug with
-  TurboC large model.
-
-Changes in 0.7 (14 April 95)
-- Added full inflate support.
-- Simplified the crc32() interface. The pre- and post-conditioning
-  (one's complement) is now done inside crc32(). WARNING: this is
-  incompatible with previous versions; see zlib.h for the new usage.
-
-Changes in 0.61 (12 April 95)
-- workaround for a bug in TurboC. example and minigzip now work on MSDOS.
-
-Changes in 0.6 (11 April 95)
-- added minigzip.c
-- added gzdopen to reopen a file descriptor as gzFile
-- added transparent reading of non-gziped files in gzread.
-- fixed bug in gzread (don't read crc as data)
-- fixed bug in destroy (gzio.c) (don't return Z_STREAM_END for gzclose).
-- don't allocate big arrays in the stack (for MSDOS)
-- fix some MSDOS compilation problems
-
-Changes in 0.5:
-- do real compression in deflate.c. Z_PARTIAL_FLUSH is supported but
-  not yet Z_FULL_FLUSH.
-- support decompression but only in a single step (forced Z_FINISH)
-- added opaque object for zalloc and zfree.
-- added deflateReset and inflateReset
-- added a variable zlib_version for consistency checking.
-- renamed the 'filter' parameter of deflateInit2 as 'strategy'.
-  Added Z_FILTERED and Z_HUFFMAN_ONLY constants.
-
-Changes in 0.4:
-- avoid "zip" everywhere, use zlib instead of ziplib.
-- suppress Z_BLOCK_FLUSH, interpret Z_PARTIAL_FLUSH as block flush
-  if compression method == 8.
-- added adler32 and crc32
-- renamed deflateOptions as deflateInit2, call one or the other but not both
-- added the method parameter for deflateInit2.
-- added inflateInit2
-- simplied considerably deflateInit and inflateInit by not supporting
-  user-provided history buffer. This is supported only in deflateInit2
-  and inflateInit2.
-
-Changes in 0.3:
-- prefix all macro names with Z_
-- use Z_FINISH instead of deflateEnd to finish compression.
-- added Z_HUFFMAN_ONLY
-- added gzerror()
diff --git a/externals/zlib/README b/externals/zlib/README
deleted file mode 100644
index d4219bf889f..00000000000
--- a/externals/zlib/README
+++ /dev/null
@@ -1,115 +0,0 @@
-ZLIB DATA COMPRESSION LIBRARY
-
-zlib 1.2.5 is a general purpose data compression library.  All the code is
-thread safe.  The data format used by the zlib library is described by RFCs
-(Request for Comments) 1950 to 1952 in the files
-http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format)
-and rfc1952.txt (gzip format).
-
-All functions of the compression library are documented in the file zlib.h
-(volunteer to write man pages welcome, contact zlib@gzip.org).  A usage example
-of the library is given in the file example.c which also tests that the library
-is working correctly.  Another example is given in the file minigzip.c.  The
-compression library itself is composed of all source files except example.c and
-minigzip.c.
-
-To compile all files and run the test program, follow the instructions given at
-the top of Makefile.in.  In short "./configure; make test", and if that goes
-well, "make install" should work for most flavors of Unix.  For Windows, use one
-of the special makefiles in win32/ or contrib/vstudio/ .  For VMS, use
-make_vms.com.
-
-Questions about zlib should be sent to , or to Gilles Vollant
- for the Windows DLL version.  The zlib home page is
-http://zlib.net/ .  Before reporting a problem, please check this site to
-verify that you have the latest version of zlib; otherwise get the latest
-version and check whether the problem still exists or not.
-
-PLEASE read the zlib FAQ http://zlib.net/zlib_faq.html before asking for help.
-
-Mark Nelson  wrote an article about zlib for the Jan.  1997
-issue of Dr.  Dobb's Journal; a copy of the article is available at
-http://marknelson.us/1997/01/01/zlib-engine/ .
-
-The changes made in version 1.2.5 are documented in the file ChangeLog.
-
-Unsupported third party contributions are provided in directory contrib/ .
-
-zlib is available in Java using the java.util.zip package, documented at
-http://java.sun.com/developer/technicalArticles/Programming/compression/ .
-
-A Perl interface to zlib written by Paul Marquess  is available
-at CPAN (Comprehensive Perl Archive Network) sites, including
-http://search.cpan.org/~pmqs/IO-Compress-Zlib/ .
-
-A Python interface to zlib written by A.M. Kuchling  is
-available in Python 1.5 and later versions, see
-http://www.python.org/doc/lib/module-zlib.html .
-
-zlib is built into tcl: http://wiki.tcl.tk/4610 .
-
-An experimental package to read and write files in .zip format, written on top
-of zlib by Gilles Vollant , is available in the
-contrib/minizip directory of zlib.
-
-
-Notes for some targets:
-
-- For Windows DLL versions, please see win32/DLL_FAQ.txt
-
-- For 64-bit Irix, deflate.c must be compiled without any optimization. With
-  -O, one libpng test fails. The test works in 32 bit mode (with the -n32
-  compiler flag). The compiler bug has been reported to SGI.
-
-- zlib doesn't work with gcc 2.6.3 on a DEC 3000/300LX under OSF/1 2.1 it works
-  when compiled with cc.
-
-- On Digital Unix 4.0D (formely OSF/1) on AlphaServer, the cc option -std1 is
-  necessary to get gzprintf working correctly. This is done by configure.
-
-- zlib doesn't work on HP-UX 9.05 with some versions of /bin/cc. It works with
-  other compilers. Use "make test" to check your compiler.
-
-- gzdopen is not supported on RISCOS or BEOS.
-
-- For PalmOs, see http://palmzlib.sourceforge.net/
-
-
-Acknowledgments:
-
-  The deflate format used by zlib was defined by Phil Katz.  The deflate and
-  zlib specifications were written by L.  Peter Deutsch.  Thanks to all the
-  people who reported problems and suggested various improvements in zlib; they
-  are too numerous to cite here.
-
-Copyright notice:
-
- (C) 1995-2010 Jean-loup Gailly and Mark Adler
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jean-loup Gailly        Mark Adler
-  jloup@gzip.org          madler@alumni.caltech.edu
-
-If you use the zlib library in a product, we would appreciate *not* receiving
-lengthy legal documents to sign.  The sources are provided for free but without
-warranty of any kind.  The library has been entirely written by Jean-loup
-Gailly and Mark Adler; it does not include third-party code.
-
-If you redistribute modified sources, we would appreciate that you include in
-the file ChangeLog history information documenting your changes.  Please read
-the FAQ for more information on the distribution of modified source versions.
diff --git a/opt/cleanup/tab2spaces.sh b/opt/cleanup/tab2spaces.sh
deleted file mode 100644
index 1022be7905c..00000000000
--- a/opt/cleanup/tab2spaces.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-# Be sure to specify files instead of * when running the script.
-perl -p -i -e "s/\t/    /g" *
diff --git a/opt/cleanup/whitespace.sh b/opt/cleanup/whitespace.sh
deleted file mode 100644
index a351e25359b..00000000000
--- a/opt/cleanup/whitespace.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-# Be sure to specify files instead of * when running the script.
-perl -p -i -e "s/ +$//g" *
diff --git a/opt/conf_merge/README b/opt/conf_merge/README
deleted file mode 100644
index 3d027b7ad42..00000000000
--- a/opt/conf_merge/README
+++ /dev/null
@@ -1,6 +0,0 @@
-This is a PHP script for merging a new .dist file with your existing .conf file (trinitycore and trinityrealm)
-It should also work with mangos dist/conf files as well.
-
-It uses sessions so it is multi user safe, it adds any options that are removed to the bottom of the file,
-commented out, just in case it removes something it shouldn't,
-and, if you add all of your custom patch configs below "# Custom" they will be copied exactly as they are.
diff --git a/opt/conf_merge/index.php b/opt/conf_merge/index.php
deleted file mode 100644
index 537937caf64..00000000000
--- a/opt/conf_merge/index.php
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-

-Dist File
-

-
-

-Current Conf File
-

-
-

-Win32 -
-UNIX/Linux
-

-
-

-If you have any custom settings, such as from patches,
-

-make sure they are at the bottom of the file following
-

-this block (add it if it's not there)
-

-###############################################################################
-

-# Custom
-

-###############################################################################
-

-

-
-

diff --git a/opt/conf_merge/merge.php b/opt/conf_merge/merge.php
deleted file mode 100644
index 6d8bedbaa08..00000000000
--- a/opt/conf_merge/merge.php
+++ /dev/null
@@ -1,159 +0,0 @@
- $v)
-        {
-            if (array_key_exists($k, $array1))
-            {
-                $array1[$k] = $v;
-                unset($array2[$k]);
-            }
-        }
-        $in_file1 = fopen($upload1,r);
-        $line = trim(fgets($in_file1));
-        while (!feof($in_file1))
-        {
-            if (substr($line,0,1) != '#' && substr($line,0,1) != '')
-            {
-                $array = array();
-                while (substr($line,0,1) != '#' && substr($line,0,1) != '')
-                {
-                    list($key, $val) = explode("=",$line);
-                    $key = trim($key);
-                    $val = trim($val);
-                    $array[$key] = $val;
-                    $line = trim(fgets($in_file1));
-                }
-                foreach($array as $k => $v)
-                {
-                    if (array_key_exists($k, $array1))
-                        fwrite($out_file, $k."=".$array1[$k].$eol);
-                    else
-                        continue;
-                }
-                unset($array);
-                if (!feof($in_file1))
-                    fwrite($out_file, $line.$eol);
-            }
-            else
-                fwrite($out_file, $line.$eol);
-            $line = trim(fgets($in_file1));
-        }
-        if ($custom_found)
-        {
-            fwrite($out_file, $eol);
-            fwrite($out_file, "###############################################################################".$eol);
-            fwrite($out_file, "# Custom".$eol);
-            $line = trim(fgets($in_file2));
-            while (!feof($in_file2))
-            {
-                fwrite($out_file, $line.$eol);
-                $line = trim(fgets($in_file2));
-            }
-        }
-        $first = true;
-        foreach($array2 as $k => $v)
-        {
-            if ($first)
-            {
-                fwrite($out_file, $eol);
-                fwrite($out_file, "###############################################################################".$eol);
-                fwrite($out_file, "#      The Following values were removed from the config.".$eol);
-                $first = false;
-            }
-            fwrite($out_file, "#          ".$k."=".$v.$eol);
-        }
-        unset($array1);
-        unset($array2);
-        fclose($in_file1);
-        fclose($in_file2);
-        fclose($out_file);
-        unlink($upload1);
-        unlink($upload2);
-
-        echo "Process done";
-        echo "
Click here to retrieve your merged conf";
-    }
-}
-else
-{
-    echo "An error has occurred";
-}
-?>
diff --git a/src/server/collision/CMakeLists.txt b/src/server/collision/CMakeLists.txt
index 913ec7ecd01..a058c14378b 100644
--- a/src/server/collision/CMakeLists.txt
+++ b/src/server/collision/CMakeLists.txt
@@ -4,21 +4,21 @@
 SET(collision_STAT_SRCS
    BoundingIntervalHierarchy.h
    BoundingIntervalHierarchy.cpp
-   Management/IVMapManager.h
    Maps/MapTree.cpp
    Maps/MapTree.h
-   Models/ModelInstance.cpp
-   Models/ModelInstance.h
    Maps/TileAssembler.cpp
    Maps/TileAssembler.h
-   VMapDefinitions.h
+   Models/ModelInstance.cpp
+   Models/ModelInstance.h
+   Models/WorldModel.cpp
+   Models/WorldModel.h
+   Management/IVMapManager.h
    Management/VMapFactory.cpp
    Management/VMapFactory.h
    Management/VMapManager2.cpp
    Management/VMapManager2.h
+   VMapDefinitions.h
    VMapTools.h
-   Models/WorldModel.cpp
-   Models/WorldModel.h
 )
 
 include_directories(
diff --git a/src/server/game/CMakeLists.txt b/src/server/game/CMakeLists.txt
index 7f9c936cff9..bf7b5d9f1ea 100644
--- a/src/server/game/CMakeLists.txt
+++ b/src/server/game/CMakeLists.txt
@@ -404,6 +404,8 @@ include_directories(
 
 if(NOT DO_SCRIPTS)
    SET(game_STAT_SRCS ${game_STAT_SRCS}
+      PrecompiledHeaders/ScriptPCH.cpp
+      PrecompiledHeaders/ScriptPCH.h
       AI/ScriptedAI/ScriptedEscortAI.cpp
       AI/ScriptedAI/ScriptedEscortAI.h
       AI/ScriptedAI/ScriptedCreature.cpp
@@ -416,8 +418,6 @@ if(NOT DO_SCRIPTS)
       AI/ScriptedAI/ScriptedInstance.h
       AI/ScriptedAI/ScriptedSimpleAI.cpp
       AI/ScriptedAI/ScriptedSimpleAI.h
-      PrecompiledHeaders/ScriptPCH.cpp
-      PrecompiledHeaders/ScriptPCH.h
    )
    message("-- Added Script Engine to GAME lib")
 endif(NOT DO_SCRIPTS)
diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt
index c908e6617f2..db8c75a6772 100644
--- a/src/server/worldserver/CMakeLists.txt
+++ b/src/server/worldserver/CMakeLists.txt
@@ -133,10 +133,14 @@ target_link_libraries(
 trinity-core
 game
 shared
+zlib
+trinitysockets
 trinitydatabase
 trinityauth
 trinityconfig
 collision
+g3dlib
+jemalloc
 ${SCRIPT_LIB}
 ${READLINE_LIBRARY}
 ${TERMCAP_LIBRARY}
-- 
cgit v1.2.3


From 332b0f3c8efb39d2532b965a4aed266a33f267ef Mon Sep 17 00:00:00 2001
From: click 
Date: Tue, 8 Jun 2010 08:59:38 +0200
Subject: Properly build and link core (yay!) - Not done yet : Sorting out the
 PCH-system on *nix - Not done yet : Sorting out scriptcompilation (still
 broken)

--HG--
branch : trunk
---
 CMakeLists.txt                   | 2 +-
 src/server/game/CMakeLists.txt   | 2 ++
 src/server/shared/CMakeLists.txt | 6 ++++--
 3 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e7384b93cae..8f89ea5cc40 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,7 +33,7 @@ option(CENTOS "CENTOS" 0)
 option(DO_CLI "With CLI" 1)
 option(DO_DEBUG "Debug mode" 0)
 option(DO_MYSQL "With MySQL support" 1)
-option(DO_PCH "Use precompiled headers" 1)
+option(DO_PCH "Use precompiled headers" 0)
 option(DO_RA "With RA" 0)
 option(DO_SCRIPTS "With trinityscripts" 1)
 option(DO_SQL "Copy SQL files" 0)
diff --git a/src/server/game/CMakeLists.txt b/src/server/game/CMakeLists.txt
index bf7b5d9f1ea..15d7da2b6d8 100644
--- a/src/server/game/CMakeLists.txt
+++ b/src/server/game/CMakeLists.txt
@@ -34,6 +34,8 @@ SET(game_STAT_SRCS
    AI/CreatureAIRegistry.h
    AI/CreatureAISelector.cpp
    AI/CreatureAISelector.h
+   AI/CreatureAI.cpp
+   AI/CreatureAI.h
    AuctionHouse/AuctionHouseMgr.cpp
    AuctionHouse/AuctionHouseMgr.h
    AuctionHouse/AuctionHouseBot/AuctionHouseBot.cpp
diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt
index 6c796d60f11..010c47fd706 100644
--- a/src/server/shared/CMakeLists.txt
+++ b/src/server/shared/CMakeLists.txt
@@ -15,7 +15,9 @@ SET(shared_STAT_SRCS
    Utilities/SignalHandler.h
    Utilities/Timer.h
    Utilities/Util.cpp
-   Utilities/Util.h
+   Utilities/Util.h  
+   Utilities/EventProcessor.cpp
+   Utilities/EventProcessor.h
    Common.cpp
    Common.h
    SystemConfig.h
@@ -127,4 +129,4 @@ include_directories(
   ${MYSQL_INCLUDE_DIR}
 )
 
-add_library(trinitydatabase STATIC ${trinitydatabase_STAT_SRCS})
\ No newline at end of file
+add_library(trinitydatabase STATIC ${trinitydatabase_STAT_SRCS})
-- 
cgit v1.2.3


From 04955cfb235e7dd3803a486ec1d198401446278f Mon Sep 17 00:00:00 2001
From: Machiavelli 
Date: Tue, 8 Jun 2010 15:41:37 +0200
Subject: Fix Infusion of Light talent (53569,53576), properly cast HoT on
 target after Flash of Light cast when target has Sacred Shield active. Big
 thanks to Shauren, QAston and JohnHoliver.

--HG--
branch : trunk
---
 sql/updates/8510_world_spell_proc_event.sql |  1 +
 sql/world_database.sql                      |  4 ++--
 src/server/game/Entities/Unit/Unit.cpp      | 20 +++++++++++++++++++-
 3 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100644 sql/updates/8510_world_spell_proc_event.sql

(limited to 'src')

diff --git a/sql/updates/8510_world_spell_proc_event.sql b/sql/updates/8510_world_spell_proc_event.sql
new file mode 100644
index 00000000000..c9d0a9cbc69
--- /dev/null
+++ b/sql/updates/8510_world_spell_proc_event.sql
@@ -0,0 +1 @@
+UPDATE spell_proc_event SET SpellFamilyMask0 = SpellFamilyMask0 | 0x40000000, procEx = ProcEx | 0x0000001 WHERE entry IN(53569,53576);
diff --git a/sql/world_database.sql b/sql/world_database.sql
index 692927a2fdf..60c05bd068f 100644
--- a/sql/world_database.sql
+++ b/sql/world_database.sql
@@ -6947,8 +6947,8 @@ INSERT INTO `spell_proc_event` (`entry`,`SchoolMask`,`SpellFamilyName`,`SpellFam
 ( 53551, 0x00,  10, 0x00001000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,   0,   0,   0), -- Sacred Cleansing (Rank 1)
 ( 53552, 0x00,  10, 0x00001000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,   0,   0,   0), -- Sacred Cleansing (Rank 2)
 ( 53553, 0x00,  10, 0x00001000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,   0,   0,   0), -- Sacred Cleansing (Rank 3)
-( 53569, 0x00,  10, 0x00200000, 0x00010000, 0x00000000, 0x00000000, 0x00000002,   0,   0,   0), -- Infusion of Light (Rank 1)
-( 53576, 0x00,  10, 0x00200000, 0x00010000, 0x00000000, 0x00000000, 0x00000002,   0,   0,   0), -- Infusion of Light (Rank 2)
+( 53569, 0x00,  10, 0x40200000, 0x00010000, 0x00000000, 0x00000000, 0x00000003,   0,   0,   0), -- Infusion of Light (Rank 1)
+( 53576, 0x00,  10, 0x40200000, 0x00010000, 0x00000000, 0x00000000, 0x00000003,   0,   0,   0), -- Infusion of Light (Rank 2)
 ( 53646, 0x00,   0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002,   0,   0,   0), -- Demonic Pact (Rank 1)
 ( 53671, 0x00,  10, 0x00800000, 0x00000000, 0x00000000, 0x00000000, 0x00040000,   0,   0,   0), -- Judgements of the Pure (Rank 1)
 ( 53672, 0x00,  10, 0x00200000, 0x00010000, 0x00000000, 0x00000000, 0x00000002,   0,   0,   0), -- Infusion of Light
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 703ea029460..a5a3ea268f3 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -7742,12 +7742,30 @@ bool Unit::HandleModDamagePctTakenAuraProc(Unit *pVictim, uint32 /*damage*/, Aur
 
 // Used in case when access to whole aura is needed
 // All procs should be handled like this...
-bool Unit::HandleAuraProc(Unit * /*pVictim*/, uint32 damage, Aura * triggeredByAura, SpellEntry const * procSpell, uint32 /*procFlag*/, uint32 procEx, uint32 /*cooldown*/, bool * handled)
+bool Unit::HandleAuraProc(Unit * pVictim, uint32 damage, Aura * triggeredByAura, SpellEntry const * procSpell, uint32 /*procFlag*/, uint32 procEx, uint32 /*cooldown*/, bool * handled)
 {
     SpellEntry const *dummySpell = triggeredByAura->GetSpellProto();
 
     switch(dummySpell->SpellFamilyName)
     {
+        case SPELLFAMILY_PALADIN:
+        {
+            // Infusion of Light
+            if (dummySpell->SpellIconID == 3021)
+            {
+                // Flash of Light Heal over Time
+                if (procSpell->SpellFamilyFlags[0] & 0x40000000 && procSpell->SpellIconID == 242)
+                {
+                    *handled = true;
+                    if (pVictim->HasAura(53601))
+                    {
+                        int32 bp0 = (damage/12) * dummySpell->CalculateSimpleValue(2)/100;
+                        CastCustomSpell(pVictim, 66922, &bp0, NULL, NULL, true);
+                        return true;
+                    }   
+                 }
+              }
+        }break;
         case SPELLFAMILY_MAGE:
         {
             // Combustion
-- 
cgit v1.2.3


From e5aa4f7be97ca7c03cf9d8f5f3547f01b8c9cd3e Mon Sep 17 00:00:00 2001
From: Machiavelli 
Date: Tue, 8 Jun 2010 16:12:43 +0200
Subject: Only proc Infusion of Light (active buff) on Holy Shock criticals.
 (Problem introduced in previous fix) Author: Shauren

--HG--
branch : trunk
---
 sql/updates/8511_world_spell_proc_event.sql |  1 +
 sql/world_database.sql                      |  4 ++--
 src/server/game/Entities/Unit/Unit.cpp      | 13 +++++++++----
 3 files changed, 12 insertions(+), 6 deletions(-)
 create mode 100644 sql/updates/8511_world_spell_proc_event.sql

(limited to 'src')

diff --git a/sql/updates/8511_world_spell_proc_event.sql b/sql/updates/8511_world_spell_proc_event.sql
new file mode 100644
index 00000000000..91cc7841f97
--- /dev/null
+++ b/sql/updates/8511_world_spell_proc_event.sql
@@ -0,0 +1 @@
+UPDATE spell_proc_event SET procEx = 0x0 WHERE entry IN(53569,53576);
diff --git a/sql/world_database.sql b/sql/world_database.sql
index 60c05bd068f..b589f3b1b0f 100644
--- a/sql/world_database.sql
+++ b/sql/world_database.sql
@@ -6947,8 +6947,8 @@ INSERT INTO `spell_proc_event` (`entry`,`SchoolMask`,`SpellFamilyName`,`SpellFam
 ( 53551, 0x00,  10, 0x00001000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,   0,   0,   0), -- Sacred Cleansing (Rank 1)
 ( 53552, 0x00,  10, 0x00001000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,   0,   0,   0), -- Sacred Cleansing (Rank 2)
 ( 53553, 0x00,  10, 0x00001000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,   0,   0,   0), -- Sacred Cleansing (Rank 3)
-( 53569, 0x00,  10, 0x40200000, 0x00010000, 0x00000000, 0x00000000, 0x00000003,   0,   0,   0), -- Infusion of Light (Rank 1)
-( 53576, 0x00,  10, 0x40200000, 0x00010000, 0x00000000, 0x00000000, 0x00000003,   0,   0,   0), -- Infusion of Light (Rank 2)
+( 53569, 0x00,  10, 0x40200000, 0x00010000, 0x00000000, 0x00000000, 0x00000000,   0,   0,   0), -- Infusion of Light (Rank 1)
+( 53576, 0x00,  10, 0x40200000, 0x00010000, 0x00000000, 0x00000000, 0x00000000,   0,   0,   0), -- Infusion of Light (Rank 2)
 ( 53646, 0x00,   0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002,   0,   0,   0), -- Demonic Pact (Rank 1)
 ( 53671, 0x00,  10, 0x00800000, 0x00000000, 0x00000000, 0x00000000, 0x00040000,   0,   0,   0), -- Judgements of the Pure (Rank 1)
 ( 53672, 0x00,  10, 0x00200000, 0x00010000, 0x00000000, 0x00000000, 0x00000002,   0,   0,   0), -- Infusion of Light
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index a5a3ea268f3..e2493e50e3c 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -7753,7 +7753,7 @@ bool Unit::HandleAuraProc(Unit * pVictim, uint32 damage, Aura * triggeredByAura,
             // Infusion of Light
             if (dummySpell->SpellIconID == 3021)
             {
-                // Flash of Light Heal over Time
+                // Flash of Light HoT on Flash of Light when Sacred Shield active
                 if (procSpell->SpellFamilyFlags[0] & 0x40000000 && procSpell->SpellIconID == 242)
                 {
                     *handled = true;
@@ -7763,9 +7763,14 @@ bool Unit::HandleAuraProc(Unit * pVictim, uint32 damage, Aura * triggeredByAura,
                         CastCustomSpell(pVictim, 66922, &bp0, NULL, NULL, true);
                         return true;
                     }   
-                 }
-              }
-        }break;
+                }
+                // but should not proc on non-critical Holy Shocks
+                else if ((procSpell->SpellFamilyFlags[0] & 0x200000 || procSpell->SpellFamilyFlags[1] & 0x10000) && !(procEx & PROC_EX_CRITICAL_HIT))
+                    *handled = true;
+                break;
+            }
+            break;
+        }
         case SPELLFAMILY_MAGE:
         {
             // Combustion
-- 
cgit v1.2.3


From ae2f8d70a04e2520e0863a2fbeb4079073ba93da Mon Sep 17 00:00:00 2001
From: Shauren 
Date: Tue, 8 Jun 2010 17:19:36 +0200
Subject: Added support for reloading creature_onkill_reputation table
 Commented ace in externals/CmakeLists.txt and moved zlib before g3dlite,
 requested by click

--HG--
branch : trunk
---
 externals/CMakeLists.txt                 | 4 ++--
 sql/updates/8512_world_command.sql       | 3 +++
 sql/world_database.sql                   | 1 +
 src/server/game/Chat/Chat.cpp            | 1 +
 src/server/game/Chat/Chat.h              | 1 +
 src/server/game/Chat/Commands/Level3.cpp | 8 ++++++++
 src/server/game/Globals/ObjectMgr.cpp    | 9 ++++++---
 7 files changed, 22 insertions(+), 5 deletions(-)
 create mode 100644 sql/updates/8512_world_command.sql

(limited to 'src')

diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index f74c476ac4c..320a40c7377 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -1,7 +1,7 @@
-add_subdirectory(ace)
+#add_subdirectory(ace)
 #add_subdirectory(bzip2)
+add_subdirectory(zlib)
 add_subdirectory(g3dlite)
 add_subdirectory(jemalloc)
 #add_subdirectory(libmpq)
 add_subdirectory(sockets)
-add_subdirectory(zlib)
diff --git a/sql/updates/8512_world_command.sql b/sql/updates/8512_world_command.sql
new file mode 100644
index 00000000000..6293503d492
--- /dev/null
+++ b/sql/updates/8512_world_command.sql
@@ -0,0 +1,3 @@
+DELETE FROM `command` WHERE `name`='reload creature_onkill_reputation';
+INSERT INTO `command` VALUES 
+('reload creature_onkill_reputation','3','Syntax: .reload creature_onkill_reputation\r\nReload creature_onkill_reputation table.');
diff --git a/sql/world_database.sql b/sql/world_database.sql
index b589f3b1b0f..9d808f9926e 100644
--- a/sql/world_database.sql
+++ b/sql/world_database.sql
@@ -571,6 +571,7 @@ INSERT INTO `command` VALUES
 ('reload creature_involvedrelation',3,'Syntax: .reload creature_involvedrelation\nReload creature_involvedrelation table.'),
 ('reload creature_linked_respawn',2,'Syntax: .reload creature_linked_respawn\r\nReload creature_linked_respawn table.'),
 ('reload creature_loot_template',3,'Syntax: .reload creature_loot_template\nReload creature_loot_template table.'),
+('reload creature_onkill_reputation','3','Syntax: .reload creature_onkill_reputation\r\nReload creature_onkill_reputation table.'),
 ('reload creature_questrelation',3,'Syntax: .reload creature_questrelation\nReload creature_questrelation table.'),
 ('reload disenchant_loot_template',3,'Syntax: .reload disenchant_loot_template\nReload disenchant_loot_template table.'),
 ('reload event_scripts',3,'Syntax: .reload event_scripts\nReload event_scripts table.'),
diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp
index 0d9f1485d20..66d867e4a69 100644
--- a/src/server/game/Chat/Chat.cpp
+++ b/src/server/game/Chat/Chat.cpp
@@ -460,6 +460,7 @@ ChatCommand * ChatHandler::getCommandTable()
         { "creature_involvedrelation",   SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadCreatureQuestInvRelationsCommand,"",NULL },
         { "creature_linked_respawn",     SEC_GAMEMASTER, true,  &ChatHandler::HandleReloadCreatureLinkedRespawnCommand,   "", NULL },
         { "creature_loot_template",      SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadLootTemplatesCreatureCommand,   "", NULL },
+        { "creature_onkill_reputation",  SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadOnKillReputationCommand,        "", NULL },
         { "creature_questrelation",      SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadCreatureQuestRelationsCommand,  "", NULL },
         { "creature_template",           SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadCreatureTemplateCommand,        "", NULL },
         //{ "db_script_string",            SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadDbScriptStringCommand,          "", NULL },
diff --git a/src/server/game/Chat/Chat.h b/src/server/game/Chat/Chat.h
index 6aa42995663..8da2979ae82 100644
--- a/src/server/game/Chat/Chat.h
+++ b/src/server/game/Chat/Chat.h
@@ -364,6 +364,7 @@ class ChatHandler
         bool HandleReloadEventAISummonsCommand(const char* args);
         bool HandleReloadEventAIScriptsCommand(const char* args);
         bool HandleReloadCommandCommand(const char* args);
+        bool HandleReloadOnKillReputationCommand(const char* args);
         bool HandleReloadCreatureTemplateCommand(const char* args);
         bool HandleReloadCreatureQuestRelationsCommand(const char* args);
         bool HandleReloadCreatureQuestInvRelationsCommand(const char* args);
diff --git a/src/server/game/Chat/Commands/Level3.cpp b/src/server/game/Chat/Commands/Level3.cpp
index deabbe62871..77d07a6f406 100644
--- a/src/server/game/Chat/Commands/Level3.cpp
+++ b/src/server/game/Chat/Commands/Level3.cpp
@@ -749,6 +749,14 @@ bool ChatHandler::HandleReloadCommandCommand(const char*)
     return true;
 }
 
+bool ChatHandler::HandleReloadOnKillReputationCommand(const char*)
+{
+    sLog.outString("Re-Loading creature award reputation definitions...");
+    objmgr.LoadReputationOnKill();
+    SendGlobalGMSysMessage("DB table `creature_onkill_reputation` reloaded.");
+    return true;
+}
+
 bool ChatHandler::HandleReloadCreatureTemplateCommand(const char* args)
 {
     if (!*args)
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index 7290af9d3fa..07e2607d13c 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -6488,6 +6488,9 @@ void ObjectMgr::LoadCorpses()
 
 void ObjectMgr::LoadReputationOnKill()
 {
+    // For reload case
+    mRepOnKill.clear();
+
     uint32 count = 0;
 
     //                                                0            1                     2
@@ -6529,7 +6532,7 @@ void ObjectMgr::LoadReputationOnKill()
 
         if (!GetCreatureTemplate(creature_id))
         {
-            sLog.outErrorDb("Table `creature_onkill_reputation` have data for not existed creature entry (%u), skipped",creature_id);
+            sLog.outErrorDb("Table `creature_onkill_reputation` have data for not existed creature entry (%u), skipped", creature_id);
             continue;
         }
 
@@ -6538,7 +6541,7 @@ void ObjectMgr::LoadReputationOnKill()
             FactionEntry const *factionEntry1 = sFactionStore.LookupEntry(repOnKill.repfaction1);
             if (!factionEntry1)
             {
-                sLog.outErrorDb("Faction (faction.dbc) %u does not exist but is used in `creature_onkill_reputation`",repOnKill.repfaction1);
+                sLog.outErrorDb("Faction (faction.dbc) %u does not exist but is used in `creature_onkill_reputation`", repOnKill.repfaction1);
                 continue;
             }
         }
@@ -6548,7 +6551,7 @@ void ObjectMgr::LoadReputationOnKill()
             FactionEntry const *factionEntry2 = sFactionStore.LookupEntry(repOnKill.repfaction2);
             if (!factionEntry2)
             {
-                sLog.outErrorDb("Faction (faction.dbc) %u does not exist but is used in `creature_onkill_reputation`",repOnKill.repfaction2);
+                sLog.outErrorDb("Faction (faction.dbc) %u does not exist but is used in `creature_onkill_reputation`", repOnKill.repfaction2);
                 continue;
             }
         }
-- 
cgit v1.2.3


From ec580c8f686e71b91798cc104c2eb3f940f3ad16 Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Tue, 8 Jun 2010 19:28:52 +0200
Subject: Some fixes for map_extractor cmake file

--HG--
branch : trunk
---
 src/tools/map_extractor/CMakeLists.txt | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/tools/map_extractor/CMakeLists.txt b/src/tools/map_extractor/CMakeLists.txt
index 9052903b1ed..2e9cb3591f1 100644
--- a/src/tools/map_extractor/CMakeLists.txt
+++ b/src/tools/map_extractor/CMakeLists.txt
@@ -1,4 +1,5 @@
 # Copyright (C) 2005-2009 MaNGOS project 
+# Copyright (C) 2005-2010 Trinity 
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -9,18 +10,18 @@
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 cmake_minimum_required (VERSION 2.6)
-project (MANGOS_MAP_EXTRACTOR)
+project (TRINITY_MAP_EXTRACTOR)
+
+file(GLOB sources *.cpp)
 
-add_subdirectory (libmpq)
 add_subdirectory (loadlib)
 
-include_directories (${MANGOS_MAP_EXTRACTOR_SOURCE_DIR}/libmpq) 
-include_directories (${MANGOS_MAP_EXTRACTOR_SOURCE_DIR}/loadlib) 
+include_directories (${CMAKE_SOURCE_DIR}/externals/libmpq)
+include_directories (${CMAKE_SOURCE_DIR}/src/tools/map-extractor/loadlib)
 
-link_directories (${MANGOS_MAP_EXTRACTOR_SOURCE_DIR}/libmpq) 
-link_directories (${MANGOS_MAP_EXTRACTOR_SOURCE_DIR}/loadlib) 
+link_directories (${CMAKE_SOURCE_DIR}/externals/libmpq)
+link_directories (${CMAKE_SOURCE_DIR}}/src/tools/map-extractor/loadlib)
 
-add_executable (ad dbcfile.cpp mpq_libmpq.cpp System.cpp)
+add_executable (trinity-map_extractor ${sources})
 
-target_link_libraries (ad libmpq)
-target_link_libraries (ad loadlib)
+target_link_libraries (trinity-map_extractor libmpq loadlib)
-- 
cgit v1.2.3


From 2238007e4edb795e6de29a10603c64f413d81320 Mon Sep 17 00:00:00 2001
From: click 
Date: Tue, 8 Jun 2010 19:29:54 +0200
Subject: Add libmpq-0.4.2 (was missing from sourcetree after cleanup)

--HG--
branch : trunk
---
 CMakeLists.txt                    |    3 +-
 externals/libmpq/Makefile.am      |   23 +
 externals/libmpq/common.c         |  221 ++++++++
 externals/libmpq/common.h         |   60 ++
 externals/libmpq/crypt_buf.h      |  217 ++++++++
 externals/libmpq/delme            |    0
 externals/libmpq/explode.c        |  602 ++++++++++++++++++++
 externals/libmpq/explode.h        |   85 +++
 externals/libmpq/extract.c        |  361 ++++++++++++
 externals/libmpq/extract.h        |  106 ++++
 externals/libmpq/huffman.c        | 1101 +++++++++++++++++++++++++++++++++++++
 externals/libmpq/huffman.h        |  151 +++++
 externals/libmpq/mpq-internal.h   |  144 +++++
 externals/libmpq/mpq.c            | 1027 ++++++++++++++++++++++++++++++++++
 externals/libmpq/mpq.h            |   99 ++++
 externals/libmpq/wave.c           |  250 +++++++++
 externals/libmpq/wave.h           |   45 ++
 src/server/scripts/CMakeLists.txt |    2 +-
 18 files changed, 4494 insertions(+), 3 deletions(-)
 create mode 100644 externals/libmpq/Makefile.am
 create mode 100644 externals/libmpq/common.c
 create mode 100644 externals/libmpq/common.h
 create mode 100644 externals/libmpq/crypt_buf.h
 delete mode 100644 externals/libmpq/delme
 create mode 100644 externals/libmpq/explode.c
 create mode 100644 externals/libmpq/explode.h
 create mode 100644 externals/libmpq/extract.c
 create mode 100644 externals/libmpq/extract.h
 create mode 100644 externals/libmpq/huffman.c
 create mode 100644 externals/libmpq/huffman.h
 create mode 100644 externals/libmpq/mpq-internal.h
 create mode 100644 externals/libmpq/mpq.c
 create mode 100644 externals/libmpq/mpq.h
 create mode 100644 externals/libmpq/wave.c
 create mode 100644 externals/libmpq/wave.h

(limited to 'src')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8f89ea5cc40..8eab43b34f4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,7 +35,7 @@ option(DO_DEBUG "Debug mode" 0)
 option(DO_MYSQL "With MySQL support" 1)
 option(DO_PCH "Use precompiled headers" 0)
 option(DO_RA "With RA" 0)
-option(DO_SCRIPTS "With trinityscripts" 1)
+option(DO_SCRIPTS "With trinityscripts" 0)
 option(DO_SQL "Copy SQL files" 0)
 option(DO_TOOLS "Compile tools" 0)
 option(DO_WARN "Enable all compile warnings" 0)
@@ -195,7 +195,6 @@ if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
   add_definitions(-D__ASSERTMACROS__)
 endif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
 
-
 add_definitions(--no-warnings) #to make build look nice, no gcc nazi warnings.
 
 set(CMAKE_SKIP_BUILD_RPATH FALSE)
diff --git a/externals/libmpq/Makefile.am b/externals/libmpq/Makefile.am
new file mode 100644
index 00000000000..409e3dfe02f
--- /dev/null
+++ b/externals/libmpq/Makefile.am
@@ -0,0 +1,23 @@
+# minimum required automake 1.6
+AUTOMAKE_OPTIONS		= 1.6
+
+# library information and headers which should not be installed.
+lib_LTLIBRARIES			= libmpq.la
+noinst_HEADERS			= common.h explode.h extract.h huffman.h mpq-internal.h wave.h
+
+# directory where the include files will be installed.
+libmpq_includedir		= $(includedir)/libmpq
+
+# header files to install.
+libmpq_include_HEADERS		= mpq.h
+
+libmpq_la_SOURCES		= $(GENERAL_SRCS)
+libmpq_la_LDFLAGS		= -release $(PACKAGE_VERSION)
+
+GENERAL_SRCS =			\
+	common.c		\
+	huffman.c		\
+	extract.c		\
+	explode.c		\
+	mpq.c			\
+	wave.c
diff --git a/externals/libmpq/common.c b/externals/libmpq/common.c
new file mode 100644
index 00000000000..f52e904e470
--- /dev/null
+++ b/externals/libmpq/common.c
@@ -0,0 +1,221 @@
+/*
+ *  common.c -- shared functions used by mpq-tools.
+ *
+ *  Copyright (c) 2003-2008 Maik Broemme 
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+/* generic includes. */
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+/* libmpq main includes. */
+#include "mpq.h"
+#include "mpq-internal.h"
+
+/* libmpq generic includes. */
+#include "extract.h"
+
+#include "common.h"
+
+/* the global shared decryption buffer. it's a static array compiled into the
+ * library, and can be re-created by compiling and running crypt_buf_gen.c
+ */
+#include "crypt_buf.h"
+
+/* function to return the hash to a given string. */
+uint32_t libmpq__hash_string(const char *key, uint32_t offset) {
+
+	/* some common variables. */
+	uint32_t seed1 = 0x7FED7FED;
+	uint32_t seed2 = 0xEEEEEEEE;
+
+	/* one key character. */
+	uint32_t ch;
+
+	/* prepare seeds. */
+	while (*key != 0) {
+		ch    = toupper(*key++);
+		seed1 = crypt_buf[offset + ch] ^ (seed1 + seed2);
+		seed2 = ch + seed1 + seed2 + (seed2 << 5) + 3;
+	}
+
+	return seed1;
+}
+
+/* function to encrypt a block. */
+int32_t libmpq__encrypt_block(uint32_t *in_buf, uint32_t in_size, uint32_t seed) {
+
+	/* some common variables. */
+	uint32_t seed2 = 0xEEEEEEEE;
+	uint32_t ch;
+
+	/* we're processing the data 4 bytes at a time. */
+	for (; in_size >= 4; in_size -= 4) {
+		seed2    += crypt_buf[0x400 + (seed & 0xFF)];
+		ch        = *in_buf ^ (seed + seed2);
+		seed      = ((~seed << 0x15) + 0x11111111) | (seed >> 0x0B);
+		seed2     = *in_buf + seed2 + (seed2 << 5) + 3;
+		*in_buf++ = ch;
+	}
+
+	/* if no error was found, return decrypted bytes. */
+	return LIBMPQ_SUCCESS;
+}
+
+
+/* function to decrypt a block. */
+int32_t libmpq__decrypt_block(uint32_t *in_buf, uint32_t in_size, uint32_t seed) {
+
+	/* some common variables. */
+	uint32_t seed2 = 0xEEEEEEEE;
+	uint32_t ch;
+
+	/* we're processing the data 4 bytes at a time. */
+	for (; in_size >= 4; in_size -= 4) {
+		seed2    += crypt_buf[0x400 + (seed & 0xFF)];
+		ch        = *in_buf ^ (seed + seed2);
+		seed      = ((~seed << 0x15) + 0x11111111) | (seed >> 0x0B);
+		seed2     = ch + seed2 + (seed2 << 5) + 3;
+		*in_buf++ = ch;
+	}
+
+	/* if no error was found, return decrypted bytes. */
+	return LIBMPQ_SUCCESS;
+}
+
+/* function to detect decryption key. */
+int32_t libmpq__decrypt_key(uint8_t *in_buf, uint32_t in_size, uint32_t block_size) {
+
+	/* some common variables. */
+	uint32_t saveseed1;
+
+	/* temp = seed1 + seed2 */
+	uint32_t temp;
+	uint32_t i = 0;
+
+	/* temp = seed1 + buffer[0x400 + (seed1 & 0xFF)] */
+	temp = (*(uint32_t *)in_buf ^ in_size) - 0xEEEEEEEE;
+
+	/* try all 255 possibilities. */
+	for (i = 0; i < 0x100; i++) {
+
+		/* some common variables. */
+		uint32_t seed1;
+		uint32_t seed2 = 0xEEEEEEEE;
+		uint32_t ch;
+		uint32_t ch2;
+
+		/* try the first uint32_t's (we exactly know the value). */
+		seed1  = temp - crypt_buf[0x400 + i];
+		seed2 += crypt_buf[0x400 + (seed1 & 0xFF)];
+		ch     = ((uint32_t *)in_buf)[0] ^ (seed1 + seed2);
+
+		if (ch != in_size) {
+			continue;
+		}
+
+		/* add one because we are decrypting block positions. */
+		saveseed1 = seed1 + 1;
+		ch2       = ch;
+
+		/*
+		 *  if ok, continue and test the second value. we don't know exactly the value,
+		 *  but we know that the second one has lower 16 bits set to zero (no compressed
+		 *  block is larger than 0xFFFF bytes)
+		 */
+		seed1  = ((~seed1 << 0x15) + 0x11111111) | (seed1 >> 0x0B);
+		seed2  = ch + seed2 + (seed2 << 5) + 3;
+		seed2 += crypt_buf[0x400 + (seed1 & 0xFF)];
+		ch     = ((uint32_t *)in_buf)[1] ^ (seed1 + seed2);
+
+		/* check if we found the file seed. */
+		if ((ch - ch2) <= block_size) {
+
+			/* file seed found, so return it. */
+			return saveseed1;
+		}
+	}
+
+	/* if no file seed was found return with error. */
+	return LIBMPQ_ERROR_DECRYPT;
+}
+
+/* function to decompress or explode a block from mpq archive. */
+int32_t libmpq__decompress_block(uint8_t *in_buf, uint32_t in_size, uint8_t *out_buf, uint32_t out_size, uint32_t compression_type) {
+
+	/* some common variables. */
+	int32_t tb = 0;
+
+	/* check if buffer is not compressed. */
+	if (compression_type == LIBMPQ_FLAG_COMPRESS_NONE) {
+
+		/* no compressed data, so copy input buffer to output buffer. */
+		memcpy(out_buf, in_buf, out_size);
+
+		/* store number of bytes copied. */
+		tb = out_size;
+	}
+
+	/* check if one compression mode is used. */
+	else if (compression_type == LIBMPQ_FLAG_COMPRESS_PKZIP ||
+	    compression_type == LIBMPQ_FLAG_COMPRESS_MULTI) {
+
+		/* check if block is really compressed, some blocks have set the compression flag, but are not compressed. */
+		if (in_size < out_size) {
+
+			/* check if we are using pkzip compression algorithm. */
+			if (compression_type == LIBMPQ_FLAG_COMPRESS_PKZIP) {
+
+				/* decompress using pkzip. */
+				if ((tb = libmpq__decompress_pkzip(in_buf, in_size, out_buf, out_size)) < 0) {
+
+					/* something on decompression failed. */
+					return tb;
+				}
+			}
+
+			/* check if we are using multiple compression algorithm. */
+			else if (compression_type == LIBMPQ_FLAG_COMPRESS_MULTI) {
+
+				/*
+				 *  check if it is a file compressed by blizzard's multiple compression, note that storm.dll
+				 *  version 1.0.9 distributed with warcraft 3 passes the full path name of the opened archive
+				 *  as the new last parameter.
+				 */
+				if ((tb = libmpq__decompress_multi(in_buf, in_size, out_buf, out_size)) < 0) {
+
+					/* something on decompression failed. */
+					return tb;
+				}
+			}
+		} else {
+
+			/* block has set compression flag, but is not compressed, so copy data to output buffer. */
+			memcpy(out_buf, in_buf, out_size);
+
+			/* save the number of transferred bytes. */
+			tb = in_size;
+		}
+	}
+
+	/* if no error was found, return transferred bytes. */
+	return tb;
+}
diff --git a/externals/libmpq/common.h b/externals/libmpq/common.h
new file mode 100644
index 00000000000..12d6008debb
--- /dev/null
+++ b/externals/libmpq/common.h
@@ -0,0 +1,60 @@
+/*
+ *  common.h -- header functions used by mpq-tools.
+ *
+ *  Copyright (c) 2003-2008 Maik Broemme 
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */       
+
+#ifndef _COMMON_H
+#define _COMMON_H
+
+/* function to return the hash to a given string. */
+uint32_t libmpq__hash_string(
+	const char	*key,
+	uint32_t	offset
+);
+
+/* function to encrypt a block. */
+int32_t libmpq__encrypt_block(
+	uint32_t	*in_buf,
+	uint32_t	in_size,
+	uint32_t	seed
+);
+
+/* function to decrypt a block. */
+int32_t libmpq__decrypt_block(
+	uint32_t	*in_buf,
+	uint32_t	in_size,
+	uint32_t	seed
+);
+
+/* function to detect decryption key. */
+int32_t libmpq__decrypt_key(
+	uint8_t		*in_buf,
+	uint32_t	in_size,
+	uint32_t	block_size
+);
+
+/* function to decompress or explode block from archive. */
+int32_t libmpq__decompress_block(
+	uint8_t		*in_buf,
+	uint32_t	in_size,
+	uint8_t		*out_buf,
+	uint32_t	out_size,
+	uint32_t	compression_type
+);
+
+#endif						/* _COMMON_H */
diff --git a/externals/libmpq/crypt_buf.h b/externals/libmpq/crypt_buf.h
new file mode 100644
index 00000000000..34184b017fe
--- /dev/null
+++ b/externals/libmpq/crypt_buf.h
@@ -0,0 +1,217 @@
+/* DO NOT CHANGE! this file is auto-generated by crypt_buf_gen.c */
+static const uint32_t crypt_buf[0x500] = {
+	0x55c636e2, 0x02be0170, 0x584b71d4, 0x2984f00e, 0xb682c809, 0x91cf876b,
+	0x775a9c24, 0x597d5ca5, 0x5a1afeb2, 0xd3e9ce0d, 0x32cdcdf8, 0xb18201cd,
+	0x3cce05ce, 0xa55d13be, 0xbb0afe71, 0x9376ab33, 0x848f645e, 0x87e45a45,
+	0x45b86017, 0x5e656ca8, 0x1b851a95, 0x2542dbd7, 0xab4df9e4, 0x5976ae9b,
+	0x6c317e7d, 0xcddd2f94, 0x3c3c13e5, 0x335b1371, 0x31a592ca, 0x51e4fc4c,
+	0xf7db5b2f, 0x8abdbe41, 0x8beaa674, 0x20d6b319, 0xde6c9a9d, 0xc5ac84e5,
+	0x445a5feb, 0x94958cb0, 0x1e7d3847, 0xf35d29b0, 0xca5cceda, 0xb732c8b5,
+	0xfdcc41dd, 0x0edcec16, 0x9d01feae, 0x1165d38e, 0x9ee193c8, 0xbf33b13c,
+	0x61bc0dfc, 0xef3e7be9, 0xf8d4d4c5, 0xc79b7694, 0x5a255943, 0x0b3dd20a,
+	0x9d1ab5a3, 0xcfa8ba57, 0x5e6d7069, 0xcb89b731, 0x3dc0d15b, 0x0d4d7e7e,
+	0x97e37f2b, 0xfefc2bb1, 0xf95b16b5, 0x27a55b93, 0x45f22729, 0x4c986630,
+	0x7c666862, 0x5fa40847, 0xa3f16205, 0x791b7764, 0x386b36d6, 0x6e6c3fef,
+	0xc75855db, 0x4abc7dc7, 0x4a328f9b, 0xcef20c0f, 0x60b88f07, 0xf7bb4b8f,
+	0x830b5192, 0x94f711ec, 0x20250752, 0x399d21a3, 0xe5c0840d, 0xe76cffa5,
+	0x624fab29, 0x5df133e6, 0x83e0b9b8, 0xc5796bfb, 0x4a7ab2d0, 0xba59a821,
+	0x03a81e4c, 0xcd3adfdb, 0x32b26b8c, 0x8e35c533, 0x9e6300e9, 0x8cf92ac5,
+	0x880d18eb, 0x131a53b3, 0x2ed2dc64, 0xb23257c1, 0xa06450c1, 0x1b92cb8e,
+	0x72ed730e, 0x19a685f0, 0x82836483, 0x42d94e8a, 0xee9bd6f6, 0x556d0b6a,
+	0xba65589a, 0xde24cce4, 0x53329f6c, 0xc754fe8b, 0x503d2dc7, 0x10027ba4,
+	0xd3b60a8b, 0x68e68d83, 0x0a9128a9, 0x595fa35f, 0x0b03b5be, 0x150a45c4,
+	0xb1629cce, 0xe5f7497b, 0x8a7098a4, 0xb8233e69, 0x8ea0f978, 0x5b579970,
+	0xeab14318, 0x4b28b263, 0xb6766cef, 0x06782877, 0x155c6dd0, 0xc711333c,
+	0xf819cedf, 0x00eb1d68, 0xd6fffa6e, 0x439e5962, 0xd765d6db, 0xcb0bcee9,
+	0x6d3c5647, 0x965466f3, 0x0ca983c9, 0x74ecc1ce, 0xfc0563b6, 0x42b08fee,
+	0xc5b38853, 0xfe502ceb, 0x7b432faf, 0xc309e610, 0x2c3997d8, 0x43774654,
+	0x15bd9d2c, 0xed6a420d, 0xc7ff520c, 0xb8a97fd1, 0x5e4d60cc, 0xb9738d11,
+	0xda2181ff, 0x73ac2597, 0x3a8eec8d, 0xac85e779, 0xf3f975d6, 0xb9fe7b91,
+	0x0f155d1e, 0x2860b6dd, 0x835977cb, 0xb0607436, 0x9cab7f6b, 0x8ab91186,
+	0xc12b51e9, 0x20084e8b, 0x44ba8ead, 0xa542b130, 0x82bcd5c4, 0xcc747f4e,
+	0x0f1909d8, 0xda242e1c, 0x6f7d1aa0, 0xd2626486, 0x88d0781e, 0xab695ccd,
+	0xfa569145, 0xb4feb55c, 0xbe47e896, 0xe70a7a88, 0xd56185a2, 0xacf4c871,
+	0x09282332, 0x1ddeeaa8, 0x590c7adb, 0xf4a97667, 0xbfd85705, 0x0ea77ccc,
+	0xa9f85364, 0x83195869, 0x8bfb041a, 0xdb842f5c, 0xd6f0f315, 0xa7756ea7,
+	0x0a51b439, 0xa9edf8a3, 0xd9084e2f, 0x827407f8, 0xd4ac8284, 0x09739d0d,
+	0xb3bb6cfc, 0xd539c77d, 0x6bbc9ac0, 0x35c641aa, 0x934c96b0, 0xd17af317,
+	0x29c6baef, 0xb275cdac, 0xd72662de, 0x9f5c2544, 0xc1a98f75, 0xd98e8f9a,
+	0x47bd5c86, 0x70c610a6, 0xb5482ed4, 0x23b9c68c, 0x3c1bae66, 0x69556e7f,
+	0xd902f5e0, 0x653d195b, 0xde6541fb, 0x07bcc6ac, 0xc6ee7788, 0x801534d4,
+	0x2c1f35c0, 0xd9de614d, 0xbdccac85, 0xb4d4a0da, 0x242d549b, 0x9d964796,
+	0xb9ceb982, 0x59fa99a9, 0xd8986cc1, 0x9e90c1a1, 0x01bbd82f, 0xd7f1c5fd,
+	0xdd847eba, 0x883d305d, 0x25f13152, 0x4a92694d, 0x77f1e601, 0x8024e6e7,
+	0x02a5f53d, 0x9c3ef4d9, 0xaf403ccc, 0xe2ad03c0, 0x46edf6ec, 0x6f9bd3e6,
+	0xcc24ad7a, 0x47afab12, 0x82298df7, 0x708c9eec, 0x76f8c1b1, 0xb39459d2,
+	0x3f1e26d9, 0xe1811be7, 0x56ed1c4d, 0xc9d18af8, 0xe828060e, 0x91cada2e,
+	0x5ccbf9b7, 0xf1a552d4, 0x3c9d4343, 0xe1008785, 0x2adfeebf, 0xf90240a0,
+	0x3d08cce7, 0x426e6fb0, 0x573c984f, 0x13a843ae, 0x406b7439, 0x636085d9,
+	0x5000ba9a, 0xad4a47ab, 0xaf001d8d, 0x419907ae, 0x185c8f96, 0xe5e9ed4d,
+	0x61764133, 0xd3703d97, 0xac98f0c6, 0xdbc3a37c, 0x85f010c4, 0x90491e32,
+	0xf12e18bf, 0xc88c96e1, 0xd3fbd6d9, 0xe3c28b08, 0xd5bf08cc, 0xb1e78859,
+	0x2546ddcf, 0xb030b200, 0xaafd2811, 0x55b22d21, 0xd38bf567, 0x469c7a2b,
+	0x5ad05792, 0xa1a5981e, 0x7dfb8384, 0x34d1ca0a, 0x7eb0dbe0, 0xd61ce0f6,
+	0x398068b7, 0xe6406d1f, 0x95ae6b47, 0xe4281230, 0xb0843061, 0xa70a3a68,
+	0xe340f625, 0x72dcbffd, 0x8eb8afcd, 0x18b6661f, 0x17ef5a5c, 0x000c5b22,
+	0x6ba13836, 0x6165e383, 0x74481c5b, 0xe56f0711, 0xa26f5024, 0x5ff22e60,
+	0x31a5e829, 0xa1094bf0, 0xc680ec6c, 0x8cf327d7, 0xebf1348a, 0x6a227d2f,
+	0x74065184, 0x8df65112, 0x2bbd05ee, 0xe4d00ed6, 0x2980ee1a, 0x6ae1da73,
+	0xe84614da, 0x6c9906ab, 0xcf8e02db, 0xd3723e97, 0x92f66caf, 0xac8491c7,
+	0xaec65696, 0xb98997cf, 0xfa16c762, 0x6d73c65f, 0x205d22a6, 0x4dd3aaa5,
+	0x2deb6bc0, 0x9f37686c, 0x71a5282b, 0x376bb9e0, 0x7fff2a1b, 0xde67982f,
+	0x9cbf33ce, 0x2e6dab37, 0x6e3424b9, 0x0ee143bc, 0x832a60d9, 0xbb6329e1,
+	0x13f6befd, 0x5965fb84, 0xf60b233c, 0x3d695183, 0x433224a1, 0xb5d9cae5,
+	0x82459bab, 0x9f21b311, 0xaf6c5247, 0xb447b13a, 0x7b2676c3, 0xc38979cd,
+	0x8526ae25, 0xc550ad5b, 0x685099a7, 0x65e9c2bd, 0xe5c6dc36, 0xe10b37a9,
+	0x88016878, 0xce81d4e4, 0x24d6fc80, 0x4106152d, 0x6d4f5f90, 0xc4dc74be,
+	0xdb48676c, 0x6cb569b7, 0xf3bf598f, 0x042b08d9, 0x02ccb2de, 0xb1056f65,
+	0x47994af4, 0xfa141ba4, 0x9376ab2e, 0x07a76737, 0x75e7e6fc, 0x449d80a1,
+	0x03b7259d, 0xf6df358a, 0x5a75d5b9, 0x47286923, 0x3b1a30ef, 0xeebe3d6a,
+	0x9db1aa00, 0x007a90d9, 0x24667071, 0x019c73cf, 0x69039bcd, 0x95900744,
+	0x6518b1eb, 0x6905f202, 0xee3951b2, 0xe141fca9, 0x797fa832, 0x5a95e55b,
+	0xd6263b15, 0x5b61f394, 0x897acb1c, 0x005f83a9, 0x22420f71, 0xf495176e,
+	0x7e138f3d, 0x1392e384, 0x373bf7aa, 0x8e512816, 0xa960b3ca, 0x0474d74c,
+	0xffacd6d7, 0x2ef5ed9e, 0x60992aaa, 0x7e690e99, 0x23c0749d, 0xd8e29105,
+	0x555d5909, 0x15631bfe, 0xa69c5a1c, 0x501017ca, 0x99438048, 0x38733ac7,
+	0xe682e2c8, 0xd4655fd6, 0x956e4c04, 0x347df643, 0x2f4b177b, 0x93ed3aa4,
+	0xa77e1dd5, 0x7ae55702, 0xd2a52fd9, 0xef8ba18c, 0xb7d3c1ee, 0x8078ba8d,
+	0xab5aaadb, 0x752be08f, 0x068b31c1, 0x078aae3c, 0xaa5a8343, 0x123d9268,
+	0x2ceaee43, 0x8ebdb239, 0x650251f3, 0x04883648, 0x8c62e12e, 0x12b32167,
+	0xe5112e9a, 0x10002548, 0x3e7a818d, 0x077e5327, 0xf140cc21, 0x6ce7d75d,
+	0x9b99f9a5, 0x3215741c, 0xb6aadbae, 0x738768dc, 0x82a3742f, 0x76517020,
+	0xdd872ad8, 0x9d0902b2, 0x7d1a6b04, 0x49381592, 0x63a652a5, 0x0c15e626,
+	0xe22f70d6, 0x01e84385, 0xb29de134, 0x20c5000e, 0xe961f443, 0x2d31662e,
+	0x3ce6bc28, 0x34f9dd94, 0xfa45de53, 0x497588bd, 0x9468215b, 0x0777fa5c,
+	0x6f7114c0, 0xe0e82694, 0xe4371986, 0x57112de2, 0xe0cac289, 0xf2a3cee0,
+	0x6a41e1b9, 0xbfcea77d, 0xf927fd52, 0x69747d98, 0xbea76cdb, 0x8dd39557,
+	0x04db5ece, 0x2a0885c8, 0x3be4e8ee, 0x21d785dc, 0x09de7c0e, 0x3258ea33,
+	0x51922982, 0xee8dd024, 0x3df6965d, 0x30c1237b, 0xf7f6686a, 0x9faca186,
+	0x7c400076, 0x85acef8a, 0xf4b6d220, 0xddc3481c, 0x439eaec4, 0x717bbe63,
+	0x8259faa7, 0xd682bd68, 0x932a8610, 0x38bf0a7f, 0x6212e2c7, 0x88ee3168,
+	0xb3c27047, 0x6133cb1e, 0x15295506, 0x5ae66246, 0x1d208ddd, 0xa91d3dba,
+	0xc315968d, 0x6aa2664b, 0x716d0cca, 0x891f4956, 0x80866bff, 0xbd56c847,
+	0x9093425a, 0x28dd9e87, 0x84ef3e08, 0x690a49d6, 0x6a7eff82, 0xabcfe400,
+	0x3d3be5ca, 0x381b650c, 0x4b7c8622, 0x3e0246f3, 0xa3561654, 0x9488865c,
+	0x3aef1bf2, 0x5e5d68a2, 0xd32f1ddc, 0x51972bf0, 0x177a213b, 0x469375c2,
+	0x37640bd0, 0xfc3324c8, 0x07091a09, 0x2d63d3fb, 0x2153f023, 0x48223875,
+	0x61a55826, 0x8c136538, 0x49f71d98, 0x84c7d51e, 0x85551a73, 0x13d604c5,
+	0xd701a626, 0x87b844ca, 0x741eb29d, 0x2a2c977c, 0xc797ca03, 0x6c4085d7,
+	0x2dacf79b, 0x734fa2eb, 0xcc290557, 0xfa1e75e4, 0x06b29a27, 0xbece2a7a,
+	0x70a4554b, 0xc935942e, 0xa764bbc1, 0x1fe391d6, 0x7807f0c2, 0x40606ed9,
+	0xe5153086, 0xe91d7dd2, 0xed5d3ba9, 0xaa14b64a, 0x83b24dd9, 0xec1ff5cd,
+	0xba33ead3, 0xe4ef735c, 0xbc062438, 0xd8bfd523, 0x473d1e04, 0x2007f8a7,
+	0xb02903ed, 0x86ea8ada, 0x95ab69cf, 0xfd1f9809, 0x9cb3d8bb, 0x51f45958,
+	0x9cdd4276, 0xc245865e, 0x8f0c836b, 0x4ee7dc07, 0xf6368d9d, 0xef2c1dc1,
+	0xee56b54b, 0xbd62ce2f, 0xf4916aad, 0xc81cb594, 0x41729f49, 0x24bef0a4,
+	0xdef487a9, 0x222e05b8, 0x8d3bf5c6, 0x11b55009, 0xad09d2b3, 0x19db9fd1,
+	0xd7427085, 0x33dbfc8b, 0x526b9378, 0x790e1bc8, 0xb2998a00, 0xa5641703,
+	0x0676d249, 0x6b9185cc, 0x30e4348f, 0x82c52f65, 0x57c7dc24, 0x489c1ecd,
+	0x9fcab02a, 0x56d61117, 0xfe869cac, 0x55fc5140, 0x7fbbb382, 0x9e5afc79,
+	0x10047c99, 0xfc9f5984, 0x56587e2d, 0xb98193f0, 0x98fe5e8e, 0x29b15b6b,
+	0x9561f055, 0xbb0caa25, 0x1e4ecc15, 0x23f5393b, 0x0845b458, 0xceff67ca,
+	0xb099900c, 0x00b1564f, 0x39eef3d1, 0xfcc1bf84, 0xac8893b5, 0x6484bf0e,
+	0x91c02ab3, 0x8c0c0c70, 0x686fa8c6, 0xe171bed6, 0xdfae37df, 0xd5a1a4e7,
+	0xe3eb49a1, 0x5e6014e0, 0x205b21ac, 0xfd58b3da, 0x2e7c07cd, 0xef2cc85a,
+	0xd7587b46, 0xf417847d, 0x8a30cec1, 0x70984f6c, 0xf0b63388, 0xc220c98d,
+	0xede62936, 0x92c0a7b3, 0x1ef371e8, 0x2005f7af, 0x91a47265, 0xb0cf5504,
+	0xd500aba8, 0xcb5c4bd3, 0x9b3bcbc3, 0xcf6644b5, 0xce9488ef, 0x003fc96e,
+	0xaa42222f, 0x4844f3d0, 0x4db89d77, 0x08681aae, 0x662f3a28, 0x761552db,
+	0x1df7a17a, 0x93feed9a, 0xcc496a4f, 0xa217cfcd, 0x3ba3c930, 0x268f7e77,
+	0x0797b4a1, 0x8bebfc51, 0x068930c4, 0x16c874e2, 0xc242da24, 0xfb229f76,
+	0xa0795b02, 0x689fc036, 0x17a73732, 0xd21aec00, 0xac00a692, 0x5b217f18,
+	0xae421624, 0x2bc05cc0, 0x48c1db7a, 0x4f4e63b4, 0x1667f04e, 0x34020f94,
+	0x972b2555, 0x9a07355b, 0x01665970, 0x7db60c6f, 0x3ad7103b, 0x5c3d09c0,
+	0xeea3dada, 0x88c21c10, 0x102436d7, 0x6a3b3400, 0xeb523c4c, 0xfb97d896,
+	0x964cb86b, 0xdd878038, 0x0529da4d, 0x0b1468a5, 0x18739ac8, 0xf7f26668,
+	0xf64f4471, 0x5c14f5c3, 0x44a081fb, 0x39ac7e37, 0x8a17c26b, 0x868f5e67,
+	0x3931978d, 0x6edf7817, 0x4951cc67, 0x943407f3, 0xcc5e748f, 0x2b7ee729,
+	0xcbb320f0, 0x11fec8e7, 0xfccfc658, 0x03454354, 0x373aa1ec, 0x1d58fe9a,
+	0x064710ae, 0xa88aa0ba, 0xd183a23e, 0x40d150a3, 0xf531b8d1, 0xa7d99f85,
+	0x11838cd5, 0xb19e64b3, 0x3d67a5e9, 0xb02c5ac6, 0x99b9b9e8, 0x4c202b7a,
+	0x15f261d3, 0xa84c2d0d, 0x50f185a6, 0x33ba41d5, 0x39791013, 0x4baff44e,
+	0xeeeeaa1c, 0xe0488314, 0x559ccd2b, 0xa104f445, 0x636f37c4, 0x264d5e3b,
+	0x75c17f35, 0x75424131, 0xbb115739, 0x74fe755a, 0x7d3a7aa6, 0x2d8be784,
+	0x83ed154a, 0xfc2673d8, 0x44dd4a7f, 0x79056cc8, 0x82cc8831, 0x9d3c1b7c,
+	0xe9453bfa, 0x24315694, 0x661f3253, 0x75549f5c, 0xbb2b63ed, 0x67e00d96,
+	0xf48966c7, 0x0d7bea56, 0xc25f92ef, 0xa947a79d, 0xde4adf6f, 0xac0f0342,
+	0xd3eb246b, 0xa4aa118e, 0x3c3e6a46, 0x457f4441, 0xa50a406f, 0x6c508d9f,
+	0xe9ac18e7, 0x1ecdb4ba, 0x39ac7e3a, 0x7fb304fa, 0x6f38f8e8, 0x4aecea6d,
+	0x61035e73, 0x81708907, 0xebc07205, 0x90fd7614, 0xb52d217f, 0x6c4de195,
+	0x1dd49084, 0x64ee482c, 0x94c7a521, 0x540c09d8, 0x75df8dd5, 0x414131f7,
+	0x3698fd76, 0xf784db4f, 0xf8c97a03, 0x048f39b9, 0x3bf4f0bd, 0x8cb50992,
+	0x9b58d9ee, 0xe5ab79cc, 0x9a5f6052, 0xbd9591b0, 0xfad2232b, 0x5a632254,
+	0x0286e618, 0x8ad3c8f7, 0xe4060176, 0x754c4617, 0x5c10490b, 0x6f7d6fff,
+	0x2187b42a, 0x5775095b, 0x02f4c663, 0x5a5dca06, 0xfe4ad4c7, 0x53e19f7d,
+	0x59ff46b5, 0xbcc42ba5, 0xfd2f4a97, 0xbed6d905, 0x95629b6b, 0x21a1c0db,
+	0xaa10b45d, 0xe6ef6d58, 0x2892cf4d, 0x9fed6c10, 0x1e386bf7, 0x9be0c6e8,
+	0x2b2f15ef, 0x19f5ac7b, 0x7aff0e72, 0x31da576f, 0x30252cb4, 0x577960ac,
+	0x166e9e5a, 0xa9374a61, 0x71369c96, 0x7ff826ae, 0xe8175326, 0xcabbfd33,
+	0x0191190e, 0x699d3c3e, 0x36b40b22, 0xb3950513, 0x9b889bfa, 0xa52a5007,
+	0xac290fed, 0x3b4e4a4f, 0xb753d8d6, 0x3c531f22, 0x582f6427, 0xa9cd93a9,
+	0x546e39ae, 0x242faad2, 0xd2e0f747, 0x09f6325d, 0x59d48719, 0xad7eb66e,
+	0xd5512878, 0x56debf9d, 0x5107e5a5, 0xf1c00aa4, 0x814ccca8, 0x600d90f0,
+	0x9be97619, 0x915fa5f2, 0x2b5628dd, 0xa33d5f5a, 0x595df7c1, 0x6966215d,
+	0x50ec8337, 0xf1d21372, 0x0ee2eefb, 0xad9e70b7, 0xab0d2fe4, 0xcf277b5d,
+	0x62585a2c, 0x835a7844, 0x74b1fa6b, 0x49baffd5, 0x2ea9c864, 0x129311a8,
+	0xbdfa1867, 0x83ca5997, 0x9d1db719, 0x84bb79e6, 0x9e3f99f2, 0x313f6101,
+	0x1b99245b, 0xd15d8fb2, 0xcef90f81, 0x2945268d, 0xdbbcf573, 0xb1021886,
+	0x9ee7ec1d, 0x1cf824f7, 0x7eaa2e32, 0x69c0a2b5, 0x7494419c, 0xe253d7d3,
+	0x48da3d12, 0x45b8b571, 0xdb4d147a, 0xd82d8dde, 0x265d10a2, 0xb0a6eb9a,
+	0x7e1c93a6, 0x36fe2f46, 0xdcad6b00, 0x05439191, 0xb0ce5484, 0x61d1c309,
+	0x8da62a03, 0x06d0fe2f, 0xbac6dd3c, 0xca2006f3, 0x8321b1af, 0x0411a6f3,
+	0xe8918eac, 0x21a2c152, 0x91c0d54f, 0x6aaa14fa, 0xdd22a440, 0x88cb2075,
+	0x7a4eb813, 0x67afa071, 0xd8d98c9c, 0x31f10d47, 0x6ff1a8a8, 0x2faaf0a1,
+	0x48a221bb, 0x3be6948b, 0xaa79e79b, 0x0ea7278c, 0x7a3857ef, 0x49b7fe55,
+	0xd51cb931, 0x041c018d, 0x00b90501, 0x45ea7881, 0x8fc1dbcf, 0xb80b32a9,
+	0xabacd2e9, 0x677bdc40, 0xecace542, 0x6d6514eb, 0x31c09ff7, 0x5e6c1abd,
+	0x1c391d0f, 0x0e9d77f1, 0x7119392d, 0x6be9b0ba, 0x6194fa77, 0x45e62148,
+	0x42234af2, 0xc3239d66, 0x939cbdbc, 0x56200d9c, 0x6b275208, 0x001a61f3,
+	0xccc2a546, 0x4b722be0, 0xee25f2b7, 0x6d86cf9e, 0xaa6be0cd, 0x4dcda7b6,
+	0x78d4aa13, 0x36ea7ad9, 0x3f29d700, 0xdeea2d84, 0x6a6af5bd, 0x18afb81c,
+	0xd8e4e73c, 0x8aa708ba, 0x658b94d9, 0xa676478c, 0xcfa10c22, 0x25593c74,
+	0x8d962235, 0x5f980270, 0x3df6ebc0, 0x8e7d92fa, 0xc3ee55e1, 0xd5f72447,
+	0x02b0fa95, 0x52b0b520, 0x70d2c11f, 0x3a6fdd6c, 0x193aa698, 0x5496f7d5,
+	0x4208931b, 0x7a4106ec, 0x83e86840, 0xf49b6f8c, 0xba3d9a51, 0x55f54ddd,
+	0x2de51372, 0x9afb571b, 0x3ab35406, 0xad64ff1f, 0xc77764fe, 0x7f864466,
+	0x416d9cd4, 0xa2489278, 0xe30b86e4, 0x0b5231b6, 0xba67aed6, 0xe5ab2467,
+	0x60028b90, 0x1d9e20c6, 0x2a7c692a, 0x6b691cdb, 0x9e51f817, 0x9b763dec,
+	0x3d29323f, 0xcfe12b68, 0x754b459b, 0xa2238047, 0xd9c55514, 0x6bdcffc1,
+	0x693e6340, 0x82383fe7, 0x1916ea5f, 0xec7bcd59, 0x72de165a, 0xe79a1617,
+	0x8ec86234, 0xa8f0d284, 0x20c90226, 0x7bf98884, 0x28a58331, 0x3ec3fa6e,
+	0x4ce0895b, 0xc353b4d0, 0x33ef064f, 0x21e5e210, 0xc8bb589d, 0xe85dcab2,
+	0xac65829f, 0xa7bf92d0, 0x05a6174d, 0x25a50c2e, 0xe5c78777, 0x3d75021f,
+	0x4baa9c98, 0x23bdc884, 0x9653bbd7, 0xbadce7f5, 0xc283a484, 0xc040df2e,
+	0x9370a841, 0x2f316022, 0x36eed231, 0xac2cbc0c, 0x13c0a49b, 0xcdd12997,
+	0x07fe91b2, 0xcd7eabcd, 0x2c01271d, 0x18432df8, 0x599c6bc7, 0x75e93d5a,
+	0xb67a6ee2, 0x8e738e16, 0xff9073fd, 0xaf77026a, 0xf86ea2fc, 0x91509ea3,
+	0x33a78dc6, 0x4f79234a, 0x3a7535bc, 0x3539fcb1, 0x3103ee52, 0x4f6f1e69,
+	0x6bb3ebbc, 0x4cb77555, 0x8dd1e999, 0x2ade439d, 0x11521fae, 0xb94d2545,
+	0x8dde9abd, 0x1909393f, 0xb792a23d, 0x749c455b, 0xb5b60f2c, 0x380459ce,
+	0x0dad5820, 0xb130845b, 0x291cbd52, 0xde9a5bb7, 0x51def961, 0x515b6408,
+	0xca6e823e, 0x382e6e74, 0xeebe3d71, 0x4c8f0c6a, 0xe676dcea, 0x14e1dc7c,
+	0x6f7fc634, 0xcf85a943, 0xd39ea96e, 0x136e7c93, 0x7164b304, 0xf32f1333,
+	0x35c34034, 0xde39d721, 0x91a87439, 0xc410111f, 0x29f17aac, 0x1316a6ff,
+	0x12f194ee, 0x420b9499, 0xf72db0dc, 0x690b9f93, 0x17d14bb2, 0x8f931ab8,
+	0x217500bc, 0x875413f8, 0x98b2e43d, 0xc51f9571, 0x54cebdca, 0x0719cc79,
+	0xf3c7080d, 0xe4286771, 0xa3eab3cd, 0x4a6b00e0, 0x11cf0759, 0x7e897379,
+	0x5b32876c, 0x5e8cd4f6, 0x0cedfa64, 0x919ac2c7, 0xb214f3b3, 0x0e89c38c,
+	0xf0c43a39, 0xeae10522, 0x835bce06, 0x9eec43c2, 0xea26a9d6, 0x69531821,
+	0x6725b24a, 0xda81b0e2, 0xd5b4ae33, 0x080f99fb, 0x15a83daf, 0x29dfc720,
+	0x91e1900f, 0x28163d58, 0x83d107a2, 0x4eac149a, 0x9f71da18, 0x61d5c4fa,
+	0xe3ab2a5f, 0xc7b0d63f, 0xb3cc752a, 0x61ebcfb6, 0x26ffb52a, 0xed789e3f,
+	0xaa3bc958, 0x455a8788, 0xc9c082a9, 0x0a1bef0e, 0xc29a5a7e, 0x150d4735,
+	0x943809e0, 0x69215510, 0xef0b0da9, 0x3b4e9fb3, 0xd8b5d04c, 0xc7a023a8,
+	0xb0d50288, 0x64821375, 0xc260e8cf, 0x8496bd2c, 0xff4f5435, 0x0fb5560c,
+	0x7cd74a52, 0x93589c80, 0x88975c47, 0x83bda89d, 0x8bcc4296, 0x01b82c21,
+	0xfd821dbf, 0x26520b47, 0x04983e19, 0xd3e1ca27, 0x782c580f, 0x326ff573,
+	0xc157bcc7, 0x4f5e6b84, 0x44ebfbfb, 0xda26d9d8, 0x6cd9d08e, 0x1719f1d8,
+	0x715c0487, 0x2c2d3c92, 0x53faaba9, 0xbc836146, 0x510c92d6, 0xe089f82a,
+	0x4680171f, 0x369f00de, 0x70ec2331, 0x0e253d55, 0xdafb9717, 0xe5dd922d,
+	0x95915d21, 0xa0202f96, 0xa161cc47, 0xeacfa6f1, 0xed5e9189, 0xdab87684,
+	0xa4b76d4a, 0xfa704897, 0x631f10ba, 0xd39da8f9, 0x5db4c0e4, 0x16fde42a,
+	0x2dff7580, 0xb56fec7e, 0xc3ffb370, 0x8e6f36bc, 0x6097d459, 0x514d5d36,
+	0xa5a737e2, 0x3977b9b3, 0xfd31a0ca, 0x903368db, 0xe8370d61, 0x98109520,
+	0xade23cac, 0x99f82e04, 0x41de7ea3, 0x84a1c295, 0x09191be0, 0x30930d02,
+	0x1c9fa44a, 0xc406b6d7, 0xeedca152, 0x6149809c, 0xb0099ef4, 0xc5f653a5,
+	0x4c10790d, 0x7303286c
+};
diff --git a/externals/libmpq/delme b/externals/libmpq/delme
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/externals/libmpq/explode.c b/externals/libmpq/explode.c
new file mode 100644
index 00000000000..2d778d25c39
--- /dev/null
+++ b/externals/libmpq/explode.c
@@ -0,0 +1,602 @@
+/*
+ *  explode.c -- explode function of pkware data compression library.
+ *
+ *  Copyright (c) 2003-2008 Maik Broemme 
+ *
+ *  This source was adepted from the C++ version of pkware.cpp included
+ *  in stormlib. The C++ version belongs to the following authors:
+ *
+ *  Ladislav Zezula 
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+/* generic includes. */
+#include 
+
+/* libmpq main includes. */
+#include "mpq.h"
+
+/* libmpq generic includes. */
+#include "explode.h"
+
+/* tables used for data extraction. */
+static const uint8_t pkzip_dist_bits[] = {
+	0x02, 0x04, 0x04, 0x05, 0x05, 0x05, 0x05, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
+	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08
+};
+
+/* tables used for data extraction. */
+static const uint8_t pkzip_dist_code[] = {
+	0x03, 0x0D, 0x05, 0x19, 0x09, 0x11, 0x01, 0x3E, 0x1E, 0x2E, 0x0E, 0x36, 0x16, 0x26, 0x06, 0x3A,
+	0x1A, 0x2A, 0x0A, 0x32, 0x12, 0x22, 0x42, 0x02, 0x7C, 0x3C, 0x5C, 0x1C, 0x6C, 0x2C, 0x4C, 0x0C,
+	0x74, 0x34, 0x54, 0x14, 0x64, 0x24, 0x44, 0x04, 0x78, 0x38, 0x58, 0x18, 0x68, 0x28, 0x48, 0x08,
+	0xF0, 0x70, 0xB0, 0x30, 0xD0, 0x50, 0x90, 0x10, 0xE0, 0x60, 0xA0, 0x20, 0xC0, 0x40, 0x80, 0x00
+};
+
+/* tables used for data extraction. */
+static const uint8_t pkzip_clen_bits[] = {
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08
+};
+
+/* tables used for data extraction. */
+static const uint16_t pkzip_len_base[] = {
+	0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007,
+	0x0008, 0x000A, 0x000E, 0x0016, 0x0026, 0x0046, 0x0086, 0x0106
+};
+
+/* tables used for data extraction. */
+static const uint8_t pkzip_slen_bits[] = {
+	0x03, 0x02, 0x03, 0x03, 0x04, 0x04, 0x04, 0x05, 0x05, 0x05, 0x05, 0x06, 0x06, 0x06, 0x07, 0x07
+};
+
+/* tables used for data extraction. */
+static const uint8_t pkzip_len_code[] = {
+	0x05, 0x03, 0x01, 0x06, 0x0A, 0x02, 0x0C, 0x14, 0x04, 0x18, 0x08, 0x30, 0x10, 0x20, 0x40, 0x00
+};
+
+/* tables used for data extraction. */
+static const uint8_t pkzip_bits_asc[] = {
+	0x0B, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x08, 0x07, 0x0C, 0x0C, 0x07, 0x0C, 0x0C,
+	0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0D, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C,
+	0x04, 0x0A, 0x08, 0x0C, 0x0A, 0x0C, 0x0A, 0x08, 0x07, 0x07, 0x08, 0x09, 0x07, 0x06, 0x07, 0x08,
+	0x07, 0x06, 0x07, 0x07, 0x07, 0x07, 0x08, 0x07, 0x07, 0x08, 0x08, 0x0C, 0x0B, 0x07, 0x09, 0x0B,
+	0x0C, 0x06, 0x07, 0x06, 0x06, 0x05, 0x07, 0x08, 0x08, 0x06, 0x0B, 0x09, 0x06, 0x07, 0x06, 0x06,
+	0x07, 0x0B, 0x06, 0x06, 0x06, 0x07, 0x09, 0x08, 0x09, 0x09, 0x0B, 0x08, 0x0B, 0x09, 0x0C, 0x08,
+	0x0C, 0x05, 0x06, 0x06, 0x06, 0x05, 0x06, 0x06, 0x06, 0x05, 0x0B, 0x07, 0x05, 0x06, 0x05, 0x05,
+	0x06, 0x0A, 0x05, 0x05, 0x05, 0x05, 0x08, 0x07, 0x08, 0x08, 0x0A, 0x0B, 0x0B, 0x0C, 0x0C, 0x0C,
+	0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D,
+	0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D,
+	0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D,
+	0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C,
+	0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C,
+	0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C,
+	0x0D, 0x0C, 0x0D, 0x0D, 0x0D, 0x0C, 0x0D, 0x0D, 0x0D, 0x0C, 0x0D, 0x0D, 0x0D, 0x0D, 0x0C, 0x0D,
+	0x0D, 0x0D, 0x0C, 0x0C, 0x0C, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D
+};
+
+/* tables used for data extraction. */
+static const uint16_t pkzip_code_asc[] = {
+	0x0490, 0x0FE0, 0x07E0, 0x0BE0, 0x03E0, 0x0DE0, 0x05E0, 0x09E0,
+	0x01E0, 0x00B8, 0x0062, 0x0EE0, 0x06E0, 0x0022, 0x0AE0, 0x02E0,
+	0x0CE0, 0x04E0, 0x08E0, 0x00E0, 0x0F60, 0x0760, 0x0B60, 0x0360,
+	0x0D60, 0x0560, 0x1240, 0x0960, 0x0160, 0x0E60, 0x0660, 0x0A60,
+	0x000F, 0x0250, 0x0038, 0x0260, 0x0050, 0x0C60, 0x0390, 0x00D8,
+	0x0042, 0x0002, 0x0058, 0x01B0, 0x007C, 0x0029, 0x003C, 0x0098,
+	0x005C, 0x0009, 0x001C, 0x006C, 0x002C, 0x004C, 0x0018, 0x000C,
+	0x0074, 0x00E8, 0x0068, 0x0460, 0x0090, 0x0034, 0x00B0, 0x0710,
+	0x0860, 0x0031, 0x0054, 0x0011, 0x0021, 0x0017, 0x0014, 0x00A8,
+	0x0028, 0x0001, 0x0310, 0x0130, 0x003E, 0x0064, 0x001E, 0x002E,
+	0x0024, 0x0510, 0x000E, 0x0036, 0x0016, 0x0044, 0x0030, 0x00C8,
+	0x01D0, 0x00D0, 0x0110, 0x0048, 0x0610, 0x0150, 0x0060, 0x0088,
+	0x0FA0, 0x0007, 0x0026, 0x0006, 0x003A, 0x001B, 0x001A, 0x002A,
+	0x000A, 0x000B, 0x0210, 0x0004, 0x0013, 0x0032, 0x0003, 0x001D,
+	0x0012, 0x0190, 0x000D, 0x0015, 0x0005, 0x0019, 0x0008, 0x0078,
+	0x00F0, 0x0070, 0x0290, 0x0410, 0x0010, 0x07A0, 0x0BA0, 0x03A0,
+	0x0240, 0x1C40, 0x0C40, 0x1440, 0x0440, 0x1840, 0x0840, 0x1040,
+	0x0040, 0x1F80, 0x0F80, 0x1780, 0x0780, 0x1B80, 0x0B80, 0x1380,
+	0x0380, 0x1D80, 0x0D80, 0x1580, 0x0580, 0x1980, 0x0980, 0x1180,
+	0x0180, 0x1E80, 0x0E80, 0x1680, 0x0680, 0x1A80, 0x0A80, 0x1280,
+	0x0280, 0x1C80, 0x0C80, 0x1480, 0x0480, 0x1880, 0x0880, 0x1080,
+	0x0080, 0x1F00, 0x0F00, 0x1700, 0x0700, 0x1B00, 0x0B00, 0x1300,
+	0x0DA0, 0x05A0, 0x09A0, 0x01A0, 0x0EA0, 0x06A0, 0x0AA0, 0x02A0,
+	0x0CA0, 0x04A0, 0x08A0, 0x00A0, 0x0F20, 0x0720, 0x0B20, 0x0320,
+	0x0D20, 0x0520, 0x0920, 0x0120, 0x0E20, 0x0620, 0x0A20, 0x0220,
+	0x0C20, 0x0420, 0x0820, 0x0020, 0x0FC0, 0x07C0, 0x0BC0, 0x03C0,
+	0x0DC0, 0x05C0, 0x09C0, 0x01C0, 0x0EC0, 0x06C0, 0x0AC0, 0x02C0,
+	0x0CC0, 0x04C0, 0x08C0, 0x00C0, 0x0F40, 0x0740, 0x0B40, 0x0340,
+	0x0300, 0x0D40, 0x1D00, 0x0D00, 0x1500, 0x0540, 0x0500, 0x1900,
+	0x0900, 0x0940, 0x1100, 0x0100, 0x1E00, 0x0E00, 0x0140, 0x1600,
+	0x0600, 0x1A00, 0x0E40, 0x0640, 0x0A40, 0x0A00, 0x1200, 0x0200,
+	0x1C00, 0x0C00, 0x1400, 0x0400, 0x1800, 0x0800, 0x1000, 0x0000  
+};
+
+/* local unused variables. */
+char pkware_copyright[] = "PKWARE Data Compression Library for Win32\r\n"
+			  "Copyright 1989-1995 PKWARE Inc.  All Rights Reserved\r\n"
+			  "Patent No. 5,051,745\r\n"
+			  "PKWARE Data Compression Library Reg. U.S. Pat. and Tm. Off.\r\n"
+			  "Version 1.11\r\n";
+
+/* skips given number of bits. */
+static int32_t skip_bit(pkzip_cmp_s *mpq_pkzip, uint32_t bits) {
+
+	/* check if number of bits required is less than number of bits in the buffer. */
+	if (bits <= mpq_pkzip->extra_bits) {
+		mpq_pkzip->extra_bits  -= bits;
+		mpq_pkzip->bit_buf    >>= bits;
+		return 0;
+	}
+
+	/* load input buffer if necessary. */
+	mpq_pkzip->bit_buf >>= mpq_pkzip->extra_bits;
+	if (mpq_pkzip->in_pos == mpq_pkzip->in_bytes) {
+		mpq_pkzip->in_pos = sizeof(mpq_pkzip->in_buf);
+		if ((mpq_pkzip->in_bytes = mpq_pkzip->read_buf((char *)mpq_pkzip->in_buf, &mpq_pkzip->in_pos, mpq_pkzip->param)) == 0) {
+			return 1;
+		}
+		mpq_pkzip->in_pos = 0;
+	}
+
+	/* update bit buffer. */
+	mpq_pkzip->bit_buf     |= (mpq_pkzip->in_buf[mpq_pkzip->in_pos++] << 8);
+	mpq_pkzip->bit_buf    >>= (bits - mpq_pkzip->extra_bits);
+	mpq_pkzip->extra_bits   = (mpq_pkzip->extra_bits - bits) + 8;
+
+	/* if no error was found, return zero. */
+	return 0;
+}
+
+/* this function generate the decode tables used for decryption. */
+static void generate_tables_decode(int32_t count, uint8_t *bits, const uint8_t *code, uint8_t *buf2) {
+
+	/* some common variables. */
+	int32_t i;
+
+	/* EBX - count */
+	for (i = count-1; i >= 0; i--) {
+
+		/* some common variables. */
+		uint32_t idx1 = code[i];
+		uint32_t idx2 = 1 << bits[i];
+
+		/* loop until table is ready. */
+		do {
+			buf2[idx1] = (uint8_t)i;
+			idx1      += idx2;
+		} while (idx1 < 0x100);
+	}
+}
+
+/* this function generate the tables for ascii decompression. */
+static void generate_tables_ascii(pkzip_cmp_s *mpq_pkzip) {
+
+	/* some common variables. */
+	const uint16_t *code_asc = &pkzip_code_asc[0xFF];
+	uint32_t acc;
+	uint32_t add;
+	uint16_t count;
+
+	/* loop through ascii table. */
+	for (count = 0x00FF; code_asc >= pkzip_code_asc; code_asc--, count--) {
+		uint8_t *bits_asc = mpq_pkzip->bits_asc + count;
+		uint8_t bits_tmp  = *bits_asc;
+
+		/* check if byte is finished. */
+		if (bits_tmp <= 8) {
+			add = (1 << bits_tmp);
+			acc = *code_asc;
+			do {
+				mpq_pkzip->offs_2c34[acc]  = (uint8_t)count;
+				acc                       += add;
+			} while (acc < 0x100);
+		} else {
+			if ((acc = (*code_asc & 0xFF)) != 0) {
+				mpq_pkzip->offs_2c34[acc] = 0xFF;
+				if (*code_asc & 0x3F) {
+
+					/* decrease bit by four. */
+					bits_tmp  -= 4;
+					*bits_asc  = bits_tmp;
+					add        = (1 << bits_tmp);
+					acc        = *code_asc >> 4;
+					do {
+						mpq_pkzip->offs_2d34[acc]  = (uint8_t)count;
+						acc                       += add;
+					} while (acc < 0x100);
+				} else {
+
+					/* decrease bit by six. */
+					bits_tmp  -= 6;
+					*bits_asc  = bits_tmp;
+					add        = (1 << bits_tmp);
+					acc        = *code_asc >> 6;
+					do {
+						mpq_pkzip->offs_2e34[acc]  = (uint8_t)count;
+						acc                       += add;
+					} while (acc < 0x80);
+				}
+			} else {
+
+				/* decrease bit by eight. (one byte) */
+				bits_tmp  -= 8;
+				*bits_asc  = bits_tmp;
+				add        = (1 << bits_tmp);
+				acc        = *code_asc >> 8;
+				do {
+					mpq_pkzip->offs_2eb4[acc]  = (uint8_t)count;
+					acc                       += add;
+				} while (acc < 0x100);
+			}
+		}
+	}
+}
+
+/*
+ *  decompress the imploded data using coded literals.
+ *
+ *  returns: 0x000 - 0x0FF : one byte from compressed file.
+ *           0x100 - 0x305 : copy previous block. (0x100 = 1 byte)
+ *           0x306         : out of buffer?
+ */
+static uint32_t decode_literal(pkzip_cmp_s *mpq_pkzip) {
+
+	/* number of bits to skip. */
+	uint32_t bits;
+
+	/* position in buffers. */
+	uint32_t value;
+
+	/* check if bit the current buffer is set, if not return the next byte. */
+	if (mpq_pkzip->bit_buf & 1) {
+
+		/* skip current bit in the buffer. */
+		if (skip_bit(mpq_pkzip, 1)) {
+			return 0x306;
+		}
+
+		/* the next bits are position in buffers. */
+		value = mpq_pkzip->pos2[(mpq_pkzip->bit_buf & 0xFF)];
+
+		/* get number of bits to skip. */
+		if (skip_bit(mpq_pkzip, mpq_pkzip->slen_bits[value])) {
+			return 0x306;
+		}
+
+		/* check bits. */
+		if ((bits = mpq_pkzip->clen_bits[value]) != 0) {
+
+			/* some common variables. */
+			uint32_t val2 = mpq_pkzip->bit_buf & ((1 << bits) - 1);
+
+			/* check if we should skip one bit. */
+			if (skip_bit(mpq_pkzip, bits)) {
+
+				/* check position if we should skip the bit. */
+				if ((value + val2) != 0x10E) {
+					return 0x306;
+				}
+			}
+
+			/* fill values. */
+			value = mpq_pkzip->len_base[value] + val2;
+		}
+
+		/* return number of bytes to repeat. */
+		return value + 0x100;
+	}
+
+	/* skip one bit. */
+	if (skip_bit(mpq_pkzip, 1)) {
+		return 0x306;
+	}
+
+	/* check the binary compression type, read 8 bits and return them as one byte. */
+	if (mpq_pkzip->cmp_type == LIBMPQ_PKZIP_CMP_BINARY) {
+
+		/* fill values. */
+		value = mpq_pkzip->bit_buf & 0xFF;
+
+		/* check if we should skip one bit. */
+		if (skip_bit(mpq_pkzip, 8)) {
+			return 0x306;
+		}
+
+		/* return value from bit buffer. */
+		return value;
+	}
+
+	/* check if ascii compression is used. */
+	if (mpq_pkzip->bit_buf & 0xFF) {
+
+		/* fill values. */
+		value = mpq_pkzip->offs_2c34[mpq_pkzip->bit_buf & 0xFF];
+
+		/* check value. */
+		if (value == 0xFF) {
+			if (mpq_pkzip->bit_buf & 0x3F) {
+
+				/* check if four bits are in bit buffer for skipping. */
+				if (skip_bit(mpq_pkzip, 4)) {
+					return 0x306;
+				}
+
+				/* fill values. */
+				value = mpq_pkzip->offs_2d34[mpq_pkzip->bit_buf & 0xFF];
+			} else {
+
+				/* check if six bits are in bit buffer for skipping. */
+				if (skip_bit(mpq_pkzip, 6)) {
+					return 0x306;
+				}
+
+				/* fill values. */
+				value = mpq_pkzip->offs_2e34[mpq_pkzip->bit_buf & 0x7F];
+			}
+		}
+	} else {
+
+		/* check if eight bits are in bit buffer for skipping. */
+		if (skip_bit(mpq_pkzip, 8)) {
+			return 0x306;
+		}
+
+		/* fill values. */
+		value = mpq_pkzip->offs_2eb4[mpq_pkzip->bit_buf & 0xFF];
+	}
+
+	/* return out of buffer error (0x306) or position in buffer. */
+	return skip_bit(mpq_pkzip, mpq_pkzip->bits_asc[value]) ? 0x306 : value;
+}
+
+/* this function retrieves the number of bytes to move back. */
+static uint32_t decode_distance(pkzip_cmp_s *mpq_pkzip, uint32_t length) {
+
+	/* some common variables. */
+	uint32_t pos  = mpq_pkzip->pos1[(mpq_pkzip->bit_buf & 0xFF)];
+
+	/* number of bits to skip. */
+	uint32_t skip = mpq_pkzip->dist_bits[pos];
+
+	/* skip the appropriate number of bits. */
+	if (skip_bit(mpq_pkzip, skip) == 1) {
+		return 0;
+	}
+
+	/* check if length is two. */
+	if (length == 2) {
+		pos = (pos << 2) | (mpq_pkzip->bit_buf & 0x03);
+
+		/* skip the bits. */
+		if (skip_bit(mpq_pkzip, 2) == 1) {
+			return 0;
+		}
+	} else {
+		pos = (pos << mpq_pkzip->dsize_bits) | (mpq_pkzip->bit_buf & mpq_pkzip->dsize_mask);
+
+		/* skip the bits */
+		if (skip_bit(mpq_pkzip, mpq_pkzip->dsize_bits) == 1) {
+			return 0;
+		}
+	}
+
+	/* return the bytes to move back. */
+	return pos + 1;
+}
+
+/*
+ *  function loads data from the input buffer used by mpq_pkzip
+ *  "implode" and "explode" function as user defined callback and
+ *  returns number of bytes loaded.
+ *
+ *  char		*buf	- pointer to a buffer where to store loaded data.
+ *  uint32_t		*size	- maximum number of bytes to read.
+ *  void		*param	- custom pointer, parameter of implode/explode.
+ */
+static uint32_t data_read_input(char *buf, uint32_t *size, void *param) {
+
+	/* some common variables. */
+	pkzip_data_s *info   = (pkzip_data_s *)param;
+	uint32_t max_avail = (info->in_bytes - info->in_pos);
+	uint32_t to_read   = *size;
+
+	/* check the case when not enough data available. */
+	if (to_read > max_avail) {
+		to_read = max_avail;
+	}
+
+	/* load data and increment offsets. */
+	memcpy(buf, info->in_buf + info->in_pos, to_read);
+	info->in_pos += to_read;
+
+	/* return bytes read. */
+	return to_read;
+}
+
+/*
+ *  function for store output data used by mpq_pkzip "implode" and
+ *  "explode" as userdefined callback.
+ *
+ *  char		*buf	- pointer to data to be written.
+ *  uint32_t		*size	- number of bytes to write.
+ *  void		*param	- custom pointer, parameter of implode/explode.
+ */
+static void data_write_output(char *buf, uint32_t *size, void *param) {
+
+	/* some common variables. */
+	pkzip_data_s *info   = (pkzip_data_s *)param;
+	uint32_t max_write = (info->max_out - info->out_pos);
+	uint32_t to_write  = *size;
+
+	/* check the case when not enough space in the output buffer. */
+	if (to_write > max_write) {
+		to_write = max_write;
+	}
+
+	/* write output data and increments offsets. */
+	memcpy(info->out_buf + info->out_pos, buf, to_write);
+	info->out_pos += to_write;
+}
+
+/* this function extract the data from input stream. */
+static uint32_t expand(pkzip_cmp_s *mpq_pkzip) {
+
+	/* number of bytes to copy. */
+	uint32_t copy_bytes;
+
+	/* one byte from compressed file. */
+	uint32_t one_byte;
+
+	/* some common variables. */
+	uint32_t result;
+
+	/* initialize output buffer position. */
+	mpq_pkzip->out_pos = 0x1000;
+
+	/* check if end of data or error, so terminate decompress. */
+	while ((result = one_byte = decode_literal(mpq_pkzip)) < 0x305) {
+
+		/* check if one byte is greater than 0x100, which means 'repeat n - 0xFE bytes'. */
+		if (one_byte >= 0x100) {
+
+			/* ECX */
+			uint8_t *source;
+
+			/* EDX */
+			uint8_t *target;
+
+			/* some common variables. */
+			uint32_t copy_length = one_byte - 0xFE;
+			uint32_t move_back;
+
+			/* get length of data to copy. */
+			if ((move_back = decode_distance(mpq_pkzip, copy_length)) == 0) {
+				result = 0x306;
+				break;
+			}
+
+			/* target and source pointer. */
+			target              = &mpq_pkzip->out_buf[mpq_pkzip->out_pos];
+			source              = target - move_back;
+			mpq_pkzip->out_pos += copy_length;
+
+			/* copy until nothing left. */
+			while (copy_length-- > 0) {
+				*target++ = *source++;
+			}
+		} else {
+
+			/* byte is 0x100 great, so add one byte. */
+			mpq_pkzip->out_buf[mpq_pkzip->out_pos++] = (uint8_t)one_byte;
+		}
+
+		/* check if number of extracted bytes has reached 1/2 of output buffer, so flush output buffer. */
+		if (mpq_pkzip->out_pos >= 0x2000) {
+
+			/* copy decompressed data into user buffer. */
+			copy_bytes = 0x1000;
+			mpq_pkzip->write_buf((char *)&mpq_pkzip->out_buf[0x1000], ©_bytes, mpq_pkzip->param);
+
+			/* check if there are some data left, keep them alive. */
+			memcpy(mpq_pkzip->out_buf, &mpq_pkzip->out_buf[0x1000], mpq_pkzip->out_pos - 0x1000);
+			mpq_pkzip->out_pos -= 0x1000;
+		}
+	}
+
+	/* copy the rest. */
+	copy_bytes = mpq_pkzip->out_pos - 0x1000;
+	mpq_pkzip->write_buf((char *)&mpq_pkzip->out_buf[0x1000], ©_bytes, mpq_pkzip->param);
+
+	/* return copied bytes. */
+	return result;
+}
+
+/* this function explode the data stream. */
+uint32_t libmpq__do_decompress_pkzip(uint8_t *work_buf, void *param) {
+
+	/* some common variables. */
+	pkzip_cmp_s *mpq_pkzip = (pkzip_cmp_s *)work_buf;
+
+	/* set the whole work buffer to zeros. */
+	memset(mpq_pkzip, 0, sizeof(pkzip_cmp_s));
+
+	/* initialize work struct and load compressed data. */
+	mpq_pkzip->read_buf   = data_read_input;
+	mpq_pkzip->write_buf  = data_write_output;
+	mpq_pkzip->param      = param;
+	mpq_pkzip->in_pos     = sizeof(mpq_pkzip->in_buf);
+	mpq_pkzip->in_bytes   = mpq_pkzip->read_buf((char *)mpq_pkzip->in_buf, &mpq_pkzip->in_pos, mpq_pkzip->param);
+
+	/* check if we have pkzip data. */
+	if (mpq_pkzip->in_bytes <= 4) {
+		return LIBMPQ_PKZIP_CMP_BAD_DATA;
+	}
+
+	/* get the compression type. */
+	mpq_pkzip->cmp_type   = mpq_pkzip->in_buf[0];
+
+	/* get the dictionary size. */
+	mpq_pkzip->dsize_bits = mpq_pkzip->in_buf[1];
+
+	/* initialize 16-bit bit buffer. */
+	mpq_pkzip->bit_buf    = mpq_pkzip->in_buf[2];
+
+	/* extra (over 8) bits. */
+	mpq_pkzip->extra_bits = 0;
+
+	/* position in input buffer. */
+	mpq_pkzip->in_pos     = 3;
+
+	/* check if valid dictionary size. */
+	if (4 > mpq_pkzip->dsize_bits || mpq_pkzip->dsize_bits > 6) {
+		return LIBMPQ_PKZIP_CMP_INV_DICTSIZE;
+	}
+
+	/* shifted by 'sar' instruction. */
+	mpq_pkzip->dsize_mask = 0xFFFF >> (0x10 - mpq_pkzip->dsize_bits);
+
+	/* check if we are using binary compression. */
+	if (mpq_pkzip->cmp_type != LIBMPQ_PKZIP_CMP_BINARY) {
+
+		/* check if we are using ascii compression. */
+		if (mpq_pkzip->cmp_type != LIBMPQ_PKZIP_CMP_ASCII) {
+			return LIBMPQ_PKZIP_CMP_INV_MODE;
+		}
+
+		/* create ascii buffer. */
+		memcpy(mpq_pkzip->bits_asc, pkzip_bits_asc, sizeof(mpq_pkzip->bits_asc));
+		generate_tables_ascii(mpq_pkzip);
+	}
+
+	/* create the tables for decode. */
+	memcpy(mpq_pkzip->slen_bits, pkzip_slen_bits, sizeof(mpq_pkzip->slen_bits));
+	generate_tables_decode(0x10, mpq_pkzip->slen_bits, pkzip_len_code, mpq_pkzip->pos2);
+
+	/* create the tables for decode. */
+	memcpy(mpq_pkzip->clen_bits, pkzip_clen_bits, sizeof(mpq_pkzip->clen_bits));
+	memcpy(mpq_pkzip->len_base, pkzip_len_base, sizeof(mpq_pkzip->len_base));
+	memcpy(mpq_pkzip->dist_bits, pkzip_dist_bits, sizeof(mpq_pkzip->dist_bits));
+	generate_tables_decode(0x40, mpq_pkzip->dist_bits, pkzip_dist_code, mpq_pkzip->pos1);
+
+	/* check if data extraction works. */
+	if (expand(mpq_pkzip) != 0x306) {
+		return LIBMPQ_PKZIP_CMP_NO_ERROR;
+	}
+
+	/* something failed, so return error. */
+	return LIBMPQ_PKZIP_CMP_ABORT;
+}
diff --git a/externals/libmpq/explode.h b/externals/libmpq/explode.h
new file mode 100644
index 00000000000..a2c65b166cc
--- /dev/null
+++ b/externals/libmpq/explode.h
@@ -0,0 +1,85 @@
+/*
+ *  explode.h -- header file for pkware data decompression library
+ *               used by mpq-tools.
+ *
+ *  Copyright (c) 2003-2008 Maik Broemme 
+ *
+ *  This source was adepted from the C++ version of pklib.h included
+ *  in stormlib. The C++ version belongs to the following authors:
+ *
+ *  Ladislav Zezula 
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef _EXPLODE_H
+#define _EXPLODE_H
+
+/* define compression constants and return values. */
+#define LIBMPQ_PKZIP_CMP_BINARY			0		/* binary compression. */
+#define LIBMPQ_PKZIP_CMP_ASCII			1		/* ascii compression. */
+#define LIBMPQ_PKZIP_CMP_NO_ERROR		0
+#define LIBMPQ_PKZIP_CMP_INV_DICTSIZE		1
+#define LIBMPQ_PKZIP_CMP_INV_MODE		2
+#define LIBMPQ_PKZIP_CMP_BAD_DATA		3
+#define LIBMPQ_PKZIP_CMP_ABORT			4
+
+/* compression structure. */
+typedef struct {
+	uint32_t	offs0000;		/* 0000 - start. */
+	uint32_t	cmp_type;		/* 0004 - compression type (binary or ascii). */
+	uint32_t	out_pos;		/* 0008 - position in output buffer. */
+	uint32_t	dsize_bits;		/* 000C - dict size (4, 5, 6 for 0x400, 0x800, 0x1000). */
+	uint32_t	dsize_mask;		/* 0010 - dict size bitmask (0x0F, 0x1F, 0x3F for 0x400, 0x800, 0x1000). */
+	uint32_t	bit_buf;		/* 0014 - 16-bit buffer for processing input data. */
+	uint32_t	extra_bits;		/* 0018 - number of extra (above 8) bits in bit buffer. */
+	uint32_t	in_pos;			/* 001C - position in in_buf. */
+	uint32_t	in_bytes;		/* 0020 - number of bytes in input buffer. */
+	void		*param;			/* 0024 - custom parameter. */
+	uint32_t	(*read_buf)(char *buf, uint32_t *size, void *param);	/* 0028 offset.*/
+	void		(*write_buf)(char *buf, uint32_t *size, void *param);	/* 002C offset. */
+	uint8_t		out_buf[0x2000];	/* 0030 - output circle buffer, starting position is 0x1000. */
+	uint8_t		offs_2030[0x204];	/* 2030 - whats that? */
+	uint8_t		in_buf[0x800];		/* 2234 - buffer for data to be decompressed. */
+	uint8_t		pos1[0x100];		/* 2A34 - positions in buffers. */
+	uint8_t		pos2[0x100];		/* 2B34 - positions in buffers. */
+	uint8_t		offs_2c34[0x100];	/* 2C34 - buffer. */
+	uint8_t		offs_2d34[0x100];	/* 2D34 - buffer. */
+	uint8_t		offs_2e34[0x80];	/* 2EB4 - buffer. */
+	uint8_t		offs_2eb4[0x100];	/* 2EB4 - buffer. */
+	uint8_t		bits_asc[0x100];	/* 2FB4 - buffer. */
+	uint8_t		dist_bits[0x40];	/* 30B4 - numbers of bytes to skip copied block length. */
+	uint8_t		slen_bits[0x10];	/* 30F4 - numbers of bits for skip copied block length. */
+	uint8_t		clen_bits[0x10];	/* 3104 - number of valid bits for copied block. */
+	uint16_t	len_base[0x10];		/* 3114 - buffer. */
+} __attribute__ ((packed)) pkzip_cmp_s;
+
+/* data structure. */
+typedef struct {
+	uint8_t		*in_buf;		/* pointer to input data buffer. */
+	uint32_t	in_pos;			/* current offset in input data buffer. */
+	int32_t		in_bytes;		/* number of bytes in the input buffer. */
+	uint8_t		*out_buf;		/* pointer to output data buffer. */
+	uint32_t	out_pos;		/* position in the output buffer. */
+	int32_t		max_out;		/* maximum number of bytes in the output buffer. */
+} pkzip_data_s;
+
+/* decompress the stream using pkzip compression. */
+uint32_t libmpq__do_decompress_pkzip(
+	uint8_t		*work_buf,
+	void		*param
+);
+
+#endif						/* _EXPLODE_H */
diff --git a/externals/libmpq/extract.c b/externals/libmpq/extract.c
new file mode 100644
index 00000000000..11de1071683
--- /dev/null
+++ b/externals/libmpq/extract.c
@@ -0,0 +1,361 @@
+/*
+ *  extract.c -- global extracting function for all known file compressions
+ *               in a mpq archive.
+ *
+ *  Copyright (c) 2003-2008 Maik Broemme 
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+/* generic includes. */
+#include 
+#include 
+
+/* zlib includes. */
+#include 
+#include 
+
+/* libmpq main includes. */
+#include "mpq.h"
+
+/* libmpq generic includes. */
+#include "explode.h"
+#include "extract.h"
+#include "huffman.h"
+#include "wave.h"
+
+/* table with decompression bits and functions. */
+static decompress_table_s dcmp_table[] = {
+	{LIBMPQ_COMPRESSION_HUFFMAN, libmpq__decompress_huffman},	/* decompression using huffman trees. */
+	{LIBMPQ_COMPRESSION_ZLIB, libmpq__decompress_zlib},	/* decompression with the zlib library. */
+	{LIBMPQ_COMPRESSION_PKZIP, libmpq__decompress_pkzip},	/* decompression with pkware data compression library. */
+	{LIBMPQ_COMPRESSION_BZIP2, libmpq__decompress_bzip2},	/* decompression with bzip2 library. */
+	{LIBMPQ_COMPRESSION_WAVE_MONO, libmpq__decompress_wave_mono},	/* decompression for mono waves. */
+	{LIBMPQ_COMPRESSION_WAVE_STEREO, libmpq__decompress_wave_stereo}	/* decompression for stereo waves. */
+};
+
+/* this function decompress a stream using huffman algorithm. */
+int32_t libmpq__decompress_huffman(uint8_t *in_buf, uint32_t in_size, uint8_t *out_buf, uint32_t out_size) {
+
+	/* TODO: make typdefs of this structs? */
+	/* some common variables. */
+	int32_t tb     = 0;
+	struct huffman_tree_s *ht;
+	struct huffman_input_stream_s *is;
+
+	/* allocate memory for the huffman tree. */
+	if ((ht = malloc(sizeof(struct huffman_tree_s))) == NULL ||
+	    (is = malloc(sizeof(struct huffman_input_stream_s))) == NULL) {
+
+		/* memory allocation problem. */
+		return LIBMPQ_ERROR_MALLOC;
+	}
+
+	/* cleanup structures. */
+	memset(ht, 0, sizeof(struct huffman_tree_s));
+	memset(is, 0, sizeof(struct huffman_input_stream_s));
+
+	/* initialize input stream. */
+	is->bit_buf  = *(uint32_t *)in_buf;
+	in_buf      += sizeof(int32_t);
+	is->in_buf   = (uint8_t *)in_buf;
+	is->bits     = 32;
+
+// TODO: add all the mallocs to init function and add function libmpq__huffman_tree_free() */
+//	if ((result = libmpq__huffman_tree_init(ht, LIBMPQ_HUFF_DECOMPRESS)) < 0) {
+//
+//		/* something on zlib initialization failed. */
+//		return LIBMPQ_ERROR_UNPACK;
+//	}
+
+	/* initialize the huffman tree for decompression. */
+	libmpq__huffman_tree_init(ht, LIBMPQ_HUFF_DECOMPRESS);
+
+	/* save the number of copied bytes. */
+	tb = libmpq__do_decompress_huffman(ht, is, out_buf, out_size);
+
+	/* free structures. */
+	free(is);
+	free(ht);
+
+	/* return transferred bytes. */
+	return tb;
+}
+
+/* this function decompress a stream using zlib algorithm. */
+int32_t libmpq__decompress_zlib(uint8_t *in_buf, uint32_t in_size, uint8_t *out_buf, uint32_t out_size) {
+
+	/* some common variables. */
+	int32_t result = 0;
+	int32_t tb     = 0;
+	z_stream z;
+
+	/* fill the stream structure for zlib. */
+	z.next_in   = (Bytef *)in_buf;
+	z.avail_in  = (uInt)in_size;
+	z.total_in  = in_size;
+	z.next_out  = (Bytef *)out_buf;
+	z.avail_out = (uInt)out_size;
+	z.total_out = 0;
+	z.zalloc    = NULL;
+	z.zfree     = NULL;
+
+	/* initialize the decompression structure, storm.dll uses zlib version 1.1.3. */
+	if ((result = inflateInit(&z)) != Z_OK) {
+
+		/* something on zlib initialization failed. */
+		return result;
+	}
+
+	/* call zlib to decompress the data. */
+	if ((result = inflate(&z, Z_FINISH)) != Z_STREAM_END) {
+
+		/* something on zlib decompression failed. */
+		return result;
+	}
+
+	/* save transferred bytes. */
+	tb = z.total_out;
+
+	/* cleanup zlib. */
+	if ((result = inflateEnd(&z)) != Z_OK) {
+
+		/* something on zlib finalization failed. */
+		return result;
+	}
+
+	/* return transferred bytes. */
+	return tb;
+}
+
+/* this function decompress a stream using pkzip algorithm. */
+int32_t libmpq__decompress_pkzip(uint8_t *in_buf, uint32_t in_size, uint8_t *out_buf, uint32_t out_size) {
+
+	/* some common variables. */
+	int32_t tb = 0;
+	uint8_t *work_buf;
+	pkzip_data_s info;
+
+	/* allocate memory for pkzip data structure. */
+	if ((work_buf = malloc(sizeof(pkzip_cmp_s))) == NULL) {
+
+		/* memory allocation problem. */
+		return LIBMPQ_ERROR_MALLOC;
+	}
+
+	/* cleanup. */
+	memset(work_buf, 0, sizeof(pkzip_cmp_s));
+
+	/* fill data information structure. */
+	info.in_buf   = in_buf;
+	info.in_pos   = 0;
+	info.in_bytes = in_size;
+	info.out_buf  = out_buf;
+	info.out_pos  = 0;
+	info.max_out  = out_size;
+
+	/* do the decompression. */
+	if ((tb = libmpq__do_decompress_pkzip(work_buf, &info)) < 0) {
+
+		/* free working buffer. */
+		free(work_buf);
+
+		/* something failed on pkzip decompression. */
+		return tb;
+	}
+
+	/* save transferred bytes. */
+	tb = info.out_pos;
+
+	/* free working buffer. */
+	free(work_buf);
+
+	/* return transferred bytes. */
+	return tb;
+}
+
+/* this function decompress a stream using bzip2 library. */
+int32_t libmpq__decompress_bzip2(uint8_t *in_buf, uint32_t in_size, uint8_t *out_buf, uint32_t out_size) {
+
+	/* some common variables. */
+	int32_t result = 0;
+	int32_t tb     = 0;
+	bz_stream strm;
+
+	/* initialize the bzlib decompression. */
+	strm.bzalloc = NULL;
+	strm.bzfree  = NULL;
+
+	/* initialize the structure. */
+	if ((result = BZ2_bzDecompressInit(&strm, 0, 0)) != BZ_OK) {
+
+		/* something on bzlib initialization failed. */
+		return result;
+	}
+
+	/* fill the stream structure for bzlib. */
+	strm.next_in   = (char *)in_buf;
+	strm.avail_in  = in_size;
+	strm.next_out  = (char *)out_buf;
+	strm.avail_out = out_size;
+
+	/* do the decompression. */
+	while (BZ2_bzDecompress(&strm) != BZ_STREAM_END);
+
+	/* save transferred bytes. */
+	tb = strm.total_out_lo32;
+
+	/* cleanup of bzip stream. */
+	BZ2_bzDecompressEnd(&strm);
+
+	/* return transferred bytes. */
+	return tb;
+}
+
+/* this function decompress a stream using wave algorithm. (1 channel) */
+int32_t libmpq__decompress_wave_mono(uint8_t *in_buf, uint32_t in_size, uint8_t *out_buf, uint32_t out_size) {
+
+	/* some common variables. */
+	int32_t tb = 0;
+
+	/* save the number of copied bytes. */
+	if ((tb = libmpq__do_decompress_wave(out_buf, out_size, in_buf, in_size, 1)) < 0) {
+
+		/* something on wave decompression failed. */
+		return tb;
+	}
+
+	/* return transferred bytes. */
+	return tb;
+}
+
+/* this function decompress a stream using wave algorithm. (2 channels) */
+int32_t libmpq__decompress_wave_stereo(uint8_t *in_buf, uint32_t in_size, uint8_t *out_buf, uint32_t out_size) {
+
+	/* some common variables. */
+	int32_t tb = 0;
+
+	/* save the number of copied bytes. */
+	if ((tb = libmpq__do_decompress_wave(out_buf, out_size, in_buf, in_size, 2)) < 0) {
+
+		/* something on wave decompression failed. */
+		return tb;
+	}
+
+	/* return transferred bytes. */
+	return tb;
+}
+
+/* this function decompress a stream using a combination of the other compression algorithm. */
+int32_t libmpq__decompress_multi(uint8_t *in_buf, uint32_t in_size, uint8_t *out_buf, uint32_t out_size) {
+
+	/* some common variables. */
+	int32_t tb        = 0;
+	uint32_t count    = 0;
+	uint32_t entries  = (sizeof(dcmp_table) / sizeof(decompress_table_s));
+	uint8_t *temp_buf = NULL;
+	uint8_t *work_buf = 0;
+	uint8_t decompress_flag, decompress_unsupp;
+	uint32_t i;
+
+	/* get applied compression types. */
+	decompress_flag = decompress_unsupp = *in_buf++;
+
+	/* decrement data size. */
+	in_size--;
+
+	/* search decompression table type and get all types of compression. */
+	for (i = 0; i < entries; i++) {
+
+		/* check if have to apply this decompression. */
+		if (decompress_flag & dcmp_table[i].mask) {
+
+			/* increase counter for used compression algorithms. */
+			count++;
+			/* this algorithm is supported, remove from unsupp mask */
+			decompress_unsupp &= ~dcmp_table[i].mask;
+		}
+	}
+
+	/* check if there is some method unhandled. (e.g. compressed by future versions) */
+	if (decompress_unsupp) {
+
+		/* compression type is unknown and we need to implement it. :) */
+		return LIBMPQ_ERROR_UNPACK;
+	}
+
+	/* if multiple decompressions should be made, we need temporary buffer for the data. */
+	if (count > 1) {
+
+		/* allocate memory for temporary buffer. */
+		if ((temp_buf = malloc(out_size)) == NULL) {
+
+			/* memory allocation problem. */
+			return LIBMPQ_ERROR_MALLOC;
+		}
+
+		/* cleanup. */
+		memset(temp_buf, 0, out_size);
+	}
+
+	/* apply all decompressions. */
+	for (i = 0, count = 0; i < entries; i++) {
+
+		/* check if not used this kind of compression. */
+		if (decompress_flag & dcmp_table[i].mask) {
+
+			/* if multiple decompressions should be made, we need temporary buffer for the data. */
+			if (count == 0) {
+
+				/* use output buffer as working buffer. */
+				work_buf = out_buf;
+			} else {
+
+				/* use temporary buffer as working buffer. */
+				work_buf = temp_buf;
+			}
+
+			/* decompress buffer using corresponding function. */
+			if ((tb = dcmp_table[i].decompress(in_buf, in_size, work_buf, out_size)) < 0) {
+
+				/* free temporary buffer. */
+				free(temp_buf);
+
+				/* something on decompression failed. */
+				return tb;
+			}
+
+			/* move output size to source size for next compression. */
+			in_size = out_size;
+			in_buf  = work_buf;
+
+			/* increase counter. */
+			count++;
+		}
+	}
+
+	/* if output buffer is not the same like target buffer, we have to copy data (this will happen on multiple decompressions). */
+	if (work_buf != out_buf) {
+
+		/* copy buffer. */
+		memcpy(out_buf, in_buf, out_size);
+	}
+
+	/* free temporary buffer. */
+	free(temp_buf);
+
+	/* return transferred bytes. */
+	return tb;
+}
diff --git a/externals/libmpq/extract.h b/externals/libmpq/extract.h
new file mode 100644
index 00000000000..d6ea794f162
--- /dev/null
+++ b/externals/libmpq/extract.h
@@ -0,0 +1,106 @@
+/*
+ *  extract.h -- header for the extraction functions used by mpq-tools.
+ *
+ *  Copyright (c) 2003-2008 Maik Broemme 
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */       
+
+#ifndef _EXTRACT_H
+#define _EXTRACT_H
+
+/* define compression types for multilpe compressions. */
+#define LIBMPQ_COMPRESSION_HUFFMAN		0x01		/* huffman compression. (used on wave files only and introduced in starcraft) */
+#define LIBMPQ_COMPRESSION_ZLIB			0x02		/* zlib compression. (introduced in warcraft 3) */
+#define LIBMPQ_COMPRESSION_PKZIP		0x08		/* pkware dcl compression. (first used compression algorithm) */
+#define LIBMPQ_COMPRESSION_BZIP2		0x10		/* bzip compression. (introduced in warcraft 3 - the frozen throne) */
+#define LIBMPQ_COMPRESSION_WAVE_MONO		0x40		/* adpcm 4:1 compression. (introduced in starcraft) */
+#define LIBMPQ_COMPRESSION_WAVE_STEREO		0x80		/* adpcm 4:1 compression. (introduced in starcraft) */
+
+/*
+ *  table for decompression functions, return value for all functions
+ *  is the transferred data size or one of the following error constants:
+ *
+ *  LIBMPQ_ERROR_MALLOC
+ *  LIBMPQ_ERROR_DECOMPRESS
+ */
+typedef int32_t		(*DECOMPRESS)(uint8_t *, uint32_t, uint8_t *, uint32_t);
+typedef struct {
+	uint32_t	mask;			/* decompression bit. */
+	DECOMPRESS	decompress;		/* decompression function. */
+} decompress_table_s;
+
+/*
+ *  huffman decompression routine, the in_size parameter is not used,
+ *  but needs to be specified due to compatibility reasons.
+ *
+ *  1500F5F0
+ */
+extern int32_t libmpq__decompress_huffman(
+	uint8_t		*in_buf,
+	uint32_t	in_size,
+	uint8_t		*out_buf,
+	uint32_t	out_size
+);
+
+/* decompression using zlib. */
+extern int32_t libmpq__decompress_zlib(
+	uint8_t		*in_buf,
+	uint32_t	in_size,
+	uint8_t		*out_buf,
+	uint32_t	out_size
+);
+
+/* decompression using pkzip. */
+extern int32_t libmpq__decompress_pkzip(
+	uint8_t		*in_buf,
+	uint32_t	in_size,
+	uint8_t		*out_buf,
+	uint32_t	out_size
+);
+
+/* decompression using bzip2. */
+extern int32_t libmpq__decompress_bzip2(
+	uint8_t		*in_buf,
+	uint32_t	in_size,
+	uint8_t		*out_buf,
+	uint32_t	out_size
+);
+
+/* decompression using wave. (1 channel) */
+extern int32_t libmpq__decompress_wave_mono(
+	uint8_t		*in_buf,
+	uint32_t	in_size,
+	uint8_t		*out_buf,
+	uint32_t	out_size
+);
+
+/* decompression using wave. (2 channels) */
+extern int32_t libmpq__decompress_wave_stereo(
+	uint8_t		*in_buf,
+	uint32_t	in_size,
+	uint8_t		*out_buf,
+	uint32_t	out_size
+);
+
+/* decompression using multiple of the above algorithm. */
+extern int32_t libmpq__decompress_multi(
+	uint8_t		*in_buf,
+	uint32_t	in_size,
+	uint8_t		*out_buf,
+	uint32_t	out_size
+);
+
+#endif						/* _EXTRACT_H */
diff --git a/externals/libmpq/huffman.c b/externals/libmpq/huffman.c
new file mode 100644
index 00000000000..8fc87be2f60
--- /dev/null
+++ b/externals/libmpq/huffman.c
@@ -0,0 +1,1101 @@
+/*
+ *  huffman.c -- functions do decompress files in mpq files which
+ *               uses a modified huffman version.
+ *
+ *  Copyright (c) 2003-2008 Maik Broemme 
+ *
+ *  Differences between C++ and C version:
+ *
+ *    - Removed the object oriented stuff.
+ *    - Replaced the goto things with some better C code.
+ *
+ *  This source was adepted from the C++ version of huffman.cpp included
+ *  in stormlib. The C++ version belongs to the following authors:
+ *
+ *  Ladislav Zezula 
+ *  ShadowFlare 
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+/* generic includes. */
+#include 
+#include 
+
+/* libmpq main includes. */
+#include "mpq.h"
+#include "mpq-internal.h"
+
+/* libmpq generic includes. */
+#include "huffman.h"
+
+/* tables for huffman tree. */
+static const uint8_t table_1502A630[] = {
+
+	/* data for compression type 0x00. */
+	0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,
+	0x00, 0x00,
+
+	/* data for compression type 0x01. */
+	0x54, 0x16, 0x16, 0x0D, 0x0C, 0x08, 0x06, 0x05, 0x06, 0x05, 0x06, 0x03, 0x04, 0x04, 0x03, 0x05,
+	0x0E, 0x0B, 0x14, 0x13, 0x13, 0x09, 0x0B, 0x06, 0x05, 0x04, 0x03, 0x02, 0x03, 0x02, 0x02, 0x02,
+	0x0D, 0x07, 0x09, 0x06, 0x06, 0x04, 0x03, 0x02, 0x04, 0x03, 0x03, 0x03, 0x03, 0x03, 0x02, 0x02,
+	0x09, 0x06, 0x04, 0x04, 0x04, 0x04, 0x03, 0x02, 0x03, 0x02, 0x02, 0x02, 0x02, 0x03, 0x02, 0x04,
+	0x08, 0x03, 0x04, 0x07, 0x09, 0x05, 0x03, 0x03, 0x03, 0x03, 0x02, 0x02, 0x02, 0x03, 0x02, 0x02,
+	0x03, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, 0x01, 0x02, 0x02,
+	0x06, 0x0A, 0x08, 0x08, 0x06, 0x07, 0x04, 0x03, 0x04, 0x04, 0x02, 0x02, 0x04, 0x02, 0x03, 0x03,
+	0x04, 0x03, 0x07, 0x07, 0x09, 0x06, 0x04, 0x03, 0x03, 0x02, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02,
+	0x0A, 0x02, 0x02, 0x03, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x02, 0x06, 0x03, 0x05, 0x02, 0x03,
+	0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x03, 0x01, 0x01, 0x01,
+	0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x04, 0x04, 0x04, 0x07, 0x09, 0x08, 0x0C, 0x02,
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x03,
+	0x04, 0x01, 0x02, 0x04, 0x05, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01,
+	0x04, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+	0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+	0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x02, 0x06, 0x4B,
+	0x00, 0x00,
+
+	/* data for compression type 0x02. */
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x27, 0x00, 0x00, 0x23, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x06, 0x0E, 0x10, 0x04,
+	0x06, 0x08, 0x05, 0x04, 0x04, 0x03, 0x03, 0x02, 0x02, 0x03, 0x03, 0x01, 0x01, 0x02, 0x01, 0x01,
+	0x01, 0x04, 0x02, 0x04, 0x02, 0x02, 0x02, 0x01, 0x01, 0x04, 0x01, 0x01, 0x02, 0x03, 0x03, 0x02,
+	0x03, 0x01, 0x03, 0x06, 0x04, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x02, 0x01, 0x01,
+	0x01, 0x29, 0x07, 0x16, 0x12, 0x40, 0x0A, 0x0A, 0x11, 0x25, 0x01, 0x03, 0x17, 0x10, 0x26, 0x2A,
+	0x10, 0x01, 0x23, 0x23, 0x2F, 0x10, 0x06, 0x07, 0x02, 0x09, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00,
+
+	/* data for compression type 0x03. */
+	0xFF, 0x0B, 0x07, 0x05, 0x0B, 0x02, 0x02, 0x02, 0x06, 0x02, 0x02, 0x01, 0x04, 0x02, 0x01, 0x03,
+	0x09, 0x01, 0x01, 0x01, 0x03, 0x04, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01,
+	0x05, 0x01, 0x01, 0x01, 0x0D, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+	0x02, 0x01, 0x01, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01,
+	0x0A, 0x04, 0x02, 0x01, 0x06, 0x03, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x03, 0x01, 0x01, 0x01,
+	0x05, 0x02, 0x03, 0x04, 0x03, 0x03, 0x03, 0x02, 0x01, 0x01, 0x01, 0x02, 0x01, 0x02, 0x03, 0x03,
+	0x01, 0x03, 0x01, 0x01, 0x02, 0x05, 0x01, 0x01, 0x04, 0x03, 0x05, 0x01, 0x03, 0x01, 0x03, 0x03,
+	0x02, 0x01, 0x04, 0x03, 0x0A, 0x06, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+	0x02, 0x02, 0x01, 0x0A, 0x02, 0x05, 0x01, 0x01, 0x02, 0x07, 0x02, 0x17, 0x01, 0x05, 0x01, 0x01,
+	0x0E, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+	0x06, 0x02, 0x01, 0x04, 0x05, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01,
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x07, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01,
+	0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x11,
+	0x00, 0x00,
+
+	/* data for compression type 0x04. */
+	0xFF, 0xFB, 0x98, 0x9A, 0x84, 0x85, 0x63, 0x64, 0x3E, 0x3E, 0x22, 0x22, 0x13, 0x13, 0x18, 0x17,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00,
+
+	/* data for compression type 0x05. */
+	0xFF, 0xF1, 0x9D, 0x9E, 0x9A, 0x9B, 0x9A, 0x97, 0x93, 0x93, 0x8C, 0x8E, 0x86, 0x88, 0x80, 0x82,
+	0x7C, 0x7C, 0x72, 0x73, 0x69, 0x6B, 0x5F, 0x60, 0x55, 0x56, 0x4A, 0x4B, 0x40, 0x41, 0x37, 0x37,
+	0x2F, 0x2F, 0x27, 0x27, 0x21, 0x21, 0x1B, 0x1C, 0x17, 0x17, 0x13, 0x13, 0x10, 0x10, 0x0D, 0x0D,
+	0x0B, 0x0B, 0x09, 0x09, 0x08, 0x08, 0x07, 0x07, 0x06, 0x05, 0x05, 0x04, 0x04, 0x04, 0x19, 0x18,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00,
+
+	/* data for compression type 0x06. */
+	0xC3, 0xCB, 0xF5, 0x41, 0xFF, 0x7B, 0xF7, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0xBF, 0xCC, 0xF2, 0x40, 0xFD, 0x7C, 0xF7, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x7A, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00,
+
+	/* data for compression type 0x07. */
+	0xC3, 0xD9, 0xEF, 0x3D, 0xF9, 0x7C, 0xE9, 0x1E, 0xFD, 0xAB, 0xF1, 0x2C, 0xFC, 0x5B, 0xFE, 0x17,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0xBD, 0xD9, 0xEC, 0x3D, 0xF5, 0x7D, 0xE8, 0x1D, 0xFB, 0xAE, 0xF0, 0x2C, 0xFB, 0x5C, 0xFF, 0x18,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x70, 0x6C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00,
+
+	/* data for compression type 0x08. */
+	0xBA, 0xC5, 0xDA, 0x33, 0xE3, 0x6D, 0xD8, 0x18, 0xE5, 0x94, 0xDA, 0x23, 0xDF, 0x4A, 0xD1, 0x10,
+	0xEE, 0xAF, 0xE4, 0x2C, 0xEA, 0x5A, 0xDE, 0x15, 0xF4, 0x87, 0xE9, 0x21, 0xF6, 0x43, 0xFC, 0x12,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0xB0, 0xC7, 0xD8, 0x33, 0xE3, 0x6B, 0xD6, 0x18, 0xE7, 0x95, 0xD8, 0x23, 0xDB, 0x49, 0xD0, 0x11,
+	0xE9, 0xB2, 0xE2, 0x2B, 0xE8, 0x5C, 0xDD, 0x15, 0xF1, 0x87, 0xE7, 0x20, 0xF7, 0x44, 0xFF, 0x13,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x5F, 0x9E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00
+};
+
+/* this function insert an item to a huffman tree. */
+void libmpq__huffman_insert_item(struct huffman_tree_item_s **p_item, struct huffman_tree_item_s *item, uint32_t where, struct huffman_tree_item_s *item2) {
+
+	/* EDI - next to the first item. */
+	struct huffman_tree_item_s *next = item->next;
+
+	/* ESI - prev to the first item. */
+	struct huffman_tree_item_s *prev = item->prev;
+
+	/* pointer to previous item. */
+	struct huffman_tree_item_s *prev2;
+
+	/* pointer to next item. */
+	long next2;
+
+	/* check the first item already has next one. */
+	if (next != 0) {
+
+		/* check if previous item exist. */
+		if (PTR_INT(prev) < 0) {
+
+			/* return previous item. */
+			prev = PTR_NOT(prev);
+		} else {
+
+			/* add item. */
+			prev += (item - next->prev);
+		}
+
+		/* 150083C1 - remove the item from the tree. */
+		prev->next = next;
+		next->prev = prev;
+
+		/* invalidate prev and next pointer. */
+		item->next = 0;
+		item->prev = 0;
+	}
+
+	/* EDX - check if the second item is not entered. */
+	if (item2 == NULL) {
+
+		/* take the first tree item. */
+		item2 = PTR_PTR(&p_item[1]);
+	}
+
+	/* check if items should be switched or new one inserted. */
+	switch (where) {
+		case SWITCH_ITEMS:
+
+			/* item2->next (pointer to pointer to first). */
+			item->next        = item2->next;
+			item->prev        = item2->next->prev;
+			item2->next->prev = item;
+
+			/* set the first item. */
+			item2->next       = item;
+
+			/* return from function. */
+			return;
+		case INSERT_ITEM:
+
+			/* set next item (or pointer to pointer to first item) - insert as last item. */
+			item->next = item2;
+
+			/* set previous item (or last item in the tree). */
+			item->prev = item2->prev;
+
+			/* usually NULL. */
+			next2      = PTR_INT(p_item[0]);
+
+			/* previous item to the second (or last tree item). */
+			prev2      = item2->prev;
+
+			/* check if previous item is a valid pointer. */
+			if (PTR_INT(prev2) < 0) {
+
+				/* set values. */
+				prev2       = PTR_NOT(prev);
+				prev2->next = item;
+
+				/* next after last item. */
+				item2->prev = item;
+
+				/* return from function. */
+				return;
+			}
+
+			/* check if next item is empty. */
+			if (next2 < 0) {
+
+				/* set next item. */
+				next2 = item2 - item2->next->prev;
+			}
+
+			/* add next item to previous one. */
+			prev2       += next2;
+			prev2->next  = item;
+
+			/* set the next and last item. */
+			item2->prev  = item;
+
+			/* return from function. */
+			return;
+		default:
+
+			/* nothing to do, so return from function. */
+			return;
+	}
+}
+
+/* 1500BC90 - remove item from huffman tree.*/
+void libmpq__huffman_remove_item(struct huffman_tree_item_s *hi) {
+
+	/* EDX - some common variables. */
+	struct huffman_tree_item_s *temp;
+
+	/* check if next item is not empty. */
+	if (hi->next != NULL) {
+
+		/* fetch previous item. */
+		temp = hi->prev;
+
+		/* check if previous item is a pointer. */
+		if (PTR_INT(temp) <= 0) {
+			temp = PTR_NOT(temp);
+		} else {
+			temp += (hi - hi->next->prev);
+		}
+
+		/* reorganize tree. */
+		temp->next     = hi->next;
+		hi->next->prev = hi->prev;
+		hi->next       = hi->prev = NULL;
+	}
+}
+
+/* get previous huffman tree item. */
+struct huffman_tree_item_s *libmpq__huffman_previous_item(struct huffman_tree_item_s *hi, long value) {
+
+	/* check if previous item exist. */
+	if (PTR_INT(hi->prev) < 0) {
+
+		/* return previous item. */
+		return PTR_NOT(hi->prev);
+	}
+
+	/* check if something else should returned. */
+	if (value < 0) {
+
+		/* fetch previous item of next item. */
+		value = hi - hi->next->prev;
+	}
+
+	/* return previous item with value. */
+	return hi->prev + value;
+}
+
+/* get one bit from input stream. */
+uint32_t libmpq__huffman_get_1bit(struct huffman_input_stream_s *is) {
+
+	/* some common variables. */
+	uint32_t bit = (is->bit_buf & 1);
+
+	/* shift bit right by one. */
+	is->bit_buf >>= 1;
+
+	/* check if we should extract bits. */
+	if (--is->bits == 0) {
+		is->bit_buf  = *(uint32_t *)is->in_buf;
+		is->in_buf  += sizeof(int32_t);
+		is->bits     = 32;
+	}
+
+	/* return the bit. */
+	return bit;
+}
+
+/* get 7 bits from the input stream. */
+uint32_t libmpq__huffman_get_7bit(struct huffman_input_stream_s *is) {
+
+	/* check if we should extract bits. */
+	if (is->bits <= 7) {
+		is->bit_buf |= *(uint16_t *)is->in_buf << is->bits;
+		is->in_buf  += sizeof(int16_t);
+		is->bits    += 16;
+	}
+
+	/* get 7 bits from input stream. */
+	return (is->bit_buf & 0x7F);
+}
+
+/* get the whole byte from the input stream. */
+uint32_t libmpq__huffman_get_8bit(struct huffman_input_stream_s *is) {
+
+	/* some common variables. */
+	uint32_t one_byte;
+
+	/* check if we should extract bits. */
+	if (is->bits <= 8) {
+		is->bit_buf |= *(uint16_t *)is->in_buf << is->bits;
+		is->in_buf  += sizeof(int16_t);
+		is->bits    += 16;
+	}
+
+	/* fill values. */
+	one_byte      = (is->bit_buf & 0xFF);
+	is->bit_buf >>= 8;
+	is->bits     -= 8;
+
+	/* return the 8 bits. */
+	return one_byte;
+}
+
+/* return struct for 1500E740. */
+struct huffman_tree_item_s *libmpq__huffman_call_1500E740(struct huffman_tree_s *ht) {
+
+	/* EDX */
+	struct huffman_tree_item_s *p_item1 = ht->item3058;
+
+	/* EAX */
+	struct huffman_tree_item_s *p_item2;
+
+	/* some common variables. */
+	struct huffman_tree_item_s *p_next;
+	struct huffman_tree_item_s *p_prev;
+	struct huffman_tree_item_s **pp_item;
+
+	/* check if item is empty. */
+	if (PTR_INT(p_item1) <= 0 || (p_item2 = p_item1) == NULL) {
+
+		/* check if item is not empty. */
+		if ((p_item2 = &ht->items0008[ht->items++]) != NULL) {
+			p_item1 = p_item2;
+		} else {
+			p_item1 = ht->first;
+		}
+	} else {
+		p_item1 = p_item2;
+	}
+
+	/* set next item. */
+	p_next = p_item1->next;
+
+	/* check if next item is not empty. */
+	if (p_next != NULL) {
+
+		/* set previous item. */
+		p_prev = p_item1->prev;
+
+		/* check if previous item is a valid pointer. */
+		if (PTR_INT(p_prev) <= 0) {
+			p_prev = PTR_NOT(p_prev);
+		} else {
+			p_prev += (p_item1 - p_item1->next->prev);
+		}
+
+		/* fill values. */
+		p_prev->next  = p_next;
+		p_next->prev  = p_prev;
+		p_item1->next = NULL;
+		p_item1->prev = NULL;
+	}
+
+	/* ESI */
+	pp_item       = &ht->first;
+	p_item1->next = (struct huffman_tree_item_s *)pp_item;
+	p_item1->prev = pp_item[1];
+
+	/* EDI = ht->item305C - ECX */
+	p_prev = pp_item[1];
+
+	/* check if previous pointer is valid. */
+	if (p_prev <= 0) {
+
+		/* fill values. */
+		p_prev          = PTR_NOT(p_prev);
+		p_prev->next    = p_item1;
+		p_prev->prev    = p_item2;
+		p_item2->parent = NULL;
+		p_item2->child  = NULL;
+	} else {
+
+		/* check if pointer is valid. */
+		if (PTR_INT(ht->item305C) < 0) {
+			p_prev += (struct huffman_tree_item_s *)pp_item - (*pp_item)->prev;
+		} else {
+			p_prev += PTR_INT(ht->item305C);
+		}
+
+		/* fill values. */
+		p_prev->next    = p_item1;
+		pp_item[1]      = p_item2;
+		p_item2->parent = NULL;
+		p_item2->child  = NULL;
+	}
+
+	/* return item. */
+	return p_item2;
+}
+
+/* return struct for 1500E820. */
+void libmpq__huffman_call_1500E820(struct huffman_tree_s *ht, struct huffman_tree_item_s *p_item) {
+
+	/* EDI */
+	struct huffman_tree_item_s *p_item1;
+
+	/* EAX */
+	struct huffman_tree_item_s *p_item2 = NULL;
+
+	/* EDX */
+	struct huffman_tree_item_s *p_item3;
+
+	/* EBX */
+	struct huffman_tree_item_s *p_prev;
+
+	/* loop through parent items. */
+	for (; p_item != NULL; p_item = p_item->parent) {
+
+		/* increase byte counter. */
+		p_item->byte_value++;
+
+		/* loop through previous items. */
+		for (p_item1 = p_item; ; p_item1 = p_prev) {
+
+			/* set previous item. */
+			p_prev = p_item1->prev;
+
+			/* check if pointer is valid. */
+			if (PTR_INT(p_prev) <= 0) {
+				p_prev = NULL;
+				break;
+			}
+
+			/* check if byte value of previous item is higher than actual item. */
+			if (p_prev->byte_value >= p_item->byte_value) {
+				break;
+			}
+		}
+
+		/* check if previous item is same like actual item. */
+		if (p_item1 == p_item) {
+			continue;
+		}
+
+		/* check if next item is not empty, */
+		if (p_item1->next != NULL) {
+
+			/* fill values. */
+			p_item2             = libmpq__huffman_previous_item(p_item1, -1);
+			p_item2->next       = p_item1->next;
+			p_item1->next->prev = p_item1->prev;
+			p_item1->next       = NULL;
+			p_item1->prev       = NULL;
+		}
+
+		/* fill values. */
+		p_item2       = p_item->next;
+		p_item1->next = p_item2;
+		p_item1->prev = p_item2->prev;
+		p_item2->prev = p_item1;
+		p_item->next  = p_item1;
+
+		/* check if both items are not empty. */
+		if ((p_item2 = p_item1) != NULL) {
+
+			/* fill values. */
+			p_item2            = libmpq__huffman_previous_item(p_item, -1);
+			p_item2->next      = p_item->next;
+			p_item->next->prev = p_item->prev;
+			p_item->next       = NULL;
+			p_item->prev       = NULL;
+		}
+
+		/* check if previous item is empty. */
+		if (p_prev == NULL) {
+			p_prev = PTR_PTR(&ht->first);
+		}
+
+		/* fill values. */
+		p_item2       = p_prev->next;
+		p_item->next  = p_item2;
+		p_item->prev  = p_item2->prev;
+		p_item2->prev = p_item;
+		p_prev->next  = p_item;
+		p_item3       = p_item1->parent->child;
+		p_item2       = p_item->parent;
+
+		/* check if child item and parent item match. */
+		if (p_item2->child == p_item) {
+			p_item2->child = p_item1;
+		}
+
+		/* check if items match. */
+		if (p_item3 == p_item1) {
+			p_item1->parent->child = p_item;
+		}
+
+		/* fill values. */
+		p_item2         = p_item->parent;
+		p_item->parent  = p_item1->parent;
+		p_item1->parent = p_item2;
+
+		/* increase counter. */
+		ht->offs0004++;
+	}
+}
+
+/* this function initialize a huffman tree. */
+void libmpq__huffman_tree_init(struct huffman_tree_s *ht, uint32_t cmp) {
+
+	/* some common variables. */
+	uint32_t count;
+	struct huffman_tree_item_s *hi;
+
+	/* clear links for all the items in the tree. */
+	for (hi = ht->items0008, count = 0x203; count != 0; hi++, count--) {
+		hi->next = hi->prev = NULL;
+	}
+
+	/* fill values. */
+	ht->item3050 = NULL;
+	ht->item3054 = PTR_PTR(&ht->item3054);
+	ht->item3058 = PTR_NOT(ht->item3054);
+	ht->item305C = NULL;
+	ht->first    = PTR_PTR(&ht->first);
+	ht->last     = PTR_NOT(ht->first);
+	ht->offs0004 = 1;
+	ht->items    = 0;
+
+	/* clear all huffman decompress items, do this only if preparing for decompression. */
+	if (cmp == LIBMPQ_HUFF_DECOMPRESS) {
+		for (count = 0; count < sizeof(ht->qd3474) / sizeof(struct huffman_decompress_s); count++) {
+			ht->qd3474[count].offs00 = 0;
+		}
+	}
+}
+
+/* this function build a huffman tree, called with the first 8 bits loaded from input stream. */
+void libmpq__huffman_tree_build(struct huffman_tree_s *ht, uint32_t cmp_type) {
+
+	/* [ESP+10] - the greatest character found in table. */
+	uint32_t max_byte;
+
+	/* [ESP+1C] - pointer to uint8_t in table_1502A630. */
+	const uint8_t *byte_array;
+
+	/* thats needed to replace the goto stuff from original source. :) */
+	uint32_t found;
+
+	/* [ESP+14] - Pointer to Huffman tree item pointer array. */
+	struct huffman_tree_item_s **p_item;
+	struct huffman_tree_item_s *child1;
+
+	/* some common variables. */
+	uint32_t i;
+
+	/* ESI - loop while pointer has a negative value (last entry). */
+	while (PTR_INT(ht->last) > 0) {
+
+		/* EAX */
+		struct huffman_tree_item_s *temp;
+
+		/* ESI->next */
+		if (ht->last->next != NULL) {
+			libmpq__huffman_remove_item(ht->last);
+		}
+
+		/* [EDI+4] */
+		ht->item3058   = PTR_PTR(&ht->item3054);
+
+		/* EAX */
+		ht->last->prev = ht->item3058;
+		temp           = libmpq__huffman_previous_item(PTR_PTR(&ht->item3054), PTR_INT(&ht->item3050));
+		temp->next     = ht->last;
+		ht->item3054   = ht->last;
+	}
+
+	/* clear all pointers in huffman tree item array. */
+	memset(ht->items306C, 0, sizeof(ht->items306C));
+
+	/* greatest character found init to zero. */
+	max_byte    = 0;
+
+	/* pointer to current entry in huffman tree item pointer array. */
+	p_item      = (struct huffman_tree_item_s **)&ht->items306C;
+
+	/* ensure we have low 8 bits only. */
+	cmp_type   &= 0xFF;
+
+	/* EDI also. */
+	byte_array  = table_1502A630 + cmp_type * 258;
+
+	/* loop to build huffman tree. */
+	for (i = 0; i < 0x100; i++, p_item++) {
+
+		/* item to be created. */
+		struct huffman_tree_item_s *item    = ht->item3058;
+		struct huffman_tree_item_s *p_item3 = ht->item3058;
+		uint8_t one_byte                  = byte_array[i];
+
+		/* skip all the bytes which are zero. */
+		if (byte_array[i] == 0) {
+			continue;
+		}
+
+		/* if not valid pointer, take the first available item in the array. */
+		if (PTR_INT(item) <= 0) {
+			item = &ht->items0008[ht->items++];
+		}
+
+		/* insert this item as the top of the tree. */
+		libmpq__huffman_insert_item(&ht->item305C, item, SWITCH_ITEMS, NULL);
+
+		/* invalidate child and parent. */
+		item->parent     = NULL;
+		item->child      = NULL;
+
+		/* store pointer into pointer array. */
+		*p_item          = item;
+
+		/* store counter. */
+		item->dcmp_byte  = i;
+
+		/* store byte value. */
+		item->byte_value = one_byte;
+
+		/* check if byte is to big. */
+		if (one_byte >= max_byte) {
+
+			/* set max byte to highest value. */
+			max_byte = one_byte;
+
+			/* continue loop. */
+			continue;
+		}
+
+		/* find the first item which has byte value greater than current one byte. */
+		found = 0;
+
+		/* EDI - Pointer to the last item. */
+		if (PTR_INT((p_item3 = ht->last)) > 0) {
+
+			/* 15006AF7 */
+			if (p_item3 != NULL) {
+
+				/* 15006AFB */
+				do {
+
+					/* check if we found item. */
+					if (p_item3->byte_value >= one_byte) {
+						found = 1;
+						break;
+					}
+
+					/* switch to previous item. */
+					p_item3 = p_item3->prev;
+				} while (PTR_INT(p_item3) > 0);
+			}
+		}
+
+		/* check if item was not found. */
+		if (found == 0) {
+			p_item3 = NULL;
+		}
+
+		/* 15006B09 */
+		if (item->next != NULL) {
+			libmpq__huffman_remove_item(item);
+		}
+
+		/* 15006B15 */
+		if (p_item3 == NULL) {
+			p_item3 = PTR_PTR(&ht->first);
+		}
+
+		/* 15006B1F */
+		item->next          = p_item3->next;
+		item->prev          = p_item3->next->prev;
+		p_item3->next->prev = item;
+		p_item3->next       = item;
+	}
+
+	/* 15006B4A */
+	for (; i < 0x102; i++) {
+
+		/* EDI */
+		struct huffman_tree_item_s **p_item2 = &ht->items306C[i];
+
+		/* 15006B59 - ESI */
+		struct huffman_tree_item_s *item2 = ht->item3058;
+
+		/* check if item is a valid pointer. */
+		if (PTR_INT(item2) <= 0) {
+			item2 = &ht->items0008[ht->items++];
+		}
+
+		/* insert the item into tree. */
+		libmpq__huffman_insert_item(&ht->item305C, item2, INSERT_ITEM, NULL);
+
+		/* 15006B89 */
+		item2->dcmp_byte  = i;
+		item2->byte_value = 1;
+		item2->parent     = NULL;
+		item2->child      = NULL;
+		*p_item2++        = item2;
+	}
+
+	/* 15006BAA - EDI - last item (first child to item). */
+	if (PTR_INT((child1 = ht->last)) > 0) {
+
+		/* EBP */
+		struct huffman_tree_item_s *child2;
+
+		/* ESI */
+		struct huffman_tree_item_s *item;
+
+		/* 15006BB8 */
+		while (PTR_INT((child2 = child1->prev)) > 0) {
+			if (PTR_INT((item = ht->item3058)) <= 0) {
+				item = &ht->items0008[ht->items++];
+			}
+
+			/* 15006BE3 */
+			libmpq__huffman_insert_item(&ht->item305C, item, SWITCH_ITEMS, NULL);
+
+			/* 15006BF3 */
+			item->parent = NULL;
+			item->child  = NULL;
+
+			/*
+			 * EDX = child2->byte_value + child1->byte_value;
+			 * EAX = child1->byte_value;
+			 * ECX = max_byte; (the greatest character (0xFF usually))
+			 *       item->byte_value (0x02 usually)
+			 */
+			item->byte_value = child1->byte_value + child2->byte_value;
+
+			/* previous item in the tree. */
+			item->child      = child1;
+			child1->parent   = item;
+			child2->parent   = item;
+
+			/* EAX = item->byte_value */
+			if (item->byte_value >= max_byte) {
+				max_byte = item->byte_value;
+			} else {
+
+				/* EDI */
+				struct huffman_tree_item_s *p_item2 = child2->prev;
+				found = 0;
+
+				/* check if item is a valid pointer. */
+				if (PTR_INT(p_item2) > 0) {
+
+					/* 15006C2D */
+					do {
+
+						/* check if we found item. */
+						if (p_item2->byte_value >= item->byte_value) {
+							found = 1;
+							break;
+						}
+
+						/* switch to previous item. */
+						p_item2 = p_item2->prev;
+					} while (PTR_INT(p_item2) > 0);
+				}
+
+				/* check if item was not found. */
+				if (found == 0) {
+					p_item2 = NULL;
+				}
+
+				/* check if next item exist. */
+				if (item->next != 0) {
+
+					/* some common variables. */
+					struct huffman_tree_item_s *temp4 = libmpq__huffman_previous_item(item, -1);
+
+					/* zhe first item changed. */
+					temp4->next                     = item->next;
+
+					/* first->prev changed to negative value. */
+					item->next->prev                = item->prev;
+					item->next                      = NULL;
+					item->prev                      = NULL;
+				}
+
+				/* 15006C62 */
+				if (p_item2 == NULL) {
+					p_item2 = PTR_PTR(&ht->first);
+				}
+
+				/* set item with 0x100 byte value. */
+				item->next          = p_item2->next;
+
+				/* set item with 0x17 byte value. */
+				item->prev          = p_item2->next->prev;
+
+				/* changed prev of item with. */
+				p_item2->next->prev = item;
+				p_item2->next       = item;
+			}
+
+			/* 15006C7B */
+			if (PTR_INT((child1 = child2->prev)) <= 0) {
+				break;
+			}
+		}
+	}
+
+	/* 15006C88 */
+	ht->offs0004 = 1;
+}
+
+/* this function did the real decompression. */
+int32_t libmpq__do_decompress_huffman(struct huffman_tree_s *ht, struct huffman_input_stream_s *is, uint8_t *out_buf, uint32_t out_length) {
+
+	/* some common variables. */
+	uint32_t dcmp_byte = 0;
+	uint8_t *out_pos = out_buf;
+	uint32_t bit_count;
+	struct huffman_decompress_s *qd;
+	struct huffman_tree_item_s *p_item1;
+	struct huffman_tree_item_s *p_item2;
+
+	/* 8 bits loaded from input stream. */
+	uint32_t n8bits;
+
+	/* 7 bits loaded from input stream. */
+	uint32_t n7bits;
+
+	/* thats needed to replace the goto stuff from original source. :) */
+	uint32_t found;
+
+	/* can we use quick decompression */
+	uint32_t has_qd;
+
+	/* test the output length, must not be non zero. */
+	if (out_length == 0) {
+		return 0;
+	}
+
+	/* get the compression type from the input stream. */
+	n8bits = libmpq__huffman_get_8bit(is);
+
+	/* build the Huffman tree. */
+	libmpq__huffman_tree_build(ht, n8bits);
+
+	/* compression 8 bit or not? */
+	ht->cmp0 = (n8bits == 0) ? TRUE : FALSE;
+
+	/* loop until break. */
+	for(;;) {
+
+		/* get 7 bits from input stream. */
+		n7bits = libmpq__huffman_get_7bit(is);
+
+		/* try to use quick decompression, check huffman decompress struct for corresponding item. */
+		qd = &ht->qd3474[n7bits];
+
+		/* if there is a quick-pass possible (ebx). */
+		has_qd = (qd->offs00 >= ht->offs0004) ? TRUE : FALSE;
+
+		/* if we can use quick decompress, use it. */
+		if (has_qd) {
+			found = 0;
+			if (qd->bits > 7) {
+				is->bit_buf >>= 7;
+				is->bits     -= 7;
+				p_item1       = qd->p_item;
+				found         = 1;
+			}
+			if (found == 0) {
+				is->bit_buf >>= qd->bits;
+				is->bits     -= qd->bits;
+				dcmp_byte     = qd->dcmp_byte;
+			}
+		} else {
+			found = 1;
+			p_item1 = ht->first->next->prev;
+			if (PTR_INT(p_item1) <= 0) {
+				p_item1 = NULL;
+			}
+		}
+
+		/* check if item was found. */
+		if (found == 1) {
+			bit_count = 0;
+			p_item2   = NULL;
+
+			/* loop until tree has no deeper level. */
+			do {
+
+				/* move down by one level. */
+				p_item1 = p_item1->child;
+
+				/* check if current bit is set, move to previous. */
+				if (libmpq__huffman_get_1bit(is)) {
+					p_item1 = p_item1->prev;
+				}
+
+				/* check if we are at 7th bit, save current huffman tree item. */
+				if (++bit_count == 7) {
+					p_item2 = p_item1;
+				}
+			} while (p_item1->child != NULL);
+
+			/* no quick decompression. :( */
+			if (has_qd == FALSE) {
+
+				/* check bit counter. */
+				if (bit_count > 7) {
+					qd->offs00 = ht->offs0004;
+					qd->bits   = bit_count;
+					qd->p_item = p_item2;
+				} else {
+					uint32_t index = n7bits & (0xFFFFFFFF >> (32 - bit_count));
+					uint32_t add   = (1 << bit_count);
+
+					/* loop through compression. */
+					for (qd = &ht->qd3474[index]; index <= 0x7F; index += add, qd += add) {
+						qd->offs00    = ht->offs0004;
+						qd->bits      = bit_count;
+						qd->dcmp_byte = p_item1->dcmp_byte;
+					}
+				}
+			}
+
+			/* set compression byte. */
+			dcmp_byte = p_item1->dcmp_byte;
+		}
+
+		/* check if huffman tree needs to be modified. */
+		if (dcmp_byte == 0x101)	{
+
+			/* fill values. */
+			n8bits                            = libmpq__huffman_get_8bit(is);
+			p_item1                           = (ht->last <= 0) ? NULL : ht->last;
+			p_item2                           = libmpq__huffman_call_1500E740(ht);
+			p_item2->parent                   = p_item1;
+			p_item2->dcmp_byte                = p_item1->dcmp_byte;
+			p_item2->byte_value               = p_item1->byte_value;
+			ht->items306C[p_item2->dcmp_byte] = p_item2;
+			p_item2                           = libmpq__huffman_call_1500E740(ht);
+			p_item2->parent                   = p_item1;
+			p_item2->dcmp_byte                = n8bits;
+			p_item2->byte_value               = 0;
+			ht->items306C[p_item2->dcmp_byte] = p_item2;
+			p_item1->child                    = p_item2;
+
+			/* call 1500E820. */
+			libmpq__huffman_call_1500E820(ht, p_item2);
+
+			/* check if compression is not set. */
+			if (ht->cmp0 == 0) {
+				libmpq__huffman_call_1500E820(ht, ht->items306C[n8bits]);
+			}
+
+			/* set compression byte. */
+			dcmp_byte = n8bits;
+		}
+
+		/* check for compression. */
+		if (dcmp_byte == 0x100) {
+			break;
+		}
+
+		/* increase position by compression byte. */
+		*out_pos++ = (uint8_t)dcmp_byte;
+		if (--out_length == 0) {
+			break;
+		}
+
+		/* check if compression is not set. */
+		if (ht->cmp0) {
+			libmpq__huffman_call_1500E820(ht, ht->items306C[dcmp_byte]);
+		}
+	}
+
+	/* return copied bytes. */
+	return (out_pos - out_buf);
+}
diff --git a/externals/libmpq/huffman.h b/externals/libmpq/huffman.h
new file mode 100644
index 00000000000..6f691088fa0
--- /dev/null
+++ b/externals/libmpq/huffman.h
@@ -0,0 +1,151 @@
+/*
+ *  huffman.h -- structures used for huffman compression.
+ *
+ *  Copyright (c) 2003-2008 Maik Broemme 
+ *
+ *  This source was adepted from the C++ version of huffman.h included
+ *  in stormlib. The C++ version belongs to the following authors:
+ *
+ *  Ladislav Zezula 
+ *  ShadowFlare 
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef _HUFFMAN_H
+#define _HUFFMAN_H
+
+/* define huffman compression and decompression values. */
+#define LIBMPQ_HUFF_DECOMPRESS			0		/* we want to decompress using huffman trees. */
+
+/* define pointer conversions. */
+#define PTR_NOT(ptr)				(struct huffman_tree_item_s *)(~(unsigned long)(ptr))
+#define PTR_PTR(ptr)				((struct huffman_tree_item_s *)(ptr))
+#define PTR_INT(ptr)				(long)(ptr)
+
+/* define item handling. */
+#define INSERT_ITEM				1		/* insert item into huffman tree. */
+#define SWITCH_ITEMS				2		/* switch items isnide huffman tree. */
+
+/* input stream for huffman decompression. */
+struct huffman_input_stream_s {
+	uint8_t		*in_buf;				/* 00 - input data. */
+	uint32_t	bit_buf;				/* 04 - input bit buffer. */
+	uint32_t	bits;					/* 08 - number of bits remaining in byte. */
+};
+
+/* huffman tree item. */
+struct huffman_tree_item_s {
+	struct		huffman_tree_item_s *next;		/* 00 - pointer to next huffman tree item. */
+	struct		huffman_tree_item_s *prev;		/* 04 - pointer to prev huffman tree item (< 0 if none). */
+	uint32_t	dcmp_byte;				/* 08 - index of this item in item pointer array, decompressed byte value. */
+	uint32_t	byte_value;				/* 0C - some byte value. */
+	struct		huffman_tree_item_s *parent;		/* 10 - pointer to parent huffman tree item (NULL if none). */
+	struct		huffman_tree_item_s *child;		/* 14 - pointer to child huffman tree item. */
+};
+
+/* structure used for quick decompression. */
+struct huffman_decompress_s {
+	uint32_t	offs00;					/* 00 - 1 if resolved. */
+	uint32_t	bits;					/* 04 - bit count. */
+	union {
+		uint32_t	dcmp_byte;			/* 08 - byte value for decompress (if bitCount <= 7). */
+		struct		huffman_tree_item_s *p_item;	/* 08 - huffman tree item (if number of bits is greater than 7). */
+	};
+};
+
+/* structure for huffman tree. */
+struct huffman_tree_s {
+	uint32_t	cmp0;					/* 0000 - 1 if compression type 0. */
+	uint32_t	offs0004;				/* 0004 - some flag. */
+	struct		huffman_tree_item_s items0008[0x203];	/* 0008 - huffman tree items. */
+	struct		huffman_tree_item_s *item3050;		/* 3050 - always NULL? */
+	struct		huffman_tree_item_s *item3054;		/* 3054 - pointer to huffman tree item. */
+	struct		huffman_tree_item_s *item3058;		/* 3058 - pointer to huffman tree item (< 0 if invalid). */
+	struct		huffman_tree_item_s *item305C;		/* 305C - usually NULL. */
+	struct		huffman_tree_item_s *first;		/* 3060 - pointer to top (first) huffman tree item. */
+	struct		huffman_tree_item_s *last;		/* 3064 - pointer to bottom (last) huffman tree item (< 0 if invalid). */
+	uint32_t	items;					/* 3068 - number of used huffman tree items. */
+	struct		huffman_tree_item_s *items306C[0x102];	/* 306C - huffman tree item pointer array. */
+	struct		huffman_decompress_s qd3474[0x80];	/* 3474 - array for quick decompression. */
+	uint8_t		table_1502A630[];			/* some table to make struct size flexible. */
+};
+
+/* insert a new item into huffman tree. */
+void libmpq__huffman_insert_item(
+	struct		huffman_tree_item_s **p_item,
+	struct		huffman_tree_item_s *item,
+	uint32_t	where,
+	struct		huffman_tree_item_s *item2
+);
+
+/* remove item from huffman tree. */
+void libmpq__huffman_remove_item(
+	struct		huffman_tree_item_s *hi
+);
+
+/* get previous item from huffman tree. */
+struct huffman_tree_item_s *libmpq__huffman_previous_item(
+	struct		huffman_tree_item_s *hi,
+	long		value
+);
+
+/* get one bit from stream. */
+uint32_t libmpq__huffman_get_1bit(
+	struct		huffman_input_stream_s *is
+);
+
+/* get seven bit from stream. */
+uint32_t libmpq__huffman_get_7bit(
+	struct		huffman_input_stream_s *is
+);
+
+/* get eight bit from stream. */
+uint32_t libmpq__huffman_get_8bit(
+	struct		huffman_input_stream_s *is
+);
+
+/* call 1500E740. */
+struct huffman_tree_item_s *libmpq__huffman_call_1500E740(
+	struct		huffman_tree_s *ht
+);
+
+/* call 1500E820- */
+void libmpq__huffman_call_1500E820(
+	struct		huffman_tree_s *ht,
+	struct		huffman_tree_item_s *p_item
+);
+
+/* initialize the huffman tree. */
+void libmpq__huffman_tree_init(
+	struct		huffman_tree_s *ht,
+	uint32_t	cmp
+);
+
+/* build the huffman tree. */
+void libmpq__huffman_tree_build(
+	struct		huffman_tree_s *ht,
+	uint32_t	cmp_type
+);
+
+/* decompress the stream using huffman compression. */
+int32_t libmpq__do_decompress_huffman(
+	struct		huffman_tree_s *ht,
+	struct		huffman_input_stream_s *is,
+	uint8_t		*out_buf,
+	uint32_t	out_length
+);
+
+#endif						/* _HUFFMAN_H */
diff --git a/externals/libmpq/mpq-internal.h b/externals/libmpq/mpq-internal.h
new file mode 100644
index 00000000000..d27879dc67c
--- /dev/null
+++ b/externals/libmpq/mpq-internal.h
@@ -0,0 +1,144 @@
+/*
+ *  mpq-internal.h -- some default types and defines, but only required for
+ *                    compilation of the library.
+ *
+ *  Copyright (c) 2003-2008 Maik Broemme 
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef _MPQ_INTERNAL_H
+#define _MPQ_INTERNAL_H
+
+/* generic includes. */
+#include 
+#include 
+#include 
+
+/* define return value if nothing failed. */
+#define LIBMPQ_SUCCESS				0		/* return value for all functions which success. */
+
+/* define generic mpq archive information. */
+#define LIBMPQ_HEADER				0x1A51504D	/* mpq archive header ('MPQ\x1A') */
+
+/* define the known archive versions. */
+#define LIBMPQ_ARCHIVE_VERSION_ONE		0		/* version one used until world of warcraft. */
+#define LIBMPQ_ARCHIVE_VERSION_TWO		1		/* version two used from world of warcraft - the burning crusade. */
+
+/* define values used by blizzard as flags. */
+#define LIBMPQ_FLAG_EXISTS			0x80000000	/* set if file exists, reset when the file was deleted. */
+#define LIBMPQ_FLAG_ENCRYPTED			0x00010000	/* indicates whether file is encrypted. */
+#define LIBMPQ_FLAG_COMPRESSED			0x0000FF00	/* file is compressed. */
+#define LIBMPQ_FLAG_COMPRESS_PKZIP		0x00000100	/* compression made by pkware data compression library. */
+#define LIBMPQ_FLAG_COMPRESS_MULTI		0x00000200	/* multiple compressions. */
+#define LIBMPQ_FLAG_COMPRESS_NONE		0x00000300	/* no compression (no blizzard flag used by myself). */
+#define LIBMPQ_FLAG_SINGLE			0x01000000	/* file is stored in one single sector, first seen in world of warcraft. */
+#define LIBMPQ_FLAG_EXTRA			0x04000000	/* compressed block offset table has one extra entry. */
+
+/* define generic hash values. */
+#define LIBMPQ_HASH_FREE			0xFFFFFFFF	/* hash table entry is empty and has always been empty. */
+
+/* define special files. */
+#define LIBMPQ_LISTFILE_NAME			"(listfile)"	/* internal listfile. */
+#define LIBMPQ_SIGNATURE_NAME			"(signature)"	/* internal signature file. */
+#define LIBMPQ_ATTRIBUTES_NAME			"(attributes)"	/* internal attributes file. */
+
+/* define true and false, because not all systems have them. */
+#ifndef FALSE
+#define FALSE 0
+#endif
+#ifndef TRUE
+#define TRUE 1
+#endif
+
+/* mpq archive header. */
+typedef struct {
+	uint32_t	mpq_magic;		/* the 0x1A51504D ('MPQ\x1A') signature. */
+	uint32_t	header_size;		/* mpq archive header size. */
+	uint32_t	archive_size;		/* size of mpq archive. */
+	uint16_t	version;		/* 0000 for starcraft and broodwar. */
+	uint16_t	block_size;		/* size of file block is (512 * 2 ^ block size). */
+	uint32_t	hash_table_offset;	/* file position of mpq_hash. */
+	uint32_t	block_table_offset;	/* file position of mpq_block, each entry has 16 bytes. */
+	uint32_t	hash_table_count;	/* number of entries in hash table. */
+	uint32_t	block_table_count;	/* number of entries in the block table. */
+} __attribute__ ((packed)) mpq_header_s;
+
+/* mpq extended archive header, used since world of warcraft - the burning crusade. */
+typedef struct {
+	uint64_t	extended_offset;	/* offset to the beginning of the extended block table, relative to the beginning of the archive. */
+	uint16_t	hash_table_offset_high;	/* upper 16 bits of the hash table offset for large archives. */
+	uint16_t	block_table_offset_high;/* upper 16 bits of the block table offset for large archives.*/
+} __attribute__ ((packed)) mpq_header_ex_s;
+
+/* hash entry, all files in the archive are searched by their hashes. */
+typedef struct {
+	uint32_t	hash_a;			/* the first two uint32_ts are the encrypted file. */
+	uint32_t	hash_b;			/* the first two uint32_ts are the encrypted file. */
+	uint16_t	locale;			/* locale information. */
+	uint16_t	platform;		/* platform information and zero is default. */
+	uint32_t	block_table_index;	/* index to file description block. */
+} __attribute__ ((packed)) mpq_hash_s;
+
+/* file description block contains informations about the file. */
+typedef struct {
+	uint32_t	offset;			/* block file starting position in the archive. */
+	uint32_t	packed_size;		/* packed file size. */
+	uint32_t	unpacked_size;		/* unpacked file size. */
+	uint32_t	flags;			/* flags. */
+} __attribute__ ((packed)) mpq_block_s;
+
+/* extended file description block contains information about the offset beyond 2^32 (4GB). */
+typedef struct {
+	uint16_t	offset_high;		/* upper 16 bit of the file offset in archive. */
+} __attribute__ ((packed)) mpq_block_ex_s;
+
+/* file structure used since diablo 1.00 (0x38 bytes). */
+typedef struct {
+	uint32_t	seed;			/* seed used for file decrypt. */
+	uint32_t	*packed_offset;		/* position of each file block (only for packed files). */
+	uint32_t	open_count;		/* number of times it has been opened - used for freeing */
+} __attribute__ ((packed)) mpq_file_s;
+
+/* map structure for valid blocks and hashes (first seen in warcraft 3 archives). */
+typedef struct {
+	uint32_t	block_table_indices;	/* real mapping for file number to block entry. */
+	uint32_t	block_table_diff;	/* block table difference between valid blocks and invalid blocks before. */
+} __attribute__ ((packed)) mpq_map_s;
+
+/* archive structure used since diablo 1.00 by blizzard. */
+struct mpq_archive {
+
+	/* generic file information. */
+	FILE		*fp;			/* file handle. */
+
+	/* generic size information. */
+	uint32_t	block_size;		/* size of the mpq block. */
+	off_t		archive_offset;		/* absolute start position of archive. */
+
+	/* archive related buffers and tables. */
+	mpq_header_s	mpq_header;		/* mpq file header. */
+	mpq_header_ex_s	mpq_header_ex;		/* mpq extended file header. */
+	mpq_hash_s	*mpq_hash;		/* hash table. */
+	mpq_block_s	*mpq_block;		/* block table. */
+	mpq_block_ex_s	*mpq_block_ex;		/* extended block table. */
+	mpq_file_s	**mpq_file;		/* pointer to the file pointers which are opened. */
+
+	/* non archive structure related members. */
+	mpq_map_s	*mpq_map;		/* map table between valid blocks and hashes. */
+	uint32_t	files;			/* number of files in archive, which could be extracted. */
+};
+
+#endif						/* _MPQ_INTERNAL_H */
diff --git a/externals/libmpq/mpq.c b/externals/libmpq/mpq.c
new file mode 100644
index 00000000000..d52214ae3b1
--- /dev/null
+++ b/externals/libmpq/mpq.c
@@ -0,0 +1,1027 @@
+/*
+ *  mpq.c -- functions for developers using libmpq.
+ *
+ *  Copyright (c) 2003-2008 Maik Broemme 
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+/* mpq-tools configuration includes. */
+#include "config.h"
+
+/* libmpq main includes. */
+#include "mpq.h"
+#include "mpq-internal.h"
+
+/* libmpq generic includes. */
+#include "common.h"
+
+/* generic includes. */
+#include 
+#include 
+#include 
+#include 
+#include 
+
+/* this function returns the library version information. */
+const char *libmpq__version(void) {
+
+	/* return version information. */
+	return VERSION;
+}
+
+/* this function read a file and verify if it is a valid mpq archive, then it read and decrypt the hash table. */
+int32_t libmpq__archive_open(mpq_archive_s **mpq_archive, const char *mpq_filename, libmpq__off_t archive_offset) {
+
+	/* some common variables. */
+	uint32_t rb             = 0;
+	uint32_t i              = 0;
+	uint32_t count          = 0;
+	int32_t result          = 0;
+	uint32_t header_search	= FALSE;
+
+	if (archive_offset == -1) {
+		archive_offset = 0;
+		header_search = TRUE;
+	}
+
+	if ((*mpq_archive = calloc(1, sizeof(mpq_archive_s))) == NULL) {
+
+		/* archive struct could not be allocated */
+		return LIBMPQ_ERROR_MALLOC;
+	}
+
+	/* check if file exists and is readable */
+	if (((*mpq_archive)->fp = fopen(mpq_filename, "rb")) == NULL) {
+
+		/* file could not be opened. */
+		result = LIBMPQ_ERROR_OPEN;
+		goto error;
+	}
+
+	/* assign some default values. */
+	(*mpq_archive)->mpq_header.mpq_magic = 0;
+	(*mpq_archive)->files                = 0;
+
+	/* loop through file and search for mpq signature. */
+	while (TRUE) {
+
+		/* reset header values. */
+		(*mpq_archive)->mpq_header.mpq_magic = 0;
+
+		/* seek in file. */
+		if (fseeko((*mpq_archive)->fp, archive_offset, SEEK_SET) < 0) {
+
+			/* seek in file failed. */
+			result = LIBMPQ_ERROR_SEEK;
+			goto error;
+		}
+
+		/* read header from file. */
+		if ((rb = fread(&(*mpq_archive)->mpq_header, 1, sizeof(mpq_header_s), (*mpq_archive)->fp)) != sizeof(mpq_header_s)) {
+
+			/* no valid mpq archive. */
+			result = LIBMPQ_ERROR_FORMAT;
+			goto error;
+		}
+
+		/* check if we found a valid mpq header. */
+		if ((*mpq_archive)->mpq_header.mpq_magic == LIBMPQ_HEADER) {
+
+			/* check if we process old mpq archive version. */
+			if ((*mpq_archive)->mpq_header.version == LIBMPQ_ARCHIVE_VERSION_ONE) {
+
+				/* check if the archive is protected. */
+				if ((*mpq_archive)->mpq_header.header_size != sizeof(mpq_header_s)) {
+
+					/* correct header size. */
+					(*mpq_archive)->mpq_header.header_size = sizeof(mpq_header_s);
+				}
+			}
+
+			/* check if we process new mpq archive version. */
+			if ((*mpq_archive)->mpq_header.version == LIBMPQ_ARCHIVE_VERSION_TWO) {
+
+				/* check if the archive is protected. */
+				if ((*mpq_archive)->mpq_header.header_size != sizeof(mpq_header_s) + sizeof(mpq_header_ex_s)) {
+
+					/* correct header size. */
+					(*mpq_archive)->mpq_header.header_size = sizeof(mpq_header_s) + sizeof(mpq_header_ex_s);
+				}
+			}
+
+			/* break the loop, because header was found. */
+			break;
+		}
+
+		/* move to the next possible offset. */
+		if (!header_search) {
+
+			/* no valid mpq archive. */
+			result = LIBMPQ_ERROR_FORMAT;
+			goto error;
+		}
+		archive_offset += 512;
+	}
+
+	/* store block size for later use. */
+	(*mpq_archive)->block_size = 512 << (*mpq_archive)->mpq_header.block_size;
+
+	/* store archive offset and size for later use. */
+	(*mpq_archive)->archive_offset = archive_offset;
+
+	/* check if we process new mpq archive version. */
+	if ((*mpq_archive)->mpq_header.version == LIBMPQ_ARCHIVE_VERSION_TWO) {
+
+		/* seek in file. */
+		if (fseeko((*mpq_archive)->fp, sizeof(mpq_header_s) + archive_offset, SEEK_SET) < 0) {
+
+			/* seek in file failed. */
+			result = LIBMPQ_ERROR_SEEK;
+			goto error;
+		}
+
+		/* read header from file. */
+		if ((rb = fread(&(*mpq_archive)->mpq_header_ex, 1, sizeof(mpq_header_ex_s), (*mpq_archive)->fp)) != sizeof(mpq_header_ex_s)) {
+
+			/* no valid mpq archive. */
+			result = LIBMPQ_ERROR_FORMAT;
+			goto error;
+		}
+	}
+
+	/* allocate memory for the block table, hash table, file and block table to file mapping. */
+	if (((*mpq_archive)->mpq_block    = calloc((*mpq_archive)->mpq_header.block_table_count, sizeof(mpq_block_s))) == NULL ||
+	    ((*mpq_archive)->mpq_block_ex = calloc((*mpq_archive)->mpq_header.block_table_count, sizeof(mpq_block_ex_s))) == NULL ||
+	    ((*mpq_archive)->mpq_hash     = calloc((*mpq_archive)->mpq_header.hash_table_count,  sizeof(mpq_hash_s))) == NULL ||
+	    ((*mpq_archive)->mpq_file     = calloc((*mpq_archive)->mpq_header.block_table_count, sizeof(mpq_file_s))) == NULL ||
+	    ((*mpq_archive)->mpq_map      = calloc((*mpq_archive)->mpq_header.block_table_count, sizeof(mpq_map_s))) == NULL) {
+
+		/* memory allocation problem. */
+		result = LIBMPQ_ERROR_MALLOC;
+		goto error;
+	}
+
+	/* seek in file. */
+	if (fseeko((*mpq_archive)->fp, (*mpq_archive)->mpq_header.hash_table_offset + (((long long)((*mpq_archive)->mpq_header_ex.hash_table_offset_high)) << 32) + (*mpq_archive)->archive_offset, SEEK_SET) < 0) {
+
+		/* seek in file failed. */
+		result = LIBMPQ_ERROR_SEEK;
+		goto error;
+	}
+
+	/* read the hash table into the buffer. */
+	if ((rb = fread((*mpq_archive)->mpq_hash, 1, (*mpq_archive)->mpq_header.hash_table_count * sizeof(mpq_hash_s), (*mpq_archive)->fp)) < 0) {
+
+		/* something on read failed. */
+		result = LIBMPQ_ERROR_READ;
+		goto error;
+	}
+
+	/* decrypt the hashtable. */
+	libmpq__decrypt_block((uint32_t *)((*mpq_archive)->mpq_hash), (*mpq_archive)->mpq_header.hash_table_count * sizeof(mpq_hash_s), libmpq__hash_string("(hash table)", 0x300));
+
+	/* seek in file. */
+	if (fseeko((*mpq_archive)->fp, (*mpq_archive)->mpq_header.block_table_offset + (((long long)((*mpq_archive)->mpq_header_ex.block_table_offset_high)) << 32) + (*mpq_archive)->archive_offset, SEEK_SET) < 0) {
+
+		/* seek in file failed. */
+		result = LIBMPQ_ERROR_SEEK;
+		goto error;
+	}
+
+	/* read the block table into the buffer. */
+	if ((rb = fread((*mpq_archive)->mpq_block, 1, (*mpq_archive)->mpq_header.block_table_count * sizeof(mpq_block_s), (*mpq_archive)->fp)) < 0) {
+
+		/* something on read failed. */
+		result = LIBMPQ_ERROR_READ;
+		goto error;
+	}
+
+	/* decrypt block table. */
+	libmpq__decrypt_block((uint32_t *)((*mpq_archive)->mpq_block), (*mpq_archive)->mpq_header.block_table_count * sizeof(mpq_block_s), libmpq__hash_string("(block table)", 0x300));
+
+	/* check if extended block table is present, regardless of version 2 it is only present in archives > 4GB. */
+	if ((*mpq_archive)->mpq_header_ex.extended_offset > 0) {
+
+		/* seek in file. */
+		if (fseeko((*mpq_archive)->fp, (*mpq_archive)->mpq_header_ex.extended_offset + archive_offset, SEEK_SET) < 0) {
+
+			/* seek in file failed. */
+			result = LIBMPQ_ERROR_SEEK;
+			goto error;
+		}
+
+		/* read header from file. */
+		if ((rb = fread((*mpq_archive)->mpq_block_ex, 1, (*mpq_archive)->mpq_header.block_table_count * sizeof(mpq_block_ex_s), (*mpq_archive)->fp)) < 0) {
+
+			/* no valid mpq archive. */
+			result = LIBMPQ_ERROR_FORMAT;
+			goto error;
+		}
+	}
+
+	/* loop through all files in mpq archive and check if they are valid. */
+	for (i = 0; i < (*mpq_archive)->mpq_header.block_table_count; i++) {
+
+		/* save block difference between valid and invalid blocks. */
+		(*mpq_archive)->mpq_map[i].block_table_diff = i - count;
+
+		/* check if file exists, sizes and offsets are correct. */
+		if (((*mpq_archive)->mpq_block[i].flags & LIBMPQ_FLAG_EXISTS) == 0) {
+
+			/* file does not exist, so nothing to do with that block. */
+			continue;
+		}
+
+		/* create final indices tables. */
+		(*mpq_archive)->mpq_map[count].block_table_indices = i;
+
+		/* increase file counter. */
+		count++;
+	}
+
+	/* save the number of files. */
+	(*mpq_archive)->files = count;
+
+	/* if no error was found, return zero. */
+	return LIBMPQ_SUCCESS;
+
+error:
+	if ((*mpq_archive)->fp)
+		fclose((*mpq_archive)->fp);
+
+	free((*mpq_archive)->mpq_map);
+	free((*mpq_archive)->mpq_file);
+	free((*mpq_archive)->mpq_hash);
+	free((*mpq_archive)->mpq_block);
+	free((*mpq_archive)->mpq_block_ex);
+	free(*mpq_archive);
+
+	*mpq_archive = NULL;
+
+	return result;
+}
+
+/* this function close the file descriptor, free the decryption buffer and the file list. */
+int32_t libmpq__archive_close(mpq_archive_s *mpq_archive) {
+
+	/* try to close the file */
+	if ((fclose(mpq_archive->fp)) < 0) {
+
+		/* don't free anything here, so the caller can try calling us
+		 * again.
+		 */
+		return LIBMPQ_ERROR_CLOSE;
+	}
+
+	/* free header, tables and list. */
+	free(mpq_archive->mpq_map);
+	free(mpq_archive->mpq_file);
+	free(mpq_archive->mpq_hash);
+	free(mpq_archive->mpq_block);
+	free(mpq_archive->mpq_block_ex);
+	free(mpq_archive);
+
+	/* if no error was found, return zero. */
+	return LIBMPQ_SUCCESS;
+}
+
+/* this function return the packed size of all files in the archive. */
+int32_t libmpq__archive_packed_size(mpq_archive_s *mpq_archive, libmpq__off_t *packed_size) {
+
+	/* some common variables. */
+	uint32_t i;
+
+	/* loop through all files in archive and count packed size. */
+	for (i = 0; i < mpq_archive->files; i++) {
+		*packed_size += mpq_archive->mpq_block[mpq_archive->mpq_map[i].block_table_indices].packed_size;
+	}
+
+	/* if no error was found, return zero. */
+	return LIBMPQ_SUCCESS;
+}
+
+/* this function return the unpacked size of all files in the archive. */
+int32_t libmpq__archive_unpacked_size(mpq_archive_s *mpq_archive, libmpq__off_t *unpacked_size) {
+
+	/* some common variables. */
+	uint32_t i;
+
+	/* loop through all files in archive and count unpacked size. */
+	for (i = 0; i < mpq_archive->files; i++) {
+		*unpacked_size += mpq_archive->mpq_block[mpq_archive->mpq_map[i].block_table_indices].unpacked_size;
+	}
+
+	/* if no error was found, return zero. */
+	return LIBMPQ_SUCCESS;
+}
+
+/* this function return the archive offset (beginning of archive in file). */
+int32_t libmpq__archive_offset(mpq_archive_s *mpq_archive, libmpq__off_t *offset) {
+
+	/* return archive offset. */
+	*offset = mpq_archive->archive_offset;
+
+	/* if no error was found, return zero. */
+	return LIBMPQ_SUCCESS;
+}
+
+/* this function return the archive offset. */
+int32_t libmpq__archive_version(mpq_archive_s *mpq_archive, uint32_t *version) {
+
+	/* return archive version. */
+	*version = mpq_archive->mpq_header.version + 1;
+
+	/* if no error was found, return zero. */
+	return LIBMPQ_SUCCESS;
+}
+
+/* this function return the number of valid files in archive. */
+int32_t libmpq__archive_files(mpq_archive_s *mpq_archive, uint32_t *files) {
+
+	/* return archive version. */
+	*files = mpq_archive->files;
+
+	/* if no error was found, return zero. */
+	return LIBMPQ_SUCCESS;
+}
+
+/* this function return the packed size of the given files in the archive. */
+int32_t libmpq__file_packed_size(mpq_archive_s *mpq_archive, uint32_t file_number, libmpq__off_t *packed_size) {
+
+	/* check if given file number is not out of range. */
+	if (file_number < 0 || file_number > mpq_archive->files - 1) {
+
+		/* file number is out of range. */
+		return LIBMPQ_ERROR_EXIST;
+	}
+
+	/* get the packed size of file. */
+	*packed_size = mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].packed_size;
+
+	/* if no error was found, return zero. */
+	return LIBMPQ_SUCCESS;
+}
+
+/* this function return the unpacked size of the given file in the archive. */
+int32_t libmpq__file_unpacked_size(mpq_archive_s *mpq_archive, uint32_t file_number, libmpq__off_t *unpacked_size) {
+
+	/* check if given file number is not out of range. */
+	if (file_number < 0 || file_number > mpq_archive->files - 1) {
+
+		/* file number is out of range. */
+		return LIBMPQ_ERROR_EXIST;
+	}
+
+	/* get the unpacked size of file. */
+	*unpacked_size = mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].unpacked_size;
+
+	/* if no error was found, return zero. */
+	return LIBMPQ_SUCCESS;
+}
+
+/* this function return the file offset (beginning of file in archive). */
+int32_t libmpq__file_offset(mpq_archive_s *mpq_archive, uint32_t file_number, libmpq__off_t *offset) {
+
+	/* check if given file number is not out of range. */
+	if (file_number < 0 || file_number > mpq_archive->files - 1) {
+
+		/* file number is out of range. */
+		return LIBMPQ_ERROR_EXIST;
+	}
+
+	/* return file offset relative to archive start. */
+	*offset = mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].offset + (((long long)mpq_archive->mpq_block_ex[mpq_archive->mpq_map[file_number].block_table_indices].offset_high) << 32);
+
+	/* if no error was found, return zero. */
+	return LIBMPQ_SUCCESS;
+}
+
+/* this function return the number of blocks for the given file in the archive. */
+int32_t libmpq__file_blocks(mpq_archive_s *mpq_archive, uint32_t file_number, uint32_t *blocks) {
+
+	/* check if given file number is not out of range. */
+	if (file_number < 0 || file_number > mpq_archive->files - 1) {
+
+		/* file number is out of range. */
+		return LIBMPQ_ERROR_EXIST;
+	}
+
+	/* return the number of blocks for the given file. */
+	*blocks = (mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].flags & LIBMPQ_FLAG_SINGLE) != 0 ? 1 : (mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].unpacked_size + mpq_archive->block_size - 1) / mpq_archive->block_size;
+
+	/* if no error was found, return zero. */
+	return LIBMPQ_SUCCESS;
+}
+
+/* this function return if the file is encrypted or not. */
+int32_t libmpq__file_encrypted(mpq_archive_s *mpq_archive, uint32_t file_number, uint32_t *encrypted) {
+
+	/* check if given file number is not out of range. */
+	if (file_number < 0 || file_number > mpq_archive->files - 1) {
+
+		/* file number is out of range. */
+		return LIBMPQ_ERROR_EXIST;
+	}
+
+	/* return the encryption status of file. */
+	*encrypted = (mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].flags & LIBMPQ_FLAG_ENCRYPTED) != 0 ? TRUE : FALSE;
+
+	/* if no error was found, return zero. */
+	return LIBMPQ_SUCCESS;
+}
+
+/* this function return if the file is compressed or not. */
+int32_t libmpq__file_compressed(mpq_archive_s *mpq_archive, uint32_t file_number, uint32_t *compressed) {
+
+	/* check if given file number is not out of range. */
+	if (file_number < 0 || file_number > mpq_archive->files - 1) {
+
+		/* file number is out of range. */
+		return LIBMPQ_ERROR_EXIST;
+	}
+
+	/* return the compression status of file. */
+	*compressed = (mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].flags & LIBMPQ_FLAG_COMPRESS_MULTI) != 0 ? TRUE : FALSE;
+
+	/* if no error was found, return zero. */
+	return LIBMPQ_SUCCESS;
+}
+
+/* this function return if the file is imploded or not. */
+int32_t libmpq__file_imploded(mpq_archive_s *mpq_archive, uint32_t file_number, uint32_t *imploded) {
+
+	/* check if given file number is not out of range. */
+	if (file_number < 0 || file_number > mpq_archive->files - 1) {
+
+		/* file number is out of range. */
+		return LIBMPQ_ERROR_EXIST;
+	}
+
+	/* return the implosion status of file. */
+	*imploded = (mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].flags & LIBMPQ_FLAG_COMPRESS_PKZIP) != 0 ? TRUE : FALSE;
+
+	/* if no error was found, return zero. */
+	return LIBMPQ_SUCCESS;
+}
+
+/* this function return filenumber by the given name. */
+int32_t libmpq__file_number(mpq_archive_s *mpq_archive, const char *filename, uint32_t *number) {
+
+	/* some common variables. */
+	uint32_t i, hash1, hash2, hash3, ht_count;
+
+	/* if the list of file names doesn't include this one, we'll have
+	 * to figure out the file number the "hard" way.
+	 */
+	ht_count = mpq_archive->mpq_header.hash_table_count;
+
+	hash1 = libmpq__hash_string (filename, 0x0) & (ht_count - 1);
+	hash2 = libmpq__hash_string (filename, 0x100);
+	hash3 = libmpq__hash_string (filename, 0x200);
+
+	/* loop through all files in mpq archive.
+	 * hash1 gives us a clue about the starting position of this
+	 * search.
+	 */
+	for (i = hash1; mpq_archive->mpq_hash[i].block_table_index != LIBMPQ_HASH_FREE; i = (i + 1) & (ht_count - 1)) {
+
+		/* if the other two hashes match, we found our file number. */
+		if (mpq_archive->mpq_hash[i].hash_a == hash2 &&
+		    mpq_archive->mpq_hash[i].hash_b == hash3) {
+
+			/* return the file number. */
+			*number = mpq_archive->mpq_hash[i].block_table_index - mpq_archive->mpq_map[mpq_archive->mpq_hash[i].block_table_index].block_table_diff;
+
+			/* we found our file, return zero. */
+			return LIBMPQ_SUCCESS;
+		}
+
+		/* check if we have cycled through the whole hash table */
+		if (((i + 1) & (ht_count - 1)) == hash1) {
+			break;
+		}
+	}
+
+	/* if no matching entry found, so return error. */
+	return LIBMPQ_ERROR_EXIST;
+}
+
+/* this function read the given file from archive into a buffer. */
+int32_t libmpq__file_read(mpq_archive_s *mpq_archive, uint32_t file_number, uint8_t *out_buf, libmpq__off_t out_size, libmpq__off_t *transferred) {
+
+	/* some common variables. */
+	uint32_t i;
+	uint32_t blocks         = 0;
+	int32_t result          = 0;
+	libmpq__off_t file_offset       = 0;
+	libmpq__off_t unpacked_size     = 0;
+	libmpq__off_t transferred_block = 0;
+	libmpq__off_t transferred_total = 0;
+
+	/* check if given file number is not out of range. */
+	if (file_number < 0 || file_number > mpq_archive->files - 1) {
+
+		/* file number is out of range. */
+		return LIBMPQ_ERROR_EXIST;
+	}
+
+	/* get target size of block. */
+	libmpq__file_unpacked_size(mpq_archive, file_number, &unpacked_size);
+
+	/* check if target buffer is to small. */
+	if (unpacked_size > out_size) {
+
+		/* output buffer size is to small or block size is unknown. */
+		return LIBMPQ_ERROR_SIZE;
+	}
+
+	/* fetch file offset. */
+	libmpq__file_offset(mpq_archive, file_number, &file_offset);
+
+	/* get block count for file. */
+	libmpq__file_blocks(mpq_archive, file_number, &blocks);
+
+	/* open the packed block offset table. */
+	if ((result = libmpq__block_open_offset(mpq_archive, file_number)) < 0) {
+
+		/* something on opening packed block offset table failed. */
+		return result;
+	}
+
+	/* loop through all blocks. */
+	for (i = 0; i < blocks; i++) {
+
+		/* cleanup size variable. */
+		unpacked_size = 0;
+
+		/* get unpacked block size. */
+		libmpq__block_unpacked_size(mpq_archive, file_number, i, &unpacked_size);
+
+		/* read block. */
+		if ((result = libmpq__block_read(mpq_archive, file_number, i, out_buf + transferred_total, unpacked_size, &transferred_block)) < 0) {
+
+			/* close the packed block offset table. */
+			libmpq__block_close_offset(mpq_archive, file_number);
+
+			/* something on reading block failed. */
+			return result;
+		}
+
+		transferred_total += transferred_block;
+
+	}
+
+	/* close the packed block offset table. */
+	libmpq__block_close_offset(mpq_archive, file_number);
+
+	/* check for null pointer. */
+	if (transferred != NULL) {
+
+		/* store transferred bytes. */
+		*transferred = transferred_total;
+	}
+
+	/* if no error was found, return zero. */
+	return LIBMPQ_SUCCESS;
+}
+
+/* this function open a file in the given archive and caches the block offset information. */
+int32_t libmpq__block_open_offset(mpq_archive_s *mpq_archive, uint32_t file_number) {
+
+	/* some common variables. */
+	uint32_t i;
+	uint32_t packed_size;
+	int32_t rb     = 0;
+	int32_t result = 0;
+
+	/* check if given file number is not out of range. */
+	if (file_number < 0 || file_number > mpq_archive->files - 1) {
+
+		/* file number is out of range. */
+		return LIBMPQ_ERROR_EXIST;
+	}
+
+	if (mpq_archive->mpq_file[file_number]) {
+
+		/* file already opened, so increment counter */
+		mpq_archive->mpq_file[file_number]->open_count++;
+		return LIBMPQ_SUCCESS;
+	}
+
+	/* check if file is not stored in a single sector. */
+	if ((mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].flags & LIBMPQ_FLAG_SINGLE) == 0) {
+
+		/* get packed size based on block size and block count. */
+		packed_size = sizeof(uint32_t) * (((mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].unpacked_size + mpq_archive->block_size - 1) / mpq_archive->block_size) + 1);
+	} else {
+
+		/* file is stored in single sector and we need only two entries for the packed block offset table. */
+		packed_size = sizeof(uint32_t) * 2;
+	}
+
+	/* check if data has one extra entry. */
+	if ((mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].flags & LIBMPQ_FLAG_EXTRA) != 0) {
+
+		/* add one uint32_t. */
+		packed_size += sizeof(uint32_t);
+	}
+
+	/* allocate memory for the file. */
+	if ((mpq_archive->mpq_file[file_number] = calloc(1, sizeof(mpq_file_s))) == NULL) {
+
+		/* memory allocation problem. */
+		result = LIBMPQ_ERROR_MALLOC;
+		goto error;
+	}
+
+	/* allocate memory for the packed block offset table. */
+	if ((mpq_archive->mpq_file[file_number]->packed_offset = calloc(1, packed_size)) == NULL) {
+
+		/* memory allocation problem. */
+		result = LIBMPQ_ERROR_MALLOC;
+		goto error;
+	}
+
+	/* initialize counter to one opening */
+	mpq_archive->mpq_file[file_number]->open_count = 1;
+
+	/* check if we need to load the packed block offset table, we will maintain this table for unpacked files too. */
+	if ((mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].flags & LIBMPQ_FLAG_COMPRESSED) != 0 &&
+	    (mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].flags & LIBMPQ_FLAG_SINGLE) == 0) {
+
+		/* seek to block position. */
+		if (fseeko(mpq_archive->fp, mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].offset + (((long long)mpq_archive->mpq_block_ex[mpq_archive->mpq_map[file_number].block_table_indices].offset_high) << 32) + mpq_archive->archive_offset, SEEK_SET) < 0) {
+
+			/* seek in file failed. */
+			result = LIBMPQ_ERROR_SEEK;
+			goto error;
+		}
+
+		/* read block positions from begin of file. */
+		if ((rb = fread(mpq_archive->mpq_file[file_number]->packed_offset, 1, packed_size, mpq_archive->fp)) < 0) {
+
+			/* something on read from archive failed. */
+			result = LIBMPQ_ERROR_READ;
+			goto error;
+		}
+
+		/* check if the archive is protected some way, sometimes the file appears not to be encrypted, but it is. */
+		if (mpq_archive->mpq_file[file_number]->packed_offset[0] != rb) {
+
+			/* file is encrypted. */
+			mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].flags |= LIBMPQ_FLAG_ENCRYPTED;
+		}
+
+		/* check if packed offset block is encrypted, we have to decrypt it. */
+		if (mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].flags & LIBMPQ_FLAG_ENCRYPTED) {
+
+			/* check if we don't know the file seed, try to find it. */
+			if ((mpq_archive->mpq_file[file_number]->seed = libmpq__decrypt_key((uint8_t *)mpq_archive->mpq_file[file_number]->packed_offset, packed_size, mpq_archive->block_size)) < 0) {
+
+				/* sorry without seed, we cannot extract file. */
+				result = LIBMPQ_ERROR_DECRYPT;
+				goto error;
+			}
+
+			/* decrypt block in input buffer. */
+			if (libmpq__decrypt_block(mpq_archive->mpq_file[file_number]->packed_offset, packed_size, mpq_archive->mpq_file[file_number]->seed - 1) < 0 ) {
+
+				/* something on decrypt failed. */
+				result = LIBMPQ_ERROR_DECRYPT;
+				goto error;
+			}
+
+			/* check if the block positions are correctly decrypted. */
+			if (mpq_archive->mpq_file[file_number]->packed_offset[0] != packed_size) {
+
+				/* sorry without seed, we cannot extract file. */
+				result = LIBMPQ_ERROR_DECRYPT;
+				goto error;
+			}
+		}
+	} else {
+
+		/* check if file is not stored in a single sector. */
+		if ((mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].flags & LIBMPQ_FLAG_SINGLE) == 0) {
+
+			/* loop through all blocks and create packed block offset table based on block size. */
+			for (i = 0; i < ((mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].unpacked_size + mpq_archive->block_size - 1) / mpq_archive->block_size + 1); i++) {
+
+				/* check if we process the last block. */
+				if (i == ((mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].unpacked_size + mpq_archive->block_size - 1) / mpq_archive->block_size)) {
+
+					/* store size of last block. */
+					mpq_archive->mpq_file[file_number]->packed_offset[i] = mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].unpacked_size;
+				} else {
+
+					/* store default block size. */
+					mpq_archive->mpq_file[file_number]->packed_offset[i] = i * mpq_archive->block_size;
+				}
+			}
+		} else {
+
+			/* store offsets. */
+			mpq_archive->mpq_file[file_number]->packed_offset[0] = 0;
+			mpq_archive->mpq_file[file_number]->packed_offset[1] = mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].packed_size;
+		}
+	}
+
+	/* if no error was found, return zero. */
+	return LIBMPQ_SUCCESS;
+
+error:
+
+	/* free packed block offset table and file pointer. */
+	free(mpq_archive->mpq_file[file_number]->packed_offset);
+	free(mpq_archive->mpq_file[file_number]);
+
+	/* return error constant. */
+	return result;
+}
+
+/* this function free the file pointer to the opened file in archive. */
+int32_t libmpq__block_close_offset(mpq_archive_s *mpq_archive, uint32_t file_number) {
+
+	/* check if given file number is not out of range. */
+	if (file_number < 0 || file_number > mpq_archive->files - 1) {
+
+		/* file number is out of range. */
+		return LIBMPQ_ERROR_EXIST;
+	}
+
+	if (mpq_archive->mpq_file[file_number] == NULL) {
+
+		/* packed block offset table is not opened. */
+		return LIBMPQ_ERROR_OPEN;
+	}
+
+	mpq_archive->mpq_file[file_number]->open_count--;
+
+	if (mpq_archive->mpq_file[file_number]->open_count != 0) {
+
+		/* still in use */
+		return LIBMPQ_SUCCESS;
+	}
+
+	/* free packed block offset table and file pointer. */
+	free(mpq_archive->mpq_file[file_number]->packed_offset);
+	free(mpq_archive->mpq_file[file_number]);
+
+	/* mark it as unopened - libmpq__block_open_offset checks for this to decide whether to increment the counter */
+	mpq_archive->mpq_file[file_number] = NULL;
+
+	/* if no error was found, return zero. */
+	return LIBMPQ_SUCCESS;
+}
+
+/* this function return the unpacked size of the given file and block in the archive. */
+int32_t libmpq__block_unpacked_size(mpq_archive_s *mpq_archive, uint32_t file_number, uint32_t block_number, libmpq__off_t *unpacked_size) {
+
+	/* check if given file number is not out of range. */
+	if (file_number < 0 || file_number > mpq_archive->files - 1) {
+
+		/* file number is out of range. */
+		return LIBMPQ_ERROR_EXIST;
+	}
+
+	/* check if given block number is not out of range. */
+	if (block_number < 0 || block_number >= ((mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].flags & LIBMPQ_FLAG_SINGLE) != 0 ? 1 : (mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].unpacked_size + mpq_archive->block_size - 1) / mpq_archive->block_size)) {
+
+		/* file number is out of range. */
+		return LIBMPQ_ERROR_EXIST;
+	}
+
+	/* check if packed block offset table is opened. */
+	if (mpq_archive->mpq_file[file_number] == NULL ||
+	    mpq_archive->mpq_file[file_number]->packed_offset == NULL) {
+
+		/* packed block offset table is not opened. */
+		return LIBMPQ_ERROR_OPEN;
+	}
+
+	/* check if block is stored as single sector. */
+	if ((mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].flags & LIBMPQ_FLAG_SINGLE) != 0) {
+
+		/* return the unpacked size of the block in the mpq archive. */
+		*unpacked_size = mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].unpacked_size;
+	}
+
+	/* check if block is not stored as single sector. */
+	if ((mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].flags & LIBMPQ_FLAG_SINGLE) == 0) {
+
+		/* check if we not process the last block. */
+		if (block_number < ((mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].unpacked_size + mpq_archive->block_size - 1) / mpq_archive->block_size) - 1) {
+
+			/* return the block size as unpacked size. */
+			*unpacked_size = mpq_archive->block_size;
+		} else {
+
+			/* return the unpacked size of the last block in the mpq archive. */
+			*unpacked_size = mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].unpacked_size - mpq_archive->block_size * block_number;
+		}
+	}
+
+	/* if no error was found, return zero. */
+	return LIBMPQ_SUCCESS;
+}
+
+/* this function return the decryption seed for the given file and block. */
+int32_t libmpq__block_seed(mpq_archive_s *mpq_archive, uint32_t file_number, uint32_t block_number, uint32_t *seed) {
+
+	/* check if given file number is not out of range. */
+	if (file_number < 0 || file_number > mpq_archive->files - 1) {
+
+		/* file number is out of range. */
+		return LIBMPQ_ERROR_EXIST;
+	}
+
+	/* check if given block number is not out of range. */
+	if (block_number < 0 || block_number >= ((mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].flags & LIBMPQ_FLAG_SINGLE) != 0 ? 1 : (mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].unpacked_size + mpq_archive->block_size - 1) / mpq_archive->block_size)) {
+
+		/* file number is out of range. */
+		return LIBMPQ_ERROR_EXIST;
+	}
+
+	/* check if packed block offset table is opened. */
+	if (mpq_archive->mpq_file[file_number] == NULL ||
+	    mpq_archive->mpq_file[file_number]->packed_offset == NULL) {
+
+		/* packed block offset table is not opened. */
+		return LIBMPQ_ERROR_OPEN;
+	}
+
+	/* return the decryption key. */
+	*seed = mpq_archive->mpq_file[file_number]->seed + block_number;
+
+	/* if no error was found, return zero. */
+	return LIBMPQ_SUCCESS;
+}
+
+/* this function read the given block from archive into a buffer. */
+int32_t libmpq__block_read(mpq_archive_s *mpq_archive, uint32_t file_number, uint32_t block_number, uint8_t *out_buf, libmpq__off_t out_size, libmpq__off_t *transferred) {
+
+	/* some common variables. */
+	uint8_t *in_buf;
+	uint32_t seed       = 0;
+	uint32_t encrypted  = 0;
+	uint32_t compressed = 0;
+	uint32_t imploded   = 0;
+	int32_t tb          = 0;
+	off_t block_offset  = 0;
+	off_t in_size       = 0;
+	libmpq__off_t unpacked_size = 0;
+
+	/* check if given file number is not out of range. */
+	if (file_number < 0 || file_number > mpq_archive->files - 1) {
+
+		/* file number is out of range. */
+		return LIBMPQ_ERROR_EXIST;
+	}
+
+	/* check if given block number is not out of range. */
+	if (block_number < 0 || block_number >= ((mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].flags & LIBMPQ_FLAG_SINGLE) != 0 ? 1 : (mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].unpacked_size + mpq_archive->block_size - 1) / mpq_archive->block_size)) {
+
+		/* file number is out of range. */
+		return LIBMPQ_ERROR_EXIST;
+	}
+
+	/* check if packed block offset table is opened. */
+	if (mpq_archive->mpq_file[file_number] == NULL ||
+	    mpq_archive->mpq_file[file_number]->packed_offset == NULL) {
+
+		/* packed block offset table is not opened. */
+		return LIBMPQ_ERROR_OPEN;
+	}
+
+	/* get target size of block. */
+	libmpq__block_unpacked_size(mpq_archive, file_number, block_number, &unpacked_size);
+
+	/* check if target buffer is to small. */
+	if (unpacked_size > out_size) {
+
+		/* output buffer size is to small or block size is unknown. */
+		return LIBMPQ_ERROR_SIZE;
+	}
+
+	/* fetch some required values like input buffer size and block offset. */
+	block_offset = mpq_archive->mpq_block[mpq_archive->mpq_map[file_number].block_table_indices].offset + (((long long)mpq_archive->mpq_block_ex[mpq_archive->mpq_map[file_number].block_table_indices].offset_high) << 32) + mpq_archive->mpq_file[file_number]->packed_offset[block_number];
+	in_size = mpq_archive->mpq_file[file_number]->packed_offset[block_number + 1] - mpq_archive->mpq_file[file_number]->packed_offset[block_number];
+
+	/* seek in file. */
+	if (fseeko(mpq_archive->fp, block_offset + mpq_archive->archive_offset, SEEK_SET) < 0) {
+
+		/* something with seek in file failed. */
+		return LIBMPQ_ERROR_SEEK;
+	}
+
+	/* allocate memory for the read buffer. */
+	if ((in_buf = calloc(1, in_size)) == NULL) {
+
+		/* memory allocation problem. */
+		return LIBMPQ_ERROR_MALLOC;
+	}
+
+	/* read block from file. */
+	if (fread(in_buf, 1, in_size, mpq_archive->fp) < 0) {
+
+		/* free buffers. */
+		free(in_buf);
+
+		/* something on reading block failed. */
+		return LIBMPQ_ERROR_READ;
+	}
+
+	/* get encryption status. */
+	libmpq__file_encrypted(mpq_archive, file_number, &encrypted);
+
+	/* check if file is encrypted. */
+	if (encrypted == 1) {
+
+		/* get decryption key. */
+		libmpq__block_seed(mpq_archive, file_number, block_number, &seed);
+
+		/* decrypt block. */
+		if (libmpq__decrypt_block((uint32_t *)in_buf, in_size, seed) < 0) {
+
+			/* free buffers. */
+			free(in_buf);
+
+			/* something on decrypting block failed. */
+			return LIBMPQ_ERROR_DECRYPT;
+		}
+	}
+
+	/* get compression status. */
+	libmpq__file_compressed(mpq_archive, file_number, &compressed);
+
+	/* check if file is compressed. */
+	if (compressed == 1) {
+
+		/* decompress block. */
+		if ((tb = libmpq__decompress_block(in_buf, in_size, out_buf, out_size, LIBMPQ_FLAG_COMPRESS_MULTI)) < 0) {
+
+			/* free temporary buffer. */
+			free(in_buf);
+
+			/* something on decompressing block failed. */
+			return LIBMPQ_ERROR_UNPACK;
+		}
+	}
+
+	/* get implosion status. */
+	libmpq__file_imploded(mpq_archive, file_number, &imploded);
+
+	/* check if file is imploded. */
+	if (imploded == 1) {
+
+		/* explode block. */
+		if ((tb = libmpq__decompress_block(in_buf, in_size, out_buf, out_size, LIBMPQ_FLAG_COMPRESS_PKZIP)) < 0) {
+
+			/* free temporary buffer. */
+			free(in_buf);
+
+			/* something on decompressing block failed. */
+			return LIBMPQ_ERROR_UNPACK;
+		}
+	}
+
+	/* check if file is neither compressed nor imploded. */
+	if (compressed == 0 && imploded == 0) {
+
+		/* copy block. */
+		if ((tb = libmpq__decompress_block(in_buf, in_size, out_buf, out_size, LIBMPQ_FLAG_COMPRESS_NONE)) < 0) {
+
+			/* free temporary buffer. */
+			free(in_buf);
+
+			/* something on decompressing block failed. */
+			return LIBMPQ_ERROR_UNPACK;
+		}
+	}
+
+	/* free read buffer. */
+	free(in_buf);
+
+	/* check for null pointer. */
+	if (transferred != NULL) {
+
+		/* store transferred bytes. */
+		*transferred = tb;
+	}
+
+	/* if no error was found, return zero. */
+	return LIBMPQ_SUCCESS;
+}
diff --git a/externals/libmpq/mpq.h b/externals/libmpq/mpq.h
new file mode 100644
index 00000000000..a11e2061bf8
--- /dev/null
+++ b/externals/libmpq/mpq.h
@@ -0,0 +1,99 @@
+/*
+ *  mpq.h -- some default types and defines.
+ *
+ *  Copyright (c) 2003-2008 Maik Broemme 
+ *
+ *  Some parts (the encryption and decryption stuff) were adapted from
+ *  the C++ version of StormLib.h and StormPort.h included in stormlib.
+ *  The C++ version belongs to the following authors:
+ *
+ *  Ladislav Zezula 
+ *  Marko Friedemann 
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef _MPQ_H
+#define _MPQ_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* generic includes. */
+#include 
+#include 
+#include 
+
+#if defined(__GNUC__) && (__GNUC__ >= 4)
+# define LIBMPQ_API __attribute__((visibility("default")))
+#else
+# define LIBMPQ_API
+#endif
+
+/* define errors. */
+#define LIBMPQ_ERROR_OPEN			-1		/* open error on file. */
+#define LIBMPQ_ERROR_CLOSE			-2		/* close error on file. */
+#define LIBMPQ_ERROR_SEEK			-3		/* lseek error on file. */
+#define LIBMPQ_ERROR_READ			-4		/* read error on file. */
+#define LIBMPQ_ERROR_WRITE			-5		/* write error on file. */
+#define LIBMPQ_ERROR_MALLOC			-6		/* memory allocation error. */
+#define LIBMPQ_ERROR_FORMAT			-7		/* format errror. */
+#define LIBMPQ_ERROR_NOT_INITIALIZED		-8		/* libmpq__init() wasn't called. */
+#define LIBMPQ_ERROR_SIZE			-9		/* buffer size is to small. */
+#define LIBMPQ_ERROR_EXIST			-10		/* file or block does not exist in archive. */
+#define LIBMPQ_ERROR_DECRYPT			-11		/* we don't know the decryption seed. */
+#define LIBMPQ_ERROR_UNPACK			-12		/* error on unpacking file. */
+
+/* internal data structure. */
+typedef struct mpq_archive mpq_archive_s;
+
+/* file offset data type for API*/
+typedef int64_t libmpq__off_t;
+
+/* generic information about library. */
+extern LIBMPQ_API const char *libmpq__version(void);
+
+/* generic mpq archive information. */
+extern LIBMPQ_API int32_t libmpq__archive_open(mpq_archive_s **mpq_archive, const char *mpq_filename, libmpq__off_t archive_offset);
+extern LIBMPQ_API int32_t libmpq__archive_close(mpq_archive_s *mpq_archive);
+extern LIBMPQ_API int32_t libmpq__archive_packed_size(mpq_archive_s *mpq_archive, libmpq__off_t *packed_size);
+extern LIBMPQ_API int32_t libmpq__archive_unpacked_size(mpq_archive_s *mpq_archive, libmpq__off_t *unpacked_size);
+extern LIBMPQ_API int32_t libmpq__archive_offset(mpq_archive_s *mpq_archive, libmpq__off_t *offset);
+extern LIBMPQ_API int32_t libmpq__archive_version(mpq_archive_s *mpq_archive, uint32_t *version);
+extern LIBMPQ_API int32_t libmpq__archive_files(mpq_archive_s *mpq_archive, uint32_t *files);
+
+/* generic file processing functions. */
+extern LIBMPQ_API int32_t libmpq__file_packed_size(mpq_archive_s *mpq_archive, uint32_t file_number, libmpq__off_t *packed_size);
+extern LIBMPQ_API int32_t libmpq__file_unpacked_size(mpq_archive_s *mpq_archive, uint32_t file_number, libmpq__off_t *unpacked_size);
+extern LIBMPQ_API int32_t libmpq__file_offset(mpq_archive_s *mpq_archive, uint32_t file_number, libmpq__off_t *offset);
+extern LIBMPQ_API int32_t libmpq__file_blocks(mpq_archive_s *mpq_archive, uint32_t file_number, uint32_t *blocks);
+extern LIBMPQ_API int32_t libmpq__file_encrypted(mpq_archive_s *mpq_archive, uint32_t file_number, uint32_t *encrypted);
+extern LIBMPQ_API int32_t libmpq__file_compressed(mpq_archive_s *mpq_archive, uint32_t file_number, uint32_t *compressed);
+extern LIBMPQ_API int32_t libmpq__file_imploded(mpq_archive_s *mpq_archive, uint32_t file_number, uint32_t *imploded);
+extern LIBMPQ_API int32_t libmpq__file_number(mpq_archive_s *mpq_archive, const char *filename, uint32_t *number);
+extern LIBMPQ_API int32_t libmpq__file_read(mpq_archive_s *mpq_archive, uint32_t file_number, uint8_t *out_buf, libmpq__off_t out_size, libmpq__off_t *transferred);
+
+/* generic block processing functions. */
+extern LIBMPQ_API int32_t libmpq__block_open_offset(mpq_archive_s *mpq_archive, uint32_t file_number);
+extern LIBMPQ_API int32_t libmpq__block_close_offset(mpq_archive_s *mpq_archive, uint32_t file_number);
+extern LIBMPQ_API int32_t libmpq__block_unpacked_size(mpq_archive_s *mpq_archive, uint32_t file_number, uint32_t block_number, libmpq__off_t *unpacked_size);
+extern LIBMPQ_API int32_t libmpq__block_read(mpq_archive_s *mpq_archive, uint32_t file_number, uint32_t block_number, uint8_t *out_buf, libmpq__off_t out_size, libmpq__off_t *transferred);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif						/* _MPQ_H */
diff --git a/externals/libmpq/wave.c b/externals/libmpq/wave.c
new file mode 100644
index 00000000000..4f2b73ba27e
--- /dev/null
+++ b/externals/libmpq/wave.c
@@ -0,0 +1,250 @@
+/*
+ *  wave.c -- this file contains decompression methods used by mpq-tools
+ *            to decompress wave files.
+ *
+ *  Copyright (c) 2003-2007 Maik Broemme 
+ *
+ *  This source was adepted from the C++ version of wave.cpp included
+ *  in stormlib. The C++ version belongs to the following authors:
+ *
+ *  Ladislav Zezula 
+ *  Tom Amigo 
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+/* generic includes. */
+#include 
+
+/* libmpq generic includes. */
+#include "wave.h"
+
+/* table necessary dor decompression. */
+static const uint32_t wave_table_1503f120[] = {
+	0xFFFFFFFF, 0x00000000, 0xFFFFFFFF, 0x00000004, 0xFFFFFFFF, 0x00000002, 0xFFFFFFFF, 0x00000006,
+	0xFFFFFFFF, 0x00000001, 0xFFFFFFFF, 0x00000005, 0xFFFFFFFF, 0x00000003, 0xFFFFFFFF, 0x00000007,
+	0xFFFFFFFF, 0x00000001, 0xFFFFFFFF, 0x00000005, 0xFFFFFFFF, 0x00000003, 0xFFFFFFFF, 0x00000007,  
+	0xFFFFFFFF, 0x00000002, 0xFFFFFFFF, 0x00000004, 0xFFFFFFFF, 0x00000006, 0xFFFFFFFF, 0x00000008  
+};
+
+/* table necessary dor decompression. */
+static const uint32_t wave_table_1503f1a0[] = {
+	0x00000007, 0x00000008, 0x00000009, 0x0000000A, 0x0000000B, 0x0000000C, 0x0000000D, 0x0000000E,
+	0x00000010, 0x00000011, 0x00000013, 0x00000015, 0x00000017, 0x00000019, 0x0000001C, 0x0000001F,
+	0x00000022, 0x00000025, 0x00000029, 0x0000002D, 0x00000032, 0x00000037, 0x0000003C, 0x00000042,
+	0x00000049, 0x00000050, 0x00000058, 0x00000061, 0x0000006B, 0x00000076, 0x00000082, 0x0000008F,
+	0x0000009D, 0x000000AD, 0x000000BE, 0x000000D1, 0x000000E6, 0x000000FD, 0x00000117, 0x00000133,
+	0x00000151, 0x00000173, 0x00000198, 0x000001C1, 0x000001EE, 0x00000220, 0x00000256, 0x00000292,
+	0x000002D4, 0x0000031C, 0x0000036C, 0x000003C3, 0x00000424, 0x0000048E, 0x00000502, 0x00000583,
+	0x00000610, 0x000006AB, 0x00000756, 0x00000812, 0x000008E0, 0x000009C3, 0x00000ABD, 0x00000BD0,
+	0x00000CFF, 0x00000E4C, 0x00000FBA, 0x0000114C, 0x00001307, 0x000014EE, 0x00001706, 0x00001954,
+	0x00001BDC, 0x00001EA5, 0x000021B6, 0x00002515, 0x000028CA, 0x00002CDF, 0x0000315B, 0x0000364B,
+	0x00003BB9, 0x000041B2, 0x00004844, 0x00004F7E, 0x00005771, 0x0000602F, 0x000069CE, 0x00007462,
+	0x00007FFF
+};
+
+/* this function decompress a wave file, mono or stereo, 1500F230 offset. */
+int32_t libmpq__do_decompress_wave(uint8_t *out_buf, int32_t out_length, uint8_t *in_buf, int32_t in_length, int32_t channels) {
+
+	/* some common variables. */
+	byte_and_int16_t out;
+	byte_and_int16_t in;
+	uint32_t index;
+	int32_t nr_array1[2];
+	int32_t nr_array2[2];
+	uint32_t count = 0;
+
+	/* end on input buffer. */
+	uint8_t *in_end = in_buf + in_length;
+
+	/* assign default values. */
+	out.pb       = out_buf;
+	in.pb        = in_buf;
+	nr_array1[0] = 0x2C;
+	nr_array1[1] = 0x2C;
+
+	/* increase. */
+	in.pw++;
+
+	/* 15007AD7 */
+	for (count = 0; count < channels; count++) {
+
+		/* some common variables. */
+		int32_t temp;
+
+		/* save pointer. */
+		temp = *(int16_t *)in.pw++;
+		nr_array2[count] = temp;
+
+		/* check if should break. */
+		if (out_length < 2) {
+			return out.pb - out_buf;
+		}
+
+		/* return values. */
+		*out.pw++   = (uint16_t)temp;
+		out_length -= 2;
+	}
+
+	/* decrease channels. */
+	index = channels - 1;
+
+	/* loop through input buffer until end reached. */
+	while (in.pb < in_end) {
+
+		/* save the byte. */
+		uint8_t one_byte = *in.pb++;
+
+		/* check how many channels and set index. */
+		if (channels == 2) {
+			index = (index == 0) ? 1 : 0;
+		}
+
+		/* 15007B25 - get one byte from input buffer. */
+		if (one_byte & 0x80) {
+
+			/* 15007B32 */
+			switch (one_byte & 0x7F) {
+				case 0:
+
+					/* 15007B8E */
+					if (nr_array1[index] != 0) {
+						nr_array1[index]--;
+					}
+
+					/* check if should break. */
+					if (out_length < 2) {
+						break;
+					}
+
+					/* return values. */
+					*out.pw++ = (uint16_t)nr_array2[index];
+					out_length -= 2;
+
+					/* continue loop. */
+					continue;
+				case 1:
+					/* 15007B72 and EBX. */
+					nr_array1[index] += 8;
+
+					/* check index. */
+					if (nr_array1[index] > 0x58) {
+						nr_array1[index] = 0x58;
+					}
+
+					/* check how many channels and set index. */
+					if (channels == 2) {
+						index = (index == 0) ? 1 : 0;
+					}
+
+					/* continue loop. */
+					continue;
+				case 2:
+
+					/* nothing todo, so continue. */
+					continue;
+				default:
+
+					/* decrease index. */
+					nr_array1[index] -= 8;
+
+					/* check index. */
+					if (nr_array1[index] < 0) {
+						nr_array1[index] = 0;
+					}
+
+					/* check if two channels left. */
+					if (channels != 2) {
+						continue;
+					}
+					index = (index == 0) ? 1 : 0;
+
+					/* continue loop. */
+					continue;
+			}
+		} else {
+
+			/* EDI */
+			uint32_t temp1 = wave_table_1503f1a0[nr_array1[index]];
+
+			/* ESI */
+			uint32_t temp2 = temp1 >> in_buf[1];
+
+			/* ECX */
+			int32_t temp3 = nr_array2[index];
+
+			/* EBX = one byte. */
+			if (one_byte & 0x01) {
+				temp2 += (temp1 >> 0);
+			}
+			if (one_byte & 0x02) {
+				temp2 += (temp1 >> 1);
+			}
+			if (one_byte & 0x04) {
+				temp2 += (temp1 >> 2);
+			}
+			if (one_byte & 0x08) {
+				temp2 += (temp1 >> 3);
+			}
+			if (one_byte & 0x10) {
+				temp2 += (temp1 >> 4);
+			}
+			if (one_byte & 0x20) {
+				temp2 += (temp1 >> 5);
+			}
+			if (one_byte & 0x40) {
+				temp3 -= temp2;
+				if (temp3 <= (int32_t)0xFFFF8000) {
+					temp3 = (int32_t)0xFFFF8000;
+				}
+			} else {
+				temp3 += temp2;
+				if (temp3 >= 0x7FFF) {
+					temp3 = 0x7FFF;
+				}
+			}
+
+			/* restore index. */
+			nr_array2[index] = temp3;
+
+			/* check if should break. */
+			if (out_length < 2) {
+				break;
+			}
+
+			/* assign values. */
+			temp2             = nr_array1[index];
+			one_byte         &= 0x1F;
+			*out.pw++         = (uint16_t)temp3;
+			out_length       -= 2;
+			temp2            += wave_table_1503f120[one_byte];
+			nr_array1[index]  = temp2;
+
+			/* check index. */
+			if (nr_array1[index] < 0) {
+				nr_array1[index] = 0;
+			} else {
+
+				/* check index. */
+				if (nr_array1[index] > 0x58) {
+					nr_array1[index] = 0x58;
+				}
+			}
+		}
+	}
+
+	/* return copied bytes. */
+	return (out.pb - out_buf);
+}
diff --git a/externals/libmpq/wave.h b/externals/libmpq/wave.h
new file mode 100644
index 00000000000..1b9491bd70a
--- /dev/null
+++ b/externals/libmpq/wave.h
@@ -0,0 +1,45 @@
+/*
+ *  wave.h -- header file for wav unplode functions used by mpq-tools.
+ *
+ *  Copyright (c) 2003-2007 Maik Broemme 
+ *
+ *  This source was adepted from the C++ version of wave.h included
+ *  in stormlib. The C++ version belongs to the following authors:
+ *
+ *  Ladislav Zezula 
+ *  Tom Amigo 
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */       
+
+#ifndef _WAVE_H
+#define _WAVE_H
+
+/* buffer. */
+typedef union {
+	uint16_t	*pw;
+	uint8_t		*pb;
+} byte_and_int16_t;
+
+/* decompress a wave file, mono or stereo, 1500F230 offset. */
+int32_t libmpq__do_decompress_wave(
+	uint8_t		*out_buf,
+	int32_t		out_length,
+	uint8_t		*in_buf,
+	int32_t		in_length,
+	int32_t		channels
+);
+
+#endif						/* _WAVE_H */
diff --git a/src/server/scripts/CMakeLists.txt b/src/server/scripts/CMakeLists.txt
index b718a52326c..6e757b95243 100644
--- a/src/server/scripts/CMakeLists.txt
+++ b/src/server/scripts/CMakeLists.txt
@@ -637,6 +637,6 @@ add_library(scripts STATIC ${scripts_STAT_SRCS})
 
 # Generate precompiled header
 IF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX)
-	ADD_PRECOMPILED_HEADER(scripts ${CMAKE_SOURCE_DIR}/src/server/game/ScriptMgr/ScriptedPch.h)
+	ADD_PRECOMPILED_HEADER(scripts ${CMAKE_SOURCE_DIR}/src/server/game/Scripts/ScriptPCH.h)
 ENDIF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX)
 
-- 
cgit v1.2.3


From b76b6700edeac8f7b036e39400cbfb6bd1a22c33 Mon Sep 17 00:00:00 2001
From: Brian 
Date: Tue, 8 Jun 2010 13:05:47 -0600
Subject: * Linux compile with and without PCH fixed * Script library compile
 fixed * --todo: fix all scripts themselves :)

--HG--
branch : trunk
---
 src/server/game/AI/CoreAI/GuardAI.cpp              |  2 +-
 src/server/game/AI/CoreAI/GuardAI.h                |  2 +-
 src/server/game/AI/CoreAI/PetAI.cpp                |  4 +-
 src/server/game/AI/CoreAI/PetAI.h                  |  2 +-
 src/server/game/AI/CoreAI/ReactorAI.cpp            |  6 +--
 src/server/game/AI/CoreAI/TotemAI.cpp              |  6 +--
 src/server/game/AI/CoreAI/TotemAI.h                |  2 +-
 src/server/game/AI/CreatureAI.h                    |  2 +-
 src/server/game/AI/CreatureAIFactory.h             |  4 +-
 src/server/game/AI/CreatureAIRegistry.cpp          | 18 ++++-----
 src/server/game/AI/CreatureAISelector.cpp          |  4 +-
 src/server/game/AI/EventAI/CreatureEventAI.cpp     |  8 ++--
 src/server/game/AI/EventAI/CreatureEventAIMgr.cpp  | 10 ++---
 src/server/game/Accounts/AccountMgr.cpp            |  8 ++--
 src/server/game/Accounts/AccountMgr.h              |  2 +-
 src/server/game/Achievements/AchievementMgr.cpp    | 20 +++++-----
 src/server/game/Achievements/AchievementMgr.h      |  4 +-
 src/server/game/Addons/AddonMgr.cpp                | 10 ++---
 src/server/game/Addons/AddonMgr.h                  |  2 +-
 .../AuctionHouseBot/AuctionHouseBot.cpp            |  2 +-
 .../AuctionHouse/AuctionHouseBot/AuctionHouseBot.h |  2 +-
 src/server/game/AuctionHouse/AuctionHouseMgr.cpp   | 14 +++----
 src/server/game/AuctionHouse/AuctionHouseMgr.h     |  6 +--
 src/server/game/BattleGrounds/ArenaTeam.cpp        |  2 +-
 src/server/game/BattleGrounds/BattleGround.cpp     | 10 ++---
 src/server/game/BattleGrounds/BattleGround.h       |  4 +-
 src/server/game/BattleGrounds/BattleGroundMgr.cpp  | 36 ++++++++---------
 src/server/game/BattleGrounds/BattleGroundMgr.h    |  2 +-
 .../game/BattleGrounds/Zones/BattleGroundAA.cpp    |  2 +-
 .../game/BattleGrounds/Zones/BattleGroundAB.cpp    |  6 +--
 .../game/BattleGrounds/Zones/BattleGroundAV.cpp    |  2 +-
 .../game/BattleGrounds/Zones/BattleGroundBE.cpp    |  4 +-
 .../game/BattleGrounds/Zones/BattleGroundDS.cpp    |  4 +-
 .../game/BattleGrounds/Zones/BattleGroundEY.cpp    |  6 +--
 .../game/BattleGrounds/Zones/BattleGroundEY.h      |  2 +-
 .../game/BattleGrounds/Zones/BattleGroundIC.cpp    |  2 +-
 .../game/BattleGrounds/Zones/BattleGroundNA.cpp    |  4 +-
 .../game/BattleGrounds/Zones/BattleGroundRB.cpp    |  2 +-
 .../game/BattleGrounds/Zones/BattleGroundRL.cpp    |  4 +-
 .../game/BattleGrounds/Zones/BattleGroundRV.cpp    |  4 +-
 .../game/BattleGrounds/Zones/BattleGroundSA.cpp    |  4 +-
 .../game/BattleGrounds/Zones/BattleGroundWS.cpp    |  4 +-
 src/server/game/CMakeLists.txt                     |  4 +-
 src/server/game/Chat/Channels/Channel.h            |  4 +-
 src/server/game/Chat/Channels/ChannelMgr.cpp       |  2 +-
 src/server/game/Chat/Channels/ChannelMgr.h         |  5 +--
 src/server/game/Chat/Chat.cpp                      | 18 ++++-----
 src/server/game/Chat/Chat.h                        |  2 +-
 src/server/game/Combat/ThreatManager.h             |  6 +--
 src/server/game/DataStores/DBCStores.h             |  4 +-
 src/server/game/Entities/Corpse/Corpse.h           |  4 +-
 src/server/game/Entities/Creature/Creature.h       |  6 +--
 src/server/game/Entities/Creature/GossipDef.h      |  2 +-
 src/server/game/Entities/GameObject/GameObject.h   |  4 +-
 src/server/game/Entities/Object/Object.h           |  8 ++--
 src/server/game/Entities/Player/Player.h           | 24 ++++++------
 src/server/game/Entities/Unit/Unit.h               | 16 ++++----
 src/server/game/Events/GameEventMgr.h              |  2 +-
 src/server/game/Globals/ObjectAccessor.h           | 10 ++---
 src/server/game/Globals/ObjectMgr.h                | 12 +++---
 src/server/game/Grids/Cells/Cell.h                 |  2 +-
 src/server/game/Grids/GridDefines.h                |  2 +-
 src/server/game/Grids/NGrid.h                      |  8 ++--
 src/server/game/Grids/Notifiers/GridNotifiers.h    |  8 ++--
 .../game/Grids/Notifiers/GridNotifiersImpl.h       |  6 +--
 src/server/game/Grids/ObjectGridLoader.h           |  8 ++--
 src/server/game/Loot/LootMgr.h                     |  8 ++--
 src/server/game/Maps/Map.h                         | 12 +++---
 src/server/game/Movement/MotionMaster.h            |  2 +-
 src/server/game/PrecompiledHeaders/NixCorePCH.cpp  |  2 +-
 src/server/game/PrecompiledHeaders/WinCorePCH.h    |  2 +-
 src/server/game/Reputation/ReputationMgr.h         |  8 ++--
 src/server/game/Server/Protocol/Opcodes.h          |  2 +-
 src/server/game/Server/WorldSession.h              |  8 ++--
 src/server/game/Spells/Spell.h                     |  4 +-
 src/server/game/Spells/SpellMgr.h                  |  6 +--
 src/server/game/World/World.h                      |  8 ++--
 src/server/scripts/CMakeLists.txt                  | 45 ++++++++++++++++++----
 src/server/scripts/Custom/on_events.cpp            |  2 +-
 .../AlteracValley/alterac_valley.cpp               |  2 +-
 .../shared/Dynamic/CountedReference/Reference.h    |  4 +-
 src/server/shared/Dynamic/TypeContainer.h          |  2 +-
 82 files changed, 278 insertions(+), 250 deletions(-)

(limited to 'src')

diff --git a/src/server/game/AI/CoreAI/GuardAI.cpp b/src/server/game/AI/CoreAI/GuardAI.cpp
index f4da814e86b..19d5b5d8354 100644
--- a/src/server/game/AI/CoreAI/GuardAI.cpp
+++ b/src/server/game/AI/CoreAI/GuardAI.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "GuardAI.h"
-#include "Debugging/Errors.h"
+#include "Errors.h"
 #include "Player.h"
 #include "ObjectAccessor.h"
 #include "World.h"
diff --git a/src/server/game/AI/CoreAI/GuardAI.h b/src/server/game/AI/CoreAI/GuardAI.h
index 3d884e28906..73e3692a770 100644
--- a/src/server/game/AI/CoreAI/GuardAI.h
+++ b/src/server/game/AI/CoreAI/GuardAI.h
@@ -22,7 +22,7 @@
 #define TRINITY_GUARDAI_H
 
 #include "CreatureAI.h"
-#include "Utilities/Timer.h"
+#include "Timer.h"
 
 class Creature;
 
diff --git a/src/server/game/AI/CoreAI/PetAI.cpp b/src/server/game/AI/CoreAI/PetAI.cpp
index 72f0db20cb5..09ec8fae53f 100644
--- a/src/server/game/AI/CoreAI/PetAI.cpp
+++ b/src/server/game/AI/CoreAI/PetAI.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "PetAI.h"
-#include "Debugging/Errors.h"
+#include "Errors.h"
 #include "Pet.h"
 #include "Player.h"
 #include "DBCStores.h"
@@ -28,7 +28,7 @@
 #include "SpellMgr.h"
 #include "Creature.h"
 #include "World.h"
-#include "Utilities/Util.h"
+#include "Util.h"
 
 int PetAI::Permissible(const Creature *creature)
 {
diff --git a/src/server/game/AI/CoreAI/PetAI.h b/src/server/game/AI/CoreAI/PetAI.h
index 52568999cd1..f6087a129ae 100644
--- a/src/server/game/AI/CoreAI/PetAI.h
+++ b/src/server/game/AI/CoreAI/PetAI.h
@@ -22,7 +22,7 @@
 #define TRINITY_PETAI_H
 
 #include "CreatureAI.h"
-#include "Utilities/Timer.h"
+#include "Timer.h"
 
 class Creature;
 class Spell;
diff --git a/src/server/game/AI/CoreAI/ReactorAI.cpp b/src/server/game/AI/CoreAI/ReactorAI.cpp
index f5e3739ccbf..fdca6314747 100644
--- a/src/server/game/AI/CoreAI/ReactorAI.cpp
+++ b/src/server/game/AI/CoreAI/ReactorAI.cpp
@@ -18,10 +18,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "Packets/ByteBuffer.h"
+#include "ByteBuffer.h"
 #include "ReactorAI.h"
-#include "Debugging/Errors.h"
-#include "Logging/Log.h"
+#include "Errors.h"
+#include "Log.h"
 #include "ObjectAccessor.h"
 #include "CreatureAIImpl.h"
 
diff --git a/src/server/game/AI/CoreAI/TotemAI.cpp b/src/server/game/AI/CoreAI/TotemAI.cpp
index 58045153efd..a6464f189e8 100644
--- a/src/server/game/AI/CoreAI/TotemAI.cpp
+++ b/src/server/game/AI/CoreAI/TotemAI.cpp
@@ -25,9 +25,9 @@
 #include "ObjectAccessor.h"
 #include "SpellMgr.h"
 
-#include "Grids/Notifiers/GridNotifiers.h"
-#include "Grids/Notifiers/GridNotifiersImpl.h"
-#include "Grids/Cells/CellImpl.h"
+#include "GridNotifiers.h"
+#include "GridNotifiersImpl.h"
+#include "CellImpl.h"
 
 int
 TotemAI::Permissible(const Creature *creature)
diff --git a/src/server/game/AI/CoreAI/TotemAI.h b/src/server/game/AI/CoreAI/TotemAI.h
index 63459ace023..34f4dfa9945 100644
--- a/src/server/game/AI/CoreAI/TotemAI.h
+++ b/src/server/game/AI/CoreAI/TotemAI.h
@@ -22,7 +22,7 @@
 #define TRINITY_TOTEMAI_H
 
 #include "CreatureAI.h"
-#include "Utilities/Timer.h"
+#include "Timer.h"
 
 class Creature;
 class Totem;
diff --git a/src/server/game/AI/CreatureAI.h b/src/server/game/AI/CreatureAI.h
index 58020c785dd..c03d3dd09d0 100644
--- a/src/server/game/AI/CreatureAI.h
+++ b/src/server/game/AI/CreatureAI.h
@@ -21,7 +21,7 @@
 #ifndef TRINITY_CREATUREAI_H
 #define TRINITY_CREATUREAI_H
 
-#include "AI/CoreAI/UnitAI.h"
+#include "UnitAI.h"
 #include "Common.h"
 
 class WorldObject;
diff --git a/src/server/game/AI/CreatureAIFactory.h b/src/server/game/AI/CreatureAIFactory.h
index 6aa69eaaa29..bc3b9628010 100644
--- a/src/server/game/AI/CreatureAIFactory.h
+++ b/src/server/game/AI/CreatureAIFactory.h
@@ -21,8 +21,8 @@
 #define TRINITY_CREATUREAIFACTORY_H
 
 //#include "Policies/Singleton.h"
-#include "Dynamic/ObjectRegistry.h"
-#include "Dynamic/FactoryHolder.h"
+#include "ObjectRegistry.h"
+#include "FactoryHolder.h"
 
 struct SelectableAI : public FactoryHolder, public Permissible
 {
diff --git a/src/server/game/AI/CreatureAIRegistry.cpp b/src/server/game/AI/CreatureAIRegistry.cpp
index 7b96e7a97d1..9db30a0a5c4 100644
--- a/src/server/game/AI/CreatureAIRegistry.cpp
+++ b/src/server/game/AI/CreatureAIRegistry.cpp
@@ -18,15 +18,15 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "CoreAI/PassiveAI.h"
-#include "CoreAI/ReactorAI.h"
-#include "CoreAI/CombatAI.h"
-#include "CoreAI/GuardAI.h"
-#include "CoreAI/PetAI.h"
-#include "CoreAI/TotemAI.h"
-#include "EventAI/CreatureEventAI.h"
-#include "Movement/MovementGenerators/RandomMovementGenerator.h"
-#include "Movement/MovementGeneratorImpl.h"
+#include "PassiveAI.h"
+#include "ReactorAI.h"
+#include "CombatAI.h"
+#include "GuardAI.h"
+#include "PetAI.h"
+#include "TotemAI.h"
+#include "CreatureEventAI.h"
+#include "RandomMovementGenerator.h"
+#include "MovementGeneratorImpl.h"
 #include "CreatureAIRegistry.h"
 #include "WaypointMovementGenerator.h"
 #include "CreatureAIFactory.h"
diff --git a/src/server/game/AI/CreatureAISelector.cpp b/src/server/game/AI/CreatureAISelector.cpp
index 6985edaaf2b..79977fab5b1 100644
--- a/src/server/game/AI/CreatureAISelector.cpp
+++ b/src/server/game/AI/CreatureAISelector.cpp
@@ -20,8 +20,8 @@
 
 #include "Creature.h"
 #include "CreatureAISelector.h"
-#include "AI/CoreAI/PassiveAI.h"
-#include "Policies/SingletonImp.h"
+#include "PassiveAI.h"
+#include "SingletonImp.h"
 #include "MovementGenerator.h"
 #include "Pet.h"
 #include "TemporarySummon.h"
diff --git a/src/server/game/AI/EventAI/CreatureEventAI.cpp b/src/server/game/AI/EventAI/CreatureEventAI.cpp
index 4162a002d99..47c8e9e6ad8 100644
--- a/src/server/game/AI/EventAI/CreatureEventAI.cpp
+++ b/src/server/game/AI/EventAI/CreatureEventAI.cpp
@@ -24,11 +24,11 @@
 #include "ObjectMgr.h"
 #include "Spell.h"
 #include "World.h"
-#include "Grids/Cells/Cell.h"
-#include "Grids/Cells/CellImpl.h"
+#include "Cell.h"
+#include "CellImpl.h"
 #include "GameEventMgr.h"
-#include "Grids/Notifiers/GridNotifiers.h"
-#include "Grids/Notifiers/GridNotifiersImpl.h"
+#include "GridNotifiers.h"
+#include "GridNotifiersImpl.h"
 #include "InstanceData.h"
 #include "SpellMgr.h"
 #include "CreatureAIImpl.h"
diff --git a/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp b/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
index f24226ee913..57c23c9a26b 100644
--- a/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
+++ b/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
@@ -17,15 +17,15 @@
  */
 
 #include "Common.h"
-#include "Database/DatabaseEnv.h"
-#include "Database/SQLStorage.h"
+#include "DatabaseEnv.h"
+#include "SQLStorage.h"
 #include "CreatureEventAI.h"
 #include "CreatureEventAIMgr.h"
 #include "ObjectMgr.h"
-#include "Utilities/ProgressBar.h"
-#include "Policies/SingletonImp.h"
+#include "ProgressBar.h"
+#include "SingletonImp.h"
 #include "ObjectDefines.h"
-#include "Grids/GridDefines.h"
+#include "GridDefines.h"
 #include "ConditionMgr.h"
 
 INSTANTIATE_SINGLETON_1(CreatureEventAIMgr);
diff --git a/src/server/game/Accounts/AccountMgr.cpp b/src/server/game/Accounts/AccountMgr.cpp
index 8089b4d624d..18372677120 100644
--- a/src/server/game/Accounts/AccountMgr.cpp
+++ b/src/server/game/Accounts/AccountMgr.cpp
@@ -18,14 +18,14 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "Database/DatabaseEnv.h"
-#include "Policies/SingletonImp.h"
+#include "DatabaseEnv.h"
+#include "SingletonImp.h"
 
 #include "AccountMgr.h"
 #include "ObjectAccessor.h"
 #include "Player.h"
-#include "Utilities/Util.h"
-#include "Cryptography/SHA1.h"
+#include "Util.h"
+#include "SHA1.h"
 
 extern DatabaseType LoginDatabase;
 
diff --git a/src/server/game/Accounts/AccountMgr.h b/src/server/game/Accounts/AccountMgr.h
index b017bf1836a..f770e24d902 100644
--- a/src/server/game/Accounts/AccountMgr.h
+++ b/src/server/game/Accounts/AccountMgr.h
@@ -24,7 +24,7 @@
 #include 
 
 #include "Common.h"
-#include "Policies/Singleton.h"
+#include "Singleton.h"
 
 enum AccountOpResult
 {
diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp
index 9f449105005..e30f6ed35df 100644
--- a/src/server/game/Achievements/AchievementMgr.cpp
+++ b/src/server/game/Achievements/AchievementMgr.cpp
@@ -20,24 +20,24 @@
 #include "DBCEnums.h"
 #include "ObjectMgr.h"
 #include "World.h"
-#include "Packets/WorldPacket.h"
-#include "Database/DatabaseEnv.h"
-#include "Policies/SingletonImp.h"
+#include "WorldPacket.h"
+#include "DatabaseEnv.h"
+#include "SingletonImp.h"
 
 #include "AchievementMgr.h"
 #include "ArenaTeam.h"
-#include "Grids/Cells/CellImpl.h"
-#include "Events/GameEventMgr.h"
-#include "Grids/Notifiers/GridNotifiersImpl.h"
-#include "Guilds/Guild.h"
-#include "Miscellaneous/Language.h"
+#include "CellImpl.h"
+#include "GameEventMgr.h"
+#include "GridNotifiersImpl.h"
+#include "Guild.h"
+#include "Language.h"
 #include "Player.h"
-#include "Utilities/ProgressBar.h"
+#include "ProgressBar.h"
 #include "SpellMgr.h"
 
 #include "MapManager.h"
 #include "BattleGround.h"
-#include "BattleGrounds/Zones/BattleGroundAB.h"
+#include "BattleGroundAB.h"
 #include "Map.h"
 #include "InstanceData.h"
 
diff --git a/src/server/game/Achievements/AchievementMgr.h b/src/server/game/Achievements/AchievementMgr.h
index ea9e5e95142..6e27a3da068 100644
--- a/src/server/game/Achievements/AchievementMgr.h
+++ b/src/server/game/Achievements/AchievementMgr.h
@@ -22,8 +22,8 @@
 #include 
 
 #include "Common.h"
-#include "Policies/Singleton.h"
-#include "Database/DatabaseEnv.h"
+#include "Singleton.h"
+#include "DatabaseEnv.h"
 #include "DBCEnums.h"
 #include "DBCStores.h"
 
diff --git a/src/server/game/Addons/AddonMgr.cpp b/src/server/game/Addons/AddonMgr.cpp
index b87ddd023f7..b7b1d2e9333 100644
--- a/src/server/game/Addons/AddonMgr.cpp
+++ b/src/server/game/Addons/AddonMgr.cpp
@@ -18,15 +18,15 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "Database/DatabaseEnv.h"
-#include "Policies/SingletonImp.h"
+#include "DatabaseEnv.h"
+#include "SingletonImp.h"
 
 #include "AddonMgr.h"
 #include "ObjectAccessor.h"
 #include "Player.h"
-#include "Utilities/Util.h"
-#include "Cryptography/SHA1.h"
-#include "Utilities/ProgressBar.h"
+#include "Util.h"
+#include "SHA1.h"
+#include "ProgressBar.h"
 
 extern DatabaseType LoginDatabase;
 
diff --git a/src/server/game/Addons/AddonMgr.h b/src/server/game/Addons/AddonMgr.h
index 8f5eed4918f..0d648794416 100644
--- a/src/server/game/Addons/AddonMgr.h
+++ b/src/server/game/Addons/AddonMgr.h
@@ -22,7 +22,7 @@
 #define _ADDONMGR_H
 
 #include "Common.h"
-#include "Policies/Singleton.h"
+#include "Singleton.h"
 
 #include 
 
diff --git a/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.cpp b/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.cpp
index ebbf48e6476..e9cf8f21ab2 100644
--- a/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.cpp
+++ b/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.cpp
@@ -3,7 +3,7 @@
 #include "AuctionHouseBot.h"
 #include 
 
-#include "Policies/SingletonImp.h"
+#include "SingletonImp.h"
 INSTANTIATE_SINGLETON_1(AuctionHouseBot);
 
 using namespace std;
diff --git a/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.h b/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.h
index 08e93fca232..f29a8762513 100644
--- a/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.h
+++ b/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.h
@@ -2,7 +2,7 @@
 #define AUCTION_HOUSE_BOT_H
 
 #include "World.h"
-#include "Configuration/ConfigEnv.h"
+#include "ConfigEnv.h"
 #include "ItemPrototype.h"
 
 #define AHB_GREY        0
diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp
index 5f00d36ba45..744df2cb6e7 100644
--- a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp
+++ b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp
@@ -20,19 +20,19 @@
 #include "ObjectMgr.h"
 #include "Player.h"
 #include "World.h"
-#include "Packets/WorldPacket.h"
-#include "Server/WorldSession.h"
-#include "Database/DatabaseEnv.h"
-#include "Database/SQLStorage.h"
-#include "Policies/SingletonImp.h"
+#include "WorldPacket.h"
+#include "WorldSession.h"
+#include "DatabaseEnv.h"
+#include "SQLStorage.h"
+#include "SingletonImp.h"
 #include "DBCStores.h"
 
 #include "AccountMgr.h"
 #include "AuctionHouseMgr.h"
 #include "Item.h"
-#include "Miscellaneous/Language.h"
+#include "Language.h"
 #include "Logging/Log.h"
-#include "Utilities/ProgressBar.h"
+#include "ProgressBar.h"
 #include 
 
 INSTANTIATE_SINGLETON_1(AuctionHouseMgr);
diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.h b/src/server/game/AuctionHouse/AuctionHouseMgr.h
index 2c29986f87a..7048e419c36 100644
--- a/src/server/game/AuctionHouse/AuctionHouseMgr.h
+++ b/src/server/game/AuctionHouse/AuctionHouseMgr.h
@@ -21,11 +21,11 @@
 #ifndef _AUCTION_HOUSE_MGR_H
 #define _AUCTION_HOUSE_MGR_H
 
-#include "Policies/Singleton.h"
+#include "Singleton.h"
 
-#include "Miscellaneous/SharedDefines.h"
+#include "SharedDefines.h"
 
-#include "AuctionHouse/AuctionHouseBot/AuctionHouseBot.h"
+#include "AuctionHouseBot.h"
 
 class Item;
 class Player;
diff --git a/src/server/game/BattleGrounds/ArenaTeam.cpp b/src/server/game/BattleGrounds/ArenaTeam.cpp
index b5fe5c16dfe..4224ff6357a 100644
--- a/src/server/game/BattleGrounds/ArenaTeam.cpp
+++ b/src/server/game/BattleGrounds/ArenaTeam.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "ObjectMgr.h"
-#include "Packets/WorldPacket.h"
+#include "WorldPacket.h"
 
 #include "ArenaTeam.h"
 #include "World.h"
diff --git a/src/server/game/BattleGrounds/BattleGround.cpp b/src/server/game/BattleGrounds/BattleGround.cpp
index ed8ad8b62a8..591417c8fea 100644
--- a/src/server/game/BattleGrounds/BattleGround.cpp
+++ b/src/server/game/BattleGrounds/BattleGround.cpp
@@ -21,21 +21,21 @@
 #include "Player.h"
 #include "ObjectMgr.h"
 #include "World.h"
-#include "Packets/WorldPacket.h"
+#include "WorldPacket.h"
 
 #include "ArenaTeam.h"
 #include "BattleGround.h"
 #include "BattleGroundMgr.h"
 #include "Creature.h"
-#include "Miscellaneous/Formulas.h"
-#include "Grids/Notifiers/GridNotifiersImpl.h"
+#include "Formulas.h"
+#include "GridNotifiersImpl.h"
 #include "Group.h"
-#include "Miscellaneous/Language.h"
+#include "Language.h"
 #include "MapManager.h"
 #include "Object.h"
 #include "SpellAuras.h"
 #include "SpellAuraEffects.h"
-#include "Utilities/Util.h"
+#include "Util.h"
 
 namespace Trinity
 {
diff --git a/src/server/game/BattleGrounds/BattleGround.h b/src/server/game/BattleGrounds/BattleGround.h
index 36fdb18f1bc..6f46b6f8f6d 100644
--- a/src/server/game/BattleGrounds/BattleGround.h
+++ b/src/server/game/BattleGrounds/BattleGround.h
@@ -22,8 +22,8 @@
 #define __BATTLEGROUND_H
 
 #include "Common.h"
-#include "Miscellaneous/SharedDefines.h"
-#include "DataStores/DBCEnums.h"
+#include "SharedDefines.h"
+#include "DBCEnums.h"
 
 class Creature;
 class GameObject;
diff --git a/src/server/game/BattleGrounds/BattleGroundMgr.cpp b/src/server/game/BattleGrounds/BattleGroundMgr.cpp
index faf8b517f15..ea2d0c2f920 100644
--- a/src/server/game/BattleGrounds/BattleGroundMgr.cpp
+++ b/src/server/game/BattleGrounds/BattleGroundMgr.cpp
@@ -21,33 +21,33 @@
 #include "Common.h"
 #include "ObjectMgr.h"
 #include "World.h"
-#include "Packets/WorldPacket.h"
-#include "Policies/SingletonImp.h"
+#include "WorldPacket.h"
+#include "SingletonImp.h"
 
 #include "ArenaTeam.h"
 #include "BattleGroundMgr.h"
-#include "Zones/BattleGroundAV.h"
-#include "Zones/BattleGroundAB.h"
-#include "Zones/BattleGroundEY.h"
-#include "Zones/BattleGroundWS.h"
-#include "Zones/BattleGroundNA.h"
-#include "Zones/BattleGroundBE.h"
-#include "Zones/BattleGroundAA.h"
-#include "Zones/BattleGroundRL.h"
-#include "Zones/BattleGroundSA.h"
-#include "Zones/BattleGroundDS.h"
-#include "Zones/BattleGroundRV.h"
-#include "Zones/BattleGroundIC.h"
-#include "Zones/BattleGroundRB.h"
+#include "BattleGroundAV.h"
+#include "BattleGroundAB.h"
+#include "BattleGroundEY.h"
+#include "BattleGroundWS.h"
+#include "BattleGroundNA.h"
+#include "BattleGroundBE.h"
+#include "BattleGroundAA.h"
+#include "BattleGroundRL.h"
+#include "BattleGroundSA.h"
+#include "BattleGroundDS.h"
+#include "BattleGroundRV.h"
+#include "BattleGroundIC.h"
+#include "BattleGroundRB.h"
 #include "Chat.h"
 #include "Map.h"
 #include "MapInstanced.h"
 #include "MapManager.h"
 #include "Player.h"
 #include "GameEventMgr.h"
-#include "Utilities/ProgressBar.h"
-#include "Miscellaneous/SharedDefines.h"
-#include "Miscellaneous/Formulas.h"
+#include "ProgressBar.h"
+#include "SharedDefines.h"
+#include "Formulas.h"
 
 INSTANTIATE_SINGLETON_1(BattleGroundMgr);
 
diff --git a/src/server/game/BattleGrounds/BattleGroundMgr.h b/src/server/game/BattleGrounds/BattleGroundMgr.h
index 569651a95b3..5319ce85752 100644
--- a/src/server/game/BattleGrounds/BattleGroundMgr.h
+++ b/src/server/game/BattleGrounds/BattleGroundMgr.h
@@ -22,7 +22,7 @@
 #define __BATTLEGROUNDMGR_H
 
 #include "Common.h"
-#include "Policies/Singleton.h"
+#include "Singleton.h"
 
 #include "DBCEnums.h"
 #include "BattleGround.h"
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundAA.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundAA.cpp
index 9b2dd152c5e..56cf3ebed15 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundAA.cpp
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundAA.cpp
@@ -20,7 +20,7 @@
 
 #include "BattleGround.h"
 #include "BattleGroundAA.h"
-#include "Miscellaneous/Language.h"
+#include "Language.h"
 #include "Player.h"
 
 BattleGroundAA::BattleGroundAA()
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundAB.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundAB.cpp
index 549b844cd20..38671e85597 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundAB.cpp
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundAB.cpp
@@ -19,16 +19,16 @@
  */
 
 #include "World.h"
-#include "Packets/WorldPacket.h"
+#include "WorldPacket.h"
 #include "ObjectMgr.h"
 #include "BattleGroundMgr.h"
 #include "BattleGround.h"
 #include "BattleGroundAB.h"
 #include "Creature.h"
-#include "Miscellaneous/Language.h"
+#include "Language.h"
 #include "Object.h"
 #include "Player.h"
-#include "Utilities/Util.h"
+#include "Util.h"
 
 // these variables aren't used outside of this file, so declare them only here
 uint32 BG_AB_HonorScoreTicks[BG_HONOR_MODE_NUM] = {
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundAV.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundAV.cpp
index 32334840f51..b477d6723fe 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundAV.cpp
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundAV.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "ObjectMgr.h"
-#include "Packets/WorldPacket.h"
+#include "WorldPacket.h"
 
 #include "BattleGround.h"
 #include "BattleGroundAV.h"
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundBE.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundBE.cpp
index e5199115bcd..d6debe45ae3 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundBE.cpp
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundBE.cpp
@@ -20,11 +20,11 @@
 
 #include "BattleGround.h"
 #include "BattleGroundBE.h"
-#include "Miscellaneous/Language.h"
+#include "Language.h"
 #include "Object.h"
 #include "ObjectMgr.h"
 #include "Player.h"
-#include "Packets/WorldPacket.h"
+#include "WorldPacket.h"
 
 BattleGroundBE::BattleGroundBE()
 {
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundDS.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundDS.cpp
index 8a4ca9fb497..9036ef83f93 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundDS.cpp
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundDS.cpp
@@ -18,11 +18,11 @@
 
 #include "BattleGround.h"
 #include "BattleGroundDS.h"
-#include "Miscellaneous/Language.h"
+#include "Language.h"
 #include "Player.h"
 #include "Object.h"
 #include "ObjectMgr.h"
-#include "Packets/WorldPacket.h"
+#include "WorldPacket.h"
 
 BattleGroundDS::BattleGroundDS()
 {
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundEY.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundEY.cpp
index a81a54f6b98..20f023e4c2a 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundEY.cpp
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundEY.cpp
@@ -20,15 +20,15 @@
 
 #include "ObjectMgr.h"
 #include "World.h"
-#include "Packets/WorldPacket.h"
+#include "WorldPacket.h"
 #include "BattleGroundMgr.h"
 #include "BattleGround.h"
 #include "BattleGroundEY.h"
 #include "Creature.h"
-#include "Miscellaneous/Language.h"
+#include "Language.h"
 #include "Object.h"
 #include "Player.h"
-#include "Utilities/Util.h"
+#include "Util.h"
 
 // these variables aren't used outside of this file, so declare them only here
 uint32 BG_EY_HonorScoreTicks[BG_HONOR_MODE_NUM] = {
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundEY.h b/src/server/game/BattleGrounds/Zones/BattleGroundEY.h
index d4bd89552be..4fe23c4c821 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundEY.h
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundEY.h
@@ -21,7 +21,7 @@
 #ifndef __BATTLEGROUNDEY_H
 #define __BATTLEGROUNDEY_H
 
-#include "Miscellaneous/Language.h"
+#include "Language.h"
 
 class BattleGround;
 
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundIC.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundIC.cpp
index 8e759046f47..8dbcc81e5c6 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundIC.cpp
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundIC.cpp
@@ -19,7 +19,7 @@
 #include "Player.h"
 #include "BattleGround.h"
 #include "BattleGroundIC.h"
-#include "Miscellaneous/Language.h"
+#include "Language.h"
 
 BattleGroundIC::BattleGroundIC()
 {
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundNA.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundNA.cpp
index 09f8fef44de..793cf13b3cb 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundNA.cpp
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundNA.cpp
@@ -20,11 +20,11 @@
 
 #include "BattleGround.h"
 #include "BattleGroundNA.h"
-#include "Miscellaneous/Language.h"
+#include "Language.h"
 #include "Object.h"
 #include "ObjectMgr.h"
 #include "Player.h"
-#include "Packets/WorldPacket.h"
+#include "WorldPacket.h"
 
 BattleGroundNA::BattleGroundNA()
 {
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundRB.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundRB.cpp
index 2777268a33c..cf22154ed11 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundRB.cpp
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundRB.cpp
@@ -21,7 +21,7 @@
 #include "Player.h"
 #include "BattleGround.h"
 #include "BattleGroundRB.h"
-#include "Miscellaneous/Language.h"
+#include "Language.h"
 
 BattleGroundRB::BattleGroundRB()
 {
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundRL.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundRL.cpp
index 94374ace289..ef2ec3cfa94 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundRL.cpp
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundRL.cpp
@@ -20,11 +20,11 @@
 
 #include "BattleGround.h"
 #include "BattleGroundRL.h"
-#include "Miscellaneous/Language.h"
+#include "Language.h"
 #include "Object.h"
 #include "ObjectMgr.h"
 #include "Player.h"
-#include "Packets/WorldPacket.h"
+#include "WorldPacket.h"
 
 BattleGroundRL::BattleGroundRL()
 {
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundRV.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundRV.cpp
index 32e578ae5ed..fcc53dbbcf9 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundRV.cpp
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundRV.cpp
@@ -21,9 +21,9 @@
 #include "BattleGround.h"
 #include "BattleGroundRV.h"
 #include "ObjectAccessor.h"
-#include "Miscellaneous/Language.h"
+#include "Language.h"
 #include "Player.h"
-#include "Packets/WorldPacket.h"
+#include "WorldPacket.h"
 #include "GameObject.h"
 
 BattleGroundRV::BattleGroundRV()
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundSA.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundSA.cpp
index f67ad9b3300..ccde43ce948 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundSA.cpp
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundSA.cpp
@@ -18,11 +18,11 @@
 
 #include "BattleGround.h"
 #include "BattleGroundSA.h"
-#include "Miscellaneous/Language.h"
+#include "Language.h"
 #include "Player.h"
 #include "GameObject.h"
 #include "ObjectMgr.h"
-#include "Packets/WorldPacket.h"
+#include "WorldPacket.h"
 
 
 BattleGroundSA::BattleGroundSA()
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundWS.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundWS.cpp
index 2eb94ca9958..71872511274 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundWS.cpp
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundWS.cpp
@@ -22,13 +22,13 @@
 #include "BattleGroundWS.h"
 #include "Creature.h"
 #include "GameObject.h"
-#include "Miscellaneous/Language.h"
+#include "Language.h"
 #include "Object.h"
 #include "ObjectMgr.h"
 #include "BattleGroundMgr.h"
 #include "Player.h"
 #include "World.h"
-#include "Packets/WorldPacket.h"
+#include "WorldPacket.h"
 
 // these variables aren't used outside of this file, so declare them only here
 enum BG_WSG_Rewards
diff --git a/src/server/game/CMakeLists.txt b/src/server/game/CMakeLists.txt
index 15d7da2b6d8..480f342aaa8 100644
--- a/src/server/game/CMakeLists.txt
+++ b/src/server/game/CMakeLists.txt
@@ -362,6 +362,7 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/src/server/game/Entities/DynamicObject
   ${CMAKE_SOURCE_DIR}/src/server/game/Entities/GameObject
   ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Item
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Item/Container
   ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object
   ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object/Updates
   ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Pet
@@ -393,6 +394,7 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/src/server/game/Reputation
   ${CMAKE_SOURCE_DIR}/src/server/game/Scripting
   ${CMAKE_SOURCE_DIR}/src/server/game/Server/Protocol
+  ${CMAKE_SOURCE_DIR}/src/server/game/Server/Protocol/Handlers
   ${CMAKE_SOURCE_DIR}/src/server/game/Server
   ${CMAKE_SOURCE_DIR}/src/server/game/Skills
   ${CMAKE_SOURCE_DIR}/src/server/game/Spells
@@ -406,8 +408,6 @@ include_directories(
 
 if(NOT DO_SCRIPTS)
    SET(game_STAT_SRCS ${game_STAT_SRCS}
-      PrecompiledHeaders/ScriptPCH.cpp
-      PrecompiledHeaders/ScriptPCH.h
       AI/ScriptedAI/ScriptedEscortAI.cpp
       AI/ScriptedAI/ScriptedEscortAI.h
       AI/ScriptedAI/ScriptedCreature.cpp
diff --git a/src/server/game/Chat/Channels/Channel.h b/src/server/game/Chat/Channels/Channel.h
index cafa814e1c9..d0b5923e30e 100644
--- a/src/server/game/Chat/Channels/Channel.h
+++ b/src/server/game/Chat/Channels/Channel.h
@@ -27,9 +27,9 @@
 
 #include "Common.h"
 
-#include "Server/Protocol/Opcodes.h"
+#include "Opcodes.h"
 #include "Player.h"
-#include "Packets/WorldPacket.h"
+#include "WorldPacket.h"
 
 enum ChatNotify
 {
diff --git a/src/server/game/Chat/Channels/ChannelMgr.cpp b/src/server/game/Chat/Channels/ChannelMgr.cpp
index f31d3ffde50..b26a42aa2b1 100644
--- a/src/server/game/Chat/Channels/ChannelMgr.cpp
+++ b/src/server/game/Chat/Channels/ChannelMgr.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "ChannelMgr.h"
-#include "Policies/SingletonImp.h"
+#include "SingletonImp.h"
 #include "World.h"
 
 INSTANTIATE_SINGLETON_1(AllianceChannelMgr);
diff --git a/src/server/game/Chat/Channels/ChannelMgr.h b/src/server/game/Chat/Channels/ChannelMgr.h
index 6f3b7c415ae..1997eb76108 100644
--- a/src/server/game/Chat/Channels/ChannelMgr.h
+++ b/src/server/game/Chat/Channels/ChannelMgr.h
@@ -22,14 +22,11 @@
 
 #include "Common.h"
 #include "Channel.h"
-#include "Policies/Singleton.h"
+#include "Singleton.h"
 
 #include 
 #include 
 
-#include "Policies/Singleton.h"
-
-#include "Channel.h"
 #include "World.h"
 
 class ChannelMgr
diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp
index 66d867e4a69..10fec8fbe4f 100644
--- a/src/server/game/Chat/Chat.cpp
+++ b/src/server/game/Chat/Chat.cpp
@@ -21,19 +21,19 @@
 #include "Common.h"
 #include "ObjectMgr.h"
 #include "World.h"
-#include "Packets/WorldPacket.h"
-#include "Server/WorldSession.h"
-#include "Database/DatabaseEnv.h"
+#include "WorldPacket.h"
+#include "WorldSession.h"
+#include "DatabaseEnv.h"
 
 #include "AccountMgr.h"
-#include "Grids/Cells/CellImpl.h"
+#include "CellImpl.h"
 #include "Chat.h"
-#include "Grids/Notifiers/GridNotifiersImpl.h"
-#include "Miscellaneous/Language.h"
-#include "Logging/Log.h"
-#include "Server/Protocol/Opcodes.h"
+#include "GridNotifiersImpl.h"
+#include "Language.h"
+#include "Log.h"
+#include "Opcodes.h"
 #include "Player.h"
-#include "Entities/Object/Updates/UpdateMask.h"
+#include "UpdateMask.h"
 #include "SpellMgr.h"
 
 // Supported shift-links (client generated and server side)
diff --git a/src/server/game/Chat/Chat.h b/src/server/game/Chat/Chat.h
index 8da2979ae82..a298ca03881 100644
--- a/src/server/game/Chat/Chat.h
+++ b/src/server/game/Chat/Chat.h
@@ -21,7 +21,7 @@
 #ifndef TRINITYCORE_CHAT_H
 #define TRINITYCORE_CHAT_H
 
-#include "Miscellaneous/SharedDefines.h"
+#include "SharedDefines.h"
 
 class ChatHandler;
 class WorldSession;
diff --git a/src/server/game/Combat/ThreatManager.h b/src/server/game/Combat/ThreatManager.h
index 517f4548121..f0ae370907b 100644
--- a/src/server/game/Combat/ThreatManager.h
+++ b/src/server/game/Combat/ThreatManager.h
@@ -22,9 +22,9 @@
 #define _THREATMANAGER
 
 #include "Common.h"
-#include "Miscellaneous/SharedDefines.h"
-#include "Dynamic/LinkedReference/Reference.h"
-#include "Combat/UnitEvents.h"
+#include "SharedDefines.h"
+#include "Reference.h"
+#include "UnitEvents.h"
 
 #include 
 
diff --git a/src/server/game/DataStores/DBCStores.h b/src/server/game/DataStores/DBCStores.h
index f4404bce447..1bda56f38cc 100644
--- a/src/server/game/DataStores/DBCStores.h
+++ b/src/server/game/DataStores/DBCStores.h
@@ -20,8 +20,8 @@
 #define TRINITY_DBCSTORES_H
 
 #include "Common.h"
-#include "DataStores/DBCStore.h"
-#include "DataStores/DBCStructure.h"
+#include "DBCStore.h"
+#include "DBCStructure.h"
 
 #include 
 
diff --git a/src/server/game/Entities/Corpse/Corpse.h b/src/server/game/Entities/Corpse/Corpse.h
index 17c8e597d87..3ba00cec3b1 100644
--- a/src/server/game/Entities/Corpse/Corpse.h
+++ b/src/server/game/Entities/Corpse/Corpse.h
@@ -22,8 +22,8 @@
 #define TRINITYCORE_CORPSE_H
 
 #include "Object.h"
-#include "Database/DatabaseEnv.h"
-#include "Grids/GridDefines.h"
+#include "DatabaseEnv.h"
+#include "GridDefines.h"
 #include "LootMgr.h"
 
 enum CorpseType
diff --git a/src/server/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h
index 0d4a4b0930e..c19187f2770 100644
--- a/src/server/game/Entities/Creature/Creature.h
+++ b/src/server/game/Entities/Creature/Creature.h
@@ -23,11 +23,11 @@
 
 #include "Common.h"
 #include "Unit.h"
-#include "Updates/UpdateMask.h"
+#include "UpdateMask.h"
 #include "ItemPrototype.h"
 #include "LootMgr.h"
-#include "Database/DatabaseEnv.h"
-#include "Grids/Cells/Cell.h"
+#include "DatabaseEnv.h"
+#include "Cell.h"
 
 #include 
 
diff --git a/src/server/game/Entities/Creature/GossipDef.h b/src/server/game/Entities/Creature/GossipDef.h
index 42ca4cc4ab3..ce2049cc23f 100644
--- a/src/server/game/Entities/Creature/GossipDef.h
+++ b/src/server/game/Entities/Creature/GossipDef.h
@@ -23,7 +23,7 @@
 
 #include "Common.h"
 #include "QuestDef.h"
-#include "Server/Protocol/Handlers/NPCHandler.h"
+#include "NPCHandler.h"
 
 class WorldSession;
 
diff --git a/src/server/game/Entities/GameObject/GameObject.h b/src/server/game/Entities/GameObject/GameObject.h
index be760e9bf41..db7f74cb412 100644
--- a/src/server/game/Entities/GameObject/GameObject.h
+++ b/src/server/game/Entities/GameObject/GameObject.h
@@ -22,10 +22,10 @@
 #define TRINITYCORE_GAMEOBJECT_H
 
 #include "Common.h"
-#include "Miscellaneous/SharedDefines.h"
+#include "SharedDefines.h"
 #include "Object.h"
 #include "LootMgr.h"
-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"
 
 // GCC have alternative #pragma pack(N) syntax and old gcc version not support pack(push,N), also any gcc version not support it at some platform
 #if defined(__GNUC__)
diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h
index edeac0a20ef..ad7d0c072ab 100644
--- a/src/server/game/Entities/Object/Object.h
+++ b/src/server/game/Entities/Object/Object.h
@@ -22,11 +22,11 @@
 #define _OBJECT_H
 
 #include "Common.h"
-#include "Updates/UpdateFields.h"
-#include "Updates/UpdateData.h"
-#include "Grids/GridReference.h"
+#include "UpdateFields.h"
+#include "UpdateData.h"
+#include "GridReference.h"
 #include "ObjectDefines.h"
-#include "Grids/GridDefines.h"
+#include "GridDefines.h"
 #include "Map.h"
 
 #include 
diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h
index 983d10f5e02..3bff9808e9d 100644
--- a/src/server/game/Entities/Player/Player.h
+++ b/src/server/game/Entities/Player/Player.h
@@ -26,20 +26,20 @@
 #include "Unit.h"
 #include "Item.h"
 
-#include "Database/DatabaseEnv.h"
-#include "Server/Protocol/Handlers/NPCHandler.h"
-#include "Quests/QuestDef.h"
-#include "Groups/Group.h"
-#include "Item/Container/Bag.h"
-#include "Server/WorldSession.h"
+#include "DatabaseEnv.h"
+#include "NPCHandler.h"
+#include "QuestDef.h"
+#include "Group.h"
+#include "Bag.h"
+#include "WorldSession.h"
 #include "Pet.h"
 #include "MapReference.h"
-#include "Utilities/Util.h"                                           // for Tokens typedef
-#include "Achievements/AchievementMgr.h"
-#include "Reputation/ReputationMgr.h"
-#include "BattleGrounds/BattleGround.h"
-#include "DataStores/DBCEnums.h"
-#include "DungeonFinding/LFG.h"
+#include "Util.h"                                           // for Tokens typedef
+#include "AchievementMgr.h"
+#include "ReputationMgr.h"
+#include "BattleGround.h"
+#include "DBCEnums.h"
+#include "LFG.h"
 
 #include
 #include
diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h
index dc90411d88b..7091ae22bd3 100644
--- a/src/server/game/Entities/Unit/Unit.h
+++ b/src/server/game/Entities/Unit/Unit.h
@@ -23,15 +23,15 @@
 
 #include "Common.h"
 #include "Object.h"
-#include "Server/Protocol/Opcodes.h"
+#include "Opcodes.h"
 #include "SpellAuraDefines.h"
-#include "Updates/UpdateFields.h"
-#include "Miscellaneous/SharedDefines.h"
-#include "Combat/ThreatManager.h"
-#include "Combat/HostileRefManager.h"
-#include "Movement/FollowerReference.h"
-#include "Movement/FollowerRefManager.h"
-#include "Utilities/EventProcessor.h"
+#include "UpdateFields.h"
+#include "SharedDefines.h"
+#include "ThreatManager.h"
+#include "HostileRefManager.h"
+#include "FollowerReference.h"
+#include "FollowerRefManager.h"
+#include "EventProcessor.h"
 #include "MotionMaster.h"
 #include "DBCStructure.h"
 #include 
diff --git a/src/server/game/Events/GameEventMgr.h b/src/server/game/Events/GameEventMgr.h
index 2ad8fd3de59..d0e288fd77e 100644
--- a/src/server/game/Events/GameEventMgr.h
+++ b/src/server/game/Events/GameEventMgr.h
@@ -22,7 +22,7 @@
 #define TRINITY_GAMEEVENT_MGR_H
 
 #include "Common.h"
-#include "Miscellaneous/SharedDefines.h"
+#include "SharedDefines.h"
 #include "Define.h"
 #include "Policies/Singleton.h"
 
diff --git a/src/server/game/Globals/ObjectAccessor.h b/src/server/game/Globals/ObjectAccessor.h
index 1f865229d42..e3295428505 100644
--- a/src/server/game/Globals/ObjectAccessor.h
+++ b/src/server/game/Globals/ObjectAccessor.h
@@ -22,14 +22,14 @@
 #define TRINITY_OBJECTACCESSOR_H
 
 #include "Define.h"
-#include "Policies/Singleton.h"
+#include "Singleton.h"
 #include 
-#include "Dynamic/UnorderedMap.h"
-#include "Policies/ThreadingModel.h"
+#include "UnorderedMap.h"
+#include "ThreadingModel.h"
 
-#include "Updates/UpdateData.h"
+#include "UpdateData.h"
 
-#include "Grids/GridDefines.h"
+#include "GridDefines.h"
 #include "Object.h"
 #include "Player.h"
 
diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h
index d8a0f81c698..79b6ffdd0eb 100644
--- a/src/server/game/Globals/ObjectMgr.h
+++ b/src/server/game/Globals/ObjectMgr.h
@@ -21,18 +21,18 @@
 #ifndef _OBJECTMGR_H
 #define _OBJECTMGR_H
 
-#include "Logging/Log.h"
+#include "Log.h"
 #include "Object.h"
-#include "Entities/Item/Container/Bag.h"
+#include "Bag.h"
 #include "Creature.h"
 #include "Player.h"
-#include "Entities/DynamicObject/DynamicObject.h"
+#include "DynamicObject.h"
 #include "GameObject.h"
-#include "Entities/Corpse/Corpse.h"
+#include "Corpse.h"
 #include "QuestDef.h"
-#include "Movement/Waypoints/Path.h"
+#include "Path.h"
 #include "ItemPrototype.h"
-#include "Server/Protocol/Handlers/NPCHandler.h"
+#include "NPCHandler.h"
 #include "Database/DatabaseEnv.h"
 #include "Mail.h"
 #include "Map.h"
diff --git a/src/server/game/Grids/Cells/Cell.h b/src/server/game/Grids/Cells/Cell.h
index 657cc403e2a..4cc1e0864ba 100644
--- a/src/server/game/Grids/Cells/Cell.h
+++ b/src/server/game/Grids/Cells/Cell.h
@@ -26,7 +26,7 @@
 #include "Dynamic/TypeContainer.h"
 #include "Dynamic/TypeContainerVisitor.h"
 
-#include "Grids/GridDefines.h"
+#include "GridDefines.h"
 
 class Map;
 class WorldObject;
diff --git a/src/server/game/Grids/GridDefines.h b/src/server/game/Grids/GridDefines.h
index e27ebec4a46..e59bb6aa8a0 100644
--- a/src/server/game/Grids/GridDefines.h
+++ b/src/server/game/Grids/GridDefines.h
@@ -22,7 +22,7 @@
 #define TRINITY_GRIDDEFINES_H
 
 #include "Common.h"
-#include "Grids/NGrid.h"
+#include "NGrid.h"
 #include 
 
 // Forward class definitions
diff --git a/src/server/game/Grids/NGrid.h b/src/server/game/Grids/NGrid.h
index 1d8967e4d9a..8c539519211 100644
--- a/src/server/game/Grids/NGrid.h
+++ b/src/server/game/Grids/NGrid.h
@@ -24,10 +24,10 @@
 /** NGrid is nothing more than a wrapper of the Grid with an NxN cells
  */
 
-#include "Grids/Grid.h"
-#include "Grids/GridReference.h"
-#include "Utilities/Timer.h"
-#include "Utilities/Util.h"
+#include "Grid.h"
+#include "GridReference.h"
+#include "Timer.h"
+#include "Util.h"
 
 #define DEFAULT_VISIBILITY_NOTIFY_PERIOD      1000
 
diff --git a/src/server/game/Grids/Notifiers/GridNotifiers.h b/src/server/game/Grids/Notifiers/GridNotifiers.h
index 9cbcb078128..b0abf0aae79 100644
--- a/src/server/game/Grids/Notifiers/GridNotifiers.h
+++ b/src/server/game/Grids/Notifiers/GridNotifiers.h
@@ -21,13 +21,13 @@
 #ifndef TRINITY_GRIDNOTIFIERS_H
 #define TRINITY_GRIDNOTIFIERS_H
 
-#include "Grids/ObjectGridLoader.h"
-#include "Updates/UpdateData.h"
+#include "ObjectGridLoader.h"
+#include "UpdateData.h"
 #include 
 
-#include "Entities/Corpse/Corpse.h"
+#include "Corpse.h"
 #include "Object.h"
-#include "Entities/DynamicObject/DynamicObject.h"
+#include "DynamicObject.h"
 #include "GameObject.h"
 #include "Player.h"
 #include "Unit.h"
diff --git a/src/server/game/Grids/Notifiers/GridNotifiersImpl.h b/src/server/game/Grids/Notifiers/GridNotifiersImpl.h
index 43cb94540c3..26a9c0bd328 100644
--- a/src/server/game/Grids/Notifiers/GridNotifiersImpl.h
+++ b/src/server/game/Grids/Notifiers/GridNotifiersImpl.h
@@ -22,10 +22,10 @@
 #define TRINITY_GRIDNOTIFIERSIMPL_H
 
 #include "GridNotifiers.h"
-#include "Packets/WorldPacket.h"
-#include "Corpse/Corpse.h"
+#include "WorldPacket.h"
+#include "Corpse.h"
 #include "Player.h"
-#include "Updates/UpdateData.h"
+#include "UpdateData.h"
 #include "CreatureAI.h"
 #include "SpellAuras.h"
 
diff --git a/src/server/game/Grids/ObjectGridLoader.h b/src/server/game/Grids/ObjectGridLoader.h
index 90e3383fbc8..c1a59cb4ecb 100644
--- a/src/server/game/Grids/ObjectGridLoader.h
+++ b/src/server/game/Grids/ObjectGridLoader.h
@@ -21,11 +21,11 @@
 #ifndef TRINITY_OBJECTGRIDLOADER_H
 #define TRINITY_OBJECTGRIDLOADER_H
 
-#include "Dynamic/TypeList.h"
+#include "TypeList.h"
 #include "Define.h"
-#include "Grids/GridLoader.h"
-#include "Grids/GridDefines.h"
-#include "Grids/Cells/Cell.h"
+#include "GridLoader.h"
+#include "GridDefines.h"
+#include "Cell.h"
 
 class ObjectWorldLoader;
 
diff --git a/src/server/game/Loot/LootMgr.h b/src/server/game/Loot/LootMgr.h
index 55bb35eda6f..00fe2a97888 100644
--- a/src/server/game/Loot/LootMgr.h
+++ b/src/server/game/Loot/LootMgr.h
@@ -22,10 +22,10 @@
 #define TRINITY_LOOTMGR_H
 
 #include "ItemEnchantmentMgr.h"
-#include "Packets/ByteBuffer.h"
-#include "Dynamic/LinkedReference/RefManager.h"
-#include "Miscellaneous/SharedDefines.h"
-#include "Conditions/ConditionMgr.h"
+#include "ByteBuffer.h"
+#include "RefManager.h"
+#include "SharedDefines.h"
+#include "ConditionMgr.h"
 
 #include 
 #include 
diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h
index 5445401c487..52c79be7038 100644
--- a/src/server/game/Maps/Map.h
+++ b/src/server/game/Maps/Map.h
@@ -27,12 +27,12 @@
 #include "ace/Thread_Mutex.h"
 
 #include "DBCStructure.h"
-#include "Grids/GridDefines.h"
-#include "Grids/Cells/Cell.h"
-#include "Utilities/Timer.h"
-#include "Miscellaneous/SharedDefines.h"
-#include "Grids/GridRefManager.h"
-#include "Maps/MapRefManager.h"
+#include "GridDefines.h"
+#include "Cell.h"
+#include "Timer.h"
+#include "SharedDefines.h"
+#include "GridRefManager.h"
+#include "MapRefManager.h"
 #include "MersenneTwister.h"
 
 #include 
diff --git a/src/server/game/Movement/MotionMaster.h b/src/server/game/Movement/MotionMaster.h
index 5bd81cd965c..c4082ba086a 100644
--- a/src/server/game/Movement/MotionMaster.h
+++ b/src/server/game/Movement/MotionMaster.h
@@ -23,7 +23,7 @@
 
 #include "Common.h"
 #include 
-#include "Miscellaneous/SharedDefines.h"
+#include "SharedDefines.h"
 #include "Object.h"
 
 class MovementGenerator;
diff --git a/src/server/game/PrecompiledHeaders/NixCorePCH.cpp b/src/server/game/PrecompiledHeaders/NixCorePCH.cpp
index e588392689e..e3b0613cafd 100644
--- a/src/server/game/PrecompiledHeaders/NixCorePCH.cpp
+++ b/src/server/game/PrecompiledHeaders/NixCorePCH.cpp
@@ -1 +1 @@
-#include "pchdef.h"
\ No newline at end of file
+#include "NixCorePCH.h"
diff --git a/src/server/game/PrecompiledHeaders/WinCorePCH.h b/src/server/game/PrecompiledHeaders/WinCorePCH.h
index cd1ea4a418a..0757b07438d 100644
--- a/src/server/game/PrecompiledHeaders/WinCorePCH.h
+++ b/src/server/game/PrecompiledHeaders/WinCorePCH.h
@@ -11,4 +11,4 @@
 #include "SharedDefines.h"
 #include "ObjectMgr.h"
 
-#include "ScriptedPch.h"
\ No newline at end of file
+#include "ScriptPCH.h"
diff --git a/src/server/game/Reputation/ReputationMgr.h b/src/server/game/Reputation/ReputationMgr.h
index 9fc0efdf850..4c0fd778a4d 100644
--- a/src/server/game/Reputation/ReputationMgr.h
+++ b/src/server/game/Reputation/ReputationMgr.h
@@ -20,10 +20,10 @@
 #define __TRINITY_REPUTATION_MGR_H
 
 #include "Common.h"
-#include "Miscellaneous/SharedDefines.h"
-#include "Miscellaneous/Language.h"
-#include "DataStores/DBCStructure.h"
-#include "Database/QueryResult.h"
+#include "SharedDefines.h"
+#include "Language.h"
+#include "DBCStructure.h"
+#include "QueryResult.h"
 #include 
 
 static uint32 ReputationRankStrIndex[MAX_REPUTATION_RANK] =
diff --git a/src/server/game/Server/Protocol/Opcodes.h b/src/server/game/Server/Protocol/Opcodes.h
index 67f2026f1f5..4ae6931c3f5 100644
--- a/src/server/game/Server/Protocol/Opcodes.h
+++ b/src/server/game/Server/Protocol/Opcodes.h
@@ -31,7 +31,7 @@
 //       if this class definition not complite then VS for x64 release use different size for
 //       struct OpcodeHandler in this header and Opcode.cpp and get totally wrong data from
 //       table opcodeTable in source when Opcode.h included but WorldSession.h not included
-#include "Server/WorldSession.h"
+#include "WorldSession.h"
 
 /// List of Opcodes
 enum Opcodes
diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h
index d2e8f6cdada..c17f3e3f3e6 100644
--- a/src/server/game/Server/WorldSession.h
+++ b/src/server/game/Server/WorldSession.h
@@ -26,10 +26,10 @@
 #define __WORLDSESSION_H
 
 #include "Common.h"
-#include "Miscellaneous/SharedDefines.h"
-#include "Addons/AddonMgr.h"
-#include "Database/QueryResult.h"
-#include "World/World.h"
+#include "SharedDefines.h"
+#include "AddonMgr.h"
+#include "QueryResult.h"
+#include "World.h"
 
 struct ItemPrototype;
 struct AuctionEntry;
diff --git a/src/server/game/Spells/Spell.h b/src/server/game/Spells/Spell.h
index ef21e4a14b3..a987e35e65d 100644
--- a/src/server/game/Spells/Spell.h
+++ b/src/server/game/Spells/Spell.h
@@ -21,8 +21,8 @@
 #ifndef __SPELL_H
 #define __SPELL_H
 
-#include "Grids/GridDefines.h"
-#include "Miscellaneous/SharedDefines.h"
+#include "GridDefines.h"
+#include "SharedDefines.h"
 
 class Unit;
 class Player;
diff --git a/src/server/game/Spells/SpellMgr.h b/src/server/game/Spells/SpellMgr.h
index b6768348417..ad0bad7cfaa 100644
--- a/src/server/game/Spells/SpellMgr.h
+++ b/src/server/game/Spells/SpellMgr.h
@@ -24,13 +24,13 @@
 // For static or at-server-startup loaded spell data
 // For more high level function for sSpellStore data
 
-#include "Miscellaneous/SharedDefines.h"
+#include "SharedDefines.h"
 #include "SpellAuraDefines.h"
 #include "DBCStructure.h"
 #include "DBCStores.h"
-#include "Database/SQLStorage.h"
+#include "SQLStorage.h"
 
-#include "Dynamic/UnorderedMap.h"
+#include "UnorderedMap.h"
 
 #include "Player.h"
 
diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h
index dfd13e60d46..c53cab1124f 100644
--- a/src/server/game/World/World.h
+++ b/src/server/game/World/World.h
@@ -26,11 +26,11 @@
 #define __WORLD_H
 
 #include "Common.h"
-#include "Utilities/Timer.h"
-#include "Policies/Singleton.h"
-#include "Miscellaneous/SharedDefines.h"
+#include "Timer.h"
+#include "Singleton.h"
+#include "SharedDefines.h"
 #include "ace/Atomic_Op.h"
-#include "Database/QueryResult.h"
+#include "QueryResult.h"
 
 #include 
 #include 
diff --git a/src/server/scripts/CMakeLists.txt b/src/server/scripts/CMakeLists.txt
index 6e757b95243..3712904335d 100644
--- a/src/server/scripts/CMakeLists.txt
+++ b/src/server/scripts/CMakeLists.txt
@@ -582,48 +582,79 @@ message("-- Added Script Engine to SCRIPTS lib")
 include_directories(
   ${ACE_INCLUDE_DIR}
   ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/dep/include
+  ${CMAKE_SOURCE_DIR}/externals/mersennetwister
+  ${CMAKE_SOURCE_DIR}/externals/zlib
+  ${CMAKE_SOURCE_DIR}/src/server/shared
+  ${CMAKE_SOURCE_DIR}/src/server/shared/Configuration
+  ${CMAKE_SOURCE_DIR}/src/server/shared/Cryptography
+  ${CMAKE_SOURCE_DIR}/src/server/shared/Database
+  ${CMAKE_SOURCE_DIR}/src/server/shared/DataStores
+  ${CMAKE_SOURCE_DIR}/src/server/shared/Debugging
+  ${CMAKE_SOURCE_DIR}/src/server/shared/Dynamic/CountedReference
+  ${CMAKE_SOURCE_DIR}/src/server/shared/Dynamic/LinkedReference
+  ${CMAKE_SOURCE_DIR}/src/server/shared/Dynamic
+  ${CMAKE_SOURCE_DIR}/src/server/shared/Logging
+  ${CMAKE_SOURCE_DIR}/src/server/shared/Packets
+  ${CMAKE_SOURCE_DIR}/src/server/shared/Policies
+  ${CMAKE_SOURCE_DIR}/src/server/shared/Threading
+  ${CMAKE_SOURCE_DIR}/src/server/shared/Utilities
+  ${CMAKE_SOURCE_DIR}/src/server/collision
+  ${CMAKE_SOURCE_DIR}/src/server/collision/Management
   ${CMAKE_SOURCE_DIR}/src/server/shared
-  ${CMAKE_SOURCE_DIR}/src/server/framework
   ${CMAKE_SOURCE_DIR}/src/server/shared/Database
   ${CMAKE_SOURCE_DIR}/src/server/game/Account
   ${CMAKE_SOURCE_DIR}/src/server/game/Achievements
   ${CMAKE_SOURCE_DIR}/src/server/game/Addons
   ${CMAKE_SOURCE_DIR}/src/server/game/AI
+  ${CMAKE_SOURCE_DIR}/src/server/game/AI/CoreAI
+  ${CMAKE_SOURCE_DIR}/src/server/game/AI/EventAI
   ${CMAKE_SOURCE_DIR}/src/server/game/AI/ScriptedAI
   ${CMAKE_SOURCE_DIR}/src/server/game/AuctionHouse
   ${CMAKE_SOURCE_DIR}/src/server/game/BattleGrounds
   ${CMAKE_SOURCE_DIR}/src/server/game/Calendar
   ${CMAKE_SOURCE_DIR}/src/server/game/Chat
-  ${CMAKE_SOURCE_DIR}/src/server/game/ConditionMgr
+  ${CMAKE_SOURCE_DIR}/src/server/game/Conditions
+  ${CMAKE_SOURCE_DIR}/src/server/shared/Configuration
   ${CMAKE_SOURCE_DIR}/src/server/game/Combat
   ${CMAKE_SOURCE_DIR}/src/server/game/DataStores
+  ${CMAKE_SOURCE_DIR}/src/server/game/DungeonFinding
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Corpse
   ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Creature
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/DynamicObject
   ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Item
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Item/Container
   ${CMAKE_SOURCE_DIR}/src/server/game/Entities/GameObject
   ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object/Updates
   ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Pet
   ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Player
   ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Unit
   ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Vehicle
   ${CMAKE_SOURCE_DIR}/src/server/game/Events
   ${CMAKE_SOURCE_DIR}/src/server/game/Globals
+  ${CMAKE_SOURCE_DIR}/src/server/game/Grids
+  ${CMAKE_SOURCE_DIR}/src/server/game/Grids/Cells
+  ${CMAKE_SOURCE_DIR}/src/server/game/Grids/Notifiers
   ${CMAKE_SOURCE_DIR}/src/server/game/Groups
   ${CMAKE_SOURCE_DIR}/src/server/game/Guilds
   ${CMAKE_SOURCE_DIR}/src/server/game/Instances
   ${CMAKE_SOURCE_DIR}/src/server/game/LookingForGroup
   ${CMAKE_SOURCE_DIR}/src/server/game/Loot
   ${CMAKE_SOURCE_DIR}/src/server/game/Mails
-  ${CMAKE_SOURCE_DIR}/src/server/game/Map
-  ${CMAKE_SOURCE_DIR}/src/server/game/Map/Cell
-  ${CMAKE_SOURCE_DIR}/src/server/game/Map/Grid
+  ${CMAKE_SOURCE_DIR}/src/server/game/Miscellaneous
+  ${CMAKE_SOURCE_DIR}/src/server/game/Maps
   ${CMAKE_SOURCE_DIR}/src/server/game/Movement
+  ${CMAKE_SOURCE_DIR}/src/server/game/Movement/Waypoints
   ${CMAKE_SOURCE_DIR}/src/server/game/Opcodes
   ${CMAKE_SOURCE_DIR}/src/server/game/OutdoorPvP
   ${CMAKE_SOURCE_DIR}/src/server/game/Pools
+  ${CMAKE_SOURCE_DIR}/src/server/game/PrecompiledHeaders
   ${CMAKE_SOURCE_DIR}/src/server/game/Quests
   ${CMAKE_SOURCE_DIR}/src/server/game/Reputation
-  ${CMAKE_SOURCE_DIR}/src/server/game/ScriptMgr
+  ${CMAKE_SOURCE_DIR}/src/server/game/Scripting
+  ${CMAKE_SOURCE_DIR}/src/server/game/Server
+  ${CMAKE_SOURCE_DIR}/src/server/game/Server/Protocol
+  ${CMAKE_SOURCE_DIR}/src/server/game/Server/Protocol/Handlers
   ${CMAKE_SOURCE_DIR}/src/server/game/Skills
   ${CMAKE_SOURCE_DIR}/src/server/game/Spells
   ${CMAKE_SOURCE_DIR}/src/server/game/Spells/Auras
diff --git a/src/server/scripts/Custom/on_events.cpp b/src/server/scripts/Custom/on_events.cpp
index 94e54a07fba..904f0010d55 100644
--- a/src/server/scripts/Custom/on_events.cpp
+++ b/src/server/scripts/Custom/on_events.cpp
@@ -1,4 +1,4 @@
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include 
 
 //This function is called when the player logs in (every login)
diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp
index a61fc21d5ba..e1788f0290b 100644
--- a/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp
+++ b/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp
@@ -14,7 +14,7 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 enum Spells
 {
diff --git a/src/server/shared/Dynamic/CountedReference/Reference.h b/src/server/shared/Dynamic/CountedReference/Reference.h
index d3cfe55ffc0..bdc06a572c9 100644
--- a/src/server/shared/Dynamic/CountedReference/Reference.h
+++ b/src/server/shared/Dynamic/CountedReference/Reference.h
@@ -33,8 +33,8 @@
  */
 
 #include 
-#include "Platform/Define.h"
-#include "Policies/ThreadingModel.h"
+#include "Define.h"
+#include "ThreadingModel.h"
 #include "ReferenceHolder.h"
 
 template
diff --git a/src/server/shared/Dynamic/TypeContainer.h b/src/server/shared/Dynamic/TypeContainer.h
index 0fa61f5e562..4ed07431ee3 100644
--- a/src/server/shared/Dynamic/TypeContainer.h
+++ b/src/server/shared/Dynamic/TypeContainer.h
@@ -30,7 +30,7 @@
 #include 
 #include "Define.h"
 #include "Dynamic/TypeList.h"
-#include "Grids/GridRefManager.h"
+#include "GridRefManager.h"
 
 /*
  * @class ContainerMapList is a mulit-type container for map elements
-- 
cgit v1.2.3


From 220d4fa29c73a6706b9413f93be8c860867f4915 Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Tue, 8 Jun 2010 21:11:07 +0200
Subject: More fixes for tools/ cmake files

--HG--
branch : trunk
---
 src/tools/map_extractor/CMakeLists.txt   |  6 ++-
 src/tools/vmap3_assembler/CMakeLists.txt | 77 +++++---------------------------
 2 files changed, 16 insertions(+), 67 deletions(-)

(limited to 'src')

diff --git a/src/tools/map_extractor/CMakeLists.txt b/src/tools/map_extractor/CMakeLists.txt
index 2e9cb3591f1..feb1c07f26b 100644
--- a/src/tools/map_extractor/CMakeLists.txt
+++ b/src/tools/map_extractor/CMakeLists.txt
@@ -13,8 +13,7 @@ cmake_minimum_required (VERSION 2.6)
 project (TRINITY_MAP_EXTRACTOR)
 
 file(GLOB sources *.cpp)
-
-add_subdirectory (loadlib)
+file(GLOB loadlib_sources loadlib/*.cpp)
 
 include_directories (${CMAKE_SOURCE_DIR}/externals/libmpq)
 include_directories (${CMAKE_SOURCE_DIR}/src/tools/map-extractor/loadlib)
@@ -22,6 +21,9 @@ include_directories (${CMAKE_SOURCE_DIR}/src/tools/map-extractor/loadlib)
 link_directories (${CMAKE_SOURCE_DIR}/externals/libmpq)
 link_directories (${CMAKE_SOURCE_DIR}}/src/tools/map-extractor/loadlib)
 
+add_library (loadlib ${loadlib_sources})
+target_link_libraries (loadlib zlib)
+
 add_executable (trinity-map_extractor ${sources})
 
 target_link_libraries (trinity-map_extractor libmpq loadlib)
diff --git a/src/tools/vmap3_assembler/CMakeLists.txt b/src/tools/vmap3_assembler/CMakeLists.txt
index 42f9a972a25..c604334c830 100644
--- a/src/tools/vmap3_assembler/CMakeLists.txt
+++ b/src/tools/vmap3_assembler/CMakeLists.txt
@@ -1,4 +1,5 @@
 # Copyright (C) 2005-2009 MaNGOS project 
+# Copyright (C) 2005-2009 MaNGOS Trinity 
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -9,76 +10,22 @@
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 cmake_minimum_required (VERSION 2.6)
-project (MANGOS_VMAP_ASSEMB_IO)
+#project (MANGOS_VMAP_ASSEMB_IO)
 
-set(CMAKE_VERBOSE_MAKEFILE true)
+#set(CMAKE_VERBOSE_MAKEFILE true)
 
 # uncomment next line to disable debug mode
-ADD_DEFINITIONS("-DIOMAP_DEBUG")
+#ADD_DEFINITIONS("-DIOMAP_DEBUG")
+#ADD_DEFINITIONS("-Wall")
+#ADD_DEFINITIONS("-ggdb")
+#ADD_DEFINITIONS("-O3")
 
-ADD_DEFINITIONS("-Wall")
-ADD_DEFINITIONS("-ggdb")
-ADD_DEFINITIONS("-O3")
+include_directories(${CMAKE_SOURCE_FILE}/src/server/collision)
+include_directories(${CMAKE_SOURCE_FILE}/externals/g3dlite)
+include_directories(${ACE_INCLUDE_DIR})
 
-include_directories(../../src/server/shared/vmap/)
-include_directories(../../dep/include/g3dlite/)
-include_directories(../../dep/ACE_wrappers/)
-include_directories(../../objdir/dep/ACE_wrappers)
-include_directories(../../src/server/framework/)
-
-add_library(g3dlite ../../dep/src/g3dlite/AABox.cpp
-	../../dep/src/g3dlite/Box.cpp
-	../../dep/src/g3dlite/Crypto.cpp
-	../../dep/src/g3dlite/format.cpp
-	../../dep/src/g3dlite/Matrix3.cpp
-	../../dep/src/g3dlite/Plane.cpp
-	../../dep/src/g3dlite/System.cpp
-	../../dep/src/g3dlite/Triangle.cpp
-	../../dep/src/g3dlite/Vector3.cpp
-	../../dep/src/g3dlite/Vector4.cpp
-	../../dep/src/g3dlite/debugAssert.cpp
-	../../dep/src/g3dlite/fileutils.cpp
-	../../dep/src/g3dlite/g3dmath.cpp
-	../../dep/src/g3dlite/g3dfnmatch.cpp
-	../../dep/src/g3dlite/prompt.cpp
-	../../dep/src/g3dlite/stringutils.cpp
-	../../dep/src/g3dlite/Any.cpp
-	../../dep/src/g3dlite/BinaryFormat.cpp
-	../../dep/src/g3dlite/BinaryInput.cpp
-	../../dep/src/g3dlite/BinaryOutput.cpp
-	../../dep/src/g3dlite/Capsule.cpp
-	../../dep/src/g3dlite/CollisionDetection.cpp
-	../../dep/src/g3dlite/CoordinateFrame.cpp
-	../../dep/src/g3dlite/Cylinder.cpp
-	../../dep/src/g3dlite/Line.cpp
-	../../dep/src/g3dlite/LineSegment.cpp
-	../../dep/src/g3dlite/Log.cpp
-	../../dep/src/g3dlite/Matrix4.cpp
-	../../dep/src/g3dlite/MemoryManager.cpp
-	../../dep/src/g3dlite/Quat.cpp
-	../../dep/src/g3dlite/Random.cpp
-	../../dep/src/g3dlite/Ray.cpp
-	../../dep/src/g3dlite/ReferenceCount.cpp
-	../../dep/src/g3dlite/Sphere.cpp
-	../../dep/src/g3dlite/TextInput.cpp
-	../../dep/src/g3dlite/TextOutput.cpp
-	../../dep/src/g3dlite/UprightFrame.cpp
-	../../dep/src/g3dlite/Vector2.cpp
-	)
-
-add_library(vmap
-	../../src/shared/vmap/BoundingIntervalHierarchy.cpp
-	../../src/shared/vmap/VMapManager2.cpp
-	../../src/shared/vmap/MapTree.cpp
-	../../src/shared/vmap/TileAssembler.cpp
-	../../src/shared/vmap/WorldModel.cpp
-	../../src/shared/vmap/ModelInstance.cpp
-	)
-
-target_link_libraries(vmap g3dlite z)
-
-add_executable(vmap_assembler VMapAssembler.cpp)
-target_link_libraries(vmap_assembler vmap)
+add_executable(trinity-collision_assembler VMapAssembler.cpp)
+target_link_libraries(trinity-collision_assembler collision g3dlite)
 
 # add_executable(vmap_test coordinate_test.cpp)
 # target_link_libraries(vmap_test vmap)
-- 
cgit v1.2.3


From 00d552ecd4bf9db8274d7d994cd942ac9f5938b8 Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Tue, 8 Jun 2010 21:15:48 +0200
Subject: Fix typo. Ty Shauren

--HG--
branch : trunk
---
 src/tools/vmap3_assembler/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/tools/vmap3_assembler/CMakeLists.txt b/src/tools/vmap3_assembler/CMakeLists.txt
index c604334c830..6739d36a2e8 100644
--- a/src/tools/vmap3_assembler/CMakeLists.txt
+++ b/src/tools/vmap3_assembler/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Copyright (C) 2005-2009 MaNGOS project 
-# Copyright (C) 2005-2009 MaNGOS Trinity 
+# Copyright (C) 2005-2009 Trinity 
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
-- 
cgit v1.2.3


From 4ec97e918ebc4a25cdb8fd1972cc243ff36528c7 Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Tue, 8 Jun 2010 21:22:43 +0200
Subject: Some fixes for worldserver cmake file

--HG--
branch : trunk
---
 src/server/worldserver/CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src')

diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt
index db8c75a6772..5c80dfc5773 100644
--- a/src/server/worldserver/CMakeLists.txt
+++ b/src/server/worldserver/CMakeLists.txt
@@ -61,6 +61,7 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/src/server/game/Entities/DynamicObject
   ${CMAKE_SOURCE_DIR}/src/server/game/Entities/GameObject
   ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Item
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Item/Container
   ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object
   ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object/Updates
   ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Pet
@@ -92,6 +93,7 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/src/server/game/Reputation
   ${CMAKE_SOURCE_DIR}/src/server/game/Scripting
   ${CMAKE_SOURCE_DIR}/src/server/game/Server/Protocol
+  ${CMAKE_SOURCE_DIR}/src/server/game/Server/Protocol/Handlers
   ${CMAKE_SOURCE_DIR}/src/server/game/Server
   ${CMAKE_SOURCE_DIR}/src/server/game/Skills
   ${CMAKE_SOURCE_DIR}/src/server/game/Spells
-- 
cgit v1.2.3


From f5d44784e18846999461186041e67fc04ce8961a Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Tue, 8 Jun 2010 21:40:27 +0200
Subject: Fix some typos and remove parent merged cmake file

--HG--
branch : trunk
---
 src/tools/map_extractor/CMakeLists.txt         |  5 +++--
 src/tools/map_extractor/loadlib/CMakeLists.txt | 13 -------------
 src/tools/map_extractor/loadlib/loadlib.cpp    |  2 +-
 3 files changed, 4 insertions(+), 16 deletions(-)
 delete mode 100644 src/tools/map_extractor/loadlib/CMakeLists.txt

(limited to 'src')

diff --git a/src/tools/map_extractor/CMakeLists.txt b/src/tools/map_extractor/CMakeLists.txt
index feb1c07f26b..4f9b0a8c855 100644
--- a/src/tools/map_extractor/CMakeLists.txt
+++ b/src/tools/map_extractor/CMakeLists.txt
@@ -16,10 +16,11 @@ file(GLOB sources *.cpp)
 file(GLOB loadlib_sources loadlib/*.cpp)
 
 include_directories (${CMAKE_SOURCE_DIR}/externals/libmpq)
-include_directories (${CMAKE_SOURCE_DIR}/src/tools/map-extractor/loadlib)
+include_directories (${CMAKE_SOURCE_DIR}/src/tools/map_extractor)
+include_directories (${CMAKE_SOURCE_DIR}/src/tools/map_extractor/loadlib)
 
 link_directories (${CMAKE_SOURCE_DIR}/externals/libmpq)
-link_directories (${CMAKE_SOURCE_DIR}}/src/tools/map-extractor/loadlib)
+link_directories (${CMAKE_SOURCE_DIR}}/src/tools/map_extractor/loadlib)
 
 add_library (loadlib ${loadlib_sources})
 target_link_libraries (loadlib zlib)
diff --git a/src/tools/map_extractor/loadlib/CMakeLists.txt b/src/tools/map_extractor/loadlib/CMakeLists.txt
deleted file mode 100644
index 5680c61d424..00000000000
--- a/src/tools/map_extractor/loadlib/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright (C) 2005-2009 MaNGOS project 
-#
-# This file is free software; as a special exception the author gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-add_library (loadlib loadlib.cpp  adt.cpp  wdt.cpp)
-# link loadlib with zlib
-target_link_libraries (loadlib z)
diff --git a/src/tools/map_extractor/loadlib/loadlib.cpp b/src/tools/map_extractor/loadlib/loadlib.cpp
index ed5bd9acb71..90d95ebfe35 100644
--- a/src/tools/map_extractor/loadlib/loadlib.cpp
+++ b/src/tools/map_extractor/loadlib/loadlib.cpp
@@ -1,7 +1,7 @@
 #define _CRT_SECURE_NO_DEPRECATE
 
 #include "loadlib.h"
-#include "../mpq_libmpq.h"
+#include "mpq_libmpq.h"
 
 class MPQFile;
 
-- 
cgit v1.2.3


From 275eff98bf20f7c74c58e1b7f7cfd503b72fada0 Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Tue, 8 Jun 2010 22:43:04 +0200
Subject: some tools/vmap3_assembler/ cmake file fixes

--HG--
branch : trunk
---
 src/tools/vmap3_assembler/CMakeLists.txt | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

(limited to 'src')

diff --git a/src/tools/vmap3_assembler/CMakeLists.txt b/src/tools/vmap3_assembler/CMakeLists.txt
index 6739d36a2e8..d273d128011 100644
--- a/src/tools/vmap3_assembler/CMakeLists.txt
+++ b/src/tools/vmap3_assembler/CMakeLists.txt
@@ -9,24 +9,15 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-cmake_minimum_required (VERSION 2.6)
-#project (MANGOS_VMAP_ASSEMB_IO)
-
-#set(CMAKE_VERBOSE_MAKEFILE true)
-
-# uncomment next line to disable debug mode
-#ADD_DEFINITIONS("-DIOMAP_DEBUG")
-#ADD_DEFINITIONS("-Wall")
-#ADD_DEFINITIONS("-ggdb")
-#ADD_DEFINITIONS("-O3")
-
-include_directories(${CMAKE_SOURCE_FILE}/src/server/collision)
-include_directories(${CMAKE_SOURCE_FILE}/externals/g3dlite)
-include_directories(${ACE_INCLUDE_DIR})
+include_directories(
+  ${CMAKE_SOURCE_DIR}/externals/g3dlite
+  ${CMAKE_SOURCE_DIR}/src/server/collision/Maps
+  ${CMAKE_SOURCE_DIR}/src/server/collision/Models
+  ${CMAKE_SOURCE_DIR}/src/server/shared
+  ${ACE_INCLUDE_DIR}
+)
 
 add_executable(trinity-collision_assembler VMapAssembler.cpp)
-target_link_libraries(trinity-collision_assembler collision g3dlite)
+target_link_libraries(trinity-collision_assembler collision g3dlib)
 
-# add_executable(vmap_test coordinate_test.cpp)
-# target_link_libraries(vmap_test vmap)
 
-- 
cgit v1.2.3


From 89dd005ff8ab2b2b1774de9798ea41dacb9c0398 Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Tue, 8 Jun 2010 22:48:52 +0200
Subject: some vmap3_extractor/ cmake fixes

--HG--
branch : trunk
---
 src/tools/vmap3_extractor/CMakeLists.txt | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/tools/vmap3_extractor/CMakeLists.txt b/src/tools/vmap3_extractor/CMakeLists.txt
index 51e867ec07e..9e978eda037 100644
--- a/src/tools/vmap3_extractor/CMakeLists.txt
+++ b/src/tools/vmap3_extractor/CMakeLists.txt
@@ -1,4 +1,5 @@
 # Copyright (C) 2005-2009 MaNGOS project 
+# Copyright (C) 2005-2010 Trinity 
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -8,9 +9,7 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-cmake_minimum_required (VERSION 2.6)
-project (MANGOS_IOMAP_EXTRACTOR)
+include_directories (${CMAKE_SOURCE_DIR}/externals/libmpq)
 
-LINK_DIRECTORIES( ${LINK_DIRECTORIES} ../../libmpq/libmpq/.libs/ )
-add_executable(vmapextractor adtfile.cpp  dbcfile.cpp  model.cpp  mpq_libmpq.cpp  vmapexport.cpp  wdtfile.cpp  wmo.cpp)
-target_link_libraries(vmapextractor mpq)
+add_executable(trinity-vmap_extractor adtfile.cpp  dbcfile.cpp  model.cpp  mpq_libmpq.cpp  vmapexport.cpp  wdtfile.cpp  wmo.cpp)
+target_link_libraries(trinity-vmap_extractor libmpq)
-- 
cgit v1.2.3


From 7561bab716427fca9c958dff2ac5be9ac77d8296 Mon Sep 17 00:00:00 2001
From: click 
Date: Tue, 8 Jun 2010 23:44:55 +0200
Subject: Change around some more headers to adhere to new strucutre and
 namebase

--HG--
branch : trunk
---
 src/server/game/Maps/MapManager.h                                     | 2 +-
 src/server/game/Weather/Weather.h                                     | 4 ++--
 src/server/scripts/CMakeLists.txt                                     | 2 +-
 src/server/scripts/Custom/npc_acherus_taxi.cpp                        | 2 +-
 src/server/scripts/Custom/npc_wyrmresttempel_taxi.cpp                 | 2 +-
 src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp     | 2 +-
 src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp    | 2 +-
 src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp   | 2 +-
 src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp     | 2 +-
 .../scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp      | 2 +-
 .../EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp     | 2 +-
 src/server/scripts/EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp | 2 +-
 .../BlackrockDepths/boss_emperor_dagran_thaurissan.cpp                | 2 +-
 .../EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp       | 2 +-
 .../EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp       | 2 +-
 src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp   | 2 +-
 .../BlackrockDepths/boss_high_interrogator_gerstahn.cpp               | 2 +-
 src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp    | 2 +-
 .../EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp        | 2 +-
 .../scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp    | 2 +-
 .../EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp     | 2 +-
 src/server/scripts/EasternKingdoms/BlackrockSpire/blackrock_spire.cpp | 2 +-
 src/server/scripts/EasternKingdoms/BlackrockSpire/boss_drakkisath.cpp | 2 +-
 src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gyth.cpp       | 2 +-
 src/server/scripts/EasternKingdoms/BlackrockSpire/boss_halycon.cpp    | 2 +-
 .../scripts/EasternKingdoms/BlackrockSpire/boss_highlord_omokk.cpp    | 2 +-
 .../scripts/EasternKingdoms/BlackrockSpire/boss_mother_smolderweb.cpp | 2 +-
 .../EasternKingdoms/BlackrockSpire/boss_overlord_wyrmthalak.cpp       | 2 +-
 .../EasternKingdoms/BlackrockSpire/boss_pyroguard_emberseer.cpp       | 2 +-
 .../EasternKingdoms/BlackrockSpire/boss_quartermaster_zigris.cpp      | 2 +-
 .../scripts/EasternKingdoms/BlackrockSpire/boss_rend_blackhand.cpp    | 2 +-
 .../EasternKingdoms/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp   | 2 +-
 src/server/scripts/EasternKingdoms/BlackrockSpire/boss_the_beast.cpp  | 2 +-
 .../scripts/EasternKingdoms/BlackrockSpire/boss_warmaster_voone.cpp   | 2 +-
 .../EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp       | 2 +-
 .../EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp        | 2 +-
 src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp  | 2 +-
 src/server/scripts/EasternKingdoms/BlackwingLair/boss_ebonroc.cpp     | 2 +-
 src/server/scripts/EasternKingdoms/BlackwingLair/boss_firemaw.cpp     | 2 +-
 src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp    | 2 +-
 src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp    | 2 +-
 src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp   | 2 +-
 src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp | 2 +-
 .../scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp    | 2 +-
 .../scripts/EasternKingdoms/BlackwingLair/instance_blackwing_lair.cpp | 2 +-
 src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp        | 2 +-
 src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp            | 2 +-
 src/server/scripts/EasternKingdoms/Deadmines/deadmines.h              | 2 +-
 src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp   | 2 +-
 src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp          | 2 +-
 src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp | 2 +-
 src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp          | 2 +-
 src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp | 2 +-
 src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp         | 2 +-
 src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp           | 2 +-
 src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp      | 2 +-
 src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp        | 2 +-
 .../scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp       | 2 +-
 src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp    | 2 +-
 .../scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp       | 2 +-
 src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp          | 2 +-
 src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp     | 2 +-
 src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp              | 2 +-
 .../EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp       | 2 +-
 .../EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp      | 2 +-
 .../scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp | 2 +-
 src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp | 2 +-
 .../EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp   | 2 +-
 .../scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp    | 2 +-
 src/server/scripts/EasternKingdoms/MoltenCore/boss_baron_geddon.cpp   | 2 +-
 src/server/scripts/EasternKingdoms/MoltenCore/boss_garr.cpp           | 2 +-
 src/server/scripts/EasternKingdoms/MoltenCore/boss_gehennas.cpp       | 2 +-
 src/server/scripts/EasternKingdoms/MoltenCore/boss_golemagg.cpp       | 2 +-
 src/server/scripts/EasternKingdoms/MoltenCore/boss_lucifron.cpp       | 2 +-
 src/server/scripts/EasternKingdoms/MoltenCore/boss_magmadar.cpp       | 2 +-
 .../scripts/EasternKingdoms/MoltenCore/boss_majordomo_executus.cpp    | 2 +-
 src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp       | 2 +-
 src/server/scripts/EasternKingdoms/MoltenCore/boss_shazzrah.cpp       | 2 +-
 .../scripts/EasternKingdoms/MoltenCore/boss_sulfuron_harbinger.cpp    | 2 +-
 .../scripts/EasternKingdoms/MoltenCore/instance_molten_core.cpp       | 2 +-
 src/server/scripts/EasternKingdoms/MoltenCore/molten_core.cpp         | 2 +-
 src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp        | 2 +-
 src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp        | 2 +-
 src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp        | 2 +-
 .../scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp    | 2 +-
 .../scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp   | 2 +-
 .../EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp    | 2 +-
 .../EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp       | 2 +-
 .../EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp       | 2 +-
 src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp    | 2 +-
 .../ScarletMonastery/boss_high_inquisitor_fairbanks.cpp               | 2 +-
 .../EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp      | 2 +-
 .../EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp     | 2 +-
 .../EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp  | 2 +-
 src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp    | 2 +-
 .../EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp   | 2 +-
 .../scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp  | 2 +-
 .../EasternKingdoms/Scholomance/boss_death_knight_darkreaver.cpp      | 2 +-
 .../EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp     | 2 +-
 src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp | 2 +-
 .../scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp   | 2 +-
 src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp | 2 +-
 src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp        | 2 +-
 .../scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp    | 2 +-
 .../scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp   | 2 +-
 .../scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp     | 2 +-
 src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp  | 2 +-
 src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp        | 2 +-
 .../scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp      | 2 +-
 .../EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp       | 2 +-
 src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp | 2 +-
 .../scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp       | 2 +-
 .../scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp     | 2 +-
 .../scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp  | 2 +-
 .../scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp   | 2 +-
 .../scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp  | 2 +-
 .../scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp     | 2 +-
 src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp     | 2 +-
 .../scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp  | 2 +-
 .../scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp     | 2 +-
 .../scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp   | 2 +-
 .../scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp       | 2 +-
 src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp | 2 +-
 src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp          | 2 +-
 .../scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp   | 2 +-
 src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp     | 2 +-
 src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp  | 2 +-
 .../scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp      | 2 +-
 src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp    | 2 +-
 src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp   | 2 +-
 src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp  | 2 +-
 src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp       | 2 +-
 .../EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp       | 2 +-
 src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.cpp | 2 +-
 src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp         | 4 ++--
 src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp           | 2 +-
 src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp       | 2 +-
 src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp                | 2 +-
 src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp           | 2 +-
 src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp           | 2 +-
 src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp           | 2 +-
 src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp           | 2 +-
 src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp          | 2 +-
 src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp            | 2 +-
 src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp       | 2 +-
 src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp                | 2 +-
 src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp           | 2 +-
 src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp        | 2 +-
 src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp           | 2 +-
 src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp           | 2 +-
 src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp         | 2 +-
 src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp           | 2 +-
 src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp            | 2 +-
 src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp         | 2 +-
 src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp            | 2 +-
 src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp         | 2 +-
 src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp           | 2 +-
 src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp          | 2 +-
 src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp        | 2 +-
 src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp     | 2 +-
 src/server/scripts/EasternKingdoms/alterac_mountains.cpp              | 2 +-
 src/server/scripts/EasternKingdoms/arathi_highlands.cpp               | 2 +-
 src/server/scripts/EasternKingdoms/blasted_lands.cpp                  | 2 +-
 src/server/scripts/EasternKingdoms/boss_kruul.cpp                     | 2 +-
 src/server/scripts/EasternKingdoms/burning_steppes.cpp                | 2 +-
 src/server/scripts/EasternKingdoms/dun_morogh.cpp                     | 2 +-
 src/server/scripts/EasternKingdoms/duskwood.cpp                       | 2 +-
 src/server/scripts/EasternKingdoms/eastern_plaguelands.cpp            | 2 +-
 src/server/scripts/EasternKingdoms/elwynn_forest.cpp                  | 2 +-
 src/server/scripts/EasternKingdoms/eversong_woods.cpp                 | 2 +-
 src/server/scripts/EasternKingdoms/ghostlands.cpp                     | 2 +-
 src/server/scripts/EasternKingdoms/hinterlands.cpp                    | 2 +-
 src/server/scripts/EasternKingdoms/ironforge.cpp                      | 2 +-
 src/server/scripts/EasternKingdoms/isle_of_queldanas.cpp              | 2 +-
 src/server/scripts/EasternKingdoms/loch_modan.cpp                     | 2 +-
 src/server/scripts/EasternKingdoms/redridge_mountains.cpp             | 2 +-
 src/server/scripts/EasternKingdoms/searing_gorge.cpp                  | 2 +-
 src/server/scripts/EasternKingdoms/silvermoon_city.cpp                | 2 +-
 src/server/scripts/EasternKingdoms/silverpine_forest.cpp              | 2 +-
 src/server/scripts/EasternKingdoms/stormwind_city.cpp                 | 2 +-
 src/server/scripts/EasternKingdoms/stranglethorn_vale.cpp             | 2 +-
 src/server/scripts/EasternKingdoms/tirisfal_glades.cpp                | 2 +-
 src/server/scripts/EasternKingdoms/undercity.cpp                      | 2 +-
 src/server/scripts/EasternKingdoms/western_plaguelands.cpp            | 2 +-
 src/server/scripts/EasternKingdoms/westfall.cpp                       | 2 +-
 src/server/scripts/EasternKingdoms/wetlands.cpp                       | 2 +-
 src/server/scripts/Examples/example_creature.cpp                      | 2 +-
 src/server/scripts/Examples/example_escort.cpp                        | 2 +-
 src/server/scripts/Examples/example_gossip_codebox.cpp                | 2 +-
 src/server/scripts/Examples/example_misc.cpp                          | 2 +-
 src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp    | 2 +-
 src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp         | 2 +-
 src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp        | 2 +-
 src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp          | 2 +-
 .../scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp  | 2 +-
 .../Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp     | 2 +-
 .../Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp    | 2 +-
 .../Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp       | 2 +-
 .../Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp      | 2 +-
 .../CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp       | 2 +-
 .../scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp      | 2 +-
 .../scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp    | 2 +-
 .../Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp        | 2 +-
 .../Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp     | 2 +-
 .../scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp | 2 +-
 .../Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp      | 2 +-
 .../Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp     | 2 +-
 .../Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp      | 2 +-
 .../Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp       | 2 +-
 .../CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp       | 2 +-
 .../CullingOfStratholme/instance_culling_of_stratholme.cpp            | 2 +-
 src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp  | 2 +-
 .../Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp       | 2 +-
 .../scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp       | 2 +-
 src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp  | 2 +-
 .../Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp        | 2 +-
 .../CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp    | 2 +-
 .../CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp       | 2 +-
 .../CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp    | 2 +-
 .../CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp  | 2 +-
 .../Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp  | 2 +-
 src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp     | 2 +-
 src/server/scripts/Kalimdor/Maraudon/boss_landslide.cpp               | 2 +-
 src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp                 | 2 +-
 src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp      | 2 +-
 src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp               | 2 +-
 src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp     | 2 +-
 .../scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp  | 2 +-
 src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp | 2 +-
 src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp          | 2 +-
 src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp | 2 +-
 src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp          | 2 +-
 src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp          | 2 +-
 src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp             | 2 +-
 src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp        | 2 +-
 src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp             | 2 +-
 src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp         | 2 +-
 src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp           | 2 +-
 .../scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp   | 2 +-
 src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp        | 2 +-
 src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp           | 2 +-
 src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp        | 2 +-
 src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp         | 2 +-
 src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp            | 2 +-
 src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp         | 2 +-
 src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp          | 2 +-
 src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp    | 2 +-
 src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp        | 2 +-
 .../scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp | 2 +-
 .../scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp      | 2 +-
 .../scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp      | 2 +-
 src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp        | 2 +-
 src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp          | 2 +-
 src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp                   | 2 +-
 src/server/scripts/Kalimdor/ashenvale.cpp                             | 2 +-
 src/server/scripts/Kalimdor/azshara.cpp                               | 2 +-
 src/server/scripts/Kalimdor/azuremyst_isle.cpp                        | 2 +-
 src/server/scripts/Kalimdor/bloodmyst_isle.cpp                        | 2 +-
 src/server/scripts/Kalimdor/boss_azuregos.cpp                         | 2 +-
 src/server/scripts/Kalimdor/darkshore.cpp                             | 2 +-
 src/server/scripts/Kalimdor/desolace.cpp                              | 2 +-
 src/server/scripts/Kalimdor/durotar.cpp                               | 4 ++--
 src/server/scripts/Kalimdor/dustwallow_marsh.cpp                      | 2 +-
 src/server/scripts/Kalimdor/felwood.cpp                               | 2 +-
 src/server/scripts/Kalimdor/feralas.cpp                               | 2 +-
 src/server/scripts/Kalimdor/moonglade.cpp                             | 2 +-
 src/server/scripts/Kalimdor/mulgore.cpp                               | 2 +-
 src/server/scripts/Kalimdor/orgrimmar.cpp                             | 2 +-
 src/server/scripts/Kalimdor/silithus.cpp                              | 2 +-
 src/server/scripts/Kalimdor/stonetalon_mountains.cpp                  | 2 +-
 src/server/scripts/Kalimdor/tanaris.cpp                               | 2 +-
 src/server/scripts/Kalimdor/teldrassil.cpp                            | 2 +-
 src/server/scripts/Kalimdor/the_barrens.cpp                           | 2 +-
 src/server/scripts/Kalimdor/thousand_needles.cpp                      | 2 +-
 src/server/scripts/Kalimdor/thunder_bluff.cpp                         | 2 +-
 src/server/scripts/Kalimdor/ungoro_crater.cpp                         | 2 +-
 src/server/scripts/Kalimdor/winterspring.cpp                          | 2 +-
 src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp  | 2 +-
 src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp  | 2 +-
 .../Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp | 2 +-
 .../scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp  | 2 +-
 src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp    | 2 +-
 src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp | 2 +-
 .../scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp      | 2 +-
 .../Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp        | 2 +-
 .../scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp    | 2 +-
 .../scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp       | 2 +-
 .../CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp    | 2 +-
 .../CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp        | 2 +-
 .../CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp     | 2 +-
 .../TrialOfTheChampion/instance_trial_of_the_champion.cpp             | 2 +-
 .../CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp    | 2 +-
 src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp             | 2 +-
 src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp            | 2 +-
 src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp        | 2 +-
 src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp        | 2 +-
 .../scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp    | 2 +-
 .../scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp      | 2 +-
 .../Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp     | 2 +-
 .../scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp     | 2 +-
 .../Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp    | 2 +-
 .../scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp   | 2 +-
 .../scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp   | 2 +-
 .../Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp   | 2 +-
 .../FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp    | 2 +-
 .../Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp    | 2 +-
 .../scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp     | 2 +-
 .../Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp    | 2 +-
 .../Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp        | 2 +-
 src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp  | 2 +-
 src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp       | 2 +-
 src/server/scripts/Northrend/Gundrak/boss_eck.cpp                     | 2 +-
 src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp               | 2 +-
 src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp                 | 2 +-
 src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp                | 2 +-
 src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp             | 2 +-
 src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp            | 2 +-
 src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp              | 2 +-
 src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp         | 2 +-
 src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp                 | 2 +-
 src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp                | 2 +-
 src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp             | 2 +-
 src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp                | 2 +-
 src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp             | 2 +-
 src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp               | 2 +-
 src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp               | 2 +-
 src/server/scripts/Northrend/Naxxramas/boss_noth.cpp                  | 2 +-
 src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp             | 2 +-
 src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp             | 2 +-
 src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp             | 2 +-
 src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp              | 2 +-
 src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp         | 2 +-
 src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp     | 2 +-
 .../Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp        | 2 +-
 src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp            | 2 +-
 src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp         | 2 +-
 src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp      | 2 +-
 src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp             | 2 +-
 src/server/scripts/Northrend/Nexus/Nexus/commander_kolurg.cpp         | 2 +-
 src/server/scripts/Northrend/Nexus/Nexus/commander_stoutbeard.cpp     | 2 +-
 src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp           | 2 +-
 src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp             | 2 +-
 src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp             | 2 +-
 src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp               | 2 +-
 src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp              | 2 +-
 src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp         | 2 +-
 src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp                  | 2 +-
 src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp      | 2 +-
 .../scripts/Northrend/ObsidianSanctum/instance_obsidian_sanctum.cpp   | 2 +-
 .../scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp      | 2 +-
 src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp   | 2 +-
 src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp   | 2 +-
 src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp | 2 +-
 .../Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp | 2 +-
 src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp  | 2 +-
 .../scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp    | 2 +-
 src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp     | 2 +-
 src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp   | 2 +-
 .../scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp | 2 +-
 src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp           | 2 +-
 src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp  | 2 +-
 src/server/scripts/Northrend/Ulduar/ulduar/boss_auriaya.cpp           | 2 +-
 src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp   | 2 +-
 src/server/scripts/Northrend/Ulduar/ulduar/boss_freya.cpp             | 2 +-
 src/server/scripts/Northrend/Ulduar/ulduar/boss_general_vezax.cpp     | 2 +-
 src/server/scripts/Northrend/Ulduar/ulduar/boss_hodir.cpp             | 2 +-
 src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp             | 2 +-
 src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp          | 2 +-
 src/server/scripts/Northrend/Ulduar/ulduar/boss_mimiron.cpp           | 2 +-
 src/server/scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp        | 2 +-
 src/server/scripts/Northrend/Ulduar/ulduar/boss_thorim.cpp            | 2 +-
 src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp             | 2 +-
 src/server/scripts/Northrend/Ulduar/ulduar/boss_yoggsaron.cpp         | 2 +-
 src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp        | 2 +-
 src/server/scripts/Northrend/Ulduar/ulduar/ulduar_teleporter.cpp      | 2 +-
 .../Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp   | 2 +-
 .../scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp       | 2 +-
 .../Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp       | 2 +-
 .../Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp       | 2 +-
 src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp | 2 +-
 .../scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp   | 2 +-
 .../scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp      | 2 +-
 .../scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp      | 2 +-
 .../scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp     | 2 +-
 .../Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp       | 2 +-
 src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp        | 2 +-
 src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp          | 2 +-
 src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp         | 2 +-
 src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp         | 2 +-
 .../scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp  | 2 +-
 src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp            | 2 +-
 src/server/scripts/Northrend/VioletHold/boss_erekem.cpp               | 2 +-
 src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp              | 2 +-
 src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp            | 2 +-
 src/server/scripts/Northrend/VioletHold/boss_moragg.cpp               | 2 +-
 src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp               | 2 +-
 src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp              | 2 +-
 src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp      | 2 +-
 src/server/scripts/Northrend/VioletHold/violet_hold.cpp               | 2 +-
 src/server/scripts/Northrend/borean_tundra.cpp                        | 2 +-
 src/server/scripts/Northrend/crystalsong_forest.cpp                   | 2 +-
 src/server/scripts/Northrend/dalaran.cpp                              | 2 +-
 src/server/scripts/Northrend/dragonblight.cpp                         | 2 +-
 src/server/scripts/Northrend/grizzly_hills.cpp                        | 2 +-
 src/server/scripts/Northrend/howling_fjord.cpp                        | 2 +-
 src/server/scripts/Northrend/icecrown.cpp                             | 2 +-
 src/server/scripts/Northrend/sholazar_basin.cpp                       | 2 +-
 src/server/scripts/Northrend/storm_peaks.cpp                          | 2 +-
 src/server/scripts/Northrend/zuldrak.cpp                              | 2 +-
 .../Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp        | 2 +-
 .../Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp       | 2 +-
 .../scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp | 2 +-
 src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp  | 2 +-
 .../scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp  | 2 +-
 .../scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp | 2 +-
 .../Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp        | 2 +-
 .../Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp    | 2 +-
 .../Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp        | 2 +-
 .../Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp    | 2 +-
 src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp | 2 +-
 .../Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp  | 2 +-
 src/server/scripts/Outland/BlackTemple/black_temple.cpp               | 2 +-
 src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp             | 2 +-
 src/server/scripts/Outland/BlackTemple/boss_illidan.cpp               | 2 +-
 src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp        | 2 +-
 src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp    | 2 +-
 src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp        | 2 +-
 src/server/scripts/Outland/BlackTemple/boss_supremus.cpp              | 2 +-
 src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp       | 2 +-
 src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp      | 2 +-
 src/server/scripts/Outland/BlackTemple/illidari_council.cpp           | 2 +-
 src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp      | 2 +-
 .../CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp    | 2 +-
 .../CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp     | 2 +-
 .../Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp       | 2 +-
 .../CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp      | 2 +-
 .../Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp     | 2 +-
 .../CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp      | 2 +-
 .../CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp       | 2 +-
 .../Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp | 2 +-
 .../CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp       | 2 +-
 .../Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp  | 2 +-
 .../Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp     | 2 +-
 .../scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp     | 2 +-
 .../Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp     | 2 +-
 src/server/scripts/Outland/GruulsLair/boss_gruul.cpp                  | 2 +-
 src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp      | 2 +-
 src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp        | 2 +-
 .../scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp     | 2 +-
 .../Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp | 2 +-
 .../scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp   | 2 +-
 .../Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp   | 2 +-
 .../HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp      | 2 +-
 .../HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp     | 2 +-
 .../HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp   | 2 +-
 .../HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp   | 2 +-
 .../Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp     | 2 +-
 .../HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp   | 2 +-
 .../Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp        | 2 +-
 .../Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp | 2 +-
 .../ShatteredHalls/boss_warchief_kargath_bladefist.cpp                | 2 +-
 .../HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp       | 2 +-
 src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp              | 2 +-
 src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp       | 2 +-
 src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp          | 2 +-
 src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp       | 2 +-
 src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp       | 2 +-
 src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp                | 2 +-
 .../Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp        | 2 +-
 .../Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp        | 2 +-
 .../Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp      | 2 +-
 .../Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp    | 2 +-
 src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp | 2 +-
 src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp          | 2 +-
 .../scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp   | 2 +-
 src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp | 2 +-
 .../Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp      | 2 +-
 src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp          | 2 +-
 .../scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp       | 2 +-
 src/server/scripts/Outland/blades_edge_mountains.cpp                  | 2 +-
 src/server/scripts/Outland/boss_doomlord_kazzak.cpp                   | 2 +-
 src/server/scripts/Outland/boss_doomwalker.cpp                        | 2 +-
 src/server/scripts/Outland/hellfire_peninsula.cpp                     | 2 +-
 src/server/scripts/Outland/nagrand.cpp                                | 2 +-
 src/server/scripts/Outland/netherstorm.cpp                            | 2 +-
 src/server/scripts/Outland/shadowmoon_valley.cpp                      | 2 +-
 src/server/scripts/Outland/shattrath_city.cpp                         | 2 +-
 src/server/scripts/Outland/terokkar_forest.cpp                        | 2 +-
 src/server/scripts/Outland/zangarmarsh.cpp                            | 2 +-
 src/server/scripts/World/areatrigger_scripts.cpp                      | 2 +-
 src/server/scripts/World/boss_emeriss.cpp                             | 2 +-
 src/server/scripts/World/boss_lethon.cpp                              | 2 +-
 src/server/scripts/World/boss_taerar.cpp                              | 2 +-
 src/server/scripts/World/boss_ysondre.cpp                             | 2 +-
 src/server/scripts/World/go_scripts.cpp                               | 2 +-
 src/server/scripts/World/guards.cpp                                   | 2 +-
 src/server/scripts/World/item_scripts.cpp                             | 2 +-
 src/server/scripts/World/mob_generic_creature.cpp                     | 2 +-
 src/server/scripts/World/npc_innkeeper.cpp                            | 2 +-
 src/server/scripts/World/npc_professions.cpp                          | 2 +-
 src/server/scripts/World/npc_taxi.cpp                                 | 2 +-
 src/server/scripts/World/npcs_special.cpp                             | 2 +-
 502 files changed, 505 insertions(+), 505 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Maps/MapManager.h b/src/server/game/Maps/MapManager.h
index 891e95d75f9..f4d7c3c94bc 100644
--- a/src/server/game/Maps/MapManager.h
+++ b/src/server/game/Maps/MapManager.h
@@ -26,7 +26,7 @@
 #include "ace/Thread_Mutex.h"
 #include "Common.h"
 #include "Map.h"
-#include "Grids/GridStates.h"
+#include "GridStates.h"
 #include "MapUpdater.h"
 
 class Transport;
diff --git a/src/server/game/Weather/Weather.h b/src/server/game/Weather/Weather.h
index 35012a5f9dc..874eccba64f 100644
--- a/src/server/game/Weather/Weather.h
+++ b/src/server/game/Weather/Weather.h
@@ -26,8 +26,8 @@
 #define __WEATHER_H
 
 #include "Common.h"
-#include "Miscellaneous/SharedDefines.h"
-#include "Utilities/Timer.h"
+#include "SharedDefines.h"
+#include "Timer.h"
 
 class Player;
 
diff --git a/src/server/scripts/CMakeLists.txt b/src/server/scripts/CMakeLists.txt
index 3712904335d..bd7ba5d5af9 100644
--- a/src/server/scripts/CMakeLists.txt
+++ b/src/server/scripts/CMakeLists.txt
@@ -668,6 +668,6 @@ add_library(scripts STATIC ${scripts_STAT_SRCS})
 
 # Generate precompiled header
 IF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX)
-	ADD_PRECOMPILED_HEADER(scripts ${CMAKE_SOURCE_DIR}/src/server/game/Scripts/ScriptPCH.h)
+	ADD_PRECOMPILED_HEADER(scripts ${CMAKE_SOURCE_DIR}/src/server/game/PrecompiledHeaders/ScriptPCH.h)
 ENDIF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX)
 
diff --git a/src/server/scripts/Custom/npc_acherus_taxi.cpp b/src/server/scripts/Custom/npc_acherus_taxi.cpp
index 6e00e365e8e..509631e1e87 100644
--- a/src/server/scripts/Custom/npc_acherus_taxi.cpp
+++ b/src/server/scripts/Custom/npc_acherus_taxi.cpp
@@ -1,4 +1,4 @@
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "WorldPacket.h"
 
 #define GOSSIP_FLIGHT "I need a ride"
diff --git a/src/server/scripts/Custom/npc_wyrmresttempel_taxi.cpp b/src/server/scripts/Custom/npc_wyrmresttempel_taxi.cpp
index d4c2cb5ab74..109cd996144 100644
--- a/src/server/scripts/Custom/npc_wyrmresttempel_taxi.cpp
+++ b/src/server/scripts/Custom/npc_wyrmresttempel_taxi.cpp
@@ -1,4 +1,4 @@
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "WorldPacket.h"
 
 #define GOSSIP_UP      "My Lord, I must go to the upper floor of the temple."
diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp
index ce2a81c864a..bb86b9cd69d 100644
--- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp
+++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp
@@ -14,7 +14,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 enum Spells
 {
diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp
index 6477ebe5eaf..e72d683d0f4 100644
--- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp
+++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp
@@ -14,7 +14,7 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 enum Spells
 {
diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp
index a12b9f267f9..d4fbae31032 100644
--- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp
+++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp
@@ -14,7 +14,7 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 enum Spells
 {
diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp
index 785827bc5d9..9e2c1bade01 100644
--- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp
+++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp
@@ -14,7 +14,7 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 enum Yells
 {
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp
index e04fa8444b2..09ed6a1c4b0 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp
@@ -36,7 +36,7 @@ npc_tobias_seecher
 npc_rocknot
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ScriptedEscortAI.h"
 #include "blackrock_depths.h"
 
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp
index a387e816951..82a28197f30 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Blackrock Depths
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 enum Spells
 {
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp
index 60e1dec236c..8565305f672 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Blackrock Depths
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 enum Spells
 {
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp
index 29fe219d6ec..6706b4b290c 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Blackrock Depths
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 enum Yells
 {
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp
index 77d69263133..d3020d572d2 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Blackrock Depths
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 enum Spells
 {
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp
index 886bc3fc909..5106fd05d99 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Blackrock Depths
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 enum Spells
 {
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp
index d3551d38790..af7a381af38 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Blackrock Depths
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 enum Yells
 {
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp
index 2af203826a1..6a82765f5a2 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Blackrock Depths
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 enum Spells
 {
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp
index 2a0cf9be133..785a4ab3258 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Blackrock Depths
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 enum Spells
 {
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp
index 1c0ed389287..b1aabbce9d2 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp
@@ -21,7 +21,7 @@ SDComment: Healing of Emperor NYI
 SDCategory: Blackrock Depths
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 enum Spells
 {
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp
index 94a37e8da7e..a66796cab03 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp
@@ -21,7 +21,7 @@ SDComment: Learning Smelt Dark Iron if tribute quest rewarded. Missing event.
 SDCategory: Blackrock Depths
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "blackrock_depths.h"
 
 enum Spells
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp
index 7684aa6c6ac..6c865ee214d 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp
@@ -29,7 +29,7 @@ update `creature_template` set `npcflag`='1',`ScriptName`='npc_tobias_seecher' w
 update `instance_template` set `script`='instance_blackrock_depths' where `map`='230';
 */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "blackrock_depths.h"
 
 #define TIMER_TOMBOFTHESEVEN    15000
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/blackrock_spire.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/blackrock_spire.cpp
index 2ea115e6e0b..8d6f1f1211f 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/blackrock_spire.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/blackrock_spire.cpp
@@ -14,7 +14,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "blackrock_spire.h"
 
 enum Creatures
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_drakkisath.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_drakkisath.cpp
index b53ddaf23ef..dec106dfede 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_drakkisath.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_drakkisath.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Blackrock Spire
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SPELL_FIRENOVA                  23462
 #define SPELL_CLEAVE                    20691
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gyth.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gyth.cpp
index fcd2ea1a6d0..762f82ded0f 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gyth.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gyth.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Blackrock Spire
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SPELL_CORROSIVEACID      20667
 #define SPELL_FREEZE             18763
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_halycon.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_halycon.cpp
index 9e78667717a..a95895749b1 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_halycon.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_halycon.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Blackrock Spire
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SPELL_CROWDPUMMEL       10887
 #define SPELL_MIGHTYBLOW        14099
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_highlord_omokk.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_highlord_omokk.cpp
index 65f1e8081a0..933d8f7264b 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_highlord_omokk.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_highlord_omokk.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Blackrock Spire
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SPELL_WARSTOMP          24375
 #define SPELL_CLEAVE            15579
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_mother_smolderweb.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_mother_smolderweb.cpp
index 60dda5a5fab..3c4cc0c0d42 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_mother_smolderweb.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_mother_smolderweb.cpp
@@ -21,7 +21,7 @@ SDComment: Uncertain how often mother's milk is casted
 SDCategory: Blackrock Spire
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SPELL_CRYSTALIZE                16104
 #define SPELL_MOTHERSMILK               16468
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_overlord_wyrmthalak.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_overlord_wyrmthalak.cpp
index 8846442705b..e63bde01cc0 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_overlord_wyrmthalak.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_overlord_wyrmthalak.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Blackrock Spire
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SPELL_BLASTWAVE         11130
 #define SPELL_SHOUT             23511
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_pyroguard_emberseer.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_pyroguard_emberseer.cpp
index 6cbd6955665..44a64dc5d0d 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_pyroguard_emberseer.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_pyroguard_emberseer.cpp
@@ -21,7 +21,7 @@ SDComment: Event to activate Emberseer NYI
 SDCategory: Blackrock Spire
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SPELL_FIRENOVA          23462
 #define SPELL_FLAMEBUFFET       23341
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_quartermaster_zigris.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_quartermaster_zigris.cpp
index 9058b35cd5c..869d3978a0b 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_quartermaster_zigris.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_quartermaster_zigris.cpp
@@ -21,7 +21,7 @@ SDComment: Needs revision
 SDCategory: Blackrock Spire
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SPELL_SHOOT             16496
 #define SPELL_STUNBOMB          16497
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_rend_blackhand.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_rend_blackhand.cpp
index 56de5dbb385..390aeb9ae03 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_rend_blackhand.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_rend_blackhand.cpp
@@ -21,7 +21,7 @@ SDComment: Intro event NYI
 SDCategory: Blackrock Spire
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SPELL_WHIRLWIND                 26038
 #define SPELL_CLEAVE                    20691
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp
index 73afc3b5afe..ccb1b27f9ea 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Blackrock Spire
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SPELL_CURSEOFBLOOD      24673
 #define SPELL_HEX               16708
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_the_beast.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_the_beast.cpp
index 499f9cf4ce5..307c6c28653 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_the_beast.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_the_beast.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Blackrock Spire
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SPELL_FLAMEBREAK            16785
 #define SPELL_IMMOLATE              20294
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_warmaster_voone.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_warmaster_voone.cpp
index 50b47c94fc5..c1c4c7563f6 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_warmaster_voone.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_warmaster_voone.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Blackrock Spire
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SPELL_SNAPKICK          15618
 #define SPELL_CLEAVE            15579
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp
index f2e2b39fe87..3f0bc377118 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp
@@ -14,7 +14,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "blackrock_spire.h"
 
 enum Achievements
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp
index 856e1236176..cf2b58ac336 100644
--- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Blackwing Lair
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SAY_AGGRO               -1469000
 #define SAY_LEASH               -1469001
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp
index 08bebe95384..b34d9bf9ea0 100644
--- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp
@@ -21,7 +21,7 @@ SDComment: Chromatic Mutation disabled due to lack of core support
 SDCategory: Blackwing Lair
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 enum Emotes
 {
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_ebonroc.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_ebonroc.cpp
index 49a999fc458..9c2657be8a7 100644
--- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_ebonroc.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_ebonroc.cpp
@@ -21,7 +21,7 @@ SDComment: Shadow of Ebonroc needs core support
 SDCategory: Blackwing Lair
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SPELL_SHADOWFLAME           22539
 #define SPELL_WINGBUFFET            18500
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_firemaw.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_firemaw.cpp
index af62b1103bc..f7712bbfd86 100644
--- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_firemaw.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_firemaw.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Blackwing Lair
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SPELL_SHADOWFLAME       22539
 #define SPELL_WINGBUFFET        23339
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp
index b29fe41f2b1..d2e8c392110 100644
--- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Blackwing Lair
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define EMOTE_FRENZY            -1469031
 
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp
index 5ef05be519c..12f4e49f3a9 100644
--- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp
@@ -21,7 +21,7 @@ SDComment: Some issues with class calls effecting more than one class
 SDCategory: Blackwing Lair
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SAY_AGGRO               -1469007
 #define SAY_XHEALTH             -1469008
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp
index a095756b18b..04a18187e24 100644
--- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp
@@ -21,7 +21,7 @@ SDComment: Needs additional review. Phase 1 NYI (Grethok the Controller)
 SDCategory: Blackwing Lair
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 //Razorgore Phase 2 Script
 
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp
index f6e94307f2f..233d7074a4e 100644
--- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp
@@ -21,7 +21,7 @@ SDComment: Burning Adrenaline not correctly implemented in core
 SDCategory: Blackwing Lair
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SAY_LINE1           -1469026
 #define SAY_LINE2           -1469027
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp
index dfeb2519bae..74d118033c6 100644
--- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp
@@ -21,7 +21,7 @@ SDComment: Missing some text, Vael beginning event, and spawns Nef in wrong plac
 SDCategory: Blackwing Lair
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SAY_GAMESBEGIN_1        -1469004
 #define SAY_GAMESBEGIN_2        -1469005
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/instance_blackwing_lair.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/instance_blackwing_lair.cpp
index d6403fa1206..7a299edaf85 100644
--- a/src/server/scripts/EasternKingdoms/BlackwingLair/instance_blackwing_lair.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackwingLair/instance_blackwing_lair.cpp
@@ -21,5 +21,5 @@ SDComment:
 SDCategory: Blackwing Lair
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
diff --git a/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp b/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp
index 5c6bab46e5a..d92f8d2c2f4 100644
--- a/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp
+++ b/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp
@@ -22,7 +22,7 @@ SD%Complete:
 SDComment: Timers and say taken from acid script
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "deadmines.h"
 
 enum eSpels
diff --git a/src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp b/src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp
index 5bc1121bead..805d5887cdd 100644
--- a/src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp
+++ b/src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp
@@ -21,7 +21,7 @@ SDComment: Placeholder
 SDCategory: Deadmines
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "deadmines.h"
 #include "Spell.h"
 
diff --git a/src/server/scripts/EasternKingdoms/Deadmines/deadmines.h b/src/server/scripts/EasternKingdoms/Deadmines/deadmines.h
index 203494ad5b7..1d25f91ce86 100644
--- a/src/server/scripts/EasternKingdoms/Deadmines/deadmines.h
+++ b/src/server/scripts/EasternKingdoms/Deadmines/deadmines.h
@@ -1,7 +1,7 @@
 #ifndef DEF_DEADMINES_H
 #define DEF_DEADMINES_H
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 enum CannonState
 {
diff --git a/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp b/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
index f1aa0c62b8a..ee9cc60c18f 100644
--- a/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
+++ b/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Deadmines
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "deadmines.h"
 
 enum Sounds
diff --git a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp
index c39bfb69910..84438a2c1ad 100644
--- a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp
+++ b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp
@@ -23,7 +23,7 @@ SD%Complete: 90%
 SDComment: Some visual effects are not implemented.
 Script Data End */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "gnomeregan.h"
 #include "ScriptedEscortAI.h"
 
diff --git a/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp b/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp
index 980a6d3552b..7db91a2aef5 100644
--- a/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp
+++ b/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "gnomeregan.h"
 
 #define    MAX_ENCOUNTER  1
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp
index 7105d27ca6a..9ddc8f974d5 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Karazhan
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SAY_AGGRO                       -1532057
 #define SAY_SUMMON1                     -1532058
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp
index 21db1be1be3..09b7c437014 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Karazhan
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SAY_AGGRO               -1532018
 #define SAY_SLAY1               -1532019
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp
index a2f2a8b605e..8856445ff2b 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Karazhan
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SAY_MIDNIGHT_KILL           -1532000
 #define SAY_APPEAR1                 -1532001
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp
index 6c8fabcca35..bf52ceafa20 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Karazhan
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "karazhan.h"
 
 #define SAY_AGGRO           -1532011
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp
index 004f1902bfc..e4240a732e9 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp
@@ -21,7 +21,7 @@ SDComment: Not sure about timing and portals placing
 SDCategory: Karazhan
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "karazhan.h"
 
 #define EMOTE_PHASE_PORTAL          -1532089
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp
index 2e8b6f51317..d542ed7fabc 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp
@@ -21,7 +21,7 @@ SDComment: SDComment: Timers may incorrect
 SDCategory: Karazhan
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "karazhan.h"
 
 //phase 1
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp
index 1071eae78a0..e1ba09753fb 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Karazhan
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "karazhan.h"
 
 #define SAY_AGGRO           -1532091
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
index 394cff3ccc5..19bf7d235ed 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
@@ -21,7 +21,7 @@ SDComment: Flame wreath missing cast animation, mods won't triggere.
 SDCategory: Karazhan
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ScriptedSimpleAI.h"
 #include "karazhan.h"
 #include "GameObject.h"
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
index 5305cc8d354..9f85cef83ea 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
@@ -21,7 +21,7 @@ SDComment: Complete! Needs adjustments to use spell though.
 SDCategory: Karazhan
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "karazhan.h"
 
 #define SAY_SLAY1                   -1532065
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
index ae6de9c1add..11e87b9e82e 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
@@ -21,7 +21,7 @@ SDComment: Oz, Hood, and RAJ event implemented. RAJ event requires more testing.
 SDCategory: Karazhan
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "karazhan.h"
 
 /***********************************/
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp
index 59c1236bcdc..0911efc01f0 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp
@@ -21,7 +21,7 @@ SDComment: Instance Script for Karazhan to help in various encounters. TODO: Gam
 SDCategory: Karazhan
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "karazhan.h"
 
 #define MAX_ENCOUNTER      12
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
index 5186a794b0d..321a65c2544 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
@@ -27,7 +27,7 @@ npc_berthold
 npc_image_of_medivh
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "karazhan.h"
 #include "ScriptedEscortAI.h"
 
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
index b5835dfe0a1..70a35bc1c73 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
@@ -21,7 +21,7 @@ SDComment: Normal and Heroic Support. Issues: Arcane Spheres do not initially fo
 SDCategory: Magisters' Terrace
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "magisters_terrace.h"
 #include "WorldPacket.h"
 
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
index 2112eaabc87..fb01176b579 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
@@ -21,7 +21,7 @@ SDComment: No Heroic support yet. Needs further testing. Several scripts for pet
 SDCategory: Magister's Terrace
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "magisters_terrace.h"
 
 struct Speech
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
index adb0700eabf..7dc8db7ce15 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
@@ -21,7 +21,7 @@ SDComment: Heroic and Normal Support. Needs further testing.
 SDCategory: Magister's Terrace
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "magisters_terrace.h"
 
 #define SAY_AGGRO                       -1585000
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
index bc8bd5cec30..d64da62566a 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
@@ -21,7 +21,7 @@ SDComment: Heroic and Normal support. Needs further testing.
 SDCategory: Magister's Terrace
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "magisters_terrace.h"
 
 enum eEnums
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
index 455c03739bc..715261f8239 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
@@ -21,7 +21,7 @@ SDComment:  Designed only for Selin Fireheart
 SDCategory: Magister's Terrace
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "magisters_terrace.h"
 
 #define MAX_ENCOUNTER      4
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp
index e46da9cb1bf..c2c9be38341 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp
@@ -25,7 +25,7 @@ EndScriptData */
 npc_kalecgos
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 /*######
 ## npc_kalecgos
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_baron_geddon.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_baron_geddon.cpp
index 77c6fafa10a..45363c5be77 100644
--- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_baron_geddon.cpp
+++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_baron_geddon.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Molten Core
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define EMOTE_SERVICE               -1409000
 
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_garr.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_garr.cpp
index 75891cf8c43..fcf5560d5fe 100644
--- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_garr.cpp
+++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_garr.cpp
@@ -21,7 +21,7 @@ SDComment: Adds NYI
 SDCategory: Molten Core
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 // Garr spells
 #define SPELL_ANTIMAGICPULSE        19492
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_gehennas.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_gehennas.cpp
index 9ebe69c0c4e..5a003c06ad8 100644
--- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_gehennas.cpp
+++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_gehennas.cpp
@@ -21,7 +21,7 @@ SDComment: Adds MC NYI
 SDCategory: Molten Core
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SPELL_SHADOWBOLT            19728
 #define SPELL_RAINOFFIRE            19717
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_golemagg.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_golemagg.cpp
index 2aba378d399..38837526134 100644
--- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_golemagg.cpp
+++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_golemagg.cpp
@@ -21,7 +21,7 @@ SDComment: Timers need to be confirmed, Golemagg's Trust need to be checked
 SDCategory: Molten Core
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "molten_core.h"
 
 enum eEnums
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_lucifron.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_lucifron.cpp
index 50601f04147..64718fcbff1 100644
--- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_lucifron.cpp
+++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_lucifron.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Molten Core
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SPELL_IMPENDINGDOOM 19702
 #define SPELL_LUCIFRONCURSE 19703
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_magmadar.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_magmadar.cpp
index f612003b076..a60aba45bdd 100644
--- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_magmadar.cpp
+++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_magmadar.cpp
@@ -21,7 +21,7 @@ SDComment: Conflag on ground nyi, fear causes issues without VMAPs
 SDCategory: Molten Core
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define EMOTE_FRENZY                -1409001
 
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_majordomo_executus.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_majordomo_executus.cpp
index 11ae70befcf..6dbf035f98e 100644
--- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_majordomo_executus.cpp
+++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_majordomo_executus.cpp
@@ -21,7 +21,7 @@ SDComment: Correct spawning and Event NYI
 SDCategory: Molten Core
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SAY_AGGRO           -1409003
 #define SAY_SPAWN           -1409004
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp
index 71c0b40de3f..adc12c3ea87 100644
--- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp
+++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp
@@ -21,7 +21,7 @@ SDComment: Intro Dialog and event NYI
 SDCategory: Molten Core
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SAY_REINFORCEMENTS1         -1409013
 #define SAY_REINFORCEMENTS2         -1409014
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_shazzrah.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_shazzrah.cpp
index 4b0774cdc54..1ddad9bc641 100644
--- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_shazzrah.cpp
+++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_shazzrah.cpp
@@ -21,7 +21,7 @@ SDComment: Teleport NYI
 SDCategory: Molten Core
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SPELL_ARCANEEXPLOSION           19712
 #define SPELL_SHAZZRAHCURSE             19713
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_sulfuron_harbinger.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_sulfuron_harbinger.cpp
index 83288fe003b..ce908bac660 100644
--- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_sulfuron_harbinger.cpp
+++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_sulfuron_harbinger.cpp
@@ -21,7 +21,7 @@ SDComment: Adds NYI
 SDCategory: Molten Core
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "molten_core.h"
 
 #define SPELL_DARKSTRIKE            19777
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/instance_molten_core.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/instance_molten_core.cpp
index eb79c234134..dbb7f73776c 100644
--- a/src/server/scripts/EasternKingdoms/MoltenCore/instance_molten_core.cpp
+++ b/src/server/scripts/EasternKingdoms/MoltenCore/instance_molten_core.cpp
@@ -21,7 +21,7 @@ SDComment: Place Holder
 SDCategory: Molten Core
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "molten_core.h"
 
 #define MAX_ENCOUNTER      9
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/molten_core.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/molten_core.cpp
index f8fe5bf1477..f7a683be9a3 100644
--- a/src/server/scripts/EasternKingdoms/MoltenCore/molten_core.cpp
+++ b/src/server/scripts/EasternKingdoms/MoltenCore/molten_core.cpp
@@ -25,7 +25,7 @@ EndScriptData */
 mob_ancient_core_hound
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ScriptedSimpleAI.h"
 
 #define SPELL_CONE_OF_FIRE          19630
diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
index bdbf6b7c081..f801f7e872e 100644
--- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "Vehicle.h"
 #include "ObjectMgr.h"
 #include "ScriptedEscortAI.h"
diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
index 91f7e0e6cbe..d917edcd0d3 100644
--- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ScriptedEscortAI.h"
 
 //How to win friends and influence enemies
diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp
index 3b0ce186592..6a95c41746b 100644
--- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ScriptedEscortAI.h"
 
 #define LESS_MOB // if you do not have a good server and do not want it to be laggy as hell
diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp
index cdfd69234fb..c3eb2869372 100644
--- a/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 /*####
 ## npc_valkyr_battle_maiden
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp
index cb6ed1daf22..60371bba99c 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Scarlet Monastery
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 enum eEnums
 {
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp
index 6b6efa0f934..4080a3169d1 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Scarlet Monastery
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SPELL_CALLOFTHEGRAVE            17831
 #define SPELL_TERRIFY                   7399
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp
index f7b6b7cce4b..56056d5e48d 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Scarlet Monastery
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 enum eEnums
 {
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
index 17bbf0c23c6..925eb74618c 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Scarlet Monastery
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "SpellMgr.h"
 #include "scarlet_monastery.h"
 
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp
index e0db29aa240..d97aef2f10a 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp
@@ -21,7 +21,7 @@ SDComment: Should in addition spawn Myrmidons in the hallway outside
 SDCategory: Scarlet Monastery
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ScriptedEscortAI.h"
 
 #define SAY_AGGRO                   -1189000
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp
index b9b15f34508..5086caf9d78 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp
@@ -21,7 +21,7 @@ SDComment: TODO: if this guy not involved in some special event, remove (and let
 SDCategory: Scarlet Monastery
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 enum eSpells
 {
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp
index 300e69611cd..92e2091effb 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Scarlet Monastery
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 enum eEnums
 {
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp
index b4b84fc8059..7a8a092eaa9 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Scarlet Monastery
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "scarlet_monastery.h"
 
 enum eEnums
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp
index 32b85e214a0..10d9c3f9996 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Scarlet Monastery
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "scarlet_monastery.h"
 
 enum eEnums
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp
index 5d0a3b3792f..d09388d6963 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Scarlet Monastery
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SPELL_LICHSLAP                  28873
 #define SPELL_FROSTBOLTVOLLEY           8398
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp
index 33642d4511c..72cc08b674c 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Scarlet Monastery
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "scarlet_monastery.h"
 
 #define ENTRY_PUMPKIN_SHRINE    186267
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp
index 50a9e204566..6dc15fd64bd 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp
@@ -21,7 +21,7 @@ SDComment: Doors missing in instance script.
 SDCategory: Scholomance
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "scholomance.h"
 
 #define SPELL_ARCANEMISSILES           22272
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_death_knight_darkreaver.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_death_knight_darkreaver.cpp
index 8bb9ec68aca..8032bf42658 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_death_knight_darkreaver.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_death_knight_darkreaver.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Scholomance
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 struct boss_death_knight_darkreaverAI : public ScriptedAI
 {
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp
index 5ff01d48623..852e62f12cd 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Scholomance
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "scholomance.h"
 
 enum eEnums
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp
index a038fc7a0b8..7ae60615085 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Scholomance
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "scholomance.h"
 
 #define SPELL_CURSEOFAGONY      18671
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp
index c4c0f95d8d1..8ce846ca456 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Scholomance
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "scholomance.h"
 
 #define SPELL_CALLOFGRAVES         17831
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp
index f8d8520e394..598b258d5b0 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Scholomance
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SPELL_CURSEOFBLOOD          24673
 //#define SPELL_ILLUSION              17773
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp
index c4ae5cc490e..e93ab0c424e 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Scholomance
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SPELL_SHADOWBOLTVOLLEY      20741
 #define SPELL_BONESHIELD            27688
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp
index 0956a04d824..b9409ed7400 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp
@@ -21,7 +21,7 @@ SDComment: aura applied/defined in database
 SDCategory: Scholomance
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "scholomance.h"
 
 #define SPELL_IMMOLATE             20294                    // Old ID  was 15570
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp
index d3b75900202..c00de34489c 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Scholomance
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "scholomance.h"
 
 #define SPELL_VOLATILEINFECTION      24928
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp
index 63837e04ad5..9a76ee220d6 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Scholomance
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SPELL_FROSTBOLT         21369
 #define SPELL_ICEARMOR          18100                       //This is actually a buff he gives himself
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp
index 6340f2b0e2d..5d236d28a94 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Scholomance
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "scholomance.h"
 
 #define SPELL_TRAMPLE           15550
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp
index a38369faab0..aa9bb06eb6f 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Scholomance
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 enum eEnums
 {
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp b/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp
index 992849cff1b..d3ae27374c7 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Scholomance
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "scholomance.h"
 
 #define GO_GATE_KIRTONOS    175570
diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
index 20959641889..f80de543714 100644
--- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
+++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Shadowfang Keep
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "shadowfang_keep.h"
 
 #define MAX_ENCOUNTER              4
diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
index 23b8ad89160..72922017ab4 100644
--- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
+++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
@@ -25,7 +25,7 @@ EndScriptData */
 npc_shadowfang_prisoner
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ScriptedEscortAI.h"
 #include "shadowfang_keep.h"
 
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp
index de17717e289..ddde69bde3a 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp
@@ -21,7 +21,7 @@ SDComment: aura applied/defined in database
 SDCategory: Stratholme
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "stratholme.h"
 
 #define SAY_0    "Intruders! More pawns of the Argent Dawn, no doubt. I already count one of their number among my prisoners. Withdraw from my domain before she is executed!"
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp
index cff4fe3fbae..808a8213b75 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp
@@ -21,7 +21,7 @@ SDComment: MC disabled
 SDCategory: Stratholme
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "stratholme.h"
 
 #define SPELL_BANSHEEWAIL   16565
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp
index c12f7b9ad04..4c533c3f276 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Stratholme
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 //front, left
 #define ADD_1X 3553.851807
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp
index a8489a7f549..fffeb966d75 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp
@@ -21,7 +21,7 @@ SDComment: Possibly need to fix/improve summons after death
 SDCategory: Stratholme
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 enum eEnums
 {
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp
index 89de7dbc207..3e806c502c2 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Stratholme
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "stratholme.h"
 
 #define SPELL_DRAININGBLOW    16793
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp
index 0c1cf011d5e..48a497899bb 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Stratholme
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "stratholme.h"
 
 #define SPELL_FROSTBOLT    17503
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp
index ae7299071f4..9f8ab239ec0 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Stratholme
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "stratholme.h"
 
 #define SPELL_ENCASINGWEBS          4962
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp
index 905feb9fffc..cb922246d46 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp
@@ -21,7 +21,7 @@ SDComment: Basic script to have support for Horde paladin epic mount (quest 9737
 SDCategory: Stratholme
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "stratholme.h"
 
 /*#####
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp
index c04bae15468..6671e48e9df 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Stratholme
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 //Spell ID to summon this guy is 24627 "Summon Postmaster Malown"
 //He should be spawned along with three other elites once the third postbox has been opened
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp
index 3a3ae60c9c9..640ded28264 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Stratholme
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "stratholme.h"
 
 #define SPELL_TRAMPLE       5568
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp
index f15eb59ba47..2567a6dc07b 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Stratholme
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SAY_SPAWN   "TIMMY!"
 
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp
index ffeaa070a26..191be16cd19 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp
@@ -21,7 +21,7 @@ SDComment: In progress. Undead side 75% implemented. Save/load not implemented.
 SDCategory: Stratholme
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "stratholme.h"
 
 #define GO_SERVICE_ENTRANCE     175368
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp
index 035fca68b95..402c7c18171 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp
@@ -28,7 +28,7 @@ mob_restless_soul
 mobs_spectral_ghostly_citizen
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "stratholme.h"
 
 /*######
diff --git a/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp b/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp
index 6fe65cf963d..faab9af0337 100644
--- a/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp
+++ b/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp
@@ -21,7 +21,7 @@ SDComment:Place Holder
 SDCategory: Sunken Temple
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "sunken_temple.h"
 
 #define GO_ATALAI_STATUE1 148830
diff --git a/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp b/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp
index 7f0ca126d78..9f5dba4408c 100644
--- a/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp
+++ b/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp
@@ -25,7 +25,7 @@ EndScriptData */
 at_malfurion_Stormrage_trigger
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "sunken_temple.h"
 
 /*#####
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp
index 59e58d6df1a..52ded56c5ae 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp
@@ -20,7 +20,7 @@ SD%Complete: 80
 SDComment: Find a way to start the intro, best code for the intro
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "sunwell_plateau.h"
 
 enum Quotes
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp
index 602f12065fa..24e28e107b4 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp
@@ -20,7 +20,7 @@ SD%Complete: 100
 SDComment:
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "sunwell_plateau.h"
 
 enum Quotes
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp
index 88ad2dbab11..5133eb7b346 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp
@@ -20,7 +20,7 @@ SD%Complete: 0
 SDComment:
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "sunwell_plateau.h"
 
 enum Yells
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
index 146771325eb..3c1ae1a1723 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Sunwell_Plateau
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "sunwell_plateau.h"
 
 enum Yells
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
index f1c3a769b28..7bd3273d9f2 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
@@ -23,7 +23,7 @@ EndScriptData */
 
 //TODO rewrite Armageddon
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "sunwell_plateau.h"
 #include 
 
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp
index 9dca453ade6..97893fc2095 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp
@@ -20,7 +20,7 @@ SD%Complete: 80
 SDComment: all sounds, black hole effect triggers to often (46228)
 */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "sunwell_plateau.h"
 
 // Muru & Entropius's spells
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp
index 94b7bf4b735..5ad630840ea 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp
@@ -9,7 +9,7 @@ SDComment: VERIFY SCRIPT
 SDCategory: Sunwell_Plateau
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "sunwell_plateau.h"
 
 #define MAX_ENCOUNTER 6
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.cpp
index dbf67d5f26e..76335087836 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.cpp
@@ -25,7 +25,7 @@ npc_prophet_velen
 npc_captain_selana
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "sunwell_plateau.h"
 
 /*######
diff --git a/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp b/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp
index cd3bc5fc219..3641f901453 100644
--- a/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp
+++ b/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp
@@ -24,7 +24,7 @@ At 33%, he will awaken the Vault Walkers
 On his death the vault door opens.
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SAY_AGGRO           "Who dares awaken Archaedas? Who dares the wrath of the makers!"
 #define SOUND_AGGRO         5855
@@ -348,7 +348,7 @@ SDComment: After activating the altar of the keepers, the stone keepers will
 wake up one by one.
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SPELL_SELF_DESTRUCT          9874
 
diff --git a/src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp b/src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp
index 9b6d5dba642..1b732f3bca8 100644
--- a/src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp
+++ b/src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Uldaman
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SAY_AGGRO                   -1070000
 
diff --git a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp
index a519ad678b7..9720d6caa79 100644
--- a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp
+++ b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp
@@ -14,7 +14,7 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SPELL_ARCHAEDAS_AWAKEN        10347
 #define SPELL_AWAKEN_VAULT_WALKER     10258
diff --git a/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp
index 2bd8387efa5..90e5bb734b7 100644
--- a/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp
+++ b/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp
@@ -26,7 +26,7 @@ mob_jadespine_basilisk
 npc_lore_keeper_of_norgannon
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 /*######
 ## mob_jadespine_basilisk
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
index f516065cc03..93f197a6867 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
@@ -23,7 +23,7 @@ SQLUpdate:
 
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "zulaman.h"
 #include "Weather.h"
 
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
index aee0a8a59ea..5edb21e792e 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Zul'Aman
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "zulaman.h"
 //#include "spell.h"
 
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
index 7baa9292142..77eb080aa11 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Zul'Aman
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "zulaman.h"
 
 #define YELL_AGGRO              "Da shadow gonna fall on you... "
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
index 9ac54976241..64ad50ea70f 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Zul'Aman
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "zulaman.h"
 #include "GridNotifiers.h"
 
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
index ae5c6596d2d..f8620bb7769 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Zul'Aman
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "zulaman.h"
 #include "GridNotifiers.h"
 
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
index 91cfa728f89..9dcc7fc76af 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
@@ -20,7 +20,7 @@ SD%Complete: 85%
 SDComment:
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "zulaman.h"
 
 //Speech
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
index 897330691a6..4758faf1ddf 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Zul'Aman
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "zulaman.h"
 
 #define MAX_ENCOUNTER     6
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
index 067ae687644..6fd68e49186 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
@@ -25,7 +25,7 @@ EndScriptData */
 npc_forest_frog
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "zulaman.h"
 
 /*######
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
index cbbe6c4dc4c..ecc458c19c5 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
@@ -21,7 +21,7 @@ SDComment: Wrong cleave and red aura is missing.
 SDCategory: Zul'Gurub
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "zulgurub.h"
 
 bool GOHello_go_gong_of_bethekk(Player* /*pPlayer*/, GameObject* pGo)
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp
index 0201235be70..88648b7334f 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp
@@ -21,7 +21,7 @@ SDComment: Massive Geyser with knockback not working. Spell buggy.
 SDCategory: Zul'Gurub
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SPELL_FROSTBREATH            16099
 #define SPELL_MASSIVEGEYSER          22421                  //Not working. Cause its a summon...
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
index 67de135674a..24d98453f22 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Zul'Gurub
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "zulgurub.h"
 
 #define SPELL_AVARTAR                24646                  //The Enrage Spell
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
index d7dd5020b74..3e34eb9c3e3 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
@@ -21,7 +21,7 @@ SDComment: Blood siphon spell buggy cause of Core Issue.
 SDCategory: Zul'Gurub
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "zulgurub.h"
 
 #define SAY_AGGRO                   -1309020
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
index ca67d0842c3..602852b3e90 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Zul'Gurub
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "zulgurub.h"
 
 #define SPELL_MANABURN         26046
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
index fae05fcf384..73fcda881a4 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
@@ -21,7 +21,7 @@ SDComment: Problem in finding the right flying batriders for spawning and making
 SDCategory: Zul'Gurub
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "zulgurub.h"
 
 #define SAY_AGGRO                   -1309002
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
index 58f91f85a95..ece31a9b3bd 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
@@ -21,7 +21,7 @@ SDComment: Mind Control not working because of core bug. Shades visible for all.
 SDCategory: Zul'Gurub
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "zulgurub.h"
 
 #define SAY_AGGRO                       -1309014
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
index 4609605f3c1..614a7e8cc01 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
@@ -21,7 +21,7 @@ SDComment: Ohgan function needs improvements.
 SDCategory: Zul'Gurub
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "zulgurub.h"
 
 #define SAY_AGGRO               -1309015
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
index 77e9f9b929f..79beefedf5a 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
@@ -21,7 +21,7 @@ SDComment: Charging healers and casters not working. Perhaps wrong Spell Timers.
 SDCategory: Zul'Gurub
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "zulgurub.h"
 
 #define SAY_AGGRO               -1309005
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
index f7b01b26e19..0e2dccf60ed 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Zul'Gurub
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "zulgurub.h"
 
 #define SPELL_AMBUSH            24337
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
index 179700d36e7..e6e8f44abe1 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
@@ -21,7 +21,7 @@ SDComment: Almost finished.
 SDCategory: Zul'Gurub
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "zulgurub.h"
 
 #define SAY_AGGRO               -1309009
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
index ec1a7a142b5..eddcf82b720 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Zul'Gurub
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "zulgurub.h"
 
 #define SAY_TRANSFORM       -1309000
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
index a71d7e0504a..79a712b4c35 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Zul'Gurub
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "zulgurub.h"
 
 #define SPELL_LIGHTNINGCLOUD         25033
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
index aaed1c6df3a..803c84a8958 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
@@ -21,7 +21,7 @@ SDComment: Missing reset function after killing a boss for Ohgan, Thekal.
 SDCategory: Zul'Gurub
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "zulgurub.h"
 
 struct instance_zulgurub : public ScriptedInstance
diff --git a/src/server/scripts/EasternKingdoms/alterac_mountains.cpp b/src/server/scripts/EasternKingdoms/alterac_mountains.cpp
index 8695a73131c..8de3912ed0a 100644
--- a/src/server/scripts/EasternKingdoms/alterac_mountains.cpp
+++ b/src/server/scripts/EasternKingdoms/alterac_mountains.cpp
@@ -24,7 +24,7 @@ EndScriptData */
 /* ContentData
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 /*void AddSC_alterac_mountains()
 {
diff --git a/src/server/scripts/EasternKingdoms/arathi_highlands.cpp b/src/server/scripts/EasternKingdoms/arathi_highlands.cpp
index 86edbc2ed9d..9f77c554e18 100644
--- a/src/server/scripts/EasternKingdoms/arathi_highlands.cpp
+++ b/src/server/scripts/EasternKingdoms/arathi_highlands.cpp
@@ -25,7 +25,7 @@ EndScriptData */
 npc_professor_phizzlethorpe
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ScriptedEscortAI.h"
 
 /*######
diff --git a/src/server/scripts/EasternKingdoms/blasted_lands.cpp b/src/server/scripts/EasternKingdoms/blasted_lands.cpp
index 768242fcd22..8a2917f9df7 100644
--- a/src/server/scripts/EasternKingdoms/blasted_lands.cpp
+++ b/src/server/scripts/EasternKingdoms/blasted_lands.cpp
@@ -26,7 +26,7 @@ npc_deathly_usher
 npc_fallen_hero_of_horde
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 /*######
 ## npc_deathly_usher
diff --git a/src/server/scripts/EasternKingdoms/boss_kruul.cpp b/src/server/scripts/EasternKingdoms/boss_kruul.cpp
index 44a6431f9ea..432da09c26f 100644
--- a/src/server/scripts/EasternKingdoms/boss_kruul.cpp
+++ b/src/server/scripts/EasternKingdoms/boss_kruul.cpp
@@ -21,7 +21,7 @@ SDComment: Highlord Kruul are presumably no longer in-game on regular bases, how
 SDCategory: Bosses
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SPELL_SHADOWVOLLEY          21341
 #define SPELL_CLEAVE                20677
diff --git a/src/server/scripts/EasternKingdoms/burning_steppes.cpp b/src/server/scripts/EasternKingdoms/burning_steppes.cpp
index 5a1e338b70f..059c491d908 100644
--- a/src/server/scripts/EasternKingdoms/burning_steppes.cpp
+++ b/src/server/scripts/EasternKingdoms/burning_steppes.cpp
@@ -25,7 +25,7 @@ EndScriptData */
 npc_ragged_john
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 /*######
 ## npc_ragged_john
diff --git a/src/server/scripts/EasternKingdoms/dun_morogh.cpp b/src/server/scripts/EasternKingdoms/dun_morogh.cpp
index 4c47cc8bbb8..04f98cd9bb8 100644
--- a/src/server/scripts/EasternKingdoms/dun_morogh.cpp
+++ b/src/server/scripts/EasternKingdoms/dun_morogh.cpp
@@ -25,7 +25,7 @@ EndScriptData */
 npc_narm_faulk
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 /*######
 ## npc_narm_faulk
diff --git a/src/server/scripts/EasternKingdoms/duskwood.cpp b/src/server/scripts/EasternKingdoms/duskwood.cpp
index 89c0ebe4213..cd87740b03c 100644
--- a/src/server/scripts/EasternKingdoms/duskwood.cpp
+++ b/src/server/scripts/EasternKingdoms/duskwood.cpp
@@ -21,7 +21,7 @@ SDComment: Quest Support:8735
 SDCategory: Duskwood
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 /*######
 # at_twilight_grove
diff --git a/src/server/scripts/EasternKingdoms/eastern_plaguelands.cpp b/src/server/scripts/EasternKingdoms/eastern_plaguelands.cpp
index 0c1d3e9072c..e643964f8ad 100644
--- a/src/server/scripts/EasternKingdoms/eastern_plaguelands.cpp
+++ b/src/server/scripts/EasternKingdoms/eastern_plaguelands.cpp
@@ -28,7 +28,7 @@ npc_darrowshire_spirit
 npc_tirion_fordring
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 //id8530 - cannibal ghoul
 //id8531 - gibbering ghoul
diff --git a/src/server/scripts/EasternKingdoms/elwynn_forest.cpp b/src/server/scripts/EasternKingdoms/elwynn_forest.cpp
index b978507c557..36113dff08d 100644
--- a/src/server/scripts/EasternKingdoms/elwynn_forest.cpp
+++ b/src/server/scripts/EasternKingdoms/elwynn_forest.cpp
@@ -25,7 +25,7 @@ EndScriptData */
 npc_henze_faulk
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 /*######
 ## npc_henze_faulk
diff --git a/src/server/scripts/EasternKingdoms/eversong_woods.cpp b/src/server/scripts/EasternKingdoms/eversong_woods.cpp
index d1c7b9a6bfe..f32804cc3ba 100644
--- a/src/server/scripts/EasternKingdoms/eversong_woods.cpp
+++ b/src/server/scripts/EasternKingdoms/eversong_woods.cpp
@@ -29,7 +29,7 @@ npc_kelerun_bloodmourn
 go_harbinger_second_trial
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ScriptedEscortAI.h"
 
 /*######
diff --git a/src/server/scripts/EasternKingdoms/ghostlands.cpp b/src/server/scripts/EasternKingdoms/ghostlands.cpp
index 67e4e764959..9c74034b8a5 100644
--- a/src/server/scripts/EasternKingdoms/ghostlands.cpp
+++ b/src/server/scripts/EasternKingdoms/ghostlands.cpp
@@ -28,7 +28,7 @@ npc_rathis_tomber
 npc_ranger_lilatha
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ScriptedEscortAI.h"
 
 /*######
diff --git a/src/server/scripts/EasternKingdoms/hinterlands.cpp b/src/server/scripts/EasternKingdoms/hinterlands.cpp
index 59002936e14..56bedfc8f40 100644
--- a/src/server/scripts/EasternKingdoms/hinterlands.cpp
+++ b/src/server/scripts/EasternKingdoms/hinterlands.cpp
@@ -26,7 +26,7 @@ npc_00x09hl
 npc_rinji
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ScriptedEscortAI.h"
 
 /*######
diff --git a/src/server/scripts/EasternKingdoms/ironforge.cpp b/src/server/scripts/EasternKingdoms/ironforge.cpp
index 5be56cc6c9c..c294ec2403b 100644
--- a/src/server/scripts/EasternKingdoms/ironforge.cpp
+++ b/src/server/scripts/EasternKingdoms/ironforge.cpp
@@ -25,7 +25,7 @@ EndScriptData */
 npc_royal_historian_archesonus
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 /*######
 ## npc_royal_historian_archesonus
diff --git a/src/server/scripts/EasternKingdoms/isle_of_queldanas.cpp b/src/server/scripts/EasternKingdoms/isle_of_queldanas.cpp
index e5a70fcb1af..4170a32e0d1 100644
--- a/src/server/scripts/EasternKingdoms/isle_of_queldanas.cpp
+++ b/src/server/scripts/EasternKingdoms/isle_of_queldanas.cpp
@@ -26,7 +26,7 @@ npc_converted_sentry
 npc_greengill_slave
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 /*######
 ## npc_converted_sentry
diff --git a/src/server/scripts/EasternKingdoms/loch_modan.cpp b/src/server/scripts/EasternKingdoms/loch_modan.cpp
index e99a13fb675..b2d540b55af 100644
--- a/src/server/scripts/EasternKingdoms/loch_modan.cpp
+++ b/src/server/scripts/EasternKingdoms/loch_modan.cpp
@@ -25,7 +25,7 @@ EndScriptData */
 npc_mountaineer_pebblebitty
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 /*######
 ## npc_mountaineer_pebblebitty
diff --git a/src/server/scripts/EasternKingdoms/redridge_mountains.cpp b/src/server/scripts/EasternKingdoms/redridge_mountains.cpp
index 2f0b5821e86..abdcc5f8d04 100644
--- a/src/server/scripts/EasternKingdoms/redridge_mountains.cpp
+++ b/src/server/scripts/EasternKingdoms/redridge_mountains.cpp
@@ -21,7 +21,7 @@ SD%Complete: 100%
 SDComment: Support for quest 219.
 Script Data End */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ScriptedEscortAI.h"
 
 enum eCorporalKeeshan
diff --git a/src/server/scripts/EasternKingdoms/searing_gorge.cpp b/src/server/scripts/EasternKingdoms/searing_gorge.cpp
index 3ad51d033da..cc1be0a11f0 100644
--- a/src/server/scripts/EasternKingdoms/searing_gorge.cpp
+++ b/src/server/scripts/EasternKingdoms/searing_gorge.cpp
@@ -27,7 +27,7 @@ npc_lothos_riftwaker
 npc_zamael_lunthistle
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 /*######
 ## npc_kalaran_windblade
diff --git a/src/server/scripts/EasternKingdoms/silvermoon_city.cpp b/src/server/scripts/EasternKingdoms/silvermoon_city.cpp
index 390f083be48..2864bb4bf64 100644
--- a/src/server/scripts/EasternKingdoms/silvermoon_city.cpp
+++ b/src/server/scripts/EasternKingdoms/silvermoon_city.cpp
@@ -25,7 +25,7 @@ EndScriptData */
 npc_blood_knight_stillblade
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 /*#######
 # npc_blood_knight_stillblade
diff --git a/src/server/scripts/EasternKingdoms/silverpine_forest.cpp b/src/server/scripts/EasternKingdoms/silverpine_forest.cpp
index dd67f048f32..e3ed130b44d 100644
--- a/src/server/scripts/EasternKingdoms/silverpine_forest.cpp
+++ b/src/server/scripts/EasternKingdoms/silverpine_forest.cpp
@@ -27,7 +27,7 @@ npc_deathstalker_erland
 pyrewood_ambush
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ScriptedEscortAI.h"
 
 /*######
diff --git a/src/server/scripts/EasternKingdoms/stormwind_city.cpp b/src/server/scripts/EasternKingdoms/stormwind_city.cpp
index 36a7d116c3b..0775ec307c9 100644
--- a/src/server/scripts/EasternKingdoms/stormwind_city.cpp
+++ b/src/server/scripts/EasternKingdoms/stormwind_city.cpp
@@ -32,7 +32,7 @@ npc_marzon_silent_blade
 npc_lord_gregor_lescovar
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ScriptedEscortAI.h"
 
 /*######
diff --git a/src/server/scripts/EasternKingdoms/stranglethorn_vale.cpp b/src/server/scripts/EasternKingdoms/stranglethorn_vale.cpp
index 08d364d1808..7b3f5136831 100644
--- a/src/server/scripts/EasternKingdoms/stranglethorn_vale.cpp
+++ b/src/server/scripts/EasternKingdoms/stranglethorn_vale.cpp
@@ -25,7 +25,7 @@ EndScriptData */
 mob_yenniku
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 /*######
 ## mob_yenniku
diff --git a/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp b/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp
index 8b6d73df704..436ce13ae7d 100644
--- a/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp
+++ b/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp
@@ -27,7 +27,7 @@ go_mausoleum_door
 go_mausoleum_trigger
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 /*######
 ## npc_calvin_montague
diff --git a/src/server/scripts/EasternKingdoms/undercity.cpp b/src/server/scripts/EasternKingdoms/undercity.cpp
index 22eb3241874..1f4dd34ecbd 100644
--- a/src/server/scripts/EasternKingdoms/undercity.cpp
+++ b/src/server/scripts/EasternKingdoms/undercity.cpp
@@ -27,7 +27,7 @@ npc_highborne_lamenter
 npc_parqual_fintallas
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 /*######
 ## npc_lady_sylvanas_windrunner
diff --git a/src/server/scripts/EasternKingdoms/western_plaguelands.cpp b/src/server/scripts/EasternKingdoms/western_plaguelands.cpp
index 778bcea0b1e..b78a5e4f656 100644
--- a/src/server/scripts/EasternKingdoms/western_plaguelands.cpp
+++ b/src/server/scripts/EasternKingdoms/western_plaguelands.cpp
@@ -28,7 +28,7 @@ npc_the_scourge_cauldron
 npc_andorhal_tower
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ScriptedEscortAI.h"
 
 /*######
diff --git a/src/server/scripts/EasternKingdoms/westfall.cpp b/src/server/scripts/EasternKingdoms/westfall.cpp
index 6f2f439f7fb..6aa1d3e2a10 100644
--- a/src/server/scripts/EasternKingdoms/westfall.cpp
+++ b/src/server/scripts/EasternKingdoms/westfall.cpp
@@ -26,7 +26,7 @@ npc_daphne_stilwell
 npc_defias_traitor
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ScriptedEscortAI.h"
 
 /*######
diff --git a/src/server/scripts/EasternKingdoms/wetlands.cpp b/src/server/scripts/EasternKingdoms/wetlands.cpp
index 02f7abdf4c2..77692738000 100644
--- a/src/server/scripts/EasternKingdoms/wetlands.cpp
+++ b/src/server/scripts/EasternKingdoms/wetlands.cpp
@@ -26,7 +26,7 @@ npc_mikhail
 npc_tapoke_slim_jahn
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ScriptedEscortAI.h"
 
 /*######
diff --git a/src/server/scripts/Examples/example_creature.cpp b/src/server/scripts/Examples/example_creature.cpp
index 856b680e2e6..8b62cecc5f2 100644
--- a/src/server/scripts/Examples/example_creature.cpp
+++ b/src/server/scripts/Examples/example_creature.cpp
@@ -21,7 +21,7 @@ SDComment: Short custom scripting example
 SDCategory: Script Examples
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 // **** This script is designed as an example for others to build on ****
 // **** Please modify whatever you'd like to as this script is only for developement ****
diff --git a/src/server/scripts/Examples/example_escort.cpp b/src/server/scripts/Examples/example_escort.cpp
index bf2b454bf8e..d0d0bd3f352 100644
--- a/src/server/scripts/Examples/example_escort.cpp
+++ b/src/server/scripts/Examples/example_escort.cpp
@@ -21,7 +21,7 @@ SDComment: Script used for testing escortAI
 SDCategory: Script Examples
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ScriptedEscortAI.h"
 
 enum eEnums
diff --git a/src/server/scripts/Examples/example_gossip_codebox.cpp b/src/server/scripts/Examples/example_gossip_codebox.cpp
index e208722784a..620a6a6b41e 100644
--- a/src/server/scripts/Examples/example_gossip_codebox.cpp
+++ b/src/server/scripts/Examples/example_gossip_codebox.cpp
@@ -21,7 +21,7 @@ SDComment: Show a codebox in gossip option
 SDCategory: Script Examples
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include 
 
 enum eEnums
diff --git a/src/server/scripts/Examples/example_misc.cpp b/src/server/scripts/Examples/example_misc.cpp
index 3c96cc0bae7..f0676bb4b78 100644
--- a/src/server/scripts/Examples/example_misc.cpp
+++ b/src/server/scripts/Examples/example_misc.cpp
@@ -21,7 +21,7 @@ SDComment: Item, Areatrigger and other small code examples
 SDCategory: Script Examples
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ScriptMgr.h"
 
 enum eSay
diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp
index a3fd42a0fe7..46bdf71bc58 100644
--- a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp
+++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp
@@ -16,7 +16,7 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "blackfathom_deeps.h"
 #include "ScriptedEscortAI.h"
 
diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp
index a4b7a160be8..8fd6396378c 100644
--- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp
+++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp
@@ -16,7 +16,7 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "blackfathom_deeps.h"
 
 enum Spells
diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp
index 374a526f098..8ca645ff1d9 100644
--- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp
+++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp
@@ -16,7 +16,7 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "blackfathom_deeps.h"
 
 enum Spells
diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp
index bd7e1014d1a..50ebe097e59 100644
--- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp
+++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp
@@ -16,7 +16,7 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "blackfathom_deeps.h"
 
 enum Spells
diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp
index a485684e699..a3155f911e1 100644
--- a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp
+++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Blackfathom Deeps
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "blackfathom_deeps.h"
 
 #define MAX_ENCOUNTER 4
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp
index 14ce4a59b37..76a2581aee2 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp
@@ -1,5 +1,5 @@
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "hyjal.h"
 #include "hyjal_trash.h"
 
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
index 8e1fa378e07..3e1ef33e548 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
@@ -21,7 +21,7 @@ SDComment: Doomfires not completely offlike due to core limitations for random m
 SDCategory: Caverns of Time, Mount Hyjal
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "hyjal.h"
 #include "SpellAuras.h"
 #include "hyjal_trash.h"
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp
index 69e37f7f740..46961f9b992 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp
@@ -1,5 +1,5 @@
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "hyjal.h"
 #include "hyjal_trash.h"
 
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp
index b52d22842e3..9b284ae94a8 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp
@@ -1,5 +1,5 @@
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "hyjal.h"
 #include "hyjal_trash.h"
 
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp
index 7465b997117..a8d00720d6e 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp
@@ -1,5 +1,5 @@
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "hyjal.h"
 #include "hyjal_trash.h"
 
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp
index 16a050939cc..c2c040dc696 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp
@@ -27,7 +27,7 @@ npc_thrall
 npc_tyrande_whisperwind
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "hyjalAI.h"
 
 #define GOSSIP_ITEM_BEGIN_ALLY      "My companions and I are with you, Lady Proudmoore."
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
index 3c12b54f3f4..6f12692d164 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Caverns of Time, Mount Hyjal
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "hyjalAI.h"
 #include "hyjal_trash.h"
 #include "MapManager.h"
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp
index c4cf9ede397..f9a3995f502 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp
@@ -1,5 +1,5 @@
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "hyjal.h"
 #include "hyjal_trash.h"
 #include "hyjalAI.h"
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
index e89d518c5bc..07decc11387 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
@@ -21,7 +21,7 @@ SDComment: Instance Data Scripts and functions to acquire mobs and set encounter
 SDCategory: Caverns of Time, Mount Hyjal
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "hyjal.h"
 #include "hyjal_trash.h"
 
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp
index 287d3cf8e9b..f3d879f5cad 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp
@@ -25,7 +25,7 @@ SDComment: TODO: Intro, consecutive attacks to a random target durin time wrap,
 SDCategory:
 Script Data End */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "culling_of_stratholme.h"
 
 enum Spells
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp
index 12cdf00f2a5..0d53ee26e18 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp
@@ -16,7 +16,7 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "culling_of_stratholme.h"
 
 enum Spells
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp
index a39f3289a5a..d496fc3bb1c 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp
@@ -27,7 +27,7 @@ Script Data End */
 /*** SQL START ***
 update creature_template set scriptname = 'boss_mal_ganis' where entry = '';
 *** SQL END ***/
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "culling_of_stratholme.h"
 
 enum Spells
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp
index eba9733c745..327c49d412b 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp
@@ -24,7 +24,7 @@ SDComment: It may need timer adjustment
 SDCategory:
 Script Data End */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "culling_of_stratholme.h"
 
 enum Spells
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp
index da1c8098517..ff5ab5e159a 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp
@@ -27,7 +27,7 @@ Script Data End */
 /*** SQL START ***
 update creature_template set scriptname = 'boss_salramm' where entry = '';
 *** SQL END ***/
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "culling_of_stratholme.h"
 
 enum Spells
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
index faaed2eb6db..352869ebebf 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
@@ -16,7 +16,7 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "culling_of_stratholme.h"
 #include "ScriptedEscortAI.h"
 
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp
index 73742a1e748..9c721dc00e7 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp
@@ -16,7 +16,7 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "culling_of_stratholme.h"
 
 #define MAX_ENCOUNTER 5
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp
index 49cf7cd4433..dd6a70461d5 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp
@@ -21,7 +21,7 @@ SDComment: Some spells not implemented
 SDCategory: Caverns of Time, The Dark Portal
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "dark_portal.h"
 
 enum eEnums
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp
index 1f2b4a80612..b347302b04b 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp
@@ -21,7 +21,7 @@ SDComment: All abilities not implemented
 SDCategory: Caverns of Time, The Dark Portal
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "dark_portal.h"
 
 enum eEnums
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp
index 04b4b020ead..ad5a3007c79 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp
@@ -21,7 +21,7 @@ SDComment: More abilities need to be implemented
 SDCategory: Caverns of Time, The Dark Portal
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "dark_portal.h"
 
 enum eEnums
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp
index b0432a9b57c..fdeb56f4c54 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp
@@ -27,7 +27,7 @@ npc_time_rift
 npc_saat
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "dark_portal.h"
 
 #define SAY_ENTER               -1269020                    //where does this belong?
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp
index d1280230808..a98d5f80eee 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp
@@ -21,7 +21,7 @@ SDComment: Quest support: 9836, 10297. Currently in progress.
 SDCategory: Caverns of Time, The Dark Portal
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "dark_portal.h"
 
 #define MAX_ENCOUNTER              2
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp
index 91c9e274b83..2f9e89ef5cb 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp
@@ -21,7 +21,7 @@ SDComment: Missing adds, missing waypoints to move up to Thrall once spawned + s
 SDCategory: Caverns of Time, Old Hillsbrad Foothills
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "old_hillsbrad.h"
 
 #define SAY_ENTER                   -1560000
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp
index 2c2ad96ddb7..93b724a3401 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp
@@ -21,7 +21,7 @@ SDComment: Missing spawns pre-event, missing speech to be coordinated with rest
 SDCategory: Caverns of Time, Old Hillsbrad Foothills
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "old_hillsbrad.h"
 
 #define SAY_ENTER1                  -1560013
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp
index dae0f5390b1..54e3d410cdb 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp
@@ -21,7 +21,7 @@ SDComment: Missing proper code for patrolling area after being spawned. Script f
 SDCategory: Caverns of Time, Old Hillsbrad Foothills
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "old_hillsbrad.h"
 #include "ScriptedEscortAI.h"
 
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
index fa0b7c14595..463461dcc1d 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
@@ -21,7 +21,7 @@ SDComment: If thrall escort fail, all parts will reset. In future, save sub-part
 SDCategory: Caverns of Time, Old Hillsbrad Foothills
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "old_hillsbrad.h"
 
 #define MAX_ENCOUNTER      6
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
index 08c63954db5..31660577e50 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
@@ -27,7 +27,7 @@ npc_thrall_old_hillsbrad
 npc_taretha
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ScriptedEscortAI.h"
 #include "old_hillsbrad.h"
 
diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp
index 6f6b9d1baa9..68702dec40e 100644
--- a/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp
+++ b/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Maraudon
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SPELL_WRATH                 21807
 #define SPELL_ENTANGLINGROOTS       12747
diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_landslide.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_landslide.cpp
index d5b03ff218f..e21472ab7c5 100644
--- a/src/server/scripts/Kalimdor/Maraudon/boss_landslide.cpp
+++ b/src/server/scripts/Kalimdor/Maraudon/boss_landslide.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Maraudon
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SPELL_KNOCKAWAY         18670
 #define SPELL_TRAMPLE           5568
diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp
index b49b1a5d71f..949e12f3016 100644
--- a/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp
+++ b/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Maraudon
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SPELL_TOXICVOLLEY           21687
 #define SPELL_UPPERCUT              22916
diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp
index 963863e89c8..d052b239b7b 100644
--- a/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp
+++ b/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Maraudon
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SPELL_DUSTFIELD             21909
 #define SPELL_BOULDER               21832
diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
index 2d351d6c6a2..264705c5ee0 100644
--- a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
+++ b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
@@ -25,7 +25,7 @@ SDComment: 
 SDCategory: Onyxia's Lair
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "onyxias_lair.h"
 
 enum eYells
diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp
index cfd66bf80f4..247a57c13fb 100644
--- a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp
+++ b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Onyxia's Lair
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "onyxias_lair.h"
 
 struct instance_onyxias_lair : public ScriptedInstance
diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp
index 711c4f0b2c1..9831e1cb8b5 100644
--- a/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Razorfen Downs
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SAY_AGGRO               -1129000
 #define SAY_SUMMON60            -1129001
diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp
index 04904f08a57..e2568ff0a2e 100644
--- a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "razorfen_downs.h"
 
 #define    MAX_ENCOUNTER  1
diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp
index 3e8f4049a37..82d5b5cf871 100644
--- a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp
@@ -25,7 +25,7 @@ EndScriptData */
 npc_henry_stern
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "razorfen_downs.h"
 
 /*###
diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp
index 8a92d3d4d89..eddf965a99e 100644
--- a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Razorfen Kraul
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "razorfen_kraul.h"
 
 #define WARD_KEEPERS_NR 2
diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp
index 8470fa6c7ac..ce2deb5c041 100644
--- a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp
@@ -25,7 +25,7 @@ EndScriptData */
 npc_willix
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ScriptedEscortAI.h"
 #include "razorfen_kraul.h"
 
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp
index f6dc75558c8..f18879036d5 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp
@@ -21,7 +21,7 @@ SDComment: VERIFY SCRIPT
 SDCategory: Ruins of Ahn'Qiraj
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ruins_of_ahnqiraj.h"
 
 /*
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
index 86a2c559543..b921623a46a 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
@@ -21,7 +21,7 @@ SDComment: Place Holder
 SDCategory: Ruins of Ahn'Qiraj
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ruins_of_ahnqiraj.h"
 
 enum Yells
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp
index 44f11bf4b60..adbb7c6d12a 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp
@@ -21,7 +21,7 @@ SDComment: VERIFY SCRIPT AND SQL
 SDCategory: Ruins of Ahn'Qiraj
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ruins_of_ahnqiraj.h"
 
 enum Spells
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp
index 1882adc8fbb..c8e019f6f33 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp
@@ -21,7 +21,7 @@ SDComment: TODO: Adjust timer, correct Stone phase buff
 SDCategory: Ruins of Ahn'Qiraj
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ruins_of_ahnqiraj.h"
 
 enum Emotes
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
index 57ba8d9da7f..7496ccff77f 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
@@ -21,7 +21,7 @@ SDComment: Place holder
 SDCategory: Ruins of Ahn'Qiraj
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ruins_of_ahnqiraj.h"
 
 enum Yells
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp
index 5be60dc0ca0..5d49ff5d350 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp
@@ -21,7 +21,7 @@ SDComment: Place Holder
 SDCategory: Ruins of Ahn'Qiraj
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ruins_of_ahnqiraj.h"
 
 enum Yells
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp
index ba7471bdbd2..9a21dd2e184 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp
@@ -21,7 +21,7 @@ SDComment: Place holder
 SDCategory: Ruins of Ahn'Qiraj
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ruins_of_ahnqiraj.h"
 
 #define MAX_ENCOUNTER 6
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp
index f6e3b0c741b..296a7ba2388 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Temple of Ahn'Qiraj
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "temple_of_ahnqiraj.h"
 
 #define SPELL_CLEAVE        26350
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
index 3e42d16be3a..9e53596c9fe 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
@@ -21,7 +21,7 @@ SDComment: Darkglare tracking issue
 SDCategory: Temple of Ahn'Qiraj
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "temple_of_ahnqiraj.h"
 
 /*
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp
index 32d5ec1c3df..20ff82af7d9 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp
@@ -21,7 +21,7 @@ SDComment: sound not implemented
 SDCategory: Temple of Ahn'Qiraj
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SOUND_SENTENCE_YOU 8588
 #define SOUND_SERVE_TO     8589
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp
index f0e3a425edd..94cd25c5edb 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Temple of Ahn'Qiraj
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define EMOTE_GENERIC_FRENZY_KILL   -1000001
 #define EMOTE_GENERIC_BERSERK       -1000004
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp
index 1dd642c38f4..cbc028b1da8 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp
@@ -21,7 +21,7 @@ SDComment: No model for submerging. Currently just invisible.
 SDCategory: Temple of Ahn'Qiraj
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "temple_of_ahnqiraj.h"
 
 #define SPELL_SWEEP             26103
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp
index 282a25b7215..aa4bcbc80f6 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Temple of Ahn'Qiraj
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SAY_AGGRO                   -1531008
 #define SAY_SLAY                    -1531009
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp
index 7e52bed750c..3ae6cf385dd 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp
@@ -21,7 +21,7 @@ SDComment: Mind Control buggy.
 SDCategory: Temple of Ahn'Qiraj
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "temple_of_ahnqiraj.h"
 #include "Group.h"
 
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp
index 73f17485f7f..dd970230476 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Temple of Ahn'Qiraj
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "temple_of_ahnqiraj.h"
 #include "WorldPacket.h"
 
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp
index f5e71a35bae..af20ab1e92f 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp
@@ -21,7 +21,7 @@ SDComment: place holder
 SDCategory: Temple of Ahn'Qiraj
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SPELL_POISON_SHOCK          25993
 #define SPELL_POISONBOLT_VOLLEY     25991
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp
index 1125a0c8623..36fb4fdd297 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Temple of Ahn'Qiraj
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "temple_of_ahnqiraj.h"
 
 struct instance_temple_of_ahnqiraj : public ScriptedInstance
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp
index 074f9ed68ae..7bb00941260 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp
@@ -21,7 +21,7 @@ SDComment: Shadow storm is not properly implemented in core it should only pTarg
 SDCategory: Temple of Ahn'Qiraj
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "WorldPacket.h"
 
 #include "Item.h"
diff --git a/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp b/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp
index 287b5db6d57..f2083ace914 100644
--- a/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp
+++ b/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp
@@ -21,7 +21,7 @@ SDComment: Everything seems to work, still need some checking
 SDCategory: Wailing Caverns
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "wailing_caverns.h"
 
 #define MAX_ENCOUNTER   9
diff --git a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp
index 544c119fc93..0b65948153e 100644
--- a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp
+++ b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp
@@ -24,7 +24,7 @@ EndScriptData */
 /* ContentData
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ScriptedEscortAI.h"
 #include "wailing_caverns.h"
 
diff --git a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp
index 530ef30f44c..5ddc3a3b53f 100644
--- a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp
+++ b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define NPC_GAHZRILLA 7273
 
diff --git a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp
index 2ca053c23b6..406fa405b82 100644
--- a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp
+++ b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp
@@ -26,7 +26,7 @@ npc_sergeant_bly
 npc_weegli_blastfuse
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 /*######
 ## npc_sergeant_bly
diff --git a/src/server/scripts/Kalimdor/ashenvale.cpp b/src/server/scripts/Kalimdor/ashenvale.cpp
index 13e8f442048..723828ad413 100644
--- a/src/server/scripts/Kalimdor/ashenvale.cpp
+++ b/src/server/scripts/Kalimdor/ashenvale.cpp
@@ -26,7 +26,7 @@ npc_torek
 npc_ruul_snowhoof
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ScriptedEscortAI.h"
 
 /*####
diff --git a/src/server/scripts/Kalimdor/azshara.cpp b/src/server/scripts/Kalimdor/azshara.cpp
index 937afe0ae5d..3350eceb7dd 100644
--- a/src/server/scripts/Kalimdor/azshara.cpp
+++ b/src/server/scripts/Kalimdor/azshara.cpp
@@ -28,7 +28,7 @@ mob_rizzle_sprysprocket
 mob_depth_charge
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "World.h"
 #include "WorldPacket.h"
 
diff --git a/src/server/scripts/Kalimdor/azuremyst_isle.cpp b/src/server/scripts/Kalimdor/azuremyst_isle.cpp
index d31eaa9e84b..780f1f41f0c 100644
--- a/src/server/scripts/Kalimdor/azuremyst_isle.cpp
+++ b/src/server/scripts/Kalimdor/azuremyst_isle.cpp
@@ -32,7 +32,7 @@ go_ravager_cage
 npc_death_ravager
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ScriptedEscortAI.h"
 #include 
 
diff --git a/src/server/scripts/Kalimdor/bloodmyst_isle.cpp b/src/server/scripts/Kalimdor/bloodmyst_isle.cpp
index 108d03b8976..88dda4bafc4 100644
--- a/src/server/scripts/Kalimdor/bloodmyst_isle.cpp
+++ b/src/server/scripts/Kalimdor/bloodmyst_isle.cpp
@@ -26,7 +26,7 @@ mob_webbed_creature
 npc_captured_sunhawk_agent
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 /*######
 ## mob_webbed_creature
diff --git a/src/server/scripts/Kalimdor/boss_azuregos.cpp b/src/server/scripts/Kalimdor/boss_azuregos.cpp
index 8aeedfa199e..f2d072ed343 100644
--- a/src/server/scripts/Kalimdor/boss_azuregos.cpp
+++ b/src/server/scripts/Kalimdor/boss_azuregos.cpp
@@ -21,7 +21,7 @@ SDComment: Teleport not included, spell reflect not effecting dots (Core problem
 SDCategory: Azshara
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SAY_TELEPORT            -1000100
 
diff --git a/src/server/scripts/Kalimdor/darkshore.cpp b/src/server/scripts/Kalimdor/darkshore.cpp
index 26b42a86422..49f14ef0408 100644
--- a/src/server/scripts/Kalimdor/darkshore.cpp
+++ b/src/server/scripts/Kalimdor/darkshore.cpp
@@ -27,7 +27,7 @@ npc_prospector_remtravel
 npc_threshwackonator
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ScriptedEscortAI.h"
 #include "ScriptedFollowerAI.h"
 
diff --git a/src/server/scripts/Kalimdor/desolace.cpp b/src/server/scripts/Kalimdor/desolace.cpp
index 6b3ec8071dd..5b5b93668f2 100644
--- a/src/server/scripts/Kalimdor/desolace.cpp
+++ b/src/server/scripts/Kalimdor/desolace.cpp
@@ -25,7 +25,7 @@ EndScriptData */
 npc_aged_dying_ancient_kodo
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ScriptedEscortAI.h" 
 
 enum eDyingKodo
diff --git a/src/server/scripts/Kalimdor/durotar.cpp b/src/server/scripts/Kalimdor/durotar.cpp
index 9ca6074cad3..bbd9a352d9d 100644
--- a/src/server/scripts/Kalimdor/durotar.cpp
+++ b/src/server/scripts/Kalimdor/durotar.cpp
@@ -14,9 +14,9 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 /*######
 ##Quest 5441: Lazy Peons
diff --git a/src/server/scripts/Kalimdor/dustwallow_marsh.cpp b/src/server/scripts/Kalimdor/dustwallow_marsh.cpp
index a80c514eed7..86a13c9e0e4 100644
--- a/src/server/scripts/Kalimdor/dustwallow_marsh.cpp
+++ b/src/server/scripts/Kalimdor/dustwallow_marsh.cpp
@@ -31,7 +31,7 @@ npc_private_hendel
 npc_cassa_crimsonwing - handled by npc_taxi
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 /*######
 ## mobs_risen_husk_spirit
diff --git a/src/server/scripts/Kalimdor/felwood.cpp b/src/server/scripts/Kalimdor/felwood.cpp
index 01da356a63e..45e155080c8 100644
--- a/src/server/scripts/Kalimdor/felwood.cpp
+++ b/src/server/scripts/Kalimdor/felwood.cpp
@@ -25,7 +25,7 @@ EndScriptData */
 npcs_riverbreeze_and_silversky
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 /*######
 ## npcs_riverbreeze_and_silversky
diff --git a/src/server/scripts/Kalimdor/feralas.cpp b/src/server/scripts/Kalimdor/feralas.cpp
index 2a87de1a67c..8e34fa3c45a 100644
--- a/src/server/scripts/Kalimdor/feralas.cpp
+++ b/src/server/scripts/Kalimdor/feralas.cpp
@@ -21,7 +21,7 @@ SDComment: Quest support: 3520, 2767, Special vendor Gregan Brewspewer
 SDCategory: Feralas
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ScriptedEscortAI.h"
 
 /*######
diff --git a/src/server/scripts/Kalimdor/moonglade.cpp b/src/server/scripts/Kalimdor/moonglade.cpp
index 16c78f20812..0a402a8780c 100644
--- a/src/server/scripts/Kalimdor/moonglade.cpp
+++ b/src/server/scripts/Kalimdor/moonglade.cpp
@@ -29,7 +29,7 @@ npc_clintar_spirit
 npc_clintar_dreamwalker
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ScriptedEscortAI.h"
 
 /*######
diff --git a/src/server/scripts/Kalimdor/mulgore.cpp b/src/server/scripts/Kalimdor/mulgore.cpp
index c87e5e36dad..52aa1cdcaa2 100644
--- a/src/server/scripts/Kalimdor/mulgore.cpp
+++ b/src/server/scripts/Kalimdor/mulgore.cpp
@@ -27,7 +27,7 @@ npc_kyle_frenzied
 npc_plains_vision
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ScriptedEscortAI.h"
 
 /*######
diff --git a/src/server/scripts/Kalimdor/orgrimmar.cpp b/src/server/scripts/Kalimdor/orgrimmar.cpp
index 71fa4381e9d..4b98bb0fa86 100644
--- a/src/server/scripts/Kalimdor/orgrimmar.cpp
+++ b/src/server/scripts/Kalimdor/orgrimmar.cpp
@@ -27,7 +27,7 @@ npc_shenthul
 npc_thrall_warchief
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 /*######
 ## npc_neeru_fireblade
diff --git a/src/server/scripts/Kalimdor/silithus.cpp b/src/server/scripts/Kalimdor/silithus.cpp
index 6383284011f..a3393ee5d73 100644
--- a/src/server/scripts/Kalimdor/silithus.cpp
+++ b/src/server/scripts/Kalimdor/silithus.cpp
@@ -27,7 +27,7 @@ npcs_rutgar_and_frankal
 quest_a_pawn_on_the_eternal_pawn
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 /*###
 ## npc_highlord_demitrian
diff --git a/src/server/scripts/Kalimdor/stonetalon_mountains.cpp b/src/server/scripts/Kalimdor/stonetalon_mountains.cpp
index 6e627948788..3402c5dec64 100644
--- a/src/server/scripts/Kalimdor/stonetalon_mountains.cpp
+++ b/src/server/scripts/Kalimdor/stonetalon_mountains.cpp
@@ -26,7 +26,7 @@ npc_braug_dimspirit
 npc_kaya_flathoof
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ScriptedEscortAI.h"
 
 /*######
diff --git a/src/server/scripts/Kalimdor/tanaris.cpp b/src/server/scripts/Kalimdor/tanaris.cpp
index bb82dea64cf..88c41083a72 100644
--- a/src/server/scripts/Kalimdor/tanaris.cpp
+++ b/src/server/scripts/Kalimdor/tanaris.cpp
@@ -31,7 +31,7 @@ npc_OOX17
 npc_tooga
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ScriptedEscortAI.h"
 #include "ScriptedFollowerAI.h"
 
diff --git a/src/server/scripts/Kalimdor/teldrassil.cpp b/src/server/scripts/Kalimdor/teldrassil.cpp
index 1607ab904a8..1d6135bd9d8 100644
--- a/src/server/scripts/Kalimdor/teldrassil.cpp
+++ b/src/server/scripts/Kalimdor/teldrassil.cpp
@@ -25,7 +25,7 @@ EndScriptData */
 npc_mist
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ScriptedFollowerAI.h"
 
 /*####
diff --git a/src/server/scripts/Kalimdor/the_barrens.cpp b/src/server/scripts/Kalimdor/the_barrens.cpp
index 04daac96877..05109d9537e 100644
--- a/src/server/scripts/Kalimdor/the_barrens.cpp
+++ b/src/server/scripts/Kalimdor/the_barrens.cpp
@@ -30,7 +30,7 @@ npc_twiggy_flathead
 npc_wizzlecrank_shredder
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ScriptedEscortAI.h"
 
 /*######
diff --git a/src/server/scripts/Kalimdor/thousand_needles.cpp b/src/server/scripts/Kalimdor/thousand_needles.cpp
index 3f54a62dd0b..bf1c1f62ffc 100644
--- a/src/server/scripts/Kalimdor/thousand_needles.cpp
+++ b/src/server/scripts/Kalimdor/thousand_needles.cpp
@@ -30,7 +30,7 @@ go_panther_cage
 npc_enraged_panther
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ScriptedEscortAI.h"
 
 /*#####
diff --git a/src/server/scripts/Kalimdor/thunder_bluff.cpp b/src/server/scripts/Kalimdor/thunder_bluff.cpp
index 288f00946f0..0b8f66135fd 100644
--- a/src/server/scripts/Kalimdor/thunder_bluff.cpp
+++ b/src/server/scripts/Kalimdor/thunder_bluff.cpp
@@ -21,7 +21,7 @@ SDComment: Quest support: 925
 SDCategory: Thunder Bluff
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 /*#####
 # npc_cairne_bloodhoof
diff --git a/src/server/scripts/Kalimdor/ungoro_crater.cpp b/src/server/scripts/Kalimdor/ungoro_crater.cpp
index 2be4a95eb4b..e6ad96de836 100644
--- a/src/server/scripts/Kalimdor/ungoro_crater.cpp
+++ b/src/server/scripts/Kalimdor/ungoro_crater.cpp
@@ -26,7 +26,7 @@ npc_a-me
 npc_ringo
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ScriptedEscortAI.h"
 #include "ScriptedFollowerAI.h"
 
diff --git a/src/server/scripts/Kalimdor/winterspring.cpp b/src/server/scripts/Kalimdor/winterspring.cpp
index a284f32aeaa..56d8a1a1911 100644
--- a/src/server/scripts/Kalimdor/winterspring.cpp
+++ b/src/server/scripts/Kalimdor/winterspring.cpp
@@ -27,7 +27,7 @@ npc_rivern_frostwind
 npc_witch_doctor_mauari
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 /*######
 ## npc_lorax
diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp
index 6de6578f7bb..f9b02694b2f 100644
--- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp
@@ -16,7 +16,7 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "azjol_nerub.h"
 
 //SQL: UPDATE creature_template SET mechanic_immune_mask = 1073741823 WHERE  name like "anub'arak%";
diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
index 0fc4e87d7c5..20c6c896502 100644
--- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
@@ -29,7 +29,7 @@
 * Hadronox to make his way to you. When Hadronox enters the main room, she will web the doors, and no more non-elites will spawn.
 */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "azjol_nerub.h"
 
 enum Spells
diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp
index 4863bdcb032..d979c7c23de 100644
--- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp
@@ -20,7 +20,7 @@
  * Comment: Find in the future best timers and the event is not implemented.
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "azjol_nerub.h"
 
 enum Spells
diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp
index d12dbd604ba..f3eb6e14978 100644
--- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "azjol_nerub.h"
 
 #define MAX_ENCOUNTER     3
diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp
index 51c4bce0c2d..2c667b4f367 100644
--- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp
@@ -20,7 +20,7 @@
  * Comment:  Find correct mushrooms spell to make them visible - buffs of the mushrooms not ever applied to the users...
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ahnkahet.h"
 
 enum Spells
diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp
index 2215d91c749..d7a10e1cfa1 100644
--- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp
@@ -16,7 +16,7 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ahnkahet.h"
 
 bool DeadAhnkaharGuardian; // needed for achievement: Respect Your Elders(2038)
diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp
index d522089a37d..a4384f0f174 100644
--- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp
@@ -20,7 +20,7 @@
  * Comment: Missing AI for Twisted Visages
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ahnkahet.h"
 
 enum Spells
diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp
index eb8046f63cd..db330950f93 100644
--- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp
@@ -20,7 +20,7 @@
  * Comment: Complete - BUT THE TRIGGER NEEDS DATA WHETHER THE PRISON OF TALDARAM IS OFFLINE !
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ahnkahet.h"
 
 enum Yells
diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp
index 93a66ccfbca..f152ad7abd3 100644
--- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ahnkahet.h"
 
 enum Spells
diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp
index 4e6e3ec8c9f..e4c7d553e42 100644
--- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp
@@ -16,7 +16,7 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ahnkahet.h"
 
 /* Ahn'kahet encounters:
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp
index c33ea69fa2d..a0ad5c39ded 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp
@@ -23,7 +23,7 @@ SDComment: AI for Argent Soldiers are not implemented. AI from bosses need more
 SDCategory: Trial of the Champion
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "trial_of_the_champion.h"
 #include "ScriptedEscortAI.h"
 
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp
index e1f4586ca6c..b7cbda45ddb 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp
@@ -23,7 +23,7 @@ SDComment: missing yells. not sure about timers.
 SDCategory: Trial of the Champion
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ScriptedEscortAI.h"
 #include "trial_of_the_champion.h"
 
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp
index 4bf8143a210..5646ff51a99 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp
@@ -21,7 +21,7 @@ SDComment: Is missing the ai to make the npcs look for a new mount and use it.
 SDCategory: Trial Of the Champion
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ScriptedEscortAI.h"
 #include "Vehicle.h"
 #include "trial_of_the_champion.h"
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp
index 04b671ec11c..8e76b59a12a 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp
@@ -23,7 +23,7 @@ SDComment:
 SDCategory: Trial Of the Champion
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "trial_of_the_champion.h"
 
 #define MAX_ENCOUNTER  4
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp
index 090b64b96cc..4d43efb3c4c 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp
@@ -27,7 +27,7 @@ EndScriptData */
 npc_announcer_toc5
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "trial_of_the_champion.h"
 #include "Vehicle.h"
 
diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp
index ba64a4748dd..56438174629 100644
--- a/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp
+++ b/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp
@@ -20,7 +20,7 @@
  * Comment: MAYBE need more improve the "Raptor Call".
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "drak_tharon_keep.h"
 
 enum eSpells
diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp
index 5e8792c352d..d25ddaf490d 100644
--- a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp
+++ b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp
@@ -16,7 +16,7 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "drak_tharon_keep.h"
 
 enum Spells
diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp
index 1e60dfc6135..f0c0e188a10 100644
--- a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp
+++ b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp
@@ -16,7 +16,7 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "drak_tharon_keep.h"
 
 enum Spells
diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp
index 03eac73385d..9545863121e 100644
--- a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp
+++ b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp
@@ -20,7 +20,7 @@
  * Comment: TODO: spawn troll waves
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "drak_tharon_keep.h"
 
 enum Spells
diff --git a/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp b/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp
index 9f4d2ee52a2..ab322e4efdf 100644
--- a/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp
+++ b/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "drak_tharon_keep.h"
 
 #define MAX_ENCOUNTER     4
diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
index 59db2842735..b7e9651edc4 100644
--- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
@@ -14,7 +14,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "forge_of_souls.h"
 
 /*
diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
index 6811ba953e2..16e6f4c0853 100644
--- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
@@ -14,7 +14,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "forge_of_souls.h"
 
 /*
diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp
index 5c85da69898..6bdf8c7f199 100644
--- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp
@@ -14,7 +14,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "forge_of_souls.h"
 
 enum Spells
diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp
index 67a6cdb4579..c3a2883149b 100644
--- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp
@@ -14,7 +14,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "forge_of_souls.h"
 
 #define MAX_ENCOUNTER 2
diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp
index c9978faca6e..64cf0b609f3 100644
--- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp
@@ -14,7 +14,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "halls_of_reflection.h"
 
 enum Yells
diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp
index 95fb2737ce9..8f3cc8330b1 100644
--- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp
@@ -14,7 +14,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "halls_of_reflection.h"
 
 enum Yells
diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
index fb3d3d5d752..c66f928033e 100644
--- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
@@ -14,7 +14,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "halls_of_reflection.h"
 
 enum Yells
diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
index 7a5d2479b7c..6b7b6878760 100644
--- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
@@ -14,7 +14,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "halls_of_reflection.h"
 
 #define MAX_ENCOUNTER 3
diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp
index 25c78c4a0d3..50b2277a6c2 100644
--- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp
@@ -14,7 +14,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "pit_of_saron.h"
 
 enum Yells
diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
index 8b8b03a3d4e..5ff3593de20 100644
--- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
@@ -14,7 +14,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "pit_of_saron.h"
 
 /*
diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp
index 55ffa0b4e4b..279dde9479e 100644
--- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp
@@ -14,7 +14,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "pit_of_saron.h"
 
 /*
diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp
index 8512eca24c1..e9241b6c075 100644
--- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp
@@ -14,7 +14,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "pit_of_saron.h"
 
 #define MAX_ENCOUNTER     3
diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp
index bc53efc7033..c950bada096 100644
--- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp
@@ -14,7 +14,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "pit_of_saron.h"
 
 /***************************************SPELLS*************************************/
diff --git a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp
index 04603c68813..7a11c33c254 100644
--- a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp
+++ b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp
@@ -20,7 +20,7 @@
  * Comment: The event with the Living Mojos is not implemented, just is done that when one of the mojos around the boss take damage will make the boss enter in combat!
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "gundrak.h"
 
 enum Spells
diff --git a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp
index 3bf1a33da5a..d0b590736d7 100644
--- a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp
+++ b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp
@@ -16,7 +16,7 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "gundrak.h"
 
 enum Spells
diff --git a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp
index c87a6600783..170da3c9820 100644
--- a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp
+++ b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp
@@ -16,7 +16,7 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "gundrak.h"
 
 //Spells
diff --git a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp
index 84a7d8bc654..7d4b6e9b09b 100644
--- a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp
+++ b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp
@@ -16,7 +16,7 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "gundrak.h"
 
 enum eSpells
diff --git a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp
index 1014beaeddd..ddb6732ac3e 100644
--- a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp
+++ b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp
@@ -16,7 +16,7 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "gundrak.h"
 
 //Spells
diff --git a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp
index 4dd896f74f2..f7f555098eb 100644
--- a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp
+++ b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp
@@ -16,7 +16,7 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "gundrak.h"
 
 #define MAX_ENCOUNTER     5
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp
index 896eb068eb6..9b255da56e7 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp
@@ -14,7 +14,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "naxxramas.h"
 
 #define SAY_GREET           RAND(-1533000,-1533004,-1533005,-1533006,-1533007)
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp
index aa5a940eb8f..40c7b77c4d5 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "naxxramas.h"
 
 enum Yells
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
index f04b39040db..2f95676363e 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
@@ -14,7 +14,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "naxxramas.h"
 
 enum Horsemen
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp
index ab6fa6c46d3..a781ead6b48 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp
@@ -14,7 +14,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "naxxramas.h"
 
 #define SPELL_MORTAL_WOUND      25646
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
index d958ff24951..b815e0172ec 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
@@ -14,7 +14,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "naxxramas.h"
 
 enum Yells
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp
index 7df01e18483..4af90224e50 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp
@@ -14,7 +14,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "naxxramas.h"
 
 #define SPELL_BOMBARD_SLIME         28280
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp
index 1de9c0e00c8..f8244999ce3 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp
@@ -14,7 +14,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "naxxramas.h"
 
 #define SAY_AGGRO           RAND(-1533109,-1533110,-1533111)
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
index bfcd0636298..2cfbe771b38 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
@@ -21,7 +21,7 @@ SDComment: VERIFY SCRIPT
 SDCategory: Naxxramas
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "naxxramas.h"
 
 enum Yells
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp
index 0b0c8f5e4c5..702c23fc3d0 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "naxxramas.h"
 
 enum Spells
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp
index 71d9cb86102..d4442d78989 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "naxxramas.h"
 
 enum Spells
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp
index b0cd4018955..577b2707817 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp
@@ -14,7 +14,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "naxxramas.h"
 
 #define SAY_AGGRO               RAND(-1533075,-1533076,-1533077)
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp
index e4472b299ce..a97446adc25 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp
@@ -14,7 +14,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "naxxramas.h"
 
 enum Spells
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp
index d507df86e83..2cbd6b37722 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "naxxramas.h"
 
 //Razuvious - NO TEXT sound only
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp
index d75b3ab78b0..608b6ef479c 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "naxxramas.h"
 
 #define EMOTE_BREATH            -1533082
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp
index 350cd450510..01f80119fea 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "naxxramas.h"
 
 //Stalagg
diff --git a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
index 706789a73f1..3006b905673 100644
--- a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
@@ -14,7 +14,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "naxxramas.h"
 
 const DoorData doorData[] =
diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
index bbb1df2731d..0b0712074c6 100644
--- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
+++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
@@ -9,7 +9,7 @@ Script Data End */
 /*** SQL START ***
 update creature_template set scriptname = '' where entry = '';
 *** SQL END ***/
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 //Spells
 #define SPELL_ARCANE_BREATH_N                        56272
diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
index d93ec415b42..227fa6f7f17 100644
--- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
+++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
@@ -1,4 +1,4 @@
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "eye_of_eternity.h"
 
 struct instance_eye_of_eternity : public ScriptedInstance
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
index 02c39dc1232..c4482003748 100644
--- a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
@@ -15,7 +15,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "nexus.h"
 
 enum Spells
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp
index ff633c55eac..80f0b674803 100644
--- a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp
@@ -15,7 +15,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "nexus.h"
 
 enum Spells
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
index 0bf9fb07bb7..a1df4d9864e 100644
--- a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
@@ -15,7 +15,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "nexus.h"
 
 enum Spells
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp
index 1304f95c7ac..dd21883bc04 100644
--- a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp
@@ -15,7 +15,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "nexus.h"
 
 enum Spells
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/commander_kolurg.cpp b/src/server/scripts/Northrend/Nexus/Nexus/commander_kolurg.cpp
index 4bd9f55a013..aa1e136bb29 100644
--- a/src/server/scripts/Northrend/Nexus/Nexus/commander_kolurg.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/commander_kolurg.cpp
@@ -9,7 +9,7 @@ Script Data End */
 /*** SQL START ***
 update creature_template set scriptname = 'boss_commander_kolurg' where entry = '';
 *** SQL END ***/
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SPELL_BATTLE_SHOUT                                    31403
 #define SPELL_CHARGE                                          60067
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/commander_stoutbeard.cpp b/src/server/scripts/Northrend/Nexus/Nexus/commander_stoutbeard.cpp
index ef02baa38e6..068d19461af 100644
--- a/src/server/scripts/Northrend/Nexus/Nexus/commander_stoutbeard.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/commander_stoutbeard.cpp
@@ -9,7 +9,7 @@ Script Data End */
 /*** SQL START ***
 update creature_template set scriptname = 'boss_commander_stoutbeard' where entry = '';
 *** SQL END ***/
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SPELL_BATTLE_SHOUT                                       31403
 #define SPELL_CHARGE                                             60067
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp
index db70245e3a4..c7d8f892012 100644
--- a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp
@@ -15,7 +15,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "nexus.h"
 
 #define NUMBER_OF_ENCOUNTERS      4
diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp
index 7d276206339..04ab66ad534 100644
--- a/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp
+++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp
@@ -14,7 +14,7 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "oculus.h"
 
 enum Spells
diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp
index 94fb90ab206..6c1d4cae425 100644
--- a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp
+++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp
@@ -14,7 +14,7 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "oculus.h"
 
 //Types of drake mounts: Ruby(Tank),  Amber(DPS),  Emerald(Healer)
diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp
index 29435441d00..2a0d432177a 100644
--- a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp
+++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp
@@ -21,7 +21,7 @@ SDComment: Is not working SPELL_ARCANE_SHIELD. SPELL_FROSTBOMB has some issues,
 SDCategory: Instance Script
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "oculus.h"
 
 enum Spells
diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp
index 79034250a43..dea7cddc5c8 100644
--- a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp
+++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp
@@ -14,7 +14,7 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "oculus.h"
 
 enum Spells
diff --git a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp
index 49be2385a3c..233a1047104 100644
--- a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp
+++ b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp
@@ -14,7 +14,7 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "oculus.h"
 
 #define MAX_ENCOUNTER 4
diff --git a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp
index 685583532d5..a6d104245ba 100644
--- a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp
+++ b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp
@@ -14,7 +14,7 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "oculus.h"
 
 #define GOSSIP_ITEM_DRAKES         "So where do we go from here?"
diff --git a/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp
index 3e24aaeb6c0..c238e55675b 100644
--- a/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp
+++ b/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp
@@ -15,7 +15,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "obsidian_sanctum.h"
 
 enum eEnums
diff --git a/src/server/scripts/Northrend/ObsidianSanctum/instance_obsidian_sanctum.cpp b/src/server/scripts/Northrend/ObsidianSanctum/instance_obsidian_sanctum.cpp
index 7ef8e03c779..26218f2e936 100644
--- a/src/server/scripts/Northrend/ObsidianSanctum/instance_obsidian_sanctum.cpp
+++ b/src/server/scripts/Northrend/ObsidianSanctum/instance_obsidian_sanctum.cpp
@@ -1,4 +1,4 @@
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "obsidian_sanctum.h"
 
 #define MAX_ENCOUNTER     1
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp
index c2da2a24e71..f7d2b74c97d 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp
@@ -21,7 +21,7 @@ SDComment: Waypoint needed, we expect boss to always have 2x Stormforged Lieuten
 SDCategory: Halls of Lightning
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "halls_of_lightning.h"
 
 enum eEnums
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp
index ecf61188b3e..a3ce55bc66a 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp
@@ -19,7 +19,7 @@
  * Comment: Timer check pending
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "halls_of_lightning.h"
 
 enum Spells
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp
index f08c19efca2..5ea0f992ace 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp
@@ -21,7 +21,7 @@ SDComment: Missing intro. Remove hack of Pulsing Shockwave when core supports. A
 SDCategory: Halls of Lightning
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "halls_of_lightning.h"
 
 enum eEnums
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp
index 184050e3103..037b1d3086b 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp
@@ -21,7 +21,7 @@ SDComment: Not considered complete. Some events may fail and need further develo
 SDCategory: Halls of Lightning
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "halls_of_lightning.h"
 
 enum eEnums
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp
index 46cd5c9cccc..341c980db15 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp
@@ -21,7 +21,7 @@ SDComment: All ready.
 SDCategory: Halls of Lightning
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "halls_of_lightning.h"
 
 /* Halls of Lightning encounters:
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp
index 0674b7c79eb..3ab55799ea3 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp
@@ -9,7 +9,7 @@ Script Data End */
 /*** SQL START ***
 update creature_template set scriptname = 'boss_krystallus' where entry = '';
 *** SQL END ***/
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "halls_of_stone.h"
 
 enum Spells
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp
index b3c3c675347..cc3803b3ea2 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp
@@ -9,7 +9,7 @@ Script Data End */
 /*** SQL START ***
 update creature_template set scriptname = 'boss_maiden_of_grief' where entry = '';
 *** SQL END ***/
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "halls_of_stone.h"
 
 enum Spells
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp
index 68c3e34e6bf..f8fdacffcbe 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp
@@ -9,7 +9,7 @@ Script Data End */
 /*** SQL START ***
 update creature_template set scriptname = 'boss_sjonnir' where entry = '';
 *** SQL END ***/
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "halls_of_stone.h"
 
 enum Spells
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp
index 8febdaab879..0e14bc7dad6 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp
@@ -1,4 +1,4 @@
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ScriptedEscortAI.h"
 #include "halls_of_stone.h"
 
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp
index 69bb3779e70..1989195c741 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp
@@ -1,4 +1,4 @@
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "halls_of_stone.h"
 
 #define MAX_ENCOUNTER 4
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp
index e944543fb9e..f4e109deb7a 100644
--- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ulduar.h"
 
 #define GAMEOBJECT_GIVE_OF_THE_OBSERVER 194821
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp
index 8d3ae4d3431..a7f5522c010 100644
--- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp
@@ -23,7 +23,7 @@ SDComment: Runes need DB support, chain lightning won't cast, supercharge won't
 SDCategory: Ulduar - Ulduar
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ulduar.h"
 
 // Any boss
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_auriaya.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_auriaya.cpp
index 41c0f317f4e..119ebb81b73 100644
--- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_auriaya.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_auriaya.cpp
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ulduar.h"
 
 //boss_auriaya
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp
index b50f12805a4..41509766bb3 100644
--- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp
@@ -23,7 +23,7 @@
  *          Leviathan's DoAction(0) from Lore Keeper's script to activate hard-mode
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ulduar.h"
 #include "Vehicle.h"
 
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_freya.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_freya.cpp
index ee995878a0e..52ead1fb19d 100644
--- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_freya.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_freya.cpp
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ulduar.h"
 
 enum Yells
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_general_vezax.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_general_vezax.cpp
index f84c638d3e3..a57dea47dea 100644
--- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_general_vezax.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_general_vezax.cpp
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ulduar.h"
 
 enum Yells
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_hodir.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_hodir.cpp
index 6facd8ac639..439e91a6d31 100644
--- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_hodir.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_hodir.cpp
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ulduar.h"
 
 enum Yells
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp
index 05f9ecd3c66..f23a1f26f2e 100644
--- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ulduar.h"
 
 #define SPELL_FLAME_JETS            62680
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp
index 2080b458a1b..483f2e1a0bd 100644
--- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ulduar.h"
 #include "Vehicle.h"
 
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_mimiron.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_mimiron.cpp
index 2b9994d5d9b..0f5837d0b80 100644
--- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_mimiron.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_mimiron.cpp
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ulduar.h"
 
 enum Yells
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp
index c61f1046474..201d39dd02e 100644
--- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp
@@ -22,7 +22,7 @@ SDAuthor: MaXiMiUS
 SD%Complete: 65
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ulduar.h"
 
 //not in db
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_thorim.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_thorim.cpp
index bbab077e10e..5b6f78227f0 100644
--- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_thorim.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_thorim.cpp
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ulduar.h"
 
 enum Yells
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp
index 58123951d2f..3cce85ca773 100644
--- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp
@@ -28,7 +28,7 @@
         make the life sparks visible...
 */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ulduar.h"
 
 enum Spells
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_yoggsaron.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_yoggsaron.cpp
index 8f42f289204..c0f8df82f9c 100644
--- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_yoggsaron.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_yoggsaron.cpp
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ulduar.h"
 
 enum Sara_Yells
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp
index 692dbf72473..c19d4766d65 100644
--- a/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ulduar.h"
 
 enum eGameObjects
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/ulduar_teleporter.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/ulduar_teleporter.cpp
index 44f9e86b69c..5ba9596e884 100644
--- a/src/server/scripts/Northrend/Ulduar/ulduar/ulduar_teleporter.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/ulduar_teleporter.cpp
@@ -1,4 +1,4 @@
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ulduar.h"
 
 /*
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
index 77f824c48d5..d85eb29742c 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
@@ -23,7 +23,7 @@ SDComment: Some Problems with Annhylde Movement, Blizzlike Timers
 SDCategory: Udgarde Keep
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "utgarde_keep.h"
 
 enum Yells
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp
index d69f0eee846..0f65f751b20 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp
@@ -23,7 +23,7 @@ SDComment:  Needs Prince Movements, Needs adjustments to blizzlike timers, Needs
 SDCategory: Utgarde Keep
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "utgarde_keep.h"
 
 enum eEnums
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp
index 2146d37635b..d83a5bcd181 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp
@@ -23,7 +23,7 @@ SDComment: Needs adjustments to blizzlike timers, Yell Text + Sound to DB
 SDCategory: Utgarde Keep
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "utgarde_keep.h"
 
 enum eEnums
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp
index 03f97b1d27e..67fb0a09755 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp
@@ -23,7 +23,7 @@ SDComment: Instance Data Scripts and functions to acquire mobs and set encounter
 SDCategory: Utgarde Keep
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "utgarde_keep.h"
 
 #define MAX_ENCOUNTER     3
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp
index 95825aa49b6..0f8beee4961 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "utgarde_keep.h"
 
 uint32 entry_search[3] =
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp
index 297fe37b7d8..737a4c97c78 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp
@@ -9,7 +9,7 @@ Script Data End */
 /*** SQL START ***
 update creature_template set scriptname = 'boss_palehoof' where entry = '';
 *** SQL END ***/
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "utgarde_pinnacle.h"
 
 enum Spells
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
index a75eb3465be..ea31628ef93 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
@@ -24,7 +24,7 @@ SDComment: 
 SDCategory: Utgarde Pinnacle
 Script Data End */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "utgarde_pinnacle.h"
 
 //Yell
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
index aae1015ddab..16466201a0a 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
@@ -14,7 +14,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "utgarde_pinnacle.h"
 
 enum Spells
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp
index 1a650f94101..18555bb2342 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp
@@ -9,7 +9,7 @@ Script Data End */
 /*** SQL START ***
 update creature_template set scriptname = 'boss_ymiron' where entry = '';
 *** SQL END ***/
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "utgarde_pinnacle.h"
 
 enum Spells
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp
index cf042867707..7c2a1db1421 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp
@@ -1,4 +1,4 @@
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "utgarde_pinnacle.h"
 
 #define MAX_ENCOUNTER     4
diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp
index 11d432e94c6..d665b8c4aa4 100644
--- a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp
+++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp
@@ -21,7 +21,7 @@ UPDATE `creature_template` SET `ScriptName`='boss_archavon' WHERE `entry`='31125
 UPDATE `creature_template` SET `ScriptName`='mob_archavon_warder' WHERE `entry`='32353';
 *** SQL END ***/
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "vault_of_archavon.h"
 
 #define EMOTE_BERSERK           -1590002
diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp
index 92a0331708e..b60117f9c07 100644
--- a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp
+++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "vault_of_archavon.h"
 
 //Emalon spells
diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp
index 61843647136..bb854b2bf9f 100644
--- a/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp
+++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp
@@ -21,7 +21,7 @@ UPDATE `creature_template` SET `ScriptName`='boss_koralon' WHERE `entry`='35013'
 UPDATE `creature_template` SET `ScriptName`='mob_flame_warder' WHERE `entry`='35143';
 *** SQL END ***/
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "vault_of_archavon.h"
 
 enum Events
diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp
index 2e16f9211d2..fa89c0a93f2 100644
--- a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp
+++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp
@@ -23,7 +23,7 @@ UPDATE `creature_template` SET `ScriptName`='mob_frozen_orb_stalker' WHERE `entr
 UPDATE `creature_template` SET `ScriptName`='mob_frozen_orb' WHERE `entry`='38456';
 *** SQL END ***/
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "vault_of_archavon.h"
 
 // Spells Toravon
diff --git a/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp
index a7183921cce..4fd82a2881c 100644
--- a/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp
+++ b/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp
@@ -1,4 +1,4 @@
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "vault_of_archavon.h"
 
 #define ENCOUNTERS  4
diff --git a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp
index 589e69a6f18..a13fc351eda 100644
--- a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp
@@ -9,7 +9,7 @@ Script Data End */
 /*** SQL START ***
 update creature_template set scriptname = '' where entry = '';
 *** SQL END ***/
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "violet_hold.h"
 
 enum Spells
diff --git a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp
index a9cc7393af4..adbd06dadb9 100644
--- a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp
@@ -9,7 +9,7 @@ Script Data End */
 /*** SQL START ***
 update creature_template set scriptname = '' where entry = '';
 *** SQL END ***/
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "violet_hold.h"
 
 enum Spells
diff --git a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp
index a28bfdffb7c..df80c1f3ff6 100644
--- a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp
@@ -22,7 +22,7 @@ SDComment: TODO: better spawn location for adds
 SDCategory:
 Script Data End */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "violet_hold.h"
 
 enum Spells
diff --git a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp
index d8cd3a4962f..01ac241d9f7 100644
--- a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp
@@ -9,7 +9,7 @@ Script Data End */
 /*** SQL START ***
 update creature_template set scriptname = '' where entry = '';
 *** SQL END ***/
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "violet_hold.h"
 
 enum Spells
diff --git a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp
index 6d283c7bfb4..edf78ccacf5 100644
--- a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp
@@ -9,7 +9,7 @@ Script Data End */
 /*** SQL START ***
 update creature_template set scriptname = '' where entry = '';
 *** SQL END ***/
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "violet_hold.h"
 
 //Spells
diff --git a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp
index 2633705c1b7..1493154599c 100644
--- a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory:
 Script Data End */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "violet_hold.h"
 
 enum Spells
diff --git a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp
index da75ed94fc2..02824f72608 100644
--- a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp
@@ -5,7 +5,7 @@ SDComment: The phasemask for the voids dosen't work.
 SDCategory:
 Script Data End */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "violet_hold.h"
 
 enum Spells
diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
index 781511f940b..9b220ae36cc 100644
--- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
+++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
@@ -1,4 +1,4 @@
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "violet_hold.h"
 
 #define MAX_ENCOUNTER          3
diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp
index 49883b5dbf3..169f933ef45 100644
--- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp
+++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp
@@ -1,4 +1,4 @@
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "violet_hold.h"
 
 #define GOSSIP_START_EVENT  "Get your people to safety, we'll keep the Blue Dragonflight's forces at bay."
diff --git a/src/server/scripts/Northrend/borean_tundra.cpp b/src/server/scripts/Northrend/borean_tundra.cpp
index 19d82dc9044..db5fe26f88f 100644
--- a/src/server/scripts/Northrend/borean_tundra.cpp
+++ b/src/server/scripts/Northrend/borean_tundra.cpp
@@ -35,7 +35,7 @@ npc_lurgglbr
 npc_nexus_drake_hatchling
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ScriptedEscortAI.h"
 #include "ScriptedFollowerAI.h"
 
diff --git a/src/server/scripts/Northrend/crystalsong_forest.cpp b/src/server/scripts/Northrend/crystalsong_forest.cpp
index 208e9dea5b5..80130021ea7 100644
--- a/src/server/scripts/Northrend/crystalsong_forest.cpp
+++ b/src/server/scripts/Northrend/crystalsong_forest.cpp
@@ -24,7 +24,7 @@ SDComment:
 SDCategory: CrystalsongForest
 Script Data End */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 /*******************************************************
  * npc_warmage_violetstand
diff --git a/src/server/scripts/Northrend/dalaran.cpp b/src/server/scripts/Northrend/dalaran.cpp
index 7d5e76ffe35..69d870f2e30 100644
--- a/src/server/scripts/Northrend/dalaran.cpp
+++ b/src/server/scripts/Northrend/dalaran.cpp
@@ -24,7 +24,7 @@ SDComment: For what is 63990+63991? Same function but don't work correct...
 SDCategory: Dalaran
 Script Data End */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 /*******************************************************
  * npc_mageguard_dalaran
diff --git a/src/server/scripts/Northrend/dragonblight.cpp b/src/server/scripts/Northrend/dragonblight.cpp
index 4f26ec1de1a..6d1100c2936 100644
--- a/src/server/scripts/Northrend/dragonblight.cpp
+++ b/src/server/scripts/Northrend/dragonblight.cpp
@@ -25,7 +25,7 @@ EndScriptData */
 npc_alexstrasza_wr_gate
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ScriptedEscortAI.h"
 
 enum eEnums
diff --git a/src/server/scripts/Northrend/grizzly_hills.cpp b/src/server/scripts/Northrend/grizzly_hills.cpp
index 4b6d65a9764..55c744de0a7 100644
--- a/src/server/scripts/Northrend/grizzly_hills.cpp
+++ b/src/server/scripts/Northrend/grizzly_hills.cpp
@@ -25,7 +25,7 @@ EndScriptData */
 npc_orsonn_and_kodian
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ScriptedEscortAI.h"
 
 #define GOSSIP_ITEM1 "You're free to go Orsonn, but first tell me what's wrong with the furbolg."
diff --git a/src/server/scripts/Northrend/howling_fjord.cpp b/src/server/scripts/Northrend/howling_fjord.cpp
index 172501e2faa..d0335b4e4c6 100644
--- a/src/server/scripts/Northrend/howling_fjord.cpp
+++ b/src/server/scripts/Northrend/howling_fjord.cpp
@@ -27,7 +27,7 @@ npc_plaguehound_tracker
 npc_apothecary_hanes
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ScriptedEscortAI.h"
 
 /*######
diff --git a/src/server/scripts/Northrend/icecrown.cpp b/src/server/scripts/Northrend/icecrown.cpp
index 76608bdb73d..a2630c06a16 100644
--- a/src/server/scripts/Northrend/icecrown.cpp
+++ b/src/server/scripts/Northrend/icecrown.cpp
@@ -25,7 +25,7 @@ EndScriptData */
 npc_arete
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 /*######
 ## npc_arete
diff --git a/src/server/scripts/Northrend/sholazar_basin.cpp b/src/server/scripts/Northrend/sholazar_basin.cpp
index b5df8998b4a..bbeee45a0d8 100644
--- a/src/server/scripts/Northrend/sholazar_basin.cpp
+++ b/src/server/scripts/Northrend/sholazar_basin.cpp
@@ -28,7 +28,7 @@ npc_vekjik
 avatar_of_freya
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ScriptedEscortAI.h"
 
 /*######
diff --git a/src/server/scripts/Northrend/storm_peaks.cpp b/src/server/scripts/Northrend/storm_peaks.cpp
index 9275e24bd2f..306dd44f7c1 100644
--- a/src/server/scripts/Northrend/storm_peaks.cpp
+++ b/src/server/scripts/Northrend/storm_peaks.cpp
@@ -15,7 +15,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ScriptedEscortAI.h"
 
 /*######
diff --git a/src/server/scripts/Northrend/zuldrak.cpp b/src/server/scripts/Northrend/zuldrak.cpp
index a821ea4ffae..da1a21011b4 100644
--- a/src/server/scripts/Northrend/zuldrak.cpp
+++ b/src/server/scripts/Northrend/zuldrak.cpp
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ScriptedEscortAI.h"
 
 /*####
diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp
index bfde95ffcb0..2385b24bd72 100644
--- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp
+++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp
@@ -27,7 +27,7 @@ boss_exarch_maladaar
 mob_avatar_of_martyred
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SPELL_MOONFIRE          37328
 #define SPELL_FIREBALL          37329
diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp
index c13e2905171..f07e3a2561f 100644
--- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp
+++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp
@@ -21,7 +21,7 @@ Comment: InhibitMagic should stack slower far from the boss, proper Visual for F
 Category: Auchindoun, Auchenai Crypts
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SPELL_INHIBITMAGIC          32264
 #define SPELL_ATTRACTMAGIC          32265
diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp
index 5b15178c33e..a2f4c411527 100644
--- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp
@@ -26,7 +26,7 @@ boss_nexusprince_shaffar
 mob_ethereal_beacon
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 enum ePrince
 {
diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp
index 51ec2e83b46..f61556c092d 100644
--- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp
@@ -21,7 +21,7 @@ SDComment: Not known how void blast is done (amount of rapid cast seems to be re
 SDCategory: Auchindoun, Mana Tombs
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SAY_AGGRO_1                     -1557008
 #define SAY_AGGRO_2                     -1557009
diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp
index 9628fa1a98f..af11926bf91 100644
--- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp
+++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp
@@ -21,7 +21,7 @@ SDComment: Shock spells/times need more work. Heroic partly implemented.
 SDCategory: Auchindoun, Sethekk Halls
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SAY_SUMMON                  -1556000
 
diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp
index 32b97293ca3..be24951545c 100644
--- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp
+++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp
@@ -21,7 +21,7 @@ SDComment: Heroic supported. Some details missing, but most are spell related.
 SDCategory: Auchindoun, Sethekk Halls
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "sethekk_halls.h"
 
 #define SAY_INTRO                   -1556007
diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp
index ee27da3cff5..ab3a7f73f91 100644
--- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp
+++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp
@@ -21,7 +21,7 @@ SDComment: Instance Data for Sethekk Halls instance
 SDCategory: Auchindoun, Sethekk Halls
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "sethekk_halls.h"
 
 enum eEnums
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp
index 2bb6a717a5a..e48b7f034a5 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp
@@ -21,7 +21,7 @@ SDComment: Enrage spell missing/not known
 SDCategory: Auchindoun, Shadow Labyrinth
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ScriptedEscortAI.h"
 #include "shadow_labyrinth.h"
 
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
index 52c60ae0d0e..b5141bb5c55 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
@@ -21,7 +21,7 @@ SDComment: Incite Chaos not functional since core lacks Mind Control support
 SDCategory: Auchindoun, Shadow Labyrinth
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "shadow_labyrinth.h"
 
 #define SPELL_INCITE_CHAOS    33676
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp
index 8b63b765b47..872ff846976 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Auchindoun, Shadow Labyrinth
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "shadow_labyrinth.h"
 
 #define SAY_INTRO                       -1555028
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp
index 14bf249c3b5..7c52c15e04c 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp
@@ -21,7 +21,7 @@ SDComment: Timers may be incorrect
 SDCategory: Auchindoun, Shadow Labyrinth
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "shadow_labyrinth.h"
 
 #define EMOTE_SONIC_BOOM            -1555036
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp
index 78340e5e132..9b4ecca6579 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp
@@ -21,7 +21,7 @@ SDComment: Some cleanup left along with save
 SDCategory: Auchindoun, Shadow Labyrinth
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "shadow_labyrinth.h"
 
 #define MAX_ENCOUNTER 5
diff --git a/src/server/scripts/Outland/BlackTemple/black_temple.cpp b/src/server/scripts/Outland/BlackTemple/black_temple.cpp
index c1e7f19fbb1..761706fb2a5 100644
--- a/src/server/scripts/Outland/BlackTemple/black_temple.cpp
+++ b/src/server/scripts/Outland/BlackTemple/black_temple.cpp
@@ -25,7 +25,7 @@ EndScriptData */
 npc_spirit_of_olum
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "black_temple.h"
 
 /*###
diff --git a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp
index 1093ce06cb8..a8331fab7e0 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp
@@ -21,7 +21,7 @@ SDComment: Bloodboil not working correctly, missing enrage
 SDCategory: Black Temple
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "black_temple.h"
 
 //Speech'n'Sound
diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
index b8e09c0e08e..590e51d9eab 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
@@ -21,7 +21,7 @@ SDComment: Somewhat of a workaround for Parasitic Shadowfiend, unable to summon
 SDCategory: Black Temple
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "black_temple.h"
 
 #define GETGO(obj, guid)      GameObject* obj = pInstance->instance->GetGameObject(guid)
diff --git a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
index 5949fc46511..0419ab30054 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
@@ -21,7 +21,7 @@ SDComment: Saber Lash missing, Fatal Attraction slightly incorrect; need to dama
 SDCategory: Black Temple
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "black_temple.h"
 
 //Speech'n'Sounds
diff --git a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
index 3e019a8dc35..e24ed1eefa2 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Black Temple
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "black_temple.h"
 #include "Spell.h"
 
diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
index 94f88d5715c..663faceb672 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
@@ -21,7 +21,7 @@ SDComment: Seems to be complete.
 SDCategory: Black Temple
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "black_temple.h"
 
 #define SAY_DEATH                   -1564013
diff --git a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp
index bc1ea3ec673..ecccc1a286b 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp
@@ -21,7 +21,7 @@ SDComment: Need to implement molten punch
 SDCategory: Black Temple
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "black_temple.h"
 
 #define EMOTE_NEW_TARGET            -1564010
diff --git a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
index 670edc4d869..807d92a238d 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
@@ -21,7 +21,7 @@ SDComment: Requires Mind Control support for Ghosts.
 SDCategory: Black Temple
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "black_temple.h"
 
  //Speech'n'sound
diff --git a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
index 7d94b4b36a0..e526e063f76 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Black Temple
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "black_temple.h"
 
 enum eEnums
diff --git a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp
index 82cc2876b5a..132da7d7bd1 100644
--- a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp
+++ b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp
@@ -21,7 +21,7 @@ SDComment: Circle of Healing not working properly.
 SDCategory: Black Temple
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "black_temple.h"
 
 //Speech'n'Sounds
diff --git a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
index 88e25026a13..5af96257887 100644
--- a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
+++ b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
@@ -21,7 +21,7 @@ SDComment: Instance Data Scripts and functions to acquire mobs and set encounter
 SDCategory: Black Temple
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "black_temple.h"
 
 #define MAX_ENCOUNTER      9
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
index 69a969adda0..fd93f7cf1c0 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
@@ -21,7 +21,7 @@ SDComment: Cyclone workaround
 SDCategory: Coilfang Resevoir, Serpent Shrine Cavern
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "serpent_shrine.h"
 #include "ScriptedEscortAI.h"
 
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
index 923fdf55f80..4fb2ef39f78 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
@@ -21,7 +21,7 @@ SDComment: Some details and adjustments left to do, probably nothing major. Spaw
 SDCategory: Coilfang Resevoir, Serpent Shrine Cavern
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "serpent_shrine.h"
 
 #define SAY_AGGRO                   -1548000
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
index 2f0485d0e6c..36bd73f5a37 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
@@ -21,7 +21,7 @@ SDComment: Missing blizzlike Shield Generators coords
 SDCategory: Coilfang Resevoir, Serpent Shrine Cavern
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "serpent_shrine.h"
 #include "ScriptedSimpleAI.h"
 #include "Spell.h"
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp
index 61c9ed9d527..80152dc0c7e 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp
@@ -21,7 +21,7 @@ SDComment: Possesion Support
 SDCategory: Coilfang Resevoir, Serpent Shrine Cavern
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "serpent_shrine.h"
 
 // --- Spells used by Leotheras The Blind
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
index b1c0c10bcce..b6765850297 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
@@ -21,7 +21,7 @@ SDComment: Coilfang Frenzy, find out how could we fishing in the strangepool
 SDCategory: The Lurker Below
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "serpent_shrine.h"
 #include "ScriptedSimpleAI.h"
 #include "Spell.h"
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
index 14c87aee141..a74a236b9ce 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
@@ -21,7 +21,7 @@ SDComment: Water globules don't explode properly, remove hacks
 SDCategory: Coilfang Resevoir, Serpent Shrine Cavern
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "serpent_shrine.h"
 
 #define SAY_AGGRO                   -1548030
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
index c80afae15c7..a59d012ebb9 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
@@ -21,7 +21,7 @@ SDComment: Instance Data Scripts and functions to acquire mobs and set encounter
 SDCategory: Coilfang Resevoir, Serpent Shrine Cavern
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "serpent_shrine.h"
 
 #define MAX_ENCOUNTER 6
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp
index 8e1b438bdc5..05d73155ce3 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp
@@ -26,7 +26,7 @@ boss_hydromancer_thespia
 mob_coilfang_waterelemental
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "steam_vault.h"
 
 #define SAY_SUMMON                  -1545000
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp
index f2da4058e44..14d8a976210 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp
@@ -26,7 +26,7 @@ boss_mekgineer_steamrigger
 mob_steamrigger_mechanic
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "steam_vault.h"
 
 #define SAY_MECHANICS               -1545007
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp
index f46956dda81..3f542f4af2a 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp
@@ -21,7 +21,7 @@ SDComment: Contains workarounds regarding warlord's rage spells not acting as ex
 SDCategory: Coilfang Resevoir, The Steamvault
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "steam_vault.h"
 
 #define SAY_INTRO                   -1545016
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
index 188a23738f5..2669c8ed48d 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
@@ -21,7 +21,7 @@ SDComment:  Instance script and access panel GO
 SDCategory: Coilfang Resevoir, The Steamvault
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "steam_vault.h"
 
 #define MAX_ENCOUNTER 4
diff --git a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp
index fcfcc1b1a90..ace43fbaeff 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp
@@ -21,7 +21,7 @@ SDComment: Need confirmation if spell data are same in both modes. Summons shoul
 SDCategory: Coilfang Resevoir, Underbog
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SPELL_FOUL_SPORES   31673
 #define SPELL_ACID_GEYSER   38739
diff --git a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp
index 3a78660389b..37411d0d3be 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp
@@ -21,7 +21,7 @@ SDComment: Timers may be incorrect
 SDCategory: Coilfang Resevoir, Underbog
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SPELL_LEVITATE             31704
 #define SPELL_SUSPENSION           31719
diff --git a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp
index a07ac910598..b27bc12635b 100644
--- a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp
+++ b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp
@@ -21,7 +21,7 @@ SDComment: Ground Slam need further development (knock back effect and shatter e
 SDCategory: Gruul's Lair
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "gruuls_lair.h"
 
 enum eEnums
diff --git a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp
index 482af86225c..fdc1493f7af 100644
--- a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp
+++ b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp
@@ -21,7 +21,7 @@ SDComment: Correct timers, after whirlwind melee attack bug, prayer of healing
 SDCategory: Gruul's Lair
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "gruuls_lair.h"
 
 #define SAY_AGGRO               -1565000
diff --git a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp
index bb790a5d4ea..7791e7ecd98 100644
--- a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp
+++ b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Gruul's Lair
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "gruuls_lair.h"
 
 #define MAX_ENCOUNTER 2
diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
index d5fb9bdba49..0fedd171ba1 100644
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
@@ -21,7 +21,7 @@ SDComment: pre-event not made
 SDCategory: Hellfire Citadel, Blood Furnace
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "blood_furnace.h"
 
 enum eEnums
diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp
index a44ad9cc3c8..030e7c4d8e2 100644
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp
@@ -26,7 +26,7 @@ boss_kelidan_the_breaker
 mob_shadowmoon_channeler
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "blood_furnace.h"
 
 enum eKelidan
diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp
index 45219b6509b..c6c9aff9914 100644
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp
@@ -21,7 +21,7 @@ SDComment: Mind control no support
 SDCategory: Hellfire Citadel, Blood Furnace
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "blood_furnace.h"
 
 enum eEnums
diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
index 3a2eb8ba5ee..ae72c873f4f 100644
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Hellfire Citadel, Blood Furnace
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "blood_furnace.h"
 
 #define ENTRY_SEWER1                 181823
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp
index d6c0b2fd401..c672a9973f6 100644
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp
@@ -21,7 +21,7 @@ SDComment: Temporary solution for orbital/shadow whip-ability. Needs more core s
 SDCategory: Hellfire Citadel, Hellfire Ramparts
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SAY_AGGRO_1                 -1543009
 #define SAY_AGGRO_2                 -1543010
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
index 181911f77a4..100654b34d5 100644
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
@@ -21,7 +21,7 @@ Comment:
 Category: Hellfire Citadel, Hellfire Ramparts
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SPELL_FIREBALL              DUNGEON_MODE(34653, 36920)
 #define SPELL_CONE_OF_FIRE          DUNGEON_MODE(30926, 36921)
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
index f0e813d3890..2204428405c 100644
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
@@ -21,7 +21,7 @@ SDComment: Missing adds to heal him. Surge should be used on pTarget furthest aw
 SDCategory: Hellfire Citadel, Hellfire Ramparts
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SAY_TAUNT               -1543000
 #define SAY_HEAL                -1543001
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
index 29c58675e9c..76425e351cf 100644
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Hellfire Ramparts
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "hellfire_ramparts.h"
 
 struct instance_ramparts : public ScriptedInstance
diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
index 5fb381f4065..4d7f3a8b0f1 100644
--- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
@@ -21,7 +21,7 @@ SDComment: In Development
 SDCategory: Hellfire Citadel, Magtheridon's lair
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "magtheridons_lair.h"
 
 struct Yell
diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
index d5b459a1fa1..5170421d97d 100644
--- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Hellfire Citadel, Magtheridon's lair
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "magtheridons_lair.h"
 
 #define SPELL_SOUL_TRANSFER         30531 // core bug, does not support target 7
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
index e3ded52edc9..4e5a575763d 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
@@ -27,7 +27,7 @@ mob_fel_orc_convert
 mob_lesser_shadow_fissure
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "shattered_halls.h"
 
 struct Say
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
index 6fa1c9efe33..f274c18c88b 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
@@ -26,7 +26,7 @@ mob_omrogg_heads
 boss_warbringer_omrogg
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "shattered_halls.h"
 
 enum eEnums
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
index b108077518a..92983f89768 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
@@ -25,7 +25,7 @@ EndScriptData */
 boss_warchief_kargath_bladefist
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SAY_AGGRO1                      -1540042
 #define SAY_AGGRO2                      -1540043
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
index c29df4d6411..a4107f7e820 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
@@ -21,7 +21,7 @@ SDComment: currently missing info about door. instance not complete
 SDCategory: Hellfire Citadel, Shattered Halls
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "shattered_halls.h"
 
 #define MAX_ENCOUNTER  2
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
index af5f1bd95c1..2d625ea4271 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Tempest Keep, The Eye
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "the_eye.h"
 
 #define SPELL_FLAME_BUFFET            34121 // Flame Buffet - every 1,5 secs in phase 1 if there is no victim in melee range and after Dive Bomb in phase 2 with same conditions
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
index e9e217a5c62..eb2d7402b99 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Tempest Keep, The Eye
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "the_eye.h"
 
 enum eEnums
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
index 05681fb7539..276fe844e32 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
@@ -21,7 +21,7 @@ SDComment: SQL, weapon scripts, mind control, need correct spells(interruptible/
 SDCategory: Tempest Keep, The Eye
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "the_eye.h"
 #include "WorldPacket.h"
 
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
index e1b60b20948..ac921af0fd9 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
@@ -21,7 +21,7 @@ SDComment: Should reset if raid are out of room.
 SDCategory: Tempest Keep, The Eye
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "the_eye.h"
 
 enum eEnums
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
index 59c72071238..4b78b804741 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Tempest Keep, The Eye
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "the_eye.h"
 
 #define MAX_ENCOUNTER 5
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp
index 97021fdc031..5c1f924764c 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp
@@ -25,7 +25,7 @@ EndScriptData */
 mob_crystalcore_devastator
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "the_eye.h"
 
 #define SPELL_COUNTERCHARGE     35035
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp
index b9c365eda65..b967fe508ee 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp
@@ -21,7 +21,7 @@ SDComment: Place Holder
 SDCategory: Tempest Keep, The Mechanar
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 //not used
 #define SAY_AGGRO                       -1554000
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp
index 50c3a6171ce..8fc29124099 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Tempest Keep, The Mechanar
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SAY_AGGRO_1                     -1554006
 #define SAY_HAMMER_1                    -1554007
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
index ededec0196d..81b4a07a237 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
@@ -21,7 +21,7 @@ SDComment: Need adjustments to initial summons
 SDCategory: Tempest Keep, The Mechanar
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "mechanar.h"
 
 #define SAY_AGGRO                       -1554013
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
index c0c06704db7..0365172837f 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
@@ -21,7 +21,7 @@ SDComment: Event missing. Script for himself 99% blizzlike.
 SDCategory: Tempest Keep, The Mechanar
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SAY_AGGRO                       -1554020
 #define SAY_DOMINATION_1                -1554021
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp
index c70da24ea3f..b17e8aa8401 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Mechanar
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "mechanar.h"
 
 #define MAX_ENCOUNTER      1
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
index 69dbc877d89..935154d3d7a 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
@@ -27,7 +27,7 @@ npc_warden_mellichar
 mob_zerekethvoidzone
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "arcatraz.h"
 
 /*#####
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
index 6576974f3ff..9abc4e70eb2 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
@@ -26,7 +26,7 @@ boss_harbinger_skyriss
 boss_harbinger_skyriss_illusion
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "arcatraz.h"
 
 #define SAY_INTRO               -1552000
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
index d16975e2af6..9638b9ce19a 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
@@ -21,7 +21,7 @@ SDComment: Mainly Harbringer Skyriss event
 SDCategory: Tempest Keep, The Arcatraz
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "arcatraz.h"
 
 #define MAX_ENCOUNTER 9
diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp
index 1a077036298..47800603c58 100644
--- a/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp
@@ -21,7 +21,7 @@ SDComment: some strange visual related to tree form(if aura lost before normal d
 SDCategory: Tempest Keep, The Botanica
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SAY_AGGRO                   -1553000
 #define SAY_KILL_1                  -1553001
diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp
index cbf21c2f992..d06c9cb4938 100644
--- a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp
@@ -21,7 +21,7 @@ SDComment: Immunities are wrong, must be adjusted to use resistance from creatur
 SDCategory: Tempest Keep, The Botanica
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define EMOTE_SUMMON                -1553006
 
diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp
index 48eb03c16d3..c6e6f5166ab 100644
--- a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp
@@ -21,7 +21,7 @@ SDComment: Includes Sapling (need some better control with these).
 SDCategory: Tempest Keep, The Botanica
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 /*#####
 # mob_treant (Sapling)
diff --git a/src/server/scripts/Outland/blades_edge_mountains.cpp b/src/server/scripts/Outland/blades_edge_mountains.cpp
index f5b4539edaf..56c530a0cb4 100644
--- a/src/server/scripts/Outland/blades_edge_mountains.cpp
+++ b/src/server/scripts/Outland/blades_edge_mountains.cpp
@@ -30,7 +30,7 @@ npc_saikkal_the_elder
 go_legion_obelisk
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 //Support for quest: You're Fired! (10821)
 bool     obelisk_one, obelisk_two, obelisk_three, obelisk_four, obelisk_five;
diff --git a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp
index 9e9538f2d23..72ddfeb73c9 100644
--- a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp
+++ b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp
@@ -21,7 +21,7 @@ SDComment: Using incorrect spell for Mark of Kazzak
 SDCategory: Hellfire Peninsula
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SAY_INTRO                       -1000147
 #define SAY_AGGRO1                      -1000148
diff --git a/src/server/scripts/Outland/boss_doomwalker.cpp b/src/server/scripts/Outland/boss_doomwalker.cpp
index 60bcd7ee373..0f5fb3335e9 100644
--- a/src/server/scripts/Outland/boss_doomwalker.cpp
+++ b/src/server/scripts/Outland/boss_doomwalker.cpp
@@ -21,7 +21,7 @@ SDComment:
 SDCategory: Shadowmoon Valley
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define SAY_AGGRO                   -1000159
 #define SAY_EARTHQUAKE_1            -1000160
diff --git a/src/server/scripts/Outland/hellfire_peninsula.cpp b/src/server/scripts/Outland/hellfire_peninsula.cpp
index fce8ac6f59e..bafca52e463 100644
--- a/src/server/scripts/Outland/hellfire_peninsula.cpp
+++ b/src/server/scripts/Outland/hellfire_peninsula.cpp
@@ -31,7 +31,7 @@ npc_trollbane
 npc_wounded_blood_elf
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ScriptedEscortAI.h"
 
 /*######
diff --git a/src/server/scripts/Outland/nagrand.cpp b/src/server/scripts/Outland/nagrand.cpp
index 700ba2cc120..518cb6f605e 100644
--- a/src/server/scripts/Outland/nagrand.cpp
+++ b/src/server/scripts/Outland/nagrand.cpp
@@ -33,7 +33,7 @@ npc_creditmarker_visit_with_ancestors
 mob_sparrowhawk
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ScriptedEscortAI.h"
 
 /*######
diff --git a/src/server/scripts/Outland/netherstorm.cpp b/src/server/scripts/Outland/netherstorm.cpp
index efe18ad1908..a44839eba90 100644
--- a/src/server/scripts/Outland/netherstorm.cpp
+++ b/src/server/scripts/Outland/netherstorm.cpp
@@ -28,7 +28,7 @@ npc_commander_dawnforge
 npc_bessy
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ScriptedEscortAI.h"
 
 /*######
diff --git a/src/server/scripts/Outland/shadowmoon_valley.cpp b/src/server/scripts/Outland/shadowmoon_valley.cpp
index 0e2eb34f0fe..42653f7a074 100644
--- a/src/server/scripts/Outland/shadowmoon_valley.cpp
+++ b/src/server/scripts/Outland/shadowmoon_valley.cpp
@@ -39,7 +39,7 @@ go_crystal_prison
 npc_enraged_spirit
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ScriptedEscortAI.h"
 
 /*#####
diff --git a/src/server/scripts/Outland/shattrath_city.cpp b/src/server/scripts/Outland/shattrath_city.cpp
index 6acc050db48..815904f02ba 100644
--- a/src/server/scripts/Outland/shattrath_city.cpp
+++ b/src/server/scripts/Outland/shattrath_city.cpp
@@ -32,7 +32,7 @@ npc_ishanah
 npc_khadgar
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ScriptedEscortAI.h"
 
 /*######
diff --git a/src/server/scripts/Outland/terokkar_forest.cpp b/src/server/scripts/Outland/terokkar_forest.cpp
index d593fdd8ca9..8fda1ee5821 100644
--- a/src/server/scripts/Outland/terokkar_forest.cpp
+++ b/src/server/scripts/Outland/terokkar_forest.cpp
@@ -31,7 +31,7 @@ npc_isla_starmane
 npc_slim
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ScriptedEscortAI.h"
 
 /*######
diff --git a/src/server/scripts/Outland/zangarmarsh.cpp b/src/server/scripts/Outland/zangarmarsh.cpp
index 5a07165595b..c163d6647cb 100644
--- a/src/server/scripts/Outland/zangarmarsh.cpp
+++ b/src/server/scripts/Outland/zangarmarsh.cpp
@@ -30,7 +30,7 @@ npc_kayra_longmane
 npc_timothy_daniels
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ScriptedEscortAI.h"
 
 /*######
diff --git a/src/server/scripts/World/areatrigger_scripts.cpp b/src/server/scripts/World/areatrigger_scripts.cpp
index 9a75263d35c..9550b6456c1 100644
--- a/src/server/scripts/World/areatrigger_scripts.cpp
+++ b/src/server/scripts/World/areatrigger_scripts.cpp
@@ -33,7 +33,7 @@ at_warsong_farms                q11686
 at_stormwright_shelf            q12741
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 /*######
 ## AreaTrigger_at_aldurthar_gate
diff --git a/src/server/scripts/World/boss_emeriss.cpp b/src/server/scripts/World/boss_emeriss.cpp
index 3dc14969786..ccd7f05c891 100644
--- a/src/server/scripts/World/boss_emeriss.cpp
+++ b/src/server/scripts/World/boss_emeriss.cpp
@@ -21,7 +21,7 @@ SDComment: Teleport function & Mark of Nature missing
 SDCategory: Bosses
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 enum eEnums
 {
diff --git a/src/server/scripts/World/boss_lethon.cpp b/src/server/scripts/World/boss_lethon.cpp
index cc316223a2f..ad400ab1f7d 100644
--- a/src/server/scripts/World/boss_lethon.cpp
+++ b/src/server/scripts/World/boss_lethon.cpp
@@ -21,5 +21,5 @@ SDComment: Place Holder
 SDCategory: Bosses
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
diff --git a/src/server/scripts/World/boss_taerar.cpp b/src/server/scripts/World/boss_taerar.cpp
index 079f7b387a8..d505297ec49 100644
--- a/src/server/scripts/World/boss_taerar.cpp
+++ b/src/server/scripts/World/boss_taerar.cpp
@@ -21,7 +21,7 @@ SDComment: Mark of Nature & Teleport NYI. Fix the way to be banished.
 SDCategory: Bosses
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 enum eEnums
 {
diff --git a/src/server/scripts/World/boss_ysondre.cpp b/src/server/scripts/World/boss_ysondre.cpp
index 50b8f724e68..483dd13845a 100644
--- a/src/server/scripts/World/boss_ysondre.cpp
+++ b/src/server/scripts/World/boss_ysondre.cpp
@@ -21,7 +21,7 @@ SDComment: Mark of Nature & Teleport missing
 SDCategory: Bosses
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 enum eEnums
 {
diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp
index 6f06ac78fd7..d8dd8c3d391 100644
--- a/src/server/scripts/World/go_scripts.cpp
+++ b/src/server/scripts/World/go_scripts.cpp
@@ -48,7 +48,7 @@ go_soulwell
 go_bashir_crystalforge
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 /*######
 ## go_cat_figurine
diff --git a/src/server/scripts/World/guards.cpp b/src/server/scripts/World/guards.cpp
index 5faf9c73f7d..72a2e808804 100644
--- a/src/server/scripts/World/guards.cpp
+++ b/src/server/scripts/World/guards.cpp
@@ -29,7 +29,7 @@ guard_shattrath_scryer
 guard_stormwind
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ScriptedGuardAI.h"
 
 /*******************************************************
diff --git a/src/server/scripts/World/item_scripts.cpp b/src/server/scripts/World/item_scripts.cpp
index dbf5f3c1a84..cae4233775b 100644
--- a/src/server/scripts/World/item_scripts.cpp
+++ b/src/server/scripts/World/item_scripts.cpp
@@ -29,7 +29,7 @@ item_gor_dreks_ointment(i30175)     Protecting Our Own(q10488)
 item_only_for_flight                Items which should only useable while flying
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "Spell.h"
 
 /*#####
diff --git a/src/server/scripts/World/mob_generic_creature.cpp b/src/server/scripts/World/mob_generic_creature.cpp
index 3ab515d8206..869ea9a70f9 100644
--- a/src/server/scripts/World/mob_generic_creature.cpp
+++ b/src/server/scripts/World/mob_generic_creature.cpp
@@ -22,7 +22,7 @@ SDComment: Should be replaced with core based AI
 SDCategory: Creatures
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define GENERIC_CREATURE_COOLDOWN   5000
 
diff --git a/src/server/scripts/World/npc_innkeeper.cpp b/src/server/scripts/World/npc_innkeeper.cpp
index 9bda7a53516..4689354b67a 100644
--- a/src/server/scripts/World/npc_innkeeper.cpp
+++ b/src/server/scripts/World/npc_innkeeper.cpp
@@ -24,7 +24,7 @@ SDComment: Complete
 SDCategory: NPCs
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define HALLOWEEN_EVENTID       12
 #define SPELL_TRICK_OR_TREATED  24755
diff --git a/src/server/scripts/World/npc_professions.cpp b/src/server/scripts/World/npc_professions.cpp
index ed22225d0d4..9d33584847b 100644
--- a/src/server/scripts/World/npc_professions.cpp
+++ b/src/server/scripts/World/npc_professions.cpp
@@ -21,7 +21,7 @@ SDComment: Provides learn/unlearn/relearn-options for professions. Not supported
 SDCategory: NPCs
 EndScriptData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 /*
 A few notes for future developement:
diff --git a/src/server/scripts/World/npc_taxi.cpp b/src/server/scripts/World/npc_taxi.cpp
index 2a8efd4e0cb..8f9a1fcc3d2 100644
--- a/src/server/scripts/World/npc_taxi.cpp
+++ b/src/server/scripts/World/npc_taxi.cpp
@@ -22,7 +22,7 @@ SDCategory: NPCs
 EndScriptData
 */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #define GOSSIP_SUSURRUS         "I am ready."
 #define GOSSIP_NETHER_DRAKE     "I'm ready to fly! Take me up, dragon!"
diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp
index cfd1b7698fc..86aaac1413b 100644
--- a/src/server/scripts/World/npcs_special.cpp
+++ b/src/server/scripts/World/npcs_special.cpp
@@ -40,7 +40,7 @@ npc_shadowfiend         100%   restore 5% of owner's mana when shadowfiend die f
 npc_locksmith            75%    list of keys needs to be confirmed
 EndContentData */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 #include "ScriptedEscortAI.h"
 #include "ObjectMgr.h"
 #include "ScriptMgr.h"
-- 
cgit v1.2.3


From 9b6669e5f3fbf996915503b383954128c8b2ab8e Mon Sep 17 00:00:00 2001
From: Brian 
Date: Tue, 8 Jun 2010 15:50:23 -0600
Subject: * Remove more relative paths from includes

--HG--
branch : trunk
---
 src/server/game/Chat/Commands/Debugcmds.cpp        | 18 +++++++++---------
 src/server/game/Chat/Commands/Level0.cpp           |  8 ++++----
 src/server/game/Chat/Commands/Level1.cpp           | 16 ++++++++--------
 src/server/game/Chat/Commands/Level2.cpp           | 10 +++++-----
 src/server/game/Chat/Commands/Level3.cpp           | 22 +++++++++++-----------
 src/server/game/Combat/HostileRefManager.h         |  2 +-
 src/server/game/Conditions/ConditionMgr.cpp        |  4 ++--
 src/server/game/DataStores/DBCStores.cpp           |  6 +++---
 src/server/game/DataStores/DBCStructure.h          |  2 +-
 src/server/game/DungeonFinding/LFGMgr.cpp          |  6 +++---
 src/server/game/DungeonFinding/LFGMgr.h            |  2 +-
 src/server/game/Entities/Corpse/Corpse.cpp         |  6 +++---
 src/server/game/Entities/Creature/Creature.cpp     | 20 ++++++++++----------
 .../game/Entities/Creature/CreatureGroups.cpp      |  4 ++--
 src/server/game/Entities/Creature/GossipDef.cpp    |  8 ++++----
 .../game/Entities/Creature/TemporarySummon.cpp     |  2 +-
 .../game/Entities/DynamicObject/DynamicObject.cpp  | 12 ++++++------
 src/server/game/Entities/GameObject/GameObject.cpp | 18 +++++++++---------
 18 files changed, 83 insertions(+), 83 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Chat/Commands/Debugcmds.cpp b/src/server/game/Chat/Commands/Debugcmds.cpp
index 247e67ed135..a6c973ea002 100644
--- a/src/server/game/Chat/Commands/Debugcmds.cpp
+++ b/src/server/game/Chat/Commands/Debugcmds.cpp
@@ -19,23 +19,23 @@
  */
 
 #include "Common.h"
-#include "Database/DatabaseEnv.h"
-#include "Packets/WorldPacket.h"
+#include "DatabaseEnv.h"
+#include "WorldPacket.h"
 #include "Vehicle.h"
 #include "Player.h"
-#include "Server/Protocol/Opcodes.h"
+#include "Opcodes.h"
 #include "Chat.h"
-#include "Logging/Log.h"
+#include "Log.h"
 #include "Unit.h"
 #include "GossipDef.h"
-#include "Miscellaneous/Language.h"
+#include "Language.h"
 #include "BattleGroundMgr.h"
 #include 
 #include "ObjectMgr.h"
-#include "Grids/Cells/Cell.h"
-#include "Grids/Cells/CellImpl.h"
-#include "Grids/Notifiers/GridNotifiers.h"
-#include "Grids/Notifiers/GridNotifiersImpl.h"
+#include "Cell.h"
+#include "CellImpl.h"
+#include "GridNotifiers.h"
+#include "GridNotifiersImpl.h"
 #include "SpellMgr.h"
 #include "ScriptMgr.h"
 
diff --git a/src/server/game/Chat/Commands/Level0.cpp b/src/server/game/Chat/Commands/Level0.cpp
index fd6dc165fc6..bed8e3ee23f 100644
--- a/src/server/game/Chat/Commands/Level0.cpp
+++ b/src/server/game/Chat/Commands/Level0.cpp
@@ -19,17 +19,17 @@
  */
 
 #include "Common.h"
-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"
 #include "World.h"
 #include "Player.h"
-#include "Server/Protocol/Opcodes.h"
+#include "Opcodes.h"
 #include "Chat.h"
 #include "ObjectAccessor.h"
-#include "Miscellaneous/Language.h"
+#include "Language.h"
 #include "AccountMgr.h"
 #include "SystemConfig.h"
 #include "revision.h"
-#include "Utilities/Util.h"
+#include "Util.h"
 
 bool ChatHandler::HandleHelpCommand(const char* args)
 {
diff --git a/src/server/game/Chat/Commands/Level1.cpp b/src/server/game/Chat/Commands/Level1.cpp
index 8a739df76d8..d80157611fb 100644
--- a/src/server/game/Chat/Commands/Level1.cpp
+++ b/src/server/game/Chat/Commands/Level1.cpp
@@ -19,22 +19,22 @@
  */
 
 #include "Common.h"
-#include "Database/DatabaseEnv.h"
-#include "Packets/WorldPacket.h"
-#include "Server/WorldSession.h"
+#include "DatabaseEnv.h"
+#include "WorldPacket.h"
+#include "WorldSession.h"
 #include "World.h"
 #include "ObjectMgr.h"
 #include "Player.h"
 #include "AccountMgr.h"
-#include "Server/Protocol/Opcodes.h"
+#include "Opcodes.h"
 #include "Chat.h"
-#include "Logging/Log.h"
+#include "Log.h"
 #include "MapManager.h"
 #include "ObjectAccessor.h"
-#include "Miscellaneous/Language.h"
-#include "Grids/Cells/CellImpl.h"
+#include "Language.h"
+#include "CellImpl.h"
 #include "InstanceSaveMgr.h"
-#include "Utilities/Util.h"
+#include "Util.h"
 
 #ifdef _DEBUG_VMAPS
 #include "VMapFactory.h"
diff --git a/src/server/game/Chat/Commands/Level2.cpp b/src/server/game/Chat/Commands/Level2.cpp
index fbca47ebad0..40772a82922 100644
--- a/src/server/game/Chat/Commands/Level2.cpp
+++ b/src/server/game/Chat/Commands/Level2.cpp
@@ -19,23 +19,23 @@
  */
 
 #include "Common.h"
-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"
 #include "DBCStores.h"
 #include "ObjectMgr.h"
 #include "Player.h"
 #include "Item.h"
 #include "GameObject.h"
-#include "Server/Protocol/Opcodes.h"
+#include "Opcodes.h"
 #include "Chat.h"
 #include "MapManager.h"
-#include "Miscellaneous/Language.h"
+#include "Language.h"
 #include "World.h"
 #include "GameEventMgr.h"
 #include "SpellMgr.h"
 #include "PoolHandler.h"
 #include "AccountMgr.h"
-#include "Movement/Waypoints/WaypointManager.h"
-#include "Utilities/Util.h"
+#include "WaypointManager.h"
+#include "Util.h"
 #include 
 #include 
 #include 
diff --git a/src/server/game/Chat/Commands/Level3.cpp b/src/server/game/Chat/Commands/Level3.cpp
index 77d07a6f406..abdb99ee5e5 100644
--- a/src/server/game/Chat/Commands/Level3.cpp
+++ b/src/server/game/Chat/Commands/Level3.cpp
@@ -19,9 +19,9 @@
 */
 
 #include "Common.h"
-#include "Database/DatabaseEnv.h"
-#include "Packets/WorldPacket.h"
-#include "Server/WorldSession.h"
+#include "DatabaseEnv.h"
+#include "WorldPacket.h"
+#include "WorldSession.h"
 #include "World.h"
 #include "ObjectMgr.h"
 #include "AuctionHouseMgr.h"
@@ -29,29 +29,29 @@
 #include "PlayerDump.h"
 #include "SpellMgr.h"
 #include "Player.h"
-#include "Server/Protocol/Opcodes.h"
+#include "Opcodes.h"
 #include "GameObject.h"
 #include "Chat.h"
-#include "Logging/Log.h"
+#include "Log.h"
 #include "Guild.h"
 #include "ObjectAccessor.h"
 #include "MapManager.h"
-#include "Miscellaneous/Language.h"
-#include "Grids/Notifiers/GridNotifiersImpl.h"
-#include "Grids/Cells/CellImpl.h"
+#include "Language.h"
+#include "GridNotifiersImpl.h"
+#include "CellImpl.h"
 #include "Weather.h"
 #include "PointMovementGenerator.h"
 #include "TargetedMovementGenerator.h"
 #include "SkillDiscovery.h"
 #include "SkillExtraItems.h"
 #include "SystemConfig.h"
-#include "Configuration/ConfigEnv.h"
-#include "Utilities/Util.h"
+#include "ConfigEnv.h"
+#include "Util.h"
 #include "ItemEnchantmentMgr.h"
 #include "BattleGroundMgr.h"
 #include "InstanceSaveMgr.h"
 #include "InstanceData.h"
-#include "AuctionHouse/AuctionHouseBot/AuctionHouseBot.h"
+#include "AuctionHouseBot.h"
 #include "CreatureEventAIMgr.h"
 #include "SpellAuraEffects.h"
 #include "DBCEnums.h"
diff --git a/src/server/game/Combat/HostileRefManager.h b/src/server/game/Combat/HostileRefManager.h
index ce5947ffc64..0a240ad44be 100644
--- a/src/server/game/Combat/HostileRefManager.h
+++ b/src/server/game/Combat/HostileRefManager.h
@@ -22,7 +22,7 @@
 #define _HOSTILEREFMANAGER
 
 #include "Common.h"
-#include "Dynamic/LinkedReference/RefManager.h"
+#include "RefManager.h"
 
 class Unit;
 class ThreatManager;
diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp
index bdd475f884d..83287ee87be 100644
--- a/src/server/game/Conditions/ConditionMgr.cpp
+++ b/src/server/game/Conditions/ConditionMgr.cpp
@@ -19,13 +19,13 @@
  */
 
 
-#include "Policies/SingletonImp.h"
+#include "SingletonImp.h"
 #include "Player.h"
 #include "SpellAuras.h"
 #include "SpellMgr.h"
 #include "GameEventMgr.h"
 #include "ObjectMgr.h"
-#include "Utilities/ProgressBar.h"
+#include "ProgressBar.h"
 #include "InstanceData.h"
 #include "ConditionMgr.h"
 
diff --git a/src/server/game/DataStores/DBCStores.cpp b/src/server/game/DataStores/DBCStores.cpp
index 55eb63ddb1e..510fbdad100 100644
--- a/src/server/game/DataStores/DBCStores.cpp
+++ b/src/server/game/DataStores/DBCStores.cpp
@@ -19,10 +19,10 @@
  */
 
 #include "DBCStores.h"
-#include "Policies/SingletonImp.h"
+#include "SingletonImp.h"
 #include "Logging/Log.h"
-#include "Utilities/ProgressBar.h"
-#include "Miscellaneous/SharedDefines.h"
+#include "ProgressBar.h"
+#include "SharedDefines.h"
 #include "SpellMgr.h"
 
 #include "DBCfmt.h"
diff --git a/src/server/game/DataStores/DBCStructure.h b/src/server/game/DataStores/DBCStructure.h
index 480aceb26e6..112aef734e7 100644
--- a/src/server/game/DataStores/DBCStructure.h
+++ b/src/server/game/DataStores/DBCStructure.h
@@ -23,7 +23,7 @@
 
 #include "DBCEnums.h"
 #include "Define.h"
-#include "Utilities/Util.h"
+#include "Util.h"
 
 #include 
 #include 
diff --git a/src/server/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp
index 71f27ead4d5..734c5522942 100644
--- a/src/server/game/DungeonFinding/LFGMgr.cpp
+++ b/src/server/game/DungeonFinding/LFGMgr.cpp
@@ -15,14 +15,14 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-#include "Policies/SingletonImp.h"
+#include "SingletonImp.h"
 #include "Common.h"
-#include "Miscellaneous/SharedDefines.h"
+#include "SharedDefines.h"
 #include "Group.h"
 #include "Player.h"
 #include "LFGMgr.h"
 #include "ObjectMgr.h"
-#include "Packets/WorldPacket.h"
+#include "WorldPacket.h"
 
 INSTANTIATE_SINGLETON_1(LFGMgr);
 
diff --git a/src/server/game/DungeonFinding/LFGMgr.h b/src/server/game/DungeonFinding/LFGMgr.h
index b19da4e3d00..a3d6fedc695 100644
--- a/src/server/game/DungeonFinding/LFGMgr.h
+++ b/src/server/game/DungeonFinding/LFGMgr.h
@@ -20,7 +20,7 @@
 #define _LFGMGR_H
 
 #include "Common.h"
-#include "Policies/Singleton.h"
+#include "Singleton.h"
 #include "Group.h"
 #include "LFG.h"
 
diff --git a/src/server/game/Entities/Corpse/Corpse.cpp b/src/server/game/Entities/Corpse/Corpse.cpp
index 96e5423a085..6d9e11104ab 100644
--- a/src/server/game/Entities/Corpse/Corpse.cpp
+++ b/src/server/game/Entities/Corpse/Corpse.cpp
@@ -21,10 +21,10 @@
 #include "Common.h"
 #include "Corpse.h"
 #include "Player.h"
-#include "Entities/Object/Updates/UpdateMask.h"
+#include "UpdateMask.h"
 #include "ObjectAccessor.h"
-#include "Database/DatabaseEnv.h"
-#include "Server/Protocol/Opcodes.h"
+#include "DatabaseEnv.h"
+#include "Opcodes.h"
 #include "GossipDef.h"
 #include "World.h"
 
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp
index f7ac131342e..71461f94949 100644
--- a/src/server/game/Entities/Creature/Creature.cpp
+++ b/src/server/game/Entities/Creature/Creature.cpp
@@ -19,8 +19,8 @@
  */
 
 #include "Common.h"
-#include "Database/DatabaseEnv.h"
-#include "Packets/WorldPacket.h"
+#include "DatabaseEnv.h"
+#include "WorldPacket.h"
 #include "World.h"
 #include "ObjectMgr.h"
 #include "SpellMgr.h"
@@ -29,27 +29,27 @@
 #include "GossipDef.h"
 #include "Player.h"
 #include "PoolHandler.h"
-#include "Server/Protocol/Opcodes.h"
-#include "Logging/Log.h"
+#include "Opcodes.h"
+#include "Log.h"
 #include "LootMgr.h"
 #include "MapManager.h"
 #include "CreatureAI.h"
 #include "CreatureAISelector.h"
-#include "Miscellaneous/Formulas.h"
+#include "Formulas.h"
 #include "WaypointMovementGenerator.h"
 #include "InstanceData.h"
 #include "BattleGroundMgr.h"
-#include "Utilities/Util.h"
-#include "Grids/Notifiers/GridNotifiers.h"
-#include "Grids/Notifiers/GridNotifiersImpl.h"
-#include "Grids/Cells/CellImpl.h"
+#include "Util.h"
+#include "GridNotifiers.h"
+#include "GridNotifiersImpl.h"
+#include "CellImpl.h"
 #include "OutdoorPvPMgr.h"
 #include "GameEventMgr.h"
 #include "CreatureGroups.h"
 #include "Vehicle.h"
 #include "SpellAuraEffects.h"
 // apply implementation of the singletons
-#include "Policies/SingletonImp.h"
+#include "SingletonImp.h"
 
 TrainerSpell const* TrainerSpellData::Find(uint32 spell_id) const
 {
diff --git a/src/server/game/Entities/Creature/CreatureGroups.cpp b/src/server/game/Entities/Creature/CreatureGroups.cpp
index 03cb8da00bf..25aab942916 100644
--- a/src/server/game/Entities/Creature/CreatureGroups.cpp
+++ b/src/server/game/Entities/Creature/CreatureGroups.cpp
@@ -21,8 +21,8 @@
 #include "Creature.h"
 #include "CreatureGroups.h"
 #include "ObjectMgr.h"
-#include "Utilities/ProgressBar.h"
-#include "Policies/SingletonImp.h"
+#include "ProgressBar.h"
+#include "SingletonImp.h"
 #include "CreatureAI.h"
 
 #define MAX_DESYNC 5.0f
diff --git a/src/server/game/Entities/Creature/GossipDef.cpp b/src/server/game/Entities/Creature/GossipDef.cpp
index e2cd8965373..3e0fec52bc7 100644
--- a/src/server/game/Entities/Creature/GossipDef.cpp
+++ b/src/server/game/Entities/Creature/GossipDef.cpp
@@ -21,10 +21,10 @@
 #include "QuestDef.h"
 #include "GossipDef.h"
 #include "ObjectMgr.h"
-#include "Server/Protocol/Opcodes.h"
-#include "Packets/WorldPacket.h"
-#include "Server/WorldSession.h"
-#include "Miscellaneous/Formulas.h"
+#include "Opcodes.h"
+#include "WorldPacket.h"
+#include "WorldSession.h"
+#include "Formulas.h"
 
 GossipMenu::GossipMenu()
 {
diff --git a/src/server/game/Entities/Creature/TemporarySummon.cpp b/src/server/game/Entities/Creature/TemporarySummon.cpp
index 860bdf21803..11652460fc5 100644
--- a/src/server/game/Entities/Creature/TemporarySummon.cpp
+++ b/src/server/game/Entities/Creature/TemporarySummon.cpp
@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "Logging/Log.h"
+#include "Log.h"
 #include "ObjectAccessor.h"
 #include "CreatureAI.h"
 #include "ObjectMgr.h"
diff --git a/src/server/game/Entities/DynamicObject/DynamicObject.cpp b/src/server/game/Entities/DynamicObject/DynamicObject.cpp
index 49f82f19b80..5c13fe47cb7 100644
--- a/src/server/game/Entities/DynamicObject/DynamicObject.cpp
+++ b/src/server/game/Entities/DynamicObject/DynamicObject.cpp
@@ -19,14 +19,14 @@
  */
 
 #include "Common.h"
-#include "Entities/Object/Updates/UpdateMask.h"
-#include "Server/Protocol/Opcodes.h"
+#include "UpdateMask.h"
+#include "Opcodes.h"
 #include "World.h"
 #include "ObjectAccessor.h"
-#include "Database/DatabaseEnv.h"
-#include "Grids/Notifiers/GridNotifiers.h"
-#include "Grids/Cells/CellImpl.h"
-#include "Grids/Notifiers/GridNotifiersImpl.h"
+#include "DatabaseEnv.h"
+#include "GridNotifiers.h"
+#include "CellImpl.h"
+#include "GridNotifiersImpl.h"
 
 DynamicObject::DynamicObject() : WorldObject()
 {
diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp
index 9bc1e2ff5e2..364bc8ec29c 100644
--- a/src/server/game/Entities/GameObject/GameObject.cpp
+++ b/src/server/game/Entities/GameObject/GameObject.cpp
@@ -25,20 +25,20 @@
 #include "PoolHandler.h"
 #include "SpellMgr.h"
 #include "Spell.h"
-#include "Entities/Object/Updates/UpdateMask.h"
-#include "Server/Protocol/Opcodes.h"
-#include "Packets/WorldPacket.h"
+#include "UpdateMask.h"
+#include "Opcodes.h"
+#include "WorldPacket.h"
 #include "World.h"
-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"
 #include "LootMgr.h"
-#include "Grids/Notifiers/GridNotifiers.h"
-#include "Grids/Notifiers/GridNotifiersImpl.h"
-#include "Grids/Cells/CellImpl.h"
+#include "GridNotifiers.h"
+#include "GridNotifiersImpl.h"
+#include "CellImpl.h"
 #include "InstanceData.h"
 #include "BattleGround.h"
-#include "Utilities/Util.h"
+#include "Util.h"
 #include "OutdoorPvPMgr.h"
-#include "BattleGrounds/Zones/BattleGroundAV.h"
+#include "BattleGroundAV.h"
 #include "ScriptMgr.h"
 
 GameObject::GameObject() : WorldObject(), m_goValue(new GameObjectValue)
-- 
cgit v1.2.3


From dee7fd13828cd886968115cb7725da01f9e31f07 Mon Sep 17 00:00:00 2001
From: Brian 
Date: Tue, 8 Jun 2010 16:13:55 -0600
Subject: * Remove more not needed relative paths in include files

--HG--
branch : trunk
---
 src/server/game/Entities/Item/Container/Bag.cpp      | 6 +++---
 src/server/game/Entities/Item/Item.cpp               | 4 ++--
 src/server/game/Entities/Item/ItemEnchantmentMgr.cpp | 2 +-
 src/server/game/Entities/Object/Updates/UpdateData.h | 2 +-
 src/server/game/Entities/Object/Updates/UpdateMask.h | 2 +-
 src/server/game/Entities/Pet/Pet.cpp                 | 2 +-
 src/server/game/Entities/Player/Player.cpp           | 4 ++--
 src/server/game/Entities/Player/SocialMgr.cpp        | 4 ++--
 src/server/game/Entities/Player/SocialMgr.h          | 4 ++--
 src/server/game/Events/GameEventMgr.cpp              | 2 +-
 src/server/game/Events/GameEventMgr.h                | 2 +-
 src/server/game/Globals/GlobalEvents.cpp             | 4 ++--
 src/server/game/Globals/ObjectAccessor.cpp           | 2 +-
 src/server/game/Globals/ObjectMgr.cpp                | 8 ++++----
 src/server/game/Globals/ObjectMgr.h                  | 6 +++---
 src/server/game/Grids/Cells/Cell.h                   | 4 ++--
 src/server/game/Grids/Grid.h                         | 6 +++---
 src/server/game/Grids/GridLoader.h                   | 2 +-
 src/server/game/Grids/GridRefManager.h               | 2 +-
 src/server/game/Grids/GridReference.h                | 2 +-
 src/server/game/Groups/GroupRefManager.h             | 2 +-
 src/server/game/Groups/GroupReference.h              | 2 +-
 src/server/game/Guilds/Guild.cpp                     | 2 +-
 src/server/game/Instances/InstanceData.cpp           | 2 +-
 src/server/game/Instances/InstanceSaveMgr.cpp        | 2 +-
 src/server/game/Instances/InstanceSaveMgr.h          | 6 +++---
 src/server/game/Maps/Map.cpp                         | 2 +-
 src/server/game/Maps/Map.h                           | 2 +-
 src/server/game/Maps/MapManager.cpp                  | 6 +++---
 src/server/game/Maps/MapManager.h                    | 2 +-
 src/server/game/Maps/MapRefManager.h                 | 2 +-
 src/server/game/Maps/MapReference.h                  | 2 +-
 src/server/game/Maps/MapUpdater.cpp                  | 2 +-
 src/server/game/Maps/MapUpdater.h                    | 2 +-
 34 files changed, 53 insertions(+), 53 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Item/Container/Bag.cpp b/src/server/game/Entities/Item/Container/Bag.cpp
index e1488e2390c..b38bcb54ff8 100644
--- a/src/server/game/Entities/Item/Container/Bag.cpp
+++ b/src/server/game/Entities/Item/Container/Bag.cpp
@@ -20,11 +20,11 @@
 
 #include "Common.h"
 #include "ObjectMgr.h"
-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"
 
 #include "Bag.h"
-#include "Logging/Log.h"
-#include "Entities/Object/Updates/UpdateData.h"
+#include "Log.h"
+#include "UpdateData.h"
 
 Bag::Bag(): Item()
 {
diff --git a/src/server/game/Entities/Item/Item.cpp b/src/server/game/Entities/Item/Item.cpp
index d6b07ecac01..d0be9199259 100644
--- a/src/server/game/Entities/Item/Item.cpp
+++ b/src/server/game/Entities/Item/Item.cpp
@@ -21,8 +21,8 @@
 #include "Common.h"
 #include "Item.h"
 #include "ObjectMgr.h"
-#include "Packets/WorldPacket.h"
-#include "Database/DatabaseEnv.h"
+#include "WorldPacket.h"
+#include "DatabaseEnv.h"
 #include "ItemEnchantmentMgr.h"
 #include "SpellMgr.h"
 #include "ScriptMgr.h"
diff --git a/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp b/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp
index 8594ea864ba..5d8d6ef25ce 100644
--- a/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp
+++ b/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp
@@ -21,7 +21,7 @@
 #include 
 #include 
 #include "ItemEnchantmentMgr.h"
-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"
 #include "Log.h"
 #include "ObjectMgr.h"
 #include "ProgressBar.h"
diff --git a/src/server/game/Entities/Object/Updates/UpdateData.h b/src/server/game/Entities/Object/Updates/UpdateData.h
index eb10696a26e..e560db842f5 100644
--- a/src/server/game/Entities/Object/Updates/UpdateData.h
+++ b/src/server/game/Entities/Object/Updates/UpdateData.h
@@ -21,7 +21,7 @@
 #ifndef __UPDATEDATA_H
 #define __UPDATEDATA_H
 
-#include "Packets/ByteBuffer.h"
+#include "ByteBuffer.h"
 class WorldPacket;
 
 enum OBJECT_UPDATE_TYPE
diff --git a/src/server/game/Entities/Object/Updates/UpdateMask.h b/src/server/game/Entities/Object/Updates/UpdateMask.h
index 9db2fcecbcc..527bec42aa7 100644
--- a/src/server/game/Entities/Object/Updates/UpdateMask.h
+++ b/src/server/game/Entities/Object/Updates/UpdateMask.h
@@ -22,7 +22,7 @@
 #define __UPDATEMASK_H
 
 #include "UpdateFields.h"
-#include "Debugging/Errors.h"
+#include "Errors.h"
 
 class UpdateMask
 {
diff --git a/src/server/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp
index 45b07e7bd96..51f5d43c3d8 100644
--- a/src/server/game/Entities/Pet/Pet.cpp
+++ b/src/server/game/Entities/Pet/Pet.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "Common.h"
-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"
 #include "Log.h"
 #include "WorldPacket.h"
 #include "ObjectMgr.h"
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 7ee5248dd54..c79ce17f40e 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -20,7 +20,7 @@
 
 #include "Common.h"
 #include "Language.h"
-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"
 #include "Log.h"
 #include "Opcodes.h"
 #include "SpellMgr.h"
@@ -59,7 +59,7 @@
 #include "OutdoorPvPMgr.h"
 #include "ArenaTeam.h"
 #include "Chat.h"
-#include "Database/DatabaseImpl.h"
+#include "DatabaseImpl.h"
 #include "Spell.h"
 #include "SocialMgr.h"
 #include "GameEventMgr.h"
diff --git a/src/server/game/Entities/Player/SocialMgr.cpp b/src/server/game/Entities/Player/SocialMgr.cpp
index f0f27691007..a64692895a3 100644
--- a/src/server/game/Entities/Player/SocialMgr.cpp
+++ b/src/server/game/Entities/Player/SocialMgr.cpp
@@ -19,8 +19,8 @@
  */
 
 #include "SocialMgr.h"
-#include "Policies/SingletonImp.h"
-#include "Database/DatabaseEnv.h"
+#include "SingletonImp.h"
+#include "DatabaseEnv.h"
 #include "Opcodes.h"
 #include "WorldPacket.h"
 #include "Player.h"
diff --git a/src/server/game/Entities/Player/SocialMgr.h b/src/server/game/Entities/Player/SocialMgr.h
index 40f0066ec2e..092ab09dc15 100644
--- a/src/server/game/Entities/Player/SocialMgr.h
+++ b/src/server/game/Entities/Player/SocialMgr.h
@@ -21,8 +21,8 @@
 #ifndef __TRINITY_SOCIALMGR_H
 #define __TRINITY_SOCIALMGR_H
 
-#include "Policies/Singleton.h"
-#include "Database/DatabaseEnv.h"
+#include "Singleton.h"
+#include "DatabaseEnv.h"
 #include "Common.h"
 
 class SocialMgr;
diff --git a/src/server/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp
index a2c6f2f2422..25cd624b3c5 100644
--- a/src/server/game/Events/GameEventMgr.cpp
+++ b/src/server/game/Events/GameEventMgr.cpp
@@ -27,7 +27,7 @@
 #include "Language.h"
 #include "Log.h"
 #include "MapManager.h"
-#include "Policies/SingletonImp.h"
+#include "SingletonImp.h"
 #include "GossipDef.h"
 #include "Player.h"
 #include "BattleGroundMgr.h"
diff --git a/src/server/game/Events/GameEventMgr.h b/src/server/game/Events/GameEventMgr.h
index d0e288fd77e..21178805859 100644
--- a/src/server/game/Events/GameEventMgr.h
+++ b/src/server/game/Events/GameEventMgr.h
@@ -24,7 +24,7 @@
 #include "Common.h"
 #include "SharedDefines.h"
 #include "Define.h"
-#include "Policies/Singleton.h"
+#include "Singleton.h"
 
 #define max_ge_check_delay DAY  // 1 day in seconds
 
diff --git a/src/server/game/Globals/GlobalEvents.cpp b/src/server/game/Globals/GlobalEvents.cpp
index 69895e14f5a..acdd91248bc 100644
--- a/src/server/game/Globals/GlobalEvents.cpp
+++ b/src/server/game/Globals/GlobalEvents.cpp
@@ -23,8 +23,8 @@
 */
 
 #include "Log.h"
-#include "Database/DatabaseEnv.h"
-#include "Database/DatabaseImpl.h"
+#include "DatabaseEnv.h"
+#include "DatabaseImpl.h"
 #include "Define.h"
 #include "MapManager.h"
 #include "ObjectAccessor.h"
diff --git a/src/server/game/Globals/ObjectAccessor.cpp b/src/server/game/Globals/ObjectAccessor.cpp
index cf5bc728c6e..73aca9865f8 100644
--- a/src/server/game/Globals/ObjectAccessor.cpp
+++ b/src/server/game/Globals/ObjectAccessor.cpp
@@ -20,7 +20,7 @@
 
 #include "ObjectAccessor.h"
 #include "ObjectMgr.h"
-#include "Policies/SingletonImp.h"
+#include "SingletonImp.h"
 #include "Player.h"
 #include "Creature.h"
 #include "GameObject.h"
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index 07e2607d13c..5f460c7e84c 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -19,10 +19,10 @@
  */
 
 #include "Common.h"
-#include "Database/DatabaseEnv.h"
-#include "Database/SQLStorage.h"
-#include "Database/SQLStorageImpl.h"
-#include "Policies/SingletonImp.h"
+#include "DatabaseEnv.h"
+#include "SQLStorage.h"
+#include "SQLStorageImpl.h"
+#include "SingletonImp.h"
 
 #include "Log.h"
 #include "MapManager.h"
diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h
index 79b6ffdd0eb..c1471aa0680 100644
--- a/src/server/game/Globals/ObjectMgr.h
+++ b/src/server/game/Globals/ObjectMgr.h
@@ -33,13 +33,13 @@
 #include "Path.h"
 #include "ItemPrototype.h"
 #include "NPCHandler.h"
-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"
 #include "Mail.h"
 #include "Map.h"
 #include "ObjectAccessor.h"
 #include "ObjectDefines.h"
-#include "Policies/Singleton.h"
-#include "Database/SQLStorage.h"
+#include "Singleton.h"
+#include "SQLStorage.h"
 #include "Vehicle.h"
 #include "ObjectMgr.h"
 #include 
diff --git a/src/server/game/Grids/Cells/Cell.h b/src/server/game/Grids/Cells/Cell.h
index 4cc1e0864ba..4bc08e3b1b9 100644
--- a/src/server/game/Grids/Cells/Cell.h
+++ b/src/server/game/Grids/Cells/Cell.h
@@ -23,8 +23,8 @@
 
 #include 
 
-#include "Dynamic/TypeContainer.h"
-#include "Dynamic/TypeContainerVisitor.h"
+#include "TypeContainer.h"
+#include "TypeContainerVisitor.h"
 
 #include "GridDefines.h"
 
diff --git a/src/server/game/Grids/Grid.h b/src/server/game/Grids/Grid.h
index 0085bc70152..fd2cc28c184 100644
--- a/src/server/game/Grids/Grid.h
+++ b/src/server/game/Grids/Grid.h
@@ -33,9 +33,9 @@
 */
 
 #include "Define.h"
-#include "Policies/ThreadingModel.h"
-#include "Dynamic/TypeContainer.h"
-#include "Dynamic/TypeContainerVisitor.h"
+#include "ThreadingModel.h"
+#include "TypeContainer.h"
+#include "TypeContainerVisitor.h"
 
 // forward declaration
 template class GridLoader;
diff --git a/src/server/game/Grids/GridLoader.h b/src/server/game/Grids/GridLoader.h
index 191ace29d34..ca80451e023 100644
--- a/src/server/game/Grids/GridLoader.h
+++ b/src/server/game/Grids/GridLoader.h
@@ -34,7 +34,7 @@
 
 #include "Define.h"
 #include "Grid.h"
-#include "Dynamic/TypeContainerVisitor.h"
+#include "TypeContainerVisitor.h"
 
 template
 <
diff --git a/src/server/game/Grids/GridRefManager.h b/src/server/game/Grids/GridRefManager.h
index 8f3430a0b4a..44a6c9b802c 100644
--- a/src/server/game/Grids/GridRefManager.h
+++ b/src/server/game/Grids/GridRefManager.h
@@ -21,7 +21,7 @@
 #ifndef _GRIDREFMANAGER
 #define _GRIDREFMANAGER
 
-#include "Dynamic/LinkedReference/RefManager.h"
+#include "RefManager.h"
 
 template
 class GridReference;
diff --git a/src/server/game/Grids/GridReference.h b/src/server/game/Grids/GridReference.h
index ac7c8e154b2..63e3817c7d3 100644
--- a/src/server/game/Grids/GridReference.h
+++ b/src/server/game/Grids/GridReference.h
@@ -21,7 +21,7 @@
 #ifndef _GRIDREFERENCE_H
 #define _GRIDREFERENCE_H
 
-#include "Dynamic/LinkedReference/Reference.h"
+#include "Reference.h"
 
 template
 class GridRefManager;
diff --git a/src/server/game/Groups/GroupRefManager.h b/src/server/game/Groups/GroupRefManager.h
index f80e8d0989a..19c4c8122c1 100644
--- a/src/server/game/Groups/GroupRefManager.h
+++ b/src/server/game/Groups/GroupRefManager.h
@@ -21,7 +21,7 @@
 #ifndef _GROUPREFMANAGER
 #define _GROUPREFMANAGER
 
-#include "Dynamic/LinkedReference/RefManager.h"
+#include "RefManager.h"
 
 class Group;
 class Player;
diff --git a/src/server/game/Groups/GroupReference.h b/src/server/game/Groups/GroupReference.h
index 530f6dd8f10..d2c50688113 100644
--- a/src/server/game/Groups/GroupReference.h
+++ b/src/server/game/Groups/GroupReference.h
@@ -21,7 +21,7 @@
 #ifndef _GROUPREFERENCE_H
 #define _GROUPREFERENCE_H
 
-#include "Dynamic/LinkedReference/Reference.h"
+#include "Reference.h"
 
 class Group;
 class Player;
diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp
index 02243776057..f1f3187bc32 100644
--- a/src/server/game/Guilds/Guild.cpp
+++ b/src/server/game/Guilds/Guild.cpp
@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
 #include "Player.h"
diff --git a/src/server/game/Instances/InstanceData.cpp b/src/server/game/Instances/InstanceData.cpp
index 214c5ca2327..5392ad4cbd1 100644
--- a/src/server/game/Instances/InstanceData.cpp
+++ b/src/server/game/Instances/InstanceData.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "InstanceData.h"
-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"
 #include "Map.h"
 #include "Player.h"
 #include "GameObject.h"
diff --git a/src/server/game/Instances/InstanceSaveMgr.cpp b/src/server/game/Instances/InstanceSaveMgr.cpp
index cd024ec6686..c62038cfbf0 100644
--- a/src/server/game/Instances/InstanceSaveMgr.cpp
+++ b/src/server/game/Instances/InstanceSaveMgr.cpp
@@ -20,7 +20,7 @@
  */
 
 #include "Common.h"
-#include "Database/SQLStorage.h"
+#include "SQLStorage.h"
 
 #include "Player.h"
 #include "GridNotifiers.h"
diff --git a/src/server/game/Instances/InstanceSaveMgr.h b/src/server/game/Instances/InstanceSaveMgr.h
index c8f6c756f2c..3d8bfb70ebf 100644
--- a/src/server/game/Instances/InstanceSaveMgr.h
+++ b/src/server/game/Instances/InstanceSaveMgr.h
@@ -23,12 +23,12 @@
 #define __InstanceSaveMgr_H
 
 #include "Define.h"
-#include "Policies/Singleton.h"
+#include "Singleton.h"
 #include "ace/Thread_Mutex.h"
 #include 
 #include 
-#include "Dynamic/UnorderedMap.h"
-#include "Database/DatabaseEnv.h"
+#include "UnorderedMap.h"
+#include "DatabaseEnv.h"
 #include "DBCEnums.h"
 #include "ObjectDefines.h"
 
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp
index 72337452d07..12d7f14090a 100644
--- a/src/server/game/Maps/Map.cpp
+++ b/src/server/game/Maps/Map.cpp
@@ -28,7 +28,7 @@
 #include "InstanceData.h"
 #include "Map.h"
 #include "GridNotifiersImpl.h"
-#include "Configuration/ConfigEnv.h"
+#include "ConfigEnv.h"
 #include "Transport.h"
 #include "ObjectAccessor.h"
 #include "ObjectMgr.h"
diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h
index 52c79be7038..d2d442ca4cd 100644
--- a/src/server/game/Maps/Map.h
+++ b/src/server/game/Maps/Map.h
@@ -22,7 +22,7 @@
 #define TRINITY_MAP_H
 
 #include "Define.h"
-#include "Policies/ThreadingModel.h"
+#include "ThreadingModel.h"
 #include "ace/RW_Thread_Mutex.h"
 #include "ace/Thread_Mutex.h"
 
diff --git a/src/server/game/Maps/MapManager.cpp b/src/server/game/Maps/MapManager.cpp
index 0585098cae0..42233db4a9a 100644
--- a/src/server/game/Maps/MapManager.cpp
+++ b/src/server/game/Maps/MapManager.cpp
@@ -20,8 +20,8 @@
 
 #include "MapManager.h"
 #include "InstanceSaveMgr.h"
-#include "Policies/SingletonImp.h"
-#include "Database/DatabaseEnv.h"
+#include "SingletonImp.h"
+#include "DatabaseEnv.h"
 #include "Log.h"
 #include "ObjectAccessor.h"
 #include "Transport.h"
@@ -29,7 +29,7 @@
 #include "MapInstanced.h"
 #include "InstanceData.h"
 #include "DestinationHolderImp.h"
-#include "Configuration/ConfigEnv.h"
+#include "ConfigEnv.h"
 #include "World.h"
 #include "CellImpl.h"
 #include "Corpse.h"
diff --git a/src/server/game/Maps/MapManager.h b/src/server/game/Maps/MapManager.h
index f4d7c3c94bc..0fd13f72af2 100644
--- a/src/server/game/Maps/MapManager.h
+++ b/src/server/game/Maps/MapManager.h
@@ -22,7 +22,7 @@
 #define TRINITY_MAPMANAGER_H
 
 #include "Define.h"
-#include "Policies/Singleton.h"
+#include "Singleton.h"
 #include "ace/Thread_Mutex.h"
 #include "Common.h"
 #include "Map.h"
diff --git a/src/server/game/Maps/MapRefManager.h b/src/server/game/Maps/MapRefManager.h
index 8712d343958..2cf38c1b000 100644
--- a/src/server/game/Maps/MapRefManager.h
+++ b/src/server/game/Maps/MapRefManager.h
@@ -19,7 +19,7 @@
 #ifndef _MAPREFMANAGER
 #define _MAPREFMANAGER
 
-#include "Dynamic/LinkedReference/RefManager.h"
+#include "RefManager.h"
 
 class MapReference;
 
diff --git a/src/server/game/Maps/MapReference.h b/src/server/game/Maps/MapReference.h
index c32be406af0..e74fdba229b 100644
--- a/src/server/game/Maps/MapReference.h
+++ b/src/server/game/Maps/MapReference.h
@@ -19,7 +19,7 @@
 #ifndef _MAPREFERENCE_H
 #define _MAPREFERENCE_H
 
-#include "Dynamic/LinkedReference/Reference.h"
+#include "Reference.h"
 #include "Map.h"
 
 class MapReference : public Reference
diff --git a/src/server/game/Maps/MapUpdater.cpp b/src/server/game/Maps/MapUpdater.cpp
index f9bb5e2bbbc..5720ed1eb50 100644
--- a/src/server/game/Maps/MapUpdater.cpp
+++ b/src/server/game/Maps/MapUpdater.cpp
@@ -1,7 +1,7 @@
 #include "MapUpdater.h"
 #include "DelayExecutor.h"
 #include "Map.h"
-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"
 
 #include 
 #include 
diff --git a/src/server/game/Maps/MapUpdater.h b/src/server/game/Maps/MapUpdater.h
index 48cd8db0c36..f301b15ca2f 100644
--- a/src/server/game/Maps/MapUpdater.h
+++ b/src/server/game/Maps/MapUpdater.h
@@ -4,7 +4,7 @@
 #include 
 #include 
 
-#include "Threading/DelayExecutor.h"
+#include "DelayExecutor.h"
 
 class Map;
 
-- 
cgit v1.2.3


From bc04d7ce25b400d22fa95e5505e08916a49fb79f Mon Sep 17 00:00:00 2001
From: Brian 
Date: Tue, 8 Jun 2010 17:01:03 -0600
Subject: * Remove the last of the realative paths from #include statements

--HG--
branch : trunk
---
 src/server/game/Movement/DestinationHolder.h                      | 2 +-
 src/server/game/Movement/FollowerRefManager.h                     | 2 +-
 src/server/game/Movement/FollowerReference.h                      | 2 +-
 src/server/game/Movement/MovementGenerator.h                      | 6 +++---
 .../game/Movement/MovementGenerators/WaypointMovementGenerator.h  | 4 ++--
 src/server/game/Movement/Waypoints/WaypointManager.cpp            | 2 +-
 src/server/game/OutdoorPvP/OutdoorPvP.h                           | 2 +-
 src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp                      | 2 +-
 src/server/game/OutdoorPvP/OutdoorPvPMgr.h                        | 2 +-
 src/server/game/Pools/PoolHandler.cpp                             | 4 ++--
 src/server/game/Pools/PoolHandler.h                               | 2 +-
 src/server/game/PrecompiledHeaders/NixCorePCH.h                   | 8 ++++----
 src/server/game/PrecompiledHeaders/WinCorePCH.cpp                 | 2 +-
 src/server/game/PrecompiledHeaders/WinCorePCH.h                   | 2 +-
 src/server/game/Quests/QuestDef.h                                 | 2 +-
 src/server/game/Scripting/ScriptMgr.cpp                           | 6 +++---
 src/server/game/Scripting/ScriptMgr.h                             | 2 +-
 src/server/game/Scripting/ScriptSystem.cpp                        | 2 +-
 src/server/game/Server/Protocol/Handlers/AddonHandler.cpp         | 4 ++--
 src/server/game/Server/Protocol/Handlers/AddonHandler.h           | 4 ++--
 src/server/game/Server/Protocol/Handlers/ArenaTeamHandler.cpp     | 2 +-
 src/server/game/Server/Protocol/Handlers/ChannelHandler.cpp       | 2 +-
 src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp     | 4 ++--
 src/server/game/Server/Protocol/Handlers/ChatHandler.cpp          | 2 +-
 src/server/game/Server/Protocol/Handlers/GroupHandler.cpp         | 2 +-
 src/server/game/Server/Protocol/Handlers/MiscHandler.cpp          | 4 ++--
 src/server/game/Server/Protocol/Handlers/NPCHandler.cpp           | 2 +-
 src/server/game/Server/Protocol/Handlers/QueryHandler.cpp         | 6 +++---
 src/server/game/Server/Protocol/Handlers/SkillHandler.cpp         | 2 +-
 src/server/game/Server/Protocol/Handlers/TaxiHandler.cpp          | 2 +-
 src/server/game/Server/Protocol/WorldLog.cpp                      | 4 ++--
 src/server/game/Server/Protocol/WorldLog.h                        | 2 +-
 src/server/game/Server/WorldSession.cpp                           | 2 +-
 src/server/game/Server/WorldSocket.cpp                            | 2 +-
 src/server/game/Server/WorldSocket.h                              | 2 +-
 src/server/game/Server/WorldSocketMgr.cpp                         | 4 ++--
 src/server/game/Skills/SkillDiscovery.cpp                         | 4 ++--
 src/server/game/Skills/SkillExtraItems.cpp                        | 2 +-
 src/server/game/Spells/Auras/SpellEffects.cpp                     | 2 +-
 src/server/game/Spells/Spell.cpp                                  | 4 ++--
 src/server/game/Tools/PlayerDump.cpp                              | 4 ++--
 src/server/game/World/TimeMgr.cpp                                 | 2 +-
 src/server/game/World/TimeMgr.h                                   | 2 +-
 src/server/game/World/World.cpp                                   | 8 ++++----
 44 files changed, 67 insertions(+), 67 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Movement/DestinationHolder.h b/src/server/game/Movement/DestinationHolder.h
index 7adf6f4cb11..c0ee668eb99 100644
--- a/src/server/game/Movement/DestinationHolder.h
+++ b/src/server/game/Movement/DestinationHolder.h
@@ -22,7 +22,7 @@
 #define TRINITY_DESTINATION_HOLDER_H
 
 #include "Define.h"
-#include "Utilities/Timer.h"
+#include "Timer.h"
 
 class WorldObject;
 class Map;
diff --git a/src/server/game/Movement/FollowerRefManager.h b/src/server/game/Movement/FollowerRefManager.h
index a0364e03db4..e451cd4747a 100644
--- a/src/server/game/Movement/FollowerRefManager.h
+++ b/src/server/game/Movement/FollowerRefManager.h
@@ -21,7 +21,7 @@
 #ifndef _FOLLOWERREFMANAGER
 #define _FOLLOWERREFMANAGER
 
-#include "Dynamic/LinkedReference/RefManager.h"
+#include "RefManager.h"
 
 class Unit;
 class TargetedMovementGeneratorBase;
diff --git a/src/server/game/Movement/FollowerReference.h b/src/server/game/Movement/FollowerReference.h
index db66ec4d022..72a6d4f463e 100644
--- a/src/server/game/Movement/FollowerReference.h
+++ b/src/server/game/Movement/FollowerReference.h
@@ -21,7 +21,7 @@
 #ifndef _FOLLOWERREFERENCE_H
 #define _FOLLOWERREFERENCE_H
 
-#include "Dynamic/LinkedReference/Reference.h"
+#include "Reference.h"
 
 class TargetedMovementGeneratorBase;
 class Unit;
diff --git a/src/server/game/Movement/MovementGenerator.h b/src/server/game/Movement/MovementGenerator.h
index fa7291b8601..650b4fc3196 100644
--- a/src/server/game/Movement/MovementGenerator.h
+++ b/src/server/game/Movement/MovementGenerator.h
@@ -22,9 +22,9 @@
 #define TRINITY_MOVEMENTGENERATOR_H
 
 #include "Define.h"
-#include "Policies/Singleton.h"
-#include "Dynamic/ObjectRegistry.h"
-#include "Dynamic/FactoryHolder.h"
+#include "Singleton.h"
+#include "ObjectRegistry.h"
+#include "FactoryHolder.h"
 #include "Common.h"
 #include "MotionMaster.h"
 
diff --git a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
index 9216aac5d0c..4b74e80e168 100644
--- a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
+++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
@@ -29,8 +29,8 @@
 
 #include "MovementGenerator.h"
 #include "DestinationHolder.h"
-#include "Movement/Waypoints/WaypointManager.h"
-#include "Movement/Waypoints/Path.h"
+#include "WaypointManager.h"
+#include "Path.h"
 #include "Traveller.h"
 
 #include "Player.h"
diff --git a/src/server/game/Movement/Waypoints/WaypointManager.cpp b/src/server/game/Movement/Waypoints/WaypointManager.cpp
index 0cbdd0bf975..078d272f62a 100644
--- a/src/server/game/Movement/Waypoints/WaypointManager.cpp
+++ b/src/server/game/Movement/Waypoints/WaypointManager.cpp
@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"
 #include "GridDefines.h"
 #include "WaypointManager.h"
 #include "ProgressBar.h"
diff --git a/src/server/game/OutdoorPvP/OutdoorPvP.h b/src/server/game/OutdoorPvP/OutdoorPvP.h
index 4f8d32c9383..8aa19ef94df 100644
--- a/src/server/game/OutdoorPvP/OutdoorPvP.h
+++ b/src/server/game/OutdoorPvP/OutdoorPvP.h
@@ -20,7 +20,7 @@
 #define OUTDOOR_PVP_H_
 
 #include "Utilities/Util.h"
-#include "Miscellaneous/SharedDefines.h"
+#include "SharedDefines.h"
 #include "ZoneScript.h"
 
 class GameObject;
diff --git a/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp b/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp
index 4a0baf49a04..f9dbedb30dc 100644
--- a/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp
+++ b/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp
@@ -25,7 +25,7 @@
 #include "OutdoorPvPEP.h"
 #include "ObjectMgr.h"
 #include "Player.h"
-#include "Policies/SingletonImp.h"
+#include "SingletonImp.h"
 
 INSTANTIATE_SINGLETON_1(OutdoorPvPMgr);
 
diff --git a/src/server/game/OutdoorPvP/OutdoorPvPMgr.h b/src/server/game/OutdoorPvP/OutdoorPvPMgr.h
index 1e314bfd169..a78583100ec 100644
--- a/src/server/game/OutdoorPvP/OutdoorPvPMgr.h
+++ b/src/server/game/OutdoorPvP/OutdoorPvPMgr.h
@@ -22,7 +22,7 @@
 #define OUTDOORPVP_OBJECTIVE_UPDATE_INTERVAL 1000
 
 #include "OutdoorPvP.h"
-#include "Policies/Singleton.h"
+#include "Singleton.h"
 
 class Player;
 class GameObject;
diff --git a/src/server/game/Pools/PoolHandler.cpp b/src/server/game/Pools/PoolHandler.cpp
index 0b5a55623e0..0105b5870ea 100644
--- a/src/server/game/Pools/PoolHandler.cpp
+++ b/src/server/game/Pools/PoolHandler.cpp
@@ -21,7 +21,7 @@
 #include "ProgressBar.h"
 #include "Log.h"
 #include "MapManager.h"
-#include "Policies/SingletonImp.h"
+#include "SingletonImp.h"
 
 INSTANTIATE_SINGLETON_1(PoolHandler);
 
@@ -750,4 +750,4 @@ void PoolHandler::UpdatePool(uint16 pool_id, uint32 db_guid_or_pool_id)
 
 template void PoolHandler::UpdatePool(uint16 pool_id, uint32 db_guid_or_pool_id);
 template void PoolHandler::UpdatePool(uint16 pool_id, uint32 db_guid_or_pool_id);
-template void PoolHandler::UpdatePool(uint16 pool_id, uint32 db_guid_or_pool_id);
\ No newline at end of file
+template void PoolHandler::UpdatePool(uint16 pool_id, uint32 db_guid_or_pool_id);
diff --git a/src/server/game/Pools/PoolHandler.h b/src/server/game/Pools/PoolHandler.h
index 7263eb7a7f7..df62badd9c8 100644
--- a/src/server/game/Pools/PoolHandler.h
+++ b/src/server/game/Pools/PoolHandler.h
@@ -20,7 +20,7 @@
 #define TRINITY_POOLHANDLER_H
 
 #include "Define.h"
-#include "Policies/Singleton.h"
+#include "Singleton.h"
 #include "Creature.h"
 #include "GameObject.h"
 
diff --git a/src/server/game/PrecompiledHeaders/NixCorePCH.h b/src/server/game/PrecompiledHeaders/NixCorePCH.h
index 3587d270131..dd56e3fc16c 100644
--- a/src/server/game/PrecompiledHeaders/NixCorePCH.h
+++ b/src/server/game/PrecompiledHeaders/NixCorePCH.h
@@ -1,12 +1,12 @@
 //add here most rarely modified headers to speed up debug build compilation
-#include "Server/WorldSocket.h"                                    // must be first to make ACE happy with ACE includes in it
+#include "WorldSocket.h"                                    // must be first to make ACE happy with ACE includes in it
 #include "Common.h"
 
 #include "MapManager.h"
 #include "Logging/Log.h"
 #include "ObjectAccessor.h"
 #include "ObjectDefines.h"
-#include "Database/SQLStorage.h"
-#include "Server/Protocol/Opcodes.h"
-#include "Miscellaneous/SharedDefines.h"
+#include "SQLStorage.h"
+#include "Opcodes.h"
+#include "SharedDefines.h"
 #include "ObjectMgr.h"
diff --git a/src/server/game/PrecompiledHeaders/WinCorePCH.cpp b/src/server/game/PrecompiledHeaders/WinCorePCH.cpp
index e588392689e..240d73fa2c5 100644
--- a/src/server/game/PrecompiledHeaders/WinCorePCH.cpp
+++ b/src/server/game/PrecompiledHeaders/WinCorePCH.cpp
@@ -1 +1 @@
-#include "pchdef.h"
\ No newline at end of file
+#include "WinCorePCH.h"
diff --git a/src/server/game/PrecompiledHeaders/WinCorePCH.h b/src/server/game/PrecompiledHeaders/WinCorePCH.h
index 0757b07438d..09b5de6d67f 100644
--- a/src/server/game/PrecompiledHeaders/WinCorePCH.h
+++ b/src/server/game/PrecompiledHeaders/WinCorePCH.h
@@ -6,7 +6,7 @@
 #include "Log.h"
 #include "ObjectAccessor.h"
 #include "ObjectDefines.h"
-#include "Database/SQLStorage.h"
+#include "SQLStorage.h"
 #include "Opcodes.h"
 #include "SharedDefines.h"
 #include "ObjectMgr.h"
diff --git a/src/server/game/Quests/QuestDef.h b/src/server/game/Quests/QuestDef.h
index 8da1f822b45..5318f685cff 100644
--- a/src/server/game/Quests/QuestDef.h
+++ b/src/server/game/Quests/QuestDef.h
@@ -22,7 +22,7 @@
 #define TRINITYCORE_QUEST_H
 
 #include "Define.h"
-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"
 
 #include 
 #include 
diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp
index 3c506f9a90f..8e52e1ce433 100644
--- a/src/server/game/Scripting/ScriptMgr.cpp
+++ b/src/server/game/Scripting/ScriptMgr.cpp
@@ -3,14 +3,14 @@
  * Please see the included DOCS/LICENSE.TXT for more information */
 
 #include "ScriptPCH.h"
-#include "Configuration/Config.h"
-#include "Database/DatabaseEnv.h"
+#include "Config.h"
+#include "DatabaseEnv.h"
 #include "DBCStores.h"
 #include "ObjectMgr.h"
 #include "ProgressBar.h"
 #include "ScriptLoader.h"
 #include "ScriptSystem.h"
-#include "Policies/SingletonImp.h"
+#include "SingletonImp.h"
 
 INSTANTIATE_SINGLETON_1(ScriptMgr);
 
diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h
index 1814148e5e5..250bbf5526a 100644
--- a/src/server/game/Scripting/ScriptMgr.h
+++ b/src/server/game/Scripting/ScriptMgr.h
@@ -11,7 +11,7 @@
 #include "Common.h"
 #include "CompilerDefs.h"
 #include "DBCStructure.h"
-#include "Configuration/ConfigEnv.h"
+#include "ConfigEnv.h"
 
 class Player;
 class Creature;
diff --git a/src/server/game/Scripting/ScriptSystem.cpp b/src/server/game/Scripting/ScriptSystem.cpp
index 9c25475aa41..fcd5c81add4 100644
--- a/src/server/game/Scripting/ScriptSystem.cpp
+++ b/src/server/game/Scripting/ScriptSystem.cpp
@@ -22,7 +22,7 @@
 #include "ScriptSystem.h"
 #include "ProgressBar.h"
 #include "ObjectMgr.h"
-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"
 
 SystemMgr::SystemMgr()
 {
diff --git a/src/server/game/Server/Protocol/Handlers/AddonHandler.cpp b/src/server/game/Server/Protocol/Handlers/AddonHandler.cpp
index ee2efcaffb2..b54c119270f 100644
--- a/src/server/game/Server/Protocol/Handlers/AddonHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/AddonHandler.cpp
@@ -21,8 +21,8 @@
 #include "zlib.h"
 
 #include "AddonHandler.h"
-#include "Database/DatabaseEnv.h"
-#include "Policies/SingletonImp.h"
+#include "DatabaseEnv.h"
+#include "SingletonImp.h"
 #include "Opcodes.h"
 
 #include "Log.h"
diff --git a/src/server/game/Server/Protocol/Handlers/AddonHandler.h b/src/server/game/Server/Protocol/Handlers/AddonHandler.h
index 956b6030171..2c9394c947d 100644
--- a/src/server/game/Server/Protocol/Handlers/AddonHandler.h
+++ b/src/server/game/Server/Protocol/Handlers/AddonHandler.h
@@ -22,8 +22,8 @@
 #define __ADDONHANDLER_H
 
 #include "Common.h"
-#include "Configuration/ConfigEnv.h"
-#include "Policies/Singleton.h"
+#include "ConfigEnv.h"
+#include "Singleton.h"
 
 #include "WorldPacket.h"
 
diff --git a/src/server/game/Server/Protocol/Handlers/ArenaTeamHandler.cpp b/src/server/game/Server/Protocol/Handlers/ArenaTeamHandler.cpp
index 3a9a14524f9..1d93090d255 100644
--- a/src/server/game/Server/Protocol/Handlers/ArenaTeamHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/ArenaTeamHandler.cpp
@@ -22,7 +22,7 @@
 #include "World.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"
 
 #include "ArenaTeam.h"
 #include "Log.h"
diff --git a/src/server/game/Server/Protocol/Handlers/ChannelHandler.cpp b/src/server/game/Server/Protocol/Handlers/ChannelHandler.cpp
index 0f615579cb6..73f01f46c4c 100644
--- a/src/server/game/Server/Protocol/Handlers/ChannelHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/ChannelHandler.cpp
@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "Policies/SingletonImp.h"
+#include "SingletonImp.h"
 
 #include "ObjectMgr.h"                                      // for normalizePlayerName
 #include "ChannelMgr.h"
diff --git a/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp b/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp
index e57a5295df5..141f3605ee2 100644
--- a/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp
@@ -26,8 +26,8 @@
 #include "WorldPacket.h"
 #include "WorldSession.h"
 #include "MD5.h"
-#include "Database/DatabaseEnv.h"
-#include "Database/DatabaseImpl.h"
+#include "DatabaseEnv.h"
+#include "DatabaseImpl.h"
 
 #include "ArenaTeam.h"
 #include "Chat.h"
diff --git a/src/server/game/Server/Protocol/Handlers/ChatHandler.cpp b/src/server/game/Server/Protocol/Handlers/ChatHandler.cpp
index 88e2b5473a5..85f37b52478 100644
--- a/src/server/game/Server/Protocol/Handlers/ChatHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/ChatHandler.cpp
@@ -24,7 +24,7 @@
 #include "World.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"
 
 #include "CellImpl.h"
 #include "Chat.h"
diff --git a/src/server/game/Server/Protocol/Handlers/GroupHandler.cpp b/src/server/game/Server/Protocol/Handlers/GroupHandler.cpp
index f973bc24722..29178465ec3 100644
--- a/src/server/game/Server/Protocol/Handlers/GroupHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/GroupHandler.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "Common.h"
-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"
 #include "Opcodes.h"
 #include "Log.h"
 #include "WorldPacket.h"
diff --git a/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp b/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp
index f1ec828447a..378a817137d 100644
--- a/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp
@@ -20,8 +20,8 @@
 
 #include "Common.h"
 #include "Language.h"
-#include "Database/DatabaseEnv.h"
-#include "Database/DatabaseImpl.h"
+#include "DatabaseEnv.h"
+#include "DatabaseImpl.h"
 #include "WorldPacket.h"
 #include "Opcodes.h"
 #include "Log.h"
diff --git a/src/server/game/Server/Protocol/Handlers/NPCHandler.cpp b/src/server/game/Server/Protocol/Handlers/NPCHandler.cpp
index 4e73fb381af..00da860db89 100644
--- a/src/server/game/Server/Protocol/Handlers/NPCHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/NPCHandler.cpp
@@ -20,7 +20,7 @@
 
 #include "Common.h"
 #include "Language.h"
-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
 #include "Opcodes.h"
diff --git a/src/server/game/Server/Protocol/Handlers/QueryHandler.cpp b/src/server/game/Server/Protocol/Handlers/QueryHandler.cpp
index 1067ad49bc4..05cbcf81f2f 100644
--- a/src/server/game/Server/Protocol/Handlers/QueryHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/QueryHandler.cpp
@@ -20,8 +20,8 @@
 
 #include "Common.h"
 #include "Language.h"
-#include "Database/DatabaseEnv.h"
-#include "Database/DatabaseImpl.h"
+#include "DatabaseEnv.h"
+#include "DatabaseImpl.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
 #include "Opcodes.h"
@@ -536,4 +536,4 @@ void WorldSession::HandleQuestPOIQuery(WorldPacket& recv_data)
     }
 
     SendPacket(&data);
-}
\ No newline at end of file
+}
diff --git a/src/server/game/Server/Protocol/Handlers/SkillHandler.cpp b/src/server/game/Server/Protocol/Handlers/SkillHandler.cpp
index 312065f9f13..e6ad7a4c9e4 100644
--- a/src/server/game/Server/Protocol/Handlers/SkillHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/SkillHandler.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "Common.h"
-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"
 #include "Opcodes.h"
 #include "Log.h"
 #include "Player.h"
diff --git a/src/server/game/Server/Protocol/Handlers/TaxiHandler.cpp b/src/server/game/Server/Protocol/Handlers/TaxiHandler.cpp
index b0660527f71..d2a7976c7a5 100644
--- a/src/server/game/Server/Protocol/Handlers/TaxiHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/TaxiHandler.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "Common.h"
-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
 #include "Opcodes.h"
diff --git a/src/server/game/Server/Protocol/WorldLog.cpp b/src/server/game/Server/Protocol/WorldLog.cpp
index 6cccb27ae87..a9000f8e65c 100644
--- a/src/server/game/Server/Protocol/WorldLog.cpp
+++ b/src/server/game/Server/Protocol/WorldLog.cpp
@@ -23,8 +23,8 @@
 */
 
 #include "WorldLog.h"
-#include "Policies/SingletonImp.h"
-#include "Configuration/ConfigEnv.h"
+#include "SingletonImp.h"
+#include "ConfigEnv.h"
 #include "Log.h"
 
 #define CLASS_LOCK Trinity::ClassLevelLockable
diff --git a/src/server/game/Server/Protocol/WorldLog.h b/src/server/game/Server/Protocol/WorldLog.h
index 4ee9bb178ec..8a3c96b3b15 100644
--- a/src/server/game/Server/Protocol/WorldLog.h
+++ b/src/server/game/Server/Protocol/WorldLog.h
@@ -26,7 +26,7 @@
 #define TRINITY_WORLDLOG_H
 
 #include "Common.h"
-#include "Policies/Singleton.h"
+#include "Singleton.h"
 #include "Errors.h"
 
 #include 
diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp
index 97c54c1f37e..a464e37ec60 100644
--- a/src/server/game/Server/WorldSession.cpp
+++ b/src/server/game/Server/WorldSession.cpp
@@ -24,7 +24,7 @@
 
 #include "WorldSocket.h"                                    // must be first to make ACE happy with ACE includes in it
 #include "Common.h"
-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"
 #include "Log.h"
 #include "Opcodes.h"
 #include "WorldPacket.h"
diff --git a/src/server/game/Server/WorldSocket.cpp b/src/server/game/Server/WorldSocket.cpp
index b792ad2faf1..0b76eb9b41e 100644
--- a/src/server/game/Server/WorldSocket.cpp
+++ b/src/server/game/Server/WorldSocket.cpp
@@ -38,7 +38,7 @@
 #include "SharedDefines.h"
 #include "ByteBuffer.h"
 #include "Opcodes.h"
-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"
 #include "BigNumber.h"
 #include "SHA1.h"
 #include "WorldSession.h"
diff --git a/src/server/game/Server/WorldSocket.h b/src/server/game/Server/WorldSocket.h
index 61158799bec..d07e9a3f2e4 100644
--- a/src/server/game/Server/WorldSocket.h
+++ b/src/server/game/Server/WorldSocket.h
@@ -43,7 +43,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "Common.h"
-#include "Cryptography/Authentication/AuthCrypt.h"
+#include "AuthCrypt.h"
 
 class ACE_Message_Block;
 class WorldPacket;
diff --git a/src/server/game/Server/WorldSocketMgr.cpp b/src/server/game/Server/WorldSocketMgr.cpp
index f7bb3949ee0..0996d873ffa 100644
--- a/src/server/game/Server/WorldSocketMgr.cpp
+++ b/src/server/game/Server/WorldSocketMgr.cpp
@@ -42,8 +42,8 @@
 
 #include "Log.h"
 #include "Common.h"
-#include "Configuration/ConfigEnv.h"
-#include "Database/DatabaseEnv.h"
+#include "ConfigEnv.h"
+#include "DatabaseEnv.h"
 #include "WorldSocket.h"
 
 /**
diff --git a/src/server/game/Skills/SkillDiscovery.cpp b/src/server/game/Skills/SkillDiscovery.cpp
index 163f7a2bf7e..f0bfb5bc0ba 100644
--- a/src/server/game/Skills/SkillDiscovery.cpp
+++ b/src/server/game/Skills/SkillDiscovery.cpp
@@ -18,10 +18,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"
 #include "Log.h"
 #include "ProgressBar.h"
-#include "Policies/SingletonImp.h"
+#include "SingletonImp.h"
 #include "World.h"
 #include "Util.h"
 #include "SkillDiscovery.h"
diff --git a/src/server/game/Skills/SkillExtraItems.cpp b/src/server/game/Skills/SkillExtraItems.cpp
index cc50d3683f4..982556c0557 100644
--- a/src/server/game/Skills/SkillExtraItems.cpp
+++ b/src/server/game/Skills/SkillExtraItems.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "SkillExtraItems.h"
-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"
 #include "Log.h"
 #include "ProgressBar.h"
 #include "Player.h"
diff --git a/src/server/game/Spells/Auras/SpellEffects.cpp b/src/server/game/Spells/Auras/SpellEffects.cpp
index 6d224af30ed..ef046531f10 100644
--- a/src/server/game/Spells/Auras/SpellEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellEffects.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "Common.h"
-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"
 #include "WorldPacket.h"
 #include "Opcodes.h"
 #include "Log.h"
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
index 5016e5ebc2b..f5c105fa9bf 100644
--- a/src/server/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "Common.h"
-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
 #include "GridNotifiers.h"
@@ -41,7 +41,7 @@
 #include "MapManager.h"
 #include "ObjectAccessor.h"
 #include "CellImpl.h"
-#include "Policies/SingletonImp.h"
+#include "SingletonImp.h"
 #include "SharedDefines.h"
 #include "LootMgr.h"
 #include "VMapFactory.h"
diff --git a/src/server/game/Tools/PlayerDump.cpp b/src/server/game/Tools/PlayerDump.cpp
index 8ebcbce50c8..964e7f9b3b1 100644
--- a/src/server/game/Tools/PlayerDump.cpp
+++ b/src/server/game/Tools/PlayerDump.cpp
@@ -20,8 +20,8 @@
 
 #include "Common.h"
 #include "PlayerDump.h"
-#include "Database/DatabaseEnv.h"
-#include "Database/SQLStorage.h"
+#include "DatabaseEnv.h"
+#include "SQLStorage.h"
 #include "UpdateFields.h"
 #include "ObjectMgr.h"
 
diff --git a/src/server/game/World/TimeMgr.cpp b/src/server/game/World/TimeMgr.cpp
index 42ecc77bbf9..00152280aa9 100644
--- a/src/server/game/World/TimeMgr.cpp
+++ b/src/server/game/World/TimeMgr.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "TimeMgr.h"
-#include "Policies/SingletonImp.h"
+#include "SingletonImp.h"
 
 INSTANTIATE_SINGLETON_1(GameTime);
 
diff --git a/src/server/game/World/TimeMgr.h b/src/server/game/World/TimeMgr.h
index 5776bb1151c..4a8cac90356 100644
--- a/src/server/game/World/TimeMgr.h
+++ b/src/server/game/World/TimeMgr.h
@@ -20,7 +20,7 @@
 #define _TIMEMGR_H
 
 #include "Timer.h"
-#include "Policies/Singleton.h"
+#include "Singleton.h"
 
 struct IntervalTimer
 {
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
index 30cedf28b4d..1a14f39500b 100644
--- a/src/server/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
@@ -23,8 +23,8 @@
 */
 
 #include "Common.h"
-#include "Database/DatabaseEnv.h"
-#include "Configuration/ConfigEnv.h"
+#include "DatabaseEnv.h"
+#include "ConfigEnv.h"
 #include "SystemConfig.h"
 #include "Log.h"
 #include "Opcodes.h"
@@ -48,7 +48,7 @@
 #include "ItemEnchantmentMgr.h"
 #include "MapManager.h"
 #include "CreatureAIRegistry.h"
-#include "Policies/SingletonImp.h"
+#include "SingletonImp.h"
 #include "BattleGroundMgr.h"
 #include "OutdoorPvPMgr.h"
 #include "TemporarySummon.h"
@@ -58,7 +58,7 @@
 #include "GlobalEvents.h"
 #include "GameEventMgr.h"
 #include "PoolHandler.h"
-#include "Database/DatabaseImpl.h"
+#include "DatabaseImpl.h"
 #include "GridNotifiersImpl.h"
 #include "CellImpl.h"
 #include "InstanceSaveMgr.h"
-- 
cgit v1.2.3


From 02efe02b43a7ce192cb313586eb2cb9df220575e Mon Sep 17 00:00:00 2001
From: Brian 
Date: Wed, 9 Jun 2010 00:34:22 -0600
Subject: * Added missing include paths that got lost in the merge a few revs
 ago * Fixed realative path to Reference.h * Re-enabled PCH building by
 default * Re-enabled scripts building by default * Linux compile now fully
 functional again.

--HG--
branch : trunk
---
 CMakeLists.txt                          | 4 ++--
 src/server/game/CMakeLists.txt          | 1 +
 src/server/game/Combat/ThreatManager.h  | 2 +-
 src/server/game/Grids/GridReference.h   | 2 +-
 src/server/game/Groups/GroupReference.h | 2 +-
 src/server/worldserver/CMakeLists.txt   | 1 +
 6 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8eab43b34f4..fab32d81ab6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,9 +33,9 @@ option(CENTOS "CENTOS" 0)
 option(DO_CLI "With CLI" 1)
 option(DO_DEBUG "Debug mode" 0)
 option(DO_MYSQL "With MySQL support" 1)
-option(DO_PCH "Use precompiled headers" 0)
+option(DO_PCH "Use precompiled headers" 1)
 option(DO_RA "With RA" 0)
-option(DO_SCRIPTS "With trinityscripts" 0)
+option(DO_SCRIPTS "With trinityscripts" 1)
 option(DO_SQL "Copy SQL files" 0)
 option(DO_TOOLS "Compile tools" 0)
 option(DO_WARN "Enable all compile warnings" 0)
diff --git a/src/server/game/CMakeLists.txt b/src/server/game/CMakeLists.txt
index 480f342aaa8..8ae179a3772 100644
--- a/src/server/game/CMakeLists.txt
+++ b/src/server/game/CMakeLists.txt
@@ -325,6 +325,7 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/src/server/shared
   ${CMAKE_SOURCE_DIR}/src/server/shared/Configuration
   ${CMAKE_SOURCE_DIR}/src/server/shared/Cryptography
+  ${CMAKE_SOURCE_DIR}/src/server/shared/Cryptography/Authentication
   ${CMAKE_SOURCE_DIR}/src/server/shared/Database
   ${CMAKE_SOURCE_DIR}/src/server/shared/DataStores
   ${CMAKE_SOURCE_DIR}/src/server/shared/Debugging
diff --git a/src/server/game/Combat/ThreatManager.h b/src/server/game/Combat/ThreatManager.h
index f0ae370907b..4834ba28759 100644
--- a/src/server/game/Combat/ThreatManager.h
+++ b/src/server/game/Combat/ThreatManager.h
@@ -23,7 +23,7 @@
 
 #include "Common.h"
 #include "SharedDefines.h"
-#include "Reference.h"
+#include "LinkedReference/Reference.h"
 #include "UnitEvents.h"
 
 #include 
diff --git a/src/server/game/Grids/GridReference.h b/src/server/game/Grids/GridReference.h
index 63e3817c7d3..0f5b46b4950 100644
--- a/src/server/game/Grids/GridReference.h
+++ b/src/server/game/Grids/GridReference.h
@@ -21,7 +21,7 @@
 #ifndef _GRIDREFERENCE_H
 #define _GRIDREFERENCE_H
 
-#include "Reference.h"
+#include "LinkedReference/Reference.h"
 
 template
 class GridRefManager;
diff --git a/src/server/game/Groups/GroupReference.h b/src/server/game/Groups/GroupReference.h
index d2c50688113..56dc5a3375f 100644
--- a/src/server/game/Groups/GroupReference.h
+++ b/src/server/game/Groups/GroupReference.h
@@ -21,7 +21,7 @@
 #ifndef _GROUPREFERENCE_H
 #define _GROUPREFERENCE_H
 
-#include "Reference.h"
+#include "LinkedReference/Reference.h"
 
 class Group;
 class Player;
diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt
index 5c80dfc5773..969204f3522 100644
--- a/src/server/worldserver/CMakeLists.txt
+++ b/src/server/worldserver/CMakeLists.txt
@@ -24,6 +24,7 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/src/server/shared
   ${CMAKE_SOURCE_DIR}/src/server/shared/Configuration
   ${CMAKE_SOURCE_DIR}/src/server/shared/Cryptography
+  ${CMAKE_SOURCE_DIR}/src/server/shared/Cryptography/Authentication
   ${CMAKE_SOURCE_DIR}/src/server/shared/Database
   ${CMAKE_SOURCE_DIR}/src/server/shared/DataStores
   ${CMAKE_SOURCE_DIR}/src/server/shared/Debugging
-- 
cgit v1.2.3


From 44ab7530b73fc0f556eb05a09548e53b03027447 Mon Sep 17 00:00:00 2001
From: Brian 
Date: Wed, 9 Jun 2010 00:57:17 -0600
Subject: * Removed not needed client directory for now

--HG--
branch : trunk
---
 src/client/.soon | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 src/client/.soon

(limited to 'src')

diff --git a/src/client/.soon b/src/client/.soon
deleted file mode 100644
index e69de29bb2d..00000000000
-- 
cgit v1.2.3


From 81bba2235321c8101dbac2ecb8b328ef48087ac6 Mon Sep 17 00:00:00 2001
From: Machiavelli 
Date: Wed, 9 Jun 2010 09:59:28 +0200
Subject: Update structure SMSG_AUTH_RESPONSE with response code
 AUTH_WAIT_QUEUE. Fixes issue #2631

--HG--
branch : trunk
---
 src/server/game/World/World.cpp | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
index 1a14f39500b..d845bbc9a3d 100644
--- a/src/server/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
@@ -316,17 +316,18 @@ int32 World::GetQueuePos(WorldSession* sess)
 void World::AddQueuedPlayer(WorldSession* sess)
 {
     sess->SetInQueue(true);
-    m_QueuedPlayer.push_back (sess);
+    m_QueuedPlayer.push_back(sess);
 
     // The 1st SMSG_AUTH_RESPONSE needs to contain other info too.
-    WorldPacket packet (SMSG_AUTH_RESPONSE, 1 + 4 + 1 + 4 + 1);
-    packet << uint8 (AUTH_WAIT_QUEUE);
-    packet << uint32 (0);                                   // BillingTimeRemaining
-    packet << uint8 (0);                                    // BillingPlanFlags
-    packet << uint32 (0);                                   // BillingTimeRested
-    packet << uint8 (sess->Expansion());                    // 0 - normal, 1 - TBC, 2 - WOTLK, must be set in database manually for each account
-    packet << uint32(GetQueuePos (sess));
-    sess->SendPacket (&packet);
+    WorldPacket packet(SMSG_AUTH_RESPONSE, 1+4+1+4+1);
+    packet << uint8(AUTH_WAIT_QUEUE);
+    packet << uint32(0);                                    // BillingTimeRemaining
+    packet << uint8(0);                                     // BillingPlanFlags
+    packet << uint32 0);                                    // BillingTimeRested
+    packet << uint8(sess->Expansion());                     // 0 - normal, 1 - TBC, 2 - WOTLK, must be set in database manually for each account
+    packet << uint32(GetQueuePos(sess));                    // Queue position
+    packet << uint8(0);                                     // Unk 3.3.0
+    sess->SendPacket(&packet);
 
     //sess->SendAuthWaitQue (GetQueuePos (sess));
 }
-- 
cgit v1.2.3


From f24290b47e873975cf3d9b4cfb95a7603739cb4f Mon Sep 17 00:00:00 2001
From: Machiavelli 
Date: Wed, 9 Jun 2010 10:04:42 +0200
Subject: Typo (It´s not like you can compile anyways)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--HG--
branch : trunk
---
 src/server/game/World/World.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
index d845bbc9a3d..0f34fc83ffb 100644
--- a/src/server/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
@@ -323,7 +323,7 @@ void World::AddQueuedPlayer(WorldSession* sess)
     packet << uint8(AUTH_WAIT_QUEUE);
     packet << uint32(0);                                    // BillingTimeRemaining
     packet << uint8(0);                                     // BillingPlanFlags
-    packet << uint32 0);                                    // BillingTimeRested
+    packet << uint32(0);                                    // BillingTimeRested
     packet << uint8(sess->Expansion());                     // 0 - normal, 1 - TBC, 2 - WOTLK, must be set in database manually for each account
     packet << uint32(GetQueuePos(sess));                    // Queue position
     packet << uint8(0);                                     // Unk 3.3.0
-- 
cgit v1.2.3


From 4cdb5c78f2cacfd5a26813a73eb59ec6c65231c0 Mon Sep 17 00:00:00 2001
From: Rat 
Date: Wed, 9 Jun 2010 14:05:50 +0200
Subject: added revision.h O.o game.vcproj update , game.lib now buildable
 todo: auth+world server

--HG--
branch : trunk
---
 src/server/game/PrecompiledHeaders/WinCorePCH.h | 22 ++++++-------
 src/server/shared/revision.h                    | 12 +++++++
 win/TrinityCore&Script VC90.sln                 |  3 --
 win/VC90/game.vcproj                            | 44 +++++++++++--------------
 4 files changed, 43 insertions(+), 38 deletions(-)
 create mode 100644 src/server/shared/revision.h

(limited to 'src')

diff --git a/src/server/game/PrecompiledHeaders/WinCorePCH.h b/src/server/game/PrecompiledHeaders/WinCorePCH.h
index 09b5de6d67f..e94a664b155 100644
--- a/src/server/game/PrecompiledHeaders/WinCorePCH.h
+++ b/src/server/game/PrecompiledHeaders/WinCorePCH.h
@@ -1,14 +1,14 @@
 //add here most rarely modified headers to speed up debug build compilation
-#include "WorldSocket.h"                                    // must be first to make ACE happy with ACE includes in it
-#include "Common.h"
+#include "..\Server\WorldSocket.h"                                    // must be first to make ACE happy with ACE includes in it
+#include "..\..\shared\Common.h"
 
-#include "MapManager.h"
-#include "Log.h"
-#include "ObjectAccessor.h"
-#include "ObjectDefines.h"
-#include "SQLStorage.h"
-#include "Opcodes.h"
-#include "SharedDefines.h"
-#include "ObjectMgr.h"
+#include "..\Maps\MapManager.h"
+#include "..\..\shared\Logging\Log.h"
+#include "..\Globals\ObjectAccessor.h"
+#include "..\Entities\Object\ObjectDefines.h"
+#include "..\..\shared\Database/SQLStorage.h"
+#include "..\Protocol\Opcodes.h"
+#include "..\Miscellaneous\SharedDefines.h"
+#include "..\Globals\ObjectMgr.h"
 
-#include "ScriptPCH.h"
+#include "ScriptPCH.h"
\ No newline at end of file
diff --git a/src/server/shared/revision.h b/src/server/shared/revision.h
new file mode 100644
index 00000000000..f459116dc84
--- /dev/null
+++ b/src/server/shared/revision.h
@@ -0,0 +1,12 @@
+#ifndef __REVISION_H__
+#define __REVISION_H__
+ #define _BUILD_DIRECTIVE "Debug"
+ #define _REVISION "8417"
+ #define _HASH "47972987739a"
+ #define _REVISION_DATE "*"
+ #define _REVISION_TIME "*"
+ #define FILEVER        0,0,8417,0
+ #define PRODUCTVER     0,0,8417,0
+ #define STRFILEVER     "0, 0, 8417, 47972987739a"
+ #define STRPRODUCTVER  "0, 0, 8417, 47972987739a"
+#endif // __REVISION_H__
diff --git a/win/TrinityCore&Script VC90.sln b/win/TrinityCore&Script VC90.sln
index f0734c9ae6c..17a19a5a8e1 100644
--- a/win/TrinityCore&Script VC90.sln	
+++ b/win/TrinityCore&Script VC90.sln	
@@ -1,9 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "game", "VC90\game.vcproj", "{1DC6C4DA-A028-41F3-877D-D5400C594F88}"
-	ProjectSection(ProjectDependencies) = postProject
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED} = {90297C34-F231-4DF4-848E-A74BCC0E40ED}
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shared", "VC90\shared.vcproj", "{90297C34-F231-4DF4-848E-A74BCC0E40ED}"
 EndProject
diff --git a/win/VC90/game.vcproj b/win/VC90/game.vcproj
index a993c0c36a9..b45bbe02967 100644
--- a/win/VC90/game.vcproj
+++ b/win/VC90/game.vcproj
@@ -6,7 +6,7 @@
 	ProjectGUID="{1DC6C4DA-A028-41F3-877D-D5400C594F88}"
 	RootNamespace="game"
 	Keyword="Win32Proj"
-	AssemblyReferenceSearchPaths=""..\..\src\game""
+	AssemblyReferenceSearchPaths=""..\..\src\server\game""
 	TargetFrameworkVersion="196613"
 	>
 	
@@ -48,7 +48,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP /Zm200"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\src\server\game\Entities\Item\Container;..\..\src\server\game\Server\Protocol\Handlers;..\..\externals\mersennetwister;..\..\externals\zlib;..\..\src\server\collision;..\..\src\server\collision\Management;..\..\src\server\shared;..\..\src\server\shared\Configuration;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Database;..\..\src\server\shared\DataStores;..\..\src\server\shared\Debugging;..\..\src\server\shared\Dynamic\CountedReference;..\..\src\server\shared\Dynamic\LinkedReference;..\..\src\server\shared\Dynamic;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\game;..\..\src\server\game\Accounts;..\..\src\server\game\Achievements;..\..\src\server\game\Addons;..\..\src\server\game\AI;..\..\src\server\game\AI\CoreAI;..\..\src\server\game\AI\EventAI;..\..\src\server\game\AI\ScriptedAI;..\..\src\server\game\AuctionHouse;..\..\src\server\game\AuctionHouse\AuctionHouseBot;..\..\src\server\game\BattleGrounds;..\..\src\server\game\BattleGrounds\Zones;..\..\src\server\game\Calendar;..\..\src\server\game\Chat;..\..\src\server\game\Chat\Channels;..\..\src\server\game\Chat\Commands;..\..\src\server\game\Combat;..\..\src\server\game\Conditions;..\..\src\server\game\DataStores;..\..\src\server\game\DungeonFinding;..\..\src\server\game\Entities;..\..\src\server\game\Entities\Creature;..\..\src\server\game\Entities\Corpse;..\..\src\server\game\Entities\DynamicObject;..\..\src\server\game\Entities\GameObject;..\..\src\server\game\Entities\Item;..\..\src\server\game\Entities\Object;..\..\src\server\game\Entities\Object\Updates;..\..\src\server\game\Entities\Pet;..\..\src\server\game\Entities\Player;..\..\src\server\game\Entities\Totem;..\..\src\server\game\Entities\Unit;..\..\src\server\game\Entities\Vehicle;..\..\src\server\game\Entities\Transport;..\..\src\server\game\Events;..\..\src\server\game\Globals;..\..\src\server\game\Grids\Cells;..\..\src\server\game\Grids\Notifiers;..\..\src\server\game\Grids;..\..\src\server\game\Groups;..\..\src\server\game\Guilds;..\..\src\server\game\Instances;..\..\src\server\game\Loot;..\..\src\server\game\Mails;..\..\src\server\game\Maps;..\..\src\server\game\Miscellaneous;..\..\src\server\game\Movement;..\..\src\server\game\Movement\MovementGenerators;..\..\src\server\game\Movement\Waypoints;..\..\src\server\game\OutdoorPvP;..\..\src\server\game\OutdoorPvP\Zones;..\..\src\server\game\Pools;..\..\src\server\game\PrecompiledHeaders;..\..\src\server\game\Quests;..\..\src\server\game\Reputation;..\..\src\server\game\Scripting;..\..\src\server\game\Server\Protocol;..\..\src\server\game\Server;..\..\src\server\game\Skills;..\..\src\server\game\Spells;..\..\src\server\game\Spells\Auras;..\..\src\server\game\Tools;..\..\src\server\game\Weather;..\..\src\server\game\World;..\..\externals;"
+				AdditionalIncludeDirectories="..\..\src\server\game\Entities\Item\Container;..\..\src\server\game\Server\Protocol\Handlers;..\..\externals\mersennetwister;..\..\externals\zlib;..\..\src\server\collision;..\..\src\server\collision\Management;..\..\src\server\shared;..\..\src\server\shared\Configuration;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Database;..\..\src\server\shared\DataStores;..\..\src\server\shared\Debugging;..\..\src\server\shared\Dynamic\CountedReference;..\..\src\server\shared\Dynamic\LinkedReference;..\..\src\server\shared\Dynamic;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\game;..\..\src\server\game\Accounts;..\..\src\server\game\Achievements;..\..\src\server\game\Addons;..\..\src\server\game\AI;..\..\src\server\game\AI\CoreAI;..\..\src\server\game\AI\EventAI;..\..\src\server\game\AI\ScriptedAI;..\..\src\server\game\AuctionHouse;..\..\src\server\game\AuctionHouse\AuctionHouseBot;..\..\src\server\game\BattleGrounds;..\..\src\server\game\BattleGrounds\Zones;..\..\src\server\game\Calendar;..\..\src\server\game\Chat;..\..\src\server\game\Chat\Channels;..\..\src\server\game\Chat\Commands;..\..\src\server\game\Combat;..\..\src\server\game\Conditions;..\..\src\server\game\DataStores;..\..\src\server\game\DungeonFinding;..\..\src\server\game\Entities;..\..\src\server\game\Entities\Creature;..\..\src\server\game\Entities\Corpse;..\..\src\server\game\Entities\DynamicObject;..\..\src\server\game\Entities\GameObject;..\..\src\server\game\Entities\Item;..\..\src\server\game\Entities\Object;..\..\src\server\game\Entities\Object\Updates;..\..\src\server\game\Entities\Pet;..\..\src\server\game\Entities\Player;..\..\src\server\game\Entities\Totem;..\..\src\server\game\Entities\Unit;..\..\src\server\game\Entities\Vehicle;..\..\src\server\game\Entities\Transport;..\..\src\server\game\Events;..\..\src\server\game\Globals;..\..\src\server\game\Grids\Cells;..\..\src\server\game\Grids\Notifiers;..\..\src\server\game\Grids;..\..\src\server\game\Groups;..\..\src\server\game\Guilds;..\..\src\server\game\Instances;..\..\src\server\game\Loot;..\..\src\server\game\Mails;..\..\src\server\game\Maps;..\..\src\server\game\Miscellaneous;..\..\src\server\game\Movement;..\..\src\server\game\Movement\MovementGenerators;..\..\src\server\game\Movement\Waypoints;..\..\src\server\game\OutdoorPvP;..\..\src\server\game\OutdoorPvP\Zones;..\..\src\server\game\Pools;..\..\src\server\game\PrecompiledHeaders;..\..\src\server\game\Quests;..\..\src\server\game\Reputation;..\..\src\server\game\Scripting;..\..\src\server\game\Server\Protocol;..\..\src\server\game\Server;..\..\src\server\game\Skills;..\..\src\server\game\Spells;..\..\src\server\game\Spells\Auras;..\..\src\server\game\Tools;..\..\src\server\game\Weather;..\..\src\server\game\World;..\..\externals;..\..\src\server\shared\Cryptography\Authentication;"
 				PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;_SECURE_SCL=0"
 				StringPooling="false"
 				MinimalRebuild="false"
@@ -56,7 +56,7 @@
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="true"
 				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="WinCorePCH.h"
 				PrecompiledHeaderFile=".\game__$(PlatformName)_$(ConfigurationName)\game.pch"
 				AssemblerListingLocation=".\game__$(PlatformName)_$(ConfigurationName)\"
@@ -68,7 +68,7 @@
 				DebugInformationFormat="3"
 				CallingConvention="0"
 				CompileAs="0"
-				ForcedIncludeFiles=""
+				ForcedIncludeFiles="WinCorePCH.h"
 			/>
 			
 					
-					
-					
 					
@@ -4311,14 +4307,6 @@
 				RelativePath="..\..\src\server\game\PrecompiledHeaders\ScriptPCH.h"
 				>
 			
-			
-			
-			
-			
 		
 		
-			
-			
-			
-			
 			
@@ -4552,6 +4532,22 @@
 				>
 			
 		
+		
+			
+				
+			
+		
+		
+		
 	
 	
 	
-- 
cgit v1.2.3


From 5effc26ad3f6f46d34ca54c27ce96709e4e92462 Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Wed, 9 Jun 2010 14:15:57 +0200
Subject: Implement DO_WORLDSERVER and DO_AUTHSERVER options for cmake, both
 enabled by default Needs more work to split shared/ and so on but it works

--HG--
branch : trunk
---
 CMakeLists.txt            | 26 +++++++++++++++++++-------
 src/server/CMakeLists.txt | 22 +++++++++++++++-------
 2 files changed, 34 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fab32d81ab6..bdb6a9c512b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,6 +30,8 @@ add_custom_target(uninstall
 )
 
 option(CENTOS "CENTOS" 0)
+option(DO_AUTHSERVER "Build authserver" 1)
+option(DO_WORLDSERVER "Build worldserver" 1)
 option(DO_CLI "With CLI" 1)
 option(DO_DEBUG "Debug mode" 0)
 option(DO_MYSQL "With MySQL support" 1)
@@ -37,7 +39,7 @@ option(DO_PCH "Use precompiled headers" 1)
 option(DO_RA "With RA" 0)
 option(DO_SCRIPTS "With trinityscripts" 1)
 option(DO_SQL "Copy SQL files" 0)
-option(DO_TOOLS "Compile tools" 0)
+option(DO_TOOLS "Build tools" 0)
 option(DO_WARN "Enable all compile warnings" 0)
 
 set(GENREV_SRC
@@ -93,6 +95,22 @@ message("* Libs install dir at: ${LIBSDIR}")
 find_library(SSLLIB NAMES ssl DOC "SSL library")
 find_library(ZLIB z "Zlib library")
 
+if(DO_AUTHSERVER)
+  message("Build authserver")
+else(DO_ATUHSERVER)
+  message("DON'T build authserver")
+endif(DO_AUTHSERVER)
+if(DO_WORLDSERVER)
+  message("Build worldserver")
+else(DO_WORLDSERVER)
+  message("DON'T build worldserver")
+endif(DO_WORLDSERVER)
+if(DO_TOOLS)
+  message("Build tools")
+else(DO_TOOLS)
+  message("DON'T build tools")
+endif(DO_TOOLS)
+
 if(DO_MYSQL)
   message("* With MySQL")
   FIND_MYSQL()
@@ -145,12 +163,6 @@ else (DO_PCH)
   message("* NOT using precompiled headers")
 endif(DO_PCH)
 
-if(DO_TOOLS)
-  message("* With Tools")
-else (DO_TOOLS)
-  message("* Without Tools")
-endif(DO_TOOLS)
-
 if(UNIX)
   if(CENTOS)
     add_definitions(-DCENTOS)
diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
index 1a6321c23e3..7c2e309da74 100644
--- a/src/server/CMakeLists.txt
+++ b/src/server/CMakeLists.txt
@@ -1,8 +1,16 @@
 add_subdirectory(shared)
-add_subdirectory(game)
-add_subdirectory(collision)
-if (DO_SCRIPTS)
-   add_subdirectory(scripts)
-endif (DO_SCRIPTS)
-add_subdirectory(authserver)
-add_subdirectory(worldserver)
+if (DO_AUTHSERVER)
+  add_subdirectory(authserver)
+endif(DO_AUTHSERVER)
+if(DO_WORLDSERVER)
+  add_subdirectory(game)
+  add_subdirectory(collision)
+  if(DO_SCRIPTS)
+    add_subdirectory(scripts)
+  endif(DO_SCRIPTS)
+  add_subdirectory(worldserver)
+else(DO_WORLDSERVER)
+  if(DO_TOOLS)
+    add_subdirectory(collision)
+  endif(DO_TOOLS)
+endif(DO_WORLDSERVER)
-- 
cgit v1.2.3


From 96fbb4fdd44e74f5974496b3f6adf303a524ca0d Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Wed, 9 Jun 2010 14:49:14 +0200
Subject: CMake: Build shared/ only if DO_WORLDSERVER or DO_AUTHSERVER is
 enabled

--HG--
branch : trunk
---
 src/server/CMakeLists.txt | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
index 7c2e309da74..d975ef8f4c4 100644
--- a/src/server/CMakeLists.txt
+++ b/src/server/CMakeLists.txt
@@ -1,8 +1,5 @@
-add_subdirectory(shared)
-if (DO_AUTHSERVER)
-  add_subdirectory(authserver)
-endif(DO_AUTHSERVER)
 if(DO_WORLDSERVER)
+  add_subdirectory(shared)
   add_subdirectory(game)
   add_subdirectory(collision)
   if(DO_SCRIPTS)
@@ -14,3 +11,9 @@ else(DO_WORLDSERVER)
     add_subdirectory(collision)
   endif(DO_TOOLS)
 endif(DO_WORLDSERVER)
+if (DO_AUTHSERVER)
+  if(NOT DO_WORLDSERVER)
+    add_subdirectory(shared)
+  endif(NOT DO_WORLDSERVER)
+  add_subdirectory(authserver)
+endif(DO_AUTHSERVER)
\ No newline at end of file
-- 
cgit v1.2.3


From dd5583e96273476607a63f197309e460d84a09cb Mon Sep 17 00:00:00 2001
From: Brian 
Date: Wed, 9 Jun 2010 07:02:24 -0600
Subject: * Removed static revision.h from src/server/shared * This is a
 dynamically generated file

--HG--
branch : trunk
---
 src/server/shared/revision.h | 12 ------------
 1 file changed, 12 deletions(-)
 delete mode 100644 src/server/shared/revision.h

(limited to 'src')

diff --git a/src/server/shared/revision.h b/src/server/shared/revision.h
deleted file mode 100644
index f459116dc84..00000000000
--- a/src/server/shared/revision.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef __REVISION_H__
-#define __REVISION_H__
- #define _BUILD_DIRECTIVE "Debug"
- #define _REVISION "8417"
- #define _HASH "47972987739a"
- #define _REVISION_DATE "*"
- #define _REVISION_TIME "*"
- #define FILEVER        0,0,8417,0
- #define PRODUCTVER     0,0,8417,0
- #define STRFILEVER     "0, 0, 8417, 47972987739a"
- #define STRPRODUCTVER  "0, 0, 8417, 47972987739a"
-#endif // __REVISION_H__
-- 
cgit v1.2.3


From cc4413f6b462cc5071cc44dbba27d329d5d43571 Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Wed, 9 Jun 2010 15:02:30 +0200
Subject: Change binary names for tools/

--HG--
branch : trunk
---
 src/server/shared/revision.h             | 14 +++++++-------
 src/tools/map_extractor/CMakeLists.txt   |  6 +++---
 src/tools/vmap3_assembler/CMakeLists.txt |  4 ++--
 src/tools/vmap3_extractor/CMakeLists.txt |  4 ++--
 4 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/server/shared/revision.h b/src/server/shared/revision.h
index f459116dc84..45cb714559a 100644
--- a/src/server/shared/revision.h
+++ b/src/server/shared/revision.h
@@ -1,12 +1,12 @@
 #ifndef __REVISION_H__
 #define __REVISION_H__
- #define _BUILD_DIRECTIVE "Debug"
- #define _REVISION "8417"
- #define _HASH "47972987739a"
+ #define _BUILD_DIRECTIVE "Release"
+ #define _REVISION "8549"
+ #define _HASH "7c4cd473d7cc"
  #define _REVISION_DATE "*"
  #define _REVISION_TIME "*"
- #define FILEVER        0,0,8417,0
- #define PRODUCTVER     0,0,8417,0
- #define STRFILEVER     "0, 0, 8417, 47972987739a"
- #define STRPRODUCTVER  "0, 0, 8417, 47972987739a"
+ #define FILEVER        0,0,8549,0
+ #define PRODUCTVER     0,0,8549,0
+ #define STRFILEVER     "0, 0, 8549, 7c4cd473d7cc"
+ #define STRPRODUCTVER  "0, 0, 8549, 7c4cd473d7cc"
 #endif // __REVISION_H__
diff --git a/src/tools/map_extractor/CMakeLists.txt b/src/tools/map_extractor/CMakeLists.txt
index 4f9b0a8c855..23177d0bf68 100644
--- a/src/tools/map_extractor/CMakeLists.txt
+++ b/src/tools/map_extractor/CMakeLists.txt
@@ -19,12 +19,12 @@ include_directories (${CMAKE_SOURCE_DIR}/externals/libmpq)
 include_directories (${CMAKE_SOURCE_DIR}/src/tools/map_extractor)
 include_directories (${CMAKE_SOURCE_DIR}/src/tools/map_extractor/loadlib)
 
-link_directories (${CMAKE_SOURCE_DIR}/externals/libmpq)
+link_directories (${CMAKE_SOURCE_DIR}/externals/libmpq/libmpq)
 link_directories (${CMAKE_SOURCE_DIR}}/src/tools/map_extractor/loadlib)
 
 add_library (loadlib ${loadlib_sources})
 target_link_libraries (loadlib zlib)
 
-add_executable (trinity-map_extractor ${sources})
+add_executable (map_extractor ${sources})
 
-target_link_libraries (trinity-map_extractor libmpq loadlib)
+target_link_libraries (map_extractor libmpq loadlib)
diff --git a/src/tools/vmap3_assembler/CMakeLists.txt b/src/tools/vmap3_assembler/CMakeLists.txt
index d273d128011..29d24eaa9e2 100644
--- a/src/tools/vmap3_assembler/CMakeLists.txt
+++ b/src/tools/vmap3_assembler/CMakeLists.txt
@@ -17,7 +17,7 @@ include_directories(
   ${ACE_INCLUDE_DIR}
 )
 
-add_executable(trinity-collision_assembler VMapAssembler.cpp)
-target_link_libraries(trinity-collision_assembler collision g3dlib)
+add_executable(collision_assembler VMapAssembler.cpp)
+target_link_libraries(collision_assembler collision g3dlib)
 
 
diff --git a/src/tools/vmap3_extractor/CMakeLists.txt b/src/tools/vmap3_extractor/CMakeLists.txt
index 9e978eda037..03d609bf60d 100644
--- a/src/tools/vmap3_extractor/CMakeLists.txt
+++ b/src/tools/vmap3_extractor/CMakeLists.txt
@@ -11,5 +11,5 @@
 
 include_directories (${CMAKE_SOURCE_DIR}/externals/libmpq)
 
-add_executable(trinity-vmap_extractor adtfile.cpp  dbcfile.cpp  model.cpp  mpq_libmpq.cpp  vmapexport.cpp  wdtfile.cpp  wmo.cpp)
-target_link_libraries(trinity-vmap_extractor libmpq)
+add_executable(collision_extractor adtfile.cpp  dbcfile.cpp  model.cpp  mpq_libmpq.cpp  vmapexport.cpp  wdtfile.cpp  wmo.cpp)
+target_link_libraries(collision_extractor libmpq)
-- 
cgit v1.2.3


From 061df242a17fa4222eec16e9071e252ab5996b6e Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Wed, 9 Jun 2010 15:11:46 +0200
Subject: Rename trinity-core to worldserver

--HG--
branch : trunk
---
 src/server/worldserver/CMakeLists.txt | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt
index 969204f3522..3203d1dfa2b 100644
--- a/src/server/worldserver/CMakeLists.txt
+++ b/src/server/worldserver/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 ########### next target ###############
 
-SET(trinity-core_SRCS
+SET(worldserver_SRCS
 CommandLine/CliRunnable.cpp
 CommandLine/CliRunnable.h
 RemoteAccess/RASocket.cpp
@@ -109,22 +109,22 @@ include_directories(
   ${MYSQL_INCLUDE_DIR}
 )
 
-SET(trinity-core_LINK_FLAGS "")
+SET(worldserver_LINK_FLAGS "")
 
-add_executable(trinity-core ${trinity-core_SRCS})
+add_executable(worldserver ${trinity-core_SRCS})
 add_definitions(
 -D_TRINITY_CORE_CONFIG='"${CONF_DIR}/trinitycore.conf"'
 )
 IF (DO_MYSQL)
-    SET(trinity-core_LINK_FLAGS "-pthread ${trinity-core_LINK_FLAGS}")
+    SET(worldserver_LINK_FLAGS "-pthread ${trinity-core_LINK_FLAGS}")
 ENDIF(DO_MYSQL)
 
 IF (CMAKE_SYSTEM_NAME MATCHES "Darwin")
-    SET(trinity-core_LINK_FLAGS "-framework Carbon ${trinity-core_LINK_FLAGS}")
+    SET(worldserver_LINK_FLAGS "-framework Carbon ${trinity-core_LINK_FLAGS}")
     SET(SCRIPT_LIB "")
 ENDIF (CMAKE_SYSTEM_NAME MATCHES "Darwin")
 
-SET_TARGET_PROPERTIES(trinity-core PROPERTIES LINK_FLAGS "${trinity-core_LINK_FLAGS}")
+SET_TARGET_PROPERTIES(worldserver PROPERTIES LINK_FLAGS "${trinity-core_LINK_FLAGS}")
 
 if(DO_SCRIPTS)
     SET(SCRIPT_LIB "scripts")
@@ -154,7 +154,7 @@ ${ZLIB}
 ${OSX_LIBS}
 )
 
-install(TARGETS trinity-core DESTINATION bin)
+install(TARGETS worldserver DESTINATION bin)
 
 
 ########### install files ###############
-- 
cgit v1.2.3


From 078a73692a88e6b87e2b930a47237da3631a0f51 Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Wed, 9 Jun 2010 15:13:07 +0200
Subject: Rename trinity-realm to authserver

--HG--
branch : trunk
---
 src/server/authserver/CMakeLists.txt | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/server/authserver/CMakeLists.txt b/src/server/authserver/CMakeLists.txt
index 98142e88729..5d753a565c0 100644
--- a/src/server/authserver/CMakeLists.txt
+++ b/src/server/authserver/CMakeLists.txt
@@ -1,6 +1,6 @@
 ########### next target ###############
 
-SET(trinity-realm_SRCS
+SET(authserver_SRCS
 Authentication/AuthCodes.cpp
 Authentication/AuthCodes.h
 Realms/RealmList.cpp
@@ -30,21 +30,21 @@ include_directories(
   ${MYSQL_INCLUDE_DIR}
 )
 
-SET(trinity-realm_LINK_FLAGS "")
+SET(authserver_LINK_FLAGS "")
 
-add_executable(trinity-realm ${trinity-realm_SRCS})
+add_executable(authserver ${trinity-realm_SRCS})
 add_definitions(
 -D_TRINITY_REALM_CONFIG='"${CONF_DIR}/trinityrealm.conf"'
 )
 IF (DO_MYSQL)
-   SET(trinity-realm_LINK_FLAGS "-pthread ${trinity-realm_LINK_FLAGS}")
+   SET(trinity-realm_LINK_FLAGS "-pthread ${authserver_LINK_FLAGS}")
 ENDIF(DO_MYSQL)
 
 IF (CMAKE_SYSTEM_NAME MATCHES "Darwin")
-   SET(trinity-realm_LINK_FLAGS "-framework Carbon ${trinity-realm_LINK_FLAGS}")
+   SET(authserver_LINK_FLAGS "-framework Carbon ${authserver_LINK_FLAGS}")
 ENDIF (CMAKE_SYSTEM_NAME MATCHES "Darwin")
 
-SET_TARGET_PROPERTIES(trinity-realm PROPERTIES LINK_FLAGS "${trinity-realm_LINK_FLAGS}")
+SET_TARGET_PROPERTIES(authserver PROPERTIES LINK_FLAGS "${authserver_LINK_FLAGS}")
 
 target_link_libraries(
 trinity-realm
@@ -57,7 +57,7 @@ ${MYSQL_LIBRARIES}
 ${OSX_LIBS}
 )
 
-install(TARGETS trinity-realm DESTINATION bin)
+install(TARGETS authserver DESTINATION bin)
 
 
 ########### install files ###############
-- 
cgit v1.2.3


From 767d9b4091ca2b60ea90542847677f6c68164576 Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Wed, 9 Jun 2010 15:21:43 +0200
Subject: Strip trinityscript ASCII banner

--HG--
branch : trunk
---
 src/server/game/Scripting/ScriptMgr.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp
index 8e52e1ce433..b41f6a215f8 100644
--- a/src/server/game/Scripting/ScriptMgr.cpp
+++ b/src/server/game/Scripting/ScriptMgr.cpp
@@ -45,19 +45,19 @@ ScriptMgr::~ScriptMgr()
 void ScriptMgr::ScriptsInit()
 {
     //Trinity Script startup
-    outstring_log(" _____     _       _ _         ____            _       _");
+    /*outstring_log(" _____     _       _ _         ____            _       _");
     outstring_log("|_   _| __(_)_ __ (_) |_ _   _/ ___|  ___ _ __(_)_ __ | |_ ");
     outstring_log("  | || '__| | '_ \\| | __| | | \\___ \\ / __| \'__| | \'_ \\| __|");
     outstring_log("  | || |  | | | | | | |_| |_| |___) | (__| |  | | |_) | |_ ");
     outstring_log("  |_||_|  |_|_| |_|_|\\__|\\__, |____/ \\___|_|  |_| .__/ \\__|");
     outstring_log("                         |___/                  |_|        ");
     outstring_log("");
-    outstring_log("");
+    outstring_log("");*/
 
     //Load database (must be called after SD2Config.SetSource).
     LoadDatabase();
 
-    outstring_log("TSCR: Loading C++ scripts");
+    outstring_log("Loading C++ scripts");
     barGoLink bar(1);
     bar.step();
     outstring_log("");
-- 
cgit v1.2.3


From 2457c5a174e145b0812479c63bf56f3cdd03a79d Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Wed, 9 Jun 2010 15:39:34 +0200
Subject: Add copyright notes to CMake files

--HG--
branch : trunk
---
 CMakeLists.txt                           | 10 ++++++++++
 src/CMakeLists.txt                       | 10 ++++++++++
 src/server/CMakeLists.txt                | 10 ++++++++++
 src/server/authserver/CMakeLists.txt     | 12 +++++++++++-
 src/server/collision/CMakeLists.txt      |  9 +++++++++
 src/server/game/CMakeLists.txt           | 12 ++++++++++++
 src/server/scripts/CMakeLists.txt        | 12 ++++++++++++
 src/server/shared/CMakeLists.txt         | 10 ++++++++++
 src/server/worldserver/CMakeLists.txt    | 11 ++++++++++-
 src/tools/CMakeLists.txt                 | 10 ++++++++++
 src/tools/vmap3_assembler/CMakeLists.txt |  2 +-
 11 files changed, 105 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bdb6a9c512b..4c143280e0b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,3 +1,13 @@
+# Copyright (C) 2005-2010 Trinity 
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
 project(Trinity)
 cmake_minimum_required(VERSION 2.6)
 cmake_policy(SET CMP0005 OLD)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 205a3961677..76c3de027eb 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,3 +1,13 @@
+# Copyright (C) 2005-2010 Trinity 
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
 add_subdirectory(server)
 
 if(DO_TOOLS)
diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
index d975ef8f4c4..cf835f7ca66 100644
--- a/src/server/CMakeLists.txt
+++ b/src/server/CMakeLists.txt
@@ -1,3 +1,13 @@
+# Copyright (C) 2005-2010 Trinity 
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
 if(DO_WORLDSERVER)
   add_subdirectory(shared)
   add_subdirectory(game)
diff --git a/src/server/authserver/CMakeLists.txt b/src/server/authserver/CMakeLists.txt
index 5d753a565c0..394841939c0 100644
--- a/src/server/authserver/CMakeLists.txt
+++ b/src/server/authserver/CMakeLists.txt
@@ -1,4 +1,14 @@
-########### next target ###############
+# Copyright (C) 2005-2010 Trinity 
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+########### authserver ###############
 
 SET(authserver_SRCS
 Authentication/AuthCodes.cpp
diff --git a/src/server/collision/CMakeLists.txt b/src/server/collision/CMakeLists.txt
index a058c14378b..1090b7ab0f7 100644
--- a/src/server/collision/CMakeLists.txt
+++ b/src/server/collision/CMakeLists.txt
@@ -1,3 +1,12 @@
+# Copyright (C) 2005-2010 Trinity 
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 ########### collision ###############
 
diff --git a/src/server/game/CMakeLists.txt b/src/server/game/CMakeLists.txt
index 8ae179a3772..8616c730d18 100644
--- a/src/server/game/CMakeLists.txt
+++ b/src/server/game/CMakeLists.txt
@@ -1,3 +1,15 @@
+# Copyright (C) 2005-2010 Trinity 
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+######## game ########
+
 # Enable precompiled headers when using the GCC compiler.
 IF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX)
         INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
diff --git a/src/server/scripts/CMakeLists.txt b/src/server/scripts/CMakeLists.txt
index bd7ba5d5af9..28a137fe4d3 100644
--- a/src/server/scripts/CMakeLists.txt
+++ b/src/server/scripts/CMakeLists.txt
@@ -1,3 +1,15 @@
+# Copyright (C) 2005-2010 Trinity 
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+####### scripts ########
+
 # Enable precompiled headers when using the GCC compiler.
 IF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX)
 	INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt
index 010c47fd706..6ff39c724de 100644
--- a/src/server/shared/CMakeLists.txt
+++ b/src/server/shared/CMakeLists.txt
@@ -1,3 +1,13 @@
+# Copyright (C) 2005-2010 Trinity 
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
 ########### shared ###############
 
 SET(shared_STAT_SRCS
diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt
index 3203d1dfa2b..3cce53f1e3f 100644
--- a/src/server/worldserver/CMakeLists.txt
+++ b/src/server/worldserver/CMakeLists.txt
@@ -1,5 +1,14 @@
+# Copyright (C) 2005-2010 Trinity 
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-########### next target ###############
+########### worldserver ###############
 
 SET(worldserver_SRCS
 CommandLine/CliRunnable.cpp
diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
index 1d891d39182..f960329674f 100644
--- a/src/tools/CMakeLists.txt
+++ b/src/tools/CMakeLists.txt
@@ -1,3 +1,13 @@
+# Copyright (C) 2005-2010 Trinity 
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
 add_subdirectory(map_extractor)
 add_subdirectory(vmap3_assembler)
 add_subdirectory(vmap3_extractor)
diff --git a/src/tools/vmap3_assembler/CMakeLists.txt b/src/tools/vmap3_assembler/CMakeLists.txt
index 29d24eaa9e2..2088158af6a 100644
--- a/src/tools/vmap3_assembler/CMakeLists.txt
+++ b/src/tools/vmap3_assembler/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Copyright (C) 2005-2009 MaNGOS project 
-# Copyright (C) 2005-2009 Trinity 
+# Copyright (C) 2005-2010 Trinity 
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
-- 
cgit v1.2.3


From 4323ba11d3c2b5e3116b014dd2941e4590a7d594 Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Wed, 9 Jun 2010 15:47:00 +0200
Subject: Fix some typos on authserver & worldserver renaming

--HG--
branch : trunk
---
 src/server/authserver/CMakeLists.txt  |  4 ++--
 src/server/worldserver/CMakeLists.txt | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/server/authserver/CMakeLists.txt b/src/server/authserver/CMakeLists.txt
index 394841939c0..2b76157a9e1 100644
--- a/src/server/authserver/CMakeLists.txt
+++ b/src/server/authserver/CMakeLists.txt
@@ -42,7 +42,7 @@ include_directories(
 
 SET(authserver_LINK_FLAGS "")
 
-add_executable(authserver ${trinity-realm_SRCS})
+add_executable(authserver ${authserver_SRCS})
 add_definitions(
 -D_TRINITY_REALM_CONFIG='"${CONF_DIR}/trinityrealm.conf"'
 )
@@ -57,7 +57,7 @@ ENDIF (CMAKE_SYSTEM_NAME MATCHES "Darwin")
 SET_TARGET_PROPERTIES(authserver PROPERTIES LINK_FLAGS "${authserver_LINK_FLAGS}")
 
 target_link_libraries(
-trinity-realm
+authserver
 shared
 trinitydatabase
 trinityauth
diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt
index 3cce53f1e3f..9bf9cb1d4b0 100644
--- a/src/server/worldserver/CMakeLists.txt
+++ b/src/server/worldserver/CMakeLists.txt
@@ -120,20 +120,20 @@ include_directories(
 
 SET(worldserver_LINK_FLAGS "")
 
-add_executable(worldserver ${trinity-core_SRCS})
+add_executable(worldserver ${worldserver_SRCS})
 add_definitions(
 -D_TRINITY_CORE_CONFIG='"${CONF_DIR}/trinitycore.conf"'
 )
 IF (DO_MYSQL)
-    SET(worldserver_LINK_FLAGS "-pthread ${trinity-core_LINK_FLAGS}")
+    SET(worldserver_LINK_FLAGS "-pthread ${worldserver_LINK_FLAGS}")
 ENDIF(DO_MYSQL)
 
 IF (CMAKE_SYSTEM_NAME MATCHES "Darwin")
-    SET(worldserver_LINK_FLAGS "-framework Carbon ${trinity-core_LINK_FLAGS}")
+    SET(worldserver_LINK_FLAGS "-framework Carbon ${worldserver_LINK_FLAGS}")
     SET(SCRIPT_LIB "")
 ENDIF (CMAKE_SYSTEM_NAME MATCHES "Darwin")
 
-SET_TARGET_PROPERTIES(worldserver PROPERTIES LINK_FLAGS "${trinity-core_LINK_FLAGS}")
+SET_TARGET_PROPERTIES(worldserver PROPERTIES LINK_FLAGS "${worldserver_LINK_FLAGS}")
 
 if(DO_SCRIPTS)
     SET(SCRIPT_LIB "scripts")
@@ -142,7 +142,7 @@ else(DO_SCRIPTS)
 endif(DO_SCRIPTS)
 
 target_link_libraries(
-trinity-core
+worldserver
 game
 shared
 zlib
-- 
cgit v1.2.3


From bdb4b2bf8fcdcaad5066f4d8f815d3278f552f92 Mon Sep 17 00:00:00 2001
From: Brian 
Date: Wed, 9 Jun 2010 07:48:29 -0600
Subject: * Rename conf file / icon file / Window file properties

--HG--
branch : trunk
rename : src/server/authserver/trinityrealm.conf.dist => src/server/authserver/authserver.conf.dist
rename : src/server/authserver/TrinityRealm.ico => src/server/authserver/authserver.ico
rename : src/server/authserver/TrinityRealm.rc => src/server/authserver/authserver.rc
---
 src/server/authserver/CMakeLists.txt         |   4 +-
 src/server/authserver/TrinityRealm.ico       | Bin 136606 -> 0 bytes
 src/server/authserver/TrinityRealm.rc        |  86 ----------------
 src/server/authserver/authserver.conf.dist   | 146 +++++++++++++++++++++++++++
 src/server/authserver/authserver.ico         | Bin 0 -> 136606 bytes
 src/server/authserver/authserver.rc          |  86 ++++++++++++++++
 src/server/authserver/trinityrealm.conf.dist | 146 ---------------------------
 7 files changed, 234 insertions(+), 234 deletions(-)
 delete mode 100644 src/server/authserver/TrinityRealm.ico
 delete mode 100644 src/server/authserver/TrinityRealm.rc
 create mode 100644 src/server/authserver/authserver.conf.dist
 create mode 100644 src/server/authserver/authserver.ico
 create mode 100644 src/server/authserver/authserver.rc
 delete mode 100644 src/server/authserver/trinityrealm.conf.dist

(limited to 'src')

diff --git a/src/server/authserver/CMakeLists.txt b/src/server/authserver/CMakeLists.txt
index 2b76157a9e1..c3fde830b43 100644
--- a/src/server/authserver/CMakeLists.txt
+++ b/src/server/authserver/CMakeLists.txt
@@ -44,7 +44,7 @@ SET(authserver_LINK_FLAGS "")
 
 add_executable(authserver ${authserver_SRCS})
 add_definitions(
--D_TRINITY_REALM_CONFIG='"${CONF_DIR}/trinityrealm.conf"'
+-D_TRINITY_REALM_CONFIG='"${CONF_DIR}/authserver.conf"'
 )
 IF (DO_MYSQL)
    SET(trinity-realm_LINK_FLAGS "-pthread ${authserver_LINK_FLAGS}")
@@ -72,4 +72,4 @@ install(TARGETS authserver DESTINATION bin)
 
 ########### install files ###############
 
-install(FILES  trinityrealm.conf.dist DESTINATION etc)
+install(FILES  authserver.conf.dist DESTINATION etc)
diff --git a/src/server/authserver/TrinityRealm.ico b/src/server/authserver/TrinityRealm.ico
deleted file mode 100644
index da318f48a8c..00000000000
Binary files a/src/server/authserver/TrinityRealm.ico and /dev/null differ
diff --git a/src/server/authserver/TrinityRealm.rc b/src/server/authserver/TrinityRealm.rc
deleted file mode 100644
index dfc548305fd..00000000000
--- a/src/server/authserver/TrinityRealm.rc
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (C) 2005-2009 MaNGOS 
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "resource.h"
-#include "../shared/revision.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "windows.h" //"afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDI_APPICON             ICON                    "TrinityRealm.ico"
-
-/////////////////////////////////////////////////////////////////////////////
-// Neutre (Par défaut système) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEUSD)
-#ifdef _WIN32
-LANGUAGE LANG_NEUTRAL, SUBLANG_SYS_DEFAULT
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION FILEVER
- PRODUCTVERSION PRODUCTVER
- FILEFLAGSMASK 0x17L
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x0L
- FILETYPE 0x0L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "080004b0"
-        BEGIN
-            VALUE "FileDescription", "TrinityRealm"
-            VALUE "FileVersion", STRFILEVER
-            VALUE "InternalName", "TrinityRealm"
-            VALUE "LegalCopyright", "Copyright (C) 2008-2009"
-            VALUE "OriginalFilename", "TrinityRealm.exe"
-            VALUE "ProductName", "TrinityRealm"
-            VALUE "ProductVersion", STRPRODUCTVER
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x800, 1200
-    END
-END
-#endif
diff --git a/src/server/authserver/authserver.conf.dist b/src/server/authserver/authserver.conf.dist
new file mode 100644
index 00000000000..e98b9386878
--- /dev/null
+++ b/src/server/authserver/authserver.conf.dist
@@ -0,0 +1,146 @@
+##########################################
+# Trinity Core realmd configuration file #
+##########################################
+# Note to devs, line breaks should be at column 80
+###############################################################################
+# REALMD SETTINGS
+#
+#    LoginDatabaseInfo
+#        Database connection settings for the realm server.
+#        Default:
+#                    hostname;port;username;password;database
+#                    .;somenumber;username;password;database
+#                     - use named pipes in Windows
+#                    Named pipes: mySQL required adding
+#                        "enable-named-pipe" to [mysqld] section my.ini
+#                    .;/path/to/unix_socket;username;password;database
+#                     - use Unix sockets in Unix/Linux
+#
+#    LogsDir
+#        Logs directory setting.
+#        Important: Logs dir must exists, or all logs need to be disabled
+#        Default: "" - no log directory prefix, if used log names isn't
+#         absolute path then logs will be stored in current directory.
+#
+#    MaxPingTime
+#         Settings for maximum database-ping interval (minutes between pings)
+#
+#    RealmServerPort
+#         Default RealmServerPort
+#
+#    BindIP
+#         Bind Realm Server to IP/hostname
+#
+#    PidFile
+#        Realmd daemon PID file
+#        Default: ""             - do not create PID file
+#                 "./realmd.pid" - create PID file (recommended name)
+#
+#    LogLevel
+#        Server console level of logging
+#        Default: 0 = Minimum
+#                 1 = Basic
+#                 2 = Detail
+#                 3 = Full/Debug
+#
+#    LogFile
+#        Logfile name
+#        Default: "realmd.log"
+#                 "" - Empty name disable creating log file
+#
+#    LogTimestamp
+#        Logfile with timestamp of server start in name
+#         in form Logname_YYYY-MM-DD_HH-MM-SS.Ext for Logname.Ext
+#        Default: 0 - no timestamp in name
+#                 1 - add timestamp in name
+#
+#    LogFileLevel
+#        Server file level of logging
+#        Default: 0 = Minimum
+#                 1 = Basic
+#                 2 = Detail
+#                 3 = Full/Debug
+#
+#    LogColors
+#        Color for messages (format "normal basic detail debug")
+#        Default: "" - no colors
+#        Colors: 0  - BLACK
+#                1  - RED
+#                2  - GREEN
+#                3  - BROWN
+#                4  - BLUE
+#                5  - MAGENTA
+#                6  - CYAN
+#                7  - GREY
+#                8  - YELLOW
+#                9  - LRED
+#                10 - LGREEN
+#                11 - LBLUE
+#                12 - LMAGENTA
+#                13 - LCYAN
+#                14 - WHITE
+#        Example: "13 11 9 5"
+#
+#    EnableLogDB
+#        Enable/disable logging to database (LogDatabaseInfo).
+#        Default: 0 - disabled
+#                 1 - enabled
+#
+#    DBLogLevel
+#        Log level of DB logging.
+#                 0 = Minimum
+#        Default: 1 = Basic
+#                 2 = Detail
+#                 3 = Full/Debug
+#
+#    UseProcessors
+#        Processors mask for multi-processor system (Used only in Windows)
+#        Default: 0 (selected by OS)
+#                 number (bitmask value of selected processors)
+#
+#    ProcessPriority
+#        Process proirity setting (Used only at Windows)
+#        Default: 1 (HIGH)
+#                 0 (Normal)
+#
+#    RealmsStateUpdateDelay
+#        Realm list Update up delay
+#         (updated at realm list request if delay expired).
+#        Default: 20
+#                 0  (Disabled)
+#
+#    WrongPass.MaxCount
+#        Number of login attemps with wrong password
+#         before the account or IP is banned
+#        Default: 0  (Never ban)
+#
+#    WrongPass.BanTime
+#        Duration of the ban in seconds (0 means permanent ban)
+#        Default: 600
+#
+#    WrongPass.BanType
+#        Ban the IP or account on which login is attempted
+#        Default: 0 (Ban IP)
+#                 1 (Ban Account)
+#
+###############################################################################
+
+LoginDatabaseInfo = "127.0.0.1;3306;trinity;trinity;realmd"
+LogsDir = ""
+MaxPingTime = 30
+RealmServerPort = 3724
+BindIP = "0.0.0.0"
+PidFile = ""
+LogLevel = 0
+LogFile = "realmd.log"
+LogTimestamp = 0
+LogFileLevel = 0
+LogColors = ""
+EnableLogDB = 0
+DBLogLevel = 1
+UseProcessors = 0
+ProcessPriority = 1
+RealmsStateUpdateDelay = 20
+WrongPass.MaxCount = 0
+WrongPass.BanTime = 600
+WrongPass.BanType = 0
diff --git a/src/server/authserver/authserver.ico b/src/server/authserver/authserver.ico
new file mode 100644
index 00000000000..da318f48a8c
Binary files /dev/null and b/src/server/authserver/authserver.ico differ
diff --git a/src/server/authserver/authserver.rc b/src/server/authserver/authserver.rc
new file mode 100644
index 00000000000..74ce7f43858
--- /dev/null
+++ b/src/server/authserver/authserver.rc
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2005-2009 MaNGOS 
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "resource.h"
+#include "../shared/revision.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "windows.h" //"afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_APPICON             ICON                    "authserver.ico"
+
+/////////////////////////////////////////////////////////////////////////////
+// Neutre (Par défaut système) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEUSD)
+#ifdef _WIN32
+LANGUAGE LANG_NEUTRAL, SUBLANG_SYS_DEFAULT
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION FILEVER
+ PRODUCTVERSION PRODUCTVER
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x0L
+ FILETYPE 0x0L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "080004b0"
+        BEGIN
+            VALUE "FileDescription", "authserver"
+            VALUE "FileVersion", STRFILEVER
+            VALUE "InternalName", "authserver"
+            VALUE "LegalCopyright", "Copyright (C) 2008-2010"
+            VALUE "OriginalFilename", "authserver.exe"
+            VALUE "ProductName", "authserver"
+            VALUE "ProductVersion", STRPRODUCTVER
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x800, 1200
+    END
+END
+#endif
diff --git a/src/server/authserver/trinityrealm.conf.dist b/src/server/authserver/trinityrealm.conf.dist
deleted file mode 100644
index e98b9386878..00000000000
--- a/src/server/authserver/trinityrealm.conf.dist
+++ /dev/null
@@ -1,146 +0,0 @@
-##########################################
-# Trinity Core realmd configuration file #
-##########################################
-# Note to devs, line breaks should be at column 80
-###############################################################################
-# REALMD SETTINGS
-#
-#    LoginDatabaseInfo
-#        Database connection settings for the realm server.
-#        Default:
-#                    hostname;port;username;password;database
-#                    .;somenumber;username;password;database
-#                     - use named pipes in Windows
-#                    Named pipes: mySQL required adding
-#                        "enable-named-pipe" to [mysqld] section my.ini
-#                    .;/path/to/unix_socket;username;password;database
-#                     - use Unix sockets in Unix/Linux
-#
-#    LogsDir
-#        Logs directory setting.
-#        Important: Logs dir must exists, or all logs need to be disabled
-#        Default: "" - no log directory prefix, if used log names isn't
-#         absolute path then logs will be stored in current directory.
-#
-#    MaxPingTime
-#         Settings for maximum database-ping interval (minutes between pings)
-#
-#    RealmServerPort
-#         Default RealmServerPort
-#
-#    BindIP
-#         Bind Realm Server to IP/hostname
-#
-#    PidFile
-#        Realmd daemon PID file
-#        Default: ""             - do not create PID file
-#                 "./realmd.pid" - create PID file (recommended name)
-#
-#    LogLevel
-#        Server console level of logging
-#        Default: 0 = Minimum
-#                 1 = Basic
-#                 2 = Detail
-#                 3 = Full/Debug
-#
-#    LogFile
-#        Logfile name
-#        Default: "realmd.log"
-#                 "" - Empty name disable creating log file
-#
-#    LogTimestamp
-#        Logfile with timestamp of server start in name
-#         in form Logname_YYYY-MM-DD_HH-MM-SS.Ext for Logname.Ext
-#        Default: 0 - no timestamp in name
-#                 1 - add timestamp in name
-#
-#    LogFileLevel
-#        Server file level of logging
-#        Default: 0 = Minimum
-#                 1 = Basic
-#                 2 = Detail
-#                 3 = Full/Debug
-#
-#    LogColors
-#        Color for messages (format "normal basic detail debug")
-#        Default: "" - no colors
-#        Colors: 0  - BLACK
-#                1  - RED
-#                2  - GREEN
-#                3  - BROWN
-#                4  - BLUE
-#                5  - MAGENTA
-#                6  - CYAN
-#                7  - GREY
-#                8  - YELLOW
-#                9  - LRED
-#                10 - LGREEN
-#                11 - LBLUE
-#                12 - LMAGENTA
-#                13 - LCYAN
-#                14 - WHITE
-#        Example: "13 11 9 5"
-#
-#    EnableLogDB
-#        Enable/disable logging to database (LogDatabaseInfo).
-#        Default: 0 - disabled
-#                 1 - enabled
-#
-#    DBLogLevel
-#        Log level of DB logging.
-#                 0 = Minimum
-#        Default: 1 = Basic
-#                 2 = Detail
-#                 3 = Full/Debug
-#
-#    UseProcessors
-#        Processors mask for multi-processor system (Used only in Windows)
-#        Default: 0 (selected by OS)
-#                 number (bitmask value of selected processors)
-#
-#    ProcessPriority
-#        Process proirity setting (Used only at Windows)
-#        Default: 1 (HIGH)
-#                 0 (Normal)
-#
-#    RealmsStateUpdateDelay
-#        Realm list Update up delay
-#         (updated at realm list request if delay expired).
-#        Default: 20
-#                 0  (Disabled)
-#
-#    WrongPass.MaxCount
-#        Number of login attemps with wrong password
-#         before the account or IP is banned
-#        Default: 0  (Never ban)
-#
-#    WrongPass.BanTime
-#        Duration of the ban in seconds (0 means permanent ban)
-#        Default: 600
-#
-#    WrongPass.BanType
-#        Ban the IP or account on which login is attempted
-#        Default: 0 (Ban IP)
-#                 1 (Ban Account)
-#
-###############################################################################
-
-LoginDatabaseInfo = "127.0.0.1;3306;trinity;trinity;realmd"
-LogsDir = ""
-MaxPingTime = 30
-RealmServerPort = 3724
-BindIP = "0.0.0.0"
-PidFile = ""
-LogLevel = 0
-LogFile = "realmd.log"
-LogTimestamp = 0
-LogFileLevel = 0
-LogColors = ""
-EnableLogDB = 0
-DBLogLevel = 1
-UseProcessors = 0
-ProcessPriority = 1
-RealmsStateUpdateDelay = 20
-WrongPass.MaxCount = 0
-WrongPass.BanTime = 600
-WrongPass.BanType = 0
-- 
cgit v1.2.3


From 5ee985b2317f17ed404586ec71ffcbe5f25d1003 Mon Sep 17 00:00:00 2001
From: Brian 
Date: Wed, 9 Jun 2010 07:53:07 -0600
Subject: * Rename trinitycore.conf / ico / windows properties

--HG--
branch : trunk
rename : src/server/worldserver/trinitycore.conf.dist => src/server/worldserver/worldserver.conf.dist
rename : src/server/worldserver/TrinityCore.ico => src/server/worldserver/worldserver.ico
rename : src/server/worldserver/TrinityCore.rc => src/server/worldserver/worldserver.rc
---
 src/server/worldserver/CMakeLists.txt        |    4 +-
 src/server/worldserver/TrinityCore.ico       |  Bin 136606 -> 0 bytes
 src/server/worldserver/TrinityCore.rc        |   86 -
 src/server/worldserver/trinitycore.conf.dist | 2212 --------------------------
 src/server/worldserver/worldserver.conf.dist | 2212 ++++++++++++++++++++++++++
 src/server/worldserver/worldserver.ico       |  Bin 0 -> 136606 bytes
 src/server/worldserver/worldserver.rc        |   86 +
 7 files changed, 2300 insertions(+), 2300 deletions(-)
 delete mode 100644 src/server/worldserver/TrinityCore.ico
 delete mode 100644 src/server/worldserver/TrinityCore.rc
 delete mode 100644 src/server/worldserver/trinitycore.conf.dist
 create mode 100644 src/server/worldserver/worldserver.conf.dist
 create mode 100644 src/server/worldserver/worldserver.ico
 create mode 100644 src/server/worldserver/worldserver.rc

(limited to 'src')

diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt
index 9bf9cb1d4b0..058338f98ed 100644
--- a/src/server/worldserver/CMakeLists.txt
+++ b/src/server/worldserver/CMakeLists.txt
@@ -122,7 +122,7 @@ SET(worldserver_LINK_FLAGS "")
 
 add_executable(worldserver ${worldserver_SRCS})
 add_definitions(
--D_TRINITY_CORE_CONFIG='"${CONF_DIR}/trinitycore.conf"'
+-D_TRINITY_CORE_CONFIG='"${CONF_DIR}/worldserver.conf"'
 )
 IF (DO_MYSQL)
     SET(worldserver_LINK_FLAGS "-pthread ${worldserver_LINK_FLAGS}")
@@ -168,5 +168,5 @@ install(TARGETS worldserver DESTINATION bin)
 
 ########### install files ###############
 
-install(FILES  trinitycore.conf.dist DESTINATION etc)
+install(FILES  worldserver.conf.dist DESTINATION etc)
 
diff --git a/src/server/worldserver/TrinityCore.ico b/src/server/worldserver/TrinityCore.ico
deleted file mode 100644
index 6f0a5721957..00000000000
Binary files a/src/server/worldserver/TrinityCore.ico and /dev/null differ
diff --git a/src/server/worldserver/TrinityCore.rc b/src/server/worldserver/TrinityCore.rc
deleted file mode 100644
index 151185f3cec..00000000000
--- a/src/server/worldserver/TrinityCore.rc
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (C) 2005-2009 MaNGOS 
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "resource.h"
-#include "../shared/revision.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "windows.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDI_APPICON             ICON                    "TrinityCore.ico"
-
-/////////////////////////////////////////////////////////////////////////////
-// Neutre (Par défaut système) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEUSD)
-#ifdef _WIN32
-LANGUAGE LANG_NEUTRAL, SUBLANG_SYS_DEFAULT
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION FILEVER
- PRODUCTVERSION PRODUCTVER
- FILEFLAGSMASK 0x17L
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x0L
- FILETYPE 0x0L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "080004b0"
-        BEGIN
-            VALUE "FileDescription", "TrinityCore"
-            VALUE "FileVersion", STRFILEVER
-            VALUE "InternalName", "TrinityCore"
-            VALUE "LegalCopyright", "Copyright (C) 2008-2009"
-            VALUE "OriginalFilename", "TrinityCore.exe"
-            VALUE "ProductName", "TrinityCore"
-            VALUE "ProductVersion", STRPRODUCTVER
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x800, 1200
-    END
-END
-#endif
diff --git a/src/server/worldserver/trinitycore.conf.dist b/src/server/worldserver/trinitycore.conf.dist
deleted file mode 100644
index 3b6d20e093d..00000000000
--- a/src/server/worldserver/trinitycore.conf.dist
+++ /dev/null
@@ -1,2212 +0,0 @@
-##########################################
-# Trinity Core worldd configuration file #
-##########################################
-# Note to devs, line breaks should be at column 80
-###############################################################################
-# CONNECTIONS AND DIRECTORIES
-#
-#    RealmID
-#        RealmID must match the realmlist inside the realmd database
-#
-#    DataDir
-#        Data directory setting.
-#        Important: DataDir needs to be quoted, as it is a string which may
-#         contain space characters.
-#        Example: "@prefix@/share/trinitycore"
-#
-#    LogsDir
-#        Logs directory setting.
-#        Important: Logs dir must exists, or all logs need to be disabled
-#        Default: "" - no log directory prefix, if used log names isn't
-#         absolute path then logs will be stored in current directory.
-#
-#
-#    LoginDatabaseInfo
-#    WorldDatabaseInfo
-#    CharacterDatabaseInfo
-#        Database connection settings for the world server.
-#        Default:
-#                    hostname;port;username;password;database
-#                    .;somenumber;username;password;database
-#                     - use named pipes in Windows
-#                    Named pipes: mySQL required adding
-#                        "enable-named-pipe" to [mysqld] section my.ini
-#                    .;/path/to/unix_socket;username;password;database
-#                     - use Unix sockets in Unix/Linux
-#
-#    MaxPingTime
-#        Settings for maximum database-ping interval (minutes between pings)
-#
-#    WorldServerPort
-#        Default WorldServerPort
-#
-#    BindIP
-#        Bind World Server to IP/hostname
-#
-###############################################################################
-
-RealmID = 1
-DataDir = "."
-LogsDir = ""
-LoginDatabaseInfo     = "127.0.0.1;3306;trinity;trinity;realmd"
-WorldDatabaseInfo     = "127.0.0.1;3306;trinity;trinity;world"
-CharacterDatabaseInfo = "127.0.0.1;3306;trinity;trinity;characters"
-MaxPingTime = 30
-WorldServerPort = 8085
-BindIP = "0.0.0.0"
-
-###############################################################################
-# SCRIPTING SETTINGS
-#
-#    Locale
-#        Setting for current (DBC) locale to use
-#
-#    EventAI Error reporting
-#        Default: 0 - Only startup
-#                 1 - Startup errors and Runtime event errors
-#                 2 - Startup errors, Runtime event errors, and Creation errors
-#
-###############################################################################
-
-Locale = 0
-EAIErrorLevel = 2
-
-###############################################################################
-# PERFORMANCE SETINGS
-#
-#    UseProcessors
-#        Processors mask for multi-processor system (Used only in Windows)
-#        Default: 0 (selected by OS)
-#                 number (bitmask value of selected processors)
-#
-#    ProcessPriority
-#        Process priority setting (Used only at Windows)
-#        Default: 1 (HIGH)
-#                 0 (Normal)
-#
-#    Compression
-#        Compression level for update packages sent to client (1..9)
-#        Default: 1 (speed)
-#                 9 (best compression)
-#
-#    PlayerLimit
-#        Maximum number of players in the world. Excluding Mods, GMs and Admins
-#        Default: 100
-#                 0 (for infinite players)
-#                 If you want to block players and enable Mods, GMs or Admins use
-#                 DB field realmd.realmlist.allowedSecurityLevel
-#
-#    SaveRespawnTimeImmediately
-#        Save respawn time for creatures at death and gameobjects at use/open
-#        Default: 1 (save creature/gameobject respawn time immediately)
-#                 0 (save creature/gameobject respawn time at grid unload)
-#
-#    MaxOverspeedPings
-#        Maximum overspeed ping count before player kick
-#         (minimum is 2, 0 used for disable check)
-#        Default: 2
-#
-#    GridUnload
-#        Unload grids
-#         (if you have lot memory you can disable it to speed up
-#         player move to new grids second time)
-#        Default: 1 (unload grids)
-#                 0 (do not unload grids)
-#
-#    SocketSelectTime
-#        Socket select time (in milliseconds)
-#        Default: 10000 (10 secs)
-#
-#    SocketTimeOutTime
-#        Time in milliseconds afer which a connection sitting idle on the character
-#        selection screen is disconnected.
-#        Default: 900000 (15 minutes)
-#
-#    SessionAddDelay
-#        Time in microseconds that a network thread will sleep after authentication
-#        protocol and adding a connection to the world session map.
-#        Default: 10000 (10 milliseconds, 0,01 second)
-#
-#    GridCleanUpDelay
-#        Grid clean up delay (in milliseconds)
-#        Default: 300000 (5 min)
-#
-#    MapUpdateInterval
-#        Map update interval (in milliseconds)
-#        Default: 100
-#
-#    ChangeWeatherInterval
-#        Weather update interval (in milliseconds)
-#        Default: 600000 (10 min)
-#
-#    PlayerSaveInterval
-#        Player save interval (in milliseconds)
-#        Default: 900000 (15 min)
-#
-#    PlayerSave.Stats.MinLevel
-#        Minimum level for saving character stats for external usage in database	
-#        Default: 0  (do not save character stats)	
-#                 1+ (save stats for characters with level 1+)	
-#
-#    PlayerSave.Stats.SaveOnlyOnLogout	
-#        Enable/Disable saving of character stats only on logout
-#        Default: 1 (only save on logout)
-#                 0 (save on every player save)
-#
-#    vmap.enableLOS
-#    vmap.enableHeight
-#        Enable/Disable VMmap support for line of sight and height calculation
-#        Default: 0 (disable)
-#                 1 (enable)
-#
-#    vmap.ignoreMapIds
-#        Map id that will be ignored by VMaps
-#         List of ids with delimiter ','
-#         If more then one id is defined and spaces are included, the string
-#         has to be enclosed by "
-#        Example: "369,0,1,530"
-#
-#    vmap.ignoreSpellIds
-#        These spells are ignored for LoS calculation
-#         List of ids with delimiter ','
-#        
-#    vmap.petLOS
-#        Check LOS for pets, to avoid them going through walls etc.
-#        Default: 0 (disable, less CPU usage)
-#                 1 (enable, each pet attack command will check for LOS)
-#    
-#    vmap.enableIndoorCheck
-#        Enable/Disable VMap based indoor check to remove outdoor-only auras (mounts etc.)
-#        Default: 0 (disabled)
-#
-#    DetectPosCollision
-#        Check final move position, summon position, etc for visible collision
-#         with other objects or wall (wall only if vmaps are enabled)
-#        Default: 1 (enable, required more CPU usage)
-#                 0 (disable, less position precision but will use less CPU)
-#
-#    TargetPosRecalculateRange
-#        Max distance from movement target point (+moving unit size) and
-#         targeted object (+size) after that new target movement point
-#         calculated. Max: melee attack range (5), min: contact range (0.5)
-#         More distance let have better performence, less distance let have
-#         more sensitive reaction at target move.
-#        Default: 1.5
-#
-#    UpdateUptimeInterval
-#        Update realm uptime period in minutes. Must be > 0
-#        Default: 10 (minutes)
-#
-#    LogDB.Opt.ClearInterval
-#        Time for the WUPDATE_CLEANDB timer that clears the `logs` table
-#         of old entries. Must be > 0.
-#        Default: 10 (minutes)
-#
-#    LogDB.Opt.ClearTime
-#        The maximum time in seconds of old `logs` table entries to keep.
-#        Default: 1209600 (14 days)
-#                 0 - don't clear
-#
-#    MaxCoreStuckTime
-#        Periodically check if the process is frozen, if this is the case
-#         force crash after the specified amount of seconds. Must be > 0.
-#         Recommended > 10 secs if you use this.
-#        Default: 0 (Disabled)
-#
-#    AddonChannel
-#        Permit/disable the use of the addon channel through the server
-#         (some client side addons will not work correctly with disabled
-#         addon channel)
-#        Default: 1 (permit addon channel)
-#                 0 (do not permit addon channel)
-#
-#    MapUpdate.Threads
-#	Number of threads to update maps.
-#	Default: 1
-#
-###############################################################################
-
-UseProcessors = 0
-ProcessPriority = 1
-Compression = 1
-PlayerLimit = 100
-SaveRespawnTimeImmediately = 1
-MaxOverspeedPings = 2
-GridUnload = 1
-SocketSelectTime = 10000
-SocketTimeOutTime = 900000
-SessionAddDelay = 10000
-GridCleanUpDelay = 300000
-MapUpdateInterval = 100
-ChangeWeatherInterval = 600000
-PlayerSaveInterval = 900000
-PlayerSave.Stats.MinLevel = 0
-PlayerSave.Stats.SaveOnlyOnLogout = 1
-vmap.enableLOS = 0
-vmap.enableHeight = 0
-vmap.ignoreMapIds = "369"
-vmap.ignoreSpellIds = "7720"
-vmap.petLOS = 0
-vmap.enableIndoorCheck = 0
-DetectPosCollision = 1
-TargetPosRecalculateRange = 1.5
-UpdateUptimeInterval = 10
-LogDB.Opt.ClearInterval = 10
-LogDB.Opt.ClearTime = 1209600
-MaxCoreStuckTime = 0
-AddonChannel = 1
-MapUpdate.Threads = 1
-
-###############################################################################
-# SERVER LOGGING
-#
-#    LogSQL
-#        Enable logging of SQL commands from in game
-#         All commands are written to a file: YYYY-MM-DD_logSQL.sql
-#         If a new day starts (00:00:00) then a new file is created
-#         the old file will not be deleted.
-#        Default: 1 - Write SQL code to logfile
-#                 0 - Do not log
-#
-#    PidFile
-#        World daemon PID file
-#        Default: ""             - do not create PID file
-#                 "./worldd.pid" - create PID file (recommended name)
-#
-#    LogLevel
-#        Server console level of logging
-#                 0 = Minimum
-#        Default: 1 = Basic
-#                 2 = Detail
-#                 3 = Full/Debug
-#
-#    LogFile
-#        Logfile name
-#        Default: "Server.log"
-#                 "" - Empty name disable creating log file
-#
-#    ChatLogFile
-#        Log file for chat logs
-#        Default: "chat.log"
-#                 "" - Empty name for disable
-#
-#    LogTimestamp
-#        Logfile with timestamp of server start in name
-#         in form Logname_YYYY-MM-DD_HH-MM-SS.Ext for Logname.Ext
-#        Default: 0 - no timestamp in name
-#                 1 - add timestamp in name
-#
-#    LogFileLevel
-#        Server file level of logging
-#        Default: 0 = Minimum
-#                 1 = Basic
-#                 2 = Detail
-#                 3 = Full/Debug
-#
-#    LogFilter_AchievementUpdates
-#    LogFilter_CreatureMoves
-#    LogFilter_TransportMoves
-#    LogFilter_VisibilityChanges
-#        Log filters
-#        Default: 1 - not include with any log level
-#                 0 - include in log if log level permit
-#
-#    WorldLogFile
-#        Packet logging file for the worldserver
-#        Default: "world.log"
-#
-#    DBErrorLogFile
-#        Log file of DB errors detected at server run
-#        Default: "DBErrors.log"
-#
-#    CharLogFile
-#        Character operations logfile name
-#        Default: "Char.log"
-#                 "" - Empty name disable creating log file
-#
-#    CharLogTimestamp
-#        Logfile with timestamp of server start in name
-#         in form Logname_YYYY-MM-DD_HH-MM-SS.Ext for Logname.Ext
-#        Default: 0 - no timestamp in name
-#                 1 - add timestamp in name
-#
-#    CharLogDump
-#        Write character dump before deleting in Char.log
-#         For restoration, cut character data from log starting from
-#         line == START DUMP == to line == END DUMP == (exclusive) in file
-#         and load it using the loadpdump command
-#        Default: 0 - don't include dumping chars to log
-#                 1 - include dumping chars to log
-#    CharLogDump.Separate
-#        Write character dump to separate file
-#        Default: 0 - don't write dump to separate file
-#                 1 - write each dump to separate file
-#
-#    CharLogDump.SeparateDir
-#        Subdirectory within logs dir for separate char dumps.
-#
-#
-#    GmLogFile
-#        Log file of gm commands
-#        Default: "gm_commands.log"
-#                 "" - Empty name for disable
-#
-#    GmLogTimestamp
-#        GM Logfile with timestamp of server start in name
-#         in form Logname_YYYY-MM-DD_HH-MM-SS.Ext for Logname.Ext
-#        Default: 0 - no timestamp in name
-#                 1 - add timestamp in name
-#
-#    GmLogPerAccount
-#        GM Logfiles with GM account id
-#         (Note: logs not created if GmLogFile not set)
-#        Default: 0 - add gm log data to single log file
-#                 1 - add gm log data to account specific log files with name
-#                     in form Logname_#ID_YYYY-MM-DD_HH-MM-SS.Ext
-#                     or form Logname_#ID.Ext
-#
-#    RaLogFile
-#        Log file of RA commands
-#        Default: "Ra.log"
-#                 "" - Empty name for disable
-#
-#    ArenaLogFile
-#        Log file of arena fights and arena team creations
-#        Default: "" - do not create arena log file
-#
-#    LogColors
-#        Color for messages (format "normal basic detail debug")
-#        Default: "" - no colors
-#        Colors: 0  - BLACK
-#                1  - RED
-#                2  - GREEN
-#                3  - BROWN
-#                4  - BLUE
-#                5  - MAGENTA
-#                6  - CYAN
-#                7  - GREY
-#                8  - YELLOW
-#                9  - LRED
-#                10 - LGREEN
-#                11 - LBLUE
-#                12 - LMAGENTA
-#                13 - LCYAN
-#                14 - WHITE
-#        Example: "13 11 9 5"
-#
-#    EnableLogDB
-#        Enable/disable logging to database (LogDatabaseInfo).
-#        Default: 0 - disabled
-#                 1 - enabled
-#
-#    DBLogLevel
-#        Log level of DB logging.
-#                 0 = Minimum
-#                 1 = Basic
-#                 2 = Detail
-#        Default: 3 = Full/Debug
-#
-#    LogDB.Char
-#        Enable/disable logging character outputs to DB.
-#        Default: 0 - off
-#                 1 - on
-#
-#    LogDB.GM
-#        Enable/disable logging GM commands to DB.
-#        Default: 0 - off
-#                 1 - on
-#
-#    LogDB.RA
-#        Enable/disable logging remote access events to DB.
-#        Default: 0 - off
-#                 1 - on
-#
-#    LogDB.World
-#        Enable/disable logging world packets to DB.
-#        Default: 0 - off
-#                 1 - on (very heavy)
-#
-#    LogDB.Chat
-#        Enable/disable logging chat messages to the database.
-#        Default: 0 - off
-#                 1 - on
-#
-#    ChatLogs.Channel
-#        Enable logging chatting in custom channels.
-#        Default: 0 - off
-#                 1 - on
-#
-#    ChatLogs.Whisper
-#        Enable logging whispers between players.
-#        Default: 0 - off
-#                 1 - on
-#
-#    ChatLogs.Party
-#        Enable logging party messages.
-#        Default: 0 - off
-#                 1 - on
-#
-#    ChatLogs.Raid
-#        Enable logging raid messages.
-#        Default: 0 - off
-#                 1 - on
-#
-#    ChatLogs.Guild
-#        Enable logging guild messages.
-#        Default: 0 - off
-#                 1 - on
-#
-#    ChatLogs.Public
-#        Enable logging public chat events (say/yell/emote).
-#        Default: 0 - off
-#                 1 - on
-#
-#    ChatLogs.Addon
-#        Enable logging addon messages.
-#        Default: 0 - off
-#                 1 - on
-#
-#    ChatLogs.BattleGround
-#        Enable logging battleground chats.
-#        Default: 0 - off
-#                 1 - on
-#
-#    ChatLogTimestamp
-#        Chat Logfile with timestamp of server start in name
-#         in form Logname_YYYY-MM-DD_HH-MM-SS.Ext for Logname.Ext
-#        Default: 0 - no timestamp in name
-#                 1 - add timestamp in name
-#
-###############################################################################
-
-LogSQL = 1
-PidFile = ""
-LogLevel = 1
-LogFile = "Server.log"
-ChatLogFile = "chat.log"
-LogTimestamp = 0
-LogFileLevel = 0
-LogFilter_AchievementUpdates = 1
-LogFilter_CreatureMoves = 1
-LogFilter_TransportMoves = 1
-LogFilter_VisibilityChanges = 1
-WorldLogFile = ""
-DBErrorLogFile = "db_errors.log"
-CharLogFile = "characters.log"
-CharLogTimestamp = 0
-CharLogDump = 0
-CharLogDump.Separate = 0
-CharLogDump.SeparateDir = ""
-GmLogFile = "gm_commands.log"
-GmLogTimestamp = 0
-GmLogPerAccount = 0
-RaLogFile = "ra_commands.log"
-ArenaLogFile = ""
-LogColors = ""
-EnableLogDB = 0
-DBLogLevel = 2
-LogDB.Char   = 0
-LogDB.GM     = 0
-LogDB.RA     = 0
-LogDB.World  = 0
-LogDB.Chat   = 0
-ChatLogs.Channel      = 0
-ChatLogs.SysChan      = 0
-ChatLogs.Whisper      = 0
-ChatLogs.Party        = 0
-ChatLogs.Raid         = 0
-ChatLogs.Guild        = 0
-ChatLogs.Public       = 0
-ChatLogs.Addon        = 0
-ChatLogs.BattleGround = 0
-ChatLogTimestamp = 0
-
-###############################################################################
-# SERVER SETTINGS
-#
-#    GameType
-#        Server realm style
-#        Default: 0 = NORMAL
-#                 1 = PVP
-#                 4 = NORMAL
-#                 6 = RP
-#                 8 = RPPVP
-#                 16 FFA_PVP (free for all pvp mode like arena PvP in all
-#                     zones except rest activated places and sanctuaries)
-#
-#    RealmZone
-#        Server realm zone (set allowed alphabet in character names/etc)
-#         See also Strict*Names options.
-#
-#        Default: 1 Development    - any language
-#                 2 United States  - extended-Latin
-#                 3 Oceanic        - extended-Latin
-#                 4 Latin America  - extended-Latin
-#                 5 Tournament     - basic-Latin at create, any at login
-#                 6 Korea          - East-Asian
-#                 7 Tournament     - basic-Latin at create, any at login
-#                 8 English        - extended-Latin
-#                 9 German         - extended-Latin
-#                 10 French        - extended-Latin
-#                 11 Spanish       - extended-Latin
-#                 12 Russian       - Cyrillic
-#                 13 Tournament    - basic-Latin at create, any at login
-#                 14 Taiwan        - East-Asian
-#                 15 Tournament    - basic-Latin at create, any at login
-#                 16 China         - East-Asian
-#                 17 CN1           - basic-Latin at create, any at login
-#                 18 CN2           - basic-Latin at create, any at login
-#                 19 CN3           - basic-Latin at create, any at login
-#                 20 CN4           - basic-Latin at create, any at login
-#                 21 CN5           - basic-Latin at create, any at login
-#                 22 CN6           - basic-Latin at create, any at login
-#                 23 CN7           - basic-Latin at create, any at login
-#                 24 CN8           - basic-Latin at create, any at login
-#                 25 Tournament    - basic-Latin at create, any at login
-#                 26 Test Server   - any language
-#                 27 Tournament    - basic-Latin at create, any at login
-#                 28 QA Server     - any language
-#                 29 CN9           - basic-Latin at create, any at login
-#
-#    Expansion
-#        Allow server use content from expansion
-#        Default: 2 - check expansion 2 maps existence, and if client support
-#                      expansion 2 and account have expansion 2 setting then
-#                      allow visit expansion 2 maps, allow create new class
-#                      character)
-#                 1 - check expansion 1 maps existence, and if client support
-#                      expansion 1 and account have expansion 1 setting then
-#                      allow visit expansion 1 maps, allow create new races
-#                      character)
-#                 0 - don't check expansion maps existence, don't allow visit
-#                      maps, don't allow create new race or new class
-#                      characters, ignore account expansion setting)
-#
-#    DBC.Locale
-#        DBC Language Settings
-#        Default: 255 = Auto Detect
-#                 0   = English
-#                 1   = Korean
-#                 2   = French
-#                 3   = German
-#                 4   = Chinese
-#                 5   = Taiwanese
-#                 6   = Spanish
-#                 7   = Spanish Mexico
-#                 8   = Russian
-#
-#    DeclinedNames
-#        Allow russian clients to set and use declined names
-#        Default: 0 - do not use declined names, except when
-#                      the Russian RealmZone is set
-#                 1 - use declined names
-#
-#    StrictPlayerNames
-#        Limit player name to language specific symbol set, don't allow
-#         character creation, and set rename request and disconnect at not
-#         allowed symbols name
-#        Default: 0 disable (limited server timezone dependent client check)
-#                 1 basic latin characters  (strict)
-#                 2 realm zone specific (strict). See RealmZone setting.
-#                   Note: In any case if you want correctly see character
-#                   name at client this client must have appropriate fonts
-#                   (included in client by default, with active official
-#                   localization or custom localization fonts in
-#                   clientdir/Fonts).
-#                 3 basic latin characters + server timezone specific
-#
-#    StrictCharterNames
-#        Limit guild/arena team charter names to language specific symbol set,
-#          don't allow charter creation with unallowed symbols in name
-#        Default: 0 disable
-#                 1 basic latin characters  (strict)
-#                 2 realm zone specific (strict). See RealmZone setting.
-#                   Note: In any case if you want correctly see character
-#                   name at client this client must have appropriate fonts
-#                   (included in client by default, with active official
-#                   localization or custom localization fonts in
-#                   clientdir/Fonts).
-#                 3 basic latin characters + server timezone specific
-#
-#    StrictPetNames
-#        Limit pet names to language specific symbols set
-#        Default: 0 disable
-#                 1 basic latin characters  (strict)
-#                 2 realm zone specific (strict). See RealmZone setting.
-#                   Note: In any case if you want correctly see character
-#                   name at client this client must have appropriate fonts
-#                   (included in client by default, with active official
-#                   localization or custom localization fonts in
-#                   clientdir/Fonts).
-#                 3 basic latin characters + server timezone specific
-#
-#    MinPlayerName
-#        Minimal name length (1..12)
-#        Default: 2
-#
-#    MinCharterName
-#        Minimal name length (1..24)
-#        Default: 2
-#
-#    MinPetName
-#        Minimal name length (1..12)
-#        Default: 2
-#
-#    CharactersCreatingDisabled
-#        Disable characters creating for specific team or any
-#         (non-player accounts not affected)
-#        Default: 0 - enabled
-#                 1 - disabled only for Alliance
-#                 2 - disabled only for Horde
-#                 3 - disabled for both teams
-#
-#    MaxWhoListReturns
-#        Set the max number of players returned in the /who list and interface.
-#        Default: 49 (stable)
-#
-#    CharactersPerAccount
-#        Limit numbers of characters per account (at all realms).
-#         Note: this setting limit character creating at _current_ realm base
-#         at characters amount at all realms
-#        Default: 50
-#                The number must be >= CharactersPerRealm
-#
-#    CharactersPerRealm
-#        Limit numbers of characters for account at realm
-#        Default: 10 (client limitation)
-#                The number must be between 1 and 10
-#
-#    HeroicCharactersPerRealm
-#        Limit numbers of heroic class characters for account at realm
-#        Default: 1
-#                The number must be between 0 (not allowed) and 10
-#
-#    MinLevelForHeroicCharacterCreating
-#        Limit creating heroic characters only for account with another
-#         character of specific level (ignored for GM accounts)
-#                 0  - not require any existed chaarcter
-#                 1  - require at least any character existed
-#        Default: 55 - default requirement
-#
-#
-#    SkipCinematics
-#        Disable in-game script movie at first character's login
-#         (allows to prevent buggy intro in case of custom start
-#         location coordinates)
-#        Default: 0 - show intro for each new characrer
-#                 1 - show intro only for first character of selected race
-#                 2 - disable intro show in all cases
-#
-#    MaxPlayerLevel
-#        Max level that can be reached by player for experience
-#         (in range from 1 to 100). Going past 100 voids your warranty
-#         and you will not receive support for bugs you encounter.
-#        Change not recommended
-#        Default: 80
-#
-#    MinDualSpecLevel
-#        Min level at which players can use Dual Spec functionality
-#        Default: 40
-#
-#    StartPlayerLevel
-#        Staring level that have character upon creation
-#         (in range 1 to MaxPlayerLevel)
-#        Default: 1
-#
-#    StartHeroicPlayerLevel
-#        Staring level that have character of heroic class upon creation
-#         (in range 1 to MaxPlayerLevel)
-#        Default: 55
-#
-#    StartPlayerMoney
-#        Amount of money that new players will start with.
-#         If you want to start with silver, use for example 100
-#         (100 copper = 1 silver)
-#        Default: 0
-#
-#    MaxHonorPoints
-#        Max honor points that player can have.
-#        Default: 75000
-#
-#    StartHonorPoints
-#        Amount of honor that new players will start with
-#        Default: 0
-#
-#    MaxArenaPoints
-#        Max arena points that player can have.
-#        Default: 5000
-#
-#    StartArenaPoints
-#        Amount of arena points that new players will start with
-#        Default: 0
-#
-#    InstantLogout
-#        Enable or disable instant logout for security level (0..4) or higher
-#        (NOT in combat/while dueling/while falling)
-#        Default: 1 (Mods/GMs/Admins)
-#
-#    DisableWaterBreath
-#        Disable/enable waterbreathing for security level (0..4) or higher
-#        Default: 4 (None)
-#
-#    AllFlightPaths
-#        Players will start with all flight paths
-#         (Note: ALL flight paths, not only player's team)
-#        Default: 0 (false)
-#                 1 (true)
-#
-#    InstantFlightPaths
-#        Flight paths will take players to their destination instantly, instead
-#         of making them wait to fly there.
-#        Default: 0 (false)
-#                 1 (true)
-#
-#    AlwaysMaxSkillForLevel
-#        Players will automatically gain max level dependent (weapon/defense)
-#         skill when logging in, leveling up etc.
-#        Default: 0 (false)
-#                 1 (true)
-#
-#    ActivateWeather
-#        Activate weather system
-#        Default: 1 (true)
-#                 0 (false)
-#
-#    CastUnstuck
-#        Allow cast or not Unstuck spell at .start or client Help option use
-#        Default: 1 (true)
-#                 0 (false)
-#
-#    Instance.IgnoreLevel
-#        Ignore level requirement to enter instance
-#        Default: 0 (false)
-#                 1 (true)
-#
-#    Instance.IgnoreRaid
-#        Ignore raid requirement to enter instance
-#        Default: 0 (false)
-#                 1 (true)
-#
-#    Instance.ResetTimeHour
-#        The hour of the day (0-23) when the global instance resets occur.
-#        Default: 4
-#
-#    Instance.UnloadDelay
-#        Unload the instance map from memory after some time
-#         if no players are inside.
-#        Default: 1800000 (miliseconds 30 minutes)
-#                 0 (instance maps are kept in memory until they are reset)
-#
-#    Quests.LowLevelHideDiff
-#        Quest level difference to hide for player low level quests:
-#         if player_level > quest_level + LowLevelQuestsHideDiff then quest
-#         "!" mark not show for quest giver
-#        Default: 4
-#                -1 (show all available quests marks)
-#
-#    Quests.HighLevelHideDiff
-#        Quest level difference to hide for player high level quests:
-#         if player_level < quest_min_level - HighLevelQuestsHideDiff then
-#         quest "!" mark not show for quest giver
-#        Default: 7
-#                -1 (show all available quests marks)
-#
-#    Guild.EventLogRecordsCount
-#        Count of guild event log records stored in guild_eventlog table
-#         Increase to store more guild events in table, minimum is 100
-#         You can set it to very high value to prevent oldest guild events to
-#         be rewritten by latest guild events; can slow down performance
-#        Default: 100
-#
-#    Guild.BankEventLogRecordsCount
-#        Count of guild_bank event log records stored in
-#         guild_bank_eventlog table
-#         Increase to store more guild_bank events in table - minimum is 25
-#         (GUILD_BANK_MAX_LOGS) for each guild_bank tab
-#         Useful when you don't want old log events to be overwritten by new,
-#         but increasing can slow down performance
-#        Default: 25
-#
-#    MaxPrimaryTradeSkill
-#        Max count that player can learn the primary trade skill.
-#        Default: 2
-#        Max : 10
-#
-#    MinPetitionSigns
-#        Min signatures count to creating guild (0..9).
-#        Default: 9
-#
-#    MaxGroupXPDistance
-#        Max distance to creature for group member to get XP at creature death.
-#        Default: 74
-#
-#    MailDeliveryDelay
-#        Mail delivery delay time for item sending
-#        Default: 3600 sec (1 hour)
-#
-#    SkillChance.Prospecting
-#        For prospecting skillup impossible by default,
-#         but can be allowed as custom setting
-#        Default: 0 - no skilups
-#                 1 - skilups possible
-#
-#    SkillChance.Milling
-#        For milling skillup impossible by default,
-#         but can be allowed as custom setting
-#        Default: 0 - no skilups
-#                 1 - skilups possible
-#
-#    OffhandCheckAtSpellUnlearn
-#        Unlearning certain spells can change offhand weapon restrictions
-#         for equip slots.
-#        Default: 0 - recheck offhand slot weapon only at zone update
-#                 1 - recheck offhand slot weapon at unlearning a spell
-#
-#    ClientCacheVersion
-#        Client cache version for client cache data reset. Use any different
-#         from DB value and not recently used for triggering reset.
-#        Default: 0 (use DB value from world DB db_version.cache_id field)
-#
-#    Event.Announce
-#        Default: 0 (false)
-#                 1 (true)
-#
-#    BeepAtStart
-#        Beep at core start finished (mostly work only at Unix/Linux systems)
-#        Default: 1 (true)
-#                 0 (false)
-#
-#    Motd
-#        Message of the Day. Displayed at worldlogin for every user
-#         Use '@' for a newline, and be sure to escape special characters.
-#        Example: "Welcome to John\'s Server@WinterGrasp is closed."
-#
-#    Server.LoginInfo
-#        Enable/disable sending server info (core version) on login.
-#        Default: 0 - disable
-#                 1 - enable
-#
-###############################################################################
-
-GameType = 0
-RealmZone = 1
-Expansion = 2
-DBC.Locale = 255
-DeclinedNames = 0
-StrictPlayerNames = 0
-StrictCharterNames = 0
-StrictPetNames = 0
-MaxWhoListReturns = 49
-MinPlayerName = 2
-MinCharterName = 2
-MinPetName = 2
-CharactersCreatingDisabled = 0
-CharactersPerAccount = 50
-CharactersPerRealm = 10
-HeroicCharactersPerRealm = 1
-MinLevelForHeroicCharacterCreating = 55
-SkipCinematics = 0
-MaxPlayerLevel = 80
-MinDualSpecLevel = 40
-StartPlayerLevel = 1
-StartHeroicPlayerLevel = 55
-StartPlayerMoney = 0
-MaxHonorPoints = 75000
-StartHonorPoints = 0
-MaxArenaPoints = 5000
-StartArenaPoints = 0
-InstantLogout = 1
-DisableWaterBreath = 4
-AllFlightPaths = 0
-InstantFlightPaths = 0
-AlwaysMaxSkillForLevel = 0
-ActivateWeather = 1
-CastUnstuck = 1
-Instance.IgnoreLevel = 0
-Instance.IgnoreRaid = 0
-Instance.ResetTimeHour = 4
-Instance.UnloadDelay = 1800000
-Quests.LowLevelHideDiff = 4
-Quests.HighLevelHideDiff = 7
-Guild.EventLogRecordsCount = 100
-Guild.BankEventLogRecordsCount = 25
-MaxPrimaryTradeSkill = 2
-MinPetitionSigns = 9
-MaxGroupXPDistance = 74
-MailDeliveryDelay = 3600
-SkillChance.Prospecting = 0
-SkillChance.Milling = 0
-OffhandCheckAtSpellUnlearn = 0
-ClientCacheVersion = 0
-Event.Announce = 0
-BeepAtStart = 1
-Motd = "Welcome to a Trinity Core server."
-Server.LoginInfo = 0
-
-###############################################################################
-# PLAYER INTERACTION
-#
-#    AllowTwoSide.Accounts
-#        Allow or not accounts to create characters in the 2 teams
-#         in any game type.
-#        Default: 1 (Allowed)
-#                 0 (Not allowed)
-#
-#    AllowTwoSide.Interaction.Chat
-#    AllowTwoSide.Interaction.Channel
-#    AllowTwoSide.Interaction.Group
-#    AllowTwoSide.Interaction.Guild
-#    AllowTwoSide.Interaction.Auction
-#    AllowTwoSide.Interaction.Mail
-#        Allow or not common :chat(say,yell)
-#                             channel(chat)
-#                             group(join)
-#                             guild(join)
-#                             merge all auction houses for players from
-#                             different teams
-#                             send mail to other team.
-#        Default: 0 (Not allowed)
-#                 1 (Allowed)
-#
-#    AllowTwoSide.WhoList
-#        Allow or not show player from both team in who list.
-#        Default: 0 (Not allowed)
-#                 1 (Allowed)
-#
-#    AllowTwoSide.AddFriend
-#        Allow or not adding friends from other team in friend list.
-#        Default: 0 (Not allowed)
-#                 1 (Allowed)
-#
-#    AllowTwoSide.Trade
-#        Allow or not trading with other team in party.
-#        Default: 0 (Not allowed)
-#                 1 (Allowed)
-#
-#    TalentsInspecting
-#        Allow other players see character talents in inspect dialog
-#         (Characters in Gamemaster mode can inspect talents always)
-#        Default: 1 (allow)
-#                 0 (not allow)
-#
-###############################################################################
-
-AllowTwoSide.Accounts = 1
-AllowTwoSide.Interaction.Chat = 0
-AllowTwoSide.Interaction.Channel = 0
-AllowTwoSide.Interaction.Group = 0
-AllowTwoSide.Interaction.Guild = 0
-AllowTwoSide.Interaction.Auction = 0
-AllowTwoSide.Interaction.Mail = 0
-AllowTwoSide.WhoList = 0
-AllowTwoSide.AddFriend = 0
-AllowTwoSide.Trade = 0
-TalentsInspecting = 1
-
-###############################################################################
-# CREATURE SETTINGS
-#
-#    ThreatRadius
-#        Radius for creature to evade after being
-#         pulled away from combat start point
-#         If ThreatRadius is less than creature aggro radius
-#         then aggro radius will be used
-#        Default: 60 yards
-#
-#    Rate.Creature.Aggro
-#        Aggro radius percent or off.
-#        Default: 1   - 100%
-#                 1.5 - 150%
-#                 0   - off (0%)
-#
-#    CreatureFamilyFleeAssistanceRadius
-#        Radius which creature will use to seek for a nearby creature
-#         for assistance. Creature will flee to this creature.
-#        Default: 30
-#                 0   - off
-#
-#    CreatureFamilyAssistanceRadius
-#        Radius which creature will use to call assistance without moving
-#        Default: 10
-#                 0   - off
-#
-#    CreatureFamilyAssistanceDelay
-#        Reaction time for creature assistance call
-#        Default: 1500 (1.5s)
-#
-#    CreatureFamilyFleeDelay
-#        Time during which creature can flee when no assistant found
-#        Default: 7000 (7s)
-#
-#    WorldBossLevelDiff
-#        Difference for boss dynamic level with target
-#        Default: 3
-#
-#    Corpse.Decay.NORMAL
-#    Corpse.Decay.RARE
-#    Corpse.Decay.ELITE
-#    Corpse.Decay.RAREELITE
-#    Corpse.Decay.WORLDBOSS
-#        Seconds until creature corpse will decay if not looted or skinned.
-#        Default: 60, 300, 300, 300, 3600
-#
-#    Rate.Corpse.Decay.Looted
-#         Controls how long the creature corpse stays after it had been looted,
-#          as a multiplier of its Corpse.Decay.* config.
-#         Default: 0.5
-#
-#    Rate.Creature.Normal.Damage
-#    Rate.Creature.Elite.Elite.Damage
-#    Rate.Creature.Elite.RAREELITE.Damage
-#    Rate.Creature.Elite.WORLDBOSS.Damage
-#    Rate.Creature.Elite.RARE.Damage
-#        Creature Damage Rates.
-#        Examples: 2 - creatures will damage 2x, 1.7 - 1.7x.
-#
-#    Rate.Creature.Normal.SpellDamage
-#    Rate.Creature.Elite.Elite.SpellDamage
-#    Rate.Creature.Elite.RAREELITE.SpellDamage
-#    Rate.Creature.Elite.WORLDBOSS.SpellDamag
-#    Rate.Creature.Elite.RARE.SpellDamage
-#        Creature Spell Damage Rates.
-#        Examples: 2 - creatures will damage with spells 2x, 1.7 - 1.7x.
-#
-#    Rate.Creature.Normal.HP
-#    Rate.Creature.Elite.Elite.HP
-#    Rate.Creature.Elite.RAREELITE.HP
-#    Rate.Creature.Elite.WORLDBOSS.HP
-#    Rate.Creature.Elite.RARE.HP
-#        Creature Health Ammount Modifier.
-#        Examples: 2 - creatures have 2x health, 1.7 - 1.7x.
-#
-#    ListenRange.Say
-#        Distance from player to listen text that creature
-#         (or other world object) says
-#        Default: 40
-#
-#    ListenRange.TextEmote
-#        Distance from player to listen textemote that creature
-#         (or other world object) says
-#        Default: 40
-#
-#    ListenRange.Yell
-#        Distance from player to listen text that creature
-#         (or other world object) yells
-#        Default: 300
-#
-###############################################################################
-
-ThreatRadius = 60
-Rate.Creature.Aggro = 1
-CreatureFamilyFleeAssistanceRadius = 30
-CreatureFamilyAssistanceRadius = 10
-CreatureFamilyAssistanceDelay = 1500
-CreatureFamilyFleeDelay = 7000
-WorldBossLevelDiff = 3
-Corpse.Decay.NORMAL = 60
-Corpse.Decay.RARE = 300
-Corpse.Decay.ELITE = 300
-Corpse.Decay.RAREELITE = 300
-Corpse.Decay.WORLDBOSS = 3600
-Rate.Corpse.Decay.Looted = 0.5
-Rate.Creature.Normal.Damage = 1
-Rate.Creature.Elite.Elite.Damage = 1
-Rate.Creature.Elite.RAREELITE.Damage = 1
-Rate.Creature.Elite.WORLDBOSS.Damage = 1
-Rate.Creature.Elite.RARE.Damage = 1
-Rate.Creature.Normal.SpellDamage = 1
-Rate.Creature.Elite.Elite.SpellDamage = 1
-Rate.Creature.Elite.RAREELITE.SpellDamage = 1
-Rate.Creature.Elite.WORLDBOSS.SpellDamage = 1
-Rate.Creature.Elite.RARE.SpellDamage = 1
-Rate.Creature.Normal.HP = 1
-Rate.Creature.Elite.Elite.HP = 1
-Rate.Creature.Elite.RAREELITE.HP = 1
-Rate.Creature.Elite.WORLDBOSS.HP = 1
-Rate.Creature.Elite.RARE.HP = 1
-ListenRange.Say = 40
-ListenRange.TextEmote = 40
-ListenRange.Yell = 300
-
-###############################################################################
-# CHAT SETTINGS
-#
-#    ChatFakeMessagePreventing
-#        Chat protection from creating fake messages using a lot spaces
-#         (other invisible symbols),
-#         not applied to addon language messages, but can cause old addons
-#         that use normal languages for sending data to another clients.
-#        Default: 0 (disible fake messages preventing)
-#                 1 (enabled fake messages preventing)
-#
-#    ChatStrictLinkChecking.Severity
-#        Check chat messages for ingame links to
-#         spells, items, quests, achievements etc.
-#        Default: 0 (disable link checking)
-#                 1 (check if only valid pipe commands are used.
-#                    This prevents posting pictures for example)
-#                 2 (verifiy that pipe commands are used in a correct order)
-#                 3 (check if color, entry and name don't contradict
-#                    each other. For correct work, please assure
-#                    that you have extracted locale DBCs of every language
-#                    specific client playing on this server.)
-#
-#    ChatStrictLinkChecking.Kick
-#        Defines what should be done if a message is considered to contain
-#         invalid pipe commands.
-#        Default: 0 (silently ignore message)
-#                 1 (kick players who sent invalid formed messages)
-#
-#    ChatFlood.MessageCount
-#        Chat anti-flood protection, haste message count to activate protection
-#        Default: 10
-#                 0 (disible anti-flood protection)
-#
-#    ChatFlood.MessageDelay
-#        Chat anti-flood protection, minimum message delay to count message
-#        Default: 1 (in secs)
-#
-#    ChatFlood.MuteTime
-#        Chat anti-flood protection, mute time at activation flood protection
-#        Default: 10 (in secs)
-#
-#    Channel.RestrictedLfg
-#        Restrict LookupForGroup channel to registered in LFG tool players
-#        Default: 1 (allow join to channel only if active in LFG)
-#                 0 (allow join to channel in any time)
-#
-#    Channel.SilentlyGMJoin
-#        Silently join GM characters (security level > 1) to channels
-#        Default: 0 (join announcement in normal way)
-#                 1 (GM join without announcement)
-#
-#    ChatLevelReq.Channel
-#        The required level of character to be able to write in chat channels
-#        Default: 1 (From level 1)
-#
-#    ChatLevelReq.Whisper
-#        The required level of character to be able to whisper
-#        Default: 1 (From level 1)
-#
-#    ChatLevelReq.Say
-#        The required level of character to be able to say/yell/emote
-#        Default: 1 (From level 1)
-#
-#    AllowPlayerCommands
-#        Allowed the players to use commands
-#        Default: 1 (allow)
-#
-###############################################################################
-
-ChatFakeMessagePreventing = 0
-ChatStrictLinkChecking.Severity = 0
-ChatStrictLinkChecking.Kick = 0
-ChatFlood.MessageCount = 10
-ChatFlood.MessageDelay = 1
-ChatFlood.MuteTime = 10
-Channel.RestrictedLfg = 1
-Channel.SilentlyGMJoin = 0
-ChatLevelReq.Channel = 1
-ChatLevelReq.Whisper = 1
-ChatLevelReq.Say = 1
-AllowPlayerCommands = 1
-
-###############################################################################
-# GAME MASTER SETTINGS
-#
-#    GM.LoginState
-#        GM mode at login
-#        Default: 2 (last save state)
-#                 0 (disable)
-#                 1 (enable)
-#
-#    GM.Visible
-#        GM visibility at login
-#        Default: 2 (last save state)
-#                 0 (invisible)
-#                 1 (visible)
-#
-#    GM.AcceptTickets
-#        Is GM accepting tickets from player by default or not.
-#        Default: 2 (last save state)
-#                 0 (disable)
-#                 1 (enable)
-#
-#    GM.Chat
-#        GM chat mode at login
-#        Default: 2 (last save state)
-#                 0 (disable)
-#                 1 (enable)
-#
-#    GM.WhisperingTo
-#        Is GM accepting whispers from player by default or not.
-#        Default: 2 (last save state)
-#                 0 (disable)
-#                 1 (enable)
-#
-#    GM.InGMList.Level
-#        Max GM level showed in GM list (if visible) in non-GM state (.gm off)
-#                 0 (only players)
-#                 1 (only moderators)
-#                 2 (only gamemasters)
-#        Default: 3 (anyone)
-#
-#    GM.InWhoList.Level
-#        Max GM level showed in who list (if visible).
-#                 0 (only players)
-#                 1 (only moderators)
-#                 2 (only gamemasters)
-#        Default: 3 (anyone)
-#
-#    GM.LogTrade
-#        Include GM trade and trade slot enchanting operations in GM log
-#        Default: 1 (include)
-#                 0 (not include)
-#
-#    GM.StartLevel
-#        GM starting level (1-100)
-#        Default: 1
-#
-#    GM.AllowInvite
-#        Is GM accepting invites from players by default or not
-#        Default: 0 (false)
-#                 1 (true)
-#
-#    GM.AllowFriend
-#        Are players allowed to add GMs to their friend list
-#        Default: 0 (false)
-#                 1 (true)
-#
-#    GM.LowerSecurity
-#        Disallow a lower security member to interact with
-#         a higher one using commands
-#        Default: 0 (disable)
-#                 1 (enable)
-#
-#    GM.AllowAchievementGain
-#        If enabled it allows gaining achievements for GM characters
-#        Default: 1 (enable)
-#                 0 (disable)
-#
-###############################################################################
-
-GM.LoginState            = 2
-GM.Visible               = 2
-GM.AcceptTickets         = 2
-GM.Chat                  = 2
-GM.WhisperingTo          = 2
-GM.InGMList.Level        = 3
-GM.InWhoList.Level       = 3
-GM.LogTrade              = 1
-GM.StartLevel            = 80
-GM.AllowInvite           = 0
-GM.AllowFriend           = 0
-GM.LowerSecurity         = 0
-GM.AllowAchievementGain  = 1
-
-###############################################################################
-# VISIBILITY AND RADIUSES
-#
-#    Visibility.GroupMode
-#        Group visibility modes
-#        Default: 0 (standard setting: only members from same group can
-#                    100% auto detect invisible player)
-#                 1 (raid members 100% auto detect invisible player from
-#                    same raid)
-#                 2 (players from same team can 100% auto detect
-#                    invisible player)
-#
-#    Visibility.Distance.Continents
-#    Visibility.Distance.Instances
-#    Visibility.Distance.BGArenas
-#        Visibility distance for different ingame object in different maps.
-#        Visibility on continents on offy ~90 yards. In BG/Arenas ~180.
-#        For instances default ~120.
-#        Max limited by active player zone: ~ 333
-#        Min limit is max aggro radius (45) * Rate.Creature.Aggro
-#
-#    Visibility.Distance.Object
-#        Visible distance for gameobject, dynobject, bodies, corpses, bones
-#        Min limit is iteraction distance (5)
-#
-#    Visibility.Distance.InFlight
-#        Visible distance for player in flight
-#        Min limit is 0 (not show any objects)
-#
-#    Visibility.Distance.Grey.Unit
-#        Visibility grey distance for creatures/players (fast changing objects)
-#         addition to appropriate object type Visibility.Distance.* use in case
-#         visibility removing to object (except corpse around distances)
-#         If D is distance and G is grey distance then object
-#         make visible if distance to it <= D
-#         but make non visible if distance > D+G
-#        Default: 1 (yard)
-#
-#    Visibility.Distance.Grey.Object
-#        Visibility grey distance for dynobjects/gameobjects/corpses/creatures
-#        Default: 10 (yards)
-#
-###############################################################################
-
-Visibility.GroupMode = 0
-Visibility.Distance.Continents = 90
-Visibility.Distance.Instances = 120
-Visibility.Distance.BGArenas = 180
-Visibility.Distance.Object = 100
-Visibility.Distance.InFlight = 100
-Visibility.Distance.Grey.Unit   = 1
-Visibility.Distance.Grey.Object = 10
-
-Visibility.Notify.Period.OnContinents = 1000
-Visibility.Notify.Period.InInstances  = 1000
-Visibility.Notify.Period.InBGArenas   = 1000
-
-###############################################################################
-# SERVER RATES
-#
-#    Rate.Health
-#    Rate.Mana
-#    Rate.Rage.Income
-#    Rate.Rage.Loss
-#    Rate.RunicPower.Income
-#    Rate.RunicPower.Loss
-#    Rate.Focus
-#    Rate.Loyalty
-#        Health and power regeneration and rage income from damage.
-#        Default: 1
-#
-#    Rate.Skill.Discovery
-#        Skill Discovery Rates
-#        Default: 1
-#
-#    Rate.Drop.Item.Poor
-#    Rate.Drop.Item.Normal
-#    Rate.Drop.Item.Uncommon
-#    Rate.Drop.Item.Rare
-#    Rate.Drop.Item.Epic
-#    Rate.Drop.Item.Legendary
-#    Rate.Drop.Item.Artifact
-#    Rate.Drop.Item.Referenced
-#    Rate.Drop.Money
-#        Drop rates (items by quality and money)
-#        Default: 1
-#
-#    Rate.Drop.Money
-#        Drop rates
-#        Default: 1
-#
-#    Rate.XP.Kill
-#    Rate.XP.Quest
-#    Rate.XP.Explore
-#        XP rates
-#        Default: 1
-#
-#    Rate.RepairCost
-#        Repair cost rate
-#        Default: 1   - standard cost
-#                 2   - double cost
-#                 0.5 - half cost
-#
-#    Rate.Rest.InGame
-#    Rate.Rest.Offline.InTavernOrCity
-#    Rate.Rest.Offline.InWilderness
-#        Resting points grow rates
-#        Default: 1   - standard rate
-#                 2   - double rate
-#                 0.5 - half rate
-#
-#    Rate.Damage.Fall
-#        Damage after fall rate.
-#        Default: 1   - standard damage
-#                 2   - double damage
-#                 0.5 - half damage
-#
-#    Rate.Auction.Time
-#    Rate.Auction.Deposit
-#    Rate.Auction.Cut
-#        Auction rates
-#         (auction time, deposit get at auction start,
-#         auction cut from price at auction end)
-#
-#    Rate.Honor
-#        Honor gain rate
-#
-#    Rate.Mining.Amount
-#    Rate.Mining.Next
-#        Mining Rates
-#         Mining.Amount changes minimum/maximum use times of a deposit,
-#         Mining.Next changes chance to have next use of a deposit
-#
-#    Rate.Talent
-#        Talent Point rates
-#        Default: 1
-#
-#    Rate.Reputation.Gain
-#        Reputation Gain rate
-#        Default: 1
-#
-#    Rate.Reputation.LowLevel.Kill
-#        Reputation Gain from low level kill (grey creture)
-#        Default: 1
-#
-#    Rate.Reputation.LowLevel.Quest
-#        Reputation Gain rate
-#        Default: 1
-#
-#    Rate.MoveSpeed
-#        Multiply the default movement speed for players
-#         and whatever they're controlling.
-#        Default: 1   - no change
-#                 1.4 - 40% increase
-#
-#    Rate.InstanceResetTime
-#        Multiplier for the number of days in between
-#         global raid/heroic instance resets.
-#        Default: 1
-#
-#    SkillGain.Crafting
-#    SkillGain.Defense
-#    SkillGain.Gathering
-#    SkillGain.Weapon
-#        Crafting/defense/gathering/weapon skills gain at skill grow (1,2,...)
-#        Default: 1
-#
-#    SkillChance.Orange
-#    SkillChance.Yellow
-#    SkillChance.Green
-#    SkillChance.Grey
-#        Skill chance values (0..100)
-#        Default: 100-75-25-0
-#
-#    SkillChance.MiningSteps
-#    SkillChance.SkinningSteps
-#        For skinning and Mining chance decrease with skill level.
-#        Default: 0  - no decrease
-#                 75 - in 2 times each 75 skill points
-#
-#    DurabilityLoss.InPvP
-#        If true, players take durability loss on death in PvP.
-#        Default: 0 (false)
-#                 1 (true)
-#
-#    DurabilityLoss.OnDeath
-#        Durability loss percentage on death
-#        Default: 10 - standard
-#                 20 - double
-#                 5  - half
-#
-#    DurabilityLossChance.Damage
-#        Chance lost one from equiped items durability
-#         point at damage apply or receive.
-#        Default: 0.5 (100/0.5 = 200)
-#         Each 200 damage apply one from 19 possible equipped items
-#
-#    DurabilityLossChance.Absorb
-#         Chance lost one from armor items durability point at damage absorb.
-#         Default: 0.5 (100/0.5 = 200)
-#          Each 200 absorbs apply one from 15 possible armor equipped items
-#
-#    DurabilityLossChance.Parry
-#         Chance lost weapon durability point at parry.
-#         Default: 0.05 (100/0.05 = 2000)
-#          Each 2000 parry attacks main weapon lost point
-#
-#    DurabilityLossChance.Block
-#         Chance lost sheild durability point at damage block.
-#         Default: 0.05 (100/0.05 = 2000)
-#          Each 2000 partly or full blocked attacks shield lost point
-#
-#    Death.SicknessLevel
-#         Starting Character start gain sickness at spirit resurrection (1 min)
-#         Default: 11
-#                  -10 - character will have full time
-#                    (10min) sickness at 1 level
-#                  maxplayerlevel+1
-#                   - character will not have sickess at any level
-#
-#    Death.CorpseReclaimDelay.PvP
-#    Death.CorpseReclaimDelay.PvE
-#         Enabled/disabled increase corpse reclaim delay at PvP/PvE deaths
-#         Default: 1 (enabled)
-#                  0 (disabled)
-#
-#    Death.Bones.World
-#    Death.Bones.BattlegroundOrArena
-#         Enable/disable creating bones instead corpse at resurrection
-#          (in normal zones/instances, or battleground/arenas)
-#         Default: 1 (enabled)
-#                  0 (disabled)
-#
-#    Die.Command.Mode
-#        Switch between two possible .die modes, where mode 1 kills
-#         and does not trigger anything such as loot, and mode 0 does
-#         damage and does trigger things such as loot
-#        Default: 1
-#                  0
-#
-###############################################################################
-
-Rate.Health = 1
-Rate.Mana = 1
-Rate.Rage.Income = 1
-Rate.Rage.Loss = 1
-Rate.RunicPower.Income = 1
-Rate.RunicPower.Loss = 1
-Rate.Focus = 1
-Rate.Loyalty = 1
-Rate.Skill.Discovery = 1
-Rate.Drop.Item.Poor = 1
-Rate.Drop.Item.Normal = 1
-Rate.Drop.Item.Uncommon = 1
-Rate.Drop.Item.Rare = 1
-Rate.Drop.Item.Epic = 1
-Rate.Drop.Item.Legendary = 1
-Rate.Drop.Item.Artifact = 1
-Rate.Drop.Item.Referenced = 1
-Rate.Drop.Money = 1
-Rate.XP.Kill    = 1
-Rate.XP.Quest   = 1
-Rate.XP.Explore = 1
-Rate.RepairCost = 1
-Rate.Rest.InGame = 1
-Rate.Rest.Offline.InTavernOrCity = 1
-Rate.Rest.Offline.InWilderness = 1
-Rate.Damage.Fall = 1
-Rate.Auction.Time = 1
-Rate.Auction.Deposit = 1
-Rate.Auction.Cut = 1
-Rate.Honor = 1
-Rate.Mining.Amount = 1
-Rate.Mining.Next   = 1
-Rate.Talent = 1
-Rate.Reputation.Gain = 1
-Rate.Reputation.LowLevel.Kill    = 1
-Rate.Reputation.LowLevel.Quest   = 1
-Rate.MoveSpeed = 1
-Rate.InstanceResetTime = 1
-SkillGain.Crafting = 1
-SkillGain.Defense = 1
-SkillGain.Gathering = 1
-SkillGain.Weapon = 1
-SkillChance.Orange = 100
-SkillChance.Yellow = 75
-SkillChance.Green  = 25
-SkillChance.Grey   = 0
-SkillChance.MiningSteps   = 0
-SkillChance.SkinningSteps = 0
-DurabilityLoss.InPvP = 0
-DurabilityLoss.OnDeath = 10
-DurabilityLossChance.Damage = 0.5
-DurabilityLossChance.Absorb = 0.5
-DurabilityLossChance.Parry  = 0.05
-DurabilityLossChance.Block  = 0.05
-Death.SicknessLevel = 11
-Death.CorpseReclaimDelay.PvP = 1
-Death.CorpseReclaimDelay.PvE = 0
-Death.Bones.World = 1
-Death.Bones.BattlegroundOrArena = 1
-Die.Command.Mode = 1
-
-###############################################################################
-# AUTO BROADCAST
-#
-#    AutoBroadcast.On
-#        Enable auto broadcast
-#        Default: 0 - off
-#                 1 - on
-#
-#    AutoBroadcast.Center
-#        Display method
-#        Default: 0 - announce
-#                 1 - notify
-#                 2 - both
-#
-#    AutoBroadcast.Timer
-#        Timer for auto broadcast (in milliseconds)
-#
-###############################################################################
-
-AutoBroadcast.On = 0
-AutoBroadcast.Center = 0
-AutoBroadcast.Timer = 60000
-
-###############################################################################
-# BATTLEGROUND CONFIG
-#
-#    Battleground.CastDeserter
-#        Cast Deserter spell at player who leave battleground in progress
-#        Default: 1 (enable)
-#                 0 (disable)
-#
-#    Battleground.QueueAnnouncer.Enable
-#        Enable queue announcer posting to chat
-#        Default: 0 (disable)
-#                 1 (enable)
-#
-#    Battleground.QueueAnnouncer.PlayerOnly
-#        Enable queue announcer posting to chat
-#        Default: 0 (disable)
-#                 1 (enable)
-#
-#    Battleground.InvitationType
-#        Set Battleground invitation type
-#        Default: 0 (normal - invite as much players to bg as possible,
-#                    don't bother with ballance)
-#                 1 (Experimental - don't allow to invite much more players
-#                    of one faction)
-#
-#    Battleground.PrematureFinishTimer
-#        The time to end the bg if there are less than MinPlayersPerTeam on
-#         one side (in milliseconds)
-#        Default: 300000 (5 minutes)
-#                 0 - disable (not recommended)
-#
-#    BattleGround.PremadeGroupWaitForMatch
-#        The time in which premade group of 1 faction waits in BG Queue
-#         for premade group of other faction
-#        Default: 1800000 (30 minutes)
-#                 0 - disable (not recommended)
-#
-#    Battleground.GiveXPForKills
-#        Give experience for honorable kills in battlegrounds
-#        Default: 0 (disable)
-#                 1 (enable)
-#
-#    Battleground.Random.ResetHour
-#        Reset random battlegrounds at specified hour of the day (0-23)
-#        Default: 6
-#
-###############################################################################
-
-Battleground.CastDeserter = 1
-Battleground.QueueAnnouncer.Enable = 0
-Battleground.QueueAnnouncer.PlayerOnly = 0
-Battleground.InvitationType = 0
-BattleGround.PrematureFinishTimer = 300000
-BattleGround.PremadeGroupWaitForMatch = 1800000
-Battleground.GiveXPForKills = 0
-Battleground.Random.ResetHour = 6
-
-###############################################################################
-# ARENA CONFIG
-#
-#    Arena.MaxRatingDifference
-#        The maximum rating difference between two groups in rated matches
-#        Default: 150 (enable, recommended)
-#                 0 (disable, rating difference is discarded)
-#
-#    Arena.RatingDiscardTimer
-#        After the specified milliseconds has passed,
-#         rating information will be discarded when selecting teams for
-#         matches also initiates an update by this timer
-#        Default: 600000 (10 minutes, recommended)
-#                 0 (disable)
-#
-#    Arena.AutoDistributePoints
-#        Set if arena points should be distributed automatically,
-#         or by GM command
-#        Default: 0 (disable) (recommended):
-#                    use gm command or sql query to distribute the points
-#                 1 (enable)  arena points are distributed automatically
-#
-#    Arena.AutoDistributeInterval
-#        How often should the distribution take place
-#        If automatic distribution is enabled in days
-#        Default: 7 (weekly)
-#
-#    Arena.QueueAnnouncer.Enable
-#        Enable bg queue announcer posting to chat
-#        Default: 0 (disable)
-#                 1 (enable)
-#
-#    Arena.ArenaSeason.ID
-#        Current area season id show in client
-#        Default: 1
-#
-#    Arena.ArenaSeason.InProgress
-#        Current area season state
-#        Default: 1 (active)
-#                 0 (finished)
-#
-#    Arena.ArenaStartRating
-#	 Start arena team command rating
-#	 Default: 1500 
-#
-#    Arena.StartPersonalRating
-#	 Start personal rating on entry in team
-#	 Default: 1500
-#
-###############################################################################
-
-Arena.MaxRatingDifference = 150
-Arena.RatingDiscardTimer = 600000
-Arena.AutoDistributePoints = 0
-Arena.AutoDistributeInterval = 7
-Arena.QueueAnnouncer.Enable = 0
-Arena.QueueAnnouncer.PlayerOnly = 0
-Arena.ArenaSeason.ID = 1
-Arena.ArenaSeason.InProgress = 1
-Arena.ArenaStartRating = 0
-Arena.ArenaStartPersonalRating = 0
-
-###############################################################################
-# NETWORK CONFIG
-#
-#    Network.Threads
-#         Number of threads for network,
-#          recommend 1 thread per 1000 connections.
-#         Default: 1
-#
-#    Network.OutKBuff
-#         The size of the output kernel buffer used
-#          ( SO_SNDBUF socket option, tcp manual ).
-#         Default: -1 (Use system default setting)
-#
-#    Network.OutUBuff
-#         Userspace buffer for output.
-#          This is amount of memory reserved per each connection.
-#         Default: 65536
-#
-#    Network.TcpNoDelay:
-#         TCP Nagle algorithm setting
-#         Default: 0 (enable Nagle algorithm, less traffic, more latency)
-#                  1 (TCP_NO_DELAY, disable Nagle algorithm,
-#                     more traffic but less latency)
-#
-###############################################################################
-
-Network.Threads = 1
-Network.OutKBuff = -1
-Network.OutUBuff = 65536
-Network.TcpNodelay = 1
-
-###############################################################################
-# AUCTION HOUSE BOT SETTINGS
-#
-#    AuctionHouseBot.DEBUG
-#        Enable/Disable Debugging output
-#    Default 0 (disabled)
-#
-#    AuctionHouseBot.DEBUG_FILTERS
-#        Enable/Disable Debugging output from Filters
-#    Default 0 (disabled)
-#
-#    AuctionHouseBot.EnableSeller
-#        Enable/Disable the part of AHBot that puts items up for auction
-#    Default 0 (disabled)
-#
-#    AuctionHouseBot.EnableBuyer
-#        Enable/Disable the part of AHBot that buys items from players
-#    Default 0 (disabled)
-#
-#    AuctionHouseBot.UseBuyPriceForSeller
-#        Should the Seller use BuyPrice or SellPrice to determine Bid Prices
-#    Default 0 (use SellPrice)
-#
-#    AuctionHouseBot.UseBuyPriceForBuyer
-#        Should the Buyer use BuyPrice or SellPrice to determine Bid Prices
-#    Default 0 (use SellPrice)
-#
-#    Auction House Bot character data
-#        AuctionHouseBot.Account is the account number
-#         (in realmd->account table) of the player you want to run
-#         as the auction bot.
-#        AuctionHouseBot.GUID is the GUID (in characters->characters table)
-#         of the player you want to run as the auction bot.
-#    Default: 0 (Auction House Bot disabled)
-#
-#    AuctionHouseBot.ItemsPerCycle
-#        Number of Items to Add/Remove from the AH during mass operations
-#    Default 200
-#
-###############################################################################
-
-AuctionHouseBot.DEBUG = 0
-AuctionHouseBot.DEBUG_FILTERS = 0
-AuctionHouseBot.EnableSeller = 0
-AuctionHouseBot.EnableBuyer = 0
-AuctionHouseBot.UseBuyPriceForSeller = 0
-AuctionHouseBot.UseBuyPriceForBuyer = 0
-AuctionHouseBot.Account = 0
-AuctionHouseBot.GUID = 0
-AuctionHouseBot.ItemsPerCycle = 200
-
-###############################################################################
-# AUCTION HOUSE BOT FILTERS PART 1
-#
-#    AuctionHouseBot.VendorItems
-#        Include items that can be bought from vendors.
-#    Default 0 (False)
-#
-#    AuctionHouseBot.VendorTradeGoods
-#        Include Trade Goods that can be bought from vendors.
-#    Default 0 (False)
-#
-#    AuctionHouseBot.LootItems
-#        Include items that can be looted or fished for.
-#    Default 1 (True)
-#
-#    AuctionHouseBot.LootTradeGoods
-#        Include Trade Goods that can be looted or fished for.
-#    Default 1 (True)
-#
-#    AuctionHouseBot.OtherItems
-#        Include misc. items.
-#    Default 0 (False)
-#
-#    AuctionHouseBot.OtherTradeGoods
-#        Include misc. Trade Goods.
-#    Default 0 (False)
-#
-#    AuctionHouseBot.Bonding_types
-#        Indicates which bonding types to allow seller to put up for auction
-#            No_Bind
-#             Default 1 (True)
-#            Bind_When_Picked_Up
-#             Default 0 (False)
-#            Bind_When_Equipped
-#             Default 1 (True)
-#            Bind_When_Use
-#             Default 1 (True)
-#            Bind_Quest_Item
-#             Default 0 (False)
-#
-#    AuctionHouseBot.DisableBeta_PTR_Unused
-#        Disable certain items that are usually unavailable to Players
-#    Default 0 (False)
-#
-#    AuctionHouseBot.DisablePermEnchant
-#        Disable Items with a Permanent Enchantment
-#    Default 0 (False)
-#
-#    AuctionHouseBot.DisableConjured
-#        Disable Conjured Items
-#    Default 0 (False)
-#
-#    AuctionHouseBot.DisableGems
-#        Disable Gems
-#    Default 0 (False)
-#
-#    AuctionHouseBot.DisableMoney
-#        Disable Items that are used as money
-#    Default 0 (False)
-#
-#    AuctionHouseBot.DisableMoneyLoot
-#        Disable Items that have Money as a loot
-#    Default 0 (False)
-#
-#    AuctionHouseBot.DisableLootable
-#        Disable Items that have other items as loot
-#    Default 0 (False)
-#
-#    AuctionHouseBot.DisableKeys
-#        Disable Items that are keys
-#    Default 0 (False)
-#
-#    AuctionHouseBot.DisableDuration
-#        Disable Items with a duration
-#    Default 0 (False)
-#
-#    AuctionHouseBot.DisableBOP_Or_Quest_NoReqLevel
-#        Disable items that are BOP or Quest Item
-#        with a Required level that is less than the Item Level
-#        (This prevents a level 10 with a level 60 weapon or armor)
-#        (May need further refinement)
-#    Default 0 (False)
-#
-###############################################################################
-
-AuctionHouseBot.VendorItems = 0
-AuctionHouseBot.VendorTradeGoods = 0
-AuctionHouseBot.LootItems = 1
-AuctionHouseBot.LootTradeGoods = 1
-AuctionHouseBot.OtherItems = 0
-AuctionHouseBot.OtherTradeGoods = 0
-AuctionHouseBot.No_Bind = 1
-AuctionHouseBot.Bind_When_Picked_Up = 0
-AuctionHouseBot.Bind_When_Equipped = 1
-AuctionHouseBot.Bind_When_Use = 1
-AuctionHouseBot.Bind_Quest_Item = 0
-AuctionHouseBot.DisableBeta_PTR_Unused = 0
-AuctionHouseBot.DisablePermEnchant = 0
-AuctionHouseBot.DisableConjured = 0
-AuctionHouseBot.DisableGems = 0
-AuctionHouseBot.DisableMoney = 0
-AuctionHouseBot.DisableMoneyLoot = 0
-AuctionHouseBot.DisableLootable = 0
-AuctionHouseBot.DisableKeys = 0
-AuctionHouseBot.DisableDuration = 0
-AuctionHouseBot.DisableBOP_Or_Quest_NoReqLevel = 0
-
-###############################################################################
-# AUCTION HOUSE BOT FILTERS PART 2
-#
-#     These Filters are boolean (0 or 1) and will disable items that are
-#     specifically meant for the Class named.
-#     (UnusedClass is Class 10, which was skipped for some reason)
-#     Default 0 (allowed)
-#
-###############################################################################
-
-AuctionHouseBot.DisableWarriorItems = 0
-AuctionHouseBot.DisablePaladinItems = 0
-AuctionHouseBot.DisableHunterItems = 0
-AuctionHouseBot.DisableRogueItems = 0
-AuctionHouseBot.DisablePriestItems = 0
-AuctionHouseBot.DisableDKItems = 0
-AuctionHouseBot.DisableShamanItems = 0
-AuctionHouseBot.DisableMageItems = 0
-AuctionHouseBot.DisableWarlockItems = 0
-AuctionHouseBot.DisableUnusedClassItems = 0
-AuctionHouseBot.DisableDruidItems = 0
-
-###############################################################################
-# AUCTION HOUSE BOT FILTERS PART 3
-#
-#    AuctionHouseBot.DisableItemsBelowLevel
-#        Prevent Seller from listing Items below this Level
-#    Default 0 (Off)
-#
-#    AuctionHouseBot.DisableItemsAboveLevel
-#        Prevent Seller from listing Items above this Level
-#    Default 0 (Off)
-#
-#    AuctionHouseBot.DisableTGsBelowLevel
-#        Prevent Seller from listing Trade Goods below this Level
-#    Default 0 (Off)
-#
-#    AuctionHouseBot.DisableTGsAboveLevel
-#        Prevent Seller from listing Trade Goods above this Level
-#    Default 0 (Off)
-#
-#    AuctionHouseBot.DisableItemsBelowGUID
-#        Prevent Seller from listing Items below this GUID
-#    Default 0 (Off)
-#
-#    AuctionHouseBot.DisableItemsAboveGUID
-#        Prevent Seller from listing Items above this GUID
-#    Default 0 (Off)
-#
-#    AuctionHouseBot.DisableTGsBelowGUID
-#        Prevent Seller from listing Trade Goods below this GUID
-#    Default 0 (Off)
-#
-#    AuctionHouseBot.DisableTGsAboveGUID
-#        Prevent Seller from listing Trade Goods above this GUID
-#    Default 0 (Off)
-#
-#    AuctionHouseBot.DisableItemsBelowReqLevel
-#        Prevent Seller from listing Items below this Required Level
-#    Default 0 (Off)
-#
-#    AuctionHouseBot.DisableItemsAboveReqLevel
-#        Prevent Seller from listing Items above this Required Level
-#    Default 0 (Off)
-#
-#    AuctionHouseBot.DisableTGsBelowReqLevel
-#        Prevent Seller from listing Trade Goods below this Required Level
-#    Default 0 (Off)
-#
-#    AuctionHouseBot.DisableTGsAboveReqLevel
-#        Prevent Seller from listing Trade Goods above this Required Level
-#    Default 0 (Off)
-#
-#    AuctionHouseBot.DisableItemsBelowReqSkillRank
-#        Prevent Seller from listing Items below this Required Skill Rank
-#    Default 0 (Off)
-#
-#    AuctionHouseBot.DisableItemsAboveReqSkillRank
-#        Prevent Seller from listing Items above this Required Skill Rank
-#    Default 0 (Off)
-#
-#    AuctionHouseBot.DisableTGsBelowReqSkillRank
-#        Prevent Seller from listing Trade Goods below this Required Skill Rank
-#    Default 0 (Off)
-#
-#    AuctionHouseBot.DisableTGsAboveReqSkillRank
-#        Prevent Seller from listing Trade Goods above this Required Skill Rank
-#    Default 0 (Off)
-#
-###############################################################################
-
-AuctionHouseBot.DisableItemsBelowLevel = 0
-AuctionHouseBot.DisableItemsAboveLevel = 0
-AuctionHouseBot.DisableTGsBelowLevel = 0
-AuctionHouseBot.DisableTGsAboveLevel = 0
-AuctionHouseBot.DisableItemsBelowGUID = 0
-AuctionHouseBot.DisableItemsAboveGUID = 0
-AuctionHouseBot.DisableTGsBelowGUID = 0
-AuctionHouseBot.DisableTGsAboveGUID = 0
-AuctionHouseBot.DisableItemsBelowReqLevel = 0
-AuctionHouseBot.DisableItemsAboveReqLevel = 0
-AuctionHouseBot.DisableTGsBelowReqLevel = 0
-AuctionHouseBot.DisableTGsAboveReqLevel = 0
-AuctionHouseBot.DisableItemsBelowReqSkillRank = 0
-AuctionHouseBot.DisableItemsAboveReqSkillRank = 0
-AuctionHouseBot.DisableTGsBelowReqSkillRank = 0
-AuctionHouseBot.DisableTGsAboveReqSkillRank = 0
-
-###############################################################################
-# CONSOLE AND REMOTE ACCESS
-#
-#    Console.Enable
-#        Enable console
-#        Default: 1 - on
-#                 0 - off
-#
-#    Ra.Enable
-#        Enable remote console
-#        Default: 0 - off
-#                 1 - on
-#
-#    Ra.IP
-#        Default remote console ip address, use 0.0.0.0 for every address
-#
-#    Ra.Port
-#        Default remote console port
-#
-#    Ra.MinLevel
-#        Minimum level that's required to login,3 by default
-#
-#    Ra.Secure
-#        Kick client on wrong pass
-#
-###############################################################################
-
-Console.Enable = 1
-Ra.Enable = 0
-Ra.IP = 0.0.0.0
-Ra.Port = 3443
-Ra.MinLevel = 3
-Ra.Secure = 1
-
-###############################################################################
-# CUSTOM SERVER OPTIONS
-#
-#    PlayerStart.AllReputation
-#        Players will start with most of the high level reputations that are
-#         needed for items, mounts etc.
-#
-#    PlayerStart.AllSpells
-#        If enabled, players will start with all their class spells
-#         (not talents). Useful for instant 80 servers.
-#        You must populate playercreateinfo_spell_custom table with the spells
-#         you want, or this WILL NOT WORK! The table has data for all
-#         classes / races up to TBC expansion.
-#         Do not enable if you do not know what you are doing!
-#        Default: 0 - off
-#                 1 - on
-#
-#
-#    PlayerStart.MapsExplored
-#        Players will start with all maps explored if enabled
-#
-#    MusicInBattleground
-#        If enabled "L70ETC-Power of the horde" will be played when BG starts
-#
-#    HonorPointsAfterDuel
-#        The amount of honor points the duel winner will get after a duel.
-#        Default: 0 - disable
-#
-#    AlwaysMaxWeaponSkill
-#        Players will automatically gain max weapon/defense skill when
-#         logging in, leveling up etc.
-#
-#    PvPToken.Enable
-#        Enable/disable PvP Token System. Players will get a token
-#         after slaying another player that gives honor.
-#
-#    PvPToken.MapAllowType
-#        Where players can receive the pvp token
-#        4 - In all maps
-#        3 - In battlegrounds only
-#        2 - In FFA areas only (gurubashi arena etc)
-#        1 - In battlegrounds AND FFA areas only
-#
-#    PvPToken.ItemID
-#        The item players will get after killing someone
-#         if PvP Token system is enabled.
-#        Default: 29434 - Badge of justice
-#
-#    PvPToken.ItemCount
-#        Modify the item ID count - Default: 1
-#
-#    NoResetTalentsCost
-#        Enable or disable no cost when reseting talents
-#
-#   Guild.AllowMultipleGuildMaster
-#       Allow override of 1 Guild Master limit. Additional Guild Masters must
-#       be set using the ".guild rank" command, not through the UI
-#       Default: 0 = Only 1 Guild Master per guild
-#                1 = Allow more than one Guild Master
-#
-#   ForbiddenMaps
-#       Map ids that users below SEC_GAMEMASTER cannot enter,
-#        with delimiter ','
-#       Default: ""
-#       example: "538,90"
-#       Note that it's HIGHLY DISCOURAGED to forbid starting maps
-#        (0, 1, 530)!
-#
-#   ShowKickInWorld
-#        Determines wether a message is broadcasted to the entire server
-#         when a player gets kicked
-#        Default: 0 = Disable
-#                 1 = Enable
-#
-#   RecordUpdateTimeDiffInterval
-#        Record update time diff to the log file
-#         update diff can be used as a criterion of performance
-#         diff < 300: good performance
-#         diff > 600: bad performance, may be caused by high cpu usage
-#        Default: 60000 (diff is written into log every 60000 ms or 1 minute.
-#                 >0 = Interval
-#                 0 = Disable
-#
-#   MinRecordUpdateTimeDiff
-#        Only record update time diff which is greater than this value
-#        Default: 10
-#
-#   PlayerStart.String
-#       If set to anything other than "", this string will be displayed
-#        to players when they login to a newly created character.
-#       Default: "" - send no text
-#
-#   LevelReq.Trade
-#        The required level of character to be able to trade
-#        Default: 1 (From level 1)
-#
-#   LevelReq.Ticket
-#        The required level of character to be able to write tickets
-#        Default: 1 (From level 1)
-#
-#   LevelReq.Auction
-#        The required level of character to be able to use auction
-#        Default: 1 (From level 1)
-#
-#   LevelReq.Mail
-#        The required level of character to be able to send and receive mail
-#        Default: 1 (From level 1)
-#
-###############################################################################
-
-PlayerStart.AllReputation = 0
-PlayerStart.AllSpells = 0
-PlayerStart.MapsExplored = 0
-MusicInBattleground = 0
-HonorPointsAfterDuel = 0
-AlwaysMaxWeaponSkill = 0
-PvPToken.Enable = 0
-PvPToken.MapAllowType = 4
-PvPToken.ItemID = 29434
-PvPToken.ItemCount = 1
-Guild.AllowMultipleGuildMaster = 0
-NoResetTalentsCost = 0
-ShowKickInWorld = 0
-RecordUpdateTimeDiffInterval = 60000
-MinRecordUpdateTimeDiff = 100
-PlayerStart.String = ""
-LevelReq.Trade = 1
-LevelReq.Ticket = 1
-LevelReq.Auction = 1
-LevelReq.Mail = 1
diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist
new file mode 100644
index 00000000000..3b6d20e093d
--- /dev/null
+++ b/src/server/worldserver/worldserver.conf.dist
@@ -0,0 +1,2212 @@
+##########################################
+# Trinity Core worldd configuration file #
+##########################################
+# Note to devs, line breaks should be at column 80
+###############################################################################
+# CONNECTIONS AND DIRECTORIES
+#
+#    RealmID
+#        RealmID must match the realmlist inside the realmd database
+#
+#    DataDir
+#        Data directory setting.
+#        Important: DataDir needs to be quoted, as it is a string which may
+#         contain space characters.
+#        Example: "@prefix@/share/trinitycore"
+#
+#    LogsDir
+#        Logs directory setting.
+#        Important: Logs dir must exists, or all logs need to be disabled
+#        Default: "" - no log directory prefix, if used log names isn't
+#         absolute path then logs will be stored in current directory.
+#
+#
+#    LoginDatabaseInfo
+#    WorldDatabaseInfo
+#    CharacterDatabaseInfo
+#        Database connection settings for the world server.
+#        Default:
+#                    hostname;port;username;password;database
+#                    .;somenumber;username;password;database
+#                     - use named pipes in Windows
+#                    Named pipes: mySQL required adding
+#                        "enable-named-pipe" to [mysqld] section my.ini
+#                    .;/path/to/unix_socket;username;password;database
+#                     - use Unix sockets in Unix/Linux
+#
+#    MaxPingTime
+#        Settings for maximum database-ping interval (minutes between pings)
+#
+#    WorldServerPort
+#        Default WorldServerPort
+#
+#    BindIP
+#        Bind World Server to IP/hostname
+#
+###############################################################################
+
+RealmID = 1
+DataDir = "."
+LogsDir = ""
+LoginDatabaseInfo     = "127.0.0.1;3306;trinity;trinity;realmd"
+WorldDatabaseInfo     = "127.0.0.1;3306;trinity;trinity;world"
+CharacterDatabaseInfo = "127.0.0.1;3306;trinity;trinity;characters"
+MaxPingTime = 30
+WorldServerPort = 8085
+BindIP = "0.0.0.0"
+
+###############################################################################
+# SCRIPTING SETTINGS
+#
+#    Locale
+#        Setting for current (DBC) locale to use
+#
+#    EventAI Error reporting
+#        Default: 0 - Only startup
+#                 1 - Startup errors and Runtime event errors
+#                 2 - Startup errors, Runtime event errors, and Creation errors
+#
+###############################################################################
+
+Locale = 0
+EAIErrorLevel = 2
+
+###############################################################################
+# PERFORMANCE SETINGS
+#
+#    UseProcessors
+#        Processors mask for multi-processor system (Used only in Windows)
+#        Default: 0 (selected by OS)
+#                 number (bitmask value of selected processors)
+#
+#    ProcessPriority
+#        Process priority setting (Used only at Windows)
+#        Default: 1 (HIGH)
+#                 0 (Normal)
+#
+#    Compression
+#        Compression level for update packages sent to client (1..9)
+#        Default: 1 (speed)
+#                 9 (best compression)
+#
+#    PlayerLimit
+#        Maximum number of players in the world. Excluding Mods, GMs and Admins
+#        Default: 100
+#                 0 (for infinite players)
+#                 If you want to block players and enable Mods, GMs or Admins use
+#                 DB field realmd.realmlist.allowedSecurityLevel
+#
+#    SaveRespawnTimeImmediately
+#        Save respawn time for creatures at death and gameobjects at use/open
+#        Default: 1 (save creature/gameobject respawn time immediately)
+#                 0 (save creature/gameobject respawn time at grid unload)
+#
+#    MaxOverspeedPings
+#        Maximum overspeed ping count before player kick
+#         (minimum is 2, 0 used for disable check)
+#        Default: 2
+#
+#    GridUnload
+#        Unload grids
+#         (if you have lot memory you can disable it to speed up
+#         player move to new grids second time)
+#        Default: 1 (unload grids)
+#                 0 (do not unload grids)
+#
+#    SocketSelectTime
+#        Socket select time (in milliseconds)
+#        Default: 10000 (10 secs)
+#
+#    SocketTimeOutTime
+#        Time in milliseconds afer which a connection sitting idle on the character
+#        selection screen is disconnected.
+#        Default: 900000 (15 minutes)
+#
+#    SessionAddDelay
+#        Time in microseconds that a network thread will sleep after authentication
+#        protocol and adding a connection to the world session map.
+#        Default: 10000 (10 milliseconds, 0,01 second)
+#
+#    GridCleanUpDelay
+#        Grid clean up delay (in milliseconds)
+#        Default: 300000 (5 min)
+#
+#    MapUpdateInterval
+#        Map update interval (in milliseconds)
+#        Default: 100
+#
+#    ChangeWeatherInterval
+#        Weather update interval (in milliseconds)
+#        Default: 600000 (10 min)
+#
+#    PlayerSaveInterval
+#        Player save interval (in milliseconds)
+#        Default: 900000 (15 min)
+#
+#    PlayerSave.Stats.MinLevel
+#        Minimum level for saving character stats for external usage in database	
+#        Default: 0  (do not save character stats)	
+#                 1+ (save stats for characters with level 1+)	
+#
+#    PlayerSave.Stats.SaveOnlyOnLogout	
+#        Enable/Disable saving of character stats only on logout
+#        Default: 1 (only save on logout)
+#                 0 (save on every player save)
+#
+#    vmap.enableLOS
+#    vmap.enableHeight
+#        Enable/Disable VMmap support for line of sight and height calculation
+#        Default: 0 (disable)
+#                 1 (enable)
+#
+#    vmap.ignoreMapIds
+#        Map id that will be ignored by VMaps
+#         List of ids with delimiter ','
+#         If more then one id is defined and spaces are included, the string
+#         has to be enclosed by "
+#        Example: "369,0,1,530"
+#
+#    vmap.ignoreSpellIds
+#        These spells are ignored for LoS calculation
+#         List of ids with delimiter ','
+#        
+#    vmap.petLOS
+#        Check LOS for pets, to avoid them going through walls etc.
+#        Default: 0 (disable, less CPU usage)
+#                 1 (enable, each pet attack command will check for LOS)
+#    
+#    vmap.enableIndoorCheck
+#        Enable/Disable VMap based indoor check to remove outdoor-only auras (mounts etc.)
+#        Default: 0 (disabled)
+#
+#    DetectPosCollision
+#        Check final move position, summon position, etc for visible collision
+#         with other objects or wall (wall only if vmaps are enabled)
+#        Default: 1 (enable, required more CPU usage)
+#                 0 (disable, less position precision but will use less CPU)
+#
+#    TargetPosRecalculateRange
+#        Max distance from movement target point (+moving unit size) and
+#         targeted object (+size) after that new target movement point
+#         calculated. Max: melee attack range (5), min: contact range (0.5)
+#         More distance let have better performence, less distance let have
+#         more sensitive reaction at target move.
+#        Default: 1.5
+#
+#    UpdateUptimeInterval
+#        Update realm uptime period in minutes. Must be > 0
+#        Default: 10 (minutes)
+#
+#    LogDB.Opt.ClearInterval
+#        Time for the WUPDATE_CLEANDB timer that clears the `logs` table
+#         of old entries. Must be > 0.
+#        Default: 10 (minutes)
+#
+#    LogDB.Opt.ClearTime
+#        The maximum time in seconds of old `logs` table entries to keep.
+#        Default: 1209600 (14 days)
+#                 0 - don't clear
+#
+#    MaxCoreStuckTime
+#        Periodically check if the process is frozen, if this is the case
+#         force crash after the specified amount of seconds. Must be > 0.
+#         Recommended > 10 secs if you use this.
+#        Default: 0 (Disabled)
+#
+#    AddonChannel
+#        Permit/disable the use of the addon channel through the server
+#         (some client side addons will not work correctly with disabled
+#         addon channel)
+#        Default: 1 (permit addon channel)
+#                 0 (do not permit addon channel)
+#
+#    MapUpdate.Threads
+#	Number of threads to update maps.
+#	Default: 1
+#
+###############################################################################
+
+UseProcessors = 0
+ProcessPriority = 1
+Compression = 1
+PlayerLimit = 100
+SaveRespawnTimeImmediately = 1
+MaxOverspeedPings = 2
+GridUnload = 1
+SocketSelectTime = 10000
+SocketTimeOutTime = 900000
+SessionAddDelay = 10000
+GridCleanUpDelay = 300000
+MapUpdateInterval = 100
+ChangeWeatherInterval = 600000
+PlayerSaveInterval = 900000
+PlayerSave.Stats.MinLevel = 0
+PlayerSave.Stats.SaveOnlyOnLogout = 1
+vmap.enableLOS = 0
+vmap.enableHeight = 0
+vmap.ignoreMapIds = "369"
+vmap.ignoreSpellIds = "7720"
+vmap.petLOS = 0
+vmap.enableIndoorCheck = 0
+DetectPosCollision = 1
+TargetPosRecalculateRange = 1.5
+UpdateUptimeInterval = 10
+LogDB.Opt.ClearInterval = 10
+LogDB.Opt.ClearTime = 1209600
+MaxCoreStuckTime = 0
+AddonChannel = 1
+MapUpdate.Threads = 1
+
+###############################################################################
+# SERVER LOGGING
+#
+#    LogSQL
+#        Enable logging of SQL commands from in game
+#         All commands are written to a file: YYYY-MM-DD_logSQL.sql
+#         If a new day starts (00:00:00) then a new file is created
+#         the old file will not be deleted.
+#        Default: 1 - Write SQL code to logfile
+#                 0 - Do not log
+#
+#    PidFile
+#        World daemon PID file
+#        Default: ""             - do not create PID file
+#                 "./worldd.pid" - create PID file (recommended name)
+#
+#    LogLevel
+#        Server console level of logging
+#                 0 = Minimum
+#        Default: 1 = Basic
+#                 2 = Detail
+#                 3 = Full/Debug
+#
+#    LogFile
+#        Logfile name
+#        Default: "Server.log"
+#                 "" - Empty name disable creating log file
+#
+#    ChatLogFile
+#        Log file for chat logs
+#        Default: "chat.log"
+#                 "" - Empty name for disable
+#
+#    LogTimestamp
+#        Logfile with timestamp of server start in name
+#         in form Logname_YYYY-MM-DD_HH-MM-SS.Ext for Logname.Ext
+#        Default: 0 - no timestamp in name
+#                 1 - add timestamp in name
+#
+#    LogFileLevel
+#        Server file level of logging
+#        Default: 0 = Minimum
+#                 1 = Basic
+#                 2 = Detail
+#                 3 = Full/Debug
+#
+#    LogFilter_AchievementUpdates
+#    LogFilter_CreatureMoves
+#    LogFilter_TransportMoves
+#    LogFilter_VisibilityChanges
+#        Log filters
+#        Default: 1 - not include with any log level
+#                 0 - include in log if log level permit
+#
+#    WorldLogFile
+#        Packet logging file for the worldserver
+#        Default: "world.log"
+#
+#    DBErrorLogFile
+#        Log file of DB errors detected at server run
+#        Default: "DBErrors.log"
+#
+#    CharLogFile
+#        Character operations logfile name
+#        Default: "Char.log"
+#                 "" - Empty name disable creating log file
+#
+#    CharLogTimestamp
+#        Logfile with timestamp of server start in name
+#         in form Logname_YYYY-MM-DD_HH-MM-SS.Ext for Logname.Ext
+#        Default: 0 - no timestamp in name
+#                 1 - add timestamp in name
+#
+#    CharLogDump
+#        Write character dump before deleting in Char.log
+#         For restoration, cut character data from log starting from
+#         line == START DUMP == to line == END DUMP == (exclusive) in file
+#         and load it using the loadpdump command
+#        Default: 0 - don't include dumping chars to log
+#                 1 - include dumping chars to log
+#    CharLogDump.Separate
+#        Write character dump to separate file
+#        Default: 0 - don't write dump to separate file
+#                 1 - write each dump to separate file
+#
+#    CharLogDump.SeparateDir
+#        Subdirectory within logs dir for separate char dumps.
+#
+#
+#    GmLogFile
+#        Log file of gm commands
+#        Default: "gm_commands.log"
+#                 "" - Empty name for disable
+#
+#    GmLogTimestamp
+#        GM Logfile with timestamp of server start in name
+#         in form Logname_YYYY-MM-DD_HH-MM-SS.Ext for Logname.Ext
+#        Default: 0 - no timestamp in name
+#                 1 - add timestamp in name
+#
+#    GmLogPerAccount
+#        GM Logfiles with GM account id
+#         (Note: logs not created if GmLogFile not set)
+#        Default: 0 - add gm log data to single log file
+#                 1 - add gm log data to account specific log files with name
+#                     in form Logname_#ID_YYYY-MM-DD_HH-MM-SS.Ext
+#                     or form Logname_#ID.Ext
+#
+#    RaLogFile
+#        Log file of RA commands
+#        Default: "Ra.log"
+#                 "" - Empty name for disable
+#
+#    ArenaLogFile
+#        Log file of arena fights and arena team creations
+#        Default: "" - do not create arena log file
+#
+#    LogColors
+#        Color for messages (format "normal basic detail debug")
+#        Default: "" - no colors
+#        Colors: 0  - BLACK
+#                1  - RED
+#                2  - GREEN
+#                3  - BROWN
+#                4  - BLUE
+#                5  - MAGENTA
+#                6  - CYAN
+#                7  - GREY
+#                8  - YELLOW
+#                9  - LRED
+#                10 - LGREEN
+#                11 - LBLUE
+#                12 - LMAGENTA
+#                13 - LCYAN
+#                14 - WHITE
+#        Example: "13 11 9 5"
+#
+#    EnableLogDB
+#        Enable/disable logging to database (LogDatabaseInfo).
+#        Default: 0 - disabled
+#                 1 - enabled
+#
+#    DBLogLevel
+#        Log level of DB logging.
+#                 0 = Minimum
+#                 1 = Basic
+#                 2 = Detail
+#        Default: 3 = Full/Debug
+#
+#    LogDB.Char
+#        Enable/disable logging character outputs to DB.
+#        Default: 0 - off
+#                 1 - on
+#
+#    LogDB.GM
+#        Enable/disable logging GM commands to DB.
+#        Default: 0 - off
+#                 1 - on
+#
+#    LogDB.RA
+#        Enable/disable logging remote access events to DB.
+#        Default: 0 - off
+#                 1 - on
+#
+#    LogDB.World
+#        Enable/disable logging world packets to DB.
+#        Default: 0 - off
+#                 1 - on (very heavy)
+#
+#    LogDB.Chat
+#        Enable/disable logging chat messages to the database.
+#        Default: 0 - off
+#                 1 - on
+#
+#    ChatLogs.Channel
+#        Enable logging chatting in custom channels.
+#        Default: 0 - off
+#                 1 - on
+#
+#    ChatLogs.Whisper
+#        Enable logging whispers between players.
+#        Default: 0 - off
+#                 1 - on
+#
+#    ChatLogs.Party
+#        Enable logging party messages.
+#        Default: 0 - off
+#                 1 - on
+#
+#    ChatLogs.Raid
+#        Enable logging raid messages.
+#        Default: 0 - off
+#                 1 - on
+#
+#    ChatLogs.Guild
+#        Enable logging guild messages.
+#        Default: 0 - off
+#                 1 - on
+#
+#    ChatLogs.Public
+#        Enable logging public chat events (say/yell/emote).
+#        Default: 0 - off
+#                 1 - on
+#
+#    ChatLogs.Addon
+#        Enable logging addon messages.
+#        Default: 0 - off
+#                 1 - on
+#
+#    ChatLogs.BattleGround
+#        Enable logging battleground chats.
+#        Default: 0 - off
+#                 1 - on
+#
+#    ChatLogTimestamp
+#        Chat Logfile with timestamp of server start in name
+#         in form Logname_YYYY-MM-DD_HH-MM-SS.Ext for Logname.Ext
+#        Default: 0 - no timestamp in name
+#                 1 - add timestamp in name
+#
+###############################################################################
+
+LogSQL = 1
+PidFile = ""
+LogLevel = 1
+LogFile = "Server.log"
+ChatLogFile = "chat.log"
+LogTimestamp = 0
+LogFileLevel = 0
+LogFilter_AchievementUpdates = 1
+LogFilter_CreatureMoves = 1
+LogFilter_TransportMoves = 1
+LogFilter_VisibilityChanges = 1
+WorldLogFile = ""
+DBErrorLogFile = "db_errors.log"
+CharLogFile = "characters.log"
+CharLogTimestamp = 0
+CharLogDump = 0
+CharLogDump.Separate = 0
+CharLogDump.SeparateDir = ""
+GmLogFile = "gm_commands.log"
+GmLogTimestamp = 0
+GmLogPerAccount = 0
+RaLogFile = "ra_commands.log"
+ArenaLogFile = ""
+LogColors = ""
+EnableLogDB = 0
+DBLogLevel = 2
+LogDB.Char   = 0
+LogDB.GM     = 0
+LogDB.RA     = 0
+LogDB.World  = 0
+LogDB.Chat   = 0
+ChatLogs.Channel      = 0
+ChatLogs.SysChan      = 0
+ChatLogs.Whisper      = 0
+ChatLogs.Party        = 0
+ChatLogs.Raid         = 0
+ChatLogs.Guild        = 0
+ChatLogs.Public       = 0
+ChatLogs.Addon        = 0
+ChatLogs.BattleGround = 0
+ChatLogTimestamp = 0
+
+###############################################################################
+# SERVER SETTINGS
+#
+#    GameType
+#        Server realm style
+#        Default: 0 = NORMAL
+#                 1 = PVP
+#                 4 = NORMAL
+#                 6 = RP
+#                 8 = RPPVP
+#                 16 FFA_PVP (free for all pvp mode like arena PvP in all
+#                     zones except rest activated places and sanctuaries)
+#
+#    RealmZone
+#        Server realm zone (set allowed alphabet in character names/etc)
+#         See also Strict*Names options.
+#
+#        Default: 1 Development    - any language
+#                 2 United States  - extended-Latin
+#                 3 Oceanic        - extended-Latin
+#                 4 Latin America  - extended-Latin
+#                 5 Tournament     - basic-Latin at create, any at login
+#                 6 Korea          - East-Asian
+#                 7 Tournament     - basic-Latin at create, any at login
+#                 8 English        - extended-Latin
+#                 9 German         - extended-Latin
+#                 10 French        - extended-Latin
+#                 11 Spanish       - extended-Latin
+#                 12 Russian       - Cyrillic
+#                 13 Tournament    - basic-Latin at create, any at login
+#                 14 Taiwan        - East-Asian
+#                 15 Tournament    - basic-Latin at create, any at login
+#                 16 China         - East-Asian
+#                 17 CN1           - basic-Latin at create, any at login
+#                 18 CN2           - basic-Latin at create, any at login
+#                 19 CN3           - basic-Latin at create, any at login
+#                 20 CN4           - basic-Latin at create, any at login
+#                 21 CN5           - basic-Latin at create, any at login
+#                 22 CN6           - basic-Latin at create, any at login
+#                 23 CN7           - basic-Latin at create, any at login
+#                 24 CN8           - basic-Latin at create, any at login
+#                 25 Tournament    - basic-Latin at create, any at login
+#                 26 Test Server   - any language
+#                 27 Tournament    - basic-Latin at create, any at login
+#                 28 QA Server     - any language
+#                 29 CN9           - basic-Latin at create, any at login
+#
+#    Expansion
+#        Allow server use content from expansion
+#        Default: 2 - check expansion 2 maps existence, and if client support
+#                      expansion 2 and account have expansion 2 setting then
+#                      allow visit expansion 2 maps, allow create new class
+#                      character)
+#                 1 - check expansion 1 maps existence, and if client support
+#                      expansion 1 and account have expansion 1 setting then
+#                      allow visit expansion 1 maps, allow create new races
+#                      character)
+#                 0 - don't check expansion maps existence, don't allow visit
+#                      maps, don't allow create new race or new class
+#                      characters, ignore account expansion setting)
+#
+#    DBC.Locale
+#        DBC Language Settings
+#        Default: 255 = Auto Detect
+#                 0   = English
+#                 1   = Korean
+#                 2   = French
+#                 3   = German
+#                 4   = Chinese
+#                 5   = Taiwanese
+#                 6   = Spanish
+#                 7   = Spanish Mexico
+#                 8   = Russian
+#
+#    DeclinedNames
+#        Allow russian clients to set and use declined names
+#        Default: 0 - do not use declined names, except when
+#                      the Russian RealmZone is set
+#                 1 - use declined names
+#
+#    StrictPlayerNames
+#        Limit player name to language specific symbol set, don't allow
+#         character creation, and set rename request and disconnect at not
+#         allowed symbols name
+#        Default: 0 disable (limited server timezone dependent client check)
+#                 1 basic latin characters  (strict)
+#                 2 realm zone specific (strict). See RealmZone setting.
+#                   Note: In any case if you want correctly see character
+#                   name at client this client must have appropriate fonts
+#                   (included in client by default, with active official
+#                   localization or custom localization fonts in
+#                   clientdir/Fonts).
+#                 3 basic latin characters + server timezone specific
+#
+#    StrictCharterNames
+#        Limit guild/arena team charter names to language specific symbol set,
+#          don't allow charter creation with unallowed symbols in name
+#        Default: 0 disable
+#                 1 basic latin characters  (strict)
+#                 2 realm zone specific (strict). See RealmZone setting.
+#                   Note: In any case if you want correctly see character
+#                   name at client this client must have appropriate fonts
+#                   (included in client by default, with active official
+#                   localization or custom localization fonts in
+#                   clientdir/Fonts).
+#                 3 basic latin characters + server timezone specific
+#
+#    StrictPetNames
+#        Limit pet names to language specific symbols set
+#        Default: 0 disable
+#                 1 basic latin characters  (strict)
+#                 2 realm zone specific (strict). See RealmZone setting.
+#                   Note: In any case if you want correctly see character
+#                   name at client this client must have appropriate fonts
+#                   (included in client by default, with active official
+#                   localization or custom localization fonts in
+#                   clientdir/Fonts).
+#                 3 basic latin characters + server timezone specific
+#
+#    MinPlayerName
+#        Minimal name length (1..12)
+#        Default: 2
+#
+#    MinCharterName
+#        Minimal name length (1..24)
+#        Default: 2
+#
+#    MinPetName
+#        Minimal name length (1..12)
+#        Default: 2
+#
+#    CharactersCreatingDisabled
+#        Disable characters creating for specific team or any
+#         (non-player accounts not affected)
+#        Default: 0 - enabled
+#                 1 - disabled only for Alliance
+#                 2 - disabled only for Horde
+#                 3 - disabled for both teams
+#
+#    MaxWhoListReturns
+#        Set the max number of players returned in the /who list and interface.
+#        Default: 49 (stable)
+#
+#    CharactersPerAccount
+#        Limit numbers of characters per account (at all realms).
+#         Note: this setting limit character creating at _current_ realm base
+#         at characters amount at all realms
+#        Default: 50
+#                The number must be >= CharactersPerRealm
+#
+#    CharactersPerRealm
+#        Limit numbers of characters for account at realm
+#        Default: 10 (client limitation)
+#                The number must be between 1 and 10
+#
+#    HeroicCharactersPerRealm
+#        Limit numbers of heroic class characters for account at realm
+#        Default: 1
+#                The number must be between 0 (not allowed) and 10
+#
+#    MinLevelForHeroicCharacterCreating
+#        Limit creating heroic characters only for account with another
+#         character of specific level (ignored for GM accounts)
+#                 0  - not require any existed chaarcter
+#                 1  - require at least any character existed
+#        Default: 55 - default requirement
+#
+#
+#    SkipCinematics
+#        Disable in-game script movie at first character's login
+#         (allows to prevent buggy intro in case of custom start
+#         location coordinates)
+#        Default: 0 - show intro for each new characrer
+#                 1 - show intro only for first character of selected race
+#                 2 - disable intro show in all cases
+#
+#    MaxPlayerLevel
+#        Max level that can be reached by player for experience
+#         (in range from 1 to 100). Going past 100 voids your warranty
+#         and you will not receive support for bugs you encounter.
+#        Change not recommended
+#        Default: 80
+#
+#    MinDualSpecLevel
+#        Min level at which players can use Dual Spec functionality
+#        Default: 40
+#
+#    StartPlayerLevel
+#        Staring level that have character upon creation
+#         (in range 1 to MaxPlayerLevel)
+#        Default: 1
+#
+#    StartHeroicPlayerLevel
+#        Staring level that have character of heroic class upon creation
+#         (in range 1 to MaxPlayerLevel)
+#        Default: 55
+#
+#    StartPlayerMoney
+#        Amount of money that new players will start with.
+#         If you want to start with silver, use for example 100
+#         (100 copper = 1 silver)
+#        Default: 0
+#
+#    MaxHonorPoints
+#        Max honor points that player can have.
+#        Default: 75000
+#
+#    StartHonorPoints
+#        Amount of honor that new players will start with
+#        Default: 0
+#
+#    MaxArenaPoints
+#        Max arena points that player can have.
+#        Default: 5000
+#
+#    StartArenaPoints
+#        Amount of arena points that new players will start with
+#        Default: 0
+#
+#    InstantLogout
+#        Enable or disable instant logout for security level (0..4) or higher
+#        (NOT in combat/while dueling/while falling)
+#        Default: 1 (Mods/GMs/Admins)
+#
+#    DisableWaterBreath
+#        Disable/enable waterbreathing for security level (0..4) or higher
+#        Default: 4 (None)
+#
+#    AllFlightPaths
+#        Players will start with all flight paths
+#         (Note: ALL flight paths, not only player's team)
+#        Default: 0 (false)
+#                 1 (true)
+#
+#    InstantFlightPaths
+#        Flight paths will take players to their destination instantly, instead
+#         of making them wait to fly there.
+#        Default: 0 (false)
+#                 1 (true)
+#
+#    AlwaysMaxSkillForLevel
+#        Players will automatically gain max level dependent (weapon/defense)
+#         skill when logging in, leveling up etc.
+#        Default: 0 (false)
+#                 1 (true)
+#
+#    ActivateWeather
+#        Activate weather system
+#        Default: 1 (true)
+#                 0 (false)
+#
+#    CastUnstuck
+#        Allow cast or not Unstuck spell at .start or client Help option use
+#        Default: 1 (true)
+#                 0 (false)
+#
+#    Instance.IgnoreLevel
+#        Ignore level requirement to enter instance
+#        Default: 0 (false)
+#                 1 (true)
+#
+#    Instance.IgnoreRaid
+#        Ignore raid requirement to enter instance
+#        Default: 0 (false)
+#                 1 (true)
+#
+#    Instance.ResetTimeHour
+#        The hour of the day (0-23) when the global instance resets occur.
+#        Default: 4
+#
+#    Instance.UnloadDelay
+#        Unload the instance map from memory after some time
+#         if no players are inside.
+#        Default: 1800000 (miliseconds 30 minutes)
+#                 0 (instance maps are kept in memory until they are reset)
+#
+#    Quests.LowLevelHideDiff
+#        Quest level difference to hide for player low level quests:
+#         if player_level > quest_level + LowLevelQuestsHideDiff then quest
+#         "!" mark not show for quest giver
+#        Default: 4
+#                -1 (show all available quests marks)
+#
+#    Quests.HighLevelHideDiff
+#        Quest level difference to hide for player high level quests:
+#         if player_level < quest_min_level - HighLevelQuestsHideDiff then
+#         quest "!" mark not show for quest giver
+#        Default: 7
+#                -1 (show all available quests marks)
+#
+#    Guild.EventLogRecordsCount
+#        Count of guild event log records stored in guild_eventlog table
+#         Increase to store more guild events in table, minimum is 100
+#         You can set it to very high value to prevent oldest guild events to
+#         be rewritten by latest guild events; can slow down performance
+#        Default: 100
+#
+#    Guild.BankEventLogRecordsCount
+#        Count of guild_bank event log records stored in
+#         guild_bank_eventlog table
+#         Increase to store more guild_bank events in table - minimum is 25
+#         (GUILD_BANK_MAX_LOGS) for each guild_bank tab
+#         Useful when you don't want old log events to be overwritten by new,
+#         but increasing can slow down performance
+#        Default: 25
+#
+#    MaxPrimaryTradeSkill
+#        Max count that player can learn the primary trade skill.
+#        Default: 2
+#        Max : 10
+#
+#    MinPetitionSigns
+#        Min signatures count to creating guild (0..9).
+#        Default: 9
+#
+#    MaxGroupXPDistance
+#        Max distance to creature for group member to get XP at creature death.
+#        Default: 74
+#
+#    MailDeliveryDelay
+#        Mail delivery delay time for item sending
+#        Default: 3600 sec (1 hour)
+#
+#    SkillChance.Prospecting
+#        For prospecting skillup impossible by default,
+#         but can be allowed as custom setting
+#        Default: 0 - no skilups
+#                 1 - skilups possible
+#
+#    SkillChance.Milling
+#        For milling skillup impossible by default,
+#         but can be allowed as custom setting
+#        Default: 0 - no skilups
+#                 1 - skilups possible
+#
+#    OffhandCheckAtSpellUnlearn
+#        Unlearning certain spells can change offhand weapon restrictions
+#         for equip slots.
+#        Default: 0 - recheck offhand slot weapon only at zone update
+#                 1 - recheck offhand slot weapon at unlearning a spell
+#
+#    ClientCacheVersion
+#        Client cache version for client cache data reset. Use any different
+#         from DB value and not recently used for triggering reset.
+#        Default: 0 (use DB value from world DB db_version.cache_id field)
+#
+#    Event.Announce
+#        Default: 0 (false)
+#                 1 (true)
+#
+#    BeepAtStart
+#        Beep at core start finished (mostly work only at Unix/Linux systems)
+#        Default: 1 (true)
+#                 0 (false)
+#
+#    Motd
+#        Message of the Day. Displayed at worldlogin for every user
+#         Use '@' for a newline, and be sure to escape special characters.
+#        Example: "Welcome to John\'s Server@WinterGrasp is closed."
+#
+#    Server.LoginInfo
+#        Enable/disable sending server info (core version) on login.
+#        Default: 0 - disable
+#                 1 - enable
+#
+###############################################################################
+
+GameType = 0
+RealmZone = 1
+Expansion = 2
+DBC.Locale = 255
+DeclinedNames = 0
+StrictPlayerNames = 0
+StrictCharterNames = 0
+StrictPetNames = 0
+MaxWhoListReturns = 49
+MinPlayerName = 2
+MinCharterName = 2
+MinPetName = 2
+CharactersCreatingDisabled = 0
+CharactersPerAccount = 50
+CharactersPerRealm = 10
+HeroicCharactersPerRealm = 1
+MinLevelForHeroicCharacterCreating = 55
+SkipCinematics = 0
+MaxPlayerLevel = 80
+MinDualSpecLevel = 40
+StartPlayerLevel = 1
+StartHeroicPlayerLevel = 55
+StartPlayerMoney = 0
+MaxHonorPoints = 75000
+StartHonorPoints = 0
+MaxArenaPoints = 5000
+StartArenaPoints = 0
+InstantLogout = 1
+DisableWaterBreath = 4
+AllFlightPaths = 0
+InstantFlightPaths = 0
+AlwaysMaxSkillForLevel = 0
+ActivateWeather = 1
+CastUnstuck = 1
+Instance.IgnoreLevel = 0
+Instance.IgnoreRaid = 0
+Instance.ResetTimeHour = 4
+Instance.UnloadDelay = 1800000
+Quests.LowLevelHideDiff = 4
+Quests.HighLevelHideDiff = 7
+Guild.EventLogRecordsCount = 100
+Guild.BankEventLogRecordsCount = 25
+MaxPrimaryTradeSkill = 2
+MinPetitionSigns = 9
+MaxGroupXPDistance = 74
+MailDeliveryDelay = 3600
+SkillChance.Prospecting = 0
+SkillChance.Milling = 0
+OffhandCheckAtSpellUnlearn = 0
+ClientCacheVersion = 0
+Event.Announce = 0
+BeepAtStart = 1
+Motd = "Welcome to a Trinity Core server."
+Server.LoginInfo = 0
+
+###############################################################################
+# PLAYER INTERACTION
+#
+#    AllowTwoSide.Accounts
+#        Allow or not accounts to create characters in the 2 teams
+#         in any game type.
+#        Default: 1 (Allowed)
+#                 0 (Not allowed)
+#
+#    AllowTwoSide.Interaction.Chat
+#    AllowTwoSide.Interaction.Channel
+#    AllowTwoSide.Interaction.Group
+#    AllowTwoSide.Interaction.Guild
+#    AllowTwoSide.Interaction.Auction
+#    AllowTwoSide.Interaction.Mail
+#        Allow or not common :chat(say,yell)
+#                             channel(chat)
+#                             group(join)
+#                             guild(join)
+#                             merge all auction houses for players from
+#                             different teams
+#                             send mail to other team.
+#        Default: 0 (Not allowed)
+#                 1 (Allowed)
+#
+#    AllowTwoSide.WhoList
+#        Allow or not show player from both team in who list.
+#        Default: 0 (Not allowed)
+#                 1 (Allowed)
+#
+#    AllowTwoSide.AddFriend
+#        Allow or not adding friends from other team in friend list.
+#        Default: 0 (Not allowed)
+#                 1 (Allowed)
+#
+#    AllowTwoSide.Trade
+#        Allow or not trading with other team in party.
+#        Default: 0 (Not allowed)
+#                 1 (Allowed)
+#
+#    TalentsInspecting
+#        Allow other players see character talents in inspect dialog
+#         (Characters in Gamemaster mode can inspect talents always)
+#        Default: 1 (allow)
+#                 0 (not allow)
+#
+###############################################################################
+
+AllowTwoSide.Accounts = 1
+AllowTwoSide.Interaction.Chat = 0
+AllowTwoSide.Interaction.Channel = 0
+AllowTwoSide.Interaction.Group = 0
+AllowTwoSide.Interaction.Guild = 0
+AllowTwoSide.Interaction.Auction = 0
+AllowTwoSide.Interaction.Mail = 0
+AllowTwoSide.WhoList = 0
+AllowTwoSide.AddFriend = 0
+AllowTwoSide.Trade = 0
+TalentsInspecting = 1
+
+###############################################################################
+# CREATURE SETTINGS
+#
+#    ThreatRadius
+#        Radius for creature to evade after being
+#         pulled away from combat start point
+#         If ThreatRadius is less than creature aggro radius
+#         then aggro radius will be used
+#        Default: 60 yards
+#
+#    Rate.Creature.Aggro
+#        Aggro radius percent or off.
+#        Default: 1   - 100%
+#                 1.5 - 150%
+#                 0   - off (0%)
+#
+#    CreatureFamilyFleeAssistanceRadius
+#        Radius which creature will use to seek for a nearby creature
+#         for assistance. Creature will flee to this creature.
+#        Default: 30
+#                 0   - off
+#
+#    CreatureFamilyAssistanceRadius
+#        Radius which creature will use to call assistance without moving
+#        Default: 10
+#                 0   - off
+#
+#    CreatureFamilyAssistanceDelay
+#        Reaction time for creature assistance call
+#        Default: 1500 (1.5s)
+#
+#    CreatureFamilyFleeDelay
+#        Time during which creature can flee when no assistant found
+#        Default: 7000 (7s)
+#
+#    WorldBossLevelDiff
+#        Difference for boss dynamic level with target
+#        Default: 3
+#
+#    Corpse.Decay.NORMAL
+#    Corpse.Decay.RARE
+#    Corpse.Decay.ELITE
+#    Corpse.Decay.RAREELITE
+#    Corpse.Decay.WORLDBOSS
+#        Seconds until creature corpse will decay if not looted or skinned.
+#        Default: 60, 300, 300, 300, 3600
+#
+#    Rate.Corpse.Decay.Looted
+#         Controls how long the creature corpse stays after it had been looted,
+#          as a multiplier of its Corpse.Decay.* config.
+#         Default: 0.5
+#
+#    Rate.Creature.Normal.Damage
+#    Rate.Creature.Elite.Elite.Damage
+#    Rate.Creature.Elite.RAREELITE.Damage
+#    Rate.Creature.Elite.WORLDBOSS.Damage
+#    Rate.Creature.Elite.RARE.Damage
+#        Creature Damage Rates.
+#        Examples: 2 - creatures will damage 2x, 1.7 - 1.7x.
+#
+#    Rate.Creature.Normal.SpellDamage
+#    Rate.Creature.Elite.Elite.SpellDamage
+#    Rate.Creature.Elite.RAREELITE.SpellDamage
+#    Rate.Creature.Elite.WORLDBOSS.SpellDamag
+#    Rate.Creature.Elite.RARE.SpellDamage
+#        Creature Spell Damage Rates.
+#        Examples: 2 - creatures will damage with spells 2x, 1.7 - 1.7x.
+#
+#    Rate.Creature.Normal.HP
+#    Rate.Creature.Elite.Elite.HP
+#    Rate.Creature.Elite.RAREELITE.HP
+#    Rate.Creature.Elite.WORLDBOSS.HP
+#    Rate.Creature.Elite.RARE.HP
+#        Creature Health Ammount Modifier.
+#        Examples: 2 - creatures have 2x health, 1.7 - 1.7x.
+#
+#    ListenRange.Say
+#        Distance from player to listen text that creature
+#         (or other world object) says
+#        Default: 40
+#
+#    ListenRange.TextEmote
+#        Distance from player to listen textemote that creature
+#         (or other world object) says
+#        Default: 40
+#
+#    ListenRange.Yell
+#        Distance from player to listen text that creature
+#         (or other world object) yells
+#        Default: 300
+#
+###############################################################################
+
+ThreatRadius = 60
+Rate.Creature.Aggro = 1
+CreatureFamilyFleeAssistanceRadius = 30
+CreatureFamilyAssistanceRadius = 10
+CreatureFamilyAssistanceDelay = 1500
+CreatureFamilyFleeDelay = 7000
+WorldBossLevelDiff = 3
+Corpse.Decay.NORMAL = 60
+Corpse.Decay.RARE = 300
+Corpse.Decay.ELITE = 300
+Corpse.Decay.RAREELITE = 300
+Corpse.Decay.WORLDBOSS = 3600
+Rate.Corpse.Decay.Looted = 0.5
+Rate.Creature.Normal.Damage = 1
+Rate.Creature.Elite.Elite.Damage = 1
+Rate.Creature.Elite.RAREELITE.Damage = 1
+Rate.Creature.Elite.WORLDBOSS.Damage = 1
+Rate.Creature.Elite.RARE.Damage = 1
+Rate.Creature.Normal.SpellDamage = 1
+Rate.Creature.Elite.Elite.SpellDamage = 1
+Rate.Creature.Elite.RAREELITE.SpellDamage = 1
+Rate.Creature.Elite.WORLDBOSS.SpellDamage = 1
+Rate.Creature.Elite.RARE.SpellDamage = 1
+Rate.Creature.Normal.HP = 1
+Rate.Creature.Elite.Elite.HP = 1
+Rate.Creature.Elite.RAREELITE.HP = 1
+Rate.Creature.Elite.WORLDBOSS.HP = 1
+Rate.Creature.Elite.RARE.HP = 1
+ListenRange.Say = 40
+ListenRange.TextEmote = 40
+ListenRange.Yell = 300
+
+###############################################################################
+# CHAT SETTINGS
+#
+#    ChatFakeMessagePreventing
+#        Chat protection from creating fake messages using a lot spaces
+#         (other invisible symbols),
+#         not applied to addon language messages, but can cause old addons
+#         that use normal languages for sending data to another clients.
+#        Default: 0 (disible fake messages preventing)
+#                 1 (enabled fake messages preventing)
+#
+#    ChatStrictLinkChecking.Severity
+#        Check chat messages for ingame links to
+#         spells, items, quests, achievements etc.
+#        Default: 0 (disable link checking)
+#                 1 (check if only valid pipe commands are used.
+#                    This prevents posting pictures for example)
+#                 2 (verifiy that pipe commands are used in a correct order)
+#                 3 (check if color, entry and name don't contradict
+#                    each other. For correct work, please assure
+#                    that you have extracted locale DBCs of every language
+#                    specific client playing on this server.)
+#
+#    ChatStrictLinkChecking.Kick
+#        Defines what should be done if a message is considered to contain
+#         invalid pipe commands.
+#        Default: 0 (silently ignore message)
+#                 1 (kick players who sent invalid formed messages)
+#
+#    ChatFlood.MessageCount
+#        Chat anti-flood protection, haste message count to activate protection
+#        Default: 10
+#                 0 (disible anti-flood protection)
+#
+#    ChatFlood.MessageDelay
+#        Chat anti-flood protection, minimum message delay to count message
+#        Default: 1 (in secs)
+#
+#    ChatFlood.MuteTime
+#        Chat anti-flood protection, mute time at activation flood protection
+#        Default: 10 (in secs)
+#
+#    Channel.RestrictedLfg
+#        Restrict LookupForGroup channel to registered in LFG tool players
+#        Default: 1 (allow join to channel only if active in LFG)
+#                 0 (allow join to channel in any time)
+#
+#    Channel.SilentlyGMJoin
+#        Silently join GM characters (security level > 1) to channels
+#        Default: 0 (join announcement in normal way)
+#                 1 (GM join without announcement)
+#
+#    ChatLevelReq.Channel
+#        The required level of character to be able to write in chat channels
+#        Default: 1 (From level 1)
+#
+#    ChatLevelReq.Whisper
+#        The required level of character to be able to whisper
+#        Default: 1 (From level 1)
+#
+#    ChatLevelReq.Say
+#        The required level of character to be able to say/yell/emote
+#        Default: 1 (From level 1)
+#
+#    AllowPlayerCommands
+#        Allowed the players to use commands
+#        Default: 1 (allow)
+#
+###############################################################################
+
+ChatFakeMessagePreventing = 0
+ChatStrictLinkChecking.Severity = 0
+ChatStrictLinkChecking.Kick = 0
+ChatFlood.MessageCount = 10
+ChatFlood.MessageDelay = 1
+ChatFlood.MuteTime = 10
+Channel.RestrictedLfg = 1
+Channel.SilentlyGMJoin = 0
+ChatLevelReq.Channel = 1
+ChatLevelReq.Whisper = 1
+ChatLevelReq.Say = 1
+AllowPlayerCommands = 1
+
+###############################################################################
+# GAME MASTER SETTINGS
+#
+#    GM.LoginState
+#        GM mode at login
+#        Default: 2 (last save state)
+#                 0 (disable)
+#                 1 (enable)
+#
+#    GM.Visible
+#        GM visibility at login
+#        Default: 2 (last save state)
+#                 0 (invisible)
+#                 1 (visible)
+#
+#    GM.AcceptTickets
+#        Is GM accepting tickets from player by default or not.
+#        Default: 2 (last save state)
+#                 0 (disable)
+#                 1 (enable)
+#
+#    GM.Chat
+#        GM chat mode at login
+#        Default: 2 (last save state)
+#                 0 (disable)
+#                 1 (enable)
+#
+#    GM.WhisperingTo
+#        Is GM accepting whispers from player by default or not.
+#        Default: 2 (last save state)
+#                 0 (disable)
+#                 1 (enable)
+#
+#    GM.InGMList.Level
+#        Max GM level showed in GM list (if visible) in non-GM state (.gm off)
+#                 0 (only players)
+#                 1 (only moderators)
+#                 2 (only gamemasters)
+#        Default: 3 (anyone)
+#
+#    GM.InWhoList.Level
+#        Max GM level showed in who list (if visible).
+#                 0 (only players)
+#                 1 (only moderators)
+#                 2 (only gamemasters)
+#        Default: 3 (anyone)
+#
+#    GM.LogTrade
+#        Include GM trade and trade slot enchanting operations in GM log
+#        Default: 1 (include)
+#                 0 (not include)
+#
+#    GM.StartLevel
+#        GM starting level (1-100)
+#        Default: 1
+#
+#    GM.AllowInvite
+#        Is GM accepting invites from players by default or not
+#        Default: 0 (false)
+#                 1 (true)
+#
+#    GM.AllowFriend
+#        Are players allowed to add GMs to their friend list
+#        Default: 0 (false)
+#                 1 (true)
+#
+#    GM.LowerSecurity
+#        Disallow a lower security member to interact with
+#         a higher one using commands
+#        Default: 0 (disable)
+#                 1 (enable)
+#
+#    GM.AllowAchievementGain
+#        If enabled it allows gaining achievements for GM characters
+#        Default: 1 (enable)
+#                 0 (disable)
+#
+###############################################################################
+
+GM.LoginState            = 2
+GM.Visible               = 2
+GM.AcceptTickets         = 2
+GM.Chat                  = 2
+GM.WhisperingTo          = 2
+GM.InGMList.Level        = 3
+GM.InWhoList.Level       = 3
+GM.LogTrade              = 1
+GM.StartLevel            = 80
+GM.AllowInvite           = 0
+GM.AllowFriend           = 0
+GM.LowerSecurity         = 0
+GM.AllowAchievementGain  = 1
+
+###############################################################################
+# VISIBILITY AND RADIUSES
+#
+#    Visibility.GroupMode
+#        Group visibility modes
+#        Default: 0 (standard setting: only members from same group can
+#                    100% auto detect invisible player)
+#                 1 (raid members 100% auto detect invisible player from
+#                    same raid)
+#                 2 (players from same team can 100% auto detect
+#                    invisible player)
+#
+#    Visibility.Distance.Continents
+#    Visibility.Distance.Instances
+#    Visibility.Distance.BGArenas
+#        Visibility distance for different ingame object in different maps.
+#        Visibility on continents on offy ~90 yards. In BG/Arenas ~180.
+#        For instances default ~120.
+#        Max limited by active player zone: ~ 333
+#        Min limit is max aggro radius (45) * Rate.Creature.Aggro
+#
+#    Visibility.Distance.Object
+#        Visible distance for gameobject, dynobject, bodies, corpses, bones
+#        Min limit is iteraction distance (5)
+#
+#    Visibility.Distance.InFlight
+#        Visible distance for player in flight
+#        Min limit is 0 (not show any objects)
+#
+#    Visibility.Distance.Grey.Unit
+#        Visibility grey distance for creatures/players (fast changing objects)
+#         addition to appropriate object type Visibility.Distance.* use in case
+#         visibility removing to object (except corpse around distances)
+#         If D is distance and G is grey distance then object
+#         make visible if distance to it <= D
+#         but make non visible if distance > D+G
+#        Default: 1 (yard)
+#
+#    Visibility.Distance.Grey.Object
+#        Visibility grey distance for dynobjects/gameobjects/corpses/creatures
+#        Default: 10 (yards)
+#
+###############################################################################
+
+Visibility.GroupMode = 0
+Visibility.Distance.Continents = 90
+Visibility.Distance.Instances = 120
+Visibility.Distance.BGArenas = 180
+Visibility.Distance.Object = 100
+Visibility.Distance.InFlight = 100
+Visibility.Distance.Grey.Unit   = 1
+Visibility.Distance.Grey.Object = 10
+
+Visibility.Notify.Period.OnContinents = 1000
+Visibility.Notify.Period.InInstances  = 1000
+Visibility.Notify.Period.InBGArenas   = 1000
+
+###############################################################################
+# SERVER RATES
+#
+#    Rate.Health
+#    Rate.Mana
+#    Rate.Rage.Income
+#    Rate.Rage.Loss
+#    Rate.RunicPower.Income
+#    Rate.RunicPower.Loss
+#    Rate.Focus
+#    Rate.Loyalty
+#        Health and power regeneration and rage income from damage.
+#        Default: 1
+#
+#    Rate.Skill.Discovery
+#        Skill Discovery Rates
+#        Default: 1
+#
+#    Rate.Drop.Item.Poor
+#    Rate.Drop.Item.Normal
+#    Rate.Drop.Item.Uncommon
+#    Rate.Drop.Item.Rare
+#    Rate.Drop.Item.Epic
+#    Rate.Drop.Item.Legendary
+#    Rate.Drop.Item.Artifact
+#    Rate.Drop.Item.Referenced
+#    Rate.Drop.Money
+#        Drop rates (items by quality and money)
+#        Default: 1
+#
+#    Rate.Drop.Money
+#        Drop rates
+#        Default: 1
+#
+#    Rate.XP.Kill
+#    Rate.XP.Quest
+#    Rate.XP.Explore
+#        XP rates
+#        Default: 1
+#
+#    Rate.RepairCost
+#        Repair cost rate
+#        Default: 1   - standard cost
+#                 2   - double cost
+#                 0.5 - half cost
+#
+#    Rate.Rest.InGame
+#    Rate.Rest.Offline.InTavernOrCity
+#    Rate.Rest.Offline.InWilderness
+#        Resting points grow rates
+#        Default: 1   - standard rate
+#                 2   - double rate
+#                 0.5 - half rate
+#
+#    Rate.Damage.Fall
+#        Damage after fall rate.
+#        Default: 1   - standard damage
+#                 2   - double damage
+#                 0.5 - half damage
+#
+#    Rate.Auction.Time
+#    Rate.Auction.Deposit
+#    Rate.Auction.Cut
+#        Auction rates
+#         (auction time, deposit get at auction start,
+#         auction cut from price at auction end)
+#
+#    Rate.Honor
+#        Honor gain rate
+#
+#    Rate.Mining.Amount
+#    Rate.Mining.Next
+#        Mining Rates
+#         Mining.Amount changes minimum/maximum use times of a deposit,
+#         Mining.Next changes chance to have next use of a deposit
+#
+#    Rate.Talent
+#        Talent Point rates
+#        Default: 1
+#
+#    Rate.Reputation.Gain
+#        Reputation Gain rate
+#        Default: 1
+#
+#    Rate.Reputation.LowLevel.Kill
+#        Reputation Gain from low level kill (grey creture)
+#        Default: 1
+#
+#    Rate.Reputation.LowLevel.Quest
+#        Reputation Gain rate
+#        Default: 1
+#
+#    Rate.MoveSpeed
+#        Multiply the default movement speed for players
+#         and whatever they're controlling.
+#        Default: 1   - no change
+#                 1.4 - 40% increase
+#
+#    Rate.InstanceResetTime
+#        Multiplier for the number of days in between
+#         global raid/heroic instance resets.
+#        Default: 1
+#
+#    SkillGain.Crafting
+#    SkillGain.Defense
+#    SkillGain.Gathering
+#    SkillGain.Weapon
+#        Crafting/defense/gathering/weapon skills gain at skill grow (1,2,...)
+#        Default: 1
+#
+#    SkillChance.Orange
+#    SkillChance.Yellow
+#    SkillChance.Green
+#    SkillChance.Grey
+#        Skill chance values (0..100)
+#        Default: 100-75-25-0
+#
+#    SkillChance.MiningSteps
+#    SkillChance.SkinningSteps
+#        For skinning and Mining chance decrease with skill level.
+#        Default: 0  - no decrease
+#                 75 - in 2 times each 75 skill points
+#
+#    DurabilityLoss.InPvP
+#        If true, players take durability loss on death in PvP.
+#        Default: 0 (false)
+#                 1 (true)
+#
+#    DurabilityLoss.OnDeath
+#        Durability loss percentage on death
+#        Default: 10 - standard
+#                 20 - double
+#                 5  - half
+#
+#    DurabilityLossChance.Damage
+#        Chance lost one from equiped items durability
+#         point at damage apply or receive.
+#        Default: 0.5 (100/0.5 = 200)
+#         Each 200 damage apply one from 19 possible equipped items
+#
+#    DurabilityLossChance.Absorb
+#         Chance lost one from armor items durability point at damage absorb.
+#         Default: 0.5 (100/0.5 = 200)
+#          Each 200 absorbs apply one from 15 possible armor equipped items
+#
+#    DurabilityLossChance.Parry
+#         Chance lost weapon durability point at parry.
+#         Default: 0.05 (100/0.05 = 2000)
+#          Each 2000 parry attacks main weapon lost point
+#
+#    DurabilityLossChance.Block
+#         Chance lost sheild durability point at damage block.
+#         Default: 0.05 (100/0.05 = 2000)
+#          Each 2000 partly or full blocked attacks shield lost point
+#
+#    Death.SicknessLevel
+#         Starting Character start gain sickness at spirit resurrection (1 min)
+#         Default: 11
+#                  -10 - character will have full time
+#                    (10min) sickness at 1 level
+#                  maxplayerlevel+1
+#                   - character will not have sickess at any level
+#
+#    Death.CorpseReclaimDelay.PvP
+#    Death.CorpseReclaimDelay.PvE
+#         Enabled/disabled increase corpse reclaim delay at PvP/PvE deaths
+#         Default: 1 (enabled)
+#                  0 (disabled)
+#
+#    Death.Bones.World
+#    Death.Bones.BattlegroundOrArena
+#         Enable/disable creating bones instead corpse at resurrection
+#          (in normal zones/instances, or battleground/arenas)
+#         Default: 1 (enabled)
+#                  0 (disabled)
+#
+#    Die.Command.Mode
+#        Switch between two possible .die modes, where mode 1 kills
+#         and does not trigger anything such as loot, and mode 0 does
+#         damage and does trigger things such as loot
+#        Default: 1
+#                  0
+#
+###############################################################################
+
+Rate.Health = 1
+Rate.Mana = 1
+Rate.Rage.Income = 1
+Rate.Rage.Loss = 1
+Rate.RunicPower.Income = 1
+Rate.RunicPower.Loss = 1
+Rate.Focus = 1
+Rate.Loyalty = 1
+Rate.Skill.Discovery = 1
+Rate.Drop.Item.Poor = 1
+Rate.Drop.Item.Normal = 1
+Rate.Drop.Item.Uncommon = 1
+Rate.Drop.Item.Rare = 1
+Rate.Drop.Item.Epic = 1
+Rate.Drop.Item.Legendary = 1
+Rate.Drop.Item.Artifact = 1
+Rate.Drop.Item.Referenced = 1
+Rate.Drop.Money = 1
+Rate.XP.Kill    = 1
+Rate.XP.Quest   = 1
+Rate.XP.Explore = 1
+Rate.RepairCost = 1
+Rate.Rest.InGame = 1
+Rate.Rest.Offline.InTavernOrCity = 1
+Rate.Rest.Offline.InWilderness = 1
+Rate.Damage.Fall = 1
+Rate.Auction.Time = 1
+Rate.Auction.Deposit = 1
+Rate.Auction.Cut = 1
+Rate.Honor = 1
+Rate.Mining.Amount = 1
+Rate.Mining.Next   = 1
+Rate.Talent = 1
+Rate.Reputation.Gain = 1
+Rate.Reputation.LowLevel.Kill    = 1
+Rate.Reputation.LowLevel.Quest   = 1
+Rate.MoveSpeed = 1
+Rate.InstanceResetTime = 1
+SkillGain.Crafting = 1
+SkillGain.Defense = 1
+SkillGain.Gathering = 1
+SkillGain.Weapon = 1
+SkillChance.Orange = 100
+SkillChance.Yellow = 75
+SkillChance.Green  = 25
+SkillChance.Grey   = 0
+SkillChance.MiningSteps   = 0
+SkillChance.SkinningSteps = 0
+DurabilityLoss.InPvP = 0
+DurabilityLoss.OnDeath = 10
+DurabilityLossChance.Damage = 0.5
+DurabilityLossChance.Absorb = 0.5
+DurabilityLossChance.Parry  = 0.05
+DurabilityLossChance.Block  = 0.05
+Death.SicknessLevel = 11
+Death.CorpseReclaimDelay.PvP = 1
+Death.CorpseReclaimDelay.PvE = 0
+Death.Bones.World = 1
+Death.Bones.BattlegroundOrArena = 1
+Die.Command.Mode = 1
+
+###############################################################################
+# AUTO BROADCAST
+#
+#    AutoBroadcast.On
+#        Enable auto broadcast
+#        Default: 0 - off
+#                 1 - on
+#
+#    AutoBroadcast.Center
+#        Display method
+#        Default: 0 - announce
+#                 1 - notify
+#                 2 - both
+#
+#    AutoBroadcast.Timer
+#        Timer for auto broadcast (in milliseconds)
+#
+###############################################################################
+
+AutoBroadcast.On = 0
+AutoBroadcast.Center = 0
+AutoBroadcast.Timer = 60000
+
+###############################################################################
+# BATTLEGROUND CONFIG
+#
+#    Battleground.CastDeserter
+#        Cast Deserter spell at player who leave battleground in progress
+#        Default: 1 (enable)
+#                 0 (disable)
+#
+#    Battleground.QueueAnnouncer.Enable
+#        Enable queue announcer posting to chat
+#        Default: 0 (disable)
+#                 1 (enable)
+#
+#    Battleground.QueueAnnouncer.PlayerOnly
+#        Enable queue announcer posting to chat
+#        Default: 0 (disable)
+#                 1 (enable)
+#
+#    Battleground.InvitationType
+#        Set Battleground invitation type
+#        Default: 0 (normal - invite as much players to bg as possible,
+#                    don't bother with ballance)
+#                 1 (Experimental - don't allow to invite much more players
+#                    of one faction)
+#
+#    Battleground.PrematureFinishTimer
+#        The time to end the bg if there are less than MinPlayersPerTeam on
+#         one side (in milliseconds)
+#        Default: 300000 (5 minutes)
+#                 0 - disable (not recommended)
+#
+#    BattleGround.PremadeGroupWaitForMatch
+#        The time in which premade group of 1 faction waits in BG Queue
+#         for premade group of other faction
+#        Default: 1800000 (30 minutes)
+#                 0 - disable (not recommended)
+#
+#    Battleground.GiveXPForKills
+#        Give experience for honorable kills in battlegrounds
+#        Default: 0 (disable)
+#                 1 (enable)
+#
+#    Battleground.Random.ResetHour
+#        Reset random battlegrounds at specified hour of the day (0-23)
+#        Default: 6
+#
+###############################################################################
+
+Battleground.CastDeserter = 1
+Battleground.QueueAnnouncer.Enable = 0
+Battleground.QueueAnnouncer.PlayerOnly = 0
+Battleground.InvitationType = 0
+BattleGround.PrematureFinishTimer = 300000
+BattleGround.PremadeGroupWaitForMatch = 1800000
+Battleground.GiveXPForKills = 0
+Battleground.Random.ResetHour = 6
+
+###############################################################################
+# ARENA CONFIG
+#
+#    Arena.MaxRatingDifference
+#        The maximum rating difference between two groups in rated matches
+#        Default: 150 (enable, recommended)
+#                 0 (disable, rating difference is discarded)
+#
+#    Arena.RatingDiscardTimer
+#        After the specified milliseconds has passed,
+#         rating information will be discarded when selecting teams for
+#         matches also initiates an update by this timer
+#        Default: 600000 (10 minutes, recommended)
+#                 0 (disable)
+#
+#    Arena.AutoDistributePoints
+#        Set if arena points should be distributed automatically,
+#         or by GM command
+#        Default: 0 (disable) (recommended):
+#                    use gm command or sql query to distribute the points
+#                 1 (enable)  arena points are distributed automatically
+#
+#    Arena.AutoDistributeInterval
+#        How often should the distribution take place
+#        If automatic distribution is enabled in days
+#        Default: 7 (weekly)
+#
+#    Arena.QueueAnnouncer.Enable
+#        Enable bg queue announcer posting to chat
+#        Default: 0 (disable)
+#                 1 (enable)
+#
+#    Arena.ArenaSeason.ID
+#        Current area season id show in client
+#        Default: 1
+#
+#    Arena.ArenaSeason.InProgress
+#        Current area season state
+#        Default: 1 (active)
+#                 0 (finished)
+#
+#    Arena.ArenaStartRating
+#	 Start arena team command rating
+#	 Default: 1500 
+#
+#    Arena.StartPersonalRating
+#	 Start personal rating on entry in team
+#	 Default: 1500
+#
+###############################################################################
+
+Arena.MaxRatingDifference = 150
+Arena.RatingDiscardTimer = 600000
+Arena.AutoDistributePoints = 0
+Arena.AutoDistributeInterval = 7
+Arena.QueueAnnouncer.Enable = 0
+Arena.QueueAnnouncer.PlayerOnly = 0
+Arena.ArenaSeason.ID = 1
+Arena.ArenaSeason.InProgress = 1
+Arena.ArenaStartRating = 0
+Arena.ArenaStartPersonalRating = 0
+
+###############################################################################
+# NETWORK CONFIG
+#
+#    Network.Threads
+#         Number of threads for network,
+#          recommend 1 thread per 1000 connections.
+#         Default: 1
+#
+#    Network.OutKBuff
+#         The size of the output kernel buffer used
+#          ( SO_SNDBUF socket option, tcp manual ).
+#         Default: -1 (Use system default setting)
+#
+#    Network.OutUBuff
+#         Userspace buffer for output.
+#          This is amount of memory reserved per each connection.
+#         Default: 65536
+#
+#    Network.TcpNoDelay:
+#         TCP Nagle algorithm setting
+#         Default: 0 (enable Nagle algorithm, less traffic, more latency)
+#                  1 (TCP_NO_DELAY, disable Nagle algorithm,
+#                     more traffic but less latency)
+#
+###############################################################################
+
+Network.Threads = 1
+Network.OutKBuff = -1
+Network.OutUBuff = 65536
+Network.TcpNodelay = 1
+
+###############################################################################
+# AUCTION HOUSE BOT SETTINGS
+#
+#    AuctionHouseBot.DEBUG
+#        Enable/Disable Debugging output
+#    Default 0 (disabled)
+#
+#    AuctionHouseBot.DEBUG_FILTERS
+#        Enable/Disable Debugging output from Filters
+#    Default 0 (disabled)
+#
+#    AuctionHouseBot.EnableSeller
+#        Enable/Disable the part of AHBot that puts items up for auction
+#    Default 0 (disabled)
+#
+#    AuctionHouseBot.EnableBuyer
+#        Enable/Disable the part of AHBot that buys items from players
+#    Default 0 (disabled)
+#
+#    AuctionHouseBot.UseBuyPriceForSeller
+#        Should the Seller use BuyPrice or SellPrice to determine Bid Prices
+#    Default 0 (use SellPrice)
+#
+#    AuctionHouseBot.UseBuyPriceForBuyer
+#        Should the Buyer use BuyPrice or SellPrice to determine Bid Prices
+#    Default 0 (use SellPrice)
+#
+#    Auction House Bot character data
+#        AuctionHouseBot.Account is the account number
+#         (in realmd->account table) of the player you want to run
+#         as the auction bot.
+#        AuctionHouseBot.GUID is the GUID (in characters->characters table)
+#         of the player you want to run as the auction bot.
+#    Default: 0 (Auction House Bot disabled)
+#
+#    AuctionHouseBot.ItemsPerCycle
+#        Number of Items to Add/Remove from the AH during mass operations
+#    Default 200
+#
+###############################################################################
+
+AuctionHouseBot.DEBUG = 0
+AuctionHouseBot.DEBUG_FILTERS = 0
+AuctionHouseBot.EnableSeller = 0
+AuctionHouseBot.EnableBuyer = 0
+AuctionHouseBot.UseBuyPriceForSeller = 0
+AuctionHouseBot.UseBuyPriceForBuyer = 0
+AuctionHouseBot.Account = 0
+AuctionHouseBot.GUID = 0
+AuctionHouseBot.ItemsPerCycle = 200
+
+###############################################################################
+# AUCTION HOUSE BOT FILTERS PART 1
+#
+#    AuctionHouseBot.VendorItems
+#        Include items that can be bought from vendors.
+#    Default 0 (False)
+#
+#    AuctionHouseBot.VendorTradeGoods
+#        Include Trade Goods that can be bought from vendors.
+#    Default 0 (False)
+#
+#    AuctionHouseBot.LootItems
+#        Include items that can be looted or fished for.
+#    Default 1 (True)
+#
+#    AuctionHouseBot.LootTradeGoods
+#        Include Trade Goods that can be looted or fished for.
+#    Default 1 (True)
+#
+#    AuctionHouseBot.OtherItems
+#        Include misc. items.
+#    Default 0 (False)
+#
+#    AuctionHouseBot.OtherTradeGoods
+#        Include misc. Trade Goods.
+#    Default 0 (False)
+#
+#    AuctionHouseBot.Bonding_types
+#        Indicates which bonding types to allow seller to put up for auction
+#            No_Bind
+#             Default 1 (True)
+#            Bind_When_Picked_Up
+#             Default 0 (False)
+#            Bind_When_Equipped
+#             Default 1 (True)
+#            Bind_When_Use
+#             Default 1 (True)
+#            Bind_Quest_Item
+#             Default 0 (False)
+#
+#    AuctionHouseBot.DisableBeta_PTR_Unused
+#        Disable certain items that are usually unavailable to Players
+#    Default 0 (False)
+#
+#    AuctionHouseBot.DisablePermEnchant
+#        Disable Items with a Permanent Enchantment
+#    Default 0 (False)
+#
+#    AuctionHouseBot.DisableConjured
+#        Disable Conjured Items
+#    Default 0 (False)
+#
+#    AuctionHouseBot.DisableGems
+#        Disable Gems
+#    Default 0 (False)
+#
+#    AuctionHouseBot.DisableMoney
+#        Disable Items that are used as money
+#    Default 0 (False)
+#
+#    AuctionHouseBot.DisableMoneyLoot
+#        Disable Items that have Money as a loot
+#    Default 0 (False)
+#
+#    AuctionHouseBot.DisableLootable
+#        Disable Items that have other items as loot
+#    Default 0 (False)
+#
+#    AuctionHouseBot.DisableKeys
+#        Disable Items that are keys
+#    Default 0 (False)
+#
+#    AuctionHouseBot.DisableDuration
+#        Disable Items with a duration
+#    Default 0 (False)
+#
+#    AuctionHouseBot.DisableBOP_Or_Quest_NoReqLevel
+#        Disable items that are BOP or Quest Item
+#        with a Required level that is less than the Item Level
+#        (This prevents a level 10 with a level 60 weapon or armor)
+#        (May need further refinement)
+#    Default 0 (False)
+#
+###############################################################################
+
+AuctionHouseBot.VendorItems = 0
+AuctionHouseBot.VendorTradeGoods = 0
+AuctionHouseBot.LootItems = 1
+AuctionHouseBot.LootTradeGoods = 1
+AuctionHouseBot.OtherItems = 0
+AuctionHouseBot.OtherTradeGoods = 0
+AuctionHouseBot.No_Bind = 1
+AuctionHouseBot.Bind_When_Picked_Up = 0
+AuctionHouseBot.Bind_When_Equipped = 1
+AuctionHouseBot.Bind_When_Use = 1
+AuctionHouseBot.Bind_Quest_Item = 0
+AuctionHouseBot.DisableBeta_PTR_Unused = 0
+AuctionHouseBot.DisablePermEnchant = 0
+AuctionHouseBot.DisableConjured = 0
+AuctionHouseBot.DisableGems = 0
+AuctionHouseBot.DisableMoney = 0
+AuctionHouseBot.DisableMoneyLoot = 0
+AuctionHouseBot.DisableLootable = 0
+AuctionHouseBot.DisableKeys = 0
+AuctionHouseBot.DisableDuration = 0
+AuctionHouseBot.DisableBOP_Or_Quest_NoReqLevel = 0
+
+###############################################################################
+# AUCTION HOUSE BOT FILTERS PART 2
+#
+#     These Filters are boolean (0 or 1) and will disable items that are
+#     specifically meant for the Class named.
+#     (UnusedClass is Class 10, which was skipped for some reason)
+#     Default 0 (allowed)
+#
+###############################################################################
+
+AuctionHouseBot.DisableWarriorItems = 0
+AuctionHouseBot.DisablePaladinItems = 0
+AuctionHouseBot.DisableHunterItems = 0
+AuctionHouseBot.DisableRogueItems = 0
+AuctionHouseBot.DisablePriestItems = 0
+AuctionHouseBot.DisableDKItems = 0
+AuctionHouseBot.DisableShamanItems = 0
+AuctionHouseBot.DisableMageItems = 0
+AuctionHouseBot.DisableWarlockItems = 0
+AuctionHouseBot.DisableUnusedClassItems = 0
+AuctionHouseBot.DisableDruidItems = 0
+
+###############################################################################
+# AUCTION HOUSE BOT FILTERS PART 3
+#
+#    AuctionHouseBot.DisableItemsBelowLevel
+#        Prevent Seller from listing Items below this Level
+#    Default 0 (Off)
+#
+#    AuctionHouseBot.DisableItemsAboveLevel
+#        Prevent Seller from listing Items above this Level
+#    Default 0 (Off)
+#
+#    AuctionHouseBot.DisableTGsBelowLevel
+#        Prevent Seller from listing Trade Goods below this Level
+#    Default 0 (Off)
+#
+#    AuctionHouseBot.DisableTGsAboveLevel
+#        Prevent Seller from listing Trade Goods above this Level
+#    Default 0 (Off)
+#
+#    AuctionHouseBot.DisableItemsBelowGUID
+#        Prevent Seller from listing Items below this GUID
+#    Default 0 (Off)
+#
+#    AuctionHouseBot.DisableItemsAboveGUID
+#        Prevent Seller from listing Items above this GUID
+#    Default 0 (Off)
+#
+#    AuctionHouseBot.DisableTGsBelowGUID
+#        Prevent Seller from listing Trade Goods below this GUID
+#    Default 0 (Off)
+#
+#    AuctionHouseBot.DisableTGsAboveGUID
+#        Prevent Seller from listing Trade Goods above this GUID
+#    Default 0 (Off)
+#
+#    AuctionHouseBot.DisableItemsBelowReqLevel
+#        Prevent Seller from listing Items below this Required Level
+#    Default 0 (Off)
+#
+#    AuctionHouseBot.DisableItemsAboveReqLevel
+#        Prevent Seller from listing Items above this Required Level
+#    Default 0 (Off)
+#
+#    AuctionHouseBot.DisableTGsBelowReqLevel
+#        Prevent Seller from listing Trade Goods below this Required Level
+#    Default 0 (Off)
+#
+#    AuctionHouseBot.DisableTGsAboveReqLevel
+#        Prevent Seller from listing Trade Goods above this Required Level
+#    Default 0 (Off)
+#
+#    AuctionHouseBot.DisableItemsBelowReqSkillRank
+#        Prevent Seller from listing Items below this Required Skill Rank
+#    Default 0 (Off)
+#
+#    AuctionHouseBot.DisableItemsAboveReqSkillRank
+#        Prevent Seller from listing Items above this Required Skill Rank
+#    Default 0 (Off)
+#
+#    AuctionHouseBot.DisableTGsBelowReqSkillRank
+#        Prevent Seller from listing Trade Goods below this Required Skill Rank
+#    Default 0 (Off)
+#
+#    AuctionHouseBot.DisableTGsAboveReqSkillRank
+#        Prevent Seller from listing Trade Goods above this Required Skill Rank
+#    Default 0 (Off)
+#
+###############################################################################
+
+AuctionHouseBot.DisableItemsBelowLevel = 0
+AuctionHouseBot.DisableItemsAboveLevel = 0
+AuctionHouseBot.DisableTGsBelowLevel = 0
+AuctionHouseBot.DisableTGsAboveLevel = 0
+AuctionHouseBot.DisableItemsBelowGUID = 0
+AuctionHouseBot.DisableItemsAboveGUID = 0
+AuctionHouseBot.DisableTGsBelowGUID = 0
+AuctionHouseBot.DisableTGsAboveGUID = 0
+AuctionHouseBot.DisableItemsBelowReqLevel = 0
+AuctionHouseBot.DisableItemsAboveReqLevel = 0
+AuctionHouseBot.DisableTGsBelowReqLevel = 0
+AuctionHouseBot.DisableTGsAboveReqLevel = 0
+AuctionHouseBot.DisableItemsBelowReqSkillRank = 0
+AuctionHouseBot.DisableItemsAboveReqSkillRank = 0
+AuctionHouseBot.DisableTGsBelowReqSkillRank = 0
+AuctionHouseBot.DisableTGsAboveReqSkillRank = 0
+
+###############################################################################
+# CONSOLE AND REMOTE ACCESS
+#
+#    Console.Enable
+#        Enable console
+#        Default: 1 - on
+#                 0 - off
+#
+#    Ra.Enable
+#        Enable remote console
+#        Default: 0 - off
+#                 1 - on
+#
+#    Ra.IP
+#        Default remote console ip address, use 0.0.0.0 for every address
+#
+#    Ra.Port
+#        Default remote console port
+#
+#    Ra.MinLevel
+#        Minimum level that's required to login,3 by default
+#
+#    Ra.Secure
+#        Kick client on wrong pass
+#
+###############################################################################
+
+Console.Enable = 1
+Ra.Enable = 0
+Ra.IP = 0.0.0.0
+Ra.Port = 3443
+Ra.MinLevel = 3
+Ra.Secure = 1
+
+###############################################################################
+# CUSTOM SERVER OPTIONS
+#
+#    PlayerStart.AllReputation
+#        Players will start with most of the high level reputations that are
+#         needed for items, mounts etc.
+#
+#    PlayerStart.AllSpells
+#        If enabled, players will start with all their class spells
+#         (not talents). Useful for instant 80 servers.
+#        You must populate playercreateinfo_spell_custom table with the spells
+#         you want, or this WILL NOT WORK! The table has data for all
+#         classes / races up to TBC expansion.
+#         Do not enable if you do not know what you are doing!
+#        Default: 0 - off
+#                 1 - on
+#
+#
+#    PlayerStart.MapsExplored
+#        Players will start with all maps explored if enabled
+#
+#    MusicInBattleground
+#        If enabled "L70ETC-Power of the horde" will be played when BG starts
+#
+#    HonorPointsAfterDuel
+#        The amount of honor points the duel winner will get after a duel.
+#        Default: 0 - disable
+#
+#    AlwaysMaxWeaponSkill
+#        Players will automatically gain max weapon/defense skill when
+#         logging in, leveling up etc.
+#
+#    PvPToken.Enable
+#        Enable/disable PvP Token System. Players will get a token
+#         after slaying another player that gives honor.
+#
+#    PvPToken.MapAllowType
+#        Where players can receive the pvp token
+#        4 - In all maps
+#        3 - In battlegrounds only
+#        2 - In FFA areas only (gurubashi arena etc)
+#        1 - In battlegrounds AND FFA areas only
+#
+#    PvPToken.ItemID
+#        The item players will get after killing someone
+#         if PvP Token system is enabled.
+#        Default: 29434 - Badge of justice
+#
+#    PvPToken.ItemCount
+#        Modify the item ID count - Default: 1
+#
+#    NoResetTalentsCost
+#        Enable or disable no cost when reseting talents
+#
+#   Guild.AllowMultipleGuildMaster
+#       Allow override of 1 Guild Master limit. Additional Guild Masters must
+#       be set using the ".guild rank" command, not through the UI
+#       Default: 0 = Only 1 Guild Master per guild
+#                1 = Allow more than one Guild Master
+#
+#   ForbiddenMaps
+#       Map ids that users below SEC_GAMEMASTER cannot enter,
+#        with delimiter ','
+#       Default: ""
+#       example: "538,90"
+#       Note that it's HIGHLY DISCOURAGED to forbid starting maps
+#        (0, 1, 530)!
+#
+#   ShowKickInWorld
+#        Determines wether a message is broadcasted to the entire server
+#         when a player gets kicked
+#        Default: 0 = Disable
+#                 1 = Enable
+#
+#   RecordUpdateTimeDiffInterval
+#        Record update time diff to the log file
+#         update diff can be used as a criterion of performance
+#         diff < 300: good performance
+#         diff > 600: bad performance, may be caused by high cpu usage
+#        Default: 60000 (diff is written into log every 60000 ms or 1 minute.
+#                 >0 = Interval
+#                 0 = Disable
+#
+#   MinRecordUpdateTimeDiff
+#        Only record update time diff which is greater than this value
+#        Default: 10
+#
+#   PlayerStart.String
+#       If set to anything other than "", this string will be displayed
+#        to players when they login to a newly created character.
+#       Default: "" - send no text
+#
+#   LevelReq.Trade
+#        The required level of character to be able to trade
+#        Default: 1 (From level 1)
+#
+#   LevelReq.Ticket
+#        The required level of character to be able to write tickets
+#        Default: 1 (From level 1)
+#
+#   LevelReq.Auction
+#        The required level of character to be able to use auction
+#        Default: 1 (From level 1)
+#
+#   LevelReq.Mail
+#        The required level of character to be able to send and receive mail
+#        Default: 1 (From level 1)
+#
+###############################################################################
+
+PlayerStart.AllReputation = 0
+PlayerStart.AllSpells = 0
+PlayerStart.MapsExplored = 0
+MusicInBattleground = 0
+HonorPointsAfterDuel = 0
+AlwaysMaxWeaponSkill = 0
+PvPToken.Enable = 0
+PvPToken.MapAllowType = 4
+PvPToken.ItemID = 29434
+PvPToken.ItemCount = 1
+Guild.AllowMultipleGuildMaster = 0
+NoResetTalentsCost = 0
+ShowKickInWorld = 0
+RecordUpdateTimeDiffInterval = 60000
+MinRecordUpdateTimeDiff = 100
+PlayerStart.String = ""
+LevelReq.Trade = 1
+LevelReq.Ticket = 1
+LevelReq.Auction = 1
+LevelReq.Mail = 1
diff --git a/src/server/worldserver/worldserver.ico b/src/server/worldserver/worldserver.ico
new file mode 100644
index 00000000000..6f0a5721957
Binary files /dev/null and b/src/server/worldserver/worldserver.ico differ
diff --git a/src/server/worldserver/worldserver.rc b/src/server/worldserver/worldserver.rc
new file mode 100644
index 00000000000..939d6bdd355
--- /dev/null
+++ b/src/server/worldserver/worldserver.rc
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2005-2009 MaNGOS 
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "resource.h"
+#include "../shared/revision.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "windows.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_APPICON             ICON                    "worldserver.ico"
+
+/////////////////////////////////////////////////////////////////////////////
+// Neutre (Par défaut système) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEUSD)
+#ifdef _WIN32
+LANGUAGE LANG_NEUTRAL, SUBLANG_SYS_DEFAULT
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION FILEVER
+ PRODUCTVERSION PRODUCTVER
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x0L
+ FILETYPE 0x0L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "080004b0"
+        BEGIN
+            VALUE "FileDescription", "worldserver"
+            VALUE "FileVersion", STRFILEVER
+            VALUE "InternalName", "worldserver"
+            VALUE "LegalCopyright", "Copyright (C) 2008-2010"
+            VALUE "OriginalFilename", "worldserver.exe"
+            VALUE "ProductName", "worldserver"
+            VALUE "ProductVersion", STRPRODUCTVER
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x800, 1200
+    END
+END
+#endif
-- 
cgit v1.2.3


From bddfebb0c70ce3648f4d9447328113a539509609 Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Wed, 9 Jun 2010 17:20:06 +0200
Subject: add -v version option to map_extractor

--HG--
branch : trunk
---
 src/tools/map_extractor/CMakeLists.txt |  4 +---
 src/tools/map_extractor/System.cpp     | 22 +++++++++++++++++++---
 2 files changed, 20 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/tools/map_extractor/CMakeLists.txt b/src/tools/map_extractor/CMakeLists.txt
index 23177d0bf68..a2ceff1fa73 100644
--- a/src/tools/map_extractor/CMakeLists.txt
+++ b/src/tools/map_extractor/CMakeLists.txt
@@ -9,12 +9,10 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-cmake_minimum_required (VERSION 2.6)
-project (TRINITY_MAP_EXTRACTOR)
-
 file(GLOB sources *.cpp)
 file(GLOB loadlib_sources loadlib/*.cpp)
 
+include_directories (${CMAKE_SOURCE_DIR}/src/server/shared)
 include_directories (${CMAKE_SOURCE_DIR}/externals/libmpq)
 include_directories (${CMAKE_SOURCE_DIR}/src/tools/map_extractor)
 include_directories (${CMAKE_SOURCE_DIR}/src/tools/map_extractor/loadlib)
diff --git a/src/tools/map_extractor/System.cpp b/src/tools/map_extractor/System.cpp
index 683f89ac11e..d5822c8d914 100644
--- a/src/tools/map_extractor/System.cpp
+++ b/src/tools/map_extractor/System.cpp
@@ -17,6 +17,8 @@
 #include "loadlib/adt.h"
 #include "loadlib/wdt.h"
 #include 
+#include "revision.h"
+#define _MAP_EXTRACTOR_VERSION 2
 
 #if defined( __GNUC__ )
     #define _open   open
@@ -33,6 +35,7 @@
 #else
     #define OPEN_FLAGS (O_RDONLY | O_BINARY)
 #endif
+
 extern ArchiveSet gOpenArchives;
 
 typedef struct
@@ -120,6 +123,13 @@ void Usage(char* prg)
     exit(1);
 }
 
+void Version(char* prg)
+{
+    printf("TrinityCore Rev: " _REVISION " " _BUILD_DIRECTIVE " Hash: " _HASH "\n"\
+    "%s Ver: " _MAP_EXTRACTOR_VERSION, prg);
+    exit(0);
+}
+
 void HandleArgs(int argc, char * arg[])
 {
     for(int c = 1; c < argc; ++c)
@@ -135,13 +145,13 @@ void HandleArgs(int argc, char * arg[])
         switch(arg[c][1])
         {
             case 'i':
-                if(c + 1 < argc)                            // all ok
+                if (c + 1 < argc)                            // all ok
                     strcpy(input_path, arg[(c++) + 1]);
                 else
                     Usage(arg[0]);
                 break;
             case 'o':
-                if(c + 1 < argc)                            // all ok
+                if (c + 1 < argc)                            // all ok
                     strcpy(output_path, arg[(c++) + 1]);
                 else
                     Usage(arg[0]);
@@ -153,7 +163,7 @@ void HandleArgs(int argc, char * arg[])
                     Usage(arg[0]);
                 break;
             case 'e':
-                if(c + 1 < argc)                            // all ok
+                if (c + 1 < argc)                            // all ok
                 {
                     CONF_extract=atoi(arg[(c++) + 1]);
                     if(!(CONF_extract > 0 && CONF_extract < 4))
@@ -162,6 +172,12 @@ void HandleArgs(int argc, char * arg[])
                 else
                     Usage(arg[0]);
                 break;
+            case 'v':
+                if (c + 1 < argc)                           // all ok
+                    Version(arg[0]);
+                else
+                    Usage(arg[0]);
+                break;
         }
     }
 }
-- 
cgit v1.2.3


From 489785418e23bb56ba2c4f8f93f43605b36d2d06 Mon Sep 17 00:00:00 2001
From: Shauren 
Date: Wed, 9 Jun 2010 22:22:02 +0200
Subject: win build: fixed game pch, generating revision.h, realm source dirs
 (but it doesnt build yet)

--HG--
branch : trunk
---
 externals/sockets/win/VC90/sockets.vcproj  | 28 ++++++------
 src/server/authserver/Server/RealmSocket.h |  1 -
 win/TrinityCore&Script VC90.sln            | 22 ++++++++--
 win/VC90/TrinityRealm.vcproj               | 68 +++++++++++++++---------------
 win/VC90/game.vcproj                       | 48 ++++++++++++---------
 win/VC90/shared.vcproj                     | 60 ++++++++++++++++++--------
 6 files changed, 137 insertions(+), 90 deletions(-)

(limited to 'src')

diff --git a/externals/sockets/win/VC90/sockets.vcproj b/externals/sockets/win/VC90/sockets.vcproj
index 0001238d3fb..f855843f5de 100644
--- a/externals/sockets/win/VC90/sockets.vcproj
+++ b/externals/sockets/win/VC90/sockets.vcproj
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="9,00"
 	Name="sockets"
-	ProjectGUID="{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}"
+	ProjectGUID="{9DF7A84E-C644-4720-A79D-C98CB950E34C}"
 	RootNamespace="sockets"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="0"
@@ -88,7 +88,7 @@
 			/>
 		
 		
 			
 			
 		
 		
 			
 			
 #include 
 #include 
-#include 
 
 class RealmSocket : public ACE_Svc_Handler
 {
diff --git a/win/TrinityCore&Script VC90.sln b/win/TrinityCore&Script VC90.sln
index 17a19a5a8e1..b7be2641081 100644
--- a/win/TrinityCore&Script VC90.sln	
+++ b/win/TrinityCore&Script VC90.sln	
@@ -1,12 +1,28 @@
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "game", "VC90\game.vcproj", "{1DC6C4DA-A028-41F3-877D-D5400C594F88}"
+	ProjectSection(ProjectDependencies) = postProject
+		{90297C34-F231-4DF4-848E-A74BCC0E40ED} = {90297C34-F231-4DF4-848E-A74BCC0E40ED}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shared", "VC90\shared.vcproj", "{90297C34-F231-4DF4-848E-A74BCC0E40ED}"
+	ProjectSection(ProjectDependencies) = postProject
+		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} = {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}
+		{9DF7A84E-C644-4720-A79D-C98CB950E34C} = {9DF7A84E-C644-4720-A79D-C98CB950E34C}
+		{803F488E-4C5A-4866-8D5C-1E6C03C007C2} = {803F488E-4C5A-4866-8D5C-1E6C03C007C2}
+		{BD537C9A-FECA-1BAD-6757-8A6348EA12C8} = {BD537C9A-FECA-1BAD-6757-8A6348EA12C8}
+		{8072769E-CF10-48BF-B9E1-12752A5DAC6E} = {8072769E-CF10-48BF-B9E1-12752A5DAC6E}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TrinityCore", "VC90\TrinityCore.vcproj", "{A3A04E47-43A2-4C08-90B3-029CEF558594}"
+	ProjectSection(ProjectDependencies) = postProject
+		{1DC6C4DA-A028-41F3-877D-D5400C594F88} = {1DC6C4DA-A028-41F3-877D-D5400C594F88}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TrinityRealm", "VC90\TrinityRealm.vcproj", "{563E9905-3657-460C-AE63-0AC39D162E23}"
+	ProjectSection(ProjectDependencies) = postProject
+		{90297C34-F231-4DF4-848E-A74BCC0E40ED} = {90297C34-F231-4DF4-848E-A74BCC0E40ED}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genrevision", "VC90\genrevision.vcproj", "{803F488E-4C5A-4866-8D5C-1E6C03C007C2}"
 EndProject
@@ -52,12 +68,10 @@ Global
 		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Release|x64.Build.0 = Release|x64
 		{563E9905-3657-460C-AE63-0AC39D162E23}.Debug|Win32.ActiveCfg = Debug|Win32
 		{563E9905-3657-460C-AE63-0AC39D162E23}.Debug|Win32.Build.0 = Debug|Win32
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Debug|x64.ActiveCfg = Debug|x64
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Debug|x64.Build.0 = Debug|x64
+		{563E9905-3657-460C-AE63-0AC39D162E23}.Debug|x64.ActiveCfg = Debug|Win32
 		{563E9905-3657-460C-AE63-0AC39D162E23}.Release|Win32.ActiveCfg = Release|Win32
 		{563E9905-3657-460C-AE63-0AC39D162E23}.Release|Win32.Build.0 = Release|Win32
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Release|x64.ActiveCfg = Release|x64
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Release|x64.Build.0 = Release|x64
+		{563E9905-3657-460C-AE63-0AC39D162E23}.Release|x64.ActiveCfg = Release|Win32
 		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug|Win32.ActiveCfg = Debug|Win32
 		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug|Win32.Build.0 = Debug|Win32
 		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug|x64.ActiveCfg = Debug|x64
diff --git a/win/VC90/TrinityRealm.vcproj b/win/VC90/TrinityRealm.vcproj
index 9fca65e3a53..746157e46e8 100644
--- a/win/VC90/TrinityRealm.vcproj
+++ b/win/VC90/TrinityRealm.vcproj
@@ -48,7 +48,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\shared\Database;..\..\src\TrinityRealm;..\..\dep\ACE_wrappers"
+				AdditionalIncludeDirectories="..\..\externals;..\..\externals\ace;..\..\src\server\shared"
 				PreprocessorDefinitions="VERSION="0.12.0-SVN",WIN32,NDEBUG,_CONSOLE;_SECURE_SCL=0"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -118,7 +118,7 @@
 			/>
 		
 		
 			
 			
 			
 			
 			
 			
 		
 		
 			
 			
 			
 			
 			
 			
 	
 		
 		
 		
 		
 		
 		
 		
 		
 		
 		
 		
 		
 		
 		
 		
 		
 		
 		
 		
 		
 		
 		
 		
 		
 		
 		
 	
diff --git a/win/VC90/game.vcproj b/win/VC90/game.vcproj
index b45bbe02967..65a85ed13ae 100644
--- a/win/VC90/game.vcproj
+++ b/win/VC90/game.vcproj
@@ -105,7 +105,7 @@
 			/>
 		
 		
 			
 			
 			
 			
 			
@@ -189,7 +186,7 @@
 			/>
 		
 		
 			
 			
 			
 			
 			
@@ -4543,6 +4543,14 @@
 					UsePrecompiledHeader="1"
 				/>
 			
+			
+				
+			
 		
 		
 		
 		
 			
 			
 			
 			
 			
 		
 		
 			
 			
 			
 			
 			
 		
+		
+			
+				
+			
+			
+				
+			
+		
 		
-- 
cgit v1.2.3


From 5dff68e457f6c0111acfc4c55b0dfba464ca72df Mon Sep 17 00:00:00 2001
From: John Holiver 
Date: Wed, 9 Jun 2010 19:38:15 -0300
Subject: Allow to sell item for: money, extendedCost or money+extendedCost.
 The new method (money+extende) can be used by using negative values on
 npc_vendor.ExtendedCost. This one goes dedicated to ZxBiohazardZx. Tnx also
 to VladimirMangos.

--HG--
branch : trunk
---
 sql/updates/8568_world_npc_vendor.sql              |  1 +
 sql/updates/8568_world_trinity_string.sql          |  4 ++++
 src/server/game/Chat/Commands/Level2.cpp           |  2 +-
 src/server/game/Entities/Creature/Creature.cpp     |  2 +-
 src/server/game/Entities/Creature/Creature.h       | 12 ++++++----
 src/server/game/Entities/Player/Player.cpp         | 27 +++++++++++-----------
 src/server/game/Globals/ObjectMgr.cpp              | 23 +++++++++---------
 src/server/game/Globals/ObjectMgr.h                |  4 ++--
 .../game/Server/Protocol/Handlers/ItemHandler.cpp  |  4 ++--
 9 files changed, 45 insertions(+), 34 deletions(-)
 create mode 100644 sql/updates/8568_world_npc_vendor.sql
 create mode 100644 sql/updates/8568_world_trinity_string.sql

(limited to 'src')

diff --git a/sql/updates/8568_world_npc_vendor.sql b/sql/updates/8568_world_npc_vendor.sql
new file mode 100644
index 00000000000..63645847ef6
--- /dev/null
+++ b/sql/updates/8568_world_npc_vendor.sql
@@ -0,0 +1 @@
+ALTER TABLE npc_vendor CHANGE COLUMN `ExtendedCost` `ExtendedCost` mediumint(8) NOT NULL default '0' COMMENT 'negative if cost must exclude normal money cost';
diff --git a/sql/updates/8568_world_trinity_string.sql b/sql/updates/8568_world_trinity_string.sql
new file mode 100644
index 00000000000..029966a4968
--- /dev/null
+++ b/sql/updates/8568_world_trinity_string.sql
@@ -0,0 +1,4 @@
+DELETE FROM trinity_string WHERE entry IN (210);
+INSERT INTO trinity_string VALUES
+(210,'Item \'%i\' (with extended cost %i) already in vendor list.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+
diff --git a/src/server/game/Chat/Commands/Level2.cpp b/src/server/game/Chat/Commands/Level2.cpp
index 40772a82922..85c5ef739fd 100644
--- a/src/server/game/Chat/Commands/Level2.cpp
+++ b/src/server/game/Chat/Commands/Level2.cpp
@@ -1051,7 +1051,7 @@ bool ChatHandler::HandleNpcAddVendorItemCommand(const char* args)
         incrtime = atol(fincrtime);
 
     char* fextendedcost = strtok(NULL, " ");                //add ExtendedCost, default: 0
-    uint32 extendedcost = fextendedcost ? atol(fextendedcost) : 0;
+    int32 extendedcost = fextendedcost ? atol(fextendedcost) : 0;
 
     Creature* vendor = getSelectedCreature();
 
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp
index 71461f94949..c9c9775c04a 100644
--- a/src/server/game/Entities/Creature/Creature.cpp
+++ b/src/server/game/Entities/Creature/Creature.cpp
@@ -76,7 +76,7 @@ bool VendorItemData::RemoveItem(uint32 item_id)
     return found;
 }
 
-VendorItem const* VendorItemData::FindItemCostPair(uint32 item_id, uint32 extendedCost) const
+VendorItem const* VendorItemData::FindItemCostPair(uint32 item_id, int32 extendedCost) const
 {
     for (VendorItemList::const_iterator i = m_items.begin(); i != m_items.end(); ++i)
         if((*i)->item == item_id && (*i)->ExtendedCost == extendedCost)
diff --git a/src/server/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h
index c19187f2770..a7c17561516 100644
--- a/src/server/game/Entities/Creature/Creature.h
+++ b/src/server/game/Entities/Creature/Creature.h
@@ -307,13 +307,17 @@ enum ChatType
 // Vendors
 struct VendorItem
 {
-    VendorItem(uint32 _item, int32 _maxcount, uint32 _incrtime, uint32 _ExtendedCost)
+    VendorItem(uint32 _item, int32 _maxcount, uint32 _incrtime, int32 _ExtendedCost)
         : item(_item), maxcount(_maxcount), incrtime(_incrtime), ExtendedCost(_ExtendedCost) {}
 
     uint32 item;
     int32  maxcount;                                        // 0 for infinity item amount
     uint32 incrtime;                                        // time for restore items amount if maxcount != 0
-    uint32 ExtendedCost;
+    int32 ExtendedCost;
+
+    //helpers
+    bool IsExcludeMoneyPrice() const { return ExtendedCost > 0; }
+    uint32 GetExtendedCostId() const { return std::abs(ExtendedCost); }
 };
 typedef std::vector VendorItemList;
 
@@ -328,12 +332,12 @@ struct VendorItemData
     }
     bool Empty() const { return m_items.empty(); }
     uint8 GetItemCount() const { return m_items.size(); }
-    void AddItem(uint32 item, int32 maxcount, uint32 ptime, uint32 ExtendedCost)
+    void AddItem(uint32 item, int32 maxcount, uint32 ptime, int32 ExtendedCost)
     {
         m_items.push_back(new VendorItem(item, maxcount, ptime, ExtendedCost));
     }
     bool RemoveItem(uint32 item_id);
-    VendorItem const* FindItemCostPair(uint32 item_id, uint32 extendedCost) const;
+    VendorItem const* FindItemCostPair(uint32 item_id, int32 extendedCost) const;
     void Clear()
     {
         for (VendorItemList::const_iterator itr = m_items.begin(); itr != m_items.end(); ++itr)
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index c79ce17f40e..faeb676c21a 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -19573,12 +19573,12 @@ bool Player::BuyItemFromVendorSlot(uint64 vendorguid, uint32 vendorslot, uint32
         return false;
     }
 
-    if (crItem->ExtendedCost)
+    if (uint32 extendedCostId = crItem->GetExtendedCostId())
     {
-        ItemExtendedCostEntry const* iece = sItemExtendedCostStore.LookupEntry(crItem->ExtendedCost);
+        ItemExtendedCostEntry const* iece = sItemExtendedCostStore.LookupEntry(extendedCostId);
         if (!iece)
         {
-            sLog.outError("Item %u have wrong ExtendedCost field value %u", pProto->ItemId, crItem->ExtendedCost);
+            sLog.outError("Item %u have wrong ExtendedCost field value %u", pProto->ItemId, extendedCostId);
             return false;
         }
 
@@ -19615,10 +19615,11 @@ bool Player::BuyItemFromVendorSlot(uint64 vendorguid, uint32 vendorslot, uint32
         }
     }
 
-    int32 price  = pProto->BuyPrice * count;
+    int32 price  = crItem->IsExcludeMoneyPrice() ? 0 : pProto->BuyPrice * count;
 
     // reputation discount
-    price = uint32(floor(price * GetReputationPriceDiscount(pCreature)));
+    if (price)
+        price = uint32(floor(price * GetReputationPriceDiscount(pCreature)));
 
     if (GetMoney() < price)
     {
@@ -19638,9 +19639,9 @@ bool Player::BuyItemFromVendorSlot(uint64 vendorguid, uint32 vendorslot, uint32
 
         ModifyMoney(-(int32)price);
 
-        if (crItem->ExtendedCost)                            // case for new honor system
+        if (uint32 extendedCostId = crItem->GetExtendedCostId())                            // case for new honor system
         {
-            ItemExtendedCostEntry const* iece = sItemExtendedCostStore.LookupEntry(crItem->ExtendedCost);
+            ItemExtendedCostEntry const* iece = sItemExtendedCostStore.LookupEntry(extendedCostId);
             if (iece->reqhonorpoints)
                 ModifyHonorPoints(- int32(iece->reqhonorpoints * count));
 
@@ -19666,11 +19667,11 @@ bool Player::BuyItemFromVendorSlot(uint64 vendorguid, uint32 vendorslot, uint32
             GetSession()->SendPacket(&data);
             SendNewItem(it, pProto->BuyCount*count, true, false, false);
 
-            if (it->HasFlag(ITEM_FIELD_FLAGS, ITEM_FLAGS_REFUNDABLE) && crItem->ExtendedCost)
+            if (it->HasFlag(ITEM_FIELD_FLAGS, ITEM_FLAGS_REFUNDABLE) && crItem->GetExtendedCostId())
             {
                 it->SetRefundRecipient(GetGUIDLow());
                 it->SetPaidMoney(price);
-                it->SetPaidExtendedCost(crItem->ExtendedCost);
+                it->SetPaidExtendedCost(crItem->GetExtendedCostId());
                 it->SaveRefundDataToDB();
                 AddRefundReference(it->GetGUID());
             }
@@ -19693,9 +19694,9 @@ bool Player::BuyItemFromVendorSlot(uint64 vendorguid, uint32 vendorslot, uint32
         }
 
         ModifyMoney(-(int32)price);
-        if (crItem->ExtendedCost)                            // case for new honor system
+        if (uint32 extendedCostId = crItem->GetExtendedCostId())                            // case for new honor system
         {
-            ItemExtendedCostEntry const* iece = sItemExtendedCostStore.LookupEntry(crItem->ExtendedCost);
+            ItemExtendedCostEntry const* iece = sItemExtendedCostStore.LookupEntry(extendedCostId);
             if (iece->reqhonorpoints)
                 ModifyHonorPoints(- int32(iece->reqhonorpoints * count));
 
@@ -19724,11 +19725,11 @@ bool Player::BuyItemFromVendorSlot(uint64 vendorguid, uint32 vendorslot, uint32
 
             AutoUnequipOffhandIfNeed();
 
-            if (it->HasFlag(ITEM_FIELD_FLAGS, ITEM_FLAGS_REFUNDABLE) && crItem->ExtendedCost)
+            if (it->HasFlag(ITEM_FIELD_FLAGS, ITEM_FLAGS_REFUNDABLE) && crItem->GetExtendedCostId())
             {
                 it->SetRefundRecipient(GetGUIDLow());
                 it->SetPaidMoney(price);
-                it->SetPaidExtendedCost(crItem->ExtendedCost);
+                it->SetPaidExtendedCost(crItem->GetExtendedCostId());
                 it->SaveRefundDataToDB();
                 AddRefundReference(it->GetGUID());
             }
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index 5f460c7e84c..8b3cf97a3fe 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -7954,7 +7954,7 @@ int ObjectMgr::LoadReferenceVendor(int32 vendor, int32 item, std::set *s
         {
             int32  maxcount     = fields[1].GetInt32();
             uint32 incrtime     = fields[2].GetUInt32();
-            uint32 ExtendedCost = fields[3].GetUInt32();
+            int32  ExtendedCost = fields[3].GetUInt32();
 
             if (!IsVendorItemValid(vendor,item_id,maxcount,incrtime,ExtendedCost,NULL,skip_vendors))
                 continue;
@@ -8009,7 +8009,7 @@ void ObjectMgr::LoadVendors()
         {
             int32  maxcount     = fields[2].GetInt32();
             uint32 incrtime     = fields[3].GetUInt32();
-            uint32 ExtendedCost = fields[4].GetUInt32();
+            int32  ExtendedCost = fields[4].GetUInt32();
 
             if (!IsVendorItemValid(entry,item_id,maxcount,incrtime,ExtendedCost,NULL,&skip_vendors))
                 continue;
@@ -8223,12 +8223,12 @@ void ObjectMgr::LoadGossipMenuItems()
     sLog.outString(">> Loaded %u gossip_menu_option entries", count);
 }
 
-void ObjectMgr::AddVendorItem(uint32 entry,uint32 item, int32 maxcount, uint32 incrtime, uint32 extendedcost, bool savetodb)
+void ObjectMgr::AddVendorItem(uint32 entry,uint32 item, int32 maxcount, uint32 incrtime, int32 extendedcost, bool savetodb)
 {
     VendorItemData& vList = m_mCacheVendorItemMap[entry];
     vList.AddItem(item,maxcount,incrtime,extendedcost);
 
-    if (savetodb) WorldDatabase.PExecuteLog("INSERT INTO npc_vendor (entry,item,maxcount,incrtime,extendedcost) VALUES('%u','%u','%u','%u','%u')",entry, item, maxcount,incrtime,extendedcost);
+    if (savetodb) WorldDatabase.PExecuteLog("INSERT INTO npc_vendor (entry,item,maxcount,incrtime,extendedcost) VALUES('%u','%u','%u','%u','%i')",entry, item, maxcount,incrtime,extendedcost);
 }
 
 bool ObjectMgr::RemoveVendorItem(uint32 entry,uint32 item, bool savetodb)
@@ -8244,7 +8244,7 @@ bool ObjectMgr::RemoveVendorItem(uint32 entry,uint32 item, bool savetodb)
     return true;
 }
 
-bool ObjectMgr::IsVendorItemValid(uint32 vendor_entry, uint32 item_id, int32 maxcount, uint32 incrtime, uint32 ExtendedCost, Player* pl, std::set* skip_vendors, uint32 ORnpcflag) const
+bool ObjectMgr::IsVendorItemValid(uint32 vendor_entry, uint32 item_id, int32 maxcount, uint32 incrtime, int32 ExtendedCost, Player* pl, std::set* skip_vendors, uint32 ORnpcflag) const
 {
     CreatureInfo const* cInfo = GetCreatureTemplate(vendor_entry);
     if (!cInfo)
@@ -8280,12 +8280,13 @@ bool ObjectMgr::IsVendorItemValid(uint32 vendor_entry, uint32 item_id, int32 max
         return false;
     }
 
-    if (ExtendedCost && !sItemExtendedCostStore.LookupEntry(ExtendedCost))
+    uint32 extendedCostId = std::abs(ExtendedCost);
+    if (extendedCostId && !sItemExtendedCostStore.LookupEntry(extendedCostId))
     {
         if (pl)
-            ChatHandler(pl).PSendSysMessage(LANG_EXTENDED_COST_NOT_EXIST,ExtendedCost);
+            ChatHandler(pl).PSendSysMessage(LANG_EXTENDED_COST_NOT_EXIST,extendedCostId);
         else
-            sLog.outErrorDb("Table `(game_event_)npc_vendor` have Item (Entry: %u) with wrong ExtendedCost (%u) for vendor (%u), ignore",item_id,ExtendedCost,vendor_entry);
+            sLog.outErrorDb("Table `(game_event_)npc_vendor` have Item (Entry: %u) with wrong ExtendedCost (%u) for vendor (%u), ignore",item_id,extendedCostId,vendor_entry);
         return false;
     }
 
@@ -8310,12 +8311,12 @@ bool ObjectMgr::IsVendorItemValid(uint32 vendor_entry, uint32 item_id, int32 max
     if (!vItems)
         return true;                                        // later checks for non-empty lists
 
-    if(vItems->FindItemCostPair(item_id,ExtendedCost))
+    if(vItems->FindItemCostPair(item_id,extendedCostId))
     {
         if (pl)
-            ChatHandler(pl).PSendSysMessage(LANG_ITEM_ALREADY_IN_LIST, item_id, ExtendedCost);
+            ChatHandler(pl).PSendSysMessage(LANG_ITEM_ALREADY_IN_LIST, item_id, extendedCostId);
         else
-            sLog.outErrorDb( "Table `npc_vendor` has duplicate items %u (with extended cost %u) for vendor (Entry: %u), ignoring", item_id, ExtendedCost, vendor_entry);
+            sLog.outErrorDb( "Table `npc_vendor` has duplicate items %u (with extended cost %u) for vendor (Entry: %u), ignoring", item_id, extendedCostId, vendor_entry);
         return false;
     }
 
diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h
index c1471aa0680..eeeb871c98e 100644
--- a/src/server/game/Globals/ObjectMgr.h
+++ b/src/server/game/Globals/ObjectMgr.h
@@ -874,9 +874,9 @@ class ObjectMgr
 
             return &iter->second;
         }
-        void AddVendorItem(uint32 entry,uint32 item, int32 maxcount, uint32 incrtime, uint32 ExtendedCost, bool savetodb = true); // for event
+        void AddVendorItem(uint32 entry,uint32 item, int32 maxcount, uint32 incrtime, int32 ExtendedCost, bool savetodb = true); // for event
         bool RemoveVendorItem(uint32 entry,uint32 item, bool savetodb = true); // for event
-        bool IsVendorItemValid(uint32 vendor_entry, uint32 item, int32 maxcount, uint32 ptime, uint32 ExtendedCost, Player* pl = NULL, std::set* skip_vendors = NULL, uint32 ORnpcflag = 0) const;
+        bool IsVendorItemValid(uint32 vendor_entry, uint32 item, int32 maxcount, uint32 ptime, int32 ExtendedCost, Player* pl = NULL, std::set* skip_vendors = NULL, uint32 ORnpcflag = 0) const;
 
         void LoadScriptNames();
         ScriptNameMap &GetScriptNames() { return m_scriptNames; }
diff --git a/src/server/game/Server/Protocol/Handlers/ItemHandler.cpp b/src/server/game/Server/Protocol/Handlers/ItemHandler.cpp
index 53aede43492..897ee7dcfd3 100644
--- a/src/server/game/Server/Protocol/Handlers/ItemHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/ItemHandler.cpp
@@ -766,7 +766,7 @@ void WorldSession::SendListInventory(uint64 vendorguid)
                 ++count;
 
                 // reputation discount
-                int32 price = uint32(floor(pProto->BuyPrice * discountMod));
+                int32 price = crItem->IsExcludeMoneyPrice() ? 0 : uint32(floor(pProto->BuyPrice * discountMod));
 
                 data << uint32(vendorslot+1);    // client expects counting to start at 1
                 data << uint32(crItem->item);
@@ -775,7 +775,7 @@ void WorldSession::SendListInventory(uint64 vendorguid)
                 data << uint32(price);
                 data << uint32(pProto->MaxDurability);
                 data << uint32(pProto->BuyCount);
-                data << uint32(crItem->ExtendedCost);
+                data << uint32(crItem->GetExtendedCostId());
             }
         }
     }
-- 
cgit v1.2.3


From 7195abfad019ac22c86819ac2b651a2ac6c11dd8 Mon Sep 17 00:00:00 2001
From: Shauren 
Date: Thu, 10 Jun 2010 16:39:51 +0200
Subject: Fixed TrinityRealm compile on windows Fixed shared build on windows
 fully

NOTE: TrinityRealm config file has been renamed to authserver.conf!

--HG--
branch : trunk
---
 src/server/authserver/Main.cpp               |  2 +-
 src/server/authserver/Server/RealmSocket.h   |  2 +-
 src/server/shared/Utilities/ServiceWin32.cpp |  5 ++++
 win/VC90/TrinityRealm.vcproj                 | 24 ++++++++--------
 win/VC90/shared.vcproj                       | 42 ++++++++++++++++++++++++----
 5 files changed, 55 insertions(+), 20 deletions(-)

(limited to 'src')

diff --git a/src/server/authserver/Main.cpp b/src/server/authserver/Main.cpp
index 4d5362608a7..7dbb1c95b5b 100644
--- a/src/server/authserver/Main.cpp
+++ b/src/server/authserver/Main.cpp
@@ -42,7 +42,7 @@
 #include 
 
 #ifndef _TRINITY_REALM_CONFIG
-# define _TRINITY_REALM_CONFIG  "TrinityRealm.conf"
+# define _TRINITY_REALM_CONFIG  "authserver.conf"
 #endif //_TRINITY_REALM_CONFIG
 
 #ifdef WIN32
diff --git a/src/server/authserver/Server/RealmSocket.h b/src/server/authserver/Server/RealmSocket.h
index dd9d4c68d26..8749fba9def 100644
--- a/src/server/authserver/Server/RealmSocket.h
+++ b/src/server/authserver/Server/RealmSocket.h
@@ -25,11 +25,11 @@
 #ifndef __REALMSOCKET_H__
 #define __REALMSOCKET_H__
 
-#include 
 #include 
 #include 
 #include 
 #include 
+#include 
 
 class RealmSocket : public ACE_Svc_Handler
 {
diff --git a/src/server/shared/Utilities/ServiceWin32.cpp b/src/server/shared/Utilities/ServiceWin32.cpp
index 2c1df2ff483..513dd64b505 100644
--- a/src/server/shared/Utilities/ServiceWin32.cpp
+++ b/src/server/shared/Utilities/ServiceWin32.cpp
@@ -26,6 +26,11 @@
 #include 
 #include 
 
+// stupid ACE define
+#ifdef main
+#undef main
+#endif //main
+
 #if !defined(WINADVAPI)
 #if !defined(_ADVAPI32_)
 #define WINADVAPI DECLSPEC_IMPORT
diff --git a/win/VC90/TrinityRealm.vcproj b/win/VC90/TrinityRealm.vcproj
index 746157e46e8..1b8b18aabbe 100644
--- a/win/VC90/TrinityRealm.vcproj
+++ b/win/VC90/TrinityRealm.vcproj
@@ -48,7 +48,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\externals;..\..\externals\ace;..\..\src\server\shared"
+				AdditionalIncludeDirectories="..\..\externals;..\..\src\server\shared;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Database;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\authserver;..\..\src\server\authserver\Authentication;..\..\src\server\authserver\Realms;..\..\src\server\authserver\Server"
 				PreprocessorDefinitions="VERSION="0.12.0-SVN",WIN32,NDEBUG,_CONSOLE;_SECURE_SCL=0"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -114,7 +114,7 @@
 			/>
 			
 		
 		
 			
 		
 		
 			
 		
 		
 			
 		
 	
@@ -425,6 +425,10 @@
 			RelativePath="..\..\src\server\authserver\Authentication\AuthCodes.h"
 			>
 		
+		
+		
 		
@@ -457,10 +461,6 @@
 			RelativePath="..\..\src\server\authserver\Server\RealmSocket.h"
 			>
 		
-		
-		
 		
diff --git a/win/VC90/shared.vcproj b/win/VC90/shared.vcproj
index c8cbd43e2fd..a84fb4cde2f 100644
--- a/win/VC90/shared.vcproj
+++ b/win/VC90/shared.vcproj
@@ -48,7 +48,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\src\server\shared\Debugging\;..\..\src\server\;..\..\src\server\shared\Utilities;..\..\src\server\shared\Logging;..\..\src\server\shared;..\..\externals;..\..\externals\sockets;..\..\externals\sockets\include;..\..\externals\openssl;..\..\externals\utf8cpp;..\..\externals\mersennetwister;..\..\externals\mysql;..\..\src\server\game\Entities\Object;"
+				AdditionalIncludeDirectories="..\..\src\server\shared\Debugging\;..\..\src\server\;..\..\src\server\shared\Utilities;..\..\src\server\shared\Logging;..\..\src\server\shared;..\..\externals;..\..\externals\sockets;..\..\externals\sockets\include;..\..\externals\openssl;..\..\externals\utf8cpp;..\..\externals\mersennetwister;..\..\externals\mysql;..\..\src\server\game\Entities\Object"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -129,7 +129,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\src\server\shared\Debugging\;..\..\src\server\;..\..\src\server\shared\Utilities;..\..\src\server\shared\Logging;..\..\src\server\shared;..\..\externals;..\..\externals\sockets;..\..\externals\sockets\include;..\..\externals\openssl;..\..\externals\utf8cpp;..\..\externals\mersennetwister;..\..\externals\mysql;..\..\src\server\game\Entities\Object;"
+				AdditionalIncludeDirectories="..\..\src\server\shared\Debugging\;..\..\src\server\;..\..\src\server\shared\Utilities;..\..\src\server\shared\Logging;..\..\src\server\shared;..\..\externals;..\..\externals\sockets;..\..\externals\sockets\include;..\..\externals\openssl;..\..\externals\utf8cpp;..\..\externals\mersennetwister;..\..\externals\mysql;..\..\src\server\game\Entities\Object"
 				PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -210,7 +210,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\src\server\shared\Debugging\;..\..\src\server\;..\..\src\server\shared\Utilities;..\..\src\server\shared\Logging;..\..\src\server\shared;..\..\externals;..\..\externals\sockets;..\..\externals\sockets\include;..\..\externals\openssl;..\..\externals\utf8cpp;..\..\externals\mersennetwister;..\..\externals\mysql;..\..\src\server\game\Entities\Object;"
+				AdditionalIncludeDirectories="..\..\src\server\shared\Debugging\;..\..\src\server\;..\..\src\server\shared\Utilities;..\..\src\server\shared\Logging;..\..\src\server\shared;..\..\externals;..\..\externals\sockets;..\..\externals\sockets\include;..\..\externals\openssl;..\..\externals\utf8cpp;..\..\externals\mersennetwister;..\..\externals\mysql;..\..\src\server\game\Entities\Object"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -293,7 +293,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\src\server\shared\Debugging\;..\..\src\server\;..\..\src\server\shared\Utilities;..\..\src\server\shared\Logging;..\..\src\server\shared;..\..\externals;..\..\externals\sockets;..\..\externals\sockets\include;..\..\externals\openssl;..\..\externals\utf8cpp;..\..\externals\mersennetwister;..\..\externals\mysql;..\..\src\server\game\Entities\Object;"
+				AdditionalIncludeDirectories="..\..\src\server\shared\Debugging\;..\..\src\server\;..\..\src\server\shared\Utilities;..\..\src\server\shared\Logging;..\..\src\server\shared;..\..\externals;..\..\externals\sockets;..\..\externals\sockets\include;..\..\externals\openssl;..\..\externals\utf8cpp;..\..\externals\mersennetwister;..\..\externals\mysql;..\..\src\server\game\Entities\Object"
 				PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -727,7 +727,7 @@
 					Name="VCCustomBuildTool"
 					Description="Getting Version..."
 					CommandLine="cd $(InputDir)
"$(TargetDir)\..\genrevision__$(PlatformName)_$(ConfigurationName)\genrevision.exe" "..\..\.."
"
-					AdditionalDependencies="$(SolutionDir)../.hg/branch.cache"
+					AdditionalDependencies="$(SolutionDir)../.hg/branchheads.cache"
 					Outputs="revision.h"
 				/>
 			
@@ -738,10 +738,40 @@
 					Name="VCCustomBuildTool"
 					Description="Getting Version..."
 					CommandLine="cd $(InputDir)
"$(TargetDir)\..\genrevision__$(PlatformName)_$(ConfigurationName)\genrevision.exe" "-d" "..\..\.."
"
-					AdditionalDependencies="$(SolutionDir)../.hg/branch.cache"
+					AdditionalDependencies="$(SolutionDir)../.hg/branchheads.cache"
 					Outputs="revision.h"
 				/>
 			
+			
+				
+			
+			
+				
+			
+		
+		
+		
+		
 		
 		
Date: Thu, 10 Jun 2010 19:22:53 +0200
Subject: Fixed windows compile for game and TrinityCore

NOTE: config renamed from TrinityCore.conf to worldserver.conf

--HG--
branch : trunk
---
 externals/g3dlite/RegistryUtil.cpp        | 290 ++++++++++++++++++++++++++++++
 externals/g3dlite/win/VC90/g3dlite.vcproj |  30 ++--
 src/server/worldserver/Main.cpp           |   2 +-
 win/VC90/TrinityCore.vcproj               |  84 ++++-----
 win/VC90/game.vcproj                      | 152 +++++++++++++---
 5 files changed, 476 insertions(+), 82 deletions(-)
 create mode 100644 externals/g3dlite/RegistryUtil.cpp

(limited to 'src')

diff --git a/externals/g3dlite/RegistryUtil.cpp b/externals/g3dlite/RegistryUtil.cpp
new file mode 100644
index 00000000000..28ff6955d9b
--- /dev/null
+++ b/externals/g3dlite/RegistryUtil.cpp
@@ -0,0 +1,290 @@
+/**
+ @file RegistryUtil.cpp
+
+ @created 2006-04-06
+ @edited  2006-04-24
+
+ Copyright 2000-2006, Morgan McGuire.
+ All rights reserved.
+*/
+
+#include "G3D/platform.h"
+
+// This file is only used on Windows
+#ifdef G3D_WIN32
+
+#include "G3D/RegistryUtil.h"
+#include "G3D/System.h"
+
+namespace G3D {
+
+// static helpers
+static HKEY getRootKeyFromString(const char* str, size_t length);
+
+
+bool RegistryUtil::keyExists(const std::string& key) {
+    size_t pos = key.find('\\', 0);
+    if (pos == std::string::npos) {
+        return false;
+    }
+
+    HKEY hkey = getRootKeyFromString(key.c_str(), pos);
+
+    if (hkey == NULL) {
+        return false;
+    }
+
+    HKEY openKey;
+    int32 result = RegOpenKeyExA(hkey, (key.c_str() + pos + 1), 0, KEY_READ, &openKey);
+
+    debugAssert(result == ERROR_SUCCESS || result == ERROR_FILE_NOT_FOUND);
+
+    if (result == ERROR_SUCCESS) {
+        RegCloseKey(openKey);
+        return true;
+    } else {
+        return false;
+    }
+}
+
+bool RegistryUtil::valueExists(const std::string& key, const std::string& value) {
+    size_t pos = key.find('\\', 0);
+    if (pos == std::string::npos) {
+        return false;
+    }
+
+    HKEY hkey = getRootKeyFromString(key.c_str(), pos);
+
+    if ( hkey == NULL ) {
+        return false;
+    }
+
+    HKEY openKey;
+    int32 result = RegOpenKeyExA(hkey, (key.c_str() + pos + 1), 0, KEY_READ, &openKey);
+    debugAssert(result == ERROR_SUCCESS || result == ERROR_FILE_NOT_FOUND);
+
+    if (result == ERROR_SUCCESS) {
+        uint32 dataSize = 0;
+        result = RegQueryValueExA(openKey, value.c_str(), NULL, NULL, NULL, reinterpret_cast(&dataSize));
+
+        debugAssert(result == ERROR_SUCCESS || result == ERROR_FILE_NOT_FOUND);
+        RegCloseKey(openKey);
+    }
+    return (result == ERROR_SUCCESS);
+}
+
+
+bool RegistryUtil::readInt32(const std::string& key, const std::string& value, int32& data) {
+    size_t pos = key.find('\\', 0);
+    if (pos == std::string::npos) {
+        return false;
+    }
+
+    HKEY hkey = getRootKeyFromString(key.c_str(), pos);
+
+    if ( hkey == NULL ) {
+        return false;
+    }
+
+    HKEY openKey;
+    int32 result = RegOpenKeyExA(hkey, (key.c_str() + pos + 1), 0, KEY_READ, &openKey);
+    debugAssert(result == ERROR_SUCCESS || result == ERROR_FILE_NOT_FOUND);
+
+    if (result == ERROR_SUCCESS) {
+        uint32 dataSize = sizeof(int32);
+        result = RegQueryValueExA(openKey, value.c_str(), NULL, NULL, reinterpret_cast(&data), reinterpret_cast(&dataSize));
+
+        debugAssertM(result == ERROR_SUCCESS, "Could not read registry key value.");
+
+        RegCloseKey(openKey);
+    }
+    return (result == ERROR_SUCCESS);
+}
+
+bool RegistryUtil::readBytes(const std::string& key, const std::string& value, uint8* data, uint32& dataSize) {
+    size_t pos = key.find('\\', 0);
+    if (pos == std::string::npos) {
+        return false;
+    }
+
+    HKEY hkey = getRootKeyFromString(key.c_str(), pos);
+
+    if (hkey == NULL) {
+        return false;
+    }
+
+    HKEY openKey;
+    int32 result = RegOpenKeyExA(hkey, (key.c_str() + pos + 1), 0, KEY_READ, &openKey);
+    debugAssert(result == ERROR_SUCCESS || result == ERROR_FILE_NOT_FOUND);
+
+    if (result == ERROR_SUCCESS) {
+        if (data == NULL) {
+            result = RegQueryValueExA(openKey, value.c_str(), NULL, NULL, NULL, reinterpret_cast(&dataSize));
+        } else {
+            result = RegQueryValueExA(openKey, value.c_str(), NULL, NULL, reinterpret_cast(&data), reinterpret_cast(&dataSize));
+        }
+
+        debugAssertM(result == ERROR_SUCCESS, "Could not read registry key value.");
+
+        RegCloseKey(openKey);
+    }
+    return (result == ERROR_SUCCESS);
+}
+
+bool RegistryUtil::readString(const std::string& key, const std::string& value, std::string& data) {
+    size_t pos = key.find('\\', 0);
+    if (pos == std::string::npos) {
+        return false;
+    }
+
+    HKEY hkey = getRootKeyFromString(key.c_str(), pos);
+
+    if (hkey == NULL) {
+        return false;
+    }
+
+    HKEY openKey;
+    int32 result = RegOpenKeyExA(hkey, (key.c_str() + pos + 1), 0, KEY_READ, &openKey);
+    debugAssert(result == ERROR_SUCCESS || result == ERROR_FILE_NOT_FOUND);
+
+    if (result == ERROR_SUCCESS) {
+        uint32 dataSize = 0;
+
+        result = RegQueryValueExA(openKey, value.c_str(), NULL, NULL, NULL, reinterpret_cast(&dataSize));
+        debugAssertM(result == ERROR_SUCCESS, "Could not read registry key value.");
+
+        // increment datasize to allow for non null-terminated strings in registry
+        dataSize += 1;
+
+        if (result == ERROR_SUCCESS) {
+            char* tmpStr = static_cast(System::malloc(dataSize));
+            System::memset(tmpStr, 0, dataSize);
+
+            result = RegQueryValueExA(openKey, value.c_str(), NULL, NULL, reinterpret_cast(tmpStr), reinterpret_cast(&dataSize));
+            debugAssertM(result == ERROR_SUCCESS, "Could not read registry key value.");
+                
+            if (result == ERROR_SUCCESS) {
+                data = tmpStr;
+            }
+
+            RegCloseKey(openKey);
+            System::free(tmpStr);
+        }
+    }
+    return (result == ERROR_SUCCESS);
+}
+
+bool RegistryUtil::writeInt32(const std::string& key, const std::string& value, int32 data) {
+    size_t pos = key.find('\\', 0);
+    if (pos == std::string::npos) {
+        return false;
+    }
+
+    HKEY hkey = getRootKeyFromString(key.c_str(), pos);
+
+    if (hkey == NULL) {
+        return false;
+    }
+
+    HKEY openKey;
+    int32 result = RegOpenKeyExA(hkey, (key.c_str() + pos + 1), 0, KEY_WRITE, &openKey);
+    debugAssert(result == ERROR_SUCCESS || result == ERROR_FILE_NOT_FOUND);
+
+    if (result == ERROR_SUCCESS) {
+        result = RegSetValueExA(openKey, value.c_str(), 0, REG_DWORD, reinterpret_cast(&data), sizeof(int32));
+
+        debugAssertM(result == ERROR_SUCCESS, "Could not write registry key value.");
+
+        RegCloseKey(openKey);
+    }
+    return (result == ERROR_SUCCESS);
+}
+
+bool RegistryUtil::writeBytes(const std::string& key, const std::string& value, const uint8* data, uint32 dataSize) {
+    debugAssert(data);
+
+    size_t pos = key.find('\\', 0);
+    if (pos == std::string::npos) {
+        return false;
+    }
+
+    HKEY hkey = getRootKeyFromString(key.c_str(), pos);
+
+    if (hkey == NULL) {
+        return false;
+    }
+
+    HKEY openKey;
+    int32 result = RegOpenKeyExA(hkey, (key.c_str() + pos + 1), 0, KEY_WRITE, &openKey);
+    debugAssert(result == ERROR_SUCCESS || result == ERROR_FILE_NOT_FOUND);
+
+    if (result == ERROR_SUCCESS) {
+        if (data) {
+            result = RegSetValueExA(openKey, value.c_str(), 0, REG_BINARY, reinterpret_cast(data), dataSize);
+        }
+
+        debugAssertM(result == ERROR_SUCCESS, "Could not write registry key value.");
+
+        RegCloseKey(openKey);
+    }
+    return (result == ERROR_SUCCESS);
+}
+
+bool RegistryUtil::writeString(const std::string& key, const std::string& value, const std::string& data) {
+    size_t pos = key.find('\\', 0);
+    if (pos == std::string::npos) {
+        return false;
+    }
+
+    HKEY hkey = getRootKeyFromString(key.c_str(), pos);
+
+    if (hkey == NULL) {
+        return false;
+    }
+
+    HKEY openKey;
+    int32 result = RegOpenKeyExA(hkey, (key.c_str() + pos + 1), 0, KEY_WRITE, &openKey);
+    debugAssert(result == ERROR_SUCCESS || result == ERROR_FILE_NOT_FOUND);
+
+    if (result == ERROR_SUCCESS) {
+        result = RegSetValueExA(openKey, value.c_str(), 0, REG_SZ, reinterpret_cast(data.c_str()), (data.size() + 1));                
+        debugAssertM(result == ERROR_SUCCESS, "Could not write registry key value.");
+
+        RegCloseKey(openKey);
+    }
+    return (result == ERROR_SUCCESS);
+}
+
+
+// static helpers
+static HKEY getRootKeyFromString(const char* str, uint32 length) {
+    debugAssert(str);
+
+    if (str) {
+        if ( strncmp(str, "HKEY_CLASSES_ROOT", length) == 0 ) {
+            return HKEY_CLASSES_ROOT;
+        } else if  ( strncmp(str, "HKEY_CURRENT_CONFIG", length) == 0 ) {
+            return HKEY_CURRENT_CONFIG;
+        } else if  ( strncmp(str, "HKEY_CURRENT_USER", length) == 0 ) {
+            return HKEY_CURRENT_USER;
+        } else if  ( strncmp(str, "HKEY_LOCAL_MACHINE", length) == 0 ) {
+            return HKEY_LOCAL_MACHINE;
+        } else if  ( strncmp(str, "HKEY_PERFORMANCE_DATA", length) == 0 ) {
+            return HKEY_PERFORMANCE_DATA;
+        } else if  ( strncmp(str, "HKEY_PERFORMANCE_NLSTEXT", length) == 0 ) {
+            return HKEY_PERFORMANCE_NLSTEXT;
+        } else if  ( strncmp(str, "HKEY_PERFORMANCE_TEXT", length) == 0 ) {
+            return HKEY_PERFORMANCE_TEXT;
+        } else if  ( strncmp(str, "HKEY_CLASSES_ROOT", length) == 0 ) {
+            return HKEY_CLASSES_ROOT;
+        } else {
+            return NULL;
+        }
+    } else {
+        return NULL;
+    }
+}
+
+} // namespace G3D
+
+#endif // G3D_WIN32
diff --git a/externals/g3dlite/win/VC90/g3dlite.vcproj b/externals/g3dlite/win/VC90/g3dlite.vcproj
index 3df2049d9f0..318eefd1dd4 100644
--- a/externals/g3dlite/win/VC90/g3dlite.vcproj
+++ b/externals/g3dlite/win/VC90/g3dlite.vcproj
@@ -93,7 +93,7 @@
 			/>
 		
 		
 			
 			
 		
 		
 			
 			
 			
+			
+			
 			
diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp
index 9c10094c37c..25c0b4be762 100644
--- a/src/server/worldserver/Main.cpp
+++ b/src/server/worldserver/Main.cpp
@@ -34,7 +34,7 @@
 #include "Master.h"
 
 #ifndef _TRINITY_CORE_CONFIG
-# define _TRINITY_CORE_CONFIG  "TrinityCore.conf"
+# define _TRINITY_CORE_CONFIG  "worldserver.conf"
 #endif //_TRINITY_CORE_CONFIG
 
 #ifdef WIN32
diff --git a/win/VC90/TrinityCore.vcproj b/win/VC90/TrinityCore.vcproj
index 8179e78cebc..692bbf7fbc0 100644
--- a/win/VC90/TrinityCore.vcproj
+++ b/win/VC90/TrinityCore.vcproj
@@ -48,7 +48,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\dep\include,..\..\src\framework,..\..\src\shared,..\..\src\shared\Database,..\..\src\game,..\..\src\trinitycore;..\..\dep\ACE_wrappers"
+				AdditionalIncludeDirectories="..\..\externals;..\..\externals\mersennetwister;..\..\externals\sockets\include;..\..\src\server\game\Accounts;..\..\src\server\game\Achievements;..\..\src\server\game\Addons;..\..\src\server\game\BattleGrounds;..\..\src\server\game\Chat;..\..\src\server\game\Combat;..\..\src\server\game\Conditions;..\..\src\server\game\DataStores;..\..\src\server\game\DungeonFinding;..\..\src\server\game\Entities\Corpse;..\..\src\server\game\Entities\Creature;..\..\src\server\game\Entities\DynamicObject;..\..\src\server\game\Entities\GameObject;..\..\src\server\game\Entities\Item;..\..\src\server\game\Entities\Item\Container;..\..\src\server\game\Entities\Object;..\..\src\server\game\Entities\Object\Updates;..\..\src\server\game\Entities\Pet;..\..\src\server\game\Entities\Player;..\..\src\server\game\Entities\Unit;..\..\src\server\game\Entities\Vehicle;..\..\src\server\game\Globals;..\..\src\server\game\Grids;..\..\src\server\game\Grids\Cells;..\..\src\server\game\Groups;..\..\src\server\game\Loot;..\..\src\server\game\Mails;..\..\src\server\game\Maps;..\..\src\server\game\Miscellaneous;..\..\src\server\game\Movement;..\..\src\server\game\Movement\Waypoints;..\..\src\server\game\Quests;..\..\src\server\game\Reputation;..\..\src\server\game\Server;..\..\src\server\game\Server\Protocol;..\..\src\server\game\Server\Protocol\Handlers;..\..\src\server\game\Spells\Auras;..\..\src\server\game\World;..\..\src\server\shared;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Cryptography\Authentication;..\..\src\server\shared\Database;..\..\src\server\shared\DataStores;..\..\src\server\shared\Dynamic;..\..\src\server\shared\Dynamic\LinkedReference;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\worldserver;..\..\src\server\worldserver\CommandLine;..\..\src\server\worldserver\RemoteAccess;..\..\src\server\worldserver\WorldThread"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;ENABLE_CLI;_SECURE_SCL=0"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -116,11 +116,11 @@
 			/>
 			
 		
 		
 			
 			
 			
 			
 			
 			
 			
 		
 		
 			
 			
 			
 			
 			
 			
 			
 		
 		
 			
 		
 	
@@ -450,11 +450,11 @@
 			
 		
 		
 		
 		
 		
 		
 		
 		
 		
 		
 		
 		
 		
 		
 		
 		
 		
 		
 		
 		
 		
 		
 		
 	
diff --git a/win/VC90/game.vcproj b/win/VC90/game.vcproj
index 65a85ed13ae..da026b48e28 100644
--- a/win/VC90/game.vcproj
+++ b/win/VC90/game.vcproj
@@ -132,7 +132,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP /Zm200"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\externals;..\..\externals\ace"
+				AdditionalIncludeDirectories="..\..\src\server\game\Entities\Item\Container;..\..\src\server\game\Server\Protocol\Handlers;..\..\externals\mersennetwister;..\..\externals\zlib;..\..\externals\g3dlite;..\..\src\server\collision;..\..\src\server\collision\Management;..\..\src\server\collision\Maps;..\..\src\server\collision\Models;..\..\src\server\shared;..\..\src\server\shared\Configuration;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Database;..\..\src\server\shared\DataStores;..\..\src\server\shared\Debugging;..\..\src\server\shared\Dynamic\CountedReference;..\..\src\server\shared\Dynamic\LinkedReference;..\..\src\server\shared\Dynamic;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\game;..\..\src\server\game\Accounts;..\..\src\server\game\Achievements;..\..\src\server\game\Addons;..\..\src\server\game\AI;..\..\src\server\game\AI\CoreAI;..\..\src\server\game\AI\EventAI;..\..\src\server\game\AI\ScriptedAI;..\..\src\server\game\AuctionHouse;..\..\src\server\game\AuctionHouse\AuctionHouseBot;..\..\src\server\game\BattleGrounds;..\..\src\server\game\BattleGrounds\Zones;..\..\src\server\game\Calendar;..\..\src\server\game\Chat;..\..\src\server\game\Chat\Channels;..\..\src\server\game\Chat\Commands;..\..\src\server\game\Combat;..\..\src\server\game\Conditions;..\..\src\server\game\DataStores;..\..\src\server\game\DungeonFinding;..\..\src\server\game\Entities;..\..\src\server\game\Entities\Creature;..\..\src\server\game\Entities\Corpse;..\..\src\server\game\Entities\DynamicObject;..\..\src\server\game\Entities\GameObject;..\..\src\server\game\Entities\Item;..\..\src\server\game\Entities\Object;..\..\src\server\game\Entities\Object\Updates;..\..\src\server\game\Entities\Pet;..\..\src\server\game\Entities\Player;..\..\src\server\game\Entities\Totem;..\..\src\server\game\Entities\Unit;..\..\src\server\game\Entities\Vehicle;..\..\src\server\game\Entities\Transport;..\..\src\server\game\Events;..\..\src\server\game\Globals;..\..\src\server\game\Grids\Cells;..\..\src\server\game\Grids\Notifiers;..\..\src\server\game\Grids;..\..\src\server\game\Groups;..\..\src\server\game\Guilds;..\..\src\server\game\Instances;..\..\src\server\game\Loot;..\..\src\server\game\Mails;..\..\src\server\game\Maps;..\..\src\server\game\Miscellaneous;..\..\src\server\game\Movement;..\..\src\server\game\Movement\MovementGenerators;..\..\src\server\game\Movement\Waypoints;..\..\src\server\game\OutdoorPvP;..\..\src\server\game\OutdoorPvP\Zones;..\..\src\server\game\Pools;..\..\src\server\game\PrecompiledHeaders;..\..\src\server\game\Quests;..\..\src\server\game\Reputation;..\..\src\server\game\Scripting;..\..\src\server\game\Server\Protocol;..\..\src\server\game\Server;..\..\src\server\game\Skills;..\..\src\server\game\Spells;..\..\src\server\game\Spells\Auras;..\..\src\server\game\Tools;..\..\src\server\game\Weather;..\..\src\server\game\World;..\..\externals;..\..\src\server\shared\Cryptography\Authentication"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -214,7 +214,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP /bigobj /Zm200"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\externals;..\..\externals\ace;"
+				AdditionalIncludeDirectories="..\..\src\server\game\Entities\Item\Container;..\..\src\server\game\Server\Protocol\Handlers;..\..\externals\mersennetwister;..\..\externals\zlib;..\..\src\server\collision;..\..\src\server\collision\Management;..\..\src\server\shared;..\..\src\server\shared\Configuration;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Database;..\..\src\server\shared\DataStores;..\..\src\server\shared\Debugging;..\..\src\server\shared\Dynamic\CountedReference;..\..\src\server\shared\Dynamic\LinkedReference;..\..\src\server\shared\Dynamic;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\game;..\..\src\server\game\Accounts;..\..\src\server\game\Achievements;..\..\src\server\game\Addons;..\..\src\server\game\AI;..\..\src\server\game\AI\CoreAI;..\..\src\server\game\AI\EventAI;..\..\src\server\game\AI\ScriptedAI;..\..\src\server\game\AuctionHouse;..\..\src\server\game\AuctionHouse\AuctionHouseBot;..\..\src\server\game\BattleGrounds;..\..\src\server\game\BattleGrounds\Zones;..\..\src\server\game\Calendar;..\..\src\server\game\Chat;..\..\src\server\game\Chat\Channels;..\..\src\server\game\Chat\Commands;..\..\src\server\game\Combat;..\..\src\server\game\Conditions;..\..\src\server\game\DataStores;..\..\src\server\game\DungeonFinding;..\..\src\server\game\Entities;..\..\src\server\game\Entities\Creature;..\..\src\server\game\Entities\Corpse;..\..\src\server\game\Entities\DynamicObject;..\..\src\server\game\Entities\GameObject;..\..\src\server\game\Entities\Item;..\..\src\server\game\Entities\Object;..\..\src\server\game\Entities\Object\Updates;..\..\src\server\game\Entities\Pet;..\..\src\server\game\Entities\Player;..\..\src\server\game\Entities\Totem;..\..\src\server\game\Entities\Unit;..\..\src\server\game\Entities\Vehicle;..\..\src\server\game\Entities\Transport;..\..\src\server\game\Events;..\..\src\server\game\Globals;..\..\src\server\game\Grids\Cells;..\..\src\server\game\Grids\Notifiers;..\..\src\server\game\Grids;..\..\src\server\game\Groups;..\..\src\server\game\Guilds;..\..\src\server\game\Instances;..\..\src\server\game\Loot;..\..\src\server\game\Mails;..\..\src\server\game\Maps;..\..\src\server\game\Miscellaneous;..\..\src\server\game\Movement;..\..\src\server\game\Movement\MovementGenerators;..\..\src\server\game\Movement\Waypoints;..\..\src\server\game\OutdoorPvP;..\..\src\server\game\OutdoorPvP\Zones;..\..\src\server\game\Pools;..\..\src\server\game\PrecompiledHeaders;..\..\src\server\game\Quests;..\..\src\server\game\Reputation;..\..\src\server\game\Scripting;..\..\src\server\game\Server\Protocol;..\..\src\server\game\Server;..\..\src\server\game\Skills;..\..\src\server\game\Spells;..\..\src\server\game\Spells\Auras;..\..\src\server\game\Tools;..\..\src\server\game\Weather;..\..\src\server\game\World;..\..\externals;..\..\src\server\shared\Cryptography\Authentication;"
 				PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB"
 				StringPooling="false"
 				MinimalRebuild="false"
@@ -298,7 +298,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP /bigobj /Zm200"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\externals;..\..\externals\ace;"
+				AdditionalIncludeDirectories="..\..\src\server\game\Entities\Item\Container;..\..\src\server\game\Server\Protocol\Handlers;..\..\externals\mersennetwister;..\..\externals\zlib;..\..\src\server\collision;..\..\src\server\collision\Management;..\..\src\server\shared;..\..\src\server\shared\Configuration;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Database;..\..\src\server\shared\DataStores;..\..\src\server\shared\Debugging;..\..\src\server\shared\Dynamic\CountedReference;..\..\src\server\shared\Dynamic\LinkedReference;..\..\src\server\shared\Dynamic;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\game;..\..\src\server\game\Accounts;..\..\src\server\game\Achievements;..\..\src\server\game\Addons;..\..\src\server\game\AI;..\..\src\server\game\AI\CoreAI;..\..\src\server\game\AI\EventAI;..\..\src\server\game\AI\ScriptedAI;..\..\src\server\game\AuctionHouse;..\..\src\server\game\AuctionHouse\AuctionHouseBot;..\..\src\server\game\BattleGrounds;..\..\src\server\game\BattleGrounds\Zones;..\..\src\server\game\Calendar;..\..\src\server\game\Chat;..\..\src\server\game\Chat\Channels;..\..\src\server\game\Chat\Commands;..\..\src\server\game\Combat;..\..\src\server\game\Conditions;..\..\src\server\game\DataStores;..\..\src\server\game\DungeonFinding;..\..\src\server\game\Entities;..\..\src\server\game\Entities\Creature;..\..\src\server\game\Entities\Corpse;..\..\src\server\game\Entities\DynamicObject;..\..\src\server\game\Entities\GameObject;..\..\src\server\game\Entities\Item;..\..\src\server\game\Entities\Object;..\..\src\server\game\Entities\Object\Updates;..\..\src\server\game\Entities\Pet;..\..\src\server\game\Entities\Player;..\..\src\server\game\Entities\Totem;..\..\src\server\game\Entities\Unit;..\..\src\server\game\Entities\Vehicle;..\..\src\server\game\Entities\Transport;..\..\src\server\game\Events;..\..\src\server\game\Globals;..\..\src\server\game\Grids\Cells;..\..\src\server\game\Grids\Notifiers;..\..\src\server\game\Grids;..\..\src\server\game\Groups;..\..\src\server\game\Guilds;..\..\src\server\game\Instances;..\..\src\server\game\Loot;..\..\src\server\game\Mails;..\..\src\server\game\Maps;..\..\src\server\game\Miscellaneous;..\..\src\server\game\Movement;..\..\src\server\game\Movement\MovementGenerators;..\..\src\server\game\Movement\Waypoints;..\..\src\server\game\OutdoorPvP;..\..\src\server\game\OutdoorPvP\Zones;..\..\src\server\game\Pools;..\..\src\server\game\PrecompiledHeaders;..\..\src\server\game\Quests;..\..\src\server\game\Reputation;..\..\src\server\game\Scripting;..\..\src\server\game\Server\Protocol;..\..\src\server\game\Server;..\..\src\server\game\Skills;..\..\src\server\game\Spells;..\..\src\server\game\Spells\Auras;..\..\src\server\game\Tools;..\..\src\server\game\Weather;..\..\src\server\game\World;..\..\externals;..\..\src\server\shared\Cryptography\Authentication;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -4307,6 +4307,46 @@
 				RelativePath="..\..\src\server\game\PrecompiledHeaders\ScriptPCH.h"
 				>
 			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+			
 		
 		
 			
 		
-		
-			
-				
-			
-			
-				
-			
-		
-		
-		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+			
+			
+				
+				
+				
+				
+				
+				
+				
+				
+			
+			
+				
+				
+				
+				
+				
+				
+				
+				
+			
+		
 	
 	
 	
-- 
cgit v1.2.3


From 4507e7dd664d326770b60abd6dde10f26c54dfab Mon Sep 17 00:00:00 2001
From: Shauren 
Date: Thu, 10 Jun 2010 20:52:15 +0200
Subject: Fixed some spaces

--HG--
branch : trunk
---
 src/server/game/Conditions/ConditionMgr.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp
index 83287ee87be..62ba42cb2f4 100644
--- a/src/server/game/Conditions/ConditionMgr.cpp
+++ b/src/server/game/Conditions/ConditionMgr.cpp
@@ -34,7 +34,7 @@ INSTANTIATE_SINGLETON_1(ConditionMgr);
 // Checks if player meets the condition
 // Can have CONDITION_SOURCE_TYPE_NONE && !mReferenceId if called from a special event (ie: eventAI)
 bool Condition::Meets(Player * player, Unit* targetOverride)
-{    
+{
     if (!player)
     {
         sLog.outDebug("Condition player not found");
@@ -126,7 +126,7 @@ bool Condition::Meets(Player * player, Unit* targetOverride)
             break;
         }
         case CONDITION_SPELL_SCRIPT_TARGET:
-            condMeets = true;//spell target condition is handled in spellsystem, here it is always true    
+            condMeets = true;//spell target condition is handled in spellsystem, here it is always true
             refId = 0;//cant have references! use CONDITION_SOURCE_TYPE_SPELL for it
             break;
         case CONDITION_CREATURE_TARGET:
@@ -165,7 +165,7 @@ bool Condition::Meets(Player * player, Unit* targetOverride)
             break;
         case CONDITION_ITEM_TARGET:
         {
-            condMeets = true;//handled in Item::IsTargetValidForItemUse    
+            condMeets = true;//handled in Item::IsTargetValidForItemUse
             refId = 0;//cant have references for now
             break;
         }
@@ -241,7 +241,7 @@ bool ConditionMgr::IsPlayerMeetToConditionList(Player* player,const ConditionLis
             {
                 if (!(*i)->Meets(player, targetOverride))
                     ElseGroupMap[(*i)->mElseGroup] = false;
-            }            
+            }
         }
     }
     for (std::map::const_iterator i = ElseGroupMap.begin(); i != ElseGroupMap.end(); ++i)
@@ -351,7 +351,7 @@ void ConditionMgr::LoadConditions(bool isReload)
 
         if (iConditionTypeOrReference < 0)//it has a reference
         {
-            if (iConditionTypeOrReference == iSourceTypeOrReferenceId)//self referencing, skipp
+            if (iConditionTypeOrReference == iSourceTypeOrReferenceId)//self referencing, skip
             {
                 sLog.outErrorDb("Condition reference %i is referencing self, skipped", iSourceTypeOrReferenceId);
                 continue;
@@ -529,7 +529,7 @@ bool ConditionMgr::addToGossipMenuItems(Condition* cond)
             }
         }
     }
-    sLog.outErrorDb("addToGossipMenuItems: GossipMenuIt %u Item %u not found", cond->mSourceGroup, cond->mSourceEntry);
+    sLog.outErrorDb("addToGossipMenuItems: GossipMenuId %u Item %u not found", cond->mSourceGroup, cond->mSourceEntry);
     return false;
 }
 
@@ -776,7 +776,7 @@ bool ConditionMgr::isSourceTypeValid(Condition* cond)
                 return false;
             }
             break;
-        }          
+        }
         case CONDITION_SOURCE_TYPE_CREATURE_TEMPLATE_VEHICLE:
         {
             if (!sCreatureStorage.LookupEntry(cond->mSourceEntry))
-- 
cgit v1.2.3


From 6da05ec5d1c7e9cb4e90404bb2358567561a9fff Mon Sep 17 00:00:00 2001
From: Anubisss 
Date: Fri, 11 Jun 2010 01:25:10 +0200
Subject: Fix memory leaks in ConditionManager.

--HG--
branch : trunk
---
 src/server/game/Conditions/ConditionMgr.cpp | 70 +++++++++++++++++++++++------
 src/server/game/Conditions/ConditionMgr.h   |  9 ++--
 2 files changed, 62 insertions(+), 17 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp
index 62ba42cb2f4..cb35d35c63f 100644
--- a/src/server/game/Conditions/ConditionMgr.cpp
+++ b/src/server/game/Conditions/ConditionMgr.cpp
@@ -201,6 +201,7 @@ ConditionMgr::ConditionMgr()
 
 ConditionMgr::~ConditionMgr()
 {
+    Clean();
 }
 
 ConditionList ConditionMgr::GetConditionReferences(uint32 refId)
@@ -236,7 +237,7 @@ bool ConditionMgr::IsPlayerMeetToConditionList(Player* player,const ConditionLis
                 }else{
                     sLog.outDebug("IsPlayerMeetToConditionList: Reference template -%u not found", (*i)->mReferenceId);//checked at loading, should never happen
                 }
-                
+
             } else//handle normal condition
             {
                 if (!(*i)->Meets(player, targetOverride))
@@ -273,7 +274,7 @@ ConditionList ConditionMgr::GetConditionsForNotGroupedEntry(ConditionSourceType
     {
         ConditionMap::const_iterator itr = m_ConditionMap.find(sType);
         if (itr != m_ConditionMap.end())
-        {            
+        {
             ConditionTypeMap::const_iterator i = (*itr).second.find(uEntry);
             if (i != (*itr).second.end())
             {
@@ -287,8 +288,8 @@ ConditionList ConditionMgr::GetConditionsForNotGroupedEntry(ConditionSourceType
 
 void ConditionMgr::LoadConditions(bool isReload)
 {
-    m_ConditionMap.clear(); // for reload case
-    m_ConditionReferenceMap.clear(); // for reload case
+    Clean();
+
     //must clear all custom handled cases (groupped types) before reload
     if (isReload)
     {
@@ -336,11 +337,11 @@ void ConditionMgr::LoadConditions(bool isReload)
         Field *fields = result->Fetch();
 
         Condition* cond = new Condition();
-        int32 iSourceTypeOrReferenceId   = fields[0].GetInt32();        
+        int32 iSourceTypeOrReferenceId   = fields[0].GetInt32();
         cond->mSourceGroup               = fields[1].GetUInt32();
         cond->mSourceEntry               = fields[2].GetUInt32();
         cond->mElseGroup                 = fields[3].GetUInt32();
-        int32 iConditionTypeOrReference  = fields[4].GetInt32();  
+        int32 iConditionTypeOrReference  = fields[4].GetInt32();
         cond->mConditionValue1           = fields[5].GetUInt32();
         cond->mConditionValue2           = fields[6].GetUInt32();
         cond->mConditionValue3           = fields[7].GetUInt32();
@@ -354,6 +355,7 @@ void ConditionMgr::LoadConditions(bool isReload)
             if (iConditionTypeOrReference == iSourceTypeOrReferenceId)//self referencing, skip
             {
                 sLog.outErrorDb("Condition reference %i is referencing self, skipped", iSourceTypeOrReferenceId);
+                delete cond;
                 continue;
             }
             cond->mReferenceId = uint32(abs(iConditionTypeOrReference));
@@ -373,8 +375,10 @@ void ConditionMgr::LoadConditions(bool isReload)
             if (cond->mSourceEntry && iSourceTypeOrReferenceId < 0)
                 sLog.outErrorDb("Condition %s %i has useless data in SourceEntry (%u)!", rowType, iSourceTypeOrReferenceId, cond->mSourceEntry);
         }else if (!isConditionTypeValid(cond))//doesn't have reference, validate ConditionType
-            continue;  
-
+        {
+            delete cond;
+            continue;
+        }
 
         if (iSourceTypeOrReferenceId < 0)//it is a reference template
         {
@@ -390,15 +394,19 @@ void ConditionMgr::LoadConditions(bool isReload)
         }//end of reference templates
 
         cond->mSourceType = ConditionSourceType(iSourceTypeOrReferenceId);
-        
+
         //if not a reference and SourceType is invalid, skip
         if (iConditionTypeOrReference >= 0 && !isSourceTypeValid(cond))
+        {
+            delete cond;
             continue;
+        }
 
         //Grouping is only allowed for some types (loot templates, gossip menus, gossip items)
         if (cond->mSourceGroup && !isGroupable(cond->mSourceType))
         {
             sLog.outErrorDb("Condition type %u has not allowed grouping %u!", uint32(cond->mSourceType), cond->mSourceGroup);
+            delete cond;
             continue;
         }else if (cond->mSourceGroup)
         {
@@ -450,9 +458,15 @@ void ConditionMgr::LoadConditions(bool isReload)
                     break;
             }
             if (!bIsDone)
+            {
                 sLog.outErrorDb("Not handled grouped condition, SourceGroup %u", cond->mSourceGroup);
+                delete cond;
+            }
             else
+            {
+                m_AllocatedMemory.push_back(cond);
                 ++count;
+            }
             continue;
         }
 
@@ -509,7 +523,7 @@ bool ConditionMgr::addToGossipMenus(Condition* cond)
                 return true;
             }
         }
-    }    
+    }
     sLog.outErrorDb("addToGossipMenus: GossipMenu %u not found", cond->mSourceGroup);
     return false;
 }
@@ -591,7 +605,7 @@ bool ConditionMgr::isSourceTypeValid(Condition* cond)
             break;
         }
         case CONDITION_SOURCE_TYPE_GAMEOBJECT_LOOT_TEMPLATE:
-        {                
+        {
             if (!LootTemplates_Gameobject.HaveLootFor(cond->mSourceGroup))
             {
                 sLog.outErrorDb("SourceGroup %u in `condition` table, does not exist in `gameobject_loot_template`, ignoring.", cond->mSourceGroup);
@@ -607,7 +621,7 @@ bool ConditionMgr::isSourceTypeValid(Condition* cond)
             break;
         }
         case CONDITION_SOURCE_TYPE_ITEM_LOOT_TEMPLATE:
-        {                
+        {
             if (!LootTemplates_Item.HaveLootFor(cond->mSourceGroup))
             {
                 sLog.outErrorDb("SourceGroup %u in `condition` table, does not exist in `item_loot_template`, ignoring.", cond->mSourceGroup);
@@ -1043,10 +1057,10 @@ bool ConditionMgr::isConditionTypeValid(Condition* cond)
             {
                 sLog.outErrorDb("SpellTarget condition has non existing spell target type (%u), skipped", cond->mConditionValue1);
                 return false;
-            }            
+            }
             switch(cond->mConditionValue1)
             {
-                case SPELL_TARGET_TYPE_GAMEOBJECT:                
+                case SPELL_TARGET_TYPE_GAMEOBJECT:
                 {
                     if (cond->mConditionValue2 && !sGOStorage.LookupEntry(cond->mConditionValue2))
                     {
@@ -1143,3 +1157,31 @@ bool ConditionMgr::isConditionTypeValid(Condition* cond)
     }
     return true;
 }
+
+void ConditionMgr::Clean()
+{
+    for (ConditionReferenceMap::iterator itr = m_ConditionReferenceMap.begin(); itr != m_ConditionReferenceMap.end(); ++itr)
+    {
+        for (ConditionList::const_iterator it = itr->second.begin(); it != itr->second.end(); ++it)
+            delete *it;
+        itr->second.clear();
+    }
+    m_ConditionReferenceMap.clear();
+
+    for (ConditionMap::iterator itr = m_ConditionMap.begin(); itr != m_ConditionMap.end(); ++itr)
+    {
+        for (ConditionTypeMap::iterator it = itr->second.begin(); it != itr->second.end(); ++it)
+        {
+            for (ConditionList::const_iterator i = it->second.begin(); i != it->second.end(); ++i)
+                delete *i;
+            it->second.clear();
+        }
+        itr->second.clear();
+    }
+    m_ConditionMap.clear();
+
+    // this is a BIG hack, feel free to fix it if you can figure out the ConditionMgr ;)
+    for (std::list::const_iterator itr = m_AllocatedMemory.begin(); itr != m_AllocatedMemory.end(); ++itr)
+        delete *itr;
+    m_AllocatedMemory.clear();
+}
diff --git a/src/server/game/Conditions/ConditionMgr.h b/src/server/game/Conditions/ConditionMgr.h
index bc2ce8d01a2..2c7c44ecf7f 100644
--- a/src/server/game/Conditions/ConditionMgr.h
+++ b/src/server/game/Conditions/ConditionMgr.h
@@ -47,7 +47,7 @@ enum ConditionType
     CONDITION_CLASS                 = 15,                   // class            0           +referenceID       true if player's class is equal to class
     CONDITION_RACE                  = 16,                   // race             0           +referenceID       true if player's race is equal to race
     CONDITION_ACHIEVEMENT           = 17,                   // achievement_id   0           +referenceID       true if achievement is complete
-    CONDITION_SPELL_SCRIPT_TARGET   = 18,                   // SpellScriptTargetType, TargetEntry, 0 
+    CONDITION_SPELL_SCRIPT_TARGET   = 18,                   // SpellScriptTargetType, TargetEntry, 0
     CONDITION_CREATURE_TARGET       = 19,                   // creature entry   0           +referenceID       true if current target is creature with value1 entry
     CONDITION_TARGET_HEALTH_BELOW_PCT = 20,                 // 0-100            0           +referenceID       true if target's health is below value1 percent, false if over or no target
     CONDITION_TARGET_RANGE          = 21,                   // minDistance      maxDist     +referenceID       true if target is closer then minDist and further then maxDist or if max is 0 then max dist is infinit
@@ -84,7 +84,7 @@ enum ConditionSourceType
 #define MAX_CONDITIONSOURCETYPE                            19
 
 struct Condition
-{    
+{
     ConditionSourceType     mSourceType;        //SourceTypeOrReferenceId
     uint32                  mSourceGroup;
     uint32                  mSourceEntry;
@@ -128,7 +128,7 @@ class ConditionMgr
         void LoadConditions(bool isReload = false);
         bool isConditionTypeValid(Condition* cond);
         ConditionList GetConditionReferences(uint32 refId);
-        
+
         bool IsPlayerMeetToConditions(Player* player, ConditionList conditions, Unit* targetOverride = NULL);
         ConditionList GetConditionsForNotGroupedEntry(ConditionSourceType sType, uint32 uEntry);
 
@@ -160,6 +160,9 @@ class ConditionMgr
                     sourceType == CONDITION_SOURCE_TYPE_GOSSIP_MENU ||
                     sourceType == CONDITION_SOURCE_TYPE_GOSSIP_MENU_OPTION);
         }
+
+        void Clean(); // free up resources
+        std::list m_AllocatedMemory; // some garbage collection :)
 };
 
 #define sConditionMgr Trinity::Singleton::Instance()
-- 
cgit v1.2.3


From f3bf8f8778b1eb3e7bd2ee08a4c261426f3b562e Mon Sep 17 00:00:00 2001
From: Anubisss 
Date: Fri, 11 Jun 2010 01:30:46 +0200
Subject: If you allocate memory with malloc() you should deallocate it with
 free(), strdup() allocates with malloc() so use free() to deallocate it :).

--HG--
branch : trunk
---
 src/server/worldserver/RemoteAccess/RASocket.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/worldserver/RemoteAccess/RASocket.cpp b/src/server/worldserver/RemoteAccess/RASocket.cpp
index 227968d4c9c..35c2514b377 100644
--- a/src/server/worldserver/RemoteAccess/RASocket.cpp
+++ b/src/server/worldserver/RemoteAccess/RASocket.cpp
@@ -254,7 +254,7 @@ void RASocket::zprint( const char * szText )
     unsigned int sz=strlen(megabuffer);
     Encrypt(megabuffer,sz);
     send(r,megabuffer,sz,0);
-    delete [] megabuffer;
+    free(megabuffer);
 
     #else
 
-- 
cgit v1.2.3


From 148f55481490f02c6fe16dc1b8916bb8e90c50c2 Mon Sep 17 00:00:00 2001
From: Anubisss 
Date: Fri, 11 Jun 2010 01:48:52 +0200
Subject: Fix a mem leak in Item::IsTargetValidForItemUse().

--HG--
branch : trunk
---
 src/server/game/Entities/Item/Item.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Item/Item.cpp b/src/server/game/Entities/Item/Item.cpp
index d0be9199259..8f7d82cee23 100644
--- a/src/server/game/Entities/Item/Item.cpp
+++ b/src/server/game/Entities/Item/Item.cpp
@@ -18,6 +18,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+ #include 
+
 #include "Common.h"
 #include "Item.h"
 #include "ObjectMgr.h"
@@ -834,7 +836,7 @@ bool Item::IsTargetValidForItemUse(Unit* pUnitTarget)
 
     for (ConditionList::const_iterator itr = conditions.begin(); itr != conditions.end(); ++itr)
     {
-        ItemRequiredTarget *irt = new ItemRequiredTarget((ItemRequiredTargetType)(*itr)->mConditionValue1, (*itr)->mConditionValue2);
+        ACE_Auto_Ptr irt(new ItemRequiredTarget((ItemRequiredTargetType)(*itr)->mConditionValue1, (*itr)->mConditionValue2));
         if (irt->IsFitToRequirements(pUnitTarget))
             return true;
     }
-- 
cgit v1.2.3


From d9d6e5732d0e07d6975e99ca32b146b9d6aa8944 Mon Sep 17 00:00:00 2001
From: Anubisss 
Date: Fri, 11 Jun 2010 01:55:04 +0200
Subject: Add NULL rows for 2 ChatCommand table.

--HG--
branch : trunk
---
 src/server/game/Chat/Chat.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src')

diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp
index 10fec8fbe4f..a976a2fcafc 100644
--- a/src/server/game/Chat/Chat.cpp
+++ b/src/server/game/Chat/Chat.cpp
@@ -133,11 +133,13 @@ ChatCommand * ChatHandler::getCommandTable()
     static ChatCommand channelSetCommandTable[] =
     {
         { "public",      SEC_ADMINISTRATOR,     true,  &ChatHandler::HandleChannelSetPublic,  "", NULL },
+        { NULL,          0,                     false, NULL,                                  "", NULL }
     };
 
     static ChatCommand channelCommandTable[] =
     {
         { "set",      SEC_ADMINISTRATOR,     true,  NULL,  "", channelSetCommandTable },
+        { NULL,       0,                     false, NULL,  "", NULL                   }
     };
 
     static ChatCommand debugPlayCommandTable[] =
-- 
cgit v1.2.3


From d6d9d50952aa244dfeba4d4ce6219527602ff8d8 Mon Sep 17 00:00:00 2001
From: silverice 
Date: Fri, 11 Jun 2010 05:00:46 +0300
Subject: Fix some memory leaks

--HG--
branch : trunk
---
 src/server/game/AI/EventAI/CreatureEventAI.cpp    | 10 +++++-----
 src/server/game/AI/EventAI/CreatureEventAIMgr.cpp | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/server/game/AI/EventAI/CreatureEventAI.cpp b/src/server/game/AI/EventAI/CreatureEventAI.cpp
index 47c8e9e6ad8..c6ec06d8895 100644
--- a/src/server/game/AI/EventAI/CreatureEventAI.cpp
+++ b/src/server/game/AI/EventAI/CreatureEventAI.cpp
@@ -1331,12 +1331,12 @@ void CreatureEventAI::ReceiveEmote(Player* pPlayer, uint32 text_emote)
             if ((*itr).Event.receive_emote.emoteId != text_emote)
                 return;
 
-            Condition* cond = new Condition();
-            cond->mConditionType = ConditionType((*itr).Event.receive_emote.condition);            
-            cond->mConditionValue1 = (*itr).Event.receive_emote.conditionValue1;
-            cond->mConditionValue2 = (*itr).Event.receive_emote.conditionValue2;
+            Condition cond;
+            cond.mConditionType = ConditionType((*itr).Event.receive_emote.condition);            
+            cond.mConditionValue1 = (*itr).Event.receive_emote.conditionValue1;
+            cond.mConditionValue2 = (*itr).Event.receive_emote.conditionValue2;
             
-            if (cond->Meets(pPlayer))
+            if (cond.Meets(pPlayer))
             {
                 sLog.outDebug("CreatureEventAI: ReceiveEmote CreatureEventAI: Condition ok, processing");
                 ProcessEvent(*itr, pPlayer);
diff --git a/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp b/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
index 57c23c9a26b..8c71f5e5765 100644
--- a/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
+++ b/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
@@ -362,11 +362,11 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
                     }
                     if (temp.receive_emote.condition)
                     {
-                        Condition* cond = new Condition();
-                        cond->mConditionType = ConditionType(temp.receive_emote.condition);            
-                        cond->mConditionValue1 = temp.receive_emote.conditionValue1;
-                        cond->mConditionValue2 = temp.receive_emote.conditionValue2;
-                        if (!sConditionMgr.isConditionTypeValid(cond))
+                        Condition cond;
+                        cond.mConditionType = ConditionType(temp.receive_emote.condition);            
+                        cond.mConditionValue1 = temp.receive_emote.conditionValue1;
+                        cond.mConditionValue2 = temp.receive_emote.conditionValue2;
+                        if (!sConditionMgr.isConditionTypeValid(&cond))
                         {
                             sLog.outErrorDb("CreatureEventAI: Creature %u using event %u: param2 (Condition: %u) are not valid.",temp.creature_id, i, temp.receive_emote.condition);
                             continue;
-- 
cgit v1.2.3


From 39e793b2bdfe4623b24a0528fd4954814f7e3a4b Mon Sep 17 00:00:00 2001
From: click 
Date: Fri, 11 Jun 2010 05:01:30 +0200
Subject: Add extractors and assembler - EXTRACTION OF NEW MAPS IS REQUIRED!
 This will allow for easier testing of functionality between different
 projects, ie. one set of maps/vmaps instead of 2 (saves space, saves time and
 saves us some confusion).

--HG--
branch : trunk
---
 externals/CMakeLists.txt                    |   5 +-
 externals/bzip2/CMakeLists.txt              |   2 +-
 externals/libmpq/config.h                   |  74 ++++++
 src/server/game/Maps/Map.cpp                |  10 +-
 src/server/game/Maps/Map.h                  |   3 +-
 src/tools/map_extractor/CMakeLists.txt      |  44 +++-
 src/tools/map_extractor/System.cpp          | 141 ++++++----
 src/tools/map_extractor/adt.cpp             | 381 ----------------------------
 src/tools/map_extractor/adt.h               | 130 ----------
 src/tools/map_extractor/dbcfile.cpp         |   2 +-
 src/tools/map_extractor/loadlib/loadlib.cpp |   4 +-
 src/tools/map_extractor/mpq_libmpq.cpp      |  61 ++---
 src/tools/map_extractor/mpq_libmpq.h        | 122 ---------
 src/tools/map_extractor/mpq_libmpq04.h      |  91 +++++++
 src/tools/vmap3_assembler/CMakeLists.txt    |   6 +-
 src/tools/vmap3_extractor/CMakeLists.txt    |   6 +-
 16 files changed, 329 insertions(+), 753 deletions(-)
 create mode 100644 externals/libmpq/config.h
 delete mode 100644 src/tools/map_extractor/adt.cpp
 delete mode 100644 src/tools/map_extractor/adt.h
 delete mode 100644 src/tools/map_extractor/mpq_libmpq.h
 create mode 100644 src/tools/map_extractor/mpq_libmpq04.h

(limited to 'src')

diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index 320a40c7377..fea7526b9c8 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -1,7 +1,8 @@
 #add_subdirectory(ace)
-#add_subdirectory(bzip2)
+#add_subdirectory(libmpq)
+
 add_subdirectory(zlib)
+add_subdirectory(bzip2)
 add_subdirectory(g3dlite)
 add_subdirectory(jemalloc)
-#add_subdirectory(libmpq)
 add_subdirectory(sockets)
diff --git a/externals/bzip2/CMakeLists.txt b/externals/bzip2/CMakeLists.txt
index d0d1ac04bcd..ef857f462ab 100644
--- a/externals/bzip2/CMakeLists.txt
+++ b/externals/bzip2/CMakeLists.txt
@@ -1,4 +1,4 @@
-file(GLOB sources *.cpp)
+file(GLOB sources *.c)
 set(bzip2_STAT_SRCS
   ${sources}
 )
diff --git a/externals/libmpq/config.h b/externals/libmpq/config.h
new file mode 100644
index 00000000000..c69fb13211b
--- /dev/null
+++ b/externals/libmpq/config.h
@@ -0,0 +1,74 @@
+/* config.h.  Generated from config.h.in by configure.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define to 1 if you have the  header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
+#define HAVE_FSEEKO 1
+
+/* Define to 1 if you have the  header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the `bz2' library (-lbz2). */
+#define HAVE_LIBBZ2 1
+
+/* Define to 1 if you have the `z' library (-lz). */
+#define HAVE_LIBZ 1
+
+/* Define to 1 if you have the  header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the  header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the  header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the  header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the  header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the  header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the  header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the  header file. */
+#define HAVE_UNISTD_H 1
+
+/* Name of package */
+#define PACKAGE "libmpq"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "mbroemme@plusserver.de"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "libmpq"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "libmpq 0.4.2"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "libmpq"
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "0.4.2"
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Version number of package */
+#define VERSION "0.4.2"
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#define _FILE_OFFSET_BITS 64
+
+/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
+/* #undef _LARGEFILE_SOURCE */
+
+/* Define for large files, on AIX-style hosts. */
+/* #undef _LARGE_FILES */
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp
index 12d7f14090a..ee8fc3fd6da 100644
--- a/src/server/game/Maps/Map.cpp
+++ b/src/server/game/Maps/Map.cpp
@@ -94,10 +94,9 @@ bool Map::ExistMap(uint32 mapid,int gx,int gy)
 
     map_fileheader header;
     fread(&header, sizeof(header), 1, pf);
-    if (header.mapMagic != uint32(MAP_MAGIC) ||
-        header.versionMagic != uint32(MAP_VERSION_MAGIC))
+    if (header.mapMagic != uint32(MAP_MAGIC) || header.versionMagic != uint32(MAP_VERSION_MAGIC))
     {
-        sLog.outError("Map file '%s' is non-compatible version (outdated?). Please, create new using ad.exe program.",tmp);
+        sLog.outError("Map file '%s' is from an incompatible clientversion. Please recreate using the mapextractor.",tmp);
         delete [] tmp;
         fclose(pf);                                         //close file before return
         return false;
@@ -1209,8 +1208,7 @@ bool GridMap::loadData(char *filename)
     if (!in)
         return true;
     fread(&header, sizeof(header),1,in);
-    if (header.mapMagic == uint32(MAP_MAGIC) &&
-        header.versionMagic == uint32(MAP_VERSION_MAGIC))
+    if (header.mapMagic == uint32(MAP_MAGIC) && header.versionMagic == uint32(MAP_VERSION_MAGIC))
     {
         // loadup area data
         if (header.areaMapOffset && !loadAreaData(in, header.areaMapOffset, header.areaMapSize))
@@ -1236,7 +1234,7 @@ bool GridMap::loadData(char *filename)
         fclose(in);
         return true;
     }
-    sLog.outError("Map file '%s' is a non-compatible version (outdated?). Please, create new using the ad.exe program.", filename);
+    sLog.outError("Map file '%s' is from an incompatible clientversion. Please recreate using the mapextractor.", filename);
     fclose(in);
     return false;
 }
diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h
index d2d442ca4cd..d17dc10ec07 100644
--- a/src/server/game/Maps/Map.h
+++ b/src/server/game/Maps/Map.h
@@ -57,7 +57,7 @@ class BattleGround;
 // Map file format defines
 //******************************************
 #define MAP_MAGIC             'SPAM'
-#define MAP_VERSION_MAGIC     '0.1w'
+#define MAP_VERSION_MAGIC     '1.1v'
 #define MAP_AREA_MAGIC        'AERA'
 #define MAP_HEIGHT_MAGIC      'TGHM'
 #define MAP_LIQUID_MAGIC      'QILM'
@@ -66,6 +66,7 @@ struct map_fileheader
 {
     uint32 mapMagic;
     uint32 versionMagic;
+    uint32 buildMagic;
     uint32 areaMapOffset;
     uint32 areaMapSize;
     uint32 heightMapOffset;
diff --git a/src/tools/map_extractor/CMakeLists.txt b/src/tools/map_extractor/CMakeLists.txt
index a2ceff1fa73..8e7fa0df891 100644
--- a/src/tools/map_extractor/CMakeLists.txt
+++ b/src/tools/map_extractor/CMakeLists.txt
@@ -12,17 +12,41 @@
 file(GLOB sources *.cpp)
 file(GLOB loadlib_sources loadlib/*.cpp)
 
-include_directories (${CMAKE_SOURCE_DIR}/src/server/shared)
-include_directories (${CMAKE_SOURCE_DIR}/externals/libmpq)
-include_directories (${CMAKE_SOURCE_DIR}/src/tools/map_extractor)
-include_directories (${CMAKE_SOURCE_DIR}/src/tools/map_extractor/loadlib)
+include_directories (
+  ${CMAKE_SOURCE_DIR}/src/server/shared
+  ${CMAKE_SOURCE_DIR}/externals/libmpq
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/loadlib
+)
 
-link_directories (${CMAKE_SOURCE_DIR}/externals/libmpq/libmpq)
-link_directories (${CMAKE_SOURCE_DIR}}/src/tools/map_extractor/loadlib)
+link_directories(
+  ${CMAKE_SOURCE_DIR}/externals/libmpq/libmpq
+  ${CMAKE_CURRENT_SOURCE_DIR}}/loadlib
+)
 
-add_library (loadlib ${loadlib_sources})
-target_link_libraries (loadlib zlib)
+add_library(loadlib
+  ${loadlib_sources}
+)
 
-add_executable (map_extractor ${sources})
+target_link_libraries(loadlib zlib)
 
-target_link_libraries (map_extractor libmpq loadlib)
+add_library(libmpq
+  ${CMAKE_SOURCE_DIR}/externals/libmpq/libmpq/common.c
+  ${CMAKE_SOURCE_DIR}/externals/libmpq/libmpq/explode.c
+  ${CMAKE_SOURCE_DIR}/externals/libmpq/libmpq/extract.c
+  ${CMAKE_SOURCE_DIR}/externals/libmpq/libmpq/huffman.c
+  ${CMAKE_SOURCE_DIR}/externals/libmpq/libmpq/mpq.c
+  ${CMAKE_SOURCE_DIR}/externals/libmpq/libmpq/wave.c
+)
+
+add_executable(mapextractor
+  ${sources}
+)
+
+target_link_libraries(mapextractor
+  libmpq
+  loadlib
+  bzip2
+)
+
+install(TARGETS mapextractor DESTINATION bin)
diff --git a/src/tools/map_extractor/System.cpp b/src/tools/map_extractor/System.cpp
index d5822c8d914..6abe2364cd6 100644
--- a/src/tools/map_extractor/System.cpp
+++ b/src/tools/map_extractor/System.cpp
@@ -12,13 +12,11 @@
 #endif
 
 #include "dbcfile.h"
-#include "mpq_libmpq.h"
+#include "mpq_libmpq04.h"
 
 #include "loadlib/adt.h"
 #include "loadlib/wdt.h"
 #include 
-#include "revision.h"
-#define _MAP_EXTRACTOR_VERSION 2
 
 #if defined( __GNUC__ )
     #define _open   open
@@ -35,7 +33,6 @@
 #else
     #define OPEN_FLAGS (O_RDONLY | O_BINARY)
 #endif
-
 extern ArchiveSet gOpenArchives;
 
 typedef struct
@@ -123,13 +120,6 @@ void Usage(char* prg)
     exit(1);
 }
 
-void Version(char* prg)
-{
-    printf("TrinityCore Rev: " _REVISION " " _BUILD_DIRECTIVE " Hash: " _HASH "\n"\
-    "%s Ver: " _MAP_EXTRACTOR_VERSION, prg);
-    exit(0);
-}
-
 void HandleArgs(int argc, char * arg[])
 {
     for(int c = 1; c < argc; ++c)
@@ -145,13 +135,13 @@ void HandleArgs(int argc, char * arg[])
         switch(arg[c][1])
         {
             case 'i':
-                if (c + 1 < argc)                            // all ok
+                if(c + 1 < argc)                            // all ok
                     strcpy(input_path, arg[(c++) + 1]);
                 else
                     Usage(arg[0]);
                 break;
             case 'o':
-                if (c + 1 < argc)                            // all ok
+                if(c + 1 < argc)                            // all ok
                     strcpy(output_path, arg[(c++) + 1]);
                 else
                     Usage(arg[0]);
@@ -163,7 +153,7 @@ void HandleArgs(int argc, char * arg[])
                     Usage(arg[0]);
                 break;
             case 'e':
-                if (c + 1 < argc)                            // all ok
+                if(c + 1 < argc)                            // all ok
                 {
                     CONF_extract=atoi(arg[(c++) + 1]);
                     if(!(CONF_extract > 0 && CONF_extract < 4))
@@ -172,16 +162,47 @@ void HandleArgs(int argc, char * arg[])
                 else
                     Usage(arg[0]);
                 break;
-            case 'v':
-                if (c + 1 < argc)                           // all ok
-                    Version(arg[0]);
-                else
-                    Usage(arg[0]);
-                break;
         }
     }
 }
 
+uint32 ReadBuild(int locale)
+{
+    // include build info file also
+    std::string filename  = std::string("component.wow-")+langs[locale]+".txt";
+    //printf("Read %s file... ", filename.c_str());
+
+    MPQFile m(filename.c_str());
+    if(m.isEof())
+    {
+        printf("Fatal error: Not found %s file!\n", filename.c_str());
+        exit(1);
+    }
+
+    std::string text = m.getPointer();
+    m.close();
+
+    size_t pos = text.find("version=\"");
+    size_t pos1 = pos + strlen("version=\"");
+    size_t pos2 = text.find("\"",pos1);
+    if (pos == text.npos || pos2 == text.npos || pos1 >= pos2)
+    {
+        printf("Fatal error: Invalid  %s file format!\n", filename.c_str());
+        exit(1);
+    }
+
+    std::string build_str = text.substr(pos1,pos2-pos1);
+
+    int build = atoi(build_str.c_str());
+    if (build <= 0)
+    {
+        printf("Fatal error: Invalid  %s file format!\n", filename.c_str());
+        exit(1);
+    }
+
+    return build;
+}
+
 uint32 ReadMapDBC()
 {
     printf("Read Map.dbc file... ");
@@ -254,16 +275,17 @@ void ReadLiquidTypeTableDBC()
 //
 
 // Map file format data
-#define MAP_MAGIC             'SPAM'
-#define MAP_VERSION_MAGIC     '0.1w'
-#define MAP_AREA_MAGIC        'AERA'
-#define MAP_HEIGHT_MAGIC      'TGHM'
-#define MAP_LIQUID_MAGIC      'QILM'
+static char const* MAP_MAGIC         = "MAPS";
+static char const* MAP_VERSION_MAGIC = "v1.1";
+static char const* MAP_AREA_MAGIC    = "AREA";
+static char const* MAP_HEIGHT_MAGIC  = "MHGT";
+static char const* MAP_LIQUID_MAGIC  = "MLIQ";
 
 struct map_fileheader
 {
     uint32 mapMagic;
     uint32 versionMagic;
+    uint32 buildMagic;
     uint32 areaMapOffset;
     uint32 areaMapSize;
     uint32 heightMapOffset;
@@ -341,7 +363,7 @@ uint8 liquid_type[ADT_CELLS_PER_GRID][ADT_CELLS_PER_GRID];
 bool  liquid_show[ADT_GRID_SIZE][ADT_GRID_SIZE];
 float liquid_height[ADT_GRID_SIZE+1][ADT_GRID_SIZE+1];
 
-bool ConvertADT(char *filename, char *filename2, int cell_y, int cell_x)
+bool ConvertADT(char *filename, char *filename2, int cell_y, int cell_x, uint32 build)
 {
     ADT_file adt;
 
@@ -360,8 +382,9 @@ bool ConvertADT(char *filename, char *filename2, int cell_y, int cell_x)
 
     // Prepare map header
     map_fileheader map;
-    map.mapMagic = MAP_MAGIC;
-    map.versionMagic = MAP_VERSION_MAGIC;
+    map.mapMagic = *(uint32 const*)MAP_MAGIC;
+    map.versionMagic = *(uint32 const*)MAP_VERSION_MAGIC;
+    map.buildMagic = build;
 
     // Get area flags data
     for (int i=0;i dbcfiles;
+    std::set dbcfiles;
 
     // get DBC file list
     for(ArchiveSet::iterator i = gOpenArchives.begin(); i != gOpenArchives.end();++i)
@@ -910,7 +949,7 @@ void ExtractDBCFiles(int locale, bool basicLocale)
                     dbcfiles.insert(*iter);
     }
 
-    string path = output_path;
+    std::string path = output_path;
     path += "/dbc/";
     CreateDir(path);
     if(!basicLocale)
@@ -920,6 +959,14 @@ void ExtractDBCFiles(int locale, bool basicLocale)
         CreateDir(path);
     }
 
+    // extract Build info file
+    {
+        string mpq_name = std::string("component.wow-") + langs[locale] + ".txt";
+        string filename = path + mpq_name;
+
+        ExtractFile(mpq_name.c_str(), filename);
+    }
+
     // extract DBCs
     int count = 0;
     for (set::iterator iter = dbcfiles.begin(); iter != dbcfiles.end(); ++iter)
@@ -927,18 +974,8 @@ void ExtractDBCFiles(int locale, bool basicLocale)
         string filename = path;
         filename += (iter->c_str() + strlen("DBFilesClient\\"));
 
-        FILE *output = fopen(filename.c_str(), "wb");
-        if(!output)
-        {
-            printf("Can't create the output file '%s'\n", filename.c_str());
-            continue;
-        }
-        MPQFile m(iter->c_str());
-        if(!m.isEof())
-            fwrite(m.getPointer(), 1, m.getSize(), output);
-
-        fclose(output);
-        ++count;
+        if(ExtractFile(iter->c_str(), filename))
+            ++count;
     }
     printf("Extracted %u DBC files\n\n", count);
 }
@@ -988,6 +1025,7 @@ int main(int argc, char * arg[])
     HandleArgs(argc, arg);
 
     int FirstLocale = -1;
+    uint32 build = 0;
 
     for (int i = 0; i < LANG_COUNT; i++)
     {
@@ -1003,14 +1041,18 @@ int main(int argc, char * arg[])
             if((CONF_extract & EXTRACT_DBC) == 0)
             {
                 FirstLocale = i;
+                build = ReadBuild(FirstLocale);
+                printf("Detected client build: %u\n", build);
                 break;
             }
 
             //Extract DBC files
             if(FirstLocale < 0)
             {
-                ExtractDBCFiles(i, true);
                 FirstLocale = i;
+                build = ReadBuild(FirstLocale);
+                printf("Detected client build: %u\n", build);
+                ExtractDBCFiles(i, true);
             }
             else
                 ExtractDBCFiles(i, false);
@@ -1035,7 +1077,7 @@ int main(int argc, char * arg[])
         LoadCommonMPQFiles();
 
         // Extract maps
-        ExtractMapsFromMpq();
+        ExtractMapsFromMpq(build);
 
         // Close MPQs
         CloseMPQFiles();
@@ -1043,4 +1085,3 @@ int main(int argc, char * arg[])
 
     return 0;
 }
-
diff --git a/src/tools/map_extractor/adt.cpp b/src/tools/map_extractor/adt.cpp
deleted file mode 100644
index fcbfc95a072..00000000000
--- a/src/tools/map_extractor/adt.cpp
+++ /dev/null
@@ -1,381 +0,0 @@
-#define _CRT_SECURE_NO_DEPRECATE
-
-#ifdef WIN32
-#include 
-#endif
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include "adt.h"
-#include "mpq_libmpq.h"
-
-extern uint16 *areas;
-extern uint16 *LiqType;
-extern uint32 maxAreaId;
-
-vec wmoc;
-
-Cell *cell;
-mcell *mcells;
-int holetab_h[4] = {0x1111, 0x2222, 0x4444, 0x8888};
-int holetab_v[4] = {0x000F, 0x00F0, 0x0F00, 0xF000};
-
-bool LoadADT(char* filename)
-{
-    size_t size;
-    MPQFile mf(filename);
-
-    if(mf.isEof())
-    {
-        //printf("No such file %s\n", filename);
-        return false;
-    }
-
-    MapLiqFlag = new uint8[256];
-    for(uint32 j = 0; j < 256; ++j)
-        MapLiqFlag[j] = 0;                                  // no water
-
-    MapLiqHeight = new float[16384];
-    for(uint32 j = 0; j < 16384; ++j)
-        MapLiqHeight[j] = -999999;                          // no water
-
-    mcells = new mcell;
-
-    wmoc.x = 65 * TILESIZE;
-    wmoc.z = 65 * TILESIZE;
-
-    size_t mcnk_offsets[256], mcnk_sizes[256];
-
-    chunk_num = 0;
-    k = 0;
-    m = 0;
-    while (!mf.isEof())
-    {
-        uint32 fourcc;
-        mf.read(&fourcc, 4);
-        mf.read(&size, 4);
-
-        size_t nextpos = mf.getPos() + size;
-
-        //if(fourcc==0x4d484452)                            // MHDR header
-        //if(fourcc==0x4d564552)                            // MVER
-        if(fourcc == 0x4d43494e)                            // MCIN
-        {
-            for (uint32 i = 0; i < 256; ++i)
-            {
-                mf.read(&mcnk_offsets[i], 4);
-                mf.read(&mcnk_sizes[i], 4);
-                mf.seekRelative(8);
-            }
-        }
-        //if(fourcc == 0x4d544558)                          // MTEX textures (strings)
-        //if(fourcc == 0x4d4d4458)                          // MMDX m2 models (strings)
-        //if(fourcc == 0x4d4d4944)                          // MMID offsets for strings in MMDX
-        //if(fourcc == 0x4d574d4f)                          // MWMO
-        //if(fourcc == 0x4d574944)                          // MWID offsets for strings in MWMO
-        //if(fourcc == 0x4d444446)                          // MDDF
-        //if(fourcc == 0x4d4f4446)                          // MODF
-        if(fourcc == 0x4d48324f)                            // MH2O new in WotLK
-        {
-            // çäåñ?íàäî çàïîìíèò?áàçîâó?ïîçèöè??ôàéë?òê âñ?ñìåùåí? áóäó?îò íåãî
-            uint32 base_pos = mf.getPos();
-            uint32 header_pos = 0;
-            MH2O_offsData *LiqOffsData = new MH2O_offsData;
-            MH2O_Data1 *LiqChunkData1 = new MH2O_Data1;
-            float *ChunkLiqHeight = new float[81];
-            for(chunk_num = 0; chunk_num < 256; ++chunk_num)
-            {
-                mf.read(LiqOffsData, 0x0C);
-                header_pos = mf.getPos();
-                if(LiqOffsData->offsData1 != 0)             // åñëè äàííûå ?Data1 ?âîäå åñòü, òî èõ íàäî êîíâåðòèðîâàòü
-                {
-                    // ïåðåõî?ïî ñìåùåíèþ èç offsData1 ÎÒ ×À?êóñê?
-                    mf.seek(base_pos + LiqOffsData->offsData1);
-                    mf.read(LiqChunkData1, 0x18);           // ñ÷èòûâàå?ñàìè äàííûå ?ñòðóêòóð?òèïà MH2O_Data1
-                    // çàíîñè?äàííûå ôëàã?äëÿ êóñê?
-                    if(LiqType[LiqChunkData1->LiquidTypeId] == 0xffff)
-                        printf("\nCan't find Liquid type for map %s\nchunk %d\n", filename, chunk_num);
-                    else if(LiqType[LiqChunkData1->LiquidTypeId] == LIQUID_TYPE_WATER || LiqType[LiqChunkData1->LiquidTypeId] == LIQUID_TYPE_OCEAN)
-                        MapLiqFlag[chunk_num] |= 1;         // water/ocean
-                    else if(LiqType[LiqChunkData1->LiquidTypeId] == LIQUID_TYPE_MAGMA || LiqType[LiqChunkData1->LiquidTypeId] == LIQUID_TYPE_SLIME)
-                        MapLiqFlag[chunk_num] |= 2;         // magma/slime
-                    // ïðåäâàðèòåëüíî çàïîëíÿåì âåñü êóñî?äàííûì?- íå?âîäû
-                    for(int j = 0; j < 81; ++j)
-                    {
-                        ChunkLiqHeight[j] = -999999;        // no liquid/water
-                    }
-                    // òåïåðü âû÷èñëÿåì òå ÷ò??âîäî??ïåðåçàïèñûâàåì èõ ?êóñê?
-                    for(int b = 0; b <= LiqChunkData1->height; ++b)
-                    {
-                        for(int c = LiqChunkData1->xOffset; c <= (LiqChunkData1->xOffset + LiqChunkData1->width); ++c)
-                        {
-                            int n = (9 * (LiqChunkData1->yOffset + b)) + c;
-                            ChunkLiqHeight[n] = LiqChunkData1->heightLevel1;
-                        }
-                    }
-                    mf.seek(header_pos);                    // ?íå çàáûòü âåðíóòüñÿ íà èñõîäíóþ ïîçèöè?èìåííî ?ÕÈÄÅÐÅ
-                }
-                else                                        // åñëè äàííûõ ?Data1 íå? òî íàäî çàïîëíèò?âåñü êóñî? íî äàííûì?- íå?âîäû
-                {
-                    for(int j = 0; j < 81; ++j)
-                        ChunkLiqHeight[j] = -999999;        // no liquid/water
-                }
-
-                if(!(chunk_num % 16))
-                    m = 1024 * (chunk_num / 16);            // ñìåùåíèå ïî ?äà?êóñêîâ ?ïåðåêðûòèå?= 1024
-                k = m + (chunk_num % 16) * 8;               // óñòàíàâëèâàåìñÿ íà íà÷àëüíû?èíäåêñ äëÿ çàïîëíåí? ?äà
-                // çàíîñè?äàííûå êóñê??ìàññèâ äëÿ êàðò? ?ïåðåêðûòèå??îáðåçàíèåì êóñêîâ òê äàííûõ 81
-                // ýò?àíàëîã ñòàðîã?îáðåçàíèÿ ãðàíè÷íû?ïðàâûõ-áîêîâû??íèæíèõ äàííûõ
-                for(int p = 0; p < 72; p += 9)              // íèæíèå 8 íå çàíîñè?òê îí?äóáëèðóåòñÿ ñëåä êóñêîì
-                {
-                    for(int s = 0; s < 8; ++s)              // 9 çíà÷åíèå ?ñòðîêå íå çàíîñè?òê îí?äóáëèðóåòñÿ ñëåä êóñêîì, ??ïðâû?áîêîâû?îáðåçàåò? äëÿ 128?28
-                    {
-                        MapLiqHeight[k] = ChunkLiqHeight[p + s];
-                        ++k;
-                    }
-                    k = k + 120;
-                }
-            }
-            delete LiqOffsData;
-            delete LiqChunkData1;
-            delete []ChunkLiqHeight;
-
-        }
-        //case 0x4d434e4b:                                  // MCNK
-        //case 0x4d46424f:                                  // MFBO new in BC
-        //case 0x4d545846:                                  // MTXF new in WotLK
-        mf.seek(nextpos);
-    }
-
-    //printf("Loading chunks info\n");
-    // read individual map chunks
-    chunk_num = 0;
-    k = 0;
-    m = 0;
-    for (int j = 0; j < 16; ++j)
-    {
-        for (int i = 0; i < 16; ++i)
-        {
-            mf.seek((int)mcnk_offsets[j * 16 + i]);
-            LoadMapChunk(mf, &(mcells->ch[i][j]));
-            ++chunk_num;
-        }
-    }
-    mf.close();
-    return true;
-}
-
-bool isHole(int holes, int i, int j)
-{
-    int testi = i / 2;
-    int testj = j / 4;
-    if(testi > 3) testi = 3;
-    if(testj > 3) testj = 3;
-    return (holes & holetab_h[testi] & holetab_v[testj]) != 0;
-}
-
-inline void LoadMapChunk(MPQFile &mf, chunk *_chunk)
-{
-    float h;
-    uint32 fourcc;
-    uint32 size;
-    MapChunkHeader header;
-
-    mf.seekRelative(4);
-    mf.read(&size, 4);
-
-    size_t lastpos = mf.getPos() + size;
-    mf.read(&header, 0x80);                                 // what if header size got changed?
-    _chunk->area_id = header.areaid;
-
-    float xbase = header.xpos;
-    float ybase = header.ypos;
-    float zbase = header.zpos;
-    zbase = TILESIZE * 32 - zbase;
-    xbase = TILESIZE * 32 - xbase;
-    if(wmoc.x > xbase) wmoc.x = xbase;
-    if(wmoc.z > zbase) wmoc.z = zbase;
-    int chunkflags = header.flags;
-    //printf("LMC: flags %X\n", chunkflags);
-    float zmin = 999999999.0f;
-    float zmax = -999999999.0f;
-    // must be there, bl!zz uses some crazy format
-    while (mf.getPos() < lastpos)
-    {
-        mf.read(&fourcc, 4);
-        mf.read(&size, 4);
-        size_t nextpos = mf.getPos() + size;
-        if(fourcc == 0x4d435654)                            // MCVT
-        {
-            for (int j = 0; j < 17; ++j)
-            {
-                for (int i = 0; i < ((j % 2) ? 8 : 9); ++i)
-                {
-                    mf.read(&h, 4);
-                    float z = h + ybase;
-                    if (j % 2)
-                    {
-                        if(isHole(header.holes, i, j))
-                            _chunk->v8[i][j / 2] = -1000;
-                        else
-                            _chunk->v8[i][j / 2] = z;
-                    }
-                    else
-                    {
-                        if(isHole(header.holes, i, j))
-                            _chunk->v9[i][j / 2] = -1000;
-                        else
-                            _chunk->v9[i][j / 2] = z;
-                    }
-
-                    if(z > zmax) zmax = z;
-                    //if(z < zmin) zmin = z;
-                }
-            }
-        }
-        else if(fourcc == 0x4d434e52)                       // MCNR
-        {
-            nextpos = mf.getPos() + 0x1C0;                  // size fix
-        }
-        else if(fourcc == 0x4d434c51)                       // íå áóäå?ó÷èòûâàò?åñëè óæ?áûëè äàííûå ?MH2O, ïåðåñòðàõîâê?:)                      // MCLQ
-        {
-            // liquid / water level
-            char fcc1[5];
-            mf.read(fcc1, 4);
-            flipcc(fcc1);
-            fcc1[4] = 0;
-            float *ChunkLiqHeight = new float[81];
-
-            if (!strcmp(fcc1, "MCSE"))
-            {
-                for(int j = 0; j < 81; ++j)
-                {
-                    ChunkLiqHeight[j] = -999999;            // no liquid/water
-                }
-            }
-            else
-            {
-                float maxheight;
-                mf.read(&maxheight, 4);
-                for(int j = 0; j < 81; ++j)
-                {
-                    LiqData liq;
-                    mf.read(&liq, 8);
-
-                    if(liq.height > maxheight)
-                        ChunkLiqHeight[j] = -999999;
-                    else
-                        ChunkLiqHeight[j] = h;
-                }
-
-                if(chunkflags & 4 || chunkflags & 8)
-                    MapLiqFlag[chunk_num] |= 1;             // water
-                if(chunkflags & 16)
-                    MapLiqFlag[chunk_num] |= 2;             // magma/slime
-            }
-            // àïîëíå?òà?æå êà??MH2O
-            if(!(chunk_num % 16))
-                m = 1024 * (chunk_num / 16);
-            k = m + (chunk_num % 16) * 8;
-            
-            for(int p = 0; p < 72; p += 9)
-            {
-                for(int s = 0; s < 8; ++s)
-                {
-                    MapLiqHeight[k] = ChunkLiqHeight[p + s];
-                    ++k;    
-                }
-                k = k + 120;
-            }
-            delete []ChunkLiqHeight;
-            break;
-        }
-        mf.seek(nextpos);
-    }
-}
-
-inline void TransformData()
-{
-    cell = new Cell;
-
-    for(uint32 x = 0; x < 128; ++x)
-    {
-        for(uint32 y = 0; y < 128; ++y)
-        {
-            cell->v8[y][x] = (float)mcells->ch[x / 8][y / 8].v8[x % 8][y % 8];
-            cell->v9[y][x] = (float)mcells->ch[x / 8][y / 8].v9[x % 8][y % 8];
-        }
-
-        // extra 1 point on bounds
-        cell->v9[128][x] = (float)mcells->ch[x / 8][15].v9[x % 8][8];
-        // x == y
-        cell->v9[x][128] = (float)mcells->ch[15][x / 8].v9[8][x % 8];
-    }
-
-    // and the last 1
-    cell->v9[128][128] = (float)mcells->ch[15][15].v9[8][8];
-
-    delete mcells;
-}
-
-const char MAP_MAGIC[] = "MAP_3.00";
-
-bool ConvertADT(char *filename, char *filename2)
-{
-    if(!LoadADT(filename))
-        return false;
-
-    FILE *output=fopen(filename2, "wb");
-    if(!output)
-    {
-        printf("Can't create the output file '%s'\n", filename2);
-        delete [] MapLiqHeight;
-        delete [] MapLiqFlag;
-        return false;
-    }
-
-    // write magic header
-    fwrite(MAP_MAGIC, 1, 8, output);
-
-    for(uint32 x = 0; x < 16; ++x)
-    {
-        for(uint32 y = 0; y < 16; ++y)
-        {
-            if(mcells->ch[y][x].area_id && mcells->ch[y][x].area_id <= maxAreaId)
-            {
-                if(areas[mcells->ch[y][x].area_id] == 0xffff)
-                    printf("\nCan't find area flag for areaid %u.\n", mcells->ch[y][x].area_id);
-
-                fwrite(&areas[mcells->ch[y][x].area_id], 1, 2, output);
-            }
-            else
-            {
-                uint16 flag = 0xffff;
-                fwrite(&flag, 1, 2, output);
-            }
-        }
-    }
-
-    fwrite(MapLiqFlag, 1, 256, output);
-    delete [] MapLiqFlag;
-
-    fwrite(MapLiqHeight, sizeof(float), 16384, output);
-    delete [] MapLiqHeight;
-
-    TransformData();
-
-
-    fwrite(&cell->v9, 1, sizeof(cell->v9), output);
-    fwrite(&cell->v8, 1, sizeof(cell->v8), output);
-    fclose(output);
-    delete cell;
-    
-    return true;
-}
-
diff --git a/src/tools/map_extractor/adt.h b/src/tools/map_extractor/adt.h
deleted file mode 100644
index 516ed88a86e..00000000000
--- a/src/tools/map_extractor/adt.h
+++ /dev/null
@@ -1,130 +0,0 @@
-#ifndef ADT_H
-#define ADT_H
-
-#define TILESIZE (533.33333f)
-#define CHUNKSIZE ((TILESIZE) / 16.0f)
-#define UNITSIZE (CHUNKSIZE / 8.0f)
-
-typedef unsigned char uint8;
-typedef unsigned short uint16;
-typedef unsigned int uint32;
-class Liquid;
-typedef struct
-{
-    float x;
-    float y;
-    float z;
-} svec;
-
-typedef struct
-{
-    double x;
-    double y;
-    double z;
-} vec;
-
-typedef struct
-{
-    vec v[3];
-} triangle;
-
-typedef struct
-{
-    float v9[16 * 8 + 1][16 * 8 + 1];
-    float v8[16 * 8][16 * 8];
-} Cell;
-
-typedef struct
-{
-    double v9[9][9];
-    double v8[8][8];
-    uint16 area_id;
-} chunk;
-
-typedef struct
-{
-    chunk ch[16][16];
-} mcell;
-
-struct MapChunkHeader
-{
-    uint32 flags;
-    uint32 ix;
-    uint32 iy;
-    uint32 nLayers;
-    uint32 nDoodadRefs;
-    uint32 ofsHeight;
-    uint32 ofsNormal;
-    uint32 ofsLayer;
-    uint32 ofsRefs;
-    uint32 ofsAlpha;
-    uint32 sizeAlpha;
-    uint32 ofsShadow;
-    uint32 sizeShadow;
-    uint32 areaid;
-    uint32 nMapObjRefs;
-    uint32 holes;
-    uint16 s1;
-    uint16 s2;
-    uint32 d1;
-    uint32 d2;
-    uint32 d3;
-    uint32 predTex;
-    uint32 nEffectDoodad;
-    uint32 ofsSndEmitters;
-    uint32 nSndEmitters;
-    uint32 ofsLiquid;                                       // not use in WotLK
-    uint32 sizeLiquid;                                      // not use in WotLK
-    float  zpos;
-    float  xpos;
-    float  ypos;
-    uint32 textureId;                                       // new offsColorValues in WotLK
-    uint32 props;
-    uint32 effectId;
-};
-
-typedef struct
-{
-    uint32 offsData1;
-    uint32 used;
-    uint32 offsData2;
-} MH2O_offsData;
-
-typedef struct
-{
-    uint16 LiquidTypeId;
-    uint16 type;
-    float heightLevel1;
-    float heightLevel2;
-    uint8 xOffset;
-    uint8 yOffset;
-    uint8 width;
-    uint8 height;
-    uint32 ofsData2a;
-    uint32 ofsData2b;
-} MH2O_Data1;
-
-typedef struct
-{
-    uint16 unk1;
-    uint16 unk2;
-    float height;
-} LiqData;
-
-enum LiquidType
-{
-    LIQUID_TYPE_WATER = 0,
-    LIQUID_TYPE_OCEAN = 1,
-    LIQUID_TYPE_MAGMA = 2,
-    LIQUID_TYPE_SLIME = 3
-};
-
-class MPQFile;
-
-float *MapLiqHeight;
-uint8 *MapLiqFlag;
-uint32 k, m, chunk_num;
-void LoadMapChunk(MPQFile &, chunk*);
-#endif
-
-
diff --git a/src/tools/map_extractor/dbcfile.cpp b/src/tools/map_extractor/dbcfile.cpp
index dd58ac1b4a6..927d3d62b7f 100644
--- a/src/tools/map_extractor/dbcfile.cpp
+++ b/src/tools/map_extractor/dbcfile.cpp
@@ -1,7 +1,7 @@
 #define _CRT_SECURE_NO_DEPRECATE
 
 #include "dbcfile.h"
-#include "mpq_libmpq.h"
+#include "mpq_libmpq04.h"
 
 DBCFile::DBCFile(const std::string &filename):
     filename(filename),
diff --git a/src/tools/map_extractor/loadlib/loadlib.cpp b/src/tools/map_extractor/loadlib/loadlib.cpp
index 90d95ebfe35..e2dd2d79d85 100644
--- a/src/tools/map_extractor/loadlib/loadlib.cpp
+++ b/src/tools/map_extractor/loadlib/loadlib.cpp
@@ -1,7 +1,7 @@
 #define _CRT_SECURE_NO_DEPRECATE
 
 #include "loadlib.h"
-#include "mpq_libmpq.h"
+#include "mpq_libmpq04.h"
 
 class MPQFile;
 
@@ -61,4 +61,4 @@ void FileLoader::free()
     data = 0;
     data_size = 0;
     version = 0;
-}
\ No newline at end of file
+}
diff --git a/src/tools/map_extractor/mpq_libmpq.cpp b/src/tools/map_extractor/mpq_libmpq.cpp
index 2a066a83b34..72a9de460eb 100644
--- a/src/tools/map_extractor/mpq_libmpq.cpp
+++ b/src/tools/map_extractor/mpq_libmpq.cpp
@@ -1,44 +1,30 @@
-#include "mpq_libmpq.h"
+#include "mpq_libmpq04.h"
 #include 
+#include 
 
 ArchiveSet gOpenArchives;
 
 MPQArchive::MPQArchive(const char* filename)
 {
-    int result = libmpq_archive_open(&mpq_a, (unsigned char*)filename);
+    int result = libmpq__archive_open(&mpq_a, filename, -1);
     printf("Opening %s\n", filename);
     if(result) {
         switch(result) {
-            case LIBMPQ_EFILE :                   /* error on file operation */
-                printf("Error opening archive '%s': File operation Error\n", filename);
+            case LIBMPQ_ERROR_OPEN :
+                printf("Error opening archive '%s': Does file really exist?\n", filename);
                 break;
-            case LIBMPQ_EFILE_FORMAT :            /* bad file format */
+            case LIBMPQ_ERROR_FORMAT :            /* bad file format */
                 printf("Error opening archive '%s': Bad file format\n", filename);
                 break;
-            case LIBMPQ_EFILE_CORRUPT :           /* file corrupt */
-                printf("Error opening archive '%s': File corrupt\n", filename);
+            case LIBMPQ_ERROR_SEEK :         /* seeking in file failed */
+                printf("Error opening archive '%s': Seeking in file failed\n", filename);
                 break;
-            case LIBMPQ_EFILE_NOT_FOUND :         /* file in archive not found */
-                printf("Error opening archive '%s': File in archive not found\n", filename);
-                break;
-            case LIBMPQ_EFILE_READ :              /* Read error in archive */
+            case LIBMPQ_ERROR_READ :              /* Read error in archive */
                 printf("Error opening archive '%s': Read error in archive\n", filename);
                 break;
-            case LIBMPQ_EALLOCMEM :               /* maybe not enough memory? :) */
+            case LIBMPQ_ERROR_MALLOC :               /* maybe not enough memory? :) */
                 printf("Error opening archive '%s': Maybe not enough memory\n", filename);
                 break;
-            case LIBMPQ_EFREEMEM :                /* can not free memory */
-                printf("Error opening archive '%s': Cannot free memory\n", filename);
-                break;
-            case LIBMPQ_EINV_RANGE :              /* Given filenumber is out of range */
-                printf("Error opening archive '%s': Given filenumber is out of range\n", filename);
-                break;
-            case LIBMPQ_EHASHTABLE :              /* error in reading hashtable */
-                printf("Error opening archive '%s': Error in reading hashtable\n", filename);
-                break;
-            case LIBMPQ_EBLOCKTABLE :             /* error in reading blocktable */
-                printf("Error opening archive '%s': Error in reading blocktable\n", filename);
-                break;
             default:
                 printf("Error opening archive '%s': Unknown error\n", filename);
                 break;
@@ -51,7 +37,7 @@ MPQArchive::MPQArchive(const char* filename)
 void MPQArchive::close()
 {
     //gOpenArchives.erase(erase(&mpq_a);
-    libmpq_archive_close(&mpq_a);
+    libmpq__archive_close(mpq_a);
 }
 
 MPQFile::MPQFile(const char* filename):
@@ -62,25 +48,16 @@ MPQFile::MPQFile(const char* filename):
 {
     for(ArchiveSet::iterator i=gOpenArchives.begin(); i!=gOpenArchives.end();++i)
     {
-        mpq_archive &mpq_a = (*i)->mpq_a;
+        mpq_archive *mpq_a = (*i)->mpq_a;
 
-        mpq_hash hash = (*i)->GetHashEntry(filename);
-        uint32 blockindex = hash.blockindex;
+        uint32_t filenum;
+        if(libmpq__file_number(mpq_a, filename, &filenum)) continue;
+        libmpq__off_t transferred;
+        libmpq__file_unpacked_size(mpq_a, filenum, &size);
 
-        if ((blockindex == 0xFFFFFFFF) || (blockindex == 0)) {
-            continue; //file not found
-        }
-
-        uint32 fileno = blockindex;
-
-        //int fileno = libmpq_file_number(&mpq_a, filename);
-        //if(fileno == LIBMPQ_EFILE_NOT_FOUND)
-        //    continue;
-
-        // Found!
-        size = libmpq_file_info(&mpq_a, LIBMPQ_FILE_UNCOMPRESSED_SIZE, fileno);
         // HACK: in patch.mpq some files don't want to open and give 1 for filesize
         if (size<=1) {
+            printf("warning: file %s has size %d; cannot read.\n", filename, size);
             eof = true;
             buffer = 0;
             return;
@@ -88,7 +65,8 @@ MPQFile::MPQFile(const char* filename):
         buffer = new char[size];
 
         //libmpq_file_getdata
-        libmpq_file_getdata(&mpq_a, hash, fileno, (unsigned char*)buffer);
+        libmpq__file_read(mpq_a, filenum, (unsigned char*)buffer, size, &transferred);
+        /*libmpq_file_getdata(&mpq_a, hash, fileno, (unsigned char*)buffer);*/
         return;
 
     }
@@ -131,4 +109,3 @@ void MPQFile::close()
     buffer = 0;
     eof = true;
 }
-
diff --git a/src/tools/map_extractor/mpq_libmpq.h b/src/tools/map_extractor/mpq_libmpq.h
deleted file mode 100644
index d61cda7f919..00000000000
--- a/src/tools/map_extractor/mpq_libmpq.h
+++ /dev/null
@@ -1,122 +0,0 @@
-#define _CRT_SECURE_NO_DEPRECATE
-#define _CRT_SECURE_NO_WARNINGS
-
-#ifndef MPQ_H
-#define MPQ_H
-
-#include "loadlib/loadlib.h"
-#include "libmpq/mpq.h"
-#include 
-#include 
-#include 
-#include 
-#include 
-
-using namespace std;
-
-class MPQArchive
-{
-
-public:
-    mpq_archive mpq_a;
-
-    MPQArchive(const char* filename);
-    void close();
-
-    uint32 HashString(const char* Input, uint32 Offset) {
-        uint32 seed1 = 0x7fed7fed;
-        uint32 seed2 = 0xeeeeeeee;
-
-        for (uint32 i = 0; i < strlen(Input); i++) {
-            uint32 val = toupper(Input[i]);
-            seed1 = mpq_a.buf[Offset + val] ^ (seed1 + seed2);
-            seed2 = val + seed1 + seed2 + (seed2 << 5) + 3;
-        }
-
-        return seed1;
-    }
-    mpq_hash GetHashEntry(const char* Filename) {
-        uint32 index = HashString(Filename, 0);
-        index &= mpq_a.header->hashtablesize - 1;
-        uint32 name1 = HashString(Filename, 0x100);
-        uint32 name2 = HashString(Filename, 0x200);
-
-        for(uint32 i = index; i < mpq_a.header->hashtablesize; ++i) {
-            mpq_hash hash = mpq_a.hashtable[i];
-            if (hash.name1 == name1 && hash.name2 == name2) return hash;
-        }
-
-        mpq_hash nullhash;
-        nullhash.blockindex = 0xFFFFFFFF;
-        return nullhash;
-    }
-
-    void GetFileListTo(vector& filelist) {
-        mpq_hash hash = GetHashEntry("(listfile)");
-        uint32 blockindex = hash.blockindex;
-
-        if ((blockindex == 0xFFFFFFFF) || (blockindex == 0))
-            return;
-
-        uint32 size = libmpq_file_info(&mpq_a, LIBMPQ_FILE_UNCOMPRESSED_SIZE, blockindex);
-        char *buffer = new char[size];
-
-        libmpq_file_getdata(&mpq_a, hash, blockindex, (unsigned char*)buffer);
-
-        char seps[] = "\n";
-        char *token;
-
-        token = strtok( buffer, seps );
-        uint32 counter = 0;
-        while ((token != NULL) && (counter < size)) {
-            //cout << token << endl;
-            token[strlen(token) - 1] = 0;
-            string s = token;
-            filelist.push_back(s);
-            counter += strlen(token) + 2;
-            token = strtok(NULL, seps);
-        }
-
-        delete[] buffer;
-    }
-};
-typedef std::deque ArchiveSet;
-
-class MPQFile
-{
-    //MPQHANDLE handle;
-    bool eof;
-    char *buffer;
-    size_t pointer,size;
-
-    // disable copying
-    MPQFile(const MPQFile &f) {}
-    void operator=(const MPQFile &f) {}
-
-public:
-    MPQFile(const char* filename);    // filenames are not case sensitive
-    ~MPQFile() { close(); }
-    size_t read(void* dest, size_t bytes);
-    size_t getSize() { return size; }
-    size_t getPos() { return pointer; }
-    char* getBuffer() { return buffer; }
-    char* getPointer() { return buffer + pointer; }
-    bool isEof() { return eof; }
-    void seek(int offset);
-    void seekRelative(int offset);
-    void close();
-};
-
-inline void flipcc(char *fcc)
-{
-    char t;
-    t=fcc[0];
-    fcc[0]=fcc[3];
-    fcc[3]=t;
-    t=fcc[1];
-    fcc[1]=fcc[2];
-    fcc[2]=t;
-}
-
-#endif
-
diff --git a/src/tools/map_extractor/mpq_libmpq04.h b/src/tools/map_extractor/mpq_libmpq04.h
new file mode 100644
index 00000000000..26008f5fba1
--- /dev/null
+++ b/src/tools/map_extractor/mpq_libmpq04.h
@@ -0,0 +1,91 @@
+#define _CRT_SECURE_NO_DEPRECATE
+#define _CRT_SECURE_NO_WARNINGS
+
+#ifndef MPQ_H
+#define MPQ_H
+
+#include "loadlib/loadlib.h"
+#include "libmpq/mpq.h"
+#include 
+#include 
+#include 
+#include 
+#include 
+
+using namespace std;
+
+class MPQArchive
+{
+
+public:
+    mpq_archive_s *mpq_a;
+
+    MPQArchive(const char* filename);
+    void close();
+
+    void GetFileListTo(vector& filelist) {
+    	uint32_t filenum;
+    	if(libmpq__file_number(mpq_a, "(listfile)", &filenum)) return;
+    	libmpq__off_t size, transferred;
+		libmpq__file_unpacked_size(mpq_a, filenum, &size);
+
+        char *buffer = new char[size];
+		
+		libmpq__file_read(mpq_a, filenum, (unsigned char*)buffer, size, &transferred);
+
+        char seps[] = "\n";
+        char *token;
+
+        token = strtok( buffer, seps );
+        uint32 counter = 0;
+        while ((token != NULL) && (counter < size)) {
+            //cout << token << endl;
+            token[strlen(token) - 1] = 0;
+            string s = token;
+            filelist.push_back(s);
+            counter += strlen(token) + 2;
+            token = strtok(NULL, seps);
+        }
+
+        delete[] buffer;
+    }
+};
+typedef std::deque ArchiveSet;
+
+class MPQFile
+{
+    //MPQHANDLE handle;
+    bool eof;
+    char *buffer;
+    libmpq__off_t pointer,size;
+
+    // disable copying
+    MPQFile(const MPQFile &f) {}
+    void operator=(const MPQFile &f) {}
+
+public:
+    MPQFile(const char* filename);    // filenames are not case sensitive
+    ~MPQFile() { close(); }
+    size_t read(void* dest, size_t bytes);
+    size_t getSize() { return size; }
+    size_t getPos() { return pointer; }
+    char* getBuffer() { return buffer; }
+    char* getPointer() { return buffer + pointer; }
+    bool isEof() { return eof; }
+    void seek(int offset);
+    void seekRelative(int offset);
+    void close();
+};
+
+inline void flipcc(char *fcc)
+{
+    char t;
+    t=fcc[0];
+    fcc[0]=fcc[3];
+    fcc[3]=t;
+    t=fcc[1];
+    fcc[1]=fcc[2];
+    fcc[2]=t;
+}
+
+#endif
diff --git a/src/tools/vmap3_assembler/CMakeLists.txt b/src/tools/vmap3_assembler/CMakeLists.txt
index 2088158af6a..b3b16d540c7 100644
--- a/src/tools/vmap3_assembler/CMakeLists.txt
+++ b/src/tools/vmap3_assembler/CMakeLists.txt
@@ -17,7 +17,7 @@ include_directories(
   ${ACE_INCLUDE_DIR}
 )
 
-add_executable(collision_assembler VMapAssembler.cpp)
-target_link_libraries(collision_assembler collision g3dlib)
-
+add_executable(vmap3assembler VMapAssembler.cpp)
+target_link_libraries(vmap3assembler collision g3dlib)
 
+install(TARGETS vmap3assembler DESTINATION bin)
diff --git a/src/tools/vmap3_extractor/CMakeLists.txt b/src/tools/vmap3_extractor/CMakeLists.txt
index 03d609bf60d..02d044cdaa9 100644
--- a/src/tools/vmap3_extractor/CMakeLists.txt
+++ b/src/tools/vmap3_extractor/CMakeLists.txt
@@ -11,5 +11,7 @@
 
 include_directories (${CMAKE_SOURCE_DIR}/externals/libmpq)
 
-add_executable(collision_extractor adtfile.cpp  dbcfile.cpp  model.cpp  mpq_libmpq.cpp  vmapexport.cpp  wdtfile.cpp  wmo.cpp)
-target_link_libraries(collision_extractor libmpq)
+add_executable(vmap3extractor adtfile.cpp  dbcfile.cpp  model.cpp  mpq_libmpq.cpp  vmapexport.cpp  wdtfile.cpp  wmo.cpp)
+target_link_libraries(vmap3extractor libmpq bzip2 zlib)
+
+install(TARGETS vmap3extractor DESTINATION bin)
-- 
cgit v1.2.3


From 4d84a4e82e56b54e79bfbeee4c38cc909ef82019 Mon Sep 17 00:00:00 2001
From: Shauren 
Date: Fri, 11 Jun 2010 12:25:49 +0200
Subject: Fixed libmpq build on windows Added 1 solution for map extractor,
 vmap extractor and vmap assembler Fixed debug build of map extractor
 (windows), don't forget to compile dependencies (external - bzip, libmpq and
 zlib)

--HG--
branch : trunk
---
 externals/libmpq/win/VC90/libmpq.vcproj            | 211 +++++++++++++++++
 externals/libmpq/win/dirent.h                      | 230 ++++++++++++++++++
 externals/libmpq/win/libmpq_VC90.sln               |  18 +-
 src/tools/ExtractorToolsVC90.sln                   |  32 +++
 src/tools/map_extractor/VC90/VC90_ad.vcproj        | 260 +++++++++++++++++++++
 src/tools/map_extractor/VC90_AD.sln                |  19 --
 src/tools/map_extractor/VC90_ad.vcproj             |  18 +-
 .../vmap3_extractor/win/vmapExtractor3_VC90.sln    |  19 --
 8 files changed, 743 insertions(+), 64 deletions(-)
 create mode 100644 externals/libmpq/win/VC90/libmpq.vcproj
 create mode 100644 externals/libmpq/win/dirent.h
 create mode 100644 src/tools/ExtractorToolsVC90.sln
 create mode 100644 src/tools/map_extractor/VC90/VC90_ad.vcproj
 delete mode 100644 src/tools/map_extractor/VC90_AD.sln
 delete mode 100644 src/tools/vmap3_extractor/win/vmapExtractor3_VC90.sln

(limited to 'src')

diff --git a/externals/libmpq/win/VC90/libmpq.vcproj b/externals/libmpq/win/VC90/libmpq.vcproj
new file mode 100644
index 00000000000..975eac173a3
--- /dev/null
+++ b/externals/libmpq/win/VC90/libmpq.vcproj
@@ -0,0 +1,211 @@
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+	
+	
+	
+
diff --git a/externals/libmpq/win/dirent.h b/externals/libmpq/win/dirent.h
new file mode 100644
index 00000000000..6425174092d
--- /dev/null
+++ b/externals/libmpq/win/dirent.h
@@ -0,0 +1,230 @@
+/*****************************************************************************
+ * dirent.h - dirent API for Microsoft Visual Studio
+ *
+ * Copyright (C) 2006 Toni Ronkko
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * ``Software''), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL TONI RONKKO BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Dec 15, 2009, John Cunningham
+ * Added rewinddir member function
+ *
+ * Jan 18, 2008, Toni Ronkko
+ * Using FindFirstFileA and WIN32_FIND_DATAA to avoid converting string
+ * between multi-byte and unicode representations.  This makes the
+ * code simpler and also allows the code to be compiled under MingW.  Thanks
+ * to Azriel Fasten for the suggestion.
+ *
+ * Mar 4, 2007, Toni Ronkko
+ * Bug fix: due to the strncpy_s() function this file only compiled in
+ * Visual Studio 2005.  Using the new string functions only when the
+ * compiler version allows.
+ *
+ * Nov  2, 2006, Toni Ronkko
+ * Major update: removed support for Watcom C, MS-DOS and Turbo C to
+ * simplify the file, updated the code to compile cleanly on Visual
+ * Studio 2005 with both unicode and multi-byte character strings,
+ * removed rewinddir() as it had a bug.
+ *
+ * Aug 20, 2006, Toni Ronkko
+ * Removed all remarks about MSVC 1.0, which is antiqued now.  Simplified
+ * comments by removing SGML tags.
+ *
+ * May 14 2002, Toni Ronkko
+ * Embedded the function definitions directly to the header so that no
+ * source modules need to be included in the Visual Studio project.  Removed
+ * all the dependencies to other projects so that this very header can be
+ * used independently.
+ *
+ * May 28 1998, Toni Ronkko
+ * First version.
+ *****************************************************************************/
+#ifndef DIRENT_H
+#define DIRENT_H
+
+#include 
+#include 
+#include 
+
+
+typedef struct dirent
+{
+   char d_name[MAX_PATH + 1]; /* current dir entry (multi-byte char string) */
+   WIN32_FIND_DATAA data;     /* file attributes */
+}  dirent;
+
+
+typedef struct DIR
+{
+   dirent current;            /* Current directory entry */
+   int    cached;             /* Indicates un-processed entry in memory */
+   HANDLE search_handle;      /* File search handle */
+   char   patt[MAX_PATH + 3]; /* search pattern (3 = pattern + "\\*\0") */
+} DIR;
+
+
+/* Forward declarations */
+static DIR *opendir (const char *dirname);
+static struct dirent *readdir (DIR *dirp);
+static int closedir (DIR *dirp);
+static void rewinddir(DIR* dirp);
+
+
+/* Use the new safe string functions introduced in Visual Studio 2005 */
+#if defined(_MSC_VER) && _MSC_VER >= 1400
+# define STRNCPY(dest,src,size) strncpy_s((dest),(size),(src),_TRUNCATE)
+#else
+# define STRNCPY(dest,src,size) strncpy((dest),(src),(size))
+#endif
+
+
+/*****************************************************************************
+ * Open directory stream DIRNAME for read and return a pointer to the
+ * internal working area that is used to retrieve individual directory
+ * entries.
+ */
+static DIR *opendir(const char *dirname)
+{
+   DIR *dirp;
+   assert (dirname != NULL);
+   assert (strlen (dirname) < MAX_PATH);
+
+   /* construct new DIR structure */
+   dirp = (DIR*) malloc (sizeof (struct DIR));
+   if (dirp != NULL) {
+      char *p;
+
+      /* take directory name... */
+      STRNCPY (dirp->patt, dirname, sizeof(dirp->patt));
+      dirp->patt[MAX_PATH] = '\0';
+
+      /* ... and append search pattern to it */
+      p = strchr (dirp->patt, '\0');
+      if (dirp->patt < p  &&  *(p-1) != '\\'  &&  *(p-1) != ':') {
+         *p++ = '\\';
+      }
+      *p++ = '*';
+      *p = '\0';
+
+      /* open stream and retrieve first file */
+      dirp->search_handle = FindFirstFileA (dirp->patt, &dirp->current.data);
+      if (dirp->search_handle == INVALID_HANDLE_VALUE) {
+         /* invalid search pattern? */
+         free (dirp);
+         return NULL;
+      }
+
+      /* there is an un-processed directory entry in memory now */
+      dirp->cached = 1;
+   }
+
+   return dirp;
+}
+
+
+/*****************************************************************************
+ * Read a directory entry, and return a pointer to a dirent structure
+ * containing the name of the entry in d_name field.  Individual directory
+ * entries returned by this very function include regular files,
+ * sub-directories, pseudo-directories "." and "..", but also volume labels,
+ * hidden files and system files may be returned.
+ */
+static struct dirent *readdir(DIR *dirp)
+{
+   assert (dirp != NULL);
+
+   if (dirp->search_handle == INVALID_HANDLE_VALUE) {
+      /* directory stream was opened/rewound incorrectly or ended normally */
+      return NULL;
+   }
+
+   /* get next directory entry */
+   if (dirp->cached != 0) {
+      /* a valid directory entry already in memory */
+      dirp->cached = 0;
+   } else {
+      /* read next directory entry from disk */
+      if (FindNextFileA (dirp->search_handle, &dirp->current.data) == FALSE) {
+         /* the very last file has been processed or an error occured */
+         FindClose (dirp->search_handle);
+         dirp->search_handle = INVALID_HANDLE_VALUE;
+         return NULL;
+      }
+   }
+
+   /* copy as a multibyte character string */
+   STRNCPY ( dirp->current.d_name,
+             dirp->current.data.cFileName,
+             sizeof(dirp->current.d_name) );
+   dirp->current.d_name[MAX_PATH] = '\0';
+
+   return &dirp->current;
+}
+
+
+/*****************************************************************************
+ * Close directory stream opened by opendir() function.  Close of the
+ * directory stream invalidates the DIR structure as well as any previously
+ * read directory entry.
+ */
+static int closedir(DIR *dirp)
+{
+   assert (dirp != NULL);
+
+   /* release search handle */
+   if (dirp->search_handle != INVALID_HANDLE_VALUE) {
+      FindClose (dirp->search_handle);
+      dirp->search_handle = INVALID_HANDLE_VALUE;
+   }
+
+   /* release directory handle */
+   free (dirp);
+   return 0;
+}
+
+
+/*****************************************************************************
+ * Resets the position of the directory stream to which dirp refers to the
+ * beginning of the directory. It also causes the directory stream to refer
+ * to the current state of the corresponding directory, as a call to opendir()
+ * would have done. If dirp does not refer to a directory stream, the effect
+ * is undefined.
+ */
+static void rewinddir(DIR* dirp)
+{
+   /* release search handle */
+   if (dirp->search_handle != INVALID_HANDLE_VALUE) {
+      FindClose (dirp->search_handle);
+      dirp->search_handle = INVALID_HANDLE_VALUE;
+   }
+
+   /* open new search handle and retrieve first file */
+   dirp->search_handle = FindFirstFileA (dirp->patt, &dirp->current.data);
+   if (dirp->search_handle == INVALID_HANDLE_VALUE) {
+      /* invalid search pattern? */
+      free (dirp);
+      return;
+   }
+
+   /* there is an un-processed directory entry in memory now */
+   dirp->cached = 1;
+}
+
+
+#endif /*DIRENT_H*/
diff --git a/externals/libmpq/win/libmpq_VC90.sln b/externals/libmpq/win/libmpq_VC90.sln
index 7c4a8e47a56..c55968a73a7 100644
--- a/externals/libmpq/win/libmpq_VC90.sln
+++ b/externals/libmpq/win/libmpq_VC90.sln
@@ -1,14 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual C++ Express 2008
+# Visual Studio 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmpq", "VC90\libmpq.vcproj", "{03AB0F44-628E-4855-99A0-C98A1EB52C50}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B96F612A-C91D-43B3-A4C3-D4294817EC6C} = {B96F612A-C91D-43B3-A4C3-D4294817EC6C}
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} = {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\..\win\VC90\zlib.vcproj", "{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bzip2", "..\..\..\win\VC90\bzip2.vcproj", "{B96F612A-C91D-43B3-A4C3-D4294817EC6C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -20,14 +12,6 @@ Global
 		{03AB0F44-628E-4855-99A0-C98A1EB52C50}.Debug|Win32.Build.0 = Debug|Win32
 		{03AB0F44-628E-4855-99A0-C98A1EB52C50}.Release|Win32.ActiveCfg = Release|Win32
 		{03AB0F44-628E-4855-99A0-C98A1EB52C50}.Release|Win32.Build.0 = Release|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.Build.0 = Debug|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.ActiveCfg = Release|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.Build.0 = Release|Win32
-		{B96F612A-C91D-43B3-A4C3-D4294817EC6C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B96F612A-C91D-43B3-A4C3-D4294817EC6C}.Debug|Win32.Build.0 = Debug|Win32
-		{B96F612A-C91D-43B3-A4C3-D4294817EC6C}.Release|Win32.ActiveCfg = Release|Win32
-		{B96F612A-C91D-43B3-A4C3-D4294817EC6C}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/src/tools/ExtractorToolsVC90.sln b/src/tools/ExtractorToolsVC90.sln
new file mode 100644
index 00000000000..6a31b5a1ddf
--- /dev/null
+++ b/src/tools/ExtractorToolsVC90.sln
@@ -0,0 +1,32 @@
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ad", "map_extractor\VC90\VC90_ad.vcproj", "{D7552D4F-408F-4F8E-859B-366659150CF4}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vmap_assembler", "vmap3_assembler\VC90\vmap_assembler.vcproj", "{572FFF74-480C-4472-8ABF-81733BB4049D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vmap3_extractor", "vmap3_extractor\VC90\vmap3_extractor.vcproj", "{502602CC-98EA-4335-B922-C5C1DBF37604}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{D7552D4F-408F-4F8E-859B-366659150CF4}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D7552D4F-408F-4F8E-859B-366659150CF4}.Debug|Win32.Build.0 = Debug|Win32
+		{D7552D4F-408F-4F8E-859B-366659150CF4}.Release|Win32.ActiveCfg = Release|Win32
+		{D7552D4F-408F-4F8E-859B-366659150CF4}.Release|Win32.Build.0 = Release|Win32
+		{572FFF74-480C-4472-8ABF-81733BB4049D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{572FFF74-480C-4472-8ABF-81733BB4049D}.Debug|Win32.Build.0 = Debug|Win32
+		{572FFF74-480C-4472-8ABF-81733BB4049D}.Release|Win32.ActiveCfg = Release|Win32
+		{572FFF74-480C-4472-8ABF-81733BB4049D}.Release|Win32.Build.0 = Release|Win32
+		{502602CC-98EA-4335-B922-C5C1DBF37604}.Debug|Win32.ActiveCfg = Debug|Win32
+		{502602CC-98EA-4335-B922-C5C1DBF37604}.Debug|Win32.Build.0 = Debug|Win32
+		{502602CC-98EA-4335-B922-C5C1DBF37604}.Release|Win32.ActiveCfg = Release|Win32
+		{502602CC-98EA-4335-B922-C5C1DBF37604}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/src/tools/map_extractor/VC90/VC90_ad.vcproj b/src/tools/map_extractor/VC90/VC90_ad.vcproj
new file mode 100644
index 00000000000..83480dd3912
--- /dev/null
+++ b/src/tools/map_extractor/VC90/VC90_ad.vcproj
@@ -0,0 +1,260 @@
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+		
+	
+	
+	
+
diff --git a/src/tools/map_extractor/VC90_AD.sln b/src/tools/map_extractor/VC90_AD.sln
deleted file mode 100644
index 68dd66e1f7f..00000000000
--- a/src/tools/map_extractor/VC90_AD.sln
+++ /dev/null
@@ -1,19 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ad", "VC90_ad.vcproj", "{D7552D4F-408F-4F8E-859B-366659150CF4}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D7552D4F-408F-4F8E-859B-366659150CF4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D7552D4F-408F-4F8E-859B-366659150CF4}.Debug|Win32.Build.0 = Debug|Win32
-		{D7552D4F-408F-4F8E-859B-366659150CF4}.Release|Win32.ActiveCfg = Release|Win32
-		{D7552D4F-408F-4F8E-859B-366659150CF4}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/src/tools/map_extractor/VC90_ad.vcproj b/src/tools/map_extractor/VC90_ad.vcproj
index 9a039a0fbb0..ab0a3568551 100644
--- a/src/tools/map_extractor/VC90_ad.vcproj
+++ b/src/tools/map_extractor/VC90_ad.vcproj
@@ -115,7 +115,7 @@
 		
 		
-			
-			
 			
 			
-			
-			
 			
@@ -247,6 +239,10 @@
 				RelativePath=".\libmpq\huffman.cpp"
 				>
 			
+			
+			
 			
@@ -287,6 +283,10 @@
 				RelativePath=".\libmpq\wave.cpp"
 				>
 			
+			
+			
 		
 		
Date: Fri, 11 Jun 2010 12:56:22 +0200
Subject: Fixed vmap extractor build on windows

--HG--
branch : trunk
---
 .../vmap3_extractor/VC90/vmap3_extractor.vcproj    | 263 +++++++++++++++++++++
 src/tools/vmap3_extractor/vmapexport.cpp           |   4 +-
 2 files changed, 265 insertions(+), 2 deletions(-)
 create mode 100644 src/tools/vmap3_extractor/VC90/vmap3_extractor.vcproj

(limited to 'src')

diff --git a/src/tools/vmap3_extractor/VC90/vmap3_extractor.vcproj b/src/tools/vmap3_extractor/VC90/vmap3_extractor.vcproj
new file mode 100644
index 00000000000..3e0000b6249
--- /dev/null
+++ b/src/tools/vmap3_extractor/VC90/vmap3_extractor.vcproj
@@ -0,0 +1,263 @@
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+				
+				
+			
+		
+	
+	
+	
+
diff --git a/src/tools/vmap3_extractor/vmapexport.cpp b/src/tools/vmap3_extractor/vmapexport.cpp
index 07d5d31d418..06f5282b19b 100644
--- a/src/tools/vmap3_extractor/vmapexport.cpp
+++ b/src/tools/vmap3_extractor/vmapexport.cpp
@@ -260,9 +260,9 @@ void getGamePath()
     LONG l;
     s = sizeof(input_path);
     memset(input_path,0,s);
-    l = RegOpenKeyEx(HKEY_LOCAL_MACHINE,"SOFTWARE\\Blizzard Entertainment\\World of Warcraft",0,KEY_QUERY_VALUE,&key);
+    l = RegOpenKeyExA(HKEY_LOCAL_MACHINE,"SOFTWARE\\Blizzard Entertainment\\World of Warcraft",0,KEY_QUERY_VALUE,&key);
     //l = RegOpenKeyEx(HKEY_LOCAL_MACHINE,"SOFTWARE\\Blizzard Entertainment\\Burning Crusade Closed Beta",0,KEY_QUERY_VALUE,&key);
-    l = RegQueryValueEx(key,"InstallPath",0,&t,(LPBYTE)input_path,&s);
+    l = RegQueryValueExA(key,"InstallPath",0,&t,(LPBYTE)input_path,&s);
     RegCloseKey(key);
     if (strlen(input_path) > 0)
     {
-- 
cgit v1.2.3


From 96ac28ebadd43095d343303a43a79370a16deca1 Mon Sep 17 00:00:00 2001
From: Shauren 
Date: Fri, 11 Jun 2010 13:57:10 +0200
Subject: Fixed vmap assembler build in release mode - windows

Working as of this commit: map extractor debug, vmap extractor both and vmap assembler release

--HG--
branch : trunk
---
 .../vmap3_assembler/VC90/vmap_assembler.vcproj     | 122 ++++++++++++---------
 1 file changed, 70 insertions(+), 52 deletions(-)

(limited to 'src')

diff --git a/src/tools/vmap3_assembler/VC90/vmap_assembler.vcproj b/src/tools/vmap3_assembler/VC90/vmap_assembler.vcproj
index aff990d01cc..e3b1b7766a5 100644
--- a/src/tools/vmap3_assembler/VC90/vmap_assembler.vcproj
+++ b/src/tools/vmap3_assembler/VC90/vmap_assembler.vcproj
@@ -1,7 +1,7 @@
 
 
 		
 			
 			
 		
 			
 			
 			
 			
 		
@@ -191,57 +197,69 @@
 			Name="vmaplib"
 			>
 			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
 			
 			
-			
-			
-			
-			
 			
 			
 			
-			
-			
-			
+				
+				
+				
+				
+				
+				
+				
+			
+			
-			
+				
+				
+				
+				
+				
+				
+				
+				
+			
+			
+				
+				
+				
+				
+			
 		
 	
 	
-- 
cgit v1.2.3


From 4261828d6301c4404a107351bba196a3cab033db Mon Sep 17 00:00:00 2001
From: Shauren 
Date: Fri, 11 Jun 2010 20:02:46 +0200
Subject: Added support for item set names in case where item does not exist in
 item_template (like gladiator gear)

--HG--
branch : trunk
---
 sql/base/world_database.sql                        |  56 +++++++++
 sql/updates/8586_world_command.sql                 |   4 +
 sql/updates/8586_world_item_set_names.sql          |  14 +++
 sql/updates/8586_world_locales_item_set_name.sql   |  20 ++++
 src/server/game/Chat/Chat.cpp                      |   2 +
 src/server/game/Chat/Chat.h                        |   2 +
 src/server/game/Chat/Commands/Level3.cpp           |  16 +++
 src/server/game/DataStores/DBCStructure.h          |   4 +-
 src/server/game/DataStores/DBCfmt.h                |   2 +-
 src/server/game/Entities/Item/ItemPrototype.h      |  11 ++
 src/server/game/Globals/ObjectMgr.cpp              | 127 ++++++++++++++++++++-
 src/server/game/Globals/ObjectMgr.h                |  21 ++++
 .../game/Server/Protocol/Handlers/ItemHandler.cpp  |  37 ++----
 src/server/game/World/World.cpp                    |  20 ++--
 14 files changed, 299 insertions(+), 37 deletions(-)
 create mode 100644 sql/updates/8586_world_command.sql
 create mode 100644 sql/updates/8586_world_item_set_names.sql
 create mode 100644 sql/updates/8586_world_locales_item_set_name.sql

(limited to 'src')

diff --git a/sql/base/world_database.sql b/sql/base/world_database.sql
index 8e047fc7a1c..9b577fd3179 100644
--- a/sql/base/world_database.sql
+++ b/sql/base/world_database.sql
@@ -585,9 +585,11 @@ INSERT INTO `command` VALUES
 ('reload gm_tickets',3,'Syntax: .reload gm_tickets\nReload gm_tickets table.'),
 ('reload item_enchantment_template',3,'Syntax: .reload item_enchantment_template\nReload item_enchantment_template table.'),
 ('reload item_loot_template',3,'Syntax: .reload item_loot_template\nReload item_loot_template table.'),
+('reload item_set_names',3,'Syntax: .reload item_set_names\nReload item_set_names table.'),
 ('reload locales_creature',3,'Syntax: .reload locales_creature\nReload locales_creature table.'),
 ('reload locales_gameobject',3,'Syntax: .reload locales_gameobject\nReload locales_gameobject table.'),
 ('reload locales_item',3,'Syntax: .reload locales_item\nReload locales_item table.'),
+('reload locales_item_set_name',3,'Syntax: .reload locales_item_set_name\nReload locales_item_set_name table.'),
 ('reload locales_npc_text',3,'Syntax: .reload locales_npc_text\nReload locales_npc_text table.'),
 ('reload locales_page_text',3,'Syntax: .reload locales_page_text\nReload locales_page_text table.'),
 ('reload locales_points_of_interest',3,'Syntax: .reload locales_points_of_interest\nReload locales_point_of_interest table.'),
@@ -2746,6 +2748,30 @@ LOCK TABLES `item_loot_template` WRITE;
 /*!40000 ALTER TABLE `item_loot_template` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `item_set_names`
+--
+
+DROP TABLE IF EXISTS `item_set_names`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `item_set_names` (
+  `entry` mediumint(8) unsigned NOT NULL,
+  `name` varchar(255) character set utf8 NOT NULL default '',
+  `InventoryType` tinyint(3) unsigned NOT NULL default '0',
+  PRIMARY KEY  (`entry`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `item_set_names`
+--
+
+LOCK TABLES `item_set_names` WRITE;
+/*!40000 ALTER TABLE `item_set_names` DISABLE KEYS */;
+/*!40000 ALTER TABLE `item_set_names` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `item_required_target`
 --
@@ -3083,6 +3109,36 @@ LOCK TABLES `locales_item` WRITE;
 /*!40000 ALTER TABLE `locales_item` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `locales_item_set_name`
+--
+
+DROP TABLE IF EXISTS `locales_item_set_name`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `locales_item_set_name` (
+  `entry` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `name_loc1` varchar(100) NOT NULL DEFAULT '',
+  `name_loc2` varchar(100) NOT NULL DEFAULT '',
+  `name_loc3` varchar(100) NOT NULL DEFAULT '',
+  `name_loc4` varchar(100) NOT NULL DEFAULT '',
+  `name_loc5` varchar(100) NOT NULL DEFAULT '',
+  `name_loc6` varchar(100) NOT NULL DEFAULT '',
+  `name_loc7` varchar(100) NOT NULL DEFAULT '',
+  `name_loc8` varchar(100) NOT NULL DEFAULT '',
+  PRIMARY KEY (`entry`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `locales_item_set_name`
+--
+
+LOCK TABLES `locales_item_set_name` WRITE;
+/*!40000 ALTER TABLE `locales_item_set_name` DISABLE KEYS */;
+/*!40000 ALTER TABLE `locales_item_set_name` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `locales_gossip_menu_option`
 --
diff --git a/sql/updates/8586_world_command.sql b/sql/updates/8586_world_command.sql
new file mode 100644
index 00000000000..b554755df08
--- /dev/null
+++ b/sql/updates/8586_world_command.sql
@@ -0,0 +1,4 @@
+DELETE FROM `command` WHERE `name` IN ('reload item_set_names','reload locales_item_set_name');
+INSERT INTO `command` VALUES 
+('reload item_set_names',3,'Syntax: .reload item_set_names\nReload item_set_names table.'),
+('reload locales_item_set_name',3,'Syntax: .reload locales_item_set_name\nReload locales_item_set_name table.');
diff --git a/sql/updates/8586_world_item_set_names.sql b/sql/updates/8586_world_item_set_names.sql
new file mode 100644
index 00000000000..f62df79678a
--- /dev/null
+++ b/sql/updates/8586_world_item_set_names.sql
@@ -0,0 +1,14 @@
+--
+-- Table structure for table `item_set_names`
+--
+
+DROP TABLE IF EXISTS `item_set_names`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `item_set_names` (
+  `entry` mediumint(8) unsigned NOT NULL,
+  `name` varchar(255) character set utf8 NOT NULL default '',
+  `InventoryType` tinyint(3) unsigned NOT NULL default '0',
+  PRIMARY KEY  (`entry`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
diff --git a/sql/updates/8586_world_locales_item_set_name.sql b/sql/updates/8586_world_locales_item_set_name.sql
new file mode 100644
index 00000000000..30d39f978a2
--- /dev/null
+++ b/sql/updates/8586_world_locales_item_set_name.sql
@@ -0,0 +1,20 @@
+--
+-- Table structure for table `locales_item_set_name`
+--
+
+DROP TABLE IF EXISTS `locales_item_set_name`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `locales_item_set_name` (
+  `entry` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `name_loc1` varchar(100) NOT NULL DEFAULT '',
+  `name_loc2` varchar(100) NOT NULL DEFAULT '',
+  `name_loc3` varchar(100) NOT NULL DEFAULT '',
+  `name_loc4` varchar(100) NOT NULL DEFAULT '',
+  `name_loc5` varchar(100) NOT NULL DEFAULT '',
+  `name_loc6` varchar(100) NOT NULL DEFAULT '',
+  `name_loc7` varchar(100) NOT NULL DEFAULT '',
+  `name_loc8` varchar(100) NOT NULL DEFAULT '',
+  PRIMARY KEY (`entry`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp
index a976a2fcafc..f62dee975da 100644
--- a/src/server/game/Chat/Chat.cpp
+++ b/src/server/game/Chat/Chat.cpp
@@ -479,10 +479,12 @@ ChatCommand * ChatHandler::getCommandTable()
         { "gossip_menu_option",          SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadGossipMenuOptionCommand,        "", NULL },
         { "item_enchantment_template",   SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadItemEnchantementsCommand,       "", NULL },
         { "item_loot_template",          SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadLootTemplatesItemCommand,       "", NULL },
+        { "item_set_names",              SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadItemSetNamesCommand,            "", NULL },
         { "locales_achievement_reward",  SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadLocalesAchievementRewardCommand,"", NULL },
         { "locales_creature",            SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadLocalesCreatureCommand,         "", NULL },
         { "locales_gameobject",          SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadLocalesGameobjectCommand,       "", NULL },
         { "locales_item",                SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadLocalesItemCommand,             "", NULL },
+        { "locales_item_set_name",       SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadLocalesItemSetNameCommand,      "", NULL },
         { "locales_npc_text",            SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadLocalesNpcTextCommand,          "", NULL },
         { "locales_page_text",           SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadLocalesPageTextCommand,         "", NULL },
         { "locales_points_of_interest",  SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadLocalesPointsOfInterestCommand, "", NULL },
diff --git a/src/server/game/Chat/Chat.h b/src/server/game/Chat/Chat.h
index a298ca03881..6b102129c8a 100644
--- a/src/server/game/Chat/Chat.h
+++ b/src/server/game/Chat/Chat.h
@@ -378,10 +378,12 @@ class ChatHandler
         bool HandleReloadGOQuestRelationsCommand(const char* args);
         bool HandleReloadGOQuestInvRelationsCommand(const char* args);
         bool HandleReloadItemEnchantementsCommand(const char* args);
+        bool HandleReloadItemSetNamesCommand(const char* args);
         bool HandleReloadLocalesAchievementRewardCommand(const char* args);
         bool HandleReloadLocalesCreatureCommand(const char* args);
         bool HandleReloadLocalesGameobjectCommand(const char* args);
         bool HandleReloadLocalesItemCommand(const char* args);
+        bool HandleReloadLocalesItemSetNameCommand(const char* args);
         bool HandleReloadLocalesNpcTextCommand(const char* args);
         bool HandleReloadLocalesPageTextCommand(const char* args);
         bool HandleReloadLocalesPointsOfInterestCommand(const char* args);
diff --git a/src/server/game/Chat/Commands/Level3.cpp b/src/server/game/Chat/Commands/Level3.cpp
index abdb99ee5e5..d7ebfbf912e 100644
--- a/src/server/game/Chat/Commands/Level3.cpp
+++ b/src/server/game/Chat/Commands/Level3.cpp
@@ -1284,6 +1284,14 @@ bool ChatHandler::HandleReloadItemEnchantementsCommand(const char*)
     return true;
 }
 
+bool ChatHandler::HandleReloadItemSetNamesCommand(const char*)
+{
+    sLog.outString("Re-Loading Item set names...");
+    LoadRandomEnchantmentsTable();
+    SendGlobalGMSysMessage("DB table `item_set_names` reloaded.");
+    return true;
+}
+
 bool ChatHandler::HandleReloadGameObjectScriptsCommand(const char* arg)
 {
     if (sWorld.IsScriptScheduled())
@@ -1502,6 +1510,14 @@ bool ChatHandler::HandleReloadLocalesItemCommand(const char* /*arg*/)
     return true;
 }
 
+bool ChatHandler::HandleReloadLocalesItemSetNameCommand(const char* /*arg*/)
+{
+    sLog.outString("Re-Loading Locales Item set name... ");
+    objmgr.LoadItemSetNameLocales();
+    SendGlobalGMSysMessage("DB table `locales_item_set_name` reloaded.");
+    return true;
+}
+
 bool ChatHandler::HandleReloadLocalesNpcTextCommand(const char* /*arg*/)
 {
     sLog.outString("Re-Loading Locales NPC Text ... ");
diff --git a/src/server/game/DataStores/DBCStructure.h b/src/server/game/DataStores/DBCStructure.h
index 112aef734e7..f3ed1e09b12 100644
--- a/src/server/game/DataStores/DBCStructure.h
+++ b/src/server/game/DataStores/DBCStructure.h
@@ -1080,12 +1080,14 @@ struct ItemRandomSuffixEntry
     uint32    prefix[5];                                    // 22-24    m_allocationPct
 };
 
+#define MAX_ITEM_SET_ITEMS 10
 struct ItemSetEntry
 {
     //uint32    id                                          // 0        m_ID
     char*     name[16];                                     // 1-16     m_name_lang
                                                             // 17 string flags, unused
-    //uint32    itemId[17];                                 // 18-34    m_itemID
+    uint32    itemId[MAX_ITEM_SET_ITEMS];                   // 18-27    m_itemID
+    //uint32    unknown[7];                                 // 28-34    unk, all 0
     uint32    spells[8];                                    // 35-42    m_setSpellID
     uint32    items_to_triggerspell[8];                     // 43-50    m_setThreshold
     uint32    required_skill_id;                            // 51       m_requiredSkill
diff --git a/src/server/game/DataStores/DBCfmt.h b/src/server/game/DataStores/DBCfmt.h
index 1f1b010a6fd..e791e304d8c 100644
--- a/src/server/game/DataStores/DBCfmt.h
+++ b/src/server/game/DataStores/DBCfmt.h
@@ -72,7 +72,7 @@ const char ItemExtendedCostEntryfmt[]="niiiiiiiiiiiiiix";
 const char ItemLimitCategoryEntryfmt[]="nxxxxxxxxxxxxxxxxxix";
 const char ItemRandomPropertiesfmt[]="nxiiiiissssssssssssssssx";
 const char ItemRandomSuffixfmt[]="nssssssssssssssssxxiiiiiiiiii";
-const char ItemSetEntryfmt[]="dssssssssssssssssxxxxxxxxxxxxxxxxxxiiiiiiiiiiiiiiiiii";
+const char ItemSetEntryfmt[]="dssssssssssssssssxiiiiiiiiiixxxxxxxiiiiiiiiiiiiiiiiii";
 const char LFGDungeonEntryfmt[]="nxxxxxxxxxxxxxxxxxiiiiiiixixxixixxxxxxxxxxxxxxxxx";
 const char LockEntryfmt[]="niiiiiiiiiiiiiiiiiiiiiiiixxxxxxxx";
 const char MailTemplateEntryfmt[]="nxxxxxxxxxxxxxxxxxssssssssssssssssx";
diff --git a/src/server/game/Entities/Item/ItemPrototype.h b/src/server/game/Entities/Item/ItemPrototype.h
index 31025005a15..797ccd6faaf 100644
--- a/src/server/game/Entities/Item/ItemPrototype.h
+++ b/src/server/game/Entities/Item/ItemPrototype.h
@@ -661,6 +661,17 @@ struct ItemLocale
     std::vector Description;
 };
 
+struct ItemSetNameEntry
+{
+    std::string name;
+    uint32 InventoryType;
+};
+
+struct ItemSetNameLocale
+{
+    std::vector Name;
+};
+
 // GCC have alternative #pragma pack() syntax and old gcc version not support pack(pop), also any gcc version not support it at some platform
 #if defined(__GNUC__)
 #pragma pack()
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index 8b3cf97a3fe..89ce93b5d80 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -2368,7 +2368,132 @@ void ObjectMgr::LoadItemPrototypes()
     }
 
     for (std::set::const_iterator itr = notFoundOutfit.begin(); itr != notFoundOutfit.end(); ++itr)
-        sLog.outErrorDb("Item (Entry: %u) not exist in `item_template` but referenced in `CharStartOutfit.dnc`", *itr);
+        sLog.outErrorDb("Item (Entry: %u) not exist in `item_template` but referenced in `CharStartOutfit.dbc`", *itr);
+}
+
+void ObjectMgr::LoadItemSetNameLocales()
+{
+    mItemSetNameLocaleMap.clear();                                 // need for reload case
+
+    QueryResult_AutoPtr result = WorldDatabase.Query("SELECT `entry`,`name_loc1`,`name_loc2`,`name_loc3`,`name_loc4`,`name_loc5`,`name_loc6`,`name_loc7`,`name_loc8` FROM `locales_item_set_name`");
+
+    if (!result)
+        return;
+
+    barGoLink bar(result->GetRowCount());
+
+    do
+    {
+        Field *fields = result->Fetch();
+        bar.step();
+
+        uint32 entry = fields[0].GetUInt32();
+
+        ItemSetNameLocale& data = mItemSetNameLocaleMap[entry];
+
+        for (uint8 i = 1; i < MAX_LOCALE; ++i)
+        {
+            std::string str = fields[i].GetCppString();
+            if (!str.empty())
+            {
+                int idx = GetOrNewIndexForLocale(LocaleConstant(i));
+                if (idx >= 0)
+                {
+                    if (data.Name.size() <= idx)
+                        data.Name.resize(idx+1);
+
+                    data.Name[idx] = str;
+                }
+            }
+        }
+    } while (result->NextRow());
+
+    sLog.outString();
+    sLog.outString(">> Loaded %lu Item set name locale strings", (uint32)mItemSetNameLocaleMap.size());
+}
+
+void ObjectMgr::LoadItemSetNames()
+{
+    mItemSetNameMap.clear();                               // needed for reload case
+
+    QueryResult_AutoPtr result = WorldDatabase.Query("SELECT `entry`,`name`,`InventoryType` FROM `item_set_names`");
+
+    uint32 count = 0;
+    std::set itemSetItems;
+
+    // fill item set member ids
+    for (uint32 entryId = 0; entryId < sItemSetStore.GetNumRows(); ++entryId)
+    {
+        ItemSetEntry const* setEntry = sItemSetStore.LookupEntry(entryId);
+        if (!setEntry)
+            continue;
+
+        for (uint32 i = 0; i < MAX_ITEM_SET_ITEMS; ++i)
+            if (setEntry->itemId[i])
+                itemSetItems.insert(setEntry->itemId[i]);
+    }
+
+    if (result)
+    {
+        barGoLink bar(result->GetRowCount());
+        do
+        {
+            Field *fields = result->Fetch();
+            bar.step();
+
+            uint32 entry = fields[0].GetUInt32();
+            if (itemSetItems.find(entry) == itemSetItems.end())
+            {
+                sLog.outErrorDb("Item set name (Entry: %u) not found in ItemSet.dbc, data useless.", entry);
+                continue;
+            }
+
+            ItemSetNameEntry &data = mItemSetNameMap[entry];
+            data.name = fields[1].GetCppString();
+
+            uint32 invType = fields[2].GetUInt32();
+            if (invType >= MAX_INVTYPE)
+            {
+                sLog.outErrorDb("Item set name (Entry: %u) has wrong InventoryType value (%u)", entry, invType);
+                invType = INVTYPE_NON_EQUIP;
+            }
+
+            data.InventoryType = invType;
+            itemSetItems.erase(entry);
+            ++count;
+        } while (result->NextRow());
+    }
+    else
+    {
+        barGoLink bar(1);
+        bar.step();
+
+        sLog.outString();
+        sLog.outErrorDb(">> Loaded 0 item set names. DB table `item_set_names` is empty.");
+    }
+
+    if (!itemSetItems.empty())
+    {
+        ItemPrototype const* pProto;
+        for (std::set::iterator itr = itemSetItems.begin(); itr != itemSetItems.end(); ++itr)
+        {
+            uint32 entry = *itr;
+            // add data from item_template if available
+            if (pProto = GetItemPrototype(entry))
+            {
+                sLog.outErrorDb("Item set part (Entry: %u) does not have entry in `item_set_names`, adding data from `item_template`.", entry);
+                ItemSetNameEntry &data = mItemSetNameMap[entry];
+                data.name = pProto->Name1;
+                data.InventoryType = pProto->InventoryType;
+                ++count;
+            }
+            else
+                sLog.outErrorDb("Item set part (Entry: %u) does not have entry in `item_set_names`, set will not display properly.", entry);
+        }
+    }
+
+    sLog.outString();
+    sLog.outString(">> Loaded %u item set names", count);
 }
 
 void ObjectMgr::LoadVehicleAccessories()
diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h
index eeeb871c98e..a5e3989d452 100644
--- a/src/server/game/Globals/ObjectMgr.h
+++ b/src/server/game/Globals/ObjectMgr.h
@@ -164,6 +164,7 @@ typedef UNORDERED_MAP GameObjectDataMap;
 typedef UNORDERED_MAP CreatureLocaleMap;
 typedef UNORDERED_MAP GameObjectLocaleMap;
 typedef UNORDERED_MAP ItemLocaleMap;
+typedef UNORDERED_MAP ItemSetNameLocaleMap;
 typedef UNORDERED_MAP QuestLocaleMap;
 typedef UNORDERED_MAP NpcTextLocaleMap;
 typedef UNORDERED_MAP PageTextLocaleMap;
@@ -431,6 +432,14 @@ class ObjectMgr
 
         static ItemPrototype const* GetItemPrototype(uint32 id) { return sItemStorage.LookupEntry(id); }
 
+        ItemSetNameEntry const* GetItemSetNameEntry(uint32 itemId)
+        {
+            ItemSetNameMap::iterator itr = mItemSetNameMap.find(itemId);
+            if(itr != mItemSetNameMap.end())
+                return &itr->second;
+            return NULL;
+        }
+
         static InstanceTemplate const* GetInstanceTemplate(uint32 map)
         {
             return sInstanceTemplate.LookupEntry(map);
@@ -607,6 +616,8 @@ class ObjectMgr
         void LoadGameobjectRespawnTimes();
         void LoadItemPrototypes();
         void LoadItemLocales();
+        void LoadItemSetNames();
+        void LoadItemSetNameLocales();
         void LoadQuestLocales();
         void LoadNpcTextLocales();
         void LoadPageTextLocales();
@@ -740,6 +751,12 @@ class ObjectMgr
             if (itr == mItemLocaleMap.end()) return NULL;
             return &itr->second;
         }
+        ItemSetNameLocale const* GetItemSetNameLocale(uint32 entry) const
+        {
+            ItemSetNameLocaleMap::const_iterator itr = mItemSetNameLocaleMap.find(entry);
+            if (itr == mItemSetNameLocaleMap.end())return NULL;
+            return &itr->second;
+        }
         QuestLocale const* GetQuestLocale(uint32 entry) const
         {
             QuestLocaleMap::const_iterator itr = mQuestLocaleMap.find(entry);
@@ -1045,6 +1062,9 @@ class ObjectMgr
         HalfNameMap PetHalfName0;
         HalfNameMap PetHalfName1;
 
+        typedef UNORDERED_MAP ItemSetNameMap;
+        ItemSetNameMap mItemSetNameMap;
+
         MapObjectGuids mMapObjectGuids;
         CreatureDataMap mCreatureDataMap;
         CreatureLinkedRespawnMap mCreatureLinkedRespawnMap;
@@ -1052,6 +1072,7 @@ class ObjectMgr
         GameObjectDataMap mGameObjectDataMap;
         GameObjectLocaleMap mGameObjectLocaleMap;
         ItemLocaleMap mItemLocaleMap;
+        ItemSetNameLocaleMap mItemSetNameLocaleMap;
         QuestLocaleMap mQuestLocaleMap;
         NpcTextLocaleMap mNpcTextLocaleMap;
         PageTextLocaleMap mPageTextLocaleMap;
diff --git a/src/server/game/Server/Protocol/Handlers/ItemHandler.cpp b/src/server/game/Server/Protocol/Handlers/ItemHandler.cpp
index 897ee7dcfd3..e9b9004804a 100644
--- a/src/server/game/Server/Protocol/Handlers/ItemHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/ItemHandler.cpp
@@ -1003,40 +1003,25 @@ void WorldSession::HandleItemNameQueryOpcode(WorldPacket & recv_data)
     recv_data.read_skip();                          // guid
 
     sLog.outDebug("WORLD: CMSG_ITEM_NAME_QUERY %u", itemid);
-    ItemPrototype const *pProto = objmgr.GetItemPrototype(itemid);
-    if (pProto)
+    ItemSetNameEntry const *pName = objmgr.GetItemSetNameEntry(itemid);
+    if (pName)
     {
-        std::string Name;
-        Name = pProto->Name1;
-
+        std::string Name = pName->name;
         int loc_idx = GetSessionDbLocaleIndex();
         if (loc_idx >= 0)
         {
-            ItemLocale const *il = objmgr.GetItemLocale(pProto->ItemId);
-            if (il)
-            {
-                if (il->Name.size() > size_t(loc_idx) && !il->Name[loc_idx].empty())
-                    Name = il->Name[loc_idx];
-            }
+            ItemSetNameLocale const *isnl = objmgr.GetItemSetNameLocale(itemid);
+            if (isnl)
+                if (isnl->Name.size() > size_t(loc_idx) && !isnl->Name[loc_idx].empty())
+                    Name = isnl->Name[loc_idx];
         }
-                                                            // guess size
-        WorldPacket data(SMSG_ITEM_NAME_QUERY_RESPONSE, (4+10));
-        data << uint32(pProto->ItemId);
+
+        WorldPacket data(SMSG_ITEM_NAME_QUERY_RESPONSE, (4+Name.size()+1+4));
+        data << uint32(itemid);
         data << Name;
-        data << uint32(pProto->InventoryType);
+        data << uint32(pName->InventoryType);
         SendPacket(&data);
-        return;
     }
-// This is a BS check, there are lots of items listed in Item.dbc that do not even exist on official -- so we can NEVER get the data for them.
-// If you *really* want to spam your error log -- uncomment this.
-/*    else
-    {
-        // listed in dbc or not expected to exist unknown item
-        if (sItemStore.LookupEntry(itemid))
-            sLog.outErrorDb("WORLD: CMSG_ITEM_NAME_QUERY for item %u failed (item listed in Item.dbc but not exist in DB)", itemid);
-        else
-            sLog.outError("WORLD: CMSG_ITEM_NAME_QUERY for item %u failed (unknown item, not listed in Item.dbc)", itemid);
-    } */
 }
 
 void WorldSession::HandleWrapItemOpcode(WorldPacket& recv_data)
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
index 0f34fc83ffb..0041bbaecc8 100644
--- a/src/server/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
@@ -1320,6 +1320,7 @@ void World::SetInitialWorldSettings()
     objmgr.LoadCreatureLocales();
     objmgr.LoadGameObjectLocales();
     objmgr.LoadItemLocales();
+    objmgr.LoadItemSetNameLocales();
     objmgr.LoadQuestLocales();
     objmgr.LoadNpcTextLocales();
     objmgr.LoadPageTextLocales();
@@ -1332,7 +1333,7 @@ void World::SetInitialWorldSettings()
     sLog.outString("Loading Page Texts...");
     objmgr.LoadPageTexts();
 
-    sLog.outString("Loading Game Object Templates...");   // must be after LoadPageTexts
+    sLog.outString("Loading Game Object Templates...");     // must be after LoadPageTexts
     objmgr.LoadGameobjectInfo();
 
     sLog.outString("Loading Spell Rank Data...");
@@ -1371,9 +1372,12 @@ void World::SetInitialWorldSettings()
     sLog.outString("Loading Item Random Enchantments Table...");
     LoadRandomEnchantmentsTable();
 
-    sLog.outString("Loading Items...");                   // must be after LoadRandomEnchantmentsTable and LoadPageTexts
+    sLog.outString("Loading Items...");                     // must be after LoadRandomEnchantmentsTable and LoadPageTexts
     objmgr.LoadItemPrototypes();
 
+    sLog.outString("Loading Item set names...");            // must be after LoadItemPrototypes
+    objmgr.LoadItemSetNames();
+
     sLog.outString("Loading Creature Model Based Info Data...");
     objmgr.LoadCreatureModelInfo();
 
@@ -1408,15 +1412,15 @@ void World::SetInitialWorldSettings()
     objmgr.LoadCreatureAddons();                            // must be after LoadCreatureTemplates() and LoadCreatures()
 
     sLog.outString("Loading Vehicle Accessories...");
-    objmgr.LoadVehicleAccessories();                          // must be after LoadCreatureTemplates()
+    objmgr.LoadVehicleAccessories();                        // must be after LoadCreatureTemplates()
 
-    sLog.outString("Loading Creature Respawn Data...");   // must be after PackInstances()
+    sLog.outString("Loading Creature Respawn Data...");     // must be after PackInstances()
     objmgr.LoadCreatureRespawnTimes();
 
     sLog.outString("Loading Gameobject Data...");
     objmgr.LoadGameobjects();
 
-    sLog.outString("Loading Gameobject Respawn Data..."); // must be after PackInstances()
+    sLog.outString("Loading Gameobject Respawn Data...");   // must be after PackInstances()
     objmgr.LoadGameobjectRespawnTimes();
 
     sLog.outString("Loading Objects Pooling Data...");
@@ -1440,7 +1444,7 @@ void World::SetInitialWorldSettings()
     sLog.outString("Loading UNIT_NPC_FLAG_SPELLCLICK Data...");
     objmgr.LoadNPCSpellClickSpells();
 
-    sLog.outString("Loading SpellArea Data...");          // must be after quest load
+    sLog.outString("Loading SpellArea Data...");            // must be after quest load
     spellmgr.LoadSpellAreas();
 
     sLog.outString("Loading AreaTrigger definitions...");
@@ -1603,7 +1607,7 @@ void World::SetInitialWorldSettings()
     sLog.outString(">>> Scripts loaded");
     sLog.outString();
 
-    sLog.outString("Loading Scripts text locales...");    // must be after Load*Scripts calls
+    sLog.outString("Loading Scripts text locales...");      // must be after Load*Scripts calls
     objmgr.LoadDbScriptStrings();
 
     sLog.outString("Loading CreatureEventAI Texts...");
@@ -1671,7 +1675,7 @@ void World::SetInitialWorldSettings()
     sLog.outString("Starting Arena Season...");
     gameeventmgr.StartArenaSeason();
 
-    sLog.outString("Loading World States..."); // must be loaded before battleground and outdoor PvP
+    sLog.outString("Loading World States...");              // must be loaded before battleground and outdoor PvP
     LoadWorldStates();
 
     ///- Initialize Looking For Group
-- 
cgit v1.2.3


From ccbff7a194235d0d376ea57ce3a822b7d8b02e0b Mon Sep 17 00:00:00 2001
From: click 
Date: Fri, 11 Jun 2010 23:14:14 +0200
Subject: Remove README for the mapextractor, it's not used!

--HG--
branch : trunk
---
 src/tools/map_extractor/README.linux | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 src/tools/map_extractor/README.linux

(limited to 'src')

diff --git a/src/tools/map_extractor/README.linux b/src/tools/map_extractor/README.linux
deleted file mode 100644
index 1986831e751..00000000000
--- a/src/tools/map_extractor/README.linux
+++ /dev/null
@@ -1,7 +0,0 @@
-Linux instructions
-------------------
-
-1. install cmake
-2. cmake -i
-3. make
-4. ./ad
-- 
cgit v1.2.3


From 057ea32adf16064a787e36fe63c1fc0634072153 Mon Sep 17 00:00:00 2001
From: click 
Date: Sat, 12 Jun 2010 00:45:24 +0200
Subject: Fix issues with missing the printf()-function on newer distributions
 (thanks to svannon and brian for helping)

--HG--
branch : trunk
---
 src/tools/map_extractor/loadlib/loadlib.cpp |  1 +
 src/tools/vmap3_extractor/loadlib/loadlib.h | 26 ++++++++++++--------------
 src/tools/vmap3_extractor/mpq_libmpq.cpp    |  2 +-
 src/tools/vmap3_extractor/mpq_libmpq04.h    |  2 +-
 4 files changed, 15 insertions(+), 16 deletions(-)

(limited to 'src')

diff --git a/src/tools/map_extractor/loadlib/loadlib.cpp b/src/tools/map_extractor/loadlib/loadlib.cpp
index e2dd2d79d85..465eb04083f 100644
--- a/src/tools/map_extractor/loadlib/loadlib.cpp
+++ b/src/tools/map_extractor/loadlib/loadlib.cpp
@@ -2,6 +2,7 @@
 
 #include "loadlib.h"
 #include "mpq_libmpq04.h"
+#include 
 
 class MPQFile;
 
diff --git a/src/tools/vmap3_extractor/loadlib/loadlib.h b/src/tools/vmap3_extractor/loadlib/loadlib.h
index 53731753425..6acfd107ec7 100644
--- a/src/tools/vmap3_extractor/loadlib/loadlib.h
+++ b/src/tools/vmap3_extractor/loadlib/loadlib.h
@@ -3,28 +3,26 @@
 
 #ifdef WIN32
 typedef __int64            int64;
-typedef __int32            int32;
-typedef __int16            int16;
-typedef __int8             int8;
+typedef long               int32;
+typedef short              int16;
+typedef char               int8;
 typedef unsigned __int64   uint64;
-typedef unsigned __int32   uint32;
-typedef unsigned __int16   uint16;
-typedef unsigned __int8    uint8;
+typedef unsigned long      uint32;
+typedef unsigned short     uint16;
+typedef unsigned char      uint8;
 #else
 #include 
 #ifndef uint64_t 
-#ifdef __linux__
 #include  
 #endif
-#endif
 typedef int64_t            int64;
-typedef int32_t            int32;
-typedef int16_t            int16;
-typedef int8_t             int8;
+typedef long               int32;
+typedef short              int16;
+typedef char               int8;
 typedef uint64_t           uint64;
-typedef uint32_t           uint32;
-typedef uint16_t           uint16;
-typedef uint8_t            uint8;
+typedef unsigned long      uint32;
+typedef unsigned short     uint16;
+typedef unsigned char      uint8;
 #endif
 
 #define FILE_FORMAT_VERSION    18
diff --git a/src/tools/vmap3_extractor/mpq_libmpq.cpp b/src/tools/vmap3_extractor/mpq_libmpq.cpp
index 4aa59417f81..72a9de460eb 100644
--- a/src/tools/vmap3_extractor/mpq_libmpq.cpp
+++ b/src/tools/vmap3_extractor/mpq_libmpq.cpp
@@ -50,7 +50,7 @@ MPQFile::MPQFile(const char* filename):
     {
         mpq_archive *mpq_a = (*i)->mpq_a;
 
-        uint32 filenum;
+        uint32_t filenum;
         if(libmpq__file_number(mpq_a, filename, &filenum)) continue;
         libmpq__off_t transferred;
         libmpq__file_unpacked_size(mpq_a, filenum, &size);
diff --git a/src/tools/vmap3_extractor/mpq_libmpq04.h b/src/tools/vmap3_extractor/mpq_libmpq04.h
index ccbfe37cba7..26008f5fba1 100644
--- a/src/tools/vmap3_extractor/mpq_libmpq04.h
+++ b/src/tools/vmap3_extractor/mpq_libmpq04.h
@@ -24,7 +24,7 @@ public:
     void close();
 
     void GetFileListTo(vector& filelist) {
-    	uint32 filenum;
+    	uint32_t filenum;
     	if(libmpq__file_number(mpq_a, "(listfile)", &filenum)) return;
     	libmpq__off_t size, transferred;
 		libmpq__file_unpacked_size(mpq_a, filenum, &size);
-- 
cgit v1.2.3


From 6520261ea652b3ec3fea45cee901d7b5f9238d14 Mon Sep 17 00:00:00 2001
From: Shauren 
Date: Sun, 13 Jun 2010 13:05:25 +0200
Subject: Added _CRT_SECURE_NO_WARNINGS preprocessor definition to windows
 project files to reduce warning spam Removed duplicate project file for map
 extractor

--HG--
branch : trunk
---
 src/tools/map_extractor/VC90_ad.vcproj | 327 ---------------------------------
 win/VC90/TrinityCore.vcproj            |  12 +-
 win/VC90/TrinityRealm.vcproj           |   8 +-
 win/VC90/game.vcproj                   |   8 +-
 4 files changed, 12 insertions(+), 343 deletions(-)
 delete mode 100644 src/tools/map_extractor/VC90_ad.vcproj

(limited to 'src')

diff --git a/src/tools/map_extractor/VC90_ad.vcproj b/src/tools/map_extractor/VC90_ad.vcproj
deleted file mode 100644
index ab0a3568551..00000000000
--- a/src/tools/map_extractor/VC90_ad.vcproj
+++ /dev/null
@@ -1,327 +0,0 @@
-
-
-	
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-				
-					
-				
-				
-					
-				
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-
diff --git a/win/VC90/TrinityCore.vcproj b/win/VC90/TrinityCore.vcproj
index 692bbf7fbc0..264e36fd790 100644
--- a/win/VC90/TrinityCore.vcproj
+++ b/win/VC90/TrinityCore.vcproj
@@ -49,7 +49,7 @@
 				AdditionalOptions="/MP"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\..\externals;..\..\externals\mersennetwister;..\..\externals\sockets\include;..\..\src\server\game\Accounts;..\..\src\server\game\Achievements;..\..\src\server\game\Addons;..\..\src\server\game\BattleGrounds;..\..\src\server\game\Chat;..\..\src\server\game\Combat;..\..\src\server\game\Conditions;..\..\src\server\game\DataStores;..\..\src\server\game\DungeonFinding;..\..\src\server\game\Entities\Corpse;..\..\src\server\game\Entities\Creature;..\..\src\server\game\Entities\DynamicObject;..\..\src\server\game\Entities\GameObject;..\..\src\server\game\Entities\Item;..\..\src\server\game\Entities\Item\Container;..\..\src\server\game\Entities\Object;..\..\src\server\game\Entities\Object\Updates;..\..\src\server\game\Entities\Pet;..\..\src\server\game\Entities\Player;..\..\src\server\game\Entities\Unit;..\..\src\server\game\Entities\Vehicle;..\..\src\server\game\Globals;..\..\src\server\game\Grids;..\..\src\server\game\Grids\Cells;..\..\src\server\game\Groups;..\..\src\server\game\Loot;..\..\src\server\game\Mails;..\..\src\server\game\Maps;..\..\src\server\game\Miscellaneous;..\..\src\server\game\Movement;..\..\src\server\game\Movement\Waypoints;..\..\src\server\game\Quests;..\..\src\server\game\Reputation;..\..\src\server\game\Server;..\..\src\server\game\Server\Protocol;..\..\src\server\game\Server\Protocol\Handlers;..\..\src\server\game\Spells\Auras;..\..\src\server\game\World;..\..\src\server\shared;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Cryptography\Authentication;..\..\src\server\shared\Database;..\..\src\server\shared\DataStores;..\..\src\server\shared\Dynamic;..\..\src\server\shared\Dynamic\LinkedReference;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\worldserver;..\..\src\server\worldserver\CommandLine;..\..\src\server\worldserver\RemoteAccess;..\..\src\server\worldserver\WorldThread"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;ENABLE_CLI;_SECURE_SCL=0"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;ENABLE_CLI;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -149,7 +149,7 @@
 				AdditionalOptions="/MP"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\externals;..\..\externals\mersennetwister;..\..\externals\sockets\include;..\..\src\server\game\Accounts;..\..\src\server\game\Achievements;..\..\src\server\game\Addons;..\..\src\server\game\BattleGrounds;..\..\src\server\game\Chat;..\..\src\server\game\Combat;..\..\src\server\game\Conditions;..\..\src\server\game\DataStores;..\..\src\server\game\DungeonFinding;..\..\src\server\game\Entities\Corpse;..\..\src\server\game\Entities\Creature;..\..\src\server\game\Entities\DynamicObject;..\..\src\server\game\Entities\GameObject;..\..\src\server\game\Entities\Item;..\..\src\server\game\Entities\Item\Container;..\..\src\server\game\Entities\Object;..\..\src\server\game\Entities\Object\Updates;..\..\src\server\game\Entities\Pet;..\..\src\server\game\Entities\Player;..\..\src\server\game\Entities\Unit;..\..\src\server\game\Entities\Vehicle;..\..\src\server\game\Globals;..\..\src\server\game\Grids;..\..\src\server\game\Grids\Cells;..\..\src\server\game\Groups;..\..\src\server\game\Loot;..\..\src\server\game\Mails;..\..\src\server\game\Maps;..\..\src\server\game\Miscellaneous;..\..\src\server\game\Movement;..\..\src\server\game\Movement\Waypoints;..\..\src\server\game\Quests;..\..\src\server\game\Reputation;..\..\src\server\game\Server;..\..\src\server\game\Server\Protocol;..\..\src\server\game\Server\Protocol\Handlers;..\..\src\server\game\Spells\Auras;..\..\src\server\game\World;..\..\src\server\shared;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Cryptography\Authentication;..\..\src\server\shared\Database;..\..\src\server\shared\DataStores;..\..\src\server\shared\Dynamic;..\..\src\server\shared\Dynamic\LinkedReference;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\worldserver;..\..\src\server\worldserver\CommandLine;..\..\src\server\worldserver\RemoteAccess;..\..\src\server\worldserver\WorldThread"
-				PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_CONSOLE;ENABLE_CLI"
+				PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_CONSOLE;ENABLE_CLI;_CRT_SECURE_NO_WARNINGS"
 				IgnoreStandardIncludePath="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -251,7 +251,7 @@
 				AdditionalOptions="/MP"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\..\externals;..\..\externals\mersennetwister;..\..\externals\sockets\include;..\..\src\server\game\Accounts;..\..\src\server\game\Achievements;..\..\src\server\game\Addons;..\..\src\server\game\BattleGrounds;..\..\src\server\game\Chat;..\..\src\server\game\Combat;..\..\src\server\game\Conditions;..\..\src\server\game\DataStores;..\..\src\server\game\DungeonFinding;..\..\src\server\game\Entities\Corpse;..\..\src\server\game\Entities\Creature;..\..\src\server\game\Entities\DynamicObject;..\..\src\server\game\Entities\GameObject;..\..\src\server\game\Entities\Item;..\..\src\server\game\Entities\Item\Container;..\..\src\server\game\Entities\Object;..\..\src\server\game\Entities\Object\Updates;..\..\src\server\game\Entities\Pet;..\..\src\server\game\Entities\Player;..\..\src\server\game\Entities\Unit;..\..\src\server\game\Entities\Vehicle;..\..\src\server\game\Globals;..\..\src\server\game\Grids;..\..\src\server\game\Grids\Cells;..\..\src\server\game\Groups;..\..\src\server\game\Loot;..\..\src\server\game\Mails;..\..\src\server\game\Maps;..\..\src\server\game\Miscellaneous;..\..\src\server\game\Movement;..\..\src\server\game\Movement\Waypoints;..\..\src\server\game\Quests;..\..\src\server\game\Reputation;..\..\src\server\game\Server;..\..\src\server\game\Server\Protocol;..\..\src\server\game\Server\Protocol\Handlers;..\..\src\server\game\Spells\Auras;..\..\src\server\game\World;..\..\src\server\shared;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Cryptography\Authentication;..\..\src\server\shared\Database;..\..\src\server\shared\DataStores;..\..\src\server\shared\Dynamic;..\..\src\server\shared\Dynamic\LinkedReference;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\worldserver;..\..\src\server\worldserver\CommandLine;..\..\src\server\worldserver\RemoteAccess;..\..\src\server\worldserver\WorldThread"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;ENABLE_CLI;_SECURE_SCL=0"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;ENABLE_CLI;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -351,7 +351,7 @@
 				AdditionalOptions="/MP"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\externals;..\..\externals\mersennetwister;..\..\externals\sockets\include;..\..\src\server\game\Accounts;..\..\src\server\game\Achievements;..\..\src\server\game\Addons;..\..\src\server\game\BattleGrounds;..\..\src\server\game\Chat;..\..\src\server\game\Combat;..\..\src\server\game\Conditions;..\..\src\server\game\DataStores;..\..\src\server\game\DungeonFinding;..\..\src\server\game\Entities\Corpse;..\..\src\server\game\Entities\Creature;..\..\src\server\game\Entities\DynamicObject;..\..\src\server\game\Entities\GameObject;..\..\src\server\game\Entities\Item;..\..\src\server\game\Entities\Item\Container;..\..\src\server\game\Entities\Object;..\..\src\server\game\Entities\Object\Updates;..\..\src\server\game\Entities\Pet;..\..\src\server\game\Entities\Player;..\..\src\server\game\Entities\Unit;..\..\src\server\game\Entities\Vehicle;..\..\src\server\game\Globals;..\..\src\server\game\Grids;..\..\src\server\game\Grids\Cells;..\..\src\server\game\Groups;..\..\src\server\game\Loot;..\..\src\server\game\Mails;..\..\src\server\game\Maps;..\..\src\server\game\Miscellaneous;..\..\src\server\game\Movement;..\..\src\server\game\Movement\Waypoints;..\..\src\server\game\Quests;..\..\src\server\game\Reputation;..\..\src\server\game\Server;..\..\src\server\game\Server\Protocol;..\..\src\server\game\Server\Protocol\Handlers;..\..\src\server\game\Spells\Auras;..\..\src\server\game\World;..\..\src\server\shared;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Cryptography\Authentication;..\..\src\server\shared\Database;..\..\src\server\shared\DataStores;..\..\src\server\shared\Dynamic;..\..\src\server\shared\Dynamic\LinkedReference;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\worldserver;..\..\src\server\worldserver\CommandLine;..\..\src\server\worldserver\RemoteAccess;..\..\src\server\worldserver\WorldThread"
-				PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_CONSOLE;ENABLE_CLI"
+				PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_CONSOLE;ENABLE_CLI;_CRT_SECURE_NO_WARNINGS"
 				IgnoreStandardIncludePath="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -432,10 +432,6 @@
 				RelativePath="..\..\COPYING"
 				>
 			
-			
-			
 			
diff --git a/win/VC90/TrinityRealm.vcproj b/win/VC90/TrinityRealm.vcproj
index 1b8b18aabbe..e8b8d9f5183 100644
--- a/win/VC90/TrinityRealm.vcproj
+++ b/win/VC90/TrinityRealm.vcproj
@@ -49,7 +49,7 @@
 				AdditionalOptions="/MP"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\..\externals;..\..\src\server\shared;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Database;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\authserver;..\..\src\server\authserver\Authentication;..\..\src\server\authserver\Realms;..\..\src\server\authserver\Server"
-				PreprocessorDefinitions="VERSION="0.12.0-SVN",WIN32,NDEBUG,_CONSOLE;_SECURE_SCL=0"
+				PreprocessorDefinitions="VERSION="0.12.0-SVN",WIN32,NDEBUG,_CONSOLE;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -147,7 +147,7 @@
 				AdditionalOptions="/MP"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\externals;..\..\src\server\shared;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Database;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\authserver;..\..\src\server\authserver\Authentication;..\..\src\server\authserver\Realms;..\..\src\server\authserver\Server"
-				PreprocessorDefinitions="VERSION="0.12.0-SVN";WIN32;_DEBUG;TRINITY_DEBUG;_CONSOLE"
+				PreprocessorDefinitions="VERSION="0.12.0-SVN";WIN32;_DEBUG;TRINITY_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
 				IgnoreStandardIncludePath="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -247,7 +247,7 @@
 				AdditionalOptions="/MP"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\..\externals;..\..\src\server\shared;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Database;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\authserver;..\..\src\server\authserver\Authentication;..\..\src\server\authserver\Realms;..\..\src\server\authserver\Server"
-				PreprocessorDefinitions="VERSION="0.12.0-SVN",WIN32,NDEBUG,_CONSOLE;_SECURE_SCL=0"
+				PreprocessorDefinitions="VERSION="0.12.0-SVN",WIN32,NDEBUG,_CONSOLE;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -345,7 +345,7 @@
 				AdditionalOptions="/MP"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\externals;..\..\src\server\shared;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Database;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\authserver;..\..\src\server\authserver\Authentication;..\..\src\server\authserver\Realms;..\..\src\server\authserver\Server"
-				PreprocessorDefinitions="VERSION="0.12.0-SVN";WIN32;_DEBUG;TRINITY_DEBUG;_CONSOLE"
+				PreprocessorDefinitions="VERSION="0.12.0-SVN";WIN32;_DEBUG;TRINITY_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
 				IgnoreStandardIncludePath="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
diff --git a/win/VC90/game.vcproj b/win/VC90/game.vcproj
index da026b48e28..14834618e5e 100644
--- a/win/VC90/game.vcproj
+++ b/win/VC90/game.vcproj
@@ -49,7 +49,7 @@
 				AdditionalOptions="/MP /Zm200"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\src\server\game\Entities\Item\Container;..\..\src\server\game\Server\Protocol\Handlers;..\..\externals\mersennetwister;..\..\externals\zlib;..\..\src\server\collision;..\..\src\server\collision\Management;..\..\src\server\shared;..\..\src\server\shared\Configuration;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Database;..\..\src\server\shared\DataStores;..\..\src\server\shared\Debugging;..\..\src\server\shared\Dynamic\CountedReference;..\..\src\server\shared\Dynamic\LinkedReference;..\..\src\server\shared\Dynamic;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\game;..\..\src\server\game\Accounts;..\..\src\server\game\Achievements;..\..\src\server\game\Addons;..\..\src\server\game\AI;..\..\src\server\game\AI\CoreAI;..\..\src\server\game\AI\EventAI;..\..\src\server\game\AI\ScriptedAI;..\..\src\server\game\AuctionHouse;..\..\src\server\game\AuctionHouse\AuctionHouseBot;..\..\src\server\game\BattleGrounds;..\..\src\server\game\BattleGrounds\Zones;..\..\src\server\game\Calendar;..\..\src\server\game\Chat;..\..\src\server\game\Chat\Channels;..\..\src\server\game\Chat\Commands;..\..\src\server\game\Combat;..\..\src\server\game\Conditions;..\..\src\server\game\DataStores;..\..\src\server\game\DungeonFinding;..\..\src\server\game\Entities;..\..\src\server\game\Entities\Creature;..\..\src\server\game\Entities\Corpse;..\..\src\server\game\Entities\DynamicObject;..\..\src\server\game\Entities\GameObject;..\..\src\server\game\Entities\Item;..\..\src\server\game\Entities\Object;..\..\src\server\game\Entities\Object\Updates;..\..\src\server\game\Entities\Pet;..\..\src\server\game\Entities\Player;..\..\src\server\game\Entities\Totem;..\..\src\server\game\Entities\Unit;..\..\src\server\game\Entities\Vehicle;..\..\src\server\game\Entities\Transport;..\..\src\server\game\Events;..\..\src\server\game\Globals;..\..\src\server\game\Grids\Cells;..\..\src\server\game\Grids\Notifiers;..\..\src\server\game\Grids;..\..\src\server\game\Groups;..\..\src\server\game\Guilds;..\..\src\server\game\Instances;..\..\src\server\game\Loot;..\..\src\server\game\Mails;..\..\src\server\game\Maps;..\..\src\server\game\Miscellaneous;..\..\src\server\game\Movement;..\..\src\server\game\Movement\MovementGenerators;..\..\src\server\game\Movement\Waypoints;..\..\src\server\game\OutdoorPvP;..\..\src\server\game\OutdoorPvP\Zones;..\..\src\server\game\Pools;..\..\src\server\game\PrecompiledHeaders;..\..\src\server\game\Quests;..\..\src\server\game\Reputation;..\..\src\server\game\Scripting;..\..\src\server\game\Server\Protocol;..\..\src\server\game\Server;..\..\src\server\game\Skills;..\..\src\server\game\Spells;..\..\src\server\game\Spells\Auras;..\..\src\server\game\Tools;..\..\src\server\game\Weather;..\..\src\server\game\World;..\..\externals;..\..\src\server\shared\Cryptography\Authentication;"
-				PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;_SECURE_SCL=0"
+				PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="false"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
@@ -133,7 +133,7 @@
 				AdditionalOptions="/MP /Zm200"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\..\src\server\game\Entities\Item\Container;..\..\src\server\game\Server\Protocol\Handlers;..\..\externals\mersennetwister;..\..\externals\zlib;..\..\externals\g3dlite;..\..\src\server\collision;..\..\src\server\collision\Management;..\..\src\server\collision\Maps;..\..\src\server\collision\Models;..\..\src\server\shared;..\..\src\server\shared\Configuration;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Database;..\..\src\server\shared\DataStores;..\..\src\server\shared\Debugging;..\..\src\server\shared\Dynamic\CountedReference;..\..\src\server\shared\Dynamic\LinkedReference;..\..\src\server\shared\Dynamic;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\game;..\..\src\server\game\Accounts;..\..\src\server\game\Achievements;..\..\src\server\game\Addons;..\..\src\server\game\AI;..\..\src\server\game\AI\CoreAI;..\..\src\server\game\AI\EventAI;..\..\src\server\game\AI\ScriptedAI;..\..\src\server\game\AuctionHouse;..\..\src\server\game\AuctionHouse\AuctionHouseBot;..\..\src\server\game\BattleGrounds;..\..\src\server\game\BattleGrounds\Zones;..\..\src\server\game\Calendar;..\..\src\server\game\Chat;..\..\src\server\game\Chat\Channels;..\..\src\server\game\Chat\Commands;..\..\src\server\game\Combat;..\..\src\server\game\Conditions;..\..\src\server\game\DataStores;..\..\src\server\game\DungeonFinding;..\..\src\server\game\Entities;..\..\src\server\game\Entities\Creature;..\..\src\server\game\Entities\Corpse;..\..\src\server\game\Entities\DynamicObject;..\..\src\server\game\Entities\GameObject;..\..\src\server\game\Entities\Item;..\..\src\server\game\Entities\Object;..\..\src\server\game\Entities\Object\Updates;..\..\src\server\game\Entities\Pet;..\..\src\server\game\Entities\Player;..\..\src\server\game\Entities\Totem;..\..\src\server\game\Entities\Unit;..\..\src\server\game\Entities\Vehicle;..\..\src\server\game\Entities\Transport;..\..\src\server\game\Events;..\..\src\server\game\Globals;..\..\src\server\game\Grids\Cells;..\..\src\server\game\Grids\Notifiers;..\..\src\server\game\Grids;..\..\src\server\game\Groups;..\..\src\server\game\Guilds;..\..\src\server\game\Instances;..\..\src\server\game\Loot;..\..\src\server\game\Mails;..\..\src\server\game\Maps;..\..\src\server\game\Miscellaneous;..\..\src\server\game\Movement;..\..\src\server\game\Movement\MovementGenerators;..\..\src\server\game\Movement\Waypoints;..\..\src\server\game\OutdoorPvP;..\..\src\server\game\OutdoorPvP\Zones;..\..\src\server\game\Pools;..\..\src\server\game\PrecompiledHeaders;..\..\src\server\game\Quests;..\..\src\server\game\Reputation;..\..\src\server\game\Scripting;..\..\src\server\game\Server\Protocol;..\..\src\server\game\Server;..\..\src\server\game\Skills;..\..\src\server\game\Spells;..\..\src\server\game\Spells\Auras;..\..\src\server\game\Tools;..\..\src\server\game\Weather;..\..\src\server\game\World;..\..\externals;..\..\src\server\shared\Cryptography\Authentication"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -215,7 +215,7 @@
 				AdditionalOptions="/MP /bigobj /Zm200"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\src\server\game\Entities\Item\Container;..\..\src\server\game\Server\Protocol\Handlers;..\..\externals\mersennetwister;..\..\externals\zlib;..\..\src\server\collision;..\..\src\server\collision\Management;..\..\src\server\shared;..\..\src\server\shared\Configuration;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Database;..\..\src\server\shared\DataStores;..\..\src\server\shared\Debugging;..\..\src\server\shared\Dynamic\CountedReference;..\..\src\server\shared\Dynamic\LinkedReference;..\..\src\server\shared\Dynamic;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\game;..\..\src\server\game\Accounts;..\..\src\server\game\Achievements;..\..\src\server\game\Addons;..\..\src\server\game\AI;..\..\src\server\game\AI\CoreAI;..\..\src\server\game\AI\EventAI;..\..\src\server\game\AI\ScriptedAI;..\..\src\server\game\AuctionHouse;..\..\src\server\game\AuctionHouse\AuctionHouseBot;..\..\src\server\game\BattleGrounds;..\..\src\server\game\BattleGrounds\Zones;..\..\src\server\game\Calendar;..\..\src\server\game\Chat;..\..\src\server\game\Chat\Channels;..\..\src\server\game\Chat\Commands;..\..\src\server\game\Combat;..\..\src\server\game\Conditions;..\..\src\server\game\DataStores;..\..\src\server\game\DungeonFinding;..\..\src\server\game\Entities;..\..\src\server\game\Entities\Creature;..\..\src\server\game\Entities\Corpse;..\..\src\server\game\Entities\DynamicObject;..\..\src\server\game\Entities\GameObject;..\..\src\server\game\Entities\Item;..\..\src\server\game\Entities\Object;..\..\src\server\game\Entities\Object\Updates;..\..\src\server\game\Entities\Pet;..\..\src\server\game\Entities\Player;..\..\src\server\game\Entities\Totem;..\..\src\server\game\Entities\Unit;..\..\src\server\game\Entities\Vehicle;..\..\src\server\game\Entities\Transport;..\..\src\server\game\Events;..\..\src\server\game\Globals;..\..\src\server\game\Grids\Cells;..\..\src\server\game\Grids\Notifiers;..\..\src\server\game\Grids;..\..\src\server\game\Groups;..\..\src\server\game\Guilds;..\..\src\server\game\Instances;..\..\src\server\game\Loot;..\..\src\server\game\Mails;..\..\src\server\game\Maps;..\..\src\server\game\Miscellaneous;..\..\src\server\game\Movement;..\..\src\server\game\Movement\MovementGenerators;..\..\src\server\game\Movement\Waypoints;..\..\src\server\game\OutdoorPvP;..\..\src\server\game\OutdoorPvP\Zones;..\..\src\server\game\Pools;..\..\src\server\game\PrecompiledHeaders;..\..\src\server\game\Quests;..\..\src\server\game\Reputation;..\..\src\server\game\Scripting;..\..\src\server\game\Server\Protocol;..\..\src\server\game\Server;..\..\src\server\game\Skills;..\..\src\server\game\Spells;..\..\src\server\game\Spells\Auras;..\..\src\server\game\Tools;..\..\src\server\game\Weather;..\..\src\server\game\World;..\..\externals;..\..\src\server\shared\Cryptography\Authentication;"
-				PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB"
+				PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="false"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
@@ -299,7 +299,7 @@
 				AdditionalOptions="/MP /bigobj /Zm200"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\..\src\server\game\Entities\Item\Container;..\..\src\server\game\Server\Protocol\Handlers;..\..\externals\mersennetwister;..\..\externals\zlib;..\..\src\server\collision;..\..\src\server\collision\Management;..\..\src\server\shared;..\..\src\server\shared\Configuration;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Database;..\..\src\server\shared\DataStores;..\..\src\server\shared\Debugging;..\..\src\server\shared\Dynamic\CountedReference;..\..\src\server\shared\Dynamic\LinkedReference;..\..\src\server\shared\Dynamic;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\game;..\..\src\server\game\Accounts;..\..\src\server\game\Achievements;..\..\src\server\game\Addons;..\..\src\server\game\AI;..\..\src\server\game\AI\CoreAI;..\..\src\server\game\AI\EventAI;..\..\src\server\game\AI\ScriptedAI;..\..\src\server\game\AuctionHouse;..\..\src\server\game\AuctionHouse\AuctionHouseBot;..\..\src\server\game\BattleGrounds;..\..\src\server\game\BattleGrounds\Zones;..\..\src\server\game\Calendar;..\..\src\server\game\Chat;..\..\src\server\game\Chat\Channels;..\..\src\server\game\Chat\Commands;..\..\src\server\game\Combat;..\..\src\server\game\Conditions;..\..\src\server\game\DataStores;..\..\src\server\game\DungeonFinding;..\..\src\server\game\Entities;..\..\src\server\game\Entities\Creature;..\..\src\server\game\Entities\Corpse;..\..\src\server\game\Entities\DynamicObject;..\..\src\server\game\Entities\GameObject;..\..\src\server\game\Entities\Item;..\..\src\server\game\Entities\Object;..\..\src\server\game\Entities\Object\Updates;..\..\src\server\game\Entities\Pet;..\..\src\server\game\Entities\Player;..\..\src\server\game\Entities\Totem;..\..\src\server\game\Entities\Unit;..\..\src\server\game\Entities\Vehicle;..\..\src\server\game\Entities\Transport;..\..\src\server\game\Events;..\..\src\server\game\Globals;..\..\src\server\game\Grids\Cells;..\..\src\server\game\Grids\Notifiers;..\..\src\server\game\Grids;..\..\src\server\game\Groups;..\..\src\server\game\Guilds;..\..\src\server\game\Instances;..\..\src\server\game\Loot;..\..\src\server\game\Mails;..\..\src\server\game\Maps;..\..\src\server\game\Miscellaneous;..\..\src\server\game\Movement;..\..\src\server\game\Movement\MovementGenerators;..\..\src\server\game\Movement\Waypoints;..\..\src\server\game\OutdoorPvP;..\..\src\server\game\OutdoorPvP\Zones;..\..\src\server\game\Pools;..\..\src\server\game\PrecompiledHeaders;..\..\src\server\game\Quests;..\..\src\server\game\Reputation;..\..\src\server\game\Scripting;..\..\src\server\game\Server\Protocol;..\..\src\server\game\Server;..\..\src\server\game\Skills;..\..\src\server\game\Spells;..\..\src\server\game\Spells\Auras;..\..\src\server\game\Tools;..\..\src\server\game\Weather;..\..\src\server\game\World;..\..\externals;..\..\src\server\shared\Cryptography\Authentication;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
-- 
cgit v1.2.3


From b6621ddf90adc8228f067f3f109ec5111587dc46 Mon Sep 17 00:00:00 2001
From: Machiavelli 
Date: Sun, 13 Jun 2010 13:29:31 +0200
Subject: Add some safer casting conditions in Map::ScriptsProcess. Fixes issue
 #2676 Fixes issue #2553

--HG--
branch : trunk
---
 src/server/game/Maps/Map.cpp | 79 +++++++++++++++++++++++++++++++-------------
 1 file changed, 56 insertions(+), 23 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp
index ee8fc3fd6da..6b72601f180 100644
--- a/src/server/game/Maps/Map.cpp
+++ b/src/server/game/Maps/Map.cpp
@@ -2939,8 +2939,9 @@ void Map::ScriptsProcess()
                     break;
                 }
 
-                Creature* cSource = NULL;
-                cSource = source->ToCreature() != NULL ? source->ToCreature() : target->ToCreature();
+                Creature* cSource = source->ToCreature();
+                if (!cSource && target)
+                    cSource = target->ToCreature();
 
                 if (!cSource)
                 {
@@ -2996,8 +2997,9 @@ void Map::ScriptsProcess()
                     break;
                 }
 
-                Creature* cSource = NULL;
-                cSource = source->ToCreature() != NULL ? source->ToCreature() : target->ToCreature();
+                Creature* cSource = source->ToCreature();
+                if (!cSource && target)
+                    target->ToCreature();
 
                 if (!cSource)
                 {
@@ -3021,7 +3023,10 @@ void Map::ScriptsProcess()
                     break;
                 }
                 
-                Creature* cSource = source->ToCreature() != NULL ? source->ToCreature() : target->ToCreature();
+                Creature* cSource = source->ToCreature();
+                if (!cSource && target)
+                    cSource = target->ToCreature();
+
                 if (!cSource)
                 {
                     sLog.outError("SCRIPT_COMMAND_FIELD_SET (script id: %u) call for non-creature source.", step.script->id);
@@ -3047,7 +3052,10 @@ void Map::ScriptsProcess()
                     break;
                 }
 
-                Creature* cSource = source->ToCreature() != NULL ? source->ToCreature() : target->ToCreature();
+                Creature* cSource = source->ToCreature();
+                if (!cSource && target)
+                    cSource = target->ToCreature();
+
                 if (!cSource)
                 {
                     sLog.outError("SCRIPT_COMMAND_MOVE_TO (script id: %u) call for non-creature (TypeId: %u, Entry: %u, GUID: %u), skipping.",
@@ -3068,7 +3076,10 @@ void Map::ScriptsProcess()
                     break;
                 }
 
-                Creature* cSource = source->ToCreature() != NULL ? source->ToCreature() : target->ToCreature();
+                Creature* cSource = source->ToCreature();
+                if (!cSource && target)
+                    cSource = target->ToCreature();
+
                 if (!cSource)
                 {
                     sLog.outError("SCRIPT_COMMAND_FLAG_SET (script id: %u) call for non-creature source.", step.script->id);
@@ -3094,7 +3105,10 @@ void Map::ScriptsProcess()
                     break;
                 }
                 
-                Creature* cSource = source->ToCreature() != NULL ? source->ToCreature() : target->ToCreature();
+                Creature* cSource = source->ToCreature();
+                if (!cSource && target)
+                    cSource = target->ToCreature();
+
                 if (!cSource)
                 {
                     sLog.outError("SCRIPT_COMMAND_FLAG_REMOVE (script id: %u) call for non-creature source.", step.script->id);
@@ -3123,7 +3137,12 @@ void Map::ScriptsProcess()
 
                 if (step.script->datalong2 == 0)
                 {
-                    Player* pSource = target->ToPlayer() != NULL ? target->ToPlayer() : source->ToPlayer();
+                    Player* pSource = NULL;
+                    if (target)
+                        pSource = target->ToPlayer();
+                    if (!pSource && source)
+                        pSource = source->ToPlayer();
+
                     // must be only Player
                     if (!pSource)
                     {
@@ -3136,7 +3155,12 @@ void Map::ScriptsProcess()
                 }
                 else if (step.script->datalong2 == 1)
                 {
-                    Creature *cSource = target->ToCreature() != NULL ? target->ToCreature() : source->ToCreature();
+                    Creature *cSource = NULL;
+                    if (target)
+                        cSource = target->ToCreature();
+                    if (!cSource && source)
+                        cSource = source->ToCreature();
+                    
                     // must be only Creature
                     if (!cSource)
                     {
@@ -3152,16 +3176,14 @@ void Map::ScriptsProcess()
 
             case SCRIPT_COMMAND_KILL_CREDIT:
             {
+                Player* pSource = NULL;
                 // accept player in any one from target/source arg
-                if (!target && !source)
-                {
-                    sLog.outError("SCRIPT_COMMAND_KILL_CREDIT (script id: %u) call for NULL object.", step.script->id);
-                    break;
-                }
-
-                Player* pSource = target->ToPlayer() != NULL ? target->ToPlayer() : source->ToPlayer();
-                // must be only Player
-                if (!pSource)
+                if (target)
+                    pSource = target->ToPlayer();
+                if (!pSourcen && source)
+                    pSource = source->ToPlayer();
+                               
+                if (!pSource)       // must be only Player
                 {
                     sLog.outError("SCRIPT_COMMAND_KILL_CREDIT (script id: %u) call for non-player (TypeIdSource: %u)(TypeIdTarget: %u), skipping.",
                     step.script->id, source ? source->GetTypeId() : 0, target ? target->GetTypeId() : 0);
@@ -3275,6 +3297,7 @@ void Map::ScriptsProcess()
                 go->GetMap()->Add(go);
                 break;
             }
+
             case SCRIPT_COMMAND_OPEN_DOOR:
             {
                 if (!step.script->datalong)                  // door not specified
@@ -3332,6 +3355,7 @@ void Map::ScriptsProcess()
                     ((GameObject*)target)->UseDoorOrButton(time_to_close);
                 break;
             }
+
             case SCRIPT_COMMAND_CLOSE_DOOR:
             {
                 if (!step.script->datalong)                  // guid for door not specified
@@ -3390,6 +3414,7 @@ void Map::ScriptsProcess()
 
                 break;
             }
+
             case SCRIPT_COMMAND_QUEST_EXPLORED:
             {
                 if (!source)
@@ -3584,7 +3609,7 @@ void Map::ScriptsProcess()
                         break;
                     }
 
-                    pTarget = target->ToPlayer();
+                    pTarget = target ? target->ToPlayer() : NULL;
                     if (!pTarget)
                     {
                         sLog.outError("SCRIPT_COMMAND_PLAY_SOUND (script id: %u) in targeted mode call for non-player (TypeId: %u, Entry: %u, GUID: %u), skipping.",
@@ -3603,13 +3628,19 @@ void Map::ScriptsProcess()
             
             case SCRIPT_COMMAND_CREATE_ITEM:
             {
-                if (!target && !source)
+                if (!source)
                 {
-                    sLog.outError("SCRIPT_COMMAND_CREATE_ITEM (script id: %u) call for NULL object.", step.script->id);
+                    sLog.outError("SCRIPT_COMMAND_CREATE_ITEM (script id: %u) call for NULL source.",
+                    step.script->id);
                     break;
                 }
 
-                Player *pReceiver = target->ToPlayer() != NULL ? target->ToPlayer() : source->ToPlayer();
+                Player *pReceiver = NULL;
+                if (target)
+                    pReceiver = target->ToPlayer();
+                if (!pReceiver)
+                    pReceiver = source->ToPlayer();
+                    
                 // only Player
                 if (!pReceiver)
                 {
@@ -3796,6 +3827,7 @@ void Map::ScriptsProcess()
                 uSource->SendMovementFlagUpdate();
                 break;
             }
+
             case SCRIPT_COMMAND_EQUIP:
             {
                 if (!source)
@@ -3814,6 +3846,7 @@ void Map::ScriptsProcess()
                 cSource->LoadEquipment(step.script->datalong);
                 break;
             }
+
             case SCRIPT_COMMAND_MODEL:
             {
                 if (!source)
-- 
cgit v1.2.3


From e6d0fa20cd7ace2bcc599c7795c1f343fd088659 Mon Sep 17 00:00:00 2001
From: Machiavelli 
Date: Sun, 13 Jun 2010 14:24:44 +0200
Subject: Typo spotted by glizzard.ad

--HG--
branch : trunk
---
 src/server/game/Maps/Map.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp
index 6b72601f180..afc18cba971 100644
--- a/src/server/game/Maps/Map.cpp
+++ b/src/server/game/Maps/Map.cpp
@@ -3180,7 +3180,7 @@ void Map::ScriptsProcess()
                 // accept player in any one from target/source arg
                 if (target)
                     pSource = target->ToPlayer();
-                if (!pSourcen && source)
+                if (!pSource && source)
                     pSource = source->ToPlayer();
                                
                 if (!pSource)       // must be only Player
-- 
cgit v1.2.3


From ad8638742cede5e3d34c8ac8c55b7b7534864819 Mon Sep 17 00:00:00 2001
From: Shauren 
Date: Sun, 13 Jun 2010 15:55:30 +0200
Subject: Do not apply duration spellmods to spells with infinite duration
 (fixes Glyph of Eternal Water + Enduring Winter making water elemental last
 5,10,15 seconds)

--HG--
branch : trunk
---
 src/server/game/Entities/Player/Player.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src')

diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index faeb676c21a..56068408c9f 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -18811,6 +18811,10 @@ bool Player::IsAffectedBySpellmod(SpellEntry const *spellInfo, SpellModifier *mo
     if (spell && mod->charges == -1 && spell->m_appliedMods.find(mod->ownerAura) == spell->m_appliedMods.end())
         return false;
 
+    // +duration to infinite duration spells making them limited
+    if (mod->op == SPELLMOD_DURATION && GetSpellDuration(spellInfo) == -1)
+        return false;
+
     return spellmgr.IsAffectedByMod(spellInfo, mod);
 }
 
-- 
cgit v1.2.3


From 8a2a82d1e8c8fb71d2762490a2af7b925a29f6be Mon Sep 17 00:00:00 2001
From: click 
Date: Sun, 13 Jun 2010 20:36:07 +0200
Subject: port over some usability-fixes from lynx3d on the vmapextractor and
 remove an old header-relic

--HG--
branch : trunk
---
 src/tools/vmap3_extractor/adtfile.cpp    |  9 +++----
 src/tools/vmap3_extractor/model.cpp      |  2 +-
 src/tools/vmap3_extractor/mpq_libmpq.cpp |  2 +-
 src/tools/vmap3_extractor/vmapexport.cpp | 40 ++++++++++++++++++--------------
 src/tools/vmap3_extractor/vmapexport.h   |  2 ++
 src/tools/vmap3_extractor/wdtfile.cpp    |  9 ++++---
 src/tools/vmap3_extractor/wmo.cpp        |  3 +--
 7 files changed, 37 insertions(+), 30 deletions(-)

(limited to 'src')

diff --git a/src/tools/vmap3_extractor/adtfile.cpp b/src/tools/vmap3_extractor/adtfile.cpp
index 055408edca6..314255d3a58 100644
--- a/src/tools/vmap3_extractor/adtfile.cpp
+++ b/src/tools/vmap3_extractor/adtfile.cpp
@@ -1,3 +1,4 @@
+#include "vmapexport.h"
 #include "adtfile.h"
 
 #include 
@@ -69,12 +70,12 @@ bool ADTFile::init(uint32 map_num, uint32 tileX, uint32 tileY)
     //printf("xMap = %s\n", xMap.c_str());
     //printf("yMap = %s\n", yMap.c_str());
 
-    const char dirname[] = "Buildings/dir_bin";
+    std::string dirname = std::string(szWorkDirWmo) + "/dir_bin";
     FILE *dirfile;
-    dirfile = fopen(dirname, "ab");
+    dirfile = fopen(dirname.c_str(), "ab");
     if(!dirfile)
     {
-        printf("Can't open dirfile!'%s'\n", dirname);
+        printf("Can't open dirfile!'%s'\n", dirname.c_str());
         return false;
     }
 
@@ -125,7 +126,7 @@ bool ADTFile::init(uint32 map_num, uint32 tileX, uint32 tileY)
                     // nothing do
 
                     char szLocalFile[1024];
-                    snprintf(szLocalFile, 1024, "./Buildings/%s", s);
+                    snprintf(szLocalFile, 1024, "%s/%s", szWorkDirWmo, s);
                     FILE * output = fopen(szLocalFile,"rb");
                     if(!output)
                     {
diff --git a/src/tools/vmap3_extractor/model.cpp b/src/tools/vmap3_extractor/model.cpp
index b914ed96406..a2493f7e571 100644
--- a/src/tools/vmap3_extractor/model.cpp
+++ b/src/tools/vmap3_extractor/model.cpp
@@ -134,7 +134,7 @@ ModelInstance::ModelInstance(MPQFile &f,const char* ModelInstName, uint32 mapID,
     sc = scale / 1024.0f;
 
     char tempname[512];
-    sprintf(tempname, "./Buildings/%s", ModelInstName);
+    sprintf(tempname, "%s/%s", szWorkDirWmo, ModelInstName);
     FILE *input;
     input = fopen(tempname, "r+b");
 
diff --git a/src/tools/vmap3_extractor/mpq_libmpq.cpp b/src/tools/vmap3_extractor/mpq_libmpq.cpp
index 72a9de460eb..2d2014e9594 100644
--- a/src/tools/vmap3_extractor/mpq_libmpq.cpp
+++ b/src/tools/vmap3_extractor/mpq_libmpq.cpp
@@ -57,7 +57,7 @@ MPQFile::MPQFile(const char* filename):
 
         // HACK: in patch.mpq some files don't want to open and give 1 for filesize
         if (size<=1) {
-            printf("warning: file %s has size %d; cannot read.\n", filename, size);
+            // printf("info: file %s has size %d; considered dummy file.\n", filename, size);
             eof = true;
             buffer = 0;
             return;
diff --git a/src/tools/vmap3_extractor/vmapexport.cpp b/src/tools/vmap3_extractor/vmapexport.cpp
index 06f5282b19b..ff81da52219 100644
--- a/src/tools/vmap3_extractor/vmapexport.cpp
+++ b/src/tools/vmap3_extractor/vmapexport.cpp
@@ -1,16 +1,3 @@
-/*****************************************************************************/
-/* StormLibTest.cpp                       Copyright (c) Ladislav Zezula 2003 */
-/*---------------------------------------------------------------------------*/
-/* This module uses very brutal test methods for StormLib. It extracts all   */
-/* files from the archive with Storm.dll and with stormlib and compares them,*/
-/* then tries to build a copy of the entire archive, then removes a few files*/
-/* from the archive and adds them back, then compares the two archives, ...  */
-/*---------------------------------------------------------------------------*/
-/*   Date    Ver   Who  Comment                                              */
-/* --------  ----  ---  -------                                              */
-/* 25.03.03  1.00  Lad  The first version of StormLibTest.cpp                */
-/*****************************************************************************/
-
 #define _CRT_SECURE_NO_DEPRECATE
 #include 
 #include 
@@ -68,8 +55,7 @@ bool preciseVectorData = false;
 // Constants
 
 //static const char * szWorkDirMaps = ".\\Maps";
-static const char * szWorkDirWmo = "./Buildings";
-
+const char * szWorkDirWmo = "./Buildings";
 // Local testing functions
 
 static void clreol()
@@ -114,7 +100,7 @@ void ReadLiquidTypeTableDBC()
     for(uint32 x = 0; x < LiqType_count; ++x)
         LiqType[dbc.getRecord(x).getUInt(0)] = dbc.getRecord(x).getUInt(3);
 
-    printf("Done! (%u LiqTypes loaded)\n", LiqType_count);
+    printf("Done! (%u LiqTypes loaded)\n", (unsigned int)LiqType_count);
 }
 
 int ExtractWmo()
@@ -236,18 +222,22 @@ void ParsMapFiles()
         WDTFile WDT(fn,map_ids[i].name);
         if(WDT.init(id, map_ids[i].id))
         {
+            printf("Processing Map %u\n[", map_ids[i].id);
             for (int x=0; x<64; ++x)
             {
                 for (int y=0; y<64; ++y)
                 {
-                    if (ADTFile*ADT = WDT.GetMap(x,y))
+                    if (ADTFile *ADT = WDT.GetMap(x,y))
                     {
                         //sprintf(id_filename,"%02u %02u %03u",x,y,map_ids[i].id);//!!!!!!!!!
                         ADT->init(map_ids[i].id, x, y);
                         delete ADT;
                     }
                 }
+            printf("#");
+            fflush(stdout);
             }
+        printf("]\n");
         }
     }
 }
@@ -451,6 +441,22 @@ int main(int argc, char ** argv)
     if(!processArgv(argc, argv, versionString))
         return 1;
 
+    // some simple check if working dir is dirty
+    else
+    {
+        std::string sdir = std::string(szWorkDirWmo) + "/dir";
+        std::string sdir_bin = std::string(szWorkDirWmo) + "/dir_bin";
+        struct stat status;
+        if (!stat(sdir.c_str(), &status) || !stat(sdir_bin.c_str(), &status))
+        {
+            printf("Your output directory seems to be polluted, please use an empty directory!\n");
+            printf("");
+            char garbage[2];
+            scanf("%c", garbage);
+            return 1;
+        }
+    }
+
     printf("Extract %s. Beginning work ....\n",versionString);
     //xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
     // Create the working directory
diff --git a/src/tools/vmap3_extractor/vmapexport.h b/src/tools/vmap3_extractor/vmapexport.h
index 625bc930882..fa9a609abf5 100644
--- a/src/tools/vmap3_extractor/vmapexport.h
+++ b/src/tools/vmap3_extractor/vmapexport.h
@@ -8,4 +8,6 @@ enum ModelFlags
     MOD_HAS_BOUND = 1<<2
 };
 
+extern const char * szWorkDirWmo;
+
 #endif
diff --git a/src/tools/vmap3_extractor/wdtfile.cpp b/src/tools/vmap3_extractor/wdtfile.cpp
index 7f81af72931..cd24ef0346c 100644
--- a/src/tools/vmap3_extractor/wdtfile.cpp
+++ b/src/tools/vmap3_extractor/wdtfile.cpp
@@ -1,5 +1,4 @@
-#define __STORMLIB_SELF__
-
+#include "vmapexport.h"
 #include "wdtfile.h"
 #include "adtfile.h"
 #include 
@@ -29,12 +28,12 @@ bool WDTFile::init(char *map_id, unsigned int mapID)
     char fourcc[5];
     uint32 size;
 
-    const char dirname[] = "Buildings/dir_bin";
+    std::string dirname = std::string(szWorkDirWmo) + "/dir_bin";
     FILE *dirfile;
-    dirfile = fopen(dirname, "ab");
+    dirfile = fopen(dirname.c_str(), "ab");
     if(!dirfile)
     {
-        printf("Can't open dirfile!'%s'\n", dirname);
+        printf("Can't open dirfile!'%s'\n", dirname.c_str());
         return false;
     }
 
diff --git a/src/tools/vmap3_extractor/wmo.cpp b/src/tools/vmap3_extractor/wmo.cpp
index 508391be675..650d2279f28 100644
--- a/src/tools/vmap3_extractor/wmo.cpp
+++ b/src/tools/vmap3_extractor/wmo.cpp
@@ -1,4 +1,3 @@
-
 #include "vmapexport.h"
 #include "wmo.h"
 #include "vec3d.h"
@@ -443,7 +442,7 @@ WMOInstance::WMOInstance(MPQFile &f,const char* WmoInstName, uint32 mapID, uint3
     //-----------add_in _dir_file----------------
 
     char tempname[512];
-    sprintf(tempname, "Buildings/%s", WmoInstName);
+    sprintf(tempname, "%s/%s", szWorkDirWmo, WmoInstName);
     FILE *input;
     input = fopen(tempname, "r+b");
 
-- 
cgit v1.2.3


From b2322042643f1cd2467aebeec48505fbed42111b Mon Sep 17 00:00:00 2001
From: click 
Date: Mon, 14 Jun 2010 02:00:30 +0200
Subject: Remove old DO_MYSQL-params in CMakeLists.txt files - not required as
 we only support MySQL anyway + add partial support for finding headers on
 Windows (not yet done)

--HG--
branch : trunk
---
 CMakeLists.txt                        | 19 +++++++------------
 cmake/FindMySql.cmake                 | 23 ++++++++++++++++++-----
 src/server/authserver/CMakeLists.txt  |  5 ++---
 src/server/worldserver/CMakeLists.txt |  5 ++---
 4 files changed, 29 insertions(+), 23 deletions(-)

(limited to 'src')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0b8e77d654e..1b450558ea4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,12 @@
 
 project(Trinity)
 cmake_minimum_required(VERSION 2.6)
-cmake_policy(SET CMP0005 OLD)
+
+# Force out-of-source build
+string(COMPARE EQUAL "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" BUILDING_IN_SOURCE)
+if(BUILDING_IN_SOURCE)
+  message(FATAL_ERROR "This project requires an out of source build. Remove the file 'CMakeCache.txt' found in this directory before continuing, and create a separate build directory and run 'cmake path_to_project [options]' from there.")    
+endif(BUILDING_IN_SOURCE)
 
 include(CheckIncludeFiles)
 include(cmake/FindAce.cmake)
@@ -19,12 +24,6 @@ include(cmake/FindReadline.cmake)
 include(cmake/FindTermcap.cmake)
 include(cmake/PCH.cmake)
 
-# Force out-of-source build
-string(COMPARE EQUAL "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" BUILDING_IN_SOURCE)
-if(BUILDING_IN_SOURCE)
-  message(FATAL_ERROR "This project requires an out of source build. Remove the file 'CMakeCache.txt' found in this directory before continuing, and create a separate build directory and run 'cmake path_to_project [options]' from there.")    
-endif(BUILDING_IN_SOURCE)
-
 # Select the Release build configuration by default.
 if(NOT CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE "Release")
@@ -44,7 +43,6 @@ option(DO_AUTHSERVER "Build authserver" 1)
 option(DO_WORLDSERVER "Build worldserver" 1)
 option(DO_CLI "With CLI" 1)
 option(DO_DEBUG "Debug mode" 0)
-option(DO_MYSQL "With MySQL support" 1)
 option(DO_PCH "Use precompiled headers" 1)
 option(DO_RA "With RA" 0)
 option(DO_SCRIPTS "With trinityscripts" 1)
@@ -179,10 +177,7 @@ message("")
 find_library(SSLLIB NAMES ssl DOC "SSL library")
 find_library(ZLIB z "Zlib library")
 
-if(DO_MYSQL)
-  FIND_MYSQL()
-  ADD_DEFINITIONS(-DDO_MYSQL)
-endif(DO_MYSQL)
+FIND_MYSQL()
 
 if(UNIX)
   if(CENTOS)
diff --git a/cmake/FindMySql.cmake b/cmake/FindMySql.cmake
index e149cd4eaf0..edd24ba1708 100644
--- a/cmake/FindMySql.cmake
+++ b/cmake/FindMySql.cmake
@@ -65,13 +65,19 @@ else(UNIX)
 ENDIF(UNIX)
 
 find_path(MYSQL_INCLUDE_DIR mysql.h
+    ${MYSQL_ADD_INCLUDE_DIR}
+    /usr/include
+    /usr/include/mysql
     /usr/local/include
-    /usr/local/include/mysql 
+    /usr/local/include/mysql
     /usr/local/mysql/include
     /usr/local/mysql/include/mysql
-    /usr/include 
-    /usr/include/mysql
-    ${MYSQL_ADD_INCLUDE_DIR}
+    "C:/Program Files/MySQL/include"
+    "C:/Program Files/MySQL/MySQL Server 5.0/include"
+    "C:/MySQL/include"
+    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.0;Location]/include"
+    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.0;Location]/include"
+    DOC "Specify the directory containing mysql.h."
 )
 
 set(TMP_MYSQL_LIBRARIES "")
@@ -80,10 +86,17 @@ foreach(LIB ${MYSQL_ADD_LIBRARIES})
     find_library("MYSQL_LIBRARIES_${LIB}" NAMES ${LIB}
         PATHS
         ${MYSQL_ADD_LIBRARY_PATH}
+        /usr/lib
         /usr/lib/mysql
         /usr/local/lib
         /usr/local/lib/mysql
         /usr/local/mysql/lib
+        "C:/Program Files/MySQL/lib"
+        "C:/Program Files/MySQL/MySQL Server 5.0/lib/opt"
+        "C:/MySQL/lib/debug"
+        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.0;Location]/lib/opt"
+        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.0;Location]/lib/opt"
+        DOC "Specify the mysql library here."
     )
     list(APPEND TMP_MYSQL_LIBRARIES "${MYSQL_LIBRARIES_${LIB}}")
 endforeach(LIB ${MYSQL_ADD_LIBRARIES})
@@ -99,4 +112,4 @@ else(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES)
 endif(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES)
 
 mark_as_advanced(MYSQL_INCLUDE_DIR MYSQL_LIBRARIES)
-ENDMACRO(FIND_MYSQL)
\ No newline at end of file
+ENDMACRO(FIND_MYSQL)
diff --git a/src/server/authserver/CMakeLists.txt b/src/server/authserver/CMakeLists.txt
index c3fde830b43..0e15381424f 100644
--- a/src/server/authserver/CMakeLists.txt
+++ b/src/server/authserver/CMakeLists.txt
@@ -46,9 +46,8 @@ add_executable(authserver ${authserver_SRCS})
 add_definitions(
 -D_TRINITY_REALM_CONFIG='"${CONF_DIR}/authserver.conf"'
 )
-IF (DO_MYSQL)
-   SET(trinity-realm_LINK_FLAGS "-pthread ${authserver_LINK_FLAGS}")
-ENDIF(DO_MYSQL)
+
+SET(trinity-realm_LINK_FLAGS "-pthread ${authserver_LINK_FLAGS}")
 
 IF (CMAKE_SYSTEM_NAME MATCHES "Darwin")
    SET(authserver_LINK_FLAGS "-framework Carbon ${authserver_LINK_FLAGS}")
diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt
index 058338f98ed..a47555307e7 100644
--- a/src/server/worldserver/CMakeLists.txt
+++ b/src/server/worldserver/CMakeLists.txt
@@ -124,9 +124,8 @@ add_executable(worldserver ${worldserver_SRCS})
 add_definitions(
 -D_TRINITY_CORE_CONFIG='"${CONF_DIR}/worldserver.conf"'
 )
-IF (DO_MYSQL)
-    SET(worldserver_LINK_FLAGS "-pthread ${worldserver_LINK_FLAGS}")
-ENDIF(DO_MYSQL)
+
+SET(worldserver_LINK_FLAGS "-pthread ${worldserver_LINK_FLAGS}")
 
 IF (CMAKE_SYSTEM_NAME MATCHES "Darwin")
     SET(worldserver_LINK_FLAGS "-framework Carbon ${worldserver_LINK_FLAGS}")
-- 
cgit v1.2.3


From 43f527b94fcf8a31dc4d57110a24323a1befe111 Mon Sep 17 00:00:00 2001
From: click 
Date: Mon, 14 Jun 2010 02:43:18 +0200
Subject: Fix compile-errors on older versions of GCC (missing definitions -
 thanks to lynx3d for the heads up) (users are adviced to upgrade to a MORE
 RECENT version of GCC that supports the standardized tr1::unordered_map
 functionality though)

--HG--
branch : trunk
---
 src/server/shared/Dynamic/UnorderedMap.h | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/shared/Dynamic/UnorderedMap.h b/src/server/shared/Dynamic/UnorderedMap.h
index fa87411258d..d9f41fe4ab8 100644
--- a/src/server/shared/Dynamic/UnorderedMap.h
+++ b/src/server/shared/Dynamic/UnorderedMap.h
@@ -62,7 +62,13 @@ namespace __gnu_cxx
     {
         size_t operator()(T * const &__x) const { return (size_t)__x; }
     };
-
+    template<> struct hash
+    {
+        size_t operator()(const std::string &__x) const
+        {
+            return hash()(__x.c_str());
+        }
+    };
 };
 
 #else
-- 
cgit v1.2.3


From d205de69bf79f3e8f1c9fb4e83305f54b5b6bed2 Mon Sep 17 00:00:00 2001
From: Trazom62 
Date: Mon, 14 Jun 2010 18:33:46 +0200
Subject: implement ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_DAILY_QUEST_DAILY. Fixe
 issues #2213.

--HG--
branch : trunk
---
 src/server/game/Achievements/AchievementMgr.cpp | 64 +++++++++++++++++++------
 src/server/game/Achievements/AchievementMgr.h   |  3 +-
 src/server/game/Entities/Player/Player.cpp      |  3 +-
 3 files changed, 53 insertions(+), 17 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp
index e30f6ed35df..41b9acfff2c 100644
--- a/src/server/game/Achievements/AchievementMgr.cpp
+++ b/src/server/game/Achievements/AchievementMgr.cpp
@@ -873,6 +873,36 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
                 SetCriteriaProgress(achievementCriteria, counter);
                 break;
             }
+            case ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_DAILY_QUEST_DAILY:
+            {
+                time_t nextDailyResetTime = sWorld.GetNextDailyQuestsResetTime();
+                CriteriaProgress *progress = GetCriteriaProgress(achievementCriteria);
+
+                if (!miscvalue1) // Login case.
+                {
+                    // reset if player missed one day.
+                    if (progress && progress->date < (nextDailyResetTime - 2 * DAY))
+                        SetCriteriaProgress(achievementCriteria, 0, PROGRESS_SET);
+                    continue;
+                }
+
+                ProgressType progressType;
+                if (!progress) 
+                    // 1st time. Start count.
+                    progressType = PROGRESS_SET;
+                else if (progress->date < (nextDailyResetTime - 2 * DAY))
+                    // last progress is older than 2 days. Player missed 1 day => Retart count.
+                    progressType = PROGRESS_SET;
+                else if (progress->date < (nextDailyResetTime - DAY))
+                    // last progress is between 1 and 2 days. => 1st time of the day.
+                    progressType = PROGRESS_ACCUMULATE;
+                else
+                    // last progress is within the day before the reset => Already counted today.
+                    continue;
+
+                SetCriteriaProgress(achievementCriteria, 1, progressType);
+                break;
+            }
             case ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_QUESTS_IN_ZONE:
             {
                 // speedup for non-login case
@@ -1428,7 +1458,6 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
             case ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_RATING:
                 break;
             // FIXME: not triggered in code as result, need to implement
-            case ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_DAILY_QUEST_DAILY:
             case ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_RAID:
             case ACHIEVEMENT_CRITERIA_TYPE_BG_OBJECTIVE_CAPTURE:
             case ACHIEVEMENT_CRITERIA_TYPE_HONORABLE_KILL_AT_AREA:
@@ -1483,11 +1512,10 @@ bool AchievementMgr::IsCompletedCriteria(AchievementCriteriaEntry const* achieve
             return false;
     }
 
-    CriteriaProgressMap::const_iterator itr = m_criteriaProgress.find(achievementCriteria->ID);
-    if (itr == m_criteriaProgress.end())
+    CriteriaProgress const* progress = GetCriteriaProgress(achievementCriteria);
+    if (!progress)
         return false;
 
-    CriteriaProgress const* progress = &itr->second;
 
     switch(achievementCriteria->requiredType)
     {
@@ -1516,6 +1544,8 @@ bool AchievementMgr::IsCompletedCriteria(AchievementCriteriaEntry const* achieve
             return progress->counter >= 1;
         case ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_QUEST_COUNT:
             return progress->counter >= achievementCriteria->complete_quest_count.totalQuestCount;
+        case ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_DAILY_QUEST_DAILY:
+            return progress->counter >= achievementCriteria->complete_daily_quest_daily.numberOfDays;
         case ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_QUESTS_IN_ZONE:
             return progress->counter >= achievementCriteria->complete_quests_in_zone.questCount;
         case ACHIEVEMENT_CRITERIA_TYPE_DAMAGE_DONE:
@@ -1661,11 +1691,10 @@ bool AchievementMgr::IsCompletedAchievement(AchievementEntry const* entry)
         {
             AchievementCriteriaEntry const* criteria = *itr;
 
-            CriteriaProgressMap::const_iterator itrProgress = m_criteriaProgress.find(criteria->ID);
-            if (itrProgress == m_criteriaProgress.end())
+            CriteriaProgress const* progress = GetCriteriaProgress(criteria);
+            if (!progress)
                 continue;
 
-            CriteriaProgress const* progress = &itrProgress->second;
             count += progress->counter;
 
             // for counters, field4 contains the main count requirement
@@ -1701,6 +1730,16 @@ bool AchievementMgr::IsCompletedAchievement(AchievementEntry const* entry)
     return false;
 }
 
+CriteriaProgress* AchievementMgr::GetCriteriaProgress(AchievementCriteriaEntry const* entry)
+{
+    CriteriaProgressMap::iterator iter = m_criteriaProgress.find(entry->ID);
+
+    if (iter == m_criteriaProgress.end())
+        return NULL;
+
+    return &(iter->second);
+}
+
 void AchievementMgr::SetCriteriaProgress(AchievementCriteriaEntry const* entry, uint32 changeValue, ProgressType ptype)
 {
     // Don't allow to cheat - doing timed achievements without timer active
@@ -1711,11 +1750,8 @@ void AchievementMgr::SetCriteriaProgress(AchievementCriteriaEntry const* entry,
     if ((sLog.getLogFilter() & LOG_FILTER_ACHIEVEMENT_UPDATES) == 0)
         sLog.outDetail("AchievementMgr::SetCriteriaProgress(%u, %u) for (GUID:%u)", entry->ID, changeValue, m_player->GetGUIDLow());
 
-    CriteriaProgress *progress = NULL;
-
-    CriteriaProgressMap::iterator iter = m_criteriaProgress.find(entry->ID);
-
-    if (iter == m_criteriaProgress.end())
+    CriteriaProgress* progress = GetCriteriaProgress(entry);
+    if (!progress)
     {
         // not create record for 0 counter but allow it for timed achievements
         // we will need to send 0 progress to client to start the timer
@@ -1724,12 +1760,9 @@ void AchievementMgr::SetCriteriaProgress(AchievementCriteriaEntry const* entry,
 
         progress = &m_criteriaProgress[entry->ID];
         progress->counter = changeValue;
-        progress->date = time(NULL);
     }
     else
     {
-        progress = &iter->second;
-
         uint32 newValue = 0;
         switch(ptype)
         {
@@ -1756,6 +1789,7 @@ void AchievementMgr::SetCriteriaProgress(AchievementCriteriaEntry const* entry,
     }
 
     progress->changed = true;
+    progress->date = time(NULL); // set the date to the latest update.
 
     uint32 timeElapsed = 0;
     bool timedCompleted = false;
diff --git a/src/server/game/Achievements/AchievementMgr.h b/src/server/game/Achievements/AchievementMgr.h
index 6e27a3da068..97dbc86396e 100644
--- a/src/server/game/Achievements/AchievementMgr.h
+++ b/src/server/game/Achievements/AchievementMgr.h
@@ -36,7 +36,7 @@ typedef std::map         AchievementListByReference
 struct CriteriaProgress
 {
     uint32 counter;
-    time_t date;
+    time_t date;                                            // latest update time.
     bool changed;
 };
 
@@ -258,6 +258,7 @@ class AchievementMgr
         enum ProgressType { PROGRESS_SET, PROGRESS_ACCUMULATE, PROGRESS_HIGHEST };
         void SendAchievementEarned(AchievementEntry const* achievement);
         void SendCriteriaUpdate(AchievementCriteriaEntry const* entry, CriteriaProgress const* progress, uint32 timeElapsed, bool timedCompleted);
+        CriteriaProgress* GetCriteriaProgress(AchievementCriteriaEntry const* entry);
         void SetCriteriaProgress(AchievementCriteriaEntry const* entry, uint32 changeValue, ProgressType ptype = PROGRESS_SET);
         void CompletedCriteriaFor(AchievementEntry const* achievement);
         bool IsCompletedCriteria(AchievementCriteriaEntry const* criteria, AchievementEntry const* achievement);
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 56068408c9f..a6dc7ab137e 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -14316,7 +14316,8 @@ void Player::RewardQuest(Quest const *pQuest, uint32 reward, Object* questGiver,
     if (pQuest->IsDaily())
     {
         SetDailyQuestStatus(quest_id);
-        GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_DAILY_QUEST, 1);
+        GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_DAILY_QUEST, quest_id);
+        GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_DAILY_QUEST_DAILY, quest_id);
     }
 
     if (pQuest->IsWeekly())
-- 
cgit v1.2.3


From d095e315a0457e49b9d8d8ab2c4fe4f0169c7a5a Mon Sep 17 00:00:00 2001
From: Xanadu 
Date: Mon, 14 Jun 2010 20:52:36 +0200
Subject: Improved startup pool check a little.

--HG--
branch : trunk
---
 src/server/game/Pools/PoolHandler.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Pools/PoolHandler.cpp b/src/server/game/Pools/PoolHandler.cpp
index 0105b5870ea..de29d59d628 100644
--- a/src/server/game/Pools/PoolHandler.cpp
+++ b/src/server/game/Pools/PoolHandler.cpp
@@ -121,10 +121,13 @@ void PoolGroup::AddEntry(PoolObject& poolitem, uint32 maxentries)
 template 
 bool PoolGroup::CheckPool() const
 {
-    if (EqualChanced.size() == 0)
+    if (EqualChanced.size() && ExplicitlyChanced.size())
+        return false;
+
+    if (ExplicitlyChanced.size())
     {
         float chance = 0;
-        for (uint32 i=0; i
Date: Mon, 14 Jun 2010 21:03:05 +0200
Subject: Added support for removing blizz items from character creation info
 by adding entry to playercreateinfo_item with count -1 Added support for all
 class/all race in playercreateinfo_item by setting class/race to 0 (like
 currently playercreateinfo_spell)

--HG--
branch : trunk
---
 sql/base/world_database.sql                      |  2 +-
 sql/updates/8605_world_playercreateinfo_item.sql |  1 +
 src/server/game/Globals/ObjectMgr.cpp            | 58 ++++++++++++++++++++++--
 src/server/game/Globals/ObjectMgr.h              |  1 +
 4 files changed, 57 insertions(+), 5 deletions(-)
 create mode 100644 sql/updates/8605_world_playercreateinfo_item.sql

(limited to 'src')

diff --git a/sql/base/world_database.sql b/sql/base/world_database.sql
index 5cf85d68cab..4ef57d79fdd 100644
--- a/sql/base/world_database.sql
+++ b/sql/base/world_database.sql
@@ -4105,7 +4105,7 @@ CREATE TABLE `playercreateinfo_item` (
   `race` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `class` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `itemid` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `amount` tinyint(3) unsigned NOT NULL DEFAULT '1',
+  `amount` tinyint(3) NOT NULL DEFAULT '1',
   KEY `playercreateinfo_race_class_index` (`race`,`class`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
diff --git a/sql/updates/8605_world_playercreateinfo_item.sql b/sql/updates/8605_world_playercreateinfo_item.sql
new file mode 100644
index 00000000000..c5d423c1744
--- /dev/null
+++ b/sql/updates/8605_world_playercreateinfo_item.sql
@@ -0,0 +1 @@
+ALTER TABLE `playercreateinfo_item` CHANGE `amount` `amount` tinyint(3) NOT NULL DEFAULT '1';
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index 89ce93b5d80..e78dc02a93f 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -2660,6 +2660,47 @@ PetLevelInfo const* ObjectMgr::GetPetLevelInfo(uint32 creature_id, uint8 level)
     return &itr->second[level-1];                           // data for level 1 stored in [0] array element, ...
 }
 
+void ObjectMgr::PlayerCreateInfoAddItemHelper(uint32 race_, uint32 class_, uint32 itemId, int32 count)
+{
+    if (count > 0)
+        playerInfo[race_][class_].item.push_back(PlayerCreateInfoItem(itemId, count));
+    else
+    {
+        if (count < -1)
+            sLog.outErrorDb("Invalid count %i specified on item %u be removed from original player create info (use -1)!", count, itemId);
+
+        uint32 RaceClass = (race_) | (class_ << 8);
+        bool doneOne = false;
+        for (uint32 i = 1; i < sCharStartOutfitStore.GetNumRows(); ++i)
+        {
+            if (CharStartOutfitEntry const* entry = sCharStartOutfitStore.LookupEntry(i))
+            {
+                if (entry->RaceClassGender == RaceClass || entry->RaceClassGender == (RaceClass | (1 << 16)))
+                {
+                    bool found = false;
+                    for (uint8 x = 0; x < MAX_OUTFIT_ITEMS; ++x)
+                    {
+                        if (entry->ItemId[x] == itemId)
+                        {
+                            found = true;
+                            const_cast(entry)->ItemId[x] = 0;
+                            break;
+                        }
+                    }
+
+                    if (!found)
+                        sLog.outErrorDb("Item %u specified to be removed from original create info not found in dbc!", itemId);
+                    
+                    if (!doneOne)
+                        doneOne = true;
+                    else
+                        break;
+                }
+            }
+        }
+    }
+}
+
 void ObjectMgr::LoadPlayerInfo()
 {
     // Load playercreate
@@ -2790,8 +2831,6 @@ void ObjectMgr::LoadPlayerInfo()
                     continue;
                 }
 
-                PlayerInfo* pInfo = &playerInfo[current_race][current_class];
-
                 uint32 item_id = fields[2].GetUInt32();
 
                 if (!GetItemPrototype(item_id))
@@ -2800,7 +2839,7 @@ void ObjectMgr::LoadPlayerInfo()
                     continue;
                 }
 
-                uint32 amount  = fields[3].GetUInt32();
+                int32 amount   = fields[3].GetInt32();
 
                 if (!amount)
                 {
@@ -2808,7 +2847,18 @@ void ObjectMgr::LoadPlayerInfo()
                     continue;
                 }
 
-                pInfo->item.push_back(PlayerCreateInfoItem(item_id, amount));
+                if (!current_race || !current_class)
+                {
+                    uint32 min_race = current_race ? current_race : 1;
+                    uint32 max_race = current_race ? current_race + 1 : MAX_RACES;
+                    uint32 min_class = current_class ? current_class : 1;
+                    uint32 max_class = current_class ? current_class + 1 : MAX_CLASSES;
+                    for (uint32 r = min_race; r < max_race; ++r)
+                        for (uint32 c = min_class; c < max_class; ++c)
+                            PlayerCreateInfoAddItemHelper(r, c, item_id, amount);
+                }
+                else
+                    PlayerCreateInfoAddItemHelper(current_race, current_class, item_id, amount);
 
                 bar.step();
                 ++count;
diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h
index a5e3989d452..824eb237756 100644
--- a/src/server/game/Globals/ObjectMgr.h
+++ b/src/server/game/Globals/ObjectMgr.h
@@ -1035,6 +1035,7 @@ class ObjectMgr
         void LoadCreatureAddons(SQLStorage& creatureaddons, char const* entryName, char const* comment);
         void ConvertCreatureAddonAuras(CreatureDataAddon* addon, char const* table, char const* guidEntryStr);
         void LoadQuestRelationsHelper(QuestRelations& map,char const* table);
+        void PlayerCreateInfoAddItemHelper(uint32 race_, uint32 class_, uint32 itemId, int32 count);
 
         MailLevelRewardMap m_mailLevelRewardMap;
 
-- 
cgit v1.2.3


From c3fed147d72474052c06c0b34460ff5ba1d5f82a Mon Sep 17 00:00:00 2001
From: Shauren 
Date: Mon, 14 Jun 2010 21:10:08 +0200
Subject: Removed useless vmap assembler solution file

--HG--
branch : trunk
---
 src/tools/vmap3_assembler/vmap_assemblerVC90.sln | 42 ------------------------
 1 file changed, 42 deletions(-)
 delete mode 100644 src/tools/vmap3_assembler/vmap_assemblerVC90.sln

(limited to 'src')

diff --git a/src/tools/vmap3_assembler/vmap_assemblerVC90.sln b/src/tools/vmap3_assembler/vmap_assemblerVC90.sln
deleted file mode 100644
index 9e94e750661..00000000000
--- a/src/tools/vmap3_assembler/vmap_assemblerVC90.sln
+++ /dev/null
@@ -1,42 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual C++ Express 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vmap_assembler", "VC90\vmap_assembler.vcproj", "{572FFF74-480C-4472-8ABF-81733BB4049D}"
-	ProjectSection(ProjectDependencies) = postProject
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} = {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E} = {8072769E-CF10-48BF-B9E1-12752A5DAC6E}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\win\VC90\zlib.vcproj", "{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g3dlite", "..\..\win\VC90\g3dlite.vcproj", "{8072769E-CF10-48BF-B9E1-12752A5DAC6E}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug_NoPCH|Win32 = Debug_NoPCH|Win32
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{572FFF74-480C-4472-8ABF-81733BB4049D}.Debug_NoPCH|Win32.ActiveCfg = Debug|Win32
-		{572FFF74-480C-4472-8ABF-81733BB4049D}.Debug_NoPCH|Win32.Build.0 = Debug|Win32
-		{572FFF74-480C-4472-8ABF-81733BB4049D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{572FFF74-480C-4472-8ABF-81733BB4049D}.Debug|Win32.Build.0 = Debug|Win32
-		{572FFF74-480C-4472-8ABF-81733BB4049D}.Release|Win32.ActiveCfg = Release|Win32
-		{572FFF74-480C-4472-8ABF-81733BB4049D}.Release|Win32.Build.0 = Release|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.Build.0 = Debug|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.ActiveCfg = Release|Win32
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.Build.0 = Release|Win32
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|Win32.Build.0 = Debug|Win32
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|Win32.ActiveCfg = Release|Win32
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
-- 
cgit v1.2.3


From 2a544c94b39238a353b8ec896936c7a6f00b53f8 Mon Sep 17 00:00:00 2001
From: Trazom62 
Date: Tue, 15 Jun 2010 00:04:03 +0200
Subject: Implement Chef Hat. Fixes issue #2514.

--HG--
branch : trunk
---
 src/server/game/Entities/Unit/Unit.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index e2493e50e3c..fa745edcb7a 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -12628,11 +12628,10 @@ void Unit::ModSpellCastTime(SpellEntry const* spellProto, int32 & castTime, Spel
 
     if (!(spellProto->Attributes & (SPELL_ATTR_UNK4|SPELL_ATTR_TRADESPELL)) && spellProto->SpellFamilyName)
         castTime = int32(float(castTime) * GetFloatValue(UNIT_MOD_CAST_SPEED));
-    else
-    {
-        if (spellProto->Attributes & SPELL_ATTR_REQ_AMMO && !(spellProto->AttributesEx2 & SPELL_ATTR_EX2_AUTOREPEAT_FLAG))
-            castTime = int32(float(castTime) * m_modAttackSpeedPct[RANGED_ATTACK]);
-    }
+    else if (spellProto->Attributes & SPELL_ATTR_REQ_AMMO && !(spellProto->AttributesEx2 & SPELL_ATTR_EX2_AUTOREPEAT_FLAG))
+        castTime = int32(float(castTime) * m_modAttackSpeedPct[RANGED_ATTACK]);
+    else if (spellProto->SpellVisual[0] == 3881 && HasAura(67556)) // cooking with Chef Hat.
+        castTime = 500;
 }
 
 DiminishingLevels Unit::GetDiminishing(DiminishingGroup group)
-- 
cgit v1.2.3


From ebb07858170c7552439ce0afd9395d93b79e2eb8 Mon Sep 17 00:00:00 2001
From: Shauren 
Date: Tue, 15 Jun 2010 17:08:04 +0200
Subject: Commit from Lynx3d: Add assert to values that can cause nasty freeze,
 but should never occur with valid input.

--HG--
branch : trunk
---
 src/server/collision/Maps/MapTree.cpp                | 6 ++++++
 src/tools/vmap3_assembler/CMakeLists.txt             | 1 +
 src/tools/vmap3_assembler/VC90/vmap_assembler.vcproj | 4 ++--
 3 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/server/collision/Maps/MapTree.cpp b/src/server/collision/Maps/MapTree.cpp
index 8c77ee109f3..af4073fcc8c 100644
--- a/src/server/collision/Maps/MapTree.cpp
+++ b/src/server/collision/Maps/MapTree.cpp
@@ -16,6 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "Errors.h"
 #include "MapTree.h"
 #include "ModelInstance.h"
 #include "VMapManager2.h"
@@ -24,6 +25,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using G3D::Vector3;
 
@@ -146,6 +148,8 @@ namespace VMAP
     {
         bool result = true;
         float maxDist = (pos2 - pos1).magnitude();
+        // valid map coords should *never ever* produce float overflow, but this would produce NaNs too
+        ASSERT(maxDist < std::numeric_limits::max());
         // prevent NaN values which can cause BIH intersection to enter infinite loop
         if (maxDist < 1e-10f)
             return true;
@@ -168,6 +172,8 @@ namespace VMAP
     {
         bool result=false;
         float maxDist = (pPos2 - pPos1).magnitude();
+        // valid map coords should *never ever* produce float overflow, but this would produce NaNs too
+        ASSERT(maxDist < std::numeric_limits::max());
         // prevent NaN values which can cause BIH intersection to enter infinite loop
         if (maxDist < 1e-10f)
         {
diff --git a/src/tools/vmap3_assembler/CMakeLists.txt b/src/tools/vmap3_assembler/CMakeLists.txt
index b3b16d540c7..62eaca7e13f 100644
--- a/src/tools/vmap3_assembler/CMakeLists.txt
+++ b/src/tools/vmap3_assembler/CMakeLists.txt
@@ -14,6 +14,7 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/src/server/collision/Maps
   ${CMAKE_SOURCE_DIR}/src/server/collision/Models
   ${CMAKE_SOURCE_DIR}/src/server/shared
+  ${CMAKE_SOURCE_DIR}/src/server/shared/Debugging
   ${ACE_INCLUDE_DIR}
 )
 
diff --git a/src/tools/vmap3_assembler/VC90/vmap_assembler.vcproj b/src/tools/vmap3_assembler/VC90/vmap_assembler.vcproj
index e3b1b7766a5..b7c0e7719b3 100644
--- a/src/tools/vmap3_assembler/VC90/vmap_assembler.vcproj
+++ b/src/tools/vmap3_assembler/VC90/vmap_assembler.vcproj
@@ -42,7 +42,7 @@
 			
 			
Date: Tue, 15 Jun 2010 19:16:25 +0200
Subject: Fix linuxbuild

--HG--
branch : trunk
---
 src/server/collision/CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src')

diff --git a/src/server/collision/CMakeLists.txt b/src/server/collision/CMakeLists.txt
index 1090b7ab0f7..8af66c7c074 100644
--- a/src/server/collision/CMakeLists.txt
+++ b/src/server/collision/CMakeLists.txt
@@ -39,6 +39,8 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/src/server/collision/Management
   ${CMAKE_SOURCE_DIR}/src/server/collision/Maps
   ${CMAKE_SOURCE_DIR}/src/server/collision/Models
+  ${CMAKE_SOURCE_DIR}/src/server/shared/Debugging
+  ${CMAKE_BINARY_DIR}
 )
 
 add_library(collision STATIC ${collision_STAT_SRCS})
-- 
cgit v1.2.3


From 5d7bed7222ae2505c05ed6f5c97f0639f2e2999f Mon Sep 17 00:00:00 2001
From: click 
Date: Wed, 16 Jun 2010 03:43:09 +0200
Subject: Adjust CMake "searchmacros" bit so that they point to correct
 locations

--HG--
branch : trunk
---
 cmake/FindACE.cmake                   | 14 +++----
 cmake/FindMySQL.cmake                 | 14 +++----
 cmake/FindOpenSSL.cmake               | 20 +++++-----
 src/server/authserver/CMakeLists.txt  | 44 +++++++++++-----------
 src/server/worldserver/CMakeLists.txt | 70 +++++++++++++++++------------------
 5 files changed, 81 insertions(+), 81 deletions(-)

(limited to 'src')

diff --git a/cmake/FindACE.cmake b/cmake/FindACE.cmake
index f49dc8cf73a..4ade5f64b03 100644
--- a/cmake/FindACE.cmake
+++ b/cmake/FindACE.cmake
@@ -3,7 +3,7 @@
 # 
 
 # This module defines
-# ACE_INCLUDE_DIRECTORIES, where to find ace.h
+# ACE_INCLUDE_DIR, where to find ace.h
 # ACE_LIBRARIES, the libraries to link against
 # ACE_FOUND, if false, you cannot build anything that requires ACE
 
@@ -13,7 +13,7 @@
 set( ACE_FOUND 0 )
 
 if ( UNIX )
-  FIND_PATH( ACE_INCLUDE_DIRECTORIES
+  FIND_PATH( ACE_INCLUDE_DIR
     NAMES
       ace/ACE.h
     PATHS
@@ -52,14 +52,14 @@ if ( UNIX )
 #  )
 
   if ( ACE_LIBRARY )
-    if ( ACE_INCLUDE_DIRECTORIES )
+    if ( ACE_INCLUDE_DIR )
       set( ACE_FOUND 1 )
       message( STATUS "Found ACE library: ${ACE_LIBRARY}")
-      message( STATUS "Found ACE headers: ${ACE_INCLUDE_DIRECTORIES}")
-    else ( ACE_INCLUDE_DIRECTORIES )
+      message( STATUS "Found ACE headers: ${ACE_INCLUDE_DIR}")
+    else ( ACE_INCLUDE_DIR )
       message(FATAL_ERROR "Could not find ACE headers! Please install ACE libraries and headers")
-    endif ( ACE_INCLUDE_DIRECTORIES )
+    endif ( ACE_INCLUDE_DIR )
   endif ( ACE_LIBRARY )
 
-  mark_as_advanced( ACE_FOUND ACE_LIBRARY ACE_EXTRA_LIBRARIES ACE_INCLUDE_DIRECTORIES )
+  mark_as_advanced( ACE_FOUND ACE_LIBRARY ACE_EXTRA_LIBRARIES ACE_INCLUDE_DIR )
 endif (UNIX)
diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
index 09db299f234..e213fb1126d 100644
--- a/cmake/FindMySQL.cmake
+++ b/cmake/FindMySQL.cmake
@@ -3,7 +3,7 @@
 # 
 
 # This module defines
-# MYSQL_INCLUDE_DIRECTORY, where to find mysql.h
+# MYSQL_INCLUDE_DIR, where to find mysql.h
 # MYSQL_LIBRARIES, the libraries to link against to connect to MySQL
 # MYSQL_FOUND, if false, you cannot build anything that requires MySQL.
 
@@ -59,7 +59,7 @@ if( UNIX )
   endif( MYSQL_CONFIG )
 endif( UNIX )
 
-find_path(MYSQL_INCLUDE_DIRECTORIES
+find_path(MYSQL_INCLUDE_DIR
   NAMES
     mysql.h
   PATHS
@@ -122,13 +122,13 @@ else( NOT WIN32 )
 endif( NOT WIN32 )
 
 if( MYSQL_LIBRARY )
-  if( MYSQL_INCLUDE_DIRECTORIES )
+  if( MYSQL_INCLUDE_DIR )
     set( MYSQL_FOUND 1 )
     message(STATUS "Found MySQL library: ${MYSQL_LIBRARY}")
-    message(STATUS "Found MySQL headers: ${MYSQL_INCLUDE_DIRECTORIES}")
-  else( MYSQL_INCLUDE_DIRECTORIES )
+    message(STATUS "Found MySQL headers: ${MYSQL_INCLUDE_DIR}")
+  else( MYSQL_INCLUDE_DIR )
       message(FATAL_ERROR "Could not find MySQL headers! Please install the development-libraries and headers.")
-  endif( MYSQL_INCLUDE_DIRECTORIES )
-  mark_as_advanced( MYSQL_FOUND MYSQL_LIBRARY MYSQL_EXTRA_LIBRARIES MYSQL_INCLUDE_DIRECTORY )
+  endif( MYSQL_INCLUDE_DIR )
+  mark_as_advanced( MYSQL_FOUND MYSQL_LIBRARY MYSQL_EXTRA_LIBRARIES MYSQL_INCLUDE_DIR )
 endif( MYSQL_LIBRARY )
 
diff --git a/cmake/FindOpenSSL.cmake b/cmake/FindOpenSSL.cmake
index ed72fd7527a..7f50394cbfc 100644
--- a/cmake/FindOpenSSL.cmake
+++ b/cmake/FindOpenSSL.cmake
@@ -3,19 +3,19 @@
 # 
 
 # This module defines
-# OPENSSL_INCLUDE_DIRECTORIES, where to find openssl.h
+# OPENSSL_INCLUDE_DIR, where to find openssl.h
 # OPENSSL_LIBRARIES, the libraries to link against to connect to MySQL
 # OPENSSL_FOUND, if false, you cannot build anything that requires MySQL.
 
 # also defined, but not for general use are
 # OPENSSL_LIBRARY, where to find the MySQL library.
 
-if( OPENSSL_INCLUDE_DIRECTORIES AND OPENSSL_LIBRARIES )
+if( OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES )
   # in cache already
   set(OPENSSL_FOUND 1)
-else( OPENSSL_INCLUDE_DIRECTORIES AND OPENSSL_LIBRARIES )
+else( OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES )
   set(OPENSSL_FOUND 0)
-  find_path(OPENSSL_INCLUDE_DIRECTORIES
+  find_path(OPENSSL_INCLUDE_DIR
     NAMES
       ssl.h
     PATHS
@@ -64,15 +64,15 @@ else( OPENSSL_INCLUDE_DIRECTORIES AND OPENSSL_LIBRARIES )
   endif( WIN32 )
 
   if( OPENSSL_LIBRARIES )
-    if( OPENSSL_INCLUDE_DIRECTORIES )
+    if( OPENSSL_INCLUDE_DIR )
       set( OPENSSL_FOUND 1 )
       message(STATUS "Found OpenSSL library: ${OPENSSL_LIBRARIES}")
-      message(STATUS "Found OpenSSL headers: ${OPENSSL_INCLUDE_DIRECTORIES}")
-    else ( OPENSSL_INCLUDE_DIRECTORIES )
+      message(STATUS "Found OpenSSL headers: ${OPENSSL_INCLUDE_DIR}")
+    else ( OPENSSL_INCLUDE_DIR )
       message(FATAL_ERROR "Could not find OpenSSL headers! Please install the development-headers")
-    endif( OPENSSL_INCLUDE_DIRECTORIES )
+    endif( OPENSSL_INCLUDE_DIR )
   else( OPENSSL_LIBRARIES )
     message(FATAL_ERROR "Could not find OpenSSL libraries! Please install the library before continuing")
   endif( OPENSSL_LIBRARIES )
-  mark_as_advanced( OPENSSL_FOUND OPENSSL_LIBRARIES OPENSSL_EXTRA_LIBRARIES OPENSSL_INCLUDE_DIRECTORIES )
-endif( OPENSSL_INCLUDE_DIRECTORIES AND OPENSSL_LIBRARIES )
+  mark_as_advanced( OPENSSL_FOUND OPENSSL_LIBRARIES OPENSSL_EXTRA_LIBRARIES OPENSSL_INCLUDE_DIR )
+endif( OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES )
diff --git a/src/server/authserver/CMakeLists.txt b/src/server/authserver/CMakeLists.txt
index 0e15381424f..c3f5fe6331b 100644
--- a/src/server/authserver/CMakeLists.txt
+++ b/src/server/authserver/CMakeLists.txt
@@ -11,20 +11,22 @@
 ########### authserver ###############
 
 SET(authserver_SRCS
-Authentication/AuthCodes.cpp
-Authentication/AuthCodes.h
-Realms/RealmList.cpp
-Realms/RealmList.h
-Server/AuthSocket.cpp
-Server/AuthSocket.h
-Server/RealmSocket.h
-Server/RealmSocket.cpp
-Server/RealmAcceptor.h
-Main.cpp
+  Authentication/AuthCodes.cpp
+  Authentication/AuthCodes.h
+  Realms/RealmList.cpp
+  Realms/RealmList.h
+  Server/AuthSocket.cpp
+  Server/AuthSocket.h
+  Server/RealmSocket.h
+  Server/RealmSocket.cpp
+  Server/RealmAcceptor.h
+  Main.cpp
 )
 
 include_directories(
   ${ACE_INCLUDE_DIR}
+  ${MYSQL_INCLUDE_DIR}
+  ${OPENSSL_INCLUDE_DIR}
   ${CMAKE_BINARY_DIR}
   ${CMAKE_SOURCE_DIR}/src/server/shared
   ${CMAKE_SOURCE_DIR}/src/server/shared/Database
@@ -37,38 +39,36 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/src/server/authserver/Authentication
   ${CMAKE_SOURCE_DIR}/src/server/authserver/Realms
   ${CMAKE_SOURCE_DIR}/src/server/authserver/Server
-  ${MYSQL_INCLUDE_DIR}
 )
 
 SET(authserver_LINK_FLAGS "")
 
 add_executable(authserver ${authserver_SRCS})
 add_definitions(
--D_TRINITY_REALM_CONFIG='"${CONF_DIR}/authserver.conf"'
+  -D_TRINITY_REALM_CONFIG='"${CONF_DIR}/authserver.conf"'
 )
 
 SET(trinity-realm_LINK_FLAGS "-pthread ${authserver_LINK_FLAGS}")
 
 IF (CMAKE_SYSTEM_NAME MATCHES "Darwin")
-   SET(authserver_LINK_FLAGS "-framework Carbon ${authserver_LINK_FLAGS}")
+  SET(authserver_LINK_FLAGS "-framework Carbon ${authserver_LINK_FLAGS}")
 ENDIF (CMAKE_SYSTEM_NAME MATCHES "Darwin")
 
 SET_TARGET_PROPERTIES(authserver PROPERTIES LINK_FLAGS "${authserver_LINK_FLAGS}")
 
 target_link_libraries(
-authserver
-shared
-trinitydatabase
-trinityauth
-trinityconfig
-${SSLLIB}
-${MYSQL_LIBRARIES}
-${OSX_LIBS}
+  authserver
+  shared
+  trinitydatabase
+  trinityauth
+  trinityconfig
+  ${MYSQL_LIBRARY}
+  ${OPENSSL_LIBRARIES}
+  ${OSX_LIBS}
 )
 
 install(TARGETS authserver DESTINATION bin)
 
-
 ########### install files ###############
 
 install(FILES  authserver.conf.dist DESTINATION etc)
diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt
index a47555307e7..6b496aa7794 100644
--- a/src/server/worldserver/CMakeLists.txt
+++ b/src/server/worldserver/CMakeLists.txt
@@ -11,19 +11,21 @@
 ########### worldserver ###############
 
 SET(worldserver_SRCS
-CommandLine/CliRunnable.cpp
-CommandLine/CliRunnable.h
-RemoteAccess/RASocket.cpp
-RemoteAccess/RASocket.h
-WorldThread/WorldRunnable.cpp
-WorldThread/WorldRunnable.h
-Main.cpp
-Master.cpp
-Master.h
+  CommandLine/CliRunnable.cpp
+  CommandLine/CliRunnable.h
+  RemoteAccess/RASocket.cpp
+  RemoteAccess/RASocket.h
+  WorldThread/WorldRunnable.cpp
+  WorldThread/WorldRunnable.h
+  Main.cpp
+  Master.cpp
+  Master.h
 )
 
 include_directories(
   ${ACE_INCLUDE_DIR}
+  ${MYSQL_INCLUDE_DIR}
+  ${OPENSSL_INCLUDE_DIR}
   ${CMAKE_BINARY_DIR}
   ${CMAKE_SOURCE_DIR}/externals/sockets/include
   ${CMAKE_SOURCE_DIR}/externals/mersennetwister
@@ -115,56 +117,54 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/src/server/worldserver/CommandLine
   ${CMAKE_SOURCE_DIR}/src/server/worldserver/RemoteAccess
   ${CMAKE_SOURCE_DIR}/src/server/worldserver/WorldThread
-  ${MYSQL_INCLUDE_DIR}
 )
 
 SET(worldserver_LINK_FLAGS "")
 
 add_executable(worldserver ${worldserver_SRCS})
 add_definitions(
--D_TRINITY_CORE_CONFIG='"${CONF_DIR}/worldserver.conf"'
+  -D_TRINITY_CORE_CONFIG='"${CONF_DIR}/worldserver.conf"'
 )
 
 SET(worldserver_LINK_FLAGS "-pthread ${worldserver_LINK_FLAGS}")
 
 IF (CMAKE_SYSTEM_NAME MATCHES "Darwin")
-    SET(worldserver_LINK_FLAGS "-framework Carbon ${worldserver_LINK_FLAGS}")
-    SET(SCRIPT_LIB "")
+  SET(worldserver_LINK_FLAGS "-framework Carbon ${worldserver_LINK_FLAGS}")
+  SET(SCRIPT_LIB "")
 ENDIF (CMAKE_SYSTEM_NAME MATCHES "Darwin")
 
 SET_TARGET_PROPERTIES(worldserver PROPERTIES LINK_FLAGS "${worldserver_LINK_FLAGS}")
 
 if(DO_SCRIPTS)
-    SET(SCRIPT_LIB "scripts")
+  SET(SCRIPT_LIB "scripts")
 else(DO_SCRIPTS)
-    SET(SCRIPT_LIB "")
+  SET(SCRIPT_LIB "")
 endif(DO_SCRIPTS)
 
 target_link_libraries(
-worldserver
-game
-shared
-zlib
-trinitysockets
-trinitydatabase
-trinityauth
-trinityconfig
-collision
-g3dlib
-jemalloc
-${SCRIPT_LIB}
-${READLINE_LIBRARY}
-${TERMCAP_LIBRARY}
-${MYSQL_LIBRARIES}
-${SSLLIB}
-${ACE_LIBRARY}
-${ZLIB} 
-${OSX_LIBS}
+  worldserver
+  game
+  shared
+  zlib
+  trinitysockets
+  trinitydatabase
+  trinityauth
+  trinityconfig
+  collision
+  g3dlib
+  jemalloc
+  ${SCRIPT_LIB}
+  ${READLINE_LIBRARY}
+  ${TERMCAP_LIBRARY}
+  ${ACE_LIBRARY}
+  ${MYSQL_LIBRARY}
+  ${OPENSSL_LIBRARIES}
+  ${ZLIB} 
+  ${OSX_LIBS}
 )
 
 install(TARGETS worldserver DESTINATION bin)
 
-
 ########### install files ###############
 
 install(FILES  worldserver.conf.dist DESTINATION etc)
-- 
cgit v1.2.3


From ec63820f56fe40d47c6ee3343c50dc50d2dac616 Mon Sep 17 00:00:00 2001
From: Xanadu 
Date: Wed, 16 Jun 2010 06:36:35 +0200
Subject: * Fixed extraction tools windows compile and core windows compile for
 32-bit targets. This should do until sufficiently good project files can be
 generated using cmake. * Windows users need to download
 8615_mysql_openssl_libs.zip from the project download page and unpack it to
 /externals.

--HG--
branch : trunk
---
 externals/ace/win/VC90/ace.vcproj                  |  71 +--
 externals/bzip2/win/VC90/bzip2.vcproj              |  18 +-
 externals/g3dlite/win/VC90/g3dlite.vcproj          |  70 +--
 externals/libmpq/win/VC90/libmpq.vcproj            |  19 +-
 externals/sockets/win/VC90/sockets.vcproj          |  50 ++-
 externals/zlib/win/VC90/zlib.vcproj                |  31 +-
 src/tools/ExtractorToolsVC90.sln                   |  48 ++
 src/tools/map_extractor/VC90/VC90_ad.vcproj        |  57 +--
 .../vmap3_assembler/VC90/vmap_assembler.vcproj     |  61 +--
 .../vmap3_extractor/VC90/vmap3_extractor.vcproj    |  38 +-
 src/tools/vmap3_extractor/vmapexport.cpp           |   2 +-
 win/VC90/TrinityCore.vcproj                        |  87 ++--
 win/VC90/TrinityRealm.vcproj                       |  78 ++--
 win/VC90/framework.vcproj                          | 491 ---------------------
 win/VC90/game.vcproj                               | 138 +++---
 win/VC90/genrevision.vcproj                        |  25 +-
 win/VC90/shared.vcproj                             |  72 +--
 17 files changed, 497 insertions(+), 859 deletions(-)
 delete mode 100644 win/VC90/framework.vcproj

(limited to 'src')

diff --git a/externals/ace/win/VC90/ace.vcproj b/externals/ace/win/VC90/ace.vcproj
index 11574ef24b0..35ae4149a81 100644
--- a/externals/ace/win/VC90/ace.vcproj
+++ b/externals/ace/win/VC90/ace.vcproj
@@ -21,8 +21,8 @@
 	
 		
@@ -79,7 +79,7 @@
 			/>
 			
 		
@@ -149,7 +149,7 @@
 				RuntimeLibrary="3"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="WinAcePCH.h"   
+				PrecompiledHeaderThrough="WinAcePCH.h"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
@@ -171,7 +171,7 @@
 			
 		
@@ -239,7 +239,7 @@
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="WinAcePCH.h"   
+				PrecompiledHeaderThrough="WinAcePCH.h"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
 				DisableSpecificWarnings="4355"
@@ -259,7 +259,7 @@
 			/>
 			
 		
@@ -329,7 +329,7 @@
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="WinAcePCH.h"  
+				PrecompiledHeaderThrough="WinAcePCH.h"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
@@ -350,8 +350,9 @@
 			/>
 			
 				
 					
 				
 				
 					
 				
 					
 				
 				
 					
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 				
+					
+				
+				
+					
+				
+				
 					
 				
 				
 					
 			
 			
 			
 		
@@ -47,14 +47,14 @@
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\zlib\;"
 				AdditionalUsingDirectories=""
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
-				AssemblerListingLocation=".\g3dlite__$(PlatformName)_$(ConfigurationName)\"
+				AssemblerListingLocation=""
 				ObjectFile=".\g3dlite__$(PlatformName)_$(ConfigurationName)\"
 				ProgramDataBaseFileName=".\g3dlite__$(PlatformName)_$(ConfigurationName)\"
 				WarningLevel="3"
@@ -73,8 +73,9 @@
 			/>
 			
 			
 		
 		
@@ -113,17 +114,22 @@
 			/>
 			
 			
 			
 			
 		
 		
@@ -182,27 +189,24 @@
 			/>
 			
 			
 			
 			
 			
 		
@@ -264,7 +269,9 @@
 				AdditionalIncludeDirectories="..\..\..\zlib\;"
 				AdditionalUsingDirectories=""
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_SECURE_SCL=0"
+				StringPooling="true"
 				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
 				EnableEnhancedInstructionSet="0"
 				UsePrecompiledHeader="0"
 				AssemblerListingLocation=".\g3dlite__$(PlatformName)_$(ConfigurationName)\"
@@ -286,8 +293,9 @@
 			/>
 			
 			
 			
 			
 			
 			
 		
@@ -46,7 +46,7 @@
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
+				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="true"
@@ -69,6 +69,7 @@
 			/>
 			
 			
 		
 		
@@ -108,14 +109,17 @@
 			/>
 			
 			
 			
 			
 		
 		
@@ -174,17 +179,14 @@
 			/>
 			
 			
 			
 			
 		
@@ -250,7 +253,9 @@
 				AdditionalOptions="/MP"
 				AdditionalIncludeDirectories="..\..\include;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
+				StringPooling="true"
 				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
 				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
@@ -271,6 +276,7 @@
 			/>
 			
 			
 		
@@ -46,7 +46,7 @@
 				Optimization="0"
 				AdditionalIncludeDirectories=""
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
+				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="true"
@@ -89,8 +89,8 @@
 		
 		
@@ -115,7 +115,7 @@
 				Optimization="0"
 				AdditionalIncludeDirectories=""
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
+				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="true"
@@ -158,8 +158,8 @@
 		
 		
@@ -182,15 +182,17 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
+				StringPooling="true"
 				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
 				EnableEnhancedInstructionSet="1"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\zlib__$(PlatformName)_$(ConfigurationName)\zlib.pch"
+				PrecompiledHeaderFile=""
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
+				DebugInformationFormat="0"
 				CallingConvention="0"
 			/>
 			
 			
 		
@@ -250,7 +253,9 @@
 				AdditionalOptions="/MP"
 				AdditionalIncludeDirectories=""
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
+				StringPooling="true"
 				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
 				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
diff --git a/src/tools/ExtractorToolsVC90.sln b/src/tools/ExtractorToolsVC90.sln
index 6a31b5a1ddf..5887925dcf1 100644
--- a/src/tools/ExtractorToolsVC90.sln
+++ b/src/tools/ExtractorToolsVC90.sln
@@ -2,10 +2,36 @@
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ad", "map_extractor\VC90\VC90_ad.vcproj", "{D7552D4F-408F-4F8E-859B-366659150CF4}"
+	ProjectSection(ProjectDependencies) = postProject
+		{03AB0F44-628E-4855-99A0-C98A1EB52C50} = {03AB0F44-628E-4855-99A0-C98A1EB52C50}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vmap_assembler", "vmap3_assembler\VC90\vmap_assembler.vcproj", "{572FFF74-480C-4472-8ABF-81733BB4049D}"
+	ProjectSection(ProjectDependencies) = postProject
+		{8072769E-CF10-48BF-B9E1-12752A5DAC6E} = {8072769E-CF10-48BF-B9E1-12752A5DAC6E}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vmap3_extractor", "vmap3_extractor\VC90\vmap3_extractor.vcproj", "{502602CC-98EA-4335-B922-C5C1DBF37604}"
+	ProjectSection(ProjectDependencies) = postProject
+		{03AB0F44-628E-4855-99A0-C98A1EB52C50} = {03AB0F44-628E-4855-99A0-C98A1EB52C50}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmpq", "..\..\externals\libmpq\win\VC90\libmpq.vcproj", "{03AB0F44-628E-4855-99A0-C98A1EB52C50}"
+	ProjectSection(ProjectDependencies) = postProject
+		{CE773400-763E-4B71-B5E2-C9B60A752EB1} = {CE773400-763E-4B71-B5E2-C9B60A752EB1}
+		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} = {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bzip2", "..\..\externals\bzip2\win\VC90\bzip2.vcproj", "{CE773400-763E-4B71-B5E2-C9B60A752EB1}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\externals\zlib\win\VC90\zlib.vcproj", "{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g3dlite", "..\..\externals\g3dlite\win\VC90\g3dlite.vcproj", "{8072769E-CF10-48BF-B9E1-12752A5DAC6E}"
+	ProjectSection(ProjectDependencies) = postProject
+		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} = {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dependencies", "Dependencies", "{69F789A6-BD04-454A-AC8E-A57AAE7FCF77}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -25,8 +51,30 @@ Global
 		{502602CC-98EA-4335-B922-C5C1DBF37604}.Debug|Win32.Build.0 = Debug|Win32
 		{502602CC-98EA-4335-B922-C5C1DBF37604}.Release|Win32.ActiveCfg = Release|Win32
 		{502602CC-98EA-4335-B922-C5C1DBF37604}.Release|Win32.Build.0 = Release|Win32
+		{03AB0F44-628E-4855-99A0-C98A1EB52C50}.Debug|Win32.ActiveCfg = Debug|Win32
+		{03AB0F44-628E-4855-99A0-C98A1EB52C50}.Debug|Win32.Build.0 = Debug|Win32
+		{03AB0F44-628E-4855-99A0-C98A1EB52C50}.Release|Win32.ActiveCfg = Release|Win32
+		{03AB0F44-628E-4855-99A0-C98A1EB52C50}.Release|Win32.Build.0 = Release|Win32
+		{CE773400-763E-4B71-B5E2-C9B60A752EB1}.Debug|Win32.ActiveCfg = Debug|Win32
+		{CE773400-763E-4B71-B5E2-C9B60A752EB1}.Debug|Win32.Build.0 = Debug|Win32
+		{CE773400-763E-4B71-B5E2-C9B60A752EB1}.Release|Win32.ActiveCfg = Release|Win32
+		{CE773400-763E-4B71-B5E2-C9B60A752EB1}.Release|Win32.Build.0 = Release|Win32
+		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.Build.0 = Debug|Win32
+		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.ActiveCfg = Release|Win32
+		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.Build.0 = Release|Win32
+		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|Win32.Build.0 = Debug|Win32
+		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|Win32.ActiveCfg = Release|Win32
+		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{CE773400-763E-4B71-B5E2-C9B60A752EB1} = {69F789A6-BD04-454A-AC8E-A57AAE7FCF77}
+		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} = {69F789A6-BD04-454A-AC8E-A57AAE7FCF77}
+		{8072769E-CF10-48BF-B9E1-12752A5DAC6E} = {69F789A6-BD04-454A-AC8E-A57AAE7FCF77}
+		{03AB0F44-628E-4855-99A0-C98A1EB52C50} = {69F789A6-BD04-454A-AC8E-A57AAE7FCF77}
+	EndGlobalSection
 EndGlobal
diff --git a/src/tools/map_extractor/VC90/VC90_ad.vcproj b/src/tools/map_extractor/VC90/VC90_ad.vcproj
index 83480dd3912..e875137556c 100644
--- a/src/tools/map_extractor/VC90/VC90_ad.vcproj
+++ b/src/tools/map_extractor/VC90/VC90_ad.vcproj
@@ -17,8 +17,8 @@
 	
 		
 			
 			
 		
 			
 			
 			
 			
 			
 			
 			
 			
-			
-			
 			
-				
-				
-				
-				
 				
@@ -248,18 +237,6 @@
 					>
 				
 			
-			
-				
-				
-				
-				
-			
 		
 	
 	
diff --git a/src/tools/vmap3_extractor/VC90/vmap3_extractor.vcproj b/src/tools/vmap3_extractor/VC90/vmap3_extractor.vcproj
index 3e0000b6249..34665937c9a 100644
--- a/src/tools/vmap3_extractor/VC90/vmap3_extractor.vcproj
+++ b/src/tools/vmap3_extractor/VC90/vmap3_extractor.vcproj
@@ -18,8 +18,8 @@
 	
 		
@@ -43,12 +43,13 @@
 				Optimization="0"
 				AdditionalIncludeDirectories="..\;..\..\..\..\externals\libmpq;..\..\..\..\externals\libmpq\win"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
+				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
+				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				DebugInformationFormat="4"
+				DebugInformationFormat="3"
 			/>
 			
 			
 			
 		
 			
 			
 			
 			
 		
 			
 			
 		
 		
 			
 			
 			
 			
 			
 			
 			
 		
 		
 			
 			
 			
 			
 			
 			
 			
 		
 		
 			
 			
 		
 	
diff --git a/win/VC90/TrinityRealm.vcproj b/win/VC90/TrinityRealm.vcproj
index e8b8d9f5183..a18082e70ef 100644
--- a/win/VC90/TrinityRealm.vcproj
+++ b/win/VC90/TrinityRealm.vcproj
@@ -21,8 +21,8 @@
 	
 		
 			
 		
 		
 			
 			
 			
 			
 			
 			
 			
 		
 		
 			
 			
 			
 			
 			
 			
 			
 		
 		
 			
 			
 		
 	
diff --git a/win/VC90/framework.vcproj b/win/VC90/framework.vcproj
deleted file mode 100644
index 4cf74a17a1e..00000000000
--- a/win/VC90/framework.vcproj
+++ /dev/null
@@ -1,491 +0,0 @@
-
-
-	
-		
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-				
-				
-				
-				
-				
-				
-			
-			
-				
-				
-				
-				
-			
-		
-		
-			
-			
-			
-			
-		
-		
-			
-			
-		
-	
-	
-	
-
diff --git a/win/VC90/game.vcproj b/win/VC90/game.vcproj
index 14834618e5e..af57afc95a8 100644
--- a/win/VC90/game.vcproj
+++ b/win/VC90/game.vcproj
@@ -22,8 +22,8 @@
 	
 		
 			
 			
 		
 		
 			
 			
 			
 			
 			
 			
 			
 		
 		
 			
 			
 			
 			
 			
 			
 			
 		
 			
 			
 			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+				
+					
+				
 			
 			
 				
 				
 					
 				
 				
 					
 				
 				
 				
 			
diff --git a/win/VC90/genrevision.vcproj b/win/VC90/genrevision.vcproj
index 6684660319b..13eda318a32 100644
--- a/win/VC90/genrevision.vcproj
+++ b/win/VC90/genrevision.vcproj
@@ -21,8 +21,8 @@
 	
 		
@@ -45,9 +45,10 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
+				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
+				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
@@ -93,8 +94,8 @@
 		
 		
@@ -118,9 +119,10 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
+				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
+				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
@@ -166,8 +168,8 @@
 		
 		
 		
 		
 			
@@ -101,9 +102,9 @@
 			/>
 		
 		
 			
 			
 			
 			
 			
@@ -181,9 +185,9 @@
 			/>
 		
 		
 			
 			
 			
 			
 			
@@ -265,8 +267,8 @@
 		
 		
 			
@@ -732,23 +734,23 @@
 				/>
 			
 			
 				
 			
 			
 				
-- 
cgit v1.2.3


From 3be48fe4fc11fdaf0cfa6974811d368adab7c74f Mon Sep 17 00:00:00 2001
From: Shauren 
Date: Wed, 16 Jun 2010 19:36:50 +0200
Subject: Fixed old no-fly zone code to use area flags instead of hardcoded
 area ids (this fixes flying in Wintergrasp) This does NOT implement no-fly
 zones!

--HG--
branch : trunk
---
 src/server/game/Spells/Auras/SpellAuraEffects.cpp | 7 -------
 src/server/game/Spells/Spell.cpp                  | 6 +++---
 src/server/game/Spells/SpellMgr.cpp               | 8 +++++++-
 3 files changed, 10 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
index 6a3e52d9646..9256228ad18 100644
--- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
@@ -1811,13 +1811,6 @@ void AuraEffect::PeriodicDummyTick(Unit * target, Unit * caster) const
                 else
                     target->RemoveAurasDueToSpell(58670);
                 break;
-            case 58600: // No fly Zone - Dalaran
-                if (GetTickNumber() == 10)
-                {
-                    target->RemoveAurasByType(SPELL_AURA_MOD_INCREASE_MOUNTED_FLIGHT_SPEED);
-                    target->RemoveAurasByType(SPELL_AURA_FLY);
-                }
-                break;
             case 62292: // Blaze (Pool of Tar)
                 // should we use custom damage?
                 target->CastSpell((Unit*)NULL, m_spellProto->EffectTriggerSpell[m_effIndex], true);
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
index f5c105fa9bf..81b3cde5a53 100644
--- a/src/server/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
@@ -5357,9 +5357,9 @@ SpellCastResult Spell::CheckCast(bool strict)
                 // allow always ghost flight spells
                 if (m_originalCaster && m_originalCaster->GetTypeId() == TYPEID_PLAYER && m_originalCaster->isAlive())
                 {
-                    // 4197 = Wintergrasp || 4395 = Dalaran && 4564 = Krasus Landing
-                    if (m_originalCaster->GetZoneId() == 4197 || m_originalCaster->GetZoneId() == 4395 && m_originalCaster->GetAreaId() != 4564)
-                        return m_IsTriggeredSpell ? SPELL_FAILED_DONT_REPORT : SPELL_FAILED_NOT_HERE;
+                    if (AreaTableEntry *const pArea = GetAreaEntryByAreaID(m_originalCaster->GetAreaId()))
+                        if (pArea->flags & AREA_FLAG_NO_FLY_ZONE)
+                            return m_IsTriggeredSpell ? SPELL_FAILED_DONT_REPORT : SPELL_FAILED_NOT_HERE;
                 }
                 break;
             }
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp
index 510fdccb98a..f98c3904bb4 100644
--- a/src/server/game/Spells/SpellMgr.cpp
+++ b/src/server/game/Spells/SpellMgr.cpp
@@ -2974,7 +2974,13 @@ bool SpellArea::IsFitToRequirements(Player const* player, uint32 newZone, uint32
     switch(spellId)
     {
         case 58600: // No fly Zone - Dalaran (Krasus Landing exception)
-            if (!player || player->GetAreaId() == 4564 || !player->HasAuraType(SPELL_AURA_MOD_INCREASE_MOUNTED_FLIGHT_SPEED) && !player->HasAuraType(SPELL_AURA_FLY) || player->HasAura(44795))
+            if (!player)
+                return false;
+
+            AreaTableEntry *const pArea = GetAreaEntryByAreaID(player->GetAreaId());
+            if (!(pArea && pArea->flags & AREA_FLAG_NO_FLY_ZONE))
+                return false;
+            if (!player->HasAuraType(SPELL_AURA_MOD_INCREASE_MOUNTED_FLIGHT_SPEED) && !player->HasAuraType(SPELL_AURA_FLY) || player->HasAura(44795))
                 return false;
             break;
     }
-- 
cgit v1.2.3


From 9b2d3b0a718315b250235a33038ba0c5603e5b45 Mon Sep 17 00:00:00 2001
From: Shauren 
Date: Wed, 16 Jun 2010 19:58:40 +0200
Subject: Fixed typo

--HG--
branch : trunk
---
 src/server/game/Spells/Spell.cpp    | 2 +-
 src/server/game/Spells/SpellMgr.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
index 81b3cde5a53..26546a39df3 100644
--- a/src/server/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
@@ -5357,7 +5357,7 @@ SpellCastResult Spell::CheckCast(bool strict)
                 // allow always ghost flight spells
                 if (m_originalCaster && m_originalCaster->GetTypeId() == TYPEID_PLAYER && m_originalCaster->isAlive())
                 {
-                    if (AreaTableEntry *const pArea = GetAreaEntryByAreaID(m_originalCaster->GetAreaId()))
+                    if (AreaTableEntry const* pArea = GetAreaEntryByAreaID(m_originalCaster->GetAreaId()))
                         if (pArea->flags & AREA_FLAG_NO_FLY_ZONE)
                             return m_IsTriggeredSpell ? SPELL_FAILED_DONT_REPORT : SPELL_FAILED_NOT_HERE;
                 }
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp
index f98c3904bb4..ee59e2821af 100644
--- a/src/server/game/Spells/SpellMgr.cpp
+++ b/src/server/game/Spells/SpellMgr.cpp
@@ -2977,7 +2977,7 @@ bool SpellArea::IsFitToRequirements(Player const* player, uint32 newZone, uint32
             if (!player)
                 return false;
 
-            AreaTableEntry *const pArea = GetAreaEntryByAreaID(player->GetAreaId());
+            AreaTableEntry const* pArea = GetAreaEntryByAreaID(player->GetAreaId());
             if (!(pArea && pArea->flags & AREA_FLAG_NO_FLY_ZONE))
                 return false;
             if (!player->HasAuraType(SPELL_AURA_MOD_INCREASE_MOUNTED_FLIGHT_SPEED) && !player->HasAuraType(SPELL_AURA_FLY) || player->HasAura(44795))
-- 
cgit v1.2.3


From d65690ad382754ba09eee2c6711829cdcc29e9a6 Mon Sep 17 00:00:00 2001
From: Shauren 
Date: Wed, 16 Jun 2010 20:03:21 +0200
Subject: Fixed wrong string format in HandleNpcUnFollowCommand

--HG--
branch : trunk
---
 src/server/game/Chat/Commands/Level2.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Chat/Commands/Level2.cpp b/src/server/game/Chat/Commands/Level2.cpp
index 85c5ef739fd..5d67ec06660 100644
--- a/src/server/game/Chat/Commands/Level2.cpp
+++ b/src/server/game/Chat/Commands/Level2.cpp
@@ -1672,7 +1672,7 @@ bool ChatHandler::HandleNpcUnFollowCommand(const char* /*args*/)
     if (/*creature->GetMotionMaster()->empty() ||*/
         creature->GetMotionMaster()->GetCurrentMovementGeneratorType () != TARGETED_MOTION_TYPE)
     {
-        PSendSysMessage(LANG_CREATURE_NOT_FOLLOW_YOU);
+        PSendSysMessage(LANG_CREATURE_NOT_FOLLOW_YOU, creature->GetName());
         SetSentErrorMessage(true);
         return false;
     }
@@ -1682,7 +1682,7 @@ bool ChatHandler::HandleNpcUnFollowCommand(const char* /*args*/)
 
     if (mgen->GetTarget() != player)
     {
-        PSendSysMessage(LANG_CREATURE_NOT_FOLLOW_YOU);
+        PSendSysMessage(LANG_CREATURE_NOT_FOLLOW_YOU, creature->GetName());
         SetSentErrorMessage(true);
         return false;
     }
-- 
cgit v1.2.3


From d976299dc3baf9ecab7ce45fae32c31e997533ba Mon Sep 17 00:00:00 2001
From: Shauren 
Date: Wed, 16 Jun 2010 20:10:42 +0200
Subject: Fixed spells with EffectCreateItem2 that do not have EffectItemType
 set in dbc and should pick it from spell_loot_template table (like 69412
 Abyssal Shatter)

--HG--
branch : trunk
---
 src/server/game/Spells/Auras/SpellEffects.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/game/Spells/Auras/SpellEffects.cpp b/src/server/game/Spells/Auras/SpellEffects.cpp
index ef046531f10..4fa56f80893 100644
--- a/src/server/game/Spells/Auras/SpellEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellEffects.cpp
@@ -3138,7 +3138,9 @@ void Spell::EffectCreateItem2(uint32 i)
 
             // create some random items
             player->AutoStoreLoot(m_spellInfo->Id, LootTemplates_Spell);
-         }
+        }
+        else
+            player->AutoStoreLoot(m_spellInfo->Id, LootTemplates_Spell);    // create some random items
     }
 }
 
-- 
cgit v1.2.3


From 90fceb18ac40636c88e853770fb7c963744cbcd2 Mon Sep 17 00:00:00 2001
From: Shauren 
Date: Wed, 16 Jun 2010 20:59:15 +0200
Subject: Fixed spell 64142 (Upper Deck - Create Foam Sword)

--HG--
branch : trunk
---
 src/server/game/Spells/Auras/SpellEffects.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'src')

diff --git a/src/server/game/Spells/Auras/SpellEffects.cpp b/src/server/game/Spells/Auras/SpellEffects.cpp
index 4fa56f80893..892162d7689 100644
--- a/src/server/game/Spells/Auras/SpellEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellEffects.cpp
@@ -5985,6 +5985,17 @@ void Spell::EffectScriptEffect(uint32 effIndex)
                     unitTarget->CastSpell(unitTarget, spellTarget[urand(0,4)], true);
                     break;
                 }
+                case 64142:                                 // Upper Deck - Create Foam Sword
+                    if (unitTarget->GetTypeId() != TYPEID_PLAYER)
+                        return;
+                    Player *plr = unitTarget->ToPlayer();
+                    static uint32 const itemId[] = {45061, 45176, 45177, 45178, 45179, 0};
+                    // player can only have one of these items
+                    for (uint32 *itr = &itemId[0]; *itr; ++itr)
+                        if (plr->HasItemCount(*itr, 1, true))
+                            return;
+                    DoCreateItem(effIndex, itemId[urand(0,4)]);
+                    return;
             }
             break;
         }
-- 
cgit v1.2.3


From a71d549bc3c7df93d297e40d466fa5a70c8f51f5 Mon Sep 17 00:00:00 2001
From: Shauren 
Date: Wed, 16 Jun 2010 21:32:34 +0200
Subject: Fixed compile

i swear, i need more beer

--HG--
branch : trunk
---
 src/server/game/Spells/Auras/SpellEffects.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/game/Spells/Auras/SpellEffects.cpp b/src/server/game/Spells/Auras/SpellEffects.cpp
index 892162d7689..f765acb1f2a 100644
--- a/src/server/game/Spells/Auras/SpellEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellEffects.cpp
@@ -5991,7 +5991,7 @@ void Spell::EffectScriptEffect(uint32 effIndex)
                     Player *plr = unitTarget->ToPlayer();
                     static uint32 const itemId[] = {45061, 45176, 45177, 45178, 45179, 0};
                     // player can only have one of these items
-                    for (uint32 *itr = &itemId[0]; *itr; ++itr)
+                    for (uint32 const *itr = &itemId[0]; *itr; ++itr)
                         if (plr->HasItemCount(*itr, 1, true))
                             return;
                     DoCreateItem(effIndex, itemId[urand(0,4)]);
-- 
cgit v1.2.3


From 5238320af0cad3438dcc532ef79d118b922a3219 Mon Sep 17 00:00:00 2001
From: Xanadu 
Date: Thu, 17 Jun 2010 05:37:37 +0200
Subject: Fixed pool system I broke in 52fac32a0b35, added a check for child
 pools and rearranged primary keys to prevent inclusion of single creature/GO
 spawn in multiple pools.

--HG--
branch : trunk
---
 sql/updates/8625_world_pool_creature.sql   |  1 +
 sql/updates/8625_world_pool_gameobject.sql |  1 +
 sql/updates/8625_world_pool_pool.sql       |  1 +
 src/server/game/Pools/PoolHandler.cpp      | 25 +++++++++++++++++--------
 4 files changed, 20 insertions(+), 8 deletions(-)
 create mode 100644 sql/updates/8625_world_pool_creature.sql
 create mode 100644 sql/updates/8625_world_pool_gameobject.sql
 create mode 100644 sql/updates/8625_world_pool_pool.sql

(limited to 'src')

diff --git a/sql/updates/8625_world_pool_creature.sql b/sql/updates/8625_world_pool_creature.sql
new file mode 100644
index 00000000000..ade35efe138
--- /dev/null
+++ b/sql/updates/8625_world_pool_creature.sql
@@ -0,0 +1 @@
+ALTER TABLE `pool_creature` DROP PRIMARY KEY, ADD PRIMARY KEY (`guid`);
diff --git a/sql/updates/8625_world_pool_gameobject.sql b/sql/updates/8625_world_pool_gameobject.sql
new file mode 100644
index 00000000000..720fbb76a0c
--- /dev/null
+++ b/sql/updates/8625_world_pool_gameobject.sql
@@ -0,0 +1 @@
+ALTER TABLE `pool_gameobject` DROP PRIMARY KEY, ADD PRIMARY KEY (`guid`);
diff --git a/sql/updates/8625_world_pool_pool.sql b/sql/updates/8625_world_pool_pool.sql
new file mode 100644
index 00000000000..1c8b9f3db8e
--- /dev/null
+++ b/sql/updates/8625_world_pool_pool.sql
@@ -0,0 +1 @@
+ALTER TABLE `pool_pool` DROP PRIMARY KEY, ADD PRIMARY KEY (`pool_id`);
diff --git a/src/server/game/Pools/PoolHandler.cpp b/src/server/game/Pools/PoolHandler.cpp
index de29d59d628..731d71c6b19 100644
--- a/src/server/game/Pools/PoolHandler.cpp
+++ b/src/server/game/Pools/PoolHandler.cpp
@@ -121,10 +121,7 @@ void PoolGroup::AddEntry(PoolObject& poolitem, uint32 maxentries)
 template 
 bool PoolGroup::CheckPool() const
 {
-    if (EqualChanced.size() && ExplicitlyChanced.size())
-        return false;
-
-    if (ExplicitlyChanced.size())
+    if (!EqualChanced.size())
     {
         float chance = 0;
         for (uint32 i = 0; i < ExplicitlyChanced.size(); ++i)
@@ -662,7 +659,7 @@ void PoolHandler::LoadFromDB()
 // The initialize method will spawn all pools not in an event and not in another pool, this is why there is 2 left joins with 2 null checks
 void PoolHandler::Initialize()
 {
-    QueryResult_AutoPtr result = WorldDatabase.Query("SELECT DISTINCT pool_template.entry FROM pool_template LEFT JOIN game_event_pool ON pool_template.entry=game_event_pool.pool_entry LEFT JOIN pool_pool ON pool_template.entry=pool_pool.pool_id WHERE game_event_pool.pool_entry IS NULL AND pool_pool.pool_id IS NULL");
+    QueryResult_AutoPtr result = WorldDatabase.Query("SELECT DISTINCT pool_template.entry, pool_pool.pool_id, pool_pool.mother_pool FROM pool_template LEFT JOIN game_event_pool ON pool_template.entry=game_event_pool.pool_entry LEFT JOIN pool_pool ON pool_template.entry=pool_pool.pool_id WHERE game_event_pool.pool_entry IS NULL");
     uint32 count=0;
     if (result)
     {
@@ -670,13 +667,25 @@ void PoolHandler::Initialize()
         {
             Field *fields = result->Fetch();
             uint16 pool_entry = fields[0].GetUInt16();
+            uint16 pool_pool_id = fields[1].GetUInt16();
+
             if (!CheckPool(pool_entry))
             {
-                sLog.outErrorDb("Pool Id (%u) has all creatures or gameobjects with explicit chance sum <>100 and no equal chance defined. The pool system cannot pick one to spawn.", pool_entry);
+                if (pool_pool_id)
+                    // The pool is a child pool in pool_pool table. Ideally we should remove it from the pool handler to ensure it never gets spawned,
+                    // however that could recursively invalidate entire chain of mother pools. It can be done in the future but for now we'll do nothing.
+                    sLog.outErrorDb("Pool Id %u has no equal chance pooled entites defined and explicit chance sum is not 100. This broken pool is a child pool of Id %u and cannot be safely removed.", pool_entry, fields[2].GetUInt16());
+                else
+                    sLog.outErrorDb("Pool Id %u has no equal chance pooled entites defined and explicit chance sum is not 100. The pool will not be spawned.", pool_entry);
                 continue;
             }
-            SpawnPool(pool_entry);;
-            count++;
+
+            // Don't spawn child pools, they are spawned recursively by their parent pools
+            if (!pool_pool_id)
+            {
+                SpawnPool(pool_entry);;
+                count++;
+            }
         } while (result->NextRow());
     }
 
-- 
cgit v1.2.3


From aa74cac7cb8ea5a6c42aaeaef33f8f319b1ad51b Mon Sep 17 00:00:00 2001
From: click 
Date: Thu, 17 Jun 2010 20:38:46 +0200
Subject: Add plane/finitecheck tests for OOB intersection-vectors (this should
 fix vmap-related freezes) - patch by Gyullo

--HG--
branch : trunk
---
 src/server/collision/Maps/MapTree.cpp | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/server/collision/Maps/MapTree.cpp b/src/server/collision/Maps/MapTree.cpp
index af4073fcc8c..4879cc963db 100644
--- a/src/server/collision/Maps/MapTree.cpp
+++ b/src/server/collision/Maps/MapTree.cpp
@@ -146,19 +146,32 @@ namespace VMAP
 
     bool StaticMapTree::isInLineOfSight(const Vector3& pos1, const Vector3& pos2) const
     {
-        bool result = true;
+        bool result = false;
         float maxDist = (pos2 - pos1).magnitude();
         // valid map coords should *never ever* produce float overflow, but this would produce NaNs too
-        ASSERT(maxDist < std::numeric_limits::max());
+
+        //ASSERT(maxDist < std::numeric_limits::max());
+
         // prevent NaN values which can cause BIH intersection to enter infinite loop
         if (maxDist < 1e-10f)
             return true;
         // direction with length of 1
+        G3D::Plane checkPlane = G3D::Plane(pos1, pos2, (pos2 - pos1));
         G3D::Ray ray = G3D::Ray::fromOriginAndDirection(pos1, (pos2 - pos1)/maxDist);
-        float resultDist = getIntersectionTime(ray, maxDist, true);
-        if (resultDist < maxDist)
+
+        Vector3 checkFinite = ray.intersection(checkPlane);
+        if (!checkFinite.isFinite())
         {
-            result = false;
+            ray = G3D::Ray::fromOriginAndDirection(pos1, -((pos2 - pos1)/maxDist));
+            checkFinite = ray.intersection(checkPlane);
+        }
+        if (checkFinite.isFinite())
+        {
+            float resultDist = getIntersectionTime(ray, maxDist, true);
+            if (resultDist >= maxDist)
+            {
+               result = true;
+            }
         }
         return result;
     }
-- 
cgit v1.2.3


From 7fe641c99e2eb17a2f4c10d1eb61debc7dfe72ef Mon Sep 17 00:00:00 2001
From: click 
Date: Thu, 17 Jun 2010 22:28:16 +0200
Subject: Fix a small "typo" regarding the calculation of LoS from the
 r9b1c565510 vmap-fix - fix by Gyullo, after being busy slapping himself for
 the mistake

--HG--
branch : trunk
---
 src/server/collision/Maps/MapTree.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/collision/Maps/MapTree.cpp b/src/server/collision/Maps/MapTree.cpp
index 4879cc963db..c733ed37454 100644
--- a/src/server/collision/Maps/MapTree.cpp
+++ b/src/server/collision/Maps/MapTree.cpp
@@ -156,7 +156,7 @@ namespace VMAP
         if (maxDist < 1e-10f)
             return true;
         // direction with length of 1
-        G3D::Plane checkPlane = G3D::Plane(pos1, pos2, (pos2 - pos1));
+	G3D::Plane checkPlane = G3D::Plane((pos2 - pos1)/maxDist,pos1, pos2);
         G3D::Ray ray = G3D::Ray::fromOriginAndDirection(pos1, (pos2 - pos1)/maxDist);
 
         Vector3 checkFinite = ray.intersection(checkPlane);
-- 
cgit v1.2.3


From c2cdc9994e489b8332fa0f167dd0141c167ef090 Mon Sep 17 00:00:00 2001
From: Xanadu 
Date: Fri, 18 Jun 2010 04:17:21 +0200
Subject: Reviewed and fixed smart heal and energize target selection: *
 Implemented Divine Hymn and Hymn of Hope targeting. Closes issue #180. Closes
 issue #2538. * Fixed CoH healing any monsters in your target. * Removed
 obsolete hackfix of Wild Growth that attempted the above. * Fixed Glyph of
 Holy Light target selection that had code in a wrong place. * Removed too
 general check that gave smart targeting to spells that shouldn't have it. *
 Implemented correct number of targets for Althor's Abacus heal proc.

--HG--
branch : trunk
---
 src/server/game/Spells/Spell.cpp | 172 +++++++++++++++++++++++----------------
 win/VC90/game.vcproj             |   8 +-
 2 files changed, 104 insertions(+), 76 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
index 26546a39df3..e7901de1a2d 100644
--- a/src/server/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
@@ -1989,7 +1989,6 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur)
             if (cur == TARGET_DST_TARGET_ENEMY || cur == TARGET_DEST_TARGET_ANY)
             {
                 m_targets.setDst(target);
-                AddUnitTarget(target, i);
                 break;
             }
 
@@ -2018,9 +2017,6 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur)
             Position pos;
             target->GetNearPosition(pos, dist, angle);
             m_targets.setDst(&pos);
-            // Teleports use this as destination
-            if (m_spellInfo->Effect[i] != SPELL_EFFECT_TELEPORT_UNITS)
-                AddUnitTarget(target, i);
             break;
         }
 
@@ -2416,6 +2412,106 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur)
 
         if (!unitList.empty())
         {
+            // Special target selection for smart heals and energizes
+            uint32 maxSize = 0;
+            int32 power = -1;
+            switch (m_spellInfo->SpellFamilyName)
+            {
+                case SPELLFAMILY_GENERIC:
+                    switch (m_spellInfo->Id)
+                    {
+                        case 52759: // Ancestral Awakening
+                        case 71610: // Echoes of Light (Althor's Abacus normal version)
+                        case 71641: // Echoes of Light (Althor's Abacus heroic version)
+                            maxSize = 1;
+                            power = POWER_HEALTH;
+                            break;
+                        case 54968: // Glyph of Holy Light
+                            maxSize = m_spellInfo->MaxAffectedTargets;
+                            power = POWER_HEALTH;
+                            break;
+                        case 57669: // Replenishment
+                            maxSize = 10;
+                            power = POWER_MANA;
+                            break;
+                        default:
+                            break;
+                    }
+                    break;
+                case SPELLFAMILY_PRIEST:
+                    if (m_spellInfo->SpellFamilyFlags[0] == 0x10000000) // Circle of Healing
+                    {
+                        maxSize = m_caster->HasAura(55675) ? 6 : 5; // Glyph of Circle of Healing
+                        power = POWER_HEALTH;
+                    }
+                    else if (m_spellInfo->Id == 64844) // Divine Hymn
+                    {
+                        maxSize = 3;
+                        power = POWER_HEALTH;
+                    }
+                    else if (m_spellInfo->Id == 64904) // Hymn of Hope
+                    {
+                        maxSize = 3;
+                        power = POWER_MANA;
+                    }
+
+                    // Remove targets outside caster's raid
+                    for (std::list::iterator itr = unitList.begin() ; itr != unitList.end();)
+                    {
+                        if (!(*itr)->IsInRaidWith(m_caster))
+                            itr = unitList.erase(itr);
+                        else
+                            ++itr;
+                    }
+                    break;
+                case SPELLFAMILY_DRUID:
+                    if (m_spellInfo->SpellFamilyFlags[1] == 0x04000000) // Wild Growth
+                    {
+                        maxSize = m_caster->HasAura(62970) ? 6 : 5; // Glyph of Wild Growth
+                        power = POWER_HEALTH;
+                    }
+
+                    // Remove targets outside caster's raid
+                    for (std::list::iterator itr = unitList.begin() ; itr != unitList.end();)
+                    {
+                        if (!(*itr)->IsInRaidWith(m_caster))
+                            itr = unitList.erase(itr);
+                        else
+                            ++itr;
+                    }
+                    break;
+                default:
+                    break;
+            }
+
+            if (maxSize && power != -1)
+            {
+                if (power == POWER_HEALTH)
+                {
+                    if (unitList.size() > maxSize)
+                    {
+                        unitList.sort(Trinity::HealthPctOrderPred());
+                        unitList.resize(maxSize);
+                    }
+                }
+                else
+                {
+                    for (std::list::iterator itr = unitList.begin() ; itr != unitList.end();)
+                    {
+                        if ((*itr)->getPowerType() != (Powers)power)
+                            itr = unitList.erase(itr);
+                        else
+                            ++itr;
+                    }
+                    if (unitList.size() > maxSize)
+                    {
+                        unitList.sort(Trinity::PowerPctOrderPred((Powers)power));
+                        unitList.resize(maxSize);
+                    }
+                }
+            }
+            
+            // Other special target selection goes here
             if (uint32 maxTargets = m_spellValue->MaxAffectedTargets)
             {
                 Unit::AuraEffectList const& Auras = m_caster->GetAuraEffectsByType(SPELL_AURA_MOD_MAX_AFFECTED_TARGETS);
@@ -2438,56 +2534,6 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur)
                     case 59725: // Improved Spell Reflection - aoe aura
                         unitList.remove(m_caster);
                         break;
-                    case 57669: //Replenishment (special target selection) 10 targets with lowest mana
-                    {
-                        for (std::list::iterator itr = unitList.begin() ; itr != unitList.end();)
-                        {
-                            if ((*itr)->getPowerType() != POWER_MANA)
-                                itr = unitList.erase(itr);
-                            else
-                                ++itr;
-                        }
-                        if (unitList.size() > 10)
-                        {
-                            unitList.sort(Trinity::PowerPctOrderPred(POWER_MANA));
-                            unitList.resize(10);
-                        }
-                        break;
-                    }
-                    case 52759: // Ancestral Awakening
-                    {
-                        if (unitList.size() > 1)
-                        {
-                            unitList.sort(Trinity::HealthPctOrderPred());
-                            unitList.resize(1);
-                        }
-                        break;
-                    }
-                }
-                if (m_spellInfo->EffectImplicitTargetA[i] == TARGET_DEST_TARGET_ANY
-                    && m_spellInfo->EffectImplicitTargetB[i] == TARGET_UNIT_AREA_ALLY_DST)// Wild Growth, Circle of Healing, Glyph of holy light target special selection
-                {
-                    for (std::list::iterator itr = unitList.begin() ; itr != unitList.end();)
-                    {
-                        if (!(*itr)->IsInRaidWith(m_targets.getUnitTarget()))
-                            itr = unitList.erase(itr);
-                        else
-                            ++itr;
-                    }
-                    
-                    uint32 maxsize = 5;
-
-                    if (m_spellInfo->SpellFamilyName == SPELLFAMILY_DRUID && m_spellInfo->SpellFamilyFlags[1] & 0x04000000) // Wild Growth
-                        maxsize += m_caster->HasAura(62970) ? 1 : 0; // Glyph of Wild Growth
-
-                    if (m_spellInfo->SpellFamilyName == SPELLFAMILY_PRIEST && m_spellInfo->SpellFamilyFlags[0] & 0x10000000 && m_spellInfo->SpellIconID == 2214) // Circle of Healing
-                        maxsize += m_caster->HasAura(55675) ? 1 : 0; // Glyph of Circle of Healing
-                                    
-                    if (unitList.size() > maxsize)
-                    {
-                        unitList.sort(Trinity::HealthPctOrderPred());
-                        unitList.resize(maxsize);
-                    }
                 }
                 // Death Pact
                 if (m_spellInfo->SpellFamilyName == SPELLFAMILY_DEATHKNIGHT && m_spellInfo->SpellFamilyFlags[0] & 0x00080000)
@@ -5212,24 +5258,6 @@ SpellCastResult Spell::CheckCast(bool strict)
                         if (m_caster->GetTypeId() != TYPEID_PLAYER || !m_caster->ToPlayer()->IsInFeralForm())
                             return SPELL_FAILED_ONLY_SHAPESHIFT;
                         break;
-                    // Wild Growth
-                    case 48438:
-                    case 53248:
-                    case 53249:
-                    case 53251:
-                    {
-                        if (m_caster->GetTypeId() != TYPEID_PLAYER)
-                            return SPELL_FAILED_DONT_REPORT;
-
-                        Unit* target = m_targets.getUnitTarget();
-                        if (!target || target->GetTypeId() != TYPEID_PLAYER)
-                            return SPELL_FAILED_BAD_TARGETS;
-
-                        if (!m_caster->ToPlayer()->IsInSameRaidWith(target->ToPlayer()))
-                            return SPELL_FAILED_TARGET_NOT_IN_RAID;
-
-                        break;
-                    }
                     case 1515:
                     {
                         if (m_caster->GetTypeId() != TYPEID_PLAYER)
diff --git a/win/VC90/game.vcproj b/win/VC90/game.vcproj
index af57afc95a8..862ad8a579b 100644
--- a/win/VC90/game.vcproj
+++ b/win/VC90/game.vcproj
@@ -4441,6 +4441,10 @@
 				RelativePath="..\..\src\server\game\Spells\Spell.h"
 				>
 			
+			
+			
 			
@@ -4472,10 +4476,6 @@
 					RelativePath="..\..\src\server\game\Spells\Auras\SpellAuras.h"
 					>
 				
-				
-				
 			
 		
 		
Date: Fri, 18 Jun 2010 16:21:23 +0200
Subject: In arenas Replenishment should only affect the caster.

--HG--
branch : trunk
---
 src/server/game/Spells/Spell.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src')

diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
index e7901de1a2d..cdc4cf2a3d5 100644
--- a/src/server/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
@@ -2431,6 +2431,13 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur)
                             power = POWER_HEALTH;
                             break;
                         case 57669: // Replenishment
+                            // In arenas Replenishment may only affect the caster
+                            if (m_caster->GetTypeId() == TYPEID_PLAYER && m_caster->ToPlayer()->InArena())
+                            {
+                                unitList.clear();
+                                unitList.push_back(m_caster);
+                                break;
+                            }
                             maxSize = 10;
                             power = POWER_MANA;
                             break;
-- 
cgit v1.2.3


From 1218b001acce5c50e7ad781823fdc668e4c3a493 Mon Sep 17 00:00:00 2001
From: Xanadu 
Date: Fri, 18 Jun 2010 17:21:39 +0200
Subject: Fixed priest and druid AoE spells broken two commits back. Closes
 issue 2737.

--HG--
branch : trunk
---
 src/server/game/Spells/Spell.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src')

diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
index cdc4cf2a3d5..7a975f021ff 100644
--- a/src/server/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
@@ -2461,6 +2461,8 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur)
                         maxSize = 3;
                         power = POWER_MANA;
                     }
+                    else
+                        break;
 
                     // Remove targets outside caster's raid
                     for (std::list::iterator itr = unitList.begin() ; itr != unitList.end();)
@@ -2477,6 +2479,8 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur)
                         maxSize = m_caster->HasAura(62970) ? 6 : 5; // Glyph of Wild Growth
                         power = POWER_HEALTH;
                     }
+                    else
+                        break;
 
                     // Remove targets outside caster's raid
                     for (std::list::iterator itr = unitList.begin() ; itr != unitList.end();)
-- 
cgit v1.2.3


From 8c8986b2bc7a5dee3c12252486ad68a40a482ee0 Mon Sep 17 00:00:00 2001
From: Machiavelli 
Date: Sat, 19 Jun 2010 17:26:12 +0200
Subject: Fix usage of uninitialized waypoint array variables in
 ConfusedMovementGenerator::Initialize and revert 9b1c565510+ad8ce5245e
 that covered up this problem without fixing it and introduced a faulty LOS
 calculation. With thanks to Lynx3d and click, and Aokromes and ritchy for
 testing.

--HG--
branch : trunk
---
 src/server/collision/Management/VMapManager2.cpp   | 10 +++++-----
 src/server/collision/Maps/MapTree.cpp              | 23 +++++-----------------
 src/server/collision/Maps/MapTree.h                |  1 +
 .../ConfusedMovementGenerator.cpp                  | 14 ++++++-------
 4 files changed, 17 insertions(+), 31 deletions(-)

(limited to 'src')

diff --git a/src/server/collision/Management/VMapManager2.cpp b/src/server/collision/Management/VMapManager2.cpp
index 1e8a84aee52..032793b1c09 100644
--- a/src/server/collision/Management/VMapManager2.cpp
+++ b/src/server/collision/Management/VMapManager2.cpp
@@ -109,7 +109,7 @@ namespace VMAP
                 ss2 >> map_num;
                 if (map_num >= 0)
                 {
-                    std::cout << "ingoring Map " << map_num << " for VMaps\n";
+                    sLog.outDebug("Ignoring Map %i for VMaps", map_num);
                     iIgnoreMapIds[map_num] = true;
                     // unload map in case it is loaded
                     unloadMap(map_num);
@@ -299,11 +299,11 @@ namespace VMAP
             WorldModel *worldmodel = new WorldModel();
             if (!worldmodel->readFile(basepath + filename + ".vmo"))
             {
-                std::cout << "VMapManager2: could not load '" << basepath << filename << ".vmo'!\n";
+                sLog.outError("VMapManager2: could not load '%s%s.vmo'!", basepath, filename);
                 delete worldmodel;
                 return NULL;
             }
-            std::cout << "VMapManager2: loading file '" << basepath << filename << "'.\n";
+            sLog.outDebug("VMapManager2: loading file '%s%s'.", basepath, filename);
             model = iLoadedModelFiles.insert(std::pair(filename, ManagedModel())).first;
             model->second.setModel(worldmodel);
         }
@@ -316,12 +316,12 @@ namespace VMAP
         ModelFileMap::iterator model = iLoadedModelFiles.find(filename);
         if (model == iLoadedModelFiles.end())
         {
-            std::cout << "VMapManager2: trying to unload non-loaded file '" << filename << "'!\n";
+            sLog.outError("VMapManager2: trying to unload non-loaded file '%s'!", filename);
             return;
         }
         if( model->second.decRefCount() == 0)
         {
-            std::cout << "VMapManager2: unloading file '" << filename << "'.\n";
+            sLog.outDebug("VMapManager2: unloading file '%s'", filename);
             delete model->second.getModel();
             iLoadedModelFiles.erase(model);
         }
diff --git a/src/server/collision/Maps/MapTree.cpp b/src/server/collision/Maps/MapTree.cpp
index c733ed37454..af4073fcc8c 100644
--- a/src/server/collision/Maps/MapTree.cpp
+++ b/src/server/collision/Maps/MapTree.cpp
@@ -146,32 +146,19 @@ namespace VMAP
 
     bool StaticMapTree::isInLineOfSight(const Vector3& pos1, const Vector3& pos2) const
     {
-        bool result = false;
+        bool result = true;
         float maxDist = (pos2 - pos1).magnitude();
         // valid map coords should *never ever* produce float overflow, but this would produce NaNs too
-
-        //ASSERT(maxDist < std::numeric_limits::max());
-
+        ASSERT(maxDist < std::numeric_limits::max());
         // prevent NaN values which can cause BIH intersection to enter infinite loop
         if (maxDist < 1e-10f)
             return true;
         // direction with length of 1
-	G3D::Plane checkPlane = G3D::Plane((pos2 - pos1)/maxDist,pos1, pos2);
         G3D::Ray ray = G3D::Ray::fromOriginAndDirection(pos1, (pos2 - pos1)/maxDist);
-
-        Vector3 checkFinite = ray.intersection(checkPlane);
-        if (!checkFinite.isFinite())
+        float resultDist = getIntersectionTime(ray, maxDist, true);
+        if (resultDist < maxDist)
         {
-            ray = G3D::Ray::fromOriginAndDirection(pos1, -((pos2 - pos1)/maxDist));
-            checkFinite = ray.intersection(checkPlane);
-        }
-        if (checkFinite.isFinite())
-        {
-            float resultDist = getIntersectionTime(ray, maxDist, true);
-            if (resultDist >= maxDist)
-            {
-               result = true;
-            }
+            result = false;
         }
         return result;
     }
diff --git a/src/server/collision/Maps/MapTree.h b/src/server/collision/Maps/MapTree.h
index 7a7af43e949..f9c51d47b95 100644
--- a/src/server/collision/Maps/MapTree.h
+++ b/src/server/collision/Maps/MapTree.h
@@ -22,6 +22,7 @@
 #include "Define.h"
 #include "Dynamic/UnorderedMap.h"
 #include "BoundingIntervalHierarchy.h"
+#include "Log.h"
 
 namespace VMAP
 {
diff --git a/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp
index 43c6052d2d3..c9e39866bf5 100644
--- a/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp
@@ -51,15 +51,13 @@ ConfusedMovementGenerator::Initialize(T &unit)
 
     for (uint8 idx = 0; idx <= MAX_CONF_WAYPOINTS; ++idx)
     {
+        const float wanderX = wander_distance*rand_norm() - wander_distance/2;
+        const float wanderY = wander_distance*rand_norm() - wander_distance/2;
+        i_waypoints[idx][0] = x + wanderX;
+        i_waypoints[idx][1] = y + wanderY;
+        
         const bool isInLoS = vMaps->isInLineOfSight(unit.GetMapId(), x, y, z + 2.0f, i_waypoints[idx][0], i_waypoints[idx][1], z + 2.0f);
-        if (isInLoS)
-        {
-            const float wanderX = wander_distance*rand_norm() - wander_distance/2;
-            const float wanderY = wander_distance*rand_norm() - wander_distance/2;
-            i_waypoints[idx][0] = x + wanderX;
-            i_waypoints[idx][1] = y + wanderY;
-        }
-        else
+        if (!isInLoS)
         {
             i_waypoints[idx][0] = x;
             i_waypoints[idx][1] = y;
-- 
cgit v1.2.3


From 108970ddbaad021460b7313998f39b1f544c5464 Mon Sep 17 00:00:00 2001
From: Brian 
Date: Sat, 19 Jun 2010 11:14:00 -0600
Subject: * Fix Linux compile

--HG--
branch : trunk
---
 src/server/collision/CMakeLists.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/collision/CMakeLists.txt b/src/server/collision/CMakeLists.txt
index 8af66c7c074..0dbb44ba05b 100644
--- a/src/server/collision/CMakeLists.txt
+++ b/src/server/collision/CMakeLists.txt
@@ -33,13 +33,15 @@ SET(collision_STAT_SRCS
 include_directories(
   ${ACE_INCLUDE_DIR}
   ${CMAKE_SOURCE_DIR}/externals/g3dlite
+  ${CMAKE_SOURCE_DIR}/externals/mysql
   ${CMAKE_SOURCE_DIR}/src/server/shared
+  ${CMAKE_SOURCE_DIR}/src/server/shared/Debugging
   ${CMAKE_SOURCE_DIR}/src/server/shared/Dynamic
+  ${CMAKE_SOURCE_DIR}/src/server/shared/Logging
   ${CMAKE_SOURCE_DIR}/src/server/collision
   ${CMAKE_SOURCE_DIR}/src/server/collision/Management
   ${CMAKE_SOURCE_DIR}/src/server/collision/Maps
   ${CMAKE_SOURCE_DIR}/src/server/collision/Models
-  ${CMAKE_SOURCE_DIR}/src/server/shared/Debugging
   ${CMAKE_BINARY_DIR}
 )
 
-- 
cgit v1.2.3


From d183d94be81dd64501fe72d674b40dd2f0a94fed Mon Sep 17 00:00:00 2001
From: Machiavelli 
Date: Sat, 19 Jun 2010 20:51:56 +0200
Subject: Fix possible crash in VMapManager sLog.OutXX functions.

--HG--
branch : trunk
---
 src/server/collision/Management/VMapManager2.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/server/collision/Management/VMapManager2.cpp b/src/server/collision/Management/VMapManager2.cpp
index 032793b1c09..8e3681864d0 100644
--- a/src/server/collision/Management/VMapManager2.cpp
+++ b/src/server/collision/Management/VMapManager2.cpp
@@ -299,11 +299,11 @@ namespace VMAP
             WorldModel *worldmodel = new WorldModel();
             if (!worldmodel->readFile(basepath + filename + ".vmo"))
             {
-                sLog.outError("VMapManager2: could not load '%s%s.vmo'!", basepath, filename);
+                sLog.outError("VMapManager2: could not load '%s%s.vmo'!", basepath.c_str(), filename.c_str());
                 delete worldmodel;
                 return NULL;
             }
-            sLog.outDebug("VMapManager2: loading file '%s%s'.", basepath, filename);
+            sLog.outDebug("VMapManager2: loading file '%s%s'.", basepath.c_str(), filename.c_str());
             model = iLoadedModelFiles.insert(std::pair(filename, ManagedModel())).first;
             model->second.setModel(worldmodel);
         }
@@ -316,12 +316,12 @@ namespace VMAP
         ModelFileMap::iterator model = iLoadedModelFiles.find(filename);
         if (model == iLoadedModelFiles.end())
         {
-            sLog.outError("VMapManager2: trying to unload non-loaded file '%s'!", filename);
+            sLog.outError("VMapManager2: trying to unload non-loaded file '%s'!", filename.c_str());
             return;
         }
         if( model->second.decRefCount() == 0)
         {
-            sLog.outDebug("VMapManager2: unloading file '%s'", filename);
+            sLog.outDebug("VMapManager2: unloading file '%s'", filename.c_str());
             delete model->second.getModel();
             iLoadedModelFiles.erase(model);
         }
-- 
cgit v1.2.3


From 6e871d6f4d93a9c1103fa619576e7e387e2b77d8 Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Sat, 19 Jun 2010 20:57:58 +0200
Subject: Violet Hold: Instance mechanics fixes, by PivoNRoll Closes issue
 #2733 Implements door hiting by trash, trash waypoints and more

--HG--
branch : trunk
---
 sql/scripts/world_scripts_full.sql                 |  12 +
 sql/updates/8638_world_scriptname.sql              |  12 +
 .../Northrend/VioletHold/instance_violet_hold.cpp  | 225 +++--
 .../scripts/Northrend/VioletHold/violet_hold.cpp   | 935 +++++++++++++++++++--
 .../scripts/Northrend/VioletHold/violet_hold.h     |  13 +-
 5 files changed, 1066 insertions(+), 131 deletions(-)
 create mode 100644 sql/updates/8638_world_scriptname.sql

(limited to 'src')

diff --git a/sql/scripts/world_scripts_full.sql b/sql/scripts/world_scripts_full.sql
index 1aaae94d91b..6b36f9f0928 100644
--- a/sql/scripts/world_scripts_full.sql
+++ b/sql/scripts/world_scripts_full.sql
@@ -1491,6 +1491,18 @@ UPDATE `creature_template` SET `ScriptName`='boss_moragg' WHERE `entry`=29316;
 UPDATE `creature_template` SET `ScriptName`='boss_xevozz' WHERE `entry`=29266;
 UPDATE `creature_template` SET `ScriptName`='mob_ethereal_sphere' WHERE `entry`=29271;
 UPDATE `creature_template` SET `ScriptName`='boss_cyanigosa' WHERE `entry`=31134;
+update `creature_template` SET `scriptname`='mob_azure_invader' WHERE `entry`=30661; 
+update `creature_template` SET `scriptname`='mob_azure_spellbreaker' WHERE `entry`=30662;
+update `creature_template` SET `scriptname`='mob_azure_binder' WHERE `entry`=30663;
+update `creature_template` SET `scriptname`='mob_azure_mage_slayer' WHERE `entry`=30664;
+update `creature_template` SET `scriptname`='mob_azure_captain' WHERE `entry`=30666;
+update `creature_template` SET `scriptname`='mob_azure_sorceror' WHERE `entry`=30667;
+update `creature_template` SET `scriptname`='mob_azure_raider' WHERE `entry`=30668;
+update `creature_template` SET `scriptname`='mob_azure_stalker' WHERE `entry`=32191;
+update `creature_template` SET `scriptname`='mob_azure_invader' WHERE `entry`=30961;
+update `creature_template` SET `scriptname`='mob_azure_spellbreaker' WHERE `entry`=30962;
+update `creature_template` SET `scriptname`='mob_azure_binder' WHERE `entry`=30918;
+update `creature_template` SET `scriptname`='mob_azure_mage_slayer' WHERE `entry`=30963;
 UPDATE `instance_template` SET `script`='instance_violet_hold' WHERE `map`=608;
 
 /* WAILING CAVERNS */
diff --git a/sql/updates/8638_world_scriptname.sql b/sql/updates/8638_world_scriptname.sql
new file mode 100644
index 00000000000..d3f357f43bf
--- /dev/null
+++ b/sql/updates/8638_world_scriptname.sql
@@ -0,0 +1,12 @@
+update `creature_template` SET `scriptname`='mob_azure_invader' WHERE `entry`=30661; -- Azure Invader 1
+update `creature_template` SET `scriptname`='mob_azure_spellbreaker' WHERE `entry`=30662; -- Azure Spellbreaker
+update `creature_template` SET `scriptname`='mob_azure_binder' WHERE `entry`=30663; -- Azure Binder 1
+update `creature_template` SET `scriptname`='mob_azure_mage_slayer' WHERE `entry`=30664; -- Azure Mage Slayer 1
+update `creature_template` SET `scriptname`='mob_azure_captain' WHERE `entry`=30666; -- Azure Captain
+update `creature_template` SET `scriptname`='mob_azure_sorceror' WHERE `entry`=30667; -- Azure Sorceror
+update `creature_template` SET `scriptname`='mob_azure_raider' WHERE `entry`=30668; -- Azure Raider
+update `creature_template` SET `scriptname`='mob_azure_stalker' WHERE `entry`=32191; -- Azure Stalker
+update `creature_template` SET `scriptname`='mob_azure_invader' WHERE `entry`=30961; -- Azure Invader 2
+update `creature_template` SET `scriptname`='mob_azure_spellbreaker' WHERE `entry`=30962; -- Azure Spellbreaker
+update `creature_template` SET `scriptname`='mob_azure_binder' WHERE `entry`=30918; -- Azure Binder 2
+update `creature_template` SET `scriptname`='mob_azure_mage_slayer' WHERE `entry`=30963; -- Azure Mage Sl
diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
index 9b220ae36cc..d5702980ff8 100644
--- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
+++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
@@ -34,12 +34,12 @@ enum GameObjects
 
 const Position PortalLocation[] =
 {
-  {1936.07, 803.198, 53.3749, 3.12414},
-  {1877.51, 850.104, 44.6599, 4.7822 },
-  {1890.64, 753.471, 48.7224, 1.71042},
-  {1908.31, 809.657, 38.7037, 3.08701},
-  {1918.37, 853.437, 47.1624, 4.12294},
-  {1927.61, 758.436, 51.4533, 2.20891}
+    {1877.51, 850.104, 44.6599, 4.7822 },     // WP 1
+    {1918.37, 853.437, 47.1624, 4.12294},     // WP 2
+    {1936.07, 803.198, 53.3749, 3.12414},     // WP 3
+    {1927.61, 758.436, 51.4533, 2.20891},     // WP 4
+    {1890.64, 753.471, 48.7224, 1.71042},     // WP 5
+    {1908.31, 809.657, 38.7037, 3.08701}      // WP 6
 };
 
 struct instance_violet_hold : public ScriptedInstance
@@ -65,6 +65,7 @@ struct instance_violet_hold : public ScriptedInstance
     uint64 uiXevozzCell;
     uint64 uiZuramatCell;
     uint64 uiMainDoor;
+    uint64 uiTeleportationPortal;
 
     uint64 uiActivationCrystal[3];
 
@@ -75,6 +76,10 @@ struct instance_violet_hold : public ScriptedInstance
     uint8 uiFirstBoss;
     uint8 uiSecondBoss;
     uint8 uiRemoveNpc;
+    uint32 uiDoorSpellTimer;
+    
+    uint8 uiMainDoorState;
+    uint8 uiDoorIntegrity;
 
     uint8 m_auiEncounter[MAX_ENCOUNTER];
     uint8 uiCountErekemGuards;
@@ -82,6 +87,9 @@ struct instance_violet_hold : public ScriptedInstance
 
     bool bActive;
     bool bWiped;
+    bool bIsDoorSpellCasted;
+
+    std::list NpcAtDoorCastingList;
 
     std::string str_data;
 
@@ -105,8 +113,13 @@ struct instance_violet_hold : public ScriptedInstance
         uiXevozzCell = 0;
         uiZuramatCell = 0;
         uiMainDoor = 0;
+        uiTeleportationPortal = 0;
+        
         uiRemoveNpc = 0;
 
+        uiMainDoorState = GO_STATE_ACTIVE;
+        uiDoorIntegrity = 100;
+
         uiWaveCount = 0;
         uiLocation = urand(0,5);
         uiFirstBoss = 0;
@@ -115,9 +128,10 @@ struct instance_violet_hold : public ScriptedInstance
         uiCountActivationCrystals = 0;
 
         uiActivationTimer = 5000;
+        uiDoorSpellTimer = 2000;
 
         bActive = false;
-        bWiped  = false;
+        bIsDoorSpellCasted = false;
 
         memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
     }
@@ -242,6 +256,38 @@ struct instance_violet_hold : public ScriptedInstance
             case DATA_REMOVE_NPC:
                 uiRemoveNpc = data;
                 break;
+            case DATA_PORTAL_LOCATION:
+                uiLocation = (uint8)data;
+                break;
+            case DATA_DOOR_INTEGRITY:
+                uiDoorIntegrity = data;
+                DoUpdateWorldState(WORLD_STATE_VH_PRISON_STATE, uiDoorIntegrity);
+                break;
+            case DATA_NPC_PRESENCE_AT_DOOR_ADD:
+                NpcAtDoorCastingList.push_back(data);
+                break;
+            case DATA_NPC_PRESENCE_AT_DOOR_REMOVE:
+                if(!NpcAtDoorCastingList.empty())
+                    NpcAtDoorCastingList.pop_back();
+                break;
+            case DATA_MAIN_DOOR:
+                if(GameObject* pMainDoor = instance->GetGameObject(uiMainDoor))
+                {
+                    switch(data)
+                    {
+                        case GO_STATE_ACTIVE:
+                            pMainDoor->SetGoState(GO_STATE_ACTIVE);
+                            break;
+                        case GO_STATE_READY:
+                            pMainDoor->SetGoState(GO_STATE_READY);
+                            break;
+                        case GO_STATE_ACTIVE_ALTERNATIVE:
+                            pMainDoor->SetGoState(GO_STATE_ACTIVE_ALTERNATIVE);
+                            break;
+                    }
+                }
+                uiMainDoorState = data;
+                break;
         }
     }
 
@@ -254,6 +300,39 @@ struct instance_violet_hold : public ScriptedInstance
             case DATA_CYANIGOSA_EVENT:          return m_auiEncounter[2];
             case DATA_WAVE_COUNT:               return uiWaveCount;
             case DATA_REMOVE_NPC:               return uiRemoveNpc;
+            case DATA_PORTAL_LOCATION:          return uiLocation;
+            case DATA_DOOR_INTEGRITY:           return uiDoorIntegrity;
+            case DATA_NPC_PRESENCE_AT_DOOR:     return NpcAtDoorCastingList.size();
+            case DATA_MAIN_DOOR:                return uiMainDoorState;
+        }
+
+        return 0;
+    }
+
+    uint64 GetData64(uint32 identifier)
+    {
+        switch(identifier)
+        {
+            case DATA_MORAGG:                   return uiMoragg;
+            case DATA_EREKEM:                   return uiErekem;
+            case DATA_EREKEM_GUARD_1:           return uiErekemGuard[0];
+            case DATA_EREKEM_GUARD_2:           return uiErekemGuard[1];
+            case DATA_ICHORON:                  return uiIchoron;
+            case DATA_LAVANTHOR:                return uiLavanthor;
+            case DATA_XEVOZZ:                   return uiXevozz;
+            case DATA_ZURAMAT:                  return uiZuramat;
+            case DATA_CYANIGOSA:                return uiCyanigosa;
+            case DATA_MORAGG_CELL:              return uiMoraggCell;
+            case DATA_EREKEM_CELL:              return uiErekemCell;
+            case DATA_EREKEM_RIGHT_GUARD_CELL:  return uiErekemRightGuardCell;
+            case DATA_EREKEM_LEFT_GUARD_CELL:   return uiErekemLeftGuardCell;
+            case DATA_ICHORON_CELL:             return uiIchoronCell;
+            case DATA_LAVANTHOR_CELL:           return uiLavanthorCell;
+            case DATA_XEVOZZ_CELL:              return uiXevozzCell;
+            case DATA_ZURAMAT_CELL:             return uiZuramatCell;
+            case DATA_MAIN_DOOR:                return uiMainDoor;
+            case DATA_SINCLARI:                 return uiSinclari;
+            case DATA_TELEPORTATION_PORTAL:     return uiTeleportationPortal;
         }
 
         return 0;
@@ -261,9 +340,10 @@ struct instance_violet_hold : public ScriptedInstance
 
     void SpawnPortal()
     {
+        SetData(DATA_PORTAL_LOCATION, (GetData(DATA_PORTAL_LOCATION) + urand(1,5))%6);
         if (Creature *pSinclari = instance->GetCreature(uiSinclari))
-            if (Creature *pPortal = pSinclari->SummonCreature(CREATURE_TELEPORTATION_PORTAL,PortalLocation[uiLocation],TEMPSUMMON_CORPSE_DESPAWN))
-                uiLocation = (uiLocation+urand(1,5))%6;
+            if(Creature *portal = pSinclari->SummonCreature(CREATURE_TELEPORTATION_PORTAL,PortalLocation[GetData(DATA_PORTAL_LOCATION)],TEMPSUMMON_CORPSE_DESPAWN))
+                uiTeleportationPortal = portal->GetGUID();
     }
 
     void StartBossEncounter(uint8 uiBoss, bool bForceRespawn = true)
@@ -275,8 +355,6 @@ struct instance_violet_hold : public ScriptedInstance
             case BOSS_MORAGG:
                 HandleGameObject(uiMoraggCell,bForceRespawn);
                 pBoss = instance->GetCreature(uiMoragg);
-                if (pBoss)
-                    pBoss->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE|UNIT_FLAG_NON_ATTACKABLE);
                 break;
             case BOSS_EREKEM:
                 HandleGameObject(uiErekemCell, bForceRespawn);
@@ -284,8 +362,6 @@ struct instance_violet_hold : public ScriptedInstance
                 HandleGameObject(uiErekemLeftGuardCell, bForceRespawn);
 
                 pBoss = instance->GetCreature(uiErekem);
-                if (pBoss)
-                    pBoss->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE|UNIT_FLAG_NON_ATTACKABLE);
 
                 if (Creature* pGuard1 = instance->GetCreature(uiErekemGuard[0]))
                 {
@@ -306,40 +382,38 @@ struct instance_violet_hold : public ScriptedInstance
             case BOSS_ICHORON:
                 HandleGameObject(uiIchoronCell,bForceRespawn);
                 pBoss = instance->GetCreature(uiIchoron);
-                if (pBoss)
-                    pBoss->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE|UNIT_FLAG_NON_ATTACKABLE);
                 break;
             case BOSS_LAVANTHOR:
                 HandleGameObject(uiLavanthorCell,bForceRespawn);
                 pBoss = instance->GetCreature(uiLavanthor);
-                if (pBoss)
-                    pBoss->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE|UNIT_FLAG_NON_ATTACKABLE);
                 break;
             case BOSS_XEVOZZ:
                 HandleGameObject(uiXevozzCell,bForceRespawn);
                 pBoss = instance->GetCreature(uiXevozz);
-                if (pBoss)
-                    pBoss->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE|UNIT_FLAG_NON_ATTACKABLE);
                 break;
             case BOSS_ZURAMAT:
                 HandleGameObject(uiZuramatCell,bForceRespawn);
                 pBoss = instance->GetCreature(uiZuramat);
-                if (pBoss)
-                    pBoss->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE|UNIT_FLAG_NON_ATTACKABLE);
                 break;
         }
 
-        if (!bForceRespawn && pBoss)
+        // generic boss state changes
+        if (pBoss)
         {
-            if (pBoss->isDead())
+            pBoss->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE|UNIT_FLAG_NON_ATTACKABLE);
+            pBoss->SetReactState(REACT_AGGRESSIVE);
+
+            if (!bForceRespawn)
             {
-                // respawn but avoid to be looted again
-                pBoss->Respawn();
-                pBoss->RemoveLootMode(1);
+                if (pBoss->isDead())
+                {
+                    // respawn but avoid to be looted again
+                    pBoss->Respawn();
+                    pBoss->RemoveLootMode(1);
+                }
+                pBoss->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE|UNIT_FLAG_NON_ATTACKABLE);
+                uiWaveCount = 0;
             }
-            pBoss->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE|UNIT_FLAG_NON_ATTACKABLE);
-            SetData(DATA_WAVE_COUNT,0);
-            uiWaveCount = 0;
         }
     }
 
@@ -347,7 +421,6 @@ struct instance_violet_hold : public ScriptedInstance
     {
         DoUpdateWorldState(WORLD_STATE_VH, 1);
         DoUpdateWorldState(WORLD_STATE_VH_WAVE_COUNT, uiWaveCount);
-        DoUpdateWorldState(WORLD_STATE_VH_PRISON_STATE, 100); // TODO
 
         switch(uiWaveCount)
         {
@@ -375,43 +448,14 @@ struct instance_violet_hold : public ScriptedInstance
             {
                 if (GameObject* pMainDoor = instance->GetGameObject(uiMainDoor))
                     pMainDoor->SetGoState(GO_STATE_READY);
+                DoUpdateWorldState(WORLD_STATE_VH_PRISON_STATE, 100);
             }
             default:
-                if (!bWiped)
-                    SpawnPortal();
-                bWiped = false;
+                SpawnPortal();
                 break;
         }
     }
 
-    uint64 GetData64(uint32 identifier)
-    {
-        switch(identifier)
-        {
-            case DATA_MORAGG:                   return uiMoragg;
-            case DATA_EREKEM:                   return uiErekem;
-            case DATA_EREKEM_GUARD_1:           return uiErekemGuard[0];
-            case DATA_EREKEM_GUARD_2:           return uiErekemGuard[1];
-            case DATA_ICHORON:                  return uiIchoron;
-            case DATA_LAVANTHOR:                return uiLavanthor;
-            case DATA_XEVOZZ:                   return uiXevozz;
-            case DATA_ZURAMAT:                  return uiZuramat;
-            case DATA_CYANIGOSA:                return uiCyanigosa;
-            case DATA_MORAGG_CELL:              return uiMoraggCell;
-            case DATA_EREKEM_CELL:              return uiErekemCell;
-            case DATA_EREKEM_RIGHT_GUARD_CELL:  return uiErekemRightGuardCell;
-            case DATA_EREKEM_LEFT_GUARD_CELL:   return uiErekemLeftGuardCell;
-            case DATA_ICHORON_CELL:             return uiIchoronCell;
-            case DATA_LAVANTHOR_CELL:           return uiLavanthorCell;
-            case DATA_XEVOZZ_CELL:              return uiXevozzCell;
-            case DATA_ZURAMAT_CELL:             return uiZuramatCell;
-            case DATA_MAIN_DOOR:                return uiMainDoor;
-            case DATA_SINCLARI:                 return uiSinclari;
-        }
-
-        return 0;
-    }
-
     std::string GetSaveData()
     {
         OUT_SAVE_INST_DATA;
@@ -483,7 +527,8 @@ struct instance_violet_hold : public ScriptedInstance
         if (!instance->HavePlayers())
             return;
 
-        if (bActive)
+        // portals should spawn if other portal is dead and doors are closed
+        if (bActive && GetData(DATA_MAIN_DOOR) == GO_STATE_READY)
         {
             if (uiActivationTimer < diff)
             {
@@ -493,23 +538,55 @@ struct instance_violet_hold : public ScriptedInstance
             } else uiActivationTimer -= diff;
         }
 
-        if (GameObject* pMainDoor = instance->GetGameObject(uiMainDoor))
-            if (pMainDoor->GetGoState() != GO_STATE_ACTIVE && CheckWipe())
+        // if doors are closed (means event is in progres) and players have wiped then reset instance
+        if (GetData(DATA_MAIN_DOOR) != GO_STATE_ACTIVE && CheckWipe())
+        {
+            SetData(DATA_REMOVE_NPC, 1);
+            StartBossEncounter(uiFirstBoss, false);
+            StartBossEncounter(uiSecondBoss, false);
+
+            SetData(DATA_MAIN_DOOR,GO_STATE_ACTIVE);
+            SetData(DATA_WAVE_COUNT, 0);
+
+            if (Creature* pSinclari = instance->GetCreature(uiSinclari))
             {
-                SetData(DATA_REMOVE_NPC, 1);
-                StartBossEncounter(uiFirstBoss, false);
-                StartBossEncounter(uiSecondBoss, false);
-                bWiped = true;
-                if (Creature* pSinclari = instance->GetCreature(uiSinclari))
+                pSinclari->SetVisibility(VISIBILITY_ON);
+
+                std::list GuardList;
+                pSinclari->GetCreatureListWithEntryInGrid(GuardList, NPC_VIOLET_HOLD_GUARD, 40.0f);
+                if (!GuardList.empty())
                 {
-                    pSinclari->DisappearAndDie();
-                    pSinclari->Respawn(true);
+                    for (std::list::const_iterator itr = GuardList.begin(); itr != GuardList.end(); ++itr)
+                    {
+                        if (Creature* pGuard = *itr)
+                        {
+                            pGuard->SetVisibility(VISIBILITY_ON);
+                            pGuard->SetReactState(REACT_AGGRESSIVE);
+                            pGuard->GetMotionMaster()->MovePoint(1,pGuard->GetHomePosition());
+                        }
+                    }
                 }
+                pSinclari->GetMotionMaster()->MovePoint(1,pSinclari->GetHomePosition());
+                pSinclari->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NOT_SELECTABLE);
+            }
+        }
 
-                if (GameObject* pMainDoor = instance->GetGameObject(uiMainDoor))
-                    pMainDoor->SetGoState(GO_STATE_ACTIVE);
-                SetData(DATA_WAVE_COUNT, 0);
+        // if there are NPCs in front of the prison door, which are casting the door seal spell and doors are active
+        if(GetData(DATA_NPC_PRESENCE_AT_DOOR) && (GetData(DATA_MAIN_DOOR) == GO_STATE_READY))
+        {
+            // if door integrity is > 0 then decrase it's integrity state
+            if(GetData(DATA_DOOR_INTEGRITY))
+            {
+                if(uiDoorSpellTimer < diff)
+                {
+                    SetData(DATA_DOOR_INTEGRITY,GetData(DATA_DOOR_INTEGRITY)-1);
+                    uiDoorSpellTimer =2000;
+                } else uiDoorSpellTimer -= diff;
             }
+            // else set door state to active (means door will open and group have failed to sustain mob invasion on the door)
+            else
+                SetData(DATA_MAIN_DOOR,GO_STATE_ACTIVE);
+        }
     }
 };
 
diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp
index 169f933ef45..b46f4d68c11 100644
--- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp
+++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp
@@ -1,4 +1,5 @@
 #include "ScriptPCH.h"
+#include "ScriptedEscortAI.h"
 #include "violet_hold.h"
 
 #define GOSSIP_START_EVENT  "Get your people to safety, we'll keep the Blue Dragonflight's forces at bay."
@@ -7,29 +8,184 @@
 
 enum PortalCreatures
 {
-    CREATURE_AZURE_INVADER            = 30661,
-    CREATURE_AZURE_SPELLBREAKER       = 30662,
-    CREATURE_AZURE_BINDER             = 30663,
-    CREATURE_AZURE_MAGE_SLAYER        = 30664,
+    CREATURE_AZURE_INVADER_1          = 30661,
+    CREATURE_AZURE_INVADER_2          = 30961,
+    CREATURE_AZURE_SPELLBREAKER_1     = 30662,
+    CREATURE_AZURE_SPELLBREAKER_2     = 30962,
+    CREATURE_AZURE_BINDER_1           = 30663,
+    CREATURE_AZURE_BINDER_2           = 30918,
+    CREATURE_AZURE_MAGE_SLAYER_1      = 30664,
+    CREATURE_AZURE_MAGE_SLAYER_2      = 30963,
     CREATURE_AZURE_CAPTAIN            = 30666,
     CREATURE_AZURE_SORCEROR           = 30667,
     CREATURE_AZURE_RAIDER             = 30668,
     CREATURE_AZURE_STALKER            = 32191
 };
 
+enum AzureInvaderSpells
+{
+    SPELL_CLEAVE                = 15496,
+    SPELL_IMPALE                = 58459,
+    H_SPELL_IMPALE              = 59256,
+    SPELL_BRUTAL_STRIKE         = 58460,
+    SPELL_SUNDER_ARMOR          = 58461
+};
+
+enum AzureSellbreakerSpells
+{
+    SPELL_ARCANE_BLAST          = 58462,
+    H_SPELL_ARCANE_BLAST        = 59257,
+    SPELL_SLOW                  = 25603,
+    SPELL_CHAINS_OF_ICE         = 58464,
+    SPELL_CONE_OF_COLD          = 58463,
+    H_SPELL_CONE_OF_COLD        = 59258
+};
+
+enum AzureBinderSpells
+{
+    SPELL_ARCANE_BARRAGE        = 58456,
+    H_SPELL_ARCANE_BARRAGE      = 59248,
+    SPELL_ARCANE_EXPLOSION      = 58455,
+    H_SPELL_ARCANE_EXPLOSION    = 59245,
+    SPELL_FROST_NOVA            = 58458,
+    H_SPELL_FROST_NOVA          = 59253,
+    SPELL_FROSTBOLT             = 58457,
+    H_SPELL_FROSTBOLT           = 59251,
+};
+
+enum AzureMageSlayerSpells
+{
+    SPELL_ARCANE_EMPOWERMENT    = 58469,
+    SPELL_SPELL_LOCK            = 30849
+};
+
+enum AzureCaptainSpells
+{
+    SPELL_MORTAL_STRIKE         = 32736,
+    SPELL_WHIRLWIND_OF_STEEL    = 41057
+};
+
+enum AzureSorcerorSpells
+{
+    SPELL_ARCANE_STREAM         = 60181,
+    H_SPELL_ARCANE_STREAM       = 60204,
+    SPELL_MANA_DETONATION       = 60182,
+    H_SPELL_MANA_DETONATION     = 60205
+};
+
+enum AzureRaiderSpells
+{
+    SPELL_CONCUSSION_BLOW       = 52719,
+    SPELL_MAGIC_REFLECTION      = 60158
+};
+
+enum AzureStalkerSpells
+{
+    SPELL_BACKSTAB              = 58471,
+    SPELL_TACTICAL_BLINK        = 58470
+};
+
+enum TrashDoorSpell
+{
+    SPELL_DESTROY_DOOR_SEAL     = 58040
+};
+
 enum Spells
 {
-    SPELL_PORTAL_CHANNEL              = 58012
+    SPELL_PORTAL_CHANNEL              = 58012,
+    SPELL_CRYSTALL_ACTIVATION         = 57804
 };
 
 enum eSinclari
 {
-    NPC_VIOLET_HOLD_GUARD             = 30659,
+    SAY_SINCLARI_1                    = -1608045
+};
+
+float FirstPortalWPs [6][3] =
+{
+    {1877.670288, 842.280273, 43.333591},
+    {1877.338867, 834.615356, 38.762287},
+    {1872.161011, 823.854309, 38.645401},
+    {1864.860474, 815.787170, 38.784843},
+    {1858.953735, 810.048950, 44.008759},
+    {1843.707153, 805.807739, 44.135197}
+    //{1825.736084, 807.305847, 44.363785}
+};
+
+float SecondPortalFirstWPs [9][3] =
+{
+    {1902.561401, 853.334656, 47.106117},
+    {1895.486084, 855.376404, 44.334591},
+    {1882.805176, 854.993286, 43.333591},
+    {1877.670288, 842.280273, 43.333591},
+    {1877.338867, 834.615356, 38.762287},
+    {1872.161011, 823.854309, 38.645401},
+    {1864.860474, 815.787170, 38.784843},
+    {1858.953735, 810.048950, 44.008759},
+    {1843.707153, 805.807739, 44.135197}
+    //{1825.736084, 807.305847, 44.363785}
+};
 
-    SAY_SINCLARI_1                    = -1608045,
+float SecondPortalSecondWPs [8][3] =
+{
+    {1929.392212, 837.614990, 47.136166},
+    {1928.290649, 824.750427, 45.474411},
+    {1915.544922, 826.919373, 38.642811},
+    {1900.933960, 818.855652, 38.801647},
+    {1886.810547, 813.536621, 38.490490},
+    {1869.079712, 808.701538, 38.689003},
+    {1860.843384, 806.645020, 44.008789},
+    {1843.707153, 805.807739, 44.135197}
+    //{1825.736084, 807.305847, 44.363785}
+};
+
+float ThirdPortalWPs [8][3] =
+{
+    {1934.049438, 815.778503, 52.408699},
+    {1928.290649, 824.750427, 45.474411},
+    {1915.544922, 826.919373, 38.642811},
+    {1900.933960, 818.855652, 38.801647},
+    {1886.810547, 813.536621, 38.490490},
+    {1869.079712, 808.701538, 38.689003},
+    {1860.843384, 806.645020, 44.008789},
+    {1843.707153, 805.807739, 44.135197}
+    //{1825.736084, 807.305847, 44.363785}
+};
+
+float FourthPortalWPs [9][3] =
+{
+    {1921.658447, 761.657043, 50.866741},
+    {1910.559814, 755.780457, 47.701447},
+    {1896.664673, 752.920898, 47.667004},
+    {1887.398804, 763.633240, 47.666851},
+    {1879.020386, 775.396973, 38.705990},
+    {1872.439087, 782.568604, 38.808292},
+    {1863.573364, 791.173584, 38.743660},
+    {1857.811890, 796.765564, 43.950329},
+    {1845.577759, 800.681152, 44.104248}
+    //{1827.100342, 801.605957, 44.363358}
+};
+
+float FifthPortalWPs [6][3] =
+{
+    {1887.398804, 763.633240, 47.666851},
+    {1879.020386, 775.396973, 38.705990},
+    {1872.439087, 782.568604, 38.808292},
+    {1863.573364, 791.173584, 38.743660},
+    {1857.811890, 796.765564, 43.950329},
+    {1845.577759, 800.681152, 44.104248}
+    //{1827.100342, 801.605957, 44.363358}
+};
+
+float SixthPoralWPs [4][3] =
+{
+    {1888.861084, 805.074768, 38.375790},
+    {1869.793823, 804.135804, 38.647018},
+    {1861.541504, 804.149780, 43.968292},
+    {1843.567017, 804.288208, 44.139091}
+    //{1826.889648, 803.929993, 44.363239}
 };
 
-const Position DoorPosition = { 1828.300049, 797.309021, 46.135502, 1.48353};
 const Position MovePosition = { 1806.955566, 803.851807, 44.363323};
 
 struct npc_sinclariAI : public ScriptedAI
@@ -69,22 +225,6 @@ struct npc_sinclariAI : public ScriptedAI
         }
     }
 
-    void MovementInform(uint32 uiType, uint32 /*uiId*/)
-    {
-        if (uiType != POINT_MOTION_TYPE)
-            return;
-
-        if (pInstance)
-        {
-            pInstance->SetData(DATA_WAVE_COUNT,1);
-            pInstance->SetData(DATA_REMOVE_NPC,0); // might not have been reset after a wipe on a boss.
-        }
-
-        //She should not be despawned, she will be used by the instance to summon some npcs
-        me->SetVisibility(VISIBILITY_OFF);
-        me->SetReactState(REACT_PASSIVE);
-    }
-
     void UpdateAI(const uint32 uiDiff)
     {
         ScriptedAI::UpdateAI(uiDiff);
@@ -96,10 +236,11 @@ struct npc_sinclariAI : public ScriptedAI
                 switch(uiPhase)
                 {
                     case 1:
-                       DoScriptText(SAY_SINCLARI_1, me);
-                       uiTimer = 4000;
-                       uiPhase = 2;
-                       break;
+                        me->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NOT_SELECTABLE);
+                        DoScriptText(SAY_SINCLARI_1, me);
+                        uiTimer = 4000;
+                        uiPhase = 2;
+                        break;
                     case 2:
                     {
                         std::list GuardList;
@@ -136,6 +277,18 @@ struct npc_sinclariAI : public ScriptedAI
                     }
                     case 4:
                         me->GetMotionMaster()->MovePoint(0, MovePosition);
+                        uiTimer = 4000;
+                        uiPhase = 5;
+                        break;
+                    case 5:
+                        if (pInstance)
+                        {
+                            pInstance->SetData(DATA_MAIN_DOOR,GO_STATE_READY);
+                            pInstance->SetData(DATA_WAVE_COUNT,1);
+                            pInstance->SetData(DATA_REMOVE_NPC,0); // might not have been reset after a wipe on a boss.
+                        }
+                        me->SetVisibility(VISIBILITY_OFF);
+                        me->SetReactState(REACT_PASSIVE);
                         uiTimer = 0;
                         uiPhase = 0;
                         break;
@@ -187,23 +340,29 @@ bool GossipSelect_npc_sinclari(Player* pPlayer, Creature* pCreature, uint32 /*ui
 
 struct npc_teleportation_portalAI : public ScriptedAI
 {
-    npc_teleportation_portalAI(Creature *c) : ScriptedAI(c)
+    npc_teleportation_portalAI(Creature *c) : ScriptedAI(c), listOfMobs(me)
     {
         pInstance = c->GetInstanceData();
+        uiTypeOfMobsPortal = urand(0,1);    // 0 - elite mobs   1 - portal guardian or portal keeper with regular mobs
+        bPortalGuardianOrKeeperOrEliteSpawn = false;
     }
 
     uint32 uiSpawnTimer;
-    bool bPortalGuardianOrKeeperSpawn;
+    bool bPortalGuardianOrKeeperOrEliteSpawn;
+    uint8 uiTypeOfMobsPortal;
+    
+    SummonList listOfMobs;
 
     ScriptedInstance *pInstance;
 
     void Reset()
     {
         uiSpawnTimer = 10000;
-        bPortalGuardianOrKeeperSpawn = false;
+        bPortalGuardianOrKeeperOrEliteSpawn = false;
     }
 
     void EnterCombat(Unit * /*who*/) {}
+    
     void MoveInLineOfSight(Unit * /*who*/) {}
 
     void UpdateAI(const uint32 diff)
@@ -214,33 +373,63 @@ struct npc_teleportation_portalAI : public ScriptedAI
             pInstance->SetData(DATA_REMOVE_NPC, 0);
         }
 
-        if (uiSpawnTimer <= diff)
+        switch(uiTypeOfMobsPortal)
         {
-            if (bPortalGuardianOrKeeperSpawn)
-            {
-                uint8 k = pInstance->GetData(DATA_WAVE_COUNT) < 12 ? 2 : 3;
-                for (uint8 i = 0; i < k; ++i)
+            // spawn elite mobs and then set portals visibility to make it look like it dissapeard
+            case 0:
+                if(!bPortalGuardianOrKeeperOrEliteSpawn)
                 {
-                    uint32 entry = RAND(CREATURE_AZURE_CAPTAIN,CREATURE_AZURE_RAIDER,CREATURE_AZURE_STALKER,CREATURE_AZURE_SORCEROR);
-                    if (Creature* pSummon = DoSummon(entry, me, 2.0f, 30000, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT))
-                        pSummon->GetMotionMaster()->MovePoint(0, DoorPosition);
+                    if (uiSpawnTimer <= diff)
+                    {
+                        bPortalGuardianOrKeeperOrEliteSpawn = true;
+                        uint8 k = pInstance->GetData(DATA_WAVE_COUNT) < 12 ? 2 : 3;
+                        for (uint8 i = 0; i < k; i)
+                        {
+                            uint32 entry = RAND(CREATURE_AZURE_CAPTAIN,CREATURE_AZURE_RAIDER,CREATURE_AZURE_STALKER,CREATURE_AZURE_SORCEROR);
+                            DoSummon(entry, me, 2.0f, 20000, TEMPSUMMON_DEAD_DESPAWN);
+                        }
+                        me->SetVisibility(VISIBILITY_OFF);
+                    } else uiSpawnTimer -= diff;
                 }
-            }
-            else
-            {
-                bPortalGuardianOrKeeperSpawn = true;
-                uint32 entry = RAND(CREATURE_PORTAL_GUARDIAN, CREATURE_PORTAL_KEEPER);
-                if (Creature *pPortalKeeper = DoSummon(entry, me, 2.0f, 0, TEMPSUMMON_DEAD_DESPAWN))
-                    me->CastSpell(pPortalKeeper, SPELL_PORTAL_CHANNEL, false);
-            }
-            uiSpawnTimer = SPAWN_TIME;
-        } else uiSpawnTimer -= diff;
+                else
+                {
+                    // if all spawned elites have died kill portal
+                    if(!listOfMobs.size())
+                    {
+                        me->Kill(me, false);
+                        me->RemoveCorpse();
+                    }
+                }
+                break;
+            // spawn portal guardian or portal keeper with regular mobs
+            case 1:
+                if (uiSpawnTimer <= diff)
+                {
+                    if(bPortalGuardianOrKeeperOrEliteSpawn)
+                    {
+                        uint8 k = pInstance->GetData(DATA_WAVE_COUNT) < 12 ? 3 : 4;
+                        for (uint8 i = 0; i < k; i)
+                        {
+                            uint32 entry = RAND(CREATURE_AZURE_INVADER_1,CREATURE_AZURE_INVADER_2,CREATURE_AZURE_SPELLBREAKER_1,CREATURE_AZURE_SPELLBREAKER_2,CREATURE_AZURE_MAGE_SLAYER_1,CREATURE_AZURE_MAGE_SLAYER_2,CREATURE_AZURE_BINDER_1,CREATURE_AZURE_BINDER_2);
+                            DoSummon(entry, me, 2.0f, 20000, TEMPSUMMON_DEAD_DESPAWN);
+                        }
+                    }
+                    else
+                    {
+                        bPortalGuardianOrKeeperOrEliteSpawn = true;
+                        uint32 entry = RAND(CREATURE_PORTAL_GUARDIAN, CREATURE_PORTAL_KEEPER);
+                        if (Creature *pPortalKeeper = DoSummon(entry, me, 2.0f, 0, TEMPSUMMON_DEAD_DESPAWN))
+                            me->CastSpell(pPortalKeeper, SPELL_PORTAL_CHANNEL, false);
+                    }
+                    uiSpawnTimer = SPAWN_TIME;
+                } else uiSpawnTimer -= diff;
 
-        if (bPortalGuardianOrKeeperSpawn && !me->IsNonMeleeSpellCasted(false))
-        {
-            me->Kill(me, false);
-            me->RemoveCorpse();
-            return;
+                if (bPortalGuardianOrKeeperOrEliteSpawn && !me->IsNonMeleeSpellCasted(false))
+                {
+                    me->Kill(me, false);
+                    me->RemoveCorpse();
+                }
+                break;
         }
     }
 
@@ -249,6 +438,16 @@ struct npc_teleportation_portalAI : public ScriptedAI
         if (pInstance)
             pInstance->SetData(DATA_WAVE_COUNT,pInstance->GetData(DATA_WAVE_COUNT)+1);
     }
+
+    void JustSummoned(Creature *summoned)
+    {
+        listOfMobs.Summon(summoned);
+    }
+
+    void SummonedMobDied(Creature *summoned)
+    {
+        listOfMobs.Despawn(summoned);
+    }
 };
 
 CreatureAI* GetAI_npc_teleportation_portal(Creature *pCreature)
@@ -256,6 +455,594 @@ CreatureAI* GetAI_npc_teleportation_portal(Creature *pCreature)
     return new npc_teleportation_portalAI(pCreature);
 }
 
+struct violet_hold_trashAI : public npc_escortAI
+{
+    violet_hold_trashAI(Creature *c):npc_escortAI(c)
+    {
+        pInstance = c->GetInstanceData();
+        bHasGotMovingPoints = false;
+        portalLocationID = pInstance->GetData(DATA_PORTAL_LOCATION);
+        Reset();
+    }
+
+    public:
+        ScriptedInstance* pInstance;
+        bool bHasGotMovingPoints;
+        uint32 portalLocationID;
+        uint32 secondPortalRouteID;
+
+    void WaypointReached(uint32 uiPointId)
+    {
+        switch(portalLocationID)
+        {
+            case 0:
+                if (uiPointId == 5)
+                   CreatureStartAttackDoor(me->GetGUID());
+                break;
+            case 1:
+                if((uiPointId == 8 && secondPortalRouteID == 0) || (uiPointId == 7 && secondPortalRouteID == 1))
+                    CreatureStartAttackDoor(me->GetGUID());
+                break;
+            case 2:
+                if(uiPointId == 7)
+                   CreatureStartAttackDoor(me->GetGUID());
+                break;
+            case 3:
+                if(uiPointId == 8)
+                    CreatureStartAttackDoor(me->GetGUID());
+                break;
+            case 4:
+                if(uiPointId == 5)
+                    CreatureStartAttackDoor(me->GetGUID());
+                break;
+            case 5:
+                if(uiPointId == 3)
+                    CreatureStartAttackDoor(me->GetGUID());
+                break;
+        }
+    }
+
+    void UpdateAI(const uint32)
+    {
+        if(pInstance->GetData(DATA_MAIN_DOOR) != GO_STATE_READY)
+                me->CastStop();
+
+        if(!bHasGotMovingPoints)
+        {
+            bHasGotMovingPoints = true;
+                switch(portalLocationID)
+            {
+                case 0:
+                    for(int i=0;i<6;i++)
+                        AddWaypoint(i,FirstPortalWPs[i][0]+irand(-1,1),FirstPortalWPs[i][1]+irand(-1,1),FirstPortalWPs[i][2]+irand(-1,1),0);
+                    me->SetHomePosition(FirstPortalWPs[5][0],FirstPortalWPs[5][1],FirstPortalWPs[5][2],3.149439);
+                    break;
+                case 1:
+                    secondPortalRouteID = urand(0,1);
+                    switch(secondPortalRouteID)
+                    {
+                        case 0:
+                            for(int i=0;i<9;i++)
+                                AddWaypoint(i,SecondPortalFirstWPs[i][0]+irand(-1,1),SecondPortalFirstWPs[i][1]+irand(-1,1),SecondPortalFirstWPs[i][2],0);
+                            me->SetHomePosition(SecondPortalFirstWPs[8][0]+irand(-1,1),SecondPortalFirstWPs[8][1]+irand(-1,1),SecondPortalFirstWPs[8][2]+irand(-1,1),3.149439);
+                            break;
+                        case 1:
+                            for(int i=0;i<8;i++)
+                                AddWaypoint(i,SecondPortalSecondWPs[i][0]+irand(-1,1),SecondPortalSecondWPs[i][1]+irand(-1,1),SecondPortalSecondWPs[i][2],0);
+                            me->SetHomePosition(SecondPortalSecondWPs[7][0],SecondPortalSecondWPs[7][1],SecondPortalSecondWPs[7][2],3.149439);
+                            break;
+                    }
+                    break;
+                case 2:
+                    for(int i=0;i<8;i++)
+                        AddWaypoint(i,ThirdPortalWPs[i][0]+irand(-1,1),ThirdPortalWPs[i][1]+irand(-1,1),ThirdPortalWPs[i][2],0);
+                        me->SetHomePosition(ThirdPortalWPs[7][0],ThirdPortalWPs[7][1],ThirdPortalWPs[7][2],3.149439);
+                    break;
+                case 3:
+                    for(int i=0;i<9;i++)
+                        AddWaypoint(i,FourthPortalWPs[i][0]+irand(-1,1),FourthPortalWPs[i][1]+irand(-1,1),FourthPortalWPs[i][2],0);
+                    me->SetHomePosition(FourthPortalWPs[8][0],FourthPortalWPs[8][1],FourthPortalWPs[8][2],3.149439);
+                    break;
+                case 4:
+                    for(int i=0;i<6;i++)
+                        AddWaypoint(i,FifthPortalWPs[i][0]+irand(-1,1),FifthPortalWPs[i][1]+irand(-1,1),FifthPortalWPs[i][2],0);
+                    me->SetHomePosition(FifthPortalWPs[5][0],FifthPortalWPs[5][1],FifthPortalWPs[5][2],3.149439);
+                    break;
+                case 5:
+                    for(int i=0;i<4;i++)
+                        AddWaypoint(i,SixthPoralWPs[i][0]+irand(-1,1),SixthPoralWPs[i][1]+irand(-1,1),SixthPoralWPs[i][2],0);
+                    me->SetHomePosition(SixthPoralWPs[3][0],SixthPoralWPs[3][1],SixthPoralWPs[3][2],3.149439);
+                    break;
+            }
+            SetDespawnAtEnd(false);
+            Start(true,true);
+        }
+    }
+
+    void JustDied(Unit *unit)
+    {
+        Creature* portal = Unit::GetCreature((*me),pInstance->GetData64(DATA_TELEPORTATION_PORTAL));
+        if (portal)
+            CAST_AI(npc_teleportation_portalAI,portal->AI())->SummonedMobDied(me);
+        pInstance->SetData(DATA_NPC_PRESENCE_AT_DOOR_REMOVE,1);
+    }
+
+    void CreatureStartAttackDoor(uint32 creature_guid)
+    {
+        me->SetReactState(REACT_PASSIVE);
+        DoCast(SPELL_DESTROY_DOOR_SEAL);
+        pInstance->SetData(DATA_NPC_PRESENCE_AT_DOOR_ADD,1);
+    }
+
+};
+
+struct mob_azure_invaderAI : public violet_hold_trashAI
+{
+    mob_azure_invaderAI(Creature *c) : violet_hold_trashAI(c)
+    {
+        pInstance = c->GetInstanceData();
+    }
+
+    uint32 uiCleaveTimer;
+    uint32 uiImpaleTimer;
+    uint32 uiBrutalStrikeTimer;
+    uint32 uiSunderArmorTimer;
+
+    void Reset()
+    {
+        uiCleaveTimer = 5000;
+        uiImpaleTimer = 4000;
+        uiBrutalStrikeTimer = 5000;
+        uiSunderArmorTimer = 4000;
+    }
+
+    void UpdateAI(const uint32 diff)
+    {
+        violet_hold_trashAI::UpdateAI(diff);
+        npc_escortAI::UpdateAI(diff);
+
+        if(!UpdateVictim())
+            return;
+
+        if(me->GetEntry() == CREATURE_AZURE_INVADER_1)
+        {
+            if(uiCleaveTimer <= diff)
+            {
+                DoCast(me->getVictim(),SPELL_CLEAVE);
+                uiCleaveTimer = 5000;
+            }else uiCleaveTimer -= diff;
+
+            if(uiImpaleTimer <= diff)
+            {
+                Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true);
+                if(pTarget)
+                    DoCast(pTarget,SPELL_IMPALE);
+                uiImpaleTimer = 4000;
+            }else uiImpaleTimer -= diff;
+        }
+
+        if(me->GetEntry() == CREATURE_AZURE_INVADER_2)
+        {
+            if(uiBrutalStrikeTimer <= diff)
+            {
+                DoCast(me->getVictim(),SPELL_BRUTAL_STRIKE);
+                uiBrutalStrikeTimer = 5000;
+            }else uiBrutalStrikeTimer -= diff;
+
+            if(uiSunderArmorTimer <= diff)
+            {
+                DoCast(me->getVictim(),SPELL_SUNDER_ARMOR);
+                uiSunderArmorTimer = urand(8000,10000);
+            }else uiSunderArmorTimer -= diff;
+
+            DoMeleeAttackIfReady();
+        }
+
+        DoMeleeAttackIfReady();
+    }
+
+};
+
+struct mob_azure_spellbreakerAI : public violet_hold_trashAI
+{
+    mob_azure_spellbreakerAI(Creature* c) : violet_hold_trashAI(c)
+    {
+         pInstance = c->GetInstanceData();
+    }
+
+    uint32 uiArcaneBlastTimer;
+    uint32 uiSlowTimer;
+    uint32 uiChainsOfIceTimer;
+    uint32 uiConeOfColdTimer;
+
+    void Reset()
+    {
+        uiArcaneBlastTimer = 5000;
+        uiSlowTimer = 4000;
+        uiChainsOfIceTimer = 5000;
+        uiConeOfColdTimer = 4000;
+    }
+
+    void UpdateAI(const uint32 diff)
+    {
+        violet_hold_trashAI::UpdateAI(diff);
+        npc_escortAI::UpdateAI(diff);
+
+        if(!UpdateVictim())
+            return;
+
+        if(me->GetEntry() == CREATURE_AZURE_SPELLBREAKER_1)
+        {
+            if(uiArcaneBlastTimer <= diff)
+            {
+                Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true);
+                if(pTarget)
+                    DoCast(pTarget,DUNGEON_MODE(SPELL_ARCANE_BLAST,H_SPELL_ARCANE_BLAST));
+                uiArcaneBlastTimer = 6000;
+            }else uiArcaneBlastTimer -= diff;
+
+            if(uiSlowTimer <= diff)
+            {
+                Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true);
+                    if(pTarget)
+                    DoCast(pTarget,SPELL_SLOW);
+                uiSlowTimer = 5000;
+            }else uiSlowTimer -= diff;
+        }
+
+        if(me->GetEntry() == CREATURE_AZURE_SPELLBREAKER_2)
+        {
+            if(uiChainsOfIceTimer <= diff)
+            {
+                Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true);
+                if(pTarget)
+                    DoCast(pTarget,SPELL_CHAINS_OF_ICE);
+                uiChainsOfIceTimer = 7000;
+            }else uiChainsOfIceTimer -= diff;
+
+            if(uiConeOfColdTimer <= diff)
+            {
+               DoCast(DUNGEON_MODE(SPELL_CONE_OF_COLD,H_SPELL_CONE_OF_COLD));
+                uiConeOfColdTimer = 5000;
+            }else uiConeOfColdTimer -= diff;
+        }
+
+        DoMeleeAttackIfReady();
+    }
+};
+
+struct mob_azure_binderAI : public violet_hold_trashAI
+{
+    mob_azure_binderAI(Creature *c) : violet_hold_trashAI(c)
+    {
+        pInstance = c->GetInstanceData();
+    }
+
+    uint32 uiArcaneExplosionTimer;
+    uint32 uiArcainBarrageTimer;
+    uint32 uiFrostNovaTimer;
+    uint32 uiFrostboltTimer;
+
+    void Reset()
+    {
+        uiArcaneExplosionTimer = 5000;
+        uiArcainBarrageTimer = 4000;
+        uiFrostNovaTimer = 5000;
+        uiFrostboltTimer = 4000;
+    }
+
+    void UpdateAI(const uint32 diff)
+    {
+        violet_hold_trashAI::UpdateAI(diff);
+        npc_escortAI::UpdateAI(diff);
+
+        if(!UpdateVictim())
+            return;
+
+        if(me->GetEntry() == CREATURE_AZURE_BINDER_1)
+        {
+            if(uiArcaneExplosionTimer <= diff)
+            {
+                DoCast(DUNGEON_MODE(SPELL_ARCANE_EXPLOSION,H_SPELL_ARCANE_EXPLOSION));
+                uiArcaneExplosionTimer = 5000;
+            }else uiArcaneExplosionTimer -= diff;
+
+                if(uiArcainBarrageTimer <= diff)
+            {
+                    Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true);
+                if(pTarget)
+                        DoCast(pTarget,DUNGEON_MODE(SPELL_ARCANE_BARRAGE,H_SPELL_ARCANE_BARRAGE));
+                uiArcainBarrageTimer = 6000;
+            }else uiArcainBarrageTimer -= diff;
+        }
+
+        if(me->GetEntry() == CREATURE_AZURE_BINDER_2)
+        {
+            if(uiFrostNovaTimer <= diff)
+            {
+                DoCast(DUNGEON_MODE(SPELL_FROST_NOVA,H_SPELL_FROST_NOVA));
+                uiFrostNovaTimer = 5000;
+            }else uiFrostNovaTimer -= diff;
+
+            if(uiFrostboltTimer <= diff)
+            {
+                Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true);
+                if(pTarget)
+                    DoCast(pTarget,DUNGEON_MODE(SPELL_FROSTBOLT,H_SPELL_FROSTBOLT));
+                uiFrostboltTimer = 6000;
+            }else uiFrostboltTimer -= diff;
+        }
+
+        DoMeleeAttackIfReady();
+    }
+};
+
+struct mob_azure_mage_slayerAI : public violet_hold_trashAI
+{
+    mob_azure_mage_slayerAI(Creature *c) : violet_hold_trashAI(c)
+    {
+        pInstance = c->GetInstanceData();
+    }
+
+    uint32 uiArcaneEmpowermentTimer;
+    uint32 uiSpellLockTimer;
+
+    void Reset()
+    {
+        uiArcaneEmpowermentTimer = 5000;
+        uiSpellLockTimer = 5000;
+    }
+
+    void UpdateAI(const uint32 diff)
+    {
+        violet_hold_trashAI::UpdateAI(diff);
+        npc_escortAI::UpdateAI(diff);
+
+        if(!UpdateVictim())
+            return;
+
+        if(me->GetEntry() == CREATURE_AZURE_MAGE_SLAYER_1)
+        {
+            if(uiArcaneEmpowermentTimer <= diff)
+            {
+                DoCast(me,SPELL_ARCANE_EMPOWERMENT);
+                    uiArcaneEmpowermentTimer = 14000;
+            }else uiArcaneEmpowermentTimer -= diff;
+        }
+
+        if(me->GetEntry() == CREATURE_AZURE_MAGE_SLAYER_2)
+        {
+            if(uiSpellLockTimer <= diff)
+            {
+                Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true);
+                if(pTarget)
+                    DoCast(pTarget,SPELL_SPELL_LOCK);
+                uiSpellLockTimer = 9000;
+            }else uiSpellLockTimer -= diff;
+        }
+
+        DoMeleeAttackIfReady();
+    }
+};
+
+struct  mob_azure_captainAI : public violet_hold_trashAI
+{
+    mob_azure_captainAI(Creature *c) : violet_hold_trashAI(c)
+    {
+        pInstance = c->GetInstanceData();
+    }
+
+    uint32 uiMortalStrikeTimer;
+    uint32 uiWhirlwindTimer;
+
+    void Reset()
+    {
+        uiMortalStrikeTimer = 5000;
+        uiWhirlwindTimer = 8000;
+    }
+
+    void UpdateAI(const uint32 diff)
+    {
+        violet_hold_trashAI::UpdateAI(diff);
+        npc_escortAI::UpdateAI(diff);
+
+        if(!UpdateVictim())
+            return;
+
+        if(uiMortalStrikeTimer <= diff)
+        {
+            DoCast(me->getVictim(),SPELL_MORTAL_STRIKE);
+            uiMortalStrikeTimer = 5000;
+        }else uiMortalStrikeTimer -= diff;
+
+        if(uiWhirlwindTimer <= diff)
+        {
+            DoCast(me,SPELL_WHIRLWIND_OF_STEEL);
+            uiWhirlwindTimer = 8000;
+        }else uiWhirlwindTimer -= diff;
+
+        DoMeleeAttackIfReady();
+    }
+};
+
+struct  mob_azure_sorcerorAI : public violet_hold_trashAI
+{
+    mob_azure_sorcerorAI(Creature *c) : violet_hold_trashAI(c)
+    {
+        pInstance = c->GetInstanceData();
+    }
+
+    uint32 uiArcaneStreamTimer;
+    uint32 uiArcaneStreamTimerStartingValueHolder;
+    uint32 uiManaDetonationTimer;
+
+    void Reset()
+    {
+        uiArcaneStreamTimer = 4000;
+        uiArcaneStreamTimerStartingValueHolder = uiArcaneStreamTimer;
+        uiManaDetonationTimer = 5000;
+    }
+
+    void UpdateAI(const uint32 diff)
+    {
+        violet_hold_trashAI::UpdateAI(diff);
+        npc_escortAI::UpdateAI(diff);
+
+        if(!UpdateVictim())
+            return;
+
+        if(uiArcaneStreamTimer <= diff)
+        {
+            Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true);
+            if(pTarget)
+                DoCast(pTarget,DUNGEON_MODE(SPELL_ARCANE_STREAM,H_SPELL_ARCANE_STREAM));
+            uiArcaneStreamTimer = urand(0,5000)+5000;
+            uiArcaneStreamTimerStartingValueHolder = uiArcaneStreamTimer;
+        }else uiArcaneStreamTimer -= diff;
+
+        if(uiManaDetonationTimer <= diff && uiArcaneStreamTimer >=1500 && uiArcaneStreamTimer <= uiArcaneStreamTimerStartingValueHolder/2)
+        {
+            DoCast(DUNGEON_MODE(SPELL_MANA_DETONATION,H_SPELL_MANA_DETONATION));
+            uiManaDetonationTimer = urand(2000,6000);
+        }else uiManaDetonationTimer -= diff;
+
+        DoMeleeAttackIfReady();
+    }
+};
+
+struct mob_azure_raiderAI : public violet_hold_trashAI
+{
+    mob_azure_raiderAI(Creature *c) : violet_hold_trashAI(c)
+    {
+        pInstance = c->GetInstanceData();
+    }
+
+    uint32 uiConcussionBlowTimer;
+    uint32 uiMagicReflectionTimer;
+
+    void Reset()
+    {
+        uiConcussionBlowTimer = 5000;
+        uiMagicReflectionTimer = 8000;
+    }
+
+    void UpdateAI(const uint32 diff)
+    {
+        violet_hold_trashAI::UpdateAI(diff);
+        npc_escortAI::UpdateAI(diff);
+
+        if(!UpdateVictim())
+            return;
+
+        if(uiConcussionBlowTimer <= diff)
+        {
+            DoCast(me->getVictim(),SPELL_CONCUSSION_BLOW);
+            uiConcussionBlowTimer = 5000;
+        }else uiConcussionBlowTimer -= diff;
+
+        if(uiMagicReflectionTimer <= diff)
+        {
+            DoCast(SPELL_MAGIC_REFLECTION);
+            uiMagicReflectionTimer = urand(10000,15000);
+        }else uiMagicReflectionTimer -= diff;
+
+        DoMeleeAttackIfReady();
+    }
+};
+
+struct mob_azure_stalkerAI : public violet_hold_trashAI
+{
+    mob_azure_stalkerAI(Creature *c) : violet_hold_trashAI(c)
+    {
+        pInstance = c->GetInstanceData();
+    }
+    uint32 uiBackstabTimer;
+    uint32 uiTacticalBlinkTimer;
+    bool TacticalBlinkCasted;
+
+    void Reset()
+    {
+        uiBackstabTimer = 1300;
+        uiTacticalBlinkTimer = 8000;
+        TacticalBlinkCasted =false;
+    }
+
+    void UpdateAI(const uint32 diff)
+    {
+        violet_hold_trashAI::UpdateAI(diff);
+        npc_escortAI::UpdateAI(diff);
+
+        if(!UpdateVictim())
+            return;
+
+        if(!TacticalBlinkCasted)
+        {
+            if(uiTacticalBlinkTimer <= diff)
+            {
+                Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 40, true);
+                if(pTarget)
+                    DoCast(pTarget,SPELL_TACTICAL_BLINK);
+                    uiTacticalBlinkTimer = 6000;
+                TacticalBlinkCasted = true;
+            }else uiTacticalBlinkTimer -= diff;
+        }
+
+        else
+        {
+            if(uiBackstabTimer <= diff)
+            {
+                Unit* pTarget = SelectTarget(SELECT_TARGET_NEAREST, 0, 10, true);
+                DoCast(pTarget,SPELL_BACKSTAB);
+                TacticalBlinkCasted = false;
+                uiBackstabTimer =1300;
+            }else uiBackstabTimer -= diff;
+        }
+
+        DoMeleeAttackIfReady();
+    }
+};
+
+
+CreatureAI* GetAI_mob_azure_invader(Creature* pCreature)
+{
+    return new mob_azure_invaderAI (pCreature);
+}
+
+CreatureAI* GetAI_mob_azure_spellbreaker(Creature* pCreature)
+{
+    return new mob_azure_spellbreakerAI (pCreature);
+}
+
+CreatureAI* GetAI_mob_azure_binder(Creature* pCreature)
+{
+    return new mob_azure_binderAI (pCreature);
+}
+
+CreatureAI* GetAI_mob_azure_mage_slayer(Creature* pCreature)
+{
+    return new mob_azure_mage_slayerAI (pCreature);
+}
+
+CreatureAI* GetAI_mob_azure_captain(Creature* pCreature)
+{
+    return new mob_azure_captainAI (pCreature);
+}
+
+CreatureAI* GetAI_mob_azure_sorceror(Creature* pCreature)
+{
+    return new mob_azure_sorcerorAI (pCreature);
+}
+
+CreatureAI* GetAI_mob_azure_raider(Creature* pCreature)
+{
+    return new mob_azure_raiderAI (pCreature);
+}
+
+CreatureAI* GetAI_mob_azure_stalker(Creature* pCreature)
+{
+    return new mob_azure_stalkerAI (pCreature);
+}
+
 void AddSC_violet_hold()
 {
     Script *newscript;
@@ -271,4 +1058,44 @@ void AddSC_violet_hold()
     newscript->Name = "npc_teleportation_portal_vh";
     newscript->GetAI = &GetAI_npc_teleportation_portal;
     newscript->RegisterSelf();
+
+    newscript = new Script;
+    newscript->Name = "mob_azure_invader";
+    newscript->GetAI = &GetAI_mob_azure_invader;
+    newscript->RegisterSelf();
+    
+    newscript = new Script;
+    newscript->Name = "mob_azure_spellbreaker";
+    newscript->GetAI = &GetAI_mob_azure_invader;
+    newscript->RegisterSelf();
+    
+    newscript = new Script;
+    newscript->Name = "mob_azure_binder";
+    newscript->GetAI = &GetAI_mob_azure_binder;
+    newscript->RegisterSelf();
+    
+    newscript = new Script;
+    newscript->Name = "mob_azure_mage_slayer";
+    newscript->GetAI = &GetAI_mob_azure_mage_slayer;
+    newscript->RegisterSelf();
+    
+    newscript = new Script;
+    newscript->Name = "mob_azure_captain";
+    newscript->GetAI = &GetAI_mob_azure_captain;
+    newscript->RegisterSelf();
+    
+    newscript = new Script;
+    newscript->Name = "mob_azure_sorceror";
+    newscript->GetAI = &GetAI_mob_azure_sorceror;
+    newscript->RegisterSelf();
+    
+    newscript = new Script;
+    newscript->Name = "mob_azure_raider";
+    newscript->GetAI = &GetAI_mob_azure_raider;
+    newscript->RegisterSelf();
+    
+    newscript = new Script;
+    newscript->Name = "mob_azure_stalker";
+    newscript->GetAI = &GetAI_mob_azure_stalker;
+    newscript->RegisterSelf();
 }
diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.h b/src/server/scripts/Northrend/VioletHold/violet_hold.h
index 4476d5e823a..459cfc884ee 100644
--- a/src/server/scripts/Northrend/VioletHold/violet_hold.h
+++ b/src/server/scripts/Northrend/VioletHold/violet_hold.h
@@ -14,7 +14,8 @@ enum Creatures
     CREATURE_EREKEM_GUARD                           = 29395,
     CREATURE_MORAGG                                 = 29316,
     CREATURE_CYANIGOSA                              = 31134,
-    CREATURE_SINCLARI                               = 30658
+    CREATURE_SINCLARI                               = 30658,
+    NPC_VIOLET_HOLD_GUARD                           = 30659
 };
 
 enum Data
@@ -23,7 +24,12 @@ enum Data
     DATA_2ND_BOSS_EVENT,
     DATA_CYANIGOSA_EVENT,
     DATA_WAVE_COUNT,
-    DATA_REMOVE_NPC
+    DATA_REMOVE_NPC,
+    DATA_PORTAL_LOCATION,
+    DATA_DOOR_INTEGRITY,
+    DATA_NPC_PRESENCE_AT_DOOR,
+    DATA_NPC_PRESENCE_AT_DOOR_ADD,
+    DATA_NPC_PRESENCE_AT_DOOR_REMOVE
 };
 
 enum Data64
@@ -46,7 +52,8 @@ enum Data64
     DATA_XEVOZZ_CELL,
     DATA_ZURAMAT_CELL,
     DATA_MAIN_DOOR,
-    DATA_SINCLARI
+    DATA_SINCLARI,
+    DATA_TELEPORTATION_PORTAL
 };
 
 enum Bosses
-- 
cgit v1.2.3


From 3e03e8d26b1730701bf33d220bdc3c5752c420a7 Mon Sep 17 00:00:00 2001
From: click 
Date: Sat, 19 Jun 2010 21:17:26 +0200
Subject: FIx vmap3_assembler compile on linux

--HG--
branch : trunk
---
 src/tools/vmap3_assembler/CMakeLists.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/tools/vmap3_assembler/CMakeLists.txt b/src/tools/vmap3_assembler/CMakeLists.txt
index 62eaca7e13f..7d3c02eb58b 100644
--- a/src/tools/vmap3_assembler/CMakeLists.txt
+++ b/src/tools/vmap3_assembler/CMakeLists.txt
@@ -11,10 +11,11 @@
 
 include_directories(
   ${CMAKE_SOURCE_DIR}/externals/g3dlite
-  ${CMAKE_SOURCE_DIR}/src/server/collision/Maps
-  ${CMAKE_SOURCE_DIR}/src/server/collision/Models
   ${CMAKE_SOURCE_DIR}/src/server/shared
   ${CMAKE_SOURCE_DIR}/src/server/shared/Debugging
+  ${CMAKE_SOURCE_DIR}/src/server/shared/Logging
+  ${CMAKE_SOURCE_DIR}/src/server/collision/Maps
+  ${CMAKE_SOURCE_DIR}/src/server/collision/Models
   ${ACE_INCLUDE_DIR}
 )
 
-- 
cgit v1.2.3


From 29d9e40f7482ff5b5b0944a339fcf7b89464bf2d Mon Sep 17 00:00:00 2001
From: click 
Date: Sat, 19 Jun 2010 21:35:32 +0200
Subject: Some smaller fixes to the vmapextractor courtesy of Lynx3d (not using
 corefunctions + update errormessages to use the new fileextensions)

--HG--
branch : trunk
---
 src/server/collision/Maps/MapTree.cpp    | 7 ++++++-
 src/server/game/World/World.cpp          | 2 +-
 src/tools/vmap3_assembler/CMakeLists.txt | 1 +
 src/tools/vmap3_extractor/wmo.cpp        | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/server/collision/Maps/MapTree.cpp b/src/server/collision/Maps/MapTree.cpp
index af4073fcc8c..9f55920bcf9 100644
--- a/src/server/collision/Maps/MapTree.cpp
+++ b/src/server/collision/Maps/MapTree.cpp
@@ -16,7 +16,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "Errors.h"
 #include "MapTree.h"
 #include "ModelInstance.h"
 #include "VMapManager2.h"
@@ -27,6 +26,12 @@
 #include 
 #include 
 
+#ifndef NO_CORE_FUNCS
+    #include "Errors.h"
+#else
+    #define ASSERT(x)
+#endif
+
 using G3D::Vector3;
 
 namespace VMAP
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
index 0041bbaecc8..8a98da41cc1 100644
--- a/src/server/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
@@ -1274,7 +1274,7 @@ void World::SetInitialWorldSettings()
         ||m_configs[CONFIG_EXPANSION] && (
         !MapManager::ExistMapAndVMap(530,10349.6f,-6357.29f) || !MapManager::ExistMapAndVMap(530,-3961.64f,-13931.2f)))
     {
-        sLog.outError("Correct *.map files not found in path '%smaps' or *.vmap/*vmdir files in '%svmaps'. Please place *.map/*.vmap/*.vmdir files in appropriate directories or correct the DataDir value in the Trinityd.conf file.",m_dataPath.c_str(),m_dataPath.c_str());
+        sLog.outError("Correct *.map files not found in path '%smaps' or *.vmtree/*.vmtile files in '%svmaps'. Please place *.map/*.vmtree/*.vmtile files in appropriate directories or correct the DataDir value in the Trinityd.conf file.",m_dataPath.c_str(),m_dataPath.c_str());
         exit(1);
     }
 
diff --git a/src/tools/vmap3_assembler/CMakeLists.txt b/src/tools/vmap3_assembler/CMakeLists.txt
index 7d3c02eb58b..8c79fff6804 100644
--- a/src/tools/vmap3_assembler/CMakeLists.txt
+++ b/src/tools/vmap3_assembler/CMakeLists.txt
@@ -19,6 +19,7 @@ include_directories(
   ${ACE_INCLUDE_DIR}
 )
 
+add_definitions(-DNO_CORE_FUNCS)
 add_executable(vmap3assembler VMapAssembler.cpp)
 target_link_libraries(vmap3assembler collision g3dlib)
 
diff --git a/src/tools/vmap3_extractor/wmo.cpp b/src/tools/vmap3_extractor/wmo.cpp
index 650d2279f28..216a2248953 100644
--- a/src/tools/vmap3_extractor/wmo.cpp
+++ b/src/tools/vmap3_extractor/wmo.cpp
@@ -386,7 +386,7 @@ int WMOGroup::ConvertToVMAPGroupWmo(FILE *output, WMORoot *rootWMO, bool pPrecis
         if (rootWMO->liquidType & 4)
             liquidEntry = liquidType;
         else if (liquidType == 15)
-            liquidEntry = 0;
+            liquidEntry = 1; // first entry, generic "Water"
         else
             liquidEntry = liquidType + 1;
         // overwrite material type in header...
-- 
cgit v1.2.3


From 09923bde0638fd1987bc46d01ae3f0089316ba18 Mon Sep 17 00:00:00 2001
From: Xanadu 
Date: Sat, 19 Jun 2010 21:50:34 +0200
Subject: Fixed win build of vmap assembler, too.

--HG--
branch : trunk
---
 src/server/collision/Management/VMapManager2.cpp | 1 +
 src/server/collision/Maps/MapTree.h              | 1 -
 src/tools/vmap3_assembler/CMakeLists.txt         | 1 -
 3 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/server/collision/Management/VMapManager2.cpp b/src/server/collision/Management/VMapManager2.cpp
index 8e3681864d0..79d0b57790a 100644
--- a/src/server/collision/Management/VMapManager2.cpp
+++ b/src/server/collision/Management/VMapManager2.cpp
@@ -25,6 +25,7 @@
 #include "ModelInstance.h"
 #include "WorldModel.h"
 #include "VMapDefinitions.h"
+#include "Log.h"
 
 using G3D::Vector3;
 
diff --git a/src/server/collision/Maps/MapTree.h b/src/server/collision/Maps/MapTree.h
index f9c51d47b95..7a7af43e949 100644
--- a/src/server/collision/Maps/MapTree.h
+++ b/src/server/collision/Maps/MapTree.h
@@ -22,7 +22,6 @@
 #include "Define.h"
 #include "Dynamic/UnorderedMap.h"
 #include "BoundingIntervalHierarchy.h"
-#include "Log.h"
 
 namespace VMAP
 {
diff --git a/src/tools/vmap3_assembler/CMakeLists.txt b/src/tools/vmap3_assembler/CMakeLists.txt
index 8c79fff6804..4b86c1ffa16 100644
--- a/src/tools/vmap3_assembler/CMakeLists.txt
+++ b/src/tools/vmap3_assembler/CMakeLists.txt
@@ -13,7 +13,6 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/externals/g3dlite
   ${CMAKE_SOURCE_DIR}/src/server/shared
   ${CMAKE_SOURCE_DIR}/src/server/shared/Debugging
-  ${CMAKE_SOURCE_DIR}/src/server/shared/Logging
   ${CMAKE_SOURCE_DIR}/src/server/collision/Maps
   ${CMAKE_SOURCE_DIR}/src/server/collision/Models
   ${ACE_INCLUDE_DIR}
-- 
cgit v1.2.3


From 2db4af394927fed0e447dd66c933a7236eb41d39 Mon Sep 17 00:00:00 2001
From: Brian 
Date: Sat, 19 Jun 2010 13:54:19 -0600
Subject: * Changed references to Trinityd.conf / trinitycore.conf to proper *
 worldserver.conf

--HG--
branch : trunk
---
 src/server/game/DataStores/DBCStores.cpp                 |  2 +-
 src/server/game/Globals/ObjectMgr.cpp                    |  8 ++++----
 src/server/game/Server/Protocol/Handlers/MiscHandler.cpp |  2 +-
 src/server/game/World/World.cpp                          | 16 ++++++++--------
 src/server/shared/Database/Database.h                    |  2 +-
 5 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'src')

diff --git a/src/server/game/DataStores/DBCStores.cpp b/src/server/game/DataStores/DBCStores.cpp
index 510fbdad100..928b9f4f9e6 100644
--- a/src/server/game/DataStores/DBCStores.cpp
+++ b/src/server/game/DataStores/DBCStores.cpp
@@ -579,7 +579,7 @@ void LoadDBCStores(const std::string& dataPath)
     // error checks
     if (bad_dbc_files.size() >= DBCFilesCount)
     {
-        sLog.outError("\nIncorrect DataDir value in Trinityd.conf or ALL required *.dbc files (%d) not found by path: %sdbc",DBCFilesCount,dataPath.c_str());
+        sLog.outError("\nIncorrect DataDir value in worldserver.conf or ALL required *.dbc files (%d) not found by path: %sdbc",DBCFilesCount,dataPath.c_str());
         exit(1);
     }
     else if (!bad_dbc_files.empty())
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index e78dc02a93f..d616806a7cc 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -2587,7 +2587,7 @@ void ObjectMgr::LoadPetLevelInfo()
                     sLog.outErrorDb("Wrong (> %u) level %u in `pet_levelstats` table, ignoring.",STRONG_MAX_LEVEL,current_level);
                 else
                 {
-                    sLog.outDetail("Unused (> MaxPlayerLevel in Trinityd.conf) level %u in `pet_levelstats` table, ignoring.",current_level);
+                    sLog.outDetail("Unused (> MaxPlayerLevel in worldserver.conf) level %u in `pet_levelstats` table, ignoring.",current_level);
                     ++count;                                // make result loading percent "expected" correct in case disabled detail mode for example.
                 }
                 continue;
@@ -3024,7 +3024,7 @@ void ObjectMgr::LoadPlayerInfo()
                     sLog.outErrorDb("Wrong (> %u) level %u in `player_classlevelstats` table, ignoring.",STRONG_MAX_LEVEL,current_level);
                 else
                 {
-                    sLog.outDetail("Unused (> MaxPlayerLevel in Trinityd.conf) level %u in `player_classlevelstats` table, ignoring.",current_level);
+                    sLog.outDetail("Unused (> MaxPlayerLevel in worldserver.conf) level %u in `player_classlevelstats` table, ignoring.",current_level);
                     ++count;                                // make result loading percent "expected" correct in case disabled detail mode for example.
                 }
                 continue;
@@ -3121,7 +3121,7 @@ void ObjectMgr::LoadPlayerInfo()
                     sLog.outErrorDb("Wrong (> %u) level %u in `player_levelstats` table, ignoring.",STRONG_MAX_LEVEL,current_level);
                 else
                 {
-                    sLog.outDetail("Unused (> MaxPlayerLevel in Trinityd.conf) level %u in `player_levelstats` table, ignoring.",current_level);
+                    sLog.outDetail("Unused (> MaxPlayerLevel in worldserver.conf) level %u in `player_levelstats` table, ignoring.",current_level);
                     ++count;                                // make result loading percent "expected" correct in case disabled detail mode for example.
                 }
                 continue;
@@ -3231,7 +3231,7 @@ void ObjectMgr::LoadPlayerInfo()
                     sLog.outErrorDb("Wrong (> %u) level %u in `player_xp_for_level` table, ignoring.", STRONG_MAX_LEVEL,current_level);
                 else
                 {
-                    sLog.outDetail("Unused (> MaxPlayerLevel in TrinityCore.conf) level %u in `player_xp_for_levels` table, ignoring.",current_level);
+                    sLog.outDetail("Unused (> MaxPlayerLevel in worldserver.conf) level %u in `player_xp_for_levels` table, ignoring.",current_level);
                     ++count;                                // make result loading percent "expected" correct in case disabled detail mode for example.
                 }
                 continue;
diff --git a/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp b/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp
index 378a817137d..e4d329e6afc 100644
--- a/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp
@@ -374,7 +374,7 @@ void WorldSession::HandleLogoutRequestOpcode(WorldPacket & /*recv_data*/)
         return;
     }
 
-    //instant logout in taverns/cities or on taxi or for admins, gm's, mod's if its enabled in TrinityCore.conf
+    //instant logout in taverns/cities or on taxi or for admins, gm's, mod's if its enabled in worldserver.conf
     if (GetPlayer()->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING) || GetPlayer()->isInFlight() ||
         GetSecurity() >= sWorld.getConfig(CONFIG_INSTANT_LOGOUT))
     {
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
index 8a98da41cc1..4da78277c96 100644
--- a/src/server/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
@@ -652,7 +652,7 @@ void World::LoadConfigSettings(bool reload)
     {
         uint32 val = sConfig.GetIntDefault("WorldServerPort", DEFAULT_WORLDSERVER_PORT);
         if (val != m_configs[CONFIG_PORT_WORLD])
-            sLog.outError("WorldServerPort option can't be changed at Trinityd.conf reload, using current value (%u).",m_configs[CONFIG_PORT_WORLD]);
+            sLog.outError("WorldServerPort option can't be changed at worldserver.conf reload, using current value (%u).",m_configs[CONFIG_PORT_WORLD]);
     }
     else
         m_configs[CONFIG_PORT_WORLD] = sConfig.GetIntDefault("WorldServerPort", DEFAULT_WORLDSERVER_PORT);
@@ -661,7 +661,7 @@ void World::LoadConfigSettings(bool reload)
     {
         uint32 val = sConfig.GetIntDefault("SocketSelectTime", DEFAULT_SOCKET_SELECT_TIME);
         if (val != m_configs[CONFIG_SOCKET_SELECTTIME])
-            sLog.outError("SocketSelectTime option can't be changed at Trinityd.conf reload, using current value (%u).",m_configs[CONFIG_SOCKET_SELECTTIME]);
+            sLog.outError("SocketSelectTime option can't be changed at worldserver.conf reload, using current value (%u).",m_configs[CONFIG_SOCKET_SELECTTIME]);
     }
     else
         m_configs[CONFIG_SOCKET_SELECTTIME] = sConfig.GetIntDefault("SocketSelectTime", DEFAULT_SOCKET_SELECT_TIME);
@@ -670,7 +670,7 @@ void World::LoadConfigSettings(bool reload)
     m_configs[CONFIG_SESSION_ADD_DELAY] = sConfig.GetIntDefault("SessionAddDelay", 10000);
 
     m_configs[CONFIG_GROUP_XP_DISTANCE] = sConfig.GetIntDefault("MaxGroupXPDistance", 74);
-    /// \todo Add MonsterSight and GuarderSight (with meaning) in Trinityd.conf or put them as define
+    /// \todo Add MonsterSight and GuarderSight (with meaning) in worldserver.conf or put them as define
     m_configs[CONFIG_SIGHT_MONSTER] = sConfig.GetIntDefault("MonsterSight", 50);
     m_configs[CONFIG_SIGHT_GUARDER] = sConfig.GetIntDefault("GuarderSight", 50);
 
@@ -678,7 +678,7 @@ void World::LoadConfigSettings(bool reload)
     {
         uint32 val = sConfig.GetIntDefault("GameType", 0);
         if (val != m_configs[CONFIG_GAME_TYPE])
-            sLog.outError("GameType option can't be changed at Trinityd.conf reload, using current value (%u).",m_configs[CONFIG_GAME_TYPE]);
+            sLog.outError("GameType option can't be changed at worldserver.conf reload, using current value (%u).",m_configs[CONFIG_GAME_TYPE]);
     }
     else
         m_configs[CONFIG_GAME_TYPE] = sConfig.GetIntDefault("GameType", 0);
@@ -687,7 +687,7 @@ void World::LoadConfigSettings(bool reload)
     {
         uint32 val = sConfig.GetIntDefault("RealmZone", REALM_ZONE_DEVELOPMENT);
         if (val != m_configs[CONFIG_REALM_ZONE])
-            sLog.outError("RealmZone option can't be changed at Trinityd.conf reload, using current value (%u).",m_configs[CONFIG_REALM_ZONE]);
+            sLog.outError("RealmZone option can't be changed at worldserver.conf reload, using current value (%u).",m_configs[CONFIG_REALM_ZONE]);
     }
     else
         m_configs[CONFIG_REALM_ZONE] = sConfig.GetIntDefault("RealmZone", REALM_ZONE_DEVELOPMENT);
@@ -991,7 +991,7 @@ void World::LoadConfigSettings(bool reload)
     {
         uint32 val = sConfig.GetIntDefault("Expansion",1);
         if (val != m_configs[CONFIG_EXPANSION])
-            sLog.outError("Expansion option can't be changed at Trinityd.conf reload, using current value (%u).",m_configs[CONFIG_EXPANSION]);
+            sLog.outError("Expansion option can't be changed at worldserver.conf reload, using current value (%u).",m_configs[CONFIG_EXPANSION]);
     }
     else
         m_configs[CONFIG_EXPANSION] = sConfig.GetIntDefault("Expansion",1);
@@ -1181,7 +1181,7 @@ void World::LoadConfigSettings(bool reload)
     if (reload)
     {
         if (dataPath != m_dataPath)
-            sLog.outError("DataDir option can't be changed at Trinityd.conf reload, using current value (%s).",m_dataPath.c_str());
+            sLog.outError("DataDir option can't be changed at worldserver.conf reload, using current value (%s).",m_dataPath.c_str());
     }
     else
     {
@@ -1274,7 +1274,7 @@ void World::SetInitialWorldSettings()
         ||m_configs[CONFIG_EXPANSION] && (
         !MapManager::ExistMapAndVMap(530,10349.6f,-6357.29f) || !MapManager::ExistMapAndVMap(530,-3961.64f,-13931.2f)))
     {
-        sLog.outError("Correct *.map files not found in path '%smaps' or *.vmtree/*.vmtile files in '%svmaps'. Please place *.map/*.vmtree/*.vmtile files in appropriate directories or correct the DataDir value in the Trinityd.conf file.",m_dataPath.c_str(),m_dataPath.c_str());
+        sLog.outError("Correct *.map files not found in path '%smaps' or *.vmtree/*.vmtile files in '%svmaps'. Please place *.map/*.vmtree/*.vmtile files in appropriate directories or correct the DataDir value in the worldserver.conf file.",m_dataPath.c_str(),m_dataPath.c_str());
         exit(1);
     }
 
diff --git a/src/server/shared/Database/Database.h b/src/server/shared/Database/Database.h
index 1a516bdc3d7..96588adbf10 100644
--- a/src/server/shared/Database/Database.h
+++ b/src/server/shared/Database/Database.h
@@ -117,7 +117,7 @@ class Database
         bool _UpdateDataBlobValue(const uint32 guid, const uint32 field, const int32 value);
         bool _SetDataBlobValue(const uint32 guid, const uint32 field, const uint32 value);
 
-        // Writes SQL commands to a LOG file (see Trinityd.conf "LogSQL")
+        // Writes SQL commands to a LOG file (see worldserver.conf "LogSQL")
         bool PExecuteLog(const char *format,...) ATTR_PRINTF(2,3);
 
         bool BeginTransaction();
-- 
cgit v1.2.3


From f43727e18cbc9523be81d3b347ae6cf07616322c Mon Sep 17 00:00:00 2001
From: Machiavelli 
Date: Sat, 19 Jun 2010 22:08:03 +0200
Subject: Change some map/vmap-related runtime output to sLog format.

--HG--
branch : trunk
---
 src/server/collision/Maps/MapTree.cpp | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/server/collision/Maps/MapTree.cpp b/src/server/collision/Maps/MapTree.cpp
index 9f55920bcf9..af92ec37ae7 100644
--- a/src/server/collision/Maps/MapTree.cpp
+++ b/src/server/collision/Maps/MapTree.cpp
@@ -20,6 +20,7 @@
 #include "ModelInstance.h"
 #include "VMapManager2.h"
 #include "VMapDefinitions.h"
+#include "Log.h"
 
 #include 
 #include 
@@ -56,7 +57,7 @@ namespace VMAP
             void operator()(const Vector3& point, uint32 entry)
             {
 #ifdef VMAP_DEBUG
-                std::cout << "trying to intersect '" << prims[entry].name << "'\n";
+                sLog.outDebug("trying to intersect '%s'", prims[entry].name.c_str());
 #endif
                 prims[entry].intersectPoint(point, aInfo);
             }
@@ -72,7 +73,7 @@ namespace VMAP
             void operator()(const Vector3& point, uint32 entry)
             {
 #ifdef VMAP_DEBUG
-                std::cout << "trying to intersect '" << prims[entry].name << "'\n";
+                sLog.outDebug("trying to intersect '%s'", prims[entry].name.c_str());
 #endif
                 if (prims[entry].GetLocationInfo(point, locInfo))
                     result = true;
@@ -269,7 +270,7 @@ namespace VMAP
 
     bool StaticMapTree::InitMap(const std::string &fname, VMapManager2 *vm)
     {
-        std::cout << "Initializing StaticMapTree '" << fname << "'\n";
+        sLog.outDebug("Initializing StaticMapTree '%s'", fname.c_str());
         bool success = true;
         std::string fullname = iBasePath + fname;
         FILE *rf = fopen(fullname.c_str(), "rb");
@@ -297,12 +298,12 @@ namespace VMAP
             // only non-tiled maps have them, and if so exactly one (so far at least...)
             ModelSpawn spawn;
 #ifdef VMAP_DEBUG
-            std::cout << "Map isTiled:" << bool(iIsTiled) << std::endl;
+            sLog.outDebug("Map isTiled: %u", static_cast(iIsTiled));
 #endif
             if (!iIsTiled && ModelSpawn::readFromFile(rf, spawn))
             {
                 WorldModel *model = vm->acquireModelInstance(iBasePath, spawn.name);
-                std::cout << "StaticMapTree::InitMap(): loading " << spawn.name << std::endl;
+                sLog.outDebug("StaticMapTree::InitMap(): loading %s", spawn.name.c_str());
                 if (model)
                 {
                     // assume that global model always is the first and only tree value (could be improved...)
@@ -312,7 +313,7 @@ namespace VMAP
                 else
                 {
                     success = false;
-                    std::cout << "error: could not acquire WorldModel pointer!\n";
+                    sLog.outError("Could not acquire WorldModel pointer!");
                 }
             }
 
@@ -348,7 +349,7 @@ namespace VMAP
         }
         if (!iTreeValues)
         {
-            std::cout << "Tree has not been initialized!\n";
+            sLog.outError("Tree has not been initialized! [%u,%u]", tileX, tileY);
             return false;
         }
         bool result = true;
@@ -369,7 +370,8 @@ namespace VMAP
                 {
                     // acquire model instance
                     WorldModel *model = vm->acquireModelInstance(iBasePath, spawn.name);
-                    if (!model) std::cout << "error: could not acquire WorldModel pointer!\n";
+                    if (!model)
+                        sLog.outError("error: could not acquire WorldModel pointer! [%u,%u]", tileX, tileY);
 
                     // update tree
                     uint32 referencedVal;
@@ -380,7 +382,7 @@ namespace VMAP
 #ifdef VMAP_DEBUG
                         if (referencedVal > iNTreeValues)
                         {
-                            std::cout << "invalid tree element! (" << referencedVal << "/" << iNTreeValues << ")\n";
+                            sLog.outDebug("invalid tree element! (%u/%u)", referencedVal, iNTreeValues);
                             continue;
                         }
 #endif
@@ -391,8 +393,10 @@ namespace VMAP
                     {
                         ++iLoadedSpawns[referencedVal];
 #ifdef VMAP_DEBUG
-                        if (iTreeValues[referencedVal].ID != spawn.ID) std::cout << "error: trying to load wrong spawn in node!\n";
-                        else if (iTreeValues[referencedVal].name != spawn.name) std::cout << "error: name collision on GUID="<< spawn.ID << "\n";
+                        if (iTreeValues[referencedVal].ID != spawn.ID)
+                            sLog.outDebug("error: trying to load wrong spawn in node!");
+                        else if (iTreeValues[referencedVal].name != spawn.name)
+                            sLog.outDebug("error: name collision on GUID=%u", spawn.ID);
 #endif
                     }
                 }
@@ -413,7 +417,7 @@ namespace VMAP
         loadedTileMap::iterator tile = iLoadedTiles.find(tileID);
         if (tile == iLoadedTiles.end())
         {
-            std::cout << "WARNING: trying to unload non-loaded tile. Map:" << iMapID << " X:" << tileX << " Y:" << tileY << std::endl;
+            sLog.outError("WARNING: trying to unload non-loaded tile. Map:%u X:%u Y:%u", iMapID, tileX, tileY);
             return;
         }
         if (tile->second) // file associated with tile
@@ -442,7 +446,7 @@ namespace VMAP
                         fread(&referencedNode, sizeof(uint32), 1, tf);
                         if (!iLoadedSpawns.count(referencedNode))
                         {
-                            std::cout << "error! trying to unload non-referenced model '" << spawn.name << "' (ID:" << spawn.ID << ")\n";
+                            sLog.outError("Trying to unload non-referenced model '%s' (ID:%u)", spawn.name.c_str(), spawn.ID);
                         }
                         else if (--iLoadedSpawns[referencedNode] == 0)
                         {
-- 
cgit v1.2.3


From 78fab5fa18fa7c3199c111240234b03cc2b45328 Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Sat, 19 Jun 2010 23:01:26 +0200
Subject: Violet Hold: Some fixes, infinite loop one included

--HG--
branch : trunk
---
 src/server/scripts/Northrend/VioletHold/violet_hold.cpp | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp
index b46f4d68c11..7744a51cfb3 100644
--- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp
+++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp
@@ -383,7 +383,7 @@ struct npc_teleportation_portalAI : public ScriptedAI
                     {
                         bPortalGuardianOrKeeperOrEliteSpawn = true;
                         uint8 k = pInstance->GetData(DATA_WAVE_COUNT) < 12 ? 2 : 3;
-                        for (uint8 i = 0; i < k; i)
+                        for (uint8 i = 0; i < k; ++i)
                         {
                             uint32 entry = RAND(CREATURE_AZURE_CAPTAIN,CREATURE_AZURE_RAIDER,CREATURE_AZURE_STALKER,CREATURE_AZURE_SORCEROR);
                             DoSummon(entry, me, 2.0f, 20000, TEMPSUMMON_DEAD_DESPAWN);
@@ -394,7 +394,7 @@ struct npc_teleportation_portalAI : public ScriptedAI
                 else
                 {
                     // if all spawned elites have died kill portal
-                    if(!listOfMobs.size())
+                    if(listOfMobs.empty())
                     {
                         me->Kill(me, false);
                         me->RemoveCorpse();
@@ -408,7 +408,7 @@ struct npc_teleportation_portalAI : public ScriptedAI
                     if(bPortalGuardianOrKeeperOrEliteSpawn)
                     {
                         uint8 k = pInstance->GetData(DATA_WAVE_COUNT) < 12 ? 3 : 4;
-                        for (uint8 i = 0; i < k; i)
+                        for (uint8 i = 0; i < k; ++i)
                         {
                             uint32 entry = RAND(CREATURE_AZURE_INVADER_1,CREATURE_AZURE_INVADER_2,CREATURE_AZURE_SPELLBREAKER_1,CREATURE_AZURE_SPELLBREAKER_2,CREATURE_AZURE_MAGE_SLAYER_1,CREATURE_AZURE_MAGE_SLAYER_2,CREATURE_AZURE_BINDER_1,CREATURE_AZURE_BINDER_2);
                             DoSummon(entry, me, 2.0f, 20000, TEMPSUMMON_DEAD_DESPAWN);
@@ -439,14 +439,14 @@ struct npc_teleportation_portalAI : public ScriptedAI
             pInstance->SetData(DATA_WAVE_COUNT,pInstance->GetData(DATA_WAVE_COUNT)+1);
     }
 
-    void JustSummoned(Creature *summoned)
+    void JustSummoned(Creature *pSummoned)
     {
-        listOfMobs.Summon(summoned);
+        listOfMobs.Summon(pSummoned);
     }
 
-    void SummonedMobDied(Creature *summoned)
+    void SummonedCreatureDespawn(Creature *pSummoned)
     {
-        listOfMobs.Despawn(summoned);
+        listOfMobs.Despawn(pSummoned);
     }
 };
 
@@ -562,8 +562,6 @@ struct violet_hold_trashAI : public npc_escortAI
     void JustDied(Unit *unit)
     {
         Creature* portal = Unit::GetCreature((*me),pInstance->GetData64(DATA_TELEPORTATION_PORTAL));
-        if (portal)
-            CAST_AI(npc_teleportation_portalAI,portal->AI())->SummonedMobDied(me);
         pInstance->SetData(DATA_NPC_PRESENCE_AT_DOOR_REMOVE,1);
     }
 
-- 
cgit v1.2.3


From cbf7d1594765d44f8998dad49db60d0479a30f04 Mon Sep 17 00:00:00 2001
From: Machiavelli 
Date: Sat, 19 Jun 2010 23:48:10 +0200
Subject: Add another assert to track down an issue where variable gets
 infinity value

--HG--
branch : trunk
---
 src/server/collision/Management/VMapManager2.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/server/collision/Management/VMapManager2.cpp b/src/server/collision/Management/VMapManager2.cpp
index 79d0b57790a..1936ba6ebba 100644
--- a/src/server/collision/Management/VMapManager2.cpp
+++ b/src/server/collision/Management/VMapManager2.cpp
@@ -280,6 +280,7 @@ namespace VMAP
             if (instanceTree->second->GetLocationInfo(pos, info))
             {
                 floor = info.ground_Z;
+                ASSERT(floor < std::numeric_limits::max());
                 type = info.hitModel->GetLiquidType();
                 if (ReqLiquidType && !(type & ReqLiquidType))
                     return false;
-- 
cgit v1.2.3


From fb7dc518264201e0aac7c03d662cd363af0d5063 Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Sat, 19 Jun 2010 23:51:33 +0200
Subject: Fix spells 50811 & 61547 (Krystallus shatter), by microbius51

--HG--
branch : trunk
---
 src/server/game/Spells/Auras/SpellAuras.cpp   | 4 ++++
 src/server/game/Spells/Auras/SpellEffects.cpp | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp
index 0b49322ab8b..c4aeca15a13 100644
--- a/src/server/game/Spells/Auras/SpellAuras.cpp
+++ b/src/server/game/Spells/Auras/SpellAuras.cpp
@@ -903,6 +903,10 @@ void Aura::HandleAuraSpecificMods(AuraApplication const * aurApp, Unit * caster,
                         if (GetStackAmount() >= 5 && !target->HasAura(33652))
                             target->CastSpell(target, 33652, true);
                         break;
+                    case 50836: //Petrifying Grip, becomes stoned
+                        if (GetStackAmount() >= 5 && !target->HasAura(50812))
+                            target->CastSpell(target, 50812, true);
+                        break;
                     case 60970: // Heroic Fury (remove Intercept cooldown)
                         if (target->GetTypeId() == TYPEID_PLAYER)
                             target->ToPlayer()->RemoveSpellCooldown(20252, true);
diff --git a/src/server/game/Spells/Auras/SpellEffects.cpp b/src/server/game/Spells/Auras/SpellEffects.cpp
index f765acb1f2a..0d44be000a8 100644
--- a/src/server/game/Spells/Auras/SpellEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellEffects.cpp
@@ -391,8 +391,9 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
                             return;
                         break;
                     }
-                    // gruul's shatter
-                    case 33671:
+                    case 33671: // gruul's shatter
+                    case 50811: //krystallus shatter ( Normal )
+                    case 61547: //krystallus shatter ( Heroic )
                     {
                         // don't damage self and only players
                         if (unitTarget->GetGUID() == m_caster->GetGUID() || unitTarget->GetTypeId() != TYPEID_PLAYER)
-- 
cgit v1.2.3


From 2c407aca1fd7ae495d3c4c2995fe39bda0cef2b9 Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Sat, 19 Jun 2010 23:52:24 +0200
Subject: Ulduar: Halls of Stone, Krystallus: Fix Shatter usage

--HG--
branch : trunk
---
 .../Ulduar/HallsOfStone/boss_krystallus.cpp        | 32 ++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp
index 3ab55799ea3..071bc8d01ad 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp
@@ -20,6 +20,9 @@ enum Spells
     SPELL_GROUND_SLAM                              = 50827,
     SPELL_SHATTER                                  = 50810,
     H_SPELL_SHATTER                                = 61546,
+    SPELL_SHATTER_EFFECT                           = 50811,
+    H_SPELL_SHATTER_EFFECT                         = 61547,
+    SPELL_STONED                                   = 50812,
     SPELL_STOMP                                    = 48131,
     H_SPELL_STOMP                                  = 59744
 };
@@ -108,8 +111,7 @@ struct boss_krystallusAI : public ScriptedAI
         {
             if (uiShatterTimer <= diff)
             {
-                DoCast(me, SPELL_SHATTER);
-                bIsSlam = false;
+                DoCast(me, DUNGEON_MODE(SPELL_SHATTER, H_SPELL_SHATTER));
             } else uiShatterTimer -= diff;
         }
 
@@ -130,6 +132,32 @@ struct boss_krystallusAI : public ScriptedAI
             return;
         DoScriptText(SAY_KILL, me);
     }
+
+    void SpellHitTarget(Unit* pTarget, const SpellEntry* pSpell)
+    {
+        //this part should be in the core
+        if (pSpell->Id == SPELL_SHATTER || pSpell->Id == H_SPELL_SHATTER)
+        {
+            //this spell must have custom handling in the core, dealing damage based on distance
+            pTarget->CastSpell(pTarget, DUNGEON_MODE(SPELL_SHATTER_EFFECT, H_SPELL_SHATTER_EFFECT), true);
+
+            if (pTarget->HasAura(SPELL_STONED))
+                pTarget->RemoveAurasDueToSpell(SPELL_STONED);
+
+            //clear this, if we are still performing
+            if (bIsSlam)
+            {
+                bIsSlam = false;
+
+                //and correct movement, if not already
+                if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() != TARGETED_MOTION_TYPE)
+                {
+                    if (me->getVictim())
+                        me->GetMotionMaster()->MoveChase(me->getVictim());
+                }
+            }
+        }
+    }
 };
 
 CreatureAI* GetAI_boss_krystallus(Creature* pCreature)
-- 
cgit v1.2.3


From d024e563f8a9b4531f3e25b454bc7ef98ad1cfaf Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Sun, 20 Jun 2010 00:37:02 +0200
Subject: Fix Grievious bite (48920): now if removed when target is fully
 healed

--HG--
branch : trunk
---
 src/server/game/Spells/Auras/SpellEffects.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src')

diff --git a/src/server/game/Spells/Auras/SpellEffects.cpp b/src/server/game/Spells/Auras/SpellEffects.cpp
index 0d44be000a8..e4ad573e45a 100644
--- a/src/server/game/Spells/Auras/SpellEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellEffects.cpp
@@ -2913,6 +2913,10 @@ void Spell::SpellDamageHeal(uint32 /*i*/)
         else
             addhealth = caster->SpellHealingBonus(unitTarget, m_spellInfo, addhealth, HEAL);
 
+        // Remove Grievious bite if fully healed
+        if (unitTarget->HasAura(48920) && (unitTarget->GetHealth() + addhealth >= unitTarget->GetMaxHealth()))
+            unitTarget->RemoveAura(48920);
+
         m_damage -= addhealth;
     }
 }
-- 
cgit v1.2.3


From 1d247017e57e549c943a387413d21b8fbef396cf Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Sun, 20 Jun 2010 00:55:54 +0200
Subject: Fix Spell 54732, Defibrillate from Gnomish Army Knife (now has
 success chance roll)

--HG--
branch : trunk
---
 src/server/game/Spells/Auras/SpellEffects.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src')

diff --git a/src/server/game/Spells/Auras/SpellEffects.cpp b/src/server/game/Spells/Auras/SpellEffects.cpp
index e4ad573e45a..dd205e99cd9 100644
--- a/src/server/game/Spells/Auras/SpellEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellEffects.cpp
@@ -6842,6 +6842,13 @@ void Spell::EffectResurrect(uint32 /*effIndex*/)
                 return;
             }
             break;
+        // Defibrillate ( Gnomish Army Knife) have 67% chance on success_list
+        case 54732:
+            if (roll_chance_i(33))
+            {
+                return;
+            }
+            break;
         default:
             break;
     }
-- 
cgit v1.2.3


From a2ab87962dc46e22e2dbc90690af612e9f2cef41 Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Sun, 20 Jun 2010 01:34:11 +0200
Subject: Minor cleansing

--HG--
branch : trunk
---
 src/server/game/Spells/Auras/SpellEffects.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Spells/Auras/SpellEffects.cpp b/src/server/game/Spells/Auras/SpellEffects.cpp
index dd205e99cd9..f2cd72acd6f 100644
--- a/src/server/game/Spells/Auras/SpellEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellEffects.cpp
@@ -392,8 +392,8 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
                         break;
                     }
                     case 33671: // gruul's shatter
-                    case 50811: //krystallus shatter ( Normal )
-                    case 61547: //krystallus shatter ( Heroic )
+                    case 50811: // krystallus shatter ( Normal )
+                    case 61547: // krystallus shatter ( Heroic )
                     {
                         // don't damage self and only players
                         if (unitTarget->GetGUID() == m_caster->GetGUID() || unitTarget->GetTypeId() != TYPEID_PLAYER)
-- 
cgit v1.2.3


From 1f709c7d1972f12555fc0adb3c9d059db6bfc8f7 Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Sun, 20 Jun 2010 01:37:58 +0200
Subject: Fix spells 52942 & 58837 (Loken Pulsing Shockwave: dinstance
 depending damage, by Josh

--HG--
branch : trunk
---
 src/server/game/Spells/Auras/SpellEffects.cpp | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'src')

diff --git a/src/server/game/Spells/Auras/SpellEffects.cpp b/src/server/game/Spells/Auras/SpellEffects.cpp
index f2cd72acd6f..e6e181815a1 100644
--- a/src/server/game/Spells/Auras/SpellEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellEffects.cpp
@@ -431,6 +431,22 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
                         damage = (m_caster->getLevel() - 60) * 4 + 60;
                         break;
                     }
+                    
+                    // Loken Pulsing Shockwave
+                    case 59837:
+                    case 52942:
+                    {
+                        // don't damage self and only players
+                        if(unitTarget->GetGUID() == m_caster->GetGUID() || unitTarget->GetTypeId() != TYPEID_PLAYER)
+                            return;
+                        
+                        float radius = GetSpellRadiusForHostile(sSpellRadiusStore.LookupEntry(m_spellInfo->EffectRadiusIndex[0]));
+                        if (!radius)
+                            return;
+                        float distance = m_caster->GetDistance2d(unitTarget);
+                        damage = (distance > radius) ? 0 : int32(m_spellInfo->EffectBasePoints[0]*distance);
+                        break;
+                    }
                 }
                 break;
             }
-- 
cgit v1.2.3


From bd599aea170762fb030d4167bfd0a31c0fad0dc7 Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Sun, 20 Jun 2010 04:34:58 +0200
Subject: Fix spells 48129, 60320 & 60321 (Scrolls of Recall I, II & III) Now
 they buff Lost! and stop teleporting if they are used beyond max safe level
 Lost! buff is not fixed so there is no random teleport penalty yet

--HG--
branch : trunk
---
 src/server/game/Spells/Auras/SpellEffects.cpp | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'src')

diff --git a/src/server/game/Spells/Auras/SpellEffects.cpp b/src/server/game/Spells/Auras/SpellEffects.cpp
index e6e181815a1..a922686d2c4 100644
--- a/src/server/game/Spells/Auras/SpellEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellEffects.cpp
@@ -2553,6 +2553,27 @@ void Spell::EffectTeleportUnits(uint32 /*i*/)
     if (!unitTarget || unitTarget->isInFlight())
         return;
 
+    // Pre effects
+    uint8 uiMaxSafeLevel = 0;
+    switch (m_spellInfo->Id)
+    {
+        case 48129:  // Scroll of Recall
+            uiMaxSafeLevel = 40;
+        case 60320:  // Scroll of Recall II
+            if (!uiMaxSafeLevel)
+                uiMaxSafeLevel = 70;
+        case 60321:  // Scroll of Recal III
+            if (!uiMaxSafeLevel)
+                uiMaxSafeLevel = 80;
+            
+            if (unitTarget->getLevel() > uiMaxSafeLevel)
+            {
+                unitTarget->AddAura(60444,unitTarget); //Apply Lost! Aura
+                return;
+            }
+            break;
+    }
+
     // If not exist data for dest location - return
     if (!m_targets.HasDst())
     {
-- 
cgit v1.2.3


From 77565846c6e894e2c3ea86fdbdd48670daae0a27 Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Sun, 20 Jun 2010 06:05:16 +0200
Subject: Fix Spell 20066 (Paladin, Repeteance), by maxdestroyer Now removes
 Righteous Vengeance

--HG--
branch : trunk
---
 src/server/game/Spells/Auras/SpellAuras.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src')

diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp
index c4aeca15a13..4681d6636fb 100644
--- a/src/server/game/Spells/Auras/SpellAuras.cpp
+++ b/src/server/game/Spells/Auras/SpellAuras.cpp
@@ -1408,6 +1408,11 @@ void Aura::HandleAuraSpecificMods(AuraApplication const * aurApp, Unit * caster,
                     else
                         target->RemoveAurasDueToSpell(64364, GetCasterGUID());
                     break;
+                // Repeteance. remove Righteous Vengeance
+                case 20066:
+                    if (apply && target->HasAura(61840))
+                        target->RemoveAura(61840);
+                    break;
             }
             break;
         case SPELLFAMILY_DEATHKNIGHT:
-- 
cgit v1.2.3


From 1c427950812a654b02b43ca456c7ece30c649ab9 Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Sun, 20 Jun 2010 11:44:18 +0200
Subject: Backed out changeset 444ae3a9769f Going to use a spell_linked_spell
 based better approach

--HG--
branch : trunk
---
 src/server/game/Spells/Auras/SpellAuras.cpp | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp
index 4681d6636fb..c4aeca15a13 100644
--- a/src/server/game/Spells/Auras/SpellAuras.cpp
+++ b/src/server/game/Spells/Auras/SpellAuras.cpp
@@ -1408,11 +1408,6 @@ void Aura::HandleAuraSpecificMods(AuraApplication const * aurApp, Unit * caster,
                     else
                         target->RemoveAurasDueToSpell(64364, GetCasterGUID());
                     break;
-                // Repeteance. remove Righteous Vengeance
-                case 20066:
-                    if (apply && target->HasAura(61840))
-                        target->RemoveAura(61840);
-                    break;
             }
             break;
         case SPELLFAMILY_DEATHKNIGHT:
-- 
cgit v1.2.3


From d72185a57a32778ce566ecddfeb60228ab13d026 Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Sun, 20 Jun 2010 16:27:23 +0200
Subject: Violet Hold: Fix portal #2 spawning. Some minor cleansing and pointer
 checks

--HG--
branch : trunk
---
 .../scripts/Northrend/VioletHold/violet_hold.cpp   | 176 +++++++++++----------
 1 file changed, 90 insertions(+), 86 deletions(-)

(limited to 'src')

diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp
index 7744a51cfb3..516163a0834 100644
--- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp
+++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp
@@ -317,7 +317,7 @@ bool GossipHello_npc_sinclari(Player* pPlayer, Creature* pCreature)
         pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,GOSSIP_ITEM_1,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+2);
         pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,GOSSIP_START_EVENT,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+1);
         pPlayer->SEND_GOSSIP_MENU(13853, pCreature->GetGUID());
-    }else
+    } else
         pPlayer->SEND_GOSSIP_MENU(13910, pCreature->GetGUID());
     return true;
 }
@@ -377,7 +377,7 @@ struct npc_teleportation_portalAI : public ScriptedAI
         {
             // spawn elite mobs and then set portals visibility to make it look like it dissapeard
             case 0:
-                if(!bPortalGuardianOrKeeperOrEliteSpawn)
+                if (!bPortalGuardianOrKeeperOrEliteSpawn)
                 {
                     if (uiSpawnTimer <= diff)
                     {
@@ -394,7 +394,7 @@ struct npc_teleportation_portalAI : public ScriptedAI
                 else
                 {
                     // if all spawned elites have died kill portal
-                    if(listOfMobs.empty())
+                    if (listOfMobs.empty())
                     {
                         me->Kill(me, false);
                         me->RemoveCorpse();
@@ -405,7 +405,7 @@ struct npc_teleportation_portalAI : public ScriptedAI
             case 1:
                 if (uiSpawnTimer <= diff)
                 {
-                    if(bPortalGuardianOrKeeperOrEliteSpawn)
+                    if (bPortalGuardianOrKeeperOrEliteSpawn)
                     {
                         uint8 k = pInstance->GetData(DATA_WAVE_COUNT) < 12 ? 3 : 4;
                         for (uint8 i = 0; i < k; ++i)
@@ -444,7 +444,7 @@ struct npc_teleportation_portalAI : public ScriptedAI
         listOfMobs.Summon(pSummoned);
     }
 
-    void SummonedCreatureDespawn(Creature *pSummoned)
+    void SummonedMobDied(Creature *pSummoned)
     {
         listOfMobs.Despawn(pSummoned);
     }
@@ -461,7 +461,8 @@ struct violet_hold_trashAI : public npc_escortAI
     {
         pInstance = c->GetInstanceData();
         bHasGotMovingPoints = false;
-        portalLocationID = pInstance->GetData(DATA_PORTAL_LOCATION);
+        if (pInstance)
+            portalLocationID = pInstance->GetData(DATA_PORTAL_LOCATION);
         Reset();
     }
 
@@ -480,23 +481,23 @@ struct violet_hold_trashAI : public npc_escortAI
                    CreatureStartAttackDoor(me->GetGUID());
                 break;
             case 1:
-                if((uiPointId == 8 && secondPortalRouteID == 0) || (uiPointId == 7 && secondPortalRouteID == 1))
+                if ((uiPointId == 8 && secondPortalRouteID == 0) || (uiPointId == 7 && secondPortalRouteID == 1))
                     CreatureStartAttackDoor(me->GetGUID());
                 break;
             case 2:
-                if(uiPointId == 7)
+                if (uiPointId == 7)
                    CreatureStartAttackDoor(me->GetGUID());
                 break;
             case 3:
-                if(uiPointId == 8)
+                if (uiPointId == 8)
                     CreatureStartAttackDoor(me->GetGUID());
                 break;
             case 4:
-                if(uiPointId == 5)
+                if (uiPointId == 5)
                     CreatureStartAttackDoor(me->GetGUID());
                 break;
             case 5:
-                if(uiPointId == 3)
+                if (uiPointId == 3)
                     CreatureStartAttackDoor(me->GetGUID());
                 break;
         }
@@ -504,10 +505,10 @@ struct violet_hold_trashAI : public npc_escortAI
 
     void UpdateAI(const uint32)
     {
-        if(pInstance->GetData(DATA_MAIN_DOOR) != GO_STATE_READY)
+        if (pInstance->GetData(DATA_MAIN_DOOR) != GO_STATE_READY)
                 me->CastStop();
 
-        if(!bHasGotMovingPoints)
+        if (!bHasGotMovingPoints)
         {
             bHasGotMovingPoints = true;
                 switch(portalLocationID)
@@ -561,15 +562,18 @@ struct violet_hold_trashAI : public npc_escortAI
 
     void JustDied(Unit *unit)
     {
-        Creature* portal = Unit::GetCreature((*me),pInstance->GetData64(DATA_TELEPORTATION_PORTAL));
-        pInstance->SetData(DATA_NPC_PRESENCE_AT_DOOR_REMOVE,1);
+        if (Creature* portal = Unit::GetCreature((*me),pInstance->GetData64(DATA_TELEPORTATION_PORTAL)))
+            CAST_AI(npc_teleportation_portalAI,portal->AI())->SummonedMobDied(me);
+        if (pInstance)
+            pInstance->SetData(DATA_NPC_PRESENCE_AT_DOOR_REMOVE,1);
     }
 
     void CreatureStartAttackDoor(uint32 creature_guid)
     {
         me->SetReactState(REACT_PASSIVE);
         DoCast(SPELL_DESTROY_DOOR_SEAL);
-        pInstance->SetData(DATA_NPC_PRESENCE_AT_DOOR_ADD,1);
+        if (pInstance)
+            pInstance->SetData(DATA_NPC_PRESENCE_AT_DOOR_ADD,1);
     }
 
 };
@@ -599,39 +603,39 @@ struct mob_azure_invaderAI : public violet_hold_trashAI
         violet_hold_trashAI::UpdateAI(diff);
         npc_escortAI::UpdateAI(diff);
 
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if(me->GetEntry() == CREATURE_AZURE_INVADER_1)
+        if (me->GetEntry() == CREATURE_AZURE_INVADER_1)
         {
-            if(uiCleaveTimer <= diff)
+            if (uiCleaveTimer <= diff)
             {
                 DoCast(me->getVictim(),SPELL_CLEAVE);
                 uiCleaveTimer = 5000;
-            }else uiCleaveTimer -= diff;
+            } else uiCleaveTimer -= diff;
 
-            if(uiImpaleTimer <= diff)
+            if (uiImpaleTimer <= diff)
             {
                 Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true);
-                if(pTarget)
+                if (pTarget)
                     DoCast(pTarget,SPELL_IMPALE);
                 uiImpaleTimer = 4000;
-            }else uiImpaleTimer -= diff;
+            } else uiImpaleTimer -= diff;
         }
 
-        if(me->GetEntry() == CREATURE_AZURE_INVADER_2)
+        if (me->GetEntry() == CREATURE_AZURE_INVADER_2)
         {
-            if(uiBrutalStrikeTimer <= diff)
+            if (uiBrutalStrikeTimer <= diff)
             {
                 DoCast(me->getVictim(),SPELL_BRUTAL_STRIKE);
                 uiBrutalStrikeTimer = 5000;
-            }else uiBrutalStrikeTimer -= diff;
+            } else uiBrutalStrikeTimer -= diff;
 
-            if(uiSunderArmorTimer <= diff)
+            if (uiSunderArmorTimer <= diff)
             {
                 DoCast(me->getVictim(),SPELL_SUNDER_ARMOR);
                 uiSunderArmorTimer = urand(8000,10000);
-            }else uiSunderArmorTimer -= diff;
+            } else uiSunderArmorTimer -= diff;
 
             DoMeleeAttackIfReady();
         }
@@ -666,43 +670,43 @@ struct mob_azure_spellbreakerAI : public violet_hold_trashAI
         violet_hold_trashAI::UpdateAI(diff);
         npc_escortAI::UpdateAI(diff);
 
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if(me->GetEntry() == CREATURE_AZURE_SPELLBREAKER_1)
+        if (me->GetEntry() == CREATURE_AZURE_SPELLBREAKER_1)
         {
-            if(uiArcaneBlastTimer <= diff)
+            if (uiArcaneBlastTimer <= diff)
             {
                 Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true);
-                if(pTarget)
+                if (pTarget)
                     DoCast(pTarget,DUNGEON_MODE(SPELL_ARCANE_BLAST,H_SPELL_ARCANE_BLAST));
                 uiArcaneBlastTimer = 6000;
-            }else uiArcaneBlastTimer -= diff;
+            } else uiArcaneBlastTimer -= diff;
 
-            if(uiSlowTimer <= diff)
+            if (uiSlowTimer <= diff)
             {
                 Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true);
-                    if(pTarget)
+                    if (pTarget)
                     DoCast(pTarget,SPELL_SLOW);
                 uiSlowTimer = 5000;
-            }else uiSlowTimer -= diff;
+            } else uiSlowTimer -= diff;
         }
 
-        if(me->GetEntry() == CREATURE_AZURE_SPELLBREAKER_2)
+        if (me->GetEntry() == CREATURE_AZURE_SPELLBREAKER_2)
         {
-            if(uiChainsOfIceTimer <= diff)
+            if (uiChainsOfIceTimer <= diff)
             {
                 Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true);
-                if(pTarget)
+                if (pTarget)
                     DoCast(pTarget,SPELL_CHAINS_OF_ICE);
                 uiChainsOfIceTimer = 7000;
-            }else uiChainsOfIceTimer -= diff;
+            } else uiChainsOfIceTimer -= diff;
 
-            if(uiConeOfColdTimer <= diff)
+            if (uiConeOfColdTimer <= diff)
             {
                DoCast(DUNGEON_MODE(SPELL_CONE_OF_COLD,H_SPELL_CONE_OF_COLD));
                 uiConeOfColdTimer = 5000;
-            }else uiConeOfColdTimer -= diff;
+            } else uiConeOfColdTimer -= diff;
         }
 
         DoMeleeAttackIfReady();
@@ -734,41 +738,41 @@ struct mob_azure_binderAI : public violet_hold_trashAI
         violet_hold_trashAI::UpdateAI(diff);
         npc_escortAI::UpdateAI(diff);
 
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if(me->GetEntry() == CREATURE_AZURE_BINDER_1)
+        if (me->GetEntry() == CREATURE_AZURE_BINDER_1)
         {
-            if(uiArcaneExplosionTimer <= diff)
+            if (uiArcaneExplosionTimer <= diff)
             {
                 DoCast(DUNGEON_MODE(SPELL_ARCANE_EXPLOSION,H_SPELL_ARCANE_EXPLOSION));
                 uiArcaneExplosionTimer = 5000;
-            }else uiArcaneExplosionTimer -= diff;
+            } else uiArcaneExplosionTimer -= diff;
 
-                if(uiArcainBarrageTimer <= diff)
+                if (uiArcainBarrageTimer <= diff)
             {
                     Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true);
-                if(pTarget)
+                if (pTarget)
                         DoCast(pTarget,DUNGEON_MODE(SPELL_ARCANE_BARRAGE,H_SPELL_ARCANE_BARRAGE));
                 uiArcainBarrageTimer = 6000;
-            }else uiArcainBarrageTimer -= diff;
+            } else uiArcainBarrageTimer -= diff;
         }
 
-        if(me->GetEntry() == CREATURE_AZURE_BINDER_2)
+        if (me->GetEntry() == CREATURE_AZURE_BINDER_2)
         {
-            if(uiFrostNovaTimer <= diff)
+            if (uiFrostNovaTimer <= diff)
             {
                 DoCast(DUNGEON_MODE(SPELL_FROST_NOVA,H_SPELL_FROST_NOVA));
                 uiFrostNovaTimer = 5000;
-            }else uiFrostNovaTimer -= diff;
+            } else uiFrostNovaTimer -= diff;
 
-            if(uiFrostboltTimer <= diff)
+            if (uiFrostboltTimer <= diff)
             {
                 Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true);
-                if(pTarget)
+                if (pTarget)
                     DoCast(pTarget,DUNGEON_MODE(SPELL_FROSTBOLT,H_SPELL_FROSTBOLT));
                 uiFrostboltTimer = 6000;
-            }else uiFrostboltTimer -= diff;
+            } else uiFrostboltTimer -= diff;
         }
 
         DoMeleeAttackIfReady();
@@ -796,27 +800,27 @@ struct mob_azure_mage_slayerAI : public violet_hold_trashAI
         violet_hold_trashAI::UpdateAI(diff);
         npc_escortAI::UpdateAI(diff);
 
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if(me->GetEntry() == CREATURE_AZURE_MAGE_SLAYER_1)
+        if (me->GetEntry() == CREATURE_AZURE_MAGE_SLAYER_1)
         {
-            if(uiArcaneEmpowermentTimer <= diff)
+            if (uiArcaneEmpowermentTimer <= diff)
             {
                 DoCast(me,SPELL_ARCANE_EMPOWERMENT);
                     uiArcaneEmpowermentTimer = 14000;
-            }else uiArcaneEmpowermentTimer -= diff;
+            } else uiArcaneEmpowermentTimer -= diff;
         }
 
-        if(me->GetEntry() == CREATURE_AZURE_MAGE_SLAYER_2)
+        if (me->GetEntry() == CREATURE_AZURE_MAGE_SLAYER_2)
         {
-            if(uiSpellLockTimer <= diff)
+            if (uiSpellLockTimer <= diff)
             {
                 Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true);
-                if(pTarget)
+                if (pTarget)
                     DoCast(pTarget,SPELL_SPELL_LOCK);
                 uiSpellLockTimer = 9000;
-            }else uiSpellLockTimer -= diff;
+            } else uiSpellLockTimer -= diff;
         }
 
         DoMeleeAttackIfReady();
@@ -844,20 +848,20 @@ struct  mob_azure_captainAI : public violet_hold_trashAI
         violet_hold_trashAI::UpdateAI(diff);
         npc_escortAI::UpdateAI(diff);
 
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if(uiMortalStrikeTimer <= diff)
+        if (uiMortalStrikeTimer <= diff)
         {
             DoCast(me->getVictim(),SPELL_MORTAL_STRIKE);
             uiMortalStrikeTimer = 5000;
-        }else uiMortalStrikeTimer -= diff;
+        } else uiMortalStrikeTimer -= diff;
 
-        if(uiWhirlwindTimer <= diff)
+        if (uiWhirlwindTimer <= diff)
         {
             DoCast(me,SPELL_WHIRLWIND_OF_STEEL);
             uiWhirlwindTimer = 8000;
-        }else uiWhirlwindTimer -= diff;
+        } else uiWhirlwindTimer -= diff;
 
         DoMeleeAttackIfReady();
     }
@@ -886,23 +890,23 @@ struct  mob_azure_sorcerorAI : public violet_hold_trashAI
         violet_hold_trashAI::UpdateAI(diff);
         npc_escortAI::UpdateAI(diff);
 
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if(uiArcaneStreamTimer <= diff)
+        if (uiArcaneStreamTimer <= diff)
         {
             Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true);
-            if(pTarget)
+            if (pTarget)
                 DoCast(pTarget,DUNGEON_MODE(SPELL_ARCANE_STREAM,H_SPELL_ARCANE_STREAM));
             uiArcaneStreamTimer = urand(0,5000)+5000;
             uiArcaneStreamTimerStartingValueHolder = uiArcaneStreamTimer;
-        }else uiArcaneStreamTimer -= diff;
+        } else uiArcaneStreamTimer -= diff;
 
-        if(uiManaDetonationTimer <= diff && uiArcaneStreamTimer >=1500 && uiArcaneStreamTimer <= uiArcaneStreamTimerStartingValueHolder/2)
+        if (uiManaDetonationTimer <= diff && uiArcaneStreamTimer >=1500 && uiArcaneStreamTimer <= uiArcaneStreamTimerStartingValueHolder/2)
         {
             DoCast(DUNGEON_MODE(SPELL_MANA_DETONATION,H_SPELL_MANA_DETONATION));
             uiManaDetonationTimer = urand(2000,6000);
-        }else uiManaDetonationTimer -= diff;
+        } else uiManaDetonationTimer -= diff;
 
         DoMeleeAttackIfReady();
     }
@@ -929,20 +933,20 @@ struct mob_azure_raiderAI : public violet_hold_trashAI
         violet_hold_trashAI::UpdateAI(diff);
         npc_escortAI::UpdateAI(diff);
 
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if(uiConcussionBlowTimer <= diff)
+        if (uiConcussionBlowTimer <= diff)
         {
             DoCast(me->getVictim(),SPELL_CONCUSSION_BLOW);
             uiConcussionBlowTimer = 5000;
-        }else uiConcussionBlowTimer -= diff;
+        } else uiConcussionBlowTimer -= diff;
 
-        if(uiMagicReflectionTimer <= diff)
+        if (uiMagicReflectionTimer <= diff)
         {
             DoCast(SPELL_MAGIC_REFLECTION);
             uiMagicReflectionTimer = urand(10000,15000);
-        }else uiMagicReflectionTimer -= diff;
+        } else uiMagicReflectionTimer -= diff;
 
         DoMeleeAttackIfReady();
     }
@@ -970,30 +974,30 @@ struct mob_azure_stalkerAI : public violet_hold_trashAI
         violet_hold_trashAI::UpdateAI(diff);
         npc_escortAI::UpdateAI(diff);
 
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if(!TacticalBlinkCasted)
+        if (!TacticalBlinkCasted)
         {
-            if(uiTacticalBlinkTimer <= diff)
+            if (uiTacticalBlinkTimer <= diff)
             {
                 Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 40, true);
-                if(pTarget)
+                if (pTarget)
                     DoCast(pTarget,SPELL_TACTICAL_BLINK);
                     uiTacticalBlinkTimer = 6000;
                 TacticalBlinkCasted = true;
-            }else uiTacticalBlinkTimer -= diff;
+            } else uiTacticalBlinkTimer -= diff;
         }
 
         else
         {
-            if(uiBackstabTimer <= diff)
+            if (uiBackstabTimer <= diff)
             {
                 Unit* pTarget = SelectTarget(SELECT_TARGET_NEAREST, 0, 10, true);
                 DoCast(pTarget,SPELL_BACKSTAB);
                 TacticalBlinkCasted = false;
                 uiBackstabTimer =1300;
-            }else uiBackstabTimer -= diff;
+            } else uiBackstabTimer -= diff;
         }
 
         DoMeleeAttackIfReady();
-- 
cgit v1.2.3


From 6bdabae38e703fc1a536f7fa4b7f462c77a9e474 Mon Sep 17 00:00:00 2001
From: click 
Date: Mon, 21 Jun 2010 03:08:51 +0200
Subject: Remove obsolete script for Highlord Mograine (not active as boss in
 Naxxramas)

--HG--
branch : trunk
---
 .../Northrend/Naxxramas/boss_highlord_mograine.cpp | 179 ---------------------
 1 file changed, 179 deletions(-)
 delete mode 100644 src/server/scripts/Northrend/Naxxramas/boss_highlord_mograine.cpp

(limited to 'src')

diff --git a/src/server/scripts/Northrend/Naxxramas/boss_highlord_mograine.cpp b/src/server/scripts/Northrend/Naxxramas/boss_highlord_mograine.cpp
deleted file mode 100644
index 4eb72a3780e..00000000000
--- a/src/server/scripts/Northrend/Naxxramas/boss_highlord_mograine.cpp
+++ /dev/null
@@ -1,179 +0,0 @@
-/* Copyright (C) 2006 - 2008 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/* ScriptData
-SDName: Boss_Highlord_Mograine
-SD%Complete: 100
-SDComment: SCRIPT OBSOLETE
-SDCategory: Naxxramas
-EndScriptData */
-
-#include "precompiled.h"
-
-//All horsemen
-#define SPELL_SHIELDWALL           29061
-#define SPELL_BESERK               26662
-
-// highlord mograine
-#define SPELL_MARK_OF_MOGRAINE     28834
-#define SPELL_RIGHTEOUS_FIRE       28882                    // Applied as a 25% chance on melee hit to proc. me->GetVictim()
-
-#define SAY_TAUNT1                 "Enough prattling. Let them come! We shall grind their bones to dust."
-#define SAY_TAUNT2                 "Conserve your anger! Harness your rage! You will all have outlets for your frustration soon enough."
-#define SAY_TAUNT3                 "Life is meaningless. It is in death that we are truly tested."
-#define SAY_AGGRO1                 "You seek death?"
-#define SAY_AGGRO2                 "None shall pass!"
-#define SAY_AGGRO3                 "Be still!"
-#define SAY_SLAY1                  "You will find no peace in death."
-#define SAY_SLAY2                  "The master's will is done."
-#define SAY_SPECIAL                "Bow to the might of the Highlord!"
-#define SAY_DEATH                  "I... am... released! Perhaps it's not too late to - noo! I need... more time..."
-
-#define SOUND_TAUNT1               8842
-#define SOUND_TAUNT2               8843
-#define SOUND_TAUNT3               8844
-#define SOUND_AGGRO1               8835
-#define SOUND_AGGRO2               8836
-#define SOUND_AGGRO3               8837
-#define SOUND_SLAY1                8839
-#define SOUND_SLAY2                8840
-#define SOUND_SPECIAL              8841
-#define SOUND_DEATH                8838
-
-#define SPIRIT_OF_MOGRAINE         16775
-
-struct TRINITY_DLL_DECL boss_highlord_mograineAI : public ScriptedAI
-{
-    boss_highlord_mograineAI(Creature *c) : ScriptedAI(c) {}
-
-    uint32 Mark_Timer;
-    uint32 RighteousFire_Timer;
-    bool ShieldWall1;
-    bool ShieldWall2;
-
-    void Reset()
-    {
-        Mark_Timer = 20000;                                 // First Horsemen Mark is applied at 20 sec.
-        RighteousFire_Timer = 2000;                         // applied approx 1 out of 4 attacks
-        ShieldWall1 = true;
-        ShieldWall2 = true;
-    }
-
-    void InitialYell()
-    {
-        if (!me->isInCombat())
-        {
-            switch(rand()%3)
-            {
-                case 0:
-                    DoYell(SAY_AGGRO1,LANG_UNIVERSAL,NULL);
-                    DoPlaySoundToSet(me,SOUND_AGGRO1);
-                    break;
-                case 1:
-                    DoYell(SAY_AGGRO2,LANG_UNIVERSAL,NULL);
-                    DoPlaySoundToSet(me,SOUND_AGGRO2);
-                    break;
-                case 2:
-                    DoYell(SAY_AGGRO3,LANG_UNIVERSAL,NULL);
-                    DoPlaySoundToSet(me,SOUND_AGGRO3);
-                    break;
-            }
-        }
-    }
-
-    void KilledUnit()
-    {
-        switch(rand()%2)
-        {
-            case 0:
-                DoYell(SAY_SLAY1,LANG_UNIVERSAL,NULL);
-                DoPlaySoundToSet(me,SOUND_SLAY1);
-                break;
-            case 1:
-                DoYell(SAY_SLAY2,LANG_UNIVERSAL,NULL);
-                DoPlaySoundToSet(me,SOUND_SLAY2);
-                break;
-        }
-    }
-
-    void JustDied(Unit* Killer)
-    {
-        DoYell(SAY_DEATH,LANG_UNIVERSAL,NULL);
-        DoPlaySoundToSet(me, SOUND_DEATH);
-    }
-
-    void Aggro(Unit *who)
-    {
-        InitialYell();
-    }
-
-    void UpdateAI(const uint32 diff)
-    {
-        if (!UpdateVictim())
-            return;
-
-        // Mark of Mograine
-        if (Mark_Timer < diff)
-        {
-            DoCast(me->getVictim(),SPELL_MARK_OF_MOGRAINE);
-            Mark_Timer = 12000;
-        }else Mark_Timer -= diff;
-
-        // Shield Wall - All 4 horsemen will shield wall at 50% hp and 20% hp for 20 seconds
-        if (ShieldWall1 && (me->GetHealth()*100 / me->GetMaxHealth()) < 50)
-        {
-            if (ShieldWall1)
-            {
-                DoCast(me,SPELL_SHIELDWALL);
-                ShieldWall1 = false;
-            }
-        }
-        if (ShieldWall2 && (me->GetHealth()*100 / me->GetMaxHealth()) < 20)
-        {
-            if (ShieldWall2)
-            {
-                DoCast(me,SPELL_SHIELDWALL);
-                ShieldWall2 = false;
-            }
-        }
-
-        // Righteous Fire
-        if (RighteousFire_Timer < diff)
-        {
-            if (rand()%4 == 1)                               // 1/4
-            {
-                DoCast(me->getVictim(),SPELL_RIGHTEOUS_FIRE);
-            }
-            RighteousFire_Timer = 2000;
-        }else RighteousFire_Timer -= diff;
-
-        DoMeleeAttackIfReady();
-    }
-};
-CreatureAI* GetAI_boss_highlord_mograine(Creature* pCreature)
-{
-    return new boss_highlord_mograineAI (pCreature);
-}
-
-void AddSC_boss_highlord_mograine()
-{
-    Script *newscript;
-    newscript = new Script;
-    newscript->Name="boss_highlord_mograine";
-    newscript->GetAI = &GetAI_boss_highlord_mograine;
-    newscript->RegisterSelf();
-}
-
-- 
cgit v1.2.3


From 1ff96c9846e537ec0a1d886da241eed300af7aae Mon Sep 17 00:00:00 2001
From: click 
Date: Mon, 21 Jun 2010 03:36:36 +0200
Subject: Use CMakeLists.txt file-globbing on scriptslibrary instead of adding
 every single script. Note that new scripts added means "run CMake to make it
 aware of any new files"

--HG--
branch : trunk
---
 src/server/scripts/CMakeLists.txt | 569 +-------------------------------------
 1 file changed, 12 insertions(+), 557 deletions(-)

(limited to 'src')

diff --git a/src/server/scripts/CMakeLists.txt b/src/server/scripts/CMakeLists.txt
index 28a137fe4d3..02228d49ba9 100644
--- a/src/server/scripts/CMakeLists.txt
+++ b/src/server/scripts/CMakeLists.txt
@@ -9,6 +9,12 @@
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 ####### scripts ########
+file(GLOB_RECURSE scripts_easternkingdoms EasternKingdoms/*.cpp)
+file(GLOB_RECURSE scripts_kalimdor Kalimdor/*.cpp)
+file(GLOB_RECURSE scripts_northrend Northrend/*.cpp)
+file(GLOB_RECURSE scripts_outland Outland/*.cpp)
+file(GLOB_RECURSE scripts_world World/*.cpp)
+file(GLOB_RECURSE scripts_examples Examples/*.cpp)
 
 # Enable precompiled headers when using the GCC compiler.
 IF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX)
@@ -31,563 +37,12 @@ SET(scripts_STAT_SRCS
    ../game/AI/ScriptedAI/ScriptedSimpleAI.cpp
    ../game/AI/ScriptedAI/ScriptedSimpleAI.h
    Custom/on_events.cpp
-   EasternKingdoms/AlteracValley/alterac_valley.cpp
-   EasternKingdoms/AlteracValley/boss_balinda.cpp
-   EasternKingdoms/AlteracValley/boss_drekthar.cpp
-   EasternKingdoms/AlteracValley/boss_galvangar.cpp
-   EasternKingdoms/AlteracValley/boss_vanndar.cpp
-   EasternKingdoms/BlackrockDepths/blackrock_depths.cpp
-   EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp
-   EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp
-   EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp
-   EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp
-   EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp
-   EasternKingdoms/BlackrockDepths/boss_grizzle.cpp
-   EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp
-   EasternKingdoms/BlackrockDepths/boss_magmus.cpp
-   EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp
-   EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp
-   EasternKingdoms/BlackrockDepths/blackrock_depths.h
-   EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp
-   EasternKingdoms/BlackrockSpire/blackrock_spire.cpp
-   EasternKingdoms/BlackrockSpire/boss_drakkisath.cpp
-   EasternKingdoms/BlackrockSpire/boss_gyth.cpp
-   EasternKingdoms/BlackrockSpire/boss_halycon.cpp
-   EasternKingdoms/BlackrockSpire/boss_highlord_omokk.cpp
-   EasternKingdoms/BlackrockSpire/boss_mother_smolderweb.cpp
-   EasternKingdoms/BlackrockSpire/boss_overlord_wyrmthalak.cpp
-   EasternKingdoms/BlackrockSpire/boss_pyroguard_emberseer.cpp
-   EasternKingdoms/BlackrockSpire/boss_quartermaster_zigris.cpp
-   EasternKingdoms/BlackrockSpire/boss_rend_blackhand.cpp
-   EasternKingdoms/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp
-   EasternKingdoms/BlackrockSpire/boss_the_beast.cpp
-   EasternKingdoms/BlackrockSpire/boss_warmaster_voone.cpp
-   EasternKingdoms/BlackrockSpire/blackrock_spire.h
-   EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp
-   EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp
-   EasternKingdoms/BlackwingLair/boss_chromaggus.cpp
-   EasternKingdoms/BlackwingLair/boss_ebonroc.cpp
-   EasternKingdoms/BlackwingLair/boss_firemaw.cpp
-   EasternKingdoms/BlackwingLair/boss_flamegor.cpp
-   EasternKingdoms/BlackwingLair/boss_nefarian.cpp
-   EasternKingdoms/BlackwingLair/boss_razorgore.cpp
-   EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp
-   EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp
-   EasternKingdoms/BlackwingLair/instance_blackwing_lair.cpp
-   EasternKingdoms/Deadmines/boss_mr_smite.cpp
-   EasternKingdoms/Deadmines/deadmines.h
-   EasternKingdoms/Deadmines/deadmines.cpp
-   EasternKingdoms/Deadmines/instance_deadmines.cpp
-   EasternKingdoms/Gnomeregan/gnomeregan.h
-   EasternKingdoms/Gnomeregan/gnomeregan.cpp
-   EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp
-   EasternKingdoms/Karazhan/boss_curator.cpp
-   EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp
-   EasternKingdoms/Karazhan/boss_midnight.cpp
-   EasternKingdoms/Karazhan/boss_moroes.cpp
-   EasternKingdoms/Karazhan/boss_netherspite.cpp
-   EasternKingdoms/Karazhan/boss_nightbane.cpp
-   EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp
-   EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
-   EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
-   EasternKingdoms/Karazhan/bosses_opera.cpp
-   EasternKingdoms/Karazhan/karazhan.h
-   EasternKingdoms/Karazhan/instance_karazhan.cpp
-   EasternKingdoms/Karazhan/karazhan.cpp
-   EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
-   EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
-   EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
-   EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
-   EasternKingdoms/MagistersTerrace/magisters_terrace.h
-   EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
-   EasternKingdoms/MagistersTerrace/magisters_terrace.cpp
-   EasternKingdoms/MoltenCore/boss_baron_geddon.cpp
-   EasternKingdoms/MoltenCore/boss_garr.cpp
-   EasternKingdoms/MoltenCore/boss_gehennas.cpp
-   EasternKingdoms/MoltenCore/boss_golemagg.cpp
-   EasternKingdoms/MoltenCore/boss_lucifron.cpp
-   EasternKingdoms/MoltenCore/boss_magmadar.cpp
-   EasternKingdoms/MoltenCore/boss_majordomo_executus.cpp
-   EasternKingdoms/MoltenCore/boss_ragnaros.cpp
-   EasternKingdoms/MoltenCore/boss_shazzrah.cpp
-   EasternKingdoms/MoltenCore/boss_sulfuron_harbinger.cpp
-   EasternKingdoms/MoltenCore/molten_core.h
-   EasternKingdoms/MoltenCore/instance_molten_core.cpp
-   EasternKingdoms/MoltenCore/molten_core.cpp
-   EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp
-   EasternKingdoms/ScarletEnclave/chapter1.cpp
-   EasternKingdoms/ScarletEnclave/chapter2.cpp
-   EasternKingdoms/ScarletEnclave/chapter5.cpp
-   EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp
-   EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp
-   EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp
-   EasternKingdoms/ScarletMonastery/boss_herod.cpp
-   EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp
-   EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp
-   EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp
-   EasternKingdoms/ScarletMonastery/boss_scorn.cpp
-   EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
-   EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp
-   EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp
-   EasternKingdoms/ScarletMonastery/scarlet_monastery.h
-   EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp
-   EasternKingdoms/Scholomance/boss_death_knight_darkreaver.cpp
-   EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp
-   EasternKingdoms/Scholomance/boss_illucia_barov.cpp
-   EasternKingdoms/Scholomance/boss_instructor_malicia.cpp
-   EasternKingdoms/Scholomance/boss_jandice_barov.cpp
-   EasternKingdoms/Scholomance/boss_kormok.cpp
-   EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp
-   EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp
-   EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp
-   EasternKingdoms/Scholomance/boss_the_ravenian.cpp
-   EasternKingdoms/Scholomance/boss_vectus.cpp
-   EasternKingdoms/Scholomance/scholomance.h
-   EasternKingdoms/Scholomance/instance_scholomance.cpp
-   EasternKingdoms/ShadowfangKeep/shadowfang_keep.h
-   EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
-   EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
-   EasternKingdoms/Stratholme/boss_baron_rivendare.cpp
-   EasternKingdoms/Stratholme/boss_baroness_anastari.cpp
-   EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp
-   EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp
-   EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp
-   EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp
-   EasternKingdoms/Stratholme/boss_nerubenkan.cpp
-   EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp
-   EasternKingdoms/Stratholme/boss_postmaster_malown.cpp
-   EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp
-   EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp
-   EasternKingdoms/Stratholme/stratholme.h
-   EasternKingdoms/Stratholme/instance_stratholme.cpp
-   EasternKingdoms/Stratholme/stratholme.cpp
-   EasternKingdoms/SunkenTemple/sunken_temple.h
-   EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp
-   EasternKingdoms/SunkenTemple/sunken_temple.cpp
-   EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
-   EasternKingdoms/SunwellPlateau/boss_muru.cpp
-   EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp
-   EasternKingdoms/SunwellPlateau/boss_felmyst.cpp
-   EasternKingdoms/SunwellPlateau/boss_brutallus.cpp
-   EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
-   EasternKingdoms/SunwellPlateau/sunwell_plateau.cpp
-   EasternKingdoms/SunwellPlateau/sunwell_plateau.h
-   EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp
-   EasternKingdoms/Uldaman/boss_archaedas.cpp
-   EasternKingdoms/Uldaman/instance_uldaman.cpp
-   EasternKingdoms/Uldaman/boss_ironaya.cpp
-   EasternKingdoms/Uldaman/uldaman.cpp
-   EasternKingdoms/ZulAman/boss_akilzon.cpp
-   EasternKingdoms/ZulAman/boss_halazzi.cpp
-   EasternKingdoms/ZulAman/boss_hexlord.cpp
-   EasternKingdoms/ZulAman/boss_janalai.cpp
-   EasternKingdoms/ZulAman/boss_nalorakk.cpp
-   EasternKingdoms/ZulAman/boss_zuljin.cpp
-   EasternKingdoms/ZulAman/zulaman.h
-   EasternKingdoms/ZulAman/instance_zulaman.cpp
-   EasternKingdoms/ZulAman/zulaman.cpp
-   EasternKingdoms/ZulGurub/boss_arlokk.cpp
-   EasternKingdoms/ZulGurub/boss_gahzranka.cpp
-   EasternKingdoms/ZulGurub/boss_grilek.cpp
-   EasternKingdoms/ZulGurub/boss_hakkar.cpp
-   EasternKingdoms/ZulGurub/boss_hazzarah.cpp
-   EasternKingdoms/ZulGurub/boss_jeklik.cpp
-   EasternKingdoms/ZulGurub/boss_jindo.cpp
-   EasternKingdoms/ZulGurub/boss_mandokir.cpp
-   EasternKingdoms/ZulGurub/boss_marli.cpp
-   EasternKingdoms/ZulGurub/boss_renataki.cpp
-   EasternKingdoms/ZulGurub/boss_thekal.cpp
-   EasternKingdoms/ZulGurub/boss_venoxis.cpp
-   EasternKingdoms/ZulGurub/boss_wushoolay.cpp
-   EasternKingdoms/ZulGurub/zulgurub.h
-   EasternKingdoms/ZulGurub/instance_zulgurub.cpp
-   EasternKingdoms/alterac_mountains.cpp
-   EasternKingdoms/arathi_highlands.cpp
-   EasternKingdoms/blasted_lands.cpp
-   EasternKingdoms/boss_kruul.cpp
-   EasternKingdoms/burning_steppes.cpp
-   EasternKingdoms/dun_morogh.cpp
-   EasternKingdoms/duskwood.cpp
-   EasternKingdoms/eastern_plaguelands.cpp
-   EasternKingdoms/elwynn_forest.cpp
-   EasternKingdoms/eversong_woods.cpp
-   EasternKingdoms/ghostlands.cpp
-   EasternKingdoms/hinterlands.cpp
-   EasternKingdoms/ironforge.cpp
-   EasternKingdoms/isle_of_queldanas.cpp
-   EasternKingdoms/loch_modan.cpp
-   EasternKingdoms/redridge_mountains.cpp
-   EasternKingdoms/searing_gorge.cpp
-   EasternKingdoms/silvermoon_city.cpp
-   EasternKingdoms/silverpine_forest.cpp
-   EasternKingdoms/stormwind_city.cpp
-   EasternKingdoms/stranglethorn_vale.cpp
-   EasternKingdoms/tirisfal_glades.cpp
-   EasternKingdoms/undercity.cpp
-   EasternKingdoms/western_plaguelands.cpp
-   EasternKingdoms/westfall.cpp
-   EasternKingdoms/wetlands.cpp
-   Examples/example_creature.cpp
-   Examples/example_escort.cpp
-   Examples/example_gossip_codebox.cpp
-   Examples/example_misc.cpp
-   Kalimdor/BlackfathomDeeps/boss_gelihast.cpp
-   Kalimdor/BlackfathomDeeps/boss_kelris.cpp
-   Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp
-   Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp
-   Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp
-   Kalimdor/BlackfathomDeeps/blackfathom_deeps.h
-   Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp
-   Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp
-   Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp
-   Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp
-   Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp
-   Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp
-   Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
-   Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.h
-   Kalimdor/CavernsOfTime/DarkPortal/dark_portal.h
-   Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp
-   Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp
-   Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp
-   Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp
-   Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp
-   Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp
-   Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
-   Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp
-   Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp
-   Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp
-   Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h
-   Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp
-   Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp
-   Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.h
-   Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
-   Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h
-   Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
-   Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp
-   Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp
-   Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp
-   Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h
-   Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
-   Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
-   Kalimdor/Maraudon/boss_celebras_the_cursed.cpp
-   Kalimdor/Maraudon/boss_landslide.cpp
-   Kalimdor/Maraudon/boss_noxxion.cpp
-   Kalimdor/Maraudon/boss_princess_theradras.cpp
-   Kalimdor/OnyxiasLair/boss_onyxia.cpp
-   Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp
-   Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp
-   Kalimdor/RazorfenDowns/razorfen_downs.cpp
-   Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp
-   Kalimdor/RazorfenDowns/razorfen_downs.h
-   Kalimdor/RazorfenKraul/razorfen_kraul.h
-   Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp
-   Kalimdor/RazorfenKraul/razorfen_kraul.cpp
-   Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp
-   Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
-   Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp
-   Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp
-   Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
-   Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp
-   Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.h
-   Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp
-   Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp
-   Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
-   Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp
-   Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp
-   Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp
-   Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp
-   Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp
-   Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp
-   Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp
-   Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h
-   Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp
-   Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp
-   Kalimdor/WailingCaverns/wailing_caverns.h
-   Kalimdor/WailingCaverns/instance_wailing_caverns.cpp
-   Kalimdor/WailingCaverns/wailing_caverns.cpp
-   Kalimdor/ZulFarrak/zulfarrak.cpp
-   Kalimdor/ZulFarrak/instance_zulfarrak.cpp
-   Kalimdor/ashenvale.cpp
-   Kalimdor/azshara.cpp
-   Kalimdor/azuremyst_isle.cpp
-   Kalimdor/bloodmyst_isle.cpp
-   Kalimdor/boss_azuregos.cpp
-   Kalimdor/darkshore.cpp
-   Kalimdor/desolace.cpp
-   Kalimdor/durotar.cpp
-   Kalimdor/dustwallow_marsh.cpp
-   Kalimdor/felwood.cpp
-   Kalimdor/feralas.cpp
-   Kalimdor/moonglade.cpp
-   Kalimdor/mulgore.cpp
-   Kalimdor/orgrimmar.cpp
-   Kalimdor/silithus.cpp
-   Kalimdor/stonetalon_mountains.cpp
-   Kalimdor/tanaris.cpp
-   Kalimdor/teldrassil.cpp
-   Kalimdor/the_barrens.cpp
-   Kalimdor/thousand_needles.cpp
-   Kalimdor/thunder_bluff.cpp
-   Kalimdor/ungoro_crater.cpp
-   Kalimdor/winterspring.cpp
-   Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp
-   Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp
-   Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
-   Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp
-   Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h
-   Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp
-   Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp
-   Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp
-   Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp
-   Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp
-   Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp
-   Northrend/AzjolNerub/ahnkahet/ahnkahet.h
-   Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp
-   Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp
-   Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp
-   Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp
-   Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp
-   Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h
-   Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp
-   Northrend/DraktharonKeep/boss_trollgore.cpp
-   Northrend/DraktharonKeep/boss_novos.cpp
-   Northrend/DraktharonKeep/boss_dred.cpp
-   Northrend/DraktharonKeep/boss_tharon_ja.cpp
-   Northrend/DraktharonKeep/drak_tharon_keep.h
-   Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp
-   Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
-   Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
-   Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h
-   Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp
-   Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp
-   Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp
-   Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
-   Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
-   Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h
-   Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp
-   Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
-   Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp
-   Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp
-   Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp
-   Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h
-   Northrend/Gundrak/instance_gundrak.cpp
-   Northrend/Gundrak/boss_slad_ran.cpp
-   Northrend/Gundrak/boss_moorabi.cpp
-   Northrend/Gundrak/boss_drakkari_colossus.cpp
-   Northrend/Gundrak/boss_gal_darah.cpp
-   Northrend/Gundrak/boss_eck.cpp
-   Northrend/Gundrak/gundrak.h
-   Northrend/Naxxramas/boss_anubrekhan.cpp
-   Northrend/Naxxramas/boss_faerlina.cpp
-   Northrend/Naxxramas/boss_gluth.cpp
-   Northrend/Naxxramas/boss_gothik.cpp
-   Northrend/Naxxramas/boss_grobbulus.cpp
-   Northrend/Naxxramas/boss_heigan.cpp
-   Northrend/Naxxramas/boss_kelthuzad.cpp
-   Northrend/Naxxramas/boss_four_horsemen.cpp
-   Northrend/Naxxramas/boss_loatheb.cpp
-   Northrend/Naxxramas/boss_maexxna.cpp
-   Northrend/Naxxramas/boss_noth.cpp
-   Northrend/Naxxramas/boss_patchwerk.cpp
-   Northrend/Naxxramas/boss_razuvious.cpp
-   Northrend/Naxxramas/boss_sapphiron.cpp
-   Northrend/Naxxramas/boss_thaddius.cpp
-   Northrend/Naxxramas/naxxramas.h
-   Northrend/Naxxramas/instance_naxxramas.cpp
-   Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
-   Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
-   Northrend/Nexus/EyeOfEternity/eye_of_eternity.h
-   Northrend/Nexus/Nexus/instance_nexus.cpp
-   Northrend/Nexus/Nexus/boss_magus_telestra.cpp
-   Northrend/Nexus/Nexus/boss_anomalus.cpp
-   Northrend/Nexus/Nexus/boss_ormorok.cpp
-   Northrend/Nexus/Nexus/boss_keristrasza.cpp
-   Northrend/Nexus/Nexus/commander_stoutbeard.cpp
-   Northrend/Nexus/Nexus/commander_kolurg.cpp
-   Northrend/Nexus/Nexus/nexus.h
-   Northrend/Nexus/Oculus/instance_oculus.cpp
-   Northrend/Nexus/Oculus/boss_drakos.cpp
-   Northrend/Nexus/Oculus/boss_urom.cpp
-   Northrend/Nexus/Oculus/boss_varos.cpp
-   Northrend/Nexus/Oculus/boss_eregos.cpp
-   Northrend/Nexus/Oculus/oculus.h
-   Northrend/Nexus/Oculus/oculus.cpp
-   Northrend/ObsidianSanctum/instance_obsidian_sanctum.cpp
-   Northrend/ObsidianSanctum/boss_sartharion.cpp
-   Northrend/ObsidianSanctum/obsidian_sanctum.h
-   Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp
-   Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp
-   Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp
-   Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp
-   Northrend/Ulduar/HallsOfStone/halls_of_stone.h
-   Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp
-   Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp
-   Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp
-   Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp
-   Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp
-   Northrend/Ulduar/HallsOfLightning/boss_loken.cpp
-   Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h
-   Northrend/Ulduar/ulduar/boss_algalon.cpp
-   Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp
-   Northrend/Ulduar/ulduar/boss_auriaya.cpp
-   Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp
-   Northrend/Ulduar/ulduar/boss_freya.cpp
-   Northrend/Ulduar/ulduar/boss_general_vezax.cpp
-   Northrend/Ulduar/ulduar/boss_hodir.cpp
-   Northrend/Ulduar/ulduar/boss_ignis.cpp
-   Northrend/Ulduar/ulduar/boss_kologarn.cpp
-   Northrend/Ulduar/ulduar/boss_mimiron.cpp
-   Northrend/Ulduar/ulduar/boss_razorscale.cpp
-   Northrend/Ulduar/ulduar/boss_thorim.cpp
-   Northrend/Ulduar/ulduar/boss_xt002.cpp
-   Northrend/Ulduar/ulduar/boss_yoggsaron.cpp
-   Northrend/Ulduar/ulduar/ulduar_teleporter.cpp
-   Northrend/Ulduar/ulduar/ulduar.h
-   Northrend/Ulduar/ulduar/instance_ulduar.cpp
-   Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp
-   Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp
-   Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp
-   Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
-   Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h
-   Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp
-   Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp
-   Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
-   Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp
-   Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp
-   Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
-   Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h
-   Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp
-   Northrend/VaultOfArchavon/boss_archavon.cpp
-   Northrend/VaultOfArchavon/boss_emalon.cpp
-   Northrend/VaultOfArchavon/boss_koralon.cpp
-   Northrend/VaultOfArchavon/boss_toravon.cpp
-   Northrend/VaultOfArchavon/vault_of_archavon.h
-   Northrend/VioletHold/instance_violet_hold.cpp
-   Northrend/VioletHold/boss_cyanigosa.cpp
-   Northrend/VioletHold/boss_erekem.cpp
-   Northrend/VioletHold/boss_ichoron.cpp
-   Northrend/VioletHold/boss_lavanthor.cpp
-   Northrend/VioletHold/boss_moragg.cpp
-   Northrend/VioletHold/boss_xevozz.cpp
-   Northrend/VioletHold/boss_zuramat.cpp
-   Northrend/VioletHold/violet_hold.h
-   Northrend/VioletHold/violet_hold.cpp
-   Northrend/dalaran.cpp
-   Northrend/borean_tundra.cpp
-   Northrend/dragonblight.cpp
-   Northrend/grizzly_hills.cpp
-   Northrend/howling_fjord.cpp
-   Northrend/icecrown.cpp
-   Northrend/sholazar_basin.cpp
-   Northrend/storm_peaks.cpp
-   Northrend/zuldrak.cpp
-   Northrend/crystalsong_forest.cpp
-   Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp
-   Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp
-   Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp
-   Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp
-   Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp
-   Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp
-   Outland/Auchindoun/SethekkHalls/sethekk_halls.h
-   Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp
-   Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp
-   Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
-   Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp
-   Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp
-   Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h
-   Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp
-   Outland/BlackTemple/black_temple.cpp
-   Outland/BlackTemple/boss_bloodboil.cpp
-   Outland/BlackTemple/boss_illidan.cpp
-   Outland/BlackTemple/boss_mother_shahraz.cpp
-   Outland/BlackTemple/boss_reliquary_of_souls.cpp
-   Outland/BlackTemple/boss_shade_of_akama.cpp
-   Outland/BlackTemple/boss_supremus.cpp
-   Outland/BlackTemple/boss_teron_gorefiend.cpp
-   Outland/BlackTemple/boss_warlord_najentus.cpp
-   Outland/BlackTemple/black_temple.h
-   Outland/BlackTemple/illidari_council.cpp
-   Outland/BlackTemple/instance_black_temple.cpp
-   Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
-   Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
-   Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
-   Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
-   Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp
-   Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
-   Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h
-   Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
-   Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp
-   Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp
-   Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp
-   Outland/CoilfangReservoir/SteamVault/steam_vault.h
-   Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
-   Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp
-   Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp
-   Outland/GruulsLair/boss_gruul.cpp
-   Outland/GruulsLair/boss_high_king_maulgar.cpp
-   Outland/GruulsLair/gruuls_lair.h
-   Outland/GruulsLair/instance_gruuls_lair.cpp
-   Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
-   Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp
-   Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp
-   Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
-   Outland/HellfireCitadel/BloodFurnace/blood_furnace.h
-   Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp
-   Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
-   Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
-   Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h
-   Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
-   Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
-   Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h
-   Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
-   Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
-   Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
-   Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h
-   Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
-   Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
-   Outland/TempestKeep/arcatraz/arcatraz.cpp
-   Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
-   Outland/TempestKeep/arcatraz/arcatraz.h
-   Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
-   Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp
-   Outland/TempestKeep/botanica/boss_laj.cpp
-   Outland/TempestKeep/botanica/boss_warp_splinter.cpp
-   Outland/TempestKeep/Eye/boss_alar.cpp
-   Outland/TempestKeep/Eye/boss_astromancer.cpp
-   Outland/TempestKeep/Eye/boss_kaelthas.cpp
-   Outland/TempestKeep/Eye/boss_void_reaver.cpp
-   Outland/TempestKeep/Eye/the_eye.h
-   Outland/TempestKeep/Eye/instance_the_eye.cpp
-   Outland/TempestKeep/Eye/the_eye.cpp
-   Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp
-   Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp
-   Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
-   Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
-   Outland/TempestKeep/Mechanar/mechanar.h
-   Outland/TempestKeep/Mechanar/instance_mechanar.cpp
-   Outland/blades_edge_mountains.cpp
-   Outland/boss_doomlord_kazzak.cpp
-   Outland/boss_doomwalker.cpp
-   Outland/hellfire_peninsula.cpp
-   Outland/nagrand.cpp
-   Outland/netherstorm.cpp
-   Outland/shadowmoon_valley.cpp
-   Outland/shattrath_city.cpp
-   Outland/terokkar_forest.cpp
-   Outland/zangarmarsh.cpp
-   World/areatrigger_scripts.cpp
-   World/boss_emeriss.cpp
-   World/boss_lethon.cpp
-   World/boss_taerar.cpp
-   World/boss_ysondre.cpp
-   World/go_scripts.cpp
-   World/guards.cpp
-   World/item_scripts.cpp
-   World/mob_generic_creature.cpp
-   World/npc_innkeeper.cpp
-   World/npc_professions.cpp
-   World/npcs_special.cpp
-   World/npc_taxi.cpp
+   ${scripts_easternkingdoms}
+   ${scripts_kalimdor}
+   ${scripts_northrend}
+   ${scripts_outland}
+   ${scripts_world}
+   ${scripts_examples}
 )
 message("-- Added Script Engine to SCRIPTS lib")
 
-- 
cgit v1.2.3


From 1c96f52568d680e320b58874df31caabae536f4c Mon Sep 17 00:00:00 2001
From: click 
Date: Mon, 21 Jun 2010 07:17:26 +0200
Subject: Add more CMake-related support for building g3dlib, zlib, bzip2, ace
 on Windows

--HG--
branch : trunk
---
 externals/CMakeLists.txt                 |  28 +-
 externals/ace/CMakeLists.txt             |  24 ++
 externals/bzip2/CMakeLists.txt           |  12 +
 externals/g3dlite/CMakeLists.txt         |  35 +-
 externals/jemalloc/CMakeLists.txt        |  10 +
 externals/sockets/CMakeLists.txt         |  11 +
 externals/zlib/CMakeLists.txt            |  10 +
 src/CMakeLists.txt                       |   4 +-
 src/server/CMakeLists.txt                |  15 +-
 src/server/authserver/CMakeLists.txt     |  26 +-
 src/server/collision/CMakeLists.txt      |  38 +-
 src/server/game/CMakeLists.txt           | 673 ++++++++++++++++---------------
 src/server/scripts/CMakeLists.txt        |  66 +--
 src/server/shared/CMakeLists.txt         | 128 +++---
 src/server/worldserver/CMakeLists.txt    |  92 +++--
 src/tools/CMakeLists.txt                 |   2 +-
 src/tools/map_extractor/CMakeLists.txt   |  30 +-
 src/tools/vmap3_assembler/CMakeLists.txt |  21 +-
 src/tools/vmap3_extractor/CMakeLists.txt |  21 +-
 19 files changed, 712 insertions(+), 534 deletions(-)
 create mode 100644 externals/ace/CMakeLists.txt

(limited to 'src')

diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index fea7526b9c8..98381bbafdc 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -1,8 +1,26 @@
-#add_subdirectory(ace)
-#add_subdirectory(libmpq)
+# Copyright (C) 2008-2010 Trinity 
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+if(NOT MACOSX)
+  add_subdirectory(jemalloc)
+endif()
+
+if(NOT UNIX)
+  add_subdirectory(ace)
+  add_subdirectory(zlib)
+  add_subdirectory(bzip2)
+endif()
 
-add_subdirectory(zlib)
-add_subdirectory(bzip2)
 add_subdirectory(g3dlite)
-add_subdirectory(jemalloc)
 add_subdirectory(sockets)
+
+# temporary disable libmpq building (through CMake at least) for now
+# - needs a proper CMakeLists.txt
+#add_subdirectory(libmpq)
diff --git a/externals/ace/CMakeLists.txt b/externals/ace/CMakeLists.txt
new file mode 100644
index 00000000000..fe2a2488d9f
--- /dev/null
+++ b/externals/ace/CMakeLists.txt
@@ -0,0 +1,24 @@
+# Copyright (C) 2008-2010 Trinity 
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+file(GLOB sources *.cpp)
+
+set(ace_STAT_SRCS
+  ${sources}
+)
+
+include_directories(
+  ${CMAKE_SOURCE_DIR}/externals
+  ${CMAKE_SOURCE_DIR}/externals/zlib
+)
+
+add_definitions(-DACE_BUILD_DLL)
+
+add_library(ace STATIC ${ace_STAT_SRCS})
diff --git a/externals/bzip2/CMakeLists.txt b/externals/bzip2/CMakeLists.txt
index ef857f462ab..3de5475610a 100644
--- a/externals/bzip2/CMakeLists.txt
+++ b/externals/bzip2/CMakeLists.txt
@@ -1,9 +1,21 @@
+# Copyright (C) 2008-2010 Trinity 
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
 file(GLOB sources *.c)
+
 set(bzip2_STAT_SRCS
   ${sources}
 )
 
 include_directories(
+  ${CMAKE_SOURCE_DIR}/externals/zlib
   ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
diff --git a/externals/g3dlite/CMakeLists.txt b/externals/g3dlite/CMakeLists.txt
index 9f302eff960..da5c89ec143 100644
--- a/externals/g3dlite/CMakeLists.txt
+++ b/externals/g3dlite/CMakeLists.txt
@@ -1,12 +1,37 @@
+# Copyright (C) 2008-2010 Trinity 
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
 file(GLOB sources *.cpp)
 
-SET(g3dlib_STAT_SRCS
+set(g3dlib_STAT_SRCS
   ${sources}
+)
+if(WIN32)
+  include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_SOURCE_DIR}/externals/zlib
   )
-
-include_directories(
-  ${CMAKE_CURRENT_SOURCE_DIR}
+else()
+  include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}
   )
+endif()
 
 add_library(g3dlib STATIC ${g3dlib_STAT_SRCS})
-target_link_libraries(g3dlib zlib)
+
+if(WIN32)
+  target_link_libraries(g3dlib
+    zlib
+  )
+else()
+  target_link_libraries(g3dlib
+    ${ZLIB_LIBRARIES}
+  )
+endif()
diff --git a/externals/jemalloc/CMakeLists.txt b/externals/jemalloc/CMakeLists.txt
index 1e32407b456..d560c6ba675 100644
--- a/externals/jemalloc/CMakeLists.txt
+++ b/externals/jemalloc/CMakeLists.txt
@@ -1,5 +1,15 @@
+# Copyright (C) 2008-2010 Trinity 
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 file(GLOB sources *.c)
+
 set(jemalloc_STAT_SRC
   ${sources}
 )
diff --git a/externals/sockets/CMakeLists.txt b/externals/sockets/CMakeLists.txt
index 716da975ca9..a1756773c08 100644
--- a/externals/sockets/CMakeLists.txt
+++ b/externals/sockets/CMakeLists.txt
@@ -1,4 +1,15 @@
+# Copyright (C) 2008-2010 Trinity 
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
 file(GLOB sources *.cpp)
+
 set(trinitysockets_STAT_SRCS
   ${sources}
 )
diff --git a/externals/zlib/CMakeLists.txt b/externals/zlib/CMakeLists.txt
index 1887110020c..bd194531bb5 100644
--- a/externals/zlib/CMakeLists.txt
+++ b/externals/zlib/CMakeLists.txt
@@ -1,3 +1,13 @@
+# Copyright (C) 2008-2010 Trinity 
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
 file(GLOB sources *.c)
 file(GLOB headers *.h)
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 76c3de027eb..b7fd8c75336 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2010 Trinity 
+# Copyright (C) 2008-2010 Trinity 
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -11,6 +11,6 @@
 add_subdirectory(server)
 
 if(DO_TOOLS)
-    add_subdirectory(tools)
+  add_subdirectory(tools)
 endif(DO_TOOLS)
 
diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
index cf835f7ca66..5d9b3b2ef9f 100644
--- a/src/server/CMakeLists.txt
+++ b/src/server/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2010 Trinity 
+# Copyright (C) 2008-2010 Trinity 
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -14,16 +14,17 @@ if(DO_WORLDSERVER)
   add_subdirectory(collision)
   if(DO_SCRIPTS)
     add_subdirectory(scripts)
-  endif(DO_SCRIPTS)
+  endif()
   add_subdirectory(worldserver)
-else(DO_WORLDSERVER)
+else()
   if(DO_TOOLS)
     add_subdirectory(collision)
-  endif(DO_TOOLS)
-endif(DO_WORLDSERVER)
+  endif()
+endif()
+
 if (DO_AUTHSERVER)
   if(NOT DO_WORLDSERVER)
     add_subdirectory(shared)
-  endif(NOT DO_WORLDSERVER)
+  endif()
   add_subdirectory(authserver)
-endif(DO_AUTHSERVER)
\ No newline at end of file
+endif()
diff --git a/src/server/authserver/CMakeLists.txt b/src/server/authserver/CMakeLists.txt
index c3f5fe6331b..6cfefb69443 100644
--- a/src/server/authserver/CMakeLists.txt
+++ b/src/server/authserver/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2010 Trinity 
+# Copyright (C) 2008-2010 Trinity 
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -10,7 +10,7 @@
 
 ########### authserver ###############
 
-SET(authserver_SRCS
+set(authserver_SRCS
   Authentication/AuthCodes.cpp
   Authentication/AuthCodes.h
   Realms/RealmList.cpp
@@ -41,20 +41,21 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/src/server/authserver/Server
 )
 
-SET(authserver_LINK_FLAGS "")
+set(authserver_LINK_FLAGS "")
 
-add_executable(authserver ${authserver_SRCS})
-add_definitions(
-  -D_TRINITY_REALM_CONFIG='"${CONF_DIR}/authserver.conf"'
+add_executable(authserver
+  ${authserver_SRCS}
 )
 
-SET(trinity-realm_LINK_FLAGS "-pthread ${authserver_LINK_FLAGS}")
+add_definitions(-D_TRINITY_REALM_CONFIG='"${CONF_DIR}/authserver.conf"')
 
-IF (CMAKE_SYSTEM_NAME MATCHES "Darwin")
-  SET(authserver_LINK_FLAGS "-framework Carbon ${authserver_LINK_FLAGS}")
-ENDIF (CMAKE_SYSTEM_NAME MATCHES "Darwin")
+set(authserver_LINK_FLAGS "-pthread ${authserver_LINK_FLAGS}")
 
-SET_TARGET_PROPERTIES(authserver PROPERTIES LINK_FLAGS "${authserver_LINK_FLAGS}")
+if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
+  set(authserver_LINK_FLAGS "-framework Carbon ${authserver_LINK_FLAGS}")
+endif()
+
+set_target_properties(authserver PROPERTIES LINK_FLAGS "${authserver_LINK_FLAGS}")
 
 target_link_libraries(
   authserver
@@ -67,8 +68,7 @@ target_link_libraries(
   ${OSX_LIBS}
 )
 
-install(TARGETS authserver DESTINATION bin)
-
 ########### install files ###############
 
+install(TARGETS authserver DESTINATION bin)
 install(FILES  authserver.conf.dist DESTINATION etc)
diff --git a/src/server/collision/CMakeLists.txt b/src/server/collision/CMakeLists.txt
index 0dbb44ba05b..b71f19496fe 100644
--- a/src/server/collision/CMakeLists.txt
+++ b/src/server/collision/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2010 Trinity 
+# Copyright (C) 2008-2010 Trinity 
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -10,24 +10,24 @@
 
 ########### collision ###############
 
-SET(collision_STAT_SRCS
-   BoundingIntervalHierarchy.h
-   BoundingIntervalHierarchy.cpp
-   Maps/MapTree.cpp
-   Maps/MapTree.h
-   Maps/TileAssembler.cpp
-   Maps/TileAssembler.h
-   Models/ModelInstance.cpp
-   Models/ModelInstance.h
-   Models/WorldModel.cpp
-   Models/WorldModel.h
-   Management/IVMapManager.h
-   Management/VMapFactory.cpp
-   Management/VMapFactory.h
-   Management/VMapManager2.cpp
-   Management/VMapManager2.h
-   VMapDefinitions.h
-   VMapTools.h
+set(collision_STAT_SRCS
+  BoundingIntervalHierarchy.h
+  BoundingIntervalHierarchy.cpp
+  Maps/MapTree.cpp
+  Maps/MapTree.h
+  Maps/TileAssembler.cpp
+  Maps/TileAssembler.h
+  Models/ModelInstance.cpp
+  Models/ModelInstance.h
+  Models/WorldModel.cpp
+  Models/WorldModel.h
+  Management/IVMapManager.h
+  Management/VMapFactory.cpp
+  Management/VMapFactory.h
+  Management/VMapManager2.cpp
+  Management/VMapManager2.h
+  VMapDefinitions.h
+  VMapTools.h
 )
 
 include_directories(
diff --git a/src/server/game/CMakeLists.txt b/src/server/game/CMakeLists.txt
index 8616c730d18..387b2365f47 100644
--- a/src/server/game/CMakeLists.txt
+++ b/src/server/game/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2010 Trinity 
+# Copyright (C) 2008-2010 Trinity 
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -11,321 +11,322 @@
 ######## game ########
 
 # Enable precompiled headers when using the GCC compiler.
-IF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX)
-        INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
-ENDIF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX)
+if(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX)
+  include_directories(${CMAKE_CURRENT_BINARY_DIR})
+endif()
 
-SET(game_STAT_SRCS
-   Accounts/AccountMgr.cpp
-   Accounts/AccountMgr.h
-   Achievements/AchievementMgr.h
-   Achievements/AchievementMgr.cpp
-   Addons/AddonMgr.cpp
-   Addons/AddonMgr.h
-   AI/CoreAI/CombatAI.cpp
-   AI/CoreAI/CombatAI.h
-   AI/CoreAI/GuardAI.cpp
-   AI/CoreAI/GuardAI.h
-   AI/CoreAI/PassiveAI.cpp
-   AI/CoreAI/PassiveAI.h
-   AI/CoreAI/PetAI.cpp
-   AI/CoreAI/PetAI.h
-   AI/CoreAI/ReactorAI.cpp
-   AI/CoreAI/ReactorAI.h
-   AI/CoreAI/TotemAI.cpp
-   AI/CoreAI/TotemAI.h
-   AI/CoreAI/UnitAI.cpp
-   AI/CoreAI/UnitAI.h
-   AI/EventAI/CreatureEventAI.cpp
-   AI/EventAI/CreatureEventAIMgr.cpp
-   AI/ScriptedAI/ScriptedSmartAI.cpp
-   AI/ScriptedAI/ScriptedSmartAI.h
-   AI/CreatureAIFactory.h
-   AI/CreatureAIImpl.h
-   AI/CreatureAIRegistry.cpp
-   AI/CreatureAIRegistry.h
-   AI/CreatureAISelector.cpp
-   AI/CreatureAISelector.h
-   AI/CreatureAI.cpp
-   AI/CreatureAI.h
-   AuctionHouse/AuctionHouseMgr.cpp
-   AuctionHouse/AuctionHouseMgr.h
-   AuctionHouse/AuctionHouseBot/AuctionHouseBot.cpp
-   AuctionHouse/AuctionHouseBot/AuctionHouseBot.h
-   BattleGrounds/ArenaTeam.cpp
-   BattleGrounds/ArenaTeam.h
-   BattleGrounds/Zones/BattleGroundAA.cpp
-   BattleGrounds/Zones/BattleGroundAA.h
-   BattleGrounds/Zones/BattleGroundAB.cpp
-   BattleGrounds/Zones/BattleGroundAB.h
-   BattleGrounds/Zones/BattleGroundRB.cpp
-   BattleGrounds/Zones/BattleGroundRB.h
-   BattleGrounds/Zones/BattleGroundAV.cpp
-   BattleGrounds/Zones/BattleGroundAV.h
-   BattleGrounds/Zones/BattleGroundBE.cpp
-   BattleGrounds/Zones/BattleGroundBE.h
-   BattleGrounds/Zones/BattleGroundDS.cpp
-   BattleGrounds/Zones/BattleGroundDS.h
-   BattleGrounds/Zones/BattleGroundEY.cpp
-   BattleGrounds/Zones/BattleGroundEY.h
-   BattleGrounds/Zones/BattleGroundIC.cpp
-   BattleGrounds/Zones/BattleGroundIC.h
-   BattleGrounds/Zones/BattleGroundNA.cpp
-   BattleGrounds/Zones/BattleGroundNA.h
-   BattleGrounds/Zones/BattleGroundRL.cpp
-   BattleGrounds/Zones/BattleGroundRL.h
-   BattleGrounds/Zones/BattleGroundRV.cpp
-   BattleGrounds/Zones/BattleGroundRV.h
-   BattleGrounds/Zones/BattleGroundSA.cpp
-   BattleGrounds/Zones/BattleGroundSA.h
-   BattleGrounds/Zones/BattleGroundWS.cpp
-   BattleGrounds/Zones/BattleGroundWS.h
-   BattleGrounds/BattleGround.cpp
-   BattleGrounds/BattleGround.h
-   BattleGrounds/BattleGroundMgr.cpp
-   BattleGrounds/BattleGroundMgr.h
-   Calendar/Calendar.cpp
-   Calendar/Calendar.h
-   Chat/Channels/Channel.cpp
-   Chat/Channels/Channel.h
-   Chat/Channels/ChannelMgr.h
-   Chat/Channels/ChannelMgr.cpp
-   Chat/Commands/Debugcmds.cpp
-   Chat/Commands/Level0.cpp
-   Chat/Commands/Level1.cpp
-   Chat/Commands/Level2.cpp
-   Chat/Commands/Level3.cpp
-   Chat/Chat.cpp
-   Chat/Chat.h
-   Combat/HostileRefManager.cpp
-   Combat/HostileRefManager.h
-   Combat/ThreatManager.cpp
-   Combat/ThreatManager.h
-   Combat/UnitEvents.h
-   Conditions/ConditionMgr.cpp
-   Conditions/ConditionMgr.h
-   DataStores/DBCEnums.h
-   DataStores/DBCStores.cpp
-   DataStores/DBCStores.h
-   DataStores/DBCStructure.h
-   DataStores/DBCfmt.h
-   DungeonFinding/LFG.h
-   DungeonFinding/LFGMgr.cpp
-   DungeonFinding/LFGMgr.h
-   Entities/Corpse/Corpse.cpp
-   Entities/Corpse/Corpse.h
-   Entities/Creature/Creature.cpp
-   Entities/Creature/Creature.h
-   Entities/Creature/CreatureGroups.cpp
-   Entities/Creature/CreatureGroups.h
-   Entities/Creature/GossipDef.cpp
-   Entities/Creature/GossipDef.h
-   Entities/Creature/TemporarySummon.cpp
-   Entities/Creature/TemporarySummon.h
-   Entities/DynamicObject/DynamicObject.cpp
-   Entities/DynamicObject/DynamicObject.h
-   Entities/GameObject/GameObject.cpp
-   Entities/GameObject/GameObject.h
-   Entities/Item/Container/Bag.cpp
-   Entities/Item/Container/Bag.h
-   Entities/Item/Item.cpp
-   Entities/Item/Item.h
-   Entities/Item/ItemEnchantmentMgr.cpp
-   Entities/Item/ItemEnchantmentMgr.h
-   Entities/Item/ItemPrototype.h
-   Entities/Object/Updates/UpdateData.cpp
-   Entities/Object/Updates/UpdateData.h
-   Entities/Object/Updates/UpdateFields.h
-   Entities/Object/Updates/UpdateMask.h
-   Entities/Object/ObjectDefines.h
-   Entities/Object/Object.cpp
-   Entities/Object/Object.h
-   Entities/Object/ObjectPosSelector.cpp
-   Entities/Object/ObjectPosSelector.h
-   Entities/Pet/Pet.cpp
-   Entities/Pet/Pet.h
-   Entities/Player/Player.cpp
-   Entities/Player/Player.h
-   Entities/Player/SocialMgr.cpp
-   Entities/Player/SocialMgr.h
-   Entities/Unit/StatSystem.cpp
-   Entities/Unit/Unit.cpp
-   Entities/Unit/Unit.h
-   Entities/Totem/Totem.cpp
-   Entities/Totem/Totem.h
-   Entities/Transport/Transport.cpp
-   Entities/Transport/Transport.h
-   Entities/Vehicle/Vehicle.cpp
-   Entities/Vehicle/Vehicle.h
-   Events/GameEventMgr.cpp
-   Events/GameEventMgr.h
-   Globals/GlobalEvents.cpp
-   Globals/GlobalEvents.h
-   Globals/ObjectAccessor.cpp
-   Globals/ObjectAccessor.h
-   Globals/ObjectMgr.cpp
-   Globals/ObjectMgr.h
-   Grids/Cells/Cell.h
-   Grids/Cells/CellImpl.h
-   Grids/Notifiers/GridNotifiers.cpp
-   Grids/Notifiers/GridNotifiers.h
-   Grids/Notifiers/GridNotifiersImpl.h
-   Grids/GridDefines.h
-   Grids/GridStates.cpp
-   Grids/GridStates.h
-   Grids/ObjectGridLoader.cpp
-   Grids/ObjectGridLoader.h
-   Groups/Group.cpp
-   Groups/Group.h
-   Groups/GroupReference.cpp
-   Groups/GroupReference.h
-   Groups/GroupRefManager.h
-   Guilds/Guild.cpp
-   Guilds/Guild.h
-   Instances/InstanceData.cpp
-   Instances/InstanceData.h
-   Instances/InstanceSaveMgr.cpp
-   Instances/InstanceSaveMgr.h
-   Loot/LootMgr.cpp
-   Loot/LootMgr.h
-   Mails/Mail.cpp
-   Mails/Mail.h
-   Maps/Map.cpp
-   Maps/Map.h
-   Maps/MapInstanced.cpp
-   Maps/MapInstanced.h
-   Maps/MapManager.cpp
-   Maps/MapManager.h
-   Maps/MapUpdater.cpp
-   Maps/MapUpdater.h
-   Maps/MapReference.h
-   Maps/MapRefManager.h
-   Maps/ZoneScript.h
-   Miscellaneous/Formulas.h
-   Miscellaneous/Language.h
-   Miscellaneous/SharedDefines.h
-   Movement/MovementGenerators/ConfusedMovementGenerator.cpp
-   Movement/MovementGenerators/ConfusedMovementGenerator.h
-   Movement/MovementGenerators/FleeingMovementGenerator.cpp
-   Movement/MovementGenerators/FleeingMovementGenerator.h
-   Movement/MovementGenerators/HomeMovementGenerator.cpp
-   Movement/MovementGenerators/HomeMovementGenerator.h
-   Movement/MovementGenerators/IdleMovementGenerator.cpp
-   Movement/MovementGenerators/IdleMovementGenerator.h
-   Movement/MovementGenerators/PointMovementGenerator.cpp
-   Movement/MovementGenerators/PointMovementGenerator.h
-   Movement/MovementGenerators/RandomMovementGenerator.cpp
-   Movement/MovementGenerators/RandomMovementGenerator.h
-   Movement/MovementGenerators/TargetedMovementGenerator.cpp
-   Movement/MovementGenerators/TargetedMovementGenerator.h
-   Movement/MovementGenerators/WaypointMovementGenerator.cpp
-   Movement/MovementGenerators/WaypointMovementGenerator.h
-   Movement/Waypoints/Path.h
-   Movement/Waypoints/WaypointManager.cpp
-   Movement/Waypoints/WaypointManager.h
-   Movement/DestinationHolder.cpp
-   Movement/DestinationHolder.h
-   Movement/DestinationHolderImp.h
-   Movement/FollowerReference.cpp
-   Movement/FollowerReference.h
-   Movement/FollowerRefManager.h
-   Movement/MotionMaster.cpp
-   Movement/MotionMaster.h
-   Movement/MovementGenerator.cpp
-   Movement/MovementGenerator.h
-   Movement/MovementGeneratorImpl.h
-   Movement/Traveller.h
-   OutdoorPvP/Zones/OutdoorPvPEP.cpp
-   OutdoorPvP/Zones/OutdoorPvPEP.h
-   OutdoorPvP/Zones/OutdoorPvPHP.cpp
-   OutdoorPvP/Zones/OutdoorPvPHP.h
-   OutdoorPvP/Zones/OutdoorPvPNA.cpp
-   OutdoorPvP/Zones/OutdoorPvPNA.h
-   OutdoorPvP/Zones/OutdoorPvPSI.cpp
-   OutdoorPvP/Zones/OutdoorPvPSI.h
-   OutdoorPvP/Zones/OutdoorPvPTF.cpp
-   OutdoorPvP/Zones/OutdoorPvPTF.h
-   OutdoorPvP/Zones/OutdoorPvPZM.cpp
-   OutdoorPvP/Zones/OutdoorPvPZM.h
-   OutdoorPvP/OutdoorPvP.cpp
-   OutdoorPvP/OutdoorPvP.h
-   OutdoorPvP/OutdoorPvPImpl.h
-   OutdoorPvP/OutdoorPvPMgr.cpp
-   OutdoorPvP/OutdoorPvPMgr.h
-   Pools/PoolHandler.cpp
-   Pools/PoolHandler.h
-   Quests/QuestDef.cpp
-   Quests/QuestDef.h
-   Reputation/ReputationMgr.cpp
-   Reputation/ReputationMgr.h
-   Scripting/ScriptLoader.cpp
-   Scripting/ScriptLoader.h
-   Scripting/ScriptMgr.cpp
-   Scripting/ScriptMgr.h
-   Scripting/ScriptSystem.cpp
-   Scripting/ScriptSystem.h
-   Server/Protocol/Handlers/AddonHandler.cpp
-   Server/Protocol/Handlers/AddonHandler.h
-   Server/Protocol/Handlers/ArenaTeamHandler.cpp
-   Server/Protocol/Handlers/AuctionHouseHandler.cpp
-   Server/Protocol/Handlers/BattleGroundHandler.cpp
-   Server/Protocol/Handlers/CalendarHandler.cpp
-   Server/Protocol/Handlers/ChannelHandler.cpp
-   Server/Protocol/Handlers/CharacterHandler.cpp
-   Server/Protocol/Handlers/ChatHandler.cpp
-   Server/Protocol/Handlers/CombatHandler.cpp
-   Server/Protocol/Handlers/DuelHandler.cpp
-   Server/Protocol/Handlers/GroupHandler.cpp
-   Server/Protocol/Handlers/GuildHandler.cpp
-   Server/Protocol/Handlers/ItemHandler.cpp
-   Server/Protocol/Handlers/LFGHandler.cpp
-   Server/Protocol/Handlers/LootHandler.cpp
-   Server/Protocol/Handlers/MiscHandler.cpp
-   Server/Protocol/Handlers/MovementHandler.cpp
-   Server/Protocol/Handlers/NPCHandler.cpp
-   Server/Protocol/Handlers/NPCHandler.h
-   Server/Protocol/Handlers/PetHandler.cpp
-   Server/Protocol/Handlers/PetitionsHandler.cpp
-   Server/Protocol/Handlers/QueryHandler.cpp
-   Server/Protocol/Handlers/QuestHandler.cpp
-   Server/Protocol/Handlers/SkillHandler.cpp
-   Server/Protocol/Handlers/SpellHandler.cpp
-   Server/Protocol/Handlers/TaxiHandler.cpp
-   Server/Protocol/Handlers/TicketHandler.cpp
-   Server/Protocol/Handlers/TradeHandler.cpp
-   Server/Protocol/Handlers/VoiceChatHandler.cpp
-   Server/Protocol/Opcodes.cpp
-   Server/Protocol/Opcodes.h
-   Server/Protocol/WorldLog.cpp
-   Server/Protocol/WorldLog.h
-   Server/WorldSession.cpp
-   Server/WorldSession.h
-   Server/WorldSocket.cpp
-   Server/WorldSocket.h
-   Server/WorldSocketMgr.cpp
-   Server/WorldSocketMgr.h
-   Skills/SkillDiscovery.cpp
-   Skills/SkillDiscovery.h
-   Skills/SkillExtraItems.cpp
-   Skills/SkillExtraItems.h
-   Spells/Auras/SpellAuraDefines.h
-   Spells/Auras/SpellAuras.cpp
-   Spells/Auras/SpellAuras.h
-   Spells/Auras/SpellAuraEffects.cpp
-   Spells/Auras/SpellAuraEffects.h
-   Spells/Auras/SpellEffects.cpp
-   Spells/Spell.cpp
-   Spells/Spell.h
-   Spells/SpellMgr.cpp
-   Spells/SpellMgr.h
-   Tools/PlayerDump.cpp
-   Tools/PlayerDump.h
-   Tools/Tools.cpp
-   Tools/Tools.h
-   Weather/Weather.cpp
-   Weather/Weather.h
-   World/World.cpp
-   World/World.h
+# Create game-libary
+set(game_STAT_SRCS
+  Accounts/AccountMgr.cpp
+  Accounts/AccountMgr.h
+  Achievements/AchievementMgr.h
+  Achievements/AchievementMgr.cpp
+  Addons/AddonMgr.cpp
+  Addons/AddonMgr.h
+  AI/CoreAI/CombatAI.cpp
+  AI/CoreAI/CombatAI.h
+  AI/CoreAI/GuardAI.cpp
+  AI/CoreAI/GuardAI.h
+  AI/CoreAI/PassiveAI.cpp
+  AI/CoreAI/PassiveAI.h
+  AI/CoreAI/PetAI.cpp
+  AI/CoreAI/PetAI.h
+  AI/CoreAI/ReactorAI.cpp
+  AI/CoreAI/ReactorAI.h
+  AI/CoreAI/TotemAI.cpp
+  AI/CoreAI/TotemAI.h
+  AI/CoreAI/UnitAI.cpp
+  AI/CoreAI/UnitAI.h
+  AI/EventAI/CreatureEventAI.cpp
+  AI/EventAI/CreatureEventAIMgr.cpp
+  AI/ScriptedAI/ScriptedSmartAI.cpp
+  AI/ScriptedAI/ScriptedSmartAI.h
+  AI/CreatureAIFactory.h
+  AI/CreatureAIImpl.h
+  AI/CreatureAIRegistry.cpp
+  AI/CreatureAIRegistry.h
+  AI/CreatureAISelector.cpp
+  AI/CreatureAISelector.h
+  AI/CreatureAI.cpp
+  AI/CreatureAI.h
+  AuctionHouse/AuctionHouseMgr.cpp
+  AuctionHouse/AuctionHouseMgr.h
+  AuctionHouse/AuctionHouseBot/AuctionHouseBot.cpp
+  AuctionHouse/AuctionHouseBot/AuctionHouseBot.h
+  BattleGrounds/ArenaTeam.cpp
+  BattleGrounds/ArenaTeam.h
+  BattleGrounds/Zones/BattleGroundAA.cpp
+  BattleGrounds/Zones/BattleGroundAA.h
+  BattleGrounds/Zones/BattleGroundAB.cpp
+  BattleGrounds/Zones/BattleGroundAB.h
+  BattleGrounds/Zones/BattleGroundRB.cpp
+  BattleGrounds/Zones/BattleGroundRB.h
+  BattleGrounds/Zones/BattleGroundAV.cpp
+  BattleGrounds/Zones/BattleGroundAV.h
+  BattleGrounds/Zones/BattleGroundBE.cpp
+  BattleGrounds/Zones/BattleGroundBE.h
+  BattleGrounds/Zones/BattleGroundDS.cpp
+  BattleGrounds/Zones/BattleGroundDS.h
+  BattleGrounds/Zones/BattleGroundEY.cpp
+  BattleGrounds/Zones/BattleGroundEY.h
+  BattleGrounds/Zones/BattleGroundIC.cpp
+  BattleGrounds/Zones/BattleGroundIC.h
+  BattleGrounds/Zones/BattleGroundNA.cpp
+  BattleGrounds/Zones/BattleGroundNA.h
+  BattleGrounds/Zones/BattleGroundRL.cpp
+  BattleGrounds/Zones/BattleGroundRL.h
+  BattleGrounds/Zones/BattleGroundRV.cpp
+  BattleGrounds/Zones/BattleGroundRV.h
+  BattleGrounds/Zones/BattleGroundSA.cpp
+  BattleGrounds/Zones/BattleGroundSA.h
+  BattleGrounds/Zones/BattleGroundWS.cpp
+  BattleGrounds/Zones/BattleGroundWS.h
+  BattleGrounds/BattleGround.cpp
+  BattleGrounds/BattleGround.h
+  BattleGrounds/BattleGroundMgr.cpp
+  BattleGrounds/BattleGroundMgr.h
+  Calendar/Calendar.cpp
+  Calendar/Calendar.h
+  Chat/Channels/Channel.cpp
+  Chat/Channels/Channel.h
+  Chat/Channels/ChannelMgr.h
+  Chat/Channels/ChannelMgr.cpp
+  Chat/Commands/Debugcmds.cpp
+  Chat/Commands/Level0.cpp
+  Chat/Commands/Level1.cpp
+  Chat/Commands/Level2.cpp
+  Chat/Commands/Level3.cpp
+  Chat/Chat.cpp
+  Chat/Chat.h
+  Combat/HostileRefManager.cpp
+  Combat/HostileRefManager.h
+  Combat/ThreatManager.cpp
+  Combat/ThreatManager.h
+  Combat/UnitEvents.h
+  Conditions/ConditionMgr.cpp
+  Conditions/ConditionMgr.h
+  DataStores/DBCEnums.h
+  DataStores/DBCStores.cpp
+  DataStores/DBCStores.h
+  DataStores/DBCStructure.h
+  DataStores/DBCfmt.h
+  DungeonFinding/LFG.h
+  DungeonFinding/LFGMgr.cpp
+  DungeonFinding/LFGMgr.h
+  Entities/Corpse/Corpse.cpp
+  Entities/Corpse/Corpse.h
+  Entities/Creature/Creature.cpp
+  Entities/Creature/Creature.h
+  Entities/Creature/CreatureGroups.cpp
+  Entities/Creature/CreatureGroups.h
+  Entities/Creature/GossipDef.cpp
+  Entities/Creature/GossipDef.h
+  Entities/Creature/TemporarySummon.cpp
+  Entities/Creature/TemporarySummon.h
+  Entities/DynamicObject/DynamicObject.cpp
+  Entities/DynamicObject/DynamicObject.h
+  Entities/GameObject/GameObject.cpp
+  Entities/GameObject/GameObject.h
+  Entities/Item/Container/Bag.cpp
+  Entities/Item/Container/Bag.h
+  Entities/Item/Item.cpp
+  Entities/Item/Item.h
+  Entities/Item/ItemEnchantmentMgr.cpp
+  Entities/Item/ItemEnchantmentMgr.h
+  Entities/Item/ItemPrototype.h
+  Entities/Object/Updates/UpdateData.cpp
+  Entities/Object/Updates/UpdateData.h
+  Entities/Object/Updates/UpdateFields.h
+  Entities/Object/Updates/UpdateMask.h
+  Entities/Object/ObjectDefines.h
+  Entities/Object/Object.cpp
+  Entities/Object/Object.h
+  Entities/Object/ObjectPosSelector.cpp
+  Entities/Object/ObjectPosSelector.h
+  Entities/Pet/Pet.cpp
+  Entities/Pet/Pet.h
+  Entities/Player/Player.cpp
+  Entities/Player/Player.h
+  Entities/Player/SocialMgr.cpp
+  Entities/Player/SocialMgr.h
+  Entities/Unit/StatSystem.cpp
+  Entities/Unit/Unit.cpp
+  Entities/Unit/Unit.h
+  Entities/Totem/Totem.cpp
+  Entities/Totem/Totem.h
+  Entities/Transport/Transport.cpp
+  Entities/Transport/Transport.h
+  Entities/Vehicle/Vehicle.cpp
+  Entities/Vehicle/Vehicle.h
+  Events/GameEventMgr.cpp
+  Events/GameEventMgr.h
+  Globals/GlobalEvents.cpp
+  Globals/GlobalEvents.h
+  Globals/ObjectAccessor.cpp
+  Globals/ObjectAccessor.h
+  Globals/ObjectMgr.cpp
+  Globals/ObjectMgr.h
+  Grids/Cells/Cell.h
+  Grids/Cells/CellImpl.h
+  Grids/Notifiers/GridNotifiers.cpp
+  Grids/Notifiers/GridNotifiers.h
+  Grids/Notifiers/GridNotifiersImpl.h
+  Grids/GridDefines.h
+  Grids/GridStates.cpp
+  Grids/GridStates.h
+  Grids/ObjectGridLoader.cpp
+  Grids/ObjectGridLoader.h
+  Groups/Group.cpp
+  Groups/Group.h
+  Groups/GroupReference.cpp
+  Groups/GroupReference.h
+  Groups/GroupRefManager.h
+  Guilds/Guild.cpp
+  Guilds/Guild.h
+  Instances/InstanceData.cpp
+  Instances/InstanceData.h
+  Instances/InstanceSaveMgr.cpp
+  Instances/InstanceSaveMgr.h
+  Loot/LootMgr.cpp
+  Loot/LootMgr.h
+  Mails/Mail.cpp
+  Mails/Mail.h
+  Maps/Map.cpp
+  Maps/Map.h
+  Maps/MapInstanced.cpp
+  Maps/MapInstanced.h
+  Maps/MapManager.cpp
+  Maps/MapManager.h
+  Maps/MapUpdater.cpp
+  Maps/MapUpdater.h
+  Maps/MapReference.h
+  Maps/MapRefManager.h
+  Maps/ZoneScript.h
+  Miscellaneous/Formulas.h
+  Miscellaneous/Language.h
+  Miscellaneous/SharedDefines.h
+  Movement/MovementGenerators/ConfusedMovementGenerator.cpp
+  Movement/MovementGenerators/ConfusedMovementGenerator.h
+  Movement/MovementGenerators/FleeingMovementGenerator.cpp
+  Movement/MovementGenerators/FleeingMovementGenerator.h
+  Movement/MovementGenerators/HomeMovementGenerator.cpp
+  Movement/MovementGenerators/HomeMovementGenerator.h
+  Movement/MovementGenerators/IdleMovementGenerator.cpp
+  Movement/MovementGenerators/IdleMovementGenerator.h
+  Movement/MovementGenerators/PointMovementGenerator.cpp
+  Movement/MovementGenerators/PointMovementGenerator.h
+  Movement/MovementGenerators/RandomMovementGenerator.cpp
+  Movement/MovementGenerators/RandomMovementGenerator.h
+  Movement/MovementGenerators/TargetedMovementGenerator.cpp
+  Movement/MovementGenerators/TargetedMovementGenerator.h
+  Movement/MovementGenerators/WaypointMovementGenerator.cpp
+  Movement/MovementGenerators/WaypointMovementGenerator.h
+  Movement/Waypoints/Path.h
+  Movement/Waypoints/WaypointManager.cpp
+  Movement/Waypoints/WaypointManager.h
+  Movement/DestinationHolder.cpp
+  Movement/DestinationHolder.h
+  Movement/DestinationHolderImp.h
+  Movement/FollowerReference.cpp
+  Movement/FollowerReference.h
+  Movement/FollowerRefManager.h
+  Movement/MotionMaster.cpp
+  Movement/MotionMaster.h
+  Movement/MovementGenerator.cpp
+  Movement/MovementGenerator.h
+  Movement/MovementGeneratorImpl.h
+  Movement/Traveller.h
+  OutdoorPvP/Zones/OutdoorPvPEP.cpp
+  OutdoorPvP/Zones/OutdoorPvPEP.h
+  OutdoorPvP/Zones/OutdoorPvPHP.cpp
+  OutdoorPvP/Zones/OutdoorPvPHP.h
+  OutdoorPvP/Zones/OutdoorPvPNA.cpp
+  OutdoorPvP/Zones/OutdoorPvPNA.h
+  OutdoorPvP/Zones/OutdoorPvPSI.cpp
+  OutdoorPvP/Zones/OutdoorPvPSI.h
+  OutdoorPvP/Zones/OutdoorPvPTF.cpp
+  OutdoorPvP/Zones/OutdoorPvPTF.h
+  OutdoorPvP/Zones/OutdoorPvPZM.cpp
+  OutdoorPvP/Zones/OutdoorPvPZM.h
+  OutdoorPvP/OutdoorPvP.cpp
+  OutdoorPvP/OutdoorPvP.h
+  OutdoorPvP/OutdoorPvPImpl.h
+  OutdoorPvP/OutdoorPvPMgr.cpp
+  OutdoorPvP/OutdoorPvPMgr.h
+  Pools/PoolHandler.cpp
+  Pools/PoolHandler.h
+  Quests/QuestDef.cpp
+  Quests/QuestDef.h
+  Reputation/ReputationMgr.cpp
+  Reputation/ReputationMgr.h
+  Scripting/ScriptLoader.cpp
+  Scripting/ScriptLoader.h
+  Scripting/ScriptMgr.cpp
+  Scripting/ScriptMgr.h
+  Scripting/ScriptSystem.cpp
+  Scripting/ScriptSystem.h
+  Server/Protocol/Handlers/AddonHandler.cpp
+  Server/Protocol/Handlers/AddonHandler.h
+  Server/Protocol/Handlers/ArenaTeamHandler.cpp
+  Server/Protocol/Handlers/AuctionHouseHandler.cpp
+  Server/Protocol/Handlers/BattleGroundHandler.cpp
+  Server/Protocol/Handlers/CalendarHandler.cpp
+  Server/Protocol/Handlers/ChannelHandler.cpp
+  Server/Protocol/Handlers/CharacterHandler.cpp
+  Server/Protocol/Handlers/ChatHandler.cpp
+  Server/Protocol/Handlers/CombatHandler.cpp
+  Server/Protocol/Handlers/DuelHandler.cpp
+  Server/Protocol/Handlers/GroupHandler.cpp
+  Server/Protocol/Handlers/GuildHandler.cpp
+  Server/Protocol/Handlers/ItemHandler.cpp
+  Server/Protocol/Handlers/LFGHandler.cpp
+  Server/Protocol/Handlers/LootHandler.cpp
+  Server/Protocol/Handlers/MiscHandler.cpp
+  Server/Protocol/Handlers/MovementHandler.cpp
+  Server/Protocol/Handlers/NPCHandler.cpp
+  Server/Protocol/Handlers/NPCHandler.h
+  Server/Protocol/Handlers/PetHandler.cpp
+  Server/Protocol/Handlers/PetitionsHandler.cpp
+  Server/Protocol/Handlers/QueryHandler.cpp
+  Server/Protocol/Handlers/QuestHandler.cpp
+  Server/Protocol/Handlers/SkillHandler.cpp
+  Server/Protocol/Handlers/SpellHandler.cpp
+  Server/Protocol/Handlers/TaxiHandler.cpp
+  Server/Protocol/Handlers/TicketHandler.cpp
+  Server/Protocol/Handlers/TradeHandler.cpp
+  Server/Protocol/Handlers/VoiceChatHandler.cpp
+  Server/Protocol/Opcodes.cpp
+  Server/Protocol/Opcodes.h
+  Server/Protocol/WorldLog.cpp
+  Server/Protocol/WorldLog.h
+  Server/WorldSession.cpp
+  Server/WorldSession.h
+  Server/WorldSocket.cpp
+  Server/WorldSocket.h
+  Server/WorldSocketMgr.cpp
+  Server/WorldSocketMgr.h
+  Skills/SkillDiscovery.cpp
+  Skills/SkillDiscovery.h
+  Skills/SkillExtraItems.cpp
+  Skills/SkillExtraItems.h
+  Spells/Auras/SpellAuraDefines.h
+  Spells/Auras/SpellAuras.cpp
+  Spells/Auras/SpellAuras.h
+  Spells/Auras/SpellAuraEffects.cpp
+  Spells/Auras/SpellAuraEffects.h
+  Spells/Auras/SpellEffects.cpp
+  Spells/Spell.cpp
+  Spells/Spell.h
+  Spells/SpellMgr.cpp
+  Spells/SpellMgr.h
+  Tools/PlayerDump.cpp
+  Tools/PlayerDump.h
+  Tools/Tools.cpp
+  Tools/Tools.h
+  Weather/Weather.cpp
+  Weather/Weather.h
+  World/World.cpp
+  World/World.h
 )
 
 include_directories(
@@ -420,28 +421,28 @@ include_directories(
 )
 
 if(NOT DO_SCRIPTS)
-   SET(game_STAT_SRCS ${game_STAT_SRCS}
-      AI/ScriptedAI/ScriptedEscortAI.cpp
-      AI/ScriptedAI/ScriptedEscortAI.h
-      AI/ScriptedAI/ScriptedCreature.cpp
-      AI/ScriptedAI/ScriptedCreature.h
-      AI/ScriptedAI/ScriptedFollowerAI.cpp
-      AI/ScriptedAI/ScriptedFollowerAI.h
-      AI/ScriptedAI/ScriptedGossip.h
-      AI/ScriptedAI/ScriptedGuardAI.cpp
-      AI/ScriptedAI/ScriptedGuardAI.h
-      AI/ScriptedAI/ScriptedInstance.h
-      AI/ScriptedAI/ScriptedSimpleAI.cpp
-      AI/ScriptedAI/ScriptedSimpleAI.h
-   )
-   message("-- Added Script Engine to GAME lib")
-endif(NOT DO_SCRIPTS)
+  set(game_STAT_SRCS ${game_STAT_SRCS}
+    AI/ScriptedAI/ScriptedEscortAI.cpp
+    AI/ScriptedAI/ScriptedEscortAI.h
+    AI/ScriptedAI/ScriptedCreature.cpp
+    AI/ScriptedAI/ScriptedCreature.h
+    AI/ScriptedAI/ScriptedFollowerAI.cpp
+    AI/ScriptedAI/ScriptedFollowerAI.h
+    AI/ScriptedAI/ScriptedGossip.h
+    AI/ScriptedAI/ScriptedGuardAI.cpp
+    AI/ScriptedAI/ScriptedGuardAI.h
+    AI/ScriptedAI/ScriptedInstance.h
+    AI/ScriptedAI/ScriptedSimpleAI.cpp
+    AI/ScriptedAI/ScriptedSimpleAI.h
+  )
+  message("-- Added basic scriptAI-engines to GAME library")
+endif()
 
 add_library(game STATIC ${game_STAT_SRCS})
-ADD_DEPENDENCIES(game revision.h)
 
-# Generate precompiled header
-IF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX)
-        ADD_PRECOMPILED_HEADER(game ${CMAKE_SOURCE_DIR}/src/server/game/PrecompiledHeaders/NixCorePCH.h)
-ENDIF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX)
+add_dependencies(game revision.h)
 
+# Generate precompiled header
+if(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX)
+  add_precompiled_header(game ${CMAKE_SOURCE_DIR}/src/server/game/PrecompiledHeaders/NixCorePCH.h)
+endif()
diff --git a/src/server/scripts/CMakeLists.txt b/src/server/scripts/CMakeLists.txt
index 02228d49ba9..7d10625e9d6 100644
--- a/src/server/scripts/CMakeLists.txt
+++ b/src/server/scripts/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2010 Trinity 
+# Copyright (C) 2008-2010 Trinity 
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -8,7 +8,6 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-####### scripts ########
 file(GLOB_RECURSE scripts_easternkingdoms EasternKingdoms/*.cpp)
 file(GLOB_RECURSE scripts_kalimdor Kalimdor/*.cpp)
 file(GLOB_RECURSE scripts_northrend Northrend/*.cpp)
@@ -17,34 +16,36 @@ file(GLOB_RECURSE scripts_world World/*.cpp)
 file(GLOB_RECURSE scripts_examples Examples/*.cpp)
 
 # Enable precompiled headers when using the GCC compiler.
-IF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX)
-	INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
-ENDIF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX)
+if(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX)
+  include_directories(
+    ${CMAKE_CURRENT_BINARY_DIR}
+  )
+endif()
 
-SET(scripts_STAT_SRCS
-   ../game/PrecompiledHeaders/ScriptPCH.cpp
-   ../game/PrecompiledHeaders/ScriptPCH.h
-   ../game/AI/ScriptedAI/ScriptedEscortAI.cpp
-   ../game/AI/ScriptedAI/ScriptedEscortAI.h
-   ../game/AI/ScriptedAI/ScriptedCreature.cpp
-   ../game/AI/ScriptedAI/ScriptedCreature.h
-   ../game/AI/ScriptedAI/ScriptedFollowerAI.cpp
-   ../game/AI/ScriptedAI/ScriptedFollowerAI.h
-   ../game/AI/ScriptedAI/ScriptedGossip.h
-   ../game/AI/ScriptedAI/ScriptedGuardAI.cpp
-   ../game/AI/ScriptedAI/ScriptedGuardAI.h
-   ../game/AI/ScriptedAI/ScriptedInstance.h
-   ../game/AI/ScriptedAI/ScriptedSimpleAI.cpp
-   ../game/AI/ScriptedAI/ScriptedSimpleAI.h
-   Custom/on_events.cpp
-   ${scripts_easternkingdoms}
-   ${scripts_kalimdor}
-   ${scripts_northrend}
-   ${scripts_outland}
-   ${scripts_world}
-   ${scripts_examples}
+set(scripts_STAT_SRCS
+  ../game/PrecompiledHeaders/ScriptPCH.cpp
+  ../game/PrecompiledHeaders/ScriptPCH.h
+  ../game/AI/ScriptedAI/ScriptedEscortAI.cpp
+  ../game/AI/ScriptedAI/ScriptedEscortAI.h
+  ../game/AI/ScriptedAI/ScriptedCreature.cpp
+  ../game/AI/ScriptedAI/ScriptedCreature.h
+  ../game/AI/ScriptedAI/ScriptedFollowerAI.cpp
+  ../game/AI/ScriptedAI/ScriptedFollowerAI.h
+  ../game/AI/ScriptedAI/ScriptedGossip.h
+  ../game/AI/ScriptedAI/ScriptedGuardAI.cpp
+  ../game/AI/ScriptedAI/ScriptedGuardAI.h
+  ../game/AI/ScriptedAI/ScriptedInstance.h
+  ../game/AI/ScriptedAI/ScriptedSimpleAI.cpp
+  ../game/AI/ScriptedAI/ScriptedSimpleAI.h
+  Custom/on_events.cpp
+  ${scripts_easternkingdoms}
+  ${scripts_kalimdor}
+  ${scripts_northrend}
+  ${scripts_outland}
+  ${scripts_world}
+  ${scripts_examples}
 )
-message("-- Added Script Engine to SCRIPTS lib")
+message("-- Added Scriptengine to SCRIPTS lib")
 
 include_directories(
   ${ACE_INCLUDE_DIR}
@@ -134,7 +135,8 @@ include_directories(
 add_library(scripts STATIC ${scripts_STAT_SRCS})
 
 # Generate precompiled header
-IF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX)
-	ADD_PRECOMPILED_HEADER(scripts ${CMAKE_SOURCE_DIR}/src/server/game/PrecompiledHeaders/ScriptPCH.h)
-ENDIF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX)
-
+if(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX)
+  add_precompiled_header(scripts
+    ${CMAKE_SOURCE_DIR}/src/server/game/PrecompiledHeaders/ScriptPCH.h
+  )
+endif()
diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt
index 6ff39c724de..c815ddb9902 100644
--- a/src/server/shared/CMakeLists.txt
+++ b/src/server/shared/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2010 Trinity 
+# Copyright (C) 2008-2010 Trinity 
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -10,27 +10,27 @@
 
 ########### shared ###############
 
-SET(shared_STAT_SRCS
-   Debugging/Errors.h
-   Logging/Log.cpp
-   Logging/Log.h
-   Packets/ByteBuffer.h
-   Packets/WorldPacket.h
-   Policies/ObjectLifeTime.cpp
-   Threading/DelayExecutor.cpp
-   Threading/DelayExecutor.h
-   Threading/Threading.cpp
-   Utilities/ProgressBar.cpp
-   Utilities/ProgressBar.h
-   Utilities/SignalHandler.h
-   Utilities/Timer.h
-   Utilities/Util.cpp
-   Utilities/Util.h  
-   Utilities/EventProcessor.cpp
-   Utilities/EventProcessor.h
-   Common.cpp
-   Common.h
-   SystemConfig.h
+set(shared_STAT_SRCS
+  Debugging/Errors.h
+  Logging/Log.cpp
+  Logging/Log.h
+  Packets/ByteBuffer.h
+  Packets/WorldPacket.h
+  Policies/ObjectLifeTime.cpp
+  Threading/DelayExecutor.cpp
+  Threading/DelayExecutor.h
+  Threading/Threading.cpp
+  Utilities/ProgressBar.cpp
+  Utilities/ProgressBar.h
+  Utilities/SignalHandler.h
+  Utilities/Timer.h
+  Utilities/Util.cpp
+  Utilities/Util.h  
+  Utilities/EventProcessor.cpp
+  Utilities/EventProcessor.h
+  Common.cpp
+  Common.h
+  SystemConfig.h
 )
 
 include_directories(
@@ -56,22 +56,22 @@ include_directories(
 )
 
 add_library(shared STATIC ${shared_STAT_SRCS})
+
 target_link_libraries(
-shared
-${ACE_LIBRARY}
+  shared
+  ${ACE_LIBRARY}
 )
 
-
 ########### trinityconfig ###############
 
-SET(trinityconfig_STAT_SRCS
-   Configuration/dotconfpp/dotconfpp.cpp
-   Configuration/dotconfpp/dotconfpp.h
-   Configuration/dotconfpp/mempool.cpp
-   Configuration/dotconfpp/mempool.h
-   Configuration/Config.cpp
-   Configuration/Config.h
-   Configuration/ConfigEnv.h
+set(trinityconfig_STAT_SRCS
+  Configuration/dotconfpp/dotconfpp.cpp
+  Configuration/dotconfpp/dotconfpp.h
+  Configuration/dotconfpp/mempool.cpp
+  Configuration/dotconfpp/mempool.h
+  Configuration/Config.cpp
+  Configuration/Config.h
+  Configuration/ConfigEnv.h
 )
 
 include_directories(
@@ -84,19 +84,19 @@ add_library(trinityconfig STATIC ${trinityconfig_STAT_SRCS})
 
 ########### trinityauth ###############
 
-SET(trinityauth_STAT_SRCS
-   Cryptography/Authentication/AuthCrypt.cpp
-   Cryptography/Authentication/AuthCrypt.h
-   Cryptography/BigNumber.cpp
-   Cryptography/BigNumber.h
-   Cryptography/HMACSHA1.cpp
-   Cryptography/HMACSHA1.h
-   Cryptography/SHA1.cpp
-   Cryptography/SHA1.h
-   Cryptography/MD5.c
-   Cryptography/MD5.h
-   Cryptography/ARC4.cpp
-   Cryptography/ARC4.h
+set(trinityauth_STAT_SRCS
+  Cryptography/Authentication/AuthCrypt.cpp
+  Cryptography/Authentication/AuthCrypt.h
+  Cryptography/BigNumber.cpp
+  Cryptography/BigNumber.h
+  Cryptography/HMACSHA1.cpp
+  Cryptography/HMACSHA1.h
+  Cryptography/SHA1.cpp
+  Cryptography/SHA1.h
+  Cryptography/MD5.c
+  Cryptography/MD5.h
+  Cryptography/ARC4.cpp
+  Cryptography/ARC4.h
 )
 
 include_directories(
@@ -110,24 +110,24 @@ add_library(trinityauth STATIC ${trinityauth_STAT_SRCS})
 
 ########### trinitydatabase ###############
 
-SET(trinitydatabase_STAT_SRCS
-    DataStores/DBCFileLoader.cpp
-    DataStores/DBCFileLoader.h
-    DataStores/DBCStore.h
-    Database/Database.cpp
-    Database/Database.h
-    Database/DatabaseEnv.h
-    Database/DatabaseImpl.h
-    Database/Field.cpp
-    Database/Field.h
-    Database/QueryResult.cpp
-    Database/QueryResult.h
-    Database/SQLStorage.cpp
-    Database/SQLStorage.h
-    Database/SqlDelayThread.cpp
-    Database/SqlDelayThread.h
-    Database/SqlOperations.cpp
-    Database/SqlOperations.h
+set(trinitydatabase_STAT_SRCS
+  DataStores/DBCFileLoader.cpp
+  DataStores/DBCFileLoader.h
+  DataStores/DBCStore.h
+  Database/Database.cpp
+  Database/Database.h
+  Database/DatabaseEnv.h
+  Database/DatabaseImpl.h
+  Database/Field.cpp
+  Database/Field.h
+  Database/QueryResult.cpp
+  Database/QueryResult.h
+  Database/SQLStorage.cpp
+  Database/SQLStorage.h
+  Database/SqlDelayThread.cpp
+  Database/SqlDelayThread.h
+  Database/SqlOperations.cpp
+  Database/SqlOperations.h
 )
 
 include_directories(
diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt
index 6b496aa7794..973cdaec200 100644
--- a/src/server/worldserver/CMakeLists.txt
+++ b/src/server/worldserver/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2010 Trinity 
+# Copyright (C) 2008-2010 Trinity 
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -10,7 +10,7 @@
 
 ########### worldserver ###############
 
-SET(worldserver_SRCS
+set(worldserver_SRCS
   CommandLine/CliRunnable.cpp
   CommandLine/CliRunnable.h
   RemoteAccess/RASocket.cpp
@@ -119,53 +119,71 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/src/server/worldserver/WorldThread
 )
 
-SET(worldserver_LINK_FLAGS "")
+set(worldserver_LINK_FLAGS "")
 
 add_executable(worldserver ${worldserver_SRCS})
 add_definitions(
   -D_TRINITY_CORE_CONFIG='"${CONF_DIR}/worldserver.conf"'
 )
 
-SET(worldserver_LINK_FLAGS "-pthread ${worldserver_LINK_FLAGS}")
+set(worldserver_LINK_FLAGS
+  "-pthread ${worldserver_LINK_FLAGS}"
+)
 
-IF (CMAKE_SYSTEM_NAME MATCHES "Darwin")
-  SET(worldserver_LINK_FLAGS "-framework Carbon ${worldserver_LINK_FLAGS}")
-  SET(SCRIPT_LIB "")
-ENDIF (CMAKE_SYSTEM_NAME MATCHES "Darwin")
+if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
+  set(worldserver_LINK_FLAGS "-framework Carbon ${worldserver_LINK_FLAGS}")
+  set(SCRIPT_LIB "")
+endif()
 
-SET_TARGET_PROPERTIES(worldserver PROPERTIES LINK_FLAGS "${worldserver_LINK_FLAGS}")
+set_target_properties(worldserver PROPERTIES LINK_FLAGS "${worldserver_LINK_FLAGS}")
 
 if(DO_SCRIPTS)
-  SET(SCRIPT_LIB "scripts")
+  set(SCRIPT_LIB "scripts")
 else(DO_SCRIPTS)
-  SET(SCRIPT_LIB "")
+  set(SCRIPT_LIB "")
 endif(DO_SCRIPTS)
-
-target_link_libraries(
-  worldserver
-  game
-  shared
-  zlib
-  trinitysockets
-  trinitydatabase
-  trinityauth
-  trinityconfig
-  collision
-  g3dlib
-  jemalloc
-  ${SCRIPT_LIB}
-  ${READLINE_LIBRARY}
-  ${TERMCAP_LIBRARY}
-  ${ACE_LIBRARY}
-  ${MYSQL_LIBRARY}
-  ${OPENSSL_LIBRARIES}
-  ${ZLIB} 
-  ${OSX_LIBS}
-)
-
-install(TARGETS worldserver DESTINATION bin)
+if(WIN32)
+ target_link_libraries(
+    worldserver
+    game
+    shared
+    zlib
+    trinitysockets
+    trinitydatabase
+    trinityauth
+    trinityconfig
+    collision
+    g3dlib
+    jemalloc
+    ${SCRIPT_LIB}
+    ${ACE_LIBRARY}
+    ${MYSQL_LIBRARY}
+    ${OPENSSL_LIBRARIES}
+  )
+else()
+  target_link_libraries(
+    worldserver
+    game
+    shared
+    trinitysockets
+    trinitydatabase
+    trinityauth
+    trinityconfig
+    collision
+    g3dlib
+    jemalloc
+    ${SCRIPT_LIB}
+    ${READLINE_LIBRARY}
+    ${TERMCAP_LIBRARY}
+    ${ACE_LIBRARY}
+    ${MYSQL_LIBRARY}
+    ${OPENSSL_LIBRARIES}
+    ${ZLIB_LIBRARIES} 
+    ${OSX_LIBS}
+  )
+endif()
 
 ########### install files ###############
 
-install(FILES  worldserver.conf.dist DESTINATION etc)
-
+install(TARGETS worldserver DESTINATION bin)
+install(FILES   worldserver.conf.dist DESTINATION etc)
diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
index f960329674f..4121a9579ec 100644
--- a/src/tools/CMakeLists.txt
+++ b/src/tools/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2010 Trinity 
+# Copyright (C) 2008-2010 Trinity 
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
diff --git a/src/tools/map_extractor/CMakeLists.txt b/src/tools/map_extractor/CMakeLists.txt
index 8e7fa0df891..ce5e54ac4f0 100644
--- a/src/tools/map_extractor/CMakeLists.txt
+++ b/src/tools/map_extractor/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Copyright (C) 2005-2009 MaNGOS project 
-# Copyright (C) 2005-2010 Trinity 
+# Copyright (C) 2008-2010 Trinity 
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -28,7 +28,15 @@ add_library(loadlib
   ${loadlib_sources}
 )
 
-target_link_libraries(loadlib zlib)
+if(NOT UNIX)
+  target_link_libraries(loadlib
+    zlib
+  )
+else()
+  target_link_libraries(loadlib
+    ${ZLIB_LIBRARIES}
+  )
+endif()
 
 add_library(libmpq
   ${CMAKE_SOURCE_DIR}/externals/libmpq/libmpq/common.c
@@ -43,10 +51,18 @@ add_executable(mapextractor
   ${sources}
 )
 
-target_link_libraries(mapextractor
-  libmpq
-  loadlib
-  bzip2
-)
+if(WIN32)
+  target_link_libraries(mapextractor
+    libmpq
+    loadlib
+    bzip2
+  )
+else()
+  target_link_libraries(mapextractor
+    libmpq
+    loadlib
+    ${BZIP2_LIBRARIES}
+  )
+endif()
 
 install(TARGETS mapextractor DESTINATION bin)
diff --git a/src/tools/vmap3_assembler/CMakeLists.txt b/src/tools/vmap3_assembler/CMakeLists.txt
index 4b86c1ffa16..0b8ece2dc37 100644
--- a/src/tools/vmap3_assembler/CMakeLists.txt
+++ b/src/tools/vmap3_assembler/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Copyright (C) 2005-2009 MaNGOS project 
-# Copyright (C) 2005-2010 Trinity 
+# Copyright (C) 2008-2010 Trinity 
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -10,16 +10,31 @@
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 include_directories(
+  ${ACE_INCLUDE_DIR}
+  ${ZLIB_INCLUDE_DIR}
   ${CMAKE_SOURCE_DIR}/externals/g3dlite
   ${CMAKE_SOURCE_DIR}/src/server/shared
   ${CMAKE_SOURCE_DIR}/src/server/shared/Debugging
   ${CMAKE_SOURCE_DIR}/src/server/collision/Maps
   ${CMAKE_SOURCE_DIR}/src/server/collision/Models
-  ${ACE_INCLUDE_DIR}
 )
 
 add_definitions(-DNO_CORE_FUNCS)
+
 add_executable(vmap3assembler VMapAssembler.cpp)
-target_link_libraries(vmap3assembler collision g3dlib)
+
+if(WIN32)
+  target_link_libraries(vmap3assembler
+    collision
+    g3dlib
+    zlib
+  )
+else()
+  target_link_libraries(vmap3assembler
+    collision
+    g3dlib
+    ${ZLIB_LIBRARIES}
+  )
+endif()
 
 install(TARGETS vmap3assembler DESTINATION bin)
diff --git a/src/tools/vmap3_extractor/CMakeLists.txt b/src/tools/vmap3_extractor/CMakeLists.txt
index 02d044cdaa9..c159c6fd715 100644
--- a/src/tools/vmap3_extractor/CMakeLists.txt
+++ b/src/tools/vmap3_extractor/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Copyright (C) 2005-2009 MaNGOS project 
-# Copyright (C) 2005-2010 Trinity 
+# Copyright (C) 2008-2010 Trinity 
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -9,9 +9,24 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
+file(GLOB sources *.cpp)
+
 include_directories (${CMAKE_SOURCE_DIR}/externals/libmpq)
 
-add_executable(vmap3extractor adtfile.cpp  dbcfile.cpp  model.cpp  mpq_libmpq.cpp  vmapexport.cpp  wdtfile.cpp  wmo.cpp)
-target_link_libraries(vmap3extractor libmpq bzip2 zlib)
+add_executable(vmap3extractor ${sources})
+
+if(WIN32)
+  target_link_libraries(vmap3extractor
+    libmpq
+    bzip2
+    zlib
+  )
+else()
+  target_link_libraries(vmap3extractor
+    libmpq
+    ${BZIP2_LIBRARIES}
+    ${ZLIB_LIBRARIES}
+  )
+endif()
 
 install(TARGETS vmap3extractor DESTINATION bin)
-- 
cgit v1.2.3


From 95ddfbd9e266690d305de077c16d7212a91be69b Mon Sep 17 00:00:00 2001
From: Machiavelli 
Date: Mon, 21 Jun 2010 23:20:58 +0200
Subject: Remove some redundant explicit NULL checks for pointers before
 ´delete´ or ´delete[]´ calls since this check is done implicitly when
 deleting. Also fixes a memory leak in .reload creature_template command
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--HG--
branch : trunk
---
 src/server/collision/Management/VMapFactory.cpp      | 15 +++++----------
 src/server/game/Chat/Commands/Level3.cpp             | 12 ++++--------
 src/server/game/DataStores/DBCStores.cpp             |  4 ++--
 src/server/game/DungeonFinding/LFGMgr.cpp            |  3 +--
 src/server/game/Entities/Creature/Creature.cpp       |  9 +++------
 src/server/game/Entities/Item/Container/Bag.cpp      |  7 ++-----
 src/server/game/Entities/Object/Object.cpp           | 10 +++-------
 src/server/game/Entities/Object/Updates/UpdateMask.h |  6 ++----
 src/server/game/Entities/Pet/Pet.cpp                 |  4 +---
 src/server/game/Entities/Player/Player.cpp           | 19 +++++--------------
 src/server/game/Entities/Unit/Unit.cpp               |  9 +++------
 src/server/game/Globals/ObjectMgr.cpp                |  2 +-
 src/server/game/Groups/Group.cpp                     |  3 +--
 src/server/game/Maps/Map.cpp                         | 17 +++++++----------
 src/server/game/Server/WorldSocket.cpp               |  3 +--
 src/server/game/Server/WorldSocketMgr.cpp            | 10 +++-------
 src/server/game/Spells/Auras/SpellAuraEffects.cpp    |  3 +--
 src/server/game/Spells/Auras/SpellAuras.cpp          |  3 +--
 src/server/game/World/World.cpp                      |  2 +-
 19 files changed, 47 insertions(+), 94 deletions(-)

(limited to 'src')

diff --git a/src/server/collision/Management/VMapFactory.cpp b/src/server/collision/Management/VMapFactory.cpp
index 331acbace47..561bf0dfa02 100644
--- a/src/server/collision/Management/VMapFactory.cpp
+++ b/src/server/collision/Management/VMapFactory.cpp
@@ -122,15 +122,10 @@ namespace VMAP
     // delete all internal data structures
     void VMapFactory::clear()
     {
-        if(iIgnoreSpellIds)
-        {
-            delete iIgnoreSpellIds;
-            iIgnoreSpellIds = NULL;
-        }
-        if(gVMapManager)
-        {
-            delete gVMapManager;
-            gVMapManager = NULL;
-        }
+        delete iIgnoreSpellIds;
+        iIgnoreSpellIds = NULL;
+
+        delete gVMapManager;
+        gVMapManager = NULL;
     }
 }
diff --git a/src/server/game/Chat/Commands/Level3.cpp b/src/server/game/Chat/Commands/Level3.cpp
index d7ebfbf912e..009a4483f83 100644
--- a/src/server/game/Chat/Commands/Level3.cpp
+++ b/src/server/game/Chat/Commands/Level3.cpp
@@ -795,24 +795,21 @@ bool ChatHandler::HandleReloadCreatureTemplateCommand(const char* args)
     size_t len = 0;
     if (const char* temp = fields[9].GetString())
     {
-        if (cInfo->Name)
-            delete cInfo->Name;
+        delete[] cInfo->Name;
         len = strlen(temp)+1;
         const_cast(cInfo)->Name = new char[len];
         strncpy(cInfo->Name, temp, len);
     }
     if (const char* temp = fields[10].GetString())
     {
-        if (cInfo->SubName)
-            delete cInfo->SubName;
+        delete[] cInfo->SubName;
         len = strlen(temp)+1;
         const_cast(cInfo)->SubName = new char[len];
         strncpy(cInfo->SubName, temp, len);
     }
     if (const char* temp = fields[11].GetString())
     {
-        if (cInfo->IconName)
-            delete cInfo->IconName;
+        delete[] cInfo->IconName;
         len = strlen(temp)+1;
         const_cast(cInfo)->IconName = new char[len];
         strncpy(cInfo->IconName, temp, len);
@@ -871,8 +868,7 @@ bool ChatHandler::HandleReloadCreatureTemplateCommand(const char* args)
     const_cast(cInfo)->maxgold = fields[63].GetUInt32();
     if (const char* temp = fields[64].GetString())
     {
-        if (cInfo->AIName)
-            delete cInfo->AIName;
+        delete[] cInfo->AIName;
         len = strlen(temp)+1;
         const_cast(cInfo)->AIName = new char[len];
         strncpy(const_cast(cInfo->AIName), temp, len);
diff --git a/src/server/game/DataStores/DBCStores.cpp b/src/server/game/DataStores/DBCStores.cpp
index 928b9f4f9e6..a64887a724f 100644
--- a/src/server/game/DataStores/DBCStores.cpp
+++ b/src/server/game/DataStores/DBCStores.cpp
@@ -235,8 +235,8 @@ inline void LoadDBC(uint32& availableDbcLocales,barGoLink& bar, StoreProblemList
         else
             errlist.push_back(dbc_filename);
     }
-    if (sql)
-       delete sql;
+
+    delete sql;
 }
 
 void LoadDBCStores(const std::string& dataPath)
diff --git a/src/server/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp
index 734c5522942..1a2c9c9767c 100644
--- a/src/server/game/DungeonFinding/LFGMgr.cpp
+++ b/src/server/game/DungeonFinding/LFGMgr.cpp
@@ -46,8 +46,7 @@ LFGQueue::~LFGQueue()
 
 void LFGQueue::AddToQueue(uint64 guid, LfgQueueInfo* pqInfo)
 {
-    if (LfgQueueInfo* qInfo = m_LfgQueue[guid])
-        delete qInfo;
+    delete m_LfgQueue[guid];
     m_LfgQueue[guid] = pqInfo;
     // ATM will only add it to the queue... No find group implementation... yet (on purpose)
 }
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp
index c9c9775c04a..62300e43a39 100644
--- a/src/server/game/Entities/Creature/Creature.cpp
+++ b/src/server/game/Entities/Creature/Creature.cpp
@@ -171,11 +171,8 @@ Creature::~Creature()
 {
     m_vendorItemCounts.clear();
 
-    if (i_AI)
-    {
-        delete i_AI;
-        i_AI = NULL;
-    }
+    delete i_AI;
+    i_AI = NULL;
 
     //if (m_uint32Values)
     //    sLog.outError("Deconstruct Creature Entry = %u", GetEntry());
@@ -721,7 +718,7 @@ bool Creature::AIM_Initialize(CreatureAI* ai)
     Motion_Initialize();
 
     i_AI = ai ? ai : FactorySelector::selectAI(this);
-    if (oldAI) delete oldAI;
+    delete oldAI;
     IsAIEnabled = true;
     i_AI->InitializeAI();
     return true;
diff --git a/src/server/game/Entities/Item/Container/Bag.cpp b/src/server/game/Entities/Item/Container/Bag.cpp
index b38bcb54ff8..12fd9efee28 100644
--- a/src/server/game/Entities/Item/Container/Bag.cpp
+++ b/src/server/game/Entities/Item/Container/Bag.cpp
@@ -117,11 +117,8 @@ bool Bag::LoadFromDB(uint32 guid, uint64 owner_guid, QueryResult_AutoPtr result)
     for (uint8 i = 0; i < MAX_BAG_SIZE; ++i)
     {
         SetUInt64Value(CONTAINER_FIELD_SLOT_1 + (i*2), 0);
-        if (m_bagslot[i])
-        {
-            delete m_bagslot[i];
-            m_bagslot[i] = NULL;
-        }
+        delete m_bagslot[i];
+        m_bagslot[i] = NULL;
     }
 
     return true;
diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp
index 5be2639bc3e..38356bf8034 100644
--- a/src/server/game/Entities/Object/Object.cpp
+++ b/src/server/game/Entities/Object/Object.cpp
@@ -113,13 +113,9 @@ Object::~Object()
         ObjectAccessor::Instance().RemoveUpdateObject(this);
     }
 
-    if (m_uint32Values)
-    {
-        //DEBUG_LOG("Object desctr 1 check (%p)",(void*)this);
-        delete [] m_uint32Values;
-        delete [] m_uint32Values_mirror;
-        //DEBUG_LOG("Object desctr 2 check (%p)",(void*)this);
-    }
+    delete [] m_uint32Values;
+    delete [] m_uint32Values_mirror;
+
 }
 
 void Object::_InitValues()
diff --git a/src/server/game/Entities/Object/Updates/UpdateMask.h b/src/server/game/Entities/Object/Updates/UpdateMask.h
index 527bec42aa7..a18a044ee33 100644
--- a/src/server/game/Entities/Object/Updates/UpdateMask.h
+++ b/src/server/game/Entities/Object/Updates/UpdateMask.h
@@ -32,8 +32,7 @@ class UpdateMask
 
         ~UpdateMask()
         {
-            if (mUpdateMask)
-                delete [] mUpdateMask;
+            delete [] mUpdateMask;
         }
 
         void SetBit (uint32 index)
@@ -58,8 +57,7 @@ class UpdateMask
 
         void SetCount (uint32 valuesCount)
         {
-            if (mUpdateMask)
-                delete [] mUpdateMask;
+            delete [] mUpdateMask;
 
             mCount = valuesCount;
             mBlocks = (valuesCount + 31) / 32;
diff --git a/src/server/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp
index 51f5d43c3d8..ed4bd4d6f96 100644
--- a/src/server/game/Entities/Pet/Pet.cpp
+++ b/src/server/game/Entities/Pet/Pet.cpp
@@ -324,9 +324,7 @@ bool Pet::LoadPetFromDB(Player* owner, uint32 petentry, uint32 petnumber, bool c
 
         if (result)
         {
-            if (m_declinedname)
-                delete m_declinedname;
-
+            delete m_declinedname;
             m_declinedname = new DeclinedName;
             Field *fields2 = result->Fetch();
             for (uint8 i = 0; i < MAX_DECLINED_NAME_CASES; ++i)
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index a6dc7ab137e..f7e70a60b9d 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -514,10 +514,7 @@ Player::~Player ()
 
     // Note: buy back item already deleted from DB when player was saved
     for (uint8 i = 0; i < PLAYER_SLOTS_COUNT; ++i)
-    {
-        if (m_items[i])
-            delete m_items[i];
-    }
+        delete m_items[i];
 
     for (PlayerSpellMap::const_iterator itr = m_spells.begin(); itr != m_spells.end(); ++itr)
         delete itr->second;
@@ -539,8 +536,7 @@ Player::~Player ()
     delete PlayerTalkClass;
 
     for (size_t x = 0; x < ItemSetEff.size(); x++)
-        if (ItemSetEff[x])
-            delete ItemSetEff[x];
+        delete ItemSetEff[x];
 
     delete m_declinedname;
     delete m_runes;
@@ -15565,9 +15561,7 @@ void Player::_LoadDeclinedNames(QueryResult_AutoPtr result)
     if (!result)
         return;
 
-    if (m_declinedname)
-        delete m_declinedname;
-
+    delete m_declinedname;
     m_declinedname = new DeclinedName;
     Field *fields = result->Fetch();
     for (uint8 i = 0; i < MAX_DECLINED_NAME_CASES; ++i)
@@ -15817,11 +15811,8 @@ bool Player::LoadFromDB(uint32 guid, SqlQueryHolder *holder)
         SetUInt64Value(PLAYER_FIELD_INV_SLOT_HEAD + (slot * 2), 0);
         SetVisibleItemSlot(slot, NULL);
 
-        if (m_items[slot])
-        {
-            delete m_items[slot];
-            m_items[slot] = NULL;
-        }
+        delete m_items[slot];
+        m_items[slot] = NULL;
     }
 
     sLog.outDebug("Load Basic value of player %s is: ", m_name.c_str());
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index fa745edcb7a..58361e19ea4 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -201,10 +201,8 @@ Unit::~Unit()
     RemoveAllDynObjects();
     _DeleteRemovedAuras();
 
-    if (m_charmInfo)
-        delete m_charmInfo;
-    if (m_vehicleKit)
-        delete m_vehicleKit;
+    delete m_charmInfo;
+    delete m_vehicleKit;
 
     assert(!m_attacking);
     assert(m_attackers.empty());
@@ -13297,8 +13295,7 @@ void Unit::UpdateCharmAI()
     {
         if (!isCharmed())
         {
-            if (i_AI)
-                delete i_AI;
+            delete i_AI;
             i_AI = i_disabledAI;
             i_disabledAI = NULL;
         }
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index d616806a7cc..9f2aeebd16e 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -3419,7 +3419,7 @@ void ObjectMgr::LoadGuilds()
             !newGuild->LoadMembersFromDB(guildMembersResult) ||
             !newGuild->LoadBankRightsFromDB(guildBankTabRightsResult) ||
             !newGuild->CheckGuildStructure()
-)
+            )
         {
             newGuild->Disband();
             delete newGuild;
diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp
index f5840e2c287..95912f21f10 100644
--- a/src/server/game/Groups/Group.cpp
+++ b/src/server/game/Groups/Group.cpp
@@ -79,8 +79,7 @@ Group::~Group()
             itr2->second.save->RemoveGroup(this);
 
     // Sub group counters clean up
-    if (m_subGroupsCounts)
-        delete[] m_subGroupsCounts;
+    delete[] m_subGroupsCounts;
 }
 
 bool Group::Create(const uint64 &guid, const char * name)
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp
index afc18cba971..a0656bee38c 100644
--- a/src/server/game/Maps/Map.cpp
+++ b/src/server/game/Maps/Map.cpp
@@ -1241,11 +1241,11 @@ bool GridMap::loadData(char *filename)
 
 void GridMap::unloadData()
 {
-    if (m_area_map) delete[] m_area_map;
-    if (m_V9) delete[] m_V9;
-    if (m_V8) delete[] m_V8;
-    if (m_liquid_type) delete[] m_liquid_type;
-    if (m_liquid_map) delete[] m_liquid_map;
+    delete[] m_area_map;
+    delete[] m_V9;
+    delete[] m_V8;
+    delete[] m_liquid_type;
+    delete[] m_liquid_map;
     m_area_map = NULL;
     m_V9 = NULL;
     m_V8 = NULL;
@@ -2350,11 +2350,8 @@ InstanceMap::InstanceMap(uint32 id, time_t expiry, uint32 InstanceId, uint8 Spaw
 
 InstanceMap::~InstanceMap()
 {
-    if (i_data)
-    {
-        delete i_data;
-        i_data = NULL;
-    }
+    delete i_data;
+    i_data = NULL;
 }
 
 void InstanceMap::InitVisibilityDistance()
diff --git a/src/server/game/Server/WorldSocket.cpp b/src/server/game/Server/WorldSocket.cpp
index 0b76eb9b41e..ac4900a0fd3 100644
--- a/src/server/game/Server/WorldSocket.cpp
+++ b/src/server/game/Server/WorldSocket.cpp
@@ -120,8 +120,7 @@ m_LastPingTime(ACE_Time_Value::zero)
 
 WorldSocket::~WorldSocket (void)
 {
-    if (m_RecvWPct)
-        delete m_RecvWPct;
+    delete m_RecvWPct;
 
     if (m_OutBuffer)
         m_OutBuffer->release();
diff --git a/src/server/game/Server/WorldSocketMgr.cpp b/src/server/game/Server/WorldSocketMgr.cpp
index 0996d873ffa..6ccb30b64ef 100644
--- a/src/server/game/Server/WorldSocketMgr.cpp
+++ b/src/server/game/Server/WorldSocketMgr.cpp
@@ -84,8 +84,7 @@ class ReactorRunnable : protected ACE_Task_Base
             Stop();
             Wait();
 
-            if (m_Reactor)
-                delete m_Reactor;
+            delete m_Reactor;
         }
 
         void Stop()
@@ -220,11 +219,8 @@ WorldSocketMgr::WorldSocketMgr() :
 
 WorldSocketMgr::~WorldSocketMgr()
 {
-    if (m_NetThreads)
-        delete [] m_NetThreads;
-
-    if (m_Acceptor)
-        delete m_Acceptor;
+    delete [] m_NetThreads;
+    delete m_Acceptor;
 }
 
 int
diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
index 9256228ad18..1b485e416e4 100644
--- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
@@ -387,8 +387,7 @@ AuraEffect::AuraEffect(Aura * base, uint8 effIndex, int32 *baseAmount, Unit * ca
 
 AuraEffect::~AuraEffect()
 {
-    if (m_spellmod)
-        delete m_spellmod;
+    delete m_spellmod;
 }
 
 void AuraEffect::GetTargetList(std::list & targetList) const
diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp
index c4aeca15a13..b3d0f3a3b12 100644
--- a/src/server/game/Spells/Auras/SpellAuras.cpp
+++ b/src/server/game/Spells/Auras/SpellAuras.cpp
@@ -342,8 +342,7 @@ Aura::~Aura()
 {
     // free effects memory
     for (uint8 i = 0 ; i < MAX_SPELL_EFFECTS; ++i)
-        if (m_effects[i])
-            delete m_effects[i];
+         delete m_effects[i];
 
     assert(m_applications.empty());
     _DeleteRemovedApplications();
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
index 4da78277c96..3b3f1bf4e06 100644
--- a/src/server/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
@@ -142,7 +142,7 @@ World::~World()
 
     VMAP::VMapFactory::clear();
 
-    if (m_resultQueue) delete m_resultQueue;
+    delete m_resultQueue;
 
     //TODO free addSessQueue
 }
-- 
cgit v1.2.3


From a9cfe876faae1360b59a9adcb952527883b9267d Mon Sep 17 00:00:00 2001
From: Machiavelli 
Date: Mon, 21 Jun 2010 23:41:28 +0200
Subject: Allow -ExtendedCostID and ExtendedCostID to be in the same vendor´s
 item list.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--HG--
branch : trunk
---
 src/server/game/Globals/ObjectMgr.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index 9f2aeebd16e..99e20d0d690 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -8486,7 +8486,7 @@ bool ObjectMgr::IsVendorItemValid(uint32 vendor_entry, uint32 item_id, int32 max
     if (!vItems)
         return true;                                        // later checks for non-empty lists
 
-    if(vItems->FindItemCostPair(item_id,extendedCostId))
+    if (vItems->FindItemCostPair(item_id, ExtendedCost))
     {
         if (pl)
             ChatHandler(pl).PSendSysMessage(LANG_ITEM_ALREADY_IN_LIST, item_id, extendedCostId);
-- 
cgit v1.2.3


From 06ef6e2553a76bd9be2562d89a1128e840a290c8 Mon Sep 17 00:00:00 2001
From: Machiavelli 
Date: Mon, 21 Jun 2010 23:58:27 +0200
Subject: Update worldserver log message to indicate which database has a
 config problem, by Ranger. Minor codestyle applied in function.

--HG--
branch : trunk
---
 src/server/worldserver/Master.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/server/worldserver/Master.cpp b/src/server/worldserver/Master.cpp
index 1137a131008..98a28093199 100644
--- a/src/server/worldserver/Master.cpp
+++ b/src/server/worldserver/Master.cpp
@@ -450,14 +450,14 @@ bool Master::_StartDB()
 
     ///- Get world database info from configuration file
     dbstring = sConfig.GetStringDefault("WorldDatabaseInfo", "");
-    if(dbstring.empty())
+    if (dbstring.empty())
     {
-        sLog.outError("Database not specified in configuration file");
+        sLog.outError("World database not specified in configuration file");
         return false;
     }
 
     ///- Initialise the world database
-    if(!WorldDatabase.Initialize(dbstring.c_str()))
+    if( !WorldDatabase.Initialize(dbstring.c_str()))
     {
         sLog.outError("Cannot connect to world database %s",dbstring.c_str());
         return false;
@@ -465,14 +465,14 @@ bool Master::_StartDB()
 
     ///- Get character database info from configuration file
     dbstring = sConfig.GetStringDefault("CharacterDatabaseInfo", "");
-    if(dbstring.empty())
+    if (dbstring.empty())
     {
-        sLog.outError("Character Database not specified in configuration file");
+        sLog.outError("Character database not specified in configuration file");
         return false;
     }
 
     ///- Initialise the Character database
-    if(!CharacterDatabase.Initialize(dbstring.c_str()))
+    if (!CharacterDatabase.Initialize(dbstring.c_str()))
     {
         sLog.outError("Cannot connect to Character database %s",dbstring.c_str());
         return false;
@@ -480,14 +480,14 @@ bool Master::_StartDB()
 
     ///- Get login database info from configuration file
     dbstring = sConfig.GetStringDefault("LoginDatabaseInfo", "");
-    if(dbstring.empty())
+    if (dbstring.empty())
     {
         sLog.outError("Login database not specified in configuration file");
         return false;
     }
 
     ///- Initialise the login database
-    if(!LoginDatabase.Initialize(dbstring.c_str()))
+    if (!LoginDatabase.Initialize(dbstring.c_str()))
     {
         sLog.outError("Cannot connect to login database %s",dbstring.c_str());
         return false;
@@ -495,7 +495,7 @@ bool Master::_StartDB()
 
     ///- Get the realm Id from the configuration file
     realmID = sConfig.GetIntDefault("RealmID", 0);
-    if(!realmID)
+    if (!realmID)
     {
         sLog.outError("Realm ID not defined in configuration file");
         return false;
-- 
cgit v1.2.3


From 4e361d0d9b339dde22a1edd7cc9ce5a33cb2f9f0 Mon Sep 17 00:00:00 2001
From: Machiavelli 
Date: Tue, 22 Jun 2010 00:39:07 +0200
Subject: Don´t allow inviting people to chat channels if they are banned from
 that channel. Also fix response codes CHAT_PLAYER_NOT_BANNED_NOTICE +
 CHAT_PLAYER_INVITE_BANNED_NOTICE for SMSG_CHANNEL_NOTIFY.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--HG--
branch : trunk
---
 src/server/game/Chat/Channels/Channel.cpp | 16 ++++++++++++----
 src/server/game/Chat/Channels/Channel.h   |  4 ++--
 2 files changed, 14 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Chat/Channels/Channel.cpp b/src/server/game/Chat/Channels/Channel.cpp
index 0047892972b..bb70e54354c 100644
--- a/src/server/game/Chat/Channels/Channel.cpp
+++ b/src/server/game/Chat/Channels/Channel.cpp
@@ -707,6 +707,14 @@ void Channel::Invite(uint64 p, const char *newname)
         return;
     }
 
+    if (IsBanned(newp->GetGUID()))
+    {
+        WorldPacket data;
+        MakePlayerInviteBanned(&data, newname);
+        SendToOne(&data, p);
+        return;
+    }
+    
     Player *plr = objmgr.GetPlayer(p);
     if (!plr)
         return;
@@ -983,10 +991,10 @@ void Channel::MakePlayerUnbanned(WorldPacket *data, uint64 bad, uint64 good)
 }
 
 // done 0x16
-void Channel::MakePlayerNotBanned(WorldPacket *data, uint64 guid)
+void Channel::MakePlayerNotBanned(WorldPacket *data, const std::string &name)
 {
     MakeNotifyPacket(data, CHAT_PLAYER_NOT_BANNED_NOTICE);
-    *data << uint64(guid);
+    *data << name;
 }
 
 // done 0x17
@@ -1035,10 +1043,10 @@ void Channel::MakePlayerInvited(WorldPacket *data, const std::string& name)
 }
 
 // done 0x1E
-void Channel::MakePlayerInviteBanned(WorldPacket *data, uint64 guid)
+void Channel::MakePlayerInviteBanned(WorldPacket *data, const std::string& name)
 {
     MakeNotifyPacket(data, CHAT_PLAYER_INVITE_BANNED_NOTICE);
-    *data << uint64(guid);
+    *data << name;
 }
 
 // done 0x1F
diff --git a/src/server/game/Chat/Channels/Channel.h b/src/server/game/Chat/Channels/Channel.h
index d0b5923e30e..a52a697cba1 100644
--- a/src/server/game/Chat/Channels/Channel.h
+++ b/src/server/game/Chat/Channels/Channel.h
@@ -187,7 +187,7 @@ class Channel
         void MakeBanned(WorldPacket *data);                                     //? 0x13
         void MakePlayerBanned(WorldPacket *data, uint64 bad, uint64 good);      //? 0x14
         void MakePlayerUnbanned(WorldPacket *data, uint64 bad, uint64 good);    //? 0x15
-        void MakePlayerNotBanned(WorldPacket *data, uint64 guid);               //? 0x16
+        void MakePlayerNotBanned(WorldPacket *data, const std::string& name);   //? 0x16
         void MakePlayerAlreadyMember(WorldPacket *data, uint64 guid);           //+ 0x17
         void MakeInvite(WorldPacket *data, uint64 guid);                        //? 0x18
         void MakeInviteWrongFaction(WorldPacket *data);                         //? 0x19
@@ -195,7 +195,7 @@ class Channel
         void MakeInvalidName(WorldPacket *data);                                //? 0x1B
         void MakeNotModerated(WorldPacket *data);                               //? 0x1C
         void MakePlayerInvited(WorldPacket *data, const std::string& name);     //+ 0x1D
-        void MakePlayerInviteBanned(WorldPacket *data, uint64 guid);            //? 0x1E
+        void MakePlayerInviteBanned(WorldPacket *data, const std::string &name);//? 0x1E
         void MakeThrottled(WorldPacket *data);                                  //? 0x1F
         void MakeNotInArea(WorldPacket *data);                                  //? 0x20
         void MakeNotInLfg(WorldPacket *data);                                   //? 0x21
-- 
cgit v1.2.3


From eefe75a31f58c24ec471aa8cd9502fc2b2dfb95b Mon Sep 17 00:00:00 2001
From: Machiavelli 
Date: Tue, 22 Jun 2010 00:42:31 +0200
Subject: Fix possible bug occuring during shuffling of raid subgroups, and
 prevent client side exploit. Author: Vladimir.

--HG--
branch : trunk
---
 src/server/game/Groups/Group.cpp                   | 19 +++++++++++------
 src/server/game/Groups/Group.h                     |  7 ++++---
 .../game/Server/Protocol/Handlers/GroupHandler.cpp | 24 +++++++++++++---------
 3 files changed, 31 insertions(+), 19 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp
index 95912f21f10..53fa9a3ecdb 100644
--- a/src/server/game/Groups/Group.cpp
+++ b/src/server/game/Groups/Group.cpp
@@ -1192,7 +1192,7 @@ bool Group::_addMember(const uint64 &guid, const char* name)
     if (m_subGroupsCounts)
     {
         bool groupFound = false;
-        for (; groupid < MAXRAIDSIZE/MAXGROUPSIZE; ++groupid)
+        for (; groupid < MAX_RAID_SUBGROUPS; ++groupid)
         {
             if (m_subGroupsCounts[groupid] < MAXGROUPSIZE)
             {
@@ -1445,17 +1445,20 @@ void Group::ChangeMembersGroup(const uint64 &guid, const uint8 &group)
 {
     if (!isRaidGroup())
         return;
+
     Player *player = objmgr.GetPlayer(guid);
 
     if (!player)
     {
-        uint8 prevSubGroup;
-        prevSubGroup = GetMemberGroup(guid);
-
-        SubGroupCounterDecrease(prevSubGroup);
+        uint8 prevSubGroup = GetMemberGroup(guid);
+        if (prevSubGroup == group)
+            return;
 
         if (_setMembersGroup(guid, group))
+        {
+            SubGroupCounterDecrease(prevSubGroup);
             SendUpdate();
+        }
     }
     else
         // This methods handles itself groupcounter decrease
@@ -1467,9 +1470,13 @@ void Group::ChangeMembersGroup(Player *player, const uint8 &group)
 {
     if (!player || !isRaidGroup())
         return;
+        
+    uint8 prevSubGroup = player->GetSubGroup();
+    if (prevSubGroup == group)
+        return;
+
     if (_setMembersGroup(player->GetGUID(), group))
     {
-        uint8 prevSubGroup = player->GetSubGroup();
         if (player->GetGroup() == this)
             player->GetGroupRef().setSubGroup(group);
         //if player is in BG raid, it is possible that he is also in normal raid - and that normal raid is stored in m_originalGroup reference
diff --git a/src/server/game/Groups/Group.h b/src/server/game/Groups/Group.h
index 808de417b79..8ec44c53b02 100644
--- a/src/server/game/Groups/Group.h
+++ b/src/server/game/Groups/Group.h
@@ -33,6 +33,7 @@
 
 #define MAXGROUPSIZE 5
 #define MAXRAIDSIZE 40
+#define MAX_RAID_SUBGROUPS MAXRAIDSIZE/MAXGROUPSIZE
 #define TARGETICONCOUNT 8
 
 enum RollVote
@@ -260,7 +261,7 @@ class Group
         {
             member_citerator mslot = _getMemberCSlot(guid);
             if (mslot == m_memberSlots.end())
-                return (MAXRAIDSIZE/MAXGROUPSIZE+1);
+                return (MAX_RAID_SUBGROUPS+1);
 
             return mslot->group;
         }
@@ -381,9 +382,9 @@ class Group
         {
             // Sub group counters initialization
             if (!m_subGroupsCounts)
-                m_subGroupsCounts = new uint8[MAXRAIDSIZE / MAXGROUPSIZE];
+                m_subGroupsCounts = new uint8[MAX_RAID_SUBGROUPS];
 
-            memset((void*)m_subGroupsCounts, 0, (MAXRAIDSIZE / MAXGROUPSIZE)*sizeof(uint8));
+            memset((void*)m_subGroupsCounts, 0, (MAX_RAID_SUBGROUPS)*sizeof(uint8));
 
             for (member_citerator itr = m_memberSlots.begin(); itr != m_memberSlots.end(); ++itr)
                 ++m_subGroupsCounts[itr->group];
diff --git a/src/server/game/Server/Protocol/Handlers/GroupHandler.cpp b/src/server/game/Server/Protocol/Handlers/GroupHandler.cpp
index 29178465ec3..bcefc763ae2 100644
--- a/src/server/game/Server/Protocol/Handlers/GroupHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/GroupHandler.cpp
@@ -534,8 +534,10 @@ void WorldSession::HandleGroupChangeSubGroupOpcode(WorldPacket & recv_data)
     std::string name;
     uint8 groupNr;
     recv_data >> name;
-
     recv_data >> groupNr;
+    
+    if (groupNr >= MAX_RAID_SUBGROUPS)
+        return;
 
     /** error handling **/
     uint64 senderGuid = GetPlayer()->GetGUID();
@@ -546,16 +548,18 @@ void WorldSession::HandleGroupChangeSubGroupOpcode(WorldPacket & recv_data)
         return;
     /********************/
 
-    Player *movedPlayer=objmgr.GetPlayer(name.c_str());
-    if (!movedPlayer)
-        return;
-
-    //Do not allow leader to change group of player in combat
-    if (movedPlayer->isInCombat())
-        return;
+    Player *movedPlayer = objmgr.GetPlayer(name.c_str());
+    if (movedPlayer)
+    {   
+        //Do not allow leader to change group of player in combat
+        if (movedPlayer->isInCombat())
+            return;
 
-    // everything's fine, do it
-    group->ChangeMembersGroup(movedPlayer, groupNr);
+        // everything's fine, do it
+        group->ChangeMembersGroup(movedPlayer, groupNr);
+    }
+    else
+        group->ChangeMembersGroup(objmgr.GetPlayerGUIDByName(name.c_str()), groupNr);
 }
 
 void WorldSession::HandleGroupAssistantLeaderOpcode(WorldPacket & recv_data)
-- 
cgit v1.2.3


From 0aa52477aeffca09cf3e8520855f61549aa0839e Mon Sep 17 00:00:00 2001
From: Machiavelli 
Date: Tue, 22 Jun 2010 01:29:02 +0200
Subject: Simplify and cleanup Transport system. Author: Vladimir.

--HG--
branch : trunk
---
 src/server/game/DataStores/DBCStores.cpp         |  3 +--
 src/server/game/DataStores/DBCStructure.h        | 14 +-----------
 src/server/game/Entities/Player/Player.cpp       | 24 ++++++++++----------
 src/server/game/Entities/Transport/Transport.cpp | 14 ++++++------
 src/server/game/Entities/Transport/Transport.h   | 29 ------------------------
 src/server/game/Globals/ObjectMgr.cpp            | 29 ++++--------------------
 src/server/game/Globals/ObjectMgr.h              |  1 -
 7 files changed, 25 insertions(+), 89 deletions(-)

(limited to 'src')

diff --git a/src/server/game/DataStores/DBCStores.cpp b/src/server/game/DataStores/DBCStores.cpp
index a64887a724f..647d1789b69 100644
--- a/src/server/game/DataStores/DBCStores.cpp
+++ b/src/server/game/DataStores/DBCStores.cpp
@@ -506,8 +506,7 @@ void LoadDBCStores(const std::string& dataPath)
     // fill data
     for (uint32 i = 1; i < sTaxiPathNodeStore.GetNumRows(); ++i)
         if (TaxiPathNodeEntry const* entry = sTaxiPathNodeStore.LookupEntry(i))
-            sTaxiPathNodesByPath[entry->path][entry->index] = TaxiPathNode(entry->mapid,entry->x,entry->y,entry->z,entry->actionFlag,entry->delay);
-    sTaxiPathNodeStore.Clear();
+            sTaxiPathNodesByPath[entry->path][entry->index] = entry;
 
     // Initialize global taxinodes mask
     // include existed nodes that have at least single not spell base (scripted) path
diff --git a/src/server/game/DataStores/DBCStructure.h b/src/server/game/DataStores/DBCStructure.h
index f3ed1e09b12..da1af805a2b 100644
--- a/src/server/game/DataStores/DBCStructure.h
+++ b/src/server/game/DataStores/DBCStructure.h
@@ -1911,19 +1911,7 @@ struct TaxiPathBySourceAndDestination
 typedef std::map TaxiPathSetForSource;
 typedef std::map TaxiPathSetBySource;
 
-struct TaxiPathNode
-{
-    TaxiPathNode() : mapid(0), x(0),y(0),z(0),actionFlag(0),delay(0) {}
-    TaxiPathNode(uint32 _mapid, float _x, float _y, float _z, uint32 _actionFlag, uint32 _delay) : mapid(_mapid), x(_x),y(_y),z(_z),actionFlag(_actionFlag),delay(_delay) {}
-
-    uint32    mapid;
-    float     x;
-    float     y;
-    float     z;
-    uint32    actionFlag;
-    uint32    delay;
-};
-typedef std::vector TaxiPathNodeList;
+typedef std::vector TaxiPathNodeList;
 typedef std::vector TaxiPathNodesByPath;
 
 #define TaxiMaskSize 12
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index f7e70a60b9d..829a9a1782d 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -19362,30 +19362,30 @@ void Player::ContinueTaxiFlight()
 
     float distPrev = MAP_SIZE*MAP_SIZE;
     float distNext =
-        (nodeList[0].x-GetPositionX())*(nodeList[0].x-GetPositionX())+
-        (nodeList[0].y-GetPositionY())*(nodeList[0].y-GetPositionY())+
-        (nodeList[0].z-GetPositionZ())*(nodeList[0].z-GetPositionZ());
+        (nodeList[0]->x-GetPositionX())*(nodeList[0]->x-GetPositionX())+
+        (nodeList[0]->y-GetPositionY())*(nodeList[0]->y-GetPositionY())+
+        (nodeList[0]->z-GetPositionZ())*(nodeList[0]->z-GetPositionZ());
 
     for (uint32 i = 1; i < nodeList.size(); ++i)
     {
-        TaxiPathNode const& node = nodeList[i];
-        TaxiPathNode const& prevNode = nodeList[i-1];
+        TaxiPathNodeEntry const* node = nodeList[i];
+        TaxiPathNodeEntry const* prevNode = nodeList[i-1];
 
         // skip nodes at another map
-        if (node.mapid != GetMapId())
+        if (node->mapid != GetMapId())
             continue;
 
         distPrev = distNext;
 
         distNext =
-            (node.x-GetPositionX())*(node.x-GetPositionX())+
-            (node.y-GetPositionY())*(node.y-GetPositionY())+
-            (node.z-GetPositionZ())*(node.z-GetPositionZ());
+            (node->x-GetPositionX())*(node->x-GetPositionX())+
+            (node->y-GetPositionY())*(node->y-GetPositionY())+
+            (node->z-GetPositionZ())*(node->z-GetPositionZ());
 
         float distNodes =
-            (node.x-prevNode.x)*(node.x-prevNode.x)+
-            (node.y-prevNode.y)*(node.y-prevNode.y)+
-            (node.z-prevNode.z)*(node.z-prevNode.z);
+            (node->x-prevNode->x)*(node->x-prevNode->x)+
+            (node->y-prevNode->y)*(node->y-prevNode->y)+
+            (node->z-prevNode->z)*(node->z-prevNode->z);
 
         if (distNext + distPrev < distNodes)
         {
diff --git a/src/server/game/Entities/Transport/Transport.cpp b/src/server/game/Entities/Transport/Transport.cpp
index e06b76f1c96..ede174a741c 100644
--- a/src/server/game/Entities/Transport/Transport.cpp
+++ b/src/server/game/Entities/Transport/Transport.cpp
@@ -205,22 +205,22 @@ struct keyFrame
 
 bool Transport::GenerateWaypoints(uint32 pathid, std::set &mapids)
 {
-    TransportPath path;
-    objmgr.GetTransportPathNodes(pathid, path);
-
-    if (path.Empty())
+    if (pathid >= sTaxiPathNodesByPath.size())
         return false;
 
+    TaxiPathNodeList const& path = sTaxiPathNodesByPath[pathid];
+    
     std::vector keyFrames;
     int mapChange = 0;
     mapids.clear();
-    for (size_t i = 1; i < path.Size() - 1; ++i)
+    for (size_t i = 1; i < path.size() - 1; ++i)
     {
         if (mapChange == 0)
         {
-            if ((path[i].mapid == path[i+1].mapid))
+            TaxiPathNodeEntry const* node_i = path[i];
+            if (node_i->mapid == path[i+1]->mapid)
             {
-                keyFrame k(path[i].x, path[i].y, path[i].z, path[i].mapid, path[i].actionFlag, path[i].delay);
+                keyFrame k(node_i->x, node_i->y, node_i->z, node_i->mapid, node_i->actionFlag, node_i->delay);
                 keyFrames.push_back(k);
                 mapids.insert(k.mapid);
             }
diff --git a/src/server/game/Entities/Transport/Transport.h b/src/server/game/Entities/Transport/Transport.h
index 25b9ade1461..0bc3322ce35 100644
--- a/src/server/game/Entities/Transport/Transport.h
+++ b/src/server/game/Entities/Transport/Transport.h
@@ -27,35 +27,6 @@
 #include 
 #include 
 
-class TransportPath
-{
-    public:
-        struct PathNode
-        {
-            uint32 mapid;
-            float x,y,z;
-            uint32 actionFlag;
-            uint32 delay;
-        };
-
-        void SetLength(const unsigned int sz)
-        {
-            i_nodes.resize(sz);
-        }
-
-        unsigned int Size(void) const { return i_nodes.size(); }
-        bool Empty(void) const { return i_nodes.empty(); }
-        void Resize(unsigned int sz) { i_nodes.resize(sz); }
-        void Clear(void) { i_nodes.clear(); }
-        PathNode* GetNodes(void) { return static_cast(&i_nodes[0]); }
-
-        PathNode& operator[](const unsigned int idx) { return i_nodes[idx]; }
-        const PathNode& operator()(const unsigned int idx) const { return i_nodes[idx]; }
-
-    protected:
-        std::vector i_nodes;
-};
-
 class Transport : public GameObject
 {
     public:
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index 99e20d0d690..acdadc57dd8 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -5494,31 +5494,10 @@ void ObjectMgr::GetTaxiPathNodes(uint32 path, Path &pathnodes, std::vector= sTaxiPathNodesByPath.size())
-        return;
-
-    TaxiPathNodeList& nodeList = sTaxiPathNodesByPath[path];
-
-    pathnodes.Resize(nodeList.size());
-
-    for (size_t i = 0; i < nodeList.size(); ++i)
-    {
-        pathnodes[ i ].mapid = nodeList[i].mapid;
-        pathnodes[ i ].x = nodeList[i].x;
-        pathnodes[ i ].y = nodeList[i].y;
-        pathnodes[ i ].z = nodeList[i].z;
-        pathnodes[ i ].actionFlag = nodeList[i].actionFlag;
-        pathnodes[ i ].delay = nodeList[i].delay;
+        pathnodes[i].x = nodeList[i]->x;
+        pathnodes[i].y = nodeList[i]->y;
+        pathnodes[i].z = nodeList[i]->z;
+        mapIds[i] = nodeList[i]->mapid;
     }
 }
 
diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h
index 824eb237756..1d9e95fbf00 100644
--- a/src/server/game/Globals/ObjectMgr.h
+++ b/src/server/game/Globals/ObjectMgr.h
@@ -474,7 +474,6 @@ class ObjectMgr
         void GetTaxiPath(uint32 source, uint32 destination, uint32 &path, uint32 &cost);
         uint32 GetTaxiMountDisplayId(uint32 id, uint32 team, bool allowed_alt_team = false);
         void GetTaxiPathNodes(uint32 path, Path &pathnodes, std::vector& mapIds);
-        void GetTransportPathNodes(uint32 path, TransportPath &pathnodes);
 
         Quest const* GetQuestTemplate(uint32 quest_id) const
         {
-- 
cgit v1.2.3


From a765961618f20412ac63a0a964ae467c4f64f9c1 Mon Sep 17 00:00:00 2001
From: Machiavelli 
Date: Tue, 22 Jun 2010 01:30:37 +0200
Subject: Fix player loading to transports. Author of original version:
 Vladimir

--HG--
branch : trunk
---
 src/server/game/Entities/Player/Player.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 829a9a1782d..45e38aaf4da 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -15935,6 +15935,7 @@ bool Player::LoadFromDB(uint32 guid, SqlQueryHolder *holder)
         // There are no transports on instances
         instanceId = 0;
 
+        m_movementInfo.t_guid = MAKE_NEW_GUID(transGUID, 0, HIGHGUID_TRANSPORT);
         m_movementInfo.t_x = fields[26].GetFloat();
         m_movementInfo.t_y = fields[27].GetFloat();
         m_movementInfo.t_z = fields[28].GetFloat();
-- 
cgit v1.2.3


From c9b20170a34feeaae4d57c6feba374b653223824 Mon Sep 17 00:00:00 2001
From: Xanadu 
Date: Tue, 22 Jun 2010 02:53:04 +0200
Subject: Cleanup of logging - removed a few duplicit functions from olden
 times, fixed a typo.

--HG--
branch : trunk
---
 src/server/game/AI/ScriptedAI/ScriptedCreature.cpp |  8 +--
 src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp | 36 +++++-----
 .../game/AI/ScriptedAI/ScriptedFollowerAI.cpp      | 20 +++---
 src/server/game/AI/ScriptedAI/ScriptedInstance.h   | 10 +--
 src/server/game/Instances/InstanceData.cpp         |  8 +--
 src/server/game/Scripting/ScriptMgr.cpp            | 54 +++++++--------
 src/server/game/Scripting/ScriptSystem.cpp         | 66 +++++++++----------
 .../BlackrockDepths/blackrock_depths.cpp           |  2 +-
 .../BlackrockDepths/instance_blackrock_depths.cpp  |  4 +-
 .../BlackwingLair/boss_victor_nefarius.cpp         |  2 +-
 .../Karazhan/boss_shade_of_aran.cpp                |  2 +-
 .../EasternKingdoms/Karazhan/bosses_opera.cpp      |  6 +-
 .../scripts/EasternKingdoms/Karazhan/karazhan.cpp  |  8 +--
 .../scripts/EasternKingdoms/Karazhan/karazhan.h    |  2 +-
 .../MagistersTerrace/boss_selin_fireheart.cpp      |  8 +--
 .../instance_magisters_terrace.cpp                 |  2 +-
 .../EasternKingdoms/ScarletEnclave/chapter1.cpp    | 12 ++--
 .../Stratholme/instance_stratholme.cpp             | 14 ++--
 .../SunwellPlateau/boss_brutallus.cpp              |  6 +-
 .../SunwellPlateau/boss_kalecgos.cpp               |  2 +-
 .../SunwellPlateau/boss_kiljaeden.cpp              |  4 +-
 .../SunwellPlateau/instance_sunwell_plateau.cpp    |  2 +-
 .../EasternKingdoms/Uldaman/boss_archaedas.cpp     |  8 +--
 .../EasternKingdoms/Uldaman/instance_uldaman.cpp   |  2 +-
 .../EasternKingdoms/ZulAman/boss_janalai.cpp       |  4 +-
 .../EasternKingdoms/ZulAman/instance_zulaman.cpp   |  8 +--
 .../EasternKingdoms/ZulGurub/boss_arlokk.cpp       |  2 +-
 .../CavernsOfTime/BattleForMountHyjal/hyjal.cpp    |  4 +-
 .../CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp  |  8 +--
 .../BattleForMountHyjal/instance_hyjal.cpp         |  2 +-
 .../CavernsOfTime/DarkPortal/dark_portal.cpp       |  4 +-
 .../DarkPortal/instance_dark_portal.cpp            | 10 +--
 .../instance_old_hillsbrad.cpp                     | 20 +++---
 .../RazorfenKraul/instance_razorfen_kraul.cpp      |  2 +-
 .../Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp       |  4 +-
 src/server/scripts/Kalimdor/azuremyst_isle.cpp     |  2 +-
 .../scripts/Northrend/Naxxramas/boss_gothik.cpp    |  2 +-
 .../Northrend/ObsidianSanctum/boss_sartharion.cpp  |  4 +-
 .../UtgardeKeep/instance_utgarde_keep.cpp          |  2 +-
 .../ShadowLabyrinth/instance_shadow_labyrinth.cpp  |  8 +--
 .../scripts/Outland/BlackTemple/boss_illidan.cpp   |  2 +-
 .../Outland/BlackTemple/boss_shade_of_akama.cpp    | 16 ++---
 .../Outland/BlackTemple/illidari_council.cpp       |  6 +-
 .../Outland/BlackTemple/instance_black_temple.cpp  |  2 +-
 .../SteamVault/instance_steam_vault.cpp            |  4 +-
 .../instance_hellfire_ramparts.cpp                 |  2 +-
 .../Outland/TempestKeep/Eye/boss_kaelthas.cpp      |  6 +-
 src/server/scripts/Outland/hellfire_peninsula.cpp  |  2 +-
 src/server/scripts/Outland/netherstorm.cpp         |  2 +-
 src/server/scripts/World/go_scripts.cpp            |  2 +-
 src/server/scripts/World/item_scripts.cpp          |  2 +-
 src/server/scripts/World/npc_professions.cpp       |  2 +-
 src/server/scripts/World/npcs_special.cpp          |  8 +--
 src/server/shared/Logging/Log.cpp                  | 76 +---------------------
 src/server/shared/Logging/Log.h                    |  6 --
 55 files changed, 216 insertions(+), 296 deletions(-)

(limited to 'src')

diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp
index a10d576e309..9ab9e06b624 100644
--- a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp
+++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp
@@ -153,7 +153,7 @@ void ScriptedAI::DoPlaySoundToSet(WorldObject* pSource, uint32 uiSoundId)
 
     if (!GetSoundEntriesStore()->LookupEntry(uiSoundId))
     {
-        error_log("TSCR: Invalid soundId %u used in DoPlaySoundToSet (Source: TypeId %u, GUID %u)", uiSoundId, pSource->GetTypeId(), pSource->GetGUIDLow());
+        sLog.outError("TSCR: Invalid soundId %u used in DoPlaySoundToSet (Source: TypeId %u, GUID %u)", uiSoundId, pSource->GetTypeId(), pSource->GetGUIDLow());
         return;
     }
 
@@ -398,7 +398,7 @@ void ScriptedAI::DoResetThreat()
 {
     if (!me->CanHaveThreatList() || me->getThreatManager().isThreatListEmpty())
     {
-        error_log("TSCR: DoResetThreat called for creature that either cannot have threat list or has empty threat list (me entry = %d)", me->GetEntry());
+        sLog.outError("TSCR: DoResetThreat called for creature that either cannot have threat list or has empty threat list (me entry = %d)", me->GetEntry());
         return;
     }
 
@@ -441,7 +441,7 @@ void ScriptedAI::DoTeleportPlayer(Unit* pUnit, float fX, float fY, float fZ, flo
     if (!pUnit || pUnit->GetTypeId() != TYPEID_PLAYER)
     {
         if (pUnit)
-            error_log("TSCR: Creature %u (Entry: %u) Tried to teleport non-player unit (Type: %u GUID: %u) to x: %f y:%f z: %f o: %f. Aborted.", me->GetGUID(), me->GetEntry(), pUnit->GetTypeId(), pUnit->GetGUID(), fX, fY, fZ, fO);
+            sLog.outError("TSCR: Creature %u (Entry: %u) Tried to teleport non-player unit (Type: %u GUID: %u) to x: %f y:%f z: %f o: %f. Aborted.", me->GetGUID(), me->GetEntry(), pUnit->GetTypeId(), pUnit->GetGUID(), fX, fY, fZ, fO);
         return;
     }
 
@@ -578,7 +578,7 @@ bool ScriptedAI::EnterEvadeIfOutOfCombatArea(const uint32 uiDiff)
                 return false;
             break;
         default:
-            error_log("TSCR: EnterEvadeIfOutOfCombatArea used for creature entry %u, but does not have any definition.", me->GetEntry());
+            sLog.outError("TSCR: EnterEvadeIfOutOfCombatArea used for creature entry %u, but does not have any definition.", me->GetEntry());
             return false;
     }
 
diff --git a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp
index 217dd066310..0549858d1c7 100644
--- a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp
+++ b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp
@@ -177,7 +177,7 @@ void npc_escortAI::EnterEvadeMode()
     {
         AddEscortState(STATE_ESCORT_RETURNING);
         ReturnToLastPoint();
-        debug_log("TSCR: EscortAI has left combat and is now returning to last point");
+        sLog.outDebug("TSCR: EscortAI has left combat and is now returning to last point");
     }
     else
     {
@@ -224,7 +224,7 @@ void npc_escortAI::UpdateAI(const uint32 uiDiff)
             {
                 if (DespawnAtEnd)
                 {
-                    debug_log("TSCR: EscortAI reached end of waypoints");
+                    sLog.outDebug("TSCR: EscortAI reached end of waypoints");
 
                     if (m_bCanReturnToStart)
                     {
@@ -235,7 +235,7 @@ void npc_escortAI::UpdateAI(const uint32 uiDiff)
 
                         m_uiWPWaitTimer = 0;
 
-                        debug_log("TSCR: EscortAI are returning home to spawn location: %u, %f, %f, %f", POINT_HOME, fRetX, fRetY, fRetZ);
+                        sLog.outDebug("TSCR: EscortAI are returning home to spawn location: %u, %f, %f, %f", POINT_HOME, fRetX, fRetY, fRetZ);
                         return;
                     }
 
@@ -251,7 +251,7 @@ void npc_escortAI::UpdateAI(const uint32 uiDiff)
                 }
                 else
                 {
-                    debug_log("TSCR: EscortAI reached end of waypoints with Despawn off");
+                    sLog.outDebug("TSCR: EscortAI reached end of waypoints with Despawn off");
 
                     return;
                 }
@@ -260,7 +260,7 @@ void npc_escortAI::UpdateAI(const uint32 uiDiff)
             if (!HasEscortState(STATE_ESCORT_PAUSED))
             {
                 me->GetMotionMaster()->MovePoint(CurrentWP->id, CurrentWP->x, CurrentWP->y, CurrentWP->z);
-                debug_log("TSCR: EscortAI start waypoint %u (%f, %f, %f).", CurrentWP->id, CurrentWP->x, CurrentWP->y, CurrentWP->z);
+                sLog.outDebug("TSCR: EscortAI start waypoint %u (%f, %f, %f).", CurrentWP->id, CurrentWP->x, CurrentWP->y, CurrentWP->z);
 
                 WaypointStart(CurrentWP->id);
 
@@ -278,7 +278,7 @@ void npc_escortAI::UpdateAI(const uint32 uiDiff)
         {
             if (DespawnAtFar && !IsPlayerOrGroupInRange())
             {
-                debug_log("TSCR: EscortAI failed because player/group was to far away or not found");
+                sLog.outDebug("TSCR: EscortAI failed because player/group was to far away or not found");
 
                 if (m_bCanInstantRespawn)
                 {
@@ -316,7 +316,7 @@ void npc_escortAI::MovementInform(uint32 uiMoveType, uint32 uiPointId)
     //Combat start position reached, continue waypoint movement
     if (uiPointId == POINT_LAST_POINT)
     {
-        debug_log("TSCR: EscortAI has returned to original position before combat");
+        sLog.outDebug("TSCR: EscortAI has returned to original position before combat");
 
         if (m_bIsRunning && me->HasUnitMovementFlag(MOVEMENTFLAG_WALK_MODE))
             me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
@@ -330,7 +330,7 @@ void npc_escortAI::MovementInform(uint32 uiMoveType, uint32 uiPointId)
     }
     else if (uiPointId == POINT_HOME)
     {
-        debug_log("TSCR: EscortAI has returned to original home location and will continue from beginning of waypoint list.");
+        sLog.outDebug("TSCR: EscortAI has returned to original home location and will continue from beginning of waypoint list.");
 
         CurrentWP = WaypointList.begin();
         m_uiWPWaitTimer = 1;
@@ -340,11 +340,11 @@ void npc_escortAI::MovementInform(uint32 uiMoveType, uint32 uiPointId)
         //Make sure that we are still on the right waypoint
         if (CurrentWP->id != uiPointId)
         {
-            error_log("TSCR ERROR: EscortAI reached waypoint out of order %u, expected %u, creature entry %u", uiPointId, CurrentWP->id, me->GetEntry());
+            sLog.outError("TSCR ERROR: EscortAI reached waypoint out of order %u, expected %u, creature entry %u", uiPointId, CurrentWP->id, me->GetEntry());
             return;
         }
 
-        debug_log("TSCR: EscortAI Waypoint %u reached", CurrentWP->id);
+        sLog.outDebug("TSCR: EscortAI Waypoint %u reached", CurrentWP->id);
 
         //Call WP function
         WaypointReached(CurrentWP->id);
@@ -415,14 +415,14 @@ void npc_escortAI::SetRun(bool bRun)
         if (!m_bIsRunning)
             me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
         else
-            debug_log("TSCR: EscortAI attempt to set run mode, but is already running.");
+            sLog.outDebug("TSCR: EscortAI attempt to set run mode, but is already running.");
     }
     else
     {
         if (m_bIsRunning)
             me->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
         else
-            debug_log("TSCR: EscortAI attempt to set walk mode, but is already walking.");
+            sLog.outDebug("TSCR: EscortAI attempt to set walk mode, but is already walking.");
     }
     m_bIsRunning = bRun;
 }
@@ -432,13 +432,13 @@ void npc_escortAI::Start(bool bIsActiveAttacker, bool bRun, uint64 uiPlayerGUID,
 {
     if (me->getVictim())
     {
-        error_log("TSCR ERROR: EscortAI attempt to Start while in combat. Scriptname: %s, creature entry: %u", me->GetScriptName().c_str(), me->GetEntry());
+        sLog.outError("TSCR ERROR: EscortAI attempt to Start while in combat. Scriptname: %s, creature entry: %u", me->GetScriptName().c_str(), me->GetEntry());
         return;
     }
 
     if (HasEscortState(STATE_ESCORT_ESCORTING))
     {
-        error_log("TSCR: EscortAI attempt to Start while already escorting.");
+        sLog.outError("TSCR: EscortAI attempt to Start while already escorting.");
         return;
     }
 
@@ -454,7 +454,7 @@ void npc_escortAI::Start(bool bIsActiveAttacker, bool bRun, uint64 uiPlayerGUID,
 
     if (WaypointList.empty())
     {
-        error_db_log("TSCR: EscortAI Start with 0 waypoints (possible missing entry in script_waypoint. Quest: %u).", pQuest ? pQuest->GetQuestId() : 0);
+        sLog.outErrorDb("TSCR: EscortAI Start with 0 waypoints (possible missing entry in script_waypoint. Quest: %u).", pQuest ? pQuest->GetQuestId() : 0);
         return;
     }
 
@@ -469,19 +469,19 @@ void npc_escortAI::Start(bool bIsActiveAttacker, bool bRun, uint64 uiPlayerGUID,
     m_bCanReturnToStart = bCanLoopPath;
 
     if (m_bCanReturnToStart && m_bCanInstantRespawn)
-        debug_log("TSCR: EscortAI is set to return home after waypoint end and instant respawn at waypoint end. Creature will never despawn.");
+        sLog.outDebug("TSCR: EscortAI is set to return home after waypoint end and instant respawn at waypoint end. Creature will never despawn.");
 
     if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() == WAYPOINT_MOTION_TYPE)
     {
         me->GetMotionMaster()->MovementExpired();
         me->GetMotionMaster()->MoveIdle();
-        debug_log("TSCR: EscortAI start with WAYPOINT_MOTION_TYPE, changed to MoveIdle.");
+        sLog.outDebug("TSCR: EscortAI start with WAYPOINT_MOTION_TYPE, changed to MoveIdle.");
     }
 
     //disable npcflags
     me->SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_NONE);
 
-    debug_log("TSCR: EscortAI started with %u waypoints. ActiveAttacker = %d, Run = %d, PlayerGUID = %u", WaypointList.size(), m_bIsActiveAttacker, m_bIsRunning, m_uiPlayerGUID);
+    sLog.outDebug("TSCR: EscortAI started with %u waypoints. ActiveAttacker = %d, Run = %d, PlayerGUID = %u", WaypointList.size(), m_bIsActiveAttacker, m_bIsRunning, m_uiPlayerGUID);
 
     CurrentWP = WaypointList.begin();
 
diff --git a/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp
index b4a51f9eb27..6147edac45c 100644
--- a/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp
+++ b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp
@@ -164,7 +164,7 @@ void FollowerAI::EnterEvadeMode()
 
     if (HasFollowState(STATE_FOLLOW_INPROGRESS))
     {
-        debug_log("TSCR: FollowerAI left combat, returning to CombatStartPosition.");
+        sLog.outDebug("TSCR: FollowerAI left combat, returning to CombatStartPosition.");
 
         if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() == TARGETED_MOTION_TYPE)
         {
@@ -190,7 +190,7 @@ void FollowerAI::UpdateAI(const uint32 uiDiff)
         {
             if (HasFollowState(STATE_FOLLOW_COMPLETE) && !HasFollowState(STATE_FOLLOW_POSTEVENT))
             {
-                debug_log("TSCR: FollowerAI is set completed, despawns.");
+                sLog.outDebug("TSCR: FollowerAI is set completed, despawns.");
                 me->ForcedDespawn();
                 return;
             }
@@ -201,7 +201,7 @@ void FollowerAI::UpdateAI(const uint32 uiDiff)
             {
                 if (HasFollowState(STATE_FOLLOW_RETURNING))
                 {
-                    debug_log("TSCR: FollowerAI is returning to leader.");
+                    sLog.outDebug("TSCR: FollowerAI is returning to leader.");
 
                     RemoveFollowState(STATE_FOLLOW_RETURNING);
                     me->GetMotionMaster()->MoveFollow(pPlayer, PET_FOLLOW_DIST, PET_FOLLOW_ANGLE);
@@ -230,7 +230,7 @@ void FollowerAI::UpdateAI(const uint32 uiDiff)
 
             if (bIsMaxRangeExceeded)
             {
-                debug_log("TSCR: FollowerAI failed because player/group was to far away or not found");
+                sLog.outDebug("TSCR: FollowerAI failed because player/group was to far away or not found");
                 me->ForcedDespawn();
                 return;
             }
@@ -273,13 +273,13 @@ void FollowerAI::StartFollow(Player* pLeader, uint32 uiFactionForFollower, const
 {
     if (me->getVictim())
     {
-        debug_log("TSCR: FollowerAI attempt to StartFollow while in combat.");
+        sLog.outDebug("TSCR: FollowerAI attempt to StartFollow while in combat.");
         return;
     }
 
     if (HasFollowState(STATE_FOLLOW_INPROGRESS))
     {
-        error_log("TSCR: FollowerAI attempt to StartFollow while already following.");
+        sLog.outError("TSCR: FollowerAI attempt to StartFollow while already following.");
         return;
     }
 
@@ -295,7 +295,7 @@ void FollowerAI::StartFollow(Player* pLeader, uint32 uiFactionForFollower, const
     {
         me->GetMotionMaster()->Clear();
         me->GetMotionMaster()->MoveIdle();
-        debug_log("TSCR: FollowerAI start with WAYPOINT_MOTION_TYPE, set to MoveIdle.");
+        sLog.outDebug("TSCR: FollowerAI start with WAYPOINT_MOTION_TYPE, set to MoveIdle.");
     }
 
     me->SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_NONE);
@@ -304,7 +304,7 @@ void FollowerAI::StartFollow(Player* pLeader, uint32 uiFactionForFollower, const
 
     me->GetMotionMaster()->MoveFollow(pLeader, PET_FOLLOW_DIST, PET_FOLLOW_ANGLE);
 
-    debug_log("TSCR: FollowerAI start follow %s (GUID %u)", pLeader->GetName(), m_uiLeaderGUID);
+    sLog.outDebug("TSCR: FollowerAI start follow %s (GUID %u)", pLeader->GetName(), m_uiLeaderGUID);
 }
 
 Player* FollowerAI::GetLeaderForFollower()
@@ -323,7 +323,7 @@ Player* FollowerAI::GetLeaderForFollower()
 
                     if (pMember && pMember->isAlive() && me->IsWithinDistInMap(pMember, MAX_PLAYER_DISTANCE))
                     {
-                        debug_log("TSCR: FollowerAI GetLeader changed and returned new leader.");
+                        sLog.outDebug("TSCR: FollowerAI GetLeader changed and returned new leader.");
                         m_uiLeaderGUID = pMember->GetGUID();
                         return pMember;
                         break;
@@ -333,7 +333,7 @@ Player* FollowerAI::GetLeaderForFollower()
         }
     }
 
-    debug_log("TSCR: FollowerAI GetLeader can not find suitable leader.");
+    sLog.outDebug("TSCR: FollowerAI GetLeader can not find suitable leader.");
     return NULL;
 }
 
diff --git a/src/server/game/AI/ScriptedAI/ScriptedInstance.h b/src/server/game/AI/ScriptedAI/ScriptedInstance.h
index 25593e05300..8a9b8c4c5a3 100644
--- a/src/server/game/AI/ScriptedAI/ScriptedInstance.h
+++ b/src/server/game/AI/ScriptedAI/ScriptedInstance.h
@@ -8,11 +8,11 @@
 #include "InstanceData.h"
 #include "Map.h"
 
-#define OUT_SAVE_INST_DATA             debug_log("TSCR: Saving Instance Data for Instance %s (Map %d, Instance Id %d)", instance->GetMapName(), instance->GetId(), instance->GetInstanceId())
-#define OUT_SAVE_INST_DATA_COMPLETE    debug_log("TSCR: Saving Instance Data for Instance %s (Map %d, Instance Id %d) completed.", instance->GetMapName(), instance->GetId(), instance->GetInstanceId())
-#define OUT_LOAD_INST_DATA(a)          debug_log("TSCR: Loading Instance Data for Instance %s (Map %d, Instance Id %d). Input is '%s'", instance->GetMapName(), instance->GetId(), instance->GetInstanceId(), a)
-#define OUT_LOAD_INST_DATA_COMPLETE    debug_log("TSCR: Instance Data Load for Instance %s (Map %d, Instance Id: %d) is complete.",instance->GetMapName(), instance->GetId(), instance->GetInstanceId())
-#define OUT_LOAD_INST_DATA_FAIL        error_log("TSCR: Unable to load Instance Data for Instance %s (Map %d, Instance Id: %d).",instance->GetMapName(), instance->GetId(), instance->GetInstanceId())
+#define OUT_SAVE_INST_DATA             sLog.outDebug("TSCR: Saving Instance Data for Instance %s (Map %d, Instance Id %d)", instance->GetMapName(), instance->GetId(), instance->GetInstanceId())
+#define OUT_SAVE_INST_DATA_COMPLETE    sLog.outDebug("TSCR: Saving Instance Data for Instance %s (Map %d, Instance Id %d) completed.", instance->GetMapName(), instance->GetId(), instance->GetInstanceId())
+#define OUT_LOAD_INST_DATA(a)          sLog.outDebug("TSCR: Loading Instance Data for Instance %s (Map %d, Instance Id %d). Input is '%s'", instance->GetMapName(), instance->GetId(), instance->GetInstanceId(), a)
+#define OUT_LOAD_INST_DATA_COMPLETE    sLog.outDebug("TSCR: Instance Data Load for Instance %s (Map %d, Instance Id: %d) is complete.",instance->GetMapName(), instance->GetId(), instance->GetInstanceId())
+#define OUT_LOAD_INST_DATA_FAIL        sLog.outError("TSCR: Unable to load Instance Data for Instance %s (Map %d, Instance Id: %d).",instance->GetMapName(), instance->GetId(), instance->GetInstanceId())
 
 #define ScriptedInstance InstanceData
 
diff --git a/src/server/game/Instances/InstanceData.cpp b/src/server/game/Instances/InstanceData.cpp
index 5392ad4cbd1..7408efe97e5 100644
--- a/src/server/game/Instances/InstanceData.cpp
+++ b/src/server/game/Instances/InstanceData.cpp
@@ -43,7 +43,7 @@ void InstanceData::HandleGameObject(uint64 GUID, bool open, GameObject *go)
     if (go)
         go->SetGoState(open ? GO_STATE_ACTIVE : GO_STATE_READY);
     else
-        debug_log("TSCR: InstanceData: HandleGameObject failed");
+        sLog.outDebug("TSCR: InstanceData: HandleGameObject failed");
 }
 
 bool InstanceData::IsEncounterInProgress() const
@@ -263,7 +263,7 @@ void InstanceData::DoUseDoorOrButton(uint64 uiGuid, uint32 uiWithRestoreTime, bo
                 pGo->ResetDoorOrButton();
         }
         else
-            error_log("SD2: Script call DoUseDoorOrButton, but gameobject entry %u is type %u.",pGo->GetEntry(),pGo->GetGoType());
+            sLog.outError("SD2: Script call DoUseDoorOrButton, but gameobject entry %u is type %u.",pGo->GetEntry(),pGo->GetGoType());
     }
 }
 
@@ -294,7 +294,7 @@ void InstanceData::DoUpdateWorldState(uint32 uiStateId, uint32 uiStateData)
                 pPlayer->SendUpdateWorldState(uiStateId, uiStateData);
     }
     else
-        debug_log("TSCR: DoUpdateWorldState attempt send data but no players in map.");
+        sLog.outDebug("TSCR: DoUpdateWorldState attempt send data but no players in map.");
 }
 
 // Send Notify to all players in instance
@@ -318,7 +318,7 @@ void InstanceData::DoCompleteAchievement(uint32 achievement)
 
     if (!pAE)
     {
-        error_log("TSCR: DoCompleteAchievement called for not existing achievement %u", achievement);
+        sLog.outError("TSCR: DoCompleteAchievement called for not existing achievement %u", achievement);
         return;
     }
 
diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp
index b41f6a215f8..88e5b7284c0 100644
--- a/src/server/game/Scripting/ScriptMgr.cpp
+++ b/src/server/game/Scripting/ScriptMgr.cpp
@@ -45,22 +45,22 @@ ScriptMgr::~ScriptMgr()
 void ScriptMgr::ScriptsInit()
 {
     //Trinity Script startup
-    /*outstring_log(" _____     _       _ _         ____            _       _");
-    outstring_log("|_   _| __(_)_ __ (_) |_ _   _/ ___|  ___ _ __(_)_ __ | |_ ");
-    outstring_log("  | || '__| | '_ \\| | __| | | \\___ \\ / __| \'__| | \'_ \\| __|");
-    outstring_log("  | || |  | | | | | | |_| |_| |___) | (__| |  | | |_) | |_ ");
-    outstring_log("  |_||_|  |_|_| |_|_|\\__|\\__, |____/ \\___|_|  |_| .__/ \\__|");
-    outstring_log("                         |___/                  |_|        ");
-    outstring_log("");
-    outstring_log("");*/
+    /*sLog.outString(" _____     _       _ _         ____            _       _");
+    sLog.outString("|_   _| __(_)_ __ (_) |_ _   _/ ___|  ___ _ __(_)_ __ | |_ ");
+    sLog.outString("  | || '__| | '_ \\| | __| | | \\___ \\ / __| \'__| | \'_ \\| __|");
+    sLog.outString("  | || |  | | | | | | |_| |_| |___) | (__| |  | | |_) | |_ ");
+    sLog.outString("  |_||_|  |_|_| |_|_|\\__|\\__, |____/ \\___|_|  |_| .__/ \\__|");
+    sLog.outString("                         |___/                  |_|        ");
+    sLog.outString("");
+    sLog.outString("");*/
 
     //Load database (must be called after SD2Config.SetSource).
     LoadDatabase();
 
-    outstring_log("Loading C++ scripts");
+    sLog.outString("Loading C++ scripts");
     barGoLink bar(1);
     bar.step();
-    outstring_log("");
+    sLog.outString("");
 
     for (uint16 i =0; i> Loaded %i C++ Scripts.", num_sc_scripts);
+    sLog.outString(">> Loaded %i C++ Scripts.", num_sc_scripts);
 
-    outstring_log(">> Load Overriden SQL Data.");
+    sLog.outString(">> Load Overriden SQL Data.");
     LoadOverridenSQLData();
 }
 
@@ -82,13 +82,13 @@ void DoScriptText(int32 iTextEntry, WorldObject* pSource, Unit* pTarget)
 {
     if (!pSource)
     {
-        error_log("TSCR: DoScriptText entry %i, invalid Source pointer.", iTextEntry);
+        sLog.outError("TSCR: DoScriptText entry %i, invalid Source pointer.", iTextEntry);
         return;
     }
 
     if (iTextEntry >= 0)
     {
-        error_log("TSCR: DoScriptText with source entry %u (TypeId=%u, guid=%u) attempts to process text entry %i, but text entry must be negative.", pSource->GetEntry(), pSource->GetTypeId(), pSource->GetGUIDLow(), iTextEntry);
+        sLog.outError("TSCR: DoScriptText with source entry %u (TypeId=%u, guid=%u) attempts to process text entry %i, but text entry must be negative.", pSource->GetEntry(), pSource->GetTypeId(), pSource->GetGUIDLow(), iTextEntry);
         return;
     }
 
@@ -96,11 +96,11 @@ void DoScriptText(int32 iTextEntry, WorldObject* pSource, Unit* pTarget)
 
     if (!pData)
     {
-        error_log("TSCR: DoScriptText with source entry %u (TypeId=%u, guid=%u) could not find text entry %i.", pSource->GetEntry(), pSource->GetTypeId(), pSource->GetGUIDLow(), iTextEntry);
+        sLog.outError("TSCR: DoScriptText with source entry %u (TypeId=%u, guid=%u) could not find text entry %i.", pSource->GetEntry(), pSource->GetTypeId(), pSource->GetGUIDLow(), iTextEntry);
         return;
     }
 
-    debug_log("TSCR: DoScriptText: text entry=%i, Sound=%u, Type=%u, Language=%u, Emote=%u", iTextEntry, pData->uiSoundId, pData->uiType, pData->uiLanguage, pData->uiEmote);
+    sLog.outDebug("TSCR: DoScriptText: text entry=%i, Sound=%u, Type=%u, Language=%u, Emote=%u", iTextEntry, pData->uiSoundId, pData->uiType, pData->uiLanguage, pData->uiEmote);
 
     if (pData->uiSoundId)
     {
@@ -109,7 +109,7 @@ void DoScriptText(int32 iTextEntry, WorldObject* pSource, Unit* pTarget)
             pSource->SendPlaySound(pData->uiSoundId, false);
         }
         else
-            error_log("TSCR: DoScriptText entry %i tried to process invalid sound id %u.", iTextEntry, pData->uiSoundId);
+            sLog.outError("TSCR: DoScriptText entry %i tried to process invalid sound id %u.", iTextEntry, pData->uiSoundId);
     }
 
     if (pData->uiEmote)
@@ -117,7 +117,7 @@ void DoScriptText(int32 iTextEntry, WorldObject* pSource, Unit* pTarget)
         if (pSource->GetTypeId() == TYPEID_UNIT || pSource->GetTypeId() == TYPEID_PLAYER)
             ((Unit*)pSource)->HandleEmoteCommand(pData->uiEmote);
         else
-            error_log("TSCR: DoScriptText entry %i tried to process emote for invalid TypeId (%u).", iTextEntry, pSource->GetTypeId());
+            sLog.outError("TSCR: DoScriptText entry %i tried to process emote for invalid TypeId (%u).", iTextEntry, pSource->GetTypeId());
     }
 
     switch(pData->uiType)
@@ -139,7 +139,7 @@ void DoScriptText(int32 iTextEntry, WorldObject* pSource, Unit* pTarget)
                 if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER)
                     pSource->MonsterWhisper(iTextEntry, pTarget->GetGUID());
                 else
-                    error_log("TSCR: DoScriptText entry %i cannot whisper without target unit (TYPEID_PLAYER).", iTextEntry);
+                    sLog.outError("TSCR: DoScriptText entry %i cannot whisper without target unit (TYPEID_PLAYER).", iTextEntry);
             }
             break;
         case CHAT_TYPE_BOSS_WHISPER:
@@ -147,7 +147,7 @@ void DoScriptText(int32 iTextEntry, WorldObject* pSource, Unit* pTarget)
                 if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER)
                     pSource->MonsterWhisper(iTextEntry, pTarget->GetGUID(), true);
                 else
-                    error_log("TSCR: DoScriptText entry %i cannot whisper without target unit (TYPEID_PLAYER).", iTextEntry);
+                    sLog.outError("TSCR: DoScriptText entry %i cannot whisper without target unit (TYPEID_PLAYER).", iTextEntry);
             }
             break;
         case CHAT_TYPE_ZONE_YELL:
@@ -165,7 +165,7 @@ void Script::RegisterSelf()
         // somebody forgot to allocate memory for a script by a method like this: newscript = new Script
         if (m_scripts[i] == this)
         {
-            error_log("ScriptName: '%s' - Forgot to allocate memory, so this script and/or the script before that can't work.", Name.c_str());
+            sLog.outError("ScriptName: '%s' - Forgot to allocate memory, so this script and/or the script before that can't work.", Name.c_str());
             // don't register it
             // and don't delete it because its memory is used for another script
             return;
@@ -200,14 +200,14 @@ void Script::RegisterSelf()
         else
         {
             // TODO: write a better error message than this one :)
-            error_log("ScriptName: '%s' already assigned with the same ScriptName, so the script can't work.", Name.c_str());
+            sLog.outError("ScriptName: '%s' already assigned with the same ScriptName, so the script can't work.", Name.c_str());
             delete this;
         }
     }
     else
     {
         if (Name.find("example") == std::string::npos)
-            error_db_log("TrinityScript: RegisterSelf, but script named %s does not have ScriptName assigned in database.",(this)->Name.c_str());
+            sLog.outErrorDb("TrinityScript: RegisterSelf, but script named %s does not have ScriptName assigned in database.",(this)->Name.c_str());
         delete this;
     }
 }
@@ -326,7 +326,7 @@ bool ScriptMgr::GossipHello (Player * pPlayer, Creature* pCreature)
 
 bool ScriptMgr::GossipSelect(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction)
 {
-    debug_log("TSCR: Gossip selection, sender: %d, action: %d", uiSender, uiAction);
+    sLog.outDebug("TSCR: Gossip selection, sender: %d, action: %d", uiSender, uiAction);
 
     Script *tmpscript = m_scripts[pCreature->GetScriptId()];
     if (!tmpscript || !tmpscript->pGossipSelect) return false;
@@ -337,7 +337,7 @@ bool ScriptMgr::GossipSelect(Player* pPlayer, Creature* pCreature, uint32 uiSend
 
 bool ScriptMgr::GossipSelectWithCode(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction, const char* sCode)
 {
-    debug_log("TSCR: Gossip selection with code, sender: %d, action: %d", uiSender, uiAction);
+    sLog.outDebug("TSCR: Gossip selection with code, sender: %d, action: %d", uiSender, uiAction);
 
     Script *tmpscript = m_scripts[pCreature->GetScriptId()];
     if (!tmpscript || !tmpscript->pGossipSelectWithCode) return false;
@@ -350,7 +350,7 @@ bool ScriptMgr::GOSelect(Player* pPlayer, GameObject* pGO, uint32 uiSender, uint
 {
     if (!pGO)
     return false;
-    debug_log("TSCR: Gossip selection, sender: %d, action: %d", uiSender, uiAction);
+    sLog.outDebug("TSCR: Gossip selection, sender: %d, action: %d", uiSender, uiAction);
 
     Script *tmpscript = m_scripts[pGO->GetGOInfo()->ScriptId];
     if (!tmpscript || !tmpscript->pGOSelect) return false;
@@ -363,7 +363,7 @@ bool ScriptMgr::GOSelectWithCode(Player* pPlayer, GameObject* pGO, uint32 uiSend
 {
     if (!pGO)
     return false;
-    debug_log("TSCR: Gossip selection, sender: %d, action: %d",uiSender, uiAction);
+    sLog.outDebug("TSCR: Gossip selection, sender: %d, action: %d",uiSender, uiAction);
 
     Script *tmpscript = m_scripts[pGO->GetGOInfo()->ScriptId];
     if (!tmpscript || !tmpscript->pGOSelectWithCode) return false;
diff --git a/src/server/game/Scripting/ScriptSystem.cpp b/src/server/game/Scripting/ScriptSystem.cpp
index fcd5c81add4..54a14228bc1 100644
--- a/src/server/game/Scripting/ScriptSystem.cpp
+++ b/src/server/game/Scripting/ScriptSystem.cpp
@@ -43,24 +43,24 @@ void SystemMgr::LoadVersion()
     {
         Field* pFields = Result->Fetch();
 
-        outstring_log("TSCR: Database version is: %s", pFields[0].GetString());
-        outstring_log("");
+        sLog.outString("TSCR: Database version is: %s", pFields[0].GetString());
+        sLog.outString("");
     }
     else
     {
-        error_log("TSCR: Missing `version`.`script_version` information.");
-        outstring_log("");
+        sLog.outError("TSCR: Missing `version`.`script_version` information.");
+        sLog.outString("");
     }
 }
 
 void SystemMgr::LoadScriptTexts()
 {
-    outstring_log("TSCR: Loading Script Texts...");
+    sLog.outString("TSCR: Loading Script Texts...");
     LoadTrinityStrings(WorldDatabase,"script_texts",TEXT_SOURCE_RANGE,1+(TEXT_SOURCE_RANGE*2));
 
     QueryResult_AutoPtr Result = WorldDatabase.Query("SELECT entry, sound, type, language, emote FROM script_texts");
 
-    outstring_log("TSCR: Loading Script Texts additional data...");
+    sLog.outString("TSCR: Loading Script Texts additional data...");
 
     if (Result)
     {
@@ -81,52 +81,52 @@ void SystemMgr::LoadScriptTexts()
 
             if (iId >= 0)
             {
-                error_db_log("TSCR: Entry %i in table `script_texts` is not a negative value.", iId);
+                sLog.outErrorDb("TSCR: Entry %i in table `script_texts` is not a negative value.", iId);
                 continue;
             }
 
             if (iId > TEXT_SOURCE_RANGE || iId <= TEXT_SOURCE_RANGE*2)
             {
-                error_db_log("TSCR: Entry %i in table `script_texts` is out of accepted entry range for table.", iId);
+                sLog.outErrorDb("TSCR: Entry %i in table `script_texts` is out of accepted entry range for table.", iId);
                 continue;
             }
 
             if (pTemp.uiSoundId)
             {
                 if (!GetSoundEntriesStore()->LookupEntry(pTemp.uiSoundId))
-                    error_db_log("TSCR: Entry %i in table `script_texts` has soundId %u but sound does not exist.", iId, pTemp.uiSoundId);
+                    sLog.outErrorDb("TSCR: Entry %i in table `script_texts` has soundId %u but sound does not exist.", iId, pTemp.uiSoundId);
             }
 
             if (!GetLanguageDescByID(pTemp.uiLanguage))
-                error_db_log("TSCR: Entry %i in table `script_texts` using Language %u but Language does not exist.", iId, pTemp.uiLanguage);
+                sLog.outErrorDb("TSCR: Entry %i in table `script_texts` using Language %u but Language does not exist.", iId, pTemp.uiLanguage);
 
             if (pTemp.uiType > CHAT_TYPE_ZONE_YELL)
-                error_db_log("TSCR: Entry %i in table `script_texts` has Type %u but this Chat Type does not exist.", iId, pTemp.uiType);
+                sLog.outErrorDb("TSCR: Entry %i in table `script_texts` has Type %u but this Chat Type does not exist.", iId, pTemp.uiType);
 
             m_mTextDataMap[iId] = pTemp;
             ++uiCount;
         } while (Result->NextRow());
 
-        outstring_log("");
-        outstring_log(">> Loaded %u additional Script Texts data.", uiCount);
+        sLog.outString("");
+        sLog.outString(">> Loaded %u additional Script Texts data.", uiCount);
     }
     else
     {
         barGoLink bar(1);
         bar.step();
-        outstring_log("");
-        outstring_log(">> Loaded 0 additional Script Texts data. DB table `script_texts` is empty.");
+        sLog.outString("");
+        sLog.outString(">> Loaded 0 additional Script Texts data. DB table `script_texts` is empty.");
     }
 }
 
 void SystemMgr::LoadScriptTextsCustom()
 {
-    outstring_log("TSCR: Loading Custom Texts...");
+    sLog.outString("TSCR: Loading Custom Texts...");
     LoadTrinityStrings(WorldDatabase,"custom_texts",TEXT_SOURCE_RANGE*2,1+(TEXT_SOURCE_RANGE*3));
 
     QueryResult_AutoPtr Result = WorldDatabase.Query("SELECT entry, sound, type, language, emote FROM custom_texts");
 
-    outstring_log("TSCR: Loading Custom Texts additional data...");
+    sLog.outString("TSCR: Loading Custom Texts additional data...");
 
     if (Result)
     {
@@ -147,41 +147,41 @@ void SystemMgr::LoadScriptTextsCustom()
 
             if (iId >= 0)
             {
-                error_db_log("TSCR: Entry %i in table `custom_texts` is not a negative value.", iId);
+                sLog.outErrorDb("TSCR: Entry %i in table `custom_texts` is not a negative value.", iId);
                 continue;
             }
 
             if (iId > TEXT_SOURCE_RANGE*2 || iId <= TEXT_SOURCE_RANGE*3)
             {
-                error_db_log("TSCR: Entry %i in table `custom_texts` is out of accepted entry range for table.", iId);
+                sLog.outErrorDb("TSCR: Entry %i in table `custom_texts` is out of accepted entry range for table.", iId);
                 continue;
             }
 
             if (pTemp.uiSoundId)
             {
                 if (!GetSoundEntriesStore()->LookupEntry(pTemp.uiSoundId))
-                    error_db_log("TSCR: Entry %i in table `custom_texts` has soundId %u but sound does not exist.", iId, pTemp.uiSoundId);
+                    sLog.outErrorDb("TSCR: Entry %i in table `custom_texts` has soundId %u but sound does not exist.", iId, pTemp.uiSoundId);
             }
 
             if (!GetLanguageDescByID(pTemp.uiLanguage))
-                error_db_log("TSCR: Entry %i in table `custom_texts` using Language %u but Language does not exist.", iId, pTemp.uiLanguage);
+                sLog.outErrorDb("TSCR: Entry %i in table `custom_texts` using Language %u but Language does not exist.", iId, pTemp.uiLanguage);
 
             if (pTemp.uiType > CHAT_TYPE_ZONE_YELL)
-                error_db_log("TSCR: Entry %i in table `custom_texts` has Type %u but this Chat Type does not exist.", iId, pTemp.uiType);
+                sLog.outErrorDb("TSCR: Entry %i in table `custom_texts` has Type %u but this Chat Type does not exist.", iId, pTemp.uiType);
 
             m_mTextDataMap[iId] = pTemp;
             ++uiCount;
         } while (Result->NextRow());
 
-        outstring_log("");
-        outstring_log(">> Loaded %u additional Custom Texts data.", uiCount);
+        sLog.outString("");
+        sLog.outString(">> Loaded %u additional Custom Texts data.", uiCount);
     }
     else
     {
         barGoLink bar(1);
         bar.step();
-        outstring_log("");
-        outstring_log(">> Loaded 0 additional Custom Texts data. DB table `custom_texts` is empty.");
+        sLog.outString("");
+        sLog.outString(">> Loaded 0 additional Custom Texts data. DB table `custom_texts` is empty.");
     }
 }
 
@@ -197,7 +197,7 @@ void SystemMgr::LoadScriptWaypoints()
     if (Result)
         uiCreatureCount = Result->GetRowCount();
 
-    outstring_log("TSCR: Loading Script Waypoints for %u creature(s)...", uiCreatureCount);
+    sLog.outString("TSCR: Loading Script Waypoints for %u creature(s)...", uiCreatureCount);
 
     Result = WorldDatabase.Query("SELECT entry, pointid, location_x, location_y, location_z, waittime FROM script_waypoint ORDER BY pointid");
 
@@ -224,25 +224,25 @@ void SystemMgr::LoadScriptWaypoints()
 
             if (!pCInfo)
             {
-                error_db_log("TSCR: DB table script_waypoint has waypoint for non-existant creature entry %u", pTemp.uiCreatureEntry);
+                sLog.outErrorDb("TSCR: DB table script_waypoint has waypoint for non-existant creature entry %u", pTemp.uiCreatureEntry);
                 continue;
             }
 
             if (!pCInfo->ScriptID)
-                error_db_log("TSCR: DB table script_waypoint has waypoint for creature entry %u, but creature does not have ScriptName defined and then useless.", pTemp.uiCreatureEntry);
+                sLog.outErrorDb("TSCR: DB table script_waypoint has waypoint for creature entry %u, but creature does not have ScriptName defined and then useless.", pTemp.uiCreatureEntry);
 
             m_mPointMoveMap[uiEntry].push_back(pTemp);
             ++uiNodeCount;
         } while (Result->NextRow());
 
-        outstring_log("");
-        outstring_log(">> Loaded %u Script Waypoint nodes.", uiNodeCount);
+        sLog.outString("");
+        sLog.outString(">> Loaded %u Script Waypoint nodes.", uiNodeCount);
     }
     else
     {
         barGoLink bar(1);
         bar.step();
-        outstring_log("");
-        outstring_log(">> Loaded 0 Script Waypoints. DB table `script_waypoint` is empty.");
+        sLog.outString("");
+        sLog.outString(">> Loaded 0 Script Waypoints. DB table `script_waypoint` is empty.");
     }
 }
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp
index 09ed6a1c4b0..a27f28e8d9c 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp
@@ -214,7 +214,7 @@ struct npc_grimstoneAI : public npc_escortAI
             if (pInstance)
             {
                 pInstance->SetData(TYPE_RING_OF_LAW,DONE);
-                debug_log("TSCR: npc_grimstone: event reached end and set complete.");
+                sLog.outDebug("TSCR: npc_grimstone: event reached end and set complete.");
             }
             break;
         }
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp
index 6c865ee214d..3dd048ce449 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp
@@ -207,7 +207,7 @@ struct instance_blackrock_depths : public ScriptedInstance
 
     void SetData64(uint32 type, uint64 data)
     {
-        debug_log("TSCR: Instance Blackrock Depths: SetData64 update (Type: %u Data %u)", type, data);
+        sLog.outDebug("TSCR: Instance Blackrock Depths: SetData64 update (Type: %u Data %u)", type, data);
 
         switch(type)
         {
@@ -223,7 +223,7 @@ struct instance_blackrock_depths : public ScriptedInstance
 
     void SetData(uint32 type, uint32 data)
     {
-        debug_log("TSCR: Instance Blackrock Depths: SetData update (Type: %u Data %u)", type, data);
+        sLog.outDebug("TSCR: Instance Blackrock Depths: SetData update (Type: %u Data %u)", type, data);
 
         switch(type)
         {
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp
index 74d118033c6..b079dd94a58 100644
--- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp
@@ -312,7 +312,7 @@ struct boss_victor_nefariusAI : public ScriptedAI
                         Nefarian->setFaction(103);
                         NefarianGUID = Nefarian->GetGUID();
                     }
-                    else error_log("TSCR: Blackwing Lair: Unable to spawn nefarian properly.");
+                    else sLog.outError("TSCR: Blackwing Lair: Unable to spawn nefarian properly.");
                 }
 
                 AddSpawnTimer = 4000;
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
index 19bf7d235ed..e7c26491cb0 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
@@ -534,7 +534,7 @@ CreatureAI* GetAI_water_elemental(Creature* pCreature)
 // CONVERT TO ACID
 CreatureAI* GetAI_shadow_of_aran(Creature* pCreature)
 {
-    outstring_log("TSCR: Convert simpleAI script for Creature Entry %u to ACID", pCreature->GetEntry());
+    sLog.outString("TSCR: Convert simpleAI script for Creature Entry %u to ACID", pCreature->GetEntry());
     SimpleAI* ai = new SimpleAI (pCreature);
 
     ai->Spell[0].Enabled = true;
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
index 11e87b9e82e..bf4db4d9d01 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
@@ -1154,7 +1154,7 @@ void boss_julianneAI::DamageTaken(Unit* /*done_by*/, uint32 &damage)
 
     if (Phase == PHASE_ROMULO)
     {
-        error_log("TSCR: boss_julianneAI: cannot take damage in PHASE_ROMULO, why was i here?");
+        sLog.outError("TSCR: boss_julianneAI: cannot take damage in PHASE_ROMULO, why was i here?");
         damage = 0;
         return;
     }
@@ -1188,7 +1188,7 @@ void boss_julianneAI::DamageTaken(Unit* /*done_by*/, uint32 &damage)
             return;
         }
     }
-    error_log("TSCR: boss_julianneAI: DamageTaken reach end of code, that should not happen.");
+    sLog.outError("TSCR: boss_julianneAI: DamageTaken reach end of code, that should not happen.");
 }
 
 void boss_romuloAI::DamageTaken(Unit* /*done_by*/, uint32 &damage)
@@ -1242,7 +1242,7 @@ void boss_romuloAI::DamageTaken(Unit* /*done_by*/, uint32 &damage)
         }
     }
 
-    error_log("TSCR: boss_romuloAI: DamageTaken reach end of code, that should not happen.");
+    sLog.outError("TSCR: boss_romuloAI: DamageTaken reach end of code, that should not happen.");
 }
 
 void boss_julianneAI::UpdateAI(const uint32 diff)
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
index 321a65c2544..a388600b51d 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
@@ -220,7 +220,7 @@ struct npc_barnesAI : public npc_escortAI
 
     void PrepareEncounter()
     {
-        debug_log("TSCR: Barnes Opera Event - Introduction complete - preparing encounter %d", m_uiEventId);
+        sLog.outDebug("TSCR: Barnes Opera Event - Introduction complete - preparing encounter %d", m_uiEventId);
         uint8 index = 0;
         uint8 count = 0;
 
@@ -371,17 +371,17 @@ bool GossipSelect_npc_barnes(Player* pPlayer, Creature* pCreature, uint32 /*uiSe
         case GOSSIP_ACTION_INFO_DEF+3:
             pPlayer->CLOSE_GOSSIP_MENU();
             pBarnesAI->m_uiEventId = EVENT_OZ;
-            outstring_log("TSCR: player (GUID %i) manually set Opera event to EVENT_OZ",pPlayer->GetGUID());
+            sLog.outString("TSCR: player (GUID %i) manually set Opera event to EVENT_OZ",pPlayer->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+4:
             pPlayer->CLOSE_GOSSIP_MENU();
             pBarnesAI->m_uiEventId = EVENT_HOOD;
-            outstring_log("TSCR: player (GUID %i) manually set Opera event to EVENT_HOOD",pPlayer->GetGUID());
+            sLog.outString("TSCR: player (GUID %i) manually set Opera event to EVENT_HOOD",pPlayer->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+5:
             pPlayer->CLOSE_GOSSIP_MENU();
             pBarnesAI->m_uiEventId = EVENT_RAJ;
-            outstring_log("TSCR: player (GUID %i) manually set Opera event to EVENT_RAJ",pPlayer->GetGUID());
+            sLog.outString("TSCR: player (GUID %i) manually set Opera event to EVENT_RAJ",pPlayer->GetGUID());
             break;
     }
 
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.h b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.h
index 56a6b106332..86562fd06df 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.h
+++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.h
@@ -48,6 +48,6 @@ enum OperaEvents
     EVENT_RAJ                       = 3
 };
 
-#define ERROR_INST_DATA(a)          error_log("TSCR: Instance Data for Karazhan not set properly. Encounter for Creature Entry %u may not work properly.", a->GetEntry());
+#define ERROR_INST_DATA(a)          sLog.outError("TSCR: Instance Data for Karazhan not set properly. Encounter for Creature Entry %u may not work properly.", a->GetEntry());
 #endif
 
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
index 7dc8db7ce15..15be0f2f87a 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
@@ -63,7 +63,7 @@ struct boss_selin_fireheartAI : public ScriptedAI
             for (uint8 i = 0; i < size; ++i)
             {
                 uint64 guid = pInstance->GetData64(DATA_FEL_CRYSTAL);
-                debug_log("TSCR: Selin: Adding Fel Crystal %u to list", guid);
+                sLog.outDebug("TSCR: Selin: Adding Fel Crystal %u to list", guid);
                 Crystals.push_back(guid);
             }
         }
@@ -108,7 +108,7 @@ struct boss_selin_fireheartAI : public ScriptedAI
                                                             // Small door opened after event are expected to be closed by default
             // Set Inst data for encounter
             pInstance->SetData(DATA_SELIN_EVENT, NOT_STARTED);
-        } else error_log(ERROR_INST_DATA);
+        } else sLog.outError(ERROR_INST_DATA);
 
         DrainLifeTimer = 3000 + rand()%4000;
         DrainManaTimer = DrainLifeTimer + 5000;
@@ -208,7 +208,7 @@ struct boss_selin_fireheartAI : public ScriptedAI
             else
             {
                 // Make an error message in case something weird happened here
-                error_log("TSCR: Selin Fireheart unable to drain crystal as the crystal is either dead or despawned");
+                sLog.outError("TSCR: Selin Fireheart unable to drain crystal as the crystal is either dead or despawned");
                 DrainingCrystal = false;
             }
         }
@@ -340,7 +340,7 @@ struct mob_fel_crystalAI : public ScriptedAI
                     }
                 }
             }
-        } else error_log(ERROR_INST_DATA);
+        } else sLog.outError(ERROR_INST_DATA);
     }
 };
 
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
index 715261f8239..ff8b0b88786 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
@@ -169,7 +169,7 @@ struct instance_magisters_terrace : public ScriptedInstance
             {
                 if (FelCrystals.empty())
                 {
-                    error_log("TSCR: Magisters Terrace: No Fel Crystals loaded in Inst Data");
+                    sLog.outError("TSCR: Magisters Terrace: No Fel Crystals loaded in Inst Data");
                     return 0;
                 }
 
diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
index f801f7e872e..9dcfc4ad459 100644
--- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
@@ -199,7 +199,7 @@ void npc_unworthy_initiateAI::UpdateAI(const uint32 diff)
                 anchorGUID = anchor->GetGUID();
             }
             else
-                error_log("npc_unworthy_initiateAI: unable to find anchor!");
+                sLog.outError("npc_unworthy_initiateAI: unable to find anchor!");
 
             float dist = 99.0f;
             GameObject *prison = NULL;
@@ -219,7 +219,7 @@ void npc_unworthy_initiateAI::UpdateAI(const uint32 diff)
             if (prison)
                 prison->ResetDoorOrButton();
             else
-                error_log("npc_unworthy_initiateAI: unable to find prison!");
+                sLog.outError("npc_unworthy_initiateAI: unable to find prison!");
         }
         return;
     case PHASE_TO_EQUIP:
@@ -230,7 +230,7 @@ void npc_unworthy_initiateAI::UpdateAI(const uint32 diff)
             else
             {
                 me->GetMotionMaster()->MovePoint(1, anchorX, anchorY, me->GetPositionZ());
-                //debug_log("npc_unworthy_initiateAI: move to %f %f %f", anchorX, anchorY, me->GetPositionZ());
+                //sLog.outDebug("npc_unworthy_initiateAI: move to %f %f %f", anchorX, anchorY, me->GetPositionZ());
                 phase = PHASE_EQUIPING;
                 wait_timer = 0;
             }
@@ -989,9 +989,9 @@ bool GOHello_go_inconspicuous_mine_car(Player* pPlayer, GameObject* /*pGO*/)
                 {
                     car->AI()->SetGUID(miner->GetGUID());
                     CAST_AI(npc_scarlet_minerAI, miner->AI())->InitCartQuest(pPlayer);
-                } else error_log("TSCR: GOHello_go_inconspicuous_mine_car vehicle entry is not correct.");
-            } else error_log("TSCR: GOHello_go_inconspicuous_mine_car player is not on the vehicle.");
-        } else error_log("TSCR: GOHello_go_inconspicuous_mine_car Scarlet Miner cant be found by script.");
+                } else sLog.outError("TSCR: GOHello_go_inconspicuous_mine_car vehicle entry is not correct.");
+            } else sLog.outError("TSCR: GOHello_go_inconspicuous_mine_car player is not on the vehicle.");
+        } else sLog.outError("TSCR: GOHello_go_inconspicuous_mine_car Scarlet Miner cant be found by script.");
     }
     return true;
 }
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp
index 191be16cd19..ce5794237f1 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp
@@ -112,7 +112,7 @@ struct instance_stratholme : public ScriptedInstance
             return true;
         }
 
-        debug_log("TSCR: Instance Stratholme: Cannot open slaugther square yet.");
+        sLog.outDebug("TSCR: Instance Stratholme: Cannot open slaugther square yet.");
         return false;
     }
 
@@ -208,7 +208,7 @@ struct instance_stratholme : public ScriptedInstance
                     break;
                 Encounter[0] = data;
                 BaronRun_Timer = 2700000;
-                debug_log("TSCR: Instance Stratholme: Baron run in progress.");
+                sLog.outDebug("TSCR: Instance Stratholme: Baron run in progress.");
                 break;
             case FAIL:
                 //may add code to remove aura from players, but in theory the time should be up already and removed.
@@ -266,10 +266,10 @@ struct instance_stratholme : public ScriptedInstance
                     //UpdateGoState(ziggurat4GUID,0,true);
                     if (Creature* pBaron = instance->GetCreature(baronGUID))
                         pBaron->SummonCreature(C_RAMSTEIN,4032.84,-3390.24,119.73,4.71,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,1800000);
-                    debug_log("TSCR: Instance Stratholme: Ramstein spawned.");
+                    sLog.outDebug("TSCR: Instance Stratholme: Ramstein spawned.");
                 }
                 else
-                    debug_log("TSCR: Instance Stratholme: %u Abomnation left to kill.",count);
+                    sLog.outDebug("TSCR: Instance Stratholme: %u Abomnation left to kill.",count);
             }
 
             if (data == NOT_STARTED)
@@ -278,7 +278,7 @@ struct instance_stratholme : public ScriptedInstance
             if (data == DONE)
             {
                 SlaugtherSquare_Timer = 300000;
-                debug_log("TSCR: Instance Stratholme: Slaugther event will continue in 5 minutes.");
+                sLog.outDebug("TSCR: Instance Stratholme: Slaugther event will continue in 5 minutes.");
             }
             Encounter[4] = data;
             break;
@@ -419,7 +419,7 @@ struct instance_stratholme : public ScriptedInstance
                 if (GetData(TYPE_BARON_RUN) != DONE)
                     SetData(TYPE_BARON_RUN, FAIL);
                 BaronRun_Timer = 0;
-                debug_log("TSCR: Instance Stratholme: Baron run event reached end. Event has state %u.",GetData(TYPE_BARON_RUN));
+                sLog.outDebug("TSCR: Instance Stratholme: Baron run event reached end. Event has state %u.",GetData(TYPE_BARON_RUN));
             } else BaronRun_Timer -= diff;
         }
 
@@ -434,7 +434,7 @@ struct instance_stratholme : public ScriptedInstance
 
                     HandleGameObject(ziggurat4GUID, true);
                     HandleGameObject(ziggurat5GUID, true);
-                    debug_log("TSCR: Instance Stratholme: Black guard sentries spawned. Opening gates to baron.");
+                    sLog.outDebug("TSCR: Instance Stratholme: Black guard sentries spawned. Opening gates to baron.");
                 }
                 SlaugtherSquare_Timer = 0;
             } else SlaugtherSquare_Timer -= diff;
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp
index 52ded56c5ae..2bf2967c914 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp
@@ -143,7 +143,7 @@ struct boss_brutallusAI : public ScriptedAI
     {
         if (!Intro || IsIntro)
             return;
-        error_log("Start Intro");
+        sLog.outError("Start Intro");
         Creature *Madrigosa = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_MADRIGOSA) : 0);
         if (Madrigosa)
         {
@@ -158,7 +158,7 @@ struct boss_brutallusAI : public ScriptedAI
         }else
         {
             //Madrigosa not found, end intro
-            error_log("Madrigosa was not found");
+            sLog.outError("Madrigosa was not found");
             EndIntro();
         }
     }
@@ -168,7 +168,7 @@ struct boss_brutallusAI : public ScriptedAI
         me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
         Intro = false;
         IsIntro = false;
-        error_log("End Intro");
+        sLog.outError("End Intro");
     }
 
     void AttackStart(Unit* pWho)
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
index 3c1ae1a1723..c41b213bd6a 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
@@ -260,7 +260,7 @@ struct boss_kalecgosAI : public ScriptedAI
                     }
                     else
                     {
-                        error_log("TSCR: Didn't find Shathrowar. Kalecgos event reseted.");
+                        sLog.outError("TSCR: Didn't find Shathrowar. Kalecgos event reseted.");
                         EnterEvadeMode();
                         return;
                     }
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
index 7bd3273d9f2..d80153c14f5 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
@@ -727,7 +727,7 @@ struct boss_kiljaedenAI : public Scripted_NoMovementAI
                             if (pRandomPlayer)
                                 DoCast(pRandomPlayer, SPELL_LEGION_LIGHTNING, false);
                             else
-                                error_log("try to cast SPELL_LEGION_LIGHTNING on invalid target");
+                                sLog.outError("try to cast SPELL_LEGION_LIGHTNING on invalid target");
                             
                             Timer[TIMER_LEGION_LIGHTNING] = (Phase == PHASE_SACRIFICE) ? 18000 : 30000; // 18 seconds in PHASE_SACRIFICE
                             Timer[TIMER_SOUL_FLAY] = 2500;
@@ -1341,7 +1341,7 @@ struct mob_sinster_reflectionAI : public ScriptedAI
                 DoMeleeAttackIfReady();
                 break;
             }
-            debug_log("Sinister-Timer");
+            sLog.outDebug("Sinister-Timer");
             for (uint8 i = 0; i < 3; ++i)
                 uiTimer[i] -= diff;            
         }
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp
index 5ad630840ea..12e94c2f33d 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp
@@ -110,7 +110,7 @@ struct instance_sunwell_plateau : public ScriptedInstance
             }
         }
 
-        debug_log("TSCR: Instance Sunwell Plateau: GetPlayerInMap, but PlayerList is empty!");
+        sLog.outDebug("TSCR: Instance Sunwell Plateau: GetPlayerInMap, but PlayerList is empty!");
         return NULL;
     }
 
diff --git a/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp b/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp
index 3641f901453..957dbec7ba5 100644
--- a/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp
+++ b/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp
@@ -436,7 +436,7 @@ bool GOHello_go_altar_of_the_keepers(Player* pPlayer, GameObject* /*pGo*/)
 
     //if (altarOfTheKeeperCounter < NUMBER_NEEDED_TO_ACTIVATE)
     //{
-          //error_log("not enough people yet, altarOfTheKeeperCounter = %d", altarOfTheKeeperCounter);
+          //sLog.outError("not enough people yet, altarOfTheKeeperCounter = %d", altarOfTheKeeperCounter);
     //    return false; // not enough people yet
     //}
 /*
@@ -446,7 +446,7 @@ bool GOHello_go_altar_of_the_keepers(Player* pPlayer, GameObject* /*pGo*/)
     for (uint8 x = 0; x < 5; ++x)
     {
         pTarget = Unit::GetUnit(*pPlayer, altarOfTheKeeperCount[x]);
-        //error_log("number of people currently activating it: %d", x+1);
+        //sLog.outError("number of people currently activating it: %d", x+1);
         if (!pTarget)
             continue;
         if (pTarget->IsNonMeleeSpellCasted(true))
@@ -457,11 +457,11 @@ bool GOHello_go_altar_of_the_keepers(Player* pPlayer, GameObject* /*pGo*/)
 
     if (count < NUMBER_NEEDED_TO_ACTIVATE)
     {
-        //error_log("still not enough people");
+        //sLog.outError("still not enough people");
         return true; // not enough people
     }
 */
-    //error_log ("activating stone keepers");
+    //sLog.outError ("activating stone keepers");
     pInstance->SetData(NULL,1); // activate the Stone Keepers
     return true;
 }
diff --git a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp
index 9720d6caa79..f09f9268395 100644
--- a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp
+++ b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp
@@ -215,7 +215,7 @@ struct instance_uldaman : public ScriptedInstance
 
     void SetData (uint32 /*type*/, uint32 data)
     {
-        //error_log ("SetData: data = %d", data);
+        //sLog.outError ("SetData: data = %d", data);
         if (data == 0) OpenDoor (altarOfTheKeeperTempleDoor);
         if (data == 0) OpenDoor (archaedasTempleDoor);
         if (data == 3) OpenDoor (ancientVaultDoor);
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
index 64ad50ea70f..9ab4937163a 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
@@ -242,7 +242,7 @@ struct boss_janalaiAI : public ScriptedAI
             cell.Visit(pair, cSearcher, *(me->GetMap()));
         }
 
-        //error_log("Eggs %d at middle", templist.size());
+        //sLog.outError("Eggs %d at middle", templist.size());
         if (!templist.size())
             return false;
 
@@ -508,7 +508,7 @@ struct mob_amanishi_hatcherAI : public ScriptedAI
             cell.Visit(pair, cSearcher, *(me->GetMap()));
         }
 
-        //error_log("Eggs %d at %d", templist.size(), side);
+        //sLog.outError("Eggs %d at %d", templist.size(), side);
 
         for (std::list::const_iterator i = templist.begin(); i != templist.end() && num > 0; ++i)
             if ((*i)->GetDisplayId() != 11686)
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
index 4758faf1ddf..1f74fdf4d7f 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
@@ -172,7 +172,7 @@ struct instance_zulaman : public ScriptedInstance
         ss << "S " << BossKilled << " " << ChestLooted << " " << QuestMinute;
         char* data = new char[ss.str().length()+1];
         strcpy(data, ss.str().c_str());
-        //error_log("TSCR: Zul'aman saved, %s.", data);
+        //sLog.outError("TSCR: Zul'aman saved, %s.", data);
         return data;
     }
 
@@ -180,17 +180,17 @@ struct instance_zulaman : public ScriptedInstance
     {
         if (!load) return;
         std::istringstream ss(load);
-        //error_log("TSCR: Zul'aman loaded, %s.", ss.str().c_str());
+        //sLog.outError("TSCR: Zul'aman loaded, %s.", ss.str().c_str());
         char dataHead; // S
         uint16 data1, data2, data3;
         ss >> dataHead >> data1 >> data2 >> data3;
-        //error_log("TSCR: Zul'aman loaded, %d %d %d.", data1, data2, data3);
+        //sLog.outError("TSCR: Zul'aman loaded, %d %d %d.", data1, data2, data3);
         if (dataHead == 'S')
         {
             BossKilled = data1;
             ChestLooted = data2;
             QuestMinute = data3;
-        } else error_log("TSCR: Zul'aman: corrupted save data.");
+        } else sLog.outError("TSCR: Zul'aman: corrupted save data.");
     }
 
     void SetData(uint32 type, uint32 data)
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
index ecc458c19c5..a309028b67d 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
@@ -170,7 +170,7 @@ struct boss_arlokkAI : public ScriptedAI
                     MarkedTargetGUID = pMarkedTarget->GetGUID();
                 }
                 else
-                    error_log("TSCR: boss_arlokk could not accuire pMarkedTarget.");
+                    sLog.outError("TSCR: boss_arlokk could not accuire pMarkedTarget.");
 
                 m_uiMark_Timer = 15000;
             }
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp
index c2c040dc696..a72598c0e7d 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp
@@ -105,7 +105,7 @@ bool GossipSelect_npc_jaina_proudmoore(Player* pPlayer, Creature* pCreature, uin
             break;
          case GOSSIP_ACTION_INFO_DEF:
             ai->Debug = !ai->Debug;
-            debug_log("TSCR: HyjalAI - Debug mode has been toggled");
+            sLog.outDebug("TSCR: HyjalAI - Debug mode has been toggled");
             break;
     }
     return true;
@@ -175,7 +175,7 @@ bool GossipSelect_npc_thrall(Player* pPlayer, Creature* pCreature, uint32 /*uiSe
             break;
         case GOSSIP_ACTION_INFO_DEF:
             ai->Debug = !ai->Debug;
-            debug_log("TSCR: HyjalAI - Debug mode has been toggled");
+            sLog.outDebug("TSCR: HyjalAI - Debug mode has been toggled");
             break;
     }
     return true;
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
index 6f12692d164..c329c659419 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
@@ -400,7 +400,7 @@ void hyjalAI::Reset()
             pInstance->DoUpdateWorldState(WORLD_STATE_ENEMYCOUNT, 0);
             pInstance->SetData(DATA_RESET_TRASH_COUNT, 0);
         }
-    } else error_log(ERROR_INST_DATA);
+    } else sLog.outError(ERROR_INST_DATA);
 
     //Visibility
     DoHide = true;
@@ -531,7 +531,7 @@ void hyjalAI::SummonNextWave(Wave wave[18], uint32 Count, float Base[4][3])
 
     if (!pInstance)
     {
-        error_log(ERROR_INST_DATA);
+        sLog.outError(ERROR_INST_DATA);
         return;
     }
     InfernalCount = 0;//reset infernal count every new wave
@@ -561,7 +561,7 @@ void hyjalAI::SummonNextWave(Wave wave[18], uint32 Count, float Base[4][3])
         else
         {
             NextWaveTimer = 15000;
-            debug_log("TSCR: HyjalAI: debug mode is enabled. Next Wave in 15 seconds");
+            sLog.outDebug("TSCR: HyjalAI: debug mode is enabled. Next Wave in 15 seconds");
         }
     }
     else
@@ -605,7 +605,7 @@ uint32 hyjalAI::GetInstanceData(uint32 Event)
 {
     if (pInstance)
         return pInstance->GetData(Event);
-    else error_log(ERROR_INST_DATA);
+    else sLog.outError(ERROR_INST_DATA);
 
     return 0;
 }
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
index 07decc11387..54007a11ecd 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
@@ -248,7 +248,7 @@ struct instance_mount_hyjal : public ScriptedInstance
                 break;
         }
 
-         debug_log("TSCR: Instance Hyjal: Instance data updated for event %u (Data=%u)",type,data);
+         sLog.outDebug("TSCR: Instance Hyjal: Instance data updated for event %u (Data=%u)",type,data);
 
         if (data == DONE)
         {
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp
index fdeb56f4c54..b31c265575e 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp
@@ -305,7 +305,7 @@ struct npc_time_riftAI : public ScriptedAI
             mRiftWaveCount = 0;
 
         entry = PortalWaves[mWaveId].PortalMob[mRiftWaveCount];
-        debug_log("TSCR: npc_time_rift: summoning wave Creature (Wave %u, Entry %u).",mRiftWaveCount,entry);
+        sLog.outDebug("TSCR: npc_time_rift: summoning wave Creature (Wave %u, Entry %u).",mRiftWaveCount,entry);
 
         ++mRiftWaveCount;
 
@@ -330,7 +330,7 @@ struct npc_time_riftAI : public ScriptedAI
         if (me->IsNonMeleeSpellCasted(false))
             return;
 
-        debug_log("TSCR: npc_time_rift: not casting anylonger, i need to die.");
+        sLog.outDebug("TSCR: npc_time_rift: not casting anylonger, i need to die.");
         me->setDeathState(JUST_DIED);
 
         if (pInstance->GetData(TYPE_RIFT) == IN_PROGRESS)
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp
index a98d5f80eee..58120d6dc55 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp
@@ -178,7 +178,7 @@ struct instance_dark_portal : public ScriptedInstance
             {
                 if (data == IN_PROGRESS)
                 {
-                    debug_log("TSCR: Instance Dark Portal: Starting event.");
+                    sLog.outDebug("TSCR: Instance Dark Portal: Starting event.");
                     InitWorldState();
                     m_auiEncounter[1] = IN_PROGRESS;
                     NextPortal_Timer = 15000;
@@ -187,7 +187,7 @@ struct instance_dark_portal : public ScriptedInstance
                 if (data == DONE)
                 {
                     //this may be completed further out in the post-event
-                    debug_log("TSCR: Instance Dark Portal: Event completed.");
+                    sLog.outDebug("TSCR: Instance Dark Portal: Event completed.");
                     Map::PlayerList const& players = instance->GetPlayers();
 
                     if (!players.isEmpty())
@@ -252,7 +252,7 @@ struct instance_dark_portal : public ScriptedInstance
         if (entry == RIFT_BOSS)
             entry = RandRiftBoss();
 
-        debug_log("TSCR: Instance Dark Portal: Summoning rift boss entry %u.",entry);
+        sLog.outDebug("TSCR: Instance Dark Portal: Summoning rift boss entry %u.",entry);
 
         Position pos;
         me->GetRandomNearPosition(pos, 10.0f);
@@ -263,7 +263,7 @@ struct instance_dark_portal : public ScriptedInstance
         if (Creature *summon = me->SummonCreature(entry, pos, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000))
             return summon;
 
-        debug_log("TSCR: Instance Dark Portal: What just happened there? No boss, no loot, no fun...");
+        sLog.outDebug("TSCR: Instance Dark Portal: What just happened there? No boss, no loot, no fun...");
         return NULL;
     }
 
@@ -276,7 +276,7 @@ struct instance_dark_portal : public ScriptedInstance
             if (tmp >= CurrentRiftId)
                 ++tmp;
 
-            debug_log("TSCR: Instance Dark Portal: Creating Time Rift at locationId %i (old locationId was %u).",tmp,CurrentRiftId);
+            sLog.outDebug("TSCR: Instance Dark Portal: Creating Time Rift at locationId %i (old locationId was %u).",tmp,CurrentRiftId);
 
             CurrentRiftId = tmp;
 
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
index 463461dcc1d..c6511af2a65 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
@@ -71,7 +71,7 @@ struct instance_old_hillsbrad : public ScriptedInstance
             }
         }
 
-        debug_log("TSCR: Instance Old Hillsbrad: GetPlayerInMap, but PlayerList is empty!");
+        sLog.outDebug("TSCR: Instance Old Hillsbrad: GetPlayerInMap, but PlayerList is empty!");
         return NULL;
     }
 
@@ -111,7 +111,7 @@ struct instance_old_hillsbrad : public ScriptedInstance
 
         if (!pPlayer)
         {
-            debug_log("TSCR: Instance Old Hillsbrad: SetData (Type: %u Data %u) cannot find any player.", type, data);
+            sLog.outDebug("TSCR: Instance Old Hillsbrad: SetData (Type: %u Data %u) cannot find any player.", type, data);
             return;
         }
 
@@ -127,7 +127,7 @@ struct instance_old_hillsbrad : public ScriptedInstance
                     ++mBarrelCount;
                     DoUpdateWorldState(WORLD_STATE_OH, mBarrelCount);
 
-                    debug_log("TSCR: Instance Old Hillsbrad: go_barrel_old_hillsbrad count %u",mBarrelCount);
+                    sLog.outDebug("TSCR: Instance Old Hillsbrad: go_barrel_old_hillsbrad count %u",mBarrelCount);
 
                     m_auiEncounter[0] = IN_PROGRESS;
 
@@ -148,7 +148,7 @@ struct instance_old_hillsbrad : public ScriptedInstance
                     {
                         ++mThrallEventCount;
                         m_auiEncounter[1] = NOT_STARTED;
-                        debug_log("TSCR: Instance Old Hillsbrad: Thrall event failed %u times. Resetting all sub-events.",mThrallEventCount);
+                        sLog.outDebug("TSCR: Instance Old Hillsbrad: Thrall event failed %u times. Resetting all sub-events.",mThrallEventCount);
                         m_auiEncounter[2] = NOT_STARTED;
                         m_auiEncounter[3] = NOT_STARTED;
                         m_auiEncounter[4] = NOT_STARTED;
@@ -161,29 +161,29 @@ struct instance_old_hillsbrad : public ScriptedInstance
                         m_auiEncounter[3] = data;
                         m_auiEncounter[4] = data;
                         m_auiEncounter[5] = data;
-                        debug_log("TSCR: Instance Old Hillsbrad: Thrall event failed %u times. Resetting all sub-events.",mThrallEventCount);
+                        sLog.outDebug("TSCR: Instance Old Hillsbrad: Thrall event failed %u times. Resetting all sub-events.",mThrallEventCount);
                     }
                 }
                 else
                     m_auiEncounter[1] = data;
-                debug_log("TSCR: Instance Old Hillsbrad: Thrall escort event adjusted to data %u.",data);
+                sLog.outDebug("TSCR: Instance Old Hillsbrad: Thrall escort event adjusted to data %u.",data);
                 break;
             }
             case TYPE_THRALL_PART1:
                 m_auiEncounter[2] = data;
-                debug_log("TSCR: Instance Old Hillsbrad: Thrall event part I adjusted to data %u.",data);
+                sLog.outDebug("TSCR: Instance Old Hillsbrad: Thrall event part I adjusted to data %u.",data);
                 break;
             case TYPE_THRALL_PART2:
                 m_auiEncounter[3] = data;
-                debug_log("TSCR: Instance Old Hillsbrad: Thrall event part II adjusted to data %u.",data);
+                sLog.outDebug("TSCR: Instance Old Hillsbrad: Thrall event part II adjusted to data %u.",data);
                 break;
             case TYPE_THRALL_PART3:
                 m_auiEncounter[4] = data;
-                debug_log("TSCR: Instance Old Hillsbrad: Thrall event part III adjusted to data %u.",data);
+                sLog.outDebug("TSCR: Instance Old Hillsbrad: Thrall event part III adjusted to data %u.",data);
                 break;
             case TYPE_THRALL_PART4:
                 m_auiEncounter[5] = data;
-                 debug_log("TSCR: Instance Old Hillsbrad: Thrall event part IV adjusted to data %u.",data);
+                 sLog.outDebug("TSCR: Instance Old Hillsbrad: Thrall event part IV adjusted to data %u.",data);
                 break;
         }
     }
diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp
index eddf965a99e..7ba2ebd5bc2 100644
--- a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp
@@ -53,7 +53,7 @@ struct instance_razorfen_kraul : public ScriptedInstance
                     return plr;
             }
         }
-        debug_log("TSCR: Instance Razorfen Kraul: GetPlayerInMap, but PlayerList is empty!");
+        sLog.outDebug("TSCR: Instance Razorfen Kraul: GetPlayerInMap, but PlayerList is empty!");
         return NULL;
     }
 
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
index 9e53596c9fe..44a6409982a 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
@@ -168,7 +168,7 @@ struct eye_of_cthunAI : public Scripted_NoMovementAI
     {
         pInst = c->GetInstanceData();
         if (!pInst)
-            error_log("TSCR: No Instance eye_of_cthunAI");
+            sLog.outError("TSCR: No Instance eye_of_cthunAI");
     }
 
     ScriptedInstance* pInst;
@@ -460,7 +460,7 @@ struct cthunAI : public Scripted_NoMovementAI
 
         pInst = c->GetInstanceData();
         if (!pInst)
-            error_log("TSCR: No Instance eye_of_cthunAI");
+            sLog.outError("TSCR: No Instance eye_of_cthunAI");
     }
 
     ScriptedInstance* pInst;
diff --git a/src/server/scripts/Kalimdor/azuremyst_isle.cpp b/src/server/scripts/Kalimdor/azuremyst_isle.cpp
index 780f1f41f0c..e1a63062439 100644
--- a/src/server/scripts/Kalimdor/azuremyst_isle.cpp
+++ b/src/server/scripts/Kalimdor/azuremyst_isle.cpp
@@ -512,7 +512,7 @@ struct npc_geezleAI : public ScriptedAI
                 else
                     (*itr)->Respawn();
             }
-        } else error_log("SD2 ERROR: FlagList is empty!");
+        } else sLog.outError("SD2 ERROR: FlagList is empty!");
     }
 
     void UpdateAI(const uint32 diff)
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
index b815e0172ec..ac774c6512e 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
@@ -182,7 +182,7 @@ struct boss_gothikAI : public BossAI
 
         if (LiveTriggerGUID.size() < POS_LIVE || DeadTriggerGUID.size() < POS_DEAD)
         {
-            error_log("Script Gothik: cannot summon triggers!");
+            sLog.outError("Script Gothik: cannot summon triggers!");
             EnterEvadeMode();
             return;
         }
diff --git a/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp
index c238e55675b..37dbce59c74 100644
--- a/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp
+++ b/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp
@@ -633,7 +633,7 @@ struct dummy_dragonAI : public ScriptedAI
         if (!pInstance || uiType != POINT_MOTION_TYPE)
             return;
 
-        debug_log("dummy_dragonAI: %s reached point %u", me->GetName(), uiPointId);
+        sLog.outDebug("dummy_dragonAI: %s reached point %u", me->GetName(), uiPointId);
 
         //if healers messed up the raid and we was already initialized
         if (pInstance->GetData(TYPE_SARTHARION_EVENT) != IN_PROGRESS)
@@ -790,7 +790,7 @@ struct dummy_dragonAI : public ScriptedAI
                     me->GetMotionMaster()->MovePoint(m_uiWaypointId,
                         m_aDragonCommon[m_uiWaypointId].m_fX, m_aDragonCommon[m_uiWaypointId].m_fY, m_aDragonCommon[m_uiWaypointId].m_fZ);
 
-                debug_log("dummy_dragonAI: %s moving to point %u", me->GetName(), m_uiWaypointId);
+                sLog.outDebug("dummy_dragonAI: %s moving to point %u", me->GetName(), m_uiWaypointId);
                 m_uiMoveNextTimer = 0;
             }
             else
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp
index 67fb0a09755..3e39de32fba 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp
@@ -109,7 +109,7 @@ struct instance_utgarde_keep : public ScriptedInstance
             }
         }
 
-        debug_log("TSCR: Instance Utgarde Keep: GetPlayerInMap, but PlayerList is empty!");
+        sLog.outDebug("TSCR: Instance Utgarde Keep: GetPlayerInMap, but PlayerList is empty!");
         return NULL;
     }
 
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp
index 9b4ecca6579..f3f754ec296 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp
@@ -96,7 +96,7 @@ struct instance_shadow_labyrinth : public ScriptedInstance
                 if (pCreature->isAlive())
                 {
                     ++m_uiFelOverseerCount;
-                    debug_log("TSCR: Shadow Labyrinth: counting %u Fel Overseers.",m_uiFelOverseerCount);
+                    sLog.outDebug("TSCR: Shadow Labyrinth: counting %u Fel Overseers.",m_uiFelOverseerCount);
                 }
                 break;
         }
@@ -113,7 +113,7 @@ struct instance_shadow_labyrinth : public ScriptedInstance
             case TYPE_OVERSEER:
                 if (uiData != DONE)
                 {
-                    error_log("TSCR: Shadow Labyrinth: TYPE_OVERSEER did not expect other data than DONE");
+                    sLog.outError("TSCR: Shadow Labyrinth: TYPE_OVERSEER did not expect other data than DONE");
                     return;
                 }
                 if (m_uiFelOverseerCount)
@@ -121,11 +121,11 @@ struct instance_shadow_labyrinth : public ScriptedInstance
                     --m_uiFelOverseerCount;
 
                     if (m_uiFelOverseerCount)
-                        debug_log("TSCR: Shadow Labyrinth: %u Fel Overseers left to kill.",m_uiFelOverseerCount);
+                        sLog.outDebug("TSCR: Shadow Labyrinth: %u Fel Overseers left to kill.",m_uiFelOverseerCount);
                     else
                     {
                         m_auiEncounter[1] = DONE;
-                        debug_log("TSCR: Shadow Labyrinth: TYPE_OVERSEER == DONE");
+                        sLog.outDebug("TSCR: Shadow Labyrinth: TYPE_OVERSEER == DONE");
                     }
                 }
                 break;
diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
index 590e51d9eab..64fed0967d9 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
@@ -2065,7 +2065,7 @@ void boss_illidan_stormrageAI::SummonMaiev()
     {
         EnterEvadeMode();
         me->MonsterTextEmote(EMOTE_UNABLE_TO_SUMMON, 0);
-        error_log("SD2 ERROR: Unable to summon Maiev Shadowsong (entry: 23197). Check your database to see if you have the proper SQL for Maiev Shadowsong (entry: 23197)");
+        sLog.outError("SD2 ERROR: Unable to summon Maiev Shadowsong (entry: 23197). Check your database to see if you have the proper SQL for Maiev Shadowsong (entry: 23197)");
     }
 }
 
diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
index 663faceb672..38ce3f2590d 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
@@ -276,7 +276,7 @@ struct boss_shade_of_akamaAI : public ScriptedAI
                         GridSearcherSucceeded = true;
                     }
                 }
-            } else error_log("SD2 ERROR: No Channelers are stored in the list. This encounter will not work properly");
+            } else sLog.outError("SD2 ERROR: No Channelers are stored in the list. This encounter will not work properly");
         }
     }
 
@@ -293,13 +293,13 @@ struct boss_shade_of_akamaAI : public ScriptedAI
         if (reseting)
             return;
 
-        debug_log("TSCR: Increasing Death Count for Shade of Akama encounter");
+        sLog.outDebug("TSCR: Increasing Death Count for Shade of Akama encounter");
         ++DeathCount;
         me->RemoveAuraFromStack(SPELL_SHADE_SOUL_CHANNEL_2);
         if (guid)
         {
             if (Sorcerers.empty())
-                error_log("SD2 ERROR: Shade of Akama - attempt to remove guid %u from Sorcerers list but list is already empty", guid);
+                sLog.outError("SD2 ERROR: Shade of Akama - attempt to remove guid %u from Sorcerers list but list is already empty", guid);
             else  Sorcerers.remove(guid);
         }
     }
@@ -351,17 +351,17 @@ struct boss_shade_of_akamaAI : public ScriptedAI
             {
                 CAST_AI(mob_ashtongue_channelerAI, (*itr)->AI())->ShadeGUID = me->GetGUID();
                 Channelers.push_back((*itr)->GetGUID());
-                debug_log("TSCR: Shade of Akama Grid Search found channeler %u. Adding to list", (*itr)->GetGUID());
+                sLog.outDebug("TSCR: Shade of Akama Grid Search found channeler %u. Adding to list", (*itr)->GetGUID());
             }
         }
-        else error_log("SD2 ERROR: Grid Search was unable to find any channelers. Shade of Akama encounter will be buggy");
+        else sLog.outError("SD2 ERROR: Grid Search was unable to find any channelers. Shade of Akama encounter will be buggy");
     }
 
     void SetSelectableChannelers()
     {
         if (Channelers.empty())
         {
-            error_log("SD2 ERROR: Channeler List is empty, Shade of Akama encounter will be buggy");
+            sLog.outError("SD2 ERROR: Channeler List is empty, Shade of Akama encounter will be buggy");
             return;
         }
 
@@ -485,7 +485,7 @@ void mob_ashtongue_channelerAI::JustDied(Unit* /*killer*/)
     Creature* Shade = (Unit::GetCreature((*me), ShadeGUID));
     if (Shade && Shade->isAlive())
         CAST_AI(boss_shade_of_akamaAI, Shade->AI())->IncrementDeathCount();
-    else error_log("SD2 ERROR: Channeler dead but unable to increment DeathCount for Shade of Akama.");
+    else sLog.outError("SD2 ERROR: Channeler dead but unable to increment DeathCount for Shade of Akama.");
 }
 
 void mob_ashtongue_sorcererAI::JustDied(Unit* /*killer*/)
@@ -493,7 +493,7 @@ void mob_ashtongue_sorcererAI::JustDied(Unit* /*killer*/)
     Creature* Shade = (Unit::GetCreature((*me), ShadeGUID));
     if (Shade && Shade->isAlive())
         CAST_AI(boss_shade_of_akamaAI, Shade->AI())->IncrementDeathCount(me->GetGUID());
-    else error_log("SD2 ERROR: Sorcerer dead but unable to increment DeathCount for Shade of Akama.");
+    else sLog.outError("SD2 ERROR: Sorcerer dead but unable to increment DeathCount for Shade of Akama.");
 }
 
 struct npc_akamaAI : public ScriptedAI
diff --git a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp
index 132da7d7bd1..52ccd1c6434 100644
--- a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp
+++ b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp
@@ -143,7 +143,7 @@ struct mob_blood_elf_council_voice_triggerAI : public ScriptedAI
             Council[1] = pInstance->GetData64(DATA_VERASDARKSHADOW);
             Council[2] = pInstance->GetData64(DATA_LADYMALANDE);
             Council[3] = pInstance->GetData64(DATA_HIGHNETHERMANCERZEREVOR);
-        } else error_log(ERROR_INST_DATA);
+        } else sLog.outError(ERROR_INST_DATA);
     }
 
     void EnterCombat(Unit* /*who*/) {}
@@ -375,7 +375,7 @@ struct boss_illidari_councilAI : public ScriptedAI
         }
         else
         {
-            error_log(ERROR_INST_DATA);
+            sLog.outError(ERROR_INST_DATA);
             EnterEvadeMode();
             return;
         }
@@ -423,7 +423,7 @@ struct boss_illidari_councilAI : public ScriptedAI
     {
         if (!pInstance)
         {
-            error_log(ERROR_INST_DATA);
+            sLog.outError(ERROR_INST_DATA);
             return;
         }
 
diff --git a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
index 5af96257887..384c9b32ff8 100644
--- a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
+++ b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
@@ -124,7 +124,7 @@ struct instance_black_temple : public ScriptedInstance
             }
         }
 
-        debug_log("TSCR: Instance Black Temple: GetPlayerInMap, but PlayerList is empty!");
+        sLog.outDebug("TSCR: Instance Black Temple: GetPlayerInMap, but PlayerList is empty!");
         return NULL;
     }
 
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
index 2669c8ed48d..5d60bc7f3e6 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
@@ -119,7 +119,7 @@ struct instance_steam_vault : public ScriptedInstance
                     if (GetData(TYPE_MEKGINEER_STEAMRIGGER) == SPECIAL)
                         HandleGameObject(MainChambersDoor, true);
 
-                    debug_log("TSCR: Instance Steamvault: Access panel used.");
+                    sLog.outDebug("TSCR: Instance Steamvault: Access panel used.");
                 }
                 m_auiEncounter[0] = data;
                 break;
@@ -131,7 +131,7 @@ struct instance_steam_vault : public ScriptedInstance
                     if (GetData(TYPE_HYDROMANCER_THESPIA) == SPECIAL)
                         HandleGameObject(MainChambersDoor, true);
 
-                    debug_log("TSCR: Instance Steamvault: Access panel used.");
+                    sLog.outDebug("TSCR: Instance Steamvault: Access panel used.");
                 }
                 m_auiEncounter[1] = data;
                 break;
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
index 76425e351cf..500892129c2 100644
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
@@ -51,7 +51,7 @@ struct instance_ramparts : public ScriptedInstance
 
     void SetData(uint32 uiType, uint32 uiData)
     {
-        debug_log("TSCR: Instance Ramparts: SetData received for type %u with data %u",uiType,uiData);
+        sLog.outDebug("TSCR: Instance Ramparts: SetData received for type %u with data %u",uiType,uiData);
 
         switch(uiType)
         {
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
index 276fe844e32..671821d8924 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
@@ -356,7 +356,7 @@ struct boss_kaelthasAI : public ScriptedAI
 
         if (!m_auiAdvisorGuid[0] || !m_auiAdvisorGuid[1] || !m_auiAdvisorGuid[2] || !m_auiAdvisorGuid[3])
         {
-            error_log("TSCR: Kael'Thas One or more advisors missing, Skipping Phases 1-3");
+            sLog.outError("TSCR: Kael'Thas One or more advisors missing, Skipping Phases 1-3");
 
             DoScriptText(SAY_PHASE4_INTRO2, me);
 
@@ -678,7 +678,7 @@ struct boss_kaelthasAI : public ScriptedAI
                         Advisor = Unit::GetCreature((*me), m_auiAdvisorGuid[i]);
 
                         if (!Advisor)
-                            error_log("SD2: Kael'Thas Advisor %u does not exist. Possibly despawned? Incorrectly Killed?", i);
+                            sLog.outError("SD2: Kael'Thas Advisor %u does not exist. Possibly despawned? Incorrectly Killed?", i);
                         else
                             CAST_AI(advisorbase_ai, Advisor->AI())->Revive(pTarget);
                     }
@@ -763,7 +763,7 @@ struct boss_kaelthasAI : public ScriptedAI
                         if (me->getThreatManager().getThreatList().size() >= 2)
                             for (uint32 i = 0; i < 3; ++i)
                         {
-                            debug_log("SD2: Kael'Thas mind control not supported.");
+                            sLog.outDebug("SD2: Kael'Thas mind control not supported.");
                             //DoCast(pUnit, SPELL_MIND_CONTROL);
                         }
 
diff --git a/src/server/scripts/Outland/hellfire_peninsula.cpp b/src/server/scripts/Outland/hellfire_peninsula.cpp
index bafca52e463..8c3355d5238 100644
--- a/src/server/scripts/Outland/hellfire_peninsula.cpp
+++ b/src/server/scripts/Outland/hellfire_peninsula.cpp
@@ -140,7 +140,7 @@ struct npc_ancestral_wolfAI : public npc_escortAI
         if (pCreature->GetOwner() && pCreature->GetOwner()->GetTypeId() == TYPEID_PLAYER)
             Start(false, false, pCreature->GetOwner()->GetGUID());
         else
-            error_log("TRINITY: npc_ancestral_wolf can not obtain owner or owner is not a player.");
+            sLog.outError("TRINITY: npc_ancestral_wolf can not obtain owner or owner is not a player.");
 
         pCreature->SetSpeed(MOVE_WALK, 1.5f);
         Reset();
diff --git a/src/server/scripts/Outland/netherstorm.cpp b/src/server/scripts/Outland/netherstorm.cpp
index a44839eba90..7c5254cace6 100644
--- a/src/server/scripts/Outland/netherstorm.cpp
+++ b/src/server/scripts/Outland/netherstorm.cpp
@@ -463,7 +463,7 @@ struct npc_commander_dawnforgeAI : public ScriptedAI
             return true;
         }
 
-        debug_log("TSCR: npc_commander_dawnforge event already in progress, need to wait.");
+        sLog.outDebug("TSCR: npc_commander_dawnforge event already in progress, need to wait.");
         return false;
     }
 
diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp
index d8dd8c3d391..65e1fc9fb17 100644
--- a/src/server/scripts/World/go_scripts.cpp
+++ b/src/server/scripts/World/go_scripts.cpp
@@ -259,7 +259,7 @@ bool GOHello_go_ethereum_prison(Player *pPlayer, GameObject *pGO)
                 if (Spell)
                     pCreature->CastSpell(pPlayer, Spell, false);
                 else
-                    error_log("TSCR: go_ethereum_prison summoned Creature (entry %u) but faction (%u) are not expected by script.", pCreature->GetEntry(), pCreature->getFaction());
+                    sLog.outError("TSCR: go_ethereum_prison summoned Creature (entry %u) but faction (%u) are not expected by script.", pCreature->GetEntry(), pCreature->getFaction());
             }
         }
     }
diff --git a/src/server/scripts/World/item_scripts.cpp b/src/server/scripts/World/item_scripts.cpp
index cae4233775b..ccca8ce70af 100644
--- a/src/server/scripts/World/item_scripts.cpp
+++ b/src/server/scripts/World/item_scripts.cpp
@@ -139,7 +139,7 @@ bool ItemUse_item_flying_machine(Player* pPlayer, Item* pItem, SpellCastTargets
         if (pPlayer->GetBaseSkillValue(SKILL_RIDING) == 300)
             return false;
 
-    debug_log("TSCR: Player attempt to use item %u, but did not meet riding requirement",itemId);
+    sLog.outDebug("TSCR: Player attempt to use item %u, but did not meet riding requirement",itemId);
     pPlayer->SendEquipError(EQUIP_ERR_ERR_CANT_EQUIP_SKILL,pItem,NULL);
     return true;
 }
diff --git a/src/server/scripts/World/npc_professions.cpp b/src/server/scripts/World/npc_professions.cpp
index 9d33584847b..5acd8472c44 100644
--- a/src/server/scripts/World/npc_professions.cpp
+++ b/src/server/scripts/World/npc_professions.cpp
@@ -238,7 +238,7 @@ bool EquippedOk(Player* pPlayer, uint32 spellId)
                 if (pItem->GetProto()->RequiredSpell == reqSpell)
             {
                 //player has item equipped that require specialty. Not allow to unlearn, player has to unequip first
-                debug_log("TSCR: player attempt to unlearn spell %u, but item %u is equipped.",reqSpell,pItem->GetProto()->ItemId);
+                sLog.outDebug("TSCR: player attempt to unlearn spell %u, but item %u is equipped.",reqSpell,pItem->GetProto()->ItemId);
                 return false;
             }
         }
diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp
index 86aaac1413b..625f6485fc6 100644
--- a/src/server/scripts/World/npcs_special.cpp
+++ b/src/server/scripts/World/npcs_special.cpp
@@ -123,7 +123,7 @@ struct npc_air_force_botsAI : public ScriptedAI
         }
 
         if (!m_pSpawnAssoc)
-            error_db_log("TCSR: Creature template entry %u has ScriptName npc_air_force_bots, but it's not handled by that script", pCreature->GetEntry());
+            sLog.outErrorDb("TCSR: Creature template entry %u has ScriptName npc_air_force_bots, but it's not handled by that script", pCreature->GetEntry());
         else
         {
             CreatureInfo const* spawnedTemplate = GetCreatureTemplateStore(m_pSpawnAssoc->m_uiSpawnedCreatureEntry);
@@ -131,7 +131,7 @@ struct npc_air_force_botsAI : public ScriptedAI
             if (!spawnedTemplate)
             {
                 m_pSpawnAssoc = NULL;
-                error_db_log("TCSR: Creature template entry %u does not exist in DB, which is required by npc_air_force_bots", m_pSpawnAssoc->m_uiSpawnedCreatureEntry);
+                sLog.outErrorDb("TCSR: Creature template entry %u does not exist in DB, which is required by npc_air_force_bots", m_pSpawnAssoc->m_uiSpawnedCreatureEntry);
                 return;
             }
         }
@@ -150,7 +150,7 @@ struct npc_air_force_botsAI : public ScriptedAI
             m_uiSpawnedGUID = pSummoned->GetGUID();
         else
         {
-            error_db_log("TCSR: npc_air_force_bots: wasn't able to spawn Creature %u", m_pSpawnAssoc->m_uiSpawnedCreatureEntry);
+            sLog.outErrorDb("TCSR: npc_air_force_bots: wasn't able to spawn Creature %u", m_pSpawnAssoc->m_uiSpawnedCreatureEntry);
             m_pSpawnAssoc = NULL;
         }
 
@@ -787,7 +787,7 @@ void npc_doctorAI::UpdateAI(const uint32 diff)
                 case DOCTOR_ALLIANCE: patientEntry = AllianceSoldierId[rand()%3]; break;
                 case DOCTOR_HORDE:    patientEntry = HordeSoldierId[rand()%3]; break;
                 default:
-                    error_log("TSCR: Invalid entry for Triage doctor. Please check your database");
+                    sLog.outError("TSCR: Invalid entry for Triage doctor. Please check your database");
                     return;
             }
 
diff --git a/src/server/shared/Logging/Log.cpp b/src/server/shared/Logging/Log.cpp
index e701e073d5c..0f27400dce2 100644
--- a/src/server/shared/Logging/Log.cpp
+++ b/src/server/shared/Logging/Log.cpp
@@ -450,7 +450,7 @@ void Log::outCrash(const char * err, ...)
     va_list ap;
 
     va_start(ap, err);
-    vutf8printf(stdout, err, &ap);
+    vutf8printf(stderr, err, &ap);
     va_end(ap);
 
     if (m_colored)
@@ -530,7 +530,6 @@ void Log::outArena(const char * str, ...)
         va_end(ap);
         fflush(arenaLogFile);
     }
-    fflush(stdout);
 }
 
 void Log::outErrorDb(const char * err, ...)
@@ -902,7 +901,6 @@ void Log::outRemote(const char * str, ...)
         va_end(ap);
         fflush(raLogfile);
     }
-    fflush(stdout);
 }
 
 void Log::outChat(const char * str, ...)
@@ -930,76 +928,4 @@ void Log::outChat(const char * str, ...)
         fflush(chatLogfile);
         va_end(ap);
     }
-    fflush(stdout);
-}
-
-void outstring_log(const char * str, ...)
-{
-    if (!str)
-        return;
-
-    char buf[256];
-    va_list ap;
-    va_start(ap, str);
-    vsnprintf(buf,256, str, ap);
-    va_end(ap);
-
-    Trinity::Singleton::Instance().outString(buf);
 }
-
-void detail_log(const char * str, ...)
-{
-    if (!str)
-        return;
-
-    char buf[256];
-    va_list ap;
-    va_start(ap, str);
-    vsnprintf(buf,256, str, ap);
-    va_end(ap);
-
-    Trinity::Singleton::Instance().outDetail(buf);
-}
-
-void debug_log(const char * str, ...)
-{
-    if (!str)
-        return;
-
-    char buf[256];
-    va_list ap;
-    va_start(ap, str);
-    vsnprintf(buf,256, str, ap);
-    va_end(ap);
-
-    Trinity::Singleton::Instance().outDebug(buf);
-}
-
-void error_log(const char * str, ...)
-{
-    if (!str)
-        return;
-
-    char buf[256];
-    va_list ap;
-    va_start(ap, str);
-    vsnprintf(buf,256, str, ap);
-    va_end(ap);
-
-    Trinity::Singleton::Instance().outError(buf);
-}
-
-void error_db_log(const char * str, ...)
-{
-    if (!str)
-        return;
-
-    char buf[256];
-    va_list ap;
-    va_start(ap, str);
-    vsnprintf(buf,256, str, ap);
-    va_end(ap);
-
-    Trinity::Singleton::Instance().outErrorDb(buf);
-}
-
diff --git a/src/server/shared/Logging/Log.h b/src/server/shared/Logging/Log.h
index deb6c55e4e0..53ce4e601b5 100644
--- a/src/server/shared/Logging/Log.h
+++ b/src/server/shared/Logging/Log.h
@@ -180,11 +180,5 @@ class Log : public Trinity::Singleton
Date: Tue, 22 Jun 2010 16:04:05 +0200
Subject: Fix use of vmap3extractor on 64-bit *nix-systems

--HG--
branch : trunk
---
 src/tools/vmap3_extractor/CMakeLists.txt    | 13 ++++++++++---
 src/tools/vmap3_extractor/loadlib/loadlib.h | 26 ++++++++++++++------------
 src/tools/vmap3_extractor/mpq_libmpq.cpp    |  2 +-
 src/tools/vmap3_extractor/mpq_libmpq04.h    |  2 +-
 src/tools/vmap3_extractor/vmapexport.cpp    | 14 +++++++-------
 5 files changed, 33 insertions(+), 24 deletions(-)
 mode change 100644 => 100755 src/tools/vmap3_extractor/CMakeLists.txt

(limited to 'src')

diff --git a/src/tools/vmap3_extractor/CMakeLists.txt b/src/tools/vmap3_extractor/CMakeLists.txt
old mode 100644
new mode 100755
index c159c6fd715..9dfdd545df8
--- a/src/tools/vmap3_extractor/CMakeLists.txt
+++ b/src/tools/vmap3_extractor/CMakeLists.txt
@@ -11,19 +11,26 @@
 
 file(GLOB sources *.cpp)
 
-include_directories (${CMAKE_SOURCE_DIR}/externals/libmpq)
+# uncomment next line to disable debug mode
+add_definitions("-DIOMAP_DEBUG")
+
+# build setup currently only supports libmpq 0.4.x
+add_definitions("-DUSE_LIBMPQ04")
+add_definitions("-Wall")
+add_definitions("-ggdb")
+add_definitions("-O3")
 
 add_executable(vmap3extractor ${sources})
 
 if(WIN32)
   target_link_libraries(vmap3extractor
-    libmpq
+    mpq
     bzip2
     zlib
   )
 else()
   target_link_libraries(vmap3extractor
-    libmpq
+    mpq
     ${BZIP2_LIBRARIES}
     ${ZLIB_LIBRARIES}
   )
diff --git a/src/tools/vmap3_extractor/loadlib/loadlib.h b/src/tools/vmap3_extractor/loadlib/loadlib.h
index 6acfd107ec7..53731753425 100644
--- a/src/tools/vmap3_extractor/loadlib/loadlib.h
+++ b/src/tools/vmap3_extractor/loadlib/loadlib.h
@@ -3,26 +3,28 @@
 
 #ifdef WIN32
 typedef __int64            int64;
-typedef long               int32;
-typedef short              int16;
-typedef char               int8;
+typedef __int32            int32;
+typedef __int16            int16;
+typedef __int8             int8;
 typedef unsigned __int64   uint64;
-typedef unsigned long      uint32;
-typedef unsigned short     uint16;
-typedef unsigned char      uint8;
+typedef unsigned __int32   uint32;
+typedef unsigned __int16   uint16;
+typedef unsigned __int8    uint8;
 #else
 #include 
 #ifndef uint64_t 
+#ifdef __linux__
 #include  
 #endif
+#endif
 typedef int64_t            int64;
-typedef long               int32;
-typedef short              int16;
-typedef char               int8;
+typedef int32_t            int32;
+typedef int16_t            int16;
+typedef int8_t             int8;
 typedef uint64_t           uint64;
-typedef unsigned long      uint32;
-typedef unsigned short     uint16;
-typedef unsigned char      uint8;
+typedef uint32_t           uint32;
+typedef uint16_t           uint16;
+typedef uint8_t            uint8;
 #endif
 
 #define FILE_FORMAT_VERSION    18
diff --git a/src/tools/vmap3_extractor/mpq_libmpq.cpp b/src/tools/vmap3_extractor/mpq_libmpq.cpp
index 2d2014e9594..528b9679a58 100644
--- a/src/tools/vmap3_extractor/mpq_libmpq.cpp
+++ b/src/tools/vmap3_extractor/mpq_libmpq.cpp
@@ -50,7 +50,7 @@ MPQFile::MPQFile(const char* filename):
     {
         mpq_archive *mpq_a = (*i)->mpq_a;
 
-        uint32_t filenum;
+        uint32 filenum;
         if(libmpq__file_number(mpq_a, filename, &filenum)) continue;
         libmpq__off_t transferred;
         libmpq__file_unpacked_size(mpq_a, filenum, &size);
diff --git a/src/tools/vmap3_extractor/mpq_libmpq04.h b/src/tools/vmap3_extractor/mpq_libmpq04.h
index 26008f5fba1..ccbfe37cba7 100644
--- a/src/tools/vmap3_extractor/mpq_libmpq04.h
+++ b/src/tools/vmap3_extractor/mpq_libmpq04.h
@@ -24,7 +24,7 @@ public:
     void close();
 
     void GetFileListTo(vector& filelist) {
-    	uint32_t filenum;
+    	uint32 filenum;
     	if(libmpq__file_number(mpq_a, "(listfile)", &filenum)) return;
     	libmpq__off_t size, transferred;
 		libmpq__file_unpacked_size(mpq_a, filenum, &size);
diff --git a/src/tools/vmap3_extractor/vmapexport.cpp b/src/tools/vmap3_extractor/vmapexport.cpp
index b3da5065f96..83dd99d3a61 100644
--- a/src/tools/vmap3_extractor/vmapexport.cpp
+++ b/src/tools/vmap3_extractor/vmapexport.cpp
@@ -56,6 +56,7 @@ bool preciseVectorData = false;
 
 //static const char * szWorkDirMaps = ".\\Maps";
 const char * szWorkDirWmo = "./Buildings";
+
 // Local testing functions
 
 static void clreol()
@@ -103,7 +104,7 @@ void ReadLiquidTypeTableDBC()
     printf("Done! (%u LiqTypes loaded)\n", (unsigned int)LiqType_count);
 }
 
-bool ExtractWmo()
+int ExtractWmo()
 {
     char   szLocalFile[1024] = "";
     bool success=true;
@@ -234,10 +235,10 @@ void ParsMapFiles()
                         delete ADT;
                     }
                 }
-            printf("#");
-            fflush(stdout);
+                printf("#");
+                fflush(stdout);
             }
-        printf("]\n");
+            printf("]\n");
         }
     }
 }
@@ -250,9 +251,8 @@ void getGamePath()
     LONG l;
     s = sizeof(input_path);
     memset(input_path,0,s);
-    l = RegOpenKeyExA(HKEY_LOCAL_MACHINE,"SOFTWARE\\Blizzard Entertainment\\World of Warcraft",0,KEY_QUERY_VALUE,&key);
-    //l = RegOpenKeyEx(HKEY_LOCAL_MACHINE,"SOFTWARE\\Blizzard Entertainment\\Burning Crusade Closed Beta",0,KEY_QUERY_VALUE,&key);
-    l = RegQueryValueExA(key,"InstallPath",0,&t,(LPBYTE)input_path,&s);
+    l = RegOpenKeyEx(HKEY_LOCAL_MACHINE,"SOFTWARE\\Blizzard Entertainment\\World of Warcraft",0,KEY_QUERY_VALUE,&key);
+    l = RegQueryValueEx(key,"InstallPath",0,&t,(LPBYTE)input_path,&s);
     RegCloseKey(key);
     if (strlen(input_path) > 0)
     {
-- 
cgit v1.2.3


From 922000a5762e022d529f8374c3d74a37e57171db Mon Sep 17 00:00:00 2001
From: click 
Date: Tue, 22 Jun 2010 17:04:37 +0200
Subject: Fix vmap3extractor for windows again... (Silly Microsoft and their
 idiotic "let's make SURE others can't use something that would make their
 lives easier")
 http://msdn.microsoft.com/en-us/library/ms724897%28VS.85%29.aspx <--- the
 culprit (BLAAAAH!)

--HG--
branch : trunk
---
 src/tools/vmap3_extractor/vmapexport.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/tools/vmap3_extractor/vmapexport.cpp b/src/tools/vmap3_extractor/vmapexport.cpp
index 83dd99d3a61..1d2079179fb 100644
--- a/src/tools/vmap3_extractor/vmapexport.cpp
+++ b/src/tools/vmap3_extractor/vmapexport.cpp
@@ -251,8 +251,8 @@ void getGamePath()
     LONG l;
     s = sizeof(input_path);
     memset(input_path,0,s);
-    l = RegOpenKeyEx(HKEY_LOCAL_MACHINE,"SOFTWARE\\Blizzard Entertainment\\World of Warcraft",0,KEY_QUERY_VALUE,&key);
-    l = RegQueryValueEx(key,"InstallPath",0,&t,(LPBYTE)input_path,&s);
+    l = RegOpenKeyExA(HKEY_LOCAL_MACHINE,"SOFTWARE\\Blizzard Entertainment\\World of Warcraft",0,KEY_QUERY_VALUE,&key);
+    l = RegQueryValueExA(key,"InstallPath",0,&t,(LPBYTE)input_path,&s);
     RegCloseKey(key);
     if (strlen(input_path) > 0)
     {
-- 
cgit v1.2.3


From 1daa1c09f9c03fdc99bafb14886160f13870e277 Mon Sep 17 00:00:00 2001
From: Brian 
Date: Tue, 22 Jun 2010 14:45:15 -0600
Subject: * Change Linux specific ifdef to POSIX compliant * Should allow the
 vmap extractor to build under OSX * Patch by imbecile

--HG--
branch : trunk
---
 src/tools/vmap3_extractor/vmapexport.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/tools/vmap3_extractor/vmapexport.cpp b/src/tools/vmap3_extractor/vmapexport.cpp
index 1d2079179fb..913fd4f9e4a 100644
--- a/src/tools/vmap3_extractor/vmapexport.cpp
+++ b/src/tools/vmap3_extractor/vmapexport.cpp
@@ -461,7 +461,7 @@ int main(int argc, char ** argv)
     //xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
     // Create the working directory
     if(mkdir(szWorkDirWmo
-#ifdef __linux__
+#ifdef _XOPEN_UNIX
                     , 0711
 #endif
                     ))
-- 
cgit v1.2.3


From d50cb473cbb1ad0e276b6fc31b477a54d37b2255 Mon Sep 17 00:00:00 2001
From: Machiavelli 
Date: Wed, 23 Jun 2010 00:57:16 +0200
Subject: Use original taxipath data in taxi flight movement generator. Author:
 Vladimir + Cleanup

--HG--
branch : trunk
---
 src/server/game/DataStores/DBCStores.cpp           |  2 +-
 src/server/game/DataStores/DBCStructure.h          | 12 +++-
 src/server/game/Entities/Object/Object.cpp         | 24 ++++----
 src/server/game/Entities/Player/Player.cpp         | 24 ++++----
 src/server/game/Entities/Transport/Transport.cpp   |  6 +-
 src/server/game/Entities/Unit/Unit.cpp             | 23 --------
 src/server/game/Entities/Unit/Unit.h               | 34 ++++++++++-
 src/server/game/Globals/ObjectMgr.cpp              | 19 ------
 src/server/game/Globals/ObjectMgr.h                |  4 --
 src/server/game/Movement/MotionMaster.cpp          | 14 ++++-
 .../WaypointMovementGenerator.cpp                  | 64 ++++++++++-----------
 .../MovementGenerators/WaypointMovementGenerator.h | 33 ++++++-----
 src/server/game/Movement/Waypoints/Path.h          | 67 +++++++++++-----------
 .../game/Server/Protocol/Handlers/TaxiHandler.cpp  |  4 +-
 14 files changed, 169 insertions(+), 161 deletions(-)

(limited to 'src')

diff --git a/src/server/game/DataStores/DBCStores.cpp b/src/server/game/DataStores/DBCStores.cpp
index 647d1789b69..b50815e6b30 100644
--- a/src/server/game/DataStores/DBCStores.cpp
+++ b/src/server/game/DataStores/DBCStores.cpp
@@ -506,7 +506,7 @@ void LoadDBCStores(const std::string& dataPath)
     // fill data
     for (uint32 i = 1; i < sTaxiPathNodeStore.GetNumRows(); ++i)
         if (TaxiPathNodeEntry const* entry = sTaxiPathNodeStore.LookupEntry(i))
-            sTaxiPathNodesByPath[entry->path][entry->index] = entry;
+            sTaxiPathNodesByPath[entry->path].set(entry->index, entry);
 
     // Initialize global taxinodes mask
     // include existed nodes that have at least single not spell base (scripted) path
diff --git a/src/server/game/DataStores/DBCStructure.h b/src/server/game/DataStores/DBCStructure.h
index da1af805a2b..5d195530021 100644
--- a/src/server/game/DataStores/DBCStructure.h
+++ b/src/server/game/DataStores/DBCStructure.h
@@ -21,8 +21,10 @@
 #ifndef TRINITY_DBCSTRUCTURE_H
 #define TRINITY_DBCSTRUCTURE_H
 
+#include "Common.h"
 #include "DBCEnums.h"
 #include "Define.h"
+#include "Path.h"
 #include "Util.h"
 
 #include 
@@ -1911,7 +1913,15 @@ struct TaxiPathBySourceAndDestination
 typedef std::map TaxiPathSetForSource;
 typedef std::map TaxiPathSetBySource;
 
-typedef std::vector TaxiPathNodeList;
+struct TaxiPathNodePtr
+{
+    TaxiPathNodePtr() : i_ptr(NULL) {}
+    TaxiPathNodePtr(TaxiPathNodeEntry const* ptr) : i_ptr(ptr) {}
+    TaxiPathNodeEntry const* i_ptr;
+    operator TaxiPathNodeEntry const& () const { return *i_ptr; }
+};
+
+typedef Path TaxiPathNodeList;
 typedef std::vector TaxiPathNodesByPath;
 
 #define TaxiMaskSize 12
diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp
index 38356bf8034..e401051b7cb 100644
--- a/src/server/game/Entities/Object/Object.cpp
+++ b/src/server/game/Entities/Object/Object.cpp
@@ -295,7 +295,11 @@ void Object::_BuildMovementUpdate(ByteBuffer * data, uint16 flags) const
         {
       //WPAssert(this->ToPlayer()->GetMotionMaster()->GetCurrentMovementGeneratorType() == FLIGHT_MOTION_TYPE);
 
-      FlightPathMovementGenerator *fmg = (FlightPathMovementGenerator*)(const_cast(this->ToPlayer())->GetMotionMaster()->top());
+            Player *player = const_cast(this)->ToPlayer();
+            if (!player)
+                return;
+
+            FlightPathMovementGenerator *fmg = (FlightPathMovementGenerator*)(player->GetMotionMaster()->top());
 
             uint32 flags3 = MOVEFLAG_GLIDE;
 
@@ -320,10 +324,10 @@ void Object::_BuildMovementUpdate(ByteBuffer * data, uint16 flags) const
                 }
             }
 
-            Path &path = fmg->GetPath();
+            TaxiPathNodeList& path = const_cast(fmg->GetPath());
 
             float x, y, z;
-            this->ToPlayer()->GetPosition(x, y, z);
+            player->GetPosition(x, y, z);
 
             uint32 inflighttime = uint32(path.GetPassedLength(fmg->GetCurrentNode(), x, y, z) * 32);
             uint32 traveltime = uint32(path.GetTotalLength() * 32);
@@ -338,21 +342,21 @@ void Object::_BuildMovementUpdate(ByteBuffer * data, uint16 flags) const
 
             *data << uint32(0);                             // added in 3.1
 
-            uint32 poscount = uint32(path.Size());
+            uint32 poscount = uint32(path.size());
             *data << uint32(poscount);                      // points count
 
             for (uint32 i = 0; i < poscount; ++i)
             {
-                *data << path.GetNodes()[i].x;
-                *data << path.GetNodes()[i].y;
-                *data << path.GetNodes()[i].z;
+                *data << float(path[i].x);
+                *data << float(path[i].y);
+                *data << float(path[i].z);
             }
 
             *data << uint8(0);                              // added in 3.0.8
 
-            *data << path.GetNodes()[poscount-1].x;
-            *data << path.GetNodes()[poscount-1].y;
-            *data << path.GetNodes()[poscount-1].z;
+            *data << float(path[poscount-1].x);
+            *data << float(path[poscount-1].y);
+            *data << float(path[poscount-1].z);
         }
     }
     else
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 45e38aaf4da..56d22c7b49e 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -19363,30 +19363,30 @@ void Player::ContinueTaxiFlight()
 
     float distPrev = MAP_SIZE*MAP_SIZE;
     float distNext =
-        (nodeList[0]->x-GetPositionX())*(nodeList[0]->x-GetPositionX())+
-        (nodeList[0]->y-GetPositionY())*(nodeList[0]->y-GetPositionY())+
-        (nodeList[0]->z-GetPositionZ())*(nodeList[0]->z-GetPositionZ());
+        (nodeList[0].x-GetPositionX())*(nodeList[0].x-GetPositionX())+
+        (nodeList[0].y-GetPositionY())*(nodeList[0].y-GetPositionY())+
+        (nodeList[0].z-GetPositionZ())*(nodeList[0].z-GetPositionZ());
 
     for (uint32 i = 1; i < nodeList.size(); ++i)
     {
-        TaxiPathNodeEntry const* node = nodeList[i];
-        TaxiPathNodeEntry const* prevNode = nodeList[i-1];
+        TaxiPathNodeEntry const& node = nodeList[i];
+        TaxiPathNodeEntry const& prevNode = nodeList[i-1];
 
         // skip nodes at another map
-        if (node->mapid != GetMapId())
+        if (node.mapid != GetMapId())
             continue;
 
         distPrev = distNext;
 
         distNext =
-            (node->x-GetPositionX())*(node->x-GetPositionX())+
-            (node->y-GetPositionY())*(node->y-GetPositionY())+
-            (node->z-GetPositionZ())*(node->z-GetPositionZ());
+            (node.x-GetPositionX())*(node.x-GetPositionX())+
+            (node.y-GetPositionY())*(node.y-GetPositionY())+
+            (node.z-GetPositionZ())*(node.z-GetPositionZ());
 
         float distNodes =
-            (node->x-prevNode->x)*(node->x-prevNode->x)+
-            (node->y-prevNode->y)*(node->y-prevNode->y)+
-            (node->z-prevNode->z)*(node->z-prevNode->z);
+            (node.x-prevNode.x)*(node.x-prevNode.x)+
+            (node.y-prevNode.y)*(node.y-prevNode.y)+
+            (node.z-prevNode.z)*(node.z-prevNode.z);
 
         if (distNext + distPrev < distNodes)
         {
diff --git a/src/server/game/Entities/Transport/Transport.cpp b/src/server/game/Entities/Transport/Transport.cpp
index ede174a741c..e8bd59c247f 100644
--- a/src/server/game/Entities/Transport/Transport.cpp
+++ b/src/server/game/Entities/Transport/Transport.cpp
@@ -217,10 +217,10 @@ bool Transport::GenerateWaypoints(uint32 pathid, std::set &mapids)
     {
         if (mapChange == 0)
         {
-            TaxiPathNodeEntry const* node_i = path[i];
-            if (node_i->mapid == path[i+1]->mapid)
+            TaxiPathNodeEntry const& node_i = path[i];
+            if (node_i.mapid == path[i+1].mapid)
             {
-                keyFrame k(node_i->x, node_i->y, node_i->z, node_i->mapid, node_i->actionFlag, node_i->delay);
+                keyFrame k(node_i.x, node_i.y, node_i.z, node_i.mapid, node_i.actionFlag, node_i.delay);
                 keyFrames.push_back(k);
                 mapids.insert(k.mapid);
             }
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 58361e19ea4..6764b454c4f 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -435,29 +435,6 @@ void Unit::SendMonsterMove(float NewPosX, float NewPosY, float NewPosZ, uint32 M
         SendMessageToSet(&data, true);
 }*/
 
-void Unit::SendMonsterMoveByPath(Path const& path, uint32 start, uint32 end)
-{
-    uint32 traveltime = uint32(path.GetTotalLength(start, end) * 32);
-
-    uint32 pathSize = end - start;
-
-    WorldPacket data(SMSG_MONSTER_MOVE, (GetPackGUID().size()+1+4+4+4+4+1+4+4+4+pathSize*4*3));
-    data.append(GetPackGUID());
-    data << uint8(0);
-    data << GetPositionX();
-    data << GetPositionY();
-    data << GetPositionZ();
-    data << uint32(getMSTime());
-    data << uint8(0);
-    data << uint32(((GetUnitMovementFlags() & MOVEMENTFLAG_LEVITATING) || isInFlight())? (MOVEFLAG_FLY|MOVEFLAG_WALK) : MOVEFLAG_WALK);
-    data << uint32(traveltime);
-    data << uint32(pathSize);
-    data.append((char*)path.GetNodes(start), pathSize * 4 * 3);
-    SendMessageToSet(&data, true);
-//MONSTER_MOVE_SPLINE_FLY
-    addUnitState(UNIT_STAT_MOVE);
-}
-
 void Unit::SendMonsterMoveTransport(Unit *vehicleOwner)
 {
     WorldPacket data(SMSG_MONSTER_MOVE_TRANSPORT, GetPackGUID().size()+vehicleOwner->GetPackGUID().size());
diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h
index 7091ae22bd3..615dfd2cf8a 100644
--- a/src/server/game/Entities/Unit/Unit.h
+++ b/src/server/game/Entities/Unit/Unit.h
@@ -34,6 +34,9 @@
 #include "EventProcessor.h"
 #include "MotionMaster.h"
 #include "DBCStructure.h"
+#include "Path.h"
+#include "WorldPacket.h"
+#include "Timer.h"
 #include 
 
 #define WORLD_TRIGGER   12999
@@ -324,7 +327,6 @@ class DynamicObject;
 class GameObject;
 class Item;
 class Pet;
-class Path;
 class PetAura;
 class Minion;
 class Guardian;
@@ -1436,12 +1438,14 @@ class Unit : public WorldObject
         void SendMonsterMove(float NewPosX, float NewPosY, float NewPosZ, uint32 Time, Player* player = NULL);
         void SendMonsterMove(float NewPosX, float NewPosY, float NewPosZ, uint32 MoveFlags, uint32 time, float speedZ, Player *player = NULL);
         //void SendMonsterMove(float NewPosX, float NewPosY, float NewPosZ, uint8 type, uint32 MovementFlags, uint32 Time, Player* player = NULL);
-        void SendMonsterMoveByPath(Path const& path, uint32 start, uint32 end);
         void SendMonsterMoveTransport(Unit *vehicleOwner);
         void SendMonsterMoveWithSpeed(float x, float y, float z, uint32 transitTime = 0, Player* player = NULL);
         void SendMonsterMoveWithSpeedToCurrentDestination(Player* player = NULL);
         void SendMovementFlagUpdate();
 
+        template
+        void SendMonsterMoveByPath(Path const& path, uint32 start, uint32 end);
+
         void SendChangeCurrentVictimOpcode(HostileReference* pHostileReference);
         void SendClearThreatListOpcode();
         void SendRemoveFromThreatListOpcode(HostileReference* pHostileReference);
@@ -2116,4 +2120,30 @@ namespace Trinity
     };
 }
 
+template
+inline void Unit::SendMonsterMoveByPath(Path const& path, uint32 start, uint32 end)
+{
+    uint32 traveltime = uint32(path.GetTotalLength(start, end) * 32);
+    uint32 pathSize = end - start;
+    WorldPacket data(SMSG_MONSTER_MOVE, (GetPackGUID().size()+1+4+4+4+4+1+4+4+4+pathSize*4*3));
+    data.append(GetPackGUID());
+    data << uint8(0);
+    data << GetPositionX();
+    data << GetPositionY();
+    data << GetPositionZ();
+    data << uint32(getMSTime());
+    data << uint8(0);
+    data << uint32(((GetUnitMovementFlags() & MOVEMENTFLAG_LEVITATING) || isInFlight()) ? (MOVEFLAG_FLY|MOVEFLAG_WALK) : MOVEFLAG_WALK);
+    data << uint32(traveltime);
+    data << uint32(pathSize);
+    
+    for (uint32 i = start; i < end; ++i)
+    {
+        data << float(path[i].x);
+        data << float(path[i].y);
+        data << float(path[i].z);
+    }
+    
+    SendMessageToSet(&data, true);
+}
 #endif
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index acdadc57dd8..99b12743237 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -5482,25 +5482,6 @@ uint32 ObjectMgr::GetTaxiMountDisplayId(uint32 id, uint32 team, bool allowed_alt
     return mount_id;
 }
 
-void ObjectMgr::GetTaxiPathNodes(uint32 path, Path &pathnodes, std::vector& mapIds)
-{
-    if (path >= sTaxiPathNodesByPath.size())
-        return;
-
-    TaxiPathNodeList& nodeList = sTaxiPathNodesByPath[path];
-
-    pathnodes.Resize(nodeList.size());
-    mapIds.resize(nodeList.size());
-
-    for (size_t i = 0; i < nodeList.size(); ++i)
-    {
-        pathnodes[i].x = nodeList[i]->x;
-        pathnodes[i].y = nodeList[i]->y;
-        pathnodes[i].z = nodeList[i]->z;
-        mapIds[i] = nodeList[i]->mapid;
-    }
-}
-
 void ObjectMgr::LoadGraveyardZones()
 {
     mGraveYardMap.clear();                                  // need for reload case
diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h
index 1d9e95fbf00..d4eb7f819bd 100644
--- a/src/server/game/Globals/ObjectMgr.h
+++ b/src/server/game/Globals/ObjectMgr.h
@@ -30,7 +30,6 @@
 #include "GameObject.h"
 #include "Corpse.h"
 #include "QuestDef.h"
-#include "Path.h"
 #include "ItemPrototype.h"
 #include "NPCHandler.h"
 #include "DatabaseEnv.h"
@@ -60,8 +59,6 @@ extern SQLStorage sInstanceTemplate;
 class Group;
 class Guild;
 class ArenaTeam;
-class Path;
-class TransportPath;
 class Item;
 
 struct GameTele
@@ -473,7 +470,6 @@ class ObjectMgr
         uint32 GetNearestTaxiNode(float x, float y, float z, uint32 mapid, uint32 team);
         void GetTaxiPath(uint32 source, uint32 destination, uint32 &path, uint32 &cost);
         uint32 GetTaxiMountDisplayId(uint32 id, uint32 team, bool allowed_alt_team = false);
-        void GetTaxiPathNodes(uint32 path, Path &pathnodes, std::vector& mapIds);
 
         Quest const* GetQuestTemplate(uint32 quest_id) const
         {
diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp
index 5c20494bfcc..46a4c806067 100644
--- a/src/server/game/Movement/MotionMaster.cpp
+++ b/src/server/game/Movement/MotionMaster.cpp
@@ -440,9 +440,17 @@ MotionMaster::MoveTaxiFlight(uint32 path, uint32 pathnode)
 {
     if (i_owner->GetTypeId() == TYPEID_PLAYER)
     {
-        DEBUG_LOG("Player (GUID: %u) taxi to (Path %u node %u)", i_owner->GetGUIDLow(), path, pathnode);
-        FlightPathMovementGenerator* mgen = new FlightPathMovementGenerator(path,pathnode);
-        Mutate(mgen, MOTION_SLOT_CONTROLLED);
+        if (path < sTaxiPathNodesByPath.size())
+        {
+            DEBUG_LOG("%s taxi to (Path %u node %u)", i_owner->GetName(), path, pathnode);
+            FlightPathMovementGenerator* mgen = new FlightPathMovementGenerator(sTaxiPathNodesByPath[path],pathnode);
+            Mutate(mgen, MOTION_SLOT_CONTROLLED);
+        }
+        else
+        {
+            sLog.outError("%s attempt taxi to (not existed Path %u node %u)",
+            i_owner->GetName(), path, pathnode);
+        }
     }
     else
     {
diff --git a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
index 2a0c7c0253d..2f9e4ce602e 100644
--- a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
@@ -229,24 +229,20 @@ template bool WaypointMovementGenerator::Update(Player &, const uint32 &
 template void WaypointMovementGenerator::MovementInform(Player &);
 
 //----------------------------------------------------//
-void FlightPathMovementGenerator::LoadPath(Player &)
-{
-    objmgr.GetTaxiPathNodes(i_pathId, i_path,i_mapIds);
-}
 
 uint32 FlightPathMovementGenerator::GetPathAtMapEnd() const
 {
-    if (i_currentNode >= i_mapIds.size())
-        return i_mapIds.size();
+    if (i_currentNode >= i_path->size())
+        return i_path->size();
 
-    uint32 curMapId = i_mapIds[i_currentNode];
-    for (uint32 i = i_currentNode; i < i_mapIds.size(); ++i)
+    uint32 curMapId = (*i_path)[i_currentNode].mapid;
+    for (uint32 i = i_currentNode; i < i_path->size(); ++i)
     {
-        if (i_mapIds[i] != curMapId)
+        if ((*i_path)[i].mapid != curMapId)
             return i;
     }
 
-    return i_mapIds.size();
+    return i_path->size();
 }
 
 void FlightPathMovementGenerator::Initialize(Player &player)
@@ -254,23 +250,12 @@ void FlightPathMovementGenerator::Initialize(Player &player)
     player.getHostileRefManager().setOnlineOfflineState(false);
     player.addUnitState(UNIT_STAT_IN_FLIGHT);
     player.SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE | UNIT_FLAG_TAXI_FLIGHT);
-    LoadPath(player);
     Traveller traveller(player);
     // do not send movement, it was sent already
-    i_destinationHolder.SetDestination(traveller, i_path[i_currentNode].x, i_path[i_currentNode].y, i_path[i_currentNode].z, false);
-
+    i_destinationHolder.SetDestination(traveller, (*i_path)[i_currentNode].x, (*i_path)[i_currentNode].y, (*i_path)[i_currentNode].z, false);
+    // For preloading end grid
+    InitEndGridInfo();
     player.SendMonsterMoveByPath(GetPath(), GetCurrentNode(), GetPathAtMapEnd());
-
-    // Storage to preload flightmaster grid at end of flight. For multi-stop flights, this will
-    // be reinitialized for each flightmaster at the end of each spline (or stop) in the flight.
-
-    uint32 nodeCount = i_mapIds.size();     // Get the number of nodes in the path. i_path and i_mapIds are the
-                                            //  same size when loaded in ObjectMgr::GetTaxiPathNodes, called from LoadPath()
-
-    m_endMapId = i_mapIds[nodeCount -1];    // Get the map ID from the last node
-    m_preloadTargetNode = nodeCount / 2;    // Split the number of nodes in half to preload the flightmaster half-way through the flight
-    m_endGridX = i_path[nodeCount -1].x;    // Get the X position from the last node
-    m_endGridY = i_path[nodeCount -1].y;    // Get tye Y position from the last node
 }
 
 void FlightPathMovementGenerator::Finalize(Player & player)
@@ -280,6 +265,7 @@ void FlightPathMovementGenerator::Finalize(Player & player)
     float x, y, z;
     i_destinationHolder.GetLocationNow(player.GetBaseMap(), x, y, z);
     player.SetPosition(x, y, z, player.GetOrientation());
+
 }
 
 bool FlightPathMovementGenerator::Update(Player &player, const uint32 &diff)
@@ -292,18 +278,18 @@ bool FlightPathMovementGenerator::Update(Player &player, const uint32 &diff)
             i_destinationHolder.ResetUpdate(FLIGHT_TRAVEL_UPDATE);
             if (i_destinationHolder.HasArrived())
             {
-                uint32 curMap = i_mapIds[i_currentNode];
+                uint32 curMap = (*i_path)[i_currentNode].mapid;
                 ++i_currentNode;
                 if (MovementInProgress())
                 {
                     DEBUG_LOG("loading node %u for player %s", i_currentNode, player.GetName());
-                    if (i_mapIds[i_currentNode] == curMap)
+                    if ((*i_path)[i_currentNode].mapid == curMap)
                     {
                         // do not send movement, it was sent already
-                        i_destinationHolder.SetDestination(traveller, i_path[i_currentNode].x, i_path[i_currentNode].y, i_path[i_currentNode].z, false);
+                        i_destinationHolder.SetDestination(traveller, (*i_path)[i_currentNode].x, (*i_path)[i_currentNode].y, (*i_path)[i_currentNode].z, false);
                     }
-
-                    // check if it's time to preload the flightmaster grid at path end
+                    
+                     // check if it's time to preload the flightmaster grid at path end
                     if (i_currentNode == m_preloadTargetNode)
                         PreloadEndGrid();
 
@@ -324,13 +310,13 @@ bool FlightPathMovementGenerator::Update(Player &player, const uint32 &diff)
 
 void FlightPathMovementGenerator::SetCurrentNodeAfterTeleport()
 {
-    if (i_mapIds.empty())
+    if (i_path->empty())
         return;
 
-    uint32 map0 = i_mapIds[0];
-    for (size_t i = 1; i < i_mapIds.size(); ++i)
+    uint32 map0 = (*i_path)[0].mapid;
+    for (size_t i = 1; i < i_path->size(); ++i)
     {
-        if (i_mapIds[i] != map0)
+        if ((*i_path)[i].mapid != map0)
         {
             i_currentNode = i;
             return;
@@ -338,6 +324,18 @@ void FlightPathMovementGenerator::SetCurrentNodeAfterTeleport()
     }
 }
 
+void FlightPathMovementGenerator::InitEndGridInfo()
+{
+    // Storage to preload flightmaster grid at end of flight. For multi-stop flights, this will
+    // be reinitialized for each flightmaster at the end of each spline (or stop) in the flight.
+
+    uint32 nodeCount = (*i_path).size();        // Get the number of nodes in the path.
+    m_endMapId = (*i_path)[nodeCount -1].mapid; // Get the map ID from the last node
+    m_preloadTargetNode = nodeCount / 2;        // Split the number of nodes in half to preload the flightmaster half-way through the flight
+    m_endGridX = (*i_path)[nodeCount -1].x;     // Get the X position from the last node
+    m_endGridY = (*i_path)[nodeCount -1].y;     // Get the Y position from the last node
+}
+
 void FlightPathMovementGenerator::PreloadEndGrid()
 {
     // used to preload the final grid where the flightmaster is
diff --git a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
index 4b74e80e168..a03ff223b8e 100644
--- a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
+++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
@@ -42,18 +42,21 @@
 #define STOP_TIME_FOR_PLAYER  3 * MINUTE * IN_MILISECONDS           // 3 Minutes
 #define TIMEDIFF_NEXT_WP      250
 
-template
+template
 class PathMovementBase
 {
     public:
         PathMovementBase() : i_currentNode(0) {}
         virtual ~PathMovementBase() {};
 
-        bool MovementInProgress(void) const { return i_currentNode < i_path.Size(); }
+        bool MovementInProgress(void) const { return i_currentNode < i_path->size(); }
 
         void LoadPath(T &);
         void ReloadPath(T &);
         uint32 GetCurrentNode() const { return i_currentNode; }
+        
+        bool GetDestination(float& x, float& y, float& z) const { i_destinationHolder.GetDestination(x,y,z); return true; }
+        bool GetPosition(float& x, float& y, float& z) const { i_destinationHolder.GetLocationNowNoMicroMovement(x,y,z); return true; }
 
     protected:
         uint32 i_currentNode;
@@ -64,7 +67,7 @@ class PathMovementBase
 template
 
 class WaypointMovementGenerator
-    : public MovementGeneratorMedium< T, WaypointMovementGenerator >, public PathMovementBase
+    : public MovementGeneratorMedium< T, WaypointMovementGenerator >, public PathMovementBase
 {
     public:
         WaypointMovementGenerator(uint32 _path_id = 0, bool _repeating = true) :
@@ -93,28 +96,29 @@ class WaypointMovementGenerator
  */
 class FlightPathMovementGenerator
 : public MovementGeneratorMedium< Player, FlightPathMovementGenerator >,
-public PathMovementBase
+public PathMovementBase
 {
-    uint32 i_pathId;
-    std::vector i_mapIds;
     public:
-        explicit FlightPathMovementGenerator(uint32 id, uint32 startNode = 0) : i_pathId(id) { i_currentNode = startNode; }
+        explicit FlightPathMovementGenerator(TaxiPathNodeList const& pathnodes, uint32 startNode = 0)
+        {
+            i_path = &pathnodes;
+            i_currentNode = startNode;
+        }
         void Initialize(Player &);
+        void Reset(Player &u){};
         void Finalize(Player &);
-        void Reset(Player &) {}
         bool Update(Player &, const uint32 &);
         MovementGeneratorType GetMovementGeneratorType() { return FLIGHT_MOTION_TYPE; }
 
-        void LoadPath(Player &);
-        void ReloadPath(Player &) { /* don't reload flight path */ }
-
-        Path& GetPath() { return i_path; }
+        TaxiPathNodeList const& GetPath() { return *i_path; }
         uint32 GetPathAtMapEnd() const;
-        bool HasArrived() const { return (i_currentNode >= i_path.Size()); }
+        bool HasArrived() const { return (i_currentNode >= i_path->size()); }
         void SetCurrentNodeAfterTeleport();
         void SkipCurrentNode() { ++i_currentNode; }
-        bool GetDestination(float& x, float& y, float& z) const { i_destinationHolder.GetDestination(x,y,z); return true; }
+        bool GetDestination(float& x, float& y, float& z) const { return PathMovementBase::GetDestination(x,y,z); }
 
+        void PreloadEndGrid();
+        void InitEndGridInfo();
     private:
         // storage for preloading the flightmaster grid at end
         // before reaching final waypoint
@@ -122,7 +126,6 @@ public PathMovementBase
         uint32 m_preloadTargetNode;
         float m_endGridX;
         float m_endGridY;
-        void PreloadEndGrid();
 };
 #endif
 
diff --git a/src/server/game/Movement/Waypoints/Path.h b/src/server/game/Movement/Waypoints/Path.h
index 9ec079f3c9c..de73d9270af 100644
--- a/src/server/game/Movement/Waypoints/Path.h
+++ b/src/server/game/Movement/Waypoints/Path.h
@@ -24,65 +24,64 @@
 #include "Common.h"
 #include 
 
+struct SimplePathNode
+{
+    float x, y, z;
+};
+template
+
 class Path
 {
     public:
-        struct PathNode
-        {
-            float x,y,z;
-        };
-
-        void SetLength(const unsigned int sz)
-        {
-            i_nodes.resize(sz);
-        }
+        size_t size() const { return i_nodes.size(); }
+        bool empty() const { return i_nodes.empty(); }
+        void resize(unsigned int sz) { i_nodes.resize(sz); }
+        void clear() { i_nodes.clear(); }
+        void erase(uint32 idx) { i_nodes.erase(i_nodes.begin()+idx); }
 
-        unsigned int Size() const { return i_nodes.size(); }
-        bool Empty() const { return i_nodes.empty(); }
-        void Resize(unsigned int sz) { i_nodes.resize(sz); }
-        void Clear(void) { i_nodes.clear(); }
-        PathNode const* GetNodes(uint32 start = 0) const { return &i_nodes[start]; }
-        float GetTotalLength() const { return GetTotalLength(0,Size()); }
         float GetTotalLength(uint32 start, uint32 end) const
         {
-            float len = 0, xd, yd, zd;
-            for (unsigned int idx=start+1; idx < end; ++idx)
+            float len = 0.0f;
+            for (uint32 idx=start+1; idx < end; ++idx)
             {
-                xd = i_nodes[ idx ].x - i_nodes[ idx-1 ].x;
-                yd = i_nodes[ idx ].y - i_nodes[ idx-1 ].y;
-                zd = i_nodes[ idx ].z - i_nodes[ idx-1 ].z;
+                PathNode const& node = i_nodes[idx];
+                PathNode const& prev = i_nodes[idx-1];
+                float xd = node.x - prev.x;
+                float yd = node.y - prev.y;
+                float zd = node.z - prev.z;
                 len += sqrtf(xd*xd + yd*yd + zd*zd);
             }
             return len;
         }
+        
+        float GetTotalLength() const { return GetTotalLength(0,size()); }
 
         float GetPassedLength(uint32 curnode, float x, float y, float z)
         {
-            float len = 0, xd, yd, zd;
-            for (unsigned int idx=1; idx < curnode; ++idx)
-            {
-                xd = i_nodes[ idx ].x - i_nodes[ idx-1 ].x;
-                yd = i_nodes[ idx ].y - i_nodes[ idx-1 ].y;
-                zd = i_nodes[ idx ].z - i_nodes[ idx-1 ].z;
-                len += sqrtf(xd*xd + yd*yd + zd*zd);
-            }
+            float len = GetTotalLength(0,curnode);
 
             if (curnode > 0)
             {
-                xd = x - i_nodes[curnode-1].x;
-                yd = y - i_nodes[curnode-1].y;
-                zd = z - i_nodes[curnode-1].z;
+                PathNode const& node = i_nodes[curnode-1];
+                float xd = x - node.x;
+                float yd = y - node.y;
+                float zd = z - node.z;
                 len += sqrtf(xd*xd + yd*yd + zd*zd);
             }
 
             return len;
         }
 
-        PathNode& operator[](const unsigned int idx) { return i_nodes[idx]; }
-        const PathNode& operator()(const unsigned int idx) const { return i_nodes[idx]; }
+        PathNode& operator[](size_t idx) { return i_nodes[idx]; }
+        PathNode const& operator[](size_t idx) const { return i_nodes[idx]; }
+        
+        void set(size_t idx, PathElem elem) { i_nodes[idx] = elem; }
 
     protected:
-        std::vector i_nodes;
+        std::vector i_nodes;
 };
+
+typedef Path SimplePath;
+
 #endif
 
diff --git a/src/server/game/Server/Protocol/Handlers/TaxiHandler.cpp b/src/server/game/Server/Protocol/Handlers/TaxiHandler.cpp
index d2a7976c7a5..3402c99ce8b 100644
--- a/src/server/game/Server/Protocol/Handlers/TaxiHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/TaxiHandler.cpp
@@ -222,7 +222,7 @@ void WorldSession::HandleMoveSplineDoneOpcode(WorldPacket& recv_data)
             FlightPathMovementGenerator* flight = (FlightPathMovementGenerator*)(GetPlayer()->GetMotionMaster()->top());
 
             flight->SetCurrentNodeAfterTeleport();
-            Path::PathNode const& node = flight->GetPath()[flight->GetCurrentNode()];
+            TaxiPathNodeEntry const& node = flight->GetPath()[flight->GetCurrentNode()];
             flight->SkipCurrentNode();
 
             GetPlayer()->TeleportTo(curDestNode->map_id,node.x,node.y,node.z,GetPlayer()->GetOrientation());
@@ -259,6 +259,8 @@ void WorldSession::HandleMoveSplineDoneOpcode(WorldPacket& recv_data)
             GetPlayer()->m_taxi.ClearTaxiDestinations();    // clear problematic path and next
         return;
     }
+    else
+        GetPlayer()->m_taxi.ClearTaxiDestinations();        // not destinations, clear source node
 
     GetPlayer()->CleanupAfterTaxiFlight();
     GetPlayer()->SetFallInformation(0, GetPlayer()->GetPositionZ());
-- 
cgit v1.2.3


From c3b7ce7b6937fd6d24e6285ab3a65969ecb71040 Mon Sep 17 00:00:00 2001
From: Brian 
Date: Tue, 22 Jun 2010 17:07:27 -0600
Subject: * Commented useless error message in the map extractor

--HG--
branch : trunk
---
 src/tools/map_extractor/mpq_libmpq.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/tools/map_extractor/mpq_libmpq.cpp b/src/tools/map_extractor/mpq_libmpq.cpp
index 72a9de460eb..81aa8cc2894 100644
--- a/src/tools/map_extractor/mpq_libmpq.cpp
+++ b/src/tools/map_extractor/mpq_libmpq.cpp
@@ -57,7 +57,7 @@ MPQFile::MPQFile(const char* filename):
 
         // HACK: in patch.mpq some files don't want to open and give 1 for filesize
         if (size<=1) {
-            printf("warning: file %s has size %d; cannot read.\n", filename, size);
+//            printf("warning: file %s has size %d; cannot read.\n", filename, size);
             eof = true;
             buffer = 0;
             return;
-- 
cgit v1.2.3


From 27062ffd6173b0ea1181353eeade6935e355e351 Mon Sep 17 00:00:00 2001
From: Machiavelli 
Date: Wed, 23 Jun 2010 01:28:57 +0200
Subject: Avoid redundant data copy in transport waypoints generation. Author:
 Vladimir

--HG--
branch : trunk
---
 src/server/game/Entities/Transport/Transport.cpp | 65 +++++++++++-------------
 1 file changed, 30 insertions(+), 35 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Transport/Transport.cpp b/src/server/game/Entities/Transport/Transport.cpp
index e8bd59c247f..a8ac5bbb0b8 100644
--- a/src/server/game/Entities/Transport/Transport.cpp
+++ b/src/server/game/Entities/Transport/Transport.cpp
@@ -185,18 +185,13 @@ bool Transport::Create(uint32 guidlow, uint32 mapid, float x, float y, float z,
 
 struct keyFrame
 {
-    keyFrame(float _x, float _y, float _z, uint32 _mapid, int _actionflag, int _delay)
-    {
-        x = _x; y = _y; z = _z; mapid = _mapid; actionflag = _actionflag; delay = _delay; distFromPrev = -1; distSinceStop = -1; distUntilStop = -1;
-        tFrom = 0; tTo = 0;
-    }
+    explicit keyFrame(TaxiPathNodeEntry const& _node) : node(&_node),
+        distSinceStop(-1.0f), distUntilStop(-1.0f), distFromPrev(-1.0f), tFrom(0.0f), tTo(0.0f)
+        {
+        }
+
+    TaxiPathNodeEntry const* node;
 
-    float x;
-    float y;
-    float z;
-    uint32 mapid;
-    int actionflag;
-    int delay;
     float distSinceStop;
     float distUntilStop;
     float distFromPrev;
@@ -220,9 +215,9 @@ bool Transport::GenerateWaypoints(uint32 pathid, std::set &mapids)
             TaxiPathNodeEntry const& node_i = path[i];
             if (node_i.mapid == path[i+1].mapid)
             {
-                keyFrame k(node_i.x, node_i.y, node_i.z, node_i.mapid, node_i.actionFlag, node_i.delay);
+                keyFrame k(node_i);
                 keyFrames.push_back(k);
-                mapids.insert(k.mapid);
+                mapids.insert(k.node->mapid);
             }
             else
             {
@@ -240,7 +235,7 @@ bool Transport::GenerateWaypoints(uint32 pathid, std::set &mapids)
 
     // first cell is arrived at by teleportation :S
     keyFrames[0].distFromPrev = 0;
-    if (keyFrames[0].actionflag == 2)
+    if (keyFrames[0].node->actionFlag == 2)
     {
         lastStop = 0;
     }
@@ -248,18 +243,18 @@ bool Transport::GenerateWaypoints(uint32 pathid, std::set &mapids)
     // find the rest of the distances between key points
     for (size_t i = 1; i < keyFrames.size(); ++i)
     {
-        if ((keyFrames[i].actionflag == 1) || (keyFrames[i].mapid != keyFrames[i-1].mapid))
+        if ((keyFrames[i].node->actionFlag == 1) || (keyFrames[i].node->mapid != keyFrames[i-1].node->mapid))
         {
             keyFrames[i].distFromPrev = 0;
         }
         else
         {
             keyFrames[i].distFromPrev =
-                sqrt(pow(keyFrames[i].x - keyFrames[i - 1].x, 2) +
-                pow(keyFrames[i].y - keyFrames[i - 1].y, 2) +
-                pow(keyFrames[i].z - keyFrames[i - 1].z, 2));
+                sqrt(pow(keyFrames[i].node->x - keyFrames[i - 1].node->x, 2) +
+                    pow(keyFrames[i].node->y - keyFrames[i - 1].node->y, 2) +
+                    pow(keyFrames[i].node->z - keyFrames[i - 1].node->z, 2));
         }
-        if (keyFrames[i].actionflag == 2)
+        if (keyFrames[i].node->actionFlag == 2)
         {
             // remember first stop frame
             if (firstStop == -1)
@@ -272,7 +267,7 @@ bool Transport::GenerateWaypoints(uint32 pathid, std::set &mapids)
     for (size_t i = 0; i < keyFrames.size(); ++i)
     {
         int j = (i + lastStop) % keyFrames.size();
-        if (keyFrames[j].actionflag == 2)
+        if (keyFrames[j].node->actionFlag == 2)
             tmpDist = 0;
         else
             tmpDist += keyFrames[j].distFromPrev;
@@ -284,7 +279,7 @@ bool Transport::GenerateWaypoints(uint32 pathid, std::set &mapids)
         int j = (i + (firstStop+1)) % keyFrames.size();
         tmpDist += keyFrames[(j + 1) % keyFrames.size()].distFromPrev;
         keyFrames[j].distUntilStop = tmpDist;
-        if (keyFrames[j].actionflag == 2)
+        if (keyFrames[j].node->actionFlag == 2)
             tmpDist = 0;
     }
 
@@ -312,14 +307,14 @@ bool Transport::GenerateWaypoints(uint32 pathid, std::set &mapids)
     // speed = max(30, t) (remember x = 0.5s^2, and when accelerating, a = 1 unit/s^2
     int t = 0;
     bool teleport = false;
-    if (keyFrames[keyFrames.size() - 1].mapid != keyFrames[0].mapid)
+    if (keyFrames[keyFrames.size() - 1].node->mapid != keyFrames[0].node->mapid)
         teleport = true;
 
-    WayPoint pos(keyFrames[0].mapid, keyFrames[0].x, keyFrames[0].y, keyFrames[0].z, teleport, 0);
+    WayPoint pos(keyFrames[0].node->mapid, keyFrames[0].node->x, keyFrames[0].node->y, keyFrames[0].node->z, teleport, 0);
     m_WayPoints[0] = pos;
-    t += keyFrames[0].delay * 1000;
+    t += keyFrames[0].node->delay * 1000;
 
-    uint32 cM = keyFrames[0].mapid;
+    uint32 cM = keyFrames[0].node->mapid;
     for (size_t i = 0; i < keyFrames.size() - 1; ++i)
     {
         float d = 0;
@@ -337,19 +332,19 @@ bool Transport::GenerateWaypoints(uint32 pathid, std::set &mapids)
                 if (d > 0)
                 {
                     float newX, newY, newZ;
-                    newX = keyFrames[i].x + (keyFrames[i + 1].x - keyFrames[i].x) * d / keyFrames[i + 1].distFromPrev;
-                    newY = keyFrames[i].y + (keyFrames[i + 1].y - keyFrames[i].y) * d / keyFrames[i + 1].distFromPrev;
-                    newZ = keyFrames[i].z + (keyFrames[i + 1].z - keyFrames[i].z) * d / keyFrames[i + 1].distFromPrev;
+                    newX = keyFrames[i].node->x + (keyFrames[i + 1].node->x - keyFrames[i].node->x) * d / keyFrames[i + 1].distFromPrev;
+                    newY = keyFrames[i].node->y + (keyFrames[i + 1].node->y - keyFrames[i].node->y) * d / keyFrames[i + 1].distFromPrev;
+                    newZ = keyFrames[i].node->z + (keyFrames[i + 1].node->z - keyFrames[i].node->z) * d / keyFrames[i + 1].distFromPrev;
 
                     bool teleport = false;
-                    if (keyFrames[i].mapid != cM)
+                    if (keyFrames[i].node->mapid != cM)
                     {
                         teleport = true;
-                        cM = keyFrames[i].mapid;
+                        cM = keyFrames[i].node->mapid;
                     }
 
                     //                    sLog.outString("T: %d, D: %f, x: %f, y: %f, z: %f", t, d, newX, newY, newZ);
-                    WayPoint pos(keyFrames[i].mapid, newX, newY, newZ, teleport, i);
+                    WayPoint pos(keyFrames[i].node->mapid, newX, newY, newZ, teleport, 0);
                     if (teleport)
                         m_WayPoints[t] = pos;
                 }
@@ -389,13 +384,13 @@ bool Transport::GenerateWaypoints(uint32 pathid, std::set &mapids)
             t += (long)keyFrames[i + 1].tTo % 100;
 
         bool teleport = false;
-        if ((keyFrames[i + 1].actionflag == 1) || (keyFrames[i + 1].mapid != keyFrames[i].mapid))
+        if ((keyFrames[i + 1].node->actionFlag == 1) || (keyFrames[i + 1].node->mapid != keyFrames[i].node->mapid))
         {
             teleport = true;
-            cM = keyFrames[i + 1].mapid;
+            cM = keyFrames[i + 1].node->mapid;
         }
 
-        WayPoint pos(keyFrames[i + 1].mapid, keyFrames[i + 1].x, keyFrames[i + 1].y, keyFrames[i + 1].z, teleport, i);
+        WayPoint pos(keyFrames[i + 1].node->mapid, keyFrames[i + 1].node->x, keyFrames[i + 1].node->y, keyFrames[i + 1].node->z, teleport, 0);
 
         //        sLog.outString("T: %d, x: %f, y: %f, z: %f, t:%d", t, pos.x, pos.y, pos.z, teleport);
 /*
@@ -405,7 +400,7 @@ bool Transport::GenerateWaypoints(uint32 pathid, std::set &mapids)
         //if (teleport)
         m_WayPoints[t] = pos;
 
-        t += keyFrames[i + 1].delay * 1000;
+        t += keyFrames[i + 1].node->delay * 1000;
         //        sLog.outString("------");
     }
 
-- 
cgit v1.2.3


From ffaffe3fd753b0afc75679c9730276871a9d034a Mon Sep 17 00:00:00 2001
From: Xanadu 
Date: Wed, 23 Jun 2010 01:47:41 +0200
Subject: * Renamed several VS projects and the executables they produce to
 reflect the new naming convention. * Cleaned up some useless and redundant
 preprocessor definitions. * Fixed the win build so that it correctly uses the
 mysql lib it built from the sources. * Note that you still need to use
 8615_mysql_openssl_libs.zip for the OpenSSL binaries. * Also note that Win
 x64 build from the existing VS files is still fubar (mysql lib...).

--HG--
branch : trunk
---
 externals/ace/win/VC90/ace.vcproj                  |  17 +-
 externals/bzip2/win/VC90/bzip2.vcproj              |  22 +-
 externals/g3dlite/win/VC90/g3dlite.vcproj          |  28 +-
 externals/libmpq/win/VC90/libmpq.vcproj            |  20 +-
 externals/mysql/win/VC90/libmysql.vcproj           | 937 +++++++++++----------
 externals/sockets/win/VC90/sockets.vcproj          |  20 +-
 externals/zlib/win/VC90/zlib.vcproj                |  18 +-
 src/server/authserver/Main.cpp                     |  10 +-
 src/server/game/PrecompiledHeaders/ScriptPCH.h     |   2 +-
 src/server/game/Scripting/ScriptLoader.cpp         |   2 +-
 src/server/game/Spells/Spell.h                     |   4 +-
 src/server/shared/CompilerDefs.h                   |   2 +-
 src/server/shared/Database/Database.cpp            |   2 +-
 src/server/shared/Database/Database.h              |   2 +-
 src/server/shared/Database/QueryResult.h           |   2 +-
 src/server/shared/Utilities/ServiceWin32.cpp       |   2 +-
 src/server/shared/Utilities/ServiceWin32.h         |   4 +-
 src/server/shared/Utilities/Util.cpp               |   2 +-
 src/server/worldserver/Main.cpp                    |   6 +-
 src/server/worldserver/Master.cpp                  |   8 +-
 .../worldserver/WorldThread/WorldRunnable.cpp      |   4 +-
 src/tools/ExtractorToolsVC90.sln                   |  54 +-
 src/tools/map_extractor/System.cpp                 |   4 +-
 src/tools/map_extractor/VC90/VC90_ad.vcproj        | 265 ------
 .../map_extractor/VC90/VC90_mapextractor.vcproj    | 264 ++++++
 src/tools/map_extractor/loadlib/loadlib.h          |   2 +-
 .../VC90/VC90_vmap3assembler.vcproj                | 247 ++++++
 .../vmap3_assembler/VC90/vmap_assembler.vcproj     | 244 ------
 .../VC90/VC90_vmap3extractor.vcproj                | 276 ++++++
 .../vmap3_extractor/VC90/vmap3_extractor.vcproj    | 271 ------
 src/tools/vmap3_extractor/adtfile.cpp              |   2 +-
 src/tools/vmap3_extractor/loadlib/loadlib.h        |   2 +-
 src/tools/vmap3_extractor/mpq_libmpq04.h           |   3 -
 src/tools/vmap3_extractor/vmapexport.cpp           |   2 +-
 win/TrinityCore&Script VC90.sln                    |  69 +-
 win/VC90/TrinityCore.vcproj                        | 504 -----------
 win/VC90/TrinityRealm.vcproj                       | 475 -----------
 win/VC90/authserver.vcproj                         | 477 +++++++++++
 win/VC90/game.vcproj                               |  32 +-
 win/VC90/genrevision.vcproj                        |  13 +-
 win/VC90/shared.vcproj                             |  42 +-
 win/VC90/worldserver.vcproj                        | 506 +++++++++++
 42 files changed, 2457 insertions(+), 2411 deletions(-)
 delete mode 100644 src/tools/map_extractor/VC90/VC90_ad.vcproj
 create mode 100644 src/tools/map_extractor/VC90/VC90_mapextractor.vcproj
 create mode 100644 src/tools/vmap3_assembler/VC90/VC90_vmap3assembler.vcproj
 delete mode 100644 src/tools/vmap3_assembler/VC90/vmap_assembler.vcproj
 create mode 100644 src/tools/vmap3_extractor/VC90/VC90_vmap3extractor.vcproj
 delete mode 100644 src/tools/vmap3_extractor/VC90/vmap3_extractor.vcproj
 delete mode 100644 win/VC90/TrinityCore.vcproj
 delete mode 100644 win/VC90/TrinityRealm.vcproj
 create mode 100644 win/VC90/authserver.vcproj
 create mode 100644 win/VC90/worldserver.vcproj

(limited to 'src')

diff --git a/externals/ace/win/VC90/ace.vcproj b/externals/ace/win/VC90/ace.vcproj
index f54385fbd7a..39b0872d0a4 100644
--- a/externals/ace/win/VC90/ace.vcproj
+++ b/externals/ace/win/VC90/ace.vcproj
@@ -52,7 +52,7 @@
 				AdditionalOptions="/MP /wd 4748 /wd 4244"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\;"
-				PreprocessorDefinitions="ACE_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				PreprocessorDefinitions="ACE_BUILD_DLL;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -143,7 +143,7 @@
 				AdditionalOptions="/MP /wd 4748 /wd 4244"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\;"
-				PreprocessorDefinitions="ACE_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				PreprocessorDefinitions="ACE_BUILD_DLL;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -235,13 +235,14 @@
 				AdditionalOptions="/MP /wd 4748 /wd 4244"
 				Optimization="2"
 				AdditionalIncludeDirectories="..\..\..\;"
-				PreprocessorDefinitions="ACE_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SECURE_SCL=0"
+				PreprocessorDefinitions="ACE_BUILD_DLL;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="WinAcePCH.h"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
 				DisableSpecificWarnings="4355"
 				ForcedIncludeFiles="WinAcePCH.h"
 			/>
@@ -325,7 +326,7 @@
 				AdditionalOptions="/MP /wd 4748 /wd 4244"
 				Optimization="2"
 				AdditionalIncludeDirectories="..\..\..\;"
-				PreprocessorDefinitions="ACE_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SECURE_SCL=0"
+				PreprocessorDefinitions="ACE_BUILD_DLL;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
@@ -481,7 +482,7 @@
 					/>
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 		
@@ -45,7 +45,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
+				PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -84,8 +84,8 @@
 		
 		
@@ -148,8 +148,8 @@
 		
 		
 			
 		
 			
 		
@@ -41,7 +41,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\;..\..\..\bzip2;..\..\..\zlib"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+				PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -49,6 +49,7 @@
 				WarningLevel="3"
 				DebugInformationFormat="3"
 				CompileAs="1"
+				DisableSpecificWarnings="4103;4244;4018"
 			/>
 			
 			
 			
 		
 			
 			
 			
 			
 			
 			
 		
 		
 			
 			
 			
 			
 			
 			
 		
 		
 			
 			
 			
 			
 			
 			
 		
 			
 			
@@ -437,7 +446,7 @@
 					/>
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 				
 				
 					
 			]\n"
         "    -c config_file           use config_file as configuration file\n\r"
-        #ifdef WIN32
+        #ifdef _WIN32
         "    Running as service functions:\n\r"
         "    --service                run as service\n\r"
         "    -s install               install service\n\r"
@@ -122,7 +122,7 @@ extern int main(int argc, char **argv)
                 cfg_file = argv[c];
         }
 
-        #ifdef WIN32
+        #ifdef _WIN32
         ////////////
         //Services//
         ////////////
@@ -243,7 +243,7 @@ extern int main(int argc, char **argv)
     #endif /* _WIN32 */();
 
     ///- Handle affinity for multiple processors and process priority on Windows
-    #ifdef WIN32
+    #ifdef _WIN32
     {
         HANDLE hProcess = GetCurrentProcess();
 
@@ -315,7 +315,7 @@ extern int main(int argc, char **argv)
             sLog.outDetail("Ping MySQL to keep connection alive");
             LoginDatabase.Query("SELECT 1 FROM realmlist LIMIT 1");
         }
-#ifdef WIN32
+#ifdef _WIN32
         if (m_ServiceStatus == 0) stopEvent = true;
         while (m_ServiceStatus == 2) Sleep(1000);
 #endif
diff --git a/src/server/game/PrecompiledHeaders/ScriptPCH.h b/src/server/game/PrecompiledHeaders/ScriptPCH.h
index 1e83a88b87a..f8515e99f89 100644
--- a/src/server/game/PrecompiledHeaders/ScriptPCH.h
+++ b/src/server/game/PrecompiledHeaders/ScriptPCH.h
@@ -23,7 +23,7 @@
 #include "DBCStores.h"
 #include "ObjectMgr.h"
 
-#ifdef WIN32
+#ifdef _WIN32
 #include 
 
 #endif
diff --git a/src/server/game/Scripting/ScriptLoader.cpp b/src/server/game/Scripting/ScriptLoader.cpp
index 37af3c50691..7bdf7eb6e4e 100644
--- a/src/server/game/Scripting/ScriptLoader.cpp
+++ b/src/server/game/Scripting/ScriptLoader.cpp
@@ -16,7 +16,7 @@
 
 #include "ScriptPCH.h"
 
-#ifdef WIN32
+#ifdef _WIN32
   #define DO_SCRIPTS
 #endif
 
diff --git a/src/server/game/Spells/Spell.h b/src/server/game/Spells/Spell.h
index a987e35e65d..372c668d2de 100644
--- a/src/server/game/Spells/Spell.h
+++ b/src/server/game/Spells/Spell.h
@@ -769,14 +769,14 @@ namespace Trinity
             }
         }
 
-        #ifdef WIN32
+        #ifdef _WIN32
         template<> inline void Visit(CorpseMapType &) {}
         template<> inline void Visit(GameObjectMapType &) {}
         template<> inline void Visit(DynamicObjectMapType &) {}
         #endif
     };
 
-    #ifndef WIN32
+    #ifndef _WIN32
     template<> inline void SpellNotifierCreatureAndPlayer::Visit(CorpseMapType&) {}
     template<> inline void SpellNotifierCreatureAndPlayer::Visit(GameObjectMapType&) {}
     template<> inline void SpellNotifierCreatureAndPlayer::Visit(DynamicObjectMapType&) {}
diff --git a/src/server/shared/CompilerDefs.h b/src/server/shared/CompilerDefs.h
index fb7dbfe4caa..d2d470e2097 100644
--- a/src/server/shared/CompilerDefs.h
+++ b/src/server/shared/CompilerDefs.h
@@ -26,7 +26,7 @@
 #define PLATFORM_APPLE   2
 #define PLATFORM_INTEL   3
 
-// must be first (win 64 also define WIN32)
+// must be first (win 64 also define _WIN32)
 #if defined( _WIN64 )
 #  define PLATFORM PLATFORM_WINDOWS
 #elif defined( __WIN32__ ) || defined( WIN32 ) || defined( _WIN32 )
diff --git a/src/server/shared/Database/Database.cpp b/src/server/shared/Database/Database.cpp
index 91275716bf8..2dd2f9bbda4 100644
--- a/src/server/shared/Database/Database.cpp
+++ b/src/server/shared/Database/Database.cpp
@@ -113,7 +113,7 @@ bool Database::Initialize(const char *infoString)
         database = *iter++;
 
     mysql_options(mysqlInit, MYSQL_SET_CHARSET_NAME, "utf8");
-    #ifdef WIN32
+    #ifdef _WIN32
     if (host==".")                                           // named pipe use option (Windows)
     {
         unsigned int opt = MYSQL_PROTOCOL_PIPE;
diff --git a/src/server/shared/Database/Database.h b/src/server/shared/Database/Database.h
index 96588adbf10..655479c85fe 100644
--- a/src/server/shared/Database/Database.h
+++ b/src/server/shared/Database/Database.h
@@ -28,7 +28,7 @@
 #include "ace/Thread_Mutex.h"
 #include "ace/Guard_T.h"
 
-#ifdef WIN32
+#ifdef _WIN32
 #define FD_SETSIZE 1024
 #include 
 #include 
diff --git a/src/server/shared/Database/QueryResult.h b/src/server/shared/Database/QueryResult.h
index 4eec9915362..5562a9abfa4 100644
--- a/src/server/shared/Database/QueryResult.h
+++ b/src/server/shared/Database/QueryResult.h
@@ -26,7 +26,7 @@
 
 #include "Field.h"
 
-#ifdef WIN32
+#ifdef _WIN32
 #define FD_SETSIZE 1024
 #include 
 #include 
diff --git a/src/server/shared/Utilities/ServiceWin32.cpp b/src/server/shared/Utilities/ServiceWin32.cpp
index 513dd64b505..a50a4f9d039 100644
--- a/src/server/shared/Utilities/ServiceWin32.cpp
+++ b/src/server/shared/Utilities/ServiceWin32.cpp
@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-#ifdef WIN32
+#ifdef _WIN32
 
 #include "Common.h"
 #include "Log.h"
diff --git a/src/server/shared/Utilities/ServiceWin32.h b/src/server/shared/Utilities/ServiceWin32.h
index ddac785a0fb..4dbd329a5fa 100644
--- a/src/server/shared/Utilities/ServiceWin32.h
+++ b/src/server/shared/Utilities/ServiceWin32.h
@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-#ifdef WIN32
+#ifdef _WIN32
 #ifndef _WIN32_SERVICE_
 #define _WIN32_SERVICE_
 
@@ -27,5 +27,5 @@ bool WinServiceUninstall();
 bool WinServiceRun();
 
 #endif                                                      // _WIN32_SERVICE_
-#endif                                                      // WIN32
+#endif                                                      // _WIN32
 
diff --git a/src/server/shared/Utilities/Util.cpp b/src/server/shared/Utilities/Util.cpp
index 14c0431c967..97dfde6c92b 100644
--- a/src/server/shared/Utilities/Util.cpp
+++ b/src/server/shared/Utilities/Util.cpp
@@ -195,7 +195,7 @@ uint32 CreatePIDFile(const std::string& filename)
     if (pid_file == NULL)
         return 0;
 
-#ifdef WIN32
+#ifdef _WIN32
     DWORD pid = GetCurrentProcessId();
 #else
     pid_t pid = getpid();
diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp
index 25c0b4be762..5166ca741df 100644
--- a/src/server/worldserver/Main.cpp
+++ b/src/server/worldserver/Main.cpp
@@ -37,7 +37,7 @@
 # define _TRINITY_CORE_CONFIG  "worldserver.conf"
 #endif //_TRINITY_CORE_CONFIG
 
-#ifdef WIN32
+#ifdef _WIN32
 #include "ServiceWin32.h"
 char serviceName[] = "TrinityCore";
 char serviceLongName[] = "Trinity core service";
@@ -62,7 +62,7 @@ void usage(const char *prog)
 {
     sLog.outString("Usage: \n %s []\n"
         "    -c config_file           use config_file as configuration file\n\r"
-        #ifdef WIN32
+        #ifdef _WIN32
         "    Running as service functions:\n\r"
         "    --service                run as service\n\r"
         "    -s install               install service\n\r"
@@ -91,7 +91,7 @@ extern int main(int argc, char **argv)
                 cfg_file = argv[c];
         }
 
-        #ifdef WIN32
+        #ifdef _WIN32
         ////////////
         //Services//
         ////////////
diff --git a/src/server/worldserver/Master.cpp b/src/server/worldserver/Master.cpp
index 98a28093199..332a607dcad 100644
--- a/src/server/worldserver/Master.cpp
+++ b/src/server/worldserver/Master.cpp
@@ -50,7 +50,7 @@
 #include "ListenSocket.h"
 #include "BigNumber.h"
 
-#ifdef WIN32
+#ifdef _WIN32
 #include "ServiceWin32.h"
 extern int m_ServiceStatus;
 #endif
@@ -285,7 +285,7 @@ int Master::Run()
 
     ACE_Based::Thread* cliThread = NULL;
 
-#ifdef WIN32
+#ifdef _WIN32
     if (sConfig.GetBoolDefault("Console.Enable", true) && (m_ServiceStatus == -1)/* need disable console in service mode*/)
 #else
     if (sConfig.GetBoolDefault("Console.Enable", true))
@@ -298,7 +298,7 @@ int Master::Run()
     ACE_Based::Thread rar_thread(new RARunnable);
 
     ///- Handle affinity for multiple processors and process priority on Windows
-    #ifdef WIN32
+    #ifdef _WIN32
     {
         HANDLE hProcess = GetCurrentProcess();
 
@@ -386,7 +386,7 @@ int Master::Run()
 
     if (cliThread)
     {
-        #ifdef WIN32
+        #ifdef _WIN32
 
         // this only way to terminate CLI thread exist at Win32 (alt. way exist only in Windows Vista API)
         //_exit(1);
diff --git a/src/server/worldserver/WorldThread/WorldRunnable.cpp b/src/server/worldserver/WorldThread/WorldRunnable.cpp
index c674ddbc06f..3531873ec0c 100644
--- a/src/server/worldserver/WorldThread/WorldRunnable.cpp
+++ b/src/server/worldserver/WorldThread/WorldRunnable.cpp
@@ -35,7 +35,7 @@
 
 #define WORLD_SLEEP_CONST 50
 
-#ifdef WIN32
+#ifdef _WIN32
 #include "ServiceWin32.h"
 extern int m_ServiceStatus;
 #endif
@@ -76,7 +76,7 @@ void WorldRunnable::run()
         else
             prevSleepTime = 0;
 
-        #ifdef WIN32
+        #ifdef _WIN32
             if (m_ServiceStatus == 0) World::StopNow(SHUTDOWN_EXIT_CODE);
             while (m_ServiceStatus == 2) Sleep(1000);
         #endif
diff --git a/src/tools/ExtractorToolsVC90.sln b/src/tools/ExtractorToolsVC90.sln
index 5887925dcf1..7881797979a 100644
--- a/src/tools/ExtractorToolsVC90.sln
+++ b/src/tools/ExtractorToolsVC90.sln
@@ -1,21 +1,6 @@
 
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ad", "map_extractor\VC90\VC90_ad.vcproj", "{D7552D4F-408F-4F8E-859B-366659150CF4}"
-	ProjectSection(ProjectDependencies) = postProject
-		{03AB0F44-628E-4855-99A0-C98A1EB52C50} = {03AB0F44-628E-4855-99A0-C98A1EB52C50}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vmap_assembler", "vmap3_assembler\VC90\vmap_assembler.vcproj", "{572FFF74-480C-4472-8ABF-81733BB4049D}"
-	ProjectSection(ProjectDependencies) = postProject
-		{8072769E-CF10-48BF-B9E1-12752A5DAC6E} = {8072769E-CF10-48BF-B9E1-12752A5DAC6E}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vmap3_extractor", "vmap3_extractor\VC90\vmap3_extractor.vcproj", "{502602CC-98EA-4335-B922-C5C1DBF37604}"
-	ProjectSection(ProjectDependencies) = postProject
-		{03AB0F44-628E-4855-99A0-C98A1EB52C50} = {03AB0F44-628E-4855-99A0-C98A1EB52C50}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmpq", "..\..\externals\libmpq\win\VC90\libmpq.vcproj", "{03AB0F44-628E-4855-99A0-C98A1EB52C50}"
 	ProjectSection(ProjectDependencies) = postProject
 		{CE773400-763E-4B71-B5E2-C9B60A752EB1} = {CE773400-763E-4B71-B5E2-C9B60A752EB1}
@@ -33,24 +18,27 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g3dlite", "..\..\externals\
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dependencies", "Dependencies", "{69F789A6-BD04-454A-AC8E-A57AAE7FCF77}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mapextractor", "map_extractor\VC90\VC90_mapextractor.vcproj", "{D7552D4F-408F-4F8E-859B-366659150CF4}"
+	ProjectSection(ProjectDependencies) = postProject
+		{03AB0F44-628E-4855-99A0-C98A1EB52C50} = {03AB0F44-628E-4855-99A0-C98A1EB52C50}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vmap3assembler", "vmap3_assembler\VC90\VC90_vmap3assembler.vcproj", "{572FFF74-480C-4472-8ABF-81733BB4049D}"
+	ProjectSection(ProjectDependencies) = postProject
+		{8072769E-CF10-48BF-B9E1-12752A5DAC6E} = {8072769E-CF10-48BF-B9E1-12752A5DAC6E}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vmap3extractor", "vmap3_extractor\VC90\VC90_vmap3extractor.vcproj", "{502602CC-98EA-4335-B922-C5C1DBF37604}"
+	ProjectSection(ProjectDependencies) = postProject
+		{03AB0F44-628E-4855-99A0-C98A1EB52C50} = {03AB0F44-628E-4855-99A0-C98A1EB52C50}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
 		Release|Win32 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D7552D4F-408F-4F8E-859B-366659150CF4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D7552D4F-408F-4F8E-859B-366659150CF4}.Debug|Win32.Build.0 = Debug|Win32
-		{D7552D4F-408F-4F8E-859B-366659150CF4}.Release|Win32.ActiveCfg = Release|Win32
-		{D7552D4F-408F-4F8E-859B-366659150CF4}.Release|Win32.Build.0 = Release|Win32
-		{572FFF74-480C-4472-8ABF-81733BB4049D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{572FFF74-480C-4472-8ABF-81733BB4049D}.Debug|Win32.Build.0 = Debug|Win32
-		{572FFF74-480C-4472-8ABF-81733BB4049D}.Release|Win32.ActiveCfg = Release|Win32
-		{572FFF74-480C-4472-8ABF-81733BB4049D}.Release|Win32.Build.0 = Release|Win32
-		{502602CC-98EA-4335-B922-C5C1DBF37604}.Debug|Win32.ActiveCfg = Debug|Win32
-		{502602CC-98EA-4335-B922-C5C1DBF37604}.Debug|Win32.Build.0 = Debug|Win32
-		{502602CC-98EA-4335-B922-C5C1DBF37604}.Release|Win32.ActiveCfg = Release|Win32
-		{502602CC-98EA-4335-B922-C5C1DBF37604}.Release|Win32.Build.0 = Release|Win32
 		{03AB0F44-628E-4855-99A0-C98A1EB52C50}.Debug|Win32.ActiveCfg = Debug|Win32
 		{03AB0F44-628E-4855-99A0-C98A1EB52C50}.Debug|Win32.Build.0 = Debug|Win32
 		{03AB0F44-628E-4855-99A0-C98A1EB52C50}.Release|Win32.ActiveCfg = Release|Win32
@@ -67,6 +55,18 @@ Global
 		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|Win32.Build.0 = Debug|Win32
 		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|Win32.ActiveCfg = Release|Win32
 		{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|Win32.Build.0 = Release|Win32
+		{D7552D4F-408F-4F8E-859B-366659150CF4}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D7552D4F-408F-4F8E-859B-366659150CF4}.Debug|Win32.Build.0 = Debug|Win32
+		{D7552D4F-408F-4F8E-859B-366659150CF4}.Release|Win32.ActiveCfg = Release|Win32
+		{D7552D4F-408F-4F8E-859B-366659150CF4}.Release|Win32.Build.0 = Release|Win32
+		{572FFF74-480C-4472-8ABF-81733BB4049D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{572FFF74-480C-4472-8ABF-81733BB4049D}.Debug|Win32.Build.0 = Debug|Win32
+		{572FFF74-480C-4472-8ABF-81733BB4049D}.Release|Win32.ActiveCfg = Release|Win32
+		{572FFF74-480C-4472-8ABF-81733BB4049D}.Release|Win32.Build.0 = Release|Win32
+		{502602CC-98EA-4335-B922-C5C1DBF37604}.Debug|Win32.ActiveCfg = Debug|Win32
+		{502602CC-98EA-4335-B922-C5C1DBF37604}.Debug|Win32.Build.0 = Debug|Win32
+		{502602CC-98EA-4335-B922-C5C1DBF37604}.Release|Win32.ActiveCfg = Release|Win32
+		{502602CC-98EA-4335-B922-C5C1DBF37604}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/src/tools/map_extractor/System.cpp b/src/tools/map_extractor/System.cpp
index 6abe2364cd6..3a328e91bf4 100644
--- a/src/tools/map_extractor/System.cpp
+++ b/src/tools/map_extractor/System.cpp
@@ -5,7 +5,7 @@
 #include 
 #include 
 
-#ifdef WIN32
+#ifdef _WIN32
 #include "direct.h"
 #else
 #include 
@@ -88,7 +88,7 @@ static char* const langs[] = {"enGB", "enUS", "deDE", "esES", "frFR", "koKR", "z
 
 void CreateDir( const std::string& Path )
 {
-    #ifdef WIN32
+    #ifdef _WIN32
     _mkdir( Path.c_str());
     #else
     mkdir( Path.c_str(), 0777 );
diff --git a/src/tools/map_extractor/VC90/VC90_ad.vcproj b/src/tools/map_extractor/VC90/VC90_ad.vcproj
deleted file mode 100644
index e875137556c..00000000000
--- a/src/tools/map_extractor/VC90/VC90_ad.vcproj
+++ /dev/null
@@ -1,265 +0,0 @@
-
-
-	
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-		
-	
-	
-	
-
diff --git a/src/tools/map_extractor/VC90/VC90_mapextractor.vcproj b/src/tools/map_extractor/VC90/VC90_mapextractor.vcproj
new file mode 100644
index 00000000000..c943d93d84e
--- /dev/null
+++ b/src/tools/map_extractor/VC90/VC90_mapextractor.vcproj
@@ -0,0 +1,264 @@
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+		
+	
+	
+	
+
diff --git a/src/tools/map_extractor/loadlib/loadlib.h b/src/tools/map_extractor/loadlib/loadlib.h
index 6acfd107ec7..48fe794f8dc 100644
--- a/src/tools/map_extractor/loadlib/loadlib.h
+++ b/src/tools/map_extractor/loadlib/loadlib.h
@@ -1,7 +1,7 @@
 #ifndef LOAD_LIB_H
 #define LOAD_LIB_H
 
-#ifdef WIN32
+#ifdef _WIN32
 typedef __int64            int64;
 typedef long               int32;
 typedef short              int16;
diff --git a/src/tools/vmap3_assembler/VC90/VC90_vmap3assembler.vcproj b/src/tools/vmap3_assembler/VC90/VC90_vmap3assembler.vcproj
new file mode 100644
index 00000000000..1f3376e71b7
--- /dev/null
+++ b/src/tools/vmap3_assembler/VC90/VC90_vmap3assembler.vcproj
@@ -0,0 +1,247 @@
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+		
+		
+			
+			
+			
+			
+			
+				
+				
+				
+				
+			
+			
+				
+				
+				
+				
+				
+				
+				
+				
+			
+		
+	
+	
+	
+
diff --git a/src/tools/vmap3_assembler/VC90/vmap_assembler.vcproj b/src/tools/vmap3_assembler/VC90/vmap_assembler.vcproj
deleted file mode 100644
index 63a99dfa421..00000000000
--- a/src/tools/vmap3_assembler/VC90/vmap_assembler.vcproj
+++ /dev/null
@@ -1,244 +0,0 @@
-
-
-	
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-	
-		
-			
-			
-		
-		
-			
-			
-			
-			
-			
-				
-				
-				
-				
-			
-			
-				
-				
-				
-				
-				
-				
-				
-				
-			
-		
-	
-	
-	
-
diff --git a/src/tools/vmap3_extractor/VC90/VC90_vmap3extractor.vcproj b/src/tools/vmap3_extractor/VC90/VC90_vmap3extractor.vcproj
new file mode 100644
index 00000000000..3dd343f3845
--- /dev/null
+++ b/src/tools/vmap3_extractor/VC90/VC90_vmap3extractor.vcproj
@@ -0,0 +1,276 @@
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+				
+				
+			
+		
+	
+	
+	
+
diff --git a/src/tools/vmap3_extractor/VC90/vmap3_extractor.vcproj b/src/tools/vmap3_extractor/VC90/vmap3_extractor.vcproj
deleted file mode 100644
index 34665937c9a..00000000000
--- a/src/tools/vmap3_extractor/VC90/vmap3_extractor.vcproj
+++ /dev/null
@@ -1,271 +0,0 @@
-
-
-	
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-				
-				
-			
-		
-	
-	
-	
-
diff --git a/src/tools/vmap3_extractor/adtfile.cpp b/src/tools/vmap3_extractor/adtfile.cpp
index 314255d3a58..58c1bb94b1c 100644
--- a/src/tools/vmap3_extractor/adtfile.cpp
+++ b/src/tools/vmap3_extractor/adtfile.cpp
@@ -4,7 +4,7 @@
 #include 
 #include 
 
-#ifdef WIN32
+#ifdef _WIN32
 #define snprintf _snprintf
 #endif
 
diff --git a/src/tools/vmap3_extractor/loadlib/loadlib.h b/src/tools/vmap3_extractor/loadlib/loadlib.h
index 53731753425..49d5f590744 100644
--- a/src/tools/vmap3_extractor/loadlib/loadlib.h
+++ b/src/tools/vmap3_extractor/loadlib/loadlib.h
@@ -1,7 +1,7 @@
 #ifndef LOAD_LIB_H
 #define LOAD_LIB_H
 
-#ifdef WIN32
+#ifdef _WIN32
 typedef __int64            int64;
 typedef __int32            int32;
 typedef __int16            int16;
diff --git a/src/tools/vmap3_extractor/mpq_libmpq04.h b/src/tools/vmap3_extractor/mpq_libmpq04.h
index ccbfe37cba7..4fe80f2759c 100644
--- a/src/tools/vmap3_extractor/mpq_libmpq04.h
+++ b/src/tools/vmap3_extractor/mpq_libmpq04.h
@@ -1,6 +1,3 @@
-#define _CRT_SECURE_NO_DEPRECATE
-#define _CRT_SECURE_NO_WARNINGS
-
 #ifndef MPQ_H
 #define MPQ_H
 
diff --git a/src/tools/vmap3_extractor/vmapexport.cpp b/src/tools/vmap3_extractor/vmapexport.cpp
index 913fd4f9e4a..82e9bd7cc7b 100644
--- a/src/tools/vmap3_extractor/vmapexport.cpp
+++ b/src/tools/vmap3_extractor/vmapexport.cpp
@@ -5,7 +5,7 @@
 #include 
 #include 
 
-#ifdef WIN32
+#ifdef _WIN32
     #include 
     #include 
     #include 
diff --git a/win/TrinityCore&Script VC90.sln b/win/TrinityCore&Script VC90.sln
index 617480e588d..1d611835132 100644
--- a/win/TrinityCore&Script VC90.sln	
+++ b/win/TrinityCore&Script VC90.sln	
@@ -15,16 +15,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shared", "VC90\shared.vcpro
 		{4FBE4FC1-22DE-41A0-9AEB-CFD00EBAC7E5} = {4FBE4FC1-22DE-41A0-9AEB-CFD00EBAC7E5}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TrinityCore", "VC90\TrinityCore.vcproj", "{A3A04E47-43A2-4C08-90B3-029CEF558594}"
-	ProjectSection(ProjectDependencies) = postProject
-		{1DC6C4DA-A028-41F3-877D-D5400C594F88} = {1DC6C4DA-A028-41F3-877D-D5400C594F88}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TrinityRealm", "VC90\TrinityRealm.vcproj", "{563E9905-3657-460C-AE63-0AC39D162E23}"
-	ProjectSection(ProjectDependencies) = postProject
-		{90297C34-F231-4DF4-848E-A74BCC0E40ED} = {90297C34-F231-4DF4-848E-A74BCC0E40ED}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genrevision", "VC90\genrevision.vcproj", "{803F488E-4C5A-4866-8D5C-1E6C03C007C2}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE_Wrappers", "..\externals\ace\win\VC90\ace.vcproj", "{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}"
@@ -36,6 +26,21 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sockets", "..\externals\sockets\win\VC90\sockets.vcproj", "{9DF7A84E-C644-4720-A79D-C98CB950E34C}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmysql", "..\externals\mysql\win\VC90\libmysql.vcproj", "{4FBE4FC1-22DE-41A0-9AEB-CFD00EBAC7E5}"
+	ProjectSection(ProjectDependencies) = postProject
+		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} = {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{FAC6B1DA-4242-4891-81CB-F366A8FC655F}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "authserver", "VC90\authserver.vcproj", "{563E9905-3657-460C-AE63-0AC39D162E23}"
+	ProjectSection(ProjectDependencies) = postProject
+		{90297C34-F231-4DF4-848E-A74BCC0E40ED} = {90297C34-F231-4DF4-848E-A74BCC0E40ED}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "worldserver", "VC90\worldserver.vcproj", "{A3A04E47-43A2-4C08-90B3-029CEF558594}"
+	ProjectSection(ProjectDependencies) = postProject
+		{1DC6C4DA-A028-41F3-877D-D5400C594F88} = {1DC6C4DA-A028-41F3-877D-D5400C594F88}
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -61,22 +66,6 @@ Global
 		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Release|Win32.Build.0 = Release|Win32
 		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Release|x64.ActiveCfg = Release|x64
 		{90297C34-F231-4DF4-848E-A74BCC0E40ED}.Release|x64.Build.0 = Release|x64
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug|Win32.Build.0 = Debug|Win32
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug|x64.ActiveCfg = Debug|x64
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug|x64.Build.0 = Debug|x64
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Release|Win32.ActiveCfg = Release|Win32
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Release|Win32.Build.0 = Release|Win32
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Release|x64.ActiveCfg = Release|x64
-		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Release|x64.Build.0 = Release|x64
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Debug|Win32.ActiveCfg = Debug|Win32
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Debug|Win32.Build.0 = Debug|Win32
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Debug|x64.ActiveCfg = Debug|x64
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Debug|x64.Build.0 = Debug|x64
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Release|Win32.ActiveCfg = Release|Win32
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Release|Win32.Build.0 = Release|Win32
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Release|x64.ActiveCfg = Release|x64
-		{563E9905-3657-460C-AE63-0AC39D162E23}.Release|x64.Build.0 = Release|x64
 		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug|Win32.ActiveCfg = Debug|Win32
 		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug|Win32.Build.0 = Debug|Win32
 		{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug|x64.ActiveCfg = Debug|x64
@@ -119,14 +108,38 @@ Global
 		{9DF7A84E-C644-4720-A79D-C98CB950E34C}.Release|x64.Build.0 = Release|x64
 		{4FBE4FC1-22DE-41A0-9AEB-CFD00EBAC7E5}.Debug|Win32.ActiveCfg = Debug|Win32
 		{4FBE4FC1-22DE-41A0-9AEB-CFD00EBAC7E5}.Debug|Win32.Build.0 = Debug|Win32
-		{4FBE4FC1-22DE-41A0-9AEB-CFD00EBAC7E5}.Debug|x64.ActiveCfg = Debug|Win32
+		{4FBE4FC1-22DE-41A0-9AEB-CFD00EBAC7E5}.Debug|x64.ActiveCfg = Debug|x64
+		{4FBE4FC1-22DE-41A0-9AEB-CFD00EBAC7E5}.Debug|x64.Build.0 = Debug|x64
 		{4FBE4FC1-22DE-41A0-9AEB-CFD00EBAC7E5}.Release|Win32.ActiveCfg = Release|Win32
 		{4FBE4FC1-22DE-41A0-9AEB-CFD00EBAC7E5}.Release|Win32.Build.0 = Release|Win32
-		{4FBE4FC1-22DE-41A0-9AEB-CFD00EBAC7E5}.Release|x64.ActiveCfg = Release|Win32
+		{4FBE4FC1-22DE-41A0-9AEB-CFD00EBAC7E5}.Release|x64.ActiveCfg = Release|x64
+		{4FBE4FC1-22DE-41A0-9AEB-CFD00EBAC7E5}.Release|x64.Build.0 = Release|x64
+		{563E9905-3657-460C-AE63-0AC39D162E23}.Debug|Win32.ActiveCfg = Debug|Win32
+		{563E9905-3657-460C-AE63-0AC39D162E23}.Debug|Win32.Build.0 = Debug|Win32
+		{563E9905-3657-460C-AE63-0AC39D162E23}.Debug|x64.ActiveCfg = Debug|x64
+		{563E9905-3657-460C-AE63-0AC39D162E23}.Debug|x64.Build.0 = Debug|x64
+		{563E9905-3657-460C-AE63-0AC39D162E23}.Release|Win32.ActiveCfg = Release|Win32
+		{563E9905-3657-460C-AE63-0AC39D162E23}.Release|Win32.Build.0 = Release|Win32
+		{563E9905-3657-460C-AE63-0AC39D162E23}.Release|x64.ActiveCfg = Release|x64
+		{563E9905-3657-460C-AE63-0AC39D162E23}.Release|x64.Build.0 = Release|x64
+		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug|Win32.Build.0 = Debug|Win32
+		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug|x64.ActiveCfg = Debug|x64
+		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Debug|x64.Build.0 = Debug|x64
+		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Release|Win32.ActiveCfg = Release|Win32
+		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Release|Win32.Build.0 = Release|Win32
+		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Release|x64.ActiveCfg = Release|x64
+		{A3A04E47-43A2-4C08-90B3-029CEF558594}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} = {FAC6B1DA-4242-4891-81CB-F366A8FC655F}
+		{8072769E-CF10-48BF-B9E1-12752A5DAC6E} = {FAC6B1DA-4242-4891-81CB-F366A8FC655F}
+		{4FBE4FC1-22DE-41A0-9AEB-CFD00EBAC7E5} = {FAC6B1DA-4242-4891-81CB-F366A8FC655F}
+		{BD537C9A-FECA-1BAD-6757-8A6348EA12C8} = {FAC6B1DA-4242-4891-81CB-F366A8FC655F}
+	EndGlobalSection
 	GlobalSection(DPCodeReviewSolutionGUID) = preSolution
 		DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}
 	EndGlobalSection
diff --git a/win/VC90/TrinityCore.vcproj b/win/VC90/TrinityCore.vcproj
deleted file mode 100644
index ef2b76ae774..00000000000
--- a/win/VC90/TrinityCore.vcproj
+++ /dev/null
@@ -1,504 +0,0 @@
-
-
-	
-		
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-	
-	
-	
-
diff --git a/win/VC90/TrinityRealm.vcproj b/win/VC90/TrinityRealm.vcproj
deleted file mode 100644
index 68927fbc4ab..00000000000
--- a/win/VC90/TrinityRealm.vcproj
+++ /dev/null
@@ -1,475 +0,0 @@
-
-
-	
-		
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-	
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-	
-	
-	
-
diff --git a/win/VC90/authserver.vcproj b/win/VC90/authserver.vcproj
new file mode 100644
index 00000000000..af3b474ff69
--- /dev/null
+++ b/win/VC90/authserver.vcproj
@@ -0,0 +1,477 @@
+
+
+	
+		
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+	
+	
+	
+
diff --git a/win/VC90/game.vcproj b/win/VC90/game.vcproj
index 862ad8a579b..aed9f2ff179 100644
--- a/win/VC90/game.vcproj
+++ b/win/VC90/game.vcproj
@@ -49,19 +49,20 @@
 				AdditionalOptions="/MP /Zm200"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\externals;..\..\externals\g3dlite;..\..\externals\mersennetwister;..\..\externals\zlib;..\..\src\server\collision;..\..\src\server\collision\Management;..\..\src\server\collision\Maps;..\..\src\server\collision\Models;..\..\src\server\shared;..\..\src\server\shared\Configuration;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Cryptography\Authentication;..\..\src\server\shared\Database;..\..\src\server\shared\DataStores;..\..\src\server\shared\Debugging;..\..\src\server\shared\Dynamic\CountedReference;..\..\src\server\shared\Dynamic\LinkedReference;..\..\src\server\shared\Dynamic;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\game;..\..\src\server\game\Accounts;..\..\src\server\game\Achievements;..\..\src\server\game\Addons;..\..\src\server\game\AI;..\..\src\server\game\AI\CoreAI;..\..\src\server\game\AI\EventAI;..\..\src\server\game\AI\ScriptedAI;..\..\src\server\game\AuctionHouse;..\..\src\server\game\AuctionHouse\AuctionHouseBot;..\..\src\server\game\BattleGrounds;..\..\src\server\game\BattleGrounds\Zones;..\..\src\server\game\Calendar;..\..\src\server\game\Chat;..\..\src\server\game\Chat\Channels;..\..\src\server\game\Chat\Commands;..\..\src\server\game\Combat;..\..\src\server\game\Conditions;..\..\src\server\game\DataStores;..\..\src\server\game\DungeonFinding;..\..\src\server\game\Entities;..\..\src\server\game\Entities\Creature;..\..\src\server\game\Entities\Corpse;..\..\src\server\game\Entities\DynamicObject;..\..\src\server\game\Entities\GameObject;..\..\src\server\game\Entities\Item;..\..\src\server\game\Entities\Item\Container;..\..\src\server\game\Entities\Object;..\..\src\server\game\Entities\Object\Updates;..\..\src\server\game\Entities\Pet;..\..\src\server\game\Entities\Player;..\..\src\server\game\Entities\Totem;..\..\src\server\game\Entities\Unit;..\..\src\server\game\Entities\Vehicle;..\..\src\server\game\Entities\Transport;..\..\src\server\game\Events;..\..\src\server\game\Globals;..\..\src\server\game\Grids\Cells;..\..\src\server\game\Grids\Notifiers;..\..\src\server\game\Grids;..\..\src\server\game\Groups;..\..\src\server\game\Guilds;..\..\src\server\game\Instances;..\..\src\server\game\Loot;..\..\src\server\game\Mails;..\..\src\server\game\Maps;..\..\src\server\game\Miscellaneous;..\..\src\server\game\Movement;..\..\src\server\game\Movement\MovementGenerators;..\..\src\server\game\Movement\Waypoints;..\..\src\server\game\OutdoorPvP;..\..\src\server\game\OutdoorPvP\Zones;..\..\src\server\game\Pools;..\..\src\server\game\PrecompiledHeaders;..\..\src\server\game\Quests;..\..\src\server\game\Reputation;..\..\src\server\game\Scripting;..\..\src\server\game\Server;..\..\src\server\game\Server\Protocol;..\..\src\server\game\Server\Protocol\Handlers;..\..\src\server\game\Skills;..\..\src\server\game\Spells;..\..\src\server\game\Spells\Auras;..\..\src\server\game\Tools;..\..\src\server\game\Weather;..\..\src\server\game\World"
-				PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="WIN32;TRINITY_DEBUG;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="false"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="true"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="WinCorePCH.h"
 				PrecompiledHeaderFile=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\$(ProjectName).pch"
-				AssemblerListingLocation=".\game__$(PlatformName)_$(ConfigurationName)\"
-				ObjectFile=".\game__$(PlatformName)_$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\game__$(PlatformName)_$(ConfigurationName)\"
+				AssemblerListingLocation=""
+				ObjectFile=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
+				ProgramDataBaseFileName=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="false"
@@ -135,19 +136,20 @@
 				AdditionalOptions="/MP /bigobj /Zm200"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\externals;..\..\externals\g3dlite;..\..\externals\mersennetwister;..\..\externals\zlib;..\..\src\server\collision;..\..\src\server\collision\Management;..\..\src\server\collision\Maps;..\..\src\server\collision\Models;..\..\src\server\shared;..\..\src\server\shared\Configuration;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Cryptography\Authentication;..\..\src\server\shared\Database;..\..\src\server\shared\DataStores;..\..\src\server\shared\Debugging;..\..\src\server\shared\Dynamic\CountedReference;..\..\src\server\shared\Dynamic\LinkedReference;..\..\src\server\shared\Dynamic;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\game;..\..\src\server\game\Accounts;..\..\src\server\game\Achievements;..\..\src\server\game\Addons;..\..\src\server\game\AI;..\..\src\server\game\AI\CoreAI;..\..\src\server\game\AI\EventAI;..\..\src\server\game\AI\ScriptedAI;..\..\src\server\game\AuctionHouse;..\..\src\server\game\AuctionHouse\AuctionHouseBot;..\..\src\server\game\BattleGrounds;..\..\src\server\game\BattleGrounds\Zones;..\..\src\server\game\Calendar;..\..\src\server\game\Chat;..\..\src\server\game\Chat\Channels;..\..\src\server\game\Chat\Commands;..\..\src\server\game\Combat;..\..\src\server\game\Conditions;..\..\src\server\game\DataStores;..\..\src\server\game\DungeonFinding;..\..\src\server\game\Entities;..\..\src\server\game\Entities\Creature;..\..\src\server\game\Entities\Corpse;..\..\src\server\game\Entities\DynamicObject;..\..\src\server\game\Entities\GameObject;..\..\src\server\game\Entities\Item;..\..\src\server\game\Entities\Item\Container;..\..\src\server\game\Entities\Object;..\..\src\server\game\Entities\Object\Updates;..\..\src\server\game\Entities\Pet;..\..\src\server\game\Entities\Player;..\..\src\server\game\Entities\Totem;..\..\src\server\game\Entities\Unit;..\..\src\server\game\Entities\Vehicle;..\..\src\server\game\Entities\Transport;..\..\src\server\game\Events;..\..\src\server\game\Globals;..\..\src\server\game\Grids\Cells;..\..\src\server\game\Grids\Notifiers;..\..\src\server\game\Grids;..\..\src\server\game\Groups;..\..\src\server\game\Guilds;..\..\src\server\game\Instances;..\..\src\server\game\Loot;..\..\src\server\game\Mails;..\..\src\server\game\Maps;..\..\src\server\game\Miscellaneous;..\..\src\server\game\Movement;..\..\src\server\game\Movement\MovementGenerators;..\..\src\server\game\Movement\Waypoints;..\..\src\server\game\OutdoorPvP;..\..\src\server\game\OutdoorPvP\Zones;..\..\src\server\game\Pools;..\..\src\server\game\PrecompiledHeaders;..\..\src\server\game\Quests;..\..\src\server\game\Reputation;..\..\src\server\game\Scripting;..\..\src\server\game\Server;..\..\src\server\game\Server\Protocol;..\..\src\server\game\Server\Protocol\Handlers;..\..\src\server\game\Skills;..\..\src\server\game\Spells;..\..\src\server\game\Spells\Auras;..\..\src\server\game\Tools;..\..\src\server\game\Weather;..\..\src\server\game\World"
-				PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="WIN32;TRINITY_DEBUG;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="false"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="true"
+				EnableEnhancedInstructionSet="0"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="WinCorePCH.h"
 				PrecompiledHeaderFile=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\$(ProjectName).pch"
-				AssemblerListingLocation=".\game__$(PlatformName)_$(ConfigurationName)\"
-				ObjectFile=".\game__$(PlatformName)_$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\game__$(PlatformName)_$(ConfigurationName)\"
+				AssemblerListingLocation=""
+				ObjectFile=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
+				ProgramDataBaseFileName=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="false"
@@ -218,7 +220,7 @@
 				AdditionalOptions="/MP /Zm200"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\..\externals;..\..\externals\g3dlite;..\..\externals\mersennetwister;..\..\externals\zlib;..\..\src\server\collision;..\..\src\server\collision\Management;..\..\src\server\collision\Maps;..\..\src\server\collision\Models;..\..\src\server\shared;..\..\src\server\shared\Configuration;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Cryptography\Authentication;..\..\src\server\shared\Database;..\..\src\server\shared\DataStores;..\..\src\server\shared\Debugging;..\..\src\server\shared\Dynamic\CountedReference;..\..\src\server\shared\Dynamic\LinkedReference;..\..\src\server\shared\Dynamic;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\game;..\..\src\server\game\Accounts;..\..\src\server\game\Achievements;..\..\src\server\game\Addons;..\..\src\server\game\AI;..\..\src\server\game\AI\CoreAI;..\..\src\server\game\AI\EventAI;..\..\src\server\game\AI\ScriptedAI;..\..\src\server\game\AuctionHouse;..\..\src\server\game\AuctionHouse\AuctionHouseBot;..\..\src\server\game\BattleGrounds;..\..\src\server\game\BattleGrounds\Zones;..\..\src\server\game\Calendar;..\..\src\server\game\Chat;..\..\src\server\game\Chat\Channels;..\..\src\server\game\Chat\Commands;..\..\src\server\game\Combat;..\..\src\server\game\Conditions;..\..\src\server\game\DataStores;..\..\src\server\game\DungeonFinding;..\..\src\server\game\Entities;..\..\src\server\game\Entities\Creature;..\..\src\server\game\Entities\Corpse;..\..\src\server\game\Entities\DynamicObject;..\..\src\server\game\Entities\GameObject;..\..\src\server\game\Entities\Item;..\..\src\server\game\Entities\Item\Container;..\..\src\server\game\Entities\Object;..\..\src\server\game\Entities\Object\Updates;..\..\src\server\game\Entities\Pet;..\..\src\server\game\Entities\Player;..\..\src\server\game\Entities\Totem;..\..\src\server\game\Entities\Unit;..\..\src\server\game\Entities\Vehicle;..\..\src\server\game\Entities\Transport;..\..\src\server\game\Events;..\..\src\server\game\Globals;..\..\src\server\game\Grids\Cells;..\..\src\server\game\Grids\Notifiers;..\..\src\server\game\Grids;..\..\src\server\game\Groups;..\..\src\server\game\Guilds;..\..\src\server\game\Instances;..\..\src\server\game\Loot;..\..\src\server\game\Mails;..\..\src\server\game\Maps;..\..\src\server\game\Miscellaneous;..\..\src\server\game\Movement;..\..\src\server\game\Movement\MovementGenerators;..\..\src\server\game\Movement\Waypoints;..\..\src\server\game\OutdoorPvP;..\..\src\server\game\OutdoorPvP\Zones;..\..\src\server\game\Pools;..\..\src\server\game\PrecompiledHeaders;..\..\src\server\game\Quests;..\..\src\server\game\Reputation;..\..\src\server\game\Scripting;..\..\src\server\game\Server;..\..\src\server\game\Server\Protocol;..\..\src\server\game\Server\Protocol\Handlers;..\..\src\server\game\Skills;..\..\src\server\game\Spells;..\..\src\server\game\Spells\Auras;..\..\src\server\game\Tools;..\..\src\server\game\Weather;..\..\src\server\game\World"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -228,8 +230,8 @@
 				PrecompiledHeaderThrough="WinCorePCH.h"
 				PrecompiledHeaderFile=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\$(ProjectName).pch"
 				AssemblerListingLocation=""
-				ObjectFile=".\game__$(PlatformName)_$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\game__$(PlatformName)_$(ConfigurationName)\"
+				ObjectFile=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
+				ProgramDataBaseFileName=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="false"
@@ -301,7 +303,7 @@
 				AdditionalOptions="/MP /bigobj /Zm200"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\..\externals;..\..\externals\g3dlite;..\..\externals\mersennetwister;..\..\externals\zlib;..\..\src\server\collision;..\..\src\server\collision\Management;..\..\src\server\collision\Maps;..\..\src\server\collision\Models;..\..\src\server\shared;..\..\src\server\shared\Configuration;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Cryptography\Authentication;..\..\src\server\shared\Database;..\..\src\server\shared\DataStores;..\..\src\server\shared\Debugging;..\..\src\server\shared\Dynamic\CountedReference;..\..\src\server\shared\Dynamic\LinkedReference;..\..\src\server\shared\Dynamic;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\game;..\..\src\server\game\Accounts;..\..\src\server\game\Achievements;..\..\src\server\game\Addons;..\..\src\server\game\AI;..\..\src\server\game\AI\CoreAI;..\..\src\server\game\AI\EventAI;..\..\src\server\game\AI\ScriptedAI;..\..\src\server\game\AuctionHouse;..\..\src\server\game\AuctionHouse\AuctionHouseBot;..\..\src\server\game\BattleGrounds;..\..\src\server\game\BattleGrounds\Zones;..\..\src\server\game\Calendar;..\..\src\server\game\Chat;..\..\src\server\game\Chat\Channels;..\..\src\server\game\Chat\Commands;..\..\src\server\game\Combat;..\..\src\server\game\Conditions;..\..\src\server\game\DataStores;..\..\src\server\game\DungeonFinding;..\..\src\server\game\Entities;..\..\src\server\game\Entities\Creature;..\..\src\server\game\Entities\Corpse;..\..\src\server\game\Entities\DynamicObject;..\..\src\server\game\Entities\GameObject;..\..\src\server\game\Entities\Item;..\..\src\server\game\Entities\Item\Container;..\..\src\server\game\Entities\Object;..\..\src\server\game\Entities\Object\Updates;..\..\src\server\game\Entities\Pet;..\..\src\server\game\Entities\Player;..\..\src\server\game\Entities\Totem;..\..\src\server\game\Entities\Unit;..\..\src\server\game\Entities\Vehicle;..\..\src\server\game\Entities\Transport;..\..\src\server\game\Events;..\..\src\server\game\Globals;..\..\src\server\game\Grids\Cells;..\..\src\server\game\Grids\Notifiers;..\..\src\server\game\Grids;..\..\src\server\game\Groups;..\..\src\server\game\Guilds;..\..\src\server\game\Instances;..\..\src\server\game\Loot;..\..\src\server\game\Mails;..\..\src\server\game\Maps;..\..\src\server\game\Miscellaneous;..\..\src\server\game\Movement;..\..\src\server\game\Movement\MovementGenerators;..\..\src\server\game\Movement\Waypoints;..\..\src\server\game\OutdoorPvP;..\..\src\server\game\OutdoorPvP\Zones;..\..\src\server\game\Pools;..\..\src\server\game\PrecompiledHeaders;..\..\src\server\game\Quests;..\..\src\server\game\Reputation;..\..\src\server\game\Scripting;..\..\src\server\game\Server;..\..\src\server\game\Server\Protocol;..\..\src\server\game\Server\Protocol\Handlers;..\..\src\server\game\Skills;..\..\src\server\game\Spells;..\..\src\server\game\Spells\Auras;..\..\src\server\game\Tools;..\..\src\server\game\Weather;..\..\src\server\game\World"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -310,9 +312,9 @@
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="WinCorePCH.h"
 				PrecompiledHeaderFile=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\$(ProjectName).pch"
-				AssemblerListingLocation=".\game__$(PlatformName)_$(ConfigurationName)\"
-				ObjectFile=".\game__$(PlatformName)_$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\game__$(PlatformName)_$(ConfigurationName)\"
+				AssemblerListingLocation=""
+				ObjectFile=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
+				ProgramDataBaseFileName=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="false"
diff --git a/win/VC90/genrevision.vcproj b/win/VC90/genrevision.vcproj
index 13eda318a32..662a3e9a9e2 100644
--- a/win/VC90/genrevision.vcproj
+++ b/win/VC90/genrevision.vcproj
@@ -44,11 +44,11 @@
 			
 			
 			
+
+	
+		
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+	
+	
+	
+
-- 
cgit v1.2.3


From 968c27f55f02551dcc0385e587b848facae10ed7 Mon Sep 17 00:00:00 2001
From: Machiavelli 
Date: Wed, 23 Jun 2010 01:59:32 +0200
Subject: Implement taxi/transport event scripts support. Author: Vladimir

--HG--
branch : trunk
---
 src/server/game/DataStores/DBCStructure.h          |  4 +--
 src/server/game/DataStores/DBCfmt.h                |  2 +-
 src/server/game/Entities/GameObject/GameObject.h   | 10 ++++++
 src/server/game/Entities/Transport/Transport.cpp   | 19 +++++++++--
 src/server/game/Entities/Transport/Transport.h     | 11 +++++--
 src/server/game/Globals/ObjectMgr.cpp              | 37 ++++++++++------------
 .../WaypointMovementGenerator.cpp                  | 15 +++++++++
 .../MovementGenerators/WaypointMovementGenerator.h |  2 ++
 8 files changed, 72 insertions(+), 28 deletions(-)

(limited to 'src')

diff --git a/src/server/game/DataStores/DBCStructure.h b/src/server/game/DataStores/DBCStructure.h
index 5d195530021..e6486baab66 100644
--- a/src/server/game/DataStores/DBCStructure.h
+++ b/src/server/game/DataStores/DBCStructure.h
@@ -1716,8 +1716,8 @@ struct TaxiPathNodeEntry
     float     z;                                            // 6        m_LocZ
     uint32    actionFlag;                                   // 7        m_flags
     uint32    delay;                                        // 8        m_delay
-                                                            // 9        m_arrivalEventID
-                                                            // 10       m_departureEventID
+    uint32    arrivalEventID;                               // 9        m_arrivalEventID
+    uint32    departureEventID;                             // 10       m_departureEventID
 };
 
 struct TotemCategoryEntry
diff --git a/src/server/game/DataStores/DBCfmt.h b/src/server/game/DataStores/DBCfmt.h
index e791e304d8c..c951e9fa3c2 100644
--- a/src/server/game/DataStores/DBCfmt.h
+++ b/src/server/game/DataStores/DBCfmt.h
@@ -110,7 +110,7 @@ const char TalentEntryfmt[]="niiiiiiiixxxxixxixxxxxx";
 const char TalentTabEntryfmt[]="nxxxxxxxxxxxxxxxxxxxiiix";
 const char TaxiNodesEntryfmt[]="nifffssssssssssssssssxii";
 const char TaxiPathEntryfmt[]="niii";
-const char TaxiPathNodeEntryfmt[]="diiifffiixx";
+const char TaxiPathNodeEntryfmt[]="diiifffiiii";
 const char TotemCategoryEntryfmt[]="nxxxxxxxxxxxxxxxxxii";
 const char VehicleEntryfmt[]="niffffiiiiiiiifffffffffffffffssssfifiixx";
 const char VehicleSeatEntryfmt[]="niiffffffffffiiiiiifffffffiiifffiiiiiiiffiiiiixxxxxxxxxxxx";
diff --git a/src/server/game/Entities/GameObject/GameObject.h b/src/server/game/Entities/GameObject/GameObject.h
index db7f74cb412..b95ea0b7788 100644
--- a/src/server/game/Entities/GameObject/GameObject.h
+++ b/src/server/game/Entities/GameObject/GameObject.h
@@ -500,6 +500,16 @@ struct GameObjectInfo
             default: return 0;
         }
     }
+    uint32 GetEventScriptId() const
+    {
+        switch(type)
+        {
+            case GAMEOBJECT_TYPE_GOOBER:        return goober.eventId;
+            case GAMEOBJECT_TYPE_CHEST:         return chest.eventId;
+            case GAMEOBJECT_TYPE_CAMERA:        return camera.eventID;
+            default: return 0;
+        }
+ 	}
 };
 
 class OPvPCapturePoint;
diff --git a/src/server/game/Entities/Transport/Transport.cpp b/src/server/game/Entities/Transport/Transport.cpp
index a8ac5bbb0b8..3956dcda184 100644
--- a/src/server/game/Entities/Transport/Transport.cpp
+++ b/src/server/game/Entities/Transport/Transport.cpp
@@ -310,7 +310,8 @@ bool Transport::GenerateWaypoints(uint32 pathid, std::set &mapids)
     if (keyFrames[keyFrames.size() - 1].node->mapid != keyFrames[0].node->mapid)
         teleport = true;
 
-    WayPoint pos(keyFrames[0].node->mapid, keyFrames[0].node->x, keyFrames[0].node->y, keyFrames[0].node->z, teleport, 0);
+    WayPoint pos(keyFrames[0].node->mapid, keyFrames[0].node->x, keyFrames[0].node->y, keyFrames[0].node->z, teleport, 0,
+        keyFrames[0].node->arrivalEventID, keyFrames[0].node->departureEventID);
     m_WayPoints[0] = pos;
     t += keyFrames[0].node->delay * 1000;
 
@@ -390,8 +391,8 @@ bool Transport::GenerateWaypoints(uint32 pathid, std::set &mapids)
             cM = keyFrames[i + 1].node->mapid;
         }
 
-        WayPoint pos(keyFrames[i + 1].node->mapid, keyFrames[i + 1].node->x, keyFrames[i + 1].node->y, keyFrames[i + 1].node->z, teleport, 0);
-
+        WayPoint pos(keyFrames[i + 1].node->mapid, keyFrames[i + 1].node->x, keyFrames[i + 1].node->y, keyFrames[i + 1].node->z, teleport,
+            0, keyFrames[i + 1].node->arrivalEventID, keyFrames[i + 1].node->departureEventID);
         //        sLog.outString("T: %d, x: %f, y: %f, z: %f, t:%d", t, pos.x, pos.y, pos.z, teleport);
 /*
         if (keyFrames[i+1].delay > 5)
@@ -494,9 +495,13 @@ void Transport::Update(uint32 /*p_time*/)
     m_timer = getMSTime() % m_period;
     while (((m_timer - m_curr->first) % m_pathTime) > ((m_next->first - m_curr->first) % m_pathTime))
     {
+        DoEventIfAny(*m_curr, true);
+
         m_curr = GetNextWayPoint();
         m_next = GetNextWayPoint();
 
+        DoEventIfAny(*m_curr,false);
+
         // first check help in case client-server transport coordinates de-synchronization
         if (m_curr->second.mapid != GetMapId() || m_curr->second.teleport)
         {
@@ -582,3 +587,11 @@ void Transport::UpdateForMap(Map const* targetMap)
     }
 }
 
+void Transport::DoEventIfAny(WayPointMap::value_type const& node, bool departure)
+{
+    if (uint32 eventid = departure ? node.second.departureEventID : node.second.arrivalEventID)
+    {
+        sLog.outDebug("Taxi %s event %u of node %u of %s path", departure ? "departure" : "arrival", eventid, node.first, GetName());
+        GetMap()->ScriptsStart(sEventScripts, eventid, this, this);
+    }
+}
diff --git a/src/server/game/Entities/Transport/Transport.h b/src/server/game/Entities/Transport/Transport.h
index 0bc3322ce35..ba17ead0547 100644
--- a/src/server/game/Entities/Transport/Transport.h
+++ b/src/server/game/Entities/Transport/Transport.h
@@ -46,14 +46,20 @@ class Transport : public GameObject
         struct WayPoint
         {
             WayPoint() : mapid(0), x(0), y(0), z(0), teleport(false), id(0) {}
-            WayPoint(uint32 _mapid, float _x, float _y, float _z, bool _teleport, uint32 _id) :
-            mapid(_mapid), x(_x), y(_y), z(_z), teleport(_teleport), id(_id) {}
+            WayPoint(uint32 _mapid, float _x, float _y, float _z, bool _teleport, uint32 _id = 0, 
+                uint32 _arrivalEventID = 0, uint32 _departureEventID = 0)
+                : mapid(_mapid), x(_x), y(_y), z(_z), teleport(_teleport), id(_id),
+                arrivalEventID(_arrivalEventID), departureEventID(_departureEventID)
+            {
+            }
             uint32 mapid;
             float x;
             float y;
             float z;
             bool teleport;
             uint32 id;
+            uint32 arrivalEventID;
+            uint32 departureEventID;
         };
 
         typedef std::map WayPointMap;
@@ -73,6 +79,7 @@ class Transport : public GameObject
     private:
         void TeleportTransport(uint32 newMapid, float x, float y, float z);
         void UpdateForMap(Map const* map);
+        void DoEventIfAny(WayPointMap::value_type const& node, bool departure);
         WayPointMap::const_iterator GetNextWayPoint();
 };
 #endif
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index 99b12743237..111de39a194 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -4813,26 +4813,9 @@ void ObjectMgr::LoadEventScripts()
     // Load all possible script entries from gameobjects
     for (uint32 i = 1; i < sGOStorage.MaxEntry; ++i)
     {
-        GameObjectInfo const * goInfo = sGOStorage.LookupEntry(i);
-        if (goInfo)
-        {
-            switch(goInfo->type)
-            {
-                case GAMEOBJECT_TYPE_GOOBER:
-                    if (goInfo->goober.eventId)
-                        evt_scripts.insert(goInfo->goober.eventId);
-                    break;
-                case GAMEOBJECT_TYPE_CHEST:
-                    if (goInfo->chest.eventId)
-                        evt_scripts.insert(goInfo->chest.eventId);
-                    break;
-                case GAMEOBJECT_TYPE_CAMERA:
-                    if (goInfo->camera.eventID)
-                        evt_scripts.insert(goInfo->camera.eventID);
-                default:
-                    break;
-            }
-        }
+        if (GameObjectInfo const * goInfo = sGOStorage.LookupEntry(i))
+            if (uint32 eventId = goInfo->GetEventScriptId())
+                evt_scripts.insert(eventId);
     }
     // Load all possible script entries from spells
     for (uint32 i = 1; i < sSpellStore.GetNumRows(); ++i)
@@ -4851,6 +4834,20 @@ void ObjectMgr::LoadEventScripts()
         }
     }
 
+    for(size_t path_idx = 0; path_idx < sTaxiPathNodesByPath.size(); ++path_idx)
+    {
+        for(size_t node_idx = 0; node_idx < sTaxiPathNodesByPath[path_idx].size(); ++node_idx)
+        {
+            TaxiPathNodeEntry const& node = sTaxiPathNodesByPath[path_idx][node_idx];
+
+            if (node.arrivalEventID)
+                evt_scripts.insert(node.arrivalEventID);
+
+            if (node.departureEventID)
+                evt_scripts.insert(node.departureEventID);
+        }
+    }
+
     // Then check if all scripts are in above list of possible script entries
     for (ScriptMapMap::const_iterator itr = sEventScripts.begin(); itr != sEventScripts.end(); ++itr)
     {
diff --git a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
index 2f9e4ce602e..beb5186a8b2 100644
--- a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
@@ -278,10 +278,14 @@ bool FlightPathMovementGenerator::Update(Player &player, const uint32 &diff)
             i_destinationHolder.ResetUpdate(FLIGHT_TRAVEL_UPDATE);
             if (i_destinationHolder.HasArrived())
             {
+                DoEventIfAny(player,(*i_path)[i_currentNode], false);
+
                 uint32 curMap = (*i_path)[i_currentNode].mapid;
                 ++i_currentNode;
                 if (MovementInProgress())
                 {
+                    DoEventIfAny(player,(*i_path)[i_currentNode], true);
+
                     DEBUG_LOG("loading node %u for player %s", i_currentNode, player.GetName());
                     if ((*i_path)[i_currentNode].mapid == curMap)
                     {
@@ -351,6 +355,17 @@ void FlightPathMovementGenerator::PreloadEndGrid()
         sLog.outDetail("Unable to determine map to preload flightmaster grid");
 }
 
+void FlightPathMovementGenerator::DoEventIfAny(Player& player, TaxiPathNodeEntry const& node, bool departure)
+{
+    if (uint32 eventid = departure ? node.departureEventID : node.arrivalEventID)
+    {
+        sLog.outDebug("Taxi %s event %u of node %u of path %u for player %s", departure ? "departure" : "arrival", eventid, node.index, node.path, player.GetName());
+        player.GetMap()->ScriptsStart(sEventScripts, eventid, &player, &player);
+    }
+}
+
+
+
 //
 // Unique1's ASTAR Pathfinding Code... For future use & reference...
 //
diff --git a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
index a03ff223b8e..c6d89ecd9b3 100644
--- a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
+++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
@@ -115,6 +115,8 @@ public PathMovementBase
         bool HasArrived() const { return (i_currentNode >= i_path->size()); }
         void SetCurrentNodeAfterTeleport();
         void SkipCurrentNode() { ++i_currentNode; }
+        void DoEventIfAny(Player& player, TaxiPathNodeEntry const& node, bool departure);
+
         bool GetDestination(float& x, float& y, float& z) const { return PathMovementBase::GetDestination(x,y,z); }
 
         void PreloadEndGrid();
-- 
cgit v1.2.3


From b917d5029ed6d10547633a587751d8a7dee5b962 Mon Sep 17 00:00:00 2001
From: Machiavelli 
Date: Wed, 23 Jun 2010 02:03:50 +0200
Subject: Preload grid on flightpath 2 nodes before final node instead of
 halfway. Previous setup could preload grid in a long flight and unload it
 again in the very same flight.

--HG--
branch : trunk
---
 .../game/Movement/MovementGenerators/WaypointMovementGenerator.cpp      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
index beb5186a8b2..4cadfe1cfb6 100644
--- a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
@@ -335,7 +335,7 @@ void FlightPathMovementGenerator::InitEndGridInfo()
 
     uint32 nodeCount = (*i_path).size();        // Get the number of nodes in the path.
     m_endMapId = (*i_path)[nodeCount -1].mapid; // Get the map ID from the last node
-    m_preloadTargetNode = nodeCount / 2;        // Split the number of nodes in half to preload the flightmaster half-way through the flight
+    m_preloadTargetNode = nodeCount - 3;        // 2 nodes before the final node, we pre-load the grid
     m_endGridX = (*i_path)[nodeCount -1].x;     // Get the X position from the last node
     m_endGridY = (*i_path)[nodeCount -1].y;     // Get the Y position from the last node
 }
-- 
cgit v1.2.3


From 31e369b281125813d691c9b7b3180d0e8e0da722 Mon Sep 17 00:00:00 2001
From: Machiavelli 
Date: Wed, 23 Jun 2010 03:35:12 +0200
Subject: Remove obsolete table transport_event_scripts.

--HG--
branch : trunk
---
 src/server/game/Entities/Transport/Transport.cpp | 10 -------
 src/server/game/Entities/Transport/Transport.h   |  1 -
 src/server/game/Globals/ObjectMgr.cpp            | 34 ------------------------
 src/server/game/Globals/ObjectMgr.h              |  4 ---
 src/server/game/World/World.cpp                  |  3 ---
 5 files changed, 52 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Transport/Transport.cpp b/src/server/game/Entities/Transport/Transport.cpp
index 3956dcda184..e1577237125 100644
--- a/src/server/game/Entities/Transport/Transport.cpp
+++ b/src/server/game/Entities/Transport/Transport.cpp
@@ -480,13 +480,6 @@ bool Transport::RemovePassenger(Player* passenger)
     return true;
 }
 
-void Transport::CheckForEvent(uint32 entry, uint32 wp_id)
-{
-    uint32 key = entry*100+wp_id;
-    if (objmgr.TransportEventMap.find(key) != objmgr.TransportEventMap.end())
-        GetMap()->ScriptsStart(sEventScripts, objmgr.TransportEventMap[key], this, NULL);
-}
-
 void Transport::Update(uint32 /*p_time*/)
 {
     if (m_WayPoints.size() <= 1)
@@ -548,9 +541,6 @@ void Transport::Update(uint32 /*p_time*/)
 
         if ((sLog.getLogFilter() & LOG_FILTER_TRANSPORT_MOVES) == 0)
             sLog.outDetail("%s moved to %d %f %f %f %d", this->m_name.c_str(), m_curr->second.id, m_curr->second.x, m_curr->second.y, m_curr->second.z, m_curr->second.mapid);
-
-        //Transport Event System
-        CheckForEvent(this->GetEntry(), m_curr->second.id);
     }
 }
 
diff --git a/src/server/game/Entities/Transport/Transport.h b/src/server/game/Entities/Transport/Transport.h
index ba17ead0547..7b93d3e28a8 100644
--- a/src/server/game/Entities/Transport/Transport.h
+++ b/src/server/game/Entities/Transport/Transport.h
@@ -37,7 +37,6 @@ class Transport : public GameObject
         void Update(uint32 p_time);
         bool AddPassenger(Player* passenger);
         bool RemovePassenger(Player* passenger);
-        void CheckForEvent(uint32 entry, uint32 wp_id);
 
         typedef std::set PlayerSet;
         PlayerSet const& GetPassengers() const { return m_passengers; }
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index 111de39a194..bab1add0132 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -8598,40 +8598,6 @@ CreatureInfo const *GetCreatureInfo(uint32 id)
     return objmgr.GetCreatureTemplate(id);
 }
 
-void ObjectMgr::LoadTransportEvents()
-{
-
-    QueryResult_AutoPtr result = WorldDatabase.Query("SELECT entry, waypoint_id, event_id FROM transport_events");
-
-    if (!result)
-    {
-        barGoLink bar1(1);
-        bar1.step();
-        sLog.outString("\n>> Transport events table is empty \n");
-        return;
-    }
-
-    barGoLink bar1(result->GetRowCount());
-
-    do
-    {
-        bar1.step();
-
-        Field *fields = result->Fetch();
-
-        //Load event values
-        uint32 entry = fields[0].GetUInt32();
-        uint32 waypoint_id = fields[1].GetUInt32();
-        uint32 event_id = fields[2].GetUInt32();
-
-        uint32 event_count = (entry*100)+waypoint_id;
-        TransportEventMap[event_count] = event_id;
-    }
-    while (result->NextRow());
-
-    sLog.outString("\n>> Loaded %u transport events \n", result->GetRowCount());
-}
-
 CreatureInfo const* GetCreatureTemplateStore(uint32 entry)
 {
     return sCreatureStorage.LookupEntry(entry);
diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h
index d4eb7f819bd..b1a5bd0e1cd 100644
--- a/src/server/game/Globals/ObjectMgr.h
+++ b/src/server/game/Globals/ObjectMgr.h
@@ -382,8 +382,6 @@ class ObjectMgr
 
         typedef std::vector ScriptNameMap;
 
-        UNORDERED_MAP TransportEventMap;
-
         Player* GetPlayer(const char* name) const { return ObjectAccessor::Instance().FindPlayerByName(name);}
         Player* GetPlayer(uint64 guid) const { return ObjectAccessor::FindPlayer(guid); }
 
@@ -589,8 +587,6 @@ class ObjectMgr
         void LoadGossipScripts();
         void LoadWaypointScripts();
 
-        void LoadTransportEvents();
-
         bool LoadTrinityStrings(DatabaseType& db, char const* table, int32 min_value, int32 max_value);
         bool LoadTrinityStrings() { return LoadTrinityStrings(WorldDatabase,"trinity_string",MIN_TRINITY_STRING_ID,MAX_TRINITY_STRING_ID); }
         void LoadDbScriptStrings();
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
index 3b3f1bf4e06..2b6f84fbc1e 100644
--- a/src/server/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
@@ -1695,9 +1695,6 @@ void World::SetInitialWorldSettings()
     sLog.outString("Loading Transports...");
     MapManager::Instance().LoadTransports();
 
-    sLog.outString("Loading Transports Events...");
-    objmgr.LoadTransportEvents();
-
     sLog.outString("Deleting expired bans...");
     LoginDatabase.Execute("DELETE FROM ip_banned WHERE unbandate <= UNIX_TIMESTAMP() AND unbandate<>bandate");
 
-- 
cgit v1.2.3


From 05976b7708cf5e4ffe9fc70d0b530d31c9a96665 Mon Sep 17 00:00:00 2001
From: Xanadu 
Date: Wed, 23 Jun 2010 03:45:44 +0200
Subject: Fixed Divine Hymn, Hymn of Hope, Dispersion and Amplify Magic being
 erroneously displayed as debuffs, instead of buffs. Based on previous
 thenecromancer's implementation.

--HG--
branch : trunk
---
 src/server/game/Spells/SpellMgr.cpp | 44 +++++++++++++++++++++++++++----------
 1 file changed, 33 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp
index ee59e2821af..f89a0650729 100644
--- a/src/server/game/Spells/SpellMgr.cpp
+++ b/src/server/game/Spells/SpellMgr.cpp
@@ -750,20 +750,42 @@ bool SpellMgr::_isPositiveEffect(uint32 spellId, uint32 effIndex, bool deep) con
     if (spellproto->Attributes & SPELL_ATTR_NEGATIVE_1)
         return false;
 
-    switch(spellId)
+    switch (spellproto->SpellFamilyName)
     {
-        //case 37675:                                         // Chaos Blast removed from mangos
-        case 34700:                                         // Allergic Reaction
-        case 61987:                                         // Avenging Wrath Marker
-        case 61988:                                         // Divine Shield exclude aura
-        case 50524:                                         // Runic Power Feed
-            return false;
-        case 12042:                                         // Arcane Power
-        case 30877:                                         // Tag Murloc
-            return true;
+        case SPELLFAMILY_GENERIC:
+            switch (spellId)
+            {
+                case 34700: // Allergic Reaction
+                case 61987: // Avenging Wrath Marker
+                case 61988: // Divine Shield exclude aura
+                    return false;
+                case 30877: // Tag Murloc
+                    return true;
+                default:
+                    break;
+            }
+            break;
+        case SPELLFAMILY_MAGE:
+            // Amplify Magic, Dampen Magic
+            if (spellproto->SpellFamilyFlags[0] == 0x00002000)
+                return true;
+            break;
+        case SPELLFAMILY_PRIEST:
+            switch (spellId)
+            {
+                case 64844: // Divine Hymn
+                case 64904: // Hymn of Hope
+                case 47585: // Dispersion
+                    return true;
+                default:
+                    break;
+            }
+            break;
+        default:
+            break;
     }
 
-    switch(spellproto->Mechanic)
+    switch (spellproto->Mechanic)
     {
         case MECHANIC_IMMUNE_SHIELD:
             return true;
-- 
cgit v1.2.3


From 30a59b7b6953a7f82f0d5c8c5c5d6fd7c1ee78e4 Mon Sep 17 00:00:00 2001
From: Xanadu 
Date: Wed, 23 Jun 2010 05:04:24 +0200
Subject: Mobs can no longer crit with spells. Closes issue #1704. Based on
 patch by PSZ.

--HG--
branch : trunk
---
 src/server/game/Entities/Unit/Unit.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src')

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 6764b454c4f..76b87985dec 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -10367,6 +10367,10 @@ int32 Unit::SpellBaseDamageBonusForVictim(SpellSchoolMask schoolMask, Unit *pVic
 
 bool Unit::isSpellCrit(Unit *pVictim, SpellEntry const *spellProto, SpellSchoolMask schoolMask, WeaponAttackType attackType) const
 {
+    // Mobs can't crit with spells.
+    if (IS_CREATURE_GUID(GetGUID()))
+        return false;
+    
     // not critting spell
     if ((spellProto->AttributesEx2 & SPELL_ATTR_EX2_CANT_CRIT))
         return false;
-- 
cgit v1.2.3


From 7bf807aee4603896cfc15adc85944654a1ea81c8 Mon Sep 17 00:00:00 2001
From: click 
Date: Wed, 23 Jun 2010 10:16:40 +0200
Subject: Kill off the issues with the map/dbcextractors - and a thanks to
 imbecile@lavabit for the comment about loadlib.h Just now the intent was to
 get it sorted out, as we might merge the tools into one "datatool" for all of
 this stuff.

--HG--
branch : trunk
rename : src/tools/map_extractor/loadlib/adt.cpp => src/tools/map_extractor/adt.cpp
rename : src/tools/map_extractor/loadlib/adt.h => src/tools/map_extractor/adt.h
rename : src/tools/map_extractor/loadlib/loadlib.cpp => src/tools/map_extractor/loadlib.cpp
rename : src/tools/map_extractor/loadlib/wdt.cpp => src/tools/map_extractor/wdt.cpp
rename : src/tools/map_extractor/loadlib/wdt.h => src/tools/map_extractor/wdt.h
---
 src/tools/map_extractor/CMakeLists.txt      |  38 +---
 src/tools/map_extractor/System.cpp          |   4 +-
 src/tools/map_extractor/adt.cpp             | 131 +++++++++++++
 src/tools/map_extractor/adt.h               | 289 ++++++++++++++++++++++++++++
 src/tools/map_extractor/loadlib.cpp         |  65 +++++++
 src/tools/map_extractor/loadlib/adt.cpp     | 131 -------------
 src/tools/map_extractor/loadlib/adt.h       | 289 ----------------------------
 src/tools/map_extractor/loadlib/loadlib.cpp |  65 -------
 src/tools/map_extractor/loadlib/loadlib.h   |  26 +--
 src/tools/map_extractor/loadlib/wdt.cpp     |  62 ------
 src/tools/map_extractor/loadlib/wdt.h       |  68 -------
 src/tools/map_extractor/wdt.cpp             |  62 ++++++
 src/tools/map_extractor/wdt.h               |  68 +++++++
 13 files changed, 634 insertions(+), 664 deletions(-)
 mode change 100644 => 100755 src/tools/map_extractor/System.cpp
 create mode 100644 src/tools/map_extractor/adt.cpp
 create mode 100644 src/tools/map_extractor/adt.h
 create mode 100644 src/tools/map_extractor/loadlib.cpp
 delete mode 100644 src/tools/map_extractor/loadlib/adt.cpp
 delete mode 100644 src/tools/map_extractor/loadlib/adt.h
 delete mode 100644 src/tools/map_extractor/loadlib/loadlib.cpp
 delete mode 100644 src/tools/map_extractor/loadlib/wdt.cpp
 delete mode 100644 src/tools/map_extractor/loadlib/wdt.h
 create mode 100644 src/tools/map_extractor/wdt.cpp
 create mode 100644 src/tools/map_extractor/wdt.h

(limited to 'src')

diff --git a/src/tools/map_extractor/CMakeLists.txt b/src/tools/map_extractor/CMakeLists.txt
index ce5e54ac4f0..a18ee7cd517 100644
--- a/src/tools/map_extractor/CMakeLists.txt
+++ b/src/tools/map_extractor/CMakeLists.txt
@@ -10,41 +10,11 @@
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 file(GLOB sources *.cpp)
-file(GLOB loadlib_sources loadlib/*.cpp)
 
 include_directories (
   ${CMAKE_SOURCE_DIR}/src/server/shared
-  ${CMAKE_SOURCE_DIR}/externals/libmpq
   ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/loadlib
-)
-
-link_directories(
-  ${CMAKE_SOURCE_DIR}/externals/libmpq/libmpq
-  ${CMAKE_CURRENT_SOURCE_DIR}}/loadlib
-)
-
-add_library(loadlib
-  ${loadlib_sources}
-)
-
-if(NOT UNIX)
-  target_link_libraries(loadlib
-    zlib
-  )
-else()
-  target_link_libraries(loadlib
-    ${ZLIB_LIBRARIES}
-  )
-endif()
-
-add_library(libmpq
-  ${CMAKE_SOURCE_DIR}/externals/libmpq/libmpq/common.c
-  ${CMAKE_SOURCE_DIR}/externals/libmpq/libmpq/explode.c
-  ${CMAKE_SOURCE_DIR}/externals/libmpq/libmpq/extract.c
-  ${CMAKE_SOURCE_DIR}/externals/libmpq/libmpq/huffman.c
-  ${CMAKE_SOURCE_DIR}/externals/libmpq/libmpq/mpq.c
-  ${CMAKE_SOURCE_DIR}/externals/libmpq/libmpq/wave.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/loadlib
 )
 
 add_executable(mapextractor
@@ -53,14 +23,12 @@ add_executable(mapextractor
 
 if(WIN32)
   target_link_libraries(mapextractor
-    libmpq
-    loadlib
+    mpq
     bzip2
   )
 else()
   target_link_libraries(mapextractor
-    libmpq
-    loadlib
+    mpq
     ${BZIP2_LIBRARIES}
   )
 endif()
diff --git a/src/tools/map_extractor/System.cpp b/src/tools/map_extractor/System.cpp
old mode 100644
new mode 100755
index 3a328e91bf4..2640b65d8b1
--- a/src/tools/map_extractor/System.cpp
+++ b/src/tools/map_extractor/System.cpp
@@ -14,8 +14,8 @@
 #include "dbcfile.h"
 #include "mpq_libmpq04.h"
 
-#include "loadlib/adt.h"
-#include "loadlib/wdt.h"
+#include "adt.h"
+#include "wdt.h"
 #include 
 
 #if defined( __GNUC__ )
diff --git a/src/tools/map_extractor/adt.cpp b/src/tools/map_extractor/adt.cpp
new file mode 100644
index 00000000000..fde70681113
--- /dev/null
+++ b/src/tools/map_extractor/adt.cpp
@@ -0,0 +1,131 @@
+#define _CRT_SECURE_NO_DEPRECATE
+
+#include "adt.h"
+
+// Helper
+int holetab_h[4] = {0x1111, 0x2222, 0x4444, 0x8888};
+int holetab_v[4] = {0x000F, 0x00F0, 0x0F00, 0xF000};
+
+bool isHole(int holes, int i, int j)
+{
+    int testi = i / 2;
+    int testj = j / 4;
+    if(testi > 3) testi = 3;
+    if(testj > 3) testj = 3;
+    return (holes & holetab_h[testi] & holetab_v[testj]) != 0;
+}
+
+//
+// Adt file loader class
+//
+ADT_file::ADT_file()
+{
+    a_grid = 0;
+}
+
+ADT_file::~ADT_file()
+{
+    free();
+}
+
+void ADT_file::free()
+{
+    a_grid = 0;
+    FileLoader::free();
+}
+
+//
+// Adt file check function
+//
+bool ADT_file::prepareLoadedData()
+{
+    // Check parent
+    if (!FileLoader::prepareLoadedData())
+        return false;
+
+    // Check and prepare MHDR
+    a_grid = (adt_MHDR *)(GetData()+8+version->size);
+    if (!a_grid->prepareLoadedData())
+        return false;
+
+    return true;
+}
+
+bool adt_MHDR::prepareLoadedData()
+{
+    if (fcc != 'MHDR')
+        return false;
+
+    if (size!=sizeof(adt_MHDR)-8)
+        return false;
+
+    // Check and prepare MCIN
+    if (offsMCIN && !getMCIN()->prepareLoadedData())
+        return false;
+
+    // Check and prepare MH2O
+    if (offsMH2O && !getMH2O()->prepareLoadedData())
+        return false;
+
+    return true;
+}
+
+bool adt_MCIN::prepareLoadedData()
+{
+    if (fcc != 'MCIN')
+        return false;
+
+    // Check cells data
+    for (int i=0; iprepareLoadedData())
+                return false;
+
+    return true;
+}
+
+bool adt_MH2O::prepareLoadedData()
+{
+    if (fcc != 'MH2O')
+        return false;
+
+    // Check liquid data
+//    for (int i=0; iprepareLoadedData())
+        return false;
+    // Check liquid data
+    if (offsMCLQ && !getMCLQ()->prepareLoadedData())
+        return false;
+
+    return true;
+}
+
+bool adt_MCVT::prepareLoadedData()
+{
+    if (fcc != 'MCVT')
+        return false;
+
+    if (size != sizeof(adt_MCVT)-8)
+        return false;
+
+    return true;
+}
+
+bool adt_MCLQ::prepareLoadedData()
+{
+    if (fcc != 'MCLQ')
+        return false;
+
+    return true;
+}
\ No newline at end of file
diff --git a/src/tools/map_extractor/adt.h b/src/tools/map_extractor/adt.h
new file mode 100644
index 00000000000..725c5b994ee
--- /dev/null
+++ b/src/tools/map_extractor/adt.h
@@ -0,0 +1,289 @@
+#ifndef ADT_H
+#define ADT_H
+
+#include "loadlib.h"
+
+#define TILESIZE (533.33333f)
+#define CHUNKSIZE ((TILESIZE) / 16.0f)
+#define UNITSIZE (CHUNKSIZE / 8.0f)
+
+enum LiquidType
+{
+    LIQUID_TYPE_WATER = 0,
+    LIQUID_TYPE_OCEAN = 1,
+    LIQUID_TYPE_MAGMA = 2,
+    LIQUID_TYPE_SLIME = 3
+};
+
+//**************************************************************************************
+// ADT file class
+//**************************************************************************************
+#define ADT_CELLS_PER_GRID    16
+#define ADT_CELL_SIZE         8
+#define ADT_GRID_SIZE         (ADT_CELLS_PER_GRID*ADT_CELL_SIZE)
+
+//
+// Adt file height map chunk
+//
+class adt_MCVT
+{
+    union{
+        uint32 fcc;
+        char   fcc_txt[4];
+    };
+    uint32 size;
+public:
+    float height_map[(ADT_CELL_SIZE+1)*(ADT_CELL_SIZE+1)+ADT_CELL_SIZE*ADT_CELL_SIZE];
+
+    bool  prepareLoadedData();
+};
+
+//
+// Adt file liquid map chunk (old)
+//
+class adt_MCLQ
+{
+    union{
+        uint32 fcc;
+        char   fcc_txt[4];
+    };
+    uint32 size;
+public:
+    float height1;
+    float height2;
+    struct liquid_data{
+        uint32 light;
+        float  height;
+    } liquid[ADT_CELL_SIZE+1][ADT_CELL_SIZE+1];
+    
+    // 1<<0 - ochen
+    // 1<<1 - lava/slime
+    // 1<<2 - water
+    // 1<<6 - all water
+    // 1<<7 - dark water
+    // == 0x0F - not show liquid
+    uint8 flags[ADT_CELL_SIZE][ADT_CELL_SIZE];
+    uint8 data[84];
+    bool  prepareLoadedData();
+};
+
+//
+// Adt file cell chunk
+//
+class adt_MCNK
+{
+    union{
+        uint32 fcc;
+        char   fcc_txt[4];
+    };
+    uint32 size;
+public:
+    uint32 flags;
+    uint32 ix;
+    uint32 iy;
+    uint32 nLayers;
+    uint32 nDoodadRefs;
+    uint32 offsMCVT;        // height map
+    uint32 offsMCNR;        // Normal vectors for each vertex
+    uint32 offsMCLY;        // Texture layer definitions
+    uint32 offsMCRF;        // A list of indices into the parent file's MDDF chunk
+    uint32 offsMCAL;        // Alpha maps for additional texture layers
+    uint32 sizeMCAL;
+    uint32 offsMCSH;        // Shadow map for static shadows on the terrain
+    uint32 sizeMCSH;
+    uint32 areaid;
+    uint32 nMapObjRefs;
+    uint32 holes;
+    uint16 s[2];
+    uint32 data1;
+    uint32 data2;
+    uint32 data3;
+    uint32 predTex;
+    uint32 nEffectDoodad;
+    uint32 offsMCSE;
+    uint32 nSndEmitters;
+    uint32 offsMCLQ;         // Liqid level (old)
+    uint32 sizeMCLQ;         //
+    float  zpos;
+    float  xpos;
+    float  ypos;
+    uint32 offsMCCV;         // offsColorValues in WotLK
+    uint32 props;
+    uint32 effectId;
+
+    bool   prepareLoadedData();
+    adt_MCVT *getMCVT()
+    {
+        if (offsMCVT)
+            return (adt_MCVT *)((uint8 *)this + offsMCVT);
+        return 0;
+    }
+    adt_MCLQ *getMCLQ()
+    {
+        if (offsMCLQ)
+            return (adt_MCLQ *)((uint8 *)this + offsMCLQ);
+        return 0;
+    }
+};
+
+//
+// Adt file grid chunk
+//
+class adt_MCIN
+{
+    union{
+        uint32 fcc;
+        char   fcc_txt[4];
+    };
+    uint32 size;
+public:
+    struct adt_CELLS{
+        uint32 offsMCNK;
+        uint32 size;
+        uint32 flags;
+        uint32 asyncId;
+    } cells[ADT_CELLS_PER_GRID][ADT_CELLS_PER_GRID];
+
+    bool   prepareLoadedData();
+    // offset from begin file (used this-84)
+    adt_MCNK *getMCNK(int x, int y)
+    {
+        if (cells[x][y].offsMCNK)
+            return (adt_MCNK *)((uint8 *)this + cells[x][y].offsMCNK - 84);
+        return 0;
+    }
+};
+
+#define ADT_LIQUID_HEADER_FULL_LIGHT   0x01
+#define ADT_LIQUID_HEADER_NO_HIGHT     0x02
+
+struct adt_liquid_header{
+    uint16 liquidType;             // Index from LiquidType.dbc
+    uint16 formatFlags;
+    float  heightLevel1;
+    float  heightLevel2;
+    uint8  xOffset;
+    uint8  yOffset;
+    uint8  width;
+    uint8  height;
+    uint32 offsData2a;
+    uint32 offsData2b;
+};
+
+//
+// Adt file liquid data chunk (new)
+//
+class adt_MH2O
+{
+public:
+    union{
+        uint32 fcc;
+        char   fcc_txt[4];
+    };
+    uint32 size;
+
+    struct adt_LIQUID{
+        uint32 offsData1;
+        uint32 used;
+        uint32 offsData2;
+    } liquid[ADT_CELLS_PER_GRID][ADT_CELLS_PER_GRID];
+
+    bool   prepareLoadedData();
+
+    adt_liquid_header *getLiquidData(int x, int y)
+    {
+        if (liquid[x][y].used && liquid[x][y].offsData1)
+            return (adt_liquid_header *)((uint8*)this + 8 + liquid[x][y].offsData1);
+        return 0;
+    }
+
+    float *getLiquidHeightMap(adt_liquid_header *h) 
+    {
+        if (h->formatFlags & ADT_LIQUID_HEADER_NO_HIGHT)
+            return 0;
+        if (h->offsData2b)
+            return (float *)((uint8*)this + 8 + h->offsData2b);
+        return 0;
+    }
+
+    uint8 *getLiquidLightMap(adt_liquid_header *h) 
+    {
+        if (h->formatFlags&ADT_LIQUID_HEADER_FULL_LIGHT)
+            return 0;
+        if (h->offsData2b)
+        {
+            if (h->formatFlags & ADT_LIQUID_HEADER_NO_HIGHT)
+                return (uint8 *)((uint8*)this + 8 + h->offsData2b);
+            return (uint8 *)((uint8*)this + 8 + h->offsData2b + (h->width+1)*(h->height+1)*4);
+        }
+        return 0;
+    }
+
+    uint32 *getLiquidFullLightMap(adt_liquid_header *h) 
+    {
+        if (!(h->formatFlags&ADT_LIQUID_HEADER_FULL_LIGHT))
+            return 0;
+        if (h->offsData2b)
+        {
+            if (h->formatFlags & ADT_LIQUID_HEADER_NO_HIGHT)
+                return (uint32 *)((uint8*)this + 8 + h->offsData2b);
+            return (uint32 *)((uint8*)this + 8 + h->offsData2b + (h->width+1)*(h->height+1)*4);
+        }
+        return 0;
+    }
+
+    uint64 getLiquidShowMap(adt_liquid_header *h)   
+    {
+        if (h->offsData2a)
+            return *((uint64 *)((uint8*)this + 8 + h->offsData2a));
+        else
+            return 0xFFFFFFFFFFFFFFFFLL;
+    }
+
+};
+
+//
+// Adt file header chunk
+//
+class adt_MHDR
+{
+    union{
+        uint32 fcc;
+        char   fcc_txt[4];
+    };
+    uint32 size;
+
+    uint32 pad;
+    uint32 offsMCIN;           // MCIN
+    uint32 offsTex;	           // MTEX
+    uint32 offsModels;	       // MMDX	
+    uint32 offsModelsIds;	   // MMID	
+    uint32 offsMapObejcts;	   // MWMO	
+    uint32 offsMapObejctsIds;  // MWID		
+    uint32 offsDoodsDef;       // MDDF	
+    uint32 offsObjectsDef;     // MODF
+    uint32 offsMFBO;           // MFBO
+    uint32 offsMH2O;           // MH2O
+    uint32 data1;
+    uint32 data2;
+    uint32 data3;
+    uint32 data4;
+    uint32 data5;
+public:
+    bool prepareLoadedData();
+    adt_MCIN *getMCIN(){ return (adt_MCIN *)((uint8 *)&pad+offsMCIN);}
+    adt_MH2O *getMH2O(){ return offsMH2O ? (adt_MH2O *)((uint8 *)&pad+offsMH2O) : 0;}
+
+};
+
+class ADT_file : public FileLoader{
+public:
+    bool prepareLoadedData();
+    ADT_file();
+    ~ADT_file();
+    void free();
+
+    adt_MHDR *a_grid;
+};
+
+#endif
diff --git a/src/tools/map_extractor/loadlib.cpp b/src/tools/map_extractor/loadlib.cpp
new file mode 100644
index 00000000000..465eb04083f
--- /dev/null
+++ b/src/tools/map_extractor/loadlib.cpp
@@ -0,0 +1,65 @@
+#define _CRT_SECURE_NO_DEPRECATE
+
+#include "loadlib.h"
+#include "mpq_libmpq04.h"
+#include 
+
+class MPQFile;
+
+FileLoader::FileLoader()
+{
+    data = 0;
+    data_size = 0;
+    version = 0;
+}
+
+FileLoader::~FileLoader()
+{
+    free();
+}
+
+bool FileLoader::loadFile(char *filename, bool log)
+{
+    free();
+    MPQFile mf(filename);
+    if(mf.isEof())
+    {
+        if (log)
+            printf("No such file %s\n", filename);
+        return false;
+    }
+
+    data_size = mf.getSize();
+
+    data = new uint8 [data_size];
+    if (data)
+    {
+        mf.read(data, data_size);
+        mf.close();
+        if (prepareLoadedData())
+            return true;
+    }
+    printf("Error loading %s", filename);
+    mf.close();
+    free();
+    return false;
+}
+
+bool FileLoader::prepareLoadedData()
+{
+    // Check version
+    version = (file_MVER *) data;
+    if (version->fcc != 'MVER')
+        return false;
+    if (version->ver != FILE_FORMAT_VERSION)
+        return false;
+    return true;
+}
+
+void FileLoader::free()
+{
+    if (data) delete[] data;
+    data = 0;
+    data_size = 0;
+    version = 0;
+}
diff --git a/src/tools/map_extractor/loadlib/adt.cpp b/src/tools/map_extractor/loadlib/adt.cpp
deleted file mode 100644
index fde70681113..00000000000
--- a/src/tools/map_extractor/loadlib/adt.cpp
+++ /dev/null
@@ -1,131 +0,0 @@
-#define _CRT_SECURE_NO_DEPRECATE
-
-#include "adt.h"
-
-// Helper
-int holetab_h[4] = {0x1111, 0x2222, 0x4444, 0x8888};
-int holetab_v[4] = {0x000F, 0x00F0, 0x0F00, 0xF000};
-
-bool isHole(int holes, int i, int j)
-{
-    int testi = i / 2;
-    int testj = j / 4;
-    if(testi > 3) testi = 3;
-    if(testj > 3) testj = 3;
-    return (holes & holetab_h[testi] & holetab_v[testj]) != 0;
-}
-
-//
-// Adt file loader class
-//
-ADT_file::ADT_file()
-{
-    a_grid = 0;
-}
-
-ADT_file::~ADT_file()
-{
-    free();
-}
-
-void ADT_file::free()
-{
-    a_grid = 0;
-    FileLoader::free();
-}
-
-//
-// Adt file check function
-//
-bool ADT_file::prepareLoadedData()
-{
-    // Check parent
-    if (!FileLoader::prepareLoadedData())
-        return false;
-
-    // Check and prepare MHDR
-    a_grid = (adt_MHDR *)(GetData()+8+version->size);
-    if (!a_grid->prepareLoadedData())
-        return false;
-
-    return true;
-}
-
-bool adt_MHDR::prepareLoadedData()
-{
-    if (fcc != 'MHDR')
-        return false;
-
-    if (size!=sizeof(adt_MHDR)-8)
-        return false;
-
-    // Check and prepare MCIN
-    if (offsMCIN && !getMCIN()->prepareLoadedData())
-        return false;
-
-    // Check and prepare MH2O
-    if (offsMH2O && !getMH2O()->prepareLoadedData())
-        return false;
-
-    return true;
-}
-
-bool adt_MCIN::prepareLoadedData()
-{
-    if (fcc != 'MCIN')
-        return false;
-
-    // Check cells data
-    for (int i=0; iprepareLoadedData())
-                return false;
-
-    return true;
-}
-
-bool adt_MH2O::prepareLoadedData()
-{
-    if (fcc != 'MH2O')
-        return false;
-
-    // Check liquid data
-//    for (int i=0; iprepareLoadedData())
-        return false;
-    // Check liquid data
-    if (offsMCLQ && !getMCLQ()->prepareLoadedData())
-        return false;
-
-    return true;
-}
-
-bool adt_MCVT::prepareLoadedData()
-{
-    if (fcc != 'MCVT')
-        return false;
-
-    if (size != sizeof(adt_MCVT)-8)
-        return false;
-
-    return true;
-}
-
-bool adt_MCLQ::prepareLoadedData()
-{
-    if (fcc != 'MCLQ')
-        return false;
-
-    return true;
-}
\ No newline at end of file
diff --git a/src/tools/map_extractor/loadlib/adt.h b/src/tools/map_extractor/loadlib/adt.h
deleted file mode 100644
index 725c5b994ee..00000000000
--- a/src/tools/map_extractor/loadlib/adt.h
+++ /dev/null
@@ -1,289 +0,0 @@
-#ifndef ADT_H
-#define ADT_H
-
-#include "loadlib.h"
-
-#define TILESIZE (533.33333f)
-#define CHUNKSIZE ((TILESIZE) / 16.0f)
-#define UNITSIZE (CHUNKSIZE / 8.0f)
-
-enum LiquidType
-{
-    LIQUID_TYPE_WATER = 0,
-    LIQUID_TYPE_OCEAN = 1,
-    LIQUID_TYPE_MAGMA = 2,
-    LIQUID_TYPE_SLIME = 3
-};
-
-//**************************************************************************************
-// ADT file class
-//**************************************************************************************
-#define ADT_CELLS_PER_GRID    16
-#define ADT_CELL_SIZE         8
-#define ADT_GRID_SIZE         (ADT_CELLS_PER_GRID*ADT_CELL_SIZE)
-
-//
-// Adt file height map chunk
-//
-class adt_MCVT
-{
-    union{
-        uint32 fcc;
-        char   fcc_txt[4];
-    };
-    uint32 size;
-public:
-    float height_map[(ADT_CELL_SIZE+1)*(ADT_CELL_SIZE+1)+ADT_CELL_SIZE*ADT_CELL_SIZE];
-
-    bool  prepareLoadedData();
-};
-
-//
-// Adt file liquid map chunk (old)
-//
-class adt_MCLQ
-{
-    union{
-        uint32 fcc;
-        char   fcc_txt[4];
-    };
-    uint32 size;
-public:
-    float height1;
-    float height2;
-    struct liquid_data{
-        uint32 light;
-        float  height;
-    } liquid[ADT_CELL_SIZE+1][ADT_CELL_SIZE+1];
-    
-    // 1<<0 - ochen
-    // 1<<1 - lava/slime
-    // 1<<2 - water
-    // 1<<6 - all water
-    // 1<<7 - dark water
-    // == 0x0F - not show liquid
-    uint8 flags[ADT_CELL_SIZE][ADT_CELL_SIZE];
-    uint8 data[84];
-    bool  prepareLoadedData();
-};
-
-//
-// Adt file cell chunk
-//
-class adt_MCNK
-{
-    union{
-        uint32 fcc;
-        char   fcc_txt[4];
-    };
-    uint32 size;
-public:
-    uint32 flags;
-    uint32 ix;
-    uint32 iy;
-    uint32 nLayers;
-    uint32 nDoodadRefs;
-    uint32 offsMCVT;        // height map
-    uint32 offsMCNR;        // Normal vectors for each vertex
-    uint32 offsMCLY;        // Texture layer definitions
-    uint32 offsMCRF;        // A list of indices into the parent file's MDDF chunk
-    uint32 offsMCAL;        // Alpha maps for additional texture layers
-    uint32 sizeMCAL;
-    uint32 offsMCSH;        // Shadow map for static shadows on the terrain
-    uint32 sizeMCSH;
-    uint32 areaid;
-    uint32 nMapObjRefs;
-    uint32 holes;
-    uint16 s[2];
-    uint32 data1;
-    uint32 data2;
-    uint32 data3;
-    uint32 predTex;
-    uint32 nEffectDoodad;
-    uint32 offsMCSE;
-    uint32 nSndEmitters;
-    uint32 offsMCLQ;         // Liqid level (old)
-    uint32 sizeMCLQ;         //
-    float  zpos;
-    float  xpos;
-    float  ypos;
-    uint32 offsMCCV;         // offsColorValues in WotLK
-    uint32 props;
-    uint32 effectId;
-
-    bool   prepareLoadedData();
-    adt_MCVT *getMCVT()
-    {
-        if (offsMCVT)
-            return (adt_MCVT *)((uint8 *)this + offsMCVT);
-        return 0;
-    }
-    adt_MCLQ *getMCLQ()
-    {
-        if (offsMCLQ)
-            return (adt_MCLQ *)((uint8 *)this + offsMCLQ);
-        return 0;
-    }
-};
-
-//
-// Adt file grid chunk
-//
-class adt_MCIN
-{
-    union{
-        uint32 fcc;
-        char   fcc_txt[4];
-    };
-    uint32 size;
-public:
-    struct adt_CELLS{
-        uint32 offsMCNK;
-        uint32 size;
-        uint32 flags;
-        uint32 asyncId;
-    } cells[ADT_CELLS_PER_GRID][ADT_CELLS_PER_GRID];
-
-    bool   prepareLoadedData();
-    // offset from begin file (used this-84)
-    adt_MCNK *getMCNK(int x, int y)
-    {
-        if (cells[x][y].offsMCNK)
-            return (adt_MCNK *)((uint8 *)this + cells[x][y].offsMCNK - 84);
-        return 0;
-    }
-};
-
-#define ADT_LIQUID_HEADER_FULL_LIGHT   0x01
-#define ADT_LIQUID_HEADER_NO_HIGHT     0x02
-
-struct adt_liquid_header{
-    uint16 liquidType;             // Index from LiquidType.dbc
-    uint16 formatFlags;
-    float  heightLevel1;
-    float  heightLevel2;
-    uint8  xOffset;
-    uint8  yOffset;
-    uint8  width;
-    uint8  height;
-    uint32 offsData2a;
-    uint32 offsData2b;
-};
-
-//
-// Adt file liquid data chunk (new)
-//
-class adt_MH2O
-{
-public:
-    union{
-        uint32 fcc;
-        char   fcc_txt[4];
-    };
-    uint32 size;
-
-    struct adt_LIQUID{
-        uint32 offsData1;
-        uint32 used;
-        uint32 offsData2;
-    } liquid[ADT_CELLS_PER_GRID][ADT_CELLS_PER_GRID];
-
-    bool   prepareLoadedData();
-
-    adt_liquid_header *getLiquidData(int x, int y)
-    {
-        if (liquid[x][y].used && liquid[x][y].offsData1)
-            return (adt_liquid_header *)((uint8*)this + 8 + liquid[x][y].offsData1);
-        return 0;
-    }
-
-    float *getLiquidHeightMap(adt_liquid_header *h) 
-    {
-        if (h->formatFlags & ADT_LIQUID_HEADER_NO_HIGHT)
-            return 0;
-        if (h->offsData2b)
-            return (float *)((uint8*)this + 8 + h->offsData2b);
-        return 0;
-    }
-
-    uint8 *getLiquidLightMap(adt_liquid_header *h) 
-    {
-        if (h->formatFlags&ADT_LIQUID_HEADER_FULL_LIGHT)
-            return 0;
-        if (h->offsData2b)
-        {
-            if (h->formatFlags & ADT_LIQUID_HEADER_NO_HIGHT)
-                return (uint8 *)((uint8*)this + 8 + h->offsData2b);
-            return (uint8 *)((uint8*)this + 8 + h->offsData2b + (h->width+1)*(h->height+1)*4);
-        }
-        return 0;
-    }
-
-    uint32 *getLiquidFullLightMap(adt_liquid_header *h) 
-    {
-        if (!(h->formatFlags&ADT_LIQUID_HEADER_FULL_LIGHT))
-            return 0;
-        if (h->offsData2b)
-        {
-            if (h->formatFlags & ADT_LIQUID_HEADER_NO_HIGHT)
-                return (uint32 *)((uint8*)this + 8 + h->offsData2b);
-            return (uint32 *)((uint8*)this + 8 + h->offsData2b + (h->width+1)*(h->height+1)*4);
-        }
-        return 0;
-    }
-
-    uint64 getLiquidShowMap(adt_liquid_header *h)   
-    {
-        if (h->offsData2a)
-            return *((uint64 *)((uint8*)this + 8 + h->offsData2a));
-        else
-            return 0xFFFFFFFFFFFFFFFFLL;
-    }
-
-};
-
-//
-// Adt file header chunk
-//
-class adt_MHDR
-{
-    union{
-        uint32 fcc;
-        char   fcc_txt[4];
-    };
-    uint32 size;
-
-    uint32 pad;
-    uint32 offsMCIN;           // MCIN
-    uint32 offsTex;	           // MTEX
-    uint32 offsModels;	       // MMDX	
-    uint32 offsModelsIds;	   // MMID	
-    uint32 offsMapObejcts;	   // MWMO	
-    uint32 offsMapObejctsIds;  // MWID		
-    uint32 offsDoodsDef;       // MDDF	
-    uint32 offsObjectsDef;     // MODF
-    uint32 offsMFBO;           // MFBO
-    uint32 offsMH2O;           // MH2O
-    uint32 data1;
-    uint32 data2;
-    uint32 data3;
-    uint32 data4;
-    uint32 data5;
-public:
-    bool prepareLoadedData();
-    adt_MCIN *getMCIN(){ return (adt_MCIN *)((uint8 *)&pad+offsMCIN);}
-    adt_MH2O *getMH2O(){ return offsMH2O ? (adt_MH2O *)((uint8 *)&pad+offsMH2O) : 0;}
-
-};
-
-class ADT_file : public FileLoader{
-public:
-    bool prepareLoadedData();
-    ADT_file();
-    ~ADT_file();
-    void free();
-
-    adt_MHDR *a_grid;
-};
-
-#endif
diff --git a/src/tools/map_extractor/loadlib/loadlib.cpp b/src/tools/map_extractor/loadlib/loadlib.cpp
deleted file mode 100644
index 465eb04083f..00000000000
--- a/src/tools/map_extractor/loadlib/loadlib.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-#define _CRT_SECURE_NO_DEPRECATE
-
-#include "loadlib.h"
-#include "mpq_libmpq04.h"
-#include 
-
-class MPQFile;
-
-FileLoader::FileLoader()
-{
-    data = 0;
-    data_size = 0;
-    version = 0;
-}
-
-FileLoader::~FileLoader()
-{
-    free();
-}
-
-bool FileLoader::loadFile(char *filename, bool log)
-{
-    free();
-    MPQFile mf(filename);
-    if(mf.isEof())
-    {
-        if (log)
-            printf("No such file %s\n", filename);
-        return false;
-    }
-
-    data_size = mf.getSize();
-
-    data = new uint8 [data_size];
-    if (data)
-    {
-        mf.read(data, data_size);
-        mf.close();
-        if (prepareLoadedData())
-            return true;
-    }
-    printf("Error loading %s", filename);
-    mf.close();
-    free();
-    return false;
-}
-
-bool FileLoader::prepareLoadedData()
-{
-    // Check version
-    version = (file_MVER *) data;
-    if (version->fcc != 'MVER')
-        return false;
-    if (version->ver != FILE_FORMAT_VERSION)
-        return false;
-    return true;
-}
-
-void FileLoader::free()
-{
-    if (data) delete[] data;
-    data = 0;
-    data_size = 0;
-    version = 0;
-}
diff --git a/src/tools/map_extractor/loadlib/loadlib.h b/src/tools/map_extractor/loadlib/loadlib.h
index 48fe794f8dc..49d5f590744 100644
--- a/src/tools/map_extractor/loadlib/loadlib.h
+++ b/src/tools/map_extractor/loadlib/loadlib.h
@@ -3,26 +3,28 @@
 
 #ifdef _WIN32
 typedef __int64            int64;
-typedef long               int32;
-typedef short              int16;
-typedef char               int8;
+typedef __int32            int32;
+typedef __int16            int16;
+typedef __int8             int8;
 typedef unsigned __int64   uint64;
-typedef unsigned long      uint32;
-typedef unsigned short     uint16;
-typedef unsigned char      uint8;
+typedef unsigned __int32   uint32;
+typedef unsigned __int16   uint16;
+typedef unsigned __int8    uint8;
 #else
 #include 
 #ifndef uint64_t 
+#ifdef __linux__
 #include  
 #endif
+#endif
 typedef int64_t            int64;
-typedef long               int32;
-typedef short              int16;
-typedef char               int8;
+typedef int32_t            int32;
+typedef int16_t            int16;
+typedef int8_t             int8;
 typedef uint64_t           uint64;
-typedef unsigned long      uint32;
-typedef unsigned short     uint16;
-typedef unsigned char      uint8;
+typedef uint32_t           uint32;
+typedef uint16_t           uint16;
+typedef uint8_t            uint8;
 #endif
 
 #define FILE_FORMAT_VERSION    18
diff --git a/src/tools/map_extractor/loadlib/wdt.cpp b/src/tools/map_extractor/loadlib/wdt.cpp
deleted file mode 100644
index dedefbb64e5..00000000000
--- a/src/tools/map_extractor/loadlib/wdt.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-#define _CRT_SECURE_NO_DEPRECATE
-
-#include "wdt.h"
-
-bool wdt_MWMO::prepareLoadedData()
-{
-    if (fcc != 'MWMO')
-        return false;
-    return true;
-}
-
-bool wdt_MPHD::prepareLoadedData()
-{
-    if (fcc != 'MPHD')
-        return false;
-    return true;
-}
-
-bool wdt_MAIN::prepareLoadedData()
-{
-    if (fcc != 'MAIN')
-        return false;
-    return true;
-}
-
-WDT_file::WDT_file()
-{
-    mphd = 0;
-    main = 0;
-    wmo  = 0;
-}
-
-WDT_file::~WDT_file()
-{
-    free();
-}
-
-void WDT_file::free()
-{
-    mphd = 0;
-    main = 0;
-    wmo  = 0;
-    FileLoader::free();
-}
-
-bool WDT_file::prepareLoadedData()
-{
-    // Check parent
-    if (!FileLoader::prepareLoadedData())
-        return false;
-
-    mphd = (wdt_MPHD *)((uint8*)version+version->size+8);
-    if (!mphd->prepareLoadedData())
-        return false;
-    main = (wdt_MAIN *)((uint8*)mphd + mphd->size+8);
-    if (!main->prepareLoadedData())
-        return false;
-    wmo = (wdt_MWMO *)((uint8*)main+ main->size+8);
-    if (!wmo->prepareLoadedData())
-        return false;
-    return true;
-}
\ No newline at end of file
diff --git a/src/tools/map_extractor/loadlib/wdt.h b/src/tools/map_extractor/loadlib/wdt.h
deleted file mode 100644
index fcee8ac64f2..00000000000
--- a/src/tools/map_extractor/loadlib/wdt.h
+++ /dev/null
@@ -1,68 +0,0 @@
-#ifndef WDT_H
-#define WDT_H
-#include "loadlib.h"
-
-//**************************************************************************************
-// WDT file class and structures
-//**************************************************************************************
-#define WDT_MAP_SIZE 64
-
-class wdt_MWMO{
-    union{
-        uint32 fcc;
-        char   fcc_txt[4];
-    };
-public:
-    uint32 size;
-    bool prepareLoadedData();
-};
-
-class wdt_MPHD{
-    union{
-        uint32 fcc;
-        char   fcc_txt[4];
-    };
-public:
-    uint32 size;
-
-    uint32 data1;
-    uint32 data2;
-    uint32 data3;
-    uint32 data4;
-    uint32 data5;
-    uint32 data6;
-    uint32 data7;
-    uint32 data8;
-    bool   prepareLoadedData();
-};
-
-class wdt_MAIN{
-    union{
-        uint32 fcc;
-        char   fcc_txt[4];
-    };
-public:
-    uint32 size;
-
-    struct adtData{
-        uint32 exist;
-        uint32 data1;
-    } adt_list[64][64];
-
-    bool   prepareLoadedData();
-};
-
-class WDT_file : public FileLoader{
-public:
-    bool   prepareLoadedData();
-
-    WDT_file();
-    ~WDT_file();
-    void free();
-
-    wdt_MPHD *mphd;
-    wdt_MAIN *main;
-    wdt_MWMO *wmo;
-};
-
-#endif
\ No newline at end of file
diff --git a/src/tools/map_extractor/wdt.cpp b/src/tools/map_extractor/wdt.cpp
new file mode 100644
index 00000000000..dedefbb64e5
--- /dev/null
+++ b/src/tools/map_extractor/wdt.cpp
@@ -0,0 +1,62 @@
+#define _CRT_SECURE_NO_DEPRECATE
+
+#include "wdt.h"
+
+bool wdt_MWMO::prepareLoadedData()
+{
+    if (fcc != 'MWMO')
+        return false;
+    return true;
+}
+
+bool wdt_MPHD::prepareLoadedData()
+{
+    if (fcc != 'MPHD')
+        return false;
+    return true;
+}
+
+bool wdt_MAIN::prepareLoadedData()
+{
+    if (fcc != 'MAIN')
+        return false;
+    return true;
+}
+
+WDT_file::WDT_file()
+{
+    mphd = 0;
+    main = 0;
+    wmo  = 0;
+}
+
+WDT_file::~WDT_file()
+{
+    free();
+}
+
+void WDT_file::free()
+{
+    mphd = 0;
+    main = 0;
+    wmo  = 0;
+    FileLoader::free();
+}
+
+bool WDT_file::prepareLoadedData()
+{
+    // Check parent
+    if (!FileLoader::prepareLoadedData())
+        return false;
+
+    mphd = (wdt_MPHD *)((uint8*)version+version->size+8);
+    if (!mphd->prepareLoadedData())
+        return false;
+    main = (wdt_MAIN *)((uint8*)mphd + mphd->size+8);
+    if (!main->prepareLoadedData())
+        return false;
+    wmo = (wdt_MWMO *)((uint8*)main+ main->size+8);
+    if (!wmo->prepareLoadedData())
+        return false;
+    return true;
+}
\ No newline at end of file
diff --git a/src/tools/map_extractor/wdt.h b/src/tools/map_extractor/wdt.h
new file mode 100644
index 00000000000..fcee8ac64f2
--- /dev/null
+++ b/src/tools/map_extractor/wdt.h
@@ -0,0 +1,68 @@
+#ifndef WDT_H
+#define WDT_H
+#include "loadlib.h"
+
+//**************************************************************************************
+// WDT file class and structures
+//**************************************************************************************
+#define WDT_MAP_SIZE 64
+
+class wdt_MWMO{
+    union{
+        uint32 fcc;
+        char   fcc_txt[4];
+    };
+public:
+    uint32 size;
+    bool prepareLoadedData();
+};
+
+class wdt_MPHD{
+    union{
+        uint32 fcc;
+        char   fcc_txt[4];
+    };
+public:
+    uint32 size;
+
+    uint32 data1;
+    uint32 data2;
+    uint32 data3;
+    uint32 data4;
+    uint32 data5;
+    uint32 data6;
+    uint32 data7;
+    uint32 data8;
+    bool   prepareLoadedData();
+};
+
+class wdt_MAIN{
+    union{
+        uint32 fcc;
+        char   fcc_txt[4];
+    };
+public:
+    uint32 size;
+
+    struct adtData{
+        uint32 exist;
+        uint32 data1;
+    } adt_list[64][64];
+
+    bool   prepareLoadedData();
+};
+
+class WDT_file : public FileLoader{
+public:
+    bool   prepareLoadedData();
+
+    WDT_file();
+    ~WDT_file();
+    void free();
+
+    wdt_MPHD *mphd;
+    wdt_MAIN *main;
+    wdt_MWMO *wmo;
+};
+
+#endif
\ No newline at end of file
-- 
cgit v1.2.3


From ceac6cd63a01e491220f58936dc7735b5a87a320 Mon Sep 17 00:00:00 2001
From: click 
Date: Wed, 23 Jun 2010 11:45:30 +0200
Subject: Correction on LoadDBC counter - no more 102%... for now :D

--HG--
branch : trunk
---
 src/server/game/DataStores/DBCStores.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 mode change 100644 => 100755 src/server/game/DataStores/DBCStores.cpp

(limited to 'src')

diff --git a/src/server/game/DataStores/DBCStores.cpp b/src/server/game/DataStores/DBCStores.cpp
old mode 100644
new mode 100755
index b50815e6b30..dc5a5b831fd
--- a/src/server/game/DataStores/DBCStores.cpp
+++ b/src/server/game/DataStores/DBCStores.cpp
@@ -243,7 +243,7 @@ void LoadDBCStores(const std::string& dataPath)
 {
     std::string dbcPath = dataPath+"dbc/";
 
-    const uint32 DBCFilesCount = 87;
+    const uint32 DBCFilesCount = 89;
 
     barGoLink bar(DBCFilesCount);
 
-- 
cgit v1.2.3


From b82330208828a52e9c12ac10ef3ec8b6c6061503 Mon Sep 17 00:00:00 2001
From: Machiavelli 
Date: Wed, 23 Jun 2010 13:31:17 +0200
Subject: Remove a duplicate query.

--HG--
branch : trunk
---
 src/server/game/Entities/GameObject/GameObject.h | 2 +-
 src/server/game/Server/WorldSession.cpp          | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Entities/GameObject/GameObject.h b/src/server/game/Entities/GameObject/GameObject.h
index b95ea0b7788..79c16cfd542 100644
--- a/src/server/game/Entities/GameObject/GameObject.h
+++ b/src/server/game/Entities/GameObject/GameObject.h
@@ -509,7 +509,7 @@ struct GameObjectInfo
             case GAMEOBJECT_TYPE_CAMERA:        return camera.eventID;
             default: return 0;
         }
- 	}
+    }
 };
 
 class OPvPCapturePoint;
diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp
index a464e37ec60..6de0cb27381 100644
--- a/src/server/game/Server/WorldSession.cpp
+++ b/src/server/game/Server/WorldSession.cpp
@@ -82,7 +82,6 @@ WorldSession::~WorldSession()
         delete packet;
 
     LoginDatabase.PExecute("UPDATE account SET online = 0 WHERE id = %u;", GetAccountId());
-    CharacterDatabase.PExecute("UPDATE characters SET online = 0 WHERE account = %u;", GetAccountId());
 }
 
 void WorldSession::SizeError(WorldPacket const& packet, uint32 size) const
-- 
cgit v1.2.3


From 606b27eb6b55282220a892080ebdd104ab288884 Mon Sep 17 00:00:00 2001
From: Shauren 
Date: Wed, 23 Jun 2010 14:08:03 +0200
Subject: minor fixes in boss_morogrim_tidewalker

--HG--
branch : trunk
---
 .../SerpentShrine/boss_morogrim_tidewalker.cpp            | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
index a74a236b9ce..963643e92bf 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
@@ -221,9 +221,8 @@ struct boss_morogrim_tidewalkerAI : public ScriptedAI
             {
                 //Teleport 4 players under the waterfalls
                 Unit *pTarget;
-                using std::set;
-                setlist;
-                set::const_iterator itr;
+                std::set list;
+                std::set::const_iterator itr;
                 for (uint8 i = 0; i < 4; ++i)
                 {
                     counter = 0;
@@ -251,7 +250,7 @@ struct boss_morogrim_tidewalkerAI : public ScriptedAI
             } else WateryGrave_Timer -= diff;
 
             //Start Phase2
-            if ((me->GetHealth()*100 / me->GetMaxHealth()) < 25)
+            if (HealthBelowPct(25))
                 Phase2 = true;
         }
         else
@@ -260,13 +259,13 @@ struct boss_morogrim_tidewalkerAI : public ScriptedAI
             if (WateryGlobules_Timer <= diff)
             {
                 Unit* pGlobuleTarget;
-                using std::set;
-                setglobulelist;
-                set::const_iterator itr;
+                std::set globulelist;
+                std::set::const_iterator itr;
                 for (uint8 g = 0; g < 4; g++)  //one unit can't cast more than one spell per update, so some players have to cast for us XD
                 {
                     counter = 0;
-                    do {
+                    do
+                    {
                         pGlobuleTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 50, true);
                         if (pGlobuleTarget)
                             itr = globulelist.find(pGlobuleTarget->GetGUID());
-- 
cgit v1.2.3


From e75c39781fe4edc6c3fde181a3cd34c13161af1f Mon Sep 17 00:00:00 2001
From: Machiavelli 
Date: Wed, 23 Jun 2010 19:05:35 +0200
Subject: Fix 2 silly typo´s in GroupHandler. - No longer can any party member
 invite a new member - Assinging raid roles is doable by raid assistant again
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--HG--
branch : trunk
---
 src/server/game/Server/Protocol/Handlers/GroupHandler.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Server/Protocol/Handlers/GroupHandler.cpp b/src/server/game/Server/Protocol/Handlers/GroupHandler.cpp
index bcefc763ae2..6323120d67c 100644
--- a/src/server/game/Server/Protocol/Handlers/GroupHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/GroupHandler.cpp
@@ -126,7 +126,7 @@ void WorldSession::HandleGroupInviteOpcode(WorldPacket & recv_data)
     if (group)
     {
         // not have permissions for invite
-        if (group->isRaidGroup() && !group->IsLeader(GetPlayer()->GetGUID()) && !group->IsAssistant(GetPlayer()->GetGUID()))
+        if (!group->IsLeader(GetPlayer()->GetGUID() && group->IsAssistant(GetPlayer()->GetGUID())
         {
             SendPartyResult(PARTY_OP_INVITE, "", ERR_NOT_LEADER);
             return;
@@ -597,7 +597,7 @@ void WorldSession::HandlePartyAssignmentOpcode(WorldPacket & recv_data)
 
     /** error handling **/
     uint64 senderGuid = GetPlayer()->GetGUID();
-    if (!group->IsLeader(senderGuid) && group->IsAssistant(senderGuid))
+    if (!group->IsLeader(senderGuid) && !group->IsAssistant(senderGuid))
         return;
     /********************/
 
-- 
cgit v1.2.3


From 73ae5910d840fbe912c8a05d045ac1179f4e570c Mon Sep 17 00:00:00 2001
From: Machiavelli 
Date: Wed, 23 Jun 2010 20:13:32 +0200
Subject: Fix an even sillier typo that broke compile

--HG--
branch : trunk
---
 src/server/game/Server/Protocol/Handlers/GroupHandler.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/game/Server/Protocol/Handlers/GroupHandler.cpp b/src/server/game/Server/Protocol/Handlers/GroupHandler.cpp
index 6323120d67c..bfdfdd1a51c 100644
--- a/src/server/game/Server/Protocol/Handlers/GroupHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/GroupHandler.cpp
@@ -126,7 +126,7 @@ void WorldSession::HandleGroupInviteOpcode(WorldPacket & recv_data)
     if (group)
     {
         // not have permissions for invite
-        if (!group->IsLeader(GetPlayer()->GetGUID() && group->IsAssistant(GetPlayer()->GetGUID())
+        if (!group->IsLeader(GetPlayer()->GetGUID() && group->IsAssistant(GetPlayer()->GetGUID())))
         {
             SendPartyResult(PARTY_OP_INVITE, "", ERR_NOT_LEADER);
             return;
-- 
cgit v1.2.3


From 1522506feb4918962f9422a94f39f5eeba0b1b52 Mon Sep 17 00:00:00 2001
From: Spp 
Date: Thu, 24 Jun 2010 10:20:34 +0200
Subject: Fix group invite after a group is formed

--HG--
branch : trunk
---
 src/server/game/Server/Protocol/Handlers/GroupHandler.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/game/Server/Protocol/Handlers/GroupHandler.cpp b/src/server/game/Server/Protocol/Handlers/GroupHandler.cpp
index bfdfdd1a51c..4f43ad3c30b 100644
--- a/src/server/game/Server/Protocol/Handlers/GroupHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/GroupHandler.cpp
@@ -126,7 +126,7 @@ void WorldSession::HandleGroupInviteOpcode(WorldPacket & recv_data)
     if (group)
     {
         // not have permissions for invite
-        if (!group->IsLeader(GetPlayer()->GetGUID() && group->IsAssistant(GetPlayer()->GetGUID())))
+        if (!group->IsLeader(GetPlayer()->GetGUID()) && !group->IsAssistant(GetPlayer()->GetGUID()))
         {
             SendPartyResult(PARTY_OP_INVITE, "", ERR_NOT_LEADER);
             return;
-- 
cgit v1.2.3


From c21c24d461637aee1cadffd4cf5d5c87fe77747e Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Thu, 24 Jun 2010 15:05:55 +0200
Subject: Fix Ice barrier scaling, Fire Ward & Frost Ward, by dr.te...

--HG--
branch : trunk
---
 src/server/game/Spells/Auras/SpellAuraEffects.cpp | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
index 1b485e416e4..9358365c17d 100644
--- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
@@ -482,8 +482,24 @@ int32 AuraEffect::CalculateAmount(Unit * caster)
                     // Ice Barrier
                     if (GetSpellProto()->SpellFamilyFlags[1] & 0x1 && GetSpellProto()->SpellFamilyFlags[2] & 0x8)
                     {
-                        // +80.67% from sp bonus
-                        DoneActualBenefit += caster->SpellBaseDamageBonus(GetSpellSchoolMask(m_spellProto)) * 0.8067f;
+                        // +80.68% from sp bonus
+                        DoneActualBenefit += caster->SpellBaseDamageBonus(GetSpellSchoolMask(m_spellProto)) * 0.8068f;
+                        // Glyph of Ice Barrier: its weird having a SPELLMOD_ALL_EFFECTS here but its blizzards doing :)
+                        // Glyph of Ice Barrier is only applied at the spell damage bonus because it was already applied to the base value in CalculateSpellDamage
+                        if (Player* modOwner = caster->GetSpellModOwner())
+                            modOwner->ApplySpellMod(GetSpellProto()->Id, SPELLMOD_ALL_EFFECTS, DoneActualBenefit);
+                    }
+                    // Fire Ward
+                    else if(GetSpellProto()->SpellFamilyFlags[0] & 0x8 && GetSpellProto()->SpellFamilyFlags[2] & 0x8)
+                    {
+                        // +80.68% from sp bonus
+                        DoneActualBenefit += caster->SpellBaseDamageBonus(GetSpellSchoolMask(m_spellProto)) * 0.8068f;
+                    }
+                    // Frost Ward
+                    else if(GetSpellProto()->SpellFamilyFlags[0] & 0x100 && GetSpellProto()->SpellFamilyFlags[2] & 0x8)
+                    {
+                        // +80.68% from sp bonus
+                        DoneActualBenefit += caster->SpellBaseDamageBonus(GetSpellSchoolMask(m_spellProto)) * 0.8068f;
                     }
                     break;
                 case SPELLFAMILY_WARLOCK:
-- 
cgit v1.2.3


From 55ca26294a51a3f34373764e77c23c0a7a134793 Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Thu, 24 Jun 2010 15:12:01 +0200
Subject: Fixed Shadow Ward coefficient, by dr.te...

--HG--
branch : trunk
---
 src/server/game/Spells/Auras/SpellAuraEffects.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
index 9358365c17d..f5d2ad75f93 100644
--- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
@@ -504,10 +504,10 @@ int32 AuraEffect::CalculateAmount(Unit * caster)
                     break;
                 case SPELLFAMILY_WARLOCK:
                     // Shadow Ward
-                    if (m_spellProto->SpellFamilyFlags[2]& 0x40)
+                    if (m_spellProto->SpellFamilyFlags[2] & 0x40)
                     {
-                        // +30% from sp bonus
-                        DoneActualBenefit += caster->SpellBaseDamageBonus(GetSpellSchoolMask(m_spellProto)) * 0.3f;
+                        // +80.68% from sp bonus
+                        DoneActualBenefit += caster->SpellBaseDamageBonus(GetSpellSchoolMask(m_spellProto)) * 0.8068f;
                     }
                     break;
                 case SPELLFAMILY_PRIEST:
-- 
cgit v1.2.3


From 38fa3c212b9d6eac2c9747be1b0015f978de7b8b Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Thu, 24 Jun 2010 15:32:11 +0200
Subject: Fix primal tenacity reduce damage while stunned only on cat form, by
 laise Closes issue #1143

--HG--
branch : trunk
---
 src/server/game/Entities/Unit/Unit.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 76b87985dec..0ee16010393 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -1791,7 +1791,7 @@ void Unit::CalcAbsorbResist(Unit *pVictim, SpellSchoolMask schoolMask, DamageEff
                 if (spellProto->SpellIconID == 2253)
                 {
                     //reduces all damage taken while Stunned
-                    if (unitflag & UNIT_FLAG_STUNNED)
+                    if (pVictim->m_form == FORM_CAT && (unitflag & UNIT_FLAG_STUNNED))
                         RemainingDamage -= RemainingDamage * currentAbsorb / 100;
                     continue;
                 }
-- 
cgit v1.2.3


From e0507a4a8d2b6c8dda9d283997d623f56b9a68b7 Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Thu, 24 Jun 2010 15:48:17 +0200
Subject: Fix logic on namego Now is possible to namego to a player inside an
 arena, by filip.havlicked Closes issue #2130

--HG--
branch : trunk
---
 src/server/game/Chat/Commands/Level1.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/game/Chat/Commands/Level1.cpp b/src/server/game/Chat/Commands/Level1.cpp
index d80157611fb..a9f1e7d9c15 100644
--- a/src/server/game/Chat/Commands/Level1.cpp
+++ b/src/server/game/Chat/Commands/Level1.cpp
@@ -817,7 +817,7 @@ bool ChatHandler::HandleNamegoCommand(const char* args)
         if (pMap->IsBattleGroundOrArena())
         {
             // only allow if gm mode is on
-            if (!target->isGameMaster())
+            if (!_player->isGameMaster())
             {
                 PSendSysMessage(LANG_CANNOT_GO_TO_BG_GM,nameLink.c_str());
                 SetSentErrorMessage(true);
-- 
cgit v1.2.3


From 0b2dad9c9750be653ed61ac4dae2debfe3825011 Mon Sep 17 00:00:00 2001
From: click 
Date: Thu, 24 Jun 2010 17:32:50 +0200
Subject: Remove a possible NaN-value in WorldObject::HasInArc (thanks to
 arrai) + do some hack'n'slash-work on the CMakeLists with my trusted axe ( I
 just LOVE being a viking - I get to wield an axe for free!)

--HG--
branch : trunk
---
 src/server/authserver/CMakeLists.txt       |   5 -
 src/server/collision/CMakeLists.txt        |  10 --
 src/server/game/CMakeLists.txt             | 159 -----------------------------
 src/server/game/Entities/Object/Object.cpp |  21 +---
 src/server/game/Maps/MapManager.h          |  15 +++
 src/server/scripts/CMakeLists.txt          |   7 --
 src/server/shared/CMakeLists.txt           |  32 ------
 src/server/worldserver/CMakeLists.txt      |   4 -
 8 files changed, 19 insertions(+), 234 deletions(-)

(limited to 'src')

diff --git a/src/server/authserver/CMakeLists.txt b/src/server/authserver/CMakeLists.txt
index 6cfefb69443..82a94a5137d 100644
--- a/src/server/authserver/CMakeLists.txt
+++ b/src/server/authserver/CMakeLists.txt
@@ -12,14 +12,9 @@
 
 set(authserver_SRCS
   Authentication/AuthCodes.cpp
-  Authentication/AuthCodes.h
   Realms/RealmList.cpp
-  Realms/RealmList.h
   Server/AuthSocket.cpp
-  Server/AuthSocket.h
-  Server/RealmSocket.h
   Server/RealmSocket.cpp
-  Server/RealmAcceptor.h
   Main.cpp
 )
 
diff --git a/src/server/collision/CMakeLists.txt b/src/server/collision/CMakeLists.txt
index b71f19496fe..4749d88b100 100644
--- a/src/server/collision/CMakeLists.txt
+++ b/src/server/collision/CMakeLists.txt
@@ -11,23 +11,13 @@
 ########### collision ###############
 
 set(collision_STAT_SRCS
-  BoundingIntervalHierarchy.h
   BoundingIntervalHierarchy.cpp
   Maps/MapTree.cpp
-  Maps/MapTree.h
   Maps/TileAssembler.cpp
-  Maps/TileAssembler.h
   Models/ModelInstance.cpp
-  Models/ModelInstance.h
   Models/WorldModel.cpp
-  Models/WorldModel.h
-  Management/IVMapManager.h
   Management/VMapFactory.cpp
-  Management/VMapFactory.h
   Management/VMapManager2.cpp
-  Management/VMapManager2.h
-  VMapDefinitions.h
-  VMapTools.h
 )
 
 include_directories(
diff --git a/src/server/game/CMakeLists.txt b/src/server/game/CMakeLists.txt
index 387b2365f47..2d6788cf36d 100644
--- a/src/server/game/CMakeLists.txt
+++ b/src/server/game/CMakeLists.txt
@@ -18,78 +18,41 @@ endif()
 # Create game-libary
 set(game_STAT_SRCS
   Accounts/AccountMgr.cpp
-  Accounts/AccountMgr.h
-  Achievements/AchievementMgr.h
   Achievements/AchievementMgr.cpp
   Addons/AddonMgr.cpp
-  Addons/AddonMgr.h
   AI/CoreAI/CombatAI.cpp
-  AI/CoreAI/CombatAI.h
   AI/CoreAI/GuardAI.cpp
-  AI/CoreAI/GuardAI.h
   AI/CoreAI/PassiveAI.cpp
-  AI/CoreAI/PassiveAI.h
   AI/CoreAI/PetAI.cpp
-  AI/CoreAI/PetAI.h
   AI/CoreAI/ReactorAI.cpp
-  AI/CoreAI/ReactorAI.h
   AI/CoreAI/TotemAI.cpp
-  AI/CoreAI/TotemAI.h
   AI/CoreAI/UnitAI.cpp
-  AI/CoreAI/UnitAI.h
   AI/EventAI/CreatureEventAI.cpp
   AI/EventAI/CreatureEventAIMgr.cpp
   AI/ScriptedAI/ScriptedSmartAI.cpp
-  AI/ScriptedAI/ScriptedSmartAI.h
-  AI/CreatureAIFactory.h
-  AI/CreatureAIImpl.h
   AI/CreatureAIRegistry.cpp
-  AI/CreatureAIRegistry.h
   AI/CreatureAISelector.cpp
-  AI/CreatureAISelector.h
   AI/CreatureAI.cpp
-  AI/CreatureAI.h
   AuctionHouse/AuctionHouseMgr.cpp
-  AuctionHouse/AuctionHouseMgr.h
   AuctionHouse/AuctionHouseBot/AuctionHouseBot.cpp
-  AuctionHouse/AuctionHouseBot/AuctionHouseBot.h
   BattleGrounds/ArenaTeam.cpp
-  BattleGrounds/ArenaTeam.h
   BattleGrounds/Zones/BattleGroundAA.cpp
-  BattleGrounds/Zones/BattleGroundAA.h
   BattleGrounds/Zones/BattleGroundAB.cpp
-  BattleGrounds/Zones/BattleGroundAB.h
   BattleGrounds/Zones/BattleGroundRB.cpp
-  BattleGrounds/Zones/BattleGroundRB.h
   BattleGrounds/Zones/BattleGroundAV.cpp
-  BattleGrounds/Zones/BattleGroundAV.h
   BattleGrounds/Zones/BattleGroundBE.cpp
-  BattleGrounds/Zones/BattleGroundBE.h
   BattleGrounds/Zones/BattleGroundDS.cpp
-  BattleGrounds/Zones/BattleGroundDS.h
   BattleGrounds/Zones/BattleGroundEY.cpp
-  BattleGrounds/Zones/BattleGroundEY.h
   BattleGrounds/Zones/BattleGroundIC.cpp
-  BattleGrounds/Zones/BattleGroundIC.h
   BattleGrounds/Zones/BattleGroundNA.cpp
-  BattleGrounds/Zones/BattleGroundNA.h
   BattleGrounds/Zones/BattleGroundRL.cpp
-  BattleGrounds/Zones/BattleGroundRL.h
   BattleGrounds/Zones/BattleGroundRV.cpp
-  BattleGrounds/Zones/BattleGroundRV.h
   BattleGrounds/Zones/BattleGroundSA.cpp
-  BattleGrounds/Zones/BattleGroundSA.h
   BattleGrounds/Zones/BattleGroundWS.cpp
-  BattleGrounds/Zones/BattleGroundWS.h
   BattleGrounds/BattleGround.cpp
-  BattleGrounds/BattleGround.h
   BattleGrounds/BattleGroundMgr.cpp
-  BattleGrounds/BattleGroundMgr.h
   Calendar/Calendar.cpp
-  Calendar/Calendar.h
   Chat/Channels/Channel.cpp
-  Chat/Channels/Channel.h
-  Chat/Channels/ChannelMgr.h
   Chat/Channels/ChannelMgr.cpp
   Chat/Commands/Debugcmds.cpp
   Chat/Commands/Level0.cpp
@@ -97,176 +60,78 @@ set(game_STAT_SRCS
   Chat/Commands/Level2.cpp
   Chat/Commands/Level3.cpp
   Chat/Chat.cpp
-  Chat/Chat.h
   Combat/HostileRefManager.cpp
-  Combat/HostileRefManager.h
   Combat/ThreatManager.cpp
-  Combat/ThreatManager.h
-  Combat/UnitEvents.h
   Conditions/ConditionMgr.cpp
-  Conditions/ConditionMgr.h
-  DataStores/DBCEnums.h
   DataStores/DBCStores.cpp
-  DataStores/DBCStores.h
-  DataStores/DBCStructure.h
-  DataStores/DBCfmt.h
-  DungeonFinding/LFG.h
   DungeonFinding/LFGMgr.cpp
-  DungeonFinding/LFGMgr.h
   Entities/Corpse/Corpse.cpp
-  Entities/Corpse/Corpse.h
   Entities/Creature/Creature.cpp
-  Entities/Creature/Creature.h
   Entities/Creature/CreatureGroups.cpp
-  Entities/Creature/CreatureGroups.h
   Entities/Creature/GossipDef.cpp
-  Entities/Creature/GossipDef.h
   Entities/Creature/TemporarySummon.cpp
-  Entities/Creature/TemporarySummon.h
   Entities/DynamicObject/DynamicObject.cpp
-  Entities/DynamicObject/DynamicObject.h
   Entities/GameObject/GameObject.cpp
-  Entities/GameObject/GameObject.h
   Entities/Item/Container/Bag.cpp
-  Entities/Item/Container/Bag.h
   Entities/Item/Item.cpp
-  Entities/Item/Item.h
   Entities/Item/ItemEnchantmentMgr.cpp
-  Entities/Item/ItemEnchantmentMgr.h
-  Entities/Item/ItemPrototype.h
   Entities/Object/Updates/UpdateData.cpp
-  Entities/Object/Updates/UpdateData.h
-  Entities/Object/Updates/UpdateFields.h
-  Entities/Object/Updates/UpdateMask.h
-  Entities/Object/ObjectDefines.h
   Entities/Object/Object.cpp
-  Entities/Object/Object.h
   Entities/Object/ObjectPosSelector.cpp
-  Entities/Object/ObjectPosSelector.h
   Entities/Pet/Pet.cpp
-  Entities/Pet/Pet.h
   Entities/Player/Player.cpp
-  Entities/Player/Player.h
   Entities/Player/SocialMgr.cpp
-  Entities/Player/SocialMgr.h
   Entities/Unit/StatSystem.cpp
   Entities/Unit/Unit.cpp
-  Entities/Unit/Unit.h
   Entities/Totem/Totem.cpp
-  Entities/Totem/Totem.h
   Entities/Transport/Transport.cpp
-  Entities/Transport/Transport.h
   Entities/Vehicle/Vehicle.cpp
-  Entities/Vehicle/Vehicle.h
   Events/GameEventMgr.cpp
-  Events/GameEventMgr.h
   Globals/GlobalEvents.cpp
-  Globals/GlobalEvents.h
   Globals/ObjectAccessor.cpp
-  Globals/ObjectAccessor.h
   Globals/ObjectMgr.cpp
-  Globals/ObjectMgr.h
-  Grids/Cells/Cell.h
-  Grids/Cells/CellImpl.h
   Grids/Notifiers/GridNotifiers.cpp
-  Grids/Notifiers/GridNotifiers.h
-  Grids/Notifiers/GridNotifiersImpl.h
-  Grids/GridDefines.h
   Grids/GridStates.cpp
-  Grids/GridStates.h
   Grids/ObjectGridLoader.cpp
-  Grids/ObjectGridLoader.h
   Groups/Group.cpp
-  Groups/Group.h
   Groups/GroupReference.cpp
-  Groups/GroupReference.h
-  Groups/GroupRefManager.h
   Guilds/Guild.cpp
-  Guilds/Guild.h
   Instances/InstanceData.cpp
-  Instances/InstanceData.h
   Instances/InstanceSaveMgr.cpp
-  Instances/InstanceSaveMgr.h
   Loot/LootMgr.cpp
-  Loot/LootMgr.h
   Mails/Mail.cpp
-  Mails/Mail.h
   Maps/Map.cpp
-  Maps/Map.h
   Maps/MapInstanced.cpp
-  Maps/MapInstanced.h
   Maps/MapManager.cpp
-  Maps/MapManager.h
   Maps/MapUpdater.cpp
-  Maps/MapUpdater.h
-  Maps/MapReference.h
-  Maps/MapRefManager.h
-  Maps/ZoneScript.h
-  Miscellaneous/Formulas.h
-  Miscellaneous/Language.h
-  Miscellaneous/SharedDefines.h
   Movement/MovementGenerators/ConfusedMovementGenerator.cpp
-  Movement/MovementGenerators/ConfusedMovementGenerator.h
   Movement/MovementGenerators/FleeingMovementGenerator.cpp
-  Movement/MovementGenerators/FleeingMovementGenerator.h
   Movement/MovementGenerators/HomeMovementGenerator.cpp
-  Movement/MovementGenerators/HomeMovementGenerator.h
   Movement/MovementGenerators/IdleMovementGenerator.cpp
-  Movement/MovementGenerators/IdleMovementGenerator.h
   Movement/MovementGenerators/PointMovementGenerator.cpp
-  Movement/MovementGenerators/PointMovementGenerator.h
   Movement/MovementGenerators/RandomMovementGenerator.cpp
-  Movement/MovementGenerators/RandomMovementGenerator.h
   Movement/MovementGenerators/TargetedMovementGenerator.cpp
-  Movement/MovementGenerators/TargetedMovementGenerator.h
   Movement/MovementGenerators/WaypointMovementGenerator.cpp
-  Movement/MovementGenerators/WaypointMovementGenerator.h
-  Movement/Waypoints/Path.h
   Movement/Waypoints/WaypointManager.cpp
-  Movement/Waypoints/WaypointManager.h
   Movement/DestinationHolder.cpp
-  Movement/DestinationHolder.h
-  Movement/DestinationHolderImp.h
   Movement/FollowerReference.cpp
-  Movement/FollowerReference.h
-  Movement/FollowerRefManager.h
   Movement/MotionMaster.cpp
-  Movement/MotionMaster.h
   Movement/MovementGenerator.cpp
-  Movement/MovementGenerator.h
-  Movement/MovementGeneratorImpl.h
-  Movement/Traveller.h
   OutdoorPvP/Zones/OutdoorPvPEP.cpp
-  OutdoorPvP/Zones/OutdoorPvPEP.h
   OutdoorPvP/Zones/OutdoorPvPHP.cpp
-  OutdoorPvP/Zones/OutdoorPvPHP.h
   OutdoorPvP/Zones/OutdoorPvPNA.cpp
-  OutdoorPvP/Zones/OutdoorPvPNA.h
   OutdoorPvP/Zones/OutdoorPvPSI.cpp
-  OutdoorPvP/Zones/OutdoorPvPSI.h
   OutdoorPvP/Zones/OutdoorPvPTF.cpp
-  OutdoorPvP/Zones/OutdoorPvPTF.h
   OutdoorPvP/Zones/OutdoorPvPZM.cpp
-  OutdoorPvP/Zones/OutdoorPvPZM.h
   OutdoorPvP/OutdoorPvP.cpp
-  OutdoorPvP/OutdoorPvP.h
-  OutdoorPvP/OutdoorPvPImpl.h
   OutdoorPvP/OutdoorPvPMgr.cpp
-  OutdoorPvP/OutdoorPvPMgr.h
   Pools/PoolHandler.cpp
-  Pools/PoolHandler.h
   Quests/QuestDef.cpp
-  Quests/QuestDef.h
   Reputation/ReputationMgr.cpp
-  Reputation/ReputationMgr.h
   Scripting/ScriptLoader.cpp
-  Scripting/ScriptLoader.h
   Scripting/ScriptMgr.cpp
-  Scripting/ScriptMgr.h
   Scripting/ScriptSystem.cpp
-  Scripting/ScriptSystem.h
   Server/Protocol/Handlers/AddonHandler.cpp
-  Server/Protocol/Handlers/AddonHandler.h
   Server/Protocol/Handlers/ArenaTeamHandler.cpp
   Server/Protocol/Handlers/AuctionHouseHandler.cpp
   Server/Protocol/Handlers/BattleGroundHandler.cpp
@@ -284,7 +149,6 @@ set(game_STAT_SRCS
   Server/Protocol/Handlers/MiscHandler.cpp
   Server/Protocol/Handlers/MovementHandler.cpp
   Server/Protocol/Handlers/NPCHandler.cpp
-  Server/Protocol/Handlers/NPCHandler.h
   Server/Protocol/Handlers/PetHandler.cpp
   Server/Protocol/Handlers/PetitionsHandler.cpp
   Server/Protocol/Handlers/QueryHandler.cpp
@@ -296,37 +160,21 @@ set(game_STAT_SRCS
   Server/Protocol/Handlers/TradeHandler.cpp
   Server/Protocol/Handlers/VoiceChatHandler.cpp
   Server/Protocol/Opcodes.cpp
-  Server/Protocol/Opcodes.h
   Server/Protocol/WorldLog.cpp
-  Server/Protocol/WorldLog.h
   Server/WorldSession.cpp
-  Server/WorldSession.h
   Server/WorldSocket.cpp
-  Server/WorldSocket.h
   Server/WorldSocketMgr.cpp
-  Server/WorldSocketMgr.h
   Skills/SkillDiscovery.cpp
-  Skills/SkillDiscovery.h
   Skills/SkillExtraItems.cpp
-  Skills/SkillExtraItems.h
-  Spells/Auras/SpellAuraDefines.h
   Spells/Auras/SpellAuras.cpp
-  Spells/Auras/SpellAuras.h
   Spells/Auras/SpellAuraEffects.cpp
-  Spells/Auras/SpellAuraEffects.h
   Spells/Auras/SpellEffects.cpp
   Spells/Spell.cpp
-  Spells/Spell.h
   Spells/SpellMgr.cpp
-  Spells/SpellMgr.h
   Tools/PlayerDump.cpp
-  Tools/PlayerDump.h
   Tools/Tools.cpp
-  Tools/Tools.h
   Weather/Weather.cpp
-  Weather/Weather.h
   World/World.cpp
-  World/World.h
 )
 
 include_directories(
@@ -423,17 +271,10 @@ include_directories(
 if(NOT DO_SCRIPTS)
   set(game_STAT_SRCS ${game_STAT_SRCS}
     AI/ScriptedAI/ScriptedEscortAI.cpp
-    AI/ScriptedAI/ScriptedEscortAI.h
     AI/ScriptedAI/ScriptedCreature.cpp
-    AI/ScriptedAI/ScriptedCreature.h
     AI/ScriptedAI/ScriptedFollowerAI.cpp
-    AI/ScriptedAI/ScriptedFollowerAI.h
-    AI/ScriptedAI/ScriptedGossip.h
     AI/ScriptedAI/ScriptedGuardAI.cpp
-    AI/ScriptedAI/ScriptedGuardAI.h
-    AI/ScriptedAI/ScriptedInstance.h
     AI/ScriptedAI/ScriptedSimpleAI.cpp
-    AI/ScriptedAI/ScriptedSimpleAI.h
   )
   message("-- Added basic scriptAI-engines to GAME library")
 endif()
diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp
index e401051b7cb..4e32b48d6b8 100644
--- a/src/server/game/Entities/Object/Object.cpp
+++ b/src/server/game/Entities/Object/Object.cpp
@@ -1379,28 +1379,15 @@ bool Position::HasInArc(float arc, const Position *obj) const
         return true;
 
     // move arc to range 0.. 2*pi
-    while (arc >= 2.0f * M_PI)
-        arc -=  2.0f * M_PI;
-    while (arc < 0)
-        arc +=  2.0f * M_PI;
+    arc = MapManager::NormalizeOrientation(arc);
 
     float angle = GetAngle(obj);
     angle -= m_orientation;
 
-    //if (angle > 100 || angle < -100)
-    //{
-    //    sLog.outCrash("Invalid Angle %f: this %u %u %f %f %f %f, that %u %u %f %f %f %f", angle,
-    //        GetEntry(), GetGUIDLow(), GetPositionX(), GetPositionY(), GetPositionZ(), GetOrientation(),
-    //        obj->GetEntry(), obj->GetGUIDLow(), obj->GetPositionX(), obj->GetPositionY(), obj->GetPositionZ(), obj->GetOrientation());
-    //    assert(false);
-    //    return false;
-    //}
-
     // move angle to range -pi ... +pi
-    while (angle > M_PI)
-        angle -= 2.0f * M_PI;
-    while (angle < -M_PI)
-        angle += 2.0f * M_PI;
+    angle = MapManager::NormalizeOrientation(angle);
+    if(angle > M_PI)
+        angle -= 2.0f*M_PI;
 
     float lborder =  -1 * (arc/2.0f);                       // in range -pi..0
     float rborder = (arc/2.0f);                             // in range 0..pi
diff --git a/src/server/game/Maps/MapManager.h b/src/server/game/Maps/MapManager.h
index 0fd13f72af2..52f38c54eb2 100644
--- a/src/server/game/Maps/MapManager.h
+++ b/src/server/game/Maps/MapManager.h
@@ -108,6 +108,21 @@ class MapManager : public Trinity::Singleton
Date: Thu, 24 Jun 2010 18:46:38 +0200
Subject: Fix genrevision to use the revision of the CHECKED OUT sourcetree,
 not the revision from when it was last CACHED (BAH-HUMBUG-CRAP-BUG! Grrrr...)

--HG--
branch : trunk
---
 src/genrevision/genrevision.cpp | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/genrevision/genrevision.cpp b/src/genrevision/genrevision.cpp
index 7e304b25a7e..35bb315088c 100644
--- a/src/genrevision/genrevision.cpp
+++ b/src/genrevision/genrevision.cpp
@@ -403,14 +403,14 @@ int main(int argc, char **argv)
             if (!res)
                 res = extractDataFromSvn(path+"_svn/entries",use_url,data);
             // HG data
-            if (!res)
-                res = extractDataFromHG(path+".hg/branchheads.cache",path,use_url,data);
-            if (!res)
-                res = extractDataFromHG(path+"_hg/branchheads.cache",path,use_url,data);
             if (!res)
                 res = extractDataFromHG(path+".hg/branch.cache",path,use_url,data);
             if (!res)
                 res = extractDataFromHG(path+"_hg/branch.cache",path,use_url,data);
+            if (!res)
+                res = extractDataFromHG(path+".hg/branchheads.cache",path,use_url,data);
+            if (!res)
+                res = extractDataFromHG(path+"_hg/branchheads.cache",path,use_url,data);
             // GIT data
             if (!res)
                 res = extractDataFromGit(path+".git/FETCH_HEAD",path,use_url,data);
@@ -429,14 +429,14 @@ int main(int argc, char **argv)
             if (!res)
                 res = extractDataFromGit(path+"_git/FETCH_HEAD",path,use_url,data);
             // HG data
-            if (!res)
-                res = extractDataFromHG(path+".hg/branchheads.cache",path,use_url,data);
-            if (!res)
-                res = extractDataFromHG(path+"_hg/branchheads.cache",path,use_url,data);
             if (!res)
                 res = extractDataFromHG(path+".hg/branch.cache",path,use_url,data);
             if (!res)
                 res = extractDataFromHG(path+"_hg/branch.cache",path,use_url,data);
+            if (!res)
+                res = extractDataFromHG(path+".hg/branchheads.cache",path,use_url,data);
+            if (!res)
+                res = extractDataFromHG(path+"_hg/branchheads.cache",path,use_url,data);
            /// SVN data
             if (!res)
                 res = extractDataFromSvn(path+".svn/entries",use_url,data);
@@ -452,13 +452,11 @@ int main(int argc, char **argv)
         else if(hg_prefered)
         {
             // HG data
-            res = extractDataFromHG(path+".hg/branchheads.cache",path,use_url,data);
-            if (!res)
-                res = extractDataFromHG(path+"_hg/branchheads.cache",path,use_url,data);
-            if (!res)
-                res = extractDataFromHG(path+".hg/branch.cache",path,use_url,data);
+            res = extractDataFromHG(path+".hg/branch.cache",path,use_url,data);
             if (!res)
                 res = extractDataFromHG(path+"_hg/branch.cache",path,use_url,data);
+            if (!res)
+                res = extractDataFromHG(path+"_hg/branchheads.cache",path,use_url,data);
             /// SVN data
             if (!res)
                 res = extractDataFromSvn(path+".svn/entries",use_url,data);
-- 
cgit v1.2.3


From 7c6be33ae01efb064114f9375f7153d80c070b3f Mon Sep 17 00:00:00 2001
From: click 
Date: Thu, 24 Jun 2010 20:13:07 +0200
Subject: Revert previous commit.

--HG--
branch : trunk
---
 src/genrevision/genrevision.cpp | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/genrevision/genrevision.cpp b/src/genrevision/genrevision.cpp
index 35bb315088c..71ca1553689 100644
--- a/src/genrevision/genrevision.cpp
+++ b/src/genrevision/genrevision.cpp
@@ -203,6 +203,7 @@ void extractDataFromGit(FILE* EntriesFile, std::string path, bool url, RawData&
         strcpy(data.rev_str,hash_str);
         strcpy(data.hash_str,"*");
 
+
     time_t rev_time = 0;
     // extracting date/time
     FILE* LogFile = fopen((path+".git/logs/HEAD").c_str(), "r");
@@ -403,14 +404,14 @@ int main(int argc, char **argv)
             if (!res)
                 res = extractDataFromSvn(path+"_svn/entries",use_url,data);
             // HG data
-            if (!res)
-                res = extractDataFromHG(path+".hg/branch.cache",path,use_url,data);
-            if (!res)
-                res = extractDataFromHG(path+"_hg/branch.cache",path,use_url,data);
             if (!res)
                 res = extractDataFromHG(path+".hg/branchheads.cache",path,use_url,data);
             if (!res)
                 res = extractDataFromHG(path+"_hg/branchheads.cache",path,use_url,data);
+            if (!res)
+                res = extractDataFromHG(path+".hg/branch.cache",path,use_url,data);
+            if (!res)
+                res = extractDataFromHG(path+"_hg/branch.cache",path,use_url,data);
             // GIT data
             if (!res)
                 res = extractDataFromGit(path+".git/FETCH_HEAD",path,use_url,data);
@@ -429,14 +430,14 @@ int main(int argc, char **argv)
             if (!res)
                 res = extractDataFromGit(path+"_git/FETCH_HEAD",path,use_url,data);
             // HG data
-            if (!res)
-                res = extractDataFromHG(path+".hg/branch.cache",path,use_url,data);
-            if (!res)
-                res = extractDataFromHG(path+"_hg/branch.cache",path,use_url,data);
             if (!res)
                 res = extractDataFromHG(path+".hg/branchheads.cache",path,use_url,data);
             if (!res)
                 res = extractDataFromHG(path+"_hg/branchheads.cache",path,use_url,data);
+            if (!res)
+                res = extractDataFromHG(path+".hg/branch.cache",path,use_url,data);
+            if (!res)
+                res = extractDataFromHG(path+"_hg/branch.cache",path,use_url,data);
            /// SVN data
             if (!res)
                 res = extractDataFromSvn(path+".svn/entries",use_url,data);
@@ -449,14 +450,17 @@ int main(int argc, char **argv)
                 res = extractDataFromArchive(path+"_hg_archival.txt",path,use_url,data);
         }
 
+
         else if(hg_prefered)
         {
             // HG data
-            res = extractDataFromHG(path+".hg/branch.cache",path,use_url,data);
-            if (!res)
-                res = extractDataFromHG(path+"_hg/branch.cache",path,use_url,data);
+            res = extractDataFromHG(path+".hg/branchheads.cache",path,use_url,data);
             if (!res)
                 res = extractDataFromHG(path+"_hg/branchheads.cache",path,use_url,data);
+            if (!res)
+                res = extractDataFromHG(path+".hg/branch.cache",path,use_url,data);
+            if (!res)
+                res = extractDataFromHG(path+"_hg/branch.cache",path,use_url,data);
             /// SVN data
             if (!res)
                 res = extractDataFromSvn(path+".svn/entries",use_url,data);
-- 
cgit v1.2.3


From a6b9e716a61334e218cff227f66b0c51053e72f3 Mon Sep 17 00:00:00 2001
From: Xanadu 
Date: Thu, 24 Jun 2010 23:59:42 +0200
Subject: Fixed the compile.

--HG--
branch : trunk
---
 src/server/game/Maps/MapManager.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Maps/MapManager.h b/src/server/game/Maps/MapManager.h
index 52f38c54eb2..c3380811c18 100644
--- a/src/server/game/Maps/MapManager.h
+++ b/src/server/game/Maps/MapManager.h
@@ -113,14 +113,14 @@ class MapManager : public Trinity::Singleton(M_PI));
+                mod = -mod + 2.0f * M_PI;
                 return mod;
             }
-            return fmod(o, 2.0f*M_PI);
+            return fmod(o, 2.0f * static_cast(M_PI));
         }
 
         void DoDelayedMovesAndRemoves();
-- 
cgit v1.2.3


From 0f7657b68c8b6444fadb480cdd0f87631391afa5 Mon Sep 17 00:00:00 2001
From: Machiavelli 
Date: Fri, 25 Jun 2010 00:18:01 +0200
Subject: Get rid of Trinity Singleton and Threading patterns and replace them
 with ACE_Singletons and ACE_GUARD_x macro´s with ACE_Thread_Mutex´es
 respectively. Also get rid of unused CountedReference class that used Trinity
 threading pattern.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--HG--
branch : trunk
---
 src/server/game/AI/CreatureAISelector.cpp          |   9 +-
 src/server/game/AI/EventAI/CreatureEventAIMgr.cpp  |   3 -
 src/server/game/AI/EventAI/CreatureEventAIMgr.h    |   5 +-
 src/server/game/Accounts/AccountMgr.cpp            |   4 +-
 src/server/game/Accounts/AccountMgr.h              |   3 +-
 src/server/game/Achievements/AchievementMgr.cpp    |   6 +-
 src/server/game/Achievements/AchievementMgr.h      |   4 +-
 src/server/game/Addons/AddonMgr.cpp                |   4 +-
 src/server/game/Addons/AddonMgr.h                  |   7 +-
 .../AuctionHouseBot/AuctionHouseBot.cpp            |   7 +-
 .../AuctionHouse/AuctionHouseBot/AuctionHouseBot.h |   6 +-
 src/server/game/AuctionHouse/AuctionHouseMgr.cpp   |   4 +-
 src/server/game/AuctionHouse/AuctionHouseMgr.h     |  66 +++++-----
 src/server/game/BattleGrounds/BattleGround.cpp     |   4 +-
 src/server/game/BattleGrounds/BattleGroundMgr.cpp  |   6 +-
 src/server/game/BattleGrounds/BattleGroundMgr.h    |  11 +-
 src/server/game/Chat/Channels/ChannelMgr.cpp       |  11 +-
 src/server/game/Chat/Channels/ChannelMgr.h         |   2 +-
 src/server/game/Chat/Commands/Level0.cpp           |   4 +-
 src/server/game/Chat/Commands/Level1.cpp           |  10 +-
 src/server/game/Chat/Commands/Level2.cpp           |   2 +-
 src/server/game/Chat/Commands/Level3.cpp           |  12 +-
 src/server/game/Conditions/ConditionMgr.cpp        |   4 +-
 src/server/game/Conditions/ConditionMgr.h          |   6 +-
 src/server/game/DataStores/DBCStores.cpp           |   2 +-
 src/server/game/DungeonFinding/LFGMgr.cpp          |   4 +-
 src/server/game/DungeonFinding/LFGMgr.h            |  65 +++++-----
 src/server/game/Entities/Corpse/Corpse.cpp         |   4 +-
 src/server/game/Entities/Creature/Creature.cpp     |   8 +-
 src/server/game/Entities/Creature/Creature.h       |   2 +-
 .../game/Entities/Creature/CreatureGroups.cpp      |   4 +-
 src/server/game/Entities/Creature/CreatureGroups.h |   5 +-
 .../game/Entities/DynamicObject/DynamicObject.cpp  |   4 +-
 src/server/game/Entities/GameObject/GameObject.cpp |   4 +-
 src/server/game/Entities/Object/Object.cpp         |  30 ++---
 src/server/game/Entities/Pet/Pet.cpp               |   4 +-
 src/server/game/Entities/Player/Player.cpp         |  36 +++---
 src/server/game/Entities/Player/SocialMgr.cpp      |   4 +-
 src/server/game/Entities/Player/SocialMgr.h        |   7 +-
 src/server/game/Entities/Transport/Transport.cpp   |   4 +-
 src/server/game/Entities/Unit/Unit.cpp             |   2 +-
 src/server/game/Events/GameEventMgr.cpp            |  13 +-
 src/server/game/Events/GameEventMgr.h              |   8 +-
 src/server/game/Globals/GlobalEvents.cpp           |   4 +-
 src/server/game/Globals/ObjectAccessor.cpp         |  22 ++--
 src/server/game/Globals/ObjectAccessor.h           |  21 ++--
 src/server/game/Globals/ObjectMgr.cpp              |  14 +--
 src/server/game/Globals/ObjectMgr.h                |  14 +--
 src/server/game/Grids/Grid.h                       |   7 +-
 src/server/game/Grids/NGrid.h                      |   9 +-
 src/server/game/Grids/ObjectGridLoader.cpp         |   2 +-
 src/server/game/Groups/Group.cpp                   |   2 +-
 src/server/game/Instances/InstanceSaveMgr.cpp      |  14 +--
 src/server/game/Instances/InstanceSaveMgr.h        |  12 +-
 src/server/game/Maps/Map.cpp                       |  20 ++--
 src/server/game/Maps/Map.h                         |   5 +-
 src/server/game/Maps/MapInstanced.cpp              |   6 +-
 src/server/game/Maps/MapManager.cpp                |  15 +--
 src/server/game/Maps/MapManager.h                  |  10 +-
 src/server/game/Movement/MovementGenerator.h       |   2 +-
 .../WaypointMovementGenerator.cpp                  |   2 +-
 src/server/game/OutdoorPvP/OutdoorPvP.cpp          |   2 +-
 src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp       |   3 -
 src/server/game/OutdoorPvP/OutdoorPvPMgr.h         |   4 +-
 src/server/game/Pools/PoolHandler.cpp              |  15 +--
 src/server/game/Pools/PoolHandler.h                |  11 +-
 src/server/game/Scripting/ScriptMgr.cpp            |   3 -
 src/server/game/Scripting/ScriptMgr.h              |   5 +-
 .../game/Server/Protocol/Handlers/AddonHandler.cpp |   5 -
 .../game/Server/Protocol/Handlers/AddonHandler.h   |  13 +-
 .../Server/Protocol/Handlers/ArenaTeamHandler.cpp  |   2 +-
 .../Server/Protocol/Handlers/ChannelHandler.cpp    |   2 -
 .../Server/Protocol/Handlers/CharacterHandler.cpp  |   2 +-
 .../game/Server/Protocol/Handlers/GuildHandler.cpp |   2 +-
 .../game/Server/Protocol/Handlers/MiscHandler.cpp  |   6 +-
 .../Server/Protocol/Handlers/MovementHandler.cpp   |   4 +-
 .../game/Server/Protocol/Handlers/QueryHandler.cpp |   2 +-
 src/server/game/Server/Protocol/WorldLog.cpp       |  12 +-
 src/server/game/Server/Protocol/WorldLog.h         |  10 +-
 src/server/game/Skills/SkillDiscovery.cpp          |   1 -
 src/server/game/Spells/Spell.cpp                   |   1 -
 src/server/game/Spells/SpellMgr.cpp                |   2 +-
 src/server/game/World/World.cpp                    |  15 +--
 src/server/game/World/World.h                      |   4 +-
 .../BlackwingLair/boss_victor_nefarius.cpp         |   6 +-
 src/server/shared/CMakeLists.txt                   |   2 -
 src/server/shared/Configuration/Config.cpp         |   3 -
 src/server/shared/Configuration/Config.h           |   7 +-
 src/server/shared/Database/Database.cpp            |   1 -
 src/server/shared/Database/Database.h              |   1 -
 src/server/shared/Debugging/MemoryLeaks.cpp        |   3 -
 src/server/shared/Debugging/MemoryLeaks.h          |   5 +-
 .../shared/Dynamic/CountedReference/Reference.h    | 100 ----------------
 .../Dynamic/CountedReference/ReferenceHolder.h     |  42 -------
 .../Dynamic/CountedReference/ReferenceImpl.h       | 133 ---------------------
 src/server/shared/Dynamic/FactoryHolder.h          |   8 +-
 src/server/shared/Dynamic/ObjectRegistry.h         |  10 +-
 src/server/shared/Logging/Log.cpp                  |   3 -
 src/server/shared/Logging/Log.h                    |  10 +-
 src/server/shared/Policies/CreationPolicy.h        | 110 -----------------
 src/server/shared/Policies/ObjectLifeTime.cpp      |  36 ------
 src/server/shared/Policies/ObjectLifeTime.h        |  53 --------
 src/server/shared/Policies/Singleton.h             |  65 ----------
 src/server/shared/Policies/SingletonImp.h          |  93 --------------
 src/server/shared/Policies/ThreadingModel.h        | 130 --------------------
 src/server/worldserver/Master.cpp                  |   3 -
 src/server/worldserver/Master.h                    |   3 +-
 .../worldserver/WorldThread/WorldRunnable.cpp      |   2 +-
 win/VC90/shared.vcproj                             |  24 ----
 109 files changed, 349 insertions(+), 1221 deletions(-)
 delete mode 100644 src/server/shared/Dynamic/CountedReference/Reference.h
 delete mode 100644 src/server/shared/Dynamic/CountedReference/ReferenceHolder.h
 delete mode 100644 src/server/shared/Dynamic/CountedReference/ReferenceImpl.h
 delete mode 100644 src/server/shared/Policies/CreationPolicy.h
 delete mode 100644 src/server/shared/Policies/ObjectLifeTime.cpp
 delete mode 100644 src/server/shared/Policies/ObjectLifeTime.h
 delete mode 100644 src/server/shared/Policies/Singleton.h
 delete mode 100644 src/server/shared/Policies/SingletonImp.h
 delete mode 100644 src/server/shared/Policies/ThreadingModel.h

(limited to 'src')

diff --git a/src/server/game/AI/CreatureAISelector.cpp b/src/server/game/AI/CreatureAISelector.cpp
index 79977fab5b1..8283baf87f9 100644
--- a/src/server/game/AI/CreatureAISelector.cpp
+++ b/src/server/game/AI/CreatureAISelector.cpp
@@ -21,22 +21,19 @@
 #include "Creature.h"
 #include "CreatureAISelector.h"
 #include "PassiveAI.h"
-#include "SingletonImp.h"
+
 #include "MovementGenerator.h"
 #include "Pet.h"
 #include "TemporarySummon.h"
 #include "CreatureAIFactory.h"
 #include "ScriptMgr.h"
 
-INSTANTIATE_SINGLETON_1(CreatureAIRegistry);
-INSTANTIATE_SINGLETON_1(MovementGeneratorRegistry);
-
 namespace FactorySelector
 {
     CreatureAI* selectAI(Creature *creature)
     {
         const CreatureAICreator *ai_factory = NULL;
-        CreatureAIRegistry &ai_registry(CreatureAIRepository::Instance());
+        CreatureAIRegistry& ai_registry(*CreatureAIRepository::instance());
 
         if (creature->isPet())
             ai_factory = ai_registry.GetRegistryItem("PetAI");
@@ -106,7 +103,7 @@ namespace FactorySelector
 
     MovementGenerator* selectMovementGenerator(Creature *creature)
     {
-        MovementGeneratorRegistry &mv_registry(MovementGeneratorRepository::Instance());
+        MovementGeneratorRegistry& mv_registry(*MovementGeneratorRepository::instance());
         assert(creature->GetCreatureInfo() != NULL);
         const MovementGeneratorCreator *mv_factory = mv_registry.GetRegistryItem(creature->GetDefaultMovementType());
 
diff --git a/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp b/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
index 8c71f5e5765..9f4105050ae 100644
--- a/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
+++ b/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
@@ -23,13 +23,10 @@
 #include "CreatureEventAIMgr.h"
 #include "ObjectMgr.h"
 #include "ProgressBar.h"
-#include "SingletonImp.h"
 #include "ObjectDefines.h"
 #include "GridDefines.h"
 #include "ConditionMgr.h"
 
-INSTANTIATE_SINGLETON_1(CreatureEventAIMgr);
-
 // -------------------
 void CreatureEventAIMgr::LoadCreatureEventAI_Texts()
 {
diff --git a/src/server/game/AI/EventAI/CreatureEventAIMgr.h b/src/server/game/AI/EventAI/CreatureEventAIMgr.h
index ef191b22463..3c8181e9e74 100644
--- a/src/server/game/AI/EventAI/CreatureEventAIMgr.h
+++ b/src/server/game/AI/EventAI/CreatureEventAIMgr.h
@@ -24,8 +24,9 @@
 
 class CreatureEventAIMgr
 {
+    friend class ACE_Singleton;
+    CreatureEventAIMgr(){};
     public:
-        CreatureEventAIMgr(){};
         ~CreatureEventAIMgr(){};
 
         void LoadCreatureEventAI_Texts();
@@ -42,5 +43,5 @@ class CreatureEventAIMgr
         CreatureEventAI_TextMap    m_CreatureEventAI_TextMap;
 };
 
-#define CreatureEAI_Mgr Trinity::Singleton::Instance()
+#define CreatureEAI_Mgr (*ACE_Singleton::instance())
 #endif
diff --git a/src/server/game/Accounts/AccountMgr.cpp b/src/server/game/Accounts/AccountMgr.cpp
index 18372677120..54f80114131 100644
--- a/src/server/game/Accounts/AccountMgr.cpp
+++ b/src/server/game/Accounts/AccountMgr.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "DatabaseEnv.h"
-#include "SingletonImp.h"
+
 
 #include "AccountMgr.h"
 #include "ObjectAccessor.h"
@@ -29,8 +29,6 @@
 
 extern DatabaseType LoginDatabase;
 
-INSTANTIATE_SINGLETON_1(AccountMgr);
-
 AccountMgr::AccountMgr()
 {}
 
diff --git a/src/server/game/Accounts/AccountMgr.h b/src/server/game/Accounts/AccountMgr.h
index f770e24d902..a0e181cf4a0 100644
--- a/src/server/game/Accounts/AccountMgr.h
+++ b/src/server/game/Accounts/AccountMgr.h
@@ -24,7 +24,6 @@
 #include 
 
 #include "Common.h"
-#include "Singleton.h"
 
 enum AccountOpResult
 {
@@ -59,6 +58,6 @@ class AccountMgr
         static bool normalizeString(std::string& utf8str);
 };
 
-#define accmgr Trinity::Singleton::Instance()
+#define accmgr (*ACE_Singleton::instance())
 #endif
 
diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp
index 41b9acfff2c..137c22634fa 100644
--- a/src/server/game/Achievements/AchievementMgr.cpp
+++ b/src/server/game/Achievements/AchievementMgr.cpp
@@ -22,7 +22,7 @@
 #include "World.h"
 #include "WorldPacket.h"
 #include "DatabaseEnv.h"
-#include "SingletonImp.h"
+
 
 #include "AchievementMgr.h"
 #include "ArenaTeam.h"
@@ -41,8 +41,6 @@
 #include "Map.h"
 #include "InstanceData.h"
 
-INSTANTIATE_SINGLETON_1(AchievementGlobalMgr);
-
 namespace Trinity
 {
     class AchievementChatBuilder
@@ -965,7 +963,7 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
                 if (!miscvalue1)
                     continue;
 
-                Map const* map = GetPlayer()->IsInWorld() ? GetPlayer()->GetMap() : MapManager::Instance().FindMap(GetPlayer()->GetMapId(), GetPlayer()->GetInstanceId());
+                Map const* map = GetPlayer()->IsInWorld() ? GetPlayer()->GetMap() : sMapMgr.FindMap(GetPlayer()->GetMapId(), GetPlayer()->GetInstanceId());
                 if (!map || !map->IsDungeon())
                     continue;
 
diff --git a/src/server/game/Achievements/AchievementMgr.h b/src/server/game/Achievements/AchievementMgr.h
index 97dbc86396e..0eedf971c20 100644
--- a/src/server/game/Achievements/AchievementMgr.h
+++ b/src/server/game/Achievements/AchievementMgr.h
@@ -22,7 +22,7 @@
 #include 
 
 #include "Common.h"
-#include "Singleton.h"
+#include "ace/Singleton.h"
 #include "DatabaseEnv.h"
 #include "DBCEnums.h"
 #include "DBCStores.h"
@@ -342,6 +342,6 @@ class AchievementGlobalMgr
         AchievementRewardLocales m_achievementRewardLocales;
 };
 
-#define achievementmgr Trinity::Singleton::Instance()
+#define achievementmgr (*ACE_Singleton::instance())
 
 #endif
diff --git a/src/server/game/Addons/AddonMgr.cpp b/src/server/game/Addons/AddonMgr.cpp
index b7b1d2e9333..9bc28f845ac 100644
--- a/src/server/game/Addons/AddonMgr.cpp
+++ b/src/server/game/Addons/AddonMgr.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "DatabaseEnv.h"
-#include "SingletonImp.h"
+
 
 #include "AddonMgr.h"
 #include "ObjectAccessor.h"
@@ -30,8 +30,6 @@
 
 extern DatabaseType LoginDatabase;
 
-INSTANTIATE_SINGLETON_1(AddonMgr);
-
 AddonMgr::AddonMgr()
 {
 }
diff --git a/src/server/game/Addons/AddonMgr.h b/src/server/game/Addons/AddonMgr.h
index 0d648794416..90232cc3f2b 100644
--- a/src/server/game/Addons/AddonMgr.h
+++ b/src/server/game/Addons/AddonMgr.h
@@ -22,7 +22,7 @@
 #define _ADDONMGR_H
 
 #include "Common.h"
-#include "Singleton.h"
+#include "ace/Singleton.h"
 
 #include 
 
@@ -68,9 +68,10 @@ typedef std::list SavedAddonsList;
 
 class AddonMgr
 {
+    friend class ACE_Singleton;
+    AddonMgr();
     public:
 
-        AddonMgr();
         ~AddonMgr();
 
         void LoadFromDB();
@@ -83,7 +84,7 @@ class AddonMgr
         SavedAddonsList m_knownAddons;                           // Known addons.
 };
 
-#define sAddonMgr Trinity::Singleton::Instance()
+#define sAddonMgr (*ACE_Singleton::instance())
 
 #endif
 
diff --git a/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.cpp b/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.cpp
index e9cf8f21ab2..ce621e689cd 100644
--- a/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.cpp
+++ b/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.cpp
@@ -3,8 +3,7 @@
 #include "AuctionHouseBot.h"
 #include 
 
-#include "SingletonImp.h"
-INSTANTIATE_SINGLETON_1(AuctionHouseBot);
+
 
 using namespace std;
 vector npcItems;
@@ -693,7 +692,7 @@ void AuctionHouseBot::Update()
     WorldSession _session(AHBplayerAccount, NULL, SEC_PLAYER, true, 0, LOCALE_enUS);
     Player _AHBplayer(&_session);
     _AHBplayer.Initialize(AHBplayerGUID);
-    ObjectAccessor::Instance().AddObject(&_AHBplayer);
+    sObjectAccessor.AddObject(&_AHBplayer);
 
     // Add New Bids
     if (!sWorld.getConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_AUCTION))
@@ -725,7 +724,7 @@ void AuctionHouseBot::Update()
         addNewAuctionBuyerBotBid(&_AHBplayer, &NeutralConfig, &_session);
         _lastrun_n = _newrun;
     }
-    ObjectAccessor::Instance().RemoveObject(&_AHBplayer);
+    sObjectAccessor.RemoveObject(&_AHBplayer);
 }
 
 void AuctionHouseBot::Initialize()
diff --git a/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.h b/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.h
index f29a8762513..853955a43a0 100644
--- a/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.h
+++ b/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.h
@@ -1207,9 +1207,11 @@ private:
     inline uint32 minValue(uint32 a, uint32 b) { return a <= b ? a : b; };
     void addNewAuctions(Player *AHBplayer, AHBConfig *config);
     void addNewAuctionBuyerBotBid(Player *AHBplayer, AHBConfig *config, WorldSession *session);
+    
+    friend class ACE_Singleton;
+    AuctionHouseBot();
 
 public:
-    AuctionHouseBot();
     ~AuctionHouseBot();
     void Update();
     void Initialize();
@@ -1220,6 +1222,6 @@ public:
     uint32 GetAHBplayerGUID() { return AHBplayerGUID; };
 };
 
-#define auctionbot Trinity::Singleton::Instance()
+#define auctionbot (*ACE_Singleton::instance())
 
 #endif
diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp
index 744df2cb6e7..38874336cc4 100644
--- a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp
+++ b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp
@@ -24,7 +24,7 @@
 #include "WorldSession.h"
 #include "DatabaseEnv.h"
 #include "SQLStorage.h"
-#include "SingletonImp.h"
+
 #include "DBCStores.h"
 
 #include "AccountMgr.h"
@@ -35,8 +35,6 @@
 #include "ProgressBar.h"
 #include 
 
-INSTANTIATE_SINGLETON_1(AuctionHouseMgr);
-
 using namespace std;
 
 AuctionHouseMgr::AuctionHouseMgr()
diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.h b/src/server/game/AuctionHouse/AuctionHouseMgr.h
index 7048e419c36..f0eda8f4fc4 100644
--- a/src/server/game/AuctionHouse/AuctionHouseMgr.h
+++ b/src/server/game/AuctionHouse/AuctionHouseMgr.h
@@ -21,7 +21,7 @@
 #ifndef _AUCTION_HOUSE_MGR_H
 #define _AUCTION_HOUSE_MGR_H
 
-#include "Singleton.h"
+#include "ace/Singleton.h"
 
 #include "SharedDefines.h"
 
@@ -121,51 +121,53 @@ class AuctionHouseObject
 
 class AuctionHouseMgr
 {
-  public:
+    friend class ACE_Singleton;
     AuctionHouseMgr();
-    ~AuctionHouseMgr();
+    
+    public:
+        ~AuctionHouseMgr();
 
-    typedef UNORDERED_MAP ItemMap;
+        typedef UNORDERED_MAP ItemMap;
 
-    AuctionHouseObject* GetAuctionsMap(uint32 factionTemplateId);
-    AuctionHouseObject* GetBidsMap(uint32 factionTemplateId);
+        AuctionHouseObject* GetAuctionsMap(uint32 factionTemplateId);
+        AuctionHouseObject* GetBidsMap(uint32 factionTemplateId);
 
-    Item* GetAItem(uint32 id)
-    {
-        ItemMap::const_iterator itr = mAitems.find(id);
-        if (itr != mAitems.end())
+        Item* GetAItem(uint32 id)
         {
-            return itr->second;
+            ItemMap::const_iterator itr = mAitems.find(id);
+            if (itr != mAitems.end())
+            {
+                return itr->second;
+            }
+            return NULL;
         }
-        return NULL;
-    }
 
-    //auction messages
-    void SendAuctionWonMail(AuctionEntry * auction);
-    void SendAuctionSalePendingMail(AuctionEntry * auction);
-    void SendAuctionSuccessfulMail(AuctionEntry * auction);
-    void SendAuctionExpiredMail(AuctionEntry * auction);
-    static uint32 GetAuctionDeposit(AuctionHouseEntry const* entry, uint32 time, Item *pItem);
-    static AuctionHouseEntry const* GetAuctionHouseEntry(uint32 factionTemplateId);
+        //auction messages
+        void SendAuctionWonMail(AuctionEntry * auction);
+        void SendAuctionSalePendingMail(AuctionEntry * auction);
+        void SendAuctionSuccessfulMail(AuctionEntry * auction);
+        void SendAuctionExpiredMail(AuctionEntry * auction);
+        static uint32 GetAuctionDeposit(AuctionHouseEntry const* entry, uint32 time, Item *pItem);
+        static AuctionHouseEntry const* GetAuctionHouseEntry(uint32 factionTemplateId);
 
-  public:
+    public:
     //load first auction items, because of check if item exists, when loading
-    void LoadAuctionItems();
-    void LoadAuctions();
+        void LoadAuctionItems();
+        void LoadAuctions();
 
-    void AddAItem(Item* it);
-    bool RemoveAItem(uint32 id);
+        void AddAItem(Item* it);
+        bool RemoveAItem(uint32 id);
 
-    void Update();
+        void Update();
 
-  private:
-    AuctionHouseObject mHordeAuctions;
-    AuctionHouseObject mAllianceAuctions;
-    AuctionHouseObject mNeutralAuctions;
+    private:
+        AuctionHouseObject mHordeAuctions;
+        AuctionHouseObject mAllianceAuctions;
+        AuctionHouseObject mNeutralAuctions;
 
-    ItemMap mAitems;
+        ItemMap mAitems;
 };
 
-#define auctionmgr Trinity::Singleton::Instance()
+#define auctionmgr (*ACE_Singleton::instance())
 
 #endif
diff --git a/src/server/game/BattleGrounds/BattleGround.cpp b/src/server/game/BattleGrounds/BattleGround.cpp
index 591417c8fea..86125ac5bfe 100644
--- a/src/server/game/BattleGrounds/BattleGround.cpp
+++ b/src/server/game/BattleGrounds/BattleGround.cpp
@@ -323,7 +323,7 @@ void BattleGround::Update(uint32 diff)
             plr->ResurrectPlayer(1.0f);
             plr->CastSpell(plr, 6962, true);
             plr->CastSpell(plr, SPELL_SPIRIT_HEAL_MANA, true);
-            ObjectAccessor::Instance().ConvertCorpseForPlayer(*itr);
+            sObjectAccessor.ConvertCorpseForPlayer(*itr);
         }
         m_ResurrectQueue.clear();
     }
@@ -1525,7 +1525,7 @@ Creature* BattleGround::AddCreature(uint32 entry, uint32 type, uint32 teamval, f
 /*
 void BattleGround::SpawnBGCreature(uint32 type, uint32 respawntime)
 {
-    Map * map = MapManager::Instance().FindMap(GetMapId(),GetInstanceId());
+    Map * map = sMapMgr.FindMap(GetMapId(),GetInstanceId());
     if (!map)
         return false;
 
diff --git a/src/server/game/BattleGrounds/BattleGroundMgr.cpp b/src/server/game/BattleGrounds/BattleGroundMgr.cpp
index ea2d0c2f920..84891dcf2df 100644
--- a/src/server/game/BattleGrounds/BattleGroundMgr.cpp
+++ b/src/server/game/BattleGrounds/BattleGroundMgr.cpp
@@ -22,7 +22,7 @@
 #include "ObjectMgr.h"
 #include "World.h"
 #include "WorldPacket.h"
-#include "SingletonImp.h"
+
 
 #include "ArenaTeam.h"
 #include "BattleGroundMgr.h"
@@ -49,8 +49,6 @@
 #include "SharedDefines.h"
 #include "Formulas.h"
 
-INSTANTIATE_SINGLETON_1(BattleGroundMgr);
-
 /*********************************************************/
 /***            BATTLEGROUND QUEUE SYSTEM              ***/
 /*********************************************************/
@@ -1630,7 +1628,7 @@ BattleGround * BattleGroundMgr::CreateNewBattleGround(BattleGroundTypeId bgTypeI
     }
 
     // generate a new instance id
-    bg->SetInstanceID(MapManager::Instance().GenerateInstanceId()); // set instance id
+    bg->SetInstanceID(sMapMgr.GenerateInstanceId()); // set instance id
     bg->SetClientInstanceID(CreateClientVisibleInstanceId(isRandom ? BATTLEGROUND_RB : bgTypeId, bracketEntry->GetBracketId()));
 
     // reset the new bg (set status to status_wait_queue from status_none)
diff --git a/src/server/game/BattleGrounds/BattleGroundMgr.h b/src/server/game/BattleGrounds/BattleGroundMgr.h
index 5319ce85752..40dfc39b5e5 100644
--- a/src/server/game/BattleGrounds/BattleGroundMgr.h
+++ b/src/server/game/BattleGrounds/BattleGroundMgr.h
@@ -22,7 +22,7 @@
 #define __BATTLEGROUNDMGR_H
 
 #include "Common.h"
-#include "Singleton.h"
+#include "ace/Singleton.h"
 
 #include "DBCEnums.h"
 #include "BattleGround.h"
@@ -180,9 +180,12 @@ class BGQueueRemoveEvent : public BasicEvent
 
 class BattleGroundMgr
 {
+    /// Todo: Thread safety?
+    /* Construction */
+    friend class ACE_Singleton;
+    BattleGroundMgr();
+    
     public:
-        /* Construction */
-        BattleGroundMgr();
         ~BattleGroundMgr();
         void Update(uint32 diff);
 
@@ -271,6 +274,6 @@ class BattleGroundMgr
         bool   m_Testing;
 };
 
-#define sBattleGroundMgr Trinity::Singleton::Instance()
+#define sBattleGroundMgr (*ACE_Singleton::instance())
 #endif
 
diff --git a/src/server/game/Chat/Channels/ChannelMgr.cpp b/src/server/game/Chat/Channels/ChannelMgr.cpp
index b26a42aa2b1..b72a2698d3a 100644
--- a/src/server/game/Chat/Channels/ChannelMgr.cpp
+++ b/src/server/game/Chat/Channels/ChannelMgr.cpp
@@ -17,21 +17,18 @@
  */
 
 #include "ChannelMgr.h"
-#include "SingletonImp.h"
-#include "World.h"
 
-INSTANTIATE_SINGLETON_1(AllianceChannelMgr);
-INSTANTIATE_SINGLETON_1(HordeChannelMgr);
+#include "World.h"
 
 ChannelMgr* channelMgr(uint32 team)
 {
     if (sWorld.getConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_CHANNEL))
-        return &Trinity::Singleton::Instance();        // cross-faction
+        return ACE_Singleton::instance();        // cross-faction
 
     if (team == ALLIANCE)
-        return &Trinity::Singleton::Instance();
+        return ACE_Singleton::instance();
     if (team == HORDE)
-        return &Trinity::Singleton::Instance();
+        return ACE_Singleton::instance();
 
     return NULL;
 }
diff --git a/src/server/game/Chat/Channels/ChannelMgr.h b/src/server/game/Chat/Channels/ChannelMgr.h
index 1997eb76108..c4e872de6b6 100644
--- a/src/server/game/Chat/Channels/ChannelMgr.h
+++ b/src/server/game/Chat/Channels/ChannelMgr.h
@@ -22,7 +22,7 @@
 
 #include "Common.h"
 #include "Channel.h"
-#include "Singleton.h"
+#include "ace/Singleton.h"
 
 #include 
 #include 
diff --git a/src/server/game/Chat/Commands/Level0.cpp b/src/server/game/Chat/Commands/Level0.cpp
index bed8e3ee23f..53f2341c5af 100644
--- a/src/server/game/Chat/Commands/Level0.cpp
+++ b/src/server/game/Chat/Commands/Level0.cpp
@@ -165,8 +165,8 @@ bool ChatHandler::HandleGMListIngameCommand(const char* /*args*/)
 {
     bool first = true;
 
-    ObjectAccessor::Guard guard(*HashMapHolder::GetLock());
-    HashMapHolder::MapType &m = ObjectAccessor::Instance().GetPlayers();
+    ACE_GUARD_RETURN(ACE_Thread_Mutex, guard, *HashMapHolder::GetLock(), true);
+    HashMapHolder::MapType &m = sObjectAccessor.GetPlayers();
     for (HashMapHolder::MapType::const_iterator itr = m.begin(); itr != m.end(); ++itr)
     {
         AccountTypes itr_sec = itr->second->GetSession()->GetSecurity();
diff --git a/src/server/game/Chat/Commands/Level1.cpp b/src/server/game/Chat/Commands/Level1.cpp
index a9f1e7d9c15..771339645fe 100644
--- a/src/server/game/Chat/Commands/Level1.cpp
+++ b/src/server/game/Chat/Commands/Level1.cpp
@@ -2381,7 +2381,7 @@ bool ChatHandler::HandleWhispersCommand(const char* args)
 //Save all players in the world
 bool ChatHandler::HandleSaveAllCommand(const char* /*args*/)
 {
-    ObjectAccessor::Instance().SaveAllPlayers();
+    sObjectAccessor.SaveAllPlayers();
     SendSysMessage(LANG_PLAYERS_SAVED);
     return true;
 }
@@ -2502,7 +2502,7 @@ bool ChatHandler::HandleTeleNameCommand(const char * args)
 
         PSendSysMessage(LANG_TELEPORTING_TO, nameLink.c_str(), GetTrinityString(LANG_OFFLINE), tele->name.c_str());
         Player::SavePositionInDB(tele->mapId,tele->position_x,tele->position_y,tele->position_z,tele->orientation,
-            MapManager::Instance().GetZoneId(tele->mapId,tele->position_x,tele->position_y,tele->position_z),target_guid);
+            sMapMgr.GetZoneId(tele->mapId,tele->position_x,tele->position_y,tele->position_z),target_guid);
     }
 
     return true;
@@ -2768,7 +2768,7 @@ bool ChatHandler::HandleGoXYCommand(const char* args)
     else
         _player->SaveRecallPosition();
 
-    Map const *map = MapManager::Instance().CreateBaseMap(mapid);
+    Map const *map = sMapMgr.CreateBaseMap(mapid);
     float z = std::max(map->GetHeight(x, y, MAX_HEIGHT), map->GetWaterLevel(x, y));
 
     _player->TeleportTo(mapid, x, y, z, _player->GetOrientation());
@@ -2861,7 +2861,7 @@ bool ChatHandler::HandleGoZoneXYCommand(const char* args)
     // update to parent zone if exist (client map show only zones without parents)
     AreaTableEntry const* zoneEntry = areaEntry->zone ? GetAreaEntryByAreaID(areaEntry->zone) : areaEntry;
 
-    Map const *map = MapManager::Instance().CreateBaseMap(zoneEntry->mapid);
+    Map const *map = sMapMgr.CreateBaseMap(zoneEntry->mapid);
 
     if (map->Instanceable())
     {
@@ -2936,7 +2936,7 @@ bool ChatHandler::HandleGoGridCommand(const char* args)
     else
         _player->SaveRecallPosition();
 
-    Map const *map = MapManager::Instance().CreateBaseMap(mapid);
+    Map const *map = sMapMgr.CreateBaseMap(mapid);
     float z = std::max(map->GetHeight(x, y, MAX_HEIGHT), map->GetWaterLevel(x, y));
     _player->TeleportTo(mapid, x, y, z, _player->GetOrientation());
 
diff --git a/src/server/game/Chat/Commands/Level2.cpp b/src/server/game/Chat/Commands/Level2.cpp
index 5d67ec06660..90c7d5ef8ae 100644
--- a/src/server/game/Chat/Commands/Level2.cpp
+++ b/src/server/game/Chat/Commands/Level2.cpp
@@ -2844,7 +2844,7 @@ bool ChatHandler::HandleWpModifyCommand(const char* args)
                 // To call _LoadGoods(); _LoadQuests(); CreateTrainerSpells();
                 wpCreature2->LoadFromDB(wpCreature2->GetDBTableGUIDLow(), map);
                 map->Add(wpCreature2);
-                //MapManager::Instance().GetMap(npcCreature->GetMapId())->Add(wpCreature2);
+                //sMapMgr.GetMap(npcCreature->GetMapId())->Add(wpCreature2);
             }
 
             WorldDatabase.PExecuteLog("UPDATE waypoint_data SET position_x = '%f',position_y = '%f',position_z = '%f' where id = '%u' AND point='%u'",
diff --git a/src/server/game/Chat/Commands/Level3.cpp b/src/server/game/Chat/Commands/Level3.cpp
index 009a4483f83..3ddf9b84365 100644
--- a/src/server/game/Chat/Commands/Level3.cpp
+++ b/src/server/game/Chat/Commands/Level3.cpp
@@ -689,7 +689,7 @@ bool ChatHandler::HandleReloadConfigCommand(const char* /*args*/)
 {
     sLog.outString("Re-Loading config settings...");
     sWorld.LoadConfigSettings(true);
-    MapManager::Instance().InitializeVisibilityDistanceInfo();
+    sMapMgr.InitializeVisibilityDistanceInfo();
     SendGlobalGMSysMessage("World config settings reloaded.");
     return true;
 }
@@ -4513,7 +4513,7 @@ bool ChatHandler::HandleReviveCommand(const char *args)
     }
     else
         // will resurrected at login without corpse
-        ObjectAccessor::Instance().ConvertCorpseForPlayer(target_guid);
+        sObjectAccessor.ConvertCorpseForPlayer(target_guid);
 
     return true;
 }
@@ -5533,8 +5533,8 @@ bool ChatHandler::HandleResetAllCommand(const char * args)
 
     CharacterDatabase.PExecute("UPDATE characters SET at_login = at_login | '%u' WHERE (at_login & '%u') = '0'",atLogin,atLogin);
 
-    ObjectAccessor::Guard guard(*HashMapHolder::GetLock());
-    HashMapHolder::MapType const& plist = ObjectAccessor::Instance().GetPlayers();
+    ACE_GUARD_RETURN(ACE_Thread_Mutex, guard, *HashMapHolder::GetLock(), true);
+    HashMapHolder::MapType const& plist = sObjectAccessor.GetPlayers();
     for (HashMapHolder::MapType::const_iterator itr = plist.begin(); itr != plist.end(); ++itr)
         itr->second->SetAtLoginFlag(atLogin);
 
@@ -7020,8 +7020,8 @@ bool ChatHandler::HandleInstanceUnbindCommand(const char *args)
 
 bool ChatHandler::HandleInstanceStatsCommand(const char* /*args*/)
 {
-    PSendSysMessage("instances loaded: %d", MapManager::Instance().GetNumInstances());
-    PSendSysMessage("players in instances: %d", MapManager::Instance().GetNumPlayersInInstances());
+    PSendSysMessage("instances loaded: %d", sMapMgr.GetNumInstances());
+    PSendSysMessage("players in instances: %d", sMapMgr.GetNumPlayersInInstances());
     PSendSysMessage("instance saves: %d", sInstanceSaveManager.GetNumInstanceSaves());
     PSendSysMessage("players bound: %d", sInstanceSaveManager.GetNumBoundPlayersTotal());
     PSendSysMessage("groups bound: %d", sInstanceSaveManager.GetNumBoundGroupsTotal());
diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp
index cb35d35c63f..2e81aad1859 100644
--- a/src/server/game/Conditions/ConditionMgr.cpp
+++ b/src/server/game/Conditions/ConditionMgr.cpp
@@ -19,7 +19,7 @@
  */
 
 
-#include "SingletonImp.h"
+
 #include "Player.h"
 #include "SpellAuras.h"
 #include "SpellMgr.h"
@@ -29,8 +29,6 @@
 #include "InstanceData.h"
 #include "ConditionMgr.h"
 
-INSTANTIATE_SINGLETON_1(ConditionMgr);
-
 // Checks if player meets the condition
 // Can have CONDITION_SOURCE_TYPE_NONE && !mReferenceId if called from a special event (ie: eventAI)
 bool Condition::Meets(Player * player, Unit* targetOverride)
diff --git a/src/server/game/Conditions/ConditionMgr.h b/src/server/game/Conditions/ConditionMgr.h
index 2c7c44ecf7f..bb9fc2708fa 100644
--- a/src/server/game/Conditions/ConditionMgr.h
+++ b/src/server/game/Conditions/ConditionMgr.h
@@ -121,8 +121,10 @@ typedef std::map ConditionReferenceMap;//only used for r
 
 class ConditionMgr
 {
+    friend class ACE_Singleton;
+    ConditionMgr();
+    
     public:
-        ConditionMgr();
         ~ConditionMgr();
 
         void LoadConditions(bool isReload = false);
@@ -165,6 +167,6 @@ class ConditionMgr
         std::list m_AllocatedMemory; // some garbage collection :)
 };
 
-#define sConditionMgr Trinity::Singleton::Instance()
+#define sConditionMgr (*ACE_Singleton::instance())
 
 #endif
diff --git a/src/server/game/DataStores/DBCStores.cpp b/src/server/game/DataStores/DBCStores.cpp
index dc5a5b831fd..bc127cb309c 100755
--- a/src/server/game/DataStores/DBCStores.cpp
+++ b/src/server/game/DataStores/DBCStores.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "DBCStores.h"
-#include "SingletonImp.h"
+
 #include "Logging/Log.h"
 #include "ProgressBar.h"
 #include "SharedDefines.h"
diff --git a/src/server/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp
index 1a2c9c9767c..6c089a83bc3 100644
--- a/src/server/game/DungeonFinding/LFGMgr.cpp
+++ b/src/server/game/DungeonFinding/LFGMgr.cpp
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-#include "SingletonImp.h"
+
 #include "Common.h"
 #include "SharedDefines.h"
 #include "Group.h"
@@ -24,8 +24,6 @@
 #include "ObjectMgr.h"
 #include "WorldPacket.h"
 
-INSTANTIATE_SINGLETON_1(LFGMgr);
-
 /*********************************************************/
 /***                    LFG QUEUES                     ***/
 /*********************************************************/
diff --git a/src/server/game/DungeonFinding/LFGMgr.h b/src/server/game/DungeonFinding/LFGMgr.h
index a3d6fedc695..88d33743fa9 100644
--- a/src/server/game/DungeonFinding/LFGMgr.h
+++ b/src/server/game/DungeonFinding/LFGMgr.h
@@ -20,7 +20,7 @@
 #define _LFGMGR_H
 
 #include "Common.h"
-#include "Singleton.h"
+#include "ace/Singleton.h"
 #include "Group.h"
 #include "LFG.h"
 
@@ -237,43 +237,44 @@ typedef std::map LFGQueueMap;
 
 class LFGMgr
 {
-public:
+    friend class ACE_Singleton;
     LFGMgr();
-    ~LFGMgr();
+    public:
+       ~LFGMgr();
 
-    void InitLFG();
-    void SendLfgPlayerInfo(Player *plr);
-    void SendLfgPartyInfo(Player *plr);
-    void Join(Player *plr);
-    void Leave(Player *plr, Group *grp = NULL);
-    void UpdateRoleCheck(Group *grp, Player *plr = NULL);
-    void Update(uint32 diff);
+        void InitLFG();
+        void SendLfgPlayerInfo(Player *plr);
+        void SendLfgPartyInfo(Player *plr);
+        void Join(Player *plr);
+        void Leave(Player *plr, Group *grp = NULL);
+        void UpdateRoleCheck(Group *grp, Player *plr = NULL);
+        void Update(uint32 diff);
 
-private:
-    void BuildLfgRoleCheck(WorldPacket &data, LfgRoleCheck *pRoleCheck);
-    void BuildAvailableRandomDungeonList(WorldPacket &data, Player *plr);
-    void BuildRewardBlock(WorldPacket &data, uint32 dungeon, Player *plr);
-    void BuildPlayerLockDungeonBlock(WorldPacket &data, LfgLockStatusSet *lockSet);
-    void BuildPartyLockDungeonBlock(WorldPacket &data, LfgLockStatusMap *lockMap);
-    bool CheckGroupRoles(LfgRolesMap &groles, bool removeLeaderFlag = true);
+    private:
+        void BuildLfgRoleCheck(WorldPacket &data, LfgRoleCheck *pRoleCheck);
+        void BuildAvailableRandomDungeonList(WorldPacket &data, Player *plr);
+        void BuildRewardBlock(WorldPacket &data, uint32 dungeon, Player *plr);
+        void BuildPlayerLockDungeonBlock(WorldPacket &data, LfgLockStatusSet *lockSet);
+        void BuildPartyLockDungeonBlock(WorldPacket &data, LfgLockStatusMap *lockMap);
+        bool CheckGroupRoles(LfgRolesMap &groles, bool removeLeaderFlag = true);
 
-    LfgLockStatusMap* GetPartyLockStatusDungeons(Player *plr, LfgDungeonSet *dungeons);
-    LfgLockStatusSet* GetPlayerLockStatusDungeons(Player *plr, LfgDungeonSet *dungeons);
-    LfgDungeonSet* GetRandomDungeons(uint8 level, uint8 expansion);
-    LfgDungeonSet* GetDungeonsByRandom(uint32 randomdungeon);
-    LfgDungeonSet* GetAllDungeons();
-    LfgReward* GetRandomDungeonReward(uint32 dungeon, bool done, uint8 level);
-    uint8 GetDungeonGroupType(uint32 dungeon);
+        LfgLockStatusMap* GetPartyLockStatusDungeons(Player *plr, LfgDungeonSet *dungeons);
+        LfgLockStatusSet* GetPlayerLockStatusDungeons(Player *plr, LfgDungeonSet *dungeons);
+        LfgDungeonSet* GetRandomDungeons(uint8 level, uint8 expansion);
+        LfgDungeonSet* GetDungeonsByRandom(uint32 randomdungeon);
+        LfgDungeonSet* GetAllDungeons();
+        LfgReward* GetRandomDungeonReward(uint32 dungeon, bool done, uint8 level);
+        uint8 GetDungeonGroupType(uint32 dungeon);
 
-    LfgRewardList m_RewardList;
-    LfgRewardList m_RewardDoneList;
-    LfgDungeonMap m_DungeonsMap;
+        LfgRewardList m_RewardList;
+        LfgRewardList m_RewardDoneList;
+        LfgDungeonMap m_DungeonsMap;
 
-    LFGQueueMap m_Queues;
-    LfgRoleCheckMap m_RoleChecks;
-    uint32 m_QueueTimer;
-    bool m_update;
+        LFGQueueMap m_Queues;
+        LfgRoleCheckMap m_RoleChecks;
+        uint32 m_QueueTimer;
+        bool m_update;
 };
 
-#define sLFGMgr Trinity::Singleton::Instance()
+#define sLFGMgr (*ACE_Singleton::instance())
 #endif
diff --git a/src/server/game/Entities/Corpse/Corpse.cpp b/src/server/game/Entities/Corpse/Corpse.cpp
index 6d9e11104ab..2811cfa129f 100644
--- a/src/server/game/Entities/Corpse/Corpse.cpp
+++ b/src/server/game/Entities/Corpse/Corpse.cpp
@@ -54,7 +54,7 @@ void Corpse::AddToWorld()
 {
     ///- Register the corpse for guid lookup
     if (!IsInWorld())
-        ObjectAccessor::Instance().AddObject(this);
+        sObjectAccessor.AddObject(this);
 
     Object::AddToWorld();
 }
@@ -63,7 +63,7 @@ void Corpse::RemoveFromWorld()
 {
     ///- Remove the corpse from the accessor
     if (IsInWorld())
-        ObjectAccessor::Instance().RemoveObject(this);
+        sObjectAccessor.RemoveObject(this);
 
     Object::RemoveFromWorld();
 }
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp
index 62300e43a39..6570a418be9 100644
--- a/src/server/game/Entities/Creature/Creature.cpp
+++ b/src/server/game/Entities/Creature/Creature.cpp
@@ -49,7 +49,7 @@
 #include "Vehicle.h"
 #include "SpellAuraEffects.h"
 // apply implementation of the singletons
-#include "SingletonImp.h"
+
 
 TrainerSpell const* TrainerSpellData::Find(uint32 spell_id) const
 {
@@ -185,7 +185,7 @@ void Creature::AddToWorld()
     {
         if (m_zoneScript)
             m_zoneScript->OnCreatureCreate(this, true);
-        ObjectAccessor::Instance().AddObject(this);
+        sObjectAccessor.AddObject(this);
         Unit::AddToWorld();
         SearchFormation();
         AIM_Initialize();
@@ -203,7 +203,7 @@ void Creature::RemoveFromWorld()
         if (m_formation)
             formation_mgr.RemoveCreatureFromGroup(m_formation, this);
         Unit::RemoveFromWorld();
-        ObjectAccessor::Instance().RemoveObject(this);
+        sObjectAccessor.RemoveObject(this);
     }
 }
 
@@ -2410,7 +2410,7 @@ time_t Creature::GetLinkedCreatureRespawnTime() const
             if (data->mapid == GetMapId())   // look up on the same map
                 targetMap = GetMap();
             else                            // it shouldn't be instanceable map here
-                targetMap = MapManager::Instance().FindMap(data->mapid);
+                targetMap = sMapMgr.FindMap(data->mapid);
         }
         if (targetMap)
             return objmgr.GetCreatureRespawnTime(targetGuid,targetMap->GetInstanceId());
diff --git a/src/server/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h
index a7c17561516..ae37ba56fd3 100644
--- a/src/server/game/Entities/Creature/Creature.h
+++ b/src/server/game/Entities/Creature/Creature.h
@@ -700,7 +700,7 @@ class Creature : public Unit, public GridObject
 
         bool DisableReputationGain;
 
-        CreatureInfo const* m_creatureInfo;                 // in difficulty mode > 0 can different from ObjMgr::GetCreatureTemplate(GetEntry())
+        CreatureInfo const* m_creatureInfo;                 // in difficulty mode > 0 can different from objmgr.::GetCreatureTemplate(GetEntry())
         CreatureData const* m_creatureData;
 
         uint16 m_LootMode;                                  // bitmask, default LOOT_MODE_DEFAULT, determines what loot will be lootable
diff --git a/src/server/game/Entities/Creature/CreatureGroups.cpp b/src/server/game/Entities/Creature/CreatureGroups.cpp
index 25aab942916..7bd05123ec5 100644
--- a/src/server/game/Entities/Creature/CreatureGroups.cpp
+++ b/src/server/game/Entities/Creature/CreatureGroups.cpp
@@ -22,13 +22,11 @@
 #include "CreatureGroups.h"
 #include "ObjectMgr.h"
 #include "ProgressBar.h"
-#include "SingletonImp.h"
+
 #include "CreatureAI.h"
 
 #define MAX_DESYNC 5.0f
 
-INSTANTIATE_SINGLETON_1(CreatureGroupManager);
-
 CreatureGroupInfoType   CreatureGroupMap;
 
 void CreatureGroupManager::AddCreatureToGroup(uint32 groupId, Creature *member)
diff --git a/src/server/game/Entities/Creature/CreatureGroups.h b/src/server/game/Entities/Creature/CreatureGroups.h
index 521586b7457..4aa49571b5d 100644
--- a/src/server/game/Entities/Creature/CreatureGroups.h
+++ b/src/server/game/Entities/Creature/CreatureGroups.h
@@ -35,12 +35,15 @@ struct FormationInfo
 
 class CreatureGroupManager
 {
+    friend class ACE_Singleton;
     public:
         void AddCreatureToGroup(uint32 group_id, Creature *creature);
         void RemoveCreatureFromGroup(CreatureGroup *group, Creature *creature);
         void LoadCreatureFormations();
 };
 
+#define formation_mgr (*ACE_Singleton::instance())
+
 typedef UNORDERED_MAP   CreatureGroupInfoType;
 
 extern CreatureGroupInfoType    CreatureGroupMap;
@@ -73,6 +76,4 @@ class CreatureGroup
         void MemberAttackStart(Creature* member, Unit *target);
 };
 
-#define formation_mgr Trinity::Singleton::Instance()
-
 #endif
diff --git a/src/server/game/Entities/DynamicObject/DynamicObject.cpp b/src/server/game/Entities/DynamicObject/DynamicObject.cpp
index 5c13fe47cb7..529710eda90 100644
--- a/src/server/game/Entities/DynamicObject/DynamicObject.cpp
+++ b/src/server/game/Entities/DynamicObject/DynamicObject.cpp
@@ -46,7 +46,7 @@ void DynamicObject::AddToWorld()
     ///- Register the dynamicObject for guid lookup
     if (!IsInWorld())
     {
-        ObjectAccessor::Instance().AddObject(this);
+        sObjectAccessor.AddObject(this);
         WorldObject::AddToWorld();
     }
 }
@@ -69,7 +69,7 @@ void DynamicObject::RemoveFromWorld()
             }
         }
         WorldObject::RemoveFromWorld();
-        ObjectAccessor::Instance().RemoveObject(this);
+        sObjectAccessor.RemoveObject(this);
     }
 }
 
diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp
index 364bc8ec29c..8783a8b5199 100644
--- a/src/server/game/Entities/GameObject/GameObject.cpp
+++ b/src/server/game/Entities/GameObject/GameObject.cpp
@@ -117,7 +117,7 @@ void GameObject::AddToWorld()
         if (m_zoneScript)
             m_zoneScript->OnGameObjectCreate(this, true);
 
-        ObjectAccessor::Instance().AddObject(this);
+        sObjectAccessor.AddObject(this);
         WorldObject::AddToWorld();
     }
 }
@@ -139,7 +139,7 @@ void GameObject::RemoveFromWorld()
                 sLog.outError("Delete GameObject (GUID: %u Entry: %u) that have references in not found creature %u GO list. Crash possible later.",GetGUIDLow(),GetGOInfo()->id,GUID_LOPART(owner_guid));
         }
         WorldObject::RemoveFromWorld();
-        ObjectAccessor::Instance().RemoveObject(this);
+        sObjectAccessor.RemoveObject(this);
     }
 }
 
diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp
index 4e32b48d6b8..fe4b8673b8f 100644
--- a/src/server/game/Entities/Object/Object.cpp
+++ b/src/server/game/Entities/Object/Object.cpp
@@ -110,7 +110,7 @@ Object::~Object()
     {
         sLog.outCrash("Object::~Object - guid="UI64FMTD", typeid=%d, entry=%u deleted but still in update list!!", GetGUID(), GetTypeId(), GetEntry());
         assert(false);
-        ObjectAccessor::Instance().RemoveUpdateObject(this);
+        sObjectAccessor.RemoveUpdateObject(this);
     }
 
     delete [] m_uint32Values;
@@ -731,7 +731,7 @@ void Object::ClearUpdateMask(bool remove)
     if (m_objectUpdated)
     {
         if (remove)
-            ObjectAccessor::Instance().RemoveUpdateObject(this);
+            sObjectAccessor.RemoveUpdateObject(this);
         m_objectUpdated = false;
     }
 }
@@ -804,7 +804,7 @@ void Object::SetInt32Value(uint16 index, int32 value)
         {
             if (!m_objectUpdated)
             {
-                ObjectAccessor::Instance().AddUpdateObject(this);
+                sObjectAccessor.AddUpdateObject(this);
                 m_objectUpdated = true;
             }
         }
@@ -823,7 +823,7 @@ void Object::SetUInt32Value(uint16 index, uint32 value)
         {
             if (!m_objectUpdated)
             {
-                ObjectAccessor::Instance().AddUpdateObject(this);
+                sObjectAccessor.AddUpdateObject(this);
                 m_objectUpdated = true;
             }
         }
@@ -849,7 +849,7 @@ void Object::SetUInt64Value(uint16 index, const uint64 &value)
         {
             if (!m_objectUpdated)
             {
-                ObjectAccessor::Instance().AddUpdateObject(this);
+                sObjectAccessor.AddUpdateObject(this);
                 m_objectUpdated = true;
             }
         }
@@ -868,7 +868,7 @@ bool Object::AddUInt64Value(uint16 index, const uint64 &value)
         {
             if (!m_objectUpdated)
             {
-                ObjectAccessor::Instance().AddUpdateObject(this);
+                sObjectAccessor.AddUpdateObject(this);
                 m_objectUpdated = true;
             }
         }
@@ -889,7 +889,7 @@ bool Object::RemoveUInt64Value(uint16 index, const uint64 &value)
         {
             if (!m_objectUpdated)
             {
-                ObjectAccessor::Instance().AddUpdateObject(this);
+                sObjectAccessor.AddUpdateObject(this);
                 m_objectUpdated = true;
             }
         }
@@ -910,7 +910,7 @@ void Object::SetFloatValue(uint16 index, float value)
         {
             if (!m_objectUpdated)
             {
-                ObjectAccessor::Instance().AddUpdateObject(this);
+                sObjectAccessor.AddUpdateObject(this);
                 m_objectUpdated = true;
             }
         }
@@ -936,7 +936,7 @@ void Object::SetByteValue(uint16 index, uint8 offset, uint8 value)
         {
             if (!m_objectUpdated)
             {
-                ObjectAccessor::Instance().AddUpdateObject(this);
+                sObjectAccessor.AddUpdateObject(this);
                 m_objectUpdated = true;
             }
         }
@@ -962,7 +962,7 @@ void Object::SetUInt16Value(uint16 index, uint8 offset, uint16 value)
         {
             if (!m_objectUpdated)
             {
-                ObjectAccessor::Instance().AddUpdateObject(this);
+                sObjectAccessor.AddUpdateObject(this);
                 m_objectUpdated = true;
             }
         }
@@ -1031,7 +1031,7 @@ void Object::SetFlag(uint16 index, uint32 newFlag)
         {
             if (!m_objectUpdated)
             {
-                ObjectAccessor::Instance().AddUpdateObject(this);
+                sObjectAccessor.AddUpdateObject(this);
                 m_objectUpdated = true;
             }
         }
@@ -1052,7 +1052,7 @@ void Object::RemoveFlag(uint16 index, uint32 oldFlag)
         {
             if (!m_objectUpdated)
             {
-                ObjectAccessor::Instance().AddUpdateObject(this);
+                sObjectAccessor.AddUpdateObject(this);
                 m_objectUpdated = true;
             }
         }
@@ -1077,7 +1077,7 @@ void Object::SetByteFlag(uint16 index, uint8 offset, uint8 newFlag)
         {
             if (!m_objectUpdated)
             {
-                ObjectAccessor::Instance().AddUpdateObject(this);
+                sObjectAccessor.AddUpdateObject(this);
                 m_objectUpdated = true;
             }
         }
@@ -1102,7 +1102,7 @@ void Object::RemoveByteFlag(uint16 index, uint8 offset, uint8 oldFlag)
         {
             if (!m_objectUpdated)
             {
-                ObjectAccessor::Instance().AddUpdateObject(this);
+                sObjectAccessor.AddUpdateObject(this);
                 m_objectUpdated = true;
             }
         }
@@ -1502,7 +1502,7 @@ void Object::ForceValuesUpdateAtIndex(uint32 i)
     {
         if (!m_objectUpdated)
         {
-            ObjectAccessor::Instance().AddUpdateObject(this);
+            sObjectAccessor.AddUpdateObject(this);
             m_objectUpdated = true;
         }
     }
diff --git a/src/server/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp
index ed4bd4d6f96..3e3eea67cca 100644
--- a/src/server/game/Entities/Pet/Pet.cpp
+++ b/src/server/game/Entities/Pet/Pet.cpp
@@ -74,7 +74,7 @@ void Pet::AddToWorld()
     if (!IsInWorld())
     {
         ///- Register the pet for guid lookup
-        ObjectAccessor::Instance().AddObject(this);
+        sObjectAccessor.AddObject(this);
         Unit::AddToWorld();
         AIM_Initialize();
     }
@@ -98,7 +98,7 @@ void Pet::RemoveFromWorld()
     {
         ///- Don't call the function for Creature, normal mobs + totems go in a different storage
         Unit::RemoveFromWorld();
-        ObjectAccessor::Instance().RemoveObject(this);
+        sObjectAccessor.RemoveObject(this);
     }
 }
 
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 56d22c7b49e..e3ddcd81f0b 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -587,7 +587,7 @@ bool Player::Create(uint32 guidlow, const std::string& name, uint8 race, uint8 c
         return false;
     }
 
-    SetMap(MapManager::Instance().CreateMap(info->mapId, this, 0));
+    SetMap(sMapMgr.CreateMap(info->mapId, this, 0));
 
     uint8 powertype = cEntry->powerType;
 
@@ -1822,12 +1822,12 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati
 
         // Check enter rights before map getting to avoid creating instance copy for player
         // this check not dependent from map instance copy and same for all instance copies of selected map
-        if (!MapManager::Instance().CanPlayerEnter(mapid, this, false))
+        if (!sMapMgr.CanPlayerEnter(mapid, this, false))
             return false;
 
         // If the map is not created, assume it is possible to enter it.
         // It will be created in the WorldPortAck.
-        Map *map = MapManager::Instance().FindMap(mapid);
+        Map *map = sMapMgr.FindMap(mapid);
         if (!map ||  map->CanEnter(this))
         {
             //lets reset near teleport flag if it wasn't reset during chained teleports
@@ -4255,7 +4255,7 @@ void Player::DeleteFromDB(uint64 playerguid, uint32 accountId, bool updateRealmC
 
     // convert corpse to bones if exist (to prevent exiting Corpse in World without DB entry)
     // bones will be deleted by corpse/bones deleting thread shortly
-    ObjectAccessor::Instance().ConvertCorpseForPlayer(playerguid);
+    sObjectAccessor.ConvertCorpseForPlayer(playerguid);
 
     // remove from guild
     uint32 guildId = GetGuildIdFromDB(playerguid);
@@ -4684,19 +4684,19 @@ void Player::CreateCorpse()
         corpse->SaveToDB();
 
     // register for player, but not show
-    ObjectAccessor::Instance().AddCorpse(corpse);
+    sObjectAccessor.AddCorpse(corpse);
 }
 
 void Player::SpawnCorpseBones()
 {
-    if (ObjectAccessor::Instance().ConvertCorpseForPlayer(GetGUID()))
+    if (sObjectAccessor.ConvertCorpseForPlayer(GetGUID()))
         if (!GetSession()->PlayerLogoutWithSave())          // at logout we will already store the player
             SaveToDB();                                     // prevent loading as ghost without corpse
 }
 
 Corpse* Player::GetCorpse() const
 {
-    return ObjectAccessor::Instance().GetCorpseForPlayerGUID(GetGUID());
+    return sObjectAccessor.GetCorpseForPlayerGUID(GetGUID());
 }
 
 void Player::DurabilityLossAll(double percent, bool inventory)
@@ -6758,7 +6758,7 @@ uint32 Player::GetZoneIdFromDB(uint64 guid)
         float posy = fields[2].GetFloat();
         float posz = fields[3].GetFloat();
 
-        zone = MapManager::Instance().GetZoneId(map,posx,posy,posz);
+        zone = sMapMgr.GetZoneId(map,posx,posy,posz);
 
         if (zone > 0)
             CharacterDatabase.PExecute("UPDATE characters SET zone='%u' WHERE guid='%u'", zone, guidLow);
@@ -8013,7 +8013,7 @@ void Player::RemovedInsignia(Player* looterPlr)
 
     // We have to convert player corpse to bones, not to be able to resurrect there
     // SpawnCorpseBones isn't handy, 'cos it saves player while he in BG
-    Corpse *bones = ObjectAccessor::Instance().ConvertCorpseForPlayer(GetGUID(),true);
+    Corpse *bones = sObjectAccessor.ConvertCorpseForPlayer(GetGUID(),true);
     if (!bones)
         return;
 
@@ -13680,7 +13680,7 @@ void Player::PrepareQuestMenu(uint64 guid)
     {
         //we should obtain map pointer from GetMap() in 99% of cases. Special case
         //only for quests which cast teleport spells on player
-        Map * _map = IsInWorld() ? GetMap() : MapManager::Instance().FindMap(GetMapId(), GetInstanceId());
+        Map * _map = IsInWorld() ? GetMap() : sMapMgr.FindMap(GetMapId(), GetInstanceId());
         ASSERT(_map);
         GameObject *pGameObject = _map->GetGameObject(guid);
         if (pGameObject)
@@ -13855,7 +13855,7 @@ Quest const * Player::GetNextQuest(uint64 guid, Quest const *pQuest)
     {
         //we should obtain map pointer from GetMap() in 99% of cases. Special case
         //only for quests which cast teleport spells on player
-        Map * _map = IsInWorld() ? GetMap() : MapManager::Instance().FindMap(GetMapId(), GetInstanceId());
+        Map * _map = IsInWorld() ? GetMap() : sMapMgr.FindMap(GetMapId(), GetInstanceId());
         ASSERT(_map);
         GameObject *pGameObject = _map->GetGameObject(guid);
         if (pGameObject)
@@ -15955,7 +15955,7 @@ bool Player::LoadFromDB(uint32 guid, SqlQueryHolder *holder)
         }
         else
         {
-            for (MapManager::TransportSet::iterator iter = MapManager::Instance().m_Transports.begin(); iter != MapManager::Instance().m_Transports.end(); ++iter)
+            for (MapManager::TransportSet::iterator iter = sMapMgr.m_Transports.begin(); iter != sMapMgr.m_Transports.end(); ++iter)
             {
                 if ((*iter)->GetGUIDLow() == transGUID)
                 {
@@ -16038,7 +16038,7 @@ bool Player::LoadFromDB(uint32 guid, SqlQueryHolder *holder)
 
     // NOW player must have valid map
     // load the player's map here if it's not already loaded
-    Map *map = MapManager::Instance().CreateMap(mapId, this, instanceId);
+    Map *map = sMapMgr.CreateMap(mapId, this, instanceId);
 
     if (!map)
     {
@@ -16056,14 +16056,14 @@ bool Player::LoadFromDB(uint32 guid, SqlQueryHolder *holder)
             RelocateToHomebind();
         }
 
-        map = MapManager::Instance().CreateMap(mapId, this, 0);
+        map = sMapMgr.CreateMap(mapId, this, 0);
         if (!map)
         {
             PlayerInfo const *info = objmgr.GetPlayerInfo(getRace(), getClass());
             mapId = info->mapId;
             Relocate(info->positionX,info->positionY,info->positionZ,0.0f);
             sLog.outError("ERROR: Player (guidlow %d) have invalid coordinates (X: %f Y: %f Z: %f O: %f). Teleport to default race/class locations.",guid,GetPositionX(),GetPositionY(),GetPositionZ(),GetOrientation());
-            map = MapManager::Instance().CreateMap(mapId, this, 0);
+            map = sMapMgr.CreateMap(mapId, this, 0);
             if (!map)
             {
                 sLog.outError("ERROR: Player (guidlow %d) has invalid default map coordinates (X: %f Y: %f Z: %f O: %f). or instance couldn't be created",guid,GetPositionX(),GetPositionY(),GetPositionZ(),GetOrientation());
@@ -16532,7 +16532,7 @@ void Player::_LoadGlyphAuras()
 void Player::LoadCorpse()
 {
     if (isAlive())
-        ObjectAccessor::Instance().ConvertCorpseForPlayer(GetGUID());
+        sObjectAccessor.ConvertCorpseForPlayer(GetGUID());
     else
     {
         if (Corpse *corpse = GetCorpse())
@@ -17446,7 +17446,7 @@ bool Player::CheckInstanceLoginValid()
     }
 
     // do checks for satisfy accessreqs, instance full, encounter in progress (raid), perm bind group != perm bind player
-    return MapManager::Instance().CanPlayerEnter(GetMap()->GetId(), this, true);
+    return sMapMgr.CanPlayerEnter(GetMap()->GetId(), this, true);
 }
 
 bool Player::_LoadHomeBind(QueryResult_AutoPtr result)
@@ -18285,7 +18285,7 @@ void Player::ResetInstances(uint8 method, bool isRaid)
         }
 
         // if the map is loaded, reset it
-        Map *map = MapManager::Instance().FindMap(p->GetMapId(), p->GetInstanceId());
+        Map *map = sMapMgr.FindMap(p->GetMapId(), p->GetInstanceId());
         if (map && map->IsDungeon())
             if (!((InstanceMap*)map)->Reset(method))
             {
diff --git a/src/server/game/Entities/Player/SocialMgr.cpp b/src/server/game/Entities/Player/SocialMgr.cpp
index a64692895a3..0de95352d19 100644
--- a/src/server/game/Entities/Player/SocialMgr.cpp
+++ b/src/server/game/Entities/Player/SocialMgr.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "SocialMgr.h"
-#include "SingletonImp.h"
+
 #include "DatabaseEnv.h"
 #include "Opcodes.h"
 #include "WorldPacket.h"
@@ -28,8 +28,6 @@
 #include "World.h"
 #include "Util.h"
 
-INSTANTIATE_SINGLETON_1(SocialMgr);
-
 PlayerSocial::PlayerSocial()
 {
     m_playerGUID = 0;
diff --git a/src/server/game/Entities/Player/SocialMgr.h b/src/server/game/Entities/Player/SocialMgr.h
index 092ab09dc15..dbed6e93006 100644
--- a/src/server/game/Entities/Player/SocialMgr.h
+++ b/src/server/game/Entities/Player/SocialMgr.h
@@ -21,7 +21,7 @@
 #ifndef __TRINITY_SOCIALMGR_H
 #define __TRINITY_SOCIALMGR_H
 
-#include "Singleton.h"
+#include "ace/Singleton.h"
 #include "DatabaseEnv.h"
 #include "Common.h"
 
@@ -139,8 +139,9 @@ class PlayerSocial
 
 class SocialMgr
 {
+    friend class ACE_Singleton;
+    SocialMgr();
     public:
-        SocialMgr();
         ~SocialMgr();
         // Misc
         void RemovePlayerSocial(uint32 guid) { m_socialMap.erase(guid); }
@@ -156,6 +157,6 @@ class SocialMgr
         SocialMap m_socialMap;
 };
 
-#define sSocialMgr Trinity::Singleton::Instance()
+#define sSocialMgr (*ACE_Singleton::instance())
 #endif
 
diff --git a/src/server/game/Entities/Transport/Transport.cpp b/src/server/game/Entities/Transport/Transport.cpp
index e1577237125..2a82b5c33df 100644
--- a/src/server/game/Entities/Transport/Transport.cpp
+++ b/src/server/game/Entities/Transport/Transport.cpp
@@ -106,7 +106,7 @@ void MapManager::LoadTransports()
             m_TransportsByMap[*i].insert(t);
 
         //If we someday decide to use the grid to track transports, here:
-        t->SetMap(MapManager::Instance().CreateMap(mapid, t, 0));
+        t->SetMap(sMapMgr.CreateMap(mapid, t, 0));
 
         //t->GetMap()->Add((GameObject *)t);
         ++count;
@@ -455,7 +455,7 @@ void Transport::TeleportTransport(uint32 newMapid, float x, float y, float z)
     //yes, you're right
 
     ResetMap();
-    Map * newMap = MapManager::Instance().CreateMap(newMapid, this, 0);
+    Map * newMap = sMapMgr.CreateMap(newMapid, this, 0);
     SetMap(newMap);
     assert (GetMap());
 
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 0ee16010393..9d0bce23fd5 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -14062,7 +14062,7 @@ void Unit::StopMoving()
 
     // send explicit stop packet
     // rely on vmaps here because for example stormwind is in air
-    //float z = MapManager::Instance().GetBaseMap(GetMapId())->GetHeight(GetPositionX(), GetPositionY(), GetPositionZ(), true);
+    //float z = sMapMgr.GetBaseMap(GetMapId())->GetHeight(GetPositionX(), GetPositionY(), GetPositionZ(), true);
     //if (fabs(GetPositionZ() - z) < 2.0f)
     //    Relocate(GetPositionX(), GetPositionY(), z);
     //Relocate(GetPositionX(), GetPositionY(),GetPositionZ());
diff --git a/src/server/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp
index 25cd624b3c5..f22db3c8187 100644
--- a/src/server/game/Events/GameEventMgr.cpp
+++ b/src/server/game/Events/GameEventMgr.cpp
@@ -27,13 +27,10 @@
 #include "Language.h"
 #include "Log.h"
 #include "MapManager.h"
-#include "SingletonImp.h"
 #include "GossipDef.h"
 #include "Player.h"
 #include "BattleGroundMgr.h"
 
-INSTANTIATE_SINGLETON_1(GameEventMgr);
-
 bool GameEventMgr::CheckOneGameEvent(uint16 entry) const
 {
     switch(mGameEvent[entry].state)
@@ -1270,7 +1267,7 @@ void GameEventMgr::GameEventSpawn(int16 event_id)
             objmgr.AddCreatureToGrid(*itr, data);
 
             // Spawn if necessary (loaded grids only)
-            Map* map = const_cast(MapManager::Instance().CreateBaseMap(data->mapid));
+            Map* map = const_cast(sMapMgr.CreateBaseMap(data->mapid));
             // We use spawn coords to spawn
             if (!map->Instanceable() && map->IsLoaded(data->posX, data->posY))
             {
@@ -1298,7 +1295,7 @@ void GameEventMgr::GameEventSpawn(int16 event_id)
             objmgr.AddGameobjectToGrid(*itr, data);
             // Spawn if necessary (loaded grids only)
             // this base map checked as non-instanced and then only existed
-            Map* map = const_cast(MapManager::Instance().CreateBaseMap(data->mapid));
+            Map* map = const_cast(sMapMgr.CreateBaseMap(data->mapid));
             // We use current coords to unspawn, not spawn coords since creature can have changed grid
             if (!map->Instanceable() && map->IsLoaded(data->posX, data->posY))
             {
@@ -1345,7 +1342,7 @@ void GameEventMgr::GameEventUnspawn(int16 event_id)
         {
             objmgr.RemoveCreatureFromGrid(*itr, data);
 
-            if (Creature* pCreature = ObjectAccessor::Instance().GetObjectInWorld(MAKE_NEW_GUID(*itr, data->id, HIGHGUID_UNIT), (Creature*)NULL))
+            if (Creature* pCreature = sObjectAccessor.GetObjectInWorld(MAKE_NEW_GUID(*itr, data->id, HIGHGUID_UNIT), (Creature*)NULL))
                 pCreature->AddObjectToRemoveList();
         }
     }
@@ -1366,7 +1363,7 @@ void GameEventMgr::GameEventUnspawn(int16 event_id)
         {
             objmgr.RemoveGameobjectFromGrid(*itr, data);
 
-            if (GameObject* pGameobject = ObjectAccessor::Instance().GetObjectInWorld(MAKE_NEW_GUID(*itr, data->id, HIGHGUID_GAMEOBJECT), (GameObject*)NULL))
+            if (GameObject* pGameobject = sObjectAccessor.GetObjectInWorld(MAKE_NEW_GUID(*itr, data->id, HIGHGUID_GAMEOBJECT), (GameObject*)NULL))
                 pGameobject->AddObjectToRemoveList();
         }
     }
@@ -1392,7 +1389,7 @@ void GameEventMgr::ChangeEquipOrModel(int16 event_id, bool activate)
             continue;
 
         // Update if spawned
-        Creature* pCreature = ObjectAccessor::Instance().GetObjectInWorld(MAKE_NEW_GUID(itr->first, data->id,HIGHGUID_UNIT), (Creature*)NULL);
+        Creature* pCreature = sObjectAccessor.GetObjectInWorld(MAKE_NEW_GUID(itr->first, data->id,HIGHGUID_UNIT), (Creature*)NULL);
         if (pCreature)
         {
             if (activate)
diff --git a/src/server/game/Events/GameEventMgr.h b/src/server/game/Events/GameEventMgr.h
index 21178805859..656be331edc 100644
--- a/src/server/game/Events/GameEventMgr.h
+++ b/src/server/game/Events/GameEventMgr.h
@@ -24,7 +24,7 @@
 #include "Common.h"
 #include "SharedDefines.h"
 #include "Define.h"
-#include "Singleton.h"
+#include "ace/Singleton.h"
 
 #define max_ge_check_delay DAY  // 1 day in seconds
 
@@ -92,9 +92,11 @@ class Creature;
 
 class GameEventMgr
 {
+    friend class ACE_Singleton;
+    GameEventMgr();
     public:
-        GameEventMgr();
         ~GameEventMgr() {};
+
         typedef std::set ActiveEvents;
         typedef std::vector GameEventDataMap;
         ActiveEvents const& GetActiveEventList() const { return m_ActiveEvents; }
@@ -172,7 +174,7 @@ class GameEventMgr
         GameEventGuidMap  mGameEventGameobjectGuids;
 };
 
-#define gameeventmgr Trinity::Singleton::Instance()
+#define gameeventmgr (*ACE_Singleton::instance())
 
  bool IsHolidayActive(HolidayIds id);
  bool IsEventActive(uint16 event_id);
diff --git a/src/server/game/Globals/GlobalEvents.cpp b/src/server/game/Globals/GlobalEvents.cpp
index acdd91248bc..e83441cf3bb 100644
--- a/src/server/game/Globals/GlobalEvents.cpp
+++ b/src/server/game/Globals/GlobalEvents.cpp
@@ -53,7 +53,7 @@ static void CorpsesEraseCallBack(QueryResult_AutoPtr result, bool bones)
         /// Resurrectable - convert corpses to bones
         if (!bones)
         {
-            if (!ObjectAccessor::Instance().ConvertCorpseForPlayer(player_guid))
+            if (!sObjectAccessor.ConvertCorpseForPlayer(player_guid))
             {
                 sLog.outDebug("Corpse %u not found in world or bones creating forbidden. Delete from DB.",guidlow);
                 CharacterDatabase.PExecute("DELETE FROM corpse WHERE guid = '%u'",guidlow);
@@ -62,7 +62,7 @@ static void CorpsesEraseCallBack(QueryResult_AutoPtr result, bool bones)
         else
             ///- or delete bones
         {
-            MapManager::Instance().RemoveBonesFromMap(mapid, guid, positionX, positionY);
+            sMapMgr.RemoveBonesFromMap(mapid, guid, positionX, positionY);
 
             ///- remove bones from the database
             CharacterDatabase.PExecute("DELETE FROM corpse WHERE guid = '%u'",guidlow);
diff --git a/src/server/game/Globals/ObjectAccessor.cpp b/src/server/game/Globals/ObjectAccessor.cpp
index 73aca9865f8..b82944d8327 100644
--- a/src/server/game/Globals/ObjectAccessor.cpp
+++ b/src/server/game/Globals/ObjectAccessor.cpp
@@ -20,7 +20,7 @@
 
 #include "ObjectAccessor.h"
 #include "ObjectMgr.h"
-#include "SingletonImp.h"
+
 #include "Player.h"
 #include "Creature.h"
 #include "GameObject.h"
@@ -41,10 +41,6 @@
 
 #include 
 
-#define CLASS_LOCK Trinity::ClassLevelLockable
-INSTANTIATE_SINGLETON_2(ObjectAccessor, CLASS_LOCK);
-INSTANTIATE_CLASS_MUTEX(ObjectAccessor, ACE_Thread_Mutex);
-
 ObjectAccessor::ObjectAccessor()
 {
 }
@@ -151,7 +147,7 @@ Player* ObjectAccessor::FindPlayer(uint64 guid)
 
 Player* ObjectAccessor::FindPlayerByName(const char* name)
 {
-    Guard guard(*HashMapHolder::GetLock());
+    ACE_GUARD_RETURN(LockType, g, *HashMapHolder::GetLock(), NULL);
     HashMapHolder::MapType& m = HashMapHolder::GetContainer();
     for (HashMapHolder::MapType::iterator iter = m.begin(); iter != m.end(); ++iter)
         if (iter->second->IsInWorld() && strcmp(name, iter->second->GetName()) == 0)
@@ -162,7 +158,7 @@ Player* ObjectAccessor::FindPlayerByName(const char* name)
 
 void ObjectAccessor::SaveAllPlayers()
 {
-    Guard guard(*HashMapHolder::GetLock());
+    ACE_GUARD(LockType, g, *HashMapHolder::GetLock());
     HashMapHolder::MapType& m = HashMapHolder::GetContainer();
     for (HashMapHolder::MapType::iterator itr = m.begin(); itr != m.end(); ++itr)
         itr->second->SaveToDB();
@@ -175,7 +171,7 @@ Pet* ObjectAccessor::GetPet(uint64 guid)
 
 Corpse* ObjectAccessor::GetCorpseForPlayerGUID(uint64 guid)
 {
-    Guard guard(i_corpseGuard);
+    ACE_GUARD_RETURN(LockType, guard, i_corpseGuard, NULL);
 
     Player2CorpsesMapType::iterator iter = i_player2corpse.find(guid);
     if (iter == i_player2corpse.end())
@@ -197,7 +193,7 @@ void ObjectAccessor::RemoveCorpse(Corpse* corpse)
 
     // Critical section
     {
-        Guard guard(i_corpseGuard);
+        ACE_GUARD(LockType, g, i_corpseGuard);
 
         Player2CorpsesMapType::iterator iter = i_player2corpse.find(corpse->GetOwnerGUID());
         if (iter == i_player2corpse.end()) // TODO: Fix this
@@ -219,7 +215,7 @@ void ObjectAccessor::AddCorpse(Corpse* corpse)
 
     // Critical section
     {
-        Guard guard(i_corpseGuard);
+        ACE_GUARD(LockType, g, i_corpseGuard);
 
         assert(i_player2corpse.find(corpse->GetOwnerGUID()) == i_player2corpse.end());
         i_player2corpse[corpse->GetOwnerGUID()] = corpse;
@@ -234,7 +230,7 @@ void ObjectAccessor::AddCorpse(Corpse* corpse)
 
 void ObjectAccessor::AddCorpsesToGrid(GridPair const& gridpair, GridType& grid, Map* map)
 {
-    Guard guard(i_corpseGuard);
+    ACE_GUARD(LockType, g, i_corpseGuard);
 
     for (Player2CorpsesMapType::iterator iter = i_player2corpse.begin(); iter != i_player2corpse.end(); ++iter)
     {
@@ -274,7 +270,7 @@ Corpse* ObjectAccessor::ConvertCorpseForPlayer(uint64 player_guid, bool /*insign
     // done in removecorpse
     // remove resurrectable corpse from grid object registry (loaded state checked into call)
     // do not load the map if it's not loaded
-    //Map *map = MapManager::Instance().FindMap(corpse->GetMapId(), corpse->GetInstanceId());
+    //Map *map = sMapMgr.FindMap(corpse->GetMapId(), corpse->GetInstanceId());
     //if (map)
     //    map->Remove(corpse, false);
 
@@ -333,7 +329,7 @@ void ObjectAccessor::Update(uint32 /*diff*/)
 
     // Critical section
     {
-        Guard guard(i_updateGuard);
+        ACE_GUARD(LockType, g, i_updateGuard);
 
         while (!i_objects.empty())
         {
diff --git a/src/server/game/Globals/ObjectAccessor.h b/src/server/game/Globals/ObjectAccessor.h
index e3295428505..fc128d6a4e0 100644
--- a/src/server/game/Globals/ObjectAccessor.h
+++ b/src/server/game/Globals/ObjectAccessor.h
@@ -22,10 +22,9 @@
 #define TRINITY_OBJECTACCESSOR_H
 
 #include "Define.h"
-#include "Singleton.h"
+#include 
 #include 
 #include "UnorderedMap.h"
-#include "ThreadingModel.h"
 
 #include "UpdateData.h"
 
@@ -50,23 +49,22 @@ class HashMapHolder
 
         typedef UNORDERED_MAP MapType;
         typedef ACE_Thread_Mutex LockType;
-        typedef Trinity::GeneralLock Guard;
 
         static void Insert(T* o)
         {
-            Guard guard(i_lock);
+            ACE_GUARD(LockType, Guard, i_lock);
             m_objectMap[o->GetGUID()] = o;
         }
 
         static void Remove(T* o)
         {
-            Guard guard(i_lock);
+            ACE_GUARD(LockType, Guard, i_lock);
             m_objectMap.erase(o->GetGUID());
         }
 
         static T* Find(uint64 guid)
         {
-            Guard guard(i_lock);
+            ACE_GUARD_RETURN(LockType, Guard, i_lock, NULL);
             typename MapType::iterator itr = m_objectMap.find(guid);
             return (itr != m_objectMap.end()) ? itr->second : NULL;
         }
@@ -84,9 +82,9 @@ class HashMapHolder
         static MapType  m_objectMap;
 };
 
-class ObjectAccessor : public Trinity::Singleton >
+class ObjectAccessor
 {
-    friend class Trinity::OperatorNew;
+    friend class ACE_Singleton;
     ObjectAccessor();
     ~ObjectAccessor();
     ObjectAccessor(const ObjectAccessor&);
@@ -220,13 +218,13 @@ class ObjectAccessor : public Trinity::Singleton Guard;
 
     private:
 
@@ -254,4 +251,6 @@ class ObjectAccessor : public Trinity::Singleton::instance())
 #endif
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index bab1add0132..00fbc83244c 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -22,8 +22,6 @@
 #include "DatabaseEnv.h"
 #include "SQLStorage.h"
 #include "SQLStorageImpl.h"
-#include "SingletonImp.h"
-
 #include "Log.h"
 #include "MapManager.h"
 #include "ObjectMgr.h"
@@ -48,8 +46,6 @@
 #include "Vehicle.h"
 #include "AchievementMgr.h"
 
-INSTANTIATE_SINGLETON_1(ObjectMgr);
-
 ScriptMapMap sQuestEndScripts;
 ScriptMapMap sQuestStartScripts;
 ScriptMapMap sSpellScripts;
@@ -1412,7 +1408,7 @@ uint32 ObjectMgr::AddGOData(uint32 entry, uint32 mapId, float x, float y, float
     if (!goinfo)
         return 0;
 
-    Map* map = const_cast(MapManager::Instance().CreateBaseMap(mapId));
+    Map* map = const_cast(sMapMgr.CreateBaseMap(mapId));
     if (!map)
         return 0;
 
@@ -1473,7 +1469,7 @@ bool ObjectMgr::MoveCreData(uint32 guid, uint32 mapId, Position pos)
     AddCreatureToGrid(guid, &data);
 
     // Spawn if necessary (loaded grids only)
-    if (Map* map = const_cast(MapManager::Instance().CreateBaseMap(mapId)))
+    if (Map* map = const_cast(sMapMgr.CreateBaseMap(mapId)))
     {
         // We use spawn coords to spawn
         if (!map->Instanceable() && map->IsLoaded(data.posX, data.posY))
@@ -1524,7 +1520,7 @@ uint32 ObjectMgr::AddCreData(uint32 entry, uint32 /*team*/, uint32 mapId, float
     AddCreatureToGrid(guid, &data);
 
     // Spawn if necessary (loaded grids only)
-    if (Map* map = const_cast(MapManager::Instance().CreateBaseMap(mapId)))
+    if (Map* map = const_cast(sMapMgr.CreateBaseMap(mapId)))
     {
         // We use spawn coords to spawn
         if (!map->Instanceable() && !map->IsRemovalGrid(x, y))
@@ -5547,7 +5543,7 @@ void ObjectMgr::LoadGraveyardZones()
 WorldSafeLocsEntry const *ObjectMgr::GetClosestGraveYard(float x, float y, float z, uint32 MapId, uint32 team)
 {
     // search for zone associated closest graveyard
-    uint32 zoneId = MapManager::Instance().GetZoneId(MapId,x,y,z);
+    uint32 zoneId = sMapMgr.GetZoneId(MapId,x,y,z);
 
     // Simulate std. algorithm:
     //   found some graveyard associated to (ghost_zone,ghost_map)
@@ -6608,7 +6604,7 @@ void ObjectMgr::LoadCorpses()
             continue;
         }
 
-        ObjectAccessor::Instance().AddCorpse(corpse);
+        sObjectAccessor.AddCorpse(corpse);
 
         ++count;
     }
diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h
index b1a5bd0e1cd..320bf12cb21 100644
--- a/src/server/game/Globals/ObjectMgr.h
+++ b/src/server/game/Globals/ObjectMgr.h
@@ -37,7 +37,7 @@
 #include "Map.h"
 #include "ObjectAccessor.h"
 #include "ObjectDefines.h"
-#include "Singleton.h"
+#include "ace/Singleton.h"
 #include "SQLStorage.h"
 #include "Vehicle.h"
 #include "ObjectMgr.h"
@@ -354,11 +354,11 @@ class PlayerDumpReader;
 class ObjectMgr
 {
     friend class PlayerDumpReader;
-
+    friend class ACE_Singleton;
+    ObjectMgr();
+    ~ObjectMgr();
+    
     public:
-        ObjectMgr();
-        ~ObjectMgr();
-
         typedef UNORDERED_MAP ItemMap;
 
         typedef std::set< Group * > GroupSet;
@@ -382,7 +382,7 @@ class ObjectMgr
 
         typedef std::vector ScriptNameMap;
 
-        Player* GetPlayer(const char* name) const { return ObjectAccessor::Instance().FindPlayerByName(name);}
+        Player* GetPlayer(const char* name) const { return sObjectAccessor.FindPlayerByName(name);}
         Player* GetPlayer(uint64 guid) const { return ObjectAccessor::FindPlayer(guid); }
 
         static GameObjectInfo const *GetGameObjectInfo(uint32 id) { return sGOStorage.LookupEntry(id); }
@@ -1083,7 +1083,7 @@ class ObjectMgr
 
 };
 
-#define objmgr Trinity::Singleton::Instance()
+#define objmgr (*ACE_Singleton::instance())
 
 // scripting access functions
  bool LoadTrinityStrings(DatabaseType& db, char const* table,int32 start_value = MAX_CREATURE_AI_TEXT_STRING_ID, int32 end_value = std::numeric_limits::min());
diff --git a/src/server/game/Grids/Grid.h b/src/server/game/Grids/Grid.h
index fd2cc28c184..2e300ac5e38 100644
--- a/src/server/game/Grids/Grid.h
+++ b/src/server/game/Grids/Grid.h
@@ -33,7 +33,6 @@
 */
 
 #include "Define.h"
-#include "ThreadingModel.h"
 #include "TypeContainer.h"
 #include "TypeContainerVisitor.h"
 
@@ -44,8 +43,7 @@ template
 <
 class ACTIVE_OBJECT,
 class WORLD_OBJECT_TYPES,
-class GRID_OBJECT_TYPES,
-class ThreadModel = Trinity::SingleThreaded
+class GRID_OBJECT_TYPES
 >
 class Grid
 {
@@ -131,9 +129,6 @@ class Grid
         }*/
     private:
 
-        typedef typename ThreadModel::Lock Guard;
-        typedef typename ThreadModel::VolatileType VolatileType;
-
         TypeMapContainer i_container;
         TypeMapContainer i_objects;
         //typedef std::set ActiveGridObjects;
diff --git a/src/server/game/Grids/NGrid.h b/src/server/game/Grids/NGrid.h
index 8c539519211..1411ac71c4a 100644
--- a/src/server/game/Grids/NGrid.h
+++ b/src/server/game/Grids/NGrid.h
@@ -74,14 +74,13 @@ template
 unsigned int N,
 class ACTIVE_OBJECT,
 class WORLD_OBJECT_TYPES,
-class GRID_OBJECT_TYPES,
-class ThreadModel = Trinity::SingleThreaded
+class GRID_OBJECT_TYPES
 >
 class NGrid
 {
     public:
 
-        typedef Grid GridType;
+        typedef Grid GridType;
         NGrid(uint32 id, int32 x, int32 y, time_t expiry, bool unload = true)
             : i_gridId(id), i_x(x), i_y(y), i_cellstate(GRID_STATE_INVALID), i_GridObjectDataLoaded(false)
         {
@@ -109,7 +108,7 @@ class NGrid
         int32 getX() const { return i_x; }
         int32 getY() const { return i_y; }
 
-        void link(GridRefManager >* pTo)
+        void link(GridRefManager >* pTo)
         {
             i_Reference.link(pTo, this);
         }
@@ -178,7 +177,7 @@ class NGrid
 
         uint32 i_gridId;
         GridInfo i_GridInfo;
-        GridReference > i_Reference;
+        GridReference > i_Reference;
         int32 i_x;
         int32 i_y;
         grid_state_t i_cellstate;
diff --git a/src/server/game/Grids/ObjectGridLoader.cpp b/src/server/game/Grids/ObjectGridLoader.cpp
index ab69d9a966b..f0da10975ac 100644
--- a/src/server/game/Grids/ObjectGridLoader.cpp
+++ b/src/server/game/Grids/ObjectGridLoader.cpp
@@ -151,7 +151,7 @@ void LoadHelper(CellCorpseSet const& cell_corpses, CellPair &cell, CorpseMapType
 
         uint32 player_guid = itr->first;
 
-        Corpse *obj = ObjectAccessor::Instance().GetCorpseForPlayerGUID(player_guid);
+        Corpse *obj = sObjectAccessor.GetCorpseForPlayerGUID(player_guid);
         if (!obj)
             continue;
 
diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp
index 53fa9a3ecdb..2977515959b 100644
--- a/src/server/game/Groups/Group.cpp
+++ b/src/server/game/Groups/Group.cpp
@@ -1724,7 +1724,7 @@ void Group::ResetInstances(uint8 method, bool isRaid, Player* SendMsgTo)
 
         bool isEmpty = true;
         // if the map is loaded, reset it
-        Map *map = MapManager::Instance().FindMap(p->GetMapId(), p->GetInstanceId());
+        Map *map = sMapMgr.FindMap(p->GetMapId(), p->GetInstanceId());
         if (map && map->IsDungeon() && !(method == INSTANCE_RESET_GROUP_DISBAND && !p->CanReset()))
         {
             if (p->CanReset())
diff --git a/src/server/game/Instances/InstanceSaveMgr.cpp b/src/server/game/Instances/InstanceSaveMgr.cpp
index c62038cfbf0..7b5ccf1c46a 100644
--- a/src/server/game/Instances/InstanceSaveMgr.cpp
+++ b/src/server/game/Instances/InstanceSaveMgr.cpp
@@ -21,7 +21,6 @@
 
 #include "Common.h"
 #include "SQLStorage.h"
-
 #include "Player.h"
 #include "GridNotifiers.h"
 #include "Log.h"
@@ -40,14 +39,7 @@
 #include "Group.h"
 #include "InstanceData.h"
 #include "ProgressBar.h"
-#include "Singleton.h"
-#include "SingletonImp.h"
-
-INSTANTIATE_SINGLETON_1(InstanceSaveManager);
 
-InstanceSaveManager::InstanceSaveManager() : lock_instLists(false)
-{
-}
 
 InstanceSaveManager::~InstanceSaveManager()
 {
@@ -173,7 +165,7 @@ void InstanceSave::SaveToDB()
     // save instance data too
     std::string data;
 
-    Map *map = MapManager::Instance().FindMap(GetMapId(),m_instanceid);
+    Map *map = sMapMgr.FindMap(GetMapId(),m_instanceid);
     if (map)
     {
         assert(map->IsDungeon());
@@ -615,7 +607,7 @@ void InstanceSaveManager::_ResetSave(InstanceSaveHashMap::iterator &itr)
 void InstanceSaveManager::_ResetInstance(uint32 mapid, uint32 instanceId)
 {
     sLog.outDebug("InstanceSaveMgr::_ResetInstance %u, %u", mapid, instanceId);
-    Map *map = (MapInstanced*)MapManager::Instance().CreateBaseMap(mapid);
+    Map *map = (MapInstanced*)sMapMgr.CreateBaseMap(mapid);
     if (!map->Instanceable())
         return;
 
@@ -679,7 +671,7 @@ void InstanceSaveManager::_ResetOrWarnAll(uint32 mapid, Difficulty difficulty, b
     }
 
     // note: this isn't fast but it's meant to be executed very rarely
-    Map const *map = MapManager::Instance().CreateBaseMap(mapid);          // _not_ include difficulty
+    Map const *map = sMapMgr.CreateBaseMap(mapid);          // _not_ include difficulty
     MapInstanced::InstancedMaps &instMaps = ((MapInstanced*)map)->GetInstancedMaps();
     MapInstanced::InstancedMaps::iterator mitr;
     for (mitr = instMaps.begin(); mitr != instMaps.end(); ++mitr)
diff --git a/src/server/game/Instances/InstanceSaveMgr.h b/src/server/game/Instances/InstanceSaveMgr.h
index 3d8bfb70ebf..66751cc4f10 100644
--- a/src/server/game/Instances/InstanceSaveMgr.h
+++ b/src/server/game/Instances/InstanceSaveMgr.h
@@ -23,7 +23,7 @@
 #define __InstanceSaveMgr_H
 
 #include "Define.h"
-#include "Singleton.h"
+#include "ace/Singleton.h"
 #include "ace/Thread_Mutex.h"
 #include 
 #include 
@@ -117,13 +117,14 @@ class InstanceSave
 
 typedef UNORDERED_MAP ResetTimeByMapDifficultyMap;
 
-class InstanceSaveManager : public Trinity::Singleton >
+class InstanceSaveManager
 {
+    friend class ACE_Singleton;
     friend class InstanceSave;
     public:
-        InstanceSaveManager();
+        InstanceSaveManager() : lock_instLists(false) {};        
         ~InstanceSaveManager();
-
+        
         typedef UNORDERED_MAP InstanceSaveHashMap;
         typedef UNORDERED_MAP InstanceSaveMapMap;
 
@@ -176,6 +177,7 @@ class InstanceSaveManager : public Trinity::Singleton::Instance()
+#define sInstanceSaveManager (*ACE_Singleton::instance())
 #endif
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp
index a0656bee38c..960e1e4cef4 100644
--- a/src/server/game/Maps/Map.cpp
+++ b/src/server/game/Maps/Map.cpp
@@ -325,7 +325,7 @@ void Map::DeleteFromWorld(T* obj)
 template<>
 void Map::DeleteFromWorld(Player* pl)
 {
-    ObjectAccessor::Instance().RemoveObject(pl);
+    sObjectAccessor.RemoveObject(pl);
     delete pl;
 }
 
@@ -334,7 +334,7 @@ Map::EnsureGridCreated(const GridPair &p)
 {
     if (!getNGrid(p.x_coord, p.y_coord))
     {
-        Guard guard(*this);
+        ACE_GUARD(ACE_Thread_Mutex, Guard, Lock);
         if (!getNGrid(p.x_coord, p.y_coord))
         {
             sLog.outDebug("Creating grid[%u,%u] for map %u instance %u", p.x_coord, p.y_coord, GetId(), i_InstanceId);
@@ -395,7 +395,7 @@ bool Map::EnsureGridLoaded(const Cell &cell)
         loader.LoadN();
 
         // Add resurrectable corpses to world object list in grid
-        ObjectAccessor::Instance().AddCorpsesToGrid(GridPair(cell.GridX(),cell.GridY()),(*grid)(cell.CellX(), cell.CellY()), this);
+        sObjectAccessor.AddCorpsesToGrid(GridPair(cell.GridX(),cell.GridY()),(*grid)(cell.CellX(), cell.CellY()), this);
 
         setGridObjectDataLoaded(true,cell.GridX(), cell.GridY());
         return true;
@@ -828,7 +828,7 @@ bool Map::RemoveBones(uint64 guid, float x, float y)
 {
     if (IsRemovalGrid(x, y))
     {
-        Corpse * corpse = ObjectAccessor::Instance().GetObjectInWorld(GetId(), x, y, guid, (Corpse*)NULL);
+        Corpse * corpse = sObjectAccessor.GetObjectInWorld(GetId(), x, y, guid, (Corpse*)NULL);
         if (corpse && corpse->GetTypeId() == TYPEID_CORPSE && corpse->GetType() == CORPSE_BONES)
             corpse->DeleteBonesFromWorld();
         else
@@ -2069,7 +2069,7 @@ void Map::SendInitSelf(Player * player)
 void Map::SendInitTransports(Player * player)
 {
     // Hack to send out transports
-    MapManager::TransportMap& tmap = MapManager::Instance().m_TransportsByMap;
+    MapManager::TransportMap& tmap = sMapMgr.m_TransportsByMap;
 
     // no transports at map
     if (tmap.find(player->GetMapId()) == tmap.end())
@@ -2096,7 +2096,7 @@ void Map::SendInitTransports(Player * player)
 void Map::SendRemoveTransports(Player * player)
 {
     // Hack to send out transports
-    MapManager::TransportMap& tmap = MapManager::Instance().m_TransportsByMap;
+    MapManager::TransportMap& tmap = sMapMgr.m_TransportsByMap;
 
     // no transports at map
     if (tmap.find(player->GetMapId()) == tmap.end())
@@ -2196,7 +2196,7 @@ void Map::RemoveAllObjectsInRemoveList()
         {
             case TYPEID_CORPSE:
             {
-                Corpse* corpse = ObjectAccessor::Instance().GetCorpse(*obj, obj->GetGUID());
+                Corpse* corpse = sObjectAccessor.GetCorpse(*obj, obj->GetGUID());
                 if (!corpse)
                     sLog.outError("Tried to delete corpse/bones %u that is not in map.", obj->GetGUIDLow());
                 else
@@ -2408,7 +2408,7 @@ bool InstanceMap::Add(Player *player)
     // Is it needed?
 
     {
-        Guard guard(*this);
+        ACE_GUARD_RETURN(ACE_Thread_Mutex, guard, Lock, false);
         // Check moved to void WorldSession::HandleMoveWorldportAckOpcode()
         //if (!CanEnter(player))
             //return false;
@@ -2733,7 +2733,7 @@ bool BattleGroundMap::CanEnter(Player * player)
 bool BattleGroundMap::Add(Player * player)
 {
     {
-        Guard guard(*this);
+        ACE_GUARD_RETURN(ACE_Thread_Mutex, guard, Lock, false);
         //Check moved to void WorldSession::HandleMoveWorldportAckOpcode()
         //if (!CanEnter(player))
             //return false;
@@ -2877,7 +2877,7 @@ void Map::ScriptsProcess()
                     source = HashMapHolder::Find(step.sourceGUID);
                     break;
                 case HIGHGUID_MO_TRANSPORT:
-                    for (MapManager::TransportSet::iterator iter = MapManager::Instance().m_Transports.begin(); iter != MapManager::Instance().m_Transports.end(); ++iter)
+                    for (MapManager::TransportSet::iterator iter = sMapMgr.m_Transports.begin(); iter != sMapMgr.m_Transports.end(); ++iter)
                     {
                         if ((*iter)->GetGUID() == step.sourceGUID)
                         {
diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h
index d17dc10ec07..4d25381fbe1 100644
--- a/src/server/game/Maps/Map.h
+++ b/src/server/game/Maps/Map.h
@@ -22,7 +22,6 @@
 #define TRINITY_MAP_H
 
 #include "Define.h"
-#include "ThreadingModel.h"
 #include "ace/RW_Thread_Mutex.h"
 #include "ace/Thread_Mutex.h"
 
@@ -239,7 +238,7 @@ typedef UNORDERED_MAP CreatureMoveList;
 
 typedef std::map        CreatureGroupHolderType;
 
-class Map : public GridRefManager, public Trinity::ObjectLevelLockable
+class Map : public GridRefManager
 {
     friend class MapReference;
     public:
@@ -490,7 +489,7 @@ class Map : public GridRefManager, public Trinity::ObjectLevelLockabl
     protected:
         void SetUnloadReferenceLock(const GridPair &p, bool on) { getNGrid(p.x_coord, p.y_coord)->setUnloadReferenceLock(on); }
 
-        typedef Trinity::ObjectLevelLockable::Lock Guard;
+        ACE_Thread_Mutex Lock;
 
         MapEntry const* i_mapEntry;
         uint8 i_spawnMode;
diff --git a/src/server/game/Maps/MapInstanced.cpp b/src/server/game/Maps/MapInstanced.cpp
index 0736bfa6fb3..008baeb79d9 100644
--- a/src/server/game/Maps/MapInstanced.cpp
+++ b/src/server/game/Maps/MapInstanced.cpp
@@ -170,7 +170,7 @@ Map* MapInstanced::CreateInstance(const uint32 mapId, Player * player)
         {
             // if no instanceId via group members or instance saves is found
             // the instance will be created for the first time
-            NewInstanceId = MapManager::Instance().GenerateInstanceId();
+            NewInstanceId = sMapMgr.GenerateInstanceId();
 
             Difficulty diff = player->GetGroup() ? player->GetGroup()->GetDifficulty(IsRaid()) : player->GetDifficulty(IsRaid());
             map = CreateInstance(NewInstanceId, NULL, diff);
@@ -183,7 +183,7 @@ Map* MapInstanced::CreateInstance(const uint32 mapId, Player * player)
 InstanceMap* MapInstanced::CreateInstance(uint32 InstanceId, InstanceSave *save, Difficulty difficulty)
 {
     // load/create a map
-    Guard guard(*this);
+    ACE_GUARD_RETURN(ACE_Thread_Mutex, Guard, Lock, NULL);
 
     // make sure we have a valid map id
     const MapEntry* entry = sMapStore.LookupEntry(GetId());
@@ -219,7 +219,7 @@ InstanceMap* MapInstanced::CreateInstance(uint32 InstanceId, InstanceSave *save,
 BattleGroundMap* MapInstanced::CreateBattleGround(uint32 InstanceId, BattleGround* bg)
 {
     // load/create a map
-    Guard guard(*this);
+    ACE_GUARD_RETURN(ACE_Thread_Mutex, Guard, Lock, NULL);
 
     sLog.outDebug("MapInstanced::CreateBattleGround: map bg %d for %d created.", InstanceId, GetId());
 
diff --git a/src/server/game/Maps/MapManager.cpp b/src/server/game/Maps/MapManager.cpp
index 42233db4a9a..46b604388c5 100644
--- a/src/server/game/Maps/MapManager.cpp
+++ b/src/server/game/Maps/MapManager.cpp
@@ -20,7 +20,6 @@
 
 #include "MapManager.h"
 #include "InstanceSaveMgr.h"
-#include "SingletonImp.h"
 #include "DatabaseEnv.h"
 #include "Log.h"
 #include "ObjectAccessor.h"
@@ -37,10 +36,6 @@
 #include "Language.h"
 #include "WorldPacket.h"
 
-#define CLASS_LOCK Trinity::ClassLevelLockable
-INSTANTIATE_SINGLETON_2(MapManager, CLASS_LOCK);
-INSTANTIATE_CLASS_MUTEX(MapManager, ACE_Thread_Mutex);
-
 extern GridState* si_GridStates[];                          // debugging code, should be deleted some day
 
 MapManager::MapManager()
@@ -116,7 +111,7 @@ Map* MapManager::_createBaseMap(uint32 id)
 
     if (m == NULL)
     {
-        Guard guard(*this);
+        ACE_GUARD_RETURN(ACE_Thread_Mutex, Guard, Lock, NULL);
 
         const MapEntry* entry = sMapStore.LookupEntry(id);
         if (entry && entry->Instanceable())
@@ -236,7 +231,7 @@ bool MapManager::CanPlayerEnter(uint32 mapid, Player* player, bool loginCheck)
         InstanceGroupBind* boundedInstance = pGroup->GetBoundInstance(player);
         if (boundedInstance && boundedInstance->save)
         {
-            if (Map *boundedMap = MapManager::Instance().FindMap(mapid,boundedInstance->save->GetInstanceId()))
+            if (Map *boundedMap = sMapMgr.FindMap(mapid,boundedInstance->save->GetInstanceId()))
             {
                 // Player permanently bounded to different instance than groups one
                 InstancePlayerBind* playerBoundedInstance = player->GetBoundInstance(mapid, player->GetDungeonDifficulty());
@@ -307,7 +302,7 @@ void MapManager::Update(uint32 diff)
     for (iter = i_maps.begin(); iter != i_maps.end(); ++iter)
         iter->second->DelayedUpdate(i_timer.GetCurrent());
 
-    ObjectAccessor::Instance().Update(i_timer.GetCurrent());
+    sObjectAccessor.Update(i_timer.GetCurrent());
     for (TransportSet::iterator iter = m_Transports.begin(); iter != m_Transports.end(); ++iter)
         (*iter)->Update(i_timer.GetCurrent());
 
@@ -361,7 +356,7 @@ void MapManager::InitMaxInstanceId()
 
 uint32 MapManager::GetNumInstances()
 {
-    Guard guard(*this);
+    ACE_GUARD_RETURN(ACE_Thread_Mutex, Guard, Lock, NULL);
 
     uint32 ret = 0;
     for (MapMapType::iterator itr = i_maps.begin(); itr != i_maps.end(); ++itr)
@@ -378,7 +373,7 @@ uint32 MapManager::GetNumInstances()
 
 uint32 MapManager::GetNumPlayersInInstances()
 {
-    Guard guard(*this);
+    ACE_GUARD_RETURN(ACE_Thread_Mutex, Guard, Lock, NULL);
 
     uint32 ret = 0;
     for (MapMapType::iterator itr = i_maps.begin(); itr != i_maps.end(); ++itr)
diff --git a/src/server/game/Maps/MapManager.h b/src/server/game/Maps/MapManager.h
index c3380811c18..47cb9d2f795 100644
--- a/src/server/game/Maps/MapManager.h
+++ b/src/server/game/Maps/MapManager.h
@@ -22,7 +22,7 @@
 #define TRINITY_MAPMANAGER_H
 
 #include "Define.h"
-#include "Singleton.h"
+#include "ace/Singleton.h"
 #include "ace/Thread_Mutex.h"
 #include "Common.h"
 #include "Map.h"
@@ -31,10 +31,9 @@
 
 class Transport;
 
-class MapManager : public Trinity::Singleton >
+class MapManager
 {
-
-    friend class Trinity::OperatorNew;
+    friend class ACE_Singleton;
     typedef UNORDERED_MAP MapMapType;
     typedef std::pair::iterator, bool>  MapMapPair;
 
@@ -162,7 +161,7 @@ class MapManager : public Trinity::Singletonsecond);
         }
 
-        typedef Trinity::ClassLevelLockable::Lock Guard;
+        ACE_Thread_Mutex Lock;
         uint32 i_gridCleanUpDelay;
         MapMapType i_maps;
         IntervalTimer i_timer;
@@ -170,4 +169,5 @@ class MapManager : public Trinity::Singleton::instance())
 #endif
diff --git a/src/server/game/Movement/MovementGenerator.h b/src/server/game/Movement/MovementGenerator.h
index 650b4fc3196..9699f6951c2 100644
--- a/src/server/game/Movement/MovementGenerator.h
+++ b/src/server/game/Movement/MovementGenerator.h
@@ -22,7 +22,7 @@
 #define TRINITY_MOVEMENTGENERATOR_H
 
 #include "Define.h"
-#include "Singleton.h"
+#include "ace/Singleton.h"
 #include "ObjectRegistry.h"
 #include "FactoryHolder.h"
 #include "Common.h"
diff --git a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
index 4cadfe1cfb6..416b775ef7e 100644
--- a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
@@ -343,7 +343,7 @@ void FlightPathMovementGenerator::InitEndGridInfo()
 void FlightPathMovementGenerator::PreloadEndGrid()
 {
     // used to preload the final grid where the flightmaster is
-    Map *endMap = MapManager::Instance().FindMap(m_endMapId);
+    Map *endMap = sMapMgr.FindMap(m_endMapId);
 
     // Load the grid
     if (endMap)
diff --git a/src/server/game/OutdoorPvP/OutdoorPvP.cpp b/src/server/game/OutdoorPvP/OutdoorPvP.cpp
index 71659a20be7..b19dc01ccd9 100644
--- a/src/server/game/OutdoorPvP/OutdoorPvP.cpp
+++ b/src/server/game/OutdoorPvP/OutdoorPvP.cpp
@@ -165,7 +165,7 @@ bool OPvPCapturePoint::DelCreature(uint32 type)
     // explicit removal from map
     // beats me why this is needed, but with the recent removal "cleanup" some creatures stay in the map if "properly" deleted
     // so this is a big fat workaround, if AddObjectToRemoveList and DoDelayedMovesAndRemoves worked correctly, this wouldn't be needed
-    //if (Map * map = MapManager::Instance().FindMap(cr->GetMapId()))
+    //if (Map * map = sMapMgr.FindMap(cr->GetMapId()))
     //    map->Remove(cr,false);
     // delete respawn time for this creature
     WorldDatabase.PExecute("DELETE FROM creature_respawn WHERE guid = '%u'", guid);
diff --git a/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp b/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp
index f9dbedb30dc..1ec2bcb6a9c 100644
--- a/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp
+++ b/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp
@@ -25,9 +25,6 @@
 #include "OutdoorPvPEP.h"
 #include "ObjectMgr.h"
 #include "Player.h"
-#include "SingletonImp.h"
-
-INSTANTIATE_SINGLETON_1(OutdoorPvPMgr);
 
 OutdoorPvPMgr::OutdoorPvPMgr()
 {
diff --git a/src/server/game/OutdoorPvP/OutdoorPvPMgr.h b/src/server/game/OutdoorPvP/OutdoorPvPMgr.h
index a78583100ec..2a18a602da9 100644
--- a/src/server/game/OutdoorPvP/OutdoorPvPMgr.h
+++ b/src/server/game/OutdoorPvP/OutdoorPvPMgr.h
@@ -22,7 +22,7 @@
 #define OUTDOORPVP_OBJECTIVE_UPDATE_INTERVAL 1000
 
 #include "OutdoorPvP.h"
-#include "Singleton.h"
+#include "ace/Singleton.h"
 
 class Player;
 class GameObject;
@@ -79,7 +79,7 @@ private:
     uint32 m_UpdateTimer;
 };
 
-#define sOutdoorPvPMgr Trinity::Singleton::Instance()
+#define sOutdoorPvPMgr (*ACE_Singleton::instance())
 
 #endif /*OUTDOOR_PVP_MGR_H_*/
 
diff --git a/src/server/game/Pools/PoolHandler.cpp b/src/server/game/Pools/PoolHandler.cpp
index 731d71c6b19..4a7c99216bd 100644
--- a/src/server/game/Pools/PoolHandler.cpp
+++ b/src/server/game/Pools/PoolHandler.cpp
@@ -21,9 +21,6 @@
 #include "ProgressBar.h"
 #include "Log.h"
 #include "MapManager.h"
-#include "SingletonImp.h"
-
-INSTANTIATE_SINGLETON_1(PoolHandler);
 
 ////////////////////////////////////////////////////////////
 // template class SpawnedPoolData
@@ -201,7 +198,7 @@ void PoolGroup::Despawn1Object(uint32 guid)
     {
         objmgr.RemoveCreatureFromGrid(guid, data);
 
-        if (Creature* pCreature = ObjectAccessor::Instance().GetObjectInWorld(MAKE_NEW_GUID(guid, data->id, HIGHGUID_UNIT), (Creature*)NULL))
+        if (Creature* pCreature = sObjectAccessor.GetObjectInWorld(MAKE_NEW_GUID(guid, data->id, HIGHGUID_UNIT), (Creature*)NULL))
             pCreature->AddObjectToRemoveList();
     }
 }
@@ -214,7 +211,7 @@ void PoolGroup::Despawn1Object(uint32 guid)
     {
         objmgr.RemoveGameobjectFromGrid(guid, data);
 
-        if (GameObject* pGameobject = ObjectAccessor::Instance().GetObjectInWorld(MAKE_NEW_GUID(guid, data->id, HIGHGUID_GAMEOBJECT), (GameObject*)NULL))
+        if (GameObject* pGameobject = sObjectAccessor.GetObjectInWorld(MAKE_NEW_GUID(guid, data->id, HIGHGUID_GAMEOBJECT), (GameObject*)NULL))
             pGameobject->AddObjectToRemoveList();
     }
 }
@@ -297,7 +294,7 @@ void PoolGroup::Spawn1Object(PoolObject* obj)
         objmgr.AddCreatureToGrid(obj->guid, data);
 
         // Spawn if necessary (loaded grids only)
-        Map* map = const_cast(MapManager::Instance().CreateBaseMap(data->mapid));
+        Map* map = const_cast(sMapMgr.CreateBaseMap(data->mapid));
         // We use spawn coords to spawn
         if (!map->Instanceable() && map->IsLoaded(data->posX, data->posY))
         {
@@ -323,7 +320,7 @@ void PoolGroup::Spawn1Object(PoolObject* obj)
         objmgr.AddGameobjectToGrid(obj->guid, data);
         // Spawn if necessary (loaded grids only)
         // this base map checked as non-instanced and then only existed
-        Map* map = const_cast(MapManager::Instance().CreateBaseMap(data->mapid));
+        Map* map = const_cast(sMapMgr.CreateBaseMap(data->mapid));
         // We use current coords to unspawn, not spawn coords since creature can have changed grid
         if (!map->Instanceable() && map->IsLoaded(data->posX, data->posY))
         {
@@ -355,7 +352,7 @@ template <>
 void PoolGroup::ReSpawn1Object(PoolObject* obj)
 {
     if (CreatureData const* data = objmgr.GetCreatureData(obj->guid))
-        if (Creature* pCreature = ObjectAccessor::Instance().GetObjectInWorld(MAKE_NEW_GUID(obj->guid, data->id, HIGHGUID_UNIT), (Creature*)NULL))
+        if (Creature* pCreature = sObjectAccessor.GetObjectInWorld(MAKE_NEW_GUID(obj->guid, data->id, HIGHGUID_UNIT), (Creature*)NULL))
             pCreature->GetMap()->Add(pCreature);
 }
 
@@ -364,7 +361,7 @@ template <>
 void PoolGroup::ReSpawn1Object(PoolObject* obj)
 {
     if (GameObjectData const* data = objmgr.GetGOData(obj->guid))
-        if (GameObject* pGameobject = ObjectAccessor::Instance().GetObjectInWorld(MAKE_NEW_GUID(obj->guid, data->id, HIGHGUID_GAMEOBJECT), (GameObject*)NULL))
+        if (GameObject* pGameobject = sObjectAccessor.GetObjectInWorld(MAKE_NEW_GUID(obj->guid, data->id, HIGHGUID_GAMEOBJECT), (GameObject*)NULL))
             pGameobject->GetMap()->Add(pGameobject);
 }
 
diff --git a/src/server/game/Pools/PoolHandler.h b/src/server/game/Pools/PoolHandler.h
index df62badd9c8..156bc47a2a9 100644
--- a/src/server/game/Pools/PoolHandler.h
+++ b/src/server/game/Pools/PoolHandler.h
@@ -20,7 +20,7 @@
 #define TRINITY_POOLHANDLER_H
 
 #include "Define.h"
-#include "Singleton.h"
+#include "ace/Singleton.h"
 #include "Creature.h"
 #include "GameObject.h"
 
@@ -89,10 +89,11 @@ class PoolGroup
 
 class PoolHandler
 {
-    public:
-        PoolHandler();
-        ~PoolHandler() {};
+    friend class ACE_Singleton;
+    PoolHandler();
+    ~PoolHandler() {};
 
+    public:
         void LoadFromDB();
         void Initialize();
 
@@ -134,7 +135,7 @@ class PoolHandler
         SpawnedPoolData mSpawnedData;
 };
 
-#define poolhandler Trinity::Singleton::Instance()
+#define poolhandler (*ACE_Singleton::instance())
 
 // Method that tell if the creature is part of a pool and return the pool id if yes
 template<>
diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp
index 88e5b7284c0..70b1ff6be64 100644
--- a/src/server/game/Scripting/ScriptMgr.cpp
+++ b/src/server/game/Scripting/ScriptMgr.cpp
@@ -10,9 +10,6 @@
 #include "ProgressBar.h"
 #include "ScriptLoader.h"
 #include "ScriptSystem.h"
-#include "SingletonImp.h"
-
-INSTANTIATE_SINGLETON_1(ScriptMgr);
 
 int num_sc_scripts;
 Script *m_scripts[MAX_SCRIPTS];
diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h
index 250bbf5526a..bcb26381809 100644
--- a/src/server/game/Scripting/ScriptMgr.h
+++ b/src/server/game/Scripting/ScriptMgr.h
@@ -94,8 +94,9 @@ struct Script
 
 class ScriptMgr
 {
+    friend class ACE_Singleton;
+    ScriptMgr();
     public:
-        ScriptMgr();
         ~ScriptMgr();
 
         void ScriptsInit();
@@ -158,6 +159,6 @@ void DoScriptText(int32 textEntry, WorldObject* pSource, Unit *pTarget = NULL);
 #define FUNC_PTR(name, callconvention, returntype, parameters)    typedef returntype(callconvention *name)parameters;
 #endif
 
-#define sScriptMgr Trinity::Singleton::Instance()
+#define sScriptMgr (*ACE_Singleton::instance())
 #endif
 
diff --git a/src/server/game/Server/Protocol/Handlers/AddonHandler.cpp b/src/server/game/Server/Protocol/Handlers/AddonHandler.cpp
index b54c119270f..13fbd266ea4 100644
--- a/src/server/game/Server/Protocol/Handlers/AddonHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/AddonHandler.cpp
@@ -19,16 +19,11 @@
  */
 
 #include "zlib.h"
-
 #include "AddonHandler.h"
 #include "DatabaseEnv.h"
-#include "SingletonImp.h"
 #include "Opcodes.h"
-
 #include "Log.h"
 
-INSTANTIATE_SINGLETON_1( AddonHandler );
-
 AddonHandler::AddonHandler()
 {
 }
diff --git a/src/server/game/Server/Protocol/Handlers/AddonHandler.h b/src/server/game/Server/Protocol/Handlers/AddonHandler.h
index 2c9394c947d..68620751da3 100644
--- a/src/server/game/Server/Protocol/Handlers/AddonHandler.h
+++ b/src/server/game/Server/Protocol/Handlers/AddonHandler.h
@@ -23,19 +23,20 @@
 
 #include "Common.h"
 #include "ConfigEnv.h"
-#include "Singleton.h"
-
+#include "ace/Singleton.h"
 #include "WorldPacket.h"
 
 class AddonHandler
 {
+    /* Construction */
+    friend class ACE_Singleton;
+    AddonHandler();
+    
     public:
-        /* Construction */
-        AddonHandler();
         ~AddonHandler();
-                                                            //built addon packet
+                                                            //build addon packet
         bool BuildAddonPacket(WorldPacket* Source, WorldPacket* Target);
 };
-#define sAddOnHandler Trinity::Singleton::Instance()
+#define sAddOnHandler ACE_Singleton::instance()
 #endif
 
diff --git a/src/server/game/Server/Protocol/Handlers/ArenaTeamHandler.cpp b/src/server/game/Server/Protocol/Handlers/ArenaTeamHandler.cpp
index 1d93090d255..3c26e17bddd 100644
--- a/src/server/game/Server/Protocol/Handlers/ArenaTeamHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/ArenaTeamHandler.cpp
@@ -91,7 +91,7 @@ void WorldSession::HandleArenaTeamInviteOpcode(WorldPacket & recv_data)
         if (!normalizePlayerName(Invitedname))
             return;
 
-        player = ObjectAccessor::Instance().FindPlayerByName(Invitedname.c_str());
+        player = sObjectAccessor.FindPlayerByName(Invitedname.c_str());
     }
 
     if (!player)
diff --git a/src/server/game/Server/Protocol/Handlers/ChannelHandler.cpp b/src/server/game/Server/Protocol/Handlers/ChannelHandler.cpp
index 73f01f46c4c..442fe55b194 100644
--- a/src/server/game/Server/Protocol/Handlers/ChannelHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/ChannelHandler.cpp
@@ -18,8 +18,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "SingletonImp.h"
-
 #include "ObjectMgr.h"                                      // for normalizePlayerName
 #include "ChannelMgr.h"
 
diff --git a/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp b/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp
index 141f3605ee2..ca08d197c3f 100644
--- a/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp
@@ -719,7 +719,7 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder * holder)
             pCurrChar->TeleportTo(pCurrChar->m_homebindMapId, pCurrChar->m_homebindX, pCurrChar->m_homebindY, pCurrChar->m_homebindZ, pCurrChar->GetOrientation());
     }
 
-    ObjectAccessor::Instance().AddObject(pCurrChar);
+    sObjectAccessor.AddObject(pCurrChar);
     //sLog.outDebug("Player %s added to Map.",pCurrChar->GetName());
 
     pCurrChar->SendInitialPacketsAfterAddToMap();
diff --git a/src/server/game/Server/Protocol/Handlers/GuildHandler.cpp b/src/server/game/Server/Protocol/Handlers/GuildHandler.cpp
index 6803fe63a86..4db1961e7af 100644
--- a/src/server/game/Server/Protocol/Handlers/GuildHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/GuildHandler.cpp
@@ -75,7 +75,7 @@ void WorldSession::HandleGuildInviteOpcode(WorldPacket& recvPacket)
     recvPacket >> Invitedname;
 
     if (normalizePlayerName(Invitedname))
-        player = ObjectAccessor::Instance().FindPlayerByName(Invitedname.c_str());
+        player = sObjectAccessor.FindPlayerByName(Invitedname.c_str());
 
     if (!player)
     {
diff --git a/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp b/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp
index e4d329e6afc..3bc5e8d507f 100644
--- a/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp
@@ -232,8 +232,8 @@ void WorldSession::HandleWhoOpcode(WorldPacket & recv_data)
     data << uint32(clientcount);                            // clientcount place holder, listed count
     data << uint32(clientcount);                            // clientcount place holder, online count
 
-    ObjectAccessor::Guard guard(*HashMapHolder::GetLock());
-    HashMapHolder::MapType& m = ObjectAccessor::Instance().GetPlayers();
+    ACE_GUARD(ACE_Thread_Mutex, g, *HashMapHolder::GetLock());
+    HashMapHolder::MapType& m = sObjectAccessor.GetPlayers();
     for (HashMapHolder::MapType::const_iterator itr = m.begin(); itr != m.end(); ++itr)
     {
         if (security == SEC_PLAYER)
@@ -935,7 +935,7 @@ void WorldSession::HandleAreaTriggerOpcode(WorldPacket & recv_data)
         return;
 
     // check if player can enter instance : instance not full, and raid instance not in encounter fight
-    if (!MapManager::Instance().CanPlayerEnter(at->target_mapId, GetPlayer(), false))
+    if (!sMapMgr.CanPlayerEnter(at->target_mapId, GetPlayer(), false))
         return;
 
     GetPlayer()->TeleportTo(at->target_mapId,at->target_X,at->target_Y,at->target_Z,at->target_Orientation,TELE_TO_NOT_LEAVE_TRANSPORT);
diff --git a/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp b/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp
index 1b850434726..56a8c9cd6da 100644
--- a/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp
@@ -75,7 +75,7 @@ void WorldSession::HandleMoveWorldportAckOpcode()
     }
 
     // relocate the player to the teleport destination
-    Map * newMap = MapManager::Instance().CreateMap(loc.GetMapId(), GetPlayer(), 0);
+    Map * newMap = sMapMgr.CreateMap(loc.GetMapId(), GetPlayer(), 0);
     // the CanEnter checks are done in TeleporTo but conditions may change
     // while the player is in transit, for example the map may get full
     if (!newMap || !newMap->CanEnter(GetPlayer()))
@@ -302,7 +302,7 @@ void WorldSession::HandleMovementOpcodes(WorldPacket & recv_data)
         if (plMover && !plMover->GetTransport())
         {
             // elevators also cause the client to send MOVEMENTFLAG_ONTRANSPORT - just unmount if the guid can be found in the transport list
-            for (MapManager::TransportSet::const_iterator iter = MapManager::Instance().m_Transports.begin(); iter != MapManager::Instance().m_Transports.end(); ++iter)
+            for (MapManager::TransportSet::const_iterator iter = sMapMgr.m_Transports.begin(); iter != sMapMgr.m_Transports.end(); ++iter)
             {
                 if ((*iter)->GetGUID() == movementInfo.t_guid)
                 {
diff --git a/src/server/game/Server/Protocol/Handlers/QueryHandler.cpp b/src/server/game/Server/Protocol/Handlers/QueryHandler.cpp
index 05cbcf81f2f..fc2c3baf735 100644
--- a/src/server/game/Server/Protocol/Handlers/QueryHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/QueryHandler.cpp
@@ -302,7 +302,7 @@ void WorldSession::HandleCorpseQueryOpcode(WorldPacket & /*recv_data*/)
             if (corpseMapEntry->IsDungeon() && corpseMapEntry->entrance_map >= 0)
             {
                 // if corpse map have entrance
-                if (Map const* entranceMap = MapManager::Instance().CreateBaseMap(corpseMapEntry->entrance_map))
+                if (Map const* entranceMap = sMapMgr.CreateBaseMap(corpseMapEntry->entrance_map))
                 {
                     mapid = corpseMapEntry->entrance_map;
                     x = corpseMapEntry->entrance_x;
diff --git a/src/server/game/Server/Protocol/WorldLog.cpp b/src/server/game/Server/Protocol/WorldLog.cpp
index a9000f8e65c..e66bff0b504 100644
--- a/src/server/game/Server/Protocol/WorldLog.cpp
+++ b/src/server/game/Server/Protocol/WorldLog.cpp
@@ -23,14 +23,9 @@
 */
 
 #include "WorldLog.h"
-#include "SingletonImp.h"
 #include "ConfigEnv.h"
 #include "Log.h"
 
-#define CLASS_LOCK Trinity::ClassLevelLockable
-INSTANTIATE_SINGLETON_2(WorldLog, CLASS_LOCK);
-INSTANTIATE_CLASS_MUTEX(WorldLog, ACE_Thread_Mutex);
-
 WorldLog::WorldLog() : i_file(NULL)
 {
     Initialize();
@@ -67,7 +62,7 @@ void WorldLog::outTimestampLog(char const *fmt, ...)
 {
     if (LogWorld())
     {
-        Guard guard(*this);
+        ACE_GUARD(ACE_Thread_Mutex, Guard, Lock);
         ASSERT(i_file);
 
         Log::outTimestamp(i_file);
@@ -95,7 +90,7 @@ void WorldLog::outLog(char const *fmt, ...)
 {
     if (LogWorld())
     {
-        Guard guard(*this);
+        ACE_GUARD(ACE_Thread_Mutex, Guard, Lock);
         ASSERT(i_file);
 
         va_list args;
@@ -117,6 +112,3 @@ void WorldLog::outLog(char const *fmt, ...)
         va_end(ap2);
     }
 }
-
-#define sWorldLog WorldLog::Instance()
-
diff --git a/src/server/game/Server/Protocol/WorldLog.h b/src/server/game/Server/Protocol/WorldLog.h
index 8a3c96b3b15..fd228ce4559 100644
--- a/src/server/game/Server/Protocol/WorldLog.h
+++ b/src/server/game/Server/Protocol/WorldLog.h
@@ -26,19 +26,19 @@
 #define TRINITY_WORLDLOG_H
 
 #include "Common.h"
-#include "Singleton.h"
+#include "ace/Singleton.h"
 #include "Errors.h"
 
 #include 
 
 /// %Log packets to a file
-class WorldLog : public Trinity::Singleton >
+class WorldLog
 {
-    friend class Trinity::OperatorNew;
+    friend class ACE_Singleton;
     WorldLog();
     WorldLog(const WorldLog &);
     WorldLog& operator=(const WorldLog &);
-    typedef Trinity::ClassLevelLockable::Lock Guard;
+    ACE_Thread_Mutex Lock;
 
     /// Close the file in destructor
     ~WorldLog();
@@ -57,7 +57,7 @@ class WorldLog : public Trinity::Singleton::instance())
 #endif
 /// @}
 
diff --git a/src/server/game/Skills/SkillDiscovery.cpp b/src/server/game/Skills/SkillDiscovery.cpp
index f0bfb5bc0ba..fb34cff150c 100644
--- a/src/server/game/Skills/SkillDiscovery.cpp
+++ b/src/server/game/Skills/SkillDiscovery.cpp
@@ -21,7 +21,6 @@
 #include "DatabaseEnv.h"
 #include "Log.h"
 #include "ProgressBar.h"
-#include "SingletonImp.h"
 #include "World.h"
 #include "Util.h"
 #include "SkillDiscovery.h"
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
index 7a975f021ff..a62e602fe49 100644
--- a/src/server/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
@@ -41,7 +41,6 @@
 #include "MapManager.h"
 #include "ObjectAccessor.h"
 #include "CellImpl.h"
-#include "SingletonImp.h"
 #include "SharedDefines.h"
 #include "LootMgr.h"
 #include "VMapFactory.h"
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp
index f89a0650729..19702f1b8f7 100644
--- a/src/server/game/Spells/SpellMgr.cpp
+++ b/src/server/game/Spells/SpellMgr.cpp
@@ -1164,7 +1164,7 @@ void SpellMgr::LoadSpellTargetPositions()
                 // additional requirements
                 if (spellInfo->Effect[i]==SPELL_EFFECT_BIND && spellInfo->EffectMiscValue[i])
                 {
-                    uint32 area_id = MapManager::Instance().GetAreaId(st.target_mapId, st.target_X, st.target_Y, st.target_Z);
+                    uint32 area_id = sMapMgr.GetAreaId(st.target_mapId, st.target_X, st.target_Y, st.target_Z);
                     if (area_id != uint32(spellInfo->EffectMiscValue[i]))
                     {
                         sLog.outErrorDb("Spell (Id: %u) listed in `spell_target_position` expected point to zone %u bit point to zone %u.",Spell_ID, spellInfo->EffectMiscValue[i], area_id);
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
index 2b6f84fbc1e..7d0b91e38de 100644
--- a/src/server/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
@@ -48,7 +48,6 @@
 #include "ItemEnchantmentMgr.h"
 #include "MapManager.h"
 #include "CreatureAIRegistry.h"
-#include "SingletonImp.h"
 #include "BattleGroundMgr.h"
 #include "OutdoorPvPMgr.h"
 #include "TemporarySummon.h"
@@ -72,8 +71,6 @@
 #include "LFGMgr.h"
 #include "ConditionMgr.h"
 
-INSTANTIATE_SINGLETON_1(World);
-
 volatile bool World::m_stopEvent = false;
 uint8 World::m_ExitCode = SHUTDOWN_EXIT_CODE;
 volatile uint32 World::m_worldLoopCounter = 0;
@@ -635,7 +632,7 @@ void World::LoadConfigSettings(bool reload)
         m_configs[CONFIG_INTERVAL_GRIDCLEAN] = MIN_GRID_DELAY;
     }
     if (reload)
-        MapManager::Instance().SetGridCleanUpDelay(m_configs[CONFIG_INTERVAL_GRIDCLEAN]);
+        sMapMgr.SetGridCleanUpDelay(m_configs[CONFIG_INTERVAL_GRIDCLEAN]);
 
     m_configs[CONFIG_INTERVAL_MAPUPDATE] = sConfig.GetIntDefault("MapUpdateInterval", 100);
     if (m_configs[CONFIG_INTERVAL_MAPUPDATE] < MIN_MAP_UPDATE_DELAY)
@@ -644,7 +641,7 @@ void World::LoadConfigSettings(bool reload)
         m_configs[CONFIG_INTERVAL_MAPUPDATE] = MIN_MAP_UPDATE_DELAY;
     }
     if (reload)
-        MapManager::Instance().SetMapUpdateInterval(m_configs[CONFIG_INTERVAL_MAPUPDATE]);
+        sMapMgr.SetMapUpdateInterval(m_configs[CONFIG_INTERVAL_MAPUPDATE]);
 
     m_configs[CONFIG_INTERVAL_CHANGEWEATHER] = sConfig.GetIntDefault("ChangeWeatherInterval", 10 * MINUTE * IN_MILISECONDS);
 
@@ -1666,7 +1663,7 @@ void World::SetInitialWorldSettings()
 
     ///- Initialize MapManager
     sLog.outString("Starting Map System");
-    MapManager::Instance().Initialize();
+    sMapMgr.Initialize();
 
     sLog.outString("Starting Game Event system...");
     uint32 nextGameEvent = gameeventmgr.Initialize();
@@ -1693,7 +1690,7 @@ void World::SetInitialWorldSettings()
 
     //Not sure if this can be moved up in the sequence (with static data loading) as it uses MapManager
     sLog.outString("Loading Transports...");
-    MapManager::Instance().LoadTransports();
+    sMapMgr.LoadTransports();
 
     sLog.outString("Deleting expired bans...");
     LoginDatabase.Execute("DELETE FROM ip_banned WHERE unbandate <= UNIX_TIMESTAMP() AND unbandate<>bandate");
@@ -1945,12 +1942,12 @@ void World::Update(uint32 diff)
 
     /// 
  •  Handle all other objects
     ///- Update objects when the timer has passed (maps, transport, creatures,...)
-    MapManager::Instance().Update(diff);                // As interval = 0
+    sMapMgr.Update(diff);                // As interval = 0
 
     /*if (m_timers[WUPDATE_OBJECTS].Passed())
     {
         m_timers[WUPDATE_OBJECTS].Reset();
-        MapManager::Instance().DoDelayedMovesAndRemoves();
+        sMapMgr.DoDelayedMovesAndRemoves();
     }*/
 
     static uint32 autobroadcaston = 0;
diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h
index c53cab1124f..7266cf7e770 100644
--- a/src/server/game/World/World.h
+++ b/src/server/game/World/World.h
@@ -27,7 +27,7 @@
 
 #include "Common.h"
 #include "Timer.h"
-#include "Singleton.h"
+#include 
 #include "SharedDefines.h"
 #include "ace/Atomic_Op.h"
 #include "QueryResult.h"
@@ -779,6 +779,6 @@ class World
 
 extern uint32 realmID;
 
-#define sWorld Trinity::Singleton::Instance()
+#define sWorld (*ACE_Singleton::instance())
 #endif
 /// @}
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp
index b079dd94a58..f611c21e2bf 100644
--- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp
@@ -189,9 +189,9 @@ struct boss_victor_nefariusAI : public ScriptedAI
 
         //Trinity::Singleton::Instance().GetMap(me->GetMapId(), me)->GetPlayers().begin();
         /*
-        list ::const_iterator i = MapManager::Instance().GetMap(me->GetMapId(), me)->GetPlayers().begin();
+        list ::const_iterator i = sMapMgr.GetMap(me->GetMapId(), me)->GetPlayers().begin();
 
-        for (i = MapManager::Instance().GetMap(me->GetMapId(), me)->GetPlayers().begin(); i != MapManager::Instance().GetMap(me->GetMapId(), me)->GetPlayers().end(); ++i)
+        for (i = sMapMgr.GetMap(me->GetMapId(), me)->GetPlayers().begin(); i != sMapMgr.GetMap(me->GetMapId(), me)->GetPlayers().end(); ++i)
         {
         AttackStart((*i));
         }
@@ -288,7 +288,7 @@ struct boss_victor_nefariusAI : public ScriptedAI
                 if (SpawnedAdds >= 42)
                 {
                     //Teleport Victor Nefarius way out of the map
-                    //MapManager::Instance().GetMap(me->GetMapId(), me)->CreatureRelocation(me,0,0,-5000,0);
+                    //sMapMgr.GetMap(me->GetMapId(), me)->CreatureRelocation(me,0,0,-5000,0);
 
                     //Inturrupt any spell casting
                     me->InterruptNonMeleeSpells(false);
diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt
index 04fbfbea60f..0fd58e63588 100644
--- a/src/server/shared/CMakeLists.txt
+++ b/src/server/shared/CMakeLists.txt
@@ -12,7 +12,6 @@
 
 set(shared_STAT_SRCS
   Logging/Log.cpp
-  Policies/ObjectLifeTime.cpp
   Threading/DelayExecutor.cpp
   Threading/Threading.cpp
   Utilities/ProgressBar.cpp
@@ -37,7 +36,6 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/src/server/shared/Dynamic
   ${CMAKE_SOURCE_DIR}/src/server/shared/Logging
   ${CMAKE_SOURCE_DIR}/src/server/shared/Packets
-  ${CMAKE_SOURCE_DIR}/src/server/shared/Policies
   ${CMAKE_SOURCE_DIR}/src/server/shared/Threading
   ${CMAKE_SOURCE_DIR}/src/server/shared/Utilities
   ${MYSQL_INCLUDE_DIR}
diff --git a/src/server/shared/Configuration/Config.cpp b/src/server/shared/Configuration/Config.cpp
index 39830104a7c..3979cbc36aa 100644
--- a/src/server/shared/Configuration/Config.cpp
+++ b/src/server/shared/Configuration/Config.cpp
@@ -19,9 +19,6 @@
  */
 
 #include "ConfigEnv.h"
-#include "Policies/SingletonImp.h"
-
-INSTANTIATE_SINGLETON_1(Config);
 
 Config::Config() : mIgnoreCase(true), mConf(NULL)
 {
diff --git a/src/server/shared/Configuration/Config.h b/src/server/shared/Configuration/Config.h
index bfcb324ee62..50cd4609b25 100644
--- a/src/server/shared/Configuration/Config.h
+++ b/src/server/shared/Configuration/Config.h
@@ -21,15 +21,16 @@
 #ifndef CONFIG_H
 #define CONFIG_H
 
-#include 
+#include 
 #include "Define.h"
 
 class DOTCONFDocument;
 
 class Config
 {
+    friend class ACE_Singleton;
+    Config();
     public:
-        Config();
         ~Config();
 
         bool SetSource(const char *file, bool ignorecase = true);
@@ -47,7 +48,7 @@ class Config
         DOTCONFDocument *mConf;
 };
 
-#define sConfig Trinity::Singleton::Instance()
+#define sConfig (*ACE_Singleton::instance())
 
 #endif
 
diff --git a/src/server/shared/Database/Database.cpp b/src/server/shared/Database/Database.cpp
index 2dd2f9bbda4..1fb2f831a9f 100644
--- a/src/server/shared/Database/Database.cpp
+++ b/src/server/shared/Database/Database.cpp
@@ -25,7 +25,6 @@
 #include "Updates/UpdateFields.h"
 
 #include "Utilities/Util.h"
-#include "Policies/SingletonImp.h"
 #include "Define.h"
 #include "Threading/Threading.h"
 #include "Database/SqlDelayThread.h"
diff --git a/src/server/shared/Database/Database.h b/src/server/shared/Database/Database.h
index 655479c85fe..762abfd2ede 100644
--- a/src/server/shared/Database/Database.h
+++ b/src/server/shared/Database/Database.h
@@ -24,7 +24,6 @@
 #include "Threading/Threading.h"
 #include "Dynamic/UnorderedMap.h"
 #include "Database/SqlDelayThread.h"
-#include "Policies/Singleton.h"
 #include "ace/Thread_Mutex.h"
 #include "ace/Guard_T.h"
 
diff --git a/src/server/shared/Debugging/MemoryLeaks.cpp b/src/server/shared/Debugging/MemoryLeaks.cpp
index ef7e36c3b57..c591dabb866 100644
--- a/src/server/shared/Debugging/MemoryLeaks.cpp
+++ b/src/server/shared/Debugging/MemoryLeaks.cpp
@@ -17,9 +17,6 @@
  */
 
 #include "MemoryLeaks.h"
-#include "Policies/SingletonImp.h"
-
-INSTANTIATE_SINGLETON_1( MemoryManager ) ;
 
 MemoryManager::MemoryManager( )
 {
diff --git a/src/server/shared/Debugging/MemoryLeaks.h b/src/server/shared/Debugging/MemoryLeaks.h
index bc722f241bd..4b13e4d3d90 100644
--- a/src/server/shared/Debugging/MemoryLeaks.h
+++ b/src/server/shared/Debugging/MemoryLeaks.h
@@ -39,10 +39,11 @@
 #endif
 
 
-#include "Policies/Singleton.h"
+#include "ace/Singleton.h"
 
-struct MemoryManager : public Trinity::Singleton < MemoryManager >
+struct MemoryManager
 {
     MemoryManager();
 };
+#define sMemoryManager ACE_Singleton::instance()
 #endif
diff --git a/src/server/shared/Dynamic/CountedReference/Reference.h b/src/server/shared/Dynamic/CountedReference/Reference.h
deleted file mode 100644
index bdc06a572c9..00000000000
--- a/src/server/shared/Dynamic/CountedReference/Reference.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (C) 2005-2009 MaNGOS 
- *
- * Copyright (C) 2008-2010 Trinity 
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#ifndef  TRINITY_REFERENCE_H
-#define  TRINITY_REFERENCE_H
-
-/**
- * Referencer
- * Referencer is an object that holds a reference holder that  hold a reference
- * counted object.  When an object's reference count drop to zero, it removes
- * the object.  This is a non intrusive mechanism and any object at any point
- * in time can be referenced.  When and object is reference counted, do not
- * pass the object directly to other methods but rather, pass its
- * reference around.  Objects can be reference counted in both single threaded
- * model and multi-threaded model
- */
-
-#include 
-#include "Define.h"
-#include "ThreadingModel.h"
-#include "ReferenceHolder.h"
-
-template
-<
-typename T,
-class THREADING_MODEL = Trinity::SingleThreaded
->
-class Referencer
-{
-    typedef typename THREADING_MODEL::Lock Lock;
-    typedef ReferenceHolder ReferenceeHolder;
-    public:
-
-        /// Constructs a referencer.
-        Referencer(T *ref = NULL);
-
-        /// Copy constructor
-        Referencer(const Referencer &obj) : i_holder(NULL) { *this = obj; }
-
-        /// Destructor
-        ~Referencer();
-
-        /// Referencee accessor
-        T* referencee(void) { return (i_holder == NULL ? NULL : i_holder->i_referencee); }
-        const T* referencee(void) const { return (i_holder == NULL ? NULL : i_holder->i_referencee); }
-
-        //T& referencee(void){ return _referencee(); }
-        //const T& referencee(void) const { return const_cast(this)->_referencee(); }
-        operator T&(void) { return _referencee(); }
-        operator const T&(void) const { return *const_cast(this)->_referencee(); }
-
-        /// cast operators
-        T* operator*() { return (i_holder == NULL ? NULL : i_holder->i_referencee); }
-        T const * operator*() const { return (i_holder == NULL ? NULL : i_holder->i_referencee); }
-
-        /// overload operators
-        T* operator->() { return (i_holder == NULL ? NULL : i_holder->i_referencee); }
-        const T * operator->() const { return (i_holder == NULL ? NULL : i_holder->i_referencee); }
-
-        /// operator =
-        Referencer& operator=(const Referencer &obj);
-        Referencer& operator=(T *);
-
-        /// returns true if i_referencee is null
-        bool isNull(void) const { return i_holder == NULL; }
-
-    private:
-
-        T& _referencee(void)
-        {
-            if( i_holder == NULL )
-                throw std::runtime_error("Invalid access to null pointer");
-            return *i_holder->i_referencee;
-        }
-
-        void deReference(ReferenceeHolder *);
-        void addReference(ReferenceeHolder *);
-
-        // private data
-        ReferenceeHolder *i_holder;
-};
-#endif
-
diff --git a/src/server/shared/Dynamic/CountedReference/ReferenceHolder.h b/src/server/shared/Dynamic/CountedReference/ReferenceHolder.h
deleted file mode 100644
index 597e9854be0..00000000000
--- a/src/server/shared/Dynamic/CountedReference/ReferenceHolder.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2005-2009 MaNGOS 
- *
- * Copyright (C) 2008-2010 Trinity 
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#ifndef TRINITY_REFERENCEHOLDER_H
-#define TRINITY_REFERENCEHOLDER_H
-
-/** ReferenceHolder holds the actualy referenced obejct as well the refence
-    count.  The ReferenecHolder implements as a policy base object and
-    will decided by the Reference class to be consnsitent.
- */
-
-template
-<
-typename T,
-class THREADING_MODEL
->
-struct ReferenceHolder : public THREADING_MODEL
-{
-    explicit ReferenceHolder(T *ref) : i_referencee(ref), i_referenceCount(0) {}
-    T *i_referencee;
-    unsigned int i_referenceCount;
-    typedef typename THREADING_MODEL::Lock Lock;
-};
-#endif
-
diff --git a/src/server/shared/Dynamic/CountedReference/ReferenceImpl.h b/src/server/shared/Dynamic/CountedReference/ReferenceImpl.h
deleted file mode 100644
index cde330179e3..00000000000
--- a/src/server/shared/Dynamic/CountedReference/ReferenceImpl.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright (C) 2005-2009 MaNGOS 
- *
- * Copyright (C) 2008-2010 Trinity 
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#ifndef TRINITY_REFERENCEIMPL_H
-#define TRINITY_REFERENCEIMPL_H
-
-#include "Reference.h"
-
-template
-<
-typename T,
-class THREADING_MODEL
->
-Referencer::Referencer(T *ref)
-: i_holder(NULL)
-{
-    if( ref != NULL )
-    {
-        i_holder = new ReferenceeHolder(ref);
-        ++i_holder->i_referenceCount;
-    }
-}
-
-template
-<
-typename T,
-class THREADING_MODEL
->
-Referencer::~Referencer()
-{
-    if( i_holder != NULL )
-        deReference(i_holder);
-    i_holder = NULL;
-}
-
-template
-<
-typename T,
-class THREADING_MODEL
->
-Referencer&
-Referencer::operator=(const Referencer &obj)
-{
-    if( i_holder != NULL )
-        deReference(i_holder);
-    if( obj.i_holder != NULL )
-        addReference(obj.i_holder);
-    i_holder = obj.i_holder;
-    return *this;
-}
-
-template
-<
-typename T,
-class THREADING_MODEL
->
-Referencer&
-Referencer::operator=(T *ref)
-{
-    if( i_holder != NULL )
-        deReference(i_holder);
-    i_holder = NULL;
-    if( ref != NULL )
-    {
-        i_holder = new ReferenceeHolder(ref);
-        ++i_holder->i_referenceCount;
-    }
-
-    return *this;
-}
-
-template
-<
-typename T,
-class THREADING_MODEL
->
-void
-Referencer::deReference(ReferenceHolder *holder)
-{
-    assert( holder != NULL && holder->i_referenceCount > 0);
-    bool delete_object = false;
-
-    {
-        // The guard is within the scope due to the guard
-        // must release earlier than expected.
-        Lock guard(*holder);
-        Guard(&guard);
-
-        --holder->i_referenceCount;
-        if( holder->i_referenceCount == 0 )
-            delete_object = true;
-    }
-
-    if( delete_object )
-    {
-        delete holder->i_referencee;
-        delete holder;
-    }
-}
-
-template
-<
-typename T,
-class THREADING_MODEL
->
-void
-Referencer::addReference(ReferenceHolder *holder)
-{
-    assert( i_holder != NULL );
-    Lock guard(*holder);
-    Guard(&guard);
-
-    ++holder->i_referenceCount;
-}
-#endif
-
diff --git a/src/server/shared/Dynamic/FactoryHolder.h b/src/server/shared/Dynamic/FactoryHolder.h
index fd5925f5f75..096bdad1783 100644
--- a/src/server/shared/Dynamic/FactoryHolder.h
+++ b/src/server/shared/Dynamic/FactoryHolder.h
@@ -24,7 +24,6 @@
 #include "Define.h"
 #include "Dynamic/TypeList.h"
 #include "ObjectRegistry.h"
-#include "Policies/SingletonImp.h"
 
 /** FactoryHolder holds a factory object of a specific type
  */
@@ -33,14 +32,15 @@ class FactoryHolder
 {
     public:
         typedef ObjectRegistry, Key > FactoryHolderRegistry;
-        typedef Trinity::Singleton FactoryHolderRepository;
+        friend class ACE_Singleton;
+        typedef ACE_Singleton FactoryHolderRepository;
 
         FactoryHolder(Key k) : i_key(k) {}
         virtual ~FactoryHolder() {}
         inline Key key() const { return i_key; }
 
-        void RegisterSelf(void) { FactoryHolderRepository::Instance().InsertItem(this, i_key); }
-        void DeregisterSelf(void) { FactoryHolderRepository::Instance().RemoveItem(this, false); }
+        void RegisterSelf(void) { FactoryHolderRepository::instance()->InsertItem(this, i_key); }
+        void DeregisterSelf(void) { FactoryHolderRepository::instance()->RemoveItem(this, false); }
 
         /// Abstract Factory create method
         virtual T* Create(void *data = NULL) const = 0;
diff --git a/src/server/shared/Dynamic/ObjectRegistry.h b/src/server/shared/Dynamic/ObjectRegistry.h
index eaf8e1acd2d..11052a9f0a7 100644
--- a/src/server/shared/Dynamic/ObjectRegistry.h
+++ b/src/server/shared/Dynamic/ObjectRegistry.h
@@ -23,7 +23,7 @@
 
 #include "Define.h"
 #include "Dynamic/UnorderedMap.h"
-#include "Policies/Singleton.h"
+#include "ace/Singleton.h"
 
 #include 
 #include 
@@ -94,11 +94,6 @@ class ObjectRegistry
             return i_registeredObjects;
         }
 
-    private:
-        RegistryMapType i_registeredObjects;
-        friend class Trinity::OperatorNew >;
-
-        // protected for friend use since it should be a singleton
         ObjectRegistry() {}
         ~ObjectRegistry()
         {
@@ -106,6 +101,9 @@ class ObjectRegistry
                 delete iter->second;
             i_registeredObjects.clear();
         }
+    private:
+        RegistryMapType i_registeredObjects;
+        
 };
 #endif
 
diff --git a/src/server/shared/Logging/Log.cpp b/src/server/shared/Logging/Log.cpp
index 0f27400dce2..7a34eaa0c0d 100644
--- a/src/server/shared/Logging/Log.cpp
+++ b/src/server/shared/Logging/Log.cpp
@@ -20,15 +20,12 @@
 
 #include "Common.h"
 #include "Log.h"
-#include "Policies/SingletonImp.h"
 #include "Configuration/ConfigEnv.h"
 #include "Util.h"
 
 #include 
 #include 
 
-INSTANTIATE_SINGLETON_1( Log );
-
 Log::Log() :
     raLogfile(NULL), logfile(NULL), gmLogfile(NULL), charLogfile(NULL),
     dberLogfile(NULL), chatLogfile(NULL), m_gmlog_per_account(false), 
diff --git a/src/server/shared/Logging/Log.h b/src/server/shared/Logging/Log.h
index 53ce4e601b5..fb584d42c27 100644
--- a/src/server/shared/Logging/Log.h
+++ b/src/server/shared/Logging/Log.h
@@ -22,7 +22,7 @@
 #define TRINITYCORE_LOG_H
 
 #include "Common.h"
-#include "Policies/Singleton.h"
+#include 
 #include "Database/DatabaseEnv.h"
 
 class Config;
@@ -82,9 +82,9 @@ enum ColorTypes
 
 const int Colors = int(WHITE)+1;
 
-class Log : public Trinity::Singleton >
+class Log
 {
-    friend class Trinity::OperatorNew;
+    friend class ACE_Singleton;
     Log();
     ~Log();
 
@@ -172,10 +172,10 @@ class Log : public Trinity::Singleton::Instance()
+#define sLog (*ACE_Singleton::instance())
 
 #ifdef TRINITY_DEBUG
-#define DEBUG_LOG Trinity::Singleton::Instance().outDebug
+#define DEBUG_LOG sLog.outDebug
 #else
 #define DEBUG_LOG
 #endif
diff --git a/src/server/shared/Policies/CreationPolicy.h b/src/server/shared/Policies/CreationPolicy.h
deleted file mode 100644
index cc38d704e99..00000000000
--- a/src/server/shared/Policies/CreationPolicy.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (C) 2005-2009 MaNGOS 
- *
- * Copyright (C) 2008-2010 Trinity 
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#ifndef TRINITY_CREATIONPOLICY_H
-#define TRINITY_CREATIONPOLICY_H
-
-#include 
-#include "Define.h"
-
-namespace Trinity
-{
-    /**
-     * OperatorNew policy creates an object on the heap using new.
-     */
-    template 
-        class OperatorNew
-    {
-        public:
-            static T* Create(void) { return (new T); }
-            static void Destroy(T *obj) { delete obj; }
-    };
-
-    /**
-     * LocalStaticCreation policy creates an object on the stack
-     * the first time call Create.
-     */
-    template 
-        class LocalStaticCreation
-    {
-        union MaxAlign
-        {
-            char t_[sizeof(T)];
-            short int shortInt_;
-            int int_;
-            long int longInt_;
-            float float_;
-            double double_;
-            long double longDouble_;
-            struct Test;
-            int Test::* pMember_;
-            int (Test::*pMemberFn_)(int);
-        };
-        public:
-            static T* Create(void)
-            {
-                static MaxAlign si_localStatic;
-                return new(&si_localStatic) T;
-            }
-
-            static void Destroy(T *obj) { obj->~T(); }
-    };
-
-    /**
-     * CreateUsingMalloc by pass the memory manger.
-     */
-    template
-        class CreateUsingMalloc
-    {
-        public:
-            static T* Create()
-            {
-                void* p = ::malloc(sizeof(T));
-                if (!p) return 0;
-                return new(p) T;
-            }
-
-            static void Destroy(T* p)
-            {
-                p->~T();
-                ::free(p);
-            }
-    };
-
-    /**
-     * CreateOnCallBack creates the object base on the call back.
-     */
-    template
-        class CreateOnCallBack
-    {
-        public:
-            static T* Create()
-            {
-                return CALL_BACK::createCallBack();
-            }
-
-            static void Destroy(T *p)
-            {
-                CALL_BACK::destroyCallBack(p);
-            }
-    };
-}
-#endif
-
diff --git a/src/server/shared/Policies/ObjectLifeTime.cpp b/src/server/shared/Policies/ObjectLifeTime.cpp
deleted file mode 100644
index fd16873ae92..00000000000
--- a/src/server/shared/Policies/ObjectLifeTime.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2005-2009 MaNGOS 
- *
- * Copyright (C) 2008-2010 Trinity 
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#include 
-#include "ObjectLifeTime.h"
-
-namespace Trinity
-{
-    extern "C" void external_wrapper(void *p)
-    {
-        std::atexit( (void (*)())p );
-    }
-
-    void at_exit( void (*func)() )
-    {
-        external_wrapper((void*)func);
-    }
-}
-
diff --git a/src/server/shared/Policies/ObjectLifeTime.h b/src/server/shared/Policies/ObjectLifeTime.h
deleted file mode 100644
index 205434cb613..00000000000
--- a/src/server/shared/Policies/ObjectLifeTime.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2005-2009 MaNGOS 
- *
- * Copyright (C) 2008-2010 Trinity 
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#ifndef TRINITY_OBJECTLIFETIME_H
-#define TRINITY_OBJECTLIFETIME_H
-
-#include 
-#include "Define.h"
-
-typedef void (* Destroyer)(void);
-
-namespace Trinity
-{
-    void at_exit( void (*func)() );
-
-    template 
-        class ObjectLifeTime
-    {
-        public:
-            static void ScheduleCall(void (*destroyer)() )
-            {
-                at_exit( destroyer );
-            }
-
-            DECLSPEC_NORETURN static void OnDeadReference(void) ATTR_NORETURN;
-
-    };
-
-    template 
-        void ObjectLifeTime::OnDeadReference(void)       // We don't handle Dead Reference for now
-    {
-        throw std::runtime_error("Dead Reference");
-    }
-}
-#endif
-
diff --git a/src/server/shared/Policies/Singleton.h b/src/server/shared/Policies/Singleton.h
deleted file mode 100644
index da898558ca5..00000000000
--- a/src/server/shared/Policies/Singleton.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2005-2009 MaNGOS 
- *
- * Copyright (C) 2008-2010 Trinity 
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#ifndef TRINITY_SINGLETON_H
-#define TRINITY_SINGLETON_H
-
-/**
- * @brief class Singleton
- */
-
-#include "CreationPolicy.h"
-#include "ThreadingModel.h"
-#include "ObjectLifeTime.h"
-
-namespace Trinity
-{
-    template
-        <
-        typename T,
-        class ThreadingModel = Trinity::SingleThreaded,
-        class CreatePolicy = Trinity::OperatorNew,
-        class LifeTimePolicy = Trinity::ObjectLifeTime
-        >
-        class Singleton
-    {
-        public:
-            static T& Instance();
-
-        protected:
-            Singleton() {};
-
-        private:
-
-            // Prohibited actions...this does not prevent hijacking.
-            Singleton(const Singleton &);
-            Singleton& operator=(const Singleton &);
-
-            // Singleton Helpers
-            static void DestroySingleton();
-
-            // data structure
-            typedef typename ThreadingModel::Lock Guard;
-            static T *si_instance;
-            static bool si_destroyed;
-    };
-}
-#endif
-
diff --git a/src/server/shared/Policies/SingletonImp.h b/src/server/shared/Policies/SingletonImp.h
deleted file mode 100644
index 3e985cd5c64..00000000000
--- a/src/server/shared/Policies/SingletonImp.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (C) 2005-2009 MaNGOS 
- *
- * Copyright (C) 2008-2010 Trinity 
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#ifndef TRINITY_SINGLETONIMPL_H
-#define TRINITY_SINGLETONIMPL_H
-
-#include "Singleton.h"
-
-// avoid the using namespace here cuz
-// its a .h file afterall
-
-template
-<
-typename T,
-class ThreadingModel,
-class CreatePolicy,
-class LifeTimePolicy
->
-T&
-Trinity::Singleton::Instance()
-{
-    if( !si_instance )
-    {
-        // double-checked Locking pattern
-        Guard();
-        if( !si_instance )
-        {
-            if( si_destroyed )
-            {
-                si_destroyed = false;
-                LifeTimePolicy::OnDeadReference();
-            }
-            si_instance = CreatePolicy::Create();
-            LifeTimePolicy::ScheduleCall(&DestroySingleton);
-        }
-    }
-
-    return *si_instance;
-}
-
-template
-<
-typename T,
-class ThreadingModel,
-class CreatePolicy,
-class LifeTimePolicy
->
-void
-Trinity::Singleton::DestroySingleton()
-{
-    CreatePolicy::Destroy(si_instance);
-    si_instance = NULL;
-    si_destroyed = true;
-}
-
-#define INSTANTIATE_SINGLETON_1(TYPE) \
-    template class Trinity::Singleton, Trinity::OperatorNew, Trinity::ObjectLifeTime >; \
-    template<> TYPE* Trinity::Singleton, Trinity::OperatorNew, Trinity::ObjectLifeTime >::si_instance = 0; \
-    template<> bool Trinity::Singleton, Trinity::OperatorNew, Trinity::ObjectLifeTime >::si_destroyed = false
-
-#define INSTANTIATE_SINGLETON_2(TYPE, THREADINGMODEL) \
-    template class Trinity::Singleton, Trinity::ObjectLifeTime >; \
-    template<> TYPE* Trinity::Singleton, Trinity::ObjectLifeTime >::si_instance = 0; \
-    template<> bool Trinity::Singleton, Trinity::ObjectLifeTime >::si_destroyed = false
-
-#define INSTANTIATE_SINGLETON_3(TYPE, THREADINGMODEL, CREATIONPOLICY ) \
-    template class Trinity::Singleton >; \
-    template<> TYPE* Trinity::Singleton >::si_instance = 0; \
-    template<> bool Trinity::Singleton >::si_destroyed = false
-
-#define INSTANTIATE_SINGLETON_4(TYPE, THREADINGMODEL, CREATIONPOLICY, OBJECTLIFETIME) \
-    template class Trinity::Singleton; \
-    template<> TYPE* Trinity::Singleton::si_instance = 0; \
-    template<> bool Trinity::Singleton::si_destroyed = false
-#endif
-
diff --git a/src/server/shared/Policies/ThreadingModel.h b/src/server/shared/Policies/ThreadingModel.h
deleted file mode 100644
index a792bf1b7d7..00000000000
--- a/src/server/shared/Policies/ThreadingModel.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright (C) 2005-2009 MaNGOS 
- *
- * Copyright (C) 2008-2010 Trinity 
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#ifndef TRINITY_THREADINGMODEL_H
-#define TRINITY_THREADINGMODEL_H
-
-/**
- * @class ThreadingModel
- *
- */
-
-#include "Define.h"
-
-namespace Trinity
-{
-    inline void Guard(void *) {}
-
-    template class GeneralLock
-    {
-        public:
-            GeneralLock(MUTEX &m) : i_mutex(m)
-            {
-                i_mutex.acquire();
-            }
-
-            ~GeneralLock()
-            {
-                i_mutex.release();
-            }
-        private:
-            GeneralLock(const GeneralLock &);
-            GeneralLock& operator=(const GeneralLock &);
-            MUTEX &i_mutex;
-    };
-
-    template 
-        class SingleThreaded
-    {
-        public:
-
-            struct Lock                                     // empty object
-            {
-                Lock() {}
-                Lock(const T &) {}
-                Lock(const SingleThreaded &)             // for single threaded we ignore this
-                {
-                }
-            };
-
-            typedef T VolatileType;
-    };
-
-    // object level lockable
-    template
-        class ObjectLevelLockable
-    {
-        public:
-            ObjectLevelLockable() : i_mtx() {}
-
-            friend class Lock;
-
-            class Lock
-            {
-                public:
-                    Lock(ObjectLevelLockable &host) : i_lock(host.i_mtx)
-                    {
-                    }
-
-                private:
-                    GeneralLock i_lock;
-            };
-
-            typedef volatile T VolatileType;
-
-        private:
-            // prevent the compiler creating a copy construct
-            ObjectLevelLockable(const ObjectLevelLockable &);
-            ObjectLevelLockable& operator=(const ObjectLevelLockable &);
-
-            MUTEX i_mtx;
-    };
-
-    template
-        class ClassLevelLockable
-    {
-        public:
-            class Lock;
-            friend class Lock;
-            typedef volatile T VolatileType;
-
-            ClassLevelLockable() {}
-
-            class Lock
-            {
-                public:
-                    Lock(T& /*host*/) { ClassLevelLockable::si_mtx.acquire(); }
-                    Lock(ClassLevelLockable &) { ClassLevelLockable::si_mtx.acquire(); }
-                    Lock() { ClassLevelLockable::si_mtx.acquire(); }
-                    ~Lock() { ClassLevelLockable::si_mtx.release(); }
-            };
-
-        private:
-            static MUTEX si_mtx;
-    };
-
-}
-
-template MUTEX Trinity::ClassLevelLockable::si_mtx;
-
-#define INSTANTIATE_CLASS_MUTEX(CTYPE,MUTEX) \
-    template class Trinity::ClassLevelLockable
-#endif
-
diff --git a/src/server/worldserver/Master.cpp b/src/server/worldserver/Master.cpp
index 332a607dcad..fb2d828e284 100644
--- a/src/server/worldserver/Master.cpp
+++ b/src/server/worldserver/Master.cpp
@@ -33,7 +33,6 @@
 #include "WorldSocketMgr.h"
 #include "Configuration/ConfigEnv.h"
 #include "Database/DatabaseEnv.h"
-#include "SingletonImp.h"
 
 #include "CliRunnable.h"
 #include "Log.h"
@@ -58,8 +57,6 @@ extern int m_ServiceStatus;
 /// \todo Warning disabling not useful under VC++2005. Can somebody say on which compiler it is useful?
 #pragma warning(disable:4305)
 
-INSTANTIATE_SINGLETON_1( Master );
-
 volatile uint32 Master::m_masterLoopCounter = 0;
 
 /// Handle cored's termination signals
diff --git a/src/server/worldserver/Master.h b/src/server/worldserver/Master.h
index 76ff2af1457..00628827e2a 100644
--- a/src/server/worldserver/Master.h
+++ b/src/server/worldserver/Master.h
@@ -26,7 +26,6 @@
 #define _MASTER_H
 
 #include "Common.h"
-#include "Policies/Singleton.h"
 
 /// Start the server
 class Master
@@ -43,6 +42,6 @@ class Master
         void clearOnlineAccounts();
 };
 
-#define sMaster Trinity::Singleton::Instance()
+#define sMaster (*ACE_Singleton::instance())
 #endif
 /// @}
diff --git a/src/server/worldserver/WorldThread/WorldRunnable.cpp b/src/server/worldserver/WorldThread/WorldRunnable.cpp
index 3531873ec0c..69639da62fa 100644
--- a/src/server/worldserver/WorldThread/WorldRunnable.cpp
+++ b/src/server/worldserver/WorldThread/WorldRunnable.cpp
@@ -90,7 +90,7 @@ void WorldRunnable::run()
 
     sWorldSocketMgr->StopNetwork();
 
-    MapManager::Instance().UnloadAll();                     // unload all grids (including locked in memory)
+    sMapMgr.UnloadAll();                     // unload all grids (including locked in memory)
 
     ///- End the database thread
     WorldDatabase.ThreadEnd();                                  // free mySQL thread resources
diff --git a/win/VC90/shared.vcproj b/win/VC90/shared.vcproj
index 2c7310a7929..536939f9d5a 100644
--- a/win/VC90/shared.vcproj
+++ b/win/VC90/shared.vcproj
@@ -588,22 +588,6 @@
 				RelativePath="..\..\src\server\shared\Dynamic\UnorderedMap.h"
 				>
 			
-			
-				
-				
-				
-				
-				
-				
-			
 			
@@ -641,14 +625,6 @@
 				>
 			
 		
-		
-			
-			
-		
 		
-- 
cgit v1.2.3


From 275469a93072119a4d53d3e55391b20b83bb1f9e Mon Sep 17 00:00:00 2001
From: Machiavelli 
Date: Fri, 25 Jun 2010 00:33:45 +0200
Subject: Fix a crash in BuildPlayerTalentsInfoData.

--HG--
branch : trunk
---
 src/server/game/Entities/Player/Player.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src')

diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index e3ddcd81f0b..48bee800d9f 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -23119,6 +23119,9 @@ void Player::BuildPlayerTalentsInfoData(WorldPacket *data)
 
     if (m_specsCount)
     {
+        if (m_specsCount > MAX_TALENT_SPECS)
+            m_specsCount = MAX_TALENT_SPECS;
+
         // loop through all specs (only 1 for now)
         for (uint32 specIdx = 0; specIdx < m_specsCount; ++specIdx)
         {
-- 
cgit v1.2.3


From c107b394211feb5e8caac69a400f1324ebdc5168 Mon Sep 17 00:00:00 2001
From: Machiavelli 
Date: Fri, 25 Jun 2010 01:11:36 +0200
Subject: Store refundable items for Player class instance per lowguid instead
 of fullguid.

--HG--
branch : trunk
---
 src/server/game/Entities/Item/Item.cpp     |  4 ++--
 src/server/game/Entities/Player/Player.cpp | 22 +++++++++++-----------
 src/server/game/Entities/Player/Player.h   |  6 +++---
 3 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Item/Item.cpp b/src/server/game/Entities/Item/Item.cpp
index 8f7d82cee23..60957b66e32 100644
--- a/src/server/game/Entities/Item/Item.cpp
+++ b/src/server/game/Entities/Item/Item.cpp
@@ -635,7 +635,7 @@ void Item::SetState(ItemUpdateState state, Player *forplayer)
     {
         // pretend the item never existed
         RemoveFromUpdateQueueOf(forplayer);
-        forplayer->DeleteRefundReference(GetGUID());
+        forplayer->DeleteRefundReference(GetGUIDLow());
         delete this;
         return;
     }
@@ -1108,7 +1108,7 @@ void Item::SetNotRefundable(Player *owner, bool changestate)
     SetPaidExtendedCost(0);
     DeleteRefundDataFromDB();
 
-    owner->DeleteRefundReference(GetGUID());
+    owner->DeleteRefundReference(GetGUIDLow());
 }
 
 void Item::UpdatePlayedTime(Player *owner)
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 48bee800d9f..543aeffd52e 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -12151,7 +12151,7 @@ void Player::SplitItem(uint16 src, uint16 dst, uint32 count)
         BankItem(dest, pNewItem, true);
         if (isRefundable)
         {
-            AddRefundReference(pNewItem->GetGUID());
+            AddRefundReference(pNewItem->GetGUIDLow());
             pNewItem->SetPaidExtendedCost(pSrcItem->GetPaidExtendedCost());
             pNewItem->SetPaidMoney(pSrcItem->GetPaidMoney());
             pNewItem->SetRefundRecipient(GetGUIDLow());
@@ -16633,7 +16633,7 @@ void Player::_LoadInventory(QueryResult_AutoPtr result, uint32 timediff)
                         item->SetRefundRecipient(fields[0].GetUInt32());
                         item->SetPaidMoney(fields[1].GetUInt32());
                         item->SetPaidExtendedCost(fields[2].GetUInt32());
-                        AddRefundReference(item->GetGUID());
+                        AddRefundReference(item->GetGUIDLow());
                     }
                 }
             }
@@ -17794,14 +17794,14 @@ void Player::_SaveInventory()
     // the client auto counts down in real time after having received the initial played time on the first
     // SMSG_ITEM_REFUND_INFO_RESPONSE packet.
     // Item::UpdatePlayedTime is only called when needed, which is in DB saves, and item refund info requests.
-    std::set::iterator i_next;
-    for (std::set::iterator itr = m_refundableItems.begin(); itr!= m_refundableItems.end(); itr = i_next)
+    std::set::iterator i_next;
+    for (std::set::iterator itr = m_refundableItems.begin(); itr!= m_refundableItems.end(); itr = i_next)
     {
         // use copy iterator because itr may be invalid after operations in this loop
         i_next = itr;
         ++i_next;
 
-        Item* iPtr = GetItemByGuid(*itr);
+        Item* iPtr = GetItemByGuid(MAKE_NEW_GUID(*itr, 0, HIGHGUID_ITEM));
         if (iPtr)
         {
             iPtr->UpdatePlayedTime(this);
@@ -17809,7 +17809,7 @@ void Player::_SaveInventory()
         }
         else
         {
-            sLog.outError("Can't find item guid " UI64FMTD " but is in refundable storage for player %u ! Removing.", *itr, GetGUIDLow());
+            sLog.outError("Can't find item guid %u but is in refundable storage for player %u ! Removing.", *itr, GetGUIDLow());
             m_refundableItems.erase(itr);
         }
     }
@@ -19670,7 +19670,7 @@ bool Player::BuyItemFromVendorSlot(uint64 vendorguid, uint32 vendorslot, uint32
                 it->SetPaidMoney(price);
                 it->SetPaidExtendedCost(crItem->GetExtendedCostId());
                 it->SaveRefundDataToDB();
-                AddRefundReference(it->GetGUID());
+                AddRefundReference(it->GetGUIDLow());
             }
         }
     }
@@ -19728,7 +19728,7 @@ bool Player::BuyItemFromVendorSlot(uint64 vendorguid, uint32 vendorslot, uint32
                 it->SetPaidMoney(price);
                 it->SetPaidExtendedCost(crItem->GetExtendedCostId());
                 it->SaveRefundDataToDB();
-                AddRefundReference(it->GetGUID());
+                AddRefundReference(it->GetGUIDLow());
             }
         }
     }
@@ -23752,14 +23752,14 @@ void Player::SendDuelCountdown(uint32 counter)
     GetSession()->SendPacket(&data);
 }
 
-void Player::AddRefundReference(uint64 it)
+void Player::AddRefundReference(uint32 it)
 {
     m_refundableItems.insert(it);
 }
 
-void Player::DeleteRefundReference(uint64 it)
+void Player::DeleteRefundReference(uint32 it)
 {
-    std::set::iterator itr = m_refundableItems.find(it);
+    std::set::iterator itr = m_refundableItems.find(it);
     if (itr != m_refundableItems.end())
     {
         m_refundableItems.erase(itr);
diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h
index 3bff9808e9d..0025d9f55d0 100644
--- a/src/server/game/Entities/Player/Player.h
+++ b/src/server/game/Entities/Player/Player.h
@@ -1137,8 +1137,8 @@ class Player : public Unit, public GridObject
         uint8 _CanTakeMoreSimilarItems(uint32 entry, uint32 count, Item* pItem, uint32* no_space_count = NULL) const;
         uint8 _CanStoreItem(uint8 bag, uint8 slot, ItemPosCountVec& dest, uint32 entry, uint32 count, Item *pItem = NULL, bool swap = false, uint32* no_space_count = NULL) const;
 
-        void AddRefundReference(uint64 it);
-        void DeleteRefundReference(uint64 it);
+        void AddRefundReference(uint32 it);
+        void DeleteRefundReference(uint32 it);
 
         void ApplyEquipCooldown(Item * pItem);
         void SetAmmo(uint32 item);
@@ -2535,7 +2535,7 @@ class Player : public Unit, public GridObject
         uint8 _CanStoreItem_InInventorySlots(uint8 slot_begin, uint8 slot_end, ItemPosCountVec& dest, ItemPrototype const *pProto, uint32& count, bool merge, Item *pSrcItem, uint8 skip_bag, uint8 skip_slot) const;
         Item* _StoreItem(uint16 pos, Item *pItem, uint32 count, bool clone, bool update);
 
-        std::set m_refundableItems;
+        std::set m_refundableItems;
         void SendRefundInfo(Item* item);
         void RefundItem(Item* item);
 
-- 
cgit v1.2.3


From d54b534dca7d65c19db549194c288e26049ff22d Mon Sep 17 00:00:00 2001
From: Machiavelli 
Date: Fri, 25 Jun 2010 01:30:06 +0200
Subject: Small cleanup in Master class, thanks to 41782992@qq.com Closes issue
 #2793

--HG--
branch : trunk
---
 src/server/worldserver/Master.cpp | 30 ++++--------------------------
 src/server/worldserver/Master.h   |  1 -
 2 files changed, 4 insertions(+), 27 deletions(-)

(limited to 'src')

diff --git a/src/server/worldserver/Master.cpp b/src/server/worldserver/Master.cpp
index fb2d828e284..f6f4260e303 100644
--- a/src/server/worldserver/Master.cpp
+++ b/src/server/worldserver/Master.cpp
@@ -54,11 +54,6 @@
 extern int m_ServiceStatus;
 #endif
 
-/// \todo Warning disabling not useful under VC++2005. Can somebody say on which compiler it is useful?
-#pragma warning(disable:4305)
-
-volatile uint32 Master::m_masterLoopCounter = 0;
-
 /// Handle cored's termination signals
 class CoredSignalHandler : public Trinity::SignalHandler
 {
@@ -91,42 +86,25 @@ public:
     void SetDelayTime(uint32 t) { _delaytime = t; }
     void run(void)
     {
-        if(!_delaytime)
+        if (!_delaytime)
             return;
         sLog.outString("Starting up anti-freeze thread (%u seconds max stuck time)...",_delaytime/1000);
         m_loops = 0;
         w_loops = 0;
         m_lastchange = 0;
         w_lastchange = 0;
-        while(!World::IsStopped())
+        while (!World::IsStopped())
         {
             ACE_Based::Thread::Sleep(1000);
             uint32 curtime = getMSTime();
-            //DEBUG_LOG("anti-freeze: time=%u, counters=[%u; %u]",curtime,Master::m_masterLoopCounter,World::m_worldLoopCounter);
-
-            // There is no Master anymore
-            // TODO: clear the rest of the code
-//            // normal work
-//            if(m_loops != Master::m_masterLoopCounter)
-//            {
-//                m_lastchange = curtime;
-//                m_loops = Master::m_masterLoopCounter;
-//            }
-//            // possible freeze
-//            else if(getMSTimeDiff(m_lastchange,curtime) > _delaytime)
-//            {
-//                sLog.outError("Main/Sockets Thread hangs, kicking out server!");
-//                *((uint32 volatile*)NULL) = 0;                       // bang crash
-//            }
-
             // normal work
-            if(w_loops != World::m_worldLoopCounter)
+            if (w_loops != World::m_worldLoopCounter)
             {
                 w_lastchange = curtime;
                 w_loops = World::m_worldLoopCounter;
             }
             // possible freeze
-            else if(getMSTimeDiff(w_lastchange,curtime) > _delaytime)
+            else if (getMSTimeDiff(w_lastchange,curtime) > _delaytime)
             {
                 sLog.outError("World Thread hangs, kicking out server!");
                 *((uint32 volatile*)NULL) = 0;                       // bang crash
diff --git a/src/server/worldserver/Master.h b/src/server/worldserver/Master.h
index 00628827e2a..e8105705435 100644
--- a/src/server/worldserver/Master.h
+++ b/src/server/worldserver/Master.h
@@ -34,7 +34,6 @@ class Master
         Master();
         ~Master();
         int Run();
-        static volatile uint32 m_masterLoopCounter;
 
     private:
         bool _StartDB();
-- 
cgit v1.2.3


From 456c6291ab70f2f3182a4d63408c45099eedbbdd Mon Sep 17 00:00:00 2001
From: Shauren 
Date: Fri, 25 Jun 2010 13:15:51 +0200
Subject: Move trade data to dynamic structure and added support for applying
 enchant after trade ends, based on Vladimir's commits

--HG--
branch : trunk
---
 src/server/game/Entities/Player/Player.cpp         | 150 +++++--
 src/server/game/Entities/Player/Player.h           |  65 ++-
 src/server/game/Miscellaneous/SharedDefines.h      |  27 ++
 .../game/Server/Protocol/Handlers/TradeHandler.cpp | 499 ++++++++++++---------
 src/server/game/Server/WorldSession.h              |   4 +-
 src/server/game/Spells/Spell.cpp                   |  77 +++-
 src/server/game/Spells/Spell.h                     |   1 +
 7 files changed, 552 insertions(+), 271 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 543aeffd52e..83fa4fa34fe 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -280,6 +280,105 @@ std::ostringstream& operator<< (std::ostringstream& ss, PlayerTaxi const& taxi)
     return ss;
 }
 
+//== TradeData =================================================
+
+TradeData* TradeData::GetTraderData() const
+{
+    return m_trader->GetTradeData();
+}
+
+Item* TradeData::GetItem(TradeSlots slot) const
+{
+    return m_items[slot] ? m_player->GetItemByGuid(m_items[slot]) : NULL;
+}
+
+bool TradeData::HasItem(uint64 item_guid) const
+{
+    for(uint8 i = 0; i < TRADE_SLOT_COUNT; ++i)
+        if (m_items[i] == item_guid)
+            return true;
+
+    return false;
+}
+
+Item* TradeData::GetSpellCastItem() const
+{
+    return m_spellCastItem ? m_player->GetItemByGuid(m_spellCastItem) : NULL;
+}
+
+void TradeData::SetItem(TradeSlots slot, Item* item)
+{
+    uint64 itemGuid = item ? item->GetGUID() : 0;
+
+    if (m_items[slot] == itemGuid)
+        return;
+
+    m_items[slot] = itemGuid;
+
+    SetAccepted(false);
+    GetTraderData()->SetAccepted(false);
+
+    Update();
+
+    // need remove possible trader spell applied to changed item
+    if (slot == TRADE_SLOT_NONTRADED)
+        GetTraderData()->SetSpell(0);
+
+    // need remove possible player spell applied (possible move reagent)
+    SetSpell(0);
+}
+
+void TradeData::SetSpell(uint32 spell_id, Item* castItem /*= NULL*/)
+{
+    uint64 itemGuid = castItem ? castItem->GetGUID() : 0;
+
+    if (m_spell == spell_id && m_spellCastItem == itemGuid)
+        return;
+
+    m_spell = spell_id;
+    m_spellCastItem = itemGuid;
+
+    SetAccepted(false);
+    GetTraderData()->SetAccepted(false);
+
+    Update(true);                                           // send spell info to item owner
+    Update(false);                                          // send spell info to caster self
+}
+
+void TradeData::SetMoney(uint32 money)
+{
+    if (m_money == money)
+        return;
+
+    m_money = money;
+
+    SetAccepted(false);
+    GetTraderData()->SetAccepted(false);
+
+    Update(true);
+}
+
+void TradeData::Update(bool forTarget /*= true*/)
+{
+    if (forTarget)
+        m_trader->GetSession()->SendUpdateTrade(true);      // player state for trader
+    else
+        m_player->GetSession()->SendUpdateTrade(false);     // player state for player
+}
+
+void TradeData::SetAccepted(bool state, bool crosssend /*= false*/)
+{
+    m_accepted = state;
+
+    if (!state)
+    {
+        if (crosssend)
+            m_trader->GetSession()->SendTradeStatus(TRADE_STATUS_BACK_TO_TRADE);
+        else
+            m_player->GetSession()->SendTradeStatus(TRADE_STATUS_BACK_TO_TRADE);
+    }
+}
+
 // == Player ====================================================
 
 UpdateMask Player::updateVisualBits;
@@ -354,8 +453,7 @@ Player::Player (WorldSession *session): Unit(), m_achievementMgr(this), m_reputa
     m_bHasDelayedTeleport = false;
     m_teleport_options = 0;
 
-    pTrader = 0;
-    ClearTrade();
+    m_trade = NULL;
 
     m_cinematic = 0;
 
@@ -9539,7 +9637,7 @@ bool Player::HasItemCount(uint32 item, uint32 count, bool inBankAlso) const
     for (uint8 i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_ITEM_END; i++)
     {
         Item *pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i);
-        if (pItem && pItem->GetEntry() == item)
+        if (pItem && pItem->GetEntry() == item && !pItem->IsInTrade())
         {
             tempcount += pItem->GetCount();
             if (tempcount >= count)
@@ -9549,7 +9647,7 @@ bool Player::HasItemCount(uint32 item, uint32 count, bool inBankAlso) const
     for (uint8 i = KEYRING_SLOT_START; i < CURRENCYTOKEN_SLOT_END; ++i)
     {
         Item *pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i);
-        if (pItem && pItem->GetEntry() == item)
+        if (pItem && pItem->GetEntry() == item && !pItem->IsInTrade())
         {
             tempcount += pItem->GetCount();
             if (tempcount >= count)
@@ -9563,7 +9661,7 @@ bool Player::HasItemCount(uint32 item, uint32 count, bool inBankAlso) const
             for (uint32 j = 0; j < pBag->GetBagSize(); j++)
             {
                 Item* pItem = GetItemByPos(i, j);
-                if (pItem && pItem->GetEntry() == item)
+                if (pItem && pItem->GetEntry() == item && !pItem->IsInTrade())
                 {
                     tempcount += pItem->GetCount();
                     if (tempcount >= count)
@@ -9578,7 +9676,7 @@ bool Player::HasItemCount(uint32 item, uint32 count, bool inBankAlso) const
         for (uint8 i = BANK_SLOT_ITEM_START; i < BANK_SLOT_ITEM_END; i++)
         {
             Item *pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i);
-            if (pItem && pItem->GetEntry() == item)
+            if (pItem && pItem->GetEntry() == item && !pItem->IsInTrade())
             {
                 tempcount += pItem->GetCount();
                 if (tempcount >= count)
@@ -9592,7 +9690,7 @@ bool Player::HasItemCount(uint32 item, uint32 count, bool inBankAlso) const
                 for (uint32 j = 0; j < pBag->GetBagSize(); j++)
                 {
                     Item* pItem = GetItemByPos(i, j);
-                    if (pItem && pItem->GetEntry() == item)
+                    if (pItem && pItem->GetEntry() == item && !pItem->IsInTrade())
                     {
                         tempcount += pItem->GetCount();
                         if (tempcount >= count)
@@ -11813,7 +11911,7 @@ void Player::DestroyItemCount(uint32 item, uint32 count, bool update, bool unequ
     {
         if (Item* pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i))
         {
-            if (pItem->GetEntry() == item)
+            if (pItem->GetEntry() == item && !pItem->IsInTrade())
             {
                 if (pItem->GetCount() + remcount <= count)
                 {
@@ -11841,7 +11939,7 @@ void Player::DestroyItemCount(uint32 item, uint32 count, bool update, bool unequ
     {
         if (Item* pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i))
         {
-            if (pItem->GetEntry() == item)
+            if (pItem->GetEntry() == item && !pItem->IsInTrade())
             {
                 if (pItem->GetCount() + remcount <= count)
                 {
@@ -11874,7 +11972,7 @@ void Player::DestroyItemCount(uint32 item, uint32 count, bool update, bool unequ
             {
                 if (Item* pItem = pBag->GetItemByPos(j))
                 {
-                    if (pItem->GetEntry() == item)
+                    if (pItem->GetEntry() == item && !pItem->IsInTrade())
                     {
                         // all items in bags can be unequipped
                         if (pItem->GetCount() + remcount <= count)
@@ -11905,7 +12003,7 @@ void Player::DestroyItemCount(uint32 item, uint32 count, bool update, bool unequ
     {
         if (Item* pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i))
         {
-            if (pItem && pItem->GetEntry() == item)
+            if (pItem && pItem->GetEntry() == item && !pItem->IsInTrade())
             {
                 if (pItem->GetCount() + remcount <= count)
                 {
@@ -12663,33 +12761,23 @@ void Player::SendSellError(uint8 msg, Creature* pCreature, uint64 guid, uint32 p
     GetSession()->SendPacket(&data);
 }
 
-void Player::ClearTrade()
-{
-    tradeGold = 0;
-    acceptTrade = false;
-    for (uint8 i = 0; i < TRADE_SLOT_COUNT; i++)
-        tradeItems[i] = 0;
-}
-
 void Player::TradeCancel(bool sendback)
 {
-    if (pTrader)
+    if (m_trade)
     {
+        Player* trader = m_trade->GetTrader();
+
         // send yellow "Trade canceled" message to both traders
-        WorldSession* ws;
-        ws = GetSession();
         if (sendback)
-            ws->SendCancelTrade();
-        ws = pTrader->GetSession();
-        if (!ws->PlayerLogout())
-            ws->SendCancelTrade();
+            GetSession()->SendCancelTrade();
+
+        trader->GetSession()->SendCancelTrade();
 
         // cleanup
-        ClearTrade();
-        pTrader->ClearTrade();
-        // prevent loss of reference
-        pTrader->pTrader = NULL;
-        pTrader = NULL;
+        delete m_trade;
+        m_trade = NULL;
+        delete trader->m_trade;
+        trader->m_trade = NULL;
     }
 }
 
diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h
index 0025d9f55d0..99584b5bf64 100644
--- a/src/server/game/Entities/Player/Player.h
+++ b/src/server/game/Entities/Player/Player.h
@@ -920,6 +920,55 @@ struct BGData
     bool HasTaxiPath() const { return taxiPath[0] && taxiPath[1]; }
 };
 
+class TradeData
+{
+    public:                                                 // constructors
+        TradeData(Player* player, Player* trader) :
+            m_player(player),  m_trader(trader), m_accepted(false), m_acceptProccess(false),
+            m_money(0), m_spell(0) {}
+
+        Player* GetTrader() const { return m_trader; }
+        TradeData* GetTraderData() const;
+
+        Item* GetItem(TradeSlots slot) const;
+        bool HasItem(uint64 item_guid) const;
+        void SetItem(TradeSlots slot, Item* item);
+
+        uint32 GetSpell() const { return m_spell; }
+        void SetSpell(uint32 spell_id, Item* castItem = NULL);
+
+        Item*  GetSpellCastItem() const;
+        bool HasSpellCastItem() const { return m_spellCastItem != 0; }
+
+        uint32 GetMoney() const { return m_money; }
+        void SetMoney(uint32 money);
+
+        bool IsAccepted() const { return m_accepted; }
+        void SetAccepted(bool state, bool crosssend = false);
+
+        bool IsInAcceptProcess() const { return m_acceptProccess; }
+        void SetInAcceptProcess(bool state) { m_acceptProccess = state; }
+
+    private:                                                // internal functions
+
+        void Update(bool for_trader = true);
+
+    private:                                                // fields
+
+        Player*    m_player;                                // Player who own of this TradeData
+        Player*    m_trader;                                // Player who trade with m_player
+
+        bool       m_accepted;                              // m_player press accept for trade list
+        bool       m_acceptProccess;                        // one from player/trader press accept and this processed
+
+        uint32     m_money;                                 // m_player place money to trade
+
+        uint32     m_spell;                                 // m_player apply spell to non-traded slot item
+        uint64     m_spellCastItem;                         // applied spell casted by item use
+
+        uint64     m_items[TRADE_SLOT_COUNT];               // traded itmes from m_player side including non-traded slot
+};
+
 class Player : public Unit, public GridObject
 {
     friend class WorldSession;
@@ -1191,15 +1240,10 @@ class Player : public Unit, public GridObject
         bool BuyItemFromVendorSlot(uint64 vendorguid, uint32 vendorslot, uint32 item, uint8 count, uint8 bag, uint8 slot);
 
         float GetReputationPriceDiscount(Creature const* pCreature) const;
-        Player* GetTrader() const { return pTrader; }
-        void ClearTrade();
+
+        Player* GetTrader() const { return m_trade ? m_trade->GetTrader() : NULL; }
+        TradeData* GetTradeData() const { return m_trade; }
         void TradeCancel(bool sendback);
-        Item *GetItemByTradeSlot(uint8 slot) const
-        {
-            if (slot < TRADE_SLOT_COUNT && tradeItems[slot])
-                return GetItemByGuid(tradeItems[slot]);
-            return NULL;
-        }
 
         void UpdateEnchantTime(uint32 time);
         void UpdateItemDuration(uint32 time, bool realtimeonly=false);
@@ -2460,10 +2504,7 @@ class Player : public Unit, public GridObject
 
         int m_cinematic;
 
-        Player *pTrader;
-        bool acceptTrade;
-        uint64 tradeItems[TRADE_SLOT_COUNT];
-        uint32 tradeGold;
+        TradeData* m_trade;
 
         bool   m_DailyQuestChanged;
         bool   m_WeeklyQuestChanged;
diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h
index 381114c6f38..a9ae3bc4cc0 100644
--- a/src/server/game/Miscellaneous/SharedDefines.h
+++ b/src/server/game/Miscellaneous/SharedDefines.h
@@ -2769,4 +2769,31 @@ enum SpellFamilyNames
     SPELLFAMILY_PET         = 17
 };
 
+enum TradeStatus
+{
+    TRADE_STATUS_BUSY           = 0,
+    TRADE_STATUS_BEGIN_TRADE    = 1,
+    TRADE_STATUS_OPEN_WINDOW    = 2,
+    TRADE_STATUS_TRADE_CANCELED = 3,
+    TRADE_STATUS_TRADE_ACCEPT   = 4,
+    TRADE_STATUS_BUSY_2         = 5,
+    TRADE_STATUS_NO_TARGET      = 6,
+    TRADE_STATUS_BACK_TO_TRADE  = 7,
+    TRADE_STATUS_TRADE_COMPLETE = 8,
+    // 9?
+    TRADE_STATUS_TARGET_TO_FAR  = 10,
+    TRADE_STATUS_WRONG_FACTION  = 11,
+    TRADE_STATUS_CLOSE_WINDOW   = 12,
+    // 13?
+    TRADE_STATUS_IGNORE_YOU     = 14,
+    TRADE_STATUS_YOU_STUNNED    = 15,
+    TRADE_STATUS_TARGET_STUNNED = 16,
+    TRADE_STATUS_YOU_DEAD       = 17,
+    TRADE_STATUS_TARGET_DEAD    = 18,
+    TRADE_STATUS_YOU_LOGOUT     = 19,
+    TRADE_STATUS_TARGET_LOGOUT  = 20,
+    TRADE_STATUS_TRIAL_ACCOUNT  = 21,                       // Trial accounts can not perform that action
+    TRADE_STATUS_ONLY_CONJURED  = 22                        // You can only trade conjured items... (cross realm BG related).
+};
+
 #endif
diff --git a/src/server/game/Server/Protocol/Handlers/TradeHandler.cpp b/src/server/game/Server/Protocol/Handlers/TradeHandler.cpp
index 448a6e0520d..6191b88587e 100644
--- a/src/server/game/Server/Protocol/Handlers/TradeHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/TradeHandler.cpp
@@ -27,37 +27,11 @@
 #include "Opcodes.h"
 #include "Player.h"
 #include "Item.h"
+#include "Spell.h"
 #include "SocialMgr.h"
 #include "Language.h"
 
-enum TradeStatus
-{
-    TRADE_STATUS_BUSY           = 0,
-    TRADE_STATUS_BEGIN_TRADE    = 1,
-    TRADE_STATUS_OPEN_WINDOW    = 2,
-    TRADE_STATUS_TRADE_CANCELED = 3,
-    TRADE_STATUS_TRADE_ACCEPT   = 4,
-    TRADE_STATUS_BUSY_2         = 5,
-    TRADE_STATUS_NO_TARGET      = 6,
-    TRADE_STATUS_BACK_TO_TRADE  = 7,
-    TRADE_STATUS_TRADE_COMPLETE = 8,
-    // 9?
-    TRADE_STATUS_TARGET_TO_FAR  = 10,
-    TRADE_STATUS_WRONG_FACTION  = 11,
-    TRADE_STATUS_CLOSE_WINDOW   = 12,
-    // 13?
-    TRADE_STATUS_IGNORE_YOU     = 14,
-    TRADE_STATUS_YOU_STUNNED    = 15,
-    TRADE_STATUS_TARGET_STUNNED = 16,
-    TRADE_STATUS_YOU_DEAD       = 17,
-    TRADE_STATUS_TARGET_DEAD    = 18,
-    TRADE_STATUS_YOU_LOGOUT     = 19,
-    TRADE_STATUS_TARGET_LOGOUT  = 20,
-    TRADE_STATUS_TRIAL_ACCOUNT  = 21,                       // Trial accounts can not perform that action
-    TRADE_STATUS_ONLY_CONJURED  = 22                        // You can only trade conjured items... (cross realm BG related).
-};
-
-void WorldSession::SendTradeStatus(uint32 status)
+void WorldSession::SendTradeStatus(TradeStatus status)
 {
     WorldPacket data;
 
@@ -106,68 +80,50 @@ void WorldSession::HandleBusyTradeOpcode(WorldPacket& /*recvPacket*/)
     // recvPacket.print_storage();
 }
 
-void WorldSession::SendUpdateTrade()
+void WorldSession::SendUpdateTrade(bool trader_data /*= true*/)
 {
-    Item *item = NULL;
+    TradeData* view_trade = trader_data ? _player->GetTradeData()->GetTraderData() : _player->GetTradeData();
 
-    if (!_player || !_player->pTrader)
-        return;
+    WorldPacket data(SMSG_TRADE_STATUS_EXTENDED, 1+4+4+4+4+4+7*(1+4+4+4+4+8+4+4+4+4+8+4+4+4+4+4+4));
+    data << uint8(trader_data);                             // 1 means traders data, 0 means own
+    data << uint32(0);                                      // added in 2.4.0, this value must be equal to value from TRADE_STATUS_OPEN_WINDOW status packet (different value for different players to block multiple trades?)
+    data << uint32(TRADE_SLOT_COUNT);                       // trade slots count/number?, = next field in most cases
+    data << uint32(TRADE_SLOT_COUNT);                       // trade slots count/number?, = prev field in most cases
+    data << uint32(view_trade->GetMoney());                 // trader gold
+    data << uint32(view_trade->GetSpell());                 // spell casted on lowest slot item
 
-    // reset trade status
-    if (_player->acceptTrade)
-    {
-        _player->acceptTrade = false;
-        SendTradeStatus(TRADE_STATUS_BACK_TO_TRADE);
-    }
-
-    if (_player->pTrader->acceptTrade)
-    {
-        _player->pTrader->acceptTrade = false;
-        _player->pTrader->GetSession()->SendTradeStatus(TRADE_STATUS_BACK_TO_TRADE);
-    }
-
-    WorldPacket data(SMSG_TRADE_STATUS_EXTENDED, (100));    // guess size
-    data << (uint8) 1;                                     // can be different (only seen 0 and 1)
-    data << (uint32) 0;                                     // added in 2.4.0, this value must be equal to value from TRADE_STATUS_OPEN_WINDOW status packet (different value for different players to block multiple trades?)
-    data << (uint32) TRADE_SLOT_COUNT;                      // trade slots count/number?, = next field in most cases
-    data << (uint32) TRADE_SLOT_COUNT;                      // trade slots count/number?, = prev field in most cases
-    data << (uint32) _player->pTrader->tradeGold;           // trader gold
-    data << (uint32) 0;                                     // spell casted on lowest slot item
+    Item *item = NULL;
 
     for (uint8 i = 0; i < TRADE_SLOT_COUNT; ++i)
     {
-        item = (_player->pTrader->tradeItems[i] != 0 ? _player->pTrader->GetItemByGuid(_player->pTrader->tradeItems[i]) : NULL);
+        data << uint8(i);                                  // trade slot number, if not specified, then end of packet
 
-        data << (uint8) i;                                  // trade slot number, if not specified, then end of packet
-
-        if (item)
+        if (Item* item = view_trade->GetItem(TradeSlots(i)))
         {
-            data << (uint32) item->GetProto()->ItemId;      // entry
-                                                            // display id
-            data << (uint32) item->GetProto()->DisplayInfoID;
-                                                            // stack count
-            data << (uint32) item->GetUInt32Value(ITEM_FIELD_STACK_COUNT);
-            data << (uint32) 0;                             // probably gift=1, created_by=0?
-                                                            // gift creator
-            data << (uint64) item->GetUInt64Value(ITEM_FIELD_GIFTCREATOR);
-            data << (uint32) item->GetEnchantmentId(PERM_ENCHANTMENT_SLOT);
-            for (uint8 j = 0; j < 3; ++j)
-                data << (uint32) 0;                         // enchantment id (permanent/gems?)
+            data << uint32(item->GetProto()->ItemId);       // entry
+            data << uint32(item->GetProto()->DisplayInfoID);// display id
+            data << uint32(item->GetCount());               // stack count
+                                                            // wrapped: hide stats but show giftcreator name
+            data << uint32(item->HasFlag(ITEM_FIELD_FLAGS, ITEM_FLAGS_WRAPPED) ? 1 : 0);
+            data << uint64(item->GetUInt64Value(ITEM_FIELD_GIFTCREATOR));
+                                                            // perm. enchantment and gems
+            data << uint32(item->GetEnchantmentId(PERM_ENCHANTMENT_SLOT));
+            for (uint32 enchant_slot = SOCK_ENCHANTMENT_SLOT; enchant_slot < SOCK_ENCHANTMENT_SLOT+MAX_GEM_SOCKETS; ++enchant_slot)
+                data << uint32(item->GetEnchantmentId(EnchantmentSlot(enchant_slot)));
                                                             // creator
-            data << (uint64) item->GetUInt64Value(ITEM_FIELD_CREATOR);
-            data << (uint32) item->GetSpellCharges();       // charges
-            data << (uint32) item->GetItemSuffixFactor();   // SuffixFactor
-                                                            // random properties id
-            data << (int32) item->GetItemRandomPropertyId();
-            data << (uint32) item->GetProto()->LockID;      // lock id
+            data << uint64(item->GetUInt64Value(ITEM_FIELD_CREATOR));
+            data << uint32(item->GetSpellCharges());        // charges
+            data << uint32(item->GetItemSuffixFactor());    // SuffixFactor
+            data << uint32(item->GetItemRandomPropertyId());// random properties id
+            data << uint32(item->GetProto()->LockID);       // lock id
                                                             // max durability
-            data << (uint32) item->GetUInt32Value(ITEM_FIELD_MAXDURABILITY);
+            data << uint32(item->GetUInt32Value(ITEM_FIELD_MAXDURABILITY));
                                                             // durability
-            data << (uint32) item->GetUInt32Value(ITEM_FIELD_DURABILITY);
+            data << uint32(item->GetUInt32Value(ITEM_FIELD_DURABILITY));
         }
         else
         {
-            for (uint8 j = 0; j < 18; j++)
+            for (uint8 j = 0; j < 18; ++j)
                 data << uint32(0);
         }
     }
@@ -179,11 +135,15 @@ void WorldSession::SendUpdateTrade()
 
 void WorldSession::moveItems(Item* myItems[], Item* hisItems[])
 {
-    for (int i=0; iGetTrader();
+    if (!trader)
+        return;
+
+    for (uint8 i = 0; i < TRADE_SLOT_TRADED_COUNT; ++i)
     {
         ItemPosCountVec traderDst;
         ItemPosCountVec playerDst;
-        bool traderCanTrade = (myItems[i] == NULL || _player->pTrader->CanStoreItem(NULL_BAG, NULL_SLOT, traderDst, myItems[i], false) == EQUIP_ERR_OK);
+        bool traderCanTrade = (myItems[i] == NULL || trader->CanStoreItem(NULL_BAG, NULL_SLOT, traderDst, myItems[i], false) == EQUIP_ERR_OK);
         bool playerCanTrade = (hisItems[i] == NULL || _player->CanStoreItem(NULL_BAG, NULL_SLOT, playerDst, hisItems[i], false) == EQUIP_ERR_OK);
         if (traderCanTrade && playerCanTrade)
         {
@@ -196,25 +156,25 @@ void WorldSession::moveItems(Item* myItems[], Item* hisItems[])
                 sLog.outDebug("partner storing: %u",myItems[i]->GetGUIDLow());
                 if (_player->GetSession()->GetSecurity() > SEC_PLAYER && sWorld.getConfig(CONFIG_GM_LOG_TRADE))
                 {
-                    sLog.outCommand(_player->GetSession()->GetAccountId(),"GM %s (Account: %u) trade: %s (Entry: %d Count: %u) to player: %s (Account: %u)",
-                        _player->GetName(),_player->GetSession()->GetAccountId(),
-                        myItems[i]->GetProto()->Name1,myItems[i]->GetEntry(),myItems[i]->GetCount(),
-                        _player->pTrader->GetName(),_player->pTrader->GetSession()->GetAccountId());
+                    sLog.outCommand(_player->GetSession()->GetAccountId(), "GM %s (Account: %u) trade: %s (Entry: %d Count: %u) to player: %s (Account: %u)",
+                        _player->GetName(), _player->GetSession()->GetAccountId(),
+                        myItems[i]->GetProto()->Name1, myItems[i]->GetEntry(), myItems[i]->GetCount(),
+                        trader->GetName(), trader->GetSession()->GetAccountId());
                 }
 
                 // store
-                _player->pTrader->MoveItemToInventory(traderDst, myItems[i], true, true);
+                trader->MoveItemToInventory(traderDst, myItems[i], true, true);
             }
             if (hisItems[i])
             {
                 // logging
                 sLog.outDebug("player storing: %u",hisItems[i]->GetGUIDLow());
-                if (_player->pTrader->GetSession()->GetSecurity() > SEC_PLAYER && sWorld.getConfig(CONFIG_GM_LOG_TRADE))
+                if (trader->GetSession()->GetSecurity() > SEC_PLAYER && sWorld.getConfig(CONFIG_GM_LOG_TRADE))
                 {
-                    sLog.outCommand(_player->pTrader->GetSession()->GetAccountId(),"GM %s (Account: %u) trade: %s (Entry: %d Count: %u) to player: %s (Account: %u)",
-                        _player->pTrader->GetName(),_player->pTrader->GetSession()->GetAccountId(),
-                        hisItems[i]->GetProto()->Name1,hisItems[i]->GetEntry(),hisItems[i]->GetCount(),
-                        _player->GetName(),_player->GetSession()->GetAccountId());
+                    sLog.outCommand(trader->GetSession()->GetAccountId(),"GM %s (Account: %u) trade: %s (Entry: %d Count: %u) to player: %s (Account: %u)",
+                        trader->GetName(), trader->GetSession()->GetAccountId(),
+                        hisItems[i]->GetProto()->Name1, hisItems[i]->GetEntry(), hisItems[i]->GetCount(),
+                        _player->GetName(), _player->GetSession()->GetAccountId());
                 }
 
                 // store
@@ -239,8 +199,8 @@ void WorldSession::moveItems(Item* myItems[], Item* hisItems[])
             {
                 if (!playerCanTrade)
                     sLog.outError("player can't store item: %u",hisItems[i]->GetGUIDLow());
-                if (_player->pTrader->CanStoreItem(NULL_BAG, NULL_SLOT, traderDst, hisItems[i], false) == EQUIP_ERR_OK)
-                    _player->pTrader->MoveItemToInventory(traderDst, hisItems[i], true, true);
+                if (trader->CanStoreItem(NULL_BAG, NULL_SLOT, traderDst, hisItems[i], false) == EQUIP_ERR_OK)
+                    trader->MoveItemToInventory(traderDst, hisItems[i], true, true);
                 else
                     sLog.outError("trader can't take item back: %u",hisItems[i]->GetGUIDLow());
             }
@@ -250,135 +210,231 @@ void WorldSession::moveItems(Item* myItems[], Item* hisItems[])
 
 //==============================================================
 
+static void setAcceptTradeMode(TradeData* myTrade, TradeData* hisTrade, Item **myItems, Item **hisItems)
+{
+    myTrade->SetInAcceptProcess(true);
+    hisTrade->SetInAcceptProcess(true);
+
+    // store items in local list and set 'in-trade' flag
+    for(uint8 i = 0; i < TRADE_SLOT_TRADED_COUNT; ++i)
+    {
+        if (Item* item = myTrade->GetItem(TradeSlots(i)))
+        {
+            DEBUG_LOG("player trade item %u bag: %u slot: %u", item->GetGUIDLow(), item->GetBagSlot(), item->GetSlot());
+            //Can return NULL
+            myItems[i] = item;
+            myItems[i]->SetInTrade();
+        }
+
+        if (Item* item = hisTrade->GetItem(TradeSlots(i)))
+        {
+            DEBUG_LOG("partner trade item %u bag: %u slot: %u", item->GetGUIDLow(), item->GetBagSlot(), item->GetSlot());
+            hisItems[i] = item;
+            hisItems[i]->SetInTrade();
+        }
+    }
+}
+
+static void clearAcceptTradeMode(TradeData* myTrade, TradeData* hisTrade)
+{
+    myTrade->SetInAcceptProcess(false);
+    hisTrade->SetInAcceptProcess(false);
+}
+
+static void clearAcceptTradeMode(Item **myItems, Item **hisItems)
+{
+    // clear 'in-trade' flag
+    for (uint8 i = 0; i < TRADE_SLOT_TRADED_COUNT; ++i)
+    {
+        if (myItems[i])
+            myItems[i]->SetInTrade(false);
+        if (hisItems[i])
+            hisItems[i]->SetInTrade(false);
+    }
+}
+
 void WorldSession::HandleAcceptTradeOpcode(WorldPacket& /*recvPacket*/)
 {
+    TradeData* my_trade = _player->m_trade;
+    if (!my_trade)
+        return;
+
+    Player* trader = my_trade->GetTrader();
+
+    TradeData* his_trade = trader->m_trade;
+    if (!his_trade)
+        return;
+
     Item *myItems[TRADE_SLOT_TRADED_COUNT]  = { NULL, NULL, NULL, NULL, NULL, NULL };
     Item *hisItems[TRADE_SLOT_TRADED_COUNT] = { NULL, NULL, NULL, NULL, NULL, NULL };
-    bool myCanCompleteTrade=true,hisCanCompleteTrade=true;
+    bool myCanCompleteTrade = true, hisCanCompleteTrade = true;
 
-    if (!GetPlayer()->pTrader)
-        return;
+    // set before checks for propertly undo at problems (it already set in to client)
+    my_trade->SetAccepted(true);
 
     // not accept case incorrect money amount
-    if (_player->tradeGold > _player->GetMoney())
+    if (my_trade->GetMoney() > _player->GetMoney())
     {
         SendNotification(LANG_NOT_ENOUGH_GOLD);
-        _player->pTrader->GetSession()->SendTradeStatus(TRADE_STATUS_BACK_TO_TRADE);
-        _player->acceptTrade = false;
+        my_trade->SetAccepted(false, true);
         return;
     }
 
     // not accept case incorrect money amount
-    if (_player->pTrader->tradeGold > _player->pTrader->GetMoney())
+    if (his_trade->GetMoney() > trader->GetMoney())
     {
-        _player->pTrader->GetSession()->SendNotification(LANG_NOT_ENOUGH_GOLD);
-        SendTradeStatus(TRADE_STATUS_BACK_TO_TRADE);
-        _player->pTrader->acceptTrade = false;
+        trader->GetSession()->SendNotification(LANG_NOT_ENOUGH_GOLD);
+        his_trade->SetAccepted(false, true);
         return;
     }
 
     // not accept if some items now can't be trade (cheating)
-    for (int i=0; itradeItems[i] != 0)
+        if (Item* item = my_trade->GetItem(TradeSlots(i)))
         {
-            if (Item* item  =_player->GetItemByGuid(_player->tradeItems[i]))
+            if (!item->CanBeTraded())
             {
-                if (!item->CanBeTraded())
-                {
-                    SendTradeStatus(TRADE_STATUS_TRADE_CANCELED);
-                    return;
-                }
+                SendTradeStatus(TRADE_STATUS_TRADE_CANCELED);
+                return;
             }
         }
-        if (_player->pTrader->tradeItems[i] != 0)
+
+        if (Item* item = his_trade->GetItem(TradeSlots(i)))
         {
-            if (Item* item  =_player->pTrader->GetItemByGuid(_player->pTrader->tradeItems[i]))
+            if (!item->CanBeTraded())
             {
-                if (!item->CanBeTraded())
-                {
-                    SendTradeStatus(TRADE_STATUS_TRADE_CANCELED);
-                    return;
-                }
+                SendTradeStatus(TRADE_STATUS_TRADE_CANCELED);
+                return;
             }
         }
     }
 
-    _player->acceptTrade = true;
-    if (_player->pTrader->acceptTrade)
+    if (his_trade->IsAccepted())
     {
-        // inform partner client
-        _player->pTrader->GetSession()->SendTradeStatus(TRADE_STATUS_TRADE_ACCEPT);
+        setAcceptTradeMode(my_trade, his_trade, myItems, hisItems);
+
+        Spell* my_spell = NULL;
+        SpellCastTargets my_targets;
+
+        Spell* his_spell = NULL;
+        SpellCastTargets his_targets;
 
-        // store items in local list and set 'in-trade' flag
-        for (int i=0; iGetSpell())
         {
-            if (_player->tradeItems[i] != 0)
+            SpellEntry const* spellEntry = sSpellStore.LookupEntry(my_spell_id);
+            Item* castItem = my_trade->GetSpellCastItem();
+
+            if (!spellEntry || !his_trade->GetItem(TRADE_SLOT_NONTRADED) ||
+                my_trade->HasSpellCastItem() && !castItem)
             {
-                                                            //Can return NULL
-                myItems[i] = _player->GetItemByGuid(_player->tradeItems[i]);
-                if (myItems[i])
-                {
-                    myItems[i]->SetInTrade();
-                    sLog.outDebug("Player trade item bag: %u slot: %u", myItems[i]->GetBagSlot(), myItems[i]->GetSlot());
-                }
+                clearAcceptTradeMode(my_trade, his_trade);
+                clearAcceptTradeMode(myItems, hisItems);
+
+                my_trade->SetSpell(0);
+                return;
             }
-            if (_player->pTrader->tradeItems[i] != 0)
+
+            my_spell = new Spell(_player, spellEntry, true);
+            my_spell->m_CastItem = castItem;
+            my_targets.setTradeItemTarget(_player);
+            my_spell->m_targets = my_targets;
+
+            SpellCastResult res = my_spell->CheckCast(true);
+            if (res != SPELL_CAST_OK)
             {
-                                                            //Can return NULL
-                hisItems[i]=_player->pTrader->GetItemByGuid(_player->pTrader->tradeItems[i]);
-                if (hisItems[i])
-                {
-                    hisItems[i]->SetInTrade();
-                    sLog.outDebug("Player trade item bag: %u slot: %u", hisItems[i]->GetBagSlot(), hisItems[i]->GetSlot());
-                }
+                my_spell->SendCastResult(res);
+
+                clearAcceptTradeMode(my_trade, his_trade);
+                clearAcceptTradeMode(myItems, hisItems);
+
+                delete my_spell;
+                my_trade->SetSpell(0);
+                return;
             }
         }
 
-        // test if item will fit in each inventory
-        hisCanCompleteTrade =  (_player->pTrader->CanStoreItems(myItems,TRADE_SLOT_TRADED_COUNT) == EQUIP_ERR_OK);
-        myCanCompleteTrade = (_player->CanStoreItems(hisItems,TRADE_SLOT_TRADED_COUNT) == EQUIP_ERR_OK);
-
-        // clear 'in-trade' flag
-        for (int i=0; iGetSpell())
         {
-            if (myItems[i])  myItems[i]->SetInTrade(false);
-            if (hisItems[i]) hisItems[i]->SetInTrade(false);
+            SpellEntry const* spellEntry = sSpellStore.LookupEntry(his_spell_id);
+            Item* castItem = his_trade->GetSpellCastItem();
+
+            if (!spellEntry || !my_trade->GetItem(TRADE_SLOT_NONTRADED) || his_trade->HasSpellCastItem() && !castItem)
+            {
+                delete my_spell;
+                his_trade->SetSpell(0);
+
+                clearAcceptTradeMode(my_trade, his_trade);
+                clearAcceptTradeMode(myItems, hisItems);
+                return;
+            }
+
+            his_spell = new Spell(trader, spellEntry, true);
+            his_spell->m_CastItem = castItem;
+            his_targets.setTradeItemTarget(trader);
+            his_spell->m_targets = his_targets;
+
+            SpellCastResult res = his_spell->CheckCast(true);
+            if (res != SPELL_CAST_OK)
+            {
+                his_spell->SendCastResult(res);
+
+                clearAcceptTradeMode(my_trade, his_trade);
+                clearAcceptTradeMode(myItems, hisItems);
+
+                delete my_spell;
+                delete his_spell;
+
+                his_trade->SetSpell(0);
+                return;
+            }
         }
 
+        // inform partner client
+        trader->GetSession()->SendTradeStatus(TRADE_STATUS_TRADE_ACCEPT);
+
+        // test if item will fit in each inventory
+        hisCanCompleteTrade =  (trader->CanStoreItems(myItems, TRADE_SLOT_TRADED_COUNT) == EQUIP_ERR_OK);
+        myCanCompleteTrade = (_player->CanStoreItems(hisItems, TRADE_SLOT_TRADED_COUNT) == EQUIP_ERR_OK);
+
+        clearAcceptTradeMode(myItems, hisItems);
+
         // in case of missing space report error
         if (!myCanCompleteTrade)
         {
+            clearAcceptTradeMode(my_trade, his_trade);
+
             SendNotification(LANG_NOT_FREE_TRADE_SLOTS);
-            GetPlayer()->pTrader->GetSession()->SendNotification(LANG_NOT_PARTNER_FREE_TRADE_SLOTS);
-            SendTradeStatus(TRADE_STATUS_BACK_TO_TRADE);
-            _player->pTrader->GetSession()->SendTradeStatus(TRADE_STATUS_BACK_TO_TRADE);
+            trader->GetSession()->SendNotification(LANG_NOT_PARTNER_FREE_TRADE_SLOTS);
+            my_trade->SetAccepted(false);
+            his_trade->SetAccepted(false);
             return;
         }
         else if (!hisCanCompleteTrade)
         {
+            clearAcceptTradeMode(my_trade, his_trade);
+
             SendNotification(LANG_NOT_PARTNER_FREE_TRADE_SLOTS);
-            GetPlayer()->pTrader->GetSession()->SendNotification(LANG_NOT_FREE_TRADE_SLOTS);
-            SendTradeStatus(TRADE_STATUS_BACK_TO_TRADE);
-            _player->pTrader->GetSession()->SendTradeStatus(TRADE_STATUS_BACK_TO_TRADE);
+            trader->GetSession()->SendNotification(LANG_NOT_FREE_TRADE_SLOTS);
+            my_trade->SetAccepted(false);
+            his_trade->SetAccepted(false);
             return;
         }
 
         // execute trade: 1. remove
-        for (int i=0; iSetUInt64Value(ITEM_FIELD_GIFTCREATOR, _player->GetGUID());
-                iPtr = _player->GetItemByGuid(_player->tradeItems[i]);
-                _player->MoveItemFromInventory(iPtr->GetBagSlot(), iPtr->GetSlot(), true);
+                _player->MoveItemFromInventory(myItems[i]->GetBagSlot(), myItems[i]->GetSlot(), true);
             }
             if (hisItems[i])
             {
-                hisItems[i]->SetUInt64Value(ITEM_FIELD_GIFTCREATOR,_player->pTrader->GetGUID());
-                iPtr = _player->pTrader->GetItemByGuid(_player->pTrader->tradeItems[i]);
-                _player->pTrader->MoveItemFromInventory(iPtr->GetBagSlot(), iPtr->GetSlot(), true);
+                hisItems[i]->SetUInt64Value(ITEM_FIELD_GIFTCREATOR, trader->GetGUID());
+                trader->MoveItemFromInventory(hisItems[i]->GetBagSlot(), hisItems[i]->GetSlot(), true);
             }
         }
 
@@ -388,72 +444,80 @@ void WorldSession::HandleAcceptTradeOpcode(WorldPacket& /*recvPacket*/)
         // logging money
         if (sWorld.getConfig(CONFIG_GM_LOG_TRADE))
         {
-            if (_player->GetSession()->GetSecurity() > SEC_PLAYER && _player->tradeGold > 0)
+            if (_player->GetSession()->GetSecurity() > SEC_PLAYER && my_trade->GetMoney() > 0)
             {
                 sLog.outCommand(_player->GetSession()->GetAccountId(),"GM %s (Account: %u) give money (Amount: %u) to player: %s (Account: %u)",
-                    _player->GetName(),_player->GetSession()->GetAccountId(),
-                    _player->tradeGold,
-                    _player->pTrader->GetName(),_player->pTrader->GetSession()->GetAccountId());
+                    _player->GetName(), _player->GetSession()->GetAccountId(),
+                    my_trade->GetMoney(),
+                    trader->GetName(), trader->GetSession()->GetAccountId());
             }
-            if (_player->pTrader->GetSession()->GetSecurity() > SEC_PLAYER && _player->pTrader->tradeGold > 0)
+            if (trader->GetSession()->GetSecurity() > SEC_PLAYER && his_trade->GetMoney() > 0)
             {
-                sLog.outCommand(_player->pTrader->GetSession()->GetAccountId(),"GM %s (Account: %u) give money (Amount: %u) to player: %s (Account: %u)",
-                    _player->pTrader->GetName(),_player->pTrader->GetSession()->GetAccountId(),
-                    _player->pTrader->tradeGold,
-                    _player->GetName(),_player->GetSession()->GetAccountId());
+                sLog.outCommand(trader->GetSession()->GetAccountId(),"GM %s (Account: %u) give money (Amount: %u) to player: %s (Account: %u)",
+                    trader->GetName(), trader->GetSession()->GetAccountId(),
+                    his_trade->GetMoney(),
+                    _player->GetName(), _player->GetSession()->GetAccountId());
             }
         }
 
         // update money
-        _player->ModifyMoney(-int32(_player->tradeGold));
-        _player->ModifyMoney(_player->pTrader->tradeGold);
-        _player->pTrader->ModifyMoney(-int32(_player->pTrader->tradeGold));
-        _player->pTrader->ModifyMoney(_player->tradeGold);
+        _player->ModifyMoney(-int32(my_trade->GetMoney()));
+        _player->ModifyMoney(his_trade->GetMoney());
+        trader->ModifyMoney(-int32(his_trade->GetMoney()));
+        trader->ModifyMoney(my_trade->GetMoney());
+
+        if (my_spell)
+            my_spell->prepare(&my_targets);
+
+        if (his_spell)
+            his_spell->prepare(&his_targets);
 
-        _player->ClearTrade();
-        _player->pTrader->ClearTrade();
+        // cleanup
+        clearAcceptTradeMode(my_trade, his_trade);
+        delete _player->m_trade;
+        _player->m_trade = NULL;
+        delete trader->m_trade;
+        trader->m_trade = NULL;
 
         // desynchronized with the other saves here (SaveInventoryAndGoldToDB() not have own transaction guards)
         CharacterDatabase.BeginTransaction();
         _player->SaveInventoryAndGoldToDB();
-        _player->pTrader->SaveInventoryAndGoldToDB();
+        trader->SaveInventoryAndGoldToDB();
         CharacterDatabase.CommitTransaction();
 
-        _player->pTrader->GetSession()->SendTradeStatus(TRADE_STATUS_TRADE_COMPLETE);
+        trader->GetSession()->SendTradeStatus(TRADE_STATUS_TRADE_COMPLETE);
         SendTradeStatus(TRADE_STATUS_TRADE_COMPLETE);
-
-        _player->pTrader->pTrader = NULL;
-        _player->pTrader = NULL;
     }
     else
     {
-        _player->pTrader->GetSession()->SendTradeStatus(TRADE_STATUS_TRADE_ACCEPT);
+        trader->GetSession()->SendTradeStatus(TRADE_STATUS_TRADE_ACCEPT);
     }
 }
 
 void WorldSession::HandleUnacceptTradeOpcode(WorldPacket& /*recvPacket*/)
 {
-    if (!GetPlayer()->pTrader)
+    TradeData* my_trade = _player->GetTradeData();
+    if (!my_trade)
         return;
 
-    _player->pTrader->GetSession()->SendTradeStatus(TRADE_STATUS_BACK_TO_TRADE);
-    _player->acceptTrade = false;
+    my_trade->SetAccepted(false, true);
 }
 
 void WorldSession::HandleBeginTradeOpcode(WorldPacket& /*recvPacket*/)
 {
-    if (!_player->pTrader)
+    TradeData* my_trade = _player->m_trade;
+    if (!my_trade)
         return;
 
-    _player->pTrader->GetSession()->SendTradeStatus(TRADE_STATUS_OPEN_WINDOW);
-    _player->pTrader->ClearTrade();
-
+    my_trade->GetTrader()->GetSession()->SendTradeStatus(TRADE_STATUS_OPEN_WINDOW);
     SendTradeStatus(TRADE_STATUS_OPEN_WINDOW);
-    _player->ClearTrade();
 }
 
 void WorldSession::SendCancelTrade()
 {
+    if (m_playerRecentlyLogout)
+        return;
+
     SendTradeStatus(TRADE_STATUS_TRADE_CANCELED);
 }
 
@@ -466,7 +530,7 @@ void WorldSession::HandleCancelTradeOpcode(WorldPacket& /*recvPacket*/)
 
 void WorldSession::HandleInitiateTradeOpcode(WorldPacket& recvPacket)
 {
-    if (GetPlayer()->pTrader)
+    if (GetPlayer()->m_trade)
         return;
 
     uint64 ID;
@@ -511,7 +575,7 @@ void WorldSession::HandleInitiateTradeOpcode(WorldPacket& recvPacket)
         return;
     }
 
-    if (pOther == GetPlayer() || pOther->pTrader)
+    if (pOther == GetPlayer() || pOther->m_trade)
     {
         SendTradeStatus(TRADE_STATUS_BUSY);
         return;
@@ -566,35 +630,30 @@ void WorldSession::HandleInitiateTradeOpcode(WorldPacket& recvPacket)
     }
 
     // OK start trade
-    _player->pTrader = pOther;
-    pOther->pTrader =_player;
+    _player->m_trade = new TradeData(_player, pOther);
+    pOther->m_trade = new TradeData(pOther, _player);
 
     WorldPacket data(SMSG_TRADE_STATUS, 12);
-    data << (uint32) TRADE_STATUS_BEGIN_TRADE;
-    data << (uint64)_player->GetGUID();
-    _player->pTrader->GetSession()->SendPacket(&data);
+    data << uint32(TRADE_STATUS_BEGIN_TRADE);
+    data << uint64(_player->GetGUID());
+    pOther->GetSession()->SendPacket(&data);
 }
 
 void WorldSession::HandleSetTradeGoldOpcode(WorldPacket& recvPacket)
 {
-    if (!_player->pTrader)
-        return;
-
     uint32 gold;
-
     recvPacket >> gold;
 
-    // gold can be incorrect, but this is checked at trade finished.
-    _player->tradeGold = gold;
+    TradeData* my_trade = _player->GetTradeData();
+    if (!my_trade)
+        return;
 
-    _player->pTrader->GetSession()->SendUpdateTrade();
+    // gold can be incorrect, but this is checked at trade finished.
+    my_trade->SetMoney(gold);
 }
 
 void WorldSession::HandleSetTradeItemOpcode(WorldPacket& recvPacket)
 {
-    if (!_player->pTrader)
-        return;
-
     // send update
     uint8 tradeSlot;
     uint8 bag;
@@ -604,6 +663,10 @@ void WorldSession::HandleSetTradeItemOpcode(WorldPacket& recvPacket)
     recvPacket >> bag;
     recvPacket >> slot;
 
+    TradeData* my_trade = _player->GetTradeData();
+    if (!my_trade)
+        return;
+
     // invalid slot number
     if (tradeSlot >= TRADE_SLOT_COUNT)
     {
@@ -612,7 +675,7 @@ void WorldSession::HandleSetTradeItemOpcode(WorldPacket& recvPacket)
     }
 
     // check cheating, can't fail with correct client operations
-    Item* item = _player->GetItemByPos(bag,slot);
+    Item* item = _player->GetItemByPos(bag, slot);
     if (!item || (tradeSlot != TRADE_SLOT_NONTRADED && !item->CanBeTraded()))
     {
         SendTradeStatus(TRADE_STATUS_TRADE_CANCELED);
@@ -622,35 +685,29 @@ void WorldSession::HandleSetTradeItemOpcode(WorldPacket& recvPacket)
     uint64 iGUID = item->GetGUID();
 
     // prevent place single item into many trade slots using cheating and client bugs
-    for (int i = 0; i < TRADE_SLOT_COUNT; ++i)
+    if (my_trade->HasItem(iGUID))
     {
-        if (_player->tradeItems[i] == iGUID)
-        {
-            // cheating attempt
-            SendTradeStatus(TRADE_STATUS_TRADE_CANCELED);
-            return;
-        }
+        // cheating attempt
+        SendTradeStatus(TRADE_STATUS_TRADE_CANCELED);
+        return;
     }
 
-    _player->tradeItems[tradeSlot] = iGUID;
-
-    _player->pTrader->GetSession()->SendUpdateTrade();
+    my_trade->SetItem(TradeSlots(tradeSlot), item);
 }
 
 void WorldSession::HandleClearTradeItemOpcode(WorldPacket& recvPacket)
 {
-    if (!_player->pTrader)
-        return;
-
     uint8 tradeSlot;
     recvPacket >> tradeSlot;
 
+    TradeData* my_trade = _player->m_trade;
+    if (!my_trade)
+        return;
+
     // invalid slot number
     if (tradeSlot >= TRADE_SLOT_COUNT)
         return;
 
-    _player->tradeItems[tradeSlot] = 0;
-
-    _player->pTrader->GetSession()->SendUpdateTrade();
+    my_trade->SetItem(TradeSlots(tradeSlot), NULL);
 }
 
diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h
index c17f3e3f3e6..dbcc94f071b 100644
--- a/src/server/game/Server/WorldSession.h
+++ b/src/server/game/Server/WorldSession.h
@@ -205,12 +205,12 @@ class WorldSession
 
         void SendBattlegGroundList(uint64 guid, BattleGroundTypeId bgTypeId);
 
-        void SendTradeStatus(uint32 status);
+        void SendTradeStatus(TradeStatus status);
         void SendCancelTrade();
 
         void SendStablePet(uint64 guid);
         void SendPetitionQueryOpcode(uint64 petitionguid);
-        void SendUpdateTrade();
+        void SendUpdateTrade(bool trader_data = true);
 
         //pet
         void SendPetNameQuery(uint64 guid, uint32 petnumber);
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
index a62e602fe49..bf00f54b110 100644
--- a/src/server/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
@@ -148,6 +148,15 @@ void SpellCastTargets::setItemTarget(Item* item)
     m_targetMask |= TARGET_FLAG_ITEM;
 }
 
+void SpellCastTargets::setTradeItemTarget(Player* caster)
+{
+    m_itemTargetGUID = uint64(TRADE_SLOT_NONTRADED);
+    m_itemTargetEntry = 0;
+    m_targetMask |= TARGET_FLAG_TRADE_ITEM;
+
+    Update(caster);
+}
+
 void SpellCastTargets::setCorpseTarget(Corpse* corpse)
 {
     m_CorpseTargetGUID = corpse->GetGUID();
@@ -163,12 +172,13 @@ void SpellCastTargets::Update(Unit* caster)
     m_itemTarget = NULL;
     if (caster->GetTypeId() == TYPEID_PLAYER)
     {
+        Player *player = caster->ToPlayer();
         if (m_targetMask & TARGET_FLAG_ITEM)
-            m_itemTarget = caster->ToPlayer()->GetItemByGuid(m_itemTargetGUID);
+            m_itemTarget = player->GetItemByGuid(m_itemTargetGUID);
         else if (m_targetMask & TARGET_FLAG_TRADE_ITEM)
-            if (m_itemTargetGUID == TRADE_SLOT_NONTRADED) // here it is not guid but slot. Also prevent hacking slots
-                if (Player* pTrader = caster->ToPlayer()->GetTrader())
-                    m_itemTarget = pTrader->GetItemByTradeSlot(m_itemTargetGUID);
+            if (m_itemTargetGUID == TRADE_SLOT_NONTRADED) // here it is not guid but slot. Also prevents hacking slots
+                if (TradeData* pTrade = player->GetTradeData())
+                    m_itemTarget = pTrade->GetTraderData()->GetItem(TRADE_SLOT_NONTRADED);
 
         if (m_itemTarget)
             m_itemTargetEntry = m_itemTarget->GetEntry();
@@ -2900,6 +2910,32 @@ void Spell::cast(bool skipCheck)
             SetExecutedCurrently(false);
             return;
         }
+
+        // additional check after cast bar completes (must not be in CheckCast)
+        // if trade not complete then remember it in trade data
+        if (m_targets.getTargetMask() & TARGET_FLAG_TRADE_ITEM)
+        {
+            if (m_caster->GetTypeId() == TYPEID_PLAYER)
+            {
+                if (TradeData* my_trade = m_caster->ToPlayer()->GetTradeData())
+                {
+                    if (!my_trade->IsInAcceptProcess())
+                    {
+                        // Spell will be casted at completing the trade. Silently ignore at this place
+                        my_trade->SetSpell(m_spellInfo->Id, m_CastItem);
+                        SendCastResult(SPELL_FAILED_DONT_REPORT);
+                        SendInterrupted(0);
+                        m_caster->ToPlayer()->RestoreSpellMods(this);
+                        // cleanup after mod system
+                        // triggered spell pointer can be not removed in some cases
+                        m_caster->ToPlayer()->SetSpellModTakingSpell(this, false);
+                        finish(false);
+                        SetExecutedCurrently(false);
+                        return;
+                    }
+                }
+            }
+        }
     }
 
     SelectSpellTargets();
@@ -2965,6 +3001,12 @@ void Spell::cast(bool skipCheck)
         TakePower();
         TakeReagents();                                         // we must remove reagents before HandleEffects to allow place crafted item in same slot
     }
+    else if (Item* targetItem = m_targets.getItemTarget())
+    {
+        /// Not own traded item (in trader trade slot) req. reagents including triggered spell case
+        if (targetItem->GetOwnerGUID() != m_caster->GetGUID())
+            TakeReagents();
+    }
 
     // are there any spells need to be triggered after hit?
     // handle SPELL_AURA_ADD_TARGET_TRIGGER auras
@@ -4330,7 +4372,12 @@ void Spell::TakeRunePower()
 void Spell::TakeReagents()
 {
     if (m_IsTriggeredSpell)                                  // reagents used in triggered spell removed by original spell or don't must be removed.
-        return;
+    {
+        Item* targetItem = m_targets.getItemTarget();
+        /// Not own traded item (in trader trade slot) req. reagents including triggered spell case
+        if (!(targetItem && targetItem->GetOwnerGUID() != m_caster->GetGUID()))
+            return;
+    }
 
     if (m_caster->GetTypeId() != TYPEID_PLAYER)
         return;
@@ -5430,6 +5477,26 @@ SpellCastResult Spell::CheckCast(bool strict)
         }
     }
 
+    // check trade slot case (last, for allow catch any another cast problems)
+    if (m_targets.getTargetMask() & TARGET_FLAG_TRADE_ITEM)
+    {
+        if (m_caster->GetTypeId() != TYPEID_PLAYER)
+            return SPELL_FAILED_NOT_TRADING;
+
+        TradeData* my_trade = m_caster->ToPlayer()->GetTradeData();
+
+        if (!my_trade)
+            return SPELL_FAILED_NOT_TRADING;
+
+        TradeSlots slot = TradeSlots(m_targets.getItemTargetGUID());
+        if (slot != TRADE_SLOT_NONTRADED)
+            return SPELL_FAILED_ITEM_NOT_READY;
+
+        if (!m_IsTriggeredSpell)
+            if (my_trade->GetSpell())
+                return SPELL_FAILED_ITEM_ALREADY_ENCHANTED;
+    }
+
     // all ok
     return SPELL_CAST_OK;
 }
diff --git a/src/server/game/Spells/Spell.h b/src/server/game/Spells/Spell.h
index 372c668d2de..7b6597720e1 100644
--- a/src/server/game/Spells/Spell.h
+++ b/src/server/game/Spells/Spell.h
@@ -180,6 +180,7 @@ class SpellCastTargets
         Item* getItemTarget() const { return m_itemTarget; }
         uint32 getItemTargetEntry() const { return m_itemTargetEntry; }
         void setItemTarget(Item* item);
+        void setTradeItemTarget(Player* caster);
         void updateTradeSlotItem()
         {
             if (m_itemTarget && (m_targetMask & TARGET_FLAG_TRADE_ITEM))
-- 
cgit v1.2.3


From 66535c37001e9d59715aa989a52bae1859ae7416 Mon Sep 17 00:00:00 2001
From: Machiavelli 
Date: Fri, 25 Jun 2010 15:22:06 +0200
Subject: Remove redundant accountid check in Item::IsBindedNotWith. Fixes the
 issue that BOA items would get stuck in the mail when original sender had
 deleted their character before the recipient could pick it up.

--HG--
branch : trunk
---
 src/server/game/Entities/Item/Item.cpp | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Item/Item.cpp b/src/server/game/Entities/Item/Item.cpp
index 60957b66e32..52d9daeb4c8 100644
--- a/src/server/game/Entities/Item/Item.cpp
+++ b/src/server/game/Entities/Item/Item.cpp
@@ -1037,20 +1037,11 @@ bool Item::IsBindedNotWith(Player const* player) const
     if (GetOwnerGUID() == player->GetGUID())
         return false;
 
-    // not BOA item case
-    if (!IsBoundAccountWide())
-        return true;
-
-    // online
-    if (Player* owner = objmgr.GetPlayer(GetOwnerGUID()))
-    {
-        return owner->GetSession()->GetAccountId() != player->GetSession()->GetAccountId();
-    }
-    // offline slow case
-    else
-    {
-        return objmgr.GetPlayerAccountIdByGUID(GetOwnerGUID()) != player->GetSession()->GetAccountId();
-    }
+    // BOA item case
+    if (IsBoundAccountWide())
+        return false;
+        
+    return true;
 }
 
 bool ItemRequiredTarget::IsFitToRequirements(Unit* pUnitTarget) const
-- 
cgit v1.2.3


From fec8ca58b5d1e04a5da344cc9027c9b73a752ca4 Mon Sep 17 00:00:00 2001
From: Xanadu 
Date: Fri, 25 Jun 2010 15:58:27 +0200
Subject: Simplified and cleaned up honor calculation.

--HG--
branch : trunk
---
 src/server/game/BattleGrounds/BattleGround.cpp    |  2 +-
 src/server/game/BattleGrounds/BattleGroundMgr.cpp |  4 +-
 src/server/game/Entities/Creature/GossipDef.cpp   |  6 +-
 src/server/game/Entities/Player/Player.cpp        | 95 +++++++++++------------
 src/server/game/Entities/Player/Player.h          |  2 +-
 src/server/game/Miscellaneous/Formulas.h          |  7 +-
 6 files changed, 57 insertions(+), 59 deletions(-)

(limited to 'src')

diff --git a/src/server/game/BattleGrounds/BattleGround.cpp b/src/server/game/BattleGrounds/BattleGround.cpp
index 86125ac5bfe..2fc9a72df04 100644
--- a/src/server/game/BattleGrounds/BattleGround.cpp
+++ b/src/server/game/BattleGrounds/BattleGround.cpp
@@ -856,7 +856,7 @@ void BattleGround::EndBattleGround(uint32 winner)
 uint32 BattleGround::GetBonusHonorFromKill(uint32 kills) const
 {
     //variable kills means how many honorable kills you scored (so we need kills * honor_for_one_kill)
-    uint32 maxLevel = (GetMaxLevel()<80)?GetMaxLevel():80;
+    uint32 maxLevel = (GetMaxLevel() < 80) ? GetMaxLevel() : 80;
     return Trinity::Honor::hk_honor_at_level(maxLevel, kills);
 }
 
diff --git a/src/server/game/BattleGrounds/BattleGroundMgr.cpp b/src/server/game/BattleGrounds/BattleGroundMgr.cpp
index 84891dcf2df..b814c9b810e 100644
--- a/src/server/game/BattleGrounds/BattleGroundMgr.cpp
+++ b/src/server/game/BattleGrounds/BattleGroundMgr.cpp
@@ -1891,8 +1891,8 @@ void BattleGroundMgr::BuildBattleGroundListPacket(WorldPacket *data, const uint6
     uint32 win_arena = plr->GetRandomWinner() ? BG_REWARD_WINNER_ARENA_LAST : BG_REWARD_WINNER_ARENA_FIRST;
     uint32 loos_kills = plr->GetRandomWinner() ? BG_REWARD_LOOSER_HONOR_LAST : BG_REWARD_LOOSER_HONOR_FIRST;
 
-    win_kills = (uint32)Trinity::Honor::hk_honor_at_level(plr->getLevel(), win_kills);
-    loos_kills = (uint32)Trinity::Honor::hk_honor_at_level(plr->getLevel(), loos_kills);
+    win_kills = Trinity::Honor::hk_honor_at_level(plr->getLevel(), win_kills);
+    loos_kills = Trinity::Honor::hk_honor_at_level(plr->getLevel(), loos_kills);
 
     data->Initialize(SMSG_BATTLEFIELD_LIST);
     *data << uint64(guid);                                  // battlemaster guid
diff --git a/src/server/game/Entities/Creature/GossipDef.cpp b/src/server/game/Entities/Creature/GossipDef.cpp
index 3e0fec52bc7..cbbe7dc052b 100644
--- a/src/server/game/Entities/Creature/GossipDef.cpp
+++ b/src/server/game/Entities/Creature/GossipDef.cpp
@@ -522,7 +522,7 @@ void PlayerMenu::SendQuestGiverQuestDetails(Quest const *pQuest, uint64 npcGUID,
     }
 
     // rewarded honor points. Multiply with 10 to satisfy client
-    data << uint32(10*Trinity::Honor::hk_honor_at_level(pSession->GetPlayer()->getLevel(), pQuest->GetRewHonorableKills()));
+    data << 10 * Trinity::Honor::hk_honor_at_level(pSession->GetPlayer()->getLevel(), pQuest->GetRewHonorableKills());
     data << float(0);                                       // new 3.3.0, honor multiplier?
     data << uint32(pQuest->GetRewSpell());                  // reward spell, this spell will display (icon) (casted if RewSpellCast == 0)
     data << int32(pQuest->GetRewSpellCast());               // casted spell
@@ -616,7 +616,7 @@ void PlayerMenu::SendQuestQueryResponse(Quest const *pQuest)
     data << int32(pQuest->GetRewSpellCast());               // casted spell
 
     // rewarded honor points
-    data << uint32(Trinity::Honor::hk_honor_at_level(pSession->GetPlayer()->getLevel(), pQuest->GetRewHonorableKills()));
+    data << Trinity::Honor::hk_honor_at_level(pSession->GetPlayer()->getLevel(), pQuest->GetRewHonorableKills());
     data << float(0);                                       // new reward honor (multipled by ~62 at client side)
     data << uint32(pQuest->GetSrcItemId());                 // source item id
     data << uint32(pQuest->GetFlags() & 0xFFFF);            // quest flags
@@ -775,7 +775,7 @@ void PlayerMenu::SendQuestGiverOfferReward(Quest const* pQuest, uint64 npcGUID,
     data << uint32(pQuest->XPValue(pSession->GetPlayer())*sWorld.getRate(RATE_XP_QUEST));
 
     // rewarded honor points. Multiply with 10 to satisfy client
-    data << uint32(10*Trinity::Honor::hk_honor_at_level(pSession->GetPlayer()->getLevel(), pQuest->GetRewHonorableKills()));
+    data << 10 * Trinity::Honor::hk_honor_at_level(pSession->GetPlayer()->getLevel(), pQuest->GetRewHonorableKills());
     data << float(0);                                       // unk, honor multiplier?
     data << uint32(0x08);                                   // unused by client?
     data << uint32(pQuest->GetRewSpell());                  // reward spell, this spell will display (icon) (casted if RewSpellCast == 0)
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 83fa4fa34fe..ab0a2e20f8b 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -6600,7 +6600,7 @@ void Player::UpdateHonorFields()
 ///Calculate the amount of honor gained based on the victim
 ///and the size of the group for which the honor is divided
 ///An exact honor value can also be given (overriding the calcs)
-bool Player::RewardHonor(Unit *uVictim, uint32 groupsize, float honor, bool pvptoken)
+bool Player::RewardHonor(Unit *uVictim, uint32 groupsize, int32 honor, bool pvptoken)
 {
     // do not reward honor in arenas, but enable onkill spellproc
     if (InArena())
@@ -6620,8 +6620,6 @@ bool Player::RewardHonor(Unit *uVictim, uint32 groupsize, float honor, bool pvpt
 
     uint64 victim_guid = 0;
     uint32 victim_rank = 0;
-    //uint32 rank_diff = 0;
-    //time_t now = time(NULL);
 
     // need call before fields update to have chance move yesterday data to appropriate fields before today data change.
     UpdateHonorFields();
@@ -6630,7 +6628,10 @@ bool Player::RewardHonor(Unit *uVictim, uint32 groupsize, float honor, bool pvpt
     if (InBattleGround() && GetBattleGround() && GetBattleGround()->isArena())
         return true;
 
-    if (honor <= 0)
+    // Promote to float for calculations
+    float honor_f = honor;
+
+    if (honor_f <= 0)
     {
         if (!uVictim || uVictim == this || uVictim->HasAuraType(SPELL_AURA_NO_PVP_CREDIT))
             return false;
@@ -6644,45 +6645,35 @@ bool Player::RewardHonor(Unit *uVictim, uint32 groupsize, float honor, bool pvpt
             if (GetTeam() == pVictim->GetTeam() && !sWorld.IsFFAPvPRealm())
                 return false;
 
-            float f = 1;                                    //need for total kills (?? need more info)
-            uint32 k_grey = 0;
-            uint32 k_level = getLevel();
-            uint32 v_level = pVictim->getLevel();
-
-            {
-                // PLAYER_CHOSEN_TITLE VALUES DESCRIPTION
-                //  [0]      Just name
-                //  [1..14]  Alliance honor titles and player name
-                //  [15..28] Horde honor titles and player name
-                //  [29..38] Other title and player name
-                //  [39+]    Nothing
-                uint32 victim_title = pVictim->GetUInt32Value(PLAYER_CHOSEN_TITLE);
-                                                            // Get Killer titles, CharTitlesEntry::bit_index
-                // Ranks:
-                //  title[1..14]  -> rank[5..18]
-                //  title[15..28] -> rank[5..18]
-                //  title[other]  -> 0
-                if (victim_title == 0)
-                    victim_guid = 0;                        // Don't show HK:  message, only log.
-                else if (victim_title < 15)
-                    victim_rank = victim_title + 4;
-                else if (victim_title < 29)
-                    victim_rank = victim_title - 14 + 4;
-                else
-                    victim_guid = 0;                        // Don't show HK:  message, only log.
-            }
-
-            k_grey = Trinity::XP::GetGrayLevel(k_level);
+            uint8 k_level = getLevel();
+            uint8 k_grey = Trinity::XP::GetGrayLevel(k_level);
+            uint8 v_level = pVictim->getLevel();
 
             if (v_level <= k_grey)
                 return false;
 
-            float diff_level = (k_level == k_grey) ? 1 : ((float(v_level) - float(k_grey)) / (float(k_level) - float(k_grey)));
-
-            int32 v_rank =1;                                //need more info
+            // PLAYER_CHOSEN_TITLE VALUES DESCRIPTION
+            //  [0]      Just name
+            //  [1..14]  Alliance honor titles and player name
+            //  [15..28] Horde honor titles and player name
+            //  [29..38] Other title and player name
+            //  [39+]    Nothing
+            uint32 victim_title = pVictim->GetUInt32Value(PLAYER_CHOSEN_TITLE);
+                                                        // Get Killer titles, CharTitlesEntry::bit_index
+            // Ranks:
+            //  title[1..14]  -> rank[5..18]
+            //  title[15..28] -> rank[5..18]
+            //  title[other]  -> 0
+            if (victim_title == 0)
+                victim_guid = 0;                        // Don't show HK:  message, only log.
+            else if (victim_title < 15)
+                victim_rank = victim_title + 4;
+            else if (victim_title < 29)
+                victim_rank = victim_title - 14 + 4;
+            else
+                victim_guid = 0;                        // Don't show HK:  message, only log.
 
-            honor = ((f * diff_level * (190 + v_rank*10))/6);
-            honor *= ((float)k_level) / 21.50537f;              //factor of dependence on levels of the killer
+            honor_f = ceil(Trinity::Honor::hk_honor_at_level_f(k_level) * (v_level - k_grey) / (k_level - k_grey));
 
             // count the number of playerkills in one day
             ApplyModUInt32Value(PLAYER_FIELD_KILLS, 1, true);
@@ -6697,7 +6688,7 @@ bool Player::RewardHonor(Unit *uVictim, uint32 groupsize, float honor, bool pvpt
             if (!uVictim->ToCreature()->isRacialLeader())
                 return false;
 
-            honor = 100;                                    // ??? need more info
+            honor_f = 100.0f;                               // ??? need more info
             victim_rank = 19;                               // HK: Leader
         }
     }
@@ -6705,35 +6696,37 @@ bool Player::RewardHonor(Unit *uVictim, uint32 groupsize, float honor, bool pvpt
     if (uVictim != NULL)
     {
         if (groupsize > 1)
-            honor /= groupsize;
+            honor_f /= groupsize;
 
         // apply honor multiplier from aura (not stacking-get highest)
-        honor = int32(float(honor) * (float(GetMaxPositiveAuraModifier(SPELL_AURA_MOD_HONOR_GAIN_PCT))+100.0f)/100.0f);
+        honor_f *= (GetMaxPositiveAuraModifier(SPELL_AURA_MOD_HONOR_GAIN_PCT) + 100) / 100.0f;
     }
 
-    honor *= sWorld.getRate(RATE_HONOR);
+    honor_f *= sWorld.getRate(RATE_HONOR);
+    // Back to int now
+    honor = honor_f;
     // honor - for show honor points in log
     // victim_guid - for show victim name in log
     // victim_rank [1..4]  HK: 
     // victim_rank [5..19] HK: 
     // victim_rank [0,20+] HK: <>
     WorldPacket data(SMSG_PVP_CREDIT,4+8+4);
-    data << (uint32) honor;
-    data << (uint64) victim_guid;
-    data << (uint32) victim_rank;
+    data << honor;
+    data << victim_guid;
+    data << victim_rank;
 
     GetSession()->SendPacket(&data);
 
     // add honor points
-    ModifyHonorPoints(int32(honor));
+    ModifyHonorPoints(honor);
 
-    ApplyModUInt32Value(PLAYER_FIELD_TODAY_CONTRIBUTION, uint32(honor), true);
+    ApplyModUInt32Value(PLAYER_FIELD_TODAY_CONTRIBUTION, honor, true);
 
     if (InBattleGround() && honor > 0)
     {
         if (BattleGround *bg = GetBattleGround())
         {
-            bg->UpdatePlayerScore(this, SCORE_BONUS_HONOR, uint32(honor), false);//false: prevent looping
+            bg->UpdatePlayerScore(this, SCORE_BONUS_HONOR, honor, false); //false: prevent looping
         }
     }
 
@@ -15524,7 +15517,7 @@ void Player::SendQuestReward(Quest const *pQuest, uint32 XP, Object * questGiver
         data << uint32(pQuest->GetRewOrReqMoney() + int32(pQuest->GetRewMoneyMaxLevel() * sWorld.getRate(RATE_DROP_MONEY)));
     }
 
-    data << uint32(10*Trinity::Honor::hk_honor_at_level(getLevel(), pQuest->GetRewHonorableKills()));
+    data << 10 * Trinity::Honor::hk_honor_at_level(getLevel(), pQuest->GetRewHonorableKills());
     data << uint32(pQuest->GetBonusTalents());              // bonus talents
     data << uint32(pQuest->GetRewArenaPoints());
     GetSession()->SendPacket(&data);
@@ -21732,7 +21725,7 @@ bool Player::RewardPlayerAndGroupAtKill(Unit* pVictim)
                     continue;                               // member (alive or dead) or his corpse at req. distance
 
                 // honor can be in PvP and !PvP (racial leader) cases (for alive)
-                if (pGroupGuy->isAlive() && pGroupGuy->RewardHonor(pVictim,count, -1, true) && pGroupGuy == this)
+                if (pGroupGuy->isAlive() && pGroupGuy->RewardHonor(pVictim, count, -1, true) && pGroupGuy == this)
                     honored_kill = true;
 
                 // xp and reputation only in !PvP case
@@ -21776,7 +21769,7 @@ bool Player::RewardPlayerAndGroupAtKill(Unit* pVictim)
         xp = (PvP || GetVehicle()) ? 0 : Trinity::XP::Gain(this, pVictim);
 
         // honor can be in PvP and !PvP (racial leader) cases
-        if (RewardHonor(pVictim,1, -1, true))
+        if (RewardHonor(pVictim, 1, -1, true))
             honored_kill = true;
 
         // xp and reputation only in !PvP case
diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h
index 99584b5bf64..765b5185bf6 100644
--- a/src/server/game/Entities/Player/Player.h
+++ b/src/server/game/Entities/Player/Player.h
@@ -1918,7 +1918,7 @@ class Player : public Unit, public GridObject
         /***                  PVP SYSTEM                       ***/
         /*********************************************************/
         void UpdateHonorFields();
-        bool RewardHonor(Unit *pVictim, uint32 groupsize, float honor = -1, bool pvptoken = false);
+        bool RewardHonor(Unit *pVictim, uint32 groupsize, int32 honor = -1, bool pvptoken = false);
         uint32 GetHonorPoints() { return GetUInt32Value(PLAYER_FIELD_HONOR_CURRENCY); }
         uint32 GetArenaPoints() { return GetUInt32Value(PLAYER_FIELD_ARENA_CURRENCY); }
         void ModifyHonorPoints(int32 value);
diff --git a/src/server/game/Miscellaneous/Formulas.h b/src/server/game/Miscellaneous/Formulas.h
index e5961834a78..8244e344275 100644
--- a/src/server/game/Miscellaneous/Formulas.h
+++ b/src/server/game/Miscellaneous/Formulas.h
@@ -27,9 +27,14 @@ namespace Trinity
 {
     namespace Honor
     {
+        inline float hk_honor_at_level_f(uint8 level, uint32 count = 1)
+        {
+            return count * level * 1.55f;
+        }
+        
         inline uint32 hk_honor_at_level(uint8 level, uint32 count = 1)
         {
-            return uint32(ceil(count * (33.333f * ((float)level) / 21.50537f)));
+            return ceil(hk_honor_at_level_f(level, count));
         }
     }
     namespace XP
-- 
cgit v1.2.3


From 711c12a68ea7e72052016c16bbcb165b0db87df9 Mon Sep 17 00:00:00 2001
From: Xanadu 
Date: Fri, 25 Jun 2010 16:23:14 +0200
Subject: Fixed win tool build.

--HG--
branch : trunk
---
 src/tools/map_extractor/VC90/VC90_mapextractor.vcproj | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/tools/map_extractor/VC90/VC90_mapextractor.vcproj b/src/tools/map_extractor/VC90/VC90_mapextractor.vcproj
index c943d93d84e..3cc367f0fc8 100644
--- a/src/tools/map_extractor/VC90/VC90_mapextractor.vcproj
+++ b/src/tools/map_extractor/VC90/VC90_mapextractor.vcproj
@@ -48,7 +48,7 @@
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			
 		
@@ -249,6 +249,10 @@
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl"
 			>
+			
+			
 			
@@ -257,6 +261,10 @@
 				RelativePath=".\mpq_libmpq.h"
 				>
 			
+			
+			
 		
 	
 	
-- 
cgit v1.2.3


From f01ef873fb91783b721965e729da954429856571 Mon Sep 17 00:00:00 2001
From: Rat 
Date: Fri, 25 Jun 2010 16:38:02 +0200
Subject: fixed some loot condition reload bugs

--HG--
branch : trunk
---
 src/server/game/Loot/LootMgr.cpp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Loot/LootMgr.cpp b/src/server/game/Loot/LootMgr.cpp
index 2137c8872b5..77b7f08fd5a 100644
--- a/src/server/game/Loot/LootMgr.cpp
+++ b/src/server/game/Loot/LootMgr.cpp
@@ -188,7 +188,6 @@ bool LootStore::HaveQuestLootForPlayer(uint32 loot_id,Player* player) const
 
 void LootStore::ResetConditions()
 {
-    LootTemplateMap m_LootTemplates;
     for (LootTemplateMap::iterator itr = m_LootTemplates.begin(); itr != m_LootTemplates.end(); ++itr)
     {
         ConditionList empty;
@@ -969,11 +968,11 @@ void LootTemplate::LootGroup::CopyConditions(ConditionList conditions)
 {
     for (LootStoreItemList::iterator i = ExplicitlyChanced.begin(); i != ExplicitlyChanced.end(); ++i)
     {
-        i->conditions = conditions;
+        i->conditions.clear();
     }
     for (LootStoreItemList::iterator i = EqualChanced.begin(); i != EqualChanced.end(); ++i)
     {
-        i->conditions = conditions;
+        i->conditions.clear();
     }
 }
 
@@ -1146,7 +1145,7 @@ void LootTemplate::AddEntry(LootStoreItem& item)
 void LootTemplate::CopyConditions(ConditionList conditions)
 {
     for (LootStoreItemList::iterator i = Entries.begin(); i != Entries.end(); ++i)
-        i->conditions = conditions;
+        i->conditions.clear();
 
     for (LootGroups::iterator i = Groups.begin(); i != Groups.end(); ++i)
         i->CopyConditions(conditions);
@@ -1197,8 +1196,6 @@ void LootTemplate::Process(Loot& loot, LootStore const& store, bool rate, uint16
             if (!Referenced)
                 continue;                                     // Error message already printed at loading stage
 
-            const_cast(Referenced)->CopyConditions(i->conditions);//copy conditions from referer template
-
             for (uint32 loop = 0; loop < i->maxcount; ++loop) // Ref multiplicator
                 Referenced->Process(loot, store, rate, lootMode, i->group);
         }
-- 
cgit v1.2.3


From 852a0c44a2bdabb44a2280f92e42d1d67381f95a Mon Sep 17 00:00:00 2001
From: Brian 
Date: Fri, 25 Jun 2010 03:50:19 -0600
Subject: * Renamed PoolHandler to PoolMgr since the pool systems has nothing
 to do with * the client/server protocol.

--HG--
branch : trunk
rename : src/server/game/Pools/PoolHandler.cpp => src/server/game/Pools/PoolMgr.cpp
rename : src/server/game/Pools/PoolHandler.h => src/server/game/Pools/PoolMgr.h
---
 src/server/game/CMakeLists.txt                     |   2 +-
 src/server/game/Chat/Commands/Level2.cpp           |   2 +-
 src/server/game/Entities/Creature/Creature.cpp     |   2 +-
 src/server/game/Entities/GameObject/GameObject.cpp |   2 +-
 src/server/game/Events/GameEventMgr.cpp            |   2 +-
 src/server/game/Pools/PoolHandler.cpp              | 762 ---------------------
 src/server/game/Pools/PoolHandler.h                | 173 -----
 src/server/game/Pools/PoolMgr.cpp                  | 762 +++++++++++++++++++++
 src/server/game/Pools/PoolMgr.h                    | 173 +++++
 src/server/game/World/World.cpp                    |   2 +-
 10 files changed, 941 insertions(+), 941 deletions(-)
 delete mode 100644 src/server/game/Pools/PoolHandler.cpp
 delete mode 100644 src/server/game/Pools/PoolHandler.h
 create mode 100644 src/server/game/Pools/PoolMgr.cpp
 create mode 100644 src/server/game/Pools/PoolMgr.h

(limited to 'src')

diff --git a/src/server/game/CMakeLists.txt b/src/server/game/CMakeLists.txt
index 2d6788cf36d..d2aa20fc6cc 100644
--- a/src/server/game/CMakeLists.txt
+++ b/src/server/game/CMakeLists.txt
@@ -125,7 +125,7 @@ set(game_STAT_SRCS
   OutdoorPvP/Zones/OutdoorPvPZM.cpp
   OutdoorPvP/OutdoorPvP.cpp
   OutdoorPvP/OutdoorPvPMgr.cpp
-  Pools/PoolHandler.cpp
+  Pools/PoolMgr.cpp
   Quests/QuestDef.cpp
   Reputation/ReputationMgr.cpp
   Scripting/ScriptLoader.cpp
diff --git a/src/server/game/Chat/Commands/Level2.cpp b/src/server/game/Chat/Commands/Level2.cpp
index 90c7d5ef8ae..ea0865a88e1 100644
--- a/src/server/game/Chat/Commands/Level2.cpp
+++ b/src/server/game/Chat/Commands/Level2.cpp
@@ -32,7 +32,7 @@
 #include "World.h"
 #include "GameEventMgr.h"
 #include "SpellMgr.h"
-#include "PoolHandler.h"
+#include "PoolMgr.h"
 #include "AccountMgr.h"
 #include "WaypointManager.h"
 #include "Util.h"
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp
index 6570a418be9..8bff608c149 100644
--- a/src/server/game/Entities/Creature/Creature.cpp
+++ b/src/server/game/Entities/Creature/Creature.cpp
@@ -28,7 +28,7 @@
 #include "QuestDef.h"
 #include "GossipDef.h"
 #include "Player.h"
-#include "PoolHandler.h"
+#include "PoolMgr.h"
 #include "Opcodes.h"
 #include "Log.h"
 #include "LootMgr.h"
diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp
index 8783a8b5199..1a5d9e09453 100644
--- a/src/server/game/Entities/GameObject/GameObject.cpp
+++ b/src/server/game/Entities/GameObject/GameObject.cpp
@@ -22,7 +22,7 @@
 #include "QuestDef.h"
 #include "GameObject.h"
 #include "ObjectMgr.h"
-#include "PoolHandler.h"
+#include "PoolMgr.h"
 #include "SpellMgr.h"
 #include "Spell.h"
 #include "UpdateMask.h"
diff --git a/src/server/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp
index f22db3c8187..889d228b0a2 100644
--- a/src/server/game/Events/GameEventMgr.cpp
+++ b/src/server/game/Events/GameEventMgr.cpp
@@ -22,7 +22,7 @@
 #include "World.h"
 #include "ObjectMgr.h"
 #include "WorldPacket.h"
-#include "PoolHandler.h"
+#include "PoolMgr.h"
 #include "ProgressBar.h"
 #include "Language.h"
 #include "Log.h"
diff --git a/src/server/game/Pools/PoolHandler.cpp b/src/server/game/Pools/PoolHandler.cpp
deleted file mode 100644
index 4a7c99216bd..00000000000
--- a/src/server/game/Pools/PoolHandler.cpp
+++ /dev/null
@@ -1,762 +0,0 @@
-/*
- * Copyright (C) 2005-2009 MaNGOS 
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "PoolHandler.h"
-#include "ObjectMgr.h"
-#include "ProgressBar.h"
-#include "Log.h"
-#include "MapManager.h"
-
-////////////////////////////////////////////////////////////
-// template class SpawnedPoolData
-
-// Method that tell amount spawned objects/subpools
-uint32 SpawnedPoolData::GetSpawnedObjects(uint32 pool_id) const
-{
-    SpawnedPoolPools::const_iterator itr = mSpawnedPools.find(pool_id);
-    return itr != mSpawnedPools.end() ? itr->second : 0;
-}
-
-// Method that tell if a creature is spawned currently
-template<>
-bool SpawnedPoolData::IsSpawnedObject(uint32 db_guid) const
-{
-    return mSpawnedCreatures.find(db_guid) != mSpawnedCreatures.end();
-}
-
-// Method that tell if a gameobject is spawned currently
-template<>
-bool SpawnedPoolData::IsSpawnedObject(uint32 db_guid) const
-{
-    return mSpawnedGameobjects.find(db_guid) != mSpawnedGameobjects.end();
-}
-
-// Method that tell if a pool is spawned currently
-template<>
-bool SpawnedPoolData::IsSpawnedObject(uint32 sub_pool_id) const
-{
-    return mSpawnedPools.find(sub_pool_id) != mSpawnedPools.end();
-}
-
-template<>
-void SpawnedPoolData::AddSpawn(uint32 db_guid, uint32 pool_id)
-{
-    mSpawnedCreatures.insert(db_guid);
-    ++mSpawnedPools[pool_id];
-}
-
-template<>
-void SpawnedPoolData::AddSpawn(uint32 db_guid, uint32 pool_id)
-{
-    mSpawnedGameobjects.insert(db_guid);
-    ++mSpawnedPools[pool_id];
-}
-
-template<>
-void SpawnedPoolData::AddSpawn(uint32 sub_pool_id, uint32 pool_id)
-{
-    mSpawnedPools[sub_pool_id] = 0;
-    ++mSpawnedPools[pool_id];
-}
-
-template<>
-void SpawnedPoolData::RemoveSpawn(uint32 db_guid, uint32 pool_id)
-{
-    mSpawnedCreatures.erase(db_guid);
-    uint32& val = mSpawnedPools[pool_id];
-    if (val > 0)
-        --val;
-}
-
-template<>
-void SpawnedPoolData::RemoveSpawn(uint32 db_guid, uint32 pool_id)
-{
-    mSpawnedGameobjects.erase(db_guid);
-    uint32& val = mSpawnedPools[pool_id];
-    if (val > 0)
-        --val;
-}
-
-template<>
-void SpawnedPoolData::RemoveSpawn(uint32 sub_pool_id, uint32 pool_id)
-{
-    mSpawnedPools.erase(sub_pool_id);
-    uint32& val = mSpawnedPools[pool_id];
-    if (val > 0)
-        --val;
-}
-
-////////////////////////////////////////////////////////////
-// Methods of template class PoolGroup
-
-// Method to add a gameobject/creature guid to the proper list depending on pool type and chance value
-template 
-void PoolGroup::AddEntry(PoolObject& poolitem, uint32 maxentries)
-{
-    if (poolitem.chance != 0 && maxentries == 1)
-        ExplicitlyChanced.push_back(poolitem);
-    else
-        EqualChanced.push_back(poolitem);
-}
-
-// Method to check the chances are proper in this object pool
-template 
-bool PoolGroup::CheckPool() const
-{
-    if (!EqualChanced.size())
-    {
-        float chance = 0;
-        for (uint32 i = 0; i < ExplicitlyChanced.size(); ++i)
-            chance += ExplicitlyChanced[i].chance;
-        if (chance != 100 && chance != 0)
-            return false;
-    }
-    return true;
-}
-
-template 
-PoolObject* PoolGroup::RollOne(SpawnedPoolData& spawns, uint32 triggerFrom)
-{
-    if (!ExplicitlyChanced.empty())
-    {
-        float roll = (float)rand_chance();
-
-        for (uint32 i=0; i(ExplicitlyChanced[i].guid)))
-               return &ExplicitlyChanced[i];
-        }
-    }
-    if (!EqualChanced.empty())
-    {
-        int32 index = irand(0, EqualChanced.size()-1);
-        // Triggering object is marked as spawned at this time and can be also rolled (respawn case)
-        // so this need explicit check for this case
-        if (EqualChanced[index].guid == triggerFrom || !spawns.IsSpawnedObject(EqualChanced[index].guid))
-           return &EqualChanced[index];
-    }
-
-    return NULL;
-}
-
-// Main method to despawn a creature or gameobject in a pool
-// If no guid is passed, the pool is just removed (event end case)
-// If guid is filled, cache will be used and no removal will occur, it just fill the cache
-template
-void PoolGroup::DespawnObject(SpawnedPoolData& spawns, uint32 guid)
-{
-    for (size_t i=0; i(EqualChanced[i].guid))
-        {
-            if (!guid || EqualChanced[i].guid == guid)
-            {
-                Despawn1Object(EqualChanced[i].guid);
-                spawns.RemoveSpawn(EqualChanced[i].guid,poolId);
-            }
-        }
-    }
-
-    for (size_t i = 0; i < ExplicitlyChanced.size(); ++i)
-    {
-        // spawned
-        if (spawns.IsSpawnedObject(ExplicitlyChanced[i].guid))
-        {
-            if (!guid || ExplicitlyChanced[i].guid == guid)
-            {
-                Despawn1Object(ExplicitlyChanced[i].guid);
-                spawns.RemoveSpawn(ExplicitlyChanced[i].guid,poolId);
-            }
-        }
-    }
-}
-
-// Method that is actualy doing the removal job on one creature
-template<>
-void PoolGroup::Despawn1Object(uint32 guid)
-{
-    if (CreatureData const* data = objmgr.GetCreatureData(guid))
-    {
-        objmgr.RemoveCreatureFromGrid(guid, data);
-
-        if (Creature* pCreature = sObjectAccessor.GetObjectInWorld(MAKE_NEW_GUID(guid, data->id, HIGHGUID_UNIT), (Creature*)NULL))
-            pCreature->AddObjectToRemoveList();
-    }
-}
-
-// Same on one gameobject
-template<>
-void PoolGroup::Despawn1Object(uint32 guid)
-{
-    if (GameObjectData const* data = objmgr.GetGOData(guid))
-    {
-        objmgr.RemoveGameobjectFromGrid(guid, data);
-
-        if (GameObject* pGameobject = sObjectAccessor.GetObjectInWorld(MAKE_NEW_GUID(guid, data->id, HIGHGUID_GAMEOBJECT), (GameObject*)NULL))
-            pGameobject->AddObjectToRemoveList();
-    }
-}
-
-// Same on one pool
-template<>
-void PoolGroup::Despawn1Object(uint32 child_pool_id)
-{
-    poolhandler.DespawnPool(child_pool_id);
-}
-
-// Method for a pool only to remove any found record causing a circular dependency loop
-template<>
-void PoolGroup::RemoveOneRelation(uint16 child_pool_id)
-{
-    for (PoolObjectList::iterator itr = ExplicitlyChanced.begin(); itr != ExplicitlyChanced.end(); ++itr)
-    {
-        if (itr->guid == child_pool_id)
-        {
-            ExplicitlyChanced.erase(itr);
-            break;
-        }
-    }
-    for (PoolObjectList::iterator itr = EqualChanced.begin(); itr != EqualChanced.end(); ++itr)
-    {
-        if (itr->guid == child_pool_id)
-        {
-            EqualChanced.erase(itr);
-            break;
-        }
-    }
-}
-
-template 
-void PoolGroup::SpawnObject(SpawnedPoolData& spawns, uint32 limit, uint32 triggerFrom)
-{
-    uint32 lastDespawned = 0;
-    int count = limit - spawns.GetSpawnedObjects(poolId);
-
-    // If triggered from some object respawn this object is still marked as spawned
-    // and also counted into m_SpawnedPoolAmount so we need increase count to be
-    // spawned by 1
-    if (triggerFrom)
-        ++count;
-
-    // This will try to spawn the rest of pool, not guaranteed
-    for (int i = 0; i < count; ++i)
-    {
-        PoolObject* obj = RollOne(spawns,triggerFrom);
-        if (!obj)
-            continue;
-        if (obj->guid == lastDespawned)
-            continue;
-
-        if (obj->guid == triggerFrom)
-        {
-            ReSpawn1Object(obj);
-            triggerFrom = 0;
-            continue;
-        }
-        spawns.AddSpawn(obj->guid,poolId);
-        Spawn1Object(obj);
-
-        if (triggerFrom)
-        {
-            // One spawn one despawn no count increase
-            DespawnObject(spawns, triggerFrom);
-            lastDespawned = triggerFrom;
-            triggerFrom = 0;
-        }
-    }
-}
-
-// Method that is actualy doing the spawn job on 1 creature
-template <>
-void PoolGroup::Spawn1Object(PoolObject* obj)
-{
-    if (CreatureData const* data = objmgr.GetCreatureData(obj->guid))
-    {
-        objmgr.AddCreatureToGrid(obj->guid, data);
-
-        // Spawn if necessary (loaded grids only)
-        Map* map = const_cast(sMapMgr.CreateBaseMap(data->mapid));
-        // We use spawn coords to spawn
-        if (!map->Instanceable() && map->IsLoaded(data->posX, data->posY))
-        {
-            Creature* pCreature = new Creature;
-            //sLog.outDebug("Spawning creature %u",guid);
-            if (!pCreature->LoadFromDB(obj->guid, map))
-            {
-                delete pCreature;
-                return;
-            }
-            else
-                map->Add(pCreature);
-        }
-    }
-}
-
-// Same for 1 gameobject
-template <>
-void PoolGroup::Spawn1Object(PoolObject* obj)
-{
-    if (GameObjectData const* data = objmgr.GetGOData(obj->guid))
-    {
-        objmgr.AddGameobjectToGrid(obj->guid, data);
-        // Spawn if necessary (loaded grids only)
-        // this base map checked as non-instanced and then only existed
-        Map* map = const_cast(sMapMgr.CreateBaseMap(data->mapid));
-        // We use current coords to unspawn, not spawn coords since creature can have changed grid
-        if (!map->Instanceable() && map->IsLoaded(data->posX, data->posY))
-        {
-            GameObject* pGameobject = new GameObject;
-            //sLog.outDebug("Spawning gameobject %u", guid);
-            if (!pGameobject->LoadFromDB(obj->guid, map))
-            {
-                delete pGameobject;
-                return;
-            }
-            else
-            {
-                if (pGameobject->isSpawnedByDefault())
-                    map->Add(pGameobject);
-            }
-        }
-    }
-}
-
-// Same for 1 pool
-template <>
-void PoolGroup::Spawn1Object(PoolObject* obj)
-{
-    poolhandler.SpawnPool(obj->guid);
-}
-
-// Method that does the respawn job on the specified creature
-template <>
-void PoolGroup::ReSpawn1Object(PoolObject* obj)
-{
-    if (CreatureData const* data = objmgr.GetCreatureData(obj->guid))
-        if (Creature* pCreature = sObjectAccessor.GetObjectInWorld(MAKE_NEW_GUID(obj->guid, data->id, HIGHGUID_UNIT), (Creature*)NULL))
-            pCreature->GetMap()->Add(pCreature);
-}
-
-// Method that does the respawn job on the specified gameobject
-template <>
-void PoolGroup::ReSpawn1Object(PoolObject* obj)
-{
-    if (GameObjectData const* data = objmgr.GetGOData(obj->guid))
-        if (GameObject* pGameobject = sObjectAccessor.GetObjectInWorld(MAKE_NEW_GUID(obj->guid, data->id, HIGHGUID_GAMEOBJECT), (GameObject*)NULL))
-            pGameobject->GetMap()->Add(pGameobject);
-}
-
-// Nothing to do for a child Pool
-template <>
-void PoolGroup::ReSpawn1Object(PoolObject* /*obj*/)
-{
-}
-
-////////////////////////////////////////////////////////////
-// Methods of class PoolHandler
-
-PoolHandler::PoolHandler()
-{
-}
-
-void PoolHandler::LoadFromDB()
-{
-    QueryResult_AutoPtr result = WorldDatabase.Query("SELECT MAX(entry) FROM pool_template");
-    if (!result)
-    {
-        sLog.outString(">> Table pool_template is empty.");
-        sLog.outString();
-        return;
-    }
-    else
-    {
-        Field *fields = result->Fetch();
-        max_pool_id = fields[0].GetUInt16();
-    }
-
-    mPoolTemplate.resize(max_pool_id + 1);
-
-    result = WorldDatabase.Query("SELECT entry,max_limit FROM pool_template");
-    if (!result)
-    {
-        mPoolTemplate.clear();
-        sLog.outString(">> Table pool_template is empty:");
-        sLog.outString();
-        return;
-    }
-
-    uint32 count = 0;
-
-    barGoLink bar(result->GetRowCount());
-    do
-    {
-        ++count;
-        Field *fields = result->Fetch();
-
-        bar.step();
-
-        uint16 pool_id = fields[0].GetUInt16();
-
-        PoolTemplateData& pPoolTemplate = mPoolTemplate[pool_id];
-        pPoolTemplate.MaxLimit  = fields[1].GetUInt32();
-
-    } while (result->NextRow());
-
-    sLog.outString();
-    sLog.outString(">> Loaded %u objects pools", count);
-
-    // Creatures
-
-    sLog.outString();
-    sLog.outString("Loading Creatures Pooling Data...");
-
-    mPoolCreatureGroups.resize(max_pool_id + 1);
-    mCreatureSearchMap.clear();
-    //                                   1     2           3
-    result = WorldDatabase.Query("SELECT guid, pool_entry, chance FROM pool_creature");
-
-    count = 0;
-    if (!result)
-    {
-        barGoLink bar2(1);
-        bar2.step();
-
-        sLog.outString();
-        sLog.outString(">> Loaded %u creatures in pools", count);
-    }
-    else
-    {
-
-        barGoLink bar2(result->GetRowCount());
-        do
-        {
-            Field *fields = result->Fetch();
-
-            bar2.step();
-
-            uint32 guid    = fields[0].GetUInt32();
-            uint16 pool_id = fields[1].GetUInt16();
-            float chance   = fields[2].GetFloat();
-
-            CreatureData const* data = objmgr.GetCreatureData(guid);
-            if (!data)
-            {
-                sLog.outErrorDb("`pool_creature` has a non existing creature spawn (GUID: %u) defined for pool id (%u), skipped.", guid, pool_id);
-                continue;
-            }
-            if (pool_id > max_pool_id)
-            {
-                sLog.outErrorDb("`pool_creature` pool id (%i) is out of range compared to max pool id in `pool_template`, skipped.",pool_id);
-                continue;
-            }
-            if (chance < 0 || chance > 100)
-            {
-                sLog.outErrorDb("`pool_creature` has an invalid chance (%f) for creature guid (%u) in pool id (%i), skipped.", chance, guid, pool_id);
-                continue;
-            }
-            PoolTemplateData *pPoolTemplate = &mPoolTemplate[pool_id];
-            ++count;
-
-            PoolObject plObject = PoolObject(guid, chance);
-            PoolGroup& cregroup = mPoolCreatureGroups[pool_id];
-            cregroup.SetPoolId(pool_id);
-            cregroup.AddEntry(plObject, pPoolTemplate->MaxLimit);
-            SearchPair p(guid, pool_id);
-            mCreatureSearchMap.insert(p);
-
-        } while (result->NextRow());
-        sLog.outString();
-        sLog.outString(">> Loaded %u creatures in pools", count);
-    }
-
-    // Gameobjects
-
-    sLog.outString("Loading Gameobject Pooling Data...");
-
-    mPoolGameobjectGroups.resize(max_pool_id + 1);
-    mGameobjectSearchMap.clear();
-    //                                   1     2           3
-    result = WorldDatabase.Query("SELECT guid, pool_entry, chance FROM pool_gameobject");
-
-    count = 0;
-    if (!result)
-    {
-        barGoLink bar2(1);
-        bar2.step();
-
-        sLog.outString();
-        sLog.outString(">> Loaded %u gameobject in pools", count);
-    }
-    else
-    {
-
-        barGoLink bar2(result->GetRowCount());
-        do
-        {
-            Field *fields = result->Fetch();
-
-            bar2.step();
-
-            uint32 guid    = fields[0].GetUInt32();
-            uint16 pool_id = fields[1].GetUInt16();
-            float chance   = fields[2].GetFloat();
-
-            GameObjectData const* data = objmgr.GetGOData(guid);
-            if (!data)
-            {
-                sLog.outErrorDb("`pool_gameobject` has a non existing gameobject spawn (GUID: %u) defined for pool id (%u), skipped.", guid, pool_id);
-                continue;
-            }
-            GameObjectInfo const* goinfo = objmgr.GetGameObjectInfo(data->id);
-            if (goinfo->type != GAMEOBJECT_TYPE_CHEST &&
-                goinfo->type != GAMEOBJECT_TYPE_GOOBER &&
-                goinfo->type != GAMEOBJECT_TYPE_FISHINGHOLE)
-            {
-                sLog.outErrorDb("`pool_gameobject` has a not lootable gameobject spawn (GUID: %u, type: %u) defined for pool id (%u), skipped.", guid, goinfo->type, pool_id);
-                continue;
-            }
-            if (pool_id > max_pool_id)
-            {
-                sLog.outErrorDb("`pool_gameobject` pool id (%i) is out of range compared to max pool id in `pool_template`, skipped.",pool_id);
-                continue;
-            }
-            if (chance < 0 || chance > 100)
-            {
-                sLog.outErrorDb("`pool_gameobject` has an invalid chance (%f) for gameobject guid (%u) in pool id (%i), skipped.", chance, guid, pool_id);
-                continue;
-            }
-            PoolTemplateData *pPoolTemplate = &mPoolTemplate[pool_id];
-
-            ++count;
-
-            PoolObject plObject = PoolObject(guid, chance);
-            PoolGroup& gogroup = mPoolGameobjectGroups[pool_id];
-            gogroup.SetPoolId(pool_id);
-            gogroup.AddEntry(plObject, pPoolTemplate->MaxLimit);
-            SearchPair p(guid, pool_id);
-            mGameobjectSearchMap.insert(p);
-
-        } while (result->NextRow());
-        sLog.outString();
-        sLog.outString(">> Loaded %u gameobject in pools", count);
-    }
-
-    // Pool of pools
-
-    sLog.outString("Loading Mother Pooling Data...");
-
-    mPoolPoolGroups.resize(max_pool_id + 1);
-    //                                      1        2            3
-    result = WorldDatabase.Query("SELECT pool_id, mother_pool, chance FROM pool_pool");
-
-    count = 0;
-    if (!result)
-    {
-        barGoLink bar2(1);
-        bar2.step();
-
-        sLog.outString();
-        sLog.outString(">> Loaded %u pools in pools", count);
-    }
-    else
-    {
-
-        barGoLink bar2(result->GetRowCount());
-        do
-        {
-            Field *fields = result->Fetch();
-
-            bar2.step();
-
-            uint16 child_pool_id  = fields[0].GetUInt16();
-            uint16 mother_pool_id = fields[1].GetUInt16();
-            float chance          = fields[2].GetFloat();
-
-            if (mother_pool_id > max_pool_id)
-            {
-                sLog.outErrorDb("`pool_pool` mother_pool id (%i) is out of range compared to max pool id in `pool_template`, skipped.",mother_pool_id);
-                continue;
-            }
-            if (child_pool_id > max_pool_id)
-            {
-                sLog.outErrorDb("`pool_pool` included pool_id (%i) is out of range compared to max pool id in `pool_template`, skipped.",child_pool_id);
-                continue;
-            }
-            if (mother_pool_id == child_pool_id)
-            {
-                sLog.outErrorDb("`pool_pool` pool_id (%i) includes itself, dead-lock detected, skipped.",child_pool_id);
-                continue;
-            }
-            if (chance < 0 || chance > 100)
-            {
-                sLog.outErrorDb("`pool_pool` has an invalid chance (%f) for pool id (%u) in mother pool id (%i), skipped.", chance, child_pool_id, mother_pool_id);
-                continue;
-            }
-            PoolTemplateData *pPoolTemplateMother = &mPoolTemplate[mother_pool_id];
-
-            ++count;
-
-            PoolObject plObject = PoolObject(child_pool_id, chance);
-            PoolGroup& plgroup = mPoolPoolGroups[mother_pool_id];
-            plgroup.SetPoolId(mother_pool_id);
-            plgroup.AddEntry(plObject, pPoolTemplateMother->MaxLimit);
-            SearchPair p(child_pool_id, mother_pool_id);
-            mPoolSearchMap.insert(p);
-
-        } while (result->NextRow());
-
-        // Now check for circular reference
-        for (uint16 i=0; i checkedPools;
-            for (SearchMap::iterator poolItr = mPoolSearchMap.find(i); poolItr != mPoolSearchMap.end(); poolItr = mPoolSearchMap.find(poolItr->second))
-            {
-                checkedPools.insert(poolItr->first);
-                if (checkedPools.find(poolItr->second) != checkedPools.end())
-                {
-                    std::ostringstream ss;
-                    ss<< "The pool(s) ";
-                    for (std::set::const_iterator itr=checkedPools.begin(); itr != checkedPools.end(); ++itr)
-                        ss << *itr << " ";
-                    ss << "create(s) a circular reference, which can cause the server to freeze.\nRemoving the last link between mother pool "
-                        << poolItr->first << " and child pool " << poolItr->second;
-                    sLog.outErrorDb(ss.str().c_str());
-                    mPoolPoolGroups[poolItr->second].RemoveOneRelation(poolItr->first);
-                    mPoolSearchMap.erase(poolItr);
-                    --count;
-                    break;
-                }
-            }
-        }
-
-        sLog.outString();
-        sLog.outString(">> Loaded %u pools in mother pools", count);
-    }
-}
-
-// The initialize method will spawn all pools not in an event and not in another pool, this is why there is 2 left joins with 2 null checks
-void PoolHandler::Initialize()
-{
-    QueryResult_AutoPtr result = WorldDatabase.Query("SELECT DISTINCT pool_template.entry, pool_pool.pool_id, pool_pool.mother_pool FROM pool_template LEFT JOIN game_event_pool ON pool_template.entry=game_event_pool.pool_entry LEFT JOIN pool_pool ON pool_template.entry=pool_pool.pool_id WHERE game_event_pool.pool_entry IS NULL");
-    uint32 count=0;
-    if (result)
-    {
-        do
-        {
-            Field *fields = result->Fetch();
-            uint16 pool_entry = fields[0].GetUInt16();
-            uint16 pool_pool_id = fields[1].GetUInt16();
-
-            if (!CheckPool(pool_entry))
-            {
-                if (pool_pool_id)
-                    // The pool is a child pool in pool_pool table. Ideally we should remove it from the pool handler to ensure it never gets spawned,
-                    // however that could recursively invalidate entire chain of mother pools. It can be done in the future but for now we'll do nothing.
-                    sLog.outErrorDb("Pool Id %u has no equal chance pooled entites defined and explicit chance sum is not 100. This broken pool is a child pool of Id %u and cannot be safely removed.", pool_entry, fields[2].GetUInt16());
-                else
-                    sLog.outErrorDb("Pool Id %u has no equal chance pooled entites defined and explicit chance sum is not 100. The pool will not be spawned.", pool_entry);
-                continue;
-            }
-
-            // Don't spawn child pools, they are spawned recursively by their parent pools
-            if (!pool_pool_id)
-            {
-                SpawnPool(pool_entry);;
-                count++;
-            }
-        } while (result->NextRow());
-    }
-
-    sLog.outBasic("Pool handling system initialized, %u pools spawned.", count);
-}
-
-// Call to spawn a pool, if cache if true the method will spawn only if cached entry is different
-// If it's same, the creature is respawned only (added back to map)
-template<>
-void PoolHandler::SpawnPool(uint16 pool_id, uint32 db_guid)
-{
-    if (!mPoolCreatureGroups[pool_id].isEmpty())
-        mPoolCreatureGroups[pool_id].SpawnObject(mSpawnedData, mPoolTemplate[pool_id].MaxLimit, db_guid);
-}
-
-// Call to spawn a pool, if cache if true the method will spawn only if cached entry is different
-// If it's same, the gameobject is respawned only (added back to map)
-template<>
-void PoolHandler::SpawnPool(uint16 pool_id, uint32 db_guid)
-{
-    if (!mPoolGameobjectGroups[pool_id].isEmpty())
-        mPoolGameobjectGroups[pool_id].SpawnObject(mSpawnedData, mPoolTemplate[pool_id].MaxLimit, db_guid);
-}
-
-// Call to spawn a pool, if cache if true the method will spawn only if cached entry is different
-// If it's same, the pool is respawned only
-template<>
-void PoolHandler::SpawnPool(uint16 pool_id, uint32 sub_pool_id)
-{
-    if (!mPoolPoolGroups[pool_id].isEmpty())
-        mPoolPoolGroups[pool_id].SpawnObject(mSpawnedData, mPoolTemplate[pool_id].MaxLimit, sub_pool_id);
-}
-
-void PoolHandler::SpawnPool(uint16 pool_id)
-{
-    SpawnPool(pool_id, 0);
-    SpawnPool(pool_id, 0);
-    SpawnPool(pool_id, 0);
-}
-
-// Call to despawn a pool, all gameobjects/creatures in this pool are removed
-void PoolHandler::DespawnPool(uint16 pool_id)
-{
-    if (!mPoolCreatureGroups[pool_id].isEmpty())
-        mPoolCreatureGroups[pool_id].DespawnObject(mSpawnedData);
-
-    if (!mPoolGameobjectGroups[pool_id].isEmpty())
-        mPoolGameobjectGroups[pool_id].DespawnObject(mSpawnedData);
-
-    if (!mPoolPoolGroups[pool_id].isEmpty())
-        mPoolPoolGroups[pool_id].DespawnObject(mSpawnedData);
-}
-
-// Method that check chance integrity of the creatures and gameobjects in this pool
-bool PoolHandler::CheckPool(uint16 pool_id) const
-{
-    return pool_id <= max_pool_id &&
-        mPoolGameobjectGroups[pool_id].CheckPool() &&
-        mPoolCreatureGroups[pool_id].CheckPool() &&
-        mPoolPoolGroups[pool_id].CheckPool();
-}
-
-// Call to update the pool when a gameobject/creature part of pool [pool_id] is ready to respawn
-// Here we cache only the creature/gameobject whose guid is passed as parameter
-// Then the spawn pool call will use this cache to decide
-template
-void PoolHandler::UpdatePool(uint16 pool_id, uint32 db_guid_or_pool_id)
-{
-    if (uint16 motherpoolid = IsPartOfAPool(pool_id))
-        SpawnPool(motherpoolid, pool_id);
-    else
-        SpawnPool(pool_id, db_guid_or_pool_id);
-}
-
-template void PoolHandler::UpdatePool(uint16 pool_id, uint32 db_guid_or_pool_id);
-template void PoolHandler::UpdatePool(uint16 pool_id, uint32 db_guid_or_pool_id);
-template void PoolHandler::UpdatePool(uint16 pool_id, uint32 db_guid_or_pool_id);
diff --git a/src/server/game/Pools/PoolHandler.h b/src/server/game/Pools/PoolHandler.h
deleted file mode 100644
index 156bc47a2a9..00000000000
--- a/src/server/game/Pools/PoolHandler.h
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * Copyright (C) 2005-2009 MaNGOS 
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef TRINITY_POOLHANDLER_H
-#define TRINITY_POOLHANDLER_H
-
-#include "Define.h"
-#include "ace/Singleton.h"
-#include "Creature.h"
-#include "GameObject.h"
-
-struct PoolTemplateData
-{
-    uint32  MaxLimit;
-};
-
-struct PoolObject
-{
-    uint32  guid;
-    float   chance;
-    PoolObject(uint32 _guid, float _chance): guid(_guid), chance(fabs(_chance)) {}
-};
-
-class Pool                                                  // for Pool of Pool case
-{
-};
-
-typedef std::set SpawnedPoolObjects;
-typedef std::map SpawnedPoolPools;
-
-class SpawnedPoolData
-{
-    public:
-        template
-        bool IsSpawnedObject(uint32 db_guid_or_pool_id) const;
-
-        uint32 GetSpawnedObjects(uint32 pool_id) const;
-
-        template
-        void AddSpawn(uint32 db_guid_or_pool_id, uint32 pool_id);
-
-        template
-        void RemoveSpawn(uint32 db_guid_or_pool_id, uint32 pool_id);
-    private:
-        SpawnedPoolObjects mSpawnedCreatures;
-        SpawnedPoolObjects mSpawnedGameobjects;
-        SpawnedPoolPools   mSpawnedPools;
-};
-
-template 
-class PoolGroup
-{
-    typedef std::vector PoolObjectList;
-    public:
-        explicit PoolGroup() : poolId(0) { }
-        void SetPoolId(uint32 pool_id) { poolId = pool_id; }
-        ~PoolGroup() {};
-        bool isEmpty() const { return ExplicitlyChanced.empty() && EqualChanced.empty(); }
-        void AddEntry(PoolObject& poolitem, uint32 maxentries);
-        bool CheckPool() const;
-        PoolObject* RollOne(SpawnedPoolData& spawns, uint32 triggerFrom);
-        void DespawnObject(SpawnedPoolData& spawns, uint32 guid=0);
-        void Despawn1Object(uint32 guid);
-        void SpawnObject(SpawnedPoolData& spawns, uint32 limit, uint32 triggerFrom);
-
-        void Spawn1Object(PoolObject* obj);
-        void ReSpawn1Object(PoolObject* obj);
-        void RemoveOneRelation(uint16 child_pool_id);
-    private:
-        uint32 poolId;
-        PoolObjectList ExplicitlyChanced;
-        PoolObjectList EqualChanced;
-};
-
-class PoolHandler
-{
-    friend class ACE_Singleton;
-    PoolHandler();
-    ~PoolHandler() {};
-
-    public:
-        void LoadFromDB();
-        void Initialize();
-
-        template
-        uint16 IsPartOfAPool(uint32 db_guid_or_pool_id) const;
-
-        template
-        bool IsSpawnedObject(uint32 db_guid_or_pool_id) const { return mSpawnedData.IsSpawnedObject(db_guid_or_pool_id); }
-
-        bool CheckPool(uint16 pool_id) const;
-
-        void SpawnPool(uint16 pool_id);
-        void DespawnPool(uint16 pool_id);
-
-        template
-        void UpdatePool(uint16 pool_id, uint32 db_guid_or_pool_id);
-
-    protected:
-        template
-        void SpawnPool(uint16 pool_id, uint32 db_guid_or_pool_id);
-
-        uint16 max_pool_id;
-        typedef std::vector PoolTemplateDataMap;
-        typedef std::vector >   PoolGroupCreatureMap;
-        typedef std::vector > PoolGroupGameObjectMap;
-        typedef std::vector >       PoolGroupPoolMap;
-        typedef std::pair SearchPair;
-        typedef std::map SearchMap;
-
-        PoolTemplateDataMap mPoolTemplate;
-        PoolGroupCreatureMap mPoolCreatureGroups;
-        PoolGroupGameObjectMap mPoolGameobjectGroups;
-        PoolGroupPoolMap mPoolPoolGroups;
-        SearchMap mCreatureSearchMap;
-        SearchMap mGameobjectSearchMap;
-        SearchMap mPoolSearchMap;
-
-        // dynamic data
-        SpawnedPoolData mSpawnedData;
-};
-
-#define poolhandler (*ACE_Singleton::instance())
-
-// Method that tell if the creature is part of a pool and return the pool id if yes
-template<>
-inline uint16 PoolHandler::IsPartOfAPool(uint32 db_guid) const
-{
-    SearchMap::const_iterator itr = mCreatureSearchMap.find(db_guid);
-    if (itr != mCreatureSearchMap.end())
-        return itr->second;
-
-    return 0;
-}
-
-// Method that tell if the gameobject is part of a pool and return the pool id if yes
-template<>
-inline uint16 PoolHandler::IsPartOfAPool(uint32 db_guid) const
-{
-    SearchMap::const_iterator itr = mGameobjectSearchMap.find(db_guid);
-    if (itr != mGameobjectSearchMap.end())
-        return itr->second;
-
-    return 0;
-}
-
-// Method that tell if the pool is part of another pool and return the pool id if yes
-template<>
-inline uint16 PoolHandler::IsPartOfAPool(uint32 pool_id) const
-{
-    SearchMap::const_iterator itr = mPoolSearchMap.find(pool_id);
-    if (itr != mPoolSearchMap.end())
-        return itr->second;
-
-    return 0;
-}
-
-#endif
diff --git a/src/server/game/Pools/PoolMgr.cpp b/src/server/game/Pools/PoolMgr.cpp
new file mode 100644
index 00000000000..28fb67ad4dd
--- /dev/null
+++ b/src/server/game/Pools/PoolMgr.cpp
@@ -0,0 +1,762 @@
+/*
+ * Copyright (C) 2005-2009 MaNGOS 
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "PoolMgr.h"
+#include "ObjectMgr.h"
+#include "ProgressBar.h"
+#include "Log.h"
+#include "MapManager.h"
+
+////////////////////////////////////////////////////////////
+// template class SpawnedPoolData
+
+// Method that tell amount spawned objects/subpools
+uint32 SpawnedPoolData::GetSpawnedObjects(uint32 pool_id) const
+{
+    SpawnedPoolPools::const_iterator itr = mSpawnedPools.find(pool_id);
+    return itr != mSpawnedPools.end() ? itr->second : 0;
+}
+
+// Method that tell if a creature is spawned currently
+template<>
+bool SpawnedPoolData::IsSpawnedObject(uint32 db_guid) const
+{
+    return mSpawnedCreatures.find(db_guid) != mSpawnedCreatures.end();
+}
+
+// Method that tell if a gameobject is spawned currently
+template<>
+bool SpawnedPoolData::IsSpawnedObject(uint32 db_guid) const
+{
+    return mSpawnedGameobjects.find(db_guid) != mSpawnedGameobjects.end();
+}
+
+// Method that tell if a pool is spawned currently
+template<>
+bool SpawnedPoolData::IsSpawnedObject(uint32 sub_pool_id) const
+{
+    return mSpawnedPools.find(sub_pool_id) != mSpawnedPools.end();
+}
+
+template<>
+void SpawnedPoolData::AddSpawn(uint32 db_guid, uint32 pool_id)
+{
+    mSpawnedCreatures.insert(db_guid);
+    ++mSpawnedPools[pool_id];
+}
+
+template<>
+void SpawnedPoolData::AddSpawn(uint32 db_guid, uint32 pool_id)
+{
+    mSpawnedGameobjects.insert(db_guid);
+    ++mSpawnedPools[pool_id];
+}
+
+template<>
+void SpawnedPoolData::AddSpawn(uint32 sub_pool_id, uint32 pool_id)
+{
+    mSpawnedPools[sub_pool_id] = 0;
+    ++mSpawnedPools[pool_id];
+}
+
+template<>
+void SpawnedPoolData::RemoveSpawn(uint32 db_guid, uint32 pool_id)
+{
+    mSpawnedCreatures.erase(db_guid);
+    uint32& val = mSpawnedPools[pool_id];
+    if (val > 0)
+        --val;
+}
+
+template<>
+void SpawnedPoolData::RemoveSpawn(uint32 db_guid, uint32 pool_id)
+{
+    mSpawnedGameobjects.erase(db_guid);
+    uint32& val = mSpawnedPools[pool_id];
+    if (val > 0)
+        --val;
+}
+
+template<>
+void SpawnedPoolData::RemoveSpawn(uint32 sub_pool_id, uint32 pool_id)
+{
+    mSpawnedPools.erase(sub_pool_id);
+    uint32& val = mSpawnedPools[pool_id];
+    if (val > 0)
+        --val;
+}
+
+////////////////////////////////////////////////////////////
+// Methods of template class PoolGroup
+
+// Method to add a gameobject/creature guid to the proper list depending on pool type and chance value
+template 
+void PoolGroup::AddEntry(PoolObject& poolitem, uint32 maxentries)
+{
+    if (poolitem.chance != 0 && maxentries == 1)
+        ExplicitlyChanced.push_back(poolitem);
+    else
+        EqualChanced.push_back(poolitem);
+}
+
+// Method to check the chances are proper in this object pool
+template 
+bool PoolGroup::CheckPool() const
+{
+    if (!EqualChanced.size())
+    {
+        float chance = 0;
+        for (uint32 i = 0; i < ExplicitlyChanced.size(); ++i)
+            chance += ExplicitlyChanced[i].chance;
+        if (chance != 100 && chance != 0)
+            return false;
+    }
+    return true;
+}
+
+template 
+PoolObject* PoolGroup::RollOne(SpawnedPoolData& spawns, uint32 triggerFrom)
+{
+    if (!ExplicitlyChanced.empty())
+    {
+        float roll = (float)rand_chance();
+
+        for (uint32 i=0; i(ExplicitlyChanced[i].guid)))
+               return &ExplicitlyChanced[i];
+        }
+    }
+    if (!EqualChanced.empty())
+    {
+        int32 index = irand(0, EqualChanced.size()-1);
+        // Triggering object is marked as spawned at this time and can be also rolled (respawn case)
+        // so this need explicit check for this case
+        if (EqualChanced[index].guid == triggerFrom || !spawns.IsSpawnedObject(EqualChanced[index].guid))
+           return &EqualChanced[index];
+    }
+
+    return NULL;
+}
+
+// Main method to despawn a creature or gameobject in a pool
+// If no guid is passed, the pool is just removed (event end case)
+// If guid is filled, cache will be used and no removal will occur, it just fill the cache
+template
+void PoolGroup::DespawnObject(SpawnedPoolData& spawns, uint32 guid)
+{
+    for (size_t i=0; i(EqualChanced[i].guid))
+        {
+            if (!guid || EqualChanced[i].guid == guid)
+            {
+                Despawn1Object(EqualChanced[i].guid);
+                spawns.RemoveSpawn(EqualChanced[i].guid,poolId);
+            }
+        }
+    }
+
+    for (size_t i = 0; i < ExplicitlyChanced.size(); ++i)
+    {
+        // spawned
+        if (spawns.IsSpawnedObject(ExplicitlyChanced[i].guid))
+        {
+            if (!guid || ExplicitlyChanced[i].guid == guid)
+            {
+                Despawn1Object(ExplicitlyChanced[i].guid);
+                spawns.RemoveSpawn(ExplicitlyChanced[i].guid,poolId);
+            }
+        }
+    }
+}
+
+// Method that is actualy doing the removal job on one creature
+template<>
+void PoolGroup::Despawn1Object(uint32 guid)
+{
+    if (CreatureData const* data = objmgr.GetCreatureData(guid))
+    {
+        objmgr.RemoveCreatureFromGrid(guid, data);
+
+        if (Creature* pCreature = sObjectAccessor.GetObjectInWorld(MAKE_NEW_GUID(guid, data->id, HIGHGUID_UNIT), (Creature*)NULL))
+            pCreature->AddObjectToRemoveList();
+    }
+}
+
+// Same on one gameobject
+template<>
+void PoolGroup::Despawn1Object(uint32 guid)
+{
+    if (GameObjectData const* data = objmgr.GetGOData(guid))
+    {
+        objmgr.RemoveGameobjectFromGrid(guid, data);
+
+        if (GameObject* pGameobject = sObjectAccessor.GetObjectInWorld(MAKE_NEW_GUID(guid, data->id, HIGHGUID_GAMEOBJECT), (GameObject*)NULL))
+            pGameobject->AddObjectToRemoveList();
+    }
+}
+
+// Same on one pool
+template<>
+void PoolGroup::Despawn1Object(uint32 child_pool_id)
+{
+    poolhandler.DespawnPool(child_pool_id);
+}
+
+// Method for a pool only to remove any found record causing a circular dependency loop
+template<>
+void PoolGroup::RemoveOneRelation(uint16 child_pool_id)
+{
+    for (PoolObjectList::iterator itr = ExplicitlyChanced.begin(); itr != ExplicitlyChanced.end(); ++itr)
+    {
+        if (itr->guid == child_pool_id)
+        {
+            ExplicitlyChanced.erase(itr);
+            break;
+        }
+    }
+    for (PoolObjectList::iterator itr = EqualChanced.begin(); itr != EqualChanced.end(); ++itr)
+    {
+        if (itr->guid == child_pool_id)
+        {
+            EqualChanced.erase(itr);
+            break;
+        }
+    }
+}
+
+template 
+void PoolGroup::SpawnObject(SpawnedPoolData& spawns, uint32 limit, uint32 triggerFrom)
+{
+    uint32 lastDespawned = 0;
+    int count = limit - spawns.GetSpawnedObjects(poolId);
+
+    // If triggered from some object respawn this object is still marked as spawned
+    // and also counted into m_SpawnedPoolAmount so we need increase count to be
+    // spawned by 1
+    if (triggerFrom)
+        ++count;
+
+    // This will try to spawn the rest of pool, not guaranteed
+    for (int i = 0; i < count; ++i)
+    {
+        PoolObject* obj = RollOne(spawns,triggerFrom);
+        if (!obj)
+            continue;
+        if (obj->guid == lastDespawned)
+            continue;
+
+        if (obj->guid == triggerFrom)
+        {
+            ReSpawn1Object(obj);
+            triggerFrom = 0;
+            continue;
+        }
+        spawns.AddSpawn(obj->guid,poolId);
+        Spawn1Object(obj);
+
+        if (triggerFrom)
+        {
+            // One spawn one despawn no count increase
+            DespawnObject(spawns, triggerFrom);
+            lastDespawned = triggerFrom;
+            triggerFrom = 0;
+        }
+    }
+}
+
+// Method that is actualy doing the spawn job on 1 creature
+template <>
+void PoolGroup::Spawn1Object(PoolObject* obj)
+{
+    if (CreatureData const* data = objmgr.GetCreatureData(obj->guid))
+    {
+        objmgr.AddCreatureToGrid(obj->guid, data);
+
+        // Spawn if necessary (loaded grids only)
+        Map* map = const_cast(sMapMgr.CreateBaseMap(data->mapid));
+        // We use spawn coords to spawn
+        if (!map->Instanceable() && map->IsLoaded(data->posX, data->posY))
+        {
+            Creature* pCreature = new Creature;
+            //sLog.outDebug("Spawning creature %u",guid);
+            if (!pCreature->LoadFromDB(obj->guid, map))
+            {
+                delete pCreature;
+                return;
+            }
+            else
+                map->Add(pCreature);
+        }
+    }
+}
+
+// Same for 1 gameobject
+template <>
+void PoolGroup::Spawn1Object(PoolObject* obj)
+{
+    if (GameObjectData const* data = objmgr.GetGOData(obj->guid))
+    {
+        objmgr.AddGameobjectToGrid(obj->guid, data);
+        // Spawn if necessary (loaded grids only)
+        // this base map checked as non-instanced and then only existed
+        Map* map = const_cast(sMapMgr.CreateBaseMap(data->mapid));
+        // We use current coords to unspawn, not spawn coords since creature can have changed grid
+        if (!map->Instanceable() && map->IsLoaded(data->posX, data->posY))
+        {
+            GameObject* pGameobject = new GameObject;
+            //sLog.outDebug("Spawning gameobject %u", guid);
+            if (!pGameobject->LoadFromDB(obj->guid, map))
+            {
+                delete pGameobject;
+                return;
+            }
+            else
+            {
+                if (pGameobject->isSpawnedByDefault())
+                    map->Add(pGameobject);
+            }
+        }
+    }
+}
+
+// Same for 1 pool
+template <>
+void PoolGroup::Spawn1Object(PoolObject* obj)
+{
+    poolhandler.SpawnPool(obj->guid);
+}
+
+// Method that does the respawn job on the specified creature
+template <>
+void PoolGroup::ReSpawn1Object(PoolObject* obj)
+{
+    if (CreatureData const* data = objmgr.GetCreatureData(obj->guid))
+        if (Creature* pCreature = sObjectAccessor.GetObjectInWorld(MAKE_NEW_GUID(obj->guid, data->id, HIGHGUID_UNIT), (Creature*)NULL))
+            pCreature->GetMap()->Add(pCreature);
+}
+
+// Method that does the respawn job on the specified gameobject
+template <>
+void PoolGroup::ReSpawn1Object(PoolObject* obj)
+{
+    if (GameObjectData const* data = objmgr.GetGOData(obj->guid))
+        if (GameObject* pGameobject = sObjectAccessor.GetObjectInWorld(MAKE_NEW_GUID(obj->guid, data->id, HIGHGUID_GAMEOBJECT), (GameObject*)NULL))
+            pGameobject->GetMap()->Add(pGameobject);
+}
+
+// Nothing to do for a child Pool
+template <>
+void PoolGroup::ReSpawn1Object(PoolObject* /*obj*/)
+{
+}
+
+////////////////////////////////////////////////////////////
+// Methods of class PoolMgr
+
+PoolMgr::PoolMgr()
+{
+}
+
+void PoolMgr::LoadFromDB()
+{
+    QueryResult_AutoPtr result = WorldDatabase.Query("SELECT MAX(entry) FROM pool_template");
+    if (!result)
+    {
+        sLog.outString(">> Table pool_template is empty.");
+        sLog.outString();
+        return;
+    }
+    else
+    {
+        Field *fields = result->Fetch();
+        max_pool_id = fields[0].GetUInt16();
+    }
+
+    mPoolTemplate.resize(max_pool_id + 1);
+
+    result = WorldDatabase.Query("SELECT entry,max_limit FROM pool_template");
+    if (!result)
+    {
+        mPoolTemplate.clear();
+        sLog.outString(">> Table pool_template is empty:");
+        sLog.outString();
+        return;
+    }
+
+    uint32 count = 0;
+
+    barGoLink bar(result->GetRowCount());
+    do
+    {
+        ++count;
+        Field *fields = result->Fetch();
+
+        bar.step();
+
+        uint16 pool_id = fields[0].GetUInt16();
+
+        PoolTemplateData& pPoolTemplate = mPoolTemplate[pool_id];
+        pPoolTemplate.MaxLimit  = fields[1].GetUInt32();
+
+    } while (result->NextRow());
+
+    sLog.outString();
+    sLog.outString(">> Loaded %u objects pools", count);
+
+    // Creatures
+
+    sLog.outString();
+    sLog.outString("Loading Creatures Pooling Data...");
+
+    mPoolCreatureGroups.resize(max_pool_id + 1);
+    mCreatureSearchMap.clear();
+    //                                   1     2           3
+    result = WorldDatabase.Query("SELECT guid, pool_entry, chance FROM pool_creature");
+
+    count = 0;
+    if (!result)
+    {
+        barGoLink bar2(1);
+        bar2.step();
+
+        sLog.outString();
+        sLog.outString(">> Loaded %u creatures in pools", count);
+    }
+    else
+    {
+
+        barGoLink bar2(result->GetRowCount());
+        do
+        {
+            Field *fields = result->Fetch();
+
+            bar2.step();
+
+            uint32 guid    = fields[0].GetUInt32();
+            uint16 pool_id = fields[1].GetUInt16();
+            float chance   = fields[2].GetFloat();
+
+            CreatureData const* data = objmgr.GetCreatureData(guid);
+            if (!data)
+            {
+                sLog.outErrorDb("`pool_creature` has a non existing creature spawn (GUID: %u) defined for pool id (%u), skipped.", guid, pool_id);
+                continue;
+            }
+            if (pool_id > max_pool_id)
+            {
+                sLog.outErrorDb("`pool_creature` pool id (%i) is out of range compared to max pool id in `pool_template`, skipped.",pool_id);
+                continue;
+            }
+            if (chance < 0 || chance > 100)
+            {
+                sLog.outErrorDb("`pool_creature` has an invalid chance (%f) for creature guid (%u) in pool id (%i), skipped.", chance, guid, pool_id);
+                continue;
+            }
+            PoolTemplateData *pPoolTemplate = &mPoolTemplate[pool_id];
+            ++count;
+
+            PoolObject plObject = PoolObject(guid, chance);
+            PoolGroup& cregroup = mPoolCreatureGroups[pool_id];
+            cregroup.SetPoolId(pool_id);
+            cregroup.AddEntry(plObject, pPoolTemplate->MaxLimit);
+            SearchPair p(guid, pool_id);
+            mCreatureSearchMap.insert(p);
+
+        } while (result->NextRow());
+        sLog.outString();
+        sLog.outString(">> Loaded %u creatures in pools", count);
+    }
+
+    // Gameobjects
+
+    sLog.outString("Loading Gameobject Pooling Data...");
+
+    mPoolGameobjectGroups.resize(max_pool_id + 1);
+    mGameobjectSearchMap.clear();
+    //                                   1     2           3
+    result = WorldDatabase.Query("SELECT guid, pool_entry, chance FROM pool_gameobject");
+
+    count = 0;
+    if (!result)
+    {
+        barGoLink bar2(1);
+        bar2.step();
+
+        sLog.outString();
+        sLog.outString(">> Loaded %u gameobject in pools", count);
+    }
+    else
+    {
+
+        barGoLink bar2(result->GetRowCount());
+        do
+        {
+            Field *fields = result->Fetch();
+
+            bar2.step();
+
+            uint32 guid    = fields[0].GetUInt32();
+            uint16 pool_id = fields[1].GetUInt16();
+            float chance   = fields[2].GetFloat();
+
+            GameObjectData const* data = objmgr.GetGOData(guid);
+            if (!data)
+            {
+                sLog.outErrorDb("`pool_gameobject` has a non existing gameobject spawn (GUID: %u) defined for pool id (%u), skipped.", guid, pool_id);
+                continue;
+            }
+            GameObjectInfo const* goinfo = objmgr.GetGameObjectInfo(data->id);
+            if (goinfo->type != GAMEOBJECT_TYPE_CHEST &&
+                goinfo->type != GAMEOBJECT_TYPE_GOOBER &&
+                goinfo->type != GAMEOBJECT_TYPE_FISHINGHOLE)
+            {
+                sLog.outErrorDb("`pool_gameobject` has a not lootable gameobject spawn (GUID: %u, type: %u) defined for pool id (%u), skipped.", guid, goinfo->type, pool_id);
+                continue;
+            }
+            if (pool_id > max_pool_id)
+            {
+                sLog.outErrorDb("`pool_gameobject` pool id (%i) is out of range compared to max pool id in `pool_template`, skipped.",pool_id);
+                continue;
+            }
+            if (chance < 0 || chance > 100)
+            {
+                sLog.outErrorDb("`pool_gameobject` has an invalid chance (%f) for gameobject guid (%u) in pool id (%i), skipped.", chance, guid, pool_id);
+                continue;
+            }
+            PoolTemplateData *pPoolTemplate = &mPoolTemplate[pool_id];
+
+            ++count;
+
+            PoolObject plObject = PoolObject(guid, chance);
+            PoolGroup& gogroup = mPoolGameobjectGroups[pool_id];
+            gogroup.SetPoolId(pool_id);
+            gogroup.AddEntry(plObject, pPoolTemplate->MaxLimit);
+            SearchPair p(guid, pool_id);
+            mGameobjectSearchMap.insert(p);
+
+        } while (result->NextRow());
+        sLog.outString();
+        sLog.outString(">> Loaded %u gameobject in pools", count);
+    }
+
+    // Pool of pools
+
+    sLog.outString("Loading Mother Pooling Data...");
+
+    mPoolPoolGroups.resize(max_pool_id + 1);
+    //                                      1        2            3
+    result = WorldDatabase.Query("SELECT pool_id, mother_pool, chance FROM pool_pool");
+
+    count = 0;
+    if (!result)
+    {
+        barGoLink bar2(1);
+        bar2.step();
+
+        sLog.outString();
+        sLog.outString(">> Loaded %u pools in pools", count);
+    }
+    else
+    {
+
+        barGoLink bar2(result->GetRowCount());
+        do
+        {
+            Field *fields = result->Fetch();
+
+            bar2.step();
+
+            uint16 child_pool_id  = fields[0].GetUInt16();
+            uint16 mother_pool_id = fields[1].GetUInt16();
+            float chance          = fields[2].GetFloat();
+
+            if (mother_pool_id > max_pool_id)
+            {
+                sLog.outErrorDb("`pool_pool` mother_pool id (%i) is out of range compared to max pool id in `pool_template`, skipped.",mother_pool_id);
+                continue;
+            }
+            if (child_pool_id > max_pool_id)
+            {
+                sLog.outErrorDb("`pool_pool` included pool_id (%i) is out of range compared to max pool id in `pool_template`, skipped.",child_pool_id);
+                continue;
+            }
+            if (mother_pool_id == child_pool_id)
+            {
+                sLog.outErrorDb("`pool_pool` pool_id (%i) includes itself, dead-lock detected, skipped.",child_pool_id);
+                continue;
+            }
+            if (chance < 0 || chance > 100)
+            {
+                sLog.outErrorDb("`pool_pool` has an invalid chance (%f) for pool id (%u) in mother pool id (%i), skipped.", chance, child_pool_id, mother_pool_id);
+                continue;
+            }
+            PoolTemplateData *pPoolTemplateMother = &mPoolTemplate[mother_pool_id];
+
+            ++count;
+
+            PoolObject plObject = PoolObject(child_pool_id, chance);
+            PoolGroup& plgroup = mPoolPoolGroups[mother_pool_id];
+            plgroup.SetPoolId(mother_pool_id);
+            plgroup.AddEntry(plObject, pPoolTemplateMother->MaxLimit);
+            SearchPair p(child_pool_id, mother_pool_id);
+            mPoolSearchMap.insert(p);
+
+        } while (result->NextRow());
+
+        // Now check for circular reference
+        for (uint16 i=0; i checkedPools;
+            for (SearchMap::iterator poolItr = mPoolSearchMap.find(i); poolItr != mPoolSearchMap.end(); poolItr = mPoolSearchMap.find(poolItr->second))
+            {
+                checkedPools.insert(poolItr->first);
+                if (checkedPools.find(poolItr->second) != checkedPools.end())
+                {
+                    std::ostringstream ss;
+                    ss<< "The pool(s) ";
+                    for (std::set::const_iterator itr=checkedPools.begin(); itr != checkedPools.end(); ++itr)
+                        ss << *itr << " ";
+                    ss << "create(s) a circular reference, which can cause the server to freeze.\nRemoving the last link between mother pool "
+                        << poolItr->first << " and child pool " << poolItr->second;
+                    sLog.outErrorDb(ss.str().c_str());
+                    mPoolPoolGroups[poolItr->second].RemoveOneRelation(poolItr->first);
+                    mPoolSearchMap.erase(poolItr);
+                    --count;
+                    break;
+                }
+            }
+        }
+
+        sLog.outString();
+        sLog.outString(">> Loaded %u pools in mother pools", count);
+    }
+}
+
+// The initialize method will spawn all pools not in an event and not in another pool, this is why there is 2 left joins with 2 null checks
+void PoolMgr::Initialize()
+{
+    QueryResult_AutoPtr result = WorldDatabase.Query("SELECT DISTINCT pool_template.entry, pool_pool.pool_id, pool_pool.mother_pool FROM pool_template LEFT JOIN game_event_pool ON pool_template.entry=game_event_pool.pool_entry LEFT JOIN pool_pool ON pool_template.entry=pool_pool.pool_id WHERE game_event_pool.pool_entry IS NULL");
+    uint32 count=0;
+    if (result)
+    {
+        do
+        {
+            Field *fields = result->Fetch();
+            uint16 pool_entry = fields[0].GetUInt16();
+            uint16 pool_pool_id = fields[1].GetUInt16();
+
+            if (!CheckPool(pool_entry))
+            {
+                if (pool_pool_id)
+                    // The pool is a child pool in pool_pool table. Ideally we should remove it from the pool handler to ensure it never gets spawned,
+                    // however that could recursively invalidate entire chain of mother pools. It can be done in the future but for now we'll do nothing.
+                    sLog.outErrorDb("Pool Id %u has no equal chance pooled entites defined and explicit chance sum is not 100. This broken pool is a child pool of Id %u and cannot be safely removed.", pool_entry, fields[2].GetUInt16());
+                else
+                    sLog.outErrorDb("Pool Id %u has no equal chance pooled entites defined and explicit chance sum is not 100. The pool will not be spawned.", pool_entry);
+                continue;
+            }
+
+            // Don't spawn child pools, they are spawned recursively by their parent pools
+            if (!pool_pool_id)
+            {
+                SpawnPool(pool_entry);;
+                count++;
+            }
+        } while (result->NextRow());
+    }
+
+    sLog.outBasic("Pool handling system initialized, %u pools spawned.", count);
+}
+
+// Call to spawn a pool, if cache if true the method will spawn only if cached entry is different
+// If it's same, the creature is respawned only (added back to map)
+template<>
+void PoolMgr::SpawnPool(uint16 pool_id, uint32 db_guid)
+{
+    if (!mPoolCreatureGroups[pool_id].isEmpty())
+        mPoolCreatureGroups[pool_id].SpawnObject(mSpawnedData, mPoolTemplate[pool_id].MaxLimit, db_guid);
+}
+
+// Call to spawn a pool, if cache if true the method will spawn only if cached entry is different
+// If it's same, the gameobject is respawned only (added back to map)
+template<>
+void PoolMgr::SpawnPool(uint16 pool_id, uint32 db_guid)
+{
+    if (!mPoolGameobjectGroups[pool_id].isEmpty())
+        mPoolGameobjectGroups[pool_id].SpawnObject(mSpawnedData, mPoolTemplate[pool_id].MaxLimit, db_guid);
+}
+
+// Call to spawn a pool, if cache if true the method will spawn only if cached entry is different
+// If it's same, the pool is respawned only
+template<>
+void PoolMgr::SpawnPool(uint16 pool_id, uint32 sub_pool_id)
+{
+    if (!mPoolPoolGroups[pool_id].isEmpty())
+        mPoolPoolGroups[pool_id].SpawnObject(mSpawnedData, mPoolTemplate[pool_id].MaxLimit, sub_pool_id);
+}
+
+void PoolMgr::SpawnPool(uint16 pool_id)
+{
+    SpawnPool(pool_id, 0);
+    SpawnPool(pool_id, 0);
+    SpawnPool(pool_id, 0);
+}
+
+// Call to despawn a pool, all gameobjects/creatures in this pool are removed
+void PoolMgr::DespawnPool(uint16 pool_id)
+{
+    if (!mPoolCreatureGroups[pool_id].isEmpty())
+        mPoolCreatureGroups[pool_id].DespawnObject(mSpawnedData);
+
+    if (!mPoolGameobjectGroups[pool_id].isEmpty())
+        mPoolGameobjectGroups[pool_id].DespawnObject(mSpawnedData);
+
+    if (!mPoolPoolGroups[pool_id].isEmpty())
+        mPoolPoolGroups[pool_id].DespawnObject(mSpawnedData);
+}
+
+// Method that check chance integrity of the creatures and gameobjects in this pool
+bool PoolMgr::CheckPool(uint16 pool_id) const
+{
+    return pool_id <= max_pool_id &&
+        mPoolGameobjectGroups[pool_id].CheckPool() &&
+        mPoolCreatureGroups[pool_id].CheckPool() &&
+        mPoolPoolGroups[pool_id].CheckPool();
+}
+
+// Call to update the pool when a gameobject/creature part of pool [pool_id] is ready to respawn
+// Here we cache only the creature/gameobject whose guid is passed as parameter
+// Then the spawn pool call will use this cache to decide
+template
+void PoolMgr::UpdatePool(uint16 pool_id, uint32 db_guid_or_pool_id)
+{
+    if (uint16 motherpoolid = IsPartOfAPool(pool_id))
+        SpawnPool(motherpoolid, pool_id);
+    else
+        SpawnPool(pool_id, db_guid_or_pool_id);
+}
+
+template void PoolMgr::UpdatePool(uint16 pool_id, uint32 db_guid_or_pool_id);
+template void PoolMgr::UpdatePool(uint16 pool_id, uint32 db_guid_or_pool_id);
+template void PoolMgr::UpdatePool(uint16 pool_id, uint32 db_guid_or_pool_id);
diff --git a/src/server/game/Pools/PoolMgr.h b/src/server/game/Pools/PoolMgr.h
new file mode 100644
index 00000000000..71cae3e4a1b
--- /dev/null
+++ b/src/server/game/Pools/PoolMgr.h
@@ -0,0 +1,173 @@
+/*
+ * Copyright (C) 2005-2009 MaNGOS 
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef TRINITY_POOLHANDLER_H
+#define TRINITY_POOLHANDLER_H
+
+#include "Define.h"
+#include "ace/Singleton.h"
+#include "Creature.h"
+#include "GameObject.h"
+
+struct PoolTemplateData
+{
+    uint32  MaxLimit;
+};
+
+struct PoolObject
+{
+    uint32  guid;
+    float   chance;
+    PoolObject(uint32 _guid, float _chance): guid(_guid), chance(fabs(_chance)) {}
+};
+
+class Pool                                                  // for Pool of Pool case
+{
+};
+
+typedef std::set SpawnedPoolObjects;
+typedef std::map SpawnedPoolPools;
+
+class SpawnedPoolData
+{
+    public:
+        template
+        bool IsSpawnedObject(uint32 db_guid_or_pool_id) const;
+
+        uint32 GetSpawnedObjects(uint32 pool_id) const;
+
+        template
+        void AddSpawn(uint32 db_guid_or_pool_id, uint32 pool_id);
+
+        template
+        void RemoveSpawn(uint32 db_guid_or_pool_id, uint32 pool_id);
+    private:
+        SpawnedPoolObjects mSpawnedCreatures;
+        SpawnedPoolObjects mSpawnedGameobjects;
+        SpawnedPoolPools   mSpawnedPools;
+};
+
+template 
+class PoolGroup
+{
+    typedef std::vector PoolObjectList;
+    public:
+        explicit PoolGroup() : poolId(0) { }
+        void SetPoolId(uint32 pool_id) { poolId = pool_id; }
+        ~PoolGroup() {};
+        bool isEmpty() const { return ExplicitlyChanced.empty() && EqualChanced.empty(); }
+        void AddEntry(PoolObject& poolitem, uint32 maxentries);
+        bool CheckPool() const;
+        PoolObject* RollOne(SpawnedPoolData& spawns, uint32 triggerFrom);
+        void DespawnObject(SpawnedPoolData& spawns, uint32 guid=0);
+        void Despawn1Object(uint32 guid);
+        void SpawnObject(SpawnedPoolData& spawns, uint32 limit, uint32 triggerFrom);
+
+        void Spawn1Object(PoolObject* obj);
+        void ReSpawn1Object(PoolObject* obj);
+        void RemoveOneRelation(uint16 child_pool_id);
+    private:
+        uint32 poolId;
+        PoolObjectList ExplicitlyChanced;
+        PoolObjectList EqualChanced;
+};
+
+class PoolMgr
+{
+    friend class ACE_Singleton;
+    PoolMgr();
+    ~PoolMgr() {};
+
+    public:
+        void LoadFromDB();
+        void Initialize();
+
+        template
+        uint16 IsPartOfAPool(uint32 db_guid_or_pool_id) const;
+
+        template
+        bool IsSpawnedObject(uint32 db_guid_or_pool_id) const { return mSpawnedData.IsSpawnedObject(db_guid_or_pool_id); }
+
+        bool CheckPool(uint16 pool_id) const;
+
+        void SpawnPool(uint16 pool_id);
+        void DespawnPool(uint16 pool_id);
+
+        template
+        void UpdatePool(uint16 pool_id, uint32 db_guid_or_pool_id);
+
+    protected:
+        template
+        void SpawnPool(uint16 pool_id, uint32 db_guid_or_pool_id);
+
+        uint16 max_pool_id;
+        typedef std::vector PoolTemplateDataMap;
+        typedef std::vector >   PoolGroupCreatureMap;
+        typedef std::vector > PoolGroupGameObjectMap;
+        typedef std::vector >       PoolGroupPoolMap;
+        typedef std::pair SearchPair;
+        typedef std::map SearchMap;
+
+        PoolTemplateDataMap mPoolTemplate;
+        PoolGroupCreatureMap mPoolCreatureGroups;
+        PoolGroupGameObjectMap mPoolGameobjectGroups;
+        PoolGroupPoolMap mPoolPoolGroups;
+        SearchMap mCreatureSearchMap;
+        SearchMap mGameobjectSearchMap;
+        SearchMap mPoolSearchMap;
+
+        // dynamic data
+        SpawnedPoolData mSpawnedData;
+};
+
+#define poolhandler (*ACE_Singleton::instance())
+
+// Method that tell if the creature is part of a pool and return the pool id if yes
+template<>
+inline uint16 PoolMgr::IsPartOfAPool(uint32 db_guid) const
+{
+    SearchMap::const_iterator itr = mCreatureSearchMap.find(db_guid);
+    if (itr != mCreatureSearchMap.end())
+        return itr->second;
+
+    return 0;
+}
+
+// Method that tell if the gameobject is part of a pool and return the pool id if yes
+template<>
+inline uint16 PoolMgr::IsPartOfAPool(uint32 db_guid) const
+{
+    SearchMap::const_iterator itr = mGameobjectSearchMap.find(db_guid);
+    if (itr != mGameobjectSearchMap.end())
+        return itr->second;
+
+    return 0;
+}
+
+// Method that tell if the pool is part of another pool and return the pool id if yes
+template<>
+inline uint16 PoolMgr::IsPartOfAPool(uint32 pool_id) const
+{
+    SearchMap::const_iterator itr = mPoolSearchMap.find(pool_id);
+    if (itr != mPoolSearchMap.end())
+        return itr->second;
+
+    return 0;
+}
+
+#endif
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
index 7d0b91e38de..27de78412a7 100644
--- a/src/server/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
@@ -56,7 +56,7 @@
 #include "VMapFactory.h"
 #include "GlobalEvents.h"
 #include "GameEventMgr.h"
-#include "PoolHandler.h"
+#include "PoolMgr.h"
 #include "DatabaseImpl.h"
 #include "GridNotifiersImpl.h"
 #include "CellImpl.h"
-- 
cgit v1.2.3


From 09cde730723a7d3774c2d218403f7c78f356a207 Mon Sep 17 00:00:00 2001
From: click 
Date: Fri, 25 Jun 2010 18:00:51 +0200
Subject: Set revision.h to be a prerequisite of worldserver and authserver
 building on *nix

--HG--
branch : trunk
---
 src/server/authserver/CMakeLists.txt  | 2 ++
 src/server/worldserver/CMakeLists.txt | 2 ++
 2 files changed, 4 insertions(+)

(limited to 'src')

diff --git a/src/server/authserver/CMakeLists.txt b/src/server/authserver/CMakeLists.txt
index 82a94a5137d..e498673bf3a 100644
--- a/src/server/authserver/CMakeLists.txt
+++ b/src/server/authserver/CMakeLists.txt
@@ -42,6 +42,8 @@ add_executable(authserver
   ${authserver_SRCS}
 )
 
+add_dependencies(authserver revision.h)
+
 add_definitions(-D_TRINITY_REALM_CONFIG='"${CONF_DIR}/authserver.conf"')
 
 set(authserver_LINK_FLAGS "-pthread ${authserver_LINK_FLAGS}")
diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt
index cc221f314e0..83fb4283877 100644
--- a/src/server/worldserver/CMakeLists.txt
+++ b/src/server/worldserver/CMakeLists.txt
@@ -122,6 +122,8 @@ add_definitions(
   -D_TRINITY_CORE_CONFIG='"${CONF_DIR}/worldserver.conf"'
 )
 
+add_dependencies(worldserver revision.h)
+
 set(worldserver_LINK_FLAGS
   "-pthread ${worldserver_LINK_FLAGS}"
 )
-- 
cgit v1.2.3


From 07ede97b93d1d7abd3292a911f5dcb778437eaf3 Mon Sep 17 00:00:00 2001
From: click 
Date: Fri, 25 Jun 2010 21:28:39 +0200
Subject: Initialize battleground difficulty before initializing it (thanks to
 kapate for the heads up)

--HG--
branch : trunk
---
 src/server/game/BattleGrounds/BattleGroundMgr.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/game/BattleGrounds/BattleGroundMgr.cpp b/src/server/game/BattleGrounds/BattleGroundMgr.cpp
index b814c9b810e..d930a4185bc 100644
--- a/src/server/game/BattleGrounds/BattleGroundMgr.cpp
+++ b/src/server/game/BattleGrounds/BattleGroundMgr.cpp
@@ -1627,6 +1627,9 @@ BattleGround * BattleGroundMgr::CreateNewBattleGround(BattleGroundTypeId bgTypeI
             return 0;
     }
 
+    // set battelground difficulty before initialization
+    bg->SetBracket(bracketEntry);
+
     // generate a new instance id
     bg->SetInstanceID(sMapMgr.GenerateInstanceId()); // set instance id
     bg->SetClientInstanceID(CreateClientVisibleInstanceId(isRandom ? BATTLEGROUND_RB : bgTypeId, bracketEntry->GetBracketId()));
@@ -1636,7 +1639,6 @@ BattleGround * BattleGroundMgr::CreateNewBattleGround(BattleGroundTypeId bgTypeI
 
     // start the joining of the bg
     bg->SetStatus(STATUS_WAIT_JOIN);
-    bg->SetBracket(bracketEntry);
     bg->SetArenaType(arenaType);
     bg->SetRated(isRated);
     bg->SetRandom(isRandom);
-- 
cgit v1.2.3


From 3d40804a3380cca5379d696d44ba6f4ef5e6bd11 Mon Sep 17 00:00:00 2001
From: click 
Date: Fri, 25 Jun 2010 21:41:43 +0200
Subject: Opcode updates (thanks to LordJZ)

--HG--
branch : trunk
---
 src/server/game/Server/Protocol/Opcodes.cpp | 26 +++++++++++++-------------
 src/server/game/Server/Protocol/Opcodes.h   |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp
index 0b67199b4ea..8a45aa9e910 100644
--- a/src/server/game/Server/Protocol/Opcodes.cpp
+++ b/src/server/game/Server/Protocol/Opcodes.cpp
@@ -361,7 +361,7 @@ OpcodeHandler opcodeTable[NUM_MSG_TYPES] =
     /*0x14A*/ { "SMSG_ATTACKERSTATEUPDATE",                     STATUS_NEVER,    &WorldSession::Handle_ServerSide               },
     /*0x14B*/ { "SMSG_BATTLEFIELD_PORT_DENIED",                 STATUS_NEVER,    &WorldSession::Handle_ServerSide               },
     /*0x14C*/ { "SMSG_DAMAGE_DONE_OBSOLETE",                    STATUS_NEVER,    &WorldSession::Handle_ServerSide               },
-    /*0x14D*/ { "SMSG_DAMAGE_TAKEN_OBSOLETE",                   STATUS_NEVER,    &WorldSession::Handle_ServerSide               },
+    /*0x14D*/ { "SMSG_UNIT_SPELLCAST_START",                    STATUS_NEVER,    &WorldSession::Handle_ServerSide               },
     /*0x14E*/ { "SMSG_CANCEL_COMBAT",                           STATUS_NEVER,    &WorldSession::Handle_ServerSide               },
     /*0x14F*/ { "SMSG_SPELLBREAKLOG",                           STATUS_NEVER,    &WorldSession::Handle_ServerSide               },
     /*0x150*/ { "SMSG_SPELLHEALLOG",                            STATUS_NEVER,    &WorldSession::Handle_ServerSide               },
@@ -570,7 +570,7 @@ OpcodeHandler opcodeTable[NUM_MSG_TYPES] =
     /*0x21B*/ { "SMSG_GMTICKET_SYSTEMSTATUS",                   STATUS_NEVER,    &WorldSession::Handle_ServerSide               },
     /*0x21C*/ { "CMSG_SPIRIT_HEALER_ACTIVATE",                  STATUS_LOGGEDIN, &WorldSession::HandleSpiritHealerActivateOpcode},
     /*0x21D*/ { "CMSG_SET_STAT_CHEAT",                          STATUS_NEVER,    &WorldSession::Handle_NULL                     },
-    /*0x21E*/ { "SMSG_SET_REST_START_OBSOLETE",                 STATUS_NEVER,    &WorldSession::Handle_ServerSide               },
+    /*0x21E*/ { "SMSG_QUEST_FORCE_REMOVE",                      STATUS_NEVER,    &WorldSession::Handle_ServerSide               },
     /*0x21F*/ { "CMSG_SKILL_BUY_STEP",                          STATUS_NEVER,    &WorldSession::Handle_NULL                     },
     /*0x220*/ { "CMSG_SKILL_BUY_RANK",                          STATUS_NEVER,    &WorldSession::Handle_NULL                     },
     /*0x221*/ { "CMSG_XP_CHEAT",                                STATUS_NEVER,    &WorldSession::Handle_NULL                     },
@@ -1148,8 +1148,8 @@ OpcodeHandler opcodeTable[NUM_MSG_TYPES] =
     /*0x45D*/ { "CMSG_FORCE_PITCH_RATE_CHANGE_ACK",             STATUS_NEVER,    &WorldSession::Handle_NULL                     },
     /*0x45E*/ { "SMSG_SPLINE_SET_PITCH_RATE",                   STATUS_NEVER,    &WorldSession::Handle_ServerSide               },
     /*0x45F*/ { "SMSG_MOVE_ABANDON_TRANSPORT",                  STATUS_NEVER,    &WorldSession::Handle_ServerSide               },
-    /*0x460*/ { "MSG_MOVE_ABANDON_TRANSPORT",                   STATUS_NEVER,    &WorldSession::Handle_NULL                     },
-    /*0x461*/ { "CMSG_MOVE_ABANDON_TRANSPORT_ACK",              STATUS_NEVER,    &WorldSession::Handle_NULL                     },
+    /*0x460*/ { "SMSG_CALENDAR_UPDATE_INVITE_LIST",             STATUS_NEVER,    &WorldSession::Handle_NULL                     },
+    /*0x461*/ { "SMSG_CALENDAR_UPDATE_INVITE_LIST2",            STATUS_NEVER,    &WorldSession::Handle_NULL                     },
     /*0x462*/ { "CMSG_UPDATE_MISSILE_TRAJECTORY",               STATUS_NEVER,    &WorldSession::Handle_NULL                     },
     /*0x463*/ { "SMSG_UPDATE_ACCOUNT_DATA_COMPLETE",            STATUS_NEVER,    &WorldSession::Handle_ServerSide               },
     /*0x464*/ { "SMSG_TRIGGER_MOVIE",                           STATUS_NEVER,    &WorldSession::Handle_ServerSide               },
@@ -1165,7 +1165,7 @@ OpcodeHandler opcodeTable[NUM_MSG_TYPES] =
     /*0x46E*/ { "CMSG_COMPLETE_ACHIEVEMENT_CHEAT",              STATUS_NEVER,    &WorldSession::Handle_NULL                     },
     /*0x46F*/ { "SMSG_QUESTUPDATE_ADD_PVP_KILL",                STATUS_NEVER,    &WorldSession::Handle_ServerSide               },
     /*0x470*/ { "CMSG_SET_CRITERIA_CHEAT",                      STATUS_NEVER,    &WorldSession::Handle_NULL                     },
-    /*0x471*/ { "SMSG_GROUP_SWAP_FAILED",                       STATUS_NEVER,    &WorldSession::Handle_ServerSide               },
+    /*0x471*/ { "SMSG_CALENDAR_UPDATE_INVITE_LIST3",            STATUS_NEVER,    &WorldSession::Handle_ServerSide               },
     /*0x472*/ { "CMSG_UNITANIMTIER_CHEAT",                      STATUS_NEVER,    &WorldSession::Handle_NULL                     },
     /*0x473*/ { "CMSG_CHAR_CUSTOMIZE",                          STATUS_AUTHED,   &WorldSession::HandleCharCustomize             },
     /*0x474*/ { "SMSG_CHAR_CUSTOMIZE",                          STATUS_NEVER,    &WorldSession::Handle_ServerSide               },
@@ -1258,13 +1258,13 @@ OpcodeHandler opcodeTable[NUM_MSG_TYPES] =
     /*0x4CB*/ { "UMSG_UNKNOWN_1227",                            STATUS_NEVER,    &WorldSession::Handle_NULL                     },
     /*0x4CC*/ { "UMSG_UNKNOWN_1228",                            STATUS_NEVER,    &WorldSession::Handle_NULL                     },
     /*0x4CD*/ { "SMSG_MULTIPLE_PACKETS",                        STATUS_NEVER,    &WorldSession::Handle_ServerSide               },
-    /*0x4CE*/ { "SMSG_UNKNOWN_1230",                            STATUS_NEVER,    &WorldSession::Handle_ServerSide               },
-    /*0x4CF*/ { "CMSG_UNKNOWN_1231_ACK",                        STATUS_NEVER,    &WorldSession::Handle_NULL                     },
-    /*0x4D0*/ { "SMSG_UNKNOWN_1232",                            STATUS_NEVER,    &WorldSession::Handle_ServerSide               },
-    /*0x4D1*/ { "CMSG_UNKNOWN_1233_ACK",                        STATUS_NEVER,    &WorldSession::Handle_NULL                     },
-    /*0x4D2*/ { "SMSG_UNKNOWN_1234",                            STATUS_NEVER,    &WorldSession::Handle_ServerSide               },
-    /*0x4D3*/ { "SMSG_UNKNOWN_1235",                            STATUS_NEVER,    &WorldSession::Handle_ServerSide               },
-    /*0x4D4*/ { "SMSG_UNKNOWN_1236",                            STATUS_NEVER,    &WorldSession::Handle_ServerSide               },
+    /*0x4CE*/ { "SMSG_FORCE_UNK1_SPEED_CHANGE",                 STATUS_NEVER,    &WorldSession::Handle_ServerSide               },
+    /*0x4CF*/ { "CMSG_FORCE_UNK1_SPEED_CHANGE_ACK",             STATUS_NEVER,    &WorldSession::Handle_NULL                     },
+    /*0x4D0*/ { "SMSG_FORCE_UNK2_SPEED_CHANGE",                 STATUS_NEVER,    &WorldSession::Handle_ServerSide               },
+    /*0x4D1*/ { "CMSG_FORCE_UNK2_SPEED_CHANGE_ACK",             STATUS_NEVER,    &WorldSession::Handle_NULL                     },
+    /*0x4D2*/ { "MSG_MOVE_UNKNOWN_1234",                        STATUS_NEVER,    &WorldSession::Handle_ServerSide               },
+    /*0x4D3*/ { "SMSG_SPLINE_MOVE_UNKNOWN_1235",                STATUS_NEVER,    &WorldSession::Handle_ServerSide               },
+    /*0x4D4*/ { "SMSG_SPLINE_MOVE_UNKNOWN_1236",                STATUS_NEVER,    &WorldSession::Handle_ServerSide               },
     /*0x4D5*/ { "CMSG_EQUIPMENT_SET_USE",                       STATUS_LOGGEDIN, &WorldSession::HandleEquipmentSetUse           },
     /*0x4D6*/ { "SMSG_EQUIPMENT_SET_USE_RESULT",                STATUS_NEVER,    &WorldSession::Handle_ServerSide               },
     /*0x4D7*/ { "UMSG_UNKNOWN_1239",                            STATUS_NEVER,    &WorldSession::Handle_NULL                     },
@@ -1275,7 +1275,7 @@ OpcodeHandler opcodeTable[NUM_MSG_TYPES] =
     /*0x4DC*/ { "UMSG_UNKNOWN_1244",                            STATUS_NEVER,    &WorldSession::Handle_NULL                     },
     /*0x4DD*/ { "UMSG_UNKNOWN_1245",                            STATUS_NEVER,    &WorldSession::Handle_NULL                     },
     /*0x4DE*/ { "SMSG_BATTLEFIELD_MGR_ENTRY_INVITE",            STATUS_NEVER,    &WorldSession::Handle_ServerSide               },
-    /*0x4DF*/ { "CMSG_BATTLEFIELD_MGR_ENTRY_INVITE_RESPONS",    STATUS_NEVER,    &WorldSession::Handle_NULL                     },
+    /*0x4DF*/ { "CMSG_BATTLEFIELD_MGR_ENTRY_INVITE_RESPONSE",   STATUS_NEVER,    &WorldSession::Handle_NULL                     },
     /*0x4E0*/ { "SMSG_BATTLEFIELD_MGR_ENTERED",                 STATUS_NEVER,    &WorldSession::Handle_ServerSide               },
     /*0x4E1*/ { "SMSG_BATTLEFIELD_MGR_QUEUE_INVITE",            STATUS_NEVER,    &WorldSession::Handle_ServerSide               },
     /*0x4E2*/ { "CMSG_BATTLEFIELD_MGR_QUEUE_INVITE_RESPONSE",   STATUS_NEVER,    &WorldSession::Handle_NULL                     },
diff --git a/src/server/game/Server/Protocol/Opcodes.h b/src/server/game/Server/Protocol/Opcodes.h
index 4ae6931c3f5..6e2fb0b6db1 100644
--- a/src/server/game/Server/Protocol/Opcodes.h
+++ b/src/server/game/Server/Protocol/Opcodes.h
@@ -1244,7 +1244,7 @@ enum Opcodes
     SMSG_ITEM_REFUND_RESULT                         = 0x4B5, // refund item result
     CMSG_CORPSE_MAP_POSITION_QUERY                  = 0x4B6, // CMSG, uint32
     SMSG_CORPSE_MAP_POSITION_QUERY_RESPONSE         = 0x4B7, // SMSG, 3*float+float
-    UMSG_UNKNOWN_1208                               = 0x4B8, // not found
+    CMSG_LFG_SET_ROLES_2                            = 0x4B8, // not found
     UMSG_UNKNOWN_1209                               = 0x4B9, // not found
     CMSG_CALENDAR_CONTEXT_EVENT_SIGNUP              = 0x4BA, // CMSG, uint64, lua: CalendarContextEventSignUp
     SMSG_CALENDAR_ACTION_PENDING                    = 0x4BB, // SMSG, calendar related EVENT_CALENDAR_ACTION_PENDING
-- 
cgit v1.2.3


From 2b29d4e65da60d1b66fbc4ed76cfeb96aabac146 Mon Sep 17 00:00:00 2001
From: click 
Date: Fri, 25 Jun 2010 21:49:27 +0200
Subject: Don't return mails to non-existing characters (thanks to laviniu for
 finding the bug)

--HG--
branch : trunk
---
 src/server/game/Mails/Mail.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Mails/Mail.cpp b/src/server/game/Mails/Mail.cpp
index 847009b83dc..77f971bf4d0 100644
--- a/src/server/game/Mails/Mail.cpp
+++ b/src/server/game/Mails/Mail.cpp
@@ -375,8 +375,8 @@ void WorldSession::HandleMailReturnToSender(WorldPacket & recv_data)
     CharacterDatabase.CommitTransaction();
     pl->RemoveMail(mailId);
 
-    // send back only to players and simple drop for other cases
-    if (m->messageType == MAIL_NORMAL)
+    // only return mail if the player exists (and delete if not existing)
+    if (m->messageType == MAIL_NORMAL && m->sender)
     {
         MailDraft draft(m->subject, m->body);
         if (m->mailTemplateId)
-- 
cgit v1.2.3


From 4357846c3c9550ed2522a7dab37002d402fe1b62 Mon Sep 17 00:00:00 2001
From: Machiavelli 
Date: Sat, 26 Jun 2010 02:02:59 +0200
Subject: Remove a hack (added by someone that will NOt be NAMEd) that caused
 too high experience bonus for heirlooms. Heirloom experience bonus was
 already handled perfectly.

--HG--
branch : trunk
---
 src/server/game/Entities/Player/Player.cpp | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index ab0a2e20f8b..9dfb0ed3f57 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -2627,13 +2627,6 @@ void Player::GiveXP(uint32 xp, Unit* victim)
     // XP resting bonus for kill
     uint32 rested_bonus_xp = victim ? GetXPRestBonus(xp) : 0;
 
-    // Heirloom Experience Bonus
-    float heirloomModifier = 1.0f;
-    for (int i = 0; i < EQUIPMENT_SLOT_END; ++i)
-        if (m_items[i] && m_items[i]->GetProto()->Spells->SpellId == 57353)
-            heirloomModifier += 0.1f;
-    xp = uint32(xp * heirloomModifier);
-
     SendLogXPGain(xp,victim,rested_bonus_xp);
 
     uint32 curXP = GetUInt32Value(PLAYER_XP);
-- 
cgit v1.2.3


From 6693bf5092910e4794825a16abc49e79d817505b Mon Sep 17 00:00:00 2001
From: Rat 
Date: Sat, 26 Jun 2010 10:57:19 +0200
Subject: removed unneeded debug lines from conditions loading

--HG--
branch : trunk
---
 src/server/game/Conditions/ConditionMgr.cpp | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp
index 2e81aad1859..9164f55c6ce 100644
--- a/src/server/game/Conditions/ConditionMgr.cpp
+++ b/src/server/game/Conditions/ConditionMgr.cpp
@@ -517,7 +517,6 @@ bool ConditionMgr::addToGossipMenus(Condition* cond)
             if ((*itr).second.entry == cond->mSourceGroup && (*itr).second.text_id == cond->mSourceEntry)
             {
                 (*itr).second.conditions.push_back(cond);
-                sLog.outDebug("addToGossipMenus: entry %u textId %u", cond->mSourceGroup, cond->mSourceEntry);
                 return true;
             }
         }
@@ -536,7 +535,6 @@ bool ConditionMgr::addToGossipMenuItems(Condition* cond)
             if ((*itr).second.menu_id == cond->mSourceGroup && (*itr).second.id == cond->mSourceEntry)
             {
                 (*itr).second.conditions.push_back(cond);
-                //sLog.outDebug("addToGossipMenuItems: menuId %u id %u", cond->mSourceGroup, cond->mSourceEntry);
                 return true;
             }
         }
-- 
cgit v1.2.3


From fac0ff32324ecee0a287abf095519beb25456476 Mon Sep 17 00:00:00 2001
From: Machiavelli 
Date: Sat, 26 Jun 2010 12:32:29 +0200
Subject: Also check for valid Y and O coordinates in Unit::SetPosition. Fixes
 another loophole related to vmaps.

--HG--
branch : trunk
---
 src/server/game/Entities/Unit/Unit.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 9d0bce23fd5..223153ba3f3 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -16270,7 +16270,7 @@ void Unit::NearTeleportTo(float x, float y, float z, float orientation, bool cas
 bool Unit::SetPosition(float x, float y, float z, float orientation, bool teleport)
 {
     // prevent crash when a bad coord is sent by the client
-    if (!Trinity::IsValidMapCoord(x,y))
+    if (!Trinity::IsValidMapCoord(x,y,z,o))
     {
         sLog.outDebug("Unit::SetPosition(%f, %f, %f) .. bad coordinates!",x,y,z);
         return false;
-- 
cgit v1.2.3


From 23ec7faf73481cd4c279b7c0a02e488dcba1e422 Mon Sep 17 00:00:00 2001
From: Machiavelli 
Date: Sat, 26 Jun 2010 13:06:36 +0200
Subject: Typo

--HG--
branch : trunk
---
 src/server/game/Entities/Unit/Unit.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 223153ba3f3..c8715eedba0 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -16270,7 +16270,7 @@ void Unit::NearTeleportTo(float x, float y, float z, float orientation, bool cas
 bool Unit::SetPosition(float x, float y, float z, float orientation, bool teleport)
 {
     // prevent crash when a bad coord is sent by the client
-    if (!Trinity::IsValidMapCoord(x,y,z,o))
+    if (!Trinity::IsValidMapCoord(x,y,z,orientation))
     {
         sLog.outDebug("Unit::SetPosition(%f, %f, %f) .. bad coordinates!",x,y,z);
         return false;
-- 
cgit v1.2.3


From 26da69a5444a15e5c1f8b1b57316ef846af969d4 Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Sat, 26 Jun 2010 13:32:24 +0200
Subject: Fix some deprecated checks on MapManager::CanPlayerEnter()

--HG--
branch : trunk
---
 src/server/game/Groups/Group.cpp    | 33 +++++++++++++++++++--------------
 src/server/game/Groups/Group.h      |  1 +
 src/server/game/Maps/MapManager.cpp |  4 ++--
 3 files changed, 22 insertions(+), 16 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp
index 2977515959b..84c9b7b81d4 100644
--- a/src/server/game/Groups/Group.cpp
+++ b/src/server/game/Groups/Group.cpp
@@ -1760,34 +1760,39 @@ InstanceGroupBind* Group::GetBoundInstance(Player* player)
 {
     uint32 mapid = player->GetMapId();
     MapEntry const* mapEntry = sMapStore.LookupEntry(mapid);
-    if (!mapEntry)
-        return NULL;
+    GetBoundInstance(mapEntry);
+}
 
-    Difficulty difficulty = player->GetDifficulty(mapEntry->IsRaid());
+InstanceGroupBind* Group::GetBoundInstance(Map* aMap)
+{
+    // Currently spawn numbering not different from map difficulty
+    Difficulty difficulty = GetDifficulty(aMap->IsRaid());
 
     // some instances only have one difficulty
-    MapDifficulty const* mapDiff = GetMapDifficultyData(mapid,difficulty);
+    MapDifficulty const* mapDiff = GetMapDifficultyData(aMap->GetId(),difficulty);
     if (!mapDiff)
-        difficulty = DUNGEON_DIFFICULTY_NORMAL;
+        return NULL;
 
-    BoundInstancesMap::iterator itr = m_boundInstances[difficulty].find(mapid);
+    BoundInstancesMap::iterator itr = m_boundInstances[difficulty].find(aMap->GetId());
     if (itr != m_boundInstances[difficulty].end())
         return &itr->second;
     else
         return NULL;
 }
 
-InstanceGroupBind* Group::GetBoundInstance(Map* aMap)
+InstanceGroupBind* Group::GetBoundInstance(MapEntry const* mapEntry)
 {
-    // Currently spawn numbering not different from map difficulty
-    Difficulty difficulty = GetDifficulty(aMap->IsRaid());
-
+    if (!mapEntry)
+        return NULL;
+    
+    Difficulty difficulty = GetDifficulty(mapEntry->IsRaid());
+    
     // some instances only have one difficulty
-    MapDifficulty const* mapDiff = GetMapDifficultyData(aMap->GetId(),difficulty);
+    MapDifficulty const* mapDiff = GetMapDifficultyData(mapEntry->MapID,difficulty);
     if (!mapDiff)
-        return NULL;
-
-    BoundInstancesMap::iterator itr = m_boundInstances[difficulty].find(aMap->GetId());
+        difficulty = DUNGEON_DIFFICULTY_NORMAL;
+    
+    BoundInstancesMap::iterator itr = m_boundInstances[difficulty].find(mapEntry->MapID);
     if (itr != m_boundInstances[difficulty].end())
         return &itr->second;
     else
diff --git a/src/server/game/Groups/Group.h b/src/server/game/Groups/Group.h
index 8ec44c53b02..2b93b7b1d6e 100644
--- a/src/server/game/Groups/Group.h
+++ b/src/server/game/Groups/Group.h
@@ -358,6 +358,7 @@ class Group
         void UnbindInstance(uint32 mapid, uint8 difficulty, bool unload = false);
         InstanceGroupBind* GetBoundInstance(Player* player);
         InstanceGroupBind* GetBoundInstance(Map* aMap);
+        InstanceGroupBind* GetBoundInstance(MapEntry const* mapEntry);
         BoundInstancesMap& GetBoundInstances(Difficulty difficulty) { return m_boundInstances[difficulty]; }
 
         // FG: evil hacks
diff --git a/src/server/game/Maps/MapManager.cpp b/src/server/game/Maps/MapManager.cpp
index 46b604388c5..47032bd6215 100644
--- a/src/server/game/Maps/MapManager.cpp
+++ b/src/server/game/Maps/MapManager.cpp
@@ -228,13 +228,13 @@ bool MapManager::CanPlayerEnter(uint32 mapid, Player* player, bool loginCheck)
     //Get instance where player's group is bound & its map
     if (pGroup)
     {
-        InstanceGroupBind* boundedInstance = pGroup->GetBoundInstance(player);
+        InstanceGroupBind* boundedInstance = pGroup->GetBoundInstance(entry);
         if (boundedInstance && boundedInstance->save)
         {
             if (Map *boundedMap = sMapMgr.FindMap(mapid,boundedInstance->save->GetInstanceId()))
             {
                 // Player permanently bounded to different instance than groups one
-                InstancePlayerBind* playerBoundedInstance = player->GetBoundInstance(mapid, player->GetDungeonDifficulty());
+                InstancePlayerBind* playerBoundedInstance = player->GetBoundInstance(mapid, player->GetDifficulty(entry->IsRaid()));
                 if (playerBoundedInstance && playerBoundedInstance->perm && playerBoundedInstance->save &&
                     boundedInstance->save->GetInstanceId() != playerBoundedInstance->save->GetInstanceId())
                 {
-- 
cgit v1.2.3


From d2553a138afcbda3ad24f7cbcc9e1202831bb049 Mon Sep 17 00:00:00 2001
From: Machiavelli 
Date: Sat, 26 Jun 2010 13:41:36 +0200
Subject: Use valid coördinates for Unit::UpdateUnderWaterState instead of raw
 coördinates. Fixes another potential crash related to vmaps. Updates issue
 #2748
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--HG--
branch : trunk
---
 src/server/game/Entities/Player/Player.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 9dfb0ed3f57..5093ec518a6 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -6207,7 +6207,9 @@ bool Player::SetPosition(float x, float y, float z, float orientation, bool tele
         SetGroupUpdateFlag(GROUP_UPDATE_FLAG_POSITION);
 
     // code block for underwater state update
-    UpdateUnderwaterState(GetMap(), x, y, z);
+    // Unit::SetPosition() checks for validity and updates our coordinates
+    // so we re-fetch them instead of using "raw" coordinates from function params
+    UpdateUnderwaterState(GetMap(), GetPositionX(), GetPositionY(), GetPositionZ());
 
     if (GetTrader() && !IsWithinDistInMap(GetTrader(), INTERACTION_DISTANCE))
         GetSession()->SendCancelTrade();
-- 
cgit v1.2.3


From 57687c5c40e31ff527b64f6dbfe701680c225228 Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Sat, 26 Jun 2010 14:06:29 +0200
Subject: Allow GMs to bypass instance entry requirements

--HG--
branch : trunk
---
 src/server/game/Maps/MapManager.cpp | 43 ++++++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 20 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Maps/MapManager.cpp b/src/server/game/Maps/MapManager.cpp
index 47032bd6215..8bb3039800c 100644
--- a/src/server/game/Maps/MapManager.cpp
+++ b/src/server/game/Maps/MapManager.cpp
@@ -161,14 +161,35 @@ bool MapManager::CanPlayerEnter(uint32 mapid, Player* player, bool loginCheck)
     if (!entry->IsDungeon())
         return true;
 
+    InstanceTemplate const* instance = objmgr.GetInstanceTemplate(mapid);
+    if (!instance)
+        return false;
+
+    //The player has a heroic mode and tries to enter into instance which has no a heroic mode
+    MapDifficulty const* mapDiff = GetMapDifficultyData(entry->MapID,player->GetDifficulty(entry->IsRaid()));
+    if (!mapDiff)
+    {
+        bool isNormalTargetMap = entry->IsRaid()
+        ? (player->GetRaidDifficulty() == RAID_DIFFICULTY_10MAN_NORMAL)
+        : (player->GetDungeonDifficulty() == DUNGEON_DIFFICULTY_NORMAL);
+        
+        // Send aborted message
+        // FIX ME: what about absent normal/heroic mode with specific players limit...
+        player->SendTransferAborted(mapid, TRANSFER_ABORT_DIFFICULTY, isNormalTargetMap ? DUNGEON_DIFFICULTY_NORMAL : DUNGEON_DIFFICULTY_HEROIC);
+        return false;
+    }
+
+    //Bypass checks for GMs
+    if (player->isGameMaster())
+        return true;
+
     const char *mapName = entry->name[player->GetSession()->GetSessionDbcLocale()];
 
     Group* pGroup = player->GetGroup();
     if (entry->IsRaid())
     {
         // can only enter in a raid group
-        // GMs can avoid raid limitations
-        if ((!pGroup || !pGroup->isRaidGroup()) && !player->isGameMaster() && !sWorld.getConfig(CONFIG_INSTANCE_IGNORE_RAID))
+        if ((!pGroup || !pGroup->isRaidGroup()) && !sWorld.getConfig(CONFIG_INSTANCE_IGNORE_RAID))
         {
             // probably there must be special opcode, because client has this string constant in GlobalStrings.lua
             // TODO: this is not a good place to send the message
@@ -178,20 +199,6 @@ bool MapManager::CanPlayerEnter(uint32 mapid, Player* player, bool loginCheck)
         }
     }
 
-    //The player has a heroic mode and tries to enter into instance which has no a heroic mode
-    MapDifficulty const* mapDiff = GetMapDifficultyData(entry->MapID,player->GetDifficulty(entry->IsRaid()));
-    if (!mapDiff)
-    {
-        bool isNormalTargetMap = entry->IsRaid()
-            ? (player->GetRaidDifficulty() == RAID_DIFFICULTY_10MAN_NORMAL)
-            : (player->GetDungeonDifficulty() == DUNGEON_DIFFICULTY_NORMAL);
-
-        // Send aborted message
-        // FIX ME: what about absent normal/heroic mode with specific players limit...
-        player->SendTransferAborted(mapid, TRANSFER_ABORT_DIFFICULTY, isNormalTargetMap ? DUNGEON_DIFFICULTY_NORMAL : DUNGEON_DIFFICULTY_HEROIC);
-        return false;
-    }
-
     if (!player->isAlive())
     {
         if (Corpse *corpse = player->GetCorpse())
@@ -221,10 +228,6 @@ bool MapManager::CanPlayerEnter(uint32 mapid, Player* player, bool loginCheck)
             sLog.outDebug("Map::CanPlayerEnter - player '%s' is dead but does not have a corpse!", player->GetName());
     }
 
-    InstanceTemplate const* instance = objmgr.GetInstanceTemplate(mapid);
-    if (!instance)
-        return false;
-
     //Get instance where player's group is bound & its map
     if (pGroup)
     {
-- 
cgit v1.2.3


From ce94851015fdacec4c36d93c9fc5f7fd55f3931c Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Sat, 26 Jun 2010 17:57:49 +0200
Subject: Add forgotten return

--HG--
branch : trunk
---
 src/server/game/Groups/Group.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp
index 84c9b7b81d4..614c6a45143 100644
--- a/src/server/game/Groups/Group.cpp
+++ b/src/server/game/Groups/Group.cpp
@@ -1760,7 +1760,7 @@ InstanceGroupBind* Group::GetBoundInstance(Player* player)
 {
     uint32 mapid = player->GetMapId();
     MapEntry const* mapEntry = sMapStore.LookupEntry(mapid);
-    GetBoundInstance(mapEntry);
+    return GetBoundInstance(mapEntry);
 }
 
 InstanceGroupBind* Group::GetBoundInstance(Map* aMap)
-- 
cgit v1.2.3


From 3614f7b089436a94bfbe26b6ba2c1d5030e64ff6 Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Sat, 26 Jun 2010 20:11:34 +0200
Subject: Load&save gothik's door state on instancedata load&save Partial fix
 for issue #1244

--HG--
branch : trunk
---
 .../Northrend/Naxxramas/instance_naxxramas.cpp     | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
index 3006b905673..5d720ad8721 100644
--- a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
@@ -128,6 +128,8 @@ struct instance_naxxramas : public InstanceData
     uint64 uiKelthuzadTrigger;
     uint64 uiPortals[4];
 
+    GOState gothikDoorState;
+
     time_t minHorsemenDiedTime;
     time_t maxHorsemenDiedTime;
 
@@ -171,7 +173,9 @@ struct instance_naxxramas : public InstanceData
                     pSapphiron->AI()->DoAction(DATA_SAPPHIRON_BIRTH);
                 return;
             }
-            case GO_GOTHIK_GATE: GothikGateGUID = add ? pGo->GetGUID() : 0; break;
+            case GO_GOTHIK_GATE:
+                GothikGateGUID = add ? pGo->GetGUID() : 0;
+                break;
             case GO_HORSEMEN_CHEST: HorsemenChestGUID = add ? pGo->GetGUID() : 0; break;
             case GO_HORSEMEN_CHEST_HERO: HorsemenChestGUID = add ? pGo->GetGUID() : 0; break;
             case GO_KELTHUZAD_PORTAL01: uiPortals[0] = pGo->GetGUID(); break;
@@ -194,6 +198,7 @@ struct instance_naxxramas : public InstanceData
             case DATA_GOTHIK_GATE:
                 if (GameObject *pGothikGate = instance->GetGameObject(GothikGateGUID))
                     pGothikGate->SetGoState(GOState(value));
+                gothikDoorState = GOState(value);
                 break;
 
             case DATA_HORSEMEN0:
@@ -307,6 +312,21 @@ struct instance_naxxramas : public InstanceData
         }
         return false;
     }
+
+    std::string GetSaveData()
+    {
+        std::ostringstream saveStream;
+        saveStream << GetBossSaveData() << gothikDoorState;
+        return saveStream.str();
+    }
+
+    void Load(const char * data)
+    {
+        std::istringstream loadStream(LoadBossState(data));
+        uint32 buff;
+        loadStream >> buff;
+        gothikDoorState = GOState(buff);
+    }
 };
 
 InstanceData* GetInstanceData_instance_naxxramas(Map* pMap)
-- 
cgit v1.2.3


From d0be4e2cad6038979aa4594a4d052344a75ed991 Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Sat, 26 Jun 2010 20:18:41 +0200
Subject: Remove duplicated job

--HG--
branch : trunk
---
 .../Northrend/Ulduar/ulduar/instance_ulduar.cpp        | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

(limited to 'src')

diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp
index c19d4766d65..5f9566d0840 100644
--- a/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp
@@ -278,19 +278,7 @@ struct instance_ulduar : public ScriptedInstance
         }
 
         if (data == DONE)
-        {
-            OUT_SAVE_INST_DATA;
-
-            std::ostringstream saveStream;
-
-            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
-                saveStream << uiEncounter[i] << " ";
-
-            m_strInstData = saveStream.str();
-
             SaveToDB();
-            OUT_SAVE_INST_DATA_COMPLETE;
-        }
     }
 
     uint64 GetData64(uint32 data)
@@ -351,9 +339,9 @@ struct instance_ulduar : public ScriptedInstance
 
         std::ostringstream saveStream;
         saveStream << "U U " << uiEncounter[0] << " " << uiEncounter[1] << " " << uiEncounter[2] << " " << uiEncounter[3]
-                   << uiEncounter[4] << " " << uiEncounter[5] << " " << uiEncounter[6] << " " << uiEncounter[7]
-                   << uiEncounter[8] << " " << uiEncounter[9] << " " << uiEncounter[10] << " " << uiEncounter[11]
-                   << uiEncounter[12] << " " << uiEncounter[13] << " " << uiEncounter[14];
+                   << " " << uiEncounter[4] << " " << uiEncounter[5] << " " << uiEncounter[6] << " " << uiEncounter[7]
+                   << " " << uiEncounter[8] << " " << uiEncounter[9] << " " << uiEncounter[10] << " " << uiEncounter[11]
+                   << " " << uiEncounter[12] << " " << uiEncounter[13] << " " << uiEncounter[14];
 
         m_strInstData = saveStream.str();
 
-- 
cgit v1.2.3


From 20585e0fc520c0de15f653d8c35ad9598f2c1130 Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Sat, 26 Jun 2010 20:19:37 +0200
Subject: Fix naxxramas saving

--HG--
branch : trunk
---
 src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
index 5d720ad8721..f3b3cb234b2 100644
--- a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
@@ -316,7 +316,7 @@ struct instance_naxxramas : public InstanceData
     std::string GetSaveData()
     {
         std::ostringstream saveStream;
-        saveStream << GetBossSaveData() << gothikDoorState;
+        saveStream << GetBossSaveData() << " " << gothikDoorState;
         return saveStream.str();
     }
 
-- 
cgit v1.2.3


From 037857c2ce19da58407addf96d2808af8d0bd541 Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Sat, 26 Jun 2010 21:12:22 +0200
Subject: Another fix for naxx GO handling

--HG--
branch : trunk
---
 src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
index f3b3cb234b2..41b6ad9a304 100644
--- a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
@@ -175,6 +175,7 @@ struct instance_naxxramas : public InstanceData
             }
             case GO_GOTHIK_GATE:
                 GothikGateGUID = add ? pGo->GetGUID() : 0;
+                pGo->SetGoState(gothikDoorState);
                 break;
             case GO_HORSEMEN_CHEST: HorsemenChestGUID = add ? pGo->GetGUID() : 0; break;
             case GO_HORSEMEN_CHEST_HERO: HorsemenChestGUID = add ? pGo->GetGUID() : 0; break;
-- 
cgit v1.2.3


From 73a2a21ee4ce9cd2eefc885288d84ab3ca68a0fc Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Sat, 26 Jun 2010 21:15:48 +0200
Subject: Fix possible crash

--HG--
branch : trunk
---
 src/server/game/Entities/Player/Player.cpp | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 5093ec518a6..4100df480fe 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -16100,17 +16100,20 @@ bool Player::LoadFromDB(uint32 guid, SqlQueryHolder *holder)
     // Map could be changed before
     mapEntry = sMapStore.LookupEntry(mapId);
     // client without expansion support
-    if (mapEntry && GetSession()->Expansion() < mapEntry->Expansion())
+    if (mapEntry)
     {
-        sLog.outDebug("Player %s using client without required expansion tried login at non accessible map %u", GetName(), mapId);
-        RelocateToHomebind();
-    }
+        if (GetSession()->Expansion() < mapEntry->Expansion())
+        {
+            sLog.outDebug("Player %s using client without required expansion tried login at non accessible map %u", GetName(), mapId);
+            RelocateToHomebind();
+        }
 
-    // fix crash (because of if (Map *map = _FindMap(instanceId)) in MapInstanced::CreateInstance)
-    if (instanceId)
-        if (InstanceSave * save = GetInstanceSave(mapId, mapEntry->IsRaid()))
-            if (save->GetInstanceId() != instanceId)
-                instanceId = 0;
+        // fix crash (because of if (Map *map = _FindMap(instanceId)) in MapInstanced::CreateInstance)
+        if (instanceId)
+            if (InstanceSave * save = GetInstanceSave(mapId, mapEntry->IsRaid()))
+                if (save->GetInstanceId() != instanceId)
+                    instanceId = 0;
+    }
 
     // NOW player must have valid map
     // load the player's map here if it's not already loaded
-- 
cgit v1.2.3


From 1b95df41942dd862c6873a4fb9ed206875b20e6b Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Sat, 26 Jun 2010 22:09:11 +0200
Subject: Violet Hold: bosses go out of the cell when door is open, by
 DennisRassmann From issue #2810

--HG--
branch : trunk
---
 .../Northrend/VioletHold/instance_violet_hold.cpp  | 24 ++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'src')

diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
index d5702980ff8..962af54de1e 100644
--- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
+++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
@@ -42,6 +42,15 @@ const Position PortalLocation[] =
     {1908.31, 809.657, 38.7037, 3.08701}      // WP 6
 };
 
+const Position BossStartMove1  = {1894.684448, 739.390503, 47.668003};
+const Position BossStartMove2  = {1875.173950, 860.832703, 43.333565};
+const Position BossStartMove21 = {1858.854614, 855.071411, 43.333565};
+const Position BossStartMove22 = {1891.926636, 863.388977, 43.333565};
+const Position BossStartMove3  = {1916.138062, 778.152222, 35.772308};
+const Position BossStartMove4  = {1853.618286, 758.557617, 38.657505};
+const Position BossStartMove5  = {1906.683960, 842.348022, 38.637459};
+const Position BossStartMove6  = {1928.207031, 852.864441, 47.200813};
+
 struct instance_violet_hold : public ScriptedInstance
 {
     instance_violet_hold(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
@@ -355,6 +364,8 @@ struct instance_violet_hold : public ScriptedInstance
             case BOSS_MORAGG:
                 HandleGameObject(uiMoraggCell,bForceRespawn);
                 pBoss = instance->GetCreature(uiMoragg);
+                if (pBoss)
+                    pBoss->GetMotionMaster()->MovePoint(0, BossStartMove1);
                 break;
             case BOSS_EREKEM:
                 HandleGameObject(uiErekemCell, bForceRespawn);
@@ -363,12 +374,16 @@ struct instance_violet_hold : public ScriptedInstance
 
                 pBoss = instance->GetCreature(uiErekem);
 
+                if (pBoss)
+                    pBoss->GetMotionMaster()->MovePoint(0, BossStartMove2);
+
                 if (Creature* pGuard1 = instance->GetCreature(uiErekemGuard[0]))
                 {
                     if (bForceRespawn)
                         pGuard1->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE|UNIT_FLAG_NON_ATTACKABLE);
                     else
                         pGuard1->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE|UNIT_FLAG_NON_ATTACKABLE);
+                    pGuard1->GetMotionMaster()->MovePoint(0, BossStartMove21);
                 }
 
                 if (Creature* pGuard2 = instance->GetCreature(uiErekemGuard[1]))
@@ -377,23 +392,32 @@ struct instance_violet_hold : public ScriptedInstance
                         pGuard2->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE|UNIT_FLAG_NON_ATTACKABLE);
                     else
                         pGuard2->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE|UNIT_FLAG_NON_ATTACKABLE);
+                    pGuard2->GetMotionMaster()->MovePoint(0, BossStartMove22);
                 }
                 break;
             case BOSS_ICHORON:
                 HandleGameObject(uiIchoronCell,bForceRespawn);
                 pBoss = instance->GetCreature(uiIchoron);
+                if (pBoss)
+                    pBoss->GetMotionMaster()->MovePoint(0, BossStartMove3);
                 break;
             case BOSS_LAVANTHOR:
                 HandleGameObject(uiLavanthorCell,bForceRespawn);
                 pBoss = instance->GetCreature(uiLavanthor);
+                if (pBoss)
+                    pBoss->GetMotionMaster()->MovePoint(0, BossStartMove4);
                 break;
             case BOSS_XEVOZZ:
                 HandleGameObject(uiXevozzCell,bForceRespawn);
                 pBoss = instance->GetCreature(uiXevozz);
+                if (pBoss)
+                    pBoss->GetMotionMaster()->MovePoint(0, BossStartMove5);
                 break;
             case BOSS_ZURAMAT:
                 HandleGameObject(uiZuramatCell,bForceRespawn);
                 pBoss = instance->GetCreature(uiZuramat);
+                if (pBoss)
+                    pBoss->GetMotionMaster()->MovePoint(0, BossStartMove6);
                 break;
         }
 
-- 
cgit v1.2.3


From 3da0d1d5b2177816250a8f0e27350fc210deae47 Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Sat, 26 Jun 2010 22:35:23 +0200
Subject: Violet Hold: Cyanigosa's pre-fight animation, by DenissRassmann From
 issue #2810

--HG--
branch : trunk
---
 .../Northrend/VioletHold/instance_violet_hold.cpp  | 56 +++++++++++++++++++++-
 1 file changed, 55 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
index 962af54de1e..cec9b8800cf 100644
--- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
+++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
@@ -51,6 +51,20 @@ const Position BossStartMove4  = {1853.618286, 758.557617, 38.657505};
 const Position BossStartMove5  = {1906.683960, 842.348022, 38.637459};
 const Position BossStartMove6  = {1928.207031, 852.864441, 47.200813};
 
+const Position CyanigosasSpawnLocation = {1930.281250, 804.407715, 52.410946, 3.139621};
+const Position MiddleRoomLocation = {1892.291260, 805.696838, 38.438862, 3.139621};
+
+//Cyanigosa's prefight event data
+enum Yells
+{
+    CYANIGOSA_SAY_SPAWN                           = -1608005
+};
+enum Spells
+{
+    CYANIGOSA_SPELL_TRANSFORM                     = 58668,
+    CYANIGOSA_BLUE_AURA                           = 47759,
+};
+
 struct instance_violet_hold : public ScriptedInstance
 {
     instance_violet_hold(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
@@ -79,6 +93,7 @@ struct instance_violet_hold : public ScriptedInstance
     uint64 uiActivationCrystal[3];
 
     uint32 uiActivationTimer;
+    uint32 uiCyanigosaEventTimer;
 
     uint8 uiWaveCount;
     uint8 uiLocation;
@@ -93,6 +108,7 @@ struct instance_violet_hold : public ScriptedInstance
     uint8 m_auiEncounter[MAX_ENCOUNTER];
     uint8 uiCountErekemGuards;
     uint8 uiCountActivationCrystals;
+    uint8 uiCyanigosaEventPhase;
 
     bool bActive;
     bool bWiped;
@@ -135,9 +151,11 @@ struct instance_violet_hold : public ScriptedInstance
         uiSecondBoss = 0;
         uiCountErekemGuards = 0;
         uiCountActivationCrystals = 0;
+        uiCyanigosaEventPhase = 1;
 
         uiActivationTimer = 5000;
         uiDoorSpellTimer = 2000;
+        uiCyanigosaEventTimer = 3*IN_MILISECONDS;
 
         bActive = false;
         bIsDoorSpellCasted = false;
@@ -184,6 +202,7 @@ struct instance_violet_hold : public ScriptedInstance
                 break;
             case CREATURE_CYANIGOSA:
                 uiCyanigosa = pCreature->GetGUID();
+                pCreature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE|UNIT_FLAG_NON_ATTACKABLE);
                 break;
             case CREATURE_SINCLARI:
                 uiSinclari = pCreature->GetGUID();
@@ -465,7 +484,7 @@ struct instance_violet_hold : public ScriptedInstance
             {
                 Creature *pSinclari = instance->GetCreature(uiSinclari);
                 if (pSinclari)
-                    pSinclari->SummonCreature(CREATURE_CYANIGOSA,PortalLocation[0],TEMPSUMMON_DEAD_DESPAWN);
+                    pSinclari->SummonCreature(CREATURE_CYANIGOSA,CyanigosasSpawnLocation,TEMPSUMMON_DEAD_DESPAWN);
                 break;
             }
             case 1:
@@ -595,6 +614,41 @@ struct instance_violet_hold : public ScriptedInstance
             }
         }
 
+        // Cyanigosa is spawned but not tranformed, prefight event
+        Creature *pCyanigosa = instance->GetCreature(uiCyanigosa);
+        if (pCyanigosa && !pCyanigosa->HasAura(CYANIGOSA_SPELL_TRANSFORM))
+        {
+            if (uiCyanigosaEventTimer <= diff)
+            {
+                switch(uiCyanigosaEventPhase)
+                {
+                    case 1:
+                        pCyanigosa->CastSpell(pCyanigosa, CYANIGOSA_BLUE_AURA, false);
+                        DoScriptText(CYANIGOSA_SAY_SPAWN, pCyanigosa);
+                        uiCyanigosaEventTimer = 7*IN_MILISECONDS;
+                        ++uiCyanigosaEventPhase;
+                        break;
+                    case 2:
+                        pCyanigosa->GetMotionMaster()->MoveJump(MiddleRoomLocation.GetPositionX(), MiddleRoomLocation.GetPositionY(), MiddleRoomLocation.GetPositionZ(), 10.0f, 20.0f);
+                        pCyanigosa->CastSpell(pCyanigosa, CYANIGOSA_BLUE_AURA, false);
+                        uiCyanigosaEventTimer = 7*IN_MILISECONDS;
+                        ++uiCyanigosaEventPhase;
+                        break;
+                    case 3:
+                        pCyanigosa->RemoveAurasDueToSpell(CYANIGOSA_BLUE_AURA);
+                        pCyanigosa->CastSpell(pCyanigosa, CYANIGOSA_SPELL_TRANSFORM, 0);
+                        pCyanigosa->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE|UNIT_FLAG_NON_ATTACKABLE);
+                        pCyanigosa->SetReactState(REACT_AGGRESSIVE);
+                        uiCyanigosaEventTimer = 2*IN_MILISECONDS;
+                        ++uiCyanigosaEventPhase;
+                        break;
+                    case 4:
+                        uiCyanigosaEventPhase = 0;
+                        break;
+                }
+            } else uiCyanigosaEventTimer -= diff;
+        }
+
         // if there are NPCs in front of the prison door, which are casting the door seal spell and doors are active
         if(GetData(DATA_NPC_PRESENCE_AT_DOOR) && (GetData(DATA_MAIN_DOOR) == GO_STATE_READY))
         {
-- 
cgit v1.2.3


From 1361b8b86c20d2e4a5a7332bb2834774a209f0f8 Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Sat, 26 Jun 2010 23:40:24 +0200
Subject: Violet Hold: Azure Saboteour animation on boss encounters, by
 DenissRassman From issue #2180

--HG--
branch : trunk
---
 sql/scripts/world_scripts_full.sql                 |   1 +
 sql/updates/8752_world_scriptname.sql              |   1 +
 .../Northrend/VioletHold/instance_violet_hold.cpp  |  39 ++++-
 .../scripts/Northrend/VioletHold/violet_hold.cpp   | 165 ++++++++++++++++++++-
 .../scripts/Northrend/VioletHold/violet_hold.h     |   9 +-
 5 files changed, 210 insertions(+), 5 deletions(-)
 create mode 100644 sql/updates/8752_world_scriptname.sql

(limited to 'src')

diff --git a/sql/scripts/world_scripts_full.sql b/sql/scripts/world_scripts_full.sql
index 6b36f9f0928..191a2ea0106 100644
--- a/sql/scripts/world_scripts_full.sql
+++ b/sql/scripts/world_scripts_full.sql
@@ -1503,6 +1503,7 @@ update `creature_template` SET `scriptname`='mob_azure_invader' WHERE `entry`=30
 update `creature_template` SET `scriptname`='mob_azure_spellbreaker' WHERE `entry`=30962;
 update `creature_template` SET `scriptname`='mob_azure_binder' WHERE `entry`=30918;
 update `creature_template` SET `scriptname`='mob_azure_mage_slayer' WHERE `entry`=30963;
+UPDATE `creature_template` SET `scriptname`='mob_azure_saboteur' WHERE `entry`=31079;
 UPDATE `instance_template` SET `script`='instance_violet_hold' WHERE `map`=608;
 
 /* WAILING CAVERNS */
diff --git a/sql/updates/8752_world_scriptname.sql b/sql/updates/8752_world_scriptname.sql
new file mode 100644
index 00000000000..03bc1bb354c
--- /dev/null
+++ b/sql/updates/8752_world_scriptname.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `scriptname`='mob_azure_saboteur' WHERE `entry`=31079; -- Azure Saboteur
diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
index cec9b8800cf..39d052b4055 100644
--- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
+++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
@@ -32,6 +32,12 @@ enum GameObjects
     GO_ACTIVATION_CRYSTAL                           = 193611
 };
 
+enum AzureSaboteurSpells
+{
+    SABOTEUR_SHIELD_DISRUPTION                      = 58291,
+    SABOTEUR_SHIELD_EFFECT                          = 45775
+};
+
 const Position PortalLocation[] =
 {
     {1877.51, 850.104, 44.6599, 4.7822 },     // WP 1
@@ -53,6 +59,7 @@ const Position BossStartMove6  = {1928.207031, 852.864441, 47.200813};
 
 const Position CyanigosasSpawnLocation = {1930.281250, 804.407715, 52.410946, 3.139621};
 const Position MiddleRoomLocation = {1892.291260, 805.696838, 38.438862, 3.139621};
+const Position MiddleRoomPortalSaboLocation = {1896.622925, 804.854126, 38.504772, 3.139621};
 
 //Cyanigosa's prefight event data
 enum Yells
@@ -89,6 +96,7 @@ struct instance_violet_hold : public ScriptedInstance
     uint64 uiZuramatCell;
     uint64 uiMainDoor;
     uint64 uiTeleportationPortal;
+    uint64 uiSaboteurPortal;
 
     uint64 uiActivationCrystal[3];
 
@@ -139,6 +147,7 @@ struct instance_violet_hold : public ScriptedInstance
         uiZuramatCell = 0;
         uiMainDoor = 0;
         uiTeleportationPortal = 0;
+        uiSaboteurPortal = 0;
         
         uiRemoveNpc = 0;
 
@@ -316,6 +325,17 @@ struct instance_violet_hold : public ScriptedInstance
                 }
                 uiMainDoorState = data;
                 break;
+            case DATA_START_BOSS_ENCOUNTER:
+                switch(uiWaveCount)
+                {
+                    case 6:
+                        StartBossEncounter(uiFirstBoss);
+                        break;
+                    case 12:
+                        StartBossEncounter(uiSecondBoss);
+                        break;
+                }
+                break;
         }
     }
 
@@ -332,6 +352,8 @@ struct instance_violet_hold : public ScriptedInstance
             case DATA_DOOR_INTEGRITY:           return uiDoorIntegrity;
             case DATA_NPC_PRESENCE_AT_DOOR:     return NpcAtDoorCastingList.size();
             case DATA_MAIN_DOOR:                return uiMainDoorState;
+            case DATA_FIRST_BOSS:               return uiFirstBoss;
+            case DATA_SECOND_BOSS:              return uiSecondBoss;
         }
 
         return 0;
@@ -361,6 +383,7 @@ struct instance_violet_hold : public ScriptedInstance
             case DATA_MAIN_DOOR:                return uiMainDoor;
             case DATA_SINCLARI:                 return uiSinclari;
             case DATA_TELEPORTATION_PORTAL:     return uiTeleportationPortal;
+            case DATA_SABOTEUR_PORTAL:          return uiSaboteurPortal;
         }
 
         return 0;
@@ -470,7 +493,13 @@ struct instance_violet_hold : public ScriptedInstance
             case 6:
                 if (uiFirstBoss == 0)
                     uiFirstBoss = urand(1,6);
-                StartBossEncounter(uiFirstBoss);
+                if (Creature *pSinclari = instance->GetCreature(uiSinclari))
+                {
+                    if(Creature *pPortal = pSinclari->SummonCreature(CREATURE_TELEPORTATION_PORTAL, MiddleRoomPortalSaboLocation, TEMPSUMMON_CORPSE_DESPAWN))
+                        uiSaboteurPortal = pPortal->GetGUID();
+                    if (Creature *pAzureSaboteur = pSinclari->SummonCreature(CREATURE_SABOTEOUR, MiddleRoomLocation, TEMPSUMMON_DEAD_DESPAWN))
+                        pAzureSaboteur->CastSpell(pAzureSaboteur, SABOTEUR_SHIELD_EFFECT, false);
+                }
                 break;
             case 12:
                 if (uiSecondBoss == 0)
@@ -478,7 +507,13 @@ struct instance_violet_hold : public ScriptedInstance
                     {
                         uiSecondBoss = urand(1,6);
                     } while (uiSecondBoss == uiFirstBoss);
-                StartBossEncounter(uiSecondBoss);
+                if (Creature *pSinclari = instance->GetCreature(uiSinclari))
+                {
+                    if(Creature *pPortal = pSinclari->SummonCreature(CREATURE_TELEPORTATION_PORTAL, MiddleRoomPortalSaboLocation, TEMPSUMMON_CORPSE_DESPAWN))
+                        uiSaboteurPortal = pPortal->GetGUID();
+                    if (Creature *pAzureSaboteur = pSinclari->SummonCreature(CREATURE_SABOTEOUR, MiddleRoomLocation, TEMPSUMMON_DEAD_DESPAWN))
+                        pAzureSaboteur->CastSpell(pAzureSaboteur, SABOTEUR_SHIELD_EFFECT, false);
+                }
                 break;
             case 18:
             {
diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp
index 516163a0834..a7a624a3dbe 100644
--- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp
+++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp
@@ -85,6 +85,12 @@ enum AzureStalkerSpells
     SPELL_TACTICAL_BLINK        = 58470
 };
 
+enum AzureSaboteurSpells
+{
+    SABOTEUR_SHIELD_DISRUPTION        = 58291,
+    SABOTEUR_SHIELD_EFFECT            = 45775
+};
+
 enum TrashDoorSpell
 {
     SPELL_DESTROY_DOOR_SEAL     = 58040
@@ -186,6 +192,40 @@ float SixthPoralWPs [4][3] =
     //{1826.889648, 803.929993, 44.363239}
 };
 
+const float SaboteurFinalPos1[3][3] =
+{
+    {1892.502319, 777.410767, 38.630402},
+    {1891.165161, 762.969421, 47.666920},
+    {1893.168091, 740.919189, 47.666920}
+};
+const float SaboteurFinalPos2[3][3] =
+{
+    {1882.242676, 834.818726, 38.646786},
+    {1879.220825, 842.224854, 43.333641},
+    {1873.842896, 863.892456, 43.333641}
+};
+const float SaboteurFinalPos3[2][3] =
+{
+    {1904.298340, 792.400391, 38.646782},
+    {1935.716919, 758.437073, 30.627895}
+};
+const float SaboteurFinalPos4[3] =
+{
+    1855.006104, 760.641724, 38.655266
+};
+const float SaboteurFinalPos5[3] =
+{
+    1906.667358, 841.705566, 38.637894
+};
+const float SaboteurFinalPos6[5][3] =
+{
+    {1911.437012, 821.289246, 38.684128},
+    {1920.734009, 822.978027, 41.525414},
+    {1928.262939, 830.836609, 44.668266},
+    {1929.338989, 837.593933, 47.137596},
+    {1931.063354, 848.468445, 47.190434}
+ };
+
 const Position MovePosition = { 1806.955566, 803.851807, 44.363323};
 
 struct npc_sinclariAI : public ScriptedAI
@@ -309,6 +349,120 @@ CreatureAI* GetAI_npc_sinclari(Creature* pCreature)
     return new npc_sinclariAI(pCreature);
 }
 
+struct mob_azure_saboteurAI : public npc_escortAI
+{
+    mob_azure_saboteurAI(Creature *c):npc_escortAI(c)
+    {
+        pInstance           = c->GetInstanceData();
+        bHasGotMovingPoints = false;
+        uiBoss = 0;
+        Reset();
+    }
+
+    ScriptedInstance* pInstance;
+    bool bHasGotMovingPoints;
+    uint32 uiBoss;
+
+    void Reset()
+    {
+        if (pInstance && !uiBoss)
+            uiBoss = pInstance->GetData(DATA_WAVE_COUNT) == 6 ? pInstance->GetData(DATA_FIRST_BOSS) : pInstance->GetData(DATA_SECOND_BOSS);
+    }
+
+    void WaypointReached(uint32 uiWPointId)
+    {
+        switch(uiBoss)
+        {
+            case 1:
+                if(uiWPointId == 2)
+                    FinishPointReached();
+                break;
+            case 2:
+                if(uiWPointId == 2)
+                    FinishPointReached();
+                break;
+            case 3:
+                if(uiWPointId == 1)
+                    FinishPointReached();
+                break;
+            case 4:
+                if(uiWPointId == 0)
+                    FinishPointReached();
+                break;
+            case 5:
+                if(uiWPointId == 0)
+                    FinishPointReached();
+                break;
+            case 6:
+                if(uiWPointId == 4)
+                    FinishPointReached();
+                break;
+        }
+    }
+    
+    void UpdateAI(uint32 diff)
+    {
+        if(pInstance->GetData(DATA_MAIN_DOOR) != GO_STATE_READY)
+            me->CastStop();
+        
+        npc_escortAI::UpdateAI(diff);
+
+        if(!bHasGotMovingPoints)
+        {
+            bHasGotMovingPoints = true;
+            switch(uiBoss)
+            {
+                case 1:
+                    for(int i=0;i<3;i++)
+                        AddWaypoint(i,SaboteurFinalPos1[i][0],SaboteurFinalPos1[i][1],SaboteurFinalPos1[i][2],0);
+                    me->SetHomePosition(SaboteurFinalPos1[2][0],SaboteurFinalPos1[2][1],SaboteurFinalPos1[2][2],4.762346);
+                    break;
+                case 2:
+                    for(int i=0;i<3;i++)
+                        AddWaypoint(i,SaboteurFinalPos2[i][0],SaboteurFinalPos2[i][1],SaboteurFinalPos2[i][2],0);
+                    me->SetHomePosition(SaboteurFinalPos2[2][0],SaboteurFinalPos2[2][1],SaboteurFinalPos2[2][2],1.862674);
+                    break;
+                case 3:
+                    for(int i=0;i<2;i++)
+                        AddWaypoint(i,SaboteurFinalPos3[i][0],SaboteurFinalPos3[i][1],SaboteurFinalPos3[i][2],0);
+                    me->SetHomePosition(SaboteurFinalPos3[1][0],SaboteurFinalPos3[1][1],SaboteurFinalPos3[1][2],5.500638);
+                    break;
+                case 4:
+                    AddWaypoint(0,SaboteurFinalPos4[0],SaboteurFinalPos4[1],SaboteurFinalPos4[2],0);
+                    me->SetHomePosition(SaboteurFinalPos4[0],SaboteurFinalPos4[1],SaboteurFinalPos4[2],3.991108);
+                    break;
+                case 5:
+                    AddWaypoint(0,SaboteurFinalPos5[0],SaboteurFinalPos5[1],SaboteurFinalPos5[2],0);
+                    me->SetHomePosition(SaboteurFinalPos5[0],SaboteurFinalPos5[1],SaboteurFinalPos5[2],1.100841);
+                    break;
+                case 6:
+                    for(int i=0;i<5;i++)
+                        AddWaypoint(i,SaboteurFinalPos6[i][0],SaboteurFinalPos6[i][1],SaboteurFinalPos6[i][2],0);
+                    me->SetHomePosition(SaboteurFinalPos6[4][0],SaboteurFinalPos6[4][1],SaboteurFinalPos6[4][2],0.983031);
+                    break;
+            }
+
+            SetDespawnAtEnd(false);
+            Start(true,true);
+        }
+    }
+
+    void FinishPointReached()
+    {
+        me->CastSpell(me, SABOTEUR_SHIELD_DISRUPTION, false);
+        me->DisappearAndDie();
+        Creature* pSaboPort = Unit::GetCreature((*me),pInstance->GetData64(DATA_SABOTEUR_PORTAL));
+        if (pSaboPort)
+            pSaboPort->DisappearAndDie();
+        pInstance->SetData(DATA_START_BOSS_ENCOUNTER, 1);
+    }
+};
+
+CreatureAI* GetAI_mob_azure_saboteur(Creature* pCreature)
+{
+    return new mob_azure_saboteurAI (pCreature);
+}
+
 bool GossipHello_npc_sinclari(Player* pPlayer, Creature* pCreature)
 {
     ScriptedInstance* pInstance = pCreature->GetInstanceData();
@@ -373,6 +527,10 @@ struct npc_teleportation_portalAI : public ScriptedAI
             pInstance->SetData(DATA_REMOVE_NPC, 0);
         }
 
+        uint8 uiWaveCount = pInstance->GetData(DATA_WAVE_COUNT);
+        if ((uiWaveCount == 6) || (uiWaveCount == 12)) //Don't spawn mobs on boss encounters
+            return;
+
         switch(uiTypeOfMobsPortal)
         {
             // spawn elite mobs and then set portals visibility to make it look like it dissapeard
@@ -382,7 +540,7 @@ struct npc_teleportation_portalAI : public ScriptedAI
                     if (uiSpawnTimer <= diff)
                     {
                         bPortalGuardianOrKeeperOrEliteSpawn = true;
-                        uint8 k = pInstance->GetData(DATA_WAVE_COUNT) < 12 ? 2 : 3;
+                        uint8 k = uiWaveCount < 12 ? 2 : 3;
                         for (uint8 i = 0; i < k; ++i)
                         {
                             uint32 entry = RAND(CREATURE_AZURE_CAPTAIN,CREATURE_AZURE_RAIDER,CREATURE_AZURE_STALKER,CREATURE_AZURE_SORCEROR);
@@ -1100,4 +1258,9 @@ void AddSC_violet_hold()
     newscript->Name = "mob_azure_stalker";
     newscript->GetAI = &GetAI_mob_azure_stalker;
     newscript->RegisterSelf();
+
+    newscript = new Script;
+    newscript->Name = "mob_azure_saboteur";
+    newscript->GetAI = &GetAI_mob_azure_saboteur;
+    newscript->RegisterSelf();
 }
diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.h b/src/server/scripts/Northrend/VioletHold/violet_hold.h
index 459cfc884ee..cbe6aecf5dd 100644
--- a/src/server/scripts/Northrend/VioletHold/violet_hold.h
+++ b/src/server/scripts/Northrend/VioletHold/violet_hold.h
@@ -15,6 +15,7 @@ enum Creatures
     CREATURE_MORAGG                                 = 29316,
     CREATURE_CYANIGOSA                              = 31134,
     CREATURE_SINCLARI                               = 30658,
+    CREATURE_SABOTEOUR                              = 31079,
     NPC_VIOLET_HOLD_GUARD                           = 30659
 };
 
@@ -29,7 +30,10 @@ enum Data
     DATA_DOOR_INTEGRITY,
     DATA_NPC_PRESENCE_AT_DOOR,
     DATA_NPC_PRESENCE_AT_DOOR_ADD,
-    DATA_NPC_PRESENCE_AT_DOOR_REMOVE
+    DATA_NPC_PRESENCE_AT_DOOR_REMOVE,
+    DATA_START_BOSS_ENCOUNTER,
+    DATA_FIRST_BOSS,
+    DATA_SECOND_BOSS
 };
 
 enum Data64
@@ -53,7 +57,8 @@ enum Data64
     DATA_ZURAMAT_CELL,
     DATA_MAIN_DOOR,
     DATA_SINCLARI,
-    DATA_TELEPORTATION_PORTAL
+    DATA_TELEPORTATION_PORTAL,
+    DATA_SABOTEUR_PORTAL
 };
 
 enum Bosses
-- 
cgit v1.2.3


From 59ca58a49f33a4a395ff4a345117825936da6527 Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Sat, 26 Jun 2010 23:43:15 +0200
Subject: Violet Hold, Cyanigosa: Clear transformation on EnterCombat, now is
 handled by instance script

--HG--
branch : trunk
---
 src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src')

diff --git a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp
index a13fc351eda..9f876b32820 100644
--- a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp
@@ -68,7 +68,6 @@ struct boss_cyanigosaAI : public ScriptedAI
     void EnterCombat(Unit* /*who*/)
     {
         DoScriptText(SAY_AGGRO, me);
-        DoCast(me, SPELL_TRANSFORM);
 
         if (pInstance)
             pInstance->SetData(DATA_CYANIGOSA_EVENT, IN_PROGRESS);
-- 
cgit v1.2.3


From 0fd3e47edcd1cea73a29a101221a3dbe131b4df7 Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Sun, 27 Jun 2010 00:58:04 +0200
Subject: Fix crash when applying mind control to vehicles Closes issue #2816
 What should happen when mind control is applied to vehicles?

--HG--
branch : trunk
---
 src/server/game/Spells/Auras/SpellAuraEffects.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src')

diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
index f5d2ad75f93..89fcd379e85 100644
--- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
@@ -3910,6 +3910,9 @@ void AuraEffect::HandleModPossessPet(AuraApplication const * aurApp, uint8 mode,
         if (caster->ToPlayer()->GetPet() != target)
             return;
 
+        if (target->IsVehicle()) //Avoid crash when mind controling vehicles due to an assert in Unit::SetCharmedBy
+            return;
+        
         target->SetCharmedBy(caster, CHARM_TYPE_POSSESS);
     }
     else
-- 
cgit v1.2.3


From 26f4fae8020ac805376c9b696331857ed1004c94 Mon Sep 17 00:00:00 2001
From: Machiavelli 
Date: Sun, 27 Jun 2010 03:47:18 +0200
Subject: Fix bug that creatures which use FleeingMovementGenerator would not
 attack after respawning. Bug was caused by improper react state

--HG--
branch : trunk
---
 src/server/game/Entities/Creature/Creature.cpp | 11 ++++-------
 src/server/game/Entities/Creature/Creature.h   | 11 +++++++++++
 2 files changed, 15 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp
index 8bff608c149..f51b7a585bd 100644
--- a/src/server/game/Entities/Creature/Creature.cpp
+++ b/src/server/game/Entities/Creature/Creature.cpp
@@ -410,13 +410,7 @@ bool Creature::UpdateEntry(uint32 Entry, uint32 team, const CreatureData *data)
     if (isTrigger())
         SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
 
-    if (isTotem() || isTrigger()
-        || GetCreatureType() == CREATURE_TYPE_CRITTER)
-        SetReactState(REACT_PASSIVE);
-    /*else if (isCivilian())
-        SetReactState(REACT_DEFENSIVE);*/
-    else
-        SetReactState(REACT_AGGRESSIVE);
+    InitializeReactState();
 
     if (cInfo->flags_extra & CREATURE_FLAG_EXTRA_NO_TAUNT)
     {
@@ -1602,6 +1596,9 @@ void Creature::Respawn(bool force)
         uint16 poolid = GetDBTableGUIDLow() ? poolhandler.IsPartOfAPool(GetDBTableGUIDLow()) : 0;
         if (poolid)
             poolhandler.UpdatePool(poolid, GetDBTableGUIDLow());
+            
+        //Re-initialize reactstate that could be altered by movementgenerators
+        InitializeReactState();
     }
 
     UpdateObjectVisibility();
diff --git a/src/server/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h
index ae37ba56fd3..11b8ce29763 100644
--- a/src/server/game/Entities/Creature/Creature.h
+++ b/src/server/game/Entities/Creature/Creature.h
@@ -428,9 +428,20 @@ class Creature : public Unit, public GridObject
         bool canWalk() const { return GetCreatureInfo()->InhabitType & INHABIT_GROUND; }
         bool canSwim() const { return GetCreatureInfo()->InhabitType & INHABIT_WATER; }
         //bool canFly()  const { return GetCreatureInfo()->InhabitType & INHABIT_AIR; }
+        
         void SetReactState(ReactStates st) { m_reactState = st; }
         ReactStates GetReactState() { return m_reactState; }
         bool HasReactState(ReactStates state) const { return (m_reactState == state); }
+        void InitializeReactState()
+        {
+            if (isTotem() || isTrigger() || GetCreatureType() == CREATURE_TYPE_CRITTER)
+                SetReactState(REACT_PASSIVE);
+            else
+                SetReactState(REACT_AGGRESSIVE);
+            /*else if (isCivilian())
+            SetReactState(REACT_DEFENSIVE);*/;
+        }
+
         ///// TODO RENAME THIS!!!!!
         bool isCanTrainingOf(Player* player, bool msg) const;
         bool isCanInteractWithBattleMaster(Player* player, bool msg) const;
-- 
cgit v1.2.3


From 39429b05488705195a0d8f75ac2194fedfc014a1 Mon Sep 17 00:00:00 2001
From: Xanadu 
Date: Sun, 27 Jun 2010 04:03:30 +0200
Subject: Dispell code cleanup - GetDispelChance now really returns dispel
 chance and not resist chance.

--HG--
branch : trunk
---
 src/server/game/Spells/Auras/SpellEffects.cpp | 6 +++---
 src/server/game/Spells/SpellMgr.cpp           | 6 ++++--
 src/server/game/Spells/SpellMgr.h             | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Spells/Auras/SpellEffects.cpp b/src/server/game/Spells/Auras/SpellEffects.cpp
index a922686d2c4..1279b738066 100644
--- a/src/server/game/Spells/Auras/SpellEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellEffects.cpp
@@ -3876,7 +3876,7 @@ void Spell::EffectDispel(uint32 i)
 
         bool success = false;
         // 2.4.3 Patch Notes: "Dispel effects will no longer attempt to remove effects that have 100% dispel resistance."
-        if (GetDispelChance(itr->first->GetCaster(), unitTarget, itr->first->GetId(), !unitTarget->IsFriendlyTo(m_caster), &success) > 99)
+        if (!GetDispelChance(itr->first->GetCaster(), unitTarget, itr->first->GetId(), !unitTarget->IsFriendlyTo(m_caster), &success))
         {
             dispel_list.erase(itr);
             continue;
@@ -7217,7 +7217,7 @@ void Spell::EffectDispelMechanic(uint32 i)
             continue;
         bool success = false;
         GetDispelChance(aura->GetCaster(), unitTarget, aura->GetId(), !unitTarget->IsFriendlyTo(m_caster), &success);
-        if((GetAllSpellMechanicMask(aura->GetSpellProto()) & (1<<(mechanic))) && success)
+        if ((GetAllSpellMechanicMask(aura->GetSpellProto()) & (1 << mechanic)) && success)
             dispel_list.push(std::make_pair(aura->GetId(), aura->GetCasterGUID()));
     }
 
@@ -7608,7 +7608,7 @@ void Spell::EffectStealBeneficialBuff(uint32 i)
 
         bool success = false;
         // 2.4.3 Patch Notes: "Dispel effects will no longer attempt to remove effects that have 100% dispel resistance."
-        if (GetDispelChance(itr->first->GetCaster(), unitTarget, itr->first->GetId(), !unitTarget->IsFriendlyTo(m_caster), &success) > 99)
+        if (!GetDispelChance(itr->first->GetCaster(), unitTarget, itr->first->GetId(), !unitTarget->IsFriendlyTo(m_caster), &success))
         {
             steal_list.erase(itr);
             continue;
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp
index 19702f1b8f7..2f2e313fb31 100644
--- a/src/server/game/Spells/SpellMgr.cpp
+++ b/src/server/game/Spells/SpellMgr.cpp
@@ -290,7 +290,7 @@ int32 GetSpellMaxDuration(SpellEntry const *spellInfo)
     return (du->Duration[2] == -1) ? -1 : abs(du->Duration[2]);
 }
 
-int32 GetDispelChance(Unit* auraCaster, Unit* target, uint32 spellId, bool offensive, bool *result)
+uint32 GetDispelChance(Unit* auraCaster, Unit* target, uint32 spellId, bool offensive, bool *result)
 {
     // we assume that aura dispel chance is 100% on start
     // need formula for level difference based chance
@@ -310,7 +310,9 @@ int32 GetDispelChance(Unit* auraCaster, Unit* target, uint32 spellId, bool offen
     if (result)
         *result = !roll_chance_i(resist_chance);
 
-    return resist_chance;
+    resist_chance = resist_chance < 0 ? 0 : resist_chance;
+    resist_chance = resist_chance > 100 ? 100 : resist_chance;
+    return 100 - resist_chance;
 }
 
 uint32 GetSpellCastTime(SpellEntry const* spellInfo, Spell * spell)
diff --git a/src/server/game/Spells/SpellMgr.h b/src/server/game/Spells/SpellMgr.h
index ad0bad7cfaa..bb76dd92880 100644
--- a/src/server/game/Spells/SpellMgr.h
+++ b/src/server/game/Spells/SpellMgr.h
@@ -192,7 +192,7 @@ AuraState GetSpellAuraState(SpellEntry const * spellInfo);
 inline float GetSpellRadiusForHostile(SpellRadiusEntry const *radius) { return (radius ? radius->radiusHostile : 0); }
 inline float GetSpellRadiusForFriend(SpellRadiusEntry const *radius) { return (radius ? radius->radiusFriend : 0); }
 uint32 GetSpellCastTime(SpellEntry const* spellInfo, Spell * spell = NULL);
-int32 GetDispelChance(Unit* auraCaster, Unit* target, uint32 spellId, bool offensive, bool *result);
+uint32 GetDispelChance(Unit* auraCaster, Unit* target, uint32 spellId, bool offensive, bool *result);
 inline float GetSpellMinRangeForHostile(SpellRangeEntry const *range) { return (range ? range->minRangeHostile : 0); }
 inline float GetSpellMaxRangeForHostile(SpellRangeEntry const *range) { return (range ? range->maxRangeHostile : 0); }
 inline float GetSpellMinRangeForFriend(SpellRangeEntry const *range) { return (range ? range->minRangeFriend : 0); }
-- 
cgit v1.2.3


From 5870b57532da10e9befb13ee5e0e18609a00c3d8 Mon Sep 17 00:00:00 2001
From: Xanadu 
Date: Sun, 27 Jun 2010 04:30:11 +0200
Subject: Get rid of a compile warning.

--HG--
branch : trunk
---
 src/server/scripts/Northrend/VioletHold/violet_hold.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp
index a7a624a3dbe..12ccacce05e 100644
--- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp
+++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp
@@ -400,7 +400,7 @@ struct mob_azure_saboteurAI : public npc_escortAI
         }
     }
     
-    void UpdateAI(uint32 diff)
+    void UpdateAI(const uint32 diff)
     {
         if(pInstance->GetData(DATA_MAIN_DOOR) != GO_STATE_READY)
             me->CastStop();
-- 
cgit v1.2.3


From 85114979f8ab89db12a610aa2510489d08944365 Mon Sep 17 00:00:00 2001
From: Machiavelli 
Date: Sun, 27 Jun 2010 04:54:51 +0200
Subject: Update ConfusedMovementGenerator with some coordinate sanity checks.
 Please leave feedback on how this affects: - Confused movement (polymorph,
 blind, etc) - Stability with vmaps enabled

--HG--
branch : trunk
---
 .../ConfusedMovementGenerator.cpp                  | 50 +++++++++++++---------
 1 file changed, 29 insertions(+), 21 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp
index c9e39866bf5..73e24486768 100644
--- a/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp
@@ -47,36 +47,44 @@ ConfusedMovementGenerator::Initialize(T &unit)
     bool is_water_ok, is_land_ok;
     _InitSpecific(unit, is_water_ok, is_land_ok);
 
-    VMAP::IVMapManager *vMaps = VMAP::VMapFactory::createOrGetVMapManager();
-
     for (uint8 idx = 0; idx <= MAX_CONF_WAYPOINTS; ++idx)
     {
-        const float wanderX = wander_distance*rand_norm() - wander_distance/2;
-        const float wanderY = wander_distance*rand_norm() - wander_distance/2;
-        i_waypoints[idx][0] = x + wanderX;
-        i_waypoints[idx][1] = y + wanderY;
+        float wanderX = x + wander_distance*rand_norm() - wander_distance/2;
+        float wanderY = y + wander_distance*rand_norm() - wander_distance/2;
+        Trinity::NormalizeMapCoord(wanderX);
+        Trinity::NormalizeMapCoord(wanderY);
         
-        const bool isInLoS = vMaps->isInLineOfSight(unit.GetMapId(), x, y, z + 2.0f, i_waypoints[idx][0], i_waypoints[idx][1], z + 2.0f);
-        if (!isInLoS)
+        float new_z = map->GetHeight(wanderX, wanderY, z, true);
+        if (new_z > INVALID_HEIGHT && unit.IsWithinLOS(wanderX, wanderY, new_z))
         {
-            i_waypoints[idx][0] = x;
-            i_waypoints[idx][1] = y;
+            // Don't move in water if we're not already in
+            // Don't move on land if we're not already on it either
+            bool is_water_now = map->IsInWater(x, y, z);
+            bool is_water_next = map->IsInWater(wanderX, wanderY, new_z);
+            if ((is_water_now && !is_water_next && !is_land_ok) || (!is_water_now && is_water_next && !is_water_ok))
+            {
+                i_waypoints[idx][0] = idx > 0 ? i_waypoints[idx-1][0] : x; // Back to previous location
+                i_waypoints[idx][1] = idx > 0 ? i_waypoints[idx-1][1] : y;
+                i_waypoints[idx][2] = idx > 0 ? i_waypoints[idx-1][2] : z;
+                continue;
+            }
+            
+            // Taken from FleeingMovementGenerator
+            if (!(new_z - z) || wander_distance / fabs(new_z - z) > 1.0f)
+            {
+                i_waypoints[idx][0] = wanderX;
+                i_waypoints[idx][1] = wanderY;
+                i_waypoints[idx][2] = new_z;
+                continue;
+            }
         }
-
-        // prevent invalid coordinates generation
-        Trinity::NormalizeMapCoord(i_waypoints[idx][0]);
-        Trinity::NormalizeMapCoord(i_waypoints[idx][1]);
-
-        bool is_water = map->IsInWater(i_waypoints[idx][0],i_waypoints[idx][1],z);
-        // if generated wrong path just ignore
-        if ((is_water && !is_water_ok) || (!is_water && !is_land_ok))
+        else    // Back to previous location
         {
             i_waypoints[idx][0] = idx > 0 ? i_waypoints[idx-1][0] : x;
             i_waypoints[idx][1] = idx > 0 ? i_waypoints[idx-1][1] : y;
+            i_waypoints[idx][2] = idx > 0 ? i_waypoints[idx-1][2] : z;
+            continue;
         }
-
-        unit.UpdateGroundPositionZ(i_waypoints[idx][0],i_waypoints[idx][1],z);
-        i_waypoints[idx][2] = z;
     }
 
     unit.SetUInt64Value(UNIT_FIELD_TARGET, 0);
-- 
cgit v1.2.3


From 60349c57003656d7513a6741b17580ff1639b0cd Mon Sep 17 00:00:00 2001
From: Machiavelli 
Date: Sun, 27 Jun 2010 11:48:33 +0200
Subject: Remove some faulty code for picking a random item enchant if
 RandomProperty is -1. This will have to be implemented correctly later. Also
 prevent the core throwing errors when loading items with RandomProperty -1

--HG--
branch : trunk
---
 src/server/game/Entities/Item/ItemEnchantmentMgr.cpp | 5 +----
 src/server/game/Globals/ObjectMgr.cpp                | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp b/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp
index 5d8d6ef25ce..c363f305451 100644
--- a/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp
+++ b/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp
@@ -95,10 +95,7 @@ uint32 GetItemEnchantMod(int32 entry)
 
     if (entry == -1)
     {
-        tab = RandomItemEnch.begin();
-        entry = urand(1, RandomItemEnch.size()) - 1;
-        for (uint32 i = 0; i < entry; ++i)
-            ++tab;
+        /* To do: Find randomproperty/suffix based on item level. */
     }
     else
         tab = RandomItemEnch.find(entry);
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index 00fbc83244c..38df034ccc4 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -2256,7 +2256,7 @@ void ObjectMgr::LoadItemPrototypes()
             const_cast(proto)->Sheath = SHEATHETYPE_NONE;
         }
 
-        if (proto->RandomProperty && !sItemRandomPropertiesStore.LookupEntry(GetItemEnchantMod(proto->RandomProperty)))
+        if (proto->RandomProperty > 0 && !sItemRandomPropertiesStore.LookupEntry(GetItemEnchantMod(proto->RandomProperty)))
         {
             sLog.outErrorDb("Item (Entry: %u) has unknown (wrong or not listed in `item_enchantment_template`) RandomProperty (%u)",i,proto->RandomProperty);
             const_cast(proto)->RandomProperty = 0;
-- 
cgit v1.2.3


From 0b063e189baf13889b28cb283a6c7d4f07e1da36 Mon Sep 17 00:00:00 2001
From: Machiavelli 
Date: Sun, 27 Jun 2010 19:46:25 +0200
Subject: Better way to check for RandomProperty == -1, assign 0 to it for now.

--HG--
branch : trunk
---
 src/server/game/Entities/Item/ItemEnchantmentMgr.cpp | 11 +++--------
 src/server/game/Globals/ObjectMgr.cpp                | 13 ++++++++++---
 2 files changed, 13 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp b/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp
index c363f305451..440ea0027e8 100644
--- a/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp
+++ b/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp
@@ -91,15 +91,10 @@ uint32 GetItemEnchantMod(int32 entry)
     if (!entry)
         return 0;
 
-    EnchantmentStore::const_iterator tab;
-
     if (entry == -1)
-    {
-        /* To do: Find randomproperty/suffix based on item level. */
-    }
-    else
-        tab = RandomItemEnch.find(entry);
-
+        return 0;
+    
+    EnchantmentStore::const_iterator tab = RandomItemEnch.find(entry);    
     if (tab == RandomItemEnch.end())
     {
         sLog.outErrorDb("Item RandomProperty / RandomSuffix id #%u used in `item_template` but it does not have records in `item_enchantment_template` table.",entry);
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index 38df034ccc4..3d6345939f9 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -2256,10 +2256,17 @@ void ObjectMgr::LoadItemPrototypes()
             const_cast(proto)->Sheath = SHEATHETYPE_NONE;
         }
 
-        if (proto->RandomProperty > 0 && !sItemRandomPropertiesStore.LookupEntry(GetItemEnchantMod(proto->RandomProperty)))
+        if (proto->RandomProperty)
         {
-            sLog.outErrorDb("Item (Entry: %u) has unknown (wrong or not listed in `item_enchantment_template`) RandomProperty (%u)",i,proto->RandomProperty);
-            const_cast(proto)->RandomProperty = 0;
+            // To be implemented later
+            if (proto->RandomProperty == -1)
+                const_cast(proto)->RandomProperty = 0;
+                
+            else if (!sItemRandomPropertiesStore.LookupEntry(GetItemEnchantMod(proto->RandomProperty)))
+            {
+                sLog.outErrorDb("Item (Entry: %u) has unknown (wrong or not listed in `item_enchantment_template`) RandomProperty (%u)",i,proto->RandomProperty);
+                const_cast(proto)->RandomProperty = 0;
+            }    
         }
 
         if (proto->RandomSuffix && !sItemRandomSuffixStore.LookupEntry(GetItemEnchantMod(proto->RandomSuffix)))
-- 
cgit v1.2.3


From ba2e5ec2a20dd069092a167a5ab3e68b66e1adf2 Mon Sep 17 00:00:00 2001
From: Xanadu 
Date: Sun, 27 Jun 2010 20:40:41 +0200
Subject: Fixed Shiv. * Now it does weapon dmg and adds a combo point even
 without poison (yes, that's blizzlike). * Poisons from Shiv cannot crit. * No
 more double poison procs.

--HG--
branch : trunk
---
 src/server/game/Entities/Player/Player.cpp    |  4 ++++
 src/server/game/Entities/Unit/Unit.cpp        |  7 +++++-
 src/server/game/Spells/Auras/SpellEffects.cpp | 31 ++-------------------------
 3 files changed, 12 insertions(+), 30 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 4100df480fe..37efe2a2aaa 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -7807,6 +7807,10 @@ void Player::CastItemCombatSpell(Unit *target, WeaponAttackType attType, uint32
 
             // Apply spell mods
             ApplySpellMod(pEnchant->spellid[s],SPELLMOD_CHANCE_OF_SUCCESS,chance);
+            
+            // Shiv has 100% chance to apply the poison
+            if (FindCurrentSpellBySpellId(5938))
+                chance = 100.0f;
 
             if (roll_chance_f(chance))
             {
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index c8715eedba0..c5a6e8440be 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -10445,7 +10445,7 @@ bool Unit::isSpellCrit(Unit *pVictim, SpellEntry const *spellProto, SpellSchoolM
                     }
                 }
                 // Custom crit by class
-                switch(spellProto->SpellFamilyName)
+                switch (spellProto->SpellFamilyName)
                 {
                     case SPELLFAMILY_DRUID:
                         // Starfire
@@ -10458,6 +10458,11 @@ bool Unit::isSpellCrit(Unit *pVictim, SpellEntry const *spellProto, SpellSchoolM
                            break;
                         }
                     break;
+                    case SPELLFAMILY_ROGUE:
+                        // Shiv-applied poisons can't crit
+                        if (FindCurrentSpellBySpellId(5938))
+                            crit_chance = 0.0f;
+                        break;
                     case SPELLFAMILY_PALADIN:
                         // Flash of light
                         if (spellProto->SpellFamilyFlags[0] & 0x40000000)
diff --git a/src/server/game/Spells/Auras/SpellEffects.cpp b/src/server/game/Spells/Auras/SpellEffects.cpp
index 1279b738066..c64db1697a6 100644
--- a/src/server/game/Spells/Auras/SpellEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellEffects.cpp
@@ -1738,41 +1738,14 @@ void Spell::EffectDummy(uint32 i)
                 m_caster->CastSpell(m_caster, 63848, true);
                 break;
             }
-            switch(m_spellInfo->Id)
+            switch (m_spellInfo->Id)
             {
                 case 5938:                                  // Shiv
                 {
                     if (m_caster->GetTypeId() != TYPEID_PLAYER)
                         return;
 
-                    Player *pCaster = m_caster->ToPlayer();
-
-                    Item *item = pCaster->GetWeaponForAttack(OFF_ATTACK);
-                    if (!item)
-                        return;
-
-                    // all poison enchantments is temporary
-                    uint32 enchant_id = item->GetEnchantmentId(TEMP_ENCHANTMENT_SLOT);
-                    if (!enchant_id)
-                        return;
-
-                    SpellItemEnchantmentEntry const *pEnchant = sSpellItemEnchantmentStore.LookupEntry(enchant_id);
-                    if (!pEnchant)
-                        return;
-
-                    for (int s=0; s<3; s++)
-                    {
-                        if (pEnchant->type[s] != ITEM_ENCHANTMENT_TYPE_COMBAT_SPELL)
-                            continue;
-
-                        SpellEntry const* combatEntry = sSpellStore.LookupEntry(pEnchant->spellid[s]);
-                        if (!combatEntry || combatEntry->Dispel != DISPEL_POISON)
-                            continue;
-
-                        m_caster->CastSpell(unitTarget, combatEntry, true, item);
-                    }
-
-                    m_caster->CastSpell(unitTarget, 5940, true);
+                    m_caster->CastSpell(unitTarget, 5940, true);                  
                     return;
                 }
                 case 14185:                                 // Preparation
-- 
cgit v1.2.3


From 4c59bf69dcfc2a58b62ce7daa8f87f5e2f503ab1 Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Sun, 27 Jun 2010 22:52:37 +0200
Subject: Violet Hold: Add copyright note

--HG--
branch : trunk
---
 .../Northrend/VioletHold/boss_cyanigosa.cpp        | 29 ++++++++++++++--------
 .../scripts/Northrend/VioletHold/boss_erekem.cpp   | 29 ++++++++++++++--------
 .../scripts/Northrend/VioletHold/boss_ichoron.cpp  | 12 +++------
 .../Northrend/VioletHold/boss_lavanthor.cpp        | 29 ++++++++++++++--------
 .../scripts/Northrend/VioletHold/boss_moragg.cpp   | 29 ++++++++++++++--------
 .../scripts/Northrend/VioletHold/boss_xevozz.cpp   | 15 ++++-------
 .../scripts/Northrend/VioletHold/boss_zuramat.cpp  | 23 ++++++++++++-----
 .../Northrend/VioletHold/instance_violet_hold.cpp  | 18 ++++++++++++++
 .../scripts/Northrend/VioletHold/violet_hold.cpp   | 18 ++++++++++++++
 .../scripts/Northrend/VioletHold/violet_hold.h     | 18 ++++++++++++++
 10 files changed, 151 insertions(+), 69 deletions(-)

(limited to 'src')

diff --git a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp
index 9f876b32820..487b7b4c500 100644
--- a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp
@@ -1,14 +1,21 @@
-/* Script Data Start
-SDName: Boss cyanigosa
-SDAuthor: LordVanMartin
-SD%Complete:
-SDComment:
-SDCategory:
-Script Data End */
-
-/*** SQL START ***
-update creature_template set scriptname = '' where entry = '';
-*** SQL END ***/
+/*
+ * Copyright (C) 2009 - 2010 Trinity 
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
 #include "ScriptPCH.h"
 #include "violet_hold.h"
 
diff --git a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp
index adbd06dadb9..473eabda14f 100644
--- a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp
@@ -1,14 +1,21 @@
-/* Script Data Start
-SDName: Boss erekem
-SDAuthor: LordVanMartin
-SD%Complete:
-SDComment:
-SDCategory:
-Script Data End */
-
-/*** SQL START ***
-update creature_template set scriptname = '' where entry = '';
-*** SQL END ***/
+/*
+ * Copyright (C) 2009 - 2010 Trinity 
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
 #include "ScriptPCH.h"
 #include "violet_hold.h"
 
diff --git a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp
index df80c1f3ff6..b86c1734076 100644
--- a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp
@@ -1,4 +1,6 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/*
+ * Copyright (C) 2009 - 2010 Trinity 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
@@ -14,14 +16,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-/* Script Data Start
-SDName: Boss ichoron
-SDAuthor: ckegg
-SD%Complete: 80%
-SDComment: TODO: better spawn location for adds
-SDCategory:
-Script Data End */
-
 #include "ScriptPCH.h"
 #include "violet_hold.h"
 
diff --git a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp
index 01ac241d9f7..a4055b3cba1 100644
--- a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp
@@ -1,14 +1,21 @@
-/* Script Data Start
-SDName: Boss lavanthor
-SDAuthor: LordVanMartin
-SD%Complete:
-SDComment:
-SDCategory:
-Script Data End */
-
-/*** SQL START ***
-update creature_template set scriptname = '' where entry = '';
-*** SQL END ***/
+/*
+ * Copyright (C) 2009 - 2010 Trinity 
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
 #include "ScriptPCH.h"
 #include "violet_hold.h"
 
diff --git a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp
index edf78ccacf5..5c59d8d0f65 100644
--- a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp
@@ -1,14 +1,21 @@
-/* Script Data Start
-SDName: Boss moragg
-SDAuthor: LordVanMartin
-SD%Complete:
-SDComment:
-SDCategory:
-Script Data End */
-
-/*** SQL START ***
-update creature_template set scriptname = '' where entry = '';
-*** SQL END ***/
+/*
+ * Copyright (C) 2009 - 2010 Trinity 
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
 #include "ScriptPCH.h"
 #include "violet_hold.h"
 
diff --git a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp
index 1493154599c..20e6a5836fd 100644
--- a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp
@@ -1,4 +1,6 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/*
+ * Copyright (C) 2009 - 2010 Trinity 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
@@ -6,21 +8,14 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-/* Script Data Start
-SDName: Boss xevozz
-SD%Complete:
-SDComment:
-SDCategory:
-Script Data End */
-
 #include "ScriptPCH.h"
 #include "violet_hold.h"
 
diff --git a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp
index 02824f72608..6257755edb8 100644
--- a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp
@@ -1,9 +1,20 @@
-/* Script Data Start
-SDName: Boss zuramat
-SD%Complete:
-SDComment: The phasemask for the voids dosen't work.
-SDCategory:
-Script Data End */
+/*
+ * Copyright (C) 2009 - 2010 Trinity 
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
 
 #include "ScriptPCH.h"
 #include "violet_hold.h"
diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
index 39d052b4055..b5c69003024 100644
--- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
+++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2009 - 2010 Trinity 
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
 #include "ScriptPCH.h"
 #include "violet_hold.h"
 
diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp
index 12ccacce05e..a970737aa2c 100644
--- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp
+++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2009 - 2010 Trinity 
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
 #include "ScriptPCH.h"
 #include "ScriptedEscortAI.h"
 #include "violet_hold.h"
diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.h b/src/server/scripts/Northrend/VioletHold/violet_hold.h
index cbe6aecf5dd..c7b0f3cad5c 100644
--- a/src/server/scripts/Northrend/VioletHold/violet_hold.h
+++ b/src/server/scripts/Northrend/VioletHold/violet_hold.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2009 - 2010 Trinity 
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
 #ifndef DEF_VIOLET_HOLD_H
 #define DEF_VIOLET_HOLD_H
 
-- 
cgit v1.2.3


From 068810d04506fa50a56d5c80e8bbf446908dcf30 Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Sun, 27 Jun 2010 22:53:35 +0200
Subject: Violet Hold: Implement Defenseless Achievement

--HG--
branch : trunk
---
 src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'src')

diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
index b5c69003024..fe7b777d9db 100644
--- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
+++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
@@ -89,6 +89,10 @@ enum Spells
     CYANIGOSA_SPELL_TRANSFORM                     = 58668,
     CYANIGOSA_BLUE_AURA                           = 47759,
 };
+enum Achievements
+{
+    ACHIEV_DEFENSELESS                            = 1816
+};
 
 struct instance_violet_hold : public ScriptedInstance
 {
@@ -139,6 +143,7 @@ struct instance_violet_hold : public ScriptedInstance
     bool bActive;
     bool bWiped;
     bool bIsDoorSpellCasted;
+    bool bCrystalActivated;
 
     std::list NpcAtDoorCastingList;
 
@@ -186,6 +191,7 @@ struct instance_violet_hold : public ScriptedInstance
 
         bActive = false;
         bIsDoorSpellCasted = false;
+        bCrystalActivated = false;
 
         memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
     }
@@ -302,6 +308,8 @@ struct instance_violet_hold : public ScriptedInstance
                     SaveToDB();
                     if (GameObject* pMainDoor = instance->GetGameObject(uiMainDoor))
                         pMainDoor->SetGoState(GO_STATE_ACTIVE);
+                    if (!bCrystalActivated && uiDoorIntegrity == 100)
+                        DoCompleteAchievement(ACHIEV_DEFENSELESS);
                 }
                 break;
             case DATA_WAVE_COUNT:
-- 
cgit v1.2.3


From cba6515acb5820af5df6b77855464c29062b8c44 Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Mon, 28 Jun 2010 00:49:21 +0200
Subject: Violet Hold: Add crystal activation support backend to instance
 script. Support is not used yet by the instance mechanic so is not usable as
 is

--HG--
branch : trunk
---
 .../Northrend/VioletHold/instance_violet_hold.cpp  | 26 ++++++++++++++++++++++
 .../scripts/Northrend/VioletHold/violet_hold.h     |  7 ++++--
 2 files changed, 31 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
index fe7b777d9db..b6d2fa06e2d 100644
--- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
+++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
@@ -125,6 +125,8 @@ struct instance_violet_hold : public ScriptedInstance
     uint32 uiActivationTimer;
     uint32 uiCyanigosaEventTimer;
 
+    std::set trashMobs; // to kill with crystal
+
     uint8 uiWaveCount;
     uint8 uiLocation;
     uint8 uiFirstBoss;
@@ -171,6 +173,8 @@ struct instance_violet_hold : public ScriptedInstance
         uiMainDoor = 0;
         uiTeleportationPortal = 0;
         uiSaboteurPortal = 0;
+
+        trashMobs.clear();
         
         uiRemoveNpc = 0;
 
@@ -362,6 +366,28 @@ struct instance_violet_hold : public ScriptedInstance
                         break;
                 }
                 break;
+            case DATA_ACTIVATE_CRYSTAL:
+                // Kill all mobs registered with SetData64(ADD_TRASH_MOB)
+                // TODO: All visual, spells etc
+                for (std::set::const_iterator itr = trashMobs.begin(); itr != trashMobs.end(); ++itr)
+                {
+                    Creature* pCreature = instance->GetCreature(*itr);
+                    if (pCreature && pCreature->isAlive())
+                        pCreature->Kill(pCreature);
+                }
+        }
+    }
+
+    void SetData64(uint32 type, uint64 data)
+    {
+        switch(type)
+        {
+            case DATA_ADD_TRASH_MOB:
+                trashMobs.insert(data);
+                break;
+            case DATA_DEL_TRASH_MOB:
+                trashMobs.erase(data);
+                break;
         }
     }
 
diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.h b/src/server/scripts/Northrend/VioletHold/violet_hold.h
index c7b0f3cad5c..e9e70950603 100644
--- a/src/server/scripts/Northrend/VioletHold/violet_hold.h
+++ b/src/server/scripts/Northrend/VioletHold/violet_hold.h
@@ -51,7 +51,8 @@ enum Data
     DATA_NPC_PRESENCE_AT_DOOR_REMOVE,
     DATA_START_BOSS_ENCOUNTER,
     DATA_FIRST_BOSS,
-    DATA_SECOND_BOSS
+    DATA_SECOND_BOSS,
+    DATA_ACTIVATE_CRYSTAL
 };
 
 enum Data64
@@ -76,7 +77,9 @@ enum Data64
     DATA_MAIN_DOOR,
     DATA_SINCLARI,
     DATA_TELEPORTATION_PORTAL,
-    DATA_SABOTEUR_PORTAL
+    DATA_SABOTEUR_PORTAL,
+    DATA_ADD_TRASH_MOB,
+    DATA_DEL_TRASH_MOB
 };
 
 enum Bosses
-- 
cgit v1.2.3


From f4531c5a582cae24d4d136035074d8da7e5bdad7 Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Mon, 28 Jun 2010 01:04:13 +0200
Subject: Violet Hold: Add crystal mechanic support to Portal's and Ichoron's
 adds

--HG--
branch : trunk
---
 src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp | 16 ++++++++++++----
 src/server/scripts/Northrend/VioletHold/violet_hold.cpp  |  9 ++++++++-
 2 files changed, 20 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp
index b86c1734076..26e5aedaf62 100644
--- a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp
@@ -292,15 +292,23 @@ struct boss_ichoronAI : public ScriptedAI
 
     void JustSummoned(Creature* pSummoned)
     {
-        pSummoned->SetSpeed(MOVE_RUN, 0.3f);
-        pSummoned->GetMotionMaster()->MoveFollow(me, 0, 0);
-        m_waterElements.push_back(pSummoned->GetGUID());
+        if (pSummoned)
+        {
+            pSummoned->SetSpeed(MOVE_RUN, 0.3f);
+            pSummoned->GetMotionMaster()->MoveFollow(me, 0, 0);
+            m_waterElements.push_back(pSummoned->GetGUID());
+            pInstance->SetData64(DATA_ADD_TRASH_MOB,pSummoned->GetGUID());
+        }
     }
 
 
     void SummonedCreatureDespawn(Creature *pSummoned)
     {
-        m_waterElements.remove(pSummoned->GetGUID());
+        if (pSummoned)
+        {
+            m_waterElements.remove(pSummoned->GetGUID());
+            pInstance->SetData64(DATA_DEL_TRASH_MOB,pSummoned->GetGUID());
+        }
     }
 
     void KilledUnit(Unit * victim)
diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp
index a970737aa2c..165d4309da4 100644
--- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp
+++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp
@@ -539,7 +539,10 @@ struct npc_teleportation_portalAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (pInstance && pInstance->GetData(DATA_REMOVE_NPC) == 1)
+        if (!pInstance) //Massive usage of pInstance, global check
+            return;
+        
+        if (pInstance->GetData(DATA_REMOVE_NPC) == 1)
         {
             me->ForcedDespawn();
             pInstance->SetData(DATA_REMOVE_NPC, 0);
@@ -618,11 +621,15 @@ struct npc_teleportation_portalAI : public ScriptedAI
     void JustSummoned(Creature *pSummoned)
     {
         listOfMobs.Summon(pSummoned);
+        if (pSummoned)
+            pInstance->SetData64(DATA_ADD_TRASH_MOB,pSummoned->GetGUID());
     }
 
     void SummonedMobDied(Creature *pSummoned)
     {
         listOfMobs.Despawn(pSummoned);
+        if (pSummoned)
+            pInstance->SetData64(DATA_DEL_TRASH_MOB,pSummoned->GetGUID());
     }
 };
 
-- 
cgit v1.2.3


From 0485d99e5d0fac0632d218afcc52b23efb15372a Mon Sep 17 00:00:00 2001
From: Xanadu 
Date: Mon, 28 Jun 2010 05:26:00 +0200
Subject: Fixed periodic damage for stackable auras (Deadly Poison...). Patch
 by Lyall. Closes issue #1368.

--HG--
branch : trunk
---
 src/server/game/Entities/Unit/Unit.cpp          | 12 ++++++++++++
 src/server/game/Spells/Auras/SpellAuraEffects.h |  3 +++
 2 files changed, 15 insertions(+)

(limited to 'src')

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index c5a6e8440be..3b292e4f7d5 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -3496,7 +3496,19 @@ void Unit::_AddAura(UnitAura * aura, Unit * caster)
         if (Aura * foundAura = GetOwnedAura(aura->GetId(), aura->GetCasterGUID(), 0, aura))
         {
             if (aura->GetSpellProto()->StackAmount)
+            {                       
                 aura->ModStackAmount(foundAura->GetStackAmount());
+                                           
+                // Update periodic timers from the previous aura
+                for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i)
+                {
+                    AuraEffect *existingEff = foundAura->GetEffect(i);
+                    AuraEffect *newEff = aura->GetEffect(i);
+                    if (!existingEff || !newEff) 
+                        continue;
+                    newEff->SetPeriodicTimer(existingEff->GetPeriodicTimer());
+                }
+            }
 
             // Use the new one to replace the old one
             // This is the only place where AURA_REMOVE_BY_STACK should be used
diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.h b/src/server/game/Spells/Auras/SpellAuraEffects.h
index c2c99b167e0..d44e73f360f 100644
--- a/src/server/game/Spells/Auras/SpellAuraEffects.h
+++ b/src/server/game/Spells/Auras/SpellAuraEffects.h
@@ -45,6 +45,9 @@ class AuraEffect
         int32 GetAmount() const { return m_amount; }
         void SetAmount(int32 amount) { m_amount = amount; m_canBeRecalculated = false;}
 
+        int32 GetPeriodicTimer() const { return m_periodicTimer; }
+        void SetPeriodicTimer(int32 periodicTimer) { m_periodicTimer = periodicTimer; }
+
         int32 CalculateAmount(Unit * caster);
         void CalculatePeriodic(Unit * caster, bool create = false);
         void CalculateSpellMod();
-- 
cgit v1.2.3


From 418360d8f9ccb458ab1f352434e1c79114a13bf3 Mon Sep 17 00:00:00 2001
From: Supabad 
Date: Mon, 28 Jun 2010 14:05:32 +0200
Subject: Add Hard Mode support to Flame Leviathan. more code cleanup. Big
 Thanks to all who participated.

--HG--
branch : trunk
---
 sql/updates/8770_world_areatrigger_scripts.sql     |    3 +
 sql/updates/8770_world_script_waypoints.sql        |    8 +
 sql/updates/8770_world_scriptname.sql              |   12 +
 .../Ulduar/ulduar/boss_flame_leviathan.cpp         | 1013 ++++++++++++++++----
 .../Northrend/Ulduar/ulduar/instance_ulduar.cpp    |   34 +-
 5 files changed, 876 insertions(+), 194 deletions(-)
 create mode 100644 sql/updates/8770_world_areatrigger_scripts.sql
 create mode 100644 sql/updates/8770_world_script_waypoints.sql
 create mode 100644 sql/updates/8770_world_scriptname.sql

(limited to 'src')

diff --git a/sql/updates/8770_world_areatrigger_scripts.sql b/sql/updates/8770_world_areatrigger_scripts.sql
new file mode 100644
index 00000000000..158ad414759
--- /dev/null
+++ b/sql/updates/8770_world_areatrigger_scripts.sql
@@ -0,0 +1,3 @@
+INSERT INTO areatrigger_scripts VALUES
+(5369,'at_RX_214_repair_o_matic_station'),
+(5423,'at_RX_214_repair_o_matic_station');
\ No newline at end of file
diff --git a/sql/updates/8770_world_script_waypoints.sql b/sql/updates/8770_world_script_waypoints.sql
new file mode 100644
index 00000000000..a66c25db739
--- /dev/null
+++ b/sql/updates/8770_world_script_waypoints.sql
@@ -0,0 +1,8 @@
+-- waypoint for mimron inferno
+INSERT INTO `script_waypoint` (`entry`, `pointid`, `location_x`, `location_y`, `location_z`, `waittime`, `point_comment`) VALUES
+(33370, 1, 331.674, -68.6878, 409.804, 0, '0'),
+(33370, 2, 274.578, -92.1829, 409.804, 0, '0'),
+(33370, 3, 226.433, -66.6652, 409.793, 0, '0'),
+(33370, 4, 206.092, -34.7447, 409.801, 0, '0'),
+(33370, 5, 240.208, 1.10346, 409.802, 0, '0'),
+(33370, 6, 337.199, 11.7051, 409.802, 0, '0');
\ No newline at end of file
diff --git a/sql/updates/8770_world_scriptname.sql b/sql/updates/8770_world_scriptname.sql
new file mode 100644
index 00000000000..95277633d0e
--- /dev/null
+++ b/sql/updates/8770_world_scriptname.sql
@@ -0,0 +1,12 @@
+UPDATE `creature_template` SET `ScriptName` = 'npc_thorims_hammer' WHERE `entry` =33365;
+UPDATE `creature_template` SET `MovementType` =2, `ScriptName` = 'npc_mimirons_inferno' WHERE `entry` =33370;
+UPDATE `creature_template` SET `ScriptName` = 'npc_hodirs_fury' WHERE `entry` =33312;
+UPDATE `creature_template` SET `ScriptName` = 'npc_freyas_ward' WHERE `entry` =33367;
+UPDATE `creature_template` SET `ScriptName` = 'npc_lorekeeper' WHERE `entry` =33686;
+UPDATE `creature_template` SET `ScriptName` = 'npc_brann_bronzebeard' WHERE `entry` =33579;
+UPDATE `creature_template` SET `ScriptName` = 'npc_freya_ward_summon' WHERE `entry` =34275;
+UPDATE `creature_template` SET `ScriptName` = 'npc_mechanolift' WHERE `entry` =33214;
+UPDATE `gameobject_template` SET `ScriptName` = 'go_ulduar_tower' WHERE `entry` =194375;
+UPDATE `gameobject_template` SET `ScriptName` = 'go_ulduar_tower' WHERE `entry` =194371;
+UPDATE `gameobject_template` SET `ScriptName` = 'go_ulduar_tower' WHERE `entry` =194370;
+UPDATE `gameobject_template` SET `ScriptName` = 'go_ulduar_tower' WHERE `entry` =194377;
\ No newline at end of file
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp
index 41509766bb3..c13ee5f5585 100644
--- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp
@@ -1,28 +1,29 @@
 /*
- * Copyright (C) 2008 - 2010 TrinityCore 
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
+* Copyright (C) 2008 - 2010 TrinityCore 
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
 
 /*
- * Comment: Tower Event support is not finished, there is missing code on triggers and
- *          Lore Keeper and Brann Bronzebeard are not scripted yet. Lore Keeper's script
- *          should activate the hard mode so is not possible to play hard-mode yet. Add a call to
- *          Leviathan's DoAction(0) from Lore Keeper's script to activate hard-mode
- */
+* Comment: there is missing code on triggers,
+*          brann bronzebeard needs correct gossip info.
+*          requires more work involving area triggers.
+*          if reached brann speaks through his radio..
+*/
 
+#include "ScriptedEscortAI.h"
 #include "ScriptPCH.h"
 #include "ulduar.h"
 #include "Vehicle.h"
@@ -36,19 +37,32 @@ enum Spells
     SPELL_MISSILE_BARRAGE                       = 62400,
     SPELL_SYSTEMS_SHUTDOWN                      = 62475,
 
-    SPELL_FLAME_CANNON                          = 62395,
-//  SPELL_FLAME_CANNON                          = 64692, trigger the same spell
-
     SPELL_OVERLOAD_CIRCUIT                      = 62399,
+    SPELL_START_THE_ENGINE                      = 62472,
     SPELL_SEARING_FLAME                         = 62402,
     SPELL_BLAZE                                 = 62292,
     SPELL_SMOKE_TRAIL                           = 63575,
     SPELL_ELECTROSHOCK                          = 62522,
-    //TOWER BUFF SPELLS
-    SPELL_THORIM_S_HAMMER                       = 62912, // Tower of Storms
-    SPELL_MIMIRON_S_INFERNO                       = 62910, // Tower of Flames
-    SPELL_HODIR_S_FURY                            = 62297, // Tower of Frost
-    SPELL_FREYA_S_WARD                          = 62906  // Tower of Nature
+    //TOWER Additional SPELLS
+    SPELL_THORIM_S_HAMMER                       = 62911, // Tower of Storms
+    SPELL_MIMIRON_S_INFERNO                     = 62909, // Tower of Flames
+    SPELL_HODIR_S_FURY                          = 62533, // Tower of Frost
+    SPELL_FREYA_S_WARD                          = 62906, // Tower of Nature
+    SPELL_FREYA_SUMMONS                         = 62947, // Tower of Nature
+    //TOWER ap & health spells
+    SPELL_BUFF_TOWER_OF_STORMS                  = 65076,
+    SPELL_BUFF_TOWER_OF_FLAMES                  = 65075,
+    SPELL_BUFF_TOWER_OF_FR0ST                   = 65077,
+    SPELL_BUFF_TOWER_OF_LIFE                    = 64482,
+    //Additional Spells
+    SPELL_LASH                                  = 65062,
+    SPELL_FREYA_S_WARD_EFFECT_1                 = 62947,
+    SPELL_FREYA_S_WARD_EFFECT_2                 = 62907,
+    SPELL_AUTO_REPAIR                           = 62705,
+    AURA_DUMMY_BLUE                             = 63294,
+    AURA_DUMMY_GREEN                            = 63295,
+    AURA_DUMMY_YELLOW                           = 63292,
+    SPELL_LIQUID_PYRITE                         = 62494,
 };
 
 enum Creatures
@@ -56,6 +70,25 @@ enum Creatures
     MOB_MECHANOLIFT                             = 33214,
     MOB_LIQUID                                  = 33189,
     MOB_CONTAINER                               = 33218,
+    MOB_THORIM_BEACON                           = 33365,
+    MOB_MIMIRON_BEACON                          = 33370,
+    MOB_HODIR_BEACON                            = 33212,
+    MOB_FREYA_BEACON                            = 33367,
+    NPC_THORIM_TARGET_BEACON                    = 33364,
+    NPC_MIMIRON_TARGET_BEACON                   = 33369,
+    NPC_HODIR_TARGET_BEACON                     = 33108,
+    NPC_FREYA_TARGET_BEACON                     = 33366,
+    NPC_LOREKEEPER                              = 33686, //Hard mode starter
+    NPC_BRANZ_BRONZBEARD                        = 33579,
+    NPC_DELORAH                                 = 33701,
+};
+
+enum Towers
+{
+    GO_TOWER_OF_STORMS = 194377,
+    GO_TOWER_OF_FLAMES = 194371,
+    GO_TOWER_OF_FROST = 194370,
+    GO_TOWER_OF_LIFE = 194375,
 };
 
 enum Events
@@ -66,10 +99,11 @@ enum Events
     EVENT_VENT,
     EVENT_SPEED,
     EVENT_SUMMON,
+    EVENT_SHUTDOWN,
     EVENT_THORIM_S_HAMMER, // Tower of Storms
     EVENT_MIMIRON_S_INFERNO, // Tower of Flames
     EVENT_HODIR_S_FURY,      // Tower of Frost
-    EVENT_FREYA_S_WARD     // Tower of Nature
+    EVENT_FREYA_S_WARD,     // Tower of Nature
 };
 
 enum Seats
@@ -79,6 +113,17 @@ enum Seats
     SEAT_DEVICE                                 = 2,
 };
 
+enum Vehicles
+{
+    VEHICLE_SIEGE                             = 33060,
+    VEHICLE_CHOPPER                           = 33062,
+    VEHICLE_DEMOLISHER                        = 33109,
+};
+
+#define EMOTE_PURSUE          "Flame Leviathan pursues $N."
+#define EMOTE_OVERLOAD        "Flame Leviathan's circuits overloaded."
+#define EMOTE_REPAIR          "Automatic repair sequence initiated."
+
 enum Yells
 {
     SAY_AGGRO                                   = -1603060,
@@ -101,24 +146,24 @@ enum Yells
 
 enum eAchievementData
 {
-    //ACHIEV_CHAMPION_OF_ULDUAR                   = 10042,
-    //ACHIEV_CONQUEROR_OF_ULDUAR                  = 10352,
-    ACHIEV_10_NUKED_FROM_ORBIT                  = 10058,
-    ACHIEV_25_NUKED_FROM_ORBIT                  = 10060,
-    ACHIEV_10_ORBITAL_BOMBARDMENT               = 10056,
-    ACHIEV_25_ORBITAL_BOMBARDMENT               = 10061,
-    ACHIEV_10_ORBITAL_DEVASTATION               = 10057,
-    ACHIEV_25_ORBITAL_DEVASTATION               = 10059,
-    ACHIEV_10_ORBIT_UARY                        = 10218,
-    ACHIEV_25_ORBIT_UARY                        = 10219,
-    ACHIEV_10_SHUTOUT                           = 10054,
-    ACHIEV_25_SHUTOUT                           = 10055,
-    ACHIEV_10_SIEGE_OF_ULDUAR                   = 9999,
-    ACHIEV_25_SIEGE_OF_ULDUAR                   = 10003,
-    //ACHIEV_10_THREE_CAR_GARAGE                  = 10046, 10047, 10048,
-    //ACHIEV_25_THREE_CAR_GARAGE                  = 10049, 10050, 10051,
-    ACHIEV_10_UNBROKEN                          = 10044,
-    ACHIEV_25_UNBROKEN                          = 10045,
+    //ACHIEV_CHAMPION_OF_ULDUAR                   = 2903,
+    //ACHIEV_CONQUEROR_OF_ULDUAR                  = 2904,
+    ACHIEV_10_NUKED_FROM_ORBIT                  = 2915,
+    ACHIEV_25_NUKED_FROM_ORBIT                  = 2917,
+    ACHIEV_10_ORBITAL_BOMBARDMENT               = 2913,
+    ACHIEV_25_ORBITAL_BOMBARDMENT               = 2918,
+    ACHIEV_10_ORBITAL_DEVASTATION               = 2914,
+    ACHIEV_25_ORBITAL_DEVASTATION               = 2916,
+    ACHIEV_10_ORBIT_UARY                        = 3056,
+    ACHIEV_25_ORBIT_UARY                        = 3057,
+    ACHIEV_10_SHUTOUT                           = 2911,
+    ACHIEV_25_SHUTOUT                           = 2912,
+    ACHIEV_10_SIEGE_OF_ULDUAR                   = 2886,
+    ACHIEV_25_SIEGE_OF_ULDUAR                   = 2887,
+    ACHIEV_10_THREE_CAR_GARAGE                  = 2907, //no core support for using a vehicle
+    ACHIEV_25_THREE_CAR_GARAGE                  = 2908, //no core support for using a vehicle
+    ACHIEV_10_UNBROKEN                          = 2905,
+    ACHIEV_25_UNBROKEN                          = 2906,
 };
 
 static Position Center[]=
@@ -126,38 +171,119 @@ static Position Center[]=
     {354.8771, -12.90240, 409.803650},
 };
 
+const Position PosSiege[5] =
+{
+    {-814.59,-64.54,429.92,5.969},
+    {-784.37,-33.31,429.92,5.096},
+    {-808.99,-52.10,429.92,5.668},
+    {-798.59,-44.00,429.92,5.663},
+    {-812.83,-77.71,429.92,0.046},
+};
+
+const Position PosChopper[5] =
+{
+    {-717.83,-106.56,430.02,0.122},
+    {-717.83,-114.23,430.44,0.122},
+    {-717.83,-109.70,430.22,0.122},
+    {-718.45,-118.24,430.26,0.052},
+    {-718.45,-123.58,430.41,0.085},
+};
+
+const Position PosDemolisher[5] =
+{
+    {-724.12,-176.64,430.03,2.543},
+    {-766.70,-225.03,430.50,1.710},
+    {-729.54,-186.26,430.12,1.902},
+    {-756.01,-219.23,430.50,2.369},
+    {-798.01,-227.24,429.84,1.446},
+};
+
 struct boss_flame_leviathanAI : public BossAI
 {
     boss_flame_leviathanAI(Creature* pCreature) : BossAI(pCreature, TYPE_LEVIATHAN), vehicle(pCreature->GetVehicleKit())
     {
         assert(vehicle);
-
-        pInstance = pCreature->GetInstanceData();
+        pInstance = me->GetInstanceData();
+        uiActiveTowers = 4;
+        ActiveTowers = false;
+        towerOfStorms = false;
+        towerOfLife = false;
+        towerOfFlames = false;
+        towerOfFrost = false;
+        me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_KNOCK_BACK, true);
+        me->ApplySpellImmune(0, IMMUNITY_ID, 49560, true); //deathgrip
+
+        me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_STUNNED);
+        me->SetReactState(REACT_PASSIVE);
     }
 
     ScriptedInstance* pInstance;
 
     Vehicle* vehicle;
     uint8 uiActiveTowers;
+    bool ActiveTowers;
+    bool towerOfStorms;
+    bool towerOfLife;
+    bool towerOfFlames;
+    bool towerOfFrost;
 
     void Reset()
     {
         _Reset();
+        /*me->SetLootMode(LOOT_MODE_HARD_MODE_4);
+        me->SetLootMode(LOOT_MODE_HARD_MODE_3);
+        me->SetLootMode(LOOT_MODE_HARD_MODE_2);
+        me->SetLootMode(LOOT_MODE_HARD_MODE_1);*/
+        if (pInstance)
+            pInstance->SetData(TYPE_LEVIATHAN, NOT_STARTED);
         assert(vehicle);
-        uiActiveTowers = 0;
-        me->SetReactState(REACT_AGGRESSIVE);
+        me->GetVehicleKit();
+        me->SetReactState(REACT_DEFENSIVE);
     }
 
     void EnterCombat(Unit* /*who*/)
     {
         _EnterCombat();
-        DoScriptText(SAY_AGGRO, me);
-        me->SetReactState(REACT_DEFENSIVE);
+        pInstance->SetData(TYPE_LEVIATHAN, IN_PROGRESS); //_Reset doesnt do this correctly
+        me->SetReactState(REACT_AGGRESSIVE);
         events.ScheduleEvent(EVENT_PURSUE, 0);
         events.ScheduleEvent(EVENT_MISSILE, 1500);
         events.ScheduleEvent(EVENT_VENT, 20000);
         events.ScheduleEvent(EVENT_SPEED, 15000);
         events.ScheduleEvent(EVENT_SUMMON, 0);
+        if (ActiveTowers)
+        {
+            if (towerOfStorms)
+            {
+                me->AddAura(SPELL_BUFF_TOWER_OF_STORMS, me);
+                events.ScheduleEvent(EVENT_THORIM_S_HAMMER, 35000);
+            }
+
+            if (towerOfFlames)
+            {
+                me->AddAura(SPELL_BUFF_TOWER_OF_FLAMES, me);
+                events.ScheduleEvent(EVENT_MIMIRON_S_INFERNO,70000);
+            }
+
+            if (towerOfFrost)
+            {
+                me->AddAura(SPELL_BUFF_TOWER_OF_FR0ST, me);
+                events.ScheduleEvent(EVENT_HODIR_S_FURY, 105000);
+            }
+
+            if (towerOfLife)
+            {
+                me->AddAura(SPELL_BUFF_TOWER_OF_LIFE, me);
+                events.ScheduleEvent(EVENT_FREYA_S_WARD, 140000);
+            }
+
+            if (!towerOfLife && !towerOfFrost && !towerOfFlames && !towerOfStorms)
+                DoScriptText(SAY_TOWER_NONE, me);
+            else
+                DoScriptText(SAY_HARDMODE, me);
+        }
+        else
+            DoScriptText(SAY_AGGRO, me);
 
         if (Creature *turret = CAST_CRE(vehicle->GetPassenger(SEAT_TURRET)))
             turret->AI()->DoZoneInCombat();
@@ -170,39 +296,40 @@ struct boss_flame_leviathanAI : public BossAI
             AttackStart(pTarget);
     }
 
+
     void JustDied(Unit* /*victim*/)
     {
         _JustDied();
+        pInstance->SetData(TYPE_LEVIATHAN, DONE); //_Reset doesnt do this correctly
         DoScriptText(SAY_DEATH, me);
-        if (pInstance)
+
+        if (ActiveTowers)
         {
-            if (uiActiveTowers)
+            switch (uiActiveTowers)
             {
-                switch (uiActiveTowers)
-                {
-                case 4:
-                    pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_10_ORBIT_UARY, ACHIEV_25_ORBIT_UARY));
-                    break;
-                case 3:
-                    pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_10_NUKED_FROM_ORBIT, ACHIEV_25_NUKED_FROM_ORBIT));
-                    break;
-                case 2:
-                    pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_10_ORBITAL_DEVASTATION, ACHIEV_25_ORBITAL_DEVASTATION));
-                    break;
-                case 1:
-                    pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_10_ORBITAL_BOMBARDMENT, ACHIEV_25_ORBITAL_BOMBARDMENT));
-                    break;
-                }
+            case 4:
+                pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_10_ORBIT_UARY, ACHIEV_25_ORBIT_UARY));
+                break;
+            case 3:
+                pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_10_NUKED_FROM_ORBIT, ACHIEV_25_NUKED_FROM_ORBIT));
+                break;
+            case 2:
+                pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_10_ORBITAL_DEVASTATION, ACHIEV_25_ORBITAL_DEVASTATION));
+                break;
+            case 1:
+                pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_10_ORBITAL_BOMBARDMENT, ACHIEV_25_ORBITAL_BOMBARDMENT));
+                break;
             }
         }
     }
 
     void SpellHit(Unit* /*caster*/, const SpellEntry* pSpell)
     {
-        if (pSpell->Id == 62472)
+        if (pSpell->Id == SPELL_START_THE_ENGINE)
             vehicle->InstallAllAccessories();
-        else if (pSpell->Id == SPELL_ELECTROSHOCK)
-            me->InterruptSpell(CURRENT_CHANNELED_SPELL);
+        else
+            if (pSpell->Id == SPELL_ELECTROSHOCK)
+                me->InterruptSpell(CURRENT_CHANNELED_SPELL);
     }
 
     void UpdateAI(const uint32 diff)
@@ -221,60 +348,104 @@ struct boss_flame_leviathanAI : public BossAI
         if (me->hasUnitState(UNIT_STAT_CASTING))
             return;
 
+        if (me->HasAura(SPELL_SYSTEMS_SHUTDOWN))
+        {
+            me->SetReactState(REACT_PASSIVE);
+            me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED);
+            return;
+        }
+        else
+        {
+            me->SetReactState(REACT_AGGRESSIVE);
+            me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED);
+        }
+
         uint32 eventId = events.GetEvent();
         if (!me->getVictim())
             eventId = EVENT_PURSUE;
 
         switch(eventId)
         {
-            case 0: break; // this is a must
-            case EVENT_PURSUE:
-                DoCastAOE(SPELL_PURSUED, true);
-                //events.RepeatEvent(35000); // this should not be used because eventId may be overriden
-                events.RescheduleEvent(EVENT_PURSUE, 35000);
-                if (!me->getVictim()) // all siege engines and demolishers are dead
-                    UpdateVictim(); // begin to kill other things
-                return;
-            case EVENT_MISSILE:
-                if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM))
-                    DoCast(pTarget, SPELL_MISSILE_BARRAGE);
-                events.RepeatEvent(1500);
-                return;
-            case EVENT_VENT:
-                DoCastAOE(SPELL_FLAME_VENTS);
-                events.RepeatEvent(20000);
-                return;
-            case EVENT_SPEED:
-                DoCastAOE(SPELL_GATHERING_SPEED);
-                events.RepeatEvent(15000);
-                return;
-            case EVENT_SUMMON:
-                if (summons.size() < 15) // 4seat+1turret+10lift
-                    if (Creature* pLift = DoSummonFlyer(MOB_MECHANOLIFT, me, urand(20,40), 50, 0))
-                        pLift->GetMotionMaster()->MoveRandom(100);
-                events.RepeatEvent(2000);
-                return;
-            case EVENT_THORIM_S_HAMMER: // Tower of Storms
-                DoCast(me, SPELL_THORIM_S_HAMMER);
-                events.RepeatEvent(urand(60000, 120000));
-                return;
-            case EVENT_MIMIRON_S_INFERNO: // Tower of Flames
-                DoCast(me->getVictim(), SPELL_MIMIRON_S_INFERNO);
-                events.RepeatEvent(urand(60000, 120000));
-                return;
-            case EVENT_HODIR_S_FURY:      // Tower of Frost
-                DoCast(me->getVictim(), SPELL_HODIR_S_FURY);
-                events.RepeatEvent(urand(60000, 120000));
-                return;
-            case EVENT_FREYA_S_WARD:    // Tower of Nature
-                DoCast(me, SPELL_FREYA_S_WARD);
-                events.RepeatEvent(urand(60000, 120000));
-                return;
-            default:
-                events.PopEvent();
-                break;
+        case 0: break; // this is a must
+        case EVENT_PURSUE:
+            DoCastAOE(SPELL_PURSUED, true);
+            DoScriptText(RAND(SAY_TARGET_1, SAY_TARGET_2, SAY_TARGET_3), me);
+            events.RescheduleEvent(EVENT_PURSUE, 30000);
+            UpdateVictim(); // begin to kill other things
+            if (me->getVictim())
+                me->MonsterTextEmote(EMOTE_PURSUE, me->getVictim()->GetGUID(), true);
+            return;
+        case EVENT_MISSILE:
+            if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM))
+                DoCast(pTarget, SPELL_MISSILE_BARRAGE);
+            events.RepeatEvent(1500);
+            return;
+        case EVENT_VENT:
+            DoCastAOE(SPELL_FLAME_VENTS);
+            events.RepeatEvent(20000);
+            return;
+        case EVENT_SPEED:
+            DoCastAOE(SPELL_GATHERING_SPEED);
+            events.RepeatEvent(15000);
+            return;
+        case EVENT_SUMMON:
+            if (summons.size() < 15) // 4seat+1turret+10lift
+                if (Creature* pLift = DoSummonFlyer(MOB_MECHANOLIFT, me, urand(20,40), 50, 0))
+                    pLift->GetMotionMaster()->MoveRandom(100);
+            events.RepeatEvent(2000);
+            return;
+        case EVENT_SHUTDOWN:
+            DoScriptText(RAND(SAY_OVERLOAD_1, SAY_OVERLOAD_2, SAY_OVERLOAD_3), me);
+            me->MonsterTextEmote(EMOTE_OVERLOAD, 0, true);
+            DoCast(SPELL_SYSTEMS_SHUTDOWN);
+            me->RemoveAurasDueToSpell(SPELL_GATHERING_SPEED);
+            me->MonsterTextEmote(EMOTE_REPAIR, 0, true);
+            events.CancelEvent(EVENT_SHUTDOWN);
+            return;
+        case EVENT_THORIM_S_HAMMER: // Tower of Storms
+            for (uint8 i = 0; i < 7; ++i)
+            {
+                if (Creature* pThorim = DoSummon(MOB_THORIM_BEACON, me, urand(20,60), 20000, TEMPSUMMON_TIMED_DESPAWN))
+                    pThorim->GetMotionMaster()->MoveRandom(100);
+            }
+            DoScriptText(SAY_TOWER_STORM, me);
+            events.CancelEvent(EVENT_THORIM_S_HAMMER);
+            return;
+        case EVENT_MIMIRON_S_INFERNO: // Tower of Flames
+            me->SummonCreature(MOB_MIMIRON_BEACON, 390.93, -13.91, 409.81);
+            DoScriptText(SAY_TOWER_FLAME, me);
+            events.CancelEvent(EVENT_MIMIRON_S_INFERNO);
+            return;
+        case EVENT_HODIR_S_FURY:      // Tower of Frost
+            for (uint8 i = 0; i < 7; ++i)
+            {
+                if (Creature* pHodir = DoSummon(MOB_HODIR_BEACON, me, 50, 0))
+                    pHodir->GetMotionMaster()->MoveRandom(100);
+            }
+            DoScriptText(SAY_TOWER_FROST, me);
+            events.CancelEvent(EVENT_HODIR_S_FURY);
+            return;
+        case EVENT_FREYA_S_WARD:    // Tower of Nature
+            DoScriptText(SAY_TOWER_NATURE, me);
+            StartFreyaEvent();
+            if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM))
+                DoCast(pTarget, SPELL_FREYA_S_WARD);
+            events.CancelEvent(EVENT_FREYA_S_WARD);
+            return;
+        default:
+            events.PopEvent();
+            break;
         }
-        DoSpellAttackIfReady(SPELL_BATTERING_RAM);
+        if (me->IsWithinMeleeRange(me->getVictim()))
+            DoSpellAttackIfReady(SPELL_BATTERING_RAM);
+    }
+
+    void StartFreyaEvent()//summon these 4 on each corner wich wil spawn additional hostile mobs
+    {
+        me->SummonCreature(MOB_FREYA_BEACON, 377.02, -119.10, 409.81);
+        me->SummonCreature(MOB_FREYA_BEACON, 377.02, 54.78, 409.81);
+        me->SummonCreature(MOB_FREYA_BEACON, 185.62, 54.78, 409.81);
+        me->SummonCreature(MOB_FREYA_BEACON, 185.62, -119.10, 409.81);
     }
 
     void DoAction(const int32 uiAction)
@@ -282,51 +453,62 @@ struct boss_flame_leviathanAI : public BossAI
         // Start encounter
         if (uiAction == 10)
         {
-            me->GetMotionMaster()->MovePoint(0, Center[0]);
+            me->SetHomePosition(354.8771, -12.90240, 409.803, 0);
+            me->GetMotionMaster()->MoveCharge(354.8771, -12.90240, 409.803); //position center
             me->SetReactState(REACT_AGGRESSIVE);
-            me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+            me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_STUNNED);
+            DoZoneInCombat();
             return;
         }
-        /*
-        Tower event triggers
-            General TODO:
-                Yells
-
-            Actions:
-                DoAction(0): Activate hard-mode. Buff up leviathan's AP & health, schedule all the tower spells.
-                             Should be triggered on Lore Keeper's script
-                DoAction(1-4): A tower have been destroyed, debuff leviathan's AP & health
-                DoAction(1); Tower of Storms has been destroyed, deschedule spell Thorim's Hammer
-                DoAction(2): Tower of Flames has been destroyed, deschedule spell Mimiron's Inferno
-                DoAction(3): Tower of Frost has been destroyed, deschedule spell Hodir's Fury
-                DoAction(4): Tower of Nature has been destroyed, deschedule spell Freya's Ward
-        */
-
-        if (uiAction) // Tower destruction, debuff leviathan AP & health
+
+        if (uiAction && uiAction <= 4) // Tower destruction, debuff leviathan loot and reduce active tower
         {
-            --uiActiveTowers;
+            if (me->HasLootMode(31) && uiActiveTowers == 4)
+            {
+                me->RemoveLootMode(LOOT_MODE_HARD_MODE_4);
+                --uiActiveTowers;
+            }
+            if (me->HasLootMode(15) && uiActiveTowers == 3)
+            {
+                me->RemoveLootMode(LOOT_MODE_HARD_MODE_3);
+                --uiActiveTowers;
+            }
+            if (me->HasLootMode(7) && uiActiveTowers == 2)
+            {
+                me->RemoveLootMode(LOOT_MODE_HARD_MODE_2);
+                --uiActiveTowers;
+            }
+            if (me->HasLootMode(3) && uiActiveTowers == 1)
+            {
+                me->RemoveLootMode(LOOT_MODE_HARD_MODE_1);
+                --uiActiveTowers;
+            }
         }
 
         switch (uiAction)
         {
-        case 0:  // Activate hard-mode
-            events.ScheduleEvent(EVENT_THORIM_S_HAMMER, urand(30000,60000));
-            events.ScheduleEvent(EVENT_MIMIRON_S_INFERNO, urand(30000,60000));
-            events.ScheduleEvent(EVENT_HODIR_S_FURY, urand(30000,60000));
-            events.ScheduleEvent(EVENT_FREYA_S_WARD, urand(30000,60000));
-            uiActiveTowers=4;
+        case 0:  // Activate hard-mode setting counter to 4 towers, enable all towers apply buffs on levithian
+            ActiveTowers = true;
+            towerOfStorms = true;
+            towerOfLife = true;
+            towerOfFlames = true;
+            towerOfFrost = true;
+            me->SetLootMode(31);
             break;
         case 1:  // Tower of Storms destroyed
-            events.CancelEvent(EVENT_THORIM_S_HAMMER);
+            towerOfStorms = false;
             break;
         case 2: // Tower of Flames destroyed
-            events.CancelEvent(EVENT_MIMIRON_S_INFERNO);
+            towerOfFlames = false;
             break;
         case 3: // Tower of Frost destroyed
-            events.CancelEvent(EVENT_HODIR_S_FURY);
+            towerOfFrost = false;
             break;
         case 4: // Tower of Nature destroyed
-            events.CancelEvent(EVENT_FREYA_S_WARD);
+            towerOfLife = false;
+            break;
+        case 9: // Schedule event
+            events.ScheduleEvent(EVENT_SHUTDOWN, 0);
             break;
         }
     }
@@ -336,7 +518,7 @@ struct boss_flame_leviathanAI : public BossAI
 
 struct boss_flame_leviathan_seatAI : public PassiveAI
 {
-    boss_flame_leviathan_seatAI(Creature *c) : PassiveAI(c), vehicle(c->GetVehicleKit())
+    boss_flame_leviathan_seatAI(Creature* pCreature) : PassiveAI(pCreature), vehicle(pCreature->GetVehicleKit())
     {
         assert(vehicle);
 #ifdef BOSS_DEBUG
@@ -377,17 +559,17 @@ struct boss_flame_leviathan_seatAI : public PassiveAI
                 device->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
             }
         }
-        else if (seatId == SEAT_TURRET)
-        {
-            if (apply)
-                return;
-
-            if (Unit* device = vehicle->GetPassenger(SEAT_DEVICE))
+        else
+            if (seatId == SEAT_TURRET)
             {
-                device->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_SPELLCLICK);
-                device->SetUInt32Value(UNIT_FIELD_FLAGS, 0); // unselectable
+                if (apply)
+                    return;
+                if (Unit* device = vehicle->GetPassenger(SEAT_DEVICE))
+                {
+                    device->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_SPELLCLICK);
+                    device->SetUInt32Value(UNIT_FIELD_FLAGS, 0); // unselectable
+                }
             }
-        }
     }
 };
 
@@ -411,7 +593,12 @@ struct boss_flame_leviathan_defense_turretAI : public TurretAI
 
 struct boss_flame_leviathan_overload_deviceAI : public PassiveAI
 {
-    boss_flame_leviathan_overload_deviceAI(Creature* pCreature) : PassiveAI(pCreature) {}
+    boss_flame_leviathan_overload_deviceAI(Creature* pCreature) : PassiveAI(pCreature)
+    {
+        pInstance = pCreature->GetInstanceData();
+    }
+
+    ScriptedInstance *pInstance;
 
     void DoAction(const int32 param)
     {
@@ -419,6 +606,7 @@ struct boss_flame_leviathan_overload_deviceAI : public PassiveAI
         {
             me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_SPELLCLICK);
             me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+            pInstance->instance->GetCreature(TYPE_LEVIATHAN)->AI()->DoAction(9);   //should be called if all 3 overload devices are active
             if (me->GetVehicle())
             {
                 if (Unit* pPlayer = me->GetVehicle()->GetPassenger(SEAT_PLAYER))
@@ -435,28 +623,83 @@ struct boss_flame_leviathan_overload_deviceAI : public PassiveAI
 
 struct boss_flame_leviathan_safety_containerAI : public PassiveAI
 {
-    boss_flame_leviathan_safety_containerAI(Creature *c) : PassiveAI(c) {}
+    boss_flame_leviathan_safety_containerAI(Creature* pCreature) : PassiveAI(pCreature)
+    {
+    }
+
+    void JustDied()
+    {
+        float x,y,z;
+        me->GetPosition(x,y,z);
+        z = me->GetMap()->GetHeight(x, y, z);
+        me->GetMotionMaster()->MovePoint(0,x,y,z);
+        me->GetMap()->CreatureRelocation(me, x,y,z,0);
+    }
+
+    void UpdateAI(const uint32 diff)
+    {        
+    }
+};
+struct npc_mechanoliftAI : public PassiveAI
+{
+    npc_mechanoliftAI(Creature* pCreature) : PassiveAI(pCreature), vehicle(pCreature->GetVehicleKit())
+    {
+        assert(vehicle);
+    }
+
+    Vehicle* vehicle;
+
+    uint32 MoveTimer;
+
+    void Reset ()
+    {
+        MoveTimer = 0;
+        me->GetMotionMaster()->MoveRandom(50);
+    }
+
+    void JustDied(Unit* pKiller)
+    {
+        me->GetMotionMaster()->MoveTargetedHome();
+        Creature* pLiquid = DoSummon(MOB_LIQUID, me, 0);
+        if (pLiquid)
+        {
+            pLiquid->CastSpell(pLiquid, SPELL_LIQUID_PYRITE, true);
+            pLiquid->GetMotionMaster()->MoveFall(pKiller->GetPositionZ());
+        }
+
+    }
 
-    void MovementInform(uint32 /*type*/, uint32 id)
+    void MovementInform(uint32 type, uint32 id)
     {
-        if (id == me->GetEntry())
+        if (id == 1)
         {
-            if (Creature* pLiquid = DoSummon(MOB_LIQUID, me, 0))
-                pLiquid->CastSpell(pLiquid, 62494, true);
-            me->DisappearAndDie(); // this will relocate creature to sky
+            Creature* pContainer = me->FindNearestCreature(MOB_CONTAINER, 5, true);
+            if (pContainer)
+                pContainer->EnterVehicle(me);
         }
     }
 
-    void UpdateAI(const uint32 /*diff*/)
+    void UpdateAI(const uint32 diff)
     {
-        if (!me->GetVehicle() && me->isSummon() && me->GetMotionMaster()->GetCurrentMovementGeneratorType() != POINT_MOTION_TYPE)
-            me->GetMotionMaster()->MoveFall(409.8f, me->GetEntry());
+        if (MoveTimer <= diff)
+        {
+            if (me->GetVehicleKit()->HasEmptySeat(-1))
+            {
+                Creature* pContainer = me->FindNearestCreature(MOB_CONTAINER, 50, true);
+                if (pContainer && !pContainer->GetVehicle())
+                    me->GetMotionMaster()->MovePoint(1,pContainer->GetPositionX(),pContainer->GetPositionY(),pContainer->GetPositionZ());
+            }
+            MoveTimer = 30000; //check next 30 seconds
+        }
+        else
+            MoveTimer-=diff;
     }
 };
 
-struct spell_pool_of_tarAI : public TriggerAI
+
+struct spell_pool_of_tarAI : public PassiveAI
 {
-    spell_pool_of_tarAI(Creature *c) : TriggerAI(c)
+    spell_pool_of_tarAI(Creature* pCreature) : PassiveAI(pCreature)
     {
         me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
     }
@@ -466,9 +709,9 @@ struct spell_pool_of_tarAI : public TriggerAI
         damage = 0;
     }
 
-    void SpellHit(Unit* /*caster*/, const SpellEntry *spell)
+    void SpellHit(Unit* /*caster*/, const SpellEntry* pSpell)
     {
-        if (spell->SchoolMask & SPELL_SCHOOL_MASK_FIRE && !me->HasAura(SPELL_BLAZE))
+        if (pSpell->SchoolMask & SPELL_SCHOOL_MASK_FIRE && !me->HasAura(SPELL_BLAZE))
             me->CastSpell(me, SPELL_BLAZE, true);
     }
 };
@@ -481,7 +724,6 @@ struct npc_colossusAI : public ScriptedAI
     }
 
     ScriptedInstance *pInstance;
-    Position pPos;
 
     void JustDied(Unit* /*Who*/)
     {
@@ -494,11 +736,341 @@ struct npc_colossusAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
+        if (!UpdateVictim())
+            return;
+        DoMeleeAttackIfReady() ;
+    }
+};
+
+struct npc_thorims_hammerAI : public ScriptedAI
+{
+    npc_thorims_hammerAI(Creature* pCreature) : ScriptedAI (pCreature)
+    {
+        me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+        me->AddAura(AURA_DUMMY_BLUE, me);
+    }
+
+    void MoveInLineOfSight(Unit* who)
+    {
+        if (who->GetTypeId() == TYPEID_PLAYER && who->IsVehicle() && me->IsInRange(who,0,10,false))
+        {
+            if (Creature* pTrigger = DoSummonFlyer(NPC_THORIM_TARGET_BEACON, me, 20, 0, 1000, TEMPSUMMON_TIMED_DESPAWN))
+                pTrigger->CastSpell(who, SPELL_THORIM_S_HAMMER, true);
+        }
+    }
+
+    void Reset ()
+    {
+    }
+
+    void UpdateAI(const uint32 diff)
+    {
+        if (!me->HasAura(AURA_DUMMY_BLUE))
+            me->AddAura(AURA_DUMMY_BLUE, me);
+
+        if (!UpdateVictim())
+            return;
+    }
+};
+
+struct npc_mimirons_infernoAI : public npc_escortAI
+{
+    npc_mimirons_infernoAI(Creature* pCreature) : npc_escortAI(pCreature)
+    {
+        me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
+        me->AddAura(AURA_DUMMY_YELLOW, me);
+        me->SetReactState(REACT_PASSIVE);
+    }
+
+    void WaypointReached(uint32 i)
+    {
+    }
+
+    void Reset()
+    {
+        infernoTimer = 2000;
+    }
+
+    uint32 infernoTimer;
+
+    void UpdateAI(const uint32 diff)
+    {
+        npc_escortAI::UpdateAI(diff);
+
+        if (!HasEscortState(STATE_ESCORT_ESCORTING))
+        {
+            Start(false,true,0,NULL,false,true);
+        }
+        else
+        {
+            if(infernoTimer <= diff)
+            {
+                if (Creature* pTrigger = DoSummonFlyer(NPC_MIMIRON_TARGET_BEACON, me, 20, 0, 1000, TEMPSUMMON_TIMED_DESPAWN))
+                {
+                    pTrigger->CastSpell(me->GetPositionX(),me->GetPositionY(),me->GetPositionZ(), SPELL_MIMIRON_S_INFERNO, true);
+                    infernoTimer = 2000;
+                }
+            }
+            else
+                infernoTimer -= diff;
+
+            if (!me->HasAura(AURA_DUMMY_YELLOW))
+                me->AddAura(AURA_DUMMY_YELLOW, me);
+        }
+    }
+};
+
+
+struct npc_hodirs_furyAI : public ScriptedAI
+{
+    npc_hodirs_furyAI(Creature* pCreature) : ScriptedAI (pCreature)
+    {
+        me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+        me->AddAura(AURA_DUMMY_GREEN, me);
+    }
+
+    void MoveInLineOfSight(Unit* who)
+    {
+        if (who->GetTypeId() == TYPEID_PLAYER && who->IsVehicle() && me->IsInRange(who,0,5,false))
+        {
+            if (Creature* pTrigger = DoSummonFlyer(NPC_HODIR_TARGET_BEACON, me, 20, 0, 1000, TEMPSUMMON_TIMED_DESPAWN))
+                pTrigger->CastSpell(who, SPELL_HODIR_S_FURY, true);
+        }
+    }
+
+    void Reset()
+    {
+    }
+
+    void UpdateAI(const uint32 diff)
+    {
+        if (!me->HasAura(AURA_DUMMY_GREEN))
+            me->AddAura(AURA_DUMMY_GREEN, me);
+
         if (!UpdateVictim())
             return;
     }
 };
 
+struct npc_freyas_wardAI : public ScriptedAI
+{
+    npc_freyas_wardAI(Creature* pCreature) : ScriptedAI(pCreature)
+    {
+        me->AddAura(AURA_DUMMY_GREEN, me);
+    }
+
+    uint32 summonTimer ;
+
+    void Reset()
+    {
+        summonTimer = 5000 ;
+    }
+
+    void UpdateAI(const uint32 diff)
+    {
+        if(summonTimer <= diff)
+        {
+            DoCast(SPELL_FREYA_S_WARD_EFFECT_1) ;
+            DoCast(SPELL_FREYA_S_WARD_EFFECT_2) ;
+            summonTimer = 20000 ;
+        }
+        else
+            summonTimer -= diff ;
+
+        if (!me->HasAura(AURA_DUMMY_GREEN))
+            me->AddAura(AURA_DUMMY_GREEN, me);
+
+        if (!UpdateVictim())
+            return;
+    }
+};
+
+struct npc_freya_ward_summonAI : public ScriptedAI
+{
+    npc_freya_ward_summonAI(Creature* pCreature) : ScriptedAI(pCreature)
+    {
+        pCreature->GetMotionMaster()->MoveRandom(100);
+    }
+
+    uint32 lashTimer ;
+
+    void Reset()
+    {
+        lashTimer = 5000 ;
+    }
+
+    void UpdateAI(const uint32 diff)
+    {
+        if (!UpdateVictim())
+            return;
+
+        if(lashTimer <= diff)
+        {
+            DoCast(SPELL_LASH);
+            lashTimer = 20000;
+        }
+        else
+            lashTimer -= diff;
+
+        DoMeleeAttackIfReady();
+    }
+};
+//npc lore keeper
+#define GOSSIP_ITEM_1  "Activate secondary defensive systems"
+#define GOSSIP_ITEM_2  "Confirmed"
+struct npc_lorekeeperAI : public ScriptedAI
+{
+    npc_lorekeeperAI(Creature* pCreature) : ScriptedAI(pCreature)
+    {
+        pInstance = pCreature->GetInstanceData();
+    }
+
+    ScriptedInstance* pInstance;
+
+    void DoAction(const int32 uiAction)
+    {
+        // Start encounter
+        if (uiAction == 0)
+        {
+            for(uint32 i = 0; i < (RAID_MODE(2,5)); ++i)
+                DoSummon(VEHICLE_SIEGE, PosSiege[i],3000,TEMPSUMMON_CORPSE_TIMED_DESPAWN);
+            for(uint32 i = 0; i < (RAID_MODE(2,5)); ++i)
+                DoSummon(VEHICLE_CHOPPER, PosChopper[i],3000,TEMPSUMMON_CORPSE_TIMED_DESPAWN);
+            for(uint32 i = 0; i < (RAID_MODE(2,5)); ++i)
+                DoSummon(VEHICLE_DEMOLISHER,PosDemolisher[i],3000,TEMPSUMMON_CORPSE_TIMED_DESPAWN);
+            return;
+        }
+    }
+};
+
+bool GossipHello_npc_lorekeeper(Player* pPlayer, Creature* pCreature)
+{
+    ScriptedInstance* pInstance = pCreature->GetInstanceData();
+    if (pInstance && pInstance->GetData(TYPE_LEVIATHAN) !=DONE && pPlayer)
+    {
+        pPlayer->PrepareGossipMenu(pCreature);
+
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,GOSSIP_ITEM_1,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+1);
+        pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID());
+    }
+    return true;
+}
+//enable hardmode
+bool GossipSelect_npc_lorekeeper(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction)
+{
+    ScriptedInstance* pInstance = pCreature->GetInstanceData();
+    switch(uiAction)
+    {
+    case GOSSIP_ACTION_INFO_DEF+1:
+        if (pPlayer)
+        {
+            pPlayer->PrepareGossipMenu(pCreature);
+            pInstance->instance->LoadGrid(364,-16); //make sure leviathan is loaded
+
+
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,GOSSIP_ITEM_2,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+2);
+            pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID());
+        }
+        break;
+    case GOSSIP_ACTION_INFO_DEF+2:
+        if (pPlayer)
+            pPlayer->CLOSE_GOSSIP_MENU();
+
+        if (Creature* pLeviathan = pInstance->instance->GetCreature(pInstance->GetData64(TYPE_LEVIATHAN)))
+        {
+            CAST_AI(boss_flame_leviathanAI, (pLeviathan->AI()))->DoAction(0); //enable hard mode activating the 4 additional events spawning additional vehicles
+            pCreature->SetVisibility(VISIBILITY_OFF);
+            pCreature->AI()->DoAction(0); // spawn the vehicles
+            pCreature->SetVisibility(VISIBILITY_OFF);
+            if (Creature* Delorah = pCreature->FindNearestCreature(NPC_DELORAH, 1000, true))
+            {
+                if (Creature* Branz = pCreature->FindNearestCreature(NPC_BRANZ_BRONZBEARD, 1000, true))
+                {
+                    Delorah->GetMotionMaster()->MovePoint(0, Branz->GetPositionX()-4, Branz->GetPositionY(), Branz->GetPositionZ());
+                    //TODO DoScriptText(xxxx, Delorah, Branz); when reached at branz
+                }
+            }
+        }
+        break;
+    }
+    return true;
+}
+////npc_brann_bronzebeard this requires more work involving area triggers. if reached this guy speaks through his radio..
+//#define GOSSIP_ITEM_1  "xxxxx"
+//#define GOSSIP_ITEM_2  "xxxxx"
+//
+//bool GossipHello_npc_brann_bronzebeard(Player* pPlayer, Creature* pCreature)
+//{
+//    ScriptedInstance* pInstance = pCreature->GetInstanceData();
+//    if (pInstance && pInstance->GetData(TYPE_LEVIATHAN) !=DONE)
+//    {
+//        pPlayer->PrepareGossipMenu(pCreature);
+//
+//        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,GOSSIP_ITEM_1,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+1);
+//        pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID());
+//    }
+//    return true;
+//}
+//
+//bool GossipSelect_npc_brann_bronzebeard(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction)
+//{
+//    switch(uiAction)
+//    {
+//        case GOSSIP_ACTION_INFO_DEF+1:
+//            if (pPlayer)
+//            {
+//                pPlayer->PrepareGossipMenu(pCreature);
+//
+//                pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,GOSSIP_ITEM_2,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+2);
+//                pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID());
+//            }
+//            break;
+//        case GOSSIP_ACTION_INFO_DEF+2:
+//            if (pPlayer)
+//                pPlayer->CLOSE_GOSSIP_MENU();
+//            if (Creature* Lorekeeper = pCreature->FindNearestCreature(NPC_LOREKEEPER, 1000, true)) //lore keeper of lorgannon
+//                Lorekeeper->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+//            break;
+//    }
+//    return true;
+//}
+
+void GODestroyed_go_ulduar_tower(Player* pPlayer, GameObject* pGO, uint32 value)
+{
+    ScriptedInstance* pInstance = pGO->GetInstanceData();
+    if (pGO->GetGOValue()->building.health == 0)
+    {
+        switch(pGO->GetEntry())
+        {
+        case GO_TOWER_OF_STORMS:
+            pInstance->ProcessEvent(pGO, EVENT_TOWER_OF_STORM_DESTROYED);
+            break;
+        case GO_TOWER_OF_FLAMES:
+            pInstance->ProcessEvent(pGO, EVENT_TOWER_OF_FLAMES_DESTROYED);
+            break;
+        case GO_TOWER_OF_FROST:
+            pInstance->ProcessEvent(pGO, EVENT_TOWER_OF_FROST_DESTROYED);
+            break;
+        case GO_TOWER_OF_LIFE:
+            pInstance->ProcessEvent(pGO, EVENT_TOWER_OF_LIFE_DESTROYED);
+            break;
+        }
+    }
+}
+
+bool AreaTrigger_at_RX_214_repair_o_matic_station(Player* pPlayer, const AreaTriggerEntry* pAt)
+{
+    if(Creature* vehicle = pPlayer->GetVehicleCreatureBase())
+    {
+        if(!vehicle->HasAura(SPELL_AUTO_REPAIR))
+        {
+            pPlayer->MonsterTextEmote(EMOTE_REPAIR, pPlayer->GetGUID(), true);
+            pPlayer->CastSpell(vehicle, SPELL_AUTO_REPAIR, true);
+        }
+    }
+    return true;
+}
+
 CreatureAI* GetAI_boss_flame_leviathan(Creature* pCreature)
 {
     return new boss_flame_leviathanAI (pCreature);
@@ -519,11 +1091,16 @@ CreatureAI* GetAI_boss_flame_leviathan_overload_device(Creature* pCreature)
     return new boss_flame_leviathan_overload_deviceAI (pCreature);
 }
 
-CreatureAI* GetAI_boss_flame_leviathan_safety_containerAI(Creature* pCreature)
+CreatureAI* GetAI_boss_flame_leviathan_safety_container(Creature* pCreature)
 {
     return new boss_flame_leviathan_safety_containerAI(pCreature);
 }
 
+CreatureAI* GetAI_npc_mechanolift(Creature* pCreature)
+{
+    return new npc_mechanoliftAI(pCreature);
+}
+
 CreatureAI* GetAI_spell_pool_of_tar(Creature* pCreature)
 {
     return new spell_pool_of_tarAI (pCreature);
@@ -534,6 +1111,35 @@ CreatureAI* GetAI_npc_colossus(Creature* pCreature)
     return new  npc_colossusAI(pCreature);
 }
 
+CreatureAI* GetAI_npc_thorims_hammer(Creature* pCreature)
+{
+    return new  npc_thorims_hammerAI(pCreature);
+}
+
+CreatureAI* GetAI_npc_mimirons_inferno(Creature* pCreature)
+{
+    return new  npc_mimirons_infernoAI(pCreature);
+}
+
+CreatureAI* GetAI_npc_hodirs_fury(Creature* pCreature)
+{
+    return new  npc_hodirs_furyAI(pCreature);
+}
+
+CreatureAI* GetAI_npc_freyas_ward(Creature* pCreature)
+{
+    return new  npc_freyas_wardAI(pCreature);
+}
+
+CreatureAI* GetAI_npc_freya_ward_summon(Creature* pCreature)
+{
+    return new npc_freya_ward_summonAI (pCreature);
+}
+CreatureAI* GetAI_npc_lorekeeper(Creature* pCreature)
+{
+    return new npc_lorekeeperAI (pCreature);
+}
+
 void AddSC_boss_flame_leviathan()
 {
     Script *newscript;
@@ -559,7 +1165,12 @@ void AddSC_boss_flame_leviathan()
 
     newscript = new Script;
     newscript->Name = "boss_flame_leviathan_safety_container";
-    newscript->GetAI = &GetAI_boss_flame_leviathan_safety_containerAI;
+    newscript->GetAI = &GetAI_boss_flame_leviathan_safety_container;
+    newscript->RegisterSelf();
+
+    newscript = new Script;
+    newscript->Name = "npc_mechanolift";
+    newscript->GetAI = &GetAI_npc_mechanolift;
     newscript->RegisterSelf();
 
     newscript = new Script;
@@ -571,4 +1182,52 @@ void AddSC_boss_flame_leviathan()
     newscript->Name = "npc_colossus";
     newscript->GetAI = &GetAI_npc_colossus;
     newscript->RegisterSelf();
+
+    newscript = new Script;
+    newscript->Name = "npc_thorims_hammer";
+    newscript->GetAI = &GetAI_npc_thorims_hammer;
+    newscript->RegisterSelf();
+
+    newscript = new Script;
+    newscript->Name = "npc_mimirons_inferno";
+    newscript->GetAI = &GetAI_npc_mimirons_inferno;
+    newscript->RegisterSelf();
+
+    newscript = new Script;
+    newscript->Name = "npc_hodirs_fury";
+    newscript->GetAI = &GetAI_npc_hodirs_fury;
+    newscript->RegisterSelf();
+
+    newscript = new Script;
+    newscript->Name = "npc_freyas_ward";
+    newscript->GetAI = &GetAI_npc_freyas_ward;
+    newscript->RegisterSelf();
+
+    newscript = new Script;
+    newscript->Name = "npc_freya_ward_summon";
+    newscript->GetAI = &GetAI_npc_freya_ward_summon;
+    newscript->RegisterSelf();
+
+    newscript = new Script;
+    newscript->Name = "npc_lorekeeper";
+    newscript->GetAI = &GetAI_npc_lorekeeper;
+    newscript->pGossipHello = &GossipHello_npc_lorekeeper;
+    newscript->pGossipSelect = &GossipSelect_npc_lorekeeper;
+    newscript->RegisterSelf();
+
+    /*newscript = new Script;
+    newscript->Name = "npc_brann_bronzebeard";
+    newscript->pGossipHello = &GossipHello_npc_brann_bronzebeard;
+    newscript->pGossipSelect = &GossipSelect_npc_brann_bronzebeard;
+    newscript->RegisterSelf();*/
+
+    newscript = new Script;
+    newscript->Name = "go_ulduar_tower";
+    newscript->pGODestroyed = &GODestroyed_go_ulduar_tower;
+    newscript->RegisterSelf();
+
+    newscript = new Script;
+    newscript->Name = "at_RX_214_repair_o_matic_station";
+    newscript->pAreaTrigger = &AreaTrigger_at_RX_214_repair_o_matic_station;
+    newscript->RegisterSelf();
 }
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp
index 5f9566d0840..ad6beb5ba51 100644
--- a/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp
@@ -16,6 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
+#include "ScriptedEscortAI.h"
 #include "ScriptPCH.h"
 #include "ulduar.h"
 
@@ -64,8 +65,7 @@ struct instance_ulduar : public ScriptedInstance
     uint64 uiFreyaChestGUID;
 
     void Initialize()
-    {
-        uiLeviathanGUID       = 0;
+    {   
         uiIgnisGUID           = 0;
         uiRazorscaleGUID      = 0;
         uiXT002GUID           = 0;
@@ -106,7 +106,7 @@ struct instance_ulduar : public ScriptedInstance
         switch(pCreature->GetEntry())
         {
             case NPC_LEVIATHAN:
-                uiLeviathanGUID = pCreature->GetGUID();
+                uiLeviathanGUID = pCreature->GetGUID();             
                 break;
             case NPC_IGNIS:
                 uiIgnisGUID = pCreature->GetGUID();
@@ -187,22 +187,24 @@ struct instance_ulduar : public ScriptedInstance
                 if (flag == 7)
                     flag =0;
                 break;
-            case GO_LEVIATHAN_GATE:
-                uiLeviathanGateGUID = pGO->GetGUID();
-                HandleGameObject(NULL, false, pGO);
-                break;
+            case GO_LEVIATHAN_GATE:                
+                uiLeviathanGateGUID = add ? pGO->GetGUID() : NULL;
+                HandleGameObject(NULL, false, pGO); 
+                break;             
         }
     }
 
     void ProcessEvent(GameObject* pGO, uint32 uiEventId)
     {
         // Flame Leviathan's Tower Event triggers
-        Creature* pFlameLeviathan = instance->GetCreature(NPC_LEVIATHAN);
+       Creature* pFlameLeviathan = instance->GetCreature(uiLeviathanGUID);
+
         if (pFlameLeviathan && pFlameLeviathan->isAlive()) //No leviathan, no event triggering ;)
             switch(uiEventId)
             {
                 case EVENT_TOWER_OF_STORM_DESTROYED:
-                    pFlameLeviathan->AI()->DoAction(1);
+                    //pGO->GetInstanceData()->SetData(DATA_TOWER_STORMS,DESTROYED);
+                    pFlameLeviathan->AI()->DoAction(1);                    
                     break;
                 case EVENT_TOWER_OF_FROST_DESTROYED:
                     pFlameLeviathan->AI()->DoAction(2);
@@ -210,7 +212,7 @@ struct instance_ulduar : public ScriptedInstance
                 case EVENT_TOWER_OF_FLAMES_DESTROYED:
                     pFlameLeviathan->AI()->DoAction(3);
                     break;
-                case EVENT_TOWER_OF_NATURE_DESTROYED:
+                case EVENT_TOWER_OF_LIFE_DESTROYED:
                     pFlameLeviathan->AI()->DoAction(4);
                     break;
             }
@@ -218,9 +220,6 @@ struct instance_ulduar : public ScriptedInstance
 
     void SetData(uint32 type, uint32 data)
     {
-        if (type != TYPE_COLOSSUS)
-            uiEncounter[type] = data;
-
         switch(type)
         {
             /*case TYPE_IGNIS:
@@ -235,12 +234,12 @@ struct instance_ulduar : public ScriptedInstance
             case TYPE_LEVIATHAN:
                 if (data == IN_PROGRESS)
                 {
-                    for (uint8 uiI = 0; uiI < 7; uiI++)
+                    for (uint8 uiI = 0; uiI < 7; ++uiI)
                         HandleGameObject(uiLeviathanDoor[uiI],false);
                 }
                 else
                 {
-                    for (uint8 uiI = 0; uiI < 7; uiI++)
+                    for (uint8 uiI = 0; uiI < 7; ++uiI)
                         HandleGameObject(uiLeviathanDoor[uiI],true);
                 }
                 break;
@@ -265,14 +264,15 @@ struct instance_ulduar : public ScriptedInstance
                         pGO->SetRespawnTime(pGO->GetRespawnDelay());
                 break;
             case TYPE_COLOSSUS:
+                uiEncounter[TYPE_COLOSSUS] = data;
                 if (data == 2)
                 {
                     if (Creature* pBoss = instance->GetCreature(uiLeviathanGUID))
                         pBoss->AI()->DoAction(10);
                     if (GameObject* pGate = instance->GetGameObject(uiLeviathanGateGUID))
-                        pGate->SetGoState(GO_STATE_ACTIVE_ALTERNATIVE);
+                        pGate->SetGoState(GO_STATE_ACTIVE_ALTERNATIVE);                                                               
                 }
-                break;
+                break;            
             default:
                 break;
         }
-- 
cgit v1.2.3


From 37529a1e9fcf36993689622de291192f4374c620 Mon Sep 17 00:00:00 2001
From: Supabad 
Date: Mon, 28 Jun 2010 14:24:35 +0200
Subject: add forgotten header for leviathan

--HG--
branch : trunk
---
 src/server/scripts/Northrend/Ulduar/ulduar/ulduar.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/ulduar.h b/src/server/scripts/Northrend/Ulduar/ulduar/ulduar.h
index cb11bcb579c..445aa804d43 100644
--- a/src/server/scripts/Northrend/Ulduar/ulduar/ulduar.h
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/ulduar.h
@@ -43,7 +43,7 @@ enum eTypes
     DATA_MOLGEIM                = 21,
     DATA_BRUNDIR                = 22,
     DATA_RUNEMASTER_MOLGEIM     = 23,
-    DATA_STORMCALLER_BRUNDIR    = 24,
+    DATA_STORMCALLER_BRUNDIR    = 24,    
 
     NPC_LEVIATHAN               = 33113,
     NPC_IGNIS                   = 33118,
@@ -65,7 +65,7 @@ enum eTypes
     EVENT_TOWER_OF_STORM_DESTROYED     = 21031,
     EVENT_TOWER_OF_FROST_DESTROYED     = 21032,
     EVENT_TOWER_OF_FLAMES_DESTROYED    = 21033,
-    EVENT_TOWER_OF_NATURE_DESTROYED    = 21030
+    EVENT_TOWER_OF_LIFE_DESTROYED      = 21030
 };
 
 #endif
-- 
cgit v1.2.3


From 988467467cd743c03148b859936da8ce076b5aa5 Mon Sep 17 00:00:00 2001
From: click 
Date: Mon, 28 Jun 2010 14:40:57 +0200
Subject: Properly initialize variable in WorldObject::PlayDirectSound() Fixes
 issue 2838

--HG--
branch : trunk
---
 src/server/game/Maps/Map.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp
index 960e1e4cef4..0387fbe8116 100644
--- a/src/server/game/Maps/Map.cpp
+++ b/src/server/game/Maps/Map.cpp
@@ -3428,7 +3428,7 @@ void Map::ScriptsProcess()
 
                 // when script called for item spell casting then target == (unit or GO) and source is player
                 WorldObject* worldObject;
-                Player* pTarget;
+                Player* pTarget = NULL;
 
                 pTarget = target->ToPlayer();
                 if (pTarget)
-- 
cgit v1.2.3


From d2f6ae6f778138643a8f0af621ad9a7e9015ecd3 Mon Sep 17 00:00:00 2001
From: Brian 
Date: Mon, 28 Jun 2010 06:42:01 -0600
Subject: * Fix creatures spawning with less than max health if curhealth field
 in * creature is != maxhealth in creature_template and the creature is
 supposed * to regenerate health. * Patch courtesy of Visagalis * Thanks for
 taking the time to fix this LONG outstanding bug

--HG--
branch : trunk
---
 src/server/game/Entities/Creature/Creature.cpp | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp
index f51b7a585bd..f1f5e7729a1 100644
--- a/src/server/game/Entities/Creature/Creature.cpp
+++ b/src/server/game/Entities/Creature/Creature.cpp
@@ -1262,16 +1262,26 @@ bool Creature::LoadFromDB(uint32 guid, Map *map)
         }
     }
 
-    uint32 curhealth = data->curhealth;
-    if (curhealth)
+    uint32 curhealth;
+    
+    if (!m_regenHealth)
     {
-        curhealth = uint32(curhealth*_GetHealthMod(GetCreatureInfo()->rank));
-        if (curhealth < 1)
-            curhealth = 1;
+        curhealth = data->curhealth;
+        if (curhealth)
+        {
+            curhealth = uint32(curhealth*_GetHealthMod(GetCreatureInfo()->rank));
+            if (curhealth < 1)
+                curhealth = 1;
+        }
+        SetPower(POWER_MANA,data->curmana);
+    }
+    else
+    {
+        curhealth = GetMaxHealth();
+        SetPower(POWER_MANA,GetMaxPower(POWER_MANA));
     }
 
     SetHealth(m_deathState == ALIVE ? curhealth : 0);
-    SetPower(POWER_MANA,data->curmana);
 
     // checked at creature_template loading
     m_defaultMovementType = MovementGeneratorType(data->movementType);
-- 
cgit v1.2.3


From b6e180c17c0626a665cd189075e9d9b7f4b48d0d Mon Sep 17 00:00:00 2001
From: Machiavelli 
Date: Mon, 28 Jun 2010 16:09:06 +0200
Subject: Add PreparedStatementHolder class that will be used for registering
 and calling prepared statements on the MySQL server. Information about
 prepared statements can be found here:
 http://dev.mysql.com/tech-resources/articles/4.1/prepared-statements.html In
 short: better performance shall ensue.

--HG--
branch : trunk
---
 src/server/shared/CMakeLists.txt                  |  1 +
 src/server/shared/Database/PreparedStatements.cpp | 93 +++++++++++++++++++++++
 src/server/shared/Database/PreparedStatements.h   | 30 ++++++++
 win/VC90/shared.vcproj                            |  8 ++
 4 files changed, 132 insertions(+)
 create mode 100644 src/server/shared/Database/PreparedStatements.cpp
 create mode 100644 src/server/shared/Database/PreparedStatements.h

(limited to 'src')

diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt
index 0fd58e63588..b3ededd8c62 100644
--- a/src/server/shared/CMakeLists.txt
+++ b/src/server/shared/CMakeLists.txt
@@ -94,6 +94,7 @@ set(trinitydatabase_STAT_SRCS
   Database/SQLStorage.cpp
   Database/SqlDelayThread.cpp
   Database/SqlOperations.cpp
+  Database/PreparedStatements.cpp
 )
 
 include_directories(
diff --git a/src/server/shared/Database/PreparedStatements.cpp b/src/server/shared/Database/PreparedStatements.cpp
new file mode 100644
index 00000000000..40a910acf9e
--- /dev/null
+++ b/src/server/shared/Database/PreparedStatements.cpp
@@ -0,0 +1,93 @@
+#include "PreparedStatements.h"
+
+void PreparedStatementHolder::_prepareStatement(const char* name, const char* sql, Database *db, uint32 &count)
+{
+    const char prefix[] = "PREPARE ";
+    size_t querySize = 8 + strlen(name) + 6 + strlen(sql) + 2 + 1;
+    char* query = new char[querySize];
+    strcpy(query, prefix);
+    strcat(query, name);
+    strcat(query, " FROM ");
+    strcat(query, "'");
+    strcat(query, sql);
+    strcat(query, "'");
+    
+    DEBUG_LOG("Preparing statement: %s", query);
+    db->Execute(query);
+    
+    delete[] query;
+    ++count;    
+}
+
+void PreparedStatementHolder::LoadAuthserver(Database *db, uint32 &count)
+{
+    _prepareStatement("auth_ping", "SELECT 1 FROM realmlist LIMIT 1", db, count);
+};
+
+void PreparedStatementHolder::Execute(Database *db, const char *name)
+{
+    const char prefix[] = "EXECUTE ";
+    size_t querySize = 8 + strlen(name) + 1;
+    char* query = new char[querySize];
+    strcpy(query, prefix);
+    strcat(query, name);
+
+    DEBUG_LOG("Prepared statement: %s", query);
+    db->Execute(query);
+    delete[] query;
+}
+
+void PreparedStatementHolder::PExecute(Database *db, const char *name, const char* args)
+{
+    // NOTE: if args == NULL, we're crashing here. No need to waste performance on checking;
+    // devs must make sure they use PExecute for args and Execute for no args.
+    
+    const char prefix[] = "EXECUTE ";
+    size_t querySize = 8 + strlen(name) + 7 + strlen(args) + 1;
+    char* query = new char[querySize];
+    strcpy(query, prefix);
+    strcat(query, name);
+    strcat(query, " USING ");
+    strcat(query, args);
+    
+    DEBUG_LOG("Prepared statement (parsed args): %s", query);
+    db->Execute(query);
+    delete[] query;
+}
+
+QueryResult_AutoPtr PreparedStatementHolder::Query(Database *db, const char *name)
+{
+    QueryResult_AutoPtr _return = QueryResult_AutoPtr(NULL);
+
+    const char prefix[] = "EXECUTE ";
+    size_t querySize = 8 + strlen(name) + 1;
+    char* query = new char[querySize];
+    strcpy(query, prefix);
+    strcat(query, name);
+
+    DEBUG_LOG("Prepared statement with resultset: %s", query);
+    _return = db->Query(query);
+    delete[] query;
+    return _return;
+}
+
+QueryResult_AutoPtr PreparedStatementHolder::PQuery(Database *db, const char *name, const char *args)
+{
+    // NOTE: if args == NULL, we're crashing here. No need to waste performance on checking;
+    // devs must make sure they use PQuery for args and Query for no args.
+
+    QueryResult_AutoPtr _return = QueryResult_AutoPtr(NULL);
+
+    const char prefix[] = "EXECUTE ";
+    size_t querySize = 8 + strlen(name) + 7 + strlen(args) + 1;
+    char* query = new char[querySize];
+    strcpy(query, prefix);
+    strcat(query, name);
+    strcat(query, " USING ");
+    strcat(query, args);
+
+    DEBUG_LOG("Prepared statement with resultset (parsed args): %s", query);
+    _return = db->Query(query);
+    delete[] query;
+    return _return;
+}
\ No newline at end of file
diff --git a/src/server/shared/Database/PreparedStatements.h b/src/server/shared/Database/PreparedStatements.h
new file mode 100644
index 00000000000..c19119dcb3d
--- /dev/null
+++ b/src/server/shared/Database/PreparedStatements.h
@@ -0,0 +1,30 @@
+#ifndef sPreparedStatement
+
+#include "ace/Singleton.h"
+#include "Database/DatabaseEnv.h"
+
+class PreparedStatementHolder
+{
+    public:
+        ///- Load prepare statements on database $db and increase $count for every statement
+        void LoadCharacters(Database *db, uint32 &count);
+        void LoadAuthserver(Database *db, uint32 &count);
+        void LoadWorldserver(Database *db, uint32 &count);
+        
+        ///- Executes prepared statement that doesn't require feedback with name $name on database $db
+        void Execute(Database *db, const char* name);
+        ///- Executes prepared statement that doesn't require feedback with name $name and args $args 
+        ///- on database $db
+        void PExecute(Database *db, const char* name, const char* args);
+        
+        ///- Executes a prepared statement without args on db $db with name $name and puts the result set in a pointer.
+        QueryResult_AutoPtr Query(Database* db, const char* name);
+        ///- Executes a prepared statement with args $args on db $db with name $name and put the result set in a pointer.
+        QueryResult_AutoPtr PQuery(Database* db, const char* name, const char* args);
+        
+    private:
+        void _prepareStatement(const char* name, const char* sql, Database *db, uint32 &count);
+
+};
+#define sPreparedStatement (*ACE_Singleton::instance())
+#endif
\ No newline at end of file
diff --git a/win/VC90/shared.vcproj b/win/VC90/shared.vcproj
index 536939f9d5a..f3908ec4596 100644
--- a/win/VC90/shared.vcproj
+++ b/win/VC90/shared.vcproj
@@ -472,6 +472,14 @@
 				RelativePath="..\..\src\server\shared\Database\Field.h"
 				>
 			
+			
+			
+			
+			
 			
-- 
cgit v1.2.3


From fb4d4514e53a6dcd2704c957a8904be8bf02034b Mon Sep 17 00:00:00 2001
From: Machiavelli 
Date: Mon, 28 Jun 2010 16:09:16 +0200
Subject: Add prepared statement example for auth server ping

--HG--
branch : trunk
---
 src/server/authserver/Main.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/authserver/Main.cpp b/src/server/authserver/Main.cpp
index 46ea2b38212..28757e914e3 100644
--- a/src/server/authserver/Main.cpp
+++ b/src/server/authserver/Main.cpp
@@ -24,6 +24,7 @@
 
 #include "Common.h"
 #include "Database/DatabaseEnv.h"
+#include "Database/PreparedStatements.h"
 
 #include "Configuration/ConfigEnv.h"
 #include "Log.h"
@@ -313,7 +314,7 @@ extern int main(int argc, char **argv)
         {
             loopCounter = 0;
             sLog.outDetail("Ping MySQL to keep connection alive");
-            LoginDatabase.Query("SELECT 1 FROM realmlist LIMIT 1");
+            sPreparedStatement.Query(&LoginDatabase, "auth_ping");
         }
 #ifdef _WIN32
         if (m_ServiceStatus == 0) stopEvent = true;
@@ -345,6 +346,10 @@ bool StartDB()
         return false;
     }
     LoginDatabase.ThreadStart();
+    
+    uint32 count = 0;
+    sPreparedStatement.LoadAuthserver(&LoginDatabase, count);
+    sLog.outString("Loaded %u prepared MySQL statements for auth DB.", count);
 
     return true;
 }
-- 
cgit v1.2.3


From 72de3dd6c42c9476b4d7f7d3f187ad1cf20b0414 Mon Sep 17 00:00:00 2001
From: click 
Date: Mon, 28 Jun 2010 17:12:36 +0200
Subject: Remove hardcoded stacking for ammunition-types (should now stack
 properly)

--HG--
branch : trunk
---
 src/server/game/Entities/Item/ItemPrototype.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Item/ItemPrototype.h b/src/server/game/Entities/Item/ItemPrototype.h
index 797ccd6faaf..0368b7c4dd1 100644
--- a/src/server/game/Entities/Item/ItemPrototype.h
+++ b/src/server/game/Entities/Item/ItemPrototype.h
@@ -623,7 +623,7 @@ struct ItemPrototype
 
     uint32 GetMaxStackSize() const
     {
-        return (Stackable == 2147483647 || Stackable <= 0 || Stackable == 1000) ? uint32(0x7FFFFFFF-1) : uint32(Stackable);
+        return (Stackable == 2147483647 || Stackable <= 0) ? uint32(0x7FFFFFFF-1) : uint32(Stackable);
     }
 
     float getDPS() const
-- 
cgit v1.2.3


From b9a2bd24f71aa80ca78faa175213528035b1b462 Mon Sep 17 00:00:00 2001
From: Supabad 
Date: Mon, 28 Jun 2010 18:45:54 +0200
Subject: minor change to destructable buildings.

--HG--
branch : trunk
---
 src/server/game/Entities/GameObject/GameObject.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp
index 1a5d9e09453..c2458a181a5 100644
--- a/src/server/game/Entities/GameObject/GameObject.cpp
+++ b/src/server/game/Entities/GameObject/GameObject.cpp
@@ -1626,7 +1626,7 @@ void GameObject::TakenDamage(uint32 damage, Unit *who)
         if (m_goValue->building.health <= m_goInfo->building.damagedNumHits)
         {
             if (!m_goInfo->building.destroyedDisplayId)
-                m_goValue->building.health = 0;
+                m_goValue->building.health = m_goInfo->building.damagedNumHits;
             else if (!m_goValue->building.health)
                 m_goValue->building.health = 1;
 
-- 
cgit v1.2.3


From 6531cbcb21cb1d9b43a4bb4927836f377a19d403 Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Mon, 28 Jun 2010 19:42:59 +0200
Subject: Violet Hold: Link Defenseless achiev code to crystal activation code

--HG--
branch : trunk
---
 src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
index b6d2fa06e2d..768544e768e 100644
--- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
+++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
@@ -369,6 +369,7 @@ struct instance_violet_hold : public ScriptedInstance
             case DATA_ACTIVATE_CRYSTAL:
                 // Kill all mobs registered with SetData64(ADD_TRASH_MOB)
                 // TODO: All visual, spells etc
+                bCrystalActivated = true;
                 for (std::set::const_iterator itr = trashMobs.begin(); itr != trashMobs.end(); ++itr)
                 {
                     Creature* pCreature = instance->GetCreature(*itr);
-- 
cgit v1.2.3


From bb6d8a7e674529006c97c7c902990fe04ef4c417 Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Mon, 28 Jun 2010 20:31:20 +0200
Subject: MapManager uses proper Map::CanEnter() function instead of rewriting
 the same checks (we could move more code to there)

--HG--
branch : trunk
---
 src/server/game/Maps/MapManager.cpp | 31 +++++--------------------------
 1 file changed, 5 insertions(+), 26 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Maps/MapManager.cpp b/src/server/game/Maps/MapManager.cpp
index 8bb3039800c..05ea37d2d80 100644
--- a/src/server/game/Maps/MapManager.cpp
+++ b/src/server/game/Maps/MapManager.cpp
@@ -233,9 +233,11 @@ bool MapManager::CanPlayerEnter(uint32 mapid, Player* player, bool loginCheck)
     {
         InstanceGroupBind* boundedInstance = pGroup->GetBoundInstance(entry);
         if (boundedInstance && boundedInstance->save)
-        {
             if (Map *boundedMap = sMapMgr.FindMap(mapid,boundedInstance->save->GetInstanceId()))
-            {
+                if (!boundedMap->CanEnter(player))
+                    return false;
+            /*
+                This check has to be moved to InstanceMap::CanEnter()
                 // Player permanently bounded to different instance than groups one
                 InstancePlayerBind* playerBoundedInstance = player->GetBoundInstance(mapid, player->GetDifficulty(entry->IsRaid()));
                 if (playerBoundedInstance && playerBoundedInstance->perm && playerBoundedInstance->save &&
@@ -243,30 +245,7 @@ bool MapManager::CanPlayerEnter(uint32 mapid, Player* player, bool loginCheck)
                 {
                     //TODO: send some kind of error message to the player
                     return false;
-                }
-
-                // Encounters in progress
-                if (!loginCheck && entry->IsRaid() && ((InstanceMap*)boundedMap)->GetInstanceData() && ((InstanceMap*)boundedMap)->GetInstanceData()->IsEncounterInProgress())
-                {
-                    sLog.outDebug("MAP: Player '%s' cannot enter instance '%s' while an encounter is in progress.", player->GetName(), mapName);
-                    player->SendTransferAborted(mapid, TRANSFER_ABORT_ZONE_IN_COMBAT);
-                    return false;
-                }
-
-                // Instance is full
-                MapDifficulty const* mapDiff = ((InstanceMap*)boundedMap)->GetMapDifficulty();
-                int8 maxPlayers = mapDiff ? mapDiff->maxPlayers : 0;
-                if (maxPlayers != -1) //-1: unlimited access
-                {
-                    if (boundedMap->GetPlayersCountExceptGMs() >= (loginCheck ? maxPlayers+1 : maxPlayers))
-                    {
-                        sLog.outDebug("MAP: Player '%s' cannot enter instance '%s' because it is full.", player->GetName(), mapName);
-                        player->SendTransferAborted(mapid, TRANSFER_ABORT_MAX_PLAYERS);
-                        return false;
-                    }
-                }
-            }
-        }
+                }*/
     }
 
     //Other requirements
-- 
cgit v1.2.3


From bde8e96cc5154717204858f3f26c79abb2f3ab13 Mon Sep 17 00:00:00 2001
From: Xanadu 
Date: Mon, 28 Jun 2010 20:34:11 +0200
Subject: Aspect of the Viper now correctly displayed as a buff. Closes issue
 #107.

--HG--
branch : trunk
---
 src/server/game/Spells/SpellMgr.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src')

diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp
index 2f2e313fb31..f23b112cbc8 100644
--- a/src/server/game/Spells/SpellMgr.cpp
+++ b/src/server/game/Spells/SpellMgr.cpp
@@ -783,6 +783,11 @@ bool SpellMgr::_isPositiveEffect(uint32 spellId, uint32 effIndex, bool deep) con
                     break;
             }
             break;
+        case SPELLFAMILY_HUNTER:
+            // Aspect of the Viper
+            if (spellId == 34074)
+                return true;
+            break;
         default:
             break;
     }
-- 
cgit v1.2.3


From de71d39abf71937bd7bbc8b74416c4d5e00c28bd Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Mon, 28 Jun 2010 20:56:29 +0200
Subject: Apply inmunities to vehicle's on its creation, by Josh

--HG--
branch : trunk
---
 src/server/game/Entities/Vehicle/Vehicle.cpp | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'src')

diff --git a/src/server/game/Entities/Vehicle/Vehicle.cpp b/src/server/game/Entities/Vehicle/Vehicle.cpp
index a154c579605..fe036cd8485 100644
--- a/src/server/game/Entities/Vehicle/Vehicle.cpp
+++ b/src/server/game/Entities/Vehicle/Vehicle.cpp
@@ -39,6 +39,25 @@ Vehicle::Vehicle(Unit *unit, VehicleEntry const *vehInfo) : me(unit), m_vehicleI
                     ++m_usableSeatNum;
             }
     }
+    //Set inmunities since db ones are rewritten with player's ones
+    switch (GetVehicleInfo()->m_ID)
+    {
+        case 160:
+            me->SetControlled(true, UNIT_STAT_ROOT);
+        case 158:
+            me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_KNOCK_BACK, true);
+            me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_HEAL, true);
+            me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_FEAR, true);
+            me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_PERIODIC_HEAL, true);
+            me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_STUN, true);
+            me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_ROOT, true);
+            me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_DECREASE_SPEED, true);
+            me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_CONFUSE, true);
+            me->ApplySpellImmune(0, IMMUNITY_ID, 49560, true); // Death Grip jump effect
+            break;
+        default:
+            break;
+    }
     assert(!m_Seats.empty());
 }
 
-- 
cgit v1.2.3


From 948f333dc3655e0b16985754c5aeea35554347f9 Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Mon, 28 Jun 2010 22:23:57 +0200
Subject: Little fix for Vehicle inmunities hack. Closes issue #2590 We must
 found a less hacky way to handle this

--HG--
branch : trunk
---
 src/server/game/Entities/Vehicle/Vehicle.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Vehicle/Vehicle.cpp b/src/server/game/Entities/Vehicle/Vehicle.cpp
index fe036cd8485..850296aaafe 100644
--- a/src/server/game/Entities/Vehicle/Vehicle.cpp
+++ b/src/server/game/Entities/Vehicle/Vehicle.cpp
@@ -39,13 +39,15 @@ Vehicle::Vehicle(Unit *unit, VehicleEntry const *vehInfo) : me(unit), m_vehicleI
                     ++m_usableSeatNum;
             }
     }
-    //Set inmunities since db ones are rewritten with player's ones
+    
+    // HACKY WAY, We must found a more generic way to handle this
+    // Set inmunities since db ones are rewritten with player's ones
     switch (GetVehicleInfo()->m_ID)
     {
         case 160:
             me->SetControlled(true, UNIT_STAT_ROOT);
-        case 158:
             me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_KNOCK_BACK, true);
+        case 158:
             me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_HEAL, true);
             me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_FEAR, true);
             me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_PERIODIC_HEAL, true);
-- 
cgit v1.2.3


From 9bedc08b71427718b2dc3d6184b25b4caf996d2b Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Mon, 28 Jun 2010 22:39:54 +0200
Subject: Violet Hold: Fix crystal activation mechanic

--HG--
branch : trunk
---
 .../Northrend/VioletHold/instance_violet_hold.cpp  | 29 +++++++++++++++-------
 1 file changed, 20 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
index 768544e768e..aa06cd4e2a8 100644
--- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
+++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
@@ -56,6 +56,11 @@ enum AzureSaboteurSpells
     SABOTEUR_SHIELD_EFFECT                          = 45775
 };
 
+enum CrystalSpells
+{
+    SPELL_ARCANE_LIGHTNING                          = 57912
+};
+
 const Position PortalLocation[] =
 {
     {1877.51, 850.104, 44.6599, 4.7822 },     // WP 1
@@ -367,15 +372,8 @@ struct instance_violet_hold : public ScriptedInstance
                 }
                 break;
             case DATA_ACTIVATE_CRYSTAL:
-                // Kill all mobs registered with SetData64(ADD_TRASH_MOB)
-                // TODO: All visual, spells etc
-                bCrystalActivated = true;
-                for (std::set::const_iterator itr = trashMobs.begin(); itr != trashMobs.end(); ++itr)
-                {
-                    Creature* pCreature = instance->GetCreature(*itr);
-                    if (pCreature && pCreature->isAlive())
-                        pCreature->Kill(pCreature);
-                }
+                ActivateCrystal();
+                break;
         }
     }
 
@@ -754,6 +752,19 @@ struct instance_violet_hold : public ScriptedInstance
                 SetData(DATA_MAIN_DOOR,GO_STATE_ACTIVE);
         }
     }
+
+    void ActivateCrystal()
+    {
+        // Kill all mobs registered with SetData64(ADD_TRASH_MOB)
+        // TODO: All visual, spells etc
+        bCrystalActivated = true;
+        for (std::set::const_iterator itr = trashMobs.begin(); itr != trashMobs.end(); ++itr)
+        {
+            Creature* pCreature = instance->GetCreature(*itr);
+            if (pCreature && pCreature->isAlive())
+                pCreature->CastSpell(pCreature,SPELL_ARCANE_LIGHTNING,true);  // Who should cast the spell?
+        }
+    }
 };
 
 InstanceData* GetInstanceData_instance_violet_hold(Map* pMap)
-- 
cgit v1.2.3


From 95aadc40371a4047bbf9c0ce419562a6aae6e013 Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Mon, 28 Jun 2010 22:45:23 +0200
Subject: Violet Hold: More work on crystal activation thing. Process the event
 that's throw by the activation spell

--HG--
branch : trunk
---
 .../Northrend/VioletHold/instance_violet_hold.cpp       | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
index aa06cd4e2a8..b5963ed5f61 100644
--- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
+++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
@@ -61,6 +61,11 @@ enum CrystalSpells
     SPELL_ARCANE_LIGHTNING                          = 57912
 };
 
+enum Events
+{
+    EVENT_ACTIVATE_CRYSTAL                          = 20001
+};
+
 const Position PortalLocation[] =
 {
     {1877.51, 850.104, 44.6599, 4.7822 },     // WP 1
@@ -757,7 +762,6 @@ struct instance_violet_hold : public ScriptedInstance
     {
         // Kill all mobs registered with SetData64(ADD_TRASH_MOB)
         // TODO: All visual, spells etc
-        bCrystalActivated = true;
         for (std::set::const_iterator itr = trashMobs.begin(); itr != trashMobs.end(); ++itr)
         {
             Creature* pCreature = instance->GetCreature(*itr);
@@ -765,6 +769,17 @@ struct instance_violet_hold : public ScriptedInstance
                 pCreature->CastSpell(pCreature,SPELL_ARCANE_LIGHTNING,true);  // Who should cast the spell?
         }
     }
+
+    void ProcessEvent(GameObject* pGO, uint32 uiEventId)
+    {
+        switch(uiEventId)
+        {
+            case EVENT_ACTIVATE_CRYSTAL:
+                bCrystalActivated = true; // Activation by player's will throw event signal
+                ActivateCrystal();
+                break;
+        }
+}
 };
 
 InstanceData* GetInstanceData_instance_violet_hold(Map* pMap)
-- 
cgit v1.2.3


From 87cc652a82161058ee94a5c6b4fe7a07408ae6c3 Mon Sep 17 00:00:00 2001
From: Machiavelli 
Date: Mon, 28 Jun 2010 23:19:54 +0200
Subject: Replace some misplaced DirectExecute´s with delayed Execute calls.
 DirectExecute at this moment should only be used for transaction control and
 not for dynamic content.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--HG--
branch : trunk
---
 src/server/game/Globals/ObjectMgr.cpp         |  4 ++--
 src/server/game/Instances/InstanceSaveMgr.cpp | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index 3d6345939f9..866910422c3 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -1173,14 +1173,14 @@ bool ObjectMgr::SetCreatureLinkedRespawn(uint32 guid, uint32 linkedGuid)
     if (!linkedGuid) // we're removing the linking
     {
         mCreatureLinkedRespawnMap.erase(guid);
-        WorldDatabase.DirectPExecute("DELETE FROM creature_linked_respawn WHERE guid = '%u'",guid);
+        WorldDatabase.PExecute("DELETE FROM creature_linked_respawn WHERE guid = '%u'",guid);
         return true;
     }
 
     if (CheckCreatureLinkedRespawn(guid,linkedGuid)) // we add/change linking
     {
         mCreatureLinkedRespawnMap[guid] = linkedGuid;
-        WorldDatabase.DirectPExecute("REPLACE INTO creature_linked_respawn (guid,linkedGuid) VALUES ('%u','%u')",guid,linkedGuid);
+        WorldDatabase.PExecute("REPLACE INTO creature_linked_respawn (guid,linkedGuid) VALUES ('%u','%u')",guid,linkedGuid);
         return true;
     }
     return false;
diff --git a/src/server/game/Instances/InstanceSaveMgr.cpp b/src/server/game/Instances/InstanceSaveMgr.cpp
index 7b5ccf1c46a..dd9001402a0 100644
--- a/src/server/game/Instances/InstanceSaveMgr.cpp
+++ b/src/server/game/Instances/InstanceSaveMgr.cpp
@@ -243,7 +243,7 @@ void InstanceSaveManager::_DelHelper(DatabaseType &db, const char *fields, const
                 db.escape_string(fieldValue);
                 ss << (i != 0 ? " AND " : "") << fieldTokens[i] << " = '" << fieldValue << "'";
             }
-            db.DirectPExecute("DELETE FROM %s WHERE %s", table, ss.str().c_str());
+            db.PExecute("DELETE FROM %s WHERE %s", table, ss.str().c_str());
         } while (result->NextRow());
     }
 }
@@ -289,7 +289,7 @@ void InstanceSaveManager::CleanupInstances()
         {
             Field *fields = result->Fetch();
             if (InstanceSet.find(fields[0].GetUInt32()) == InstanceSet.end())
-                WorldDatabase.DirectPExecute("DELETE FROM creature_respawn WHERE instance = '%u'", fields[0].GetUInt32());
+                WorldDatabase.PExecute("DELETE FROM creature_respawn WHERE instance = '%u'", fields[0].GetUInt32());
         }
         while (result->NextRow());
     }
@@ -302,7 +302,7 @@ void InstanceSaveManager::CleanupInstances()
         {
             Field *fields = result->Fetch();
             if (InstanceSet.find(fields[0].GetUInt32()) == InstanceSet.end())
-                WorldDatabase.DirectPExecute("DELETE FROM gameobject_respawn WHERE instance = '%u'", fields[0].GetUInt32());
+                WorldDatabase.PExecute("DELETE FROM gameobject_respawn WHERE instance = '%u'", fields[0].GetUInt32());
         }
         while (result->NextRow());
     }
@@ -433,7 +433,7 @@ void InstanceSaveManager::LoadResetTimes()
                 InstResetTimeMapDiffType::iterator itr = instResetTime.find(instance);
                 if (itr != instResetTime.end() && itr->second.second != resettime)
                 {
-                    CharacterDatabase.DirectPExecute("UPDATE instance SET resettime = '"UI64FMTD"' WHERE id = '%u'", uint64(resettime), instance);
+                    CharacterDatabase.PExecute("UPDATE instance SET resettime = '"UI64FMTD"' WHERE id = '%u'", uint64(resettime), instance);
                     itr->second.second = resettime;
                 }
             }
@@ -462,14 +462,14 @@ void InstanceSaveManager::LoadResetTimes()
             if (!mapDiff)
             {
                 sLog.outError("InstanceSaveManager::LoadResetTimes: invalid mapid(%u)/difficulty(%u) pair in instance_reset!", mapid, difficulty);
-                CharacterDatabase.DirectPExecute("DELETE FROM instance_reset WHERE mapid = '%u' AND difficulty = '%u'", mapid,difficulty);
+                CharacterDatabase.PExecute("DELETE FROM instance_reset WHERE mapid = '%u' AND difficulty = '%u'", mapid,difficulty);
                 continue;
             }
 
             // update the reset time if the hour in the configs changes
             uint64 newresettime = (oldresettime / DAY) * DAY + diff;
             if (oldresettime != newresettime)
-                CharacterDatabase.DirectPExecute("UPDATE instance_reset SET resettime = '"UI64FMTD"' WHERE mapid = '%u' AND difficulty = '%u'", newresettime, mapid, difficulty);
+                CharacterDatabase.PExecute("UPDATE instance_reset SET resettime = '"UI64FMTD"' WHERE mapid = '%u' AND difficulty = '%u'", newresettime, mapid, difficulty);
 
             SetResetTimeFor(mapid,difficulty,newresettime);
         } while (result->NextRow());
@@ -500,7 +500,7 @@ void InstanceSaveManager::LoadResetTimes()
         {
             // initialize the reset time
             t = today + period + diff;
-            CharacterDatabase.DirectPExecute("INSERT INTO instance_reset VALUES ('%u','%u','"UI64FMTD"')", mapid, difficulty, (uint64)t);
+            CharacterDatabase.PExecute("INSERT INTO instance_reset VALUES ('%u','%u','"UI64FMTD"')", mapid, difficulty, (uint64)t);
         }
 
         if (t < now)
@@ -509,7 +509,7 @@ void InstanceSaveManager::LoadResetTimes()
             // calculate the next reset time
             t = (t / DAY) * DAY;
             t += ((today - t) / period + 1) * period + diff;
-            CharacterDatabase.DirectPExecute("UPDATE instance_reset SET resettime = '"UI64FMTD"' WHERE mapid = '%u' AND difficulty= '%u'", (uint64)t, mapid, difficulty);
+            CharacterDatabase.PExecute("UPDATE instance_reset SET resettime = '"UI64FMTD"' WHERE mapid = '%u' AND difficulty= '%u'", (uint64)t, mapid, difficulty);
         }
 
         SetResetTimeFor(mapid,difficulty,t);
-- 
cgit v1.2.3


From b61674fbf2c3f298479c194e673b8f77aef22010 Mon Sep 17 00:00:00 2001
From: Supabad 
Date: Tue, 29 Jun 2010 12:49:37 +0200
Subject: Hellfire Ramparts - Code cleanup & Re-write Nazan a little bit

--HG--
branch : trunk
---
 .../HellfireRamparts/boss_vazruden_the_herald.cpp  | 142 +++++++++++----------
 1 file changed, 73 insertions(+), 69 deletions(-)

(limited to 'src')

diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
index 100654b34d5..122d9d59ed4 100644
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
@@ -23,32 +23,43 @@ EndScriptData */
 
 #include "ScriptPCH.h"
 
-#define SPELL_FIREBALL              DUNGEON_MODE(34653, 36920)
-#define SPELL_CONE_OF_FIRE          DUNGEON_MODE(30926, 36921)
-#define SPELL_SUMMON_LIQUID_FIRE    DUNGEON_MODE(23971, 30928)
-#define SPELL_BELLOWING_ROAR        39427
-#define SPELL_REVENGE               DUNGEON_MODE(19130, 40392)
-#define SPELL_KIDNEY_SHOT           30621
-#define SPELL_FIRE_NOVA_VISUAL      19823
-
-#define ENTRY_HELLFIRE_SENTRY       17517
-#define ENTRY_VAZRUDEN_HERALD       17307
-#define ENTRY_VAZRUDEN              17537
-#define ENTRY_NAZAN                 17536
-#define ENTRY_LIQUID_FIRE           22515
-#define ENTRY_REINFORCED_FEL_IRON_CHEST DUNGEON_MODE(185168, 185169)
-
-#define SAY_INTRO               -1543017
-#define SAY_WIPE                -1543018
-#define SAY_AGGRO_1             -1543019
-#define SAY_AGGRO_2             -1543020
-#define SAY_AGGRO_3             -1543021
-#define SAY_KILL_1              -1543022
-#define SAY_KILL_2              -1543023
-#define SAY_DIE                 -1543024
-#define EMOTE                   -1543025
-
-#define PATH_ENTRY              2081
+enum eSpells
+{
+    SPELL_FIREBALL                = 34653,
+    SPELL_FIREBALL_H              = 36920,
+    SPELL_CONE_OF_FIRE            = 30926,
+    SPELL_CONE_OF_FIRE_H          = 36921,
+    SPELL_SUMMON_LIQUID_FIRE      = 23971,
+    SPELL_SUMMON_LIQUID_FIRE_H    = 30928,
+    SPELL_BELLOWING_ROAR          = 39427,
+    SPELL_REVENGE                 = 19130,
+    SPELL_REVENGE_H               = 40392,
+    SPELL_KIDNEY_SHOT             = 30621,
+    SPELL_FIRE_NOVA_VISUAL        = 19823,
+};
+
+enum eUnits
+{
+    ENTRY_HELLFIRE_SENTRY             = 17517,
+    ENTRY_VAZRUDEN_HERALD             = 17307,
+    ENTRY_VAZRUDEN                    = 17537,
+    ENTRY_NAZAN                       = 17536,
+    ENTRY_LIQUID_FIRE                 = 22515,
+    ENTRY_REINFORCED_FEL_IRON_CHEST   = 185168,
+    ENTRY_REINFORCED_FEL_IRON_CHEST_H = 185169,
+};
+enum eSays
+{
+    SAY_INTRO                     = -1543017,
+    SAY_WIPE                      = -1543018,
+    SAY_AGGRO_1                   = -1543019,
+    SAY_AGGRO_2                   = -1543020,
+    SAY_AGGRO_3                   = -1543021,
+    SAY_KILL_1                    = -1543022,
+    SAY_KILL_2                    = -1543023,
+    SAY_DIE                       = -1543024,
+    EMOTE                         = -1543025,
+};
 
 const float VazrudenMiddle[3] = {-1406.5, 1746.5, 81.2};
 const float VazrudenRing[2][3] =
@@ -59,10 +70,10 @@ const float VazrudenRing[2][3] =
 
 struct boss_nazanAI : public ScriptedAI
 {
-    boss_nazanAI(Creature *c) : ScriptedAI(c)
+    boss_nazanAI(Creature* pCreature) : ScriptedAI(pCreature)
     {
         VazrudenGUID = 0;
-        flight = true;
+        flight = true;        
     }
 
     uint32 Fireball_Timer;
@@ -70,7 +81,6 @@ struct boss_nazanAI : public ScriptedAI
     uint32 BellowingRoar_Timer;
     uint32 Fly_Timer;
     uint32 Turn_Timer;
-    uint32 UnsummonCheck;
     bool flight;
     uint64 VazrudenGUID;
     SpellEntry *liquid_fire;
@@ -80,8 +90,7 @@ struct boss_nazanAI : public ScriptedAI
         Fireball_Timer = 4000;
         Fly_Timer = 45000;
         Turn_Timer = 0;
-        UnsummonCheck = 5000;
-    }
+    }  
 
     void EnterCombat(Unit* /*who*/) {}
 
@@ -91,7 +100,7 @@ struct boss_nazanAI : public ScriptedAI
         {
             summoned->SetLevel(me->getLevel());
             summoned->setFaction(me->getFaction());
-            summoned->CastSpell(summoned,SPELL_SUMMON_LIQUID_FIRE,true);
+            summoned->CastSpell(summoned, DUNGEON_MODE(SPELL_SUMMON_LIQUID_FIRE,SPELL_SUMMON_LIQUID_FIRE_H),true);
             summoned->CastSpell(summoned,SPELL_FIRE_NOVA_VISUAL,true);
         }
     }
@@ -105,18 +114,12 @@ struct boss_nazanAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         if (!UpdateVictim())
-        {
-            if (UnsummonCheck < diff && me->isAlive())
-                me->DisappearAndDie();
-            else
-                UnsummonCheck -= diff;
             return;
-        }
 
         if (Fireball_Timer <= diff)
         {
-            if (Unit *victim = SelectUnit(SELECT_TARGET_RANDOM,0))
-                DoCast(victim, SPELL_FIREBALL, true);
+            if (Unit* pVictim = SelectUnit(SELECT_TARGET_RANDOM,0))
+                DoCast(pVictim, DUNGEON_MODE(SPELL_FIREBALL, SPELL_FIREBALL_H), true);
             Fireball_Timer = urand(4000,7000);
         } else Fireball_Timer -= diff;
 
@@ -127,12 +130,12 @@ struct boss_nazanAI : public ScriptedAI
             {
                 flight = false;
                 BellowingRoar_Timer = 6000;
-                ConeOfFire_Timer = 12000;
+                ConeOfFire_Timer = 12000;                
                 me->RemoveUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
                 me->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
                 me->GetMotionMaster()->Clear();
-                if (Unit *victim = SelectUnit(SELECT_TARGET_NEAREST,0))
-                    me->AI()->AttackStart(victim);
+                if (Unit* pVictim = SelectUnit(SELECT_TARGET_NEAREST,0))
+                    me->AI()->AttackStart(pVictim);
                 DoStartMovement(me->getVictim());
                 DoScriptText(EMOTE, me);
                 return;
@@ -141,7 +144,7 @@ struct boss_nazanAI : public ScriptedAI
             if (Turn_Timer <= diff)
             {
                 uint32 waypoint = (Fly_Timer/10000)%2;
-                if (me->IsWithinDist3d(VazrudenRing[waypoint][0],VazrudenRing[waypoint][1],VazrudenRing[waypoint][2], 5))
+                if (!me->IsWithinDist3d(VazrudenRing[waypoint][0],VazrudenRing[waypoint][1],VazrudenRing[waypoint][2], 5))
                     me->GetMotionMaster()->MovePoint(0,VazrudenRing[waypoint][0],VazrudenRing[waypoint][1],VazrudenRing[waypoint][2]);
                 Turn_Timer = 10000;
             } else Turn_Timer -= diff;
@@ -150,7 +153,7 @@ struct boss_nazanAI : public ScriptedAI
         {
             if (ConeOfFire_Timer <= diff)
             {
-                DoCast(me, SPELL_CONE_OF_FIRE);
+                DoCast(me, DUNGEON_MODE(SPELL_CONE_OF_FIRE, SPELL_CONE_OF_FIRE_H));
                 ConeOfFire_Timer = 12000;
                 Fireball_Timer = 4000;
             } else ConeOfFire_Timer -= diff;
@@ -169,7 +172,7 @@ struct boss_nazanAI : public ScriptedAI
 
 struct boss_vazrudenAI : public ScriptedAI
 {
-    boss_vazrudenAI(Creature *c) : ScriptedAI(c)
+    boss_vazrudenAI(Creature* pCreature) : ScriptedAI(pCreature)
     {
     }
 
@@ -220,7 +223,7 @@ struct boss_vazrudenAI : public ScriptedAI
         if (Revenge_Timer <= diff)
         {
             if (Unit *victim = me->getVictim())
-                DoCast(victim, SPELL_REVENGE);
+                DoCast(victim, DUNGEON_MODE(SPELL_REVENGE,SPELL_REVENGE_H));
             Revenge_Timer = 5000;
         } else Revenge_Timer -= diff;
 
@@ -230,7 +233,7 @@ struct boss_vazrudenAI : public ScriptedAI
 
 struct boss_vazruden_the_heraldAI : public ScriptedAI
 {
-    boss_vazruden_the_heraldAI(Creature *c) : ScriptedAI(c)
+    boss_vazruden_the_heraldAI(Creature* pCreature) : ScriptedAI(pCreature)
     {
         summoned = false;
         sentryDown = false;
@@ -251,8 +254,7 @@ struct boss_vazruden_the_heraldAI : public ScriptedAI
         phase = 0;
         waypoint = 0;
         check = 0;
-        UnsummonAdds();
-        me->GetMotionMaster()->MovePath(PATH_ENTRY, true);
+        UnsummonAdds();        
     }
 
     void UnsummonAdds()
@@ -288,15 +290,15 @@ struct boss_vazruden_the_heraldAI : public ScriptedAI
         {
             if (Creature* Vazruden = me->SummonCreature(ENTRY_VAZRUDEN,VazrudenMiddle[0],VazrudenMiddle[1],VazrudenMiddle[2],0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,6000000))
                 VazrudenGUID = Vazruden->GetGUID();
-            if (Creature* Nazan = me->SummonCreature(ENTRY_NAZAN,VazrudenMiddle[0],VazrudenMiddle[1],VazrudenMiddle[2],0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,6000000))
-                NazanGUID = Nazan->GetGUID();
+            if (Creature* Nazan = me->SummonCreature(ENTRY_NAZAN,VazrudenMiddle[0],VazrudenMiddle[1],VazrudenMiddle[2],0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,6000000))                            
+                NazanGUID = Nazan->GetGUID();            
             summoned = true;
             me->SetVisibility(VISIBILITY_OFF);
             me->addUnitState(UNIT_STAT_ROOT);
         }
     }
 
-    void EnterCombat(Unit * /*who*/)
+    void EnterCombat(Unit* /*who*/)
     {
         if (phase == 0)
         {
@@ -306,27 +308,29 @@ struct boss_vazruden_the_heraldAI : public ScriptedAI
         }
     }
 
-    void JustSummoned(Creature *summoned)
+    void JustSummoned(Creature* pSummoned)
     {
-        if (!summoned) return;
-        Unit *victim = me->getVictim();
-        if (summoned->GetEntry() == ENTRY_NAZAN)
+        if (!pSummoned)
+            return;
+        Unit* pVictim = me->getVictim();
+        if (pSummoned->GetEntry() == ENTRY_NAZAN)
         {
-            CAST_AI(boss_nazanAI, summoned->AI())->VazrudenGUID = VazrudenGUID;
-            summoned->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
-            summoned->SetSpeed(MOVE_FLIGHT, 2.5);
-            if (victim)
-                AttackStartNoMove(victim);
+            CAST_AI(boss_nazanAI, pSummoned->AI())->VazrudenGUID = VazrudenGUID;
+            pSummoned->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
+            pSummoned->SetSpeed(MOVE_FLIGHT, 2.5);            
+            if (pVictim)
+                AttackStartNoMove(pVictim);
         }
-        else if (victim)
-            summoned->AI()->AttackStart(victim);
+        else 
+            if (pVictim)
+                pSummoned->AI()->AttackStart(pVictim);
     }
 
-    void SentryDownBy(Unit* killer)
+    void SentryDownBy(Unit* pKiller)
     {
         if (sentryDown)
         {
-            AttackStartNoMove(killer);
+            AttackStartNoMove(pKiller);
             sentryDown = false;
         }
         else
@@ -375,9 +379,9 @@ struct boss_vazruden_the_heraldAI : public ScriptedAI
                 }
                 else
                 {
-                    me->SummonGameObject(ENTRY_REINFORCED_FEL_IRON_CHEST,VazrudenMiddle[0],VazrudenMiddle[1],VazrudenMiddle[2],0,0,0,0,0,0);
+                    me->SummonGameObject(DUNGEON_MODE(ENTRY_REINFORCED_FEL_IRON_CHEST, ENTRY_REINFORCED_FEL_IRON_CHEST_H),VazrudenMiddle[0],VazrudenMiddle[1],VazrudenMiddle[2],0,0,0,0,0,0);
                     me->SetLootRecipient(NULL); // don't think this is necessary..
-                    me->Kill(me);
+                    //me->Kill(me);
                 }
                 check = 2000;
             } else check -= diff;
@@ -388,7 +392,7 @@ struct boss_vazruden_the_heraldAI : public ScriptedAI
 
 struct mob_hellfire_sentryAI : public ScriptedAI
 {
-    mob_hellfire_sentryAI(Creature *c) : ScriptedAI(c) {}
+    mob_hellfire_sentryAI(Creature* pCreature) : ScriptedAI(pCreature) {}
 
     uint32 KidneyShot_Timer;
 
-- 
cgit v1.2.3


From 4b19773df135518729cb9df92cb0859f0df556a5 Mon Sep 17 00:00:00 2001
From: Shauren 
Date: Tue, 29 Jun 2010 14:20:49 +0200
Subject: Added support for SPELL_AURA_SCHOOL_HEAL_ABSORB (301)

--HG--
branch : trunk
---
 src/server/game/Entities/Unit/Unit.cpp            | 82 +++++++++++++++++++++--
 src/server/game/Entities/Unit/Unit.h              |  3 +-
 src/server/game/Spells/Auras/SpellAuraDefines.h   |  2 +-
 src/server/game/Spells/Auras/SpellAuraEffects.cpp |  2 +-
 4 files changed, 82 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 3b292e4f7d5..4585e0c8b85 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -2186,6 +2186,74 @@ void Unit::CalcAbsorbResist(Unit *pVictim, SpellSchoolMask schoolMask, DamageEff
     }
 }
 
+void Unit::CalcHealAbsorb(Unit *pVictim, const SpellEntry *healSpell, uint32 &healAmount, uint32 &absorb)
+{
+    if (!healAmount)
+        return;
+
+    int32 RemainingHeal = healAmount;
+    // Get unit state (need for some absorb check)
+    uint32 unitflag = pVictim->GetUInt32Value(UNIT_FIELD_FLAGS);
+    // Need remove expired auras after
+    bool existExpired = false;
+
+    // Incanter's Absorption, for converting to spell power
+    int32 incanterAbsorption = 0;
+
+    // absorb without mana cost
+    AuraEffectList const& vHealAbsorb = pVictim->GetAuraEffectsByType(SPELL_AURA_SCHOOL_HEAL_ABSORB);
+    for (AuraEffectList::const_iterator i = vHealAbsorb.begin(); i != vHealAbsorb.end() && RemainingHeal > 0; ++i)
+    {
+        if (!((*i)->GetMiscValue() & healSpell->SchoolMask))
+            continue;
+
+        SpellEntry const* spellProto = (*i)->GetSpellProto();
+
+        // Max Amount can be absorbed by this aura
+        int32 currentAbsorb = (*i)->GetAmount();
+
+        // Found empty aura (impossible but..)
+        if (currentAbsorb <= 0)
+        {
+            existExpired = true;
+            continue;
+        }
+
+        // currentAbsorb - damage can be absorbed by shield
+        // If need absorb less damage
+        if (RemainingHeal < currentAbsorb)
+            currentAbsorb = RemainingHeal;
+
+        RemainingHeal -= currentAbsorb;
+
+        // Reduce shield amount
+        (*i)->SetAmount((*i)->GetAmount() - currentAbsorb);
+        // Need remove it later
+        if ((*i)->GetAmount() <= 0)
+            existExpired = true;
+    }
+
+    // Remove all expired absorb auras
+    if (existExpired)
+    {
+        for (AuraEffectList::const_iterator i = vHealAbsorb.begin(); i != vHealAbsorb.end();)
+        {
+            AuraEffect *auraEff = *i;
+            ++i;
+            if (auraEff->GetAmount() <= 0)
+            {
+                uint32 removedAuras = pVictim->m_removedAurasCount;
+                auraEff->GetBase()->Remove(AURA_REMOVE_BY_ENEMY_SPELL);
+                if (removedAuras+1 < pVictim->m_removedAurasCount)
+                    i = vHealAbsorb.begin();
+            }
+        }
+    }
+
+    absorb = RemainingHeal > 0 ? (healAmount - RemainingHeal) : healAmount;
+    healAmount = RemainingHeal;
+}
+
 void Unit::AttackerStateUpdate (Unit *pVictim, WeaponAttackType attType, bool /*extra*/)
 {
     if (hasUnitState(UNIT_STAT_CANNOT_AUTOATTACK) || HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PACIFIED))
@@ -9616,7 +9684,13 @@ void Unit::SetCharm(Unit* charm, bool apply)
 
 int32 Unit::DealHeal(Unit *pVictim, uint32 addhealth, SpellEntry const *spellProto, bool critical)
 {
-    int32 gain = pVictim->ModifyHealth(int32(addhealth));
+    uint32 absorb = 0;
+    // calculate heal absorb and reduce healing
+    CalcHealAbsorb(pVictim, spellProto, addhealth, absorb);
+    int32 gain = 0;
+    
+    if (addhealth)
+        gain = pVictim->ModifyHealth(int32(addhealth));
 
     Unit* unit = this;
 
@@ -9626,7 +9700,7 @@ int32 Unit::DealHeal(Unit *pVictim, uint32 addhealth, SpellEntry const *spellPro
     if (unit->GetTypeId() == TYPEID_PLAYER)
     {
         // overheal = addhealth - gain
-        unit->SendHealSpellLog(pVictim, spellProto->Id, addhealth, addhealth - gain, critical);
+        unit->SendHealSpellLog(pVictim, spellProto->Id, addhealth, addhealth - gain, absorb, critical);
 
         if (BattleGround *bg = unit->ToPlayer()->GetBattleGround())
             bg->UpdatePlayerScore((Player*)unit, SCORE_HEALING_DONE, gain);
@@ -9831,7 +9905,7 @@ void Unit::UnsummonAllTotems()
     }
 }
 
-void Unit::SendHealSpellLog(Unit *pVictim, uint32 SpellID, uint32 Damage, uint32 OverHeal, bool critical)
+void Unit::SendHealSpellLog(Unit *pVictim, uint32 SpellID, uint32 Damage, uint32 OverHeal, uint32 Absorb, bool critical)
 {
     // we guess size
     WorldPacket data(SMSG_SPELLHEALLOG, (8+8+4+4+4+4+1));
@@ -9840,7 +9914,7 @@ void Unit::SendHealSpellLog(Unit *pVictim, uint32 SpellID, uint32 Damage, uint32
     data << uint32(SpellID);
     data << uint32(Damage);
     data << uint32(OverHeal);
-    data << uint32(0);  // Absorb amount
+    data << uint32(Absorb); // Absorb amount
     data << uint8(critical ? 1 : 0);
     SendMessageToSet(&data, true);
 }
diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h
index 615dfd2cf8a..87bd997a683 100644
--- a/src/server/game/Entities/Unit/Unit.h
+++ b/src/server/game/Entities/Unit/Unit.h
@@ -1399,7 +1399,7 @@ class Unit : public WorldObject
         virtual bool IsUnderWater() const;
         bool isInAccessiblePlaceFor(Creature const* c) const;
 
-        void SendHealSpellLog(Unit *pVictim, uint32 SpellID, uint32 Damage, uint32 OverHeal, bool critical = false);
+        void SendHealSpellLog(Unit *pVictim, uint32 SpellID, uint32 Damage, uint32 OverHeal, uint32 Absorb, bool critical = false);
         void SendEnergizeSpellLog(Unit *pVictim, uint32 SpellID, uint32 Damage,Powers powertype);
         void EnergizeBySpell(Unit *pVictim, uint32 SpellID, uint32 Damage, Powers powertype);
         uint32 SpellNonMeleeDamageLog(Unit *pVictim, uint32 spellID, uint32 damage);
@@ -1835,6 +1835,7 @@ class Unit : public WorldObject
         uint32 CalcNotIgnoreDamageRedunction(uint32 damage, SpellSchoolMask damageSchoolMask);
         uint32 CalcArmorReducedDamage(Unit* pVictim, const uint32 damage, SpellEntry const *spellInfo, WeaponAttackType attackType=MAX_ATTACK);
         void CalcAbsorbResist(Unit *pVictim, SpellSchoolMask schoolMask, DamageEffectType damagetype, const uint32 damage, uint32 *absorb, uint32 *resist, SpellEntry const *spellInfo = NULL);
+        void CalcHealAbsorb(Unit *pVictim, const SpellEntry *spellProto, uint32 &healAmount, uint32 &absorb);
 
         void  UpdateSpeed(UnitMoveType mtype, bool forced);
         float GetSpeed(UnitMoveType mtype) const;
diff --git a/src/server/game/Spells/Auras/SpellAuraDefines.h b/src/server/game/Spells/Auras/SpellAuraDefines.h
index 8b21062e371..81af1e71ecc 100644
--- a/src/server/game/Spells/Auras/SpellAuraDefines.h
+++ b/src/server/game/Spells/Auras/SpellAuraDefines.h
@@ -345,7 +345,7 @@ enum AuraType
     SPELL_AURA_298 = 298,
     SPELL_AURA_299 = 299,
     SPELL_AURA_300 = 300,
-    SPELL_AURA_301 = 301,
+    SPELL_AURA_SCHOOL_HEAL_ABSORB = 301,
     SPELL_AURA_302 = 302,
     SPELL_AURA_303 = 303,
     SPELL_AURA_304 = 304,
diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
index 89fcd379e85..54bb87470bc 100644
--- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
@@ -354,7 +354,7 @@ pAuraEffectHandler AuraEffectHandler[TOTAL_AURAS]=
     &AuraEffect::HandleNULL,                                      //298 unused
     &AuraEffect::HandleNULL,                                      //299 unused
     &AuraEffect::HandleNULL,                                      //300 3 spells (share damage?)
-    &AuraEffect::HandleNULL,                                      //301 5 spells
+    &AuraEffect::HandleNoImmediateEffect,                         //301 SPELL_AURA_SCHOOL_HEAL_ABSORB implemented in Unit::CalcHealAbsorb
     &AuraEffect::HandleNULL,                                      //302 unused
     &AuraEffect::HandleNULL,                                      //303 17 spells
     &AuraEffect::HandleNULL,                                      //304 2 spells (alcohol effect?)
-- 
cgit v1.2.3


From 9a648e120de1a9ca85e9dc1386e13dec0f8564b5 Mon Sep 17 00:00:00 2001
From: Shauren 
Date: Tue, 29 Jun 2010 14:33:07 +0200
Subject: This should not be there

--HG--
branch : trunk
---
 src/server/game/Entities/Unit/Unit.cpp | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 4585e0c8b85..362ccbf582d 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -2197,9 +2197,6 @@ void Unit::CalcHealAbsorb(Unit *pVictim, const SpellEntry *healSpell, uint32 &he
     // Need remove expired auras after
     bool existExpired = false;
 
-    // Incanter's Absorption, for converting to spell power
-    int32 incanterAbsorption = 0;
-
     // absorb without mana cost
     AuraEffectList const& vHealAbsorb = pVictim->GetAuraEffectsByType(SPELL_AURA_SCHOOL_HEAL_ABSORB);
     for (AuraEffectList::const_iterator i = vHealAbsorb.begin(); i != vHealAbsorb.end() && RemainingHeal > 0; ++i)
-- 
cgit v1.2.3


From 745c2fb599080ab94bad795a8c21ae587172bc9f Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Tue, 29 Jun 2010 15:40:20 +0200
Subject: Violet Hold: Restructuration: Add an EventPhase var instead of using
 door's status to handle main event. Needed for next commits and cleansing

--HG--
branch : trunk
---
 .../Northrend/VioletHold/instance_violet_hold.cpp  | 36 +++++++++++++++-------
 .../scripts/Northrend/VioletHold/violet_hold.cpp   | 29 ++++++++---------
 .../scripts/Northrend/VioletHold/violet_hold.h     |  3 +-
 3 files changed, 42 insertions(+), 26 deletions(-)

(limited to 'src')

diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
index b5963ed5f61..b3625d68ed7 100644
--- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
+++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
@@ -134,6 +134,7 @@ struct instance_violet_hold : public ScriptedInstance
 
     uint32 uiActivationTimer;
     uint32 uiCyanigosaEventTimer;
+    uint32 uiDoorSpellTimer;
 
     std::set trashMobs; // to kill with crystal
 
@@ -142,15 +143,14 @@ struct instance_violet_hold : public ScriptedInstance
     uint8 uiFirstBoss;
     uint8 uiSecondBoss;
     uint8 uiRemoveNpc;
-    uint32 uiDoorSpellTimer;
-    
-    uint8 uiMainDoorState;
+
     uint8 uiDoorIntegrity;
 
     uint8 m_auiEncounter[MAX_ENCOUNTER];
     uint8 uiCountErekemGuards;
     uint8 uiCountActivationCrystals;
     uint8 uiCyanigosaEventPhase;
+    uint8 uiMainEventPhase; // SPECIAL: pre event animations, IN_PROGRESS: event itself
 
     bool bActive;
     bool bWiped;
@@ -188,7 +188,6 @@ struct instance_violet_hold : public ScriptedInstance
         
         uiRemoveNpc = 0;
 
-        uiMainDoorState = GO_STATE_ACTIVE;
         uiDoorIntegrity = 100;
 
         uiWaveCount = 0;
@@ -320,6 +319,7 @@ struct instance_violet_hold : public ScriptedInstance
                 if (data == DONE)
                 {
                     SaveToDB();
+                    uiMainEventPhase = DONE;
                     if (GameObject* pMainDoor = instance->GetGameObject(uiMainDoor))
                         pMainDoor->SetGoState(GO_STATE_ACTIVE);
                     if (!bCrystalActivated && uiDoorIntegrity == 100)
@@ -348,7 +348,7 @@ struct instance_violet_hold : public ScriptedInstance
                     NpcAtDoorCastingList.pop_back();
                 break;
             case DATA_MAIN_DOOR:
-                if(GameObject* pMainDoor = instance->GetGameObject(uiMainDoor))
+                if (GameObject* pMainDoor = instance->GetGameObject(uiMainDoor))
                 {
                     switch(data)
                     {
@@ -363,7 +363,6 @@ struct instance_violet_hold : public ScriptedInstance
                             break;
                     }
                 }
-                uiMainDoorState = data;
                 break;
             case DATA_START_BOSS_ENCOUNTER:
                 switch(uiWaveCount)
@@ -379,6 +378,17 @@ struct instance_violet_hold : public ScriptedInstance
             case DATA_ACTIVATE_CRYSTAL:
                 ActivateCrystal();
                 break;
+            case DATA_MAIN_EVENT_PHASE:
+                uiMainEventPhase = data;
+                if (data == IN_PROGRESS) // Start event
+                {
+                    if (GameObject* pMainDoor = instance->GetGameObject(uiMainDoor))
+                        pMainDoor->SetGoState(GO_STATE_READY);
+                    uiWaveCount = 1;
+                    bActive = true;
+                    uiRemoveNpc = 0; // might not have been reset after a wipe on a boss.
+                }
+                break;
         }
     }
 
@@ -407,9 +417,9 @@ struct instance_violet_hold : public ScriptedInstance
             case DATA_PORTAL_LOCATION:          return uiLocation;
             case DATA_DOOR_INTEGRITY:           return uiDoorIntegrity;
             case DATA_NPC_PRESENCE_AT_DOOR:     return NpcAtDoorCastingList.size();
-            case DATA_MAIN_DOOR:                return uiMainDoorState;
             case DATA_FIRST_BOSS:               return uiFirstBoss;
             case DATA_SECOND_BOSS:              return uiSecondBoss;
+            case DATA_MAIN_EVENT_PHASE:         return uiMainEventPhase;
         }
 
         return 0;
@@ -662,7 +672,7 @@ struct instance_violet_hold : public ScriptedInstance
             return;
 
         // portals should spawn if other portal is dead and doors are closed
-        if (bActive && GetData(DATA_MAIN_DOOR) == GO_STATE_READY)
+        if (bActive && uiMainEventPhase == IN_PROGRESS)
         {
             if (uiActivationTimer < diff)
             {
@@ -672,8 +682,8 @@ struct instance_violet_hold : public ScriptedInstance
             } else uiActivationTimer -= diff;
         }
 
-        // if doors are closed (means event is in progres) and players have wiped then reset instance
-        if (GetData(DATA_MAIN_DOOR) != GO_STATE_ACTIVE && CheckWipe())
+        // if main event is in progress and players have wiped then reset instance
+        if ( uiMainEventPhase == IN_PROGRESS && CheckWipe())
         {
             SetData(DATA_REMOVE_NPC, 1);
             StartBossEncounter(uiFirstBoss, false);
@@ -681,6 +691,7 @@ struct instance_violet_hold : public ScriptedInstance
 
             SetData(DATA_MAIN_DOOR,GO_STATE_ACTIVE);
             SetData(DATA_WAVE_COUNT, 0);
+            uiMainEventPhase = NOT_STARTED;
 
             if (Creature* pSinclari = instance->GetCreature(uiSinclari))
             {
@@ -741,7 +752,7 @@ struct instance_violet_hold : public ScriptedInstance
         }
 
         // if there are NPCs in front of the prison door, which are casting the door seal spell and doors are active
-        if(GetData(DATA_NPC_PRESENCE_AT_DOOR) && (GetData(DATA_MAIN_DOOR) == GO_STATE_READY))
+        if (GetData(DATA_NPC_PRESENCE_AT_DOOR) && uiMainEventPhase == IN_PROGRESS)
         {
             // if door integrity is > 0 then decrase it's integrity state
             if(GetData(DATA_DOOR_INTEGRITY))
@@ -754,7 +765,10 @@ struct instance_violet_hold : public ScriptedInstance
             }
             // else set door state to active (means door will open and group have failed to sustain mob invasion on the door)
             else
+            {
                 SetData(DATA_MAIN_DOOR,GO_STATE_ACTIVE);
+                uiMainEventPhase = FAIL;
+            }
         }
     }
 
diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp
index 165d4309da4..77fda62e32e 100644
--- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp
+++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp
@@ -340,11 +340,7 @@ struct npc_sinclariAI : public ScriptedAI
                         break;
                     case 5:
                         if (pInstance)
-                        {
-                            pInstance->SetData(DATA_MAIN_DOOR,GO_STATE_READY);
-                            pInstance->SetData(DATA_WAVE_COUNT,1);
-                            pInstance->SetData(DATA_REMOVE_NPC,0); // might not have been reset after a wipe on a boss.
-                        }
+                            pInstance->SetData(DATA_MAIN_EVENT_PHASE,IN_PROGRESS);
                         me->SetVisibility(VISIBILITY_OFF);
                         me->SetReactState(REACT_PASSIVE);
                         uiTimer = 0;
@@ -420,7 +416,7 @@ struct mob_azure_saboteurAI : public npc_escortAI
     
     void UpdateAI(const uint32 diff)
     {
-        if(pInstance->GetData(DATA_MAIN_DOOR) != GO_STATE_READY)
+        if (pInstance && pInstance->GetData(DATA_MAIN_EVENT_PHASE != IN_PROGRESS))
             me->CastStop();
         
         npc_escortAI::UpdateAI(diff);
@@ -483,14 +479,17 @@ CreatureAI* GetAI_mob_azure_saboteur(Creature* pCreature)
 
 bool GossipHello_npc_sinclari(Player* pPlayer, Creature* pCreature)
 {
-    ScriptedInstance* pInstance = pCreature->GetInstanceData();
-    if (pInstance && pInstance->GetData(DATA_CYANIGOSA_EVENT) != DONE && pInstance->GetData(DATA_WAVE_COUNT) == 0 && pPlayer)
+    if (ScriptedInstance* pInstance = pCreature->GetInstanceData())
     {
-        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,GOSSIP_ITEM_1,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+2);
-        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,GOSSIP_START_EVENT,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+1);
-        pPlayer->SEND_GOSSIP_MENU(13853, pCreature->GetGUID());
-    } else
-        pPlayer->SEND_GOSSIP_MENU(13910, pCreature->GetGUID());
+        uint8 uiInstancePhase = pInstance->GetData(DATA_MAIN_EVENT_PHASE);
+        if (uiInstancePhase == NOT_STARTED || uiInstancePhase == FAIL) // Allow to start event if not started or wiped
+        {
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,GOSSIP_ITEM_1,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+2);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,GOSSIP_START_EVENT,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+1);
+            pPlayer->SEND_GOSSIP_MENU(13853, pCreature->GetGUID());
+        } else
+            pPlayer->SEND_GOSSIP_MENU(13910, pCreature->GetGUID());
+    }
     return true;
 }
 
@@ -502,6 +501,8 @@ bool GossipSelect_npc_sinclari(Player* pPlayer, Creature* pCreature, uint32 /*ui
             if (pPlayer)
                 pPlayer->CLOSE_GOSSIP_MENU();
             CAST_AI(npc_sinclariAI, (pCreature->AI()))->uiPhase = 1;
+            if (ScriptedInstance *pInstance = pCreature->GetInstanceData())
+                pInstance->SetData(DATA_MAIN_EVENT_PHASE,SPECIAL);
             break;
         case GOSSIP_ACTION_INFO_DEF+2:
             pPlayer->SEND_GOSSIP_MENU(13854, pCreature->GetGUID());
@@ -688,7 +689,7 @@ struct violet_hold_trashAI : public npc_escortAI
 
     void UpdateAI(const uint32)
     {
-        if (pInstance->GetData(DATA_MAIN_DOOR) != GO_STATE_READY)
+        if (pInstance && pInstance->GetData(DATA_MAIN_EVENT_PHASE != IN_PROGRESS))
                 me->CastStop();
 
         if (!bHasGotMovingPoints)
diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.h b/src/server/scripts/Northrend/VioletHold/violet_hold.h
index e9e70950603..f30b4c50ead 100644
--- a/src/server/scripts/Northrend/VioletHold/violet_hold.h
+++ b/src/server/scripts/Northrend/VioletHold/violet_hold.h
@@ -52,7 +52,8 @@ enum Data
     DATA_START_BOSS_ENCOUNTER,
     DATA_FIRST_BOSS,
     DATA_SECOND_BOSS,
-    DATA_ACTIVATE_CRYSTAL
+    DATA_ACTIVATE_CRYSTAL,
+    DATA_MAIN_EVENT_PHASE
 };
 
 enum Data64
-- 
cgit v1.2.3


From aa9b52c67a56ad4f0313d253974a4bce4837431e Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Tue, 29 Jun 2010 15:41:39 +0200
Subject: bypass Map::CanEnter() checks on login (fixes a crash) Need info
 about this bypass is exploitable or not

--HG--
branch : trunk
---
 src/server/game/Maps/MapManager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/game/Maps/MapManager.cpp b/src/server/game/Maps/MapManager.cpp
index 05ea37d2d80..36999aab14f 100644
--- a/src/server/game/Maps/MapManager.cpp
+++ b/src/server/game/Maps/MapManager.cpp
@@ -234,7 +234,7 @@ bool MapManager::CanPlayerEnter(uint32 mapid, Player* player, bool loginCheck)
         InstanceGroupBind* boundedInstance = pGroup->GetBoundInstance(entry);
         if (boundedInstance && boundedInstance->save)
             if (Map *boundedMap = sMapMgr.FindMap(mapid,boundedInstance->save->GetInstanceId()))
-                if (!boundedMap->CanEnter(player))
+                if (!loginCheck && !boundedMap->CanEnter(player))
                     return false;
             /*
                 This check has to be moved to InstanceMap::CanEnter()
-- 
cgit v1.2.3


From e2f47ef67236044d555c3aca7df9e63df7234548 Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Tue, 29 Jun 2010 21:15:19 +0200
Subject: Violet Hold: Implement sinclari's option to teleport player's inside
 during main event, based on DennisRassmann Closes issue #2810

--HG--
branch : trunk
---
 .../scripts/Northrend/VioletHold/violet_hold.cpp   | 87 ++++++++++++----------
 1 file changed, 49 insertions(+), 38 deletions(-)

(limited to 'src')

diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp
index 77fda62e32e..30736b9fc4e 100644
--- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp
+++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp
@@ -22,6 +22,7 @@
 
 #define GOSSIP_START_EVENT  "Get your people to safety, we'll keep the Blue Dragonflight's forces at bay."
 #define GOSSIP_ITEM_1       "Activate the crystals when we get in trouble, right"
+#define GOSSIP_I_WANT_IN    "Sorry, I'm late! Can I get in to help my friends?"
 #define SPAWN_TIME          20000
 
 enum PortalCreatures
@@ -244,7 +245,9 @@ const float SaboteurFinalPos6[5][3] =
     {1931.063354, 848.468445, 47.190434}
  };
 
-const Position MovePosition = { 1806.955566, 803.851807, 44.363323};
+const Position MovePosition = {1806.955566, 803.851807, 44.363323};
+const Position playerTeleportPosition = {1830.531006, 803.939758, 44.340508, 6.281611};
+const Position sinclariOutsidePosition = {1817.315674, 804.060608, 44.363998};
 
 struct npc_sinclariAI : public ScriptedAI
 {
@@ -263,7 +266,6 @@ struct npc_sinclariAI : public ScriptedAI
         uiPhase = 0;
         uiTimer = 0;
 
-        me->SetVisibility(VISIBILITY_ON);
         me->SetReactState(REACT_AGGRESSIVE);
 
         std::list GuardList;
@@ -334,14 +336,13 @@ struct npc_sinclariAI : public ScriptedAI
                         break;
                     }
                     case 4:
-                        me->GetMotionMaster()->MovePoint(0, MovePosition);
+                        me->GetMotionMaster()->MovePoint(0, sinclariOutsidePosition);
                         uiTimer = 4000;
                         uiPhase = 5;
                         break;
                     case 5:
                         if (pInstance)
                             pInstance->SetData(DATA_MAIN_EVENT_PHASE,IN_PROGRESS);
-                        me->SetVisibility(VISIBILITY_OFF);
                         me->SetReactState(REACT_PASSIVE);
                         uiTimer = 0;
                         uiPhase = 0;
@@ -363,6 +364,50 @@ CreatureAI* GetAI_npc_sinclari(Creature* pCreature)
     return new npc_sinclariAI(pCreature);
 }
 
+bool GossipHello_npc_sinclari(Player* pPlayer, Creature* pCreature)
+{
+    if (ScriptedInstance* pInstance = pCreature->GetInstanceData())
+    {
+        switch (pInstance->GetData(DATA_MAIN_EVENT_PHASE))
+        {
+            case NOT_STARTED:
+            case FAIL: // Allow to start event if not started or wiped
+                pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,GOSSIP_ITEM_1,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+2);
+                pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,GOSSIP_START_EVENT,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+1);
+                pPlayer->SEND_GOSSIP_MENU(13853, pCreature->GetGUID());
+                break;
+            case IN_PROGRESS: // Allow to teleport inside if event is in progress
+                pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,GOSSIP_I_WANT_IN,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+3);
+                pPlayer->SEND_GOSSIP_MENU(13853, pCreature->GetGUID());
+                break;
+            default:
+                pPlayer->SEND_GOSSIP_MENU(13910, pCreature->GetGUID());
+        }
+    }
+    return true;
+}
+
+bool GossipSelect_npc_sinclari(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction)
+{
+    switch(uiAction)
+    {
+        case GOSSIP_ACTION_INFO_DEF+1:
+            pPlayer->CLOSE_GOSSIP_MENU();
+            CAST_AI(npc_sinclariAI, (pCreature->AI()))->uiPhase = 1;
+            if (ScriptedInstance *pInstance = pCreature->GetInstanceData())
+                pInstance->SetData(DATA_MAIN_EVENT_PHASE,SPECIAL);
+            break;
+        case GOSSIP_ACTION_INFO_DEF+2:
+            pPlayer->SEND_GOSSIP_MENU(13854, pCreature->GetGUID());
+            break;
+        case GOSSIP_ACTION_INFO_DEF+3:
+            pPlayer->NearTeleportTo(playerTeleportPosition.GetPositionX(),playerTeleportPosition.GetPositionY(),playerTeleportPosition.GetPositionZ(),playerTeleportPosition.GetOrientation(),true);
+            pPlayer->CLOSE_GOSSIP_MENU();
+            break;
+    }
+    return true;
+}
+
 struct mob_azure_saboteurAI : public npc_escortAI
 {
     mob_azure_saboteurAI(Creature *c):npc_escortAI(c)
@@ -477,40 +522,6 @@ CreatureAI* GetAI_mob_azure_saboteur(Creature* pCreature)
     return new mob_azure_saboteurAI (pCreature);
 }
 
-bool GossipHello_npc_sinclari(Player* pPlayer, Creature* pCreature)
-{
-    if (ScriptedInstance* pInstance = pCreature->GetInstanceData())
-    {
-        uint8 uiInstancePhase = pInstance->GetData(DATA_MAIN_EVENT_PHASE);
-        if (uiInstancePhase == NOT_STARTED || uiInstancePhase == FAIL) // Allow to start event if not started or wiped
-        {
-            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,GOSSIP_ITEM_1,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+2);
-            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,GOSSIP_START_EVENT,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+1);
-            pPlayer->SEND_GOSSIP_MENU(13853, pCreature->GetGUID());
-        } else
-            pPlayer->SEND_GOSSIP_MENU(13910, pCreature->GetGUID());
-    }
-    return true;
-}
-
-bool GossipSelect_npc_sinclari(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction)
-{
-    switch(uiAction)
-    {
-        case GOSSIP_ACTION_INFO_DEF+1:
-            if (pPlayer)
-                pPlayer->CLOSE_GOSSIP_MENU();
-            CAST_AI(npc_sinclariAI, (pCreature->AI()))->uiPhase = 1;
-            if (ScriptedInstance *pInstance = pCreature->GetInstanceData())
-                pInstance->SetData(DATA_MAIN_EVENT_PHASE,SPECIAL);
-            break;
-        case GOSSIP_ACTION_INFO_DEF+2:
-            pPlayer->SEND_GOSSIP_MENU(13854, pCreature->GetGUID());
-            break;
-    }
-    return true;
-}
-
 struct npc_teleportation_portalAI : public ScriptedAI
 {
     npc_teleportation_portalAI(Creature *c) : ScriptedAI(c), listOfMobs(me)
-- 
cgit v1.2.3


From b0d5071598a7a3bd329f1f107725c1d56d100e1e Mon Sep 17 00:00:00 2001
From: Shauren 
Date: Wed, 30 Jun 2010 10:55:12 +0200
Subject: Added rename forgotten in revision 1744c10a1b

--HG--
branch : trunk
---
 src/server/game/Globals/ObjectMgr.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index 866910422c3..c7ed4cfb330 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -2378,7 +2378,7 @@ void ObjectMgr::LoadItemSetNameLocales()
 {
     mItemSetNameLocaleMap.clear();                                 // need for reload case
 
-    QueryResult_AutoPtr result = WorldDatabase.Query("SELECT `entry`,`name_loc1`,`name_loc2`,`name_loc3`,`name_loc4`,`name_loc5`,`name_loc6`,`name_loc7`,`name_loc8` FROM `locales_item_set_name`");
+    QueryResult_AutoPtr result = WorldDatabase.Query("SELECT `entry`,`name_loc1`,`name_loc2`,`name_loc3`,`name_loc4`,`name_loc5`,`name_loc6`,`name_loc7`,`name_loc8` FROM `locales_item_set_names`");
 
     if (!result)
         return;
-- 
cgit v1.2.3


From 2ea043484d3efadf955c30d1d7fb10894ee465b7 Mon Sep 17 00:00:00 2001
From: Shauren 
Date: Wed, 30 Jun 2010 13:10:13 +0200
Subject: It is now possible to use CMake on windows for proper build (PCH
 support included) Merged PCH header into gamePCH since they became the same
 after these changes

--HG--
branch : trunk
rename : src/server/game/PrecompiledHeaders/NixCorePCH.cpp => src/server/game/PrecompiledHeaders/gamePCH.cpp
rename : src/server/game/PrecompiledHeaders/NixCorePCH.h => src/server/game/PrecompiledHeaders/gamePCH.h
---
 CMakeLists.txt                                    |   5 +
 cmake/FindPCHSupport.cmake                        |   4 +-
 externals/ace/CMakeLists.txt                      | 321 +++++++++++++++++++++-
 src/server/authserver/CMakeLists.txt              |  18 +-
 src/server/game/CMakeLists.txt                    |  17 +-
 src/server/game/PrecompiledHeaders/NixCorePCH.cpp |   1 -
 src/server/game/PrecompiledHeaders/NixCorePCH.h   |  12 -
 src/server/game/PrecompiledHeaders/WinCorePCH.cpp |   1 -
 src/server/game/PrecompiledHeaders/WinCorePCH.h   |  14 -
 src/server/game/PrecompiledHeaders/gamePCH.cpp    |   1 +
 src/server/game/PrecompiledHeaders/gamePCH.h      |  12 +
 src/server/scripts/CMakeLists.txt                 |  21 +-
 src/server/shared/CMakeLists.txt                  |  16 ++
 src/server/worldserver/CMakeLists.txt             |  10 +-
 14 files changed, 402 insertions(+), 51 deletions(-)
 delete mode 100644 src/server/game/PrecompiledHeaders/NixCorePCH.cpp
 delete mode 100644 src/server/game/PrecompiledHeaders/NixCorePCH.h
 delete mode 100644 src/server/game/PrecompiledHeaders/WinCorePCH.cpp
 delete mode 100644 src/server/game/PrecompiledHeaders/WinCorePCH.h
 create mode 100644 src/server/game/PrecompiledHeaders/gamePCH.cpp
 create mode 100644 src/server/game/PrecompiledHeaders/gamePCH.h

(limited to 'src')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d0c4eb18e9e..e7118a2faa7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,6 +31,11 @@ endif()
 
 include(CheckIncludeFiles)
 include(cmake/FindPCHSupport.cmake)
+
+if(WIN32)
+  set(ACE_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/externals)
+endif()
+
 include(cmake/FindACE.cmake)
 include(cmake/FindMySQL.cmake)
 include(cmake/FindOpenSSL.cmake)
diff --git a/cmake/FindPCHSupport.cmake b/cmake/FindPCHSupport.cmake
index 4874808a0f9..d96a287e1a3 100644
--- a/cmake/FindPCHSupport.cmake
+++ b/cmake/FindPCHSupport.cmake
@@ -281,11 +281,11 @@ MACRO(ADD_NATIVE_PRECOMPILED_HEADER _targetName _input)
         SET(oldProps "")
     endif(${oldProps} MATCHES NOTFOUND)
 
-    SET(newProperties "${oldProps} /Yu\"${_input}\" /FI\"${_input}\"")
+    SET(newProperties "${oldProps} /Yu\"${_input}.h\" /FI\"${_input}.h\"")
     SET_TARGET_PROPERTIES(${_targetName} PROPERTIES COMPILE_FLAGS "${newProperties}")
 
     #also inlude ${oldProps} to have the same compile options
-    SET_SOURCE_FILES_PROPERTIES(${${_targetName}_pch} PROPERTIES COMPILE_FLAGS "${oldProps} /Yc\"${_input}\"")
+    SET_SOURCE_FILES_PROPERTIES(${_input}.cpp PROPERTIES COMPILE_FLAGS "${oldProps} /Yc\"${_input}.h\"")
 
     else(CMAKE_GENERATOR MATCHES Visual*)
 
diff --git a/externals/ace/CMakeLists.txt b/externals/ace/CMakeLists.txt
index fe2a2488d9f..db0dc7cdfee 100644
--- a/externals/ace/CMakeLists.txt
+++ b/externals/ace/CMakeLists.txt
@@ -8,17 +8,330 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-file(GLOB sources *.cpp)
-
+# NOTE: Do not use glob here, it would include files we don't want
 set(ace_STAT_SRCS
-  ${sources}
+  PrecompiledHeaders/WinAcePCH.cpp
+  ACE.cpp
+  ACE_crc32.cpp
+  ACE_crc_ccitt.cpp
+  ace_wchar.cpp
+  Activation_Queue.cpp
+  Active_Map_Manager.cpp
+  Addr.cpp
+  Argv_Type_Converter.cpp
+  Assert.cpp
+  Asynch_IO.cpp
+  Asynch_IO_Impl.cpp
+  Asynch_Pseudo_Task.cpp
+  ATM_Acceptor.cpp
+  ATM_Addr.cpp
+  ATM_Connector.cpp
+  ATM_Params.cpp
+  ATM_QoS.cpp
+  ATM_Stream.cpp
+  Atomic_Op.cpp
+  Atomic_Op_Sparc.c
+  Auto_Event.cpp
+  Barrier.cpp
+  Base_Thread_Adapter.cpp
+  Based_Pointer_Repository.cpp
+  Basic_Stats.cpp
+  Basic_Types.cpp
+  Capabilities.cpp
+  CDR_Base.cpp
+  CDR_Size.cpp
+  CDR_Stream.cpp
+  Cleanup.cpp
+  Codecs.cpp
+  Codeset_IBM1047.cpp
+  Codeset_Registry.cpp
+  Codeset_Registry_db.cpp
+  Condition_Recursive_Thread_Mutex.cpp
+  Condition_Thread_Mutex.cpp
+  Configuration.cpp
+  Configuration_Import_Export.cpp
+  Connection_Recycling_Strategy.cpp
+  Containers.cpp
+  Copy_Disabled.cpp
+  Countdown_Time.cpp
+  Date_Time.cpp
+  DEV.cpp
+  DEV_Addr.cpp
+  DEV_Connector.cpp
+  DEV_IO.cpp
+  Dev_Poll_Reactor.cpp
+  Dirent.cpp
+  Dirent_Selector.cpp
+  DLL.cpp
+  DLL_Manager.cpp
+  Dump.cpp
+  Dynamic.cpp
+  Dynamic_Message_Strategy.cpp
+  Dynamic_Service_Base.cpp
+  Dynamic_Service_Dependency.cpp
+  Encoding_Converter.cpp
+  Encoding_Converter_Factory.cpp
+  Event.cpp
+  Event_Handler.cpp
+  FIFO.cpp
+  FIFO_Recv.cpp
+  FIFO_Recv_Msg.cpp
+  FIFO_Send.cpp
+  FIFO_Send_Msg.cpp
+  FILE.cpp
+  FILE_Addr.cpp
+  FILE_Connector.cpp
+  FILE_IO.cpp
+  File_Lock.cpp
+  Filecache.cpp
+  Flag_Manip.cpp
+  Framework_Component.cpp
+  Functor.cpp
+  Functor_String.cpp
+  Get_Opt.cpp
+  gethrtime.cpp
+  Handle_Ops.cpp
+  Handle_Set.cpp
+  Hashable.cpp
+  High_Res_Timer.cpp
+  ICMP_Socket.cpp
+  INET_Addr.cpp
+  Init_ACE.cpp
+  IO_Cntl_Msg.cpp
+  IO_SAP.cpp
+  IOStream.cpp
+  IPC_SAP.cpp
+  Lib_Find.cpp
+  Local_Memory_Pool.cpp
+  Local_Name_Space.cpp
+  Local_Tokens.cpp
+  Lock.cpp
+  Log_Msg.cpp
+  Log_Msg_Backend.cpp
+  Log_Msg_Callback.cpp
+  Log_Msg_IPC.cpp
+  Log_Msg_NT_Event_Log.cpp
+  Log_Msg_UNIX_Syslog.cpp
+  Log_Record.cpp
+  Logging_Strategy.cpp
+  LSOCK.cpp
+  LSOCK_Acceptor.cpp
+  LSOCK_CODgram.cpp
+  LSOCK_Connector.cpp
+  LSOCK_Dgram.cpp
+  LSOCK_Stream.cpp
+  Malloc.cpp
+  Malloc_Allocator.cpp
+  Manual_Event.cpp
+  MEM_Acceptor.cpp
+  MEM_Addr.cpp
+  MEM_Connector.cpp
+  MEM_IO.cpp
+  Mem_Map.cpp
+  MEM_SAP.cpp
+  MEM_Stream.cpp
+  Message_Block.cpp
+  Message_Queue.cpp
+  Message_Queue_NT.cpp
+  Message_Queue_Vx.cpp
+  Method_Request.cpp
+  MMAP_Memory_Pool.cpp
+  Monitor_Admin.cpp
+  Monitor_Admin_Manager.cpp
+  Monitor_Base.cpp
+  Monitor_Control_Action.cpp
+  Monitor_Control_Types.cpp
+  Monitor_Point_Registry.cpp
+  Monitor_Size.cpp
+  Msg_WFMO_Reactor.cpp
+  Multihomed_INET_Addr.cpp
+  Mutex.cpp
+  Name_Proxy.cpp
+  Name_Request_Reply.cpp
+  Name_Space.cpp
+  Naming_Context.cpp
+  Netlink_Addr.cpp
+  Notification_Queue.cpp
+  Notification_Strategy.cpp
+  NT_Service.cpp
+  Obchunk.cpp
+  Object_Manager.cpp
+  Object_Manager_Base.cpp
+  OS_Errno.cpp
+  OS_Log_Msg_Attributes.cpp
+  OS_main.cpp
+  OS_NS_arpa_inet.cpp
+  OS_NS_ctype.cpp
+  OS_NS_dirent.cpp
+  OS_NS_dlfcn.cpp
+  OS_NS_errno.cpp
+  OS_NS_fcntl.cpp
+  OS_NS_math.cpp
+  OS_NS_netdb.cpp
+  OS_NS_poll.cpp
+  OS_NS_pwd.cpp
+  OS_NS_regex.cpp
+  OS_NS_signal.cpp
+  OS_NS_stdio.cpp
+  OS_NS_stdlib.cpp
+  OS_NS_string.cpp
+  OS_NS_strings.cpp
+  OS_NS_stropts.cpp
+  OS_NS_sys_mman.cpp
+  OS_NS_sys_msg.cpp
+  OS_NS_sys_resource.cpp
+  OS_NS_sys_select.cpp
+  OS_NS_sys_sendfile.cpp
+  OS_NS_sys_shm.cpp
+  OS_NS_sys_socket.cpp
+  OS_NS_sys_stat.cpp
+  OS_NS_sys_time.cpp
+  OS_NS_sys_uio.cpp
+  OS_NS_sys_utsname.cpp
+  OS_NS_sys_wait.cpp
+  OS_NS_Thread.cpp
+  OS_NS_time.cpp
+  OS_NS_unistd.cpp
+  OS_NS_wchar.cpp
+  OS_QoS.cpp
+  OS_Thread_Adapter.cpp
+  OS_TLI.cpp
+  Pagefile_Memory_Pool.cpp
+  Parse_Node.cpp
+  PI_Malloc.cpp
+  Ping_Socket.cpp
+  Pipe.cpp
+  POSIX_Asynch_IO.cpp
+  POSIX_CB_Proactor.cpp
+  POSIX_Proactor.cpp
+  Priority_Reactor.cpp
+  Proactor.cpp
+  Proactor_Impl.cpp
+  Process.cpp
+  Process_Manager.cpp
+  Process_Mutex.cpp
+  Process_Semaphore.cpp
+  Profile_Timer.cpp
+  Reactor.cpp
+  Reactor_Impl.cpp
+  Reactor_Notification_Strategy.cpp
+  Reactor_Timer_Interface.cpp
+  Read_Buffer.cpp
+  Recursive_Thread_Mutex.cpp
+  Recyclable.cpp
+  Registry.cpp
+  Registry_Name_Space.cpp
+  Remote_Name_Space.cpp
+  Remote_Tokens.cpp
+  Rtems_init.c
+  RW_Mutex.cpp
+  RW_Process_Mutex.cpp
+  RW_Thread_Mutex.cpp
+  Sample_History.cpp
+  Sbrk_Memory_Pool.cpp
+  Sched_Params.cpp
+  Select_Reactor_Base.cpp
+  Semaphore.cpp
+  Service_Config.cpp
+  Service_Gestalt.cpp
+  Service_Manager.cpp
+  Service_Object.cpp
+  Service_Repository.cpp
+  Service_Types.cpp
+  Shared_Memory.cpp
+  Shared_Memory_MM.cpp
+  Shared_Memory_Pool.cpp
+  Shared_Memory_SV.cpp
+  Shared_Object.cpp
+  Sig_Adapter.cpp
+  Sig_Handler.cpp
+  Signal.cpp
+  SOCK.cpp
+  SOCK_Acceptor.cpp
+  SOCK_CODgram.cpp
+  Sock_Connect.cpp
+  SOCK_Connector.cpp
+  SOCK_Dgram.cpp
+  SOCK_Dgram_Bcast.cpp
+  SOCK_Dgram_Mcast.cpp
+  SOCK_IO.cpp
+  SOCK_Netlink.cpp
+  SOCK_SEQPACK_Acceptor.cpp
+  SOCK_SEQPACK_Association.cpp
+  SOCK_SEQPACK_Connector.cpp
+  SOCK_Stream.cpp
+  SPIPE.cpp
+  SPIPE_Acceptor.cpp
+  SPIPE_Addr.cpp
+  SPIPE_Connector.cpp
+  SPIPE_Stream.cpp
+  SString.cpp
+  Stack_Trace.cpp
+  Stats.cpp
+  String_Base_Const.cpp
+  SUN_Proactor.cpp
+  SV_Message.cpp
+  SV_Message_Queue.cpp
+  SV_Semaphore_Complex.cpp
+  SV_Semaphore_Simple.cpp
+  SV_Shared_Memory.cpp
+  Svc_Conf_Lexer.cpp
+  Svc_Conf_y.cpp
+  Synch_Options.cpp
+  System_Time.cpp
+  Task.cpp
+  Thread.cpp
+  Thread_Adapter.cpp
+  Thread_Control.cpp
+  Thread_Exit.cpp
+  Thread_Hook.cpp
+  Thread_Manager.cpp
+  Thread_Mutex.cpp
+  Thread_Semaphore.cpp
+  Throughput_Stats.cpp
+  Time_Value.cpp
+  Timeprobe.cpp
+  TLI.cpp
+  TLI_Acceptor.cpp
+  TLI_Connector.cpp
+  TLI_Stream.cpp
+  Token.cpp
+  Token_Collection.cpp
+  Token_Invariants.cpp
+  Token_Manager.cpp
+  Token_Request_Reply.cpp
+  TP_Reactor.cpp
+  Trace.cpp
+  TSS_Adapter.cpp
+  TTY_IO.cpp
+  UNIX_Addr.cpp
+  UPIPE_Acceptor.cpp
+  UPIPE_Connector.cpp
+  UPIPE_Stream.cpp
+  UTF16_Encoding_Converter.cpp
+  UTF32_Encoding_Converter.cpp
+  UTF8_Encoding_Converter.cpp
+  UUID.cpp
+  WFMO_Reactor.cpp
+  WIN32_Asynch_IO.cpp
+  WIN32_Proactor.cpp
+  XML_Svc_Conf.cpp
+  XTI_ATM_Mcast.cpp
 )
 
 include_directories(
   ${CMAKE_SOURCE_DIR}/externals
+  ${CMAKE_SOURCE_DIR}/externals/ace/PrecompiledHeaders
   ${CMAKE_SOURCE_DIR}/externals/zlib
 )
 
+# Needed for PCH support
+set_source_files_properties(Atomic_Op_Sparc.c Rtems_init.c PROPERTIES LANGUAGE CXX)
+
 add_definitions(-DACE_BUILD_DLL)
 
-add_library(ace STATIC ${ace_STAT_SRCS})
+add_library(ace SHARED ${ace_STAT_SRCS})
+
+if(DO_PCH)
+  add_native_precompiled_header(ace ${CMAKE_SOURCE_DIR}/externals/ace/PrecompiledHeaders/WinAcePCH)
+endif()
\ No newline at end of file
diff --git a/src/server/authserver/CMakeLists.txt b/src/server/authserver/CMakeLists.txt
index e498673bf3a..956010da987 100644
--- a/src/server/authserver/CMakeLists.txt
+++ b/src/server/authserver/CMakeLists.txt
@@ -44,7 +44,9 @@ add_executable(authserver
 
 add_dependencies(authserver revision.h)
 
-add_definitions(-D_TRINITY_REALM_CONFIG='"${CONF_DIR}/authserver.conf"')
+if(NOT WIN32)
+  add_definitions(-D_TRINITY_REALM_CONFIG='"${CONF_DIR}/authserver.conf"')
+endif()
 
 set(authserver_LINK_FLAGS "-pthread ${authserver_LINK_FLAGS}")
 
@@ -54,6 +56,18 @@ endif()
 
 set_target_properties(authserver PROPERTIES LINK_FLAGS "${authserver_LINK_FLAGS}")
 
+if(WIN32)
+target_link_libraries(
+  authserver
+  shared
+  trinitydatabase
+  trinityauth
+  trinityconfig
+  ${MYSQL_LIBRARY}
+  ${OPENSSL_LIBRARIES}
+  ${OPENSSL_EXTRA_LIBRARIES}
+)
+else()
 target_link_libraries(
   authserver
   shared
@@ -64,7 +78,7 @@ target_link_libraries(
   ${OPENSSL_LIBRARIES}
   ${OSX_LIBS}
 )
-
+endif()
 ########### install files ###############
 
 install(TARGETS authserver DESTINATION bin)
diff --git a/src/server/game/CMakeLists.txt b/src/server/game/CMakeLists.txt
index d2aa20fc6cc..f27d4df7d50 100644
--- a/src/server/game/CMakeLists.txt
+++ b/src/server/game/CMakeLists.txt
@@ -11,7 +11,7 @@
 ######## game ########
 
 # Enable precompiled headers when using the GCC compiler.
-if(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX)
+if(DO_PCH)
   include_directories(${CMAKE_CURRENT_BINARY_DIR})
 endif()
 
@@ -279,11 +279,22 @@ if(NOT DO_SCRIPTS)
   message("-- Added basic scriptAI-engines to GAME library")
 endif()
 
+# Add gamePCH.cpp to project on Windows
+if(MSVC)
+  set(game_STAT_SRCS
+    PrecompiledHeaders/gamePCH.cpp
+    ${game_STAT_SRCS})
+endif()
+
 add_library(game STATIC ${game_STAT_SRCS})
 
 add_dependencies(game revision.h)
 
 # Generate precompiled header
-if(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX)
-  add_precompiled_header(game ${CMAKE_SOURCE_DIR}/src/server/game/PrecompiledHeaders/NixCorePCH.h)
+if(DO_PCH)
+  if(CMAKE_COMPILER_IS_GNUCXX)
+    add_precompiled_header(game ${CMAKE_SOURCE_DIR}/src/server/game/PrecompiledHeaders/gamePCH.h)
+  elseif(MSVC)
+    add_native_precompiled_header(game ${CMAKE_SOURCE_DIR}/src/server/game/PrecompiledHeaders/gamePCH)
+  endif()
 endif()
diff --git a/src/server/game/PrecompiledHeaders/NixCorePCH.cpp b/src/server/game/PrecompiledHeaders/NixCorePCH.cpp
deleted file mode 100644
index e3b0613cafd..00000000000
--- a/src/server/game/PrecompiledHeaders/NixCorePCH.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "NixCorePCH.h"
diff --git a/src/server/game/PrecompiledHeaders/NixCorePCH.h b/src/server/game/PrecompiledHeaders/NixCorePCH.h
deleted file mode 100644
index dd56e3fc16c..00000000000
--- a/src/server/game/PrecompiledHeaders/NixCorePCH.h
+++ /dev/null
@@ -1,12 +0,0 @@
-//add here most rarely modified headers to speed up debug build compilation
-#include "WorldSocket.h"                                    // must be first to make ACE happy with ACE includes in it
-#include "Common.h"
-
-#include "MapManager.h"
-#include "Logging/Log.h"
-#include "ObjectAccessor.h"
-#include "ObjectDefines.h"
-#include "SQLStorage.h"
-#include "Opcodes.h"
-#include "SharedDefines.h"
-#include "ObjectMgr.h"
diff --git a/src/server/game/PrecompiledHeaders/WinCorePCH.cpp b/src/server/game/PrecompiledHeaders/WinCorePCH.cpp
deleted file mode 100644
index 240d73fa2c5..00000000000
--- a/src/server/game/PrecompiledHeaders/WinCorePCH.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "WinCorePCH.h"
diff --git a/src/server/game/PrecompiledHeaders/WinCorePCH.h b/src/server/game/PrecompiledHeaders/WinCorePCH.h
deleted file mode 100644
index e94a664b155..00000000000
--- a/src/server/game/PrecompiledHeaders/WinCorePCH.h
+++ /dev/null
@@ -1,14 +0,0 @@
-//add here most rarely modified headers to speed up debug build compilation
-#include "..\Server\WorldSocket.h"                                    // must be first to make ACE happy with ACE includes in it
-#include "..\..\shared\Common.h"
-
-#include "..\Maps\MapManager.h"
-#include "..\..\shared\Logging\Log.h"
-#include "..\Globals\ObjectAccessor.h"
-#include "..\Entities\Object\ObjectDefines.h"
-#include "..\..\shared\Database/SQLStorage.h"
-#include "..\Protocol\Opcodes.h"
-#include "..\Miscellaneous\SharedDefines.h"
-#include "..\Globals\ObjectMgr.h"
-
-#include "ScriptPCH.h"
\ No newline at end of file
diff --git a/src/server/game/PrecompiledHeaders/gamePCH.cpp b/src/server/game/PrecompiledHeaders/gamePCH.cpp
new file mode 100644
index 00000000000..11e501ec7f2
--- /dev/null
+++ b/src/server/game/PrecompiledHeaders/gamePCH.cpp
@@ -0,0 +1 @@
+#include "gamePCH.h"
diff --git a/src/server/game/PrecompiledHeaders/gamePCH.h b/src/server/game/PrecompiledHeaders/gamePCH.h
new file mode 100644
index 00000000000..dd56e3fc16c
--- /dev/null
+++ b/src/server/game/PrecompiledHeaders/gamePCH.h
@@ -0,0 +1,12 @@
+//add here most rarely modified headers to speed up debug build compilation
+#include "WorldSocket.h"                                    // must be first to make ACE happy with ACE includes in it
+#include "Common.h"
+
+#include "MapManager.h"
+#include "Logging/Log.h"
+#include "ObjectAccessor.h"
+#include "ObjectDefines.h"
+#include "SQLStorage.h"
+#include "Opcodes.h"
+#include "SharedDefines.h"
+#include "ObjectMgr.h"
diff --git a/src/server/scripts/CMakeLists.txt b/src/server/scripts/CMakeLists.txt
index 151e843fa96..1c55955c777 100644
--- a/src/server/scripts/CMakeLists.txt
+++ b/src/server/scripts/CMakeLists.txt
@@ -16,15 +16,13 @@ file(GLOB_RECURSE scripts_world World/*.cpp)
 file(GLOB_RECURSE scripts_examples Examples/*.cpp)
 
 # Enable precompiled headers when using the GCC compiler.
-if(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX)
+if(DO_PCH)
   include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
   )
 endif()
 
 set(scripts_STAT_SRCS
-  ../game/PrecompiledHeaders/ScriptPCH.cpp
-  ../game/PrecompiledHeaders/ScriptPCH.h
   ../game/AI/ScriptedAI/ScriptedEscortAI.cpp
   ../game/AI/ScriptedAI/ScriptedCreature.cpp
   ../game/AI/ScriptedAI/ScriptedFollowerAI.cpp
@@ -125,11 +123,20 @@ include_directories(
   ${MYSQL_INCLUDE_DIR}
 )
 
+# Add ScriptPCH.cpp to project on Windows
+if(MSVC)
+set(scripts_STAT_SRCS
+    ../game/PrecompiledHeaders/ScriptPCH.cpp
+    ${scripts_STAT_SRCS})
+endif()
+
 add_library(scripts STATIC ${scripts_STAT_SRCS})
 
 # Generate precompiled header
-if(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX)
-  add_precompiled_header(scripts
-    ${CMAKE_SOURCE_DIR}/src/server/game/PrecompiledHeaders/ScriptPCH.h
-  )
+if(DO_PCH)
+  if(CMAKE_COMPILER_IS_GNUCXX)
+    add_precompiled_header(scripts ${CMAKE_SOURCE_DIR}/src/server/game/PrecompiledHeaders/ScriptPCH.h)
+  elseif(MSVC)
+    add_native_precompiled_header(scripts ${CMAKE_SOURCE_DIR}/src/server/game/PrecompiledHeaders/ScriptPCH)
+  endif()
 endif()
diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt
index b3ededd8c62..2c474e61693 100644
--- a/src/server/shared/CMakeLists.txt
+++ b/src/server/shared/CMakeLists.txt
@@ -20,6 +20,15 @@ set(shared_STAT_SRCS
   Common.cpp
 )
 
+# Windows specific files
+if(WIN32)
+  set(shared_STAT_SRCS
+    ${shared_STAT_SRCS}
+    Debugging/WheatyExceptionReport.cpp
+    Utilities/ServiceWin32.cpp
+  )
+endif()
+
 include_directories(
   ${ACE_INCLUDE_DIR}
   ${CMAKE_BINARY_DIR}
@@ -43,10 +52,17 @@ include_directories(
 
 add_library(shared STATIC ${shared_STAT_SRCS})
 
+if(WIN32)
+target_link_libraries(
+  shared
+  ace
+)
+else()
 target_link_libraries(
   shared
   ${ACE_LIBRARY}
 )
+endif()
 
 ########### trinityconfig ###############
 
diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt
index 83fb4283877..823cc720e56 100644
--- a/src/server/worldserver/CMakeLists.txt
+++ b/src/server/worldserver/CMakeLists.txt
@@ -118,9 +118,9 @@ include_directories(
 set(worldserver_LINK_FLAGS "")
 
 add_executable(worldserver ${worldserver_SRCS})
-add_definitions(
-  -D_TRINITY_CORE_CONFIG='"${CONF_DIR}/worldserver.conf"'
-)
+if(NOT WIN32)
+  add_definitions(-D_TRINITY_CORE_CONFIG='"${CONF_DIR}/worldserver.conf"')
+endif()
 
 add_dependencies(worldserver revision.h)
 
@@ -152,11 +152,11 @@ if(WIN32)
     trinityconfig
     collision
     g3dlib
-    jemalloc
     ${SCRIPT_LIB}
-    ${ACE_LIBRARY}
+    ace
     ${MYSQL_LIBRARY}
     ${OPENSSL_LIBRARIES}
+    ${OPENSSL_EXTRA_LIBRARIES}
   )
 else()
   target_link_libraries(
-- 
cgit v1.2.3


From d8bdc9d22fb3b49e127ab419a5283ebb054e943c Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Wed, 30 Jun 2010 13:41:04 +0200
Subject: Violet Hold: Don't make sinclari unselectable when event starts
 Thanks to dex for pointing it

--HG--
branch : trunk
---
 src/server/scripts/Northrend/VioletHold/violet_hold.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src')

diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp
index 30736b9fc4e..982a15a4172 100644
--- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp
+++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp
@@ -296,7 +296,6 @@ struct npc_sinclariAI : public ScriptedAI
                 switch(uiPhase)
                 {
                     case 1:
-                        me->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NOT_SELECTABLE);
                         DoScriptText(SAY_SINCLARI_1, me);
                         uiTimer = 4000;
                         uiPhase = 2;
-- 
cgit v1.2.3


From 1740bace3a8194a9ad669d3b52a482381679b461 Mon Sep 17 00:00:00 2001
From: Shauren 
Date: Wed, 30 Jun 2010 14:48:38 +0200
Subject: Initialize a pointer with NULL value to prevent possible crashes.

--HG--
branch : trunk
---
 src/server/game/Maps/Map.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp
index 0387fbe8116..476d98afc66 100644
--- a/src/server/game/Maps/Map.cpp
+++ b/src/server/game/Maps/Map.cpp
@@ -3597,7 +3597,7 @@ void Map::ScriptsProcess()
                 }
 
                 // bitmask: 0/1=anyone/target, 0/2=with distance dependent
-                Player* pTarget;
+                Player* pTarget = NULL;
                 if (step.script->datalong2 & 1)
                 {
                     if (!target)
-- 
cgit v1.2.3


From f8bb7afa9817411beda1f2492d18c61679e9a5f9 Mon Sep 17 00:00:00 2001
From: click 
Date: Wed, 30 Jun 2010 16:51:37 +0200
Subject: And even more CMake-specific cleanups (mutes most of the
 "non-harmful" warnings - VS is just trying to be too friendly/noisy at times)

--HG--
branch : trunk
---
 CMakeLists.txt                           | 61 ++++++++++++++++++++++----------
 externals/zlib/CMakeLists.txt            | 19 +++++++---
 src/server/authserver/CMakeLists.txt     | 47 ++++++++++++------------
 src/server/worldserver/CMakeLists.txt    | 11 +++---
 src/tools/map_extractor/CMakeLists.txt   |  4 ++-
 src/tools/vmap3_assembler/CMakeLists.txt |  4 ++-
 src/tools/vmap3_extractor/CMakeLists.txt |  4 ++-
 7 files changed, 96 insertions(+), 54 deletions(-)

(limited to 'src')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8b56a8906b4..ed74400e808 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,6 +57,7 @@ if( NOT CMAKE_BUILD_TYPE )
   set(CMAKE_BUILD_TYPE "Release")
 endif()
 
+if( UNIX )
 configure_file(
   "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
   "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
@@ -66,6 +67,7 @@ configure_file(
 add_custom_target(uninstall
   "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
 )
+endif()
 
 option(DO_AUTHSERVER "Build authserver" 1)
 option(DO_WORLDSERVER "Build worldserver" 1)
@@ -100,27 +102,49 @@ set(GENREV_SRC
 # Handle debugmode compiles (this will require further work for proper WIN32-setups)
 if( DO_DEBUG )
   set(CMAKE_BUILD_TYPE Debug)
+
   add_executable(genrev
     ${GENREV_SRC}
   )
 
-  add_custom_target("revision.h" ALL
-    COMMAND "${CMAKE_BINARY_DIR}/genrev"
-    ${CMAKE_SOURCE_DIR}
-    WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
-    DEPENDS genrev
-  )
+  if( CMAKE_GENERATOR MATCHES "Visual Studio" )
+    add_custom_target("revision.h" ALL
+      COMMAND "${CMAKE_CURRENT_BINARY_DIR}/$(ConfigurationName)/genrev"
+      ${CMAKE_SOURCE_DIR}
+      WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
+      DEPENDS genrev
+    )
+  else()
+    add_custom_target("revision.h" ALL
+      COMMAND "${CMAKE_CURRENT_BINARY_DIR}/genrev"
+      ${CMAKE_SOURCE_DIR}
+      WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
+      DEPENDS genrev
+    )
+  endif()
+
 else()
+
   add_executable(genrev
     ${GENREV_SRC}
   )
 
-  add_custom_target("revision.h" ALL
-    COMMAND "${CMAKE_BINARY_DIR}/genrev"
-    ${CMAKE_SOURCE_DIR}
-    WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
-    DEPENDS genrev
-  )
+  if( CMAKE_GENERATOR MATCHES "Visual Studio" )
+    add_custom_target("revision.h" ALL
+      COMMAND "${CMAKE_CURRENT_BINARY_DIR}/$(ConfigurationName)/genrev"
+      ${CMAKE_SOURCE_DIR}
+      WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
+      DEPENDS genrev
+    )
+  else()
+    add_custom_target("revision.h" ALL
+      COMMAND "${CMAKE_CURRENT_BINARY_DIR}/genrev"
+      ${CMAKE_SOURCE_DIR}
+      WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
+      DEPENDS genrev
+    )
+  endif()
+
 endif()
 
 execute_process(
@@ -209,12 +233,13 @@ else()
   elseif( WIN32 )
     # Disable warnings in Visual Studio 8 and above
     if(MSVC AND NOT CMAKE_GENERATOR MATCHES "Visual Studio 7")
-      set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /wd4996")
-      set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /wd4996")
-      set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /wd4996")
-      set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /wd4996")
-      set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} /wd4996")
-      set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /wd4996")
+      set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /wd4996 /wd4355 /wd4244 /wd4267")
+      set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /wd4996 /wd4355 /wd4244 /wd4985 /wd4267")
+      set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /wd4996 /wd4355 /wd4244 /wd4985 /wd4267")
+
+      set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /wd4996 /wd4355 /wd4244 /wd4985 /wd4267")
+      set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} /wd4996 /wd4355 /wd4244 /wd4985 /wd4267")
+      set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /wd4996 /wd4355 /wd4244 /wd4985 /wd4267")
     endif()
     add_definitions(-D_CRT_SECURE_NO_WARNINGS)
   endif()
diff --git a/externals/zlib/CMakeLists.txt b/externals/zlib/CMakeLists.txt
index bd194531bb5..e53fae3053d 100644
--- a/externals/zlib/CMakeLists.txt
+++ b/externals/zlib/CMakeLists.txt
@@ -8,15 +8,24 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-file(GLOB sources *.c)
-file(GLOB headers *.h)
 
 SET(zlib_STAT_SRCS
-  ${sources}
-  )
+  adler32.c                                                                                                                                           
+  compress.c                                                                                                                                          
+  crc32.c                                                                                                                                             
+  deflate.c                                                                                                                                           
+  example.c                                                                                                                                           
+  infback.c                                                                                                                                           
+  inffast.c                                                                                                                                           
+  inflate.c                                                                                                                                           
+  inftrees.c                                                                                                                                          
+  trees.c                                                                                                                                             
+  uncompr.c                                                                                                                                           
+  zutil.c   
+)
 
 include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}
-  )
+)
 
 add_library(zlib STATIC ${zlib_STAT_SRCS})
diff --git a/src/server/authserver/CMakeLists.txt b/src/server/authserver/CMakeLists.txt
index 956010da987..e97bcfbea88 100644
--- a/src/server/authserver/CMakeLists.txt
+++ b/src/server/authserver/CMakeLists.txt
@@ -57,29 +57,30 @@ endif()
 set_target_properties(authserver PROPERTIES LINK_FLAGS "${authserver_LINK_FLAGS}")
 
 if(WIN32)
-target_link_libraries(
-  authserver
-  shared
-  trinitydatabase
-  trinityauth
-  trinityconfig
-  ${MYSQL_LIBRARY}
-  ${OPENSSL_LIBRARIES}
-  ${OPENSSL_EXTRA_LIBRARIES}
-)
+  target_link_libraries(
+    authserver
+    shared
+    trinitydatabase
+    trinityauth
+    trinityconfig
+    ${MYSQL_LIBRARY}
+    ${OPENSSL_LIBRARIES}
+    ${OPENSSL_EXTRA_LIBRARIES}
+  )
 else()
-target_link_libraries(
-  authserver
-  shared
-  trinitydatabase
-  trinityauth
-  trinityconfig
-  ${MYSQL_LIBRARY}
-  ${OPENSSL_LIBRARIES}
-  ${OSX_LIBS}
-)
+  target_link_libraries(
+    authserver
+    shared
+    trinitydatabase
+    trinityauth
+    trinityconfig
+    ${MYSQL_LIBRARY}
+    ${OPENSSL_LIBRARIES}
+    ${OSX_LIBS}
+  )
 endif()
-########### install files ###############
 
-install(TARGETS authserver DESTINATION bin)
-install(FILES  authserver.conf.dist DESTINATION etc)
+if( UNIX )
+  install(TARGETS authserver DESTINATION bin)
+  install(FILES  authserver.conf.dist DESTINATION etc)
+endif()
diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt
index 823cc720e56..17bdc418884 100644
--- a/src/server/worldserver/CMakeLists.txt
+++ b/src/server/worldserver/CMakeLists.txt
@@ -140,8 +140,9 @@ if(DO_SCRIPTS)
 else(DO_SCRIPTS)
   set(SCRIPT_LIB "")
 endif(DO_SCRIPTS)
+
 if(WIN32)
- target_link_libraries(
+  target_link_libraries(
     worldserver
     game
     shared
@@ -181,7 +182,7 @@ else()
   )
 endif()
 
-########### install files ###############
-
-install(TARGETS worldserver DESTINATION bin)
-install(FILES   worldserver.conf.dist DESTINATION etc)
+if( UNIX )
+  install(TARGETS worldserver DESTINATION bin)
+  install(FILES   worldserver.conf.dist DESTINATION etc)
+endif()
diff --git a/src/tools/map_extractor/CMakeLists.txt b/src/tools/map_extractor/CMakeLists.txt
index a18ee7cd517..cb3778c7c6a 100644
--- a/src/tools/map_extractor/CMakeLists.txt
+++ b/src/tools/map_extractor/CMakeLists.txt
@@ -33,4 +33,6 @@ else()
   )
 endif()
 
-install(TARGETS mapextractor DESTINATION bin)
+if( UNIX )
+  install(TARGETS mapextractor DESTINATION bin)
+endif()
diff --git a/src/tools/vmap3_assembler/CMakeLists.txt b/src/tools/vmap3_assembler/CMakeLists.txt
index 0b8ece2dc37..2035d3f2055 100644
--- a/src/tools/vmap3_assembler/CMakeLists.txt
+++ b/src/tools/vmap3_assembler/CMakeLists.txt
@@ -37,4 +37,6 @@ else()
   )
 endif()
 
-install(TARGETS vmap3assembler DESTINATION bin)
+if( UNIX )
+  install(TARGETS vmap3assembler DESTINATION bin)
+if()
diff --git a/src/tools/vmap3_extractor/CMakeLists.txt b/src/tools/vmap3_extractor/CMakeLists.txt
index 9dfdd545df8..62604f7ad3d 100755
--- a/src/tools/vmap3_extractor/CMakeLists.txt
+++ b/src/tools/vmap3_extractor/CMakeLists.txt
@@ -36,4 +36,6 @@ else()
   )
 endif()
 
-install(TARGETS vmap3extractor DESTINATION bin)
+if( UNIX )
+  install(TARGETS vmap3extractor DESTINATION bin)
+endif()
-- 
cgit v1.2.3


From d12b6fa6dd798d329455411eae882558504a02d9 Mon Sep 17 00:00:00 2001
From: click 
Date: Wed, 30 Jun 2010 17:14:13 +0200
Subject: Fix vmap3_assembler CmakeLists.txt - thanks m.ax for noticing the
 typo

--HG--
branch : trunk
---
 src/tools/vmap3_assembler/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/tools/vmap3_assembler/CMakeLists.txt b/src/tools/vmap3_assembler/CMakeLists.txt
index 2035d3f2055..c920571c439 100644
--- a/src/tools/vmap3_assembler/CMakeLists.txt
+++ b/src/tools/vmap3_assembler/CMakeLists.txt
@@ -39,4 +39,4 @@ endif()
 
 if( UNIX )
   install(TARGETS vmap3assembler DESTINATION bin)
-if()
+endif()
-- 
cgit v1.2.3


From 0a5a30a59229e46ace9fef1b7d5173dc5dae5333 Mon Sep 17 00:00:00 2001
From: click 
Date: Wed, 30 Jun 2010 18:46:55 +0200
Subject: Minor cleanups to accomodate CMake-usage on Windows

--HG--
branch : trunk
---
 src/server/authserver/CMakeLists.txt       | 10 ++++++----
 src/server/game/CMakeLists.txt             |  3 ++-
 src/server/game/Scripting/ScriptLoader.cpp |  4 ----
 src/server/worldserver/CMakeLists.txt      | 19 ++++++++++---------
 4 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'src')

diff --git a/src/server/authserver/CMakeLists.txt b/src/server/authserver/CMakeLists.txt
index e97bcfbea88..82b36c8ab3e 100644
--- a/src/server/authserver/CMakeLists.txt
+++ b/src/server/authserver/CMakeLists.txt
@@ -44,19 +44,21 @@ add_executable(authserver
 
 add_dependencies(authserver revision.h)
 
-if(NOT WIN32)
+if( NOT WIN32 )
   add_definitions(-D_TRINITY_REALM_CONFIG='"${CONF_DIR}/authserver.conf"')
 endif()
 
-set(authserver_LINK_FLAGS "-pthread ${authserver_LINK_FLAGS}")
+if( UNIX )
+  set(authserver_LINK_FLAGS "-pthread ${authserver_LINK_FLAGS}")
+endif()
 
-if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
+if( CMAKE_SYSTEM_NAME MATCHES "Darwin" )
   set(authserver_LINK_FLAGS "-framework Carbon ${authserver_LINK_FLAGS}")
 endif()
 
 set_target_properties(authserver PROPERTIES LINK_FLAGS "${authserver_LINK_FLAGS}")
 
-if(WIN32)
+if( WIN32 )
   target_link_libraries(
     authserver
     shared
diff --git a/src/server/game/CMakeLists.txt b/src/server/game/CMakeLists.txt
index f27d4df7d50..d1a9fac4f16 100644
--- a/src/server/game/CMakeLists.txt
+++ b/src/server/game/CMakeLists.txt
@@ -269,7 +269,8 @@ include_directories(
 )
 
 if(NOT DO_SCRIPTS)
-  set(game_STAT_SRCS ${game_STAT_SRCS}
+  set(game_STAT_SRCS
+    ${game_STAT_SRCS}
     AI/ScriptedAI/ScriptedEscortAI.cpp
     AI/ScriptedAI/ScriptedCreature.cpp
     AI/ScriptedAI/ScriptedFollowerAI.cpp
diff --git a/src/server/game/Scripting/ScriptLoader.cpp b/src/server/game/Scripting/ScriptLoader.cpp
index 7bdf7eb6e4e..cf378db2bac 100644
--- a/src/server/game/Scripting/ScriptLoader.cpp
+++ b/src/server/game/Scripting/ScriptLoader.cpp
@@ -16,10 +16,6 @@
 
 #include "ScriptPCH.h"
 
-#ifdef _WIN32
-  #define DO_SCRIPTS
-#endif
-
 #ifdef DO_SCRIPTS
 //custom
 
diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt
index 17bdc418884..e86422e2ce1 100644
--- a/src/server/worldserver/CMakeLists.txt
+++ b/src/server/worldserver/CMakeLists.txt
@@ -118,30 +118,31 @@ include_directories(
 set(worldserver_LINK_FLAGS "")
 
 add_executable(worldserver ${worldserver_SRCS})
-if(NOT WIN32)
+
+if( NOT WIN32 )
   add_definitions(-D_TRINITY_CORE_CONFIG='"${CONF_DIR}/worldserver.conf"')
 endif()
 
 add_dependencies(worldserver revision.h)
 
-set(worldserver_LINK_FLAGS
-  "-pthread ${worldserver_LINK_FLAGS}"
-)
+if( UNIX )
+  set(worldserver_LINK_FLAGS "-pthread ${worldserver_LINK_FLAGS}")
+endif()
 
-if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
+if( CMAKE_SYSTEM_NAME MATCHES "Darwin" )
   set(worldserver_LINK_FLAGS "-framework Carbon ${worldserver_LINK_FLAGS}")
   set(SCRIPT_LIB "")
 endif()
 
 set_target_properties(worldserver PROPERTIES LINK_FLAGS "${worldserver_LINK_FLAGS}")
 
-if(DO_SCRIPTS)
+if( DO_SCRIPTS )
   set(SCRIPT_LIB "scripts")
-else(DO_SCRIPTS)
+else()
   set(SCRIPT_LIB "")
-endif(DO_SCRIPTS)
+endif()
 
-if(WIN32)
+if( WIN32 )
   target_link_libraries(
     worldserver
     game
-- 
cgit v1.2.3


From fe1caeefc06870ee648b5a4c680b52b0946eeced Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Wed, 30 Jun 2010 19:02:20 +0200
Subject: Obsidian Sanctum: Many improvements & fixes, by moriquendu Closes
 issue #1278 Closes issue #2505 Finally I make some time to review & push this
 change. Thanks for the patience

--HG--
branch : trunk
---
 sql/updates/8806_spell_script_target.sql           |   5 +
 .../Northrend/ObsidianSanctum/boss_sartharion.cpp  | 553 +++++++++++++++------
 .../ObsidianSanctum/instance_obsidian_sanctum.cpp  |  36 ++
 .../Northrend/ObsidianSanctum/obsidian_sanctum.h   |  19 +
 4 files changed, 474 insertions(+), 139 deletions(-)
 create mode 100644 sql/updates/8806_spell_script_target.sql

(limited to 'src')

diff --git a/sql/updates/8806_spell_script_target.sql b/sql/updates/8806_spell_script_target.sql
new file mode 100644
index 00000000000..e84bfcc83d9
--- /dev/null
+++ b/sql/updates/8806_spell_script_target.sql
@@ -0,0 +1,5 @@
+-- Limit Flame Tsunami buff to Lava Blazes only
+DELETE FROM spell_script_target WHERE entry = 60430;
+INSERT INTO spell_script_target (entry, type, targetEntry) VALUES
+  (60430, 1, 30643),
+  (60430, 1, 31317);
diff --git a/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp
index 37dbce59c74..4992e325849 100644
--- a/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp
+++ b/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp
@@ -1,5 +1,4 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
- * Copyright (C) 2006 - 2010 TrinityCore 
+/* Copyright (C) 2009 - 2010 TrinityCore 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
@@ -53,6 +52,7 @@ enum eEnums
     SPELL_WILL_OF_SARTHARION                    = 61254,    // Sartharion's presence bolsters the resolve of the Twilight Drakes, increasing their total health by 25%. This effect also increases Sartharion's health by 25%.
     SPELL_LAVA_STRIKE                           = 57571,    // (Real spell casted should be 57578) 57571 then trigger visual missile, then summon Lava Blaze on impact(spell 57572)
     SPELL_TWILIGHT_REVENGE                      = 60639,
+    NPC_FIRE_CYCLONE                            = 30648,
 
     SPELL_PYROBUFFET                            = 56916,    // currently used for hard enrage after 15 minutes
     SPELL_PYROBUFFET_RANGE                      = 58907,    // possibly used when player get too far away from dummy creatures (2x Creature entry 30494)
@@ -101,6 +101,7 @@ enum eEnums
     SPELL_HATCH_EGGS_EFFECT                     = 58685,
     NPC_TWILIHT_WHELP                           = 31214,
     NPC_TWILIGHT_EGG                            = 30882,
+    NPC_SARTHARION_TWILIGHT_EGG                 = 31204,
 
     //Whelps
     NPC_TWILIGHT_WHELP                          = 30890,
@@ -110,7 +111,10 @@ enum eEnums
     //flame tsunami
     SPELL_FLAME_TSUNAMI                         = 57494,    // the visual dummy
     SPELL_FLAME_TSUNAMI_LEAP                    = 60241,    // SPELL_EFFECT_138 some leap effect, causing caster to move in direction
-    SPELL_FLAME_TSUNAMI_DMG_AURA                = 57492,    // periodic damage, npc has this aura
+
+    SPELL_FLAME_TSUNAMI_DMG_AURA                = 57491,    // periodic damage, npc has this aura
+    SPELL_FLAME_TSUNAMI_BUFF                    = 60430,
+    
 
     NPC_FLAME_TSUNAMI                           = 30616,    // for the flame waves
     NPC_LAVA_BLAZE                              = 30643,    // adds spawning from flame strike
@@ -132,6 +136,7 @@ struct Waypoint
 {
     float m_fX, m_fY, m_fZ;
 };
+
 struct Location
 {
     float x,y,z;
@@ -171,20 +176,22 @@ Waypoint m_aDragonCommon[MAX_WAYPOINT]=
     {3250.479, 585.827, 98.652},
     {3209.969, 566.523, 98.652}
 };
-static Location FlameRight1Spawn =     { 3197.59, 495.336, 57.8462 };
-static Location FlameRight1Direction = { 3289.28, 521.569, 55.1526 };
-static Location FlameRight2Spawn =     { 3201.94, 543.324, 56.7209 };
-static Location FlameRight2Direction = { 3288.98, 549.291, 55.1232 };
-static Location FlameLeft1Spawn =      { 3290.24, 521.725, 55.1238 };
-static Location FlameLeft1Direction =  { 3199.94, 516.891, 57.5112 };
-static Location FlameLeft2Spawn =      { 3290.33, 586.51, 55.063 };
-static Location FlameLeft2Direction =  { 3195.03, 479.135, 55.6331 };
-
-static Location AcolyteofShadron =     { 3363.92, 534.703, 97.2683 };
-static Location AcolyteofShadron2 =    { 3246.57, 551.263, 58.6164 };
-static Location AcolyteofVesperon =    { 3145.68, 520.71, 89.7 };
-static Location AcolyteofVesperon2 =   { 3246.57, 551.263, 58.6164 };
 
+static Location FlameRight1Spawn = { 3200.00, 573.211, 57.1551 };
+static Location FlameRight1Direction = { 3289.28, 573.211, 57.1551 };
+static Location FlameRight2Spawn = { 3200.00, 532.211, 57.1551 };
+static Location FlameRight2Direction = { 3289.28, 532.211, 57.1551 };
+static Location FlameRight3Spawn = { 3200.00, 491.211, 57.1551 };
+static Location FlameRight3Direction = { 3289.28, 491.211, 57.1551 };
+static Location FlameLeft1Spawn = { 3289.28, 511.711, 57.1551 };
+static Location FlameLeft1Direction = { 3200.00, 511.711, 57.1551 };
+static Location FlameLeft2Spawn = { 3289.28, 552.711, 57.1551 };
+static Location FlameLeft2Direction = { 3200.00, 552.711, 57.1551 };
+
+static Location AcolyteofShadron = { 3363.92, 534.703, 97.2683 };
+static Location AcolyteofShadron2 = { 3246.57, 551.263, 58.6164 };
+static Location AcolyteofVesperon = { 3145.68, 520.71, 89.7 };
+static Location AcolyteofVesperon2 = { 3246.57, 551.263, 58.6164 };
 Locations TwilightEggs[] =
 {
     {3219.28, 669.121 , 88.5549},
@@ -196,9 +203,12 @@ Locations TwilightEggs[] =
 };
 Locations TwilightEggsSarth[] =
 {
-    {3261.75, 539.14 , 58.6082},
-    {3257.41, 512.939 , 58.5432},
-    {3231.04, 498.281 , 58.6439}
+    {3252.73, 515.762 , 58.5501},
+    {3256.56, 521.119 , 58.6061},
+    {3255.63, 527.513 , 58.7568},
+    {3264.90, 525.865 , 58.6436},
+    {3264.26, 516.364 , 58.8011},
+    {3257.54, 502.285 , 58.2077}
 };
 
 /*######
@@ -262,8 +272,68 @@ struct boss_sartharionAI : public ScriptedAI
             me->RemoveAurasDueToSpell(SPELL_TWILIGHT_REVENGE);
 
         me->ResetLootMode();
+        me->SetHomePosition(3246.57, 551.263, 58.6164, 4.66003);
 
         achievProgress = 0;
+
+        // Drakes respawning system
+        if (pInstance)
+        {
+            Creature* pTenebron = Unit::GetCreature(*me, pInstance->GetData64(DATA_TENEBRON));
+            Creature* pShadron = Unit::GetCreature(*me, pInstance->GetData64(DATA_SHADRON));
+            Creature* pVesperon = Unit::GetCreature(*me, pInstance->GetData64(DATA_VESPERON));
+            if (pTenebron)
+            {
+                pTenebron->SetHomePosition(3239.07, 657.235, 86.8775, 4.74729);
+                if(pTenebron->isAlive())
+                {
+                    if (pTenebron->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
+                        pTenebron->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+                    pTenebron->GetMotionMaster()->MoveTargetedHome();
+                }else
+                {
+                    if(pInstance->GetData(TYPE_TENEBRON_PREKILLED) == false)
+                    {
+                        pTenebron->Respawn();
+                        pTenebron->GetMotionMaster()->MoveTargetedHome();
+                    }
+                }
+            }
+            if (pShadron)
+            {
+                pShadron->SetHomePosition(3363.06, 525.28, 98.362, 4.76475);
+                if(pShadron->isAlive())
+                {
+                    if (pShadron->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
+                        pShadron->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+                    pShadron->GetMotionMaster()->MoveTargetedHome();
+                }else
+                {
+                    if(pInstance->GetData(TYPE_SHADRON_PREKILLED) == false)
+                    {
+                        pShadron->Respawn();
+                        pShadron->GetMotionMaster()->MoveTargetedHome();
+                    }
+                }
+            }
+            if (pVesperon)
+            {
+                pVesperon->SetHomePosition(3145.68, 520.71, 89.7, 4.64258);
+                if(pVesperon->isAlive())
+                {
+                    if (pVesperon->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
+                        pVesperon->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+                    pVesperon->GetMotionMaster()->MoveTargetedHome();
+                }else
+                {
+                    if(pInstance->GetData(TYPE_VESPERON_PREKILLED) == false)
+                    {
+                        pVesperon->Respawn();
+                        pVesperon->GetMotionMaster()->MoveTargetedHome();
+                    }
+                }
+            }
+        }
     }
 
     void JustReachedHome()
@@ -272,7 +342,7 @@ struct boss_sartharionAI : public ScriptedAI
             pInstance->SetData(TYPE_SARTHARION_EVENT, NOT_STARTED);
     }
 
-    void EnterCombat(Unit* /*pWho*/)
+    void EnterCombat(Unit* pWho)
     {
         DoScriptText(SAY_SARTHARION_AGGRO,me);
         DoZoneInCombat();
@@ -284,24 +354,41 @@ struct boss_sartharionAI : public ScriptedAI
         }
     }
 
-    void JustDied(Unit* /*pKiller*/)
+    void JustDied(Unit* pKiller)
     {
         DoScriptText(SAY_SARTHARION_DEATH,me);
 
         if (pInstance)
         {
-            if (achievProgress >= 1)
-              pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_TWILIGHT_ASSIST,H_ACHIEV_TWILIGHT_ASSIST));
-            else if (achievProgress >= 2)
-              pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_TWILIGHT_DUO,H_ACHIEV_TWILIGHT_DUO));
+            Creature* pTenebron = Unit::GetCreature(*me, pInstance->GetData64(DATA_TENEBRON));
+            Creature* pShadron = Unit::GetCreature(*me, pInstance->GetData64(DATA_SHADRON));
+            Creature* pVesperon = Unit::GetCreature(*me, pInstance->GetData64(DATA_VESPERON));
+            if (pTenebron && pTenebron->isAlive())
+                pTenebron->DisappearAndDie();
+            if (pShadron && pShadron->isAlive())
+                pShadron->DisappearAndDie();
+            if (pVesperon && pVesperon->isAlive())
+                pVesperon->DisappearAndDie();
+
+            if (achievProgress == 1)
+                pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_TWILIGHT_ASSIST,H_ACHIEV_TWILIGHT_ASSIST));
+            else if (achievProgress == 2)
+            {
+                pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_TWILIGHT_ASSIST,H_ACHIEV_TWILIGHT_ASSIST));
+                pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_TWILIGHT_DUO,H_ACHIEV_TWILIGHT_DUO));
+            }
             else if (achievProgress == 3)
-              pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_TWILIGHT_ZONE,H_ACHIEV_TWILIGHT_ZONE));
-
+            {
+                pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_TWILIGHT_ASSIST,H_ACHIEV_TWILIGHT_ASSIST));
+                pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_TWILIGHT_DUO,H_ACHIEV_TWILIGHT_DUO));
+                pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_TWILIGHT_ZONE,H_ACHIEV_TWILIGHT_ZONE));
+            }
+       
             pInstance->SetData(TYPE_SARTHARION_EVENT, DONE);
         }
     }
 
-    void KilledUnit(Unit* /*pVictim*/)
+    void KilledUnit(Unit* pVictim)
     {
         DoScriptText(RAND(SAY_SARTHARION_SLAY_1,SAY_SARTHARION_SLAY_2,SAY_SARTHARION_SLAY_3), me);
     }
@@ -314,14 +401,18 @@ struct boss_sartharionAI : public ScriptedAI
             me->AddLootMode(LOOT_MODE_HARD_MODE_3);      // Add 3rd Drake loot mode
         else if (me->HasLootMode(LOOT_MODE_HARD_MODE_1)) // Has one Drake loot mode
             me->AddLootMode(LOOT_MODE_HARD_MODE_2);      // Add 2nd Drake loot mode
-        else                                                     // Has no Drake loot modes
+        else                                             // Has no Drake loot modes
             me->AddLootMode(LOOT_MODE_HARD_MODE_1);      // Add 1st Drake loot mode
     }
 
     void FetchDragons()
     {
-        if (!pInstance)
+        if(!pInstance)
             return;
+
+        me->ResetLootMode();
+        achievProgress = 0;
+
         Creature* pFetchTene = Unit::GetCreature(*me, pInstance->GetData64(DATA_TENEBRON));
         Creature* pFetchShad = Unit::GetCreature(*me, pInstance->GetData64(DATA_SHADRON));
         Creature* pFetchVesp = Unit::GetCreature(*me, pInstance->GetData64(DATA_VESPERON));
@@ -332,6 +423,11 @@ struct boss_sartharionAI : public ScriptedAI
         if (pFetchTene && pFetchTene->isAlive() && !pFetchTene->getVictim())
         {
             bCanUseWill = true;
+            if(!pFetchTene->isInCombat())
+            {
+                AddDrakeLootMode();
+                achievProgress++;
+            }
             pFetchTene->GetMotionMaster()->MovePoint(POINT_ID_INIT, m_aTene[0].m_fX, m_aTene[0].m_fY, m_aTene[0].m_fZ);
 
             if (!pFetchTene->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
@@ -341,6 +437,11 @@ struct boss_sartharionAI : public ScriptedAI
         if (pFetchShad && pFetchShad->isAlive() && !pFetchShad->getVictim())
         {
             bCanUseWill = true;
+            if(!pFetchShad->isInCombat())
+            {
+                AddDrakeLootMode();
+                achievProgress++;
+            }
             pFetchShad->GetMotionMaster()->MovePoint(POINT_ID_INIT, m_aShad[0].m_fX, m_aShad[0].m_fY, m_aShad[0].m_fZ);
 
             if (!pFetchShad->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
@@ -350,6 +451,11 @@ struct boss_sartharionAI : public ScriptedAI
         if (pFetchVesp && pFetchVesp->isAlive() && !pFetchVesp->getVictim())
         {
             bCanUseWill = true;
+            if(!pFetchVesp->isInCombat())
+            {
+                AddDrakeLootMode();
+                achievProgress++;
+            }
             pFetchVesp->GetMotionMaster()->MovePoint(POINT_ID_INIT, m_aVesp[0].m_fX, m_aVesp[0].m_fY, m_aVesp[0].m_fZ);
 
             if (!pFetchVesp->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
@@ -375,22 +481,22 @@ struct boss_sartharionAI : public ScriptedAI
                         pTemp->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
 
                     int32 iTextId = 0;
-                    AddDrakeLootMode();
-
-                    achievProgress++;
 
                     switch(pTemp->GetEntry())
                     {
                         case NPC_TENEBRON:
                             iTextId = SAY_SARTHARION_CALL_TENEBRON;
+                            pTemp->AddAura(SPELL_POWER_OF_TENEBRON, pTemp);
                             pTemp->GetMotionMaster()->MovePoint(POINT_ID_LAND, m_aTene[1].m_fX, m_aTene[1].m_fY, m_aTene[1].m_fZ);
                             break;
                         case NPC_SHADRON:
                             iTextId = SAY_SARTHARION_CALL_SHADRON;
+                            pTemp->AddAura(SPELL_POWER_OF_SHADRON, pTemp);
                             pTemp->GetMotionMaster()->MovePoint(POINT_ID_LAND, m_aShad[1].m_fX, m_aShad[1].m_fY, m_aShad[1].m_fZ);
                             break;
                         case NPC_VESPERON:
                             iTextId = SAY_SARTHARION_CALL_VESPERON;
+                            pTemp->AddAura(SPELL_POWER_OF_VESPERON, pTemp);
                             pTemp->GetMotionMaster()->MovePoint(POINT_ID_LAND, m_aVesp[1].m_fX, m_aVesp[1].m_fY, m_aVesp[1].m_fZ);
                             break;
                     }
@@ -415,6 +521,27 @@ struct boss_sartharionAI : public ScriptedAI
             }
     }
 
+    // Selects a random Fire Cyclone and makes it cast Lava Strike.
+    // FIXME: Frequency of the casts reduced to compensate 100% chance of spawning a Lava Blaze add
+    void CastLavaStrikeOnTarget(Unit* target)
+    {
+        std::list pFireCyclonesList;
+        Trinity::AllCreaturesOfEntryInRange checker(me, NPC_FIRE_CYCLONE, 200.0f);
+        Trinity::CreatureListSearcher searcher(me, pFireCyclonesList, checker);
+        me->VisitNearbyObject(200.0f, searcher);
+
+        if(pFireCyclonesList.empty())
+            return;
+
+        std::list::iterator itr = pFireCyclonesList.begin();
+        uint32 rnd = rand()%pFireCyclonesList.size();
+
+        for(uint32 i = 0; i < rnd; ++i)
+            ++itr;
+
+        (*itr)->CastSpell(target, SPELL_LAVA_STRIKE, true);
+    }
+
     void UpdateAI(const uint32 uiDiff)
     {
         //Return since we have no target
@@ -435,9 +562,9 @@ struct boss_sartharionAI : public ScriptedAI
         }
 
         //soft enrage
-        if (!m_bIsSoftEnraged && (me->GetHealth()*100 / me->GetMaxHealth()) <= 10)
+        if (!m_bIsSoftEnraged && HealthBelowPct(10))
         {
-            // TODO
+            // m_bIsSoftEnraged is used while determining Lava Strike cooldown.
             m_bIsSoftEnraged = true;
         }
 
@@ -461,18 +588,20 @@ struct boss_sartharionAI : public ScriptedAI
             {
                 case 0:
                 {
-                    if (Creature *Right1 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameRight1Spawn.x, FlameRight1Spawn.y , FlameRight1Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN,12000))
-                        Right1->GetMotionMaster()->MovePoint(0, FlameRight1Direction.x, FlameRight1Direction.y, FlameRight1Direction.z);
-                    if (Creature *Right2 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameRight2Spawn.x, FlameRight2Spawn.y , FlameRight2Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN,12000))
-                        Right2->GetMotionMaster()->MovePoint(0, FlameRight2Direction.x, FlameRight2Direction.y, FlameRight2Direction.z);
+                    Creature *Right1 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameRight1Spawn.x, FlameRight1Spawn.y , FlameRight1Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN,12000);
+                    Creature *Right2 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameRight2Spawn.x, FlameRight2Spawn.y , FlameRight2Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN,12000);
+                    Creature *Right3 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameRight3Spawn.x, FlameRight3Spawn.y , FlameRight3Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN,12000);
+                    Right1->GetMotionMaster()->MovePoint(0, FlameRight1Direction.x, FlameRight1Direction.y, FlameRight1Direction.z);
+                    Right2->GetMotionMaster()->MovePoint(0, FlameRight2Direction.x, FlameRight2Direction.y, FlameRight2Direction.z);
+                    Right3->GetMotionMaster()->MovePoint(0, FlameRight3Direction.x, FlameRight3Direction.y, FlameRight3Direction.z);
                     break;
                 }
                 case 1:
                 {
-                    if (Creature *Left1 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameLeft1Spawn.x, FlameLeft1Spawn.y , FlameLeft1Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN,12000))
-                        Left1->GetMotionMaster()->MovePoint(0, FlameLeft1Direction.x, FlameLeft1Direction.y, FlameLeft1Direction.z);
-                    if (Creature *Left2 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameLeft2Spawn.x, FlameLeft2Spawn.y , FlameLeft2Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN,12000))
-                        Left2->GetMotionMaster()->MovePoint(0, FlameLeft2Direction.x, FlameLeft2Direction.y, FlameLeft2Direction.z);
+                    Creature *Left1 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameLeft1Spawn.x, FlameLeft1Spawn.y , FlameLeft1Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN,12000);
+                    Creature *Left2 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameLeft2Spawn.x, FlameLeft2Spawn.y , FlameLeft2Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN,12000);
+                    Left1->GetMotionMaster()->MovePoint(0, FlameLeft1Direction.x, FlameLeft1Direction.y, FlameLeft1Direction.z);
+                    Left2->GetMotionMaster()->MovePoint(0, FlameLeft2Direction.x, FlameLeft2Direction.y, FlameLeft2Direction.z);
                     break;
                 }
             }
@@ -515,12 +644,12 @@ struct boss_sartharionAI : public ScriptedAI
         {
             if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
             {
-                DoCast(pTarget, SPELL_LAVA_STRIKE);
+                CastLavaStrikeOnTarget(pTarget);
 
-                if (urand(0,4) == 4)
+                if(urand(0,5) == 0)
                     DoScriptText(RAND(SAY_SARTHARION_SPECIAL_1,SAY_SARTHARION_SPECIAL_2,SAY_SARTHARION_SPECIAL_3), me);
             }
-            m_uiLavaStrikeTimer = urand(5000,20000);
+            m_uiLavaStrikeTimer = (m_bIsSoftEnraged ? urand(1400, 2000) : urand(5000,20000));
         }
         else
             m_uiLavaStrikeTimer -= uiDiff;
@@ -552,6 +681,10 @@ struct boss_sartharionAI : public ScriptedAI
         else
             m_uiVesperonTimer -= uiDiff;
 
+        // Don't attack current target if he's not visible for us.
+        if(me->getVictim() && me->getVictim()->HasAura(57874, 0))
+            me->getThreatManager().modifyThreatPercent(me->getVictim(), -100);
+
         DoMeleeAttackIfReady();
 
         EnterEvadeIfOutOfCombatArea(uiDiff);
@@ -619,9 +752,6 @@ struct dummy_dragonAI : public ScriptedAI
         if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
             me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
 
-        if (GameObject* TwilightPortal = GameObject::GetGameObject((*me), pInstance->GetData64(GO_TWILIGHT_PORTAL)))
-            TwilightPortal->SetGoState(GO_STATE_READY);
-
         m_uiWaypointId = 0;
         m_uiMoveNextTimer = 500;
         m_iPortalRespawnTime = 30000;
@@ -633,7 +763,7 @@ struct dummy_dragonAI : public ScriptedAI
         if (!pInstance || uiType != POINT_MOTION_TYPE)
             return;
 
-        sLog.outDebug("dummy_dragonAI: %s reached point %u", me->GetName(), uiPointId);
+//        debug_log("dummy_dragonAI: %s reached point %u", me->GetName(), uiPointId);
 
         //if healers messed up the raid and we was already initialized
         if (pInstance->GetData(TYPE_SARTHARION_EVENT) != IN_PROGRESS)
@@ -646,6 +776,14 @@ struct dummy_dragonAI : public ScriptedAI
         if (uiPointId == POINT_ID_LAND)
         {
             me->GetMotionMaster()->Clear();
+            me->SetInCombatWithZone();
+            if(Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0, true))
+            {
+                me->AddThreat(target, 1.0f);
+                me->Attack(target, true);
+                me->GetMotionMaster()->MoveChase(target);
+            }
+
             m_bCanMoveFree = false;
             return;
         }
@@ -695,39 +833,57 @@ struct dummy_dragonAI : public ScriptedAI
         //using a grid search here seem to be more efficient than caching all four guids
         //in instance script and calculate range to each.
         GameObject* pPortal = me->FindNearestGameObject(GO_TWILIGHT_PORTAL,50.0f);
-        if (GameObject* TwilightPortal = GameObject::GetGameObject((*me), pInstance->GetData64(GO_TWILIGHT_PORTAL)))
-            TwilightPortal->SetGoState(GO_STATE_ACTIVE);
 
         switch(me->GetEntry())
         {
             case NPC_TENEBRON:
             {
                 iTextId = WHISPER_HATCH_EGGS;
-                if (pInstance && pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS)
-                    me->SummonCreature(NPC_TWILIGHT_EGG, TwilightEggs[0].x, TwilightEggs[0].y, TwilightEggs[0].z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN,20000);
+                if (pInstance && !pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS) 
+                {
+                    for(uint32 i = 0; i < 6; ++i)
+                        me->SummonCreature(NPC_TWILIGHT_EGG, TwilightEggs[i].x, TwilightEggs[i].y, TwilightEggs[i].z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN,20000);
+                }
                 else
-                    me->SummonCreature(NPC_TWILIGHT_EGG, TwilightEggsSarth[0].x, TwilightEggsSarth[0].y, TwilightEggsSarth[0].z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN,20000);
+                {
+                    for(uint32 i = 0; i < 6; ++i)
+                        me->SummonCreature(NPC_SARTHARION_TWILIGHT_EGG, TwilightEggsSarth[i].x, TwilightEggsSarth[i].y, TwilightEggsSarth[i].z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN,20000);
+                }
                 break;
             }
             case NPC_SHADRON:
             {
                 iTextId = WHISPER_OPEN_PORTAL;
-                if (pInstance && !pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS)
-                    me->SummonCreature(NPC_ACOLYTE_OF_SHADRON, AcolyteofShadron.x, AcolyteofShadron.y , AcolyteofShadron.z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN,20000);
+                if(pInstance && !pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS)
+                    me->SummonCreature(NPC_ACOLYTE_OF_SHADRON, AcolyteofShadron.x, AcolyteofShadron.y , AcolyteofShadron.z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 28000);
                 else
-                    me->SummonCreature(NPC_ACOLYTE_OF_SHADRON, AcolyteofShadron2.x, AcolyteofShadron2.y , AcolyteofShadron2.z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN,20000);
+                    me->SummonCreature(NPC_ACOLYTE_OF_SHADRON, AcolyteofShadron2.x, AcolyteofShadron2.y , AcolyteofShadron2.z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 28000);
 
                 break;
             }
             case NPC_VESPERON:
             {
+                iTextId = WHISPER_OPEN_PORTAL;
                 if (pInstance && !pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS)
-                    me->SummonCreature(NPC_ACOLYTE_OF_VESPERON, AcolyteofVesperon.x, AcolyteofVesperon.y , AcolyteofVesperon.z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN,20000);
+                {
+                    if(Creature* Acolyte = me->SummonCreature(NPC_ACOLYTE_OF_VESPERON, AcolyteofVesperon.x, AcolyteofVesperon.y , AcolyteofVesperon.z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN,20000))
+                    {
+                        me->InterruptNonMeleeSpells(true);
+                        Acolyte->InterruptNonMeleeSpells(true);
+                        me->CastSpell(me, 32747, false);
+                    }
+                }
                 else
-                    me->SummonCreature(NPC_ACOLYTE_OF_VESPERON, AcolyteofVesperon2.x, AcolyteofVesperon2.y , AcolyteofVesperon2.z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN,20000);
+                {
+                    if(Creature* Acolyte = me->SummonCreature(NPC_ACOLYTE_OF_VESPERON, AcolyteofVesperon2.x, AcolyteofVesperon2.y , AcolyteofVesperon2.z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN,20000))
+                    {
+                        me->InterruptNonMeleeSpells(true);
+                        Acolyte->InterruptNonMeleeSpells(true);
+                        me->CastSpell(me, 32747, false);
+                    }
+                }
 
-                iTextId = WHISPER_OPEN_PORTAL;
-                break;
+                 break;
             }
         }
 
@@ -742,7 +898,7 @@ struct dummy_dragonAI : public ScriptedAI
         //Refresh respawnTime so time again are set to 30secs?
     }
 
-    void JustDied(Unit* /*pKiller*/)
+    void JustDied(Unit* pKiller)
     {
         int32 iTextId = 0;
         uint32 uiSpellId = 0;
@@ -752,23 +908,39 @@ struct dummy_dragonAI : public ScriptedAI
             case NPC_TENEBRON:
                 iTextId = SAY_TENEBRON_DEATH;
                 uiSpellId = SPELL_POWER_OF_TENEBRON;
+                if(pInstance && pInstance->GetData(TYPE_SARTHARION_EVENT) != IN_PROGRESS)
+                    pInstance->SetData(TYPE_TENEBRON_PREKILLED, 1);
                 break;
             case NPC_SHADRON:
                 iTextId = SAY_SHADRON_DEATH;
                 uiSpellId = SPELL_POWER_OF_SHADRON;
+                if(pInstance && pInstance->GetData(TYPE_SARTHARION_EVENT) != IN_PROGRESS)
+                    pInstance->SetData(TYPE_SHADRON_PREKILLED, 1);
+                if(Creature* pAcolyte = me->FindNearestCreature(NPC_ACOLYTE_OF_SHADRON, 100.0f))
+                {
+                    pAcolyte->Kill(pAcolyte);
+                }
                 break;
             case NPC_VESPERON:
                 iTextId = SAY_VESPERON_DEATH;
                 uiSpellId = SPELL_POWER_OF_VESPERON;
+                if(pInstance && pInstance->GetData(TYPE_SARTHARION_EVENT) != IN_PROGRESS)
+                    pInstance->SetData(TYPE_VESPERON_PREKILLED, 1);
+                if(Creature* pAcolyte = me->FindNearestCreature(NPC_ACOLYTE_OF_VESPERON, 100.0f))
+                {
+                    pAcolyte->Kill(pAcolyte);
+                }
                 break;
         }
 
         DoScriptText(iTextId, me);
 
-        me->RemoveOwnedAura(uiSpellId);
+        me->RemoveAurasDueToSpell(uiSpellId);
 
         if (pInstance)
         {
+            pInstance->DoRemoveAurasDueToSpellOnPlayers(uiSpellId);
+
             // not if solo mini-boss fight
             if (pInstance->GetData(TYPE_SARTHARION_EVENT) != IN_PROGRESS)
                 return;
@@ -776,7 +948,10 @@ struct dummy_dragonAI : public ScriptedAI
             // Twilight Revenge to main boss
             if (Unit* pSartharion = Unit::GetUnit((*me), pInstance->GetData64(DATA_SARTHARION)))
                 if (pSartharion->isAlive())
+                {
+                    pSartharion->RemoveAurasDueToSpell(uiSpellId);
                     DoCast(pSartharion, SPELL_TWILIGHT_REVENGE, true);
+                }
         }
     }
 
@@ -786,11 +961,11 @@ struct dummy_dragonAI : public ScriptedAI
         {
             if (m_uiMoveNextTimer <= uiDiff)
             {
-                if (m_uiWaypointId < MAX_WAYPOINT)
+                if(m_uiWaypointId < MAX_WAYPOINT)
                     me->GetMotionMaster()->MovePoint(m_uiWaypointId,
                         m_aDragonCommon[m_uiWaypointId].m_fX, m_aDragonCommon[m_uiWaypointId].m_fY, m_aDragonCommon[m_uiWaypointId].m_fZ);
 
-                sLog.outDebug("dummy_dragonAI: %s moving to point %u", me->GetName(), m_uiWaypointId);
+//                debug_log("dummy_dragonAI: %s moving to point %u", me->GetName(), m_uiWaypointId);
                 m_uiMoveNextTimer = 0;
             }
             else
@@ -811,25 +986,27 @@ struct mob_tenebronAI : public dummy_dragonAI
     uint32 m_uiShadowFissureTimer;
     uint32 m_uiHatchEggTimer;
 
+    bool m_bHasPortalOpen;
+
     void Reset()
     {
         m_uiShadowBreathTimer = 20000;
         m_uiShadowFissureTimer = 5000;
         m_uiHatchEggTimer = 30000;
+
+        m_bHasPortalOpen = false;
     }
 
-    void Aggro(Unit* /*pWho*/)
+    void Aggro(Unit* pWho)
     {
         DoScriptText(SAY_TENEBRON_AGGRO, me);
         DoZoneInCombat();
         DoCast(me, SPELL_POWER_OF_TENEBRON);
     }
 
-    void KilledUnit(Unit* /*pVictim*/)
+    void KilledUnit(Unit* pVictim)
     {
         DoScriptText(RAND(SAY_TENEBRON_SLAY_1,SAY_TENEBRON_SLAY_2), me);
-        /*if (pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS)
-            achievProgress = 1;*/
     }
 
     void UpdateAI(const uint32 uiDiff)
@@ -852,7 +1029,7 @@ struct mob_tenebronAI : public dummy_dragonAI
         else
             m_uiShadowFissureTimer -= uiDiff;
 
-        // Hach Egg
+        // Hatch Egg
         if (m_uiHatchEggTimer <= uiDiff)
         {
             OpenPortal();
@@ -871,6 +1048,10 @@ struct mob_tenebronAI : public dummy_dragonAI
         else
             m_uiShadowBreathTimer -= uiDiff;
 
+        // Don't attack current target if he's not visible for us.
+        if(me->getVictim() && me->getVictim()->HasAura(57874, 0))
+            me->getThreatManager().modifyThreatPercent(me->getVictim(), -100);
+
         DoMeleeAttackIfReady();
     }
 };
@@ -892,6 +1073,8 @@ struct mob_shadronAI : public dummy_dragonAI
     uint32 m_uiShadowFissureTimer;
     uint32 m_uiAcolyteShadronTimer;
 
+    bool m_bHasPortalOpen;
+
     void Reset()
     {
         m_uiShadowBreathTimer = 20000;
@@ -903,20 +1086,20 @@ struct mob_shadronAI : public dummy_dragonAI
 
         if (me->HasAura(SPELL_GIFT_OF_TWILIGTH_SHA))
             me->RemoveAurasDueToSpell(SPELL_GIFT_OF_TWILIGTH_SHA);
+
+        m_bHasPortalOpen = false;
     }
 
-    void Aggro(Unit* /*pWho*/)
+    void Aggro(Unit* pWho)
     {
         DoScriptText(SAY_SHADRON_AGGRO,me);
         DoZoneInCombat();
         DoCast(me, SPELL_POWER_OF_SHADRON);
     }
 
-    void KilledUnit(Unit* /*pVictim*/)
+    void KilledUnit(Unit* pVictim)
     {
         DoScriptText(RAND(SAY_SHADRON_SLAY_1,SAY_SHADRON_SLAY_2), me);
-        /*if (pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS)
-            achievProgress = 2;*/
     }
 
     void UpdateAI(const uint32 uiDiff)
@@ -942,11 +1125,17 @@ struct mob_shadronAI : public dummy_dragonAI
         // Portal Event
         if (m_uiAcolyteShadronTimer <= uiDiff)
         {
-            if (me->HasAura(SPELL_GIFT_OF_TWILIGTH_SHA))
-                return;
+            if(m_bHasPortalOpen)
+                m_uiAcolyteShadronTimer = 10000;
+            else
+            {
+                if (me->HasAura(SPELL_GIFT_OF_TWILIGTH_SHA))
+                    return;
 
-             OpenPortal();
-             m_uiAcolyteShadronTimer = urand(60000,65000);
+                OpenPortal();
+                m_bHasPortalOpen = true;
+                m_uiAcolyteShadronTimer = urand(60000,65000);
+            }
         }
         else
             m_uiAcolyteShadronTimer -= uiDiff;
@@ -961,6 +1150,10 @@ struct mob_shadronAI : public dummy_dragonAI
         else
             m_uiShadowBreathTimer -= uiDiff;
 
+        // Don't attack current target if he's not visible for us.
+        if(me->getVictim() && me->getVictim() && me->getVictim()->HasAura(57874, 0))
+            me->getThreatManager().modifyThreatPercent(me->getVictim(), -100);
+
         DoMeleeAttackIfReady();
     }
 };
@@ -982,25 +1175,27 @@ struct mob_vesperonAI : public dummy_dragonAI
     uint32 m_uiShadowFissureTimer;
     uint32 m_uiAcolyteVesperonTimer;
 
+    bool m_bHasPortalOpen;
+
     void Reset()
     {
         m_uiShadowBreathTimer = 20000;
         m_uiShadowFissureTimer = 5000;
         m_uiAcolyteVesperonTimer = 60000;
+
+        m_bHasPortalOpen = false;
     }
 
-    void Aggro(Unit* /*pWho*/)
+    void Aggro(Unit* pWho)
     {
         DoScriptText(SAY_VESPERON_AGGRO,me);
         DoZoneInCombat();
         DoCast(me, SPELL_POWER_OF_VESPERON);
     }
 
-    void KilledUnit(Unit* /*pVictim*/)
+    void KilledUnit(Unit* pVictim)
     {
         DoScriptText(RAND(SAY_VESPERON_SLAY_1,SAY_VESPERON_SLAY_2), me);
-        /*if (pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS)
-            achievProgress = 3;*/
     }
 
     void UpdateAI(const uint32 uiDiff)
@@ -1026,9 +1221,14 @@ struct mob_vesperonAI : public dummy_dragonAI
         // Portal Event
         if (m_uiAcolyteVesperonTimer <= uiDiff)
         {
-            OpenPortal();
-            DoCast(me->getVictim(), SPELL_TWILIGHT_TORMENT_VESP);
-            m_uiAcolyteVesperonTimer = urand(60000,70000);
+            if(m_bHasPortalOpen)
+                m_uiAcolyteVesperonTimer = 10000;
+            else
+            {
+                OpenPortal();
+                DoCast(me->getVictim(), SPELL_TWILIGHT_TORMENT_VESP);            
+                m_uiAcolyteVesperonTimer = urand(60000,70000);
+            }
         }
         else
             m_uiAcolyteVesperonTimer -= uiDiff;
@@ -1043,6 +1243,10 @@ struct mob_vesperonAI : public dummy_dragonAI
         else
             m_uiShadowBreathTimer -= uiDiff;
 
+        // Don't attack current target if he's not visible for us.
+        if(me->getVictim() && me->getVictim()->HasAura(57874, 0))
+            me->getThreatManager().modifyThreatPercent(me->getVictim(), -100);
+
         DoMeleeAttackIfReady();
     }
 };
@@ -1061,43 +1265,49 @@ struct mob_acolyte_of_shadronAI : public ScriptedAI
     mob_acolyte_of_shadronAI(Creature* pCreature) : ScriptedAI(pCreature)
     {
         pInstance = pCreature->GetInstanceData();
+        Reset();
     }
 
     ScriptedInstance* pInstance;
-    uint32 uiShiftEffectTimer;
-
+    uint32 uiDespawnTimer;
+ 
     void Reset()
     {
-        uiShiftEffectTimer = 1000;
+        uiDespawnTimer = 28000;
         if (pInstance)
         {
-            Unit *pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 0, 999, true);
-
-            Creature* pSartharion = Unit::GetCreature(*me, pInstance->GetData64(DATA_SARTHARION));
-            if (Creature* pShadron = Unit::GetCreature(*me, pInstance->GetData64(DATA_SHADRON)))
+            Creature* pTarget = NULL;
             //if not solo figth, buff main boss, else place debuff on mini-boss. both spells TARGET_SCRIPT
             if (pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS)
-                 pSartharion->CastSpell(me, SPELL_GIFT_OF_TWILIGTH_SAR, true);
+            {
+                if(pTarget = ((Creature*)Unit::GetUnit((*me), pInstance->GetData64(DATA_SARTHARION))))
+                    pTarget->AddAura(SPELL_GIFT_OF_TWILIGTH_SAR, pTarget);
+            }
             else
             {
-                pShadron->CastSpell(me, SPELL_GIFT_OF_TWILIGTH_SHA,true);
-                pShadron->AddThreat(pTarget, 100.0f);
-                AttackStart(pShadron->getVictim());
+                if(pTarget = ((Creature*)Unit::GetUnit((*me), pInstance->GetData64(DATA_SHADRON))))
+                    pTarget->AddAura(SPELL_GIFT_OF_TWILIGTH_SHA, pTarget);
             }
-        }
-         me->AddAura(SPELL_TWILIGHT_SHIFT_ENTER,me);
+         }
+        me->AddAura(SPELL_TWILIGHT_SHIFT_ENTER,me);
     }
 
-    void JustDied(Unit* /*killer*/)
+    void JustDied(Unit* killer)
     {
         if (pInstance)
         {
-            //Creature* pDebuffTarget = NULL;
+            Creature* Shadron = pInstance->instance->GetCreature(pInstance->GetData64(DATA_SHADRON));
+            if(Shadron)
+            {
+                ((mob_shadronAI*)Shadron->AI())->m_bHasPortalOpen = false;
+            }
+
+            Creature* pDebuffTarget = NULL;
             Map *map = me->GetMap();
             if (map->IsDungeon())
             {
                 Map::PlayerList const &PlayerList = map->GetPlayers();
-
+ 
                 if (PlayerList.isEmpty())
                     return;
 
@@ -1110,28 +1320,31 @@ struct mob_acolyte_of_shadronAI : public ScriptedAI
                         i->getSource()->RemoveAurasDueToSpell(SPELL_TWILIGHT_SHIFT);
                         i->getSource()->RemoveAurasDueToSpell(SPELL_TWILIGHT_SHIFT_ENTER);
                     }
-                }
+               }
             }
 
-            if (pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS)
-            {
-                //not solo fight, so main boss has deduff
-                Creature* pDebuffTarget = Unit::GetCreature(*me, pInstance->GetData64(DATA_SARTHARION));
-                if (pDebuffTarget && pDebuffTarget->isAlive() && pDebuffTarget->HasAura(SPELL_GIFT_OF_TWILIGTH_SAR))
-                    pDebuffTarget->RemoveAurasDueToSpell(SPELL_GIFT_OF_TWILIGTH_SAR);
-            }
-            else
-            {
-                //event not in progress, then solo fight and must remove debuff mini-boss
-                Creature* pDebuffTarget = Unit::GetCreature(*me, pInstance->GetData64(DATA_SHADRON));
-                if (pDebuffTarget && pDebuffTarget->isAlive() && pDebuffTarget->HasAura(SPELL_GIFT_OF_TWILIGTH_SHA))
-                    pDebuffTarget->RemoveAurasDueToSpell(SPELL_GIFT_OF_TWILIGTH_SHA);
-            }
+            //not solo fight, so main boss has deduff
+            pDebuffTarget = pInstance->instance->GetCreature(pInstance->GetData64(DATA_SARTHARION));
+            if (pDebuffTarget && pDebuffTarget->isAlive() && pDebuffTarget->HasAura(SPELL_GIFT_OF_TWILIGTH_SAR))
+                pDebuffTarget->RemoveAurasDueToSpell(SPELL_GIFT_OF_TWILIGTH_SAR);
+
+            //event not in progress, then solo fight and must remove debuff mini-boss
+            pDebuffTarget = pInstance->instance->GetCreature(pInstance->GetData64(DATA_SHADRON));
+            if (pDebuffTarget && pDebuffTarget->isAlive() && pDebuffTarget->HasAura(SPELL_GIFT_OF_TWILIGTH_SHA))
+                pDebuffTarget->RemoveAurasDueToSpell(SPELL_GIFT_OF_TWILIGTH_SHA);
         }
     }
 
-    void UpdateAI(const uint32 /*uiDiff*/)
+    void UpdateAI(const uint32 uiDiff)
     {
+        if(uiDespawnTimer < uiDiff)
+        {
+            me->SetVisibility(VISIBILITY_OFF);
+            me->Kill(me);
+            uiDespawnTimer = 28000;
+            return;
+        }else uiDespawnTimer -= uiDiff;
+
         if (!UpdateVictim())
             return;
 
@@ -1156,26 +1369,32 @@ struct mob_acolyte_of_vesperonAI : public ScriptedAI
     }
 
     ScriptedInstance* pInstance;
+    uint32 uiDespawnTimer;
 
     void Reset()
     {
+        uiDespawnTimer = 28000;
         if (pInstance)
         {
-            me->AddAura(SPELL_TWILIGHT_SHIFT_ENTER,me);
+            me->AddAura(SPELL_TWILIGHT_SHIFT_ENTER,me);                
         }
         DoCast(me, SPELL_TWILIGHT_TORMENT_VESP_ACO);
     }
 
-    void JustDied(Unit* /*pKiller*/)
+    void JustDied(Unit* pKiller)
     {
+        me->RemoveAurasDueToSpell(SPELL_TWILIGHT_TORMENT_VESP_ACO);     
+
         // remove twilight torment on Vesperon
         if (pInstance)
         {
-            Creature* pVesperon = Unit::GetCreature(*me, pInstance->GetData64(DATA_VESPERON));
+            Creature* pVesperon = pInstance->instance->GetCreature(pInstance->GetData64(DATA_VESPERON));
+            if (pVesperon)
+                ((mob_vesperonAI*)pVesperon->AI())->m_bHasPortalOpen = false;
 
             if (pVesperon && pVesperon->isAlive() && pVesperon->HasAura(SPELL_TWILIGHT_TORMENT_VESP))
                 pVesperon->RemoveAurasDueToSpell(SPELL_TWILIGHT_TORMENT_VESP);
-
+            
             Map *map = me->GetMap();
             if (map->IsDungeon())
             {
@@ -1194,15 +1413,26 @@ struct mob_acolyte_of_vesperonAI : public ScriptedAI
                         i->getSource()->RemoveAurasDueToSpell(SPELL_TWILIGHT_SHIFT_ENTER);
                     }
                     if (i->getSource()->isAlive() && i->getSource()->HasAura(SPELL_TWILIGHT_TORMENT_VESP,0) && !i->getSource()->getVictim())
-                        i->getSource()->RemoveAurasDueToSpell(SPELL_TWILIGHT_SHIFT);
+                        i->getSource()->RemoveAurasDueToSpell(SPELL_TWILIGHT_TORMENT_VESP);
                 }
             }
 
+            pInstance->DoRemoveAurasDueToSpellOnPlayers(SPELL_TWILIGHT_TORMENT_VESP_ACO);
+            pInstance->DoRemoveAurasDueToSpellOnPlayers(57935);
+            pInstance->DoRemoveAurasDueToSpellOnPlayers(58835); // Components of spell Twilight Torment
         }
     }
 
-    void UpdateAI(const uint32 /*uiDiff*/)
+    void UpdateAI(const uint32 uiDiff)
     {
+        if(uiDespawnTimer < uiDiff)
+        {
+            me->SetVisibility(VISIBILITY_OFF);
+            me->Kill(me);
+            uiDespawnTimer = 28000;
+            return;
+        }else uiDespawnTimer -= uiDiff;
+
         if (!UpdateVictim())
             return;
 
@@ -1222,9 +1452,10 @@ CreatureAI* GetAI_mob_acolyte_of_vesperon(Creature* pCreature)
 struct mob_twilight_eggsAI : public Scripted_NoMovementAI
 {
     mob_twilight_eggsAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature)
-    {
+    {        
         pInstance = pCreature->GetInstanceData();
     }
+
     uint32 m_uiFadeArmorTimer;
     uint32 m_uiHatchEggTimer;
 
@@ -1232,28 +1463,46 @@ struct mob_twilight_eggsAI : public Scripted_NoMovementAI
 
     void Reset()
     {
-        m_uiHatchEggTimer = 20000;
+        if(pInstance)
+        {
+            me->AddAura(SPELL_TWILIGHT_SHIFT_ENTER,me);
+        }
         m_uiFadeArmorTimer = 1000;
+        m_uiHatchEggTimer = 20000;
     }
+    
     void SpawnWhelps()
     {
+        me->RemoveAllAuras();
+
         if (!pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS)
             me->SummonCreature(NPC_TWILIGHT_WHELP, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 60000);
-        else
+        else                      
             me->SummonCreature(NPC_SHARTHARION_TWILIGHT_WHELP, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 60000);
         me->DealDamage(me, me->GetHealth());
     }
+    
+    void JustSummoned(Creature* pWho)
+    {
+        pWho->SetInCombatWithZone();
+    }
+    
     void UpdateAI(const uint32 uiDiff)
     {
         if (m_uiHatchEggTimer <= uiDiff)
         {
+            Creature* Tenebron = pInstance->instance->GetCreature(pInstance->GetData64(DATA_TENEBRON));
+            if(Tenebron)
+                ((mob_tenebronAI*)Tenebron->AI())->m_bHasPortalOpen = false;
             SpawnWhelps();
         }
         else
-            m_uiHatchEggTimer -= uiDiff;
+            m_uiHatchEggTimer -= uiDiff;      
     }
-    void AttackStart(Unit* /*pWho*/) {}
-    void MoveInLineOfSight(Unit* /*pWho*/) {}
+    
+
+    void AttackStart(Unit* pWho) {}
+    void MoveInLineOfSight(Unit* pWho) {}
 };
 
 CreatureAI* GetAI_mob_twilight_eggs(Creature* pCreature)
@@ -1262,33 +1511,46 @@ CreatureAI* GetAI_mob_twilight_eggs(Creature* pCreature)
 }
 
 /*######
-## Flame Tzunami
+## Mob Flame Tsunami
 ######*/
 struct npc_flame_tsunamiAI : public ScriptedAI
 {
     npc_flame_tsunamiAI(Creature* pCreature) : ScriptedAI(pCreature)
     {
-        me->HasAura(SPELL_FLAME_TSUNAMI_DMG_AURA);
-        DoCast(me, SPELL_FLAME_TSUNAMI);
+        me->SetDisplayId(11686);
+        me->AddAura(SPELL_FLAME_TSUNAMI, me);
     }
 
     uint32 Tsunami_Timer;
+    uint32 TsunamiBuff_timer;
+    uint32 entry;
 
     void Reset()
     {
         Tsunami_Timer = 100;
         me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+        me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+        TsunamiBuff_timer = 1000;
+        entry = 0;
     }
-
+    
     void UpdateAI(const uint32 diff)
     {
         if (Tsunami_Timer <= diff)
         {
-            DoCast(me, SPELL_FLAME_TSUNAMI_DMG_AURA);
-            Tsunami_Timer = 1000;
-        } else Tsunami_Timer -= diff;
+            DoCast(me,SPELL_FLAME_TSUNAMI_DMG_AURA);
+            Tsunami_Timer = 500;
+        }else Tsunami_Timer -= diff;
+        
+        if(TsunamiBuff_timer <= diff)
+        {
+            if (Unit* LavaBlaze = GetClosestCreatureWithEntry(me,NPC_LAVA_BLAZE, 10.0f, true))
+                LavaBlaze->CastSpell(LavaBlaze, SPELL_FLAME_TSUNAMI_BUFF, true);
+            TsunamiBuff_timer = 1000;
+        }else TsunamiBuff_timer -= diff;
     }
 };
+
 // Twilight Fissure
 struct npc_twilight_fissureAI : public Scripted_NoMovementAI
 {
@@ -1301,6 +1563,10 @@ struct npc_twilight_fissureAI : public Scripted_NoMovementAI
 
     void Reset()
     {
+        me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+        me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+        me->AddAura( 46265 , me ); // Wrong, can't find proper visual
+        me->AddAura( 69422 , me );
         VoidBlast_Timer = 5000;
     }
 
@@ -1308,8 +1574,12 @@ struct npc_twilight_fissureAI : public Scripted_NoMovementAI
     {
         if (VoidBlast_Timer <= diff)
         {
-            DoCast(me->getVictim(), RAID_MODE(SPELL_VOID_BLAST, SPELL_VOID_BLAST_H));
+            DoCastAOE(RAID_MODE(SPELL_VOID_BLAST, SPELL_VOID_BLAST_H));
+            ////twilight realm
+            //DoCast(me->getVictim(), 57620, true);
+            //DoCast(me->getVictim(), 57874, true);
             VoidBlast_Timer = 9000;
+            me->RemoveAllAuras();
             me->Kill(me);
         } else VoidBlast_Timer -= diff;
     }
@@ -1332,12 +1602,17 @@ CreatureAI* GetAI_npc_twilight_fissure(Creature* pCreature)
 
 struct mob_twilight_whelpAI : public ScriptedAI
 {
-    mob_twilight_whelpAI(Creature* pCreature) : ScriptedAI(pCreature) {}
+    mob_twilight_whelpAI(Creature* pCreature) : ScriptedAI(pCreature)
+    {
+        Reset();
+    }
 
     uint32 m_uiFadeArmorTimer;
 
     void Reset()
     {
+        me->RemoveAllAuras();
+        me->SetInCombatWithZone();
         m_uiFadeArmorTimer = 1000;
     }
 
diff --git a/src/server/scripts/Northrend/ObsidianSanctum/instance_obsidian_sanctum.cpp b/src/server/scripts/Northrend/ObsidianSanctum/instance_obsidian_sanctum.cpp
index 26218f2e936..a8e1d159626 100644
--- a/src/server/scripts/Northrend/ObsidianSanctum/instance_obsidian_sanctum.cpp
+++ b/src/server/scripts/Northrend/ObsidianSanctum/instance_obsidian_sanctum.cpp
@@ -1,3 +1,19 @@
+/* Copyright (C) 2009 - 2010 TrinityCore 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #include "ScriptPCH.h"
 #include "obsidian_sanctum.h"
 
@@ -17,6 +33,10 @@ struct instance_obsidian_sanctum : public ScriptedInstance
     uint64 m_uiShadronGUID;
     uint64 m_uiVesperonGUID;
 
+    bool m_bTenebronKilled;
+    bool m_bShadronKilled;
+    bool m_bVesperonKilled;
+
     void Initialize()
     {
         memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
@@ -25,6 +45,10 @@ struct instance_obsidian_sanctum : public ScriptedInstance
         m_uiTenebronGUID   = 0;
         m_uiShadronGUID    = 0;
         m_uiVesperonGUID   = 0;
+
+        m_bTenebronKilled = false;
+        m_bShadronKilled = false;
+        m_bVesperonKilled = false;
     }
 
     void OnCreatureCreate(Creature* pCreature, bool /*add*/)
@@ -55,12 +79,24 @@ struct instance_obsidian_sanctum : public ScriptedInstance
     {
         if (uiType == TYPE_SARTHARION_EVENT)
             m_auiEncounter[0] = uiData;
+        else if(uiType == TYPE_TENEBRON_PREKILLED)
+            m_bTenebronKilled = true;
+        else if(uiType == TYPE_SHADRON_PREKILLED)
+            m_bShadronKilled = true;
+        else if(uiType == TYPE_VESPERON_PREKILLED)
+            m_bVesperonKilled = true;
     }
 
     uint32 GetData(uint32 uiType)
     {
         if (uiType == TYPE_SARTHARION_EVENT)
             return m_auiEncounter[0];
+        else if(uiType == TYPE_TENEBRON_PREKILLED)
+            return m_bTenebronKilled;
+        else if(uiType == TYPE_SHADRON_PREKILLED)
+            return m_bShadronKilled;
+        else if(uiType == TYPE_VESPERON_PREKILLED)
+            return m_bVesperonKilled;
 
         return 0;
     }
diff --git a/src/server/scripts/Northrend/ObsidianSanctum/obsidian_sanctum.h b/src/server/scripts/Northrend/ObsidianSanctum/obsidian_sanctum.h
index 59013174795..6809d1bbfdc 100644
--- a/src/server/scripts/Northrend/ObsidianSanctum/obsidian_sanctum.h
+++ b/src/server/scripts/Northrend/ObsidianSanctum/obsidian_sanctum.h
@@ -1,9 +1,28 @@
+/* Copyright (C) 2009 - 2010 TrinityCore 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef DEF_OBSIDIAN_SANCTUM_H
 #define DEF_OBSIDIAN_SANCTUM_H
 
 enum eTypes
 {
     TYPE_SARTHARION_EVENT       = 1,
+    TYPE_TENEBRON_PREKILLED     = 2,
+    TYPE_SHADRON_PREKILLED      = 3,
+    TYPE_VESPERON_PREKILLED     = 4,
 
     DATA_SARTHARION             = 10,
     DATA_TENEBRON               = 11,
-- 
cgit v1.2.3


From f1bcd2c5bc935959d1b1c3fa96316426dba2b16c Mon Sep 17 00:00:00 2001
From: Brian 
Date: Wed, 30 Jun 2010 12:46:19 -0600
Subject: * Fix expected client build

--HG--
branch : trunk
---
 src/server/authserver/Authentication/AuthCodes.h       | 2 +-
 src/server/game/Entities/Object/Updates/UpdateFields.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/server/authserver/Authentication/AuthCodes.h b/src/server/authserver/Authentication/AuthCodes.h
index eb6e4abfb08..883f8d2edd2 100644
--- a/src/server/authserver/Authentication/AuthCodes.h
+++ b/src/server/authserver/Authentication/AuthCodes.h
@@ -80,7 +80,7 @@ enum LoginResult
 //3.3.2 build 11403
 //3.3.3a build 11723
 
-#define POST_BC_ACCEPTED_CLIENT_BUILD                 {11723, 11403, 11159, 10571, 10505, 10146, 9947, 8606, 0}
+#define POST_BC_ACCEPTED_CLIENT_BUILD                 {12213, 11723, 11403, 11159, 10571, 10505, 10146, 9947, 8606, 0}
 #define PRE_BC_ACCEPTED_CLIENT_BUILD                  {5875, 6005, 0}
 
 #define POST_BC_EXP_FLAG                              0x2
diff --git a/src/server/game/Entities/Object/Updates/UpdateFields.h b/src/server/game/Entities/Object/Updates/UpdateFields.h
index 5f819375677..09c2b3805c4 100644
--- a/src/server/game/Entities/Object/Updates/UpdateFields.h
+++ b/src/server/game/Entities/Object/Updates/UpdateFields.h
@@ -21,7 +21,7 @@
 #ifndef _UPDATEFIELDS_AUTO_H
 #define _UPDATEFIELDS_AUTO_H
 
-// Auto generated for version 3, 3, 3, 11723
+// Auto generated for version 3, 3, 3, 12213
 
 enum EObjectFields
 {
-- 
cgit v1.2.3


From 27958838bf522e92257a9f0c6a359b5c52c474e6 Mon Sep 17 00:00:00 2001
From: Brian 
Date: Wed, 30 Jun 2010 12:58:00 -0600
Subject: * Update / Add some opcodes * Thanks TOM_RUS

--HG--
branch : trunk
---
 src/server/game/Server/Protocol/Opcodes.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/game/Server/Protocol/Opcodes.h b/src/server/game/Server/Protocol/Opcodes.h
index 6e2fb0b6db1..ef328c70586 100644
--- a/src/server/game/Server/Protocol/Opcodes.h
+++ b/src/server/game/Server/Protocol/Opcodes.h
@@ -1343,7 +1343,11 @@ enum Opcodes
     SMSG_UNKNOWN_1304                               = 0x518, // something with player movement (move event 58?), speed packet
     UMSG_UNKNOWN_1305                               = 0x519, // not found
     UMSG_UNKNOWN_1306                               = 0x51A, // not found
-    NUM_MSG_TYPES                                   = 0x51B
+    CMSG_COMMENTATOR_SKIRMISH_QUEUE_COMMAND         = 0x51B, // lua: CommentatorSetSkirmishMatchmakingMode/CommentatorRequestSkirmishQueueData/CommentatorRequestSkirmishMode/CommentatorStartSkirmishMatch
+    SMSG_UNKNOWN_1308                               = 0x51C, // event EVENT_COMMENTATOR_SKIRMISH_QUEUE_REQUEST, CGCommentator::QueueNode
+    SMSG_UNKNOWN_1309                               = 0x51D, // event EVENT_COMMENTATOR_SKIRMISH_QUEUE_REQUEST
+    SMSG_UNKNOWN_1310                               = 0x51E, // some compressed packet?
+    NUM_MSG_TYPES                                   = 0x51F
 };
 
 /// Player state
-- 
cgit v1.2.3


From 9b7da805f8223be50fa510e7aa8bd94259d4a245 Mon Sep 17 00:00:00 2001
From: Brian 
Date: Wed, 30 Jun 2010 13:02:43 -0600
Subject: * Some update to chat enums * Thanks TOM_RUS

--HG--
branch : trunk
---
 src/server/game/Entities/Player/SocialMgr.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Player/SocialMgr.h b/src/server/game/Entities/Player/SocialMgr.h
index dbed6e93006..9b1176baab9 100644
--- a/src/server/game/Entities/Player/SocialMgr.h
+++ b/src/server/game/Entities/Player/SocialMgr.h
@@ -43,7 +43,8 @@ enum SocialFlag
 {
     SOCIAL_FLAG_FRIEND      = 0x01,
     SOCIAL_FLAG_IGNORED     = 0x02,
-    SOCIAL_FLAG_MUTED       = 0x04                          // guessed
+    SOCIAL_FLAG_MUTED       = 0x04,                          // guessed
+    SOCAIL_FLAG_RAF         = 0x08                           // Recruit A Friend
 };
 
 struct FriendInfo
@@ -112,7 +113,7 @@ enum FriendsResult
 };
 
 #define SOCIALMGR_FRIEND_LIMIT  50
-#define SOCIALMGR_IGNORE_LIMIT  25
+#define SOCIALMGR_IGNORE_LIMIT  50
 
 class PlayerSocial
 {
-- 
cgit v1.2.3


From b0df141c54597cc5af55b4268880af40f62c428d Mon Sep 17 00:00:00 2001
From: Brian 
Date: Wed, 30 Jun 2010 13:05:23 -0600
Subject: * Another opcode update * Thanks TOM_RUS

--HG--
branch : trunk
---
 src/server/game/Server/Protocol/Opcodes.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/game/Server/Protocol/Opcodes.h b/src/server/game/Server/Protocol/Opcodes.h
index ef328c70586..44a06ddb8d3 100644
--- a/src/server/game/Server/Protocol/Opcodes.h
+++ b/src/server/game/Server/Protocol/Opcodes.h
@@ -1244,7 +1244,7 @@ enum Opcodes
     SMSG_ITEM_REFUND_RESULT                         = 0x4B5, // refund item result
     CMSG_CORPSE_MAP_POSITION_QUERY                  = 0x4B6, // CMSG, uint32
     SMSG_CORPSE_MAP_POSITION_QUERY_RESPONSE         = 0x4B7, // SMSG, 3*float+float
-    CMSG_LFG_SET_ROLES_2                            = 0x4B8, // not found
+    UMSG_UNKNOWN_1208                               = 0x4B8, // not found
     UMSG_UNKNOWN_1209                               = 0x4B9, // not found
     CMSG_CALENDAR_CONTEXT_EVENT_SIGNUP              = 0x4BA, // CMSG, uint64, lua: CalendarContextEventSignUp
     SMSG_CALENDAR_ACTION_PENDING                    = 0x4BB, // SMSG, calendar related EVENT_CALENDAR_ACTION_PENDING
-- 
cgit v1.2.3


From 4d00596e95a04e274d4a8bbb3222f4ffa60e601d Mon Sep 17 00:00:00 2001
From: Brian 
Date: Wed, 30 Jun 2010 13:11:44 -0600
Subject: * Update for 3.3.5a

--HG--
branch : trunk
---
 src/server/authserver/Authentication/AuthCodes.h       | 2 +-
 src/server/game/Entities/Object/Updates/UpdateFields.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/server/authserver/Authentication/AuthCodes.h b/src/server/authserver/Authentication/AuthCodes.h
index 883f8d2edd2..802b7b78f1b 100644
--- a/src/server/authserver/Authentication/AuthCodes.h
+++ b/src/server/authserver/Authentication/AuthCodes.h
@@ -80,7 +80,7 @@ enum LoginResult
 //3.3.2 build 11403
 //3.3.3a build 11723
 
-#define POST_BC_ACCEPTED_CLIENT_BUILD                 {12213, 11723, 11403, 11159, 10571, 10505, 10146, 9947, 8606, 0}
+#define POST_BC_ACCEPTED_CLIENT_BUILD                 {12340, 11723, 11403, 11159, 10571, 10505, 10146, 9947, 8606, 0}
 #define PRE_BC_ACCEPTED_CLIENT_BUILD                  {5875, 6005, 0}
 
 #define POST_BC_EXP_FLAG                              0x2
diff --git a/src/server/game/Entities/Object/Updates/UpdateFields.h b/src/server/game/Entities/Object/Updates/UpdateFields.h
index 09c2b3805c4..1b334967688 100644
--- a/src/server/game/Entities/Object/Updates/UpdateFields.h
+++ b/src/server/game/Entities/Object/Updates/UpdateFields.h
@@ -21,7 +21,7 @@
 #ifndef _UPDATEFIELDS_AUTO_H
 #define _UPDATEFIELDS_AUTO_H
 
-// Auto generated for version 3, 3, 3, 12213
+// Auto generated for version 3, 3, 3, 12340
 
 enum EObjectFields
 {
-- 
cgit v1.2.3


From 38316ca97bee09412efe5f1b87e21bfb194232be Mon Sep 17 00:00:00 2001
From: Brian 
Date: Wed, 30 Jun 2010 13:14:23 -0600
Subject: * Fix authentication for the new client * Thanks TOM_RUS

--HG--
branch : trunk
---
 src/server/game/Server/WorldSocket.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/game/Server/WorldSocket.cpp b/src/server/game/Server/WorldSocket.cpp
index ac4900a0fd3..f7b128fb761 100644
--- a/src/server/game/Server/WorldSocket.cpp
+++ b/src/server/game/Server/WorldSocket.cpp
@@ -768,7 +768,7 @@ int WorldSocket::HandleAuthSession (WorldPacket& recvPacket)
     // NOTE: ATM the socket is singlethread, have this in mind ...
     uint8 digest[20];
     uint32 clientSeed;
-    uint32 unk2, unk3;
+    uint32 unk2, unk3, unk5, unk6, unk7;
     uint64 unk4;
     uint32 BuiltNumberClient;
     uint32 id, security;
@@ -797,6 +797,7 @@ int WorldSocket::HandleAuthSession (WorldPacket& recvPacket)
     recvPacket >> account;
     recvPacket >> unk3;
     recvPacket >> clientSeed;
+    recvPacket >> unk5 >> unk6 >> unk7;
     recvPacket >> unk4;
     recvPacket.read (digest, 20);
 
-- 
cgit v1.2.3


From f3187e95019dfb94cb27e68a3954936cc35ec4eb Mon Sep 17 00:00:00 2001
From: click 
Date: Thu, 1 Jul 2010 16:36:48 +0200
Subject: Adjust includes for some Ulduar-scripts (fixes non-PCH build on *nix
 and should also do the same for Visual Studio/Windows)

--HG--
branch : trunk
---
 src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp | 2 +-
 src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp      | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp
index c13ee5f5585..adbd764e845 100644
--- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp
@@ -23,8 +23,8 @@
 *          if reached brann speaks through his radio..
 */
 
-#include "ScriptedEscortAI.h"
 #include "ScriptPCH.h"
+#include "ScriptedEscortAI.h"
 #include "ulduar.h"
 #include "Vehicle.h"
 
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp
index ad6beb5ba51..d8fc0143b69 100644
--- a/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp
@@ -16,7 +16,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "ScriptedEscortAI.h"
 #include "ScriptPCH.h"
 #include "ulduar.h"
 
-- 
cgit v1.2.3


From 3fd0fb8f97a54266677d6b76d30d1281bd9d9861 Mon Sep 17 00:00:00 2001
From: Brian 
Date: Thu, 1 Jul 2010 09:20:09 -0600
Subject: * Fixed ordering of gossip_menu_option so menu items appear in the
 proper * order

--HG--
branch : trunk
---
 src/server/game/Globals/ObjectMgr.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index c7ed4cfb330..ae8dd503caa 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -8266,7 +8266,7 @@ void ObjectMgr::LoadGossipMenuItems()
     QueryResult_AutoPtr result = WorldDatabase.Query(
         "SELECT menu_id, id, option_icon, option_text, option_id, npc_option_npcflag, "
         "action_menu_id, action_poi_id, action_script_id, box_coded, box_money, box_text "
-        "FROM gossip_menu_option");
+        "FROM gossip_menu_option ORDER BY menu_id, id");
 
     if (!result)
     {
-- 
cgit v1.2.3


From baf108e5ccc0ee42efcefa4a87e2784421df15c5 Mon Sep 17 00:00:00 2001
From: Brian 
Date: Fri, 2 Jul 2010 01:48:49 -0600
Subject: * Updated DBC file checks for 3.3.5a

--HG--
branch : trunk
---
 src/server/game/DataStores/DBCStores.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/server/game/DataStores/DBCStores.cpp b/src/server/game/DataStores/DBCStores.cpp
index bc127cb309c..4ddccd735f5 100755
--- a/src/server/game/DataStores/DBCStores.cpp
+++ b/src/server/game/DataStores/DBCStores.cpp
@@ -592,13 +592,13 @@ void LoadDBCStores(const std::string& dataPath)
     }
 
     // Check loaded DBC files proper version
-    if (!sAreaStore.LookupEntry(3617)              ||       // last area (areaflag) added in 3.3.3a
-        !sCharTitlesStore.LookupEntry(177)         ||       // last char title added in 3.3.3a
-        !sGemPropertiesStore.LookupEntry(1629)     ||       // last added spell in 3.3.3a
-        !sItemStore.LookupEntry(54860)             ||       // last gem property added in 3.3.3a
-        !sItemExtendedCostStore.LookupEntry(2997)  ||       // last item extended cost added in 3.3.3a
-        !sMapStore.LookupEntry(724)                ||       // last map added in 3.3.3a
-        !sSpellStore.LookupEntry(76567)            )        // last client known item added in 3.3.3a
+    if (!sAreaStore.LookupEntry(3617)              ||       // last area (areaflag) added in 3.3.5a
+        !sCharTitlesStore.LookupEntry(177)         ||       // last char title added in 3.3.5a
+        !sGemPropertiesStore.LookupEntry(1629)     ||       // last added spell in 3.3.5a
+        !sItemStore.LookupEntry(56806)             ||       // last gem property added in 3.3.5a
+        !sItemExtendedCostStore.LookupEntry(2997)  ||       // last item extended cost added in 3.3.5a
+        !sMapStore.LookupEntry(724)                ||       // last map added in 3.3.5a
+        !sSpellStore.LookupEntry(80864)            )        // last client known item added in 3.3.5a
     {
         sLog.outError("\nYou have _outdated_ DBC files. Please extract correct versions from current using client.");
         exit(1);
-- 
cgit v1.2.3


From 255e7e8b83848f1e43baffe98e0df88ae5dd537f Mon Sep 17 00:00:00 2001
From: Shauren 
Date: Fri, 2 Jul 2010 14:24:05 +0200
Subject: Fixed Chain Lightning overproccing with Lightning Overload, patch by
 DrTenma Closes issue #1198.

--HG--
branch : trunk
---
 sql/updates/8816_world_spell_bonus_data.sql   |  4 ++++
 src/server/game/Combat/ThreatManager.cpp      |  5 +++++
 src/server/game/Entities/Unit/Unit.cpp        | 28 +++++++++++++--------------
 src/server/game/Miscellaneous/SharedDefines.h |  2 +-
 4 files changed, 23 insertions(+), 16 deletions(-)
 create mode 100644 sql/updates/8816_world_spell_bonus_data.sql

(limited to 'src')

diff --git a/sql/updates/8816_world_spell_bonus_data.sql b/sql/updates/8816_world_spell_bonus_data.sql
new file mode 100644
index 00000000000..67d01d19b77
--- /dev/null
+++ b/sql/updates/8816_world_spell_bonus_data.sql
@@ -0,0 +1,4 @@
+DELETE FROM `spell_bonus_data` WHERE `entry` IN (45284,45297);
+INSERT INTO `spell_bonus_data` (`entry`,`direct_bonus`,`dot_bonus`,`ap_bonus`,`ap_dot_bonus`,`comments`) VALUES
+(45284,0.357,-1,-1,-1,'Shaman - LO Lightning Bolt'),
+(45297,0.285,-1,-1,-1,'Shaman - LO Chain Lightning');
diff --git a/src/server/game/Combat/ThreatManager.cpp b/src/server/game/Combat/ThreatManager.cpp
index 52f02f0f66d..fbf5a80d42b 100644
--- a/src/server/game/Combat/ThreatManager.cpp
+++ b/src/server/game/Combat/ThreatManager.cpp
@@ -36,8 +36,13 @@
 float ThreatCalcHelper::calcThreat(Unit* pHatedUnit, Unit* /*pHatingUnit*/, float fThreat, SpellSchoolMask schoolMask, SpellEntry const *pThreatSpell)
 {
     if (pThreatSpell)
+    {
+        if (pThreatSpell->AttributesEx & SPELL_ATTR_EX_NO_THREAT)
+            return 0.0f;
+
         if (Player* modOwner = pHatedUnit->GetSpellModOwner())
             modOwner->ApplySpellMod(pThreatSpell->Id, SPELLMOD_THREAT, fThreat);
+    }
 
     return pHatedUnit->ApplyTotalThreatModifier(fThreat, schoolMask);
 }
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 362ccbf582d..e85dd8968dc 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -7335,27 +7335,25 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                         sLog.outError("Unit::HandleDummyAuraProc: non handled spell id: %u (LO)", procSpell->Id);
                         return false;
                 }
-                // No thread generated mod
-                // TODO: exist special flag in spell attributes for this, need found and use!
-                SpellModifier *mod = new SpellModifier;
-                mod->op = SPELLMOD_THREAT;
-                mod->value = -100;
-                mod->type = SPELLMOD_PCT;
-                mod->spellId = dummySpell->Id;
-                mod->mask[0] = 0x02;
-                mod->mask[2] = 0x00;
-                this->ToPlayer()->AddSpellMod(mod, true);
-
-                // Remove cooldown (Chain Lightning - have Category Recovery time)
+
+                // Chain Lightning
                 if (procSpell->SpellFamilyFlags[0] & 0x2)
+                {
+                    // Chain lightning has [LightOverload_Proc_Chance] / [Max_Number_of_Targets] chance to proc of each individual target hit.
+                    // A maxed LO would have a 33% / 3 = 11% chance to proc of each target.
+                    // LO chance was already "accounted" at the proc chance roll, now need to divide the chance by [Max_Number_of_Targets]
+                    float chance = 100.0f / procSpell->EffectChainTarget[effIndex];
+                    if (!roll_chance_f(chance))
+                        return false;
+
+                    // Remove cooldown (Chain Lightning - have Category Recovery time)
                     ToPlayer()->RemoveSpellCooldown(spellId);
+                }
 
                 CastSpell(pVictim, spellId, true, castItem, triggeredByAura);
 
-                this->ToPlayer()->AddSpellMod(mod, false);
-
                 if (cooldown && GetTypeId() == TYPEID_PLAYER)
-                    ToPlayer()->AddSpellCooldown(dummySpell->Id,0,time(NULL) + cooldown);
+                    ToPlayer()->AddSpellCooldown(dummySpell->Id, 0, time(NULL) + cooldown);
 
                 return true;
             }
diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h
index a9ae3bc4cc0..a1692794ca8 100644
--- a/src/server/game/Miscellaneous/SharedDefines.h
+++ b/src/server/game/Miscellaneous/SharedDefines.h
@@ -287,7 +287,7 @@ const uint32 ItemQualityColors[MAX_ITEM_QUALITY] = {
 #define SPELL_ATTR_EX_NEGATIVE                    0x00000080            // 7
 #define SPELL_ATTR_EX_NOT_IN_COMBAT_TARGET        0x00000100            // 8 Spell req target not to be in combat state
 #define SPELL_ATTR_EX_UNK9                        0x00000200            // 9 melee spells
-#define SPELL_ATTR_EX_UNK10                       0x00000400            // 10 no generates threat on cast 100%? (old NO_INITIAL_AGGRO)
+#define SPELL_ATTR_EX_NO_THREAT                   0x00000400            // 10 no generates threat on cast 100% (old NO_INITIAL_AGGRO)
 #define SPELL_ATTR_EX_UNK11                       0x00000800            // 11 aura
 #define SPELL_ATTR_EX_UNK12                       0x00001000            // 12
 #define SPELL_ATTR_EX_UNK13                       0x00002000            // 13
-- 
cgit v1.2.3


From 7091c37ac0608685cd5f695c956a8635015347fb Mon Sep 17 00:00:00 2001
From: click 
Date: Fri, 2 Jul 2010 16:02:40 +0200
Subject: Add Trinity copyright holders for scripts

--HG--
branch : trunk
---
 .../scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp       | 3 ++-
 src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.h  | 3 ++-
 .../EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp      | 3 ++-
 src/server/scripts/EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp  | 3 ++-
 .../EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp | 3 ++-
 .../EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp        | 3 ++-
 .../EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp        | 3 ++-
 src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp    | 3 ++-
 .../BlackrockDepths/boss_high_interrogator_gerstahn.cpp                | 3 ++-
 src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp     | 3 ++-
 .../scripts/EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp | 3 ++-
 .../scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp     | 3 ++-
 .../EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp      | 3 ++-
 src/server/scripts/EasternKingdoms/BlackrockSpire/boss_drakkisath.cpp  | 3 ++-
 src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gyth.cpp        | 3 ++-
 src/server/scripts/EasternKingdoms/BlackrockSpire/boss_halycon.cpp     | 3 ++-
 .../scripts/EasternKingdoms/BlackrockSpire/boss_highlord_omokk.cpp     | 3 ++-
 .../scripts/EasternKingdoms/BlackrockSpire/boss_mother_smolderweb.cpp  | 3 ++-
 .../EasternKingdoms/BlackrockSpire/boss_overlord_wyrmthalak.cpp        | 3 ++-
 .../EasternKingdoms/BlackrockSpire/boss_pyroguard_emberseer.cpp        | 3 ++-
 .../EasternKingdoms/BlackrockSpire/boss_quartermaster_zigris.cpp       | 3 ++-
 .../scripts/EasternKingdoms/BlackrockSpire/boss_rend_blackhand.cpp     | 3 ++-
 .../EasternKingdoms/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp    | 3 ++-
 src/server/scripts/EasternKingdoms/BlackrockSpire/boss_the_beast.cpp   | 3 ++-
 .../scripts/EasternKingdoms/BlackrockSpire/boss_warmaster_voone.cpp    | 3 ++-
 .../scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp | 3 ++-
 src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp   | 3 ++-
 src/server/scripts/EasternKingdoms/BlackwingLair/boss_ebonroc.cpp      | 3 ++-
 src/server/scripts/EasternKingdoms/BlackwingLair/boss_firemaw.cpp      | 3 ++-
 src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp     | 3 ++-
 src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp     | 3 ++-
 src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp    | 3 ++-
 src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp  | 3 ++-
 .../scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp     | 3 ++-
 .../scripts/EasternKingdoms/BlackwingLair/instance_blackwing_lair.cpp  | 3 ++-
 src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp             | 3 ++-
 src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp           | 3 ++-
 src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp  | 3 ++-
 src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp          | 3 ++-
 src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp       | 3 ++-
 src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp         | 3 ++-
 src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp | 3 ++-
 src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp     | 3 ++-
 src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp | 3 ++-
 src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp           | 3 ++-
 src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp      | 3 ++-
 src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp               | 3 ++-
 src/server/scripts/EasternKingdoms/Karazhan/karazhan.h                 | 3 ++-
 .../EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp        | 3 ++-
 .../EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp       | 3 ++-
 .../scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp  | 3 ++-
 src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp  | 3 ++-
 .../EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp    | 3 ++-
 .../scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp     | 3 ++-
 .../scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h       | 3 ++-
 src/server/scripts/EasternKingdoms/MoltenCore/boss_baron_geddon.cpp    | 3 ++-
 src/server/scripts/EasternKingdoms/MoltenCore/boss_garr.cpp            | 3 ++-
 src/server/scripts/EasternKingdoms/MoltenCore/boss_gehennas.cpp        | 3 ++-
 src/server/scripts/EasternKingdoms/MoltenCore/boss_golemagg.cpp        | 3 ++-
 src/server/scripts/EasternKingdoms/MoltenCore/boss_lucifron.cpp        | 3 ++-
 src/server/scripts/EasternKingdoms/MoltenCore/boss_magmadar.cpp        | 3 ++-
 .../scripts/EasternKingdoms/MoltenCore/boss_majordomo_executus.cpp     | 3 ++-
 src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp        | 3 ++-
 src/server/scripts/EasternKingdoms/MoltenCore/boss_shazzrah.cpp        | 3 ++-
 .../scripts/EasternKingdoms/MoltenCore/boss_sulfuron_harbinger.cpp     | 3 ++-
 src/server/scripts/EasternKingdoms/MoltenCore/instance_molten_core.cpp | 3 ++-
 src/server/scripts/EasternKingdoms/MoltenCore/molten_core.cpp          | 3 ++-
 src/server/scripts/EasternKingdoms/MoltenCore/molten_core.h            | 3 ++-
 .../scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp    | 3 ++-
 .../EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp     | 3 ++-
 .../EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp        | 3 ++-
 .../EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp        | 3 ++-
 src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp     | 3 ++-
 .../ScarletMonastery/boss_high_inquisitor_fairbanks.cpp                | 3 ++-
 .../EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp       | 3 ++-
 .../EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp      | 3 ++-
 .../EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp   | 3 ++-
 src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp     | 3 ++-
 .../EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp    | 3 ++-
 .../scripts/EasternKingdoms/ScarletMonastery/scarlet_monastery.h       | 3 ++-
 .../scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp   | 3 ++-
 .../EasternKingdoms/Scholomance/boss_death_knight_darkreaver.cpp       | 3 ++-
 .../EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp      | 3 ++-
 src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp  | 3 ++-
 .../scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp    | 3 ++-
 src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp  | 3 ++-
 src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp         | 3 ++-
 .../scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp     | 3 ++-
 .../scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp    | 3 ++-
 .../scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp      | 3 ++-
 src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp   | 3 ++-
 src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp         | 3 ++-
 .../scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp       | 3 ++-
 src/server/scripts/EasternKingdoms/Scholomance/scholomance.h           | 3 ++-
 .../EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp        | 3 ++-
 src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp  | 3 ++-
 src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h    | 3 ++-
 src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp | 3 ++-
 .../scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp      | 3 ++-
 .../scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp   | 3 ++-
 .../scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp    | 3 ++-
 .../scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp   | 3 ++-
 .../scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp      | 3 ++-
 src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp      | 3 ++-
 .../scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp   | 3 ++-
 .../scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp      | 3 ++-
 .../scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp    | 3 ++-
 src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp | 3 ++-
 src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp  | 3 ++-
 src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp           | 3 ++-
 src/server/scripts/EasternKingdoms/Stratholme/stratholme.h             | 3 ++-
 src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp   | 3 ++-
 src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp    | 3 ++-
 .../EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp        | 3 ++-
 src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h    | 3 ++-
 src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp            | 3 ++-
 src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp                 | 3 ++-
 src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp            | 3 ++-
 src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp            | 3 ++-
 src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp           | 3 ++-
 src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp        | 3 ++-
 src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp                 | 3 ++-
 src/server/scripts/EasternKingdoms/ZulAman/zulaman.h                   | 3 ++-
 src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp            | 3 ++-
 src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp         | 3 ++-
 src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp            | 3 ++-
 src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp            | 3 ++-
 src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp          | 3 ++-
 src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp            | 3 ++-
 src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp             | 3 ++-
 src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp          | 3 ++-
 src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp             | 3 ++-
 src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp          | 3 ++-
 src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp            | 3 ++-
 src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp           | 3 ++-
 src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp         | 3 ++-
 src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp      | 3 ++-
 src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h                 | 3 ++-
 src/server/scripts/EasternKingdoms/alterac_mountains.cpp               | 3 ++-
 src/server/scripts/EasternKingdoms/arathi_highlands.cpp                | 3 ++-
 src/server/scripts/EasternKingdoms/blasted_lands.cpp                   | 3 ++-
 src/server/scripts/EasternKingdoms/boss_kruul.cpp                      | 3 ++-
 src/server/scripts/EasternKingdoms/burning_steppes.cpp                 | 3 ++-
 src/server/scripts/EasternKingdoms/dun_morogh.cpp                      | 3 ++-
 src/server/scripts/EasternKingdoms/eastern_plaguelands.cpp             | 3 ++-
 src/server/scripts/EasternKingdoms/elwynn_forest.cpp                   | 3 ++-
 src/server/scripts/EasternKingdoms/eversong_woods.cpp                  | 3 ++-
 src/server/scripts/EasternKingdoms/ghostlands.cpp                      | 3 ++-
 src/server/scripts/EasternKingdoms/hinterlands.cpp                     | 3 ++-
 src/server/scripts/EasternKingdoms/ironforge.cpp                       | 3 ++-
 src/server/scripts/EasternKingdoms/isle_of_queldanas.cpp               | 3 ++-
 src/server/scripts/EasternKingdoms/loch_modan.cpp                      | 3 ++-
 src/server/scripts/EasternKingdoms/searing_gorge.cpp                   | 3 ++-
 src/server/scripts/EasternKingdoms/silvermoon_city.cpp                 | 3 ++-
 src/server/scripts/EasternKingdoms/silverpine_forest.cpp               | 3 ++-
 src/server/scripts/EasternKingdoms/stormwind_city.cpp                  | 3 ++-
 src/server/scripts/EasternKingdoms/stranglethorn_vale.cpp              | 3 ++-
 src/server/scripts/EasternKingdoms/tirisfal_glades.cpp                 | 3 ++-
 src/server/scripts/EasternKingdoms/undercity.cpp                       | 3 ++-
 src/server/scripts/EasternKingdoms/western_plaguelands.cpp             | 3 ++-
 src/server/scripts/EasternKingdoms/westfall.cpp                        | 3 ++-
 src/server/scripts/EasternKingdoms/wetlands.cpp                        | 3 ++-
 src/server/scripts/Examples/example_creature.cpp                       | 3 ++-
 src/server/scripts/Examples/example_escort.cpp                         | 3 ++-
 src/server/scripts/Examples/example_gossip_codebox.cpp                 | 3 ++-
 src/server/scripts/Examples/example_misc.cpp                           | 3 ++-
 src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h       | 3 ++-
 .../scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp   | 3 ++-
 .../Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp     | 3 ++-
 .../scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp       | 3 ++-
 src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h  | 3 ++-
 .../scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp     | 3 ++-
 .../scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h       | 3 ++-
 .../Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp      | 3 ++-
 src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp   | 3 ++-
 .../Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp        | 3 ++-
 src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp | 3 ++-
 src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp   | 3 ++-
 src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.h     | 3 ++-
 .../scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp | 3 ++-
 .../CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp     | 3 ++-
 .../CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp        | 3 ++-
 .../CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp     | 3 ++-
 .../CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp   | 3 ++-
 .../Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp   | 3 ++-
 .../Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h     | 3 ++-
 src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp      | 3 ++-
 src/server/scripts/Kalimdor/Maraudon/boss_landslide.cpp                | 3 ++-
 src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp                  | 3 ++-
 src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp       | 3 ++-
 .../scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp   | 3 ++-
 src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp           | 3 ++-
 src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp  | 3 ++-
 src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp           | 3 ++-
 src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.h             | 3 ++-
 src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp           | 3 ++-
 src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp              | 3 ++-
 src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp         | 3 ++-
 src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp              | 3 ++-
 src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp          | 3 ++-
 src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp            | 3 ++-
 .../scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp    | 3 ++-
 src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp         | 3 ++-
 src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp            | 3 ++-
 src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp         | 3 ++-
 src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp          | 3 ++-
 src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp             | 3 ++-
 src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp          | 3 ++-
 src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp           | 3 ++-
 src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp     | 3 ++-
 src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp         | 3 ++-
 .../scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp  | 3 ++-
 .../scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp       | 3 ++-
 src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h      | 3 ++-
 .../scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp       | 3 ++-
 src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp         | 3 ++-
 src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.h           | 3 ++-
 src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp                    | 3 ++-
 src/server/scripts/Kalimdor/ashenvale.cpp                              | 3 ++-
 src/server/scripts/Kalimdor/azshara.cpp                                | 3 ++-
 src/server/scripts/Kalimdor/azuremyst_isle.cpp                         | 3 ++-
 src/server/scripts/Kalimdor/bloodmyst_isle.cpp                         | 3 ++-
 src/server/scripts/Kalimdor/boss_azuregos.cpp                          | 3 ++-
 src/server/scripts/Kalimdor/darkshore.cpp                              | 3 ++-
 src/server/scripts/Kalimdor/desolace.cpp                               | 3 ++-
 src/server/scripts/Kalimdor/dustwallow_marsh.cpp                       | 3 ++-
 src/server/scripts/Kalimdor/felwood.cpp                                | 3 ++-
 src/server/scripts/Kalimdor/feralas.cpp                                | 3 ++-
 src/server/scripts/Kalimdor/moonglade.cpp                              | 3 ++-
 src/server/scripts/Kalimdor/mulgore.cpp                                | 3 ++-
 src/server/scripts/Kalimdor/orgrimmar.cpp                              | 3 ++-
 src/server/scripts/Kalimdor/silithus.cpp                               | 3 ++-
 src/server/scripts/Kalimdor/stonetalon_mountains.cpp                   | 3 ++-
 src/server/scripts/Kalimdor/tanaris.cpp                                | 3 ++-
 src/server/scripts/Kalimdor/teldrassil.cpp                             | 3 ++-
 src/server/scripts/Kalimdor/the_barrens.cpp                            | 3 ++-
 src/server/scripts/Kalimdor/thousand_needles.cpp                       | 3 ++-
 src/server/scripts/Kalimdor/thunder_bluff.cpp                          | 3 ++-
 src/server/scripts/Kalimdor/ungoro_crater.cpp                          | 3 ++-
 src/server/scripts/Kalimdor/winterspring.cpp                           | 3 ++-
 .../CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp      | 3 ++-
 .../CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h       | 3 ++-
 src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp              | 3 ++-
 src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp             | 3 ++-
 src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp          | 3 ++-
 src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp       | 3 ++-
 src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp              | 3 ++-
 src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp            | 3 ++-
 .../scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp       | 3 ++-
 src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp    | 3 ++-
 src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp    | 3 ++-
 src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp  | 3 ++-
 .../scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h     | 3 ++-
 .../Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp  | 3 ++-
 src/server/scripts/Northrend/borean_tundra.cpp                         | 3 ++-
 src/server/scripts/Northrend/dragonblight.cpp                          | 3 ++-
 src/server/scripts/Northrend/grizzly_hills.cpp                         | 3 ++-
 src/server/scripts/Northrend/icecrown.cpp                              | 3 ++-
 .../scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp | 3 ++-
 .../Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp        | 3 ++-
 .../scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp  | 3 ++-
 src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp   | 3 ++-
 .../scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp   | 3 ++-
 .../scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp  | 3 ++-
 .../scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp | 3 ++-
 src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h     | 3 ++-
 .../Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp     | 3 ++-
 .../Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp | 3 ++-
 .../Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp     | 3 ++-
 src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp  | 3 ++-
 .../Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp   | 3 ++-
 .../scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h      | 3 ++-
 src/server/scripts/Outland/BlackTemple/black_temple.cpp                | 3 ++-
 src/server/scripts/Outland/BlackTemple/black_temple.h                  | 3 ++-
 src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp              | 3 ++-
 src/server/scripts/Outland/BlackTemple/boss_illidan.cpp                | 3 ++-
 src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp         | 3 ++-
 src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp     | 3 ++-
 src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp         | 3 ++-
 src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp        | 3 ++-
 src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp       | 3 ++-
 src/server/scripts/Outland/BlackTemple/illidari_council.cpp            | 3 ++-
 src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp       | 3 ++-
 .../CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp     | 3 ++-
 .../CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp      | 3 ++-
 .../Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp        | 3 ++-
 .../CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp       | 3 ++-
 .../Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp      | 3 ++-
 .../CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp       | 3 ++-
 .../CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp        | 3 ++-
 .../scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h   | 3 ++-
 .../Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp  | 3 ++-
 .../CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp        | 3 ++-
 .../Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp   | 3 ++-
 .../Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp      | 3 ++-
 src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h  | 3 ++-
 .../scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp      | 3 ++-
 .../Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp      | 3 ++-
 src/server/scripts/Outland/GruulsLair/boss_gruul.cpp                   | 3 ++-
 src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp       | 3 ++-
 src/server/scripts/Outland/GruulsLair/gruuls_lair.h                    | 3 ++-
 src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp         | 3 ++-
 .../scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h       | 3 ++-
 .../scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp      | 3 ++-
 .../Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp  | 3 ++-
 .../scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp    | 3 ++-
 .../Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp    | 3 ++-
 .../HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp       | 3 ++-
 .../HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp      | 3 ++-
 .../HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp    | 3 ++-
 .../Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h       | 3 ++-
 .../HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp    | 3 ++-
 .../HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp    | 3 ++-
 .../Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h       | 3 ++-
 .../scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp | 3 ++-
 .../Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp  | 3 ++-
 .../HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp | 3 ++-
 .../HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp        | 3 ++-
 .../scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h   | 3 ++-
 src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp        | 3 ++-
 src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp           | 3 ++-
 src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp        | 3 ++-
 src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp        | 3 ++-
 src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp                 | 3 ++-
 src/server/scripts/Outland/TempestKeep/Eye/the_eye.h                   | 3 ++-
 .../scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp | 3 ++-
 .../scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp | 3 ++-
 .../Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp       | 3 ++-
 .../Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp     | 3 ++-
 src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp  | 3 ++-
 src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp           | 3 ++-
 src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h             | 3 ++-
 .../scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp    | 3 ++-
 src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp  | 3 ++-
 .../Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp       | 3 ++-
 src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp           | 3 ++-
 src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp | 3 ++-
 src/server/scripts/Outland/blades_edge_mountains.cpp                   | 3 ++-
 src/server/scripts/Outland/boss_doomlord_kazzak.cpp                    | 3 ++-
 src/server/scripts/Outland/boss_doomwalker.cpp                         | 3 ++-
 src/server/scripts/Outland/hellfire_peninsula.cpp                      | 3 ++-
 src/server/scripts/Outland/nagrand.cpp                                 | 3 ++-
 src/server/scripts/Outland/netherstorm.cpp                             | 3 ++-
 src/server/scripts/Outland/shadowmoon_valley.cpp                       | 3 ++-
 src/server/scripts/Outland/shattrath_city.cpp                          | 3 ++-
 src/server/scripts/Outland/terokkar_forest.cpp                         | 3 ++-
 src/server/scripts/Outland/zangarmarsh.cpp                             | 3 ++-
 src/server/scripts/World/areatrigger_scripts.cpp                       | 3 ++-
 src/server/scripts/World/boss_emeriss.cpp                              | 3 ++-
 src/server/scripts/World/boss_lethon.cpp                               | 3 ++-
 src/server/scripts/World/boss_taerar.cpp                               | 3 ++-
 src/server/scripts/World/boss_ysondre.cpp                              | 3 ++-
 src/server/scripts/World/go_scripts.cpp                                | 3 ++-
 src/server/scripts/World/guards.cpp                                    | 3 ++-
 src/server/scripts/World/item_scripts.cpp                              | 3 ++-
 src/server/scripts/World/mob_generic_creature.cpp                      | 3 ++-
 src/server/scripts/World/npc_professions.cpp                           | 3 ++-
 src/server/scripts/World/npc_taxi.cpp                                  | 3 ++-
 src/server/scripts/World/npcs_special.cpp                              | 3 ++-
 359 files changed, 718 insertions(+), 359 deletions(-)

(limited to 'src')

diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp
index a27f28e8d9c..23df4981b75 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
 
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.h b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.h
index edb340252b2..94cd4a00e62 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.h
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software licensed under GPL version 2
 * Please see the included DOCS/LICENSE.TXT for more information */
 
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp
index 82a28197f30..43f7a28d8c7 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp
index 8565305f672..0e723df7876 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp
index 6706b4b290c..2d8cc8309a5 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp
index d3020d572d2..815e416b556 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp
index 5106fd05d99..31cf3d49a4e 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp
index af7a381af38..dd6aeb0fcf2 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp
index 6a82765f5a2..c8acf24eee2 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp
index 785a4ab3258..bf6ebeca273 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp
index b1aabbce9d2..3d3f7853139 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp
index a66796cab03..c00a7508a04 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp
index 3dd048ce449..cfdc278ea1a 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_drakkisath.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_drakkisath.cpp
index dec106dfede..e3e57c8cd40 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_drakkisath.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_drakkisath.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gyth.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gyth.cpp
index 762f82ded0f..fa5a4d541f8 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gyth.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gyth.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_halycon.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_halycon.cpp
index a95895749b1..0639f55bf2b 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_halycon.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_halycon.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_highlord_omokk.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_highlord_omokk.cpp
index 933d8f7264b..89f7a20030f 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_highlord_omokk.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_highlord_omokk.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_mother_smolderweb.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_mother_smolderweb.cpp
index 3c4cc0c0d42..876139b4aa0 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_mother_smolderweb.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_mother_smolderweb.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_overlord_wyrmthalak.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_overlord_wyrmthalak.cpp
index e63bde01cc0..cae3c6141c0 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_overlord_wyrmthalak.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_overlord_wyrmthalak.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_pyroguard_emberseer.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_pyroguard_emberseer.cpp
index 44a64dc5d0d..b0699be2005 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_pyroguard_emberseer.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_pyroguard_emberseer.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_quartermaster_zigris.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_quartermaster_zigris.cpp
index 869d3978a0b..cbfc484763e 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_quartermaster_zigris.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_quartermaster_zigris.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_rend_blackhand.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_rend_blackhand.cpp
index 390aeb9ae03..fdf051ef739 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_rend_blackhand.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_rend_blackhand.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp
index ccb1b27f9ea..2e140dbbeba 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_the_beast.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_the_beast.cpp
index 307c6c28653..555976880a2 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_the_beast.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_the_beast.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_warmaster_voone.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_warmaster_voone.cpp
index c1c4c7563f6..8500d365e7a 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_warmaster_voone.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_warmaster_voone.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp
index cf2b58ac336..d4505f06d4a 100644
--- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp
index b34d9bf9ea0..fc875504ddb 100644
--- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_ebonroc.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_ebonroc.cpp
index 9c2657be8a7..38f26565473 100644
--- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_ebonroc.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_ebonroc.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_firemaw.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_firemaw.cpp
index f7712bbfd86..56ba7be5f8b 100644
--- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_firemaw.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_firemaw.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp
index d2e8c392110..89bbf1106a4 100644
--- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp
index 12f4e49f3a9..1a3580caaab 100644
--- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp
index 04a18187e24..f6a96a47ca1 100644
--- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp
index 233d7074a4e..012846a82fc 100644
--- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp
index f611c21e2bf..7b20703cf2d 100644
--- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/instance_blackwing_lair.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/instance_blackwing_lair.cpp
index 7a299edaf85..af4f8660cca 100644
--- a/src/server/scripts/EasternKingdoms/BlackwingLair/instance_blackwing_lair.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackwingLair/instance_blackwing_lair.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp b/src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp
index 805d5887cdd..ef91e64a090 100644
--- a/src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp
+++ b/src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp
index 9ddc8f974d5..7f6932fd9a6 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp
index 09b7c437014..2b0b74ef8e5 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp
index 8856445ff2b..e7cad239007 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp
index e4240a732e9..13ec19858c8 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp
index d542ed7fabc..b775c0ecb6f 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp
index e1ba09753fb..40c4d682c40 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
index e7c26491cb0..d4621489898 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
index 9f85cef83ea..053aa638536 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
index bf4db4d9d01..7e2652d8678 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp
index 0911efc01f0..fc901b8c568 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
index a388600b51d..d2d17653da1 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
@@ -1,4 +1,5 @@
- /* Copyright (C) 2006 - 2009 ScriptDev2 
+ /* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.h b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.h
index 86562fd06df..9120bec1478 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.h
+++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software licensed under GPL version 2
  * Please see the included DOCS/LICENSE.TXT for more information */
 
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
index 70a35bc1c73..15c73a0d31f 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
index fb01176b579..352b2c2c5c8 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
index 15be0f2f87a..38bd7a40054 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
index d64da62566a..10170fc8247 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
index ff8b0b88786..044f557e4c2 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp
index c2c9be38341..075add0442e 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h
index d6419ea409c..6263b6f6870 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software licensed under GPL version 2
  * Please see the included DOCS/LICENSE.TXT for more information */
 
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_baron_geddon.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_baron_geddon.cpp
index 45363c5be77..e9d9625fc34 100644
--- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_baron_geddon.cpp
+++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_baron_geddon.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_garr.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_garr.cpp
index fcf5560d5fe..ac363c4ad8f 100644
--- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_garr.cpp
+++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_garr.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_gehennas.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_gehennas.cpp
index 5a003c06ad8..ffd60c3995c 100644
--- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_gehennas.cpp
+++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_gehennas.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_golemagg.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_golemagg.cpp
index 38837526134..f4814cb69f3 100644
--- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_golemagg.cpp
+++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_golemagg.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_lucifron.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_lucifron.cpp
index 64718fcbff1..773b0a34b6b 100644
--- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_lucifron.cpp
+++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_lucifron.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_magmadar.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_magmadar.cpp
index a60aba45bdd..cdae64995d4 100644
--- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_magmadar.cpp
+++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_magmadar.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_majordomo_executus.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_majordomo_executus.cpp
index 6dbf035f98e..3d3d62c3f32 100644
--- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_majordomo_executus.cpp
+++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_majordomo_executus.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp
index adc12c3ea87..135e160eaad 100644
--- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp
+++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_shazzrah.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_shazzrah.cpp
index 1ddad9bc641..7852fc371d5 100644
--- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_shazzrah.cpp
+++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_shazzrah.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_sulfuron_harbinger.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_sulfuron_harbinger.cpp
index ce908bac660..1c98f89563f 100644
--- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_sulfuron_harbinger.cpp
+++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_sulfuron_harbinger.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/instance_molten_core.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/instance_molten_core.cpp
index dbb7f73776c..5b620592de6 100644
--- a/src/server/scripts/EasternKingdoms/MoltenCore/instance_molten_core.cpp
+++ b/src/server/scripts/EasternKingdoms/MoltenCore/instance_molten_core.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/molten_core.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/molten_core.cpp
index f7a683be9a3..85bfdcd52fc 100644
--- a/src/server/scripts/EasternKingdoms/MoltenCore/molten_core.cpp
+++ b/src/server/scripts/EasternKingdoms/MoltenCore/molten_core.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/molten_core.h b/src/server/scripts/EasternKingdoms/MoltenCore/molten_core.h
index 5874d8b9408..fe81a2f9b6e 100644
--- a/src/server/scripts/EasternKingdoms/MoltenCore/molten_core.h
+++ b/src/server/scripts/EasternKingdoms/MoltenCore/molten_core.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software licensed under GPL version 2
  * Please see the included DOCS/LICENSE.TXT for more information */
 
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp
index 60371bba99c..4164c05591b 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp
index 4080a3169d1..3a76c483e8a 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp
index 56056d5e48d..04c58978cf6 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
index 925eb74618c..139884c666b 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp
index d97aef2f10a..f3c6f2db4b7 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp
index 5086caf9d78..c8e55f31186 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp
index 92e2091effb..459f6a07bf1 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp
index 7a8a092eaa9..8e5821b4643 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp
index 10d9c3f9996..8f236df9769 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp
index d09388d6963..87cf9e0111d 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp
index 72cc08b674c..5dd4f659b3a 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/scarlet_monastery.h b/src/server/scripts/EasternKingdoms/ScarletMonastery/scarlet_monastery.h
index 2b6399ae3e4..4c861861b37 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/scarlet_monastery.h
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/scarlet_monastery.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
  * This program is free software licensed under GPL version 2
  * Please see the included DOCS/LICENSE.TXT for more information */
 
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp
index 6dc15fd64bd..2800d6edf93 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_death_knight_darkreaver.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_death_knight_darkreaver.cpp
index 8032bf42658..814a87ed0c9 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_death_knight_darkreaver.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_death_knight_darkreaver.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp
index 852e62f12cd..97d769a7c6c 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp
index 7ae60615085..f9694749cbc 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp
index 8ce846ca456..d6d6c01e2d1 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp
index 598b258d5b0..c51236f175a 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp
index e93ab0c424e..40ce79e8fa9 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp
index b9409ed7400..e88a76a5ded 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp
index c00de34489c..3335ea914b0 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp
index 9a76ee220d6..d6711184b98 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp
index 5d236d28a94..de881f84240 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp
index aa9bb06eb6f..33c53711358 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp b/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp
index d3ae27374c7..48379226f62 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/scholomance.h b/src/server/scripts/EasternKingdoms/Scholomance/scholomance.h
index 83ce26c9687..f8482d670c0 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/scholomance.h
+++ b/src/server/scripts/EasternKingdoms/Scholomance/scholomance.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software licensed under GPL version 2
  * Please see the included DOCS/LICENSE.TXT for more information */
 
diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
index f80de543714..372710771f9 100644
--- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
+++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
index 72922017ab4..8e21246afbd 100644
--- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
+++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
@@ -1,4 +1,5 @@
- /* Copyright (C) 2006 - 2009 ScriptDev2 
+ /* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h
index a1a59789632..67cac79fd04 100644
--- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h
+++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software licensed under GPL version 2
  * Please see the included DOCS/LICENSE.TXT for more information */
 
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp
index ddde69bde3a..492830c4fbd 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp
index 808a8213b75..6d119090457 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp
index 4c533c3f276..5b3950d2463 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp
index fffeb966d75..55b311af624 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp
index 3e806c502c2..ac1f2fd3761 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp
index 48a497899bb..7b532a945c2 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp
index 9f8ab239ec0..09331490598 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp
index cb922246d46..4c19e351954 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp
index 6671e48e9df..5f40fde9a59 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp
index 640ded28264..59c4da475b0 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp
index 2567a6dc07b..d009c8767b2 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp
index ce5794237f1..5bb6f091505 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp
index 402c7c18171..90645098a7a 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.h b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.h
index b9246091a7c..0ff218af5cd 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.h
+++ b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software licensed under GPL version 2
 * Please see the included DOCS/LICENSE.TXT for more information */
 
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp
index 2bf2967c914..6e034d0f7e8 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
index c41b213bd6a..b9930a4a3e5 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp
index 12e94c2f33d..e51b95bf606 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software licensed under GPL version 2
  * Please see the included DOCS/LICENSE.TXT for more information */
 
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h b/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h
index 9f1a2480c96..0afac50d6ef 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software licensed under GPL version 2
  * Please see the included DOCS/LICENSE.TXT for more information */
 
diff --git a/src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp b/src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp
index 1b732f3bca8..36f1c7dec22 100644
--- a/src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp
+++ b/src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp
index 90e5bb734b7..ddaf2de6a6f 100644
--- a/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp
+++ b/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
index 5edb21e792e..7a6c0baf25d 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
index 9ab4937163a..b8954777487 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
@@ -1,4 +1,5 @@
- /* Copyright (C) 2006 - 2009 ScriptDev2 
+ /* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
index f8620bb7769..5406b77c3f8 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
@@ -1,4 +1,5 @@
- /* Copyright (C) 2006 - 2009 ScriptDev2 
+ /* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
index 1f74fdf4d7f..a1a53764471 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
@@ -1,4 +1,5 @@
- /* Copyright (C) 2006 - 2009 ScriptDev2 
+ /* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
index 6fd68e49186..fe2f5b8e77e 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.h b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.h
index 6fb0ef173bd..4f0ccf29683 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.h
+++ b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software licensed under GPL version 2
 * Please see the included DOCS/LICENSE.TXT for more information */
 
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
index a309028b67d..476f92b2b53 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp
index 88648b7334f..85d6dd6493b 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
index 24d98453f22..24fe2e98089 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
index 3e34eb9c3e3..9ae1083811b 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
index 602852b3e90..5ba1d9656d4 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
index 73fcda881a4..37f7381d56e 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
index ece31a9b3bd..a735f3c49e5 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
index 614a7e8cc01..a63f820d255 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
index 79beefedf5a..25a61f802ab 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
index 0e2dccf60ed..e7ae562b725 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
index e6e8f44abe1..7539f2592bf 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
index eddcf82b720..2b2a3d65d1a 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
index 79a712b4c35..f897f544d92 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
index 803c84a8958..11771919886 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h b/src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
index bf55a54c1d5..512bf5da047 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software licensed under GPL version 2
  * Please see the included DOCS/LICENSE.TXT for more information */
 
diff --git a/src/server/scripts/EasternKingdoms/alterac_mountains.cpp b/src/server/scripts/EasternKingdoms/alterac_mountains.cpp
index 8de3912ed0a..55f6d41656a 100644
--- a/src/server/scripts/EasternKingdoms/alterac_mountains.cpp
+++ b/src/server/scripts/EasternKingdoms/alterac_mountains.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/arathi_highlands.cpp b/src/server/scripts/EasternKingdoms/arathi_highlands.cpp
index 9f77c554e18..544a2631090 100644
--- a/src/server/scripts/EasternKingdoms/arathi_highlands.cpp
+++ b/src/server/scripts/EasternKingdoms/arathi_highlands.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/blasted_lands.cpp b/src/server/scripts/EasternKingdoms/blasted_lands.cpp
index 8a2917f9df7..0d94e62a70b 100644
--- a/src/server/scripts/EasternKingdoms/blasted_lands.cpp
+++ b/src/server/scripts/EasternKingdoms/blasted_lands.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/boss_kruul.cpp b/src/server/scripts/EasternKingdoms/boss_kruul.cpp
index 432da09c26f..d066e03ca61 100644
--- a/src/server/scripts/EasternKingdoms/boss_kruul.cpp
+++ b/src/server/scripts/EasternKingdoms/boss_kruul.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/burning_steppes.cpp b/src/server/scripts/EasternKingdoms/burning_steppes.cpp
index 059c491d908..a82246fbb3f 100644
--- a/src/server/scripts/EasternKingdoms/burning_steppes.cpp
+++ b/src/server/scripts/EasternKingdoms/burning_steppes.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/dun_morogh.cpp b/src/server/scripts/EasternKingdoms/dun_morogh.cpp
index 04f98cd9bb8..137e53d31f5 100644
--- a/src/server/scripts/EasternKingdoms/dun_morogh.cpp
+++ b/src/server/scripts/EasternKingdoms/dun_morogh.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/eastern_plaguelands.cpp b/src/server/scripts/EasternKingdoms/eastern_plaguelands.cpp
index e643964f8ad..3e42153b805 100644
--- a/src/server/scripts/EasternKingdoms/eastern_plaguelands.cpp
+++ b/src/server/scripts/EasternKingdoms/eastern_plaguelands.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/elwynn_forest.cpp b/src/server/scripts/EasternKingdoms/elwynn_forest.cpp
index 36113dff08d..f9b91c1c285 100644
--- a/src/server/scripts/EasternKingdoms/elwynn_forest.cpp
+++ b/src/server/scripts/EasternKingdoms/elwynn_forest.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/eversong_woods.cpp b/src/server/scripts/EasternKingdoms/eversong_woods.cpp
index f32804cc3ba..b62b24145ef 100644
--- a/src/server/scripts/EasternKingdoms/eversong_woods.cpp
+++ b/src/server/scripts/EasternKingdoms/eversong_woods.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/ghostlands.cpp b/src/server/scripts/EasternKingdoms/ghostlands.cpp
index 9c74034b8a5..04b82d92e8e 100644
--- a/src/server/scripts/EasternKingdoms/ghostlands.cpp
+++ b/src/server/scripts/EasternKingdoms/ghostlands.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/hinterlands.cpp b/src/server/scripts/EasternKingdoms/hinterlands.cpp
index 56bedfc8f40..957abd75188 100644
--- a/src/server/scripts/EasternKingdoms/hinterlands.cpp
+++ b/src/server/scripts/EasternKingdoms/hinterlands.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/ironforge.cpp b/src/server/scripts/EasternKingdoms/ironforge.cpp
index c294ec2403b..4f59891fdbd 100644
--- a/src/server/scripts/EasternKingdoms/ironforge.cpp
+++ b/src/server/scripts/EasternKingdoms/ironforge.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/isle_of_queldanas.cpp b/src/server/scripts/EasternKingdoms/isle_of_queldanas.cpp
index 4170a32e0d1..c8061714259 100644
--- a/src/server/scripts/EasternKingdoms/isle_of_queldanas.cpp
+++ b/src/server/scripts/EasternKingdoms/isle_of_queldanas.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/loch_modan.cpp b/src/server/scripts/EasternKingdoms/loch_modan.cpp
index b2d540b55af..d50cdef8c60 100644
--- a/src/server/scripts/EasternKingdoms/loch_modan.cpp
+++ b/src/server/scripts/EasternKingdoms/loch_modan.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/searing_gorge.cpp b/src/server/scripts/EasternKingdoms/searing_gorge.cpp
index cc1be0a11f0..b7b2e6a6107 100644
--- a/src/server/scripts/EasternKingdoms/searing_gorge.cpp
+++ b/src/server/scripts/EasternKingdoms/searing_gorge.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/silvermoon_city.cpp b/src/server/scripts/EasternKingdoms/silvermoon_city.cpp
index 2864bb4bf64..52ff8513d95 100644
--- a/src/server/scripts/EasternKingdoms/silvermoon_city.cpp
+++ b/src/server/scripts/EasternKingdoms/silvermoon_city.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/silverpine_forest.cpp b/src/server/scripts/EasternKingdoms/silverpine_forest.cpp
index e3ed130b44d..cb105a102ef 100644
--- a/src/server/scripts/EasternKingdoms/silverpine_forest.cpp
+++ b/src/server/scripts/EasternKingdoms/silverpine_forest.cpp
@@ -1,4 +1,5 @@
- /* Copyright (C) 2006 - 2009 ScriptDev2 
+ /* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/stormwind_city.cpp b/src/server/scripts/EasternKingdoms/stormwind_city.cpp
index 0775ec307c9..9043942feb4 100644
--- a/src/server/scripts/EasternKingdoms/stormwind_city.cpp
+++ b/src/server/scripts/EasternKingdoms/stormwind_city.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/stranglethorn_vale.cpp b/src/server/scripts/EasternKingdoms/stranglethorn_vale.cpp
index 7b3f5136831..9537244fbd8 100644
--- a/src/server/scripts/EasternKingdoms/stranglethorn_vale.cpp
+++ b/src/server/scripts/EasternKingdoms/stranglethorn_vale.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp b/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp
index 436ce13ae7d..966b23489e6 100644
--- a/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp
+++ b/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/undercity.cpp b/src/server/scripts/EasternKingdoms/undercity.cpp
index 1f4dd34ecbd..9a7c66e45fb 100644
--- a/src/server/scripts/EasternKingdoms/undercity.cpp
+++ b/src/server/scripts/EasternKingdoms/undercity.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/western_plaguelands.cpp b/src/server/scripts/EasternKingdoms/western_plaguelands.cpp
index b78a5e4f656..38d81a1de7c 100644
--- a/src/server/scripts/EasternKingdoms/western_plaguelands.cpp
+++ b/src/server/scripts/EasternKingdoms/western_plaguelands.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/westfall.cpp b/src/server/scripts/EasternKingdoms/westfall.cpp
index 6aa1d3e2a10..10a7705aeba 100644
--- a/src/server/scripts/EasternKingdoms/westfall.cpp
+++ b/src/server/scripts/EasternKingdoms/westfall.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/EasternKingdoms/wetlands.cpp b/src/server/scripts/EasternKingdoms/wetlands.cpp
index 77692738000..2b68542cd1b 100644
--- a/src/server/scripts/EasternKingdoms/wetlands.cpp
+++ b/src/server/scripts/EasternKingdoms/wetlands.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Examples/example_creature.cpp b/src/server/scripts/Examples/example_creature.cpp
index 8b62cecc5f2..c35071d3ae2 100644
--- a/src/server/scripts/Examples/example_creature.cpp
+++ b/src/server/scripts/Examples/example_creature.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Examples/example_escort.cpp b/src/server/scripts/Examples/example_escort.cpp
index d0d0bd3f352..8ef52e37d3f 100644
--- a/src/server/scripts/Examples/example_escort.cpp
+++ b/src/server/scripts/Examples/example_escort.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Examples/example_gossip_codebox.cpp b/src/server/scripts/Examples/example_gossip_codebox.cpp
index 620a6a6b41e..f2325ad5bad 100644
--- a/src/server/scripts/Examples/example_gossip_codebox.cpp
+++ b/src/server/scripts/Examples/example_gossip_codebox.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Examples/example_misc.cpp b/src/server/scripts/Examples/example_misc.cpp
index f0676bb4b78..3a36411065c 100644
--- a/src/server/scripts/Examples/example_misc.cpp
+++ b/src/server/scripts/Examples/example_misc.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h
index e8bbab9f105..6d6ef5e44db 100644
--- a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h
+++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software licensed under GPL version 2
  * Please see the included DOCS/LICENSE.TXT for more information */
 
diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp
index a3155f911e1..0be581ea325 100644
--- a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp
+++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
index 3e1ef33e548..407a968dd09 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp
index a72598c0e7d..762f5e406d2 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp
@@ -1,4 +1,5 @@
- /* Copyright (C) 2006 - 2009 ScriptDev2 
+ /* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h
index bfc9a54dfd9..7487759a129 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software licensed under GPL version 2
  * Please see the included DOCS/LICENSE.TXT for more information */
 
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
index c329c659419..5093b9f8d04 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h
index 5c75465b7b4..823ae8f56bc 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software licensed under GPL version 2
  * Please see the included DOCS/LICENSE.TXT for more information */
 
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
index 54007a11ecd..665f2ac80b7 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
@@ -1,4 +1,5 @@
- /* Copyright (C) 2006 - 2009 ScriptDev2 
+ /* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp
index dd6a70461d5..c8a3a02e2af 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp
index b347302b04b..f0daf8780fb 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp
index ad5a3007c79..2800d57b22d 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp
index b31c265575e..e29e6f805b5 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.h b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.h
index 7bfd8c917d7..7927ea894ab 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.h
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software licensed under GPL version 2
 * Please see the included DOCS/LICENSE.TXT for more information */
 
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp
index 58120d6dc55..39307b6696f 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp
index 2f9e89ef5cb..ae40fdcbb0a 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp
index 93b724a3401..b2595e752de 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp
index 54e3d410cdb..a04bc48b75b 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
index c6511af2a65..217207c848d 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
index 31660577e50..65fcd757d61 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
@@ -1,4 +1,5 @@
- /* Copyright (C) 2006 - 2009 ScriptDev2 
+ /* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h
index 5c398cc2647..b4c6f1934c9 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software licensed under GPL version 2
  * Please see the included DOCS/LICENSE.TXT for more information */
 
diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp
index 68702dec40e..e56b002b7e5 100644
--- a/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp
+++ b/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_landslide.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_landslide.cpp
index e21472ab7c5..80d3628f59b 100644
--- a/src/server/scripts/Kalimdor/Maraudon/boss_landslide.cpp
+++ b/src/server/scripts/Kalimdor/Maraudon/boss_landslide.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp
index 949e12f3016..4dee83ac26b 100644
--- a/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp
+++ b/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp
index d052b239b7b..2ea8bf9f815 100644
--- a/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp
+++ b/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp
index 9831e1cb8b5..902d564aee2 100644
--- a/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp
index 82d5b5cf871..738a03d1fd6 100644
--- a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp
index 7ba2ebd5bc2..b918ba7c146 100644
--- a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp
index ce2deb5c041..5604b58b216 100644
--- a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.h b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.h
index e2219986f63..2f6b21ee515 100644
--- a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.h
+++ b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp
index f18879036d5..8a05f78bff0 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
index b921623a46a..21114099064 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp
index adbb7c6d12a..b958a172ddf 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp
index c8e019f6f33..17211d4d72a 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
index 7496ccff77f..249b2f05166 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp
index 5d49ff5d350..a71568b3707 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp
index 9a21dd2e184..573f5b8f298 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp
index 296a7ba2388..8b11f1b7893 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
index 44a6409982a..7fe767e5b05 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp
index 20ff82af7d9..ba4b10d71e7 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp
index 94cd25c5edb..04136856a9f 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp
index cbc028b1da8..f59983eb945 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp
index aa4bcbc80f6..f3d890f3e0c 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp
index 3ae6cf385dd..d9ef9a08a24 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp
index dd970230476..85bf1549970 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp
index af20ab1e92f..b5c360ce015 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp
index 36fb4fdd297..5d80d15595e 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp
index 7bb00941260..761b45afb39 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h
index 5d545ed7c74..ac584f5918e 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software licensed under GPL version 2
  * Please see the included DOCS/LICENSE.TXT for more information */
 
diff --git a/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp b/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp
index f2083ace914..5dde3ae15f2 100644
--- a/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp
+++ b/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp
index 0b65948153e..90d645cfbab 100644
--- a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp
+++ b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.h b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.h
index 6ef1a673c59..981f886fd78 100644
--- a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.h
+++ b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software licensed under GPL version 2
  * Please see the included DOCS/LICENSE.TXT for more information */
 
diff --git a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp
index 406fa405b82..d51124199c8 100644
--- a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp
+++ b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/ashenvale.cpp b/src/server/scripts/Kalimdor/ashenvale.cpp
index 723828ad413..c9685b17f01 100644
--- a/src/server/scripts/Kalimdor/ashenvale.cpp
+++ b/src/server/scripts/Kalimdor/ashenvale.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/azshara.cpp b/src/server/scripts/Kalimdor/azshara.cpp
index 3350eceb7dd..f54329f4576 100644
--- a/src/server/scripts/Kalimdor/azshara.cpp
+++ b/src/server/scripts/Kalimdor/azshara.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/azuremyst_isle.cpp b/src/server/scripts/Kalimdor/azuremyst_isle.cpp
index e1a63062439..3923921c5c5 100644
--- a/src/server/scripts/Kalimdor/azuremyst_isle.cpp
+++ b/src/server/scripts/Kalimdor/azuremyst_isle.cpp
@@ -1,4 +1,5 @@
- /* Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
+ /* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/bloodmyst_isle.cpp b/src/server/scripts/Kalimdor/bloodmyst_isle.cpp
index 88dda4bafc4..f0bfe430fec 100644
--- a/src/server/scripts/Kalimdor/bloodmyst_isle.cpp
+++ b/src/server/scripts/Kalimdor/bloodmyst_isle.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/boss_azuregos.cpp b/src/server/scripts/Kalimdor/boss_azuregos.cpp
index f2d072ed343..81c7da916bf 100644
--- a/src/server/scripts/Kalimdor/boss_azuregos.cpp
+++ b/src/server/scripts/Kalimdor/boss_azuregos.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/darkshore.cpp b/src/server/scripts/Kalimdor/darkshore.cpp
index 49f14ef0408..548049c90aa 100644
--- a/src/server/scripts/Kalimdor/darkshore.cpp
+++ b/src/server/scripts/Kalimdor/darkshore.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/desolace.cpp b/src/server/scripts/Kalimdor/desolace.cpp
index 5b5b93668f2..814ec34b8f5 100644
--- a/src/server/scripts/Kalimdor/desolace.cpp
+++ b/src/server/scripts/Kalimdor/desolace.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/dustwallow_marsh.cpp b/src/server/scripts/Kalimdor/dustwallow_marsh.cpp
index 86a13c9e0e4..ddd41f4e45b 100644
--- a/src/server/scripts/Kalimdor/dustwallow_marsh.cpp
+++ b/src/server/scripts/Kalimdor/dustwallow_marsh.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/felwood.cpp b/src/server/scripts/Kalimdor/felwood.cpp
index 45e155080c8..c9d551ae996 100644
--- a/src/server/scripts/Kalimdor/felwood.cpp
+++ b/src/server/scripts/Kalimdor/felwood.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/feralas.cpp b/src/server/scripts/Kalimdor/feralas.cpp
index 8e34fa3c45a..5f54b67810e 100644
--- a/src/server/scripts/Kalimdor/feralas.cpp
+++ b/src/server/scripts/Kalimdor/feralas.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/moonglade.cpp b/src/server/scripts/Kalimdor/moonglade.cpp
index 0a402a8780c..acec591e2b3 100644
--- a/src/server/scripts/Kalimdor/moonglade.cpp
+++ b/src/server/scripts/Kalimdor/moonglade.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/mulgore.cpp b/src/server/scripts/Kalimdor/mulgore.cpp
index 52aa1cdcaa2..00d405fae26 100644
--- a/src/server/scripts/Kalimdor/mulgore.cpp
+++ b/src/server/scripts/Kalimdor/mulgore.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/orgrimmar.cpp b/src/server/scripts/Kalimdor/orgrimmar.cpp
index 4b98bb0fa86..8c1fa00416c 100644
--- a/src/server/scripts/Kalimdor/orgrimmar.cpp
+++ b/src/server/scripts/Kalimdor/orgrimmar.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/silithus.cpp b/src/server/scripts/Kalimdor/silithus.cpp
index a3393ee5d73..eeefc0f19e2 100644
--- a/src/server/scripts/Kalimdor/silithus.cpp
+++ b/src/server/scripts/Kalimdor/silithus.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/stonetalon_mountains.cpp b/src/server/scripts/Kalimdor/stonetalon_mountains.cpp
index 3402c5dec64..b3cb4bc664f 100644
--- a/src/server/scripts/Kalimdor/stonetalon_mountains.cpp
+++ b/src/server/scripts/Kalimdor/stonetalon_mountains.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/tanaris.cpp b/src/server/scripts/Kalimdor/tanaris.cpp
index 88c41083a72..93c75e1b37a 100644
--- a/src/server/scripts/Kalimdor/tanaris.cpp
+++ b/src/server/scripts/Kalimdor/tanaris.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/teldrassil.cpp b/src/server/scripts/Kalimdor/teldrassil.cpp
index 1d6135bd9d8..fe41f8a5361 100644
--- a/src/server/scripts/Kalimdor/teldrassil.cpp
+++ b/src/server/scripts/Kalimdor/teldrassil.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/the_barrens.cpp b/src/server/scripts/Kalimdor/the_barrens.cpp
index 05109d9537e..8c2f4299374 100644
--- a/src/server/scripts/Kalimdor/the_barrens.cpp
+++ b/src/server/scripts/Kalimdor/the_barrens.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/thousand_needles.cpp b/src/server/scripts/Kalimdor/thousand_needles.cpp
index bf1c1f62ffc..2ab3171113a 100644
--- a/src/server/scripts/Kalimdor/thousand_needles.cpp
+++ b/src/server/scripts/Kalimdor/thousand_needles.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/thunder_bluff.cpp b/src/server/scripts/Kalimdor/thunder_bluff.cpp
index 0b8f66135fd..b11619413b3 100644
--- a/src/server/scripts/Kalimdor/thunder_bluff.cpp
+++ b/src/server/scripts/Kalimdor/thunder_bluff.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/ungoro_crater.cpp b/src/server/scripts/Kalimdor/ungoro_crater.cpp
index e6ad96de836..066dde3e957 100644
--- a/src/server/scripts/Kalimdor/ungoro_crater.cpp
+++ b/src/server/scripts/Kalimdor/ungoro_crater.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Kalimdor/winterspring.cpp b/src/server/scripts/Kalimdor/winterspring.cpp
index 56d8a1a1911..d6b19132fd8 100644
--- a/src/server/scripts/Kalimdor/winterspring.cpp
+++ b/src/server/scripts/Kalimdor/winterspring.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp
index 5646ff51a99..a1bf7e55dd5 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h
index 221c7c0412f..a98a7230493 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software licensed under GPL version 2
 * Please see the included DOCS/LICENSE.TXT for more information */
 
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
index 2cfbe771b38..51884761f30 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
index c4482003748..2debf8c732a 100644
--- a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * Copyright (C) 2008 - 2010 TrinityCore 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp
index 80f0b674803..93a8cf8331e 100644
--- a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * Copyright (C) 2008 - 2010 TrinityCore 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
index a1df4d9864e..123a14b1c63 100644
--- a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * Copyright (C) 2008 - 2010 TrinityCore 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp
index dd21883bc04..639c1d6192b 100644
--- a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * Copyright (C) 2008 - 2010 TrinityCore 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp
index c7d8f892012..716ae6eb6d8 100644
--- a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * Copyright (C) 2008 - 2010 TrinityCore 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp
index f7d2b74c97d..17305753c31 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp
index a3ce55bc66a..6c334996c74 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * Copyright (C) 2008 - 2010 TrinityCore 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp
index 5ea0f992ace..f6138453121 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp
index 037b1d3086b..ff751dcb6f4 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h
index d9739fdf888..47226597761 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software licensed under GPL version 2
  * Please see the included DOCS/LICENSE.TXT for more information */
 
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp
index 341c980db15..06f6be6214d 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Northrend/borean_tundra.cpp b/src/server/scripts/Northrend/borean_tundra.cpp
index db5fe26f88f..6a02fdd9106 100644
--- a/src/server/scripts/Northrend/borean_tundra.cpp
+++ b/src/server/scripts/Northrend/borean_tundra.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Northrend/dragonblight.cpp b/src/server/scripts/Northrend/dragonblight.cpp
index 6d1100c2936..13486cedb31 100644
--- a/src/server/scripts/Northrend/dragonblight.cpp
+++ b/src/server/scripts/Northrend/dragonblight.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Northrend/grizzly_hills.cpp b/src/server/scripts/Northrend/grizzly_hills.cpp
index 55c744de0a7..f739cb4b768 100644
--- a/src/server/scripts/Northrend/grizzly_hills.cpp
+++ b/src/server/scripts/Northrend/grizzly_hills.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Northrend/icecrown.cpp b/src/server/scripts/Northrend/icecrown.cpp
index a2630c06a16..3183b6ddf9f 100644
--- a/src/server/scripts/Northrend/icecrown.cpp
+++ b/src/server/scripts/Northrend/icecrown.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp
index 2385b24bd72..c3fbb7a70e3 100644
--- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp
+++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp
index f07e3a2561f..b651072f91b 100644
--- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp
+++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp
index a2f4c411527..51c1759ef43 100644
--- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp
index f61556c092d..1b744685df6 100644
--- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp
index af11926bf91..e80d591e697 100644
--- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp
+++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp
index be24951545c..343c2e8b78f 100644
--- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp
+++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp
index ab3a7f73f91..2be293cc478 100644
--- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp
+++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h b/src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h
index 79a6cd4952d..25ab6b0f89f 100644
--- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h
+++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software licensed under GPL version 2
  * Please see the included DOCS/LICENSE.TXT for more information */
 
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp
index e48b7f034a5..b8d7e966c2f 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
index b5141bb5c55..9d5ebf959e0 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp
index 872ff846976..253d5a45f65 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp
index 7c52c15e04c..a048a4fb736 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp
index f3f754ec296..04602a6eee7 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h
index a78955368bf..7b3f1fba135 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software licensed under GPL version 2
  * Please see the included DOCS/LICENSE.TXT for more information */
 
diff --git a/src/server/scripts/Outland/BlackTemple/black_temple.cpp b/src/server/scripts/Outland/BlackTemple/black_temple.cpp
index 761706fb2a5..e68ccd8940b 100644
--- a/src/server/scripts/Outland/BlackTemple/black_temple.cpp
+++ b/src/server/scripts/Outland/BlackTemple/black_temple.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/BlackTemple/black_temple.h b/src/server/scripts/Outland/BlackTemple/black_temple.h
index b7432cd5b20..b102d35c981 100644
--- a/src/server/scripts/Outland/BlackTemple/black_temple.h
+++ b/src/server/scripts/Outland/BlackTemple/black_temple.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software licensed under GPL version 2
  * Please see the included DOCS/LICENSE.TXT for more information */
 
diff --git a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp
index a8331fab7e0..844c314c43f 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
index 64fed0967d9..4fb7b75b4f8 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
index 0419ab30054..1f6c847ea95 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
index e24ed1eefa2..76c90d2dec6 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
index 38ce3f2590d..15c73061354 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
index 807d92a238d..6719060f822 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
index e526e063f76..5e50e4a2769 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp
index 52ccd1c6434..e7b260bd289 100644
--- a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp
+++ b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
index 384c9b32ff8..c037f5131a3 100644
--- a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
+++ b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
index fd93f7cf1c0..a86ed00cf77 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
index 4fb2ef39f78..0ba5e62a4c3 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
index 36bd73f5a37..850882b6254 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp
index 80152dc0c7e..bd83759d153 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
index b6765850297..d22117aba8f 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
index 963643e92bf..6e615000d5a 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
index a59d012ebb9..c889078b22e 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h
index adfa39dc7e0..bfe841a5d1e 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software licensed under GPL version 2
  * Please see the included DOCS/LICENSE.TXT for more information */
 
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp
index 05d73155ce3..4c0d2f3c271 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp
index 14d8a976210..7b7aa183017 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp
index 3f542f4af2a..7919816effd 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
index 5d60bc7f3e6..34ddee339d4 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h
index 4b407ac4816..f1189d0831d 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software licensed under GPL version 2
  * Please see the included DOCS/LICENSE.TXT for more information */
 
diff --git a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp
index ace43fbaeff..2912a19d372 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp
index 37411d0d3be..795e95dae53 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp
index b27bc12635b..534ae93e183 100644
--- a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp
+++ b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp
index fdc1493f7af..000fa11deda 100644
--- a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp
+++ b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/GruulsLair/gruuls_lair.h b/src/server/scripts/Outland/GruulsLair/gruuls_lair.h
index 7003dcb1e26..b53e51557e4 100644
--- a/src/server/scripts/Outland/GruulsLair/gruuls_lair.h
+++ b/src/server/scripts/Outland/GruulsLair/gruuls_lair.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software licensed under GPL version 2
  * Please see the included DOCS/LICENSE.TXT for more information */
 
diff --git a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp
index 7791e7ecd98..3d1b30b765d 100644
--- a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp
+++ b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h
index b845c66823f..e01873d3501 100644
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software licensed under GPL version 2
  * Please see the included DOCS/LICENSE.TXT for more information */
 
diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
index 0fedd171ba1..717b09a4808 100644
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp
index 030e7c4d8e2..2da2ba36c1e 100644
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp
index c6c9aff9914..59670ed9d9b 100644
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
index ae72c873f4f..30b6cb38188 100644
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp
index c672a9973f6..2d59eb18d7d 100644
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
index 122d9d59ed4..fa85e5afa5e 100644
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
index 2204428405c..d49797d98c9 100644
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h
index 599aa237774..4d138d6430a 100644
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software licensed under GPL version 2
  * Please see the included DOCS/LICENSE.TXT for more information */
 
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
index 500892129c2..153651419b6 100644
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
index 5170421d97d..c7c940dc789 100644
--- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h
index 1b3e525fc54..410c57c8c1b 100644
--- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h
+++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software licensed under GPL version 2
  * Please see the included DOCS/LICENSE.TXT for more information */
 
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
index 4e5a575763d..0ff4bae75c9 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
index f274c18c88b..d57a163564c 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
index 92983f89768..8905d89d9fb 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
index a4107f7e820..016c6908d8c 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h
index cbfa23ec4e0..521ffd2c369 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software licensed under GPL version 2
  * Please see the included DOCS/LICENSE.TXT for more information */
 
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
index eb2d7402b99..a807a1d6945 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
index 671821d8924..640df17dff2 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
index ac921af0fd9..9958b47fbb2 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
index 4b78b804741..eed56a0a4e0 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp
index 5c1f924764c..e78c4276c5e 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.h b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.h
index d0d3ea09061..1120af800ac 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.h
+++ b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software licensed under GPL version 2
  * Please see the included DOCS/LICENSE.TXT for more information */
 
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp
index b967fe508ee..54abc76ce36 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp
index 8fc29124099..55ca2c36465 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
index 81b4a07a237..df395c5a925 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
index 0365172837f..61e0d7ab518 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp
index b17e8aa8401..b152726f12a 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
index 935154d3d7a..4061fc4e587 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h
index 3f8dee8bbd0..1115444d747 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software licensed under GPL version 2
  * Please see the included DOCS/LICENSE.TXT for more information */
 
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
index 9abc4e70eb2..62af91fd990 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
index 9638b9ce19a..3ce146774a1 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp
index 47800603c58..e77c5d0228e 100644
--- a/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp
index d06c9cb4938..ce3d96fbb4c 100644
--- a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp
index c6e6f5166ab..833b8f2bab7 100644
--- a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/blades_edge_mountains.cpp b/src/server/scripts/Outland/blades_edge_mountains.cpp
index 56c530a0cb4..56a6155ec1c 100644
--- a/src/server/scripts/Outland/blades_edge_mountains.cpp
+++ b/src/server/scripts/Outland/blades_edge_mountains.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp
index 72ddfeb73c9..a1832f3b51b 100644
--- a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp
+++ b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/boss_doomwalker.cpp b/src/server/scripts/Outland/boss_doomwalker.cpp
index 0f5fb3335e9..5c4fd477553 100644
--- a/src/server/scripts/Outland/boss_doomwalker.cpp
+++ b/src/server/scripts/Outland/boss_doomwalker.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/hellfire_peninsula.cpp b/src/server/scripts/Outland/hellfire_peninsula.cpp
index 8c3355d5238..bea5d6e34dd 100644
--- a/src/server/scripts/Outland/hellfire_peninsula.cpp
+++ b/src/server/scripts/Outland/hellfire_peninsula.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/nagrand.cpp b/src/server/scripts/Outland/nagrand.cpp
index 518cb6f605e..e04761d1ae5 100644
--- a/src/server/scripts/Outland/nagrand.cpp
+++ b/src/server/scripts/Outland/nagrand.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/netherstorm.cpp b/src/server/scripts/Outland/netherstorm.cpp
index 7c5254cace6..814479f564b 100644
--- a/src/server/scripts/Outland/netherstorm.cpp
+++ b/src/server/scripts/Outland/netherstorm.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/shadowmoon_valley.cpp b/src/server/scripts/Outland/shadowmoon_valley.cpp
index 42653f7a074..a14ce724bef 100644
--- a/src/server/scripts/Outland/shadowmoon_valley.cpp
+++ b/src/server/scripts/Outland/shadowmoon_valley.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/shattrath_city.cpp b/src/server/scripts/Outland/shattrath_city.cpp
index 815904f02ba..700d22202e6 100644
--- a/src/server/scripts/Outland/shattrath_city.cpp
+++ b/src/server/scripts/Outland/shattrath_city.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/terokkar_forest.cpp b/src/server/scripts/Outland/terokkar_forest.cpp
index 8fda1ee5821..01284bce8c1 100644
--- a/src/server/scripts/Outland/terokkar_forest.cpp
+++ b/src/server/scripts/Outland/terokkar_forest.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Outland/zangarmarsh.cpp b/src/server/scripts/Outland/zangarmarsh.cpp
index c163d6647cb..73e64b0c6a2 100644
--- a/src/server/scripts/Outland/zangarmarsh.cpp
+++ b/src/server/scripts/Outland/zangarmarsh.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/World/areatrigger_scripts.cpp b/src/server/scripts/World/areatrigger_scripts.cpp
index 9550b6456c1..0a8793aa415 100644
--- a/src/server/scripts/World/areatrigger_scripts.cpp
+++ b/src/server/scripts/World/areatrigger_scripts.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/World/boss_emeriss.cpp b/src/server/scripts/World/boss_emeriss.cpp
index ccd7f05c891..f227a48be2d 100644
--- a/src/server/scripts/World/boss_emeriss.cpp
+++ b/src/server/scripts/World/boss_emeriss.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/World/boss_lethon.cpp b/src/server/scripts/World/boss_lethon.cpp
index ad400ab1f7d..61b06fdd776 100644
--- a/src/server/scripts/World/boss_lethon.cpp
+++ b/src/server/scripts/World/boss_lethon.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/World/boss_taerar.cpp b/src/server/scripts/World/boss_taerar.cpp
index d505297ec49..13c5b31548c 100644
--- a/src/server/scripts/World/boss_taerar.cpp
+++ b/src/server/scripts/World/boss_taerar.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/World/boss_ysondre.cpp b/src/server/scripts/World/boss_ysondre.cpp
index 483dd13845a..bb962dd7b25 100644
--- a/src/server/scripts/World/boss_ysondre.cpp
+++ b/src/server/scripts/World/boss_ysondre.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp
index 65e1fc9fb17..3e9b1c78b67 100644
--- a/src/server/scripts/World/go_scripts.cpp
+++ b/src/server/scripts/World/go_scripts.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 >
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 >
 * Copyright (C) 2006 - 20010 TrinityCore 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/World/guards.cpp b/src/server/scripts/World/guards.cpp
index 72a2e808804..3d840dd854f 100644
--- a/src/server/scripts/World/guards.cpp
+++ b/src/server/scripts/World/guards.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/World/item_scripts.cpp b/src/server/scripts/World/item_scripts.cpp
index ccca8ce70af..9eb6f72743c 100644
--- a/src/server/scripts/World/item_scripts.cpp
+++ b/src/server/scripts/World/item_scripts.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/World/mob_generic_creature.cpp b/src/server/scripts/World/mob_generic_creature.cpp
index 869ea9a70f9..c7b746bd0c8 100644
--- a/src/server/scripts/World/mob_generic_creature.cpp
+++ b/src/server/scripts/World/mob_generic_creature.cpp
@@ -1,5 +1,6 @@
 
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/World/npc_professions.cpp b/src/server/scripts/World/npc_professions.cpp
index 5acd8472c44..24159c01685 100644
--- a/src/server/scripts/World/npc_professions.cpp
+++ b/src/server/scripts/World/npc_professions.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/World/npc_taxi.cpp b/src/server/scripts/World/npc_taxi.cpp
index 8f9a1fcc3d2..951f7a6bde6 100644
--- a/src/server/scripts/World/npc_taxi.cpp
+++ b/src/server/scripts/World/npc_taxi.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp
index 625f6485fc6..766a5c30251 100644
--- a/src/server/scripts/World/npcs_special.cpp
+++ b/src/server/scripts/World/npcs_special.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
+/* Copyright (C) 2006 - 2010 Trinity 
+ * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
-- 
cgit v1.2.3


From 8bdd082aa1b62866634cf9efa57fad23e2c9f58d Mon Sep 17 00:00:00 2001
From: click 
Date: Fri, 2 Jul 2010 16:13:40 +0200
Subject: Adjust to use correct timeframe for script-copyrights

--HG--
branch : trunk
---
 src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp | 2 +-
 src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.h   | 2 +-
 .../EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp       | 2 +-
 src/server/scripts/EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp   | 2 +-
 .../EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp  | 2 +-
 .../scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp | 2 +-
 .../scripts/EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp | 2 +-
 src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp     | 2 +-
 .../EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp | 2 +-
 src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp      | 2 +-
 .../scripts/EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp  | 2 +-
 .../scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp      | 2 +-
 .../EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp       | 2 +-
 src/server/scripts/EasternKingdoms/BlackrockSpire/boss_drakkisath.cpp   | 2 +-
 src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gyth.cpp         | 2 +-
 src/server/scripts/EasternKingdoms/BlackrockSpire/boss_halycon.cpp      | 2 +-
 .../scripts/EasternKingdoms/BlackrockSpire/boss_highlord_omokk.cpp      | 2 +-
 .../scripts/EasternKingdoms/BlackrockSpire/boss_mother_smolderweb.cpp   | 2 +-
 .../scripts/EasternKingdoms/BlackrockSpire/boss_overlord_wyrmthalak.cpp | 2 +-
 .../scripts/EasternKingdoms/BlackrockSpire/boss_pyroguard_emberseer.cpp | 2 +-
 .../EasternKingdoms/BlackrockSpire/boss_quartermaster_zigris.cpp        | 2 +-
 .../scripts/EasternKingdoms/BlackrockSpire/boss_rend_blackhand.cpp      | 2 +-
 .../EasternKingdoms/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp     | 2 +-
 src/server/scripts/EasternKingdoms/BlackrockSpire/boss_the_beast.cpp    | 2 +-
 .../scripts/EasternKingdoms/BlackrockSpire/boss_warmaster_voone.cpp     | 2 +-
 .../scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp  | 2 +-
 src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp    | 2 +-
 src/server/scripts/EasternKingdoms/BlackwingLair/boss_ebonroc.cpp       | 2 +-
 src/server/scripts/EasternKingdoms/BlackwingLair/boss_firemaw.cpp       | 2 +-
 src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp      | 2 +-
 src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp      | 2 +-
 src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp     | 2 +-
 src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp   | 2 +-
 .../scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp      | 2 +-
 .../scripts/EasternKingdoms/BlackwingLair/instance_blackwing_lair.cpp   | 2 +-
 src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp              | 2 +-
 src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp            | 2 +-
 src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp   | 2 +-
 src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp           | 2 +-
 src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp        | 2 +-
 src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp          | 2 +-
 src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp  | 2 +-
 src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp      | 2 +-
 src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp  | 2 +-
 src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp            | 2 +-
 src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp       | 2 +-
 src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp                | 2 +-
 src/server/scripts/EasternKingdoms/Karazhan/karazhan.h                  | 2 +-
 .../scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp | 2 +-
 .../EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp        | 2 +-
 .../scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp   | 2 +-
 src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp   | 2 +-
 .../EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp     | 2 +-
 .../scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp      | 2 +-
 src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h | 2 +-
 src/server/scripts/EasternKingdoms/MoltenCore/boss_baron_geddon.cpp     | 2 +-
 src/server/scripts/EasternKingdoms/MoltenCore/boss_garr.cpp             | 2 +-
 src/server/scripts/EasternKingdoms/MoltenCore/boss_gehennas.cpp         | 2 +-
 src/server/scripts/EasternKingdoms/MoltenCore/boss_golemagg.cpp         | 2 +-
 src/server/scripts/EasternKingdoms/MoltenCore/boss_lucifron.cpp         | 2 +-
 src/server/scripts/EasternKingdoms/MoltenCore/boss_magmadar.cpp         | 2 +-
 .../scripts/EasternKingdoms/MoltenCore/boss_majordomo_executus.cpp      | 2 +-
 src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp         | 2 +-
 src/server/scripts/EasternKingdoms/MoltenCore/boss_shazzrah.cpp         | 2 +-
 .../scripts/EasternKingdoms/MoltenCore/boss_sulfuron_harbinger.cpp      | 2 +-
 src/server/scripts/EasternKingdoms/MoltenCore/instance_molten_core.cpp  | 2 +-
 src/server/scripts/EasternKingdoms/MoltenCore/molten_core.cpp           | 2 +-
 src/server/scripts/EasternKingdoms/MoltenCore/molten_core.h             | 2 +-
 .../scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp     | 2 +-
 .../EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp      | 2 +-
 .../scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp | 2 +-
 .../scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp | 2 +-
 src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp      | 2 +-
 .../EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp | 2 +-
 .../EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp        | 2 +-
 .../EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp       | 2 +-
 .../EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp    | 2 +-
 src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp      | 2 +-
 .../EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp     | 2 +-
 src/server/scripts/EasternKingdoms/ScarletMonastery/scarlet_monastery.h | 2 +-
 .../scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp    | 2 +-
 .../EasternKingdoms/Scholomance/boss_death_knight_darkreaver.cpp        | 2 +-
 .../EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp       | 2 +-
 src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp   | 2 +-
 .../scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp     | 2 +-
 src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp   | 2 +-
 src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp          | 2 +-
 .../scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp      | 2 +-
 .../scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp     | 2 +-
 .../scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp       | 2 +-
 src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp    | 2 +-
 src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp          | 2 +-
 src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp | 2 +-
 src/server/scripts/EasternKingdoms/Scholomance/scholomance.h            | 2 +-
 .../scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp | 2 +-
 src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp   | 2 +-
 src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h     | 2 +-
 src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp  | 2 +-
 .../scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp       | 2 +-
 .../scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp    | 2 +-
 .../scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp     | 2 +-
 .../scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp    | 2 +-
 .../scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp       | 2 +-
 src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp       | 2 +-
 .../scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp    | 2 +-
 .../scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp       | 2 +-
 .../scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp     | 2 +-
 src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp  | 2 +-
 src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp   | 2 +-
 src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp            | 2 +-
 src/server/scripts/EasternKingdoms/Stratholme/stratholme.h              | 2 +-
 src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp    | 2 +-
 src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp     | 2 +-
 .../scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp | 2 +-
 src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h     | 2 +-
 src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp             | 2 +-
 src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp                  | 2 +-
 src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp             | 2 +-
 src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp             | 2 +-
 src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp            | 2 +-
 src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp         | 2 +-
 src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp                  | 2 +-
 src/server/scripts/EasternKingdoms/ZulAman/zulaman.h                    | 2 +-
 src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp             | 2 +-
 src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp          | 2 +-
 src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp             | 2 +-
 src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp             | 2 +-
 src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp           | 2 +-
 src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp             | 2 +-
 src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp              | 2 +-
 src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp           | 2 +-
 src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp              | 2 +-
 src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp           | 2 +-
 src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp             | 2 +-
 src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp            | 2 +-
 src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp          | 2 +-
 src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp       | 2 +-
 src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h                  | 2 +-
 src/server/scripts/EasternKingdoms/alterac_mountains.cpp                | 2 +-
 src/server/scripts/EasternKingdoms/arathi_highlands.cpp                 | 2 +-
 src/server/scripts/EasternKingdoms/blasted_lands.cpp                    | 2 +-
 src/server/scripts/EasternKingdoms/boss_kruul.cpp                       | 2 +-
 src/server/scripts/EasternKingdoms/burning_steppes.cpp                  | 2 +-
 src/server/scripts/EasternKingdoms/dun_morogh.cpp                       | 2 +-
 src/server/scripts/EasternKingdoms/eastern_plaguelands.cpp              | 2 +-
 src/server/scripts/EasternKingdoms/elwynn_forest.cpp                    | 2 +-
 src/server/scripts/EasternKingdoms/eversong_woods.cpp                   | 2 +-
 src/server/scripts/EasternKingdoms/ghostlands.cpp                       | 2 +-
 src/server/scripts/EasternKingdoms/hinterlands.cpp                      | 2 +-
 src/server/scripts/EasternKingdoms/ironforge.cpp                        | 2 +-
 src/server/scripts/EasternKingdoms/isle_of_queldanas.cpp                | 2 +-
 src/server/scripts/EasternKingdoms/loch_modan.cpp                       | 2 +-
 src/server/scripts/EasternKingdoms/searing_gorge.cpp                    | 2 +-
 src/server/scripts/EasternKingdoms/silvermoon_city.cpp                  | 2 +-
 src/server/scripts/EasternKingdoms/silverpine_forest.cpp                | 2 +-
 src/server/scripts/EasternKingdoms/stormwind_city.cpp                   | 2 +-
 src/server/scripts/EasternKingdoms/stranglethorn_vale.cpp               | 2 +-
 src/server/scripts/EasternKingdoms/tirisfal_glades.cpp                  | 2 +-
 src/server/scripts/EasternKingdoms/undercity.cpp                        | 2 +-
 src/server/scripts/EasternKingdoms/western_plaguelands.cpp              | 2 +-
 src/server/scripts/EasternKingdoms/westfall.cpp                         | 2 +-
 src/server/scripts/EasternKingdoms/wetlands.cpp                         | 2 +-
 src/server/scripts/Examples/example_creature.cpp                        | 2 +-
 src/server/scripts/Examples/example_escort.cpp                          | 2 +-
 src/server/scripts/Examples/example_gossip_codebox.cpp                  | 2 +-
 src/server/scripts/Examples/example_misc.cpp                            | 2 +-
 src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h        | 2 +-
 .../scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp    | 2 +-
 .../Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp      | 2 +-
 src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp | 2 +-
 src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h   | 2 +-
 .../scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp      | 2 +-
 src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h | 2 +-
 .../Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp       | 2 +-
 src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp    | 2 +-
 .../scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp | 2 +-
 src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp  | 2 +-
 src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp    | 2 +-
 src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.h      | 2 +-
 .../scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp  | 2 +-
 .../CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp      | 2 +-
 .../CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp         | 2 +-
 .../CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp      | 2 +-
 .../CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp    | 2 +-
 .../Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp    | 2 +-
 .../Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h      | 2 +-
 src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp       | 2 +-
 src/server/scripts/Kalimdor/Maraudon/boss_landslide.cpp                 | 2 +-
 src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp                   | 2 +-
 src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp        | 2 +-
 .../scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp    | 2 +-
 src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp            | 2 +-
 src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp   | 2 +-
 src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp            | 2 +-
 src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.h              | 2 +-
 src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp            | 2 +-
 src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp               | 2 +-
 src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp          | 2 +-
 src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp               | 2 +-
 src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp           | 2 +-
 src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp             | 2 +-
 .../scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp     | 2 +-
 src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp          | 2 +-
 src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp             | 2 +-
 src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp          | 2 +-
 src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp           | 2 +-
 src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp              | 2 +-
 src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp           | 2 +-
 src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp            | 2 +-
 src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp      | 2 +-
 src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp          | 2 +-
 .../scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp   | 2 +-
 src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp | 2 +-
 src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h       | 2 +-
 src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp | 2 +-
 src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp          | 2 +-
 src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.h            | 2 +-
 src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp                     | 2 +-
 src/server/scripts/Kalimdor/ashenvale.cpp                               | 2 +-
 src/server/scripts/Kalimdor/azshara.cpp                                 | 2 +-
 src/server/scripts/Kalimdor/azuremyst_isle.cpp                          | 2 +-
 src/server/scripts/Kalimdor/bloodmyst_isle.cpp                          | 2 +-
 src/server/scripts/Kalimdor/boss_azuregos.cpp                           | 2 +-
 src/server/scripts/Kalimdor/darkshore.cpp                               | 2 +-
 src/server/scripts/Kalimdor/desolace.cpp                                | 2 +-
 src/server/scripts/Kalimdor/dustwallow_marsh.cpp                        | 2 +-
 src/server/scripts/Kalimdor/felwood.cpp                                 | 2 +-
 src/server/scripts/Kalimdor/feralas.cpp                                 | 2 +-
 src/server/scripts/Kalimdor/moonglade.cpp                               | 2 +-
 src/server/scripts/Kalimdor/mulgore.cpp                                 | 2 +-
 src/server/scripts/Kalimdor/orgrimmar.cpp                               | 2 +-
 src/server/scripts/Kalimdor/silithus.cpp                                | 2 +-
 src/server/scripts/Kalimdor/stonetalon_mountains.cpp                    | 2 +-
 src/server/scripts/Kalimdor/tanaris.cpp                                 | 2 +-
 src/server/scripts/Kalimdor/teldrassil.cpp                              | 2 +-
 src/server/scripts/Kalimdor/the_barrens.cpp                             | 2 +-
 src/server/scripts/Kalimdor/thousand_needles.cpp                        | 2 +-
 src/server/scripts/Kalimdor/thunder_bluff.cpp                           | 2 +-
 src/server/scripts/Kalimdor/ungoro_crater.cpp                           | 2 +-
 src/server/scripts/Kalimdor/winterspring.cpp                            | 2 +-
 .../CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp       | 2 +-
 .../CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h        | 2 +-
 src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp | 2 +-
 .../Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp       | 2 +-
 .../scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp       | 2 +-
 src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h  | 2 +-
 .../Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp      | 2 +-
 .../scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp     | 2 +-
 .../scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp     | 2 +-
 .../Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp     | 2 +-
 .../Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h       | 2 +-
 .../FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp      | 2 +-
 .../Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp      | 2 +-
 .../scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp       | 2 +-
 .../Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp      | 2 +-
 .../scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp  | 2 +-
 src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp    | 2 +-
 src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h      | 2 +-
 src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp               | 2 +-
 src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp              | 2 +-
 src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp           | 2 +-
 src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp        | 2 +-
 src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp               | 2 +-
 src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp             | 2 +-
 src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp                    | 2 +-
 src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp | 2 +-
 src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp     | 2 +-
 src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp     | 2 +-
 src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp   | 2 +-
 .../scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h      | 2 +-
 .../Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp   | 2 +-
 src/server/scripts/Northrend/borean_tundra.cpp                          | 2 +-
 src/server/scripts/Northrend/dragonblight.cpp                           | 2 +-
 src/server/scripts/Northrend/grizzly_hills.cpp                          | 2 +-
 src/server/scripts/Northrend/icecrown.cpp                               | 2 +-
 .../scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp  | 2 +-
 .../Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp | 2 +-
 .../scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp   | 2 +-
 src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp    | 2 +-
 .../scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp    | 2 +-
 .../scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp   | 2 +-
 .../scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp  | 2 +-
 src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h      | 2 +-
 .../Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp      | 2 +-
 .../Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp  | 2 +-
 .../Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp      | 2 +-
 src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp   | 2 +-
 .../Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp    | 2 +-
 .../scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h       | 2 +-
 src/server/scripts/Outland/BlackTemple/black_temple.cpp                 | 2 +-
 src/server/scripts/Outland/BlackTemple/black_temple.h                   | 2 +-
 src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp               | 2 +-
 src/server/scripts/Outland/BlackTemple/boss_illidan.cpp                 | 2 +-
 src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp          | 2 +-
 src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp      | 2 +-
 src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp          | 2 +-
 src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp         | 2 +-
 src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp        | 2 +-
 src/server/scripts/Outland/BlackTemple/illidari_council.cpp             | 2 +-
 src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp        | 2 +-
 .../CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp      | 2 +-
 .../CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp       | 2 +-
 .../scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp | 2 +-
 .../CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp        | 2 +-
 .../Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp       | 2 +-
 .../CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp        | 2 +-
 .../Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp | 2 +-
 .../scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h    | 2 +-
 .../Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp   | 2 +-
 .../Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp | 2 +-
 .../Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp    | 2 +-
 .../Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp       | 2 +-
 src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h   | 2 +-
 .../scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp       | 2 +-
 .../Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp       | 2 +-
 src/server/scripts/Outland/GruulsLair/boss_gruul.cpp                    | 2 +-
 src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp        | 2 +-
 src/server/scripts/Outland/GruulsLair/gruuls_lair.h                     | 2 +-
 src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp          | 2 +-
 src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h | 2 +-
 .../scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp       | 2 +-
 .../Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp   | 2 +-
 .../scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp     | 2 +-
 .../Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp     | 2 +-
 .../HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp        | 2 +-
 .../HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp       | 2 +-
 .../HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp     | 2 +-
 .../Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h        | 2 +-
 .../HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp     | 2 +-
 .../HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp     | 2 +-
 .../Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h        | 2 +-
 .../scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp  | 2 +-
 .../Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp   | 2 +-
 .../HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp  | 2 +-
 .../Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp | 2 +-
 .../scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h    | 2 +-
 src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp         | 2 +-
 src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp            | 2 +-
 src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp         | 2 +-
 src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp         | 2 +-
 src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp                  | 2 +-
 src/server/scripts/Outland/TempestKeep/Eye/the_eye.h                    | 2 +-
 .../scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp  | 2 +-
 .../scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp  | 2 +-
 .../Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp        | 2 +-
 .../Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp      | 2 +-
 src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp   | 2 +-
 src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp            | 2 +-
 src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h              | 2 +-
 .../scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp     | 2 +-
 src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp   | 2 +-
 .../Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp        | 2 +-
 src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp            | 2 +-
 src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp  | 2 +-
 src/server/scripts/Outland/blades_edge_mountains.cpp                    | 2 +-
 src/server/scripts/Outland/boss_doomlord_kazzak.cpp                     | 2 +-
 src/server/scripts/Outland/boss_doomwalker.cpp                          | 2 +-
 src/server/scripts/Outland/hellfire_peninsula.cpp                       | 2 +-
 src/server/scripts/Outland/nagrand.cpp                                  | 2 +-
 src/server/scripts/Outland/netherstorm.cpp                              | 2 +-
 src/server/scripts/Outland/shadowmoon_valley.cpp                        | 2 +-
 src/server/scripts/Outland/shattrath_city.cpp                           | 2 +-
 src/server/scripts/Outland/terokkar_forest.cpp                          | 2 +-
 src/server/scripts/Outland/zangarmarsh.cpp                              | 2 +-
 src/server/scripts/World/areatrigger_scripts.cpp                        | 2 +-
 src/server/scripts/World/boss_emeriss.cpp                               | 2 +-
 src/server/scripts/World/boss_lethon.cpp                                | 2 +-
 src/server/scripts/World/boss_taerar.cpp                                | 2 +-
 src/server/scripts/World/boss_ysondre.cpp                               | 2 +-
 src/server/scripts/World/go_scripts.cpp                                 | 2 +-
 src/server/scripts/World/guards.cpp                                     | 2 +-
 src/server/scripts/World/item_scripts.cpp                               | 2 +-
 src/server/scripts/World/mob_generic_creature.cpp                       | 2 +-
 src/server/scripts/World/npc_professions.cpp                            | 2 +-
 src/server/scripts/World/npc_taxi.cpp                                   | 2 +-
 src/server/scripts/World/npcs_special.cpp                               | 2 +-
 376 files changed, 376 insertions(+), 376 deletions(-)

(limited to 'src')

diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp
index 23df4981b75..e92803921a3 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
 
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.h b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.h
index 94cd4a00e62..be5442fbf15 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.h
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software licensed under GPL version 2
 * Please see the included DOCS/LICENSE.TXT for more information */
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp
index 43f7a28d8c7..317bebee964 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp
index 0e723df7876..fa7f0d4891a 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp
index 2d8cc8309a5..1af1f80f174 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp
index 815e416b556..d29a2d95ea7 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp
index 31cf3d49a4e..3274def15d8 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp
index dd6aeb0fcf2..9b992422bcd 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp
index c8acf24eee2..2be444f973b 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp
index bf6ebeca273..4adedd89f83 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp
index 3d3f7853139..e3d7e5a024b 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp
index c00a7508a04..ed8e628c1ec 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp
index cfdc278ea1a..3624a6ad88f 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_drakkisath.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_drakkisath.cpp
index e3e57c8cd40..2094db3db43 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_drakkisath.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_drakkisath.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gyth.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gyth.cpp
index fa5a4d541f8..2c57e8ec303 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gyth.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gyth.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_halycon.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_halycon.cpp
index 0639f55bf2b..7dd2d94de03 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_halycon.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_halycon.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_highlord_omokk.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_highlord_omokk.cpp
index 89f7a20030f..ec1a586b080 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_highlord_omokk.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_highlord_omokk.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_mother_smolderweb.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_mother_smolderweb.cpp
index 876139b4aa0..502fd922107 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_mother_smolderweb.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_mother_smolderweb.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_overlord_wyrmthalak.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_overlord_wyrmthalak.cpp
index cae3c6141c0..08497ea9e83 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_overlord_wyrmthalak.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_overlord_wyrmthalak.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_pyroguard_emberseer.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_pyroguard_emberseer.cpp
index b0699be2005..18590e89314 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_pyroguard_emberseer.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_pyroguard_emberseer.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_quartermaster_zigris.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_quartermaster_zigris.cpp
index cbfc484763e..30cfbb8c51a 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_quartermaster_zigris.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_quartermaster_zigris.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_rend_blackhand.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_rend_blackhand.cpp
index fdf051ef739..feea0af1e44 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_rend_blackhand.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_rend_blackhand.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp
index 2e140dbbeba..972e54abc0a 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_the_beast.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_the_beast.cpp
index 555976880a2..56e751875c9 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_the_beast.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_the_beast.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_warmaster_voone.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_warmaster_voone.cpp
index 8500d365e7a..ee93709f9b2 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_warmaster_voone.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_warmaster_voone.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp
index d4505f06d4a..a04bd9870db 100644
--- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp
index fc875504ddb..80197ff8efb 100644
--- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_ebonroc.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_ebonroc.cpp
index 38f26565473..6bf5029945e 100644
--- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_ebonroc.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_ebonroc.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_firemaw.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_firemaw.cpp
index 56ba7be5f8b..8fef3431cc4 100644
--- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_firemaw.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_firemaw.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp
index 89bbf1106a4..74c2d7e3397 100644
--- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp
index 1a3580caaab..3581448ce71 100644
--- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp
index f6a96a47ca1..3fcc1a5df20 100644
--- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp
index 012846a82fc..56461d0fc08 100644
--- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp
index 7b20703cf2d..b3802559557 100644
--- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/instance_blackwing_lair.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/instance_blackwing_lair.cpp
index af4f8660cca..f1f54120f25 100644
--- a/src/server/scripts/EasternKingdoms/BlackwingLair/instance_blackwing_lair.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackwingLair/instance_blackwing_lair.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp b/src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp
index ef91e64a090..18e4e252c4d 100644
--- a/src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp
+++ b/src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp
index 7f6932fd9a6..8769e8ec861 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp
index 2b0b74ef8e5..6b6fd5df9aa 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp
index e7cad239007..dabfd846eb9 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp
index 13ec19858c8..a496fac109e 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp
index b775c0ecb6f..551e6eb39d4 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp
index 40c4d682c40..bbc58c51e3d 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
index d4621489898..636a223444c 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
index 053aa638536..b9ef55cfa8d 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
index 7e2652d8678..45472a8cc81 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp
index fc901b8c568..0a03f9d4d9a 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
index d2d17653da1..13957ddc32a 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
@@ -1,4 +1,4 @@
- /* Copyright (C) 2006 - 2010 Trinity 
+ /* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.h b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.h
index 9120bec1478..192eb15d68b 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.h
+++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software licensed under GPL version 2
  * Please see the included DOCS/LICENSE.TXT for more information */
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
index 15c73a0d31f..2e9eb67ad23 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
index 352b2c2c5c8..44e78e0eb8f 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
index 38bd7a40054..ca17a3dd675 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
index 10170fc8247..42fe3630b74 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
index 044f557e4c2..52694d64bec 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp
index 075add0442e..98a436f1e5d 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h
index 6263b6f6870..af12ec6f729 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software licensed under GPL version 2
  * Please see the included DOCS/LICENSE.TXT for more information */
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_baron_geddon.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_baron_geddon.cpp
index e9d9625fc34..0f9be5eca12 100644
--- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_baron_geddon.cpp
+++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_baron_geddon.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_garr.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_garr.cpp
index ac363c4ad8f..80a383e5343 100644
--- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_garr.cpp
+++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_garr.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_gehennas.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_gehennas.cpp
index ffd60c3995c..6100e58c72b 100644
--- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_gehennas.cpp
+++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_gehennas.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_golemagg.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_golemagg.cpp
index f4814cb69f3..113060b1231 100644
--- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_golemagg.cpp
+++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_golemagg.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_lucifron.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_lucifron.cpp
index 773b0a34b6b..f6aabff44c2 100644
--- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_lucifron.cpp
+++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_lucifron.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_magmadar.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_magmadar.cpp
index cdae64995d4..5d35105e8b2 100644
--- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_magmadar.cpp
+++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_magmadar.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_majordomo_executus.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_majordomo_executus.cpp
index 3d3d62c3f32..b67cf108246 100644
--- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_majordomo_executus.cpp
+++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_majordomo_executus.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp
index 135e160eaad..cbcf30a054c 100644
--- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp
+++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_shazzrah.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_shazzrah.cpp
index 7852fc371d5..e4ab1559c7a 100644
--- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_shazzrah.cpp
+++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_shazzrah.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_sulfuron_harbinger.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_sulfuron_harbinger.cpp
index 1c98f89563f..147d61464f4 100644
--- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_sulfuron_harbinger.cpp
+++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_sulfuron_harbinger.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/instance_molten_core.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/instance_molten_core.cpp
index 5b620592de6..593919d72d3 100644
--- a/src/server/scripts/EasternKingdoms/MoltenCore/instance_molten_core.cpp
+++ b/src/server/scripts/EasternKingdoms/MoltenCore/instance_molten_core.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/molten_core.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/molten_core.cpp
index 85bfdcd52fc..6387f573913 100644
--- a/src/server/scripts/EasternKingdoms/MoltenCore/molten_core.cpp
+++ b/src/server/scripts/EasternKingdoms/MoltenCore/molten_core.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/molten_core.h b/src/server/scripts/EasternKingdoms/MoltenCore/molten_core.h
index fe81a2f9b6e..65535e390ce 100644
--- a/src/server/scripts/EasternKingdoms/MoltenCore/molten_core.h
+++ b/src/server/scripts/EasternKingdoms/MoltenCore/molten_core.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software licensed under GPL version 2
  * Please see the included DOCS/LICENSE.TXT for more information */
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp
index 4164c05591b..4e7f4f9927d 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp
index 3a76c483e8a..a38497650bc 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp
index 04c58978cf6..0d2767b7e90 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
index 139884c666b..214e6dbd832 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp
index f3c6f2db4b7..8e430db98a0 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp
index c8e55f31186..3a678829d65 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp
index 459f6a07bf1..6edc0cae41f 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp
index 8e5821b4643..96d6f23833d 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp
index 8f236df9769..d89c2bce36e 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp
index 87cf9e0111d..81f3d1c7910 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp
index 5dd4f659b3a..399b748678e 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/scarlet_monastery.h b/src/server/scripts/EasternKingdoms/ScarletMonastery/scarlet_monastery.h
index 4c861861b37..1307667cfee 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/scarlet_monastery.h
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/scarlet_monastery.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
  * This program is free software licensed under GPL version 2
  * Please see the included DOCS/LICENSE.TXT for more information */
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp
index 2800d6edf93..6f8b59d31de 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_death_knight_darkreaver.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_death_knight_darkreaver.cpp
index 814a87ed0c9..b3f8087bc1d 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_death_knight_darkreaver.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_death_knight_darkreaver.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp
index 97d769a7c6c..3ca01977bdc 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp
index f9694749cbc..f38626bfdd2 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp
index d6d6c01e2d1..f3b2704d0e2 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp
index c51236f175a..6f272f67222 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp
index 40ce79e8fa9..09626c92c91 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp
index e88a76a5ded..d922ed49f08 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp
index 3335ea914b0..04826a4aa45 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp
index d6711184b98..35895580d5f 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp
index de881f84240..17279b2e16c 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp
index 33c53711358..c840b3a971a 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp b/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp
index 48379226f62..1d4041121c0 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/scholomance.h b/src/server/scripts/EasternKingdoms/Scholomance/scholomance.h
index f8482d670c0..0145f5ef448 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/scholomance.h
+++ b/src/server/scripts/EasternKingdoms/Scholomance/scholomance.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software licensed under GPL version 2
  * Please see the included DOCS/LICENSE.TXT for more information */
diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
index 372710771f9..21f4aa4230c 100644
--- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
+++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
index 8e21246afbd..424ff365b31 100644
--- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
+++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
@@ -1,4 +1,4 @@
- /* Copyright (C) 2006 - 2010 Trinity 
+ /* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h
index 67cac79fd04..7f5658dfe3e 100644
--- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h
+++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software licensed under GPL version 2
  * Please see the included DOCS/LICENSE.TXT for more information */
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp
index 492830c4fbd..7b09df0ae6e 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp
index 6d119090457..f3a31e0cc04 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp
index 5b3950d2463..b0a3f9e6ff2 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp
index 55b311af624..9025767fe6f 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp
index ac1f2fd3761..165157ff503 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp
index 7b532a945c2..a89293de09e 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp
index 09331490598..e5292199d22 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp
index 4c19e351954..e46b40d0028 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp
index 5f40fde9a59..b2564e1c674 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp
index 59c4da475b0..7375eb9ba8d 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp
index d009c8767b2..c66a9469d22 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp
index 5bb6f091505..0944f58f2bc 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp
index 90645098a7a..a4e0988ee1e 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.h b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.h
index 0ff218af5cd..730b890a917 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.h
+++ b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software licensed under GPL version 2
 * Please see the included DOCS/LICENSE.TXT for more information */
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp
index 6e034d0f7e8..c682bbd8a68 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
index b9930a4a3e5..cdb84386085 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp
index e51b95bf606..a755c8f405c 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software licensed under GPL version 2
  * Please see the included DOCS/LICENSE.TXT for more information */
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h b/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h
index 0afac50d6ef..3aafb8aa29c 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software licensed under GPL version 2
  * Please see the included DOCS/LICENSE.TXT for more information */
diff --git a/src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp b/src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp
index 36f1c7dec22..dde9cfde4d2 100644
--- a/src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp
+++ b/src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp
index ddaf2de6a6f..5212bc45060 100644
--- a/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp
+++ b/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
index 7a6c0baf25d..bfeef7ad338 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
index b8954777487..c24e048290d 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
@@ -1,4 +1,4 @@
- /* Copyright (C) 2006 - 2010 Trinity 
+ /* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
index 5406b77c3f8..8db76cb7054 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
@@ -1,4 +1,4 @@
- /* Copyright (C) 2006 - 2010 Trinity 
+ /* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
index a1a53764471..f93d1da1212 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
@@ -1,4 +1,4 @@
- /* Copyright (C) 2006 - 2010 Trinity 
+ /* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
index fe2f5b8e77e..00da369c57c 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.h b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.h
index 4f0ccf29683..2f6533edcf1 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.h
+++ b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software licensed under GPL version 2
 * Please see the included DOCS/LICENSE.TXT for more information */
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
index 476f92b2b53..c575272fbd8 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp
index 85d6dd6493b..657da0970d4 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
index 24fe2e98089..df39b7d69b0 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
index 9ae1083811b..57b57fa5646 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
index 5ba1d9656d4..4970cfbc2b5 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
index 37f7381d56e..b9668c4c657 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
index a735f3c49e5..49d663a44cb 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
index a63f820d255..5cbcb19cf75 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
index 25a61f802ab..6f588082f98 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
index e7ae562b725..fbcc6f11fbf 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
index 7539f2592bf..da283a7009a 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
index 2b2a3d65d1a..13738c70a9e 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
index f897f544d92..8c546592e53 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
index 11771919886..8a9f64b5c39 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h b/src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
index 512bf5da047..194e391e598 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software licensed under GPL version 2
  * Please see the included DOCS/LICENSE.TXT for more information */
diff --git a/src/server/scripts/EasternKingdoms/alterac_mountains.cpp b/src/server/scripts/EasternKingdoms/alterac_mountains.cpp
index 55f6d41656a..d404d8ccd95 100644
--- a/src/server/scripts/EasternKingdoms/alterac_mountains.cpp
+++ b/src/server/scripts/EasternKingdoms/alterac_mountains.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/arathi_highlands.cpp b/src/server/scripts/EasternKingdoms/arathi_highlands.cpp
index 544a2631090..5f3276ef0e6 100644
--- a/src/server/scripts/EasternKingdoms/arathi_highlands.cpp
+++ b/src/server/scripts/EasternKingdoms/arathi_highlands.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/blasted_lands.cpp b/src/server/scripts/EasternKingdoms/blasted_lands.cpp
index 0d94e62a70b..674941616b1 100644
--- a/src/server/scripts/EasternKingdoms/blasted_lands.cpp
+++ b/src/server/scripts/EasternKingdoms/blasted_lands.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/boss_kruul.cpp b/src/server/scripts/EasternKingdoms/boss_kruul.cpp
index d066e03ca61..86c26fe072f 100644
--- a/src/server/scripts/EasternKingdoms/boss_kruul.cpp
+++ b/src/server/scripts/EasternKingdoms/boss_kruul.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/burning_steppes.cpp b/src/server/scripts/EasternKingdoms/burning_steppes.cpp
index a82246fbb3f..173c9e2a675 100644
--- a/src/server/scripts/EasternKingdoms/burning_steppes.cpp
+++ b/src/server/scripts/EasternKingdoms/burning_steppes.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/dun_morogh.cpp b/src/server/scripts/EasternKingdoms/dun_morogh.cpp
index 137e53d31f5..111fec3044e 100644
--- a/src/server/scripts/EasternKingdoms/dun_morogh.cpp
+++ b/src/server/scripts/EasternKingdoms/dun_morogh.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/eastern_plaguelands.cpp b/src/server/scripts/EasternKingdoms/eastern_plaguelands.cpp
index 3e42153b805..cfc6a6d248a 100644
--- a/src/server/scripts/EasternKingdoms/eastern_plaguelands.cpp
+++ b/src/server/scripts/EasternKingdoms/eastern_plaguelands.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/elwynn_forest.cpp b/src/server/scripts/EasternKingdoms/elwynn_forest.cpp
index f9b91c1c285..67f5992b458 100644
--- a/src/server/scripts/EasternKingdoms/elwynn_forest.cpp
+++ b/src/server/scripts/EasternKingdoms/elwynn_forest.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/eversong_woods.cpp b/src/server/scripts/EasternKingdoms/eversong_woods.cpp
index b62b24145ef..1fe2b84faf9 100644
--- a/src/server/scripts/EasternKingdoms/eversong_woods.cpp
+++ b/src/server/scripts/EasternKingdoms/eversong_woods.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/ghostlands.cpp b/src/server/scripts/EasternKingdoms/ghostlands.cpp
index 04b82d92e8e..78e3ac48c90 100644
--- a/src/server/scripts/EasternKingdoms/ghostlands.cpp
+++ b/src/server/scripts/EasternKingdoms/ghostlands.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/hinterlands.cpp b/src/server/scripts/EasternKingdoms/hinterlands.cpp
index 957abd75188..0d6983f6d8a 100644
--- a/src/server/scripts/EasternKingdoms/hinterlands.cpp
+++ b/src/server/scripts/EasternKingdoms/hinterlands.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/ironforge.cpp b/src/server/scripts/EasternKingdoms/ironforge.cpp
index 4f59891fdbd..4615eb6543d 100644
--- a/src/server/scripts/EasternKingdoms/ironforge.cpp
+++ b/src/server/scripts/EasternKingdoms/ironforge.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/isle_of_queldanas.cpp b/src/server/scripts/EasternKingdoms/isle_of_queldanas.cpp
index c8061714259..bf177c90561 100644
--- a/src/server/scripts/EasternKingdoms/isle_of_queldanas.cpp
+++ b/src/server/scripts/EasternKingdoms/isle_of_queldanas.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/loch_modan.cpp b/src/server/scripts/EasternKingdoms/loch_modan.cpp
index d50cdef8c60..b6919c4bed3 100644
--- a/src/server/scripts/EasternKingdoms/loch_modan.cpp
+++ b/src/server/scripts/EasternKingdoms/loch_modan.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/searing_gorge.cpp b/src/server/scripts/EasternKingdoms/searing_gorge.cpp
index b7b2e6a6107..763cb848d99 100644
--- a/src/server/scripts/EasternKingdoms/searing_gorge.cpp
+++ b/src/server/scripts/EasternKingdoms/searing_gorge.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/silvermoon_city.cpp b/src/server/scripts/EasternKingdoms/silvermoon_city.cpp
index 52ff8513d95..0c4ec0aa478 100644
--- a/src/server/scripts/EasternKingdoms/silvermoon_city.cpp
+++ b/src/server/scripts/EasternKingdoms/silvermoon_city.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/silverpine_forest.cpp b/src/server/scripts/EasternKingdoms/silverpine_forest.cpp
index cb105a102ef..0a0e91a2f74 100644
--- a/src/server/scripts/EasternKingdoms/silverpine_forest.cpp
+++ b/src/server/scripts/EasternKingdoms/silverpine_forest.cpp
@@ -1,4 +1,4 @@
- /* Copyright (C) 2006 - 2010 Trinity 
+ /* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/stormwind_city.cpp b/src/server/scripts/EasternKingdoms/stormwind_city.cpp
index 9043942feb4..b709c5de4b9 100644
--- a/src/server/scripts/EasternKingdoms/stormwind_city.cpp
+++ b/src/server/scripts/EasternKingdoms/stormwind_city.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/stranglethorn_vale.cpp b/src/server/scripts/EasternKingdoms/stranglethorn_vale.cpp
index 9537244fbd8..2002747ac12 100644
--- a/src/server/scripts/EasternKingdoms/stranglethorn_vale.cpp
+++ b/src/server/scripts/EasternKingdoms/stranglethorn_vale.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp b/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp
index 966b23489e6..bb2d2905df3 100644
--- a/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp
+++ b/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/undercity.cpp b/src/server/scripts/EasternKingdoms/undercity.cpp
index 9a7c66e45fb..7186011d367 100644
--- a/src/server/scripts/EasternKingdoms/undercity.cpp
+++ b/src/server/scripts/EasternKingdoms/undercity.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/western_plaguelands.cpp b/src/server/scripts/EasternKingdoms/western_plaguelands.cpp
index 38d81a1de7c..12a4b6e9cbf 100644
--- a/src/server/scripts/EasternKingdoms/western_plaguelands.cpp
+++ b/src/server/scripts/EasternKingdoms/western_plaguelands.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/westfall.cpp b/src/server/scripts/EasternKingdoms/westfall.cpp
index 10a7705aeba..7a15d56c07a 100644
--- a/src/server/scripts/EasternKingdoms/westfall.cpp
+++ b/src/server/scripts/EasternKingdoms/westfall.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/EasternKingdoms/wetlands.cpp b/src/server/scripts/EasternKingdoms/wetlands.cpp
index 2b68542cd1b..012792902a6 100644
--- a/src/server/scripts/EasternKingdoms/wetlands.cpp
+++ b/src/server/scripts/EasternKingdoms/wetlands.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Examples/example_creature.cpp b/src/server/scripts/Examples/example_creature.cpp
index c35071d3ae2..6c05d80e708 100644
--- a/src/server/scripts/Examples/example_creature.cpp
+++ b/src/server/scripts/Examples/example_creature.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Examples/example_escort.cpp b/src/server/scripts/Examples/example_escort.cpp
index 8ef52e37d3f..af66c8e6fee 100644
--- a/src/server/scripts/Examples/example_escort.cpp
+++ b/src/server/scripts/Examples/example_escort.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Examples/example_gossip_codebox.cpp b/src/server/scripts/Examples/example_gossip_codebox.cpp
index f2325ad5bad..8a45638facc 100644
--- a/src/server/scripts/Examples/example_gossip_codebox.cpp
+++ b/src/server/scripts/Examples/example_gossip_codebox.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Examples/example_misc.cpp b/src/server/scripts/Examples/example_misc.cpp
index 3a36411065c..8a7729fda99 100644
--- a/src/server/scripts/Examples/example_misc.cpp
+++ b/src/server/scripts/Examples/example_misc.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h
index 6d6ef5e44db..965886f1501 100644
--- a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h
+++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software licensed under GPL version 2
  * Please see the included DOCS/LICENSE.TXT for more information */
diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp
index 0be581ea325..b6eeaa0bdf1 100644
--- a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp
+++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
index 407a968dd09..76415aa3398 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp
index 762f5e406d2..1bb6e13367e 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp
@@ -1,4 +1,4 @@
- /* Copyright (C) 2006 - 2010 Trinity 
+ /* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h
index 7487759a129..c237d9d7aa8 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software licensed under GPL version 2
  * Please see the included DOCS/LICENSE.TXT for more information */
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
index 5093b9f8d04..6d3b3f33b59 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h
index 823ae8f56bc..70508f1bf15 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software licensed under GPL version 2
  * Please see the included DOCS/LICENSE.TXT for more information */
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
index 665f2ac80b7..46d6dde79a4 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
@@ -1,4 +1,4 @@
- /* Copyright (C) 2006 - 2010 Trinity 
+ /* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp
index c8a3a02e2af..c23edea5355 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp
index f0daf8780fb..88d212e57e6 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp
index 2800d57b22d..9bd1d984f8e 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp
index e29e6f805b5..0414ef49ecb 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.h b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.h
index 7927ea894ab..92194d8e3af 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.h
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software licensed under GPL version 2
 * Please see the included DOCS/LICENSE.TXT for more information */
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp
index 39307b6696f..91f79e14d5e 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp
index ae40fdcbb0a..f17775f85ed 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp
index b2595e752de..eaf934ab36b 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp
index a04bc48b75b..7cf8d5b1347 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
index 217207c848d..070f3279a4a 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
index 65fcd757d61..dfd62a9fd01 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
@@ -1,4 +1,4 @@
- /* Copyright (C) 2006 - 2010 Trinity 
+ /* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h
index b4c6f1934c9..45a0e0ab1db 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software licensed under GPL version 2
  * Please see the included DOCS/LICENSE.TXT for more information */
diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp
index e56b002b7e5..9bc68e2919f 100644
--- a/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp
+++ b/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_landslide.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_landslide.cpp
index 80d3628f59b..c9591203d90 100644
--- a/src/server/scripts/Kalimdor/Maraudon/boss_landslide.cpp
+++ b/src/server/scripts/Kalimdor/Maraudon/boss_landslide.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp
index 4dee83ac26b..85cb9ae37cf 100644
--- a/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp
+++ b/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp
index 2ea8bf9f815..605fb1cfccf 100644
--- a/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp
+++ b/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp
index 902d564aee2..472909bad81 100644
--- a/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp
index 738a03d1fd6..6cd7c8e6563 100644
--- a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp
index b918ba7c146..0b127199af7 100644
--- a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp
index 5604b58b216..409928a6866 100644
--- a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.h b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.h
index 2f6b21ee515..1bc69603c8a 100644
--- a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.h
+++ b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp
index 8a05f78bff0..1aedc544f4c 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
index 21114099064..b949693652a 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp
index b958a172ddf..1008b37d049 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp
index 17211d4d72a..51c25be4264 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
index 249b2f05166..d5fc5f00030 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp
index a71568b3707..f7c81d050dd 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp
index 573f5b8f298..9703d7c26a7 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp
index 8b11f1b7893..c696e34248c 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
index 7fe767e5b05..7894f07dd94 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp
index ba4b10d71e7..e6542176a0f 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp
index 04136856a9f..d7410adb522 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp
index f59983eb945..16ac07f7b06 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp
index f3d890f3e0c..d64a7f9f70f 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp
index d9ef9a08a24..429d6cb645f 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp
index 85bf1549970..200ca446030 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp
index b5c360ce015..c5adee80baf 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp
index 5d80d15595e..108d4304255 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp
index 761b45afb39..37a1a477de7 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h
index ac584f5918e..8376a73f27c 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software licensed under GPL version 2
  * Please see the included DOCS/LICENSE.TXT for more information */
diff --git a/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp b/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp
index 5dde3ae15f2..9900410f527 100644
--- a/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp
+++ b/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp
index 90d645cfbab..9af42029926 100644
--- a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp
+++ b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.h b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.h
index 981f886fd78..aa83e307100 100644
--- a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.h
+++ b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software licensed under GPL version 2
  * Please see the included DOCS/LICENSE.TXT for more information */
diff --git a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp
index d51124199c8..084a3f543c8 100644
--- a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp
+++ b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/ashenvale.cpp b/src/server/scripts/Kalimdor/ashenvale.cpp
index c9685b17f01..23c439bd57d 100644
--- a/src/server/scripts/Kalimdor/ashenvale.cpp
+++ b/src/server/scripts/Kalimdor/ashenvale.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/azshara.cpp b/src/server/scripts/Kalimdor/azshara.cpp
index f54329f4576..6d10199b1da 100644
--- a/src/server/scripts/Kalimdor/azshara.cpp
+++ b/src/server/scripts/Kalimdor/azshara.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/azuremyst_isle.cpp b/src/server/scripts/Kalimdor/azuremyst_isle.cpp
index 3923921c5c5..dcc69b1f36f 100644
--- a/src/server/scripts/Kalimdor/azuremyst_isle.cpp
+++ b/src/server/scripts/Kalimdor/azuremyst_isle.cpp
@@ -1,4 +1,4 @@
- /* Copyright (C) 2006 - 2010 Trinity 
+ /* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/bloodmyst_isle.cpp b/src/server/scripts/Kalimdor/bloodmyst_isle.cpp
index f0bfe430fec..074d9c3daed 100644
--- a/src/server/scripts/Kalimdor/bloodmyst_isle.cpp
+++ b/src/server/scripts/Kalimdor/bloodmyst_isle.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/boss_azuregos.cpp b/src/server/scripts/Kalimdor/boss_azuregos.cpp
index 81c7da916bf..92b03418aa9 100644
--- a/src/server/scripts/Kalimdor/boss_azuregos.cpp
+++ b/src/server/scripts/Kalimdor/boss_azuregos.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/darkshore.cpp b/src/server/scripts/Kalimdor/darkshore.cpp
index 548049c90aa..263203611fa 100644
--- a/src/server/scripts/Kalimdor/darkshore.cpp
+++ b/src/server/scripts/Kalimdor/darkshore.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/desolace.cpp b/src/server/scripts/Kalimdor/desolace.cpp
index 814ec34b8f5..be099f909e5 100644
--- a/src/server/scripts/Kalimdor/desolace.cpp
+++ b/src/server/scripts/Kalimdor/desolace.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/dustwallow_marsh.cpp b/src/server/scripts/Kalimdor/dustwallow_marsh.cpp
index ddd41f4e45b..9b27e122663 100644
--- a/src/server/scripts/Kalimdor/dustwallow_marsh.cpp
+++ b/src/server/scripts/Kalimdor/dustwallow_marsh.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/felwood.cpp b/src/server/scripts/Kalimdor/felwood.cpp
index c9d551ae996..3c029d34f4b 100644
--- a/src/server/scripts/Kalimdor/felwood.cpp
+++ b/src/server/scripts/Kalimdor/felwood.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/feralas.cpp b/src/server/scripts/Kalimdor/feralas.cpp
index 5f54b67810e..d8bfc081124 100644
--- a/src/server/scripts/Kalimdor/feralas.cpp
+++ b/src/server/scripts/Kalimdor/feralas.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/moonglade.cpp b/src/server/scripts/Kalimdor/moonglade.cpp
index acec591e2b3..373137163f7 100644
--- a/src/server/scripts/Kalimdor/moonglade.cpp
+++ b/src/server/scripts/Kalimdor/moonglade.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/mulgore.cpp b/src/server/scripts/Kalimdor/mulgore.cpp
index 00d405fae26..0a92df106ed 100644
--- a/src/server/scripts/Kalimdor/mulgore.cpp
+++ b/src/server/scripts/Kalimdor/mulgore.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/orgrimmar.cpp b/src/server/scripts/Kalimdor/orgrimmar.cpp
index 8c1fa00416c..8cb31d8a349 100644
--- a/src/server/scripts/Kalimdor/orgrimmar.cpp
+++ b/src/server/scripts/Kalimdor/orgrimmar.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/silithus.cpp b/src/server/scripts/Kalimdor/silithus.cpp
index eeefc0f19e2..5814af10790 100644
--- a/src/server/scripts/Kalimdor/silithus.cpp
+++ b/src/server/scripts/Kalimdor/silithus.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/stonetalon_mountains.cpp b/src/server/scripts/Kalimdor/stonetalon_mountains.cpp
index b3cb4bc664f..1cafc199cfb 100644
--- a/src/server/scripts/Kalimdor/stonetalon_mountains.cpp
+++ b/src/server/scripts/Kalimdor/stonetalon_mountains.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/tanaris.cpp b/src/server/scripts/Kalimdor/tanaris.cpp
index 93c75e1b37a..6ef15cfc1f3 100644
--- a/src/server/scripts/Kalimdor/tanaris.cpp
+++ b/src/server/scripts/Kalimdor/tanaris.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/teldrassil.cpp b/src/server/scripts/Kalimdor/teldrassil.cpp
index fe41f8a5361..e495f23abf9 100644
--- a/src/server/scripts/Kalimdor/teldrassil.cpp
+++ b/src/server/scripts/Kalimdor/teldrassil.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/the_barrens.cpp b/src/server/scripts/Kalimdor/the_barrens.cpp
index 8c2f4299374..87fcc9e71ed 100644
--- a/src/server/scripts/Kalimdor/the_barrens.cpp
+++ b/src/server/scripts/Kalimdor/the_barrens.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/thousand_needles.cpp b/src/server/scripts/Kalimdor/thousand_needles.cpp
index 2ab3171113a..528cd8d1c49 100644
--- a/src/server/scripts/Kalimdor/thousand_needles.cpp
+++ b/src/server/scripts/Kalimdor/thousand_needles.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/thunder_bluff.cpp b/src/server/scripts/Kalimdor/thunder_bluff.cpp
index b11619413b3..835346f90c5 100644
--- a/src/server/scripts/Kalimdor/thunder_bluff.cpp
+++ b/src/server/scripts/Kalimdor/thunder_bluff.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/ungoro_crater.cpp b/src/server/scripts/Kalimdor/ungoro_crater.cpp
index 066dde3e957..3e6ea803333 100644
--- a/src/server/scripts/Kalimdor/ungoro_crater.cpp
+++ b/src/server/scripts/Kalimdor/ungoro_crater.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Kalimdor/winterspring.cpp b/src/server/scripts/Kalimdor/winterspring.cpp
index d6b19132fd8..4eb4746c910 100644
--- a/src/server/scripts/Kalimdor/winterspring.cpp
+++ b/src/server/scripts/Kalimdor/winterspring.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp
index a1bf7e55dd5..db7487c7d04 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h
index a98a7230493..714f008f912 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software licensed under GPL version 2
 * Please see the included DOCS/LICENSE.TXT for more information */
diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
index b7e9651edc4..21cbd7c6942 100644
--- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 TrinityCore 
+/* Copyright (C) 2008 - 2010 TrinityCore 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
index 16e6f4c0853..4c54c83d764 100644
--- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 TrinityCore 
+/* Copyright (C) 2008 - 2010 TrinityCore 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp
index 6bdf8c7f199..b4edf3c36ed 100644
--- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 TrinityCore 
+/* Copyright (C) 2008 - 2010 TrinityCore 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h
index e0479eb4d2b..f33347b4466 100644
--- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h
+++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 TrinityCore 
+/* Copyright (C) 2008 - 2010 TrinityCore 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp
index c3a2883149b..72139b89256 100644
--- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 TrinityCore 
+/* Copyright (C) 2008 - 2010 TrinityCore 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp
index 64cf0b609f3..63dfb565440 100644
--- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 TrinityCore 
+/* Copyright (C) 2008 - 2010 TrinityCore 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp
index 8f3cc8330b1..45ebb86dc83 100644
--- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 TrinityCore 
+/* Copyright (C) 2008 - 2010 TrinityCore 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
index c66f928033e..787b969bbf1 100644
--- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 TrinityCore 
+/* Copyright (C) 2008 - 2010 TrinityCore 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h
index 46ae0cb283c..43efe19ef9c 100644
--- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h
+++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 TrinityCore 
+/* Copyright (C) 2008 - 2010 TrinityCore 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
index 6b7b6878760..fb88704ca46 100644
--- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 TrinityCore 
+/* Copyright (C) 2008 - 2010 TrinityCore 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp
index 50b2277a6c2..a46aef2d592 100644
--- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 TrinityCore 
+/* Copyright (C) 2008 - 2010 TrinityCore 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
index 5ff3593de20..d6179274160 100644
--- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 TrinityCore 
+/* Copyright (C) 2008 - 2010 TrinityCore 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp
index 279dde9479e..f188057dca6 100644
--- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 TrinityCore 
+/* Copyright (C) 2008 - 2010 TrinityCore 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp
index e9241b6c075..f8002e075a8 100644
--- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 TrinityCore 
+/* Copyright (C) 2008 - 2010 TrinityCore 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp
index c950bada096..f9390ac2582 100644
--- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 TrinityCore 
+/* Copyright (C) 2008 - 2010 TrinityCore 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h
index 4a221d17518..9a52fb6698c 100644
--- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h
+++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 TrinityCore 
+/* Copyright (C) 2008 - 2010 TrinityCore 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
index 51884761f30..dc750268dfc 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
index 2debf8c732a..21d10dec5c1 100644
--- a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * Copyright (C) 2008 - 2010 TrinityCore 
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp
index 93a8cf8331e..293ba967410 100644
--- a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * Copyright (C) 2008 - 2010 TrinityCore 
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
index 123a14b1c63..f9abf8011ce 100644
--- a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * Copyright (C) 2008 - 2010 TrinityCore 
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp
index 639c1d6192b..4482b37992e 100644
--- a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * Copyright (C) 2008 - 2010 TrinityCore 
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp
index 716ae6eb6d8..601b667aa0b 100644
--- a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * Copyright (C) 2008 - 2010 TrinityCore 
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp
index a6d104245ba..d13c036856a 100644
--- a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp
+++ b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 TrinityCore 
+/* Copyright (C) 2008 - 2010 TrinityCore 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp
index 17305753c31..ab21760bed8 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp
index 6c334996c74..36f555eb9f0 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * Copyright (C) 2008 - 2010 TrinityCore 
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp
index f6138453121..4d55554e552 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp
index ff751dcb6f4..735d91a5f54 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h
index 47226597761..b8b220a2aa2 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software licensed under GPL version 2
  * Please see the included DOCS/LICENSE.TXT for more information */
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp
index 06f6be6214d..f867314fd3c 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Northrend/borean_tundra.cpp b/src/server/scripts/Northrend/borean_tundra.cpp
index 6a02fdd9106..058a464f4b8 100644
--- a/src/server/scripts/Northrend/borean_tundra.cpp
+++ b/src/server/scripts/Northrend/borean_tundra.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Northrend/dragonblight.cpp b/src/server/scripts/Northrend/dragonblight.cpp
index 13486cedb31..0de8a5c5b7e 100644
--- a/src/server/scripts/Northrend/dragonblight.cpp
+++ b/src/server/scripts/Northrend/dragonblight.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Northrend/grizzly_hills.cpp b/src/server/scripts/Northrend/grizzly_hills.cpp
index f739cb4b768..43afd1f2ce4 100644
--- a/src/server/scripts/Northrend/grizzly_hills.cpp
+++ b/src/server/scripts/Northrend/grizzly_hills.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Northrend/icecrown.cpp b/src/server/scripts/Northrend/icecrown.cpp
index 3183b6ddf9f..5a3b5953af4 100644
--- a/src/server/scripts/Northrend/icecrown.cpp
+++ b/src/server/scripts/Northrend/icecrown.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp
index c3fbb7a70e3..682903889ec 100644
--- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp
+++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp
index b651072f91b..fb2c7b4567a 100644
--- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp
+++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp
index 51c1759ef43..56d9f24f419 100644
--- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp
index 1b744685df6..a169863aaa1 100644
--- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp
index e80d591e697..c76ac41761b 100644
--- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp
+++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp
index 343c2e8b78f..b0ec79cc5a0 100644
--- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp
+++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp
index 2be293cc478..d8ec3faed02 100644
--- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp
+++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h b/src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h
index 25ab6b0f89f..b4ed1817fcf 100644
--- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h
+++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software licensed under GPL version 2
  * Please see the included DOCS/LICENSE.TXT for more information */
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp
index b8d7e966c2f..bc94c9ec5a7 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
index 9d5ebf959e0..0b4928a640f 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp
index 253d5a45f65..937741e37ed 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp
index a048a4fb736..b903ce832cb 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp
index 04602a6eee7..5f8452cb1ef 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h
index 7b3f1fba135..0bea027f466 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software licensed under GPL version 2
  * Please see the included DOCS/LICENSE.TXT for more information */
diff --git a/src/server/scripts/Outland/BlackTemple/black_temple.cpp b/src/server/scripts/Outland/BlackTemple/black_temple.cpp
index e68ccd8940b..b280839bdef 100644
--- a/src/server/scripts/Outland/BlackTemple/black_temple.cpp
+++ b/src/server/scripts/Outland/BlackTemple/black_temple.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/BlackTemple/black_temple.h b/src/server/scripts/Outland/BlackTemple/black_temple.h
index b102d35c981..83733892988 100644
--- a/src/server/scripts/Outland/BlackTemple/black_temple.h
+++ b/src/server/scripts/Outland/BlackTemple/black_temple.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software licensed under GPL version 2
  * Please see the included DOCS/LICENSE.TXT for more information */
diff --git a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp
index 844c314c43f..4695c5873ff 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
index 4fb7b75b4f8..247230aacee 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
index 1f6c847ea95..2deee41e31f 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
index 76c90d2dec6..b3dccdf18e6 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
index 15c73061354..e4a71983e8c 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
index 6719060f822..03ab5233971 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
index 5e50e4a2769..08e1bd9cadc 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp
index e7b260bd289..2cf2737c796 100644
--- a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp
+++ b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
index c037f5131a3..3594876e28e 100644
--- a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
+++ b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
index a86ed00cf77..55799e52711 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
index 0ba5e62a4c3..0fde5689fac 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
index 850882b6254..cda16e818aa 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp
index bd83759d153..b0fc34738e7 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
index d22117aba8f..fa31e04429d 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
index 6e615000d5a..d2996f8e989 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
index c889078b22e..44f5f91efc0 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h
index bfe841a5d1e..3d41e15ea44 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software licensed under GPL version 2
  * Please see the included DOCS/LICENSE.TXT for more information */
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp
index 4c0d2f3c271..471df6faad6 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp
index 7b7aa183017..709dfa52255 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp
index 7919816effd..f27cef0fbe4 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
index 34ddee339d4..59dfb86888f 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h
index f1189d0831d..1c0fce65c30 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software licensed under GPL version 2
  * Please see the included DOCS/LICENSE.TXT for more information */
diff --git a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp
index 2912a19d372..4a0da30d7de 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp
index 795e95dae53..49aa55fb1cf 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp
index 534ae93e183..2f70d80db55 100644
--- a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp
+++ b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp
index 000fa11deda..360d1c2385b 100644
--- a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp
+++ b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/GruulsLair/gruuls_lair.h b/src/server/scripts/Outland/GruulsLair/gruuls_lair.h
index b53e51557e4..92ecac1cf3f 100644
--- a/src/server/scripts/Outland/GruulsLair/gruuls_lair.h
+++ b/src/server/scripts/Outland/GruulsLair/gruuls_lair.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software licensed under GPL version 2
  * Please see the included DOCS/LICENSE.TXT for more information */
diff --git a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp
index 3d1b30b765d..75d4e0453bd 100644
--- a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp
+++ b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h
index e01873d3501..148ec2a5389 100644
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software licensed under GPL version 2
  * Please see the included DOCS/LICENSE.TXT for more information */
diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
index 717b09a4808..13555363afa 100644
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp
index 2da2ba36c1e..51d5e84297e 100644
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp
index 59670ed9d9b..df3ed850002 100644
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
index 30b6cb38188..d7e3ee4df53 100644
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp
index 2d59eb18d7d..156a2261e1a 100644
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
index fa85e5afa5e..a952b6ba79a 100644
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
index d49797d98c9..7996f41143e 100644
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h
index 4d138d6430a..df30859df75 100644
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software licensed under GPL version 2
  * Please see the included DOCS/LICENSE.TXT for more information */
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
index 153651419b6..63521094c1c 100644
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
index c7c940dc789..838ae7f07d7 100644
--- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h
index 410c57c8c1b..413f45e981d 100644
--- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h
+++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software licensed under GPL version 2
  * Please see the included DOCS/LICENSE.TXT for more information */
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
index 0ff4bae75c9..ddc20fba7f5 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
index d57a163564c..0cfcc154313 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
index 8905d89d9fb..cbaa3144664 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
index 016c6908d8c..9302826bce9 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h
index 521ffd2c369..15380e11fe1 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software licensed under GPL version 2
  * Please see the included DOCS/LICENSE.TXT for more information */
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
index a807a1d6945..d4f4985f9db 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
index 640df17dff2..5b33b893e41 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
index 9958b47fbb2..97111edea73 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
index eed56a0a4e0..a44c83baaf8 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp
index e78c4276c5e..a5e5b32738c 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.h b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.h
index 1120af800ac..a39476eceb5 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.h
+++ b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software licensed under GPL version 2
  * Please see the included DOCS/LICENSE.TXT for more information */
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp
index 54abc76ce36..e71b76735ea 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp
index 55ca2c36465..0623f90aa9e 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
index df395c5a925..c2c5b00bfcf 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
index 61e0d7ab518..9f5074cf394 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp
index b152726f12a..32a9b79f426 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
index 4061fc4e587..e67b5246223 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h
index 1115444d747..bdb18aa84ac 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software licensed under GPL version 2
  * Please see the included DOCS/LICENSE.TXT for more information */
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
index 62af91fd990..ced239ea088 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
index 3ce146774a1..413864ac843 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp
index e77c5d0228e..0a66cdf038c 100644
--- a/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp
index ce3d96fbb4c..38d0d3da1eb 100644
--- a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp
index 833b8f2bab7..9bca4e763d2 100644
--- a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/blades_edge_mountains.cpp b/src/server/scripts/Outland/blades_edge_mountains.cpp
index 56a6155ec1c..5c0419730c6 100644
--- a/src/server/scripts/Outland/blades_edge_mountains.cpp
+++ b/src/server/scripts/Outland/blades_edge_mountains.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp
index a1832f3b51b..1c83465357e 100644
--- a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp
+++ b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/boss_doomwalker.cpp b/src/server/scripts/Outland/boss_doomwalker.cpp
index 5c4fd477553..7c44d7e2542 100644
--- a/src/server/scripts/Outland/boss_doomwalker.cpp
+++ b/src/server/scripts/Outland/boss_doomwalker.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/hellfire_peninsula.cpp b/src/server/scripts/Outland/hellfire_peninsula.cpp
index bea5d6e34dd..768562c1460 100644
--- a/src/server/scripts/Outland/hellfire_peninsula.cpp
+++ b/src/server/scripts/Outland/hellfire_peninsula.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/nagrand.cpp b/src/server/scripts/Outland/nagrand.cpp
index e04761d1ae5..b845314a3c4 100644
--- a/src/server/scripts/Outland/nagrand.cpp
+++ b/src/server/scripts/Outland/nagrand.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/netherstorm.cpp b/src/server/scripts/Outland/netherstorm.cpp
index 814479f564b..e7c7c975ee4 100644
--- a/src/server/scripts/Outland/netherstorm.cpp
+++ b/src/server/scripts/Outland/netherstorm.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/shadowmoon_valley.cpp b/src/server/scripts/Outland/shadowmoon_valley.cpp
index a14ce724bef..cc5a9ef6640 100644
--- a/src/server/scripts/Outland/shadowmoon_valley.cpp
+++ b/src/server/scripts/Outland/shadowmoon_valley.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/shattrath_city.cpp b/src/server/scripts/Outland/shattrath_city.cpp
index 700d22202e6..072695c58c7 100644
--- a/src/server/scripts/Outland/shattrath_city.cpp
+++ b/src/server/scripts/Outland/shattrath_city.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/terokkar_forest.cpp b/src/server/scripts/Outland/terokkar_forest.cpp
index 01284bce8c1..2349a733f29 100644
--- a/src/server/scripts/Outland/terokkar_forest.cpp
+++ b/src/server/scripts/Outland/terokkar_forest.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Outland/zangarmarsh.cpp b/src/server/scripts/Outland/zangarmarsh.cpp
index 73e64b0c6a2..46bc1f186c4 100644
--- a/src/server/scripts/Outland/zangarmarsh.cpp
+++ b/src/server/scripts/Outland/zangarmarsh.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/World/areatrigger_scripts.cpp b/src/server/scripts/World/areatrigger_scripts.cpp
index 0a8793aa415..ab0975ea84f 100644
--- a/src/server/scripts/World/areatrigger_scripts.cpp
+++ b/src/server/scripts/World/areatrigger_scripts.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/World/boss_emeriss.cpp b/src/server/scripts/World/boss_emeriss.cpp
index f227a48be2d..f3b10157858 100644
--- a/src/server/scripts/World/boss_emeriss.cpp
+++ b/src/server/scripts/World/boss_emeriss.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/World/boss_lethon.cpp b/src/server/scripts/World/boss_lethon.cpp
index 61b06fdd776..6e78b6a5dd5 100644
--- a/src/server/scripts/World/boss_lethon.cpp
+++ b/src/server/scripts/World/boss_lethon.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/World/boss_taerar.cpp b/src/server/scripts/World/boss_taerar.cpp
index 13c5b31548c..0f6727a7821 100644
--- a/src/server/scripts/World/boss_taerar.cpp
+++ b/src/server/scripts/World/boss_taerar.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/World/boss_ysondre.cpp b/src/server/scripts/World/boss_ysondre.cpp
index bb962dd7b25..d2cc5bf1efc 100644
--- a/src/server/scripts/World/boss_ysondre.cpp
+++ b/src/server/scripts/World/boss_ysondre.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp
index 3e9b1c78b67..b5ee4b54a3c 100644
--- a/src/server/scripts/World/go_scripts.cpp
+++ b/src/server/scripts/World/go_scripts.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 >
 * Copyright (C) 2006 - 20010 TrinityCore 
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/server/scripts/World/guards.cpp b/src/server/scripts/World/guards.cpp
index 3d840dd854f..6379238d2c9 100644
--- a/src/server/scripts/World/guards.cpp
+++ b/src/server/scripts/World/guards.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/World/item_scripts.cpp b/src/server/scripts/World/item_scripts.cpp
index 9eb6f72743c..c875a9a4295 100644
--- a/src/server/scripts/World/item_scripts.cpp
+++ b/src/server/scripts/World/item_scripts.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/World/mob_generic_creature.cpp b/src/server/scripts/World/mob_generic_creature.cpp
index c7b746bd0c8..548562f5576 100644
--- a/src/server/scripts/World/mob_generic_creature.cpp
+++ b/src/server/scripts/World/mob_generic_creature.cpp
@@ -1,5 +1,5 @@
 
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/World/npc_professions.cpp b/src/server/scripts/World/npc_professions.cpp
index 24159c01685..744837a900a 100644
--- a/src/server/scripts/World/npc_professions.cpp
+++ b/src/server/scripts/World/npc_professions.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/World/npc_taxi.cpp b/src/server/scripts/World/npc_taxi.cpp
index 951f7a6bde6..c6e9652d5b2 100644
--- a/src/server/scripts/World/npc_taxi.cpp
+++ b/src/server/scripts/World/npc_taxi.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp
index 766a5c30251..1e9edb7a96d 100644
--- a/src/server/scripts/World/npcs_special.cpp
+++ b/src/server/scripts/World/npcs_special.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 - 2010 Trinity 
+/* Copyright (C) 2008 - 2010 Trinity 
  * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
-- 
cgit v1.2.3


From c4634a3161ae0b72b9ebfc7f6c477a5918d40a52 Mon Sep 17 00:00:00 2001
From: click 
Date: Fri, 2 Jul 2010 16:28:59 +0200
Subject: Adjust some more script copyrights (grrrrr)

--HG--
branch : trunk
---
 src/server/game/Addons/AddonMgr.cpp                                  | 3 +--
 src/server/game/Addons/AddonMgr.h                                    | 3 +--
 src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp           | 4 +++-
 src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp             | 2 +-
 src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp        | 4 +++-
 src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp                | 4 +++-
 src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp               | 4 +++-
 src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp            | 4 +++-
 src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp               | 4 +++-
 src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp              | 2 +-
 src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp              | 2 +-
 src/server/scripts/Northrend/Naxxramas/boss_noth.cpp                 | 4 +++-
 src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp            | 4 +++-
 src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp            | 2 +-
 src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp            | 2 +-
 src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp | 2 +-
 src/server/scripts/Northrend/Ulduar/ulduar/boss_auriaya.cpp          | 2 +-
 src/server/scripts/Northrend/Ulduar/ulduar/boss_freya.cpp            | 2 +-
 src/server/scripts/Northrend/Ulduar/ulduar/boss_general_vezax.cpp    | 2 +-
 src/server/scripts/Northrend/Ulduar/ulduar/boss_hodir.cpp            | 2 +-
 src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp            | 2 +-
 src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp         | 2 +-
 src/server/scripts/Northrend/Ulduar/ulduar/boss_mimiron.cpp          | 2 +-
 src/server/scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp       | 2 +-
 src/server/scripts/Northrend/Ulduar/ulduar/boss_thorim.cpp           | 2 +-
 src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp            | 2 +-
 src/server/scripts/Northrend/Ulduar/ulduar/boss_yoggsaron.cpp        | 2 +-
 src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp       | 2 +-
 src/server/scripts/Northrend/Ulduar/ulduar/ulduar.h                  | 2 +-
 src/server/scripts/World/npc_innkeeper.cpp                           | 2 +-
 30 files changed, 46 insertions(+), 32 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Addons/AddonMgr.cpp b/src/server/game/Addons/AddonMgr.cpp
index 9bc28f845ac..830d439bfdd 100644
--- a/src/server/game/Addons/AddonMgr.cpp
+++ b/src/server/game/Addons/AddonMgr.cpp
@@ -1,8 +1,7 @@
 /*
+ * Copyright (C) 2008-2010 Trinity 
  * Copyright (C) 2005-2009 MaNGOS 
  *
- * Copyright (C) 2008-2009 Trinity 
- *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/game/Addons/AddonMgr.h b/src/server/game/Addons/AddonMgr.h
index 90232cc3f2b..112415e5b40 100644
--- a/src/server/game/Addons/AddonMgr.h
+++ b/src/server/game/Addons/AddonMgr.h
@@ -1,8 +1,7 @@
 /*
+ * Copyright (C) 2008-2010 Trinity 
  * Copyright (C) 2005-2009 MaNGOS 
  *
- * Copyright (C) 2008-2009 Trinity 
- *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp
index 9b255da56e7..349f39b24fd 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp
@@ -1,4 +1,6 @@
-/* Copyright (C) 2008 - 2009 Trinity 
+/*
+ * Copyright (C) 2008 - 2010 Trinity 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp
index 40c7b77c4d5..7f66788c32e 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 - 2009 Trinity 
+ * Copyright (C) 2008 - 2010 Trinity 
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
index 2f95676363e..32a6683366e 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
@@ -1,4 +1,6 @@
-/* Copyright (C) 2008 - 2009 Trinity 
+/*
+ * Copyright (C) 2008 - 2010 Trinity 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp
index a781ead6b48..4eee9f03f60 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp
@@ -1,4 +1,6 @@
-/* Copyright (C) 2008 - 2009 Trinity 
+/*
+ * Copyright (C) 2008 - 2010 Trinity 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
index ac774c6512e..2b3a0daad17 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
@@ -1,4 +1,6 @@
-/* Copyright (C) 2008 - 2009 Trinity 
+/*
+ * Copyright (C) 2008 - 2010 Trinity 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp
index 4af90224e50..1e68ea07418 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp
@@ -1,4 +1,6 @@
-/* Copyright (C) 2008 - 2009 Trinity 
+/*
+ * Copyright (C) 2008 - 2010 Trinity 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp
index f8244999ce3..7d24be22bb6 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp
@@ -1,4 +1,6 @@
-/* Copyright (C) 2008 - 2009 Trinity 
+/*
+ * Copyright (C) 2008 - 2010 Trinity 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp
index 702c23fc3d0..5c5808f795d 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 - 2009 Trinity 
+ * Copyright (C) 2008 - 2010 Trinity 
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp
index d4442d78989..29c1eac6a6d 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 - 2009 Trinity 
+ * Copyright (C) 2008 - 2010 Trinity 
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp
index 577b2707817..62a4d60d20b 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp
@@ -1,4 +1,6 @@
-/* Copyright (C) 2008 - 2009 Trinity 
+/*
+ * Copyright (C) 2008 - 2010 Trinity 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp
index a97446adc25..a65b164648b 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp
@@ -1,4 +1,6 @@
-/* Copyright (C) 2008 - 2009 Trinity 
+/*
+ * Copyright (C) 2008 - 2010 Trinity 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp
index 2cbd6b37722..f76ba34a6c8 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 - 2009 Trinity 
+ * Copyright (C) 2008 - 2010 Trinity 
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp
index 608b6ef479c..88fccbce899 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 - 2009 Trinity 
+ * Copyright (C) 2008 - 2010 Trinity 
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp
index a7f5522c010..7b1cf21cebe 100644
--- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 - 2009 Trinity 
+ * Copyright (C) 2008 - 2010 Trinity 
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_auriaya.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_auriaya.cpp
index 119ebb81b73..4f7d541c087 100644
--- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_auriaya.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_auriaya.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 - 2009 Trinity 
+ * Copyright (C) 2008 - 2010 Trinity 
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_freya.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_freya.cpp
index 52ead1fb19d..5dbacf060ea 100644
--- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_freya.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_freya.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 - 2009 Trinity 
+ * Copyright (C) 2008 - 2010 Trinity 
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_general_vezax.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_general_vezax.cpp
index a57dea47dea..78431ae007d 100644
--- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_general_vezax.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_general_vezax.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 - 2009 Trinity 
+ * Copyright (C) 2008 - 2010 Trinity 
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_hodir.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_hodir.cpp
index 439e91a6d31..7b35e4c182e 100644
--- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_hodir.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_hodir.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 - 2009 Trinity 
+ * Copyright (C) 2008 - 2010 Trinity 
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp
index f23a1f26f2e..04ae00d1a6d 100644
--- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 - 2009 Trinity 
+ * Copyright (C) 2008 - 2010 Trinity 
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp
index 483f2e1a0bd..a0c3844079c 100644
--- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 - 2009 Trinity 
+ * Copyright (C) 2008 - 2010 Trinity 
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_mimiron.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_mimiron.cpp
index 0f5837d0b80..6a1c3fa7c22 100644
--- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_mimiron.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_mimiron.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 - 2009 Trinity 
+ * Copyright (C) 2008 - 2010 Trinity 
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp
index 201d39dd02e..f13b05bcab9 100644
--- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 - 2009 Trinity 
+ * Copyright (C) 2008 - 2010 Trinity 
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_thorim.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_thorim.cpp
index 5b6f78227f0..36d52e55ac4 100644
--- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_thorim.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_thorim.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 - 2009 Trinity 
+ * Copyright (C) 2008 - 2010 Trinity 
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp
index 3cce85ca773..958ad6a053c 100644
--- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 - 2009 Trinity 
+ * Copyright (C) 2008 - 2010 Trinity 
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_yoggsaron.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_yoggsaron.cpp
index c0f8df82f9c..698e61c39c2 100644
--- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_yoggsaron.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_yoggsaron.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 - 2009 Trinity 
+ * Copyright (C) 2008 - 2010 Trinity 
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp
index d8fc0143b69..ab4befd00f1 100644
--- a/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 - 2009 Trinity 
+ * Copyright (C) 2008 - 2010 Trinity 
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/ulduar.h b/src/server/scripts/Northrend/Ulduar/ulduar/ulduar.h
index 445aa804d43..7b54bacbbe0 100644
--- a/src/server/scripts/Northrend/Ulduar/ulduar/ulduar.h
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/ulduar.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 - 2009 Trinity 
+ * Copyright (C) 2008 - 2010 Trinity 
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/server/scripts/World/npc_innkeeper.cpp b/src/server/scripts/World/npc_innkeeper.cpp
index 4689354b67a..4457393eec6 100644
--- a/src/server/scripts/World/npc_innkeeper.cpp
+++ b/src/server/scripts/World/npc_innkeeper.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 - 2009 Trinity 
+ * Copyright (C) 2008 - 2010 Trinity 
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
-- 
cgit v1.2.3


From 599d957a263a722341aba4459ae2e5a2e2ed1a02 Mon Sep 17 00:00:00 2001
From: click 
Date: Sun, 4 Jul 2010 15:43:20 +0200
Subject: Fix SPELL_AURA_MOD_HEALING_DONE healing bonus with 0 misc value
 (patch by toni.shocker)

--HG--
branch : trunk
---
 src/server/game/Entities/Unit/Unit.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index e85dd8968dc..189a797d955 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -10963,7 +10963,7 @@ int32 Unit::SpellBaseHealingBonus(SpellSchoolMask schoolMask)
 
     AuraEffectList const& mHealingDone = GetAuraEffectsByType(SPELL_AURA_MOD_HEALING_DONE);
     for (AuraEffectList::const_iterator i = mHealingDone.begin(); i != mHealingDone.end(); ++i)
-        if (((*i)->GetMiscValue() & schoolMask) != 0)
+        if (!(*i)->GetMiscValue() || ((*i)->GetMiscValue() & schoolMask) != 0)
             AdvertisedBenefit += (*i)->GetAmount();
 
     // Healing bonus of spirit, intellect and strength
-- 
cgit v1.2.3


From 079b945a7dff0dcc46d932ab929b7fe6c64c8c03 Mon Sep 17 00:00:00 2001
From: click 
Date: Sun, 4 Jul 2010 15:55:05 +0200
Subject: Use RemoveAurasByType() and not RemoveAuraDueToSpell() to remove
 iterated spellauras of a type - DueTospell() expects singular spellID Thanks
 to Azazel for the heads up

--HG--
branch : trunk
---
 src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp           | 2 +-
 src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp         | 2 +-
 src/server/scripts/EasternKingdoms/wetlands.cpp              | 2 +-
 src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp
index 0549858d1c7..84e2cff7e2f 100644
--- a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp
+++ b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp
@@ -104,7 +104,7 @@ void npc_escortAI::MoveInLineOfSight(Unit* pWho)
             {
                 if (!me->getVictim())
                 {
-                    pWho->RemoveAurasDueToSpell(SPELL_AURA_MOD_STEALTH);
+                    pWho->RemoveAurasByType(SPELL_AURA_MOD_STEALTH);
                     AttackStart(pWho);
                 }
                 else if (me->GetMap()->IsDungeon())
diff --git a/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp
index 6147edac45c..499e4611693 100644
--- a/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp
+++ b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp
@@ -102,7 +102,7 @@ void FollowerAI::MoveInLineOfSight(Unit* pWho)
             {
                 if (!me->getVictim())
                 {
-                    pWho->RemoveAurasDueToSpell(SPELL_AURA_MOD_STEALTH);
+                    pWho->RemoveAurasByType(SPELL_AURA_MOD_STEALTH);
                     AttackStart(pWho);
                 }
                 else if (me->GetMap()->IsDungeon())
diff --git a/src/server/scripts/EasternKingdoms/wetlands.cpp b/src/server/scripts/EasternKingdoms/wetlands.cpp
index 012792902a6..71ef6884449 100644
--- a/src/server/scripts/EasternKingdoms/wetlands.cpp
+++ b/src/server/scripts/EasternKingdoms/wetlands.cpp
@@ -62,7 +62,7 @@ struct npc_tapoke_slim_jahnAI : public npc_escortAI
         {
             case 2:
                 if (me->HasStealthAura())
-                    me->RemoveAurasDueToSpell(SPELL_AURA_MOD_STEALTH);
+                    me->RemoveAurasByType(SPELL_AURA_MOD_STEALTH);
 
                 SetRun();
                 me->setFaction(FACTION_ENEMY);
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
index 5b33b893e41..e2eff5deb31 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
@@ -400,7 +400,7 @@ struct boss_kaelthasAI : public ScriptedAI
             {
                 if (!me->getVictim() && Phase >= 4)
                 {
-                    who->RemoveAurasDueToSpell(SPELL_AURA_MOD_STEALTH);
+                    who->RemoveAurasByType(SPELL_AURA_MOD_STEALTH);
                     AttackStart(who);
                 }
                 else if (me->GetMap()->IsDungeon())
-- 
cgit v1.2.3


From cdf3514603e3d892ddf0d0b4be7d318e56274a5e Mon Sep 17 00:00:00 2001
From: click 
Date: Sun, 4 Jul 2010 16:15:29 +0200
Subject: Use MAX_SPELL_CHARM as spellcount on GetPetAutoSpellSize(), fixes OOB
 array-access in Pet::UpdateAI() Thanks to ge0rg for the heads up and patch

--HG--
branch : trunk
---
 src/server/game/Entities/Creature/Creature.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h
index 11b8ce29763..ed3b4c6a5b4 100644
--- a/src/server/game/Entities/Creature/Creature.h
+++ b/src/server/game/Entities/Creature/Creature.h
@@ -622,10 +622,10 @@ class Creature : public Unit, public GridObject
         bool hasInvolvedQuest(uint32 quest_id)  const;
 
         bool isRegeneratingHealth() { return m_regenHealth; }
-        virtual uint8 GetPetAutoSpellSize() const { return CREATURE_MAX_SPELLS; }
+        virtual uint8 GetPetAutoSpellSize() const { return MAX_SPELL_CHARM; }
         virtual uint32 GetPetAutoSpellOnPos(uint8 pos) const
         {
-            if (pos >= CREATURE_MAX_SPELLS || m_charmInfo->GetCharmSpell(pos)->GetType() != ACT_ENABLED)
+            if (pos >= MAX_SPELL_CHARM || m_charmInfo->GetCharmSpell(pos)->GetType() != ACT_ENABLED)
                 return 0;
             else
                 return m_charmInfo->GetCharmSpell(pos)->GetAction();
-- 
cgit v1.2.3


From 962b48c6a36016a24c5487a12b0d78e642ed942c Mon Sep 17 00:00:00 2001
From: click 
Date: Sun, 4 Jul 2010 16:27:33 +0200
Subject: Properly initialize CharmInfo states (fixes warning about
 noninitialized pointers) - Fix/patch by ge0rg

--HG--
branch : trunk
---
 src/server/game/Entities/Unit/Unit.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 189a797d955..5d1bcabb318 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -13398,7 +13398,8 @@ void Unit::DeleteCharmInfo()
 }
 
 CharmInfo::CharmInfo(Unit* unit)
-: m_unit(unit), m_CommandState(COMMAND_FOLLOW), m_petnumber(0), m_barInit(false)
+: m_unit(unit), m_CommandState(COMMAND_FOLLOW), m_petnumber(0), m_barInit(false),
+  m_isCommandAttack(false), m_isAtStay(false), m_isFollowing(false), m_isReturning(false)
 {
     for (uint8 i = 0; i < MAX_SPELL_CHARM; ++i)
         m_charmspells[i].SetActionAndType(0,ACT_DISABLED);
-- 
cgit v1.2.3


From c834a45ba531967ec9fd9329aaf18332411d6f31 Mon Sep 17 00:00:00 2001
From: click 
Date: Sun, 4 Jul 2010 16:57:26 +0200
Subject: Initialize m_flags after m_isNeedManyNegativeEffects, as
 m_isNeedManyNegativeEffects is used in _CheckPositive() Thanks to ge0rg and
 his valgrind-running

--HG--
branch : trunk
---
 src/server/game/Spells/Auras/SpellAuras.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp
index b3d0f3a3b12..cb6ddfb2307 100644
--- a/src/server/game/Spells/Auras/SpellAuras.cpp
+++ b/src/server/game/Spells/Auras/SpellAuras.cpp
@@ -77,14 +77,15 @@ AuraApplication::AuraApplication(Unit * target, Unit * caster, Aura * aura, uint
         else
             sLog.outDebug("Aura: %u Effect: %d could not find empty unit visible slot", GetBase()->GetId(), GetEffectMask());
     }
-    m_flags |= (_CheckPositive(caster) ? AFLAG_POSITIVE : AFLAG_NEGATIVE) |
-        (GetBase()->GetCasterGUID() == GetTarget()->GetGUID() ? AFLAG_CASTER : AFLAG_NONE);
 
     m_isNeedManyNegativeEffects = false;
     if (GetBase()->GetCasterGUID() == GetTarget()->GetGUID()) // caster == target - 1 negative effect is enough for aura to be negative
         m_isNeedManyNegativeEffects = false;
     else if (caster)
         m_isNeedManyNegativeEffects = caster->IsFriendlyTo(m_target);
+
+    m_flags |= (_CheckPositive(caster) ? AFLAG_POSITIVE : AFLAG_NEGATIVE) |
+        (GetBase()->GetCasterGUID() == GetTarget()->GetGUID() ? AFLAG_CASTER : AFLAG_NONE);
 }
 
 void AuraApplication::_Remove()
-- 
cgit v1.2.3


From 18dfd3a2aa4af1eab1dfab8f264fc92495bf7b24 Mon Sep 17 00:00:00 2001
From: click 
Date: Sun, 4 Jul 2010 17:19:50 +0200
Subject: Fix another uninitialized value in Player::m_AreaID Thanks to ge0rg
 and his valgrinding (again)

--HG--
branch : trunk
---
 src/server/game/Entities/Player/Player.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src')

diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 37efe2a2aaa..bca7ba5ab97 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -575,6 +575,8 @@ Player::Player (WorldSession *session): Unit(), m_achievementMgr(this), m_reputa
     //Default movement to run mode
     //m_unit_movement_flags = 0;
 
+    m_AreaID = 0;
+
     m_mover = this;
     m_movedPlayer = this;
     m_seer = this;
-- 
cgit v1.2.3


From eba3f0a1dd4d85fd74be11c14798d52e507c85c1 Mon Sep 17 00:00:00 2001
From: Shauren 
Date: Sun, 4 Jul 2010 19:16:40 +0200
Subject: Implemented SPELL_EFFECT_CLEAR_QUEST (139), patch by Socolin Closes
 issue #2840.

--HG--
branch : trunk
---
 src/server/game/Spells/Auras/SpellEffects.cpp | 55 ++++++++++++++++++++++++++-
 src/server/game/Spells/Spell.h                |  1 +
 2 files changed, 54 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Spells/Auras/SpellEffects.cpp b/src/server/game/Spells/Auras/SpellEffects.cpp
index c64db1697a6..f819e3f1971 100644
--- a/src/server/game/Spells/Auras/SpellEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellEffects.cpp
@@ -204,7 +204,7 @@ pEffect SpellEffects[TOTAL_SPELL_EFFECTS]=
     &Spell::EffectHealPct,                                  //136 SPELL_EFFECT_HEAL_PCT
     &Spell::EffectEnergizePct,                              //137 SPELL_EFFECT_ENERGIZE_PCT
     &Spell::EffectJump2,                                    //138 SPELL_EFFECT_LEAP_BACK                Leap back
-    &Spell::EffectUnused,                                   //139 SPELL_EFFECT_CLEAR_QUEST              (misc - is quest ID)
+    &Spell::EffectQuestClear,                               //139 SPELL_EFFECT_CLEAR_QUEST              Reset quest status (miscValue - quest ID)
     &Spell::EffectForceCast,                                //140 SPELL_EFFECT_FORCE_CAST
     &Spell::EffectNULL,                                     //141 SPELL_EFFECT_141                      damage and reduce speed?
     &Spell::EffectTriggerSpellWithValue,                    //142 SPELL_EFFECT_TRIGGER_SPELL_WITH_VALUE
@@ -6993,7 +6993,14 @@ void Spell::EffectQuestComplete(uint32 i)
         return;
 
     uint32 quest_id = m_spellInfo->EffectMiscValue[i];
-    pPlayer->AreaExploredOrEventHappens(quest_id);
+    if (quest_id)
+    {
+        uint16 log_slot = pPlayer->FindQuestSlot(quest_id);
+        if (log_slot < MAX_QUEST_LOG_SIZE)
+            pPlayer->AreaExploredOrEventHappens(quest_id);
+        else
+            pPlayer->CompleteQuest(quest_id);   // quest not in log - for internal use
+    }
 }
 
 void Spell::EffectForceDeselect(uint32 /*i*/)
@@ -7155,6 +7162,50 @@ void Spell::EffectJump2(uint32 i)
     }
 }
 
+void Spell::EffectQuestClear(uint32 i)
+{
+    Player *pPlayer = NULL;
+    if (m_caster->GetTypeId() == TYPEID_PLAYER)
+        pPlayer = m_caster->ToPlayer();
+    else if (unitTarget && unitTarget->GetTypeId() == TYPEID_PLAYER)
+        pPlayer = unitTarget->ToPlayer();
+    
+    if (!pPlayer)
+        return;
+
+    uint32 quest_id = m_spellInfo->EffectMiscValue[i];
+
+    Quest const* pQuest = objmgr.GetQuestTemplate(quest_id);
+
+    if (!pQuest)
+        return;
+
+    QuestStatusMap::iterator qs_itr = pPlayer->getQuestStatusMap().find(quest_id);
+    // Player has never done this quest
+    if (qs_itr == pPlayer->getQuestStatusMap().end())
+        return;
+
+    // remove all quest entries for 'entry' from quest log
+    for (uint8 slot = 0; slot < MAX_QUEST_LOG_SIZE; ++slot)
+    {
+        uint32 quest = pPlayer->GetQuestSlotQuestId(slot);
+        if (quest == quest_id)
+        {
+            pPlayer->SetQuestSlot(slot, 0);
+
+            // we ignore unequippable quest items in this case, its' still be equipped
+            pPlayer->TakeQuestSourceItem(quest, false);
+        }
+    }
+
+    // set quest status to not started (will be updated in DB at next save)
+    pPlayer->SetQuestStatus(quest_id, QUEST_STATUS_NONE);
+
+    // reset rewarded for restart repeatable quest
+    QuestStatusData &data = qs_itr->second;
+    data.m_rewarded = false;
+}
+
 void Spell::EffectSendTaxi(uint32 i)
 {
     if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
diff --git a/src/server/game/Spells/Spell.h b/src/server/game/Spells/Spell.h
index 7b6597720e1..61014343878 100644
--- a/src/server/game/Spells/Spell.h
+++ b/src/server/game/Spells/Spell.h
@@ -305,6 +305,7 @@ class Spell
         void EffectHealMechanical(uint32 i);
         void EffectJump(uint32 i);
         void EffectJump2(uint32 i);
+        void EffectQuestClear(uint32 i);
         void EffectTeleUnitsFaceCaster(uint32 i);
         void EffectLearnSkill(uint32 i);
         void EffectAddHonor(uint32 i);
-- 
cgit v1.2.3


From a11391b3c09a2fce83a3d4c92e2267085fba10b2 Mon Sep 17 00:00:00 2001
From: click 
Date: Sun, 4 Jul 2010 19:28:40 +0200
Subject: Fix warrior selfheal & heal-reduction (and handling of OBS_MOD_HEALTH
 in the same time) (Thanks to dr.tenma)

--HG--
branch : trunk
---
 src/server/game/Spells/Auras/SpellAuraEffects.cpp | 30 +++++++++++++++++++++++
 1 file changed, 30 insertions(+)

(limited to 'src')

diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
index 54bb87470bc..da495eaa4f1 100644
--- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
@@ -1485,7 +1485,37 @@ void AuraEffect::PeriodicTick(Unit * target, Unit * caster) const
             int32 damage = m_amount > 0 ? m_amount : 0;
 
             if (GetAuraType() == SPELL_AURA_OBS_MOD_HEALTH)
+            {
+                // Taken mods
+                float TakenTotalMod = 1.0f;
+
+                // Tenacity increase healing % taken
+                if (AuraEffect const* Tenacity = target->GetAuraEffect(58549, 0))
+                    TakenTotalMod *= (Tenacity->GetAmount() + 100.0f) / 100.0f;
+
+                // Healing taken percent
+                float minval = target->GetMaxNegativeAuraModifier(SPELL_AURA_MOD_HEALING_PCT);
+                if (minval)
+                    TakenTotalMod *= (100.0f + minval) / 100.0f;
+
+                float maxval = target->GetMaxPositiveAuraModifier(SPELL_AURA_MOD_HEALING_PCT);
+                if (maxval)
+                    TakenTotalMod *= (100.0f + maxval) / 100.0f;
+                
+                // Healing over time taken percent
+                float minval_hot = target->GetMaxNegativeAuraModifier(SPELL_AURA_MOD_HOT_PCT);
+                if (minval_hot)
+                    TakenTotalMod *= (100.0f + minval_hot) / 100.0f;
+
+                float maxval_hot = target->GetMaxPositiveAuraModifier(SPELL_AURA_MOD_HOT_PCT);
+                if (maxval_hot)
+                    TakenTotalMod *= (100.0f + maxval_hot) / 100.0f;
+
+                TakenTotalMod = TakenTotalMod > 0.0f ? TakenTotalMod : 0.0f;
+
                 damage = uint32(target->GetMaxHealth() * damage / 100);
+                damage = uint32(damage * TakenTotalMod);
+            }
             else
             {
                 // Wild Growth = amount + (6 - 2*doneTicks) * ticks* amount / 100
-- 
cgit v1.2.3


From 1416c833940a68484e17837ed064feafbc959cff Mon Sep 17 00:00:00 2001
From: click 
Date: Sun, 4 Jul 2010 20:17:22 +0200
Subject: Fix: make sure healing potions doesn't benefit from
 spellhealing-power - patch by maxdestroyer

--HG--
branch : trunk
---
 src/server/game/Entities/Unit/Unit.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src')

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 5d1bcabb318..a9e8cd0ee7f 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -10692,6 +10692,10 @@ uint32 Unit::SpellHealingBonus(Unit *pVictim, SpellEntry const *spellProto, uint
         if (Unit* owner = GetOwner())
             return owner->SpellHealingBonus(pVictim, spellProto, healamount, damagetype, stack);
 
+    // no bonus for heal potions/bandages
+    if (spellProto->SpellFamilyName == SPELLFAMILY_POTION /*|| spellProto->Mechanic == MECHANIC_BANDAGE*/ )
+        return healamount;
+
     // Healing Done
     // Taken/Done total percent damage auras
     float  DoneTotalMod = 1.0f;
-- 
cgit v1.2.3


From 86df5ec9ad6e2269f8eb0a190352d536bb275511 Mon Sep 17 00:00:00 2001
From: click 
Date: Sun, 4 Jul 2010 20:57:44 +0200
Subject: resolve circular dependency on uninitialized memory (and add
 copyrightheaders) in AHBot (dependency-fix by ge0rg)

--HG--
branch : trunk
---
 .../AuctionHouseBot/AuctionHouseBot.cpp            | 23 ++++++++++++++++++++--
 .../AuctionHouse/AuctionHouseBot/AuctionHouseBot.h | 22 ++++++++++++++++++++-
 2 files changed, 42 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.cpp b/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.cpp
index ce621e689cd..0a4b6c3f32e 100644
--- a/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.cpp
+++ b/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.cpp
@@ -1,10 +1,27 @@
+/*
+ * Copyright (C) 2008-2010 Trinity 
+ * Copyright (C) 2005-2009 MaNGOS 
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
 #include "ObjectMgr.h"
 #include "AuctionHouseMgr.h"
 #include "AuctionHouseBot.h"
 #include 
 
-
-
 using namespace std;
 vector npcItems;
 vector lootItems;
@@ -22,6 +39,7 @@ vector blueItemsBin;
 vector purpleItemsBin;
 vector orangeItemsBin;
 vector yellowItemsBin;
+
 AuctionHouseBot::AuctionHouseBot()
 {
     debug_Out = false;
@@ -1509,6 +1527,7 @@ void AuctionHouseBot::Commands(uint32 command, uint32 ahMapID, uint32 col, char*
             uint32 maxItems = (uint32) strtoul(param1, NULL, 0);
             CharacterDatabase.PExecute("UPDATE auctionhousebot SET maxitems = '%u' WHERE auctionhouse = '%u'", maxItems, ahMapID);
             config->SetMaxItems(maxItems);
+            config->CalculatePercents();
         }
         break;
     case 3:     //min time Deprecated (Place holder for future commands)
diff --git a/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.h b/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.h
index 853955a43a0..d1cec5f170e 100644
--- a/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.h
+++ b/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.h
@@ -1,3 +1,22 @@
+/*
+ * Copyright (C) 2008-2010 Trinity 
+ * Copyright (C) 2005-2009 MaNGOS 
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
 #ifndef AUCTION_HOUSE_BOT_H
 #define AUCTION_HOUSE_BOT_H
 
@@ -173,7 +192,8 @@ public:
     void SetMaxItems(uint32 value)
     {
         maxItems = value;
-        CalculatePercents();
+	// CalculatePercents() needs to be called, but only if
+	// SetPercentages() has been called at least once already.
     }
     uint32 GetMaxItems()
     {
-- 
cgit v1.2.3


From 53f4b517ce87a7b4063428ca3a22ba9adbefc6cb Mon Sep 17 00:00:00 2001
From: click 
Date: Sun, 4 Jul 2010 21:31:20 +0200
Subject: Remove doublecalculation of crit res (fix by dr.tenma) Fixes issue
 2031

--HG--
branch : trunk
---
 src/server/game/Spells/Auras/SpellAuraEffects.cpp | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
index da495eaa4f1..fcc9558773c 100644
--- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
@@ -1311,10 +1311,7 @@ void AuraEffect::PeriodicTick(Unit * target, Unit * caster) const
 
             bool crit = IsPeriodicTickCrit(target, caster);
             if (crit)
-            {
                 damage = caster->SpellCriticalDamageBonus(m_spellProto, damage, target);
-                damage -= target->GetSpellCritDamageReduction(damage);
-            }
 
             // Reduce damage from resilience for players and pets only.
             // As of patch 3.3 pets inherit 100% of master resilience.
@@ -1323,7 +1320,7 @@ void AuraEffect::PeriodicTick(Unit * target, Unit * caster) const
                 {
                     if (crit)
                         damage -= modOwner->GetSpellCritDamageReduction(damage);
-                    damage -= modOwner->GetSpellDamageReduction(damage);
+                        damage -= modOwner->GetSpellDamageReduction(damage);
                 }
 
             caster->CalcAbsorbResist(target, GetSpellSchoolMask(GetSpellProto()), DOT, damage, &absorb, &resist, m_spellProto);
@@ -1382,10 +1379,7 @@ void AuraEffect::PeriodicTick(Unit * target, Unit * caster) const
 
             bool crit = IsPeriodicTickCrit(target, caster);
             if (crit)
-            {
                 damage = caster->SpellCriticalDamageBonus(m_spellProto, damage, target);
-                damage -= target->GetSpellCritDamageReduction(damage);
-            }
 
             //Calculate armor mitigation if it is a physical spell
             if (GetSpellSchoolMask(GetSpellProto()) & SPELL_SCHOOL_MASK_NORMAL)
-- 
cgit v1.2.3


From 6f393be15abc7c8315b96656e6a97e0a7565b6d3 Mon Sep 17 00:00:00 2001
From: click 
Date: Tue, 6 Jul 2010 03:27:41 +0200
Subject: Update GPL-licensing information on scripts (now with the proper
 bling-bling headers!) If any more scriptfiles are missing their respective
 header, let us know please...

--HG--
branch : trunk
---
 src/server/scripts/Custom/custom_example.cpp       | 26 +++++++-------
 .../scripts/Custom/custom_gossip_codebox.cpp       | 26 +++++++-------
 src/server/scripts/Custom/npc_acherus_taxi.cpp     | 17 +++++++++
 .../scripts/Custom/npc_wyrmresttempel_taxi.cpp     | 17 +++++++++
 src/server/scripts/Custom/on_events.cpp            | 17 +++++++++
 src/server/scripts/Custom/test.cpp                 | 26 +++++++-------
 .../AlteracValley/alterac_valley.cpp               | 31 ++++++++--------
 .../EasternKingdoms/AlteracValley/boss_balinda.cpp | 25 ++++++-------
 .../AlteracValley/boss_drekthar.cpp                | 31 ++++++++--------
 .../AlteracValley/boss_galvangar.cpp               | 31 ++++++++--------
 .../EasternKingdoms/AlteracValley/boss_vanndar.cpp | 31 ++++++++--------
 .../BlackrockDepths/blackrock_depths.cpp           | 27 +++++++-------
 .../BlackrockDepths/blackrock_depths.h             | 21 ++++++++---
 .../BlackrockDepths/boss_ambassador_flamelash.cpp  | 27 +++++++-------
 .../BlackrockDepths/boss_anubshiah.cpp             | 27 +++++++-------
 .../boss_emperor_dagran_thaurissan.cpp             | 27 +++++++-------
 .../BlackrockDepths/boss_general_angerforge.cpp    | 27 +++++++-------
 .../BlackrockDepths/boss_gorosh_the_dervish.cpp    | 27 +++++++-------
 .../BlackrockDepths/boss_grizzle.cpp               | 27 +++++++-------
 .../boss_high_interrogator_gerstahn.cpp            | 27 +++++++-------
 .../BlackrockDepths/boss_magmus.cpp                | 27 +++++++-------
 .../BlackrockDepths/boss_moira_bronzebeard.cpp     | 27 +++++++-------
 .../BlackrockDepths/boss_tomb_of_seven.cpp         | 27 +++++++-------
 .../BlackrockDepths/instance_blackrock_depths.cpp  | 33 ++++++++---------
 .../BlackrockSpire/blackrock_spire.cpp             | 25 ++++++-------
 .../BlackrockSpire/blackrock_spire.h               | 25 ++++++-------
 .../BlackrockSpire/boss_drakkisath.cpp             | 27 +++++++-------
 .../EasternKingdoms/BlackrockSpire/boss_gyth.cpp   | 27 +++++++-------
 .../BlackrockSpire/boss_halycon.cpp                | 27 +++++++-------
 .../BlackrockSpire/boss_highlord_omokk.cpp         | 27 +++++++-------
 .../BlackrockSpire/boss_mother_smolderweb.cpp      | 27 +++++++-------
 .../BlackrockSpire/boss_overlord_wyrmthalak.cpp    | 27 +++++++-------
 .../BlackrockSpire/boss_pyroguard_emberseer.cpp    | 27 +++++++-------
 .../BlackrockSpire/boss_quartermaster_zigris.cpp   | 27 +++++++-------
 .../BlackrockSpire/boss_rend_blackhand.cpp         | 27 +++++++-------
 .../boss_shadow_hunter_voshgajin.cpp               | 27 +++++++-------
 .../BlackrockSpire/boss_the_beast.cpp              | 27 +++++++-------
 .../BlackrockSpire/boss_warmaster_voone.cpp        | 27 +++++++-------
 .../BlackrockSpire/instance_blackrock_spire.cpp    | 25 ++++++-------
 .../BlackwingLair/boss_broodlord_lashlayer.cpp     | 27 +++++++-------
 .../BlackwingLair/boss_chromaggus.cpp              | 27 +++++++-------
 .../EasternKingdoms/BlackwingLair/boss_ebonroc.cpp | 27 +++++++-------
 .../EasternKingdoms/BlackwingLair/boss_firemaw.cpp | 27 +++++++-------
 .../BlackwingLair/boss_flamegor.cpp                | 27 +++++++-------
 .../BlackwingLair/boss_nefarian.cpp                | 27 +++++++-------
 .../BlackwingLair/boss_razorgore.cpp               | 27 +++++++-------
 .../BlackwingLair/boss_vaelastrasz.cpp             | 27 +++++++-------
 .../BlackwingLair/boss_victor_nefarius.cpp         | 27 +++++++-------
 .../BlackwingLair/instance_blackwing_lair.cpp      | 33 ++++++++---------
 .../EasternKingdoms/Deadmines/boss_mr_smite.cpp    | 31 ++++++++--------
 .../EasternKingdoms/Deadmines/deadmines.cpp        | 27 +++++++-------
 .../scripts/EasternKingdoms/Deadmines/deadmines.h  | 17 +++++++++
 .../Deadmines/instance_deadmines.cpp               | 26 +++++++-------
 .../EasternKingdoms/Gnomeregan/gnomeregan.cpp      | 23 ++++++------
 .../EasternKingdoms/Gnomeregan/gnomeregan.h        | 23 ++++++------
 .../Gnomeregan/instance_gnomeregan.cpp             | 23 ++++++------
 .../EasternKingdoms/Karazhan/boss_curator.cpp      | 27 +++++++-------
 .../Karazhan/boss_maiden_of_virtue.cpp             | 27 +++++++-------
 .../EasternKingdoms/Karazhan/boss_midnight.cpp     | 27 +++++++-------
 .../EasternKingdoms/Karazhan/boss_moroes.cpp       | 26 +++++++-------
 .../EasternKingdoms/Karazhan/boss_netherspite.cpp  | 27 +++++++-------
 .../EasternKingdoms/Karazhan/boss_nightbane.cpp    | 27 +++++++-------
 .../Karazhan/boss_prince_malchezaar.cpp            | 27 +++++++-------
 .../Karazhan/boss_shade_of_aran.cpp                | 27 +++++++-------
 .../Karazhan/boss_terestian_illhoof.cpp            | 27 +++++++-------
 .../EasternKingdoms/Karazhan/bosses_opera.cpp      | 27 +++++++-------
 .../EasternKingdoms/Karazhan/instance_karazhan.cpp | 27 +++++++-------
 .../scripts/EasternKingdoms/Karazhan/karazhan.cpp  | 27 +++++++-------
 .../scripts/EasternKingdoms/Karazhan/karazhan.h    | 21 ++++++++---
 .../MagistersTerrace/boss_felblood_kaelthas.cpp    | 27 +++++++-------
 .../MagistersTerrace/boss_priestess_delrissa.cpp   | 27 +++++++-------
 .../MagistersTerrace/boss_selin_fireheart.cpp      | 27 +++++++-------
 .../MagistersTerrace/boss_vexallus.cpp             | 27 +++++++-------
 .../instance_magisters_terrace.cpp                 | 27 +++++++-------
 .../MagistersTerrace/magisters_terrace.cpp         | 27 +++++++-------
 .../MagistersTerrace/magisters_terrace.h           | 21 ++++++++---
 .../MoltenCore/boss_baron_geddon.cpp               | 27 +++++++-------
 .../EasternKingdoms/MoltenCore/boss_garr.cpp       | 27 +++++++-------
 .../EasternKingdoms/MoltenCore/boss_gehennas.cpp   | 27 +++++++-------
 .../EasternKingdoms/MoltenCore/boss_golemagg.cpp   | 27 +++++++-------
 .../EasternKingdoms/MoltenCore/boss_lucifron.cpp   | 27 +++++++-------
 .../EasternKingdoms/MoltenCore/boss_magmadar.cpp   | 27 +++++++-------
 .../MoltenCore/boss_majordomo_executus.cpp         | 27 +++++++-------
 .../EasternKingdoms/MoltenCore/boss_ragnaros.cpp   | 27 +++++++-------
 .../EasternKingdoms/MoltenCore/boss_shazzrah.cpp   | 27 +++++++-------
 .../MoltenCore/boss_sulfuron_harbinger.cpp         | 27 +++++++-------
 .../MoltenCore/instance_molten_core.cpp            | 27 +++++++-------
 .../EasternKingdoms/MoltenCore/molten_core.cpp     | 27 +++++++-------
 .../EasternKingdoms/MoltenCore/molten_core.h       | 21 ++++++++---
 .../EasternKingdoms/ScarletEnclave/chapter1.cpp    | 23 ++++++------
 .../EasternKingdoms/ScarletEnclave/chapter2.cpp    | 23 ++++++------
 .../EasternKingdoms/ScarletEnclave/chapter5.cpp    | 23 ++++++------
 .../ScarletEnclave/the_scarlet_enclave.cpp         | 23 ++++++------
 .../ScarletMonastery/boss_arcanist_doan.cpp        | 27 +++++++-------
 .../ScarletMonastery/boss_azshir_the_sleepless.cpp | 27 +++++++-------
 .../ScarletMonastery/boss_bloodmage_thalnos.cpp    | 27 +++++++-------
 .../ScarletMonastery/boss_headless_horseman.cpp    | 27 +++++++-------
 .../ScarletMonastery/boss_herod.cpp                | 27 +++++++-------
 .../boss_high_inquisitor_fairbanks.cpp             | 27 +++++++-------
 .../ScarletMonastery/boss_houndmaster_loksey.cpp   | 27 +++++++-------
 .../ScarletMonastery/boss_interrogator_vishas.cpp  | 27 +++++++-------
 .../boss_mograine_and_whitemane.cpp                | 27 +++++++-------
 .../ScarletMonastery/boss_scorn.cpp                | 27 +++++++-------
 .../instance_scarlet_monastery.cpp                 | 33 ++++++++---------
 .../ScarletMonastery/scarlet_monastery.h           | 21 ++++++++---
 .../Scholomance/boss_darkmaster_gandling.cpp       | 27 +++++++-------
 .../Scholomance/boss_death_knight_darkreaver.cpp   | 27 +++++++-------
 .../Scholomance/boss_doctor_theolen_krastinov.cpp  | 27 +++++++-------
 .../Scholomance/boss_illucia_barov.cpp             | 27 +++++++-------
 .../Scholomance/boss_instructor_malicia.cpp        | 27 +++++++-------
 .../Scholomance/boss_jandice_barov.cpp             | 33 ++++++++---------
 .../EasternKingdoms/Scholomance/boss_kormok.cpp    | 27 +++++++-------
 .../Scholomance/boss_lord_alexei_barov.cpp         | 27 +++++++-------
 .../Scholomance/boss_lorekeeper_polkelt.cpp        | 27 +++++++-------
 .../Scholomance/boss_ras_frostwhisper.cpp          | 27 +++++++-------
 .../Scholomance/boss_the_ravenian.cpp              | 27 +++++++-------
 .../EasternKingdoms/Scholomance/boss_vectus.cpp    | 27 +++++++-------
 .../Scholomance/instance_scholomance.cpp           | 27 +++++++-------
 .../EasternKingdoms/Scholomance/scholomance.h      | 21 ++++++++---
 .../ShadowfangKeep/instance_shadowfang_keep.cpp    | 27 +++++++-------
 .../ShadowfangKeep/shadowfang_keep.cpp             | 27 +++++++-------
 .../ShadowfangKeep/shadowfang_keep.h               | 21 ++++++++---
 .../Stratholme/boss_baron_rivendare.cpp            | 33 ++++++++---------
 .../Stratholme/boss_baroness_anastari.cpp          | 33 ++++++++---------
 .../Stratholme/boss_cannon_master_willey.cpp       | 33 ++++++++---------
 .../Stratholme/boss_dathrohan_balnazzar.cpp        | 33 ++++++++---------
 .../Stratholme/boss_magistrate_barthilas.cpp       | 33 ++++++++---------
 .../Stratholme/boss_maleki_the_pallid.cpp          | 33 ++++++++---------
 .../EasternKingdoms/Stratholme/boss_nerubenkan.cpp | 33 ++++++++---------
 .../Stratholme/boss_order_of_silver_hand.cpp       | 33 ++++++++---------
 .../Stratholme/boss_postmaster_malown.cpp          | 33 ++++++++---------
 .../Stratholme/boss_ramstein_the_gorger.cpp        | 33 ++++++++---------
 .../Stratholme/boss_timmy_the_cruel.cpp            | 33 ++++++++---------
 .../Stratholme/instance_stratholme.cpp             | 33 ++++++++---------
 .../EasternKingdoms/Stratholme/stratholme.cpp      | 27 +++++++-------
 .../EasternKingdoms/Stratholme/stratholme.h        | 21 ++++++++---
 .../SunkenTemple/instance_sunken_temple.cpp        | 26 +++++++-------
 .../EasternKingdoms/SunkenTemple/sunken_temple.cpp | 26 +++++++-------
 .../EasternKingdoms/SunkenTemple/sunken_temple.h   | 20 +++++++++--
 .../SunwellPlateau/boss_brutallus.cpp              | 27 +++++++-------
 .../SunwellPlateau/boss_eredar_twins.cpp           | 31 ++++++++--------
 .../SunwellPlateau/boss_felmyst.cpp                | 31 ++++++++--------
 .../SunwellPlateau/boss_kalecgos.cpp               | 27 +++++++-------
 .../SunwellPlateau/boss_kiljaeden.cpp              | 25 ++++++-------
 .../EasternKingdoms/SunwellPlateau/boss_muru.cpp   | 31 ++++++++--------
 .../SunwellPlateau/instance_sunwell_plateau.cpp    | 21 ++++++++---
 .../SunwellPlateau/sunwell_plateau.cpp             | 25 ++++++-------
 .../SunwellPlateau/sunwell_plateau.h               | 21 ++++++++---
 .../EasternKingdoms/Uldaman/boss_archaedas.cpp     | 32 +++++++++--------
 .../EasternKingdoms/Uldaman/boss_ironaya.cpp       | 27 +++++++-------
 .../EasternKingdoms/Uldaman/instance_uldaman.cpp   | 32 +++++++++--------
 .../scripts/EasternKingdoms/Uldaman/uldaman.cpp    | 27 +++++++-------
 .../EasternKingdoms/ZulAman/boss_akilzon.cpp       | 32 +++++++++--------
 .../EasternKingdoms/ZulAman/boss_halazzi.cpp       | 33 ++++++++---------
 .../EasternKingdoms/ZulAman/boss_hexlord.cpp       | 32 +++++++++--------
 .../EasternKingdoms/ZulAman/boss_janalai.cpp       | 33 ++++++++---------
 .../EasternKingdoms/ZulAman/boss_nalorakk.cpp      | 33 ++++++++---------
 .../EasternKingdoms/ZulAman/boss_zuljin.cpp        | 32 +++++++++--------
 .../EasternKingdoms/ZulAman/instance_zulaman.cpp   | 33 ++++++++---------
 .../scripts/EasternKingdoms/ZulAman/zulaman.cpp    | 33 ++++++++---------
 .../scripts/EasternKingdoms/ZulAman/zulaman.h      | 21 ++++++++---
 .../EasternKingdoms/ZulGurub/boss_arlokk.cpp       | 27 +++++++-------
 .../EasternKingdoms/ZulGurub/boss_gahzranka.cpp    | 27 +++++++-------
 .../EasternKingdoms/ZulGurub/boss_grilek.cpp       | 27 +++++++-------
 .../EasternKingdoms/ZulGurub/boss_hakkar.cpp       | 27 +++++++-------
 .../EasternKingdoms/ZulGurub/boss_hazzarah.cpp     | 27 +++++++-------
 .../EasternKingdoms/ZulGurub/boss_jeklik.cpp       | 27 +++++++-------
 .../EasternKingdoms/ZulGurub/boss_jindo.cpp        | 27 +++++++-------
 .../EasternKingdoms/ZulGurub/boss_mandokir.cpp     | 27 +++++++-------
 .../EasternKingdoms/ZulGurub/boss_marli.cpp        | 27 +++++++-------
 .../EasternKingdoms/ZulGurub/boss_renataki.cpp     | 27 +++++++-------
 .../EasternKingdoms/ZulGurub/boss_thekal.cpp       | 27 +++++++-------
 .../EasternKingdoms/ZulGurub/boss_venoxis.cpp      | 27 +++++++-------
 .../EasternKingdoms/ZulGurub/boss_wushoolay.cpp    | 27 +++++++-------
 .../EasternKingdoms/ZulGurub/instance_zulgurub.cpp | 27 +++++++-------
 .../scripts/EasternKingdoms/ZulGurub/zulgurub.h    | 21 ++++++++---
 .../scripts/EasternKingdoms/alterac_mountains.cpp  | 27 +++++++-------
 .../scripts/EasternKingdoms/arathi_highlands.cpp   | 27 +++++++-------
 .../scripts/EasternKingdoms/blasted_lands.cpp      | 27 +++++++-------
 src/server/scripts/EasternKingdoms/boss_kruul.cpp  | 27 +++++++-------
 .../scripts/EasternKingdoms/burning_steppes.cpp    | 27 +++++++-------
 src/server/scripts/EasternKingdoms/dun_morogh.cpp  | 27 +++++++-------
 src/server/scripts/EasternKingdoms/duskwood.cpp    | 26 +++++++-------
 .../EasternKingdoms/eastern_plaguelands.cpp        | 27 +++++++-------
 .../scripts/EasternKingdoms/elwynn_forest.cpp      | 27 +++++++-------
 .../scripts/EasternKingdoms/eversong_woods.cpp     | 27 +++++++-------
 src/server/scripts/EasternKingdoms/ghostlands.cpp  | 27 +++++++-------
 src/server/scripts/EasternKingdoms/hinterlands.cpp | 27 +++++++-------
 src/server/scripts/EasternKingdoms/ironforge.cpp   | 27 +++++++-------
 .../scripts/EasternKingdoms/isle_of_queldanas.cpp  | 27 +++++++-------
 src/server/scripts/EasternKingdoms/loch_modan.cpp  | 27 +++++++-------
 .../scripts/EasternKingdoms/redridge_mountains.cpp | 24 ++++++-------
 .../scripts/EasternKingdoms/searing_gorge.cpp      | 27 +++++++-------
 .../scripts/EasternKingdoms/silvermoon_city.cpp    | 27 +++++++-------
 .../scripts/EasternKingdoms/silverpine_forest.cpp  | 27 +++++++-------
 .../scripts/EasternKingdoms/stormwind_city.cpp     | 27 +++++++-------
 .../scripts/EasternKingdoms/stranglethorn_vale.cpp | 27 +++++++-------
 .../scripts/EasternKingdoms/tirisfal_glades.cpp    | 27 +++++++-------
 src/server/scripts/EasternKingdoms/undercity.cpp   | 27 +++++++-------
 .../EasternKingdoms/western_plaguelands.cpp        | 27 +++++++-------
 src/server/scripts/EasternKingdoms/westfall.cpp    | 27 +++++++-------
 src/server/scripts/EasternKingdoms/wetlands.cpp    | 27 +++++++-------
 src/server/scripts/Examples/example_creature.cpp   | 27 +++++++-------
 src/server/scripts/Examples/example_escort.cpp     | 27 +++++++-------
 .../scripts/Examples/example_gossip_codebox.cpp    | 27 +++++++-------
 src/server/scripts/Examples/example_misc.cpp       | 27 +++++++-------
 .../BlackfathomDeeps/blackfathom_deeps.cpp         | 31 ++++++++--------
 .../Kalimdor/BlackfathomDeeps/blackfathom_deeps.h  | 21 ++++++++---
 .../Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp     | 31 ++++++++--------
 .../Kalimdor/BlackfathomDeeps/boss_gelihast.cpp    | 31 ++++++++--------
 .../Kalimdor/BlackfathomDeeps/boss_kelris.cpp      | 31 ++++++++--------
 .../instance_blackfathom_deeps.cpp                 | 27 +++++++-------
 .../BattleForMountHyjal/boss_anetheron.cpp         | 16 +++++++++
 .../BattleForMountHyjal/boss_archimonde.cpp        | 27 +++++++-------
 .../BattleForMountHyjal/boss_azgalor.cpp           | 16 +++++++++
 .../BattleForMountHyjal/boss_kazrogal.cpp          | 16 +++++++++
 .../BattleForMountHyjal/boss_rage_winterchill.cpp  | 16 +++++++++
 .../CavernsOfTime/BattleForMountHyjal/hyjal.cpp    | 27 +++++++-------
 .../CavernsOfTime/BattleForMountHyjal/hyjal.h      | 21 ++++++++---
 .../CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp  | 27 +++++++-------
 .../CavernsOfTime/BattleForMountHyjal/hyjalAI.h    | 21 ++++++++---
 .../BattleForMountHyjal/hyjal_trash.cpp            | 16 +++++++++
 .../BattleForMountHyjal/hyjal_trash.h              | 16 +++++++++
 .../BattleForMountHyjal/instance_hyjal.cpp         | 27 +++++++-------
 .../CullingOfStratholme/boss_epoch.cpp             | 31 ++++++++--------
 .../CullingOfStratholme/boss_infinite.cpp          | 31 ++++++++--------
 .../CullingOfStratholme/boss_mal_ganis.cpp         | 31 ++++++++--------
 .../CullingOfStratholme/boss_meathook.cpp          | 31 ++++++++--------
 .../CullingOfStratholme/boss_salramm.cpp           | 31 ++++++++--------
 .../CullingOfStratholme/culling_of_stratholme.cpp  | 31 ++++++++--------
 .../CullingOfStratholme/culling_of_stratholme.h    | 31 ++++++++--------
 .../instance_culling_of_stratholme.cpp             | 31 ++++++++--------
 .../CavernsOfTime/DarkPortal/boss_aeonus.cpp       | 27 +++++++-------
 .../DarkPortal/boss_chrono_lord_deja.cpp           | 27 +++++++-------
 .../CavernsOfTime/DarkPortal/boss_temporus.cpp     | 27 +++++++-------
 .../CavernsOfTime/DarkPortal/dark_portal.cpp       | 33 ++++++++---------
 .../CavernsOfTime/DarkPortal/dark_portal.h         | 21 ++++++++---
 .../DarkPortal/instance_dark_portal.cpp            | 33 ++++++++---------
 .../boss_captain_skarloc.cpp                       | 27 +++++++-------
 .../EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp  | 27 +++++++-------
 .../boss_leutenant_drake.cpp                       | 27 +++++++-------
 .../instance_old_hillsbrad.cpp                     | 27 +++++++-------
 .../EscapeFromDurnholdeKeep/old_hillsbrad.cpp      | 27 +++++++-------
 .../EscapeFromDurnholdeKeep/old_hillsbrad.h        | 21 ++++++++---
 .../Kalimdor/Maraudon/boss_celebras_the_cursed.cpp | 27 +++++++-------
 .../scripts/Kalimdor/Maraudon/boss_landslide.cpp   | 27 +++++++-------
 .../scripts/Kalimdor/Maraudon/boss_noxxion.cpp     | 27 +++++++-------
 .../Kalimdor/Maraudon/boss_princess_theradras.cpp  | 27 +++++++-------
 .../scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp   | 25 ++++++-------
 .../Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp | 25 ++++++-------
 .../scripts/Kalimdor/OnyxiasLair/onyxias_lair.h    | 25 ++++++-------
 .../boss_amnennar_the_coldbringer.cpp              | 27 +++++++-------
 .../RazorfenDowns/instance_razorfen_downs.cpp      | 23 ++++++------
 .../Kalimdor/RazorfenDowns/razorfen_downs.cpp      | 27 +++++++-------
 .../Kalimdor/RazorfenDowns/razorfen_downs.h        | 23 ++++++------
 .../RazorfenKraul/instance_razorfen_kraul.cpp      | 27 +++++++-------
 .../Kalimdor/RazorfenKraul/razorfen_kraul.cpp      | 27 +++++++-------
 .../Kalimdor/RazorfenKraul/razorfen_kraul.h        | 27 +++++++-------
 .../Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp      | 27 +++++++-------
 .../scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp | 27 +++++++-------
 .../Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp    | 27 +++++++-------
 .../scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp | 27 +++++++-------
 .../Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp     | 27 +++++++-------
 .../Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp       | 27 +++++++-------
 .../RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp | 27 +++++++-------
 .../Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.h   | 18 ++++++++++
 .../Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp    | 27 +++++++-------
 .../Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp       | 27 +++++++-------
 .../Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp    | 27 +++++++-------
 .../Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp     | 27 +++++++-------
 .../Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp        | 27 +++++++-------
 .../Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp     | 27 +++++++-------
 .../Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp      | 27 +++++++-------
 .../TempleOfAhnQiraj/boss_twinemperors.cpp         | 27 +++++++-------
 .../Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp    | 27 +++++++-------
 .../instance_temple_of_ahnqiraj.cpp                | 27 +++++++-------
 .../TempleOfAhnQiraj/mob_anubisath_sentinel.cpp    | 27 +++++++-------
 .../Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h | 21 ++++++++---
 .../WailingCaverns/instance_wailing_caverns.cpp    | 27 +++++++-------
 .../Kalimdor/WailingCaverns/wailing_caverns.cpp    | 33 ++++++++---------
 .../Kalimdor/WailingCaverns/wailing_caverns.h      | 21 ++++++++---
 .../Kalimdor/ZulFarrak/instance_zulfarrak.cpp      | 23 ++++++------
 .../scripts/Kalimdor/ZulFarrak/zulfarrak.cpp       | 27 +++++++-------
 src/server/scripts/Kalimdor/ashenvale.cpp          | 33 ++++++++---------
 src/server/scripts/Kalimdor/azshara.cpp            | 27 +++++++-------
 src/server/scripts/Kalimdor/azuremyst_isle.cpp     | 27 +++++++-------
 src/server/scripts/Kalimdor/bloodmyst_isle.cpp     | 27 +++++++-------
 src/server/scripts/Kalimdor/boss_azuregos.cpp      | 27 +++++++-------
 src/server/scripts/Kalimdor/darkshore.cpp          | 27 +++++++-------
 src/server/scripts/Kalimdor/desolace.cpp           | 27 +++++++-------
 src/server/scripts/Kalimdor/durotar.cpp            | 31 ++++++++--------
 src/server/scripts/Kalimdor/dustwallow_marsh.cpp   | 27 +++++++-------
 src/server/scripts/Kalimdor/felwood.cpp            | 27 +++++++-------
 src/server/scripts/Kalimdor/feralas.cpp            | 27 +++++++-------
 src/server/scripts/Kalimdor/moonglade.cpp          | 27 +++++++-------
 src/server/scripts/Kalimdor/mulgore.cpp            | 27 +++++++-------
 src/server/scripts/Kalimdor/orgrimmar.cpp          | 27 +++++++-------
 src/server/scripts/Kalimdor/silithus.cpp           | 27 +++++++-------
 .../scripts/Kalimdor/stonetalon_mountains.cpp      | 27 +++++++-------
 src/server/scripts/Kalimdor/tanaris.cpp            | 27 +++++++-------
 src/server/scripts/Kalimdor/teldrassil.cpp         | 27 +++++++-------
 src/server/scripts/Kalimdor/the_barrens.cpp        | 27 +++++++-------
 src/server/scripts/Kalimdor/thousand_needles.cpp   | 27 +++++++-------
 src/server/scripts/Kalimdor/thunder_bluff.cpp      | 27 +++++++-------
 src/server/scripts/Kalimdor/ungoro_crater.cpp      | 33 ++++++++---------
 src/server/scripts/Kalimdor/winterspring.cpp       | 27 +++++++-------
 .../Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h  | 23 ++++++------
 .../AzjolNerub/AzjolNerub/boss_anubarak.cpp        | 31 ++++++++--------
 .../AzjolNerub/AzjolNerub/boss_hadronox.cpp        | 23 ++++++------
 .../AzjolNerub/boss_krikthir_the_gatewatcher.cpp   | 23 ++++++------
 .../AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp | 23 ++++++------
 .../Northrend/AzjolNerub/ahnkahet/ahnkahet.h       | 23 ++++++------
 .../AzjolNerub/ahnkahet/boss_amanitar.cpp          | 31 ++++++++--------
 .../AzjolNerub/ahnkahet/boss_elder_nadox.cpp       | 31 ++++++++--------
 .../AzjolNerub/ahnkahet/boss_herald_volazj.cpp     | 31 ++++++++--------
 .../ahnkahet/boss_jedoga_shadowseeker.cpp          | 31 ++++++++--------
 .../AzjolNerub/ahnkahet/boss_prince_taldaram.cpp   | 23 ++++++------
 .../AzjolNerub/ahnkahet/instance_ahnkahet.cpp      | 31 ++++++++--------
 .../TrialOfTheChampion/boss_argent_challenge.cpp   | 23 ++++++------
 .../TrialOfTheChampion/boss_black_knight.cpp       | 23 ++++++------
 .../TrialOfTheChampion/boss_grand_champions.cpp    | 27 +++++++-------
 .../instance_trial_of_the_champion.cpp             | 23 ++++++------
 .../TrialOfTheChampion/trial_of_the_champion.cpp   | 23 ++++++------
 .../TrialOfTheChampion/trial_of_the_champion.h     | 21 ++++++++---
 .../scripts/Northrend/DraktharonKeep/boss_dred.cpp | 23 ++++++------
 .../Northrend/DraktharonKeep/boss_novos.cpp        | 31 ++++++++--------
 .../Northrend/DraktharonKeep/boss_tharon_ja.cpp    | 31 ++++++++--------
 .../Northrend/DraktharonKeep/boss_trollgore.cpp    | 23 ++++++------
 .../Northrend/DraktharonKeep/drak_tharon_keep.h    | 31 ++++++++--------
 .../DraktharonKeep/instance_drak_tharon_keep.cpp   | 23 ++++++------
 .../FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp     | 25 ++++++-------
 .../ForgeOfSouls/boss_devourer_of_souls.cpp        | 25 ++++++-------
 .../FrozenHalls/ForgeOfSouls/forge_of_souls.cpp    | 25 ++++++-------
 .../FrozenHalls/ForgeOfSouls/forge_of_souls.h      | 25 ++++++-------
 .../ForgeOfSouls/instance_forge_of_souls.cpp       | 25 ++++++-------
 .../FrozenHalls/HallsOfReflection/boss_falric.cpp  | 25 ++++++-------
 .../FrozenHalls/HallsOfReflection/boss_marwyn.cpp  | 25 ++++++-------
 .../HallsOfReflection/halls_of_reflection.cpp      | 25 ++++++-------
 .../HallsOfReflection/halls_of_reflection.h        | 25 ++++++-------
 .../instance_halls_of_reflection.cpp               | 25 ++++++-------
 .../PitOfSaron/boss_forgemaster_garfrost.cpp       | 25 ++++++-------
 .../FrozenHalls/PitOfSaron/boss_krickandick.cpp    | 25 ++++++-------
 .../PitOfSaron/boss_scourgelord_tyrannus.cpp       | 25 ++++++-------
 .../PitOfSaron/instance_pit_of_saron.cpp           | 25 ++++++-------
 .../FrozenHalls/PitOfSaron/pit_of_saron.cpp        | 25 ++++++-------
 .../FrozenHalls/PitOfSaron/pit_of_saron.h          | 25 ++++++-------
 .../Northrend/Gundrak/boss_drakkari_colossus.cpp   | 23 ++++++------
 src/server/scripts/Northrend/Gundrak/boss_eck.cpp  | 31 ++++++++--------
 .../scripts/Northrend/Gundrak/boss_gal_darah.cpp   | 31 ++++++++--------
 .../scripts/Northrend/Gundrak/boss_moorabi.cpp     | 31 ++++++++--------
 .../scripts/Northrend/Gundrak/boss_slad_ran.cpp    | 31 ++++++++--------
 src/server/scripts/Northrend/Gundrak/gundrak.h     | 31 ++++++++--------
 .../scripts/Northrend/Gundrak/instance_gundrak.cpp | 31 ++++++++--------
 .../Northrend/Naxxramas/boss_anubrekhan.cpp        | 23 ++++++------
 .../scripts/Northrend/Naxxramas/boss_faerlina.cpp  | 23 ++++++------
 .../Northrend/Naxxramas/boss_four_horsemen.cpp     | 23 ++++++------
 .../scripts/Northrend/Naxxramas/boss_gluth.cpp     | 23 ++++++------
 .../scripts/Northrend/Naxxramas/boss_gothik.cpp    | 23 ++++++------
 .../scripts/Northrend/Naxxramas/boss_grobbulus.cpp | 23 ++++++------
 .../scripts/Northrend/Naxxramas/boss_heigan.cpp    | 23 ++++++------
 .../scripts/Northrend/Naxxramas/boss_kelthuzad.cpp | 27 +++++++-------
 .../scripts/Northrend/Naxxramas/boss_loatheb.cpp   | 23 ++++++------
 .../scripts/Northrend/Naxxramas/boss_maexxna.cpp   | 23 ++++++------
 .../scripts/Northrend/Naxxramas/boss_noth.cpp      | 23 ++++++------
 .../scripts/Northrend/Naxxramas/boss_patchwerk.cpp | 23 ++++++------
 .../scripts/Northrend/Naxxramas/boss_razuvious.cpp | 23 ++++++------
 .../scripts/Northrend/Naxxramas/boss_sapphiron.cpp | 23 ++++++------
 .../scripts/Northrend/Naxxramas/boss_thaddius.cpp  | 23 ++++++------
 .../Northrend/Naxxramas/instance_naxxramas.cpp     | 25 ++++++-------
 src/server/scripts/Northrend/Naxxramas/naxxramas.h | 23 ++++++------
 .../Northrend/Nexus/EyeOfEternity/boss_malygos.cpp | 17 +++++++++
 .../Nexus/EyeOfEternity/eye_of_eternity.h          | 17 +++++++++
 .../EyeOfEternity/instance_eye_of_eternity.cpp     | 17 +++++++++
 .../Northrend/Nexus/Nexus/boss_anomalus.cpp        | 28 +++++++--------
 .../Northrend/Nexus/Nexus/boss_keristrasza.cpp     | 28 +++++++--------
 .../Northrend/Nexus/Nexus/boss_magus_telestra.cpp  | 28 +++++++--------
 .../scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp | 28 +++++++--------
 .../Northrend/Nexus/Nexus/commander_kolurg.cpp     | 17 +++++++++
 .../Northrend/Nexus/Nexus/commander_stoutbeard.cpp | 17 +++++++++
 .../Northrend/Nexus/Nexus/instance_nexus.cpp       | 28 +++++++--------
 src/server/scripts/Northrend/Nexus/Nexus/nexus.h   | 25 ++++++-------
 .../scripts/Northrend/Nexus/Oculus/boss_drakos.cpp | 31 ++++++++--------
 .../scripts/Northrend/Nexus/Oculus/boss_eregos.cpp | 31 ++++++++--------
 .../scripts/Northrend/Nexus/Oculus/boss_urom.cpp   | 31 ++++++++--------
 .../scripts/Northrend/Nexus/Oculus/boss_varos.cpp  | 31 ++++++++--------
 .../Northrend/Nexus/Oculus/instance_oculus.cpp     | 31 ++++++++--------
 .../scripts/Northrend/Nexus/Oculus/oculus.cpp      | 31 ++++++++--------
 src/server/scripts/Northrend/Nexus/Oculus/oculus.h | 17 +++++++++
 .../Northrend/ObsidianSanctum/boss_sartharion.cpp  | 25 ++++++-------
 .../ObsidianSanctum/instance_obsidian_sanctum.cpp  | 25 ++++++-------
 .../Northrend/ObsidianSanctum/obsidian_sanctum.h   | 25 ++++++-------
 .../Ulduar/HallsOfLightning/boss_bjarngrim.cpp     | 27 +++++++-------
 .../Ulduar/HallsOfLightning/boss_ionar.cpp         | 28 +++++++--------
 .../Ulduar/HallsOfLightning/boss_loken.cpp         | 27 +++++++-------
 .../Ulduar/HallsOfLightning/boss_volkhan.cpp       | 27 +++++++-------
 .../Ulduar/HallsOfLightning/halls_of_lightning.h   | 21 ++++++++---
 .../instance_halls_of_lightning.cpp                | 27 +++++++-------
 .../Ulduar/HallsOfStone/boss_krystallus.cpp        | 17 +++++++++
 .../Ulduar/HallsOfStone/boss_maiden_of_grief.cpp   | 17 +++++++++
 .../Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp | 17 +++++++++
 .../Ulduar/HallsOfStone/halls_of_stone.cpp         | 17 +++++++++
 .../Northrend/Ulduar/HallsOfStone/halls_of_stone.h | 17 +++++++++
 .../HallsOfStone/instance_halls_of_stone.cpp       | 17 +++++++++
 .../Northrend/Ulduar/ulduar/boss_algalon.cpp       | 23 ++++++------
 .../Ulduar/ulduar/boss_assembly_of_iron.cpp        | 23 ++++++------
 .../Northrend/Ulduar/ulduar/boss_auriaya.cpp       | 23 ++++++------
 .../Ulduar/ulduar/boss_flame_leviathan.cpp         | 41 +++++++++++-----------
 .../scripts/Northrend/Ulduar/ulduar/boss_freya.cpp | 23 ++++++------
 .../Northrend/Ulduar/ulduar/boss_general_vezax.cpp | 23 ++++++------
 .../scripts/Northrend/Ulduar/ulduar/boss_hodir.cpp | 23 ++++++------
 .../scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp | 23 ++++++------
 .../Northrend/Ulduar/ulduar/boss_kologarn.cpp      | 23 ++++++------
 .../Northrend/Ulduar/ulduar/boss_mimiron.cpp       | 23 ++++++------
 .../Northrend/Ulduar/ulduar/boss_razorscale.cpp    | 23 ++++++------
 .../Northrend/Ulduar/ulduar/boss_thorim.cpp        | 23 ++++++------
 .../scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp | 23 ++++++------
 .../Northrend/Ulduar/ulduar/boss_yoggsaron.cpp     | 23 ++++++------
 .../Northrend/Ulduar/ulduar/instance_ulduar.cpp    | 23 ++++++------
 .../scripts/Northrend/Ulduar/ulduar/ulduar.h       | 23 ++++++------
 .../Northrend/Ulduar/ulduar/ulduar_teleporter.cpp  | 18 ++++++++++
 .../UtgardeKeep/boss_ingvar_the_plunderer.cpp      | 23 ++++++------
 .../UtgardeKeep/UtgardeKeep/boss_keleseth.cpp      | 23 ++++++------
 .../UtgardeKeep/boss_skarvald_dalronn.cpp          | 23 ++++++------
 .../UtgardeKeep/instance_utgarde_keep.cpp          | 23 ++++++------
 .../UtgardeKeep/UtgardeKeep/utgarde_keep.cpp       | 23 ++++++------
 .../UtgardeKeep/UtgardeKeep/utgarde_keep.h         | 23 ++++++------
 .../UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp  | 17 +++++++++
 .../UtgardeKeep/UtgardePinnacle/boss_skadi.cpp     | 25 ++++++-------
 .../UtgardeKeep/UtgardePinnacle/boss_svala.cpp     | 25 ++++++-------
 .../UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp    | 17 +++++++++
 .../UtgardePinnacle/instance_pinnacle.cpp          | 17 +++++++++
 .../UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h | 17 +++++++++
 .../Northrend/VaultOfArchavon/boss_archavon.cpp    | 23 ++++++------
 .../Northrend/VaultOfArchavon/boss_emalon.cpp      | 23 ++++++------
 .../Northrend/VaultOfArchavon/boss_koralon.cpp     | 23 ++++++------
 .../Northrend/VaultOfArchavon/boss_toravon.cpp     | 23 ++++++------
 .../VaultOfArchavon/instance_vault_of_archavon.cpp | 17 +++++++++
 .../Northrend/VaultOfArchavon/vault_of_archavon.h  | 17 +++++++++
 .../Northrend/VioletHold/boss_cyanigosa.cpp        | 23 ++++++------
 .../scripts/Northrend/VioletHold/boss_erekem.cpp   | 23 ++++++------
 .../scripts/Northrend/VioletHold/boss_ichoron.cpp  | 23 ++++++------
 .../Northrend/VioletHold/boss_lavanthor.cpp        | 23 ++++++------
 .../scripts/Northrend/VioletHold/boss_moragg.cpp   | 23 ++++++------
 .../scripts/Northrend/VioletHold/boss_xevozz.cpp   | 23 ++++++------
 .../scripts/Northrend/VioletHold/boss_zuramat.cpp  | 23 ++++++------
 .../Northrend/VioletHold/instance_violet_hold.cpp  | 23 ++++++------
 .../scripts/Northrend/VioletHold/violet_hold.cpp   | 23 ++++++------
 .../scripts/Northrend/VioletHold/violet_hold.h     | 23 ++++++------
 src/server/scripts/Northrend/borean_tundra.cpp     | 27 +++++++-------
 .../scripts/Northrend/crystalsong_forest.cpp       | 23 ++++++------
 src/server/scripts/Northrend/dalaran.cpp           | 23 ++++++------
 src/server/scripts/Northrend/dragonblight.cpp      | 27 +++++++-------
 src/server/scripts/Northrend/grizzly_hills.cpp     | 27 +++++++-------
 src/server/scripts/Northrend/howling_fjord.cpp     | 24 ++++++-------
 src/server/scripts/Northrend/icecrown.cpp          | 27 +++++++-------
 src/server/scripts/Northrend/sholazar_basin.cpp    | 24 ++++++-------
 src/server/scripts/Northrend/storm_peaks.cpp       | 24 ++++++-------
 src/server/scripts/Northrend/zuldrak.cpp           | 23 ++++++------
 .../AuchenaiCrypts/boss_exarch_maladaar.cpp        | 27 +++++++-------
 .../boss_shirrak_the_dead_watcher.cpp              | 27 +++++++-------
 .../ManaTombs/boss_nexusprince_shaffar.cpp         | 27 +++++++-------
 .../Auchindoun/ManaTombs/boss_pandemonius.cpp      | 27 +++++++-------
 .../SethekkHalls/boss_darkweaver_syth.cpp          | 27 +++++++-------
 .../SethekkHalls/boss_tailonking_ikiss.cpp         | 27 +++++++-------
 .../SethekkHalls/instance_sethekk_halls.cpp        | 27 +++++++-------
 .../Auchindoun/SethekkHalls/sethekk_halls.h        | 21 ++++++++---
 .../ShadowLabyrinth/boss_ambassador_hellmaw.cpp    | 27 +++++++-------
 .../boss_blackheart_the_inciter.cpp                | 27 +++++++-------
 .../ShadowLabyrinth/boss_grandmaster_vorpil.cpp    | 27 +++++++-------
 .../Auchindoun/ShadowLabyrinth/boss_murmur.cpp     | 27 +++++++-------
 .../ShadowLabyrinth/instance_shadow_labyrinth.cpp  | 27 +++++++-------
 .../Auchindoun/ShadowLabyrinth/shadow_labyrinth.h  | 21 ++++++++---
 .../scripts/Outland/BlackTemple/black_temple.cpp   | 27 +++++++-------
 .../scripts/Outland/BlackTemple/black_temple.h     | 21 ++++++++---
 .../scripts/Outland/BlackTemple/boss_bloodboil.cpp | 27 +++++++-------
 .../scripts/Outland/BlackTemple/boss_illidan.cpp   | 33 ++++++++---------
 .../Outland/BlackTemple/boss_mother_shahraz.cpp    | 27 +++++++-------
 .../BlackTemple/boss_reliquary_of_souls.cpp        | 33 ++++++++---------
 .../Outland/BlackTemple/boss_shade_of_akama.cpp    | 27 +++++++-------
 .../scripts/Outland/BlackTemple/boss_supremus.cpp  | 26 +++++++-------
 .../Outland/BlackTemple/boss_teron_gorefiend.cpp   | 27 +++++++-------
 .../Outland/BlackTemple/boss_warlord_najentus.cpp  | 27 +++++++-------
 .../Outland/BlackTemple/illidari_council.cpp       | 27 +++++++-------
 .../Outland/BlackTemple/instance_black_temple.cpp  | 33 ++++++++---------
 .../SerpentShrine/boss_fathomlord_karathress.cpp   | 27 +++++++-------
 .../SerpentShrine/boss_hydross_the_unstable.cpp    | 27 +++++++-------
 .../SerpentShrine/boss_lady_vashj.cpp              | 27 +++++++-------
 .../SerpentShrine/boss_leotheras_the_blind.cpp     | 27 +++++++-------
 .../SerpentShrine/boss_lurker_below.cpp            | 27 +++++++-------
 .../SerpentShrine/boss_morogrim_tidewalker.cpp     | 33 ++++++++---------
 .../SerpentShrine/instance_serpent_shrine.cpp      | 27 +++++++-------
 .../SerpentShrine/serpent_shrine.h                 | 21 ++++++++---
 .../SteamVault/boss_hydromancer_thespia.cpp        | 27 +++++++-------
 .../SteamVault/boss_mekgineer_steamrigger.cpp      | 27 +++++++-------
 .../SteamVault/boss_warlord_kalithresh.cpp         | 27 +++++++-------
 .../SteamVault/instance_steam_vault.cpp            | 27 +++++++-------
 .../CoilfangReservoir/SteamVault/steam_vault.h     | 21 ++++++++---
 .../CoilfangReservoir/underbog/boss_hungarfen.cpp  | 27 +++++++-------
 .../underbog/boss_the_black_stalker.cpp            | 27 +++++++-------
 .../scripts/Outland/GruulsLair/boss_gruul.cpp      | 27 +++++++-------
 .../Outland/GruulsLair/boss_high_king_maulgar.cpp  | 27 +++++++-------
 .../scripts/Outland/GruulsLair/gruuls_lair.h       | 21 ++++++++---
 .../Outland/GruulsLair/instance_gruuls_lair.cpp    | 27 +++++++-------
 .../HellfireCitadel/BloodFurnace/blood_furnace.h   | 21 ++++++++---
 .../HellfireCitadel/BloodFurnace/boss_broggok.cpp  | 27 +++++++-------
 .../BloodFurnace/boss_kelidan_the_breaker.cpp      | 27 +++++++-------
 .../BloodFurnace/boss_the_maker.cpp                | 27 +++++++-------
 .../BloodFurnace/instance_blood_furnace.cpp        | 27 +++++++-------
 .../HellfireRamparts/boss_omor_the_unscarred.cpp   | 27 +++++++-------
 .../HellfireRamparts/boss_vazruden_the_herald.cpp  | 27 +++++++-------
 .../boss_watchkeeper_gargolmar.cpp                 | 27 +++++++-------
 .../HellfireRamparts/hellfire_ramparts.h           | 21 ++++++++---
 .../instance_hellfire_ramparts.cpp                 | 27 +++++++-------
 .../MagtheridonsLair/boss_magtheridon.cpp          | 32 +++++++++--------
 .../instance_magtheridons_lair.cpp                 | 27 +++++++-------
 .../MagtheridonsLair/magtheridons_lair.h           | 21 ++++++++---
 .../ShatteredHalls/boss_nethekurse.cpp             | 27 +++++++-------
 .../ShatteredHalls/boss_warbringer_omrogg.cpp      | 27 +++++++-------
 .../boss_warchief_kargath_bladefist.cpp            | 27 +++++++-------
 .../ShatteredHalls/instance_shattered_halls.cpp    | 27 +++++++-------
 .../ShatteredHalls/shattered_halls.h               | 21 ++++++++---
 .../scripts/Outland/TempestKeep/Eye/boss_alar.cpp  | 32 +++++++++--------
 .../Outland/TempestKeep/Eye/boss_astromancer.cpp   | 27 +++++++-------
 .../Outland/TempestKeep/Eye/boss_kaelthas.cpp      | 27 +++++++-------
 .../Outland/TempestKeep/Eye/boss_void_reaver.cpp   | 27 +++++++-------
 .../Outland/TempestKeep/Eye/instance_the_eye.cpp   | 27 +++++++-------
 .../scripts/Outland/TempestKeep/Eye/the_eye.cpp    | 27 +++++++-------
 .../scripts/Outland/TempestKeep/Eye/the_eye.h      | 21 ++++++++---
 .../Mechanar/boss_gatewatcher_gyrokill.cpp         | 27 +++++++-------
 .../Mechanar/boss_gatewatcher_ironhand.cpp         | 33 ++++++++---------
 .../Mechanar/boss_nethermancer_sepethrea.cpp       | 33 ++++++++---------
 .../Mechanar/boss_pathaleon_the_calculator.cpp     | 33 ++++++++---------
 .../TempestKeep/Mechanar/instance_mechanar.cpp     | 27 +++++++-------
 .../Outland/TempestKeep/Mechanar/mechanar.h        | 18 ++++++++++
 .../Outland/TempestKeep/arcatraz/arcatraz.cpp      | 27 +++++++-------
 .../Outland/TempestKeep/arcatraz/arcatraz.h        | 21 ++++++++---
 .../arcatraz/boss_harbinger_skyriss.cpp            | 27 +++++++-------
 .../TempestKeep/arcatraz/instance_arcatraz.cpp     | 27 +++++++-------
 .../botanica/boss_high_botanist_freywinn.cpp       | 27 +++++++-------
 .../Outland/TempestKeep/botanica/boss_laj.cpp      | 27 +++++++-------
 .../TempestKeep/botanica/boss_warp_splinter.cpp    | 33 ++++++++---------
 .../scripts/Outland/blades_edge_mountains.cpp      | 27 +++++++-------
 .../scripts/Outland/boss_doomlord_kazzak.cpp       | 27 +++++++-------
 src/server/scripts/Outland/boss_doomwalker.cpp     | 33 ++++++++---------
 src/server/scripts/Outland/hellfire_peninsula.cpp  | 27 +++++++-------
 src/server/scripts/Outland/nagrand.cpp             | 27 +++++++-------
 src/server/scripts/Outland/netherstorm.cpp         | 27 +++++++-------
 src/server/scripts/Outland/shadowmoon_valley.cpp   | 27 +++++++-------
 src/server/scripts/Outland/shattrath_city.cpp      | 27 +++++++-------
 src/server/scripts/Outland/terokkar_forest.cpp     | 27 +++++++-------
 src/server/scripts/Outland/zangarmarsh.cpp         | 27 +++++++-------
 src/server/scripts/World/areatrigger_scripts.cpp   | 27 +++++++-------
 src/server/scripts/World/boss_emeriss.cpp          | 27 +++++++-------
 src/server/scripts/World/boss_lethon.cpp           | 27 +++++++-------
 src/server/scripts/World/boss_taerar.cpp           | 27 +++++++-------
 src/server/scripts/World/boss_ysondre.cpp          | 27 +++++++-------
 src/server/scripts/World/go_scripts.cpp            | 28 +++++++--------
 src/server/scripts/World/guards.cpp                | 27 +++++++-------
 src/server/scripts/World/item_scripts.cpp          | 27 +++++++-------
 src/server/scripts/World/mob_generic_creature.cpp  | 34 +++++++++---------
 src/server/scripts/World/npc_innkeeper.cpp         | 23 ++++++------
 src/server/scripts/World/npc_professions.cpp       | 27 +++++++-------
 src/server/scripts/World/npc_taxi.cpp              | 27 +++++++-------
 src/server/scripts/World/npcs_special.cpp          | 27 +++++++-------
 564 files changed, 8004 insertions(+), 6750 deletions(-)
 mode change 100644 => 100755 src/server/scripts/Custom/custom_example.cpp
 mode change 100644 => 100755 src/server/scripts/Custom/custom_gossip_codebox.cpp
 mode change 100644 => 100755 src/server/scripts/Custom/test.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.h
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/BlackrockSpire/blackrock_spire.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/BlackrockSpire/blackrock_spire.h
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/BlackrockSpire/boss_drakkisath.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gyth.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/BlackrockSpire/boss_halycon.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/BlackrockSpire/boss_highlord_omokk.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/BlackrockSpire/boss_mother_smolderweb.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/BlackrockSpire/boss_overlord_wyrmthalak.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/BlackrockSpire/boss_pyroguard_emberseer.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/BlackrockSpire/boss_quartermaster_zigris.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/BlackrockSpire/boss_rend_blackhand.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/BlackrockSpire/boss_the_beast.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/BlackrockSpire/boss_warmaster_voone.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/BlackwingLair/boss_ebonroc.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/BlackwingLair/boss_firemaw.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/BlackwingLair/instance_blackwing_lair.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.h
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/Karazhan/karazhan.h
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/MoltenCore/boss_baron_geddon.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/MoltenCore/boss_garr.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/MoltenCore/boss_gehennas.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/MoltenCore/boss_golemagg.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/MoltenCore/boss_lucifron.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/MoltenCore/boss_magmadar.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/MoltenCore/boss_majordomo_executus.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/MoltenCore/boss_shazzrah.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/MoltenCore/boss_sulfuron_harbinger.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/MoltenCore/instance_molten_core.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/MoltenCore/molten_core.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/MoltenCore/molten_core.h
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/ScarletMonastery/scarlet_monastery.h
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/Scholomance/boss_death_knight_darkreaver.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/Scholomance/scholomance.h
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/Stratholme/stratholme.h
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.h
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/ZulAman/zulaman.h
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/alterac_mountains.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/arathi_highlands.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/blasted_lands.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/boss_kruul.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/burning_steppes.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/dun_morogh.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/duskwood.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/eastern_plaguelands.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/elwynn_forest.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/eversong_woods.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/ghostlands.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/hinterlands.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/ironforge.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/isle_of_queldanas.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/loch_modan.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/redridge_mountains.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/searing_gorge.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/silvermoon_city.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/silverpine_forest.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/stormwind_city.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/stranglethorn_vale.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/tirisfal_glades.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/undercity.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/western_plaguelands.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/westfall.cpp
 mode change 100644 => 100755 src/server/scripts/EasternKingdoms/wetlands.cpp
 mode change 100644 => 100755 src/server/scripts/Examples/example_creature.cpp
 mode change 100644 => 100755 src/server/scripts/Examples/example_escort.cpp
 mode change 100644 => 100755 src/server/scripts/Examples/example_gossip_codebox.cpp
 mode change 100644 => 100755 src/server/scripts/Examples/example_misc.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h
 mode change 100644 => 100755 src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h
 mode change 100644 => 100755 src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h
 mode change 100644 => 100755 src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.h
 mode change 100644 => 100755 src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.h
 mode change 100644 => 100755 src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h
 mode change 100644 => 100755 src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/Maraudon/boss_landslide.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/OnyxiasLair/onyxias_lair.h
 mode change 100644 => 100755 src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.h
 mode change 100644 => 100755 src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.h
 mode change 100644 => 100755 src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h
 mode change 100644 => 100755 src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.h
 mode change 100644 => 100755 src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/ashenvale.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/azshara.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/azuremyst_isle.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/bloodmyst_isle.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/boss_azuregos.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/darkshore.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/desolace.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/durotar.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/dustwallow_marsh.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/felwood.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/feralas.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/moonglade.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/mulgore.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/orgrimmar.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/silithus.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/stonetalon_mountains.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/tanaris.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/teldrassil.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/the_barrens.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/thousand_needles.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/thunder_bluff.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/ungoro_crater.cpp
 mode change 100644 => 100755 src/server/scripts/Kalimdor/winterspring.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h
 mode change 100644 => 100755 src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/AzjolNerub/ahnkahet/ahnkahet.h
 mode change 100644 => 100755 src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h
 mode change 100644 => 100755 src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/DraktharonKeep/drak_tharon_keep.h
 mode change 100644 => 100755 src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h
 mode change 100644 => 100755 src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h
 mode change 100644 => 100755 src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/Gundrak/boss_eck.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/Gundrak/gundrak.h
 mode change 100644 => 100755 src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/Naxxramas/boss_noth.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/Naxxramas/naxxramas.h
 mode change 100644 => 100755 src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/Nexus/Nexus/nexus.h
 mode change 100644 => 100755 src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h
 mode change 100644 => 100755 src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/Ulduar/ulduar/boss_auriaya.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/Ulduar/ulduar/boss_freya.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/Ulduar/ulduar/boss_general_vezax.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/Ulduar/ulduar/boss_hodir.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/Ulduar/ulduar/boss_mimiron.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/Ulduar/ulduar/boss_thorim.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/Ulduar/ulduar/boss_yoggsaron.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/Ulduar/ulduar/ulduar.h
 mode change 100644 => 100755 src/server/scripts/Northrend/Ulduar/ulduar/ulduar_teleporter.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h
 mode change 100644 => 100755 src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/VioletHold/boss_erekem.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/VioletHold/boss_moragg.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/VioletHold/violet_hold.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/VioletHold/violet_hold.h
 mode change 100644 => 100755 src/server/scripts/Northrend/borean_tundra.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/crystalsong_forest.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/dalaran.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/dragonblight.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/grizzly_hills.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/howling_fjord.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/icecrown.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/sholazar_basin.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/storm_peaks.cpp
 mode change 100644 => 100755 src/server/scripts/Northrend/zuldrak.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h
 mode change 100644 => 100755 src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h
 mode change 100644 => 100755 src/server/scripts/Outland/BlackTemple/black_temple.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/BlackTemple/black_temple.h
 mode change 100644 => 100755 src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/BlackTemple/boss_supremus.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/BlackTemple/illidari_council.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h
 mode change 100644 => 100755 src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h
 mode change 100644 => 100755 src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/GruulsLair/boss_gruul.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/GruulsLair/gruuls_lair.h
 mode change 100644 => 100755 src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h
 mode change 100644 => 100755 src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h
 mode change 100644 => 100755 src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h
 mode change 100644 => 100755 src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h
 mode change 100644 => 100755 src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/TempestKeep/Eye/the_eye.h
 mode change 100644 => 100755 src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h
 mode change 100644 => 100755 src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/blades_edge_mountains.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/boss_doomlord_kazzak.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/boss_doomwalker.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/hellfire_peninsula.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/nagrand.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/netherstorm.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/shadowmoon_valley.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/shattrath_city.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/terokkar_forest.cpp
 mode change 100644 => 100755 src/server/scripts/Outland/zangarmarsh.cpp
 mode change 100644 => 100755 src/server/scripts/World/areatrigger_scripts.cpp
 mode change 100644 => 100755 src/server/scripts/World/boss_emeriss.cpp
 mode change 100644 => 100755 src/server/scripts/World/boss_lethon.cpp
 mode change 100644 => 100755 src/server/scripts/World/boss_taerar.cpp
 mode change 100644 => 100755 src/server/scripts/World/boss_ysondre.cpp
 mode change 100644 => 100755 src/server/scripts/World/go_scripts.cpp
 mode change 100644 => 100755 src/server/scripts/World/guards.cpp
 mode change 100644 => 100755 src/server/scripts/World/item_scripts.cpp
 mode change 100644 => 100755 src/server/scripts/World/mob_generic_creature.cpp
 mode change 100644 => 100755 src/server/scripts/World/npc_innkeeper.cpp
 mode change 100644 => 100755 src/server/scripts/World/npc_professions.cpp
 mode change 100644 => 100755 src/server/scripts/World/npc_taxi.cpp
 mode change 100644 => 100755 src/server/scripts/World/npcs_special.cpp

(limited to 'src')

diff --git a/src/server/scripts/Custom/custom_example.cpp b/src/server/scripts/Custom/custom_example.cpp
old mode 100644
new mode 100755
index 0e230ba901d..9010c958ea9
--- a/src/server/scripts/Custom/custom_example.cpp
+++ b/src/server/scripts/Custom/custom_example.cpp
@@ -1,17 +1,19 @@
-/* Copyright (C) 2006 - 2008 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2008 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Custom/custom_gossip_codebox.cpp b/src/server/scripts/Custom/custom_gossip_codebox.cpp
old mode 100644
new mode 100755
index a00d2b7031f..e7dd58f0a33
--- a/src/server/scripts/Custom/custom_gossip_codebox.cpp
+++ b/src/server/scripts/Custom/custom_gossip_codebox.cpp
@@ -1,17 +1,19 @@
-/* Copyright (C) 2006 - 2008 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2008 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Custom/npc_acherus_taxi.cpp b/src/server/scripts/Custom/npc_acherus_taxi.cpp
index 509631e1e87..dff5165ce70 100644
--- a/src/server/scripts/Custom/npc_acherus_taxi.cpp
+++ b/src/server/scripts/Custom/npc_acherus_taxi.cpp
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
+
 #include "ScriptPCH.h"
 #include "WorldPacket.h"
 
diff --git a/src/server/scripts/Custom/npc_wyrmresttempel_taxi.cpp b/src/server/scripts/Custom/npc_wyrmresttempel_taxi.cpp
index 109cd996144..cec34365c67 100644
--- a/src/server/scripts/Custom/npc_wyrmresttempel_taxi.cpp
+++ b/src/server/scripts/Custom/npc_wyrmresttempel_taxi.cpp
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
+
 #include "ScriptPCH.h"
 #include "WorldPacket.h"
 
diff --git a/src/server/scripts/Custom/on_events.cpp b/src/server/scripts/Custom/on_events.cpp
index 904f0010d55..58cc8275a3a 100644
--- a/src/server/scripts/Custom/on_events.cpp
+++ b/src/server/scripts/Custom/on_events.cpp
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
+
 #include "ScriptPCH.h"
 #include 
 
diff --git a/src/server/scripts/Custom/test.cpp b/src/server/scripts/Custom/test.cpp
old mode 100644
new mode 100755
index aa9e6879075..0f5dec744b0
--- a/src/server/scripts/Custom/test.cpp
+++ b/src/server/scripts/Custom/test.cpp
@@ -1,17 +1,19 @@
-/* Copyright (C) 2006 - 2008 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2008 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp
old mode 100644
new mode 100755
index e1788f0290b..1f6821d7493
--- a/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp
+++ b/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 TrinityCore 
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #include "ScriptPCH.h"
 
diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp
old mode 100644
new mode 100755
index bb86b9cd69d..42e87b14a8c
--- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp
+++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp
@@ -1,17 +1,18 @@
-/* Copyright (C) 2008 - 2010 TrinityCore 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp
old mode 100644
new mode 100755
index e72d683d0f4..60e26972574
--- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp
+++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 TrinityCore 
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #include "ScriptPCH.h"
 
diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp
old mode 100644
new mode 100755
index d4fbae31032..8f27fe61810
--- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp
+++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 TrinityCore 
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #include "ScriptPCH.h"
 
diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp
old mode 100644
new mode 100755
index 9e2c1bade01..f24d6eec5a9
--- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp
+++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 TrinityCore 
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #include "ScriptPCH.h"
 
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp
old mode 100644
new mode 100755
index e92803921a3..6b8d17b3f55
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp
@@ -1,19 +1,18 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
-
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.h b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.h
old mode 100644
new mode 100755
index be5442fbf15..a9228615604
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.h
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.h
@@ -1,7 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
-* This program is free software licensed under GPL version 2
-* Please see the included DOCS/LICENSE.TXT for more information */
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #ifndef DEF_BRD_H
 #define DEF_BRD_H
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp
old mode 100644
new mode 100755
index 317bebee964..df77770a410
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp
old mode 100644
new mode 100755
index fa7f0d4891a..e8277d9e931
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp
old mode 100644
new mode 100755
index 1af1f80f174..d177e3c97ac
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp
old mode 100644
new mode 100755
index d29a2d95ea7..0c50893633b
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp
old mode 100644
new mode 100755
index 3274def15d8..718278d3720
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp
old mode 100644
new mode 100755
index 9b992422bcd..f369e4d645a
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp
old mode 100644
new mode 100755
index 2be444f973b..53df13eee1f
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp
old mode 100644
new mode 100755
index 4adedd89f83..bc0181bbb9a
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp
old mode 100644
new mode 100755
index e3d7e5a024b..fe81ad5eeac
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp
old mode 100644
new mode 100755
index ed8e628c1ec..ac1795d5e43
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp
old mode 100644
new mode 100755
index 3624a6ad88f..9be222e8bb2
--- a/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp
@@ -1,19 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 /* ScriptData
 SDName: Instance_Blackrock_Depths
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/blackrock_spire.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/blackrock_spire.cpp
old mode 100644
new mode 100755
index 8d6f1f1211f..a0508c1d86e
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/blackrock_spire.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/blackrock_spire.cpp
@@ -1,17 +1,18 @@
-/* Copyright (C) 2008 - 2010 TrinityCore 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/blackrock_spire.h b/src/server/scripts/EasternKingdoms/BlackrockSpire/blackrock_spire.h
old mode 100644
new mode 100755
index 56b6e0cbe23..94ad1c24ef4
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/blackrock_spire.h
+++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/blackrock_spire.h
@@ -1,17 +1,18 @@
-/* Copyright (C) 2008 - 2010 TrinityCore 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #ifndef DEF_BRS_H
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_drakkisath.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_drakkisath.cpp
old mode 100644
new mode 100755
index 2094db3db43..612201efa1c
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_drakkisath.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_drakkisath.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gyth.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gyth.cpp
old mode 100644
new mode 100755
index 2c57e8ec303..dec948f68df
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gyth.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gyth.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_halycon.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_halycon.cpp
old mode 100644
new mode 100755
index 7dd2d94de03..679ec4d37a0
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_halycon.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_halycon.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_highlord_omokk.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_highlord_omokk.cpp
old mode 100644
new mode 100755
index ec1a586b080..1b40580572b
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_highlord_omokk.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_highlord_omokk.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_mother_smolderweb.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_mother_smolderweb.cpp
old mode 100644
new mode 100755
index 502fd922107..1f7d9d1dd18
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_mother_smolderweb.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_mother_smolderweb.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_overlord_wyrmthalak.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_overlord_wyrmthalak.cpp
old mode 100644
new mode 100755
index 08497ea9e83..dd93ef85325
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_overlord_wyrmthalak.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_overlord_wyrmthalak.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_pyroguard_emberseer.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_pyroguard_emberseer.cpp
old mode 100644
new mode 100755
index 18590e89314..267a590a307
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_pyroguard_emberseer.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_pyroguard_emberseer.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_quartermaster_zigris.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_quartermaster_zigris.cpp
old mode 100644
new mode 100755
index 30cfbb8c51a..4d46394a536
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_quartermaster_zigris.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_quartermaster_zigris.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_rend_blackhand.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_rend_blackhand.cpp
old mode 100644
new mode 100755
index feea0af1e44..4973246df79
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_rend_blackhand.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_rend_blackhand.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp
old mode 100644
new mode 100755
index 972e54abc0a..b3470b43e21
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_the_beast.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_the_beast.cpp
old mode 100644
new mode 100755
index 56e751875c9..4af0dbc3a73
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_the_beast.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_the_beast.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_warmaster_voone.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_warmaster_voone.cpp
old mode 100644
new mode 100755
index ee93709f9b2..7e05dec67cf
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_warmaster_voone.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_warmaster_voone.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp
old mode 100644
new mode 100755
index 3f0bc377118..208843e359e
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp
@@ -1,17 +1,18 @@
-/* Copyright (C) 2008 - 2010 TrinityCore 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp
old mode 100644
new mode 100755
index a04bd9870db..33e0ff49e5a
--- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp
old mode 100644
new mode 100755
index 80197ff8efb..bc0e451932f
--- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_ebonroc.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_ebonroc.cpp
old mode 100644
new mode 100755
index 6bf5029945e..1eeb7b3a6ae
--- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_ebonroc.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_ebonroc.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_firemaw.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_firemaw.cpp
old mode 100644
new mode 100755
index 8fef3431cc4..a9142a2049b
--- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_firemaw.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_firemaw.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp
old mode 100644
new mode 100755
index 74c2d7e3397..32fc2d52b37
--- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp
old mode 100644
new mode 100755
index 3581448ce71..b78c999e0e5
--- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp
old mode 100644
new mode 100755
index 3fcc1a5df20..59c4d2a6730
--- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp
old mode 100644
new mode 100755
index 56461d0fc08..bba4cac82f1
--- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp
old mode 100644
new mode 100755
index b3802559557..85d1537ffd1
--- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/instance_blackwing_lair.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/instance_blackwing_lair.cpp
old mode 100644
new mode 100755
index f1f54120f25..9d680b13cfe
--- a/src/server/scripts/EasternKingdoms/BlackwingLair/instance_blackwing_lair.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackwingLair/instance_blackwing_lair.cpp
@@ -1,19 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 /* ScriptData
 SDName: Instance_Blackwing_Lair
diff --git a/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp b/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp
old mode 100644
new mode 100755
index d92f8d2c2f4..77fb826e9dd
--- a/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp
+++ b/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp
@@ -1,20 +1,19 @@
 /*
-* Copyright (C) 2008-2010 Trinity 
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 /* ScriptData
 SDName: Boss Mr.Smite
diff --git a/src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp b/src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp
old mode 100644
new mode 100755
index 18e4e252c4d..0540ae7194d
--- a/src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp
+++ b/src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/Deadmines/deadmines.h b/src/server/scripts/EasternKingdoms/Deadmines/deadmines.h
index 1d25f91ce86..6f0e922b421 100644
--- a/src/server/scripts/EasternKingdoms/Deadmines/deadmines.h
+++ b/src/server/scripts/EasternKingdoms/Deadmines/deadmines.h
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
+
 #ifndef DEF_DEADMINES_H
 #define DEF_DEADMINES_H
 
diff --git a/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp b/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
old mode 100644
new mode 100755
index ee9cc60c18f..153d7ed10e1
--- a/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
+++ b/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
@@ -1,17 +1,19 @@
-/* Copyright (C) 2006 - 2008 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2008 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp
old mode 100644
new mode 100755
index 84438a2c1ad..776515891e4
--- a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp
+++ b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2010 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* Script Data Start
diff --git a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.h b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.h
old mode 100644
new mode 100755
index e46c811e9b1..cbb0d166fb0
--- a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.h
+++ b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.h
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2010 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #ifndef DEF_GNOMEREGAN_H
diff --git a/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp b/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp
old mode 100644
new mode 100755
index 7db91a2aef5..c678fc55140
--- a/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp
+++ b/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2010 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp
old mode 100644
new mode 100755
index 8769e8ec861..ce6d4158fd7
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp
old mode 100644
new mode 100755
index 6b6fd5df9aa..19b6b203d4c
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp
old mode 100644
new mode 100755
index dabfd846eb9..939a5a1684a
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp
old mode 100644
new mode 100755
index bf52ceafa20..fc46d027d07
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp
@@ -1,17 +1,19 @@
-/* Copyright (C) 2006 - 2008 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2008 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp
old mode 100644
new mode 100755
index a496fac109e..c3a2a85e74c
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp
old mode 100644
new mode 100755
index 551e6eb39d4..1cf397e2ce5
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp
old mode 100644
new mode 100755
index bbc58c51e3d..aea8703f2f2
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
old mode 100644
new mode 100755
index 636a223444c..ace2b186342
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
old mode 100644
new mode 100755
index b9ef55cfa8d..039b517bd9b
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
old mode 100644
new mode 100755
index 45472a8cc81..c5bc8a2a3d4
--- a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp
old mode 100644
new mode 100755
index 0a03f9d4d9a..7a7039b94fe
--- a/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
old mode 100644
new mode 100755
index 13957ddc32a..bf9c2519dd9
--- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
@@ -1,18 +1,19 @@
- /* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ /*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.h b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.h
old mode 100644
new mode 100755
index 192eb15d68b..a24dba53e49
--- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.h
+++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.h
@@ -1,7 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software licensed under GPL version 2
- * Please see the included DOCS/LICENSE.TXT for more information */
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #ifndef DEF_KARAZHAN_H
 #define DEF_KARAZHAN_H
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
old mode 100644
new mode 100755
index 2e9eb67ad23..3f0cffbacaa
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
old mode 100644
new mode 100755
index 44e78e0eb8f..3e5ddd8cce2
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
old mode 100644
new mode 100755
index ca17a3dd675..9636d596213
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
old mode 100644
new mode 100755
index 42fe3630b74..c89c7683749
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
old mode 100644
new mode 100755
index 52694d64bec..ab1bf3b04d1
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp
old mode 100644
new mode 100755
index 98a436f1e5d..d23c7883f96
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h
old mode 100644
new mode 100755
index af12ec6f729..a7de6da1c8e
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h
@@ -1,7 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software licensed under GPL version 2
- * Please see the included DOCS/LICENSE.TXT for more information */
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #ifndef DEF_MAGISTERS_TERRACE_H
 #define DEF_MAGISTERS_TERRACE_H
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_baron_geddon.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_baron_geddon.cpp
old mode 100644
new mode 100755
index 0f9be5eca12..86894f75f73
--- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_baron_geddon.cpp
+++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_baron_geddon.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_garr.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_garr.cpp
old mode 100644
new mode 100755
index 80a383e5343..18eef567088
--- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_garr.cpp
+++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_garr.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_gehennas.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_gehennas.cpp
old mode 100644
new mode 100755
index 6100e58c72b..a2e3550b87b
--- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_gehennas.cpp
+++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_gehennas.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_golemagg.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_golemagg.cpp
old mode 100644
new mode 100755
index 113060b1231..1665d8356b9
--- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_golemagg.cpp
+++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_golemagg.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_lucifron.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_lucifron.cpp
old mode 100644
new mode 100755
index f6aabff44c2..761bfa97f81
--- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_lucifron.cpp
+++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_lucifron.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_magmadar.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_magmadar.cpp
old mode 100644
new mode 100755
index 5d35105e8b2..fd64e42fed1
--- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_magmadar.cpp
+++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_magmadar.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_majordomo_executus.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_majordomo_executus.cpp
old mode 100644
new mode 100755
index b67cf108246..3b8bf20256d
--- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_majordomo_executus.cpp
+++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_majordomo_executus.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp
old mode 100644
new mode 100755
index cbcf30a054c..fc7f9948f0a
--- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp
+++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_shazzrah.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_shazzrah.cpp
old mode 100644
new mode 100755
index e4ab1559c7a..f2b6b4a99f8
--- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_shazzrah.cpp
+++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_shazzrah.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_sulfuron_harbinger.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_sulfuron_harbinger.cpp
old mode 100644
new mode 100755
index 147d61464f4..66d6d115b12
--- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_sulfuron_harbinger.cpp
+++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_sulfuron_harbinger.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/instance_molten_core.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/instance_molten_core.cpp
old mode 100644
new mode 100755
index 593919d72d3..fb313fba3ae
--- a/src/server/scripts/EasternKingdoms/MoltenCore/instance_molten_core.cpp
+++ b/src/server/scripts/EasternKingdoms/MoltenCore/instance_molten_core.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/molten_core.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/molten_core.cpp
old mode 100644
new mode 100755
index 6387f573913..5a77af76d63
--- a/src/server/scripts/EasternKingdoms/MoltenCore/molten_core.cpp
+++ b/src/server/scripts/EasternKingdoms/MoltenCore/molten_core.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/molten_core.h b/src/server/scripts/EasternKingdoms/MoltenCore/molten_core.h
old mode 100644
new mode 100755
index 65535e390ce..419aeb4acbf
--- a/src/server/scripts/EasternKingdoms/MoltenCore/molten_core.h
+++ b/src/server/scripts/EasternKingdoms/MoltenCore/molten_core.h
@@ -1,7 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software licensed under GPL version 2
- * Please see the included DOCS/LICENSE.TXT for more information */
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #ifndef DEF_MOLTEN_CORE_H
 #define DEF_MOLTEN_CORE_H
diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
old mode 100644
new mode 100755
index 9dcfc4ad459..609e8bd9322
--- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2009 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
old mode 100644
new mode 100755
index d917edcd0d3..bafb12d5606
--- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2009 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp
old mode 100644
new mode 100755
index 6a95c41746b..6d40618a936
--- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2009 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp
old mode 100644
new mode 100755
index c3eb2869372..e39dace9920
--- a/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2009 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp
old mode 100644
new mode 100755
index 4e7f4f9927d..6659d1aaba8
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp
old mode 100644
new mode 100755
index a38497650bc..e30e527d567
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp
old mode 100644
new mode 100755
index 0d2767b7e90..2a53ce591db
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
old mode 100644
new mode 100755
index 214e6dbd832..50a4dd8f60e
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp
old mode 100644
new mode 100755
index 8e430db98a0..e6b535c1073
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp
old mode 100644
new mode 100755
index 3a678829d65..e643e001ca6
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp
old mode 100644
new mode 100755
index 6edc0cae41f..324f28ccf6a
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp
old mode 100644
new mode 100755
index 96d6f23833d..d804a680e76
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp
old mode 100644
new mode 100755
index d89c2bce36e..2d4f7e8e244
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp
old mode 100644
new mode 100755
index 81f3d1c7910..f37903d09e1
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp
old mode 100644
new mode 100755
index 399b748678e..dd7a88dbc88
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp
@@ -1,19 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 /* ScriptData
 SDName: Instance_Scarlet_Monastery
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/scarlet_monastery.h b/src/server/scripts/EasternKingdoms/ScarletMonastery/scarlet_monastery.h
old mode 100644
new mode 100755
index 1307667cfee..d34636df360
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/scarlet_monastery.h
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/scarlet_monastery.h
@@ -1,7 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
- * This program is free software licensed under GPL version 2
- * Please see the included DOCS/LICENSE.TXT for more information */
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #ifndef DEF_SCARLET_M
 #define DEF_SCARLET_M
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp
old mode 100644
new mode 100755
index 6f8b59d31de..1f2e2fe1429
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_death_knight_darkreaver.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_death_knight_darkreaver.cpp
old mode 100644
new mode 100755
index b3f8087bc1d..c021e9e677e
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_death_knight_darkreaver.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_death_knight_darkreaver.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp
old mode 100644
new mode 100755
index 3ca01977bdc..24b5bafd57c
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp
old mode 100644
new mode 100755
index f38626bfdd2..b2748fef22a
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp
old mode 100644
new mode 100755
index f3b2704d0e2..d78b486d00f
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp
old mode 100644
new mode 100755
index 6f272f67222..370cd221029
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp
@@ -1,19 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 /* ScriptData
 SDName: Boss_jandicebarov
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp
old mode 100644
new mode 100755
index 09626c92c91..9a41a16a2e7
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp
old mode 100644
new mode 100755
index d922ed49f08..9782475540f
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp
old mode 100644
new mode 100755
index 04826a4aa45..7d3dc7cf873
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp
old mode 100644
new mode 100755
index 35895580d5f..a5957995981
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp
old mode 100644
new mode 100755
index 17279b2e16c..e23bc4fdd97
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp
old mode 100644
new mode 100755
index c840b3a971a..1aa278f1bce
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp b/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp
old mode 100644
new mode 100755
index 1d4041121c0..28ed326cefa
--- a/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/scholomance.h b/src/server/scripts/EasternKingdoms/Scholomance/scholomance.h
old mode 100644
new mode 100755
index 0145f5ef448..463c848b9ef
--- a/src/server/scripts/EasternKingdoms/Scholomance/scholomance.h
+++ b/src/server/scripts/EasternKingdoms/Scholomance/scholomance.h
@@ -1,7 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software licensed under GPL version 2
- * Please see the included DOCS/LICENSE.TXT for more information */
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #ifndef DEF_SCHOLOMANCE_H
 #define DEF_SCHOLOMANCE_H
diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
old mode 100644
new mode 100755
index 21f4aa4230c..be3cd67c8d6
--- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
+++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
old mode 100644
new mode 100755
index 424ff365b31..61f06276bb6
--- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
+++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
@@ -1,18 +1,19 @@
- /* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ /*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h
old mode 100644
new mode 100755
index 7f5658dfe3e..fb5bf310589
--- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h
+++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h
@@ -1,7 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software licensed under GPL version 2
- * Please see the included DOCS/LICENSE.TXT for more information */
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #ifndef DEF_SHADOWFANG_H
 #define DEF_SHADOWFANG_H
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp
old mode 100644
new mode 100755
index 7b09df0ae6e..ca2ca46d198
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp
@@ -1,19 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 /* ScriptData
 SDName: Boss_Baron_Rivendare
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp
old mode 100644
new mode 100755
index f3a31e0cc04..ba2a49a1804
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp
@@ -1,19 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 /* ScriptData
 SDName: Boss_Baroness_Anastari
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp
old mode 100644
new mode 100755
index b0a3f9e6ff2..0de4d122904
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp
@@ -1,19 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 /* ScriptData
 SDName: boss_cannon_master_willey
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp
old mode 100644
new mode 100755
index 9025767fe6f..5f1e1a0f088
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp
@@ -1,19 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 /* ScriptData
 SDName: Boss_Dathrohan_Balnazzar
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp
old mode 100644
new mode 100755
index 165157ff503..4551a8c5118
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp
@@ -1,19 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 /* ScriptData
 SDName: Boss_Magistrate_Barthilas
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp
old mode 100644
new mode 100755
index a89293de09e..f47da709578
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp
@@ -1,19 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 /* ScriptData
 SDName: boss_maleki_the_pallid
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp
old mode 100644
new mode 100755
index e5292199d22..1e39e4ef3e4
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp
@@ -1,19 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 /* ScriptData
 SDName: Boss_Nerubenkan
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp
old mode 100644
new mode 100755
index e46b40d0028..c20ac90aae0
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp
@@ -1,19 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 /* ScriptData
 SDName: Boss_Silver_Hand_Bosses
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp
old mode 100644
new mode 100755
index b2564e1c674..002cd963e2a
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp
@@ -1,19 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 /* ScriptData
 SDName: boss_postmaster_malown
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp
old mode 100644
new mode 100755
index 7375eb9ba8d..809b62e68af
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp
@@ -1,19 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 /* ScriptData
 SDName: Boss_Ramstein_The_Gorger
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp
old mode 100644
new mode 100755
index c66a9469d22..426e40e2db2
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp
@@ -1,19 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 /* ScriptData
 SDName: boss_timmy_the_cruel
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp
old mode 100644
new mode 100755
index 0944f58f2bc..797a3899806
--- a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp
@@ -1,19 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 /* ScriptData
 SDName: instance_stratholme
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp
old mode 100644
new mode 100755
index a4e0988ee1e..ed87b7fdccb
--- a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.h b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.h
old mode 100644
new mode 100755
index 730b890a917..6198ea85723
--- a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.h
+++ b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.h
@@ -1,7 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
-* This program is free software licensed under GPL version 2
-* Please see the included DOCS/LICENSE.TXT for more information */
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #ifndef DEF_STRATHOLME_H
 #define DEF_STRATHOLME_H
diff --git a/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp b/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp
old mode 100644
new mode 100755
index faab9af0337..99c018161dc
--- a/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp
+++ b/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp
@@ -1,17 +1,19 @@
-/* Copyright (C) 2006 - 2009 kb_z
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp b/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp
old mode 100644
new mode 100755
index 9f5dba4408c..ca49cac4908
--- a/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp
+++ b/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp
@@ -1,17 +1,19 @@
-/* Copyright (C) 2006 - 2009 kb_z
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.h b/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.h
old mode 100644
new mode 100755
index 82245095c31..39fdee13ef3
--- a/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.h
+++ b/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.h
@@ -1,6 +1,20 @@
-/* Copyright (C) 2006 - 2009 kb_z
- * This program is free software licensed under GPL version 2
- * Please see the included DOCS/LICENSE.TXT for more information */
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #ifndef DEF_SUNKEN_TEMPLE_H
 #define DEF_SUNKEN_TEMPLE_H
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp
old mode 100644
new mode 100755
index c682bbd8a68..5aa1daaad77
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp
old mode 100644
new mode 100755
index 24e28e107b4..6ce5b933d6a
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2009 Trinity 
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 /* ScriptData
 SDName: Boss_Eredar_Twins
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp
old mode 100644
new mode 100755
index 5133eb7b346..3c6efbb97fe
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2009 Trinity 
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 /* ScriptData
 SDName: Boss_Felmyst
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
old mode 100644
new mode 100755
index cdb84386085..e72e49c47b3
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
old mode 100644
new mode 100755
index d80153c14f5..4bd5164bf9c
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
@@ -1,17 +1,18 @@
-/* Copyright (C) 2009 Trinity 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp
old mode 100644
new mode 100755
index 97893fc2095..ca25828c484
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2009 Trinity 
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 /* ScriptData
 SDName: Boss_Muru
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp
old mode 100644
new mode 100755
index a755c8f405c..12a0bdfffff
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp
@@ -1,7 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software licensed under GPL version 2
- * Please see the included DOCS/LICENSE.TXT for more information */
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 /* ScriptData
 SDName: Instance_Sunwell_Plateau
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.cpp
old mode 100644
new mode 100755
index 76335087836..bb3a1b16a20
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.cpp
@@ -1,17 +1,18 @@
-/* Copyright (C) 2009 Trinity 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h b/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h
old mode 100644
new mode 100755
index 3aafb8aa29c..bebee8f0f99
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h
@@ -1,7 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software licensed under GPL version 2
- * Please see the included DOCS/LICENSE.TXT for more information */
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #ifndef DEF_SUNWELLPLATEAU_H
 #define DEF_SUNWELLPLATEAU_H
diff --git a/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp b/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp
old mode 100644
new mode 100755
index 957dbec7ba5..ba7fbd9ca8f
--- a/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp
+++ b/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp
@@ -1,18 +1,20 @@
-/* Copyright (C) 2006,2007 ScriptDev2 
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2007 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 /* ScriptData
 SDName: boss_archaedas
diff --git a/src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp b/src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp
old mode 100644
new mode 100755
index dde9cfde4d2..71e1bf9d877
--- a/src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp
+++ b/src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp
old mode 100644
new mode 100755
index f09f9268395..579c01e7286
--- a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp
+++ b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp
@@ -1,18 +1,20 @@
-/* Copyright (C) 2006,2007 ScriptDev2 
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2007 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #include "ScriptPCH.h"
 
diff --git a/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp
old mode 100644
new mode 100755
index 5212bc45060..34cf68d0d21
--- a/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp
+++ b/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
old mode 100644
new mode 100755
index 93f197a6867..bf45480783e
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
@@ -1,18 +1,20 @@
-/* Copyright ?2006 - 2008 ScriptDev2 
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 /* ScriptData
 SDName: boss_Akilzon
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
old mode 100644
new mode 100755
index bfeef7ad338..a846e3f8779
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
@@ -1,19 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 /* ScriptData
 SDName: boss_Halazzi
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
old mode 100644
new mode 100755
index 77eb080aa11..5fa14fb56ab
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
@@ -1,18 +1,20 @@
-/* Copyright ?2006,2007 ScriptDev2 
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2007 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 /* ScriptData
 SDName: Boss_Hex_Lord_Malacrass
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
old mode 100644
new mode 100755
index c24e048290d..ffa963fdb04
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
@@ -1,19 +1,20 @@
- /* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-*(at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 /* ScriptData
 SDName: Boss_Janalai
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
old mode 100644
new mode 100755
index 8db76cb7054..42762fe7baa
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
@@ -1,19 +1,20 @@
- /* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+ /*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 /* ScriptData
 SDName: Boss_Nalorakk
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
old mode 100644
new mode 100755
index 9dcc7fc76af..fbd34c34228
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
@@ -1,18 +1,20 @@
-/* Copyright (C) 2006,2007,2008 ScriptDev2 
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 /* ScriptData
 SDName: Boss_ZulJin
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
old mode 100644
new mode 100755
index f93d1da1212..4a3096b302e
--- a/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
@@ -1,19 +1,20 @@
- /* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+ /*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 /* ScriptData
 SDName: instance_zulaman
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
old mode 100644
new mode 100755
index 00da369c57c..a27ae768dba
--- a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
@@ -1,19 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 /* ScriptData
 SDName: Zulaman
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.h b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.h
old mode 100644
new mode 100755
index 2f6533edcf1..ad2d83f659f
--- a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.h
+++ b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.h
@@ -1,7 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
-* This program is free software licensed under GPL version 2
-* Please see the included DOCS/LICENSE.TXT for more information */
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #ifndef DEF_ZULAMAN_H
 #define DEF_ZULAMAN_H
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
old mode 100644
new mode 100755
index c575272fbd8..80d6d76da4d
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp
old mode 100644
new mode 100755
index 657da0970d4..ee65b4f5e61
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
old mode 100644
new mode 100755
index df39b7d69b0..e2914b1e8e0
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
old mode 100644
new mode 100755
index 57b57fa5646..8ed073c56d3
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
old mode 100644
new mode 100755
index 4970cfbc2b5..a079a451f43
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
old mode 100644
new mode 100755
index b9668c4c657..3642ffa6a1b
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
old mode 100644
new mode 100755
index 49d663a44cb..a192a1fcbf3
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
old mode 100644
new mode 100755
index 5cbcb19cf75..2fdae639e46
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
old mode 100644
new mode 100755
index 6f588082f98..76f89ebf6ca
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
old mode 100644
new mode 100755
index fbcc6f11fbf..3d1d19bed40
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
old mode 100644
new mode 100755
index da283a7009a..7e1aa2db350
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
old mode 100644
new mode 100755
index 13738c70a9e..f7e1ae27296
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
old mode 100644
new mode 100755
index 8c546592e53..051e556b698
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
old mode 100644
new mode 100755
index 8a9f64b5c39..89f30ff134e
--- a/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h b/src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
old mode 100644
new mode 100755
index 194e391e598..9ca8d3e9fa1
--- a/src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
@@ -1,7 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software licensed under GPL version 2
- * Please see the included DOCS/LICENSE.TXT for more information */
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #ifndef DEF_ZULGURUB_H
 #define DEF_ZULGURUB_H
diff --git a/src/server/scripts/EasternKingdoms/alterac_mountains.cpp b/src/server/scripts/EasternKingdoms/alterac_mountains.cpp
old mode 100644
new mode 100755
index d404d8ccd95..e54f0840988
--- a/src/server/scripts/EasternKingdoms/alterac_mountains.cpp
+++ b/src/server/scripts/EasternKingdoms/alterac_mountains.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/arathi_highlands.cpp b/src/server/scripts/EasternKingdoms/arathi_highlands.cpp
old mode 100644
new mode 100755
index 5f3276ef0e6..5a5d229a109
--- a/src/server/scripts/EasternKingdoms/arathi_highlands.cpp
+++ b/src/server/scripts/EasternKingdoms/arathi_highlands.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/blasted_lands.cpp b/src/server/scripts/EasternKingdoms/blasted_lands.cpp
old mode 100644
new mode 100755
index 674941616b1..cbeb8d45ffe
--- a/src/server/scripts/EasternKingdoms/blasted_lands.cpp
+++ b/src/server/scripts/EasternKingdoms/blasted_lands.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/boss_kruul.cpp b/src/server/scripts/EasternKingdoms/boss_kruul.cpp
old mode 100644
new mode 100755
index 86c26fe072f..d6a6cb76d59
--- a/src/server/scripts/EasternKingdoms/boss_kruul.cpp
+++ b/src/server/scripts/EasternKingdoms/boss_kruul.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/burning_steppes.cpp b/src/server/scripts/EasternKingdoms/burning_steppes.cpp
old mode 100644
new mode 100755
index 173c9e2a675..de543258b40
--- a/src/server/scripts/EasternKingdoms/burning_steppes.cpp
+++ b/src/server/scripts/EasternKingdoms/burning_steppes.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/dun_morogh.cpp b/src/server/scripts/EasternKingdoms/dun_morogh.cpp
old mode 100644
new mode 100755
index 111fec3044e..c170529aa45
--- a/src/server/scripts/EasternKingdoms/dun_morogh.cpp
+++ b/src/server/scripts/EasternKingdoms/dun_morogh.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/duskwood.cpp b/src/server/scripts/EasternKingdoms/duskwood.cpp
old mode 100644
new mode 100755
index cd87740b03c..3dcf9a01f6a
--- a/src/server/scripts/EasternKingdoms/duskwood.cpp
+++ b/src/server/scripts/EasternKingdoms/duskwood.cpp
@@ -1,17 +1,19 @@
-/* Copyright (C) 2006 - 2009 kb_z
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/eastern_plaguelands.cpp b/src/server/scripts/EasternKingdoms/eastern_plaguelands.cpp
old mode 100644
new mode 100755
index cfc6a6d248a..32091439b1f
--- a/src/server/scripts/EasternKingdoms/eastern_plaguelands.cpp
+++ b/src/server/scripts/EasternKingdoms/eastern_plaguelands.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/elwynn_forest.cpp b/src/server/scripts/EasternKingdoms/elwynn_forest.cpp
old mode 100644
new mode 100755
index 67f5992b458..8b56c16f8fa
--- a/src/server/scripts/EasternKingdoms/elwynn_forest.cpp
+++ b/src/server/scripts/EasternKingdoms/elwynn_forest.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/eversong_woods.cpp b/src/server/scripts/EasternKingdoms/eversong_woods.cpp
old mode 100644
new mode 100755
index 1fe2b84faf9..beb7acb3217
--- a/src/server/scripts/EasternKingdoms/eversong_woods.cpp
+++ b/src/server/scripts/EasternKingdoms/eversong_woods.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/ghostlands.cpp b/src/server/scripts/EasternKingdoms/ghostlands.cpp
old mode 100644
new mode 100755
index 78e3ac48c90..b429bd03ec7
--- a/src/server/scripts/EasternKingdoms/ghostlands.cpp
+++ b/src/server/scripts/EasternKingdoms/ghostlands.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/hinterlands.cpp b/src/server/scripts/EasternKingdoms/hinterlands.cpp
old mode 100644
new mode 100755
index 0d6983f6d8a..13f44f47ff4
--- a/src/server/scripts/EasternKingdoms/hinterlands.cpp
+++ b/src/server/scripts/EasternKingdoms/hinterlands.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/ironforge.cpp b/src/server/scripts/EasternKingdoms/ironforge.cpp
old mode 100644
new mode 100755
index 4615eb6543d..da215065c6d
--- a/src/server/scripts/EasternKingdoms/ironforge.cpp
+++ b/src/server/scripts/EasternKingdoms/ironforge.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/isle_of_queldanas.cpp b/src/server/scripts/EasternKingdoms/isle_of_queldanas.cpp
old mode 100644
new mode 100755
index bf177c90561..2bb7a723b06
--- a/src/server/scripts/EasternKingdoms/isle_of_queldanas.cpp
+++ b/src/server/scripts/EasternKingdoms/isle_of_queldanas.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/loch_modan.cpp b/src/server/scripts/EasternKingdoms/loch_modan.cpp
old mode 100644
new mode 100755
index b6919c4bed3..1a5dafb8b17
--- a/src/server/scripts/EasternKingdoms/loch_modan.cpp
+++ b/src/server/scripts/EasternKingdoms/loch_modan.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/redridge_mountains.cpp b/src/server/scripts/EasternKingdoms/redridge_mountains.cpp
old mode 100644
new mode 100755
index abdcc5f8d04..ac02be30aa7
--- a/src/server/scripts/EasternKingdoms/redridge_mountains.cpp
+++ b/src/server/scripts/EasternKingdoms/redridge_mountains.cpp
@@ -1,18 +1,18 @@
-/* Copyright (C) 2008-2010 Trinity 
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* Script Data Start
diff --git a/src/server/scripts/EasternKingdoms/searing_gorge.cpp b/src/server/scripts/EasternKingdoms/searing_gorge.cpp
old mode 100644
new mode 100755
index 763cb848d99..602fdeb2b59
--- a/src/server/scripts/EasternKingdoms/searing_gorge.cpp
+++ b/src/server/scripts/EasternKingdoms/searing_gorge.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/silvermoon_city.cpp b/src/server/scripts/EasternKingdoms/silvermoon_city.cpp
old mode 100644
new mode 100755
index 0c4ec0aa478..b636f20bb44
--- a/src/server/scripts/EasternKingdoms/silvermoon_city.cpp
+++ b/src/server/scripts/EasternKingdoms/silvermoon_city.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/silverpine_forest.cpp b/src/server/scripts/EasternKingdoms/silverpine_forest.cpp
old mode 100644
new mode 100755
index 0a0e91a2f74..4b04083f4cd
--- a/src/server/scripts/EasternKingdoms/silverpine_forest.cpp
+++ b/src/server/scripts/EasternKingdoms/silverpine_forest.cpp
@@ -1,18 +1,19 @@
- /* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ /*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/stormwind_city.cpp b/src/server/scripts/EasternKingdoms/stormwind_city.cpp
old mode 100644
new mode 100755
index b709c5de4b9..72d1a3b693b
--- a/src/server/scripts/EasternKingdoms/stormwind_city.cpp
+++ b/src/server/scripts/EasternKingdoms/stormwind_city.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/stranglethorn_vale.cpp b/src/server/scripts/EasternKingdoms/stranglethorn_vale.cpp
old mode 100644
new mode 100755
index 2002747ac12..503e27f993c
--- a/src/server/scripts/EasternKingdoms/stranglethorn_vale.cpp
+++ b/src/server/scripts/EasternKingdoms/stranglethorn_vale.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp b/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp
old mode 100644
new mode 100755
index bb2d2905df3..94fb836ca35
--- a/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp
+++ b/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/undercity.cpp b/src/server/scripts/EasternKingdoms/undercity.cpp
old mode 100644
new mode 100755
index 7186011d367..017dab5b63d
--- a/src/server/scripts/EasternKingdoms/undercity.cpp
+++ b/src/server/scripts/EasternKingdoms/undercity.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/western_plaguelands.cpp b/src/server/scripts/EasternKingdoms/western_plaguelands.cpp
old mode 100644
new mode 100755
index 12a4b6e9cbf..3dddf3a3f80
--- a/src/server/scripts/EasternKingdoms/western_plaguelands.cpp
+++ b/src/server/scripts/EasternKingdoms/western_plaguelands.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/westfall.cpp b/src/server/scripts/EasternKingdoms/westfall.cpp
old mode 100644
new mode 100755
index 7a15d56c07a..e706594dcf5
--- a/src/server/scripts/EasternKingdoms/westfall.cpp
+++ b/src/server/scripts/EasternKingdoms/westfall.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/EasternKingdoms/wetlands.cpp b/src/server/scripts/EasternKingdoms/wetlands.cpp
old mode 100644
new mode 100755
index 71ef6884449..b7b92462f11
--- a/src/server/scripts/EasternKingdoms/wetlands.cpp
+++ b/src/server/scripts/EasternKingdoms/wetlands.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Examples/example_creature.cpp b/src/server/scripts/Examples/example_creature.cpp
old mode 100644
new mode 100755
index 6c05d80e708..6c10644564d
--- a/src/server/scripts/Examples/example_creature.cpp
+++ b/src/server/scripts/Examples/example_creature.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Examples/example_escort.cpp b/src/server/scripts/Examples/example_escort.cpp
old mode 100644
new mode 100755
index af66c8e6fee..2b381c53451
--- a/src/server/scripts/Examples/example_escort.cpp
+++ b/src/server/scripts/Examples/example_escort.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Examples/example_gossip_codebox.cpp b/src/server/scripts/Examples/example_gossip_codebox.cpp
old mode 100644
new mode 100755
index 8a45638facc..b86f1ffacdb
--- a/src/server/scripts/Examples/example_gossip_codebox.cpp
+++ b/src/server/scripts/Examples/example_gossip_codebox.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Examples/example_misc.cpp b/src/server/scripts/Examples/example_misc.cpp
old mode 100644
new mode 100755
index 8a7729fda99..af17b922602
--- a/src/server/scripts/Examples/example_misc.cpp
+++ b/src/server/scripts/Examples/example_misc.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp
old mode 100644
new mode 100755
index 46bdf71bc58..f217661871c
--- a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp
+++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp
@@ -1,20 +1,19 @@
 /*
-* Copyright (C) 2008-2010 Trinity 
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #include "ScriptPCH.h"
 #include "blackfathom_deeps.h"
diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h
old mode 100644
new mode 100755
index 965886f1501..25e3806c624
--- a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h
+++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h
@@ -1,7 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software licensed under GPL version 2
- * Please see the included DOCS/LICENSE.TXT for more information */
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #ifndef DEF_BFD_H
 #define DEF_BFD_H
diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp
old mode 100644
new mode 100755
index 8fd6396378c..9037fe25ff3
--- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp
+++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp
@@ -1,20 +1,19 @@
 /*
-* Copyright (C) 2008-2010 Trinity 
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #include "ScriptPCH.h"
 #include "blackfathom_deeps.h"
diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp
old mode 100644
new mode 100755
index 8ca645ff1d9..2525f949f89
--- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp
+++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp
@@ -1,20 +1,19 @@
 /*
-* Copyright (C) 2008-2010 Trinity 
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #include "ScriptPCH.h"
 #include "blackfathom_deeps.h"
diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp
old mode 100644
new mode 100755
index 50ebe097e59..a8183971a98
--- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp
+++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp
@@ -1,20 +1,19 @@
 /*
-* Copyright (C) 2008-2010 Trinity 
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #include "ScriptPCH.h"
 #include "blackfathom_deeps.h"
diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp
old mode 100644
new mode 100755
index b6eeaa0bdf1..99ddd5cdd82
--- a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp
+++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp
index 76a2581aee2..e70eefe62d5 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #include "ScriptPCH.h"
 #include "hyjal.h"
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
old mode 100644
new mode 100755
index 76415aa3398..04a838d9adb
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp
index 46961f9b992..50b86c7fa30 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #include "ScriptPCH.h"
 #include "hyjal.h"
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp
index 9b284ae94a8..2e9228b2f75 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #include "ScriptPCH.h"
 #include "hyjal.h"
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp
index a8d00720d6e..28b32e19063 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #include "ScriptPCH.h"
 #include "hyjal.h"
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp
old mode 100644
new mode 100755
index 1bb6e13367e..4f524587525
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp
@@ -1,18 +1,19 @@
- /* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ /*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h
old mode 100644
new mode 100755
index c237d9d7aa8..6a57dc550fa
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h
@@ -1,7 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software licensed under GPL version 2
- * Please see the included DOCS/LICENSE.TXT for more information */
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #ifndef DEF_HYJAL_H
 #define DEF_HYJAL_H
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
old mode 100644
new mode 100755
index 6d3b3f33b59..dbd0696631e
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h
old mode 100644
new mode 100755
index 70508f1bf15..245e719295a
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h
@@ -1,7 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software licensed under GPL version 2
- * Please see the included DOCS/LICENSE.TXT for more information */
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #ifndef SC_HYJALAI_H
 #define SC_HYJALAI_H
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp
index f9a3995f502..dd889b9fee6 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #include "ScriptPCH.h"
 #include "hyjal.h"
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.h b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.h
index 21ee4bc06cc..b18fa74e6a4 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.h
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.h
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #ifndef SC_HYJAL_TRASH_AI_H
 #define SC_HYJAL_TRASH_AI_H
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
old mode 100644
new mode 100755
index 46d6dde79a4..65579498210
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
@@ -1,18 +1,19 @@
- /* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ /*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp
old mode 100644
new mode 100755
index f3d879f5cad..7aa4b04a750
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp
@@ -1,20 +1,19 @@
 /*
-* Copyright (C) 2008-2010 Trinity 
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 
 /* Script Data Start
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp
old mode 100644
new mode 100755
index 0d53ee26e18..60a46159fa7
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp
@@ -1,20 +1,19 @@
 /*
-* Copyright (C) 2008-2010 Trinity 
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #include "ScriptPCH.h"
 #include "culling_of_stratholme.h"
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp
old mode 100644
new mode 100755
index d496fc3bb1c..deabd11961f
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp
@@ -1,20 +1,19 @@
 /*
-* Copyright (C) 2008-2010 Trinity 
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 /* Script Data Start
 SDName: Boss mal_ganis
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp
old mode 100644
new mode 100755
index 327c49d412b..4ab1c3023e6
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp
@@ -1,20 +1,19 @@
 /*
-* Copyright (C) 2008-2010 Trinity 
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 /* Script Data Start
 SDName: Boss meathook
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp
old mode 100644
new mode 100755
index ff5ab5e159a..98c8d34bb8a
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp
@@ -1,20 +1,19 @@
 /*
-* Copyright (C) 2008-2010 Trinity 
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 /* Script Data Start
 SDName: Boss salramm
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
old mode 100644
new mode 100755
index 352869ebebf..4e340d13ea4
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
@@ -1,20 +1,19 @@
 /*
-* Copyright (C) 2008-2010 Trinity 
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #include "ScriptPCH.h"
 #include "culling_of_stratholme.h"
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.h b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.h
old mode 100644
new mode 100755
index 4278ad46500..2f1816e5221
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.h
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.h
@@ -1,20 +1,19 @@
 /*
-* Copyright (C) 2008-2010 Trinity 
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #ifndef DEF_CULLING_OF_STRATHOLME_H
 #define DEF_CULLING_OF_STRATHOLME_H
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp
old mode 100644
new mode 100755
index 9c721dc00e7..a64a0a03976
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp
@@ -1,20 +1,19 @@
 /*
-* Copyright (C) 2008-2010 Trinity 
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #include "ScriptPCH.h"
 #include "culling_of_stratholme.h"
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp
old mode 100644
new mode 100755
index c23edea5355..e95c440a7aa
--- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp
old mode 100644
new mode 100755
index 88d212e57e6..4845a39f2fe
--- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp
old mode 100644
new mode 100755
index 9bd1d984f8e..61888422d60
--- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp
old mode 100644
new mode 100755
index 0414ef49ecb..d0387eb5a34
--- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp
@@ -1,19 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 /* ScriptData
 SDName: Dark_Portal
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.h b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.h
old mode 100644
new mode 100755
index 92194d8e3af..301c174accf
--- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.h
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.h
@@ -1,7 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
-* This program is free software licensed under GPL version 2
-* Please see the included DOCS/LICENSE.TXT for more information */
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #ifndef DEF_DARKPORTAL_H
 #define DEF_DARKPORTAL_H
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp
old mode 100644
new mode 100755
index 91f79e14d5e..b68310b4a18
--- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp
@@ -1,19 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 /* ScriptData
 SDName: Instance_Dark_Portal
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp
old mode 100644
new mode 100755
index f17775f85ed..013846e576a
--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp
old mode 100644
new mode 100755
index eaf934ab36b..92e0ac31a2b
--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp
old mode 100644
new mode 100755
index 7cf8d5b1347..6fc67249925
--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
old mode 100644
new mode 100755
index 070f3279a4a..85536bacd7e
--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
old mode 100644
new mode 100755
index dfd62a9fd01..400fca670e2
--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
@@ -1,18 +1,19 @@
- /* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ /*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h
old mode 100644
new mode 100755
index 45a0e0ab1db..c775d5243f9
--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h
@@ -1,7 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software licensed under GPL version 2
- * Please see the included DOCS/LICENSE.TXT for more information */
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #ifndef DEF_OLD_HILLSBRAD_H
 #define DEF_OLD_HILLSBRAD_H
diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp
old mode 100644
new mode 100755
index 9bc68e2919f..61cd06f0f1c
--- a/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp
+++ b/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_landslide.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_landslide.cpp
old mode 100644
new mode 100755
index c9591203d90..b7d89607857
--- a/src/server/scripts/Kalimdor/Maraudon/boss_landslide.cpp
+++ b/src/server/scripts/Kalimdor/Maraudon/boss_landslide.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp
old mode 100644
new mode 100755
index 85cb9ae37cf..96aa6bd7785
--- a/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp
+++ b/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp
old mode 100644
new mode 100755
index 605fb1cfccf..9bd8735f4d2
--- a/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp
+++ b/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
old mode 100644
new mode 100755
index 264705c5ee0..b346f848510
--- a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
+++ b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
@@ -1,17 +1,18 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp
old mode 100644
new mode 100755
index 247a57c13fb..8de463d4afc
--- a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp
+++ b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp
@@ -1,17 +1,18 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/onyxias_lair.h b/src/server/scripts/Kalimdor/OnyxiasLair/onyxias_lair.h
old mode 100644
new mode 100755
index cadd5b5a2d5..9eccc6c42d1
--- a/src/server/scripts/Kalimdor/OnyxiasLair/onyxias_lair.h
+++ b/src/server/scripts/Kalimdor/OnyxiasLair/onyxias_lair.h
@@ -1,17 +1,18 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #ifndef DEF_ONYXIAS_LAIR_H
diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp
old mode 100644
new mode 100755
index 472909bad81..4157903bf75
--- a/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp
old mode 100644
new mode 100755
index e2568ff0a2e..6e67569f6d8
--- a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2010 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp
old mode 100644
new mode 100755
index 6cd7c8e6563..3eed9ee07f9
--- a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.h b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.h
old mode 100644
new mode 100755
index a67b4223c4a..53f33eb5cea
--- a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.h
+++ b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.h
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2010 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #ifndef DEF_RAZORFEN_DOWNS_H
diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp
old mode 100644
new mode 100755
index 0b127199af7..691462e595d
--- a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp
old mode 100644
new mode 100755
index 409928a6866..a2aa56fb2d2
--- a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.h b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.h
old mode 100644
new mode 100755
index 1bc69603c8a..3944a3300be
--- a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.h
+++ b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.h
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #ifndef DEF_RAZORFEN_KRAUL_H
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp
old mode 100644
new mode 100755
index 1aedc544f4c..9e1c4e1af53
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
old mode 100644
new mode 100755
index b949693652a..d8f6bece646
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp
old mode 100644
new mode 100755
index 1008b37d049..c1dba225462
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp
old mode 100644
new mode 100755
index 51c25be4264..361bb149ce7
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
old mode 100644
new mode 100755
index d5fc5f00030..9b4f0430c4a
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp
old mode 100644
new mode 100755
index f7c81d050dd..3346e57685f
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp
old mode 100644
new mode 100755
index 9703d7c26a7..26ac218e298
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.h b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.h
index 33fd75d557a..89fc66e686d 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.h
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
+
 #ifndef DEF_RUINS_OF_AHNQIRAJ_H
 #define DEF_RUINS_OF_AHNQIRAJ_H
 
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp
old mode 100644
new mode 100755
index c696e34248c..fe7a66ddb1f
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
old mode 100644
new mode 100755
index 7894f07dd94..40314e012e8
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp
old mode 100644
new mode 100755
index e6542176a0f..5bcc9598ebf
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp
old mode 100644
new mode 100755
index d7410adb522..468d535c48a
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp
old mode 100644
new mode 100755
index 16ac07f7b06..7a07c8f81a3
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp
old mode 100644
new mode 100755
index d64a7f9f70f..18bd1af71a5
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp
old mode 100644
new mode 100755
index 429d6cb645f..06b753bd5f5
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp
old mode 100644
new mode 100755
index 200ca446030..39938d64dc5
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp
old mode 100644
new mode 100755
index c5adee80baf..a6cb13c5348
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp
old mode 100644
new mode 100755
index 108d4304255..9f105e27a1d
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp
old mode 100644
new mode 100755
index 37a1a477de7..e0ce8834b6d
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h
old mode 100644
new mode 100755
index 8376a73f27c..143747e5b9d
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h
@@ -1,7 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software licensed under GPL version 2
- * Please see the included DOCS/LICENSE.TXT for more information */
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #ifndef DEF_TEMPLE_OF_AHNQIRAJ_H
 #define DEF_TEMPLE_OF_AHNQIRAJ_H
diff --git a/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp b/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp
old mode 100644
new mode 100755
index 9900410f527..6edcf9b72cf
--- a/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp
+++ b/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp
old mode 100644
new mode 100755
index 9af42029926..18efcbfdd04
--- a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp
+++ b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp
@@ -1,19 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 /* ScriptData
 SDName: Wailing Caverns
diff --git a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.h b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.h
old mode 100644
new mode 100755
index aa83e307100..9d69bf6947c
--- a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.h
+++ b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.h
@@ -1,7 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software licensed under GPL version 2
- * Please see the included DOCS/LICENSE.TXT for more information */
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #ifndef DEF_WAILING_CAVERNS_H
 #define DEF_WAILING_CAVERNS_H
diff --git a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp
old mode 100644
new mode 100755
index 5ddc3a3b53f..458111e464e
--- a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp
+++ b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp
@@ -1,19 +1,18 @@
  /*
- * Copyright (C) 2008-2010 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp
old mode 100644
new mode 100755
index 084a3f543c8..2b02146a6dc
--- a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp
+++ b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/ashenvale.cpp b/src/server/scripts/Kalimdor/ashenvale.cpp
old mode 100644
new mode 100755
index 23c439bd57d..1b64bd08437
--- a/src/server/scripts/Kalimdor/ashenvale.cpp
+++ b/src/server/scripts/Kalimdor/ashenvale.cpp
@@ -1,19 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 /* ScriptData
 SDName: Ashenvale
diff --git a/src/server/scripts/Kalimdor/azshara.cpp b/src/server/scripts/Kalimdor/azshara.cpp
old mode 100644
new mode 100755
index 6d10199b1da..656730f687f
--- a/src/server/scripts/Kalimdor/azshara.cpp
+++ b/src/server/scripts/Kalimdor/azshara.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/azuremyst_isle.cpp b/src/server/scripts/Kalimdor/azuremyst_isle.cpp
old mode 100644
new mode 100755
index dcc69b1f36f..131e91b65b3
--- a/src/server/scripts/Kalimdor/azuremyst_isle.cpp
+++ b/src/server/scripts/Kalimdor/azuremyst_isle.cpp
@@ -1,18 +1,19 @@
- /* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ /*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/bloodmyst_isle.cpp b/src/server/scripts/Kalimdor/bloodmyst_isle.cpp
old mode 100644
new mode 100755
index 074d9c3daed..9e8c7bbe563
--- a/src/server/scripts/Kalimdor/bloodmyst_isle.cpp
+++ b/src/server/scripts/Kalimdor/bloodmyst_isle.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/boss_azuregos.cpp b/src/server/scripts/Kalimdor/boss_azuregos.cpp
old mode 100644
new mode 100755
index 92b03418aa9..b8b40e3c510
--- a/src/server/scripts/Kalimdor/boss_azuregos.cpp
+++ b/src/server/scripts/Kalimdor/boss_azuregos.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/darkshore.cpp b/src/server/scripts/Kalimdor/darkshore.cpp
old mode 100644
new mode 100755
index 263203611fa..8cdb8990dbd
--- a/src/server/scripts/Kalimdor/darkshore.cpp
+++ b/src/server/scripts/Kalimdor/darkshore.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/desolace.cpp b/src/server/scripts/Kalimdor/desolace.cpp
old mode 100644
new mode 100755
index be099f909e5..f9f79ffc917
--- a/src/server/scripts/Kalimdor/desolace.cpp
+++ b/src/server/scripts/Kalimdor/desolace.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/durotar.cpp b/src/server/scripts/Kalimdor/durotar.cpp
old mode 100644
new mode 100755
index bbd9a352d9d..fd2ed655f05
--- a/src/server/scripts/Kalimdor/durotar.cpp
+++ b/src/server/scripts/Kalimdor/durotar.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2010 TrinityCore 
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #include "ScriptPCH.h"
 
diff --git a/src/server/scripts/Kalimdor/dustwallow_marsh.cpp b/src/server/scripts/Kalimdor/dustwallow_marsh.cpp
old mode 100644
new mode 100755
index 9b27e122663..a5190cbdd30
--- a/src/server/scripts/Kalimdor/dustwallow_marsh.cpp
+++ b/src/server/scripts/Kalimdor/dustwallow_marsh.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/felwood.cpp b/src/server/scripts/Kalimdor/felwood.cpp
old mode 100644
new mode 100755
index 3c029d34f4b..66757e0de36
--- a/src/server/scripts/Kalimdor/felwood.cpp
+++ b/src/server/scripts/Kalimdor/felwood.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/feralas.cpp b/src/server/scripts/Kalimdor/feralas.cpp
old mode 100644
new mode 100755
index d8bfc081124..86117e80616
--- a/src/server/scripts/Kalimdor/feralas.cpp
+++ b/src/server/scripts/Kalimdor/feralas.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/moonglade.cpp b/src/server/scripts/Kalimdor/moonglade.cpp
old mode 100644
new mode 100755
index 373137163f7..4fe0b3a5333
--- a/src/server/scripts/Kalimdor/moonglade.cpp
+++ b/src/server/scripts/Kalimdor/moonglade.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/mulgore.cpp b/src/server/scripts/Kalimdor/mulgore.cpp
old mode 100644
new mode 100755
index 0a92df106ed..ff06012cbf6
--- a/src/server/scripts/Kalimdor/mulgore.cpp
+++ b/src/server/scripts/Kalimdor/mulgore.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/orgrimmar.cpp b/src/server/scripts/Kalimdor/orgrimmar.cpp
old mode 100644
new mode 100755
index 8cb31d8a349..5dd273d9be4
--- a/src/server/scripts/Kalimdor/orgrimmar.cpp
+++ b/src/server/scripts/Kalimdor/orgrimmar.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/silithus.cpp b/src/server/scripts/Kalimdor/silithus.cpp
old mode 100644
new mode 100755
index 5814af10790..75c4e8d1158
--- a/src/server/scripts/Kalimdor/silithus.cpp
+++ b/src/server/scripts/Kalimdor/silithus.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/stonetalon_mountains.cpp b/src/server/scripts/Kalimdor/stonetalon_mountains.cpp
old mode 100644
new mode 100755
index 1cafc199cfb..17ad95c2cee
--- a/src/server/scripts/Kalimdor/stonetalon_mountains.cpp
+++ b/src/server/scripts/Kalimdor/stonetalon_mountains.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/tanaris.cpp b/src/server/scripts/Kalimdor/tanaris.cpp
old mode 100644
new mode 100755
index 6ef15cfc1f3..7ef9e5039d9
--- a/src/server/scripts/Kalimdor/tanaris.cpp
+++ b/src/server/scripts/Kalimdor/tanaris.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/teldrassil.cpp b/src/server/scripts/Kalimdor/teldrassil.cpp
old mode 100644
new mode 100755
index e495f23abf9..a6659dcd6d9
--- a/src/server/scripts/Kalimdor/teldrassil.cpp
+++ b/src/server/scripts/Kalimdor/teldrassil.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/the_barrens.cpp b/src/server/scripts/Kalimdor/the_barrens.cpp
old mode 100644
new mode 100755
index 87fcc9e71ed..258ab475c84
--- a/src/server/scripts/Kalimdor/the_barrens.cpp
+++ b/src/server/scripts/Kalimdor/the_barrens.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/thousand_needles.cpp b/src/server/scripts/Kalimdor/thousand_needles.cpp
old mode 100644
new mode 100755
index 528cd8d1c49..6aded229ddd
--- a/src/server/scripts/Kalimdor/thousand_needles.cpp
+++ b/src/server/scripts/Kalimdor/thousand_needles.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/thunder_bluff.cpp b/src/server/scripts/Kalimdor/thunder_bluff.cpp
old mode 100644
new mode 100755
index 835346f90c5..71c2c174fc7
--- a/src/server/scripts/Kalimdor/thunder_bluff.cpp
+++ b/src/server/scripts/Kalimdor/thunder_bluff.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Kalimdor/ungoro_crater.cpp b/src/server/scripts/Kalimdor/ungoro_crater.cpp
old mode 100644
new mode 100755
index 3e6ea803333..19181ba570f
--- a/src/server/scripts/Kalimdor/ungoro_crater.cpp
+++ b/src/server/scripts/Kalimdor/ungoro_crater.cpp
@@ -1,19 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 /* ScriptData
 SDName: Ungoro Crater
diff --git a/src/server/scripts/Kalimdor/winterspring.cpp b/src/server/scripts/Kalimdor/winterspring.cpp
old mode 100644
new mode 100755
index 4eb4746c910..c07f80b7c91
--- a/src/server/scripts/Kalimdor/winterspring.cpp
+++ b/src/server/scripts/Kalimdor/winterspring.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h
old mode 100644
new mode 100755
index 4113885b6f4..d936d6a8c90
--- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h
+++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2009 - 2010 TrinityCore 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #ifndef DEF_AZJOL_NERUB_H
diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp
old mode 100644
new mode 100755
index f9b02694b2f..a428cc6a856
--- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp
@@ -1,20 +1,19 @@
 /*
-* Copyright (C) 2009 - 2010 TrinityCore 
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #include "ScriptPCH.h"
 #include "azjol_nerub.h"
diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
old mode 100644
new mode 100755
index 20c6c896502..088b39bce03
--- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2009 - 2010 TrinityCore 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /*
diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp
old mode 100644
new mode 100755
index d979c7c23de..96707cead16
--- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2009 - 2010 TrinityCore 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /*
diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp
old mode 100644
new mode 100755
index f3eb6e14978..90f96b21af3
--- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2009 - 2010 TrinityCore 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/ahnkahet.h b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/ahnkahet.h
old mode 100644
new mode 100755
index 240ad77c74d..f324344228a
--- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/ahnkahet.h
+++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/ahnkahet.h
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2009 - 2010 TrinityCore 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #ifndef DEF_AHNKAHET_H
diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp
old mode 100644
new mode 100755
index 2c667b4f367..c1c4427a63c
--- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp
@@ -1,20 +1,19 @@
 /*
-* Copyright (C) 2009 - 2010 TrinityCore 
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 /*
  * Comment:  Find correct mushrooms spell to make them visible - buffs of the mushrooms not ever applied to the users...
diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp
old mode 100644
new mode 100755
index d7a10e1cfa1..b25b62573d4
--- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp
@@ -1,20 +1,19 @@
 /*
-* Copyright (C) 2009 - 2010 TrinityCore 
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #include "ScriptPCH.h"
 #include "ahnkahet.h"
diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp
old mode 100644
new mode 100755
index a4384f0f174..f020e16cb96
--- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp
@@ -1,20 +1,19 @@
 /*
-* Copyright (C) 2009 - 2010 TrinityCore 
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 /*
  * Comment: Missing AI for Twisted Visages
diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp
old mode 100644
new mode 100755
index db330950f93..5c39cc122b6
--- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp
@@ -1,20 +1,19 @@
 /*
-* Copyright (C) 2009 - 2010 TrinityCore 
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 /*
  * Comment: Complete - BUT THE TRIGGER NEEDS DATA WHETHER THE PRISON OF TALDARAM IS OFFLINE !
diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp
old mode 100644
new mode 100755
index f152ad7abd3..a3ce654bc76
--- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2009 - 2010 TrinityCore 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp
old mode 100644
new mode 100755
index e4c7d553e42..7d3fa8d5fba
--- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp
@@ -1,20 +1,19 @@
 /*
-* Copyright (C) 2009 - 2010 TrinityCore 
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #include "ScriptPCH.h"
 #include "ahnkahet.h"
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp
old mode 100644
new mode 100755
index a0ad5c39ded..adc3449862b
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2009 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp
old mode 100644
new mode 100755
index b7cbda45ddb..14b44079719
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2010 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp
old mode 100644
new mode 100755
index db7487c7d04..53b71a5760e
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
-* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp
old mode 100644
new mode 100755
index 8e76b59a12a..45cab67c0f4
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2010 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp
old mode 100644
new mode 100755
index 4d43efb3c4c..0ebe340a691
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2010 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h
old mode 100644
new mode 100755
index 714f008f912..5533a4a8690
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h
@@ -1,7 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
-* This program is free software licensed under GPL version 2
-* Please see the included DOCS/LICENSE.TXT for more information */
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #ifndef DEF_TOC_H
 #define DEF_TOC_H
diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp
old mode 100644
new mode 100755
index 56438174629..a7f0cdc3a2f
--- a/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp
+++ b/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2008 - 2010 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /*
diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp
old mode 100644
new mode 100755
index d25ddaf490d..c18b7deb272
--- a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp
+++ b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp
@@ -1,20 +1,19 @@
 /*
-* Copyright (C) 2008 - 2010 TrinityCore 
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #include "ScriptPCH.h"
 #include "drak_tharon_keep.h"
diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp
old mode 100644
new mode 100755
index f0c0e188a10..363ee5ad89c
--- a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp
+++ b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp
@@ -1,20 +1,19 @@
 /*
-* Copyright (C) 2008-2010 Trinity 
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #include "ScriptPCH.h"
 #include "drak_tharon_keep.h"
diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp
old mode 100644
new mode 100755
index 9545863121e..deae70bfd08
--- a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp
+++ b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2008-2010 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /*
diff --git a/src/server/scripts/Northrend/DraktharonKeep/drak_tharon_keep.h b/src/server/scripts/Northrend/DraktharonKeep/drak_tharon_keep.h
old mode 100644
new mode 100755
index 597971d17dd..11e6f1557db
--- a/src/server/scripts/Northrend/DraktharonKeep/drak_tharon_keep.h
+++ b/src/server/scripts/Northrend/DraktharonKeep/drak_tharon_keep.h
@@ -1,20 +1,19 @@
 /*
-* Copyright (C) 2008 - 2010 TrinityCore 
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #ifndef DEF_DRAK_THARON_H
 #define DEF_DRAK_THARON_H
diff --git a/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp b/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp
old mode 100644
new mode 100755
index ab322e4efdf..2c36217755d
--- a/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp
+++ b/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2008-2010 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
old mode 100644
new mode 100755
index 21cbd7c6942..6ac11c81e2d
--- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
@@ -1,17 +1,18 @@
-/* Copyright (C) 2008 - 2010 TrinityCore 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
old mode 100644
new mode 100755
index 4c54c83d764..13d65619a13
--- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
@@ -1,17 +1,18 @@
-/* Copyright (C) 2008 - 2010 TrinityCore 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp
old mode 100644
new mode 100755
index b4edf3c36ed..0e0c22c9b10
--- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp
@@ -1,17 +1,18 @@
-/* Copyright (C) 2008 - 2010 TrinityCore 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h
old mode 100644
new mode 100755
index f33347b4466..df2c682eaa1
--- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h
+++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h
@@ -1,17 +1,18 @@
-/* Copyright (C) 2008 - 2010 TrinityCore 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #ifndef DEF_FORGE_OF_SOULS_H
diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp
old mode 100644
new mode 100755
index 72139b89256..074a9d40915
--- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp
@@ -1,17 +1,18 @@
-/* Copyright (C) 2008 - 2010 TrinityCore 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp
index 63dfb565440..ddb6191c999 100644
--- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp
@@ -1,17 +1,18 @@
-/* Copyright (C) 2008 - 2010 TrinityCore 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp
old mode 100644
new mode 100755
index 45ebb86dc83..47af8fd19c0
--- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp
@@ -1,17 +1,18 @@
-/* Copyright (C) 2008 - 2010 TrinityCore 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
index 787b969bbf1..65f326e924f 100644
--- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
@@ -1,17 +1,18 @@
-/* Copyright (C) 2008 - 2010 TrinityCore 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h
index 43efe19ef9c..0e4dc94b826 100644
--- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h
+++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h
@@ -1,17 +1,18 @@
-/* Copyright (C) 2008 - 2010 TrinityCore 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #ifndef DEF_HALLS_OF_REFLECTION_H
diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
index fb88704ca46..8a6ffb82fc2 100644
--- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
@@ -1,17 +1,18 @@
-/* Copyright (C) 2008 - 2010 TrinityCore 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp
old mode 100644
new mode 100755
index a46aef2d592..e854c767f63
--- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp
@@ -1,17 +1,18 @@
-/* Copyright (C) 2008 - 2010 TrinityCore 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
old mode 100644
new mode 100755
index d6179274160..961451051a7
--- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
@@ -1,17 +1,18 @@
-/* Copyright (C) 2008 - 2010 TrinityCore 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp
old mode 100644
new mode 100755
index f188057dca6..6f45c3ef76f
--- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp
@@ -1,17 +1,18 @@
-/* Copyright (C) 2008 - 2010 TrinityCore 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp
old mode 100644
new mode 100755
index f8002e075a8..595b5d01228
--- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp
@@ -1,17 +1,18 @@
-/* Copyright (C) 2008 - 2010 TrinityCore 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp
old mode 100644
new mode 100755
index f9390ac2582..b9b8504fcf0
--- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp
@@ -1,17 +1,18 @@
-/* Copyright (C) 2008 - 2010 TrinityCore 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h
old mode 100644
new mode 100755
index 9a52fb6698c..98ee73a6fe8
--- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h
+++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h
@@ -1,17 +1,18 @@
-/* Copyright (C) 2008 - 2010 TrinityCore 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #ifndef DEF_PIT_OF_SARON_H
diff --git a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp
old mode 100644
new mode 100755
index 7a11c33c254..73b88a870f4
--- a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp
+++ b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2009 - 2010 TrinityCore 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /*
diff --git a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp
old mode 100644
new mode 100755
index d0b590736d7..f4b87cd1ee0
--- a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp
+++ b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp
@@ -1,20 +1,19 @@
 /*
-* Copyright (C) 2009 - 2010 TrinityCore 
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #include "ScriptPCH.h"
 #include "gundrak.h"
diff --git a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp
old mode 100644
new mode 100755
index 170da3c9820..dae642f68af
--- a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp
+++ b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp
@@ -1,20 +1,19 @@
 /*
-* Copyright (C) 2009 - 2010 TrinityCore 
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #include "ScriptPCH.h"
 #include "gundrak.h"
diff --git a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp
old mode 100644
new mode 100755
index 7d4b6e9b09b..388efc70e56
--- a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp
+++ b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp
@@ -1,20 +1,19 @@
 /*
-* Copyright (C) 2009 - 2010 TrinityCore 
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #include "ScriptPCH.h"
 #include "gundrak.h"
diff --git a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp
old mode 100644
new mode 100755
index ddb6732ac3e..56d8c6f1857
--- a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp
+++ b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp
@@ -1,20 +1,19 @@
 /*
-* Copyright (C) 2009 - 2010 TrinityCore 
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #include "ScriptPCH.h"
 #include "gundrak.h"
diff --git a/src/server/scripts/Northrend/Gundrak/gundrak.h b/src/server/scripts/Northrend/Gundrak/gundrak.h
old mode 100644
new mode 100755
index a443aa4e698..c6858b8930c
--- a/src/server/scripts/Northrend/Gundrak/gundrak.h
+++ b/src/server/scripts/Northrend/Gundrak/gundrak.h
@@ -1,20 +1,19 @@
 /*
-* Copyright (C) 2009 - 2010 TrinityCore 
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #ifndef DEF_GUNDRAK_H
 #define DEF_GUNDRAK_H
diff --git a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp
old mode 100644
new mode 100755
index f7f555098eb..6ca2e0886c6
--- a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp
+++ b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp
@@ -1,20 +1,19 @@
 /*
-* Copyright (C) 2009 - 2010 TrinityCore 
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #include "ScriptPCH.h"
 #include "gundrak.h"
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp
old mode 100644
new mode 100755
index 349f39b24fd..567f1f01c4d
--- a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2008 - 2010 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp
old mode 100644
new mode 100755
index 7f66788c32e..b6a3760e6b6
--- a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2008 - 2010 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
old mode 100644
new mode 100755
index 32a6683366e..d04180aa037
--- a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2008 - 2010 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp
old mode 100644
new mode 100755
index 4eee9f03f60..a91fa207df7
--- a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2008 - 2010 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
old mode 100644
new mode 100755
index 2b3a0daad17..4fcf902714c
--- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2008 - 2010 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp
old mode 100644
new mode 100755
index 1e68ea07418..1d96a2d70ab
--- a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2008 - 2010 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp
old mode 100644
new mode 100755
index 7d24be22bb6..00b6f498ce0
--- a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2008 - 2010 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
old mode 100644
new mode 100755
index dc750268dfc..5188ab14d2f
--- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp
old mode 100644
new mode 100755
index 5c5808f795d..c22bf236ec3
--- a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2008 - 2010 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp
old mode 100644
new mode 100755
index 29c1eac6a6d..b7a61ad0aca
--- a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2008 - 2010 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp
old mode 100644
new mode 100755
index 62a4d60d20b..6b93e5ea19d
--- a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2008 - 2010 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp
old mode 100644
new mode 100755
index a65b164648b..bd30cb20471
--- a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2008 - 2010 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp
old mode 100644
new mode 100755
index f76ba34a6c8..12d5b3057f5
--- a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2008 - 2010 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp
old mode 100644
new mode 100755
index 88fccbce899..a646e6d8412
--- a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2008 - 2010 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp
old mode 100644
new mode 100755
index 01f80119fea..9d224f01022
--- a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2008 - 2010 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
old mode 100644
new mode 100755
index 41b6ad9a304..6ece32054ae
--- a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
@@ -1,17 +1,18 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/Naxxramas/naxxramas.h b/src/server/scripts/Northrend/Naxxramas/naxxramas.h
old mode 100644
new mode 100755
index 9b1fac2ff5b..d4e67ce1b81
--- a/src/server/scripts/Northrend/Naxxramas/naxxramas.h
+++ b/src/server/scripts/Northrend/Naxxramas/naxxramas.h
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2008 - 2010 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #ifndef DEF_NAXXRAMAS_H
diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
index 0b0712074c6..71e8ad69ff4 100644
--- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
+++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
+
 /* Script Data Start
 SDName: Boss malygos
 SDAuthor: LordVanMartin
diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/eye_of_eternity.h b/src/server/scripts/Northrend/Nexus/EyeOfEternity/eye_of_eternity.h
index caa82a92e95..e56f760cb83 100644
--- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/eye_of_eternity.h
+++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/eye_of_eternity.h
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
+
 #ifndef DEF_EYE_OF_ETERNITY_H
 #define DEF_EYE_OF_ETERNITY_H
 
diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
index 227fa6f7f17..e8ba3c89a67 100644
--- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
+++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
+
 #include "ScriptPCH.h"
 #include "eye_of_eternity.h"
 
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
old mode 100644
new mode 100755
index 21d10dec5c1..2aa150bec76
--- a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
@@ -1,19 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * Copyright (C) 2008 - 2010 TrinityCore 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp
old mode 100644
new mode 100755
index 293ba967410..b3db17167b6
--- a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp
@@ -1,19 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * Copyright (C) 2008 - 2010 TrinityCore 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
old mode 100644
new mode 100755
index f9abf8011ce..dbcb1dc2a58
--- a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
@@ -1,19 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * Copyright (C) 2008 - 2010 TrinityCore 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp
old mode 100644
new mode 100755
index 4482b37992e..dffdbf8d20d
--- a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp
@@ -1,19 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * Copyright (C) 2008 - 2010 TrinityCore 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/commander_kolurg.cpp b/src/server/scripts/Northrend/Nexus/Nexus/commander_kolurg.cpp
index aa1e136bb29..2a95007a477 100644
--- a/src/server/scripts/Northrend/Nexus/Nexus/commander_kolurg.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/commander_kolurg.cpp
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
+
 /* Script Data Start
 SDName: Boss Commander Kolurg
 SDAuthor: LordVanMartin
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/commander_stoutbeard.cpp b/src/server/scripts/Northrend/Nexus/Nexus/commander_stoutbeard.cpp
index 068d19461af..a4e8f9559ce 100644
--- a/src/server/scripts/Northrend/Nexus/Nexus/commander_stoutbeard.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/commander_stoutbeard.cpp
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
+
 /* Script Data Start
 SDName: Boss Commander Stoutbeard
 SDAuthor: LordVanMartin
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp
old mode 100644
new mode 100755
index 601b667aa0b..356a7eab12f
--- a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp
@@ -1,19 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * Copyright (C) 2008 - 2010 TrinityCore 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/nexus.h b/src/server/scripts/Northrend/Nexus/Nexus/nexus.h
old mode 100644
new mode 100755
index 66902bece30..237f5db46f5
--- a/src/server/scripts/Northrend/Nexus/Nexus/nexus.h
+++ b/src/server/scripts/Northrend/Nexus/Nexus/nexus.h
@@ -1,17 +1,18 @@
-/* Copyright (C) 2008 - 2010 TrinityCore 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #ifndef DEF_NEXUS_H
diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp
old mode 100644
new mode 100755
index 04ab66ad534..00de292678d
--- a/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp
+++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 TrinityCore 
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #include "ScriptPCH.h"
 #include "oculus.h"
diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp
old mode 100644
new mode 100755
index 6c1d4cae425..cde22d0268c
--- a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp
+++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 TrinityCore 
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #include "ScriptPCH.h"
 #include "oculus.h"
diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp
old mode 100644
new mode 100755
index 2a0d432177a..4333102c540
--- a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp
+++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 TrinityCore 
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 /* ScriptData
 SDName: Urom
diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp
old mode 100644
new mode 100755
index dea7cddc5c8..1a67d07dcb0
--- a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp
+++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 TrinityCore 
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #include "ScriptPCH.h"
 #include "oculus.h"
diff --git a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp
old mode 100644
new mode 100755
index 233a1047104..bc1ce7f58dd
--- a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp
+++ b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 TrinityCore 
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #include "ScriptPCH.h"
 #include "oculus.h"
diff --git a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp
old mode 100644
new mode 100755
index d13c036856a..b3572bd92ff
--- a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp
+++ b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 TrinityCore 
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #include "ScriptPCH.h"
 #include "oculus.h"
diff --git a/src/server/scripts/Northrend/Nexus/Oculus/oculus.h b/src/server/scripts/Northrend/Nexus/Oculus/oculus.h
index b212c9b8b6a..8228cd10754 100644
--- a/src/server/scripts/Northrend/Nexus/Oculus/oculus.h
+++ b/src/server/scripts/Northrend/Nexus/Oculus/oculus.h
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
+
 #ifndef DEF_OCULUS_H
 #define DEF_OCULUS_H
 
diff --git a/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp
index 4992e325849..70773e6258e 100644
--- a/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp
+++ b/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp
@@ -1,17 +1,18 @@
-/* Copyright (C) 2009 - 2010 TrinityCore 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/ObsidianSanctum/instance_obsidian_sanctum.cpp b/src/server/scripts/Northrend/ObsidianSanctum/instance_obsidian_sanctum.cpp
index a8e1d159626..4cb38db3a28 100644
--- a/src/server/scripts/Northrend/ObsidianSanctum/instance_obsidian_sanctum.cpp
+++ b/src/server/scripts/Northrend/ObsidianSanctum/instance_obsidian_sanctum.cpp
@@ -1,17 +1,18 @@
-/* Copyright (C) 2009 - 2010 TrinityCore 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/ObsidianSanctum/obsidian_sanctum.h b/src/server/scripts/Northrend/ObsidianSanctum/obsidian_sanctum.h
index 6809d1bbfdc..43825d04f47 100644
--- a/src/server/scripts/Northrend/ObsidianSanctum/obsidian_sanctum.h
+++ b/src/server/scripts/Northrend/ObsidianSanctum/obsidian_sanctum.h
@@ -1,17 +1,18 @@
-/* Copyright (C) 2009 - 2010 TrinityCore 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #ifndef DEF_OBSIDIAN_SANCTUM_H
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp
old mode 100644
new mode 100755
index ab21760bed8..aa0be07d7bd
--- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp
old mode 100644
new mode 100755
index 36f555eb9f0..49863dab607
--- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp
@@ -1,19 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * Copyright (C) 2008 - 2010 TrinityCore 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /*
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp
old mode 100644
new mode 100755
index 4d55554e552..e0a55a79ccd
--- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp
old mode 100644
new mode 100755
index 735d91a5f54..cb5878defb3
--- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h
old mode 100644
new mode 100755
index b8b220a2aa2..2c270d5796e
--- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h
@@ -1,7 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software licensed under GPL version 2
- * Please see the included DOCS/LICENSE.TXT for more information */
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #ifndef DEF_HALLS_OF_LIGHTNING_H
 #define DEF_HALLS_OF_LIGHTNING_H
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp
old mode 100644
new mode 100755
index f867314fd3c..8dbcf8da23f
--- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp
index 071bc8d01ad..63b1de56c38 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
+
 /* Script Data Start
 SDName: Boss krystallus
 SDAuthor: LordVanMartin
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp
index cc3803b3ea2..e7fde3dcea7 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
+
 /* Script Data Start
 SDName: Boss maiden_of_grief
 SDAuthor: LordVanMartin
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp
index f8fdacffcbe..1cab83db949 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
+
 /* Script Data Start
 SDName: Boss sjonnir
 SDAuthor: LordVanMartin
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp
index 0e14bc7dad6..d7e7f495cfb 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
+
 #include "ScriptPCH.h"
 #include "ScriptedEscortAI.h"
 #include "halls_of_stone.h"
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.h b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.h
index b61e7057ddc..06a405390d2 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.h
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.h
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
+
 #ifndef DEF_HALLS_OF_STONE_H
 #define DEF_HALLS_OF_STONE_H
 enum Data
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp
index 1989195c741..e4bbcdd9690 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
+
 #include "ScriptPCH.h"
 #include "halls_of_stone.h"
 
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp
old mode 100644
new mode 100755
index f4e109deb7a..5019bb29d21
--- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2008 - 2010 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp
old mode 100644
new mode 100755
index 7b1cf21cebe..98fac4f80d2
--- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2008 - 2010 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_auriaya.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_auriaya.cpp
old mode 100644
new mode 100755
index 4f7d541c087..da3d671eb6d
--- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_auriaya.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_auriaya.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2008 - 2010 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp
old mode 100644
new mode 100755
index adbd764e845..0d462097213
--- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp
@@ -1,27 +1,26 @@
 /*
-* Copyright (C) 2008 - 2010 TrinityCore 
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 /*
-* Comment: there is missing code on triggers,
-*          brann bronzebeard needs correct gossip info.
-*          requires more work involving area triggers.
-*          if reached brann speaks through his radio..
-*/
+ * Comment: there is missing code on triggers,
+ *          brann bronzebeard needs correct gossip info.
+ *          requires more work involving area triggers.
+ *          if reached brann speaks through his radio..
+ */
 
 #include "ScriptPCH.h"
 #include "ScriptedEscortAI.h"
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_freya.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_freya.cpp
old mode 100644
new mode 100755
index 5dbacf060ea..df1298eb3b7
--- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_freya.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_freya.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2008 - 2010 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_general_vezax.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_general_vezax.cpp
old mode 100644
new mode 100755
index 78431ae007d..7b573864ee0
--- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_general_vezax.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_general_vezax.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2008 - 2010 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_hodir.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_hodir.cpp
old mode 100644
new mode 100755
index 7b35e4c182e..b43dbe82b60
--- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_hodir.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_hodir.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2008 - 2010 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp
old mode 100644
new mode 100755
index 04ae00d1a6d..ac5414eaedf
--- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2008 - 2010 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp
old mode 100644
new mode 100755
index a0c3844079c..710484de42c
--- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2008 - 2010 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_mimiron.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_mimiron.cpp
old mode 100644
new mode 100755
index 6a1c3fa7c22..85fab4d67db
--- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_mimiron.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_mimiron.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2008 - 2010 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp
old mode 100644
new mode 100755
index f13b05bcab9..bf4ddae9e99
--- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2008 - 2010 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_thorim.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_thorim.cpp
old mode 100644
new mode 100755
index 36d52e55ac4..a508457e62a
--- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_thorim.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_thorim.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2008 - 2010 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp
old mode 100644
new mode 100755
index 958ad6a053c..600bb41a469
--- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2008 - 2010 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /*
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_yoggsaron.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_yoggsaron.cpp
old mode 100644
new mode 100755
index 698e61c39c2..57c0008536b
--- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_yoggsaron.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_yoggsaron.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2008 - 2010 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp
old mode 100644
new mode 100755
index ab4befd00f1..27f59ebb835
--- a/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2008 - 2010 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/ulduar.h b/src/server/scripts/Northrend/Ulduar/ulduar/ulduar.h
old mode 100644
new mode 100755
index 7b54bacbbe0..a6d1271ce0e
--- a/src/server/scripts/Northrend/Ulduar/ulduar/ulduar.h
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/ulduar.h
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2008 - 2010 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #ifndef DEF_ULDUAR_H
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/ulduar_teleporter.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/ulduar_teleporter.cpp
old mode 100644
new mode 100755
index 5ba9596e884..102cb69a3b1
--- a/src/server/scripts/Northrend/Ulduar/ulduar/ulduar_teleporter.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/ulduar_teleporter.cpp
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
+
 #include "ScriptPCH.h"
 #include "ulduar.h"
 
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
old mode 100644
new mode 100755
index d85eb29742c..bc2270cf79f
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2009 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp
old mode 100644
new mode 100755
index 0f65f751b20..31274403c0e
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2009 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp
old mode 100644
new mode 100755
index d83a5bcd181..02fc594b74a
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2009 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp
old mode 100644
new mode 100755
index 3e39de32fba..1a45b18326c
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2009 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp
old mode 100644
new mode 100755
index 0f8beee4961..4ee2059712d
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2009 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h
old mode 100644
new mode 100755
index b630e156564..f65c54f540c
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2009 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #ifndef DEF_UTGARDE_KEEP_H
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp
index 737a4c97c78..af20d156c15 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
+
 /* Script Data Start
 SDName: Boss palehoof
 SDAuthor: LordVanMartin
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
old mode 100644
new mode 100755
index ea31628ef93..2bea610891e
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
@@ -1,17 +1,18 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* Script Data Start
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
old mode 100644
new mode 100755
index 16466201a0a..0367cb760cb
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
@@ -1,17 +1,18 @@
-/* Copyright (C) 2008 - 2010 TrinityCore 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp
index 18555bb2342..62d297396ac 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
+
 /* Script Data Start
 SDName: Boss ymiron
 SDAuthor: LordVanMartin
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp
index 7c2a1db1421..dbbd7b058f2 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
+
 #include "ScriptPCH.h"
 #include "utgarde_pinnacle.h"
 
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h
index a51d7aceda0..4592cb2f335 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
+
 #ifndef DEF_PINNACLE_H
 #define DEF_PINNACLE_H
 
diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp
old mode 100644
new mode 100755
index d665b8c4aa4..124a8f0b8b8
--- a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp
+++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2009-2010 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /*** SQL START ***
diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp
old mode 100644
new mode 100755
index b60117f9c07..6757d28a208
--- a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp
+++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2009-2010 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp
old mode 100644
new mode 100755
index bb854b2bf9f..f8bc8295f21
--- a/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp
+++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2009-2010 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /*** SQL START ***
diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp
old mode 100644
new mode 100755
index fa89c0a93f2..eddf62700fe
--- a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp
+++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2009-2010 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /*** SQL START ***
diff --git a/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp
index 4fd82a2881c..e7449acafb4 100644
--- a/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp
+++ b/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
+
 #include "ScriptPCH.h"
 #include "vault_of_archavon.h"
 
diff --git a/src/server/scripts/Northrend/VaultOfArchavon/vault_of_archavon.h b/src/server/scripts/Northrend/VaultOfArchavon/vault_of_archavon.h
index 6aa642ff701..1885235359e 100644
--- a/src/server/scripts/Northrend/VaultOfArchavon/vault_of_archavon.h
+++ b/src/server/scripts/Northrend/VaultOfArchavon/vault_of_archavon.h
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
+
 #ifndef DEF_ARCHAVON_H
 #define DEF_ARCHAVON_H
 
diff --git a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp
old mode 100644
new mode 100755
index 487b7b4c500..8e760ba00c6
--- a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2009 - 2010 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp
old mode 100644
new mode 100755
index 473eabda14f..d25f87ca230
--- a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2009 - 2010 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp
old mode 100644
new mode 100755
index 26e5aedaf62..fe216d8db4e
--- a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2009 - 2010 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp
old mode 100644
new mode 100755
index a4055b3cba1..7a86fedf849
--- a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2009 - 2010 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp
old mode 100644
new mode 100755
index 5c59d8d0f65..0abcbbf720c
--- a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2009 - 2010 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp
old mode 100644
new mode 100755
index 20e6a5836fd..8fb3f200852
--- a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2009 - 2010 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp
old mode 100644
new mode 100755
index 6257755edb8..ebe703aae38
--- a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2009 - 2010 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
old mode 100644
new mode 100755
index b3625d68ed7..e8fbe46507c
--- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
+++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2009 - 2010 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp
old mode 100644
new mode 100755
index 982a15a4172..1267ede8be6
--- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp
+++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2009 - 2010 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.h b/src/server/scripts/Northrend/VioletHold/violet_hold.h
old mode 100644
new mode 100755
index f30b4c50ead..0d55b9bfae8
--- a/src/server/scripts/Northrend/VioletHold/violet_hold.h
+++ b/src/server/scripts/Northrend/VioletHold/violet_hold.h
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2009 - 2010 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #ifndef DEF_VIOLET_HOLD_H
diff --git a/src/server/scripts/Northrend/borean_tundra.cpp b/src/server/scripts/Northrend/borean_tundra.cpp
old mode 100644
new mode 100755
index 058a464f4b8..760750fece7
--- a/src/server/scripts/Northrend/borean_tundra.cpp
+++ b/src/server/scripts/Northrend/borean_tundra.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Northrend/crystalsong_forest.cpp b/src/server/scripts/Northrend/crystalsong_forest.cpp
old mode 100644
new mode 100755
index 80130021ea7..e8743b92db4
--- a/src/server/scripts/Northrend/crystalsong_forest.cpp
+++ b/src/server/scripts/Northrend/crystalsong_forest.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2010 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* Script Data Start
diff --git a/src/server/scripts/Northrend/dalaran.cpp b/src/server/scripts/Northrend/dalaran.cpp
old mode 100644
new mode 100755
index 69d870f2e30..b0dbd17559d
--- a/src/server/scripts/Northrend/dalaran.cpp
+++ b/src/server/scripts/Northrend/dalaran.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2009 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* Script Data Start
diff --git a/src/server/scripts/Northrend/dragonblight.cpp b/src/server/scripts/Northrend/dragonblight.cpp
old mode 100644
new mode 100755
index 0de8a5c5b7e..f79deb594b0
--- a/src/server/scripts/Northrend/dragonblight.cpp
+++ b/src/server/scripts/Northrend/dragonblight.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Northrend/grizzly_hills.cpp b/src/server/scripts/Northrend/grizzly_hills.cpp
old mode 100644
new mode 100755
index 43afd1f2ce4..bb0971c8904
--- a/src/server/scripts/Northrend/grizzly_hills.cpp
+++ b/src/server/scripts/Northrend/grizzly_hills.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Northrend/howling_fjord.cpp b/src/server/scripts/Northrend/howling_fjord.cpp
old mode 100644
new mode 100755
index d0335b4e4c6..7b2fb06986e
--- a/src/server/scripts/Northrend/howling_fjord.cpp
+++ b/src/server/scripts/Northrend/howling_fjord.cpp
@@ -1,18 +1,18 @@
-/* Copyright (C) 2008-2010 Trinity 
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Northrend/icecrown.cpp b/src/server/scripts/Northrend/icecrown.cpp
old mode 100644
new mode 100755
index 5a3b5953af4..a40d363eeb8
--- a/src/server/scripts/Northrend/icecrown.cpp
+++ b/src/server/scripts/Northrend/icecrown.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Northrend/sholazar_basin.cpp b/src/server/scripts/Northrend/sholazar_basin.cpp
old mode 100644
new mode 100755
index bbeee45a0d8..cae5012eb3a
--- a/src/server/scripts/Northrend/sholazar_basin.cpp
+++ b/src/server/scripts/Northrend/sholazar_basin.cpp
@@ -1,18 +1,18 @@
-/* Copyright (C) 2008-2010 Trinity 
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Northrend/storm_peaks.cpp b/src/server/scripts/Northrend/storm_peaks.cpp
old mode 100644
new mode 100755
index 306dd44f7c1..bcc846be1dc
--- a/src/server/scripts/Northrend/storm_peaks.cpp
+++ b/src/server/scripts/Northrend/storm_peaks.cpp
@@ -1,18 +1,18 @@
-/* Copyright (C) 2008-2010 Trinity 
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Northrend/zuldrak.cpp b/src/server/scripts/Northrend/zuldrak.cpp
old mode 100644
new mode 100755
index da1a21011b4..b1574b21f6b
--- a/src/server/scripts/Northrend/zuldrak.cpp
+++ b/src/server/scripts/Northrend/zuldrak.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2009 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ScriptPCH.h"
diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp
old mode 100644
new mode 100755
index 682903889ec..353da092dba
--- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp
+++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp
old mode 100644
new mode 100755
index fb2c7b4567a..6c584e16744
--- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp
+++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp
old mode 100644
new mode 100755
index 56d9f24f419..d38c6d03662
--- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp
old mode 100644
new mode 100755
index a169863aaa1..da9c0c4a520
--- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp
old mode 100644
new mode 100755
index c76ac41761b..4a76d46904d
--- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp
+++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp
old mode 100644
new mode 100755
index b0ec79cc5a0..83cf669824f
--- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp
+++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp
old mode 100644
new mode 100755
index d8ec3faed02..884e71e7c36
--- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp
+++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h b/src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h
old mode 100644
new mode 100755
index b4ed1817fcf..a1cbc7ce61f
--- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h
+++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h
@@ -1,7 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software licensed under GPL version 2
- * Please see the included DOCS/LICENSE.TXT for more information */
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #ifndef DEF_SETHEKK_HALLS_H
 #define DEF_SETHEKK_HALLS_H
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp
old mode 100644
new mode 100755
index bc94c9ec5a7..f039b7c7fab
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
old mode 100644
new mode 100755
index 0b4928a640f..817b71200f0
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp
old mode 100644
new mode 100755
index 937741e37ed..4234c0c1271
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp
old mode 100644
new mode 100755
index b903ce832cb..ef6565bb7cf
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp
old mode 100644
new mode 100755
index 5f8452cb1ef..b5b917547a6
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h
old mode 100644
new mode 100755
index 0bea027f466..4bbdbd76c59
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h
@@ -1,7 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software licensed under GPL version 2
- * Please see the included DOCS/LICENSE.TXT for more information */
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #ifndef DEF_SHADOW_LABYRINTH_H
 #define DEF_SHADOW_LABYRINTH_H
diff --git a/src/server/scripts/Outland/BlackTemple/black_temple.cpp b/src/server/scripts/Outland/BlackTemple/black_temple.cpp
old mode 100644
new mode 100755
index b280839bdef..bae84641086
--- a/src/server/scripts/Outland/BlackTemple/black_temple.cpp
+++ b/src/server/scripts/Outland/BlackTemple/black_temple.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/BlackTemple/black_temple.h b/src/server/scripts/Outland/BlackTemple/black_temple.h
old mode 100644
new mode 100755
index 83733892988..52ee510efd0
--- a/src/server/scripts/Outland/BlackTemple/black_temple.h
+++ b/src/server/scripts/Outland/BlackTemple/black_temple.h
@@ -1,7 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software licensed under GPL version 2
- * Please see the included DOCS/LICENSE.TXT for more information */
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #ifndef DEF_BLACK_TEMPLE_H
 #define DEF_BLACK_TEMPLE_H
diff --git a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp
old mode 100644
new mode 100755
index 4695c5873ff..b7fee842206
--- a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
old mode 100644
new mode 100755
index 247230aacee..7af3aba92f9
--- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
@@ -1,19 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 /* ScriptData
 SDName: boss_illidan_stormrage
diff --git a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
old mode 100644
new mode 100755
index 2deee41e31f..cb72486972b
--- a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
old mode 100644
new mode 100755
index b3dccdf18e6..1482cb84bd2
--- a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
@@ -1,19 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 /* ScriptData
 SDName: Boss_Reliquary_of_Souls
diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
old mode 100644
new mode 100755
index e4a71983e8c..539b347e6fd
--- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp
old mode 100644
new mode 100755
index ecccc1a286b..7dc197994fe
--- a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp
@@ -1,17 +1,19 @@
-/* Copyright (C) 2006 - 2008 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
old mode 100644
new mode 100755
index 03ab5233971..92b5a0a6134
--- a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
old mode 100644
new mode 100755
index 08e1bd9cadc..3f39cb0aea7
--- a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp
old mode 100644
new mode 100755
index 2cf2737c796..c5fb8159a41
--- a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp
+++ b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
old mode 100644
new mode 100755
index 3594876e28e..7d5c5a9a3af
--- a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
+++ b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
@@ -1,19 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 /* ScriptData
 SDName: Instance_Black_Temple
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
old mode 100644
new mode 100755
index 55799e52711..a99aa661c97
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
old mode 100644
new mode 100755
index 0fde5689fac..1e75a4e65fd
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
old mode 100644
new mode 100755
index cda16e818aa..ed3af2453d1
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA02111-1307USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp
old mode 100644
new mode 100755
index b0fc34738e7..0392ebaaad8
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
old mode 100644
new mode 100755
index fa31e04429d..7bfd50407a6
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
old mode 100644
new mode 100755
index d2996f8e989..b040730f1a2
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
@@ -1,19 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 /* ScriptData
 SDName: Boss_Morogrim_Tidewalker
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
old mode 100644
new mode 100755
index 44f5f91efc0..05944c1954e
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h
old mode 100644
new mode 100755
index 3d41e15ea44..953e1f48eea
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h
@@ -1,7 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software licensed under GPL version 2
- * Please see the included DOCS/LICENSE.TXT for more information */
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #ifndef DEF_SERPENT_SHRINE_H
 #define DEF_SERPENT_SHRINE_H
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp
old mode 100644
new mode 100755
index 471df6faad6..a8969d18b8b
--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp
old mode 100644
new mode 100755
index 709dfa52255..1c25800e2e6
--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp
old mode 100644
new mode 100755
index f27cef0fbe4..b6a9d628f06
--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
old mode 100644
new mode 100755
index 59dfb86888f..3d089a3ecda
--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h
old mode 100644
new mode 100755
index 1c0fce65c30..c15582c5b03
--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h
@@ -1,7 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software licensed under GPL version 2
- * Please see the included DOCS/LICENSE.TXT for more information */
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #ifndef DEF_STEAM_VAULT_H
 #define DEF_STEAM_VAULT_H
diff --git a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp
old mode 100644
new mode 100755
index 4a0da30d7de..2fd078bc5ba
--- a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp
old mode 100644
new mode 100755
index 49aa55fb1cf..a005d52cd84
--- a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp
old mode 100644
new mode 100755
index 2f70d80db55..8d25155f14a
--- a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp
+++ b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp
old mode 100644
new mode 100755
index 360d1c2385b..a2824a6fd16
--- a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp
+++ b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/GruulsLair/gruuls_lair.h b/src/server/scripts/Outland/GruulsLair/gruuls_lair.h
old mode 100644
new mode 100755
index 92ecac1cf3f..8dc06e35666
--- a/src/server/scripts/Outland/GruulsLair/gruuls_lair.h
+++ b/src/server/scripts/Outland/GruulsLair/gruuls_lair.h
@@ -1,7 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software licensed under GPL version 2
- * Please see the included DOCS/LICENSE.TXT for more information */
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #ifndef DEF_GRUULS_LAIR_H
 #define DEF_GRUULS_LAIR_H
diff --git a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp
old mode 100644
new mode 100755
index 75d4e0453bd..2df6ad896da
--- a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp
+++ b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h
old mode 100644
new mode 100755
index 148ec2a5389..e6d1bd14efd
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h
@@ -1,7 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software licensed under GPL version 2
- * Please see the included DOCS/LICENSE.TXT for more information */
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #ifndef DEF_BLOOD_FURNACE_H
 #define DEF_BLOOD_FURNACE_H
diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
old mode 100644
new mode 100755
index 13555363afa..3a8fcee2975
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp
old mode 100644
new mode 100755
index 51d5e84297e..5b705708e9b
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp
old mode 100644
new mode 100755
index df3ed850002..1c3ad6bf3f1
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
old mode 100644
new mode 100755
index d7e3ee4df53..1b0f3f8aa25
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp
old mode 100644
new mode 100755
index 156a2261e1a..9cdab2399a7
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
old mode 100644
new mode 100755
index a952b6ba79a..8dd705d3b3f
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
old mode 100644
new mode 100755
index 7996f41143e..4feb83ec9cd
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h
old mode 100644
new mode 100755
index df30859df75..bbf61b4c45c
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h
@@ -1,7 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software licensed under GPL version 2
- * Please see the included DOCS/LICENSE.TXT for more information */
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #ifndef DEF_RAMPARTS_H
 #define DEF_RAMPARTS_H
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
old mode 100644
new mode 100755
index 63521094c1c..22ba195fb72
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
old mode 100644
new mode 100755
index 4d7f3a8b0f1..123636a503c
--- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
@@ -1,18 +1,20 @@
-/* Copyright(C) 2006 - 2008 ScriptDev2 
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-*(at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 /* ScriptData
 SDName: Boss_Magtheridon
diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
old mode 100644
new mode 100755
index 838ae7f07d7..aa655588d3b
--- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h
old mode 100644
new mode 100755
index 413f45e981d..f2c5d97277a
--- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h
+++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h
@@ -1,7 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software licensed under GPL version 2
- * Please see the included DOCS/LICENSE.TXT for more information */
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #ifndef DEF_MAGTHERIDONS_LAIR_H
 #define DEF_MAGTHERIDONS_LAIR_H
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
old mode 100644
new mode 100755
index ddc20fba7f5..64ad5c7b130
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
old mode 100644
new mode 100755
index 0cfcc154313..29119eb4015
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
old mode 100644
new mode 100755
index cbaa3144664..3478f3b0434
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
old mode 100644
new mode 100755
index 9302826bce9..c7107cdb244
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h
old mode 100644
new mode 100755
index 15380e11fe1..bfde60a86e4
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h
@@ -1,7 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software licensed under GPL version 2
- * Please see the included DOCS/LICENSE.TXT for more information */
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #ifndef DEF_SHATTERED_H
 #define DEF_SHATTERED_H
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
old mode 100644
new mode 100755
index 2d625ea4271..6230ec1a7fa
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
@@ -1,18 +1,20 @@
-/* Copyright(C) 2006 - 2008 ScriptDev2 
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-*(at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 /* ScriptData
 SDName: boss_alar
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
old mode 100644
new mode 100755
index d4f4985f9db..af311f7f5c2
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
old mode 100644
new mode 100755
index e2eff5deb31..2dfc990bdb7
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
old mode 100644
new mode 100755
index 97111edea73..c22c9787a76
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
old mode 100644
new mode 100755
index a44c83baaf8..04c80a0a430
--- a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp
old mode 100644
new mode 100755
index a5e5b32738c..eb5e90bba90
--- a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.h b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.h
old mode 100644
new mode 100755
index a39476eceb5..44f9072917c
--- a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.h
+++ b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.h
@@ -1,7 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software licensed under GPL version 2
- * Please see the included DOCS/LICENSE.TXT for more information */
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #ifndef DEF_THE_EYE_H
 #define DEF_THE_EYE_H
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp
old mode 100644
new mode 100755
index e71b76735ea..72f8a821aba
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp
old mode 100644
new mode 100755
index 0623f90aa9e..97dd2253081
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp
@@ -1,19 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 /* ScriptData
 SDName: Boss_Gatewatcher_Ironhand
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
old mode 100644
new mode 100755
index c2c5b00bfcf..9e3b35c2590
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
@@ -1,19 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 /* ScriptData
 SDName: Boss_Nethermancer_Sepethrea
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
old mode 100644
new mode 100755
index 9f5074cf394..f6af93c9acc
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
@@ -1,19 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 /* ScriptData
 SDName: Boss Pathaleon the Calculator
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp
old mode 100644
new mode 100755
index 32a9b79f426..38c30c52ae5
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/mechanar.h b/src/server/scripts/Outland/TempestKeep/Mechanar/mechanar.h
index d1b53eebf53..a89335bf51b 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/mechanar.h
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/mechanar.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
+
 #ifndef DEF_MECHANAR_H
 #define DEF_MECHANAR_H
 
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
old mode 100644
new mode 100755
index e67b5246223..fa9576f476b
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h
old mode 100644
new mode 100755
index bdb18aa84ac..b861099be3d
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h
@@ -1,7 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software licensed under GPL version 2
- * Please see the included DOCS/LICENSE.TXT for more information */
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 #ifndef DEF_ARCATRAZ_H
 #define DEF_ARCATRAZ_H
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
old mode 100644
new mode 100755
index ced239ea088..5821e7e4f77
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
old mode 100644
new mode 100755
index 413864ac843..4d257d4b4c2
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp
old mode 100644
new mode 100755
index 0a66cdf038c..cf9346e1ce4
--- a/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp
old mode 100644
new mode 100755
index 38d0d3da1eb..8fc44da614c
--- a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp
old mode 100644
new mode 100755
index 9bca4e763d2..d844b931a79
--- a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp
@@ -1,19 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 /* ScriptData
 SDName: Boss_Warp_Splinter
diff --git a/src/server/scripts/Outland/blades_edge_mountains.cpp b/src/server/scripts/Outland/blades_edge_mountains.cpp
old mode 100644
new mode 100755
index 5c0419730c6..6744045b896
--- a/src/server/scripts/Outland/blades_edge_mountains.cpp
+++ b/src/server/scripts/Outland/blades_edge_mountains.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp
old mode 100644
new mode 100755
index 1c83465357e..b158a1a6fd1
--- a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp
+++ b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/boss_doomwalker.cpp b/src/server/scripts/Outland/boss_doomwalker.cpp
old mode 100644
new mode 100755
index 7c44d7e2542..a51cab3426b
--- a/src/server/scripts/Outland/boss_doomwalker.cpp
+++ b/src/server/scripts/Outland/boss_doomwalker.cpp
@@ -1,19 +1,20 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 /* ScriptData
 SDName: Boss_Doomwalker
diff --git a/src/server/scripts/Outland/hellfire_peninsula.cpp b/src/server/scripts/Outland/hellfire_peninsula.cpp
old mode 100644
new mode 100755
index 768562c1460..c3710739926
--- a/src/server/scripts/Outland/hellfire_peninsula.cpp
+++ b/src/server/scripts/Outland/hellfire_peninsula.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/nagrand.cpp b/src/server/scripts/Outland/nagrand.cpp
old mode 100644
new mode 100755
index b845314a3c4..d78377cfd28
--- a/src/server/scripts/Outland/nagrand.cpp
+++ b/src/server/scripts/Outland/nagrand.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/netherstorm.cpp b/src/server/scripts/Outland/netherstorm.cpp
old mode 100644
new mode 100755
index e7c7c975ee4..05481f84aa3
--- a/src/server/scripts/Outland/netherstorm.cpp
+++ b/src/server/scripts/Outland/netherstorm.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/shadowmoon_valley.cpp b/src/server/scripts/Outland/shadowmoon_valley.cpp
old mode 100644
new mode 100755
index cc5a9ef6640..f059bc96b13
--- a/src/server/scripts/Outland/shadowmoon_valley.cpp
+++ b/src/server/scripts/Outland/shadowmoon_valley.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/shattrath_city.cpp b/src/server/scripts/Outland/shattrath_city.cpp
old mode 100644
new mode 100755
index 072695c58c7..74105af6428
--- a/src/server/scripts/Outland/shattrath_city.cpp
+++ b/src/server/scripts/Outland/shattrath_city.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/terokkar_forest.cpp b/src/server/scripts/Outland/terokkar_forest.cpp
old mode 100644
new mode 100755
index 2349a733f29..bb7e25de5a0
--- a/src/server/scripts/Outland/terokkar_forest.cpp
+++ b/src/server/scripts/Outland/terokkar_forest.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/Outland/zangarmarsh.cpp b/src/server/scripts/Outland/zangarmarsh.cpp
old mode 100644
new mode 100755
index 46bc1f186c4..db50e255118
--- a/src/server/scripts/Outland/zangarmarsh.cpp
+++ b/src/server/scripts/Outland/zangarmarsh.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/World/areatrigger_scripts.cpp b/src/server/scripts/World/areatrigger_scripts.cpp
old mode 100644
new mode 100755
index ab0975ea84f..3d6f1a4e8d6
--- a/src/server/scripts/World/areatrigger_scripts.cpp
+++ b/src/server/scripts/World/areatrigger_scripts.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/World/boss_emeriss.cpp b/src/server/scripts/World/boss_emeriss.cpp
old mode 100644
new mode 100755
index f3b10157858..e63a4a0d6d4
--- a/src/server/scripts/World/boss_emeriss.cpp
+++ b/src/server/scripts/World/boss_emeriss.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/World/boss_lethon.cpp b/src/server/scripts/World/boss_lethon.cpp
old mode 100644
new mode 100755
index 6e78b6a5dd5..b16060b43a7
--- a/src/server/scripts/World/boss_lethon.cpp
+++ b/src/server/scripts/World/boss_lethon.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/World/boss_taerar.cpp b/src/server/scripts/World/boss_taerar.cpp
old mode 100644
new mode 100755
index 0f6727a7821..6b0823147b2
--- a/src/server/scripts/World/boss_taerar.cpp
+++ b/src/server/scripts/World/boss_taerar.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/World/boss_ysondre.cpp b/src/server/scripts/World/boss_ysondre.cpp
old mode 100644
new mode 100755
index d2cc5bf1efc..e9d7efc9d88
--- a/src/server/scripts/World/boss_ysondre.cpp
+++ b/src/server/scripts/World/boss_ysondre.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp
old mode 100644
new mode 100755
index b5ee4b54a3c..84ce38dd243
--- a/src/server/scripts/World/go_scripts.cpp
+++ b/src/server/scripts/World/go_scripts.cpp
@@ -1,19 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 >
-* Copyright (C) 2006 - 20010 TrinityCore 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/World/guards.cpp b/src/server/scripts/World/guards.cpp
old mode 100644
new mode 100755
index 6379238d2c9..f475c276558
--- a/src/server/scripts/World/guards.cpp
+++ b/src/server/scripts/World/guards.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/World/item_scripts.cpp b/src/server/scripts/World/item_scripts.cpp
old mode 100644
new mode 100755
index c875a9a4295..f7c6af53e44
--- a/src/server/scripts/World/item_scripts.cpp
+++ b/src/server/scripts/World/item_scripts.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/World/mob_generic_creature.cpp b/src/server/scripts/World/mob_generic_creature.cpp
old mode 100644
new mode 100755
index 548562f5576..9493d4e033a
--- a/src/server/scripts/World/mob_generic_creature.cpp
+++ b/src/server/scripts/World/mob_generic_creature.cpp
@@ -1,20 +1,20 @@
-
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
 
 /* ScriptData
 SDName: Generic_Creature
diff --git a/src/server/scripts/World/npc_innkeeper.cpp b/src/server/scripts/World/npc_innkeeper.cpp
old mode 100644
new mode 100755
index 4457393eec6..29b27484fc8
--- a/src/server/scripts/World/npc_innkeeper.cpp
+++ b/src/server/scripts/World/npc_innkeeper.cpp
@@ -1,19 +1,18 @@
 /*
- * Copyright (C) 2008 - 2010 Trinity 
+ * Copyright (C) 2008-2010 TrinityCore 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/World/npc_professions.cpp b/src/server/scripts/World/npc_professions.cpp
old mode 100644
new mode 100755
index 744837a900a..9a11c5773a0
--- a/src/server/scripts/World/npc_professions.cpp
+++ b/src/server/scripts/World/npc_professions.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/World/npc_taxi.cpp b/src/server/scripts/World/npc_taxi.cpp
old mode 100644
new mode 100755
index c6e9652d5b2..1a296735b38
--- a/src/server/scripts/World/npc_taxi.cpp
+++ b/src/server/scripts/World/npc_taxi.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp
old mode 100644
new mode 100755
index 1e9edb7a96d..a95ec8b6aff
--- a/src/server/scripts/World/npcs_special.cpp
+++ b/src/server/scripts/World/npcs_special.cpp
@@ -1,18 +1,19 @@
-/* Copyright (C) 2008 - 2010 Trinity 
- * Copyright (C) 2006 - 2009 ScriptDev2 .sourceforge.net/>
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2006-2009 ScriptDev2 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 /* ScriptData
-- 
cgit v1.2.3


From 47bfc190c7b7caf2569a2abd7f4f175f52ecaac5 Mon Sep 17 00:00:00 2001
From: click 
Date: Tue, 6 Jul 2010 04:49:31 +0200
Subject: Kill another memleak - delete auction element after auction has been
 ended and removed (fix by ge0rg)

--HG--
branch : trunk
---
 src/server/game/AuctionHouse/AuctionHouseMgr.cpp | 28 ++++++++++++++----------
 src/server/game/AuctionHouse/AuctionHouseMgr.h   | 24 ++++++++++----------
 2 files changed, 27 insertions(+), 25 deletions(-)

(limited to 'src')

diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp
index 38874336cc4..9b666b1b49c 100644
--- a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp
+++ b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp
@@ -1,19 +1,19 @@
 /*
+ * Copyright (C) 2008-2010 TrinityCore 
  * Copyright (C) 2005-2009 MaNGOS 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "Common.h"
@@ -481,7 +481,11 @@ AuctionHouseEntry const* AuctionHouseMgr::GetAuctionHouseEntry(uint32 factionTem
     bool AuctionHouseObject::RemoveAuction(AuctionEntry *auction, uint32 item_template)
     {
         auctionbot.DecrementItemCounts(auction, item_template);
-        return AuctionsMap.erase(auction->Id) ? true : false;
+        bool wasInMap = AuctionsMap.erase(auction->Id) ? true : false;
+
+	// we need to delete the entry, it is not referenced any more
+	delete auction;
+	return wasInMap;
     }
 
 void AuctionHouseObject::Update()
diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.h b/src/server/game/AuctionHouse/AuctionHouseMgr.h
index f0eda8f4fc4..24c954a91e8 100644
--- a/src/server/game/AuctionHouse/AuctionHouseMgr.h
+++ b/src/server/game/AuctionHouse/AuctionHouseMgr.h
@@ -1,21 +1,19 @@
 /*
+ * Copyright (C) 2008-2010 TrinityCore 
  * Copyright (C) 2005-2009 MaNGOS 
  *
- * Copyright (C) 2008-2010 Trinity 
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #ifndef _AUCTION_HOUSE_MGR_H
-- 
cgit v1.2.3


From 9ba91d50d0b9b86cf0c4a09bf7a0593f0b095d4f Mon Sep 17 00:00:00 2001
From: Shauren 
Date: Tue, 6 Jul 2010 13:22:24 +0200
Subject: Fixed sending aura remove packet at stack modification

--HG--
branch : trunk
---
 src/server/game/Spells/Auras/SpellAuras.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src')

diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp
index cb6ddfb2307..65da8f47c2b 100644
--- a/src/server/game/Spells/Auras/SpellAuras.cpp
+++ b/src/server/game/Spells/Auras/SpellAuras.cpp
@@ -171,6 +171,9 @@ void AuraApplication::ClientUpdate(bool remove)
 {
     m_needClientUpdate = false;
 
+    if (remove && GetRemoveMode() == AURA_REMOVE_BY_STACK)
+        return;
+
     WorldPacket data(SMSG_AURA_UPDATE);
     data.append(GetTarget()->GetPackGUID());
     data << uint8(m_slot);
-- 
cgit v1.2.3


From 2484df3918084d405c8020069a5722cd537d10c3 Mon Sep 17 00:00:00 2001
From: Shauren 
Date: Wed, 7 Jul 2010 09:42:18 +0200
Subject: Revert revision 4b8a7a570412 until properly fixed, caused auras to
 get stuck at client sometimes

--HG--
branch : trunk
---
 src/server/game/Spells/Auras/SpellAuras.cpp | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp
index 65da8f47c2b..cb6ddfb2307 100644
--- a/src/server/game/Spells/Auras/SpellAuras.cpp
+++ b/src/server/game/Spells/Auras/SpellAuras.cpp
@@ -171,9 +171,6 @@ void AuraApplication::ClientUpdate(bool remove)
 {
     m_needClientUpdate = false;
 
-    if (remove && GetRemoveMode() == AURA_REMOVE_BY_STACK)
-        return;
-
     WorldPacket data(SMSG_AURA_UPDATE);
     data.append(GetTarget()->GetPackGUID());
     data << uint8(m_slot);
-- 
cgit v1.2.3


From 7969723527648431fb5d739607956ff14db8ed0d Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Wed, 7 Jul 2010 22:22:16 +0200
Subject: Deny access to instances if other party/user with the same perm id is
 inside Fixes #2844

--HG--
branch : trunk
---
 src/server/game/Maps/Map.cpp | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

(limited to 'src')

diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp
index 476d98afc66..f0d1b5d05ee 100644
--- a/src/server/game/Maps/Map.cpp
+++ b/src/server/game/Maps/Map.cpp
@@ -2395,6 +2395,32 @@ bool InstanceMap::CanEnter(Player *player)
         return false;
     }
 
+    // cannot enter if instance is in use by another party/soloer that have a
+    // permanent save in the same instance id
+
+    PlayerList const &playerList = GetPlayers();
+    Player *firstInsidePlayer = NULL;
+
+    if (!playerList.isEmpty())
+        for (PlayerList::const_iterator i = playerList.begin(); i != playerList.end(); ++i)
+            if (Player *iPlayer = i->getSource())
+            {
+                if (iPlayer->isGameMaster()) // bypass GMs
+                    continue;
+                if (!player->GetGroup()) // player has not group and there is someone inside, deny entry
+                {
+                    player->SendTransferAborted(GetId(), TRANSFER_ABORT_MAX_PLAYERS);
+                    return false;
+                }
+                // player inside instance has no group or his groups is different to entering player's one, deny entry
+                if (!iPlayer->GetGroup() || iPlayer->GetGroup() != player->GetGroup() )
+                {
+                    player->SendTransferAborted(GetId(), TRANSFER_ABORT_MAX_PLAYERS);
+                    return false;
+                }
+                break;
+            }
+
     return Map::CanEnter(player);
 }
 
-- 
cgit v1.2.3


From e58ca4d363901264326a9db0ba7900bf91116fc5 Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Wed, 7 Jul 2010 22:30:38 +0200
Subject: Coment annoying assert that nobody knows why is there

--HG--
branch : trunk
---
 src/server/game/Maps/Map.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp
index f0d1b5d05ee..5c908ba445f 100644
--- a/src/server/game/Maps/Map.cpp
+++ b/src/server/game/Maps/Map.cpp
@@ -2369,7 +2369,7 @@ bool InstanceMap::CanEnter(Player *player)
     if (player->GetMapRef().getTarget() == this)
     {
         sLog.outError("InstanceMap::CanEnter - player %s(%u) already in map %d,%d,%d!", player->GetName(), player->GetGUIDLow(), GetId(), GetInstanceId(), GetSpawnMode());
-        assert(false);
+        //assert(false);
         return false;
     }
 
-- 
cgit v1.2.3


From 668de35042674b95474965847227d9f26f8ca412 Mon Sep 17 00:00:00 2001
From: click 
Date: Thu, 8 Jul 2010 03:03:10 +0200
Subject: Do proper sanitytesting for waypoint scriptloading - thanks to Azazel
 for the heads up Closes issues #2888

--HG--
branch : trunk
---
 src/server/game/Globals/ObjectMgr.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index ae8dd503caa..a5c084c3a5d 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -4868,7 +4868,7 @@ void ObjectMgr::LoadWaypointScripts()
 
     for (ScriptMapMap::const_iterator itr = sWaypointScripts.begin(); itr != sWaypointScripts.end(); ++itr)
     {
-        QueryResult_AutoPtr query = WorldDatabase.PQuery("SELECT * FROM waypoint_scripts WHERE id = %u", itr->first);
+        QueryResult_AutoPtr query = WorldDatabase.PQuery("SELECT * FROM waypoint_data WHERE action = %u", itr->first);
         if (!query || !query->GetRowCount())
             sLog.outErrorDb("There is no waypoint which links to the waypoint script %u", itr->first);
     }
-- 
cgit v1.2.3


From e761d578dadabd4514867764a2ceec61928bf902 Mon Sep 17 00:00:00 2001
From: Brian 
Date: Thu, 8 Jul 2010 02:22:20 -0600
Subject: * Implement proper script support for quest "The Prophecy of Akida"
 (9544) * Script by antihrist

--HG--
branch : trunk
---
 sql/scripts/world_script_texts.sql             |  3 ++
 sql/scripts/world_scripts_full.sql             |  1 +
 sql/updates/8842_world_script_texts.sql        |  5 ++
 sql/updates/8842_world_scriptname.sql          |  2 +
 src/server/scripts/Kalimdor/azuremyst_isle.cpp | 71 ++++++++++++++++++++++++++
 src/server/scripts/World/go_scripts.cpp        | 27 ----------
 6 files changed, 82 insertions(+), 27 deletions(-)
 create mode 100644 sql/updates/8842_world_script_texts.sql
 create mode 100644 sql/updates/8842_world_scriptname.sql

(limited to 'src')

diff --git a/sql/scripts/world_script_texts.sql b/sql/scripts/world_script_texts.sql
index ea68673c4da..84e05311494 100644
--- a/sql/scripts/world_script_texts.sql
+++ b/sql/scripts/world_script_texts.sql
@@ -423,6 +423,9 @@ INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`
    (23861,-1000471,'It was... terrible... the demon...',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,''),
    (23864,-1000472,'This land was mine long before your wretched kind set foot here.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,''),
    (23864,-1000473,'All who venture here belong to me, including you!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,''),
+   (17375, -1000474, '[Fulborg] The Stillpine furbolgs will not soon forget your bravery!', 0, 0, 'Stillpine Capitive free say text 1'),
+   (17375, -1000475, '[Fulborg] Thank you, $N', 0, 0, 'Stillpine Capitive free say text 2'),
+   (17375, -1000476, '[Fulborg] Those remaining at Stillpine Hold will welcome you as a hero!', 0, 0, 'Stillpine Capitive free say text 3');
    (26588,-1800001, 'Um... I think one of those wolves is back...',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0, '12027'),
    (26588,-1800002, 'He''s going for Mr. Floppy! ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0, '12027'),
    (26588,-1800003, 'Oh, no! Look, it''s another wolf, and it''s a biiiiiig one!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0, '12027'),
diff --git a/sql/scripts/world_scripts_full.sql b/sql/scripts/world_scripts_full.sql
index 2ec85dd2b47..0576458fbcd 100644
--- a/sql/scripts/world_scripts_full.sql
+++ b/sql/scripts/world_scripts_full.sql
@@ -274,6 +274,7 @@ UPDATE `creature_template` SET `ScriptName`='npc_geezle' WHERE `entry`=17318;
 UPDATE `creature_template` SET `ScriptName`='npc_nestlewood_owlkin' WHERE `entry`=16518;
 UPDATE `creature_template` SET `ScriptName`='npc_draenei_survivor' WHERE `entry`=16483;
 UPDATE `creature_template` SET `ScriptName`='npc_death_ravager' WHERE `entry`=17556;
+UPDATE `creature_template` SET `ScriptName`='npc_stillpine_capitive' where `entry`=17375;
 UPDATE `gameobject_template` SET `ScriptName`='go_ravager_cage' WHERE `entry`=181849;
 UPDATE `gameobject_template` SET `ScriptName`='go_stillpine_cage' WHERE `entry`=181714;
 
diff --git a/sql/updates/8842_world_script_texts.sql b/sql/updates/8842_world_script_texts.sql
new file mode 100644
index 00000000000..617b61a694f
--- /dev/null
+++ b/sql/updates/8842_world_script_texts.sql
@@ -0,0 +1,5 @@
+DELETE FROM script_texts where entry IN (-1000474, -1000475, -1000476);
+INSERT INTO script_texts (`npc_entry`, `entry`, `content_default`, `type`, `language`, `comment`) VALUE
+(17375, -1000474, '[Fulborg] The Stillpine furbolgs will not soon forget your bravery!', 0, 0, 'Stillpine Capitive free say text 1'),
+(17375, -1000475, '[Fulborg] Thank you, $N', 0, 0, 'Stillpine Capitive free say text 2'),
+(17375, -1000476, '[Fulborg] Those remaining at Stillpine Hold will welcome you as a hero!', 0, 0, 'Stillpine Capitive free say text 3');
diff --git a/sql/updates/8842_world_scriptname.sql b/sql/updates/8842_world_scriptname.sql
new file mode 100644
index 00000000000..5ef8e4b6aa9
--- /dev/null
+++ b/sql/updates/8842_world_scriptname.sql
@@ -0,0 +1,2 @@
+UPDATE `creature_template` SET `ScriptName`='npc_stillpine_capitive' where `entry`=17375;
+UPDATE `gameobject_template` SET `ScriptName`='go_stillpine_cage' WHERE `entry`=181714;
diff --git a/src/server/scripts/Kalimdor/azuremyst_isle.cpp b/src/server/scripts/Kalimdor/azuremyst_isle.cpp
index 131e91b65b3..ca35b48b970 100755
--- a/src/server/scripts/Kalimdor/azuremyst_isle.cpp
+++ b/src/server/scripts/Kalimdor/azuremyst_isle.cpp
@@ -669,6 +669,67 @@ CreatureAI* GetAI_npc_death_ravagerAI(Creature* pCreature)
     return new npc_death_ravagerAI(pCreature);
 }
 
+/*########
+## Quest: The Prophecy of Akida
+########*/
+enum BristlelimbCage
+{
+    QUEST_THE_PROPHECY_OF_AKIDA         = 9544,
+    NPC_STILLPINE_CAPITIVE              = 17375,
+    GO_BRISTELIMB_CAGE                  = 181714,
+    CAPITIVE_SAY_1                      = -1000474,
+    CAPITIVE_SAY_2                      = -1000475,
+    CAPITIVE_SAY_3                      = -1000476
+};
+
+
+struct npc_stillpine_capitiveAI : public ScriptedAI
+{
+    npc_stillpine_capitiveAI(Creature *c) : ScriptedAI(c){}
+
+    uint32 FleeTimer;
+
+    void Reset()
+    {
+        FleeTimer = 0;
+        GameObject* cage = me->FindNearestGameObject(GO_BRISTELIMB_CAGE, 5.0f);
+        if(cage)
+            cage->ResetDoorOrButton();
+    }
+
+    void UpdateAI(const uint32 diff)
+    {
+        if(FleeTimer)
+        {
+            if(FleeTimer <= diff)
+                me->ForcedDespawn();
+            else FleeTimer -= diff;
+        }
+    }
+};
+
+CreatureAI* GetAI_npc_stillpine_capitiveAI(Creature* pCreature)
+{
+    return new npc_stillpine_capitiveAI(pCreature);
+}
+
+bool go_bristlelimb_cage(Player* pPlayer, GameObject* pGo)
+{
+    if(pPlayer->GetQuestStatus(QUEST_THE_PROPHECY_OF_AKIDA) == QUEST_STATUS_INCOMPLETE)
+    {
+        Creature* pCreature = pGo->FindNearestCreature(NPC_STILLPINE_CAPITIVE, 5.0f, true);
+        if(pCreature)
+        {
+            DoScriptText(RAND(CAPITIVE_SAY_1, CAPITIVE_SAY_2, CAPITIVE_SAY_3), pCreature, pPlayer);
+            pCreature->GetMotionMaster()->MoveFleeing(pPlayer, 3500);
+            pPlayer->KilledMonsterCredit(pCreature->GetEntry(), pCreature->GetGUID());
+            CAST_AI(npc_stillpine_capitiveAI, pCreature->AI())->FleeTimer = 3500;
+            return false;
+        }
+    }
+    return true;
+}
+
 void AddSC_azuremyst_isle()
 {
     Script *newscript;
@@ -716,5 +777,15 @@ void AddSC_azuremyst_isle()
     newscript->Name="go_ravager_cage";
     newscript->pGOHello = &go_ravager_cage;
     newscript->RegisterSelf();
+	
+    newscript = new Script;
+    newscript->Name="npc_stillpine_capitive";
+    newscript->GetAI = &GetAI_npc_stillpine_capitiveAI;
+    newscript->RegisterSelf();
+    
+    newscript = new Script;
+    newscript->Name="go_bristlelimb_cage";
+    newscript->pGOHello = &go_bristlelimb_cage;
+    newscript->RegisterSelf();
 }
 
diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp
index 84ce38dd243..ca7a136c2fb 100755
--- a/src/server/scripts/World/go_scripts.cpp
+++ b/src/server/scripts/World/go_scripts.cpp
@@ -943,28 +943,6 @@ bool GOSelect_go_amberpine_outhouse(Player *pPlayer, GameObject *pGO, uint32 /*u
             return false;
 }
 
-/*######
-## Quest 9544: The Prophecy of Akida
-######*/
-
-enum eProphecy
-{
-    QUEST_PROPHECY_OF_AKIDA                       = 9544,
-    NPC_STILLPINE_CAPTIVE                         = 17375
-};
-
-bool GOHello_go_stillpine_cage(Player *pPlayer, GameObject *pGO)
-{
-    if (pPlayer->GetQuestStatus(QUEST_PROPHECY_OF_AKIDA) == QUEST_STATUS_INCOMPLETE)
-        if (Creature *pPrisoner = pGO->FindNearestCreature(NPC_STILLPINE_CAPTIVE,1.0f))
-        {
-            pGO->UseDoorOrButton();
-            pPrisoner->DisappearAndDie();
-            pPlayer->KilledMonsterCredit(pPrisoner->GetEntry(),0);
-        }
-    return true;
-}
-
 /*######
 ## Quest 1126: Hive in the Tower
 ######*/
@@ -1160,11 +1138,6 @@ void AddSC_go_scripts()
     newscript->pGOHello =           &GOHello_go_black_cage;
     newscript->RegisterSelf();
 
-    newscript = new Script;
-    newscript->Name = "go_stillpine_cage";
-    newscript->pGOHello =           &GOHello_go_stillpine_cage;
-    newscript->RegisterSelf();
-
     newscript = new Script;
     newscript->Name = "go_amberpine_outhouse";
     newscript->pGOHello =           &GOHello_go_amberpine_outhouse;
-- 
cgit v1.2.3


From 09c84f0a24d9345695610b5884220fb28d425c33 Mon Sep 17 00:00:00 2001
From: Brian 
Date: Thu, 8 Jul 2010 07:13:35 -0600
Subject: * Fix typo

--HG--
branch : trunk
---
 src/server/game/Entities/Player/SocialMgr.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Player/SocialMgr.h b/src/server/game/Entities/Player/SocialMgr.h
index 9b1176baab9..1f40fcf28e9 100644
--- a/src/server/game/Entities/Player/SocialMgr.h
+++ b/src/server/game/Entities/Player/SocialMgr.h
@@ -44,7 +44,7 @@ enum SocialFlag
     SOCIAL_FLAG_FRIEND      = 0x01,
     SOCIAL_FLAG_IGNORED     = 0x02,
     SOCIAL_FLAG_MUTED       = 0x04,                          // guessed
-    SOCAIL_FLAG_RAF         = 0x08                           // Recruit A Friend
+    SOCIAL_FLAG_RAF         = 0x08                           // Recruit A Friend
 };
 
 struct FriendInfo
-- 
cgit v1.2.3


From bf111e7d962ae1d824120acb9da6d47f03d92e27 Mon Sep 17 00:00:00 2001
From: Shauren 
Date: Thu, 8 Jul 2010 20:35:01 +0200
Subject: Fixed Savage Defense Fixed Master Shapeshifter

Fixes issue #1299.

--HG--
branch : trunk
---
 src/server/game/Entities/Unit/Unit.cpp            | 13 ++++++++++---
 src/server/game/Spells/Auras/SpellAuraEffects.cpp |  8 ++++----
 2 files changed, 14 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index a9e8cd0ee7f..d990ae397af 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -1795,10 +1795,17 @@ void Unit::CalcAbsorbResist(Unit *pVictim, SpellSchoolMask schoolMask, DamageEff
                         RemainingDamage -= RemainingDamage * currentAbsorb / 100;
                     continue;
                 }
-                // Savage Defense (amount store original percent of attack power applied)
-                if (spellProto->SpellIconID == 50)    // only spell with this aura fit
+                // Savage Defense
+                if (spellProto->SpellIconID == 146)
                 {
-                    RemainingDamage -= int32(currentAbsorb * pVictim->GetTotalAttackPowerValue(BASE_ATTACK) / 100);
+                    if (RemainingDamage < currentAbsorb)
+                        currentAbsorb = RemainingDamage;
+
+                    // don't use up the aura if we don't absorb anything
+                    if (currentAbsorb > 0)
+                        (*i)->GetBase()->DropCharge();
+
+                    RemainingDamage -= currentAbsorb;
                     continue;
                 }
                 // Moonkin Form passive
diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
index fcc9558773c..8be639241d7 100644
--- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
@@ -2543,7 +2543,7 @@ void AuraEffect::HandleShapeshiftBoosts(Unit * target, bool apply) const
                     // Master Shapeshifter - Cat
                     if (AuraEffect const * aurEff = target->GetDummyAuraEffect(SPELLFAMILY_GENERIC, 2851, 0))
                     {
-                        int32 bp = aurEff->GetAmount();
+                        int32 bp = aurEff->GetAmount()+1;
                         target->CastCustomSpell(target, 48420, &bp, NULL, NULL, true);
                     }
                 break;
@@ -2552,7 +2552,7 @@ void AuraEffect::HandleShapeshiftBoosts(Unit * target, bool apply) const
                     // Master Shapeshifter - Bear
                     if (AuraEffect const * aurEff = target->GetDummyAuraEffect(SPELLFAMILY_GENERIC, 2851, 0))
                     {
-                        int32 bp = aurEff->GetAmount();
+                        int32 bp = aurEff->GetAmount()+1;
                         target->CastCustomSpell(target, 48418, &bp, NULL, NULL, true);
                     }
                     // Survival of the Fittest
@@ -2566,7 +2566,7 @@ void AuraEffect::HandleShapeshiftBoosts(Unit * target, bool apply) const
                     // Master Shapeshifter - Moonkin
                     if (AuraEffect const * aurEff = target->GetDummyAuraEffect(SPELLFAMILY_GENERIC, 2851, 0))
                     {
-                        int32 bp = aurEff->GetAmount();
+                        int32 bp = aurEff->GetAmount()+1;
                         target->CastCustomSpell(target, 48421, &bp, NULL, NULL, true);
                     }
                 break;
@@ -2574,7 +2574,7 @@ void AuraEffect::HandleShapeshiftBoosts(Unit * target, bool apply) const
                 case FORM_TREE:
                     if (AuraEffect const * aurEff = target->GetDummyAuraEffect(SPELLFAMILY_GENERIC, 2851, 0))
                     {
-                        int32 bp = aurEff->GetAmount();
+                        int32 bp = aurEff->GetAmount()+1;
                         target->CastCustomSpell(target, 48422, &bp, NULL, NULL, true);
                     }
                 break;
-- 
cgit v1.2.3


From 5f119652ea719273b899872069350417fbe83e66 Mon Sep 17 00:00:00 2001
From: Brian 
Date: Thu, 8 Jul 2010 12:43:13 -0600
Subject: * Proper quest reputation reward post 3.3.0 * Will require a DB
 update for all quest_templates that are pre 3.3.0

--HG--
branch : trunk
---
 src/server/game/Entities/Player/Player.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index bca7ba5ab97..927cd189e30 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -6536,7 +6536,7 @@ void Player::RewardReputation(Quest const *pQuest)
             continue;
         if (pQuest->RewRepValue[i])
         {
-            int32 rep = CalculateReputationGain(GetQuestLevel(pQuest), pQuest->RewRepValue[i], pQuest->RewRepFaction[i], true);
+            int32 rep = CalculateReputationGain(GetQuestLevel(pQuest), pQuest->RewRepValue[i]/100, pQuest->RewRepFaction[i], true);
             if (FactionEntry const* factionEntry = sFactionStore.LookupEntry(pQuest->RewRepFaction[i]))
                 GetReputationMgr().ModifyReputation(factionEntry, rep);
         }
-- 
cgit v1.2.3


From fe39f4f59ab7358510c417db64eb065ade345bb4 Mon Sep 17 00:00:00 2001
From: Brian 
Date: Thu, 8 Jul 2010 12:46:04 -0600
Subject: * Version update

--HG--
branch : trunk
---
 src/server/game/Entities/Object/Updates/UpdateFields.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Object/Updates/UpdateFields.h b/src/server/game/Entities/Object/Updates/UpdateFields.h
index 1b334967688..ecef0276e7a 100644
--- a/src/server/game/Entities/Object/Updates/UpdateFields.h
+++ b/src/server/game/Entities/Object/Updates/UpdateFields.h
@@ -21,7 +21,7 @@
 #ifndef _UPDATEFIELDS_AUTO_H
 #define _UPDATEFIELDS_AUTO_H
 
-// Auto generated for version 3, 3, 3, 12340
+// Auto generated for version 3, 3, 5, 12340
 
 enum EObjectFields
 {
-- 
cgit v1.2.3


From 7b27b98599bf7f648ed0dfc329421b27bb2783c4 Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Fri, 9 Jul 2010 13:12:25 +0200
Subject: Remove double requirement check in AreaTrigger teleport

--HG--
branch : trunk
---
 src/server/game/Server/Protocol/Handlers/MiscHandler.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp b/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp
index 3bc5e8d507f..06a2210d79f 100644
--- a/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp
@@ -931,8 +931,9 @@ void WorldSession::HandleAreaTriggerOpcode(WorldPacket & recv_data)
     if (!at)
         return;
 
-    if (!GetPlayer()->Satisfy(objmgr.GetAccessRequirement(at->access_id), at->target_mapId, true))
-        return;
+    // MapManager::CanPlayerEnter() calls players->Satisfy() so this is not needed here
+    // if (!GetPlayer()->Satisfy(objmgr.GetAccessRequirement(at->access_id), at->target_mapId, true))
+    //    return;
 
     // check if player can enter instance : instance not full, and raid instance not in encounter fight
     if (!sMapMgr.CanPlayerEnter(at->target_mapId, GetPlayer(), false))
-- 
cgit v1.2.3


From a95bafefda815e2a06470de68e2544784309b5ae Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Fri, 9 Jul 2010 13:22:07 +0200
Subject: Check map entering requirements only if areatrigger teleport changes
 map

--HG--
branch : trunk
---
 src/server/game/Server/Protocol/Handlers/MiscHandler.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp b/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp
index 06a2210d79f..4225a99c72b 100644
--- a/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp
@@ -935,8 +935,9 @@ void WorldSession::HandleAreaTriggerOpcode(WorldPacket & recv_data)
     // if (!GetPlayer()->Satisfy(objmgr.GetAccessRequirement(at->access_id), at->target_mapId, true))
     //    return;
 
+    // Check only if target map != current player's map
     // check if player can enter instance : instance not full, and raid instance not in encounter fight
-    if (!sMapMgr.CanPlayerEnter(at->target_mapId, GetPlayer(), false))
+    if (GetPlayer()->GetMapId() != at->target_mapId && !sMapMgr.CanPlayerEnter(at->target_mapId, GetPlayer(), false))
         return;
 
     GetPlayer()->TeleportTo(at->target_mapId,at->target_X,at->target_Y,at->target_Z,at->target_Orientation,TELE_TO_NOT_LEAVE_TRANSPORT);
-- 
cgit v1.2.3


From 9182ab6ead9ca4f7f08dc5741ec72496a0041e62 Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Fri, 9 Jul 2010 13:23:22 +0200
Subject: Uncomment the assert that I commented some revs ago on
 InstanceMap::CanEnter()

--HG--
branch : trunk
---
 src/server/game/Maps/Map.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp
index 5c908ba445f..f0d1b5d05ee 100644
--- a/src/server/game/Maps/Map.cpp
+++ b/src/server/game/Maps/Map.cpp
@@ -2369,7 +2369,7 @@ bool InstanceMap::CanEnter(Player *player)
     if (player->GetMapRef().getTarget() == this)
     {
         sLog.outError("InstanceMap::CanEnter - player %s(%u) already in map %d,%d,%d!", player->GetName(), player->GetGUIDLow(), GetId(), GetInstanceId(), GetSpawnMode());
-        //assert(false);
+        assert(false);
         return false;
     }
 
-- 
cgit v1.2.3


From 70a31424f864e29d2f672e18867f9b5e9b9cdfd8 Mon Sep 17 00:00:00 2001
From: Brian 
Date: Fri, 9 Jul 2010 04:02:26 -0600
Subject: [mq]: vm3

--HG--
branch : trunk
---
 src/server/collision/Management/VMapManager2.cpp | 32 ++++++------
 src/server/collision/Maps/MapTree.cpp            | 64 ++++++++++++++----------
 src/server/collision/Maps/MapTree.h              |  1 +
 src/server/collision/Maps/TileAssembler.cpp      | 28 ++++++-----
 src/server/collision/Models/ModelInstance.cpp    | 23 +++++----
 src/server/collision/Models/WorldModel.cpp       | 63 +++++++++++++++++------
 src/server/collision/VMapDefinitions.h           | 22 ++++----
 src/server/worldserver/worldserver.conf.dist     |  6 +--
 src/tools/vmap3_assembler/VMapAssembler.cpp      |  4 +-
 src/tools/vmap3_extractor/dbcfile.h              | 22 ++++++--
 src/tools/vmap3_extractor/vmapexport.cpp         |  2 +-
 11 files changed, 165 insertions(+), 102 deletions(-)

(limited to 'src')

diff --git a/src/server/collision/Management/VMapManager2.cpp b/src/server/collision/Management/VMapManager2.cpp
index 1936ba6ebba..61b202c9342 100644
--- a/src/server/collision/Management/VMapManager2.cpp
+++ b/src/server/collision/Management/VMapManager2.cpp
@@ -1,19 +1,19 @@
 /*
+ * Copyright (C) 2008-2010 TrinityCore 
  * Copyright (C) 2005-2010 MaNGOS 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include 
@@ -57,7 +57,7 @@ namespace VMAP
     Vector3 VMapManager2::convertPositionToInternalRep(float x, float y, float z) const
     {
         Vector3 pos;
-        const float mid = 0.5 * 64.0 * 533.33333333f;
+        const float mid = 0.5f * 64.0f * 533.33333333f;
         pos.x = mid - x;
         pos.y = mid - y;
         pos.z = z;
@@ -70,7 +70,7 @@ namespace VMAP
     Vector3 VMapManager2::convertPositionToMangosRep(float x, float y, float z) const
     {
         Vector3 pos;
-        const float mid = 0.5 * 64.0 * 533.33333333f;
+        const float mid = 0.5f * 64.0f * 533.33333333f;
         pos.x = mid - x;
         pos.y = mid - y;
         pos.z = z;
@@ -301,11 +301,11 @@ namespace VMAP
             WorldModel *worldmodel = new WorldModel();
             if (!worldmodel->readFile(basepath + filename + ".vmo"))
             {
-                sLog.outError("VMapManager2: could not load '%s%s.vmo'!", basepath.c_str(), filename.c_str());
+                sLog.outError("VMapManager2: could not load '%s%s.vmo'", basepath.c_str(), filename.c_str());
                 delete worldmodel;
                 return NULL;
             }
-            sLog.outDebug("VMapManager2: loading file '%s%s'.", basepath.c_str(), filename.c_str());
+            sLog.outDebug("VMapManager2: loading file '%s%s'", basepath.c_str(), filename.c_str());
             model = iLoadedModelFiles.insert(std::pair(filename, ManagedModel())).first;
             model->second.setModel(worldmodel);
         }
@@ -318,7 +318,7 @@ namespace VMAP
         ModelFileMap::iterator model = iLoadedModelFiles.find(filename);
         if (model == iLoadedModelFiles.end())
         {
-            sLog.outError("VMapManager2: trying to unload non-loaded file '%s'!", filename.c_str());
+            sLog.outError("VMapManager2: trying to unload non-loaded file '%s'", filename.c_str());
             return;
         }
         if( model->second.decRefCount() == 0)
diff --git a/src/server/collision/Maps/MapTree.cpp b/src/server/collision/Maps/MapTree.cpp
index af92ec37ae7..e758581e2f8 100644
--- a/src/server/collision/Maps/MapTree.cpp
+++ b/src/server/collision/Maps/MapTree.cpp
@@ -1,19 +1,19 @@
 /*
+ * Copyright (C) 2008-2010 TrinityCore 
  * Copyright (C) 2005-2010 MaNGOS 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "MapTree.h"
@@ -57,7 +57,7 @@ namespace VMAP
             void operator()(const Vector3& point, uint32 entry)
             {
 #ifdef VMAP_DEBUG
-                sLog.outDebug("trying to intersect '%s'", prims[entry].name.c_str());
+                sLog.outDebug("AreaInfoCallback: trying to intersect '%s'", prims[entry].name.c_str());
 #endif
                 prims[entry].intersectPoint(point, aInfo);
             }
@@ -73,7 +73,7 @@ namespace VMAP
             void operator()(const Vector3& point, uint32 entry)
             {
 #ifdef VMAP_DEBUG
-                sLog.outDebug("trying to intersect '%s'", prims[entry].name.c_str());
+                sLog.outDebug("LocationInfoCallback: trying to intersect '%s'", prims[entry].name.c_str());
 #endif
                 if (prims[entry].GetLocationInfo(point, locInfo))
                     result = true;
@@ -121,7 +121,7 @@ namespace VMAP
     }
 
     StaticMapTree::StaticMapTree(uint32 mapID, const std::string &basePath):
-        iMapID(mapID), /* iTree(0), */ iTreeValues(0), iBasePath(basePath)
+        iMapID(mapID), iTreeValues(0), iBasePath(basePath)
     {
         if (iBasePath.length() > 0 && (iBasePath[iBasePath.length()-1] != '/' || iBasePath[iBasePath.length()-1] != '\\'))
         {
@@ -260,7 +260,11 @@ namespace VMAP
             if (!tf)
                 success = false;
             else
+            {
+                if (!readChunk(tf, chunk, VMAP_MAGIC, 8))
+                    success = false;
                 fclose(tf);
+            }
         }
         fclose(rf);
         return success;
@@ -270,7 +274,7 @@ namespace VMAP
 
     bool StaticMapTree::InitMap(const std::string &fname, VMapManager2 *vm)
     {
-        sLog.outDebug("Initializing StaticMapTree '%s'", fname.c_str());
+        sLog.outDebug("StaticMapTree::InitMap() : initializing StaticMapTree '%s'", fname.c_str());
         bool success = true;
         std::string fullname = iBasePath + fname;
         FILE *rf = fopen(fullname.c_str(), "rb");
@@ -298,12 +302,12 @@ namespace VMAP
             // only non-tiled maps have them, and if so exactly one (so far at least...)
             ModelSpawn spawn;
 #ifdef VMAP_DEBUG
-            sLog.outDebug("Map isTiled: %u", static_cast(iIsTiled));
+            sLog.outDebug("StaticMapTree::InitMap() : map isTiled: %u", static_cast(iIsTiled));
 #endif
             if (!iIsTiled && ModelSpawn::readFromFile(rf, spawn))
             {
                 WorldModel *model = vm->acquireModelInstance(iBasePath, spawn.name);
-                sLog.outDebug("StaticMapTree::InitMap(): loading %s", spawn.name.c_str());
+                sLog.outDebug("StaticMapTree::InitMap() : loading %s", spawn.name.c_str());
                 if (model)
                 {
                     // assume that global model always is the first and only tree value (could be improved...)
@@ -313,7 +317,7 @@ namespace VMAP
                 else
                 {
                     success = false;
-                    sLog.outError("Could not acquire WorldModel pointer!");
+                    sLog.outError("StaticMapTree::InitMap() : could not acquire WorldModel pointer for '%s'", spawn.name.c_str());
                 }
             }
 
@@ -349,7 +353,7 @@ namespace VMAP
         }
         if (!iTreeValues)
         {
-            sLog.outError("Tree has not been initialized! [%u,%u]", tileX, tileY);
+            sLog.outError("StaticMapTree::LoadMapTile() : tree has not been initialized [%u,%u]", tileX, tileY);
             return false;
         }
         bool result = true;
@@ -358,8 +362,12 @@ namespace VMAP
         FILE* tf = fopen(tilefile.c_str(), "rb");
         if (tf)
         {
+            char chunk[8];
+
+            if (!readChunk(tf, chunk, VMAP_MAGIC, 8))
+                result = false;
             uint32 numSpawns;
-            if (fread(&numSpawns, sizeof(uint32), 1, tf) != 1)
+            if (result && fread(&numSpawns, sizeof(uint32), 1, tf) != 1)
                 result = false;
             for (uint32 i=0; iacquireModelInstance(iBasePath, spawn.name);
                     if (!model)
-                        sLog.outError("error: could not acquire WorldModel pointer! [%u,%u]", tileX, tileY);
+                        sLog.outError("StaticMapTree::LoadMapTile() : could not acquire WorldModel pointer [%u,%u]", tileX, tileY);
 
                     // update tree
                     uint32 referencedVal;
@@ -382,7 +390,7 @@ namespace VMAP
 #ifdef VMAP_DEBUG
                         if (referencedVal > iNTreeValues)
                         {
-                            sLog.outDebug("invalid tree element! (%u/%u)", referencedVal, iNTreeValues);
+                            sLog.outDebug("StaticMapTree::LoadMapTile() : invalid tree element (%u/%u)", referencedVal, iNTreeValues);
                             continue;
                         }
 #endif
@@ -394,9 +402,9 @@ namespace VMAP
                         ++iLoadedSpawns[referencedVal];
 #ifdef VMAP_DEBUG
                         if (iTreeValues[referencedVal].ID != spawn.ID)
-                            sLog.outDebug("error: trying to load wrong spawn in node!");
+                            sLog.outDebug("StaticMapTree::LoadMapTile() : trying to load wrong spawn in node");
                         else if (iTreeValues[referencedVal].name != spawn.name)
-                            sLog.outDebug("error: name collision on GUID=%u", spawn.ID);
+                            sLog.outDebug("StaticMapTree::LoadMapTile() : name collision on GUID=%u", spawn.ID);
 #endif
                     }
                 }
@@ -417,7 +425,7 @@ namespace VMAP
         loadedTileMap::iterator tile = iLoadedTiles.find(tileID);
         if (tile == iLoadedTiles.end())
         {
-            sLog.outError("WARNING: trying to unload non-loaded tile. Map:%u X:%u Y:%u", iMapID, tileX, tileY);
+            sLog.outError("StaticMapTree::UnloadMapTile() : trying to unload non-loaded tile - Map:%u X:%u Y:%u", iMapID, tileX, tileY);
             return;
         }
         if (tile->second) // file associated with tile
@@ -427,6 +435,9 @@ namespace VMAP
             if (tf)
             {
                 bool result=true;
+                char chunk[8];
+                if (!readChunk(tf, chunk, VMAP_MAGIC, 8))
+                    result = false;
                 uint32 numSpawns;
                 if (fread(&numSpawns, sizeof(uint32), 1, tf) != 1)
                     result = false;
@@ -446,11 +457,10 @@ namespace VMAP
                         fread(&referencedNode, sizeof(uint32), 1, tf);
                         if (!iLoadedSpawns.count(referencedNode))
                         {
-                            sLog.outError("Trying to unload non-referenced model '%s' (ID:%u)", spawn.name.c_str(), spawn.ID);
+                            sLog.outError("StaticMapTree::UnloadMapTile() : trying to unload non-referenced model '%s' (ID:%u)", spawn.name.c_str(), spawn.ID);
                         }
                         else if (--iLoadedSpawns[referencedNode] == 0)
                         {
-                            //std::cout << "MapTree: removing '" << spawn.name << "' from tree\n";
                             iTreeValues[referencedNode].setUnloaded();
                             iLoadedSpawns.erase(referencedNode);
                         }
diff --git a/src/server/collision/Maps/MapTree.h b/src/server/collision/Maps/MapTree.h
index 7a7af43e949..f9c51d47b95 100644
--- a/src/server/collision/Maps/MapTree.h
+++ b/src/server/collision/Maps/MapTree.h
@@ -22,6 +22,7 @@
 #include "Define.h"
 #include "Dynamic/UnorderedMap.h"
 #include "BoundingIntervalHierarchy.h"
+#include "Log.h"
 
 namespace VMAP
 {
diff --git a/src/server/collision/Maps/TileAssembler.cpp b/src/server/collision/Maps/TileAssembler.cpp
index 0b9780130ed..c6798e70cc4 100644
--- a/src/server/collision/Maps/TileAssembler.cpp
+++ b/src/server/collision/Maps/TileAssembler.cpp
@@ -1,19 +1,19 @@
 /*
+ * Copyright (C) 2008-2010 TrinityCore 
  * Copyright (C) 2005-2010 MaNGOS 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "WorldModel.h"
@@ -82,6 +82,7 @@ namespace VMAP
             // build global map tree
             std::vector mapSpawns;
             UniqueEntryMap::iterator entry;
+            printf("Calculating model bounds for map %u...\n", map_iter->first);
             for (entry = map_iter->second->UniqueEntries.begin(); entry != map_iter->second->UniqueEntries.end(); ++entry)
             {
                 // M2 models don't have a bound set in WDT/ADT placement data, i still think they're not used for LoS at all on retail
@@ -100,6 +101,7 @@ namespace VMAP
                 spawnedModelFiles.insert(entry->second.name);
             }
 
+            printf("Creating map tree...\n", map_iter->first);
             BIH pTree;
             pTree.build(mapSpawns, BoundsTrait::getBounds);
 
@@ -107,8 +109,6 @@ namespace VMAP
             std::map modelNodeIdx;
             for (uint32 i=0; i(mapSpawns[i]->ID, i));
-            if (!modelNodeIdx.empty())
-                printf("min GUID: %u, max GUID: %u\n", modelNodeIdx.begin()->first, modelNodeIdx.rbegin()->first);
 
             // write map tree file
             std::stringstream mapfilename;
@@ -158,6 +158,8 @@ namespace VMAP
                 StaticMapTree::unpackTileID(tile->first, x, y);
                 tilefilename << std::setw(2) << x << "_" << std::setw(2) << y << ".vmtile";
                 FILE *tilefile = fopen(tilefilename.str().c_str(), "wb");
+                // file header
+                if (success && fwrite(VMAP_MAGIC, 1, 8, tilefile) != 8) success = false;
                 // write number of tile spawns
                 if (success && fwrite(&nSpawns, sizeof(uint32), 1, tilefile) != 1) success = false;
                 // write tile spawns
diff --git a/src/server/collision/Models/ModelInstance.cpp b/src/server/collision/Models/ModelInstance.cpp
index 677a08e147a..af32d4026e7 100644
--- a/src/server/collision/Models/ModelInstance.cpp
+++ b/src/server/collision/Models/ModelInstance.cpp
@@ -1,24 +1,25 @@
 /*
+ * Copyright (C) 2008-2010 TrinityCore 
  * Copyright (C) 2005-2010 MaNGOS 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "ModelInstance.h"
 #include "WorldModel.h"
 #include "MapTree.h"
+#include "VMapDefinitions.h"
 
 using G3D::Vector3;
 using G3D::Ray;
diff --git a/src/server/collision/Models/WorldModel.cpp b/src/server/collision/Models/WorldModel.cpp
index 690c77577ae..0bd156fedc2 100644
--- a/src/server/collision/Models/WorldModel.cpp
+++ b/src/server/collision/Models/WorldModel.cpp
@@ -1,19 +1,19 @@
 /*
+ * Copyright (C) 2008-2010 TrinityCore 
  * Copyright (C) 2005-2010 MaNGOS 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #include "WorldModel.h"
@@ -148,15 +148,48 @@ namespace VMAP
 
     bool WmoLiquid::GetLiquidHeight(const Vector3 &pos, float &liqHeight) const
     {
-        uint32 tx = (pos.x - iCorner.x)/LIQUID_TILE_SIZE;
+        float tx_f = (pos.x - iCorner.x)/LIQUID_TILE_SIZE;
+        uint32 tx = uint32(tx_f);
         if (tx<0 || tx >= iTilesX) return false;
-        uint32 ty = (pos.y - iCorner.y)/LIQUID_TILE_SIZE;
+        float ty_f = (pos.y - iCorner.y)/LIQUID_TILE_SIZE;
+        uint32 ty = uint32(ty_f);
         if (ty<0 || ty >= iTilesY) return false;
+
+        // check if tile shall be used for liquid level
         // checking for 0x08 *might* be enough, but disabled tiles always are 0x?F:
         if ((iFlags[tx + ty*iTilesX] & 0x0F) == 0x0F)
             return false;
-        //placeholder...use only lower left corner vertex
-        liqHeight = /* iCorner.z + */ iHeight[tx + ty*(iTilesX+1)];
+
+        // (dx, dy) coordinates inside tile, in [0,1]^2
+        float dx = tx_f - (float)tx;
+        float dy = ty_f - (float)ty;
+
+        /* Tesselate tile to two triangles (not sure if client does it exactly like this)
+
+            ^ dy
+            |
+          1 x---------x (1,1)
+            | (b)   / |
+            |     /   |
+            |   /     |
+            | /   (a) |
+            x---------x---> dx
+          0           1
+        */
+
+        const uint32 rowOffset = iTilesX + 1;
+        if (dx > dy) // case (a)
+        {
+            float sx = iHeight[tx+1 +  ty    * rowOffset] - iHeight[tx   + ty * rowOffset];
+            float sy = iHeight[tx+1 + (ty+1) * rowOffset] - iHeight[tx+1 + ty * rowOffset];
+            liqHeight = iHeight[tx + ty * rowOffset] + dx * sx + dy * sy;
+        }
+        else // case (b)
+        {
+            float sx = iHeight[tx+1 + (ty+1) * rowOffset] - iHeight[tx + (ty+1) * rowOffset];
+            float sy = iHeight[tx   + (ty+1) * rowOffset] - iHeight[tx +  ty    * rowOffset];
+            liqHeight = iHeight[tx + ty * rowOffset] + dx * sx + dy * sy;
+        }
         return true;
     }
 
diff --git a/src/server/collision/VMapDefinitions.h b/src/server/collision/VMapDefinitions.h
index e4a34cc1397..5f4a976ed2a 100644
--- a/src/server/collision/VMapDefinitions.h
+++ b/src/server/collision/VMapDefinitions.h
@@ -1,19 +1,19 @@
 /*
+ * Copyright (C) 2008-YYYY TrinityCore 
  * Copyright (C) 2005-2010 MaNGOS 
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
  */
 
 #ifndef _VMAPDEFINITIONS_H
diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist
index 3b6d20e093d..b78d8b363cd 100644
--- a/src/server/worldserver/worldserver.conf.dist
+++ b/src/server/worldserver/worldserver.conf.dist
@@ -177,7 +177,7 @@ EAIErrorLevel = 2
 #    
 #    vmap.enableIndoorCheck
 #        Enable/Disable VMap based indoor check to remove outdoor-only auras (mounts etc.)
-#        Default: 0 (disabled)
+#        Default: 1 (enabled)
 #
 #    DetectPosCollision
 #        Check final move position, summon position, etc for visible collision
@@ -244,10 +244,10 @@ PlayerSave.Stats.MinLevel = 0
 PlayerSave.Stats.SaveOnlyOnLogout = 1
 vmap.enableLOS = 0
 vmap.enableHeight = 0
-vmap.ignoreMapIds = "369"
+vmap.ignoreMapIds = ""
 vmap.ignoreSpellIds = "7720"
 vmap.petLOS = 0
-vmap.enableIndoorCheck = 0
+vmap.enableIndoorCheck = 1
 DetectPosCollision = 1
 TargetPosRecalculateRange = 1.5
 UpdateUptimeInterval = 10
diff --git a/src/tools/vmap3_assembler/VMapAssembler.cpp b/src/tools/vmap3_assembler/VMapAssembler.cpp
index 6666b54356c..d714db5ae45 100644
--- a/src/tools/vmap3_assembler/VMapAssembler.cpp
+++ b/src/tools/vmap3_assembler/VMapAssembler.cpp
@@ -76,11 +76,13 @@ A '#' at the beginning of a line defines a comment
     return(result);
 } */
 //=======================================================
+
 int main(int argc, char* argv[])
 {
     if(argc != 3 && argc != 4)
     {
-        printf("\nusage: %s   [config file name]\n", argv[0]);
+        //printf("\nusage: %s   [config file name]\n", argv[0]);
+        printf("\nusage: %s  \n", argv[0]);
         return 1;
     }
 
diff --git a/src/tools/vmap3_extractor/dbcfile.h b/src/tools/vmap3_extractor/dbcfile.h
index 7381ab9f668..d405d6ffd60 100644
--- a/src/tools/vmap3_extractor/dbcfile.h
+++ b/src/tools/vmap3_extractor/dbcfile.h
@@ -1,13 +1,27 @@
+/*
+ * Copyright (C) 2008-2010 TrinityCore 
+ * Copyright (C) 2005-2010 MaNGOS 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
+
 #ifndef DBCFILE_H
 #define DBCFILE_H
-#define __STORMLIB_SELF__
 
 #include 
 #include 
-//#include "StormLib.h"
 
-#undef min
-#undef max
 class DBCFile
 {
 public:
diff --git a/src/tools/vmap3_extractor/vmapexport.cpp b/src/tools/vmap3_extractor/vmapexport.cpp
index 82e9bd7cc7b..b82f9249f07 100644
--- a/src/tools/vmap3_extractor/vmapexport.cpp
+++ b/src/tools/vmap3_extractor/vmapexport.cpp
@@ -435,7 +435,7 @@ bool processArgv(int argc, char ** argv, const char *versionString)
 int main(int argc, char ** argv)
 {
     bool success=true;
-    const char *versionString = "V2.90 2010_05";
+    const char *versionString = "V3.00 2010_07";
 
     // Use command line arguments, when some
     if(!processArgv(argc, argv, versionString))
-- 
cgit v1.2.3


From 89ea8ccdf99d32a09260a0fe1898fbe7ecffadfa Mon Sep 17 00:00:00 2001
From: teacher 
Date: Fri, 9 Jul 2010 20:32:00 +0200
Subject: Fixed Extractors' windows compile issue (with click's blessing and
 ever viewing eye!)

--HG--
branch : trunk
---
 src/server/collision/Maps/MapTree.h | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src')

diff --git a/src/server/collision/Maps/MapTree.h b/src/server/collision/Maps/MapTree.h
index f9c51d47b95..7a7af43e949 100644
--- a/src/server/collision/Maps/MapTree.h
+++ b/src/server/collision/Maps/MapTree.h
@@ -22,7 +22,6 @@
 #include "Define.h"
 #include "Dynamic/UnorderedMap.h"
 #include "BoundingIntervalHierarchy.h"
-#include "Log.h"
 
 namespace VMAP
 {
-- 
cgit v1.2.3


From 478946284d6949922267a24dae45e4ac4532ff56 Mon Sep 17 00:00:00 2001
From: click 
Date: Sat, 10 Jul 2010 05:14:05 +0200
Subject: Fix incorrect blocked LOS-calculation on certain locations (by
 Lynx3d)

--HG--
branch : trunk
---
 src/server/collision/Maps/MapTree.cpp         | 42 +++++++++++++++------------
 src/server/collision/Maps/MapTree.h           |  2 +-
 src/server/collision/Models/ModelInstance.cpp |  7 +++--
 3 files changed, 29 insertions(+), 22 deletions(-)

(limited to 'src')

diff --git a/src/server/collision/Maps/MapTree.cpp b/src/server/collision/Maps/MapTree.cpp
index e758581e2f8..fe35e389363 100644
--- a/src/server/collision/Maps/MapTree.cpp
+++ b/src/server/collision/Maps/MapTree.cpp
@@ -41,13 +41,18 @@ namespace VMAP
     class MapRayCallback
     {
         public:
-            MapRayCallback(ModelInstance *val): prims(val) {}
-            ModelInstance *prims;
+            MapRayCallback(ModelInstance *val): prims(val), hit(false) {}
             bool operator()(const G3D::Ray& ray, uint32 entry, float& distance, bool pStopAtFirstHit=true)
             {
-                return prims[entry].intersectRay(ray, distance, pStopAtFirstHit);
-                //std::cout << "trying to intersect '" << entity->name << "'\n";
+                bool result = prims[entry].intersectRay(ray, distance, pStopAtFirstHit);
+                if (result)
+                    hit = true;
+                return result;
             }
+        bool didHit() { return hit; }
+    protected:
+        ModelInstances *prims;
+        bool hit;
     };
 
     class AreaInfoCallback
@@ -138,21 +143,23 @@ namespace VMAP
 
     //=========================================================
     /**
-    return dist to hit or inf() if no hit
+    If intersection is found within pMaxDist, sets pMaxDist to intersection distance and returns true.
+    Else, pMaxDist is not modified and returns false;
     */
 
-    float StaticMapTree::getIntersectionTime(const G3D::Ray& pRay, float pMaxDist, bool pStopAtFirstHit) const
+    bool StaticMapTree::getIntersectionTime(const G3D::Ray& pRay, float &pMaxDist, bool pStopAtFirstHit) const
     {
         float distance = pMaxDist;
         MapRayCallback intersectionCallBack(iTreeValues);
         iTree.intersectRay(pRay, intersectionCallBack, distance, pStopAtFirstHit);
-        return distance;
+        if (intersectionCallBack.didHit())
+            pMaxDist = distance;
+        return intersectionCallBack.didHit();    
     }
     //=========================================================
 
     bool StaticMapTree::isInLineOfSight(const Vector3& pos1, const Vector3& pos2) const
     {
-        bool result = true;
         float maxDist = (pos2 - pos1).magnitude();
         // valid map coords should *never ever* produce float overflow, but this would produce NaNs too
         ASSERT(maxDist < std::numeric_limits::max());
@@ -161,12 +168,10 @@ namespace VMAP
             return true;
         // direction with length of 1
         G3D::Ray ray = G3D::Ray::fromOriginAndDirection(pos1, (pos2 - pos1)/maxDist);
-        float resultDist = getIntersectionTime(ray, maxDist, true);
-        if (resultDist < maxDist)
-        {
-            result = false;
-        }
-        return result;
+        if (getIntersectionTime(ray, maxDist, true))
+            return false;
+
+        return true;
     }
     //=========================================================
     /**
@@ -188,8 +193,8 @@ namespace VMAP
         }
         Vector3 dir = (pPos2 - pPos1)/maxDist;              // direction with length of 1
         G3D::Ray ray(pPos1, dir);
-        float dist = getIntersectionTime(ray, maxDist, false);
-        if (dist < maxDist)
+        float dist = maxDist;
+        if (getIntersectionTime(ray, dist, false))
         {
             pResultHitPos = pPos1 + dir * dist;
             if (pModifyDist < 0)
@@ -225,10 +230,9 @@ namespace VMAP
         Vector3 dir = Vector3(0,0,-1);
         G3D::Ray ray(pPos, dir);   // direction with length of 1
         float maxDist = VMapDefinitions::getMaxCanFallDistance();
-        float dist = getIntersectionTime(ray, maxDist, false);
-        if (dist < maxDist)
+        if (getIntersectionTime(ray, maxDist, false))
         {
-            height = pPos.z - dist;
+            height = pPos.z - maxDist;
         }
         return(height);
     }
diff --git a/src/server/collision/Maps/MapTree.h b/src/server/collision/Maps/MapTree.h
index 7a7af43e949..8f2242da5a6 100644
--- a/src/server/collision/Maps/MapTree.h
+++ b/src/server/collision/Maps/MapTree.h
@@ -57,7 +57,7 @@ namespace VMAP
             std::string iBasePath;
 
         private:
-            float getIntersectionTime(const G3D::Ray& pRay, float pMaxDist, bool pStopAtFirstHit) const;
+            bool getIntersectionTime(const G3D::Ray& pRay, float &pMaxDist, bool pStopAtFirstHit) const;
             //bool containsLoadedMapTile(unsigned int pTileIdent) const { return(iLoadedMapTiles.containsKey(pTileIdent)); }
         public:
             static std::string getTileFileName(uint32 mapID, uint32 tileX, uint32 tileY);
diff --git a/src/server/collision/Models/ModelInstance.cpp b/src/server/collision/Models/ModelInstance.cpp
index af32d4026e7..1ab6b363b22 100644
--- a/src/server/collision/Models/ModelInstance.cpp
+++ b/src/server/collision/Models/ModelInstance.cpp
@@ -57,8 +57,11 @@ namespace VMAP
         Ray modRay(p, iInvRot * pRay.direction());
         float distance = pMaxDist * iInvScale;
         bool hit = iModel->IntersectRay(modRay, distance, pStopAtFirstHit);
-        distance *= iScale;
-        pMaxDist = distance;
+        if(hit)
+        {
+            distance *= iScale;
+            pMaxDist = distance;
+        }
         return hit;
     }
 
-- 
cgit v1.2.3


From 63179eb772b39792b087207c0b1b6fdc8bc0e063 Mon Sep 17 00:00:00 2001
From: click 
Date: Sat, 10 Jul 2010 05:46:21 +0200
Subject: Fix typo in previous commit *sighs*

--HG--
branch : trunk
---
 src/server/collision/Maps/MapTree.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/collision/Maps/MapTree.cpp b/src/server/collision/Maps/MapTree.cpp
index fe35e389363..b47e34b2b72 100644
--- a/src/server/collision/Maps/MapTree.cpp
+++ b/src/server/collision/Maps/MapTree.cpp
@@ -51,7 +51,7 @@ namespace VMAP
             }
         bool didHit() { return hit; }
     protected:
-        ModelInstances *prims;
+        ModelInstance *prims;
         bool hit;
     };
 
-- 
cgit v1.2.3


From aebbdcebc2e02710fbe468cffcb03e44b52a8686 Mon Sep 17 00:00:00 2001
From: Shauren 
Date: Sun, 11 Jul 2010 20:30:53 +0200
Subject: This should fix Savage Defense related crashes

--HG--
branch : trunk
---
 src/server/game/Entities/Unit/Unit.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index d990ae397af..d52554fabf6 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -1801,9 +1801,8 @@ void Unit::CalcAbsorbResist(Unit *pVictim, SpellSchoolMask schoolMask, DamageEff
                     if (RemainingDamage < currentAbsorb)
                         currentAbsorb = RemainingDamage;
 
-                    // don't use up the aura if we don't absorb anything
-                    if (currentAbsorb > 0)
-                        (*i)->GetBase()->DropCharge();
+                    (*i)->SetAmount(0);     // guarantee removal
+                    existExpired = true;    // maybe hacky but not crashy
 
                     RemainingDamage -= currentAbsorb;
                     continue;
-- 
cgit v1.2.3


From 66547c5fbd6dc62ede9f891fdfebbf4bcd0086ee Mon Sep 17 00:00:00 2001
From: click 
Date: Sun, 11 Jul 2010 22:22:49 +0200
Subject: Implement ITEM_FLAGS_NO_EQUIP_COOLDOWN support + add serverside
 checks for ITEM_FLAGS_INDESTRUCTIBLE (code by Vladimir)

--HG--
branch : trunk
---
 src/server/game/Entities/Player/Player.cpp               | 3 +++
 src/server/game/Maps/Map.cpp                             | 1 -
 src/server/game/Server/Protocol/Handlers/ItemHandler.cpp | 6 ++++++
 3 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 927cd189e30..8e93798ac1b 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -21002,6 +21002,9 @@ void Player::SendInstanceResetWarning(uint32 mapid, Difficulty difficulty, uint3
 
 void Player::ApplyEquipCooldown(Item * pItem)
 {
+    if (pItem->HasFlag(ITEM_FIELD_FLAGS, ITEM_FLAGS_NO_EQUIP_COOLDOWN))
+        return;
+
     for (uint8 i = 0; i < MAX_ITEM_PROTO_SPELLS; ++i)
     {
         _Spell const& spellData = pItem->GetProto()->Spells[i];
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp
index f0d1b5d05ee..6c9b505d6c9 100644
--- a/src/server/game/Maps/Map.cpp
+++ b/src/server/game/Maps/Map.cpp
@@ -113,7 +113,6 @@ bool Map::ExistVMap(uint32 mapid,int gx,int gy)
     {
         if (vmgr->isMapLoadingEnabled())
         {
-                                                            // x and y are swapped !! => fixed now
             bool exists = vmgr->existsMap((sWorld.GetDataPath()+ "vmaps").c_str(),  mapid, gx,gy);
             if (!exists)
             {
diff --git a/src/server/game/Server/Protocol/Handlers/ItemHandler.cpp b/src/server/game/Server/Protocol/Handlers/ItemHandler.cpp
index e9b9004804a..d969013801b 100644
--- a/src/server/game/Server/Protocol/Handlers/ItemHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/ItemHandler.cpp
@@ -263,6 +263,12 @@ void WorldSession::HandleDestroyItemOpcode(WorldPacket & recv_data)
         return;
     }
 
+    if (pItem->HasFlag(ITEM_FIELD_FLAGS, ITEM_FLAGS_INDESTRUCTIBLE))
+    {
+        _player->SendEquipError(EQUIP_ERR_CANT_DROP_SOULBOUND, NULL, NULL);
+        return;
+    }
+
     if (count)
     {
         uint32 i_count = count;
-- 
cgit v1.2.3


From 307bf7f73ea30b2ea6db796072c029911e9bcd18 Mon Sep 17 00:00:00 2001
From: click 
Date: Sun, 11 Jul 2010 22:33:18 +0200
Subject: Backed out changeset 6670e64b2d92

--HG--
branch : trunk
---
 src/server/game/Entities/Player/Player.cpp               | 3 ---
 src/server/game/Maps/Map.cpp                             | 1 +
 src/server/game/Server/Protocol/Handlers/ItemHandler.cpp | 6 ------
 3 files changed, 1 insertion(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 8e93798ac1b..927cd189e30 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -21002,9 +21002,6 @@ void Player::SendInstanceResetWarning(uint32 mapid, Difficulty difficulty, uint3
 
 void Player::ApplyEquipCooldown(Item * pItem)
 {
-    if (pItem->HasFlag(ITEM_FIELD_FLAGS, ITEM_FLAGS_NO_EQUIP_COOLDOWN))
-        return;
-
     for (uint8 i = 0; i < MAX_ITEM_PROTO_SPELLS; ++i)
     {
         _Spell const& spellData = pItem->GetProto()->Spells[i];
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp
index 6c9b505d6c9..f0d1b5d05ee 100644
--- a/src/server/game/Maps/Map.cpp
+++ b/src/server/game/Maps/Map.cpp
@@ -113,6 +113,7 @@ bool Map::ExistVMap(uint32 mapid,int gx,int gy)
     {
         if (vmgr->isMapLoadingEnabled())
         {
+                                                            // x and y are swapped !! => fixed now
             bool exists = vmgr->existsMap((sWorld.GetDataPath()+ "vmaps").c_str(),  mapid, gx,gy);
             if (!exists)
             {
diff --git a/src/server/game/Server/Protocol/Handlers/ItemHandler.cpp b/src/server/game/Server/Protocol/Handlers/ItemHandler.cpp
index d969013801b..e9b9004804a 100644
--- a/src/server/game/Server/Protocol/Handlers/ItemHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/ItemHandler.cpp
@@ -263,12 +263,6 @@ void WorldSession::HandleDestroyItemOpcode(WorldPacket & recv_data)
         return;
     }
 
-    if (pItem->HasFlag(ITEM_FIELD_FLAGS, ITEM_FLAGS_INDESTRUCTIBLE))
-    {
-        _player->SendEquipError(EQUIP_ERR_CANT_DROP_SOULBOUND, NULL, NULL);
-        return;
-    }
-
     if (count)
     {
         uint32 i_count = count;
-- 
cgit v1.2.3


From 07c1d011d436abac8703d3efabff864076b41d68 Mon Sep 17 00:00:00 2001
From: click 
Date: Sun, 11 Jul 2010 23:53:48 +0200
Subject: Reinstate ITEM_FLAGS_NO_EQUIP_COOLDOWN implementation and the
 serverside checks for ITEM_FLAGS_INDESTRUCTIBLE (with prototypes this time)

--HG--
branch : trunk
---
 src/server/game/Entities/Item/ItemPrototype.h            | 3 ++-
 src/server/game/Entities/Player/Player.cpp               | 3 +++
 src/server/game/Maps/Map.cpp                             | 1 -
 src/server/game/Server/Protocol/Handlers/ItemHandler.cpp | 6 ++++++
 4 files changed, 11 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Item/ItemPrototype.h b/src/server/game/Entities/Item/ItemPrototype.h
index 0368b7c4dd1..7f4dc97df00 100644
--- a/src/server/game/Entities/Item/ItemPrototype.h
+++ b/src/server/game/Entities/Item/ItemPrototype.h
@@ -111,8 +111,9 @@ enum ITEM_FLAGS
     ITEM_FLAGS_OPENABLE                       = 0x00000004,
     ITEM_FLAGS_WRAPPED                        = 0x00000008,
     ITEM_FLAGS_BROKEN                         = 0x00000010, // appears red icon (like when item durability == 0)
-    ITEM_FLAGS_TOTEM                          = 0x00000020, // ?
+    ITEM_FLAGS_INDESTRUCTIBLE                 = 0x00000020, // Item can not be destroyed, except by using spell (item can be reagent for spell and then allowed)
     ITEM_FLAGS_USABLE                         = 0x00000040, // ?
+    ITEM_FLAGS_NO_EQUIP_COOLDOWN              = 0x00000080, // ?
     ITEM_FLAGS_WRAPPER                        = 0x00000200, // used or not used wrapper
     ITEM_FLAGS_PARTY_LOOT                     = 0x00000800, // determines if item is party loot or not
     ITEM_FLAGS_REFUNDABLE                     = 0x00001000, // item cost can be refunded within 2 hours after purchase
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 927cd189e30..8e93798ac1b 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -21002,6 +21002,9 @@ void Player::SendInstanceResetWarning(uint32 mapid, Difficulty difficulty, uint3
 
 void Player::ApplyEquipCooldown(Item * pItem)
 {
+    if (pItem->HasFlag(ITEM_FIELD_FLAGS, ITEM_FLAGS_NO_EQUIP_COOLDOWN))
+        return;
+
     for (uint8 i = 0; i < MAX_ITEM_PROTO_SPELLS; ++i)
     {
         _Spell const& spellData = pItem->GetProto()->Spells[i];
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp
index f0d1b5d05ee..6c9b505d6c9 100644
--- a/src/server/game/Maps/Map.cpp
+++ b/src/server/game/Maps/Map.cpp
@@ -113,7 +113,6 @@ bool Map::ExistVMap(uint32 mapid,int gx,int gy)
     {
         if (vmgr->isMapLoadingEnabled())
         {
-                                                            // x and y are swapped !! => fixed now
             bool exists = vmgr->existsMap((sWorld.GetDataPath()+ "vmaps").c_str(),  mapid, gx,gy);
             if (!exists)
             {
diff --git a/src/server/game/Server/Protocol/Handlers/ItemHandler.cpp b/src/server/game/Server/Protocol/Handlers/ItemHandler.cpp
index e9b9004804a..d969013801b 100644
--- a/src/server/game/Server/Protocol/Handlers/ItemHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/ItemHandler.cpp
@@ -263,6 +263,12 @@ void WorldSession::HandleDestroyItemOpcode(WorldPacket & recv_data)
         return;
     }
 
+    if (pItem->HasFlag(ITEM_FIELD_FLAGS, ITEM_FLAGS_INDESTRUCTIBLE))
+    {
+        _player->SendEquipError(EQUIP_ERR_CANT_DROP_SOULBOUND, NULL, NULL);
+        return;
+    }
+
     if (count)
     {
         uint32 i_count = count;
-- 
cgit v1.2.3


From 673c652ba6e540d874e929dcc50f6c04ceae50c8 Mon Sep 17 00:00:00 2001
From: click 
Date: Mon, 12 Jul 2010 00:30:17 +0200
Subject: change "IN_MILISECONDS" to proper english "IN_MILLISECONDS"

--HG--
branch : trunk
---
 src/server/game/AI/CoreAI/PetAI.cpp                |   2 +-
 src/server/game/Achievements/AchievementMgr.cpp    |   4 +-
 src/server/game/AuctionHouse/AuctionHouseMgr.cpp   |   2 +-
 src/server/game/BattleGrounds/BattleGround.cpp     |  12 +--
 .../game/BattleGrounds/Zones/BattleGroundEY.h      |   4 +-
 .../game/BattleGrounds/Zones/BattleGroundWS.cpp    |   4 +-
 src/server/game/Chat/Commands/Level0.cpp           |   2 +-
 src/server/game/Combat/ThreatManager.h             |   2 +-
 src/server/game/Entities/Creature/Creature.cpp     |  16 ++--
 src/server/game/Entities/Creature/Creature.h       |   2 +-
 src/server/game/Entities/GameObject/GameObject.h   |   2 +-
 src/server/game/Entities/Pet/Pet.cpp               |   8 +-
 src/server/game/Entities/Pet/Pet.h                 |   2 +-
 src/server/game/Entities/Player/Player.cpp         |  58 ++++++------
 src/server/game/Entities/Player/Player.h           |   2 +-
 src/server/game/Entities/Unit/Unit.cpp             |   8 +-
 src/server/game/Events/GameEventMgr.cpp            |   2 +-
 src/server/game/Grids/GridDefines.h                |   2 +-
 .../MovementGenerators/WaypointMovementGenerator.h |   2 +-
 .../Server/Protocol/Handlers/MovementHandler.cpp   |   2 +-
 src/server/game/Spells/Auras/SpellAuraEffects.cpp  |   8 +-
 src/server/game/Spells/Auras/SpellAuras.cpp        |   6 +-
 src/server/game/Spells/Auras/SpellEffects.cpp      |  22 ++---
 src/server/game/Spells/Spell.cpp                   |   4 +-
 src/server/game/Spells/SpellMgr.cpp                |  12 +--
 src/server/game/Weather/Weather.cpp                |   2 +-
 src/server/game/World/World.cpp                    |  34 +++----
 .../AlteracValley/alterac_valley.cpp               |  28 +++---
 .../EasternKingdoms/AlteracValley/boss_balinda.cpp |  32 +++----
 .../AlteracValley/boss_drekthar.cpp                |  24 ++---
 .../AlteracValley/boss_galvangar.cpp               |  24 ++---
 .../EasternKingdoms/AlteracValley/boss_vanndar.cpp |  20 ++---
 .../BlackrockSpire/blackrock_spire.cpp             |   2 +-
 .../BlackrockSpire/instance_blackrock_spire.cpp    |   2 +-
 .../EasternKingdoms/Karazhan/bosses_opera.cpp      |   6 +-
 .../scripts/EasternKingdoms/Karazhan/karazhan.cpp  |   2 +-
 .../MagistersTerrace/magisters_terrace.cpp         |   2 +-
 .../EasternKingdoms/MoltenCore/boss_golemagg.cpp   |  16 ++--
 .../Stratholme/boss_dathrohan_balnazzar.cpp        |   2 +-
 .../EasternKingdoms/ZulAman/boss_akilzon.cpp       |   2 +-
 .../EasternKingdoms/ZulAman/boss_janalai.cpp       |   2 +-
 .../Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp |   2 +-
 .../AzjolNerub/AzjolNerub/boss_anubarak.cpp        |  30 +++----
 .../AzjolNerub/AzjolNerub/boss_hadronox.cpp        |  24 ++---
 .../AzjolNerub/boss_krikthir_the_gatewatcher.cpp   | 100 ++++++++++-----------
 .../AzjolNerub/ahnkahet/boss_amanitar.cpp          |  22 ++---
 .../AzjolNerub/ahnkahet/boss_elder_nadox.cpp       |  22 ++---
 .../AzjolNerub/ahnkahet/boss_herald_volazj.cpp     |  12 +--
 .../ahnkahet/boss_jedoga_shadowseeker.cpp          |  20 ++---
 .../AzjolNerub/ahnkahet/boss_prince_taldaram.cpp   |  26 +++---
 .../scripts/Northrend/DraktharonKeep/boss_dred.cpp |  30 +++----
 .../Northrend/DraktharonKeep/boss_novos.cpp        |  20 ++---
 .../Northrend/DraktharonKeep/boss_tharon_ja.cpp    |  40 ++++-----
 .../Northrend/DraktharonKeep/boss_trollgore.cpp    |  22 ++---
 .../Northrend/Gundrak/boss_drakkari_colossus.cpp   |  16 ++--
 src/server/scripts/Northrend/Gundrak/boss_eck.cpp  |  16 ++--
 .../scripts/Northrend/Gundrak/boss_gal_darah.cpp   |  30 +++----
 .../scripts/Northrend/Gundrak/boss_moorabi.cpp     |  16 ++--
 .../scripts/Northrend/Gundrak/boss_slad_ran.cpp    |  28 +++---
 .../Northrend/Nexus/Nexus/boss_anomalus.cpp        |  18 ++--
 .../Northrend/Nexus/Nexus/boss_keristrasza.cpp     |  16 ++--
 .../Northrend/Nexus/Nexus/boss_magus_telestra.cpp  |  22 ++---
 .../scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp |  30 +++----
 .../scripts/Northrend/Nexus/Oculus/boss_drakos.cpp |   2 +-
 .../Northrend/ObsidianSanctum/boss_sartharion.cpp  |   2 +-
 .../Ulduar/HallsOfLightning/boss_ionar.cpp         |  18 ++--
 .../UtgardeKeep/UtgardePinnacle/boss_skadi.cpp     |   4 +-
 .../UtgardeKeep/UtgardePinnacle/boss_svala.cpp     |  28 +++---
 .../Northrend/VioletHold/instance_violet_hold.cpp  |   8 +-
 .../SethekkHalls/instance_sethekk_halls.cpp        |   2 +-
 .../instance_hellfire_ramparts.cpp                 |   4 +-
 src/server/scripts/World/npcs_special.cpp          |   2 +-
 src/server/shared/Common.h                         |   2 +-
 73 files changed, 512 insertions(+), 512 deletions(-)

(limited to 'src')

diff --git a/src/server/game/AI/CoreAI/PetAI.cpp b/src/server/game/AI/CoreAI/PetAI.cpp
index 09ec8fae53f..cae50668a3a 100644
--- a/src/server/game/AI/CoreAI/PetAI.cpp
+++ b/src/server/game/AI/CoreAI/PetAI.cpp
@@ -231,7 +231,7 @@ void PetAI::UpdateAllies()
     Unit* owner = me->GetCharmerOrOwner();
     Group *pGroup = NULL;
 
-    m_updateAlliesTimer = 10*IN_MILISECONDS;                //update friendly targets every 10 seconds, lesser checks increase performance
+    m_updateAlliesTimer = 10*IN_MILLISECONDS;                //update friendly targets every 10 seconds, lesser checks increase performance
 
     if (!owner)
         return;
diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp
index 137c22634fa..bb156c40ca6 100644
--- a/src/server/game/Achievements/AchievementMgr.cpp
+++ b/src/server/game/Achievements/AchievementMgr.cpp
@@ -1797,7 +1797,7 @@ void AchievementMgr::SetCriteriaProgress(AchievementCriteriaEntry const* entry,
         //has to exist else we wouldn't be here
         timedCompleted = IsCompletedCriteria(entry, sAchievementStore.LookupEntry(entry->referredAchievement));
         // Client expects this in packet
-        timeElapsed = entry->timeLimit - (timedIter->second/IN_MILISECONDS);
+        timeElapsed = entry->timeLimit - (timedIter->second/IN_MILLISECONDS);
 
         // Remove the timer, we wont need it anymore
         if (timedCompleted)
@@ -1841,7 +1841,7 @@ void AchievementMgr::StartTimedAchievement(AchievementCriteriaTimedTypes type, u
         if (m_timedAchievements.find((*i)->ID) == m_timedAchievements.end() && !IsCompletedCriteria(*i, achievement))
         {
             // Start the timer
-            m_timedAchievements[(*i)->ID] = (*i)->timeLimit * IN_MILISECONDS;
+            m_timedAchievements[(*i)->ID] = (*i)->timeLimit * IN_MILLISECONDS;
 
             // and at client too
             SetCriteriaProgress(*i, 0, PROGRESS_SET);
diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp
index 9b666b1b49c..95e1fb5e931 100644
--- a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp
+++ b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp
@@ -713,7 +713,7 @@ bool AuctionEntry::BuildAuctionInfo(WorldPacket & data) const
     data << uint32(bid ? GetAuctionOutBid() : 0);
     //minimal outbid
     data << uint32(buyout);                                 //auction->buyout
-    data << uint32((expire_time-time(NULL))*IN_MILISECONDS);//time left
+    data << uint32((expire_time-time(NULL))*IN_MILLISECONDS);//time left
     data << uint64(bidder) ;                                //auction->bidder current
     data << uint32(bid);                                    //current bid
     return true;
diff --git a/src/server/game/BattleGrounds/BattleGround.cpp b/src/server/game/BattleGrounds/BattleGround.cpp
index 2fc9a72df04..d9d6dc98a58 100644
--- a/src/server/game/BattleGrounds/BattleGround.cpp
+++ b/src/server/game/BattleGrounds/BattleGround.cpp
@@ -356,16 +356,16 @@ void BattleGround::Update(uint32 diff)
         {
             uint32 newtime = m_PrematureCountDownTimer - diff;
             // announce every minute
-            if (newtime > (MINUTE * IN_MILISECONDS))
+            if (newtime > (MINUTE * IN_MILLISECONDS))
             {
-                if (newtime / (MINUTE * IN_MILISECONDS) != m_PrematureCountDownTimer / (MINUTE * IN_MILISECONDS))
-                    PSendMessageToAll(LANG_BATTLEGROUND_PREMATURE_FINISH_WARNING, CHAT_MSG_SYSTEM, NULL, (uint32)(m_PrematureCountDownTimer / (MINUTE * IN_MILISECONDS)));
+                if (newtime / (MINUTE * IN_MILLISECONDS) != m_PrematureCountDownTimer / (MINUTE * IN_MILLISECONDS))
+                    PSendMessageToAll(LANG_BATTLEGROUND_PREMATURE_FINISH_WARNING, CHAT_MSG_SYSTEM, NULL, (uint32)(m_PrematureCountDownTimer / (MINUTE * IN_MILLISECONDS)));
             }
             else
             {
                 //announce every 15 seconds
-                if (newtime / (15 * IN_MILISECONDS) != m_PrematureCountDownTimer / (15 * IN_MILISECONDS))
-                    PSendMessageToAll(LANG_BATTLEGROUND_PREMATURE_FINISH_WARNING_SECS, CHAT_MSG_SYSTEM, NULL, (uint32)(m_PrematureCountDownTimer / IN_MILISECONDS));
+                if (newtime / (15 * IN_MILLISECONDS) != m_PrematureCountDownTimer / (15 * IN_MILLISECONDS))
+                    PSendMessageToAll(LANG_BATTLEGROUND_PREMATURE_FINISH_WARNING_SECS, CHAT_MSG_SYSTEM, NULL, (uint32)(m_PrematureCountDownTimer / IN_MILLISECONDS));
             }
             m_PrematureCountDownTimer = newtime;
         }
@@ -436,7 +436,7 @@ void BattleGround::Update(uint32 diff)
                             AuraApplication * aurApp = iter->second;
                             Aura * aura = aurApp->GetBase();
                             if (!aura->IsPermanent()
-                                && aura->GetDuration() <= 30*IN_MILISECONDS
+                                && aura->GetDuration() <= 30*IN_MILLISECONDS
                                 && aurApp->IsPositive()
                                 && (!(aura->GetSpellProto()->Attributes & SPELL_ATTR_UNAFFECTED_BY_INVULNERABILITY))
                                 && (!aura->HasEffectType(SPELL_AURA_MOD_INVISIBILITY)))
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundEY.h b/src/server/game/BattleGrounds/Zones/BattleGroundEY.h
index 4fe23c4c821..6b1ec6ced59 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundEY.h
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundEY.h
@@ -25,8 +25,8 @@
 
 class BattleGround;
 
-#define BG_EY_FLAG_RESPAWN_TIME         (8*IN_MILISECONDS) //8 seconds
-#define BG_EY_FPOINTS_TICK_TIME         (2*IN_MILISECONDS)  //2 seconds
+#define BG_EY_FLAG_RESPAWN_TIME         (8*IN_MILLISECONDS) //8 seconds
+#define BG_EY_FPOINTS_TICK_TIME         (2*IN_MILLISECONDS)  //2 seconds
 
 enum BG_EY_WorldStates
 {
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundWS.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundWS.cpp
index 71872511274..12ccc331bab 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundWS.cpp
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundWS.cpp
@@ -70,7 +70,7 @@ void BattleGroundWS::Update(uint32 diff)
 
     if (GetStatus() == STATUS_IN_PROGRESS)
     {
-        if (GetStartTime() >= 25*MINUTE*IN_MILISECONDS)        // Òàéìåð òèêàòü íà÷èíàåò ïîñëå 25 ìèíóò
+        if (GetStartTime() >= 25*MINUTE*IN_MILLISECONDS)        // Òàéìåð òèêàòü íà÷èíàåò ïîñëå 25 ìèíóò
         {
             if (GetTeamScore(ALLIANCE) == 0)
             {
@@ -91,7 +91,7 @@ void BattleGroundWS::Update(uint32 diff)
             else
                 EndBattleGround(ALLIANCE);
         }
-        else if (GetStartTime() > m_minutesElapsed*MINUTE*IN_MILISECONDS)
+        else if (GetStartTime() > m_minutesElapsed*MINUTE*IN_MILLISECONDS)
         {
             ++m_minutesElapsed;
             UpdateWorldState(BG_WS_STATE_TIMER, 25-m_minutesElapsed);
diff --git a/src/server/game/Chat/Commands/Level0.cpp b/src/server/game/Chat/Commands/Level0.cpp
index 53f2341c5af..be039479092 100644
--- a/src/server/game/Chat/Commands/Level0.cpp
+++ b/src/server/game/Chat/Commands/Level0.cpp
@@ -155,7 +155,7 @@ bool ChatHandler::HandleSaveCommand(const char* /*args*/)
 
     // save or plan save after 20 sec (logout delay) if current next save time more this value and _not_ output any messages to prevent cheat planning
     uint32 save_interval = sWorld.getConfig(CONFIG_INTERVAL_SAVE);
-    if ((save_interval == 0 || save_interval > 20*IN_MILISECONDS && player->GetSaveTimer() <= save_interval - 20*IN_MILISECONDS))
+    if ((save_interval == 0 || save_interval > 20*IN_MILLISECONDS && player->GetSaveTimer() <= save_interval - 20*IN_MILLISECONDS))
         player->SaveToDB();
 
     return true;
diff --git a/src/server/game/Combat/ThreatManager.h b/src/server/game/Combat/ThreatManager.h
index 4834ba28759..2903fe83c38 100644
--- a/src/server/game/Combat/ThreatManager.h
+++ b/src/server/game/Combat/ThreatManager.h
@@ -35,7 +35,7 @@ class Creature;
 class ThreatManager;
 struct SpellEntry;
 
-#define THREAT_UPDATE_INTERVAL 1 * IN_MILISECONDS    // Server should send threat update to client periodically each second
+#define THREAT_UPDATE_INTERVAL 1 * IN_MILLISECONDS    // Server should send threat update to client periodically each second
 
 //==============================================================
 // Class to calculate the real threat based
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp
index f1f5e7729a1..1d66385dada 100644
--- a/src/server/game/Entities/Creature/Creature.cpp
+++ b/src/server/game/Entities/Creature/Creature.cpp
@@ -620,7 +620,7 @@ void Creature::RegenerateMana()
         if ((*i)->GetMiscValue() == POWER_MANA)
             addvalue *= ((*i)->GetAmount() + 100) / 100.0f;
 
-    addvalue += GetTotalAuraModifierByMiscValue(SPELL_AURA_MOD_POWER_REGEN, POWER_MANA) * CREATURE_REGEN_INTERVAL / (5 * IN_MILISECONDS);
+    addvalue += GetTotalAuraModifierByMiscValue(SPELL_AURA_MOD_POWER_REGEN, POWER_MANA) * CREATURE_REGEN_INTERVAL / (5 * IN_MILLISECONDS);
 
     ModifyPower(POWER_MANA, addvalue);
 }
@@ -657,7 +657,7 @@ void Creature::RegenerateHealth()
     for (AuraEffectList::const_iterator i = ModPowerRegenPCTAuras.begin(); i != ModPowerRegenPCTAuras.end(); ++i)
         addvalue *= ((*i)->GetAmount() + 100) / 100.0f;
 
-    addvalue += GetTotalAuraModifier(SPELL_AURA_MOD_REGEN) * CREATURE_REGEN_INTERVAL  / (5 * IN_MILISECONDS);
+    addvalue += GetTotalAuraModifier(SPELL_AURA_MOD_REGEN) * CREATURE_REGEN_INTERVAL  / (5 * IN_MILLISECONDS);
 
     ModifyHealth(addvalue);
 }
@@ -1473,7 +1473,7 @@ void Creature::setDeathState(DeathState s)
 {
     if ((s == JUST_DIED && !m_isDeadByDefault)||(s == JUST_ALIVED && m_isDeadByDefault))
     {
-        m_deathTimer = m_corpseDelay*IN_MILISECONDS;
+        m_deathTimer = m_corpseDelay*IN_MILLISECONDS;
 
         // always save boss respawn time at death to prevent crash cheating
         if (sWorld.getConfig(CONFIG_SAVE_RESPAWN_TIME_IMMEDIATELY) || isWorldBoss())
@@ -1987,7 +1987,7 @@ void Creature::SaveRespawnTime()
     if (m_respawnTime > time(NULL))                          // dead (no corpse)
         objmgr.SaveCreatureRespawnTime(m_DBTableGuid,GetInstanceId(),m_respawnTime);
     else if (m_deathTimer > 0)                               // dead (corpse)
-        objmgr.SaveCreatureRespawnTime(m_DBTableGuid,GetInstanceId(),time(NULL)+m_respawnDelay+m_deathTimer/IN_MILISECONDS);
+        objmgr.SaveCreatureRespawnTime(m_DBTableGuid,GetInstanceId(),time(NULL)+m_respawnDelay+m_deathTimer/IN_MILLISECONDS);
 }
 
 // this should not be called by petAI or
@@ -2170,7 +2170,7 @@ void Creature::AddCreatureSpellCooldown(uint32 spellid)
         modOwner->ApplySpellMod(spellid, SPELLMOD_COOLDOWN, cooldown);
 
     if (cooldown)
-        _AddCreatureSpellCooldown(spellid, time(NULL) + cooldown/IN_MILISECONDS);
+        _AddCreatureSpellCooldown(spellid, time(NULL) + cooldown/IN_MILLISECONDS);
 
     if (spellInfo->Category)
         _AddCreatureCategoryCooldown(spellInfo->Category, time(NULL));
@@ -2189,7 +2189,7 @@ bool Creature::HasCategoryCooldown(uint32 spell_id) const
         return true;
 
     CreatureSpellCooldowns::const_iterator itr = m_CreatureCategoryCooldowns.find(spellInfo->Category);
-    return(itr != m_CreatureCategoryCooldowns.end() && time_t(itr->second + (spellInfo->CategoryRecoveryTime / IN_MILISECONDS)) > time(NULL));
+    return(itr != m_CreatureCategoryCooldowns.end() && time_t(itr->second + (spellInfo->CategoryRecoveryTime / IN_MILLISECONDS)) > time(NULL));
 }
 
 bool Creature::HasSpellCooldown(uint32 spell_id) const
@@ -2213,7 +2213,7 @@ time_t Creature::GetRespawnTimeEx() const
     if (m_respawnTime > now)                                 // dead (no corpse)
         return m_respawnTime;
     else if (m_deathTimer > 0)                               // dead (corpse)
-        return now+m_respawnDelay+m_deathTimer/IN_MILISECONDS;
+        return now+m_respawnDelay+m_deathTimer/IN_MILLISECONDS;
     else
         return now;
 }
@@ -2255,7 +2255,7 @@ void Creature::AllLootRemovedFromCorpse()
 
         // corpse was not skinnable -> apply corpse looted timer
         if (!cinfo || !cinfo->SkinLootId)
-            nDeathTimer = (uint32)((m_corpseDelay * IN_MILISECONDS) * sWorld.getRate(RATE_CORPSE_DECAY_LOOTED));
+            nDeathTimer = (uint32)((m_corpseDelay * IN_MILLISECONDS) * sWorld.getRate(RATE_CORPSE_DECAY_LOOTED));
         // corpse skinnable, but without skinning flag, and then skinned, corpse will despawn next update
         else
             nDeathTimer = 0;
diff --git a/src/server/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h
index ed3b4c6a5b4..9f58079efd0 100644
--- a/src/server/game/Entities/Creature/Creature.h
+++ b/src/server/game/Entities/Creature/Creature.h
@@ -66,7 +66,7 @@ enum CreatureFlagsExtra
 #endif
 
 #define MAX_KILL_CREDIT 2
-#define CREATURE_REGEN_INTERVAL 2 * IN_MILISECONDS
+#define CREATURE_REGEN_INTERVAL 2 * IN_MILLISECONDS
 
 // from `creature_template` table
 struct CreatureInfo
diff --git a/src/server/game/Entities/GameObject/GameObject.h b/src/server/game/Entities/GameObject/GameObject.h
index 79c16cfd542..2c1765ea14e 100644
--- a/src/server/game/Entities/GameObject/GameObject.h
+++ b/src/server/game/Entities/GameObject/GameObject.h
@@ -479,7 +479,7 @@ struct GameObjectInfo
             case GAMEOBJECT_TYPE_AREADAMAGE:    autoCloseTime = areadamage.autoCloseTime; break;
             default: break;
         }
-        return autoCloseTime / IN_MILISECONDS;              // prior to 3.0.3, conversion was / 0x10000;
+        return autoCloseTime / IN_MILLISECONDS;              // prior to 3.0.3, conversion was / 0x10000;
     }
 
     uint32 GetLootId() const
diff --git a/src/server/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp
index 3e3eea67cca..1f0533ddcda 100644
--- a/src/server/game/Entities/Pet/Pet.cpp
+++ b/src/server/game/Entities/Pet/Pet.cpp
@@ -619,7 +619,7 @@ void Creature::Regenerate(Powers power)
         if ((*i)->GetMiscValue() == power)
             addvalue *= ((*i)->GetAmount() + 100) / 100.0f;
 
-    addvalue += GetTotalAuraModifierByMiscValue(SPELL_AURA_MOD_POWER_REGEN, power) * (isHunterPet()? PET_FOCUS_REGEN_INTERVAL : CREATURE_REGEN_INTERVAL) / (5 * IN_MILISECONDS);
+    addvalue += GetTotalAuraModifierByMiscValue(SPELL_AURA_MOD_POWER_REGEN, power) * (isHunterPet()? PET_FOCUS_REGEN_INTERVAL : CREATURE_REGEN_INTERVAL) / (5 * IN_MILLISECONDS);
 
     ModifyPower(power, (int32)addvalue);
 }
@@ -1112,7 +1112,7 @@ void Pet::_LoadSpellCooldowns()
                 continue;
 
             data << uint32(spell_id);
-            data << uint32(uint32(db_time-curTime)*IN_MILISECONDS);
+            data << uint32(uint32(db_time-curTime)*IN_MILLISECONDS);
 
             _AddCreatureSpellCooldown(spell_id,db_time);
 
@@ -1229,10 +1229,10 @@ void Pet::_LoadAuras(uint32 timediff)
             // negative effects should continue counting down after logout
             if (remaintime != -1 && !IsPositiveSpell(spellid))
             {
-                if (remaintime/IN_MILISECONDS <= int32(timediff))
+                if (remaintime/IN_MILLISECONDS <= int32(timediff))
                     continue;
 
-                remaintime -= timediff*IN_MILISECONDS;
+                remaintime -= timediff*IN_MILLISECONDS;
             }
 
             // prevent wrong values of remaincharges
diff --git a/src/server/game/Entities/Pet/Pet.h b/src/server/game/Entities/Pet/Pet.h
index 16e80170cd4..2c9b72b4fa6 100644
--- a/src/server/game/Entities/Pet/Pet.h
+++ b/src/server/game/Entities/Pet/Pet.h
@@ -118,7 +118,7 @@ typedef std::vector AutoSpellList;
 
 #define PET_FOLLOW_DIST  1
 #define PET_FOLLOW_ANGLE (M_PI/2)
-#define PET_FOCUS_REGEN_INTERVAL 4 * IN_MILISECONDS
+#define PET_FOCUS_REGEN_INTERVAL 4 * IN_MILLISECONDS
 
 class Player;
 
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 8e93798ac1b..f8b485c36b5 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -69,7 +69,7 @@
 #include "ConditionMgr.h"
 #include 
 
-#define ZONE_UPDATE_INTERVAL (1*IN_MILISECONDS)
+#define ZONE_UPDATE_INTERVAL (1*IN_MILLISECONDS)
 
 #define PLAYER_SKILL_INDEX(x)       (PLAYER_SKILL_INFO_1_1 + ((x)*3))
 #define PLAYER_SKILL_VALUE_INDEX(x) (PLAYER_SKILL_INDEX(x)+1)
@@ -477,7 +477,7 @@ Player::Player (WorldSession *session): Unit(), m_achievementMgr(this), m_reputa
 
     m_swingErrorMsg = 0;
 
-    m_DetectInvTimer = 1*IN_MILISECONDS;
+    m_DetectInvTimer = 1*IN_MILLISECONDS;
 
     for (uint8 j = 0; j < PLAYER_MAX_BATTLEGROUND_QUEUES; ++j)
     {
@@ -1037,12 +1037,12 @@ int32 Player::getMaxTimer(MirrorTimerType timer)
     switch (timer)
     {
         case FATIGUE_TIMER:
-            return MINUTE*IN_MILISECONDS;
+            return MINUTE*IN_MILLISECONDS;
         case BREATH_TIMER:
         {
             if (!isAlive() || HasAuraType(SPELL_AURA_WATER_BREATHING) || GetSession()->GetSecurity() >= sWorld.getConfig(CONFIG_DISABLE_BREATHING))
                 return DISABLED_MIRROR_TIMER;
-            int32 UnderWaterTime = 3*MINUTE*IN_MILISECONDS;
+            int32 UnderWaterTime = 3*MINUTE*IN_MILLISECONDS;
             AuraEffectList const& mModWaterBreathing = GetAuraEffectsByType(SPELL_AURA_MOD_WATER_BREATHING);
             for (AuraEffectList::const_iterator i = mModWaterBreathing.begin(); i != mModWaterBreathing.end(); ++i)
                 UnderWaterTime = uint32(UnderWaterTime * (100.0f + (*i)->GetAmount()) / 100.0f);
@@ -1052,7 +1052,7 @@ int32 Player::getMaxTimer(MirrorTimerType timer)
         {
             if (!isAlive())
                 return DISABLED_MIRROR_TIMER;
-            return 1*IN_MILISECONDS;
+            return 1*IN_MILLISECONDS;
         }
         default:
             return 0;
@@ -1086,7 +1086,7 @@ void Player::HandleDrowning(uint32 time_diff)
             // Timer limit - need deal damage
             if (m_MirrorTimer[BREATH_TIMER] < 0)
             {
-                m_MirrorTimer[BREATH_TIMER]+= 1*IN_MILISECONDS;
+                m_MirrorTimer[BREATH_TIMER]+= 1*IN_MILLISECONDS;
                 // Calculate and deal damage
                 // TODO: Check this formula
                 uint32 damage = GetMaxHealth() / 5 + urand(0, getLevel()-1);
@@ -1122,7 +1122,7 @@ void Player::HandleDrowning(uint32 time_diff)
             // Timer limit - need deal damage or teleport ghost to graveyard
             if (m_MirrorTimer[FATIGUE_TIMER] < 0)
             {
-                m_MirrorTimer[FATIGUE_TIMER]+= 1*IN_MILISECONDS;
+                m_MirrorTimer[FATIGUE_TIMER]+= 1*IN_MILLISECONDS;
                 if (isAlive())                                            // Calculate and deal damage
                 {
                     uint32 damage = GetMaxHealth() / 5 + urand(0, getLevel()-1);
@@ -1155,7 +1155,7 @@ void Player::HandleDrowning(uint32 time_diff)
             m_MirrorTimer[FIRE_TIMER]-=time_diff;
             if (m_MirrorTimer[FIRE_TIMER] < 0)
             {
-                m_MirrorTimer[FIRE_TIMER]+= 1*IN_MILISECONDS;
+                m_MirrorTimer[FIRE_TIMER]+= 1*IN_MILLISECONDS;
                 // Calculate and deal damage
                 // TODO: Check this formula
                 uint32 damage = urand(600, 700);
@@ -1490,7 +1490,7 @@ void Player::Update(uint32 p_time)
     {
         m_drunkTimer += p_time;
 
-        if (m_drunkTimer > 10*IN_MILISECONDS)
+        if (m_drunkTimer > 10*IN_MILLISECONDS)
             HandleSobering();
     }
 
@@ -2243,7 +2243,7 @@ void Player::Regenerate(Powers power)
 
         // Butchery requires combat for this effect
         if (power != POWER_RUNIC_POWER || isInCombat())
-            addvalue += GetTotalAuraModifierByMiscValue(SPELL_AURA_MOD_POWER_REGEN, power) * ((power != POWER_ENERGY) ? m_regenTimerCount : m_regenTimer) / (5 * IN_MILISECONDS);
+            addvalue += GetTotalAuraModifierByMiscValue(SPELL_AURA_MOD_POWER_REGEN, power) * ((power != POWER_ENERGY) ? m_regenTimerCount : m_regenTimer) / (5 * IN_MILLISECONDS);
     }
 
     if (addvalue < 0.0f)
@@ -2321,7 +2321,7 @@ void Player::RegenerateHealth()
             for (AuraEffectList::const_iterator i = mModHealthRegenPct.begin(); i != mModHealthRegenPct.end(); ++i)
                 addvalue *= (100.0f + (*i)->GetAmount()) / 100.0f;
 
-            addvalue += GetTotalAuraModifier(SPELL_AURA_MOD_REGEN) * 2 * IN_MILISECONDS / (5 * IN_MILISECONDS);
+            addvalue += GetTotalAuraModifier(SPELL_AURA_MOD_REGEN) * 2 * IN_MILLISECONDS / (5 * IN_MILLISECONDS);
         }
         else if (HasAuraType(SPELL_AURA_MOD_REGEN_DURING_COMBAT))
             addvalue *= GetTotalAuraModifier(SPELL_AURA_MOD_REGEN_DURING_COMBAT) / 100.0f;
@@ -2978,7 +2978,7 @@ void Player::SendInitialSpells()
             continue;
         }
 
-        time_t cooldown = itr->second.end > curTime ? (itr->second.end-curTime)*IN_MILISECONDS : 0;
+        time_t cooldown = itr->second.end > curTime ? (itr->second.end-curTime)*IN_MILLISECONDS : 0;
 
         if (sEntry->Category)                                // may be wrong, but anyway better than nothing...
         {
@@ -3856,8 +3856,8 @@ void Player::RemoveArenaSpellCooldowns()
         SpellEntry const * entry = sSpellStore.LookupEntry(itr->first);
         // check if spellentry is present and if the cooldown is less than 10 mins
         if (entry &&
-            entry->RecoveryTime <= 10 * MINUTE * IN_MILISECONDS &&
-            entry->CategoryRecoveryTime <= 10 * MINUTE * IN_MILISECONDS)
+            entry->RecoveryTime <= 10 * MINUTE * IN_MILLISECONDS &&
+            entry->CategoryRecoveryTime <= 10 * MINUTE * IN_MILLISECONDS)
         {
             // remove & notify
             RemoveSpellCooldown(itr->first, true);
@@ -4645,7 +4645,7 @@ void Player::ResurrectPlayer(float restore_percent, bool applySickness)
 
             if (Aura * aur = GetAura(15007, GetGUID()))
             {
-                aur->SetDuration(delta*IN_MILISECONDS);
+                aur->SetDuration(delta*IN_MILLISECONDS);
             }
         }
     }
@@ -4698,7 +4698,7 @@ void Player::KillPlayer()
     ApplyModFlag(PLAYER_FIELD_BYTES, PLAYER_FIELD_BYTE_RELEASE_TIMER, !sMapStore.LookupEntry(GetMapId())->Instanceable());
 
     // 6 minutes until repop at graveyard
-    m_deathTimer = 6*MINUTE*IN_MILISECONDS;
+    m_deathTimer = 6*MINUTE*IN_MILLISECONDS;
 
     UpdateCorpseReclaimDelay();                             // dependent at use SetDeathPvP() call before kill
     SendCorpseReclaimDelay();
@@ -14213,10 +14213,10 @@ void Player::AddQuest(Quest const *pQuest, Object *questGiver)
 
         // shared timed quest
         if (questGiver && questGiver->GetTypeId() == TYPEID_PLAYER)
-            limittime = questGiver->ToPlayer()->getQuestStatusMap()[quest_id].m_timer / IN_MILISECONDS;
+            limittime = questGiver->ToPlayer()->getQuestStatusMap()[quest_id].m_timer / IN_MILLISECONDS;
 
         AddTimedQuest(quest_id);
-        questStatusData.m_timer = limittime * IN_MILISECONDS;
+        questStatusData.m_timer = limittime * IN_MILLISECONDS;
         qtime = static_cast(time(NULL)) + limittime;
     }
     else
@@ -16550,10 +16550,10 @@ void Player::_LoadAuras(QueryResult_AutoPtr result, uint32 timediff)
             // negative effects should continue counting down after logout
             if (remaintime != -1 && !IsPositiveSpell(spellid))
             {
-                if (remaintime/IN_MILISECONDS <= int32(timediff))
+                if (remaintime/IN_MILLISECONDS <= int32(timediff))
                     continue;
 
-                remaintime -= timediff*IN_MILISECONDS;
+                remaintime -= timediff*IN_MILLISECONDS;
             }
 
             // prevent wrong values of remaincharges
@@ -16979,7 +16979,7 @@ void Player::_LoadQuestStatus(QueryResult_AutoPtr result)
                     if (quest_time <= sWorld.GetGameTime())
                         questStatusData.m_timer = 1;
                     else
-                        questStatusData.m_timer = (quest_time - sWorld.GetGameTime()) * IN_MILISECONDS;
+                        questStatusData.m_timer = (quest_time - sWorld.GetGameTime()) * IN_MILLISECONDS;
                 }
                 else
                     quest_time = 0;
@@ -18023,11 +18023,11 @@ void Player::_SaveQuestStatus()
             case QUEST_NEW :
                 CharacterDatabase.PExecute("INSERT INTO character_queststatus (guid,quest,status,rewarded,explored,timer,mobcount1,mobcount2,mobcount3,mobcount4,itemcount1,itemcount2,itemcount3,itemcount4) "
                     "VALUES ('%u', '%u', '%u', '%u', '%u', '" UI64FMTD "', '%u', '%u', '%u', '%u', '%u', '%u', '%u', '%u')",
-                    GetGUIDLow(), i->first, i->second.m_status, i->second.m_rewarded, i->second.m_explored, uint64(i->second.m_timer / IN_MILISECONDS+ sWorld.GetGameTime()), i->second.m_creatureOrGOcount[0], i->second.m_creatureOrGOcount[1], i->second.m_creatureOrGOcount[2], i->second.m_creatureOrGOcount[3], i->second.m_itemcount[0], i->second.m_itemcount[1], i->second.m_itemcount[2], i->second.m_itemcount[3]);
+                    GetGUIDLow(), i->first, i->second.m_status, i->second.m_rewarded, i->second.m_explored, uint64(i->second.m_timer / IN_MILLISECONDS+ sWorld.GetGameTime()), i->second.m_creatureOrGOcount[0], i->second.m_creatureOrGOcount[1], i->second.m_creatureOrGOcount[2], i->second.m_creatureOrGOcount[3], i->second.m_itemcount[0], i->second.m_itemcount[1], i->second.m_itemcount[2], i->second.m_itemcount[3]);
                 break;
             case QUEST_CHANGED :
                 CharacterDatabase.PExecute("UPDATE character_queststatus SET status = '%u',rewarded = '%u',explored = '%u',timer = '" UI64FMTD "',mobcount1 = '%u',mobcount2 = '%u',mobcount3 = '%u',mobcount4 = '%u',itemcount1 = '%u',itemcount2 = '%u',itemcount3 = '%u',itemcount4 = '%u'  WHERE guid = '%u' AND quest = '%u' ",
-                    i->second.m_status, i->second.m_rewarded, i->second.m_explored, uint64(i->second.m_timer / IN_MILISECONDS + sWorld.GetGameTime()), i->second.m_creatureOrGOcount[0], i->second.m_creatureOrGOcount[1], i->second.m_creatureOrGOcount[2], i->second.m_creatureOrGOcount[3], i->second.m_itemcount[0], i->second.m_itemcount[1], i->second.m_itemcount[2], i->second.m_itemcount[3], GetGUIDLow(), i->first);
+                    i->second.m_status, i->second.m_rewarded, i->second.m_explored, uint64(i->second.m_timer / IN_MILLISECONDS + sWorld.GetGameTime()), i->second.m_creatureOrGOcount[0], i->second.m_creatureOrGOcount[1], i->second.m_creatureOrGOcount[2], i->second.m_creatureOrGOcount[3], i->second.m_itemcount[0], i->second.m_itemcount[1], i->second.m_itemcount[2], i->second.m_itemcount[3], GetGUIDLow(), i->first);
                 break;
             case QUEST_UNCHANGED:
                 break;
@@ -18725,7 +18725,7 @@ void Player::PetSpellInitialize()
 
     for (CreatureSpellCooldowns::const_iterator itr = pet->m_CreatureSpellCooldowns.begin(); itr != pet->m_CreatureSpellCooldowns.end(); ++itr)
     {
-        time_t cooldown = (itr->second > curTime) ? (itr->second - curTime) * IN_MILISECONDS : 0;
+        time_t cooldown = (itr->second > curTime) ? (itr->second - curTime) * IN_MILLISECONDS : 0;
 
         data << uint32(itr->first);                         // spellid
         data << uint16(0);                                  // spell category?
@@ -18735,7 +18735,7 @@ void Player::PetSpellInitialize()
 
     for (CreatureSpellCooldowns::const_iterator itr = pet->m_CreatureCategoryCooldowns.begin(); itr != pet->m_CreatureCategoryCooldowns.end(); ++itr)
     {
-        time_t cooldown = (itr->second > curTime) ? (itr->second - curTime) * IN_MILISECONDS : 0;
+        time_t cooldown = (itr->second > curTime) ? (itr->second - curTime) * IN_MILLISECONDS : 0;
 
         data << uint32(itr->first);                         // spellid
         data << uint16(0);                                  // spell category?
@@ -19513,7 +19513,7 @@ void Player::ProhibitSpellScholl(SpellSchoolMask idSchoolMask, uint32 unTimeMs)
         {
             data << uint32(unSpellId);
             data << uint32(unTimeMs);                       // in m.secs
-            AddSpellCooldown(unSpellId, 0, curTime + unTimeMs/IN_MILISECONDS);
+            AddSpellCooldown(unSpellId, 0, curTime + unTimeMs/IN_MILLISECONDS);
         }
     }
     GetSession()->SendPacket(&data);
@@ -20009,8 +20009,8 @@ void Player::AddSpellAndCategoryCooldowns(SpellEntry const* spellInfo, uint32 it
         if (rec == 0 && catrec == 0)
             return;
 
-        catrecTime = catrec ? curTime+catrec/IN_MILISECONDS : 0;
-        recTime    = rec ? curTime+rec/IN_MILISECONDS : catrecTime;
+        catrecTime = catrec ? curTime+catrec/IN_MILLISECONDS : 0;
+        recTime    = rec ? curTime+rec/IN_MILLISECONDS : catrecTime;
     }
 
     // self spell cooldown
@@ -22024,7 +22024,7 @@ void Player::SendCorpseReclaimDelay(bool load)
 
     //! corpse reclaim delay 30 * 1000ms or longer at often deaths
     WorldPacket data(SMSG_CORPSE_RECLAIM_DELAY, 4);
-    data << uint32(delay*IN_MILISECONDS);
+    data << uint32(delay*IN_MILLISECONDS);
     GetSession()->SendPacket(&data);
 }
 
diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h
index 765b5185bf6..eeb45cab4cb 100644
--- a/src/server/game/Entities/Player/Player.h
+++ b/src/server/game/Entities/Player/Player.h
@@ -2118,7 +2118,7 @@ class Player : public Unit, public GridObject
         /***                    REST SYSTEM                    ***/
         /*********************************************************/
 
-        bool isRested() const { return GetRestTime() >= 10*IN_MILISECONDS; }
+        bool isRested() const { return GetRestTime() >= 10*IN_MILLISECONDS; }
         uint32 GetXPRestBonus(uint32 xp);
         uint32 GetRestTime() const { return m_restTime;}
         void SetRestTime(uint32 v) { m_restTime = v;}
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index d52554fabf6..f32e41a73b4 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -4176,7 +4176,7 @@ void Unit::RemoveAurasDueToSpellBySteal(uint32 spellId, uint64 casterGUID, Unit
             }
             else
             {
-                int32 dur = 2*MINUTE*IN_MILISECONDS < aura->GetDuration() ? 2*MINUTE*IN_MILISECONDS : aura->GetDuration();
+                int32 dur = 2*MINUTE*IN_MILLISECONDS < aura->GetDuration() ? 2*MINUTE*IN_MILLISECONDS : aura->GetDuration();
 
                 newAura = Aura::TryCreate(aura->GetSpellProto(), effMask, stealer, NULL, &baseDamage[0], NULL, aura->GetCasterGUID());
                 if (!newAura)
@@ -12671,7 +12671,7 @@ int32 Unit::ModSpellDuration(SpellEntry const* spellProto, Unit const* target, i
                 {
                     // Glyph of Thorns
                     if (AuraEffect * aurEff = GetAuraEffect(57862, 0))
-                        duration += aurEff->GetAmount() * MINUTE * IN_MILISECONDS;
+                        duration += aurEff->GetAmount() * MINUTE * IN_MILLISECONDS;
                 }
                 break;
             case SPELLFAMILY_PALADIN:
@@ -12679,13 +12679,13 @@ int32 Unit::ModSpellDuration(SpellEntry const* spellProto, Unit const* target, i
                 {
                     // Glyph of Blessing of Might
                     if (AuraEffect * aurEff = GetAuraEffect(57958, 0))
-                        duration += aurEff->GetAmount() * MINUTE * IN_MILISECONDS;
+                        duration += aurEff->GetAmount() * MINUTE * IN_MILLISECONDS;
                 }
                 else if (spellProto->SpellFamilyFlags[0] & 0x00010000)
                 {
                     // Glyph of Blessing of Wisdom
                     if (AuraEffect * aurEff = GetAuraEffect(57979, 0))
-                        duration += aurEff->GetAmount() * MINUTE * IN_MILISECONDS;
+                        duration += aurEff->GetAmount() * MINUTE * IN_MILLISECONDS;
                 }
                 break;
         }
diff --git a/src/server/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp
index 889d228b0a2..f0500e177bb 100644
--- a/src/server/game/Events/GameEventMgr.cpp
+++ b/src/server/game/Events/GameEventMgr.cpp
@@ -1151,7 +1151,7 @@ uint32 GameEventMgr::Update()                               // return the next e
     for (std::set::iterator itr = deactivate.begin(); itr != deactivate.end(); ++itr)
         StopEvent(*itr);
     sLog.outDetail("Next game event check in %u seconds.", nextEventDelay + 1);
-    return (nextEventDelay + 1) * IN_MILISECONDS;           // Add 1 second to be sure event has started/stopped at next call
+    return (nextEventDelay + 1) * IN_MILLISECONDS;           // Add 1 second to be sure event has started/stopped at next call
 }
 
 void GameEventMgr::UnApplyEvent(uint16 event_id)
diff --git a/src/server/game/Grids/GridDefines.h b/src/server/game/Grids/GridDefines.h
index e59bb6aa8a0..620b8dd2a03 100644
--- a/src/server/game/Grids/GridDefines.h
+++ b/src/server/game/Grids/GridDefines.h
@@ -42,7 +42,7 @@ class Player;
 
 #define CENTER_GRID_OFFSET      (SIZE_OF_GRIDS/2)
 
-#define MIN_GRID_DELAY          (MINUTE*IN_MILISECONDS)
+#define MIN_GRID_DELAY          (MINUTE*IN_MILLISECONDS)
 #define MIN_MAP_UPDATE_DELAY    50
 
 #define SIZE_OF_GRID_CELL       (SIZE_OF_GRIDS/MAX_NUMBER_OF_CELLS)
diff --git a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
index c6d89ecd9b3..cce0eff290e 100644
--- a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
+++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
@@ -39,7 +39,7 @@
 #include 
 
 #define FLIGHT_TRAVEL_UPDATE  100
-#define STOP_TIME_FOR_PLAYER  3 * MINUTE * IN_MILISECONDS           // 3 Minutes
+#define STOP_TIME_FOR_PLAYER  3 * MINUTE * IN_MILLISECONDS           // 3 Minutes
 #define TIMEDIFF_NEXT_WP      250
 
 template
diff --git a/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp b/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp
index 56a8c9cd6da..a31361e9275 100644
--- a/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp
@@ -198,7 +198,7 @@ void WorldSession::HandleMoveTeleportAck(WorldPacket& recv_data)
     uint32 flags, time;
     recv_data >> flags >> time;
     DEBUG_LOG("Guid " UI64FMTD, guid);
-    DEBUG_LOG("Flags %u, time %u", flags, time/IN_MILISECONDS);
+    DEBUG_LOG("Flags %u, time %u", flags, time/IN_MILLISECONDS);
 
     Unit *mover = _player->m_mover;
     Player *plMover = mover->GetTypeId() == TYPEID_PLAYER ? (Player*)mover : NULL;
diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
index 8be639241d7..69c576a5363 100644
--- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
@@ -733,7 +733,7 @@ void AuraEffect::CalculatePeriodic(Unit * caster, bool create)
         case SPELL_AURA_OBS_MOD_POWER:
             // 3 spells have no amplitude set
             if (!m_amplitude)
-                m_amplitude = 1 * IN_MILISECONDS;
+                m_amplitude = 1 * IN_MILLISECONDS;
         case SPELL_AURA_PERIODIC_DAMAGE:
         case SPELL_AURA_PERIODIC_HEAL:
         case SPELL_AURA_PERIODIC_ENERGIZE:
@@ -762,7 +762,7 @@ void AuraEffect::CalculatePeriodic(Unit * caster, bool create)
             {
                 m_isPeriodic = true;
                 m_amplitude = irand (0, 60) + 30;
-                m_amplitude *= IN_MILISECONDS;
+                m_amplitude *= IN_MILLISECONDS;
             }
             break;
     }
@@ -1047,7 +1047,7 @@ void AuraEffect::UpdatePeriodic(Unit * caster)
             if (GetId() == 7057)
             {
                 m_amplitude = irand (0 , 60) + 30;
-                m_amplitude *= IN_MILISECONDS;
+                m_amplitude *= IN_MILLISECONDS;
             }
             break;
         case SPELL_AURA_PERIODIC_TRIGGER_SPELL:
@@ -3125,7 +3125,7 @@ void AuraEffect::HandleAuraTransform(AuraApplication const * aurApp, uint8 mode,
             // for players, start regeneration after 1s (in polymorph fast regeneration case)
             // only if caster is Player (after patch 2.4.2)
             if (IS_PLAYER_GUID(GetCasterGUID()))
-                target->ToPlayer()->setRegenTimerCount(1*IN_MILISECONDS);
+                target->ToPlayer()->setRegenTimerCount(1*IN_MILLISECONDS);
 
             //dismount polymorphed target (after patch 2.4.2)
             if (target->IsMounted())
diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp
index cb6ddfb2307..e3b155dac08 100644
--- a/src/server/game/Spells/Auras/SpellAuras.cpp
+++ b/src/server/game/Spells/Auras/SpellAuras.cpp
@@ -306,7 +306,7 @@ m_spellProto(spellproto), m_owner(owner), m_casterGuid(casterGUID ? casterGUID :
     m_procCharges(0), m_stackAmount(1), m_isRemoved(false), m_casterLevel(caster ? caster->getLevel() : m_spellProto->spellLevel)
 {
     if (m_spellProto->manaPerSecond || m_spellProto->manaPerSecondPerLevel)
-        m_timeCla = 1 * IN_MILISECONDS;
+        m_timeCla = 1 * IN_MILLISECONDS;
 
     Player* modOwner = NULL;
 
@@ -699,7 +699,7 @@ void Aura::RefreshDuration()
             m_effects[i]->ResetPeriodic();
 
     if (m_spellProto->manaPerSecond || m_spellProto->manaPerSecondPerLevel)
-        m_timeCla = 1 * IN_MILISECONDS;
+        m_timeCla = 1 * IN_MILLISECONDS;
 }
 
 void Aura::SetCharges(uint8 charges)
@@ -1290,7 +1290,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const * aurApp, Unit * caster,
                             data << uint64(player->GetGUID());
                             data << uint8(0x0);                                     // flags (0x1, 0x2)
                             data << uint32(GetSpellProto()->Id);
-                            data << uint32(aurEff->GetAmount()*IN_MILISECONDS);
+                            data << uint32(aurEff->GetAmount()*IN_MILLISECONDS);
                             player->SendDirectMessage(&data);
                         }
                         break;
diff --git a/src/server/game/Spells/Auras/SpellEffects.cpp b/src/server/game/Spells/Auras/SpellEffects.cpp
index f819e3f1971..3f01d8bca2d 100644
--- a/src/server/game/Spells/Auras/SpellEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellEffects.cpp
@@ -727,7 +727,7 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
                     // Add main hand dps * effect[2] amount
                     float average = (m_caster->GetFloatValue(UNIT_FIELD_MINDAMAGE) + m_caster->GetFloatValue(UNIT_FIELD_MAXDAMAGE)) / 2;
                     int32 count = m_caster->CalculateSpellDamage(unitTarget, m_spellInfo, 2);
-                    damage += count * int32(average * IN_MILISECONDS) / m_caster->GetAttackTime(BASE_ATTACK);
+                    damage += count * int32(average * IN_MILLISECONDS) / m_caster->GetAttackTime(BASE_ATTACK);
                 }
                 // Shield of Righteousness
                 else if (m_spellInfo->SpellFamilyFlags[1]&0x00100000)
@@ -3946,7 +3946,7 @@ void Spell::EffectDistract(uint32 /*i*/)
         // Set creature Distracted, Stop it, And turn it
         unitTarget->SetOrientation(angle);
         unitTarget->StopMoving();
-        unitTarget->GetMotionMaster()->MoveDistract(damage * IN_MILISECONDS);
+        unitTarget->GetMotionMaster()->MoveDistract(damage * IN_MILLISECONDS);
     }
 }
 
@@ -4873,7 +4873,7 @@ void Spell::EffectSummonObjectWild(uint32 i)
 
     int32 duration = GetSpellDuration(m_spellInfo);
 
-    pGameObj->SetRespawnTime(duration > 0 ? duration/IN_MILISECONDS : 0);
+    pGameObj->SetRespawnTime(duration > 0 ? duration/IN_MILLISECONDS : 0);
     pGameObj->SetSpellId(m_spellInfo->Id);
 
     // Wild object not have owner and check clickable by players
@@ -4916,7 +4916,7 @@ void Spell::EffectSummonObjectWild(uint32 i)
         if (linkedGO->Create(objmgr.GenerateLowGuid(HIGHGUID_GAMEOBJECT), linkedEntry, map,
             m_caster->GetPhaseMask(), x, y, z, target->GetOrientation(), 0.0f, 0.0f, 0.0f, 0.0f, 100, GO_STATE_READY))
         {
-            linkedGO->SetRespawnTime(duration > 0 ? duration/IN_MILISECONDS : 0);
+            linkedGO->SetRespawnTime(duration > 0 ? duration/IN_MILLISECONDS : 0);
             linkedGO->SetSpellId(m_spellInfo->Id);
 
             // Wild object not have owner and check clickable by players
@@ -6507,7 +6507,7 @@ void Spell::EffectDuel(uint32 i)
     pGameObj->SetUInt32Value(GAMEOBJECT_FACTION, m_caster->getFaction());
     pGameObj->SetUInt32Value(GAMEOBJECT_LEVEL, m_caster->getLevel()+1);
     int32 duration = GetSpellDuration(m_spellInfo);
-    pGameObj->SetRespawnTime(duration > 0 ? duration/IN_MILISECONDS : 0);
+    pGameObj->SetRespawnTime(duration > 0 ? duration/IN_MILLISECONDS : 0);
     pGameObj->SetSpellId(m_spellInfo->Id);
 
     m_caster->AddGameObject(pGameObj);
@@ -6585,7 +6585,7 @@ void Spell::EffectSummonPlayer(uint32 /*i*/)
     WorldPacket data(SMSG_SUMMON_REQUEST, 8+4+4);
     data << uint64(m_caster->GetGUID());                    // summoner guid
     data << uint32(m_caster->GetZoneId());                  // summoner zone
-    data << uint32(MAX_PLAYER_SUMMON_DELAY*IN_MILISECONDS); // auto decline after msecs
+    data << uint32(MAX_PLAYER_SUMMON_DELAY*IN_MILLISECONDS); // auto decline after msecs
     unitTarget->ToPlayer()->GetSession()->SendPacket(&data);
 }
 
@@ -6683,7 +6683,7 @@ void Spell::EffectEnchantHeldItem(uint32 i)
             return;
 
         // Apply the temporary enchantment
-        item->SetEnchantment(slot, enchant_id, duration*IN_MILISECONDS, 0);
+        item->SetEnchantment(slot, enchant_id, duration*IN_MILLISECONDS, 0);
         item_owner->ApplyEnchantment(item, slot, true);
     }
 }
@@ -6813,7 +6813,7 @@ void Spell::EffectSummonObject(uint32 i)
 
     //pGameObj->SetUInt32Value(GAMEOBJECT_LEVEL,m_caster->getLevel());
     int32 duration = GetSpellDuration(m_spellInfo);
-    pGameObj->SetRespawnTime(duration > 0 ? duration/IN_MILISECONDS : 0);
+    pGameObj->SetRespawnTime(duration > 0 ? duration/IN_MILLISECONDS : 0);
     pGameObj->SetSpellId(m_spellInfo->Id);
     m_caster->AddGameObject(pGameObj);
 
@@ -7445,7 +7445,7 @@ void Spell::EffectTransmitted(uint32 effIndex)
                 case 3: lastSec = 17; break;
             }
 
-            duration = duration - lastSec*IN_MILISECONDS + FISHING_BOBBER_READY_TIME*IN_MILISECONDS;
+            duration = duration - lastSec*IN_MILLISECONDS + FISHING_BOBBER_READY_TIME*IN_MILLISECONDS;
             break;
         }
         case GAMEOBJECT_TYPE_SUMMONING_RITUAL:
@@ -7466,7 +7466,7 @@ void Spell::EffectTransmitted(uint32 effIndex)
             break;
     }
 
-    pGameObj->SetRespawnTime(duration > 0 ? duration/IN_MILISECONDS : 0);
+    pGameObj->SetRespawnTime(duration > 0 ? duration/IN_MILLISECONDS : 0);
 
     pGameObj->SetOwnerGUID(m_caster->GetGUID());
 
@@ -7485,7 +7485,7 @@ void Spell::EffectTransmitted(uint32 effIndex)
         if (linkedGO->Create(objmgr.GenerateLowGuid(HIGHGUID_GAMEOBJECT), linkedEntry, cMap,
             m_caster->GetPhaseMask(), fx, fy, fz, m_caster->GetOrientation(), 0.0f, 0.0f, 0.0f, 0.0f, 100, GO_STATE_READY))
         {
-            linkedGO->SetRespawnTime(duration > 0 ? duration/IN_MILISECONDS : 0);
+            linkedGO->SetRespawnTime(duration > 0 ? duration/IN_MILLISECONDS : 0);
             //linkedGO->SetUInt32Value(GAMEOBJECT_LEVEL, m_caster->getLevel());
             linkedGO->SetSpellId(m_spellInfo->Id);
             linkedGO->SetOwnerGUID(m_caster->GetGUID());
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
index bf00f54b110..c3b0fdb1405 100644
--- a/src/server/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
@@ -52,7 +52,7 @@
 #include "ScriptMgr.h"
 #include "ConditionMgr.h"
 
-#define SPELL_CHANNEL_UPDATE_INTERVAL (1 * IN_MILISECONDS)
+#define SPELL_CHANNEL_UPDATE_INTERVAL (1 * IN_MILLISECONDS)
 
 extern pEffect SpellEffects[TOTAL_SPELL_EFFECTS];
 
@@ -4772,7 +4772,7 @@ SpellCastResult Spell::CheckCast(bool strict)
     // - with greater than 10 min CD without SPELL_ATTR_EX4_USABLE_IN_ARENA flag
     // - with SPELL_ATTR_EX4_NOT_USABLE_IN_ARENA flag
     if ((m_spellInfo->AttributesEx4 & SPELL_ATTR_EX4_NOT_USABLE_IN_ARENA) ||
-        GetSpellRecoveryTime(m_spellInfo) > 10 * MINUTE * IN_MILISECONDS && !(m_spellInfo->AttributesEx4 & SPELL_ATTR_EX4_USABLE_IN_ARENA))
+        GetSpellRecoveryTime(m_spellInfo) > 10 * MINUTE * IN_MILLISECONDS && !(m_spellInfo->AttributesEx4 & SPELL_ATTR_EX4_USABLE_IN_ARENA))
         if (MapEntry const* mapEntry = sMapStore.LookupEntry(m_caster->GetMapId()))
             if (mapEntry->IsBattleArena())
                 return SPELL_FAILED_NOT_IN_ARENA;
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp
index f23b112cbc8..7fd3650d6f4 100644
--- a/src/server/game/Spells/SpellMgr.cpp
+++ b/src/server/game/Spells/SpellMgr.cpp
@@ -2876,38 +2876,38 @@ int32 GetDiminishingReturnsLimitDuration(DiminishingGroup group, SpellEntry cons
         {
             // Wyvern Sting
             if (spellproto->SpellFamilyFlags[1] & 0x1000)
-                return 6 * IN_MILISECONDS;
+                return 6 * IN_MILLISECONDS;
             // Hunter's Mark
             if (spellproto->SpellFamilyFlags[0] & 0x400)
-                return 120 * IN_MILISECONDS;
+                return 120 * IN_MILLISECONDS;
             break;
         }
         case SPELLFAMILY_PALADIN:
         {
             // Repentance - limit to 6 seconds in PvP
             if (spellproto->SpellFamilyFlags[0] & 0x4)
-                return 6 * IN_MILISECONDS;
+                return 6 * IN_MILLISECONDS;
             break;
         }
         case SPELLFAMILY_DRUID:
         {
             // Faerie Fire - limit to 40 seconds in PvP (3.1)
             if (spellproto->SpellFamilyFlags[0] & 0x400)
-                return 40 * IN_MILISECONDS;
+                return 40 * IN_MILLISECONDS;
             break;
         }
         case SPELLFAMILY_PRIEST:
         {
             // Vampiric Embrace - limit to 60 seconds in PvP (3.1)
             if ((spellproto->SpellFamilyFlags[0] & 0x4) && spellproto->SpellIconID == 150)
-                return 60 * IN_MILISECONDS;
+                return 60 * IN_MILLISECONDS;
             break;
         }
         default:
             break;
     }
 
-    return 10 * IN_MILISECONDS;
+    return 10 * IN_MILLISECONDS;
 }
 
 bool IsDiminishingReturnsGroupDurationLimited(DiminishingGroup group)
diff --git a/src/server/game/Weather/Weather.cpp b/src/server/game/Weather/Weather.cpp
index d74f945fd5a..0bfb7f19345 100644
--- a/src/server/game/Weather/Weather.cpp
+++ b/src/server/game/Weather/Weather.cpp
@@ -37,7 +37,7 @@ Weather::Weather(uint32 zone, WeatherZoneChances const* weatherChances) : m_zone
     m_type = WEATHER_TYPE_FINE;
     m_grade = 0;
 
-    sLog.outDetail("WORLD: Starting weather system for zone %u (change every %u minutes).", m_zone, (uint32)(m_timer.GetInterval() / (MINUTE*IN_MILISECONDS)));
+    sLog.outDetail("WORLD: Starting weather system for zone %u (change every %u minutes).", m_zone, (uint32)(m_timer.GetInterval() / (MINUTE*IN_MILLISECONDS)));
 }
 
 /// Launch a weather update
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
index 27de78412a7..04a709e75f5 100644
--- a/src/server/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
@@ -614,7 +614,7 @@ void World::LoadConfigSettings(bool reload)
     m_configs[CONFIG_MAIL_LEVEL_REQ] = sConfig.GetIntDefault("LevelReq.Mail", 1);
     m_configs[CONFIG_ALLOW_PLAYER_COMMANDS] = sConfig.GetBoolDefault("AllowPlayerCommands", 1);
     m_configs[CONFIG_GRID_UNLOAD] = sConfig.GetBoolDefault("GridUnload", true);
-    m_configs[CONFIG_INTERVAL_SAVE] = sConfig.GetIntDefault("PlayerSaveInterval", 15 * MINUTE * IN_MILISECONDS);
+    m_configs[CONFIG_INTERVAL_SAVE] = sConfig.GetIntDefault("PlayerSaveInterval", 15 * MINUTE * IN_MILLISECONDS);
     m_configs[CONFIG_INTERVAL_DISCONNECT_TOLERANCE] = sConfig.GetIntDefault("DisconnectToleranceInterval", 0);
     m_configs[CONFIG_STATS_SAVE_ONLY_ON_LOGOUT] = sConfig.GetBoolDefault("PlayerSave.Stats.SaveOnlyOnLogout", true);
 
@@ -625,7 +625,7 @@ void World::LoadConfigSettings(bool reload)
         m_configs[CONFIG_MIN_LEVEL_STAT_SAVE] = 0;
     }
 
-    m_configs[CONFIG_INTERVAL_GRIDCLEAN] = sConfig.GetIntDefault("GridCleanUpDelay", 5 * MINUTE * IN_MILISECONDS);
+    m_configs[CONFIG_INTERVAL_GRIDCLEAN] = sConfig.GetIntDefault("GridCleanUpDelay", 5 * MINUTE * IN_MILLISECONDS);
     if (m_configs[CONFIG_INTERVAL_GRIDCLEAN] < MIN_GRID_DELAY)
     {
         sLog.outError("GridCleanUpDelay (%i) must be greater %u. Use this minimal value.",m_configs[CONFIG_INTERVAL_GRIDCLEAN],MIN_GRID_DELAY);
@@ -643,7 +643,7 @@ void World::LoadConfigSettings(bool reload)
     if (reload)
         sMapMgr.SetMapUpdateInterval(m_configs[CONFIG_INTERVAL_MAPUPDATE]);
 
-    m_configs[CONFIG_INTERVAL_CHANGEWEATHER] = sConfig.GetIntDefault("ChangeWeatherInterval", 10 * MINUTE * IN_MILISECONDS);
+    m_configs[CONFIG_INTERVAL_CHANGEWEATHER] = sConfig.GetIntDefault("ChangeWeatherInterval", 10 * MINUTE * IN_MILLISECONDS);
 
     if (reload)
     {
@@ -863,7 +863,7 @@ void World::LoadConfigSettings(bool reload)
 
     m_configs[CONFIG_CAST_UNSTUCK] = sConfig.GetBoolDefault("CastUnstuck", true);
     m_configs[CONFIG_INSTANCE_RESET_TIME_HOUR]  = sConfig.GetIntDefault("Instance.ResetTimeHour", 4);
-    m_configs[CONFIG_INSTANCE_UNLOAD_DELAY] = sConfig.GetIntDefault("Instance.UnloadDelay", 30 * MINUTE * IN_MILISECONDS);
+    m_configs[CONFIG_INSTANCE_UNLOAD_DELAY] = sConfig.GetIntDefault("Instance.UnloadDelay", 30 * MINUTE * IN_MILLISECONDS);
 
     m_configs[CONFIG_MAX_PRIMARY_TRADE_SKILL] = sConfig.GetIntDefault("MaxPrimaryTradeSkill", 2);
     m_configs[CONFIG_MIN_PETITION_SIGNS] = sConfig.GetIntDefault("MinPetitionSigns", 9);
@@ -911,7 +911,7 @@ void World::LoadConfigSettings(bool reload)
     }
     if (reload)
     {
-        m_timers[WUPDATE_UPTIME].SetInterval(m_configs[CONFIG_UPTIME_UPDATE]*MINUTE*IN_MILISECONDS);
+        m_timers[WUPDATE_UPTIME].SetInterval(m_configs[CONFIG_UPTIME_UPDATE]*MINUTE*IN_MILLISECONDS);
         m_timers[WUPDATE_UPTIME].Reset();
     }
 
@@ -924,7 +924,7 @@ void World::LoadConfigSettings(bool reload)
     }
     if (reload)
     {
-        m_timers[WUPDATE_CLEANDB].SetInterval(m_configs[CONFIG_LOGDB_CLEARINTERVAL] * MINUTE * IN_MILISECONDS);
+        m_timers[WUPDATE_CLEANDB].SetInterval(m_configs[CONFIG_LOGDB_CLEARINTERVAL] * MINUTE * IN_MILLISECONDS);
         m_timers[WUPDATE_CLEANDB].Reset();
     }
     m_configs[CONFIG_LOGDB_CLEARTIME] = sConfig.GetIntDefault("LogDB.Opt.ClearTime", 1209600); // 14 days default
@@ -1059,11 +1059,11 @@ void World::LoadConfigSettings(bool reload)
     m_configs[CONFIG_BATTLEGROUND_QUEUE_ANNOUNCER_ENABLE]       = sConfig.GetBoolDefault("Battleground.QueueAnnouncer.Enable", false);
     m_configs[CONFIG_BATTLEGROUND_QUEUE_ANNOUNCER_PLAYERONLY]   = sConfig.GetBoolDefault("Battleground.QueueAnnouncer.PlayerOnly", false);
     m_configs[CONFIG_BATTLEGROUND_INVITATION_TYPE]              = sConfig.GetIntDefault ("Battleground.InvitationType", 0);
-    m_configs[CONFIG_BATTLEGROUND_PREMATURE_FINISH_TIMER]       = sConfig.GetIntDefault ("BattleGround.PrematureFinishTimer", 5 * MINUTE * IN_MILISECONDS);
-    m_configs[CONFIG_BATTLEGROUND_PREMADE_GROUP_WAIT_FOR_MATCH] = sConfig.GetIntDefault ("BattleGround.PremadeGroupWaitForMatch", 30 * MINUTE * IN_MILISECONDS);
+    m_configs[CONFIG_BATTLEGROUND_PREMATURE_FINISH_TIMER]       = sConfig.GetIntDefault ("BattleGround.PrematureFinishTimer", 5 * MINUTE * IN_MILLISECONDS);
+    m_configs[CONFIG_BATTLEGROUND_PREMADE_GROUP_WAIT_FOR_MATCH] = sConfig.GetIntDefault ("BattleGround.PremadeGroupWaitForMatch", 30 * MINUTE * IN_MILLISECONDS);
     m_configs[CONFIG_BG_XP_FOR_KILL]                            = sConfig.GetBoolDefault("Battleground.GiveXPForKills", false);
     m_configs[CONFIG_ARENA_MAX_RATING_DIFFERENCE]               = sConfig.GetIntDefault ("Arena.MaxRatingDifference", 150);
-    m_configs[CONFIG_ARENA_RATING_DISCARD_TIMER]                = sConfig.GetIntDefault ("Arena.RatingDiscardTimer", 10 * MINUTE * IN_MILISECONDS);
+    m_configs[CONFIG_ARENA_RATING_DISCARD_TIMER]                = sConfig.GetIntDefault ("Arena.RatingDiscardTimer", 10 * MINUTE * IN_MILLISECONDS);
     m_configs[CONFIG_ARENA_AUTO_DISTRIBUTE_POINTS]              = sConfig.GetBoolDefault("Arena.AutoDistributePoints", false);
     m_configs[CONFIG_ARENA_AUTO_DISTRIBUTE_INTERVAL_DAYS]       = sConfig.GetIntDefault ("Arena.AutoDistributeInterval", 7);
     m_configs[CONFIG_ARENA_QUEUE_ANNOUNCER_ENABLE]              = sConfig.GetBoolDefault("Arena.QueueAnnouncer.Enable", false);
@@ -1637,24 +1637,24 @@ void World::SetInitialWorldSettings()
 
     static uint32 abtimer = 0;
     abtimer = sConfig.GetIntDefault("AutoBroadcast.Timer", 60000);
-    m_timers[WUPDATE_OBJECTS].SetInterval(IN_MILISECONDS/2);
+    m_timers[WUPDATE_OBJECTS].SetInterval(IN_MILLISECONDS/2);
     m_timers[WUPDATE_SESSIONS].SetInterval(0);
-    m_timers[WUPDATE_WEATHERS].SetInterval(1*IN_MILISECONDS);
-    m_timers[WUPDATE_AUCTIONS].SetInterval(MINUTE*IN_MILISECONDS);
-    m_timers[WUPDATE_UPTIME].SetInterval(m_configs[CONFIG_UPTIME_UPDATE]*MINUTE*IN_MILISECONDS);
+    m_timers[WUPDATE_WEATHERS].SetInterval(1*IN_MILLISECONDS);
+    m_timers[WUPDATE_AUCTIONS].SetInterval(MINUTE*IN_MILLISECONDS);
+    m_timers[WUPDATE_UPTIME].SetInterval(m_configs[CONFIG_UPTIME_UPDATE]*MINUTE*IN_MILLISECONDS);
                                                             //Update "uptime" table based on configuration entry in minutes.
-    m_timers[WUPDATE_CORPSES].SetInterval(20*MINUTE*IN_MILISECONDS);
+    m_timers[WUPDATE_CORPSES].SetInterval(20*MINUTE*IN_MILLISECONDS);
                                                             //erase corpses every 20 minutes
-    m_timers[WUPDATE_CLEANDB].SetInterval(m_configs[CONFIG_LOGDB_CLEARINTERVAL]*MINUTE*IN_MILISECONDS);
+    m_timers[WUPDATE_CLEANDB].SetInterval(m_configs[CONFIG_LOGDB_CLEARINTERVAL]*MINUTE*IN_MILLISECONDS);
                                                             // clean logs table every 14 days by default
     m_timers[WUPDATE_AUTOBROADCAST].SetInterval(abtimer);
 
     //to set mailtimer to return mails every day between 4 and 5 am
     //mailtimer is increased when updating auctions
     //one second is 1000 -(tested on win system)
-    mail_timer = ((((localtime(&m_gameTime)->tm_hour + 20) % 24)* HOUR * IN_MILISECONDS) / m_timers[WUPDATE_AUCTIONS].GetInterval());
+    mail_timer = ((((localtime(&m_gameTime)->tm_hour + 20) % 24)* HOUR * IN_MILLISECONDS) / m_timers[WUPDATE_AUCTIONS].GetInterval());
                                                             //1440
-    mail_timer_expires = ((DAY * IN_MILISECONDS) / (m_timers[WUPDATE_AUCTIONS].GetInterval()));
+    mail_timer_expires = ((DAY * IN_MILLISECONDS) / (m_timers[WUPDATE_AUCTIONS].GetInterval()));
     sLog.outDebug("Mail timer set to: %u, mail return is called every %u minutes", mail_timer, mail_timer_expires);
 
     ///- Initilize static helper structures
diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp
index 1f6821d7493..7592742ef23 100755
--- a/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp
+++ b/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp
@@ -63,13 +63,13 @@ struct mob_av_marshal_or_warmasterAI : public ScriptedAI
 
     void Reset()
     {
-        uiChargeTimer = urand(2*IN_MILISECONDS,12*IN_MILISECONDS);
-        uiCleaveTimer = urand(1*IN_MILISECONDS,11*IN_MILISECONDS);
-        uiDemoralizingShoutTimer = urand(2*IN_MILISECONDS,2*IN_MILISECONDS);
-        uiWhirlwind1Timer = urand(1*IN_MILISECONDS,12*IN_MILISECONDS);
-        uiWhirlwind2Timer = urand(5*IN_MILISECONDS,20*IN_MILISECONDS);
-        uiEnrageTimer = urand(5*IN_MILISECONDS,20*IN_MILISECONDS);
-        uiResetTimer = 5*IN_MILISECONDS;
+        uiChargeTimer = urand(2*IN_MILLISECONDS,12*IN_MILLISECONDS);
+        uiCleaveTimer = urand(1*IN_MILLISECONDS,11*IN_MILLISECONDS);
+        uiDemoralizingShoutTimer = urand(2*IN_MILLISECONDS,2*IN_MILLISECONDS);
+        uiWhirlwind1Timer = urand(1*IN_MILLISECONDS,12*IN_MILLISECONDS);
+        uiWhirlwind2Timer = urand(5*IN_MILLISECONDS,20*IN_MILLISECONDS);
+        uiEnrageTimer = urand(5*IN_MILLISECONDS,20*IN_MILLISECONDS);
+        uiResetTimer = 5*IN_MILLISECONDS;
 
         bHasAura = false;
     }
@@ -120,37 +120,37 @@ struct mob_av_marshal_or_warmasterAI : public ScriptedAI
         if (uiChargeTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_CHARGE);
-            uiChargeTimer = urand(10*IN_MILISECONDS,25*IN_MILISECONDS);
+            uiChargeTimer = urand(10*IN_MILLISECONDS,25*IN_MILLISECONDS);
         } else uiChargeTimer -= diff;
 
         if (uiCleaveTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_CLEAVE);
-            uiCleaveTimer =  urand(10*IN_MILISECONDS,16*IN_MILISECONDS);
+            uiCleaveTimer =  urand(10*IN_MILLISECONDS,16*IN_MILLISECONDS);
         } else uiCleaveTimer -= diff;
 
         if (uiDemoralizingShoutTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_DEMORALIZING_SHOUT);
-            uiDemoralizingShoutTimer = urand(10*IN_MILISECONDS,15*IN_MILISECONDS);
+            uiDemoralizingShoutTimer = urand(10*IN_MILLISECONDS,15*IN_MILLISECONDS);
         } else uiDemoralizingShoutTimer -= diff;
 
         if (uiWhirlwind1Timer <= diff)
         {
             DoCast(me->getVictim(), SPELL_WHIRLWIND1);
-            uiWhirlwind1Timer = urand(6*IN_MILISECONDS,20*IN_MILISECONDS);
+            uiWhirlwind1Timer = urand(6*IN_MILLISECONDS,20*IN_MILLISECONDS);
         } else uiWhirlwind1Timer -= diff;
 
         if (uiWhirlwind2Timer <= diff)
         {
             DoCast(me->getVictim(), SPELL_WHIRLWIND2);
-            uiWhirlwind2Timer = urand(10*IN_MILISECONDS,25*IN_MILISECONDS);
+            uiWhirlwind2Timer = urand(10*IN_MILLISECONDS,25*IN_MILLISECONDS);
         } else uiWhirlwind2Timer -= diff;
 
         if (uiEnrageTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_ENRAGE);
-            uiEnrageTimer = urand(10*IN_MILISECONDS,30*IN_MILISECONDS);
+            uiEnrageTimer = urand(10*IN_MILLISECONDS,30*IN_MILLISECONDS);
         }else uiEnrageTimer -= diff;
 
 
@@ -159,7 +159,7 @@ struct mob_av_marshal_or_warmasterAI : public ScriptedAI
         {
             if (me->GetDistance2d(me->GetHomePosition().GetPositionX(), me->GetHomePosition().GetPositionY()) > 50)
                 EnterEvadeMode();
-            uiResetTimer = 5*IN_MILISECONDS;
+            uiResetTimer = 5*IN_MILLISECONDS;
         } else uiResetTimer -= diff;
 
         DoMeleeAttackIfReady();
diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp
index 42e87b14a8c..bfc0e418334 100755
--- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp
+++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp
@@ -51,8 +51,8 @@ struct mob_water_elementalAI : public ScriptedAI
 
     void Reset()
     {
-        uiWaterBoltTimer            = 3*IN_MILISECONDS;
-        uiResetTimer                = 5*IN_MILISECONDS;
+        uiWaterBoltTimer            = 3*IN_MILLISECONDS;
+        uiResetTimer                = 5*IN_MILLISECONDS;
     }
 
     void UpdateAI(const uint32 diff)
@@ -63,7 +63,7 @@ struct mob_water_elementalAI : public ScriptedAI
         if (uiWaterBoltTimer < diff)
         {
             DoCast(me->getVictim(), SPELL_WATERBOLT);
-            uiWaterBoltTimer = 5*IN_MILISECONDS;
+            uiWaterBoltTimer = 5*IN_MILLISECONDS;
         } else uiWaterBoltTimer -= diff;
 
         // check if creature is not outside of building
@@ -72,7 +72,7 @@ struct mob_water_elementalAI : public ScriptedAI
             if (Creature *pBalinda = Unit::GetCreature(*me, uiBalindaGUID))
                 if (me->GetDistance2d(pBalinda->GetHomePosition().GetPositionX(), pBalinda->GetHomePosition().GetPositionY()) > 50)
                     EnterEvadeMode();
-                uiResetTimer = 5*IN_MILISECONDS;
+                uiResetTimer = 5*IN_MILLISECONDS;
         } else uiResetTimer -= diff;
 
         DoMeleeAttackIfReady();
@@ -94,11 +94,11 @@ struct boss_balindaAI : public ScriptedAI
 
     void Reset()
     {
-        uiArcaneExplosionTimer      = urand(5*IN_MILISECONDS,15*IN_MILISECONDS);
-        uiConeOfColdTimer           = 8*IN_MILISECONDS;
-        uiFireBoltTimer             = 1*IN_MILISECONDS;
-        uiFrostboltTimer            = 4*IN_MILISECONDS;
-        uiResetTimer                = 5*IN_MILISECONDS;
+        uiArcaneExplosionTimer      = urand(5*IN_MILLISECONDS,15*IN_MILLISECONDS);
+        uiConeOfColdTimer           = 8*IN_MILLISECONDS;
+        uiFireBoltTimer             = 1*IN_MILLISECONDS;
+        uiFrostboltTimer            = 4*IN_MILLISECONDS;
+        uiResetTimer                = 5*IN_MILLISECONDS;
         uiWaterElementalTimer       = 0;
 
         Summons.DespawnAll();
@@ -135,32 +135,32 @@ struct boss_balindaAI : public ScriptedAI
         if (uiWaterElementalTimer < diff)
         {
             if (Summons.empty())
-                me->SummonCreature(NPC_WATER_ELEMENTAL, 0, 0, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 45*IN_MILISECONDS);
-            uiWaterElementalTimer = 50*IN_MILISECONDS;
+                me->SummonCreature(NPC_WATER_ELEMENTAL, 0, 0, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 45*IN_MILLISECONDS);
+            uiWaterElementalTimer = 50*IN_MILLISECONDS;
         } else uiWaterElementalTimer -= diff;
 
         if (uiArcaneExplosionTimer < diff)
         {
             DoCast(me->getVictim(), SPELL_ARCANE_EXPLOSION);
-            uiArcaneExplosionTimer =  urand(5*IN_MILISECONDS,15*IN_MILISECONDS);
+            uiArcaneExplosionTimer =  urand(5*IN_MILLISECONDS,15*IN_MILLISECONDS);
         } else uiArcaneExplosionTimer -= diff;
 
         if (uiConeOfColdTimer < diff)
         {
             DoCast(me->getVictim(), SPELL_CONE_OF_COLD);
-            uiConeOfColdTimer = urand(10*IN_MILISECONDS,20*IN_MILISECONDS);
+            uiConeOfColdTimer = urand(10*IN_MILLISECONDS,20*IN_MILLISECONDS);
         } else uiConeOfColdTimer -= diff;
 
         if (uiFireBoltTimer < diff)
         {
             DoCast(me->getVictim(), SPELL_FIREBALL);
-            uiFireBoltTimer = urand(5*IN_MILISECONDS,9*IN_MILISECONDS);
+            uiFireBoltTimer = urand(5*IN_MILLISECONDS,9*IN_MILLISECONDS);
         } else uiFireBoltTimer -= diff;
 
         if (uiFrostboltTimer < diff)
         {
             DoCast(me->getVictim(), SPELL_FROSTBOLT);
-            uiFrostboltTimer = urand(4*IN_MILISECONDS,12*IN_MILISECONDS);
+            uiFrostboltTimer = urand(4*IN_MILLISECONDS,12*IN_MILLISECONDS);
         } else uiFrostboltTimer -= diff;
 
 
@@ -172,7 +172,7 @@ struct boss_balindaAI : public ScriptedAI
                 EnterEvadeMode();
                 DoScriptText(YELL_EVADE, me);
             }
-            uiResetTimer = 5*IN_MILISECONDS;
+            uiResetTimer = 5*IN_MILLISECONDS;
         } else uiResetTimer -= diff;
 
         DoMeleeAttackIfReady();
diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp
index 60e26972574..5488a85af87 100755
--- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp
+++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp
@@ -54,12 +54,12 @@ struct boss_drektharAI : public ScriptedAI
 
     void Reset()
     {
-        uiWhirlwindTimer = urand(1*IN_MILISECONDS,20*IN_MILISECONDS);
-        uiWhirlwind2Timer = urand(1*IN_MILISECONDS,20*IN_MILISECONDS);
-        uiKnockdownTimer = 12*IN_MILISECONDS;
-        uiFrenzyTimer = 6*IN_MILISECONDS;
-        uiResetTimer = 5*IN_MILISECONDS;
-        uiYellTimer = urand(20*IN_MILISECONDS,30*IN_MILISECONDS); //20 to 30 seconds
+        uiWhirlwindTimer = urand(1*IN_MILLISECONDS,20*IN_MILLISECONDS);
+        uiWhirlwind2Timer = urand(1*IN_MILLISECONDS,20*IN_MILLISECONDS);
+        uiKnockdownTimer = 12*IN_MILLISECONDS;
+        uiFrenzyTimer = 6*IN_MILLISECONDS;
+        uiResetTimer = 5*IN_MILLISECONDS;
+        uiYellTimer = urand(20*IN_MILLISECONDS,30*IN_MILLISECONDS); //20 to 30 seconds
     }
 
     void Aggro(Unit * /*who*/)
@@ -81,31 +81,31 @@ struct boss_drektharAI : public ScriptedAI
         if (uiWhirlwindTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_WHIRLWIND);
-            uiWhirlwindTimer =  urand(8*IN_MILISECONDS,18*IN_MILISECONDS);
+            uiWhirlwindTimer =  urand(8*IN_MILLISECONDS,18*IN_MILLISECONDS);
         } else uiWhirlwindTimer -= diff;
 
         if (uiWhirlwind2Timer <= diff)
         {
             DoCast(me->getVictim(), SPELL_WHIRLWIND2);
-            uiWhirlwind2Timer = urand(7*IN_MILISECONDS,25*IN_MILISECONDS);
+            uiWhirlwind2Timer = urand(7*IN_MILLISECONDS,25*IN_MILLISECONDS);
         } else uiWhirlwind2Timer -= diff;
 
         if (uiKnockdownTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_KNOCKDOWN);
-            uiKnockdownTimer = urand(10*IN_MILISECONDS,15*IN_MILISECONDS);
+            uiKnockdownTimer = urand(10*IN_MILLISECONDS,15*IN_MILLISECONDS);
         } else uiKnockdownTimer -= diff;
 
         if (uiFrenzyTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_FRENZY);
-            uiFrenzyTimer = urand(20*IN_MILISECONDS,30*IN_MILISECONDS);
+            uiFrenzyTimer = urand(20*IN_MILLISECONDS,30*IN_MILLISECONDS);
         } else uiFrenzyTimer -= diff;
 
         if (uiYellTimer <= diff)
         {
             DoScriptText(RAND(YELL_RANDOM1,YELL_RANDOM2,YELL_RANDOM3,YELL_RANDOM4,YELL_RANDOM5), me);
-            uiYellTimer = urand(20*IN_MILISECONDS,30*IN_MILISECONDS); //20 to 30 seconds
+            uiYellTimer = urand(20*IN_MILLISECONDS,30*IN_MILLISECONDS); //20 to 30 seconds
         } else uiYellTimer -= diff;
 
         // check if creature is not outside of building
@@ -116,7 +116,7 @@ struct boss_drektharAI : public ScriptedAI
                 EnterEvadeMode();
                 DoScriptText(YELL_EVADE, me);
             }
-            uiResetTimer = 5*IN_MILISECONDS;
+            uiResetTimer = 5*IN_MILLISECONDS;
         } else uiResetTimer -= diff;
 
         DoMeleeAttackIfReady();
diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp
index 8f27fe61810..2c30c7c16b4 100755
--- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp
+++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp
@@ -47,12 +47,12 @@ struct boss_galvangarAI : public ScriptedAI
 
     void Reset()
     {
-        uiCleaveTimer                     = urand(1*IN_MILISECONDS,9*IN_MILISECONDS);
-        uiFrighteningShoutTimer           = urand(2*IN_MILISECONDS,19*IN_MILISECONDS);
-        uiWhirlwind1Timer                 = urand(1*IN_MILISECONDS,13*IN_MILISECONDS);
-        uiWhirlwind2Timer                 = urand(5*IN_MILISECONDS,20*IN_MILISECONDS);
-        uiMortalStrikeTimer               = urand(5*IN_MILISECONDS,20*IN_MILISECONDS);
-        uiResetTimer                      = 5*IN_MILISECONDS;
+        uiCleaveTimer                     = urand(1*IN_MILLISECONDS,9*IN_MILLISECONDS);
+        uiFrighteningShoutTimer           = urand(2*IN_MILLISECONDS,19*IN_MILLISECONDS);
+        uiWhirlwind1Timer                 = urand(1*IN_MILLISECONDS,13*IN_MILLISECONDS);
+        uiWhirlwind2Timer                 = urand(5*IN_MILLISECONDS,20*IN_MILLISECONDS);
+        uiMortalStrikeTimer               = urand(5*IN_MILLISECONDS,20*IN_MILLISECONDS);
+        uiResetTimer                      = 5*IN_MILLISECONDS;
     }
 
     void Aggro(Unit * /*who*/)
@@ -73,31 +73,31 @@ struct boss_galvangarAI : public ScriptedAI
         if (uiCleaveTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_CLEAVE);
-            uiCleaveTimer =  urand(10*IN_MILISECONDS,16*IN_MILISECONDS);
+            uiCleaveTimer =  urand(10*IN_MILLISECONDS,16*IN_MILLISECONDS);
         } else uiCleaveTimer -= diff;
 
         if (uiFrighteningShoutTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_FRIGHTENING_SHOUT);
-            uiFrighteningShoutTimer = urand(10*IN_MILISECONDS,15*IN_MILISECONDS);
+            uiFrighteningShoutTimer = urand(10*IN_MILLISECONDS,15*IN_MILLISECONDS);
         } else uiFrighteningShoutTimer -= diff;
 
         if (uiWhirlwind1Timer <= diff)
         {
             DoCast(me->getVictim(), SPELL_WHIRLWIND1);
-            uiWhirlwind1Timer = urand(6*IN_MILISECONDS,10*IN_MILISECONDS);
+            uiWhirlwind1Timer = urand(6*IN_MILLISECONDS,10*IN_MILLISECONDS);
         } else uiWhirlwind1Timer -= diff;
 
         if (uiWhirlwind2Timer <= diff)
         {
             DoCast(me->getVictim(), SPELL_WHIRLWIND2);
-            uiWhirlwind2Timer = urand(10*IN_MILISECONDS,25*IN_MILISECONDS);
+            uiWhirlwind2Timer = urand(10*IN_MILLISECONDS,25*IN_MILLISECONDS);
         } else uiWhirlwind2Timer -= diff;
 
         if (uiMortalStrikeTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_MORTAL_STRIKE);
-            uiMortalStrikeTimer = urand(10*IN_MILISECONDS,30*IN_MILISECONDS);
+            uiMortalStrikeTimer = urand(10*IN_MILLISECONDS,30*IN_MILLISECONDS);
         } else uiMortalStrikeTimer -= diff;
 
         // check if creature is not outside of building
@@ -108,7 +108,7 @@ struct boss_galvangarAI : public ScriptedAI
                 EnterEvadeMode();
                 DoScriptText(YELL_EVADE, me);
             }
-            uiResetTimer = 5*IN_MILISECONDS;
+            uiResetTimer = 5*IN_MILLISECONDS;
         } else uiResetTimer -= diff;
 
         DoMeleeAttackIfReady();
diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp
index f24d6eec5a9..cb01944b998 100755
--- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp
+++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp
@@ -53,11 +53,11 @@ struct boss_vanndarAI : public ScriptedAI
 
     void Reset()
     {
-        uiAvatarTimer = 3*IN_MILISECONDS;
-        uiThunderclapTimer = 4*IN_MILISECONDS;
-        uiStormboltTimer = 6*IN_MILISECONDS;
-        uiResetTimer = 5*IN_MILISECONDS;
-        uiYellTimer = urand(20*IN_MILISECONDS,30*IN_MILISECONDS);
+        uiAvatarTimer = 3*IN_MILLISECONDS;
+        uiThunderclapTimer = 4*IN_MILLISECONDS;
+        uiStormboltTimer = 6*IN_MILLISECONDS;
+        uiResetTimer = 5*IN_MILLISECONDS;
+        uiYellTimer = urand(20*IN_MILLISECONDS,30*IN_MILLISECONDS);
     }
 
     void Aggro(Unit * /*who*/)
@@ -79,25 +79,25 @@ struct boss_vanndarAI : public ScriptedAI
         if (uiAvatarTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_AVATAR);
-            uiAvatarTimer =  urand(15*IN_MILISECONDS,20*IN_MILISECONDS);
+            uiAvatarTimer =  urand(15*IN_MILLISECONDS,20*IN_MILLISECONDS);
         } else uiAvatarTimer -= diff;
 
         if (uiThunderclapTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_THUNDERCLAP);
-            uiThunderclapTimer = urand(5*IN_MILISECONDS,15*IN_MILISECONDS);
+            uiThunderclapTimer = urand(5*IN_MILLISECONDS,15*IN_MILLISECONDS);
         } else uiThunderclapTimer -= diff;
 
         if (uiStormboltTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_STORMBOLT);
-            uiStormboltTimer = urand(10*IN_MILISECONDS,25*IN_MILISECONDS);
+            uiStormboltTimer = urand(10*IN_MILLISECONDS,25*IN_MILLISECONDS);
         } else uiStormboltTimer -= diff;
 
         if (uiYellTimer <= diff)
         {
             DoScriptText(RAND(YELL_RANDOM1,YELL_RANDOM2,YELL_RANDOM3,YELL_RANDOM4,YELL_RANDOM5,YELL_RANDOM6,YELL_RANDOM7), me);
-            uiYellTimer = urand(20*IN_MILISECONDS,30*IN_MILISECONDS); //20 to 30 seconds
+            uiYellTimer = urand(20*IN_MILLISECONDS,30*IN_MILLISECONDS); //20 to 30 seconds
         } else uiYellTimer -= diff;
 
         // check if creature is not outside of building
@@ -108,7 +108,7 @@ struct boss_vanndarAI : public ScriptedAI
                 EnterEvadeMode();
                 DoScriptText(YELL_EVADE, me);
             }
-            uiResetTimer = 5*IN_MILISECONDS;
+            uiResetTimer = 5*IN_MILLISECONDS;
         } else uiResetTimer -= diff;
 
         DoMeleeAttackIfReady();
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/blackrock_spire.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/blackrock_spire.cpp
index a0508c1d86e..86de9f60920 100755
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/blackrock_spire.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/blackrock_spire.cpp
@@ -56,7 +56,7 @@ bool GOHello_rookey_egg(Player *pPlayer, GameObject * /*pGO*/)
 {
     Position pos;
     pPlayer->GetPosition(&pos);
-    pPlayer->SummonCreature(NPC_ROOKERY_WHELP, pos, TEMPSUMMON_TIMED_DESPAWN, 15*IN_MILISECONDS);
+    pPlayer->SummonCreature(NPC_ROOKERY_WHELP, pos, TEMPSUMMON_TIMED_DESPAWN, 15*IN_MILLISECONDS);
     //destroy gobject need to be implemented
 
     return true;
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp
index 208843e359e..53f2b730a80 100755
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp
@@ -35,7 +35,7 @@ struct instance_blackrock_spire : public ScriptedInstance
 
     void Initialize()
     {
-      uiLeeroyTimer = 15*IN_MILISECONDS;
+      uiLeeroyTimer = 15*IN_MILLISECONDS;
       uiWhelpCount = 0;
       bLeeeeeeeeroy = true;
       uiLeroyData = 0;
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
index c5bc8a2a3d4..6498e48069a 100755
--- a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
@@ -94,7 +94,7 @@ void SummonCroneIfReady(ScriptedInstance* pInstance, Creature* pCreature)
 
     if (pInstance->GetData(DATA_OPERA_OZ_DEATHCOUNT) == 4)
     {
-        if (Creature* pCrone = pCreature->SummonCreature(CREATURE_CRONE, -10891.96, -1755.95, pCreature->GetPositionZ(), 4.64, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, HOUR*2*IN_MILISECONDS))
+        if (Creature* pCrone = pCreature->SummonCreature(CREATURE_CRONE, -10891.96, -1755.95, pCreature->GetPositionZ(), 4.64, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, HOUR*2*IN_MILLISECONDS))
         {
             if (pCreature->getVictim())
                 pCrone->AI()->AttackStart(pCreature->getVictim());
@@ -727,7 +727,7 @@ bool GossipSelect_npc_grandmother(Player* pPlayer, Creature* pCreature, uint32 /
 {
     if (uiAction == GOSSIP_ACTION_INFO_DEF)
     {
-        if (Creature* pBigBadWolf = pCreature->SummonCreature(CREATURE_BIG_BAD_WOLF, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, HOUR*2*IN_MILISECONDS))
+        if (Creature* pBigBadWolf = pCreature->SummonCreature(CREATURE_BIG_BAD_WOLF, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, HOUR*2*IN_MILLISECONDS))
             pBigBadWolf->AI()->AttackStart(pPlayer);
 
         pCreature->ForcedDespawn();
@@ -1285,7 +1285,7 @@ void boss_julianneAI::UpdateAI(const uint32 diff)
     {
         if (SummonRomuloTimer <= diff)
         {
-            if (Creature* pRomulo = me->SummonCreature(CREATURE_ROMULO, ROMULO_X, ROMULO_Y, me->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, HOUR*2*IN_MILISECONDS))
+            if (Creature* pRomulo = me->SummonCreature(CREATURE_ROMULO, ROMULO_X, ROMULO_Y, me->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, HOUR*2*IN_MILLISECONDS))
             {
                 RomuloGUID = pRomulo->GetGUID();
                 CAST_AI(boss_romuloAI, pRomulo->AI())->JulianneGUID = me->GetGUID();
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
index bf9c2519dd9..29e22d36047 100755
--- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
@@ -247,7 +247,7 @@ struct npc_barnesAI : public npc_escortAI
             uint32 entry = ((uint32)Spawns[index][0]);
             float PosX = Spawns[index][1];
 
-            if (Creature* pCreature = me->SummonCreature(entry, PosX, SPAWN_Y, SPAWN_Z, SPAWN_O, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, HOUR*2*IN_MILISECONDS))
+            if (Creature* pCreature = me->SummonCreature(entry, PosX, SPAWN_Y, SPAWN_Z, SPAWN_O, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, HOUR*2*IN_MILLISECONDS))
             {
                 // In case database has bad flags
                 pCreature->SetUInt32Value(UNIT_FIELD_FLAGS, 0);
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp
index d23c7883f96..f6f1631fa6a 100755
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp
@@ -72,7 +72,7 @@ struct npc_kalecgosAI : public ScriptedAI
             return;
 
         if (uiPointId == POINT_ID_LAND)
-            m_uiTransformTimer = MINUTE*IN_MILISECONDS;
+            m_uiTransformTimer = MINUTE*IN_MILLISECONDS;
     }
 
     // some targeting issues with the spell, so use this workaround as temporary solution
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_golemagg.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_golemagg.cpp
index 1665d8356b9..5ad9768d567 100755
--- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_golemagg.cpp
+++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_golemagg.cpp
@@ -55,9 +55,9 @@ struct boss_golemaggAI : public ScriptedAI
 
     void Reset()
     {
-        m_uiPyroblastTimer = 7*IN_MILISECONDS;              // These timers are probably wrong
-        m_uiEarthquakeTimer = 3*IN_MILISECONDS;
-        m_uiBuffTimer = 2.5*IN_MILISECONDS;
+        m_uiPyroblastTimer = 7*IN_MILLISECONDS;              // These timers are probably wrong
+        m_uiEarthquakeTimer = 3*IN_MILLISECONDS;
+        m_uiBuffTimer = 2.5*IN_MILLISECONDS;
         m_bEnraged = false;
 
         DoCast(me, SPELL_MAGMASPLASH, true);
@@ -80,7 +80,7 @@ struct boss_golemaggAI : public ScriptedAI
             if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
                 DoCast(pTarget, SPELL_PYROBLAST);
 
-            m_uiPyroblastTimer = 7*IN_MILISECONDS;
+            m_uiPyroblastTimer = 7*IN_MILLISECONDS;
         }
         else
             m_uiPyroblastTimer -= uiDiff;
@@ -98,7 +98,7 @@ struct boss_golemaggAI : public ScriptedAI
             if (m_uiEarthquakeTimer <= uiDiff)
             {
                 DoCast(me->getVictim(), SPELL_EARTHQUAKE);
-                m_uiEarthquakeTimer = 3*IN_MILISECONDS;
+                m_uiEarthquakeTimer = 3*IN_MILLISECONDS;
             }
             else
                 m_uiEarthquakeTimer -= uiDiff;
@@ -109,7 +109,7 @@ struct boss_golemaggAI : public ScriptedAI
         if (m_uiBuffTimer <= uidiff)
         {
             DoCast(me, SPELL_GOLEMAGG_TRUST);
-            m_uiBuffTimer = 2.5*IN_MILISECONDS;
+            m_uiBuffTimer = 2.5*IN_MILLISECONDS;
         }
         else
             m_uiBuffTimer -= uiDiff;
@@ -132,7 +132,7 @@ struct mob_core_ragerAI : public ScriptedAI
 
     void Reset()
     {
-        m_uiMangleTimer = 7*IN_MILISECONDS;                 // These times are probably wrong
+        m_uiMangleTimer = 7*IN_MILLISECONDS;                 // These times are probably wrong
     }
 
     void DamageTaken(Unit* /*pDoneBy*/, uint32& uiDamage)
@@ -164,7 +164,7 @@ struct mob_core_ragerAI : public ScriptedAI
         if (m_uiMangleTimer <= uiDiff)
         {
             DoCast(me->getVictim(), SPELL_MANGLE);
-            m_uiMangleTimer = 10*IN_MILISECONDS;
+            m_uiMangleTimer = 10*IN_MILLISECONDS;
         }
         else
             m_uiMangleTimer -= uiDiff;
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp
index 5f1e1a0f088..ec2fd370a16 100755
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp
@@ -102,7 +102,7 @@ struct boss_dathrohan_balnazzarAI : public ScriptedAI
         for (uint8 i=0; iSummonCreature(NPC_ZOMBIE,
             m_aSummonPoint[i].m_fX, m_aSummonPoint[i].m_fY, m_aSummonPoint[i].m_fZ, m_aSummonPoint[i].m_fOrient,
-            TEMPSUMMON_TIMED_DESPAWN, HOUR*IN_MILISECONDS);
+            TEMPSUMMON_TIMED_DESPAWN, HOUR*IN_MILLISECONDS);
     }
 
     void EnterCombat(Unit * /*who*/)
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
index bf45480783e..2be5b6caacb 100755
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
@@ -96,7 +96,7 @@ struct boss_akilzonAI : public ScriptedAI
         GustOfWind_Timer = urand(20000,30000); //20 to 30 seconds(bosskillers)
         CallLighting_Timer = urand(10000,20000); //totaly random timer. can't find any info on this
         ElectricalStorm_Timer = 60000; //60 seconds(bosskillers)
-        Enrage_Timer = 10*MINUTE*IN_MILISECONDS; //10 minutes till enrage(bosskillers)
+        Enrage_Timer = 10*MINUTE*IN_MILLISECONDS; //10 minutes till enrage(bosskillers)
         SummonEagles_Timer = 99999;
 
         TargetGUID = 0;
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
index ffa963fdb04..073fff60456 100755
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
@@ -143,7 +143,7 @@ struct boss_janalaiAI : public ScriptedAI
         BombSequenceTimer = 1000;
         BombCount = 0;
         HatcherTimer = 10000;
-        EnrageTimer = MINUTE*5*IN_MILISECONDS;
+        EnrageTimer = MINUTE*5*IN_MILLISECONDS;
 
         noeggs = false;
         isBombing =false;
diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp
index 8de463d4afc..36a2712fe6d 100755
--- a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp
+++ b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp
@@ -137,7 +137,7 @@ struct instance_onyxias_lair : public ScriptedInstance
                 {
                     m_bAchievManyWhelpsHandleIt = false;
                     m_uiManyWhelpsCounter = 0;
-                    m_uiOnyxiaLiftoffTimer = 10*IN_MILISECONDS;
+                    m_uiOnyxiaLiftoffTimer = 10*IN_MILLISECONDS;
                 }
                 break;
             case DATA_SHE_DEEP_BREATH_MORE:
diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp
index a428cc6a856..65c649c4225 100755
--- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp
@@ -117,10 +117,10 @@ struct boss_anub_arakAI : public ScriptedAI
 
     void Reset()
     {
-        uiCarrionBeetlesTimer = 8*IN_MILISECONDS;
-        uiLeechingSwarmTimer = 20*IN_MILISECONDS;
-        uiImpaleTimer = 9*IN_MILISECONDS;
-        uiPoundTimer = 15*IN_MILISECONDS;
+        uiCarrionBeetlesTimer = 8*IN_MILLISECONDS;
+        uiLeechingSwarmTimer = 20*IN_MILLISECONDS;
+        uiImpaleTimer = 9*IN_MILLISECONDS;
+        uiPoundTimer = 15*IN_MILLISECONDS;
 
         uiPhase = PHASE_MELEE;
         uiUndergroundPhase = 0;
@@ -144,7 +144,7 @@ struct boss_anub_arakAI : public ScriptedAI
         Position targetPos;
         pTarget->GetPosition(&targetPos);
 
-        if (TempSummon* pImpaleTarget = me->SummonCreature(CREATURE_IMPALE_TARGET, targetPos, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 6*IN_MILISECONDS))
+        if (TempSummon* pImpaleTarget = me->SummonCreature(CREATURE_IMPALE_TARGET, targetPos, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 6*IN_MILLISECONDS))
         {
             uiImpaleTarget = pImpaleTarget->GetGUID();
             pImpaleTarget->SetReactState(REACT_PASSIVE);
@@ -183,7 +183,7 @@ struct boss_anub_arakAI : public ScriptedAI
                     {
                         if (Creature *pImpaleTarget = DoSummonImpaleTarget(target))
                             pImpaleTarget->CastSpell(pImpaleTarget, SPELL_IMPALE_SHAKEGROUND, true);
-                        uiImpaleTimer = 3*IN_MILISECONDS;
+                        uiImpaleTimer = 3*IN_MILLISECONDS;
                         uiImpalePhase = IMPALE_PHASE_ATTACK;
                     }
                     break;
@@ -194,13 +194,13 @@ struct boss_anub_arakAI : public ScriptedAI
                         pImpaleTarget->RemoveAurasDueToSpell(SPELL_IMPALE_SHAKEGROUND);
                     }
                     uiImpalePhase = IMPALE_PHASE_DMG;
-                    uiImpaleTimer = 1*IN_MILISECONDS;
+                    uiImpaleTimer = 1*IN_MILLISECONDS;
                     break;
                 case IMPALE_PHASE_DMG:
                     if (Creature* pImpaleTarget = Unit::GetCreature(*me, uiImpaleTarget))
                         me->CastSpell(pImpaleTarget, DUNGEON_MODE(SPELL_IMPALE_DMG, SPELL_IMPALE_DMG_H), true);
                     uiImpalePhase = IMPALE_PHASE_TARGET;
-                    uiImpaleTimer = 9*IN_MILISECONDS;
+                    uiImpaleTimer = 9*IN_MILLISECONDS;
                     break;
                 }
             } else uiImpaleTimer -= diff;
@@ -274,12 +274,12 @@ struct boss_anub_arakAI : public ScriptedAI
                 bVenomancerSummoned = false;
                 bDatterSummoned = false;
 
-                uiUndergroundTimer = 40*IN_MILISECONDS;
-                uiVenomancerTimer = 25*IN_MILISECONDS;
-                uiDatterTimer = 32*IN_MILISECONDS;
+                uiUndergroundTimer = 40*IN_MILLISECONDS;
+                uiVenomancerTimer = 25*IN_MILLISECONDS;
+                uiDatterTimer = 32*IN_MILLISECONDS;
 
                 uiImpalePhase = 0;
-                uiImpaleTimer = 9*IN_MILISECONDS;
+                uiImpaleTimer = 9*IN_MILLISECONDS;
 
                 DoCast(me, SPELL_SUBMERGE, false);
                 me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE);
@@ -298,13 +298,13 @@ struct boss_anub_arakAI : public ScriptedAI
             {
                 bChanneling = true;
                 DoCastVictim(SPELL_CARRION_BEETLES);
-                uiCarrionBeetlesTimer = 25*IN_MILISECONDS;
+                uiCarrionBeetlesTimer = 25*IN_MILLISECONDS;
             } else uiCarrionBeetlesTimer -= diff;
             
             if (uiLeechingSwarmTimer <= diff)
             {
                 DoCast(me, SPELL_LEECHING_SWARM, true);
-                uiLeechingSwarmTimer = 19*IN_MILISECONDS;
+                uiLeechingSwarmTimer = 19*IN_MILLISECONDS;
             } else uiLeechingSwarmTimer -= diff;
 
             if (uiPoundTimer <= diff)
@@ -314,7 +314,7 @@ struct boss_anub_arakAI : public ScriptedAI
                     if (Creature *pImpaleTarget = DoSummonImpaleTarget(target))
                         me->CastSpell(pImpaleTarget, DUNGEON_MODE(SPELL_POUND, SPELL_POUND_H), false);
                 }
-                uiPoundTimer = 16.5*IN_MILISECONDS;
+                uiPoundTimer = 16.5*IN_MILLISECONDS;
             } else uiPoundTimer -= diff;
 
             DoMeleeAttackIfReady();
diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
index 088b39bce03..7b8a81013be 100755
--- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
@@ -71,12 +71,12 @@ struct boss_hadronoxAI : public ScriptedAI
         me->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, 9.0f);
         me->SetFloatValue(UNIT_FIELD_COMBATREACH, 9.0f);
 
-        uiAcidTimer = urand(10*IN_MILISECONDS,14*IN_MILISECONDS);
-        uiLeechTimer = urand(3*IN_MILISECONDS,9*IN_MILISECONDS);
-        uiPierceTimer = urand(1*IN_MILISECONDS,3*IN_MILISECONDS);
-        uiGrabTimer = urand(15*IN_MILISECONDS,19*IN_MILISECONDS);
-        uiDoorsTimer = urand(20*IN_MILISECONDS,30*IN_MILISECONDS);
-        uiCheckDistanceTimer = 2*IN_MILISECONDS;
+        uiAcidTimer = urand(10*IN_MILLISECONDS,14*IN_MILLISECONDS);
+        uiLeechTimer = urand(3*IN_MILLISECONDS,9*IN_MILLISECONDS);
+        uiPierceTimer = urand(1*IN_MILLISECONDS,3*IN_MILLISECONDS);
+        uiGrabTimer = urand(15*IN_MILLISECONDS,19*IN_MILLISECONDS);
+        uiDoorsTimer = urand(20*IN_MILLISECONDS,30*IN_MILLISECONDS);
+        uiCheckDistanceTimer = 2*IN_MILLISECONDS;
 
         if (pInstance && (pInstance->GetData(DATA_HADRONOX_EVENT) != DONE && !bFirstTime))
             pInstance->SetData(DATA_HADRONOX_EVENT, FAIL);
@@ -121,7 +121,7 @@ struct boss_hadronoxAI : public ScriptedAI
         me->GetRespawnCoord(x,y,z);
 
         if (uiCheckDistanceTimer <= uiDiff)
-            uiCheckDistanceTimer = 5*IN_MILISECONDS;
+            uiCheckDistanceTimer = 5*IN_MILLISECONDS;
         else
         {
             uiCheckDistanceTimer -= uiDiff;
@@ -152,7 +152,7 @@ struct boss_hadronoxAI : public ScriptedAI
         if (uiPierceTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_PIERCE_ARMOR);
-            uiPierceTimer = 8*IN_MILISECONDS;
+            uiPierceTimer = 8*IN_MILLISECONDS;
         } else uiPierceTimer -= diff;
 
         if (uiAcidTimer <= diff)
@@ -160,7 +160,7 @@ struct boss_hadronoxAI : public ScriptedAI
             if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
                 DoCast(pTarget, SPELL_ACID_CLOUD);
 
-            uiAcidTimer = urand(20*IN_MILISECONDS,30*IN_MILISECONDS);
+            uiAcidTimer = urand(20*IN_MILLISECONDS,30*IN_MILLISECONDS);
         } else uiAcidTimer -= diff;
 
         if (uiLeechTimer <= diff)
@@ -168,7 +168,7 @@ struct boss_hadronoxAI : public ScriptedAI
             if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
                 DoCast(pTarget, SPELL_LEECH_POISON);
 
-            uiLeechTimer = urand(11*IN_MILISECONDS,14*IN_MILISECONDS);
+            uiLeechTimer = urand(11*IN_MILLISECONDS,14*IN_MILLISECONDS);
         } else uiLeechTimer -= diff;
 
         if (uiGrabTimer <= diff)
@@ -176,13 +176,13 @@ struct boss_hadronoxAI : public ScriptedAI
             if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) // Draws all players (and attacking Mobs) to itself.
                 DoCast(pTarget, SPELL_WEB_GRAB);
 
-            uiGrabTimer = urand(15*IN_MILISECONDS,30*IN_MILISECONDS);
+            uiGrabTimer = urand(15*IN_MILLISECONDS,30*IN_MILLISECONDS);
         } else uiGrabTimer -= diff;
 
         if (uiDoorsTimer <= diff)
         {
             //DoCast(me, RAND(SPELL_WEB_FRONT_DOORS, SPELL_WEB_SIDE_DOORS));
-            uiDoorsTimer = urand(30*IN_MILISECONDS,60*IN_MILISECONDS);
+            uiDoorsTimer = urand(30*IN_MILLISECONDS,60*IN_MILLISECONDS);
         } else uiDoorsTimer -= diff;
 
         DoMeleeAttackIfReady();
diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp
index 96707cead16..9680863acad 100755
--- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp
@@ -106,8 +106,8 @@ struct boss_krik_thirAI : public ScriptedAI
 
     void Reset()
     {
-        uiMindFlayTimer = 15*IN_MILISECONDS;
-        uiCurseFatigueTimer = 12*IN_MILISECONDS;
+        uiMindFlayTimer = 15*IN_MILLISECONDS;
+        uiCurseFatigueTimer = 12*IN_MILLISECONDS;
 
         if (pInstance)
             pInstance->SetData(DATA_KRIKTHIR_THE_GATEWATCHER_EVENT, NOT_STARTED);
@@ -117,7 +117,7 @@ struct boss_krik_thirAI : public ScriptedAI
     {
         DoScriptText(SAY_AGGRO, me);
         Summon();
-        uiSummonTimer = 15*IN_MILISECONDS;
+        uiSummonTimer = 15*IN_MILLISECONDS;
 
         if (pInstance)
             pInstance->SetData(DATA_KRIKTHIR_THE_GATEWATCHER_EVENT, IN_PROGRESS);
@@ -125,22 +125,22 @@ struct boss_krik_thirAI : public ScriptedAI
 
     void Summon()
     {
-            me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[0],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS);
-            me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[0],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS);
-            me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[1],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS);
-            me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[1],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS);
-            me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[2],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS);
-            me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[2],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS);
-            me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[3],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS);
-            me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[3],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS);
-            me->SummonCreature(MOB_SKITTERING_INFECTIOR,SpawnPoint[4],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS);
-            me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[4],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS);
-            me->SummonCreature(MOB_SKITTERING_INFECTIOR,SpawnPoint[5],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS);
-            me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[5],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS);
-            me->SummonCreature(MOB_SKITTERING_INFECTIOR,SpawnPoint[6],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS);
-            me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[6],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS);
-            me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[7],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS);
-            me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[7],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILISECONDS);
+            me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[0],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS);
+            me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[0],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS);
+            me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[1],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS);
+            me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[1],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS);
+            me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[2],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS);
+            me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[2],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS);
+            me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[3],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS);
+            me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[3],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS);
+            me->SummonCreature(MOB_SKITTERING_INFECTIOR,SpawnPoint[4],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS);
+            me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[4],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS);
+            me->SummonCreature(MOB_SKITTERING_INFECTIOR,SpawnPoint[5],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS);
+            me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[5],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS);
+            me->SummonCreature(MOB_SKITTERING_INFECTIOR,SpawnPoint[6],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS);
+            me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[6],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS);
+            me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[7],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS);
+            me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[7],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS);
     }
 
     void UpdateAI(const uint32 diff)
@@ -151,13 +151,13 @@ struct boss_krik_thirAI : public ScriptedAI
         if (uiSummonTimer <= diff)
         {
             Summon();
-            uiSummonTimer = 15*IN_MILISECONDS;
+            uiSummonTimer = 15*IN_MILLISECONDS;
         } else uiSummonTimer -= diff;
 
         if (uiMindFlayTimer <= diff)
         {
                 DoCast(me->getVictim(), SPELL_MIND_FLAY);
-                uiMindFlayTimer = 15*IN_MILISECONDS;
+                uiMindFlayTimer = 15*IN_MILLISECONDS;
             } else uiMindFlayTimer -= diff;
 
         if (uiCurseFatigueTimer <= diff)
@@ -169,7 +169,7 @@ struct boss_krik_thirAI : public ScriptedAI
             DoCast(pTarget, SPELL_CURSE_OF_FATIGUE);
             DoCast(pTarget_1, SPELL_CURSE_OF_FATIGUE);
 
-            uiCurseFatigueTimer = 10*IN_MILISECONDS;
+            uiCurseFatigueTimer = 10*IN_MILLISECONDS;
         } else uiCurseFatigueTimer -= diff;
 
         if (!me->HasAura(SPELL_FRENZY) && HealthBelowPct(10))
@@ -236,8 +236,8 @@ struct npc_anub_ar_skirmisherAI : public ScriptedAI
 
     void Reset()
     {
-        uiChargeTimer   = 11*IN_MILISECONDS;
-        uiBackstabTimer = 7*IN_MILISECONDS;
+        uiChargeTimer   = 11*IN_MILLISECONDS;
+        uiBackstabTimer = 7*IN_MILLISECONDS;
     }
 
     void UpdateAI(const uint32 diff)
@@ -253,13 +253,13 @@ struct npc_anub_ar_skirmisherAI : public ScriptedAI
                 me->AddThreat(pTarget,1.0f);
                 DoCast(pTarget, SPELL_CHARGE, true);
             }
-            uiChargeTimer = 15*IN_MILISECONDS;
+            uiChargeTimer = 15*IN_MILLISECONDS;
         } else uiChargeTimer -= diff;
 
         if (uiBackstabTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_BACKSTAB);
-            uiBackstabTimer = 12*IN_MILISECONDS;
+            uiBackstabTimer = 12*IN_MILLISECONDS;
         } else uiBackstabTimer -= diff;
 
         DoMeleeAttackIfReady();
@@ -276,8 +276,8 @@ struct npc_anub_ar_shadowcasterAI : public ScriptedAI
 
     void Reset()
     {
-        uiShadowBoltTimer = 6*IN_MILISECONDS;
-        uiShadowNovaTimer = 15*IN_MILISECONDS;
+        uiShadowBoltTimer = 6*IN_MILLISECONDS;
+        uiShadowNovaTimer = 15*IN_MILLISECONDS;
     }
 
     void UpdateAI(const uint32 diff)
@@ -289,13 +289,13 @@ struct npc_anub_ar_shadowcasterAI : public ScriptedAI
         {
             if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
                  DoCast(pTarget, SPELL_SHADOW_BOLT, true);
-            uiShadowBoltTimer = 15*IN_MILISECONDS;
+            uiShadowBoltTimer = 15*IN_MILLISECONDS;
         } else uiShadowBoltTimer -= diff;
 
         if (uiShadowNovaTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_SHADOW_NOVA, true);
-            uiShadowNovaTimer = 17*IN_MILISECONDS;
+            uiShadowNovaTimer = 17*IN_MILLISECONDS;
         } else uiShadowNovaTimer -= diff;
 
         DoMeleeAttackIfReady();
@@ -311,8 +311,8 @@ struct npc_anub_ar_warriorAI : public ScriptedAI
 
     void Reset()
     {
-        uiCleaveTimer = 11*IN_MILISECONDS;
-        uiStrikeTimer = 6*IN_MILISECONDS;
+        uiCleaveTimer = 11*IN_MILLISECONDS;
+        uiStrikeTimer = 6*IN_MILLISECONDS;
     }
 
     void UpdateAI(const uint32 diff)
@@ -323,13 +323,13 @@ struct npc_anub_ar_warriorAI : public ScriptedAI
         if (uiStrikeTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_STRIKE, true);
-            uiStrikeTimer = 15*IN_MILISECONDS;
+            uiStrikeTimer = 15*IN_MILLISECONDS;
         } else uiStrikeTimer -= diff;
 
         if (uiCleaveTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_CLEAVE, true);
-            uiCleaveTimer = 17*IN_MILISECONDS;
+            uiCleaveTimer = 17*IN_MILLISECONDS;
         } else uiCleaveTimer -= diff;
 
         DoMeleeAttackIfReady();
@@ -347,8 +347,8 @@ struct npc_watcher_gashraAI : public ScriptedAI
 
     void Reset()
     {
-        uiWebWrapTimer      = 11*IN_MILISECONDS;
-        uiInfectedBiteTimer = 4*IN_MILISECONDS;
+        uiWebWrapTimer      = 11*IN_MILLISECONDS;
+        uiInfectedBiteTimer = 4*IN_MILLISECONDS;
     }
 
     void EnterCombat(Unit* /*who*/)
@@ -365,13 +365,13 @@ struct npc_watcher_gashraAI : public ScriptedAI
         {
             if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
                 DoCast(pTarget, SPELL_WEB_WRAP, true);
-            uiWebWrapTimer = 17*IN_MILISECONDS;
+            uiWebWrapTimer = 17*IN_MILLISECONDS;
         } else uiWebWrapTimer -= diff;
 
         if (uiInfectedBiteTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_INFECTED_BITE, true);
-            uiInfectedBiteTimer = 15*IN_MILISECONDS;
+            uiInfectedBiteTimer = 15*IN_MILLISECONDS;
         } else uiInfectedBiteTimer -= diff;
 
         DoMeleeAttackIfReady();
@@ -388,9 +388,9 @@ struct npc_watcher_narjilAI : public ScriptedAI
 
     void Reset()
     {
-        uiWebWrapTimer      = 11*IN_MILISECONDS;
-        uiInfectedBiteTimer = 4*IN_MILISECONDS;
-        uiBindingWebsTimer = 17*IN_MILISECONDS;
+        uiWebWrapTimer      = 11*IN_MILLISECONDS;
+        uiInfectedBiteTimer = 4*IN_MILLISECONDS;
+        uiBindingWebsTimer = 17*IN_MILLISECONDS;
     }
 
     void UpdateAI(const uint32 diff)
@@ -402,19 +402,19 @@ struct npc_watcher_narjilAI : public ScriptedAI
         {
             if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
                 DoCast(pTarget, SPELL_WEB_WRAP, true);
-            uiWebWrapTimer = 15*IN_MILISECONDS;
+            uiWebWrapTimer = 15*IN_MILLISECONDS;
         } else uiWebWrapTimer -= diff;
 
         if (uiInfectedBiteTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_INFECTED_BITE, true);
-            uiInfectedBiteTimer = 11*IN_MILISECONDS;
+            uiInfectedBiteTimer = 11*IN_MILLISECONDS;
         } else uiInfectedBiteTimer -= diff;
 
         if (uiBindingWebsTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_BLINDING_WEBS, true);
-            uiBindingWebsTimer = 17*IN_MILISECONDS;
+            uiBindingWebsTimer = 17*IN_MILLISECONDS;
         } else uiBindingWebsTimer -= diff;
 
         DoMeleeAttackIfReady();
@@ -431,9 +431,9 @@ struct npc_watcher_silthikAI : public ScriptedAI
 
     void Reset()
     {
-        uiWebWrapTimer      = 11*IN_MILISECONDS;
-        uiInfectedBiteTimer = 4*IN_MILISECONDS;
-        uiPoisonSprayTimer  = 15*IN_MILISECONDS;
+        uiWebWrapTimer      = 11*IN_MILLISECONDS;
+        uiInfectedBiteTimer = 4*IN_MILLISECONDS;
+        uiPoisonSprayTimer  = 15*IN_MILLISECONDS;
     }
 
     void UpdateAI(const uint32 diff)
@@ -446,19 +446,19 @@ struct npc_watcher_silthikAI : public ScriptedAI
             if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
                 DoCast(pTarget, SPELL_WEB_WRAP, true);
 
-            uiWebWrapTimer = 15*IN_MILISECONDS;
+            uiWebWrapTimer = 15*IN_MILLISECONDS;
         } else uiWebWrapTimer -= diff;
 
         if (uiInfectedBiteTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_INFECTED_BITE, true);
-            uiInfectedBiteTimer = 15*IN_MILISECONDS;
+            uiInfectedBiteTimer = 15*IN_MILLISECONDS;
         } else uiInfectedBiteTimer -= diff;
 
         if (uiPoisonSprayTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_POSION_SPRAY, true);
-            uiPoisonSprayTimer = 17*IN_MILISECONDS;
+            uiPoisonSprayTimer = 17*IN_MILLISECONDS;
         } else uiPoisonSprayTimer -= diff;
 
         DoMeleeAttackIfReady();
diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp
index c1c4427a63c..ee5dc6b297f 100755
--- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp
@@ -60,9 +60,9 @@ struct boss_amanitarAI : public ScriptedAI
 
     void Reset()
     {
-        uiRootTimer = urand(5*IN_MILISECONDS,9*IN_MILISECONDS);
-        uiBashTimer = urand(10*IN_MILISECONDS,14*IN_MILISECONDS);
-        uiBoltTimer = urand(15*IN_MILISECONDS,30*IN_MILISECONDS);
+        uiRootTimer = urand(5*IN_MILLISECONDS,9*IN_MILLISECONDS);
+        uiBashTimer = urand(10*IN_MILLISECONDS,14*IN_MILLISECONDS);
+        uiBoltTimer = urand(15*IN_MILLISECONDS,30*IN_MILLISECONDS);
         uiSpawnTimer = 0;
 
         me->SetMeleeDamageSchool(SPELL_SCHOOL_NATURE);
@@ -106,9 +106,9 @@ struct boss_amanitarAI : public ScriptedAI
                 Position pos;
                 victim->GetPosition(&pos);
                 me->GetRandomNearPosition(pos, float(urand(5,80)));
-                me->SummonCreature(NPC_POISONOUS_MUSHROOM, pos, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 30*IN_MILISECONDS);
+                me->SummonCreature(NPC_POISONOUS_MUSHROOM, pos, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 30*IN_MILLISECONDS);
                 me->GetRandomNearPosition(pos, float(urand(5,80)));
-                me->SummonCreature(NPC_HEALTHY_MUSHROOM, pos, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 30*IN_MILISECONDS);
+                me->SummonCreature(NPC_HEALTHY_MUSHROOM, pos, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 30*IN_MILLISECONDS);
             }
         }
     }
@@ -122,27 +122,27 @@ struct boss_amanitarAI : public ScriptedAI
         if (uiSpawnTimer <= diff)
         {
             SpawnAdds();
-            uiSpawnTimer = urand(35*IN_MILISECONDS,40*IN_MILISECONDS);
+            uiSpawnTimer = urand(35*IN_MILLISECONDS,40*IN_MILLISECONDS);
         } else uiSpawnTimer -= diff;
 
         if (uiRootTimer <= diff)
         {
             if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
                 DoCast(pTarget, SPELL_ENTANGLING_ROOTS);
-            uiRootTimer = urand(15*IN_MILISECONDS,30*IN_MILISECONDS);
+            uiRootTimer = urand(15*IN_MILLISECONDS,30*IN_MILLISECONDS);
         } else uiRootTimer -= diff;
 
         if (uiBashTimer <= diff)
         {
             DoCastVictim(SPELL_BASH);
-            uiBashTimer = urand(15*IN_MILISECONDS,30*IN_MILISECONDS);
+            uiBashTimer = urand(15*IN_MILLISECONDS,30*IN_MILLISECONDS);
         } else uiBashTimer -= diff;
 
         if (uiBoltTimer <= diff)
         {
             if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
                 DoCast(pTarget, SPELL_VENOM_BOLT_VOLLEY);
-            uiBoltTimer = urand(15*IN_MILISECONDS,30*IN_MILISECONDS);
+            uiBoltTimer = urand(15*IN_MILLISECONDS,30*IN_MILLISECONDS);
         } else uiBoltTimer -= diff;
 
         DoMeleeAttackIfReady();
@@ -164,7 +164,7 @@ struct mob_amanitar_mushroomsAI : public Scripted_NoMovementAI
             DoCast(me, SPELL_POISONOUS_MUSHROOM_VISUAL_AURA, true);
 
         uiAuraTimer = 0;
-        uiDeathTimer = 30*IN_MILISECONDS;
+        uiDeathTimer = 30*IN_MILLISECONDS;
     }
 
     void JustDied(Unit *killer)
@@ -190,7 +190,7 @@ struct mob_amanitar_mushroomsAI : public Scripted_NoMovementAI
             {
                 DoCast(me, SPELL_POISONOUS_MUSHROOM_VISUAL_AREA, true);
                 DoCast(me, SPELL_POISONOUS_MUSHROOM_POISON_CLOUD, false);
-                uiAuraTimer = 7*IN_MILISECONDS;
+                uiAuraTimer = 7*IN_MILLISECONDS;
             } else uiAuraTimer -= diff;
         }
         if (uiDeathTimer <= diff)
diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp
index b25b62573d4..05c868708f2 100755
--- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp
@@ -75,13 +75,13 @@ struct boss_elder_nadoxAI : public ScriptedAI
 
     void Reset()
     {
-        uiPlagueTimer = 13*IN_MILISECONDS;
-        uiRagueTimer = 20*IN_MILISECONDS;
+        uiPlagueTimer = 13*IN_MILLISECONDS;
+        uiRagueTimer = 20*IN_MILLISECONDS;
 
-        uiSwarmerSpawnTimer = 10*IN_MILISECONDS;
-        uiGuardSpawnTimer = 25*IN_MILISECONDS;
+        uiSwarmerSpawnTimer = 10*IN_MILLISECONDS;
+        uiGuardSpawnTimer = 25*IN_MILLISECONDS;
 
-        uiEnragueTimer = 5*IN_MILISECONDS;
+        uiEnragueTimer = 5*IN_MILLISECONDS;
 
         DeadAhnkaharGuardian = false;
         bGuardSpawned = false;
@@ -123,7 +123,7 @@ struct boss_elder_nadoxAI : public ScriptedAI
         if (uiPlagueTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_BROOD_PLAGUE);
-            uiPlagueTimer = 15*IN_MILISECONDS;
+            uiPlagueTimer = 15*IN_MILLISECONDS;
         } else uiPlagueTimer -= diff;
 
         if (IsHeroic())
@@ -132,7 +132,7 @@ struct boss_elder_nadoxAI : public ScriptedAI
                 if (Creature *pSwarmer = me->FindNearestCreature(MOB_AHNKAHAR_SWARMER, 35))
                 {
                     DoCast(pSwarmer, H_SPELL_BROOD_RAGE, true);
-                    uiRagueTimer = 15*IN_MILISECONDS;
+                    uiRagueTimer = 15*IN_MILLISECONDS;
                 }
             } else uiRagueTimer -= diff;
 
@@ -143,7 +143,7 @@ struct boss_elder_nadoxAI : public ScriptedAI
             if (urand(1,3) == 3) // 33% chance of dialog
                 DoScriptText(RAND(SAY_EGG_SAC_1,SAY_EGG_SAC_2), me);
 
-            uiSwarmerSpawnTimer = 10*IN_MILISECONDS;
+            uiSwarmerSpawnTimer = 10*IN_MILLISECONDS;
         } else uiSwarmerSpawnTimer -= diff;
 
         if (!bGuardSpawned && uiGuardSpawnTimer <= diff)
@@ -164,7 +164,7 @@ struct boss_elder_nadoxAI : public ScriptedAI
                 if (!me->IsNonMeleeSpellCasted(false))
                     DoCast(me, SPELL_ENRAGE, true);
 
-            uiEnragueTimer = 5*IN_MILISECONDS;
+            uiEnragueTimer = 5*IN_MILLISECONDS;
         } else uiEnragueTimer -= diff;
 
         DoMeleeAttackIfReady();
@@ -196,7 +196,7 @@ struct mob_ahnkahar_nerubianAI : public ScriptedAI
     {
         if (me->GetEntry() == MOB_AHNKAHAR_GUARDIAN_ENTRY) //magic numbers are bad!
             DoCast(me, SPELL_GUARDIAN_AURA, true);
-        uiSprintTimer = 10*IN_MILISECONDS;
+        uiSprintTimer = 10*IN_MILLISECONDS;
     }
 
     void JustDied(Unit * /*killer*/)
@@ -229,7 +229,7 @@ struct mob_ahnkahar_nerubianAI : public ScriptedAI
         if (uiSprintTimer <= diff)
         {
             DoCast(me, SPELL_SPRINT);
-            uiSprintTimer = 25*IN_MILISECONDS;
+            uiSprintTimer = 25*IN_MILLISECONDS;
         } else uiSprintTimer -= diff;
 
         DoMeleeAttackIfReady();
diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp
index f020e16cb96..0e58217c584 100755
--- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp
@@ -146,9 +146,9 @@ struct boss_volazjAI : public ScriptedAI
 
     void Reset()
     {
-        uiMindFlayTimer = 8*IN_MILISECONDS;
-        uiShadowBoltVolleyTimer = 5*IN_MILISECONDS;
-        uiShiverTimer = 15*IN_MILISECONDS;
+        uiMindFlayTimer = 8*IN_MILLISECONDS;
+        uiShadowBoltVolleyTimer = 5*IN_MILLISECONDS;
+        uiShiverTimer = 15*IN_MILLISECONDS;
 
         if (pInstance)
         {
@@ -272,20 +272,20 @@ struct boss_volazjAI : public ScriptedAI
         if (uiMindFlayTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_MIND_FLAY);
-            uiMindFlayTimer = 20*IN_MILISECONDS;
+            uiMindFlayTimer = 20*IN_MILLISECONDS;
         } else uiMindFlayTimer -= diff;
 
         if (uiShadowBoltVolleyTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_SHADOW_BOLT_VOLLEY);
-            uiShadowBoltVolleyTimer = 5*IN_MILISECONDS;
+            uiShadowBoltVolleyTimer = 5*IN_MILLISECONDS;
         } else uiShadowBoltVolleyTimer -= diff;
 
         if (uiShiverTimer <= diff)
         {
             if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
                 DoCast(pTarget, SPELL_SHIVER);
-            uiShiverTimer = 15*IN_MILISECONDS;
+            uiShiverTimer = 15*IN_MILLISECONDS;
         } else uiShiverTimer -= diff;
 
         DoMeleeAttackIfReady();
diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp
index 5c39cc122b6..3ea1c0bda4f 100755
--- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp
@@ -89,11 +89,11 @@ struct boss_jedoga_shadowseekerAI : public ScriptedAI
 
     void Reset()
     {
-        uiOpFerTimer = urand(15*IN_MILISECONDS,20*IN_MILISECONDS);
+        uiOpFerTimer = urand(15*IN_MILLISECONDS,20*IN_MILLISECONDS);
 
-        uiCycloneTimer = 3*IN_MILISECONDS;
-        uiBoltTimer = 7*IN_MILISECONDS;
-        uiThunderTimer = 12*IN_MILISECONDS;
+        uiCycloneTimer = 3*IN_MILLISECONDS;
+        uiBoltTimer = 7*IN_MILLISECONDS;
+        uiThunderTimer = 12*IN_MILLISECONDS;
 
         bOpFerok = false;
         bOpFerokFail = false;
@@ -247,7 +247,7 @@ struct boss_jedoga_shadowseekerAI : public ScriptedAI
         if (pInstance->GetData(DATA_JEDOGA_SHADOWSEEKER_EVENT) == IN_PROGRESS) OpferRufen();
 
         bOnGround = false;
-        uiOpFerTimer = urand(15*IN_MILISECONDS,30*IN_MILISECONDS);
+        uiOpFerTimer = urand(15*IN_MILLISECONDS,30*IN_MILLISECONDS);
     }
 
     void OpferRufen()
@@ -303,7 +303,7 @@ struct boss_jedoga_shadowseekerAI : public ScriptedAI
             if (uiCycloneTimer <= diff)
             {
                 DoCast(me, SPELL_CYCLONE_STRIKE, false);
-                uiCycloneTimer = urand(15*IN_MILISECONDS,30*IN_MILISECONDS);
+                uiCycloneTimer = urand(15*IN_MILLISECONDS,30*IN_MILLISECONDS);
             } else uiCycloneTimer -= diff;
 
             if (uiBoltTimer <= diff)
@@ -311,7 +311,7 @@ struct boss_jedoga_shadowseekerAI : public ScriptedAI
                 if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
                     me->CastSpell(pTarget, DUNGEON_MODE(SPELL_LIGHTNING_BOLT, SPELL_LIGHTNING_BOLT_H), false);
 
-                uiBoltTimer = urand(15*IN_MILISECONDS,30*IN_MILISECONDS);
+                uiBoltTimer = urand(15*IN_MILLISECONDS,30*IN_MILLISECONDS);
             } else uiBoltTimer -= diff;
 
             if (uiThunderTimer <= diff)
@@ -319,7 +319,7 @@ struct boss_jedoga_shadowseekerAI : public ScriptedAI
                 if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
                     me->CastSpell(pTarget, DUNGEON_MODE(SPELL_THUNDERSHOCK, SPELL_THUNDERSHOCK_H), false);
 
-                uiThunderTimer = urand(15*IN_MILISECONDS,30*IN_MILISECONDS);
+                uiThunderTimer = urand(15*IN_MILLISECONDS,30*IN_MILLISECONDS);
             } else uiThunderTimer -= diff;
 
             if (uiOpFerTimer <= diff)
@@ -351,7 +351,7 @@ struct mob_jedoga_initiandAI : public ScriptedAI
             return;
 
         bWalking = false;
-        bCheckTimer = 2*IN_MILISECONDS;
+        bCheckTimer = 2*IN_MILLISECONDS;
 
         if (pInstance->GetData(DATA_JEDOGA_SHADOWSEEKER_EVENT) != IN_PROGRESS)
         {
@@ -466,7 +466,7 @@ struct mob_jedoga_initiandAI : public ScriptedAI
                     me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE + UNIT_FLAG_NON_ATTACKABLE);
                 }
             }
-            bCheckTimer = 2*IN_MILISECONDS;
+            bCheckTimer = 2*IN_MILLISECONDS;
         } else bCheckTimer -= diff;
 
         //Return since we have no target
diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp
index a3ce654bc76..995fccd8611 100755
--- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp
@@ -97,10 +97,10 @@ struct boss_taldaramAI : public ScriptedAI
 
     void Reset()
     {
-        uiBloodthirstTimer = 10*IN_MILISECONDS;
-        uiVanishTimer = urand(25*IN_MILISECONDS,35*IN_MILISECONDS);
-        uiEmbraceTimer = 20*IN_MILISECONDS;
-        uiFlamesphereTimer = 5*IN_MILISECONDS;
+        uiBloodthirstTimer = 10*IN_MILLISECONDS;
+        uiVanishTimer = urand(25*IN_MILLISECONDS,35*IN_MILLISECONDS);
+        uiEmbraceTimer = 20*IN_MILLISECONDS;
+        uiFlamesphereTimer = 5*IN_MILLISECONDS;
         uiEmbraceTakenDamage = 0;
         Phase = NORMAL;
         uiPhaseTimer = 0;
@@ -129,7 +129,7 @@ struct boss_taldaramAI : public ScriptedAI
                     Creature* pSpheres[3];
 
                     //DoCast(me, SPELL_FLAME_SPHERE_SUMMON_1);
-                    pSpheres[0] = DoSpawnCreature(CREATURE_FLAME_SPHERE, 0, 0, 5, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 10*IN_MILISECONDS);
+                    pSpheres[0] = DoSpawnCreature(CREATURE_FLAME_SPHERE, 0, 0, 5, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 10*IN_MILLISECONDS);
                     Unit *pSphereTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true);
                     if (pSphereTarget && pSpheres[0])
                     {
@@ -142,9 +142,9 @@ struct boss_taldaramAI : public ScriptedAI
                     if (IsHeroic())
                     {
                         //DoCast(me, H_SPELL_FLAME_SPHERE_SUMMON_1);
-                        pSpheres[1] = DoSpawnCreature(H_CREATURE_FLAME_SPHERE_1, 0, 0, 5, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 10*IN_MILISECONDS);
+                        pSpheres[1] = DoSpawnCreature(H_CREATURE_FLAME_SPHERE_1, 0, 0, 5, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 10*IN_MILLISECONDS);
                         //DoCast(me, H_SPELL_FLAME_SPHERE_SUMMON_2);
-                        pSpheres[2] = DoSpawnCreature(H_CREATURE_FLAME_SPHERE_2, 0, 0, 5, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 10*IN_MILISECONDS);
+                        pSpheres[2] = DoSpawnCreature(H_CREATURE_FLAME_SPHERE_2, 0, 0, 5, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 10*IN_MILLISECONDS);
                         if (pSphereTarget && pSpheres[1] && pSpheres[2])
                         {
                             float angle,x,y;
@@ -180,7 +180,7 @@ struct boss_taldaramAI : public ScriptedAI
                     me->SetSpeed(MOVE_WALK, 1.0f, true);
                     me->GetMotionMaster()->MoveChase(me->getVictim());
                     Phase = FEEDING;
-                    uiPhaseTimer = 20*IN_MILISECONDS;
+                    uiPhaseTimer = 20*IN_MILLISECONDS;
                     break;
                 case FEEDING:
                     Phase = NORMAL;
@@ -191,15 +191,15 @@ struct boss_taldaramAI : public ScriptedAI
                     if (uiBloodthirstTimer <= diff)
                     {
                         DoCast(me->getVictim(), SPELL_BLOODTHIRST);
-                        uiBloodthirstTimer = 10*IN_MILISECONDS;
+                        uiBloodthirstTimer = 10*IN_MILLISECONDS;
                     } else uiBloodthirstTimer -= diff;
 
                     if (uiFlamesphereTimer <= diff)
                     {
                         DoCast(me, SPELL_CONJURE_FLAME_SPHERE);
                         Phase = CASTING_FLAME_SPHERES;
-                        uiPhaseTimer = 3*IN_MILISECONDS + diff;
-                        uiFlamesphereTimer = 15*IN_MILISECONDS;
+                        uiPhaseTimer = 3*IN_MILLISECONDS + diff;
+                        uiFlamesphereTimer = 15*IN_MILLISECONDS;
                     } else uiFlamesphereTimer -= diff;
 
                     if (uiVanishTimer <= diff)
@@ -227,7 +227,7 @@ struct boss_taldaramAI : public ScriptedAI
                                 uiEmbraceTarget = pEmbraceTarget->GetGUID();
 
                         }
-                        uiVanishTimer = urand(25*IN_MILISECONDS,35*IN_MILISECONDS);
+                        uiVanishTimer = urand(25*IN_MILLISECONDS,35*IN_MILLISECONDS);
                     } else uiVanishTimer -= diff;
 
                     DoMeleeAttackIfReady();
@@ -338,7 +338,7 @@ struct mob_taldaram_flamesphereAI : public ScriptedAI
         DoCast(me, SPELL_FLAME_SPHERE_VISUAL);
         DoCast(me, SPELL_FLAME_SPHERE_SPAWN_EFFECT);
         DoCast(me, SPELL_FLAME_SPHERE_PERIODIC);
-        uiDespawnTimer = 10*IN_MILISECONDS;
+        uiDespawnTimer = 10*IN_MILLISECONDS;
     }
 
     void EnterCombat(Unit * /*who*/) {}
diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp
index a7f0cdc3a2f..c03d3df15d8 100755
--- a/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp
+++ b/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp
@@ -70,12 +70,12 @@ struct boss_dredAI : public ScriptedAI
             pInstance->SetData(DATA_KING_DRED_ACHIEV, 0);
         }
 
-        uiBellowingRoarTimer = 33*IN_MILISECONDS;
-        uiGrievousBiteTimer  = 20*IN_MILISECONDS;
-        uiManglingSlashTimer = 18.5*IN_MILISECONDS;
-        uiFearsomeRoarTimer  = urand(10*IN_MILISECONDS,20*IN_MILISECONDS);
-        uiPiercingSlashTimer = 17*IN_MILISECONDS;
-        uiRaptorCallTimer    = urand(20*IN_MILISECONDS,25*IN_MILISECONDS);
+        uiBellowingRoarTimer = 33*IN_MILLISECONDS;
+        uiGrievousBiteTimer  = 20*IN_MILLISECONDS;
+        uiManglingSlashTimer = 18.5*IN_MILLISECONDS;
+        uiFearsomeRoarTimer  = urand(10*IN_MILLISECONDS,20*IN_MILLISECONDS);
+        uiPiercingSlashTimer = 17*IN_MILLISECONDS;
+        uiRaptorCallTimer    = urand(20*IN_MILLISECONDS,25*IN_MILLISECONDS);
     }
 
     void EnterCombat(Unit* /*who*/)
@@ -93,31 +93,31 @@ struct boss_dredAI : public ScriptedAI
         if (uiBellowingRoarTimer < diff)
         {
             DoCastAOE(SPELL_BELLOWING_ROAR, false);
-            uiBellowingRoarTimer = 40*IN_MILISECONDS;
+            uiBellowingRoarTimer = 40*IN_MILLISECONDS;
         } else uiBellowingRoarTimer -=diff;
 
         if (uiGrievousBiteTimer < diff)
         {
             DoCastVictim(SPELL_GRIEVOUS_BITE ,false);
-            uiGrievousBiteTimer = 20*IN_MILISECONDS;
+            uiGrievousBiteTimer = 20*IN_MILLISECONDS;
         } else uiGrievousBiteTimer -=diff;
 
         if (uiManglingSlashTimer < diff)
         {
             DoCastVictim(SPELL_MANGLING_SLASH,false);
-            uiManglingSlashTimer = 20*IN_MILISECONDS;
+            uiManglingSlashTimer = 20*IN_MILLISECONDS;
         } else uiManglingSlashTimer -=diff;
 
         if (uiFearsomeRoarTimer < diff)
         {
             DoCastAOE(SPELL_FEARSOME_ROAR,false);
-            uiFearsomeRoarTimer = urand(16*IN_MILISECONDS,18*IN_MILISECONDS);
+            uiFearsomeRoarTimer = urand(16*IN_MILLISECONDS,18*IN_MILLISECONDS);
         } else uiFearsomeRoarTimer -=diff;
 
         if (uiPiercingSlashTimer < diff)
         {
             DoCastVictim(SPELL_PIERCING_SLASH,false);
-            uiPiercingSlashTimer = 20*IN_MILISECONDS;
+            uiPiercingSlashTimer = 20*IN_MILLISECONDS;
         } else uiPiercingSlashTimer -=diff;
 
         if (uiRaptorCallTimer < diff)
@@ -127,9 +127,9 @@ struct boss_dredAI : public ScriptedAI
             float x,y,z;
 
             me->GetClosePoint(x,y,z,me->GetObjectSize()/3,10.0f);
-            me->SummonCreature(RAND(NPC_RAPTOR_1,NPC_RAPTOR_2),x,y,z,0,TEMPSUMMON_DEAD_DESPAWN,1*IN_MILISECONDS);
+            me->SummonCreature(RAND(NPC_RAPTOR_1,NPC_RAPTOR_2),x,y,z,0,TEMPSUMMON_DEAD_DESPAWN,1*IN_MILLISECONDS);
 
-            uiRaptorCallTimer = urand(20*IN_MILISECONDS,25*IN_MILISECONDS);
+            uiRaptorCallTimer = urand(20*IN_MILLISECONDS,25*IN_MILLISECONDS);
         } else uiRaptorCallTimer -=diff;
 
         DoMeleeAttackIfReady();
@@ -213,7 +213,7 @@ struct npc_drakkari_scytheclawAI : public ScriptedAI
 
     void Reset()
     {
-        uiRendTimer = urand(10*IN_MILISECONDS,15*IN_MILISECONDS);
+        uiRendTimer = urand(10*IN_MILLISECONDS,15*IN_MILLISECONDS);
     }
 
     void UpdateAI(const uint32 diff)
@@ -225,7 +225,7 @@ struct npc_drakkari_scytheclawAI : public ScriptedAI
         if (uiRendTimer < diff)
         {
             DoCastVictim(SPELL_REND,false);
-            uiRendTimer = urand(10*IN_MILISECONDS,15*IN_MILISECONDS);
+            uiRendTimer = urand(10*IN_MILLISECONDS,15*IN_MILLISECONDS);
         }else uiRendTimer -=diff;
 
         DoMeleeAttackIfReady();
diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp
index c18b7deb272..e8abb804417 100755
--- a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp
+++ b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp
@@ -117,8 +117,8 @@ struct boss_novosAI : public Scripted_NoMovementAI
     {
         DoScriptText(SAY_AGGRO, me);
         Phase = PHASE_1;
-        uiCrystalHandlerTimer = 30*IN_MILISECONDS;
-        uiTimer = 1*IN_MILISECONDS;
+        uiCrystalHandlerTimer = 30*IN_MILLISECONDS;
+        uiTimer = 1*IN_MILLISECONDS;
         DoCast(SPELL_ARCANE_FIELD);
         if (pInstance)
         {
@@ -141,18 +141,18 @@ struct boss_novosAI : public Scripted_NoMovementAI
             case PHASE_1:
                 if (uiTimer <= diff)
                 {
-                    Creature *pSummon = me->SummonCreature(RAND(CREATURE_FETID_TROLL_CORPSE,CREATURE_HULKING_CORPSE,CREATURE_RISEN_SHADOWCASTER), AddSpawnPoint, TEMPSUMMON_CORPSE_TIMED_DESPAWN,20*IN_MILISECONDS);
+                    Creature *pSummon = me->SummonCreature(RAND(CREATURE_FETID_TROLL_CORPSE,CREATURE_HULKING_CORPSE,CREATURE_RISEN_SHADOWCASTER), AddSpawnPoint, TEMPSUMMON_CORPSE_TIMED_DESPAWN,20*IN_MILLISECONDS);
                     pSummon->GetMotionMaster()->MovePoint(0, AddDestinyPoint);
                     //If spell is casted stops casting arcane field so no spell casting
                     //DoCast(me, SPELL_SUMMON_MINIONS);
-                    uiTimer = 3*IN_MILISECONDS;
+                    uiTimer = 3*IN_MILLISECONDS;
                 } else uiTimer -= diff;
                 if (uiCrystalHandlerTimer <= diff)
                 {
                     DoScriptText(SAY_NECRO_ADD, me);
-                    Creature *pCrystalHandler = me->SummonCreature(CREATURE_CRYSTAL_HANDLER, CrystalHandlerSpawnPoint, TEMPSUMMON_CORPSE_TIMED_DESPAWN,20*IN_MILISECONDS);
+                    Creature *pCrystalHandler = me->SummonCreature(CREATURE_CRYSTAL_HANDLER, CrystalHandlerSpawnPoint, TEMPSUMMON_CORPSE_TIMED_DESPAWN,20*IN_MILLISECONDS);
                     pCrystalHandler->GetMotionMaster()->MovePoint(0, AddDestinyPoint);
-                    uiCrystalHandlerTimer = urand(20*IN_MILISECONDS,30*IN_MILISECONDS);
+                    uiCrystalHandlerTimer = urand(20*IN_MILLISECONDS,30*IN_MILLISECONDS);
                 } else uiCrystalHandlerTimer -= diff;
                 break;
             case PHASE_2:
@@ -161,7 +161,7 @@ struct boss_novosAI : public Scripted_NoMovementAI
                     if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
                         DoCast(pTarget, DUNGEON_MODE(RAND(SPELL_ARCANE_BLAST,SPELL_BLIZZARD,SPELL_FROSTBOLT,SPELL_WRATH_OF_MISERY),
                                                      RAND(H_SPELL_ARCANE_BLAST,H_SPELL_BLIZZARD,H_SPELL_FROSTBOLT,H_SPELL_WRATH_OF_MISERY)));
-                    uiTimer = urand(1*IN_MILISECONDS,3*IN_MILISECONDS);
+                    uiTimer = urand(1*IN_MILLISECONDS,3*IN_MILLISECONDS);
                 } else uiTimer -= diff;
                 break;
         }
@@ -207,7 +207,7 @@ struct boss_novosAI : public Scripted_NoMovementAI
             me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
             me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
             Phase = PHASE_2;
-            uiTimer = 1*IN_MILISECONDS;
+            uiTimer = 1*IN_MILLISECONDS;
         }
     }
 
@@ -236,7 +236,7 @@ struct mob_crystal_handlerAI : public ScriptedAI
 
     void Reset()
     {
-        uiFlashOfDarknessTimer = 5*IN_MILISECONDS;
+        uiFlashOfDarknessTimer = 5*IN_MILLISECONDS;
     }
 
     void JustDied(Unit* /*killer*/)
@@ -253,7 +253,7 @@ struct mob_crystal_handlerAI : public ScriptedAI
         if (uiFlashOfDarknessTimer <= diff)
         {
             DoCast(me->getVictim(), DUNGEON_MODE(SPELL_FLASH_OF_DARKNESS,H_SPELL_FLASH_OF_DARKNESS));
-            uiFlashOfDarknessTimer = 5*IN_MILISECONDS;
+            uiFlashOfDarknessTimer = 5*IN_MILLISECONDS;
         } else uiFlashOfDarknessTimer -= diff;
 
         DoMeleeAttackIfReady();
diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp
index 363ee5ad89c..46121f49849 100755
--- a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp
+++ b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp
@@ -85,10 +85,10 @@ struct boss_tharon_jaAI : public ScriptedAI
 
     void Reset()
     {
-        uiPhaseTimer = 20*IN_MILISECONDS;
-        uiCurseOfLifeTimer = 1*IN_MILISECONDS;
-        uiRainOfFireTimer = urand(14*IN_MILISECONDS,18*IN_MILISECONDS);
-        uiShadowVolleyTimer = urand(8*IN_MILISECONDS,10*IN_MILISECONDS);
+        uiPhaseTimer = 20*IN_MILLISECONDS;
+        uiCurseOfLifeTimer = 1*IN_MILLISECONDS;
+        uiRainOfFireTimer = urand(14*IN_MILLISECONDS,18*IN_MILLISECONDS);
+        uiShadowVolleyTimer = urand(8*IN_MILLISECONDS,10*IN_MILLISECONDS);
         Phase = SKELETAL;
         me->SetDisplayId(me->GetNativeDisplayId());
         if (pInstance)
@@ -116,26 +116,26 @@ struct boss_tharon_jaAI : public ScriptedAI
                 {
                     if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
                         DoCast(pTarget, SPELL_CURSE_OF_LIFE);
-                    uiCurseOfLifeTimer = urand(10*IN_MILISECONDS,15*IN_MILISECONDS);
+                    uiCurseOfLifeTimer = urand(10*IN_MILLISECONDS,15*IN_MILLISECONDS);
                 } else uiCurseOfLifeTimer -= diff;
 
                 if (uiShadowVolleyTimer < diff)
                 {
                     DoCastVictim(SPELL_SHADOW_VOLLEY);
-                    uiShadowVolleyTimer = urand(8*IN_MILISECONDS,10*IN_MILISECONDS);
+                    uiShadowVolleyTimer = urand(8*IN_MILLISECONDS,10*IN_MILLISECONDS);
                 } else uiShadowVolleyTimer -= diff;
 
                 if (uiRainOfFireTimer < diff)
                 {
                     DoCastAOE(SPELL_RAIN_OF_FIRE);
-                    uiRainOfFireTimer = urand(14*IN_MILISECONDS,18*IN_MILISECONDS);
+                    uiRainOfFireTimer = urand(14*IN_MILLISECONDS,18*IN_MILLISECONDS);
                 } else uiRainOfFireTimer -= diff;
 
                 if (uiPhaseTimer < diff)
                 {
                     DoCast(SPELL_DECAY_FLESH);
                     Phase = GOING_FLESH;
-                    uiPhaseTimer = 6*IN_MILISECONDS;
+                    uiPhaseTimer = 6*IN_MILLISECONDS;
                 } else uiPhaseTimer -= diff;
 
                 DoMeleeAttackIfReady();
@@ -155,10 +155,10 @@ struct boss_tharon_jaAI : public ScriptedAI
                             pTemp->SetDisplayId(MODEL_SKELETON);
                         }
                     }
-                    uiPhaseTimer = 20*IN_MILISECONDS;
-                    uiLightningBreathTimer = urand(3*IN_MILISECONDS,4*IN_MILISECONDS);
-                    uiEyeBeamTimer = urand(4*IN_MILISECONDS,8*IN_MILISECONDS);
-                    uiPoisonCloudTimer = urand(6*IN_MILISECONDS,7*IN_MILISECONDS);
+                    uiPhaseTimer = 20*IN_MILLISECONDS;
+                    uiLightningBreathTimer = urand(3*IN_MILLISECONDS,4*IN_MILLISECONDS);
+                    uiEyeBeamTimer = urand(4*IN_MILLISECONDS,8*IN_MILLISECONDS);
+                    uiPoisonCloudTimer = urand(6*IN_MILLISECONDS,7*IN_MILLISECONDS);
                     Phase = FLESH;
                 } else uiPhaseTimer -= diff;
                 break;
@@ -167,27 +167,27 @@ struct boss_tharon_jaAI : public ScriptedAI
                 {
                     if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
                         DoCast(pTarget, SPELL_LIGHTNING_BREATH);
-                    uiLightningBreathTimer = urand(6*IN_MILISECONDS,7*IN_MILISECONDS);
+                    uiLightningBreathTimer = urand(6*IN_MILLISECONDS,7*IN_MILLISECONDS);
                 } else uiLightningBreathTimer -= diff;
 
                 if (uiEyeBeamTimer < diff)
                 {
                     if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
                         DoCast(pTarget, SPELL_EYE_BEAM);
-                    uiEyeBeamTimer = urand(4*IN_MILISECONDS,6*IN_MILISECONDS);
+                    uiEyeBeamTimer = urand(4*IN_MILLISECONDS,6*IN_MILLISECONDS);
                 } else uiEyeBeamTimer -= diff;
 
                 if (uiPoisonCloudTimer < diff)
                 {
                     DoCastAOE(SPELL_POISON_CLOUD);
-                    uiPoisonCloudTimer = urand(10*IN_MILISECONDS,12*IN_MILISECONDS);
+                    uiPoisonCloudTimer = urand(10*IN_MILLISECONDS,12*IN_MILLISECONDS);
                 } else uiPoisonCloudTimer -= diff;
 
                 if (uiPhaseTimer < diff)
                 {
                     DoCast(SPELL_RETURN_FLESH);
                     Phase = GOING_SKELETAL;
-                    uiPhaseTimer = 6*IN_MILISECONDS;
+                    uiPhaseTimer = 6*IN_MILLISECONDS;
                 } else uiPhaseTimer -= diff;
                 DoMeleeAttackIfReady();
                 break;
@@ -197,10 +197,10 @@ struct boss_tharon_jaAI : public ScriptedAI
                     DoScriptText(RAND(SAY_SKELETON_1,SAY_SKELETON_2), me);
                     me->DeMorph();
                     Phase = SKELETAL;
-                    uiPhaseTimer = 20*IN_MILISECONDS;
-                    uiCurseOfLifeTimer = 1*IN_MILISECONDS;
-                    uiRainOfFireTimer = urand(14*IN_MILISECONDS,18*IN_MILISECONDS);
-                    uiShadowVolleyTimer = urand(8*IN_MILISECONDS,10*IN_MILISECONDS);
+                    uiPhaseTimer = 20*IN_MILLISECONDS;
+                    uiCurseOfLifeTimer = 1*IN_MILLISECONDS;
+                    uiRainOfFireTimer = urand(14*IN_MILLISECONDS,18*IN_MILLISECONDS);
+                    uiShadowVolleyTimer = urand(8*IN_MILLISECONDS,10*IN_MILLISECONDS);
                     std::list& threatlist = me->getThreatManager().getThreatList();
                     for (std::list::const_iterator itr = threatlist.begin(); itr != threatlist.end(); ++itr)
                     {
diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp
index deae70bfd08..4281ab53463 100755
--- a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp
+++ b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp
@@ -76,12 +76,12 @@ struct boss_trollgoreAI : public ScriptedAI
 
     void Reset()
     {
-        uiConsumeTimer = 15*IN_MILISECONDS;
-        uiAuraCountTimer = 15.5*IN_MILISECONDS;
-        uiCrushTimer = urand(1*IN_MILISECONDS,5*IN_MILISECONDS);
-        uiInfectedWoundTimer = urand(60*IN_MILISECONDS,10*IN_MILISECONDS);
-        uiExplodeCorpseTimer = 3*IN_MILISECONDS;
-        uiSpawnTimer = urand(30*IN_MILISECONDS,40*IN_MILISECONDS);
+        uiConsumeTimer = 15*IN_MILLISECONDS;
+        uiAuraCountTimer = 15.5*IN_MILLISECONDS;
+        uiCrushTimer = urand(1*IN_MILLISECONDS,5*IN_MILLISECONDS);
+        uiInfectedWoundTimer = urand(60*IN_MILLISECONDS,10*IN_MILLISECONDS);
+        uiExplodeCorpseTimer = 3*IN_MILLISECONDS;
+        uiSpawnTimer = urand(30*IN_MILLISECONDS,40*IN_MILLISECONDS);
 
         bAchiev = IsHeroic();
 
@@ -112,14 +112,14 @@ struct boss_trollgoreAI : public ScriptedAI
             uint32 spawnNumber = urand(2,DUNGEON_MODE(3,5));
             for (uint8 i = 0; i < spawnNumber; ++i)
                 DoSummon(RAND(NPC_DRAKKARI_INVADER_1,NPC_DRAKKARI_INVADER_2), AddSpawnPoint, 0, TEMPSUMMON_DEAD_DESPAWN);
-            uiSpawnTimer = urand(30*IN_MILISECONDS,40*IN_MILISECONDS);
+            uiSpawnTimer = urand(30*IN_MILLISECONDS,40*IN_MILLISECONDS);
         } else uiSpawnTimer -= diff;
 
         if (uiConsumeTimer <= diff)
         {
             DoScriptText(SAY_CONSUME, me);
             DoCast(SPELL_CONSUME);
-            uiConsumeTimer = 15*IN_MILISECONDS;
+            uiConsumeTimer = 15*IN_MILLISECONDS;
         } else uiConsumeTimer -= diff;
 
         if (bAchiev)
@@ -132,20 +132,20 @@ struct boss_trollgoreAI : public ScriptedAI
         if (uiCrushTimer <= diff)
         {
             DoCastVictim(SPELL_CRUSH);
-            uiCrushTimer = urand(10*IN_MILISECONDS,15*IN_MILISECONDS);
+            uiCrushTimer = urand(10*IN_MILLISECONDS,15*IN_MILLISECONDS);
         } else uiCrushTimer -= diff;
 
         if (uiInfectedWoundTimer <= diff)
         {
             DoCastVictim(SPELL_INFECTED_WOUND);
-            uiInfectedWoundTimer = urand(25*IN_MILISECONDS,35*IN_MILISECONDS);
+            uiInfectedWoundTimer = urand(25*IN_MILLISECONDS,35*IN_MILLISECONDS);
         } else uiInfectedWoundTimer -= diff;
 
         if (uiExplodeCorpseTimer <= diff)
         {
             DoCast(SPELL_CORPSE_EXPLODE);
             DoScriptText(SAY_EXPLODE, me);
-            uiExplodeCorpseTimer = urand(15*IN_MILISECONDS,19*IN_MILISECONDS);
+            uiExplodeCorpseTimer = urand(15*IN_MILLISECONDS,19*IN_MILLISECONDS);
         } else uiExplodeCorpseTimer -= diff;
 
         DoMeleeAttackIfReady();
diff --git a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp
index 73b88a870f4..3bb998c7096 100755
--- a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp
+++ b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp
@@ -58,7 +58,7 @@ struct boss_drakkari_colossusAI : public ScriptedAI
         me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
         me->clearUnitState(UNIT_STAT_STUNNED | UNIT_STAT_ROOT);
         me->SetReactState(REACT_PASSIVE);
-        MightyBlowTimer = 10*IN_MILISECONDS;
+        MightyBlowTimer = 10*IN_MILLISECONDS;
         bHealth = false;
         bHealth1 = false;
     }
@@ -114,7 +114,7 @@ struct boss_drakkari_colossusAI : public ScriptedAI
         if (MightyBlowTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_MIGHTY_BLOW, true);
-            MightyBlowTimer = 10*IN_MILISECONDS;
+            MightyBlowTimer = 10*IN_MILLISECONDS;
         } else MightyBlowTimer -= diff;
 
         if (!me->hasUnitState(UNIT_STAT_STUNNED))
@@ -152,7 +152,7 @@ struct boss_drakkari_elementalAI : public ScriptedAI
     {
         if (Creature *pColossus = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_DRAKKARI_COLOSSUS) : 0))
             CAST_AI(boss_drakkari_colossusAI, pColossus->AI())->CreatureState(me, true);
-        uiSurgeTimer = 7*IN_MILISECONDS;
+        uiSurgeTimer = 7*IN_MILLISECONDS;
         bGoToColossus = false;
     }
 
@@ -195,7 +195,7 @@ struct boss_drakkari_elementalAI : public ScriptedAI
         if (uiSurgeTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_SURGE);
-            uiSurgeTimer = 7*IN_MILISECONDS;
+            uiSurgeTimer = 7*IN_MILLISECONDS;
         } else uiSurgeTimer -= diff;
 
         DoMeleeAttackIfReady();
@@ -222,8 +222,8 @@ struct npc_living_mojoAI : public ScriptedAI
 
     void Reset()
     {
-        uiMojoWaveTimer = 2*IN_MILISECONDS;
-        uiMojoPuddleTimer = 7*IN_MILISECONDS;
+        uiMojoWaveTimer = 2*IN_MILLISECONDS;
+        uiMojoPuddleTimer = 7*IN_MILLISECONDS;
     }
 
     void EnterCombat(Unit* /*who*/)
@@ -267,13 +267,13 @@ struct npc_living_mojoAI : public ScriptedAI
         if (uiMojoWaveTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_MOJO_WAVE);
-            uiMojoWaveTimer = 15*IN_MILISECONDS;
+            uiMojoWaveTimer = 15*IN_MILLISECONDS;
         } else uiMojoWaveTimer -= diff;
 
         if (uiMojoPuddleTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_MOJO_PUDDLE);
-            uiMojoPuddleTimer = 18*IN_MILISECONDS;
+            uiMojoPuddleTimer = 18*IN_MILLISECONDS;
         } else uiMojoPuddleTimer -= diff;
 
         DoMeleeAttackIfReady();
diff --git a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp
index f4b87cd1ee0..8ddcc12ae49 100755
--- a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp
+++ b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp
@@ -47,10 +47,10 @@ struct boss_eckAI : public ScriptedAI
 
     void Reset()
     {
-        uiBerserkTimer = urand(60*IN_MILISECONDS,90*IN_MILISECONDS); //60-90 secs according to wowwiki
-        uiBiteTimer = 5*IN_MILISECONDS;
-        uiSpitTimer = 10*IN_MILISECONDS;
-        uiSpringTimer = 8*IN_MILISECONDS;
+        uiBerserkTimer = urand(60*IN_MILLISECONDS,90*IN_MILLISECONDS); //60-90 secs according to wowwiki
+        uiBiteTimer = 5*IN_MILLISECONDS;
+        uiSpitTimer = 10*IN_MILLISECONDS;
+        uiSpringTimer = 8*IN_MILLISECONDS;
 
         bBerserk = false;
 
@@ -73,13 +73,13 @@ struct boss_eckAI : public ScriptedAI
         if (uiBiteTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_ECK_BITE);
-            uiBiteTimer = urand(8*IN_MILISECONDS,12*IN_MILISECONDS);
+            uiBiteTimer = urand(8*IN_MILLISECONDS,12*IN_MILLISECONDS);
         } else uiBiteTimer -= diff;
 
         if (uiSpitTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_ECK_SPIT);
-            uiSpitTimer = urand(6*IN_MILISECONDS,14*IN_MILISECONDS);
+            uiSpitTimer = urand(6*IN_MILLISECONDS,14*IN_MILLISECONDS);
         } else uiSpitTimer -= diff;
 
         if (uiSpringTimer <= diff)
@@ -88,7 +88,7 @@ struct boss_eckAI : public ScriptedAI
             if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER)
             {
                 DoCast(pTarget, RAND(SPELL_ECK_SPRING_1, SPELL_ECK_SPRING_2));
-                uiSpringTimer = urand(5*IN_MILISECONDS,10*IN_MILISECONDS);
+                uiSpringTimer = urand(5*IN_MILLISECONDS,10*IN_MILLISECONDS);
             }
         } else uiSpringTimer -= diff;
 
@@ -141,7 +141,7 @@ struct npc_ruins_dwellerAI : public ScriptedAI
         {
             pInstance->SetData64(DATA_RUIN_DWELLER_DIED,me->GetGUID());
             if (pInstance->GetData(DATA_ALIVE_RUIN_DWELLERS) == 0)
-                me->SummonCreature(CREATURE_ECK, EckSpawnPoint, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300*IN_MILISECONDS);
+                me->SummonCreature(CREATURE_ECK, EckSpawnPoint, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300*IN_MILLISECONDS);
         }
     }
 };
diff --git a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp
index dae642f68af..e90b244b118 100755
--- a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp
+++ b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp
@@ -94,13 +94,13 @@ struct boss_gal_darahAI : public ScriptedAI
 
     void Reset()
     {
-        uiStampedeTimer = 10*IN_MILISECONDS;
-        uiWhirlingSlashTimer = 21*IN_MILISECONDS;
-        uiPunctureTimer = 10*IN_MILISECONDS;
-        uiEnrageTimer = 15*IN_MILISECONDS;
-        uiImpalingChargeTimer = 21*IN_MILISECONDS;
-        uiStompTimer = 25*IN_MILISECONDS;
-        uiTransformationTimer = 9*IN_MILISECONDS;
+        uiStampedeTimer = 10*IN_MILLISECONDS;
+        uiWhirlingSlashTimer = 21*IN_MILLISECONDS;
+        uiPunctureTimer = 10*IN_MILLISECONDS;
+        uiEnrageTimer = 15*IN_MILLISECONDS;
+        uiImpalingChargeTimer = 21*IN_MILLISECONDS;
+        uiStompTimer = 25*IN_MILLISECONDS;
+        uiTransformationTimer = 9*IN_MILLISECONDS;
         uiPhaseCounter = 0;
 
         lImpaledPlayers.clear();
@@ -140,7 +140,7 @@ struct boss_gal_darahAI : public ScriptedAI
                         Phase = RHINO;
                         uiPhaseCounter = 0;
                         DoScriptText(SAY_TRANSFORM_1, me);
-                        uiTransformationTimer = 5*IN_MILISECONDS;
+                        uiTransformationTimer = 5*IN_MILLISECONDS;
                         bStartOfTransformation = true;
                         me->clearUnitState(UNIT_STAT_STUNNED|UNIT_STAT_ROOT);
                         me->SetReactState(REACT_AGGRESSIVE);
@@ -163,13 +163,13 @@ struct boss_gal_darahAI : public ScriptedAI
                     {
                         DoCast(me, SPELL_STAMPEDE);
                         DoScriptText(RAND(SAY_SUMMON_RHINO_1,SAY_SUMMON_RHINO_2,SAY_SUMMON_RHINO_3),me);
-                        uiStampedeTimer = 15*IN_MILISECONDS;
+                        uiStampedeTimer = 15*IN_MILLISECONDS;
                     } else uiStampedeTimer -= diff;
 
                     if (uiWhirlingSlashTimer <= diff)
                     {
                         DoCast(me->getVictim(), SPELL_WHIRLING_SLASH);
-                        uiWhirlingSlashTimer = 21*IN_MILISECONDS;
+                        uiWhirlingSlashTimer = 21*IN_MILLISECONDS;
                         ++uiPhaseCounter;
                     } else uiWhirlingSlashTimer -= diff;
                 }
@@ -183,7 +183,7 @@ struct boss_gal_darahAI : public ScriptedAI
                         Phase = TROLL;
                         uiPhaseCounter = 0;
                         DoScriptText(SAY_TRANSFORM_2, me);
-                        uiTransformationTimer = 9*IN_MILISECONDS;
+                        uiTransformationTimer = 9*IN_MILLISECONDS;
                         bStartOfTransformation = true;
                         me->clearUnitState(UNIT_STAT_STUNNED|UNIT_STAT_ROOT);
                         me->SetReactState(REACT_AGGRESSIVE);
@@ -205,19 +205,19 @@ struct boss_gal_darahAI : public ScriptedAI
                     if (uiPunctureTimer <= diff)
                     {
                         DoCast(me->getVictim(), SPELL_PUNCTURE);
-                        uiPunctureTimer = 8*IN_MILISECONDS;
+                        uiPunctureTimer = 8*IN_MILLISECONDS;
                     } else uiPunctureTimer -= diff;
 
                     if (uiEnrageTimer <= diff)
                     {
                         DoCast(me->getVictim(), SPELL_ENRAGE);
-                        uiEnrageTimer = 20*IN_MILISECONDS;
+                        uiEnrageTimer = 20*IN_MILLISECONDS;
                     } else uiEnrageTimer -= diff;
 
                     if (uiStompTimer <= diff)
                     {
                         DoCast(me->getVictim(), SPELL_STOMP);
-                        uiStompTimer = 20*IN_MILISECONDS;
+                        uiStompTimer = 20*IN_MILLISECONDS;
                     } else uiStompTimer -= diff;
 
                     if (uiImpalingChargeTimer <= diff)
@@ -227,7 +227,7 @@ struct boss_gal_darahAI : public ScriptedAI
                             DoCast(pTarget, SPELL_IMPALING_CHARGE);
                             lImpaledPlayers.insert(pTarget->GetGUID());
                         }
-                        uiImpalingChargeTimer = 31*IN_MILISECONDS;
+                        uiImpalingChargeTimer = 31*IN_MILLISECONDS;
                         ++uiPhaseCounter;
                     } else uiImpalingChargeTimer -= diff;
                 }
diff --git a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp
index 388efc70e56..7a9278b2fde 100755
--- a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp
+++ b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp
@@ -66,10 +66,10 @@ struct boss_moorabiAI : public ScriptedAI
 
     void Reset()
     {
-        uiGroundTremorTimer = 18*IN_MILISECONDS;
-        uiNumblingShoutTimer =  10*IN_MILISECONDS;
-        uiDeterminedStabTimer = 20*IN_MILISECONDS;
-        uiTransformationTImer = 12*IN_MILISECONDS;
+        uiGroundTremorTimer = 18*IN_MILLISECONDS;
+        uiNumblingShoutTimer =  10*IN_MILLISECONDS;
+        uiDeterminedStabTimer = 20*IN_MILLISECONDS;
+        uiTransformationTImer = 12*IN_MILLISECONDS;
         bPhase = false;
 
         if (pInstance)
@@ -104,7 +104,7 @@ struct boss_moorabiAI : public ScriptedAI
                 DoCast(me->getVictim(), SPELL_QUAKE, true);
             else
                 DoCast(me->getVictim(), SPELL_GROUND_TREMOR, true);
-            uiGroundTremorTimer = 10*IN_MILISECONDS;
+            uiGroundTremorTimer = 10*IN_MILLISECONDS;
         } else uiGroundTremorTimer -= uiDiff;
 
         if (uiNumblingShoutTimer <= uiDiff)
@@ -113,7 +113,7 @@ struct boss_moorabiAI : public ScriptedAI
                 DoCast(me->getVictim(), SPELL_NUMBING_ROAR, true);
             else
                 DoCast(me->getVictim(), SPELL_NUMBING_SHOUT, true);
-            uiNumblingShoutTimer = 10*IN_MILISECONDS;
+            uiNumblingShoutTimer = 10*IN_MILLISECONDS;
         } else uiNumblingShoutTimer -=uiDiff;
 
         if (uiDeterminedStabTimer <= uiDiff)
@@ -122,7 +122,7 @@ struct boss_moorabiAI : public ScriptedAI
                 DoCast(me->getVictim(), SPELL_DETERMINED_GORE);
             else
                 DoCast(me->getVictim(), SPELL_DETERMINED_STAB, true);
-            uiDeterminedStabTimer = 8*IN_MILISECONDS;
+            uiDeterminedStabTimer = 8*IN_MILLISECONDS;
         } else uiDeterminedStabTimer -=uiDiff;
 
         if (!bPhase && uiTransformationTImer <= uiDiff)
@@ -130,7 +130,7 @@ struct boss_moorabiAI : public ScriptedAI
             DoScriptText(EMOTE_TRANSFORM, me);
             DoScriptText(SAY_TRANSFORM, me);
             DoCast(me, SPELL_TRANSFORMATION, false);
-            uiTransformationTImer = 10*IN_MILISECONDS;
+            uiTransformationTImer = 10*IN_MILLISECONDS;
         } else uiTransformationTImer -= uiDiff;
 
         DoMeleeAttackIfReady();
diff --git a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp
index 56d8c6f1857..47a55440b92 100755
--- a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp
+++ b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp
@@ -85,10 +85,10 @@ struct boss_slad_ranAI : public ScriptedAI
 
     void Reset()
     {
-        uiPoisonNovaTimer = 10*IN_MILISECONDS;
-        uiPowerfullBiteTimer = 3*IN_MILISECONDS;
-        uiVenomBoltTimer = 15*IN_MILISECONDS;
-        uiSpawnTimer = 5*IN_MILISECONDS;
+        uiPoisonNovaTimer = 10*IN_MILLISECONDS;
+        uiPowerfullBiteTimer = 3*IN_MILLISECONDS;
+        uiVenomBoltTimer = 15*IN_MILLISECONDS;
+        uiSpawnTimer = 5*IN_MILLISECONDS;
         uiPhase = 0;
 
         lSummons.DespawnAll();
@@ -114,19 +114,19 @@ struct boss_slad_ranAI : public ScriptedAI
         if (uiPoisonNovaTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_POISON_NOVA);
-            uiPoisonNovaTimer = 15*IN_MILISECONDS;
+            uiPoisonNovaTimer = 15*IN_MILLISECONDS;
         } else uiPoisonNovaTimer -= diff;
 
         if (uiPowerfullBiteTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_POWERFULL_BITE);
-            uiPowerfullBiteTimer = 10*IN_MILISECONDS;
+            uiPowerfullBiteTimer = 10*IN_MILLISECONDS;
         } else uiPowerfullBiteTimer -= diff;
 
         if (uiVenomBoltTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_VENOM_BOLT);
-            uiVenomBoltTimer = 10*IN_MILISECONDS;
+            uiVenomBoltTimer = 10*IN_MILLISECONDS;
         } else uiVenomBoltTimer -= diff;
 
         if (uiPhase)
@@ -135,11 +135,11 @@ struct boss_slad_ranAI : public ScriptedAI
             {
                 if (uiPhase == 1)
                     for (uint8 i = 0; i < DUNGEON_MODE(3, 5); ++i)
-                        me->SummonCreature(CREATURE_SNAKE, SpawnLoc[i], TEMPSUMMON_CORPSE_TIMED_DESPAWN,20*IN_MILISECONDS);
+                        me->SummonCreature(CREATURE_SNAKE, SpawnLoc[i], TEMPSUMMON_CORPSE_TIMED_DESPAWN,20*IN_MILLISECONDS);
                 if (uiPhase == 2)
                     for (uint8 i = 0; i < DUNGEON_MODE(3, 5); ++i)
-                        me->SummonCreature(CREATURE_CONSTRICTORS, SpawnLoc[i], TEMPSUMMON_CORPSE_TIMED_DESPAWN,20*IN_MILISECONDS);
-                uiSpawnTimer = 5*IN_MILISECONDS;
+                        me->SummonCreature(CREATURE_CONSTRICTORS, SpawnLoc[i], TEMPSUMMON_CORPSE_TIMED_DESPAWN,20*IN_MILLISECONDS);
+                uiSpawnTimer = 5*IN_MILLISECONDS;
             } else uiSpawnTimer -= diff;
         }
 
@@ -186,7 +186,7 @@ struct mob_slad_ran_constrictorAI : public ScriptedAI
 
     void Reset()
     {
-        uiGripOfSladRanTimer = 1*IN_MILISECONDS;
+        uiGripOfSladRanTimer = 1*IN_MILLISECONDS;
     }
 
     void UpdateAI(const uint32 diff)
@@ -196,7 +196,7 @@ struct mob_slad_ran_constrictorAI : public ScriptedAI
         if (uiGripOfSladRanTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_GRIP_OF_SLAD_RAN);
-            uiGripOfSladRanTimer = 5*IN_MILISECONDS;
+            uiGripOfSladRanTimer = 5*IN_MILLISECONDS;
         } else uiGripOfSladRanTimer -= diff;
     }
 
@@ -213,7 +213,7 @@ struct mob_slad_ran_viperAI : public ScriptedAI
 
     void Reset()
     {
-        uiVenomousBiteTimer = 2*IN_MILISECONDS;
+        uiVenomousBiteTimer = 2*IN_MILLISECONDS;
     }
 
     void UpdateAI(const uint32 diff)
@@ -224,7 +224,7 @@ struct mob_slad_ran_viperAI : public ScriptedAI
         if (uiVenomousBiteTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_VENOMOUS_BITE);
-            uiVenomousBiteTimer = 10*IN_MILISECONDS;
+            uiVenomousBiteTimer = 10*IN_MILLISECONDS;
         } else uiVenomousBiteTimer -= diff;
     }
 };
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
index 2aa150bec76..767aeabcc42 100755
--- a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
@@ -78,7 +78,7 @@ struct boss_anomalusAI : public ScriptedAI
     void Reset()
     {
         Phase = 0;
-        uiSparkTimer = 5*IN_MILISECONDS;
+        uiSparkTimer = 5*IN_MILLISECONDS;
         uiChaoticRiftGUID = 0;
 
         bDeadChaoticRift = false;
@@ -139,7 +139,7 @@ struct boss_anomalusAI : public ScriptedAI
             Phase = 1;
             DoScriptText(SAY_SHIELD, me);
             DoCast(me, SPELL_RIFT_SHIELD);
-            Creature* Rift = me->SummonCreature(MOB_CHAOTIC_RIFT, RiftLocation[urand(0,5)], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1*IN_MILISECONDS);
+            Creature* Rift = me->SummonCreature(MOB_CHAOTIC_RIFT, RiftLocation[urand(0,5)], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1*IN_MILLISECONDS);
             if (Rift)
             {
                 //DoCast(Rift, SPELL_CHARGE_RIFT);
@@ -155,7 +155,7 @@ struct boss_anomalusAI : public ScriptedAI
         {
             if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
                 DoCast(pTarget, SPELL_SPARK);
-            uiSparkTimer = 5*IN_MILISECONDS;
+            uiSparkTimer = 5*IN_MILLISECONDS;
         } else uiSparkTimer -= diff;
 
         DoMeleeAttackIfReady();
@@ -188,8 +188,8 @@ struct mob_chaotic_riftAI : public Scripted_NoMovementAI
 
     void Reset()
     {
-        uiChaoticEnergyBurstTimer = 1*IN_MILISECONDS;
-        uiSummonCrazedManaWraithTimer = 5*IN_MILISECONDS;
+        uiChaoticEnergyBurstTimer = 1*IN_MILLISECONDS;
+        uiSummonCrazedManaWraithTimer = 5*IN_MILLISECONDS;
         //me->SetDisplayId(25206); //For some reason in DB models for ally and horde are different.
                                          //Model for ally (1126) does not show auras. Horde model works perfect.
                                          //Set model to horde number
@@ -215,20 +215,20 @@ struct mob_chaotic_riftAI : public Scripted_NoMovementAI
                     DoCast(pTarget, SPELL_CHARGED_CHAOTIC_ENERGY_BURST);
                 else
                     DoCast(pTarget, SPELL_CHAOTIC_ENERGY_BURST);
-            uiChaoticEnergyBurstTimer = 1*IN_MILISECONDS;
+            uiChaoticEnergyBurstTimer = 1*IN_MILLISECONDS;
         } else uiChaoticEnergyBurstTimer -= diff;
 
         if (uiSummonCrazedManaWraithTimer <= diff)
         {
-            Creature* Wraith = me->SummonCreature(MOB_CRAZED_MANA_WRAITH, me->GetPositionX()+1, me->GetPositionY()+1, me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1*IN_MILISECONDS);
+            Creature* Wraith = me->SummonCreature(MOB_CRAZED_MANA_WRAITH, me->GetPositionX()+1, me->GetPositionY()+1, me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1*IN_MILLISECONDS);
             if (Wraith)
                 if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
                     Wraith->AI()->AttackStart(pTarget);
             Unit* Anomalus = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_ANOMALUS) : 0);
             if (Anomalus && Anomalus->HasAura(SPELL_RIFT_SHIELD))
-                uiSummonCrazedManaWraithTimer = 5*IN_MILISECONDS;
+                uiSummonCrazedManaWraithTimer = 5*IN_MILLISECONDS;
             else
-                uiSummonCrazedManaWraithTimer = 10*IN_MILISECONDS;
+                uiSummonCrazedManaWraithTimer = 10*IN_MILLISECONDS;
         } else uiSummonCrazedManaWraithTimer -= diff;
     }
 };
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp
index b3db17167b6..befa9fb068d 100755
--- a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp
@@ -71,12 +71,12 @@ struct boss_keristraszaAI : public ScriptedAI
 
     void Reset()
     {
-        uiCrystalfireBreathTimer = 14*IN_MILISECONDS;
-        uiCrystalChainsCrystalizeTimer = DUNGEON_MODE(30*IN_MILISECONDS,11*IN_MILISECONDS);
-        uiTailSweepTimer = 5*IN_MILISECONDS;
+        uiCrystalfireBreathTimer = 14*IN_MILLISECONDS;
+        uiCrystalChainsCrystalizeTimer = DUNGEON_MODE(30*IN_MILLISECONDS,11*IN_MILLISECONDS);
+        uiTailSweepTimer = 5*IN_MILLISECONDS;
         bEnrage = false;
 
-        uiCheckIntenseColdTimer = 2*IN_MILISECONDS;
+        uiCheckIntenseColdTimer = 2*IN_MILLISECONDS;
         bMoreThanTwoIntenseCold = false;
 
         me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED);
@@ -175,7 +175,7 @@ struct boss_keristraszaAI : public ScriptedAI
                     break;
                 }
             }
-            uiCheckIntenseColdTimer = 2*IN_MILISECONDS;
+            uiCheckIntenseColdTimer = 2*IN_MILLISECONDS;
         } else uiCheckIntenseColdTimer -= diff;
 
         if (!bEnrage && HealthBelowPct(25))
@@ -188,13 +188,13 @@ struct boss_keristraszaAI : public ScriptedAI
         if (uiCrystalfireBreathTimer <= diff)
         {
             DoCast(me->getVictim(), SPELL_CRYSTALFIRE_BREATH);
-            uiCrystalfireBreathTimer = 14*IN_MILISECONDS;
+            uiCrystalfireBreathTimer = 14*IN_MILLISECONDS;
         } else uiCrystalfireBreathTimer -= diff;
 
         if (uiTailSweepTimer <= diff)
         {
             DoCast(me, SPELL_TAIL_SWEEP);
-            uiTailSweepTimer = 5*IN_MILISECONDS;
+            uiTailSweepTimer = 5*IN_MILLISECONDS;
         } else uiTailSweepTimer -= diff;
 
         if (uiCrystalChainsCrystalizeTimer <= diff)
@@ -204,7 +204,7 @@ struct boss_keristraszaAI : public ScriptedAI
                 DoCast(me, SPELL_CRYSTALIZE);
             else if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
                 DoCast(pTarget, SPELL_CRYSTAL_CHAINS);
-            uiCrystalChainsCrystalizeTimer = DUNGEON_MODE(30*IN_MILISECONDS,11*IN_MILISECONDS);
+            uiCrystalChainsCrystalizeTimer = DUNGEON_MODE(30*IN_MILLISECONDS,11*IN_MILLISECONDS);
         } else uiCrystalChainsCrystalizeTimer -= diff;
 
         DoMeleeAttackIfReady();
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
index dbcb1dc2a58..77dd3025451 100755
--- a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
@@ -50,7 +50,7 @@ enum Yells
 enum Achievements
 {
     ACHIEV_SPLIT_PERSONALITY                      = 2150,
-    ACHIEV_TIMER                                  = 5*IN_MILISECONDS
+    ACHIEV_TIMER                                  = 5*IN_MILLISECONDS
 };
 
 const Position  CenterOfRoom = {504.80, 89.07, -16.12, 6.27};
@@ -88,9 +88,9 @@ struct boss_magus_telestraAI : public ScriptedAI
     {
         Phase = 0;
         //These times are probably wrong
-        uiIceNovaTimer =  7*IN_MILISECONDS;
+        uiIceNovaTimer =  7*IN_MILLISECONDS;
         uiFireBombTimer =  0;
-        uiGravityWellTimer = 15*IN_MILISECONDS;
+        uiGravityWellTimer = 15*IN_MILLISECONDS;
         uiCooldown = 0;
 
         uiFireMagusGUID = 0;
@@ -137,7 +137,7 @@ struct boss_magus_telestraAI : public ScriptedAI
 
     uint64 SplitPersonality(uint32 entry)
     {
-        if (Creature* Summoned = me->SummonCreature(entry, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1*IN_MILISECONDS))
+        if (Creature* Summoned = me->SummonCreature(entry, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1*IN_MILLISECONDS))
         {
             switch (entry)
             {
@@ -224,7 +224,7 @@ struct boss_magus_telestraAI : public ScriptedAI
                 uiFrostMagusGUID = 0;
                 uiArcaneMagusGUID = 0;
                 bIsWaitingToAppear = true;
-                uiIsWaitingToAppearTimer = 4*IN_MILISECONDS;
+                uiIsWaitingToAppearTimer = 4*IN_MILLISECONDS;
                 DoScriptText(SAY_MERGE, me);
                 bIsAchievementTimerRunning = false;
                 uiAchievementTimer = 0;
@@ -283,9 +283,9 @@ struct boss_magus_telestraAI : public ScriptedAI
             if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
             {
                 DoCast(pTarget, SPELL_ICE_NOVA, false);
-                uiCooldown = 1.5*IN_MILISECONDS;
+                uiCooldown = 1.5*IN_MILLISECONDS;
             }
-            uiIceNovaTimer = 15*IN_MILISECONDS;
+            uiIceNovaTimer = 15*IN_MILLISECONDS;
         } else uiIceNovaTimer -= diff;
 
         if (uiGravityWellTimer <= diff)
@@ -293,9 +293,9 @@ struct boss_magus_telestraAI : public ScriptedAI
             if (Unit *pTarget = me->getVictim())
             {
                 DoCast(pTarget, SPELL_GRAVITY_WELL);
-                uiCooldown = 6*IN_MILISECONDS;
+                uiCooldown = 6*IN_MILLISECONDS;
             }
-            uiGravityWellTimer = 15*IN_MILISECONDS;
+            uiGravityWellTimer = 15*IN_MILLISECONDS;
         } else uiGravityWellTimer -= diff;
 
         if (uiFireBombTimer <= diff)
@@ -303,9 +303,9 @@ struct boss_magus_telestraAI : public ScriptedAI
             if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
             {
                 DoCast(pTarget, SPELL_FIREBOMB, false);
-                uiCooldown = 2*IN_MILISECONDS;
+                uiCooldown = 2*IN_MILLISECONDS;
             }
-            uiFireBombTimer = 2*IN_MILISECONDS;
+            uiFireBombTimer = 2*IN_MILLISECONDS;
         } else uiFireBombTimer -=diff;
 
         DoMeleeAttackIfReady();
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp
index dffdbf8d20d..c28aff66ed1 100755
--- a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp
@@ -76,10 +76,10 @@ struct boss_ormorokAI : public ScriptedAI
 
     void Reset()
     {
-        uiCrystalSpikesTimer = 12*IN_MILISECONDS;
-        uiTrampleTimer = 10*IN_MILISECONDS;
-        uiSpellReflectionTimer = 30*IN_MILISECONDS;
-        uiSummonCrystallineTanglerTimer = 17*IN_MILISECONDS;
+        uiCrystalSpikesTimer = 12*IN_MILLISECONDS;
+        uiTrampleTimer = 10*IN_MILLISECONDS;
+        uiSpellReflectionTimer = 30*IN_MILLISECONDS;
+        uiSummonCrystallineTanglerTimer = 17*IN_MILLISECONDS;
         bFrenzy = false;
         bCrystalSpikes = false;
 
@@ -126,7 +126,7 @@ struct boss_ormorokAI : public ScriptedAI
                 fSpikeXY[3][0] = fBaseX-(SPIKE_DISTANCE*uiCrystalSpikesCount*cos(fBaseO-(M_PI/2)));
                 fSpikeXY[3][1] = fBaseY-(SPIKE_DISTANCE*uiCrystalSpikesCount*sin(fBaseO-(M_PI/2)));
                 for (uint8 i = 0; i < 4; ++i)
-                    me->SummonCreature(MOB_CRYSTAL_SPIKE, fSpikeXY[i][0], fSpikeXY[i][1], fBaseZ, 0, TEMPSUMMON_TIMED_DESPAWN, 7*IN_MILISECONDS);
+                    me->SummonCreature(MOB_CRYSTAL_SPIKE, fSpikeXY[i][0], fSpikeXY[i][1], fBaseZ, 0, TEMPSUMMON_TIMED_DESPAWN, 7*IN_MILLISECONDS);
                 if (++uiCrystalSpikesCount >= 13)
                     bCrystalSpikes = false;
                 uiCrystalSpikesTimer2 = 200;
@@ -141,14 +141,14 @@ struct boss_ormorokAI : public ScriptedAI
         if (uiTrampleTimer <= diff)
         {
             DoCast(me, SPELL_TRAMPLE);
-            uiTrampleTimer = 10*IN_MILISECONDS;
+            uiTrampleTimer = 10*IN_MILLISECONDS;
         } else uiTrampleTimer -= diff;
 
         if (uiSpellReflectionTimer <= diff)
         {
             DoScriptText(SAY_REFLECT, me);
             DoCast(me, SPELL_SPELL_REFLECTION);
-            uiSpellReflectionTimer = 30*IN_MILISECONDS;
+            uiSpellReflectionTimer = 30*IN_MILLISECONDS;
         } else uiSpellReflectionTimer -= diff;
 
         if (uiCrystalSpikesTimer <= diff)
@@ -161,7 +161,7 @@ struct boss_ormorokAI : public ScriptedAI
             fBaseY = me->GetPositionY();
             fBaseZ = me->GetPositionZ();
             fBaseO = me->GetOrientation();
-            uiCrystalSpikesTimer = 20*IN_MILISECONDS;
+            uiCrystalSpikesTimer = 20*IN_MILLISECONDS;
         } else uiCrystalSpikesTimer -= diff;
 
         if (IsHeroic() && (uiSummonCrystallineTanglerTimer <= diff))
@@ -201,7 +201,7 @@ struct boss_ormorokAI : public ScriptedAI
                     Crystalline_Tangler->getThreatManager().addThreat(pTarget, 1000000000.0f);
                 }
             }
-            uiSummonCrystallineTanglerTimer = 17*IN_MILISECONDS;
+            uiSummonCrystallineTanglerTimer = 17*IN_MILLISECONDS;
         } else uiSummonCrystallineTanglerTimer -= diff;
 
         DoMeleeAttackIfReady();
@@ -219,8 +219,8 @@ struct mob_crystal_spikeAI : public Scripted_NoMovementAI
 
     void Reset()
     {
-        SpellCrystalSpikeDamageTimer = 3.7*IN_MILISECONDS;
-        SpellCrystalSpikePrevisualTimer = 1*IN_MILISECONDS;
+        SpellCrystalSpikeDamageTimer = 3.7*IN_MILLISECONDS;
+        SpellCrystalSpikePrevisualTimer = 1*IN_MILLISECONDS;
     }
 
     void UpdateAI(const uint32 diff)
@@ -228,13 +228,13 @@ struct mob_crystal_spikeAI : public Scripted_NoMovementAI
         if (SpellCrystalSpikePrevisualTimer <= diff)
         {
             DoCast(me, SPELL_CRYSTAL_SPIKE_PREVISUAL);
-            SpellCrystalSpikePrevisualTimer = 10*IN_MILISECONDS;
+            SpellCrystalSpikePrevisualTimer = 10*IN_MILLISECONDS;
         } else SpellCrystalSpikePrevisualTimer -= diff;
 
         if (SpellCrystalSpikeDamageTimer <= diff)
         {
             DoCast(me, SPELL_CRYSTALL_SPIKE_DAMAGE);
-            SpellCrystalSpikeDamageTimer = 10*IN_MILISECONDS;
+            SpellCrystalSpikeDamageTimer = 10*IN_MILLISECONDS;
         } else SpellCrystalSpikeDamageTimer -= diff;
     }
 };
@@ -247,7 +247,7 @@ struct mob_crystalline_tanglerAI : public ScriptedAI
 
     void Reset()
     {
-        uiRootsTimer = 1*IN_MILISECONDS;
+        uiRootsTimer = 1*IN_MILLISECONDS;
     }
 
     void UpdateAI(const uint32 diff)
@@ -257,7 +257,7 @@ struct mob_crystalline_tanglerAI : public ScriptedAI
             if (me->IsWithinDist(me->getVictim(), 5.0f, false))
             {
                 DoCast(me->getVictim(), SPELL_ROOTS);
-                uiRootsTimer = 15*IN_MILISECONDS;
+                uiRootsTimer = 15*IN_MILLISECONDS;
             }
         } else uiRootsTimer -= diff;
     }
diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp
index 00de292678d..a1201b838c5 100755
--- a/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp
+++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp
@@ -189,7 +189,7 @@ struct npc_unstable_sphereAI : public ScriptedAI
         if (uiPulseTimer <= uiDiff)
         {
             DoCast(SPELL_UNSTABLE_SPHERE_PULSE);
-            uiPulseTimer = 3*IN_MILISECONDS;
+            uiPulseTimer = 3*IN_MILLISECONDS;
         } else uiPulseTimer -= uiDiff;
 
         if (uiDeathTimer <= uiDiff)
diff --git a/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp
index 70773e6258e..ffeda4d4b7f 100644
--- a/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp
+++ b/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp
@@ -252,7 +252,7 @@ struct boss_sartharionAI : public ScriptedAI
         m_bIsBerserk = false;
         m_bIsSoftEnraged = false;
 
-        m_uiEnrageTimer = 15*MINUTE*IN_MILISECONDS;
+        m_uiEnrageTimer = 15*MINUTE*IN_MILLISECONDS;
         m_bIsHardEnraged = false;
 
         m_uiTenebronTimer = 30000;
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp
index 49863dab607..88c240b49bd 100755
--- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp
@@ -94,10 +94,10 @@ struct boss_ionarAI : public ScriptedAI
         bIsSplitPhase = true;
         bHasDispersed = false;
 
-        uiSplitTimer = 25*IN_MILISECONDS;
+        uiSplitTimer = 25*IN_MILLISECONDS;
 
-        uiStaticOverloadTimer = urand(5*IN_MILISECONDS, 6*IN_MILISECONDS);
-        uiBallLightningTimer = urand(10*IN_MILISECONDS, 11*IN_MILISECONDS);
+        uiStaticOverloadTimer = urand(5*IN_MILLISECONDS, 6*IN_MILLISECONDS);
+        uiBallLightningTimer = urand(10*IN_MILLISECONDS, 11*IN_MILLISECONDS);
 
         uiDisperseHealth = 45 + urand(0,10);
 
@@ -200,7 +200,7 @@ struct boss_ionarAI : public ScriptedAI
         {
             if (uiSplitTimer <= uiDiff)
             {
-                uiSplitTimer = 2.5*IN_MILISECONDS;
+                uiSplitTimer = 2.5*IN_MILLISECONDS;
 
                 // Return sparks to where Ionar splitted
                 if (bIsSplitPhase)
@@ -216,7 +216,7 @@ struct boss_ionarAI : public ScriptedAI
 
                     DoCast(me, SPELL_SPARK_DESPAWN, false);
 
-                    uiSplitTimer = 25*IN_MILISECONDS;
+                    uiSplitTimer = 25*IN_MILLISECONDS;
                     bIsSplitPhase = true;
 
                     if (me->getVictim())
@@ -234,7 +234,7 @@ struct boss_ionarAI : public ScriptedAI
             if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
                 DoCast(pTarget, SPELL_STATIC_OVERLOAD);
 
-            uiStaticOverloadTimer = urand(5*IN_MILISECONDS, 6*IN_MILISECONDS);
+            uiStaticOverloadTimer = urand(5*IN_MILLISECONDS, 6*IN_MILLISECONDS);
         }
         else
             uiStaticOverloadTimer -= uiDiff;
@@ -242,7 +242,7 @@ struct boss_ionarAI : public ScriptedAI
         if (uiBallLightningTimer <= uiDiff)
         {
             DoCast(me->getVictim(), SPELL_BALL_LIGHTNING);
-            uiBallLightningTimer = urand(10*IN_MILISECONDS, 11*IN_MILISECONDS);
+            uiBallLightningTimer = urand(10*IN_MILLISECONDS, 11*IN_MILLISECONDS);
         }
         else
             uiBallLightningTimer -= uiDiff;
@@ -310,7 +310,7 @@ struct mob_spark_of_ionarAI : public ScriptedAI
 
     void Reset()
     {
-        uiCheckTimer = 2*IN_MILISECONDS;
+        uiCheckTimer = 2*IN_MILLISECONDS;
         me->SetReactState(REACT_PASSIVE);
     }
 
@@ -358,7 +358,7 @@ struct mob_spark_of_ionarAI : public ScriptedAI
                 else
                     me->ForcedDespawn();
             }
-            uiCheckTimer = 2*IN_MILISECONDS;
+            uiCheckTimer = 2*IN_MILLISECONDS;
         }
         else
             uiCheckTimer -= uiDiff;
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
index 2bea610891e..964f30adb91 100755
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
@@ -253,7 +253,7 @@ struct boss_skadiAI : public ScriptedAI
                 break;
             case CREATURE_TRIGGER:
                 pSummoned->CastSpell((Unit*)NULL, SPELL_FREEZING_CLOUD, true);
-                pSummoned->ForcedDespawn(10*IN_MILISECONDS);
+                pSummoned->ForcedDespawn(10*IN_MILLISECONDS);
                 break;
         }
         Summons.Summon(pSummoned);
@@ -276,7 +276,7 @@ struct boss_skadiAI : public ScriptedAI
                 Phase = SKADI;
                 me->SetFlying(false);
                 me->Unmount();
-                if(Creature* pGrauf = me->SummonCreature(CREATURE_GRAUF, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 3*IN_MILISECONDS))
+                if(Creature* pGrauf = me->SummonCreature(CREATURE_GRAUF, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 3*IN_MILLISECONDS))
                 {
                     pGrauf->GetMotionMaster()->MoveFall(0);
                     pGrauf->HandleEmoteCommand(EMOTE_ONESHOT_FLYDEATH);
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
index 0367cb760cb..bd3cf42c502 100755
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
@@ -105,7 +105,7 @@ struct boss_svalaAI : public ScriptedAI
     void Reset()
     {
         Phase = IDLE;
-        uiIntroTimer = 1*IN_MILISECONDS;
+        uiIntroTimer = 1*IN_MILLISECONDS;
         uiIntroPhase = 0;
         uiArthasGUID = 0;
 
@@ -150,28 +150,28 @@ struct boss_svalaAI : public ScriptedAI
                 case 0:
                     DoScriptText(SAY_DIALOG_WITH_ARTHAS_1, me);
                     ++uiIntroPhase;
-                    uiIntroTimer = 3.5*IN_MILISECONDS;
+                    uiIntroTimer = 3.5*IN_MILLISECONDS;
                     break;
                 case 1:
                     DoScriptText(SAY_DIALOG_OF_ARTHAS_1, pArthas);
                     ++uiIntroPhase;
-                    uiIntroTimer = 3.5*IN_MILISECONDS;
+                    uiIntroTimer = 3.5*IN_MILLISECONDS;
                     break;
                 case 2:
                     DoScriptText(SAY_DIALOG_WITH_ARTHAS_2, me);
                     ++uiIntroPhase;
-                    uiIntroTimer = 3.5*IN_MILISECONDS;
+                    uiIntroTimer = 3.5*IN_MILLISECONDS;
                     break;
                 case 3:
                     DoScriptText(SAY_DIALOG_OF_ARTHAS_2, pArthas);
                     ++uiIntroPhase;
-                    uiIntroTimer = 3.5*IN_MILISECONDS;
+                    uiIntroTimer = 3.5*IN_MILLISECONDS;
                     break;
                 case 4:
                     DoScriptText(SAY_DIALOG_WITH_ARTHAS_3, me);
                     DoCast(me, SPELL_SVALA_TRANSFORMING1);
                     ++uiIntroPhase;
-                    uiIntroTimer = 2.8*IN_MILISECONDS;
+                    uiIntroTimer = 2.8*IN_MILLISECONDS;
                     break;
                 case 5:
                     DoCast(me, SPELL_SVALA_TRANSFORMING2);
@@ -179,7 +179,7 @@ struct boss_svalaAI : public ScriptedAI
                     uiIntroTimer = 200;
                     break;
                 case 6:
-                    if (Creature* pSvalaSorrowgrave = me->SummonCreature(CREATURE_SVALA_SORROWGRAVE, SvalaPos, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 60*IN_MILISECONDS))
+                    if (Creature* pSvalaSorrowgrave = me->SummonCreature(CREATURE_SVALA_SORROWGRAVE, SvalaPos, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 60*IN_MILLISECONDS))
                     {
                         me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE);
                         me->SetDisplayId(DATA_SVALA_DISPLAY_ID);
@@ -244,10 +244,10 @@ struct boss_svala_sorrowgraveAI : public ScriptedAI
 
     void Reset()
     {
-        uiSinsterStrikeTimer = 7*IN_MILISECONDS;
-        uiCallFlamesTimer = 10*IN_MILISECONDS;
-        uiRitualOfSwordTimer = 20*IN_MILISECONDS;
-        uiSacrificeTimer = 8*IN_MILISECONDS;
+        uiSinsterStrikeTimer = 7*IN_MILLISECONDS;
+        uiCallFlamesTimer = 10*IN_MILLISECONDS;
+        uiRitualOfSwordTimer = 20*IN_MILLISECONDS;
+        uiSacrificeTimer = 8*IN_MILLISECONDS;
 
         bSacrificed = false;
 
@@ -294,7 +294,7 @@ struct boss_svala_sorrowgraveAI : public ScriptedAI
             if (uiSinsterStrikeTimer <= diff)
             {
                 DoCast(me->getVictim(), SPELL_SINSTER_STRIKE);
-                uiSinsterStrikeTimer = urand(5*IN_MILISECONDS,9*IN_MILISECONDS);
+                uiSinsterStrikeTimer = urand(5*IN_MILLISECONDS,9*IN_MILLISECONDS);
             } else uiSinsterStrikeTimer -= diff;
 
             if (uiCallFlamesTimer <= diff)
@@ -302,7 +302,7 @@ struct boss_svala_sorrowgraveAI : public ScriptedAI
                 if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
                 {
                     DoCast(pTarget, SPELL_CALL_FLAMES);
-                    uiCallFlamesTimer = urand(8*IN_MILISECONDS,12*IN_MILISECONDS);
+                    uiCallFlamesTimer = urand(8*IN_MILLISECONDS,12*IN_MILLISECONDS);
                 }
             } else uiCallFlamesTimer -= diff;
 
@@ -348,7 +348,7 @@ struct boss_svala_sorrowgraveAI : public ScriptedAI
                 if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
                     me->GetMotionMaster()->MoveChase(pTarget);
 
-                uiSacrificeTimer = 8*IN_MILISECONDS;
+                uiSacrificeTimer = 8*IN_MILLISECONDS;
             }
             else uiSacrificeTimer -= diff;
         }
diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
index e8fbe46507c..80051ace614 100755
--- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
+++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
@@ -199,7 +199,7 @@ struct instance_violet_hold : public ScriptedInstance
 
         uiActivationTimer = 5000;
         uiDoorSpellTimer = 2000;
-        uiCyanigosaEventTimer = 3*IN_MILISECONDS;
+        uiCyanigosaEventTimer = 3*IN_MILLISECONDS;
 
         bActive = false;
         bIsDoorSpellCasted = false;
@@ -726,13 +726,13 @@ struct instance_violet_hold : public ScriptedInstance
                     case 1:
                         pCyanigosa->CastSpell(pCyanigosa, CYANIGOSA_BLUE_AURA, false);
                         DoScriptText(CYANIGOSA_SAY_SPAWN, pCyanigosa);
-                        uiCyanigosaEventTimer = 7*IN_MILISECONDS;
+                        uiCyanigosaEventTimer = 7*IN_MILLISECONDS;
                         ++uiCyanigosaEventPhase;
                         break;
                     case 2:
                         pCyanigosa->GetMotionMaster()->MoveJump(MiddleRoomLocation.GetPositionX(), MiddleRoomLocation.GetPositionY(), MiddleRoomLocation.GetPositionZ(), 10.0f, 20.0f);
                         pCyanigosa->CastSpell(pCyanigosa, CYANIGOSA_BLUE_AURA, false);
-                        uiCyanigosaEventTimer = 7*IN_MILISECONDS;
+                        uiCyanigosaEventTimer = 7*IN_MILLISECONDS;
                         ++uiCyanigosaEventPhase;
                         break;
                     case 3:
@@ -740,7 +740,7 @@ struct instance_violet_hold : public ScriptedInstance
                         pCyanigosa->CastSpell(pCyanigosa, CYANIGOSA_SPELL_TRANSFORM, 0);
                         pCyanigosa->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE|UNIT_FLAG_NON_ATTACKABLE);
                         pCyanigosa->SetReactState(REACT_AGGRESSIVE);
-                        uiCyanigosaEventTimer = 2*IN_MILISECONDS;
+                        uiCyanigosaEventTimer = 2*IN_MILLISECONDS;
                         ++uiCyanigosaEventPhase;
                         break;
                     case 4:
diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp
index 884e71e7c36..61b891c7535 100755
--- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp
+++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp
@@ -68,7 +68,7 @@ struct instance_sethekk_halls : public ScriptedInstance
         {
             case DATA_IKISSDOOREVENT:
                 if (data == DONE)
-                    DoUseDoorOrButton(m_uiIkissDoorGUID,DAY*IN_MILISECONDS);
+                    DoUseDoorOrButton(m_uiIkissDoorGUID,DAY*IN_MILLISECONDS);
                 break;
             case TYPE_ANZU_ENCOUNTER:
                 AnzuEncounter = data;
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
index 22ba195fb72..56cbf1cabcb 100755
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
@@ -59,12 +59,12 @@ struct instance_ramparts : public ScriptedInstance
         {
             case TYPE_VAZRUDEN:
                 if (uiData == DONE && m_auiEncounter[1] == DONE)
-                    DoRespawnGameObject(instance->IsHeroic() ? m_uiChestHGUID : m_uiChestNGUID, HOUR*IN_MILISECONDS);
+                    DoRespawnGameObject(instance->IsHeroic() ? m_uiChestHGUID : m_uiChestNGUID, HOUR*IN_MILLISECONDS);
                 m_auiEncounter[0] = uiData;
                 break;
             case TYPE_NAZAN:
                 if (uiData == DONE && m_auiEncounter[0] == DONE)
-                    DoRespawnGameObject(instance->IsHeroic() ? m_uiChestHGUID : m_uiChestNGUID, HOUR*IN_MILISECONDS);
+                    DoRespawnGameObject(instance->IsHeroic() ? m_uiChestHGUID : m_uiChestNGUID, HOUR*IN_MILLISECONDS);
                 m_auiEncounter[1] = uiData;
                 break;
         }
diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp
index a95ec8b6aff..cad93995675 100755
--- a/src/server/scripts/World/npcs_special.cpp
+++ b/src/server/scripts/World/npcs_special.cpp
@@ -1850,7 +1850,7 @@ struct npc_ebon_gargoyleAI : CasterAI
         me->GetMotionMaster()->MovePoint(0, x, y, z);
 
         // Despawn as soon as possible
-        despawnTimer = 4 * IN_MILISECONDS;
+        despawnTimer = 4 * IN_MILLISECONDS;
     }
 
     void UpdateAI(const uint32 diff)
diff --git a/src/server/shared/Common.h b/src/server/shared/Common.h
index 0922ac254dc..f7407e78aac 100644
--- a/src/server/shared/Common.h
+++ b/src/server/shared/Common.h
@@ -168,7 +168,7 @@ enum TimeConstants
     WEEK   = DAY*7,
     MONTH  = DAY*30,
     YEAR   = MONTH*12,
-    IN_MILISECONDS = 1000
+    IN_MILLISECONDS = 1000
 };
 
 enum AccountTypes
-- 
cgit v1.2.3


From 67268befcde4476b6c5d69ba93c7dc432888f547 Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Mon, 12 Jul 2010 11:40:08 +0200
Subject: Warsong Gulch: remove non-english comment

--HG--
branch : trunk
---
 src/server/game/BattleGrounds/Zones/BattleGroundWS.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundWS.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundWS.cpp
index 12ccc331bab..b70df220e5e 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundWS.cpp
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundWS.cpp
@@ -70,7 +70,7 @@ void BattleGroundWS::Update(uint32 diff)
 
     if (GetStatus() == STATUS_IN_PROGRESS)
     {
-        if (GetStartTime() >= 25*MINUTE*IN_MILLISECONDS)        // Òàéìåð òèêàòü íà÷èíàåò ïîñëå 25 ìèíóò
+        if (GetStartTime() >= 25*MINUTE*IN_MILLISECONDS)
         {
             if (GetTeamScore(ALLIANCE) == 0)
             {
-- 
cgit v1.2.3


From 7a8d464b194ac8aac3194c77a57e403b951555be Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Mon, 12 Jul 2010 11:42:57 +0200
Subject: Warsong Gulch: In tie case last captured flag decides instead of
 first Patch by manisamja Closes issue #2925

--HG--
branch : trunk
---
 src/server/game/BattleGrounds/Zones/BattleGroundWS.cpp | 10 +++++-----
 src/server/game/BattleGrounds/Zones/BattleGroundWS.h   |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundWS.cpp b/src/server/game/BattleGrounds/Zones/BattleGroundWS.cpp
index b70df220e5e..2521e93ebcf 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundWS.cpp
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundWS.cpp
@@ -83,8 +83,8 @@ void BattleGroundWS::Update(uint32 diff)
             else if (GetTeamScore(HORDE) == 0)
                 EndBattleGround(ALLIANCE);           // Alliance has > 0, Horde has 0, alliance wins
 
-            else if (GetTeamScore(HORDE) == GetTeamScore(ALLIANCE)) // Team score equal, winner is team that scored the first flag
-                EndBattleGround(m_FirstFlagCaptureTeam);
+            else if (GetTeamScore(HORDE) == GetTeamScore(ALLIANCE)) // Team score equal, winner is team that scored the last flag
+                EndBattleGround(m_LastFlagCaptureTeam);
 
             else if (GetTeamScore(HORDE) > GetTeamScore(ALLIANCE))  // Last but not least, check who has the higher score
                 EndBattleGround(HORDE);
@@ -325,8 +325,8 @@ void BattleGroundWS::EventPlayerCapturedFlag(Player *Source)
     // only flag capture should be updated
     UpdatePlayerScore(Source, SCORE_FLAG_CAPTURES, 1);      // +1 flag captures
 
-    if (!m_FirstFlagCaptureTeam)
-        SetFirstFlagCapture(Source->GetTeam());
+    // update last flag capture to be used if teamscore is equal
+    SetLastFlagCapture(Source->GetTeam());
 
     if (GetTeamScore(ALLIANCE) == BG_WS_MAX_TEAM_SCORE)
         winner = ALLIANCE;
@@ -720,7 +720,7 @@ void BattleGroundWS::Reset()
     m_HonorEndKills = (isBGWeekend) ? 4 : 2;
     // For WorldState
     m_minutesElapsed                    = 0;
-    m_FirstFlagCaptureTeam              = 0;
+    m_LastFlagCaptureTeam               = 0;
 
     /* Spirit nodes is static at this BG and then not required deleting at BG reset.
     if (m_BgCreatures[WS_SPIRIT_MAIN_ALLIANCE])
diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundWS.h b/src/server/game/BattleGrounds/Zones/BattleGroundWS.h
index 1a733c14570..ff3a3c893ff 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundWS.h
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundWS.h
@@ -191,7 +191,7 @@ class BattleGroundWS : public BattleGround
         virtual WorldSafeLocsEntry const* GetClosestGraveYard(Player* player);
 
         void UpdateFlagState(uint32 team, uint32 value);
-        void SetFirstFlagCapture(uint32 team)                { m_FirstFlagCaptureTeam = team; }
+        void SetLastFlagCapture(uint32 team)                { m_LastFlagCaptureTeam = team; }
         void UpdateTeamScore(uint32 team);
         void UpdatePlayerScore(Player *Source, uint32 type, uint32 value, bool doAddHonor = true);
         void SetDroppedFlagGUID(uint64 guid, uint32 TeamID)  { m_DroppedFlagGUID[GetTeamIndexByTeamId(TeamID)] = guid;}
@@ -209,7 +209,7 @@ class BattleGroundWS : public BattleGround
         uint8 m_FlagState[2];                               // for checking flag state
         int32 m_FlagsTimer[2];
         int32 m_FlagsDropTimer[2];
-        uint32 m_FirstFlagCaptureTeam;                      // Winner is based on this if score is equal
+        uint32 m_LastFlagCaptureTeam;                       // Winner is based on this if score is equal
 
         uint32 m_ReputationCapture;
         uint32 m_HonorWinKills;
-- 
cgit v1.2.3


From 5ad02b578d40e8c8ff0272c177dbe375f2614027 Mon Sep 17 00:00:00 2001
From: Shauren 
Date: Mon, 12 Jul 2010 14:38:24 +0200
Subject: Added support for all raid quest types Added new config option to
 allow non-raid quest progression when in raid group

code by Vladimir

--HG--
branch : trunk
---
 src/server/game/Entities/Player/Player.cpp                |  6 +++---
 src/server/game/Quests/QuestDef.cpp                       | 10 +++++++++-
 src/server/game/Quests/QuestDef.h                         |  3 +++
 src/server/game/Server/Protocol/Handlers/QuestHandler.cpp |  2 +-
 src/server/game/World/World.cpp                           |  1 +
 src/server/game/World/World.h                             |  1 +
 src/server/worldserver/worldserver.conf.dist              |  6 ++++++
 7 files changed, 24 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index f8b485c36b5..449ad32859f 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -15168,7 +15168,7 @@ void Player::KilledMonsterCredit(uint32 entry, uint64 guid)
             continue;
         // just if !ingroup || !noraidgroup || raidgroup
         QuestStatusData& q_status = mQuestStatus[questid];
-        if (q_status.m_status == QUEST_STATUS_INCOMPLETE && (!GetGroup() || !GetGroup()->isRaidGroup() || qInfo->GetType() == QUEST_TYPE_RAID))
+        if (q_status.m_status == QUEST_STATUS_INCOMPLETE && (!GetGroup() || !GetGroup()->isRaidGroup() || qInfo->IsAllowedInRaid()))
         {
             if (qInfo->HasFlag(QUEST_TRINITY_FLAGS_KILL_OR_CAST))
             {
@@ -15451,7 +15451,7 @@ bool Player::HasQuestForItem(uint32 itemid) const
                 continue;
 
             // hide quest if player is in raid-group and quest is no raid quest
-            if (GetGroup() && GetGroup()->isRaidGroup() && qinfo->GetType() != QUEST_TYPE_RAID)
+            if (GetGroup() && GetGroup()->isRaidGroup() && !qinfo->IsAllowedInRaid())
                 if (!InBattleGround()) //there are two ways.. we can make every bg-quest a raidquest, or add this code here.. i don't know if this can be exploited by other quests, but i think all other quests depend on a specific area.. but keep this in mind, if something strange happens later
                     continue;
 
@@ -21397,7 +21397,7 @@ bool Player::HasQuestForGO(int32 GOId) const
             if (!qinfo)
                 continue;
 
-            if (GetGroup() && GetGroup()->isRaidGroup() && qinfo->GetType() != QUEST_TYPE_RAID)
+            if (GetGroup() && GetGroup()->isRaidGroup() && !qinfo->IsAllowedInRaid())
                 continue;
 
             for (uint8 j = 0; j < QUEST_OBJECTIVES_COUNT; ++j)
diff --git a/src/server/game/Quests/QuestDef.cpp b/src/server/game/Quests/QuestDef.cpp
index 2fdd1c58e9b..43ad7ffc114 100644
--- a/src/server/game/Quests/QuestDef.cpp
+++ b/src/server/game/Quests/QuestDef.cpp
@@ -175,7 +175,7 @@ uint32 Quest::XPValue(Player *pPlayer) const
         if (!xpentry)
             return 0;
 
-        int diffFactor = 2 * (quest_level - pPlayer->getLevel()) + 20;
+        int32 diffFactor = 2 * (quest_level - pPlayer->getLevel()) + 20;
         if (diffFactor < 1)
             diffFactor = 1;
         else if (diffFactor > 10)
@@ -204,3 +204,11 @@ int32  Quest::GetRewOrReqMoney() const
 
     return int32(RewOrReqMoney * sWorld.getRate(RATE_DROP_MONEY));
 }
+
+bool Quest::IsAllowedInRaid() const
+{
+    if (IsRaidQuest())
+        return true;
+
+    return sWorld.getConfig(CONFIG_QUEST_IGNORE_RAID);
+}
diff --git a/src/server/game/Quests/QuestDef.h b/src/server/game/Quests/QuestDef.h
index 5318f685cff..64c9b47627d 100644
--- a/src/server/game/Quests/QuestDef.h
+++ b/src/server/game/Quests/QuestDef.h
@@ -23,6 +23,7 @@
 
 #include "Define.h"
 #include "DatabaseEnv.h"
+#include "SharedDefines.h"
 
 #include 
 #include 
@@ -244,6 +245,8 @@ class Quest
         bool   IsWeekly() const { return QuestFlags & QUEST_FLAGS_WEEKLY; }
         bool   IsDailyOrWeekly() const { return QuestFlags & (QUEST_FLAGS_DAILY | QUEST_FLAGS_WEEKLY); }
         bool   IsAutoAccept() const { return QuestFlags & QUEST_FLAGS_AUTO_ACCEPT; }
+        bool   IsRaidQuest() const { return Type == QUEST_TYPE_RAID || Type == QUEST_TYPE_RAID_10 || Type == QUEST_TYPE_RAID_25; }
+        bool   IsAllowedInRaid() const;
 
         // multiple values
         std::string ObjectiveText[QUEST_OBJECTIVES_COUNT];
diff --git a/src/server/game/Server/Protocol/Handlers/QuestHandler.cpp b/src/server/game/Server/Protocol/Handlers/QuestHandler.cpp
index 8043f5ed149..d513dc4b84c 100644
--- a/src/server/game/Server/Protocol/Handlers/QuestHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/QuestHandler.cpp
@@ -422,7 +422,7 @@ void WorldSession::HandleQuestConfirmAccept(WorldPacket& recv_data)
         if (!pOriginalPlayer)
             return;
 
-        if (pQuest->GetType() == QUEST_TYPE_RAID)
+        if (pQuest->IsRaidQuest())
         {
             if (!_player->IsInSameRaidWith(pOriginalPlayer))
                 return;
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
index 04a709e75f5..05065140c35 100644
--- a/src/server/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
@@ -1013,6 +1013,7 @@ void World::LoadConfigSettings(bool reload)
     m_configs[CONFIG_QUEST_HIGH_LEVEL_HIDE_DIFF] = sConfig.GetIntDefault("Quests.HighLevelHideDiff", 7);
     if (m_configs[CONFIG_QUEST_HIGH_LEVEL_HIDE_DIFF] > MAX_LEVEL)
         m_configs[CONFIG_QUEST_HIGH_LEVEL_HIDE_DIFF] = MAX_LEVEL;
+    m_configs[CONFIG_QUEST_IGNORE_RAID] = sConfig.GetBoolDefault("Quests.IgnoreRaid", false);
 
     m_configs[CONFIG_RANDOM_BG_RESET_HOUR] = sConfig.GetIntDefault("BattleGround.Random.ResetHour", 6);
     if (m_configs[CONFIG_RANDOM_BG_RESET_HOUR] < 0 || m_configs[CONFIG_RANDOM_BG_RESET_HOUR] > 23)
diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h
index 7266cf7e770..07d7d3c51db 100644
--- a/src/server/game/World/World.h
+++ b/src/server/game/World/World.h
@@ -188,6 +188,7 @@ enum WorldConfigs
     CONFIG_WORLD_BOSS_LEVEL_DIFF,
     CONFIG_QUEST_LOW_LEVEL_HIDE_DIFF,
     CONFIG_QUEST_HIGH_LEVEL_HIDE_DIFF,
+    CONFIG_QUEST_IGNORE_RAID,
     CONFIG_DETECT_POS_COLLISION,
     CONFIG_RESTRICTED_LFG_CHANNEL,
     CONFIG_SILENTLY_GM_JOIN_TO_CHANNEL,
diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist
index b78d8b363cd..6811c3ed9ea 100644
--- a/src/server/worldserver/worldserver.conf.dist
+++ b/src/server/worldserver/worldserver.conf.dist
@@ -811,6 +811,11 @@ ChatLogTimestamp = 0
 #        Default: 7
 #                -1 (show all available quests marks)
 #
+#    Quests.IgnoreRaid
+#        Allow non-raid quests to be completed when in raid group
+#        Default: 0 (false)
+#                 1 (true)
+#
 #    Guild.EventLogRecordsCount
 #        Count of guild event log records stored in guild_eventlog table
 #         Increase to store more guild events in table, minimum is 100
@@ -928,6 +933,7 @@ Instance.ResetTimeHour = 4
 Instance.UnloadDelay = 1800000
 Quests.LowLevelHideDiff = 4
 Quests.HighLevelHideDiff = 7
+Quests.IgnoreRaid = 0
 Guild.EventLogRecordsCount = 100
 Guild.BankEventLogRecordsCount = 25
 MaxPrimaryTradeSkill = 2
-- 
cgit v1.2.3


From 94f143ee467554e868b933212402f6bf136fddb8 Mon Sep 17 00:00:00 2001
From: teacher 
Date: Mon, 12 Jul 2010 18:00:27 +0200
Subject: Renamed "realmd" to "auth" in config files. Renamed
 "character_database.sql" to "characters_database.sql". (yeah I know, you're
 gonna hate me, but I'm pedantic!)

--HG--
branch : trunk
---
 sql/base/character_database.sql              | 1991 --------------------------
 sql/base/characters_database.sql             | 1991 ++++++++++++++++++++++++++
 src/server/authserver/authserver.conf.dist   |    4 +-
 src/server/worldserver/worldserver.conf.dist |    2 +-
 4 files changed, 1994 insertions(+), 1994 deletions(-)
 delete mode 100644 sql/base/character_database.sql
 create mode 100644 sql/base/characters_database.sql

(limited to 'src')

diff --git a/sql/base/character_database.sql b/sql/base/character_database.sql
deleted file mode 100644
index 6ec8cd968e9..00000000000
--- a/sql/base/character_database.sql
+++ /dev/null
@@ -1,1991 +0,0 @@
--- MySQL dump 10.11
---
--- Host: localhost    Database: characters
--- ------------------------------------------------------
--- Server version	5.0.45-Debian_1ubuntu3.1-log
-
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8 */;
-/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
-/*!40103 SET TIME_ZONE='+00:00' */;
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-
---
--- Table structure for table `account_data`
---
-
-DROP TABLE IF EXISTS `account_data`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `account_data` (
-  `account` int(11) unsigned NOT NULL default '0',
-  `type` int(11) unsigned NOT NULL default '0',
-  `time` bigint(11) unsigned NOT NULL default '0',
-  `data` longblob NOT NULL,
-  PRIMARY KEY  (`account`,`type`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `account_data`
---
-
-LOCK TABLES `account_data` WRITE;
-/*!40000 ALTER TABLE `account_data` DISABLE KEYS */;
-/*!40000 ALTER TABLE `account_data` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `addons`
---
-
-DROP TABLE IF EXISTS `addons`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `addons` (
-  `name` varchar(120) NOT NULL default '',
-  `crc` int(32) unsigned NOT NULL default '0',
-  PRIMARY KEY (`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Addons';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `addons`
---
-
-LOCK TABLES `addons` WRITE;
-/*!40000 ALTER TABLE `addons` DISABLE KEYS */;
-/*!40000 ALTER TABLE `addons` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `arena_team`
---
-
-DROP TABLE IF EXISTS `arena_team`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `arena_team` (
-  `arenateamid` int(10) unsigned NOT NULL default '0',
-  `name` char(255) NOT NULL,
-  `captainguid` int(10) unsigned NOT NULL default '0',
-  `type` tinyint(3) unsigned NOT NULL default '0',
-  `BackgroundColor` int(10) unsigned NOT NULL default '0',
-  `EmblemStyle` int(10) unsigned NOT NULL default '0',
-  `EmblemColor` int(10) unsigned NOT NULL default '0',
-  `BorderStyle` int(10) unsigned NOT NULL default '0',
-  `BorderColor` int(10) unsigned NOT NULL default '0',
-  PRIMARY KEY  (`arenateamid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `arena_team`
---
-
-LOCK TABLES `arena_team` WRITE;
-/*!40000 ALTER TABLE `arena_team` DISABLE KEYS */;
-/*!40000 ALTER TABLE `arena_team` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `arena_team_member`
---
-
-DROP TABLE IF EXISTS `arena_team_member`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `arena_team_member` (
-  `arenateamid` int(10) unsigned NOT NULL default '0',
-  `guid` int(10) unsigned NOT NULL default '0',
-  `played_week` int(10) unsigned NOT NULL default '0',
-  `wons_week` int(10) unsigned NOT NULL default '0',
-  `played_season` int(10) unsigned NOT NULL default '0',
-  `wons_season` int(10) unsigned NOT NULL default '0',
-  `personal_rating` int(10) UNSIGNED NOT NULL DEFAULT '0',
-  PRIMARY KEY  (`arenateamid`,`guid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `arena_team_member`
---
-
-LOCK TABLES `arena_team_member` WRITE;
-/*!40000 ALTER TABLE `arena_team_member` DISABLE KEYS */;
-/*!40000 ALTER TABLE `arena_team_member` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `arena_team_stats`
---
-
-DROP TABLE IF EXISTS `arena_team_stats`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `arena_team_stats` (
-  `arenateamid` int(10) unsigned NOT NULL default '0',
-  `rating` int(10) unsigned NOT NULL default '0',
-  `games` int(10) unsigned NOT NULL default '0',
-  `wins` int(10) unsigned NOT NULL default '0',
-  `played` int(10) unsigned NOT NULL default '0',
-  `wins2` int(10) unsigned NOT NULL default '0',
-  `rank` int(10) unsigned NOT NULL default '0',
-  PRIMARY KEY  (`arenateamid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `arena_team_stats`
---
-
-LOCK TABLES `arena_team_stats` WRITE;
-/*!40000 ALTER TABLE `arena_team_stats` DISABLE KEYS */;
-/*!40000 ALTER TABLE `arena_team_stats` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `auctionhouse`
---
-
-DROP TABLE IF EXISTS `auctionhouse`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `auctionhouse` (
-  `id` int(11) unsigned NOT NULL default '0',
-  `auctioneerguid` int(11) unsigned NOT NULL default '0',
-  `itemguid` int(11) unsigned NOT NULL default '0',
-  `item_template` int(11) unsigned NOT NULL default '0' COMMENT 'Item Identifier',
-  `itemowner` int(11) unsigned NOT NULL default '0',
-  `buyoutprice` int(11) NOT NULL default '0',
-  `time` bigint(40) NOT NULL default '0',
-  `buyguid` int(11) unsigned NOT NULL default '0',
-  `lastbid` int(11) NOT NULL default '0',
-  `startbid` int(11) NOT NULL default '0',
-  `deposit` int(11) NOT NULL default '0',
-  PRIMARY KEY  (`id`),
-  UNIQUE KEY `item_guid` (`itemguid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `auctionhouse`
---
-
-LOCK TABLES `auctionhouse` WRITE;
-/*!40000 ALTER TABLE `auctionhouse` DISABLE KEYS */;
-/*!40000 ALTER TABLE `auctionhouse` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `auctionhousebot`
---
-
-DROP TABLE IF EXISTS `auctionhousebot`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `auctionhousebot` (
-  `auctionhouse` int(11) NOT NULL default '0' COMMENT 'mapID of the auctionhouse.',
-  `name` char(25) default NULL COMMENT 'Text name of the auctionhouse.',
-  `minitems` int(11) default '0' COMMENT 'This is the minimum number of items you want to keep in the auction house. a 0 here will make it the same as the maximum.',
-  `maxitems` int(11) default '0' COMMENT 'This is the number of items you want to keep in the auction house.',
-  `percentgreytradegoods` int(11) default '0' COMMENT 'Sets the percentage of the Grey Trade Goods auction items',
-  `percentwhitetradegoods` int(11) default '27' COMMENT 'Sets the percentage of the White Trade Goods auction items',
-  `percentgreentradegoods` int(11) default '12' COMMENT 'Sets the percentage of the Green Trade Goods auction items',
-  `percentbluetradegoods` int(11) default '10' COMMENT 'Sets the percentage of the Blue Trade Goods auction items',
-  `percentpurpletradegoods` int(11) default '1' COMMENT 'Sets the percentage of the Purple Trade Goods auction items',
-  `percentorangetradegoods` int(11) default '0' COMMENT 'Sets the percentage of the Orange Trade Goods auction items',
-  `percentyellowtradegoods` int(11) default '0' COMMENT 'Sets the percentage of the Yellow Trade Goods auction items',
-  `percentgreyitems` int(11) default '0' COMMENT 'Sets the percentage of the non trade Grey auction items',
-  `percentwhiteitems` int(11) default '10' COMMENT 'Sets the percentage of the non trade White auction items',
-  `percentgreenitems` int(11) default '30' COMMENT 'Sets the percentage of the non trade Green auction items',
-  `percentblueitems` int(11) default '8' COMMENT 'Sets the percentage of the non trade Blue auction items',
-  `percentpurpleitems` int(11) default '2' COMMENT 'Sets the percentage of the non trade Purple auction items',
-  `percentorangeitems` int(11) default '0' COMMENT 'Sets the percentage of the non trade Orange auction items',
-  `percentyellowitems` int(11) default '0' COMMENT 'Sets the percentage of the non trade Yellow auction items',
-  `minpricegrey` int(11) default '100' COMMENT 'Minimum price of Grey items (percentage).',
-  `maxpricegrey` int(11) default '150' COMMENT 'Maximum price of Grey items (percentage).',
-  `minpricewhite` int(11) default '150' COMMENT 'Minimum price of White items (percentage).',
-  `maxpricewhite` int(11) default '250' COMMENT 'Maximum price of White items (percentage).',
-  `minpricegreen` int(11) default '800' COMMENT 'Minimum price of Green items (percentage).',
-  `maxpricegreen` int(11) default '1400' COMMENT 'Maximum price of Green items (percentage).',
-  `minpriceblue` int(11) default '1250' COMMENT 'Minimum price of Blue items (percentage).',
-  `maxpriceblue` int(11) default '1750' COMMENT 'Maximum price of Blue items (percentage).',
-  `minpricepurple` int(11) default '2250' COMMENT 'Minimum price of Purple items (percentage).',
-  `maxpricepurple` int(11) default '4550' COMMENT 'Maximum price of Purple items (percentage).',
-  `minpriceorange` int(11) default '3250' COMMENT 'Minimum price of Orange items (percentage).',
-  `maxpriceorange` int(11) default '5550' COMMENT 'Maximum price of Orange items (percentage).',
-  `minpriceyellow` int(11) default '5250' COMMENT 'Minimum price of Yellow items (percentage).',
-  `maxpriceyellow` int(11) default '6550' COMMENT 'Maximum price of Yellow items (percentage).',
-  `minbidpricegrey` int(11) default '70' COMMENT 'Starting bid price of Grey items as a percentage of the randomly chosen buyout price. Default: 70',
-  `maxbidpricegrey` int(11) default '100' COMMENT 'Starting bid price of Grey items as a percentage of the randomly chosen buyout price. Default: 100',
-  `minbidpricewhite` int(11) default '70' COMMENT 'Starting bid price of White items as a percentage of the randomly chosen buyout price. Default: 70',
-  `maxbidpricewhite` int(11) default '100' COMMENT 'Starting bid price of White items as a percentage of the randomly chosen buyout price. Default: 100',
-  `minbidpricegreen` int(11) default '80' COMMENT 'Starting bid price of Green items as a percentage of the randomly chosen buyout price. Default: 80',
-  `maxbidpricegreen` int(11) default '100' COMMENT 'Starting bid price of Green items as a percentage of the randomly chosen buyout price. Default: 100',
-  `minbidpriceblue` int(11) default '75' COMMENT 'Starting bid price of Blue items as a percentage of the randomly chosen buyout price. Default: 75',
-  `maxbidpriceblue` int(11) default '100' COMMENT 'Starting bid price of Blue items as a percentage of the randomly chosen buyout price. Default: 100',
-  `minbidpricepurple` int(11) default '80' COMMENT 'Starting bid price of Purple items as a percentage of the randomly chosen buyout price. Default: 80',
-  `maxbidpricepurple` int(11) default '100' COMMENT 'Starting bid price of Purple items as a percentage of the randomly chosen buyout price. Default: 100',
-  `minbidpriceorange` int(11) default '80' COMMENT 'Starting bid price of Orange items as a percentage of the randomly chosen buyout price. Default: 80',
-  `maxbidpriceorange` int(11) default '100' COMMENT 'Starting bid price of Orange items as a percentage of the randomly chosen buyout price. Default: 100',
-  `minbidpriceyellow` int(11) default '80' COMMENT 'Starting bid price of Yellow items as a percentage of the randomly chosen buyout price. Default: 80',
-  `maxbidpriceyellow` int(11) default '100' COMMENT 'Starting bid price of Yellow items as a percentage of the randomly chosen buyout price. Default: 100',
-  `maxstackgrey` int(11) default '0' COMMENT 'Stack size limits for item qualities - a value of 0 will disable a maximum stack size for that quality, which will allow the bot to create items in stack as large as the item allows.',
-  `maxstackwhite` int(11) default '0' COMMENT 'Stack size limits for item qualities - a value of 0 will disable a maximum stack size for that quality, which will allow the bot to create items in stack as large as the item allows.',
-  `maxstackgreen` int(11) default '0' COMMENT 'Stack size limits for item qualities - a value of 0 will disable a maximum stack size for that quality, which will allow the bot to create items in stack as large as the item allows.',
-  `maxstackblue` int(11) default '0' COMMENT 'Stack size limits for item qualities - a value of 0 will disable a maximum stack size for that quality, which will allow the bot to create items in stack as large as the item allows.',
-  `maxstackpurple` int(11) default '0' COMMENT 'Stack size limits for item qualities - a value of 0 will disable a maximum stack size for that quality, which will allow the bot to create items in stack as large as the item allows.',
-  `maxstackorange` int(11) default '0' COMMENT 'Stack size limits for item qualities - a value of 0 will disable a maximum stack size for that quality, which will allow the bot to create items in stack as large as the item allows.',
-  `maxstackyellow` int(11) default '0' COMMENT 'Stack size limits for item qualities - a value of 0 will disable a maximum stack size for that quality, which will allow the bot to create items in stack as large as the item allows.',
-  `buyerpricegrey` int(11) default '1' COMMENT 'Multiplier to vendorprice when buying grey items from auctionhouse',
-  `buyerpricewhite` int(11) default '3' COMMENT 'Multiplier to vendorprice when buying white items from auctionhouse',
-  `buyerpricegreen` int(11) default '5' COMMENT 'Multiplier to vendorprice when buying green items from auctionhouse',
-  `buyerpriceblue` int(11) default '12' COMMENT 'Multiplier to vendorprice when buying blue items from auctionhouse',
-  `buyerpricepurple` int(11) default '15' COMMENT 'Multiplier to vendorprice when buying purple items from auctionhouse',
-  `buyerpriceorange` int(11) default '20' COMMENT 'Multiplier to vendorprice when buying orange items from auctionhouse',
-  `buyerpriceyellow` int(11) default '22' COMMENT 'Multiplier to vendorprice when buying yellow items from auctionhouse',
-  `buyerbiddinginterval` int(11) default '1' COMMENT 'Interval how frequently AHB bids on each AH. Time in minutes',
-  `buyerbidsperinterval` int(11) default '1' COMMENT 'number of bids to put in per bidding interval',
-  PRIMARY KEY  (`auctionhouse`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `auctionhousebot`
---
-
-INSERT INTO `auctionhousebot`(`auctionhouse`,`name`,`minitems`,`maxitems`,`percentgreytradegoods`,`percentwhitetradegoods`,`percentgreentradegoods`,`percentbluetradegoods`,`percentpurpletradegoods`,`percentorangetradegoods`,`percentyellowtradegoods`,`percentgreyitems`,`percentwhiteitems`,`percentgreenitems`,`percentblueitems`,`percentpurpleitems`,`percentorangeitems`,`percentyellowitems`,`minpricegrey`,`maxpricegrey`,`minpricewhite`,`maxpricewhite`,`minpricegreen`,`maxpricegreen`,`minpriceblue`,`maxpriceblue`,`minpricepurple`,`maxpricepurple`,`minpriceorange`,`maxpriceorange`,`minpriceyellow`,`maxpriceyellow`,`minbidpricegrey`,`maxbidpricegrey`,`minbidpricewhite`,`maxbidpricewhite`,`minbidpricegreen`,`maxbidpricegreen`,`minbidpriceblue`,`maxbidpriceblue`,`minbidpricepurple`,`maxbidpricepurple`,`minbidpriceorange`,`maxbidpriceorange`,`minbidpriceyellow`,`maxbidpriceyellow`,`maxstackgrey`,`maxstackwhite`,`maxstackgreen`,`maxstackblue`,`maxstackpurple`,`maxstackorange`,`maxstackyellow`,`buyerpricegrey`,`buyerpricewhite`,`buyerpricegreen`,`buyerpriceblue`,`buyerpricepurple`,`buyerpriceorange`,`buyerpriceyellow`,`buyerbiddinginterval`,`buyerbidsperinterval`) VALUES
-(2,'Alliance',0,0,0,27,12,10,1,0,0,0,10,30,8,2,0,0,100,150,150,250,800,1400,1250,1750,2250,4550,3250,5550,5250,6550,70,100,70,100,80,100,75,100,80,100,80,100,80,100,0,0,3,2,1,1,1,1,3,5,12,15,20,22,1,1),
-(6,'Horde',0,0,0,27,12,10,1,0,0,0,10,30,8,2,0,0,100,150,150,250,800,1400,1250,1750,2250,4550,3250,5550,5250,6550,70,100,70,100,80,100,75,100,80,100,80,100,80,100,0,0,3,2,1,1,1,1,3,5,12,15,20,22,1,1),
-(7,'Neutral',0,0,0,27,12,10,1,0,0,0,10,30,8,2,0,0,100,150,150,250,800,1400,1250,1750,2250,4550,3250,5550,5250,6550,70,100,70,100,80,100,75,100,80,100,80,100,80,100,0,0,3,2,1,1,1,1,3,5,12,15,20,22,1,1);
-
---
--- Table structure for table `bugreport`
---
-
-DROP TABLE IF EXISTS `bugreport`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `bugreport` (
-  `id` int(11) NOT NULL auto_increment COMMENT 'Identifier',
-  `type` longtext NOT NULL default '',
-  `content` longtext NOT NULL default '',
-  PRIMARY KEY  (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Debug System';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `bugreport`
---
-
-LOCK TABLES `bugreport` WRITE;
-/*!40000 ALTER TABLE `bugreport` DISABLE KEYS */;
-/*!40000 ALTER TABLE `bugreport` ENABLE KEYS */;
-UNLOCK TABLES;
-
--- 
--- Table structure for table `channels`
--- 
-
-DROP TABLE IF EXISTS `channels`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `channels` (
-  `m_name` text NOT NULL,
-  `m_team` int(10) unsigned NOT NULL,
-  `m_announce` tinyint(1) unsigned NOT NULL default '0',
-  `m_moderate` tinyint(1) unsigned NOT NULL default '0',
-  `m_public` tinyint(1) unsigned NOT NULL default '1',
-  `m_password` text,
-  `BannedList` longtext,
-  PRIMARY KEY  (`m_name`(10),`m_team`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Channel System';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `channels`
---
-
-LOCK TABLES `channels` WRITE;
-/*!40000 ALTER TABLE `channels` DISABLE KEYS */;
-/*!40000 ALTER TABLE `channels` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `characters`
---
-
-DROP TABLE IF EXISTS `characters`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `characters` (
-  `guid` int(11) unsigned NOT NULL default '0' COMMENT 'Global Unique Identifier',
-  `account` int(11) unsigned NOT NULL default '0' COMMENT 'Account Identifier',
-  `name` varchar(12) NOT NULL default '',
-  `race` tinyint(3) unsigned NOT NULL default '0',
-  `class` tinyint(3) unsigned NOT NULL default '0',
-  `gender` TINYINT UNSIGNED NOT NULL default '0',
-  `level` TINYINT UNSIGNED NOT NULL default '0',
-  `xp` INT UNSIGNED NOT NULL default '0',
-  `money` INT UNSIGNED NOT NULL default '0',
-  `playerBytes` INT UNSIGNED NOT NULL default '0',
-  `playerBytes2` INT UNSIGNED NOT NULL default '0',
-  `playerFlags` INT UNSIGNED NOT NULL default '0',
-  `position_x` float NOT NULL default '0',
-  `position_y` float NOT NULL default '0',
-  `position_z` float NOT NULL default '0',
-  `map` int(11) unsigned NOT NULL default '0' COMMENT 'Map Identifier',
-  `instance_id` int(11) unsigned NOT NULL default '0',
-  `dungeon_difficulty` tinyint(1) unsigned NOT NULL default '0',
-  `orientation` float NOT NULL default '0',
-  `taximask` longtext,
-  `online` tinyint(3) unsigned NOT NULL default '0',
-  `cinematic` tinyint(3) unsigned NOT NULL default '0',
-  `totaltime` int(11) unsigned NOT NULL default '0',
-  `leveltime` int(11) unsigned NOT NULL default '0',
-  `logout_time` bigint(20) unsigned NOT NULL default '0',
-  `is_logout_resting` tinyint(3) unsigned NOT NULL default '0',
-  `rest_bonus` float NOT NULL default '0',
-  `resettalents_cost` int(11) unsigned NOT NULL default '0',
-  `resettalents_time` bigint(20) unsigned NOT NULL default '0',
-  `trans_x` float NOT NULL default '0',
-  `trans_y` float NOT NULL default '0',
-  `trans_z` float NOT NULL default '0',
-  `trans_o` float NOT NULL default '0',
-  `transguid` bigint(20) unsigned NOT NULL default '0',
-  `extra_flags` int(11) unsigned NOT NULL default '0',
-  `stable_slots` tinyint(1) unsigned NOT NULL default '0',
-  `at_login` int(11) unsigned NOT NULL default '0',
-  `zone` int(11) unsigned NOT NULL default '0',
-  `death_expire_time` bigint(20) unsigned NOT NULL default '0',
-  `taxi_path` text,
-  `arenaPoints` int(10) unsigned NOT NULL default'0',
-  `totalHonorPoints` int(10) unsigned NOT NULL default'0',
-  `todayHonorPoints` int(10) unsigned NOT NULL default'0',
-  `yesterdayHonorPoints` int(10) unsigned NOT NULL default'0',
-  `totalKills` int(10) unsigned NOT NULL default'0',
-  `todayKills` smallint(5) unsigned NOT NULL default'0',
-  `yesterdayKills` smallint(5) unsigned NOT NULL default'0',
-  `chosenTitle` int(10) unsigned NOT NULL default'0',
-  `knownCurrencies` bigint(20) unsigned NOT NULL default'0',
-  `watchedFaction` bigint(10) unsigned NOT NULL default'0',
-  `drunk` smallint(5) unsigned NOT NULL default'0',
-  `health` int(10)  unsigned NOT NULL default'0',
-  `power1` int(10) unsigned NOT NULL default'0',
-  `power2` int(10) unsigned NOT NULL default'0',
-  `power3` int(10) unsigned NOT NULL default'0',
-  `power4` int(10) unsigned NOT NULL default'0',
-  `power5` int(10) unsigned NOT NULL default'0',
-  `power6` int(10) unsigned NOT NULL default'0',
-  `power7` int(10) unsigned NOT NULL default'0',
-  `latency` int(11) unsigned NOT NULL default '0',
-  `speccount` tinyint(3) unsigned NOT NULL default 1,
-  `activespec` tinyint(3) unsigned NOT NULL default 0,
-  `exploredZones` longtext,
-  `equipmentCache` longtext,
-  `ammoId` int(10) UNSIGNED NOT NULL default '0',
-  `knownTitles` longtext,
-  `actionBars` tinyint(3) UNSIGNED NOT NULL default '0',
-  PRIMARY KEY  (`guid`),
-  KEY `idx_account` (`account`),
-  KEY `idx_online` (`online`),
-  KEY `idx_name` (`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Player System';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `characters`
---
-
-LOCK TABLES `characters` WRITE;
-/*!40000 ALTER TABLE `characters` DISABLE KEYS */;
-/*!40000 ALTER TABLE `characters` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `character_account_data`
---
-
-DROP TABLE IF EXISTS `character_account_data`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `character_account_data` (
-  `guid` int(11) unsigned NOT NULL default '0',
-  `type` int(11) unsigned NOT NULL default '0',
-  `time` bigint(11) unsigned NOT NULL default '0',
-  `data` longblob NOT NULL,
-  PRIMARY KEY  (`guid`,`type`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `character_account_data`
---
-
-LOCK TABLES `character_account_data` WRITE;
-/*!40000 ALTER TABLE `character_account_data` DISABLE KEYS */;
-/*!40000 ALTER TABLE `character_account_data` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `character_achievement`
---
-
-DROP TABLE IF EXISTS `character_achievement`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `character_achievement` (
-  `guid` int(11) unsigned NOT NULL,
-  `achievement` int(11) unsigned  NOT NULL,
-  `date` bigint(11) unsigned NOT NULL default '0',
-  PRIMARY KEY  (`guid`,`achievement`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `character_achievement`
---
-
-LOCK TABLES `character_achievement` WRITE;
-/*!40000 ALTER TABLE `character_achievement` DISABLE KEYS */;
-/*!40000 ALTER TABLE `character_achievement` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `character_achievement_progress`
---
-
-DROP TABLE IF EXISTS `character_achievement_progress`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `character_achievement_progress` (
-  `guid` int(11) unsigned NOT NULL,
-  `criteria` int(11) unsigned NOT NULL,
-  `counter` int(11) unsigned NOT NULL,
-  `date` bigint(11) unsigned NOT NULL default '0',
-  PRIMARY KEY  (`guid`,`criteria`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `character_achievement_progress`
---
-
-LOCK TABLES `character_achievement_progress` WRITE;
-/*!40000 ALTER TABLE `character_achievement_progress` DISABLE KEYS */;
-/*!40000 ALTER TABLE `character_achievement_progress` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `character_action`
---
-
-DROP TABLE IF EXISTS `character_action`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `character_action` (
-  `guid` int(11) unsigned NOT NULL default '0',
-  `spec` tinyint(3) unsigned NOT NULL default '0',
-  `button` tinyint(3) unsigned NOT NULL default '0',
-  `action` int(11) unsigned NOT NULL default '0',
-  `type` tinyint(3) unsigned NOT NULL default '0',
-  PRIMARY KEY  (`guid`,`spec`,`button`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `character_action`
---
-
-LOCK TABLES `character_action` WRITE;
-/*!40000 ALTER TABLE `character_action` DISABLE KEYS */;
-/*!40000 ALTER TABLE `character_action` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `character_aura`
---
-
-DROP TABLE IF EXISTS `character_aura`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `character_aura` (
-  `guid` int(11) unsigned NOT NULL default '0' COMMENT 'Global Unique Identifier',
-  `caster_guid` bigint(20) unsigned NOT NULL default '0' COMMENT 'Full Global Unique Identifier',
-  `spell` int(11) unsigned NOT NULL default '0',
-  `effect_mask` tinyint(3) unsigned NOT NULL default '0',
-  `recalculate_mask` tinyint(3) unsigned NOT NULL default '0',
-  `stackcount` tinyint(3) unsigned NOT NULL default '1',
-  `amount0` int(11) NOT NULL default '0',
-  `amount1` int(11) NOT NULL default '0',
-  `amount2` int(11) NOT NULL default '0',
-  `base_amount0` int(11) NOT NULL default '0',
-  `base_amount1` int(11) NOT NULL default '0',
-  `base_amount2` int(11) NOT NULL default '0',
-  `maxduration` int(11) NOT NULL default '0',
-  `remaintime` int(11) NOT NULL default '0',
-  `remaincharges` tinyint(3) unsigned NOT NULL default '0',
-  PRIMARY KEY  (`guid`,`caster_guid`,`spell`,`effect_mask`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Player System';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `character_aura`
---
-
-LOCK TABLES `character_aura` WRITE;
-/*!40000 ALTER TABLE `character_aura` DISABLE KEYS */;
-/*!40000 ALTER TABLE `character_aura` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `character_battleground_data`
---
-
-DROP TABLE IF EXISTS `character_battleground_data`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `character_battleground_data` (
-  `guid` int(11) unsigned NOT NULL default '0' COMMENT 'Global Unique Identifier',
-  `instance_id` int(11) unsigned NOT NULL default '0',
-  `team` int(11) unsigned NOT NULL default '0',
-  `join_x` float NOT NULL default '0',
-  `join_y` float NOT NULL default '0',
-  `join_z` float NOT NULL default '0',
-  `join_o` float NOT NULL default '0',
-  `join_map` int(11) NOT NULL default '0',
-  `taxi_start` int(11) NOT NULL default '0',
-  `taxi_end` int(11) NOT NULL default '0',
-  `mount_spell` int(11) NOT NULL default '0',
-  PRIMARY KEY  (`guid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Player System';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `character_battleground_data`
---
-
-LOCK TABLES `character_battleground_data` WRITE;
-/*!40000 ALTER TABLE `character_battleground_data` DISABLE KEYS */;
-/*!40000 ALTER TABLE `character_battleground_data` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `character_battleground_random`
---
-
-DROP TABLE IF EXISTS `character_battleground_random`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `character_battleground_random` (
-  `guid` int(11) unsigned NOT NULL default '0',
-  PRIMARY KEY  (`guid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `character_battleground_random`
---
-
-LOCK TABLES `character_battleground_random` WRITE;
-/*!40000 ALTER TABLE `character_battleground_random` DISABLE KEYS */;
-/*!40000 ALTER TABLE `character_battleground_random` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `character_declinedname`
---
-
-DROP TABLE IF EXISTS `character_declinedname`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `character_declinedname` (
-  `guid` int(11) unsigned NOT NULL default '0' COMMENT 'Global Unique Identifier',
-  `genitive` varchar(15) NOT NULL default '',
-  `dative` varchar(15) NOT NULL default '',
-  `accusative` varchar(15) NOT NULL default '',
-  `instrumental` varchar(15) NOT NULL default '',
-  `prepositional` varchar(15) NOT NULL default '',
-  PRIMARY KEY  (`guid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `character_declinedname`
---
-
-LOCK TABLES `character_declinedname` WRITE;
-/*!40000 ALTER TABLE `character_declinedname` DISABLE KEYS */;
-/*!40000 ALTER TABLE `character_declinedname` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `character_equipmentsets`
---
-
-DROP TABLE IF EXISTS `character_equipmentsets`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `character_equipmentsets` (
-  `guid` int(11) NOT NULL default '0',
-  `setguid` bigint(20) NOT NULL auto_increment,
-  `setindex` tinyint(4) NOT NULL default '0',
-  `name` varchar(100) NOT NULL,
-  `iconname` varchar(100) NOT NULL,
-  `item0` int(11) NOT NULL default '0',
-  `item1` int(11) NOT NULL default '0',
-  `item2` int(11) NOT NULL default '0',
-  `item3` int(11) NOT NULL default '0',
-  `item4` int(11) NOT NULL default '0',
-  `item5` int(11) NOT NULL default '0',
-  `item6` int(11) NOT NULL default '0',
-  `item7` int(11) NOT NULL default '0',
-  `item8` int(11) NOT NULL default '0',
-  `item9` int(11) NOT NULL default '0',
-  `item10` int(11) NOT NULL default '0',
-  `item11` int(11) NOT NULL default '0',
-  `item12` int(11) NOT NULL default '0',
-  `item13` int(11) NOT NULL default '0',
-  `item14` int(11) NOT NULL default '0',
-  `item15` int(11) NOT NULL default '0',
-  `item16` int(11) NOT NULL default '0',
-  `item17` int(11) NOT NULL default '0',
-  `item18` int(11) NOT NULL default '0',
-  PRIMARY KEY  (`setguid`),
-  UNIQUE KEY `idx_set` (`guid`,`setguid`,`setindex`),
-  INDEX `Idx_setindex` (`setindex`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `character_equipmentsets`
---
-
-LOCK TABLES `character_equipmentsets` WRITE;
-/*!40000 ALTER TABLE `character_equipmentsets` DISABLE KEYS */;
-/*!40000 ALTER TABLE `character_equipmentsets` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `character_gifts`
---
-
-DROP TABLE IF EXISTS `character_gifts`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `character_gifts` (
-  `guid` int(20) unsigned NOT NULL default '0',
-  `item_guid` int(11) unsigned NOT NULL default '0',
-  `entry` int(20) unsigned NOT NULL default '0',
-  `flags` int(20) unsigned NOT NULL default '0',
-  PRIMARY KEY  (`item_guid`),
-  KEY `idx_guid` (`guid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `character_gifts`
---
-
-LOCK TABLES `character_gifts` WRITE;
-/*!40000 ALTER TABLE `character_gifts` DISABLE KEYS */;
-/*!40000 ALTER TABLE `character_gifts` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `character_glyphs`
---
-
-DROP TABLE IF EXISTS `character_glyphs`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `character_glyphs` (
-  `guid` int(11) unsigned NOT NULL,
-  `spec` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `glyph1` int(11) unsigned NOT NULL DEFAULT '0',
-  `glyph2` int(11) unsigned DEFAULT '0',
-  `glyph3` int(11) unsigned DEFAULT '0',
-  `glyph4` int(11) unsigned DEFAULT '0',
-  `glyph5` int(11) unsigned DEFAULT '0',
-  `glyph6` int(11) unsigned DEFAULT '0',
-  PRIMARY KEY (`guid`,`spec`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `character_glyphs`
---
-
-LOCK TABLES `character_glyphs` WRITE;
-/*!40000 ALTER TABLE `character_glyphs` DISABLE KEYS */;
-/*!40000 ALTER TABLE `character_glyphs` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `character_homebind`
---
-
-DROP TABLE IF EXISTS `character_homebind`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `character_homebind` (
-  `guid` int(11) unsigned NOT NULL default '0' COMMENT 'Global Unique Identifier',
-  `map` int(11) unsigned NOT NULL default '0' COMMENT 'Map Identifier',
-  `zone` int(11) unsigned NOT NULL default '0' COMMENT 'Zone Identifier',
-  `position_x` float NOT NULL default '0',
-  `position_y` float NOT NULL default '0',
-  `position_z` float NOT NULL default '0',
-  PRIMARY KEY  (`guid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Player System';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `character_homebind`
---
-
-LOCK TABLES `character_homebind` WRITE;
-/*!40000 ALTER TABLE `character_homebind` DISABLE KEYS */;
-/*!40000 ALTER TABLE `character_homebind` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `character_instance`
---
-
-DROP TABLE IF EXISTS `character_instance`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `character_instance` (
-  `guid` int(11) unsigned NOT NULL default '0',
-  `instance` int(11) unsigned NOT NULL default '0',
-  `permanent` tinyint(1) unsigned NOT NULL default '0',
-  PRIMARY KEY  (`guid`,`instance`),
-  KEY `instance` (`instance`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `character_instance`
---
-
-LOCK TABLES `character_instance` WRITE;
-/*!40000 ALTER TABLE `character_instance` DISABLE KEYS */;
-/*!40000 ALTER TABLE `character_instance` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `character_inventory`
---
-
-DROP TABLE IF EXISTS `character_inventory`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `character_inventory` (
-  `guid` int(11) unsigned NOT NULL default '0' COMMENT 'Global Unique Identifier',
-  `bag` int(11) unsigned NOT NULL default '0',
-  `slot` tinyint(3) unsigned NOT NULL default '0',
-  `item` int(11) unsigned NOT NULL default '0' COMMENT 'Item Global Unique Identifier',
-  `item_template` int(11) unsigned NOT NULL default '0' COMMENT 'Item Identifier',
-  PRIMARY KEY  (`item`),
-  KEY `idx_guid` (`guid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Player System';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `character_inventory`
---
-
-LOCK TABLES `character_inventory` WRITE;
-/*!40000 ALTER TABLE `character_inventory` DISABLE KEYS */;
-/*!40000 ALTER TABLE `character_inventory` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `character_pet`
---
-
-DROP TABLE IF EXISTS `character_pet`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `character_pet` (
-  `id` int(11) unsigned NOT NULL default '0',
-  `entry` int(11) unsigned NOT NULL default '0',
-  `owner` int(11) unsigned NOT NULL default '0',
-  `modelid` int(11) unsigned default '0',
-  `CreatedBySpell` int(11) unsigned NOT NULL default '0',
-  `PetType` tinyint(3) unsigned NOT NULL default '0',
-  `level` int(11) unsigned NOT NULL default '1',
-  `exp` int(11) unsigned NOT NULL default '0',
-  `Reactstate` tinyint(1) unsigned NOT NULL default '0',
-  `name` varchar(100) default 'Pet',
-  `renamed` tinyint(1) unsigned NOT NULL default '0',
-  `slot` int(11) unsigned NOT NULL default '0',
-  `curhealth` int(11) unsigned NOT NULL default '1',
-  `curmana` int(11) unsigned NOT NULL default '0',
-  `curhappiness` int(11) unsigned NOT NULL default '0',
-  `savetime` bigint(20) unsigned NOT NULL default '0',
-  `resettalents_cost` int(11) unsigned NOT NULL default '0',
-  `resettalents_time` bigint(20) unsigned NOT NULL default '0',
-  `abdata` longtext,
-  PRIMARY KEY  (`id`),
-  KEY `owner` (`owner`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Pet System';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `character_pet`
---
-
-LOCK TABLES `character_pet` WRITE;
-/*!40000 ALTER TABLE `character_pet` DISABLE KEYS */;
-/*!40000 ALTER TABLE `character_pet` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `character_pet_declinedname`
---
-
-DROP TABLE IF EXISTS `character_pet_declinedname`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `character_pet_declinedname` (
-  `id` int(11) unsigned NOT NULL default '0',
-  `owner` int(11) unsigned NOT NULL default '0',
-  `genitive` varchar(12) NOT NULL default '',
-  `dative` varchar(12) NOT NULL default '',
-  `accusative` varchar(12) NOT NULL default '',
-  `instrumental` varchar(12) NOT NULL default '',
-  `prepositional` varchar(12) NOT NULL default '',
-  PRIMARY KEY  (`id`),
-  KEY owner_key (`owner`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `character_pet_declinedname`
---
-
-LOCK TABLES `character_pet_declinedname` WRITE;
-/*!40000 ALTER TABLE `character_pet_declinedname` DISABLE KEYS */;
-/*!40000 ALTER TABLE `character_pet_declinedname` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `character_queststatus`
---
-
-DROP TABLE IF EXISTS `character_queststatus`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `character_queststatus` (
-  `guid` int(11) unsigned NOT NULL default '0' COMMENT 'Global Unique Identifier',
-  `quest` int(11) unsigned NOT NULL default '0' COMMENT 'Quest Identifier',
-  `status` int(11) unsigned NOT NULL default '0',
-  `rewarded` tinyint(1) unsigned NOT NULL default '0',
-  `explored` tinyint(1) unsigned NOT NULL default '0',
-  `timer` bigint(20) unsigned NOT NULL default '0',
-  `mobcount1` int(11) unsigned NOT NULL default '0',
-  `mobcount2` int(11) unsigned NOT NULL default '0',
-  `mobcount3` int(11) unsigned NOT NULL default '0',
-  `mobcount4` int(11) unsigned NOT NULL default '0',
-  `itemcount1` int(11) unsigned NOT NULL default '0',
-  `itemcount2` int(11) unsigned NOT NULL default '0',
-  `itemcount3` int(11) unsigned NOT NULL default '0',
-  `itemcount4` int(11) unsigned NOT NULL default '0',
-  PRIMARY KEY  (`guid`,`quest`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Player System';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `character_queststatus`
---
-
-LOCK TABLES `character_queststatus` WRITE;
-/*!40000 ALTER TABLE `character_queststatus` DISABLE KEYS */;
-/*!40000 ALTER TABLE `character_queststatus` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `character_queststatus_daily`
---
-
-DROP TABLE IF EXISTS `character_queststatus_daily`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `character_queststatus_daily` (
-  `guid` int(11) unsigned NOT NULL default '0' COMMENT 'Global Unique Identifier',
-  `quest` int(11) unsigned NOT NULL default '0' COMMENT 'Quest Identifier',
-  `time` bigint(20) unsigned NOT NULL default '0',
-  PRIMARY KEY  (`guid`,`quest`),
-  KEY `idx_guid` (`guid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Player System';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `character_queststatus_daily`
---
-
-LOCK TABLES `character_queststatus_daily` WRITE;
-/*!40000 ALTER TABLE `character_queststatus_daily` DISABLE KEYS */;
-/*!40000 ALTER TABLE `character_queststatus_daily` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `character_queststatus_weekly`
---
-
-DROP TABLE IF EXISTS `character_queststatus_weekly`;
-CREATE TABLE `character_queststatus_weekly` (
-  `guid` int(11) unsigned NOT NULL default '0' COMMENT 'Global Unique Identifier',
-  `quest` int(11) unsigned NOT NULL default '0' COMMENT 'Quest Identifier',
-  PRIMARY KEY  (`guid`,`quest`),
-  KEY `idx_guid` (`guid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Player System';
-
---
--- Dumping data for table `character_queststatus_weekly`
---
-
-LOCK TABLES `character_queststatus_weekly` WRITE;
-/*!40000 ALTER TABLE `character_queststatus_weekly` DISABLE KEYS */;
-/*!40000 ALTER TABLE `character_queststatus_weekly` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `character_reputation`
---
-
-DROP TABLE IF EXISTS `character_reputation`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `character_reputation` (
-  `guid` int(11) unsigned NOT NULL default '0' COMMENT 'Global Unique Identifier',
-  `faction` int(11) unsigned NOT NULL default '0',
-  `standing` int(11) NOT NULL default '0',
-  `flags` int(11) NOT NULL default '0',
-  PRIMARY KEY  (`guid`,`faction`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Player System';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `character_reputation`
---
-
-LOCK TABLES `character_reputation` WRITE;
-/*!40000 ALTER TABLE `character_reputation` DISABLE KEYS */;
-/*!40000 ALTER TABLE `character_reputation` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `character_skills`
---
-
-DROP TABLE IF EXISTS `character_skills`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `character_skills` (
-  `guid` int(11) unsigned NOT NULL COMMENT 'Global Unique Identifier',
-  `skill` mediumint(9) unsigned NOT NULL,
-  `value` mediumint(9) unsigned NOT NULL,
-  `max` mediumint(9) unsigned NOT NULL,
-  PRIMARY KEY  (`guid`,`skill`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Player System';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `character_skills`
---
-
-LOCK TABLES `character_skills` WRITE;
-/*!40000 ALTER TABLE `character_skills` DISABLE KEYS */;
-/*!40000 ALTER TABLE `character_skills` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `character_social`
---
-
-DROP TABLE IF EXISTS `character_social`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `character_social` (
-  `guid` int(11) unsigned NOT NULL default '0' COMMENT 'Character Global Unique Identifier',
-  `friend` int(11) unsigned NOT NULL default '0' COMMENT 'Friend Global Unique Identifier',
-  `flags` tinyint(1) unsigned NOT NULL default '0' COMMENT 'Friend Flags',
-  `note` varchar(48) NOT NULL DEFAULT '' COMMENT 'Friend Note',
-  PRIMARY KEY  (`guid`,`friend`,`flags`),
-  KEY `guid` (`guid`),
-  KEY `friend` (`friend`),
-  KEY `guid_flags` (`guid`,`flags`),
-  KEY `friend_flags` (`friend`,`flags`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Player System';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `character_social`
---
-
-LOCK TABLES `character_social` WRITE;
-/*!40000 ALTER TABLE `character_social` DISABLE KEYS */;
-/*!40000 ALTER TABLE `character_social` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `character_spell`
---
-
-DROP TABLE IF EXISTS `character_spell`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `character_spell` (
-  `guid` int(11) unsigned NOT NULL default '0' COMMENT 'Global Unique Identifier',
-  `spell` int(11) unsigned NOT NULL default '0' COMMENT 'Spell Identifier',
-  `active` tinyint(3) unsigned NOT NULL default '1',
-  `disabled` tinyint(3) unsigned NOT NULL default '0',
-  PRIMARY KEY  (`guid`,`spell`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Player System';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `character_spell`
---
-
-LOCK TABLES `character_spell` WRITE;
-/*!40000 ALTER TABLE `character_spell` DISABLE KEYS */;
-/*!40000 ALTER TABLE `character_spell` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `character_spell_cooldown`
---
-
-DROP TABLE IF EXISTS `character_spell_cooldown`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `character_spell_cooldown` (
-  `guid` int(11) unsigned NOT NULL default '0' COMMENT 'Global Unique Identifier, Low part',
-  `spell` int(11) unsigned NOT NULL default '0' COMMENT 'Spell Identifier',
-  `item` int(11) unsigned NOT NULL default '0' COMMENT 'Item Identifier',
-  `time` bigint(20) unsigned NOT NULL default '0',
-  PRIMARY KEY  (`guid`,`spell`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `character_spell_cooldown`
---
-
-LOCK TABLES `character_spell_cooldown` WRITE;
-/*!40000 ALTER TABLE `character_spell_cooldown` DISABLE KEYS */;
-/*!40000 ALTER TABLE `character_spell_cooldown` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `character_stats`
---
-
-DROP TABLE IF EXISTS `character_stats`;
-CREATE TABLE `character_stats` (
-  `guid` int(11) unsigned NOT NULL default '0' COMMENT 'Global Unique Identifier, Low part',
-  `maxhealth` int(10) UNSIGNED NOT NULL default '0',
-  `maxpower1` int(10) UNSIGNED NOT NULL default '0',
-  `maxpower2` int(10) UNSIGNED NOT NULL default '0',
-  `maxpower3` int(10) UNSIGNED NOT NULL default '0',
-  `maxpower4` int(10) UNSIGNED NOT NULL default '0',
-  `maxpower5` int(10) UNSIGNED NOT NULL default '0',
-  `maxpower6` int(10) UNSIGNED NOT NULL default '0',
-  `maxpower7` int(10) UNSIGNED NOT NULL default '0',
-  `strength` int(10) UNSIGNED NOT NULL default '0',
-  `agility` int(10) UNSIGNED NOT NULL default '0',
-  `stamina` int(10) UNSIGNED NOT NULL default '0',
-  `intellect` int(10) UNSIGNED NOT NULL default '0',
-  `spirit` int(10) UNSIGNED NOT NULL default '0',
-  `armor` int(10) UNSIGNED NOT NULL default '0',
-  `resHoly` int(10) UNSIGNED NOT NULL default '0',
-  `resFire` int(10) UNSIGNED NOT NULL default '0',
-  `resNature` int(10) UNSIGNED NOT NULL default '0',
-  `resFrost` int(10) UNSIGNED NOT NULL default '0',
-  `resShadow` int(10) UNSIGNED NOT NULL default '0',
-  `resArcane` int(10) UNSIGNED NOT NULL default '0',
-  `blockPct` float UNSIGNED NOT NULL default '0',
-  `dodgePct` float UNSIGNED NOT NULL default '0',
-  `parryPct` float UNSIGNED NOT NULL default '0',
-  `critPct` float UNSIGNED NOT NULL default '0',  
-  `rangedCritPct` float UNSIGNED NOT NULL default '0',
-  `spellCritPct` float UNSIGNED NOT NULL default '0',
-  `attackPower` int(10) UNSIGNED NOT NULL default '0',
-  `rangedAttackPower` int(10) UNSIGNED NOT NULL default '0',
-  `spellPower` int(10) UNSIGNED NOT NULL default '0',
-   
-  PRIMARY KEY  (`guid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
---
--- Dumping data for table `character_stats`
---
-
-LOCK TABLES `character_stats` WRITE;
-/*!40000 ALTER TABLE `character_stats` DISABLE KEYS */;
-/*!40000 ALTER TABLE `character_stats` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `character_talent`
---
-
-DROP TABLE IF EXISTS `character_talent`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `character_talent` (
-  `guid` int(11) unsigned NOT NULL,
-  `spell` int(11) unsigned NOT NULL,
-  `spec` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  PRIMARY KEY (`guid`,`spell`,`spec`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `character_talent`
---
-
-LOCK TABLES `character_talent` WRITE;
-/*!40000 ALTER TABLE `character_talent` DISABLE KEYS */;
-/*!40000 ALTER TABLE `character_talent` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `character_tutorial`
---
-
-DROP TABLE IF EXISTS `character_tutorial`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `character_tutorial` (
-  `account` bigint(20) unsigned NOT NULL auto_increment COMMENT 'Account Identifier',
-  `realmid` int(11) unsigned NOT NULL default '0' COMMENT 'Realm Identifier',
-  `tut0` int(11) unsigned NOT NULL default '0',
-  `tut1` int(11) unsigned NOT NULL default '0',
-  `tut2` int(11) unsigned NOT NULL default '0',
-  `tut3` int(11) unsigned NOT NULL default '0',
-  `tut4` int(11) unsigned NOT NULL default '0',
-  `tut5` int(11) unsigned NOT NULL default '0',
-  `tut6` int(11) unsigned NOT NULL default '0',
-  `tut7` int(11) unsigned NOT NULL default '0',
-  PRIMARY KEY  (`account`,`realmid`),
-  KEY acc_key (`account`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Player System';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `character_tutorial`
---
-
-LOCK TABLES `character_tutorial` WRITE;
-/*!40000 ALTER TABLE `character_tutorial` DISABLE KEYS */;
-/*!40000 ALTER TABLE `character_tutorial` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `corpse`
---
-
-DROP TABLE IF EXISTS `corpse`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `corpse` (
-  `guid` int(11) unsigned NOT NULL default '0' COMMENT 'Global Unique Identifier',
-  `player` int(11) unsigned NOT NULL default '0' COMMENT 'Character Global Unique Identifier',
-  `position_x` float NOT NULL default '0',
-  `position_y` float NOT NULL default '0',
-  `position_z` float NOT NULL default '0',
-  `orientation` float NOT NULL default '0',
-  `zone` int(11) unsigned NOT NULL default '38' COMMENT 'Zone Identifier',
-  `map` int(11) unsigned NOT NULL default '0' COMMENT 'Map Identifier',
-  `phaseMask` smallint(5) unsigned NOT NULL default '1',
-  `data` longtext,
-  `time` bigint(20) unsigned NOT NULL default '0',
-  `corpse_type` tinyint(3) unsigned NOT NULL default '0',
-  `instance` int(11) unsigned NOT NULL default '0',
-  PRIMARY KEY  (`guid`),
-  KEY `idx_type` (`corpse_type`),
-  KEY `instance` (`instance`),
-  INDEX `Idx_player`(`player`),
-  INDEX `Idx_time`(`time`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Death System';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `corpse`
---
-
-LOCK TABLES `corpse` WRITE;
-/*!40000 ALTER TABLE `corpse` DISABLE KEYS */;
-/*!40000 ALTER TABLE `corpse` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `game_event_condition_save`
---
-
-DROP TABLE IF EXISTS `game_event_condition_save`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `game_event_condition_save` (
-  `event_id` mediumint(8) unsigned NOT NULL,
-  `condition_id` mediumint(8) unsigned NOT NULL default '0',
-  `done` float default '0',
-  PRIMARY KEY  (`event_id`,`condition_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `game_event_condition_save`
---
-
-LOCK TABLES `game_event_condition_save` WRITE;
-/*!40000 ALTER TABLE `game_event_condition_save` DISABLE KEYS */;
-/*!40000 ALTER TABLE `game_event_condition_save` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `game_event_save`
---
-
-DROP TABLE IF EXISTS `game_event_save`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `game_event_save` (
-  `event_id` mediumint(8) unsigned NOT NULL,
-  `state` tinyint(3) unsigned NOT NULL default '1',
-  `next_start` timestamp NOT NULL default '0000-00-00 00:00:00',
-  PRIMARY KEY  (`event_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `game_event_save`
---
-
-LOCK TABLES `game_event_save` WRITE;
-/*!40000 ALTER TABLE `game_event_save` DISABLE KEYS */;
-/*!40000 ALTER TABLE `game_event_save` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `gm_tickets`
---
-
-DROP TABLE IF EXISTS `gm_tickets`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `gm_tickets` (
-  `guid` int(10) NOT NULL auto_increment,
-  `playerGuid` int(11) unsigned NOT NULL default '0',
-  `name` varchar(15) NOT NULL,
-  `message` text NOT NULL,
-  `createtime` int(10) NOT NULL default '0',
-  `map` int NOT NULL DEFAULT '0',
-  `posX` float NOT NULL DEFAULT '0',
-  `posY` float NOT NULL DEFAULT '0',
-  `posZ` float NOT NULL DEFAULT '0',
-  `timestamp` int(10) NOT NULL default '0',
-  `closed` int(10) NOT NULL default '0',
-  `assignedto` int(10) NOT NULL default '0',
-  `comment` text NOT NULL,
-  PRIMARY KEY  (`guid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Player System';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `gm_tickets`
---
-
-LOCK TABLES `gm_tickets` WRITE;
-/*!40000 ALTER TABLE `gm_tickets` DISABLE KEYS */;
-/*!40000 ALTER TABLE `gm_tickets` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `group_instance`
---
-
-DROP TABLE IF EXISTS `group_instance`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `group_instance` (
-  `guid` int(11) unsigned NOT NULL default '0',
-  `instance` int(11) unsigned NOT NULL default '0',
-  `permanent` tinyint(1) unsigned NOT NULL default '0',
-  PRIMARY KEY  (`guid`,`instance`),
-  KEY `instance` (`instance`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `group_instance`
---
-
-LOCK TABLES `group_instance` WRITE;
-/*!40000 ALTER TABLE `group_instance` DISABLE KEYS */;
-/*!40000 ALTER TABLE `group_instance` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `group_member`
---
-
-DROP TABLE IF EXISTS `group_member`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `group_member` (
-  `guid` int(11) unsigned NOT NULL,
-  `memberGuid` int(11) unsigned NOT NULL,
-  `memberFlags` tinyint(2) unsigned NOT NULL,
-  `subgroup` smallint(6) unsigned NOT NULL,
-  PRIMARY KEY  (`memberGuid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Groups';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `group_member`
---
-
-LOCK TABLES `group_member` WRITE;
-/*!40000 ALTER TABLE `group_member` DISABLE KEYS */;
-/*!40000 ALTER TABLE `group_member` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `groups`
---
-
-DROP TABLE IF EXISTS `groups`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `groups` (
-  `guid` int(11) unsigned NOT NULL,
-  `leaderGuid` int(11) unsigned NOT NULL,
-  `lootMethod` tinyint(4) unsigned NOT NULL,
-  `looterGuid` int(11) unsigned NOT NULL,
-  `lootThreshold` tinyint(4) unsigned NOT NULL,
-  `icon1` int(11) unsigned NOT NULL,
-  `icon2` int(11) unsigned NOT NULL,
-  `icon3` int(11) unsigned NOT NULL,
-  `icon4` int(11) unsigned NOT NULL,
-  `icon5` int(11) unsigned NOT NULL,
-  `icon6` int(11) unsigned NOT NULL,
-  `icon7` int(11) unsigned NOT NULL,
-  `icon8` int(11) unsigned NOT NULL,
-  `groupType` mediumint(8) unsigned NOT NULL,
-  `difficulty` tinyint(3) unsigned NOT NULL default '0',
-  `raiddifficulty` int(11) UNSIGNED NOT NULL default '0',
-  PRIMARY KEY  (`guid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Groups';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `groups`
---
-
-LOCK TABLES `groups` WRITE;
-/*!40000 ALTER TABLE `groups` DISABLE KEYS */;
-/*!40000 ALTER TABLE `groups` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `guild`
---
-
-DROP TABLE IF EXISTS `guild`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `guild` (
-  `guildid` int(6) unsigned NOT NULL default '0',
-  `name` varchar(255) NOT NULL default '',
-  `leaderguid` int(6) unsigned NOT NULL default '0',
-  `EmblemStyle` int(5) NOT NULL default '0',
-  `EmblemColor` int(5) NOT NULL default '0',
-  `BorderStyle` int(5) NOT NULL default '0',
-  `BorderColor` int(5) NOT NULL default '0',
-  `BackgroundColor` int(5) NOT NULL default '0',
-  `info` text NOT NULL,
-  `motd` varchar(255) NOT NULL default '',
-  `createdate` bigint(20) NOT NULL default '0',
-  `BankMoney` bigint(20) NOT NULL default '0',
-  PRIMARY KEY  (`guildid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Guild System';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `guild`
---
-
-LOCK TABLES `guild` WRITE;
-/*!40000 ALTER TABLE `guild` DISABLE KEYS */;
-/*!40000 ALTER TABLE `guild` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `guild_bank_eventlog`
---
-
-DROP TABLE IF EXISTS `guild_bank_eventlog`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `guild_bank_eventlog` (
-  `guildid` int(11) unsigned NOT NULL default '0' COMMENT 'Guild Identificator',
-  `LogGuid` int(11) unsigned NOT NULL default '0' COMMENT 'Log record identificator - auxiliary column',
-  `TabId` tinyint(3) unsigned NOT NULL default '0' COMMENT 'Guild bank TabId',
-  `EventType` tinyint(3) unsigned NOT NULL default '0' COMMENT 'Event type',
-  `PlayerGuid` int(11) unsigned NOT NULL default '0',
-  `ItemOrMoney` int(11) unsigned NOT NULL default '0',
-  `ItemStackCount` tinyint(3) unsigned NOT NULL default '0',
-  `DestTabId` tinyint(1) unsigned NOT NULL default '0' COMMENT 'Destination Tab Id',
-  `TimeStamp` bigint(20) unsigned NOT NULL default '0' COMMENT 'Event UNIX time',
-  PRIMARY KEY  (`guildid`,`LogGuid`,`TabId`),
-  KEY `guildid_key` (`guildid`),	
-  INDEX `Idx_PlayerGuid`(`PlayerGuid`),
-  INDEX `Idx_LogGuid`(`LogGuid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `guild_bank_eventlog`
---
-
-LOCK TABLES `guild_bank_eventlog` WRITE;
-/*!40000 ALTER TABLE `guild_bank_eventlog` DISABLE KEYS */;
-/*!40000 ALTER TABLE `guild_bank_eventlog` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `guild_bank_item`
---
-
-DROP TABLE IF EXISTS `guild_bank_item`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `guild_bank_item` (
-  `guildid` int(11) unsigned NOT NULL default '0',
-  `TabId` tinyint(1) unsigned NOT NULL default '0',
-  `SlotId` tinyint(3) unsigned NOT NULL default '0',
-  `item_guid` int(11) unsigned NOT NULL default '0',
-  `item_entry` int(11) unsigned NOT NULL default '0',
-  PRIMARY KEY  (`guildid`,`tabid`,`slotid`),
-  KEY `guildid_key` (`guildid`),	
-  INDEX `Idx_item_guid`(`item_guid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `guild_bank_item`
---
-
-LOCK TABLES `guild_bank_item` WRITE;
-/*!40000 ALTER TABLE `guild_bank_item` DISABLE KEYS */;
-/*!40000 ALTER TABLE `guild_bank_item` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `guild_bank_right`
---
-
-DROP TABLE IF EXISTS `guild_bank_right`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `guild_bank_right` (
-  `guildid` int(11) unsigned NOT NULL default '0',
-  `TabId` tinyint(1) unsigned NOT NULL default '0',
-  `rid` int(11) unsigned NOT NULL default '0',
-  `gbright` tinyint(3) unsigned NOT NULL default '0',
-  `SlotPerDay` int(11) unsigned NOT NULL default '0',
-  PRIMARY KEY  (`guildid`,`TabId`,`rid`),
-  KEY `guildid_key` (`guildid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `guild_bank_right`
---
-
-LOCK TABLES `guild_bank_right` WRITE;
-/*!40000 ALTER TABLE `guild_bank_right` DISABLE KEYS */;
-/*!40000 ALTER TABLE `guild_bank_right` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `guild_bank_tab`
---
-
-DROP TABLE IF EXISTS `guild_bank_tab`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `guild_bank_tab` (
-  `guildid` int(11) unsigned NOT NULL default '0',
-  `TabId` tinyint(1) unsigned NOT NULL default '0',
-  `TabName` varchar(100) NOT NULL default '',
-  `TabIcon` varchar(100) NOT NULL default '',
-  `TabText` text,
-  PRIMARY KEY  (`guildid`,`TabId`),
-  KEY `guildid_key` (`guildid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `guild_bank_tab`
---
-
-LOCK TABLES `guild_bank_tab` WRITE;
-/*!40000 ALTER TABLE `guild_bank_tab` DISABLE KEYS */;
-/*!40000 ALTER TABLE `guild_bank_tab` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `guild_eventlog`
---
-
-DROP TABLE IF EXISTS `guild_eventlog`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `guild_eventlog` (
-  `guildid` int(11) NOT NULL COMMENT 'Guild Identificator',
-  `LogGuid` int(11) NOT NULL COMMENT 'Log record identificator - auxiliary column',
-  `EventType` tinyint(1) NOT NULL COMMENT 'Event type',
-  `PlayerGuid1` int(11) NOT NULL COMMENT 'Player 1',
-  `PlayerGuid2` int(11) NOT NULL COMMENT 'Player 2',
-  `NewRank` tinyint(2) NOT NULL COMMENT 'New rank(in case promotion/demotion)',
-  `TimeStamp` bigint(20) NOT NULL COMMENT 'Event UNIX time',
-  PRIMARY KEY (`guildid`, `LogGuid`),
-  INDEX `Idx_PlayerGuid1`(`PlayerGuid1`),
-  INDEX `Idx_PlayerGuid2`(`PlayerGuid2`),
-  INDEX `Idx_LogGuid`(`LogGuid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT 'Guild Eventlog';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `guild_eventlog`
---
-
-LOCK TABLES `guild_eventlog` WRITE;
-/*!40000 ALTER TABLE `guild_eventlog` DISABLE KEYS */;
-/*!40000 ALTER TABLE `guild_eventlog` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `guild_member`
---
-
-DROP TABLE IF EXISTS `guild_member`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `guild_member` (
-  `guildid` int(6) unsigned NOT NULL default '0',
-  `guid` int(11) unsigned NOT NULL default '0',
-  `rank` tinyint(2) unsigned NOT NULL default '0',
-  `pnote` varchar(255) NOT NULL default '',
-  `offnote` varchar(255) NOT NULL default '',
-  `BankResetTimeMoney` int(11) unsigned NOT NULL default '0',
-  `BankRemMoney` int(11) unsigned NOT NULL default '0',
-  `BankResetTimeTab0` int(11) unsigned NOT NULL default '0',
-  `BankRemSlotsTab0` int(11) unsigned NOT NULL default '0',
-  `BankResetTimeTab1` int(11) unsigned NOT NULL default '0',
-  `BankRemSlotsTab1` int(11) unsigned NOT NULL default '0',
-  `BankResetTimeTab2` int(11) unsigned NOT NULL default '0',
-  `BankRemSlotsTab2` int(11) unsigned NOT NULL default '0',
-  `BankResetTimeTab3` int(11) unsigned NOT NULL default '0',
-  `BankRemSlotsTab3` int(11) unsigned NOT NULL default '0',
-  `BankResetTimeTab4` int(11) unsigned NOT NULL default '0',
-  `BankRemSlotsTab4` int(11) unsigned NOT NULL default '0',
-  `BankResetTimeTab5` int(11) unsigned NOT NULL default '0',
-  `BankRemSlotsTab5` int(11) unsigned NOT NULL default '0',
-  KEY `guildid_key` (`guildid`),
-  KEY `guildid_rank_key` (`guildid`,`rank`),
-  UNIQUE KEY `guid_key` (`guid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Guild System';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `guild_member`
---
-
-LOCK TABLES `guild_member` WRITE;
-/*!40000 ALTER TABLE `guild_member` DISABLE KEYS */;
-/*!40000 ALTER TABLE `guild_member` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `guild_rank`
---
-
-DROP TABLE IF EXISTS `guild_rank`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `guild_rank` (
-  `guildid` int(6) unsigned NOT NULL default '0',
-  `rid` int(11) unsigned NOT NULL,
-  `rname` varchar(255) NOT NULL default '',
-  `rights` int(3) unsigned NOT NULL default '0',
-  `BankMoneyPerDay` int(11) unsigned NOT NULL default '0',
-  PRIMARY KEY  (`guildid`,`rid`),
-  INDEX `Idx_rid`(`rid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Guild System';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `guild_rank`
---
-
-LOCK TABLES `guild_rank` WRITE;
-/*!40000 ALTER TABLE `guild_rank` DISABLE KEYS */;
-/*!40000 ALTER TABLE `guild_rank` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `instance`
---
-
-DROP TABLE IF EXISTS `instance`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `instance` (
-  `id` int(11) unsigned NOT NULL default '0',
-  `map` int(11) unsigned NOT NULL default '0',
-  `resettime` bigint(40) NOT NULL default '0',
-  `difficulty` tinyint(1) unsigned NOT NULL default '0',
-  `data` longtext,
-  PRIMARY KEY  (`id`),
-  KEY `map` (`map`),
-  KEY `resettime` (`resettime`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `instance`
---
-
-LOCK TABLES `instance` WRITE;
-/*!40000 ALTER TABLE `instance` DISABLE KEYS */;
-/*!40000 ALTER TABLE `instance` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `instance_reset`
---
-
-DROP TABLE IF EXISTS `instance_reset`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `instance_reset` (
-  `mapid` int(11) unsigned NOT NULL default '0',
-  `difficulty` tinyint(1) unsigned NOT NULL default '0',
-  `resettime` bigint(40) NOT NULL default '0',
-  PRIMARY KEY  (`mapid`,`difficulty`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `instance_reset`
---
-
-LOCK TABLES `instance_reset` WRITE;
-/*!40000 ALTER TABLE `instance_reset` DISABLE KEYS */;
-/*!40000 ALTER TABLE `instance_reset` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `item_instance`
---
-
-DROP TABLE IF EXISTS `item_instance`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `item_instance` (
-  `guid` int(11) unsigned NOT NULL default '0',
-  `owner_guid` int(11) unsigned NOT NULL default '0',
-  `data` longtext,
-  `text` longtext,
-  PRIMARY KEY  (`guid`),
-  KEY `idx_owner_guid` (`owner_guid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Item System';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `item_instance`
---
-
-LOCK TABLES `item_instance` WRITE;
-/*!40000 ALTER TABLE `item_instance` DISABLE KEYS */;
-/*!40000 ALTER TABLE `item_instance` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `item_refund_instance`
---
-
-DROP TABLE IF EXISTS `item_refund_instance`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `item_refund_instance` (
-  `item_guid` int(11) unsigned NOT NULL COMMENT 'Item GUID',
-  `player_guid` int(11) unsigned NOT NULL COMMENT 'Player GUID',
-  `paidMoney` int(11) unsigned NOT NULL DEFAULT '0',
-  `paidExtendedCost` int(11) unsigned NOT NULL DEFAULT '0',
-  PRIMARY KEY (`item_guid`,`player_guid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Item Refund System';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `item_refund_instance`
---
-
-LOCK TABLES `item_refund_instance` WRITE;
-/*!40000 ALTER TABLE `item_refund_instance` DISABLE KEYS */;
-/*!40000 ALTER TABLE `item_refund_instance` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `mail`
---
-
-DROP TABLE IF EXISTS `mail`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `mail` (
-  `id` int(11) unsigned NOT NULL default '0' COMMENT 'Identifier',
-  `messageType` tinyint(3) unsigned NOT NULL default '0',
-  `stationery` tinyint(3) NOT NULL default '41',
-  `mailTemplateId` mediumint(8) unsigned NOT NULL default '0',
-  `sender` int(11) unsigned NOT NULL default '0' COMMENT 'Character Global Unique Identifier',
-  `receiver` int(11) unsigned NOT NULL default '0' COMMENT 'Character Global Unique Identifier',
-  `subject` longtext,
-  `body` longtext,
-  `has_items` tinyint(3) unsigned NOT NULL default '0',
-  `expire_time` bigint(40) NOT NULL default '0',
-  `deliver_time` bigint(40) NOT NULL default '0',
-  `money` int(11) unsigned NOT NULL default '0',
-  `cod` int(11) unsigned NOT NULL default '0',
-  `checked` tinyint(3) unsigned NOT NULL default '0',
-  PRIMARY KEY  (`id`),
-  KEY `idx_receiver` (`receiver`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Mail System';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `mail`
---
-
-LOCK TABLES `mail` WRITE;
-/*!40000 ALTER TABLE `mail` DISABLE KEYS */;
-/*!40000 ALTER TABLE `mail` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `mail_items`
---
-
-DROP TABLE IF EXISTS `mail_items`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `mail_items` (
-  `mail_id` int(11) NOT NULL default '0',
-  `item_guid` int(11) NOT NULL default '0',
-  `item_template` int(11) NOT NULL default '0',
-  `receiver` int(11) unsigned NOT NULL default '0' COMMENT 'Character Global Unique Identifier',
-  PRIMARY KEY  (`mail_id`,`item_guid`),
-  KEY `idx_receiver` (`receiver`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `mail_items`
---
-
-LOCK TABLES `mail_items` WRITE;
-/*!40000 ALTER TABLE `mail_items` DISABLE KEYS */;
-/*!40000 ALTER TABLE `mail_items` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `pet_aura`
---
-
-DROP TABLE IF EXISTS `pet_aura`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `pet_aura` (
-  `guid` int(11) unsigned NOT NULL default '0' COMMENT 'Global Unique Identifier',
-  `caster_guid` bigint(20) unsigned NOT NULL default '0' COMMENT 'Full Global Unique Identifier',
-  `spell` int(11) unsigned NOT NULL default '0',
-  `effect_mask` tinyint(3) unsigned NOT NULL default '0',
-  `recalculate_mask` tinyint(3) unsigned NOT NULL default '0',
-  `stackcount` tinyint(3) unsigned NOT NULL default '1',
-  `amount0` int(11) NOT NULL default '0',
-  `amount1` int(11) NOT NULL default '0',
-  `amount2` int(11) NOT NULL default '0',
-  `base_amount0` int(11) NOT NULL default '0',
-  `base_amount1` int(11) NOT NULL default '0',
-  `base_amount2` int(11) NOT NULL default '0',
-  `maxduration` int(11) NOT NULL default '0',
-  `remaintime` int(11) NOT NULL default '0',
-  `remaincharges` tinyint(3) unsigned NOT NULL default '0',
-  PRIMARY KEY  (`guid`,`spell`,`effect_mask`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Pet System';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `pet_aura`
---
-
-LOCK TABLES `pet_aura` WRITE;
-/*!40000 ALTER TABLE `pet_aura` DISABLE KEYS */;
-/*!40000 ALTER TABLE `pet_aura` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `pet_spell`
---
-
-DROP TABLE IF EXISTS `pet_spell`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `pet_spell` (
-  `guid` int(11) unsigned NOT NULL default '0' COMMENT 'Global Unique Identifier',
-  `spell` int(11) unsigned NOT NULL default '0' COMMENT 'Spell Identifier',
-  `active` int(11) unsigned NOT NULL default '0',
-  PRIMARY KEY  (`guid`,`spell`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Pet System';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `pet_spell`
---
-
-LOCK TABLES `pet_spell` WRITE;
-/*!40000 ALTER TABLE `pet_spell` DISABLE KEYS */;
-/*!40000 ALTER TABLE `pet_spell` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `pet_spell_cooldown`
---
-
-DROP TABLE IF EXISTS `pet_spell_cooldown`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `pet_spell_cooldown` (
-  `guid` int(11) unsigned NOT NULL default '0' COMMENT 'Global Unique Identifier, Low part',
-  `spell` int(11) unsigned NOT NULL default '0' COMMENT 'Spell Identifier',
-  `time` bigint(20) unsigned NOT NULL default '0',
-  PRIMARY KEY  (`guid`,`spell`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `pet_spell_cooldown`
---
-
-LOCK TABLES `pet_spell_cooldown` WRITE;
-/*!40000 ALTER TABLE `pet_spell_cooldown` DISABLE KEYS */;
-/*!40000 ALTER TABLE `pet_spell_cooldown` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `petition`
---
-
-DROP TABLE IF EXISTS `petition`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `petition` (
-  `ownerguid` int(10) unsigned NOT NULL,
-  `petitionguid` int(10) unsigned default '0',
-  `name` varchar(255) NOT NULL default '',
-  `type` int(10) unsigned NOT NULL default '0',
-  PRIMARY KEY  (`ownerguid`,`type`),
-  UNIQUE KEY `index_ownerguid_petitionguid` (`ownerguid`,`petitionguid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Guild System';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `petition`
---
-
-LOCK TABLES `petition` WRITE;
-/*!40000 ALTER TABLE `petition` DISABLE KEYS */;
-/*!40000 ALTER TABLE `petition` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `petition_sign`
---
-
-DROP TABLE IF EXISTS `petition_sign`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `petition_sign` (
-  `ownerguid` int(10) unsigned NOT NULL,
-  `petitionguid` int(11) unsigned NOT NULL default '0',
-  `playerguid` int(11) unsigned NOT NULL default '0',
-  `player_account` int(11) unsigned NOT NULL default '0',
-  `type` int(10) unsigned NOT NULL default '0',
-  PRIMARY KEY  (`petitionguid`,`playerguid`),
-  INDEX `Idx_playerguid`(`playerguid`),	
-  INDEX `Idx_ownerguid`(`ownerguid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Guild System';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `petition_sign`
---
-
-LOCK TABLES `petition_sign` WRITE;
-/*!40000 ALTER TABLE `petition_sign` DISABLE KEYS */;
-/*!40000 ALTER TABLE `petition_sign` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `worldstates`
---
-
-DROP TABLE IF EXISTS `worldstates`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `worldstates` (
-  `entry` mediumint(11) UNSIGNED NOT NULL DEFAULT '0',
-  `value` bigint(40) UNSIGNED NOT NULL DEFAULT '0',
-  `comment` text,
-  PRIMARY KEY  (`entry`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Variable Saves';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `worldstates`
---
-
-LOCK TABLES `worldstates` WRITE;
-/*!40000 ALTER TABLE `worldstates` DISABLE KEYS */;
-INSERT INTO `worldstates` (`entry`,`value`, `comment`) VALUES 
-(20001, 0, 'NextArenaPointDistributionTime'),
-(20002, 0, 'NextWeeklyQuestResetTime'),
-(20003, 0, 'NextBGRandomDailyResetTime');
-/*!40000 ALTER TABLE `worldstates` ENABLE KEYS */;
-UNLOCK TABLES;
-/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
-
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-
--- Dump completed on 2008-01-10 11:37:06
-
--- Updated on 2010-01-29 23:05:45 GMT+1
diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql
new file mode 100644
index 00000000000..6ec8cd968e9
--- /dev/null
+++ b/sql/base/characters_database.sql
@@ -0,0 +1,1991 @@
+-- MySQL dump 10.11
+--
+-- Host: localhost    Database: characters
+-- ------------------------------------------------------
+-- Server version	5.0.45-Debian_1ubuntu3.1-log
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+
+--
+-- Table structure for table `account_data`
+--
+
+DROP TABLE IF EXISTS `account_data`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `account_data` (
+  `account` int(11) unsigned NOT NULL default '0',
+  `type` int(11) unsigned NOT NULL default '0',
+  `time` bigint(11) unsigned NOT NULL default '0',
+  `data` longblob NOT NULL,
+  PRIMARY KEY  (`account`,`type`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `account_data`
+--
+
+LOCK TABLES `account_data` WRITE;
+/*!40000 ALTER TABLE `account_data` DISABLE KEYS */;
+/*!40000 ALTER TABLE `account_data` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `addons`
+--
+
+DROP TABLE IF EXISTS `addons`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `addons` (
+  `name` varchar(120) NOT NULL default '',
+  `crc` int(32) unsigned NOT NULL default '0',
+  PRIMARY KEY (`name`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Addons';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `addons`
+--
+
+LOCK TABLES `addons` WRITE;
+/*!40000 ALTER TABLE `addons` DISABLE KEYS */;
+/*!40000 ALTER TABLE `addons` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `arena_team`
+--
+
+DROP TABLE IF EXISTS `arena_team`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `arena_team` (
+  `arenateamid` int(10) unsigned NOT NULL default '0',
+  `name` char(255) NOT NULL,
+  `captainguid` int(10) unsigned NOT NULL default '0',
+  `type` tinyint(3) unsigned NOT NULL default '0',
+  `BackgroundColor` int(10) unsigned NOT NULL default '0',
+  `EmblemStyle` int(10) unsigned NOT NULL default '0',
+  `EmblemColor` int(10) unsigned NOT NULL default '0',
+  `BorderStyle` int(10) unsigned NOT NULL default '0',
+  `BorderColor` int(10) unsigned NOT NULL default '0',
+  PRIMARY KEY  (`arenateamid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `arena_team`
+--
+
+LOCK TABLES `arena_team` WRITE;
+/*!40000 ALTER TABLE `arena_team` DISABLE KEYS */;
+/*!40000 ALTER TABLE `arena_team` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `arena_team_member`
+--
+
+DROP TABLE IF EXISTS `arena_team_member`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `arena_team_member` (
+  `arenateamid` int(10) unsigned NOT NULL default '0',
+  `guid` int(10) unsigned NOT NULL default '0',
+  `played_week` int(10) unsigned NOT NULL default '0',
+  `wons_week` int(10) unsigned NOT NULL default '0',
+  `played_season` int(10) unsigned NOT NULL default '0',
+  `wons_season` int(10) unsigned NOT NULL default '0',
+  `personal_rating` int(10) UNSIGNED NOT NULL DEFAULT '0',
+  PRIMARY KEY  (`arenateamid`,`guid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `arena_team_member`
+--
+
+LOCK TABLES `arena_team_member` WRITE;
+/*!40000 ALTER TABLE `arena_team_member` DISABLE KEYS */;
+/*!40000 ALTER TABLE `arena_team_member` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `arena_team_stats`
+--
+
+DROP TABLE IF EXISTS `arena_team_stats`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `arena_team_stats` (
+  `arenateamid` int(10) unsigned NOT NULL default '0',
+  `rating` int(10) unsigned NOT NULL default '0',
+  `games` int(10) unsigned NOT NULL default '0',
+  `wins` int(10) unsigned NOT NULL default '0',
+  `played` int(10) unsigned NOT NULL default '0',
+  `wins2` int(10) unsigned NOT NULL default '0',
+  `rank` int(10) unsigned NOT NULL default '0',
+  PRIMARY KEY  (`arenateamid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `arena_team_stats`
+--
+
+LOCK TABLES `arena_team_stats` WRITE;
+/*!40000 ALTER TABLE `arena_team_stats` DISABLE KEYS */;
+/*!40000 ALTER TABLE `arena_team_stats` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `auctionhouse`
+--
+
+DROP TABLE IF EXISTS `auctionhouse`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `auctionhouse` (
+  `id` int(11) unsigned NOT NULL default '0',
+  `auctioneerguid` int(11) unsigned NOT NULL default '0',
+  `itemguid` int(11) unsigned NOT NULL default '0',
+  `item_template` int(11) unsigned NOT NULL default '0' COMMENT 'Item Identifier',
+  `itemowner` int(11) unsigned NOT NULL default '0',
+  `buyoutprice` int(11) NOT NULL default '0',
+  `time` bigint(40) NOT NULL default '0',
+  `buyguid` int(11) unsigned NOT NULL default '0',
+  `lastbid` int(11) NOT NULL default '0',
+  `startbid` int(11) NOT NULL default '0',
+  `deposit` int(11) NOT NULL default '0',
+  PRIMARY KEY  (`id`),
+  UNIQUE KEY `item_guid` (`itemguid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `auctionhouse`
+--
+
+LOCK TABLES `auctionhouse` WRITE;
+/*!40000 ALTER TABLE `auctionhouse` DISABLE KEYS */;
+/*!40000 ALTER TABLE `auctionhouse` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `auctionhousebot`
+--
+
+DROP TABLE IF EXISTS `auctionhousebot`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `auctionhousebot` (
+  `auctionhouse` int(11) NOT NULL default '0' COMMENT 'mapID of the auctionhouse.',
+  `name` char(25) default NULL COMMENT 'Text name of the auctionhouse.',
+  `minitems` int(11) default '0' COMMENT 'This is the minimum number of items you want to keep in the auction house. a 0 here will make it the same as the maximum.',
+  `maxitems` int(11) default '0' COMMENT 'This is the number of items you want to keep in the auction house.',
+  `percentgreytradegoods` int(11) default '0' COMMENT 'Sets the percentage of the Grey Trade Goods auction items',
+  `percentwhitetradegoods` int(11) default '27' COMMENT 'Sets the percentage of the White Trade Goods auction items',
+  `percentgreentradegoods` int(11) default '12' COMMENT 'Sets the percentage of the Green Trade Goods auction items',
+  `percentbluetradegoods` int(11) default '10' COMMENT 'Sets the percentage of the Blue Trade Goods auction items',
+  `percentpurpletradegoods` int(11) default '1' COMMENT 'Sets the percentage of the Purple Trade Goods auction items',
+  `percentorangetradegoods` int(11) default '0' COMMENT 'Sets the percentage of the Orange Trade Goods auction items',
+  `percentyellowtradegoods` int(11) default '0' COMMENT 'Sets the percentage of the Yellow Trade Goods auction items',
+  `percentgreyitems` int(11) default '0' COMMENT 'Sets the percentage of the non trade Grey auction items',
+  `percentwhiteitems` int(11) default '10' COMMENT 'Sets the percentage of the non trade White auction items',
+  `percentgreenitems` int(11) default '30' COMMENT 'Sets the percentage of the non trade Green auction items',
+  `percentblueitems` int(11) default '8' COMMENT 'Sets the percentage of the non trade Blue auction items',
+  `percentpurpleitems` int(11) default '2' COMMENT 'Sets the percentage of the non trade Purple auction items',
+  `percentorangeitems` int(11) default '0' COMMENT 'Sets the percentage of the non trade Orange auction items',
+  `percentyellowitems` int(11) default '0' COMMENT 'Sets the percentage of the non trade Yellow auction items',
+  `minpricegrey` int(11) default '100' COMMENT 'Minimum price of Grey items (percentage).',
+  `maxpricegrey` int(11) default '150' COMMENT 'Maximum price of Grey items (percentage).',
+  `minpricewhite` int(11) default '150' COMMENT 'Minimum price of White items (percentage).',
+  `maxpricewhite` int(11) default '250' COMMENT 'Maximum price of White items (percentage).',
+  `minpricegreen` int(11) default '800' COMMENT 'Minimum price of Green items (percentage).',
+  `maxpricegreen` int(11) default '1400' COMMENT 'Maximum price of Green items (percentage).',
+  `minpriceblue` int(11) default '1250' COMMENT 'Minimum price of Blue items (percentage).',
+  `maxpriceblue` int(11) default '1750' COMMENT 'Maximum price of Blue items (percentage).',
+  `minpricepurple` int(11) default '2250' COMMENT 'Minimum price of Purple items (percentage).',
+  `maxpricepurple` int(11) default '4550' COMMENT 'Maximum price of Purple items (percentage).',
+  `minpriceorange` int(11) default '3250' COMMENT 'Minimum price of Orange items (percentage).',
+  `maxpriceorange` int(11) default '5550' COMMENT 'Maximum price of Orange items (percentage).',
+  `minpriceyellow` int(11) default '5250' COMMENT 'Minimum price of Yellow items (percentage).',
+  `maxpriceyellow` int(11) default '6550' COMMENT 'Maximum price of Yellow items (percentage).',
+  `minbidpricegrey` int(11) default '70' COMMENT 'Starting bid price of Grey items as a percentage of the randomly chosen buyout price. Default: 70',
+  `maxbidpricegrey` int(11) default '100' COMMENT 'Starting bid price of Grey items as a percentage of the randomly chosen buyout price. Default: 100',
+  `minbidpricewhite` int(11) default '70' COMMENT 'Starting bid price of White items as a percentage of the randomly chosen buyout price. Default: 70',
+  `maxbidpricewhite` int(11) default '100' COMMENT 'Starting bid price of White items as a percentage of the randomly chosen buyout price. Default: 100',
+  `minbidpricegreen` int(11) default '80' COMMENT 'Starting bid price of Green items as a percentage of the randomly chosen buyout price. Default: 80',
+  `maxbidpricegreen` int(11) default '100' COMMENT 'Starting bid price of Green items as a percentage of the randomly chosen buyout price. Default: 100',
+  `minbidpriceblue` int(11) default '75' COMMENT 'Starting bid price of Blue items as a percentage of the randomly chosen buyout price. Default: 75',
+  `maxbidpriceblue` int(11) default '100' COMMENT 'Starting bid price of Blue items as a percentage of the randomly chosen buyout price. Default: 100',
+  `minbidpricepurple` int(11) default '80' COMMENT 'Starting bid price of Purple items as a percentage of the randomly chosen buyout price. Default: 80',
+  `maxbidpricepurple` int(11) default '100' COMMENT 'Starting bid price of Purple items as a percentage of the randomly chosen buyout price. Default: 100',
+  `minbidpriceorange` int(11) default '80' COMMENT 'Starting bid price of Orange items as a percentage of the randomly chosen buyout price. Default: 80',
+  `maxbidpriceorange` int(11) default '100' COMMENT 'Starting bid price of Orange items as a percentage of the randomly chosen buyout price. Default: 100',
+  `minbidpriceyellow` int(11) default '80' COMMENT 'Starting bid price of Yellow items as a percentage of the randomly chosen buyout price. Default: 80',
+  `maxbidpriceyellow` int(11) default '100' COMMENT 'Starting bid price of Yellow items as a percentage of the randomly chosen buyout price. Default: 100',
+  `maxstackgrey` int(11) default '0' COMMENT 'Stack size limits for item qualities - a value of 0 will disable a maximum stack size for that quality, which will allow the bot to create items in stack as large as the item allows.',
+  `maxstackwhite` int(11) default '0' COMMENT 'Stack size limits for item qualities - a value of 0 will disable a maximum stack size for that quality, which will allow the bot to create items in stack as large as the item allows.',
+  `maxstackgreen` int(11) default '0' COMMENT 'Stack size limits for item qualities - a value of 0 will disable a maximum stack size for that quality, which will allow the bot to create items in stack as large as the item allows.',
+  `maxstackblue` int(11) default '0' COMMENT 'Stack size limits for item qualities - a value of 0 will disable a maximum stack size for that quality, which will allow the bot to create items in stack as large as the item allows.',
+  `maxstackpurple` int(11) default '0' COMMENT 'Stack size limits for item qualities - a value of 0 will disable a maximum stack size for that quality, which will allow the bot to create items in stack as large as the item allows.',
+  `maxstackorange` int(11) default '0' COMMENT 'Stack size limits for item qualities - a value of 0 will disable a maximum stack size for that quality, which will allow the bot to create items in stack as large as the item allows.',
+  `maxstackyellow` int(11) default '0' COMMENT 'Stack size limits for item qualities - a value of 0 will disable a maximum stack size for that quality, which will allow the bot to create items in stack as large as the item allows.',
+  `buyerpricegrey` int(11) default '1' COMMENT 'Multiplier to vendorprice when buying grey items from auctionhouse',
+  `buyerpricewhite` int(11) default '3' COMMENT 'Multiplier to vendorprice when buying white items from auctionhouse',
+  `buyerpricegreen` int(11) default '5' COMMENT 'Multiplier to vendorprice when buying green items from auctionhouse',
+  `buyerpriceblue` int(11) default '12' COMMENT 'Multiplier to vendorprice when buying blue items from auctionhouse',
+  `buyerpricepurple` int(11) default '15' COMMENT 'Multiplier to vendorprice when buying purple items from auctionhouse',
+  `buyerpriceorange` int(11) default '20' COMMENT 'Multiplier to vendorprice when buying orange items from auctionhouse',
+  `buyerpriceyellow` int(11) default '22' COMMENT 'Multiplier to vendorprice when buying yellow items from auctionhouse',
+  `buyerbiddinginterval` int(11) default '1' COMMENT 'Interval how frequently AHB bids on each AH. Time in minutes',
+  `buyerbidsperinterval` int(11) default '1' COMMENT 'number of bids to put in per bidding interval',
+  PRIMARY KEY  (`auctionhouse`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `auctionhousebot`
+--
+
+INSERT INTO `auctionhousebot`(`auctionhouse`,`name`,`minitems`,`maxitems`,`percentgreytradegoods`,`percentwhitetradegoods`,`percentgreentradegoods`,`percentbluetradegoods`,`percentpurpletradegoods`,`percentorangetradegoods`,`percentyellowtradegoods`,`percentgreyitems`,`percentwhiteitems`,`percentgreenitems`,`percentblueitems`,`percentpurpleitems`,`percentorangeitems`,`percentyellowitems`,`minpricegrey`,`maxpricegrey`,`minpricewhite`,`maxpricewhite`,`minpricegreen`,`maxpricegreen`,`minpriceblue`,`maxpriceblue`,`minpricepurple`,`maxpricepurple`,`minpriceorange`,`maxpriceorange`,`minpriceyellow`,`maxpriceyellow`,`minbidpricegrey`,`maxbidpricegrey`,`minbidpricewhite`,`maxbidpricewhite`,`minbidpricegreen`,`maxbidpricegreen`,`minbidpriceblue`,`maxbidpriceblue`,`minbidpricepurple`,`maxbidpricepurple`,`minbidpriceorange`,`maxbidpriceorange`,`minbidpriceyellow`,`maxbidpriceyellow`,`maxstackgrey`,`maxstackwhite`,`maxstackgreen`,`maxstackblue`,`maxstackpurple`,`maxstackorange`,`maxstackyellow`,`buyerpricegrey`,`buyerpricewhite`,`buyerpricegreen`,`buyerpriceblue`,`buyerpricepurple`,`buyerpriceorange`,`buyerpriceyellow`,`buyerbiddinginterval`,`buyerbidsperinterval`) VALUES
+(2,'Alliance',0,0,0,27,12,10,1,0,0,0,10,30,8,2,0,0,100,150,150,250,800,1400,1250,1750,2250,4550,3250,5550,5250,6550,70,100,70,100,80,100,75,100,80,100,80,100,80,100,0,0,3,2,1,1,1,1,3,5,12,15,20,22,1,1),
+(6,'Horde',0,0,0,27,12,10,1,0,0,0,10,30,8,2,0,0,100,150,150,250,800,1400,1250,1750,2250,4550,3250,5550,5250,6550,70,100,70,100,80,100,75,100,80,100,80,100,80,100,0,0,3,2,1,1,1,1,3,5,12,15,20,22,1,1),
+(7,'Neutral',0,0,0,27,12,10,1,0,0,0,10,30,8,2,0,0,100,150,150,250,800,1400,1250,1750,2250,4550,3250,5550,5250,6550,70,100,70,100,80,100,75,100,80,100,80,100,80,100,0,0,3,2,1,1,1,1,3,5,12,15,20,22,1,1);
+
+--
+-- Table structure for table `bugreport`
+--
+
+DROP TABLE IF EXISTS `bugreport`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `bugreport` (
+  `id` int(11) NOT NULL auto_increment COMMENT 'Identifier',
+  `type` longtext NOT NULL default '',
+  `content` longtext NOT NULL default '',
+  PRIMARY KEY  (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Debug System';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `bugreport`
+--
+
+LOCK TABLES `bugreport` WRITE;
+/*!40000 ALTER TABLE `bugreport` DISABLE KEYS */;
+/*!40000 ALTER TABLE `bugreport` ENABLE KEYS */;
+UNLOCK TABLES;
+
+-- 
+-- Table structure for table `channels`
+-- 
+
+DROP TABLE IF EXISTS `channels`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `channels` (
+  `m_name` text NOT NULL,
+  `m_team` int(10) unsigned NOT NULL,
+  `m_announce` tinyint(1) unsigned NOT NULL default '0',
+  `m_moderate` tinyint(1) unsigned NOT NULL default '0',
+  `m_public` tinyint(1) unsigned NOT NULL default '1',
+  `m_password` text,
+  `BannedList` longtext,
+  PRIMARY KEY  (`m_name`(10),`m_team`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Channel System';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `channels`
+--
+
+LOCK TABLES `channels` WRITE;
+/*!40000 ALTER TABLE `channels` DISABLE KEYS */;
+/*!40000 ALTER TABLE `channels` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `characters`
+--
+
+DROP TABLE IF EXISTS `characters`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `characters` (
+  `guid` int(11) unsigned NOT NULL default '0' COMMENT 'Global Unique Identifier',
+  `account` int(11) unsigned NOT NULL default '0' COMMENT 'Account Identifier',
+  `name` varchar(12) NOT NULL default '',
+  `race` tinyint(3) unsigned NOT NULL default '0',
+  `class` tinyint(3) unsigned NOT NULL default '0',
+  `gender` TINYINT UNSIGNED NOT NULL default '0',
+  `level` TINYINT UNSIGNED NOT NULL default '0',
+  `xp` INT UNSIGNED NOT NULL default '0',
+  `money` INT UNSIGNED NOT NULL default '0',
+  `playerBytes` INT UNSIGNED NOT NULL default '0',
+  `playerBytes2` INT UNSIGNED NOT NULL default '0',
+  `playerFlags` INT UNSIGNED NOT NULL default '0',
+  `position_x` float NOT NULL default '0',
+  `position_y` float NOT NULL default '0',
+  `position_z` float NOT NULL default '0',
+  `map` int(11) unsigned NOT NULL default '0' COMMENT 'Map Identifier',
+  `instance_id` int(11) unsigned NOT NULL default '0',
+  `dungeon_difficulty` tinyint(1) unsigned NOT NULL default '0',
+  `orientation` float NOT NULL default '0',
+  `taximask` longtext,
+  `online` tinyint(3) unsigned NOT NULL default '0',
+  `cinematic` tinyint(3) unsigned NOT NULL default '0',
+  `totaltime` int(11) unsigned NOT NULL default '0',
+  `leveltime` int(11) unsigned NOT NULL default '0',
+  `logout_time` bigint(20) unsigned NOT NULL default '0',
+  `is_logout_resting` tinyint(3) unsigned NOT NULL default '0',
+  `rest_bonus` float NOT NULL default '0',
+  `resettalents_cost` int(11) unsigned NOT NULL default '0',
+  `resettalents_time` bigint(20) unsigned NOT NULL default '0',
+  `trans_x` float NOT NULL default '0',
+  `trans_y` float NOT NULL default '0',
+  `trans_z` float NOT NULL default '0',
+  `trans_o` float NOT NULL default '0',
+  `transguid` bigint(20) unsigned NOT NULL default '0',
+  `extra_flags` int(11) unsigned NOT NULL default '0',
+  `stable_slots` tinyint(1) unsigned NOT NULL default '0',
+  `at_login` int(11) unsigned NOT NULL default '0',
+  `zone` int(11) unsigned NOT NULL default '0',
+  `death_expire_time` bigint(20) unsigned NOT NULL default '0',
+  `taxi_path` text,
+  `arenaPoints` int(10) unsigned NOT NULL default'0',
+  `totalHonorPoints` int(10) unsigned NOT NULL default'0',
+  `todayHonorPoints` int(10) unsigned NOT NULL default'0',
+  `yesterdayHonorPoints` int(10) unsigned NOT NULL default'0',
+  `totalKills` int(10) unsigned NOT NULL default'0',
+  `todayKills` smallint(5) unsigned NOT NULL default'0',
+  `yesterdayKills` smallint(5) unsigned NOT NULL default'0',
+  `chosenTitle` int(10) unsigned NOT NULL default'0',
+  `knownCurrencies` bigint(20) unsigned NOT NULL default'0',
+  `watchedFaction` bigint(10) unsigned NOT NULL default'0',
+  `drunk` smallint(5) unsigned NOT NULL default'0',
+  `health` int(10)  unsigned NOT NULL default'0',
+  `power1` int(10) unsigned NOT NULL default'0',
+  `power2` int(10) unsigned NOT NULL default'0',
+  `power3` int(10) unsigned NOT NULL default'0',
+  `power4` int(10) unsigned NOT NULL default'0',
+  `power5` int(10) unsigned NOT NULL default'0',
+  `power6` int(10) unsigned NOT NULL default'0',
+  `power7` int(10) unsigned NOT NULL default'0',
+  `latency` int(11) unsigned NOT NULL default '0',
+  `speccount` tinyint(3) unsigned NOT NULL default 1,
+  `activespec` tinyint(3) unsigned NOT NULL default 0,
+  `exploredZones` longtext,
+  `equipmentCache` longtext,
+  `ammoId` int(10) UNSIGNED NOT NULL default '0',
+  `knownTitles` longtext,
+  `actionBars` tinyint(3) UNSIGNED NOT NULL default '0',
+  PRIMARY KEY  (`guid`),
+  KEY `idx_account` (`account`),
+  KEY `idx_online` (`online`),
+  KEY `idx_name` (`name`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Player System';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `characters`
+--
+
+LOCK TABLES `characters` WRITE;
+/*!40000 ALTER TABLE `characters` DISABLE KEYS */;
+/*!40000 ALTER TABLE `characters` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `character_account_data`
+--
+
+DROP TABLE IF EXISTS `character_account_data`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `character_account_data` (
+  `guid` int(11) unsigned NOT NULL default '0',
+  `type` int(11) unsigned NOT NULL default '0',
+  `time` bigint(11) unsigned NOT NULL default '0',
+  `data` longblob NOT NULL,
+  PRIMARY KEY  (`guid`,`type`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `character_account_data`
+--
+
+LOCK TABLES `character_account_data` WRITE;
+/*!40000 ALTER TABLE `character_account_data` DISABLE KEYS */;
+/*!40000 ALTER TABLE `character_account_data` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `character_achievement`
+--
+
+DROP TABLE IF EXISTS `character_achievement`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `character_achievement` (
+  `guid` int(11) unsigned NOT NULL,
+  `achievement` int(11) unsigned  NOT NULL,
+  `date` bigint(11) unsigned NOT NULL default '0',
+  PRIMARY KEY  (`guid`,`achievement`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `character_achievement`
+--
+
+LOCK TABLES `character_achievement` WRITE;
+/*!40000 ALTER TABLE `character_achievement` DISABLE KEYS */;
+/*!40000 ALTER TABLE `character_achievement` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `character_achievement_progress`
+--
+
+DROP TABLE IF EXISTS `character_achievement_progress`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `character_achievement_progress` (
+  `guid` int(11) unsigned NOT NULL,
+  `criteria` int(11) unsigned NOT NULL,
+  `counter` int(11) unsigned NOT NULL,
+  `date` bigint(11) unsigned NOT NULL default '0',
+  PRIMARY KEY  (`guid`,`criteria`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `character_achievement_progress`
+--
+
+LOCK TABLES `character_achievement_progress` WRITE;
+/*!40000 ALTER TABLE `character_achievement_progress` DISABLE KEYS */;
+/*!40000 ALTER TABLE `character_achievement_progress` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `character_action`
+--
+
+DROP TABLE IF EXISTS `character_action`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `character_action` (
+  `guid` int(11) unsigned NOT NULL default '0',
+  `spec` tinyint(3) unsigned NOT NULL default '0',
+  `button` tinyint(3) unsigned NOT NULL default '0',
+  `action` int(11) unsigned NOT NULL default '0',
+  `type` tinyint(3) unsigned NOT NULL default '0',
+  PRIMARY KEY  (`guid`,`spec`,`button`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `character_action`
+--
+
+LOCK TABLES `character_action` WRITE;
+/*!40000 ALTER TABLE `character_action` DISABLE KEYS */;
+/*!40000 ALTER TABLE `character_action` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `character_aura`
+--
+
+DROP TABLE IF EXISTS `character_aura`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `character_aura` (
+  `guid` int(11) unsigned NOT NULL default '0' COMMENT 'Global Unique Identifier',
+  `caster_guid` bigint(20) unsigned NOT NULL default '0' COMMENT 'Full Global Unique Identifier',
+  `spell` int(11) unsigned NOT NULL default '0',
+  `effect_mask` tinyint(3) unsigned NOT NULL default '0',
+  `recalculate_mask` tinyint(3) unsigned NOT NULL default '0',
+  `stackcount` tinyint(3) unsigned NOT NULL default '1',
+  `amount0` int(11) NOT NULL default '0',
+  `amount1` int(11) NOT NULL default '0',
+  `amount2` int(11) NOT NULL default '0',
+  `base_amount0` int(11) NOT NULL default '0',
+  `base_amount1` int(11) NOT NULL default '0',
+  `base_amount2` int(11) NOT NULL default '0',
+  `maxduration` int(11) NOT NULL default '0',
+  `remaintime` int(11) NOT NULL default '0',
+  `remaincharges` tinyint(3) unsigned NOT NULL default '0',
+  PRIMARY KEY  (`guid`,`caster_guid`,`spell`,`effect_mask`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Player System';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `character_aura`
+--
+
+LOCK TABLES `character_aura` WRITE;
+/*!40000 ALTER TABLE `character_aura` DISABLE KEYS */;
+/*!40000 ALTER TABLE `character_aura` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `character_battleground_data`
+--
+
+DROP TABLE IF EXISTS `character_battleground_data`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `character_battleground_data` (
+  `guid` int(11) unsigned NOT NULL default '0' COMMENT 'Global Unique Identifier',
+  `instance_id` int(11) unsigned NOT NULL default '0',
+  `team` int(11) unsigned NOT NULL default '0',
+  `join_x` float NOT NULL default '0',
+  `join_y` float NOT NULL default '0',
+  `join_z` float NOT NULL default '0',
+  `join_o` float NOT NULL default '0',
+  `join_map` int(11) NOT NULL default '0',
+  `taxi_start` int(11) NOT NULL default '0',
+  `taxi_end` int(11) NOT NULL default '0',
+  `mount_spell` int(11) NOT NULL default '0',
+  PRIMARY KEY  (`guid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Player System';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `character_battleground_data`
+--
+
+LOCK TABLES `character_battleground_data` WRITE;
+/*!40000 ALTER TABLE `character_battleground_data` DISABLE KEYS */;
+/*!40000 ALTER TABLE `character_battleground_data` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `character_battleground_random`
+--
+
+DROP TABLE IF EXISTS `character_battleground_random`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `character_battleground_random` (
+  `guid` int(11) unsigned NOT NULL default '0',
+  PRIMARY KEY  (`guid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `character_battleground_random`
+--
+
+LOCK TABLES `character_battleground_random` WRITE;
+/*!40000 ALTER TABLE `character_battleground_random` DISABLE KEYS */;
+/*!40000 ALTER TABLE `character_battleground_random` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `character_declinedname`
+--
+
+DROP TABLE IF EXISTS `character_declinedname`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `character_declinedname` (
+  `guid` int(11) unsigned NOT NULL default '0' COMMENT 'Global Unique Identifier',
+  `genitive` varchar(15) NOT NULL default '',
+  `dative` varchar(15) NOT NULL default '',
+  `accusative` varchar(15) NOT NULL default '',
+  `instrumental` varchar(15) NOT NULL default '',
+  `prepositional` varchar(15) NOT NULL default '',
+  PRIMARY KEY  (`guid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `character_declinedname`
+--
+
+LOCK TABLES `character_declinedname` WRITE;
+/*!40000 ALTER TABLE `character_declinedname` DISABLE KEYS */;
+/*!40000 ALTER TABLE `character_declinedname` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `character_equipmentsets`
+--
+
+DROP TABLE IF EXISTS `character_equipmentsets`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `character_equipmentsets` (
+  `guid` int(11) NOT NULL default '0',
+  `setguid` bigint(20) NOT NULL auto_increment,
+  `setindex` tinyint(4) NOT NULL default '0',
+  `name` varchar(100) NOT NULL,
+  `iconname` varchar(100) NOT NULL,
+  `item0` int(11) NOT NULL default '0',
+  `item1` int(11) NOT NULL default '0',
+  `item2` int(11) NOT NULL default '0',
+  `item3` int(11) NOT NULL default '0',
+  `item4` int(11) NOT NULL default '0',
+  `item5` int(11) NOT NULL default '0',
+  `item6` int(11) NOT NULL default '0',
+  `item7` int(11) NOT NULL default '0',
+  `item8` int(11) NOT NULL default '0',
+  `item9` int(11) NOT NULL default '0',
+  `item10` int(11) NOT NULL default '0',
+  `item11` int(11) NOT NULL default '0',
+  `item12` int(11) NOT NULL default '0',
+  `item13` int(11) NOT NULL default '0',
+  `item14` int(11) NOT NULL default '0',
+  `item15` int(11) NOT NULL default '0',
+  `item16` int(11) NOT NULL default '0',
+  `item17` int(11) NOT NULL default '0',
+  `item18` int(11) NOT NULL default '0',
+  PRIMARY KEY  (`setguid`),
+  UNIQUE KEY `idx_set` (`guid`,`setguid`,`setindex`),
+  INDEX `Idx_setindex` (`setindex`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `character_equipmentsets`
+--
+
+LOCK TABLES `character_equipmentsets` WRITE;
+/*!40000 ALTER TABLE `character_equipmentsets` DISABLE KEYS */;
+/*!40000 ALTER TABLE `character_equipmentsets` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `character_gifts`
+--
+
+DROP TABLE IF EXISTS `character_gifts`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `character_gifts` (
+  `guid` int(20) unsigned NOT NULL default '0',
+  `item_guid` int(11) unsigned NOT NULL default '0',
+  `entry` int(20) unsigned NOT NULL default '0',
+  `flags` int(20) unsigned NOT NULL default '0',
+  PRIMARY KEY  (`item_guid`),
+  KEY `idx_guid` (`guid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `character_gifts`
+--
+
+LOCK TABLES `character_gifts` WRITE;
+/*!40000 ALTER TABLE `character_gifts` DISABLE KEYS */;
+/*!40000 ALTER TABLE `character_gifts` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `character_glyphs`
+--
+
+DROP TABLE IF EXISTS `character_glyphs`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `character_glyphs` (
+  `guid` int(11) unsigned NOT NULL,
+  `spec` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `glyph1` int(11) unsigned NOT NULL DEFAULT '0',
+  `glyph2` int(11) unsigned DEFAULT '0',
+  `glyph3` int(11) unsigned DEFAULT '0',
+  `glyph4` int(11) unsigned DEFAULT '0',
+  `glyph5` int(11) unsigned DEFAULT '0',
+  `glyph6` int(11) unsigned DEFAULT '0',
+  PRIMARY KEY (`guid`,`spec`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `character_glyphs`
+--
+
+LOCK TABLES `character_glyphs` WRITE;
+/*!40000 ALTER TABLE `character_glyphs` DISABLE KEYS */;
+/*!40000 ALTER TABLE `character_glyphs` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `character_homebind`
+--
+
+DROP TABLE IF EXISTS `character_homebind`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `character_homebind` (
+  `guid` int(11) unsigned NOT NULL default '0' COMMENT 'Global Unique Identifier',
+  `map` int(11) unsigned NOT NULL default '0' COMMENT 'Map Identifier',
+  `zone` int(11) unsigned NOT NULL default '0' COMMENT 'Zone Identifier',
+  `position_x` float NOT NULL default '0',
+  `position_y` float NOT NULL default '0',
+  `position_z` float NOT NULL default '0',
+  PRIMARY KEY  (`guid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Player System';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `character_homebind`
+--
+
+LOCK TABLES `character_homebind` WRITE;
+/*!40000 ALTER TABLE `character_homebind` DISABLE KEYS */;
+/*!40000 ALTER TABLE `character_homebind` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `character_instance`
+--
+
+DROP TABLE IF EXISTS `character_instance`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `character_instance` (
+  `guid` int(11) unsigned NOT NULL default '0',
+  `instance` int(11) unsigned NOT NULL default '0',
+  `permanent` tinyint(1) unsigned NOT NULL default '0',
+  PRIMARY KEY  (`guid`,`instance`),
+  KEY `instance` (`instance`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `character_instance`
+--
+
+LOCK TABLES `character_instance` WRITE;
+/*!40000 ALTER TABLE `character_instance` DISABLE KEYS */;
+/*!40000 ALTER TABLE `character_instance` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `character_inventory`
+--
+
+DROP TABLE IF EXISTS `character_inventory`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `character_inventory` (
+  `guid` int(11) unsigned NOT NULL default '0' COMMENT 'Global Unique Identifier',
+  `bag` int(11) unsigned NOT NULL default '0',
+  `slot` tinyint(3) unsigned NOT NULL default '0',
+  `item` int(11) unsigned NOT NULL default '0' COMMENT 'Item Global Unique Identifier',
+  `item_template` int(11) unsigned NOT NULL default '0' COMMENT 'Item Identifier',
+  PRIMARY KEY  (`item`),
+  KEY `idx_guid` (`guid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Player System';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `character_inventory`
+--
+
+LOCK TABLES `character_inventory` WRITE;
+/*!40000 ALTER TABLE `character_inventory` DISABLE KEYS */;
+/*!40000 ALTER TABLE `character_inventory` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `character_pet`
+--
+
+DROP TABLE IF EXISTS `character_pet`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `character_pet` (
+  `id` int(11) unsigned NOT NULL default '0',
+  `entry` int(11) unsigned NOT NULL default '0',
+  `owner` int(11) unsigned NOT NULL default '0',
+  `modelid` int(11) unsigned default '0',
+  `CreatedBySpell` int(11) unsigned NOT NULL default '0',
+  `PetType` tinyint(3) unsigned NOT NULL default '0',
+  `level` int(11) unsigned NOT NULL default '1',
+  `exp` int(11) unsigned NOT NULL default '0',
+  `Reactstate` tinyint(1) unsigned NOT NULL default '0',
+  `name` varchar(100) default 'Pet',
+  `renamed` tinyint(1) unsigned NOT NULL default '0',
+  `slot` int(11) unsigned NOT NULL default '0',
+  `curhealth` int(11) unsigned NOT NULL default '1',
+  `curmana` int(11) unsigned NOT NULL default '0',
+  `curhappiness` int(11) unsigned NOT NULL default '0',
+  `savetime` bigint(20) unsigned NOT NULL default '0',
+  `resettalents_cost` int(11) unsigned NOT NULL default '0',
+  `resettalents_time` bigint(20) unsigned NOT NULL default '0',
+  `abdata` longtext,
+  PRIMARY KEY  (`id`),
+  KEY `owner` (`owner`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Pet System';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `character_pet`
+--
+
+LOCK TABLES `character_pet` WRITE;
+/*!40000 ALTER TABLE `character_pet` DISABLE KEYS */;
+/*!40000 ALTER TABLE `character_pet` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `character_pet_declinedname`
+--
+
+DROP TABLE IF EXISTS `character_pet_declinedname`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `character_pet_declinedname` (
+  `id` int(11) unsigned NOT NULL default '0',
+  `owner` int(11) unsigned NOT NULL default '0',
+  `genitive` varchar(12) NOT NULL default '',
+  `dative` varchar(12) NOT NULL default '',
+  `accusative` varchar(12) NOT NULL default '',
+  `instrumental` varchar(12) NOT NULL default '',
+  `prepositional` varchar(12) NOT NULL default '',
+  PRIMARY KEY  (`id`),
+  KEY owner_key (`owner`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `character_pet_declinedname`
+--
+
+LOCK TABLES `character_pet_declinedname` WRITE;
+/*!40000 ALTER TABLE `character_pet_declinedname` DISABLE KEYS */;
+/*!40000 ALTER TABLE `character_pet_declinedname` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `character_queststatus`
+--
+
+DROP TABLE IF EXISTS `character_queststatus`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `character_queststatus` (
+  `guid` int(11) unsigned NOT NULL default '0' COMMENT 'Global Unique Identifier',
+  `quest` int(11) unsigned NOT NULL default '0' COMMENT 'Quest Identifier',
+  `status` int(11) unsigned NOT NULL default '0',
+  `rewarded` tinyint(1) unsigned NOT NULL default '0',
+  `explored` tinyint(1) unsigned NOT NULL default '0',
+  `timer` bigint(20) unsigned NOT NULL default '0',
+  `mobcount1` int(11) unsigned NOT NULL default '0',
+  `mobcount2` int(11) unsigned NOT NULL default '0',
+  `mobcount3` int(11) unsigned NOT NULL default '0',
+  `mobcount4` int(11) unsigned NOT NULL default '0',
+  `itemcount1` int(11) unsigned NOT NULL default '0',
+  `itemcount2` int(11) unsigned NOT NULL default '0',
+  `itemcount3` int(11) unsigned NOT NULL default '0',
+  `itemcount4` int(11) unsigned NOT NULL default '0',
+  PRIMARY KEY  (`guid`,`quest`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Player System';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `character_queststatus`
+--
+
+LOCK TABLES `character_queststatus` WRITE;
+/*!40000 ALTER TABLE `character_queststatus` DISABLE KEYS */;
+/*!40000 ALTER TABLE `character_queststatus` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `character_queststatus_daily`
+--
+
+DROP TABLE IF EXISTS `character_queststatus_daily`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `character_queststatus_daily` (
+  `guid` int(11) unsigned NOT NULL default '0' COMMENT 'Global Unique Identifier',
+  `quest` int(11) unsigned NOT NULL default '0' COMMENT 'Quest Identifier',
+  `time` bigint(20) unsigned NOT NULL default '0',
+  PRIMARY KEY  (`guid`,`quest`),
+  KEY `idx_guid` (`guid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Player System';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `character_queststatus_daily`
+--
+
+LOCK TABLES `character_queststatus_daily` WRITE;
+/*!40000 ALTER TABLE `character_queststatus_daily` DISABLE KEYS */;
+/*!40000 ALTER TABLE `character_queststatus_daily` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `character_queststatus_weekly`
+--
+
+DROP TABLE IF EXISTS `character_queststatus_weekly`;
+CREATE TABLE `character_queststatus_weekly` (
+  `guid` int(11) unsigned NOT NULL default '0' COMMENT 'Global Unique Identifier',
+  `quest` int(11) unsigned NOT NULL default '0' COMMENT 'Quest Identifier',
+  PRIMARY KEY  (`guid`,`quest`),
+  KEY `idx_guid` (`guid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Player System';
+
+--
+-- Dumping data for table `character_queststatus_weekly`
+--
+
+LOCK TABLES `character_queststatus_weekly` WRITE;
+/*!40000 ALTER TABLE `character_queststatus_weekly` DISABLE KEYS */;
+/*!40000 ALTER TABLE `character_queststatus_weekly` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `character_reputation`
+--
+
+DROP TABLE IF EXISTS `character_reputation`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `character_reputation` (
+  `guid` int(11) unsigned NOT NULL default '0' COMMENT 'Global Unique Identifier',
+  `faction` int(11) unsigned NOT NULL default '0',
+  `standing` int(11) NOT NULL default '0',
+  `flags` int(11) NOT NULL default '0',
+  PRIMARY KEY  (`guid`,`faction`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Player System';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `character_reputation`
+--
+
+LOCK TABLES `character_reputation` WRITE;
+/*!40000 ALTER TABLE `character_reputation` DISABLE KEYS */;
+/*!40000 ALTER TABLE `character_reputation` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `character_skills`
+--
+
+DROP TABLE IF EXISTS `character_skills`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `character_skills` (
+  `guid` int(11) unsigned NOT NULL COMMENT 'Global Unique Identifier',
+  `skill` mediumint(9) unsigned NOT NULL,
+  `value` mediumint(9) unsigned NOT NULL,
+  `max` mediumint(9) unsigned NOT NULL,
+  PRIMARY KEY  (`guid`,`skill`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Player System';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `character_skills`
+--
+
+LOCK TABLES `character_skills` WRITE;
+/*!40000 ALTER TABLE `character_skills` DISABLE KEYS */;
+/*!40000 ALTER TABLE `character_skills` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `character_social`
+--
+
+DROP TABLE IF EXISTS `character_social`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `character_social` (
+  `guid` int(11) unsigned NOT NULL default '0' COMMENT 'Character Global Unique Identifier',
+  `friend` int(11) unsigned NOT NULL default '0' COMMENT 'Friend Global Unique Identifier',
+  `flags` tinyint(1) unsigned NOT NULL default '0' COMMENT 'Friend Flags',
+  `note` varchar(48) NOT NULL DEFAULT '' COMMENT 'Friend Note',
+  PRIMARY KEY  (`guid`,`friend`,`flags`),
+  KEY `guid` (`guid`),
+  KEY `friend` (`friend`),
+  KEY `guid_flags` (`guid`,`flags`),
+  KEY `friend_flags` (`friend`,`flags`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Player System';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `character_social`
+--
+
+LOCK TABLES `character_social` WRITE;
+/*!40000 ALTER TABLE `character_social` DISABLE KEYS */;
+/*!40000 ALTER TABLE `character_social` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `character_spell`
+--
+
+DROP TABLE IF EXISTS `character_spell`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `character_spell` (
+  `guid` int(11) unsigned NOT NULL default '0' COMMENT 'Global Unique Identifier',
+  `spell` int(11) unsigned NOT NULL default '0' COMMENT 'Spell Identifier',
+  `active` tinyint(3) unsigned NOT NULL default '1',
+  `disabled` tinyint(3) unsigned NOT NULL default '0',
+  PRIMARY KEY  (`guid`,`spell`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Player System';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `character_spell`
+--
+
+LOCK TABLES `character_spell` WRITE;
+/*!40000 ALTER TABLE `character_spell` DISABLE KEYS */;
+/*!40000 ALTER TABLE `character_spell` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `character_spell_cooldown`
+--
+
+DROP TABLE IF EXISTS `character_spell_cooldown`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `character_spell_cooldown` (
+  `guid` int(11) unsigned NOT NULL default '0' COMMENT 'Global Unique Identifier, Low part',
+  `spell` int(11) unsigned NOT NULL default '0' COMMENT 'Spell Identifier',
+  `item` int(11) unsigned NOT NULL default '0' COMMENT 'Item Identifier',
+  `time` bigint(20) unsigned NOT NULL default '0',
+  PRIMARY KEY  (`guid`,`spell`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `character_spell_cooldown`
+--
+
+LOCK TABLES `character_spell_cooldown` WRITE;
+/*!40000 ALTER TABLE `character_spell_cooldown` DISABLE KEYS */;
+/*!40000 ALTER TABLE `character_spell_cooldown` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `character_stats`
+--
+
+DROP TABLE IF EXISTS `character_stats`;
+CREATE TABLE `character_stats` (
+  `guid` int(11) unsigned NOT NULL default '0' COMMENT 'Global Unique Identifier, Low part',
+  `maxhealth` int(10) UNSIGNED NOT NULL default '0',
+  `maxpower1` int(10) UNSIGNED NOT NULL default '0',
+  `maxpower2` int(10) UNSIGNED NOT NULL default '0',
+  `maxpower3` int(10) UNSIGNED NOT NULL default '0',
+  `maxpower4` int(10) UNSIGNED NOT NULL default '0',
+  `maxpower5` int(10) UNSIGNED NOT NULL default '0',
+  `maxpower6` int(10) UNSIGNED NOT NULL default '0',
+  `maxpower7` int(10) UNSIGNED NOT NULL default '0',
+  `strength` int(10) UNSIGNED NOT NULL default '0',
+  `agility` int(10) UNSIGNED NOT NULL default '0',
+  `stamina` int(10) UNSIGNED NOT NULL default '0',
+  `intellect` int(10) UNSIGNED NOT NULL default '0',
+  `spirit` int(10) UNSIGNED NOT NULL default '0',
+  `armor` int(10) UNSIGNED NOT NULL default '0',
+  `resHoly` int(10) UNSIGNED NOT NULL default '0',
+  `resFire` int(10) UNSIGNED NOT NULL default '0',
+  `resNature` int(10) UNSIGNED NOT NULL default '0',
+  `resFrost` int(10) UNSIGNED NOT NULL default '0',
+  `resShadow` int(10) UNSIGNED NOT NULL default '0',
+  `resArcane` int(10) UNSIGNED NOT NULL default '0',
+  `blockPct` float UNSIGNED NOT NULL default '0',
+  `dodgePct` float UNSIGNED NOT NULL default '0',
+  `parryPct` float UNSIGNED NOT NULL default '0',
+  `critPct` float UNSIGNED NOT NULL default '0',  
+  `rangedCritPct` float UNSIGNED NOT NULL default '0',
+  `spellCritPct` float UNSIGNED NOT NULL default '0',
+  `attackPower` int(10) UNSIGNED NOT NULL default '0',
+  `rangedAttackPower` int(10) UNSIGNED NOT NULL default '0',
+  `spellPower` int(10) UNSIGNED NOT NULL default '0',
+   
+  PRIMARY KEY  (`guid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+--
+-- Dumping data for table `character_stats`
+--
+
+LOCK TABLES `character_stats` WRITE;
+/*!40000 ALTER TABLE `character_stats` DISABLE KEYS */;
+/*!40000 ALTER TABLE `character_stats` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `character_talent`
+--
+
+DROP TABLE IF EXISTS `character_talent`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `character_talent` (
+  `guid` int(11) unsigned NOT NULL,
+  `spell` int(11) unsigned NOT NULL,
+  `spec` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`guid`,`spell`,`spec`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `character_talent`
+--
+
+LOCK TABLES `character_talent` WRITE;
+/*!40000 ALTER TABLE `character_talent` DISABLE KEYS */;
+/*!40000 ALTER TABLE `character_talent` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `character_tutorial`
+--
+
+DROP TABLE IF EXISTS `character_tutorial`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `character_tutorial` (
+  `account` bigint(20) unsigned NOT NULL auto_increment COMMENT 'Account Identifier',
+  `realmid` int(11) unsigned NOT NULL default '0' COMMENT 'Realm Identifier',
+  `tut0` int(11) unsigned NOT NULL default '0',
+  `tut1` int(11) unsigned NOT NULL default '0',
+  `tut2` int(11) unsigned NOT NULL default '0',
+  `tut3` int(11) unsigned NOT NULL default '0',
+  `tut4` int(11) unsigned NOT NULL default '0',
+  `tut5` int(11) unsigned NOT NULL default '0',
+  `tut6` int(11) unsigned NOT NULL default '0',
+  `tut7` int(11) unsigned NOT NULL default '0',
+  PRIMARY KEY  (`account`,`realmid`),
+  KEY acc_key (`account`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Player System';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `character_tutorial`
+--
+
+LOCK TABLES `character_tutorial` WRITE;
+/*!40000 ALTER TABLE `character_tutorial` DISABLE KEYS */;
+/*!40000 ALTER TABLE `character_tutorial` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `corpse`
+--
+
+DROP TABLE IF EXISTS `corpse`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `corpse` (
+  `guid` int(11) unsigned NOT NULL default '0' COMMENT 'Global Unique Identifier',
+  `player` int(11) unsigned NOT NULL default '0' COMMENT 'Character Global Unique Identifier',
+  `position_x` float NOT NULL default '0',
+  `position_y` float NOT NULL default '0',
+  `position_z` float NOT NULL default '0',
+  `orientation` float NOT NULL default '0',
+  `zone` int(11) unsigned NOT NULL default '38' COMMENT 'Zone Identifier',
+  `map` int(11) unsigned NOT NULL default '0' COMMENT 'Map Identifier',
+  `phaseMask` smallint(5) unsigned NOT NULL default '1',
+  `data` longtext,
+  `time` bigint(20) unsigned NOT NULL default '0',
+  `corpse_type` tinyint(3) unsigned NOT NULL default '0',
+  `instance` int(11) unsigned NOT NULL default '0',
+  PRIMARY KEY  (`guid`),
+  KEY `idx_type` (`corpse_type`),
+  KEY `instance` (`instance`),
+  INDEX `Idx_player`(`player`),
+  INDEX `Idx_time`(`time`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Death System';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `corpse`
+--
+
+LOCK TABLES `corpse` WRITE;
+/*!40000 ALTER TABLE `corpse` DISABLE KEYS */;
+/*!40000 ALTER TABLE `corpse` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `game_event_condition_save`
+--
+
+DROP TABLE IF EXISTS `game_event_condition_save`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `game_event_condition_save` (
+  `event_id` mediumint(8) unsigned NOT NULL,
+  `condition_id` mediumint(8) unsigned NOT NULL default '0',
+  `done` float default '0',
+  PRIMARY KEY  (`event_id`,`condition_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `game_event_condition_save`
+--
+
+LOCK TABLES `game_event_condition_save` WRITE;
+/*!40000 ALTER TABLE `game_event_condition_save` DISABLE KEYS */;
+/*!40000 ALTER TABLE `game_event_condition_save` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `game_event_save`
+--
+
+DROP TABLE IF EXISTS `game_event_save`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `game_event_save` (
+  `event_id` mediumint(8) unsigned NOT NULL,
+  `state` tinyint(3) unsigned NOT NULL default '1',
+  `next_start` timestamp NOT NULL default '0000-00-00 00:00:00',
+  PRIMARY KEY  (`event_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `game_event_save`
+--
+
+LOCK TABLES `game_event_save` WRITE;
+/*!40000 ALTER TABLE `game_event_save` DISABLE KEYS */;
+/*!40000 ALTER TABLE `game_event_save` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `gm_tickets`
+--
+
+DROP TABLE IF EXISTS `gm_tickets`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `gm_tickets` (
+  `guid` int(10) NOT NULL auto_increment,
+  `playerGuid` int(11) unsigned NOT NULL default '0',
+  `name` varchar(15) NOT NULL,
+  `message` text NOT NULL,
+  `createtime` int(10) NOT NULL default '0',
+  `map` int NOT NULL DEFAULT '0',
+  `posX` float NOT NULL DEFAULT '0',
+  `posY` float NOT NULL DEFAULT '0',
+  `posZ` float NOT NULL DEFAULT '0',
+  `timestamp` int(10) NOT NULL default '0',
+  `closed` int(10) NOT NULL default '0',
+  `assignedto` int(10) NOT NULL default '0',
+  `comment` text NOT NULL,
+  PRIMARY KEY  (`guid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Player System';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `gm_tickets`
+--
+
+LOCK TABLES `gm_tickets` WRITE;
+/*!40000 ALTER TABLE `gm_tickets` DISABLE KEYS */;
+/*!40000 ALTER TABLE `gm_tickets` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `group_instance`
+--
+
+DROP TABLE IF EXISTS `group_instance`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `group_instance` (
+  `guid` int(11) unsigned NOT NULL default '0',
+  `instance` int(11) unsigned NOT NULL default '0',
+  `permanent` tinyint(1) unsigned NOT NULL default '0',
+  PRIMARY KEY  (`guid`,`instance`),
+  KEY `instance` (`instance`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `group_instance`
+--
+
+LOCK TABLES `group_instance` WRITE;
+/*!40000 ALTER TABLE `group_instance` DISABLE KEYS */;
+/*!40000 ALTER TABLE `group_instance` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `group_member`
+--
+
+DROP TABLE IF EXISTS `group_member`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `group_member` (
+  `guid` int(11) unsigned NOT NULL,
+  `memberGuid` int(11) unsigned NOT NULL,
+  `memberFlags` tinyint(2) unsigned NOT NULL,
+  `subgroup` smallint(6) unsigned NOT NULL,
+  PRIMARY KEY  (`memberGuid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Groups';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `group_member`
+--
+
+LOCK TABLES `group_member` WRITE;
+/*!40000 ALTER TABLE `group_member` DISABLE KEYS */;
+/*!40000 ALTER TABLE `group_member` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `groups`
+--
+
+DROP TABLE IF EXISTS `groups`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `groups` (
+  `guid` int(11) unsigned NOT NULL,
+  `leaderGuid` int(11) unsigned NOT NULL,
+  `lootMethod` tinyint(4) unsigned NOT NULL,
+  `looterGuid` int(11) unsigned NOT NULL,
+  `lootThreshold` tinyint(4) unsigned NOT NULL,
+  `icon1` int(11) unsigned NOT NULL,
+  `icon2` int(11) unsigned NOT NULL,
+  `icon3` int(11) unsigned NOT NULL,
+  `icon4` int(11) unsigned NOT NULL,
+  `icon5` int(11) unsigned NOT NULL,
+  `icon6` int(11) unsigned NOT NULL,
+  `icon7` int(11) unsigned NOT NULL,
+  `icon8` int(11) unsigned NOT NULL,
+  `groupType` mediumint(8) unsigned NOT NULL,
+  `difficulty` tinyint(3) unsigned NOT NULL default '0',
+  `raiddifficulty` int(11) UNSIGNED NOT NULL default '0',
+  PRIMARY KEY  (`guid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Groups';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `groups`
+--
+
+LOCK TABLES `groups` WRITE;
+/*!40000 ALTER TABLE `groups` DISABLE KEYS */;
+/*!40000 ALTER TABLE `groups` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `guild`
+--
+
+DROP TABLE IF EXISTS `guild`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `guild` (
+  `guildid` int(6) unsigned NOT NULL default '0',
+  `name` varchar(255) NOT NULL default '',
+  `leaderguid` int(6) unsigned NOT NULL default '0',
+  `EmblemStyle` int(5) NOT NULL default '0',
+  `EmblemColor` int(5) NOT NULL default '0',
+  `BorderStyle` int(5) NOT NULL default '0',
+  `BorderColor` int(5) NOT NULL default '0',
+  `BackgroundColor` int(5) NOT NULL default '0',
+  `info` text NOT NULL,
+  `motd` varchar(255) NOT NULL default '',
+  `createdate` bigint(20) NOT NULL default '0',
+  `BankMoney` bigint(20) NOT NULL default '0',
+  PRIMARY KEY  (`guildid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Guild System';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `guild`
+--
+
+LOCK TABLES `guild` WRITE;
+/*!40000 ALTER TABLE `guild` DISABLE KEYS */;
+/*!40000 ALTER TABLE `guild` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `guild_bank_eventlog`
+--
+
+DROP TABLE IF EXISTS `guild_bank_eventlog`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `guild_bank_eventlog` (
+  `guildid` int(11) unsigned NOT NULL default '0' COMMENT 'Guild Identificator',
+  `LogGuid` int(11) unsigned NOT NULL default '0' COMMENT 'Log record identificator - auxiliary column',
+  `TabId` tinyint(3) unsigned NOT NULL default '0' COMMENT 'Guild bank TabId',
+  `EventType` tinyint(3) unsigned NOT NULL default '0' COMMENT 'Event type',
+  `PlayerGuid` int(11) unsigned NOT NULL default '0',
+  `ItemOrMoney` int(11) unsigned NOT NULL default '0',
+  `ItemStackCount` tinyint(3) unsigned NOT NULL default '0',
+  `DestTabId` tinyint(1) unsigned NOT NULL default '0' COMMENT 'Destination Tab Id',
+  `TimeStamp` bigint(20) unsigned NOT NULL default '0' COMMENT 'Event UNIX time',
+  PRIMARY KEY  (`guildid`,`LogGuid`,`TabId`),
+  KEY `guildid_key` (`guildid`),	
+  INDEX `Idx_PlayerGuid`(`PlayerGuid`),
+  INDEX `Idx_LogGuid`(`LogGuid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `guild_bank_eventlog`
+--
+
+LOCK TABLES `guild_bank_eventlog` WRITE;
+/*!40000 ALTER TABLE `guild_bank_eventlog` DISABLE KEYS */;
+/*!40000 ALTER TABLE `guild_bank_eventlog` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `guild_bank_item`
+--
+
+DROP TABLE IF EXISTS `guild_bank_item`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `guild_bank_item` (
+  `guildid` int(11) unsigned NOT NULL default '0',
+  `TabId` tinyint(1) unsigned NOT NULL default '0',
+  `SlotId` tinyint(3) unsigned NOT NULL default '0',
+  `item_guid` int(11) unsigned NOT NULL default '0',
+  `item_entry` int(11) unsigned NOT NULL default '0',
+  PRIMARY KEY  (`guildid`,`tabid`,`slotid`),
+  KEY `guildid_key` (`guildid`),	
+  INDEX `Idx_item_guid`(`item_guid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `guild_bank_item`
+--
+
+LOCK TABLES `guild_bank_item` WRITE;
+/*!40000 ALTER TABLE `guild_bank_item` DISABLE KEYS */;
+/*!40000 ALTER TABLE `guild_bank_item` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `guild_bank_right`
+--
+
+DROP TABLE IF EXISTS `guild_bank_right`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `guild_bank_right` (
+  `guildid` int(11) unsigned NOT NULL default '0',
+  `TabId` tinyint(1) unsigned NOT NULL default '0',
+  `rid` int(11) unsigned NOT NULL default '0',
+  `gbright` tinyint(3) unsigned NOT NULL default '0',
+  `SlotPerDay` int(11) unsigned NOT NULL default '0',
+  PRIMARY KEY  (`guildid`,`TabId`,`rid`),
+  KEY `guildid_key` (`guildid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `guild_bank_right`
+--
+
+LOCK TABLES `guild_bank_right` WRITE;
+/*!40000 ALTER TABLE `guild_bank_right` DISABLE KEYS */;
+/*!40000 ALTER TABLE `guild_bank_right` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `guild_bank_tab`
+--
+
+DROP TABLE IF EXISTS `guild_bank_tab`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `guild_bank_tab` (
+  `guildid` int(11) unsigned NOT NULL default '0',
+  `TabId` tinyint(1) unsigned NOT NULL default '0',
+  `TabName` varchar(100) NOT NULL default '',
+  `TabIcon` varchar(100) NOT NULL default '',
+  `TabText` text,
+  PRIMARY KEY  (`guildid`,`TabId`),
+  KEY `guildid_key` (`guildid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `guild_bank_tab`
+--
+
+LOCK TABLES `guild_bank_tab` WRITE;
+/*!40000 ALTER TABLE `guild_bank_tab` DISABLE KEYS */;
+/*!40000 ALTER TABLE `guild_bank_tab` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `guild_eventlog`
+--
+
+DROP TABLE IF EXISTS `guild_eventlog`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `guild_eventlog` (
+  `guildid` int(11) NOT NULL COMMENT 'Guild Identificator',
+  `LogGuid` int(11) NOT NULL COMMENT 'Log record identificator - auxiliary column',
+  `EventType` tinyint(1) NOT NULL COMMENT 'Event type',
+  `PlayerGuid1` int(11) NOT NULL COMMENT 'Player 1',
+  `PlayerGuid2` int(11) NOT NULL COMMENT 'Player 2',
+  `NewRank` tinyint(2) NOT NULL COMMENT 'New rank(in case promotion/demotion)',
+  `TimeStamp` bigint(20) NOT NULL COMMENT 'Event UNIX time',
+  PRIMARY KEY (`guildid`, `LogGuid`),
+  INDEX `Idx_PlayerGuid1`(`PlayerGuid1`),
+  INDEX `Idx_PlayerGuid2`(`PlayerGuid2`),
+  INDEX `Idx_LogGuid`(`LogGuid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT 'Guild Eventlog';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `guild_eventlog`
+--
+
+LOCK TABLES `guild_eventlog` WRITE;
+/*!40000 ALTER TABLE `guild_eventlog` DISABLE KEYS */;
+/*!40000 ALTER TABLE `guild_eventlog` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `guild_member`
+--
+
+DROP TABLE IF EXISTS `guild_member`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `guild_member` (
+  `guildid` int(6) unsigned NOT NULL default '0',
+  `guid` int(11) unsigned NOT NULL default '0',
+  `rank` tinyint(2) unsigned NOT NULL default '0',
+  `pnote` varchar(255) NOT NULL default '',
+  `offnote` varchar(255) NOT NULL default '',
+  `BankResetTimeMoney` int(11) unsigned NOT NULL default '0',
+  `BankRemMoney` int(11) unsigned NOT NULL default '0',
+  `BankResetTimeTab0` int(11) unsigned NOT NULL default '0',
+  `BankRemSlotsTab0` int(11) unsigned NOT NULL default '0',
+  `BankResetTimeTab1` int(11) unsigned NOT NULL default '0',
+  `BankRemSlotsTab1` int(11) unsigned NOT NULL default '0',
+  `BankResetTimeTab2` int(11) unsigned NOT NULL default '0',
+  `BankRemSlotsTab2` int(11) unsigned NOT NULL default '0',
+  `BankResetTimeTab3` int(11) unsigned NOT NULL default '0',
+  `BankRemSlotsTab3` int(11) unsigned NOT NULL default '0',
+  `BankResetTimeTab4` int(11) unsigned NOT NULL default '0',
+  `BankRemSlotsTab4` int(11) unsigned NOT NULL default '0',
+  `BankResetTimeTab5` int(11) unsigned NOT NULL default '0',
+  `BankRemSlotsTab5` int(11) unsigned NOT NULL default '0',
+  KEY `guildid_key` (`guildid`),
+  KEY `guildid_rank_key` (`guildid`,`rank`),
+  UNIQUE KEY `guid_key` (`guid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Guild System';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `guild_member`
+--
+
+LOCK TABLES `guild_member` WRITE;
+/*!40000 ALTER TABLE `guild_member` DISABLE KEYS */;
+/*!40000 ALTER TABLE `guild_member` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `guild_rank`
+--
+
+DROP TABLE IF EXISTS `guild_rank`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `guild_rank` (
+  `guildid` int(6) unsigned NOT NULL default '0',
+  `rid` int(11) unsigned NOT NULL,
+  `rname` varchar(255) NOT NULL default '',
+  `rights` int(3) unsigned NOT NULL default '0',
+  `BankMoneyPerDay` int(11) unsigned NOT NULL default '0',
+  PRIMARY KEY  (`guildid`,`rid`),
+  INDEX `Idx_rid`(`rid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Guild System';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `guild_rank`
+--
+
+LOCK TABLES `guild_rank` WRITE;
+/*!40000 ALTER TABLE `guild_rank` DISABLE KEYS */;
+/*!40000 ALTER TABLE `guild_rank` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `instance`
+--
+
+DROP TABLE IF EXISTS `instance`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `instance` (
+  `id` int(11) unsigned NOT NULL default '0',
+  `map` int(11) unsigned NOT NULL default '0',
+  `resettime` bigint(40) NOT NULL default '0',
+  `difficulty` tinyint(1) unsigned NOT NULL default '0',
+  `data` longtext,
+  PRIMARY KEY  (`id`),
+  KEY `map` (`map`),
+  KEY `resettime` (`resettime`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `instance`
+--
+
+LOCK TABLES `instance` WRITE;
+/*!40000 ALTER TABLE `instance` DISABLE KEYS */;
+/*!40000 ALTER TABLE `instance` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `instance_reset`
+--
+
+DROP TABLE IF EXISTS `instance_reset`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `instance_reset` (
+  `mapid` int(11) unsigned NOT NULL default '0',
+  `difficulty` tinyint(1) unsigned NOT NULL default '0',
+  `resettime` bigint(40) NOT NULL default '0',
+  PRIMARY KEY  (`mapid`,`difficulty`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `instance_reset`
+--
+
+LOCK TABLES `instance_reset` WRITE;
+/*!40000 ALTER TABLE `instance_reset` DISABLE KEYS */;
+/*!40000 ALTER TABLE `instance_reset` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `item_instance`
+--
+
+DROP TABLE IF EXISTS `item_instance`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `item_instance` (
+  `guid` int(11) unsigned NOT NULL default '0',
+  `owner_guid` int(11) unsigned NOT NULL default '0',
+  `data` longtext,
+  `text` longtext,
+  PRIMARY KEY  (`guid`),
+  KEY `idx_owner_guid` (`owner_guid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Item System';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `item_instance`
+--
+
+LOCK TABLES `item_instance` WRITE;
+/*!40000 ALTER TABLE `item_instance` DISABLE KEYS */;
+/*!40000 ALTER TABLE `item_instance` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `item_refund_instance`
+--
+
+DROP TABLE IF EXISTS `item_refund_instance`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `item_refund_instance` (
+  `item_guid` int(11) unsigned NOT NULL COMMENT 'Item GUID',
+  `player_guid` int(11) unsigned NOT NULL COMMENT 'Player GUID',
+  `paidMoney` int(11) unsigned NOT NULL DEFAULT '0',
+  `paidExtendedCost` int(11) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`item_guid`,`player_guid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Item Refund System';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `item_refund_instance`
+--
+
+LOCK TABLES `item_refund_instance` WRITE;
+/*!40000 ALTER TABLE `item_refund_instance` DISABLE KEYS */;
+/*!40000 ALTER TABLE `item_refund_instance` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `mail`
+--
+
+DROP TABLE IF EXISTS `mail`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `mail` (
+  `id` int(11) unsigned NOT NULL default '0' COMMENT 'Identifier',
+  `messageType` tinyint(3) unsigned NOT NULL default '0',
+  `stationery` tinyint(3) NOT NULL default '41',
+  `mailTemplateId` mediumint(8) unsigned NOT NULL default '0',
+  `sender` int(11) unsigned NOT NULL default '0' COMMENT 'Character Global Unique Identifier',
+  `receiver` int(11) unsigned NOT NULL default '0' COMMENT 'Character Global Unique Identifier',
+  `subject` longtext,
+  `body` longtext,
+  `has_items` tinyint(3) unsigned NOT NULL default '0',
+  `expire_time` bigint(40) NOT NULL default '0',
+  `deliver_time` bigint(40) NOT NULL default '0',
+  `money` int(11) unsigned NOT NULL default '0',
+  `cod` int(11) unsigned NOT NULL default '0',
+  `checked` tinyint(3) unsigned NOT NULL default '0',
+  PRIMARY KEY  (`id`),
+  KEY `idx_receiver` (`receiver`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Mail System';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `mail`
+--
+
+LOCK TABLES `mail` WRITE;
+/*!40000 ALTER TABLE `mail` DISABLE KEYS */;
+/*!40000 ALTER TABLE `mail` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `mail_items`
+--
+
+DROP TABLE IF EXISTS `mail_items`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `mail_items` (
+  `mail_id` int(11) NOT NULL default '0',
+  `item_guid` int(11) NOT NULL default '0',
+  `item_template` int(11) NOT NULL default '0',
+  `receiver` int(11) unsigned NOT NULL default '0' COMMENT 'Character Global Unique Identifier',
+  PRIMARY KEY  (`mail_id`,`item_guid`),
+  KEY `idx_receiver` (`receiver`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `mail_items`
+--
+
+LOCK TABLES `mail_items` WRITE;
+/*!40000 ALTER TABLE `mail_items` DISABLE KEYS */;
+/*!40000 ALTER TABLE `mail_items` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `pet_aura`
+--
+
+DROP TABLE IF EXISTS `pet_aura`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `pet_aura` (
+  `guid` int(11) unsigned NOT NULL default '0' COMMENT 'Global Unique Identifier',
+  `caster_guid` bigint(20) unsigned NOT NULL default '0' COMMENT 'Full Global Unique Identifier',
+  `spell` int(11) unsigned NOT NULL default '0',
+  `effect_mask` tinyint(3) unsigned NOT NULL default '0',
+  `recalculate_mask` tinyint(3) unsigned NOT NULL default '0',
+  `stackcount` tinyint(3) unsigned NOT NULL default '1',
+  `amount0` int(11) NOT NULL default '0',
+  `amount1` int(11) NOT NULL default '0',
+  `amount2` int(11) NOT NULL default '0',
+  `base_amount0` int(11) NOT NULL default '0',
+  `base_amount1` int(11) NOT NULL default '0',
+  `base_amount2` int(11) NOT NULL default '0',
+  `maxduration` int(11) NOT NULL default '0',
+  `remaintime` int(11) NOT NULL default '0',
+  `remaincharges` tinyint(3) unsigned NOT NULL default '0',
+  PRIMARY KEY  (`guid`,`spell`,`effect_mask`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Pet System';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `pet_aura`
+--
+
+LOCK TABLES `pet_aura` WRITE;
+/*!40000 ALTER TABLE `pet_aura` DISABLE KEYS */;
+/*!40000 ALTER TABLE `pet_aura` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `pet_spell`
+--
+
+DROP TABLE IF EXISTS `pet_spell`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `pet_spell` (
+  `guid` int(11) unsigned NOT NULL default '0' COMMENT 'Global Unique Identifier',
+  `spell` int(11) unsigned NOT NULL default '0' COMMENT 'Spell Identifier',
+  `active` int(11) unsigned NOT NULL default '0',
+  PRIMARY KEY  (`guid`,`spell`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Pet System';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `pet_spell`
+--
+
+LOCK TABLES `pet_spell` WRITE;
+/*!40000 ALTER TABLE `pet_spell` DISABLE KEYS */;
+/*!40000 ALTER TABLE `pet_spell` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `pet_spell_cooldown`
+--
+
+DROP TABLE IF EXISTS `pet_spell_cooldown`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `pet_spell_cooldown` (
+  `guid` int(11) unsigned NOT NULL default '0' COMMENT 'Global Unique Identifier, Low part',
+  `spell` int(11) unsigned NOT NULL default '0' COMMENT 'Spell Identifier',
+  `time` bigint(20) unsigned NOT NULL default '0',
+  PRIMARY KEY  (`guid`,`spell`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `pet_spell_cooldown`
+--
+
+LOCK TABLES `pet_spell_cooldown` WRITE;
+/*!40000 ALTER TABLE `pet_spell_cooldown` DISABLE KEYS */;
+/*!40000 ALTER TABLE `pet_spell_cooldown` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `petition`
+--
+
+DROP TABLE IF EXISTS `petition`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `petition` (
+  `ownerguid` int(10) unsigned NOT NULL,
+  `petitionguid` int(10) unsigned default '0',
+  `name` varchar(255) NOT NULL default '',
+  `type` int(10) unsigned NOT NULL default '0',
+  PRIMARY KEY  (`ownerguid`,`type`),
+  UNIQUE KEY `index_ownerguid_petitionguid` (`ownerguid`,`petitionguid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Guild System';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `petition`
+--
+
+LOCK TABLES `petition` WRITE;
+/*!40000 ALTER TABLE `petition` DISABLE KEYS */;
+/*!40000 ALTER TABLE `petition` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `petition_sign`
+--
+
+DROP TABLE IF EXISTS `petition_sign`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `petition_sign` (
+  `ownerguid` int(10) unsigned NOT NULL,
+  `petitionguid` int(11) unsigned NOT NULL default '0',
+  `playerguid` int(11) unsigned NOT NULL default '0',
+  `player_account` int(11) unsigned NOT NULL default '0',
+  `type` int(10) unsigned NOT NULL default '0',
+  PRIMARY KEY  (`petitionguid`,`playerguid`),
+  INDEX `Idx_playerguid`(`playerguid`),	
+  INDEX `Idx_ownerguid`(`ownerguid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Guild System';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `petition_sign`
+--
+
+LOCK TABLES `petition_sign` WRITE;
+/*!40000 ALTER TABLE `petition_sign` DISABLE KEYS */;
+/*!40000 ALTER TABLE `petition_sign` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `worldstates`
+--
+
+DROP TABLE IF EXISTS `worldstates`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `worldstates` (
+  `entry` mediumint(11) UNSIGNED NOT NULL DEFAULT '0',
+  `value` bigint(40) UNSIGNED NOT NULL DEFAULT '0',
+  `comment` text,
+  PRIMARY KEY  (`entry`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Variable Saves';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `worldstates`
+--
+
+LOCK TABLES `worldstates` WRITE;
+/*!40000 ALTER TABLE `worldstates` DISABLE KEYS */;
+INSERT INTO `worldstates` (`entry`,`value`, `comment`) VALUES 
+(20001, 0, 'NextArenaPointDistributionTime'),
+(20002, 0, 'NextWeeklyQuestResetTime'),
+(20003, 0, 'NextBGRandomDailyResetTime');
+/*!40000 ALTER TABLE `worldstates` ENABLE KEYS */;
+UNLOCK TABLES;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+
+-- Dump completed on 2008-01-10 11:37:06
+
+-- Updated on 2010-01-29 23:05:45 GMT+1
diff --git a/src/server/authserver/authserver.conf.dist b/src/server/authserver/authserver.conf.dist
index e98b9386878..33e2db43df3 100644
--- a/src/server/authserver/authserver.conf.dist
+++ b/src/server/authserver/authserver.conf.dist
@@ -125,14 +125,14 @@
 #
 ###############################################################################
 
-LoginDatabaseInfo = "127.0.0.1;3306;trinity;trinity;realmd"
+LoginDatabaseInfo = "127.0.0.1;3306;trinity;trinity;auth"
 LogsDir = ""
 MaxPingTime = 30
 RealmServerPort = 3724
 BindIP = "0.0.0.0"
 PidFile = ""
 LogLevel = 0
-LogFile = "realmd.log"
+LogFile = "auth.log"
 LogTimestamp = 0
 LogFileLevel = 0
 LogColors = ""
diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist
index 6811c3ed9ea..8c53993d3f0 100644
--- a/src/server/worldserver/worldserver.conf.dist
+++ b/src/server/worldserver/worldserver.conf.dist
@@ -48,7 +48,7 @@
 RealmID = 1
 DataDir = "."
 LogsDir = ""
-LoginDatabaseInfo     = "127.0.0.1;3306;trinity;trinity;realmd"
+LoginDatabaseInfo     = "127.0.0.1;3306;trinity;trinity;auth"
 WorldDatabaseInfo     = "127.0.0.1;3306;trinity;trinity;world"
 CharacterDatabaseInfo = "127.0.0.1;3306;trinity;trinity;characters"
 MaxPingTime = 30
-- 
cgit v1.2.3


From e54e153e2e2fbefb93fba10373efc36e74aa483b Mon Sep 17 00:00:00 2001
From: Tartalo 
Date: Tue, 13 Jul 2010 10:31:58 +0200
Subject: Tools, vmap3_extractor: Add missing locales support, by Lynx3d Closes
 issue #2813

--HG--
branch : trunk
---
 src/tools/vmap3_extractor/vmapexport.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src')

diff --git a/src/tools/vmap3_extractor/vmapexport.cpp b/src/tools/vmap3_extractor/vmapexport.cpp
index b82f9249f07..2be03d85d97 100644
--- a/src/tools/vmap3_extractor/vmapexport.cpp
+++ b/src/tools/vmap3_extractor/vmapexport.cpp
@@ -311,6 +311,11 @@ bool fillArchiveNameVector(std::vector& pArchiveNames)
     searchLocales.push_back("esES");
     searchLocales.push_back("frFR");
     searchLocales.push_back("koKR");
+    searchLocales.push_back("zhCN");
+    searchLocales.push_back("zhTW");
+    searchLocales.push_back("enCN");
+    searchLocales.push_back("enTW");
+    searchLocales.push_back("esMX");
     searchLocales.push_back("ruRU");
 
     for (std::vector::iterator i = searchLocales.begin(); i != searchLocales.end(); ++i)
-- 
cgit v1.2.3


From 3815f19c4f14f2640da198eb8241ae2e6e380f92 Mon Sep 17 00:00:00 2001
From: Shauren 
Date: Tue, 13 Jul 2010 11:10:29 +0200
Subject: Fixed SMSG_BATTLEFIELD_STATUS packet. code by tom_rus.

--HG--
branch : trunk
---
 src/server/game/BattleGrounds/BattleGroundMgr.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/server/game/BattleGrounds/BattleGroundMgr.cpp b/src/server/game/BattleGrounds/BattleGroundMgr.cpp
index d930a4185bc..2450cfe6e24 100644
--- a/src/server/game/BattleGrounds/BattleGroundMgr.cpp
+++ b/src/server/game/BattleGrounds/BattleGroundMgr.cpp
@@ -1269,8 +1269,8 @@ void BattleGroundMgr::BuildBattleGroundStatusPacket(WorldPacket *data, BattleGro
     *data << uint32(bg->GetTypeID());
     *data << uint16(0x1F90);
     // End of uint64 segment, decomposed this way for simplicity
-    *data << uint8(0);                                      // 3.3.0
-    *data << uint8(0);                                      // 3.3.0
+    *data << uint8(0);                                      // 3.3.0, some level, only saw 80...
+    *data << uint8(0);                                      // 3.3.0, some level, only saw 80...
     *data << uint32(bg->GetClientInstanceID());
     // alliance/horde for BG and skirmish/rated for Arenas
     // following displays the minimap-icon 0 = faction icon 1 = arenaicon
@@ -1285,10 +1285,12 @@ void BattleGroundMgr::BuildBattleGroundStatusPacket(WorldPacket *data, BattleGro
             break;
         case STATUS_WAIT_JOIN:                              // status_invite
             *data << uint32(bg->GetMapId());                // map id
+            *data << uint64(0);                             // 3.3.5, unknown
             *data << uint32(Time1);                         // time to remove from queue, milliseconds
             break;
         case STATUS_IN_PROGRESS:                            // status_in_progress
             *data << uint32(bg->GetMapId());                // map id
+            *data << uint64(0);                             // 3.3.5, unknown
             *data << uint32(Time1);                         // time to bg auto leave, 0 at bg start, 120000 after bg end, milliseconds
             *data << uint32(Time2);                         // time from bg start, milliseconds
             *data << uint8(/*bg->isArena() ? 0 :*/ 1);      // unk, possibly 0 == preparation phase, 1 == battle
-- 
cgit v1.2.3


From c783cacbe63023c36e9393d28a574b613ff6b555 Mon Sep 17 00:00:00 2001
From: QAston 
Date: Tue, 13 Jul 2010 21:41:21 +0200
Subject: *Remove unsafe call of Aura::CheckTarget() which was causing aura
 list corruption on some units. *Change the function name to
 Aura::CheckAreaTarget() *Move some functions in SpellAuras.cpp to match order
 from SpellAuras.h

--HG--
branch : trunk
---
 src/server/game/Spells/Auras/SpellAuras.cpp | 147 ++++++++++++++--------------
 src/server/game/Spells/Auras/SpellAuras.h   |   2 +-
 2 files changed, 76 insertions(+), 73 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp
index e3b155dac08..a96471ef0e4 100644
--- a/src/server/game/Spells/Auras/SpellAuras.cpp
+++ b/src/server/game/Spells/Auras/SpellAuras.cpp
@@ -467,8 +467,10 @@ void Aura::UpdateTargetMap(Unit * caster, bool apply)
     for (std::map::iterator itr = targets.begin(); itr!= targets.end();)
     {
         bool addUnit = true;
-        // check target immunities
-        if (itr->first->IsImmunedToSpell(GetSpellProto()))
+        // check target immunities 
+        if (itr->first->IsImmunedToSpell(GetSpellProto()) 
+			// check area target requirements
+			|| (itr->first != GetOwner() && !CheckAreaTarget(itr->first)))
             addUnit = false;
 
         if (addUnit)
@@ -540,7 +542,7 @@ void Aura::_ApplyEffectForTargets(uint8 effIndex)
     UnitList targetList;
     for (ApplicationMap::iterator appIter = m_applications.begin(); appIter != m_applications.end(); ++appIter)
     {
-        if ((appIter->second->GetEffectsToApply() & (1<second->GetTarget()) && !appIter->second->HasEffect(effIndex))
+        if ((appIter->second->GetEffectsToApply() & (1<second->HasEffect(effIndex))
             targetList.push_back(appIter->second->GetTarget());
     }
 
@@ -640,45 +642,6 @@ void Aura::Update(uint32 diff, Unit * caster)
     }
 }
 
-bool Aura::CheckTarget(Unit *target)
-{
-    // some special cases
-    switch(GetId())
-    {
-        case 45828: // AV Marshal's HP/DMG auras
-        case 45829:
-        case 45830:
-        case 45821:
-        case 45822: // AV Warmaster's HP/DMG auras
-        case 45823:
-        case 45824:
-        case 45826:
-            switch(target->GetEntry())
-            {
-                // alliance
-                case 14762: // Dun Baldar North Marshal
-                case 14763: // Dun Baldar South Marshal
-                case 14764: // Icewing Marshal
-                case 14765: // Stonehearth Marshal
-                case 11948: // Vandar Stormspike
-                // horde
-                case 14772: // East Frostwolf Warmaster
-                case 14776: // Tower Point Warmaster
-                case 14773: // Iceblood Warmaster
-                case 14777: // West Frostwolf Warmaster
-                case 11946: // Drek'thar
-                    return true;
-                default:
-                    return false;
-                    break;
-            }
-            break;
-        default:
-            return true;
-            break;
-    }
-}
-
 void Aura::SetDuration(int32 duration, bool withMods)
 {
     if (withMods)
@@ -789,33 +752,6 @@ bool Aura::CanBeSaved() const
     return true;
 }
 
-bool Aura::HasEffectType(AuraType type) const
-{
-    for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i)
-    {
-        if (m_effects[i] && m_effects[i]->GetAuraType() == type)
-            return true;
-    }
-    return false;
-}
-
-void Aura::RecalculateAmountOfEffects()
-{
-    assert (!IsRemoved());
-    Unit * caster = GetCaster();
-    for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i)
-        if (m_effects[i])
-            m_effects[i]->RecalculateAmount(caster);
-}
-
-void Aura::HandleAllEffects(AuraApplication const * aurApp, uint8 mode, bool apply)
-{
-    assert (!IsRemoved());
-    for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i)
-        if (m_effects[i] && !IsRemoved())
-            m_effects[i]->HandleEffect(aurApp, mode, apply);
-}
-
 bool Aura::IsVisible() const
 {
     // Is this blizzlike? show totem passive auras
@@ -850,6 +786,39 @@ void Aura::SetLoadedState(int32 maxduration, int32 duration, int32 charges, uint
         }
 }
 
+bool Aura::HasEffectType(AuraType type) const
+{
+    for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i)
+    {
+        if (m_effects[i] && m_effects[i]->GetAuraType() == type)
+            return true;
+    }
+    return false;
+}
+
+void Aura::RecalculateAmountOfEffects()
+{
+    assert (!IsRemoved());
+    Unit * caster = GetCaster();
+    for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i)
+        if (m_effects[i])
+            m_effects[i]->RecalculateAmount(caster);
+}
+
+void Aura::HandleAllEffects(AuraApplication const * aurApp, uint8 mode, bool apply)
+{
+    assert (!IsRemoved());
+    for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i)
+        if (m_effects[i] && !IsRemoved())
+            m_effects[i]->HandleEffect(aurApp, mode, apply);
+}
+
+void Aura::SetNeedClientUpdateForTargets() const
+{
+    for (ApplicationMap::const_iterator appIter = m_applications.begin(); appIter != m_applications.end(); ++appIter)
+        appIter->second->SetNeedClientUpdate();
+}
+
 // trigger effects on real aura apply/remove
 void Aura::HandleAuraSpecificMods(AuraApplication const * aurApp, Unit * caster, bool apply)
 {
@@ -1526,10 +1495,44 @@ void Aura::HandleAuraSpecificMods(AuraApplication const * aurApp, Unit * caster,
     }
 }
 
-void Aura::SetNeedClientUpdateForTargets() const
+bool Aura::CheckAreaTarget(Unit *target)
 {
-    for (ApplicationMap::const_iterator appIter = m_applications.begin(); appIter != m_applications.end(); ++appIter)
-        appIter->second->SetNeedClientUpdate();
+	// for owner check use Spell::CheckTarget
+	assert(GetOwner() != target);
+
+    // some special cases
+    switch(GetId())
+    {
+        case 45828: // AV Marshal's HP/DMG auras
+        case 45829:
+        case 45830:
+        case 45821:
+        case 45822: // AV Warmaster's HP/DMG auras
+        case 45823:
+        case 45824:
+        case 45826:
+            switch(target->GetEntry())
+            {
+                // alliance
+                case 14762: // Dun Baldar North Marshal
+                case 14763: // Dun Baldar South Marshal
+                case 14764: // Icewing Marshal
+                case 14765: // Stonehearth Marshal
+                case 11948: // Vandar Stormspike
+                // horde
+                case 14772: // East Frostwolf Warmaster
+                case 14776: // Tower Point Warmaster
+                case 14773: // Iceblood Warmaster
+                case 14777: // West Frostwolf Warmaster
+                case 11946: // Drek'thar
+                    return true;
+                default:
+                    return false;
+                    break;
+            }
+            break;
+    }
+	return true;
 }
 
 void Aura::_DeleteRemovedApplications()
diff --git a/src/server/game/Spells/Auras/SpellAuras.h b/src/server/game/Spells/Auras/SpellAuras.h
index be76b520bd9..97c0076fcd5 100644
--- a/src/server/game/Spells/Auras/SpellAuras.h
+++ b/src/server/game/Spells/Auras/SpellAuras.h
@@ -163,7 +163,7 @@ class Aura
 
         void SetNeedClientUpdateForTargets() const;
         void HandleAuraSpecificMods(AuraApplication const * aurApp, Unit * caster, bool apply);
-        bool CheckTarget(Unit *target);
+        bool CheckAreaTarget(Unit *target);
     private:
         void _DeleteRemovedApplications();
     protected:
-- 
cgit v1.2.3


From fd3e4d5139edf7e6dd036315794e7eba3e8ff91f Mon Sep 17 00:00:00 2001
From: Shauren 
Date: Tue, 13 Jul 2010 23:04:31 +0200
Subject: Add Stances and StancesNot fields to spell_dbc table

--HG--
branch : trunk
---
 sql/base/world_database.sql          | 2 ++
 sql/updates/8890_world_spell_dbc.sql | 3 +++
 src/server/game/DataStores/DBCfmt.h  | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 sql/updates/8890_world_spell_dbc.sql

(limited to 'src')

diff --git a/sql/base/world_database.sql b/sql/base/world_database.sql
index 6bd4a008a8a..7f6dae9f01a 100644
--- a/sql/base/world_database.sql
+++ b/sql/base/world_database.sql
@@ -5205,6 +5205,8 @@ CREATE TABLE `spell_dbc` (
   `AttributesEx3` int(10) unsigned NOT NULL DEFAULT '0',
   `AttributesEx4` int(10) unsigned NOT NULL DEFAULT '0',
   `AttributesEx5` int(10) unsigned NOT NULL DEFAULT '0',
+  `Stances` int(10) unsigned NOT NULL DEFAULT '0',
+  `StancesNot` int(10) unsigned NOT NULL DEFAULT '0',
   `Targets` int(10) unsigned NOT NULL DEFAULT '0',
   `CastingTimeIndex` tinyint(3) unsigned NOT NULL DEFAULT '1',
   `AuraInterruptFlags` int(10) unsigned NOT NULL DEFAULT '0',
diff --git a/sql/updates/8890_world_spell_dbc.sql b/sql/updates/8890_world_spell_dbc.sql
new file mode 100644
index 00000000000..a5e0927806f
--- /dev/null
+++ b/sql/updates/8890_world_spell_dbc.sql
@@ -0,0 +1,3 @@
+ALTER TABLE `spell_dbc`
+  ADD COLUMN `Stances` int(10) unsigned NOT NULL DEFAULT '0' AFTER `AttributesEx5`,
+  ADD COLUMN `StancesNot` int(10) unsigned NOT NULL DEFAULT '0' AFTER `Stances`;
diff --git a/src/server/game/DataStores/DBCfmt.h b/src/server/game/DataStores/DBCfmt.h
index c951e9fa3c2..80d8791bd01 100644
--- a/src/server/game/DataStores/DBCfmt.h
+++ b/src/server/game/DataStores/DBCfmt.h
@@ -95,7 +95,7 @@ const std::string CustomSpellDifficultyfmt="ppppp";
 const std::string CustomSpellDifficultyIndex="id";
 const char SpellDurationfmt[]="niii";
 const char SpellEntryfmt[]="niiiiiiiiiiiixixiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiifxiiiiiiiiiiiiiiiiiiiiiiiiiiiifffiiiiiiiiiiiiiiiiiiiiifffiiiiiiiiiiiiiiifffiiiiiiiiiiiiixssssssssssssssssxssssssssssssssssxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxiiiiiiiiiiixfffxxxiiiiixxxxxxx";
-const std::string CustomSpellEntryfmt="pappppppppaaaaaapaaaaaaaaaaapaaapapppppppaaaaapaapaaaaaaaaaaaaaaaaaappppppppppppppppppppppppppppppppppppaaaaaapppppppppaaapppppppppaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaappppppppapppaaaaappaaaaaaa";
+const std::string CustomSpellEntryfmt="pappppppppaapapapaaaaaaaaaaapaaapapppppppaaaaapaapaaaaaaaaaaaaaaaaaappppppppppppppppppppppppppppppppppppaaaaaapppppppppaaapppppppppaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaappppppppapppaaaaappaaaaaaa";
 const std::string CustomSpellEntryIndex = "Id";
 const char SpellFocusObjectfmt[]="nxxxxxxxxxxxxxxxxx";
 const char SpellItemEnchantmentfmt[]="nxiiiiiixxxiiissssssssssssssssxiiiiiii";
-- 
cgit v1.2.3


From 6385a48b4500514b20b91f0c4eb030b9c5a89ab3 Mon Sep 17 00:00:00 2001
From: Shauren 
Date: Wed, 14 Jul 2010 09:51:18 +0200
Subject: Fixed base points for Heart of the Wild however this does not fix its
 incorrect amount as the issue is somewhere else

Add forgotten Stances and StancesNot fields to data insert in world sql

--HG--
branch : trunk
---
 sql/base/world_database.sql                       | 89 +++++++++++------------
 sql/updates/8891_world_spell_dbc.sql              |  2 +
 src/server/game/Spells/Auras/SpellAuraEffects.cpp | 10 +--
 3 files changed, 51 insertions(+), 50 deletions(-)
 create mode 100644 sql/updates/8891_world_spell_dbc.sql

(limited to 'src')

diff --git a/sql/base/world_database.sql b/sql/base/world_database.sql
index 7f6dae9f01a..2e075d2c89c 100644
--- a/sql/base/world_database.sql
+++ b/sql/base/world_database.sql
@@ -5297,51 +5297,50 @@ CREATE TABLE `spell_dbc` (
 
 LOCK TABLES `spell_dbc` WRITE;
 /*!40000 ALTER TABLE `spell_dbc` DISABLE KEYS */;
-INSERT INTO `spell_dbc` (`Id`,`Dispel`,`Mechanic`,`Attributes`,`AttributesEx`,`AttributesEx2`,`AttributesEx3`,`AttributesEx4`,`AttributesEx5`,`Targets`,`CastingTimeIndex`,`AuraInterruptFlags`,`ProcFlags`,`ProcChance`,`ProcCharges`,`MaxLevel`,`BaseLevel`,`SpellLevel`,`DurationIndex`,`RangeIndex`,`StackAmount`,`EquippedItemClass`,`EquippedItemSubClassMask`,`EquippedItemInventoryTypeMask`,`Effect1`,`Effect2`,`Effect3`,`EffectDieSides1`,`EffectDieSides2`,`EffectDieSides3`,`EffectRealPointsPerLevel1`,`EffectRealPointsPerLevel2`,`EffectRealPointsPerLevel3`,`EffectBasePoints1`,`EffectBasePoints2`,`EffectBasePoints3`,`EffectMechanic1`,`EffectMechanic2`,`EffectMechanic3`,`EffectImplicitTargetA1`,`EffectImplicitTargetA2`,`EffectImplicitTargetA3`,`EffectImplicitTargetB1`,`EffectImplicitTargetB2`,`EffectImplicitTargetB3`,`EffectRadiusIndex1`,`EffectRadiusIndex2`,`EffectRadiusIndex3`,`EffectApplyAuraName1`,`EffectApplyAuraName2`,`EffectApplyAuraName3`,`EffectAmplitude1`,`EffectAmplitude2`,`EffectAmplitude3`,`EffectMultipleValue1`,`EffectMultipleValue2`,`EffectMultipleValue3`,`EffectMiscValue1`,`EffectMiscValue2`,`EffectMiscValue3`,`EffectMiscValueB1`,`EffectMiscValueB2`,`EffectMiscValueB3`,`EffectTriggerSpell1`,`EffectTriggerSpell2`,`EffectTriggerSpell3`,`EffectSpellClassMaskA1`,`EffectSpellClassMaskA2`,`EffectSpellClassMaskA3`,`EffectSpellClassMaskB1`,`EffectSpellClassMaskB2`,`EffectSpellClassMaskB3`,`EffectSpellClassMaskC1`,`EffectSpellClassMaskC2`,`EffectSpellClassMaskC3`,`MaxTargetLevel`,`SpellFamilyName`,`SpellFamilyFlags1`,`SpellFamilyFlags2`,`SpellFamilyFlags3`,`MaxAffectedTargets`,`DmgClass`,`PreventionType`,`DmgMultiplier1`,`DmgMultiplier2`,`DmgMultiplier3`,`AreaGroupId`,`SchoolMask`,`Comment`) VALUES
-(62388,  0,  0, 0, 0, 0, 0x00000000, 0, 0, 0, 1, 0, 0,   0, 0, 0,  0,  0, 21,  1, 0, -1, 0, 0,  6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,   4, 0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Demonic Circle: Teleport(48020) - casterAuraSpell'),
-(65142,  3, 22, 0, 0, 0, 0x00000080, 0, 0, 0, 1, 0, 0,   0, 0, 0,  0,  0, 21, 13, 0, -1, 0, 0,  6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 22, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 'Crypt Fever - SPELL_AURA_LINKED'),
-(58888,  0,  0, 0, 0, 0, 0x04000000, 0, 0, 0, 1, 0, 0, 101, 0, 0, 68, 68,  0,  1, 0, -1, 0, 0, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 58889, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 'Ritual of Souls Rank 2 - Trigger Create Soulwell (58889)'),
-(34145,  0,  0, 0, 0, 0, 0x04000000, 0, 0, 0, 1, 0, 0, 101, 0, 0, 80, 80,  0,  1, 0, -1, 0, 0, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 29886, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 'Ritual of Souls Rank 1 - Trigger Create Soulwell (29886)'),
-(200000, 0,  0, 0, 0, 0,          0, 0, 0, 0, 1, 0, 0,   0, 0, 0,  0,  0,  8,  1, 0, -1, 0, 0,  6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,   4, 0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  5, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 'Drain Soul increased damage - serverside spell'),
-(61988,  0,  0, 0x28000180, 0x10000400, 0x4, 0x10100000, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 25, 13, 0, -1, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 25, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Divine Shield Exclude Aura - 61988'),
-(42876,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Quest 9275 reward serverside spell'),
-(44987,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Quest 11521 reward serverside spell'),
-(48803,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Quest 12214 reward serverside spell'),
-(68496,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Item_template serverside spell'),
-(72958,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Item_template serverside spell'),
-(32780,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Quest 10040 reward serverside spell'),
-(45453,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Quest 11587 reward serverside spell'),
-(25347,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Item_template serverside spell'),
-(45315,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Quest 11566 reward serverside spell'),
-(43236,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Quest 11288 reward serverside spell'),
-(43459,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Quest 11332 reward serverside spell'),
-(43499,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Quest 11250 reward serverside spell'),
-(44275,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Quest 11432 reward serverside spell'),
-(64689,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Quest 13854 and 13862 reward serverside spell'),
-(50574,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Quest 12597 reward serverside spell'),
-(56817,  0,  0, 384,  0, 0, 0, 0, 0, 0, 1, 0, 16, 101, 1, 0, 67,67,1, 1, 0, -1, 0, 0, 6,0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Rune strike proc'),
-(58428,  0,  0, 671089024,  0, 0, 0, 0, 0, 0, 1, 0, 0, 100, 0, 0, 0, 0, 18, 1, 0, -1, 0, 0, 6, 0, 0, 1, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 226, 0, 0, 20000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 'Overkill - aura remove spell'),
-(71356,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Spelldifficulty_dbc id:2108 spellid0 serverside spell'),
-(71803,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Spelldifficulty_dbc id:2108 spellid1 serverside spell'),
-(72111,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Spelldifficulty_dbc id:2136 spellid0 serverside spell'),
-(72125,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Spelldifficulty_dbc id:2136 spellid1 serverside spell'),
-(70816,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Spelldifficulty_dbc id:2146 spellid0 serverside spell'),
-(72233,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Spelldifficulty_dbc id:2146 spellid1 serverside spell'),
-(72234,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Spelldifficulty_dbc id:2146 spellid2 serverside spell'),
-(72235,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Spelldifficulty_dbc id:2146 spellid3 serverside spell'),
-(24899,  0,  0, 400, 1024,  0, 0, 2097152, 0, 0, 1, 0, 0, 101, 0, 0, 0, 0, 21, 1, 0, -1, 0, 0, 6, 0, 0, 1, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 137, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 'Heart of the Wild Bear Effect'),
-(24900,  0,  0, 400, 1024,  0, 0, 2097152, 0, 0, 1, 0, 0, 101, 0, 0, 0, 0, 21, 1, 0, -1, 0, 0, 6, 0, 0, 1, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 166, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 'Heart of the Wild Cat Effect'),
-(43503,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Quest 11261 reward serverside spell'),
-(39613,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Quest 10967  reward serverside spell'),
-(39616,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Quest 10966  reward serverside spell'),
-(34448, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 77, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  'Serverside spell orb of translocation (gobjid=180911)' ), 
-(34452, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 77, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  'Serverside spell orb of translocation (gobjid=180912)' ),
-
-(11202,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Item 3776 spellid_1 serverside spell'),
-(25359,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Item 21293 spellid_2 serverside spell'),
-(40145,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Quest 11000 RewSpellCast serverside spell'),
-(45767,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Quest 11670 RewSpellCast serverside spell'),
-(71098,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Quest 24451 RewSpellCast serverside spell');
+INSERT INTO `spell_dbc` (`Id`,`Dispel`,`Mechanic`,`Attributes`,`AttributesEx`,`AttributesEx2`,`AttributesEx3`,`AttributesEx4`,`AttributesEx5`,`Stances`,`StancesNot`,`Targets`,`CastingTimeIndex`,`AuraInterruptFlags`,`ProcFlags`,`ProcChance`,`ProcCharges`,`MaxLevel`,`BaseLevel`,`SpellLevel`,`DurationIndex`,`RangeIndex`,`StackAmount`,`EquippedItemClass`,`EquippedItemSubClassMask`,`EquippedItemInventoryTypeMask`,`Effect1`,`Effect2`,`Effect3`,`EffectDieSides1`,`EffectDieSides2`,`EffectDieSides3`,`EffectRealPointsPerLevel1`,`EffectRealPointsPerLevel2`,`EffectRealPointsPerLevel3`,`EffectBasePoints1`,`EffectBasePoints2`,`EffectBasePoints3`,`EffectMechanic1`,`EffectMechanic2`,`EffectMechanic3`,`EffectImplicitTargetA1`,`EffectImplicitTargetA2`,`EffectImplicitTargetA3`,`EffectImplicitTargetB1`,`EffectImplicitTargetB2`,`EffectImplicitTargetB3`,`EffectRadiusIndex1`,`EffectRadiusIndex2`,`EffectRadiusIndex3`,`EffectApplyAuraName1`,`EffectApplyAuraName2`,`EffectApplyAuraName3`,`EffectAmplitude1`,`EffectAmplitude2`,`EffectAmplitude3`,`EffectMultipleValue1`,`EffectMultipleValue2`,`EffectMultipleValue3`,`EffectMiscValue1`,`EffectMiscValue2`,`EffectMiscValue3`,`EffectMiscValueB1`,`EffectMiscValueB2`,`EffectMiscValueB3`,`EffectTriggerSpell1`,`EffectTriggerSpell2`,`EffectTriggerSpell3`,`EffectSpellClassMaskA1`,`EffectSpellClassMaskA2`,`EffectSpellClassMaskA3`,`EffectSpellClassMaskB1`,`EffectSpellClassMaskB2`,`EffectSpellClassMaskB3`,`EffectSpellClassMaskC1`,`EffectSpellClassMaskC2`,`EffectSpellClassMaskC3`,`MaxTargetLevel`,`SpellFamilyName`,`SpellFamilyFlags1`,`SpellFamilyFlags2`,`SpellFamilyFlags3`,`MaxAffectedTargets`,`DmgClass`,`PreventionType`,`DmgMultiplier1`,`DmgMultiplier2`,`DmgMultiplier3`,`AreaGroupId`,`SchoolMask`,`Comment`) VALUES
+(62388,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 21, 1, 0, -1, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Demonic Circle: Teleport(48020) - casterAuraSpell'),
+(65142,  3, 22, 0, 0, 0, 128, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 21, 13, 0, -1, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 22, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 'Crypt Fever - SPELL_AURA_LINKED'),
+(34145,  0, 0, 0, 0, 0, 67108864, 0, 0, 0, 0, 0, 1, 0, 0, 101, 0, 0, 80, 80, 0, 1, 0, -1, 0, 0, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 29886, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 'Ritual of Souls Rank 1 - Trigger Create Soulwell (29886)'),
+(58888,  0, 0, 0, 0, 0, 67108864, 0, 0, 0, 0, 0, 1, 0, 0, 101, 0, 0, 68, 68, 0, 1, 0, -1, 0, 0, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 58889, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 'Ritual of Souls Rank 2 - Trigger Create Soulwell (58889)'),
+(61988,  0, 0, 671089024, 268436480, 4, 269484032, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 25, 13, 0, -1, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Divine Shield Exclude Aura - 61988'),
+(200000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 8, 1, 0, -1, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 'Drain Soul increased damage - serverside spell'),
+(42876,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Quest 9275 reward serverside spell'),
+(44987,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Quest 11521 reward serverside spell'),
+(48803,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Quest 12214 reward serverside spell'),
+(68496,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Item_template serverside spell'),
+(72958,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Item_template serverside spell'),
+(32780,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Quest 10040 reward serverside spell'),
+(45453,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Quest 11587 reward serverside spell'),
+(25347,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Item_template serverside spell'),
+(45315,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Quest 11566 reward serverside spell'),
+(43236,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Quest 11288 reward serverside spell'),
+(43459,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Quest 11332 reward serverside spell'),
+(43499,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Quest 11250 reward serverside spell'),
+(44275,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Quest 11432 reward serverside spell'),
+(64689,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Quest 13854 and 13862 reward serverside spell'),
+(50574,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Quest 12597 reward serverside spell'),
+(71356,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Spelldifficulty_dbc id:2108 spellid0 serverside spell'),
+(71803,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Spelldifficulty_dbc id:2108 spellid1 serverside spell'),
+(72111,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Spelldifficulty_dbc id:2136 spellid0 serverside spell'),
+(72125,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Spelldifficulty_dbc id:2136 spellid1 serverside spell'),
+(70816,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Spelldifficulty_dbc id:2146 spellid0 serverside spell'),
+(72233,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Spelldifficulty_dbc id:2146 spellid1 serverside spell'),
+(72234,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Spelldifficulty_dbc id:2146 spellid2 serverside spell'),
+(72235,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Spelldifficulty_dbc id:2146 spellid3 serverside spell'),
+(58428,  0, 0, 671089024, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 100, 0, 0, 0, 0, 18, 1, 0, -1, 0, 0, 6, 0, 0, 1, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 226, 0, 0, 20000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 'Overkill - aura remove spell'),
+(56817,  0, 0, 384, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 16, 101, 1, 0, 67, 67, 1, 1, 0, -1, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Rune strike proc'),
+(24899,  0, 0, 400, 1024, 0, 0, 2097152, 0, 144, 0, 0, 1, 0, 0, 101, 0, 0, 0, 0, 21, 1, 0, -1, 0, 0, 6, 0, 0, 1, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 137, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 'Heart of the Wild Bear Effect'),
+(24900,  0, 0, 400, 1024, 0, 0, 2097152, 0, 1, 0, 0, 1, 0, 0, 101, 0, 0, 0, 0, 21, 1, 0, -1, 0, 0, 6, 0, 0, 1, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 166, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 'Heart of the Wild Cat Effect'),
+(43503,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Quest 11261 reward serverside spell'),
+(39613,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Quest 10967 reward serverside spell'),
+(34448,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 77, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Serverside spell orb of translocation (gobjid=180911)'),
+(34452,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 77, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Serverside spell orb of translocation (gobjid=180912)'),
+(39616,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Quest 10966 reward serverside spell'),
+(11202,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Item 3776 spellid_1 serverside spell'),
+(25359,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Item 21293 spellid_2 serverside spell'),
+(40145,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Quest 11000 RewSpellCast serverside spell'),
+(45767,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Quest 11670 RewSpellCast serverside spell'),
+(71098,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Quest 24451 RewSpellCast serverside spell');
 /*!40000 ALTER TABLE `spell_dbc` ENABLE KEYS */;
 UNLOCK TABLES;
 
diff --git a/sql/updates/8891_world_spell_dbc.sql b/sql/updates/8891_world_spell_dbc.sql
new file mode 100644
index 00000000000..6adb4e5fd28
--- /dev/null
+++ b/sql/updates/8891_world_spell_dbc.sql
@@ -0,0 +1,2 @@
+UPDATE `spell_dbc` SET `Stances`=0x90 WHERE `Id`=24899;
+UPDATE `spell_dbc` SET `Stances`=0x1 WHERE `Id`=24900;
diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
index 69c576a5363..91bfa9a36fa 100644
--- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
@@ -2505,14 +2505,14 @@ void AuraEffect::HandleShapeshiftBoosts(Unit * target, bool apply) const
             }
             // Heart of the Wild
             if (HotWSpellId)
-            {
+            {   // hacky, but the only way as spell family is not SPELLFAMILY_DRUID
                 Unit::AuraEffectList const& mModTotalStatPct = target->GetAuraEffectsByType(SPELL_AURA_MOD_TOTAL_STAT_PERCENTAGE);
                 for (Unit::AuraEffectList::const_iterator i = mModTotalStatPct.begin(); i != mModTotalStatPct.end(); ++i)
                 {
                     // Heart of the Wild
                     if ((*i)->GetSpellProto()->SpellIconID == 240 && (*i)->GetMiscValue() == 3)
                     {
-                        int32 HotWMod = (*i)->GetSpellProto()->EffectBasePoints[1] + 1;
+                        int32 HotWMod = (*i)->GetSpellProto()->EffectBasePoints[1]+1+1;  // +1 for base points and +1 for SetSpellValue (where 1 is substracted)
 
                         target->CastCustomSpell(target, HotWSpellId, &HotWMod, NULL, NULL, true, NULL, this);
                         break;
@@ -2522,11 +2522,11 @@ void AuraEffect::HandleShapeshiftBoosts(Unit * target, bool apply) const
             switch(GetMiscValue())
             {
                 case FORM_CAT:
-              // Savage Roar
+                    // Savage Roar
                     if (AuraEffect const * aurEff = target->GetAuraEffect(SPELL_AURA_DUMMY, SPELLFAMILY_DRUID, 0 , 0x10000000, 0))
                         target->CastSpell(target, 62071, true);
                     // Nurturing Instinct
-                    if (AuraEffect const * aurEff = target->GetAuraEffect(SPELL_AURA_MOD_SPELL_HEALING_OF_STAT_PERCENT, SPELLFAMILY_DRUID, 2254,0))
+                    if (AuraEffect const * aurEff = target->GetAuraEffect(SPELL_AURA_MOD_SPELL_HEALING_OF_STAT_PERCENT, SPELLFAMILY_DRUID, 2254, 0))
                     {
                         uint32 spellId = 0;
                         switch (aurEff->GetId())
@@ -2556,7 +2556,7 @@ void AuraEffect::HandleShapeshiftBoosts(Unit * target, bool apply) const
                         target->CastCustomSpell(target, 48418, &bp, NULL, NULL, true);
                     }
                     // Survival of the Fittest
-                    if (AuraEffect const * aurEff = target->GetAuraEffect(SPELL_AURA_MOD_TOTAL_STAT_PERCENTAGE,SPELLFAMILY_DRUID, 961, 0))
+                    if (AuraEffect const * aurEff = target->GetAuraEffect(SPELL_AURA_MOD_TOTAL_STAT_PERCENTAGE, SPELLFAMILY_DRUID, 961, 0))
                     {
                         int32 bp = 100 + aurEff->GetSpellProto()->CalculateSimpleValue(2);
                         target->CastCustomSpell(target, 62069, &bp, NULL, NULL, true, 0, this);
-- 
cgit v1.2.3


From af8a2e754c83e958c6f0ba210f1d9da421493041 Mon Sep 17 00:00:00 2001
From: Shauren 
Date: Wed, 14 Jul 2010 10:35:43 +0200
Subject: Another basepoint fix, Thrill of the Hunt

--HG--
branch : trunk
---
 src/server/game/Entities/Unit/Unit.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index f32e41a73b4..0e0b4ca2de9 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -6617,11 +6617,11 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                     return false;
 
                 // mana cost save
-                int32 mana = procSpell->manaCost + procSpell->ManaCostPercentage * GetCreateMana() / 100;
-                basepoints0 = mana * 40/100;
+                basepoints0 = CalculatePowerCost(procSpell, this, SpellSchoolMask(procSpell->SchoolMask)) * 4/10;
                 if (basepoints0 <= 0)
                     return false;
 
+                basepoints0 += 1;   // standard basepoint increase for CastCustomSpell
                 target = this;
                 triggered_spell_id = 34720;
                 break;
-- 
cgit v1.2.3


From 6aa9ee1a2f58ae0ad3b3ab67d90cb2170d52f33b Mon Sep 17 00:00:00 2001
From: Shauren 
Date: Wed, 14 Jul 2010 12:02:27 +0200
Subject: Fixed "At Gold Limit" popping every time you are gold capped and buy
 any item (with extended costs)

--HG--
branch : trunk
---
 src/server/game/Entities/Player/Player.h | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h
index eeb45cab4cb..0b64d7e3821 100644
--- a/src/server/game/Entities/Player/Player.h
+++ b/src/server/game/Entities/Player/Player.h
@@ -1439,11 +1439,19 @@ class Player : public Unit, public GridObject
             if (d < 0)
                 SetMoney (GetMoney() > uint32(-d) ? GetMoney() + d : 0);
             else
-                SetMoney (GetMoney() < uint32(MAX_MONEY_AMOUNT - d) ? GetMoney() + d : MAX_MONEY_AMOUNT);
-
-            // "At Gold Limit"
-            if (GetMoney() >= MAX_MONEY_AMOUNT)
-                SendEquipError(EQUIP_ERR_TOO_MUCH_GOLD,NULL,NULL);
+            {
+                uint32 newAmount = 0;
+                if (GetMoney() < uint32(MAX_MONEY_AMOUNT - d))
+                    newAmount = GetMoney() + d;
+                else
+                {
+                    // "At Gold Limit"
+                    newAmount = MAX_MONEY_AMOUNT;
+                    if (d)
+                        SendEquipError(EQUIP_ERR_TOO_MUCH_GOLD, NULL, NULL);
+                }
+                SetMoney (newAmount);
+            }
         }
         void SetMoney(uint32 value)
         {
-- 
cgit v1.2.3


From a43ec3f158b6c0b813a2996b5369f5c2c168d483 Mon Sep 17 00:00:00 2001
From: QAston 
Date: Wed, 14 Jul 2010 16:57:13 +0200
Subject: *Add SpellMgr::CalculateSpellEffectAmount function for consistency of
 effect amount calculations in core *Remove SpellEntry::CalculateSimpleValue
 function and use the new cuntion instead *Remove some workarounds made
 because of incorrect effect amount calculations *Since now aura effect amount
 problems should be gone.

--HG--
branch : trunk
---
 src/server/game/DataStores/DBCStructure.h         |  3 -
 src/server/game/Entities/Player/Player.cpp        |  6 +-
 src/server/game/Entities/Unit/Unit.cpp            | 71 +++--------------
 src/server/game/Entities/Unit/Unit.h              |  6 +-
 src/server/game/Spells/Auras/SpellAuraEffects.cpp | 21 +++--
 src/server/game/Spells/Auras/SpellAuras.cpp       |  8 +-
 src/server/game/Spells/Auras/SpellEffects.cpp     | 26 +++---
 src/server/game/Spells/Spell.cpp                  | 11 ++-
 src/server/game/Spells/SpellMgr.cpp               | 97 +++++++++++++++++++----
 src/server/game/Spells/SpellMgr.h                 | 25 +++---
 10 files changed, 142 insertions(+), 132 deletions(-)

(limited to 'src')

diff --git a/src/server/game/DataStores/DBCStructure.h b/src/server/game/DataStores/DBCStructure.h
index e6486baab66..7663aaf3dcb 100644
--- a/src/server/game/DataStores/DBCStructure.h
+++ b/src/server/game/DataStores/DBCStructure.h
@@ -1513,9 +1513,6 @@ struct SpellEntry
     //uint32  spellDescriptionVariableID;                   // 232      3.2.0
     //uint32  SpellDifficultyId;                            // 233      3.3.0
 
-    // helpers
-    int32 CalculateSimpleValue(uint8 eff) const { return EffectBasePoints[eff]+int32(1); }
-
     private:
         // prevent creating custom entries (copy data from original in fact)
         SpellEntry(SpellEntry const&);                      // DON'T must have implementation
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 449ad32859f..0a14be4d35e 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -3431,7 +3431,7 @@ bool Player::addSpell(uint32 spell_id, bool active, bool learning, bool dependen
             if (!Has310Flyer(false) && pSkill->id == SKILL_MOUNTS)
                 for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i)
                     if (spellInfo->EffectApplyAuraName[i] == SPELL_AURA_MOD_INCREASE_MOUNTED_FLIGHT_SPEED &&
-                        spellInfo->CalculateSimpleValue(i) == 310)
+                        SpellMgr::CalculateSpellEffectAmount(spellInfo, i) == 310)
                         SetHas310Flyer(true);
 
             if (HasSkill(pSkill->id))
@@ -3705,7 +3705,7 @@ void Player::removeSpell(uint32 spell_id, bool disabled, bool learn_low_rank)
                 SpellEntry const *pSpellInfo = sSpellStore.LookupEntry(spell_id);
                 for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i)
                     if (pSpellInfo->EffectApplyAuraName[i] == SPELL_AURA_MOD_INCREASE_MOUNTED_FLIGHT_SPEED &&
-                        pSpellInfo->CalculateSimpleValue(i) == 310)
+                        SpellMgr::CalculateSpellEffectAmount(pSpellInfo, i) == 310)
                         Has310Flyer(true, spell_id);    // with true as first argument its also used to set/remove the flag
             }
         }
@@ -3799,7 +3799,7 @@ bool Player::Has310Flyer(bool checkAllSpells, uint32 excludeSpellId)
                 pSpellInfo = sSpellStore.LookupEntry(itr->first);
                 for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i)
                     if (pSpellInfo->EffectApplyAuraName[i] == SPELL_AURA_MOD_INCREASE_MOUNTED_FLIGHT_SPEED &&
-                        pSpellInfo->CalculateSimpleValue(i) == 310)
+                        SpellMgr::CalculateSpellEffectAmount(pSpellInfo, i) == 310)
                     {
                         SetHas310Flyer(true);
                         return true;
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 0e0b4ca2de9..4d4e0e1c135 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -3566,10 +3566,10 @@ void Unit::_AddAura(UnitAura * aura, Unit * caster)
         // find current aura from spell and change it's stackamount
         if (Aura * foundAura = GetOwnedAura(aura->GetId(), aura->GetCasterGUID(), 0, aura))
         {
-            if (aura->GetSpellProto()->StackAmount)
-            {                       
-                aura->ModStackAmount(foundAura->GetStackAmount());
-                                           
+            if (foundAura->GetSpellProto()->StackAmount)
+            {
+                foundAura->ModStackAmount(foundAura->GetStackAmount());
+
                 // Update periodic timers from the previous aura
                 for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i)
                 {
@@ -7815,7 +7815,7 @@ bool Unit::HandleAuraProc(Unit * pVictim, uint32 damage, Aura * triggeredByAura,
                     *handled = true;
                     if (pVictim->HasAura(53601))
                     {
-                        int32 bp0 = (damage/12) * dummySpell->CalculateSimpleValue(2)/100;
+                        int32 bp0 = (damage/12) * SpellMgr::CalculateSpellEffectAmount(procSpell, 2)/100;
                         CastCustomSpell(pVictim, 66922, &bp0, NULL, NULL, true);
                         return true;
                     }   
@@ -7860,7 +7860,7 @@ bool Unit::HandleAuraProc(Unit * pVictim, uint32 damage, Aura * triggeredByAura,
                     if (!spInfo)
                         return false;
 
-                    int32 bp0 = this->GetCreateMana() * spInfo->CalculateSimpleValue(0) / 100;
+                    int32 bp0 = this->GetCreateMana() * SpellMgr::CalculateSpellEffectAmount(spInfo, 0) / 100;
                     this->CastCustomSpell(this, 67545, &bp0, NULL, NULL, true, NULL, triggeredByAura->GetEffect(0), this->GetGUID());
                     return true;
                 }
@@ -8247,7 +8247,7 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, AuraEffect* trig
                             }
                             // percent stored in effect 1 (class scripts) base points
                             int32 cost = originalSpell->manaCost + originalSpell->ManaCostPercentage * GetCreateMana() / 100;
-                            basepoints0 = cost*auraSpellInfo->CalculateSimpleValue(1)/100;
+                            basepoints0 = cost*SpellMgr::CalculateSpellEffectAmount(auraSpellInfo, 1)/100;
                             trigger_spell_id = 20272;
                             target = this;
                         }
@@ -10205,7 +10205,7 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3
                         case 49638:
                         {
                             if (const SpellEntry *proto=sSpellStore.LookupEntry(itr->first))
-                                ApCoeffMod *= (100.0f + proto->CalculateSimpleValue(0)) / 100.0f;
+                                ApCoeffMod *= (100.0f + SpellMgr::CalculateSpellEffectAmount(proto, 0)) / 100.0f;
                         }
                         break;
                     }
@@ -12515,7 +12515,7 @@ Unit* Creature::SelectVictim()
 //======================================================================
 //======================================================================
 
-int32 Unit::ApplyEffectModifiers(SpellEntry const* spellProto, uint8 effect_index, int32 value)
+int32 Unit::ApplyEffectModifiers(SpellEntry const* spellProto, uint8 effect_index, int32 value) const
 {
     if (Player* modOwner = GetSpellModOwner())
     {
@@ -12536,57 +12536,10 @@ int32 Unit::ApplyEffectModifiers(SpellEntry const* spellProto, uint8 effect_inde
     return value;
 }
 
-int32 Unit::CalculateSpellDamage(Unit const* /*target*/, SpellEntry const* spellProto, uint8 effect_index, int32 const* effBasePoints)
+// function uses real base points (typically value - 1)
+int32 Unit::CalculateSpellDamage(Unit const* target, SpellEntry const* spellProto, uint8 effect_index, int32 const* basePoints) const
 {
-    int32 level = int32(getLevel());
-    if (level > int32(spellProto->maxLevel) && spellProto->maxLevel > 0)
-        level = int32(spellProto->maxLevel);
-    else if (level < int32(spellProto->baseLevel))
-        level = int32(spellProto->baseLevel);
-    level -= int32(spellProto->spellLevel);
-
-    float basePointsPerLevel = spellProto->EffectRealPointsPerLevel[effect_index];
-    int32 basePoints = effBasePoints ? *effBasePoints - 1 : spellProto->EffectBasePoints[effect_index];
-    basePoints += int32(level * basePointsPerLevel);
-    int32 randomPoints = int32(spellProto->EffectDieSides[effect_index]);
-
-    switch(randomPoints)
-    {
-        case 0:                                             // not used
-        case 1: basePoints += 1; break;                     // range 1..1
-        default:
-            // range can have positive (1..rand) and negative (rand..1) values, so order its for irand
-            int32 randvalue = (randomPoints >= 1)
-                ? irand(1, randomPoints)
-                : irand(randomPoints, 1);
-
-            basePoints += randvalue;
-            break;
-    }
-
-    int32 value = basePoints;
-
-    // random damage
-    //if (comboDamage != 0 && unitPlayer /*&& target && (target->GetGUID() == unitPlayer->GetComboTarget())*/)
-    if  (m_movedPlayer)
-        if (uint8 comboPoints = m_movedPlayer->GetComboPoints())
-            if (float comboDamage = spellProto->EffectPointsPerComboPoint[effect_index])
-                value += int32(comboDamage * comboPoints);
-
-    value = ApplyEffectModifiers(spellProto, effect_index, value);
-
-    if (!basePointsPerLevel && (spellProto->Attributes & SPELL_ATTR_LEVEL_DAMAGE_CALCULATION && spellProto->spellLevel) &&
-            spellProto->Effect[effect_index] != SPELL_EFFECT_WEAPON_PERCENT_DAMAGE &&
-            spellProto->Effect[effect_index] != SPELL_EFFECT_KNOCK_BACK &&
-            spellProto->EffectApplyAuraName[effect_index] != SPELL_AURA_MOD_SPEED_ALWAYS &&
-            spellProto->EffectApplyAuraName[effect_index] != SPELL_AURA_MOD_SPEED_NOT_STACK &&
-            spellProto->EffectApplyAuraName[effect_index] != SPELL_AURA_MOD_INCREASE_SPEED &&
-            spellProto->EffectApplyAuraName[effect_index] != SPELL_AURA_MOD_DECREASE_SPEED)
-            //there are many more: slow speed, -healing pct
-        value = int32(value*0.25f*exp(getLevel()*(70-spellProto->spellLevel)/1000.0f));
-        //value = int32(value * (int32)getLevel() / (int32)(spellProto->spellLevel ? spellProto->spellLevel : 1));
-
-    return value;
+    return SpellMgr::CalculateSpellEffectAmount(spellProto, effect_index, this, basePoints, target);
 }
 
 int32 Unit::CalcSpellDuration(SpellEntry const* spellProto)
diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h
index 87bd997a683..2051123dfb5 100644
--- a/src/server/game/Entities/Unit/Unit.h
+++ b/src/server/game/Entities/Unit/Unit.h
@@ -1529,7 +1529,7 @@ class Unit : public WorldObject
         void       DeleteCharmInfo();
         void UpdateCharmAI();
         //Player * GetMoverSource() const;
-        Player *m_movedPlayer;
+        Player * m_movedPlayer;
         SharedVisionList const& GetSharedVisionList() { return m_sharedVision; }
         void AddPlayerToVision(Player* plr);
         void RemovePlayerFromVision(Player* plr);
@@ -1846,8 +1846,8 @@ class Unit : public WorldObject
         void SetHover(bool on);
         bool isHover() const { return HasAuraType(SPELL_AURA_HOVER); }
 
-        int32 ApplyEffectModifiers(SpellEntry const* spellProto, uint8 effect_index, int32 value);
-        int32 CalculateSpellDamage(Unit const* target, SpellEntry const* spellProto, uint8 effect_index, int32 const* basePoints = NULL);
+        int32 ApplyEffectModifiers(SpellEntry const* spellProto, uint8 effect_index, int32 value) const;
+        int32 CalculateSpellDamage(Unit const* target, SpellEntry const* spellProto, uint8 effect_index, int32 const* basePoints = NULL) const;
         int32 CalcSpellDuration(SpellEntry const* spellProto);
         int32 ModSpellDuration(SpellEntry const* spellProto, Unit const* target, int32 duration, bool positive);
         void  ModSpellCastTime(SpellEntry const* spellProto, int32 & castTime, Spell * spell=NULL);
diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
index 91bfa9a36fa..3835e4703a7 100644
--- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
@@ -376,7 +376,7 @@ pAuraEffectHandler AuraEffectHandler[TOTAL_AURAS]=
 AuraEffect::AuraEffect(Aura * base, uint8 effIndex, int32 *baseAmount, Unit * caster) :
     m_base(base), m_spellProto(base->GetSpellProto()), m_spellmod(NULL), m_periodicTimer(0),
     m_tickNumber(0), m_effIndex(effIndex), m_isPeriodic(false), m_canBeRecalculated(true),
-    m_baseAmount (baseAmount ? *baseAmount : m_spellProto->EffectBasePoints[m_effIndex] + 1)
+    m_baseAmount (baseAmount ? *baseAmount : m_spellProto->EffectBasePoints[m_effIndex])
 {
     CalculatePeriodic(caster, true);
 
@@ -405,10 +405,7 @@ int32 AuraEffect::CalculateAmount(Unit * caster)
 {
     int32 amount;
     // default amount calculation
-    if (caster)
-        amount = caster->CalculateSpellDamage(NULL, m_spellProto, m_effIndex, &m_baseAmount);
-    else
-        amount = m_baseAmount + 1;
+    amount = SpellMgr::CalculateSpellEffectAmount(m_spellProto, m_effIndex, caster, &m_baseAmount, NULL);
 
     // check item enchant aura cast
     if (!amount && caster)
@@ -622,7 +619,7 @@ int32 AuraEffect::CalculateAmount(Unit * caster)
                 if (spellmgr.GetSpellRank(m_spellProto->Id) >= 9)
                 {
                     if (GetBase()->GetUnitOwner()->HasAuraState(AURA_STATE_HEALTH_ABOVE_75_PERCENT, m_spellProto, caster))
-                        amount += int32(amount * m_spellProto->CalculateSimpleValue(2) / 100.0f);
+                        amount += int32(amount * SpellMgr::CalculateSpellEffectAmount(m_spellProto, 2, caster) / 100.0f);
                 }
             }
             break;
@@ -2512,7 +2509,7 @@ void AuraEffect::HandleShapeshiftBoosts(Unit * target, bool apply) const
                     // Heart of the Wild
                     if ((*i)->GetSpellProto()->SpellIconID == 240 && (*i)->GetMiscValue() == 3)
                     {
-                        int32 HotWMod = (*i)->GetSpellProto()->EffectBasePoints[1]+1+1;  // +1 for base points and +1 for SetSpellValue (where 1 is substracted)
+                        int32 HotWMod = (*i)->GetAmount();
 
                         target->CastCustomSpell(target, HotWSpellId, &HotWMod, NULL, NULL, true, NULL, this);
                         break;
@@ -2543,7 +2540,7 @@ void AuraEffect::HandleShapeshiftBoosts(Unit * target, bool apply) const
                     // Master Shapeshifter - Cat
                     if (AuraEffect const * aurEff = target->GetDummyAuraEffect(SPELLFAMILY_GENERIC, 2851, 0))
                     {
-                        int32 bp = aurEff->GetAmount()+1;
+                        int32 bp = aurEff->GetAmount();
                         target->CastCustomSpell(target, 48420, &bp, NULL, NULL, true);
                     }
                 break;
@@ -2552,13 +2549,13 @@ void AuraEffect::HandleShapeshiftBoosts(Unit * target, bool apply) const
                     // Master Shapeshifter - Bear
                     if (AuraEffect const * aurEff = target->GetDummyAuraEffect(SPELLFAMILY_GENERIC, 2851, 0))
                     {
-                        int32 bp = aurEff->GetAmount()+1;
+                        int32 bp = aurEff->GetAmount();
                         target->CastCustomSpell(target, 48418, &bp, NULL, NULL, true);
                     }
                     // Survival of the Fittest
                     if (AuraEffect const * aurEff = target->GetAuraEffect(SPELL_AURA_MOD_TOTAL_STAT_PERCENTAGE, SPELLFAMILY_DRUID, 961, 0))
                     {
-                        int32 bp = 100 + aurEff->GetSpellProto()->CalculateSimpleValue(2);
+                        int32 bp = 100 + SpellMgr::CalculateSpellEffectAmount(aurEff->GetSpellProto(), 2);
                         target->CastCustomSpell(target, 62069, &bp, NULL, NULL, true, 0, this);
                     }
                 break;
@@ -2566,7 +2563,7 @@ void AuraEffect::HandleShapeshiftBoosts(Unit * target, bool apply) const
                     // Master Shapeshifter - Moonkin
                     if (AuraEffect const * aurEff = target->GetDummyAuraEffect(SPELLFAMILY_GENERIC, 2851, 0))
                     {
-                        int32 bp = aurEff->GetAmount()+1;
+                        int32 bp = aurEff->GetAmount();
                         target->CastCustomSpell(target, 48421, &bp, NULL, NULL, true);
                     }
                 break;
@@ -2574,7 +2571,7 @@ void AuraEffect::HandleShapeshiftBoosts(Unit * target, bool apply) const
                 case FORM_TREE:
                     if (AuraEffect const * aurEff = target->GetDummyAuraEffect(SPELLFAMILY_GENERIC, 2851, 0))
                     {
-                        int32 bp = aurEff->GetAmount()+1;
+                        int32 bp = aurEff->GetAmount();
                         target->CastCustomSpell(target, 48422, &bp, NULL, NULL, true);
                     }
                 break;
diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp
index a96471ef0e4..c8672780c13 100644
--- a/src/server/game/Spells/Auras/SpellAuras.cpp
+++ b/src/server/game/Spells/Auras/SpellAuras.cpp
@@ -469,7 +469,7 @@ void Aura::UpdateTargetMap(Unit * caster, bool apply)
         bool addUnit = true;
         // check target immunities 
         if (itr->first->IsImmunedToSpell(GetSpellProto()) 
-			// check area target requirements
+            // check area target requirements
 			|| (itr->first != GetOwner() && !CheckAreaTarget(itr->first)))
             addUnit = false;
 
@@ -1497,8 +1497,8 @@ void Aura::HandleAuraSpecificMods(AuraApplication const * aurApp, Unit * caster,
 
 bool Aura::CheckAreaTarget(Unit *target)
 {
-	// for owner check use Spell::CheckTarget
-	assert(GetOwner() != target);
+    // for owner check use Spell::CheckTarget
+    assert(GetOwner() != target);
 
     // some special cases
     switch(GetId())
@@ -1532,7 +1532,7 @@ bool Aura::CheckAreaTarget(Unit *target)
             }
             break;
     }
-	return true;
+    return true;
 }
 
 void Aura::_DeleteRemovedApplications()
diff --git a/src/server/game/Spells/Auras/SpellEffects.cpp b/src/server/game/Spells/Auras/SpellEffects.cpp
index 3f01d8bca2d..88e1ac72928 100644
--- a/src/server/game/Spells/Auras/SpellEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellEffects.cpp
@@ -303,7 +303,7 @@ void Spell::EffectEnvirinmentalDMG(uint32 i)
     // Note: this hack with damage replace required until GO casting not implemented
     // environment damage spells already have around enemies targeting but this not help in case not existed GO casting support
     // currently each enemy selected explicitly and self cast damage, we prevent apply self casted spell bonuses/etc
-    damage = m_spellInfo->CalculateSimpleValue(i);
+    damage = SpellMgr::CalculateSpellEffectAmount(m_spellInfo, i, m_caster);
 
     m_caster->CalcAbsorbResist(m_caster, GetSpellSchoolMask(m_spellInfo), SPELL_DIRECT_DAMAGE, damage, &absorb, &resist, m_spellInfo);
 
@@ -583,7 +583,7 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
                         if ((*i)->GetSpellProto()->SpellFamilyName == SPELLFAMILY_PRIEST &&
                             ((*i)->GetSpellProto()->SpellIconID == 95))
                         {
-                            int chance = (*i)->GetSpellProto()->CalculateSimpleValue(1);
+                            int chance = SpellMgr::CalculateSpellEffectAmount((*i)->GetSpellProto(), 1, m_caster);
                             if (roll_chance_i(chance))
                                 // Mind Trauma
                                 m_caster->CastSpell(unitTarget, 48301, true, 0);
@@ -638,7 +638,7 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
                             {
                                 if ((*iter)->GetSpellProto()->SpellFamilyName == SPELLFAMILY_ROGUE && (*iter)->GetSpellProto()->SpellIconID == 1960)
                                 {
-                                    uint32 chance = (*iter)->GetSpellProto()->CalculateSimpleValue(2);
+                                    uint32 chance = SpellMgr::CalculateSpellEffectAmount((*iter)->GetSpellProto(), 2, m_caster);
 
                                     if (chance && roll_chance_i(chance))
                                         needConsume = false;
@@ -1408,8 +1408,8 @@ void Spell::EffectDummy(uint32 i)
                     {
                         case 0:
                         {
-                            uint32 spellID = m_spellInfo->CalculateSimpleValue(0);
-                            uint32 reqAuraID = m_spellInfo->CalculateSimpleValue(1);
+                            uint32 spellID = SpellMgr::CalculateSpellEffectAmount(m_spellInfo, 0);
+                            uint32 reqAuraID = SpellMgr::CalculateSpellEffectAmount(m_spellInfo, 1);
 
                             if (m_caster->HasAuraEffect(reqAuraID,0))
                                 m_caster->CastSpell(m_caster,spellID,true,NULL);
@@ -1840,7 +1840,7 @@ void Spell::EffectDummy(uint32 i)
 
                     if (Pet *pPet = m_caster->ToPlayer()->GetPet())
                         if (pPet->isAlive())
-                            pPet->CastSpell(unitTarget, m_spellInfo->CalculateSimpleValue(i), true);
+                            pPet->CastSpell(unitTarget, SpellMgr::CalculateSpellEffectAmount(m_spellInfo, i), true);
                     return;
                 }
             }
@@ -2140,7 +2140,7 @@ void Spell::EffectDummy(uint32 i)
                 {
                     bp = damage;
                 }
-                m_caster->CastCustomSpell(unitTarget,m_spellInfo->CalculateSimpleValue(1),&bp,NULL,NULL,true);
+                m_caster->CastCustomSpell(unitTarget, SpellMgr::CalculateSpellEffectAmount(m_spellInfo, 1), &bp,NULL,NULL,true);
                 // Corpse Explosion (Suicide)
                 unitTarget->CastCustomSpell(unitTarget,43999,&bp,NULL,NULL,true);
                 // Set corpse look
@@ -3753,7 +3753,7 @@ void Spell::EffectSummonType(uint32 i)
 
             if (m_spellInfo->EffectBasePoints[i])
             {
-                SpellEntry const *spellProto = sSpellStore.LookupEntry(m_spellInfo->CalculateSimpleValue(i));
+                SpellEntry const *spellProto = sSpellStore.LookupEntry(SpellMgr::CalculateSpellEffectAmount(m_spellInfo, i));
                 if (spellProto)
                     m_caster->CastSpell(summon, spellProto, true);
             }
@@ -3905,7 +3905,7 @@ void Spell::EffectDispel(uint32 i)
     // Devour Magic
     if (m_spellInfo->SpellFamilyName == SPELLFAMILY_WARLOCK && m_spellInfo->Category == SPELLCATEGORY_DEVOUR_MAGIC)
     {
-        int32 heal_amount = m_spellInfo->CalculateSimpleValue(1);
+        int32 heal_amount = SpellMgr::CalculateSpellEffectAmount(m_spellInfo, 1);
         m_caster->CastCustomSpell(m_caster, 19658, &heal_amount, NULL, NULL, true);
     }
 }
@@ -4018,7 +4018,7 @@ void Spell::EffectLearnSkill(uint32 i)
 
     uint32 skillid =  m_spellInfo->EffectMiscValue[i];
     uint16 skillval = unitTarget->ToPlayer()->GetPureSkillValue(skillid);
-    unitTarget->ToPlayer()->SetSkill(skillid, m_spellInfo->CalculateSimpleValue(i), skillval?skillval:1, damage*75);
+    unitTarget->ToPlayer()->SetSkill(skillid, SpellMgr::CalculateSpellEffectAmount(m_spellInfo, i), skillval?skillval:1, damage*75);
 }
 
 void Spell::EffectAddHonor(uint32 /*i*/)
@@ -5035,7 +5035,7 @@ void Spell::EffectScriptEffect(uint32 effIndex)
                 case 55693:                                 // Remove Collapsing Cave Aura
                     if (!unitTarget)
                         return;
-                    unitTarget->RemoveAurasDueToSpell(m_spellInfo->CalculateSimpleValue(effIndex));
+                    unitTarget->RemoveAurasDueToSpell(SpellMgr::CalculateSpellEffectAmount(m_spellInfo, effIndex));
                     break;
                 // PX-238 Winter Wondervolt TRAP
                 case 26275:
@@ -5578,8 +5578,8 @@ void Spell::EffectScriptEffect(uint32 effIndex)
                     if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER || effIndex != 0)
                         return;
 
-                    uint32 spellID = m_spellInfo->CalculateSimpleValue(0);
-                    uint32 questID = m_spellInfo->CalculateSimpleValue(1);
+                    uint32 spellID = SpellMgr::CalculateSpellEffectAmount(m_spellInfo, 0);
+                    uint32 questID = SpellMgr::CalculateSpellEffectAmount(m_spellInfo, 1);
 
                     if (unitTarget->ToPlayer()->GetQuestStatus(questID) == QUEST_STATUS_COMPLETE && !unitTarget->ToPlayer()->GetQuestRewardStatus (questID))
                         unitTarget->CastSpell(unitTarget, spellID, true);
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
index c3b0fdb1405..c371d518a04 100644
--- a/src/server/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
@@ -399,13 +399,12 @@ Spell::Spell(Unit* Caster, SpellEntry const *info, bool triggered, uint64 origin
     }
 
     for (int i=0; i <3; ++i)
-        m_currentBasePoints[i] = m_spellInfo->CalculateSimpleValue(i);
+        m_currentBasePoints[i] = m_spellInfo->EffectBasePoints[i];
 
     m_spellState = SPELL_STATE_NULL;
 
     m_TriggerSpells.clear();
     m_IsTriggeredSpell = triggered;
-    //m_AreaAura = false;
     m_CastItem = NULL;
 
     unitTarget = NULL;
@@ -5997,7 +5996,7 @@ SpellCastResult Spell::CheckItems()
                             else if (!(p_caster->HasItemCount(m_spellInfo->EffectItemType[i],1)))
                                 return SPELL_FAILED_TOO_MANY_OF_ITEM;
                             else
-                                p_caster->CastSpell(m_caster,m_spellInfo->CalculateSimpleValue(1),false);        // move this to anywhere
+                                p_caster->CastSpell(m_caster,SpellMgr::CalculateSpellEffectAmount(m_spellInfo, 1),false);        // move this to anywhere
                             return SPELL_FAILED_DONT_REPORT;
                         }
                     }
@@ -6883,15 +6882,15 @@ void Spell::SetSpellValue(SpellValueMod mod, int32 value)
     switch(mod)
     {
         case SPELLVALUE_BASE_POINT0:
-            m_spellValue->EffectBasePoints[0] = value - int32(1);
+            m_spellValue->EffectBasePoints[0] = SpellMgr::CalculateSpellEffectBaseAmount(value);
             m_currentBasePoints[0] = m_spellValue->EffectBasePoints[0]; //this should be removed in the future
             break;
         case SPELLVALUE_BASE_POINT1:
-            m_spellValue->EffectBasePoints[1] = value - int32(1);
+            m_spellValue->EffectBasePoints[1] = SpellMgr::CalculateSpellEffectBaseAmount(value);
             m_currentBasePoints[1] = m_spellValue->EffectBasePoints[1];
             break;
         case SPELLVALUE_BASE_POINT2:
-            m_spellValue->EffectBasePoints[2] = value - int32(1);
+            m_spellValue->EffectBasePoints[2] = SpellMgr::CalculateSpellEffectBaseAmount(value);
             m_currentBasePoints[2] = m_spellValue->EffectBasePoints[2];
             break;
         case SPELLVALUE_RADIUS_MOD:
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp
index 7fd3650d6f4..5ebb927eb80 100644
--- a/src/server/game/Spells/SpellMgr.cpp
+++ b/src/server/game/Spells/SpellMgr.cpp
@@ -838,16 +838,16 @@ bool SpellMgr::_isPositiveEffect(uint32 spellId, uint32 effIndex, bool deep) con
                 case SPELL_AURA_MOD_HEALING_PCT:
                 case SPELL_AURA_MOD_HEALING_DONE:
                 case SPELL_AURA_MOD_DAMAGE_PERCENT_DONE:
-                    if (spellproto->CalculateSimpleValue(effIndex) < 0)
+                    if (SpellMgr::CalculateSpellEffectAmount(spellproto, effIndex) < 0)
                         return false;
                     break;
                 case SPELL_AURA_MOD_DAMAGE_TAKEN:           // dependent from bas point sign (positive -> negative)
-                    if (spellproto->CalculateSimpleValue(effIndex) > 0)
+                    if (SpellMgr::CalculateSpellEffectAmount(spellproto, effIndex) > 0)
                         return false;
                     break;
                 case SPELL_AURA_MOD_CRIT_PCT:
                 case SPELL_AURA_MOD_SPELL_CRIT_CHANCE:
-                    if (spellproto->CalculateSimpleValue(effIndex) > 0)
+                    if (SpellMgr::CalculateSpellEffectAmount(spellproto, effIndex) > 0)
                         return true;                        // some expected positive spells have SPELL_ATTR_EX_NEGATIVE
                     break;
                 case SPELL_AURA_ADD_TARGET_TRIGGER:
@@ -925,7 +925,7 @@ bool SpellMgr::_isPositiveEffect(uint32 spellId, uint32 effIndex, bool deep) con
                     switch(spellproto->EffectMiscValue[effIndex])
                     {
                         case SPELLMOD_COST:                 // dependent from bas point sign (negative -> positive)
-                            if (spellproto->CalculateSimpleValue(effIndex) > 0)
+                            if (SpellMgr::CalculateSpellEffectAmount(spellproto, effIndex) > 0)
                             {
                                 if (!deep)
                                 {
@@ -1810,6 +1810,80 @@ bool SpellMgr::IsSkillBonusSpell(uint32 spellId) const
     return false;
 }
 
+bool SpellMgr::IsSkillTypeSpell(uint32 spellId, SkillType type) const
+{
+    SkillLineAbilityMapBounds bounds = GetSkillLineAbilityMapBounds(spellId);
+
+    for (SkillLineAbilityMap::const_iterator _spell_idx = bounds.first; _spell_idx != bounds.second; ++_spell_idx)
+        if (_spell_idx->second->skillId == uint32(type))
+            return true;
+
+    return false;
+}
+
+// basepoints provided here have to be valid basepoints (use SpellMgr::CalculateSpellEffectBaseAmount)
+int32 SpellMgr::CalculateSpellEffectAmount(SpellEntry const * spellEntry, uint8 effIndex, Unit const * caster, int32 const * effBasePoints, Unit const * target)
+{
+    float basePointsPerLevel = spellEntry->EffectRealPointsPerLevel[effIndex];
+    int32 basePoints = effBasePoints ? *effBasePoints : spellEntry->EffectBasePoints[effIndex];
+    int32 randomPoints = int32(spellEntry->EffectDieSides[effIndex]);
+
+    // base amount modification based on spell lvl vs caster lvl
+    if (caster)
+    {
+        int32 level = int32(caster->getLevel());
+        if (level > int32(spellEntry->maxLevel) && spellEntry->maxLevel > 0)
+            level = int32(spellEntry->maxLevel);
+        else if (level < int32(spellEntry->baseLevel))
+            level = int32(spellEntry->baseLevel);
+        level -= int32(spellEntry->spellLevel);
+        basePoints += int32(level * basePointsPerLevel);
+    }
+
+    // roll in a range <1;EffectDieSides> as of patch 3.3.3
+    switch(randomPoints)
+    {
+        case 0:                                             // not used
+        case 1: basePoints += 1; break;                     // range 1..1
+        default:
+            // range can have positive (1..rand) and negative (rand..1) values, so order its for irand
+            int32 randvalue = (randomPoints >= 1)
+                ? irand(1, randomPoints)
+                : irand(randomPoints, 1);
+
+            basePoints += randvalue;
+            break;
+    }
+
+    int32 value = basePoints;
+
+    // random damage
+    if (caster)
+    {
+        // bonus amount from combo points
+        if  (caster->m_movedPlayer)
+            if (uint8 comboPoints = caster->m_movedPlayer->GetComboPoints())
+                if (float comboDamage = spellEntry->EffectPointsPerComboPoint[effIndex])
+                    value += int32(comboDamage * comboPoints);
+
+        value = caster->ApplyEffectModifiers(spellEntry, effIndex, value);
+
+        // amount multiplication based on caster's level
+        if (!basePointsPerLevel && (spellEntry->Attributes & SPELL_ATTR_LEVEL_DAMAGE_CALCULATION && spellEntry->spellLevel) &&
+                spellEntry->Effect[effIndex] != SPELL_EFFECT_WEAPON_PERCENT_DAMAGE &&
+                spellEntry->Effect[effIndex] != SPELL_EFFECT_KNOCK_BACK &&
+                spellEntry->EffectApplyAuraName[effIndex] != SPELL_AURA_MOD_SPEED_ALWAYS &&
+                spellEntry->EffectApplyAuraName[effIndex] != SPELL_AURA_MOD_SPEED_NOT_STACK &&
+                spellEntry->EffectApplyAuraName[effIndex] != SPELL_AURA_MOD_INCREASE_SPEED &&
+                spellEntry->EffectApplyAuraName[effIndex] != SPELL_AURA_MOD_DECREASE_SPEED)
+                //there are many more: slow speed, -healing pct
+            value = int32(value*0.25f*exp(caster->getLevel()*(70-spellEntry->spellLevel)/1000.0f));
+            //value = int32(value * (int32)getLevel() / (int32)(spellProto->spellLevel ? spellProto->spellLevel : 1));
+    }
+
+    return value;
+}
+
 SpellEntry const* SpellMgr::SelectAuraRankForPlayerLevel(SpellEntry const* spellInfo, uint32 playerLevel) const
 {
     // ignore passive spells
@@ -1872,7 +1946,7 @@ void SpellMgr::LoadSpellLearnSkills()
             {
                 SpellLearnSkillNode dbc_node;
                 dbc_node.skill = entry->EffectMiscValue[i];
-                dbc_node.step  = entry->CalculateSimpleValue(i);
+                dbc_node.step  = SpellMgr::CalculateSpellEffectAmount(entry, i);
                 if (dbc_node.skill != SKILL_RIDING)
                     dbc_node.value = 1;
                 else
@@ -2059,7 +2133,7 @@ void SpellMgr::LoadSpellPetAuras()
                 continue;
             }
 
-            PetAura pa(pet, aura, spellInfo->EffectImplicitTargetA[eff] == TARGET_UNIT_PET, spellInfo->CalculateSimpleValue(eff));
+            PetAura pa(pet, aura, spellInfo->EffectImplicitTargetA[eff] == TARGET_UNIT_PET, SpellMgr::CalculateSpellEffectAmount(spellInfo, eff));
             mSpellPetAuraMap[(spell<<8) + eff] = pa;
         }
 
@@ -3840,17 +3914,6 @@ void SpellMgr::LoadEnchantCustomAttr()
     sLog.outString(">> Loaded %u custom enchant attributes", count);
 }
 
-bool SpellMgr::IsSkillTypeSpell(uint32 spellId, SkillType type) const
-{
-    SkillLineAbilityMapBounds bounds = GetSkillLineAbilityMapBounds(spellId);
-
-    for (SkillLineAbilityMap::const_iterator _spell_idx = bounds.first; _spell_idx != bounds.second; ++_spell_idx)
-        if (_spell_idx->second->skillId == uint32(type))
-            return true;
-
-    return false;
-}
-
 void SpellMgr::LoadSpellLinked()
 {
     mSpellLinkedMap.clear();    // need for reload case
diff --git a/src/server/game/Spells/SpellMgr.h b/src/server/game/Spells/SpellMgr.h
index bb76dd92880..872a19a27f1 100644
--- a/src/server/game/Spells/SpellMgr.h
+++ b/src/server/game/Spells/SpellMgr.h
@@ -1212,6 +1212,8 @@ class SpellMgr
 
         bool IsSkillBonusSpell(uint32 spellId) const;
         bool IsSkillTypeSpell(uint32 spellId, SkillType type) const;
+        static int32 CalculateSpellEffectAmount(SpellEntry const * spellEntry, uint8 effIndex, Unit const * caster = NULL, int32 const * basePoints = NULL, Unit const * target = NULL);
+        static int32 CalculateSpellEffectBaseAmount(int32 value) {return value-1;};
 
         // Spell correctess for client using
         static bool IsSpellValid(SpellEntry const * spellInfo, Player* pl = NULL, bool msg = true);
@@ -1322,21 +1324,20 @@ class SpellMgr
         }
         void SetSpellDifficultyId(uint32 spellId, uint32 id) { mSpellDifficultySearcherMap[spellId] = id; }
 
-    const SpellsRequiringSpellMap GetSpellsRequiringSpell()
-    {
-      return this->mSpellsReqSpell;
-    }
-
-    uint32 GetSpellRequired(uint32 spell_id) const
-    {
-      SpellRequiredMap::const_iterator itr = mSpellReq.find(spell_id);
+        const SpellsRequiringSpellMap GetSpellsRequiringSpell()
+        {
+            return this->mSpellsReqSpell;
+        }
 
-      if (itr == mSpellReq.end())
-        return NULL;
+        uint32 GetSpellRequired(uint32 spell_id) const
+        {
+            SpellRequiredMap::const_iterator itr = mSpellReq.find(spell_id);
 
-      return itr->second;
-    }
+            if (itr == mSpellReq.end())
+                return NULL;
 
+            return itr->second;
+        }
 
     // Modifiers
     public:
-- 
cgit v1.2.3


From d59cc55351d0b3f94ae6d71a7d16685a157cb321 Mon Sep 17 00:00:00 2001
From: QAston 
Date: Wed, 14 Jul 2010 17:09:30 +0200
Subject: *Typofix

--HG--
branch : trunk
---
 src/server/game/Entities/Unit/Unit.cpp      | 25 ++++++++++++-------------
 src/server/game/Spells/Auras/SpellAuras.cpp |  2 +-
 2 files changed, 13 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 4d4e0e1c135..b3cfa7f287f 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -3566,19 +3566,18 @@ void Unit::_AddAura(UnitAura * aura, Unit * caster)
         // find current aura from spell and change it's stackamount
         if (Aura * foundAura = GetOwnedAura(aura->GetId(), aura->GetCasterGUID(), 0, aura))
         {
-            if (foundAura->GetSpellProto()->StackAmount)
+            if (aura->GetSpellProto()->StackAmount)
             {
-                foundAura->ModStackAmount(foundAura->GetStackAmount());
-
-                // Update periodic timers from the previous aura
-                for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i)
-                {
-                    AuraEffect *existingEff = foundAura->GetEffect(i);
-                    AuraEffect *newEff = aura->GetEffect(i);
-                    if (!existingEff || !newEff) 
-                        continue;
-                    newEff->SetPeriodicTimer(existingEff->GetPeriodicTimer());
-                }
+                aura->ModStackAmount(foundAura->GetStackAmount());
+            }
+            // Update periodic timers from the previous aura
+            for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i)
+            {
+                AuraEffect *existingEff = foundAura->GetEffect(i);
+                AuraEffect *newEff = aura->GetEffect(i);
+                if (!existingEff || !newEff) 
+                    continue;
+                newEff->SetPeriodicTimer(existingEff->GetPeriodicTimer());
             }
 
             // Use the new one to replace the old one
@@ -7815,7 +7814,7 @@ bool Unit::HandleAuraProc(Unit * pVictim, uint32 damage, Aura * triggeredByAura,
                     *handled = true;
                     if (pVictim->HasAura(53601))
                     {
-                        int32 bp0 = (damage/12) * SpellMgr::CalculateSpellEffectAmount(procSpell, 2)/100;
+                        int32 bp0 = (damage/12) * SpellMgr::CalculateSpellEffectAmount(dummySpell, 2)/100;
                         CastCustomSpell(pVictim, 66922, &bp0, NULL, NULL, true);
                         return true;
                     }   
diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp
index c8672780c13..42f1f151dd9 100644
--- a/src/server/game/Spells/Auras/SpellAuras.cpp
+++ b/src/server/game/Spells/Auras/SpellAuras.cpp
@@ -470,7 +470,7 @@ void Aura::UpdateTargetMap(Unit * caster, bool apply)
         // check target immunities 
         if (itr->first->IsImmunedToSpell(GetSpellProto()) 
             // check area target requirements
-			|| (itr->first != GetOwner() && !CheckAreaTarget(itr->first)))
+            || (itr->first != GetOwner() && !CheckAreaTarget(itr->first)))
             addUnit = false;
 
         if (addUnit)
-- 
cgit v1.2.3


From 894a0652031f509da3689fb4b359b3cfe94073f0 Mon Sep 17 00:00:00 2001
From: Shauren 
Date: Thu, 15 Jul 2010 10:12:51 +0200
Subject: Revert revisions 67325b1a0af0 and a0cba24b9060. Made vendors ignore
 gold cost by default when extended cost is set, except when item has
 ITEM_FLAGS_EXTRA_EXT_COST_REQUIRES_GOLD flag

--HG--
branch : trunk
---
 sql/updates/8897_world_npc_vendor.sql              |  5 ++++
 sql/updates/8897_world_trinity_string.sql          |  2 ++
 src/server/game/Chat/Commands/Level2.cpp           |  2 +-
 src/server/game/Entities/Creature/Creature.cpp     |  2 +-
 src/server/game/Entities/Creature/Creature.h       | 11 ++++---
 src/server/game/Entities/Item/ItemPrototype.h      |  2 +-
 src/server/game/Entities/Player/Player.cpp         | 24 +++++++--------
 src/server/game/Globals/ObjectMgr.cpp              | 34 +++++++++++-----------
 src/server/game/Globals/ObjectMgr.h                |  6 ++--
 .../game/Server/Protocol/Handlers/ItemHandler.cpp  |  4 +--
 10 files changed, 49 insertions(+), 43 deletions(-)
 create mode 100644 sql/updates/8897_world_npc_vendor.sql
 create mode 100644 sql/updates/8897_world_trinity_string.sql

(limited to 'src')

diff --git a/sql/updates/8897_world_npc_vendor.sql b/sql/updates/8897_world_npc_vendor.sql
new file mode 100644
index 00000000000..0e1c793863d
--- /dev/null
+++ b/sql/updates/8897_world_npc_vendor.sql
@@ -0,0 +1,5 @@
+-- Restore negative ExtendedCost, we now use FlagsExtra value instead
+UPDATE `npc_vendor` SET `ExtendedCost`=-`ExtendedCost` WHERE `ExtendedCost`<0;
+
+-- Set field type to unsigned
+ALTER TABLE npc_vendor CHANGE COLUMN `ExtendedCost` `ExtendedCost` mediumint(8) UNSIGNED NOT NULL default '0' COMMENT '';
diff --git a/sql/updates/8897_world_trinity_string.sql b/sql/updates/8897_world_trinity_string.sql
new file mode 100644
index 00000000000..691b0723a5b
--- /dev/null
+++ b/sql/updates/8897_world_trinity_string.sql
@@ -0,0 +1,2 @@
+-- UPDATE so we don't kill customized locale strings if user has any
+UPDATE `trinity_string` SET `content_default`='Item ''%u'' (with extended cost %u) already in vendor list.' WHERE `entry`=210;
diff --git a/src/server/game/Chat/Commands/Level2.cpp b/src/server/game/Chat/Commands/Level2.cpp
index ea0865a88e1..77716e25954 100644
--- a/src/server/game/Chat/Commands/Level2.cpp
+++ b/src/server/game/Chat/Commands/Level2.cpp
@@ -1051,7 +1051,7 @@ bool ChatHandler::HandleNpcAddVendorItemCommand(const char* args)
         incrtime = atol(fincrtime);
 
     char* fextendedcost = strtok(NULL, " ");                //add ExtendedCost, default: 0
-    int32 extendedcost = fextendedcost ? atol(fextendedcost) : 0;
+    uint32 extendedcost = fextendedcost ? atol(fextendedcost) : 0;
 
     Creature* vendor = getSelectedCreature();
 
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp
index 1d66385dada..7e79dc42664 100644
--- a/src/server/game/Entities/Creature/Creature.cpp
+++ b/src/server/game/Entities/Creature/Creature.cpp
@@ -76,7 +76,7 @@ bool VendorItemData::RemoveItem(uint32 item_id)
     return found;
 }
 
-VendorItem const* VendorItemData::FindItemCostPair(uint32 item_id, int32 extendedCost) const
+VendorItem const* VendorItemData::FindItemCostPair(uint32 item_id, uint32 extendedCost) const
 {
     for (VendorItemList::const_iterator i = m_items.begin(); i != m_items.end(); ++i)
         if((*i)->item == item_id && (*i)->ExtendedCost == extendedCost)
diff --git a/src/server/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h
index 9f58079efd0..203106f635e 100644
--- a/src/server/game/Entities/Creature/Creature.h
+++ b/src/server/game/Entities/Creature/Creature.h
@@ -307,17 +307,16 @@ enum ChatType
 // Vendors
 struct VendorItem
 {
-    VendorItem(uint32 _item, int32 _maxcount, uint32 _incrtime, int32 _ExtendedCost)
+    VendorItem(uint32 _item, int32 _maxcount, uint32 _incrtime, uint32 _ExtendedCost)
         : item(_item), maxcount(_maxcount), incrtime(_incrtime), ExtendedCost(_ExtendedCost) {}
 
     uint32 item;
     int32  maxcount;                                        // 0 for infinity item amount
     uint32 incrtime;                                        // time for restore items amount if maxcount != 0
-    int32 ExtendedCost;
+    uint32 ExtendedCost;
 
     //helpers
-    bool IsExcludeMoneyPrice() const { return ExtendedCost > 0; }
-    uint32 GetExtendedCostId() const { return std::abs(ExtendedCost); }
+    bool IsGoldRequired(ItemPrototype const* pProto) const { return pProto->Flags2 & ITEM_FLAGS_EXTRA_EXT_COST_REQUIRES_GOLD || !ExtendedCost; }
 };
 typedef std::vector VendorItemList;
 
@@ -332,12 +331,12 @@ struct VendorItemData
     }
     bool Empty() const { return m_items.empty(); }
     uint8 GetItemCount() const { return m_items.size(); }
-    void AddItem(uint32 item, int32 maxcount, uint32 ptime, int32 ExtendedCost)
+    void AddItem(uint32 item, int32 maxcount, uint32 ptime, uint32 ExtendedCost)
     {
         m_items.push_back(new VendorItem(item, maxcount, ptime, ExtendedCost));
     }
     bool RemoveItem(uint32 item_id);
-    VendorItem const* FindItemCostPair(uint32 item_id, int32 extendedCost) const;
+    VendorItem const* FindItemCostPair(uint32 item_id, uint32 extendedCost) const;
     void Clear()
     {
         for (VendorItemList::const_iterator itr = m_items.begin(); itr != m_items.end(); ++itr)
diff --git a/src/server/game/Entities/Item/ItemPrototype.h b/src/server/game/Entities/Item/ItemPrototype.h
index 7f4dc97df00..1a91ad10c6b 100644
--- a/src/server/game/Entities/Item/ItemPrototype.h
+++ b/src/server/game/Entities/Item/ItemPrototype.h
@@ -136,7 +136,7 @@ enum ItemFlagsExtra
 {
     ITEM_FLAGS_EXTRA_HORDE_ONLY              = 0x00000001,
     ITEM_FLAGS_EXTRA_ALLIANCE_ONLY           = 0x00000002,
-    ITEM_FLAGS_EXTRA_REFUNDABLE              = 0x00000004,
+    ITEM_FLAGS_EXTRA_EXT_COST_REQUIRES_GOLD  = 0x00000004, // when item uses extended cost, gold is also required
     ITEM_FLAGS_EXTRA_NEED_ROLL_DISABLED      = 0x00000100
 };
 
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 0a14be4d35e..b491eec7508 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -19655,12 +19655,12 @@ bool Player::BuyItemFromVendorSlot(uint64 vendorguid, uint32 vendorslot, uint32
         return false;
     }
 
-    if (uint32 extendedCostId = crItem->GetExtendedCostId())
+    if (crItem->ExtendedCost)
     {
-        ItemExtendedCostEntry const* iece = sItemExtendedCostStore.LookupEntry(extendedCostId);
+        ItemExtendedCostEntry const* iece = sItemExtendedCostStore.LookupEntry(crItem->ExtendedCost);
         if (!iece)
         {
-            sLog.outError("Item %u have wrong ExtendedCost field value %u", pProto->ItemId, extendedCostId);
+            sLog.outError("Item %u have wrong ExtendedCost field value %u", pProto->ItemId, crItem->ExtendedCost);
             return false;
         }
 
@@ -19697,7 +19697,7 @@ bool Player::BuyItemFromVendorSlot(uint64 vendorguid, uint32 vendorslot, uint32
         }
     }
 
-    int32 price  = crItem->IsExcludeMoneyPrice() ? 0 : pProto->BuyPrice * count;
+    int32 price  = crItem->IsGoldRequired(pProto) ? pProto->BuyPrice * count : 0;
 
     // reputation discount
     if (price)
@@ -19721,9 +19721,9 @@ bool Player::BuyItemFromVendorSlot(uint64 vendorguid, uint32 vendorslot, uint32
 
         ModifyMoney(-(int32)price);
 
-        if (uint32 extendedCostId = crItem->GetExtendedCostId())                            // case for new honor system
+        if (crItem->ExtendedCost)                            // case for new honor system
         {
-            ItemExtendedCostEntry const* iece = sItemExtendedCostStore.LookupEntry(extendedCostId);
+            ItemExtendedCostEntry const* iece = sItemExtendedCostStore.LookupEntry(crItem->ExtendedCost);
             if (iece->reqhonorpoints)
                 ModifyHonorPoints(- int32(iece->reqhonorpoints * count));
 
@@ -19749,11 +19749,11 @@ bool Player::BuyItemFromVendorSlot(uint64 vendorguid, uint32 vendorslot, uint32
             GetSession()->SendPacket(&data);
             SendNewItem(it, pProto->BuyCount*count, true, false, false);
 
-            if (it->HasFlag(ITEM_FIELD_FLAGS, ITEM_FLAGS_REFUNDABLE) && crItem->GetExtendedCostId())
+            if (it->HasFlag(ITEM_FIELD_FLAGS, ITEM_FLAGS_REFUNDABLE) && crItem->ExtendedCost)
             {
                 it->SetRefundRecipient(GetGUIDLow());
                 it->SetPaidMoney(price);
-                it->SetPaidExtendedCost(crItem->GetExtendedCostId());
+                it->SetPaidExtendedCost(crItem->ExtendedCost);
                 it->SaveRefundDataToDB();
                 AddRefundReference(it->GetGUIDLow());
             }
@@ -19776,9 +19776,9 @@ bool Player::BuyItemFromVendorSlot(uint64 vendorguid, uint32 vendorslot, uint32
         }
 
         ModifyMoney(-(int32)price);
-        if (uint32 extendedCostId = crItem->GetExtendedCostId())                            // case for new honor system
+        if (crItem->ExtendedCost)                            // case for new honor system
         {
-            ItemExtendedCostEntry const* iece = sItemExtendedCostStore.LookupEntry(extendedCostId);
+            ItemExtendedCostEntry const* iece = sItemExtendedCostStore.LookupEntry(crItem->ExtendedCost);
             if (iece->reqhonorpoints)
                 ModifyHonorPoints(- int32(iece->reqhonorpoints * count));
 
@@ -19807,11 +19807,11 @@ bool Player::BuyItemFromVendorSlot(uint64 vendorguid, uint32 vendorslot, uint32
 
             AutoUnequipOffhandIfNeed();
 
-            if (it->HasFlag(ITEM_FIELD_FLAGS, ITEM_FLAGS_REFUNDABLE) && crItem->GetExtendedCostId())
+            if (it->HasFlag(ITEM_FIELD_FLAGS, ITEM_FLAGS_REFUNDABLE) && crItem->ExtendedCost)
             {
                 it->SetRefundRecipient(GetGUIDLow());
                 it->SetPaidMoney(price);
-                it->SetPaidExtendedCost(crItem->GetExtendedCostId());
+                it->SetPaidExtendedCost(crItem->ExtendedCost);
                 it->SaveRefundDataToDB();
                 AddRefundReference(it->GetGUIDLow());
             }
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index a5c084c3a5d..b7ff12e2176 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -8089,14 +8089,14 @@ int ObjectMgr::LoadReferenceVendor(int32 vendor, int32 item, std::set *s
         {
             int32  maxcount     = fields[1].GetInt32();
             uint32 incrtime     = fields[2].GetUInt32();
-            int32  ExtendedCost = fields[3].GetUInt32();
+            uint32 ExtendedCost = fields[3].GetUInt32();
 
-            if (!IsVendorItemValid(vendor,item_id,maxcount,incrtime,ExtendedCost,NULL,skip_vendors))
+            if (!IsVendorItemValid(vendor, item_id, maxcount, incrtime, ExtendedCost, NULL, skip_vendors))
                 continue;
 
             VendorItemData& vList = m_mCacheVendorItemMap[vendor];
 
-            vList.AddItem(item_id,maxcount,incrtime,ExtendedCost);
+            vList.AddItem(item_id, maxcount, incrtime, ExtendedCost);
             ++count;
         }
 
@@ -8144,14 +8144,14 @@ void ObjectMgr::LoadVendors()
         {
             int32  maxcount     = fields[2].GetInt32();
             uint32 incrtime     = fields[3].GetUInt32();
-            int32  ExtendedCost = fields[4].GetUInt32();
+            uint32 ExtendedCost = fields[4].GetUInt32();
 
-            if (!IsVendorItemValid(entry,item_id,maxcount,incrtime,ExtendedCost,NULL,&skip_vendors))
+            if (!IsVendorItemValid(entry, item_id, maxcount, incrtime, ExtendedCost, NULL, &skip_vendors))
                 continue;
 
             VendorItemData& vList = m_mCacheVendorItemMap[entry];
 
-            vList.AddItem(item_id,maxcount,incrtime,ExtendedCost);
+            vList.AddItem(item_id, maxcount, incrtime, ExtendedCost);
             ++count;
         }
 
@@ -8358,12 +8358,13 @@ void ObjectMgr::LoadGossipMenuItems()
     sLog.outString(">> Loaded %u gossip_menu_option entries", count);
 }
 
-void ObjectMgr::AddVendorItem(uint32 entry,uint32 item, int32 maxcount, uint32 incrtime, int32 extendedcost, bool savetodb)
+void ObjectMgr::AddVendorItem(uint32 entry,uint32 item, int32 maxcount, uint32 incrtime, uint32 extendedcost, bool savetodb)
 {
     VendorItemData& vList = m_mCacheVendorItemMap[entry];
-    vList.AddItem(item,maxcount,incrtime,extendedcost);
+    vList.AddItem(item, maxcount, incrtime, extendedcost);
 
-    if (savetodb) WorldDatabase.PExecuteLog("INSERT INTO npc_vendor (entry,item,maxcount,incrtime,extendedcost) VALUES('%u','%u','%u','%u','%i')",entry, item, maxcount,incrtime,extendedcost);
+    if (savetodb)
+        WorldDatabase.PExecuteLog("INSERT INTO npc_vendor (entry,item,maxcount,incrtime,extendedcost) VALUES('%u','%u','%u','%u','%i')", entry, item, maxcount, incrtime, extendedcost);
 }
 
 bool ObjectMgr::RemoveVendorItem(uint32 entry,uint32 item, bool savetodb)
@@ -8379,7 +8380,7 @@ bool ObjectMgr::RemoveVendorItem(uint32 entry,uint32 item, bool savetodb)
     return true;
 }
 
-bool ObjectMgr::IsVendorItemValid(uint32 vendor_entry, uint32 item_id, int32 maxcount, uint32 incrtime, int32 ExtendedCost, Player* pl, std::set* skip_vendors, uint32 ORnpcflag) const
+bool ObjectMgr::IsVendorItemValid(uint32 vendor_entry, uint32 item_id, int32 maxcount, uint32 incrtime, uint32 ExtendedCost, Player* pl, std::set* skip_vendors, uint32 ORnpcflag) const
 {
     CreatureInfo const* cInfo = GetCreatureTemplate(vendor_entry);
     if (!cInfo)
@@ -8411,17 +8412,16 @@ bool ObjectMgr::IsVendorItemValid(uint32 vendor_entry, uint32 item_id, int32 max
         if (pl)
             ChatHandler(pl).PSendSysMessage(LANG_ITEM_NOT_FOUND, item_id);
         else
-            sLog.outErrorDb("Table `(game_event_)npc_vendor` for Vendor (Entry: %u) have in item list non-existed item (%u), ignore",vendor_entry,item_id);
+            sLog.outErrorDb("Table `(game_event_)npc_vendor` for Vendor (Entry: %u) have in item list non-existed item (%u), ignore", vendor_entry, item_id);
         return false;
     }
 
-    uint32 extendedCostId = std::abs(ExtendedCost);
-    if (extendedCostId && !sItemExtendedCostStore.LookupEntry(extendedCostId))
+    if (ExtendedCost && !sItemExtendedCostStore.LookupEntry(ExtendedCost))
     {
         if (pl)
-            ChatHandler(pl).PSendSysMessage(LANG_EXTENDED_COST_NOT_EXIST,extendedCostId);
+            ChatHandler(pl).PSendSysMessage(LANG_EXTENDED_COST_NOT_EXIST, ExtendedCost);
         else
-            sLog.outErrorDb("Table `(game_event_)npc_vendor` have Item (Entry: %u) with wrong ExtendedCost (%u) for vendor (%u), ignore",item_id,extendedCostId,vendor_entry);
+            sLog.outErrorDb("Table `(game_event_)npc_vendor` have Item (Entry: %u) with wrong ExtendedCost (%u) for vendor (%u), ignore", item_id, ExtendedCost, vendor_entry);
         return false;
     }
 
@@ -8449,9 +8449,9 @@ bool ObjectMgr::IsVendorItemValid(uint32 vendor_entry, uint32 item_id, int32 max
     if (vItems->FindItemCostPair(item_id, ExtendedCost))
     {
         if (pl)
-            ChatHandler(pl).PSendSysMessage(LANG_ITEM_ALREADY_IN_LIST, item_id, extendedCostId);
+            ChatHandler(pl).PSendSysMessage(LANG_ITEM_ALREADY_IN_LIST, item_id, ExtendedCost);
         else
-            sLog.outErrorDb( "Table `npc_vendor` has duplicate items %u (with extended cost %u) for vendor (Entry: %u), ignoring", item_id, extendedCostId, vendor_entry);
+            sLog.outErrorDb( "Table `npc_vendor` has duplicate items %u (with extended cost %u) for vendor (Entry: %u), ignoring", item_id, ExtendedCost, vendor_entry);
         return false;
     }
 
diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h
index 320bf12cb21..7b7e0e2bdb9 100644
--- a/src/server/game/Globals/ObjectMgr.h
+++ b/src/server/game/Globals/ObjectMgr.h
@@ -882,9 +882,9 @@ class ObjectMgr
 
             return &iter->second;
         }
-        void AddVendorItem(uint32 entry,uint32 item, int32 maxcount, uint32 incrtime, int32 ExtendedCost, bool savetodb = true); // for event
-        bool RemoveVendorItem(uint32 entry,uint32 item, bool savetodb = true); // for event
-        bool IsVendorItemValid(uint32 vendor_entry, uint32 item, int32 maxcount, uint32 ptime, int32 ExtendedCost, Player* pl = NULL, std::set* skip_vendors = NULL, uint32 ORnpcflag = 0) const;
+        void AddVendorItem(uint32 entry,uint32 item, int32 maxcount, uint32 incrtime, uint32 ExtendedCost, bool savetodb = true); // for event
+        bool RemoveVendorItem(uint32 entry, uint32 item, bool savetodb = true); // for event
+        bool IsVendorItemValid(uint32 vendor_entry, uint32 item, int32 maxcount, uint32 ptime, uint32 ExtendedCost, Player* pl = NULL, std::set* skip_vendors = NULL, uint32 ORnpcflag = 0) const;
 
         void LoadScriptNames();
         ScriptNameMap &GetScriptNames() { return m_scriptNames; }
diff --git a/src/server/game/Server/Protocol/Handlers/ItemHandler.cpp b/src/server/game/Server/Protocol/Handlers/ItemHandler.cpp
index d969013801b..39c3b61a445 100644
--- a/src/server/game/Server/Protocol/Handlers/ItemHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/ItemHandler.cpp
@@ -772,7 +772,7 @@ void WorldSession::SendListInventory(uint64 vendorguid)
                 ++count;
 
                 // reputation discount
-                int32 price = crItem->IsExcludeMoneyPrice() ? 0 : uint32(floor(pProto->BuyPrice * discountMod));
+                int32 price = crItem->IsGoldRequired(pProto) ? uint32(floor(pProto->BuyPrice * discountMod)) : 0;
 
                 data << uint32(vendorslot+1);    // client expects counting to start at 1
                 data << uint32(crItem->item);
@@ -781,7 +781,7 @@ void WorldSession::SendListInventory(uint64 vendorguid)
                 data << uint32(price);
                 data << uint32(pProto->MaxDurability);
                 data << uint32(pProto->BuyCount);
-                data << uint32(crItem->GetExtendedCostId());
+                data << uint32(crItem->ExtendedCost);
             }
         }
     }
-- 
cgit v1.2.3


From a214443409068257f19c00f5855f3352c550bffc Mon Sep 17 00:00:00 2001
From: Shauren 
Date: Thu, 15 Jul 2010 10:16:30 +0200
Subject: Typo fix

--HG--
branch : trunk
---
 src/server/game/Globals/ObjectMgr.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index b7ff12e2176..71cd4c46b80 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -8364,7 +8364,7 @@ void ObjectMgr::AddVendorItem(uint32 entry,uint32 item, int32 maxcount, uint32 i
     vList.AddItem(item, maxcount, incrtime, extendedcost);
 
     if (savetodb)
-        WorldDatabase.PExecuteLog("INSERT INTO npc_vendor (entry,item,maxcount,incrtime,extendedcost) VALUES('%u','%u','%u','%u','%i')", entry, item, maxcount, incrtime, extendedcost);
+        WorldDatabase.PExecuteLog("INSERT INTO npc_vendor (entry,item,maxcount,incrtime,extendedcost) VALUES('%u','%u','%u','%u','%u')", entry, item, maxcount, incrtime, extendedcost);
 }
 
 bool ObjectMgr::RemoveVendorItem(uint32 entry,uint32 item, bool savetodb)
-- 
cgit v1.2.3


From d2b4ffbec37499259f1c26cf8e2142b012f9f6bd Mon Sep 17 00:00:00 2001
From: click 
Date: Thu, 15 Jul 2010 19:43:47 +0200
Subject: Use a slightly different approach to tree bound intersection (by
 Lynx3d)

--HG--
branch : trunk
---
 src/server/collision/BoundingIntervalHierarchy.h | 34 +++++++++++++-----------
 1 file changed, 19 insertions(+), 15 deletions(-)

(limited to 'src')

diff --git a/src/server/collision/BoundingIntervalHierarchy.h b/src/server/collision/BoundingIntervalHierarchy.h
index d4d41a66d30..1e1955641cf 100644
--- a/src/server/collision/BoundingIntervalHierarchy.h
+++ b/src/server/collision/BoundingIntervalHierarchy.h
@@ -116,32 +116,36 @@ class BIH
         template
         void intersectRay(const Ray &r, RayCallback& intersectCallback, float &maxDist, bool stopAtFirst=false) const
         {
-            float intervalMin = 0.f;
-            float intervalMax = maxDist;
+            float intervalMin = -1.f;
+            float intervalMax = -1.f;
             Vector3 org = r.origin();
             Vector3 dir = r.direction();
             Vector3 invDir;
-            float t1, t2;
-            for(int i=0; i<3; ++i)
+            for (int i=0; i<3; ++i)
             {
                 invDir[i] = 1.f / dir[i];
-                t1 = (bounds.low()[i] - org[i]) * invDir[i];
-                t2 = (bounds.high()[i] - org[i]) * invDir[i];
-                if (invDir[i] > 0) {
+                if (dir[i] != 0.f)
+                {
+                    float t1 = (bounds.low()[i]  - org[i]) * invDir[i];
+                    float t2 = (bounds.high()[i] - org[i]) * invDir[i];
+                    if (t1 > t2)
+                        std::swap(t1, t2);
                     if (t1 > intervalMin)
                         intervalMin = t1;
-                    if (t2 < intervalMax)
+                    if (t2 < intervalMax || intervalMax < 0.f)
                         intervalMax = t2;
-                } else {
-                    if (t2 > intervalMin)
-                        intervalMin = t2;
-                    if (t1 < intervalMax)
-                        intervalMax = t1;
+                    // intervalMax can only become smaller for other axis,
+                    //  and intervalMin only larger respectively, so stop early
+                    if (intervalMax <= 0 || intervalMin >= maxDist)
+                        return;
                 }
-                if (intervalMin > intervalMax)
-                    return;
             }
 
+            if (intervalMin > intervalMax)
+                return;
+            intervalMin = std::max(intervalMin, 0.f);
+            intervalMax = std::min(intervalMax, maxDist);
+
             uint32 offsetFront[3];
             uint32 offsetBack[3];
             uint32 offsetFront3[3];
-- 
cgit v1.2.3


From 0252202504bfeea0591b8c9ee03527d0495d4afd Mon Sep 17 00:00:00 2001
From: QAston 
Date: Thu, 15 Jul 2010 23:20:41 +0200
Subject: *Correctly set basepoints of Learn spells - patch by Toni.Shocker.
 *Make sure that Spell::m_currentBasePoints are used correctly in any other
 place of the code.

--HG--
branch : trunk
---
 src/server/game/Entities/Player/Player.cpp    | 2 +-
 src/server/game/Spells/Auras/SpellEffects.cpp | 6 +++---
 src/server/game/Spells/Spell.cpp              | 4 ++--
 src/server/game/Spells/Spell.h                | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index b491eec7508..9c63c2f73c8 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -7845,7 +7845,7 @@ void Player::CastItemUseSpell(Item *item,SpellCastTargets const& targets,uint8 c
         Spell *spell = new Spell(this, spellInfo,false);
         spell->m_CastItem = item;
         spell->m_cast_count = cast_count;                   //set count of casts
-        spell->m_currentBasePoints[0] = learning_spell_id;
+        spell->m_currentBasePoints[0] = SpellMgr::CalculateSpellEffectBaseAmount(learning_spell_id);
         spell->prepare(&targets);
         return;
     }
diff --git a/src/server/game/Spells/Auras/SpellEffects.cpp b/src/server/game/Spells/Auras/SpellEffects.cpp
index 88e1ac72928..3a80ce458f8 100644
--- a/src/server/game/Spells/Auras/SpellEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellEffects.cpp
@@ -521,7 +521,7 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
                         damage += pdamage * aura->GetTotalTicks() * pct_dir / 100;
 
                         uint32 pct_dot = m_caster->CalculateSpellDamage(unitTarget, m_spellInfo, (effect_idx + 2)) / 3;
-                        m_currentBasePoints[1] = pdamage * aura->GetTotalTicks() * pct_dot / 100;
+                        m_currentBasePoints[1] = SpellMgr::CalculateSpellEffectBaseAmount(pdamage * aura->GetTotalTicks() * pct_dot / 100);
 
                         apply_direct_bonus = false;
                         // Glyph of Conflagrate
@@ -2121,7 +2121,7 @@ void Spell::EffectDummy(uint32 i)
                 if (m_targets.HasDst())
                     targets.setDst(&m_targets.m_dstPos);
 
-                spell_id = m_currentBasePoints[0];
+                spell_id = CalculateDamage(0, NULL);
             }
             // Corpse Explosion
             else if (m_spellInfo->SpellIconID == 1737)
@@ -2173,7 +2173,7 @@ void Spell::EffectDummy(uint32 i)
 
         targets.setUnitTarget(unitTarget);
         Spell* spell = new Spell(m_caster, spellInfo, triggered, m_originalCasterGUID, NULL, true);
-        if (bp) spell->m_currentBasePoints[0] = bp;
+        if (bp) spell->m_currentBasePoints[0] = SpellMgr::CalculateSpellEffectBaseAmount(bp);
         spell->prepare(&targets);
     }
 
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
index c371d518a04..5f55b52d85c 100644
--- a/src/server/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
@@ -6852,8 +6852,8 @@ SpellCastResult Spell::CanOpenLock(uint32 effIndex, uint32 lockId, SkillType& sk
                 if (skillId != SKILL_NONE)
                 {
                     // skill bonus provided by casting spell (mostly item spells)
-                    // add the damage modifier from the spell casted (cheat lock / skeleton key etc.) (use m_currentBasePoints, CalculateDamage returns wrong value)
-                    uint32 spellSkillBonus = uint32(m_currentBasePoints[effIndex]);
+                    // add the damage modifier from the spell casted (cheat lock / skeleton key etc.)
+                    uint32 spellSkillBonus = uint32(CalculateDamage(effIndex, NULL));
                     reqSkillValue = lockInfo->Skill[j];
 
                     // castitem check: rogue using skeleton keys. the skill values should not be added in this case.
diff --git a/src/server/game/Spells/Spell.h b/src/server/game/Spells/Spell.h
index 61014343878..d41f4309263 100644
--- a/src/server/game/Spells/Spell.h
+++ b/src/server/game/Spells/Spell.h
@@ -462,7 +462,7 @@ class Spell
         void HandleThreatSpells(uint32 spellId);
 
         const SpellEntry * const m_spellInfo;
-        int32 m_currentBasePoints[3];                       // cache SpellEntry::EffectBasePoints and use for set custom base points
+        int32 m_currentBasePoints[3]; // overrides SpellEntry::EffectBasePoints IMPORTANT: base points != points calculated
         Item* m_CastItem;
         uint64 m_castItemGUID;
         uint8 m_cast_count;
-- 
cgit v1.2.3


From 3c1887aab96b11d4ae8aefb5389db0f73a469d1f Mon Sep 17 00:00:00 2001
From: _manuel_ 
Date: Thu, 15 Jul 2010 19:31:40 -0300
Subject: Fixed problems with Sacred Cleansing, by QAston.

Fixes issue 546.

--HG--
branch : trunk
---
 src/server/game/Entities/Unit/Unit.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index b3cfa7f287f..6f68b50e871 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -2892,11 +2892,12 @@ SpellMissInfo Unit::MagicSpellHitResult(Unit *pVictim, SpellEntry const *spell)
         return SPELL_MISS_MISS;
 
     // Chance resist mechanic (select max value from every mechanic spell effect)
-    int32 resist_chance = pVictim->GetMechanicResistChance(spell);
+    int32 resist_chance = pVictim->GetMechanicResistChance(spell)*100;
     tmp += resist_chance;
 
     // Chance resist debuff
-    tmp -= pVictim->GetTotalAuraModifierByMiscValue(SPELL_AURA_MOD_DEBUFF_RESISTANCE, int32(spell->Dispel));
+    tmp += pVictim->GetMaxPositiveAuraModifierByMiscValue(SPELL_AURA_MOD_DEBUFF_RESISTANCE, int32(spell->Dispel)) * 100;
+    tmp += pVictim->GetMaxNegativeAuraModifierByMiscValue(SPELL_AURA_MOD_DEBUFF_RESISTANCE, int32(spell->Dispel)) * 100;
 
    // Roll chance
     if (rand < tmp)
-- 
cgit v1.2.3


From 5ca174832655c26a036bf365d807c4bf10e88c47 Mon Sep 17 00:00:00 2001
From: QAston 
Date: Fri, 16 Jul 2010 01:08:06 +0200
Subject: *Implement aura type SPELL_AURA_SHARE_DAMAGE_PCT(300), somewhat based
 on patch by joshwhedon *Add some guess comments about unknown aura types

--HG--
branch : trunk
---
 src/server/game/Entities/Unit/Unit.cpp            | 20 +++++++++++++++++++-
 src/server/game/Spells/Auras/SpellAuraDefines.h   |  2 +-
 src/server/game/Spells/Auras/SpellAuraEffects.cpp | 12 ++++++------
 3 files changed, 26 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 6f68b50e871..45ff1af316f 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -586,8 +586,26 @@ uint32 Unit::DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDa
     {
         // interrupting auras with AURA_INTERRUPT_FLAG_DAMAGE before checking !damage (absorbed damage breaks that type of auras)
         pVictim->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_TAKE_DAMAGE, spellProto ? spellProto->Id : 0);
-    }
 
+        // copy damage to casters of this aura
+        AuraEffectList const& vCopyDamage = pVictim->GetAuraEffectsByType(SPELL_AURA_SHARE_DAMAGE_PCT);
+        for (AuraEffectList::const_iterator i = vCopyDamage.begin(); i != vCopyDamage.end(); ++i)
+        {
+            // check damage school mask
+            if (((*i)->GetMiscValue() & damageSchoolMask) == 0)
+                continue;
+
+            Unit * shareDamageTarget = (*i)->GetCaster();
+            if (!shareDamageTarget)
+                continue;
+            SpellEntry const * spell = (*i)->GetSpellProto();
+
+            uint32 share = damage * (float((*i)->GetAmount()) / 100.0f);
+            // TODO: check packets if damage is done by pVictim, or by attacker of pVicitm
+            DealDamageMods(shareDamageTarget, share, NULL);
+            DealDamage(shareDamageTarget, share, NULL, NODAMAGE, GetSpellSchoolMask(spell), spell, false);
+        }
+    }
 
     // Rage from Damage made (only from direct weapon damage)
     if (cleanDamage && damagetype == DIRECT_DAMAGE && this != pVictim && getPowerType() == POWER_RAGE)
diff --git a/src/server/game/Spells/Auras/SpellAuraDefines.h b/src/server/game/Spells/Auras/SpellAuraDefines.h
index 81af1e71ecc..3feb01759ab 100644
--- a/src/server/game/Spells/Auras/SpellAuraDefines.h
+++ b/src/server/game/Spells/Auras/SpellAuraDefines.h
@@ -344,7 +344,7 @@ enum AuraType
     SPELL_AURA_297 = 297,
     SPELL_AURA_298 = 298,
     SPELL_AURA_299 = 299,
-    SPELL_AURA_300 = 300,
+    SPELL_AURA_SHARE_DAMAGE_PCT = 300,
     SPELL_AURA_SCHOOL_HEAL_ABSORB = 301,
     SPELL_AURA_302 = 302,
     SPELL_AURA_303 = 303,
diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
index 3835e4703a7..8cdf48d5b10 100644
--- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
@@ -271,7 +271,7 @@ pAuraEffectHandler AuraEffectHandler[TOTAL_AURAS]=
     &AuraEffect::HandleNULL,                                      //214 Tamed Pet Passive
     &AuraEffect::HandleArenaPreparation,                          //215 SPELL_AURA_ARENA_PREPARATION
     &AuraEffect::HandleModCastingSpeed,                           //216 SPELL_AURA_HASTE_SPELLS
-    &AuraEffect::HandleUnused,                                    //217 unused (3.2.0)
+    &AuraEffect::HandleNULL,                                      //217 69106 - killing spree helper - unknown use
     &AuraEffect::HandleAuraModRangedHaste,                        //218 SPELL_AURA_HASTE_RANGED
     &AuraEffect::HandleModManaRegen,                              //219 SPELL_AURA_MOD_MANA_REGEN_FROM_STAT
     &AuraEffect::HandleModRatingFromStat,                         //220 SPELL_AURA_MOD_RATING_FROM_STAT
@@ -347,13 +347,13 @@ pAuraEffectHandler AuraEffectHandler[TOTAL_AURAS]=
     &AuraEffect::HandleAuraModCritPct,                            //290 SPELL_AURA_MOD_CRIT_PCT
     &AuraEffect::HandleNoImmediateEffect,                         //291 SPELL_AURA_MOD_XP_QUEST_PCT  implemented in Player::RewardQuest
     &AuraEffect::HandleNULL,                                      //292 call stabled pet
-    &AuraEffect::HandleNULL,                                      //293 2 test spells
+    &AuraEffect::HandleNULL,                                      //293 auras which probably add set of abilities to their target based on it's miscvalue
     &AuraEffect::HandleNoImmediateEffect,                         //294 SPELL_AURA_PREVENT_REGENERATE_POWER implemented in Player::Regenerate(Powers power)
-    &AuraEffect::HandleNULL,                                      //296 2 spells
-    &AuraEffect::HandleNULL,                                      //297 1 spell (counter spell school?)
-    &AuraEffect::HandleNULL,                                      //298 unused
+    &AuraEffect::HandleNULL,                                      //296 6 spells, something vehicle or character display related
+    &AuraEffect::HandleNULL,                                      //297 Spirit Burst spells
+    &AuraEffect::HandleNULL,                                      //298 70569 - Strangulating, maybe prevents talk or cast
     &AuraEffect::HandleNULL,                                      //299 unused
-    &AuraEffect::HandleNULL,                                      //300 3 spells (share damage?)
+    &AuraEffect::HandleNoImmediateEffect,                         //300 SPELL_AURA_SHARE_DAMAGE_PCT implemented in Unit::DealDamage
     &AuraEffect::HandleNoImmediateEffect,                         //301 SPELL_AURA_SCHOOL_HEAL_ABSORB implemented in Unit::CalcHealAbsorb
     &AuraEffect::HandleNULL,                                      //302 unused
     &AuraEffect::HandleNULL,                                      //303 17 spells
-- 
cgit v1.2.3


From 719f13874e83b19ac3b096eda877face6691de28 Mon Sep 17 00:00:00 2001
From: QAston 
Date: Fri, 16 Jul 2010 13:20:50 +0200
Subject: *Rename SPELL_AURA_RANGED_AP_ATTACKER_CREATURES_BONUS to
 SPELL_AURA_MOD_CREATURE_AOE_DAMAGE_AVOIDANCE, and reimplement that aura type.
 *Some more research about new aura types.

--HG--
branch : trunk
---
 src/server/game/Entities/Unit/Unit.cpp            | 13 +----------
 src/server/game/Spells/Auras/SpellAuraDefines.h   |  6 ++---
 src/server/game/Spells/Auras/SpellAuraEffects.cpp | 28 +++++++++++------------
 src/server/game/Spells/Spell.cpp                  | 15 ++++--------
 src/server/game/Spells/SpellMgr.cpp               |  1 +
 5 files changed, 23 insertions(+), 40 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 45ff1af316f..4a9094f1c5c 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -11208,17 +11208,7 @@ void Unit::MeleeDamageBonus(Unit *pVictim, uint32 *pdamage, WeaponAttackType att
     // ..done (base at attack power for marked target and base at attack power for creature type)
     int32 APbonus = 0;
 
-    if (attType == RANGED_ATTACK && pVictim->GetTypeId() == TYPEID_UNIT)
-    {
-        APbonus += pVictim->GetTotalAuraModifier(SPELL_AURA_RANGED_AP_ATTACKER_CREATURES_BONUS);
-
-        // ..done (base at attack power and creature type)
-        AuraEffectList const& mCreatureAttackPower = GetAuraEffectsByType(SPELL_AURA_MOD_RANGED_ATTACK_POWER_VERSUS);
-        for (AuraEffectList::const_iterator i = mCreatureAttackPower.begin(); i != mCreatureAttackPower.end(); ++i)
-            if (creatureTypeMask & uint32((*i)->GetMiscValue()))
-                APbonus += (*i)->GetAmount();
-    }
-    else if (attType == RANGED_ATTACK)
+    if (attType == RANGED_ATTACK)
     {
         APbonus += pVictim->GetTotalAuraModifier(SPELL_AURA_RANGED_ATTACK_POWER_ATTACKER_BONUS);
 
@@ -13689,7 +13679,6 @@ bool InitTriggerAuraData()
 
     isNonTriggerAura[SPELL_AURA_MOD_POWER_REGEN]=true;
     isNonTriggerAura[SPELL_AURA_REDUCE_PUSHBACK]=true;
-    isTriggerAura[SPELL_AURA_RANGED_AP_ATTACKER_CREATURES_BONUS] = true;
 
     return true;
 }
diff --git a/src/server/game/Spells/Auras/SpellAuraDefines.h b/src/server/game/Spells/Auras/SpellAuraDefines.h
index 3feb01759ab..a3a037ae5a8 100644
--- a/src/server/game/Spells/Auras/SpellAuraDefines.h
+++ b/src/server/game/Spells/Auras/SpellAuraDefines.h
@@ -354,12 +354,12 @@ enum AuraType
     SPELL_AURA_307 = 307,
     SPELL_AURA_308 = 308,
     SPELL_AURA_309 = 309,
-    SPELL_AURA_RANGED_AP_ATTACKER_CREATURES_BONUS = 310,
+    SPELL_AURA_MOD_CREATURE_AOE_DAMAGE_AVOIDANCE = 310,
     SPELL_AURA_311 = 311,
     SPELL_AURA_312 = 312,
     SPELL_AURA_313 = 313,
-    SPELL_AURA_314 = 314,
-    SPELL_AURA_315 = 315,
+    SPELL_AURA_PREVENT_RESSURECTION = 314,
+    SPELL_AURA_UNDERWATER_WALKING = 315,
     SPELL_AURA_PERIODIC_HASTE = 316,
     TOTAL_AURAS = 317
 };
diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
index 8cdf48d5b10..19c1e7ffee6 100644
--- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
@@ -355,22 +355,21 @@ pAuraEffectHandler AuraEffectHandler[TOTAL_AURAS]=
     &AuraEffect::HandleNULL,                                      //299 unused
     &AuraEffect::HandleNoImmediateEffect,                         //300 SPELL_AURA_SHARE_DAMAGE_PCT implemented in Unit::DealDamage
     &AuraEffect::HandleNoImmediateEffect,                         //301 SPELL_AURA_SCHOOL_HEAL_ABSORB implemented in Unit::CalcHealAbsorb
-    &AuraEffect::HandleNULL,                                      //302 unused
-    &AuraEffect::HandleNULL,                                      //303 17 spells
-    &AuraEffect::HandleNULL,                                      //304 2 spells (alcohol effect?)
+    &AuraEffect::HandleNULL,                                      //302 0 spells in 3.3.5
+    &AuraEffect::HandleNULL,                                      //303 SPELL_AURA_MOD_DMG_VESRUS_AURASTATE_PCT? - 22 and 19 look like serverside aurastates (22 - dark, gas cloud, 19 light, ooze)
+    &AuraEffect::HandleUnused,                                    //304 clientside
     &AuraEffect::HandleAuraModIncreaseSpeed,                      //305 SPELL_AURA_MOD_MINIMUM_SPEED
-    &AuraEffect::HandleNULL,                                      //306 1 spell
-    &AuraEffect::HandleNULL,                                      //307 absorb healing?
+    &AuraEffect::HandleNULL,                                      //306 0 spells in 3.3.5
+    &AuraEffect::HandleNULL,                                      //307 0 spells in 3.3.5
     &AuraEffect::HandleNULL,                                      //308 new aura for hunter traps
-    &AuraEffect::HandleNULL,                                      //309 absorb healing?
-    &AuraEffect::HandleNoImmediateEffect,                         //310 5 spells SPELL_AURA_RANGED_AP_ATTACKER_CREATURES_BONUS implemented in Unit::MeleeDamageBonus
-    &AuraEffect::HandleNULL,                                      //311 0 spells in 3.3
-    &AuraEffect::HandleNULL,                                      //312 0 spells in 3.3
-    &AuraEffect::HandleNULL,                                      //313 0 spells in 3.3
-    &AuraEffect::HandleNULL,                                      //314 1 test spell (reduce duration of silince/magic)
-    &AuraEffect::HandleNULL,                                      //315 underwater walking
+    &AuraEffect::HandleNULL,                                      //309 0 spells in 3.3.5
+    &AuraEffect::HandleNoImmediateEffect,                         //310 SPELL_AURA_MOD_CREATURE_AOE_DAMAGE_AVOIDANCE implemented in Spell::CalculateDamageDone
+    &AuraEffect::HandleNULL,                                      //311 0 spells in 3.3.5
+    &AuraEffect::HandleNULL,                                      //312 0 spells in 3.3.5
+    &AuraEffect::HandleNULL,                                      //313 0 spells in 3.3.5
+    &AuraEffect::HandleNoImmediateEffect,                         //314 SPELL_AURA_PREVENT_RESSURECTION todo
+    &AuraEffect::HandleNoImmediateEffect,                         //315 SPELL_AURA_UNDERWATER_WALKING todo
     &AuraEffect::HandleNoImmediateEffect,                         //316 SPELL_AURA_PERIODIC_HASTE implemented in AuraEffect::CalculatePeriodic
-    &AuraEffect::HandleNULL
 };
 
 AuraEffect::AuraEffect(Aura * base, uint8 effIndex, int32 *baseAmount, Unit * caster) :
@@ -780,7 +779,8 @@ void AuraEffect::CalculatePeriodic(Unit * caster, bool create)
             modOwner->ModSpellCastTime(m_spellProto, m_amplitude);
         }
         // For spells that can benefit from haste
-        else if (modOwner->HasAuraType(SPELL_AURA_PERIODIC_HASTE)) {
+        else if (modOwner->HasAuraType(SPELL_AURA_PERIODIC_HASTE)) 
+        {
             const Unit::AuraEffectList &effList = modOwner->GetAuraEffectsByType(SPELL_AURA_PERIODIC_HASTE);
             for (Unit::AuraEffectList::const_iterator itr = effList.begin(), end = effList.end(); itr != end; ++itr)
             {
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
index 5f55b52d85c..650f464d56b 100644
--- a/src/server/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
@@ -5447,17 +5447,6 @@ SpellCastResult Spell::CheckCast(bool strict)
                 }
                 break;
             }
-            case SPELL_AURA_RANGED_AP_ATTACKER_CREATURES_BONUS:
-            {
-                if (!m_targets.getUnitTarget() && m_targets.getUnitTarget()->GetTypeId() != TYPEID_UNIT)
-                    return SPELL_FAILED_BAD_IMPLICIT_TARGETS;
-
-                // can be casted at non-friendly unit or own pet/charm
-                if (m_caster->IsFriendlyTo(m_targets.getUnitTarget()))
-                    return SPELL_FAILED_TARGET_FRIENDLY;
-
-                break;
-            }
             case SPELL_AURA_PERIODIC_MANA_LEECH:
             {
                 if (!m_targets.getUnitTarget())
@@ -6791,6 +6780,10 @@ int32 Spell::CalculateDamageDone(Unit *unit, const uint32 effectMask, float *mul
             {
                 if (IsAreaEffectTarget[m_spellInfo->EffectImplicitTargetA[i]] || IsAreaEffectTarget[m_spellInfo->EffectImplicitTargetB[i]])
                 {
+                    m_damage = float(m_damage) * unit->GetTotalAuraMultiplierByMiscMask(SPELL_AURA_MOD_AOE_DAMAGE_AVOIDANCE, m_spellInfo->SchoolMask);
+                    if (m_caster->GetTypeId() == TYPEID_UNIT)
+                        m_damage = float(m_damage) * unit->GetTotalAuraMultiplierByMiscMask(SPELL_AURA_MOD_CREATURE_AOE_DAMAGE_AVOIDANCE, m_spellInfo->SchoolMask);
+
                     if (int32 reducedPct = unit->GetMaxNegativeAuraModifier(SPELL_AURA_MOD_AOE_DAMAGE_AVOIDANCE))
                         m_damage = m_damage * (100 + reducedPct) / 100;
 
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp
index 5ebb927eb80..701d1db1b05 100644
--- a/src/server/game/Spells/SpellMgr.cpp
+++ b/src/server/game/Spells/SpellMgr.cpp
@@ -890,6 +890,7 @@ bool SpellMgr::_isPositiveEffect(uint32 spellId, uint32 effIndex, bool deep) con
                 case SPELL_AURA_PERIODIC_LEECH:
                 case SPELL_AURA_MOD_STALKED:
                 case SPELL_AURA_PERIODIC_DAMAGE_PERCENT:
+                case SPELL_AURA_PREVENT_RESSURECTION:
                     return false;
                 case SPELL_AURA_PERIODIC_DAMAGE:            // used in positive spells also.
                     // part of negative spell if casted at self (prevent cancel)
-- 
cgit v1.2.3


From b406321c01235d7cc35a834a6ce3f7e6da74b37a Mon Sep 17 00:00:00 2001
From: QAston 
Date: Fri, 16 Jul 2010 14:23:03 +0200
Subject: *Prevent possible problems with application of negative auras with 0
 duration, now only spell hits which were diminished are immuned. *Remove old
 code of SPELL_AURA_MOD_AOE_DAMAGE_AVOIDANCE forgotten in c84e55b632.

--HG--
branch : trunk
---
 src/server/game/Entities/Unit/Unit.cpp |  5 +++--
 src/server/game/Entities/Unit/Unit.h   |  2 +-
 src/server/game/Spells/Spell.cpp       | 19 +++++++++----------
 3 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 4a9094f1c5c..61fc98e3ae2 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -12710,10 +12710,10 @@ void Unit::IncrDiminishing(DiminishingGroup group)
     m_Diminishing.push_back(DiminishingReturn(group,getMSTime(),DIMINISHING_LEVEL_2));
 }
 
-void Unit::ApplyDiminishingToDuration(DiminishingGroup group, int32 &duration,Unit* caster,DiminishingLevels Level, int32 limitduration)
+float Unit::ApplyDiminishingToDuration(DiminishingGroup group, int32 &duration,Unit* caster,DiminishingLevels Level, int32 limitduration)
 {
     if (duration == -1 || group == DIMINISHING_NONE || caster->IsFriendlyTo(this))
-        return;
+        return 1.0f;
 
     // test pet/charm masters instead pets/charmeds
     Unit const* targetOwner = GetCharmerOrOwner();
@@ -12767,6 +12767,7 @@ void Unit::ApplyDiminishingToDuration(DiminishingGroup group, int32 &duration,Un
     }
 
     duration = int32(duration * mod);
+    return mod;
 }
 
 void Unit::ApplyDiminishingAura(DiminishingGroup group, bool apply)
diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h
index 2051123dfb5..347a862b5d4 100644
--- a/src/server/game/Entities/Unit/Unit.h
+++ b/src/server/game/Entities/Unit/Unit.h
@@ -1106,7 +1106,7 @@ class Unit : public WorldObject
 
         DiminishingLevels GetDiminishing(DiminishingGroup  group);
         void IncrDiminishing(DiminishingGroup group);
-        void ApplyDiminishingToDuration(DiminishingGroup  group, int32 &duration,Unit* caster, DiminishingLevels Level, int32 limitduration);
+        float ApplyDiminishingToDuration(DiminishingGroup  group, int32 &duration,Unit* caster, DiminishingLevels Level, int32 limitduration);
         void ApplyDiminishingAura(DiminishingGroup  group, bool apply);
         void ClearDiminishings() { m_Diminishing.clear(); }
 
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
index 650f464d56b..a6185085161 100644
--- a/src/server/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
@@ -1344,7 +1344,15 @@ SpellMissInfo Spell::DoSpellHitOnUnit(Unit *unit, const uint32 effectMask, bool
                 // Now Reduce spell duration using data received at spell hit
                 int32 duration = m_spellAura->GetMaxDuration();
                 int32 limitduration = GetDiminishingReturnsLimitDuration(m_diminishGroup,aurSpellInfo);
-                unit->ApplyDiminishingToDuration(m_diminishGroup, duration, m_originalCaster, m_diminishLevel,limitduration);
+                float diminishMod = unit->ApplyDiminishingToDuration(m_diminishGroup, duration, m_originalCaster, m_diminishLevel,limitduration);
+
+                // unit is immune to aura if it was diminished to 0 duration
+                if (diminishMod == 0.0f)
+                {
+                    m_spellAura->Remove();
+                    return SPELL_MISS_IMMUNE;
+                }
+
                 ((UnitAura*)m_spellAura)->SetDiminishGroup(m_diminishGroup);
 
                 bool positive = IsPositiveSpell(m_spellAura->GetId());
@@ -1358,12 +1366,6 @@ SpellMissInfo Spell::DoSpellHitOnUnit(Unit *unit, const uint32 effectMask, bool
                 if (IsChanneledSpell(m_spellInfo))
                     m_originalCaster->ModSpellCastTime(aurSpellInfo, duration, this);
 
-                if (duration == 0 && !positive)
-                {
-                    m_spellAura->Remove();
-                    return SPELL_MISS_IMMUNE;
-                }
-
                 if (duration != m_spellAura->GetMaxDuration())
                 {
                     m_spellAura->SetMaxDuration(duration);
@@ -6784,9 +6786,6 @@ int32 Spell::CalculateDamageDone(Unit *unit, const uint32 effectMask, float *mul
                     if (m_caster->GetTypeId() == TYPEID_UNIT)
                         m_damage = float(m_damage) * unit->GetTotalAuraMultiplierByMiscMask(SPELL_AURA_MOD_CREATURE_AOE_DAMAGE_AVOIDANCE, m_spellInfo->SchoolMask);
 
-                    if (int32 reducedPct = unit->GetMaxNegativeAuraModifier(SPELL_AURA_MOD_AOE_DAMAGE_AVOIDANCE))
-                        m_damage = m_damage * (100 + reducedPct) / 100;
-
                     if (m_caster->GetTypeId() == TYPEID_PLAYER)
                     {
                         uint32 targetAmount = m_UniqueTargetInfo.size();
-- 
cgit v1.2.3


From 7e8c61c95a6505ac223ae07ebbbbae5c0b50c8fb Mon Sep 17 00:00:00 2001
From: QAston 
Date: Fri, 16 Jul 2010 14:42:24 +0200
Subject: *Remove hack for Divine Storm from Unit::DealDamage *"Zip" some data
 in SpellMgr::LoadSpellCustomAttr *Add MaxAffectedTargets for Divine storm
 heal effect *Move Divine Storm to correct spellfamily switch-case block in
 Spell::EffectDummy *Some ordering fixes of case blocks in Spell::EffectDummy

--HG--
branch : trunk
---
 src/server/game/Entities/Unit/Unit.cpp        | 17 -----
 src/server/game/Spells/Auras/SpellEffects.cpp | 91 ++++++++++++++-------------
 src/server/game/Spells/SpellMgr.cpp           | 36 +++--------
 3 files changed, 54 insertions(+), 90 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 61fc98e3ae2..15aadf32502 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -562,23 +562,6 @@ void Unit::DealDamageMods(Unit *pVictim, uint32 &damage, uint32* absorb)
 
 uint32 Unit::DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDamage, DamageEffectType damagetype, SpellSchoolMask damageSchoolMask, SpellEntry const *spellProto, bool durabilityLoss)
 {
-    // if attacker is a player and spell is not empty/fail
-    if (GetTypeId() == TYPEID_PLAYER && spellProto)
-    {
-        // on divine storm dealed damage - heal
-        if (spellProto->SpellFamilyName == SPELLFAMILY_PALADIN && spellProto->SpellFamilyFlags[1] & 0x20000)
-        {
-            Unit *pRaidGrpMember = GetNextRandomRaidMemberOrPet(30.0f);
-
-            int32 divineDmg = damage * (25 + (HasAura(63220) ? 15 : 0)) / 100; //25%, if has Glyph of Divine Storm -> 40%
-
-            if (!pRaidGrpMember)
-                pRaidGrpMember = this;
-
-            CastCustomSpell(pRaidGrpMember, 54172, &divineDmg, 0, 0, true);
-        }
-    }
-
     if (pVictim->GetTypeId() == TYPEID_UNIT && pVictim->ToCreature()->IsAIEnabled)
         pVictim->ToCreature()->AI()->DamageTaken(this, damage);
 
diff --git a/src/server/game/Spells/Auras/SpellEffects.cpp b/src/server/game/Spells/Auras/SpellEffects.cpp
index 3a80ce458f8..0f76affc1dc 100644
--- a/src/server/game/Spells/Auras/SpellEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellEffects.cpp
@@ -786,33 +786,6 @@ void Spell::EffectDummy(uint32 i)
         {
             switch (m_spellInfo->Id)
             {
-                // Magic Pull
-                case 51336:
-                    m_caster->CastSpell(unitTarget,50770,true);
-                    break;
-                // Wrath of the Astromancer
-                case 42784:
-                {
-                    uint32 count = 0;
-                    for (std::list::iterator ihit= m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit)
-                        if (ihit->effectMask & (1<::iterator ihit= m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit)
-                        if (ihit->effectMask & (1<targetGUID))
-                                m_caster->DealDamage(casttarget, damage, NULL, SPELL_DIRECT_DAMAGE, SPELL_SCHOOL_MASK_ARCANE, spellInfo, false);
-                        }
-
-                    return;
-                }
                 case 8063:                                  // Deviate Fish
                 {
                     if (m_caster->GetTypeId() != TYPEID_PLAYER)
@@ -1163,6 +1136,20 @@ void Spell::EffectDummy(uint32 i)
                     m_caster->CastSpell(m_caster, spell_id, true, NULL);
                     return;
                 }
+                case 34665:                                 //Administer Antidote
+                {
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT
+                        || unitTarget->GetEntry() != 16880 || unitTarget->ToCreature()->isPet())
+                        return;
+
+                    unitTarget->ToCreature()->UpdateEntry(16992);
+                    m_caster->ToPlayer()->RewardPlayerAndGroupAtEvent(16992, unitTarget);
+
+                    if (unitTarget->IsAIEnabled)
+                        unitTarget->ToCreature()->AI()->AttackStart(m_caster);
+
+                    return;
+                }
                 case 35745:                                 // Socrethar's Stone
                 {
                     uint32 spell_id;
@@ -1223,6 +1210,29 @@ void Spell::EffectDummy(uint32 i)
                     DoCreateItem(i, newitemid);
                     return;
                 }
+                // Wrath of the Astromancer
+                case 42784:
+                {
+                    uint32 count = 0;
+                    for (std::list::iterator ihit= m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit)
+                        if (ihit->effectMask & (1<::iterator ihit= m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit)
+                        if (ihit->effectMask & (1<targetGUID))
+                                m_caster->DealDamage(casttarget, damage, NULL, SPELL_DIRECT_DAMAGE, SPELL_SCHOOL_MASK_ARCANE, spellInfo, false);
+                        }
+
+                    return;
+                }
                 // Demon Broiled Surprise
                 case 43723:
                 {
@@ -1255,20 +1265,6 @@ void Spell::EffectDummy(uint32 i)
                     m_caster->CastSpell(m_caster, 42337, true, NULL);
                     return;
                 }
-                case 34665:                                 //Administer Antidote
-                {
-                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT
-                        || unitTarget->GetEntry() != 16880 || unitTarget->ToCreature()->isPet())
-                        return;
-
-                    unitTarget->ToCreature()->UpdateEntry(16992);
-                    m_caster->ToPlayer()->RewardPlayerAndGroupAtEvent(16992, unitTarget);
-
-                    if (unitTarget->IsAIEnabled)
-                        unitTarget->ToCreature()->AI()->AttackStart(m_caster);
-
-                    return;
-                }
                 case 44997:                                 // Converting Sentry
                 {
                     //Converted Sentry Credit
@@ -1327,6 +1323,10 @@ void Spell::EffectDummy(uint32 i)
                             m_caster->CastSpell(m_caster, 49378, true);
                     }
                     return;
+                // Magic Pull
+                case 51336:
+                    m_caster->CastSpell(unitTarget,50770,true);
+                    break;
                 case 52845:                                 // Brewfest Mount Transformation (Faction Swap)
                     if (m_caster->GetTypeId() != TYPEID_PLAYER)
                         return;
@@ -1432,6 +1432,11 @@ void Spell::EffectDummy(uint32 i)
                     m_caster->CastSpell(m_caster, 54586, true);
                     return;
                 }
+                case 54171:                                   //Divine Storm
+                {
+                    m_caster->CastCustomSpell(unitTarget, 54172, &damage, 0, 0, true);
+                    return;
+                }
                 case 58418:                                 // Portal to Orgrimmar
                 case 58420:                                 // Portal to Stormwind
                     return;                                 // implemented in EffectScript[0]
@@ -1890,10 +1895,6 @@ void Spell::EffectDummy(uint32 i)
 
             switch(m_spellInfo->Id)
             {
-                case 54171:                                   //Divine Storm
-                {
-                    m_caster->CastCustomSpell(unitTarget, 54172, &damage, 0, 0, true);
-                }
                 case 20425:                                   // Judgement of command
                 {
                     if (!unitTarget)
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp
index 701d1db1b05..2d2d28b2012 100644
--- a/src/server/game/Spells/SpellMgr.cpp
+++ b/src/server/game/Spells/SpellMgr.cpp
@@ -3615,6 +3615,12 @@ void SpellMgr::LoadSpellCustomAttr()
         case 39365: // Thundering Storm
         case 41071: // Raise Dead (HACK)
         case 52124: // Sky Darkener Assault
+        case 42442: // Vengeance Landing Cannonfire
+        case 45863: // Cosmetic - Incinerate to Random Target
+        case 25425: // Shoot
+        case 45761: // Shoot
+        case 42611: // Shoot
+        case 62374: // Pursued
             spellInfo->MaxAffectedTargets = 1;
             count++;
             break;
@@ -3636,6 +3642,8 @@ void SpellMgr::LoadSpellCustomAttr()
         case 54172: // Divine Storm (heal)
         case 29213: // Curse of the Plaguebringer - Noth
         case 28542: // Life Drain - Sapphiron
+        case 66588: // Flaming Spear
+        case 54171: // Divine Storm
             spellInfo->MaxAffectedTargets = 3;
             count++;
             break;
@@ -3760,10 +3768,6 @@ void SpellMgr::LoadSpellCustomAttr()
             spellInfo->rangeIndex = 13;
             count++;
             break;
-        case 62374:     // Pursued
-            spellInfo->MaxAffectedTargets = 1;
-            count++;
-            break;
         case 48743: // Death Pact
             spellInfo->AttributesEx &= ~SPELL_ATTR_EX_CANT_TARGET_SELF;
             count++;
@@ -3785,30 +3789,6 @@ void SpellMgr::LoadSpellCustomAttr()
             spellInfo->EffectMiscValue[0] = MECHANIC_IMMUNE_SHIELD;
             count++;
             break;
-        case 42442:     // Vengeance Landing Cannonfire
-            spellInfo->MaxAffectedTargets = 1;
-            count++;
-            break;
-        case 45863:     // Cosmetic - Incinerate to Random Target
-            spellInfo->MaxAffectedTargets = 1;
-            count++;
-            break;
-        case 25425:     // Shoot
-            spellInfo->MaxAffectedTargets = 1;
-            count++;
-            break;
-        case 45761:     // Shoot
-            spellInfo->MaxAffectedTargets = 1;
-            count++;
-            break;
-        case 42611:     // Shoot
-            spellInfo->MaxAffectedTargets = 1;
-            count++;
-            break;
-        case 66588:     // Flaming Spear
-            spellInfo->MaxAffectedTargets = 3;
-            count++;
-            break;
         case 53651:
             spellInfo->AttributesEx3 |= SPELL_ATTR_EX3_NO_INITIAL_AGGRO;
             count++;
-- 
cgit v1.2.3


From a7b7073cc572c775e02f1143b99440329253d58d Mon Sep 17 00:00:00 2001
From: QAston 
Date: Fri, 16 Jul 2010 15:48:31 +0200
Subject: *Item - Coliseum 25 Heroic Caster Trinket - patch by microbius51

--HG--
branch : trunk
---
 sql/updates/8905_world_spell_proc_event.sql       |  3 +++
 src/server/game/Entities/Unit/Unit.cpp            | 18 ++++++++++++++++++
 src/server/game/Spells/Auras/SpellAuraEffects.cpp |  2 +-
 3 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 sql/updates/8905_world_spell_proc_event.sql

(limited to 'src')

diff --git a/sql/updates/8905_world_spell_proc_event.sql b/sql/updates/8905_world_spell_proc_event.sql
new file mode 100644
index 00000000000..7429a6a06b4
--- /dev/null
+++ b/sql/updates/8905_world_spell_proc_event.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_proc_event` WHERE `entry` IN(67758);
+INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES
+(67758,0,0,0,0,0,0,2,0,0,2);
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 15aadf32502..6a44506232d 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -8215,6 +8215,24 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, AuraEffect* trig
                         target = pVictim;
                         break;
                     }
+                    //Item - Coliseum 25 Heroic Caster Trinket
+                    case 67758:
+                    {
+                        if(!pVictim || !pVictim->isAlive())
+                            return false;
+                        // stacking
+                        CastSpell(this, 67759, true, NULL, triggeredByAura);
+
+                        Aura * dummy = GetAura(67759);
+                        // release at 3 aura in stack (cont contain in basepoint of trigger aura)
+                        if(!dummy || dummy->GetStackAmount() < triggerAmount)
+                            return false;
+
+                        RemoveAurasDueToSpell(67759);
+                        trigger_spell_id = 67760;
+                        target = pVictim;
+                        break;
+                    }
                     default:
                         // Illumination
                         if (auraSpellInfo->SpellIconID == 241)
diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
index 19c1e7ffee6..11467543cab 100644
--- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
@@ -356,7 +356,7 @@ pAuraEffectHandler AuraEffectHandler[TOTAL_AURAS]=
     &AuraEffect::HandleNoImmediateEffect,                         //300 SPELL_AURA_SHARE_DAMAGE_PCT implemented in Unit::DealDamage
     &AuraEffect::HandleNoImmediateEffect,                         //301 SPELL_AURA_SCHOOL_HEAL_ABSORB implemented in Unit::CalcHealAbsorb
     &AuraEffect::HandleNULL,                                      //302 0 spells in 3.3.5
-    &AuraEffect::HandleNULL,                                      //303 SPELL_AURA_MOD_DMG_VESRUS_AURASTATE_PCT? - 22 and 19 look like serverside aurastates (22 - dark, gas cloud, 19 light, ooze)
+    &AuraEffect::HandleNULL,                                      //303 SPELL_AURA_MOD_DMG_VERSUS_AURASTATE_PCT? - 22 and 19 look like serverside aurastates (22 - dark, gas cloud, 19 light, ooze)
     &AuraEffect::HandleUnused,                                    //304 clientside
     &AuraEffect::HandleAuraModIncreaseSpeed,                      //305 SPELL_AURA_MOD_MINIMUM_SPEED
     &AuraEffect::HandleNULL,                                      //306 0 spells in 3.3.5
-- 
cgit v1.2.3


From d005e14faf674f7195725894ad30f760dae9872d Mon Sep 17 00:00:00 2001
From: QAston 
Date: Fri, 16 Jul 2010 17:25:14 +0200
Subject: *Update spell_proc_event entry for Everlastin Affliction - by
 francesco.buldo. *Manually add corruption to list of spells affected by
 Everlasting Affliction.

--HG--
branch : trunk
---
 sql/base/world_database.sql                 | 11 ++++++-----
 sql/updates/8906_world_spell_proc_event.sql |  7 +++++++
 src/server/game/Spells/SpellMgr.cpp         |  9 +++++++++
 3 files changed, 22 insertions(+), 5 deletions(-)
 create mode 100644 sql/updates/8906_world_spell_proc_event.sql

(limited to 'src')

diff --git a/sql/base/world_database.sql b/sql/base/world_database.sql
index 2e075d2c89c..702210f9f6e 100644
--- a/sql/base/world_database.sql
+++ b/sql/base/world_database.sql
@@ -6830,11 +6830,11 @@ INSERT INTO `spell_proc_event` (`entry`,`SchoolMask`,`SpellFamilyName`,`SpellFam
 ( 47195, 0x00,   5, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000,   0,   0,  30), -- Eradication (Rank 1)
 ( 47196, 0x00,   5, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000,   0,   0,  30), -- Eradication (Rank 2)
 ( 47197, 0x00,   5, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000,   0,   0,  30), -- Eradication (Rank 3)
-( 47201, 0x00,   5, 0x00000008, 0x00040000, 0x00000000, 0x00000000, 0x00010000,   0,   0,   0), -- Everlasting Affliction (1)
-( 47202, 0x00,   5, 0x00000008, 0x00040000, 0x00000000, 0x00000000, 0x00000000,   0,   0,   0), -- Everlasting Affliction (2)
-( 47203, 0x00,   5, 0x00000008, 0x00040000, 0x00000000, 0x00000000, 0x00000000,   0,   0,   0), -- Everlasting Affliction (3)
-( 47204, 0x00,   5, 0x00000008, 0x00040000, 0x00000000, 0x00000000, 0x00000000,   0,   0,   0), -- Everlasting Affliction (4)
-( 47205, 0x00,   5, 0x00000008, 0x00040000, 0x00000000, 0x00000000, 0x00000000,   0,   0,   0), -- Everlasting Affliction (5)
+( 47201, 0x00,   5, 0x00004009, 0x00040000, 0x00000000, 0x00000000, 0x00000000,   0,   0,   0), -- Everlasting Affliction (1)
+( 47202, 0x00,   5, 0x00004009, 0x00040000, 0x00000000, 0x00000000, 0x00000000,   0,   0,   0), -- Everlasting Affliction (2)
+( 47203, 0x00,   5, 0x00004009, 0x00040000, 0x00000000, 0x00000000, 0x00000000,   0,   0,   0), -- Everlasting Affliction (3)
+( 47204, 0x00,   5, 0x00004009, 0x00040000, 0x00000000, 0x00000000, 0x00000000,   0,   0,   0), -- Everlasting Affliction (4)
+( 47205, 0x00,   5, 0x00004009, 0x00040000, 0x00000000, 0x00000000, 0x00000000,   0,   0,   0), -- Everlasting Affliction (5)
 ( 47245, 0x00,   5, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000001,   0,   0,   0), -- Molten Core (Rank 1)
 ( 47246, 0x00,   5, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000001,   0,   0,   0), -- Molten Core (Rank 2)
 ( 47247, 0x00,   5, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000001,   0,   0,   0), -- Molten Core (Rank 3)
@@ -7262,6 +7262,7 @@ INSERT INTO `spell_proc_event` (`entry`,`SchoolMask`,`SpellFamilyName`,`SpellFam
 ( 67667, 0x00,   0, 0x00000000, 0x00000000, 0x00000000, 0x00004000, 0x00000000,   0,   0,  45), -- Item - Coliseum Healer Trinket 5men
 ( 67670, 0x00,   0, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000,   0,   0,  45), -- Item - Coliseum Caster Trinket 5men
 ( 67672, 0x00,   0, 0x00000000, 0x00000000, 0x00000000, 0x00800154, 0x00000000,   0,   0,  45), -- Item - Coliseum Melee Trinket 5men
+( 67758, 0x00,   0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002,   0,   0,   2), -- Item - Coliseum 25 Heroic Caster Trinket
 ( 67771, 0x01,   0, 0x00000000, 0x00000000, 0x00000000, 0x00851154, 0x00000003,   0,  35,  45), -- Item - Coliseum Melee Trinket 10men
 ( 67702, 0x01,   0, 0x00000000, 0x00000000, 0x00000000, 0x00851154, 0x00000003,   0,  35,  45), -- Item - Coliseum Melee Trinket 25men
 ( 70807, 0x00,  11, 0x00000000, 0x00000000, 0x00000010, 0x00000000, 0x00000000,   0, 100,   0), -- Item - Shaman T10 Restoration 2P Bonus
diff --git a/sql/updates/8906_world_spell_proc_event.sql b/sql/updates/8906_world_spell_proc_event.sql
new file mode 100644
index 00000000000..2d5c35c02a5
--- /dev/null
+++ b/sql/updates/8906_world_spell_proc_event.sql
@@ -0,0 +1,7 @@
+DELETE FROM `spell_proc_event` WHERE `entry` IN (47201,47202,47203,47204,47205);
+INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES
+(47201,0,5,0x00004009,0x00040000,0x00000000,0x00000000,0x0000000,0,0,0),
+(47202,0,5,0x00004009,0x00040000,0x00000000,0x00000000,0x0000000,0,0,0),
+(47203,0,5,0x00004009,0x00040000,0x00000000,0x00000000,0x0000000,0,0,0),
+(47204,0,5,0x00004009,0x00040000,0x00000000,0x00000000,0x0000000,0,0,0),
+(47205,0,5,0x00004009,0x00040000,0x00000000,0x00000000,0x0000000,0,0,0);
\ No newline at end of file
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp
index 2d2d28b2012..6c9455bad99 100644
--- a/src/server/game/Spells/SpellMgr.cpp
+++ b/src/server/game/Spells/SpellMgr.cpp
@@ -3705,6 +3705,15 @@ void SpellMgr::LoadSpellCustomAttr()
             spellInfo->procCharges = 6;
             count++;
             break;
+        case 47201:    // Everlasting Affliction
+        case 47202:
+        case 47203:
+        case 47204:
+        case 47205:
+            // add corruption to affected spells
+            spellInfo->EffectSpellClassMask[1][0] |= 2;
+            count++;
+            break;
         case 51852:    // The Eye of Acherus (no spawn in phase 2 in db)
             spellInfo->EffectMiscValue[0] |= 1;
             count++;
-- 
cgit v1.2.3


From 974e120235c8885008867221755d6544f9f2c091 Mon Sep 17 00:00:00 2001
From: QAston 
Date: Fri, 16 Jul 2010 18:05:25 +0200
Subject: *Remove no longer needed check in Arcane Potency script - by
 A.Metaphysical.Drama.

--HG--
branch : trunk
---
 src/server/game/Spells/Auras/SpellAuras.cpp | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp
index 42f1f151dd9..3ebfa44492c 100644
--- a/src/server/game/Spells/Auras/SpellAuras.cpp
+++ b/src/server/game/Spells/Auras/SpellAuras.cpp
@@ -917,20 +917,17 @@ void Aura::HandleAuraSpecificMods(AuraApplication const * aurApp, Unit * caster,
                         // Arcane Potency
                         if (AuraEffect const * aurEff = caster->GetAuraEffect(SPELL_AURA_DUMMY, SPELLFAMILY_MAGE, 2120, 0))
                         {
-                            if (roll_chance_i(aurEff->GetAmount()))
-                            {
-                                uint32 spellId = 0;
+                            uint32 spellId = 0;
 
-                                switch (aurEff->GetId())
-                                {
-                                    case 31571: spellId = 57529; break;
-                                    case 31572: spellId = 57531; break;
-                                    default:
-                                        sLog.outError("Aura::HandleAuraSpecificMods: Unknown rank of Arcane Potency (%d) found", aurEff->GetId());
-                                }
-                                if (spellId)
-                                    caster->CastSpell(caster, spellId, true);
+                            switch (aurEff->GetId())
+                            {
+                                case 31571: spellId = 57529; break;
+                                case 31572: spellId = 57531; break;
+                                default:
+                                    sLog.outError("Aura::HandleAuraSpecificMods: Unknown rank of Arcane Potency (%d) found", aurEff->GetId());
                             }
+                            if (spellId)
+                                caster->CastSpell(caster, spellId, true);
                         }
                         break;
                 }
-- 
cgit v1.2.3


From 0ed0b1f7f57919bcdc46b0acf6363443c9b1473a Mon Sep 17 00:00:00 2001
From: QAston 
Date: Fri, 16 Jul 2010 18:37:43 +0200
Subject: *Fix for Six demon Bag - patch by pxlcreations and antihrists.

--HG--
branch : trunk
---
 src/server/game/Spells/Auras/SpellEffects.cpp | 40 +++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

(limited to 'src')

diff --git a/src/server/game/Spells/Auras/SpellEffects.cpp b/src/server/game/Spells/Auras/SpellEffects.cpp
index 0f76affc1dc..ea73988fba7 100644
--- a/src/server/game/Spells/Auras/SpellEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellEffects.cpp
@@ -929,6 +929,46 @@ void Spell::EffectDummy(uint32 i)
                     }
                     return;
                 }
+                case 14537:                                 // Six Demon Bag
+                { 
+                    if( !unitTarget || !unitTarget->isAlive()) return; 
+
+                    uint32 ClearSpellId[6] = 
+                    { 
+                        15662,   // Fireball  
+                        11538,   // Frostball  
+                        21179,   // Chain Lightning  
+                        14621,   // Polymorph  
+                        25189,   // Enveloping Winds
+                        14642    // Summon Felhund minion
+                    };
+
+                    uint32 effect = 0;
+                    uint32 rand = urand(0, 100);
+
+                    if (rand >= 0 && rand < 25)         // Fireball (25% chance)
+                        effect = ClearSpellId[0];
+                    else if (rand >= 25 && rand < 50)   // Frostball (25% chance)
+                        effect = ClearSpellId[1];
+                    else if (rand >=50 && rand < 70)    // Chain Lighting (25% chance)
+                        effect = ClearSpellId[2];
+                    else if (rand >= 70 && rand < 80)   // Polymorph (10% chance)
+                    {
+                        effect = ClearSpellId[3];
+                        if (urand(0, 100) <= 30)        // 30% chance to self-cast
+                            unitTarget = m_caster;
+                    } 
+                    else if (rand >=80 && rand < 95)    // Enveloping Winds (15% chance)
+                         effect = ClearSpellId[4];
+                    else                                // Summon Felhund minion (5% chance)
+                    {
+                         effect = ClearSpellId[5];
+                         unitTarget = m_caster;
+                    }
+
+                    m_caster->CastSpell(unitTarget, effect, true);
+                    return;     
+                }
                 case 15998:                                 // Capture Worg Pup
                 case 29435:                                 // Capture Female Kaliri Hatchling
                 {
-- 
cgit v1.2.3


From 31a3310ea1afc9ff4daf01d1eee1879f2b80c41e Mon Sep 17 00:00:00 2001
From: QAston 
Date: Fri, 16 Jul 2010 19:17:45 +0200
Subject: *Fix Totem of Hex coefficient - patch by Lightguard.

--HG--
branch : trunk
---
 src/server/game/Entities/Unit/Unit.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 6a44506232d..6cebccb3da4 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -10057,7 +10057,8 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3
             case 5142: // Increased Lightning Damage
             case 5147: // Improved Consecration / Libram of Resurgence
             case 5148: // Idol of the Shooting Star
-            case 6008: // Increased Lightning Damage / Totem of Hex
+            case 6008: // Increased Lightning Damage
+            case 8627: // Totem of Hex
             {
                 DoneTotal += (*i)->GetAmount();
                 break;
-- 
cgit v1.2.3


From 9c9bc32d0923d3f1dc95ba63b94cf7be93df27e7 Mon Sep 17 00:00:00 2001
From: QAston 
Date: Sat, 17 Jul 2010 00:48:31 +0200
Subject: *Add missing 295 aura effect handler lost somewhere in 33x repo merge
 to handler table - this fixes crash with access to 316 aura and binds correct
 handler to aura 305.

--HG--
branch : trunk
---
 src/server/game/Spells/Auras/SpellAuraEffects.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
index 11467543cab..fc87a934e97 100644
--- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
@@ -349,6 +349,7 @@ pAuraEffectHandler AuraEffectHandler[TOTAL_AURAS]=
     &AuraEffect::HandleNULL,                                      //292 call stabled pet
     &AuraEffect::HandleNULL,                                      //293 auras which probably add set of abilities to their target based on it's miscvalue
     &AuraEffect::HandleNoImmediateEffect,                         //294 SPELL_AURA_PREVENT_REGENERATE_POWER implemented in Player::Regenerate(Powers power)
+    &AuraEffect::HandleNULL,                                      //295 0 spells in 3.3.5
     &AuraEffect::HandleNULL,                                      //296 6 spells, something vehicle or character display related
     &AuraEffect::HandleNULL,                                      //297 Spirit Burst spells
     &AuraEffect::HandleNULL,                                      //298 70569 - Strangulating, maybe prevents talk or cast
-- 
cgit v1.2.3


From b955dc395c53f29e09d7bcc26f48d273729008e4 Mon Sep 17 00:00:00 2001
From: click 
Date: Mon, 19 Jul 2010 02:20:09 +0200
Subject: Send SMSG_LEARNED_SPELL before relearning or respeccing disabled
 spells/talents (fix by Vladimir) (Ensures proper ordering when attempting to
 learn higher ranked/disabled spells/talents)

--HG--
branch : trunk
---
 src/server/game/Entities/Player/Player.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 9c63c2f73c8..3470e55b8cd 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -3536,6 +3536,15 @@ void Player::learnSpell(uint32 spell_id, bool dependent)
 
     bool learning = addSpell(spell_id,active,true,dependent,false);
 
+    // prevent duplicated entires in spell book, also not send if not in world (loading)
+    if (learning || IsInWorld())
+    {
+        WorldPacket data(SMSG_LEARNED_SPELL, 6);
+        data << uint32(spell_id);
+        data << uint16(0);
+        GetSession()->SendPacket(&data);
+    }
+
     // learn all disabled higher ranks and required spells (recursive)
     if (disabled)
     {
@@ -3555,15 +3564,6 @@ void Player::learnSpell(uint32 spell_id, bool dependent)
                 learnSpell(itr2->second, false);
         }
     }
-
-    // prevent duplicated entires in spell book, also not send if not in world (loading)
-    if (!learning || !IsInWorld())
-        return;
-
-    WorldPacket data(SMSG_LEARNED_SPELL, 6);
-    data << uint32(spell_id);
-    data << uint16(0);
-    GetSession()->SendPacket(&data);
 }
 
 void Player::removeSpell(uint32 spell_id, bool disabled, bool learn_low_rank)
-- 
cgit v1.2.3


From e4a120b0adbd2be24a39699c8c11d2341b5c2731 Mon Sep 17 00:00:00 2001
From: click 
Date: Mon, 19 Jul 2010 03:32:32 +0200
Subject: Fix typo in previous commit (thanks to 4178...something)

--HG--
branch : trunk
---
 src/server/game/Entities/Player/Player.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 3470e55b8cd..5a8cb7b66fc 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -3537,7 +3537,7 @@ void Player::learnSpell(uint32 spell_id, bool dependent)
     bool learning = addSpell(spell_id,active,true,dependent,false);
 
     // prevent duplicated entires in spell book, also not send if not in world (loading)
-    if (learning || IsInWorld())
+    if (learning && IsInWorld())
     {
         WorldPacket data(SMSG_LEARNED_SPELL, 6);
         data << uint32(spell_id);
-- 
cgit v1.2.3


From a4d0542f192240841da11982d85ed6cd27a1f864 Mon Sep 17 00:00:00 2001
From: click 
Date: Mon, 19 Jul 2010 03:49:15 +0200
Subject: Clean up level0.cpp and return proper errormessages (fix by ogeraisi)
 Closes issue #286

--HG--
branch : trunk
---
 sql/base/world_database.sql               |  3 +-
 sql/updates/8915_world_trinity_string.sql |  4 ++
 src/server/game/Chat/Commands/Level0.cpp  | 64 +++++++++++++++++--------------
 src/server/game/Miscellaneous/Language.h  |  3 +-
 4 files changed, 44 insertions(+), 30 deletions(-)
 create mode 100644 sql/updates/8915_world_trinity_string.sql

(limited to 'src')

diff --git a/sql/base/world_database.sql b/sql/base/world_database.sql
index 32e82380dd0..a0c566f550c 100644
--- a/sql/base/world_database.sql
+++ b/sql/base/world_database.sql
@@ -14636,7 +14636,7 @@ INSERT INTO `trinity_string` (`entry`,`content_default`,`content_loc1`,`content_
 (24, 'You used it recently.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (25, 'Password not changed (unknown error)!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (26, 'The password was changed', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-(27, 'The new passwords do not match or the old password is wrong', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+(27, 'The old password is wrong', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (28, 'Your account is now locked.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (29, 'Your account is now unlocked.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (30, ', rank ', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
@@ -14671,6 +14671,7 @@ INSERT INTO `trinity_string` (`entry`,`content_default`,`content_loc1`,`content_
 (59, 'Using creature EventAI: %s', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (60, 'Online players: %u (max: %u)', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (61, 'Up to %u expansion allowed now.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+(62, 'One on more parameters have incorrect values', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (100, 'Global notify: ', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (101, 'Map: %u (%s) Zone: %u (%s) Area: %u (%s) Phase: %u\nX: %f Y: %f Z: %f Orientation: %f\ngrid[%u,%u]cell[%u,%u] InstanceID: %u\n ZoneX: %f ZoneY: %f\nGroundZ: %f FloorZ: %f Have height data (Map: %u VMap: %u)', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (102, '%s is already being teleported.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
diff --git a/sql/updates/8915_world_trinity_string.sql b/sql/updates/8915_world_trinity_string.sql
new file mode 100644
index 00000000000..49676b0870a
--- /dev/null
+++ b/sql/updates/8915_world_trinity_string.sql
@@ -0,0 +1,4 @@
+-- UPDATE so we don't kill customized locale strings if user has any
+UPDATE `trinity_string` SET `content_default`='The old password is wrong' WHERE `entry`=27;
+-- INSERT as this string has not been used before
+INSERT INTO `trinity_string` VALUES (62, 'One on more parameters have incorrect values', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
diff --git a/src/server/game/Chat/Commands/Level0.cpp b/src/server/game/Chat/Commands/Level0.cpp
index be039479092..ff266caa328 100644
--- a/src/server/game/Chat/Commands/Level0.cpp
+++ b/src/server/game/Chat/Commands/Level0.cpp
@@ -87,7 +87,7 @@ bool ChatHandler::HandleStartCommand(const char* /*args*/)
     }
 
     // cast spell Stuck
-    chr->CastSpell(chr,7355,false);
+    chr->CastSpell(chr, 7355, false);
     return true;
 }
 
@@ -103,14 +103,6 @@ bool ChatHandler::HandleServerInfoCommand(const char* /*args*/)
     uint32 updateTime = sWorld.GetUpdateTime();
 
     PSendSysMessage(_FULLVERSION);
-    //if (m_session)
-    //    full = _FULLVERSION(REVISION_DATE,REVISION_TIME,"|cffffffff|Hurl:" REVISION_ID "|h" REVISION_ID "|h|r");
-    //else
-    //    full = _FULLVERSION(REVISION_DATE,REVISION_TIME,REVISION_ID);
-
-    //SendSysMessage(full);
-    //PSendSysMessage(LANG_USING_WORLD_DB,sWorld.GetDBVersion());
-    //PSendSysMessage(LANG_USING_EVENT_AI,sWorld.GetCreatureEventAIVersion());
     PSendSysMessage(LANG_CONNECTED_PLAYERS, PlayersNum, MaxPlayersNum);
     PSendSysMessage(LANG_CONNECTED_USERS, activeClientsNum, maxActiveClientsNum, queuedClientsNum, maxQueuedClientsNum);
     PSendSysMessage(LANG_UPTIME, uptime.c_str());
@@ -143,9 +135,9 @@ bool ChatHandler::HandleDismountCommand(const char* /*args*/)
 
 bool ChatHandler::HandleSaveCommand(const char* /*args*/)
 {
-    Player *player=m_session->GetPlayer();
+    Player *player = m_session->GetPlayer();
 
-    // save GM account without delay and output message (testing, etc)
+    // save GM account without delay and output message
     if (m_session->GetSecurity() > SEC_PLAYER)
     {
         player->SaveToDB();
@@ -153,7 +145,7 @@ bool ChatHandler::HandleSaveCommand(const char* /*args*/)
         return true;
     }
 
-    // save or plan save after 20 sec (logout delay) if current next save time more this value and _not_ output any messages to prevent cheat planning
+    // save if the player has last been saved over 20 seconds ago
     uint32 save_interval = sWorld.getConfig(CONFIG_INTERVAL_SAVE);
     if ((save_interval == 0 || save_interval > 20*IN_MILLISECONDS && player->GetSaveTimer() <= save_interval - 20*IN_MILLISECONDS))
         player->SaveToDB();
@@ -192,35 +184,42 @@ bool ChatHandler::HandleGMListIngameCommand(const char* /*args*/)
 bool ChatHandler::HandleAccountPasswordCommand(const char* args)
 {
     if (!*args)
+    {
+        SendSysMessage(LANG_CMD_SYNTAX);
+        SetSentErrorMessage(true);
         return false;
+    }
 
-    char *old_pass = strtok ((char*)args, " ");
-    char *new_pass = strtok (NULL, " ");
-    char *new_pass_c  = strtok (NULL, " ");
+    char *old_pass = strtok((char*)args, " ");
+    char *new_pass = strtok(NULL, " ");
+    char *new_pass_c  = strtok(NULL, " ");
 
     if (!old_pass || !new_pass || !new_pass_c)
+    {
+        SendSysMessage(LANG_CMD_SYNTAX);
+        SetSentErrorMessage(true);
         return false;
+    }
 
     std::string password_old = old_pass;
     std::string password_new = new_pass;
     std::string password_new_c = new_pass_c;
 
-    if (strcmp(new_pass, new_pass_c) != 0)
+    if (!accmgr.CheckPassword(m_session->GetAccountId(), password_old))
     {
-        SendSysMessage (LANG_NEW_PASSWORDS_NOT_MATCH);
-        SetSentErrorMessage (true);
+        SendSysMessage(LANG_COMMAND_WRONGOLDPASSWORD);
+        SetSentErrorMessage(true);
         return false;
     }
 
-    if (!accmgr.CheckPassword (m_session->GetAccountId(), password_old))
+    if (strcmp(new_pass, new_pass_c) != 0)
     {
-        SendSysMessage (LANG_COMMAND_WRONGOLDPASSWORD);
-        SetSentErrorMessage (true);
+        SendSysMessage(LANG_NEW_PASSWORDS_NOT_MATCH);
+        SetSentErrorMessage(true);
         return false;
     }
 
     AccountOpResult result = accmgr.ChangePassword(m_session->GetAccountId(), password_new);
-
     switch(result)
     {
         case AOR_OK:
@@ -230,7 +229,6 @@ bool ChatHandler::HandleAccountPasswordCommand(const char* args)
             SendSysMessage(LANG_PASSWORD_TOO_LONG);
             SetSentErrorMessage(true);
             return false;
-        case AOR_NAME_NOT_EXIST:                            // not possible case, don't want get account name for output
         default:
             SendSysMessage(LANG_COMMAND_NOTCHANGEPASSWORD);
             SetSentErrorMessage(true);
@@ -243,15 +241,23 @@ bool ChatHandler::HandleAccountPasswordCommand(const char* args)
 bool ChatHandler::HandleAccountAddonCommand(const char* args)
 {
     if (!*args)
+    {
+        SendSysMessage(LANG_CMD_SYNTAX);
+        SetSentErrorMessage(true);
         return false;
+    }
 
-    char *szExp = strtok((char*)args," ");
+    char *szExp = strtok((char*)args, " ");
 
     uint32 account_id = m_session->GetAccountId();
 
-    int expansion=atoi(szExp);                                    //get int anyway (0 if error)
+    int expansion = atoi(szExp);                                    //get int anyway (0 if error)
     if (expansion < 0 || expansion > sWorld.getConfig(CONFIG_EXPANSION))
-         return false;
+    {
+        SendSysMessage(LANG_IMPROPER_VALUE);
+        SetSentErrorMessage(true);
+        return false;
+    }
 
     // No SQL injection
     LoginDatabase.PExecute("UPDATE account SET expansion = '%d' WHERE id = '%u'", expansion, account_id);
@@ -264,7 +270,8 @@ bool ChatHandler::HandleAccountLockCommand(const char* args)
     if (!*args)
     {
         SendSysMessage(LANG_USE_BOL);
-        return true;
+        SetSentErrorMessage(true);
+        return false;
     }
 
     std::string argstr = (char*)args;
@@ -283,7 +290,8 @@ bool ChatHandler::HandleAccountLockCommand(const char* args)
     }
 
     SendSysMessage(LANG_USE_BOL);
-    return true;
+    SetSentErrorMessage(true);
+    return false;
 }
 
 /// Display the 'Message of the day' for the realm
diff --git a/src/server/game/Miscellaneous/Language.h b/src/server/game/Miscellaneous/Language.h
index c0c8fc486f3..435c6549f56 100644
--- a/src/server/game/Miscellaneous/Language.h
+++ b/src/server/game/Miscellaneous/Language.h
@@ -87,7 +87,8 @@ enum TrinityStrings
     LANG_USING_EVENT_AI                 = 59,
     LANG_CONNECTED_PLAYERS              = 60,
     LANG_ACCOUNT_ADDON                  = 61,
-    // Room for more level 0              62-99 not used
+    LANG_IMPROPER_VALUE                 = 62,
+    // Room for more level 0              63-99 not used
 
     // level 1 chat
     LANG_GLOBAL_NOTIFY                  = 100,
-- 
cgit v1.2.3


From dd92bffd24426f7ac4f9187297dae8cf28a341ad Mon Sep 17 00:00:00 2001
From: click 
Date: Mon, 19 Jul 2010 04:16:15 +0200
Subject: Exclude hunters Auto Shot from casttimer-delay - should be blizzlike
 now (fix by Ktistay) Closes issue 1927

--HG--
branch : trunk
---
 src/server/game/Entities/Unit/Unit.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 6cebccb3da4..b659f876112 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -3318,8 +3318,8 @@ void Unit::_UpdateAutoRepeatSpell()
         return;
     }
 
-    //apply delay
-    if (m_AutoRepeatFirstCast && getAttackTimer(RANGED_ATTACK) < 500)
+    //apply delay (Auto Shot (spellID 75) not affected)
+    if (m_AutoRepeatFirstCast && getAttackTimer(RANGED_ATTACK) < 500 && m_currentSpells[CURRENT_AUTOREPEAT_SPELL]->m_spellInfo->Id != 75)
         setAttackTimer(RANGED_ATTACK,500);
     m_AutoRepeatFirstCast = false;
 
-- 
cgit v1.2.3


From 0984c2e3560ebcf68062615df88b61e44683ab87 Mon Sep 17 00:00:00 2001
From: click 
Date: Mon, 19 Jul 2010 05:50:19 +0200
Subject: Adjust position of a door in SOTA (correction by Scaraber, minor
 adjustments in z-axis by Aokromes) Closes issue 2589

--HG--
branch : trunk
---
 src/server/game/BattleGrounds/Zones/BattleGroundSA.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/game/BattleGrounds/Zones/BattleGroundSA.h b/src/server/game/BattleGrounds/Zones/BattleGroundSA.h
index 760be3ca02e..f1299fbb4a4 100644
--- a/src/server/game/BattleGrounds/Zones/BattleGroundSA.h
+++ b/src/server/game/BattleGrounds/Zones/BattleGroundSA.h
@@ -197,7 +197,7 @@ const float BG_SA_ObjSpawnlocs[BG_SA_MAXOBJ][4] =
     { 1431.3413f, -219.437f, 30.893f, 0.9736f },
     { 1227.667f, -212.555f, 55.372f, 0.5023f },
     { 1214.681f, 81.21f, 53.413f, 5.745f },
-    { 878.555f, -108.989f, 119.835f, 0.0565f },
+    { 878.555f, -108.2f, 117.845f, 0.0f },
     { 836.5f, -108.8f, 120.219f, 0.0f },
     //Ships
     { 2679.696777, -826.891235, 3.712860, 5.78367f}, //rot2 1 rot3 0.0002
-- 
cgit v1.2.3


From 84c6fa001ccbe8b2ce5ae2f1a756c7ba2fbfe36f Mon Sep 17 00:00:00 2001
From: click 
Date: Mon, 19 Jul 2010 13:57:28 +0200
Subject: Allow HOT/DOT-stacking for spells with PERIODIC_DUMMY spellauras
 (QAston working as a teacher) Closes issue 2645

--HG--
branch : trunk
---
 src/server/game/Spells/SpellMgr.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp
index 6c9455bad99..8385b3386e6 100644
--- a/src/server/game/Spells/SpellMgr.cpp
+++ b/src/server/game/Spells/SpellMgr.cpp
@@ -3128,6 +3128,7 @@ bool SpellMgr::CanAurasStack(SpellEntry const *spellInfo_1, SpellEntry const *sp
             {
                 // DOT or HOT from different casters will stack
                 case SPELL_AURA_PERIODIC_DAMAGE:
+                case SPELL_AURA_PERIODIC_DUMMY:
                 case SPELL_AURA_PERIODIC_HEAL:
                 case SPELL_AURA_PERIODIC_TRIGGER_SPELL:
                 case SPELL_AURA_PERIODIC_ENERGIZE:
-- 
cgit v1.2.3


From ba36f1eb23885260a832a41e9264b74881c8d285 Mon Sep 17 00:00:00 2001
From: click 
Date: Mon, 19 Jul 2010 14:17:30 +0200
Subject: Clean up old (and partially unused) Aggro() function and use
 EnterCombat() instead + fix some minor enum-typos (INTURRUPT -> INTERRUPT)
 (fix by Azazel)

--HG--
branch : trunk
---
 src/server/game/AI/EventAI/CreatureEventAI.cpp         |  4 ++--
 src/server/game/AI/EventAI/CreatureEventAI.h           |  2 +-
 src/server/scripts/Custom/custom_example.cpp           |  2 +-
 src/server/scripts/Custom/test.cpp                     |  2 +-
 .../EasternKingdoms/AlteracValley/boss_drekthar.cpp    |  2 +-
 .../EasternKingdoms/AlteracValley/boss_galvangar.cpp   |  2 +-
 .../EasternKingdoms/AlteracValley/boss_vanndar.cpp     |  2 +-
 .../EasternKingdoms/BlackrockSpire/boss_gyth.cpp       |  2 +-
 .../BlackwingLair/boss_victor_nefarius.cpp             |  2 +-
 .../EasternKingdoms/Karazhan/boss_netherspite.cpp      |  2 +-
 .../EasternKingdoms/Karazhan/boss_shade_of_aran.cpp    | 18 +++++++++---------
 .../MagistersTerrace/boss_priestess_delrissa.cpp       |  2 +-
 .../EasternKingdoms/Scholomance/boss_jandice_barov.cpp |  2 +-
 src/server/scripts/EasternKingdoms/hinterlands.cpp     |  2 +-
 .../scripts/EasternKingdoms/silverpine_forest.cpp      |  2 +-
 src/server/scripts/EasternKingdoms/wetlands.cpp        |  2 +-
 src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp  |  2 +-
 src/server/scripts/Kalimdor/ashenvale.cpp              |  2 +-
 src/server/scripts/Kalimdor/the_barrens.cpp            |  2 +-
 .../Northrend/ObsidianSanctum/boss_sartharion.cpp      |  6 +++---
 src/server/scripts/Northrend/borean_tundra.cpp         |  2 +-
 src/server/scripts/Northrend/dalaran.cpp               |  2 +-
 .../scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp  | 10 +++++-----
 src/server/scripts/Outland/nagrand.cpp                 |  2 +-
 src/server/scripts/Outland/shadowmoon_valley.cpp       |  2 +-
 src/server/scripts/World/boss_emeriss.cpp              |  2 +-
 src/server/scripts/World/boss_taerar.cpp               |  2 +-
 src/server/scripts/World/npcs_special.cpp              |  2 +-
 28 files changed, 43 insertions(+), 43 deletions(-)

(limited to 'src')

diff --git a/src/server/game/AI/EventAI/CreatureEventAI.cpp b/src/server/game/AI/EventAI/CreatureEventAI.cpp
index c6ec06d8895..c70f471a82f 100644
--- a/src/server/game/AI/EventAI/CreatureEventAI.cpp
+++ b/src/server/game/AI/EventAI/CreatureEventAI.cpp
@@ -456,7 +456,7 @@ void CreatureEventAI::ProcessAction(CreatureEventAI_Action const& action, uint32
                 caster = target;
 
             //Allowed to cast only if not casting (unless we interrupt ourself) or if spell is triggered
-            bool canCast = !caster->IsNonMeleeSpellCasted(false) || (action.cast.castFlags & (CAST_TRIGGERED | CAST_INTURRUPT_PREVIOUS));
+            bool canCast = !caster->IsNonMeleeSpellCasted(false) || (action.cast.castFlags & (CAST_TRIGGERED | CAST_INTERRUPT_PREVIOUS));
 
             // If cast flag CAST_AURA_NOT_PRESENT is active, check if target already has aura on them
             if (action.cast.castFlags & CAST_AURA_NOT_PRESENT)
@@ -492,7 +492,7 @@ void CreatureEventAI::ProcessAction(CreatureEventAI_Action const& action, uint32
                     else
                     {
                         //Interrupt any previous spell
-                        if (caster->IsNonMeleeSpellCasted(false) && action.cast.castFlags & CAST_INTURRUPT_PREVIOUS)
+                        if (caster->IsNonMeleeSpellCasted(false) && action.cast.castFlags & CAST_INTERRUPT_PREVIOUS)
                             caster->InterruptNonMeleeSpells(false);
 
                         caster->CastSpell(target, action.cast.spellId, (action.cast.castFlags & CAST_TRIGGERED));
diff --git a/src/server/game/AI/EventAI/CreatureEventAI.h b/src/server/game/AI/EventAI/CreatureEventAI.h
index 2fc5de46089..84b359787f5 100644
--- a/src/server/game/AI/EventAI/CreatureEventAI.h
+++ b/src/server/game/AI/EventAI/CreatureEventAI.h
@@ -150,7 +150,7 @@ enum Target
 
 enum CastFlags
 {
-    CAST_INTURRUPT_PREVIOUS     = 0x01,                     //Interrupt any spell casting
+    CAST_INTERRUPT_PREVIOUS     = 0x01,                     //Interrupt any spell casting
     CAST_TRIGGERED              = 0x02,                     //Triggered (this makes spell cost zero mana and have no cast time)
     CAST_FORCE_CAST             = 0x04,                     //Forces cast even if creature is out of mana or out of range
     CAST_NO_MELEE_IF_OOM        = 0x08,                     //Prevents creature from entering melee if out of mana or out of range
diff --git a/src/server/scripts/Custom/custom_example.cpp b/src/server/scripts/Custom/custom_example.cpp
index 9010c958ea9..d922dfed0aa 100755
--- a/src/server/scripts/Custom/custom_example.cpp
+++ b/src/server/scripts/Custom/custom_example.cpp
@@ -91,7 +91,7 @@ struct TRINITY_DLL_DECL custom_exampleAI : public ScriptedAI
 
     //*** HANDLED FUNCTION ***
     //Attack Start is called whenever someone hits us.
-    void Aggro(Unit *who)
+    void EnterCombat(Unit *who)
     {
         //Say some stuff
         DoSay(SAY_AGGRO,LANG_UNIVERSAL,NULL);
diff --git a/src/server/scripts/Custom/test.cpp b/src/server/scripts/Custom/test.cpp
index 0f5dec744b0..0e841d450ba 100755
--- a/src/server/scripts/Custom/test.cpp
+++ b/src/server/scripts/Custom/test.cpp
@@ -87,7 +87,7 @@ struct TRINITY_DLL_DECL npc_testAI : public npc_escortAI
             }
         }
 
-        void Aggro(Unit*)
+        void EnterCombat(Unit*)
         {
             if (HasEscortState(STATE_ESCORT_ESCORTING))
                 me->Say(SAY_AGGRO1, LANG_UNIVERSAL, PlayerGUID);
diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp
index 5488a85af87..385812c6776 100755
--- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp
+++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp
@@ -62,7 +62,7 @@ struct boss_drektharAI : public ScriptedAI
         uiYellTimer = urand(20*IN_MILLISECONDS,30*IN_MILLISECONDS); //20 to 30 seconds
     }
 
-    void Aggro(Unit * /*who*/)
+    void EnterCombat(Unit * /*who*/)
     {
         DoScriptText(YELL_AGGRO, me);
     }
diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp
index 2c30c7c16b4..380a841fb7c 100755
--- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp
+++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp
@@ -55,7 +55,7 @@ struct boss_galvangarAI : public ScriptedAI
         uiResetTimer                      = 5*IN_MILLISECONDS;
     }
 
-    void Aggro(Unit * /*who*/)
+    void EnterCombat(Unit * /*who*/)
     {
         DoScriptText(YELL_AGGRO, me);
     }
diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp
index cb01944b998..6ae75c0fa06 100755
--- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp
+++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp
@@ -60,7 +60,7 @@ struct boss_vanndarAI : public ScriptedAI
         uiYellTimer = urand(20*IN_MILLISECONDS,30*IN_MILLISECONDS);
     }
 
-    void Aggro(Unit * /*who*/)
+    void EnterCombat(Unit * /*who*/)
     {
         DoScriptText(YELL_AGGRO, me);
     }
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gyth.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gyth.cpp
index dec948f68df..676115b0595 100755
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gyth.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gyth.cpp
@@ -178,7 +178,7 @@ struct boss_gythAI : public ScriptedAI
                 && me->GetHealth() > 0)
             {
                 //summon Rend and Change model to normal Gyth
-                //Inturrupt any spell casting
+                //Interrupt any spell casting
                 me->InterruptNonMeleeSpells(false);
                 //Gyth model
                 me->SetDisplayId(9806);
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp
index 85d1537ffd1..d6a31cda4af 100755
--- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp
@@ -292,7 +292,7 @@ struct boss_victor_nefariusAI : public ScriptedAI
                     //Teleport Victor Nefarius way out of the map
                     //sMapMgr.GetMap(me->GetMapId(), me)->CreatureRelocation(me,0,0,-5000,0);
 
-                    //Inturrupt any spell casting
+                    //Interrupt any spell casting
                     me->InterruptNonMeleeSpells(false);
 
                     //Root self
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp
index c3a2a85e74c..3e3f7ffb9c4 100755
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp
@@ -247,7 +247,7 @@ struct boss_netherspiteAI : public ScriptedAI
             Door->SetGoState(open ? GO_STATE_ACTIVE : GO_STATE_READY);
     }
 
-    void Aggro(Unit * /*who*/)
+    void EnterCombat(Unit * /*who*/)
     {
         HandleDoors(false);
         SwitchToPortalPhase();
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
index ace2b186342..37ea79fefbe 100755
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
@@ -109,7 +109,7 @@ struct boss_aranAI : public ScriptedAI
     uint32 FireCooldown;
     uint32 FrostCooldown;
 
-    uint32 DrinkInturruptTimer;
+    uint32 DrinkInterruptTimer;
 
     bool ElementalsSpawned;
     bool Drinking;
@@ -133,7 +133,7 @@ struct boss_aranAI : public ScriptedAI
         FireCooldown = 0;
         FrostCooldown = 0;
 
-        DrinkInturruptTimer = 10000;
+        DrinkInterruptTimer = 10000;
 
         ElementalsSpawned = false;
         Drinking = false;
@@ -261,11 +261,11 @@ struct boss_aranAI : public ScriptedAI
                 DoCast(me, SPELL_CONJURE, false);
                 DoCast(me, SPELL_DRINK, false);
                 me->SetStandState(UNIT_STAND_STATE_SIT);
-                DrinkInturruptTimer = 10000;
+                DrinkInterruptTimer = 10000;
             }
         }
 
-        //Drink Inturrupt
+        //Drink Interrupt
         if (Drinking && DrinkInturrupted)
         {
             Drinking = false;
@@ -275,10 +275,10 @@ struct boss_aranAI : public ScriptedAI
             DoCast(me, SPELL_POTION, false);
         }
 
-        //Drink Inturrupt Timer
+        //Drink Interrupt Timer
         if (Drinking && !DrinkInturrupted)
-            if (DrinkInturruptTimer >= diff)
-                DrinkInturruptTimer -= diff;
+            if (DrinkInterruptTimer >= diff)
+                DrinkInterruptTimer -= diff;
         else
         {
             me->SetStandState(UNIT_STAND_STATE_STAND);
@@ -476,13 +476,13 @@ struct boss_aranAI : public ScriptedAI
 
     void SpellHit(Unit* /*pAttacker*/, const SpellEntry* Spell)
     {
-        //We only care about inturrupt effects and only if they are durring a spell currently being casted
+        //We only care about interrupt effects and only if they are durring a spell currently being casted
         if ((Spell->Effect[0] != SPELL_EFFECT_INTERRUPT_CAST &&
             Spell->Effect[1] != SPELL_EFFECT_INTERRUPT_CAST &&
             Spell->Effect[2] != SPELL_EFFECT_INTERRUPT_CAST) || !me->IsNonMeleeSpellCasted(false))
             return;
 
-        //Inturrupt effect
+        //Interrupt effect
         me->InterruptNonMeleeSpells(false);
 
         //Normally we would set the cooldown equal to the spell duration
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
index 3e5ddd8cce2..bc4049bb1fb 100755
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
@@ -597,7 +597,7 @@ struct boss_ellris_duskhallowAI : public boss_priestess_lackey_commonAI
         boss_priestess_lackey_commonAI::Reset();
     }
 
-    void Aggro(Unit* /*pWho*/)
+    void EnterCombat(Unit* /*pWho*/)
     {
         DoCast(me, SPELL_SUMMON_IMP);
     }
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp
index 370cd221029..63ba5885573 100755
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp
@@ -93,7 +93,7 @@ struct boss_jandicebarovAI : public ScriptedAI
         if (!Invisible && Illusion_Timer <= diff)
         {
 
-            //Inturrupt any spell casting
+            //Interrupt any spell casting
             me->InterruptNonMeleeSpells(false);
             me->setFaction(35);
             me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
diff --git a/src/server/scripts/EasternKingdoms/hinterlands.cpp b/src/server/scripts/EasternKingdoms/hinterlands.cpp
index 13f44f47ff4..12c5a3acda3 100755
--- a/src/server/scripts/EasternKingdoms/hinterlands.cpp
+++ b/src/server/scripts/EasternKingdoms/hinterlands.cpp
@@ -101,7 +101,7 @@ struct npc_00x09hlAI : public npc_escortAI
         }
     }
 
-    void Aggro(Unit* pWho)
+    void EnterCombat(Unit* pWho)
     {
         if (pWho->GetEntry() == NPC_MARAUDING_OWL || pWho->GetEntry() == NPC_VILE_AMBUSHER)
             return;
diff --git a/src/server/scripts/EasternKingdoms/silverpine_forest.cpp b/src/server/scripts/EasternKingdoms/silverpine_forest.cpp
index 4b04083f4cd..cd88974788e 100755
--- a/src/server/scripts/EasternKingdoms/silverpine_forest.cpp
+++ b/src/server/scripts/EasternKingdoms/silverpine_forest.cpp
@@ -233,7 +233,7 @@ struct pyrewood_ambushAI : public ScriptedAI
         }
     }
 
-    void Aggro(Unit * /*who*/){}
+    void EnterCombat(Unit * /*who*/){}
 
     void JustSummoned(Creature *pSummoned)
     {
diff --git a/src/server/scripts/EasternKingdoms/wetlands.cpp b/src/server/scripts/EasternKingdoms/wetlands.cpp
index b7b92462f11..084b673dacd 100755
--- a/src/server/scripts/EasternKingdoms/wetlands.cpp
+++ b/src/server/scripts/EasternKingdoms/wetlands.cpp
@@ -71,7 +71,7 @@ struct npc_tapoke_slim_jahnAI : public npc_escortAI
         }
     }
 
-    void Aggro(Unit* /*pWho*/)
+    void EnterCombat(Unit* /*pWho*/)
     {
         Player* pPlayer = GetPlayerForEscort();
 
diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp
index 96aa6bd7785..f2856e89fd1 100755
--- a/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp
+++ b/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp
@@ -96,7 +96,7 @@ struct boss_noxxionAI : public ScriptedAI
         //Adds_Timer
         if (!Invisible && Adds_Timer <= diff)
         {
-            //Inturrupt any spell casting
+            //Interrupt any spell casting
             //me->m_canMove = true;
             me->InterruptNonMeleeSpells(false);
             me->setFaction(35);
diff --git a/src/server/scripts/Kalimdor/ashenvale.cpp b/src/server/scripts/Kalimdor/ashenvale.cpp
index 1b64bd08437..2d1b39de980 100755
--- a/src/server/scripts/Kalimdor/ashenvale.cpp
+++ b/src/server/scripts/Kalimdor/ashenvale.cpp
@@ -325,7 +325,7 @@ struct npc_muglashAI : public npc_escortAI
         }
     }
 
-    void Aggro(Unit* /*pWho*/)
+    void EnterCombat(Unit* /*pWho*/)
     {
         if (HasEscortState(STATE_ESCORT_PAUSED))
         {
diff --git a/src/server/scripts/Kalimdor/the_barrens.cpp b/src/server/scripts/Kalimdor/the_barrens.cpp
index 258ab475c84..901e3b8b923 100755
--- a/src/server/scripts/Kalimdor/the_barrens.cpp
+++ b/src/server/scripts/Kalimdor/the_barrens.cpp
@@ -125,7 +125,7 @@ struct npc_giltharesAI : public npc_escortAI
         }
     }
 
-    void Aggro(Unit* pWho)
+    void EnterCombat(Unit* pWho)
     {
         //not always use
         if (rand()%4)
diff --git a/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp
index ffeda4d4b7f..65d870afc0d 100644
--- a/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp
+++ b/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp
@@ -998,7 +998,7 @@ struct mob_tenebronAI : public dummy_dragonAI
         m_bHasPortalOpen = false;
     }
 
-    void Aggro(Unit* pWho)
+    void EnterCombat(Unit* pWho)
     {
         DoScriptText(SAY_TENEBRON_AGGRO, me);
         DoZoneInCombat();
@@ -1091,7 +1091,7 @@ struct mob_shadronAI : public dummy_dragonAI
         m_bHasPortalOpen = false;
     }
 
-    void Aggro(Unit* pWho)
+    void EnterCombat(Unit* pWho)
     {
         DoScriptText(SAY_SHADRON_AGGRO,me);
         DoZoneInCombat();
@@ -1187,7 +1187,7 @@ struct mob_vesperonAI : public dummy_dragonAI
         m_bHasPortalOpen = false;
     }
 
-    void Aggro(Unit* pWho)
+    void EnterCombat(Unit* pWho)
     {
         DoScriptText(SAY_VESPERON_AGGRO,me);
         DoZoneInCombat();
diff --git a/src/server/scripts/Northrend/borean_tundra.cpp b/src/server/scripts/Northrend/borean_tundra.cpp
index 760750fece7..b2b975f54ab 100755
--- a/src/server/scripts/Northrend/borean_tundra.cpp
+++ b/src/server/scripts/Northrend/borean_tundra.cpp
@@ -2110,7 +2110,7 @@ struct npc_warmage_coldarraAI : public Scripted_NoMovementAI
         m_uiTimer = 0;
     }
 
-    void Aggro(Unit* /*pWho*/) {}
+    void EnterCombat(Unit* /*pWho*/) {}
 
     void AttackStart(Unit* /*pWho*/) {}
 
diff --git a/src/server/scripts/Northrend/dalaran.cpp b/src/server/scripts/Northrend/dalaran.cpp
index b0dbd17559d..a602b84fcf0 100755
--- a/src/server/scripts/Northrend/dalaran.cpp
+++ b/src/server/scripts/Northrend/dalaran.cpp
@@ -52,7 +52,7 @@ struct npc_mageguard_dalaranAI : public Scripted_NoMovementAI
 
     void Reset(){}
 
-    void Aggro(Unit* /*pWho*/){}
+    void EnterCombat(Unit* /*pWho*/){}
 
     void AttackStart(Unit* /*pWho*/){}
 
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
index 2dfc990bdb7..b6cfca4940a 100755
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
@@ -416,7 +416,7 @@ struct boss_kaelthasAI : public ScriptedAI
         }
     }
 
-    void Aggro(Unit * /*who*/)
+    void EnterCombat(Unit * /*who*/)
     {
         if (m_pInstance && !m_pInstance->GetData(DATA_KAELTHASEVENT) && !Phase)
             StartEvent();
@@ -985,7 +985,7 @@ struct boss_thaladred_the_darkenerAI : public advisorbase_ai
         advisorbase_ai::Reset();
     }
 
-    void Aggro(Unit *who)
+    void EnterCombat(Unit *who)
     {
         if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
             return;
@@ -1058,7 +1058,7 @@ struct boss_lord_sanguinarAI : public advisorbase_ai
         advisorbase_ai::Reset();
     }
 
-    void Aggro(Unit *who)
+    void EnterCombat(Unit *who)
     {
         if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
             return;
@@ -1141,7 +1141,7 @@ struct boss_grand_astromancer_capernianAI : public advisorbase_ai
         }
     }
 
-    void Aggro(Unit *who)
+    void EnterCombat(Unit *who)
     {
         if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
             return;
@@ -1243,7 +1243,7 @@ struct boss_master_engineer_telonicusAI : public advisorbase_ai
             DoScriptText(SAY_TELONICUS_DEATH, me);
     }
 
-    void Aggro(Unit *who)
+    void EnterCombat(Unit *who)
     {
         if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
             return;
diff --git a/src/server/scripts/Outland/nagrand.cpp b/src/server/scripts/Outland/nagrand.cpp
index d78377cfd28..c2d76b0e9bb 100755
--- a/src/server/scripts/Outland/nagrand.cpp
+++ b/src/server/scripts/Outland/nagrand.cpp
@@ -566,7 +566,7 @@ struct npc_maghar_captiveAI : public npc_escortAI
         m_uiFrostShockTimer = 6000;
     }
 
-    void Aggro(Unit* /*pWho*/)
+    void EnterCombat(Unit* /*pWho*/)
     {
         DoCast(me, SPELL_EARTHBIND_TOTEM, false);
     }
diff --git a/src/server/scripts/Outland/shadowmoon_valley.cpp b/src/server/scripts/Outland/shadowmoon_valley.cpp
index f059bc96b13..b85959b34c8 100755
--- a/src/server/scripts/Outland/shadowmoon_valley.cpp
+++ b/src/server/scripts/Outland/shadowmoon_valley.cpp
@@ -972,7 +972,7 @@ struct npc_earthmender_wildaAI : public npc_escortAI
         DoSummon(NPC_COILSKAR_ASSASSIN, me, 15.0f, 5000, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT);
     }
 
-    void Aggro(Unit* pWho)
+    void EnterCombat(Unit* pWho)
     {
         //don't always use
         if (rand()%5)
diff --git a/src/server/scripts/World/boss_emeriss.cpp b/src/server/scripts/World/boss_emeriss.cpp
index e63a4a0d6d4..dc36e189f95 100755
--- a/src/server/scripts/World/boss_emeriss.cpp
+++ b/src/server/scripts/World/boss_emeriss.cpp
@@ -59,7 +59,7 @@ struct boss_emerissAI : public ScriptedAI
         m_uiCorruptionsCasted = 0;
     }
 
-    void Aggro(Unit* /*pWho*/)
+    void EnterCombat(Unit* /*pWho*/)
     {
         DoScriptText(SAY_AGGRO, me);
     }
diff --git a/src/server/scripts/World/boss_taerar.cpp b/src/server/scripts/World/boss_taerar.cpp
index 6b0823147b2..e23400feda7 100755
--- a/src/server/scripts/World/boss_taerar.cpp
+++ b/src/server/scripts/World/boss_taerar.cpp
@@ -173,7 +173,7 @@ struct boss_taerarAI : public ScriptedAI
         {
             if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
             {
-                //Inturrupt any spell casting
+                //Interrupt any spell casting
                 me->InterruptNonMeleeSpells(false);
 
                 //horrible workaround, need to fix
diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp
index cad93995675..f6fa8f04258 100755
--- a/src/server/scripts/World/npcs_special.cpp
+++ b/src/server/scripts/World/npcs_special.cpp
@@ -1691,7 +1691,7 @@ struct mob_mojoAI : public ScriptedAI
         if (Unit* own = me->GetOwner())
             me->GetMotionMaster()->MoveFollow(own,0,0);
     }
-    void Aggro(Unit * /*who*/){}
+    void EnterCombat(Unit * /*who*/){}
     void UpdateAI(const uint32 diff)
     {
         if (me->HasAura(20372))
-- 
cgit v1.2.3


From e1e16310ec81a0ae5ee11bf6a2e70682889409f6 Mon Sep 17 00:00:00 2001
From: QAston 
Date: Mon, 19 Jul 2010 19:22:05 +0200
Subject: *Rename SPELL_EFFECT_CHARGE_2 to SPELL_EFFECT_CHARGE_DEST, fix its
 implementation.

--HG--
branch : trunk
---
 src/server/game/Miscellaneous/SharedDefines.h |  2 +-
 src/server/game/Spells/Auras/SpellEffects.cpp | 17 ++++-------------
 src/server/game/Spells/Spell.h                |  2 +-
 src/server/game/Spells/SpellMgr.cpp           |  2 ++
 4 files changed, 8 insertions(+), 15 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h
index a1692794ca8..81e82054a95 100644
--- a/src/server/game/Miscellaneous/SharedDefines.h
+++ b/src/server/game/Miscellaneous/SharedDefines.h
@@ -750,7 +750,7 @@ enum SpellEffects
     SPELL_EFFECT_ACTIVATE_RUNE             = 146,
     SPELL_EFFECT_QUEST_FAIL                = 147,
     SPELL_EFFECT_148                       = 148,
-    SPELL_EFFECT_149                       = 149,
+    SPELL_EFFECT_CHARGE_DEST               = 149,
     SPELL_EFFECT_150                       = 150,
     SPELL_EFFECT_TRIGGER_SPELL_2           = 151,
     SPELL_EFFECT_152                       = 152,
diff --git a/src/server/game/Spells/Auras/SpellEffects.cpp b/src/server/game/Spells/Auras/SpellEffects.cpp
index ea73988fba7..fd023f14261 100644
--- a/src/server/game/Spells/Auras/SpellEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellEffects.cpp
@@ -214,7 +214,7 @@ pEffect SpellEffects[TOTAL_SPELL_EFFECTS]=
     &Spell::EffectActivateRune,                             //146 SPELL_EFFECT_ACTIVATE_RUNE
     &Spell::EffectQuestFail,                                //147 SPELL_EFFECT_QUEST_FAIL               quest fail
     &Spell::EffectUnused,                                   //148 SPELL_EFFECT_148                      unused
-    &Spell::EffectCharge2,                                  //149 SPELL_EFFECT_CHARGE2                  swoop
+    &Spell::EffectChargeDest,                               //149 SPELL_EFFECT_CHARGE_DEST
     &Spell::EffectUnused,                                   //150 SPELL_EFFECT_150                      unused
     &Spell::EffectTriggerRitualOfSummoning,                 //151 SPELL_EFFECT_TRIGGER_SPELL_2
     &Spell::EffectNULL,                                     //152 SPELL_EFFECT_152                      summon Refer-a-Friend
@@ -7129,22 +7129,13 @@ void Spell::EffectCharge(uint32 /*i*/)
         m_caster->Attack(target, true);
 }
 
-void Spell::EffectCharge2(uint32 /*i*/)
+void Spell::EffectChargeDest(uint32 /*i*/)
 {
-    float x, y, z;
     if (m_targets.HasDst())
-        m_targets.m_dstPos.GetPosition(x, y, z);
-    else if (Unit *target = m_targets.getUnitTarget())
     {
-        target->GetContactPoint(m_caster, x, y, z);
-        // not all charge effects used in negative spells
-        if (!IsPositiveSpell(m_spellInfo->Id) && m_caster->GetTypeId() == TYPEID_PLAYER)
-            m_caster->Attack(target, true);
+        m_targets.m_dstPos.GetPosition(x, y, z);
+        m_caster->GetMotionMaster()->MoveCharge(x, y, z);
     }
-    else
-        return;
-
-    m_caster->GetMotionMaster()->MoveCharge(x, y, z);
 }
 
 void Spell::EffectKnockBack(uint32 i)
diff --git a/src/server/game/Spells/Spell.h b/src/server/game/Spells/Spell.h
index d41f4309263..86ad12b9f35 100644
--- a/src/server/game/Spells/Spell.h
+++ b/src/server/game/Spells/Spell.h
@@ -347,7 +347,7 @@ class Spell
         void EffectSelfResurrect(uint32 i);
         void EffectSkinning(uint32 i);
         void EffectCharge(uint32 i);
-        void EffectCharge2(uint32 i);
+        void EffectChargeDest(uint32 i);
         void EffectProspecting(uint32 i);
         void EffectMilling(uint32 i);
         void EffectRenamePet(uint32 i);
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp
index 8385b3386e6..65e942ba272 100644
--- a/src/server/game/Spells/SpellMgr.cpp
+++ b/src/server/game/Spells/SpellMgr.cpp
@@ -83,6 +83,7 @@ SpellMgr::SpellMgr()
             case SPELL_EFFECT_APPLY_AREA_AURA_OWNER:
             case SPELL_EFFECT_APPLY_AREA_AURA_RAID:
             case SPELL_EFFECT_CHARGE:
+            case SPELL_EFFECT_CHARGE_DEST:
             case SPELL_EFFECT_JUMP:
             case SPELL_EFFECT_JUMP2:
             case SPELL_EFFECT_LEAP_BACK:
@@ -3461,6 +3462,7 @@ void SpellMgr::LoadSpellCustomAttr()
                     count++;
                     break;
                 case SPELL_EFFECT_CHARGE:
+                case SPELL_EFFECT_CHARGE_DEST:
                 case SPELL_EFFECT_JUMP:
                 case SPELL_EFFECT_JUMP2:
                 case SPELL_EFFECT_LEAP_BACK:
-- 
cgit v1.2.3


From b1fab8caafcfa5228e2727d64bcf6a675318b517 Mon Sep 17 00:00:00 2001
From: QAston 
Date: Mon, 19 Jul 2010 19:28:54 +0200
Subject: *Correct typo in CastSpeedSlow spellgroup - by tassader1000, thanks
 azazel_kon for sql *Fix a compile typo in prev commit.

--HG--
branch : trunk
---
 sql/base/world_database.sql                   | 4 ++--
 sql/updates/8925_world_spell_group.sql        | 6 ++++++
 src/server/game/Spells/Auras/SpellEffects.cpp | 1 +
 3 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 sql/updates/8925_world_spell_group.sql

(limited to 'src')

diff --git a/sql/base/world_database.sql b/sql/base/world_database.sql
index b47cff9f9ee..fb3fcb2b322 100644
--- a/sql/base/world_database.sql
+++ b/sql/base/world_database.sql
@@ -5878,8 +5878,8 @@ INSERT INTO `spell_group` (`id`, `spell_id`) VALUES
 (1099,-1098),
 -- Cast Speed Slow
 (1103,-1100),
-(1103,-1001),
-(1103,-1002),
+(1103,-1101),
+(1103,-1102),
 -- mage freezing spells
 (1107, 122), -- Frost Nova
 (1107, 33395), -- Freeze
diff --git a/sql/updates/8925_world_spell_group.sql b/sql/updates/8925_world_spell_group.sql
new file mode 100644
index 00000000000..0e7d2cf894e
--- /dev/null
+++ b/sql/updates/8925_world_spell_group.sql
@@ -0,0 +1,6 @@
+DELETE FROM `spell_group` WHERE `id` = 1103;
+-- Cast Speed Slow
+INSERT INTO `spell_group` (`id`,`spell_id`) VALUES
+(1103,-1100),
+(1103,-1101),
+(1103,-1102);
diff --git a/src/server/game/Spells/Auras/SpellEffects.cpp b/src/server/game/Spells/Auras/SpellEffects.cpp
index fd023f14261..5d0858ed214 100644
--- a/src/server/game/Spells/Auras/SpellEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellEffects.cpp
@@ -7133,6 +7133,7 @@ void Spell::EffectChargeDest(uint32 /*i*/)
 {
     if (m_targets.HasDst())
     {
+        float x, y, z;
         m_targets.m_dstPos.GetPosition(x, y, z);
         m_caster->GetMotionMaster()->MoveCharge(x, y, z);
     }
-- 
cgit v1.2.3


From 7eaaa063750a0b857a656f679ee4b5286a128caf Mon Sep 17 00:00:00 2001
From: QAston 
Date: Mon, 19 Jul 2010 21:24:09 +0200
Subject: *Rename SPELL_EFFECT_JUMP2 to SPELL_EFFECT_JUMP_DEST, split the
 handler of effect from SPELL_EFFECT_JUMP handler

--HG--
branch : trunk
---
 src/server/game/Miscellaneous/SharedDefines.h |  2 +-
 src/server/game/Spells/Auras/SpellEffects.cpp | 60 +++++++++++++++++----------
 src/server/game/Spells/Spell.cpp              |  3 +-
 src/server/game/Spells/Spell.h                |  5 ++-
 src/server/game/Spells/SpellMgr.cpp           |  4 +-
 5 files changed, 48 insertions(+), 26 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h
index 81e82054a95..0d5025a5d5f 100644
--- a/src/server/game/Miscellaneous/SharedDefines.h
+++ b/src/server/game/Miscellaneous/SharedDefines.h
@@ -643,7 +643,7 @@ enum SpellEffects
     SPELL_EFFECT_LANGUAGE                  = 39,
     SPELL_EFFECT_DUAL_WIELD                = 40,
     SPELL_EFFECT_JUMP                      = 41,
-    SPELL_EFFECT_JUMP2                     = 42,
+    SPELL_EFFECT_JUMP_DEST                 = 42,
     SPELL_EFFECT_TELEPORT_UNITS_FACE_CASTER= 43,
     SPELL_EFFECT_SKILL_STEP                = 44,
     SPELL_EFFECT_ADD_HONOR                 = 45,
diff --git a/src/server/game/Spells/Auras/SpellEffects.cpp b/src/server/game/Spells/Auras/SpellEffects.cpp
index 5d0858ed214..d01e3778291 100644
--- a/src/server/game/Spells/Auras/SpellEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellEffects.cpp
@@ -107,7 +107,7 @@ pEffect SpellEffects[TOTAL_SPELL_EFFECTS]=
     &Spell::EffectUnused,                                   // 39 SPELL_EFFECT_LANGUAGE
     &Spell::EffectDualWield,                                // 40 SPELL_EFFECT_DUAL_WIELD
     &Spell::EffectJump,                                     // 41 SPELL_EFFECT_JUMP
-    &Spell::EffectJump,                                     // 42 SPELL_EFFECT_JUMP2
+    &Spell::EffectJumpDest,                                 // 42 SPELL_EFFECT_JUMP_DEST
     &Spell::EffectTeleUnitsFaceCaster,                      // 43 SPELL_EFFECT_TELEPORT_UNITS_FACE_CASTER
     &Spell::EffectLearnSkill,                               // 44 SPELL_EFFECT_SKILL_STEP
     &Spell::EffectAddHonor,                                 // 45 SPELL_EFFECT_ADD_HONOR                honor/pvp related
@@ -203,7 +203,7 @@ pEffect SpellEffects[TOTAL_SPELL_EFFECTS]=
     &Spell::EffectNULL,                                     //135 SPELL_EFFECT_CALL_PET
     &Spell::EffectHealPct,                                  //136 SPELL_EFFECT_HEAL_PCT
     &Spell::EffectEnergizePct,                              //137 SPELL_EFFECT_ENERGIZE_PCT
-    &Spell::EffectJump2,                                    //138 SPELL_EFFECT_LEAP_BACK                Leap back
+    &Spell::EffectLeapBack,                                 //138 SPELL_EFFECT_LEAP_BACK                Leap back
     &Spell::EffectQuestClear,                               //139 SPELL_EFFECT_CLEAR_QUEST              Reset quest status (miscValue - quest ID)
     &Spell::EffectForceCast,                                //140 SPELL_EFFECT_FORCE_CAST
     &Spell::EffectNULL,                                     //141 SPELL_EFFECT_141                      damage and reduce speed?
@@ -2507,6 +2507,33 @@ void Spell::EffectTriggerMissileSpell(uint32 effect_idx)
 }
 
 void Spell::EffectJump(uint32 i)
+{
+    if (m_caster->isInFlight())
+        return;
+
+    float x,y,z,o;
+    if (m_targets.getUnitTarget())
+    {
+        m_targets.getUnitTarget()->GetContactPoint(m_caster,x,y,z,CONTACT_DISTANCE);
+        o = m_caster->GetOrientation();
+    }
+    else if (m_targets.getGOTarget())
+    {
+        m_targets.getGOTarget()->GetContactPoint(m_caster,x,y,z,CONTACT_DISTANCE);
+        o = m_caster->GetOrientation();
+    }
+    else
+    {
+        sLog.outError("Spell::EffectJump - unsupported target mode for spell ID %u", m_spellInfo->Id);
+        return;
+    }
+
+    float speedXY, speedZ;
+    CalculateJumpSpeeds(i, m_caster->GetExactDist2d(x, y), speedXY, speedZ);
+    m_caster->GetMotionMaster()->MoveJump(x, y, z, speedXY, speedZ);
+}
+
+void Spell::EffectJumpDest(uint32 i)
 {
     if (m_caster->isInFlight())
         return;
@@ -2534,32 +2561,26 @@ void Spell::EffectJump(uint32 i)
         else
             o = m_caster->GetOrientation();
     }
-    else if (m_targets.getUnitTarget())
-    {
-        m_targets.getUnitTarget()->GetContactPoint(m_caster,x,y,z,CONTACT_DISTANCE);
-        o = m_caster->GetOrientation();
-    }
-    else if (m_targets.getGOTarget())
-    {
-        m_targets.getGOTarget()->GetContactPoint(m_caster,x,y,z,CONTACT_DISTANCE);
-        o = m_caster->GetOrientation();
-    }
     else
     {
-        sLog.outError("Spell::EffectJump - unsupported target mode for spell ID %u", m_spellInfo->Id);
+        sLog.outError("Spell::EffectJumpDest - unsupported target mode for spell ID %u", m_spellInfo->Id);
         return;
     }
 
-    //m_caster->NearTeleportTo(x,y,z,o,true);
-    float speedZ;
+    float speedXY, speedZ;
+    CalculateJumpSpeeds(i, m_caster->GetExactDist2d(x, y), speedXY, speedZ);
+    m_caster->GetMotionMaster()->MoveJump(x, y, z, speedXY, speedZ);
+}
+
+void Spell::CalculateJumpSpeeds(uint8 i, float dist, float & speedXY, float & speedZ)
+{
     if (m_spellInfo->EffectMiscValue[i])
         speedZ = float(m_spellInfo->EffectMiscValue[i])/10;
     else if (m_spellInfo->EffectMiscValueB[i])
         speedZ = float(m_spellInfo->EffectMiscValueB[i])/10;
     else
         speedZ = 10.0f;
-    float speedXY = m_caster->GetExactDist2d(x, y) * 10.0f / speedZ;
-    m_caster->GetMotionMaster()->MoveJump(x, y, z, speedXY, speedZ);
+    speedXY = dist * 10.0f / speedZ;
 }
 
 void Spell::EffectTeleportUnits(uint32 /*i*/)
@@ -7113,9 +7134,6 @@ void Spell::EffectSkinning(uint32 /*i*/)
 
 void Spell::EffectCharge(uint32 /*i*/)
 {
-    if (!m_caster)
-        return;
-
     Unit *target = m_targets.getUnitTarget();
     if (!target)
         return;
@@ -7179,7 +7197,7 @@ void Spell::EffectKnockBack(uint32 i)
     unitTarget->KnockbackFrom(x, y, speedxy, speedz);
 }
 
-void Spell::EffectJump2(uint32 i)
+void Spell::EffectLeapBack(uint32 i)
 {
     float speedxy = float(m_spellInfo->EffectMiscValue[i])/10;
     float speedz = float(damage/10);
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
index a6185085161..0ab7ec07407 100644
--- a/src/server/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
@@ -3037,8 +3037,9 @@ void Spell::cast(bool skipCheck)
         switch(m_spellInfo->Effect[i])
         {
             case SPELL_EFFECT_CHARGE:
+            case SPELL_EFFECT_CHARGE_DEST:
             case SPELL_EFFECT_JUMP:
-            case SPELL_EFFECT_JUMP2:
+            case SPELL_EFFECT_JUMP_DEST:
             case SPELL_EFFECT_LEAP_BACK:
             case SPELL_EFFECT_ACTIVATE_RUNE:
                 HandleEffects(NULL,NULL,NULL,i);
diff --git a/src/server/game/Spells/Spell.h b/src/server/game/Spells/Spell.h
index 86ad12b9f35..dd6b08cadc1 100644
--- a/src/server/game/Spells/Spell.h
+++ b/src/server/game/Spells/Spell.h
@@ -304,7 +304,8 @@ class Spell
         void EffectAddFarsight(uint32 i);
         void EffectHealMechanical(uint32 i);
         void EffectJump(uint32 i);
-        void EffectJump2(uint32 i);
+        void EffectJumpDest(uint32 i);
+        void EffectLeapBack(uint32 i);
         void EffectQuestClear(uint32 i);
         void EffectTeleUnitsFaceCaster(uint32 i);
         void EffectLearnSkill(uint32 i);
@@ -644,8 +645,10 @@ class Spell
         void SpellDamageWeaponDmg(uint32 i);
         void SpellDamageHeal(uint32 i);
 
+        // effect helpers
         void GetSummonPosition(uint32 i, Position &pos, float radius = 0.0f, uint32 count = 0);
         void SummonGuardian(uint32 i, uint32 entry, SummonPropertiesEntry const *properties);
+        void CalculateJumpSpeeds(uint8 i, float dist, float & speedxy, float & speedz);
 
         SpellCastResult CanOpenLock(uint32 effIndex, uint32 lockid, SkillType& skillid, int32& reqSkillValue, int32& skillValue);
         // -------------------------------------------
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp
index 65e942ba272..55a421b7a57 100644
--- a/src/server/game/Spells/SpellMgr.cpp
+++ b/src/server/game/Spells/SpellMgr.cpp
@@ -85,7 +85,7 @@ SpellMgr::SpellMgr()
             case SPELL_EFFECT_CHARGE:
             case SPELL_EFFECT_CHARGE_DEST:
             case SPELL_EFFECT_JUMP:
-            case SPELL_EFFECT_JUMP2:
+            case SPELL_EFFECT_JUMP_DEST:
             case SPELL_EFFECT_LEAP_BACK:
                 EffectTargetType[i] = SPELL_REQUIRE_CASTER;
                 break;
@@ -3464,7 +3464,7 @@ void SpellMgr::LoadSpellCustomAttr()
                 case SPELL_EFFECT_CHARGE:
                 case SPELL_EFFECT_CHARGE_DEST:
                 case SPELL_EFFECT_JUMP:
-                case SPELL_EFFECT_JUMP2:
+                case SPELL_EFFECT_JUMP_DEST:
                 case SPELL_EFFECT_LEAP_BACK:
                     if (!spellInfo->speed && !spellInfo->SpellFamilyName)
                         spellInfo->speed = SPEED_CHARGE;
-- 
cgit v1.2.3


From 6a9e6f258d0836420586ae8f4966978901dfb61e Mon Sep 17 00:00:00 2001
From: Shauren 
Date: Mon, 19 Jul 2010 21:40:34 +0200
Subject: Remove 2 unused files

--HG--
branch : trunk
---
 src/server/game/World/TimeMgr.cpp | 36 ---------------
 src/server/game/World/TimeMgr.h   | 92 ---------------------------------------
 2 files changed, 128 deletions(-)
 delete mode 100644 src/server/game/World/TimeMgr.cpp
 delete mode 100644 src/server/game/World/TimeMgr.h

(limited to 'src')

diff --git a/src/server/game/World/TimeMgr.cpp b/src/server/game/World/TimeMgr.cpp
deleted file mode 100644
index 00152280aa9..00000000000
--- a/src/server/game/World/TimeMgr.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2008-2010 Trinity 
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#include "TimeMgr.h"
-#include "SingletonImp.h"
-
-INSTANTIATE_SINGLETON_1(GameTime);
-
-bool PeriodicTimer::Update(const uint32 &diff)
-{
-    if((i_expireTime -= diff) > 0)
-        return false;
-
-    i_expireTime += i_period > diff ? i_period : diff;
-    return true;
-}
-
-void PeriodicTimer::SetPeriodic(int32 period, int32 start_time)
-{
-    i_expireTime=start_time, i_period=period;
-}
diff --git a/src/server/game/World/TimeMgr.h b/src/server/game/World/TimeMgr.h
deleted file mode 100644
index 4a8cac90356..00000000000
--- a/src/server/game/World/TimeMgr.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (C) 2008-2010 Trinity 
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#ifndef _TIMEMGR_H
-#define _TIMEMGR_H
-
-#include "Timer.h"
-#include "Singleton.h"
-
-struct IntervalTimer
-{
-    public:
-        IntervalTimer() : _interval(0), _current(0) {}
-
-        void Update(time_t diff) { _current += diff; if(_current<0) _current=0;}
-        bool Passed() { return _current >= _interval; }
-        void Reset() { if(_current >= _interval) _current -= _interval;  }
-
-        void SetCurrent(time_t current) { _current = current; }
-        void SetInterval(time_t interval) { _interval = interval; }
-        time_t GetInterval() const { return _interval; }
-        time_t GetCurrent() const { return _current; }
-
-    private:
-        time_t _interval;
-        time_t _current;
-};
-
-template  struct TimeTrack
-{
-    public:
-        TimeTrack(T expire) : i_expireTime(expire) {}
-        void Update(T diff) { i_expireTime -= diff; }
-        bool Passed(void) const { return (i_expireTime <= 0); }
-        void Reset(T interval) { i_expireTime = interval; }
-        T GetExpireTime(void) const { return i_expireTime; }
-    private:
-        T i_expireTime;
-};
-
-typedef TimeTrack TimeTracker;
-typedef TimeTrack TimeTrackerSmall;
-
-struct PeriodicTimer
-{
-    public:
-        PeriodicTimer(int32 period, int32 start_time) :
-            i_expireTime(start_time), i_period(period) {}
-
-        bool Update(const uint32 &diff);
-        void SetPeriodic(int32 period, int32 start_time);
-
-    private:
-        int32 i_period;
-        int32 i_expireTime;
-};
-
-class GameTime
-{
-    public:
-        /// When server started?
-        time_t const& GetStartTime() const { return m_startTime; }
-        /// What time is it?
-        time_t const& GetGameTime() const { return m_gameTime; }
-        /// Uptime (in secs)
-        uint32 GetUptime() const { return uint32(m_gameTime - m_startTime); }
-
-        void SetGameTime(void) { m_gameTime  = time(NULL); }
-        void SetStartTime(void){ m_startTime = time(NULL); }
-    private:
-        time_t m_gameTime;
-        time_t m_startTime;
-};
-
-#define sGameTime Trinity::Singleton::Instance()
-
-#endif
-- 
cgit v1.2.3


From b5f7ac86eac6c300807ea2d5df4f6d2fae5bc4c8 Mon Sep 17 00:00:00 2001
From: QAston 
Date: Mon, 19 Jul 2010 22:52:21 +0200
Subject: *Implement SPELL_EFFECT_FORCE_CAST_WITH_VALUE(141).

--HG--
branch : trunk
---
 src/server/game/Spells/Auras/SpellEffects.cpp | 26 ++++++++++++++++++++++++--
 src/server/game/Spells/Spell.h                |  1 +
 2 files changed, 25 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Spells/Auras/SpellEffects.cpp b/src/server/game/Spells/Auras/SpellEffects.cpp
index d01e3778291..3f02035dadc 100644
--- a/src/server/game/Spells/Auras/SpellEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellEffects.cpp
@@ -111,7 +111,7 @@ pEffect SpellEffects[TOTAL_SPELL_EFFECTS]=
     &Spell::EffectTeleUnitsFaceCaster,                      // 43 SPELL_EFFECT_TELEPORT_UNITS_FACE_CASTER
     &Spell::EffectLearnSkill,                               // 44 SPELL_EFFECT_SKILL_STEP
     &Spell::EffectAddHonor,                                 // 45 SPELL_EFFECT_ADD_HONOR                honor/pvp related
-    &Spell::EffectNULL,                                     // 46 SPELL_EFFECT_SPAWN                    we must spawn pet there
+    &Spell::EffectUnused,                                   // 46 SPELL_EFFECT_SPAWN clientside, unit appears as if it was just spawned
     &Spell::EffectTradeSkill,                               // 47 SPELL_EFFECT_TRADE_SKILL
     &Spell::EffectUnused,                                   // 48 SPELL_EFFECT_STEALTH                  one spell: Base Stealth
     &Spell::EffectUnused,                                   // 49 SPELL_EFFECT_DETECT                   one spell: Detect
@@ -206,7 +206,7 @@ pEffect SpellEffects[TOTAL_SPELL_EFFECTS]=
     &Spell::EffectLeapBack,                                 //138 SPELL_EFFECT_LEAP_BACK                Leap back
     &Spell::EffectQuestClear,                               //139 SPELL_EFFECT_CLEAR_QUEST              Reset quest status (miscValue - quest ID)
     &Spell::EffectForceCast,                                //140 SPELL_EFFECT_FORCE_CAST
-    &Spell::EffectNULL,                                     //141 SPELL_EFFECT_141                      damage and reduce speed?
+    &Spell::EffectForceCastWithValue,                       //141 SPELL_EFFECT_FORCE_CAST_WITH_VALUE
     &Spell::EffectTriggerSpellWithValue,                    //142 SPELL_EFFECT_TRIGGER_SPELL_WITH_VALUE
     &Spell::EffectApplyAreaAura,                            //143 SPELL_EFFECT_APPLY_AREA_AURA_OWNER
     &Spell::EffectKnockBack,                                //144 SPELL_EFFECT_KNOCK_BACK_2             Spectral Blast
@@ -2307,6 +2307,28 @@ void Spell::EffectForceCast(uint32 i)
     caster->CastSpell(unitTarget, spellInfo, true, NULL, NULL, m_originalCasterGUID);
 }
 
+void Spell::EffectForceCastWithValue(uint32 i)
+{
+    if (!unitTarget)
+        return;
+
+    uint32 triggered_spell_id = m_spellInfo->EffectTriggerSpell[i];
+
+    // normal case
+    SpellEntry const *spellInfo = sSpellStore.LookupEntry(triggered_spell_id);
+
+    if (!spellInfo)
+    {
+        sLog.outError("EffectForceCastWithValue of spell %u: triggering unknown spell id %i", m_spellInfo->Id,triggered_spell_id);
+        return;
+    }
+    int32 bp = damage;
+    Unit * caster = GetTriggeredSpellCaster(spellInfo, m_caster, unitTarget);
+
+    caster->CastCustomSpell(unitTarget, spellInfo->Id, &bp, &bp, &bp, true, NULL, NULL, m_originalCasterGUID);
+}
+
+
 void Spell::EffectTriggerSpell(uint32 effIndex)
 {
     // only unit case known
diff --git a/src/server/game/Spells/Spell.h b/src/server/game/Spells/Spell.h
index dd6b08cadc1..ffbcfdb056d 100644
--- a/src/server/game/Spells/Spell.h
+++ b/src/server/game/Spells/Spell.h
@@ -318,6 +318,7 @@ class Spell
         void EffectLearnPetSpell(uint32 i);
         void EffectWeaponDmg(uint32 i);
         void EffectForceCast(uint32 i);
+        void EffectForceCastWithValue(uint32 i);
         void EffectTriggerSpell(uint32 i);
         void EffectTriggerMissileSpell(uint32 i);
         void EffectThreat(uint32 i);
-- 
cgit v1.2.3


From f906976837502fa5aa81b982b901d1509f5aa0c4 Mon Sep 17 00:00:00 2001
From: QAston 
Date: Tue, 20 Jul 2010 01:42:14 +0200
Subject: *Remove assertion from packet handler. Assertions should not be put
 in such places because we can't trust clients nor network. *Do not allow to
 charm mounted units.

--HG--
branch : trunk
---
 src/server/game/Entities/Unit/Unit.cpp                    | 4 ++++
 src/server/game/Server/Protocol/Handlers/SpellHandler.cpp | 4 ----
 src/server/game/Spells/Auras/SpellAuraEffects.cpp         | 3 ---
 src/server/game/Spells/Auras/SpellEffects.cpp             | 2 +-
 src/server/game/Spells/Spell.cpp                          | 5 +++++
 5 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index b659f876112..1fb662c43df 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -15204,6 +15204,10 @@ bool Unit::SetCharmedBy(Unit* charmer, CharmType type)
     if (!charmer)
         return false;
 
+    // unmount players when charmed
+    if (GetTypeId() == TYPEID_PLAYER)
+        Unmount();
+
     assert(type != CHARM_TYPE_POSSESS || charmer->GetTypeId() == TYPEID_PLAYER);
     assert((type == CHARM_TYPE_VEHICLE) == IsVehicle());
 
diff --git a/src/server/game/Server/Protocol/Handlers/SpellHandler.cpp b/src/server/game/Server/Protocol/Handlers/SpellHandler.cpp
index b8a4a127824..a526c61a5e7 100644
--- a/src/server/game/Server/Protocol/Handlers/SpellHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/SpellHandler.cpp
@@ -538,11 +538,7 @@ void WorldSession::HandleSpellClick(WorldPacket & recv_data)
 
     // TODO: Unit::SetCharmedBy: 28782 is not in world but 0 is trying to charm it! -> crash
     if (!unit->IsInWorld())
-    {
-        sLog.outCrash("Spell click target %u is not in world!", unit->GetEntry());
-        assert(false);
         return;
-    }
 
     SpellClickInfoMapBounds clickPair = objmgr.GetSpellClickInfoMapBounds(unit->GetEntry());
     for (SpellClickInfoMap::const_iterator itr = clickPair.first; itr != clickPair.second; ++itr)
diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
index fc87a934e97..7a70155a23e 100644
--- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
@@ -3932,9 +3932,6 @@ void AuraEffect::HandleModPossessPet(AuraApplication const * aurApp, uint8 mode,
         if (caster->ToPlayer()->GetPet() != target)
             return;
 
-        if (target->IsVehicle()) //Avoid crash when mind controling vehicles due to an assert in Unit::SetCharmedBy
-            return;
-        
         target->SetCharmedBy(caster, CHARM_TYPE_POSSESS);
     }
     else
diff --git a/src/server/game/Spells/Auras/SpellEffects.cpp b/src/server/game/Spells/Auras/SpellEffects.cpp
index 3f02035dadc..0b2191d5e48 100644
--- a/src/server/game/Spells/Auras/SpellEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellEffects.cpp
@@ -154,7 +154,7 @@ pEffect SpellEffects[TOTAL_SPELL_EFFECTS]=
     &Spell::EffectActivateObject,                           // 86 SPELL_EFFECT_ACTIVATE_OBJECT
     &Spell::EffectWMODamage,                                // 87 SPELL_EFFECT_WMO_DAMAGE
     &Spell::EffectWMORepair,                                // 88 SPELL_EFFECT_WMO_REPAIR
-    &Spell::EffectUnused,                                   // 89 SPELL_EFFECT_WMO_CHANGE
+    &Spell::EffectUnused,                                   // 89 SPELL_EFFECT_WMO_CHANGE // 0 intact // 1 damaged // 2 destroyed // 3 rebuilding
     &Spell::EffectKillCreditPersonal,                       // 90 SPELL_EFFECT_KILL_CREDIT              Kill credit but only for single person
     &Spell::EffectUnused,                                   // 91 SPELL_EFFECT_THREAT_ALL               one spell: zzOLDBrainwash
     &Spell::EffectEnchantHeldItem,                          // 92 SPELL_EFFECT_ENCHANT_HELD_ITEM
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
index 0ab7ec07407..510be691d18 100644
--- a/src/server/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
@@ -5391,6 +5391,9 @@ SpellCastResult Spell::CheckCast(bool strict)
                     if (target->GetTypeId() == TYPEID_UNIT && target->ToCreature()->IsVehicle())
                         return SPELL_FAILED_BAD_IMPLICIT_TARGETS;
 
+                    if (target->IsMounted())
+                        return SPELL_FAILED_CANT_BE_CHARMED;
+
                     if (target->GetCharmerGUID())
                         return SPELL_FAILED_CHARMED;
 
@@ -6442,6 +6445,8 @@ bool Spell::CheckTarget(Unit* target, uint32 eff)
         case SPELL_AURA_AOE_CHARM:
             if (target->GetTypeId() == TYPEID_UNIT && target->IsVehicle())
                 return false;
+            if (target->IsMounted())
+                return false;
             if (target->GetCharmerGUID())
                 return false;
             if (int32 damage = CalculateDamage(eff, target))
-- 
cgit v1.2.3